From 7522f86d010e600e17e82f98364235e96df21c1e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 22 Sep 2008 01:51:24 +0000
Subject: [PATCH 001/577] * Volume rendering

This is an initial commit to get it in SVN and make it easier to work on.

Don't expect it to work perfectly, it's still in development and there's
plenty of work still needing to be done. And so no I'm not very interested
in hearing bug reports or feature requests at this stage :)

There's some info on this, and a todo list at:
http://mke3.net/weblog/volume-rendering/

Right now I'm trying to focus on getting shading working correctly (there's
currently a problem in which 'surfaces' of the volume facing towards or away
from light sources are getting shaded differently to how they should be),
then I'll work on integration issues, like taking materials behind the volume
into account, blending with alpha, etc. You can do simple testing though,
mapping textures to density or emission on a cube with volume material.
---
 source/blender/blenkernel/intern/material.c   |   5 +
 source/blender/blenlib/BLI_arithb.h           |   1 +
 source/blender/blenlib/intern/arithb.c        |  13 +
 source/blender/blenloader/intern/readfile.c   |  10 +
 source/blender/makesdna/DNA_material_types.h  |  21 +
 .../blender/render/intern/include/shading.h   |   2 +
 .../blender/render/intern/include/texture.h   |   1 +
 .../render/intern/include/volumetric.h        |  29 ++
 .../render/intern/source/convertblender.c     |   2 +
 .../blender/render/intern/source/shadeinput.c |   9 +-
 .../render/intern/source/shadeoutput.c        |   2 +-
 source/blender/render/intern/source/texture.c | 135 ++++++
 .../blender/render/intern/source/volumetric.c | 400 ++++++++++++++++++
 source/blender/src/buttons_shading.c          | 145 +++++--
 source/blender/src/previewrender.c            |   2 +
 15 files changed, 730 insertions(+), 47 deletions(-)
 create mode 100644 source/blender/render/intern/include/volumetric.h
 create mode 100644 source/blender/render/intern/source/volumetric.c

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index f05b84f6e90..5c20858ec63 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -166,6 +166,11 @@ void init_material(Material *ma)
 	ma->sss_texfac= 0.0f;
 	ma->sss_front= 1.0f;
 	ma->sss_back= 1.0f;
+	
+	ma->vol_stepsize = 0.2f;
+	ma->vol_shade_stepsize = 0.2f;
+	ma->vol_absorption = 1.0f;
+	ma->vol_scattering = 1.0f;
 
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 6e54fae58d0..0a9abc34608 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -250,6 +250,7 @@ void printvec4f(char *str, float v[4]);
 
 void VecAddf(float *v, float *v1, float *v2);
 void VecSubf(float *v, float *v1, float *v2);
+void VecMulVecf(float *v, float *v1, float *v2);
 void VecLerpf(float *target, float *a, float *b, float t);
 void VecMidf(float *v, float *v1, float *v2);
 
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index f89f90f7045..f311c30e0c7 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2126,6 +2126,13 @@ void VecSubf(float *v, float *v1, float *v2)
 	v[2]= v1[2]- v2[2];
 }
 
+void VecMulVecf(float *v, float *v1, float *v2)
+{
+	v[0] = v1[0] * v2[0];
+	v[1] = v1[1] * v2[1];
+	v[2] = v1[2] * v2[2];
+}
+
 void VecLerpf(float *target, float *a, float *b, float t)
 {
 	float s = 1.0f-t;
@@ -3269,6 +3276,12 @@ float Normalize2(float *n)
 	return d;
 }
 
+float rgb_to_luminance(float r, float g, float b)
+{
+	/* Rec. 709 HDTV */
+	return (0.2126*r + 0.7152*g + 0.0722*b);
+}
+
 void hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b)
 {
 	int i;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f3f1a99cdbf..a1d50b618d1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7681,6 +7681,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 11)) {
 		Object *ob;
 		bActionStrip *strip;
+
 		
 		/* nla-strips - scale */		
 		for (ob= main->object.first; ob; ob= ob->id.next) {
@@ -7704,12 +7705,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ob->soft->shearstiff = 1.0f; 
 			}
 		}
+		
 	}
 
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 14)) {
 		Scene *sce= main->scene.first;
 		Sequence *seq;
 		Editing *ed;
+		Material *ma;
 		
 		while(sce) {
 			ed= sce->ed;
@@ -7724,6 +7727,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			
 			sce= sce->id.next;
 		}
+		
+		for(ma=main->mat.first; ma; ma= ma->id.next) {
+			if (ma->vol_shade_stepsize < 0.001f) ma->vol_shade_stepsize = 0.2f;
+			if (ma->vol_stepsize < 0.001f) ma->vol_stepsize = 0.2f;
+			if (ma->vol_absorption < 0.001f) ma->vol_absorption = 1.0f;
+			if (ma->vol_scattering < 0.001f) ma->vol_scattering = 1.0f;
+		}
 	}
 	
 	/*fix broken group lengths in id properties*/
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index c92a33bbcbb..940f57c1ebc 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -62,6 +62,16 @@ typedef struct Material {
 	float translucency;
 	/* end synced with render_types.h */
 	
+	short material_type; /* solid, halo, volumetric */
+	short pad5[3];
+	
+	/* volumetrics */
+	float vol_alphathresh;
+	float vol_stepsize, vol_shade_stepsize;
+	float vol_absorption, vol_scattering;
+	short vol_shadeflag;
+	short vpad;
+	
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
 	float filter;		/* filter added, for raytrace transparency and transmissivity */
@@ -154,6 +164,12 @@ typedef struct Material {
 		/* for render */
 #define MA_IS_USED		1
 
+/* material_type */
+#define MA_SOLID		0
+#define MA_PTHALO		1
+#define MA_VOLUME		2
+#define MA_VOLUMESOLID	3
+
 /* mode (is int) */
 #define MA_TRACEBLE		1
 #define MA_SHADOW		2
@@ -327,5 +343,10 @@ typedef struct Material {
 /* sss_flag */
 #define MA_DIFF_SSS		1
 
+/* vol_shadeflag */
+#define MA_VOL_SHADED		1
+#define MA_VOL_ATTENUATED	2
+#define MA_VOL_SHADOWED		4
+
 #endif
 
diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h
index 6f1cb8dd7a9..9229e612337 100644
--- a/source/blender/render/intern/include/shading.h
+++ b/source/blender/render/intern/include/shading.h
@@ -52,6 +52,7 @@ typedef struct ShadeSample {
 
 	/* also the node shader callback */
 void shade_material_loop(struct ShadeInput *shi, struct ShadeResult *shr);
+void shade_volume_loop(struct ShadeInput *shi, struct ShadeResult *shr);
 
 void shade_input_set_triangle_i(struct ShadeInput *shi, struct ObjectInstanceRen *obi, struct VlakRen *vlr, short i1, short i2, short i3);
 void shade_input_set_triangle(struct ShadeInput *shi, volatile int obi, volatile int facenr, int normal_flip);
@@ -85,6 +86,7 @@ void shade_color(struct ShadeInput *shi, ShadeResult *shr);
 void ambient_occlusion_to_diffuse(struct ShadeInput *shi, float *diff);
 void ambient_occlusion(struct ShadeInput *shi);
 
+ListBase *get_lights(struct ShadeInput *shi);
 float lamp_get_visibility(struct LampRen *lar, float *co, float *lv, float *dist);
 void lamp_get_shadow(struct LampRen *lar, ShadeInput *shi, float inp, float *shadfac, int do_real);
 
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index 8e56c4a852f..08c4ee5df98 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -56,6 +56,7 @@ void do_halo_tex(struct HaloRen *har, float xn, float yn, float *colf);
 void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, float *blend, int skyflag);
 void do_material_tex(struct ShadeInput *shi);
 void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf);
+void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float *emit);
 
 void init_render_textures(Render *re);
 
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
new file mode 100644
index 00000000000..8db3fa63f98
--- /dev/null
+++ b/source/blender/render/intern/include/volumetric.h
@@ -0,0 +1,29 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Farsthary (Raul FHernandez), Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr);
\ No newline at end of file
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 322d2066a6c..48855246e87 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1029,6 +1029,8 @@ static Material *give_render_material(Render *re, Object *ob, int nr)
 	if(ma->nodetree && ma->use_nodes)
 		flag_render_node_material(re, ma->nodetree);
 	
+	if (ma->material_type == MA_VOLUME) re->r.mode |= R_RAYTRACE;
+	
 	return ma;
 }
 
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 7397d623264..cd5ecc413df 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -135,6 +135,12 @@ void shade_material_loop(ShadeInput *shi, ShadeResult *shr)
 	}	
 }
 
+/* delivers a fully filled in ShadeResult, for all passes */
+void shade_volume_loop(ShadeInput *shi, ShadeResult *shr)
+{
+	if(R.r.mode & R_RAYTRACE) volume_trace(shi, shr);
+}
+
 
 /* do a shade, finish up some passes, apply mist */
 void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr)
@@ -151,7 +157,8 @@ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr)
 		memcpy(&shi->r, &shi->mat->r, 23*sizeof(float));
 		shi->har= shi->mat->har;
 		
-		shade_material_loop(shi, shr);
+		if (shi->mat->material_type == MA_SOLID) shade_material_loop(shi, shr);
+		else if (shi->mat->material_type == MA_VOLUME) shade_volume_loop(shi, shr);
 	}
 	
 	/* copy additional passes */
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 5a80173d1f1..4f7c26614e9 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -58,7 +58,7 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-static ListBase *get_lights(ShadeInput *shi)
+ListBase *get_lights(ShadeInput *shi)
 {
 	
 	if(shi->light_override)
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 27628d91465..37778fafeb3 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1451,6 +1451,141 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen
 	return in;
 }
 
+void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float *emit)
+{
+	MTex *mtex;
+	Tex *tex;
+	TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
+	int tex_nr, rgbnor= 0;
+	float co[3], texvec[3];
+	float fact, stencilTin=1.0;
+	
+	if (R.r.scemode & R_NO_TEX) return;
+	/* here: test flag if there's a tex (todo) */
+	
+	for(tex_nr=0; tex_nr<MAX_MTEX; tex_nr++) {
+		/* separate tex switching */
+		if(shi->mat->septex & (1<<tex_nr)) continue;
+		
+		if(shi->mat->mtex[tex_nr]) {
+			mtex= shi->mat->mtex[tex_nr];
+			tex= mtex->tex;
+			if(tex==0) continue;
+			
+			/* which coords */
+			if(mtex->texco==TEXCO_OBJECT) { 
+				Object *ob= mtex->object;
+				ob= mtex->object;
+				if(ob) {						
+					VECCOPY(co, xyz);	
+					if(mtex->texflag & MTEX_OB_DUPLI_ORIG) {
+						if(shi->obi && shi->obi->duplitexmat)
+							MTC_Mat4MulVecfl(shi->obi->duplitexmat, co);					
+					} 
+					MTC_Mat4MulVecfl(ob->imat, co);
+				}
+			}
+			else if(mtex->texco==TEXCO_GLOB) {							
+			   VECCOPY(co, xyz);		
+			}
+			else continue;	// can happen when texco defines disappear and it renders old files
+
+			texres.nor= NULL;
+			
+			if(tex->type==TEX_IMAGE) {
+				continue;	/* not supported yet */
+			}
+			else {
+				/* placement */
+				if(mtex->projx) texvec[0]= mtex->size[0]*(co[mtex->projx-1]+mtex->ofs[0]);
+				else texvec[0]= mtex->size[0]*(mtex->ofs[0]);
+
+				if(mtex->projy) texvec[1]= mtex->size[1]*(co[mtex->projy-1]+mtex->ofs[1]);
+				else texvec[1]= mtex->size[1]*(mtex->ofs[1]);
+
+				if(mtex->projz) texvec[2]= mtex->size[2]*(co[mtex->projz-1]+mtex->ofs[2]);
+				else texvec[2]= mtex->size[2]*(mtex->ofs[2]);
+			}
+			
+
+			rgbnor= multitex(tex, co, NULL, NULL, 0, &texres);	/* NULL = dxt/dyt, 0 = shi->osatex - not supported */
+			
+			/* texture output */
+
+			if( (rgbnor & TEX_RGB) && (mtex->texflag & MTEX_RGBTOINT)) {
+				texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);
+				rgbnor-= TEX_RGB;
+			}
+			if(mtex->texflag & MTEX_NEGATIVE) {
+				if(rgbnor & TEX_RGB) {
+					texres.tr= 1.0-texres.tr;
+					texres.tg= 1.0-texres.tg;
+					texres.tb= 1.0-texres.tb;
+				}
+				texres.tin= 1.0-texres.tin;
+			}
+			if(mtex->texflag & MTEX_STENCIL) {
+				if(rgbnor & TEX_RGB) {
+					fact= texres.ta;
+					texres.ta*= stencilTin;
+					stencilTin*= fact;
+				}
+				else {
+					fact= texres.tin;
+					texres.tin*= stencilTin;
+					stencilTin*= fact;
+				}
+			}
+			
+			
+			if(mtex->mapto & (MAP_COL)) {
+				float tcol[3], colfac;
+				
+				/* stencil maps on the texture control slider, not texture intensity value */
+				colfac= mtex->colfac*stencilTin;
+				
+				tcol[0]=texres.tr; tcol[1]=texres.tg; tcol[2]=texres.tb;
+				
+				if((rgbnor & TEX_RGB)==0) {
+					tcol[0]= mtex->r;
+					tcol[1]= mtex->g;
+					tcol[2]= mtex->b;
+				}
+				else if(mtex->mapto & MAP_ALPHA) {
+					texres.tin= stencilTin;
+				}
+				else texres.tin= texres.ta;
+				
+				if(mtex->mapto & MAP_COL) {
+					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
+				}
+			}
+			
+			if(mtex->mapto & MAP_VARS) {
+				/* stencil maps on the texture control slider, not texture intensity value */
+				float varfac= mtex->varfac*stencilTin;
+				
+				if(rgbnor & TEX_RGB) {
+					if(texres.talpha) texres.tin= texres.ta;
+					else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);
+				}
+				
+				if(mtex->mapto & MAP_EMIT) {
+					int flip= mtex->maptoneg & MAP_EMIT;
+
+					*emit = texture_value_blend(mtex->def_var, *emit, texres.tin, varfac, mtex->blendtype, flip);
+					if(*emit<0.0) *emit= 0.0;
+				}
+				if(mtex->mapto & MAP_ALPHA) {
+					int flip= mtex->maptoneg & MAP_ALPHA;
+
+					*alpha = texture_value_blend(mtex->def_var, *alpha, texres.tin, varfac, mtex->blendtype, flip);
+					CLAMP(*alpha, 0.0, 1.0);
+				}
+			}
+		}
+	}
+}
 
 void do_material_tex(ShadeInput *shi)
 {
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
new file mode 100644
index 00000000000..3ca8c0a0693
--- /dev/null
+++ b/source/blender/render/intern/source/volumetric.c
@@ -0,0 +1,400 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Farsthary (Raul FHernandez), Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include <float.h>
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "BLI_rand.h"
+
+#include "RE_shader_ext.h"
+#include "RE_raytrace.h"
+
+#include "DNA_material_types.h"
+#include "DNA_group_types.h"
+#include "DNA_lamp_types.h"
+
+#include "render_types.h"
+#include "shading.h"
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
+/* only to be used here in this file, it's for speed */
+extern struct Render R;
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
+{
+	VlakRen *vlr = (VlakRen *)face;
+	
+	/* only consider faces away, so overlapping layers
+	 * of foward facing geometry don't cause the ray to stop */
+	return (INPR(is->vec, vlr->n) < 0.0f);
+}
+
+#define VOL_IS_SAMEOBJECT		1
+#define VOL_IS_SAMEMATERIAL		2
+
+int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco)
+{
+	/* TODO: Box or sphere intersection types could speed things up */
+
+	/* raytrace method */
+	Isect isect;
+	float maxsize = RE_ray_tree_max_size(R.raytree);
+
+	/* TODO: use object's bounding box to calculate max size */
+	VECCOPY(isect.start, co);
+	isect.end[0] = co[0] + vec[0] * maxsize;
+	isect.end[1] = co[1] + vec[1] * maxsize;
+	isect.end[2] = co[2] + vec[2] * maxsize;
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.faceorig= (RayFace*)shi->vlr;
+	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect.face_last= NULL;
+	isect.ob_last= 0;
+	isect.lay= -1;
+	
+	if(RE_ray_tree_intersect(R.raytree, &isect))
+	{
+		float isvec[3];
+
+		VECCOPY(isvec, isect.vec);
+		hitco[0] = isect.start[0] + isect.labda*isvec[0];
+		hitco[1] = isect.start[1] + isect.labda*isvec[1];
+		hitco[2] = isect.start[2] + isect.labda*isvec[2];
+		
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+float vol_get_density(struct ShadeInput *shi, float *co)
+{
+	float density = shi->mat->alpha;
+	float emit_fac=0.0f;
+	float col[3] = {0.0, 0.0, 0.0};
+	
+	/* do any density gain stuff here */
+	
+	do_volume_tex(shi, co, col, &density, &emit_fac);
+	
+	return density;
+}
+
+
+/* compute emission component, amount of radiance to add per segment
+ * can be textured with 'emit' */
+void vol_get_emission(ShadeInput *shi, float *em, float *co, float *endco, float density)
+{
+	float emission = shi->mat->emit;
+	float col[3] = {0.0, 0.0, 0.0};
+	float dens_dummy = 1.0f;
+	
+	do_volume_tex(shi, co, col, &dens_dummy, &emission);
+	
+	em[0] = em[1] = em[2] = emission;
+}
+
+
+/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
+ * Used in the relationship Transmittance = e^(-attenuation)
+ * can be textured with 'alpha' */
+void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, float density, float stepsize)
+{
+	/* input density = density at co */
+
+	float dist;
+	float absorption = shi->mat->vol_absorption;
+	int s, nsteps;
+	float step_vec[3], step_sta[3], step_end[3];
+
+	dist = VecLenf(co, endco);
+
+	nsteps = (int)ceil(dist / stepsize);
+	
+	if (nsteps == 1) {
+		/* homogenous volume within the sampled distance */
+		tau[0] = tau[1] = tau[2] = dist * density;
+		VecMulf(tau, absorption);
+		return;
+	} else {
+		tau[0] = tau[1] = tau[2] = 0.0;
+	}
+	
+	VecSubf(step_vec, endco, co);
+	VecMulf(step_vec, 1.0f / nsteps);
+	
+	VECCOPY(step_sta, co);
+	VecAddf(step_end, step_sta, step_vec);
+	
+	for (s = 0;  s < nsteps; s++) {
+		
+		if (s > 0) density = vol_get_density(shi, step_sta);
+		
+		tau[0] += stepsize * density;
+		tau[1] += stepsize * density;
+		tau[2] += stepsize * density;
+		
+		if (s < nsteps-1) {
+			VECCOPY(step_sta, step_end);
+			VecAddf(step_end, step_end, step_vec);
+		}
+	}
+	VecMulf(tau, absorption);	
+}
+
+void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *col, float stepsize, float density)
+{
+	float visifac, lv[3], lampdist;
+	float lacol[3];
+	float tau[3], tr[3]={1.0,1.0,1.0};
+	float hitco[3], *atten_co;
+	
+	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
+	if ((lar->lay & shi->lay)==0) return;
+	if (lar->energy == 0.0) return;
+	
+	visifac= lamp_get_visibility(lar, co, lv, &lampdist);
+	if(visifac==0.0f) return;
+
+	lacol[0] = lar->r;
+	lacol[1] = lar->g;
+	lacol[2] = lar->b;
+	
+	if(lar->mode & LA_TEXTURE) {
+		shi->osatex= 0;
+		do_lamp_tex(lar, lv, shi, lacol);
+	}
+	
+	VecMulf(lacol, visifac*lar->energy);
+
+	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
+		/* find minimum of volume bounds, or lamp coord */
+		
+		if (ELEM(lar->type, LA_SUN, LA_HEMI))
+			VECCOPY(lv, lar->vec);
+		
+		VecMulf(lv, -1.0f);
+		
+		if (vol_get_bounds(shi, co, lv, hitco)) {
+			if (ELEM(lar->type, LA_SUN, LA_HEMI))
+				atten_co = hitco;
+			else if ( lampdist < VecLenf(co, hitco) )
+				atten_co = lar->co;
+			else
+				atten_co = hitco;
+
+			atten_co = lar->co;
+
+			vol_get_attenuation(shi, tau, co, atten_co, density, shi->mat->vol_shade_stepsize);
+			tr[0] = exp(-tau[0]);
+			tr[1] = exp(-tau[1]);
+			tr[2] = exp(-tau[2]);
+			
+			VecMulVecf(lacol, lacol, tr);
+		}
+		else {
+			/* point is on the outside edge of the volume,
+			 * therefore no attenuation, full transmission
+			 * radiance from lamp remains unchanged */
+		}
+	}
+	
+	VecAddf(col, col, lacol);
+}		
+
+/* shadows -> trace a ray to find blocker geometry
+   - if blocker is outside the volume, use standard shadow functions
+   - if blocker is inside the volume, use raytracing
+    -- (deep shadow maps could potentially slot in here too I suppose)
+   - attenuate from current point, to blocked point or volume bounds
+*/
+
+/* single scattering only for now */
+void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float *endco, float stepsize, float density)
+{
+	GroupObject *go;
+	ListBase *lights;
+	LampRen *lar;
+	float col[3] = {0.f, 0.f, 0.f};
+	
+	lights= get_lights(shi);
+	for(go=lights->first; go; go= go->next)
+	{
+		float lacol[3] = {0.f, 0.f, 0.f};
+	
+		lar= go->lampren;
+		if (lar==NULL) continue;
+		
+		vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
+		
+		/* isotropic phase function */
+		VecMulf(lacol, 1.0f / (4.f * M_PI));
+	
+		VecMulf(lacol, density);
+		
+		VecAddf(col, col, lacol);
+	}
+	
+	
+		
+	VECCOPY(scatter, col);
+}
+
+
+
+static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
+{
+	float total_tau;
+	float total_tr[3];
+	float tr[3] = {1.f, 1.f, 1.f};			/* total transmittance */
+	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
+	float stepsize = shi->mat->vol_stepsize;
+	int nsteps;
+	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
+	float step_tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
+	int s;
+	float step_sta[3], step_end[3], step_offs[3] = {0.0, 0.0, 0.0};
+	float alpha_fac, emit_fac=0.0f, tex_col[3];
+	
+	/* multiply col_behind with beam transmittance over entire distance */
+/*
+	// get col_behind
+	
+	// get total transmittance
+	vol_get_attenuation(shi, total_tau, start, dist, stepsize);
+	total_tr[0] = exp(-total_tau[0]);
+	total_tr[1] = exp(-total_tau[1]);
+	total_tr[2] = exp(-total_tau[2]);
+	VecMulVecf(radiance, total_tr, col_behind);
+*/	
+	
+	/* ray marching */
+	nsteps = (int)ceil(VecLenf(co, endco) / stepsize);
+	
+	VecSubf(vec, endco, co);
+	VECCOPY(stepvec, vec);
+	VecMulf(stepvec, 1.0f / nsteps);
+	
+	VECCOPY(step_sta, co);
+	VecAddf(step_end, step_sta, stepvec);
+	
+	
+	/* get radiance from all points along the ray due to participating media */
+	for (s = 0; s < nsteps; s++) {
+		float density = vol_get_density(shi, step_sta);
+		
+		/* *** transmittance and emission *** */
+		
+		/* transmittance component (alpha) */
+		vol_get_attenuation(shi, step_tau, step_sta, step_end, density, stepsize);
+		tr[0] *= exp(-step_tau[0]);
+		tr[1] *= exp(-step_tau[1]);
+		tr[2] *= exp(-step_tau[2]);
+		
+		/* Terminate raymarching if transmittance is small */
+		//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
+		
+		/* incoming light via emission or scattering (additive) */
+		vol_get_emission(shi, step_emit, step_sta, step_end, density);
+		vol_get_scattering(shi, step_scatter, step_end, step_end, stepsize, density);
+		
+		VecAddf(d_radiance, step_emit, step_scatter);
+		
+		/*   Lv += Tr * (Lve() + Ld) */
+		VecMulVecf(d_radiance, tr, d_radiance);
+		VecAddf(radiance, radiance, d_radiance);	
+
+		if (s < nsteps-1) {
+			VECCOPY(step_sta, step_end);
+			VecAddf(step_end, step_end, stepvec);
+		}
+	}
+	
+	VecMulf(radiance, stepsize);
+	VECCOPY(col, radiance);
+	
+	/*
+	Incoming radiance = 
+		  outgoing radiance from behind surface * beam transmittance/attenuation
+		
+		+ added radiance from all points along the ray due to participating media
+		    --> radiance for each segment = 
+					  radiance added by scattering 
+					+ radiance added by emission
+					* beam transmittance/attenuation
+	
+	
+	-- To find transmittance:
+		compute optical thickness with tau (perhaps involving monte carlo integration)
+		return exp(-tau)
+		
+	-- To find radiance from segments along the way:
+		find radiance for one step:
+		  - loop over lights and weight by phase function
+
+		  - single scattering
+		    : integrate over sphere
+		
+		then multiply each step for final exit radiance
+		*/
+}
+
+void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
+{
+	Isect isect;
+	float hitco[3], col[3];
+
+	memset(shr, 0, sizeof(ShadeResult));
+
+	if (vol_get_bounds(shi, shi->co, shi->view, hitco)) {
+		
+		volumeintegrate(shi, col, shi->co, hitco);
+		
+		/* hit */
+		shr->alpha = 1.0f;
+		shr->combined[0] = col[0];
+		shr->combined[1] = col[1];
+		shr->combined[2] = col[2];
+		
+		QUATCOPY(shr->diff, shr->combined);
+	}
+	else {
+		/* no hit */
+		shr->combined[0] = 0.0f;
+		shr->combined[1] = 0.0f;
+		shr->combined[2] = 0.0f;
+		shr->combined[3] = shr->alpha =  0.0f;
+	}
+}
\ No newline at end of file
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 6d5e1a62ad4..bdb2fe5a3f3 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -3383,6 +3383,10 @@ static void material_panel_map_to(Object *ob, Material *ma, int from_nodes)
 		uiDefButBitS(block, TOG, 1, B_MATPRV, "PAttr",		250,160,60,19, &pattr, 0, 0, 0, 0, "Display settings for particle attributes");
 		uiBlockSetCol(block, TH_AUTO);
 	}
+	else if (ma->material_type == MA_VOLUME) {
+		uiDefButBitS(block, TOG3, MAP_ALPHA, B_MATPRV, "Density",		10,180,60,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the alpha value");
+		uiDefButBitS(block, TOG3, MAP_EMIT, B_MATPRV, "Emit",		70,180,45,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the emit value");
+	}
 	else {
 		uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col",		10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material");
 		uiDefButBitS(block, TOG3, MAP_NORM, B_MATPRV, "Nor",		50,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the rendered normal");
@@ -3499,37 +3503,43 @@ static void material_panel_map_input(Object *ob, Material *ma)
 	
 	/* TEXCO */
 	uiBlockBeginAlign(block);
-	uiDefButS(block, ROW, B_MATPRV, "Glob",			630,180,45,18, &(mtex->texco), 4.0, (float)TEXCO_GLOB, 0, 0, "Uses global coordinates for the texture coordinates");
-	uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
-	if(mtex->texco == TEXCO_UV && !(mtex->texflag & MTEX_DUPLI_MAPTO)) {
-		if(!verify_valid_uv_name(mtex->uvname))
-            uiBlockSetCol(block, TH_REDALERT);
-		but=uiDefBut(block, TEX, B_MATPRV, "UV:", 750,180,158,18, mtex->uvname, 0, 31, 0, 0, "Set name of UV layer to use, default is active UV layer");
-		uiButSetCompleteFunc(but, autocomplete_uv, NULL);
-		uiBlockSetCol(block, TH_AUTO);
-	}
-	else
+	
+	if (ma->material_type == MA_VOLUME) {
+		uiDefButS(block, ROW, B_MATPRV, "Glob",			630,180,45,18, &(mtex->texco), 4.0, (float)TEXCO_GLOB, 0, 0, "Uses global coordinates for the texture coordinates");
+		uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
 		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_MATPRV, "Ob:",750,180,158,18, &(mtex->object), "");
-	
-	uiDefButS(block, ROW, B_MATPRV, "UV",			630,160,40,18, &(mtex->texco), 4.0, (float)TEXCO_UV, 0, 0, "Uses UV coordinates for texture coordinates");
-	uiDefButS(block, ROW, B_MATPRV, "Orco",			670,160,55,18, &(mtex->texco), 4.0, (float)TEXCO_ORCO, 0, 0, "Uses the original undeformed coordinates of the object");
-	if( ob->particlesystem.first )
-		uiDefButS(block, ROW, B_MATPRV, "Strand",	725,160,50,18, &(mtex->texco), 4.0, (float)TEXCO_STRAND, 0, 0, "Uses normalized strand texture coordinate (1D)");
-	else
-		uiDefButS(block, ROW, B_MATPRV, "Stick",	725,160,50,18, &(mtex->texco), 4.0, (float)TEXCO_STICKY, 0, 0, "Uses mesh's sticky coordinates for the texture coordinates");
-	uiDefButS(block, ROW, B_MATPRV, "Win",			775,160,45,18, &(mtex->texco), 4.0, (float)TEXCO_WINDOW, 0, 0, "Uses screen coordinates as texture coordinates");
-	uiDefButS(block, ROW, B_MATPRV, "Nor",			820,160,44,18, &(mtex->texco), 4.0, (float)TEXCO_NORM, 0, 0, "Uses normal vector as texture coordinates");
-	uiDefButS(block, ROW, B_MATPRV, "Refl",			864,160,44,18, &(mtex->texco), 4.0, (float)TEXCO_REFL, 0, 0, "Uses reflection vector as texture coordinates");
-	
-	uiDefButS(block, ROW, B_MATPRV, "Stress",		630,140,70,18, &(mtex->texco), 4.0, (float)TEXCO_STRESS, 0, 0, "Uses the difference of edge lengths compared to original coordinates of the mesh");
-	uiDefButS(block, ROW, B_MATPRV, "Tangent",		700,140,70,18, &(mtex->texco), 4.0, (float)TEXCO_TANGENT, 0, 0, "Uses the optional tangent vector as texture coordinates");
-	uiBlockEndAlign(block);
-
-	if(ELEM(mtex->texco, TEXCO_UV, TEXCO_ORCO))
-		uiDefButBitS(block, TOG, MTEX_DUPLI_MAPTO, B_MATPRV, "From Dupli",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent");
-	else if(mtex->texco == TEXCO_OBJECT)
-		uiDefButBitS(block, TOG, MTEX_OB_DUPLI_ORIG, B_MATPRV, "From Original",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "Dupli's derive their object coordinates from the original objects transformation");
+	} else {
+		uiDefButS(block, ROW, B_MATPRV, "Glob",			630,180,45,18, &(mtex->texco), 4.0, (float)TEXCO_GLOB, 0, 0, "Uses global coordinates for the texture coordinates");
+		uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
+		if(mtex->texco == TEXCO_UV && !(mtex->texflag & MTEX_DUPLI_MAPTO)) {
+			if(!verify_valid_uv_name(mtex->uvname))
+				uiBlockSetCol(block, TH_REDALERT);
+			but=uiDefBut(block, TEX, B_MATPRV, "UV:", 750,180,158,18, mtex->uvname, 0, 31, 0, 0, "Set name of UV layer to use, default is active UV layer");
+			uiButSetCompleteFunc(but, autocomplete_uv, NULL);
+			uiBlockSetCol(block, TH_AUTO);
+		}
+		else
+			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_MATPRV, "Ob:",750,180,158,18, &(mtex->object), "");
+		
+		uiDefButS(block, ROW, B_MATPRV, "UV",			630,160,40,18, &(mtex->texco), 4.0, (float)TEXCO_UV, 0, 0, "Uses UV coordinates for texture coordinates");
+		uiDefButS(block, ROW, B_MATPRV, "Orco",			670,160,55,18, &(mtex->texco), 4.0, (float)TEXCO_ORCO, 0, 0, "Uses the original undeformed coordinates of the object");
+		if( ob->particlesystem.first )
+			uiDefButS(block, ROW, B_MATPRV, "Strand",	725,160,50,18, &(mtex->texco), 4.0, (float)TEXCO_STRAND, 0, 0, "Uses normalized strand texture coordinate (1D)");
+		else
+			uiDefButS(block, ROW, B_MATPRV, "Stick",	725,160,50,18, &(mtex->texco), 4.0, (float)TEXCO_STICKY, 0, 0, "Uses mesh's sticky coordinates for the texture coordinates");
+		uiDefButS(block, ROW, B_MATPRV, "Win",			775,160,45,18, &(mtex->texco), 4.0, (float)TEXCO_WINDOW, 0, 0, "Uses screen coordinates as texture coordinates");
+		uiDefButS(block, ROW, B_MATPRV, "Nor",			820,160,44,18, &(mtex->texco), 4.0, (float)TEXCO_NORM, 0, 0, "Uses normal vector as texture coordinates");
+		uiDefButS(block, ROW, B_MATPRV, "Refl",			864,160,44,18, &(mtex->texco), 4.0, (float)TEXCO_REFL, 0, 0, "Uses reflection vector as texture coordinates");
+		
+		uiDefButS(block, ROW, B_MATPRV, "Stress",		630,140,70,18, &(mtex->texco), 4.0, (float)TEXCO_STRESS, 0, 0, "Uses the difference of edge lengths compared to original coordinates of the mesh");
+		uiDefButS(block, ROW, B_MATPRV, "Tangent",		700,140,70,18, &(mtex->texco), 4.0, (float)TEXCO_TANGENT, 0, 0, "Uses the optional tangent vector as texture coordinates");
+		uiBlockEndAlign(block);
 
+		if(ELEM(mtex->texco, TEXCO_UV, TEXCO_ORCO))
+			uiDefButBitS(block, TOG, MTEX_DUPLI_MAPTO, B_MATPRV, "From Dupli",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent");
+		else if(mtex->texco == TEXCO_OBJECT)
+			uiDefButBitS(block, TOG, MTEX_OB_DUPLI_ORIG, B_MATPRV, "From Original",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "Dupli's derive their object coordinates from the original objects transformation");
+	}
 
 	/* COORDS */
 	uiBlockBeginAlign(block);
@@ -4111,7 +4121,7 @@ static uiBlock *strand_menu(void *mat_v)
 }
 
 
-static void material_panel_material(Material *ma)
+static void material_panel_material_solid(Material *ma)
 {
 	uiBlock *block;
 	float *colpoin = NULL;
@@ -4199,6 +4209,43 @@ static void material_panel_material(Material *ma)
 
 }
 
+static void material_panel_material_volume(Material *ma)
+{
+	uiBlock *block;
+	short yco=PANEL_YMAX;
+ 	
+ 	block= uiNewBlock(&curarea->uiblocks, "material_panel_material_volume", UI_EMBOSS, UI_HELV, curarea->win);
+	if(uiNewPanel(curarea, block, "Volume", "Material", PANELX, PANELY, PANELW, PANELH)==0) return;
+	
+	uiSetButLock(ma->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
+	
+	uiBlockBeginAlign(block);
+	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
+	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base opacity value");
+	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 5.0, 0, 0, "Multiplier for absorption");
+	uiBlockEndAlign(block);
+	
+	yco -= YSPACE;
+	
+	uiDefButF(block, NUMSLI, B_MATPRV, "Emit: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->emit), 0.0, 2.0, 0, 0, "Emission component");
+	
+	yco -= YSPACE;
+		
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Shading",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
+	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
+	uiBlockEndAlign(block);
+
+	uiDefBut(block, LABEL, B_DIFF, "",
+		X2CLM2, yco, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+}
+
 static void material_panel_nodes(Material *ma)
 {
 	bNode *node;
@@ -4237,7 +4284,7 @@ static void material_panel_links(Object *ob, Material *ma)
 	
 	block= uiNewBlock(&curarea->uiblocks, "material_panel_links", UI_EMBOSS, UI_HELV, curarea->win);
 	/* 310 makes sorting code to put it right after preview panel */
-	if(uiNewPanel(curarea, block, "Links and Pipeline", "Material", 310, 0, 318, 204)==0) return;
+	if(uiNewPanel(curarea, block, "Links and Pipeline", "Material", 310, 0, 338, 204)==0) return;
 
 	/* Links from object to material/nodes */
 	uiDefBut(block, ROUNDBOX, 0, "",					5, 90, 310, 110, NULL, 7.0, 0.0, 15 , 20, ""); 
@@ -4330,7 +4377,10 @@ static void material_panel_links(Object *ob, Material *ma)
 	uiDefButBitI(block, TOG, MA_ONLYCAST, B_MATPRV,"OnlyCast",		85,10,75,19, &(ma->mode), 0, 0, 0, 0, "Makes faces cast shadows only, not rendered");
 	uiDefButBitI(block, TOG, MA_TRACEBLE, B_NOP,"Traceable",	160,10,75,19, &(ma->mode), 0, 0, 0, 0, "Makes material detectable by ray tracing");
 	uiDefButBitI(block, TOG, MA_SHADBUF, B_MATPRV,	"Shadbuf",		235,10,75,19, &(ma->mode), 0, 0, 0, 0, "Makes material cast shadows from shadow buffer lamps");
-				  
+	uiBlockEndAlign(block);
+	
+	uiDefButS(block, MENU, B_MATPRV, "Material Type %t|Solid %x0|Halo %x1|Volume %x2",
+		10, -15, 300, 20, &(ma->material_type), 0.0, 0.0, 0, 0, "");
 	
 }
 
@@ -4388,21 +4438,26 @@ void material_panels()
 		
 		ma= editnode_get_active_material(ma);
 		if(ma) {
-			material_panel_material(ma);
-			material_panel_ramps(ma);
-			material_panel_shading(ma);
-			
-			if (G.scene->r.renderer==R_INTERN)
-				material_panel_tramir(ma);
-			else {
-				if(ma->YF_ar==0.f) {
-					ma->YF_ar = ma->YF_ag = ma->YF_ab = 1;
-					ma->YF_dscale = 1;
+			if (ma->material_type == MA_SOLID) {
+				material_panel_material_solid(ma);
+				material_panel_ramps(ma);
+				material_panel_shading(ma);
+				
+				if (G.scene->r.renderer==R_INTERN)
+					material_panel_tramir(ma);
+				else {
+					if(ma->YF_ar==0.f) {
+						ma->YF_ar = ma->YF_ag = ma->YF_ab = 1;
+						ma->YF_dscale = 1;
+					}
+					material_panel_tramir_yafray(ma);
 				}
-				material_panel_tramir_yafray(ma);
-			}
 
-			material_panel_sss(ma);
+				material_panel_sss(ma);
+				
+			} else if (ma->material_type == MA_VOLUME) {
+				material_panel_material_volume(ma);
+			}
 			material_panel_texture(ob, ma);
 			
 			mtex= ma->mtex[ ma->texact ];
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c
index 1730bb890bc..dacb26b99a4 100644
--- a/source/blender/src/previewrender.c
+++ b/source/blender/src/previewrender.c
@@ -315,6 +315,8 @@ static Scene *preview_prepare_scene(RenderInfo *ri, int id_type, ID *id, int pr_
 				/* turn on raytracing if needed */
 				if(mat->mode_l & (MA_RAYTRANSP|MA_RAYMIRROR))
 					sce->r.mode |= R_RAYTRACE;
+				if(mat->material_type == MA_VOLUME)
+					sce->r.mode |= R_RAYTRACE;
 				if(mat->sss_flag & MA_DIFF_SSS)
 					sce->r.mode |= R_SSS;
 				

From 50d0e1a988a55a7e7a59823c030ce9ac3413a9a2 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 23 Sep 2008 04:26:52 +0000
Subject: [PATCH 002/577] * Volumetrics update

- Fixed a shading bug, due to issues in the raytrace engine where it would ignore
intersections from the starting face (as it should). Disabled this for single
scattering intersections, thanks to Brecht for a hint there. It still shows a
little bit of noise, I think due to raytrace inaccuracy, which will have to be
fixed up later.

before: http://mke3.net/blender/devel/rendering/volumetrics/vol_shaded_old.png
after: http://mke3.net/blender/devel/rendering/volumetrics/vol_shaded_correct.png

Now single scatttering shading works very nicely and is capable of things like this:
http://mke3.net/blender/devel/rendering/volumetrics/vol_shaded_clouds.mov

- Added colour emission. Now as well as the overall 'Emit:' slider to control
overall emission strength, there's also a colour swatch for the volume to emit
that colour. This can also be textured, using 'Emit Col' in the map to panel.

This animation was made using a clouds texture, with colour band, mapped to both
emit colour and emit (strength):
http://mke3.net/blender/devel/rendering/volumetrics/vol_col_emit.mov

- Added 'Local' mapping to 'map input' - it's similar to Orco

- Fixed texture 'map input', wasn't using the offsets or scale values.
---
 source/blender/makesdna/DNA_material_types.h  |  3 +
 .../render/intern/source/convertblender.c     | 24 +++++++
 .../blender/render/intern/source/raytrace.c   |  2 +-
 source/blender/render/intern/source/texture.c | 16 ++++-
 .../blender/render/intern/source/volumetric.c | 71 ++++++++++---------
 source/blender/src/buttons_shading.c          | 20 +++++-
 6 files changed, 97 insertions(+), 39 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index ee4779779ec..98ddc0aa7d3 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -69,6 +69,8 @@ typedef struct Material {
 	float vol_alphathresh;
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_absorption, vol_scattering;
+	float vol_absorption_col[3];
+	float vpad2;
 	short vol_shadeflag;
 	short vpad;
 	
@@ -163,6 +165,7 @@ typedef struct Material {
 /* flag */
 		/* for render */
 #define MA_IS_USED		1
+#define MA_IS_TEXTURED	2
 
 /* material_type */
 #define MA_SOLID		0
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index a752561218c..17cd71ecb79 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -921,6 +921,28 @@ static void flag_render_node_material(Render *re, bNodeTree *ntree)
 	}
 }
 
+static void check_material_is_textured(Material *ma)
+{
+	MTex *mtex;
+	Tex *tex;
+	int tex_nr;
+	
+	for(tex_nr=0; tex_nr<MAX_MTEX; tex_nr++) {
+		if(ma->septex & (1<<tex_nr))
+			continue;
+		
+		if(ma->mtex[tex_nr]) {
+			mtex= ma->mtex[tex_nr];
+			tex= mtex->tex;
+			if(tex==NULL)
+				continue;
+			else
+				ma->flag |= MA_IS_TEXTURED;
+				return;
+		}
+	}
+}
+
 static Material *give_render_material(Render *re, Object *ob, int nr)
 {
 	extern Material defmaterial;	/* material.c */
@@ -943,6 +965,8 @@ static Material *give_render_material(Render *re, Object *ob, int nr)
 	
 	if (ma->material_type == MA_VOLUME) re->r.mode |= R_RAYTRACE;
 	
+	check_material_is_textured(ma);
+	
 	return ma;
 }
 
diff --git a/source/blender/render/intern/source/raytrace.c b/source/blender/render/intern/source/raytrace.c
index ec47df74d04..d14d221b099 100644
--- a/source/blender/render/intern/source/raytrace.c
+++ b/source/blender/render/intern/source/raytrace.c
@@ -931,7 +931,7 @@ int RE_ray_face_intersection(Isect *is, RayObjectTransformFunc transformfunc, Ra
 		intersection to be detected in its neighbour face */
 		
 		if(is->facecontr && is->faceisect);	// optimizing, the tests below are not needed
-		else if(is->labda< .1) {
+		else if(is->labda< .1 && is->faceorig) {
 			RayFace *face= is->faceorig;
 			float *origv1, *origv2, *origv3, *origv4;
 			short de= 0;
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index e874f98ede1..6d3cc57cd32 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1485,8 +1485,20 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float
 					MTC_Mat4MulVecfl(ob->imat, co);
 				}
 			}
+			/* not really orco, but 'local' */
+			else if(mtex->texco==TEXCO_ORCO) {
+				
+				if(mtex->texflag & MTEX_DUPLI_MAPTO) {
+					VECCOPY(co, shi->duplilo);
+				}
+				else {
+					Object *ob= shi->obi->ob;
+					VECCOPY(co, xyz);
+					MTC_Mat4MulVecfl(ob->imat, co);
+				}
+			}
 			else if(mtex->texco==TEXCO_GLOB) {							
-			   VECCOPY(co, xyz);		
+			   VECCOPY(co, xyz);
 			}
 			else continue;	// can happen when texco defines disappear and it renders old files
 
@@ -1508,7 +1520,7 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float
 			}
 			
 
-			rgbnor= multitex(tex, co, NULL, NULL, 0, &texres);	/* NULL = dxt/dyt, 0 = shi->osatex - not supported */
+			rgbnor= multitex(tex, texvec, NULL, NULL, 0, &texres);	/* NULL = dxt/dyt, 0 = shi->osatex - not supported */
 			
 			/* texture output */
 
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 3ca8c0a0693..298b08c3545 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -42,8 +42,11 @@
 #include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
 
+#include "BKE_global.h"
+
 #include "render_types.h"
 #include "shading.h"
+#include "texture.h"
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
@@ -51,6 +54,7 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#if 0
 static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 {
 	VlakRen *vlr = (VlakRen *)face;
@@ -59,11 +63,16 @@ static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 	 * of foward facing geometry don't cause the ray to stop */
 	return (INPR(is->vec, vlr->n) < 0.0f);
 }
+#endif
 
 #define VOL_IS_SAMEOBJECT		1
 #define VOL_IS_SAMEMATERIAL		2
 
-int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco)
+
+#define VOL_BOUNDS_DEPTH	0
+#define VOL_BOUNDS_SS		1
+
+int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, int intersect_type)
 {
 	/* TODO: Box or sphere intersection types could speed things up */
 
@@ -77,8 +86,10 @@ int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco)
 	isect.end[1] = co[1] + vec[1] * maxsize;
 	isect.end[2] = co[2] + vec[2] * maxsize;
 	
+	if (intersect_type == VOL_BOUNDS_DEPTH) isect.faceorig= (RayFace*)shi->vlr;
+	else if (intersect_type == VOL_BOUNDS_SS) isect.faceorig= NULL;
+	
 	isect.mode= RE_RAY_MIRROR;
-	isect.faceorig= (RayFace*)shi->vlr;
 	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
 	isect.face_last= NULL;
 	isect.ob_last= 0;
@@ -106,8 +117,8 @@ float vol_get_density(struct ShadeInput *shi, float *co)
 	float col[3] = {0.0, 0.0, 0.0};
 	
 	/* do any density gain stuff here */
-	
-	do_volume_tex(shi, co, col, &density, &emit_fac);
+	if (shi->mat->flag & MA_IS_TEXTURED)
+		do_volume_tex(shi, co, col, &density, &emit_fac);
 	
 	return density;
 }
@@ -115,15 +126,18 @@ float vol_get_density(struct ShadeInput *shi, float *co)
 
 /* compute emission component, amount of radiance to add per segment
  * can be textured with 'emit' */
-void vol_get_emission(ShadeInput *shi, float *em, float *co, float *endco, float density)
+void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 {
 	float emission = shi->mat->emit;
-	float col[3] = {0.0, 0.0, 0.0};
+	float col[3];
 	float dens_dummy = 1.0f;
 	
+	VECCOPY(col, &shi->mat->r);
+	
 	do_volume_tex(shi, co, col, &dens_dummy, &emission);
 	
 	em[0] = em[1] = em[2] = emission;
+	VecMulVecf(em, em, col);
 }
 
 
@@ -133,7 +147,6 @@ void vol_get_emission(ShadeInput *shi, float *em, float *co, float *endco, float
 void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, float density, float stepsize)
 {
 	/* input density = density at co */
-
 	float dist;
 	float absorption = shi->mat->vol_absorption;
 	int s, nsteps;
@@ -194,29 +207,29 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	
 	if(lar->mode & LA_TEXTURE) {
 		shi->osatex= 0;
-		do_lamp_tex(lar, lv, shi, lacol);
+		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
 	}
 	
 	VecMulf(lacol, visifac*lar->energy);
 
+
 	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
-		/* find minimum of volume bounds, or lamp coord */
 		
 		if (ELEM(lar->type, LA_SUN, LA_HEMI))
 			VECCOPY(lv, lar->vec);
-		
 		VecMulf(lv, -1.0f);
 		
-		if (vol_get_bounds(shi, co, lv, hitco)) {
+		/* find minimum of volume bounds, or lamp coord */
+		if (vol_get_bounds(shi, co, lv, hitco, VOL_BOUNDS_SS)) {
+			float dist = VecLenf(co, hitco);
+			
 			if (ELEM(lar->type, LA_SUN, LA_HEMI))
 				atten_co = hitco;
-			else if ( lampdist < VecLenf(co, hitco) )
+			else if ( lampdist < dist ) {
 				atten_co = lar->co;
-			else
+			} else
 				atten_co = hitco;
 
-			atten_co = lar->co;
-
 			vol_get_attenuation(shi, tau, co, atten_co, density, shi->mat->vol_shade_stepsize);
 			tr[0] = exp(-tau[0]);
 			tr[1] = exp(-tau[1]);
@@ -232,7 +245,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	}
 	
 	VecAddf(col, col, lacol);
-}		
+}
 
 /* shadows -> trace a ray to find blocker geometry
    - if blocker is outside the volume, use standard shadow functions
@@ -242,7 +255,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 */
 
 /* single scattering only for now */
-void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float *endco, float stepsize, float density)
+void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
 {
 	GroupObject *go;
 	ListBase *lights;
@@ -267,8 +280,6 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float *endco
 		VecAddf(col, col, lacol);
 	}
 	
-	
-		
 	VECCOPY(scatter, col);
 }
 
@@ -276,8 +287,6 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float *endco
 
 static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
 {
-	float total_tau;
-	float total_tr[3];
 	float tr[3] = {1.f, 1.f, 1.f};			/* total transmittance */
 	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
 	float stepsize = shi->mat->vol_stepsize;
@@ -285,8 +294,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
 	float step_tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
 	int s;
-	float step_sta[3], step_end[3], step_offs[3] = {0.0, 0.0, 0.0};
-	float alpha_fac, emit_fac=0.0f, tex_col[3];
+	float step_sta[3], step_end[3];
 	
 	/* multiply col_behind with beam transmittance over entire distance */
 /*
@@ -314,7 +322,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	/* get radiance from all points along the ray due to participating media */
 	for (s = 0; s < nsteps; s++) {
 		float density = vol_get_density(shi, step_sta);
-		
+	
 		/* *** transmittance and emission *** */
 		
 		/* transmittance component (alpha) */
@@ -327,8 +335,8 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
 		
 		/* incoming light via emission or scattering (additive) */
-		vol_get_emission(shi, step_emit, step_sta, step_end, density);
-		vol_get_scattering(shi, step_scatter, step_end, step_end, stepsize, density);
+		vol_get_emission(shi, step_emit, step_sta, density);
+		vol_get_scattering(shi, step_scatter, step_end, stepsize, density);
 		
 		VecAddf(d_radiance, step_emit, step_scatter);
 		
@@ -336,10 +344,8 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		VecMulVecf(d_radiance, tr, d_radiance);
 		VecAddf(radiance, radiance, d_radiance);	
 
-		if (s < nsteps-1) {
-			VECCOPY(step_sta, step_end);
-			VecAddf(step_end, step_end, stepvec);
-		}
+		VECCOPY(step_sta, step_end);
+		VecAddf(step_end, step_end, stepvec);
 	}
 	
 	VecMulf(radiance, stepsize);
@@ -373,12 +379,11 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 
 void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 {
-	Isect isect;
 	float hitco[3], col[3];
 
 	memset(shr, 0, sizeof(ShadeResult));
 
-	if (vol_get_bounds(shi, shi->co, shi->view, hitco)) {
+	if (vol_get_bounds(shi, shi->co, shi->view, hitco, VOL_BOUNDS_DEPTH)) {
 		
 		volumeintegrate(shi, col, shi->co, hitco);
 		
@@ -397,4 +402,4 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 		shr->combined[2] = 0.0f;
 		shr->combined[3] = shr->alpha =  0.0f;
 	}
-}
\ No newline at end of file
+}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 73ff5945d25..eaf432f2397 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -3402,7 +3402,8 @@ static void material_panel_map_to(Object *ob, Material *ma, int from_nodes)
 	}
 	else if (ma->material_type == MA_VOLUME) {
 		uiDefButBitS(block, TOG3, MAP_ALPHA, B_MATPRV, "Density",		10,180,60,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the alpha value");
-		uiDefButBitS(block, TOG3, MAP_EMIT, B_MATPRV, "Emit",		70,180,45,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the emit value");
+		uiDefButBitS(block, TOG3, MAP_EMIT, B_MATPRV, "Emit",		70,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the emit value");
+		uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Emit Col",		120,180,80,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material");
 	}
 	else {
 		uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col",		10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material");
@@ -3525,6 +3526,7 @@ static void material_panel_map_input(Object *ob, Material *ma)
 		uiDefButS(block, ROW, B_MATPRV, "Glob",			630,180,45,18, &(mtex->texco), 4.0, (float)TEXCO_GLOB, 0, 0, "Uses global coordinates for the texture coordinates");
 		uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
 		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_MATPRV, "Ob:",750,180,158,18, &(mtex->object), "");
+		uiDefButS(block, ROW, B_MATPRV, "Local",		630,160,55,18, &(mtex->texco), 4.0, (float)TEXCO_ORCO, 0, 0, "Uses the original undeformed coordinates of the object");
 	} else {
 		uiDefButS(block, ROW, B_MATPRV, "Glob",			630,180,45,18, &(mtex->texco), 4.0, (float)TEXCO_GLOB, 0, 0, "Uses global coordinates for the texture coordinates");
 		uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
@@ -4241,14 +4243,26 @@ static void material_panel_material_volume(Material *ma)
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
 	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base opacity value");
-	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 5.0, 0, 0, "Multiplier for absorption");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
 	
+	uiBlockBeginAlign(block);
+	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 5.0, 0, 0, "Multiplier for absorption");
+	/* uiDefButF(block, COL, B_MATPRV, "",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption_col), 0, 0, 0, B_MATCOL, "");
+		*/
+	uiBlockEndAlign(block);
+	
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
 	uiDefButF(block, NUMSLI, B_MATPRV, "Emit: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->emit), 0.0, 2.0, 0, 0, "Emission component");
+	uiDefButF(block, COL, B_MATPRV, "",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->r), 0, 0, 0, B_MATCOL, "");
+	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
 		

From 6b4ac3e7def9e1b7e11398f483f2b64581939766 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 23 Sep 2008 07:05:06 +0000
Subject: [PATCH 003/577] * Volume colour absorption

Rather than a single absorption value to control how much light is absorbed as it
travels through a volume, there's now an additional absorption colour. This is
used to absorb different R/G/B components of light at different amounts. For
example, if a white light shines on a volume which absorbs green and blue
components, the volume will appear red.

To make it easier to use, the colour set in the UI is actually the inverse of the
absorption colour, so the colour you set is the colour that the volume will
appear as.

Here's an example of how it works:
http://mke3.net/blender/devel/rendering/volumetrics/vol_col_absorption.jpg

And this can be textured too:
http://mke3.net/blender/devel/rendering/volumetrics/vol_absorb_textured.png

Keep in mind, this doesn't use accurate spectral light wavelength mixing (just
R/G/B channels) so in cases where the absorption colour is fully red green or
blue, you'll get non-physical results.

Todo: refactor the volume texturing internal interface...
---
 source/blender/blenkernel/intern/material.c   |  1 +
 source/blender/blenloader/intern/readfile.c   | 12 ++++---
 source/blender/makesdna/DNA_material_types.h  |  2 +-
 .../blender/render/intern/include/texture.h   |  2 +-
 source/blender/render/intern/source/texture.c |  9 +++--
 .../blender/render/intern/source/volumetric.c | 35 +++++++++++++++----
 source/blender/src/buttons_shading.c          |  5 +--
 7 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 5c20858ec63..473a035ecce 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -171,6 +171,7 @@ void init_material(Material *ma)
 	ma->vol_shade_stepsize = 0.2f;
 	ma->vol_absorption = 1.0f;
 	ma->vol_scattering = 1.0f;
+	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
 
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 63f3f88da50..41035b1c373 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7737,10 +7737,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		}
 		
 		for(ma=main->mat.first; ma; ma= ma->id.next) {
-			if (ma->vol_shade_stepsize < 0.001f) ma->vol_shade_stepsize = 0.2f;
-			if (ma->vol_stepsize < 0.001f) ma->vol_stepsize = 0.2f;
-			if (ma->vol_absorption < 0.001f) ma->vol_absorption = 1.0f;
-			if (ma->vol_scattering < 0.001f) ma->vol_scattering = 1.0f;
+			/* trigger for non-volumetric file */
+			if (ma->vol_shade_stepsize < 0.0001f) {
+				ma->vol_shade_stepsize = 0.2f;
+				ma->vol_stepsize = 0.2f;
+				ma->vol_absorption = 1.0f;
+				ma->vol_scattering = 1.0f;
+				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
+			}
 		}
 	}
 	
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 98ddc0aa7d3..c322295fff9 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -302,7 +302,7 @@ typedef struct Material {
 #define MAP_AMB			2048
 #define MAP_DISPLACE	4096
 #define MAP_WARP		8192
-#define MAP_LAYER		16384
+#define MAP_LAYER		16384	
 
 /* mapto for halo */
 //#define MAP_HA_COL		1
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index 64b88c050d2..eee4ad7069a 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -56,7 +56,7 @@ void do_halo_tex(struct HaloRen *har, float xn, float yn, float *colf);
 void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, float *blend, int skyflag);
 void do_material_tex(struct ShadeInput *shi);
 void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf, int effect);
-void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float *emit);
+void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, float *alpha, float *emit);
 
 void init_render_textures(Render *re);
 
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 6d3cc57cd32..1bcefb049ae 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1451,7 +1451,7 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen
 	return in;
 }
 
-void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float *emit)
+void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, float *alpha, float *emit)
 {
 	MTex *mtex;
 	Tex *tex;
@@ -1550,7 +1550,7 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float
 			}
 			
 			
-			if(mtex->mapto & (MAP_COL)) {
+			if(mtex->mapto & (MAP_COL+MAP_COLMIR)) {
 				float tcol[3], colfac;
 				
 				/* stencil maps on the texture control slider, not texture intensity value */
@@ -1571,6 +1571,11 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *alpha, float
 				if(mtex->mapto & MAP_COL) {
 					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
 				}
+				
+				/* MAP_COLMIR is abused for absorption colour at the moment */
+				if(mtex->mapto & MAP_COLMIR) {
+					texture_rgb_blend(absorb_col, tcol, absorb_col, texres.tin, colfac, mtex->blendtype);
+				}
 			}
 			
 			if(mtex->mapto & MAP_VARS) {
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 298b08c3545..5966e10e1dd 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -115,10 +115,11 @@ float vol_get_density(struct ShadeInput *shi, float *co)
 	float density = shi->mat->alpha;
 	float emit_fac=0.0f;
 	float col[3] = {0.0, 0.0, 0.0};
+	float absorb_col[3] = {0.0, 0.0, 0.0};
 	
 	/* do any density gain stuff here */
 	if (shi->mat->flag & MA_IS_TEXTURED)
-		do_volume_tex(shi, co, col, &density, &emit_fac);
+		do_volume_tex(shi, co, col, absorb_col, &density, &emit_fac);
 	
 	return density;
 }
@@ -131,15 +132,32 @@ void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 	float emission = shi->mat->emit;
 	float col[3];
 	float dens_dummy = 1.0f;
+	float absorb_col[3] = {0.0, 0.0, 0.0};
 	
 	VECCOPY(col, &shi->mat->r);
 	
-	do_volume_tex(shi, co, col, &dens_dummy, &emission);
+	do_volume_tex(shi, co, col, absorb_col, &dens_dummy, &emission);
 	
 	em[0] = em[1] = em[2] = emission;
 	VecMulVecf(em, em, col);
 }
 
+void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
+{
+	float col[3];
+	float dummy = 1.0f;
+	float vec_one[3] = {1.0f, 1.0f, 1.0f};
+	float absorption = shi->mat->vol_absorption;
+	
+	VECCOPY(absorb_col, shi->mat->vol_absorption_col);
+	
+	if (shi->mat->flag & MA_IS_TEXTURED)
+		do_volume_tex(shi, co, col, absorb_col, &dummy, &dummy);
+	
+	absorb_col[0] = (1.0f - absorb_col[0]) * absorption;
+	absorb_col[1] = (1.0f - absorb_col[1]) * absorption;
+	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
+}
 
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
@@ -148,18 +166,20 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 {
 	/* input density = density at co */
 	float dist;
-	float absorption = shi->mat->vol_absorption;
+	float absorb_col[3];
 	int s, nsteps;
 	float step_vec[3], step_sta[3], step_end[3];
 
-	dist = VecLenf(co, endco);
+	vol_get_absorption(shi, absorb_col, co);
 
+	dist = VecLenf(co, endco);
 	nsteps = (int)ceil(dist / stepsize);
 	
 	if (nsteps == 1) {
 		/* homogenous volume within the sampled distance */
 		tau[0] = tau[1] = tau[2] = dist * density;
-		VecMulf(tau, absorption);
+		
+		VecMulVecf(tau, tau, absorb_col);
 		return;
 	} else {
 		tau[0] = tau[1] = tau[2] = 0.0;
@@ -173,7 +193,8 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	
 	for (s = 0;  s < nsteps; s++) {
 		
-		if (s > 0) density = vol_get_density(shi, step_sta);
+		if (s > 0)
+			density = vol_get_density(shi, step_sta);
 		
 		tau[0] += stepsize * density;
 		tau[1] += stepsize * density;
@@ -184,7 +205,7 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 			VecAddf(step_end, step_end, step_vec);
 		}
 	}
-	VecMulf(tau, absorption);	
+	VecMulVecf(tau, tau, absorb_col);
 }
 
 void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *col, float stepsize, float density)
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index eaf432f2397..7db44e4c0eb 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -3404,6 +3404,7 @@ static void material_panel_map_to(Object *ob, Material *ma, int from_nodes)
 		uiDefButBitS(block, TOG3, MAP_ALPHA, B_MATPRV, "Density",		10,180,60,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the alpha value");
 		uiDefButBitS(block, TOG3, MAP_EMIT, B_MATPRV, "Emit",		70,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the emit value");
 		uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Emit Col",		120,180,80,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material");
+		uiDefButBitS(block, TOG, MAP_COLMIR, B_MATPRV, "Absorb Col",		200,180,80,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material");
 	}
 	else {
 		uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col",		10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material");
@@ -4250,9 +4251,9 @@ static void material_panel_material_volume(Material *ma)
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 5.0, 0, 0, "Multiplier for absorption");
-	/* uiDefButF(block, COL, B_MATPRV, "",
+	uiDefButF(block, COL, B_MATPRV, "",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption_col), 0, 0, 0, B_MATCOL, "");
-		*/
+	
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;

From 340c3b945e5ac5ef0076f0006f8f2248bd2a327d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 23 Sep 2008 07:44:25 +0000
Subject: [PATCH 004/577] * Refactored the volume texture code. Seems to go ok
 so far, stress tests and all my old files render fine, but anyone feel free
 to let me know if you find a bug in this :)

Should be a bit faster too, this file renders in about 60% of the time
it did before
(http://mke3.net/blender/devel/rendering/volumetrics/vol_col_emit.mov)
---
 .../blender/render/intern/include/texture.h   |  2 +-
 source/blender/render/intern/source/texture.c | 28 +++++++++++--------
 .../blender/render/intern/source/volumetric.c | 16 ++++-------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index eee4ad7069a..6e1ad562c14 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -56,7 +56,7 @@ void do_halo_tex(struct HaloRen *har, float xn, float yn, float *colf);
 void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, float *blend, int skyflag);
 void do_material_tex(struct ShadeInput *shi);
 void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf, int effect);
-void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, float *alpha, float *emit);
+void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, float *val);
 
 void init_render_textures(Render *re);
 
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 1bcefb049ae..0fa8d2bf909 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1451,7 +1451,7 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen
 	return in;
 }
 
-void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, float *alpha, float *emit)
+void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, float *val)
 {
 	MTex *mtex;
 	Tex *tex;
@@ -1472,6 +1472,10 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, f
 			tex= mtex->tex;
 			if(tex==0) continue;
 			
+			/* only process if this texture is mapped 
+			 * to one that we're interested in */
+			if (!(mtex->mapto & mapto_flag)) continue;
+			
 			/* which coords */
 			if(mtex->texco==TEXCO_OBJECT) { 
 				Object *ob= mtex->object;
@@ -1550,7 +1554,7 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, f
 			}
 			
 			
-			if(mtex->mapto & (MAP_COL+MAP_COLMIR)) {
+			if((mapto_flag & (MAP_COL+MAP_COLMIR)) && (mtex->mapto & (MAP_COL+MAP_COLMIR))) {
 				float tcol[3], colfac;
 				
 				/* stencil maps on the texture control slider, not texture intensity value */
@@ -1568,17 +1572,17 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, f
 				}
 				else texres.tin= texres.ta;
 				
-				if(mtex->mapto & MAP_COL) {
+				if((mapto_flag & MAP_COL) && (mtex->mapto & MAP_COL)) {
 					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
 				}
 				
 				/* MAP_COLMIR is abused for absorption colour at the moment */
-				if(mtex->mapto & MAP_COLMIR) {
-					texture_rgb_blend(absorb_col, tcol, absorb_col, texres.tin, colfac, mtex->blendtype);
+				if((mapto_flag & MAP_COLMIR) && (mtex->mapto & MAP_COLMIR)) {
+					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
 				}
 			}
 			
-			if(mtex->mapto & MAP_VARS) {
+			if((mapto_flag & MAP_VARS) && (mtex->mapto & MAP_VARS)) {
 				/* stencil maps on the texture control slider, not texture intensity value */
 				float varfac= mtex->varfac*stencilTin;
 				
@@ -1587,17 +1591,17 @@ void do_volume_tex(ShadeInput *shi, float *xyz, float *col, float *absorb_col, f
 					else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);
 				}
 				
-				if(mtex->mapto & MAP_EMIT) {
+				if((mapto_flag & MAP_EMIT) && (mtex->mapto & MAP_EMIT)) {
 					int flip= mtex->maptoneg & MAP_EMIT;
 
-					*emit = texture_value_blend(mtex->def_var, *emit, texres.tin, varfac, mtex->blendtype, flip);
-					if(*emit<0.0) *emit= 0.0;
+					*val = texture_value_blend(mtex->def_var, *val, texres.tin, varfac, mtex->blendtype, flip);
+					if(*val<0.0) *val= 0.0;
 				}
-				if(mtex->mapto & MAP_ALPHA) {
+				if((mapto_flag & MAP_ALPHA) && (mtex->mapto & MAP_ALPHA)) {
 					int flip= mtex->maptoneg & MAP_ALPHA;
 
-					*alpha = texture_value_blend(mtex->def_var, *alpha, texres.tin, varfac, mtex->blendtype, flip);
-					CLAMP(*alpha, 0.0, 1.0);
+					*val = texture_value_blend(mtex->def_var, *val, texres.tin, varfac, mtex->blendtype, flip);
+					CLAMP(*val, 0.0, 1.0);
 				}
 			}
 		}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 5966e10e1dd..f3ce9279225 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -113,13 +113,11 @@ int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, int int
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->alpha;
-	float emit_fac=0.0f;
 	float col[3] = {0.0, 0.0, 0.0};
-	float absorb_col[3] = {0.0, 0.0, 0.0};
-	
+		
 	/* do any density gain stuff here */
 	if (shi->mat->flag & MA_IS_TEXTURED)
-		do_volume_tex(shi, co, col, absorb_col, &density, &emit_fac);
+		do_volume_tex(shi, co, MAP_ALPHA, col, &density);
 	
 	return density;
 }
@@ -130,13 +128,11 @@ float vol_get_density(struct ShadeInput *shi, float *co)
 void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 {
 	float emission = shi->mat->emit;
-	float col[3];
-	float dens_dummy = 1.0f;
-	float absorb_col[3] = {0.0, 0.0, 0.0};
+	float col[3] = {0.0, 0.0, 0.0};
 	
 	VECCOPY(col, &shi->mat->r);
 	
-	do_volume_tex(shi, co, col, absorb_col, &dens_dummy, &emission);
+	do_volume_tex(shi, co, MAP_EMIT+MAP_COL, col, &emission);
 	
 	em[0] = em[1] = em[2] = emission;
 	VecMulVecf(em, em, col);
@@ -144,15 +140,13 @@ void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 
 void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 {
-	float col[3];
 	float dummy = 1.0f;
-	float vec_one[3] = {1.0f, 1.0f, 1.0f};
 	float absorption = shi->mat->vol_absorption;
 	
 	VECCOPY(absorb_col, shi->mat->vol_absorption_col);
 	
 	if (shi->mat->flag & MA_IS_TEXTURED)
-		do_volume_tex(shi, co, col, absorb_col, &dummy, &dummy);
+		do_volume_tex(shi, co, MAP_COLMIR, absorb_col, &dummy);
 	
 	absorb_col[0] = (1.0f - absorb_col[0]) * absorption;
 	absorb_col[1] = (1.0f - absorb_col[1]) * absorption;

From 45acf427a7352bbffffcec93d43b50220febbd04 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 23 Sep 2008 08:00:55 +0000
Subject: [PATCH 005/577] * bugfix, old files (including default cube) weren't
 loading up with correctly initialised volume settings

---
 source/blender/blenloader/intern/readfile.c | 28 ++++++++++++---------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 41035b1c373..e106dd6cb59 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7720,7 +7720,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		Scene *sce= main->scene.first;
 		Sequence *seq;
 		Editing *ed;
-		Material *ma;
 		
 		while(sce) {
 			ed= sce->ed;
@@ -7735,17 +7734,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			
 			sce= sce->id.next;
 		}
-		
-		for(ma=main->mat.first; ma; ma= ma->id.next) {
-			/* trigger for non-volumetric file */
-			if (ma->vol_shade_stepsize < 0.0001f) {
-				ma->vol_shade_stepsize = 0.2f;
-				ma->vol_stepsize = 0.2f;
-				ma->vol_absorption = 1.0f;
-				ma->vol_scattering = 1.0f;
-				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
-			}
-		}
 	}
 	
 	/*fix broken group lengths in id properties*/
@@ -7869,6 +7857,22 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			la->skyblendtype= MA_RAMP_ADD;
 			la->skyblendfac= 1.0f;
 		}
+		
+	}
+	
+	if (main->versionfile <= 247) {
+		Material *ma;
+		
+		for(ma=main->mat.first; ma; ma= ma->id.next) {
+			/* trigger for non-volumetric file */
+			if (ma->vol_shade_stepsize < 0.0001f) {
+				ma->vol_shade_stepsize = 0.2f;
+				ma->vol_stepsize = 0.2f;
+				ma->vol_absorption = 1.0f;
+				ma->vol_scattering = 1.0f;
+				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
+			}
+		}
 	}
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */

From aed107cf4a31f4b07d1f065d407e6ad55935afb2 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 24 Sep 2008 02:52:47 +0000
Subject: [PATCH 006/577] * Volumetrics scene integration

Now other objects (and sky) correctly render if they're partially
inside or behind a volume. Previously all other objects were ignored,
and volumes just rendered on black. The colour of surfaces inside or
behind the volume gets correctly attenuated by the density of the
volume in between - i.e. thicker volumes will block the light coming
from behind. However, other solid objects don't receive volume shadows
yet, this is to be worked on later.

http://mke3.net/blender/devel/rendering/volumetrics/vol_inside_behind.png

Currently this uses raytracing to find intersections within the volume,
and rays are also traced from the volume, heading behind into the
scene, to see what's behind it (similar effect to ray transp with IOR
1). Because of this, objects inside or behind the volume will not be
antialiased. Perhaps I can come up with a solution for this, but until
then, for antialiasing, you can turn on Full OSA (warning, this will
incur a slowdown). Of course you can always avoid this by rendering
volumes on a separate renderlayer, and compositing in post, too.

Another idea I've started thinking about is to calculate an alpha
value, then use ztransp to overlay on top of other objects. This won't
accurately attenuate and absorb light coming from objects behind the
volume, but for some situations it may be fine, and faster too.
---
 .../blender/render/intern/include/shading.h   |   3 +
 .../blender/render/intern/source/rayshade.c   |   2 +-
 .../blender/render/intern/source/volumetric.c | 178 +++++++++++++-----
 3 files changed, 134 insertions(+), 49 deletions(-)

diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h
index 9229e612337..4e63d0f0d79 100644
--- a/source/blender/render/intern/include/shading.h
+++ b/source/blender/render/intern/include/shading.h
@@ -91,3 +91,6 @@ float lamp_get_visibility(struct LampRen *lar, float *co, float *lv, float *dist
 void lamp_get_shadow(struct LampRen *lar, ShadeInput *shi, float inp, float *shadfac, int do_real);
 
 float	fresnel_fac(float *view, float *vn, float fresnel, float fac);
+
+/* rayshade.c */
+extern void shade_ray(struct Isect *is, struct ShadeInput *shi, struct ShadeResult *shr);
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 0fd9365477c..e000a55ece6 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -205,7 +205,7 @@ void makeraytree(Render *re)
 	re->stats_draw(&re->i);
 }
 
-static void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
+void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
 {
 	VlakRen *vlr= (VlakRen*)is->face;
 	ObjectInstanceRen *obi= RAY_OBJECT_GET(&R, is->ob);
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index f3ce9279225..e3d21f2d2b0 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -45,6 +45,7 @@
 #include "BKE_global.h"
 
 #include "render_types.h"
+#include "pixelshading.h"
 #include "shading.h"
 #include "texture.h"
 
@@ -72,37 +73,36 @@ static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 #define VOL_BOUNDS_DEPTH	0
 #define VOL_BOUNDS_SS		1
 
-int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, int intersect_type)
+static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
 {
 	/* TODO: Box or sphere intersection types could speed things up */
 
 	/* raytrace method */
-	Isect isect;
 	float maxsize = RE_ray_tree_max_size(R.raytree);
 
 	/* TODO: use object's bounding box to calculate max size */
-	VECCOPY(isect.start, co);
-	isect.end[0] = co[0] + vec[0] * maxsize;
-	isect.end[1] = co[1] + vec[1] * maxsize;
-	isect.end[2] = co[2] + vec[2] * maxsize;
+	VECCOPY(isect->start, co);
+	isect->end[0] = co[0] + vec[0] * maxsize;
+	isect->end[1] = co[1] + vec[1] * maxsize;
+	isect->end[2] = co[2] + vec[2] * maxsize;
 	
-	if (intersect_type == VOL_BOUNDS_DEPTH) isect.faceorig= (RayFace*)shi->vlr;
-	else if (intersect_type == VOL_BOUNDS_SS) isect.faceorig= NULL;
+	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
+	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
 	
-	isect.mode= RE_RAY_MIRROR;
-	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
-	isect.face_last= NULL;
-	isect.ob_last= 0;
-	isect.lay= -1;
+	isect->mode= RE_RAY_MIRROR;
+	isect->oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect->face_last= NULL;
+	isect->ob_last= 0;
+	isect->lay= -1;
 	
-	if(RE_ray_tree_intersect(R.raytree, &isect))
+	if(RE_ray_tree_intersect(R.raytree, isect))
 	{
 		float isvec[3];
 
-		VECCOPY(isvec, isect.vec);
-		hitco[0] = isect.start[0] + isect.labda*isvec[0];
-		hitco[1] = isect.start[1] + isect.labda*isvec[1];
-		hitco[2] = isect.start[2] + isect.labda*isvec[2];
+		VECCOPY(isvec, isect->vec);
+		hitco[0] = isect->start[0] + isect->labda*isvec[0];
+		hitco[1] = isect->start[1] + isect->labda*isvec[1];
+		hitco[2] = isect->start[2] + isect->labda*isvec[2];
 		
 		return 1;
 	} else {
@@ -229,13 +229,14 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 
 
 	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
+		Isect is;
 		
 		if (ELEM(lar->type, LA_SUN, LA_HEMI))
 			VECCOPY(lv, lar->vec);
 		VecMulf(lv, -1.0f);
 		
 		/* find minimum of volume bounds, or lamp coord */
-		if (vol_get_bounds(shi, co, lv, hitco, VOL_BOUNDS_SS)) {
+		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS)) {
 			float dist = VecLenf(co, hitco);
 			
 			if (ELEM(lar->type, LA_SUN, LA_HEMI))
@@ -298,31 +299,101 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	VECCOPY(scatter, col);
 }
 
-
-
-static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
+static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 {
-	float tr[3] = {1.f, 1.f, 1.f};			/* total transmittance */
+	ShadeInput shi_new;
+	ShadeResult shr_new;
+	
+	memset(&shi_new, 0, sizeof(ShadeInput)); 
+	
+	shi_new.mask= shi->mask;
+	shi_new.osatex= shi->osatex;
+	shi_new.depth= 1;					/* only used to indicate tracing */
+	shi_new.thread= shi->thread;
+	shi_new.xs= shi->xs;
+	shi_new.ys= shi->ys;
+	shi_new.lay= shi->lay;
+	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
+	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
+	shi_new.light_override= shi->light_override;
+	shi_new.mat_override= shi->mat_override;
+	
+	memset(&shr_new, 0, sizeof(ShadeResult));
+	
+	shade_ray(is, &shi_new, &shr_new);
+	
+	col[0]= shr_new.diff[0] + shr_new.spec[0];
+	col[1]= shr_new.diff[1] + shr_new.spec[1];
+	col[2]= shr_new.diff[2] + shr_new.spec[2];
+}
+
+
+static void vol_trace_behind(ShadeInput *shi, float *co, Isect *isect_first, float *col)
+{
+	if (isect_first != NULL) {
+		/* found an intersection, 
+		 * either back of volume object or another object */
+		ObjectInstanceRen *obi= RAY_OBJECT_GET(&R, isect_first->ob);
+
+		if (obi != shi->obi) {
+			/* already intersected with another object, so shade it */
+			shade_intersection(shi, col, isect_first);
+			return;
+		} else {
+			/* trace a new ray onwards behind the volume */
+			Isect isect;
+			float maxsize = RE_ray_tree_max_size(R.raytree);
+			
+			VECCOPY(isect.start, co);
+			isect.end[0] = co[0] + shi->view[0] * maxsize;
+			isect.end[1] = co[1] + shi->view[1] * maxsize;
+			isect.end[2] = co[2] + shi->view[2] * maxsize;
+			
+			isect.faceorig= isect_first->face;	
+			isect.mode= RE_RAY_MIRROR;
+			isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
+			isect.face_last= NULL;
+			isect.ob_last= 0;
+			isect.lay= -1;
+			
+			if(RE_ray_tree_intersect(R.raytree, &isect))
+				shade_intersection(shi, col, &isect);
+			else
+				shadeSkyView(col, co, shi->view, NULL);
+				
+			return;
+		}
+	}
+	
+	col[0] = col[1] = col[2] = 0.0f;
+}
+
+static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco, Isect *isect)
+{
+	float tr[3] = {1.0f, 1.0f, 1.0f};			/* total transmittance */
 	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
 	float stepsize = shi->mat->vol_stepsize;
 	int nsteps;
 	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
-	float step_tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
+	float tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
 	int s;
 	float step_sta[3], step_end[3];
+	float col_behind[3];
+	float total_density = 0.f;
+	
+	float density = vol_get_density(shi, co);
 	
 	/* multiply col_behind with beam transmittance over entire distance */
-/*
-	// get col_behind
-	
-	// get total transmittance
-	vol_get_attenuation(shi, total_tau, start, dist, stepsize);
-	total_tr[0] = exp(-total_tau[0]);
-	total_tr[1] = exp(-total_tau[1]);
-	total_tr[2] = exp(-total_tau[2]);
-	VecMulVecf(radiance, total_tr, col_behind);
-*/	
-	
+	vol_trace_behind(shi, endco, isect, col_behind);
+	vol_get_attenuation(shi, tau, co, endco, density, stepsize);
+	tr[0] *= exp(-tau[0]);
+	tr[1] *= exp(-tau[1]);
+	tr[2] *= exp(-tau[2]);
+	VecMulVecf(radiance, tr, col_behind);	
+	tr[0] = tr[1] = tr[2] = 1.0f;
+
+
+
 	/* ray marching */
 	nsteps = (int)ceil(VecLenf(co, endco) / stepsize);
 	
@@ -333,18 +404,17 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	VECCOPY(step_sta, co);
 	VecAddf(step_end, step_sta, stepvec);
 	
-	
 	/* get radiance from all points along the ray due to participating media */
 	for (s = 0; s < nsteps; s++) {
-		float density = vol_get_density(shi, step_sta);
+		if (s > 0) density = vol_get_density(shi, step_sta);
 	
 		/* *** transmittance and emission *** */
 		
 		/* transmittance component (alpha) */
-		vol_get_attenuation(shi, step_tau, step_sta, step_end, density, stepsize);
-		tr[0] *= exp(-step_tau[0]);
-		tr[1] *= exp(-step_tau[1]);
-		tr[2] *= exp(-step_tau[2]);
+		vol_get_attenuation(shi, tau, step_sta, step_end, density, stepsize);
+		tr[0] *= exp(-tau[0]);
+		tr[1] *= exp(-tau[1]);
+		tr[2] *= exp(-tau[2]);
 		
 		/* Terminate raymarching if transmittance is small */
 		//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
@@ -357,14 +427,24 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		
 		/*   Lv += Tr * (Lve() + Ld) */
 		VecMulVecf(d_radiance, tr, d_radiance);
+		VecMulf(d_radiance, stepsize);
+		
 		VecAddf(radiance, radiance, d_radiance);	
 
 		VECCOPY(step_sta, step_end);
 		VecAddf(step_end, step_end, stepvec);
+	
+		total_density += density;
 	}
 	
-	VecMulf(radiance, stepsize);
-	VECCOPY(col, radiance);
+	
+	
+	col[0] = radiance[0];
+	col[1] = radiance[1];
+	col[2] = radiance[2];
+	
+	col[3] = 1.0f;
+	//col[3] = total_density * stepsize;
 	
 	/*
 	Incoming radiance = 
@@ -394,21 +474,23 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 
 void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 {
-	float hitco[3], col[3];
+	float hitco[3], col[4];
+	Isect is;
 
 	memset(shr, 0, sizeof(ShadeResult));
 
-	if (vol_get_bounds(shi, shi->co, shi->view, hitco, VOL_BOUNDS_DEPTH)) {
+	if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
 		
-		volumeintegrate(shi, col, shi->co, hitco);
+		volumeintegrate(shi, col, shi->co, hitco, &is);
 		
 		/* hit */
-		shr->alpha = 1.0f;
 		shr->combined[0] = col[0];
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
+		shr->combined[3] = 0.0f;
+		shr->alpha = col[3];
 		
-		QUATCOPY(shr->diff, shr->combined);
+		VECCOPY(shr->diff, shr->combined);
 	}
 	else {
 		/* no hit */

From a0a5198a03ec705e6faf3a995315c8615336963a Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 24 Sep 2008 07:38:12 +0000
Subject: [PATCH 007/577] Volumetrics:

* Now it's possible to render with the camera inside a volume. I'm not sure how this goes with overlapping volumes yet, will look at it. But it allows nice things like this :)
http://mke3.net/blender/devel/rendering/volumetrics/clouds_sky.mov

* Sped up shading significantly by not doing any shading if the density
of the current sample is less than 0.01 (there's nothing to shade there anyway!) Speeds up around 200% on that clouds scene.

* Fixed a bug in global texture coordinates for volume textures
---
 .../blender/render/intern/include/shading.h   |   1 +
 .../blender/render/intern/source/rayshade.c   |   7 +-
 source/blender/render/intern/source/texture.c |   1 +
 .../blender/render/intern/source/volumetric.c | 150 +++++++++++-------
 source/blender/src/buttons_shading.c          |   7 +-
 5 files changed, 108 insertions(+), 58 deletions(-)

diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h
index 4e63d0f0d79..54a8d4b0404 100644
--- a/source/blender/render/intern/include/shading.h
+++ b/source/blender/render/intern/include/shading.h
@@ -33,6 +33,7 @@ struct VlakRen;
 struct StrandSegment;
 struct StrandPoint;
 struct ObjectInstanceRen obi;
+struct Isect;
 
 /* shadeinput.c */
 
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index e000a55ece6..5e06b298bdb 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -274,9 +274,10 @@ void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
 			ntreeShaderExecTree(shi->mat->nodetree, shi, shr);
 			shi->mat= vlr->mat;		/* shi->mat is being set in nodetree */
 		}
-		else
-			shade_material_loop(shi, shr);
-		
+		else {
+			if (shi->mat->material_type == MA_SOLID) shade_material_loop(shi, shr);
+			else if (shi->mat->material_type == MA_VOLUME) shade_volume_loop(shi, shr);
+		}
 		/* raytrace likes to separate the spec color */
 		VECSUB(shr->diff, shr->combined, shr->spec);
 	}	
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 0fa8d2bf909..2c143986900 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1503,6 +1503,7 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 			}
 			else if(mtex->texco==TEXCO_GLOB) {							
 			   VECCOPY(co, xyz);
+			   MTC_Mat4MulVecfl(R.viewinv, co);
 			}
 			else continue;	// can happen when texco defines disappear and it renders old files
 
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index e3d21f2d2b0..032175f522b 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -138,6 +138,15 @@ void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 	VecMulVecf(em, em, col);
 }
 
+void vol_get_scattering_fac(ShadeInput *shi, float *scatter_fac, float *co, float density)
+{
+	//float col[3] = {0.0, 0.0, 0.0};
+	//do_volume_tex(shi, co, MAP_EMIT+MAP_COL, col, &emission);
+	
+	*scatter_fac = shi->mat->vol_scattering;
+}
+
+
 void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 {
 	float dummy = 1.0f;
@@ -282,12 +291,16 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	for(go=lights->first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
+		float scatter_fac;
 	
 		lar= go->lampren;
 		if (lar==NULL) continue;
 		
 		vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
 		
+		vol_get_scattering_fac(shi, &scatter_fac, co, density);
+		VecMulf(lacol, scatter_fac);
+		
 		/* isotropic phase function */
 		VecMulf(lacol, 1.0f / (4.f * M_PI));
 	
@@ -330,9 +343,13 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 
 static void vol_trace_behind(ShadeInput *shi, float *co, Isect *isect_first, float *col)
 {
+	RayFace *rforig=NULL;
+	Isect isect;
+	float maxsize = RE_ray_tree_max_size(R.raytree);
+	
 	if (isect_first != NULL) {
-		/* found an intersection, 
-		 * either back of volume object or another object */
+		/* there was already a ray intersection - 
+		 * either the back of volume object or another object */
 		ObjectInstanceRen *obi= RAY_OBJECT_GET(&R, isect_first->ob);
 
 		if (obi != shi->obi) {
@@ -340,32 +357,39 @@ static void vol_trace_behind(ShadeInput *shi, float *co, Isect *isect_first, flo
 			shade_intersection(shi, col, isect_first);
 			return;
 		} else {
-			/* trace a new ray onwards behind the volume */
-			Isect isect;
-			float maxsize = RE_ray_tree_max_size(R.raytree);
-			
-			VECCOPY(isect.start, co);
-			isect.end[0] = co[0] + shi->view[0] * maxsize;
-			isect.end[1] = co[1] + shi->view[1] * maxsize;
-			isect.end[2] = co[2] + shi->view[2] * maxsize;
-			
-			isect.faceorig= isect_first->face;	
-			isect.mode= RE_RAY_MIRROR;
-			isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
-			isect.face_last= NULL;
-			isect.ob_last= 0;
-			isect.lay= -1;
-			
-			if(RE_ray_tree_intersect(R.raytree, &isect))
-				shade_intersection(shi, col, &isect);
-			else
-				shadeSkyView(col, co, shi->view, NULL);
-				
-			return;
+			rforig = isect_first->face;
 		}
 	}
 	
-	col[0] = col[1] = col[2] = 0.0f;
+	/* get ready to trace a new ray behind the volume */
+	VECCOPY(isect.start, co)
+	
+	if (rforig == NULL) {
+		/* if there's no original ray intersection then the original 
+		 * shaded surface is the inside of the volume at the far bounds. 
+		 * We can use this face for the raytrace orig face */
+		isect.faceorig= (RayFace *)shi->vlr;
+	} else {
+		isect.faceorig= rforig;
+	}
+	
+	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
+	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
+	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect.face_last= NULL;
+	isect.ob_last= 0;
+	isect.lay= -1;
+	
+	/* check to see if there's anything behind the volume, otherwise shade the sky */
+	if(RE_ray_tree_intersect(R.raytree, &isect)) {
+		shade_intersection(shi, col, &isect);
+	} else {
+		shadeSkyView(col, co, shi->view, NULL);
+	}
+	
 }
 
 static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco, Isect *isect)
@@ -392,8 +416,6 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	VecMulVecf(radiance, tr, col_behind);	
 	tr[0] = tr[1] = tr[2] = 1.0f;
 
-
-
 	/* ray marching */
 	nsteps = (int)ceil(VecLenf(co, endco) / stepsize);
 	
@@ -408,28 +430,31 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	for (s = 0; s < nsteps; s++) {
 		if (s > 0) density = vol_get_density(shi, step_sta);
 	
-		/* *** transmittance and emission *** */
+		/* there's only any point shading here
+		 * if there's actually some density to shade! */
+		if (density > 0.01f) {
 		
-		/* transmittance component (alpha) */
-		vol_get_attenuation(shi, tau, step_sta, step_end, density, stepsize);
-		tr[0] *= exp(-tau[0]);
-		tr[1] *= exp(-tau[1]);
-		tr[2] *= exp(-tau[2]);
-		
-		/* Terminate raymarching if transmittance is small */
-		//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
-		
-		/* incoming light via emission or scattering (additive) */
-		vol_get_emission(shi, step_emit, step_sta, density);
-		vol_get_scattering(shi, step_scatter, step_end, stepsize, density);
-		
-		VecAddf(d_radiance, step_emit, step_scatter);
-		
-		/*   Lv += Tr * (Lve() + Ld) */
-		VecMulVecf(d_radiance, tr, d_radiance);
-		VecMulf(d_radiance, stepsize);
-		
-		VecAddf(radiance, radiance, d_radiance);	
+			/* transmittance component (alpha) */
+			vol_get_attenuation(shi, tau, step_sta, step_end, density, stepsize);
+			tr[0] *= exp(-tau[0]);
+			tr[1] *= exp(-tau[1]);
+			tr[2] *= exp(-tau[2]);
+			
+			/* Terminate raymarching if transmittance is small */
+			//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
+			
+			/* incoming light via emission or scattering (additive) */
+			vol_get_emission(shi, step_emit, step_sta, density);
+			vol_get_scattering(shi, step_scatter, step_end, stepsize, density);
+			
+			VecAddf(d_radiance, step_emit, step_scatter);
+			
+			/*   Lv += Tr * (Lve() + Ld) */
+			VecMulVecf(d_radiance, tr, d_radiance);
+			VecMulf(d_radiance, stepsize);
+			
+			VecAddf(radiance, radiance, d_radiance);	
+		}
 
 		VECCOPY(step_sta, step_end);
 		VecAddf(step_end, step_end, stepvec);
@@ -479,15 +504,32 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 
 	memset(shr, 0, sizeof(ShadeResult));
 
-	if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
+	/* if original normal is facing away from the camera, 
+	 * then we're inside the volume already.
+	 * so integrate from the camera to the shading coord */
+	//if (INPR(shi->orignor, shi->view) < 0.0f) {
+	if (shi->flippednor) {
 		
-		volumeintegrate(shi, col, shi->co, hitco, &is);
+		const float co_cam[3] = {0.0, 0.0, 0.0};
+		volumeintegrate(shi, col, co_cam, shi->co, NULL);
 		
-		/* hit */
 		shr->combined[0] = col[0];
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
-		shr->combined[3] = 0.0f;
+		shr->combined[3] = 1.0f;
+		shr->alpha = col[3];
+		
+		VECCOPY(shr->diff, shr->combined);
+		
+	}
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
+		volumeintegrate(shi, col, shi->co, hitco, &is);
+		
+
+		shr->combined[0] = col[0];
+		shr->combined[1] = col[1];
+		shr->combined[2] = col[2];
+		shr->combined[3] = 1.0f;
 		shr->alpha = col[3];
 		
 		VECCOPY(shr->diff, shr->combined);
@@ -496,7 +538,7 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 		/* no hit */
 		shr->combined[0] = 0.0f;
 		shr->combined[1] = 0.0f;
-		shr->combined[2] = 0.0f;
-		shr->combined[3] = shr->alpha =  0.0f;
+		shr->combined[2] = 1.0f;
+		shr->combined[3] = shr->alpha =  1.0f;
 	}
 }
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 7db44e4c0eb..3972e4c3338 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4250,7 +4250,7 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 5.0, 0, 0, "Multiplier for absorption");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 10.0, 10, 0, "Multiplier for absorption");
 	uiDefButF(block, COL, B_MATPRV, "",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption_col), 0, 0, 0, B_MATCOL, "");
 	
@@ -4266,6 +4266,11 @@ static void material_panel_material_volume(Material *ma)
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
+	
+	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 10.0, 10, 0, "Multiplier for scattering");
+	
+	yco -= YSPACE;
 		
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Shading",

From 0417e79586fd1857ac101d17cd6038bc4f2efe3f Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 24 Sep 2008 07:49:24 +0000
Subject: [PATCH 008/577] * Moved the sample location for shading to the middle
 of the volumetric step. This fixes a nagging bug that would cause noise/odd
 moire-ish patterns, due to raytrace numerical errors:

http://mke3.net/blender/devel/rendering/volumetrics/vol_clouds_moire.jpg
---
 source/blender/render/intern/source/volumetric.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 032175f522b..d4c3f393a0e 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -401,7 +401,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
 	float tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
 	int s;
-	float step_sta[3], step_end[3];
+	float step_sta[3], step_end[3], step_mid[3];
 	float col_behind[3];
 	float total_density = 0.f;
 	
@@ -433,6 +433,9 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		/* there's only any point shading here
 		 * if there's actually some density to shade! */
 		if (density > 0.01f) {
+			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
+			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
+			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
 		
 			/* transmittance component (alpha) */
 			vol_get_attenuation(shi, tau, step_sta, step_end, density, stepsize);
@@ -444,8 +447,8 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
 			
 			/* incoming light via emission or scattering (additive) */
-			vol_get_emission(shi, step_emit, step_sta, density);
-			vol_get_scattering(shi, step_scatter, step_end, stepsize, density);
+			vol_get_emission(shi, step_emit, step_mid, density);
+			vol_get_scattering(shi, step_scatter, step_mid, stepsize, density);
 			
 			VecAddf(d_radiance, step_emit, step_scatter);
 			

From 707f2e300cb44891210bf0168489a0cfb36b3c69 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 25 Sep 2008 06:08:41 +0000
Subject: [PATCH 009/577] * Worked a bit on cleaning up the code involving
 layering volumes on solids, in front of other volumes, etc. Now there's a
 'layer depth' value that works similarly to refraction depth - a limit for
 how many times the view ray will penetrate different volumetric surfaces.

I have it close to being able to return alpha, but it's still not 100%
correct and needs a bit more work. Going to sit on this for a while.
---
 source/blender/blenkernel/intern/material.c   |   1 +
 source/blender/blenloader/intern/readfile.c   |   1 +
 source/blender/makesdna/DNA_material_types.h  |   2 +-
 .../render/extern/include/RE_shader_ext.h     |   2 +-
 .../blender/render/intern/source/shadeinput.c |   4 +
 .../blender/render/intern/source/volumetric.c | 248 +++++++++---------
 source/blender/src/buttons_shading.c          |  54 ++--
 7 files changed, 159 insertions(+), 153 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 473a035ecce..8f4e65576d8 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -172,6 +172,7 @@ void init_material(Material *ma)
 	ma->vol_absorption = 1.0f;
 	ma->vol_scattering = 1.0f;
 	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
+	ma->vol_raydepth = 15;
 
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e106dd6cb59..658c14f5876 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7871,6 +7871,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_absorption = 1.0f;
 				ma->vol_scattering = 1.0f;
 				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
+				if (ma->vol_raydepth == 0) ma->vol_raydepth = 15;
 			}
 		}
 	}
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index c322295fff9..d20ea600fea 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -71,8 +71,8 @@ typedef struct Material {
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
 	float vpad2;
+	short vol_raydepth;
 	short vol_shadeflag;
-	short vpad;
 	
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index e8403053e0b..5d74895f0c8 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -113,7 +113,7 @@ typedef struct ShadeInput
 	
 	/* internal face coordinates */
 	float u, v, dx_u, dx_v, dy_u, dy_v;
-	float co[3], view[3];
+	float co[3], view[3], camera_co[3];
 	
 	/* copy from material, keep synced so we can do memcopy */
 	/* current size: 23*4 */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index cd5ecc413df..8d4206a75ae 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -671,6 +671,10 @@ void shade_input_set_viewco(ShadeInput *shi, float x, float y, float z)
 		}
 	}
 	
+	/* set camera coords - for scanline, it's always 0.0,0.0,0.0 (render is in camera space)
+	 * however for raytrace it can be different - the position of the last intersection */
+	shi->camera_co[0] = shi->camera_co[1] = shi->camera_co[2] = 0.0f;
+	
 	/* cannot normalize earlier, code above needs it at viewplane level */
 	Normalize(shi->view);
 }
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index d4c3f393a0e..4baeabcfa7a 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -55,7 +55,7 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#if 0
+
 static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 {
 	VlakRen *vlr = (VlakRen *)face;
@@ -64,21 +64,33 @@ static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 	 * of foward facing geometry don't cause the ray to stop */
 	return (INPR(is->vec, vlr->n) < 0.0f);
 }
-#endif
 
-#define VOL_IS_SAMEOBJECT		1
+static int vol_frontface_intersect_check(Isect *is, int ob, RayFace *face)
+{
+	VlakRen *vlr = (VlakRen *)face;
+	
+	/* only consider faces away, so overlapping layers
+	 * of foward facing geometry don't cause the ray to stop */
+	return (INPR(is->vec, vlr->n) > 0.0f);
+}
+
+static int vol_always_intersect_check(Isect *is, int ob, RayFace *face)
+{
+	return 1;
+}
+
+#define VOL_IS_BACKFACE			1
 #define VOL_IS_SAMEMATERIAL		2
 
 
 #define VOL_BOUNDS_DEPTH	0
 #define VOL_BOUNDS_SS		1
 
-static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
+/* TODO: Box or sphere intersection types could speed things up */
+static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type, int checkfunc)
 {
-	/* TODO: Box or sphere intersection types could speed things up */
-
-	/* raytrace method */
 	float maxsize = RE_ray_tree_max_size(R.raytree);
+	int intersected=0;
 
 	/* TODO: use object's bounding box to calculate max size */
 	VECCOPY(isect->start, co);
@@ -86,16 +98,21 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	isect->end[1] = co[1] + vec[1] * maxsize;
 	isect->end[2] = co[2] + vec[2] * maxsize;
 	
-	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
-	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
-	
 	isect->mode= RE_RAY_MIRROR;
 	isect->oborig= RAY_OBJECT_SET(&R, shi->obi);
 	isect->face_last= NULL;
 	isect->ob_last= 0;
 	isect->lay= -1;
 	
-	if(RE_ray_tree_intersect(R.raytree, isect))
+	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
+	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
+	
+	if (checkfunc==VOL_IS_BACKFACE)
+		intersected = RE_ray_tree_intersect_check(R.raytree, isect, vol_backface_intersect_check);
+	else
+		intersected = RE_ray_tree_intersect(R.raytree, isect);
+	
+	if(intersected)
 	{
 		float isvec[3];
 
@@ -245,7 +262,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		VecMulf(lv, -1.0f);
 		
 		/* find minimum of volume bounds, or lamp coord */
-		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS)) {
+		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
 			float dist = VecLenf(co, hitco);
 			
 			if (ELEM(lar->type, LA_SUN, LA_HEMI))
@@ -312,87 +329,7 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	VECCOPY(scatter, col);
 }
 
-static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
-{
-	ShadeInput shi_new;
-	ShadeResult shr_new;
-	
-	memset(&shi_new, 0, sizeof(ShadeInput)); 
-	
-	shi_new.mask= shi->mask;
-	shi_new.osatex= shi->osatex;
-	shi_new.depth= 1;					/* only used to indicate tracing */
-	shi_new.thread= shi->thread;
-	shi_new.xs= shi->xs;
-	shi_new.ys= shi->ys;
-	shi_new.lay= shi->lay;
-	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
-	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
-	shi_new.light_override= shi->light_override;
-	shi_new.mat_override= shi->mat_override;
-	
-	memset(&shr_new, 0, sizeof(ShadeResult));
-	
-	shade_ray(is, &shi_new, &shr_new);
-	
-	col[0]= shr_new.diff[0] + shr_new.spec[0];
-	col[1]= shr_new.diff[1] + shr_new.spec[1];
-	col[2]= shr_new.diff[2] + shr_new.spec[2];
-}
-
-
-static void vol_trace_behind(ShadeInput *shi, float *co, Isect *isect_first, float *col)
-{
-	RayFace *rforig=NULL;
-	Isect isect;
-	float maxsize = RE_ray_tree_max_size(R.raytree);
-	
-	if (isect_first != NULL) {
-		/* there was already a ray intersection - 
-		 * either the back of volume object or another object */
-		ObjectInstanceRen *obi= RAY_OBJECT_GET(&R, isect_first->ob);
-
-		if (obi != shi->obi) {
-			/* already intersected with another object, so shade it */
-			shade_intersection(shi, col, isect_first);
-			return;
-		} else {
-			rforig = isect_first->face;
-		}
-	}
-	
-	/* get ready to trace a new ray behind the volume */
-	VECCOPY(isect.start, co)
-	
-	if (rforig == NULL) {
-		/* if there's no original ray intersection then the original 
-		 * shaded surface is the inside of the volume at the far bounds. 
-		 * We can use this face for the raytrace orig face */
-		isect.faceorig= (RayFace *)shi->vlr;
-	} else {
-		isect.faceorig= rforig;
-	}
-	
-	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
-	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
-	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
-	
-	isect.mode= RE_RAY_MIRROR;
-	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
-	isect.face_last= NULL;
-	isect.ob_last= 0;
-	isect.lay= -1;
-	
-	/* check to see if there's anything behind the volume, otherwise shade the sky */
-	if(RE_ray_tree_intersect(R.raytree, &isect)) {
-		shade_intersection(shi, col, &isect);
-	} else {
-		shadeSkyView(col, co, shi->view, NULL);
-	}
-	
-}
-
-static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco, Isect *isect)
+static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
 {
 	float tr[3] = {1.0f, 1.0f, 1.0f};			/* total transmittance */
 	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
@@ -403,18 +340,17 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	int s;
 	float step_sta[3], step_end[3], step_mid[3];
 	float col_behind[3];
-	float total_density = 0.f;
-	
+	float alpha;
 	float density = vol_get_density(shi, co);
 	
 	/* multiply col_behind with beam transmittance over entire distance */
-	vol_trace_behind(shi, endco, isect, col_behind);
 	vol_get_attenuation(shi, tau, co, endco, density, stepsize);
 	tr[0] *= exp(-tau[0]);
 	tr[1] *= exp(-tau[1]);
 	tr[2] *= exp(-tau[2]);
-	VecMulVecf(radiance, tr, col_behind);	
+	VecMulVecf(radiance, tr, col);	
 	tr[0] = tr[1] = tr[2] = 1.0f;
+	
 
 	/* ray marching */
 	nsteps = (int)ceil(VecLenf(co, endco) / stepsize);
@@ -444,7 +380,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			tr[2] *= exp(-tau[2]);
 			
 			/* Terminate raymarching if transmittance is small */
-			//if (rgb_to_luminance(tr[0], tr[1], tr[2]) < 1e-3) break;
+			//if ((tr[0] + tr[1] + tr[2] * 0.333f) < 0.01f) continue;
 			
 			/* incoming light via emission or scattering (additive) */
 			vol_get_emission(shi, step_emit, step_mid, density);
@@ -461,18 +397,14 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 
 		VECCOPY(step_sta, step_end);
 		VecAddf(step_end, step_end, stepvec);
-	
-		total_density += density;
 	}
 	
-	
-	
 	col[0] = radiance[0];
 	col[1] = radiance[1];
 	col[2] = radiance[2];
 	
-	col[3] = 1.0f;
-	//col[3] = total_density * stepsize;
+	alpha = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
+	col[3] = alpha;
 	
 	/*
 	Incoming radiance = 
@@ -492,56 +424,124 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	-- To find radiance from segments along the way:
 		find radiance for one step:
 		  - loop over lights and weight by phase function
-
-		  - single scattering
-		    : integrate over sphere
-		
-		then multiply each step for final exit radiance
 		*/
 }
 
+static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
+{
+	ShadeInput shi_new;
+	ShadeResult shr_new;
+	
+	memset(&shi_new, 0, sizeof(ShadeInput)); 
+	
+	shi_new.mask= shi->mask;
+	shi_new.osatex= shi->osatex;
+	shi_new.depth= shi->depth + 1;
+	shi_new.thread= shi->thread;
+	shi_new.xs= shi->xs;
+	shi_new.ys= shi->ys;
+	shi_new.lay= shi->lay;
+	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
+	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
+	shi_new.light_override= shi->light_override;
+	shi_new.mat_override= shi->mat_override;
+	
+	VECCOPY(shi_new.camera_co, is->start);
+	
+	memset(&shr_new, 0, sizeof(ShadeResult));
+	
+	if (shi->depth < shi->mat->vol_raydepth) 
+		shade_ray(is, &shi_new, &shr_new);
+	
+	col[0] = shr_new.combined[0];
+	col[1] = shr_new.combined[1];
+	col[2] = shr_new.combined[2];
+	col[3] = shr_new.alpha;
+}
+
+static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
+{
+	Isect isect;
+	float maxsize = RE_ray_tree_max_size(R.raytree);
+
+	VECCOPY(isect.start, co);
+	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
+	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
+	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
+
+	isect.faceorig= (RayFace *)vlr;
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect.face_last= NULL;
+	isect.ob_last= 0;
+	isect.lay= -1;
+	
+	/* check to see if there's anything behind the volume, otherwise shade the sky */
+	if(RE_ray_tree_intersect(R.raytree, &isect)) {
+		shade_intersection(shi, col, &isect);
+	} else {
+		shadeSkyView(col, co, shi->view, NULL);
+	}
+}
+
 void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 {
-	float hitco[3], col[4];
+	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
 	Isect is;
 
 	memset(shr, 0, sizeof(ShadeResult));
 
-	/* if original normal is facing away from the camera, 
-	 * then we're inside the volume already.
-	 * so integrate from the camera to the shading coord */
-	//if (INPR(shi->orignor, shi->view) < 0.0f) {
+	/* if 1st hit normal is facing away from the camera, 
+	 * then we're inside the volume already. */
 	if (shi->flippednor) {
+		/* trace behind the 1st hit point */
+		vol_trace_behind(shi, shi->vlr, shi->co, col);
 		
-		const float co_cam[3] = {0.0, 0.0, 0.0};
-		volumeintegrate(shi, col, co_cam, shi->co, NULL);
+		/* shade volume from 'camera' to 1st hit point */
+		volumeintegrate(shi, col, shi->camera_co, shi->co);
 		
 		shr->combined[0] = col[0];
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
-		shr->combined[3] = 1.0f;
+		
+		if (col[3] > 1.0f) col[3] = 1.0f;
+		shr->combined[3] = col[3];
 		shr->alpha = col[3];
 		
 		VECCOPY(shr->diff, shr->combined);
-		
 	}
-	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
-		volumeintegrate(shi, col, shi->co, hitco, &is);
+	/* trace to find a backface, the other side bounds of the volume */
+	/* (ray intersect ignores front faces here) */
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH, 0)) {
+		VlakRen *vlr = (VlakRen *)is.face;
+		
+		/* if it's another face in the same material */
+		if (vlr->mat == shi->mat) {
+			/* trace behind the 2nd (raytrace) hit point */
+			vol_trace_behind(shi, (VlakRen *)is.face, hitco, col);
+		} else {
+			shade_intersection(shi, col, &is);
+		}
+	
+		/* shade volume from 1st hit point to 2nd hit point */
+		volumeintegrate(shi, col, shi->co, hitco);
 		
-
 		shr->combined[0] = col[0];
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
-		shr->combined[3] = 1.0f;
+		
+		//if (col[3] > 1.0f) 
+		col[3] = 1.0f;
+		shr->combined[3] = col[3];
 		shr->alpha = col[3];
 		
 		VECCOPY(shr->diff, shr->combined);
 	}
 	else {
-		/* no hit */
 		shr->combined[0] = 0.0f;
 		shr->combined[1] = 0.0f;
-		shr->combined[2] = 1.0f;
+		shr->combined[2] = 0.0f;
 		shr->combined[3] = shr->alpha =  1.0f;
 	}
 }
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 3972e4c3338..a288845c39d 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -3528,6 +3528,8 @@ static void material_panel_map_input(Object *ob, Material *ma)
 		uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
 		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_MATPRV, "Ob:",750,180,158,18, &(mtex->object), "");
 		uiDefButS(block, ROW, B_MATPRV, "Local",		630,160,55,18, &(mtex->texco), 4.0, (float)TEXCO_ORCO, 0, 0, "Uses the original undeformed coordinates of the object");
+	
+
 	} else {
 		uiDefButS(block, ROW, B_MATPRV, "Glob",			630,180,45,18, &(mtex->texco), 4.0, (float)TEXCO_GLOB, 0, 0, "Uses global coordinates for the texture coordinates");
 		uiDefButS(block, ROW, B_MATPRV, "Object",		675,180,75,18, &(mtex->texco), 4.0, (float)TEXCO_OBJECT, 0, 0, "Uses linked object's coordinates for texture coordinates");
@@ -4244,43 +4246,41 @@ static void material_panel_material_volume(Material *ma)
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
 	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base opacity value");
+	uiDefButS(block, NUM, B_MATPRV, "Layer Depth: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_raydepth), 0.0, 512.0, 10, 2, "Number of layered volume ray intersections allowed per pixel");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
-	
-	uiBlockBeginAlign(block);
-	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 10.0, 10, 0, "Multiplier for absorption");
-	uiDefButF(block, COL, B_MATPRV, "",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption_col), 0, 0, 0, B_MATCOL, "");
-	
-	uiBlockEndAlign(block);
-	
-	yco -= YSPACE;
-	
-	uiBlockBeginAlign(block);
-	uiDefButF(block, NUMSLI, B_MATPRV, "Emit: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->emit), 0.0, 2.0, 0, 0, "Emission component");
-	uiDefButF(block, COL, B_MATPRV, "",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->r), 0, 0, 0, B_MATCOL, "");
-	uiBlockEndAlign(block);
-	
-	yco -= YSPACE;
-	
-	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 10.0, 10, 0, "Multiplier for scattering");
-	
-	yco -= YSPACE;
-		
+			
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Shading",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
 	uiBlockEndAlign(block);
+	
+	yco = PANEL_YMAX;
+	
+	uiBlockBeginAlign(block);
+	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 10.0, 10, 0, "Multiplier for absorption");
+	uiDefButF(block, COL, B_MATPRV, "",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption_col), 0, 0, 0, B_MATCOL, "");
+	uiBlockEndAlign(block);
 
-	uiDefBut(block, LABEL, B_DIFF, "",
-		X2CLM2, yco, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
+	uiDefButF(block, NUMSLI, B_MATPRV, "Emit: ",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->emit), 0.0, 2.0, 0, 0, "Emission component");
+	uiDefButF(block, COL, B_MATPRV, "",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->r), 0, 0, 0, B_MATCOL, "");
+	uiBlockEndAlign(block);
+	
+	yco -= YSPACE;
+	
+	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 10.0, 10, 0, "Multiplier for scattering");
 }
 
 static void material_panel_nodes(Material *ma)

From 78c50f7af1d694252984885e0eac87682647e2d2 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 26 Sep 2008 01:54:31 +0000
Subject: [PATCH 010/577] Wheee!

Initial commit for supporting rendering particles directly as
volume density. It works by looking up how many particles are
within a specified radius of the currently shaded point and using
that to calculate density (which is used just as any other
measure of density would be).

http://mke3.net/blender/devel/rendering/volumetrics/smoke_test01.mov
http://mke3.net/blender/devel/rendering/volumetrics/smoke_test01.blend

Right now it's an early implementation, just to see that it can
work - it may end up changing quite a bit. Currently, it's just a
single switch on the volume material - it looks up all particles
in the scene for density at the current shaded point in world
space (so the volume region must enclose the particles in order
to render them.

This will probably change - one idea I have is to make the
particle density estimation a procedural texture with options for:
* the object and particle system to use
* the origin of the co-ordinate system, i.e. object center, world
space, etc.

This would allow you in a sense, to instance particle systems for
render - you only need to bake one particle system, but you can
render it anywhere.

Anyway, plenty of work to do here, firstly on getting a nice
density evaluation with falloff etc...
---
 source/blender/makesdna/DNA_material_types.h  |  3 +-
 .../render/intern/include/render_types.h      | 12 +++++++
 .../render/intern/include/renderdatabase.h    |  2 ++
 .../render/intern/source/convertblender.c     | 13 +++++--
 .../render/intern/source/renderdatabase.c     | 15 ++++++++
 .../blender/render/intern/source/volumetric.c | 35 ++++++++++++++++---
 source/blender/src/buttons_shading.c          |  9 +++++
 7 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index d20ea600fea..814e9b9ab66 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -70,7 +70,7 @@ typedef struct Material {
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
-	float vpad2;
+	float vol_part_searchradius;
 	short vol_raydepth;
 	short vol_shadeflag;
 	
@@ -351,6 +351,7 @@ typedef struct Material {
 #define MA_VOL_SHADED		1
 #define MA_VOL_ATTENUATED	2
 #define MA_VOL_SHADOWED		4
+#define MA_VOL_PARTICLES	8
 
 #endif
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 1768b052b54..2db70c460f9 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -198,6 +198,8 @@ struct Render
 	ListBase *sss_points;
 	struct Material *sss_mat;
 
+	struct KDTree *particles_tree;
+
 	ListBase customdata_names;
 
 	struct Object *excludeob;
@@ -347,6 +349,16 @@ typedef struct HaloRen
 
 /* ------------------------------------------------------------------------- */
 
+typedef struct ParticleRen
+{
+	struct ParticleRen *next, *prev;
+	float co[3];	// location
+	// float col[3]; // colour
+	// float vec[3]; // direction
+} ParticleRen;
+
+/* ------------------------------------------------------------------------- */
+
 typedef struct StrandVert {
 	float co[3];
 	float strandco;
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index dc28eae1cc2..6fcd8576ed9 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -98,6 +98,8 @@ struct HaloRen *RE_inithalo(struct Render *re, struct ObjectRen *obr, struct Mat
 struct HaloRen *RE_inithalo_particle(struct Render *re, struct ObjectRen *obr, struct DerivedMesh *dm, struct Material *ma,   float *vec,   float *vec1, float *orco, float *uvco, float hasize, float vectsize, int seed);
 struct StrandBuffer *RE_addStrandBuffer(struct ObjectRen *obr, int totvert);
 
+struct ParticleRen *RE_cache_particle(Render *re, float *co, int index, float *vec);
+
 struct ObjectRen *RE_addRenderObject(struct Render *re, struct Object *ob, struct Object *par, int index, int psysindex, int lay);
 struct ObjectInstanceRen *RE_addRenderInstance(struct Render *re, struct ObjectRen *obr, struct Object *ob, struct Object *par, int index, int psysindex, float mat[][4], int lay);
 void RE_makeRenderInstances(struct Render *re);
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 17cd71ecb79..5eac30bf3be 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -41,6 +41,7 @@
 #include "BLI_rand.h"
 #include "BLI_memarena.h"
 #include "BLI_ghash.h"
+#include "BLI_kdtree.h"
 
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
@@ -1475,8 +1476,9 @@ static void render_new_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Mat
 			static_particle_strand(re, obr, ma, orco, surfnor, uvco, totuv, mcol, totcol, loc, loc1, time, first, line, adapt, adapt_angle, adapt_pix, override_uv);
 	}
 	else{
-		har= RE_inithalo_particle(re, obr, dm, ma, loc, NULL, orco, uvco, size, 0.0, seed);
-		if(har) har->lay= obr->ob->lay;
+		//har= RE_inithalo_particle(re, obr, dm, ma, loc, NULL, orco, uvco, size, 0.0, seed);
+		//if(har) har->lay= obr->ob->lay;
+		RE_cache_particle(re, loc, 0, loc1);
 	}
 }
 static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem *psys, int timeoffset)
@@ -1703,6 +1705,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	if(path_nbr==0)
 		psys->lattice=psys_get_lattice(ob,psys);
 
+	re->particles_tree = BLI_kdtree_new(totpart+totchild);
+
 /* 3. start creating renderable things */
 	for(a=0,pa=pars; a<totpart+totchild; a++, pa++, seed++) {
 		random = rng_getFloat(rng);
@@ -2049,6 +2053,9 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		strandbuf->surface= cache_strand_surface(re, obr, psmd->dm, mat, timeoffset);
 
 /* 4. clean up */
+	if (re->particles_tree)
+		BLI_kdtree_balance(re->particles_tree);
+
 	if(ma) do_mat_ipo(ma);
 
 	if(orco1)
@@ -4410,6 +4417,8 @@ void RE_Database_Free(Render *re)
 	
 	BLI_freelistN(&re->lampren);
 	BLI_freelistN(&re->lights);
+		
+	BLI_kdtree_free(re->particles_tree);
 
 	free_renderdata_tables(re);
 	
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index d44b49cc706..7fc8dc05ec3 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -1041,6 +1041,21 @@ HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma,   float *vec,   f
 	return har;
 }
 
+ParticleRen *RE_cache_particle(Render *re, float *co, int index, float *vec)
+{
+	/*
+	ParticleRen *pr;
+	
+	pr= (LampRen *)MEM_callocN(sizeof(ParticleRen),"particleren");
+	VECCOPY(pr->co, co);
+	BLI_addtail(&re->vol_particles, pr);
+	*/
+	
+	BLI_kdtree_insert(re->particles_tree, index, co, vec);
+	
+	
+}
+
 HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma,   float *vec,   float *vec1, 
 				  float *orco, float *uvco, float hasize, float vectsize, int seed)
 {
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 4baeabcfa7a..83250ebfd36 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -34,6 +34,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
+#include "BLI_kdtree.h"
 
 #include "RE_shader_ext.h"
 #include "RE_raytrace.h"
@@ -127,14 +128,41 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	}
 }
 
+/* need to figure out a good default here */ 
+#define MAX_PARTICLES_NEAREST	10
+float get_particle_density(float *co, float radius)
+{
+	KDTreeNearest nearest[MAX_PARTICLES_NEAREST];
+	float density=0.0f;
+	int n, neighbours=0;
+	
+	/* no particles in preview for now - 
+	 * can check for existence of particle kdtree better later on */
+	if(R.r.scemode & R_PREVIEWBUTS)	return;
+	
+	neighbours = BLI_kdtree_find_n_nearest(R.particles_tree, MAX_PARTICLES_NEAREST, co, NULL, nearest);
+	
+	for(n=1; n<neighbours; n++) {
+		if ( nearest[n].dist < radius) {
+			/* TODO: proper falloff/filter */
+			density += 3.0f * (radius - nearest[n].dist);
+		}
+	}
+
+	return density;
+}
+
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->alpha;
 	float col[3] = {0.0, 0.0, 0.0};
-		
-	/* do any density gain stuff here */
-	if (shi->mat->flag & MA_IS_TEXTURED)
+	
+	if (shi->mat->vol_shadeflag & MA_VOL_PARTICLES) {
+		density += get_particle_density(co, shi->mat->vol_part_searchradius);
+	}
+	else if (shi->mat->flag & MA_IS_TEXTURED) {
 		do_volume_tex(shi, co, MAP_ALPHA, col, &density);
+	}
 	
 	return density;
 }
@@ -339,7 +367,6 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	float tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
 	int s;
 	float step_sta[3], step_end[3], step_mid[3];
-	float col_behind[3];
 	float alpha;
 	float density = vol_get_density(shi, co);
 	
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index a288845c39d..50e5e69ea16 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4281,6 +4281,15 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 10.0, 10, 0, "Multiplier for scattering");
+		
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOG, MA_VOL_PARTICLES, B_MATPRV, "Particles",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Render global particle cache");
+	uiDefButF(block, NUM, B_MATPRV, "Search Radius: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_part_searchradius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
+	uiBlockEndAlign(block);
 }
 
 static void material_panel_nodes(Material *ma)

From 5adff90b0868f88050e601092b35628fa3ae132b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 26 Sep 2008 07:12:36 +0000
Subject: [PATCH 011/577] * Some more tweaks to particle density rendering. I'm
 not 100% sure if this is 'correct' but so far in testing it's been working
 pretty well.

This also exposes a new 'Nearest' value, to determine how many
nearby particles are taken into account when determining density.
A greater number is more accurate, but slower.
---
 source/blender/blenkernel/intern/material.c    |  4 +++-
 source/blender/blenloader/intern/readfile.c    |  2 ++
 source/blender/makesdna/DNA_material_types.h   |  3 +++
 .../render/intern/source/renderdatabase.c      |  2 +-
 .../blender/render/intern/source/volumetric.c  | 18 ++++++++++++------
 source/blender/src/buttons_shading.c           |  4 +++-
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 8f4e65576d8..04a68d1b1e1 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -173,7 +173,9 @@ void init_material(Material *ma)
 	ma->vol_scattering = 1.0f;
 	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
 	ma->vol_raydepth = 15;
-
+	ma->vol_part_maxnearest = 5;
+	ma->vol_part_searchradius = 0.2f;
+	
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
 	ma->preview = NULL;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 658c14f5876..49ad3096957 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7872,6 +7872,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_scattering = 1.0f;
 				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
 				if (ma->vol_raydepth == 0) ma->vol_raydepth = 15;
+				if (ma->vol_part_maxnearest == 0) ma->vol_part_maxnearest = 5;
+				if (ma->vol_part_searchradius < 0.001f) ma->vol_part_searchradius = 0.20;
 			}
 		}
 	}
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 814e9b9ab66..dc23e7fcc6a 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -72,7 +72,10 @@ typedef struct Material {
 	float vol_absorption_col[3];
 	float vol_part_searchradius;
 	short vol_raydepth;
+	short vol_part_maxnearest;
 	short vol_shadeflag;
+	short vol_pad[3];
+	
 	
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index 7fc8dc05ec3..14288167c4a 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -1051,7 +1051,7 @@ ParticleRen *RE_cache_particle(Render *re, float *co, int index, float *vec)
 	BLI_addtail(&re->vol_particles, pr);
 	*/
 	
-	BLI_kdtree_insert(re->particles_tree, index, co, vec);
+	BLI_kdtree_insert(re->particles_tree, index, co, NULL);
 	
 	
 }
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 83250ebfd36..543c89f6b96 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -129,8 +129,8 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 }
 
 /* need to figure out a good default here */ 
-#define MAX_PARTICLES_NEAREST	10
-float get_particle_density(float *co, float radius)
+#define MAX_PARTICLES_NEAREST	50
+float get_particle_density(float *co, float radius, int max_nearest)
 {
 	KDTreeNearest nearest[MAX_PARTICLES_NEAREST];
 	float density=0.0f;
@@ -140,14 +140,20 @@ float get_particle_density(float *co, float radius)
 	 * can check for existence of particle kdtree better later on */
 	if(R.r.scemode & R_PREVIEWBUTS)	return;
 	
-	neighbours = BLI_kdtree_find_n_nearest(R.particles_tree, MAX_PARTICLES_NEAREST, co, NULL, nearest);
+	neighbours = BLI_kdtree_find_n_nearest(R.particles_tree, max_nearest, co, NULL, nearest);
 	
 	for(n=1; n<neighbours; n++) {
 		if ( nearest[n].dist < radius) {
-			/* TODO: proper falloff/filter */
-			density += 3.0f * (radius - nearest[n].dist);
+			float dist = 1.0 - (nearest[n].dist / radius);
+			
+			density += 3.0f*dist*dist - 2.0f*dist*dist*dist;
+
+			
 		}
 	}
+	
+	density /= neighbours;
+	density *= 1.0 / radius;
 
 	return density;
 }
@@ -158,7 +164,7 @@ float vol_get_density(struct ShadeInput *shi, float *co)
 	float col[3] = {0.0, 0.0, 0.0};
 	
 	if (shi->mat->vol_shadeflag & MA_VOL_PARTICLES) {
-		density += get_particle_density(co, shi->mat->vol_part_searchradius);
+		density += get_particle_density(co, shi->mat->vol_part_searchradius, shi->mat->vol_part_maxnearest);
 	}
 	else if (shi->mat->flag & MA_IS_TEXTURED) {
 		do_volume_tex(shi, co, MAP_ALPHA, col, &density);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 50e5e69ea16..4e6560a035a 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4287,8 +4287,10 @@ static void material_panel_material_volume(Material *ma)
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, MA_VOL_PARTICLES, B_MATPRV, "Particles",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Render global particle cache");
-	uiDefButF(block, NUM, B_MATPRV, "Search Radius: ",
+	uiDefButF(block, NUM, B_MATPRV, "Radius: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_part_searchradius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
+	uiDefButS(block, NUM, B_MATPRV, "Nearby: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_part_maxnearest), 2.0, 30.0, 10, 2, "The number of nearby particles to check for density");
 	uiBlockEndAlign(block);
 }
 

From 8056705ae9b2467a013f2372c0579687d3723229 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 28 Sep 2008 08:00:22 +0000
Subject: [PATCH 012/577] * Volumetrics

Removed all the old particle rendering code and options I had in there
before, in order to make way for...

A new procedural texture: 'Point Density'

Point Density is a 3d texture that find the density of a group of 'points'
in space and returns that in the texture as an intensity value. Right now,
its at an early stage and it's only enabled for particles, but it would be
cool to extend it later for things like object vertices, or point cache
files from disk - i.e. to import point cloud data into Blender for
rendering volumetrically.

Currently there are just options for an Object and its particle system
number, this is the particle system that will get cached before rendering,
and then used for the texture's density estimation.

It works totally consistent with as any other procedural texture, so
previously where I've mapped a clouds texture to volume density to make
some of those test renders, now I just map a point density texture to
volume density.

Here's a version of the same particle smoke test file from before, updated
to use the point density texture instead:
http://mke3.net/blender/devel/rendering/volumetrics/smoke_test02.blend

There are a few cool things about implementing this as a texture:

- The one texture (and cache) can be instanced across many different
materials:
http://mke3.net/blender/devel/rendering/volumetrics/pointdensity_instanced.png

This means you can calculate and bake one particle system, but render it
multiple times across the scene, with different material settings, at no
extra memory cost.

Right now, the particles are cached in world space, so you have to map it
globally, and if you want it offset, you have to do it in the material (as
in the file above). I plan to add an option to bake in local space, so you
can just map the texture to local and it just works.

- It also works for solid surfaces too, it just gets the density at that
particular point on the surface, eg:
http://mke3.net/blender/devel/rendering/volumetrics/pointdensity_solid.mov

- You can map it to whatever you want, not only density but the various
emissions and colours as well. I'd like to investigate using the other
outputs in the texture too (like the RGB or normal outputs), perhaps with
options to colour by particle age, generating normals for making particle
'dents' in a surface, whatever!
---
 source/blender/blenkernel/BKE_texture.h       |   6 +
 source/blender/blenkernel/intern/material.c   |   2 -
 source/blender/blenkernel/intern/texture.c    |  47 +++++
 source/blender/blenloader/intern/readfile.c   |   7 +-
 source/blender/blenloader/intern/writefile.c  |   1 +
 source/blender/makesdna/DNA_material_types.h  |   8 +-
 source/blender/makesdna/DNA_texture_types.h   |  30 +++
 .../render/intern/include/pointdensity.h      |  43 ++++
 .../render/intern/include/render_types.h      |  11 -
 .../render/intern/include/renderdatabase.h    |   2 -
 .../render/intern/source/convertblender.c     |  18 +-
 .../render/intern/source/pointdensity.c       | 195 ++++++++++++++++++
 .../render/intern/source/renderdatabase.c     |  15 --
 source/blender/render/intern/source/texture.c |   4 +
 .../blender/render/intern/source/volumetric.c |  35 +---
 source/blender/src/buttons_shading.c          |  61 ++++--
 16 files changed, 391 insertions(+), 94 deletions(-)
 create mode 100644 source/blender/render/intern/include/pointdensity.h
 create mode 100644 source/blender/render/intern/source/pointdensity.c

diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index cfcae3c44bc..e16ac2d369b 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -39,6 +39,7 @@ struct ColorBand;
 struct HaloRen;
 struct TexMapping;
 struct EnvMap;
+struct PointDensity;
 
 /*  in ColorBand struct */
 #define MAXCOLORBAND 32
@@ -74,6 +75,11 @@ void    BKE_free_envmap(struct EnvMap *env);
 struct EnvMap *BKE_add_envmap(void);
 struct EnvMap *BKE_copy_envmap(struct EnvMap *env);
 
+void    BKE_free_pointdensitydata(struct PointDensity *pd);
+void    BKE_free_pointdensity(struct PointDensity *pd);
+struct PointDensity *BKE_add_pointdensity(void);
+struct PointDensity *BKE_copy_pointdensity(struct PointDensity *pd);
+
 int     BKE_texture_dependsOnTime(const struct Tex *texture);
 
 #endif
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 04a68d1b1e1..64125d5834e 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -173,8 +173,6 @@ void init_material(Material *ma)
 	ma->vol_scattering = 1.0f;
 	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
 	ma->vol_raydepth = 15;
-	ma->vol_part_maxnearest = 5;
-	ma->vol_part_searchradius = 0.2f;
 	
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index bb726887d32..62bab45dd50 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -409,6 +409,7 @@ void free_texture(Tex *tex)
 	free_plugin_tex(tex->plugin);
 	if(tex->coba) MEM_freeN(tex->coba);
 	if(tex->env) BKE_free_envmap(tex->env);
+	if(tex->pd) BKE_free_pointdensity(tex->pd);
 	BKE_previewimg_free(&tex->preview);
 	BKE_icon_delete((struct ID*)tex);
 	tex->id.icon_id = 0;
@@ -470,6 +471,11 @@ void default_tex(Tex *tex)
 		tex->env->depth=0;
 	}
 
+	if (tex->pd) {
+		tex->pd->radius = 0.3f;
+		tex->pd->nearest = 5;
+	}
+
 	pit = tex->plugin;
 	if (pit) {
 		varstr= pit->varstr;
@@ -566,6 +572,7 @@ Tex *copy_texture(Tex *tex)
 	
 	if(texn->coba) texn->coba= MEM_dupallocN(texn->coba);
 	if(texn->env) texn->env= BKE_copy_envmap(texn->env);
+	if(texn->pd) texn->pd= BKE_copy_pointdensity(texn->pd);
 	
 	if(tex->preview) texn->preview = BKE_previewimg_copy(tex->preview);
 
@@ -858,6 +865,46 @@ void BKE_free_envmap(EnvMap *env)
 	
 }
 
+/* ------------------------------------------------------------------------- */
+
+PointDensity *BKE_add_pointdensity(void)
+{
+	PointDensity *pd;
+	
+	pd= MEM_callocN(sizeof(PointDensity), "pointdensity");
+	pd->radius = 0.3f;
+	pd->nearest = 5;
+	pd->type = TEX_PD_PSYS;
+	pd->point_tree = NULL;
+	
+	return pd;
+} 
+
+PointDensity *BKE_copy_pointdensity(PointDensity *pd)
+{
+	PointDensity *pdn;
+	int a;
+	
+	pdn= MEM_dupallocN(pd);
+	pdn->point_tree = NULL;
+	
+	return pd;
+}
+
+void BKE_free_pointdensitydata(PointDensity *pd)
+{
+	if (pd->point_tree) {
+		BLI_kdtree_free(pd->point_tree);
+		pd->point_tree = NULL;
+	}
+}
+
+void BKE_free_pointdensity(PointDensity *pd)
+{
+	BKE_free_pointdensitydata(pd);
+	MEM_freeN(pd);
+}
+
 /* ------------------------------------------------------------------------- */
 int BKE_texture_dependsOnTime(const struct Tex *texture)
 {
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e80d2c7ce67..8aa0c8c5d5e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2475,6 +2475,7 @@ static void lib_link_texture(FileData *fd, Main *main)
 			tex->ima= newlibadr_us(fd, tex->id.lib, tex->ima);
 			tex->ipo= newlibadr_us(fd, tex->id.lib, tex->ipo);
 			if(tex->env) tex->env->object= newlibadr(fd, tex->id.lib, tex->env->object);
+			if(tex->pd) tex->pd->object= newlibadr(fd, tex->id.lib, tex->pd->object);
 
 			tex->id.flag -= LIB_NEEDLINK;
 		}
@@ -2501,6 +2502,10 @@ static void direct_link_texture(FileData *fd, Tex *tex)
 		memset(tex->env->cube, 0, 6*sizeof(void *));
 		tex->env->ok= 0;
 	}
+	tex->pd= newdataadr(fd, tex->pd);
+	if(tex->pd) {
+		tex->pd->point_tree = NULL;
+	}
 	tex->preview = direct_link_preview_image(fd, tex->preview);
 
 	tex->iuser.ok= 1;
@@ -7885,8 +7890,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_scattering = 1.0f;
 				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
 				if (ma->vol_raydepth == 0) ma->vol_raydepth = 15;
-				if (ma->vol_part_maxnearest == 0) ma->vol_part_maxnearest = 5;
-				if (ma->vol_part_searchradius < 0.001f) ma->vol_part_searchradius = 0.20;
 			}
 		}
 	}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index e53c725867a..c4ae6ef858b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1334,6 +1334,7 @@ static void write_textures(WriteData *wd, ListBase *idbase)
 			if(tex->plugin) writestruct(wd, DATA, "PluginTex", 1, tex->plugin);
 			if(tex->coba) writestruct(wd, DATA, "ColorBand", 1, tex->coba);
 			if(tex->env) writestruct(wd, DATA, "EnvMap", 1, tex->env);
+			if(tex->pd) writestruct(wd, DATA, "PointDensity", 1, tex->pd);
 			
 			write_previews(wd, tex->preview);
 		}
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index dc23e7fcc6a..5d5ae042950 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -70,13 +70,10 @@ typedef struct Material {
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
-	float vol_part_searchradius;
 	short vol_raydepth;
-	short vol_part_maxnearest;
 	short vol_shadeflag;
-	short vol_pad[3];
-	
-	
+	int volpad;
+		
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
 	float filter;		/* filter added, for raytrace transparency and transmissivity */
@@ -354,7 +351,6 @@ typedef struct Material {
 #define MA_VOL_SHADED		1
 #define MA_VOL_ATTENUATED	2
 #define MA_VOL_SHADOWED		4
-#define MA_VOL_PARTICLES	8
 
 #endif
 
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 111dc08ee02..ed172c24474 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -127,6 +127,22 @@ typedef struct EnvMap {
 	short recalc, lastsize;
 } EnvMap;
 
+typedef struct PointDensity {
+	short flag;
+
+	short nearest;
+	float radius;
+
+	short type;
+	short pdpad[3];
+
+	struct Object *object;	/* for 'Particle system' type - source object */
+	short psysindex;		/* and object's psys number */
+	short pdpad2[3];
+	
+	void *point_tree;		/* the kd-tree containing points */
+} PointDensity;
+
 typedef struct Tex {
 	ID id;
 	
@@ -172,6 +188,7 @@ typedef struct Tex {
 	struct ColorBand *coba;
 	struct EnvMap *env;
 	struct PreviewImage * preview;
+	struct PointDensity *pd;
 	
 } Tex;
 
@@ -208,6 +225,8 @@ typedef struct TexMapping {
 #define TEX_MUSGRAVE	11
 #define TEX_VORONOI		12
 #define TEX_DISTNOISE	13
+/* predicting ocean texture for 14 */
+#define TEX_POINTDENSITY	15
 
 /* musgrave stype */
 #define TEX_MFRACTAL		0
@@ -385,5 +404,16 @@ typedef struct TexMapping {
 #define ENV_NORMAL	1
 #define ENV_OSA		2
 
+/* **************** PointDensity ********************* */
+
+/* type */
+#define TEX_PD_PSYS			0
+#define TEX_PD_OBJECT		1
+#define TEX_PD_FILE			2
+
+/* psys_space */
+#define TEX_PD_PSYS_WORLDSPACE	0
+#define TEX_PD_PSYS_OBJECTSPACE	1
+
 #endif
 
diff --git a/source/blender/render/intern/include/pointdensity.h b/source/blender/render/intern/include/pointdensity.h
new file mode 100644
index 00000000000..9c21cc0c253
--- /dev/null
+++ b/source/blender/render/intern/include/pointdensity.h
@@ -0,0 +1,43 @@
+/*
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef POINTDENSITY_H
+#define POINTDENSITY_H 
+
+/**
+ * Make point density kd-trees for all point density textures in the scene
+ */
+
+struct Render;
+struct TexResult;
+
+void make_pointdensities(struct Render *re);
+int pointdensitytex(struct Tex *tex, float *texvec, struct TexResult *texres);
+
+#endif /* POINTDENSITY_H */
+
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 2db70c460f9..b0003cadb55 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -198,8 +198,6 @@ struct Render
 	ListBase *sss_points;
 	struct Material *sss_mat;
 
-	struct KDTree *particles_tree;
-
 	ListBase customdata_names;
 
 	struct Object *excludeob;
@@ -347,15 +345,6 @@ typedef struct HaloRen
     struct Material *mat;
 } HaloRen;
 
-/* ------------------------------------------------------------------------- */
-
-typedef struct ParticleRen
-{
-	struct ParticleRen *next, *prev;
-	float co[3];	// location
-	// float col[3]; // colour
-	// float vec[3]; // direction
-} ParticleRen;
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index 6fcd8576ed9..dc28eae1cc2 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -98,8 +98,6 @@ struct HaloRen *RE_inithalo(struct Render *re, struct ObjectRen *obr, struct Mat
 struct HaloRen *RE_inithalo_particle(struct Render *re, struct ObjectRen *obr, struct DerivedMesh *dm, struct Material *ma,   float *vec,   float *vec1, float *orco, float *uvco, float hasize, float vectsize, int seed);
 struct StrandBuffer *RE_addStrandBuffer(struct ObjectRen *obr, int totvert);
 
-struct ParticleRen *RE_cache_particle(Render *re, float *co, int index, float *vec);
-
 struct ObjectRen *RE_addRenderObject(struct Render *re, struct Object *ob, struct Object *par, int index, int psysindex, int lay);
 struct ObjectInstanceRen *RE_addRenderInstance(struct Render *re, struct ObjectRen *obr, struct Object *ob, struct Object *par, int index, int psysindex, float mat[][4], int lay);
 void RE_makeRenderInstances(struct Render *re);
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 5eac30bf3be..40e9a32d003 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -103,6 +103,7 @@
 #include "envmap.h"
 #include "multires.h"
 #include "occlusion.h"
+#include "pointdensity.h"
 #include "render_types.h"
 #include "rendercore.h"
 #include "renderdatabase.h"
@@ -1476,9 +1477,8 @@ static void render_new_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Mat
 			static_particle_strand(re, obr, ma, orco, surfnor, uvco, totuv, mcol, totcol, loc, loc1, time, first, line, adapt, adapt_angle, adapt_pix, override_uv);
 	}
 	else{
-		//har= RE_inithalo_particle(re, obr, dm, ma, loc, NULL, orco, uvco, size, 0.0, seed);
-		//if(har) har->lay= obr->ob->lay;
-		RE_cache_particle(re, loc, 0, loc1);
+		har= RE_inithalo_particle(re, obr, dm, ma, loc, NULL, orco, uvco, size, 0.0, seed);
+		if(har) har->lay= obr->ob->lay;
 	}
 }
 static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem *psys, int timeoffset)
@@ -1705,8 +1705,6 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	if(path_nbr==0)
 		psys->lattice=psys_get_lattice(ob,psys);
 
-	re->particles_tree = BLI_kdtree_new(totpart+totchild);
-
 /* 3. start creating renderable things */
 	for(a=0,pa=pars; a<totpart+totchild; a++, pa++, seed++) {
 		random = rng_getFloat(rng);
@@ -2053,8 +2051,6 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 		strandbuf->surface= cache_strand_surface(re, obr, psmd->dm, mat, timeoffset);
 
 /* 4. clean up */
-	if (re->particles_tree)
-		BLI_kdtree_balance(re->particles_tree);
 
 	if(ma) do_mat_ipo(ma);
 
@@ -4417,8 +4413,6 @@ void RE_Database_Free(Render *re)
 	
 	BLI_freelistN(&re->lampren);
 	BLI_freelistN(&re->lights);
-		
-	BLI_kdtree_free(re->particles_tree);
 
 	free_renderdata_tables(re);
 	
@@ -4441,6 +4435,8 @@ void RE_Database_Free(Render *re)
 	end_radio_render();
 	end_render_materials();
 	
+	free_pointdensities(re);
+	
 	if(re->wrld.aosphere) {
 		MEM_freeN(re->wrld.aosphere);
 		re->wrld.aosphere= NULL;
@@ -4890,6 +4886,10 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 			/* ENVIRONMENT MAPS */
 			if(!re->test_break())
 				make_envmaps(re);
+				
+			/* point density texture */
+			if(!re->test_break())
+				make_pointdensities(re);
 		}
 		
 		if(!re->test_break())
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
new file mode 100644
index 00000000000..00dbbd34f96
--- /dev/null
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -0,0 +1,195 @@
+/* 
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributors: Matt Ebb
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "BLI_kdtree.h"
+
+#include "BKE_DerivedMesh.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+
+#include "DNA_texture_types.h"
+#include "DNA_particle_types.h"
+
+#include "render_types.h"
+#include "texture.h"
+
+
+static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, ParticleSystem *psys)
+{
+	DerivedMesh* dm;
+	ParticleKey state;
+	float cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
+	int i, childexists;
+			
+	/* init crap */
+	if (!psys || !ob || !pd) return;
+	
+	/* Just to create a valid rendering context */
+	psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, 0);
+	
+	dm = mesh_create_derived_render(ob,CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
+	dm->release(dm);
+	
+	if ( !psys_check_enabled(ob, psys) ){
+		psys_render_restore(ob, psys);
+		return;
+	}
+	
+	/* finally do something */
+	pd->point_tree = BLI_kdtree_new(psys->totpart+psys->totchild);
+	
+	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
+		childexists = 1;
+	
+	for (i = 0; i < psys->totpart + psys->totchild; i++) {
+
+		state.time = cfra;
+		if(psys_get_particle_state(ob, psys, i, &state, 0)) {
+			BLI_kdtree_insert(pd->point_tree, 0, state.co, NULL);
+		}
+	}
+	
+	BLI_kdtree_balance(pd->point_tree);
+	psys_render_restore(ob, psys);
+}
+
+
+static void cache_pointdensity(Render *re, Tex *tex)
+{
+	PointDensity *pd = tex->pd;
+
+	if (pd->point_tree) {
+		BLI_kdtree_free(pd->point_tree);
+		pd->point_tree = NULL;
+	}
+	
+	if (pd->type == TEX_PD_PSYS) {
+		ParticleSystem *psys;
+		Object *ob = pd->object;
+		int i;
+		
+		for(psys=ob->particlesystem.first, i=0; i< pd->psysindex-1; i++)
+			psys= psys->next;
+		
+		if (!ob || !psys) return;
+		
+		pointdensity_cache_psys(re, pd, ob, psys);
+	}
+}
+
+static void free_pointdensity(Render *re, Tex *tex)
+{
+	PointDensity *pd = tex->pd;
+
+	if (pd->point_tree) {
+		BLI_kdtree_free(pd->point_tree);
+		pd->point_tree = NULL;
+	}
+}
+
+
+
+void make_pointdensities(Render *re)
+{
+	Tex *tex;
+	
+	if(re->scene->r.scemode & R_PREVIEWBUTS)
+		return;
+	
+	re->i.infostr= "Caching Point Densities";
+	re->stats_draw(&re->i);
+
+	for (tex= G.main->tex.first; tex; tex= tex->id.next) {
+		if(tex->id.us && tex->type==TEX_POINTDENSITY) {
+			cache_pointdensity(re, tex);
+		}
+	}
+}
+
+void free_pointdensities(Render *re)
+{
+	Tex *tex;
+	
+	if(re->scene->r.scemode & R_PREVIEWBUTS)
+		return;
+	
+	for (tex= G.main->tex.first; tex; tex= tex->id.next) {
+		if(tex->id.us && tex->type==TEX_POINTDENSITY) {
+			free_pointdensity(re, tex);
+		}
+	}
+}
+
+#define MAX_POINTS_NEAREST	25
+int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
+{
+	int rv = TEX_INT;
+	
+	PointDensity *pd = tex->pd;
+	KDTreeNearest nearest[MAX_POINTS_NEAREST];
+	float density=0.0f;
+	int n, neighbours=0;
+	
+	if ((!pd) || (!pd->point_tree)) {
+		texres->tin = 0.0f;
+		return 0;
+	}
+	
+	neighbours = BLI_kdtree_find_n_nearest(pd->point_tree, pd->nearest, texvec, NULL, nearest);
+	
+	for(n=1; n<neighbours; n++) {
+		if ( nearest[n].dist < pd->radius) {
+			float dist = 1.0 - (nearest[n].dist / pd->radius);
+			
+			density += 3.0f*dist*dist - 2.0f*dist*dist*dist;
+		}
+	}
+	
+	density /= neighbours;
+	density *= 1.0 / pd->radius;
+
+	texres->tin = density;
+
+	/*
+	texres->tr = 1.0f;
+	texres->tg = 1.0f;
+	texres->tb = 0.0f;
+	
+	BRICONTRGB;
+	
+	texres->ta = 1.0;
+	
+	if (texres->nor!=NULL) {
+		texres->nor[0] = texres->nor[1] = texres->nor[2] = 0.0f;
+	}
+	*/
+	
+	BRICONT;
+	
+	return rv;
+}
\ No newline at end of file
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index 14288167c4a..d44b49cc706 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -1041,21 +1041,6 @@ HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma,   float *vec,   f
 	return har;
 }
 
-ParticleRen *RE_cache_particle(Render *re, float *co, int index, float *vec)
-{
-	/*
-	ParticleRen *pr;
-	
-	pr= (LampRen *)MEM_callocN(sizeof(ParticleRen),"particleren");
-	VECCOPY(pr->co, co);
-	BLI_addtail(&re->vol_particles, pr);
-	*/
-	
-	BLI_kdtree_insert(re->particles_tree, index, co, NULL);
-	
-	
-}
-
 HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma,   float *vec,   float *vec1, 
 				  float *orco, float *uvco, float hasize, float vectsize, int seed)
 {
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 2c143986900..3df53f7041a 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -62,6 +62,7 @@
 #include "BKE_ipo.h"
 
 #include "envmap.h"
+#include "pointdensity.h"
 #include "renderpipeline.h"
 #include "render_types.h"
 #include "rendercore.h"
@@ -1216,6 +1217,9 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
 		
 		retval= mg_distNoiseTex(tex, tmpvec, texres);
 		break;
+	case TEX_POINTDENSITY:
+		retval= pointdensitytex(tex, texvec, texres);
+		break;
 	}
 
 	if (tex->flag & TEX_COLORBAND) {
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 543c89f6b96..dcff34429b6 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -128,45 +128,12 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	}
 }
 
-/* need to figure out a good default here */ 
-#define MAX_PARTICLES_NEAREST	50
-float get_particle_density(float *co, float radius, int max_nearest)
-{
-	KDTreeNearest nearest[MAX_PARTICLES_NEAREST];
-	float density=0.0f;
-	int n, neighbours=0;
-	
-	/* no particles in preview for now - 
-	 * can check for existence of particle kdtree better later on */
-	if(R.r.scemode & R_PREVIEWBUTS)	return;
-	
-	neighbours = BLI_kdtree_find_n_nearest(R.particles_tree, max_nearest, co, NULL, nearest);
-	
-	for(n=1; n<neighbours; n++) {
-		if ( nearest[n].dist < radius) {
-			float dist = 1.0 - (nearest[n].dist / radius);
-			
-			density += 3.0f*dist*dist - 2.0f*dist*dist*dist;
-
-			
-		}
-	}
-	
-	density /= neighbours;
-	density *= 1.0 / radius;
-
-	return density;
-}
-
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->alpha;
 	float col[3] = {0.0, 0.0, 0.0};
 	
-	if (shi->mat->vol_shadeflag & MA_VOL_PARTICLES) {
-		density += get_particle_density(co, shi->mat->vol_part_searchradius, shi->mat->vol_part_maxnearest);
-	}
-	else if (shi->mat->flag & MA_IS_TEXTURED) {
+	if (shi->mat->flag & MA_IS_TEXTURED) {
 		do_volume_tex(shi, co, MAP_ALPHA, col, &density);
 	}
 	
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 0cfe469b7da..002c62c1a17 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -731,6 +731,49 @@ static void texture_panel_voronoi(Tex *tex)
 	uiDefButF(block, NUMSLI, B_TEXPRV, "W4: ", 10, 10, 150, 19, &tex->vn_w4, -2.0, 2.0, 10, 0, "Sets feature weight 4");
 }
 
+static void texture_panel_pointdensity(Tex *tex)
+{
+	uiBlock *block;
+	PointDensity *pd;
+	short yco=PANEL_YMAX;
+	
+	block= uiNewBlock(&curarea->uiblocks, "texture_panel_pointdensity", UI_EMBOSS, UI_HELV, curarea->win);
+	if(uiNewPanel(curarea, block, "Point Density", "Texture", PANELX, PANELY, PANELW, PANELH)==0) return;
+	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+	
+	if(tex->pd==NULL) {
+		tex->pd= BKE_add_pointdensity();
+		tex->pd->object= OBACT;
+	}
+	if(tex->pd) {
+		pd= tex->pd;
+
+		uiBlockBeginAlign(block);
+		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object that has the particle system");
+			
+		if (pd->object->particlesystem.first) {
+			uiDefButS(block, NUM, B_REDR, "PSys:", 
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->psysindex), 1, 10, 10, 3, "Particle system number in the object");
+		}
+		uiBlockEndAlign(block);
+		
+		yco -= YSPACE;
+		
+		uiBlockBeginAlign(block);
+		uiDefButF(block, NUM, B_REDR, "Radius: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
+		uiDefButS(block, NUM, B_REDR, "Nearby: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->nearest), 2.0, 30.0, 10, 2, "The number of nearby particles to check for density");
+		uiBlockEndAlign(block);
+		
+		uiDefBut(block, LABEL, B_NOP, " ",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	}
+	
+	
+}
+
 
 static char *layer_menu(RenderResult *rr, short *curlay)
 {
@@ -1688,7 +1731,7 @@ static void texture_panel_texture(MTex *actmtex, Material *ma, World *wrld, Lamp
 		/* newnoise: all texture types as menu, not enough room for more buttons.
 		 * Can widen panel, but looks ugly when other panels overlap it */
 		
-		sprintf(textypes, "Texture Type %%t|None %%x%d|Image %%x%d|EnvMap %%x%d|Clouds %%x%d|Marble %%x%d|Stucci %%x%d|Wood %%x%d|Magic %%x%d|Blend %%x%d|Noise %%x%d|Plugin %%x%d|Musgrave %%x%d|Voronoi %%x%d|DistortedNoise %%x%d", 0, TEX_IMAGE, TEX_ENVMAP, TEX_CLOUDS, TEX_MARBLE, TEX_STUCCI, TEX_WOOD, TEX_MAGIC, TEX_BLEND, TEX_NOISE, TEX_PLUGIN, TEX_MUSGRAVE, TEX_VORONOI, TEX_DISTNOISE);
+		sprintf(textypes, "Texture Type %%t|None %%x%d|Image %%x%d|EnvMap %%x%d|Clouds %%x%d|Marble %%x%d|Stucci %%x%d|Wood %%x%d|Magic %%x%d|Blend %%x%d|Noise %%x%d|Plugin %%x%d|Musgrave %%x%d|Voronoi %%x%d|DistortedNoise %%x%d|Point Density %%x%d", 0, TEX_IMAGE, TEX_ENVMAP, TEX_CLOUDS, TEX_MARBLE, TEX_STUCCI, TEX_WOOD, TEX_MAGIC, TEX_BLEND, TEX_NOISE, TEX_PLUGIN, TEX_MUSGRAVE, TEX_VORONOI, TEX_DISTNOISE, TEX_POINTDENSITY);
 		uiDefBut(block, LABEL, 0, "Texture Type",		160, 150, 140, 20, 0, 0.0, 0.0, 0, 0, "");
 		uiDefButS(block, MENU, B_TEXTYPE, textypes,	160, 125, 140, 25, &tex->type, 0,0,0,0, "Select texture type");
 
@@ -4272,7 +4315,7 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 10.0, 10, 0, "Multiplier for absorption");
 	uiDefButF(block, COL, B_MATPRV, "",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption_col), 0, 0, 0, B_MATCOL, "");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, ma->vol_absorption_col, 0, 0, 0, B_MATCOL, "");
 	uiBlockEndAlign(block);
 
 	yco -= YSPACE;
@@ -4288,17 +4331,6 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 10.0, 10, 0, "Multiplier for scattering");
-		
-	yco -= YSPACE;
-	
-	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, MA_VOL_PARTICLES, B_MATPRV, "Particles",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Render global particle cache");
-	uiDefButF(block, NUM, B_MATPRV, "Radius: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_part_searchradius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
-	uiDefButS(block, NUM, B_MATPRV, "Nearby: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_part_maxnearest), 2.0, 30.0, 10, 2, "The number of nearby particles to check for density");
-	uiBlockEndAlign(block);
 }
 
 static void material_panel_nodes(Material *ma)
@@ -4683,6 +4715,9 @@ void texture_panels()
 			case TEX_VORONOI:
 				texture_panel_voronoi(tex);
 				break;
+			case TEX_POINTDENSITY:
+				texture_panel_pointdensity(tex);
+				break;
 			}
 		}
 	}

From 345dc8eb9464efdf6cccac8dddc2cd24e1fe3dbb Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 28 Sep 2008 23:40:36 +0000
Subject: [PATCH 013/577] Fix: point density texture now works with the 'auto
 name' button

---
 source/blender/src/butspace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c
index 5b5c7f2d5ba..f134e9a9650 100644
--- a/source/blender/src/butspace.c
+++ b/source/blender/src/butspace.c
@@ -92,7 +92,7 @@ MTex mtexcopybuf;
 
 char texstr[20][12]= {"None"  , "Clouds" , "Wood", "Marble", "Magic"  , "Blend",
 					 "Stucci", "Noise"  , "Image", "Plugin", "EnvMap" , "Musgrave",
-					 "Voronoi", "DistNoise", "", "", "", "", "", ""};
+					 "Voronoi", "DistNoise", "", "PointDensity", "", "", "", ""};
 /*  ---------------------------------------------------------------------- */
 
 void test_idbutton_cb(void *namev, void *arg2)

From bab94c46e07563c65e7a1b0392d70814ddf0de28 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 29 Sep 2008 04:19:24 +0000
Subject: [PATCH 014/577] Point Density texture

The Point Density texture now has some additional options for how
the point locations are cached. Previously it was all relative to
worldspace, but there are now some other options that make things
a lot more convenient for mapping the texture to Local (or Orco).
Thanks to theeth for helping with the space conversions!

The new Object space options allow this sort of thing to be possible
 - a particle system, instanced on a transformed renderable object:
http://mke3.net/blender/devel/rendering/volumetrics/pd_objectspace.mov

It's also a lot easier to use multiple instances, just duplicate
the renderable objects and move them around.


The new particle cache options are:

* Emit Object space
This caches the particles relative to the emitter object's
coordinate space (i.e. relative to the emitter's object center).
This makes it possible to map the Texture to Local or Orco
easily, so you can easily move, rotate or scale the rendering
object that has the Point Density texture. It's relative to the
emitter's location, rotation and scale, so if the object you're
rendering the texture on is aligned differently to the emitter,
the results will be rotated etc.

* Emit Object Location
This offsets the particles to the emitter object's location in 3D
space. It's similar to Emit Object Space, however the emitter
object's rotation and scale are ignored. This is probably the
easiest to use, since you don't need to worry about the rotation
and scale of the emitter object (just the rendered object), so
it's the default.

* Global Space
This is the same as previously, the particles are cached in global space, so to use this effectively you'll need to map the texture to Global, and have the rendered object in the right global location.
---
 source/blender/blenkernel/intern/texture.c    |  6 +--
 source/blender/makesdna/DNA_texture_types.h   | 13 +++--
 .../render/intern/source/pointdensity.c       | 32 +++++++++++--
 source/blender/src/buttons_shading.c          | 48 ++++++++++++-------
 4 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 62bab45dd50..45fd11faa32 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -43,6 +43,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
+#include "BLI_kdtree.h"
 
 #include "DNA_texture_types.h"
 #include "DNA_key_types.h"
@@ -874,7 +875,7 @@ PointDensity *BKE_add_pointdensity(void)
 	pd= MEM_callocN(sizeof(PointDensity), "pointdensity");
 	pd->radius = 0.3f;
 	pd->nearest = 5;
-	pd->type = TEX_PD_PSYS;
+	pd->source = TEX_PD_PSYS;
 	pd->point_tree = NULL;
 	
 	return pd;
@@ -883,8 +884,7 @@ PointDensity *BKE_add_pointdensity(void)
 PointDensity *BKE_copy_pointdensity(PointDensity *pd)
 {
 	PointDensity *pdn;
-	int a;
-	
+
 	pdn= MEM_dupallocN(pd);
 	pdn->point_tree = NULL;
 	
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index ed172c24474..aef8bd95ee4 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -133,12 +133,14 @@ typedef struct PointDensity {
 	short nearest;
 	float radius;
 
-	short type;
+	short source;
 	short pdpad[3];
 
 	struct Object *object;	/* for 'Particle system' type - source object */
 	short psysindex;		/* and object's psys number */
-	short pdpad2[3];
+	short psys_cache_space;	/* cache particles in worldspace, object space, ... ? */
+	
+	short pdpad2[2];
 	
 	void *point_tree;		/* the kd-tree containing points */
 } PointDensity;
@@ -406,14 +408,15 @@ typedef struct TexMapping {
 
 /* **************** PointDensity ********************* */
 
-/* type */
+/* source */
 #define TEX_PD_PSYS			0
 #define TEX_PD_OBJECT		1
 #define TEX_PD_FILE			2
 
-/* psys_space */
-#define TEX_PD_PSYS_WORLDSPACE	0
+/* psys_cache_space */
+#define TEX_PD_PSYS_OBJECTLOC	0
 #define TEX_PD_PSYS_OBJECTSPACE	1
+#define TEX_PD_PSYS_WORLDSPACE	2
 
 #endif
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 00dbbd34f96..e589e579565 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -26,11 +26,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "BLI_arithb.h"
 #include "BLI_kdtree.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_object.h"
+#include "BKE_particle.h"
 
 #include "DNA_texture_types.h"
 #include "DNA_particle_types.h"
@@ -45,10 +48,15 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	ParticleKey state;
 	float cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
 	int i, childexists;
-			
+	float partco[3];
+	float obview[4][4];
+	
 	/* init crap */
 	if (!psys || !ob || !pd) return;
 	
+	//Mat4CpyMat4(obview, ob->obmat);
+	Mat4MulMat4(obview, re->viewinv, ob->obmat);
+	
 	/* Just to create a valid rendering context */
 	psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, 0);
 	
@@ -60,6 +68,9 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 		return;
 	}
 	
+	/* in case ob->imat isn't up-to-date */
+	Mat4Invert(ob->imat, ob->obmat);
+	
 	/* finally do something */
 	pd->point_tree = BLI_kdtree_new(psys->totpart+psys->totchild);
 	
@@ -70,7 +81,20 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 
 		state.time = cfra;
 		if(psys_get_particle_state(ob, psys, i, &state, 0)) {
-			BLI_kdtree_insert(pd->point_tree, 0, state.co, NULL);
+			
+			VECCOPY(partco, state.co);
+			
+			if (pd->psys_cache_space == TEX_PD_PSYS_OBJECTSPACE)
+				Mat4MulVecfl(ob->imat, partco);
+			else if (pd->psys_cache_space == TEX_PD_PSYS_OBJECTLOC) {
+				float obloc[3];
+				VECCOPY(obloc, ob->loc);
+				VecSubf(partco, partco, obloc);
+			} else {
+				/* TEX_PD_PSYS_WORLDSPACE */
+			}
+			
+			BLI_kdtree_insert(pd->point_tree, 0, partco, NULL);
 		}
 	}
 	
@@ -88,7 +112,7 @@ static void cache_pointdensity(Render *re, Tex *tex)
 		pd->point_tree = NULL;
 	}
 	
-	if (pd->type == TEX_PD_PSYS) {
+	if (pd->source == TEX_PD_PSYS) {
 		ParticleSystem *psys;
 		Object *ob = pd->object;
 		int i;
@@ -192,4 +216,4 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	BRICONT;
 	
 	return rv;
-}
\ No newline at end of file
+}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 002c62c1a17..5397ab84f1c 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -748,18 +748,9 @@ static void texture_panel_pointdensity(Tex *tex)
 	if(tex->pd) {
 		pd= tex->pd;
 
-		uiBlockBeginAlign(block);
-		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object that has the particle system");
-			
-		if (pd->object->particlesystem.first) {
-			uiDefButS(block, NUM, B_REDR, "PSys:", 
-				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->psysindex), 1, 10, 10, 3, "Particle system number in the object");
-		}
-		uiBlockEndAlign(block);
-		
-		yco -= YSPACE;
-		
+		uiDefBut(block, LABEL, B_NOP, "Density estimation:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+
 		uiBlockBeginAlign(block);
 		uiDefButF(block, NUM, B_REDR, "Radius: ",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
@@ -767,11 +758,36 @@ static void texture_panel_pointdensity(Tex *tex)
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->nearest), 2.0, 30.0, 10, 2, "The number of nearby particles to check for density");
 		uiBlockEndAlign(block);
 		
-		uiDefBut(block, LABEL, B_NOP, " ",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		yco = PANEL_YMAX;
+		
+		uiDefBut(block, LABEL, B_NOP, "Point data source:",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		
+		uiDefButS(block, MENU, B_TEXREDR_PRV, "Particle System %x0",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->source, 0.0, 0.0, 0, 0, "Source");
+		
+		yco -= YSPACE;
+		
+		if (pd->source == TEX_PD_PSYS) {
+			uiBlockBeginAlign(block);
+			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object that has the particle system");
+				
+			if (pd->object->particlesystem.first) {
+				uiDefButS(block, NUM, B_REDR, "PSys:", 
+					X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->psysindex), 1, 10, 10, 3, "Particle system number in the object");
+			}
+			uiBlockEndAlign(block);
+			
+			yco -= YSPACE;
+			
+			uiDefBut(block, LABEL, B_NOP, "Cache particles in:",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			uiDefButS(block, MENU, B_TEXREDR_PRV, "Emit Object Location %x0|Emit Object Space %x1|Global Space %x2",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->psys_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache particles in");
+		}
 	}
-	
-	
+
 }
 
 

From 31d6a6be68066cb0e084e0aa66e6eaf08e438851 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 29 Sep 2008 07:56:41 +0000
Subject: [PATCH 015/577] * New Point Density texture option: 'Object Vertices'

This works very similarly to particles, it just uses the object's renderable vertices as the points instead.

http://mke3.net/blender/devel/rendering/volumetrics/pd_objectvertices.png
---
 source/blender/makesdna/DNA_texture_types.h   | 16 ++---
 .../render/intern/source/pointdensity.c       | 59 +++++++++++++++++--
 source/blender/src/buttons_shading.c          | 20 ++++++-
 3 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index aef8bd95ee4..52055f24f82 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -136,11 +136,13 @@ typedef struct PointDensity {
 	short source;
 	short pdpad[3];
 
-	struct Object *object;	/* for 'Particle system' type - source object */
-	short psysindex;		/* and object's psys number */
-	short psys_cache_space;	/* cache particles in worldspace, object space, ... ? */
+	struct Object *object;	/* for 'Object' or 'Particle system' type - source object */
+	short psys_cache_space;		/* cache points in worldspace, object space, ... ? */
+	short psysindex;		/* for 'Particle system' type - object's psys number */
 	
-	short pdpad2[2];
+	short ob_cache_space;		/* cache points in worldspace, object space, ... ? */
+	
+	short pdpad2;
 	
 	void *point_tree;		/* the kd-tree containing points */
 } PointDensity;
@@ -414,9 +416,9 @@ typedef struct TexMapping {
 #define TEX_PD_FILE			2
 
 /* psys_cache_space */
-#define TEX_PD_PSYS_OBJECTLOC	0
-#define TEX_PD_PSYS_OBJECTSPACE	1
-#define TEX_PD_PSYS_WORLDSPACE	2
+#define TEX_PD_OBJECTLOC	0
+#define TEX_PD_OBJECTSPACE	1
+#define TEX_PD_WORLDSPACE	2
 
 #endif
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index e589e579565..17bc6bb58cf 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -39,6 +39,7 @@
 #include "DNA_particle_types.h"
 
 #include "render_types.h"
+#include "renderdatabase.h"
 #include "texture.h"
 
 
@@ -54,7 +55,6 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	/* init crap */
 	if (!psys || !ob || !pd) return;
 	
-	//Mat4CpyMat4(obview, ob->obmat);
 	Mat4MulMat4(obview, re->viewinv, ob->obmat);
 	
 	/* Just to create a valid rendering context */
@@ -71,7 +71,6 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	/* in case ob->imat isn't up-to-date */
 	Mat4Invert(ob->imat, ob->obmat);
 	
-	/* finally do something */
 	pd->point_tree = BLI_kdtree_new(psys->totpart+psys->totchild);
 	
 	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
@@ -84,17 +83,17 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 			
 			VECCOPY(partco, state.co);
 			
-			if (pd->psys_cache_space == TEX_PD_PSYS_OBJECTSPACE)
+			if (pd->psys_cache_space == TEX_PD_OBJECTSPACE)
 				Mat4MulVecfl(ob->imat, partco);
-			else if (pd->psys_cache_space == TEX_PD_PSYS_OBJECTLOC) {
+			else if (pd->psys_cache_space == TEX_PD_OBJECTLOC) {
 				float obloc[3];
 				VECCOPY(obloc, ob->loc);
 				VecSubf(partco, partco, obloc);
 			} else {
-				/* TEX_PD_PSYS_WORLDSPACE */
+				/* TEX_PD_WORLDSPACE */
 			}
 			
-			BLI_kdtree_insert(pd->point_tree, 0, partco, NULL);
+			BLI_kdtree_insert(pd->point_tree, i, partco, NULL);
 		}
 	}
 	
@@ -103,6 +102,38 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 }
 
 
+static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *obr)
+{
+	int i;
+	
+	if (!obr || !pd) return;
+	if(!obr->vertnodes) return;
+	
+	/* in case ob->imat isn't up-to-date */
+	Mat4Invert(obr->ob->imat, obr->ob->obmat);
+	
+	pd->point_tree = BLI_kdtree_new(obr->totvert);
+	
+	for(i=0; i<obr->totvert; i++) {
+		float ver_co[3];
+		VertRen *ver= RE_findOrAddVert(obr, i);
+		
+		VECCOPY(ver_co, ver->co);
+		
+		if (pd->ob_cache_space == TEX_PD_OBJECTSPACE) {
+			Mat4MulVecfl(re->viewinv, ver_co);
+			Mat4MulVecfl(obr->ob->imat, ver_co);
+		} else {
+			/* TEX_PD_WORLDSPACE */
+			Mat4MulVecfl(re->viewinv, ver_co);
+		}
+		
+		BLI_kdtree_insert(pd->point_tree, i, ver_co, NULL);
+	}
+	
+	BLI_kdtree_balance(pd->point_tree);
+
+}
 static void cache_pointdensity(Render *re, Tex *tex)
 {
 	PointDensity *pd = tex->pd;
@@ -124,6 +155,22 @@ static void cache_pointdensity(Render *re, Tex *tex)
 		
 		pointdensity_cache_psys(re, pd, ob, psys);
 	}
+	else if (pd->source == TEX_PD_OBJECT) {
+		Object *ob = pd->object;
+		ObjectRen *obr;
+		int found=0;
+
+		/* find the obren that corresponds to the object */
+		for (obr=re->objecttable.first; obr; obr=obr->next) {
+			if (obr->ob == ob) {
+				found=1;
+				break;
+			}
+		}
+		if (!found) return;
+		
+		pointdensity_cache_object(re, pd, obr);
+	}
 }
 
 static void free_pointdensity(Render *re, Tex *tex)
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 5397ab84f1c..873b93fb4c4 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -763,7 +763,7 @@ static void texture_panel_pointdensity(Tex *tex)
 		uiDefBut(block, LABEL, B_NOP, "Point data source:",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 		
-		uiDefButS(block, MENU, B_TEXREDR_PRV, "Particle System %x0",
+		uiDefButS(block, MENU, B_TEXREDR_PRV, "Particle System %x0|Object Vertices %x1",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->source, 0.0, 0.0, 0, 0, "Source");
 		
 		yco -= YSPACE;
@@ -786,6 +786,17 @@ static void texture_panel_pointdensity(Tex *tex)
 			uiDefButS(block, MENU, B_TEXREDR_PRV, "Emit Object Location %x0|Emit Object Space %x1|Global Space %x2",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->psys_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache particles in");
 		}
+		else if (pd->source == TEX_PD_OBJECT) {
+			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object to render as points");
+			
+			yco -= YSPACE;
+			
+			uiDefBut(block, LABEL, B_NOP, "Cache vertices in:",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			uiDefButS(block, MENU, B_TEXREDR_PRV, "Object Space %x1|Global Space %x2",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->ob_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache vertices in");
+		}
 	}
 
 }
@@ -4310,8 +4321,6 @@ static void material_panel_material_volume(Material *ma)
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
-	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base opacity value");
 	uiDefButS(block, NUM, B_MATPRV, "Layer Depth: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_raydepth), 0.0, 512.0, 10, 2, "Number of layered volume ray intersections allowed per pixel");
 	uiBlockEndAlign(block);
@@ -4327,6 +4336,11 @@ static void material_panel_material_volume(Material *ma)
 	
 	yco = PANEL_YMAX;
 	
+	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base opacity value");
+	
+	yco -= YSPACE;
+	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 10.0, 10, 0, "Multiplier for absorption");

From a667fc61d44ed35a8bfd13b062a3469a8aa88138 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 30 Sep 2008 10:41:47 +0000
Subject: [PATCH 016/577] * Removed the volume 'layer depth' control' (was used
 to limit ray intersections like as for ray transparency). It remains to be
 seen if it's even that useful, and was preventing refracting materials behind
 volumes from working easily.

---
 source/blender/blenkernel/intern/material.c      | 1 -
 source/blender/blenloader/intern/readfile.c      | 3 +--
 source/blender/makesdna/DNA_material_types.h     | 3 +--
 source/blender/render/intern/source/volumetric.c | 4 +---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 64125d5834e..f54c0ae7ab1 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -172,7 +172,6 @@ void init_material(Material *ma)
 	ma->vol_absorption = 1.0f;
 	ma->vol_scattering = 1.0f;
 	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
-	ma->vol_raydepth = 15;
 	
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8aa0c8c5d5e..555a7455c60 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7888,8 +7888,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_stepsize = 0.2f;
 				ma->vol_absorption = 1.0f;
 				ma->vol_scattering = 1.0f;
-				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
-				if (ma->vol_raydepth == 0) ma->vol_raydepth = 15;
+				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;	
 			}
 		}
 	}
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 5d5ae042950..8215f73d8ce 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -70,9 +70,8 @@ typedef struct Material {
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
-	short vol_raydepth;
 	short vol_shadeflag;
-	int volpad;
+	short volpad[3];
 		
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index dcff34429b6..4d138ea8545 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -436,7 +436,6 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	
 	shi_new.mask= shi->mask;
 	shi_new.osatex= shi->osatex;
-	shi_new.depth= shi->depth + 1;
 	shi_new.thread= shi->thread;
 	shi_new.xs= shi->xs;
 	shi_new.ys= shi->ys;
@@ -450,8 +449,7 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	
 	memset(&shr_new, 0, sizeof(ShadeResult));
 	
-	if (shi->depth < shi->mat->vol_raydepth) 
-		shade_ray(is, &shi_new, &shr_new);
+	shade_ray(is, &shi_new, &shr_new);
 	
 	col[0] = shr_new.combined[0];
 	col[1] = shr_new.combined[1];

From 3c99a0f73539e5a3c8ceeb02e6c5a21ed4985f71 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 30 Sep 2008 23:58:48 +0000
Subject: [PATCH 017/577] Fix for build error, mustn't have committed this
 properly last night

---
 source/blender/src/buttons_shading.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 873b93fb4c4..85154682819 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -755,7 +755,7 @@ static void texture_panel_pointdensity(Tex *tex)
 		uiDefButF(block, NUM, B_REDR, "Radius: ",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
 		uiDefButS(block, NUM, B_REDR, "Nearby: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->nearest), 2.0, 30.0, 10, 2, "The number of nearby particles to check for density");
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->nearest), 2.0, 25.0, 10, 2, "The number of nearby particles to check for density (higher is more accurate, but slower)");
 		uiBlockEndAlign(block);
 		
 		yco = PANEL_YMAX;
@@ -4321,8 +4321,6 @@ static void material_panel_material_volume(Material *ma)
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
-	uiDefButS(block, NUM, B_MATPRV, "Layer Depth: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_raydepth), 0.0, 512.0, 10, 2, "Number of layered volume ray intersections allowed per pixel");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;

From 8622cbca359d77eb980250b42d0635c0dddfa48b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 1 Oct 2008 03:35:53 +0000
Subject: [PATCH 018/577] * Point Density texture

Replaced the previous KD-tree (for caching points) with a
BVH-tree (thanks to Andre 'jaguarandi' Pinto for help here!).

The bvh is quite a bit faster and doesn't suffer some of the
artifacts that were apparent with the kd-tree.

I've also added a choice of falloff types: Standard, Smooth, and
Sharp. Standard gives a harder edge, easier to see individual
particles, and when used with a larger radius, Smooth and Sharp
falloffs make a much cloudier appearance possible. See the image
below (note the settings and render times too)

http://mke3.net/blender/devel/rendering/volumetrics/pointdensity_bvh.jpg
---
 source/blender/blenkernel/intern/texture.c    |  16 ++-
 source/blender/blenlib/BLI_kdopbvh.h          |   7 ++
 source/blender/blenlib/intern/BLI_kdopbvh.c   | 109 ++++++++++++++++--
 source/blender/makesdna/DNA_texture_types.h   |  13 ++-
 .../render/intern/source/pointdensity.c       |  72 ++++++++----
 source/blender/src/buttons_shading.c          |  11 +-
 6 files changed, 183 insertions(+), 45 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 45fd11faa32..ec34fcf4103 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -43,7 +43,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
-#include "BLI_kdtree.h"
+#include "BLI_kdopbvh.h"
 
 #include "DNA_texture_types.h"
 #include "DNA_key_types.h"
@@ -474,7 +474,7 @@ void default_tex(Tex *tex)
 
 	if (tex->pd) {
 		tex->pd->radius = 0.3f;
-		tex->pd->nearest = 5;
+		tex->pd->falloff_type = TEX_PD_FALLOFF_STD;
 	}
 
 	pit = tex->plugin;
@@ -874,9 +874,10 @@ PointDensity *BKE_add_pointdensity(void)
 	
 	pd= MEM_callocN(sizeof(PointDensity), "pointdensity");
 	pd->radius = 0.3f;
-	pd->nearest = 5;
+	pd->falloff_type = TEX_PD_FALLOFF_STD;
 	pd->source = TEX_PD_PSYS;
 	pd->point_tree = NULL;
+	//pd->point_data = NULL;
 	
 	return pd;
 } 
@@ -887,6 +888,7 @@ PointDensity *BKE_copy_pointdensity(PointDensity *pd)
 
 	pdn= MEM_dupallocN(pd);
 	pdn->point_tree = NULL;
+	//pdn->point_data = NULL;
 	
 	return pd;
 }
@@ -894,9 +896,15 @@ PointDensity *BKE_copy_pointdensity(PointDensity *pd)
 void BKE_free_pointdensitydata(PointDensity *pd)
 {
 	if (pd->point_tree) {
-		BLI_kdtree_free(pd->point_tree);
+		BLI_bvhtree_free(pd->point_tree);
 		pd->point_tree = NULL;
 	}
+	/*
+	if (pd->point_data) {
+		MEM_freeN(pd->point_data);
+		pd->point_data = NULL;
+	}
+	*/
 }
 
 void BKE_free_pointdensity(PointDensity *pd)
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
index e3591a84e98..8912ac5bd13 100644
--- a/source/blender/blenlib/BLI_kdopbvh.h
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -71,6 +71,9 @@ typedef void (*BVHTree_NearestPointCallback) (void *userdata, int index, const f
 /* callback must update hit in case it finds a nearest successful hit */
 typedef void (*BVHTree_RayCastCallback) (void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit);
 
+/* callback to range search query */
+typedef void (*BVHTree_RangeQuery) (void *userdata, int index, float squared_dist, float radius);
+
 
 BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis);
 void BLI_bvhtree_free(BVHTree *tree);
@@ -93,5 +96,9 @@ int BLI_bvhtree_find_nearest(BVHTree *tree, const float *co, BVHTreeNearest *nea
 
 int BLI_bvhtree_ray_cast(BVHTree *tree, const float *co, const float *dir, float radius, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void *userdata);
 
+/* range query */
+int BLI_bvhtree_range_query(BVHTree *tree, const float *co, float radius, BVHTree_RangeQuery callback, void *userdata);
+
+
 #endif // BLI_KDOPBVH_H
 
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 30472beb3e6..f82b6b7f162 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -1171,7 +1171,7 @@ static float squared_dist(const float *a, const float *b)
 }
 
 //Determines the nearest point of the given node BV. Returns the squared distance to that point.
-static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *nearest)
+static float calc_nearest_point(const float *proj, BVHNode *node, float *nearest)
 {
 	int i;
 	const float *bv = node->bv;
@@ -1179,12 +1179,12 @@ static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *near
 	//nearest on AABB hull
 	for(i=0; i != 3; i++, bv += 2)
 	{
-		if(bv[0] > data->proj[i])
+		if(bv[0] > proj[i])
 			nearest[i] = bv[0];
-		else if(bv[1] < data->proj[i])
+		else if(bv[1] < proj[i])
 			nearest[i] = bv[1];
 		else
-			nearest[i] = data->proj[i];
+			nearest[i] = proj[i];
 	}
 
 /*
@@ -1206,7 +1206,7 @@ static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *near
 		}
 	}
 */
-	return squared_dist(data->co, nearest);
+	return squared_dist(proj, nearest);
 }
 
 
@@ -1229,7 +1229,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 		else
 		{
 			data->nearest.index	= node->index;
-			data->nearest.dist	= calc_nearest_point(data, node, data->nearest.co);
+			data->nearest.dist	= calc_nearest_point(data->proj, node, data->nearest.co);
 		}
 	}
 	else
@@ -1243,7 +1243,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 
 			for(i=0; i != node->totnode; i++)
 			{
-				if( calc_nearest_point(data, node->children[i], nearest) >= data->nearest.dist) continue;
+				if( calc_nearest_point(data->proj, node->children[i], nearest) >= data->nearest.dist) continue;
 				dfs_find_nearest_dfs(data, node->children[i]);
 			}
 		}
@@ -1251,7 +1251,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 		{
 			for(i=node->totnode-1; i >= 0 ; i--)
 			{
-				if( calc_nearest_point(data, node->children[i], nearest) >= data->nearest.dist) continue;
+				if( calc_nearest_point(data->proj, node->children[i], nearest) >= data->nearest.dist) continue;
 				dfs_find_nearest_dfs(data, node->children[i]);
 			}
 		}
@@ -1261,7 +1261,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 static void dfs_find_nearest_begin(BVHNearestData *data, BVHNode *node)
 {
 	float nearest[3], sdist;
-	sdist = calc_nearest_point(data, node, nearest);
+	sdist = calc_nearest_point(data->proj, node, nearest);
 	if(sdist >= data->nearest.dist) return;
 	dfs_find_nearest_dfs(data, node);
 }
@@ -1298,7 +1298,7 @@ static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
 	}
 
 	current.node = node;
-	current.dist = calc_nearest_point(data, node, nearest);
+	current.dist = calc_nearest_point(data->proj, node, nearest);
 
 	while(current.dist < data->nearest.dist)
 	{
@@ -1326,7 +1326,7 @@ static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
 				}
 
 				heap[heap_size].node = current.node->children[i];
-				heap[heap_size].dist = calc_nearest_point(data, current.node->children[i], nearest);
+				heap[heap_size].dist = calc_nearest_point(data->proj, current.node->children[i], nearest);
 
 				if(heap[heap_size].dist >= data->nearest.dist) continue;
 				heap_size++;
@@ -1524,3 +1524,90 @@ int BLI_bvhtree_ray_cast(BVHTree *tree, const float *co, const float *dir, float
 	return data.hit.index;
 }
 
+/*
+ * Range Query - as request by broken :P
+ *
+ * Allocs and fills an array with the indexs of node that are on the given spherical range (center, radius) 
+ * Returns the size of the array.
+ */
+typedef struct RangeQueryData
+{
+	BVHTree *tree;
+	const float *center;
+	float radius;			//squared radius
+
+	int hits;
+
+	BVHTree_RangeQuery callback;
+	void *userdata;
+
+
+} RangeQueryData;
+
+
+static void dfs_range_query(RangeQueryData *data, BVHNode *node)
+{
+	if(node->totnode == 0)
+	{
+
+		//Calculate the node min-coords (if the node was a point then this is the point coordinates)
+		float co[3];
+		co[0] = node->bv[0];
+		co[1] = node->bv[2];
+		co[2] = node->bv[4];
+
+	}
+	else
+	{
+		int i;
+		for(i=0; i != node->totnode; i++)
+		{
+			float nearest[3];
+			float dist = calc_nearest_point(data->center, node->children[i], nearest);
+			if(dist < data->radius)
+			{
+				//Its a leaf.. call the callback
+				if(node->children[i]->totnode == 0)
+				{
+					data->hits++;
+					data->callback( data->userdata, node->children[i]->index, dist, data->radius );
+				}
+				else
+					dfs_range_query( data, node->children[i] );
+			}
+		}
+	}
+}
+
+int BLI_bvhtree_range_query(BVHTree *tree, const float *co, float radius, BVHTree_RangeQuery callback, void *userdata)
+{
+	BVHNode * root = tree->nodes[tree->totleaf];
+
+	RangeQueryData data;
+	data.tree = tree;
+	data.center = co;
+	data.radius = radius*radius;
+	data.hits = 0;
+
+	data.callback = callback;
+	data.userdata = userdata;
+
+	if(root != NULL)
+	{
+		float nearest[3];
+		float dist = calc_nearest_point(data.center, root, nearest);
+		if(dist < data.radius)
+		{
+			//Its a leaf.. call the callback
+			if(root->totnode == 0)
+			{
+				data.hits++;
+				data.callback( data.userdata, root->index, dist, data.radius );
+			}
+			else
+				dfs_range_query( &data, root );
+		}
+	}
+
+	return data.hits;
+}
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 52055f24f82..d23672f9284 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -130,7 +130,7 @@ typedef struct EnvMap {
 typedef struct PointDensity {
 	short flag;
 
-	short nearest;
+	short falloff_type;
 	float radius;
 
 	short source;
@@ -144,7 +144,10 @@ typedef struct PointDensity {
 	
 	short pdpad2;
 	
-	void *point_tree;		/* the kd-tree containing points */
+	void *point_tree;		/* the acceleration tree containing points */
+	//void *point_data;		/* dynamically allocated extra for extra information, like particle age */
+	//int pdpad3;
+	
 } PointDensity;
 
 typedef struct Tex {
@@ -415,10 +418,16 @@ typedef struct TexMapping {
 #define TEX_PD_OBJECT		1
 #define TEX_PD_FILE			2
 
+/* falloff_type */
+#define TEX_PD_FALLOFF_STD		0
+#define TEX_PD_FALLOFF_SMOOTH	1
+#define TEX_PD_FALLOFF_SHARP	2
+
 /* psys_cache_space */
 #define TEX_PD_OBJECTLOC	0
 #define TEX_PD_OBJECTSPACE	1
 #define TEX_PD_WORLDSPACE	2
 
+
 #endif
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 17bc6bb58cf..4422b9fbbdd 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "BLI_arithb.h"
-#include "BLI_kdtree.h"
+#include "BLI_kdopbvh.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
@@ -71,7 +71,7 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	/* in case ob->imat isn't up-to-date */
 	Mat4Invert(ob->imat, ob->obmat);
 	
-	pd->point_tree = BLI_kdtree_new(psys->totpart+psys->totchild);
+	pd->point_tree = BLI_bvhtree_new(psys->totpart+psys->totchild, 0.0, 2, 6);
 	
 	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
 		childexists = 1;
@@ -93,11 +93,12 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 				/* TEX_PD_WORLDSPACE */
 			}
 			
-			BLI_kdtree_insert(pd->point_tree, i, partco, NULL);
+			BLI_bvhtree_insert(pd->point_tree, i, partco, 1);
 		}
 	}
 	
-	BLI_kdtree_balance(pd->point_tree);
+	BLI_bvhtree_balance(pd->point_tree);
+	
 	psys_render_restore(ob, psys);
 }
 
@@ -112,7 +113,7 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *o
 	/* in case ob->imat isn't up-to-date */
 	Mat4Invert(obr->ob->imat, obr->ob->obmat);
 	
-	pd->point_tree = BLI_kdtree_new(obr->totvert);
+	pd->point_tree = BLI_bvhtree_new(obr->totvert, 0.0, 2, 6);
 	
 	for(i=0; i<obr->totvert; i++) {
 		float ver_co[3];
@@ -128,10 +129,10 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *o
 			Mat4MulVecfl(re->viewinv, ver_co);
 		}
 		
-		BLI_kdtree_insert(pd->point_tree, i, ver_co, NULL);
+		BLI_bvhtree_insert(pd->point_tree, i, ver_co, 1);
 	}
 	
-	BLI_kdtree_balance(pd->point_tree);
+	BLI_bvhtree_balance(pd->point_tree);
 
 }
 static void cache_pointdensity(Render *re, Tex *tex)
@@ -139,7 +140,7 @@ static void cache_pointdensity(Render *re, Tex *tex)
 	PointDensity *pd = tex->pd;
 
 	if (pd->point_tree) {
-		BLI_kdtree_free(pd->point_tree);
+		BLI_bvhtree_free(pd->point_tree);
 		pd->point_tree = NULL;
 	}
 	
@@ -178,9 +179,16 @@ static void free_pointdensity(Render *re, Tex *tex)
 	PointDensity *pd = tex->pd;
 
 	if (pd->point_tree) {
-		BLI_kdtree_free(pd->point_tree);
+		BLI_bvhtree_free(pd->point_tree);
 		pd->point_tree = NULL;
 	}
+
+	/*
+	if (pd->point_data) {
+		MEM_freeN(pd->point_data);
+		pd->point_data = NULL;
+	}
+	*/
 }
 
 
@@ -216,33 +224,49 @@ void free_pointdensities(Render *re)
 	}
 }
 
+
+void accum_density_std(void *userdata, int index, float squared_dist, float squared_radius)
+{
+	float *density = userdata;
+	const float dist = squared_radius - squared_dist;
+	
+	*density+= dist;
+}
+
+void accum_density_smooth(void *userdata, int index, float squared_dist, float squared_radius)
+{
+	float *density = userdata;
+	const float dist = squared_radius - squared_dist;
+	
+	*density+= 3.0f*dist*dist - 2.0f*dist*dist*dist;
+}
+
+void accum_density_sharp(void *userdata, int index, float squared_dist, float squared_radius)
+{
+	float *density = userdata;
+	const float dist = squared_radius - squared_dist;
+	
+	*density+= dist*dist;
+}
+
 #define MAX_POINTS_NEAREST	25
 int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 {
 	int rv = TEX_INT;
-	
 	PointDensity *pd = tex->pd;
-	KDTreeNearest nearest[MAX_POINTS_NEAREST];
 	float density=0.0f;
-	int n, neighbours=0;
 	
 	if ((!pd) || (!pd->point_tree)) {
 		texres->tin = 0.0f;
 		return 0;
 	}
 	
-	neighbours = BLI_kdtree_find_n_nearest(pd->point_tree, pd->nearest, texvec, NULL, nearest);
-	
-	for(n=1; n<neighbours; n++) {
-		if ( nearest[n].dist < pd->radius) {
-			float dist = 1.0 - (nearest[n].dist / pd->radius);
-			
-			density += 3.0f*dist*dist - 2.0f*dist*dist*dist;
-		}
-	}
-	
-	density /= neighbours;
-	density *= 1.0 / pd->radius;
+	if (pd->falloff_type == TEX_PD_FALLOFF_STD)
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_std, &density);
+	else if (pd->falloff_type == TEX_PD_FALLOFF_SMOOTH)
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_smooth, &density);
+	else if (pd->falloff_type == TEX_PD_FALLOFF_SHARP)
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_sharp, &density);
 
 	texres->tin = density;
 
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 85154682819..050dae6026e 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -751,12 +751,15 @@ static void texture_panel_pointdensity(Tex *tex)
 		uiDefBut(block, LABEL, B_NOP, "Density estimation:",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 
-		uiBlockBeginAlign(block);
 		uiDefButF(block, NUM, B_REDR, "Radius: ",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
-		uiDefButS(block, NUM, B_REDR, "Nearby: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->nearest), 2.0, 25.0, 10, 2, "The number of nearby particles to check for density (higher is more accurate, but slower)");
-		uiBlockEndAlign(block);
+		
+		yco -= YSPACE;
+		
+		uiDefBut(block, LABEL, B_NOP, "Falloff:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
+		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Sharp %x2",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
 		
 		yco = PANEL_YMAX;
 		

From 25236b56a6c8c5619a3a8d35841be7e413df1e5e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 1 Oct 2008 07:13:28 +0000
Subject: [PATCH 019/577] * Fix for volumetric rendering. It previously wasn't
 multiplying the emission component by the density at the current point, which
 made the volume too bright in less dense areas. This made it look too rough,
 as opposed to smooth as it should be. This makes the particle rendering look
 *much* better, thanks a bunch to ZanQdo for complaining and kicking my butt
 to make me realise the error.

Here's an example of how smooth it looks now:
http://mke3.net/blender/devel/rendering/volumetrics/smoke_test03.mov
http://mke3.net/blender/devel/rendering/volumetrics/smoke_test03.blend

Settings in existing files will have to be tweaked a bit, since
what they were set up for before, was incorrect.

* Added two new interpolation types to Point Density: Constant and
Root. These work similarly to in proportional edit for example,
just gives a bit more choice over how hard-edged the particles
should look.
---
 source/blender/makesdna/DNA_texture_types.h   |  3 ++-
 .../render/intern/source/pointdensity.c       | 23 +++++++++++++++++--
 .../blender/render/intern/source/volumetric.c | 16 ++++++-------
 source/blender/src/buttons_shading.c          |  4 ++--
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index d23672f9284..9c608302b22 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -132,7 +132,6 @@ typedef struct PointDensity {
 
 	short falloff_type;
 	float radius;
-
 	short source;
 	short pdpad[3];
 
@@ -422,6 +421,8 @@ typedef struct TexMapping {
 #define TEX_PD_FALLOFF_STD		0
 #define TEX_PD_FALLOFF_SMOOTH	1
 #define TEX_PD_FALLOFF_SHARP	2
+#define TEX_PD_FALLOFF_CONSTANT	3
+#define TEX_PD_FALLOFF_ROOT		4
 
 /* psys_cache_space */
 #define TEX_PD_OBJECTLOC	0
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 4422b9fbbdd..c4124fba8bb 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -224,7 +224,6 @@ void free_pointdensities(Render *re)
 	}
 }
 
-
 void accum_density_std(void *userdata, int index, float squared_dist, float squared_radius)
 {
 	float *density = userdata;
@@ -249,6 +248,22 @@ void accum_density_sharp(void *userdata, int index, float squared_dist, float sq
 	*density+= dist*dist;
 }
 
+void accum_density_constant(void *userdata, int index, float squared_dist, float squared_radius)
+{
+	float *density = userdata;
+		
+	*density+= squared_radius;
+}
+
+void accum_density_root(void *userdata, int index, float squared_dist, float squared_radius)
+{
+	float *density = userdata;
+	const float dist = squared_radius - squared_dist;
+		
+	*density+= sqrt(dist);
+}
+
+
 #define MAX_POINTS_NEAREST	25
 int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 {
@@ -267,7 +282,11 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_smooth, &density);
 	else if (pd->falloff_type == TEX_PD_FALLOFF_SHARP)
 		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_sharp, &density);
-
+	else if (pd->falloff_type == TEX_PD_FALLOFF_CONSTANT)
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_constant, &density);
+	else if (pd->falloff_type == TEX_PD_FALLOFF_ROOT)
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_root, &density);
+	
 	texres->tin = density;
 
 	/*
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 4d138ea8545..5d28540f17a 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -152,7 +152,7 @@ void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 	
 	do_volume_tex(shi, co, MAP_EMIT+MAP_COL, col, &emission);
 	
-	em[0] = em[1] = em[2] = emission;
+	em[0] = em[1] = em[2] = emission * density;
 	VecMulVecf(em, em, col);
 }
 
@@ -365,13 +365,10 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	/* get radiance from all points along the ray due to participating media */
 	for (s = 0; s < nsteps; s++) {
 		if (s > 0) density = vol_get_density(shi, step_sta);
-	
-		/* there's only any point shading here
+		
+		/* there's only any use in shading here
 		 * if there's actually some density to shade! */
 		if (density > 0.01f) {
-			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
-			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
-			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
 		
 			/* transmittance component (alpha) */
 			vol_get_attenuation(shi, tau, step_sta, step_end, density, stepsize);
@@ -379,9 +376,10 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			tr[1] *= exp(-tau[1]);
 			tr[2] *= exp(-tau[2]);
 			
-			/* Terminate raymarching if transmittance is small */
-			//if ((tr[0] + tr[1] + tr[2] * 0.333f) < 0.01f) continue;
-			
+			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
+			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
+			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
+		
 			/* incoming light via emission or scattering (additive) */
 			vol_get_emission(shi, step_emit, step_mid, density);
 			vol_get_scattering(shi, step_scatter, step_mid, stepsize, density);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 050dae6026e..7a154d084bc 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -758,7 +758,7 @@ static void texture_panel_pointdensity(Tex *tex)
 		
 		uiDefBut(block, LABEL, B_NOP, "Falloff:",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
-		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Sharp %x2",
+		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Sharp %x2|Constant %x3|Root %x4",
 				X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
 		
 		yco = PANEL_YMAX;
@@ -4334,7 +4334,7 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
 	uiBlockEndAlign(block);
-	
+		
 	yco = PANEL_YMAX;
 	
 	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",

From 2745517ecda2a72603fa7c8ec5a44f2b857c5782 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 1 Oct 2008 07:30:56 +0000
Subject: [PATCH 020/577] Added 'Object Location' option to 'object vertices'
 mode in Point Density. This brings it consistent with the 'particle system'
 mode, and allows silly things like this a bit easier (especially after the
 last fix and BVH improvements!):

http://mke3.net/blender/devel/rendering/volumetrics/pd_objectloc.mov
---
 source/blender/render/intern/source/pointdensity.c | 6 ++++--
 source/blender/src/buttons_shading.c               | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index c4124fba8bb..a3f174be68b 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -120,13 +120,15 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *o
 		VertRen *ver= RE_findOrAddVert(obr, i);
 		
 		VECCOPY(ver_co, ver->co);
+		Mat4MulVecfl(re->viewinv, ver_co);
 		
 		if (pd->ob_cache_space == TEX_PD_OBJECTSPACE) {
-			Mat4MulVecfl(re->viewinv, ver_co);
 			Mat4MulVecfl(obr->ob->imat, ver_co);
+		} else if (pd->psys_cache_space == TEX_PD_OBJECTLOC) {
+			VecSubf(ver_co, ver_co, obr->ob->loc);
 		} else {
 			/* TEX_PD_WORLDSPACE */
-			Mat4MulVecfl(re->viewinv, ver_co);
+
 		}
 		
 		BLI_bvhtree_insert(pd->point_tree, i, ver_co, 1);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 7a154d084bc..c9df2f6d833 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -797,7 +797,7 @@ static void texture_panel_pointdensity(Tex *tex)
 			
 			uiDefBut(block, LABEL, B_NOP, "Cache vertices in:",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-			uiDefButS(block, MENU, B_TEXREDR_PRV, "Object Space %x1|Global Space %x2",
+			uiDefButS(block, MENU, B_TEXREDR_PRV, "Object Location %x0|Object Space %x1|Global Space %x2",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->ob_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache vertices in");
 		}
 	}

From e114d194ae44cb72aa52954f4fdeb67805a2c7c6 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 2 Oct 2008 01:38:12 +0000
Subject: [PATCH 021/577] * Re-coded the point density range checking to be a
 bit cleaner, and not necessary to modify the BVH functions.

---
 source/blender/blenkernel/intern/texture.c    |  6 +-
 source/blender/blenlib/BLI_kdopbvh.h          |  2 +-
 source/blender/blenlib/intern/BLI_kdopbvh.c   |  4 +-
 source/blender/makesdna/DNA_texture_types.h   |  4 +-
 .../render/intern/source/pointdensity.c       | 79 ++++++++-----------
 5 files changed, 38 insertions(+), 57 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index ec34fcf4103..7b558008a92 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -877,7 +877,7 @@ PointDensity *BKE_add_pointdensity(void)
 	pd->falloff_type = TEX_PD_FALLOFF_STD;
 	pd->source = TEX_PD_PSYS;
 	pd->point_tree = NULL;
-	//pd->point_data = NULL;
+	pd->point_data = NULL;
 	
 	return pd;
 } 
@@ -888,7 +888,7 @@ PointDensity *BKE_copy_pointdensity(PointDensity *pd)
 
 	pdn= MEM_dupallocN(pd);
 	pdn->point_tree = NULL;
-	//pdn->point_data = NULL;
+	pdn->point_data = NULL;
 	
 	return pd;
 }
@@ -899,12 +899,10 @@ void BKE_free_pointdensitydata(PointDensity *pd)
 		BLI_bvhtree_free(pd->point_tree);
 		pd->point_tree = NULL;
 	}
-	/*
 	if (pd->point_data) {
 		MEM_freeN(pd->point_data);
 		pd->point_data = NULL;
 	}
-	*/
 }
 
 void BKE_free_pointdensity(PointDensity *pd)
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
index 8912ac5bd13..dabf12d48d3 100644
--- a/source/blender/blenlib/BLI_kdopbvh.h
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -72,7 +72,7 @@ typedef void (*BVHTree_NearestPointCallback) (void *userdata, int index, const f
 typedef void (*BVHTree_RayCastCallback) (void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit);
 
 /* callback to range search query */
-typedef void (*BVHTree_RangeQuery) (void *userdata, int index, float squared_dist, float radius);
+typedef void (*BVHTree_RangeQuery) (void *userdata, int index, float squared_dist);
 
 
 BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis);
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index f82b6b7f162..df37ff457f6 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -1570,7 +1570,7 @@ static void dfs_range_query(RangeQueryData *data, BVHNode *node)
 				if(node->children[i]->totnode == 0)
 				{
 					data->hits++;
-					data->callback( data->userdata, node->children[i]->index, dist, data->radius );
+					data->callback( data->userdata, node->children[i]->index, dist );
 				}
 				else
 					dfs_range_query( data, node->children[i] );
@@ -1602,7 +1602,7 @@ int BLI_bvhtree_range_query(BVHTree *tree, const float *co, float radius, BVHTre
 			if(root->totnode == 0)
 			{
 				data.hits++;
-				data.callback( data.userdata, root->index, dist, data.radius );
+				data.callback( data.userdata, root->index, dist );
 			}
 			else
 				dfs_range_query( &data, root );
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 9c608302b22..95bacbbd4c6 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -144,8 +144,8 @@ typedef struct PointDensity {
 	short pdpad2;
 	
 	void *point_tree;		/* the acceleration tree containing points */
-	//void *point_data;		/* dynamically allocated extra for extra information, like particle age */
-	//int pdpad3;
+	void *point_data;		/* dynamically allocated extra for extra information, like particle age */
+	int pdpad3[2];
 	
 } PointDensity;
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index a3f174be68b..7998fa82836 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -23,9 +23,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_arithb.h"
 #include "BLI_kdopbvh.h"
 
@@ -185,12 +188,10 @@ static void free_pointdensity(Render *re, Tex *tex)
 		pd->point_tree = NULL;
 	}
 
-	/*
 	if (pd->point_data) {
 		MEM_freeN(pd->point_data);
 		pd->point_data = NULL;
 	}
-	*/
 }
 
 
@@ -226,51 +227,37 @@ void free_pointdensities(Render *re)
 	}
 }
 
-void accum_density_std(void *userdata, int index, float squared_dist, float squared_radius)
+typedef struct PointDensityRangeData
 {
-	float *density = userdata;
-	const float dist = squared_radius - squared_dist;
+    float *density;
+    float squared_radius;
+    float *point_data;
+    short falloff_type;   
+} PointDensityRangeData;
+
+void accum_density(void *userdata, int index, float squared_dist)
+{
+	PointDensityRangeData *pdr = (PointDensityRangeData *)userdata;
+	const float dist = pdr->squared_radius - squared_dist;
 	
-	*density+= dist;
+	if (pdr->falloff_type == TEX_PD_FALLOFF_STD)
+		*pdr->density += dist;
+	else if (pdr->falloff_type == TEX_PD_FALLOFF_SMOOTH)
+		*pdr->density+= 3.0f*dist*dist - 2.0f*dist*dist*dist;
+	else if (pdr->falloff_type == TEX_PD_FALLOFF_SHARP)
+		*pdr->density+= dist*dist;
+	else if (pdr->falloff_type == TEX_PD_FALLOFF_CONSTANT)
+		*pdr->density+= pdr->squared_radius;
+	else if (pdr->falloff_type == TEX_PD_FALLOFF_ROOT)
+		*pdr->density+= sqrt(dist);
 }
 
-void accum_density_smooth(void *userdata, int index, float squared_dist, float squared_radius)
-{
-	float *density = userdata;
-	const float dist = squared_radius - squared_dist;
-	
-	*density+= 3.0f*dist*dist - 2.0f*dist*dist*dist;
-}
-
-void accum_density_sharp(void *userdata, int index, float squared_dist, float squared_radius)
-{
-	float *density = userdata;
-	const float dist = squared_radius - squared_dist;
-	
-	*density+= dist*dist;
-}
-
-void accum_density_constant(void *userdata, int index, float squared_dist, float squared_radius)
-{
-	float *density = userdata;
-		
-	*density+= squared_radius;
-}
-
-void accum_density_root(void *userdata, int index, float squared_dist, float squared_radius)
-{
-	float *density = userdata;
-	const float dist = squared_radius - squared_dist;
-		
-	*density+= sqrt(dist);
-}
-
-
 #define MAX_POINTS_NEAREST	25
 int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 {
 	int rv = TEX_INT;
 	PointDensity *pd = tex->pd;
+	PointDensityRangeData pdr;
 	float density=0.0f;
 	
 	if ((!pd) || (!pd->point_tree)) {
@@ -278,16 +265,12 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 		return 0;
 	}
 	
-	if (pd->falloff_type == TEX_PD_FALLOFF_STD)
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_std, &density);
-	else if (pd->falloff_type == TEX_PD_FALLOFF_SMOOTH)
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_smooth, &density);
-	else if (pd->falloff_type == TEX_PD_FALLOFF_SHARP)
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_sharp, &density);
-	else if (pd->falloff_type == TEX_PD_FALLOFF_CONSTANT)
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_constant, &density);
-	else if (pd->falloff_type == TEX_PD_FALLOFF_ROOT)
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density_root, &density);
+	pdr.squared_radius = pd->radius*pd->radius;
+	pdr.density = &density;
+	pdr.point_data = pd->point_data;
+	pdr.falloff_type = pd->falloff_type;
+	
+	BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density, &pdr);
 	
 	texres->tin = density;
 

From 67a9d4154d520a98e572e98f680995fca701f728 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 4 Oct 2008 12:23:57 +0000
Subject: [PATCH 022/577] * New volumetrics feature: scattering types

Otherwise known as a phase function, this determines in which directions
the light is scattered in the volume. Until now it's been isotropic
scattering, meaning that the light gets scattered equally in all
directions. This adds some new types for anisotropic scattering, to
scatter light more forwards or backwards towards the viewing direction,
which can be more similar to how light is scattered by particles in nature.

Here's a diagram of how light is scattered isotropically and anisotropically:
http://mke3.net/blender/devel/rendering/volumetrics/phase_diagram.png

The new additions are:
- Rayleigh
describes scattering by very small particles in the atmosphere.
- Mie Hazy / Mie Murky
more generalised, describes scattering from large particle sizes.
- Henyey-Greenstein
a very flexible formula, that can be used to simulate a wide range of
scattering. It uses an additional 'Asymmetry' slider, ranging from -1.0
(backward scattering) to 1.0 (forward scattering) to control the
direction of scattering.
- Schlick
an approximation of Henyey-Greenstein, working similarly but faster.

And a description of how they look visually (just an omnidirectional lamp
inside a volume box)
http://mke3.net/blender/devel/rendering/volumetrics/phasefunctions.jpg


* Sun/sky integration

Volumes now correctly render in front of the new physical sky. Atmosphere
still doesn't work correctly with volumes, due to something that i hope
can be fixed in the atmosphere rendering, but the sky looks quite good.

http://mke3.net/blender/devel/rendering/volumetrics/sky_clouds.png

This also works very nicely with the anisotropic scattering, giving
clouds their signature bright halos when the sun is behind them:

http://mke3.net/blender/devel/rendering/volumetrics/phase_cloud.mov

in comparison here's a render with isotropic scattering:

http://mke3.net/blender/devel/rendering/volumetrics/phase_cloud_isotropic.png


* Added back the max volume depth tracing limit, as a hard coded value -
fixes crashes with weird geometry, like the overlapping faces around
suzanne's eyes. As a general note, it's always best to use volume
materials on airtight geometry, without intersecting or overlapping faces.
---
 source/blender/makesdna/DNA_material_types.h  | 11 ++-
 .../render/extern/include/RE_shader_ext.h     |  1 +
 .../blender/render/intern/source/volumetric.c | 73 ++++++++++++++-----
 source/blender/src/buttons_shading.c          | 12 +++
 4 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 8215f73d8ce..4e006d17682 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -71,7 +71,8 @@ typedef struct Material {
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
 	short vol_shadeflag;
-	short volpad[3];
+	short vol_phasefunc_type;
+	float vol_phasefunc_g;
 		
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
@@ -351,5 +352,13 @@ typedef struct Material {
 #define MA_VOL_ATTENUATED	2
 #define MA_VOL_SHADOWED		4
 
+/* vol_phasefunc_type */
+#define MA_VOL_PH_ISOTROPIC		0
+#define MA_VOL_PH_MIEHAZY		1
+#define MA_VOL_PH_MIEMURKY		2
+#define MA_VOL_PH_RAYLEIGH		3
+#define MA_VOL_PH_HG			4
+#define MA_VOL_PH_SCHLICK		5
+
 #endif
 
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 5d74895f0c8..16449df02b0 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -160,6 +160,7 @@ typedef struct ShadeInput
 	
 	int samplenr;			/* sample counter, to detect if we should do shadow again */
 	int depth;				/* 1 or larger on raytrace shading */
+	int volume_depth;		/* number of intersections through volumes */
 	
 	/* stored copy of original face normal (facenor) 
 	 * before flipping. Used in Front/back output on geometry node */
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 5d28540f17a..9a6790976af 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -164,6 +164,33 @@ void vol_get_scattering_fac(ShadeInput *shi, float *scatter_fac, float *co, floa
 	*scatter_fac = shi->mat->vol_scattering;
 }
 
+float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w, float *wp)
+{
+	const float costheta = Inpf(w, wp);
+	
+	if (phasefunc_type == MA_VOL_PH_ISOTROPIC) {
+		return 1.f / (4.f * M_PI);
+	}
+	else if (phasefunc_type == MA_VOL_PH_MIEHAZY) {
+		return (0.5f + 4.5f * powf(0.5 * (1.f + costheta), 8.f)) / (4.f*M_PI);
+	}
+	else if (phasefunc_type == MA_VOL_PH_MIEMURKY) {
+		return (0.5f + 16.5f * powf(0.5 * (1.f + costheta), 32.f)) / (4.f*M_PI);
+	}
+	else if (phasefunc_type == MA_VOL_PH_RAYLEIGH) {
+		return 3.f/(16.f*M_PI) * (1 + costheta * costheta);
+	}
+	else if (phasefunc_type == MA_VOL_PH_HG) {
+		return 1.f / (4.f * M_PI) * (1.f - g*g) / powf(1.f + g*g - 2.f * g * costheta, 1.5f);
+	}
+	else if (phasefunc_type == MA_VOL_PH_SCHLICK) {
+		const float k = 1.55f * g - .55f * g * g * g;
+		const float kcostheta = k * costheta;
+		return 1.f / (4.f * M_PI) * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta));
+	} else {
+		return 1.0f;
+	}
+}
 
 void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 {
@@ -229,13 +256,14 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	VecMulVecf(tau, tau, absorb_col);
 }
 
-void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *col, float stepsize, float density)
+void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *lacol, float stepsize, float density)
 {
 	float visifac, lv[3], lampdist;
-	float lacol[3];
 	float tau[3], tr[3]={1.0,1.0,1.0};
 	float hitco[3], *atten_co;
-	
+	float p;
+	float scatter_fac;
+			
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
 	if (lar->energy == 0.0) return;
@@ -253,15 +281,17 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	}
 	
 	VecMulf(lacol, visifac*lar->energy);
-
-
+		
+	if (ELEM(lar->type, LA_SUN, LA_HEMI))
+		VECCOPY(lv, lar->vec);
+	VecMulf(lv, -1.0f);
+	
+	p = vol_get_phasefunc(shi, shi->mat->vol_phasefunc_type, shi->mat->vol_phasefunc_g, shi->view, lv);
+	VecMulf(lacol, p);
+	
 	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
 		Isect is;
 		
-		if (ELEM(lar->type, LA_SUN, LA_HEMI))
-			VECCOPY(lv, lar->vec);
-		VecMulf(lv, -1.0f);
-		
 		/* find minimum of volume bounds, or lamp coord */
 		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
 			float dist = VecLenf(co, hitco);
@@ -287,7 +317,11 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		}
 	}
 	
-	VecAddf(col, col, lacol);
+	vol_get_scattering_fac(shi, &scatter_fac, co, density);
+	VecMulf(lacol, scatter_fac);
+	
+	
+
 }
 
 /* shadows -> trace a ray to find blocker geometry
@@ -309,19 +343,12 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	for(go=lights->first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
-		float scatter_fac;
 	
 		lar= go->lampren;
 		if (lar==NULL) continue;
 		
 		vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
-		
-		vol_get_scattering_fac(shi, &scatter_fac, co, density);
-		VecMulf(lacol, scatter_fac);
-		
-		/* isotropic phase function */
-		VecMulf(lacol, 1.0f / (4.f * M_PI));
-	
+			
 		VecMulf(lacol, density);
 		
 		VecAddf(col, col, lacol);
@@ -435,6 +462,8 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	shi_new.mask= shi->mask;
 	shi_new.osatex= shi->osatex;
 	shi_new.thread= shi->thread;
+	shi_new.depth= shi->depth;
+	shi_new.volume_depth= shi->volume_depth + 1;
 	shi_new.xs= shi->xs;
 	shi_new.ys= shi->ys;
 	shi_new.lay= shi->lay;
@@ -446,8 +475,11 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	VECCOPY(shi_new.camera_co, is->start);
 	
 	memset(&shr_new, 0, sizeof(ShadeResult));
-	
-	shade_ray(is, &shi_new, &shr_new);
+
+	/* hardcoded limit of 100 for now - prevents problems in weird geometry */
+	if (shi->volume_depth < 100) {
+		shade_ray(is, &shi_new, &shr_new);
+	}
 	
 	col[0] = shr_new.combined[0];
 	col[1] = shr_new.combined[1];
@@ -478,6 +510,7 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *co
 		shade_intersection(shi, col, &isect);
 	} else {
 		shadeSkyView(col, co, shi->view, NULL);
+		shadeSunView(col, shi->view);
 	}
 }
 
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 949487fc06f..ec5419c1704 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4342,6 +4342,18 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
 	uiBlockEndAlign(block);
+	
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
+	uiDefButS(block, MENU, B_TEXREDR_PRV, "Scattering Direction %t|Isotropic %x0|Mie Hazy %x1|Mie Murky %x2|Rayleigh %x3|Henyey-Greenstein %x4|Schlick %x5",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_phasefunc_type, 0.0, 0.0, 0, 0, "Scattering Direction (Phase Function)");
+	if (ELEM(ma->vol_phasefunc_type, MA_VOL_PH_HG, MA_VOL_PH_SCHLICK)) {
+		uiDefButF(block, NUM, B_MATPRV, "Asymmetry: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_phasefunc_g), -1.0, 1.0, 0, 0, "> 0 is forward scattering, < 0 is back scattering");
+	}
+	uiBlockEndAlign(block);
+	
 		
 	yco = PANEL_YMAX;
 	

From 25ece3ba2f60ec4271828bb4ab1c083c6fa36761 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 6 Oct 2008 12:25:22 +0000
Subject: [PATCH 023/577] * New point density update: Turbulence

This addition allows you to perturb the point density with noise, to give
the impression of more resolution. It's a quick way to add detail, without
having to use large, complex, and slower to render particle systems.

Rather than just overlaying noise, like you might do by adding a secondary
clouds texture, it uses noise to perturb the actual coordinate looked up
in the density evaluation. This gives a much better looking result, as it
actually alters the original density.

Comparison of the particle cloud render without, and with added turbulence
(the render with turbulence only renders slightly more slowly):
http://mke3.net/blender/devel/rendering/volumetrics/pd_turbulence.jpg

Using the same constant noise function/spatial coordinates will give a
static appearance. This is fine (and quicker) if the particles aren't
moving, but on animated particle systems, it looks bad, as if the
particles are moving through a static noise field. To overcome this, there
are additional options for particle systems, to influence the turbulence
with the particles' average velocity, or average angular velocity. This
information is only available for particle systems at the present.

Here you can see the (dramatic) difference between no turbulence, static
turbulence, and turbulence influenced by particle velocity:
http://mke3.net/blender/devel/rendering/volumetrics/turbu_compare.mov
---
 source/blender/blenkernel/intern/texture.c    |  4 +
 source/blender/blenloader/intern/readfile.c   | 13 +++
 source/blender/makesdna/DNA_texture_types.h   | 18 +++-
 .../render/intern/source/pointdensity.c       | 83 +++++++++++++++----
 source/blender/src/buttons_shading.c          | 34 +++++++-
 5 files changed, 131 insertions(+), 21 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 7b558008a92..33b824623fa 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -878,6 +878,10 @@ PointDensity *BKE_add_pointdensity(void)
 	pd->source = TEX_PD_PSYS;
 	pd->point_tree = NULL;
 	pd->point_data = NULL;
+	pd->noise_size = 0.5f;
+	pd->noise_depth = 1;
+	pd->noise_fac = 1.0f;
+	pd->noise_influence = TEX_PD_NOISE_STATIC;
 	
 	return pd;
 } 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 568513650e0..249459bf3a4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7882,6 +7882,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	
 	if (main->versionfile <= 247) {
 		Material *ma;
+		Tex *tex;
 		
 		for(ma=main->mat.first; ma; ma= ma->id.next) {
 			/* trigger for non-volumetric file */
@@ -7893,6 +7894,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;	
 			}
 		}
+		
+		for(tex=main->tex.first; tex; tex= tex->id.next) {
+			if (tex->pd == NULL) 
+				tex->pd = BKE_add_pointdensity();
+			else if (tex->pd->noise_size < 0.0001f) {
+				tex->pd->noise_size = 0.5f;
+				tex->pd->noise_depth = 1;
+				tex->pd->noise_fac = 1.0f;
+				tex->pd->noise_influence = TEX_PD_NOISE_STATIC;
+			}
+		}
+		
 	}
 	
 	/* set the curve radius interpolation to 2.47 default - easy */
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 95bacbbd4c6..95f61e73c79 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -144,8 +144,13 @@ typedef struct PointDensity {
 	short pdpad2;
 	
 	void *point_tree;		/* the acceleration tree containing points */
-	void *point_data;		/* dynamically allocated extra for extra information, like particle age */
-	int pdpad3[2];
+	float *point_data;		/* dynamically allocated extra for extra information, like particle age */
+	
+	float noise_size;
+	short noise_depth;
+	short noise_influence;
+	float noise_fac;
+	float pdpad4;
 	
 } PointDensity;
 
@@ -429,6 +434,15 @@ typedef struct TexMapping {
 #define TEX_PD_OBJECTSPACE	1
 #define TEX_PD_WORLDSPACE	2
 
+/* flag */
+#define TEX_PD_TURBULENCE	1
+
+
+/* noise_influence */
+#define TEX_PD_NOISE_STATIC		0
+#define TEX_PD_NOISE_VEL		1
+#define TEX_PD_NOISE_ANGVEL		2
+#define TEX_PD_NOISE_TIME		3
 
 #endif
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 7998fa82836..e7e2d4fc26e 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -30,6 +30,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_arithb.h"
+#include "BLI_blenlib.h"
 #include "BLI_kdopbvh.h"
 
 #include "BKE_DerivedMesh.h"
@@ -45,13 +46,13 @@
 #include "renderdatabase.h"
 #include "texture.h"
 
-
 static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, ParticleSystem *psys)
 {
 	DerivedMesh* dm;
 	ParticleKey state;
 	float cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
 	int i, childexists;
+	int total_particles;
 	float partco[3];
 	float obview[4][4];
 	
@@ -74,12 +75,16 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	/* in case ob->imat isn't up-to-date */
 	Mat4Invert(ob->imat, ob->obmat);
 	
-	pd->point_tree = BLI_bvhtree_new(psys->totpart+psys->totchild, 0.0, 2, 6);
+	total_particles = psys->totpart+psys->totchild;
+	
+	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 2, 6);
+	if (pd->noise_influence != TEX_PD_NOISE_STATIC)
+		pd->point_data = MEM_mallocN(sizeof(float)*3*total_particles, "point_data");
 	
 	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
 		childexists = 1;
 	
-	for (i = 0; i < psys->totpart + psys->totchild; i++) {
+	for (i = 0; i < total_particles; i++) {
 
 		state.time = cfra;
 		if(psys_get_particle_state(ob, psys, i, &state, 0)) {
@@ -97,6 +102,16 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 			}
 			
 			BLI_bvhtree_insert(pd->point_tree, i, partco, 1);
+			
+			if (pd->noise_influence == TEX_PD_NOISE_VEL) {
+				pd->point_data[i*3 + 0] = state.vel[0];
+				pd->point_data[i*3 + 1] = state.vel[1];
+				pd->point_data[i*3 + 2] = state.vel[2];
+			} else if (pd->noise_influence == TEX_PD_NOISE_ANGVEL) {
+				pd->point_data[i*3 + 0] = state.ave[0];
+				pd->point_data[i*3 + 1] = state.ave[1];
+				pd->point_data[i*3 + 2] = state.ave[2];
+			}
 		}
 	}
 	
@@ -131,7 +146,6 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *o
 			VecSubf(ver_co, ver_co, obr->ob->loc);
 		} else {
 			/* TEX_PD_WORLDSPACE */
-
 		}
 		
 		BLI_bvhtree_insert(pd->point_tree, i, ver_co, 1);
@@ -232,6 +246,7 @@ typedef struct PointDensityRangeData
     float *density;
     float squared_radius;
     float *point_data;
+	float *vec;
     short falloff_type;   
 } PointDensityRangeData;
 
@@ -239,17 +254,26 @@ void accum_density(void *userdata, int index, float squared_dist)
 {
 	PointDensityRangeData *pdr = (PointDensityRangeData *)userdata;
 	const float dist = pdr->squared_radius - squared_dist;
+	float density;
 	
 	if (pdr->falloff_type == TEX_PD_FALLOFF_STD)
-		*pdr->density += dist;
+		density = dist;
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_SMOOTH)
-		*pdr->density+= 3.0f*dist*dist - 2.0f*dist*dist*dist;
+		density = 3.0f*dist*dist - 2.0f*dist*dist*dist;
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_SHARP)
-		*pdr->density+= dist*dist;
+		density = dist*dist;
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_CONSTANT)
-		*pdr->density+= pdr->squared_radius;
+		density = pdr->squared_radius;
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_ROOT)
-		*pdr->density+= sqrt(dist);
+		density = sqrt(dist);
+	
+	if (pdr->point_data) {
+		pdr->vec[0] += pdr->point_data[index*3 + 0];// * density;
+		pdr->vec[1] += pdr->point_data[index*3 + 1];// * density;
+		pdr->vec[2] += pdr->point_data[index*3 + 2];// * density;
+	}
+	
+	*pdr->density += density;
 }
 
 #define MAX_POINTS_NEAREST	25
@@ -259,6 +283,9 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	PointDensity *pd = tex->pd;
 	PointDensityRangeData pdr;
 	float density=0.0f;
+	float vec[3] = {0.0, 0.0, 0.0};
+	float tv[3];
+	float turb;
 	
 	if ((!pd) || (!pd->point_tree)) {
 		texres->tin = 0.0f;
@@ -269,16 +296,40 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	pdr.density = &density;
 	pdr.point_data = pd->point_data;
 	pdr.falloff_type = pd->falloff_type;
+	pdr.vec = vec;
 	
-	BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density, &pdr);
+	if (pd->flag & TEX_PD_TURBULENCE) {
+		VECCOPY(tv, texvec);
+		
+		/* find the average speed vectors, for perturbing final density lookup with */
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density, &pdr);
+		
+		density = 0.0f;
+		Normalize(vec);
 	
+		turb = BLI_turbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth);
+		
+		turb -= 0.5f;	/* re-center 0.0-1.0 range around 0 to prevent offsetting result */
+		
+		tv[0] = texvec[0] + pd->noise_fac * turb;
+		tv[1] = texvec[1] + pd->noise_fac * turb;
+		tv[2] = texvec[2] + pd->noise_fac * turb;
+		
+		/* do density lookup with altered coordinates */
+		BLI_bvhtree_range_query(pd->point_tree, tv, pd->radius, accum_density, &pdr);
+	}
+	else
+		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density, &pdr);
+
 	texres->tin = density;
 
-	/*
-	texres->tr = 1.0f;
-	texres->tg = 1.0f;
-	texres->tb = 0.0f;
+	//texres->tr = vec[0];
+	//texres->tg = vec[1];
+	//texres->tb = vec[2];
 	
+	return TEX_INT;
+	
+	/*
 	BRICONTRGB;
 	
 	texres->ta = 1.0;
@@ -288,7 +339,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	}
 	*/
 	
-	BRICONT;
+	//BRICONT;
 	
-	return rv;
+	//return rv;
 }
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index ec5419c1704..b6c3e39bac2 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -759,15 +759,42 @@ static void texture_panel_pointdensity(Tex *tex)
 		uiDefBut(block, LABEL, B_NOP, "Falloff:",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
 		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Sharp %x2|Constant %x3|Root %x4",
-				X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
 		
+		yco -= YSPACE;
+		
+		
+		uiBlockBeginAlign(block);
+		uiDefButBitS(block, TOG, TEX_PD_TURBULENCE, B_REDR, "Turbulence",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->flag), 0, 0, 0, 0, "Add directed turbulence to the density estimation");
+			
+		if (pd->flag & TEX_PD_TURBULENCE) {
+			
+			uiDefButF(block, NUM, B_REDR, "Size: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 100.0, 10, 2, "Turbulence size");
+			uiDefButS(block, NUM, B_REDR, "Depth: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 100.0, 10, 2, "Turbulence depth");
+			uiDefButF(block, NUM, B_REDR, "Strength: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 100.0, 10, 2, "");
+			
+			uiBlockEndAlign(block);
+			
+			yco -= YSPACE;
+
+			if (pd->source == TEX_PD_PSYS) {
+				uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Angular Velocity %x2",
+					X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
+			}
+		}
+		uiBlockEndAlign(block);
+
 		yco = PANEL_YMAX;
 		
 		uiDefBut(block, LABEL, B_NOP, "Point data source:",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 		
 		uiDefButS(block, MENU, B_TEXREDR_PRV, "Particle System %x0|Object Vertices %x1",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->source, 0.0, 0.0, 0, 0, "Source");
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->source, 0.0, 0.0, 0, 0, "Source");
 		
 		yco -= YSPACE;
 		
@@ -788,6 +815,7 @@ static void texture_panel_pointdensity(Tex *tex)
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 			uiDefButS(block, MENU, B_TEXREDR_PRV, "Emit Object Location %x0|Emit Object Space %x1|Global Space %x2",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->psys_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache particles in");
+				
 		}
 		else if (pd->source == TEX_PD_OBJECT) {
 			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",

From 8c3e960dd40cf36f8d4140fe545cb6e584d8900c Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 6 Oct 2008 22:39:06 +0000
Subject: [PATCH 024/577] * Fix for silly crash in point density UI, showed up
 in files with an existing empty texture.

---
 source/blender/src/buttons_shading.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index b6c3e39bac2..6ec8ce78e73 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -803,7 +803,7 @@ static void texture_panel_pointdensity(Tex *tex)
 			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
 				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object that has the particle system");
 				
-			if (pd->object->particlesystem.first) {
+			if (pd->object && pd->object->particlesystem.first) {
 				uiDefButS(block, NUM, B_REDR, "PSys:", 
 					X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->psysindex), 1, 10, 10, 3, "Particle system number in the object");
 			}

From 837211077ce17f17b946c46dde63555d56640aae Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 9 Oct 2008 01:15:54 +0000
Subject: [PATCH 025/577] * fix for silly bug in point density with no object
 in the object field

---
 source/blender/render/intern/source/pointdensity.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index e7e2d4fc26e..6ba9ace043d 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -168,10 +168,12 @@ static void cache_pointdensity(Render *re, Tex *tex)
 		Object *ob = pd->object;
 		int i;
 		
+		if (!ob) return;
+		
 		for(psys=ob->particlesystem.first, i=0; i< pd->psysindex-1; i++)
 			psys= psys->next;
 		
-		if (!ob || !psys) return;
+		if (!psys) return;
 		
 		pointdensity_cache_psys(re, pd, ob, psys);
 	}

From 21075b1a17b901a104efd1a8cb47241947942ffd Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 12 Oct 2008 11:38:28 +0000
Subject: [PATCH 026/577] Using quad trees instead of binary ones give another
 10% speedup

---
 source/blender/render/intern/source/pointdensity.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 6ba9ace043d..bdfb4d3b9d1 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -77,7 +77,7 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	
 	total_particles = psys->totpart+psys->totchild;
 	
-	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 2, 6);
+	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 4, 6);
 	if (pd->noise_influence != TEX_PD_NOISE_STATIC)
 		pd->point_data = MEM_mallocN(sizeof(float)*3*total_particles, "point_data");
 	
@@ -131,7 +131,7 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *o
 	/* in case ob->imat isn't up-to-date */
 	Mat4Invert(obr->ob->imat, obr->ob->obmat);
 	
-	pd->point_tree = BLI_bvhtree_new(obr->totvert, 0.0, 2, 6);
+	pd->point_tree = BLI_bvhtree_new(obr->totvert, 0.0, 4, 6);
 	
 	for(i=0; i<obr->totvert; i++) {
 		float ver_co[3];

From a6bd4480ee218d4e3885691262aed13abf4241b0 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 12 Oct 2008 23:39:52 +0000
Subject: [PATCH 027/577] * A few volume rendering tweaks:

- modified point density so that it returns a more consistent
density with regards to search radius. Previously larger radii
would give much higher density but this is equalised out now.

- Added a new volume material option 'density scale'. This is an
overall scale multiplier for density, allowing you to (for
example) crank down the density to a more desirable range if
you're working at a large physical scale. Volume rendering is
fundamentally scale dependant so this lets you correct to get the
right visual result.

- Also tweaked a few constants, old files won't render exactly
the same, just minor things though.
---
 source/blender/blenkernel/intern/material.c        |  1 +
 source/blender/blenloader/intern/readfile.c        |  2 ++
 source/blender/makesdna/DNA_material_types.h       |  2 +-
 source/blender/render/intern/source/pointdensity.c | 11 ++++++-----
 source/blender/render/intern/source/volumetric.c   |  3 ++-
 source/blender/src/buttons_shading.c               | 14 +++++++++-----
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index f54c0ae7ab1..3fcc76bf058 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -167,6 +167,7 @@ void init_material(Material *ma)
 	ma->sss_front= 1.0f;
 	ma->sss_back= 1.0f;
 	
+	ma->vol_density_scale = 1.0f;
 	ma->vol_stepsize = 0.2f;
 	ma->vol_shade_stepsize = 0.2f;
 	ma->vol_absorption = 1.0f;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3cae5fe4972..a3e6a21dd0b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7893,6 +7893,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_scattering = 1.0f;
 				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;	
 			}
+			if (ma->vol_density_scale < 0.0001f)
+				ma->vol_density_scale = 1.0f;
 		}
 		
 		for(tex=main->tex.first; tex; tex= tex->id.next) {
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 4e006d17682..3efb8d9c116 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -66,7 +66,7 @@ typedef struct Material {
 	short pad5[3];
 	
 	/* volumetrics */
-	float vol_alphathresh;
+	float vol_density_scale;
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index bdfb4d3b9d1..e7b6aedb894 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -255,7 +255,7 @@ typedef struct PointDensityRangeData
 void accum_density(void *userdata, int index, float squared_dist)
 {
 	PointDensityRangeData *pdr = (PointDensityRangeData *)userdata;
-	const float dist = pdr->squared_radius - squared_dist;
+	const float dist = (pdr->squared_radius - squared_dist) / pdr->squared_radius * 0.5f;
 	float density;
 	
 	if (pdr->falloff_type == TEX_PD_FALLOFF_STD)
@@ -287,7 +287,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	float density=0.0f;
 	float vec[3] = {0.0, 0.0, 0.0};
 	float tv[3];
-	float turb;
+	float turb, noise_fac;
 	
 	if ((!pd) || (!pd->point_tree)) {
 		texres->tin = 0.0f;
@@ -299,6 +299,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	pdr.point_data = pd->point_data;
 	pdr.falloff_type = pd->falloff_type;
 	pdr.vec = vec;
+	noise_fac = pd->noise_fac * 0.5f;	/* better default */
 	
 	if (pd->flag & TEX_PD_TURBULENCE) {
 		VECCOPY(tv, texvec);
@@ -313,9 +314,9 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 		
 		turb -= 0.5f;	/* re-center 0.0-1.0 range around 0 to prevent offsetting result */
 		
-		tv[0] = texvec[0] + pd->noise_fac * turb;
-		tv[1] = texvec[1] + pd->noise_fac * turb;
-		tv[2] = texvec[2] + pd->noise_fac * turb;
+		tv[0] = texvec[0] + noise_fac * turb;
+		tv[1] = texvec[1] + noise_fac * turb;
+		tv[2] = texvec[2] + noise_fac * turb;
 		
 		/* do density lookup with altered coordinates */
 		BLI_bvhtree_range_query(pd->point_tree, tv, pd->radius, accum_density, &pdr);
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 9a6790976af..ea661c42cff 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -131,13 +131,14 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->alpha;
+	float density_scale = shi->mat->vol_density_scale;
 	float col[3] = {0.0, 0.0, 0.0};
 	
 	if (shi->mat->flag & MA_IS_TEXTURED) {
 		do_volume_tex(shi, co, MAP_ALPHA, col, &density);
 	}
 	
-	return density;
+	return density * density_scale;
 }
 
 
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 7be862b0f15..8d94d5f1ea3 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4363,7 +4363,7 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 100, 2, "Ray marching step size");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
@@ -4372,7 +4372,7 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Shading",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 100, 2, "Step");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
@@ -4389,14 +4389,18 @@ static void material_panel_material_volume(Material *ma)
 		
 	yco = PANEL_YMAX;
 	
+	uiBlockBeginAlign(block);
 	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base opacity value");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base density value - textured density is added on top");
+	uiDefButF(block, NUM, B_MATPRV, "Density Scale: ",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_density_scale), 0.000001, 100.0, 100, 2, "Global density multiplier");
+	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
 	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 10.0, 10, 0, "Multiplier for absorption");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 100.0, 10, 0, "Multiplier for absorption");
 	uiDefButF(block, COL, B_MATPRV, "",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, ma->vol_absorption_col, 0, 0, 0, B_MATCOL, "");
 	uiBlockEndAlign(block);
@@ -4413,7 +4417,7 @@ static void material_panel_material_volume(Material *ma)
 	yco -= YSPACE;
 	
 	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 10.0, 10, 0, "Multiplier for scattering");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 100.0, 10, 0, "Multiplier for scattering");
 }
 
 static void material_panel_nodes(Material *ma)

From c0ddd5fd4914f7876cdf36225566d795e415bbf1 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 13 Oct 2008 00:35:58 +0000
Subject: [PATCH 028/577] * New option for step size: Randomized

This is on by default, and trades random noise for banding. It jitters
the step size from 75% to 125% of its original amount, and since it
uses the threaded random seeds, shouldn't flicker during animation.

These two images took roughly the same time to render:
http://mke3.net/blender/devel/rendering/volumetrics/vol_stepsize_randomized.jpg
---
 source/blender/makesdna/DNA_material_types.h  | 10 ++++--
 .../blender/render/intern/source/volumetric.c | 32 ++++++++++++++++---
 source/blender/src/buttons_shading.c          |  8 +++--
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 3efb8d9c116..86de34e5d26 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -63,11 +63,12 @@ typedef struct Material {
 	/* end synced with render_types.h */
 	
 	short material_type; /* solid, halo, volumetric */
-	short pad5[3];
+	short pad5[2];
 	
 	/* volumetrics */
-	float vol_density_scale;
+	short vol_stepsize_type;
 	float vol_stepsize, vol_shade_stepsize;
+	float vol_density_scale;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
 	short vol_shadeflag;
@@ -347,6 +348,11 @@ typedef struct Material {
 /* sss_flag */
 #define MA_DIFF_SSS		1
 
+/* vol_stepsize_type */
+#define MA_VOL_STEP_RANDOMIZED	0
+#define MA_VOL_STEP_CONSTANT	1
+#define MA_VOL_STEP_ADAPTIVE	2
+
 /* vol_shadeflag */
 #define MA_VOL_SHADED		1
 #define MA_VOL_ATTENUATED	2
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index ea661c42cff..e0006a24fba 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -128,6 +128,29 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	}
 }
 
+#define STEPSIZE_VIEW	0
+#define STEPSIZE_SHADE	1
+float vol_get_stepsize(struct ShadeInput *shi, int context)
+{
+	if (shi->mat->vol_stepsize_type == MA_VOL_STEP_RANDOMIZED) {
+		/* range between 0.75 and 1.25 */
+		const float rnd = 0.5f * BLI_thread_frand(shi->thread) + 0.75f;
+	
+		if (context == STEPSIZE_VIEW)
+			return shi->mat->vol_stepsize * rnd;
+		else if (context == STEPSIZE_SHADE)
+			return shi->mat->vol_shade_stepsize * rnd;
+	}
+	else {
+		// MA_VOL_STEP_CONSTANT
+		
+		if (context == STEPSIZE_VIEW)
+			return shi->mat->vol_stepsize;
+		else if (context == STEPSIZE_SHADE)
+			return shi->mat->vol_shade_stepsize;
+	}
+}
+
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->alpha;
@@ -264,6 +287,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	float hitco[3], *atten_co;
 	float p;
 	float scatter_fac;
+	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
 			
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
@@ -303,8 +327,8 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 				atten_co = lar->co;
 			} else
 				atten_co = hitco;
-
-			vol_get_attenuation(shi, tau, co, atten_co, density, shi->mat->vol_shade_stepsize);
+			
+			vol_get_attenuation(shi, tau, co, atten_co, density, shade_stepsize);
 			tr[0] = exp(-tau[0]);
 			tr[1] = exp(-tau[1]);
 			tr[2] = exp(-tau[2]);
@@ -321,8 +345,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	vol_get_scattering_fac(shi, &scatter_fac, co, density);
 	VecMulf(lacol, scatter_fac);
 	
-	
-
 }
 
 /* shadows -> trace a ray to find blocker geometry
@@ -362,7 +384,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 {
 	float tr[3] = {1.0f, 1.0f, 1.0f};			/* total transmittance */
 	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
-	float stepsize = shi->mat->vol_stepsize;
+	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
 	int nsteps;
 	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
 	float tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 8d94d5f1ea3..ac4f10cf214 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4363,7 +4363,9 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 100, 2, "Ray marching step size");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
+	uiDefButS(block, MENU, B_TEXREDR_PRV, "Step Size Calculation %t|Randomized %x0|Constant %x1",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_stepsize_type, 0.0, 0.0, 0, 0, "Step size calculation, replace banding with jittering");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
@@ -4372,7 +4374,7 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Shading",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 100, 2, "Step");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
@@ -4393,7 +4395,7 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButF(block, NUMSLI, B_MATPRV, "Density: ",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->alpha), 0.0, 1.0, 0, 0, "Base density value - textured density is added on top");
 	uiDefButF(block, NUM, B_MATPRV, "Density Scale: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_density_scale), 0.000001, 100.0, 100, 2, "Global density multiplier");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_density_scale), 0.000001, 100.0, 10, 2, "Global density multiplier");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;

From d6808c2b4b9d53f5481e96d4041e67b20f1d56f0 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 13 Oct 2008 05:22:31 +0000
Subject: [PATCH 029/577] * Raytraced shadow casting for volumes

This is a first version and still has a couple of things undefined or
unimplemented, such as external objects casting shadows on or within volumes,
however volume->solid shadows are going ok.

http://mke3.net/blender/devel/rendering/volumetrics/shadows_test_02.mov
http://mke3.net/blender/devel/rendering/volumetrics/vol_test_shad3.blend

As with other transparent raytraced shadows in Blender ,in order to make it work,
you must enable 'TraShad' on the material *receiving* the shadow. It would be
nice to make this a bit easier to use, since there's not much chance you want a
volume material to be casting solid shadows, but that's a bigger issue in the
renderer outside this scope.

The volume shadows are working from the same physical basis of absorption, and
support coloured absorption:

http://mke3.net/blender/devel/rendering/volumetrics/vol_shad_absorption.png

They also work properly with multi-sampled (i.e. QMC) soft shadows:

http://mke3.net/blender/devel/rendering/volumetrics/vol_shad_sharp.png
http://mke3.net/blender/devel/rendering/volumetrics/vol_shad_soft.png

And by popular request the test file:
http://mke3.net/blender/devel/rendering/volumetrics/vol_test_shad_clouds.blend
---
 .../render/intern/include/pointdensity.h      |  1 +
 .../render/intern/include/rendercore.h        |  2 +
 .../render/intern/include/volumetric.h        |  3 +-
 .../render/intern/source/convertblender.c     |  2 -
 .../blender/render/intern/source/rayshade.c   | 33 ++++++----
 .../blender/render/intern/source/volumetric.c | 60 ++++++++++++++++++-
 6 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/source/blender/render/intern/include/pointdensity.h b/source/blender/render/intern/include/pointdensity.h
index 9c21cc0c253..93cdef3b14e 100644
--- a/source/blender/render/intern/include/pointdensity.h
+++ b/source/blender/render/intern/include/pointdensity.h
@@ -37,6 +37,7 @@ struct Render;
 struct TexResult;
 
 void make_pointdensities(struct Render *re);
+void free_pointdensities(struct Render *re);
 int pointdensitytex(struct Tex *tex, float *texvec, struct TexResult *texres);
 
 #endif /* POINTDENSITY_H */
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index 4b28529a147..972071764d2 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -48,6 +48,7 @@ struct RenderPart;
 struct RenderLayer;
 struct ObjectRen;
 struct ListBase;
+struct Isect;
 
 /* ------------------------------------------------------------------------- */
 
@@ -98,6 +99,7 @@ extern void makeraytree(Render *re);
 
 extern void ray_shadow(ShadeInput *, LampRen *, float *);
 extern void ray_trace(ShadeInput *, ShadeResult *);
+extern void ray_trace_shadow_tra(struct Isect *is, int depth, int traflag);
 extern void ray_ao(ShadeInput *, float *);
 extern void init_jitter_plane(LampRen *lar);
 extern void init_ao_sphere(struct World *wrld);
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index 8db3fa63f98..290be427f01 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -26,4 +26,5 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr);
\ No newline at end of file
+void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr);
+void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is);
\ No newline at end of file
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 4b663c6caa6..0660d9e0b24 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -965,8 +965,6 @@ static Material *give_render_material(Render *re, Object *ob, int nr)
 	if(ma->nodetree && ma->use_nodes)
 		flag_render_node_material(re, ma->nodetree);
 	
-	if (ma->material_type == MA_VOLUME) re->r.mode |= R_RAYTRACE;
-	
 	check_material_is_textured(ma);
 	
 	return ma;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index c431340d770..d06bbcf3300 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -54,6 +54,7 @@
 #include "pixelshading.h"
 #include "shading.h"
 #include "texture.h"
+#include "volumetric.h"
 
 #include "RE_raytrace.h"
 
@@ -262,21 +263,28 @@ void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
 
 	shade_input_set_shade_texco(shi);
 	
-	if(is->mode==RE_RAY_SHADOW_TRA) 
+	if (shi->mat->material_type == MA_VOLUME) {
+		if(ELEM(is->mode, RE_RAY_SHADOW, RE_RAY_SHADOW_TRA)) {
+			volume_trace_shadow(shi, shr, is);
+		} else {
+			shade_volume_loop(shi, shr);
+		}
+	}
+	else if(is->mode==RE_RAY_SHADOW_TRA) 
 		if(shi->mat->nodetree && shi->mat->use_nodes) {
 			ntreeShaderExecTree(shi->mat->nodetree, shi, shr);
 			shi->mat= vlr->mat;		/* shi->mat is being set in nodetree */
 		}
-		else
+		else {
 			shade_color(shi, shr);
+		}
 	else {
 		if(shi->mat->nodetree && shi->mat->use_nodes) {
 			ntreeShaderExecTree(shi->mat->nodetree, shi, shr);
 			shi->mat= vlr->mat;		/* shi->mat is being set in nodetree */
 		}
 		else {
-			if (shi->mat->material_type == MA_SOLID) shade_material_loop(shi, shr);
-			else if (shi->mat->material_type == MA_VOLUME) shade_volume_loop(shi, shr);
+			shade_material_loop(shi, shr);
 		}
 		/* raytrace likes to separate the spec color */
 		VECSUB(shr->diff, shr->combined, shr->spec);
@@ -1274,7 +1282,7 @@ static void addAlphaLight(float *shadfac, float *col, float alpha, float filter)
 	shadfac[3]= (1.0f-alpha)*shadfac[3];
 }
 
-static void ray_trace_shadow_tra(Isect *is, int depth, int traflag)
+void ray_trace_shadow_tra(Isect *is, int depth, int traflag)
 {
 	/* ray to lamp, find first face that intersects, check alpha properties,
 	   if it has col[3]>0.0f  continue. so exit when alpha is full */
@@ -1303,11 +1311,16 @@ static void ray_trace_shadow_tra(Isect *is, int depth, int traflag)
 		shi.mat_override= NULL;*/
 		
 		shade_ray(is, &shi, &shr);
-		if (traflag & RAY_TRA)
-			d= shade_by_transmission(is, &shi, &shr);
-		
-		/* mix colors based on shadfac (rgb + amount of light factor) */
-		addAlphaLight(is->col, shr.diff, shr.alpha, d*shi.mat->filter);
+		if (shi.mat->material_type == MA_SOLID) {
+			if (traflag & RAY_TRA)
+				d= shade_by_transmission(is, &shi, &shr);
+			
+			/* mix colors based on shadfac (rgb + amount of light factor) */
+			addAlphaLight(is->col, shr.diff, shr.alpha, d*shi.mat->filter);
+		} else {
+			// MA_VOLUME
+			addAlphaLight(is->col, shr.combined, shr.alpha, 1.0f);
+		}
 		
 		if(depth>0 && is->col[3]>0.0f) {
 			
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index e0006a24fba..3b44e1bb87f 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -149,6 +149,8 @@ float vol_get_stepsize(struct ShadeInput *shi, int context)
 		else if (context == STEPSIZE_SHADE)
 			return shi->mat->vol_shade_stepsize;
 	}
+	
+	return shi->mat->vol_stepsize;
 }
 
 float vol_get_density(struct ShadeInput *shi, float *co)
@@ -247,6 +249,8 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	dist = VecLenf(co, endco);
 	nsteps = (int)ceil(dist / stepsize);
 	
+	if (density < -0.001f) density = vol_get_density(shi, co);
+	
 	if (nsteps == 1) {
 		/* homogenous volume within the sampled distance */
 		tau[0] = tau[1] = tau[2] = dist * density;
@@ -485,7 +489,7 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	shi_new.mask= shi->mask;
 	shi_new.osatex= shi->osatex;
 	shi_new.thread= shi->thread;
-	shi_new.depth= shi->depth;
+	shi_new.depth= 1;
 	shi_new.volume_depth= shi->volume_depth + 1;
 	shi_new.xs= shi->xs;
 	shi_new.ys= shi->ys;
@@ -597,3 +601,57 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 		shr->combined[3] = shr->alpha =  1.0f;
 	}
 }
+
+void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
+{
+	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
+	float tr[3] = {1.0,1.0,1.0};
+	float tau[3] = {0.0,0.0,0.0};
+	Isect is;
+	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
+
+	memset(shr, 0, sizeof(ShadeResult));
+	
+	/* if 1st hit normal is facing away from the camera, 
+	 * then we're inside the volume already. */
+	if (shi->flippednor) {
+	
+		vol_get_attenuation(shi, tau, last_is->start, shi->co, -1.0f, shade_stepsize);
+		tr[0] = exp(-tau[0]);
+		tr[1] = exp(-tau[1]);
+		tr[2] = exp(-tau[2]);
+		
+		shr->combined[0] = tr[0];
+		shr->combined[1] = tr[1];
+		shr->combined[2] = tr[2];
+		
+		shr->combined[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
+		shr->alpha = shr->combined[3];
+	}
+	/* trace to find a backface, the other side bounds of the volume */
+	/* (ray intersect ignores front faces here) */
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH, 0)) {
+		float dist = VecLenf(shi->co, hitco);
+		
+		vol_get_attenuation(shi, tau, shi->co, hitco, -1.0f, shade_stepsize);
+		tr[0] = exp(-tau[0]);
+		tr[1] = exp(-tau[1]);
+		tr[2] = exp(-tau[2]);
+		
+		shr->combined[0] = tr[0];
+		shr->combined[1] = tr[1];
+		shr->combined[2] = tr[2];
+		
+		shr->combined[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
+		shr->alpha = shr->combined[3];
+
+	}
+	else {
+		shr->combined[0] = 0.0f;
+		shr->combined[1] = 0.0f;
+		shr->combined[2] = 0.0f;
+		shr->combined[3] = shr->alpha =  0.0f;
+	}
+
+}
+

From 51d51991e59f98e7cff3a035d5ba3a142f1ed7e0 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 13 Oct 2008 06:46:23 +0000
Subject: [PATCH 030/577] * Added support for solid objects casting shadows
 within a volume.

Currently it only supports solid shadows - if it's a solid object, it will cast
100% shadow. Support for transparent shadows can potentially be added down the
track.

http://mke3.net/blender/devel/rendering/volumetrics/vol_shad_internal.jpg
---
 source/blender/makesdna/DNA_material_types.h     |  2 +-
 source/blender/render/intern/source/volumetric.c | 12 +++++++++---
 source/blender/src/buttons_shading.c             |  7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 86de34e5d26..7b6e945dfbf 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -356,7 +356,7 @@ typedef struct Material {
 /* vol_shadeflag */
 #define MA_VOL_SHADED		1
 #define MA_VOL_ATTENUATED	2
-#define MA_VOL_SHADOWED		4
+#define MA_VOL_RECVSHADOW	4
 
 /* vol_phasefunc_type */
 #define MA_VOL_PH_ISOTROPIC		0
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 3b44e1bb87f..6e2e817fc85 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -292,7 +292,8 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	float p;
 	float scatter_fac;
 	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
-			
+	float shadfac[4];
+	
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
 	if (lar->energy == 0.0) return;
@@ -324,7 +325,13 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		/* find minimum of volume bounds, or lamp coord */
 		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
 			float dist = VecLenf(co, hitco);
+			VlakRen *vlr = (VlakRen *)is.face;
 			
+			if (vlr->mat->material_type == MA_SOLID) {
+				lacol[0] = lacol[1] = lacol[2] = 0.0f;
+				return;
+			}
+
 			if (ELEM(lar->type, LA_SUN, LA_HEMI))
 				atten_co = hitco;
 			else if ( lampdist < dist ) {
@@ -604,7 +611,7 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 
 void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
 {
-	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
+	float hitco[3];
 	float tr[3] = {1.0,1.0,1.0};
 	float tau[3] = {0.0,0.0,0.0};
 	Isect is;
@@ -631,7 +638,6 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	/* trace to find a backface, the other side bounds of the volume */
 	/* (ray intersect ignores front faces here) */
 	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH, 0)) {
-		float dist = VecLenf(shi->co, hitco);
 		
 		vol_get_attenuation(shi, tau, shi->co, hitco, -1.0f, shade_stepsize);
 		tr[0] = exp(-tau[0]);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index ac4f10cf214..430b50717df 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4371,7 +4371,7 @@ static void material_panel_material_volume(Material *ma)
 	yco -= YSPACE;
 			
 	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Shading",
+	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Self Shading",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
@@ -4388,7 +4388,10 @@ static void material_panel_material_volume(Material *ma)
 	}
 	uiBlockEndAlign(block);
 	
-		
+	/*uiDefButBitS(block, TOG, MA_VOL_RECVSHADOW, B_MATPRV, "Receive Shadows",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Receive shadows from external objects");
+	*/
+	
 	yco = PANEL_YMAX;
 	
 	uiBlockBeginAlign(block);

From b3000c5529d10ae5002d25384c50d934b233a216 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 17 Oct 2008 05:54:42 +0000
Subject: [PATCH 031/577] non-working WIP commit to continue coding at home.

nothing to see here, move along!
---
 source/blender/makesdna/DNA_material_types.h  |   1 +
 .../render/intern/include/render_types.h      |  14 ++
 .../render/intern/include/volumetric.h        |   4 +-
 .../render/intern/source/convertblender.c     |  20 +++
 .../render/intern/source/renderdatabase.c     |   1 +
 .../blender/render/intern/source/volumetric.c | 126 +++++++++++++++---
 source/blender/src/buttons_shading.c          |   2 +
 7 files changed, 150 insertions(+), 18 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 7b6e945dfbf..3ceb267ce67 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -357,6 +357,7 @@ typedef struct Material {
 #define MA_VOL_SHADED		1
 #define MA_VOL_ATTENUATED	2
 #define MA_VOL_RECVSHADOW	4
+#define MA_VOL_PRECACHESHADING	8
 
 /* vol_phasefunc_type */
 #define MA_VOL_PH_ISOTROPIC		0
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index b0003cadb55..6f4537d84fb 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -201,6 +201,8 @@ struct Render
 	ListBase customdata_names;
 
 	struct Object *excludeob;
+	
+	ListBase vol_precache_obs;
 
 	/* arena for allocating data for use during render, for
 		* example dynamic TFaces to go in the VlakRen structure.
@@ -285,6 +287,8 @@ typedef struct ObjectInstanceRen {
 
 	float dupliorco[3], dupliuv[2];
 	float (*duplitexmat)[4];
+	
+	float *volume_precache;
 
 	float *vectors;
 	int totvector;
@@ -396,6 +400,16 @@ typedef struct StrandRen {
 	float orco[3];
 } StrandRen;
 
+/* ------------------------------------------------------------------------- */
+
+typedef struct VolPrecache
+{
+	struct VolPrecache *next, *prev;
+	struct Material *ma;
+	struct ObjectRen *obr;
+} VolPrecache;
+
+/* ------------------------------------------------------------------------- */
 
 struct LampRen;
 struct MTex;
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index 290be427f01..fb87035145f 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -27,4 +27,6 @@
  */
 
 void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr);
-void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is);
\ No newline at end of file
+void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is);
+void volume_precache(Render *re);
+void free_volume_precache(Render *re);
\ No newline at end of file
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 0660d9e0b24..4c9914aa4d3 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3026,6 +3026,18 @@ static void use_mesh_edge_lookup(ObjectRen *obr, DerivedMesh *dm, MEdge *medge,
 	}
 }
 
+static void add_vol_precache(Render *re, ObjectRen *obr, Material *ma)
+{
+	struct VolPrecache *vp;
+	
+	vp = MEM_mallocN(sizeof(VolPrecache), "volume precache object");
+	
+	vp->ma = ma;
+	vp->obr = obr;
+	
+	BLI_addtail(&re->vol_precache_obs, vp);
+}
+
 static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 {
 	Object *ob= obr->ob;
@@ -3080,6 +3092,10 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 			if(re->r.mode & R_RADIO)
 				if(ma->mode & MA_RADIO) 
 					do_autosmooth= 1;
+			
+			if (ma->vol_shadeflag & MA_VOL_PRECACHESHADING) {
+				add_vol_precache(re, obr, ma);
+			}
 		}
 	}
 
@@ -4436,6 +4452,7 @@ void RE_Database_Free(Render *re)
 	end_render_materials();
 	
 	free_pointdensities(re);
+	free_volume_precache(re);
 	
 	if(re->wrld.aosphere) {
 		MEM_freeN(re->wrld.aosphere);
@@ -4891,6 +4908,9 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 			/* point density texture */
 			if(!re->test_break())
 				make_pointdensities(re);
+				
+			if(!re->test_break())
+				volume_precache(re);
 		}
 		
 		if(!re->test_break())
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index d44b49cc706..1bc1c1a712a 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -1323,6 +1323,7 @@ ObjectInstanceRen *RE_addRenderInstance(Render *re, ObjectRen *obr, Object *ob,
 	obi->index= index;
 	obi->psysindex= psysindex;
 	obi->lay= lay;
+	obi->volume_precache = NULL;
 
 	if(mat) {
 		Mat4CpyMat4(obi->mat, mat);
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 6e2e817fc85..3128c67ee88 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <float.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
@@ -44,6 +46,7 @@
 #include "DNA_lamp_types.h"
 
 #include "BKE_global.h"
+#include "BKE_main.h"
 
 #include "render_types.h"
 #include "pixelshading.h"
@@ -166,7 +169,6 @@ float vol_get_density(struct ShadeInput *shi, float *co)
 	return density * density_scale;
 }
 
-
 /* compute emission component, amount of radiance to add per segment
  * can be textured with 'emit' */
 void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
@@ -182,14 +184,16 @@ void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
 	VecMulVecf(em, em, col);
 }
 
+/* scattering multiplier, values above 1.0 are non-physical, 
+ * but can be useful to tweak lighting */
 void vol_get_scattering_fac(ShadeInput *shi, float *scatter_fac, float *co, float density)
 {
-	//float col[3] = {0.0, 0.0, 0.0};
-	//do_volume_tex(shi, co, MAP_EMIT+MAP_COL, col, &emission);
-	
 	*scatter_fac = shi->mat->vol_scattering;
 }
 
+/* phase function - determines in which directions the light 
+ * is scattered in the volume relative to incoming direction 
+ * and view direction */
 float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w, float *wp)
 {
 	const float costheta = Inpf(w, wp);
@@ -235,7 +239,7 @@ void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
- * can be textured with 'alpha' */
+ */
 void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, float density, float stepsize)
 {
 	/* input density = density at co */
@@ -249,6 +253,7 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	dist = VecLenf(co, endco);
 	nsteps = (int)ceil(dist / stepsize);
 	
+	/* trigger for recalculating density */
 	if (density < -0.001f) density = vol_get_density(shi, co);
 	
 	if (nsteps == 1) {
@@ -327,6 +332,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 			float dist = VecLenf(co, hitco);
 			VlakRen *vlr = (VlakRen *)is.face;
 			
+			/* simple internal shadowing */
 			if (vlr->mat->material_type == MA_SOLID) {
 				lacol[0] = lacol[1] = lacol[2] = 0.0f;
 				return;
@@ -347,9 +353,9 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 			VecMulVecf(lacol, lacol, tr);
 		}
 		else {
-			/* point is on the outside edge of the volume,
-			 * therefore no attenuation, full transmission
-			 * radiance from lamp remains unchanged */
+			/* Point is on the outside edge of the volume,
+			 * therefore no attenuation, full transmission.
+			 * Radiance from lamp remains unchanged */
 		}
 	}
 	
@@ -358,13 +364,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	
 }
 
-/* shadows -> trace a ray to find blocker geometry
-   - if blocker is outside the volume, use standard shadow functions
-   - if blocker is inside the volume, use raytracing
-    -- (deep shadow maps could potentially slot in here too I suppose)
-   - attenuate from current point, to blocked point or volume bounds
-*/
-
 /* single scattering only for now */
 void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
 {
@@ -382,7 +381,7 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 		if (lar==NULL) continue;
 		
 		vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
-			
+		
 		VecMulf(lacol, density);
 		
 		VecAddf(col, col, lacol);
@@ -425,7 +424,28 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	
 	/* get radiance from all points along the ray due to participating media */
 	for (s = 0; s < nsteps; s++) {
-		if (s > 0) density = vol_get_density(shi, step_sta);
+
+		if (shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) {
+			int res = 10;
+			int x,y,z;
+			
+			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
+			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
+			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
+			
+			//CLAMP(step_mid[0], 0.0f, 1.0f);
+			//CLAMP(step_mid[1], 0.0f, 1.0f);
+			//CLAMP(step_mid[2], 0.0f, 1.0f);
+			
+			MTC_Mat4MulVecfl(R.viewinv, step_mid);
+			
+			x = (int)step_mid[0] * res;
+			y = (int)step_mid[1] * res;
+			z = (int)step_mid[2] * res;
+			
+			density = shi->obi->volume_precache[x*res + y*res + z*res];
+		}
+		else if (s > 0) density = vol_get_density(shi, step_sta);
 		
 		/* there's only any use in shading here
 		 * if there's actually some density to shade! */
@@ -661,3 +681,75 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 
 }
 
+void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma)
+{
+	int x, y, z;
+	int res = 10;
+	float co[3];
+	ShadeInput shi;
+	int foundma=0;
+	float density;
+	float resf;
+	int i;
+	
+	memset(&shi, 0, sizeof(ShadeInput)); 
+	shi.depth= 1;
+	shi.mask= 1;
+	shi.mat = ma;
+	shi.vlr = NULL;
+	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
+	shi.har= shi.mat->har;
+
+	shi.obi= obi;
+	shi.obr= obi->obr;
+
+	resf = (float) res;
+	
+	obi->volume_precache = MEM_mallocN(sizeof(float)*res*res*res, "volume light cache");
+	
+	for (x=0; x < res; x++) {
+		co[0] = (float)x / resf;
+		
+		for (y=0; y < res; y++) {
+			co[1] = (float)y / resf;
+			
+			for (z=0; z < res; z++) {
+				co[2] = (float)z / resf;
+				
+				density = vol_get_density(&shi, co);
+			
+				obi->volume_precache[x*res + y*res + z*res] = density;
+				
+				printf("vol_light_cache[%d][%d][%d] = %f \n", x, y, z, obi->volume_precache[x*res + y*res + z*res]); 
+			}
+		}
+	}
+}
+
+void volume_precache(Render *re)
+{
+	ObjectInstanceRen *obi;
+	VolPrecache *vp;
+	
+	printf("Precaching %d volumes... \n", BLI_countlist(&re->vol_precache_obs));
+	
+	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
+		for(obi= re->instancetable.first; obi; obi= obi->next) {
+			if (obi->obr == vp->obr)
+				printf("precaching object: %s with material: %s \n", vp->obr->ob->id.name+2, vp->ma->id.name+2);
+				vol_precache_objectinstance(re, obi, vp->ma);
+		}
+	}
+}
+
+void free_volume_precache(Render *re)
+{
+	ObjectInstanceRen *obi;
+	
+	for(obi= re->instancetable.first; obi; obi= obi->next) {
+		if (obi->volume_precache)
+			MEM_freeN(obi->volume_precache);
+	}
+	
+	BLI_freelistN(&re->vol_precache_obs);
+}
\ No newline at end of file
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 430b50717df..63fa127824a 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4375,6 +4375,8 @@ static void material_panel_material_volume(Material *ma)
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
+	uiDefButBitS(block, TOG, MA_VOL_PRECACHESHADING, B_MATPRV, "Precache",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "precache");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;

From 49aa7edb7708fcc0119d8251fa423903b022e706 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 19 Oct 2008 08:25:10 +0000
Subject: [PATCH 032/577] Another WIP commit, nothing to see yet.

---
 source/blender/makesdna/DNA_material_types.h  |   3 +-
 .../render/intern/source/convertblender.c     |  11 +-
 .../render/intern/source/pointdensity.c       |   3 +
 .../blender/render/intern/source/volumetric.c | 128 +++++++++++-------
 source/blender/src/buttons_shading.c          |   2 +
 5 files changed, 94 insertions(+), 53 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 3ceb267ce67..66f23c7905d 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -63,10 +63,11 @@ typedef struct Material {
 	/* end synced with render_types.h */
 	
 	short material_type; /* solid, halo, volumetric */
-	short pad5[2];
+	short pad5;
 	
 	/* volumetrics */
 	short vol_stepsize_type;
+	short vol_precache_resolution;
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_density_scale;
 	float vol_absorption, vol_scattering;
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 4c9914aa4d3..c58946bb64b 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3093,7 +3093,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 				if(ma->mode & MA_RADIO) 
 					do_autosmooth= 1;
 			
-			if (ma->vol_shadeflag & MA_VOL_PRECACHESHADING) {
+			if ((ma->material_type == MA_VOLUME) && (ma->vol_shadeflag & MA_VOL_PRECACHESHADING)) {
 				add_vol_precache(re, obr, ma);
 			}
 		}
@@ -4429,6 +4429,8 @@ void RE_Database_Free(Render *re)
 	
 	BLI_freelistN(&re->lampren);
 	BLI_freelistN(&re->lights);
+	
+	free_volume_precache(re);
 
 	free_renderdata_tables(re);
 	
@@ -4452,7 +4454,6 @@ void RE_Database_Free(Render *re)
 	end_render_materials();
 	
 	free_pointdensities(re);
-	free_volume_precache(re);
 	
 	if(re->wrld.aosphere) {
 		MEM_freeN(re->wrld.aosphere);
@@ -4908,9 +4909,6 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 			/* point density texture */
 			if(!re->test_break())
 				make_pointdensities(re);
-				
-			if(!re->test_break())
-				volume_precache(re);
 		}
 		
 		if(!re->test_break())
@@ -4927,6 +4925,9 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 		if((re->r.mode & R_SSS) && !re->test_break())
 			if(re->r.renderer==R_INTERN)
 				make_sss_tree(re);
+		
+		if(!re->test_break())
+			volume_precache(re);
 	}
 	
 	if(re->test_break())
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index e7b6aedb894..f7c6767fcd8 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -227,6 +227,9 @@ void make_pointdensities(Render *re)
 			cache_pointdensity(re, tex);
 		}
 	}
+	
+	re->i.infostr= NULL;
+	re->stats_draw(&re->i);
 }
 
 void free_pointdensities(Render *re)
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 3128c67ee88..fc2e4a630b1 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): Farsthary (Raul FHernandez), Matt Ebb.
+ * Contributor(s): Matt Ebb, Raul Hernandez.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -38,6 +38,8 @@
 #include "BLI_rand.h"
 #include "BLI_kdtree.h"
 
+#include "PIL_time.h"
+
 #include "RE_shader_ext.h"
 #include "RE_raytrace.h"
 
@@ -59,6 +61,7 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#define PRECACHE_RES	5
 
 static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 {
@@ -365,7 +368,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 }
 
 /* single scattering only for now */
-void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
+void vol_get_scattering(Render *re, ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
 {
 	GroupObject *go;
 	ListBase *lights;
@@ -378,13 +381,14 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 		float lacol[3] = {0.f, 0.f, 0.f};
 	
 		lar= go->lampren;
-		if (lar==NULL) continue;
+		if (lar) {
 		
-		vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
+			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
 		
-		VecMulf(lacol, density);
+			VecMulf(lacol, density);
 		
-		VecAddf(col, col, lacol);
+			VecAddf(col, col, lacol);
+		}
 	}
 	
 	VECCOPY(scatter, col);
@@ -397,7 +401,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
 	int nsteps;
 	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
-	float tau[3], step_emit[3], step_scatter[3] = {0.0, 0.0, 0.0};
+	float tau[3], emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
 	int s;
 	float step_sta[3], step_end[3], step_mid[3];
 	float alpha;
@@ -425,27 +429,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	/* get radiance from all points along the ray due to participating media */
 	for (s = 0; s < nsteps; s++) {
 
-		if (shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) {
-			int res = 10;
-			int x,y,z;
-			
-			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
-			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
-			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
-			
-			//CLAMP(step_mid[0], 0.0f, 1.0f);
-			//CLAMP(step_mid[1], 0.0f, 1.0f);
-			//CLAMP(step_mid[2], 0.0f, 1.0f);
-			
-			MTC_Mat4MulVecfl(R.viewinv, step_mid);
-			
-			x = (int)step_mid[0] * res;
-			y = (int)step_mid[1] * res;
-			z = (int)step_mid[2] * res;
-			
-			density = shi->obi->volume_precache[x*res + y*res + z*res];
-		}
-		else if (s > 0) density = vol_get_density(shi, step_sta);
+		if (s > 0) density = vol_get_density(shi, step_sta);
 		
 		/* there's only any use in shading here
 		 * if there's actually some density to shade! */
@@ -462,10 +446,26 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
 		
 			/* incoming light via emission or scattering (additive) */
-			vol_get_emission(shi, step_emit, step_mid, density);
-			vol_get_scattering(shi, step_scatter, step_mid, stepsize, density);
+			vol_get_emission(shi, emit_col, step_mid, density);
+			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) && shi->obi->volume_precache) {
+				const int res = shi->mat->vol_precache_resolution;
+				int x,y,z;
+				float bbmin[3], bbmax[3], dim[3];
+								
+				VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
+				VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
+				VecSubf(dim, bbmax, bbmin);
+				
+				x = (int)(((step_mid[0] - bbmin[0]) / dim[0]) * res);
+				y = (int)(((step_mid[1] - bbmin[1]) / dim[1]) * res);
+				z = (int)(((step_mid[2] - bbmin[2]) / dim[2]) * res);
+				
+				scatter_col[0] = scatter_col[1] = scatter_col[2] = shi->obi->volume_precache[x*res*res + y*res + z];
+			}
+			else
+				vol_get_scattering(&R, shi, scatter_col, step_mid, stepsize, density);
 			
-			VecAddf(d_radiance, step_emit, step_scatter);
+			VecAddf(d_radiance, emit_col, scatter_col);
 			
 			/*   Lv += Tr * (Lve() + Ld) */
 			VecMulVecf(d_radiance, tr, d_radiance);
@@ -681,17 +681,23 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 
 }
 
-void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma)
+void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
 {
 	int x, y, z;
-	int res = 10;
-	float co[3];
+
+	float co[3], voxel[3], scatter_col[3];
 	ShadeInput shi;
-	int foundma=0;
 	float density;
-	float resf;
-	int i;
+	float stepsize;
 	
+	float resf;
+	int res_2;
+	float res_3;
+	
+	float i = 1.0f;
+	double lasttime= PIL_check_seconds_timer();
+	const int res = ma->vol_precache_resolution;
+
 	memset(&shi, 0, sizeof(ShadeInput)); 
 	shi.depth= 1;
 	shi.mask= 1;
@@ -699,28 +705,49 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	shi.vlr = NULL;
 	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
 	shi.har= shi.mat->har;
-
 	shi.obi= obi;
 	shi.obr= obi->obr;
+	
+	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
 
 	resf = (float) res;
+	res_2 = res*res;
+	res_3 = res*res*res;
+	
+	VecSubf(voxel, bbmax, bbmin);
+	VecMulf(voxel, 1.0f/res);
 	
 	obi->volume_precache = MEM_mallocN(sizeof(float)*res*res*res, "volume light cache");
 	
 	for (x=0; x < res; x++) {
-		co[0] = (float)x / resf;
+		co[0] = bbmin[0] + (voxel[0] * x);
 		
 		for (y=0; y < res; y++) {
-			co[1] = (float)y / resf;
+			co[1] = bbmin[1] + (voxel[1] * y);
 			
 			for (z=0; z < res; z++) {
-				co[2] = (float)z / resf;
+				double time= PIL_check_seconds_timer();
+			
+				co[2] = bbmin[2] + (voxel[2] * z);
 				
 				density = vol_get_density(&shi, co);
+				vol_get_scattering(re, &shi, scatter_col, co, stepsize, density);
 			
-				obi->volume_precache[x*res + y*res + z*res] = density;
+				obi->volume_precache[x*res_2 + y*res + z] = (scatter_col[0] + scatter_col[1] + scatter_col[2]) / 3.0f;
 				
-				printf("vol_light_cache[%d][%d][%d] = %f \n", x, y, z, obi->volume_precache[x*res + y*res + z*res]); 
+				/* display progress every second */
+				if(re->test_break())
+					return;
+				if(time-lasttime>1.0f) {
+					char str[64];
+					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3)));
+					re->i.infostr= str;
+					re->stats_draw(&re->i);
+					re->i.infostr= NULL;
+					lasttime= time;
+				}
+				
+				i++;
 			}
 		}
 	}
@@ -730,16 +757,21 @@ void volume_precache(Render *re)
 {
 	ObjectInstanceRen *obi;
 	VolPrecache *vp;
+	int i=1;
 	
 	printf("Precaching %d volumes... \n", BLI_countlist(&re->vol_precache_obs));
 	
 	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
 		for(obi= re->instancetable.first; obi; obi= obi->next) {
-			if (obi->obr == vp->obr)
-				printf("precaching object: %s with material: %s \n", vp->obr->ob->id.name+2, vp->ma->id.name+2);
-				vol_precache_objectinstance(re, obi, vp->ma);
+			if (obi->obr == vp->obr) {				
+				printf("Precaching Object: %s with Material: %s \n", vp->obr->ob->id.name+2, vp->ma->id.name+2);
+				vol_precache_objectinstance(re, obi, vp->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+			}
 		}
 	}
+	
+	re->i.infostr= NULL;
+	re->stats_draw(&re->i);
 }
 
 void free_volume_precache(Render *re)
@@ -747,8 +779,10 @@ void free_volume_precache(Render *re)
 	ObjectInstanceRen *obi;
 	
 	for(obi= re->instancetable.first; obi; obi= obi->next) {
-		if (obi->volume_precache)
+		if (obi->volume_precache) {
 			MEM_freeN(obi->volume_precache);
+			printf("freed volume precache of object: %s \n", obi->obr->ob->id.name+2);
+		}
 	}
 	
 	BLI_freelistN(&re->vol_precache_obs);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 63fa127824a..8ad4078b90e 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4377,6 +4377,8 @@ static void material_panel_material_volume(Material *ma)
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
 	uiDefButBitS(block, TOG, MA_VOL_PRECACHESHADING, B_MATPRV, "Precache",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "precache");
+	uiDefButS(block, NUM, B_MATPRV, "Resolution: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_precache_resolution), 0.0, 1024.0, 10, 2, "precache voxel resolution");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;

From 9d2fc97827e2b94eb436081185108db9043ae54e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 20 Oct 2008 07:08:06 +0000
Subject: [PATCH 033/577] New volume rendering feature: Light Cache

This was a bit complicated to do, but is working pretty well now, and can make shading significantly faster to render.

This option pre-calculates self-shading information into a
3d voxel grid before rendering, then uses and interpolates
that data during the main rendering phase, rather than
calculating shading for each sample. It's an approximation
and isn't as accurate as getting the lighting directly,
but in many cases it looks very similar and renders much faster.
The voxel grid covers the object's 3D screen-aligned bounding box
so this may not be that useful for large volume regions like a
big range of cloud cover, since you'll need a lot of resolution.

The render time speaks for itself here:
http://mke3.net/blender/devel/rendering/volumetrics/vol_light_cache_interpolation.jpg

The resolution is set in the volume panel - it's the resolution
of one edge of the voxel grid. Keep in mind that the higher the
resolution, the more memory needed, like in fluid sim. The
memory requirements increase with the cube of the edge
resolution so be careful. I might try and add a little memory
calculator thing like fluid sim has there later.

The voxels are interpolated using trilinear interpolation -
here's a comparison image I made during testing:
http://mke3.net/blender/devel/rendering/volumetrics/vol_light_cache_compare.jpg

There might still be a couple of little tweaks I can do to
improve the visual quality, I'll see.
---
 source/blender/blenkernel/intern/material.c   |   1 +
 source/blender/blenloader/intern/readfile.c   |   2 +
 .../render/extern/include/RE_shader_ext.h     |   1 +
 .../blender/render/intern/source/shadeinput.c |   1 +
 .../blender/render/intern/source/volumetric.c | 301 ++++++++++++++----
 source/blender/src/buttons_shading.c          |  47 ++-
 6 files changed, 275 insertions(+), 78 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 3fcc76bf058..b47e4d2ebaa 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -173,6 +173,7 @@ void init_material(Material *ma)
 	ma->vol_absorption = 1.0f;
 	ma->vol_scattering = 1.0f;
 	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
+	ma->vol_precache_resolution = 50;
 	
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a3e6a21dd0b..4af54832221 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7895,6 +7895,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 			if (ma->vol_density_scale < 0.0001f)
 				ma->vol_density_scale = 1.0f;
+			if (ma->vol_precache_resolution == 0)
+				ma->vol_precache_resolution = 50;
 		}
 		
 		for(tex=main->tex.first; tex; tex= tex->id.next) {
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 112a1e9929d..5a320da522f 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -100,6 +100,7 @@ typedef struct ShadeInput
 	struct StrandRen *strand;
 	struct ObjectInstanceRen *obi;
 	struct ObjectRen *obr;
+	struct Render *re;				/* link back to the Render */
 	int facenr;
 	float facenor[3];				/* copy from face */
 	short flippednor;				/* is facenor flipped? */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index aa11e3d75dd..6989fe66b67 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -1270,6 +1270,7 @@ void shade_input_initialize(ShadeInput *shi, RenderPart *pa, RenderLayer *rl, in
 	shi->combinedflag= ~rl->pass_xor;
 	shi->mat_override= rl->mat_override;
 	shi->light_override= rl->light_override;
+	shi->re = &R;
 //	shi->rl= rl;
 	/* note shi.depth==0  means first hit, not raytracing */
 	
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index fc2e4a630b1..0f6e7591ece 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -51,6 +51,7 @@
 #include "BKE_main.h"
 
 #include "render_types.h"
+#include "renderdatabase.h"
 #include "pixelshading.h"
 #include "shading.h"
 #include "texture.h"
@@ -61,8 +62,6 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#define PRECACHE_RES	5
-
 static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 {
 	VlakRen *vlr = (VlakRen *)face;
@@ -96,7 +95,7 @@ static int vol_always_intersect_check(Isect *is, int ob, RayFace *face)
 /* TODO: Box or sphere intersection types could speed things up */
 static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type, int checkfunc)
 {
-	float maxsize = RE_ray_tree_max_size(R.raytree);
+	float maxsize = RE_ray_tree_max_size(shi->re->raytree);
 	int intersected=0;
 
 	/* TODO: use object's bounding box to calculate max size */
@@ -115,9 +114,9 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
 	
 	if (checkfunc==VOL_IS_BACKFACE)
-		intersected = RE_ray_tree_intersect_check(R.raytree, isect, vol_backface_intersect_check);
+		intersected = RE_ray_tree_intersect_check(shi->re->raytree, isect, vol_backface_intersect_check);
 	else
-		intersected = RE_ray_tree_intersect(R.raytree, isect);
+		intersected = RE_ray_tree_intersect(shi->re->raytree, isect);
 	
 	if(intersected)
 	{
@@ -240,6 +239,82 @@ void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
 }
 
+
+static float D(ShadeInput *shi, int rgb, int x, int y, int z)
+{
+	const int res = shi->mat->vol_precache_resolution;
+	CLAMP(x, 0, res-1);
+	CLAMP(y, 0, res-1);
+	CLAMP(y, 0, res-1);
+	return shi->obi->volume_precache[rgb*res*res*res + x*res*res + y*res + z];
+}
+
+inline float lerp(float t, float v1, float v2) {
+	return (1.f - t) * v1 + t * v2;
+}
+
+/* trilinear interpolation */
+static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
+{
+	const int res = shi->mat->vol_precache_resolution;
+	float voxx, voxy, voxz;
+	int vx, vy, vz;
+	float dx, dy, dz;
+	float d00, d10, d01, d11, d0, d1, d_final;
+	float bbmin[3], bbmax[3], dim[3];
+	int rgb;
+	
+	if (!shi->obi->volume_precache) return;
+	
+	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
+	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
+	VecSubf(dim, bbmax, bbmin);
+	
+	voxx = ((co[0] - bbmin[0]) / dim[0]) * res - 0.5f;
+	voxy = ((co[1] - bbmin[1]) / dim[1]) * res - 0.5f;
+	voxz = ((co[2] - bbmin[2]) / dim[2]) * res - 0.5f;
+	
+	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
+	
+	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
+	
+	for (rgb=0; rgb < 3; rgb++) {
+		d00 = lerp(dx, D(shi, rgb, vx, vy, vz), 		D(shi, rgb, vx+1, vy, vz));
+		d10 = lerp(dx, D(shi, rgb, vx, vy+1, vz), 		D(shi, rgb, vx+1, vy+1, vz));
+		d01 = lerp(dx, D(shi, rgb, vx, vy, vz+1), 		D(shi, rgb, vx+1, vy, vz+1));
+		d11 = lerp(dx, D(shi, rgb, vx, vy+1, vz+1), 	D(shi, rgb, vx+1, vy+1, vz+1));
+		d0 = lerp(dy, d00, d10);
+		d1 = lerp(dy, d01, d11);
+		d_final = lerp(dz, d0, d1);
+		
+		scatter_col[rgb] = d_final;
+	}
+}
+
+#if 0
+/* no interpolation, not used */
+static void vol_get_precached_scattering_nearest(ShadeInput *shi, float *scatter_col, float *co)
+{
+	const int res = shi->mat->vol_precache_resolution;
+	int x,y,z;
+	float bbmin[3], bbmax[3], dim[3];
+
+	if (!shi->obi->volume_precache) return;
+	
+	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
+	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
+	VecSubf(dim, bbmax, bbmin);
+	
+	x = (int)(((co[0] - bbmin[0]) / dim[0]) * res);
+	y = (int)(((co[1] - bbmin[1]) / dim[1]) * res);
+	z = (int)(((co[2] - bbmin[2]) / dim[2]) * res);
+	
+	scatter_col[0] = shi->obi->volume_precache[0*res*res*res + x*res*res + y*res + z];
+	scatter_col[1] = shi->obi->volume_precache[1*res*res*res + x*res*res + y*res + z];
+	scatter_col[2] = shi->obi->volume_precache[2*res*res*res + x*res*res + y*res + z];
+}
+#endif
+
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
  */
@@ -276,7 +351,6 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	VecAddf(step_end, step_sta, step_vec);
 	
 	for (s = 0;  s < nsteps; s++) {
-		
 		if (s > 0)
 			density = vol_get_density(shi, step_sta);
 		
@@ -317,9 +391,9 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		shi->osatex= 0;
 		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
 	}
-	
+
 	VecMulf(lacol, visifac*lar->energy);
-		
+
 	if (ELEM(lar->type, LA_SUN, LA_HEMI))
 		VECCOPY(lv, lar->vec);
 	VecMulf(lv, -1.0f);
@@ -364,27 +438,27 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	
 	vol_get_scattering_fac(shi, &scatter_fac, co, density);
 	VecMulf(lacol, scatter_fac);
-	
 }
 
 /* single scattering only for now */
-void vol_get_scattering(Render *re, ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
+void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
 {
 	GroupObject *go;
 	ListBase *lights;
 	LampRen *lar;
 	float col[3] = {0.f, 0.f, 0.f};
-	
-	lights= get_lights(shi);
-	for(go=lights->first; go; go= go->next)
+	int i=0;
+
+	for(go=shi->re->lights.first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
 	
+		i++;
+	
 		lar= go->lampren;
 		if (lar) {
-		
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
-		
+			
 			VecMulf(lacol, density);
 		
 			VecAddf(col, col, lacol);
@@ -415,7 +489,6 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	VecMulVecf(radiance, tr, col);	
 	tr[0] = tr[1] = tr[2] = 1.0f;
 	
-
 	/* ray marching */
 	nsteps = (int)ceil(VecLenf(co, endco) / stepsize);
 	
@@ -447,23 +520,12 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		
 			/* incoming light via emission or scattering (additive) */
 			vol_get_emission(shi, emit_col, step_mid, density);
-			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) && shi->obi->volume_precache) {
-				const int res = shi->mat->vol_precache_resolution;
-				int x,y,z;
-				float bbmin[3], bbmax[3], dim[3];
-								
-				VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
-				VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
-				VecSubf(dim, bbmax, bbmin);
-				
-				x = (int)(((step_mid[0] - bbmin[0]) / dim[0]) * res);
-				y = (int)(((step_mid[1] - bbmin[1]) / dim[1]) * res);
-				z = (int)(((step_mid[2] - bbmin[2]) / dim[2]) * res);
-				
-				scatter_col[0] = scatter_col[1] = scatter_col[2] = shi->obi->volume_precache[x*res*res + y*res + z];
-			}
-			else
-				vol_get_scattering(&R, shi, scatter_col, step_mid, stepsize, density);
+			
+			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
+				(shi->mat->vol_shadeflag & MA_VOL_ATTENUATED)) {
+				vol_get_precached_scattering(shi, scatter_col, step_mid);
+			} else
+				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
 			
 			VecAddf(d_radiance, emit_col, scatter_col);
 			
@@ -544,7 +606,7 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
 {
 	Isect isect;
-	float maxsize = RE_ray_tree_max_size(R.raytree);
+	float maxsize = RE_ray_tree_max_size(shi->re->raytree);
 
 	VECCOPY(isect.start, co);
 	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
@@ -560,7 +622,7 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *co
 	isect.lay= -1;
 	
 	/* check to see if there's anything behind the volume, otherwise shade the sky */
-	if(RE_ray_tree_intersect(R.raytree, &isect)) {
+	if(RE_ray_tree_intersect(shi->re->raytree, &isect)) {
 		shade_intersection(shi, col, &isect);
 	} else {
 		shadeSkyView(col, co, shi->view, NULL);
@@ -568,6 +630,7 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *co
 	}
 }
 
+/* the main entry point for volume shading */
 void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 {
 	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
@@ -629,6 +692,8 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 	}
 }
 
+/* Traces a shadow through the object, 
+ * pretty much gets the transmission over a ray path */
 void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
 {
 	float hitco[3];
@@ -678,26 +743,125 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 		shr->combined[2] = 0.0f;
 		shr->combined[3] = shr->alpha =  0.0f;
 	}
-
 }
 
+
+/* Recursive test for intersections, from a point inside the mesh, to outside
+ * Number of intersections (depth) determine if a point is inside or outside the mesh */
+int intersect_outside_volume(RayTree *tree, Isect *isect, float *offset, int limit, int depth)
+{
+	if (limit == 0) return depth;
+	
+	if (RE_ray_tree_intersect(tree, isect)) {
+		float hitco[3];
+		
+		hitco[0] = isect->start[0] + isect->labda*isect->vec[0];
+		hitco[1] = isect->start[1] + isect->labda*isect->vec[1];
+		hitco[2] = isect->start[2] + isect->labda*isect->vec[2];
+		VecAddf(isect->start, hitco, offset);
+
+		return intersect_outside_volume(tree, isect, offset, limit-1, depth+1);
+	} else {
+		return depth;
+	}
+}
+
+/* Uses ray tracing to check if a point is inside or outside an ObjectInstanceRen */
+int point_inside_obi(RayTree *tree, ObjectInstanceRen *obi, float *co)
+{
+	float maxsize = RE_ray_tree_max_size(tree);
+	int intersected;
+	Isect isect;
+	float vec[3] = {0.0f,0.0f,1.0f};
+	int final_depth=0, depth=0, limit=20;
+	
+	/* set up the isect */
+	memset(&isect, 0, sizeof(isect));
+	VECCOPY(isect.start, co);
+	isect.end[0] = co[0] + vec[0] * maxsize;
+	isect.end[1] = co[1] + vec[1] * maxsize;
+	isect.end[2] = co[2] + vec[2] * maxsize;
+	
+	/* and give it a little offset to prevent self-intersections */
+	VecMulf(vec, 1e-5);
+	VecAddf(isect.start, isect.start, vec);
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.face_last= NULL;
+	isect.lay= -1;
+	
+	final_depth = intersect_outside_volume(tree, &isect, vec, limit, depth);
+	
+	/* even number of intersections: point is outside
+	 * odd number: point is inside */
+	if (final_depth % 2 == 0) return 0;
+	else return 1;
+}
+
+static int inside_check_func(Isect *is, int ob, RayFace *face)
+{
+	return 1;
+}
+static void vlr_face_coords(RayFace *face, float **v1, float **v2, float **v3, float **v4)
+{
+	VlakRen *vlr= (VlakRen*)face;
+
+	*v1 = (vlr->v1)? vlr->v1->co: NULL;
+	*v2 = (vlr->v2)? vlr->v2->co: NULL;
+	*v3 = (vlr->v3)? vlr->v3->co: NULL;
+	*v4 = (vlr->v4)? vlr->v4->co: NULL;
+}
+
+RayTree *create_raytree_obi(ObjectInstanceRen *obi, float *bbmin, float *bbmax)
+{
+	int v;
+	VlakRen *vlr= NULL;
+	
+	/* create empty raytree */
+	RayTree *tree = RE_ray_tree_create(64, obi->obr->totvlak, bbmin, bbmax,
+		vlr_face_coords, inside_check_func, NULL, NULL);
+	
+	/* fill it with faces */
+	for(v=0; v<obi->obr->totvlak; v++) {
+		if((v & 255)==0)
+			vlr= obi->obr->vlaknodes[v>>8].vlak;
+		else
+			vlr++;
+	
+		RE_ray_tree_add_face(tree, 0, vlr);
+	}
+	
+	RE_ray_tree_done(tree);
+}
+
+/* Precache a volume into a 3D voxel grid.
+ * The voxel grid is stored in the ObjectInstanceRen, 
+ * in camera space, aligned with the ObjectRen's bounding box.
+ * Resolution is defined by the user.
+ */
 void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
 {
 	int x, y, z;
 
 	float co[3], voxel[3], scatter_col[3];
 	ShadeInput shi;
+	float view[3] = {0.0,0.0,1.0};
 	float density;
 	float stepsize;
 	
-	float resf;
-	int res_2;
-	float res_3;
+	float resf, res_3f;
+	int res_2, res_3;
 	
 	float i = 1.0f;
-	double lasttime= PIL_check_seconds_timer();
+	double time, lasttime= PIL_check_seconds_timer();
 	const int res = ma->vol_precache_resolution;
 
+	/* create a raytree with just the faces of the instanced ObjectRen, 
+	 * used for checking if the cached point is inside or outside. */
+	RayTree *tree = create_raytree_obi(obi, bbmin, bbmax);
+	if (!tree) return;
+
+	/* Need a shadeinput to calculate scattering */
 	memset(&shi, 0, sizeof(ShadeInput)); 
 	shi.depth= 1;
 	shi.mask= 1;
@@ -707,18 +871,28 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	shi.har= shi.mat->har;
 	shi.obi= obi;
 	shi.obr= obi->obr;
+	shi.lay = re->scene->lay;
+	shi.re = re;
+	VECCOPY(shi.view, view);
 	
 	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
 
-	resf = (float) res;
+	resf = (float)res;
 	res_2 = res*res;
 	res_3 = res*res*res;
+	res_3f = (float)res_3;
 	
 	VecSubf(voxel, bbmax, bbmin);
 	VecMulf(voxel, 1.0f/res);
 	
-	obi->volume_precache = MEM_mallocN(sizeof(float)*res*res*res, "volume light cache");
+	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
 	
+	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
+	 *
+	 * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
+	 * I'm guessing the memory alignment may work out better this way for the purposes
+	 * of doing linear interpolation, but I haven't actually tested this theory! :)
+	 */
 	for (x=0; x < res; x++) {
 		co[0] = bbmin[0] + (voxel[0] * x);
 		
@@ -726,47 +900,54 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 			co[1] = bbmin[1] + (voxel[1] * y);
 			
 			for (z=0; z < res; z++) {
-				double time= PIL_check_seconds_timer();
-			
 				co[2] = bbmin[2] + (voxel[2] * z);
-				
-				density = vol_get_density(&shi, co);
-				vol_get_scattering(re, &shi, scatter_col, co, stepsize, density);
 			
-				obi->volume_precache[x*res_2 + y*res + z] = (scatter_col[0] + scatter_col[1] + scatter_col[2]) / 3.0f;
-				
+				time= PIL_check_seconds_timer();
+				i++;
+			
 				/* display progress every second */
 				if(re->test_break())
 					return;
 				if(time-lasttime>1.0f) {
 					char str[64];
-					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3)));
+					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
 					re->i.infostr= str;
 					re->stats_draw(&re->i);
 					re->i.infostr= NULL;
 					lasttime= time;
 				}
 				
-				i++;
+				/* don't bother if the point is not inside the volume mesh */
+				if (!point_inside_obi(tree, obi, co))
+					continue;
+				
+				density = vol_get_density(&shi, co);
+				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
+			
+				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
+				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
+				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
 			}
 		}
 	}
+	
+	if(tree) {
+		RE_ray_tree_free(tree);
+		tree= NULL;
+	}
 }
 
+/* loop through all objects (and their associated materials)
+ * marked for pre-caching in convertblender.c, and pre-cache them */
 void volume_precache(Render *re)
 {
 	ObjectInstanceRen *obi;
 	VolPrecache *vp;
-	int i=1;
-	
-	printf("Precaching %d volumes... \n", BLI_countlist(&re->vol_precache_obs));
-	
+
 	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
 		for(obi= re->instancetable.first; obi; obi= obi->next) {
-			if (obi->obr == vp->obr) {				
-				printf("Precaching Object: %s with Material: %s \n", vp->obr->ob->id.name+2, vp->ma->id.name+2);
+			if (obi->obr == vp->obr) 
 				vol_precache_objectinstance(re, obi, vp->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
-			}
 		}
 	}
 	
@@ -779,10 +960,8 @@ void free_volume_precache(Render *re)
 	ObjectInstanceRen *obi;
 	
 	for(obi= re->instancetable.first; obi; obi= obi->next) {
-		if (obi->volume_precache) {
+		if (obi->volume_precache)
 			MEM_freeN(obi->volume_precache);
-			printf("freed volume precache of object: %s \n", obi->obr->ob->id.name+2);
-		}
 	}
 	
 	BLI_freelistN(&re->vol_precache_obs);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 8ad4078b90e..72a396d63be 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4357,7 +4357,7 @@ static void material_panel_material_volume(Material *ma)
 	short yco=PANEL_YMAX;
  	
  	block= uiNewBlock(&curarea->uiblocks, "material_panel_material_volume", UI_EMBOSS, UI_HELV, curarea->win);
-	if(uiNewPanel(curarea, block, "Volume", "Material", PANELX, PANELY, PANELW, PANELH)==0) return;
+	if(uiNewPanel(curarea, block, "Volume", "Material", PANELX, PANELY, PANELW, PANELH+40)==0) return;
 	
 	uiSetButLock(ma->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
 	
@@ -4365,32 +4365,28 @@ static void material_panel_material_volume(Material *ma)
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
 	uiDefButS(block, MENU, B_TEXREDR_PRV, "Step Size Calculation %t|Randomized %x0|Constant %x1",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_stepsize_type, 0.0, 0.0, 0, 0, "Step size calculation, replace banding with jittering");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_stepsize_type, 0.0, 0.0, 0, 0, "Step size calculation, randomized replaces banding with jittering");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
-			
+	
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Self Shading",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
 	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
-	uiDefButBitS(block, TOG, MA_VOL_PRECACHESHADING, B_MATPRV, "Precache",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "precache");
-	uiDefButS(block, NUM, B_MATPRV, "Resolution: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_precache_resolution), 0.0, 1024.0, 10, 2, "precache voxel resolution");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
 	
-	uiBlockBeginAlign(block);
-	uiDefButS(block, MENU, B_TEXREDR_PRV, "Scattering Direction %t|Isotropic %x0|Mie Hazy %x1|Mie Murky %x2|Rayleigh %x3|Henyey-Greenstein %x4|Schlick %x5",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_phasefunc_type, 0.0, 0.0, 0, 0, "Scattering Direction (Phase Function)");
-	if (ELEM(ma->vol_phasefunc_type, MA_VOL_PH_HG, MA_VOL_PH_SCHLICK)) {
-		uiDefButF(block, NUM, B_MATPRV, "Asymmetry: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_phasefunc_g), -1.0, 1.0, 0, 0, "> 0 is forward scattering, < 0 is back scattering");
+	if (ma->vol_shadeflag & MA_VOL_ATTENUATED) {
+		uiBlockBeginAlign(block);
+		uiDefButBitS(block, TOG, MA_VOL_PRECACHESHADING, B_MATPRV, "Light Cache",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Pre-cache the shading information into a voxel grid");
+		uiDefButS(block, NUM, B_MATPRV, "Resolution: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_precache_resolution), 0.0, 1024.0, 10, 2, "Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory (res ^3)");
+		uiBlockEndAlign(block);
 	}
-	uiBlockEndAlign(block);
 	
 	/*uiDefButBitS(block, TOG, MA_VOL_RECVSHADOW, B_MATPRV, "Receive Shadows",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Receive shadows from external objects");
@@ -4409,7 +4405,7 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM, B_MATPRV, "Absorption: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 100.0, 10, 0, "Multiplier for absorption");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_absorption), 0.0, 100.0, 10, 0, "Amount of light absorbed by the volume");
 	uiDefButF(block, COL, B_MATPRV, "",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, ma->vol_absorption_col, 0, 0, 0, B_MATCOL, "");
 	uiBlockEndAlign(block);
@@ -4418,7 +4414,7 @@ static void material_panel_material_volume(Material *ma)
 	
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUMSLI, B_MATPRV, "Emit: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->emit), 0.0, 2.0, 0, 0, "Emission component");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->emit), 0.0, 2.0, 0, 0, "Amount of light emitted from the volume");
 	uiDefButF(block, COL, B_MATPRV, "",
 		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->r), 0, 0, 0, B_MATCOL, "");
 	uiBlockEndAlign(block);
@@ -4426,7 +4422,24 @@ static void material_panel_material_volume(Material *ma)
 	yco -= YSPACE;
 	
 	uiDefButF(block, NUM, B_MATPRV, "Scattering: ",
-		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 100.0, 10, 0, "Multiplier for scattering");
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_scattering), 0.0, 100.0, 10, 0, "Amount of light scattered through the volume from lamps");
+	
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
+	uiDefButS(block, MENU, B_TEXREDR_PRV, "Scattering Direction %t|Isotropic %x0|Mie Hazy %x1|Mie Murky %x2|Rayleigh %x3|Henyey-Greenstein %x4|Schlick %x5",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &ma->vol_phasefunc_type, 0.0, 0.0, 0, 0, "Scattering Direction (Phase Function)");
+	if (ELEM(ma->vol_phasefunc_type, MA_VOL_PH_HG, MA_VOL_PH_SCHLICK)) {
+		uiDefButF(block, NUM, B_MATPRV, "Asymmetry: ",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(ma->vol_phasefunc_g), -1.0, 1.0, 0, 0, "> 0 is forward scattering, < 0 is back scattering");
+		uiBlockEndAlign(block);
+	} else {
+		uiBlockEndAlign(block);
+		/* spacer */
+		uiDefBut(block, LABEL, B_NOP, "",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	}
+	
 }
 
 static void material_panel_nodes(Material *ma)

From 07f072457da87b1940970831422d3569ef069b7a Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 20 Oct 2008 23:12:42 +0000
Subject: [PATCH 034/577] * fix for crash after latest light cache commit

---
 source/blender/render/intern/source/convertblender.c | 3 ++-
 source/blender/render/intern/source/volumetric.c     | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index c58946bb64b..74b03d1082f 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4927,7 +4927,8 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 				make_sss_tree(re);
 		
 		if(!re->test_break())
-			volume_precache(re);
+			if(re->r.mode & R_RAYTRACE)
+				volume_precache(re);
 	}
 	
 	if(re->test_break())
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 0f6e7591ece..6004442e4bc 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -253,6 +253,12 @@ inline float lerp(float t, float v1, float v2) {
 	return (1.f - t) * v1 + t * v2;
 }
 
+inline float do_lerp(float t, float a, float b) {
+	if (a > 0.f && b > 0.f) return lerp(t, a, b);
+	else if (a < 0.f) 		return b;
+	else if (b < 0.f) 		return a;
+}
+
 /* trilinear interpolation */
 static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
 {
@@ -587,6 +593,7 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
 	shi_new.light_override= shi->light_override;
 	shi_new.mat_override= shi->mat_override;
+	shi_new.re = shi->re;
 	
 	VECCOPY(shi_new.camera_co, is->start);
 	
@@ -920,7 +927,7 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 				/* don't bother if the point is not inside the volume mesh */
 				if (!point_inside_obi(tree, obi, co))
 					continue;
-				
+
 				density = vol_get_density(&shi, co);
 				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
 			

From d335c2dfcf95e120ebc5e5f84b0c960cb9ca14ae Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 21 Oct 2008 02:04:29 +0000
Subject: [PATCH 035/577] * fixed a memory leak that was happening during
 preview render

---
 source/blender/render/intern/source/volumetric.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 6004442e4bc..c8cead3e8c7 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -913,8 +913,13 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 				i++;
 			
 				/* display progress every second */
-				if(re->test_break())
+				if(re->test_break()) {
+					if(tree) {
+						RE_ray_tree_free(tree);
+						tree= NULL;
+					}
 					return;
+				}
 				if(time-lasttime>1.0f) {
 					char str[64];
 					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
@@ -937,11 +942,13 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 			}
 		}
 	}
-	
+
 	if(tree) {
 		RE_ray_tree_free(tree);
 		tree= NULL;
 	}
+	
+
 }
 
 /* loop through all objects (and their associated materials)

From 97a7b05068254543615ff274d77e66aea356df28 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 21 Oct 2008 06:10:36 +0000
Subject: [PATCH 036/577] fixed a crash in volume shadows

---
 source/blender/render/intern/source/rayshade.c   |  2 ++
 source/blender/render/intern/source/volumetric.c | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index d06bbcf3300..7e9a5c9abb3 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -467,6 +467,7 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, flo
 		//shi.do_preview= 0; // memset above, so dont need this
 		shi.light_override= origshi->light_override;
 		shi.mat_override= origshi->mat_override;
+		shi.re = origshi->re;
 		
 		memset(&shr, 0, sizeof(ShadeResult));
 		
@@ -1300,6 +1301,7 @@ void ray_trace_shadow_tra(Isect *is, int depth, int traflag)
 		
 		shi.depth= 1;					/* only used to indicate tracing */
 		shi.mask= 1;
+		shi.re = &R;
 		
 		/*shi.osatex= 0;
 		shi.thread= shi.sample= 0;
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index c8cead3e8c7..82149f38176 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -297,8 +297,8 @@ static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, fl
 	}
 }
 
-#if 0
-/* no interpolation, not used */
+
+/* no interpolation */
 static void vol_get_precached_scattering_nearest(ShadeInput *shi, float *scatter_col, float *co)
 {
 	const int res = shi->mat->vol_precache_resolution;
@@ -319,7 +319,7 @@ static void vol_get_precached_scattering_nearest(ShadeInput *shi, float *scatter
 	scatter_col[1] = shi->obi->volume_precache[1*res*res*res + x*res*res + y*res + z];
 	scatter_col[2] = shi->obi->volume_precache[2*res*res*res + x*res*res + y*res + z];
 }
-#endif
+
 
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
@@ -529,7 +529,10 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			
 			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
 				(shi->mat->vol_shadeflag & MA_VOL_ATTENUATED)) {
-				vol_get_precached_scattering(shi, scatter_col, step_mid);
+				if (G.rt==0)
+					vol_get_precached_scattering(shi, scatter_col, step_mid);
+				else
+					vol_get_precached_scattering_nearest(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
 			

From b12d9bfa9caf6d99ca2e19b9cb456d037c17f049 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 21 Oct 2008 08:21:36 +0000
Subject: [PATCH 037/577] * reimplemented some things, hopefully may fix some
 problems zanqdo was having

---
 .../render/extern/include/RE_shader_ext.h        |  1 -
 source/blender/render/intern/source/rayshade.c   |  2 --
 source/blender/render/intern/source/shadeinput.c |  1 -
 source/blender/render/intern/source/volumetric.c | 16 ++++++++--------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 5a320da522f..112a1e9929d 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -100,7 +100,6 @@ typedef struct ShadeInput
 	struct StrandRen *strand;
 	struct ObjectInstanceRen *obi;
 	struct ObjectRen *obr;
-	struct Render *re;				/* link back to the Render */
 	int facenr;
 	float facenor[3];				/* copy from face */
 	short flippednor;				/* is facenor flipped? */
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 7e9a5c9abb3..d06bbcf3300 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -467,7 +467,6 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, flo
 		//shi.do_preview= 0; // memset above, so dont need this
 		shi.light_override= origshi->light_override;
 		shi.mat_override= origshi->mat_override;
-		shi.re = origshi->re;
 		
 		memset(&shr, 0, sizeof(ShadeResult));
 		
@@ -1301,7 +1300,6 @@ void ray_trace_shadow_tra(Isect *is, int depth, int traflag)
 		
 		shi.depth= 1;					/* only used to indicate tracing */
 		shi.mask= 1;
-		shi.re = &R;
 		
 		/*shi.osatex= 0;
 		shi.thread= shi.sample= 0;
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 6989fe66b67..aa11e3d75dd 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -1270,7 +1270,6 @@ void shade_input_initialize(ShadeInput *shi, RenderPart *pa, RenderLayer *rl, in
 	shi->combinedflag= ~rl->pass_xor;
 	shi->mat_override= rl->mat_override;
 	shi->light_override= rl->light_override;
-	shi->re = &R;
 //	shi->rl= rl;
 	/* note shi.depth==0  means first hit, not raytracing */
 	
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 82149f38176..ebaf70f1cfe 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -95,7 +95,7 @@ static int vol_always_intersect_check(Isect *is, int ob, RayFace *face)
 /* TODO: Box or sphere intersection types could speed things up */
 static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type, int checkfunc)
 {
-	float maxsize = RE_ray_tree_max_size(shi->re->raytree);
+	float maxsize = RE_ray_tree_max_size(R.raytree);
 	int intersected=0;
 
 	/* TODO: use object's bounding box to calculate max size */
@@ -114,9 +114,9 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
 	
 	if (checkfunc==VOL_IS_BACKFACE)
-		intersected = RE_ray_tree_intersect_check(shi->re->raytree, isect, vol_backface_intersect_check);
+		intersected = RE_ray_tree_intersect_check(R.raytree, isect, vol_backface_intersect_check);
 	else
-		intersected = RE_ray_tree_intersect(shi->re->raytree, isect);
+		intersected = RE_ray_tree_intersect(R.raytree, isect);
 	
 	if(intersected)
 	{
@@ -455,7 +455,7 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	float col[3] = {0.f, 0.f, 0.f};
 	int i=0;
 
-	for(go=shi->re->lights.first; go; go= go->next)
+	for(go=R.lights.first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
 	
@@ -596,7 +596,6 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
 	shi_new.light_override= shi->light_override;
 	shi_new.mat_override= shi->mat_override;
-	shi_new.re = shi->re;
 	
 	VECCOPY(shi_new.camera_co, is->start);
 	
@@ -616,7 +615,7 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
 {
 	Isect isect;
-	float maxsize = RE_ray_tree_max_size(shi->re->raytree);
+	float maxsize = RE_ray_tree_max_size(R.raytree);
 
 	VECCOPY(isect.start, co);
 	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
@@ -632,7 +631,7 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *co
 	isect.lay= -1;
 	
 	/* check to see if there's anything behind the volume, otherwise shade the sky */
-	if(RE_ray_tree_intersect(shi->re->raytree, &isect)) {
+	if(RE_ray_tree_intersect(R.raytree, &isect)) {
 		shade_intersection(shi, col, &isect);
 	} else {
 		shadeSkyView(col, co, shi->view, NULL);
@@ -865,6 +864,8 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	float i = 1.0f;
 	double time, lasttime= PIL_check_seconds_timer();
 	const int res = ma->vol_precache_resolution;
+	
+	R = *re;
 
 	/* create a raytree with just the faces of the instanced ObjectRen, 
 	 * used for checking if the cached point is inside or outside. */
@@ -882,7 +883,6 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	shi.obi= obi;
 	shi.obr= obi->obr;
 	shi.lay = re->scene->lay;
-	shi.re = re;
 	VECCOPY(shi.view, view);
 	
 	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);

From 094fda8cd9c1e6f5f452bf6c47ad53bebb8dd4e6 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 00:09:12 +0000
Subject: [PATCH 038/577] * Fixed a crash with using light cache on a plane
 (which doesn't really make sense, but shouldn't crash at least)

---
 source/blender/render/intern/source/volumetric.c | 7 +++++--
 source/blender/src/drawnode.c                    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index ebaf70f1cfe..cd35bc027d1 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -245,7 +245,7 @@ static float D(ShadeInput *shi, int rgb, int x, int y, int z)
 	const int res = shi->mat->vol_precache_resolution;
 	CLAMP(x, 0, res-1);
 	CLAMP(y, 0, res-1);
-	CLAMP(y, 0, res-1);
+	CLAMP(z, 0, res-1);
 	return shi->obi->volume_precache[rgb*res*res*res + x*res*res + y*res + z];
 }
 
@@ -864,12 +864,13 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	float i = 1.0f;
 	double time, lasttime= PIL_check_seconds_timer();
 	const int res = ma->vol_precache_resolution;
+	RayTree *tree;
 	
 	R = *re;
 
 	/* create a raytree with just the faces of the instanced ObjectRen, 
 	 * used for checking if the cached point is inside or outside. */
-	RayTree *tree = create_raytree_obi(obi, bbmin, bbmax);
+	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
 
 	/* Need a shadeinput to calculate scattering */
@@ -893,6 +894,8 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	res_3f = (float)res_3;
 	
 	VecSubf(voxel, bbmax, bbmin);
+	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
+		return;
 	VecMulf(voxel, 1.0f/res);
 	
 	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c
index 618eca15ac6..7decec3f0e3 100644
--- a/source/blender/src/drawnode.c
+++ b/source/blender/src/drawnode.c
@@ -1550,7 +1550,7 @@ static int node_composit_buts_vecblur(uiBlock *block, bNodeTree *ntree, bNode *n
 				  &nbd->maxspeed, 0, 1024, 0, 0, "If not zero, maximum speed in pixels");
 		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "BlurFac:",
 				  butr->xmin, dy+19, dx, 19, 
-				  &nbd->fac, 0.0f, 2.0f, 10, 2, "Scaling factor for motion vectors, actually 'shutter speed' in frames");
+				  &nbd->fac, 0.0f, 10.0f, 10, 2, "Scaling factor for motion vectors, actually 'shutter speed' in frames");
 		uiDefButS(block, TOG, B_NODE_EXEC+node->nr, "Curved",
 				  butr->xmin, dy, dx, 19, 
 				  &nbd->curved, 0.0f, 2.0f, 10, 2, "Interpolate between frames in a bezier curve, rather than linearly");

From 6f656f6482adfa93b010b364cac41a449b8fdc91 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 00:26:19 +0000
Subject: [PATCH 039/577] fix for a compile error with msvc

---
 source/blender/render/intern/source/volumetric.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index cd35bc027d1..95cd9e5588b 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -56,6 +56,10 @@
 #include "shading.h"
 #include "texture.h"
 
+#if defined( _MSC_VER ) && !defined( __cplusplus )
+# define inline __inline
+#endif // defined( _MSC_VER ) && !defined( __cplusplus )
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
 /* only to be used here in this file, it's for speed */

From 652e4b5225cc88d7bc74dfe092d60a8363ef3189 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 01:31:46 +0000
Subject: [PATCH 040/577] Point Density:

Replaced 'Sharp' falloff with 'Soft'. This falloff type has
a variable softness, and can get some quite smooth results.
It can be useful to get smooth transitions in density when
you're using particles on a large scale:

http://mke3.net/blender/devel/rendering/volumetrics/pd_falloff_soft.jpg

Also removed 'angular velocity' turbulence source - it
wasn't doing anything useful atm
---
 source/blender/blenkernel/intern/texture.c    |  1 +
 source/blender/blenloader/intern/readfile.c   |  2 ++
 source/blender/makesdna/DNA_texture_types.h   |  8 ++++----
 .../render/intern/source/pointdensity.c       | 19 ++++++++++---------
 source/blender/src/buttons_shading.c          | 12 +++++++++---
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 33b824623fa..6f58e054f69 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -875,6 +875,7 @@ PointDensity *BKE_add_pointdensity(void)
 	pd= MEM_callocN(sizeof(PointDensity), "pointdensity");
 	pd->radius = 0.3f;
 	pd->falloff_type = TEX_PD_FALLOFF_STD;
+	pd->falloff_softness = 2.0;
 	pd->source = TEX_PD_PSYS;
 	pd->point_tree = NULL;
 	pd->point_data = NULL;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4af54832221..8f005e99053 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7908,6 +7908,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				tex->pd->noise_fac = 1.0f;
 				tex->pd->noise_influence = TEX_PD_NOISE_STATIC;
 			}
+			if (tex->pd->falloff_softness < 1.0f)
+				tex->pd->falloff_softness = 2.0f;
 		}
 		
 	}
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 95f61e73c79..c51311bb621 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -131,9 +131,10 @@ typedef struct PointDensity {
 	short flag;
 
 	short falloff_type;
+	float falloff_softness;
 	float radius;
 	short source;
-	short pdpad[3];
+	short pdpad;
 
 	struct Object *object;	/* for 'Object' or 'Particle system' type - source object */
 	short psys_cache_space;		/* cache points in worldspace, object space, ... ? */
@@ -425,7 +426,7 @@ typedef struct TexMapping {
 /* falloff_type */
 #define TEX_PD_FALLOFF_STD		0
 #define TEX_PD_FALLOFF_SMOOTH	1
-#define TEX_PD_FALLOFF_SHARP	2
+#define TEX_PD_FALLOFF_SOFT		2
 #define TEX_PD_FALLOFF_CONSTANT	3
 #define TEX_PD_FALLOFF_ROOT		4
 
@@ -441,8 +442,7 @@ typedef struct TexMapping {
 /* noise_influence */
 #define TEX_PD_NOISE_STATIC		0
 #define TEX_PD_NOISE_VEL		1
-#define TEX_PD_NOISE_ANGVEL		2
-#define TEX_PD_NOISE_TIME		3
+#define TEX_PD_NOISE_TIME		2
 
 #endif
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index f7c6767fcd8..5f2c6153384 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -107,10 +107,6 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 				pd->point_data[i*3 + 0] = state.vel[0];
 				pd->point_data[i*3 + 1] = state.vel[1];
 				pd->point_data[i*3 + 2] = state.vel[2];
-			} else if (pd->noise_influence == TEX_PD_NOISE_ANGVEL) {
-				pd->point_data[i*3 + 0] = state.ave[0];
-				pd->point_data[i*3 + 1] = state.ave[1];
-				pd->point_data[i*3 + 2] = state.ave[2];
 			}
 		}
 	}
@@ -252,6 +248,7 @@ typedef struct PointDensityRangeData
     float squared_radius;
     float *point_data;
 	float *vec;
+	float softness;
     short falloff_type;   
 } PointDensityRangeData;
 
@@ -265,8 +262,8 @@ void accum_density(void *userdata, int index, float squared_dist)
 		density = dist;
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_SMOOTH)
 		density = 3.0f*dist*dist - 2.0f*dist*dist*dist;
-	else if (pdr->falloff_type == TEX_PD_FALLOFF_SHARP)
-		density = dist*dist;
+	else if (pdr->falloff_type == TEX_PD_FALLOFF_SOFT)
+		density = pow(dist, pdr->softness);
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_CONSTANT)
 		density = pdr->squared_radius;
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_ROOT)
@@ -302,6 +299,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	pdr.point_data = pd->point_data;
 	pdr.falloff_type = pd->falloff_type;
 	pdr.vec = vec;
+	pdr.softness = pd->falloff_softness;
 	noise_fac = pd->noise_fac * 0.5f;	/* better default */
 	
 	if (pd->flag & TEX_PD_TURBULENCE) {
@@ -329,13 +327,16 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 
 	texres->tin = density;
 
-	//texres->tr = vec[0];
-	//texres->tg = vec[1];
-	//texres->tb = vec[2];
+	
+	
+	BRICONT;
 	
 	return TEX_INT;
 	
 	/*
+	texres->tr = vec[0];
+	texres->tg = vec[1];
+	texres->tb = vec[2];
 	BRICONTRGB;
 	
 	texres->ta = 1.0;
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 72a396d63be..7e4298b4b6b 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -738,7 +738,7 @@ static void texture_panel_pointdensity(Tex *tex)
 	short yco=PANEL_YMAX;
 	
 	block= uiNewBlock(&curarea->uiblocks, "texture_panel_pointdensity", UI_EMBOSS, UI_HELV, curarea->win);
-	if(uiNewPanel(curarea, block, "Point Density", "Texture", PANELX, PANELY, PANELW, PANELH)==0) return;
+	if(uiNewPanel(curarea, block, "Point Density", "Texture", PANELX, PANELY, PANELW, PANELH+25)==0) return;
 	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
 	
 	if(tex->pd==NULL) {
@@ -758,8 +758,14 @@ static void texture_panel_pointdensity(Tex *tex)
 		
 		uiDefBut(block, LABEL, B_NOP, "Falloff:",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
-		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Sharp %x2|Constant %x3|Root %x4",
+		uiBlockBeginAlign(block);
+		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Soft %x2|Constant %x3|Root %x4",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
+		if (pd->falloff_type == TEX_PD_FALLOFF_SOFT) {
+			uiDefButF(block, NUM, B_REDR, "Softness: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->falloff_softness), 1.0, 1024.0, 10, 2, "The intensity of the falloff");
+		}
+		uiBlockEndAlign(block);
 		
 		yco -= YSPACE;
 		
@@ -782,7 +788,7 @@ static void texture_panel_pointdensity(Tex *tex)
 			yco -= YSPACE;
 
 			if (pd->source == TEX_PD_PSYS) {
-				uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Angular Velocity %x2",
+				uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1",
 					X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
 			}
 		}

From febcbdcfcd5e7f7a480f7980410eec853ef04a5e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 02:59:33 +0000
Subject: [PATCH 041/577] Tweaked rendering inside a volume to always return
 alpha 1.0. This fixes an issue which darkened the render from inside a volume
 with sky or premul on. Still need to find a good way to get an alpha value
 back into the shader (for compositing etc) without getting the render
 distorted by premul.

---
 source/blender/render/intern/source/volumetric.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 95cd9e5588b..4ff6f5aea41 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -664,7 +664,8 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
 		
-		if (col[3] > 1.0f) col[3] = 1.0f;
+		//if (col[3] > 1.0f)
+		col[3] = 1.0f;
 		shr->combined[3] = col[3];
 		shr->alpha = col[3];
 		
@@ -858,7 +859,7 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 
 	float co[3], voxel[3], scatter_col[3];
 	ShadeInput shi;
-	float view[3] = {0.0,0.0,1.0};
+	float view[3] = {0.0,0.0,-1.0};
 	float density;
 	float stepsize;
 	

From 876368d859593c8ad152f94ea06214bacf516b0d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 05:24:41 +0000
Subject: [PATCH 042/577] * fix for point density - particle systems weren't
 being  deformed by lattices

---
 source/blender/render/intern/source/pointdensity.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 5f2c6153384..28d8c2388c4 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -65,9 +65,8 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, 0);
 	
 	dm = mesh_create_derived_render(ob,CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
-	dm->release(dm);
 	
-	if ( !psys_check_enabled(ob, psys) ){
+	if ( !psys_check_enabled(ob, psys)) {
 		psys_render_restore(ob, psys);
 		return;
 	}
@@ -76,8 +75,10 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	Mat4Invert(ob->imat, ob->obmat);
 	
 	total_particles = psys->totpart+psys->totchild;
+	psys->lattice=psys_get_lattice(ob,psys);
 	
 	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 4, 6);
+	
 	if (pd->noise_influence != TEX_PD_NOISE_STATIC)
 		pd->point_data = MEM_mallocN(sizeof(float)*3*total_particles, "point_data");
 	
@@ -112,6 +113,12 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	}
 	
 	BLI_bvhtree_balance(pd->point_tree);
+	dm->release(dm);
+	
+	if(psys->lattice){
+		end_latt_deform();
+		psys->lattice=0;
+	}
 	
 	psys_render_restore(ob, psys);
 }

From c62c61a413f90f0af387027f9f94782904c40f17 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 06:10:16 +0000
Subject: [PATCH 043/577] * Fixed a bug in copying (making single user) a point
 density texture

---
 source/blender/blenkernel/intern/texture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 6f58e054f69..0dbc0228820 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -895,7 +895,7 @@ PointDensity *BKE_copy_pointdensity(PointDensity *pd)
 	pdn->point_tree = NULL;
 	pdn->point_data = NULL;
 	
-	return pd;
+	return pdn;
 }
 
 void BKE_free_pointdensitydata(PointDensity *pd)

From 8a6c82684f0e8463bf0a82862929c43b93f18c0b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 22 Oct 2008 09:26:18 +0000
Subject: [PATCH 044/577] * Did some small tweaks to how density is used with
 light cache - it makes some very good improvements clearing up artifacts:

http://mke3.net/blender/devel/rendering/volumetrics/vol_lc_fixed.jpg
---
 source/blender/render/intern/source/volumetric.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 4ff6f5aea41..7005f1a6952 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -468,9 +468,6 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 		lar= go->lampren;
 		if (lar) {
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
-			
-			VecMulf(lacol, density);
-		
 			VecAddf(col, col, lacol);
 		}
 	}
@@ -539,7 +536,8 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 					vol_get_precached_scattering_nearest(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
-			
+						
+			VecMulf(scatter_col, density);
 			VecAddf(d_radiance, emit_col, scatter_col);
 			
 			/*   Lv += Tr * (Lve() + Ld) */

From 3a347c1cafd864f9cce3ba30df8ec45f70a6cbfd Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 23 Oct 2008 01:14:30 +0000
Subject: [PATCH 045/577] Just adding some temporary testing code to help try
 and find a bug.

---
 .../blender/render/intern/source/volumetric.c   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 7005f1a6952..ff1c1ca7b67 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -386,10 +386,14 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
 	float shadfac[4];
 	
+	if (G.rt==5) printf("s_o_l pre checks col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
+	
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
 	if (lar->energy == 0.0) return;
 	
+	if (G.rt==5) printf("s_o_l post checks  col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
+	
 	visifac= lamp_get_visibility(lar, co, lv, &lampdist);
 	if(visifac==0.0f) return;
 
@@ -397,6 +401,8 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	lacol[1] = lar->g;
 	lacol[2] = lar->b;
 	
+	if (G.rt==5) printf("s_o_l post lacol col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
+	
 	if(lar->mode & LA_TEXTURE) {
 		shi->osatex= 0;
 		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
@@ -404,6 +410,8 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 
 	VecMulf(lacol, visifac*lar->energy);
 
+	if (G.rt==5) printf("s_o_l post energy col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
+	
 	if (ELEM(lar->type, LA_SUN, LA_HEMI))
 		VECCOPY(lv, lar->vec);
 	VecMulf(lv, -1.0f);
@@ -414,6 +422,8 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
 		Isect is;
 		
+		if (G.rt==5) printf("s_o_l inside atten col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
+		
 		/* find minimum of volume bounds, or lamp coord */
 		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
 			float dist = VecLenf(co, hitco);
@@ -446,6 +456,8 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		}
 	}
 	
+	if (G.rt==5) printf("s_o_l post atten col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
+	
 	vol_get_scattering_fac(shi, &scatter_fac, co, density);
 	VecMulf(lacol, scatter_fac);
 }
@@ -459,16 +471,21 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	float col[3] = {0.f, 0.f, 0.f};
 	int i=0;
 
+	if (G.rt==5) printf("lights count: %d \n", BLI_countlist(&R.lights));
+
 	for(go=R.lights.first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
 	
 		i++;
+		if (G.rt==5) printf("pre light %d \n", i);
 	
 		lar= go->lampren;
 		if (lar) {
+			if (G.rt==5) printf("pre vol_shade_one_lamp %d col %f %f %f \n", i, lacol[0], lacol[1], lacol[2]);
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
 			VecAddf(col, col, lacol);
+			if (G.rt==5) printf("post vol_shade_one_lamp %d col %f %f %f \n", i, lacol[0], lacol[1], lacol[2]);
 		}
 	}
 	

From ee1a143947ebfc8fe26cf9083fd41c520db3e86b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 23 Oct 2008 01:40:49 +0000
Subject: [PATCH 046/577] more testing code

---
 source/blender/render/intern/source/volumetric.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index ff1c1ca7b67..f718dbba703 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -956,9 +956,11 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 				}
 				
 				/* don't bother if the point is not inside the volume mesh */
-				if (!point_inside_obi(tree, obi, co))
+				if (!point_inside_obi(tree, obi, co)) {
+					if (G.rt==5) printf("not inside mesh \n");
 					continue;
-
+				}
+				if (G.rt==5) printf("inside mesh \n");
 				density = vol_get_density(&shi, co);
 				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
 			

From 5fabc7781be98305acda9d8d69042dcba3ac3eef Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 23 Oct 2008 01:52:04 +0000
Subject: [PATCH 047/577] and more debugging

---
 source/blender/render/intern/source/convertblender.c | 5 ++++-
 source/blender/render/intern/source/volumetric.c     | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 74b03d1082f..d7491d9e3fb 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3094,6 +3094,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 					do_autosmooth= 1;
 			
 			if ((ma->material_type == MA_VOLUME) && (ma->vol_shadeflag & MA_VOL_PRECACHESHADING)) {
+				printf("before add_vol_precache \n");
 				add_vol_precache(re, obr, ma);
 			}
 		}
@@ -4927,8 +4928,10 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 				make_sss_tree(re);
 		
 		if(!re->test_break())
-			if(re->r.mode & R_RAYTRACE)
+			if(re->r.mode & R_RAYTRACE) {
+				printf("before volume_precache \n");
 				volume_precache(re);
+			}
 	}
 	
 	if(re->test_break())
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index f718dbba703..dbd241498a9 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -888,11 +888,14 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	
 	R = *re;
 
+	if (G.rt==5) printf("before create raytree \n");
 	/* create a raytree with just the faces of the instanced ObjectRen, 
 	 * used for checking if the cached point is inside or outside. */
 	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
 
+	if (G.rt==5) printf("after create raytree \n");
+
 	/* Need a shadeinput to calculate scattering */
 	memset(&shi, 0, sizeof(ShadeInput)); 
 	shi.depth= 1;
@@ -918,6 +921,8 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 		return;
 	VecMulf(voxel, 1.0f/res);
 	
+	if (G.rt==5) printf("before alloc \n");
+	
 	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
 	
 	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
@@ -986,6 +991,8 @@ void volume_precache(Render *re)
 	ObjectInstanceRen *obi;
 	VolPrecache *vp;
 
+	if (G.rt==5) printf("precache obs: %d \n", BLI_countlist(&re->vol_precache_obs));
+
 	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
 		for(obi= re->instancetable.first; obi; obi= obi->next) {
 			if (obi->obr == vp->obr) 

From ffe81354f8c7aebaed6168ecb942c86c2da56ce4 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 23 Oct 2008 02:03:54 +0000
Subject: [PATCH 048/577] removed debug stuff

---
 .../render/intern/source/convertblender.c     |  5 +---
 .../blender/render/intern/source/volumetric.c | 30 ++-----------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index d7491d9e3fb..74b03d1082f 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3094,7 +3094,6 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 					do_autosmooth= 1;
 			
 			if ((ma->material_type == MA_VOLUME) && (ma->vol_shadeflag & MA_VOL_PRECACHESHADING)) {
-				printf("before add_vol_precache \n");
 				add_vol_precache(re, obr, ma);
 			}
 		}
@@ -4928,10 +4927,8 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 				make_sss_tree(re);
 		
 		if(!re->test_break())
-			if(re->r.mode & R_RAYTRACE) {
-				printf("before volume_precache \n");
+			if(re->r.mode & R_RAYTRACE)
 				volume_precache(re);
-			}
 	}
 	
 	if(re->test_break())
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index dbd241498a9..7005f1a6952 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -386,14 +386,10 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
 	float shadfac[4];
 	
-	if (G.rt==5) printf("s_o_l pre checks col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
 	if (lar->energy == 0.0) return;
 	
-	if (G.rt==5) printf("s_o_l post checks  col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	visifac= lamp_get_visibility(lar, co, lv, &lampdist);
 	if(visifac==0.0f) return;
 
@@ -401,8 +397,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	lacol[1] = lar->g;
 	lacol[2] = lar->b;
 	
-	if (G.rt==5) printf("s_o_l post lacol col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	if(lar->mode & LA_TEXTURE) {
 		shi->osatex= 0;
 		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
@@ -410,8 +404,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 
 	VecMulf(lacol, visifac*lar->energy);
 
-	if (G.rt==5) printf("s_o_l post energy col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	if (ELEM(lar->type, LA_SUN, LA_HEMI))
 		VECCOPY(lv, lar->vec);
 	VecMulf(lv, -1.0f);
@@ -422,8 +414,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
 		Isect is;
 		
-		if (G.rt==5) printf("s_o_l inside atten col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-		
 		/* find minimum of volume bounds, or lamp coord */
 		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
 			float dist = VecLenf(co, hitco);
@@ -456,8 +446,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		}
 	}
 	
-	if (G.rt==5) printf("s_o_l post atten col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	vol_get_scattering_fac(shi, &scatter_fac, co, density);
 	VecMulf(lacol, scatter_fac);
 }
@@ -471,21 +459,16 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	float col[3] = {0.f, 0.f, 0.f};
 	int i=0;
 
-	if (G.rt==5) printf("lights count: %d \n", BLI_countlist(&R.lights));
-
 	for(go=R.lights.first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
 	
 		i++;
-		if (G.rt==5) printf("pre light %d \n", i);
 	
 		lar= go->lampren;
 		if (lar) {
-			if (G.rt==5) printf("pre vol_shade_one_lamp %d col %f %f %f \n", i, lacol[0], lacol[1], lacol[2]);
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
 			VecAddf(col, col, lacol);
-			if (G.rt==5) printf("post vol_shade_one_lamp %d col %f %f %f \n", i, lacol[0], lacol[1], lacol[2]);
 		}
 	}
 	
@@ -888,14 +871,11 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 	
 	R = *re;
 
-	if (G.rt==5) printf("before create raytree \n");
 	/* create a raytree with just the faces of the instanced ObjectRen, 
 	 * used for checking if the cached point is inside or outside. */
 	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
 
-	if (G.rt==5) printf("after create raytree \n");
-
 	/* Need a shadeinput to calculate scattering */
 	memset(&shi, 0, sizeof(ShadeInput)); 
 	shi.depth= 1;
@@ -921,8 +901,6 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 		return;
 	VecMulf(voxel, 1.0f/res);
 	
-	if (G.rt==5) printf("before alloc \n");
-	
 	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
 	
 	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
@@ -961,11 +939,9 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 				}
 				
 				/* don't bother if the point is not inside the volume mesh */
-				if (!point_inside_obi(tree, obi, co)) {
-					if (G.rt==5) printf("not inside mesh \n");
+				if (!point_inside_obi(tree, obi, co))
 					continue;
-				}
-				if (G.rt==5) printf("inside mesh \n");
+
 				density = vol_get_density(&shi, co);
 				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
 			
@@ -991,8 +967,6 @@ void volume_precache(Render *re)
 	ObjectInstanceRen *obi;
 	VolPrecache *vp;
 
-	if (G.rt==5) printf("precache obs: %d \n", BLI_countlist(&re->vol_precache_obs));
-
 	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
 		for(obi= re->instancetable.first; obi; obi= obi->next) {
 			if (obi->obr == vp->obr) 

From ba829e5c36b0e1282f5799720142d464c57c7d54 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 23 Oct 2008 02:15:36 +0000
Subject: [PATCH 049/577] Debugging tests paid off, fixed a ridiculously silly
 bug that was preventing light cache from working on some people's systems
 (but went just fine on both my windows pc and mac). I have no idea how the
 original code even worked at all, it really shouldn't have.

But fixed now anyway! Thanks a bunch to Zanqdo for patience
in helping me pinpoint this.
---
 source/blender/render/intern/source/volumetric.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 7005f1a6952..aad8f44441e 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -844,6 +844,8 @@ RayTree *create_raytree_obi(ObjectInstanceRen *obi, float *bbmin, float *bbmax)
 	}
 	
 	RE_ray_tree_done(tree);
+	
+	return tree;
 }
 
 /* Precache a volume into a 3D voxel grid.

From deea0fa2e70a094cd289ac0083dcbf624453df51 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 23 Oct 2008 03:50:56 +0000
Subject: [PATCH 050/577] * More improvements for light cache

Previously when using light cache, there could be artifacts caused when
voxel points that were sampled outside the volume object's geometry got
interpolated into the rest of the volume. This commit adds a (similar
to a dilate) filter pass after creating the light cache, that fills
these empty areas with the average of their surrounding voxels.

http://mke3.net/blender/devel/rendering/volumetrics/vol_lightcache_filter.jpg
---
 .../blender/render/intern/source/volumetric.c | 92 ++++++++++++++++---
 1 file changed, 77 insertions(+), 15 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index aad8f44441e..02ebbd83c31 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -75,6 +75,7 @@ static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 	return (INPR(is->vec, vlr->n) < 0.0f);
 }
 
+#if 0
 static int vol_frontface_intersect_check(Isect *is, int ob, RayFace *face)
 {
 	VlakRen *vlr = (VlakRen *)face;
@@ -88,6 +89,7 @@ static int vol_always_intersect_check(Isect *is, int ob, RayFace *face)
 {
 	return 1;
 }
+#endif
 
 #define VOL_IS_BACKFACE			1
 #define VOL_IS_SAMEMATERIAL		2
@@ -257,12 +259,6 @@ inline float lerp(float t, float v1, float v2) {
 	return (1.f - t) * v1 + t * v2;
 }
 
-inline float do_lerp(float t, float a, float b) {
-	if (a > 0.f && b > 0.f) return lerp(t, a, b);
-	else if (a < 0.f) 		return b;
-	else if (b < 0.f) 		return a;
-}
-
 /* trilinear interpolation */
 static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
 {
@@ -384,7 +380,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	float p;
 	float scatter_fac;
 	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
-	float shadfac[4];
 	
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
@@ -454,7 +449,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
 {
 	GroupObject *go;
-	ListBase *lights;
 	LampRen *lar;
 	float col[3] = {0.f, 0.f, 0.f};
 	int i=0;
@@ -530,10 +524,10 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			
 			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
 				(shi->mat->vol_shadeflag & MA_VOL_ATTENUATED)) {
-				if (G.rt==0)
-					vol_get_precached_scattering(shi, scatter_col, step_mid);
-				else
+				if (G.rt==100)
 					vol_get_precached_scattering_nearest(shi, scatter_col, step_mid);
+				else
+					vol_get_precached_scattering(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
 						
@@ -782,7 +776,6 @@ int intersect_outside_volume(RayTree *tree, Isect *isect, float *offset, int lim
 int point_inside_obi(RayTree *tree, ObjectInstanceRen *obi, float *co)
 {
 	float maxsize = RE_ray_tree_max_size(tree);
-	int intersected;
 	Isect isect;
 	float vec[3] = {0.0f,0.0f,1.0f};
 	int final_depth=0, depth=0, limit=20;
@@ -848,6 +841,70 @@ RayTree *create_raytree_obi(ObjectInstanceRen *obi, float *bbmin, float *bbmax)
 	return tree;
 }
 
+static float get_avg_surrounds(float *cache, int res, int res_2, int res_3, int rgb, int xx, int yy, int zz)
+{
+	int x, y, z, x_, y_, z_;
+	int added=0;
+	float tot=0.0f;
+	int i;
+	
+	for (x=-1; x <= 1; x++) {
+		x_ = xx+x;
+		if (x_ >= 0 && x_ <= res-1) {
+		
+			for (y=-1; y <= 1; y++) {
+				y_ = yy+y;
+				if (y_ >= 0 && y_ <= res-1) {
+				
+					for (z=-1; z <= 1; z++) {
+						z_ = zz+z;
+						if (z_ >= 0 && z_ <= res-1) {
+						
+							i = rgb*res_3 + x_*res_2 + y_*res + z_;
+							if (cache[i] > 0.0f) {
+								tot += cache[i];
+								added++;
+							}
+							
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	tot /= added;
+	
+	return ((added>0)?tot:0.0f);
+}
+
+/* function to filter the edges of the light cache, where there was no volume originally.
+ * For each voxel which was originally external to the mesh, it finds the average values of
+ * the surrounding internal voxels and sets the original external voxel to that average amount.
+ * Works almost a bit like a 'dilate' filter */
+static void lightcache_filter(float *cache, int res)
+{
+	int x, y, z, rgb;
+	int res_2, res_3;
+	int i;
+	
+	res_2 = res*res;
+	res_3 = res*res*res;
+
+	for (x=0; x < res; x++) {
+		for (y=0; y < res; y++) {
+			for (z=0; z < res; z++) {
+				for (rgb=0; rgb < 3; rgb++) {
+					i = rgb*res_3 + x*res_2 + y*res + z;
+
+					/* trigger for outside mesh */
+					if (cache[i] < 0.5f) cache[i] = get_avg_surrounds(cache, res, res_2, res_3, rgb, x, y, z);
+				}
+			}
+		}
+	}
+}
+
 /* Precache a volume into a 3D voxel grid.
  * The voxel grid is stored in the ObjectInstanceRen, 
  * in camera space, aligned with the ObjectRen's bounding box.
@@ -941,9 +998,12 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 				}
 				
 				/* don't bother if the point is not inside the volume mesh */
-				if (!point_inside_obi(tree, obi, co))
+				if (!point_inside_obi(tree, obi, co)) {
+					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
 					continue;
-
+				}
 				density = vol_get_density(&shi, co);
 				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
 			
@@ -959,6 +1019,7 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 		tree= NULL;
 	}
 	
+	lightcache_filter(obi->volume_precache, res);
 
 }
 
@@ -990,4 +1051,5 @@ void free_volume_precache(Render *re)
 	}
 	
 	BLI_freelistN(&re->vol_precache_obs);
-}
\ No newline at end of file
+}
+

From 5fb8debada3db41d2ff40ee9a30e10ddcf35d35e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 30 Oct 2008 09:26:30 +0000
Subject: [PATCH 051/577] * Added a new, slightly experimental force field
 type: 'Spin'. It works similarly to Vortex, but it's a more controllable - it
 doesn't send the particles off accelerating into space, but keeps them
 spinning around the Z axis of the force field object.

This is safe in the branch, but Jahka if you have any feedback,
I'd be curious to hear :)
---
 source/blender/blenkernel/intern/effect.c  | 13 +++++++++++++
 source/blender/makesdna/DNA_object_force.h |  1 +
 source/blender/src/buttons_object.c        |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 122c6c71a6c..8b38fadafb1 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -420,6 +420,19 @@ void do_physical_effector(Object *ob, float *opco, short type, float force_val,
 			VecMulf(mag_vec,force_val*distance*falloff);
 			VecAddf(field,field,mag_vec);
 
+			break;
+		case PFIELD_SPIN:
+			Projf(temp, velocity, eff_vel);
+			
+			Crossf(mag_vec,eff_vel,vec_to_part);
+
+			Normalize(mag_vec);
+
+			VecMulf(mag_vec,force_val*distance*falloff);
+			VecAddf(mag_vec, mag_vec, temp);
+			
+			VecCopyf(velocity, mag_vec);
+			
 			break;
 		case PFIELD_MAGNET:
 			if(planar)
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index 21c5242a703..2b8a86ac67b 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -210,6 +210,7 @@ typedef struct SoftBody {
 #define PFIELD_HARMONIC	7
 #define PFIELD_CHARGE	8
 #define PFIELD_LENNARDJ	9
+#define PFIELD_SPIN		10
 
 
 /* pd->flag: various settings */
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index a8ce9da8780..763038adaae 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -3409,8 +3409,8 @@ static void object_panel_fields(Object *ob)
 				sprintf(menustr, "Field Type%%t|None%%x0|Spherical%%x%d|Wind%%x%d|Vortex%%x%d|Curve Guide%%x%d|Magnetic%%x%d|Harmonic%%x%d|Texture%%x%d|Charge%%x%d|Lennard-Jones%%x%d", 
 						PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_GUIDE, PFIELD_MAGNET, PFIELD_HARMONIC, PFIELD_TEXTURE, PFIELD_CHARGE, PFIELD_LENNARDJ);
 			else
-				sprintf(menustr, "Field Type%%t|None%%x0|Spherical%%x%d|Wind%%x%d|Vortex%%x%d|Magnetic%%x%d|Harmonic%%x%d|Texture%%x%d|Charge%%x%d|Lennard-Jones%%x%d", 
-						PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_MAGNET, PFIELD_HARMONIC, PFIELD_TEXTURE, PFIELD_CHARGE, PFIELD_LENNARDJ);
+				sprintf(menustr, "Field Type%%t|None%%x0|Spherical%%x%d|Wind%%x%d|Vortex%%x%d|Spin%%x%d|Magnetic%%x%d|Harmonic%%x%d|Texture%%x%d|Charge%%x%d|Lennard-Jones%%x%d", 
+						PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_SPIN, PFIELD_MAGNET, PFIELD_HARMONIC, PFIELD_TEXTURE, PFIELD_CHARGE, PFIELD_LENNARDJ);
 
 			if(pd->forcefield==PFIELD_FORCE) tipstr= "Object center attracts or repels particles (On shared object layers)";
 			else if(pd->forcefield==PFIELD_WIND) tipstr= "Constant force applied in direction of Object Z axis (On shared object layers)";

From 15579884b1255cba9de7662f72cd21323ad2c701 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 31 Oct 2008 05:29:54 +0000
Subject: [PATCH 052/577] * Added a new turbulence type: Time. It's not
 entirely well tested, but so far working ok. It's smoother looking than
 'velocity' but may need more in depth investigation.

---
 .../render/intern/source/pointdensity.c       | 89 +++++++++++--------
 source/blender/render/intern/source/texture.c | 13 ++-
 source/blender/src/buttons_shading.c          |  2 +-
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 28d8c2388c4..483cc96122b 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -35,6 +35,7 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
+#include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
@@ -56,12 +57,12 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	float partco[3];
 	float obview[4][4];
 	
-	/* init crap */
+	/* init everything */
 	if (!psys || !ob || !pd) return;
 	
 	Mat4MulMat4(obview, re->viewinv, ob->obmat);
 	
-	/* Just to create a valid rendering context */
+	/* Just to create a valid rendering context for particles */
 	psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, 0);
 	
 	dm = mesh_create_derived_render(ob,CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
@@ -79,8 +80,10 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	
 	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 4, 6);
 	
-	if (pd->noise_influence != TEX_PD_NOISE_STATIC)
-		pd->point_data = MEM_mallocN(sizeof(float)*3*total_particles, "point_data");
+	if (pd->noise_influence == TEX_PD_NOISE_VEL)
+		pd->point_data = MEM_mallocN(sizeof(float)*3*total_particles, "velocity point data");
+	else if (pd->noise_influence == TEX_PD_NOISE_TIME)
+		pd->point_data = MEM_mallocN(sizeof(float)*total_particles, "time point data");
 	
 	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
 		childexists = 1;
@@ -108,6 +111,8 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 				pd->point_data[i*3 + 0] = state.vel[0];
 				pd->point_data[i*3 + 1] = state.vel[1];
 				pd->point_data[i*3 + 2] = state.vel[2];
+			} else if (pd->noise_influence == TEX_PD_NOISE_TIME) {
+				pd->point_data[i] = state.time;
 			}
 		}
 	}
@@ -256,7 +261,9 @@ typedef struct PointDensityRangeData
     float *point_data;
 	float *vec;
 	float softness;
-    short falloff_type;   
+    short falloff_type;
+	short noise_influence;
+	float *time;
 } PointDensityRangeData;
 
 void accum_density(void *userdata, int index, float squared_dist)
@@ -277,10 +284,14 @@ void accum_density(void *userdata, int index, float squared_dist)
 		density = sqrt(dist);
 	
 	if (pdr->point_data) {
-		pdr->vec[0] += pdr->point_data[index*3 + 0];// * density;
-		pdr->vec[1] += pdr->point_data[index*3 + 1];// * density;
-		pdr->vec[2] += pdr->point_data[index*3 + 2];// * density;
-	}
+		if (pdr->noise_influence == TEX_PD_NOISE_VEL) {
+			pdr->vec[0] += pdr->point_data[index*3 + 0];// * density;
+			pdr->vec[1] += pdr->point_data[index*3 + 1];// * density;
+			pdr->vec[2] += pdr->point_data[index*3 + 2];// * density;
+		} else if (pdr->noise_influence == TEX_PD_NOISE_TIME) {
+			*pdr->time += pdr->point_data[index]; // * density;
+		}
+	} 
 	
 	*pdr->density += density;
 }
@@ -288,12 +299,13 @@ void accum_density(void *userdata, int index, float squared_dist)
 #define MAX_POINTS_NEAREST	25
 int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 {
-	int rv = TEX_INT;
+	int retval = TEX_INT;
 	PointDensity *pd = tex->pd;
 	PointDensityRangeData pdr;
-	float density=0.0f;
+	float density=0.0f, time=0.0f;
 	float vec[3] = {0.0, 0.0, 0.0};
 	float tv[3];
+	float co[3];
 	float turb, noise_fac;
 	
 	if ((!pd) || (!pd->point_tree)) {
@@ -306,54 +318,53 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	pdr.point_data = pd->point_data;
 	pdr.falloff_type = pd->falloff_type;
 	pdr.vec = vec;
+	pdr.time = &time;
 	pdr.softness = pd->falloff_softness;
+	pdr.noise_influence = pd->noise_influence;
 	noise_fac = pd->noise_fac * 0.5f;	/* better default */
 	
-	if (pd->flag & TEX_PD_TURBULENCE) {
-		VECCOPY(tv, texvec);
-		
-		/* find the average speed vectors, for perturbing final density lookup with */
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density, &pdr);
-		
-		density = 0.0f;
-		Normalize(vec);
+	VECCOPY(co, texvec);
 	
-		turb = BLI_turbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth);
+	if (pd->flag & TEX_PD_TURBULENCE) {
+		retval |= TEX_RGB;
 		
+		if (ELEM(pd->noise_influence, TEX_PD_NOISE_VEL, TEX_PD_NOISE_TIME)) {
+			/* find the average speed vectors or particle time,
+			 * for perturbing final density lookup with */
+			BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
+			density = 0.0f;
+			
+			if (pd->noise_influence == TEX_PD_NOISE_TIME)
+				vec[0] = vec[1] = vec[2] = time;
+			
+			Normalize(vec);
+		}
+		
+		turb = BLI_turbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth);
 		turb -= 0.5f;	/* re-center 0.0-1.0 range around 0 to prevent offsetting result */
 		
-		tv[0] = texvec[0] + noise_fac * turb;
-		tv[1] = texvec[1] + noise_fac * turb;
-		tv[2] = texvec[2] + noise_fac * turb;
-		
-		/* do density lookup with altered coordinates */
-		BLI_bvhtree_range_query(pd->point_tree, tv, pd->radius, accum_density, &pdr);
+		/* now we have an offset coordinate to use for the density lookup */
+		co[0] = texvec[0] + noise_fac * turb;
+		co[1] = texvec[1] + noise_fac * turb;
+		co[2] = texvec[2] + noise_fac * turb;
 	}
-	else
-		BLI_bvhtree_range_query(pd->point_tree, texvec, pd->radius, accum_density, &pdr);
+	
+	BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
 
 	texres->tin = density;
-
-	
-	
 	BRICONT;
 	
-	return TEX_INT;
-	
-	/*
 	texres->tr = vec[0];
 	texres->tg = vec[1];
 	texres->tb = vec[2];
+	texres->ta = density;
 	BRICONTRGB;
 	
-	texres->ta = 1.0;
+	return retval;
 	
+	/*
 	if (texres->nor!=NULL) {
 		texres->nor[0] = texres->nor[1] = texres->nor[2] = 0.0f;
 	}
 	*/
-	
-	//BRICONT;
-	
-	//return rv;
 }
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index dfeb775aca6..972ab4b55a9 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1565,17 +1565,15 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 				/* stencil maps on the texture control slider, not texture intensity value */
 				colfac= mtex->colfac*stencilTin;
 				
-				tcol[0]=texres.tr; tcol[1]=texres.tg; tcol[2]=texres.tb;
-				
 				if((rgbnor & TEX_RGB)==0) {
 					tcol[0]= mtex->r;
 					tcol[1]= mtex->g;
 					tcol[2]= mtex->b;
+				} else {
+					tcol[0]=texres.tr;
+					tcol[1]=texres.tg;
+					tcol[2]=texres.tb;
 				}
-				else if(mtex->mapto & MAP_ALPHA) {
-					texres.tin= stencilTin;
-				}
-				else texres.tin= texres.ta;
 				
 				if((mapto_flag & MAP_COL) && (mtex->mapto & MAP_COL)) {
 					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
@@ -1591,7 +1589,8 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 				/* stencil maps on the texture control slider, not texture intensity value */
 				float varfac= mtex->varfac*stencilTin;
 				
-				if(rgbnor & TEX_RGB) {
+				/* convert RGB to intensity if intensity info isn't provided */
+				if((rgbnor & TEX_RGB) && !(rgbnor & TEX_INT)) {
 					if(texres.talpha) texres.tin= texres.ta;
 					else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);
 				}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 04fc9d5314f..dbe3db871b4 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -788,7 +788,7 @@ static void texture_panel_pointdensity(Tex *tex)
 			yco -= YSPACE;
 
 			if (pd->source == TEX_PD_PSYS) {
-				uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1",
+				uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Time %x2",
 					X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
 			}
 		}

From 5cdbbe3a925383472c852c0db958d1af11c6413b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 1 Nov 2008 12:45:19 +0000
Subject: [PATCH 053/577] * Tweaked the spin force field a bit. It worked great
 for its purpose before, but wasn't playing nice with the other force fields
 (was overwriting the velocity rather than acting as a force). This version is
 slightly different, but will work a lot better with other force fields too.

---
 source/blender/blenkernel/intern/effect.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 8b38fadafb1..4c8394f0eeb 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -422,18 +422,25 @@ void do_physical_effector(Object *ob, float *opco, short type, float force_val,
 
 			break;
 		case PFIELD_SPIN:
-			Projf(temp, velocity, eff_vel);
+		{	
+			float inward[3];
 			
+			Projf(temp, velocity, eff_vel);
 			Crossf(mag_vec,eff_vel,vec_to_part);
+			Crossf(inward, mag_vec, eff_vel);
 
 			Normalize(mag_vec);
 
+			VecSubf(mag_vec, mag_vec, inward);
+			
 			VecMulf(mag_vec,force_val*distance*falloff);
 			VecAddf(mag_vec, mag_vec, temp);
-			
-			VecCopyf(velocity, mag_vec);
-			
+
+			/* compensate for existing velocity */
+			VecSubf(mag_vec, mag_vec, velocity);
+			VecAddf(field,field,mag_vec);
 			break;
+		}
 		case PFIELD_MAGNET:
 			if(planar)
 				VecCopyf(temp,eff_vel);

From 389588bb4f9f273d5cc1f679e351604859dafc0b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 2 Nov 2008 23:25:21 +0000
Subject: [PATCH 054/577] Reverted to the previous, more hackish version of the
 spin field. There has to be a better way of doing this though... jahka? :)

---
 source/blender/blenkernel/intern/effect.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 4c8394f0eeb..f3d9ea7005a 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -422,25 +422,20 @@ void do_physical_effector(Object *ob, float *opco, short type, float force_val,
 
 			break;
 		case PFIELD_SPIN:
-		{	
-			float inward[3];
-			
 			Projf(temp, velocity, eff_vel);
+			
 			Crossf(mag_vec,eff_vel,vec_to_part);
-			Crossf(inward, mag_vec, eff_vel);
 
 			Normalize(mag_vec);
 
-			VecSubf(mag_vec, mag_vec, inward);
-			
 			VecMulf(mag_vec,force_val*distance*falloff);
 			VecAddf(mag_vec, mag_vec, temp);
-
-			/* compensate for existing velocity */
-			VecSubf(mag_vec, mag_vec, velocity);
-			VecAddf(field,field,mag_vec);
+			
+			VecCopyf(velocity, mag_vec);
+			//VecSubf(mag_vec, mag_vec, velocity);
+			//VecAddf(field, field, mag_vec);
+			
 			break;
-		}
 		case PFIELD_MAGNET:
 			if(planar)
 				VecCopyf(temp,eff_vel);

From f5f0c8fb37eaac8be9efc44b2802fb87fcf85727 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 4 Nov 2008 05:17:02 +0000
Subject: [PATCH 055/577] * Fixed a strange problem with the way textures are
 interpreted - was causing weird things with point density turbulence on

* Reverted the spin field once more..
---
 source/blender/blenkernel/intern/effect.c         | 15 +++++++++++----
 .../blender/render/intern/source/pointdensity.c   | 12 +++++++-----
 source/blender/render/intern/source/texture.c     |  8 +++++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index f3d9ea7005a..f91a99accef 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -422,20 +422,27 @@ void do_physical_effector(Object *ob, float *opco, short type, float force_val,
 
 			break;
 		case PFIELD_SPIN:
+		{
+			float inward[3];
+
 			Projf(temp, velocity, eff_vel);
-			
 			Crossf(mag_vec,eff_vel,vec_to_part);
+			Crossf(inward, mag_vec, eff_vel);
 
 			Normalize(mag_vec);
+			Normalize(inward);
 
+			VecSubf(mag_vec, mag_vec, inward);
 			VecMulf(mag_vec,force_val*distance*falloff);
+
 			VecAddf(mag_vec, mag_vec, temp);
 			
-			VecCopyf(velocity, mag_vec);
-			//VecSubf(mag_vec, mag_vec, velocity);
-			//VecAddf(field, field, mag_vec);
+			//VecCopyf(velocity, mag_vec);
+			VecSubf(mag_vec, mag_vec, velocity);
+			VecAddf(field, field, mag_vec);
 			
 			break;
+		}
 		case PFIELD_MAGNET:
 			if(planar)
 				VecCopyf(temp,eff_vel);
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 483cc96122b..c80ee767142 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -304,9 +304,9 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	PointDensityRangeData pdr;
 	float density=0.0f, time=0.0f;
 	float vec[3] = {0.0, 0.0, 0.0};
-	float tv[3];
 	float co[3];
 	float turb, noise_fac;
+	int num;
 	
 	if ((!pd) || (!pd->point_tree)) {
 		texres->tin = 0.0f;
@@ -331,11 +331,13 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 		if (ELEM(pd->noise_influence, TEX_PD_NOISE_VEL, TEX_PD_NOISE_TIME)) {
 			/* find the average speed vectors or particle time,
 			 * for perturbing final density lookup with */
-			BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
+			num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
 			density = 0.0f;
 			
-			if (pd->noise_influence == TEX_PD_NOISE_TIME)
-				vec[0] = vec[1] = vec[2] = time;
+			if (pd->noise_influence == TEX_PD_NOISE_TIME) {
+				vec[0] = vec[1] = vec[2] = time/num;
+				//if ((G.rt==1) && (time > 0.f)) printf("time: %f  time/num: %f \n", time, time/num);
+			}
 			
 			Normalize(vec);
 		}
@@ -357,7 +359,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	texres->tr = vec[0];
 	texres->tg = vec[1];
 	texres->tb = vec[2];
-	texres->ta = density;
+	//texres->ta = density;
 	BRICONTRGB;
 	
 	return retval;
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 972ab4b55a9..4fdccc9d892 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1590,9 +1590,11 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 				float varfac= mtex->varfac*stencilTin;
 				
 				/* convert RGB to intensity if intensity info isn't provided */
-				if((rgbnor & TEX_RGB) && !(rgbnor & TEX_INT)) {
-					if(texres.talpha) texres.tin= texres.ta;
-					else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);
+				if (rgbnor & TEX_INT) {
+					if (rgbnor & TEX_RGB) {
+						if(texres.talpha) texres.tin= texres.ta;
+						else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);
+					}
 				}
 				
 				if((mapto_flag & MAP_EMIT) && (mtex->mapto & MAP_EMIT)) {

From a972107b03a3b8b00e1548d99e790612dc9f0ccc Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 9 Nov 2008 01:16:12 +0000
Subject: [PATCH 056/577] Point Density texture: colouring

This introduces a few new ways of modifying the intensity and colour output
generated by the Point Density texture. Previously, the texture only output
intensity information, but now you can map it to colours along a gradient
ramp, based on information coming out of a particle system.

This lets you do things like colour a particle system based on the individual
particles' age - the main reason I need it is to fade particles out over time.

The colorband influences both the colour and intensity (using the colorband's
alpha value), which makes it easy to map a single point density texture to
both intensity values in the Map To panel (such as density or emit) and colour
values (such as absorb col or emit col). This is how the below examples are
set up, an example .blend file is available here:

http://mke3.net/blender/devel/rendering/volumetrics/pd_test4.blend

The different modes:

* Constant
No modifications to intensity or colour (pure white)

* Particle Age
Maps the color ramp along the particles' lifetimes:
http://mke3.net/blender/devel/rendering/volumetrics/pd_mod_partage.mov

* Particle Speed
Maps the color ramp to the particles' absolute speed per frame (in Blender
units). There's an additional scale parameter that you can use to bring this
speed into a 0.0 - 1.0 range, if your particles are travelling too faster or
slower than 0-1.
http://mke3.net/blender/devel/rendering/volumetrics/pd_mod_speed.mov

* Velocity -> RGB
Outputs the particle XYZ velocity vector as RGB colours. This may be useful
for comp work, or maybe in the future things like displacement. Again, there's
a scale parameter to control it.
http://mke3.net/blender/devel/rendering/volumetrics/pd_mod_velrgb.mov
---
 source/blender/blenkernel/intern/texture.c    |   6 +-
 source/blender/blenloader/intern/readfile.c   |   5 +
 source/blender/blenloader/intern/writefile.c  |   5 +-
 source/blender/makesdna/DNA_texture_types.h   |  21 +-
 .../render/intern/source/pointdensity.c       | 209 ++++++---
 source/blender/src/buttons_shading.c          | 427 ++++++++++--------
 6 files changed, 424 insertions(+), 249 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 0dbc0228820..76ef6bdb4e8 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -883,7 +883,9 @@ PointDensity *BKE_add_pointdensity(void)
 	pd->noise_depth = 1;
 	pd->noise_fac = 1.0f;
 	pd->noise_influence = TEX_PD_NOISE_STATIC;
-	
+	pd->coba = add_colorband(1);
+	pd->speed_scale = 1.0f;
+	pd->totpoints = 0;
 	return pd;
 } 
 
@@ -894,6 +896,7 @@ PointDensity *BKE_copy_pointdensity(PointDensity *pd)
 	pdn= MEM_dupallocN(pd);
 	pdn->point_tree = NULL;
 	pdn->point_data = NULL;
+	if(pdn->coba) pdn->coba= MEM_dupallocN(pdn->coba);
 	
 	return pdn;
 }
@@ -908,6 +911,7 @@ void BKE_free_pointdensitydata(PointDensity *pd)
 		MEM_freeN(pd->point_data);
 		pd->point_data = NULL;
 	}
+	if(pd->coba) MEM_freeN(pd->coba);
 }
 
 void BKE_free_pointdensity(PointDensity *pd)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 83a66143ffc..372e9856b98 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2506,6 +2506,7 @@ static void direct_link_texture(FileData *fd, Tex *tex)
 	tex->pd= newdataadr(fd, tex->pd);
 	if(tex->pd) {
 		tex->pd->point_tree = NULL;
+		tex->pd->coba= newdataadr(fd, tex->pd->coba);
 	}
 	tex->preview = direct_link_preview_image(fd, tex->preview);
 
@@ -7902,6 +7903,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 			if (tex->pd->falloff_softness < 1.0f)
 				tex->pd->falloff_softness = 2.0f;
+			if (tex->pd->coba == NULL) {
+				tex->pd->coba = add_colorband(1);
+				tex->pd->speed_scale = 1.0f;
+			}
 		}
 		
 	}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 7249090dfa7..5c1032045d7 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1335,7 +1335,10 @@ static void write_textures(WriteData *wd, ListBase *idbase)
 			if(tex->plugin) writestruct(wd, DATA, "PluginTex", 1, tex->plugin);
 			if(tex->coba) writestruct(wd, DATA, "ColorBand", 1, tex->coba);
 			if(tex->env) writestruct(wd, DATA, "EnvMap", 1, tex->env);
-			if(tex->pd) writestruct(wd, DATA, "PointDensity", 1, tex->pd);
+			if(tex->pd) {
+				writestruct(wd, DATA, "PointDensity", 1, tex->pd);
+				if(tex->pd->coba) writestruct(wd, DATA, "ColorBand", 1, tex->pd->coba);
+			}
 			
 			write_previews(wd, tex->preview);
 		}
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index c51311bb621..b057efb4a55 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -134,7 +134,10 @@ typedef struct PointDensity {
 	float falloff_softness;
 	float radius;
 	short source;
-	short pdpad;
+	short color_source;
+	int totpoints;
+	
+	int pdpad;
 
 	struct Object *object;	/* for 'Object' or 'Particle system' type - source object */
 	short psys_cache_space;		/* cache points in worldspace, object space, ... ? */
@@ -151,7 +154,9 @@ typedef struct PointDensity {
 	short noise_depth;
 	short noise_influence;
 	float noise_fac;
-	float pdpad4;
+	
+	float speed_scale;
+	struct ColorBand *coba;	/* for time -> color */
 	
 } PointDensity;
 
@@ -442,7 +447,17 @@ typedef struct TexMapping {
 /* noise_influence */
 #define TEX_PD_NOISE_STATIC		0
 #define TEX_PD_NOISE_VEL		1
-#define TEX_PD_NOISE_TIME		2
+#define TEX_PD_NOISE_AGE		2
+#define TEX_PD_NOISE_TIME		3
+
+/* color_source */
+#define TEX_PD_COLOR_CONSTANT	0
+#define TEX_PD_COLOR_PARTAGE	1
+#define TEX_PD_COLOR_PARTSPEED	2
+#define TEX_PD_COLOR_PARTVEL	3
+
+#define POINT_DATA_VEL		1
+#define POINT_DATA_LIFE		2
 
 #endif
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index c80ee767142..db3e57e0b79 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -39,6 +39,7 @@
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
+#include "BKE_texture.h"
 
 #include "DNA_texture_types.h"
 #include "DNA_particle_types.h"
@@ -47,16 +48,59 @@
 #include "renderdatabase.h"
 #include "texture.h"
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
+/* only to be used here in this file, it's for speed */
+extern struct Render R;
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+
+static int point_data_used(PointDensity *pd)
+{
+	int pd_bitflag = 0;
+	
+	if ((pd->noise_influence == TEX_PD_NOISE_VEL) || (pd->color_source == TEX_PD_COLOR_PARTVEL) || (pd->color_source == TEX_PD_COLOR_PARTSPEED))
+		pd_bitflag |= POINT_DATA_VEL;
+	if ((pd->noise_influence == TEX_PD_NOISE_AGE) || (pd->color_source == TEX_PD_COLOR_PARTAGE)) 
+		pd_bitflag |= POINT_DATA_LIFE;
+		
+	return pd_bitflag;
+}
+
+
+/* additional data stored alongside the point density BVH, 
+ * accessible by point index number to retrieve other information 
+ * such as particle velocity or lifetime */
+static void make_point_data(PointDensity *pd, int total_particles, int point_data_used)
+{
+	int data_size = 0;
+	
+	if (point_data_used & POINT_DATA_VEL) {
+		/* store 3 channels of velocity data */
+		data_size += 3;
+	}
+	if (point_data_used & POINT_DATA_LIFE) {
+		/* store 1 channel of lifetime data */
+		data_size += 1;
+	}
+
+	if (data_size)
+		pd->point_data = MEM_mallocN(sizeof(float)*data_size*total_particles, "particle point data");
+}
+
 static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, ParticleSystem *psys)
 {
 	DerivedMesh* dm;
 	ParticleKey state;
+	ParticleData *pa=NULL;
 	float cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
 	int i, childexists;
-	int total_particles;
+	int total_particles, offset=0;
+	int data_used = point_data_used(pd);
 	float partco[3];
 	float obview[4][4];
 	
+	
 	/* init everything */
 	if (!psys || !ob || !pd) return;
 	
@@ -79,16 +123,14 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	psys->lattice=psys_get_lattice(ob,psys);
 	
 	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 4, 6);
-	
-	if (pd->noise_influence == TEX_PD_NOISE_VEL)
-		pd->point_data = MEM_mallocN(sizeof(float)*3*total_particles, "velocity point data");
-	else if (pd->noise_influence == TEX_PD_NOISE_TIME)
-		pd->point_data = MEM_mallocN(sizeof(float)*total_particles, "time point data");
+	make_point_data(pd, total_particles, data_used);
+	pd->totpoints = total_particles;
+	if (data_used & POINT_DATA_VEL) offset = pd->totpoints*3;
 	
 	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
 		childexists = 1;
 	
-	for (i = 0; i < total_particles; i++) {
+	for (i=0, pa=psys->particles; i < total_particles; i++, pa++) {
 
 		state.time = cfra;
 		if(psys_get_particle_state(ob, psys, i, &state, 0)) {
@@ -107,12 +149,14 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 			
 			BLI_bvhtree_insert(pd->point_tree, i, partco, 1);
 			
-			if (pd->noise_influence == TEX_PD_NOISE_VEL) {
+			if (data_used & POINT_DATA_VEL) {
 				pd->point_data[i*3 + 0] = state.vel[0];
 				pd->point_data[i*3 + 1] = state.vel[1];
 				pd->point_data[i*3 + 2] = state.vel[2];
-			} else if (pd->noise_influence == TEX_PD_NOISE_TIME) {
-				pd->point_data[i] = state.time;
+			} 
+			if (data_used & POINT_DATA_LIFE) {
+				float pa_time = (cfra - pa->time)/pa->lifetime;
+				pd->point_data[offset + i] = pa_time;
 			}
 		}
 	}
@@ -140,6 +184,7 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen *o
 	Mat4Invert(obr->ob->imat, obr->ob->obmat);
 	
 	pd->point_tree = BLI_bvhtree_new(obr->totvert, 0.0, 4, 6);
+	pd->totpoints = obr->totvert;
 	
 	for(i=0; i<obr->totvert; i++) {
 		float ver_co[3];
@@ -216,6 +261,7 @@ static void free_pointdensity(Render *re, Tex *tex)
 		MEM_freeN(pd->point_data);
 		pd->point_data = NULL;
 	}
+	pd->totpoints = 0;
 }
 
 
@@ -263,7 +309,9 @@ typedef struct PointDensityRangeData
 	float softness;
     short falloff_type;
 	short noise_influence;
-	float *time;
+	float *age;
+	int point_data_used;
+	int offset;
 } PointDensityRangeData;
 
 void accum_density(void *userdata, int index, float squared_dist)
@@ -283,83 +331,130 @@ void accum_density(void *userdata, int index, float squared_dist)
 	else if (pdr->falloff_type == TEX_PD_FALLOFF_ROOT)
 		density = sqrt(dist);
 	
-	if (pdr->point_data) {
-		if (pdr->noise_influence == TEX_PD_NOISE_VEL) {
-			pdr->vec[0] += pdr->point_data[index*3 + 0];// * density;
-			pdr->vec[1] += pdr->point_data[index*3 + 1];// * density;
-			pdr->vec[2] += pdr->point_data[index*3 + 2];// * density;
-		} else if (pdr->noise_influence == TEX_PD_NOISE_TIME) {
-			*pdr->time += pdr->point_data[index]; // * density;
-		}
-	} 
+	if (pdr->point_data_used & POINT_DATA_VEL) {
+		pdr->vec[0] += pdr->point_data[index*3 + 0]; //* density;
+		pdr->vec[1] += pdr->point_data[index*3 + 1]; //* density;
+		pdr->vec[2] += pdr->point_data[index*3 + 2]; //* density;
+	}
+	if (pdr->point_data_used & POINT_DATA_LIFE) {
+		*pdr->age += pdr->point_data[pdr->offset + index]; // * density;
+	}
 	
 	*pdr->density += density;
 }
 
-#define MAX_POINTS_NEAREST	25
+
+static void init_pointdensityrangedata(PointDensity *pd, PointDensityRangeData *pdr, float *density, float *vec, float *age)
+{
+	pdr->squared_radius = pd->radius*pd->radius;
+	pdr->density = density;
+	pdr->point_data = pd->point_data;
+	pdr->falloff_type = pd->falloff_type;
+	pdr->vec = vec;
+	pdr->age = age;
+	pdr->softness = pd->falloff_softness;
+	pdr->noise_influence = pd->noise_influence;
+	pdr->point_data_used = point_data_used(pd);
+	pdr->offset = (pdr->point_data_used & POINT_DATA_VEL)?pd->totpoints*3:0;
+}
+
+
 int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 {
-	int retval = TEX_INT;
+	int retval = TEX_INT+TEX_RGB;
 	PointDensity *pd = tex->pd;
 	PointDensityRangeData pdr;
-	float density=0.0f, time=0.0f;
-	float vec[3] = {0.0, 0.0, 0.0};
-	float co[3];
+	float density=0.0f, age=0.0f, time=0.0f;
+	float vec[3] = {0.0f, 0.0f, 0.0f}, co[3];
+	float col[4];
 	float turb, noise_fac;
-	int num;
+	int num=0;
 	
 	if ((!pd) || (!pd->point_tree)) {
 		texres->tin = 0.0f;
 		return 0;
 	}
 	
-	pdr.squared_radius = pd->radius*pd->radius;
-	pdr.density = &density;
-	pdr.point_data = pd->point_data;
-	pdr.falloff_type = pd->falloff_type;
-	pdr.vec = vec;
-	pdr.time = &time;
-	pdr.softness = pd->falloff_softness;
-	pdr.noise_influence = pd->noise_influence;
+	init_pointdensityrangedata(pd, &pdr, &density, vec, &age);
 	noise_fac = pd->noise_fac * 0.5f;	/* better default */
 	
 	VECCOPY(co, texvec);
 	
-	if (pd->flag & TEX_PD_TURBULENCE) {
-		retval |= TEX_RGB;
-		
-		if (ELEM(pd->noise_influence, TEX_PD_NOISE_VEL, TEX_PD_NOISE_TIME)) {
-			/* find the average speed vectors or particle time,
-			 * for perturbing final density lookup with */
-			num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
-			density = 0.0f;
-			
-			if (pd->noise_influence == TEX_PD_NOISE_TIME) {
-				vec[0] = vec[1] = vec[2] = time/num;
-				//if ((G.rt==1) && (time > 0.f)) printf("time: %f  time/num: %f \n", time, time/num);
-			}
-			
-			Normalize(vec);
+	if (point_data_used(pd)) {
+		/* does a BVH lookup to find accumulated density and additional point data *
+		 * stores particle velocity vector in 'vec', and particle lifetime in 'time' */
+		num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
+		if (num > 0) {
+			age /= num;
+			VecMulf(vec, 1.0f/num);
 		}
-		
-		turb = BLI_turbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth);
+	}
+	
+	if (pd->flag & TEX_PD_TURBULENCE) {
+	
+		if (pd->noise_influence == TEX_PD_NOISE_AGE) {
+			turb = BLI_turbulence(pd->noise_size, texvec[0]+age, texvec[1]+age, texvec[2]+age, pd->noise_depth);
+		}
+		else if (pd->noise_influence == TEX_PD_NOISE_TIME) {
+			time = R.cfra / (float)R.r.efra;
+			turb = BLI_turbulence(pd->noise_size, texvec[0]+time, texvec[1]+time, texvec[2]+time, pd->noise_depth);
+		}
+		else {
+			turb = BLI_turbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth);
+		}
+
 		turb -= 0.5f;	/* re-center 0.0-1.0 range around 0 to prevent offsetting result */
 		
 		/* now we have an offset coordinate to use for the density lookup */
 		co[0] = texvec[0] + noise_fac * turb;
 		co[1] = texvec[1] + noise_fac * turb;
 		co[2] = texvec[2] + noise_fac * turb;
+		
+		/* reset and do a new BVH query with the perturbed coordinates */
+		density = vec[0] = vec[1] = vec[2] = 0.0f;
+		num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
+		if (num > 0) {
+			age /= num;
+			VecMulf(vec, 1.0f/num);
+		}
+		
 	}
 	
-	BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
-
 	texres->tin = density;
 	BRICONT;
 	
-	texres->tr = vec[0];
-	texres->tg = vec[1];
-	texres->tb = vec[2];
-	//texres->ta = density;
+	switch (pd->color_source) {
+		case TEX_PD_COLOR_PARTAGE:
+			if (pd->coba) {
+				if (do_colorband(pd->coba, age, col)) {
+					texres->talpha= 1;
+					QUATCOPY(&texres->tr, col);
+					texres->tin *= texres->ta;
+				}
+			}
+			break;
+		case TEX_PD_COLOR_PARTSPEED:
+		{
+			float speed = VecLength(vec) * pd->speed_scale;
+			
+			if (pd->coba) {
+				if (do_colorband(pd->coba, speed, col)) {
+					texres->talpha= 1;	
+					QUATCOPY(&texres->tr, col);
+					texres->tin *= texres->ta;
+				}
+			}
+			break;
+		}
+		case TEX_PD_COLOR_PARTVEL:
+			VecMulf(vec, pd->speed_scale);
+			VECCOPY(&texres->tr, vec);
+			texres->ta = 1.0f;
+			break;
+		default:
+			texres->tr = texres->tg = texres->tb = texres->ta = 1.0f;
+			break;
+	}
 	BRICONTRGB;
 	
 	return retval;
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index dbe3db871b4..b9ea4ebe9d6 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -427,6 +427,115 @@ void do_texbuts(unsigned short event)
 	}
 }
 
+static void colorband_pos_cb(void *coba_v, void *unused_v)
+{
+	ColorBand *coba= coba_v;
+	int a;
+	
+	if(coba->tot<2) return;
+	
+	for(a=0; a<coba->tot; a++) coba->data[a].cur= a;
+	qsort(coba->data, coba->tot, sizeof(CBData), vergcband);
+	for(a=0; a<coba->tot; a++) {
+		if(coba->data[a].cur==coba->cur) {
+			if(coba->cur!=a) addqueue(curarea->win, REDRAW, 0);	/* button cur */
+			coba->cur= a;
+			break;
+		}
+	}
+}
+
+static void colorband_add_cb(void *coba_v, void *unused_v)
+{
+	ColorBand *coba= coba_v;
+	
+	if(coba->tot < MAXCOLORBAND-1) coba->tot++;
+	coba->cur= coba->tot-1;
+	
+	colorband_pos_cb(coba, NULL);
+	BIF_undo_push("Add colorband");
+	
+}
+
+static void colorband_del_cb(void *coba_v, void *unused_v)
+{
+	ColorBand *coba= coba_v;
+	int a;
+	
+	if(coba->tot<2) return;
+	
+	for(a=coba->cur; a<coba->tot; a++) {
+		coba->data[a]= coba->data[a+1];
+	}
+	if(coba->cur) coba->cur--;
+	coba->tot--;
+	
+	BIF_undo_push("Delete colorband");
+	BIF_preview_changed(ID_TE);
+}
+
+
+/* offset aligns from bottom, standard width 300, height 115 */
+static void draw_colorband_buts(uiBlock *block, ColorBand *coba, int xoffs, int yoffs, int redraw)
+{
+	CBData *cbd;
+	uiBut *bt;
+	
+	if(coba==NULL) return;
+	
+	bt= uiDefBut(block, BUT, redraw,	"Add",		80+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Adds a new color position to the colorband");
+	uiButSetFunc(bt, colorband_add_cb, coba, NULL);
+	uiDefButS(block, NUM, redraw,		"Cur:",		117+xoffs,95+yoffs,81,20, &coba->cur, 0.0, (float)(coba->tot-1), 0, 0, "Displays the active color from the colorband");
+	bt= uiDefBut(block, BUT, redraw,		"Del",		199+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Deletes the active position");
+	uiButSetFunc(bt, colorband_del_cb, coba, NULL);
+	uiDefButS(block, ROW, redraw,		 "E",		236+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 1.0, 0, 0, "Sets interpolation type 'Ease' (quadratic) ");
+	uiDefButS(block, ROW, redraw,		"C",		252+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 3.0, 0, 0, "Sets interpolation type Cardinal");
+	uiDefButS(block, ROW, redraw,		"L",		268+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 0.0, 0, 0, "Sets interpolation type Linear");
+	uiDefButS(block, ROW, redraw,		"S",		284+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 2.0, 0, 0, "Sets interpolation type B-Spline");
+
+	uiDefBut(block, BUT_COLORBAND, redraw, "", 	xoffs,65+yoffs,300,30, coba, 0, 0, 0, 0, "");
+	
+	cbd= coba->data + coba->cur;
+	
+	uiBlockBeginAlign(block);
+	bt= uiDefButF(block, NUM, redraw, "Pos",		xoffs,40+yoffs,110,20, &cbd->pos, 0.0, 1.0, 10, 0, "Sets the position of the active color");
+	uiButSetFunc(bt, colorband_pos_cb, coba, NULL);
+	uiDefButF(block, COL, redraw,		"",		xoffs,20+yoffs,110,20, &(cbd->r), 0, 0, 0, B_BANDCOL, "");
+	uiDefButF(block, NUMSLI, redraw,	"A ",	xoffs,yoffs,110,20, &cbd->a, 0.0, 1.0, 10, 0, "Sets the alpha value for this position");
+
+	uiBlockBeginAlign(block);
+	uiDefButF(block, NUMSLI, redraw,	"R ",	115+xoffs,40+yoffs,185,20, &cbd->r, 0.0, 1.0, B_BANDCOL, 0, "Sets the red value for the active color");
+	uiDefButF(block, NUMSLI, redraw,	"G ",	115+xoffs,20+yoffs,185,20, &cbd->g, 0.0, 1.0, B_BANDCOL, 0, "Sets the green value for the active color");
+	uiDefButF(block, NUMSLI, redraw,	"B ",	115+xoffs,yoffs,185,20, &cbd->b, 0.0, 1.0, B_BANDCOL, 0, "Sets the blue value for the active color");
+	uiBlockEndAlign(block);
+}
+
+void draw_colorband_buts_small(uiBlock *block, ColorBand *coba, rctf *butr, int event)
+{
+	CBData *cbd;
+	uiBut *bt;
+	float unit= (butr->xmax-butr->xmin)/14.0f;
+	float xs= butr->xmin;
+	
+	cbd= coba->data + coba->cur;
+	
+	uiBlockBeginAlign(block);
+	uiDefButF(block, COL, event,		"",			xs,butr->ymin+20.0f,2.0f*unit,20,				&(cbd->r), 0, 0, 0, B_BANDCOL, "");
+	uiDefButF(block, NUM, event,		"A:",		xs+2.0f*unit,butr->ymin+20.0f,4.0f*unit,20,	&(cbd->a), 0.0f, 1.0f, 10, 2, "");
+	bt= uiDefBut(block, BUT, event,	"Add",		xs+6.0f*unit,butr->ymin+20.0f,2.0f*unit,20,	NULL, 0, 0, 0, 0, "Adds a new color position to the colorband");
+	uiButSetFunc(bt, colorband_add_cb, coba, NULL);
+	bt= uiDefBut(block, BUT, event,	"Del",		xs+8.0f*unit,butr->ymin+20.0f,2.0f*unit,20,	NULL, 0, 0, 0, 0, "Deletes the active position");
+	uiButSetFunc(bt, colorband_del_cb, coba, NULL);
+	uiDefButS(block, ROW, event,		"E",		xs+10.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 1.0, 0, 0, "Sets interpolation type 'Ease' (quadratic) ");
+	uiDefButS(block, ROW, event,		"C",		xs+11.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 3.0, 0, 0, "Sets interpolation type Cardinal");
+	uiDefButS(block, ROW, event,		"L",		xs+12.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 0.0, 0, 0, "Sets interpolation type Linear");
+	uiDefButS(block, ROW, event,		"S",		xs+13.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 2.0, 0, 0, "Sets interpolation type B-Spline");
+	
+	uiDefBut(block, BUT_COLORBAND, event, "",		xs,butr->ymin,butr->xmax-butr->xmin,20.0f, coba, 0, 0, 0, 0, "");
+	uiBlockEndAlign(block);
+	
+}
+
 static void texture_panel_plugin(Tex *tex)
 {
 	uiBlock *block;
@@ -731,6 +840,87 @@ static void texture_panel_voronoi(Tex *tex)
 	uiDefButF(block, NUMSLI, B_TEXPRV, "W4: ", 10, 10, 150, 19, &tex->vn_w4, -2.0, 2.0, 10, 0, "Sets feature weight 4");
 }
 
+static void texture_panel_pointdensity_modify(Tex *tex)
+{
+	uiBlock *block;
+	PointDensity *pd;
+	short yco=PANEL_YMAX, ymid;
+	
+	block= uiNewBlock(&curarea->uiblocks, "texture_panel_pointdensity_modify", UI_EMBOSS, UI_HELV, curarea->win);
+	if(uiNewPanel(curarea, block, "Modifiers", "Texture", PANELX, PANELY, PANELW, PANELH+20)==0) return;
+	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+
+	if(tex->pd==NULL) {
+		tex->pd= BKE_add_pointdensity();
+	}
+	if(!tex->pd) return;
+	
+	if (pd->source == TEX_PD_PSYS) {
+		uiDefBut(block, LABEL, B_NOP, "Color & Intensity By:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+
+		uiBlockBeginAlign(block);
+		uiDefButS(block, MENU, B_TEXREDR_PRV, "Constant %x0|Particle Age %x1|Particle Speed %x2|Velocity -> RGB %x3|",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->color_source, 0.0, 0.0, 0, 0, "Particle Life: Lifetime mapped as 0.0 - 1.0 intensity, Velocity: XYZ velocity mapped as RGB colours");
+		if (ELEM(pd->color_source, TEX_PD_COLOR_PARTSPEED, TEX_PD_COLOR_PARTVEL)) {
+			uiDefButF(block, NUM, B_REDR, "Scale: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->speed_scale), 0.001, 100.0, 10, 2, "Multipler to bring particle speed within an acceptable range");
+		}
+		uiBlockEndAlign(block);
+		
+		yco-= 2*BUTH;
+		
+		if (ELEM(pd->color_source, TEX_PD_COLOR_PARTAGE, TEX_PD_COLOR_PARTSPEED)) {
+			rctf rect = {X2CLM1, X2CLM1+BUTW1, yco, yco};
+			if (tex->pd->coba == NULL) tex->pd->coba = add_colorband(1);
+			draw_colorband_buts_small(block, tex->pd->coba, &rect, B_TEXREDR_PRV);
+		} else {
+			/* spacer */
+			uiDefBut(block, LABEL, B_NOP, "",
+				X2CLM2, yco, BUTW2, BUTH*2, 0, 0, 0, 0, 0, "");
+		}
+		
+		if (!ELEM(pd->color_source, TEX_PD_COLOR_PARTSPEED, TEX_PD_COLOR_PARTVEL)) yco -= BUTH;
+	}
+	
+	ymid = yco -= YSPACE;
+	
+	uiDefButBitS(block, TOG, TEX_PD_TURBULENCE, B_REDR, "Turbulence",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->flag), 0, 0, 0, 0, "Add directed turbulence to the density estimation");
+	
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
+	if (pd->flag & TEX_PD_TURBULENCE) {
+		
+		uiDefButF(block, NUM, B_REDR, "Size: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 100.0, 10, 2, "Turbulence size");
+		uiDefButS(block, NUM, B_REDR, "Depth: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 100.0, 10, 2, "Turbulence depth");
+		uiDefButF(block, NUM, B_REDR, "Strength: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 100.0, 10, 2, "");
+		
+		uiBlockEndAlign(block);
+		
+		yco = ymid - BUTH - YSPACE;
+
+		uiDefBut(block, LABEL, B_NOP, "Noise Influence:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			
+		if (pd->source == TEX_PD_PSYS) {
+			uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Particle Age %x2|Time %x3",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
+		} else if (pd->source == TEX_PD_OBJECT) {
+			uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Time %x3",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
+		}
+	} else {
+		uiDefBut(block, LABEL, B_NOP, "",
+			X2CLM2, yco-=2*BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	}
+
+}
+
 static void texture_panel_pointdensity(Tex *tex)
 {
 	uiBlock *block;
@@ -738,102 +928,73 @@ static void texture_panel_pointdensity(Tex *tex)
 	short yco=PANEL_YMAX;
 	
 	block= uiNewBlock(&curarea->uiblocks, "texture_panel_pointdensity", UI_EMBOSS, UI_HELV, curarea->win);
-	if(uiNewPanel(curarea, block, "Point Density", "Texture", PANELX, PANELY, PANELW, PANELH+25)==0) return;
+	if(uiNewPanel(curarea, block, "Point Density", "Texture", PANELX, PANELY, PANELW, PANELH)==0) return;
 	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
 	
 	if(tex->pd==NULL) {
 		tex->pd= BKE_add_pointdensity();
 		tex->pd->object= OBACT;
 	}
-	if(tex->pd) {
-		pd= tex->pd;
+	if(!tex->pd) return;
+	pd= tex->pd;
 
-		uiDefBut(block, LABEL, B_NOP, "Density estimation:",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	uiDefBut(block, LABEL, B_NOP, "Density estimation:",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 
-		uiDefButF(block, NUM, B_REDR, "Radius: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
-		
-		yco -= YSPACE;
-		
-		uiDefBut(block, LABEL, B_NOP, "Falloff:",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
+	uiDefButF(block, NUM, B_REDR, "Radius: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
+	
+	yco -= YSPACE;
+	
+	uiDefBut(block, LABEL, B_NOP, "Falloff:",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
+	uiBlockBeginAlign(block);
+	uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Soft %x2|Constant %x3|Root %x4",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
+	if (pd->falloff_type == TEX_PD_FALLOFF_SOFT) {
+		uiDefButF(block, NUM, B_REDR, "Softness: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->falloff_softness), 1.0, 1024.0, 10, 2, "The intensity of the falloff");
+	}
+	uiBlockEndAlign(block);
+
+	yco = PANEL_YMAX;
+	
+	uiDefBut(block, LABEL, B_NOP, "Point data source:",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	
+	uiDefButS(block, MENU, B_TEXREDR_PRV, "Particle System %x0|Object Vertices %x1",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->source, 0.0, 0.0, 0, 0, "Source");
+	
+	yco -= YSPACE;
+	
+	if (pd->source == TEX_PD_PSYS) {
 		uiBlockBeginAlign(block);
-		uiDefButS(block, MENU, B_REDR, "Standard %x0|Smooth %x1|Soft %x2|Constant %x3|Root %x4",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->falloff_type, 0.0, 0.0, 0, 0, "Falloff type");
-		if (pd->falloff_type == TEX_PD_FALLOFF_SOFT) {
-			uiDefButF(block, NUM, B_REDR, "Softness: ",
-				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->falloff_softness), 1.0, 1024.0, 10, 2, "The intensity of the falloff");
+		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object that has the particle system");
+			
+		if (pd->object && pd->object->particlesystem.first) {
+			uiDefButS(block, NUM, B_REDR, "PSys:", 
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->psysindex), 1, 10, 10, 3, "Particle system number in the object");
 		}
 		uiBlockEndAlign(block);
 		
 		yco -= YSPACE;
 		
-		
-		uiBlockBeginAlign(block);
-		uiDefButBitS(block, TOG, TEX_PD_TURBULENCE, B_REDR, "Turbulence",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->flag), 0, 0, 0, 0, "Add directed turbulence to the density estimation");
-			
-		if (pd->flag & TEX_PD_TURBULENCE) {
-			
-			uiDefButF(block, NUM, B_REDR, "Size: ",
-				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 100.0, 10, 2, "Turbulence size");
-			uiDefButS(block, NUM, B_REDR, "Depth: ",
-				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 100.0, 10, 2, "Turbulence depth");
-			uiDefButF(block, NUM, B_REDR, "Strength: ",
-				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 100.0, 10, 2, "");
-			
-			uiBlockEndAlign(block);
-			
-			yco -= YSPACE;
-
-			if (pd->source == TEX_PD_PSYS) {
-				uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Time %x2",
-					X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
-			}
-		}
-		uiBlockEndAlign(block);
-
-		yco = PANEL_YMAX;
-		
-		uiDefBut(block, LABEL, B_NOP, "Point data source:",
+		uiDefBut(block, LABEL, B_NOP, "Cache particles in:",
 			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-		
-		uiDefButS(block, MENU, B_TEXREDR_PRV, "Particle System %x0|Object Vertices %x1",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->source, 0.0, 0.0, 0, 0, "Source");
+		uiDefButS(block, MENU, B_TEXREDR_PRV, "Emit Object Location %x0|Emit Object Space %x1|Global Space %x2",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->psys_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache particles in");
+	}
+	else if (pd->source == TEX_PD_OBJECT) {
+		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object to render as points");
 		
 		yco -= YSPACE;
 		
-		if (pd->source == TEX_PD_PSYS) {
-			uiBlockBeginAlign(block);
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object that has the particle system");
-				
-			if (pd->object && pd->object->particlesystem.first) {
-				uiDefButS(block, NUM, B_REDR, "PSys:", 
-					X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->psysindex), 1, 10, 10, 3, "Particle system number in the object");
-			}
-			uiBlockEndAlign(block);
-			
-			yco -= YSPACE;
-			
-			uiDefBut(block, LABEL, B_NOP, "Cache particles in:",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-			uiDefButS(block, MENU, B_TEXREDR_PRV, "Emit Object Location %x0|Emit Object Space %x1|Global Space %x2",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->psys_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache particles in");
-				
-		}
-		else if (pd->source == TEX_PD_OBJECT) {
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR, "Ob:",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->object), "Object to render as points");
-			
-			yco -= YSPACE;
-			
-			uiDefBut(block, LABEL, B_NOP, "Cache vertices in:",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-			uiDefButS(block, MENU, B_TEXREDR_PRV, "Object Location %x0|Object Space %x1|Global Space %x2",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->ob_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache vertices in");
-		}
+		uiDefBut(block, LABEL, B_NOP, "Cache vertices in:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefButS(block, MENU, B_TEXREDR_PRV, "Object Location %x0|Object Space %x1|Global Space %x2",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &pd->ob_cache_space, 0.0, 0.0, 0, 0, "Co-ordinate system to cache vertices in");
 	}
 
 }
@@ -1514,115 +1675,6 @@ static void texture_panel_envmap(Tex *tex)
 	}
 }
 
-static void colorband_pos_cb(void *coba_v, void *unused_v)
-{
-	ColorBand *coba= coba_v;
-	int a;
-	
-	if(coba->tot<2) return;
-	
-	for(a=0; a<coba->tot; a++) coba->data[a].cur= a;
-	qsort(coba->data, coba->tot, sizeof(CBData), vergcband);
-	for(a=0; a<coba->tot; a++) {
-		if(coba->data[a].cur==coba->cur) {
-			if(coba->cur!=a) addqueue(curarea->win, REDRAW, 0);	/* button cur */
-			coba->cur= a;
-			break;
-		}
-	}
-}
-
-static void colorband_add_cb(void *coba_v, void *unused_v)
-{
-	ColorBand *coba= coba_v;
-	
-	if(coba->tot < MAXCOLORBAND-1) coba->tot++;
-	coba->cur= coba->tot-1;
-	
-	colorband_pos_cb(coba, NULL);
-	BIF_undo_push("Add colorband");
-	
-}
-
-static void colorband_del_cb(void *coba_v, void *unused_v)
-{
-	ColorBand *coba= coba_v;
-	int a;
-	
-	if(coba->tot<2) return;
-	
-	for(a=coba->cur; a<coba->tot; a++) {
-		coba->data[a]= coba->data[a+1];
-	}
-	if(coba->cur) coba->cur--;
-	coba->tot--;
-	
-	BIF_undo_push("Delete colorband");
-	BIF_preview_changed(ID_TE);
-}
-
-
-/* offset aligns from bottom, standard width 300, height 115 */
-static void draw_colorband_buts(uiBlock *block, ColorBand *coba, int xoffs, int yoffs, int redraw)
-{
-	CBData *cbd;
-	uiBut *bt;
-	
-	if(coba==NULL) return;
-	
-	bt= uiDefBut(block, BUT, redraw,	"Add",		80+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Adds a new color position to the colorband");
-	uiButSetFunc(bt, colorband_add_cb, coba, NULL);
-	uiDefButS(block, NUM, redraw,		"Cur:",		117+xoffs,95+yoffs,81,20, &coba->cur, 0.0, (float)(coba->tot-1), 0, 0, "Displays the active color from the colorband");
-	bt= uiDefBut(block, BUT, redraw,		"Del",		199+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Deletes the active position");
-	uiButSetFunc(bt, colorband_del_cb, coba, NULL);
-	uiDefButS(block, ROW, redraw,		 "E",		236+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 1.0, 0, 0, "Sets interpolation type 'Ease' (quadratic) ");
-	uiDefButS(block, ROW, redraw,		"C",		252+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 3.0, 0, 0, "Sets interpolation type Cardinal");
-	uiDefButS(block, ROW, redraw,		"L",		268+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 0.0, 0, 0, "Sets interpolation type Linear");
-	uiDefButS(block, ROW, redraw,		"S",		284+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 2.0, 0, 0, "Sets interpolation type B-Spline");
-
-	uiDefBut(block, BUT_COLORBAND, redraw, "", 	xoffs,65+yoffs,300,30, coba, 0, 0, 0, 0, "");
-	
-	cbd= coba->data + coba->cur;
-	
-	uiBlockBeginAlign(block);
-	bt= uiDefButF(block, NUM, redraw, "Pos",		xoffs,40+yoffs,110,20, &cbd->pos, 0.0, 1.0, 10, 0, "Sets the position of the active color");
-	uiButSetFunc(bt, colorband_pos_cb, coba, NULL);
-	uiDefButF(block, COL, redraw,		"",		xoffs,20+yoffs,110,20, &(cbd->r), 0, 0, 0, B_BANDCOL, "");
-	uiDefButF(block, NUMSLI, redraw,	"A ",	xoffs,yoffs,110,20, &cbd->a, 0.0, 1.0, 10, 0, "Sets the alpha value for this position");
-
-	uiBlockBeginAlign(block);
-	uiDefButF(block, NUMSLI, redraw,	"R ",	115+xoffs,40+yoffs,185,20, &cbd->r, 0.0, 1.0, B_BANDCOL, 0, "Sets the red value for the active color");
-	uiDefButF(block, NUMSLI, redraw,	"G ",	115+xoffs,20+yoffs,185,20, &cbd->g, 0.0, 1.0, B_BANDCOL, 0, "Sets the green value for the active color");
-	uiDefButF(block, NUMSLI, redraw,	"B ",	115+xoffs,yoffs,185,20, &cbd->b, 0.0, 1.0, B_BANDCOL, 0, "Sets the blue value for the active color");
-	uiBlockEndAlign(block);
-}
-
-void draw_colorband_buts_small(uiBlock *block, ColorBand *coba, rctf *butr, int event)
-{
-	CBData *cbd;
-	uiBut *bt;
-	float unit= (butr->xmax-butr->xmin)/14.0f;
-	float xs= butr->xmin;
-	
-	cbd= coba->data + coba->cur;
-	
-	uiBlockBeginAlign(block);
-	uiDefButF(block, COL, event,		"",			xs,butr->ymin+20.0f,2.0f*unit,20,				&(cbd->r), 0, 0, 0, B_BANDCOL, "");
-	uiDefButF(block, NUM, event,		"A:",		xs+2.0f*unit,butr->ymin+20.0f,4.0f*unit,20,	&(cbd->a), 0.0f, 1.0f, 10, 2, "");
-	bt= uiDefBut(block, BUT, event,	"Add",		xs+6.0f*unit,butr->ymin+20.0f,2.0f*unit,20,	NULL, 0, 0, 0, 0, "Adds a new color position to the colorband");
-	uiButSetFunc(bt, colorband_add_cb, coba, NULL);
-	bt= uiDefBut(block, BUT, event,	"Del",		xs+8.0f*unit,butr->ymin+20.0f,2.0f*unit,20,	NULL, 0, 0, 0, 0, "Deletes the active position");
-	uiButSetFunc(bt, colorband_del_cb, coba, NULL);
-	uiDefButS(block, ROW, event,		"E",		xs+10.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 1.0, 0, 0, "Sets interpolation type 'Ease' (quadratic) ");
-	uiDefButS(block, ROW, event,		"C",		xs+11.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 3.0, 0, 0, "Sets interpolation type Cardinal");
-	uiDefButS(block, ROW, event,		"L",		xs+12.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 0.0, 0, 0, "Sets interpolation type Linear");
-	uiDefButS(block, ROW, event,		"S",		xs+13.0f*unit,butr->ymin+20.0f,unit,20,		&coba->ipotype, 5.0, 2.0, 0, 0, "Sets interpolation type B-Spline");
-	
-	uiDefBut(block, BUT_COLORBAND, event, "",		xs,butr->ymin,butr->xmax-butr->xmin,20.0f, coba, 0, 0, 0, 0, "");
-	uiBlockEndAlign(block);
-	
-}
-
 static void texture_panel_colors(Tex *tex)
 {
 	uiBlock *block;
@@ -4833,6 +4885,7 @@ void texture_panels()
 				break;
 			case TEX_POINTDENSITY:
 				texture_panel_pointdensity(tex);
+				texture_panel_pointdensity_modify(tex);
 				break;
 			}
 		}

From 3b2f996c25e911fb6497fd45b3b4a5ab5e5609ac Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 10 Nov 2008 00:14:35 +0000
Subject: [PATCH 057/577] Point Density

* Fixed a stupid crash caused by last commit that worked fine on the mac
(but never should have...)

* Fix for using child particles with the new particle age color options
---
 source/blender/blenkernel/intern/texture.c    |   2 +
 .../render/intern/source/pointdensity.c       |  14 +-
 source/blender/src/buttons_shading.c          | 162 +++++++++---------
 3 files changed, 94 insertions(+), 84 deletions(-)

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 76ef6bdb4e8..1bb4ef3eeff 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -873,6 +873,7 @@ PointDensity *BKE_add_pointdensity(void)
 	PointDensity *pd;
 	
 	pd= MEM_callocN(sizeof(PointDensity), "pointdensity");
+	pd->flag = 0;
 	pd->radius = 0.3f;
 	pd->falloff_type = TEX_PD_FALLOFF_STD;
 	pd->falloff_softness = 2.0;
@@ -886,6 +887,7 @@ PointDensity *BKE_add_pointdensity(void)
 	pd->coba = add_colorband(1);
 	pd->speed_scale = 1.0f;
 	pd->totpoints = 0;
+	pd->coba = add_colorband(1);
 	return pd;
 } 
 
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index db3e57e0b79..af2a7edae06 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -71,7 +71,7 @@ static int point_data_used(PointDensity *pd)
 /* additional data stored alongside the point density BVH, 
  * accessible by point index number to retrieve other information 
  * such as particle velocity or lifetime */
-static void make_point_data(PointDensity *pd, int total_particles, int point_data_used)
+static void alloc_point_data(PointDensity *pd, int total_particles, int point_data_used)
 {
 	int data_size = 0;
 	
@@ -123,7 +123,7 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 	psys->lattice=psys_get_lattice(ob,psys);
 	
 	pd->point_tree = BLI_bvhtree_new(total_particles, 0.0, 4, 6);
-	make_point_data(pd, total_particles, data_used);
+	alloc_point_data(pd, total_particles, data_used);
 	pd->totpoints = total_particles;
 	if (data_used & POINT_DATA_VEL) offset = pd->totpoints*3;
 	
@@ -155,7 +155,15 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa
 				pd->point_data[i*3 + 2] = state.vel[2];
 			} 
 			if (data_used & POINT_DATA_LIFE) {
-				float pa_time = (cfra - pa->time)/pa->lifetime;
+				float pa_time;
+				
+				if (i < psys->totpart) {
+					pa_time = (cfra - pa->time)/pa->lifetime;
+				} else {
+					ChildParticle *cpa= (psys->child + i) - psys->totpart;
+					pa_time = psys_get_child_time(psys, cpa, cfra);
+				}
+				
 				pd->point_data[offset + i] = pa_time;
 			}
 		}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index b9ea4ebe9d6..5ed39764af0 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -840,87 +840,6 @@ static void texture_panel_voronoi(Tex *tex)
 	uiDefButF(block, NUMSLI, B_TEXPRV, "W4: ", 10, 10, 150, 19, &tex->vn_w4, -2.0, 2.0, 10, 0, "Sets feature weight 4");
 }
 
-static void texture_panel_pointdensity_modify(Tex *tex)
-{
-	uiBlock *block;
-	PointDensity *pd;
-	short yco=PANEL_YMAX, ymid;
-	
-	block= uiNewBlock(&curarea->uiblocks, "texture_panel_pointdensity_modify", UI_EMBOSS, UI_HELV, curarea->win);
-	if(uiNewPanel(curarea, block, "Modifiers", "Texture", PANELX, PANELY, PANELW, PANELH+20)==0) return;
-	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
-
-	if(tex->pd==NULL) {
-		tex->pd= BKE_add_pointdensity();
-	}
-	if(!tex->pd) return;
-	
-	if (pd->source == TEX_PD_PSYS) {
-		uiDefBut(block, LABEL, B_NOP, "Color & Intensity By:",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-
-		uiBlockBeginAlign(block);
-		uiDefButS(block, MENU, B_TEXREDR_PRV, "Constant %x0|Particle Age %x1|Particle Speed %x2|Velocity -> RGB %x3|",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->color_source, 0.0, 0.0, 0, 0, "Particle Life: Lifetime mapped as 0.0 - 1.0 intensity, Velocity: XYZ velocity mapped as RGB colours");
-		if (ELEM(pd->color_source, TEX_PD_COLOR_PARTSPEED, TEX_PD_COLOR_PARTVEL)) {
-			uiDefButF(block, NUM, B_REDR, "Scale: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->speed_scale), 0.001, 100.0, 10, 2, "Multipler to bring particle speed within an acceptable range");
-		}
-		uiBlockEndAlign(block);
-		
-		yco-= 2*BUTH;
-		
-		if (ELEM(pd->color_source, TEX_PD_COLOR_PARTAGE, TEX_PD_COLOR_PARTSPEED)) {
-			rctf rect = {X2CLM1, X2CLM1+BUTW1, yco, yco};
-			if (tex->pd->coba == NULL) tex->pd->coba = add_colorband(1);
-			draw_colorband_buts_small(block, tex->pd->coba, &rect, B_TEXREDR_PRV);
-		} else {
-			/* spacer */
-			uiDefBut(block, LABEL, B_NOP, "",
-				X2CLM2, yco, BUTW2, BUTH*2, 0, 0, 0, 0, 0, "");
-		}
-		
-		if (!ELEM(pd->color_source, TEX_PD_COLOR_PARTSPEED, TEX_PD_COLOR_PARTVEL)) yco -= BUTH;
-	}
-	
-	ymid = yco -= YSPACE;
-	
-	uiDefButBitS(block, TOG, TEX_PD_TURBULENCE, B_REDR, "Turbulence",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->flag), 0, 0, 0, 0, "Add directed turbulence to the density estimation");
-	
-	yco -= YSPACE;
-	
-	uiBlockBeginAlign(block);
-	if (pd->flag & TEX_PD_TURBULENCE) {
-		
-		uiDefButF(block, NUM, B_REDR, "Size: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 100.0, 10, 2, "Turbulence size");
-		uiDefButS(block, NUM, B_REDR, "Depth: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 100.0, 10, 2, "Turbulence depth");
-		uiDefButF(block, NUM, B_REDR, "Strength: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 100.0, 10, 2, "");
-		
-		uiBlockEndAlign(block);
-		
-		yco = ymid - BUTH - YSPACE;
-
-		uiDefBut(block, LABEL, B_NOP, "Noise Influence:",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-			
-		if (pd->source == TEX_PD_PSYS) {
-			uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Particle Age %x2|Time %x3",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
-		} else if (pd->source == TEX_PD_OBJECT) {
-			uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Time %x3",
-				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
-		}
-	} else {
-		uiDefBut(block, LABEL, B_NOP, "",
-			X2CLM2, yco-=2*BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-	}
-
-}
-
 static void texture_panel_pointdensity(Tex *tex)
 {
 	uiBlock *block;
@@ -999,6 +918,87 @@ static void texture_panel_pointdensity(Tex *tex)
 
 }
 
+static void texture_panel_pointdensity_modify(Tex *tex)
+{
+	uiBlock *block;
+	PointDensity *pd;
+	short yco=PANEL_YMAX, ymid;
+	
+	block= uiNewBlock(&curarea->uiblocks, "texture_panel_pointdensity_modify", UI_EMBOSS, UI_HELV, curarea->win);
+	if(uiNewPanel(curarea, block, "Modifiers", "Texture", PANELX, PANELY, PANELW, PANELH+20)==0) return;
+	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+
+	if(tex->pd==NULL) {
+		tex->pd= BKE_add_pointdensity();
+	}
+	if(!tex->pd) return;
+	pd= tex->pd;
+	
+	if (pd->source == TEX_PD_PSYS) {
+		uiDefBut(block, LABEL, B_NOP, "Color & Intensity By:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+
+		uiBlockBeginAlign(block);
+		uiDefButS(block, MENU, B_TEXREDR_PRV, "Constant %x0|Particle Age %x1|Particle Speed %x2|Velocity -> RGB %x3|",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &pd->color_source, 0.0, 0.0, 0, 0, "Particle Life: Lifetime mapped as 0.0 - 1.0 intensity, Velocity: XYZ velocity mapped as RGB colours");
+		if (ELEM(pd->color_source, TEX_PD_COLOR_PARTSPEED, TEX_PD_COLOR_PARTVEL)) {
+			uiDefButF(block, NUM, B_REDR, "Scale: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->speed_scale), 0.001, 100.0, 10, 2, "Multipler to bring particle speed within an acceptable range");
+		}
+		uiBlockEndAlign(block);
+		
+		yco-= 2*BUTH;
+		
+		
+		if (ELEM(pd->color_source, TEX_PD_COLOR_PARTAGE, TEX_PD_COLOR_PARTSPEED)) {
+			rctf rect = {X2CLM1, X2CLM1+BUTW1, yco, yco};
+			if (pd->coba == NULL) pd->coba = add_colorband(1);
+			draw_colorband_buts_small(block, pd->coba, &rect, B_TEXREDR_PRV);
+		} else {
+			uiDefBut(block, LABEL, B_NOP, "",
+				X2CLM2, yco, BUTW2, BUTH*2, 0, 0, 0, 0, 0, "");
+		}
+		
+		if (!ELEM(pd->color_source, TEX_PD_COLOR_PARTSPEED, TEX_PD_COLOR_PARTVEL)) yco -= BUTH;
+	}
+	
+	ymid = yco -= YSPACE;
+	
+	uiDefButBitS(block, TOG, TEX_PD_TURBULENCE, B_REDR, "Turbulence",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->flag), 0, 0, 0, 0, "Add directed turbulence to the density estimation");
+	
+	yco -= YSPACE;
+	
+	uiBlockBeginAlign(block);
+	if (pd->flag & TEX_PD_TURBULENCE) {
+		
+		uiDefButF(block, NUM, B_REDR, "Size: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 100.0, 10, 2, "Turbulence size");
+		uiDefButS(block, NUM, B_REDR, "Depth: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 100.0, 10, 2, "Turbulence depth");
+		uiDefButF(block, NUM, B_REDR, "Strength: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 100.0, 10, 2, "");
+		
+		uiBlockEndAlign(block);
+		
+		yco = ymid - BUTH - YSPACE;
+
+		uiDefBut(block, LABEL, B_NOP, "Noise Influence:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			
+		if (pd->source == TEX_PD_PSYS) {
+			uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Velocity %x1|Particle Age %x2|Time %x3",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
+		} else if (pd->source == TEX_PD_OBJECT) {
+			uiDefButS(block, MENU, B_REDR, "Noise Influence %t|Static %x0|Time %x3",
+				X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_influence), 0.0, 0.0, 0, 0, "Noise Influence");
+		}
+	} else {
+		uiDefBut(block, LABEL, B_NOP, "",
+			X2CLM2, yco-=2*BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+	}
+
+}
 
 static char *layer_menu(RenderResult *rr, short *curlay)
 {

From bf747a30af000c024ecb9e98a295a54dd286d0b3 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 11 Nov 2008 23:24:10 +0000
Subject: [PATCH 058/577] * Added a button to the volume material controls
 'Alpha' to generate an alpha channel based on the volume's transmission
 properties, allowing you to use it in comp etc.

I'd rather not have this button at all, and make it just work properly
by default, however it causes problems with overlapping volumes when
'premul' is on (stoopid thing..) so for the time being, there's the
button. I'll try and fix this up later on when I have more time.
---
 source/blender/makesdna/DNA_material_types.h     |  1 +
 source/blender/render/intern/source/volumetric.c | 16 ++++++++++++----
 source/blender/src/buttons_shading.c             |  6 ++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 66f23c7905d..f332537e9a8 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -359,6 +359,7 @@ typedef struct Material {
 #define MA_VOL_ATTENUATED	2
 #define MA_VOL_RECVSHADOW	4
 #define MA_VOL_PRECACHESHADING	8
+#define MA_VOL_USEALPHA		16
 
 /* vol_phasefunc_type */
 #define MA_VOL_PH_ISOTROPIC		0
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 02ebbd83c31..52d23de45ff 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -656,8 +656,12 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
 		
-		//if (col[3] > 1.0f)
-		col[3] = 1.0f;
+		if (shi->mat->vol_shadeflag & MA_VOL_USEALPHA) {
+			if (col[3] > 1.0f)
+				col[3] = 1.0f;
+		}
+		else
+			col[3] = 1.0f;
 		shr->combined[3] = col[3];
 		shr->alpha = col[3];
 		
@@ -683,8 +687,12 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 		shr->combined[1] = col[1];
 		shr->combined[2] = col[2];
 		
-		//if (col[3] > 1.0f) 
-		col[3] = 1.0f;
+		if (shi->mat->vol_shadeflag & MA_VOL_USEALPHA) {
+			if (col[3] > 1.0f)
+				col[3] = 1.0f;
+		}
+		else
+			col[3] = 1.0f;
 		shr->combined[3] = col[3];
 		shr->alpha = col[3];
 		
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 5ed39764af0..3e5f5305033 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4447,6 +4447,12 @@ static void material_panel_material_volume(Material *ma)
 		uiBlockEndAlign(block);
 	}
 	
+	yco -= YSPACE;
+	
+	uiDefButBitS(block, TOG, MA_VOL_USEALPHA, B_MATPRV, "Alpha",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Generate an alpha channel (causes problems with Premul)");
+	
+	
 	/*uiDefButBitS(block, TOG, MA_VOL_RECVSHADOW, B_MATPRV, "Receive Shadows",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Receive shadows from external objects");
 	*/

From a2da0911a6da23dc420f7a25fc258ae048913b7a Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 13 Nov 2008 10:43:02 +0000
Subject: [PATCH 059/577] * Fixed a float -> int conversion rounding error in
 volume rendering, which was manifesting in little dark dots

---
 source/blender/render/intern/source/volumetric.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 52d23de45ff..1c0828d868c 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -335,7 +335,7 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	vol_get_absorption(shi, absorb_col, co);
 
 	dist = VecLenf(co, endco);
-	nsteps = (int)ceil(dist / stepsize);
+	nsteps = (int)((dist / stepsize) + 0.5);
 	
 	/* trigger for recalculating density */
 	if (density < -0.001f) density = vol_get_density(shi, co);
@@ -491,7 +491,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	tr[0] = tr[1] = tr[2] = 1.0f;
 	
 	/* ray marching */
-	nsteps = (int)ceil(VecLenf(co, endco) / stepsize);
+	nsteps = (int)((VecLenf(co, endco) / stepsize) + 0.5);
 	
 	VecSubf(vec, endco, co);
 	VECCOPY(stepvec, vec);

From 8d5c14b20d61d990691ccaecefc3b5cbce449ef5 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 14 Nov 2008 06:01:06 +0000
Subject: [PATCH 060/577] Volume rendering:

* Use a slightly better (but still not exact) approximation for the view
vector when pre-shading the light cache. This still doesn't give exactly the
same results as non-light-cache shading, but it's better. Will investigate
getting a better view vector when there's more time - or if anyone has a
simple formula to derive shi->view from shi->co that would be great to
hear about too :)
---
 source/blender/render/intern/source/volumetric.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 1c0828d868c..83c25ad68c6 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -984,7 +984,7 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 			
 			for (z=0; z < res; z++) {
 				co[2] = bbmin[2] + (voxel[2] * z);
-			
+				
 				time= PIL_check_seconds_timer();
 				i++;
 			
@@ -1012,6 +1012,9 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
 					continue;
 				}
+				
+				VECCOPY(shi.view, co);
+				Normalize(shi.view);
 				density = vol_get_density(&shi, co);
 				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
 			

From e6a903c06e24ce9afd7b6e3de70e36fa450171d6 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 15 Nov 2008 04:16:46 +0000
Subject: [PATCH 061/577] cleaned some code and split volume precaching into a
 new file

---
 .../render/intern/include/volume_precache.h   |  30 +
 .../render/intern/include/volumetric.h        |  17 +-
 .../render/intern/source/convertblender.c     |   1 +
 .../render/intern/source/volume_precache.c    | 356 +++++++++++
 .../blender/render/intern/source/volumetric.c | 566 ++++--------------
 5 files changed, 509 insertions(+), 461 deletions(-)
 create mode 100644 source/blender/render/intern/include/volume_precache.h
 create mode 100644 source/blender/render/intern/source/volume_precache.c

diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
new file mode 100644
index 00000000000..7a719840f48
--- /dev/null
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -0,0 +1,30 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+void volume_precache(Render *re);
+void free_volume_precache(Render *re);
\ No newline at end of file
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index fb87035145f..a69238f54b3 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -21,12 +21,23 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): Farsthary (Raul FHernandez), Matt Ebb.
+ * Contributor(s): Matt Ebb.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
+float vol_get_stepsize(struct ShadeInput *shi, int context);
+float vol_get_density(struct ShadeInput *shi, float *co);
+void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density);
+
 void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr);
 void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is);
-void volume_precache(Render *re);
-void free_volume_precache(Render *re);
\ No newline at end of file
+
+#define STEPSIZE_VIEW	0
+#define STEPSIZE_SHADE	1
+
+#define VOL_IS_BACKFACE			1
+#define VOL_IS_SAMEMATERIAL		2
+
+#define VOL_BOUNDS_DEPTH	0
+#define VOL_BOUNDS_SS		1
\ No newline at end of file
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 45e934e5273..b9b151ab9fd 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -113,6 +113,7 @@
 #include "shading.h"
 #include "strand.h"
 #include "texture.h"
+#include "volume_precache.h"
 #include "sss.h"
 #include "strand.h"
 #include "zbuf.h"
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
new file mode 100644
index 00000000000..5b43aa8f935
--- /dev/null
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -0,0 +1,356 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <float.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+
+#include "PIL_time.h"
+
+#include "RE_shader_ext.h"
+#include "RE_raytrace.h"
+
+#include "DNA_material_types.h"
+
+#include "render_types.h"
+#include "renderdatabase.h"
+#include "volumetric.h"
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
+/* only to be used here in this file, it's for speed */
+extern struct Render R;
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+
+/* Recursive test for intersections, from a point inside the mesh, to outside
+ * Number of intersections (depth) determine if a point is inside or outside the mesh */
+int intersect_outside_volume(RayTree *tree, Isect *isect, float *offset, int limit, int depth)
+{
+	if (limit == 0) return depth;
+	
+	if (RE_ray_tree_intersect(tree, isect)) {
+		float hitco[3];
+		
+		hitco[0] = isect->start[0] + isect->labda*isect->vec[0];
+		hitco[1] = isect->start[1] + isect->labda*isect->vec[1];
+		hitco[2] = isect->start[2] + isect->labda*isect->vec[2];
+		VecAddf(isect->start, hitco, offset);
+
+		return intersect_outside_volume(tree, isect, offset, limit-1, depth+1);
+	} else {
+		return depth;
+	}
+}
+
+/* Uses ray tracing to check if a point is inside or outside an ObjectInstanceRen */
+int point_inside_obi(RayTree *tree, ObjectInstanceRen *obi, float *co)
+{
+	float maxsize = RE_ray_tree_max_size(tree);
+	Isect isect;
+	float vec[3] = {0.0f,0.0f,1.0f};
+	int final_depth=0, depth=0, limit=20;
+	
+	/* set up the isect */
+	memset(&isect, 0, sizeof(isect));
+	VECCOPY(isect.start, co);
+	isect.end[0] = co[0] + vec[0] * maxsize;
+	isect.end[1] = co[1] + vec[1] * maxsize;
+	isect.end[2] = co[2] + vec[2] * maxsize;
+	
+	/* and give it a little offset to prevent self-intersections */
+	VecMulf(vec, 1e-5);
+	VecAddf(isect.start, isect.start, vec);
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.face_last= NULL;
+	isect.lay= -1;
+	
+	final_depth = intersect_outside_volume(tree, &isect, vec, limit, depth);
+	
+	/* even number of intersections: point is outside
+	 * odd number: point is inside */
+	if (final_depth % 2 == 0) return 0;
+	else return 1;
+}
+
+static int inside_check_func(Isect *is, int ob, RayFace *face)
+{
+	return 1;
+}
+static void vlr_face_coords(RayFace *face, float **v1, float **v2, float **v3, float **v4)
+{
+	VlakRen *vlr= (VlakRen*)face;
+
+	*v1 = (vlr->v1)? vlr->v1->co: NULL;
+	*v2 = (vlr->v2)? vlr->v2->co: NULL;
+	*v3 = (vlr->v3)? vlr->v3->co: NULL;
+	*v4 = (vlr->v4)? vlr->v4->co: NULL;
+}
+
+RayTree *create_raytree_obi(ObjectInstanceRen *obi, float *bbmin, float *bbmax)
+{
+	int v;
+	VlakRen *vlr= NULL;
+	
+	/* create empty raytree */
+	RayTree *tree = RE_ray_tree_create(64, obi->obr->totvlak, bbmin, bbmax,
+		vlr_face_coords, inside_check_func, NULL, NULL);
+	
+	/* fill it with faces */
+	for(v=0; v<obi->obr->totvlak; v++) {
+		if((v & 255)==0)
+			vlr= obi->obr->vlaknodes[v>>8].vlak;
+		else
+			vlr++;
+	
+		RE_ray_tree_add_face(tree, 0, vlr);
+	}
+	
+	RE_ray_tree_done(tree);
+	
+	return tree;
+}
+
+static float get_avg_surrounds(float *cache, int res, int res_2, int res_3, int rgb, int xx, int yy, int zz)
+{
+	int x, y, z, x_, y_, z_;
+	int added=0;
+	float tot=0.0f;
+	int i;
+	
+	for (x=-1; x <= 1; x++) {
+		x_ = xx+x;
+		if (x_ >= 0 && x_ <= res-1) {
+		
+			for (y=-1; y <= 1; y++) {
+				y_ = yy+y;
+				if (y_ >= 0 && y_ <= res-1) {
+				
+					for (z=-1; z <= 1; z++) {
+						z_ = zz+z;
+						if (z_ >= 0 && z_ <= res-1) {
+						
+							i = rgb*res_3 + x_*res_2 + y_*res + z_;
+							if (cache[i] > 0.0f) {
+								tot += cache[i];
+								added++;
+							}
+							
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	tot /= added;
+	
+	return ((added>0)?tot:0.0f);
+}
+
+/* function to filter the edges of the light cache, where there was no volume originally.
+ * For each voxel which was originally external to the mesh, it finds the average values of
+ * the surrounding internal voxels and sets the original external voxel to that average amount.
+ * Works almost a bit like a 'dilate' filter */
+static void lightcache_filter(float *cache, int res)
+{
+	int x, y, z, rgb;
+	int res_2, res_3;
+	int i;
+	
+	res_2 = res*res;
+	res_3 = res*res*res;
+
+	for (x=0; x < res; x++) {
+		for (y=0; y < res; y++) {
+			for (z=0; z < res; z++) {
+				for (rgb=0; rgb < 3; rgb++) {
+					i = rgb*res_3 + x*res_2 + y*res + z;
+
+					/* trigger for outside mesh */
+					if (cache[i] < 0.5f) cache[i] = get_avg_surrounds(cache, res, res_2, res_3, rgb, x, y, z);
+				}
+			}
+		}
+	}
+}
+
+/* Precache a volume into a 3D voxel grid.
+ * The voxel grid is stored in the ObjectInstanceRen, 
+ * in camera space, aligned with the ObjectRen's bounding box.
+ * Resolution is defined by the user.
+ */
+void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
+{
+	int x, y, z;
+
+	float co[3], voxel[3], scatter_col[3];
+	ShadeInput shi;
+	float view[3] = {0.0,0.0,-1.0};
+	float density;
+	float stepsize;
+	
+	float resf, res_3f;
+	int res_2, res_3;
+	
+	float i = 1.0f;
+	double time, lasttime= PIL_check_seconds_timer();
+	const int res = ma->vol_precache_resolution;
+	RayTree *tree;
+	
+	R = *re;
+
+	/* create a raytree with just the faces of the instanced ObjectRen, 
+	 * used for checking if the cached point is inside or outside. */
+	tree = create_raytree_obi(obi, bbmin, bbmax);
+	if (!tree) return;
+
+	/* Need a shadeinput to calculate scattering */
+	memset(&shi, 0, sizeof(ShadeInput)); 
+	shi.depth= 1;
+	shi.mask= 1;
+	shi.mat = ma;
+	shi.vlr = NULL;
+	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
+	shi.har= shi.mat->har;
+	shi.obi= obi;
+	shi.obr= obi->obr;
+	shi.lay = re->scene->lay;
+	VECCOPY(shi.view, view);
+	
+	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
+
+	resf = (float)res;
+	res_2 = res*res;
+	res_3 = res*res*res;
+	res_3f = (float)res_3;
+	
+	VecSubf(voxel, bbmax, bbmin);
+	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
+		return;
+	VecMulf(voxel, 1.0f/res);
+	
+	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
+	
+	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
+	 *
+	 * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
+	 * I'm guessing the memory alignment may work out better this way for the purposes
+	 * of doing linear interpolation, but I haven't actually tested this theory! :)
+	 */
+	for (x=0; x < res; x++) {
+		co[0] = bbmin[0] + (voxel[0] * x);
+		
+		for (y=0; y < res; y++) {
+			co[1] = bbmin[1] + (voxel[1] * y);
+			
+			for (z=0; z < res; z++) {
+				co[2] = bbmin[2] + (voxel[2] * z);
+			
+				time= PIL_check_seconds_timer();
+				i++;
+			
+				/* display progress every second */
+				if(re->test_break()) {
+					if(tree) {
+						RE_ray_tree_free(tree);
+						tree= NULL;
+					}
+					return;
+				}
+				if(time-lasttime>1.0f) {
+					char str[64];
+					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
+					re->i.infostr= str;
+					re->stats_draw(&re->i);
+					re->i.infostr= NULL;
+					lasttime= time;
+				}
+				
+				/* don't bother if the point is not inside the volume mesh */
+				if (!point_inside_obi(tree, obi, co)) {
+					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
+					continue;
+				}
+				density = vol_get_density(&shi, co);
+				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
+			
+				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
+				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
+				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
+			}
+		}
+	}
+
+	if(tree) {
+		RE_ray_tree_free(tree);
+		tree= NULL;
+	}
+	
+	lightcache_filter(obi->volume_precache, res);
+
+}
+
+/* loop through all objects (and their associated materials)
+ * marked for pre-caching in convertblender.c, and pre-cache them */
+void volume_precache(Render *re)
+{
+	ObjectInstanceRen *obi;
+	VolPrecache *vp;
+
+	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
+		for(obi= re->instancetable.first; obi; obi= obi->next) {
+			if (obi->obr == vp->obr) 
+				vol_precache_objectinstance(re, obi, vp->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+		}
+	}
+	
+	re->i.infostr= NULL;
+	re->stats_draw(&re->i);
+}
+
+void free_volume_precache(Render *re)
+{
+	ObjectInstanceRen *obi;
+	
+	for(obi= re->instancetable.first; obi; obi= obi->next) {
+		if (obi->volume_precache)
+			MEM_freeN(obi->volume_precache);
+	}
+	
+	BLI_freelistN(&re->vol_precache_obs);
+}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 83c25ad68c6..86705232b1e 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -27,8 +27,8 @@
  */
 
 #include <math.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <float.h>
 
 #include "MEM_guardedalloc.h"
@@ -36,9 +36,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
-#include "BLI_kdtree.h"
-
-#include "PIL_time.h"
 
 #include "RE_shader_ext.h"
 #include "RE_raytrace.h"
@@ -48,13 +45,12 @@
 #include "DNA_lamp_types.h"
 
 #include "BKE_global.h"
-#include "BKE_main.h"
 
 #include "render_types.h"
-#include "renderdatabase.h"
 #include "pixelshading.h"
 #include "shading.h"
 #include "texture.h"
+#include "volumetric.h"
 
 #if defined( _MSC_VER ) && !defined( __cplusplus )
 # define inline __inline
@@ -75,29 +71,6 @@ static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
 	return (INPR(is->vec, vlr->n) < 0.0f);
 }
 
-#if 0
-static int vol_frontface_intersect_check(Isect *is, int ob, RayFace *face)
-{
-	VlakRen *vlr = (VlakRen *)face;
-	
-	/* only consider faces away, so overlapping layers
-	 * of foward facing geometry don't cause the ray to stop */
-	return (INPR(is->vec, vlr->n) > 0.0f);
-}
-
-static int vol_always_intersect_check(Isect *is, int ob, RayFace *face)
-{
-	return 1;
-}
-#endif
-
-#define VOL_IS_BACKFACE			1
-#define VOL_IS_SAMEMATERIAL		2
-
-
-#define VOL_BOUNDS_DEPTH	0
-#define VOL_BOUNDS_SS		1
-
 /* TODO: Box or sphere intersection types could speed things up */
 static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type, int checkfunc)
 {
@@ -139,8 +112,6 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	}
 }
 
-#define STEPSIZE_VIEW	0
-#define STEPSIZE_SHADE	1
 float vol_get_stepsize(struct ShadeInput *shi, int context)
 {
 	if (shi->mat->vol_stepsize_type == MA_VOL_STEP_RANDOMIZED) {
@@ -152,8 +123,7 @@ float vol_get_stepsize(struct ShadeInput *shi, int context)
 		else if (context == STEPSIZE_SHADE)
 			return shi->mat->vol_shade_stepsize * rnd;
 	}
-	else {
-		// MA_VOL_STEP_CONSTANT
+	else {	// MA_VOL_STEP_CONSTANT
 		
 		if (context == STEPSIZE_VIEW)
 			return shi->mat->vol_stepsize;
@@ -164,6 +134,81 @@ float vol_get_stepsize(struct ShadeInput *shi, int context)
 	return shi->mat->vol_stepsize;
 }
 
+/* SHADING */
+
+static float D(ShadeInput *shi, int rgb, int x, int y, int z)
+{
+	const int res = shi->mat->vol_precache_resolution;
+	CLAMP(x, 0, res-1);
+	CLAMP(y, 0, res-1);
+	CLAMP(z, 0, res-1);
+	return shi->obi->volume_precache[rgb*res*res*res + x*res*res + y*res + z];
+}
+
+inline float lerp(float t, float v1, float v2) {
+	return (1.f - t) * v1 + t * v2;
+}
+
+/* trilinear interpolation */
+static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
+{
+	const int res = shi->mat->vol_precache_resolution;
+	float voxx, voxy, voxz;
+	int vx, vy, vz;
+	float dx, dy, dz;
+	float d00, d10, d01, d11, d0, d1, d_final;
+	float bbmin[3], bbmax[3], dim[3];
+	int rgb;
+	
+	if (!shi->obi->volume_precache) return;
+	
+	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
+	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
+	VecSubf(dim, bbmax, bbmin);
+	
+	voxx = ((co[0] - bbmin[0]) / dim[0]) * res - 0.5f;
+	voxy = ((co[1] - bbmin[1]) / dim[1]) * res - 0.5f;
+	voxz = ((co[2] - bbmin[2]) / dim[2]) * res - 0.5f;
+	
+	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
+	
+	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
+	
+	for (rgb=0; rgb < 3; rgb++) {
+		d00 = lerp(dx, D(shi, rgb, vx, vy, vz), 		D(shi, rgb, vx+1, vy, vz));
+		d10 = lerp(dx, D(shi, rgb, vx, vy+1, vz), 		D(shi, rgb, vx+1, vy+1, vz));
+		d01 = lerp(dx, D(shi, rgb, vx, vy, vz+1), 		D(shi, rgb, vx+1, vy, vz+1));
+		d11 = lerp(dx, D(shi, rgb, vx, vy+1, vz+1), 	D(shi, rgb, vx+1, vy+1, vz+1));
+		d0 = lerp(dy, d00, d10);
+		d1 = lerp(dy, d01, d11);
+		d_final = lerp(dz, d0, d1);
+		
+		scatter_col[rgb] = d_final;
+	}
+}
+
+/* no interpolation */
+static void vol_get_precached_scattering_nearest(ShadeInput *shi, float *scatter_col, float *co)
+{
+	const int res = shi->mat->vol_precache_resolution;
+	int x,y,z;
+	float bbmin[3], bbmax[3], dim[3];
+
+	if (!shi->obi->volume_precache) return;
+	
+	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
+	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
+	VecSubf(dim, bbmax, bbmin);
+	
+	x = (int)(((co[0] - bbmin[0]) / dim[0]) * res);
+	y = (int)(((co[1] - bbmin[1]) / dim[1]) * res);
+	z = (int)(((co[2] - bbmin[2]) / dim[2]) * res);
+	
+	scatter_col[0] = shi->obi->volume_precache[0*res*res*res + x*res*res + y*res + z];
+	scatter_col[1] = shi->obi->volume_precache[1*res*res*res + x*res*res + y*res + z];
+	scatter_col[2] = shi->obi->volume_precache[2*res*res*res + x*res*res + y*res + z];
+}
+
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->alpha;
@@ -245,82 +290,6 @@ void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
 }
 
-
-static float D(ShadeInput *shi, int rgb, int x, int y, int z)
-{
-	const int res = shi->mat->vol_precache_resolution;
-	CLAMP(x, 0, res-1);
-	CLAMP(y, 0, res-1);
-	CLAMP(z, 0, res-1);
-	return shi->obi->volume_precache[rgb*res*res*res + x*res*res + y*res + z];
-}
-
-inline float lerp(float t, float v1, float v2) {
-	return (1.f - t) * v1 + t * v2;
-}
-
-/* trilinear interpolation */
-static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
-{
-	const int res = shi->mat->vol_precache_resolution;
-	float voxx, voxy, voxz;
-	int vx, vy, vz;
-	float dx, dy, dz;
-	float d00, d10, d01, d11, d0, d1, d_final;
-	float bbmin[3], bbmax[3], dim[3];
-	int rgb;
-	
-	if (!shi->obi->volume_precache) return;
-	
-	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
-	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
-	VecSubf(dim, bbmax, bbmin);
-	
-	voxx = ((co[0] - bbmin[0]) / dim[0]) * res - 0.5f;
-	voxy = ((co[1] - bbmin[1]) / dim[1]) * res - 0.5f;
-	voxz = ((co[2] - bbmin[2]) / dim[2]) * res - 0.5f;
-	
-	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
-	
-	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
-	
-	for (rgb=0; rgb < 3; rgb++) {
-		d00 = lerp(dx, D(shi, rgb, vx, vy, vz), 		D(shi, rgb, vx+1, vy, vz));
-		d10 = lerp(dx, D(shi, rgb, vx, vy+1, vz), 		D(shi, rgb, vx+1, vy+1, vz));
-		d01 = lerp(dx, D(shi, rgb, vx, vy, vz+1), 		D(shi, rgb, vx+1, vy, vz+1));
-		d11 = lerp(dx, D(shi, rgb, vx, vy+1, vz+1), 	D(shi, rgb, vx+1, vy+1, vz+1));
-		d0 = lerp(dy, d00, d10);
-		d1 = lerp(dy, d01, d11);
-		d_final = lerp(dz, d0, d1);
-		
-		scatter_col[rgb] = d_final;
-	}
-}
-
-
-/* no interpolation */
-static void vol_get_precached_scattering_nearest(ShadeInput *shi, float *scatter_col, float *co)
-{
-	const int res = shi->mat->vol_precache_resolution;
-	int x,y,z;
-	float bbmin[3], bbmax[3], dim[3];
-
-	if (!shi->obi->volume_precache) return;
-	
-	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
-	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
-	VecSubf(dim, bbmax, bbmin);
-	
-	x = (int)(((co[0] - bbmin[0]) / dim[0]) * res);
-	y = (int)(((co[1] - bbmin[1]) / dim[1]) * res);
-	z = (int)(((co[2] - bbmin[2]) / dim[2]) * res);
-	
-	scatter_col[0] = shi->obi->volume_precache[0*res*res*res + x*res*res + y*res + z];
-	scatter_col[1] = shi->obi->volume_precache[1*res*res*res + x*res*res + y*res + z];
-	scatter_col[2] = shi->obi->volume_precache[2*res*res*res + x*res*res + y*res + z];
-}
-
-
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
  */
@@ -353,7 +322,7 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 	VecSubf(step_vec, endco, co);
 	VecMulf(step_vec, 1.0f / nsteps);
 	
-	VECCOPY(step_sta, co);
+	VecCopyf(step_sta, co);
 	VecAddf(step_end, step_sta, step_vec);
 	
 	for (s = 0;  s < nsteps; s++) {
@@ -469,17 +438,33 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	VECCOPY(scatter, col);
 }
 
+	
+/*
+The main volumetric integrator, using an emission/absorption/scattering model.
+
+Incoming radiance = 
+
+outgoing radiance from behind surface * beam transmittance/attenuation
++ added radiance from all points along the ray due to participating media
+	--> radiance for each segment = 
+		(radiance added by scattering + radiance added by emission) * beam transmittance/attenuation
+
+-- To find transmittance:
+	compute optical thickness with tau (perhaps involving monte carlo integration)
+	transmittance = exp(-tau)
+	
+-- To find radiance from segments along the way:
+	find radiance for one step: 
+	- loop over lights and weight by phase function
+*/
 static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
 {
-	float tr[3] = {1.0f, 1.0f, 1.0f};			/* total transmittance */
+	float tr[3] = {1.0f, 1.0f, 1.0f};
 	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
 	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
-	int nsteps;
-	float vec[3], stepvec[3] = {0.0, 0.0, 0.0};
+	int nsteps, s;
 	float tau[3], emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
-	int s;
-	float step_sta[3], step_end[3], step_mid[3];
-	float alpha;
+	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
 	float density = vol_get_density(shi, co);
 	
 	/* multiply col_behind with beam transmittance over entire distance */
@@ -493,11 +478,9 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	/* ray marching */
 	nsteps = (int)((VecLenf(co, endco) / stepsize) + 0.5);
 	
-	VecSubf(vec, endco, co);
-	VECCOPY(stepvec, vec);
+	VecSubf(stepvec, endco, co);
 	VecMulf(stepvec, 1.0f / nsteps);
-	
-	VECCOPY(step_sta, co);
+	VecCopyf(step_sta, co);
 	VecAddf(step_end, step_sta, stepvec);
 	
 	/* get radiance from all points along the ray due to participating media */
@@ -505,8 +488,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 
 		if (s > 0) density = vol_get_density(shi, step_sta);
 		
-		/* there's only any use in shading here
-		 * if there's actually some density to shade! */
+		/* there's only any use in shading here if there's actually some density to shade! */
 		if (density > 0.01f) {
 		
 			/* transmittance component (alpha) */
@@ -524,10 +506,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			
 			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
 				(shi->mat->vol_shadeflag & MA_VOL_ATTENUATED)) {
-				if (G.rt==100)
-					vol_get_precached_scattering_nearest(shi, scatter_col, step_mid);
-				else
-					vol_get_precached_scattering(shi, scatter_col, step_mid);
+				vol_get_precached_scattering(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
 						
@@ -541,36 +520,12 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			VecAddf(radiance, radiance, d_radiance);	
 		}
 
-		VECCOPY(step_sta, step_end);
+		VecCopyf(step_sta, step_end);
 		VecAddf(step_end, step_end, stepvec);
 	}
 	
-	col[0] = radiance[0];
-	col[1] = radiance[1];
-	col[2] = radiance[2];
-	
-	alpha = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
-	col[3] = alpha;
-	
-	/*
-	Incoming radiance = 
-		  outgoing radiance from behind surface * beam transmittance/attenuation
-		
-		+ added radiance from all points along the ray due to participating media
-		    --> radiance for each segment = 
-					  radiance added by scattering 
-					+ radiance added by emission
-					* beam transmittance/attenuation
-	
-	
-	-- To find transmittance:
-		compute optical thickness with tau (perhaps involving monte carlo integration)
-		return exp(-tau)
-		
-	-- To find radiance from segments along the way:
-		find radiance for one step:
-		  - loop over lights and weight by phase function
-		*/
+	VecCopyf(col, radiance);
+	col[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
 }
 
 static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
@@ -759,308 +714,3 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	}
 }
 
-
-/* Recursive test for intersections, from a point inside the mesh, to outside
- * Number of intersections (depth) determine if a point is inside or outside the mesh */
-int intersect_outside_volume(RayTree *tree, Isect *isect, float *offset, int limit, int depth)
-{
-	if (limit == 0) return depth;
-	
-	if (RE_ray_tree_intersect(tree, isect)) {
-		float hitco[3];
-		
-		hitco[0] = isect->start[0] + isect->labda*isect->vec[0];
-		hitco[1] = isect->start[1] + isect->labda*isect->vec[1];
-		hitco[2] = isect->start[2] + isect->labda*isect->vec[2];
-		VecAddf(isect->start, hitco, offset);
-
-		return intersect_outside_volume(tree, isect, offset, limit-1, depth+1);
-	} else {
-		return depth;
-	}
-}
-
-/* Uses ray tracing to check if a point is inside or outside an ObjectInstanceRen */
-int point_inside_obi(RayTree *tree, ObjectInstanceRen *obi, float *co)
-{
-	float maxsize = RE_ray_tree_max_size(tree);
-	Isect isect;
-	float vec[3] = {0.0f,0.0f,1.0f};
-	int final_depth=0, depth=0, limit=20;
-	
-	/* set up the isect */
-	memset(&isect, 0, sizeof(isect));
-	VECCOPY(isect.start, co);
-	isect.end[0] = co[0] + vec[0] * maxsize;
-	isect.end[1] = co[1] + vec[1] * maxsize;
-	isect.end[2] = co[2] + vec[2] * maxsize;
-	
-	/* and give it a little offset to prevent self-intersections */
-	VecMulf(vec, 1e-5);
-	VecAddf(isect.start, isect.start, vec);
-	
-	isect.mode= RE_RAY_MIRROR;
-	isect.face_last= NULL;
-	isect.lay= -1;
-	
-	final_depth = intersect_outside_volume(tree, &isect, vec, limit, depth);
-	
-	/* even number of intersections: point is outside
-	 * odd number: point is inside */
-	if (final_depth % 2 == 0) return 0;
-	else return 1;
-}
-
-static int inside_check_func(Isect *is, int ob, RayFace *face)
-{
-	return 1;
-}
-static void vlr_face_coords(RayFace *face, float **v1, float **v2, float **v3, float **v4)
-{
-	VlakRen *vlr= (VlakRen*)face;
-
-	*v1 = (vlr->v1)? vlr->v1->co: NULL;
-	*v2 = (vlr->v2)? vlr->v2->co: NULL;
-	*v3 = (vlr->v3)? vlr->v3->co: NULL;
-	*v4 = (vlr->v4)? vlr->v4->co: NULL;
-}
-
-RayTree *create_raytree_obi(ObjectInstanceRen *obi, float *bbmin, float *bbmax)
-{
-	int v;
-	VlakRen *vlr= NULL;
-	
-	/* create empty raytree */
-	RayTree *tree = RE_ray_tree_create(64, obi->obr->totvlak, bbmin, bbmax,
-		vlr_face_coords, inside_check_func, NULL, NULL);
-	
-	/* fill it with faces */
-	for(v=0; v<obi->obr->totvlak; v++) {
-		if((v & 255)==0)
-			vlr= obi->obr->vlaknodes[v>>8].vlak;
-		else
-			vlr++;
-	
-		RE_ray_tree_add_face(tree, 0, vlr);
-	}
-	
-	RE_ray_tree_done(tree);
-	
-	return tree;
-}
-
-static float get_avg_surrounds(float *cache, int res, int res_2, int res_3, int rgb, int xx, int yy, int zz)
-{
-	int x, y, z, x_, y_, z_;
-	int added=0;
-	float tot=0.0f;
-	int i;
-	
-	for (x=-1; x <= 1; x++) {
-		x_ = xx+x;
-		if (x_ >= 0 && x_ <= res-1) {
-		
-			for (y=-1; y <= 1; y++) {
-				y_ = yy+y;
-				if (y_ >= 0 && y_ <= res-1) {
-				
-					for (z=-1; z <= 1; z++) {
-						z_ = zz+z;
-						if (z_ >= 0 && z_ <= res-1) {
-						
-							i = rgb*res_3 + x_*res_2 + y_*res + z_;
-							if (cache[i] > 0.0f) {
-								tot += cache[i];
-								added++;
-							}
-							
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	tot /= added;
-	
-	return ((added>0)?tot:0.0f);
-}
-
-/* function to filter the edges of the light cache, where there was no volume originally.
- * For each voxel which was originally external to the mesh, it finds the average values of
- * the surrounding internal voxels and sets the original external voxel to that average amount.
- * Works almost a bit like a 'dilate' filter */
-static void lightcache_filter(float *cache, int res)
-{
-	int x, y, z, rgb;
-	int res_2, res_3;
-	int i;
-	
-	res_2 = res*res;
-	res_3 = res*res*res;
-
-	for (x=0; x < res; x++) {
-		for (y=0; y < res; y++) {
-			for (z=0; z < res; z++) {
-				for (rgb=0; rgb < 3; rgb++) {
-					i = rgb*res_3 + x*res_2 + y*res + z;
-
-					/* trigger for outside mesh */
-					if (cache[i] < 0.5f) cache[i] = get_avg_surrounds(cache, res, res_2, res_3, rgb, x, y, z);
-				}
-			}
-		}
-	}
-}
-
-/* Precache a volume into a 3D voxel grid.
- * The voxel grid is stored in the ObjectInstanceRen, 
- * in camera space, aligned with the ObjectRen's bounding box.
- * Resolution is defined by the user.
- */
-void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
-{
-	int x, y, z;
-
-	float co[3], voxel[3], scatter_col[3];
-	ShadeInput shi;
-	float view[3] = {0.0,0.0,-1.0};
-	float density;
-	float stepsize;
-	
-	float resf, res_3f;
-	int res_2, res_3;
-	
-	float i = 1.0f;
-	double time, lasttime= PIL_check_seconds_timer();
-	const int res = ma->vol_precache_resolution;
-	RayTree *tree;
-	
-	R = *re;
-
-	/* create a raytree with just the faces of the instanced ObjectRen, 
-	 * used for checking if the cached point is inside or outside. */
-	tree = create_raytree_obi(obi, bbmin, bbmax);
-	if (!tree) return;
-
-	/* Need a shadeinput to calculate scattering */
-	memset(&shi, 0, sizeof(ShadeInput)); 
-	shi.depth= 1;
-	shi.mask= 1;
-	shi.mat = ma;
-	shi.vlr = NULL;
-	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
-	shi.har= shi.mat->har;
-	shi.obi= obi;
-	shi.obr= obi->obr;
-	shi.lay = re->scene->lay;
-	VECCOPY(shi.view, view);
-	
-	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
-
-	resf = (float)res;
-	res_2 = res*res;
-	res_3 = res*res*res;
-	res_3f = (float)res_3;
-	
-	VecSubf(voxel, bbmax, bbmin);
-	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
-		return;
-	VecMulf(voxel, 1.0f/res);
-	
-	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
-	
-	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
-	 *
-	 * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
-	 * I'm guessing the memory alignment may work out better this way for the purposes
-	 * of doing linear interpolation, but I haven't actually tested this theory! :)
-	 */
-	for (x=0; x < res; x++) {
-		co[0] = bbmin[0] + (voxel[0] * x);
-		
-		for (y=0; y < res; y++) {
-			co[1] = bbmin[1] + (voxel[1] * y);
-			
-			for (z=0; z < res; z++) {
-				co[2] = bbmin[2] + (voxel[2] * z);
-				
-				time= PIL_check_seconds_timer();
-				i++;
-			
-				/* display progress every second */
-				if(re->test_break()) {
-					if(tree) {
-						RE_ray_tree_free(tree);
-						tree= NULL;
-					}
-					return;
-				}
-				if(time-lasttime>1.0f) {
-					char str[64];
-					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
-					re->i.infostr= str;
-					re->stats_draw(&re->i);
-					re->i.infostr= NULL;
-					lasttime= time;
-				}
-				
-				/* don't bother if the point is not inside the volume mesh */
-				if (!point_inside_obi(tree, obi, co)) {
-					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
-					continue;
-				}
-				
-				VECCOPY(shi.view, co);
-				Normalize(shi.view);
-				density = vol_get_density(&shi, co);
-				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
-			
-				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
-				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
-				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
-			}
-		}
-	}
-
-	if(tree) {
-		RE_ray_tree_free(tree);
-		tree= NULL;
-	}
-	
-	lightcache_filter(obi->volume_precache, res);
-
-}
-
-/* loop through all objects (and their associated materials)
- * marked for pre-caching in convertblender.c, and pre-cache them */
-void volume_precache(Render *re)
-{
-	ObjectInstanceRen *obi;
-	VolPrecache *vp;
-
-	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
-		for(obi= re->instancetable.first; obi; obi= obi->next) {
-			if (obi->obr == vp->obr) 
-				vol_precache_objectinstance(re, obi, vp->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
-		}
-	}
-	
-	re->i.infostr= NULL;
-	re->stats_draw(&re->i);
-}
-
-void free_volume_precache(Render *re)
-{
-	ObjectInstanceRen *obi;
-	
-	for(obi= re->instancetable.first; obi; obi= obi->next) {
-		if (obi->volume_precache)
-			MEM_freeN(obi->volume_precache);
-	}
-	
-	BLI_freelistN(&re->vol_precache_obs);
-}
-

From e5b51109e955e3dd6ec4857f833c3aa51f0fa3f4 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 18 Nov 2008 01:53:52 +0000
Subject: [PATCH 062/577] * Exclude volume materials from AO

---
 source/blender/render/intern/source/occlusion.c |  2 +-
 source/blender/render/intern/source/rayshade.c  | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index d2d2cf3fb77..04404d71f30 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -663,7 +663,7 @@ static OcclusionTree *occ_tree_build(Render *re)
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak;
 			else vlr++;
 
-			if(vlr->mat->mode & MA_TRACEBLE) {
+			if((vlr->mat->mode & MA_TRACEBLE) && (vlr->mat->material_type == MA_SOLID)) {
 				tree->face[b].obi= c;
 				tree->face[b].facenr= a;
 				tree->occlusion[b]= 1.0f;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index d06bbcf3300..bba7cb924eb 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -96,6 +96,17 @@ static int vlr_check_intersect(Isect *is, int ob, RayFace *face)
 		return (is->lay & obi->lay);
 }
 
+static int vlr_check_intersect_solid(Isect *is, int ob, RayFace *face)
+{
+	VlakRen *vlr = (VlakRen*)face;
+
+	/* solid material types only */
+	if (vlr->mat->material_type == MA_SOLID)
+		return 1;
+	else
+		return 0;
+}
+
 static float *vlr_get_transform(void *userdata, int i)
 {
 	ObjectInstanceRen *obi= RAY_OBJECT_GET((Render*)userdata, i);
@@ -1621,7 +1632,7 @@ static void ray_ao_qmc(ShadeInput *shi, float *shadfac)
 		
 		prev = fac;
 		
-		if(RE_ray_tree_intersect(R.raytree, &isec)) {
+		if(RE_ray_tree_intersect_check(R.raytree, &isec, vlr_check_intersect_solid)) {
 			if (R.wrld.aomode & WO_AODIST) fac+= exp(-isec.labda*R.wrld.aodistfac); 
 			else fac+= 1.0f;
 		}
@@ -1746,7 +1757,7 @@ static void ray_ao_spheresamp(ShadeInput *shi, float *shadfac)
 			isec.end[2] = shi->co[2] - maxdist*vec[2];
 			
 			/* do the trace */
-			if(RE_ray_tree_intersect(R.raytree, &isec)) {
+			if(RE_ray_tree_intersect_check(R.raytree, &isec, vlr_check_intersect_solid)) {
 				if (R.wrld.aomode & WO_AODIST) sh+= exp(-isec.labda*R.wrld.aodistfac); 
 				else sh+= 1.0f;
 			}

From 14a0718a8a4ed3ee95f6374e20dbe9e74cf3b5c6 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 19 Nov 2008 05:30:52 +0000
Subject: [PATCH 063/577] * fix - constant colour output in point density
 wasn't working

---
 .../blender/render/intern/source/pointdensity.c   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index af2a7edae06..db675c81840 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -418,14 +418,14 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 		co[1] = texvec[1] + noise_fac * turb;
 		co[2] = texvec[2] + noise_fac * turb;
 		
-		/* reset and do a new BVH query with the perturbed coordinates */
+		/* reset and prepare for a new BVH query with the perturbed coordinates */
 		density = vec[0] = vec[1] = vec[2] = 0.0f;
-		num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
-		if (num > 0) {
-			age /= num;
-			VecMulf(vec, 1.0f/num);
-		}
-		
+	}
+
+	num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
+	if (num > 0) {
+		age /= num;
+		VecMulf(vec, 1.0f/num);
 	}
 	
 	texres->tin = density;
@@ -459,6 +459,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 			VECCOPY(&texres->tr, vec);
 			texres->ta = 1.0f;
 			break;
+		case TEX_PD_COLOR_CONSTANT:
 		default:
 			texres->tr = texres->tg = texres->tb = texres->ta = 1.0f;
 			break;

From 6df8cf842a926e9354ee74f1892530b69897da5f Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 19 Nov 2008 23:27:47 +0000
Subject: [PATCH 064/577] * Allow for light linking/overrides in volume
 materials

---
 source/blender/render/intern/source/volumetric.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 359f6202fe4..45d54d40fa1 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -417,12 +417,14 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 /* single scattering only for now */
 void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
 {
+	ListBase *lights;
 	GroupObject *go;
 	LampRen *lar;
 	float col[3] = {0.f, 0.f, 0.f};
 	int i=0;
 
-	for(go=R.lights.first; go; go= go->next)
+	lights= get_lights(shi);
+	for(go=lights->first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
 	

From bdf6711b70e1800dbf390c8a9264368c0fe01760 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 28 Nov 2008 07:12:32 +0000
Subject: [PATCH 065/577] * Some extra sanity checks for point density

---
 source/blender/render/intern/source/pointdensity.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index db675c81840..2034ed2d466 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -230,6 +230,8 @@ static void cache_pointdensity(Render *re, Tex *tex)
 		int i;
 		
 		if (!ob) return;
+		if (BLI_countlist(&ob->particlesystem) == 0) return;
+		
 		
 		for(psys=ob->particlesystem.first, i=0; i< pd->psysindex-1; i++)
 			psys= psys->next;
@@ -260,6 +262,8 @@ static void free_pointdensity(Render *re, Tex *tex)
 {
 	PointDensity *pd = tex->pd;
 
+	if (!pd) return;
+	
 	if (pd->point_tree) {
 		BLI_bvhtree_free(pd->point_tree);
 		pd->point_tree = NULL;

From 1b9eabeef6ac895a4818c4ad74c0899226cabc84 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 5 Dec 2008 04:06:41 +0000
Subject: [PATCH 066/577] * Added other noise basis types to point density
 turbulence

* Fixed a bug in 'ignoring volumes in AAO'
---
 source/blender/makesdna/DNA_texture_types.h   |   2 +
 .../blender/render/intern/source/occlusion.c  |   2 +-
 .../render/intern/source/pointdensity.c       |   7 +-
 .../render/intern/source/volume_precache.c    | 129 ++++++++++++++++++
 source/blender/src/buttons_shading.c          |   5 +
 5 files changed, 141 insertions(+), 4 deletions(-)

diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index fd497cef178..b4fcb5efe40 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -153,6 +153,8 @@ typedef struct PointDensity {
 	float noise_size;
 	short noise_depth;
 	short noise_influence;
+	short noise_basis;
+	short pdpad3[3];
 	float noise_fac;
 	
 	float speed_scale;
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index 04404d71f30..f1ea4665120 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -630,7 +630,7 @@ static OcclusionTree *occ_tree_build(Render *re)
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak;
 			else vlr++;
 
-			if(vlr->mat->mode & MA_TRACEBLE)
+			if((vlr->mat->mode & MA_TRACEBLE) && (vlr->mat->material_type == MA_SOLID))
 				totface++;
 		}
 	}
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 2034ed2d466..392af8411c5 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -405,14 +405,15 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	if (pd->flag & TEX_PD_TURBULENCE) {
 	
 		if (pd->noise_influence == TEX_PD_NOISE_AGE) {
-			turb = BLI_turbulence(pd->noise_size, texvec[0]+age, texvec[1]+age, texvec[2]+age, pd->noise_depth);
+			turb = BLI_gTurbulence(pd->noise_size, texvec[0]+age, texvec[1]+age, texvec[2]+age, pd->noise_depth, 0, pd->noise_basis);
 		}
 		else if (pd->noise_influence == TEX_PD_NOISE_TIME) {
 			time = R.cfra / (float)R.r.efra;
-			turb = BLI_turbulence(pd->noise_size, texvec[0]+time, texvec[1]+time, texvec[2]+time, pd->noise_depth);
+			turb = BLI_gTurbulence(pd->noise_size, texvec[0]+time, texvec[1]+time, texvec[2]+time, pd->noise_depth, 0, pd->noise_basis);
+			//turb = BLI_turbulence(pd->noise_size, texvec[0]+time, texvec[1]+time, texvec[2]+time, pd->noise_depth);
 		}
 		else {
-			turb = BLI_turbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth);
+			turb = BLI_gTurbulence(pd->noise_size, texvec[0]+vec[0], texvec[1]+vec[1], texvec[2]+vec[2], pd->noise_depth, 0, pd->noise_basis);
 		}
 
 		turb -= 0.5f;	/* re-center 0.0-1.0 range around 0 to prevent offsetting result */
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 5b43aa8f935..c56d17f7cc3 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -325,6 +325,135 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 
 }
 
+#if 0
+void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
+{
+	int x, y, z;
+
+	float co[3], voxel[3], scatter_col[3];
+	ShadeInput shi;
+	float view[3] = {0.0,0.0,-1.0};
+	float density;
+	float stepsize;
+	
+	float resf, res_3f;
+	int res_2, res_3;
+	
+	int edgeparts=2;
+	int totparts;
+	
+	float i = 1.0f;
+	double time, lasttime= PIL_check_seconds_timer();
+	const int res = ma->vol_precache_resolution;
+	RayTree *tree;
+	
+	R = *re;
+
+	/* create a raytree with just the faces of the instanced ObjectRen, 
+	 * used for checking if the cached point is inside or outside. */
+	tree = create_raytree_obi(obi, bbmin, bbmax);
+	if (!tree) return;
+
+	/* Need a shadeinput to calculate scattering */
+	memset(&shi, 0, sizeof(ShadeInput)); 
+	shi.depth= 1;
+	shi.mask= 1;
+	shi.mat = ma;
+	shi.vlr = NULL;
+	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
+	shi.har= shi.mat->har;
+	shi.obi= obi;
+	shi.obr= obi->obr;
+	shi.lay = re->scene->lay;
+	VECCOPY(shi.view, view);
+	
+	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
+
+	resf = (float)res;
+	res_2 = res*res;
+	res_3 = res*res*res;
+	res_3f = (float)res_3;
+	
+	VecSubf(voxel, bbmax, bbmin);
+	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
+		return;
+	VecMulf(voxel, 1.0f/res);
+	
+	
+	part[0] = parceil(res/(float)xparts); 
+	part[1] = ceil(rex/(float)yparts);
+	part[2] = ceil(rex/(float)zparts);
+	
+	
+	
+	//obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
+	
+	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
+	 *
+	 * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
+	 * I'm guessing the memory alignment may work out better this way for the purposes
+	 * of doing linear interpolation, but I haven't actually tested this theory! :)
+	 */
+	 /*
+	for (x=0; x < res; x++) {
+		co[0] = bbmin[0] + (voxel[0] * x);
+		
+		for (y=0; y < res; y++) {
+			co[1] = bbmin[1] + (voxel[1] * y);
+			
+			for (z=0; z < res; z++) {
+				co[2] = bbmin[2] + (voxel[2] * z);
+			
+				time= PIL_check_seconds_timer();
+				i++;
+			
+				// display progress every second
+				if(re->test_break()) {
+					if(tree) {
+						RE_ray_tree_free(tree);
+						tree= NULL;
+					}
+					return;
+				}
+				if(time-lasttime>1.0f) {
+					char str[64];
+					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
+					re->i.infostr= str;
+					re->stats_draw(&re->i);
+					re->i.infostr= NULL;
+					lasttime= time;
+				}
+				
+				// don't bother if the point is not inside the volume mesh
+				
+				if (!point_inside_obi(tree, obi, co)) {
+					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
+					continue;
+				}
+				density = vol_get_density(&shi, co);
+				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
+			
+				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
+				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
+				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
+				
+			}
+		}
+	}
+	*/
+
+	if(tree) {
+		RE_ray_tree_free(tree);
+		tree= NULL;
+	}
+	
+	lightcache_filter(obi->volume_precache, res);
+
+}
+#endif
+
 /* loop through all objects (and their associated materials)
  * marked for pre-caching in convertblender.c, and pre-cache them */
 void volume_precache(Render *re)
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 55475e74450..c88c341fe53 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -994,6 +994,11 @@ static void texture_panel_pointdensity_modify(Tex *tex)
 		
 		yco = ymid - BUTH - YSPACE;
 
+		uiDefBut(block, LABEL, B_NOP, "Noise Basis:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefButS(block, MENU, B_REDR, noisebasis_menu(),
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(pd->noise_basis), 0.0, 0.0, 0, 0, "Noise formula used for tubulence");
+		
 		uiDefBut(block, LABEL, B_NOP, "Noise Influence:",
 			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 			

From 9e1da805e19b3efd822803fa53e4bbc23223f58f Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 9 Dec 2008 04:27:34 +0000
Subject: [PATCH 067/577] * Added back the GR: field for volume materials,
 limiting lighting to a certain group

---
 source/blender/src/buttons_shading.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index c88c341fe53..a8aa00370d9 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4529,6 +4529,10 @@ static void material_panel_material_volume(Material *ma)
 			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 	}
 	
+	yco -= YSPACE;
+	uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_MATPRV, "GR:",
+		X2CLM2, yco-=BUTH, BUTW2, BUTH, &ma->group, "Limit Lighting to Lamps in this Group"); 
+	
 }
 
 static void material_panel_nodes(Material *ma)

From aef61a7000c279a96f1bb0e1fedf7da2574292fd Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 9 Dec 2008 07:19:55 +0000
Subject: [PATCH 068/577] wip commit to work on at home, nothing to see

---
 .../render/intern/source/volume_precache.c    | 187 +++++++++++++++---
 1 file changed, 164 insertions(+), 23 deletions(-)

diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index c56d17f7cc3..246f9bc6d69 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -326,13 +326,104 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 }
 
 #if 0
+typedef struct VolPrecachePart {
+	struct VolPrecachePart *next, *prev;
+	int num;
+	int minx, maxx;
+	int miny, maxy;
+	int minz, maxz;
+	int res;
+	float bbmin[3], voxel[3];
+	struct RayTree *tree;
+	struct ShadeInput *shi;
+	struct ObjectInstanceRen *obi;
+	int done;
+} VolPrecachePart;
+
+static void *vol_precache_part_test(void *data)
+{
+	VolPrecachePart *vpt =  (VolPrecachePart *)data;
+
+	printf("part number: %d \n", vpt->num);
+
+	return 0;
+}
+
+/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
+ *
+ * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
+ * I'm guessing the memory alignment may work out better this way for the purposes
+ * of doing linear interpolation, but I haven't actually tested this theory! :)
+ */
+static void *vol_precache_part(void *data)
+{
+	VolPrecachePart *vpt =  (VolPrecachePart *)data;
+	ObjectInstanceRen *obi = vpt->obi;
+	RayTree *tree = vpt->tree;
+	ShadeInput *shi = vpt->shi;
+	float scatter_col[3] = {0.f, 0.f, 0.f};
+	float co[3];
+	int x, y, z;
+	const int res=vpt->res, res_2=vpt->res*vpt->res, res_3=vpt->res*vpt->res*vpt->res;
+	const float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
+	
+	res = vpt->res;
+	res_2 = res*res;
+	res_3 = res*res*res;
+	
+	for (x= vpt->minx; x < vpt->maxx; x++) {
+		co[0] = vpt->bbmin[0] + (vpt->voxel[0] * x);
+		
+		for (y= vpt->miny; y < vpt->maxy; y++) {
+			co[1] = vpt->bbmin[1] + (vpt->voxel[1] * y);
+			
+			for (z=vpt->minz; z < vpt->maxz; z++) {
+				co[2] = vpt->bbmin[2] + (vpt->voxel[2] * z);
+			
+				// don't bother if the point is not inside the volume mesh
+				if (!point_inside_obi(tree, obi, co)) {
+					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
+					continue;
+				}
+				density = vol_get_density(shi, co);
+				vol_get_scattering(shi, scatter_col, co, stepsize, density);
+			
+				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
+				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
+				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
+			}
+		}
+	}
+	
+	return 0;
+}
+
+void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Material *ma, ShadeInput *shi)
+{
+	float view[3] = {0.0,0.0,-1.0};
+	
+	memset(&shi, 0, sizeof(ShadeInput)); 
+	shi->depth= 1;
+	shi->mask= 1;
+	shi->mat = ma;
+	shi->vlr = NULL;
+	memcpy(&shi->r, &shi->mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
+	shi->har= shi->mat->har;
+	shi->obi= obi;
+	shi->obr= obi->obr;
+	shi->lay = re->scene->lay;
+	VECCOPY(shi->view, view);
+}
+
 void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
 {
 	int x, y, z;
 
 	float co[3], voxel[3], scatter_col[3];
 	ShadeInput shi;
-	float view[3] = {0.0,0.0,-1.0};
+	
 	float density;
 	float stepsize;
 	
@@ -341,6 +432,14 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	
 	int edgeparts=2;
 	int totparts;
+	ListBase threads;
+	int cont= 1;
+	int xparts, yparts, zparts;
+	float part[3];
+	int totthread = re->r.threads;
+	ListBase precache_parts;
+	VolPrecachePart *nextpa;
+	int j;
 	
 	float i = 1.0f;
 	double time, lasttime= PIL_check_seconds_timer();
@@ -355,38 +454,80 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	if (!tree) return;
 
 	/* Need a shadeinput to calculate scattering */
-	memset(&shi, 0, sizeof(ShadeInput)); 
-	shi.depth= 1;
-	shi.mask= 1;
-	shi.mat = ma;
-	shi.vlr = NULL;
-	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
-	shi.har= shi.mat->har;
-	shi.obi= obi;
-	shi.obr= obi->obr;
-	shi.lay = re->scene->lay;
-	VECCOPY(shi.view, view);
-	
-	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
+	precache_setup_shadeinput(re, obi, ma, &shi);
 
-	resf = (float)res;
-	res_2 = res*res;
-	res_3 = res*res*res;
-	res_3f = (float)res_3;
-	
 	VecSubf(voxel, bbmax, bbmin);
 	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
 		return;
 	VecMulf(voxel, 1.0f/res);
 	
+	part[0] = ceil(res/(float)xparts); 
+	part[1] = ceil(res/(float)yparts);
+	part[2] = ceil(res/(float)zparts);
 	
-	part[0] = parceil(res/(float)xparts); 
-	part[1] = ceil(rex/(float)yparts);
-	part[2] = ceil(rex/(float)zparts);
+	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
 	
+	totparts = edgeparts*edgeparts*edgeparts;
+	precache_parts= MEM_callocN(sizeof(VolPrecachePart)*totparts, "VolPrecachePart");
+	memset(precache_parts, 0, sizeof(VolPrecachePart)*totparts);
+
+	precache_init_parts(precache_parts);
+
+	for(j=0; j < totparts; j++) {
+		VolPrecachePart *pa= MEM_callocN(sizeof(VolPrecachePart), "new precache part");
 	
+		pa->done = 0;
+		pa->num = j;
+		
+		pa->res = res;
+		VECCOPY(pa->bbmin, bbmin);
+		VECCOPY(precache_parts[j].voxel, voxel);
+		precache_parts[j].tree = tree;
+		precache_parts[j].shi = shi;
+		precache_parts[j].obi = obi;
+	}
 	
-	//obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
+	BLI_init_threads(&threads, vol_precache_part, totthread);
+	
+	nextpa = precache_get_new_part(precache_threads);
+	
+	while(cont) {
+
+		if(BLI_available_threads(&threads) && !(re->test_break())) {
+			
+			precache_get_new_part(
+			// get new job (data pointer)
+			for(j=0; j < totparts; j++) {
+				if (!precache_threads[j].done) {
+					// tag job 'processed
+					precache_threads[j].done = 1;
+				}
+			}
+		
+			BLI_insert_thread(&threads, precache_get_new_part(precache_threads));
+		}
+		else PIL_sleep_ms(50);
+
+		// find if a job is ready, this the do_something_func() should write in job somewhere
+		cont= 0;
+		for(go over all jobs)
+			if(job is ready) {
+				if(job was not removed) {
+					BLI_remove_thread(&lb, job);
+				}
+			}
+			else cont= 1;
+		}
+		// conditions to exit loop
+		if(if escape loop event) {
+		if(BLI_available_threadslots(&lb)==maxthreads)
+			break;
+		}
+	}
+
+	BLI_end_threads(&threads);
+	
+	//
 	
 	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
 	 *

From 92f5c719aedf79db7e45d3b887146a559321981e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 13 Dec 2008 05:41:34 +0000
Subject: [PATCH 069/577] * Volume Rendering: Voxel data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit introduces a new texture ('Voxel Data'), used to load up saved voxel
data sets for rendering, contributed by Rau�l 'farsthary' Ferna�ndez Herna�ndez
with some additional tweaks. Thanks, Rau�l!

The texture works similar to the existing point density texture, currently it
only provides intensity information, which can then be mapped (for example) to
density in a volume material. This is an early version, intended to read the
voxel format saved by Rau�l's command line simulators, in future revisions
there's potential for making a more full-featured 'Blender voxel file format',
and also for supporting other formats too.

Note: Due to some subtleties in Rau�l's existing released simulators, in  order
to load them correctly the voxel data texture, you'll need to raise the
'resolution' value by 2. So if you baked out the simulation at resolution 50,
enter 52 for the resolution in the texture panel. This can possibly be fixed in
the simulator later on.

Right now, the way the texture is mapped is just in the space 0,0,0 <-> 1,1,1
and it can appear rotated 90 degrees incorrectly. This will be tackled, for now,
probably the easiest way to map it is with and empty, using Map Input -> Object.

Smoke test: http://www.vimeo.com/2449270

One more note, trilinear interpolation seems a bit slow at the moment, we'll
look into this.

For curiosity, while testing/debugging this, I made a script that exports a mesh
to voxel data. Here's a test of grogan (www.kajimba.com) converted to voxels,
rendered as a volume: http://www.vimeo.com/2512028

The script is available here: http://mke3.net/projects/bpython/export_object_voxeldata.py

* Another smaller thing, brought back early ray termination (was disabled
previously for debugging) and made it user configurable. It now appears as a new
value in the volume material: 'Depth Cutoff'. For some background info on what
this does, check:
http://farsthary.wordpress.com/2008/12/11/cutting-down-render-times/

* Also some disabled work-in-progess code for light cache
---
 source/blender/blenkernel/BKE_texture.h       |  6 ++
 source/blender/blenkernel/intern/texture.c    | 49 ++++++++++
 source/blender/blenloader/intern/readfile.c   | 18 ++++
 source/blender/blenloader/intern/writefile.c  |  1 +
 source/blender/include/butspace.h             |  2 +
 source/blender/makesdna/DNA_material_types.h  |  2 +
 source/blender/makesdna/DNA_texture_types.h   | 24 ++++-
 .../render/intern/include/render_types.h      | 14 +++
 .../render/intern/include/volume_precache.h   |  3 +-
 .../render/intern/source/convertblender.c     | 61 ++++++++++--
 source/blender/render/intern/source/texture.c |  5 +
 .../render/intern/source/volume_precache.c    | 98 +++++++++++--------
 .../blender/render/intern/source/volumetric.c | 16 ++-
 source/blender/src/butspace.c                 |  2 +-
 source/blender/src/buttons_shading.c          | 80 ++++++++++++++-
 15 files changed, 324 insertions(+), 57 deletions(-)

diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index e16ac2d369b..985094a7e62 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -40,6 +40,7 @@ struct HaloRen;
 struct TexMapping;
 struct EnvMap;
 struct PointDensity;
+struct VoxelData;
 
 /*  in ColorBand struct */
 #define MAXCOLORBAND 32
@@ -80,6 +81,11 @@ void    BKE_free_pointdensity(struct PointDensity *pd);
 struct PointDensity *BKE_add_pointdensity(void);
 struct PointDensity *BKE_copy_pointdensity(struct PointDensity *pd);
 
+void BKE_free_voxeldatadata(struct VoxelData *vd);
+void BKE_free_voxeldata(struct VoxelData *vd);
+struct VoxelData *BKE_add_voxeldata(void);
+struct VoxelData *BKE_copy_voxeldata(struct VoxelData *vd);
+
 int     BKE_texture_dependsOnTime(const struct Tex *texture);
 
 #endif
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index c972d70d927..c9cae91da6f 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -420,6 +420,7 @@ void free_texture(Tex *tex)
 	if(tex->coba) MEM_freeN(tex->coba);
 	if(tex->env) BKE_free_envmap(tex->env);
 	if(tex->pd) BKE_free_pointdensity(tex->pd);
+	if(tex->vd) BKE_free_voxeldata(tex->vd);
 	BKE_previewimg_free(&tex->preview);
 	BKE_icon_delete((struct ID*)tex);
 	tex->id.icon_id = 0;
@@ -490,6 +491,11 @@ void default_tex(Tex *tex)
 		tex->pd->radius = 0.3f;
 		tex->pd->falloff_type = TEX_PD_FALLOFF_STD;
 	}
+	
+	if (tex->vd) {
+		tex->vd->resolX=50;
+		tex->vd->interp_type=0;
+	}
 
 	pit = tex->plugin;
 	if (pit) {
@@ -588,6 +594,7 @@ Tex *copy_texture(Tex *tex)
 	if(texn->coba) texn->coba= MEM_dupallocN(texn->coba);
 	if(texn->env) texn->env= BKE_copy_envmap(texn->env);
 	if(texn->pd) texn->pd= BKE_copy_pointdensity(texn->pd);
+	if(texn->vd) texn->vd=BKE_copy_voxeldata(texn->vd);
 	
 	if(tex->preview) texn->preview = BKE_previewimg_copy(tex->preview);
 
@@ -945,6 +952,48 @@ void BKE_free_pointdensity(PointDensity *pd)
 	MEM_freeN(pd);
 }
 
+
+void BKE_free_voxeldatadata(struct VoxelData *vd)
+{
+	if (vd->dataset) {
+		MEM_freeN(vd->dataset);
+		vd->dataset = NULL;
+	}
+
+}
+ 
+void BKE_free_voxeldata(struct VoxelData *vd)
+{
+	BKE_free_voxeldatadata(vd);
+	MEM_freeN(vd);
+}
+ 
+struct VoxelData *BKE_add_voxeldata(void)
+{
+	VoxelData *vd;
+
+	vd= MEM_callocN(sizeof(struct VoxelData), "voxeldata");
+	vd->dataset = NULL;
+	vd->resolX = 1;
+	vd->resolY = 1;
+	vd->resolZ = 1;
+	vd->interp_type= TEX_VD_NEARESTNEIGHBOR;
+	vd->int_multiplier = 1.0;
+	
+	return vd;
+ }
+ 
+struct VoxelData *BKE_copy_voxeldata(struct VoxelData *vd)
+{
+	VoxelData *vdn;
+
+	vdn= MEM_dupallocN(vd);	
+	vdn->dataset = NULL;
+
+	return vdn;
+}
+
+
 /* ------------------------------------------------------------------------- */
 int BKE_texture_dependsOnTime(const struct Tex *texture)
 {
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1fd766be256..8347920319a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2535,6 +2535,11 @@ static void direct_link_texture(FileData *fd, Tex *tex)
 		tex->pd->coba= newdataadr(fd, tex->pd->coba);
 	}
 	
+	tex->vd= newdataadr(fd, tex->vd);
+	if(tex->vd) {
+		tex->vd->dataset = NULL;
+	}
+	
 	tex->nodetree= newdataadr(fd, tex->nodetree);
 	if(tex->nodetree)
 		direct_link_nodetree(fd, tex->nodetree);
@@ -7939,6 +7944,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->vol_density_scale = 1.0f;
 			if (ma->vol_precache_resolution == 0)
 				ma->vol_precache_resolution = 50;
+			if (ma->vol_depth_cutoff < 0.0001)
+				ma->vol_depth_cutoff = 0.05;
 		}
 		
 		for(tex=main->tex.first; tex; tex= tex->id.next) {
@@ -7956,6 +7963,17 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				tex->pd->coba = add_colorband(1);
 				tex->pd->speed_scale = 1.0f;
 			}
+			
+			if (tex->vd == NULL) {
+				tex->vd = BKE_add_voxeldata();
+			} else if (tex->vd->resolX == 0) {
+				tex->vd->dataset = NULL;
+				tex->vd->resolX = 1;
+				tex->vd->resolY = 1;
+				tex->vd->resolZ = 1;
+				tex->vd->interp_type= TEX_VD_NEARESTNEIGHBOR;
+				tex->vd->int_multiplier = 1.0;
+			}
 		}
 		
 	}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 93bf8111c98..fd87080d0ee 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1339,6 +1339,7 @@ static void write_textures(WriteData *wd, ListBase *idbase)
 				writestruct(wd, DATA, "PointDensity", 1, tex->pd);
 				if(tex->pd->coba) writestruct(wd, DATA, "ColorBand", 1, tex->pd->coba);
 			}
+			if(tex->vd) writestruct(wd, DATA, "VoxelData", 1, tex->vd);
 			
 			/* nodetree is integral part of texture, no libdata */
 			if(tex->nodetree) {
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index fd3f6e926b9..a3cd9d1875b 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -260,6 +260,8 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 #define B_ENV_FREE_ALL	1357
 #define B_TEX_USENODES		1358
 
+#define B_VOXELDATA_LOAD	1359
+
 
 /* **************** animbuts = object buttons ******* */
 #define B_ANIMBUTS		1500
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index f332537e9a8..5172f6a970c 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -69,6 +69,8 @@ typedef struct Material {
 	short vol_stepsize_type;
 	short vol_precache_resolution;
 	float vol_stepsize, vol_shade_stepsize;
+	float vol_depth_cutoff;
+	float vpad;
 	float vol_density_scale;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index b4fcb5efe40..e90df908c2b 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -154,7 +154,7 @@ typedef struct PointDensity {
 	short noise_depth;
 	short noise_influence;
 	short noise_basis;
-	short pdpad3[3];
+    short pdpad3[3];
 	float noise_fac;
 	
 	float speed_scale;
@@ -162,6 +162,18 @@ typedef struct PointDensity {
 	
 } PointDensity;
 
+typedef struct VoxelData {
+	int resolX, resolY, resolZ;
+	int interp_type;
+
+	float int_multiplier;
+	float vxpad;
+	
+	char source_path[240];
+	float *dataset;
+ 
+} VoxelData;
+
 typedef struct Tex {
 	ID id;
 	
@@ -209,6 +221,7 @@ typedef struct Tex {
 	struct EnvMap *env;
 	struct PreviewImage * preview;
 	struct PointDensity *pd;
+	struct VoxelData *vd;
 	
 	char use_nodes;
 	char pad[7];
@@ -250,6 +263,7 @@ typedef struct TexMapping {
 #define TEX_DISTNOISE	13
 /* predicting ocean texture for 14 */
 #define TEX_POINTDENSITY	15
+#define TEX_VOXELDATA		16
 
 /* musgrave stype */
 #define TEX_MFRACTAL		0
@@ -465,5 +479,13 @@ typedef struct TexMapping {
 #define POINT_DATA_VEL		1
 #define POINT_DATA_LIFE		2
 
+/******************** Voxel Data *****************************/ 
+#define TEX_VD_CUBIC              0
+#define TEX_VD_PARALLELOGRAM      1
+ 
+#define TEX_VD_NEARESTNEIGHBOR		0
+#define TEX_VD_LINEAR			1
+#define TEX_VD_TRICUBIC				2
+
 #endif
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 6f4537d84fb..65bb12e059d 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -203,6 +203,8 @@ struct Render
 	struct Object *excludeob;
 	
 	ListBase vol_precache_obs;
+	ListBase render_volumes_inside;
+	ListBase volumes;
 
 	/* arena for allocating data for use during render, for
 		* example dynamic TFaces to go in the VlakRen structure.
@@ -409,6 +411,18 @@ typedef struct VolPrecache
 	struct ObjectRen *obr;
 } VolPrecache;
 
+typedef struct VolumeOb
+{
+	struct VolumeOb *next, *prev;
+	struct Material *ma;
+	struct ObjectRen *obr;
+} VolumeOb;
+
+typedef struct MatInside {
+	struct MatInside *next, *prev;
+	struct Material *ma;
+} MatInside;
+
 /* ------------------------------------------------------------------------- */
 
 struct LampRen;
diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index 7a719840f48..78409e4c646 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -27,4 +27,5 @@
  */
  
 void volume_precache(Render *re);
-void free_volume_precache(Render *re);
\ No newline at end of file
+void free_volume_precache(Render *re);
+int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
\ No newline at end of file
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 09f2d1275f4..d87ee65c42c 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -104,6 +104,7 @@
 #include "multires.h"
 #include "occlusion.h"
 #include "pointdensity.h"
+#include "voxeldata.h"
 #include "render_types.h"
 #include "rendercore.h"
 #include "renderdatabase.h"
@@ -3028,16 +3029,51 @@ static void use_mesh_edge_lookup(ObjectRen *obr, DerivedMesh *dm, MEdge *medge,
 	}
 }
 
-static void add_vol_precache(Render *re, ObjectRen *obr, Material *ma)
+static void free_camera_inside_volumes(Render *re)
 {
-	struct VolPrecache *vp;
+	BLI_freelistN(&re->render_volumes_inside);
+}
+
+static void init_camera_inside_volumes(Render *re)
+{
+	ObjectInstanceRen *obi;
+	VolumeOb *vo;
+	float co[3] = {0.f, 0.f, 0.f};
+
+	for(vo= re->volumes.first; vo; vo= vo->next) {
+		for(obi= re->instancetable.first; obi; obi= obi->next) {
+			if (obi->obr == vo->obr) {
+				if (point_inside_volume_objectinstance(obi, co)) {
+					MatInside *mi;
+					
+					mi = MEM_mallocN(sizeof(MatInside), "camera inside material");
+					mi->ma = vo->ma;
+					
+					BLI_addtail(&(re->render_volumes_inside), mi);
+				}
+			}
+		}
+	}
 	
-	vp = MEM_mallocN(sizeof(VolPrecache), "volume precache object");
+	{
+	MatInside *m;
+	for (m=re->render_volumes_inside.first; m; m=m->next) {
+		printf("matinside: ma: %s \n", m->ma->id.name+2);
+	}
 	
-	vp->ma = ma;
-	vp->obr = obr;
+	}
+}
+
+static void add_volume(Render *re, ObjectRen *obr, Material *ma)
+{
+	struct VolumeOb *vo;
 	
-	BLI_addtail(&re->vol_precache_obs, vp);
+	vo = MEM_mallocN(sizeof(VolumeOb), "volume object");
+	
+	vo->ma = ma;
+	vo->obr = obr;
+	
+	BLI_addtail(&re->volumes, vo);
 }
 
 static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
@@ -3095,9 +3131,8 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 				if(ma->mode & MA_RADIO) 
 					do_autosmooth= 1;
 			
-			if ((ma->material_type == MA_VOLUME) && (ma->vol_shadeflag & MA_VOL_PRECACHESHADING)) {
-				add_vol_precache(re, obr, ma);
-			}
+			if (ma->material_type == MA_VOLUME)
+				add_volume(re, obr, ma);
 		}
 	}
 
@@ -4457,6 +4492,9 @@ void RE_Database_Free(Render *re)
 	end_render_textures();
 	
 	free_pointdensities(re);
+	free_voxeldata(re);
+	
+	free_camera_inside_volumes(re);
 	
 	if(re->wrld.aosphere) {
 		MEM_freeN(re->wrld.aosphere);
@@ -4861,6 +4899,8 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 
 	/* MAKE RENDER DATA */
 	database_init_objects(re, lay, 0, 0, 0, 0);
+	
+	init_camera_inside_volumes(re);
 
 	if(!re->test_break()) {
 		int tothalo;
@@ -4912,6 +4952,9 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 			/* point density texture */
 			if(!re->test_break())
 				make_pointdensities(re);
+			/* voxel data texture */
+			if(!re->test_break())
+				make_voxeldata(re);//Volumetrics
 		}
 		
 		if(!re->test_break())
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index d7d4d124b18..d7b41d7cc2c 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -65,6 +65,7 @@
 
 #include "envmap.h"
 #include "pointdensity.h"
+#include "voxeldata.h"
 #include "renderpipeline.h"
 #include "render_types.h"
 #include "rendercore.h"
@@ -1257,6 +1258,10 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
 	case TEX_POINTDENSITY:
 		retval= pointdensitytex(tex, texvec, texres);
 		break;
+	case TEX_VOXELDATA:
+		retval= voxeldatatex(tex, texvec, texres);  
+		break;
+
 	}
 
 	if (tex->flag & TEX_COLORBAND) {
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 246f9bc6d69..89f997f4b99 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -400,7 +400,7 @@ static void *vol_precache_part(void *data)
 	return 0;
 }
 
-void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Material *ma, ShadeInput *shi)
+static void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Material *ma, ShadeInput *shi)
 {
 	float view[3] = {0.0,0.0,-1.0};
 	
@@ -417,6 +417,34 @@ void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Material *ma,
 	VECCOPY(shi->view, view);
 }
 
+static void precache_init_parts(ListBase *precache_parts, RayTree *tree, ShadeInput *shi, ObjectInstanceRen *obi, float *bbmin, float *bbmax, int res)
+{
+	int i;
+	float voxel[3];
+
+	VecSubf(voxel, bbmax, bbmin);
+	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
+		return;
+	VecMulf(voxel, 1.0f/res);
+
+	for(i=0; i < totparts; i++) {
+		VolPrecachePart *pa= MEM_callocN(sizeof(VolPrecachePart), "new precache part");
+	
+		pa->done = 0;
+		pa->num = i;
+		
+		pa->res = res;
+		VECCOPY(pa->bbmin, bbmin);
+		VECCOPY(precache_parts[j].voxel, voxel);
+		precache_parts[j].tree = tree;
+		precache_parts[j].shi = shi;
+		precache_parts[j].obi = obi;
+		
+		BLI_addtail(precache_parts, pa);
+	}
+	
+}
+
 void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
 {
 	int x, y, z;
@@ -431,13 +459,12 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	int res_2, res_3;
 	
 	int edgeparts=2;
-	int totparts;
-	ListBase threads;
+	ListBase threads, precache_parts;
 	int cont= 1;
 	int xparts, yparts, zparts;
 	float part[3];
 	int totthread = re->r.threads;
-	ListBase precache_parts;
+	int totparts = edgeparts*edgeparts*edgeparts;
 	VolPrecachePart *nextpa;
 	int j;
 	
@@ -452,41 +479,13 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	 * used for checking if the cached point is inside or outside. */
 	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
+	
+	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
 
 	/* Need a shadeinput to calculate scattering */
 	precache_setup_shadeinput(re, obi, ma, &shi);
+	precache_init_parts(&precache_parts, tree, shi, obi, bbmin, bbmax, res);
 
-	VecSubf(voxel, bbmax, bbmin);
-	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
-		return;
-	VecMulf(voxel, 1.0f/res);
-	
-	part[0] = ceil(res/(float)xparts); 
-	part[1] = ceil(res/(float)yparts);
-	part[2] = ceil(res/(float)zparts);
-	
-	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
-	
-	totparts = edgeparts*edgeparts*edgeparts;
-	precache_parts= MEM_callocN(sizeof(VolPrecachePart)*totparts, "VolPrecachePart");
-	memset(precache_parts, 0, sizeof(VolPrecachePart)*totparts);
-
-	precache_init_parts(precache_parts);
-
-	for(j=0; j < totparts; j++) {
-		VolPrecachePart *pa= MEM_callocN(sizeof(VolPrecachePart), "new precache part");
-	
-		pa->done = 0;
-		pa->num = j;
-		
-		pa->res = res;
-		VECCOPY(pa->bbmin, bbmin);
-		VECCOPY(precache_parts[j].voxel, voxel);
-		precache_parts[j].tree = tree;
-		precache_parts[j].shi = shi;
-		precache_parts[j].obi = obi;
-	}
-	
 	BLI_init_threads(&threads, vol_precache_part, totthread);
 	
 	nextpa = precache_get_new_part(precache_threads);
@@ -600,12 +599,15 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 void volume_precache(Render *re)
 {
 	ObjectInstanceRen *obi;
-	VolPrecache *vp;
+	VolumeOb *vo;
 
-	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
-		for(obi= re->instancetable.first; obi; obi= obi->next) {
-			if (obi->obr == vp->obr) 
-				vol_precache_objectinstance(re, obi, vp->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+	for(vo= re->volumes.first; vo; vo= vo->next) {
+		if (vo->ma->vol_shadeflag & MA_VOL_PRECACHESHADING) {
+			for(obi= re->instancetable.first; obi; obi= obi->next) {
+				if (obi->obr == vo->obr) {
+					vol_precache_objectinstance(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+				}
+			}
 		}
 	}
 	
@@ -624,3 +626,19 @@ void free_volume_precache(Render *re)
 	
 	BLI_freelistN(&re->vol_precache_obs);
 }
+
+int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co)
+{
+	RayTree *tree;
+	int inside=0;
+	
+	tree = create_raytree_obi(obi, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+	if (!tree) return 0;
+	
+	inside = point_inside_obi(tree, obi, co);
+	
+	RE_ray_tree_free(tree);
+	tree= NULL;
+	
+	return inside;
+}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 45d54d40fa1..fba847da2ad 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): Matt Ebb, Raul Hernandez.
+ * Contributor(s): Matt Ebb, Raul Fernandez Hernandez (Farsthary)
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -134,6 +134,11 @@ float vol_get_stepsize(struct ShadeInput *shi, int context)
 	return shi->mat->vol_stepsize;
 }
 
+static float vol_get_depth_cutoff(struct ShadeInput *shi)
+{
+	return shi->mat->vol_depth_cutoff;
+}
+
 /* SHADING */
 
 static float D(ShadeInput *shi, int rgb, int x, int y, int z)
@@ -278,7 +283,7 @@ float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w
 void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 {
 	float dummy = 1.0f;
-	float absorption = shi->mat->vol_absorption;
+	const float absorption = shi->mat->vol_absorption;
 	
 	VECCOPY(absorb_col, shi->mat->vol_absorption_col);
 	
@@ -296,14 +301,13 @@ void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, float density, float stepsize)
 {
 	/* input density = density at co */
-	float dist;
 	float absorb_col[3];
 	int s, nsteps;
 	float step_vec[3], step_sta[3], step_end[3];
+	const float dist = VecLenf(co, endco);
 
 	vol_get_absorption(shi, absorb_col, co);
 
-	dist = VecLenf(co, endco);
 	nsteps = (int)((dist / stepsize) + 0.5);
 	
 	/* trigger for recalculating density */
@@ -468,6 +472,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	float tau[3], emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
 	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
 	float density = vol_get_density(shi, co);
+	const float depth_cutoff = vol_get_depth_cutoff(shi);
 	
 	/* multiply col_behind with beam transmittance over entire distance */
 	vol_get_attenuation(shi, tau, co, endco, density, stepsize);
@@ -524,6 +529,9 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 
 		VecCopyf(step_sta, step_end);
 		VecAddf(step_end, step_end, stepvec);
+		
+		/* luminance rec. 709 */
+		if ((0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]) < depth_cutoff) break;	
 	}
 	
 	VecCopyf(col, radiance);
diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c
index 2ca709184c5..6d8f806d8f9 100644
--- a/source/blender/src/butspace.c
+++ b/source/blender/src/butspace.c
@@ -92,7 +92,7 @@ MTex mtexcopybuf;
 
 char texstr[20][12]= {"None"  , "Clouds" , "Wood", "Marble", "Magic"  , "Blend",
 					 "Stucci", "Noise"  , "Image", "Plugin", "EnvMap" , "Musgrave",
-					 "Voronoi", "DistNoise", "", "PointDensity", "", "", "", ""};
+					 "Voronoi", "DistNoise", "", "PointDensity", "VoxelData", "", "", ""};
 /*  ---------------------------------------------------------------------- */
 
 void test_idbutton_cb(void *namev, void *arg2)
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index a8aa00370d9..6e69414fbe0 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -264,6 +264,19 @@ static int vergcband(const void *a1, const void *a2)
 	return 0;
 }
 
+static void voxeldata_filename(char *str, void *tex_v, void *unused)	/* called from fileselect */
+{
+	Tex *tex= tex_v;
+	
+	if(tex->type!=TEX_VOXELDATA) return;
+	
+	strcpy(tex->vd->source_path, str);
+	
+	allqueue(REDRAWBUTSSHADING, 0);
+	BIF_preview_changed(ID_TE);
+	BIF_undo_push("Open voxel data source");
+}
+
 void do_texbuts(unsigned short event)
 {
 	Tex *tex;
@@ -425,7 +438,25 @@ void do_texbuts(unsigned short event)
 		allqueue(REDRAWBUTSSHADING, 0);
 		allqueue(REDRAWIPO, 0);
 		break;
+	
+	case B_VOXELDATA_LOAD:
+		if (tex->vd==NULL) {
+			tex->vd= BKE_add_voxeldata();
+#ifdef _WIN32
+			if (strcmp (U.textudir, "/") == 0)
+				strcpy(str, G.sce);
+			else
+				strcpy(str, U.textudir);
+#else
+			strcpy(str, U.textudir);
+#endif
+		}
+		else strcpy(str, tex->vd->source_path);
 		
+		sa= closest_bigger_area();
+		areawinset(sa->win);
+		activate_fileselect_args(FILE_SPECIAL, "Open Voxel Data", str, voxeldata_filename, tex, NULL);
+		break;
 	default:
 		if(event>=B_PLUGBUT && event<=B_PLUGBUT+23) {
 			PluginTex *pit= tex->plugin;
@@ -1016,6 +1047,48 @@ static void texture_panel_pointdensity_modify(Tex *tex)
 
 }
 
+static void texture_panel_voxeldata(Tex *tex)
+{
+	uiBlock *block;
+	VoxelData *vd;
+	short yco=PANEL_YMAX;
+
+	block= uiNewBlock(&curarea->uiblocks, "texture_panel_voxeldata", UI_EMBOSS, UI_HELV, curarea->win);
+	if(uiNewPanel(curarea, block, "Voxel Data", "Texture", PANELX, PANELY, PANELW, PANELH)==0) return;
+	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+
+	if(tex->vd==NULL) {
+		tex->vd= BKE_add_voxeldata();
+	}
+
+	if(tex->vd) {
+		vd= tex->vd;
+		
+		uiDefBut(block, LABEL, B_NOP, "Data source:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			
+		uiDefIconTextBut(block, BUT, B_VOXELDATA_LOAD, ICON_FILESEL, "Open",
+			X4CLM1, yco-=BUTH, BUTW4, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefBut(block, TEX, 0, "",
+			X4CLM2+XSPACE, yco, BUTW2+BUTW4+2*XSPACE, BUTH, &vd->source_path, 0.0, 79.0, 0, 0, "File path to the voxel data set");
+
+		yco -= YSPACE;
+		
+		uiDefBut(block, LABEL, B_NOP, "Interpolation:",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefButI(block, MENU, B_REDR, "None %x0|Linear %x1|Tricubic %x2",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &vd->interp_type, 0.0, 0.0, 0, 0, "Interpolation type");		
+		
+		uiDefButI(block, NUM, B_REDR, "Resolution: ",
+			X2CLM2, yco, BUTW2, BUTH, &(vd->resolX), 1, 10000, 0, 0, "Resolution of the voxel data");
+			
+		yco -= YSPACE;
+		
+		uiDefButF(block, NUM, B_REDR, "Intensity: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(vd->int_multiplier), 0.0001, 10000.0, 0, 0, "Multiplier to scale up or down the texture's intensity");
+	}
+}
+
 static char *layer_menu(RenderResult *rr, short *curlay)
 {
 	RenderLayer *rl;
@@ -1865,7 +1938,7 @@ static void texture_panel_texture(MTex *actmtex, Material *ma, World *wrld, Lamp
 		/* newnoise: all texture types as menu, not enough room for more buttons.
 		 * Can widen panel, but looks ugly when other panels overlap it */
 		if( !tex->use_nodes ) {
-			sprintf(textypes, "Texture Type %%t|None %%x%d|Image %%x%d|EnvMap %%x%d|Clouds %%x%d|Marble %%x%d|Stucci %%x%d|Wood %%x%d|Magic %%x%d|Blend %%x%d|Noise %%x%d|Plugin %%x%d|Musgrave %%x%d|Voronoi %%x%d|DistortedNoise %%x%d|Point Density %%x%d", 0, TEX_IMAGE, TEX_ENVMAP, TEX_CLOUDS, TEX_MARBLE, TEX_STUCCI, TEX_WOOD, TEX_MAGIC, TEX_BLEND, TEX_NOISE, TEX_PLUGIN, TEX_MUSGRAVE, TEX_VORONOI, TEX_DISTNOISE, TEX_POINTDENSITY);
+			sprintf(textypes, "Texture Type %%t|None %%x%d|Image %%x%d|EnvMap %%x%d|Clouds %%x%d|Marble %%x%d|Stucci %%x%d|Wood %%x%d|Magic %%x%d|Blend %%x%d|Noise %%x%d|Plugin %%x%d|Musgrave %%x%d|Voronoi %%x%d|DistortedNoise %%x%d|Point Density %%x%d|Voxel Data %%x%d", 0, TEX_IMAGE, TEX_ENVMAP, TEX_CLOUDS, TEX_MARBLE, TEX_STUCCI, TEX_WOOD, TEX_MAGIC, TEX_BLEND, TEX_NOISE, TEX_PLUGIN, TEX_MUSGRAVE, TEX_VORONOI, TEX_DISTNOISE, TEX_POINTDENSITY, TEX_VOXELDATA);
 			uiDefBut(block, LABEL, 0, "Texture Type",		160, 150, 140, 20, 0, 0.0, 0.0, 0, 0, "");
 			uiDefButS(block, MENU, B_TEXTYPE, textypes,	160, 125, 140, 25, &tex->type, 0,0,0,0, "Select texture type");
 		}
@@ -4449,6 +4522,8 @@ static void material_panel_material_volume(Material *ma)
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_stepsize), 0.001, 100.0, 10, 2, "Ray marching step size");
 	uiDefButS(block, MENU, B_TEXREDR_PRV, "Step Size Calculation %t|Randomized %x0|Constant %x1",
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_stepsize_type, 0.0, 0.0, 0, 0, "Step size calculation, randomized replaces banding with jittering");
+	uiDefButF(block, NUM, B_MATPRV, "Depth Cutoff: ",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_depth_cutoff), 0.001, 1.0, 10, 2, "Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy ");
 	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
@@ -4921,6 +4996,9 @@ void texture_panels()
 				texture_panel_pointdensity(tex);
 				texture_panel_pointdensity_modify(tex);
 				break;
+			case TEX_VOXELDATA:
+				texture_panel_voxeldata(tex);
+				break;
 			}
 		}
 	}

From c2f037da073856ab44096df6d7e5dfbebb5f5efa Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 13 Dec 2008 05:43:10 +0000
Subject: [PATCH 070/577] and the new voxel data files..

---
 .../blender/render/intern/include/voxeldata.h |  45 ++
 .../blender/render/intern/source/voxeldata.c  | 444 ++++++++++++++++++
 2 files changed, 489 insertions(+)
 create mode 100644 source/blender/render/intern/include/voxeldata.h
 create mode 100644 source/blender/render/intern/source/voxeldata.c

diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h
new file mode 100644
index 00000000000..504d5523db6
--- /dev/null
+++ b/source/blender/render/intern/include/voxeldata.h
@@ -0,0 +1,45 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Raul Fernandez Hernandez (Farsthary), Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef VOXELDATA_H
+#define VOXELDATA_H 
+
+/**
+ * Load voxel data for all point density textures in the scene
+ */
+
+struct Render;
+struct TexResult;
+
+int _I(int x,int y,int z,int n);
+void make_voxeldata(struct Render *re);
+void free_voxeldata(struct Render *re);
+int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres);
+
+
+#endif /* VOXELDATA_H */
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
new file mode 100644
index 00000000000..b2521e59b41
--- /dev/null
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -0,0 +1,444 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Raul Fernandez Hernandez (Farsthary), Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+
+#include "BKE_global.h"
+#include "BKE_main.h"
+
+#include "DNA_texture_types.h"
+#include "render_types.h"
+#include "renderdatabase.h"
+#include "texture.h"
+
+/*---------------------------Utils----------------------------------------*/
+int _I(int x,int y,int z,int n)
+{
+	return (z*(n)+y)*(n)+x;
+}
+
+float Linear(float xx,float yy,float zz,float *x0,int n)
+{
+	float sx1,sx0,sy1,sy0,sz1,sz0,v0,v1;
+	int i0,i1,j0,j1,k0,k1;
+	
+	if (xx<0.5) xx=0.5f; if (xx>n+0.5) xx=n+0.5f; i0=(int)xx; i1=i0+1;
+	if (yy<0.5) yy=0.5f; if (yy>n+0.5) yy=n+0.5f; j0=(int)yy; j1=j0+1;
+	if (zz<0.5) zz=0.5f; if (zz>n+0.5) zz=n+0.5f; k0=(int)zz; k1=k0+1;
+	
+	sx1 = xx-i0; sx0 = 1-sx1;
+	sy1 = yy-j0; sy0 = 1-sy1;
+	sz1 = zz-k0; sz0 = 1-sz1;
+	v0 = sx0*(sy0*x0[_I(i0,j0,k0,n)]+sy1*x0[_I(i0,j1,k0,n)])+sx1*(sy0*x0[_I(i1,j0,k0,n)]+sy1*x0[_I(i1,j1,k0,n)]);
+	v1 = sx0*(sy0*x0[_I(i0,j0,k1,n)]+sy1*x0[_I(i0,j1,k1,n)])+sx1*(sy0*x0[_I(i1,j0,k1,n)]+sy1*x0[_I(i1,j1,k1,n)]);
+	return sz0*v0 + sz1*v1;
+	
+}
+
+int C[64][64] = {
+	{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 9,-9,-9, 9, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{-6, 6, 6,-6, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{-6, 6, 6,-6, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 4,-4,-4, 4, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0},
+	{-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 9,-9, 0, 0,-9, 9, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{-6, 6, 0, 0, 6,-6, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9, 0, 0,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0},
+	{ 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0},
+	{-27,27,27,-27,27,-27,-27,27,-18,-9,18, 9,18, 9,-18,-9,-18,18,-9, 9,18,-18, 9,-9,-18,18,18,-18,-9, 9, 9,-9,-12,-6,-6,-3,12, 6, 6, 3,-12,-6,12, 6,-6,-3, 6, 3,-12,12,-6, 6,-6, 6,-3, 3,-8,-4,-4,-2,-4,-2,-2,-1},
+	{18,-18,-18,18,-18,18,18,-18, 9, 9,-9,-9,-9,-9, 9, 9,12,-12, 6,-6,-12,12,-6, 6,12,-12,-12,12, 6,-6,-6, 6, 6, 6, 3, 3,-6,-6,-3,-3, 6, 6,-6,-6, 3, 3,-3,-3, 8,-8, 4,-4, 4,-4, 2,-2, 4, 4, 2, 2, 2, 2, 1, 1},
+	{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0},
+	{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6, 9,-9, 9,-9,-9, 9,-9, 9,12,-12,-12,12, 6,-6,-6, 6, 6, 3, 6, 3,-6,-3,-6,-3, 8, 4,-8,-4, 4, 2,-4,-2, 6,-6, 6,-6, 3,-3, 3,-3, 4, 2, 4, 2, 2, 1, 2, 1},
+	{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-6, 6,-6, 6, 6,-6, 6,-6,-8, 8, 8,-8,-4, 4, 4,-4,-3,-3,-3,-3, 3, 3, 3, 3,-4,-4, 4, 4,-2,-2, 2, 2,-4, 4,-4, 4,-2, 2,-2, 2,-2,-2,-2,-2,-1,-1,-1,-1},
+	{ 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{-6, 6, 0, 0, 6,-6, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 4,-4, 0, 0,-4, 4, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4, 0, 0,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0},
+	{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0},
+	{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6,12,-12, 6,-6,-12,12,-6, 6, 9,-9,-9, 9, 9,-9,-9, 9, 8, 4, 4, 2,-8,-4,-4,-2, 6, 3,-6,-3, 6, 3,-6,-3, 6,-6, 3,-3, 6,-6, 3,-3, 4, 2, 2, 1, 4, 2, 2, 1},
+	{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-8, 8,-4, 4, 8,-8, 4,-4,-6, 6, 6,-6,-6, 6, 6,-6,-4,-4,-2,-2, 4, 4, 2, 2,-3,-3, 3, 3,-3,-3, 3, 3,-4, 4,-2, 2,-4, 4,-2, 2,-2,-2,-1,-1,-2,-2,-1,-1},
+	{ 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
+	{-12,12,12,-12,12,-12,-12,12,-8,-4, 8, 4, 8, 4,-8,-4,-6, 6,-6, 6, 6,-6, 6,-6,-6, 6, 6,-6,-6, 6, 6,-6,-4,-2,-4,-2, 4, 2, 4, 2,-4,-2, 4, 2,-4,-2, 4, 2,-3, 3,-3, 3,-3, 3,-3, 3,-2,-1,-2,-1,-2,-1,-2,-1},
+	{ 8,-8,-8, 8,-8, 8, 8,-8, 4, 4,-4,-4,-4,-4, 4, 4, 4,-4, 4,-4,-4, 4,-4, 4, 4,-4,-4, 4, 4,-4,-4, 4, 2, 2, 2, 2,-2,-2,-2,-2, 2, 2,-2,-2, 2, 2,-2,-2, 2,-2, 2,-2, 2,-2, 2,-2, 1, 1, 1, 1, 1, 1, 1, 1}};
+
+int ijk2n(int i, int j, int k) {
+	return(i+4*j+16*k);
+}
+
+void tricubic_get_coeff_stacked(float a[64], float x[64]) {
+	int i,j;
+	for (i=0;i<64;i++) {
+		a[i]=(float)(0.0);
+		for (j=0;j<64;j++) {
+			a[i]+=C[i][j]*x[j];
+		}
+	}
+}
+
+void point2xyz(int p, int *x, int *y, int *z) {
+	switch (p) {
+		case 0: *x=0; *y=0; *z=0; break;
+		case 1: *x=1; *y=0; *z=0; break;
+		case 2: *x=0; *y=1; *z=0; break;
+		case 3: *x=1; *y=1; *z=0; break;
+		case 4: *x=0; *y=0; *z=1; break;
+		case 5: *x=1; *y=0; *z=1; break;
+		case 6: *x=0; *y=1; *z=1; break;
+		case 7: *x=1; *y=1; *z=1; break;
+		default:*x=0; *y=0; *z=0;
+	}
+}
+
+
+void tricubic_get_coeff(float a[64], float f[8], float dfdx[8], float dfdy[8], float dfdz[8], float d2fdxdy[8], float d2fdxdz[8], float d2fdydz[8], float d3fdxdydz[8]) {
+	int i;
+	float x[64];
+	for (i=0;i<8;i++) {
+		x[0+i]=f[i];
+		x[8+i]=dfdx[i];
+		x[16+i]=dfdy[i];
+		x[24+i]=dfdz[i];
+		x[32+i]=d2fdxdy[i];
+		x[40+i]=d2fdxdz[i];
+		x[48+i]=d2fdydz[i];
+		x[56+i]=d3fdxdydz[i];
+	}
+	tricubic_get_coeff_stacked(a,x);
+}
+
+float tricubic_eval(float a[64], float x, float y, float z) {
+	int i,j,k;
+	float ret=(float)(0.0);
+	
+	for (i=0;i<4;i++) {
+		for (j=0;j<4;j++) {
+			for (k=0;k<4;k++) {
+				ret+=a[ijk2n(i,j,k)]*pow(x,i)*pow(y,j)*pow(z,k);
+			}
+		}
+	}
+	return(ret);
+}
+
+
+float tricubic(float xx,float yy,float zz,float *heap,int n)
+{
+	
+	int xi,yi,zi;	
+	
+	if (xx<0.5) xx=0.5f; if (xx>n+0.5) xx=n+0.5f; xi=(int)xx; 
+	if (yy<0.5) yy=0.5f; if (yy>n+0.5) yy=n+0.5f; yi=(int)yy; 
+	if (zz<0.5) zz=0.5f; if (zz>n+0.5) zz=n+0.5f; zi=(int)zz; 
+	
+	float a[64]; 
+	
+	float fval[8]={heap[_I(xi,yi,zi,n)],heap[_I(xi+1,yi,zi,n)],heap[_I(xi,yi+1,zi,n)],heap[_I(xi+1,yi+1,zi,n)],heap[_I(xi,yi,zi+1,n)],heap[_I(xi+1,yi,zi+1,n)],heap[_I(xi,yi+1,zi+1,n)],heap[_I(xi+1,yi+1,zi+1,n)]}; 
+	
+	float dfdxval[8]={0.5f*(heap[_I(xi+1,yi,zi,n)]-heap[_I(xi-1,yi,zi,n)]),0.5f*(heap[_I(xi+2,yi,zi,n)]-heap[_I(xi,yi,zi,n)]),
+		0.5f*(heap[_I(xi+1,yi+1,zi,n)]-heap[_I(xi-1,yi+1,zi,n)]),0.5f*(heap[_I(xi+2,yi+1,zi,n)]-heap[_I(xi,yi+1,zi,n)]),
+		0.5f*(heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi-1,yi,zi+1,n)]),0.5f*(heap[_I(xi+2,yi,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]),
+		0.5f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]),
+	0.5f*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)])};						
+	
+	float dfdyval[8]={0.5f*(heap[_I(xi,yi+1,zi,n)]-heap[_I(xi,yi-1,zi,n)]),0.5f*(heap[_I(xi+1,yi+1,zi,n)]-heap[_I(xi+1,yi-1,zi,n)]),
+		0.5f*(heap[_I(xi,yi+2,zi,n)]-heap[_I(xi,yi,zi,n)]),0.5f*(heap[_I(xi+1,yi+2,zi,n)]-heap[_I(xi+1,yi,zi,n)]),
+		0.5f*(heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi,yi-1,zi+1,n)]),0.5f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]),
+		0.5f*(heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]),
+	0.5f*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)])};						 
+	
+	float dfdzval[8]={0.5f*(heap[_I(xi,yi,zi+1,n)]-heap[_I(xi,yi,zi-1,n)]),0.5f*(heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi+1,yi,zi-1,n)]),
+		0.5f*(heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi-1,n)]),0.5f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]),
+		0.5f*(heap[_I(xi,yi,zi+2,n)]-heap[_I(xi,yi,zi,n)]),0.5f*(heap[_I(xi+1,yi,zi+2,n)]-heap[_I(xi+1,yi,zi,n)]),
+		0.5f*(heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi,n)]),
+	0.5f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)])};						 
+	
+	float d2fdxdyval[8]={0.25*(heap[_I(xi+1,yi+1,zi,n)]-heap[_I(xi-1,yi+1,zi,n)]-heap[_I(xi+1,yi-1,zi,n)]+heap[_I(xi-1,yi-1,zi,n)]),
+		0.25*(heap[_I(xi+2,yi+1,zi,n)]-heap[_I(xi,yi+1,zi,n)]-heap[_I(xi+2,yi-1,zi,n)]+heap[_I(xi,yi-1,zi,n)]),
+		0.25*(heap[_I(xi+1,yi+2,zi,n)]-heap[_I(xi-1,yi+2,zi,n)]-heap[_I(xi+1,yi,zi,n)]+heap[_I(xi-1,yi,zi,n)]),
+		0.25*(heap[_I(xi+2,yi+2,zi,n)]-heap[_I(xi,yi+2,zi,n)]-heap[_I(xi+2,yi,zi,n)]+heap[_I(xi,yi,zi,n)]),
+		0.25*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]+heap[_I(xi-1,yi-1,zi+1,n)]),
+		0.25*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi+2,yi-1,zi+1,n)]+heap[_I(xi,yi-1,zi+1,n)]),
+		0.25*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi-1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)]+heap[_I(xi-1,yi,zi+1,n)]),
+	0.25*(heap[_I(xi+2,yi+2,zi+1,n)]-heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi+2,yi,zi+1,n)]+heap[_I(xi,yi,zi+1,n)])};						 
+	
+	float d2fdxdzval[8]={0.25f*(heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi-1,yi,zi+1,n)]-heap[_I(xi+1,yi,zi-1,n)]+heap[_I(xi-1,yi,zi-1,n)]),
+		0.25f*(heap[_I(xi+2,yi,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]-heap[_I(xi+2,yi,zi-1,n)]+heap[_I(xi,yi,zi-1,n)]),
+		0.25f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]+heap[_I(xi-1,yi+1,zi-1,n)]),
+		0.25f*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi+2,yi+1,zi-1,n)]+heap[_I(xi,yi+1,zi-1,n)]),
+		0.25f*(heap[_I(xi+1,yi,zi+2,n)]-heap[_I(xi-1,yi,zi+2,n)]-heap[_I(xi+1,yi,zi,n)]+heap[_I(xi-1,yi,zi,n)]),
+		0.25f*(heap[_I(xi+2,yi,zi+2,n)]-heap[_I(xi,yi,zi+2,n)]-heap[_I(xi+2,yi,zi,n)]+heap[_I(xi,yi,zi,n)]),
+		0.25f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi-1,yi+1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)]+heap[_I(xi-1,yi+1,zi,n)]),
+	0.25f*(heap[_I(xi+2,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi+2,yi+1,zi,n)]+heap[_I(xi,yi+1,zi,n)])};
+	
+	
+	float d2fdydzval[8]={0.25f*(heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi,yi-1,zi+1,n)]-heap[_I(xi,yi+1,zi-1,n)]+heap[_I(xi,yi-1,zi-1,n)]),
+		0.25f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]+heap[_I(xi+1,yi-1,zi-1,n)]),
+		0.25f*(heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]-heap[_I(xi,yi+2,zi-1,n)]+heap[_I(xi,yi,zi-1,n)]),
+		0.25f*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi+1,yi+2,zi-1,n)]+heap[_I(xi+1,yi,zi-1,n)]),
+		0.25f*(heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi,yi-1,zi+2,n)]-heap[_I(xi,yi+1,zi,n)]+heap[_I(xi,yi-1,zi,n)]),
+		0.25f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi+1,yi-1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)]+heap[_I(xi+1,yi-1,zi,n)]),
+		0.25f*(heap[_I(xi,yi+2,zi+2,n)]-heap[_I(xi,yi,zi+2,n)]-heap[_I(xi,yi+2,zi,n)]+heap[_I(xi,yi,zi,n)]),
+	0.25f*(heap[_I(xi+1,yi+2,zi+2,n)]-heap[_I(xi+1,yi,zi+2,n)]-heap[_I(xi+1,yi+2,zi,n)]+heap[_I(xi+1,yi,zi,n)])};
+	
+	
+	float d3fdxdydzval[8]={0.125f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]+heap[_I(xi-1,yi-1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]+heap[_I(xi-1,yi+1,zi-1,n)]+heap[_I(xi+1,yi-1,zi-1,n)]-heap[_I(xi-1,yi-1,zi-1,n)]),
+		0.125f*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi+2,yi-1,zi+1,n)]+heap[_I(xi,yi-1,zi+1,n)]-heap[_I(xi+2,yi+1,zi-1,n)]+heap[_I(xi,yi+1,zi-1,n)]+heap[_I(xi+2,yi-1,zi-1,n)]-heap[_I(xi,yi-1,zi-1,n)]),
+		0.125f*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi-1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)]+heap[_I(xi-1,yi,zi+1,n)]-heap[_I(xi+1,yi+2,zi-1,n)]+heap[_I(xi-1,yi+2,zi-1,n)]+heap[_I(xi+1,yi,zi-1,n)]-heap[_I(xi-1,yi,zi-1,n)]),
+		0.125f*(heap[_I(xi+2,yi+2,zi+1,n)]-heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi+2,yi,zi+1,n)]+heap[_I(xi,yi,zi+1,n)]-heap[_I(xi+2,yi+2,zi-1,n)]+heap[_I(xi,yi+2,zi-1,n)]+heap[_I(xi+2,yi,zi-1,n)]-heap[_I(xi,yi,zi-1,n)]),
+		0.125f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi-1,yi+1,zi+2,n)]-heap[_I(xi+1,yi-1,zi+2,n)]+heap[_I(xi-1,yi-1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)]+heap[_I(xi-1,yi+1,zi,n)]+heap[_I(xi+1,yi-1,zi,n)]-heap[_I(xi-1,yi-1,zi,n)]),
+		0.125f*(heap[_I(xi+2,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi+2,yi-1,zi+2,n)]+heap[_I(xi,yi-1,zi+2,n)]-heap[_I(xi+2,yi+1,zi,n)]+heap[_I(xi,yi+1,zi,n)]+heap[_I(xi+2,yi-1,zi,n)]-heap[_I(xi,yi-1,zi,n)]),
+		0.125f*(heap[_I(xi+1,yi+2,zi+2,n)]-heap[_I(xi-1,yi+2,zi+2,n)]-heap[_I(xi+1,yi,zi+2,n)]+heap[_I(xi-1,yi,zi+2,n)]-heap[_I(xi+1,yi+2,zi,n)]+heap[_I(xi-1,yi+2,zi,n)]+heap[_I(xi+1,yi,zi,n)]-heap[_I(xi-1,yi,zi,n)]),
+	0.125f*(heap[_I(xi+2,yi+2,zi+2,n)]-heap[_I(xi,yi+2,zi+2,n)]-heap[_I(xi+2,yi,zi+2,n)]+heap[_I(xi,yi,zi+2,n)]-heap[_I(xi+2,yi+2,zi,n)]+heap[_I(xi,yi+2,zi,n)]+heap[_I(xi+2,yi,zi,n)]-heap[_I(xi,yi,zi,n)])};
+	
+	tricubic_get_coeff(a,fval,dfdxval,dfdyval,dfdzval,d2fdxdyval,d2fdxdzval,d2fdydzval,d3fdxdydzval);
+	
+	float dx=xx-xi;
+	float dy=yy-yi;
+	float dz=zz-zi;
+	
+	return tricubic_eval(a,dx,dy,dz);
+	
+}
+
+
+
+
+
+/*--------------------------------------------------------------------*/
+
+void load_frame (FILE *fp,float *F, int size,int frame)
+{
+	
+	fseek(fp,frame*size*sizeof(float),0);
+	fread(F,sizeof(float),size,fp);
+}
+
+
+
+
+void cache_voxeldata(struct Render *re,Tex *tex)
+{	
+	VoxelData *vd = tex->vd;
+	FILE *fp;
+	int size;
+	
+	if (!vd) return;
+	
+	vd->resolY=vd->resolX; //for now only support cubic datasets (rectangular datasets could be added latter)
+	vd->resolZ=vd->resolX;
+	size = (vd->resolX)*(vd->resolY)*(vd->resolZ);	
+	
+	vd->dataset=MEM_mallocN(sizeof(float)*size, "voxel dataset");	
+	
+	if (!BLI_exists(vd->source_path)) return;
+	fp = fopen(vd->source_path,"rb");
+	if (!fp) return;
+	
+	load_frame(fp, vd->dataset, size, re->r.cfra); //here improve the dataset loading function for more dataset types	
+	
+	fclose(fp);
+	
+}
+
+void make_voxeldata(struct Render *re)
+{
+    Tex *tex;
+	
+	if(re->scene->r.scemode & R_PREVIEWBUTS)
+		return;
+	
+	re->i.infostr= "Loading voxel datasets";
+	re->stats_draw(&re->i);
+	
+	for (tex= G.main->tex.first; tex; tex= tex->id.next) {
+		if(tex->id.us && tex->type==TEX_VOXELDATA) {
+			cache_voxeldata(re, tex);
+		}
+	}
+	
+	re->i.infostr= NULL;
+	re->stats_draw(&re->i);
+	
+}
+
+static void free_voxeldata_one(Render *re, Tex *tex)
+{
+	VoxelData *vd = tex->vd;
+	
+	if (vd->dataset) {
+		MEM_freeN(vd->dataset);
+		vd->dataset = NULL;
+	}
+}
+
+
+void free_voxeldata(Render *re)
+{
+	Tex *tex;
+	
+	if(re->scene->r.scemode & R_PREVIEWBUTS)
+		return;
+	
+	for (tex= G.main->tex.first; tex; tex= tex->id.next) {
+		if(tex->id.us && tex->type==TEX_VOXELDATA) {
+			free_voxeldata_one(re, tex);
+		}
+	}
+}
+
+int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
+{	 
+    int retval = TEX_INT;
+	VoxelData *vd = tex->vd;	
+	float vec[3] = {0.0, 0.0, 0.0};	
+	float co[3];
+	float dx, dy, dz;
+	int xi, yi, zi;
+	float xf, yf, zf;
+	int i=0, fail=0;
+	int resolX, resolY, resolZ;
+	
+	if ((!vd) || (vd->dataset==NULL)) {
+		texres->tin = 0.0f;
+		return 0;
+	}
+	
+	//here do the calculation of the interpolation types 
+	
+	resolX=vd->resolX;
+	resolY=vd->resolY;
+	resolZ=vd->resolZ;
+	
+	VECCOPY(co, texvec);	
+	
+	dx=1.0f/(resolX);
+	dy=1.0f/(resolY);
+	dz=1.0f/(resolZ);
+	
+	xi=co[0]/dx;
+	yi=co[1]/dy;
+	zi=co[2]/dz;
+	
+	xf=co[0]/dx;
+	yf=co[1]/dy;
+	zf=co[2]/dz;
+	
+	if (xi>1 && xi<resolX)
+	{
+		if (yi>1 && yi<resolY)
+		{
+			if (zi>1 && zi<resolZ)
+			{
+				
+				switch (vd->interp_type)
+				{
+						
+					case TEX_VD_NEARESTNEIGHBOR:
+					{
+						texres->tin = vd->dataset[_I(xi,yi,zi,resolX)];
+						BRICONT; 	
+						break;  
+					}
+					case TEX_VD_LINEAR:
+					{
+						texres->tin = Linear(xf,yf,zf,vd->dataset,resolX);						
+					}
+					case TEX_VD_TRICUBIC:
+					{
+						texres->tin = tricubic(xf,yf,zf,vd->dataset,resolX);
+					}
+						
+				}				  				   
+				
+				
+				
+			} else fail++;
+		} else fail++;
+	} else fail++;
+	
+	if (fail) texres->tin=0.0f;
+
+	texres->tin *= vd->int_multiplier;
+	
+	texres->tr = texres->tin;
+	texres->tg = texres->tin;
+	texres->tb = texres->tin;
+	texres->ta = texres->tin;
+	BRICONTRGB;
+	
+	return retval;	
+}
+
+

From 5f55aa43d055883af35b7c91474e78e79c6fe352 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 14 Dec 2008 02:22:29 +0000
Subject: [PATCH 071/577] * Compile fixes for voxeldata.c (thanks jms)

* Fixed a typo in the patch that made trilinear interpolation really slow

* Replaced the patch's trilinear interpolation code with the existing trilinear code from pbrt / light cache (first stage of unifying this voxel interpolation code)
---
 .../blender/render/intern/source/volumetric.c |  2 +-
 .../blender/render/intern/source/voxeldata.c  | 80 +++++++++++++++----
 2 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index fba847da2ad..3206989d1d7 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -150,7 +150,7 @@ static float D(ShadeInput *shi, int rgb, int x, int y, int z)
 	return shi->obi->volume_precache[rgb*res*res*res + x*res*res + y*res + z];
 }
 
-inline float lerp(float t, float v1, float v2) {
+static inline float lerp(float t, float v1, float v2) {
 	return (1.f - t) * v1 + t * v2;
 }
 
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index b2521e59b41..bffe30b7d80 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -44,7 +44,7 @@
 #include "texture.h"
 
 /*---------------------------Utils----------------------------------------*/
-int _I(int x,int y,int z,int n)
+static inline int _I(int x,int y,int z,int n)
 {
 	return (z*(n)+y)*(n)+x;
 }
@@ -67,6 +67,51 @@ float Linear(float xx,float yy,float zz,float *x0,int n)
 	
 }
 
+
+static float D(float *data, const int res, int x, int y, int z)
+{
+	CLAMP(x, 0, res-1);
+	CLAMP(y, 0, res-1);
+	CLAMP(z, 0, res-1);
+	return data[ _I(x, y, z, res) ];
+}
+
+static inline float lerp(float t, float v1, float v2) {
+	return (1.f - t) * v1 + t * v2;
+}
+
+/* trilinear interpolation */
+static float trilinear(float *data, const int res, float *co)
+{
+	float voxx, voxy, voxz;
+	int vx, vy, vz;
+	float dx, dy, dz;
+	float d00, d10, d01, d11, d0, d1, d_final;
+	float dim[3];
+		
+	if (!data) return;
+	
+	voxx = co[0] * res - 0.5f;
+	voxy = co[1] * res - 0.5f;
+	voxz = co[2] * res - 0.5f;
+	
+	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
+	
+	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
+	
+	d00 = lerp(dx, D(data, res, vx, vy, vz), 		D(data, res, vx+1, vy, vz));
+	d10 = lerp(dx, D(data, res, vx, vy+1, vz), 		D(data, res, vx+1, vy+1, vz));
+	d01 = lerp(dx, D(data, res, vx, vy, vz+1), 		D(data, res, vx+1, vy, vz+1));
+	d11 = lerp(dx, D(data, res, vx, vy+1, vz+1), 	D(data, res, vx+1, vy+1, vz+1));
+	d0 = lerp(dy, d00, d10);
+	d1 = lerp(dy, d01, d11);
+	d_final = lerp(dz, d0, d1);
+	
+	return d_final;
+
+}
+
+
 int C[64][64] = {
 	{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -196,14 +241,16 @@ float tricubic_eval(float a[64], float x, float y, float z) {
 float tricubic(float xx,float yy,float zz,float *heap,int n)
 {
 	
-	int xi,yi,zi;	
+	int xi,yi,zi;
+	float dx,dy,dz;
+	float a[64];
+
 	
 	if (xx<0.5) xx=0.5f; if (xx>n+0.5) xx=n+0.5f; xi=(int)xx; 
 	if (yy<0.5) yy=0.5f; if (yy>n+0.5) yy=n+0.5f; yi=(int)yy; 
 	if (zz<0.5) zz=0.5f; if (zz>n+0.5) zz=n+0.5f; zi=(int)zz; 
 	
-	float a[64]; 
-	
+	{
 	float fval[8]={heap[_I(xi,yi,zi,n)],heap[_I(xi+1,yi,zi,n)],heap[_I(xi,yi+1,zi,n)],heap[_I(xi+1,yi+1,zi,n)],heap[_I(xi,yi,zi+1,n)],heap[_I(xi+1,yi,zi+1,n)],heap[_I(xi,yi+1,zi+1,n)],heap[_I(xi+1,yi+1,zi+1,n)]}; 
 	
 	float dfdxval[8]={0.5f*(heap[_I(xi+1,yi,zi,n)]-heap[_I(xi-1,yi,zi,n)]),0.5f*(heap[_I(xi+2,yi,zi,n)]-heap[_I(xi,yi,zi,n)]),
@@ -261,12 +308,14 @@ float tricubic(float xx,float yy,float zz,float *heap,int n)
 		0.125f*(heap[_I(xi+2,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi+2,yi-1,zi+2,n)]+heap[_I(xi,yi-1,zi+2,n)]-heap[_I(xi+2,yi+1,zi,n)]+heap[_I(xi,yi+1,zi,n)]+heap[_I(xi+2,yi-1,zi,n)]-heap[_I(xi,yi-1,zi,n)]),
 		0.125f*(heap[_I(xi+1,yi+2,zi+2,n)]-heap[_I(xi-1,yi+2,zi+2,n)]-heap[_I(xi+1,yi,zi+2,n)]+heap[_I(xi-1,yi,zi+2,n)]-heap[_I(xi+1,yi+2,zi,n)]+heap[_I(xi-1,yi+2,zi,n)]+heap[_I(xi+1,yi,zi,n)]-heap[_I(xi-1,yi,zi,n)]),
 	0.125f*(heap[_I(xi+2,yi+2,zi+2,n)]-heap[_I(xi,yi+2,zi+2,n)]-heap[_I(xi+2,yi,zi+2,n)]+heap[_I(xi,yi,zi+2,n)]-heap[_I(xi+2,yi+2,zi,n)]+heap[_I(xi,yi+2,zi,n)]+heap[_I(xi+2,yi,zi,n)]-heap[_I(xi,yi,zi,n)])};
+
 	
 	tricubic_get_coeff(a,fval,dfdxval,dfdyval,dfdzval,d2fdxdyval,d2fdxdzval,d2fdydzval,d3fdxdydzval);
-	
-	float dx=xx-xi;
-	float dy=yy-yi;
-	float dz=zz-zi;
+	}
+		
+	dx = xx-xi;
+	dy = yy-yi;
+	dz = zz-zi;
 	
 	return tricubic_eval(a,dx,dy,dz);
 	
@@ -390,7 +439,7 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 	xi=co[0]/dx;
 	yi=co[1]/dy;
 	zi=co[2]/dz;
-	
+		
 	xf=co[0]/dx;
 	yf=co[1]/dy;
 	zf=co[2]/dz;
@@ -401,29 +450,24 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 		{
 			if (zi>1 && zi<resolZ)
 			{
-				
 				switch (vd->interp_type)
 				{
-						
 					case TEX_VD_NEARESTNEIGHBOR:
 					{
 						texres->tin = vd->dataset[_I(xi,yi,zi,resolX)];
-						BRICONT; 	
 						break;  
 					}
 					case TEX_VD_LINEAR:
 					{
-						texres->tin = Linear(xf,yf,zf,vd->dataset,resolX);						
+						texres->tin = trilinear(vd->dataset, resolX, co);
+						break;					
 					}
 					case TEX_VD_TRICUBIC:
 					{
 						texres->tin = tricubic(xf,yf,zf,vd->dataset,resolX);
+						break;
 					}
-						
 				}				  				   
-				
-				
-				
 			} else fail++;
 		} else fail++;
 	} else fail++;
@@ -432,6 +476,8 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 
 	texres->tin *= vd->int_multiplier;
 	
+	BRICONT;
+	
 	texres->tr = texres->tin;
 	texres->tg = texres->tin;
 	texres->tb = texres->tin;

From 7124d321d88240f14161c365ec1238ade2ec224d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 15 Dec 2008 05:49:56 +0000
Subject: [PATCH 072/577] * msvc compile fix

---
 source/blender/render/intern/source/voxeldata.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index bffe30b7d80..2f0bbd44a7c 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -43,6 +43,10 @@
 #include "renderdatabase.h"
 #include "texture.h"
 
+#if defined( _MSC_VER ) && !defined( __cplusplus )
+# define inline __inline
+#endif // defined( _MSC_VER ) && !defined( __cplusplus )
+
 /*---------------------------Utils----------------------------------------*/
 static inline int _I(int x,int y,int z,int n)
 {

From be1d06a2c544a4ea27139475a72edb75afa37879 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 22 Dec 2008 20:28:02 +0000
Subject: [PATCH 073/577] Volume rendering:

* Multithreaded volume light cache

While the render process itself is multithreaded, the light cache pre-process
previously wasn't (painfully noticed this the other week rendering on some
borrowed octocore nodes!). This commit adds threading, similar to the tiled render -
it divides the light cache's voxel grid into 3d parts and renders them with the
available threads.

This makes the most significant difference on shots where the light cache pre-
process is the bottleneck, so shots with either several lights, or a high res light
cache, or both. On this file (3 lights, light cache res 120), on my Core 2 Duo it now
renders in 27 seconds compared to 49 previously.

http://mke3.net/blender/devel/rendering/volumetrics/threaded_cache.jpg
---
 .../render/intern/include/render_types.h      |  26 +-
 .../render/intern/source/volume_precache.c    | 325 ++++++++----------
 2 files changed, 168 insertions(+), 183 deletions(-)

diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 65bb12e059d..8dbdde77726 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -202,9 +202,9 @@ struct Render
 
 	struct Object *excludeob;
 	
-	ListBase vol_precache_obs;
 	ListBase render_volumes_inside;
 	ListBase volumes;
+	ListBase volume_precache_parts;
 
 	/* arena for allocating data for use during render, for
 		* example dynamic TFaces to go in the VlakRen structure.
@@ -404,13 +404,6 @@ typedef struct StrandRen {
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct VolPrecache
-{
-	struct VolPrecache *next, *prev;
-	struct Material *ma;
-	struct ObjectRen *obr;
-} VolPrecache;
-
 typedef struct VolumeOb
 {
 	struct VolumeOb *next, *prev;
@@ -423,6 +416,23 @@ typedef struct MatInside {
 	struct Material *ma;
 } MatInside;
 
+typedef struct VolPrecachePart
+{
+	struct VolPrecachePart *next, *prev;
+	struct RayTree *tree;
+	struct ShadeInput *shi;
+	struct ObjectInstanceRen *obi;
+	int num;
+	int minx, maxx;
+	int miny, maxy;
+	int minz, maxz;
+	int res;
+	float bbmin[3];
+	float voxel[3];
+	int working, done;
+} VolPrecachePart;
+
+
 /* ------------------------------------------------------------------------- */
 
 struct LampRen;
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 89f997f4b99..18687962d79 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -35,6 +35,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
+#include "BLI_threads.h"
 
 #include "PIL_time.h"
 
@@ -47,6 +48,9 @@
 #include "renderdatabase.h"
 #include "volumetric.h"
 
+
+#include "BKE_global.h"
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
 /* only to be used here in this file, it's for speed */
@@ -207,11 +211,7 @@ static void lightcache_filter(float *cache, int res)
 	}
 }
 
-/* Precache a volume into a 3D voxel grid.
- * The voxel grid is stored in the ObjectInstanceRen, 
- * in camera space, aligned with the ObjectRen's bounding box.
- * Resolution is defined by the user.
- */
+
 void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
 {
 	int x, y, z;
@@ -325,29 +325,20 @@ void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *m
 
 }
 
-#if 0
-typedef struct VolPrecachePart {
-	struct VolPrecachePart *next, *prev;
-	int num;
-	int minx, maxx;
-	int miny, maxy;
-	int minz, maxz;
-	int res;
-	float bbmin[3], voxel[3];
-	struct RayTree *tree;
-	struct ShadeInput *shi;
-	struct ObjectInstanceRen *obi;
-	int done;
-} VolPrecachePart;
-
+#if 0 // debug stuff
 static void *vol_precache_part_test(void *data)
 {
-	VolPrecachePart *vpt =  (VolPrecachePart *)data;
+	VolPrecachePart *pa = data;
 
-	printf("part number: %d \n", vpt->num);
+	printf("part number: %d \n", pa->num);
+	printf("done: %d \n", pa->done);
+	printf("x min: %d   x max: %d \n", pa->minx, pa->maxx);
+	printf("y min: %d   y max: %d \n", pa->miny, pa->maxy);
+	printf("z min: %d   z max: %d \n", pa->minz, pa->maxz);
 
-	return 0;
+	return NULL;
 }
+#endif
 
 /* Iterate over the 3d voxel grid, and fill the voxels with scattering information
  *
@@ -357,28 +348,24 @@ static void *vol_precache_part_test(void *data)
  */
 static void *vol_precache_part(void *data)
 {
-	VolPrecachePart *vpt =  (VolPrecachePart *)data;
-	ObjectInstanceRen *obi = vpt->obi;
-	RayTree *tree = vpt->tree;
-	ShadeInput *shi = vpt->shi;
-	float scatter_col[3] = {0.f, 0.f, 0.f};
+	VolPrecachePart *pa =  (VolPrecachePart *)data;
+	ObjectInstanceRen *obi = pa->obi;
+	RayTree *tree = pa->tree;
+	ShadeInput *shi = pa->shi;
+	float density, scatter_col[3] = {0.f, 0.f, 0.f};
 	float co[3];
 	int x, y, z;
-	const int res=vpt->res, res_2=vpt->res*vpt->res, res_3=vpt->res*vpt->res*vpt->res;
+	const int res=pa->res, res_2=pa->res*pa->res, res_3=pa->res*pa->res*pa->res;
 	const float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
-	
-	res = vpt->res;
-	res_2 = res*res;
-	res_3 = res*res*res;
-	
-	for (x= vpt->minx; x < vpt->maxx; x++) {
-		co[0] = vpt->bbmin[0] + (vpt->voxel[0] * x);
+
+	for (x= pa->minx; x < pa->maxx; x++) {
+		co[0] = pa->bbmin[0] + (pa->voxel[0] * x);
 		
-		for (y= vpt->miny; y < vpt->maxy; y++) {
-			co[1] = vpt->bbmin[1] + (vpt->voxel[1] * y);
+		for (y= pa->miny; y < pa->maxy; y++) {
+			co[1] = pa->bbmin[1] + (pa->voxel[1] * y);
 			
-			for (z=vpt->minz; z < vpt->maxz; z++) {
-				co[2] = vpt->bbmin[2] + (vpt->voxel[2] * z);
+			for (z=pa->minz; z < pa->maxz; z++) {
+				co[2] = pa->bbmin[2] + (pa->voxel[2] * z);
 			
 				// don't bother if the point is not inside the volume mesh
 				if (!point_inside_obi(tree, obi, co)) {
@@ -397,14 +384,17 @@ static void *vol_precache_part(void *data)
 		}
 	}
 	
+	pa->done = 1;
+	
 	return 0;
 }
 
+
 static void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Material *ma, ShadeInput *shi)
 {
 	float view[3] = {0.0,0.0,-1.0};
 	
-	memset(&shi, 0, sizeof(ShadeInput)); 
+	memset(shi, 0, sizeof(ShadeInput)); 
 	shi->depth= 1;
 	shi->mask= 1;
 	shi->mat = ma;
@@ -417,61 +407,102 @@ static void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Materi
 	VECCOPY(shi->view, view);
 }
 
-static void precache_init_parts(ListBase *precache_parts, RayTree *tree, ShadeInput *shi, ObjectInstanceRen *obi, float *bbmin, float *bbmax, int res)
+static void precache_init_parts(Render *re, RayTree *tree, ShadeInput *shi, ObjectInstanceRen *obi, float *bbmin, float *bbmax, int res, int totthread, int *parts)
 {
-	int i;
+	int i=0, x, y, z;
 	float voxel[3];
-
+	int sizex, sizey, sizez;
+	int minx, maxx;
+	int miny, maxy;
+	int minz, maxz;
+	
+	BLI_freelistN(&re->volume_precache_parts);
+	
+	/* currently we just subdivide the box, number of threads per side */
+	parts[0] = parts[1] = parts[2] = totthread;
+	
 	VecSubf(voxel, bbmax, bbmin);
 	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
 		return;
 	VecMulf(voxel, 1.0f/res);
 
-	for(i=0; i < totparts; i++) {
-		VolPrecachePart *pa= MEM_callocN(sizeof(VolPrecachePart), "new precache part");
-	
-		pa->done = 0;
-		pa->num = i;
+	for (x=0; x < parts[0]; x++) {
+		sizex = ceil(res / (float)parts[0]);
+		minx = x * sizex;
+		maxx = minx + sizex;
+		maxx = (maxx>res)?res:maxx;
 		
-		pa->res = res;
-		VECCOPY(pa->bbmin, bbmin);
-		VECCOPY(precache_parts[j].voxel, voxel);
-		precache_parts[j].tree = tree;
-		precache_parts[j].shi = shi;
-		precache_parts[j].obi = obi;
-		
-		BLI_addtail(precache_parts, pa);
+		for (y=0; y < parts[1]; y++) {
+			sizey = ceil(res / (float)parts[1]);
+			miny = y * sizey;
+			maxy = miny + sizey;
+			maxy = (maxy>res)?res:maxy;
+			
+			for (z=0; z < parts[2]; z++) {
+				VolPrecachePart *pa= MEM_callocN(sizeof(VolPrecachePart), "new precache part");
+				
+				sizez = ceil(res / (float)parts[2]);
+				minz = z * sizez;
+				maxz = minz + sizez;
+				maxz = (maxz>res)?res:maxz;
+						
+				pa->done = 0;
+				pa->working = 0;
+				
+				pa->num = i;
+				pa->tree = tree;
+				pa->shi = shi;
+				pa->obi = obi;
+				VECCOPY(pa->bbmin, bbmin);
+				VECCOPY(pa->voxel, voxel);
+				pa->res = res;
+				
+				pa->minx = minx; pa->maxx = maxx;
+				pa->miny = miny; pa->maxy = maxy;
+				pa->minz = minz; pa->maxz = maxz;
+				
+				
+				BLI_addtail(&re->volume_precache_parts, pa);
+				
+				i++;
+			}
+		}
 	}
-	
 }
 
+static VolPrecachePart *precache_get_new_part(Render *re)
+{
+	VolPrecachePart *pa, *nextpa=NULL;
+	
+	for (pa = re->volume_precache_parts.first; pa; pa=pa->next)
+	{
+		if (pa->done==0 && pa->working==0) {
+			nextpa = pa;
+			break;
+		}
+	}
+
+	return nextpa;
+}
+
+/* Precache a volume into a 3D voxel grid.
+ * The voxel grid is stored in the ObjectInstanceRen, 
+ * in camera space, aligned with the ObjectRen's bounding box.
+ * Resolution is defined by the user.
+ */
 void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
 {
-	int x, y, z;
-
-	float co[3], voxel[3], scatter_col[3];
-	ShadeInput shi;
-	
-	float density;
-	float stepsize;
-	
-	float resf, res_3f;
-	int res_2, res_3;
-	
-	int edgeparts=2;
-	ListBase threads, precache_parts;
-	int cont= 1;
-	int xparts, yparts, zparts;
-	float part[3];
-	int totthread = re->r.threads;
-	int totparts = edgeparts*edgeparts*edgeparts;
-	VolPrecachePart *nextpa;
-	int j;
-	
-	float i = 1.0f;
-	double time, lasttime= PIL_check_seconds_timer();
-	const int res = ma->vol_precache_resolution;
+	VolPrecachePart *nextpa, *pa;
 	RayTree *tree;
+	ShadeInput shi;
+	ListBase threads;
+	const int res = ma->vol_precache_resolution;
+	int parts[3], totparts;
+	
+	int caching=1, counter=0;
+	int totthread = re->r.threads;
+	
+	double time, lasttime= PIL_check_seconds_timer();
 	
 	R = *re;
 
@@ -480,119 +511,62 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
 	
-	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
+	obi->volume_precache = MEM_callocN(sizeof(float)*res*res*res*3, "volume light cache");
 
 	/* Need a shadeinput to calculate scattering */
 	precache_setup_shadeinput(re, obi, ma, &shi);
-	precache_init_parts(&precache_parts, tree, shi, obi, bbmin, bbmax, res);
-
+	
+	precache_init_parts(re, tree, &shi, obi, bbmin, bbmax, res, totthread, parts);
+	totparts = parts[0] * parts[1] * parts[2];
+	
 	BLI_init_threads(&threads, vol_precache_part, totthread);
 	
-	nextpa = precache_get_new_part(precache_threads);
-	
-	while(cont) {
+	while(caching) {
 
 		if(BLI_available_threads(&threads) && !(re->test_break())) {
-			
-			precache_get_new_part(
-			// get new job (data pointer)
-			for(j=0; j < totparts; j++) {
-				if (!precache_threads[j].done) {
-					// tag job 'processed
-					precache_threads[j].done = 1;
-				}
+			nextpa = precache_get_new_part(re);
+			if (nextpa) {
+				nextpa->working = 1;
+				BLI_insert_thread(&threads, nextpa);
 			}
-		
-			BLI_insert_thread(&threads, precache_get_new_part(precache_threads));
 		}
 		else PIL_sleep_ms(50);
 
-		// find if a job is ready, this the do_something_func() should write in job somewhere
-		cont= 0;
-		for(go over all jobs)
-			if(job is ready) {
-				if(job was not removed) {
-					BLI_remove_thread(&lb, job);
-				}
-			}
-			else cont= 1;
+		caching=0;
+		counter=0;
+		for(pa= re->volume_precache_parts.first; pa; pa= pa->next) {
+			
+			if(pa->done) {
+				counter++;
+				BLI_remove_thread(&threads, pa);
+			} else
+				caching = 1;
 		}
-		// conditions to exit loop
-		if(if escape loop event) {
-		if(BLI_available_threadslots(&lb)==maxthreads)
-			break;
-		}
-	}
-
-	BLI_end_threads(&threads);
-	
-	//
-	
-	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
-	 *
-	 * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
-	 * I'm guessing the memory alignment may work out better this way for the purposes
-	 * of doing linear interpolation, but I haven't actually tested this theory! :)
-	 */
-	 /*
-	for (x=0; x < res; x++) {
-		co[0] = bbmin[0] + (voxel[0] * x);
 		
-		for (y=0; y < res; y++) {
-			co[1] = bbmin[1] + (voxel[1] * y);
-			
-			for (z=0; z < res; z++) {
-				co[2] = bbmin[2] + (voxel[2] * z);
-			
-				time= PIL_check_seconds_timer();
-				i++;
-			
-				// display progress every second
-				if(re->test_break()) {
-					if(tree) {
-						RE_ray_tree_free(tree);
-						tree= NULL;
-					}
-					return;
-				}
-				if(time-lasttime>1.0f) {
-					char str[64];
-					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
-					re->i.infostr= str;
-					re->stats_draw(&re->i);
-					re->i.infostr= NULL;
-					lasttime= time;
-				}
-				
-				// don't bother if the point is not inside the volume mesh
-				
-				if (!point_inside_obi(tree, obi, co)) {
-					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
-					continue;
-				}
-				density = vol_get_density(&shi, co);
-				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
-			
-				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
-				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
-				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
-				
-			}
+		if (re->test_break() && BLI_available_threads(&threads)==totthread)
+			caching=0;
+		
+		time= PIL_check_seconds_timer();
+		if(time-lasttime>1.0f) {
+			char str[64];
+			sprintf(str, "Precaching volume: %d%%", (int)(100.0f * ((float)counter / (float)totparts)));
+			re->i.infostr= str;
+			re->stats_draw(&re->i);
+			re->i.infostr= NULL;
+			lasttime= time;
 		}
 	}
-	*/
-
+	
+	BLI_end_threads(&threads);
+	BLI_freelistN(&re->volume_precache_parts);
+	
 	if(tree) {
 		RE_ray_tree_free(tree);
 		tree= NULL;
 	}
 	
 	lightcache_filter(obi->volume_precache, res);
-
 }
-#endif
 
 /* loop through all objects (and their associated materials)
  * marked for pre-caching in convertblender.c, and pre-cache them */
@@ -605,7 +579,8 @@ void volume_precache(Render *re)
 		if (vo->ma->vol_shadeflag & MA_VOL_PRECACHESHADING) {
 			for(obi= re->instancetable.first; obi; obi= obi->next) {
 				if (obi->obr == vo->obr) {
-					vol_precache_objectinstance(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+					if (G.rt==10) vol_precache_objectinstance(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+					else vol_precache_objectinstance_threads(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
 				}
 			}
 		}
@@ -624,7 +599,7 @@ void free_volume_precache(Render *re)
 			MEM_freeN(obi->volume_precache);
 	}
 	
-	BLI_freelistN(&re->vol_precache_obs);
+	BLI_freelistN(&re->volumes);
 }
 
 int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co)

From 834fda50d99210a5a69360bbed84f76934792171 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 31 Dec 2008 05:08:04 +0000
Subject: [PATCH 074/577] Volume rendering

* Fixed an old problem where if both the camera and a solid surface were
inside a volume, the volume wouldn't attenuate in front of the surface (was
visible in the blender conference art festival clouds animation:

http://mke3.net/blender/devel/rendering/volumetrics/vol_shade_cam_inside.mov

* Initial support for refracting solids inside volumes. I might be able to
make this work better, but not sure at the moment. It's a bit dodgy,
limited by the code that does the recursive ray shading - it's really not
set up for this kind of thing and could use a refactor very much.
---
 .../render/intern/include/volumetric.h        | 10 ++-
 .../blender/render/intern/source/rayshade.c   | 20 ++++--
 .../blender/render/intern/source/shadeinput.c | 23 +++----
 .../blender/render/intern/source/volumetric.c | 61 ++++++++++++++++---
 4 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index a69238f54b3..40d79e8d173 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -30,8 +30,9 @@ float vol_get_stepsize(struct ShadeInput *shi, int context);
 float vol_get_density(struct ShadeInput *shi, float *co);
 void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density);
 
-void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr);
-void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is);
+void shade_volume_outside(ShadeInput *shi, ShadeResult *shr);
+void shade_volume_inside(ShadeInput *shi, ShadeResult *shr);
+void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is);
 
 #define STEPSIZE_VIEW	0
 #define STEPSIZE_SHADE	1
@@ -40,4 +41,7 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 #define VOL_IS_SAMEMATERIAL		2
 
 #define VOL_BOUNDS_DEPTH	0
-#define VOL_BOUNDS_SS		1
\ No newline at end of file
+#define VOL_BOUNDS_SS		1
+
+#define VOL_SHADE_OUTSIDE	0
+#define VOL_SHADE_INSIDE	1
\ No newline at end of file
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 8bbdb243c8a..d09bd5c707a 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -276,9 +276,9 @@ void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
 	
 	if (shi->mat->material_type == MA_VOLUME) {
 		if(ELEM(is->mode, RE_RAY_SHADOW, RE_RAY_SHADOW_TRA)) {
-			volume_trace_shadow(shi, shr, is);
+			shade_volume_shadow(shi, shr, is);
 		} else {
-			shade_volume_loop(shi, shr);
+			shade_volume_outside(shi, shr);
 		}
 	}
 	else if(is->mode==RE_RAY_SHADOW_TRA) 
@@ -295,7 +295,18 @@ void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
 			shi->mat= vlr->mat;		/* shi->mat is being set in nodetree */
 		}
 		else {
-			shade_material_loop(shi, shr);
+			int tempdepth;
+			/* XXX dodgy business here, set ray depth to -1
+			 * to ignore raytrace in shade_material_loop()
+			 * this could really use a refactor --Matt */
+			if (shi->volume_depth == 0) {
+				tempdepth = shi->depth;
+				shi->depth = -1;
+				shade_material_loop(shi, shr);
+				shi->depth = tempdepth;
+			} else {
+				shade_material_loop(shi, shr);
+			}
 		}
 		/* raytrace likes to separate the spec color */
 		VECSUB(shr->diff, shr->combined, shr->spec);
@@ -467,7 +478,7 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, flo
 		
 		shi.mask= origshi->mask;
 		shi.osatex= origshi->osatex;
-		shi.depth= 1;					/* only used to indicate tracing */
+		shi.depth = origshi->depth + 1;					/* only used to indicate tracing */
 		shi.thread= origshi->thread;
 		//shi.sample= 0; // memset above, so dont need this
 		shi.xs= origshi->xs;
@@ -482,6 +493,7 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, flo
 		memset(&shr, 0, sizeof(ShadeResult));
 		
 		shade_ray(&isec, &shi, &shr);
+
 		if (traflag & RAY_TRA)
 			d= shade_by_transmission(&isec, &shi, &shr);
 		
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index aa11e3d75dd..5bf2f58ae4e 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -121,7 +121,7 @@ void shade_material_loop(ShadeInput *shi, ShadeResult *shr)
 	}
 	
 	/* depth >= 1 when ray-shading */
-	if(shi->depth==0) {
+	if(shi->depth >= 0 && (shi->depth < MAX2(shi->mat->ray_depth_tra, shi->mat->ray_depth))) {
 		if(R.r.mode & R_RAYTRACE) {
 			if(shi->ray_mirror!=0.0f || ((shi->mat->mode & MA_RAYTRANSP) && shr->alpha!=1.0f)) {
 				/* ray trace works on combined, but gives pass info */
@@ -132,16 +132,13 @@ void shade_material_loop(ShadeInput *shi, ShadeResult *shr)
 		if(shi->mat->mode & MA_RAYTRANSP) 
 			if((shi->layflag & SCE_LAY_SKY) && (R.r.alphamode==R_ADDSKY))
 				shr->alpha= 1.0f;
-	}	
+	}
+	
+	if(R.r.mode & R_RAYTRACE) {
+		shade_volume_inside(shi, shr);
+	}
 }
 
-/* delivers a fully filled in ShadeResult, for all passes */
-void shade_volume_loop(ShadeInput *shi, ShadeResult *shr)
-{
-	if(R.r.mode & R_RAYTRACE) volume_trace(shi, shr);
-}
-
-
 /* do a shade, finish up some passes, apply mist */
 void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr)
 {
@@ -157,8 +154,12 @@ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr)
 		memcpy(&shi->r, &shi->mat->r, 23*sizeof(float));
 		shi->har= shi->mat->har;
 		
-		if (shi->mat->material_type == MA_SOLID) shade_material_loop(shi, shr);
-		else if (shi->mat->material_type == MA_VOLUME) shade_volume_loop(shi, shr);
+		if (shi->mat->material_type == MA_SOLID) {
+			shade_material_loop(shi, shr);
+		} else if (shi->mat->material_type == MA_VOLUME) {
+			if(R.r.mode & R_RAYTRACE)
+				shade_volume_outside(shi, shr);
+		}
 	}
 	
 	/* copy additional passes */
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 3206989d1d7..10a3f83758c 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -548,7 +548,7 @@ static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
 	shi_new.mask= shi->mask;
 	shi_new.osatex= shi->osatex;
 	shi_new.thread= shi->thread;
-	shi_new.depth= 1;
+	shi_new.depth = shi->depth + 1;
 	shi_new.volume_depth= shi->volume_depth + 1;
 	shi_new.xs= shi->xs;
 	shi_new.ys= shi->ys;
@@ -601,18 +601,31 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *co
 }
 
 /* the main entry point for volume shading */
-void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
+static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int inside_volume)
 {
 	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
+	int trace_behind = 1;
 	Isect is;
 
-	memset(shr, 0, sizeof(ShadeResult));
+	/* check for shading an internal face a volume object directly */
+	if (inside_volume == VOL_SHADE_INSIDE) {
+		trace_behind = 0;
+	}
+	if (inside_volume == VOL_SHADE_OUTSIDE) {
+		if (shi->flippednor)
+			inside_volume = VOL_SHADE_INSIDE;
+	}
 
-	/* if 1st hit normal is facing away from the camera, 
-	 * then we're inside the volume already. */
-	if (shi->flippednor) {
-		/* trace behind the 1st hit point */
-		vol_trace_behind(shi, shi->vlr, shi->co, col);
+	if (inside_volume == VOL_SHADE_INSIDE) {
+		
+		if (trace_behind) {
+			/* trace behind the volume object */
+			vol_trace_behind(shi, shi->vlr, shi->co, col);
+		} else {
+			/* we're tracing through the volume between the camera 
+			 * and a solid surface, so use that pre-shaded radiance */
+			QUATCOPY(col, shr->combined);
+		}
 		
 		/* shade volume from 'camera' to 1st hit point */
 		volumeintegrate(shi, col, shi->camera_co, shi->co);
@@ -673,7 +686,7 @@ void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr)
 
 /* Traces a shadow through the object, 
  * pretty much gets the transmission over a ray path */
-void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
+void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
 {
 	float hitco[3];
 	float tr[3] = {1.0,1.0,1.0};
@@ -724,3 +737,33 @@ void volume_trace_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	}
 }
 
+
+/* delivers a fully filled in ShadeResult, for all passes */
+void shade_volume_outside(ShadeInput *shi, ShadeResult *shr)
+{
+	memset(shr, 0, sizeof(ShadeResult));
+	
+	volume_trace(shi, shr, VOL_SHADE_OUTSIDE);
+}
+
+
+void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
+{
+	MatInside *m;
+	Material *mat_backup;
+	
+	if (BLI_countlist(&R.render_volumes_inside) == 0) return;
+	
+	mat_backup = shi->mat;
+	
+//	for (m=R.render_volumes_inside.first; m; m=m->next) {
+//		printf("matinside: ma: %s \n", m->ma->id.name+2);
+//	}
+
+	m = R.render_volumes_inside.first;
+	shi->mat = m->ma;
+	
+	volume_trace(shi, shr, VOL_SHADE_INSIDE);
+
+	shi->mat = mat_backup;
+}
\ No newline at end of file

From 0572f1a5f61c96c44e81af5a49d9f1f01e9c9b69 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 8 Jan 2009 22:49:03 +0000
Subject: [PATCH 075/577] * fixed an incredibly silly typo-bug in light cache

---
 source/blender/render/intern/source/volume_precache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 18687962d79..75759b651ed 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -204,7 +204,7 @@ static void lightcache_filter(float *cache, int res)
 					i = rgb*res_3 + x*res_2 + y*res + z;
 
 					/* trigger for outside mesh */
-					if (cache[i] < 0.5f) cache[i] = get_avg_surrounds(cache, res, res_2, res_3, rgb, x, y, z);
+					if (cache[i] < -0.5f) cache[i] = get_avg_surrounds(cache, res, res_2, res_3, rgb, x, y, z);
 				}
 			}
 		}

From 6cfbb0017a525262f55767bf3b560ba3ae2e8d42 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 13 Jan 2009 02:39:46 +0000
Subject: [PATCH 076/577] * Little feature, blend texture can have
 extrapolation modes (like repeat).

This should probably go in trunk, but I'll stay away for now with all the 2.5 work on.
---
 source/blender/blenkernel/BKE_blender.h       |  2 +-
 source/blender/blenloader/intern/readfile.c   | 11 ++++++++++-
 source/blender/render/intern/source/texture.c | 17 +++++++++++++++++
 source/blender/src/buttons_shading.c          |  6 ++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index f392d57521c..db6d4762b17 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -41,7 +41,7 @@ struct ListBase;
 struct MemFile;
 
 #define BLENDER_VERSION			248
-#define BLENDER_SUBVERSION		1
+#define BLENDER_SUBVERSION		3
 
 #define BLENDER_MINVERSION		245
 #define BLENDER_MINSUBVERSION	15
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8347920319a..35e4c8b915c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7975,7 +7975,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				tex->vd->int_multiplier = 1.0;
 			}
 		}
-		
 	}
 	
 	/* set the curve radius interpolation to 2.47 default - easy */
@@ -8074,6 +8073,16 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		}
 	}
 	
+	if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 3)) {
+		Tex *tex;
+		
+		/* blend texture extrapolation */
+		for(tex=main->tex.first; tex; tex= tex->id.next) {
+			if (tex->type == TEX_BLEND)
+				tex->extend = TEX_EXTEND;
+		}
+	}
+	
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
 
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index d7b41d7cc2c..e5e8a285f28 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -197,6 +197,23 @@ static int blend(Tex *tex, float *texvec, TexResult *texres)
 		y= texvec[1];
 	}
 
+	if (tex->extend == TEX_REPEAT) {
+		if (x < -1.0 || x > 1.0) {
+			const float x2 = (x + 1.0)* 0.5;			/* to 0.0, 1.0 */
+			x = (x2 - floor(x2) - 0.5) * 2.0;	/* to -1.0, 1.0 */
+		}
+		if (y < -1.0 || y > 1.0) {
+			const float y2 = (y + 1.0)* 0.5;			/* to 0.0, 1.0 */
+			y = (y2 - floor(y2) - 0.5) * 2.0;	/* to -1.0, 1.0 */
+		}
+	} else if (tex->extend == TEX_CLIP) {
+		if (x < -1.0 || x > 1.0 || y < -1.0 || y > 1.0) {
+			texres->tin = 0.f;
+			BRICONT;
+			return TEX_INT;
+		}
+	}
+
 	if(tex->stype==TEX_LIN) {	/* lin */
 		texres->tin= (1.0+x)/2.0;
 	}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 6e69414fbe0..4f6a25058c3 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -644,7 +644,13 @@ static void texture_panel_blend(Tex *tex)
 	uiDefButS(block, ROW, B_TEXPRV, "Sphere",	85, 160, 75, 19, &tex->stype, 2.0, (float)TEX_SPHERE, 0, 0, "Use progression with the shape of a sphere");
 	uiDefButS(block, ROW, B_TEXPRV, "Halo",		160, 160, 75, 19, &tex->stype, 2.0, (float)TEX_HALO, 0, 0, "Use a quadratic progression with the shape of a sphere");
 	uiDefButS(block, ROW, B_TEXPRV, "Radial",	235, 160, 75, 19, &tex->stype, 2.0, (float)TEX_RAD, 0, 0, "Use a polar progression");
+	uiBlockEndAlign(block);
 	
+	uiBlockBeginAlign(block);
+	uiDefButS(block, ROW, B_TEXREDR_PRV, "Extend",			10,120,63,19, &tex->extend, 4.0, 1.0, 0, 0, "Extends the color of the edge pixels");
+	uiDefButS(block, ROW, B_TEXREDR_PRV, "Clip",			73,120,48,19, &tex->extend, 4.0, 2.0, 0, 0, "Sets alpha 0.0 outside Image edges");
+	uiDefButS(block, ROW, B_TEXREDR_PRV, "Repeat",			121,120,63,19, &tex->extend, 4.0, 3.0, 0, 0, "Causes Image to repeat horizontally and vertically");	
+	uiBlockEndAlign(block);
 }
 
 /* newnoise: noisebasis menu string */

From 1ed26fffb88ffcf70aa62c65964cc98348712b9d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 26 Jan 2009 02:42:17 +0000
Subject: [PATCH 077/577] Volume rendering: multiple scattering

This is mostly a contribution from Raul 'farsthary' Hernandez - an approximation for
multiple scattering within volumes. Thanks, Raul! Where single scattering considers
the path from the light to a point in the volume, and to the eye, multiple scattering
approximates the interactions of light as it bounces around randomly within the
volume, before eventually reaching the eye.

It works as a diffusion process that effectively blurs the lighting information
that's already stored within the light cache.

A cloudy sky setup, with single scattering, and multiple scattering:
http://mke3.net/blender/devel/rendering/volumetrics/vol_sky_ss_ms.jpg
http://mke3.net/blender/devel/rendering/volumetrics/sky_ms.blend

To enable it, there is a menu in the volume panel (which needs a bit of cleanup, for
later), that lets you choose between self-shading methods:

* None: No attenuation of the light source by the volume - light passes straight
through at full strength
* Single Scattering: (same as previously, with 'self-shading' enabled)
* Multiple Scattering: Uses multiple scattering only for shading information
* Single + Multiple: Adds the multiple scattering lighting on top of the existing
single scattered light - this can be useful to tweak the strength of the effect,
while still retaining details in the lighting.

An example of how the different scattering methods affect the visual result:
http://mke3.net/blender/devel/rendering/volumetrics/ss_ms_comparison.jpg
http://mke3.net/blender/devel/rendering/volumetrics/ss_ms_comparison.blend


The multiple scattering methods introduce 3 new controls when enabled:
* Blur: A factor blending between fully diffuse/blurred lighting, and sharper
* Spread: The range that the diffuse blurred lighting spreads over - similar to a
blur width. The higher the spread, the slower the processing time.
* Intensity: A multiplier for the multiple scattering light brightness

Here's the effect of multiple scattering on a tight beam (similar to a laser). The
effect of the 'spread' value is pretty clear here:
http://mke3.net/blender/devel/rendering/volumetrics/ms_spread_laser.jpg

Unlike the rest of the system so far, this part of the volume rendering engine isn't
physically based, and currently it's not unusual to get non-physical results (i.e.
much more light being scattered out then goes in via lamps or emit). To counter this,
you can use the intensity slider to tweak the brightness - on the todo, perhaps there is a more automatic method we can work on for this later on. I'd also like to check
on speeding this up further with threading too.
---
 source/blender/blenloader/intern/readfile.c   |  14 +-
 source/blender/makesdna/DNA_material_types.h  |  14 +-
 .../render/intern/include/volume_precache.h   |   4 +-
 .../render/intern/source/volume_precache.c    | 229 ++++++++++--------
 .../blender/render/intern/source/volumetric.c |  10 +-
 source/blender/src/buttons_shading.c          |  62 ++++-
 6 files changed, 212 insertions(+), 121 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 35e4c8b915c..7993d2eec89 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8072,17 +8072,27 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 		}
 	}
-	
+
 	if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 3)) {
 		Tex *tex;
+		Material *ma;
 		
 		/* blend texture extrapolation */
 		for(tex=main->tex.first; tex; tex= tex->id.next) {
 			if (tex->type == TEX_BLEND)
 				tex->extend = TEX_EXTEND;
 		}
+		
+		for(ma=main->mat.first; ma; ma= ma->id.next) {
+			if (ma->vol_shadeflag & 2) { // old MA_VOL_ATTENUATED
+				ma->vol_shade_type = MA_VOL_SHADE_SINGLE;
+				ma->vol_ms_diff = 0.5f;
+				ma->vol_ms_steps = 5;
+				ma->vol_ms_intensity = 1.0;
+			}
+		}
 	}
-	
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
 
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 5172f6a970c..dafa816cb96 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -70,13 +70,18 @@ typedef struct Material {
 	short vol_precache_resolution;
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_depth_cutoff;
-	float vpad;
+	short vol_shade_type;
+	short vpad;
 	float vol_density_scale;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
 	short vol_shadeflag;
 	short vol_phasefunc_type;
 	float vol_phasefunc_g;
+	float vpad2;
+	
+	float vol_ms_diff, vol_ms_intensity;
+	int vol_ms_steps;
 		
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
@@ -358,11 +363,16 @@ typedef struct Material {
 
 /* vol_shadeflag */
 #define MA_VOL_SHADED		1
-#define MA_VOL_ATTENUATED	2
 #define MA_VOL_RECVSHADOW	4
 #define MA_VOL_PRECACHESHADING	8
 #define MA_VOL_USEALPHA		16
 
+/* vol_shading_type */
+#define MA_VOL_SHADE_NONE					0
+#define MA_VOL_SHADE_SINGLE					1
+#define MA_VOL_SHADE_MULTIPLE				2
+#define MA_VOL_SHADE_SINGLEPLUSMULTIPLE		3
+
 /* vol_phasefunc_type */
 #define MA_VOL_PH_ISOTROPIC		0
 #define MA_VOL_PH_MIEHAZY		1
diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index 78409e4c646..9d87a219c82 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -28,4 +28,6 @@
  
 void volume_precache(Render *re);
 void free_volume_precache(Render *re);
-int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
\ No newline at end of file
+int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
+
+#define VOL_MS_TIMESTEP	0.1f
\ No newline at end of file
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 75759b651ed..4cdffc5ad35 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -47,6 +47,7 @@
 #include "render_types.h"
 #include "renderdatabase.h"
 #include "volumetric.h"
+#include "volume_precache.h"
 
 
 #include "BKE_global.h"
@@ -211,120 +212,141 @@ static void lightcache_filter(float *cache, int res)
 	}
 }
 
+static inline int I(int x,int y,int z,int n) //has a pad of 1 voxel surrounding the core for boundary simulation
+{ 
+	return (x*(n+2)+y)*(n+2)+z;
+}
 
-void vol_precache_objectinstance(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
+static void ms_diffuse(int b, float* x0, float* x, float diff, int n)
 {
-	int x, y, z;
+	int i, j, k, l;
+	const float dt = VOL_MS_TIMESTEP;
+	const float a = dt*diff*n*n*n;
+	
+	for (l=0; l<20; l++)
+	{
+		for (k=1; k<=n; k++)
+		{
+			for (j=1; j<=n; j++)
+			{
+				for (i=1; i<=n; i++)
+				{
+					x[I(i,j,k,n)] = (x0[I(i,j,k,n)] + a*(
+														 x[I(i-1,j,k,n)]+x[I(i+1,j,k,n)]+
+														 x[I(i,j-1,k,n)]+x[I(i,j+1,k,n)]+
+														 x[I(i,j,k-1,n)]+x[I(i,j,k+1,n)]))/(1+6*a);
+				}
+			}
+		}
+	}
+}
 
-	float co[3], voxel[3], scatter_col[3];
-	ShadeInput shi;
-	float view[3] = {0.0,0.0,-1.0};
-	float density;
-	float stepsize;
-	
-	float resf, res_3f;
-	int res_2, res_3;
-	
-	float i = 1.0f;
+void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *ma)
+{
+	const float diff = ma->vol_ms_diff * 0.001f; 	/* compensate for scaling for a nicer UI range */
+	const float fac = ma->vol_ms_intensity;
+	const float simframes = ma->vol_ms_steps;
+	const int shade_type = ma->vol_shade_type;
+	const float dt = VOL_MS_TIMESTEP;
+
+	int i, j, k, m;
+	int n = res;
+	const int size = (n+2)*(n+2)*(n+2);
 	double time, lasttime= PIL_check_seconds_timer();
-	const int res = ma->vol_precache_resolution;
-	RayTree *tree;
+	float total;
+	float c=1.0f;
+	int index;
+	float origf;	/* factor for blending in original light cache */
 	
-	R = *re;
+	
+	float *sr0=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
+	float *sr=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
+	float *sg0=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
+	float *sg=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
+	float *sb0=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
+	float *sb=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
 
-	/* create a raytree with just the faces of the instanced ObjectRen, 
-	 * used for checking if the cached point is inside or outside. */
-	tree = create_raytree_obi(obi, bbmin, bbmax);
-	if (!tree) return;
+	total = (float)(n*n*n*simframes);
+	
+	/* Scattering as diffusion pass */
+	for (m=0; m<simframes; m++)
+	{
+		/* add sources */
+		for (k=1; k<=n; k++)
+		{
+			for (j=1; j<=n; j++)
+			{
+				for (i=1; i<=n; i++)
+				{
+					time= PIL_check_seconds_timer();
+					c++;
+					
+					index=(i-1)*n*n + (j-1)*n + k-1;
+					
+					if (cache[index] > 0.0f)
+						sr[I(i,j,k,n)] += cache[index];
+					if (cache[1*n*n*n + index] > 0.0f)
+						sg[I(i,j,k,n)] += cache[1*n*n*n + index];
+					if (cache[2*n*n*n + index] > 0.0f)
+						sb[I(i,j,k,n)] += cache[2*n*n*n + index];
 
-	/* Need a shadeinput to calculate scattering */
-	memset(&shi, 0, sizeof(ShadeInput)); 
-	shi.depth= 1;
-	shi.mask= 1;
-	shi.mat = ma;
-	shi.vlr = NULL;
-	memcpy(&shi.r, &shi.mat->r, 23*sizeof(float));	// note, keep this synced with render_types.h
-	shi.har= shi.mat->har;
-	shi.obi= obi;
-	shi.obr= obi->obr;
-	shi.lay = re->scene->lay;
-	VECCOPY(shi.view, view);
-	
-	stepsize = vol_get_stepsize(&shi, STEPSIZE_VIEW);
 
-	resf = (float)res;
-	res_2 = res*res;
-	res_3 = res*res*res;
-	res_3f = (float)res_3;
-	
-	VecSubf(voxel, bbmax, bbmin);
-	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
-		return;
-	VecMulf(voxel, 1.0f/res);
-	
-	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
-	
-	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
-	 *
-	 * It's stored in memory as 3 big float grids next to each other, one for each RGB channel.
-	 * I'm guessing the memory alignment may work out better this way for the purposes
-	 * of doing linear interpolation, but I haven't actually tested this theory! :)
-	 */
-	for (x=0; x < res; x++) {
-		co[0] = bbmin[0] + (voxel[0] * x);
-		
-		for (y=0; y < res; y++) {
-			co[1] = bbmin[1] + (voxel[1] * y);
-			
-			for (z=0; z < res; z++) {
-				co[2] = bbmin[2] + (voxel[2] * z);
-			
-				time= PIL_check_seconds_timer();
-				i++;
-			
-				/* display progress every second */
-				if(re->test_break()) {
-					if(tree) {
-						RE_ray_tree_free(tree);
-						tree= NULL;
+					/* Displays progress every second */
+					if(time-lasttime>1.0f) {
+						char str[64];
+						sprintf(str, "Simulating multiple scattering: %d%%", (int)
+								(100.0f * (c / total)));
+						re->i.infostr= str;
+						re->stats_draw(&re->i);
+						re->i.infostr= NULL;
+						lasttime= time;
 					}
-					return;
 				}
-				if(time-lasttime>1.0f) {
-					char str[64];
-					sprintf(str, "Precaching volume: %d%%", (int)(100.0f * (i / res_3f)));
-					re->i.infostr= str;
-					re->stats_draw(&re->i);
-					re->i.infostr= NULL;
-					lasttime= time;
-				}
-				
-				/* don't bother if the point is not inside the volume mesh */
-				if (!point_inside_obi(tree, obi, co)) {
-					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
-					continue;
-				}
-				density = vol_get_density(&shi, co);
-				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
-			
-				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
-				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
-				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
+			}
+		}
+		SWAP(float *, sr, sr0);
+		SWAP(float *, sg, sg0);
+		SWAP(float *, sb, sb0);
+
+		/* main diffusion simulation */
+		ms_diffuse(0, sr0, sr, diff, n);
+		ms_diffuse(0, sg0, sg, diff, n);
+		ms_diffuse(0, sb0, sb, diff, n);
+		
+		if (re->test_break()) break;
+	}
+	
+	/* copy to light cache */
+
+	if (shade_type == MA_VOL_SHADE_SINGLEPLUSMULTIPLE)
+		origf = 1.0f;
+	else
+		origf = 0.0f;
+
+	for (k=1;k<=n;k++)
+	{
+		for (j=1;j<=n;j++)
+		{
+			for (i=1;i<=n;i++)
+			{
+				index=(i-1)*n*n + (j-1)*n + k-1;
+				cache[index]			= origf * cache[index]  + fac * sr[I(i,j,k,n)];
+				cache[1*n*n*n + index]	= origf * cache[1*n*n*n + index] + fac * sg[I(i,j,k,n)];
+				cache[2*n*n*n + index]	= origf * cache[2*n*n*n + index] + fac * sb[I(i,j,k,n)];
 			}
 		}
 	}
 
-	if(tree) {
-		RE_ray_tree_free(tree);
-		tree= NULL;
-	}
-	
-	lightcache_filter(obi->volume_precache, res);
-
+	MEM_freeN(sr0);
+	MEM_freeN(sr);
+	MEM_freeN(sg0);
+	MEM_freeN(sg);
+	MEM_freeN(sb0);
+	MEM_freeN(sb);
 }
 
+
+
 #if 0 // debug stuff
 static void *vol_precache_part_test(void *data)
 {
@@ -566,6 +588,11 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	}
 	
 	lightcache_filter(obi->volume_precache, res);
+	
+	if (ELEM(ma->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE))
+	{
+		multiple_scattering_diffusion(re, obi->volume_precache, res, ma);
+	}
 }
 
 /* loop through all objects (and their associated materials)
@@ -575,12 +602,14 @@ void volume_precache(Render *re)
 	ObjectInstanceRen *obi;
 	VolumeOb *vo;
 
+	/* ignore light cache and multiple scattering for preview render .. for now? */
+	if (re->r.scemode & R_PREVIEWBUTS) return;
+
 	for(vo= re->volumes.first; vo; vo= vo->next) {
 		if (vo->ma->vol_shadeflag & MA_VOL_PRECACHESHADING) {
 			for(obi= re->instancetable.first; obi; obi= obi->next) {
 				if (obi->obr == vo->obr) {
-					if (G.rt==10) vol_precache_objectinstance(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
-					else vol_precache_objectinstance_threads(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+					vol_precache_objectinstance_threads(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
 				}
 			}
 		}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 10a3f83758c..c8361844e11 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -379,7 +379,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	p = vol_get_phasefunc(shi, shi->mat->vol_phasefunc_type, shi->mat->vol_phasefunc_g, shi->view, lv);
 	VecMulf(lacol, p);
 	
-	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
+	if (shi->mat->vol_shade_type != MA_VOL_SHADE_NONE) {
 		Isect is;
 		
 		/* find minimum of volume bounds, or lamp coord */
@@ -511,8 +511,12 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			/* incoming light via emission or scattering (additive) */
 			vol_get_emission(shi, emit_col, step_mid, density);
 			
-			if ((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
-				(shi->mat->vol_shadeflag & MA_VOL_ATTENUATED)) {
+			
+			if (R.r.scemode & R_PREVIEWBUTS) {
+				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
+			} else if (((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
+				(shi->mat->vol_shade_type == MA_VOL_SHADE_SINGLE)) ||
+				(ELEM(shi->mat->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE))) {
 				vol_get_precached_scattering(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 4f6a25058c3..658b79f99fb 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -4534,23 +4534,59 @@ static void material_panel_material_volume(Material *ma)
 	
 	yco -= YSPACE;
 	
+	uiDefBut(block, LABEL, B_NOP, "Self Shading:",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
+
 	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, MA_VOL_ATTENUATED, B_MATPRV, "Self Shading",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Uses absorption for light attenuation");
-	uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
-	uiBlockEndAlign(block);
+	uiDefButS(block, MENU, B_TEXREDR_PRV, "Self Shading %t|None %x0|Single Scattering %x1|Multiple Scattering %x2|Single + Multiple %x3",
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &ma->vol_shade_type, 0.0, 0.0, 0, 0, "Use absorbtion to attenuate light - Single scattering: direct lighting, Multiple scattering: internal light bouncing & diffusion");
+		
+	if (ELEM3(ma->vol_shade_type, MA_VOL_SHADE_SINGLE, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE))
+	{
+		uiDefButF(block, NUM, B_MATPRV, "Step Size: ",
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shade_stepsize), 0.001, 100.0, 10, 2, "Step");
 	
-	yco -= YSPACE;
-	
-	if (ma->vol_shadeflag & MA_VOL_ATTENUATED) {
-		uiBlockBeginAlign(block);
-		uiDefButBitS(block, TOG, MA_VOL_PRECACHESHADING, B_MATPRV, "Light Cache",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Pre-cache the shading information into a voxel grid");
-		uiDefButS(block, NUM, B_MATPRV, "Resolution: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_precache_resolution), 0.0, 1024.0, 10, 2, "Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory (res ^3)");
 		uiBlockEndAlign(block);
+		
+		yco -= YSPACE;
+		
+		if (ma->vol_shade_type == MA_VOL_SHADE_SINGLE)
+		{
+			uiBlockBeginAlign(block);
+			uiDefButBitS(block, TOG, MA_VOL_PRECACHESHADING, B_MATPRV, "Light Cache",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_shadeflag), 0, 0, 0, 0, "Pre-cache the shading information into a voxel grid, speeds up shading at slightly less accuracy");
+			uiDefButS(block, NUM, B_MATPRV, "Resolution: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_precache_resolution), 0.0, 1024.0, 10, 2, "Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory (res ^3)");
+		
+		}
+		else if (ELEM(ma->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE))
+		{
+			uiDefBut(block, LABEL, B_NOP, "Light Cache:",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
+			uiDefButS(block, NUM, B_MATPRV, "Resolution: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_precache_resolution), 0.0, 1024.0, 10, 2, "Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory (res ^3)");
+		
+		}
+
+		uiBlockEndAlign(block);
+		
+		yco -= YSPACE;
+		
+		if (ELEM(ma->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE)) {
+			uiDefBut(block, LABEL, B_NOP, "Multiple Scattering:",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");	
+
+			uiBlockBeginAlign(block);
+			uiDefButF(block, NUM, B_MATPRV, "Blur: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_ms_diff), 0.01, 1.0, 10, 2, "Diffusion factor, the strength of the blurring effect");
+			uiDefButI(block, NUM, B_MATPRV, "Spread: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_ms_steps), 1, 512.0, 10, 2, "Simulation steps, the effective distance over which the light is diffused");
+			uiDefButF(block, NUM, B_MATPRV, "Intensity: ",
+				X2CLM1, yco-=BUTH, BUTW2, BUTH, &(ma->vol_ms_intensity), 0.00001, 1024.0, 10, 2, "Multiplier for multiple scattered light energy");
+			uiBlockEndAlign(block);
+		}
 	}
+	uiBlockEndAlign(block);
 	
 	yco -= YSPACE;
 	

From 8fa180a9b19649067edce3b973be4a27ea5b8daa Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 26 Feb 2009 00:13:40 +0000
Subject: [PATCH 078/577] * Fix for a small bug where multiple scattering
 wasn't being enabled properly. * Also a MSVC compile fix

---
 .../render/intern/include/volume_precache.h        |  1 +
 .../blender/render/intern/source/volume_precache.c | 14 +++++++++++---
 source/blender/render/intern/source/volumetric.c   |  4 +---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index 9d87a219c82..d8a94c2d560 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -29,5 +29,6 @@
 void volume_precache(Render *re);
 void free_volume_precache(Render *re);
 int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
+int using_lightcache(Material *ma);
 
 #define VOL_MS_TIMESTEP	0.1f
\ No newline at end of file
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 4cdffc5ad35..ba5fae0f284 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -49,6 +49,9 @@
 #include "volumetric.h"
 #include "volume_precache.h"
 
+#if defined( _MSC_VER ) && !defined( __cplusplus )
+# define inline __inline
+#endif // defined( _MSC_VER ) && !defined( __cplusplus )
 
 #include "BKE_global.h"
 
@@ -247,8 +250,7 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 	const float fac = ma->vol_ms_intensity;
 	const float simframes = ma->vol_ms_steps;
 	const int shade_type = ma->vol_shade_type;
-	const float dt = VOL_MS_TIMESTEP;
-
+	
 	int i, j, k, m;
 	int n = res;
 	const int size = (n+2)*(n+2)*(n+2);
@@ -595,6 +597,12 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	}
 }
 
+int using_lightcache(Material *ma)
+{
+	return (((ma->vol_shadeflag & MA_VOL_PRECACHESHADING) && (ma->vol_shade_type == MA_VOL_SHADE_SINGLE))
+		|| (ELEM(ma->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE)));
+}
+
 /* loop through all objects (and their associated materials)
  * marked for pre-caching in convertblender.c, and pre-cache them */
 void volume_precache(Render *re)
@@ -606,7 +614,7 @@ void volume_precache(Render *re)
 	if (re->r.scemode & R_PREVIEWBUTS) return;
 
 	for(vo= re->volumes.first; vo; vo= vo->next) {
-		if (vo->ma->vol_shadeflag & MA_VOL_PRECACHESHADING) {
+		if (using_lightcache(vo->ma)) {
 			for(obi= re->instancetable.first; obi; obi= obi->next) {
 				if (obi->obr == vo->obr) {
 					vol_precache_objectinstance_threads(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index c8361844e11..01c4ac8fa74 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -514,9 +514,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 			
 			if (R.r.scemode & R_PREVIEWBUTS) {
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
-			} else if (((shi->mat->vol_shadeflag & MA_VOL_PRECACHESHADING) &&
-				(shi->mat->vol_shade_type == MA_VOL_SHADE_SINGLE)) ||
-				(ELEM(shi->mat->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE))) {
+			} else if (using_lightcache(shi->mat)) {
 				vol_get_precached_scattering(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);

From ce637a00469bf5caf620d4ed27a54e658469ee54 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 11 Mar 2009 05:32:11 +0000
Subject: [PATCH 079/577] * Patch by Raul F Hernandez This adds a header to the
 voxel data texture's data file format, to auto-fill the resolution settings
 upon loading a file. I don't have a data file of the right format to test
 with, so I'll trust it works and wait for confirmation!

It also adds a 'still frame' setting, to pause the voxel data sequence on a
specified frame, throughout the course of the rendered animation.
---
 source/blender/makesdna/DNA_texture_types.h   |   1 +
 .../blender/render/intern/include/voxeldata.h |   8 +-
 .../blender/render/intern/source/voxeldata.c  | 115 +++++++++---------
 source/blender/src/buttons_shading.c          |  28 ++++-
 4 files changed, 91 insertions(+), 61 deletions(-)

diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index e90df908c2b..420850ce396 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -169,6 +169,7 @@ typedef struct VoxelData {
 	float int_multiplier;
 	float vxpad;
 	
+	int still, still_frame;
 	char source_path[240];
 	float *dataset;
  
diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h
index 504d5523db6..190a5a5a1c4 100644
--- a/source/blender/render/intern/include/voxeldata.h
+++ b/source/blender/render/intern/include/voxeldata.h
@@ -36,7 +36,13 @@
 struct Render;
 struct TexResult;
 
-int _I(int x,int y,int z,int n);
+typedef struct VoxelDataHeader
+{
+int resolX, resolY, resolZ;
+int frames;
+} VoxelDataHeader;
+
+inline int _I(int x, int y, int z, int *n);
 void make_voxeldata(struct Render *re);
 void free_voxeldata(struct Render *re);
 int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres);
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 2f0bbd44a7c..86cc54c0d44 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -42,25 +42,26 @@
 #include "render_types.h"
 #include "renderdatabase.h"
 #include "texture.h"
+#include "voxeldata.h"
 
 #if defined( _MSC_VER ) && !defined( __cplusplus )
 # define inline __inline
 #endif // defined( _MSC_VER ) && !defined( __cplusplus )
 
 /*---------------------------Utils----------------------------------------*/
-static inline int _I(int x,int y,int z,int n)
+inline int _I(int x, int y, int z, int *n)
 {
-	return (z*(n)+y)*(n)+x;
+	return (z*(n[1])+y)*(n[2])+x;
 }
 
-float Linear(float xx,float yy,float zz,float *x0,int n)
+float Linear(float xx, float yy, float zz, float *x0, int *n)
 {
 	float sx1,sx0,sy1,sy0,sz1,sz0,v0,v1;
 	int i0,i1,j0,j1,k0,k1;
 	
-	if (xx<0.5) xx=0.5f; if (xx>n+0.5) xx=n+0.5f; i0=(int)xx; i1=i0+1;
-	if (yy<0.5) yy=0.5f; if (yy>n+0.5) yy=n+0.5f; j0=(int)yy; j1=j0+1;
-	if (zz<0.5) zz=0.5f; if (zz>n+0.5) zz=n+0.5f; k0=(int)zz; k1=k0+1;
+	if (xx<0.5) xx=0.5f; if (xx>n[0]+0.5) xx=n[0]+0.5f; i0=(int)xx; i1=i0+1;
+	if (yy<0.5) yy=0.5f; if (yy>n[1]+0.5) yy=n[1]+0.5f; j0=(int)yy; j1=j0+1;
+	if (zz<0.5) zz=0.5f; if (zz>n[2]+0.5) zz=n[2]+0.5f; k0=(int)zz; k1=k0+1;
 	
 	sx1 = xx-i0; sx0 = 1-sx1;
 	sy1 = yy-j0; sy0 = 1-sy1;
@@ -68,15 +69,14 @@ float Linear(float xx,float yy,float zz,float *x0,int n)
 	v0 = sx0*(sy0*x0[_I(i0,j0,k0,n)]+sy1*x0[_I(i0,j1,k0,n)])+sx1*(sy0*x0[_I(i1,j0,k0,n)]+sy1*x0[_I(i1,j1,k0,n)]);
 	v1 = sx0*(sy0*x0[_I(i0,j0,k1,n)]+sy1*x0[_I(i0,j1,k1,n)])+sx1*(sy0*x0[_I(i1,j0,k1,n)]+sy1*x0[_I(i1,j1,k1,n)]);
 	return sz0*v0 + sz1*v1;
-	
 }
 
 
-static float D(float *data, const int res, int x, int y, int z)
+static float D(float *data, int *res, int x, int y, int z)
 {
-	CLAMP(x, 0, res-1);
-	CLAMP(y, 0, res-1);
-	CLAMP(z, 0, res-1);
+	CLAMP(x, 0, res[0]-1);
+	CLAMP(y, 0, res[1]-1);
+	CLAMP(z, 0, res[2]-1);
 	return data[ _I(x, y, z, res) ];
 }
 
@@ -85,19 +85,18 @@ static inline float lerp(float t, float v1, float v2) {
 }
 
 /* trilinear interpolation */
-static float trilinear(float *data, const int res, float *co)
+static float trilinear(float *data, int *res, float *co)
 {
 	float voxx, voxy, voxz;
 	int vx, vy, vz;
 	float dx, dy, dz;
 	float d00, d10, d01, d11, d0, d1, d_final;
-	float dim[3];
-		
-	if (!data) return;
+
+	if (!data) return 0.f;
 	
-	voxx = co[0] * res - 0.5f;
-	voxy = co[1] * res - 0.5f;
-	voxz = co[2] * res - 0.5f;
+	voxx = co[0] * res[0] - 0.5f;
+	voxy = co[1] * res[1] - 0.5f;
+	voxz = co[2] * res[2] - 0.5f;
 	
 	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
 	
@@ -112,7 +111,6 @@ static float trilinear(float *data, const int res, float *co)
 	d_final = lerp(dz, d0, d1);
 	
 	return d_final;
-
 }
 
 
@@ -242,17 +240,16 @@ float tricubic_eval(float a[64], float x, float y, float z) {
 }
 
 
-float tricubic(float xx,float yy,float zz,float *heap,int n)
+float tricubic(float xx, float yy, float zz, float *heap, int *n)
 {
 	
 	int xi,yi,zi;
 	float dx,dy,dz;
 	float a[64];
 
-	
-	if (xx<0.5) xx=0.5f; if (xx>n+0.5) xx=n+0.5f; xi=(int)xx; 
-	if (yy<0.5) yy=0.5f; if (yy>n+0.5) yy=n+0.5f; yi=(int)yy; 
-	if (zz<0.5) zz=0.5f; if (zz>n+0.5) zz=n+0.5f; zi=(int)zz; 
+	if (xx<0.5) xx=0.5f; if (xx>n[0]+0.5) xx=n[0]+0.5f; xi=(int)xx;
+	if (yy<0.5) yy=0.5f; if (yy>n[1]+0.5) yy=n[1]+0.5f; yi=(int)yy;
+	if (zz<0.5) zz=0.5f; if (zz>n[2]+0.5) zz=n[2]+0.5f; zi=(int)zz;
 	
 	{
 	float fval[8]={heap[_I(xi,yi,zi,n)],heap[_I(xi+1,yi,zi,n)],heap[_I(xi,yi+1,zi,n)],heap[_I(xi+1,yi+1,zi,n)],heap[_I(xi,yi,zi+1,n)],heap[_I(xi+1,yi,zi+1,n)],heap[_I(xi,yi+1,zi+1,n)],heap[_I(xi+1,yi+1,zi+1,n)]}; 
@@ -325,21 +322,30 @@ float tricubic(float xx,float yy,float zz,float *heap,int n)
 	
 }
 
-
-
-
-
-/*--------------------------------------------------------------------*/
-
-void load_frame (FILE *fp,float *F, int size,int frame)
-{
-	
-	fseek(fp,frame*size*sizeof(float),0);
+void load_frame (FILE *fp, float *F, int size, int frame, int offset)
+{	
+	fseek(fp,frame*size*sizeof(float)+offset,0);
 	fread(F,sizeof(float),size,fp);
 }
 
+void write_voxeldata_header(struct VoxelDataHeader *h, FILE *fp)
+{
+	fwrite(h,sizeof(struct VoxelDataHeader),1,fp);
+}
 
+void read_voxeldata_header(FILE *fp, struct VoxelData *vd)
+{
+	VoxelDataHeader *h=(VoxelDataHeader *)MEM_mallocN(sizeof(VoxelDataHeader), "voxel data header");
+	
+	rewind(fp);
+	fread(h,sizeof(VoxelDataHeader),1,fp);
+	
+	vd->resolX=h->resolX;
+	vd->resolY=h->resolY;
+	vd->resolZ=h->resolZ;
 
+	MEM_freeN(h);
+}
 
 void cache_voxeldata(struct Render *re,Tex *tex)
 {	
@@ -349,20 +355,19 @@ void cache_voxeldata(struct Render *re,Tex *tex)
 	
 	if (!vd) return;
 	
-	vd->resolY=vd->resolX; //for now only support cubic datasets (rectangular datasets could be added latter)
-	vd->resolZ=vd->resolX;
-	size = (vd->resolX)*(vd->resolY)*(vd->resolZ);	
-	
-	vd->dataset=MEM_mallocN(sizeof(float)*size, "voxel dataset");	
+	read_voxeldata_header(fp, vd);
+	size = (vd->resolX)*(vd->resolY)*(vd->resolZ);
+	vd->dataset = MEM_mallocN(sizeof(float)*size, "voxel dataset");
 	
 	if (!BLI_exists(vd->source_path)) return;
 	fp = fopen(vd->source_path,"rb");
 	if (!fp) return;
 	
-	load_frame(fp, vd->dataset, size, re->r.cfra); //here improve the dataset loading function for more dataset types	
+	//here improve the dataset loading function for more dataset types
+	if (vd->still) load_frame(fp, vd->dataset, size, vd->still_frame, sizeof(VoxelDataHeader));
+	else load_frame(fp, vd->dataset, size, re->r.cfra, sizeof(VoxelDataHeader));
 	
 	fclose(fp);
-	
 }
 
 void make_voxeldata(struct Render *re)
@@ -421,24 +426,22 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 	int xi, yi, zi;
 	float xf, yf, zf;
 	int i=0, fail=0;
-	int resolX, resolY, resolZ;
+	int resol[3];
 	
 	if ((!vd) || (vd->dataset==NULL)) {
 		texres->tin = 0.0f;
 		return 0;
 	}
 	
-	//here do the calculation of the interpolation types 
-	
-	resolX=vd->resolX;
-	resolY=vd->resolY;
-	resolZ=vd->resolZ;
+	resol[0] = vd->resolX;
+	resol[1] = vd->resolY;
+	resol[2] = vd->resolZ;
 	
 	VECCOPY(co, texvec);	
 	
-	dx=1.0f/(resolX);
-	dy=1.0f/(resolY);
-	dz=1.0f/(resolZ);
+	dx=1.0f/(resol[0]);
+	dy=1.0f/(resol[1]);
+	dz=1.0f/(resol[2]);
 	
 	xi=co[0]/dx;
 	yi=co[1]/dy;
@@ -448,27 +451,27 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 	yf=co[1]/dy;
 	zf=co[2]/dz;
 	
-	if (xi>1 && xi<resolX)
+	if (xi>1 && xi<resol[0])
 	{
-		if (yi>1 && yi<resolY)
+		if (yi>1 && yi<resol[1])
 		{
-			if (zi>1 && zi<resolZ)
+			if (zi>1 && zi<resol[2])
 			{
 				switch (vd->interp_type)
 				{
 					case TEX_VD_NEARESTNEIGHBOR:
 					{
-						texres->tin = vd->dataset[_I(xi,yi,zi,resolX)];
+						texres->tin = vd->dataset[_I(xi,yi,zi,resol)];
 						break;  
 					}
 					case TEX_VD_LINEAR:
 					{
-						texres->tin = trilinear(vd->dataset, resolX, co);
+						texres->tin = trilinear(vd->dataset, resol, co);
 						break;					
 					}
 					case TEX_VD_TRICUBIC:
 					{
-						texres->tin = tricubic(xf,yf,zf,vd->dataset,resolX);
+						texres->tin = tricubic(xf, yf, zf, vd->dataset, resol);
 						break;
 					}
 				}				  				   
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 658b79f99fb..875184d6cc1 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -1060,7 +1060,7 @@ static void texture_panel_voxeldata(Tex *tex)
 	short yco=PANEL_YMAX;
 
 	block= uiNewBlock(&curarea->uiblocks, "texture_panel_voxeldata", UI_EMBOSS, UI_HELV, curarea->win);
-	if(uiNewPanel(curarea, block, "Voxel Data", "Texture", PANELX, PANELY, PANELW, PANELH)==0) return;
+	if(uiNewPanel(curarea, block, "Voxel Data", "Texture", PANELX, PANELY, PANELW, PANELH+YSPACE)==0) return;
 	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
 
 	if(tex->vd==NULL) {
@@ -1085,13 +1085,33 @@ static void texture_panel_voxeldata(Tex *tex)
 		uiDefButI(block, MENU, B_REDR, "None %x0|Linear %x1|Tricubic %x2",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &vd->interp_type, 0.0, 0.0, 0, 0, "Interpolation type");		
 		
-		uiDefButI(block, NUM, B_REDR, "Resolution: ",
-			X2CLM2, yco, BUTW2, BUTH, &(vd->resolX), 1, 10000, 0, 0, "Resolution of the voxel data");
-			
 		yco -= YSPACE;
 		
 		uiDefButF(block, NUM, B_REDR, "Intensity: ",
 			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(vd->int_multiplier), 0.0001, 10000.0, 0, 0, "Multiplier to scale up or down the texture's intensity");
+		
+		yco = PANEL_YMAX - 2*BUTH - 2*YSPACE;
+		
+		uiDefBut(block, LABEL, B_NOP, "Resolution:",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiBlockBeginAlign(block);
+		uiDefButI(block, NUM, B_REDR, "X: ",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->resolX), 1, 10000, 0, 0, "Resolution of the voxel data");
+		uiDefButI(block, NUM, B_REDR, "Y: ",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->resolY), 1, 10000, 0, 0, "Resolution of the voxel data");
+		uiDefButI(block, NUM, B_REDR, "Z: ",
+			X2CLM2, yco-= BUTH, BUTW2, BUTH, &(vd->resolZ), 1, 10000, 0, 0, "Resolution of the voxel data");
+		uiBlockEndAlign(block);
+		
+		yco -= YSPACE;
+		
+		uiBlockBeginAlign(block);
+		uiDefButI(block,TOG, B_REDR, "Still",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->still), 0,1, 0, 0, "Use a still frame from the data sequence for the entire rendered animation");
+		if (vd->still) uiDefButI(block, NUM, B_REDR, "Frame: ",
+			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->still_frame), 1, 10000, 0, 0, "The frame to pause on for the entire rendered animation");	
+		uiBlockEndAlign(block);
+		
 	}
 }
 

From 2b05a837295e32c2dd91a59984870803a3f0a52d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 17 Mar 2009 05:33:05 +0000
Subject: [PATCH 080/577] Fixed a problem in how volumes were interpreting
 textures, and removed associated workarounds in point density texture.

---
 .../render/intern/source/pointdensity.c       | 35 ++++++++++++-------
 source/blender/render/intern/source/texture.c |  2 +-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 392af8411c5..2c8b6aaf0a5 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -373,7 +373,7 @@ static void init_pointdensityrangedata(PointDensity *pd, PointDensityRangeData *
 
 int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 {
-	int retval = TEX_INT+TEX_RGB;
+	int retval = TEX_INT;
 	PointDensity *pd = tex->pd;
 	PointDensityRangeData pdr;
 	float density=0.0f, age=0.0f, time=0.0f;
@@ -382,11 +382,11 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	float turb, noise_fac;
 	int num=0;
 	
-	if ((!pd) || (!pd->point_tree)) {
-		texres->tin = 0.0f;
-		return 0;
-	}
+	texres->tin = 0.0f;
 	
+	if ((!pd) || (!pd->point_tree))		
+		return 0;
+		
 	init_pointdensityrangedata(pd, &pdr, &density, vec, &age);
 	noise_fac = pd->noise_fac * 0.5f;	/* better default */
 	
@@ -400,6 +400,9 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 			age /= num;
 			VecMulf(vec, 1.0f/num);
 		}
+		
+		/* reset */
+		density = vec[0] = vec[1] = vec[2] = 0.0f;
 	}
 	
 	if (pd->flag & TEX_PD_TURBULENCE) {
@@ -422,11 +425,9 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 		co[0] = texvec[0] + noise_fac * turb;
 		co[1] = texvec[1] + noise_fac * turb;
 		co[2] = texvec[2] + noise_fac * turb;
-		
-		/* reset and prepare for a new BVH query with the perturbed coordinates */
-		density = vec[0] = vec[1] = vec[2] = 0.0f;
 	}
 
+	/* BVH query with the potentially perturbed coordinates */
 	num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
 	if (num > 0) {
 		age /= num;
@@ -436,13 +437,19 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 	texres->tin = density;
 	BRICONT;
 	
+	if (pd->color_source == TEX_PD_COLOR_CONSTANT)
+		return retval;
+	
+	retval |= TEX_RGB;
+	
 	switch (pd->color_source) {
 		case TEX_PD_COLOR_PARTAGE:
 			if (pd->coba) {
 				if (do_colorband(pd->coba, age, col)) {
 					texres->talpha= 1;
-					QUATCOPY(&texres->tr, col);
-					texres->tin *= texres->ta;
+					VECCOPY(&texres->tr, col);
+					texres->tin *= col[3];
+					texres->ta = texres->tin;
 				}
 			}
 			break;
@@ -453,16 +460,18 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
 			if (pd->coba) {
 				if (do_colorband(pd->coba, speed, col)) {
 					texres->talpha= 1;	
-					QUATCOPY(&texres->tr, col);
-					texres->tin *= texres->ta;
+					VECCOPY(&texres->tr, col);
+					texres->tin *= col[3];
+					texres->ta = texres->tin;
 				}
 			}
 			break;
 		}
 		case TEX_PD_COLOR_PARTVEL:
+			texres->talpha= 1;
 			VecMulf(vec, pd->speed_scale);
 			VECCOPY(&texres->tr, vec);
-			texres->ta = 1.0f;
+			texres->ta = texres->tin;
 			break;
 		case TEX_PD_COLOR_CONSTANT:
 		default:
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index e5e8a285f28..d1115e1d399 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1653,7 +1653,7 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 				float varfac= mtex->varfac*stencilTin;
 				
 				/* convert RGB to intensity if intensity info isn't provided */
-				if (rgbnor & TEX_INT) {
+				if (!(rgbnor & TEX_INT)) {
 					if (rgbnor & TEX_RGB) {
 						if(texres.talpha) texres.tin= texres.ta;
 						else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb);

From 41b2a2a530804db35c3a0fed2d881acf6f332c3d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 18 Mar 2009 03:52:17 +0000
Subject: [PATCH 081/577] * Volume rendering / multiple scattering -
 normalisation

This changes the effect of the multiple scattering approximation to be more
physically plausible (and easier to use) by making it conserve energy.
Previously, the multiple scattering could show wildly different results
based on the spread settings, often outputting much more light than was put
in (via lamps), which is physically incorrect and made it difficult to use
by requiring a lot of tweaking of the intensity value.

This fixes it to some extent with a simple normalization, where it scales
the light energy after multiple scattering to be the same as what was
previously there in the light cache via single scattering. This means that
using the default intensity of 1.0 should give good results by default,
although you can still use it to tweak the effect.

Note: This will render differently if you've already set up a .blend using
multiple scattering with the old code, so you'll need to tweak older files.
Setting the intensity back to the default 1.0 should be good though.


* Smaller thing - fixed the camera view vector stuff up a bit in light
cache, it now gives much more similar results to non-light cache when using
anisotropic scattering.
---
 .../render/intern/source/volume_precache.c    | 80 ++++++++++++++++---
 1 file changed, 68 insertions(+), 12 deletions(-)

diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index ba5fae0f284..b3cffb45a27 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -220,6 +220,53 @@ static inline int I(int x,int y,int z,int n) //has a pad of 1 voxel surrounding
 	return (x*(n+2)+y)*(n+2)+z;
 }
 
+
+/* get the total amount of light energy in the light cache. used to normalise after multiple scattering */
+static float total_ss_energy(float *cache, const int res)
+{
+	int x, y, z, rgb;
+	int res_2, res_3;
+	int i;
+	float energy=0.f;
+	
+	res_2 = res*res;
+	res_3 = res*res*res;
+
+	for (x=0; x < res; x++) {
+		for (y=0; y < res; y++) {
+			for (z=0; z < res; z++) {
+				for (rgb=0; rgb < 3; rgb++) {
+					i = rgb*res_3 + x*res_2 + y*res + z;
+					
+					if (cache[i] > 0.f) energy += cache[i];
+				}
+			}
+		}
+	}
+	
+	return energy;
+}
+
+static float total_ms_energy(float *sr, float *sg, float *sb, const int res)
+{
+	int x, y, z, i;
+	float energy=0.f;
+	
+	for (z=1;z<=res;z++) {
+		for (y=1;y<=res;y++) {
+			for (x=1;x<=res;x++) {
+			
+				i = I(x,y,z,res);
+				if (sr[i] > 0.f) energy += sr[i];
+				if (sg[i] > 0.f) energy += sg[i];
+				if (sb[i] > 0.f) energy += sb[i];
+			}
+		}
+	}
+	
+	return energy;
+}
+
 static void ms_diffuse(int b, float* x0, float* x, float diff, int n)
 {
 	int i, j, k, l;
@@ -247,9 +294,9 @@ static void ms_diffuse(int b, float* x0, float* x, float diff, int n)
 void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *ma)
 {
 	const float diff = ma->vol_ms_diff * 0.001f; 	/* compensate for scaling for a nicer UI range */
-	const float fac = ma->vol_ms_intensity;
 	const float simframes = ma->vol_ms_steps;
 	const int shade_type = ma->vol_shade_type;
+	float fac = ma->vol_ms_intensity;
 	
 	int i, j, k, m;
 	int n = res;
@@ -259,8 +306,8 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 	float c=1.0f;
 	int index;
 	float origf;	/* factor for blending in original light cache */
-	
-	
+	float energy_ss, energy_ms;
+
 	float *sr0=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
 	float *sr=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
 	float *sg0=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
@@ -270,6 +317,8 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 
 	total = (float)(n*n*n*simframes);
 	
+	energy_ss = total_ss_energy(cache, res);
+	
 	/* Scattering as diffusion pass */
 	for (m=0; m<simframes; m++)
 	{
@@ -318,12 +367,18 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 		if (re->test_break()) break;
 	}
 	
-	/* copy to light cache */
-
-	if (shade_type == MA_VOL_SHADE_SINGLEPLUSMULTIPLE)
-		origf = 1.0f;
-	else
+	/* normalisation factor to conserve energy */
+	energy_ms = total_ms_energy(sr, sg, sb, res);
+	fac *= (energy_ss / energy_ms);
+	
+	/* blend multiple scattering back in the light cache */
+	if (shade_type == MA_VOL_SHADE_SINGLEPLUSMULTIPLE) {
+		/* conserve energy - half single, half multiple */
+		origf = 0.5f;
+		fac *= 0.5f;
+	} else {
 		origf = 0.0f;
+	}
 
 	for (k=1;k<=n;k++)
 	{
@@ -390,7 +445,7 @@ static void *vol_precache_part(void *data)
 			
 			for (z=pa->minz; z < pa->maxz; z++) {
 				co[2] = pa->bbmin[2] + (pa->voxel[2] * z);
-			
+				
 				// don't bother if the point is not inside the volume mesh
 				if (!point_inside_obi(tree, obi, co)) {
 					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
@@ -398,6 +453,9 @@ static void *vol_precache_part(void *data)
 					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
 					continue;
 				}
+				
+				VecCopyf(shi->view, co);
+				Normalize(shi->view);
 				density = vol_get_density(shi, co);
 				vol_get_scattering(shi, scatter_col, co, stepsize, density);
 			
@@ -416,8 +474,6 @@ static void *vol_precache_part(void *data)
 
 static void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Material *ma, ShadeInput *shi)
 {
-	float view[3] = {0.0,0.0,-1.0};
-	
 	memset(shi, 0, sizeof(ShadeInput)); 
 	shi->depth= 1;
 	shi->mask= 1;
@@ -428,7 +484,6 @@ static void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Materi
 	shi->obi= obi;
 	shi->obr= obi->obr;
 	shi->lay = re->scene->lay;
-	VECCOPY(shi->view, view);
 }
 
 static void precache_init_parts(Render *re, RayTree *tree, ShadeInput *shi, ObjectInstanceRen *obi, float *bbmin, float *bbmax, int res, int totthread, int *parts)
@@ -654,3 +709,4 @@ int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co)
 	
 	return inside;
 }
+

From fc7a561de1b384280fdae7d3e50dde1736576733 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 21 Apr 2009 09:31:07 +0000
Subject: [PATCH 082/577] 4th: another file corrupted

---
 source/blender/imbuf/intern/IMB_jp2.h | 56 ---------------------------
 1 file changed, 56 deletions(-)

diff --git a/source/blender/imbuf/intern/IMB_jp2.h b/source/blender/imbuf/intern/IMB_jp2.h
index 1d89ab8e375..fcdd4589fca 100644
--- a/source/blender/imbuf/intern/IMB_jp2.h
+++ b/source/blender/imbuf/intern/IMB_jp2.h
@@ -1,62 +1,7 @@
-<<<<<<< .working
-/*
- * IMB_jp2.h
- *
-<<<<<<< .working
- * $Id: IMB_jp2.h 19805 2009-04-20 00:19:16Z genscher $
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-/**
- * \file IMB_jp2.h
- * \ingroup imbuf
- * \brief Function declarations for jp2.c
- */
-
-#ifndef IMB_JP2_H
-#define IMB_JP2_H
-
-#ifdef WITH_OPENJPEG
-struct ImBuf;
-
-int imb_is_a_jp2(void *buf);
-struct ImBuf *imb_jp2_decode(unsigned char *mem, int size, int flags);
-short imb_savejp2(struct ImBuf *ibuf, char *name, int flags);
-#endif /* WITH_OPENJPEG */
-
-#endif
-
-=======
 /*
  * IMB_jp2.h
  *
  * $Id: IMB_bmp.h 14444 2008-04-16 22:40:48Z hos $
-=======
- * $Id$
->>>>>>> .merge-right.r19825
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -102,4 +47,3 @@ short imb_savejp2(struct ImBuf *ibuf, char *name, int flags);
 
 #endif
 
->>>>>>> .merge-right.r19804

From e1122a1b67173ee180cfda9fe8dda2f4c37481bf Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 21 Apr 2009 10:19:14 +0000
Subject: [PATCH 083/577] 5th: another compile fix

---
 source/gameengine/Ketsji/KX_PythonInit.cpp | 43 ++++++++++++----------
 source/gameengine/Ketsji/KX_PythonInit.h   |  2 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 2227072d2e7..873e49be6bb 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -216,13 +216,13 @@ static PyObject* gPyGetSpectrum(PyObject*)
 
 		for (int index = 0; index < 512; index++)
 		{
-			PyList_SetItem(resultlist, index, PyFloat_FromDouble(spectrum[index]));
+			PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(spectrum[index]));
 		}
 	}
 	else {
 		for (int index = 0; index < 512; index++)
 		{
-			PyList_SetItem(resultlist, index, PyFloat_FromDouble(0.0));
+			PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(0.0));
 		}
 	}
 
@@ -553,7 +553,7 @@ static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args)
 		return NULL;
 
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setEyeSeparation(float), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -565,7 +565,7 @@ static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args)
 static PyObject* gPyGetEyeSeparation(PyObject*)
 {
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.getEyeSeparation(), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -579,7 +579,7 @@ static PyObject* gPySetFocalLength(PyObject*, PyObject* args)
 		return NULL;
 	
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setFocalLength(float), Rasterizer not available");
 		return NULL;
 	}
 
@@ -591,7 +591,7 @@ static PyObject* gPySetFocalLength(PyObject*, PyObject* args)
 static PyObject* gPyGetFocalLength(PyObject*, PyObject*, PyObject*)
 {
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.getFocalLength(), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -624,7 +624,7 @@ static PyObject* gPySetMistColor(PyObject*, PyObject* value)
 		return NULL;
 	
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistColor(color), Rasterizer not available");
 		return NULL;
 	}	
 	gp_Rasterizer->SetFogColor(vec[0], vec[1], vec[2]);
@@ -642,7 +642,7 @@ static PyObject* gPySetMistStart(PyObject*, PyObject* args)
 		return NULL;
 	
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistStart(float), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -661,7 +661,7 @@ static PyObject* gPySetMistEnd(PyObject*, PyObject* args)
 		return NULL;
 	
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistEnd(float), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -679,7 +679,7 @@ static PyObject* gPySetAmbientColor(PyObject*, PyObject* value)
 		return NULL;
 	
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setAmbientColor(color), Rasterizer not available");
 		return NULL;
 	}	
 	gp_Rasterizer->SetAmbientColor(vec[0], vec[1], vec[2]);
@@ -711,7 +711,7 @@ static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args)
 		return NULL;
 	
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.enableMotionBlur(float), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -723,7 +723,7 @@ static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args)
 static PyObject* gPyDisableMotionBlur(PyObject*, PyObject* args)
 {
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.disableMotionBlur(), Rasterizer not available");
 		return NULL;
 	}
 	
@@ -763,7 +763,7 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*,
 	flag = getGLSLSettingFlag(setting);
 	
 	if  (flag==-1) {
-		PyErr_SetString(PyExc_ValueError, "glsl setting is not known");
+		PyErr_SetString(PyExc_ValueError, "Rasterizer.setGLSLMaterialSetting(string): glsl setting is not known");
 		return NULL;
 	}
 
@@ -804,7 +804,7 @@ static PyObject* gPyGetGLSLMaterialSetting(PyObject*,
 	flag = getGLSLSettingFlag(setting);
 	
 	if  (flag==-1) {
-		PyErr_SetString(PyExc_ValueError, "glsl setting is not known");
+		PyErr_SetString(PyExc_ValueError, "Rasterizer.getGLSLMaterialSetting(string): glsl setting is not known");
 		return NULL;
 	}
 
@@ -832,7 +832,7 @@ static PyObject* gPySetMaterialType(PyObject*,
 	else if(type == KX_TEXFACE_MATERIAL)
 		flag = 0;
 	else {
-		PyErr_SetString(PyExc_ValueError, "material type is not known");
+		PyErr_SetString(PyExc_ValueError, "Rasterizer.setMaterialType(int): material type is not known");
 		return NULL;
 	}
 
@@ -863,7 +863,7 @@ static PyObject* gPyDrawLine(PyObject*, PyObject* args)
 	PyObject* ob_color;
 
 	if (!gp_Rasterizer) {
-		PyErr_SetString(PyExc_RuntimeError, "Rasterizer not available");
+		PyErr_SetString(PyExc_RuntimeError, "Rasterizer.drawLine(obFrom, obTo, color): Rasterizer not available");
 		return NULL;
 	}
 
@@ -1270,7 +1270,7 @@ PyObject *KXpy_reload(PyObject *self, PyObject *args) {
 		return newmodule;
 	
 	if (found==0) /* if its found but could not import then it has its own error */
-		PyErr_SetString(PyExc_ImportError, "failed to reload from blenders internal text");
+		PyErr_SetString(PyExc_ImportError, "reload(module): failed to reload from blenders internal text");
 	
 	return newmodule;
 }
@@ -1357,14 +1357,17 @@ void setSandbox(TPythonSecurityLevel level)
 /**
  * Python is not initialised.
  */
-PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie)
+PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv)
 {
 	STR_String pname = progname;
 	Py_SetProgramName(pname.Ptr());
 	Py_NoSiteFlag=1;
 	Py_FrozenFlag=1;
 	Py_Initialize();
-
+	
+	if(argv) /* browser plugins dont currently set this */
+		PySys_SetArgv(argc, argv);
+	
 	//importBlenderModules()
 	
 	setSandbox(level);
@@ -1517,7 +1520,7 @@ static PyObject* gPyEventToString(PyObject*, PyObject* value)
 	
 	PyErr_Clear(); // incase there was an error clearing
 	Py_DECREF(mod);
-	if (!ret)	PyErr_SetString(PyExc_ValueError, "expected a valid int keyboard event");
+	if (!ret)	PyErr_SetString(PyExc_ValueError, "GameKeys.EventToString(int): expected a valid int keyboard event");
 	else		Py_INCREF(ret);
 	
 	return ret;
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index 97d23fe391c..11360197b95 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -43,7 +43,7 @@ extern bool gUseVisibilityTemp;
 PyObject*	initGameLogic(class KX_KetsjiEngine *engine, class KX_Scene* ketsjiscene);
 PyObject*	initGameKeys();
 PyObject*	initRasterizer(class RAS_IRasterizer* rasty,class RAS_ICanvas* canvas);
-PyObject*	initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, struct Main *maggie);
+PyObject*	initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, struct Main *maggie, int argc, char** argv);
 PyObject*	initMathutils();
 PyObject*	initBGL();
 PyObject*	initVideoTexture(void); 

From ffbd75e57116ba05a1261f14be0d1206acce7e3d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 16 May 2009 13:17:21 +0000
Subject: [PATCH 084/577] * Fix for simple bug in voxel data texture

---
 source/blender/render/intern/source/voxeldata.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 86cc54c0d44..f0816cfddff 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -355,14 +355,14 @@ void cache_voxeldata(struct Render *re,Tex *tex)
 	
 	if (!vd) return;
 	
-	read_voxeldata_header(fp, vd);
-	size = (vd->resolX)*(vd->resolY)*(vd->resolZ);
-	vd->dataset = MEM_mallocN(sizeof(float)*size, "voxel dataset");
-	
 	if (!BLI_exists(vd->source_path)) return;
 	fp = fopen(vd->source_path,"rb");
 	if (!fp) return;
 	
+	read_voxeldata_header(fp, vd);
+	size = (vd->resolX)*(vd->resolY)*(vd->resolZ);
+	vd->dataset = MEM_mallocN(sizeof(float)*size, "voxel dataset");
+	
 	//here improve the dataset loading function for more dataset types
 	if (vd->still) load_frame(fp, vd->dataset, size, vd->still_frame, sizeof(VoxelDataHeader));
 	else load_frame(fp, vd->dataset, size, re->r.cfra, sizeof(VoxelDataHeader));

From 44cebb39b88a6f411dbe0eb05109869ae82bbc9f Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 10 Jun 2009 07:45:12 +0000
Subject: [PATCH 085/577] * raised some limits in point density

---
 source/blender/src/buttons_shading.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 2e6dc7da9e1..f74afde5e81 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -909,7 +909,7 @@ static void texture_panel_pointdensity(Tex *tex)
 		X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
 
 	uiDefButF(block, NUM, B_REDR, "Radius: ",
-		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 100.0, 10, 2, "Radius to look for nearby particles within");
+		X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->radius), 0.001, 10000.0, 10, 2, "Radius to look for nearby particles within");
 	
 	yco -= YSPACE;
 	
@@ -1021,11 +1021,11 @@ static void texture_panel_pointdensity_modify(Tex *tex)
 	if (pd->flag & TEX_PD_TURBULENCE) {
 		
 		uiDefButF(block, NUM, B_REDR, "Size: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 100.0, 10, 2, "Turbulence size");
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_size), 0.001, 10000.0, 10, 2, "Turbulence size");
 		uiDefButS(block, NUM, B_REDR, "Depth: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 100.0, 10, 2, "Turbulence depth");
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_depth), 0.0, 1024.0, 10, 2, "Turbulence depth");
 		uiDefButF(block, NUM, B_REDR, "Strength: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 100.0, 10, 2, "");
+			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(pd->noise_fac), 0.001, 10000.0, 10, 2, "");
 		
 		uiBlockEndAlign(block);
 		

From 3b2ec949778649f19b83c5ada413f3a50bb0e0e8 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 20 Jun 2009 06:41:50 +0000
Subject: [PATCH 086/577] Voxel data & volume light cache

* Added support for additional file types in the voxel data texture. I added
support for 8 bit raw files, but most notably for image sequences.

Image sequences generate the voxel grid by stacking layers of image slices on top
of each other to generate the voxels in the Z axis - the number of slices in the
sequence is the resolution of the voxel grid's Z axis.

i.e. http://mke3.net/blender/devel/rendering/volumetrics/skull_layers.jpg

The image sequence option is particularly useful for loading medical data into
Blender. 3d medical data such as MRIs or CT scans are often stored as DICOM
format image sequences. It's not in Blender's scope to support the DICOM format,
but there are plenty of utilities such as ImageMagick, Photoshop or OsiriX that
can easily convert DICOM files to formats that Blender supports, such as PNG or JPEG.

Here are some example renderings using these file formats to load medical data:
http://vimeo.com/5242961
http://vimeo.com/5242989
http://vimeo.com/5243228

Currently the 8 bit raw and image sequence formats only support the 'still'
rendering feature.

* Changed the default texture placement to be centred around 0.5,0.5,0.5, rather
than within the 0.0,1.0 cube. This is more consistent with image textures, and it
also means you can easily add a voxel data texture to a default cube without
having to mess around with mapping.

* Added some more extrapolation modes such as Repeat and Extend rather than just clipping

http://mke3.net/blender/devel/rendering/volumetrics/bradybunch.jpg

* Changed the voxel data storage to use MEM_Mapalloc (memory mapped disk cache)
rather than storing in ram, to help cut down memory usage.

* Refactored and cleaned up the code a lot. Now the access and interpolation code
is separated into a separate voxel library inside blenlib. This is now properly
shared between voxel data texture and light cache (previously there was some
duplicated code).

* Made volume light cache support non-cubic voxel grids. Now the resolution
specified in the material properties is used for the longest edge of the volume
object's bounding box, and the shorter edges are proportional (similar to how
resolution is calculated for fluid sim domains).

This is *much* more memory efficient for squashed volume regions like clouds
layer bounding boxes, allowing you to raise the resolution considerably while
still keeping memory usage acceptable.
---
 source/blender/blenlib/BLI_voxel.h            |  40 ++
 source/blender/blenlib/intern/voxel.c         | 311 +++++++++++
 source/blender/makesdna/DNA_texture_types.h   |  22 +-
 .../render/intern/include/render_types.h      |  13 +-
 .../blender/render/intern/include/voxeldata.h |  10 +-
 .../blender/render/intern/source/shadeinput.c |   1 +
 .../render/intern/source/volume_precache.c    | 260 +++++-----
 .../blender/render/intern/source/volumetric.c |  73 +--
 .../blender/render/intern/source/voxeldata.c  | 484 ++++++------------
 source/blender/src/buttons_shading.c          | 198 ++++---
 10 files changed, 816 insertions(+), 596 deletions(-)
 create mode 100644 source/blender/blenlib/BLI_voxel.h
 create mode 100644 source/blender/blenlib/intern/voxel.c

diff --git a/source/blender/blenlib/BLI_voxel.h b/source/blender/blenlib/BLI_voxel.h
new file mode 100644
index 00000000000..091d8e3682d
--- /dev/null
+++ b/source/blender/blenlib/BLI_voxel.h
@@ -0,0 +1,40 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb, Raul Fernandez Hernandez (Farsthary).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BLI_VOXEL_H
+#define BLI_VOXEL_H
+
+/* find the index number of a voxel, given x/y/z integer coords and resolution vector */
+#define V_I(x, y, z, res) ( (z)*(res)[1]*(res)[0] + (y)*(res)[0] + (x) )
+
+/* all input coordinates must be in bounding box 0.0 - 1.0 */
+float voxel_sample_nearest(float *data, int *res, float *co);
+float voxel_sample_trilinear(float *data, int *res, float *co);
+float voxel_sample_tricubic(float *data, int *res, float *co);
+
+#endif /* BLI_VOXEL_H */
\ No newline at end of file
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c
new file mode 100644
index 00000000000..8a1ca6e59ff
--- /dev/null
+++ b/source/blender/blenlib/intern/voxel.c
@@ -0,0 +1,311 @@
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb, Raul Fernandez Hernandez (Farsthary).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#include <math.h>
+
+#include "BLI_voxel.h"
+
+#include "BKE_utildefines.h"
+
+
+#if defined( _MSC_VER ) && !defined( __cplusplus )
+# define inline __inline
+#endif // defined( _MSC_VER ) && !defined( __cplusplus )
+
+static inline float D(float *data,  int *res, int x, int y, int z)
+{
+	CLAMP(x, 0, res[0]-1);
+	CLAMP(y, 0, res[1]-1);
+	CLAMP(z, 0, res[2]-1);
+	return data[ V_I(x, y, z, res) ];
+}
+
+/* *** nearest neighbour *** */
+/* input coordinates must be in bounding box 0.0 - 1.0 */
+float voxel_sample_nearest(float *data, int *res, float *co)
+{
+	int xi, yi, zi;
+	
+	xi = co[0] * res[0];
+	yi = co[1] * res[1];
+	zi = co[2] * res[2];
+	
+	return D(data, res, xi, yi, zi);
+}
+
+
+/* *** trilinear *** */
+/* input coordinates must be in bounding box 0.0 - 1.0 */
+
+static inline float lerp(float t, float v1, float v2) {
+	return (1.f - t) * v1 + t * v2;
+}
+
+/* trilinear interpolation - taken partly from pbrt's implementation: http://www.pbrt.org */
+float voxel_sample_trilinear(float *data, int *res, float *co)
+{
+	float voxx, voxy, voxz;
+	int vx, vy, vz;
+	float dx, dy, dz;
+	float d00, d10, d01, d11, d0, d1, d_final;
+	
+	if (!data) return 0.f;
+	
+	voxx = co[0] * res[0] - 0.5f;
+	voxy = co[1] * res[1] - 0.5f;
+	voxz = co[2] * res[2] - 0.5f;
+	
+	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
+	
+	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
+	
+	d00 = lerp(dx, D(data, res, vx, vy, vz), 		D(data, res, vx+1, vy, vz));
+	d10 = lerp(dx, D(data, res, vx, vy+1, vz), 		D(data, res, vx+1, vy+1, vz));
+	d01 = lerp(dx, D(data, res, vx, vy, vz+1), 		D(data, res, vx+1, vy, vz+1));
+	d11 = lerp(dx, D(data, res, vx, vy+1, vz+1), 	D(data, res, vx+1, vy+1, vz+1));
+	d0 = lerp(dy, d00, d10);
+	d1 = lerp(dy, d01, d11);
+	d_final = lerp(dz, d0, d1);
+	
+	return d_final;
+}
+
+/* *** tricubic *** */
+
+int C[64][64] = {
+{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 9,-9,-9, 9, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{-6, 6, 6,-6, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{-6, 6, 6,-6, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 4,-4,-4, 4, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0},
+{-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 9,-9, 0, 0,-9, 9, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{-6, 6, 0, 0, 6,-6, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9, 0, 0,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0},
+{ 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0},
+{-27,27,27,-27,27,-27,-27,27,-18,-9,18, 9,18, 9,-18,-9,-18,18,-9, 9,18,-18, 9,-9,-18,18,18,-18,-9, 9, 9,-9,-12,-6,-6,-3,12, 6, 6, 3,-12,-6,12, 6,-6,-3, 6, 3,-12,12,-6, 6,-6, 6,-3, 3,-8,-4,-4,-2,-4,-2,-2,-1},
+{18,-18,-18,18,-18,18,18,-18, 9, 9,-9,-9,-9,-9, 9, 9,12,-12, 6,-6,-12,12,-6, 6,12,-12,-12,12, 6,-6,-6, 6, 6, 6, 3, 3,-6,-6,-3,-3, 6, 6,-6,-6, 3, 3,-3,-3, 8,-8, 4,-4, 4,-4, 2,-2, 4, 4, 2, 2, 2, 2, 1, 1},
+{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0},
+{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6, 9,-9, 9,-9,-9, 9,-9, 9,12,-12,-12,12, 6,-6,-6, 6, 6, 3, 6, 3,-6,-3,-6,-3, 8, 4,-8,-4, 4, 2,-4,-2, 6,-6, 6,-6, 3,-3, 3,-3, 4, 2, 4, 2, 2, 1, 2, 1},
+{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-6, 6,-6, 6, 6,-6, 6,-6,-8, 8, 8,-8,-4, 4, 4,-4,-3,-3,-3,-3, 3, 3, 3, 3,-4,-4, 4, 4,-2,-2, 2, 2,-4, 4,-4, 4,-2, 2,-2, 2,-2,-2,-2,-2,-1,-1,-1,-1},
+{ 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{-6, 6, 0, 0, 6,-6, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 4,-4, 0, 0,-4, 4, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4, 0, 0,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0},
+{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0},
+{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6,12,-12, 6,-6,-12,12,-6, 6, 9,-9,-9, 9, 9,-9,-9, 9, 8, 4, 4, 2,-8,-4,-4,-2, 6, 3,-6,-3, 6, 3,-6,-3, 6,-6, 3,-3, 6,-6, 3,-3, 4, 2, 2, 1, 4, 2, 2, 1},
+{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-8, 8,-4, 4, 8,-8, 4,-4,-6, 6, 6,-6,-6, 6, 6,-6,-4,-4,-2,-2, 4, 4, 2, 2,-3,-3, 3, 3,-3,-3, 3, 3,-4, 4,-2, 2,-4, 4,-2, 2,-2,-2,-1,-1,-2,-2,-1,-1},
+{ 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+{ 0, 0, 0, 0, 0, 0, 0, 0, 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
+{-12,12,12,-12,12,-12,-12,12,-8,-4, 8, 4, 8, 4,-8,-4,-6, 6,-6, 6, 6,-6, 6,-6,-6, 6, 6,-6,-6, 6, 6,-6,-4,-2,-4,-2, 4, 2, 4, 2,-4,-2, 4, 2,-4,-2, 4, 2,-3, 3,-3, 3,-3, 3,-3, 3,-2,-1,-2,-1,-2,-1,-2,-1},
+{ 8,-8,-8, 8,-8, 8, 8,-8, 4, 4,-4,-4,-4,-4, 4, 4, 4,-4, 4,-4,-4, 4,-4, 4, 4,-4,-4, 4, 4,-4,-4, 4, 2, 2, 2, 2,-2,-2,-2,-2, 2, 2,-2,-2, 2, 2,-2,-2, 2,-2, 2,-2, 2,-2, 2,-2, 1, 1, 1, 1, 1, 1, 1, 1}};
+
+static int ijk2n(int i, int j, int k) {
+	return(i+4*j+16*k);
+}
+
+static void tricubic_get_coeff_stacked(float a[64], float x[64]) {
+	int i,j;
+	for (i=0;i<64;i++) {
+		a[i]=(float)(0.0);
+		for (j=0;j<64;j++) {
+			a[i]+=C[i][j]*x[j];
+		}
+	}
+}
+
+static void point2xyz(int p, int *x, int *y, int *z) {
+	switch (p) {
+		case 0: *x=0; *y=0; *z=0; break;
+		case 1: *x=1; *y=0; *z=0; break;
+		case 2: *x=0; *y=1; *z=0; break;
+		case 3: *x=1; *y=1; *z=0; break;
+		case 4: *x=0; *y=0; *z=1; break;
+		case 5: *x=1; *y=0; *z=1; break;
+		case 6: *x=0; *y=1; *z=1; break;
+		case 7: *x=1; *y=1; *z=1; break;
+		default:*x=0; *y=0; *z=0;
+	}
+}
+
+
+static void tricubic_get_coeff(float a[64], float f[8], float dfdx[8], float dfdy[8], float dfdz[8], float d2fdxdy[8], float d2fdxdz[8], float d2fdydz[8], float d3fdxdydz[8]) {
+	int i;
+	float x[64];
+	for (i=0;i<8;i++) {
+		x[0+i]=f[i];
+		x[8+i]=dfdx[i];
+		x[16+i]=dfdy[i];
+		x[24+i]=dfdz[i];
+		x[32+i]=d2fdxdy[i];
+		x[40+i]=d2fdxdz[i];
+		x[48+i]=d2fdydz[i];
+		x[56+i]=d3fdxdydz[i];
+	}
+	tricubic_get_coeff_stacked(a,x);
+}
+
+static float tricubic_eval(float a[64], float x, float y, float z) {
+	int i,j,k;
+	float ret=(float)(0.0);
+	
+	for (i=0;i<4;i++) {
+		for (j=0;j<4;j++) {
+			for (k=0;k<4;k++) {
+				ret+=a[ijk2n(i,j,k)]*pow(x,i)*pow(y,j)*pow(z,k);
+			}
+		}
+	}
+	return(ret);
+}
+
+/* tricubic interpolation
+ * from 'libtricubic': http://www.lekien.com/~francois/software/tricubic/ 
+ * input coordinates must be in bounding box 0.0 - 1.0 */
+float voxel_sample_tricubic(float *data, int *res, float *co)
+{
+	float xx, yy, zz;
+	int xi,yi,zi;
+	int *n = res;
+	float dx,dy,dz;
+	float a[64];
+	
+	xx = co[0] * res[0] - 0.5f;
+	yy = co[1] * res[1] - 0.5f;
+	zz = co[2] * res[2] - 0.5f;
+	
+	xi = (int)xx; yi = (int)yy; zi = (int)zz;
+	
+	{
+		float fval[8]={data[V_I(xi,yi,zi,n)],data[V_I(xi+1,yi,zi,n)],data[V_I(xi,yi+1,zi,n)],data[V_I(xi+1,yi+1,zi,n)],data[V_I(xi,yi,zi+1,n)],data[V_I(xi+1,yi,zi+1,n)],data[V_I(xi,yi+1,zi+1,n)],data[V_I(xi+1,yi+1,zi+1,n)]}; 
+		
+		float dfdxval[8]={0.5f*(data[V_I(xi+1,yi,zi,n)]-data[V_I(xi-1,yi,zi,n)]),0.5f*(data[V_I(xi+2,yi,zi,n)]-data[V_I(xi,yi,zi,n)]),
+			0.5f*(data[V_I(xi+1,yi+1,zi,n)]-data[V_I(xi-1,yi+1,zi,n)]),0.5f*(data[V_I(xi+2,yi+1,zi,n)]-data[V_I(xi,yi+1,zi,n)]),
+			0.5f*(data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi-1,yi,zi+1,n)]),0.5f*(data[V_I(xi+2,yi,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]),
+			0.5f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]),
+			0.5f*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)])};						
+		
+		float dfdyval[8]={0.5f*(data[V_I(xi,yi+1,zi,n)]-data[V_I(xi,yi-1,zi,n)]),0.5f*(data[V_I(xi+1,yi+1,zi,n)]-data[V_I(xi+1,yi-1,zi,n)]),
+			0.5f*(data[V_I(xi,yi+2,zi,n)]-data[V_I(xi,yi,zi,n)]),0.5f*(data[V_I(xi+1,yi+2,zi,n)]-data[V_I(xi+1,yi,zi,n)]),
+			0.5f*(data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi,yi-1,zi+1,n)]),0.5f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]),
+			0.5f*(data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]),
+			0.5f*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)])};						 
+		
+		float dfdzval[8]={0.5f*(data[V_I(xi,yi,zi+1,n)]-data[V_I(xi,yi,zi-1,n)]),0.5f*(data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi+1,yi,zi-1,n)]),
+			0.5f*(data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi-1,n)]),0.5f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]),
+			0.5f*(data[V_I(xi,yi,zi+2,n)]-data[V_I(xi,yi,zi,n)]),0.5f*(data[V_I(xi+1,yi,zi+2,n)]-data[V_I(xi+1,yi,zi,n)]),
+			0.5f*(data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi,yi+1,zi,n)]),
+			0.5f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)])};						 
+		
+		float d2fdxdyval[8]={0.25*(data[V_I(xi+1,yi+1,zi,n)]-data[V_I(xi-1,yi+1,zi,n)]-data[V_I(xi+1,yi-1,zi,n)]+data[V_I(xi-1,yi-1,zi,n)]),
+			0.25*(data[V_I(xi+2,yi+1,zi,n)]-data[V_I(xi,yi+1,zi,n)]-data[V_I(xi+2,yi-1,zi,n)]+data[V_I(xi,yi-1,zi,n)]),
+			0.25*(data[V_I(xi+1,yi+2,zi,n)]-data[V_I(xi-1,yi+2,zi,n)]-data[V_I(xi+1,yi,zi,n)]+data[V_I(xi-1,yi,zi,n)]),
+			0.25*(data[V_I(xi+2,yi+2,zi,n)]-data[V_I(xi,yi+2,zi,n)]-data[V_I(xi+2,yi,zi,n)]+data[V_I(xi,yi,zi,n)]),
+			0.25*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]+data[V_I(xi-1,yi-1,zi+1,n)]),
+			0.25*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi+2,yi-1,zi+1,n)]+data[V_I(xi,yi-1,zi+1,n)]),
+			0.25*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi-1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)]+data[V_I(xi-1,yi,zi+1,n)]),
+			0.25*(data[V_I(xi+2,yi+2,zi+1,n)]-data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi+2,yi,zi+1,n)]+data[V_I(xi,yi,zi+1,n)])};						 
+		
+		float d2fdxdzval[8]={0.25f*(data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi-1,yi,zi+1,n)]-data[V_I(xi+1,yi,zi-1,n)]+data[V_I(xi-1,yi,zi-1,n)]),
+			0.25f*(data[V_I(xi+2,yi,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]-data[V_I(xi+2,yi,zi-1,n)]+data[V_I(xi,yi,zi-1,n)]),
+			0.25f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]+data[V_I(xi-1,yi+1,zi-1,n)]),
+			0.25f*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi+2,yi+1,zi-1,n)]+data[V_I(xi,yi+1,zi-1,n)]),
+			0.25f*(data[V_I(xi+1,yi,zi+2,n)]-data[V_I(xi-1,yi,zi+2,n)]-data[V_I(xi+1,yi,zi,n)]+data[V_I(xi-1,yi,zi,n)]),
+			0.25f*(data[V_I(xi+2,yi,zi+2,n)]-data[V_I(xi,yi,zi+2,n)]-data[V_I(xi+2,yi,zi,n)]+data[V_I(xi,yi,zi,n)]),
+			0.25f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi-1,yi+1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)]+data[V_I(xi-1,yi+1,zi,n)]),
+			0.25f*(data[V_I(xi+2,yi+1,zi+2,n)]-data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi+2,yi+1,zi,n)]+data[V_I(xi,yi+1,zi,n)])};
+		
+		
+		float d2fdydzval[8]={0.25f*(data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi,yi-1,zi+1,n)]-data[V_I(xi,yi+1,zi-1,n)]+data[V_I(xi,yi-1,zi-1,n)]),
+			0.25f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]+data[V_I(xi+1,yi-1,zi-1,n)]),
+			0.25f*(data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]-data[V_I(xi,yi+2,zi-1,n)]+data[V_I(xi,yi,zi-1,n)]),
+			0.25f*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi+1,yi+2,zi-1,n)]+data[V_I(xi+1,yi,zi-1,n)]),
+			0.25f*(data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi,yi-1,zi+2,n)]-data[V_I(xi,yi+1,zi,n)]+data[V_I(xi,yi-1,zi,n)]),
+			0.25f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi+1,yi-1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)]+data[V_I(xi+1,yi-1,zi,n)]),
+			0.25f*(data[V_I(xi,yi+2,zi+2,n)]-data[V_I(xi,yi,zi+2,n)]-data[V_I(xi,yi+2,zi,n)]+data[V_I(xi,yi,zi,n)]),
+			0.25f*(data[V_I(xi+1,yi+2,zi+2,n)]-data[V_I(xi+1,yi,zi+2,n)]-data[V_I(xi+1,yi+2,zi,n)]+data[V_I(xi+1,yi,zi,n)])};
+		
+		
+		float d3fdxdydzval[8]={0.125f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]+data[V_I(xi-1,yi-1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]+data[V_I(xi-1,yi+1,zi-1,n)]+data[V_I(xi+1,yi-1,zi-1,n)]-data[V_I(xi-1,yi-1,zi-1,n)]),
+			0.125f*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi+2,yi-1,zi+1,n)]+data[V_I(xi,yi-1,zi+1,n)]-data[V_I(xi+2,yi+1,zi-1,n)]+data[V_I(xi,yi+1,zi-1,n)]+data[V_I(xi+2,yi-1,zi-1,n)]-data[V_I(xi,yi-1,zi-1,n)]),
+			0.125f*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi-1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)]+data[V_I(xi-1,yi,zi+1,n)]-data[V_I(xi+1,yi+2,zi-1,n)]+data[V_I(xi-1,yi+2,zi-1,n)]+data[V_I(xi+1,yi,zi-1,n)]-data[V_I(xi-1,yi,zi-1,n)]),
+			0.125f*(data[V_I(xi+2,yi+2,zi+1,n)]-data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi+2,yi,zi+1,n)]+data[V_I(xi,yi,zi+1,n)]-data[V_I(xi+2,yi+2,zi-1,n)]+data[V_I(xi,yi+2,zi-1,n)]+data[V_I(xi+2,yi,zi-1,n)]-data[V_I(xi,yi,zi-1,n)]),
+			0.125f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi-1,yi+1,zi+2,n)]-data[V_I(xi+1,yi-1,zi+2,n)]+data[V_I(xi-1,yi-1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)]+data[V_I(xi-1,yi+1,zi,n)]+data[V_I(xi+1,yi-1,zi,n)]-data[V_I(xi-1,yi-1,zi,n)]),
+			0.125f*(data[V_I(xi+2,yi+1,zi+2,n)]-data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi+2,yi-1,zi+2,n)]+data[V_I(xi,yi-1,zi+2,n)]-data[V_I(xi+2,yi+1,zi,n)]+data[V_I(xi,yi+1,zi,n)]+data[V_I(xi+2,yi-1,zi,n)]-data[V_I(xi,yi-1,zi,n)]),
+			0.125f*(data[V_I(xi+1,yi+2,zi+2,n)]-data[V_I(xi-1,yi+2,zi+2,n)]-data[V_I(xi+1,yi,zi+2,n)]+data[V_I(xi-1,yi,zi+2,n)]-data[V_I(xi+1,yi+2,zi,n)]+data[V_I(xi-1,yi+2,zi,n)]+data[V_I(xi+1,yi,zi,n)]-data[V_I(xi-1,yi,zi,n)]),
+			0.125f*(data[V_I(xi+2,yi+2,zi+2,n)]-data[V_I(xi,yi+2,zi+2,n)]-data[V_I(xi+2,yi,zi+2,n)]+data[V_I(xi,yi,zi+2,n)]-data[V_I(xi+2,yi+2,zi,n)]+data[V_I(xi,yi+2,zi,n)]+data[V_I(xi+2,yi,zi,n)]-data[V_I(xi,yi,zi,n)])};
+		
+		
+		tricubic_get_coeff(a,fval,dfdxval,dfdyval,dfdzval,d2fdxdyval,d2fdxdzval,d2fdydzval,d3fdxdydzval);
+	}
+	
+	dx = xx-xi;
+	dy = yy-yi;
+	dz = zz-zi;
+	
+	return tricubic_eval(a,dx,dy,dz);
+	
+}
+
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 420850ce396..5cbad6cf424 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -165,9 +165,10 @@ typedef struct PointDensity {
 typedef struct VoxelData {
 	int resolX, resolY, resolZ;
 	int interp_type;
-
+	short file_format;
+	short flag;
+	
 	float int_multiplier;
-	float vxpad;
 	
 	int still, still_frame;
 	char source_path[240];
@@ -480,13 +481,20 @@ typedef struct TexMapping {
 #define POINT_DATA_VEL		1
 #define POINT_DATA_LIFE		2
 
-/******************** Voxel Data *****************************/ 
-#define TEX_VD_CUBIC              0
-#define TEX_VD_PARALLELOGRAM      1
- 
+/******************** Voxel Data *****************************/
+/* flag */
+
+
+/* interpolation */
 #define TEX_VD_NEARESTNEIGHBOR		0
-#define TEX_VD_LINEAR			1
+#define TEX_VD_LINEAR				1
 #define TEX_VD_TRICUBIC				2
 
+/* file format */
+#define TEX_VD_BLENDERVOXEL		0
+#define TEX_VD_RAW_8BIT			1
+#define TEX_VD_RAW_16BIT		2
+#define TEX_VD_IMAGE_SEQUENCE	3
+
 #endif
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 8dbdde77726..9703ab10821 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -290,8 +290,8 @@ typedef struct ObjectInstanceRen {
 	float dupliorco[3], dupliuv[2];
 	float (*duplitexmat)[4];
 	
-	float *volume_precache;
-
+	struct VolumePrecache *volume_precache;
+	
 	float *vectors;
 	int totvector;
 } ObjectInstanceRen;
@@ -426,12 +426,19 @@ typedef struct VolPrecachePart
 	int minx, maxx;
 	int miny, maxy;
 	int minz, maxz;
-	int res;
+	int res[3];
 	float bbmin[3];
 	float voxel[3];
 	int working, done;
 } VolPrecachePart;
 
+typedef struct VolumePrecache
+{
+	int res[3];
+	float *data_r;
+	float *data_g;
+	float *data_b;
+} VolumePrecache;
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h
index 36c7789da80..b291bdc096d 100644
--- a/source/blender/render/intern/include/voxeldata.h
+++ b/source/blender/render/intern/include/voxeldata.h
@@ -29,23 +29,17 @@
 #ifndef VOXELDATA_H
 #define VOXELDATA_H 
 
-/**
- * Load voxel data for all point density textures in the scene
- */
-
 struct Render;
 struct TexResult;
 
 typedef struct VoxelDataHeader
 {
-int resolX, resolY, resolZ;
-int frames;
+	int resolX, resolY, resolZ;
+	int frames;
 } VoxelDataHeader;
 
-__inline int _I(int x, int y, int z, int *n);
 void make_voxeldata(struct Render *re);
 void free_voxeldata(struct Render *re);
 int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres);
 
-
 #endif /* VOXELDATA_H */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 294175460bf..59ab5661c19 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -51,6 +51,7 @@
 #include "shading.h"
 #include "strand.h"
 #include "texture.h"
+#include "volumetric.h"
 #include "zbuf.h"
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index b3cffb45a27..98a1a2ec2c8 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -36,6 +36,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_threads.h"
+#include "BLI_voxel.h"
 
 #include "PIL_time.h"
 
@@ -61,6 +62,7 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+/* *** utility code to set up an individual raytree for objectinstance, for checking inside/outside *** */
 
 /* Recursive test for intersections, from a point inside the mesh, to outside
  * Number of intersections (depth) determine if a point is inside or outside the mesh */
@@ -151,28 +153,28 @@ RayTree *create_raytree_obi(ObjectInstanceRen *obi, float *bbmin, float *bbmax)
 	return tree;
 }
 
-static float get_avg_surrounds(float *cache, int res, int res_2, int res_3, int rgb, int xx, int yy, int zz)
+/* *** light cache filtering *** */
+
+static float get_avg_surrounds(float *cache, int *res, int xx, int yy, int zz)
 {
 	int x, y, z, x_, y_, z_;
 	int added=0;
 	float tot=0.0f;
-	int i;
 	
-	for (x=-1; x <= 1; x++) {
-		x_ = xx+x;
-		if (x_ >= 0 && x_ <= res-1) {
+	for (z=-1; z <= 1; z++) {
+		z_ = zz+z;
+		if (z_ >= 0 && z_ <= res[2]-1) {
 		
 			for (y=-1; y <= 1; y++) {
 				y_ = yy+y;
-				if (y_ >= 0 && y_ <= res-1) {
+				if (y_ >= 0 && y_ <= res[1]-1) {
 				
-					for (z=-1; z <= 1; z++) {
-						z_ = zz+z;
-						if (z_ >= 0 && z_ <= res-1) {
+					for (x=-1; x <= 1; x++) {
+						x_ = xx+x;
+						if (x_ >= 0 && x_ <= res[0]-1) {
 						
-							i = rgb*res_3 + x_*res_2 + y_*res + z_;
-							if (cache[i] > 0.0f) {
-								tot += cache[i];
+							if (cache[ V_I(x_, y_, z_, res) ] > 0.0f) {
+								tot += cache[ V_I(x_, y_, z_, res) ];
 								added++;
 							}
 							
@@ -192,54 +194,46 @@ static float get_avg_surrounds(float *cache, int res, int res_2, int res_3, int
  * For each voxel which was originally external to the mesh, it finds the average values of
  * the surrounding internal voxels and sets the original external voxel to that average amount.
  * Works almost a bit like a 'dilate' filter */
-static void lightcache_filter(float *cache, int res)
+static void lightcache_filter(VolumePrecache *vp)
 {
-	int x, y, z, rgb;
-	int res_2, res_3;
-	int i;
-	
-	res_2 = res*res;
-	res_3 = res*res*res;
+	int x, y, z;
 
-	for (x=0; x < res; x++) {
-		for (y=0; y < res; y++) {
-			for (z=0; z < res; z++) {
-				for (rgb=0; rgb < 3; rgb++) {
-					i = rgb*res_3 + x*res_2 + y*res + z;
-
-					/* trigger for outside mesh */
-					if (cache[i] < -0.5f) cache[i] = get_avg_surrounds(cache, res, res_2, res_3, rgb, x, y, z);
-				}
+	for (z=0; z < vp->res[2]; z++) {
+		for (y=0; y < vp->res[1]; y++) {
+			for (x=0; x < vp->res[0]; x++) {
+				/* trigger for outside mesh */
+				if (vp->data_r[ V_I(x, y, z, vp->res) ] < -0.5f)
+					vp->data_r[ V_I(x, y, z, vp->res) ] = get_avg_surrounds(vp->data_r, vp->res, x, y, z);
+				if (vp->data_g[ V_I(x, y, z, vp->res) ] < -0.5f)
+					vp->data_g[ V_I(x, y, z, vp->res) ] = get_avg_surrounds(vp->data_g, vp->res, x, y, z);
+				if (vp->data_b[ V_I(x, y, z, vp->res) ] < -0.5f)
+					vp->data_b[ V_I(x, y, z, vp->res) ] = get_avg_surrounds(vp->data_b, vp->res, x, y, z);
 			}
 		}
 	}
 }
 
-static inline int I(int x,int y,int z,int n) //has a pad of 1 voxel surrounding the core for boundary simulation
+static inline int ms_I(int x, int y, int z, int *n) //has a pad of 1 voxel surrounding the core for boundary simulation
 { 
-	return (x*(n+2)+y)*(n+2)+z;
+	return z*(n[1]+2)*(n[0]+2) + y*(n[0]+2) + x;
 }
 
 
+/* *** multiple scattering approximation *** */
+
 /* get the total amount of light energy in the light cache. used to normalise after multiple scattering */
-static float total_ss_energy(float *cache, const int res)
+static float total_ss_energy(VolumePrecache *vp)
 {
-	int x, y, z, rgb;
-	int res_2, res_3;
-	int i;
+	int x, y, z;
+	int *res = vp->res;
 	float energy=0.f;
 	
-	res_2 = res*res;
-	res_3 = res*res*res;
-
-	for (x=0; x < res; x++) {
-		for (y=0; y < res; y++) {
-			for (z=0; z < res; z++) {
-				for (rgb=0; rgb < 3; rgb++) {
-					i = rgb*res_3 + x*res_2 + y*res + z;
-					
-					if (cache[i] > 0.f) energy += cache[i];
-				}
+	for (z=0; z < res[2]; z++) {
+		for (y=0; y < res[1]; y++) {
+			for (x=0; x < res[0]; x++) {
+				if (vp->data_r[ V_I(x, y, z, res) ] > 0.f) energy += vp->data_r[ V_I(x, y, z, res) ];
+				if (vp->data_g[ V_I(x, y, z, res) ] > 0.f) energy += vp->data_g[ V_I(x, y, z, res) ];
+				if (vp->data_b[ V_I(x, y, z, res) ] > 0.f) energy += vp->data_b[ V_I(x, y, z, res) ];
 			}
 		}
 	}
@@ -247,16 +241,16 @@ static float total_ss_energy(float *cache, const int res)
 	return energy;
 }
 
-static float total_ms_energy(float *sr, float *sg, float *sb, const int res)
+static float total_ms_energy(float *sr, float *sg, float *sb, int *res)
 {
 	int x, y, z, i;
 	float energy=0.f;
 	
-	for (z=1;z<=res;z++) {
-		for (y=1;y<=res;y++) {
-			for (x=1;x<=res;x++) {
+	for (z=1;z<=res[2];z++) {
+		for (y=1;y<=res[1];y++) {
+			for (x=1;x<=res[0];x++) {
 			
-				i = I(x,y,z,res);
+				i = ms_I(x,y,z,res);
 				if (sr[i] > 0.f) energy += sr[i];
 				if (sg[i] > 0.f) energy += sg[i];
 				if (sb[i] > 0.f) energy += sb[i];
@@ -267,44 +261,44 @@ static float total_ms_energy(float *sr, float *sg, float *sb, const int res)
 	return energy;
 }
 
-static void ms_diffuse(int b, float* x0, float* x, float diff, int n)
+static void ms_diffuse(int b, float* x0, float* x, float diff, int *n)
 {
 	int i, j, k, l;
 	const float dt = VOL_MS_TIMESTEP;
-	const float a = dt*diff*n*n*n;
+	const float a = dt*diff*n[0]*n[1]*n[2];
 	
 	for (l=0; l<20; l++)
 	{
-		for (k=1; k<=n; k++)
+		for (k=1; k<=n[2]; k++)
 		{
-			for (j=1; j<=n; j++)
+			for (j=1; j<=n[1]; j++)
 			{
-				for (i=1; i<=n; i++)
+				for (i=1; i<=n[0]; i++)
 				{
-					x[I(i,j,k,n)] = (x0[I(i,j,k,n)] + a*(
-														 x[I(i-1,j,k,n)]+x[I(i+1,j,k,n)]+
-														 x[I(i,j-1,k,n)]+x[I(i,j+1,k,n)]+
-														 x[I(i,j,k-1,n)]+x[I(i,j,k+1,n)]))/(1+6*a);
+					x[ms_I(i,j,k,n)] = (x0[ms_I(i,j,k,n)] + a*(
+						 x[ms_I(i-1,j,k,n)]+x[ms_I(i+1,j,k,n)]+
+						 x[ms_I(i,j-1,k,n)]+x[ms_I(i,j+1,k,n)]+
+						 x[ms_I(i,j,k-1,n)]+x[ms_I(i,j,k+1,n)]))/(1+6*a);
 				}
 			}
 		}
 	}
 }
 
-void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *ma)
+void multiple_scattering_diffusion(Render *re, VolumePrecache *vp, Material *ma)
 {
 	const float diff = ma->vol_ms_diff * 0.001f; 	/* compensate for scaling for a nicer UI range */
 	const float simframes = ma->vol_ms_steps;
 	const int shade_type = ma->vol_shade_type;
 	float fac = ma->vol_ms_intensity;
 	
-	int i, j, k, m;
-	int n = res;
-	const int size = (n+2)*(n+2)*(n+2);
+	int x, y, z, m;
+	int *n = vp->res;
+	const int size = (n[0]+2)*(n[1]+2)*(n[2]+2);
 	double time, lasttime= PIL_check_seconds_timer();
 	float total;
 	float c=1.0f;
-	int index;
+	int i;
 	float origf;	/* factor for blending in original light cache */
 	float energy_ss, energy_ms;
 
@@ -315,33 +309,31 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 	float *sb0=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
 	float *sb=(float *)MEM_callocN(size*sizeof(float), "temporary multiple scattering buffer");
 
-	total = (float)(n*n*n*simframes);
+	total = (float)(n[0]*n[1]*n[2]*simframes);
 	
-	energy_ss = total_ss_energy(cache, res);
+	energy_ss = total_ss_energy(vp);
 	
 	/* Scattering as diffusion pass */
 	for (m=0; m<simframes; m++)
 	{
 		/* add sources */
-		for (k=1; k<=n; k++)
+		for (z=1; z<=n[2]; z++)
 		{
-			for (j=1; j<=n; j++)
+			for (y=1; y<=n[1]; y++)
 			{
-				for (i=1; i<=n; i++)
+				for (x=1; x<=n[0]; x++)
 				{
+					i = V_I((x-1), (y-1), (z-1), n);
 					time= PIL_check_seconds_timer();
 					c++;
+										
+					if (vp->data_r[i] > 0.f)
+						sr[ms_I(x,y,z,n)] += vp->data_r[i];
+					if (vp->data_g[i] > 0.f)
+						sg[ms_I(x,y,z,n)] += vp->data_g[i];
+					if (vp->data_b[i] > 0.f)
+						sb[ms_I(x,y,z,n)] += vp->data_b[i];
 					
-					index=(i-1)*n*n + (j-1)*n + k-1;
-					
-					if (cache[index] > 0.0f)
-						sr[I(i,j,k,n)] += cache[index];
-					if (cache[1*n*n*n + index] > 0.0f)
-						sg[I(i,j,k,n)] += cache[1*n*n*n + index];
-					if (cache[2*n*n*n + index] > 0.0f)
-						sb[I(i,j,k,n)] += cache[2*n*n*n + index];
-
-
 					/* Displays progress every second */
 					if(time-lasttime>1.0f) {
 						char str[64];
@@ -368,7 +360,7 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 	}
 	
 	/* normalisation factor to conserve energy */
-	energy_ms = total_ms_energy(sr, sg, sb, res);
+	energy_ms = total_ms_energy(sr, sg, sb, n);
 	fac *= (energy_ss / energy_ms);
 	
 	/* blend multiple scattering back in the light cache */
@@ -380,16 +372,16 @@ void multiple_scattering_diffusion(Render *re, float *cache, int res, Material *
 		origf = 0.0f;
 	}
 
-	for (k=1;k<=n;k++)
+	for (z=1;z<=n[2];z++)
 	{
-		for (j=1;j<=n;j++)
+		for (y=1;y<=n[1];y++)
 		{
-			for (i=1;i<=n;i++)
+			for (x=1;x<=n[0];x++)
 			{
-				index=(i-1)*n*n + (j-1)*n + k-1;
-				cache[index]			= origf * cache[index]  + fac * sr[I(i,j,k,n)];
-				cache[1*n*n*n + index]	= origf * cache[1*n*n*n + index] + fac * sg[I(i,j,k,n)];
-				cache[2*n*n*n + index]	= origf * cache[2*n*n*n + index] + fac * sb[I(i,j,k,n)];
+				int index=(x-1)*n[1]*n[2] + (y-1)*n[2] + z-1;
+				vp->data_r[index] = origf * vp->data_r[index] + fac * sr[ms_I(x,y,z,n)];
+				vp->data_g[index] = origf * vp->data_g[index] + fac * sg[ms_I(x,y,z,n)];
+				vp->data_b[index] = origf * vp->data_b[index] + fac * sb[ms_I(x,y,z,n)];
 			}
 		}
 	}
@@ -434,23 +426,23 @@ static void *vol_precache_part(void *data)
 	float density, scatter_col[3] = {0.f, 0.f, 0.f};
 	float co[3];
 	int x, y, z;
-	const int res=pa->res, res_2=pa->res*pa->res, res_3=pa->res*pa->res*pa->res;
+	const int res[3]= {pa->res[0], pa->res[1], pa->res[2]};
 	const float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
 
-	for (x= pa->minx; x < pa->maxx; x++) {
-		co[0] = pa->bbmin[0] + (pa->voxel[0] * x);
+	for (z= pa->minz; z < pa->maxz; z++) {
+		co[2] = pa->bbmin[2] + (pa->voxel[2] * z);
 		
 		for (y= pa->miny; y < pa->maxy; y++) {
 			co[1] = pa->bbmin[1] + (pa->voxel[1] * y);
 			
-			for (z=pa->minz; z < pa->maxz; z++) {
-				co[2] = pa->bbmin[2] + (pa->voxel[2] * z);
+			for (x=pa->minx; x < pa->maxx; x++) {
+				co[0] = pa->bbmin[0] + (pa->voxel[0] * x);
 				
 				// don't bother if the point is not inside the volume mesh
 				if (!point_inside_obi(tree, obi, co)) {
-					obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = -1.0f;
-					obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = -1.0f;
+					obi->volume_precache->data_r[ V_I(x, y, z, res) ] = -1.0f;
+					obi->volume_precache->data_g[ V_I(x, y, z, res) ] = -1.0f;
+					obi->volume_precache->data_b[ V_I(x, y, z, res) ] = -1.0f;
 					continue;
 				}
 				
@@ -459,9 +451,9 @@ static void *vol_precache_part(void *data)
 				density = vol_get_density(shi, co);
 				vol_get_scattering(shi, scatter_col, co, stepsize, density);
 			
-				obi->volume_precache[0*res_3 + x*res_2 + y*res + z] = scatter_col[0];
-				obi->volume_precache[1*res_3 + x*res_2 + y*res + z] = scatter_col[1];
-				obi->volume_precache[2*res_3 + x*res_2 + y*res + z] = scatter_col[2];
+				obi->volume_precache->data_r[ V_I(x, y, z, res) ] = scatter_col[0];
+				obi->volume_precache->data_g[ V_I(x, y, z, res) ] = scatter_col[1];
+				obi->volume_precache->data_b[ V_I(x, y, z, res) ] = scatter_col[2];
 			}
 		}
 	}
@@ -486,44 +478,52 @@ static void precache_setup_shadeinput(Render *re, ObjectInstanceRen *obi, Materi
 	shi->lay = re->scene->lay;
 }
 
-static void precache_init_parts(Render *re, RayTree *tree, ShadeInput *shi, ObjectInstanceRen *obi, float *bbmin, float *bbmax, int res, int totthread, int *parts)
+static void precache_init_parts(Render *re, RayTree *tree, ShadeInput *shi, ObjectInstanceRen *obi, int totthread, int *parts)
 {
+	VolumePrecache *vp = obi->volume_precache;
 	int i=0, x, y, z;
 	float voxel[3];
 	int sizex, sizey, sizez;
+	float *bbmin=obi->obr->boundbox[0], *bbmax=obi->obr->boundbox[1];
+	int *res;
 	int minx, maxx;
 	int miny, maxy;
 	int minz, maxz;
 	
+	if (!vp) return;
+
 	BLI_freelistN(&re->volume_precache_parts);
 	
 	/* currently we just subdivide the box, number of threads per side */
 	parts[0] = parts[1] = parts[2] = totthread;
+	res = vp->res;
 	
 	VecSubf(voxel, bbmax, bbmin);
 	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
 		return;
-	VecMulf(voxel, 1.0f/res);
+	voxel[0] /= res[0];
+	voxel[1] /= res[1];
+	voxel[2] /= res[2];
 
 	for (x=0; x < parts[0]; x++) {
-		sizex = ceil(res / (float)parts[0]);
+		sizex = ceil(res[0] / (float)parts[0]);
 		minx = x * sizex;
 		maxx = minx + sizex;
-		maxx = (maxx>res)?res:maxx;
+		maxx = (maxx>res[0])?res[0]:maxx;
 		
 		for (y=0; y < parts[1]; y++) {
-			sizey = ceil(res / (float)parts[1]);
+			sizey = ceil(res[1] / (float)parts[1]);
 			miny = y * sizey;
 			maxy = miny + sizey;
-			maxy = (maxy>res)?res:maxy;
+			maxy = (maxy>res[1])?res[1]:maxy;
 			
 			for (z=0; z < parts[2]; z++) {
 				VolPrecachePart *pa= MEM_callocN(sizeof(VolPrecachePart), "new precache part");
 				
-				sizez = ceil(res / (float)parts[2]);
+				sizez = ceil(res[2] / (float)parts[2]);
 				minz = z * sizez;
 				maxz = minz + sizez;
-				maxz = (maxz>res)?res:maxz;
+				maxz = (maxz>res[2])?res[2]:maxz;
 						
 				pa->done = 0;
 				pa->working = 0;
@@ -534,7 +534,7 @@ static void precache_init_parts(Render *re, RayTree *tree, ShadeInput *shi, Obje
 				pa->obi = obi;
 				VECCOPY(pa->bbmin, bbmin);
 				VECCOPY(pa->voxel, voxel);
-				pa->res = res;
+				VECCOPY(pa->res, res);
 				
 				pa->minx = minx; pa->maxx = maxx;
 				pa->miny = miny; pa->maxy = maxy;
@@ -564,19 +564,37 @@ static VolPrecachePart *precache_get_new_part(Render *re)
 	return nextpa;
 }
 
+static void precache_resolution(VolumePrecache *vp, float *bbmin, float *bbmax, int res)
+{
+	float dim[3], div;
+	
+	VecSubf(dim, bbmax, bbmin);
+	
+	div = MAX3(dim[0], dim[1], dim[2]);
+	dim[0] /= div;
+	dim[1] /= div;
+	dim[2] /= div;
+			   
+	vp->res[0] = dim[0] * (float)res;
+	vp->res[1] = dim[1] * (float)res;
+	vp->res[2] = dim[2] * (float)res;
+}
+
 /* Precache a volume into a 3D voxel grid.
  * The voxel grid is stored in the ObjectInstanceRen, 
  * in camera space, aligned with the ObjectRen's bounding box.
  * Resolution is defined by the user.
  */
-void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Material *ma, float *bbmin, float *bbmax)
+void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Material *ma)
 {
+	VolumePrecache *vp;
 	VolPrecachePart *nextpa, *pa;
 	RayTree *tree;
 	ShadeInput shi;
 	ListBase threads;
-	const int res = ma->vol_precache_resolution;
+	float *bbmin=obi->obr->boundbox[0], *bbmax=obi->obr->boundbox[1];
 	int parts[3], totparts;
+	int res[3];
 	
 	int caching=1, counter=0;
 	int totthread = re->r.threads;
@@ -589,13 +607,19 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	 * used for checking if the cached point is inside or outside. */
 	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
-	
-	obi->volume_precache = MEM_callocN(sizeof(float)*res*res*res*3, "volume light cache");
+
+	vp = MEM_callocN(sizeof(VolumePrecache), "volume light cache");
+	precache_resolution(vp, bbmin, bbmax, ma->vol_precache_resolution);
+
+	vp->data_r = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data red channel");
+	vp->data_g = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data green channel");
+	vp->data_b = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data blue channel");
+	obi->volume_precache = vp;
 
 	/* Need a shadeinput to calculate scattering */
 	precache_setup_shadeinput(re, obi, ma, &shi);
 	
-	precache_init_parts(re, tree, &shi, obi, bbmin, bbmax, res, totthread, parts);
+	precache_init_parts(re, tree, &shi, obi, totthread, parts);
 	totparts = parts[0] * parts[1] * parts[2];
 	
 	BLI_init_threads(&threads, vol_precache_part, totthread);
@@ -644,11 +668,11 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 		tree= NULL;
 	}
 	
-	lightcache_filter(obi->volume_precache, res);
+	lightcache_filter(obi->volume_precache);
 	
 	if (ELEM(ma->vol_shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE))
 	{
-		multiple_scattering_diffusion(re, obi->volume_precache, res, ma);
+		multiple_scattering_diffusion(re, vp, ma);
 	}
 }
 
@@ -672,7 +696,7 @@ void volume_precache(Render *re)
 		if (using_lightcache(vo->ma)) {
 			for(obi= re->instancetable.first; obi; obi= obi->next) {
 				if (obi->obr == vo->obr) {
-					vol_precache_objectinstance_threads(re, obi, vo->ma, obi->obr->boundbox[0], obi->obr->boundbox[1]);
+					vol_precache_objectinstance_threads(re, obi, vo->ma);
 				}
 			}
 		}
@@ -687,8 +711,12 @@ void free_volume_precache(Render *re)
 	ObjectInstanceRen *obi;
 	
 	for(obi= re->instancetable.first; obi; obi= obi->next) {
-		if (obi->volume_precache)
+		if (obi->volume_precache != NULL) {
 			MEM_freeN(obi->volume_precache);
+			MEM_freeN(obi->volume_precache->data_r);
+			MEM_freeN(obi->volume_precache->data_g);
+			MEM_freeN(obi->volume_precache->data_b);
+		}
 	}
 	
 	BLI_freelistN(&re->volumes);
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 01c4ac8fa74..65f2916af59 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -36,6 +36,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
+#include "BLI_voxel.h"
 
 #include "RE_shader_ext.h"
 #include "RE_raytrace.h"
@@ -139,79 +140,27 @@ static float vol_get_depth_cutoff(struct ShadeInput *shi)
 	return shi->mat->vol_depth_cutoff;
 }
 
-/* SHADING */
-
-static float D(ShadeInput *shi, int rgb, int x, int y, int z)
-{
-	const int res = shi->mat->vol_precache_resolution;
-	CLAMP(x, 0, res-1);
-	CLAMP(y, 0, res-1);
-	CLAMP(z, 0, res-1);
-	return shi->obi->volume_precache[rgb*res*res*res + x*res*res + y*res + z];
-}
-
-static inline float lerp(float t, float v1, float v2) {
-	return (1.f - t) * v1 + t * v2;
-}
-
 /* trilinear interpolation */
 static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
 {
-	const int res = shi->mat->vol_precache_resolution;
-	float voxx, voxy, voxz;
-	int vx, vy, vz;
-	float dx, dy, dz;
-	float d00, d10, d01, d11, d0, d1, d_final;
+	VolumePrecache *vp = shi->obi->volume_precache;
 	float bbmin[3], bbmax[3], dim[3];
-	int rgb;
+	float sample_co[3];
 	
-	if (!shi->obi->volume_precache) return;
+	if (!vp) return;
 	
+	/* convert input coords to 0.0, 1.0 */
 	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
 	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
 	VecSubf(dim, bbmax, bbmin);
-	
-	voxx = ((co[0] - bbmin[0]) / dim[0]) * res - 0.5f;
-	voxy = ((co[1] - bbmin[1]) / dim[1]) * res - 0.5f;
-	voxz = ((co[2] - bbmin[2]) / dim[2]) * res - 0.5f;
-	
-	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
-	
-	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
-	
-	for (rgb=0; rgb < 3; rgb++) {
-		d00 = lerp(dx, D(shi, rgb, vx, vy, vz), 		D(shi, rgb, vx+1, vy, vz));
-		d10 = lerp(dx, D(shi, rgb, vx, vy+1, vz), 		D(shi, rgb, vx+1, vy+1, vz));
-		d01 = lerp(dx, D(shi, rgb, vx, vy, vz+1), 		D(shi, rgb, vx+1, vy, vz+1));
-		d11 = lerp(dx, D(shi, rgb, vx, vy+1, vz+1), 	D(shi, rgb, vx+1, vy+1, vz+1));
-		d0 = lerp(dy, d00, d10);
-		d1 = lerp(dy, d01, d11);
-		d_final = lerp(dz, d0, d1);
-		
-		scatter_col[rgb] = d_final;
-	}
-}
 
-/* no interpolation */
-static void vol_get_precached_scattering_nearest(ShadeInput *shi, float *scatter_col, float *co)
-{
-	const int res = shi->mat->vol_precache_resolution;
-	int x,y,z;
-	float bbmin[3], bbmax[3], dim[3];
+	sample_co[0] = ((co[0] - bbmin[0]) / dim[0]);
+	sample_co[1] = ((co[1] - bbmin[1]) / dim[1]);
+	sample_co[2] = ((co[2] - bbmin[2]) / dim[2]);
 
-	if (!shi->obi->volume_precache) return;
-	
-	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
-	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
-	VecSubf(dim, bbmax, bbmin);
-	
-	x = (int)(((co[0] - bbmin[0]) / dim[0]) * res);
-	y = (int)(((co[1] - bbmin[1]) / dim[1]) * res);
-	z = (int)(((co[2] - bbmin[2]) / dim[2]) * res);
-	
-	scatter_col[0] = shi->obi->volume_precache[0*res*res*res + x*res*res + y*res + z];
-	scatter_col[1] = shi->obi->volume_precache[1*res*res*res + x*res*res + y*res + z];
-	scatter_col[2] = shi->obi->volume_precache[2*res*res*res + x*res*res + y*res + z];
+	scatter_col[0] = voxel_sample_trilinear(vp->data_r, vp->res, sample_co);
+	scatter_col[1] = voxel_sample_trilinear(vp->data_g, vp->res, sample_co);
+	scatter_col[2] = voxel_sample_trilinear(vp->data_b, vp->res, sample_co);
 }
 
 float vol_get_density(struct ShadeInput *shi, float *co)
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index f0816cfddff..241b11e04b9 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -34,8 +34,13 @@
 
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
+#include "BLI_voxel.h"
+
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
 #include "BKE_global.h"
+#include "BKE_image.h"
 #include "BKE_main.h"
 
 #include "DNA_texture_types.h"
@@ -44,290 +49,81 @@
 #include "texture.h"
 #include "voxeldata.h"
 
-#if defined( _MSC_VER ) && !defined( __cplusplus )
-# define inline __inline
-#endif // defined( _MSC_VER ) && !defined( __cplusplus )
-
-/*---------------------------Utils----------------------------------------*/
-inline int _I(int x, int y, int z, int *n)
-{
-	return (z*(n[1])+y)*(n[2])+x;
-}
-
-float Linear(float xx, float yy, float zz, float *x0, int *n)
-{
-	float sx1,sx0,sy1,sy0,sz1,sz0,v0,v1;
-	int i0,i1,j0,j1,k0,k1;
-	
-	if (xx<0.5) xx=0.5f; if (xx>n[0]+0.5) xx=n[0]+0.5f; i0=(int)xx; i1=i0+1;
-	if (yy<0.5) yy=0.5f; if (yy>n[1]+0.5) yy=n[1]+0.5f; j0=(int)yy; j1=j0+1;
-	if (zz<0.5) zz=0.5f; if (zz>n[2]+0.5) zz=n[2]+0.5f; k0=(int)zz; k1=k0+1;
-	
-	sx1 = xx-i0; sx0 = 1-sx1;
-	sy1 = yy-j0; sy0 = 1-sy1;
-	sz1 = zz-k0; sz0 = 1-sz1;
-	v0 = sx0*(sy0*x0[_I(i0,j0,k0,n)]+sy1*x0[_I(i0,j1,k0,n)])+sx1*(sy0*x0[_I(i1,j0,k0,n)]+sy1*x0[_I(i1,j1,k0,n)]);
-	v1 = sx0*(sy0*x0[_I(i0,j0,k1,n)]+sy1*x0[_I(i0,j1,k1,n)])+sx1*(sy0*x0[_I(i1,j0,k1,n)]+sy1*x0[_I(i1,j1,k1,n)]);
-	return sz0*v0 + sz1*v1;
-}
-
-
-static float D(float *data, int *res, int x, int y, int z)
-{
-	CLAMP(x, 0, res[0]-1);
-	CLAMP(y, 0, res[1]-1);
-	CLAMP(z, 0, res[2]-1);
-	return data[ _I(x, y, z, res) ];
-}
-
-static inline float lerp(float t, float v1, float v2) {
-	return (1.f - t) * v1 + t * v2;
-}
-
-/* trilinear interpolation */
-static float trilinear(float *data, int *res, float *co)
-{
-	float voxx, voxy, voxz;
-	int vx, vy, vz;
-	float dx, dy, dz;
-	float d00, d10, d01, d11, d0, d1, d_final;
-
-	if (!data) return 0.f;
-	
-	voxx = co[0] * res[0] - 0.5f;
-	voxy = co[1] * res[1] - 0.5f;
-	voxz = co[2] * res[2] - 0.5f;
-	
-	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
-	
-	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
-	
-	d00 = lerp(dx, D(data, res, vx, vy, vz), 		D(data, res, vx+1, vy, vz));
-	d10 = lerp(dx, D(data, res, vx, vy+1, vz), 		D(data, res, vx+1, vy+1, vz));
-	d01 = lerp(dx, D(data, res, vx, vy, vz+1), 		D(data, res, vx+1, vy, vz+1));
-	d11 = lerp(dx, D(data, res, vx, vy+1, vz+1), 	D(data, res, vx+1, vy+1, vz+1));
-	d0 = lerp(dy, d00, d10);
-	d1 = lerp(dy, d01, d11);
-	d_final = lerp(dz, d0, d1);
-	
-	return d_final;
-}
-
-
-int C[64][64] = {
-	{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 9,-9,-9, 9, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{-6, 6, 6,-6, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{-6, 6, 6,-6, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 4,-4,-4, 4, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0},
-	{-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 9,-9, 0, 0,-9, 9, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{-6, 6, 0, 0, 6,-6, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9, 0, 0,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0},
-	{ 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0},
-	{-27,27,27,-27,27,-27,-27,27,-18,-9,18, 9,18, 9,-18,-9,-18,18,-9, 9,18,-18, 9,-9,-18,18,18,-18,-9, 9, 9,-9,-12,-6,-6,-3,12, 6, 6, 3,-12,-6,12, 6,-6,-3, 6, 3,-12,12,-6, 6,-6, 6,-3, 3,-8,-4,-4,-2,-4,-2,-2,-1},
-	{18,-18,-18,18,-18,18,18,-18, 9, 9,-9,-9,-9,-9, 9, 9,12,-12, 6,-6,-12,12,-6, 6,12,-12,-12,12, 6,-6,-6, 6, 6, 6, 3, 3,-6,-6,-3,-3, 6, 6,-6,-6, 3, 3,-3,-3, 8,-8, 4,-4, 4,-4, 2,-2, 4, 4, 2, 2, 2, 2, 1, 1},
-	{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0},
-	{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6, 9,-9, 9,-9,-9, 9,-9, 9,12,-12,-12,12, 6,-6,-6, 6, 6, 3, 6, 3,-6,-3,-6,-3, 8, 4,-8,-4, 4, 2,-4,-2, 6,-6, 6,-6, 3,-3, 3,-3, 4, 2, 4, 2, 2, 1, 2, 1},
-	{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-6, 6,-6, 6, 6,-6, 6,-6,-8, 8, 8,-8,-4, 4, 4,-4,-3,-3,-3,-3, 3, 3, 3, 3,-4,-4, 4, 4,-2,-2, 2, 2,-4, 4,-4, 4,-2, 2,-2, 2,-2,-2,-2,-2,-1,-1,-1,-1},
-	{ 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{-6, 6, 0, 0, 6,-6, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 4,-4, 0, 0,-4, 4, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4, 0, 0,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0},
-	{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0},
-	{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6,12,-12, 6,-6,-12,12,-6, 6, 9,-9,-9, 9, 9,-9,-9, 9, 8, 4, 4, 2,-8,-4,-4,-2, 6, 3,-6,-3, 6, 3,-6,-3, 6,-6, 3,-3, 6,-6, 3,-3, 4, 2, 2, 1, 4, 2, 2, 1},
-	{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-8, 8,-4, 4, 8,-8, 4,-4,-6, 6, 6,-6,-6, 6, 6,-6,-4,-4,-2,-2, 4, 4, 2, 2,-3,-3, 3, 3,-3,-3, 3, 3,-4, 4,-2, 2,-4, 4,-2, 2,-2,-2,-1,-1,-2,-2,-1,-1},
-	{ 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
-	{-12,12,12,-12,12,-12,-12,12,-8,-4, 8, 4, 8, 4,-8,-4,-6, 6,-6, 6, 6,-6, 6,-6,-6, 6, 6,-6,-6, 6, 6,-6,-4,-2,-4,-2, 4, 2, 4, 2,-4,-2, 4, 2,-4,-2, 4, 2,-3, 3,-3, 3,-3, 3,-3, 3,-2,-1,-2,-1,-2,-1,-2,-1},
-	{ 8,-8,-8, 8,-8, 8, 8,-8, 4, 4,-4,-4,-4,-4, 4, 4, 4,-4, 4,-4,-4, 4,-4, 4, 4,-4,-4, 4, 4,-4,-4, 4, 2, 2, 2, 2,-2,-2,-2,-2, 2, 2,-2,-2, 2, 2,-2,-2, 2,-2, 2,-2, 2,-2, 2,-2, 1, 1, 1, 1, 1, 1, 1, 1}};
-
-int ijk2n(int i, int j, int k) {
-	return(i+4*j+16*k);
-}
-
-void tricubic_get_coeff_stacked(float a[64], float x[64]) {
-	int i,j;
-	for (i=0;i<64;i++) {
-		a[i]=(float)(0.0);
-		for (j=0;j<64;j++) {
-			a[i]+=C[i][j]*x[j];
-		}
-	}
-}
-
-void point2xyz(int p, int *x, int *y, int *z) {
-	switch (p) {
-		case 0: *x=0; *y=0; *z=0; break;
-		case 1: *x=1; *y=0; *z=0; break;
-		case 2: *x=0; *y=1; *z=0; break;
-		case 3: *x=1; *y=1; *z=0; break;
-		case 4: *x=0; *y=0; *z=1; break;
-		case 5: *x=1; *y=0; *z=1; break;
-		case 6: *x=0; *y=1; *z=1; break;
-		case 7: *x=1; *y=1; *z=1; break;
-		default:*x=0; *y=0; *z=0;
-	}
-}
-
-
-void tricubic_get_coeff(float a[64], float f[8], float dfdx[8], float dfdy[8], float dfdz[8], float d2fdxdy[8], float d2fdxdz[8], float d2fdydz[8], float d3fdxdydz[8]) {
-	int i;
-	float x[64];
-	for (i=0;i<8;i++) {
-		x[0+i]=f[i];
-		x[8+i]=dfdx[i];
-		x[16+i]=dfdy[i];
-		x[24+i]=dfdz[i];
-		x[32+i]=d2fdxdy[i];
-		x[40+i]=d2fdxdz[i];
-		x[48+i]=d2fdydz[i];
-		x[56+i]=d3fdxdydz[i];
-	}
-	tricubic_get_coeff_stacked(a,x);
-}
-
-float tricubic_eval(float a[64], float x, float y, float z) {
-	int i,j,k;
-	float ret=(float)(0.0);
-	
-	for (i=0;i<4;i++) {
-		for (j=0;j<4;j++) {
-			for (k=0;k<4;k++) {
-				ret+=a[ijk2n(i,j,k)]*pow(x,i)*pow(y,j)*pow(z,k);
-			}
-		}
-	}
-	return(ret);
-}
-
-
-float tricubic(float xx, float yy, float zz, float *heap, int *n)
-{
-	
-	int xi,yi,zi;
-	float dx,dy,dz;
-	float a[64];
-
-	if (xx<0.5) xx=0.5f; if (xx>n[0]+0.5) xx=n[0]+0.5f; xi=(int)xx;
-	if (yy<0.5) yy=0.5f; if (yy>n[1]+0.5) yy=n[1]+0.5f; yi=(int)yy;
-	if (zz<0.5) zz=0.5f; if (zz>n[2]+0.5) zz=n[2]+0.5f; zi=(int)zz;
-	
-	{
-	float fval[8]={heap[_I(xi,yi,zi,n)],heap[_I(xi+1,yi,zi,n)],heap[_I(xi,yi+1,zi,n)],heap[_I(xi+1,yi+1,zi,n)],heap[_I(xi,yi,zi+1,n)],heap[_I(xi+1,yi,zi+1,n)],heap[_I(xi,yi+1,zi+1,n)],heap[_I(xi+1,yi+1,zi+1,n)]}; 
-	
-	float dfdxval[8]={0.5f*(heap[_I(xi+1,yi,zi,n)]-heap[_I(xi-1,yi,zi,n)]),0.5f*(heap[_I(xi+2,yi,zi,n)]-heap[_I(xi,yi,zi,n)]),
-		0.5f*(heap[_I(xi+1,yi+1,zi,n)]-heap[_I(xi-1,yi+1,zi,n)]),0.5f*(heap[_I(xi+2,yi+1,zi,n)]-heap[_I(xi,yi+1,zi,n)]),
-		0.5f*(heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi-1,yi,zi+1,n)]),0.5f*(heap[_I(xi+2,yi,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]),
-		0.5f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]),
-	0.5f*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)])};						
-	
-	float dfdyval[8]={0.5f*(heap[_I(xi,yi+1,zi,n)]-heap[_I(xi,yi-1,zi,n)]),0.5f*(heap[_I(xi+1,yi+1,zi,n)]-heap[_I(xi+1,yi-1,zi,n)]),
-		0.5f*(heap[_I(xi,yi+2,zi,n)]-heap[_I(xi,yi,zi,n)]),0.5f*(heap[_I(xi+1,yi+2,zi,n)]-heap[_I(xi+1,yi,zi,n)]),
-		0.5f*(heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi,yi-1,zi+1,n)]),0.5f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]),
-		0.5f*(heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]),
-	0.5f*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)])};						 
-	
-	float dfdzval[8]={0.5f*(heap[_I(xi,yi,zi+1,n)]-heap[_I(xi,yi,zi-1,n)]),0.5f*(heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi+1,yi,zi-1,n)]),
-		0.5f*(heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi-1,n)]),0.5f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]),
-		0.5f*(heap[_I(xi,yi,zi+2,n)]-heap[_I(xi,yi,zi,n)]),0.5f*(heap[_I(xi+1,yi,zi+2,n)]-heap[_I(xi+1,yi,zi,n)]),
-		0.5f*(heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi,n)]),
-	0.5f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)])};						 
-	
-	float d2fdxdyval[8]={0.25*(heap[_I(xi+1,yi+1,zi,n)]-heap[_I(xi-1,yi+1,zi,n)]-heap[_I(xi+1,yi-1,zi,n)]+heap[_I(xi-1,yi-1,zi,n)]),
-		0.25*(heap[_I(xi+2,yi+1,zi,n)]-heap[_I(xi,yi+1,zi,n)]-heap[_I(xi+2,yi-1,zi,n)]+heap[_I(xi,yi-1,zi,n)]),
-		0.25*(heap[_I(xi+1,yi+2,zi,n)]-heap[_I(xi-1,yi+2,zi,n)]-heap[_I(xi+1,yi,zi,n)]+heap[_I(xi-1,yi,zi,n)]),
-		0.25*(heap[_I(xi+2,yi+2,zi,n)]-heap[_I(xi,yi+2,zi,n)]-heap[_I(xi+2,yi,zi,n)]+heap[_I(xi,yi,zi,n)]),
-		0.25*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]+heap[_I(xi-1,yi-1,zi+1,n)]),
-		0.25*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi+2,yi-1,zi+1,n)]+heap[_I(xi,yi-1,zi+1,n)]),
-		0.25*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi-1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)]+heap[_I(xi-1,yi,zi+1,n)]),
-	0.25*(heap[_I(xi+2,yi+2,zi+1,n)]-heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi+2,yi,zi+1,n)]+heap[_I(xi,yi,zi+1,n)])};						 
-	
-	float d2fdxdzval[8]={0.25f*(heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi-1,yi,zi+1,n)]-heap[_I(xi+1,yi,zi-1,n)]+heap[_I(xi-1,yi,zi-1,n)]),
-		0.25f*(heap[_I(xi+2,yi,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]-heap[_I(xi+2,yi,zi-1,n)]+heap[_I(xi,yi,zi-1,n)]),
-		0.25f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]+heap[_I(xi-1,yi+1,zi-1,n)]),
-		0.25f*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi+2,yi+1,zi-1,n)]+heap[_I(xi,yi+1,zi-1,n)]),
-		0.25f*(heap[_I(xi+1,yi,zi+2,n)]-heap[_I(xi-1,yi,zi+2,n)]-heap[_I(xi+1,yi,zi,n)]+heap[_I(xi-1,yi,zi,n)]),
-		0.25f*(heap[_I(xi+2,yi,zi+2,n)]-heap[_I(xi,yi,zi+2,n)]-heap[_I(xi+2,yi,zi,n)]+heap[_I(xi,yi,zi,n)]),
-		0.25f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi-1,yi+1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)]+heap[_I(xi-1,yi+1,zi,n)]),
-	0.25f*(heap[_I(xi+2,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi+2,yi+1,zi,n)]+heap[_I(xi,yi+1,zi,n)])};
-	
-	
-	float d2fdydzval[8]={0.25f*(heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi,yi-1,zi+1,n)]-heap[_I(xi,yi+1,zi-1,n)]+heap[_I(xi,yi-1,zi-1,n)]),
-		0.25f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]+heap[_I(xi+1,yi-1,zi-1,n)]),
-		0.25f*(heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi,yi,zi+1,n)]-heap[_I(xi,yi+2,zi-1,n)]+heap[_I(xi,yi,zi-1,n)]),
-		0.25f*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)]-heap[_I(xi+1,yi+2,zi-1,n)]+heap[_I(xi+1,yi,zi-1,n)]),
-		0.25f*(heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi,yi-1,zi+2,n)]-heap[_I(xi,yi+1,zi,n)]+heap[_I(xi,yi-1,zi,n)]),
-		0.25f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi+1,yi-1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)]+heap[_I(xi+1,yi-1,zi,n)]),
-		0.25f*(heap[_I(xi,yi+2,zi+2,n)]-heap[_I(xi,yi,zi+2,n)]-heap[_I(xi,yi+2,zi,n)]+heap[_I(xi,yi,zi,n)]),
-	0.25f*(heap[_I(xi+1,yi+2,zi+2,n)]-heap[_I(xi+1,yi,zi+2,n)]-heap[_I(xi+1,yi+2,zi,n)]+heap[_I(xi+1,yi,zi,n)])};
-	
-	
-	float d3fdxdydzval[8]={0.125f*(heap[_I(xi+1,yi+1,zi+1,n)]-heap[_I(xi-1,yi+1,zi+1,n)]-heap[_I(xi+1,yi-1,zi+1,n)]+heap[_I(xi-1,yi-1,zi+1,n)]-heap[_I(xi+1,yi+1,zi-1,n)]+heap[_I(xi-1,yi+1,zi-1,n)]+heap[_I(xi+1,yi-1,zi-1,n)]-heap[_I(xi-1,yi-1,zi-1,n)]),
-		0.125f*(heap[_I(xi+2,yi+1,zi+1,n)]-heap[_I(xi,yi+1,zi+1,n)]-heap[_I(xi+2,yi-1,zi+1,n)]+heap[_I(xi,yi-1,zi+1,n)]-heap[_I(xi+2,yi+1,zi-1,n)]+heap[_I(xi,yi+1,zi-1,n)]+heap[_I(xi+2,yi-1,zi-1,n)]-heap[_I(xi,yi-1,zi-1,n)]),
-		0.125f*(heap[_I(xi+1,yi+2,zi+1,n)]-heap[_I(xi-1,yi+2,zi+1,n)]-heap[_I(xi+1,yi,zi+1,n)]+heap[_I(xi-1,yi,zi+1,n)]-heap[_I(xi+1,yi+2,zi-1,n)]+heap[_I(xi-1,yi+2,zi-1,n)]+heap[_I(xi+1,yi,zi-1,n)]-heap[_I(xi-1,yi,zi-1,n)]),
-		0.125f*(heap[_I(xi+2,yi+2,zi+1,n)]-heap[_I(xi,yi+2,zi+1,n)]-heap[_I(xi+2,yi,zi+1,n)]+heap[_I(xi,yi,zi+1,n)]-heap[_I(xi+2,yi+2,zi-1,n)]+heap[_I(xi,yi+2,zi-1,n)]+heap[_I(xi+2,yi,zi-1,n)]-heap[_I(xi,yi,zi-1,n)]),
-		0.125f*(heap[_I(xi+1,yi+1,zi+2,n)]-heap[_I(xi-1,yi+1,zi+2,n)]-heap[_I(xi+1,yi-1,zi+2,n)]+heap[_I(xi-1,yi-1,zi+2,n)]-heap[_I(xi+1,yi+1,zi,n)]+heap[_I(xi-1,yi+1,zi,n)]+heap[_I(xi+1,yi-1,zi,n)]-heap[_I(xi-1,yi-1,zi,n)]),
-		0.125f*(heap[_I(xi+2,yi+1,zi+2,n)]-heap[_I(xi,yi+1,zi+2,n)]-heap[_I(xi+2,yi-1,zi+2,n)]+heap[_I(xi,yi-1,zi+2,n)]-heap[_I(xi+2,yi+1,zi,n)]+heap[_I(xi,yi+1,zi,n)]+heap[_I(xi+2,yi-1,zi,n)]-heap[_I(xi,yi-1,zi,n)]),
-		0.125f*(heap[_I(xi+1,yi+2,zi+2,n)]-heap[_I(xi-1,yi+2,zi+2,n)]-heap[_I(xi+1,yi,zi+2,n)]+heap[_I(xi-1,yi,zi+2,n)]-heap[_I(xi+1,yi+2,zi,n)]+heap[_I(xi-1,yi+2,zi,n)]+heap[_I(xi+1,yi,zi,n)]-heap[_I(xi-1,yi,zi,n)]),
-	0.125f*(heap[_I(xi+2,yi+2,zi+2,n)]-heap[_I(xi,yi+2,zi+2,n)]-heap[_I(xi+2,yi,zi+2,n)]+heap[_I(xi,yi,zi+2,n)]-heap[_I(xi+2,yi+2,zi,n)]+heap[_I(xi,yi+2,zi,n)]+heap[_I(xi+2,yi,zi,n)]-heap[_I(xi,yi,zi,n)])};
-
-	
-	tricubic_get_coeff(a,fval,dfdxval,dfdyval,dfdzval,d2fdxdyval,d2fdxdzval,d2fdydzval,d3fdxdydzval);
-	}
-		
-	dx = xx-xi;
-	dy = yy-yi;
-	dz = zz-zi;
-	
-	return tricubic_eval(a,dx,dy,dz);
-	
-}
-
-void load_frame (FILE *fp, float *F, int size, int frame, int offset)
+void load_frame_blendervoxel(FILE *fp, float *F, int size, int frame, int offset)
 {	
 	fseek(fp,frame*size*sizeof(float)+offset,0);
 	fread(F,sizeof(float),size,fp);
 }
 
+void load_frame_raw8(FILE *fp, float *F, int size, int frame)
+{
+	char *tmp;
+	int i;
+	
+	tmp = (char *)MEM_mallocN(sizeof(char)*size, "temporary voxel file reading storage");
+	
+	fseek(fp,(frame-1)*size*sizeof(char),0);
+	fread(tmp, sizeof(char), size, fp);
+	
+	for (i=0; i<size; i++) {
+		F[i] = (float)tmp[i] / 256.f;
+	}
+	MEM_freeN(tmp);
+}
+
+void load_frame_image_sequence(Render *re, VoxelData *vd, Tex *tex)
+{
+	ImBuf *ibuf;
+	Image *ima = tex->ima;
+	ImageUser *iuser = &tex->iuser;
+	int x=0, y=0, z=0;
+	float r, g, b;
+	float *rf;
+
+	if (!ima || !iuser) return;
+	
+	ima->source = IMA_SRC_SEQUENCE;
+	iuser->framenr = 1 + iuser->offset;
+
+	/* find the first valid ibuf and use it to initialise the resolution of the data set */
+	/* need to do this in advance so we know how much memory to allocate */
+	ibuf= BKE_image_get_ibuf(ima, iuser);
+	while (!ibuf && (iuser->framenr < iuser->frames)) {
+		iuser->framenr++;
+		ibuf= BKE_image_get_ibuf(ima, iuser);
+	}
+	if (!ibuf) return;
+	if (!ibuf->rect_float) IMB_float_from_rect(ibuf);
+	
+	vd->still = 1;
+	vd->resolX = ibuf->x;
+	vd->resolY = ibuf->y;
+	vd->resolZ = iuser->frames;
+	vd->dataset = MEM_mapallocN(sizeof(float)*(vd->resolX)*(vd->resolY)*(vd->resolZ), "voxel dataset");
+	
+	for (z=0; z < iuser->frames; z++)
+	{	
+		/* get a new ibuf for each frame */
+		if (z > 0) {
+			iuser->framenr++;
+			ibuf= BKE_image_get_ibuf(ima, iuser);
+			if (!ibuf) break;
+			if (!ibuf->rect_float) IMB_float_from_rect(ibuf);
+		}
+		rf = ibuf->rect_float;
+		
+		for (y=0; y < ibuf->y; y++)
+		{
+			for (x=0; x < ibuf->x; x++)
+			{
+				/* currently converted to monchrome */
+				vd->dataset[ V_I(x, y, z, &vd->resolX) ] = (rf[0] + rf[1] + rf[2])*0.333f;
+				rf +=4;
+			}
+		}
+	}
+}
+
 void write_voxeldata_header(struct VoxelDataHeader *h, FILE *fp)
 {
 	fwrite(h,sizeof(struct VoxelDataHeader),1,fp);
@@ -352,20 +148,37 @@ void cache_voxeldata(struct Render *re,Tex *tex)
 	VoxelData *vd = tex->vd;
 	FILE *fp;
 	int size;
+	int curframe;
 	
 	if (!vd) return;
 	
+	/* image sequence gets special treatment */
+	if (vd->file_format == TEX_VD_IMAGE_SEQUENCE) {
+		load_frame_image_sequence(re, vd, tex);
+		return;
+	}
+
 	if (!BLI_exists(vd->source_path)) return;
 	fp = fopen(vd->source_path,"rb");
 	if (!fp) return;
+
+	if (vd->file_format == TEX_VD_BLENDERVOXEL)
+		read_voxeldata_header(fp, vd);
 	
-	read_voxeldata_header(fp, vd);
 	size = (vd->resolX)*(vd->resolY)*(vd->resolZ);
-	vd->dataset = MEM_mallocN(sizeof(float)*size, "voxel dataset");
+	vd->dataset = MEM_mapallocN(sizeof(float)*size, "voxel dataset");
+		
+	if (vd->still) curframe = vd->still_frame;
+	else curframe = re->r.cfra;
 	
-	//here improve the dataset loading function for more dataset types
-	if (vd->still) load_frame(fp, vd->dataset, size, vd->still_frame, sizeof(VoxelDataHeader));
-	else load_frame(fp, vd->dataset, size, re->r.cfra, sizeof(VoxelDataHeader));
+	switch(vd->file_format) {
+		case TEX_VD_BLENDERVOXEL:
+			load_frame_blendervoxel(fp, vd->dataset, size, curframe-1, sizeof(VoxelDataHeader));
+			break;
+		case TEX_VD_RAW_8BIT:
+			load_frame_raw8(fp, vd->dataset, size, curframe);
+			break;
+	}
 	
 	fclose(fp);
 }
@@ -380,6 +193,7 @@ void make_voxeldata(struct Render *re)
 	re->i.infostr= "Loading voxel datasets";
 	re->stats_draw(&re->i);
 	
+	/* XXX: should be doing only textures used in this render */
 	for (tex= G.main->tex.first; tex; tex= tex->id.next) {
 		if(tex->id.us && tex->type==TEX_VOXELDATA) {
 			cache_voxeldata(re, tex);
@@ -420,69 +234,59 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 {	 
     int retval = TEX_INT;
 	VoxelData *vd = tex->vd;	
-	float vec[3] = {0.0, 0.0, 0.0};	
-	float co[3];
-	float dx, dy, dz;
-	int xi, yi, zi;
-	float xf, yf, zf;
-	int i=0, fail=0;
-	int resol[3];
-	
+	float co[3], offset[3] = {0.5, 0.5, 0.5};
+
 	if ((!vd) || (vd->dataset==NULL)) {
 		texres->tin = 0.0f;
 		return 0;
 	}
 	
-	resol[0] = vd->resolX;
-	resol[1] = vd->resolY;
-	resol[2] = vd->resolZ;
-	
-	VECCOPY(co, texvec);	
-	
-	dx=1.0f/(resol[0]);
-	dy=1.0f/(resol[1]);
-	dz=1.0f/(resol[2]);
-	
-	xi=co[0]/dx;
-	yi=co[1]/dy;
-	zi=co[2]/dz;
-		
-	xf=co[0]/dx;
-	yf=co[1]/dy;
-	zf=co[2]/dz;
-	
-	if (xi>1 && xi<resol[0])
-	{
-		if (yi>1 && yi<resol[1])
-		{
-			if (zi>1 && zi<resol[2])
-			{
-				switch (vd->interp_type)
-				{
-					case TEX_VD_NEARESTNEIGHBOR:
-					{
-						texres->tin = vd->dataset[_I(xi,yi,zi,resol)];
-						break;  
-					}
-					case TEX_VD_LINEAR:
-					{
-						texres->tin = trilinear(vd->dataset, resol, co);
-						break;					
-					}
-					case TEX_VD_TRICUBIC:
-					{
-						texres->tin = tricubic(xf, yf, zf, vd->dataset, resol);
-						break;
-					}
-				}				  				   
-			} else fail++;
-		} else fail++;
-	} else fail++;
-	
-	if (fail) texres->tin=0.0f;
+	/* scale lookup from 0.0-1.0 (original location) to -1.0, 1.0, consistent with image texture tex coords */
+	/* in implementation this works backwards, bringing sample locations from -1.0, 1.0
+	 * to the range 0.0, 1.0, before looking up in the voxel structure. */
+	VecCopyf(co, texvec);
+	VecMulf(co, 0.5f);
+	VecAddf(co, co, offset);
 
-	texres->tin *= vd->int_multiplier;
+	/* co is now in the range 0.0, 1.0 */
+	switch (tex->extend) {
+		case TEX_CLIP:
+		{
+			if ((co[0] < 0.f || co[0] > 1.f) || (co[1] < 0.f || co[1] > 1.f) || (co[2] < 0.f || co[2] > 1.f)) {
+				texres->tin = 0.f;
+				return retval;
+			}
+			break;
+		}
+		case TEX_REPEAT:
+		{
+			co[0] = co[0] - floor(co[0]);
+			co[1] = co[1] - floor(co[1]);
+			co[2] = co[2] - floor(co[2]);
+			break;
+		}
+		case TEX_EXTEND:
+		{
+			CLAMP(co[0], 0.f, 1.f);
+			CLAMP(co[1], 0.f, 1.f);
+			CLAMP(co[2], 0.f, 1.f);
+			break;
+		}
+	}
 	
+	switch (vd->interp_type) {
+		case TEX_VD_NEARESTNEIGHBOR:
+			texres->tin = voxel_sample_nearest(vd->dataset, &vd->resolX, co);
+			break;  
+		case TEX_VD_LINEAR:
+			texres->tin = voxel_sample_trilinear(vd->dataset, &vd->resolX, co);
+			break;					
+		case TEX_VD_TRICUBIC:
+			texres->tin = voxel_sample_tricubic(vd->dataset, &vd->resolX, co);
+			break;
+	}
+	
+	texres->tin *= vd->int_multiplier;
 	BRICONT;
 	
 	texres->tr = texres->tin;
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index f74afde5e81..54fc639059d 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -1053,67 +1053,7 @@ static void texture_panel_pointdensity_modify(Tex *tex)
 
 }
 
-static void texture_panel_voxeldata(Tex *tex)
-{
-	uiBlock *block;
-	VoxelData *vd;
-	short yco=PANEL_YMAX;
 
-	block= uiNewBlock(&curarea->uiblocks, "texture_panel_voxeldata", UI_EMBOSS, UI_HELV, curarea->win);
-	if(uiNewPanel(curarea, block, "Voxel Data", "Texture", PANELX, PANELY, PANELW, PANELH+YSPACE)==0) return;
-	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
-
-	if(tex->vd==NULL) {
-		tex->vd= BKE_add_voxeldata();
-	}
-
-	if(tex->vd) {
-		vd= tex->vd;
-		
-		uiDefBut(block, LABEL, B_NOP, "Data source:",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-			
-		uiDefIconTextBut(block, BUT, B_VOXELDATA_LOAD, ICON_FILESEL, "Open",
-			X4CLM1, yco-=BUTH, BUTW4, BUTH, 0, 0, 0, 0, 0, "");
-		uiDefBut(block, TEX, 0, "",
-			X4CLM2+XSPACE, yco, BUTW2+BUTW4+2*XSPACE, BUTH, &vd->source_path, 0.0, 79.0, 0, 0, "File path to the voxel data set");
-
-		yco -= YSPACE;
-		
-		uiDefBut(block, LABEL, B_NOP, "Interpolation:",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-		uiDefButI(block, MENU, B_REDR, "None %x0|Linear %x1|Tricubic %x2",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &vd->interp_type, 0.0, 0.0, 0, 0, "Interpolation type");		
-		
-		yco -= YSPACE;
-		
-		uiDefButF(block, NUM, B_REDR, "Intensity: ",
-			X2CLM1, yco-=BUTH, BUTW2, BUTH, &(vd->int_multiplier), 0.0001, 10000.0, 0, 0, "Multiplier to scale up or down the texture's intensity");
-		
-		yco = PANEL_YMAX - 2*BUTH - 2*YSPACE;
-		
-		uiDefBut(block, LABEL, B_NOP, "Resolution:",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
-		uiBlockBeginAlign(block);
-		uiDefButI(block, NUM, B_REDR, "X: ",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->resolX), 1, 10000, 0, 0, "Resolution of the voxel data");
-		uiDefButI(block, NUM, B_REDR, "Y: ",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->resolY), 1, 10000, 0, 0, "Resolution of the voxel data");
-		uiDefButI(block, NUM, B_REDR, "Z: ",
-			X2CLM2, yco-= BUTH, BUTW2, BUTH, &(vd->resolZ), 1, 10000, 0, 0, "Resolution of the voxel data");
-		uiBlockEndAlign(block);
-		
-		yco -= YSPACE;
-		
-		uiBlockBeginAlign(block);
-		uiDefButI(block,TOG, B_REDR, "Still",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->still), 0,1, 0, 0, "Use a still frame from the data sequence for the entire rendered animation");
-		if (vd->still) uiDefButI(block, NUM, B_REDR, "Frame: ",
-			X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->still_frame), 1, 10000, 0, 0, "The frame to pause on for the entire rendered animation");	
-		uiBlockEndAlign(block);
-		
-	}
-}
 
 static char *layer_menu(RenderResult *rr, short *curlay)
 {
@@ -1791,6 +1731,144 @@ static void texture_panel_envmap(Tex *tex)
 	}
 }
 
+static void texture_panel_voxeldata(Tex *tex)
+{
+	uiBlock *block;
+	VoxelData *vd;
+	short yco=PANEL_YMAX;
+	
+	block= uiNewBlock(&curarea->uiblocks, "texture_panel_voxeldata", UI_EMBOSS, UI_HELV, curarea->win);
+	if(uiNewPanel(curarea, block, "Voxel Data", "Texture", PANELX, PANELY, PANELW, PANELH+BUTH+2*YSPACE)==0) return;
+	uiSetButLock(tex->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+	
+	if(tex->vd==NULL) {
+		tex->vd= BKE_add_voxeldata();
+	}
+	
+	if(tex->vd) {
+		vd= tex->vd;
+		
+		uiDefBut(block, LABEL, B_NOP, "Data source:",
+				 X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		
+		if (vd->file_format != TEX_VD_IMAGE_SEQUENCE) {
+			uiDefIconTextBut(block, BUT, B_VOXELDATA_LOAD, ICON_FILESEL, "Open",
+							 X4CLM1, yco-=BUTH, BUTW4, BUTH, 0, 0, 0, 0, 0, "");
+			uiDefBut(block, TEX, 0, "",
+					 X4CLM2+XSPACE, yco, BUTW2+BUTW4+2*XSPACE, BUTH, &vd->source_path, 0.0, 79.0, 0, 0, "File path to the voxel data set");
+		}
+		else {
+			char *strp;
+			char str[128];
+			ImageUser *iuser = &(tex->iuser);
+			uiBut *but;
+			
+			/* Browse */
+			IMAnames_to_pupstring(&strp, NULL, NULL, &(G.main->image), NULL, &iuser->menunr);
+			
+			uiBlockBeginAlign(block);
+			but= uiDefButS(block, MENU, B_REDR, strp,
+						   X2CLM1, yco-=BUTH, ICONBUTW, BUTH, &iuser->menunr, 0, 0, 0, 0, "Selects an existing Image or Movie");
+			uiButSetFunc(but, image_browse_cb, &(tex->ima), iuser);
+			
+			MEM_freeN(strp);
+			
+			if (tex->ima) {
+				uiSetButLock(tex->ima->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
+				but= uiDefIconBut(block, BUT, B_REDR, ICON_FILESEL,
+								  X2CLM1+ICONBUTW, yco, X2CLM1+ICONBUTW, BUTH, 0, 0, 0, 0, 0, "Open Fileselect to load new Image");
+				uiButSetFunc(but, image_load_fs_cb, &(tex->ima), iuser);
+				
+				but= uiDefBut(block, TEX, B_IDNAME, "IM:",
+							  X2CLM1+2*ICONBUTW, yco, PANEL_XMAX-4*ICONBUTW-BUTW4, BUTH, tex->ima->id.name+2, 0.0, 21.0, 0, 0, "Current Image Datablock name.");
+				uiButSetFunc(but, test_idbutton_cb, tex->ima->id.name, NULL);
+				
+				but= uiDefBut(block, BUT, B_REDR, "Reload",
+					PANEL_XMAX-2*ICONBUTW-BUTW4, yco, BUTW4, BUTH, NULL, 0, 0, 0, 0, "Reloads Image or Movie");
+				uiButSetFunc(but, image_reload_cb, &(tex->ima), iuser);
+				
+				but= uiDefIconBut(block, BUT, B_REDR, ICON_X,
+					PANEL_XMAX-2*ICONBUTW, yco, ICONBUTW, BUTH, 0, 0, 0, 0, 0, "Unlink Image block");
+				uiButSetFunc(but, image_unlink_cb, &(tex->ima), NULL);
+				
+				sprintf(str, "%d", tex->ima->id.us);
+				uiDefBut(block, BUT, B_NOP, str,
+					PANEL_XMAX-ICONBUTW, yco, ICONBUTW, BUTH, 0, 0, 0, 0, 0, "Only displays number of users of Image block");
+				uiBlockEndAlign(block);
+				
+				yco -= (BUTH);
+				
+				uiBlockBeginAlign(block);
+				uiDefButI(block, NUM, B_NOP, "Slices:",
+					X2CLM1, yco, BUTW2, BUTH, &iuser->frames, 1.0, MAXFRAMEF, 0, 0, "Number of images in the sequence");
+				uiDefButI(block, NUM, B_NOP, "Offset:",
+					X2CLM2, yco, BUTW2, BUTH, &iuser->offset, -MAXFRAMEF, MAXFRAMEF, 0, 0, "Offsets the file number to consider as the start of the sequence");
+				uiBlockEndAlign(block);
+				
+			} else {
+				but= uiDefBut(block, BUT, B_REDR, "Load",
+					X2CLM1+ICONBUTW, yco, BUTW2-ICONBUTW, BUTH, NULL, 0, 0, 0, 0, "Load new Image");
+				uiButSetFunc(but, image_load_fs_cb, &(tex->ima), iuser);
+			}
+		}
+		
+		yco -= YSPACE;
+		
+		uiDefBut(block, LABEL, B_NOP, "Interpolation:",
+				 X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefButI(block, MENU, B_REDR, "None %x0|Linear %x1|Tricubic %x2",
+				  X2CLM1, yco-=BUTH, BUTW2, BUTH, &vd->interp_type, 0.0, 0.0, 0, 0, "Interpolation type");
+		
+		yco -= YSPACE;
+		
+		uiDefBut(block, LABEL, B_NOP, "Extend:",
+				 X2CLM1, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefButS(block, MENU, B_REDR, "Repeat %x3|Clip %x2|Extend %x1",
+				  X2CLM1, yco-=BUTH, BUTW2, BUTH, &(tex->extend), 0.0, 0.0, 0, 0, "Extrapolation type");
+		
+		yco -= YSPACE;
+		
+		uiDefButF(block, NUM, B_REDR, "Intensity: ",
+				  X2CLM1, yco-=BUTH, BUTW2, BUTH, &(vd->int_multiplier), 0.0001, 10000.0, 0, 0, "Multiplier to scale up or down the texture's intensity");
+		
+		yco = PANEL_YMAX - 2*BUTH - YSPACE;
+		if (vd->file_format == TEX_VD_IMAGE_SEQUENCE) yco -= BUTH;
+		
+		uiDefBut(block, LABEL, B_NOP, "File Format:",
+				 X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+		uiDefButS(block, MENU, B_REDR, "Blender Voxel %x0|Raw (8 bit) %x1|Image Sequence %x3",
+				  X2CLM2, yco-=BUTH, BUTW2, BUTH, &vd->file_format, 0.0, 0.0, 0, 0, "File format of the voxel data file");	
+		
+		if (ELEM(vd->file_format, TEX_VD_RAW_8BIT, TEX_VD_RAW_16BIT)) {
+			uiDefBut(block, LABEL, B_NOP, "Resolution:",
+					 X2CLM2, yco-=BUTH, BUTW2, BUTH, 0, 0, 0, 0, 0, "");
+			uiBlockBeginAlign(block);
+			uiDefButI(block, NUM, B_REDR, "X: ",
+					  X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->resolX), 1, 10000, 0, 0, "Resolution of the voxel data");
+			uiDefButI(block, NUM, B_REDR, "Y: ",
+					  X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->resolY), 1, 10000, 0, 0, "Resolution of the voxel data");
+			uiDefButI(block, NUM, B_REDR, "Z: ",
+					  X2CLM2, yco-= BUTH, BUTW2, BUTH, &(vd->resolZ), 1, 10000, 0, 0, "Resolution of the voxel data");
+			uiBlockEndAlign(block);
+		
+			yco -= YSPACE;
+		}	
+		
+		if (vd->file_format == TEX_VD_BLENDERVOXEL) {
+			yco -= (BUTH+YSPACE);
+			uiBlockBeginAlign(block);
+			uiDefButI(block,TOG, B_REDR, "Still",
+				  X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->still), 0,1, 0, 0, "Use a still frame from the data sequence for the entire rendered animation");
+			if (vd->still)
+				uiDefButI(block, NUM, B_REDR, "Frame: ",
+						  X2CLM2, yco-=BUTH, BUTW2, BUTH, &(vd->still_frame), 1, 10000, 0, 0, "The frame to pause on for the entire rendered animation");	
+			uiBlockEndAlign(block);
+		}
+		
+		
+	}
+}
+
 static void texture_panel_colors(Tex *tex)
 {
 	uiBlock *block;

From d5e9eb7d76792ef019021d64a7229a82b10fdb62 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 21 Jun 2009 22:17:06 +0000
Subject: [PATCH 087/577] * fix for small bug in volume texture stack

---
 source/blender/render/intern/source/texture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index d1115e1d399..5df814358d5 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1289,7 +1289,7 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
 			texres->tg= col[1];
 			texres->tb= col[2];
 			texres->ta= col[3];
-			retval |= 1;
+			retval |= TEX_RGB;
 		}
 	}
 	return retval;
@@ -1636,8 +1636,11 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 					tcol[0]=texres.tr;
 					tcol[1]=texres.tg;
 					tcol[2]=texres.tb;
+					if(texres.talpha)
+						texres.tin= texres.ta;
 				}
 				
+				/* used for emit */
 				if((mapto_flag & MAP_COL) && (mtex->mapto & MAP_COL)) {
 					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
 				}

From 7da0d1a71efee9b360eb344e7bfaa9b5f0f4ece5 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 3 Jul 2009 11:03:09 +0000
Subject: [PATCH 088/577] * Fixed a crazy memory leak in voxel data image
 sequence data source

---
 source/blender/render/intern/source/voxeldata.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 241b11e04b9..8a1a8e0bbeb 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -121,6 +121,8 @@ void load_frame_image_sequence(Render *re, VoxelData *vd, Tex *tex)
 				rf +=4;
 			}
 		}
+		
+		BKE_image_free_anim_ibufs(ima, iuser->framenr);
 	}
 }
 

From a8872d99a9ff638fe46ec264bfe9636855807f9e Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 15 Aug 2009 07:49:56 +0000
Subject: [PATCH 089/577] * scons fixes for voxel data texture

---
 source/blender/render/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index dbd9f65254b..db151775b96 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c')
 
 incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
 incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
-incs += ' ../include ../blenloader'
+incs += ' ../include ../blenloader ../../../intern/smoke/extern'
 
 defs = []
 

From f27bee3d2192000feeb6b7ae4a8abe23c072caef Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 15 Aug 2009 19:28:28 +0000
Subject: [PATCH 090/577] had support for single triangular brush commented
 when it works ok. thanks to j michaelson for pointing out.

---
 release/scripts/export_map.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/scripts/export_map.py b/release/scripts/export_map.py
index aca02288c7a..2262ae3b89b 100644
--- a/release/scripts/export_map.py
+++ b/release/scripts/export_map.py
@@ -197,7 +197,7 @@ def is_tricyl_facegroup(faces):
 	is the face group a tri cylinder
 	Returens a bool, true if the faces make an extruded tri solid
 	'''
-	return False
+	
 	# cube must have 5 faces
 	if len(faces) != 5:
 		print '1'

From fe984a6e6ca9de9cb358fea0f4f3cf42742a1667 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 16 Aug 2009 06:10:31 +0000
Subject: [PATCH 091/577] volume material

* data reorganisation - uses own values now instead of reusing surface material properties (i.e. an individual density value, rather than reusing alpha) Files saved with the old system won't load up the same after this.

* improved defaults and ui
---
 release/ui/buttons_material.py                | 115 ++++++++++----
 release/ui/buttons_texture.py                 |  68 +++++----
 source/blender/blenkernel/intern/material.c   |  13 +-
 source/blender/blenkernel/intern/texture.c    |   6 +-
 source/blender/blenloader/intern/readfile.c   |  13 +-
 source/blender/makesdna/DNA_material_types.h  |  39 +++--
 source/blender/makesrna/intern/rna_material.c | 107 +++++++++++--
 source/blender/makesrna/intern/rna_texture.c  |   4 +-
 source/blender/render/intern/source/texture.c |  26 +++-
 .../blender/render/intern/source/volumetric.c | 143 +++++++++---------
 10 files changed, 364 insertions(+), 170 deletions(-)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 4c919f813e2..5b3ad34a09a 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -107,7 +107,7 @@ class MATERIAL_PT_strand(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 	
 	def poll(self, context):
-		return context.material.type in ['SURFACE', 'WIRE', 'HALO']
+		return context.material.type in ('SURFACE', 'WIRE', 'HALO')
 	
 	def draw(self, context):
 		layout = self.layout
@@ -165,7 +165,7 @@ class MATERIAL_PT_options(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 
 	def poll(self, context):
-		return (context.material.type in ['SURFACE', 'WIRE', 'HALO'])
+		return (context.material.type in ('SURFACE', 'WIRE', 'HALO'))
 
 	def draw(self, context):
 		layout = self.layout
@@ -202,7 +202,7 @@ class MATERIAL_PT_shadows(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 	
 	def poll(self, context):
-		return context.material.type in ['SURFACE', 'WIRE']
+		return context.material.type in ('SURFACE', 'WIRE')
 
 	def draw(self, context):
 		layout = self.layout
@@ -235,7 +235,7 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
 
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ['SURFACE', 'WIRE']) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -289,7 +289,7 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
 
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ['SURFACE', 'WIRE']) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -341,7 +341,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
 	
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ['SURFACE', 'WIRE']) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
 
 	def draw_header(self, context):
 		layout = self.layout
@@ -383,7 +383,7 @@ class MATERIAL_PT_raymir(MaterialButtonsPanel):
 	
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ['SURFACE', 'WIRE']) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
 	
 	def draw_header(self, context):
 		layout = self.layout
@@ -435,7 +435,7 @@ class MATERIAL_PT_raytransp(MaterialButtonsPanel):
 		
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ['SURFACE', 'WIRE']) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
 
 	def draw_header(self, context):
 		layout = self.layout
@@ -481,8 +481,40 @@ class MATERIAL_PT_raytransp(MaterialButtonsPanel):
 		sub.itemR(rayt, "gloss_threshold", slider=True, text="Threshold")
 		sub.itemR(rayt, "gloss_samples", text="Samples")
 
-class MATERIAL_PT_volume(MaterialButtonsPanel):
-	__label__ = "Volume"
+class MATERIAL_PT_volume_shading(MaterialButtonsPanel):
+	__label__ = "Shading"
+	__default_closed__ = False
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+	
+	def poll(self, context):
+		return (context.material.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		vol = context.material.volume
+		
+		split = layout.split()
+		
+		row = split.row()
+		row.itemR(vol, "density")
+		row.itemR(vol, "scattering")
+		
+		split = layout.split()
+		col = split.column()
+		col.itemR(vol, "absorption")
+		col.itemR(vol, "absorption_color", text="")
+		
+				
+		col = split.column()
+		col.itemR(vol, "emission")
+		col.itemR(vol, "emission_color", text="")
+		
+		
+
+class MATERIAL_PT_volume_scattering(MaterialButtonsPanel):
+	__label__ = "Scattering"
 	__default_closed__ = False
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 	
@@ -498,40 +530,55 @@ class MATERIAL_PT_volume(MaterialButtonsPanel):
 		split = layout.split()
 		
 		col = split.column()
-		col.itemR(vol, "step_calculation")
-		col.itemR(vol, "step_size")
-		col.itemR(vol, "shading_step_size")
-		
-		col.itemR(mat, "alpha", text="Density", slider=True)
-		
-		col.itemR(vol, "scattering_mode")
-		if vol.scattering_mode == 'SINGLE':
+		col.itemR(vol, "scattering_mode", text="")
+		if vol.scattering_mode == 'SINGLE_SCATTERING':
 			col.itemR(vol, "light_cache")
 			sub = col.column()
 			sub.active = vol.light_cache
+			sub.itemR(vol, "cache_resolution")
+		elif vol.scattering_mode in ('MULTIPLE_SCATTERING', 'SINGLE_PLUS_MULTIPLE_SCATTERING'):
 			col.itemR(vol, "cache_resolution")
-		elif vol.scattering_mode in ['MULTIPLE', 'SINGLE_PLUS_MULTIPLE']:
-			col.itemR(vol, "cache_resolution")
+			
+			col = col.column(align=True)
 			col.itemR(vol, "ms_diffusion")
 			col.itemR(vol, "ms_spread")
 			col.itemR(vol, "ms_intensity")
-			
-		col.itemR(vol, "density_scale")
-		col.itemR(vol, "depth_cutoff")
 		
 		col = split.column()
-		col.itemR(vol, "absorption")
-		col.itemR(vol, "absorption_color")
-		col.itemR(vol, "scattering")
+		# col.itemL(text="Anisotropic Scattering:")
+		col.itemR(vol, "phase_function", text="")
+		if vol.phase_function in ('SCHLICK', 'HENYEY-GREENSTEIN'):
+			col.itemR(vol, "asymmetry")
 		
-		col.itemR(mat, "emit")
-		col.itemR(mat, "diffuse_color")
+class MATERIAL_PT_volume_integration(MaterialButtonsPanel):
+	__label__ = "Integration"
+	__default_closed__ = False
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+	
+	def poll(self, context):
+		return (context.material.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		vol = context.material.volume
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="Step Calculation:")
+		col.itemR(vol, "step_calculation", text="")
+		col = col.column(align=True)
+		col.itemR(vol, "step_size")
+		col.itemR(vol, "shading_step_size")
+		
+		col = split.column()
+		col.itemL()
+		col.itemR(vol, "depth_cutoff")
+		col.itemR(vol, "density_scale")
 		
-		col.itemR(vol, "phase_function")
-		col.itemR(vol, "asymmetry")
 		
-
-
 class MATERIAL_PT_halo(MaterialButtonsPanel):
 	__label__= "Halo"
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
@@ -592,7 +639,9 @@ bpy.types.register(MATERIAL_PT_specular)
 bpy.types.register(MATERIAL_PT_raymir)
 bpy.types.register(MATERIAL_PT_raytransp)
 bpy.types.register(MATERIAL_PT_sss)
-bpy.types.register(MATERIAL_PT_volume)
+bpy.types.register(MATERIAL_PT_volume_shading)
+bpy.types.register(MATERIAL_PT_volume_scattering)
+bpy.types.register(MATERIAL_PT_volume_integration)
 bpy.types.register(MATERIAL_PT_halo)
 bpy.types.register(MATERIAL_PT_physics)
 bpy.types.register(MATERIAL_PT_strand)
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 5998eca870a..5b48fdfbaa4 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -176,35 +176,51 @@ class TEXTURE_PT_influence(TextureButtonsPanel):
 			sub.itemR(tex, factor, text=name, slider=True)
 		
 		if ma:
-			split = layout.split()
-			
-			col = split.column()
-			col.itemL(text="Diffuse:")
-			factor_but(col, tex.map_diffuse, "map_diffuse", "diffuse_factor", "Intensity")
-			factor_but(col, tex.map_colordiff, "map_colordiff", "colordiff_factor", "Color")
-			factor_but(col, tex.map_alpha, "map_alpha", "alpha_factor", "Alpha")
-			factor_but(col, tex.map_translucency, "map_translucency", "translucency_factor", "Translucency")
+			if ma.type in ['SURFACE', 'HALO', 'WIRE']:
+				split = layout.split()
+				
+				col = split.column()
+				col.itemL(text="Diffuse:")
+				factor_but(col, tex.map_diffuse, "map_diffuse", "diffuse_factor", "Intensity")
+				factor_but(col, tex.map_colordiff, "map_colordiff", "colordiff_factor", "Color")
+				factor_but(col, tex.map_alpha, "map_alpha", "alpha_factor", "Alpha")
+				factor_but(col, tex.map_translucency, "map_translucency", "translucency_factor", "Translucency")
 
-			col.itemL(text="Specular:")
-			factor_but(col, tex.map_specular, "map_specular", "specular_factor", "Intensity")
-			factor_but(col, tex.map_colorspec, "map_colorspec", "colorspec_factor", "Color")
-			factor_but(col, tex.map_hardness, "map_hardness", "hardness_factor", "Hardness")
+				col.itemL(text="Specular:")
+				factor_but(col, tex.map_specular, "map_specular", "specular_factor", "Intensity")
+				factor_but(col, tex.map_colorspec, "map_colorspec", "colorspec_factor", "Color")
+				factor_but(col, tex.map_hardness, "map_hardness", "hardness_factor", "Hardness")
 
-			col = split.column()
-			col.itemL(text="Shading:")
-			factor_but(col, tex.map_ambient, "map_ambient", "ambient_factor", "Ambient")
-			factor_but(col, tex.map_emit, "map_emit", "emit_factor", "Emit")
-			factor_but(col, tex.map_mirror, "map_mirror", "mirror_factor", "Mirror")
-			factor_but(col, tex.map_raymir, "map_raymir", "raymir_factor", "Ray Mirror")
+				col = split.column()
+				col.itemL(text="Shading:")
+				factor_but(col, tex.map_ambient, "map_ambient", "ambient_factor", "Ambient")
+				factor_but(col, tex.map_emit, "map_emit", "emit_factor", "Emit")
+				factor_but(col, tex.map_mirror, "map_mirror", "mirror_factor", "Mirror")
+				factor_but(col, tex.map_raymir, "map_raymir", "raymir_factor", "Ray Mirror")
 
-			col.itemL(text="Geometry:")
-			factor_but(col, tex.map_normal, "map_normal", "normal_factor", "Normal")
-			factor_but(col, tex.map_warp, "map_warp", "warp_factor", "Warp")
-			factor_but(col, tex.map_displacement, "map_displacement", "displacement_factor", "Displace")
+				col.itemL(text="Geometry:")
+				factor_but(col, tex.map_normal, "map_normal", "normal_factor", "Normal")
+				factor_but(col, tex.map_warp, "map_warp", "warp_factor", "Warp")
+				factor_but(col, tex.map_displacement, "map_displacement", "displacement_factor", "Displace")
+
+				#sub = col.column()
+				#sub.active = tex.map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror
+				#sub.itemR(tex, "default_value", text="Amount", slider=True)
+			elif ma.type == 'VOLUME':
+				split = layout.split()
+				
+				col = split.column()
+				factor_but(col, tex.map_density, "map_density", "density_factor", "Density")
+				factor_but(col, tex.map_emission, "map_emission", "emission_factor", "Emission")
+				factor_but(col, tex.map_absorption, "map_absorption", "absorption_factor", "Absorption")
+				factor_but(col, tex.map_scattering, "map_scattering", "scattering_factor", "Scattering")
+				
+				col = split.column()
+				col.itemL(text=" ")
+				factor_but(col, tex.map_alpha, "map_coloremission", "coloremission_factor", "Emission Color")
+				factor_but(col, tex.map_colorabsorption, "map_colorabsorption", "colorabsorption_factor", "Absorption Color")
+				
 
-			#sub = col.column()
-			#sub.active = tex.map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror
-			#sub.itemR(tex, "default_value", text="Amount", slider=True)
 		elif la:
 			row = layout.row()
 			factor_but(row, tex.map_color, "map_color", "color_factor", "Color")
@@ -641,7 +657,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel):
 		if vd.file_format == 'RAW_8BIT':
 			layout.itemR(vd, "resolution")
 		if vd.file_format == 'SMOKE':
-			layout.itemR(vd, "object")
+			layout.itemR(vd, "domain_object")
 		
 		layout.itemR(vd, "still")
 		if vd.still:
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index a46014d0a7c..51748443c97 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -170,12 +170,19 @@ void init_material(Material *ma)
 	ma->sss_front= 1.0f;
 	ma->sss_back= 1.0f;
 
-	ma->vol.density_scale = 1.0f;
-	ma->vol.stepsize = 0.2f;
-	ma->vol.shade_stepsize = 0.2f;
+	ma->vol.density = 1.0f;
+	ma->vol.emission = 0.0f;
 	ma->vol.absorption = 1.0f;
 	ma->vol.scattering = 1.0f;
+	ma->vol.emission_col[0] = ma->vol.emission_col[1] = ma->vol.emission_col[2] = 1.0f;
 	ma->vol.absorption_col[0] = ma->vol.absorption_col[1] = ma->vol.absorption_col[2] = 0.0f;
+	ma->vol.density_scale = 1.0f;
+	ma->vol.depth_cutoff = 0.01f;
+	ma->vol.stepsize_type = MA_VOL_STEP_RANDOMIZED;
+	ma->vol.stepsize = 0.2f;
+	ma->vol.shade_stepsize = 0.2f;
+	ma->vol.shade_type = MA_VOL_SHADE_SINGLE;
+	ma->vol.shadeflag |= MA_VOL_PRECACHESHADING;
 	ma->vol.precache_resolution = 50;
 	
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 234078f66ae..fc9948f8d95 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -496,7 +496,8 @@ void default_tex(Tex *tex)
 	
 	if (tex->vd) {
 		tex->vd->resol[0] = tex->vd->resol[1] = tex->vd->resol[2] = 0;
-		tex->vd->interp_type=0;
+		tex->vd->interp_type=TEX_VD_LINEAR;
+		tex->vd->file_format=TEX_VD_SMOKE;
 	}
 	pit = tex->plugin;
 	if (pit) {
@@ -978,7 +979,8 @@ struct VoxelData *BKE_add_voxeldata(void)
 	vd= MEM_callocN(sizeof(struct VoxelData), "voxeldata");
 	vd->dataset = NULL;
 	vd->resol[0] = vd->resol[1] = vd->resol[2] = 1;
-	vd->interp_type= TEX_VD_NEARESTNEIGHBOR;
+	vd->interp_type= TEX_VD_LINEAR;
+	vd->file_format= TEX_VD_SMOKE;
 	vd->int_multiplier = 1.0;
 	
 	return vd;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4ee71ea92db..c5588ccf7d6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9491,12 +9491,19 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 			
 			/* volume rendering settings */
-			ma->vol.density_scale = 1.0f;
-			ma->vol.stepsize = 0.2f;
-			ma->vol.shade_stepsize = 0.2f;
+			ma->vol.density = 1.0f;
+			ma->vol.emission = 0.0f;
 			ma->vol.absorption = 1.0f;
 			ma->vol.scattering = 1.0f;
+			ma->vol.emission_col[0] = ma->vol.emission_col[1] = ma->vol.emission_col[2] = 1.0f;
 			ma->vol.absorption_col[0] = ma->vol.absorption_col[1] = ma->vol.absorption_col[2] = 0.0f;
+			ma->vol.density_scale = 1.0f;
+			ma->vol.depth_cutoff = 0.01f;
+			ma->vol.stepsize_type = MA_VOL_STEP_RANDOMIZED;
+			ma->vol.stepsize = 0.2f;
+			ma->vol.shade_stepsize = 0.2f;
+			ma->vol.shade_type = MA_VOL_SHADE_SINGLE;
+			ma->vol.shadeflag |= MA_VOL_PRECACHESHADING;
 			ma->vol.precache_resolution = 50;
 		}
 
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 22ec0f6d59e..1729db37ad1 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -48,21 +48,30 @@ struct Ipo;
 /* WATCH IT: change type? also make changes in ipo.h  */
 
 typedef struct VolumeSettings {
-	short stepsize_type;
-	short precache_resolution;
-	float stepsize, shade_stepsize;
-	float depth_cutoff;
-	short shade_type;
-	short vpad;
-	float density_scale;
-	float absorption, scattering;
+	float density;
+	float emission;
+	float absorption;
+	float scattering;
+
+	float emission_col[3];
 	float absorption_col[3];
-	short shadeflag;
+	float density_scale;
+	float depth_cutoff;
+
 	short phasefunc_type;
+	short vpad[3];
 	float phasefunc_g;
-	float vpad2[2];
 	
-	float ms_diff, ms_intensity;
+	float stepsize;
+	float shade_stepsize;
+	
+	short stepsize_type;
+	short shadeflag;
+	short shade_type;
+	short precache_resolution;
+	
+	float ms_diff;
+	float ms_intensity;
 	int ms_steps;
 } VolumeSettings;
 
@@ -308,6 +317,14 @@ typedef struct Material {
 #define MAP_WARP		8192
 #define MAP_LAYER		16384
 
+/* volume mapto - reuse definitions for now - a bit naughty! */
+#define MAP_DENSITY			128
+#define MAP_EMISSION		64
+#define MAP_EMISSION_COL	1
+#define MAP_ABSORPTION		512
+#define MAP_ABSORPTION_COL	8
+#define MAP_SCATTERING		16
+
 /* mapto for halo */
 //#define MAP_HA_COL		1
 //#define MAP_HA_ALPHA	128
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 4ca1db09374..3f225321024 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -468,6 +468,75 @@ static void rna_def_material_mtex(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Ambient Factor", "Amount texture affects ambient.");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 
+	/* volume material */
+	prop= RNA_def_property(srna, "map_coloremission", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMISSION_COL);
+	RNA_def_property_ui_text(prop, "Emission Color", "Causes the texture to affect the colour of emission");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "map_colorabsorption", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_ABSORPTION_COL);
+	RNA_def_property_ui_text(prop, "Absorption Color", "Causes the texture to affect the result colour after absorption");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "map_density", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_DENSITY);
+	RNA_def_property_ui_text(prop, "Density", "Causes the texture to affect the volume's density");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "map_emission", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMISSION);
+	RNA_def_property_ui_text(prop, "Emission", "Causes the texture to affect the volume's emission");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "map_absorption", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_ABSORPTION);
+	RNA_def_property_ui_text(prop, "Absorption", "Causes the texture to affect the volume's absorption");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "map_scattering", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_SCATTERING);
+	RNA_def_property_ui_text(prop, "Scattering", "Causes the texture to affect the volume's scattering");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "coloremission_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "colfac");
+	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
+	RNA_def_property_ui_text(prop, "Emission Color Factor", "Amount texture affects emission color.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "colorabsorption_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "colfac");
+	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
+	RNA_def_property_ui_text(prop, "Absorpion Color Factor", "Amount texture affects diffuse color.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "density_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "varfac");
+	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
+	RNA_def_property_ui_text(prop, "Density Factor", "Amount texture affects density.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "emission_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "varfac");
+	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
+	RNA_def_property_ui_text(prop, "Emission Factor", "Amount texture affects emission.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "absorption_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "varfac");
+	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
+	RNA_def_property_ui_text(prop, "Absorption Factor", "Amount texture affects absorption.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "scattering_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "varfac");
+	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
+	RNA_def_property_ui_text(prop, "Scattering Factor", "Amount texture affects scattering.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	/* end volume material */
+	
 	prop= RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_MaterialTextureSlot_enabled_get", "rna_MaterialTextureSlot_enabled_set");
 	RNA_def_property_ui_text(prop, "Enabled", "Enable this material texture slot.");
@@ -810,9 +879,9 @@ static void rna_def_material_volume(BlenderRNA *brna)
 
 	static EnumPropertyItem prop_scattering_items[] = {
 		{MA_VOL_SHADE_NONE, "NONE", 0, "None", ""},
-		{MA_VOL_SHADE_SINGLE, "SINGLE", 0, "Single", ""},
-		{MA_VOL_SHADE_MULTIPLE, "MULTIPLE", 0, "Multiple", ""},
-		{MA_VOL_SHADE_SINGLEPLUSMULTIPLE, "SINGLE_PLUS_MULTIPLE", 0, "Single + Multiple", ""},
+		{MA_VOL_SHADE_SINGLE, "SINGLE_SCATTERING", 0, "Single Scattering", ""},
+		{MA_VOL_SHADE_MULTIPLE, "MULTIPLE_SCATTERING", 0, "Multiple Scattering", ""},
+		{MA_VOL_SHADE_SINGLEPLUSMULTIPLE, "SINGLE_PLUS_MULTIPLE_SCATTERING", 0, "Single + Multiple Scattering", ""},
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_stepsize_items[] = {
@@ -844,12 +913,14 @@ static void rna_def_material_volume(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "step_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "stepsize");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 1, 3);
 	RNA_def_property_ui_text(prop, "Step Size", "Distance between subsequent volume depth samples.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "shading_step_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "shade_stepsize");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 1, 3);
 	RNA_def_property_ui_text(prop, "Shading Step Size", "Distance between subsequent volume shading samples.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
@@ -894,15 +965,23 @@ static void rna_def_material_volume(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Depth Cutoff", "Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
+	prop= RNA_def_property(srna, "density", PROP_FLOAT, PROP_PERCENTAGE);
+	RNA_def_property_float_sdna(prop, NULL, "density");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Density", "The base density of the volume");
+	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
+
 	prop= RNA_def_property(srna, "density_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "density_scale");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
 	RNA_def_property_ui_text(prop, "Density Scale", "Multiplier for the material's density");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "absorption", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "absorption");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
 	RNA_def_property_ui_text(prop, "Absorption", "Amount of light that gets absorbed by the volume - higher values mean light travels less distance");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
@@ -915,9 +994,23 @@ static void rna_def_material_volume(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "scattering", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "scattering");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1 ,3);
 	RNA_def_property_ui_text(prop, "Scattering", "Amount of light that gets scattered by the volume - values > 1.0 are non-physical");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
+	prop= RNA_def_property(srna, "emission", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "emission");
+	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
+	RNA_def_property_ui_text(prop, "Emission", "Amount of light that gets emitted by the volume");
+	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
+	
+	prop= RNA_def_property(srna, "emission_color", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "emission_col");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Emission Color", "");
+	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING_DRAW, NULL);
+	
 	prop= RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shadeflag", MA_VOL_USEALPHA); /* use bitflags */
 	RNA_def_property_ui_text(prop, "Use Alpha", "Temp method for getting a usable alpha channel");
@@ -934,14 +1027,6 @@ static void rna_def_material_volume(BlenderRNA *brna)
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Asymmetry", "Continuum between forward scattering and back scattering");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
-	
-	/*
-	prop= RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "samp_gloss_mir");
-	RNA_def_property_range(prop, 0, 1024);
-	RNA_def_property_ui_text(prop, "Gloss Samples", "Number of cone samples averaged for blurry reflections.");
-	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
-	*/
 }
 
 
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 203012dbc80..01078ac2412 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -1448,9 +1448,9 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Still Frame Number", "The frame number to always use");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 	
-	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
+	prop= RNA_def_property(srna, "domain_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "object");
-	RNA_def_property_ui_text(prop, "Object", "Object to use for smoke simulations");
+	RNA_def_property_ui_text(prop, "Domain Object", "Object used as the smoke simulation domain");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 27cf698aabe..1b25edaab34 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -2362,7 +2362,7 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 			}
 			
 			
-			if((mapto_flag & (MAP_COL+MAP_COLMIR)) && (mtex->mapto & (MAP_COL+MAP_COLMIR))) {
+			if((mapto_flag & (MAP_EMISSION_COL+MAP_ABSORPTION_COL)) && (mtex->mapto & (MAP_EMISSION_COL+MAP_ABSORPTION_COL))) {
 				float tcol[3], colfac;
 				
 				/* stencil maps on the texture control slider, not texture intensity value */
@@ -2386,12 +2386,12 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 				}
 				
 				/* used for emit */
-				if((mapto_flag & MAP_COL) && (mtex->mapto & MAP_COL)) {
+				if((mapto_flag & MAP_EMISSION_COL) && (mtex->mapto & MAP_EMISSION_COL)) {
 					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
 				}
 				
 				/* MAP_COLMIR is abused for absorption colour at the moment */
-				if((mapto_flag & MAP_COLMIR) && (mtex->mapto & MAP_COLMIR)) {
+				if((mapto_flag & MAP_ABSORPTION_COL) && (mtex->mapto & MAP_ABSORPTION_COL)) {
 					texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype);
 				}
 			}
@@ -2408,15 +2408,27 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 					}
 				}
 				
-				if((mapto_flag & MAP_EMIT) && (mtex->mapto & MAP_EMIT)) {
-					int flip= mtex->maptoneg & MAP_EMIT;
+				if((mapto_flag & MAP_EMISSION) && (mtex->mapto & MAP_EMISSION)) {
+					int flip= mtex->maptoneg & MAP_EMISSION;
 
 					*val = texture_value_blend(mtex->def_var, *val, texres.tin, varfac, mtex->blendtype, flip);
 					if(*val<0.0) *val= 0.0;
 				}
-				if((mapto_flag & MAP_ALPHA) && (mtex->mapto & MAP_ALPHA)) {
-					int flip= mtex->maptoneg & MAP_ALPHA;
+				if((mapto_flag & MAP_DENSITY) && (mtex->mapto & MAP_DENSITY)) {
+					int flip= mtex->maptoneg & MAP_DENSITY;
 
+					*val = texture_value_blend(mtex->def_var, *val, texres.tin, varfac, mtex->blendtype, flip);
+					CLAMP(*val, 0.0, 1.0);
+				}
+				if((mapto_flag & MAP_ABSORPTION) && (mtex->mapto & MAP_ABSORPTION)) {
+					int flip= mtex->maptoneg & MAP_ABSORPTION;
+					
+					*val = texture_value_blend(mtex->def_var, *val, texres.tin, varfac, mtex->blendtype, flip);
+					CLAMP(*val, 0.0, 1.0);
+				}
+				if((mapto_flag & MAP_SCATTERING) && (mtex->mapto & MAP_SCATTERING)) {
+					int flip= mtex->maptoneg & MAP_SCATTERING;
+					
 					*val = texture_value_blend(mtex->def_var, *val, texres.tin, varfac, mtex->blendtype, flip);
 					CLAMP(*val, 0.0, 1.0);
 				}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 04eb1b5e3bf..63c4e97f86e 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -165,80 +165,89 @@ static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, fl
 
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
-	float density = shi->mat->alpha;
+	float density = shi->mat->vol.density;
 	float density_scale = shi->mat->vol.density_scale;
 	float col[3] = {0.0, 0.0, 0.0};
 	
-	do_volume_tex(shi, co, MAP_ALPHA, col, &density);
+	do_volume_tex(shi, co, MAP_DENSITY, col, &density);
 	
 	return density * density_scale;
 }
 
-/* compute emission component, amount of radiance to add per segment
- * can be textured with 'emit' */
-void vol_get_emission(ShadeInput *shi, float *em, float *co, float density)
-{
-	float emission = shi->mat->emit;
-	float col[3] = {0.0, 0.0, 0.0};
-	
-	VECCOPY(col, &shi->mat->r);
-	
-	do_volume_tex(shi, co, MAP_EMIT+MAP_COL, col, &emission);
-	
-	em[0] = em[1] = em[2] = emission * density;
-	VecMulVecf(em, em, col);
-}
-
 /* scattering multiplier, values above 1.0 are non-physical, 
  * but can be useful to tweak lighting */
-void vol_get_scattering_fac(ShadeInput *shi, float *scatter_fac, float *co, float density)
+float vol_get_scattering_fac(ShadeInput *shi, float *co)
 {
-	*scatter_fac = shi->mat->vol.scattering;
+	float scatter = shi->mat->vol.scattering;
+	float col[3] = {0.0, 0.0, 0.0};
+	
+	do_volume_tex(shi, co, MAP_SCATTERING, col, &scatter);
+	
+	return scatter;
 }
 
+/* compute emission component, amount of radiance to add per segment
+ * can be textured with 'emit' */
+void vol_get_emission(ShadeInput *shi, float *emission_col, float *co, float density)
+{
+	float emission = shi->mat->vol.emission;
+	VECCOPY(emission_col, shi->mat->vol.emission_col);
+	
+	do_volume_tex(shi, co, MAP_EMISSION+MAP_EMISSION_COL, emission_col, &emission);
+	
+	emission_col[0] = emission_col[0] * emission * density;
+	emission_col[1] = emission_col[1] * emission * density;
+	emission_col[2] = emission_col[2] * emission * density;
+}
+
+void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
+{
+	float absorption = shi->mat->vol.absorption;
+	VECCOPY(absorb_col, shi->mat->vol.absorption_col);
+	
+	do_volume_tex(shi, co, MAP_ABSORPTION+MAP_ABSORPTION_COL, absorb_col, &absorption);
+	
+	absorb_col[0] = (1.0f - absorb_col[0]) * absorption;
+	absorb_col[1] = (1.0f - absorb_col[1]) * absorption;
+	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
+}
+
+
 /* phase function - determines in which directions the light 
  * is scattered in the volume relative to incoming direction 
  * and view direction */
 float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w, float *wp)
 {
 	const float costheta = Inpf(w, wp);
+	const float scale = M_PI;
 	
-	if (phasefunc_type == MA_VOL_PH_ISOTROPIC) {
-		return 1.f / (4.f * M_PI);
-	}
-	else if (phasefunc_type == MA_VOL_PH_MIEHAZY) {
-		return (0.5f + 4.5f * powf(0.5 * (1.f + costheta), 8.f)) / (4.f*M_PI);
-	}
-	else if (phasefunc_type == MA_VOL_PH_MIEMURKY) {
-		return (0.5f + 16.5f * powf(0.5 * (1.f + costheta), 32.f)) / (4.f*M_PI);
-	}
-	else if (phasefunc_type == MA_VOL_PH_RAYLEIGH) {
-		return 3.f/(16.f*M_PI) * (1 + costheta * costheta);
-	}
-	else if (phasefunc_type == MA_VOL_PH_HG) {
-		return 1.f / (4.f * M_PI) * (1.f - g*g) / powf(1.f + g*g - 2.f * g * costheta, 1.5f);
-	}
-	else if (phasefunc_type == MA_VOL_PH_SCHLICK) {
-		const float k = 1.55f * g - .55f * g * g * g;
-		const float kcostheta = k * costheta;
-		return 1.f / (4.f * M_PI) * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta));
-	} else {
-		return 1.0f;
-	}
-}
-
-void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
-{
-	float dummy = 1.0f;
-	const float absorption = shi->mat->vol.absorption;
+	/*
+	 * Scale constant is required, since Blender's shading system doesn't normalise for
+	 * energy conservation - eg. scaling by 1/pi for a lambert shader.
+	 * This makes volumes darker than other solid objects, for the same lighting intensity.
+	 * To correct this, scale up the phase function values
+	 * until Blender's shading system supports this better. --matt
+	 */
 	
-	VECCOPY(absorb_col, shi->mat->vol.absorption_col);
-	
-	do_volume_tex(shi, co, MAP_COLMIR, absorb_col, &dummy);
-	
-	absorb_col[0] = (1.0f - absorb_col[0]) * absorption;
-	absorb_col[1] = (1.0f - absorb_col[1]) * absorption;
-	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
+	switch (phasefunc_type) {
+		case MA_VOL_PH_MIEHAZY:
+			return scale * (0.5f + 4.5f * powf(0.5 * (1.f + costheta), 8.f)) / (4.f*M_PI);
+		case MA_VOL_PH_MIEMURKY:
+			return scale * (0.5f + 16.5f * powf(0.5 * (1.f + costheta), 32.f)) / (4.f*M_PI);
+		case MA_VOL_PH_RAYLEIGH:
+			return scale * 3.f/(16.f*M_PI) * (1 + costheta * costheta);
+		case MA_VOL_PH_HG:
+			return scale * (1.f / (4.f * M_PI) * (1.f - g*g) / powf(1.f + g*g - 2.f * g * costheta, 1.5f));
+		case MA_VOL_PH_SCHLICK:
+		{
+			const float k = 1.55f * g - .55f * g * g * g;
+			const float kcostheta = k * costheta;
+			return scale * (1.f / (4.f * M_PI) * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta)));
+		}
+		case MA_VOL_PH_ISOTROPIC:
+		default:
+			return scale * (1.f / (4.f * M_PI));
+	}
 }
 
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
@@ -360,7 +369,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		}
 	}
 	
-	vol_get_scattering_fac(shi, &scatter_fac, co, density);
+	scatter_fac = vol_get_scattering_fac(shi, co);
 	VecMulf(lacol, scatter_fac);
 }
 
@@ -371,16 +380,13 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 	GroupObject *go;
 	LampRen *lar;
 	float col[3] = {0.f, 0.f, 0.f};
-	int i=0;
-
+	
 	lights= get_lights(shi);
 	for(go=lights->first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
-	
-		i++;
-	
 		lar= go->lampren;
+		
 		if (lar) {
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
 			VecAddf(col, col, lacol);
@@ -575,9 +581,7 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 		/* shade volume from 'camera' to 1st hit point */
 		volumeintegrate(shi, col, shi->camera_co, shi->co);
 		
-		shr->combined[0] = col[0];
-		shr->combined[1] = col[1];
-		shr->combined[2] = col[2];
+		VecCopyf(shr->combined, col);
 		
 		if (shi->mat->vol.shadeflag & MA_VOL_USEALPHA) {
 			if (col[3] > 1.0f)
@@ -606,9 +610,7 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 		/* shade volume from 1st hit point to 2nd hit point */
 		volumeintegrate(shi, col, shi->co, hitco);
 		
-		shr->combined[0] = col[0];
-		shr->combined[1] = col[1];
-		shr->combined[2] = col[2];
+		VecCopyf(shr->combined, col);
 		
 		if (shi->mat->vol.shadeflag & MA_VOL_USEALPHA) {
 			if (col[3] > 1.0f)
@@ -650,9 +652,8 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 		tr[1] = exp(-tau[1]);
 		tr[2] = exp(-tau[2]);
 		
-		shr->combined[0] = tr[0];
-		shr->combined[1] = tr[1];
-		shr->combined[2] = tr[2];
+		
+		VecCopyf(shr->combined, tr);
 		
 		shr->combined[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
 		shr->alpha = shr->combined[3];
@@ -666,9 +667,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 		tr[1] = exp(-tau[1]);
 		tr[2] = exp(-tau[2]);
 		
-		shr->combined[0] = tr[0];
-		shr->combined[1] = tr[1];
-		shr->combined[2] = tr[2];
+		VecCopyf(shr->combined, tr);
 		
 		shr->combined[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
 		shr->alpha = shr->combined[3];

From 71cc934c6fb0037c6f0cd87f5f984250645ad42f Mon Sep 17 00:00:00 2001
From: Peter Schlaile <peter@schlaile.de>
Date: Sun, 16 Aug 2009 14:43:30 +0000
Subject: [PATCH 092/577] == Sequencer ==

Make coverity scan happy and check for input strip on speed control map
rebuild.
---
 source/blender/src/seqeffects.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/blender/src/seqeffects.c b/source/blender/src/seqeffects.c
index 2e339f433c3..1aab9a00506 100644
--- a/source/blender/src/seqeffects.c
+++ b/source/blender/src/seqeffects.c
@@ -2791,6 +2791,10 @@ void sequence_effect_speed_rebuild_map(struct Sequence * seq, int force)
 	if (!(force || seq->len != v->length || !v->frameMap)) {
 		return;
 	}
+	if (!seq->seq1) { /* make coverity happy and check for 
+			     input strip ... */
+		return;
+	}
 
 	if (!v->frameMap || v->length != seq->len) {
 		if (v->frameMap) MEM_freeN(v->frameMap);
@@ -2807,7 +2811,7 @@ void sequence_effect_speed_rebuild_map(struct Sequence * seq, int force)
 	   strip */
 
 	if ((!seq->ipo || !seq->ipo->curve.first) && 
-	    seq->seq1 && seq->seq1->enddisp != seq->seq1->start
+	    seq->seq1->enddisp != seq->seq1->start
 	    && seq->seq1->len != 0) {
 		fallback_fac = (float) seq->seq1->len / 
 			(float) (seq->seq1->enddisp - seq->seq1->start);

From c73bad7bddb3a5368b28d061bdc3b2c86b05a53d Mon Sep 17 00:00:00 2001
From: Peter Schlaile <peter@schlaile.de>
Date: Sun, 16 Aug 2009 14:52:05 +0000
Subject: [PATCH 093/577] == Sequencer ==

Forgot coverity id: CID 598
---
 source/blender/src/seqeffects.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/src/seqeffects.c b/source/blender/src/seqeffects.c
index 1aab9a00506..731bbaea9f4 100644
--- a/source/blender/src/seqeffects.c
+++ b/source/blender/src/seqeffects.c
@@ -2791,7 +2791,7 @@ void sequence_effect_speed_rebuild_map(struct Sequence * seq, int force)
 	if (!(force || seq->len != v->length || !v->frameMap)) {
 		return;
 	}
-	if (!seq->seq1) { /* make coverity happy and check for 
+	if (!seq->seq1) { /* make coverity happy and check for (CID 598)
 			     input strip ... */
 		return;
 	}

From c00d610e3e704efe27cf35cbfa2ae9d0a48274ec Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Mon, 17 Aug 2009 17:14:37 +0000
Subject: [PATCH 094/577] 2.5:

* Added icons to viewport shading enum. On a side note, why do we have an icon called "ICON_POTATO" for texture mode?
* Fixed clay brush at zero-strength bug, was dividing by zero. Still todo is fixing clay brush strength relative to other brushes.
---
 source/blender/editors/sculpt_paint/sculpt.c | 37 ++++++++++++--------
 source/blender/makesrna/intern/rna_space.c   | 10 +++---
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 2a4c553a94c..9931ae15f23 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -542,12 +542,27 @@ static void point_plane_project(float intr[3], float co[3], float plane_normal[3
 	VecAddf(intr, intr, p1);
 }
 
+static int plane_point_side(float co[3], float plane_normal[3], float plane_center[3], int flip)
+{
+	float delta[3];
+	float d;
+
+	VecSubf(delta, co, plane_center);
+	d = Inpf(plane_normal, delta);
+
+	if(flip)
+		d = -d;
+
+	return d <= 0.0f;
+}
+
 static void do_flatten_clay_brush(Sculpt *sd, SculptSession *ss, const ListBase *active_verts, int clay)
 {
 	ActiveData *node= active_verts->first;
 	/* area_normal and cntr define the plane towards which vertices are squashed */
 	float area_normal[3];
 	float cntr[3], cntr2[3], bstr;
+	int flip = 0;
 
 	calc_area_normal(sd, ss, area_normal, active_verts);
 	calc_flatten_center(ss, node, cntr);
@@ -558,31 +573,24 @@ static void do_flatten_clay_brush(Sculpt *sd, SculptSession *ss, const ListBase
 		cntr2[0]=cntr[0]+area_normal[0]*bstr*ss->cache->scale[0];
 		cntr2[1]=cntr[1]+area_normal[1]*bstr*ss->cache->scale[1];
 		cntr2[2]=cntr[2]+area_normal[2]*bstr*ss->cache->scale[2];
+		flip = bstr < 0;
 	}
 	
 	while(node){
 		float *co= ss->mvert[node->Index].co;
-		float intr[3], val[3], d;
+		float intr[3], val[3];
 		
-		if(clay) {
-			float delta[3];
-
-			VecSubf(delta, co, cntr2);
-			d = Inpf(area_normal, delta);
-
-			/* Check for subtractive mode */
-			if(bstr < 0)
-				d = -d;
-		}
-
-		if(!clay || d <= 0.0f) {
+		if(!clay || plane_point_side(co, area_normal, cntr2, flip)) {
 			/* Find the intersection between squash-plane and vertex (along the area normal) */		
 			point_plane_project(intr, co, area_normal, cntr);
 
 			VecSubf(val, intr, co);
 
 			if(clay) {
-				VecMulf(val, node->Fade / bstr);
+				if(bstr > FLT_EPSILON)
+					VecMulf(val, node->Fade / bstr);
+				else
+					VecMulf(val, node->Fade);
 				/* Clay displacement */
 				val[0]+=area_normal[0] * ss->cache->scale[0]*node->Fade;
 				val[1]+=area_normal[1] * ss->cache->scale[1]*node->Fade;
@@ -592,6 +600,7 @@ static void do_flatten_clay_brush(Sculpt *sd, SculptSession *ss, const ListBase
 				VecMulf(val, fabs(node->Fade));
 
 			VecAddf(val, val, co);
+
 			sculpt_clip(sd, ss, co, val);
 		}
 		
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 664b1713b31..41361dd69a4 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -519,11 +519,11 @@ static void rna_def_space_3dview(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem viewport_shading_items[] = {
-		{OB_BOUNDBOX, "BOUNDBOX", 0, "Bounding Box", "Display the object's local bounding boxes only"},
-		{OB_WIRE, "WIREFRAME", 0, "Wireframe", "Display the object as wire edges"},
-		{OB_SOLID, "SOLID", 0, "Solid", "Display the object solid, lit with default OpenGL lights"},
-		{OB_SHADED, "SHADED", 0, "Shaded", "Display the object solid, with preview shading interpolated at vertices"},
-		{OB_TEXTURE, "TEXTURED", 0, "Textured", "Display the object solid, with face-assigned textures"},
+		{OB_BOUNDBOX, "BOUNDBOX", ICON_BBOX, "Bounding Box", "Display the object's local bounding boxes only"},
+		{OB_WIRE, "WIREFRAME", ICON_WIRE, "Wireframe", "Display the object as wire edges"},
+		{OB_SOLID, "SOLID", ICON_SOLID, "Solid", "Display the object solid, lit with default OpenGL lights"},
+		{OB_SHADED, "SHADED", ICON_SMOOTH, "Shaded", "Display the object solid, with preview shading interpolated at vertices"},
+		{OB_TEXTURE, "TEXTURED", ICON_POTATO, "Textured", "Display the object solid, with face-assigned textures"},
 		{0, NULL, 0, NULL, NULL}};
 		
 	static EnumPropertyItem pivot_items[] = {

From f3caa80a49fc1978e04915d663be540390180791 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 17 Aug 2009 17:26:54 +0000
Subject: [PATCH 095/577] rna reference doc generation - rna classes,  only
 include props and functions that are not inherited (epydoc then gives
 inheritance info) - include function arguments and return values for in cross
 reference

---
 source/blender/python/epy_doc_gen.py | 58 +++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/source/blender/python/epy_doc_gen.py b/source/blender/python/epy_doc_gen.py
index 1da69c622a6..6a515648340 100644
--- a/source/blender/python/epy_doc_gen.py
+++ b/source/blender/python/epy_doc_gen.py
@@ -89,7 +89,7 @@ def write_func(rna, ident, out, func_type):
 		rna_prop_type = rna_prop.type.lower() # enum, float, int, boolean
 		
 		
-		# only for rna funcions, operators should not get pointers as args
+		# only for rna functions, operators should not get pointers as args
 		if rna_prop_type=='pointer':
 			rna_prop_type_refine = "L{%s}" % rna_prop.fixed_type.identifier
 		else:
@@ -200,6 +200,7 @@ def rna2epy(target_path):
 	
 	# Use for faster lookups
 	# use rna_struct.identifier as the key for each dict
+	rna_struct_dict =		{}  # store identifier:rna lookups
 	rna_full_path_dict =	{}	# store the result of full_rna_struct_path(rna_struct)
 	rna_children_dict =		{}	# store all rna_structs nested from here
 	rna_references_dict =	{}	# store a list of rna path strings that reference this type
@@ -216,8 +217,12 @@ def rna2epy(target_path):
 		
 		if rna_base:
 			out.write(ident+ 'class %s(%s):\n' % (identifier, rna_base.identifier))
+			rna_base_prop_keys = rna_base.properties.keys() # could be cached
+			rna_base_func_keys = [f.identifier for f in rna_base.functions]
 		else:
 			out.write(ident+ 'class %s:\n' % identifier)
+			rna_base_prop_keys = []
+			rna_base_func_keys = []
 		
 		out.write(ident+ '\t"""\n')
 		
@@ -249,11 +254,9 @@ def rna2epy(target_path):
 		
 		for rna_prop_identifier, rna_prop in rna_struct.properties.items():
 			
-			if rna_prop_identifier=='RNA':
-				continue
-			
-			if rna_prop_identifier=='rna_type':
-				continue
+			if rna_prop_identifier=='RNA':					continue
+			if rna_prop_identifier=='rna_type':				continue
+			if rna_prop_identifier in rna_base_prop_keys:	continue # does this prop exist in our parent class, if so skip
 			
 			rna_desc = rna_prop.description.strip()
 			
@@ -308,7 +311,8 @@ def rna2epy(target_path):
 		# Write functions 
 		# for rna_func in rna_struct.functions: # Better ignore inherited (line below)
 		for rna_func in rna_functions_dict[identifier]:
-			write_func(rna_func, ident+'\t', out, 'FUNCTION')
+			if rna_func not in rna_base_func_keys:
+				write_func(rna_func, ident+'\t', out, 'FUNCTION')
 		
 		out.write('\n')
 		
@@ -331,13 +335,18 @@ def rna2epy(target_path):
 	structs = []
 	for rna_type_name in dir(bpy.types):
 		rna_type = getattr(bpy.types, rna_type_name)
-		if hasattr(rna_type, '__rna__'):
+		
+		try:		rna_struct = rna_type.__rna__
+		except:	rna_struct = None
+		
+		if rna_struct:
 			#if not rna_type_name.startswith('__'):
-			rna_struct = rna_type.__rna__
+			
 			identifier = rna_struct.identifier
 			structs.append( (base_id(rna_struct), identifier, rna_struct) )	
 			
-			
+			# Simple lookup
+			rna_struct_dict[identifier] = rna_struct
 			
 			# Store full rna path 'GameObjectSettings' -> 'Object.GameObjectSettings'
 			rna_full_path_dict[identifier] = full_rna_struct_path(rna_struct)
@@ -395,16 +404,21 @@ def rna2epy(target_path):
 	# precalc vars to avoid a lot of looping
 	for (rna_base, identifier, rna_struct) in structs:
 		
+		if rna_base:
+			rna_base_prop_keys = rna_struct_dict[rna_base].properties.keys() # could cache
+			rna_base_func_keys = [f.identifier for f in rna_struct_dict[rna_base].functions]
+		else:
+			rna_base_prop_keys = []
+			rna_base_func_keys= []
 		
 		# rna_struct_path = full_rna_struct_path(rna_struct)
 		rna_struct_path = rna_full_path_dict[identifier]
 		
 		for rna_prop_identifier, rna_prop in rna_struct.properties.items():
-			if rna_prop_identifier=='RNA':
-				continue
 			
-			if rna_prop_identifier=='rna_type':
-				continue
+			if rna_prop_identifier=='RNA':					continue
+			if rna_prop_identifier=='rna_type':				continue
+			if rna_prop_identifier in rna_base_prop_keys:	continue
 			
 			try:		rna_prop_ptr = rna_prop.fixed_type
 			except:	rna_prop_ptr = None
@@ -413,7 +427,21 @@ def rna2epy(target_path):
 			if rna_prop_ptr:
 				rna_references_dict[rna_prop_ptr.identifier].append( "%s.%s" % (rna_struct_path, rna_prop_identifier) )
 		
-		
+		for rna_func in rna_struct.functions:
+			for rna_prop_identifier, rna_prop in rna_func.parameters.items():
+				
+				if rna_prop_identifier=='RNA':					continue
+				if rna_prop_identifier=='rna_type':				continue
+				if rna_prop_identifier in rna_base_func_keys:	continue
+					
+				
+				try:		rna_prop_ptr = rna_prop.fixed_type
+				except:	rna_prop_ptr = None
+				
+				# Does this property point to me?
+				if rna_prop_ptr:
+					rna_references_dict[rna_prop_ptr.identifier].append( "%s.%s" % (rna_struct_path, rna_func.identifier) )
+			
 		
 		# Store nested children
 		nested = rna_struct.nested

From b0508659f650bce8ed7e7142aa362088c6597d62 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Mon, 17 Aug 2009 17:26:58 +0000
Subject: [PATCH 096/577] 2.5 editmode:

* Added a poll to the editmode operator that checks first that the object is an editable type (no more tabkey on camera, bug reported by DingTo)
---
 source/blender/editors/object/object_edit.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index d4f2493be2b..f8d969d2462 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -3859,6 +3859,16 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
+static int editmode_toggle_poll(bContext *C)
+{
+	Object *ob = CTX_data_active_object(C);
+
+	return ob && (ob->type == OB_MESH || ob->type == OB_ARMATURE ||
+		      ob->type == OB_FONT || ob->type == OB_MBALL ||
+		      ob->type == OB_LATTICE || ob->type == OB_SURF ||
+		      ob->type == OB_CURVE);
+}
+
 void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
 {
 	
@@ -3870,7 +3880,7 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
 	/* api callbacks */
 	ot->exec= editmode_toggle_exec;
 	
-	ot->poll= ED_operator_object_active;
+	ot->poll= editmode_toggle_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;

From 77f60458e28f154b8f3e0b377ef6c8d11b9627f8 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Mon, 17 Aug 2009 17:34:15 +0000
Subject: [PATCH 097/577] 2.5 Particle edit:

* Fixed cursor poll, so the cursor won't show up outside the 3d view
---
 source/blender/editors/physics/editparticle.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 83bf12d651e..0317a500196 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -109,7 +109,8 @@ static int PE_poll(bContext *C)
 
 static int PE_poll_3dview(bContext *C)
 {
-	return PE_poll(C) && CTX_wm_region_view3d(C);
+	return PE_poll(C) && CTX_wm_area(C)->spacetype == SPACE_VIEW3D &&
+		CTX_wm_region(C)->regiontype == RGN_TYPE_WINDOW;
 }
 
 static void PE_free_particle_edit(ParticleSystem *psys)
@@ -2260,7 +2261,7 @@ static void toggle_particle_cursor(bContext *C, int enable)
 		pset->paintcursor = NULL;
 	}
 	else if(enable)
-		pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll, brush_drawcursor, NULL);
+		pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll_3dview, brush_drawcursor, NULL);
 }
 
 /********************* radial control operator *********************/

From e19e654d84ccb697941586df74a42cf3bd13ca96 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Mon, 17 Aug 2009 17:49:33 +0000
Subject: [PATCH 098/577] 2.5/Sculpt:

* Fixed a mem leak with the grab brush
---
 source/blender/editors/sculpt_paint/sculpt.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 9931ae15f23..43d70cfcf7a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1191,12 +1191,15 @@ static float unproject_brush_radius(SculptSession *ss, float offset)
 
 static void sculpt_cache_free(StrokeCache *cache)
 {
+	int i;
 	if(cache->orig_norms)
 		MEM_freeN(cache->orig_norms);
 	if(cache->face_norms)
 		MEM_freeN(cache->face_norms);
 	if(cache->mats)
 		MEM_freeN(cache->mats);
+	for(i = 0; i < 8; ++i) 
+		BLI_freelistN(&cache->grab_active_verts[i]);
 	MEM_freeN(cache);
 }
 

From 6aeb2f687ae1d41715351ef265a0e0a9af06121a Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 17 Aug 2009 18:07:40 +0000
Subject: [PATCH 099/577] - rna sequence sound was referencing unknown struct -
 cmake was using libs that were disabled (whitespace changes too) - unit
 conversion missing checks for % ~ & operators

---
 CMake/macros.cmake                            | 53 ++++++------
 CMakeLists.txt                                | 83 ++++++++++---------
 source/blender/blenkernel/intern/unit.c       |  3 +
 source/blender/makesrna/intern/rna_sequence.c |  2 +-
 4 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index e6c4664b68d..9ba33dfb158 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -42,8 +42,12 @@ MACRO(SETUP_LIBDIRS)
   if(COMMAND cmake_policy)
     CMAKE_POLICY(SET CMP0003 NEW)
   endif(COMMAND cmake_policy)
-  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
-  LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+  
+  LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+  
+  IF(WITH_PYTHON)
+    LINK_DIRECTORIES(${PYTHON_LIBPATH})
+  ENDIF(WITH_PYTHON)
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${ICONV_LIBPATH})
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
@@ -51,6 +55,15 @@ MACRO(SETUP_LIBDIRS)
   IF(WITH_SDL)
     LINK_DIRECTORIES(${SDL_LIBPATH})
   ENDIF(WITH_SDL)
+  IF(WITH_FFMPEG)
+    LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+  ENDIF(WITH_FFMPEG)
+  IF(WITH_OPENEXR)
+    LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+  ENDIF(WITH_OPENEXR)
+  IF(WITH_QUICKTIME)
+    LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
+  ENDIF(WITH_QUICKTIME)
   IF(WITH_OPENAL)
     LINK_DIRECTORIES(${OPENAL_LIBPATH})
   ENDIF(WITH_OPENAL)
@@ -59,7 +72,7 @@ MACRO(SETUP_LIBDIRS)
   ENDIF(WITH_JACK)
   IF(WITH_FFTW3)
     LINK_DIRECTORIES(${FFTW3_LIBPATH})
-  ENDIF(WITH_FFTW3)	
+  ENDIF(WITH_FFTW3)
 
   IF(WIN32)
     LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -71,38 +84,26 @@ MACRO(SETUP_LIBLINKS
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
   #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIBRARY} ${LLIBS})
 
-  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
+  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
 
   # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-
   IF(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-
-            TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-
+    TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+    TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
   ELSE(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-
+    TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
   ENDIF(WIN32)
-
-
+  
   TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${LLIBS})
   TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
 
   # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
 
   IF(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-
-            TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-
-            ELSE(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-
+    TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+    TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+  ELSE(WIN32)
+    TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
   ENDIF(WIN32)
 
   IF(WITH_INTERNATIONAL)
@@ -111,6 +112,9 @@ MACRO(SETUP_LIBLINKS
   IF(WITH_OPENAL)
     TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
   ENDIF(WITH_OPENAL)
+  IF(WITH_FFTW3)  
+    TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
+  ENDIF(WITH_FFTW3)
   IF(WITH_JACK)
     TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
   ENDIF(WITH_JACK)
@@ -133,3 +137,4 @@ MACRO(SETUP_LIBLINKS
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
   ENDIF(WIN32)
 ENDMACRO(SETUP_LIBLINKS)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 029a65eb739..5e72227982d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,24 +53,24 @@ SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
 #-----------------------------------------------------------------------------
 # Set default config options
-OPTION(WITH_PLAYER		"Build Player"						OFF)
-OPTION(WITH_GAMEENGINE		"Enable Game Engine"					ON)
-OPTION(WITH_BULLET		"Enable Bullet (Physics Engine)"			ON)
-OPTION(WITH_INTERNATIONAL	"Enable I18N   (International fonts and text)"		ON)
-OPTION(WITH_ELBEEM		"Enable Elbeem (Fluid Simulation)"			ON)
-OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
-OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
-OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
-OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_PYTHON		"Enable Embedded Python API"				ON)
-OPTION(WITH_SDL			"Enable SDL for sound and joystick support"				ON)
-OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
-OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
-OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
-OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
-OPTION(WITH_FFTW3		"Enable FFTW3 support"				OFF)
-OPTION(WITH_JACK		"Enable Jack Support (http://www.jackaudio.org)"		OFF)
-OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_DDS           "Enable DDS Support" ON)
+OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -102,10 +102,10 @@ IF(UNIX AND NOT APPLE)
   ENDIF(WITH_OPENAL)
 
   IF(WITH_JACK)
-	SET(JACK /usr)
-	SET(JACK_INC ${JACK}/include/jack)
-	SET(JACK_LIB jack)
-	SET(JACK_LIBPATH ${JACK}/lib)
+    SET(JACK /usr)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
   FIND_LIBRARY(INTL_LIBRARY
@@ -239,10 +239,10 @@ IF(WIN32)
   ENDIF(CMAKE_CL_64)
 
   IF(WITH_JACK)
-	SET(JACK ${LIBDIR}/jack)
-	SET(JACK_INC ${JACK}/include/jack)
-	SET(JACK_LIB jack)
-	SET(JACK_LIBPATH ${JACK}/lib)
+    SET(JACK ${LIBDIR}/jack)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
   IF(CMAKE_CL_64)
@@ -268,10 +268,10 @@ IF(WIN32)
   SET(ICONV_LIBPATH ${ICONV}/lib)
   
   IF(WITH_FFTW3)
-      SET(FFTW3 ${LIBDIR}/fftw3)
-      SET(FFTW3_INC ${FFTW3}/include)
-      SET(FFTW3_LIB libfftw)
-      SET(FFTW3_LIBPATH ${FFTW3}/lib)
+    SET(FFTW3 ${LIBDIR}/fftw3)
+    SET(FFTW3_INC ${FFTW3}/include)
+    SET(FFTW3_LIB libfftw)
+    SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
   
   SET(GETTEXT ${LIBDIR}/gettext)
@@ -292,12 +292,12 @@ IF(WIN32)
   SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
   SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   IF (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
   ELSE (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   ENDIF(MSVC80)
   IF (MSVC90)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
   ENDIF(MSVC90)
 
   
@@ -317,9 +317,9 @@ IF(WIN32)
   SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
   IF(CMAKE_CL_64)
-  SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+    SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
   ELSE(CMAKE_CL_64)
-  SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+    SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   ENDIF(CMAKE_CL_64)
 
   SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -355,10 +355,11 @@ IF(WIN32)
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+    SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+    SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)
+  
   SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
 ENDIF(WIN32)
 
@@ -379,10 +380,10 @@ IF(APPLE)
   ENDIF(WITH_OPENAL)
 
   IF(WITH_JACK)
-	SET(JACK /usr)
-	SET(JACK_INC ${JACK}/include/jack)
-	SET(JACK_LIB jack)
-	SET(JACK_LIBPATH ${JACK}/lib)
+    SET(JACK /usr)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
   SET(PYTHON_VERSION 3.1)
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index e56d8f173e5..f8e3b3c5ad2 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -317,11 +317,14 @@ static int ch_is_op(char op)
 	case '*':
 	case '/':
 	case '|':
+	case '&':
+	case '~':
 	case '<':
 	case '>':
 	case '^':
 	case '!':
 	case '=':
+	case '%':
 		return 1;
 	default:
 		return 0;
diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c
index 06f9972d93f..71f5b480061 100644
--- a/source/blender/makesrna/intern/rna_sequence.c
+++ b/source/blender/makesrna/intern/rna_sequence.c
@@ -742,7 +742,7 @@ static void rna_def_sound(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "Sequence");
 
 	prop= RNA_def_property(srna, "sound", PROP_POINTER, PROP_NONE);
-	RNA_def_property_struct_type(prop, "UnknownType");
+	RNA_def_property_struct_type(prop, "Sound");
 	RNA_def_property_ui_text(prop, "Sound", "Sound datablock used by this sequence (RAM audio only).");
 
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);

From 55b6230464a140c62ec4cea4e11a4a05c8910d13 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Mon, 17 Aug 2009 18:37:58 +0000
Subject: [PATCH 100/577] Made texture nodes accessible in the interface.

* Exposed Tex.use_nodes, Tex.nodetree, MTex.which_output in RNA
* Added node controls to texture buttons (Use Nodes and Use Output)
* Made new texture outputs have unique names by default, though unique names still aren't required.

Note: The preview window in the texture buttons only takes which_output into account when in "material" mode, and in the material half of "both" mode; the plain texture display ignores the user's output choice.

This is because ED_preview_draw draws a Tex* and not an MTex* -- still some work to do here.
---
 release/ui/buttons_texture.py                 | 194 ++++++++----------
 source/blender/makesrna/intern/rna_texture.c  |  77 ++++++-
 .../nodes/intern/TEX_nodes/TEX_output.c       |  63 +++++-
 source/blender/nodes/intern/TEX_util.c        |  15 +-
 4 files changed, 232 insertions(+), 117 deletions(-)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 51a90b2c9ee..a1b89bec0ce 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -7,7 +7,8 @@ class TextureButtonsPanel(bpy.types.Panel):
 	__context__ = "texture"
 	
 	def poll(self, context):
-		return (context.texture and context.texture.type != 'NONE')
+		tex = context.texture
+		return (tex and (tex.type != 'NONE' or tex.use_nodes))
 		
 class TEXTURE_PT_preview(TextureButtonsPanel):
 	__label__ = "Preview"
@@ -31,7 +32,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel):
 			layout.template_preview(tex, parent=br)
 		else:
 			layout.template_preview(tex)
-
+			
 class TEXTURE_PT_context_texture(TextureButtonsPanel):
 	__show_header__ = False
 
@@ -61,25 +62,62 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel):
 		elif tex:
 			split.template_ID(space, "pin_id")
 
-		if (not space.pin_id) and (	context.sculpt_object or \
-									context.vertex_paint_object or \
-									context.weight_paint_object or \
-									context.texture_paint_object \
-									):
+		if (not space.pin_id) and (
+			context.sculpt_object or
+			context.vertex_paint_object or
+			context.weight_paint_object or
+			context.texture_paint_object
+		):
 			split.itemR(space, "brush_texture", text="Brush", toggle=True)
 
 		if tex:
+			layout.itemR(tex, "use_nodes")
+			
 			split = layout.split(percentage=0.2)
-		
-			split.itemL(text="Type:")
-			split.itemR(tex, "type", text="")
+			
+			if tex.use_nodes:
+				slot = context.texture_slot
+				split.itemL(text="Output:")
+				split.itemR(slot, "output_node", text="")
 
-class TEXTURE_PT_mapping(TextureButtonsPanel):
+			else:
+				split.itemL(text="Type:")
+				split.itemR(tex, "type", text="")
+			
+class TEXTURE_PT_colors(TextureButtonsPanel):
+	__label__ = "Colors"
+	__default_closed__ = True
+
+	def draw(self, context):
+		layout = self.layout
+		
+		tex = context.texture
+
+		layout.itemR(tex, "use_color_ramp", text="Ramp")
+		if tex.use_color_ramp:
+			layout.template_color_ramp(tex.color_ramp, expand=True)
+
+		split = layout.split()
+		
+		split.itemR(tex, "rgb_factor", text="Multiply RGB")
+
+		col = split.column()
+		col.itemL(text="Adjust:")
+		col.itemR(tex, "brightness")
+		col.itemR(tex, "contrast")
+			
+# Texture Slot Panels #
+			
+class TextureSlotPanel(TextureButtonsPanel):
+	def poll(self, context):
+		return (
+			context.texture_slot and 
+			TextureButtonsPanel.poll(self, context)
+		)
+				
+class TEXTURE_PT_mapping(TextureSlotPanel):
 	__label__ = "Mapping"
 	
-	def poll(self, context):
-		return (context.texture_slot and context.texture and context.texture.type != 'NONE')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -150,12 +188,9 @@ class TEXTURE_PT_mapping(TextureButtonsPanel):
 			row.column().itemR(tex, "offset")
 			row.column().itemR(tex, "size")
 
-class TEXTURE_PT_influence(TextureButtonsPanel):
+class TEXTURE_PT_influence(TextureSlotPanel):
 	__label__ = "Influence"
 	
-	def poll(self, context):
-		return (context.texture_slot and context.texture and context.texture.type != 'NONE' and (not context.brush))
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -235,36 +270,16 @@ class TEXTURE_PT_influence(TextureButtonsPanel):
 		if ma or wo:
 			col.itemR(tex, "default_value", text="DVar", slider=True)
 
-class TEXTURE_PT_colors(TextureButtonsPanel):
-	__label__ = "Colors"
-	__default_closed__ = True
-
-	def draw(self, context):
-		layout = self.layout
-		
-		tex = context.texture
-
-		layout.itemR(tex, "use_color_ramp", text="Ramp")
-		if tex.use_color_ramp:
-			layout.template_color_ramp(tex.color_ramp, expand=True)
-
-		split = layout.split()
-		
-		split.itemR(tex, "rgb_factor", text="Multiply RGB")
-
-		col = split.column()
-		col.itemL(text="Adjust:")
-		col.itemR(tex, "brightness")
-		col.itemR(tex, "contrast")
-		
 # Texture Type Panels #
 
-class TEXTURE_PT_clouds(TextureButtonsPanel):
-	__label__ = "Clouds"
-	
+class TextureTypePanel(TextureButtonsPanel):
 	def poll(self, context):
 		tex = context.texture
-		return (tex and tex.type == 'CLOUDS')
+		return (tex and tex.type == self.tex_type and not tex.use_nodes)
+
+class TEXTURE_PT_clouds(TextureTypePanel):
+	__label__ = "Clouds"
+	tex_type = 'CLOUDS'
 
 	def draw(self, context):
 		layout = self.layout
@@ -281,12 +296,9 @@ class TEXTURE_PT_clouds(TextureButtonsPanel):
 		flow.itemR(tex, "noise_depth", text="Depth")
 		flow.itemR(tex, "nabla", text="Nabla")
 
-class TEXTURE_PT_wood(TextureButtonsPanel):
+class TEXTURE_PT_wood(TextureTypePanel):
 	__label__ = "Wood"
-	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'WOOD')
+	tex_type = 'WOOD'
 
 	def draw(self, context):
 		layout = self.layout
@@ -308,13 +320,10 @@ class TEXTURE_PT_wood(TextureButtonsPanel):
 		flow.itemR(tex, "turbulence")
 		flow.itemR(tex, "nabla")
 		
-class TEXTURE_PT_marble(TextureButtonsPanel):
+class TEXTURE_PT_marble(TextureTypePanel):
 	__label__ = "Marble"
+	tex_type = 'MARBLE'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'MARBLE')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -332,13 +341,10 @@ class TEXTURE_PT_marble(TextureButtonsPanel):
 		flow.itemR(tex, "turbulence")
 		flow.itemR(tex, "nabla")
 
-class TEXTURE_PT_magic(TextureButtonsPanel):
+class TEXTURE_PT_magic(TextureTypePanel):
 	__label__ = "Magic"
+	tex_type = 'MAGIC'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'MAGIC')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -348,13 +354,10 @@ class TEXTURE_PT_magic(TextureButtonsPanel):
 		row.itemR(tex, "noise_depth", text="Depth")
 		row.itemR(tex, "turbulence")
 
-class TEXTURE_PT_blend(TextureButtonsPanel):
+class TEXTURE_PT_blend(TextureTypePanel):
 	__label__ = "Blend"
+	tex_type = 'BLEND'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'BLEND')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -363,13 +366,10 @@ class TEXTURE_PT_blend(TextureButtonsPanel):
 		layout.itemR(tex, "progression")
 		layout.itemR(tex, "flip_axis")
 			
-class TEXTURE_PT_stucci(TextureButtonsPanel):
+class TEXTURE_PT_stucci(TextureTypePanel):
 	__label__ = "Stucci"
+	tex_type = 'STUCCI'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'STUCCI')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -384,13 +384,10 @@ class TEXTURE_PT_stucci(TextureButtonsPanel):
 		row.itemR(tex, "noise_size", text="Size")
 		row.itemR(tex, "turbulence")
 		
-class TEXTURE_PT_image(TextureButtonsPanel):
+class TEXTURE_PT_image(TextureTypePanel):
 	__label__ = "Image"
+	tex_type = 'IMAGE'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'IMAGE')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -398,14 +395,11 @@ class TEXTURE_PT_image(TextureButtonsPanel):
 
 		layout.template_texture_image(tex)
 
-class TEXTURE_PT_image_sampling(TextureButtonsPanel):
+class TEXTURE_PT_image_sampling(TextureTypePanel):
 	__label__ = "Image Sampling"
 	__default_closed__ = True
+	tex_type = 'IMAGE'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'IMAGE')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -449,14 +443,11 @@ class TEXTURE_PT_image_sampling(TextureButtonsPanel):
 			else:
 				col.itemR(tex, "filter_eccentricity", text="Eccentricity")
 
-class TEXTURE_PT_image_mapping(TextureButtonsPanel):
+class TEXTURE_PT_image_mapping(TextureTypePanel):
 	__label__ = "Image Mapping"
 	__default_closed__ = True
+	tex_type = 'IMAGE'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'IMAGE')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -499,13 +490,10 @@ class TEXTURE_PT_image_mapping(TextureButtonsPanel):
 		col.itemR(tex, "crop_max_x", text="X")
 		col.itemR(tex, "crop_max_y", text="Y")
 	
-class TEXTURE_PT_plugin(TextureButtonsPanel):
+class TEXTURE_PT_plugin(TextureTypePanel):
 	__label__ = "Plugin"
+	tex_type = 'PLUGIN'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'PLUGIN')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -513,13 +501,10 @@ class TEXTURE_PT_plugin(TextureButtonsPanel):
 		
 		layout.itemL(text="Nothing yet")
 		
-class TEXTURE_PT_envmap(TextureButtonsPanel):
+class TEXTURE_PT_envmap(TextureTypePanel):
 	__label__ = "Environment Map"
+	tex_type = 'ENVIRONMENT_MAP'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'ENVIRONMENT_MAP')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -527,13 +512,10 @@ class TEXTURE_PT_envmap(TextureButtonsPanel):
 		
 		layout.itemL(text="Nothing yet")
 		
-class TEXTURE_PT_musgrave(TextureButtonsPanel):
+class TEXTURE_PT_musgrave(TextureTypePanel):
 	__label__ = "Musgrave"
+	tex_type = 'MUSGRAVE'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'MUSGRAVE')
-
 	def draw(self, context):
 		layout = self.layout
 		
@@ -563,12 +545,9 @@ class TEXTURE_PT_musgrave(TextureButtonsPanel):
 		row.itemR(tex, "noise_size", text="Size")
 		row.itemR(tex, "nabla")
 
-class TEXTURE_PT_voronoi(TextureButtonsPanel):
+class TEXTURE_PT_voronoi(TextureTypePanel):
 	__label__ = "Voronoi"
-	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'VORONOI')
+	tex_type = 'VORONOI'
 
 	def draw(self, context):
 		layout = self.layout
@@ -600,13 +579,10 @@ class TEXTURE_PT_voronoi(TextureButtonsPanel):
 		row.itemR(tex, "noise_size", text="Size")
 		row.itemR(tex, "nabla")
 			
-class TEXTURE_PT_distortednoise(TextureButtonsPanel):
+class TEXTURE_PT_distortednoise(TextureTypePanel):
 	__label__ = "Distorted Noise"
+	tex_type = 'DISTORTED_NOISE'
 	
-	def poll(self, context):
-		tex = context.texture
-		return (tex and tex.type == 'DISTORTED_NOISE')
-
 	def draw(self, context):
 		layout = self.layout
 		
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index ccb5e5b2f95..76cb9986306 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -36,6 +36,9 @@
 #include "DNA_material_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_world_types.h"
+#include "DNA_node_types.h"
+
+#include "BKE_node.h"
 
 #include "WM_types.h"
 
@@ -107,6 +110,43 @@ static void rna_TextureSlot_name_get(PointerRNA *ptr, char *str)
 		strcpy(str, "");
 }
 
+static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerRNA *ptr, int *free)
+{
+	MTex *mtex= ptr->data;
+	Tex *tex= mtex->tex;
+	EnumPropertyItem *item= NULL;
+	int totitem= 0;
+	
+	if(tex)
+	{
+		bNodeTree *ntree= tex->nodetree;
+		if(ntree)
+		{
+			EnumPropertyItem tmp= {0, "", 0, "", ""};
+			bNode *node;
+			
+			tmp.value = 0;
+			tmp.name = "Not Specified";
+			tmp.identifier = "NOT_SPECIFIED";
+			RNA_enum_item_add(&item, &totitem, &tmp);
+			
+			for(node= ntree->nodes.first; node; node= node->next) {
+				if(node->type == TEX_NODE_OUTPUT) {
+					tmp.value= node->custom1;
+					tmp.name= ((TexNodeOutput*)node->storage)->name;
+					tmp.identifier = tmp.name;
+					RNA_enum_item_add(&item, &totitem, &tmp);
+				}
+			}
+		}
+	}
+	
+	RNA_enum_item_end(&item, &totitem);
+	
+	*free = 1;
+	return item;
+}
+
 static void rna_Texture_use_color_ramp_set(PointerRNA *ptr, int value)
 {
 	Tex *tex= (Tex*)ptr->data;
@@ -118,6 +158,18 @@ static void rna_Texture_use_color_ramp_set(PointerRNA *ptr, int value)
 		tex->coba= add_colorband(0);
 }
 
+void rna_Texture_use_nodes_set(PointerRNA *ptr, int v)
+{
+	Tex *tex= (Tex*)ptr->data;
+	
+	tex->use_nodes = v;
+	tex->type = 0;
+	
+	if(v && tex->nodetree==NULL) {
+		node_texture_default(tex);
+	}
+}
+
 static void rna_ImageTexture_mipmap_set(PointerRNA *ptr, int value)
 {
 	Tex *tex= (Tex*)ptr->data;
@@ -287,6 +339,10 @@ static void rna_def_mtex(BlenderRNA *brna)
 		{MTEX_MAP_MODE_3D, "3D", 0, "3D", ""},
 		{0, NULL, 0, NULL, NULL}};
 
+	static EnumPropertyItem output_node_items[] = {
+		{0, "DUMMY", 0, "Dummy", ""},
+		{0, NULL, 0, NULL, NULL}};
+		
 	srna= RNA_def_struct(brna, "TextureSlot", NULL);
 	RNA_def_struct_sdna(srna, "MTex");
 	RNA_def_struct_ui_text(srna, "Texture Slot", "Texture slot defining the mapping and influence of a texture.");
@@ -373,6 +429,13 @@ static void rna_def_mtex(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, 0, 5, 10, 3);
 	RNA_def_property_ui_text(prop, "Normal Factor", "Amount texture affects normal values.");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "output_node", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "which_output");
+	RNA_def_property_enum_items(prop, output_node_items);
+	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_TextureSlot_output_node_itemf");
+	RNA_def_property_ui_text(prop, "Output Node", "Which output node to use, for node-based textures.");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 }
 
 static void rna_def_filter_size_common(StructRNA *srna) 
@@ -1285,7 +1348,19 @@ static void rna_def_texture(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 2);
 	RNA_def_property_ui_text(prop, "RGB Factor", "");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-
+	
+	/* nodetree */
+	prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_Texture_use_nodes_set");
+	RNA_def_property_ui_text(prop, "Use Nodes", "Make this a node-based texture");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "nodetree");
+	RNA_def_property_ui_text(prop, "Node Tree", "Node tree for node-based textures");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
 	rna_def_animdata_common(srna);
 
 	/* specific types */
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
index 060ea8d7e67..d0538d11900 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
@@ -64,11 +64,64 @@ static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 	}
 }
 
-static void init(bNode* node)
+static void unique_name(bNode *node)
 {
-   TexNodeOutput *tno = MEM_callocN(sizeof(TexNodeOutput), "TEX_output");
-   strcpy(tno->name, "Default");
-   node->storage= tno;
+	TexNodeOutput *tno = (TexNodeOutput *)node->storage;
+	char *new_name = 0;
+	int new_len;
+	int suffix;
+	bNode *i;
+	char *name = tno->name;
+	
+	i = node;
+	while(i->prev) i = i->prev;
+	for(; i; i=i->next) {
+		if(
+			i == node ||
+			i->type != TEX_NODE_OUTPUT ||
+			strcmp(name, ((TexNodeOutput*)(i->storage))->name)
+		)
+			continue;
+		
+		if(!new_name) {
+			int len = strlen(name);
+			if(len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) {
+				new_len = len;
+			} else {
+				suffix = 0;
+				new_len = len + 4;
+				if(new_len > 31)
+					new_len = 31;
+			}
+			
+			new_name = malloc(new_len + 1);
+			strcpy(new_name, name);
+			name = new_name;
+		}
+		sprintf(new_name + new_len - 4, ".%03d", ++suffix);
+	}
+	
+	if(new_name) {
+		strcpy(tno->name, new_name);
+		free(new_name);
+	}
+}
+
+static void init(bNode *node)
+{
+	TexNodeOutput *tno = MEM_callocN(sizeof(TexNodeOutput), "TEX_output");
+	node->storage= tno;
+	
+	strcpy(tno->name, "Default");
+	unique_name(node);
+	ntreeTexAssignIndex(0, node);
+}
+
+static void copy(bNode *orig, bNode *new)
+{
+	node_copy_standard_storage(orig, new);
+	unique_name(new);
+	ntreeTexAssignIndex(0, new);
 }
 
 
@@ -85,6 +138,6 @@ bNodeType tex_node_output= {
 	/* butfunc         */  NULL,
 	/* initfunc        */  init,
 	/* freestoragefunc */  node_free_standard_storage,
-	/* copystoragefunc */  node_copy_standard_storage,  
+	/* copystoragefunc */  copy,  
 	/* id              */  NULL
 };
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index 867e754f960..d25decd4111 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -197,6 +197,10 @@ void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, char do
 	TexResult dummy_texres;
 	TexCallData data;
 	
+	/* 0 means don't care, so just use first */
+	if(which_output == 0)
+		which_output = 1;
+	
 	if(!texres) texres = &dummy_texres;
 	data.coord = coord;
 	data.target = texres;
@@ -270,10 +274,17 @@ char* ntreeTexOutputMenu(bNodeTree *ntree)
 void ntreeTexAssignIndex(struct bNodeTree *ntree, struct bNode *node)
 {
 	bNode *tnode;
-	int index = 0;
+	int index = 1;
+	
+	if(ntree) 
+		tnode = ntree->nodes.first;
+	else {
+		tnode = node;
+		while(tnode->prev) tnode = tnode->prev;
+	}
 	
 	check_index:
-	for(tnode= ntree->nodes.first; tnode; tnode= tnode->next)
+	for(; tnode; tnode= tnode->next)
 		if(tnode->type == TEX_NODE_OUTPUT && tnode != node)
 			if(tnode->custom1 == index) {
 				index ++;

From 912c48442cf661bbc06ef37dd38f52a86eb7d036 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Mon, 17 Aug 2009 19:54:29 +0000
Subject: [PATCH 101/577] 2.5/Ghost:

* Hopefully fixed X tablet support. The name string was not a reliable way of finding tablet anymore, so now we get the type string and search it for 'stylus' and 'eraser'. Still not very robust, but without UI I don't see how to do better.
---
 intern/ghost/intern/GHOST_WindowX11.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index f9774b6df70..88ae8afd0ce 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -42,6 +42,9 @@
 #include <cstring>
 #include <cstdio>
 
+#include <algorithm>
+#include <string>
+
 // For obscure full screen mode stuuf
 // lifted verbatim from blut.
 
@@ -428,7 +431,20 @@ void GHOST_WindowX11::initXInputDevices()
 			old_handler = XSetErrorHandler(ApplicationErrorHandler) ;
 
 			for(int i=0; i<device_count; ++i) {
-				if(!strcasecmp(device_info[i].name, "stylus")) {
+				std::string type = "";
+				
+				if(device_info[i].type) {
+					const char *orig = XGetAtomName(m_display, device_info[i].type);
+					// Make a copy so we can convert to lower case
+					if(orig) {
+						type = orig;
+						XFree((void*)orig);
+						std::transform(type.begin(), type.end(), type.begin(), ::tolower);
+					}
+				}
+
+
+				if(type.find("stylus") != std::string::npos) {
 					m_xtablet.StylusID= device_info[i].id;
 					m_xtablet.StylusDevice = XOpenDevice(m_display, m_xtablet.StylusID);
 
@@ -453,7 +469,7 @@ void GHOST_WindowX11::initXInputDevices()
  						m_xtablet.StylusID= 0;
 					}
 				}
-				if(!strcasecmp(device_info[i].name, "eraser")) {
+				if(type.find("eraser") != std::string::npos) {
 					m_xtablet.EraserID= device_info[i].id;
 					m_xtablet.EraserDevice = XOpenDevice(m_display, m_xtablet.EraserID);
 					if (m_xtablet.EraserDevice == NULL) m_xtablet.EraserID= 0;

From 9f5d25748397aad6a4347f40c7ec6c025dc93129 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 17 Aug 2009 20:04:28 +0000
Subject: [PATCH 102/577] New command line argument to specify render engine

-E <engine>

-E help: lists all available engine and then quits. (blender window might flash open and then disappear. io python scripts need to be read for all engine, so we have to load interface and not do that before like other help options).

When run after -b, only builtin engines are available because of the python scripts not being read correctly bug.
---
 source/creator/creator.c | 43 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 4f7a4afb5a6..5ecd95ecc21 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -177,6 +177,8 @@ static void print_help(void)
 	printf ("        When the filename has no #, The suffix #### is added to the filename\n");
 	printf ("      The frame number will be added at the end of the filename.\n");
 	printf ("      eg: blender -b foobar.blend -o //render_ -F PNG -x 1 -a\n");
+	printf ("    -E <engine>\tSpecify the render engine.\n");
+	printf ("      use -E help to list available engines.\n");
 	printf ("\nFormat options:\n");
 	printf ("    -F <format>\tSet the render format, Valid options are...\n");
 	printf ("    \tTGA IRIS HAMX JPEG MOVIE IRIZ RAWTGA\n");
@@ -692,6 +694,47 @@ int main(int argc, char **argv)
 					printf("\nError: you must specify a path after '-o '.\n");
 				}
 				break;
+			case 'E':
+				a++;
+				if (a < argc)
+				{
+					if (!strcmp(argv[a],"help"))
+					{
+						RenderEngineType *type = NULL;
+
+						for( type = R_engines.first; type; type = type->next )
+						{
+							printf("\t%s\n", type->idname);
+						}
+						exit(0);
+					}
+					else 
+					{
+						if (CTX_data_scene(C)==NULL)
+						{
+							printf("\nError: no blend loaded. order the arguments so '-E ' is after the blend is loaded.\n");
+						}
+						else 
+						{
+							Scene *scene= CTX_data_scene(C);
+							RenderData *rd = &scene->r;
+							RenderEngineType *type = NULL;
+							
+							for( type = R_engines.first; type; type = type->next )
+							{
+								if (!strcmp(argv[a],type->idname))
+								{
+									BLI_strncpy(rd->engine, type->idname, sizeof(rd->engine));
+								}
+							}
+						}
+					}
+				}
+				else
+				{
+					printf("\nEngine not specified.\n");
+				}
+				break;
 			case 'F':
 				a++;
 				if (a < argc){

From f9ceeeede672a634913188c775e020c23170f4e1 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Mon, 17 Aug 2009 20:30:11 +0000
Subject: [PATCH 103/577] Slight refactor of texture nodes.

Delegates now receive a TexParams* instead of float *coords. This gives texture nodes access to dxt, dyt, cfra as well as coords. This fixes the time node and allows nice sampling to be implemented.
---
 source/blender/blenkernel/BKE_node.h          |  2 +-
 .../blender/nodes/intern/TEX_nodes/TEX_at.c   |  8 +-
 .../nodes/intern/TEX_nodes/TEX_bricks.c       | 20 +++--
 .../nodes/intern/TEX_nodes/TEX_checker.c      | 16 ++--
 .../nodes/intern/TEX_nodes/TEX_compose.c      |  6 +-
 .../nodes/intern/TEX_nodes/TEX_coord.c        |  8 +-
 .../nodes/intern/TEX_nodes/TEX_curves.c       | 13 ++-
 .../nodes/intern/TEX_nodes/TEX_decompose.c    | 18 ++--
 .../nodes/intern/TEX_nodes/TEX_distance.c     |  6 +-
 .../nodes/intern/TEX_nodes/TEX_hueSatVal.c    | 12 +--
 .../nodes/intern/TEX_nodes/TEX_image.c        |  8 +-
 .../nodes/intern/TEX_nodes/TEX_invert.c       |  6 +-
 .../blender/nodes/intern/TEX_nodes/TEX_math.c |  8 +-
 .../nodes/intern/TEX_nodes/TEX_mixRgb.c       | 10 +--
 .../nodes/intern/TEX_nodes/TEX_output.c       |  9 +-
 .../blender/nodes/intern/TEX_nodes/TEX_proc.c | 86 +++++++++----------
 .../nodes/intern/TEX_nodes/TEX_rotate.c       | 15 ++--
 .../nodes/intern/TEX_nodes/TEX_scale.c        | 16 ++--
 .../nodes/intern/TEX_nodes/TEX_texture.c      |  9 +-
 .../nodes/intern/TEX_nodes/TEX_translate.c    | 16 ++--
 .../nodes/intern/TEX_nodes/TEX_valToNor.c     | 16 ++--
 .../nodes/intern/TEX_nodes/TEX_valToRgb.c     | 10 +--
 .../nodes/intern/TEX_nodes/TEX_viewer.c       |  2 +-
 source/blender/nodes/intern/TEX_util.c        | 58 +++++++++----
 source/blender/nodes/intern/TEX_util.h        | 23 +++--
 source/blender/render/intern/source/texture.c |  6 +-
 26 files changed, 231 insertions(+), 176 deletions(-)

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 183cdaff0e6..4ac95b61a5e 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -422,7 +422,7 @@ extern struct ListBase node_all_textures;
 /* API */
 int  ntreeTexTagAnimated(struct bNodeTree *ntree);
 void ntreeTexUpdatePreviews( struct bNodeTree* nodetree );
-void ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float *coord, char do_preview, short thread, struct Tex *tex, short which_output, int cfra);
+void ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float *coord, float *dxt, float *dyt, char do_preview, short thread, struct Tex *tex, short which_output, int cfra);
 void ntreeTexCheckCyclics(struct bNodeTree *ntree);
 void ntreeTexAssignIndex(struct bNodeTree *ntree, struct bNode *node);
 char* ntreeTexOutputMenu(struct bNodeTree *ntree);
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_at.c b/source/blender/nodes/intern/TEX_nodes/TEX_at.c
index 80f232ccd0c..4d714d91130 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_at.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_at.c
@@ -38,12 +38,14 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
+	TexParams np = *p;
 	float new_coord[3];
+	np.coord = new_coord;
 	
-	tex_input_vec(new_coord, in[1], coord, thread);
-	tex_input_rgba(out, in[0], new_coord, thread);
+	tex_input_vec(new_coord, in[1], p, thread);
+	tex_input_rgba(out, in[0], &np, thread);
 }
 
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c b/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
index 80cbd6188ee..f1f3b0919ae 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -57,8 +57,10 @@ static float noise(int n) /* fast integer noise */
 	return 0.5f * ((float)nn / 1073741824.0f);
 }
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
+	float *coord = p->coord;
+	
 	float x = coord[0];
 	float y = coord[1];
 	
@@ -71,14 +73,14 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
 	float bricks2[4];
 	float mortar[4];
 	
-	float mortar_thickness = tex_input_value(in[3], coord, thread);
-	float bias             = tex_input_value(in[4], coord, thread);
-	float brick_width      = tex_input_value(in[5], coord, thread);
-	float row_height       = tex_input_value(in[6], coord, thread);
+	float mortar_thickness = tex_input_value(in[3], p, thread);
+	float bias             = tex_input_value(in[4], p, thread);
+	float brick_width      = tex_input_value(in[5], p, thread);
+	float row_height       = tex_input_value(in[6], p, thread);
 	
-	tex_input_rgba(bricks1, in[0], coord, thread);
-	tex_input_rgba(bricks2, in[1], coord, thread);
-	tex_input_rgba(mortar,  in[2], coord, thread);
+	tex_input_rgba(bricks1, in[0], p, thread);
+	tex_input_rgba(bricks2, in[1], p, thread);
+	tex_input_rgba(mortar,  in[2], p, thread);
 	
 	rownum = (int)floor(y / row_height);
 	
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_checker.c b/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
index 60357782e25..b889f1e2164 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -40,12 +40,12 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	float x  = coord[0];
-	float y  = coord[1];
-	float z  = coord[2];
-	float sz = tex_input_value(in[2], coord, thread);
+	float x  = p->coord[0];
+	float y  = p->coord[1];
+	float z  = p->coord[2];
+	float sz = tex_input_value(in[2], p, thread);
 	
 	/* 0.00001  because of unit sized stuff */
 	int xi = (int)fabs(floor(0.00001 + x / sz));
@@ -53,9 +53,9 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
 	int zi = (int)fabs(floor(0.00001 + z / sz));
 	
 	if( (xi % 2 == yi % 2) == (zi % 2) ) {
-		tex_input_rgba(out, in[0], coord, thread);
+		tex_input_rgba(out, in[0], p, thread);
 	} else {
-		tex_input_rgba(out, in[1], coord, thread);
+		tex_input_rgba(out, in[1], p, thread);
 	} 
 }
 
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_compose.c b/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
index 26576befa3e..9fc4b2ff7c2 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -40,11 +40,11 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	int i;
 	for(i = 0; i < 4; i++)
-		out[i] = tex_input_value(in[i], coord, thread);
+		out[i] = tex_input_value(in[i], p, thread);
 }
 
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_coord.c b/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
index da487c190af..e5c2b309fb3 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
@@ -33,11 +33,11 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void vectorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void vectorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	out[0] = coord[0];
-	out[1] = coord[1];
-	out[2] = coord[2];
+	out[0] = p->coord[0];
+	out[1] = p->coord[1];
+	out[2] = p->coord[2];
 }
 
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_curves.c b/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
index 7d1366b5b18..61ebcea7360 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -36,14 +36,13 @@ static bNodeSocketType time_outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void time_colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void time_colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	/* stack order output: fac */
 	float fac= 0.0f;
 	
-	// XXX SOLVE! these functions should get the TexCallData pointer
-//	if(node->custom1 < node->custom2)
-//		fac = (scene->r.cfra - node->custom1)/(float)(node->custom2-node->custom1);
+	if(node->custom1 < node->custom2)
+		fac = (p->cfra - node->custom1)/(float)(node->custom2-node->custom1);
 	
 	fac = curvemapping_evaluateF(node->storage, 0, fac);
 	out[0] = CLAMPIS(fac, 0.0f, 1.0f);
@@ -90,10 +89,10 @@ static bNodeSocketType rgb_outputs[]= {
 	{	-1, 0, ""	}
 };
 
-static void rgb_colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void rgb_colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float cin[4];
-	tex_input_rgba(cin, in[0], coord, thread);
+	tex_input_rgba(cin, in[0], p, thread);
 	
 	curvemapping_evaluateRGBF(node->storage, out, cin);
 	out[3] = cin[3];
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c b/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
index c08eb12a18f..f7a409f0230 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -41,27 +41,27 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void valuefn_r(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valuefn_r(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	tex_input_rgba(out, in[0], coord, thread);
+	tex_input_rgba(out, in[0], p, thread);
 	*out = out[0];
 }
 
-static void valuefn_g(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valuefn_g(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	tex_input_rgba(out, in[0], coord, thread);
+	tex_input_rgba(out, in[0], p, thread);
 	*out = out[1];
 }
 
-static void valuefn_b(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valuefn_b(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	tex_input_rgba(out, in[0], coord, thread);
+	tex_input_rgba(out, in[0], p, thread);
 	*out = out[2];
 }
 
-static void valuefn_a(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valuefn_a(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	tex_input_rgba(out, in[0], coord, thread);
+	tex_input_rgba(out, in[0], p, thread);
 	*out = out[3];
 }
 
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_distance.c b/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
index d23eb6bc589..4e145e26b72 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
@@ -41,12 +41,12 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void valuefn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float coord1[3], coord2[3];
 
-	tex_input_vec(coord1, in[0], coord, thread);
-	tex_input_vec(coord2, in[1], coord, thread);
+	tex_input_vec(coord1, in[0], p, thread);
+	tex_input_vec(coord2, in[1], p, thread);
 
 	*out = VecLenf(coord2, coord1);
 }
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c b/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
index bb1a49fb235..192c7a39ee8 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
@@ -65,15 +65,15 @@ static void do_hue_sat_fac(bNode *node, float *out, float hue, float sat, float
 	}
 }
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {	
-	float hue = tex_input_value(in[0], coord, thread);
-	float sat = tex_input_value(in[1], coord, thread);
-	float val = tex_input_value(in[2], coord, thread);
-	float fac = tex_input_value(in[3], coord, thread);
+	float hue = tex_input_value(in[0], p, thread);
+	float sat = tex_input_value(in[1], p, thread);
+	float val = tex_input_value(in[2], p, thread);
+	float fac = tex_input_value(in[3], p, thread);
 	
 	float col[4];
-	tex_input_rgba(col, in[4], coord, thread);
+	tex_input_rgba(col, in[4], p, thread);
 	
 	hue += 0.5f; /* [-.5, .5] -> [0, 1] */
 	
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_image.c b/source/blender/nodes/intern/TEX_nodes/TEX_image.c
index b84088da154..0a55af70b52 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_image.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_image.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -34,10 +34,10 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	float x = coord[0];
-	float y = coord[1];
+	float x = p->coord[0];
+	float y = p->coord[1];
 	Image *ima= (Image *)node->id;
 	ImageUser *iuser= (ImageUser *)node->storage;
 	
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_invert.c b/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
index 09716951009..5663f897ff5 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -39,11 +39,11 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" } 
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float col[4];
 	
-	tex_input_rgba(col, in[0], coord, thread);
+	tex_input_rgba(col, in[0], p, thread);
 
 	col[0] = 1.0f - col[0];
 	col[1] = 1.0f - col[1];
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_math.c b/source/blender/nodes/intern/TEX_nodes/TEX_math.c
index bac91fc0901..4ee04140fca 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_math.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_math.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -42,10 +42,10 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" } 
 };
 
-static void valuefn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	float in0 = tex_input_value(in[0], coord, thread);
-	float in1 = tex_input_value(in[1], coord, thread);
+	float in0 = tex_input_value(in[0], p, thread);
+	float in1 = tex_input_value(in[1], p, thread);
 	
 	switch(node->custom1){ 
 	
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c b/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
index b1ccb7a3d07..24bdde70127 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -41,13 +41,13 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
-	float fac  = tex_input_value(in[0], coord, thread);
+	float fac  = tex_input_value(in[0], p, thread);
 	float col1[4], col2[4];
 	
-	tex_input_rgba(col1, in[1], coord, thread);
-	tex_input_rgba(col2, in[2], coord, thread);
+	tex_input_rgba(col1, in[1], p, thread);
+	tex_input_rgba(col2, in[2], p, thread);
 	
 	CLAMP(fac, 0.0f, 1.0f);
 	
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
index d0538d11900..355de796c7e 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -49,14 +49,17 @@ static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 	if(!cdata->do_preview) {
 		if(cdata->which_output == node->custom1)
 		{
-			tex_input_rgba(&target->tr, in[0], cdata->coord, cdata->thread);
+			TexParams params;
+			params_from_cdata(&params, cdata);
+			
+			tex_input_rgba(&target->tr, in[0], &params, cdata->thread);
 		
 			target->tin = (target->tr + target->tg + target->tb) / 3.0f;
 			target->talpha = 1.0f;
 		
 			if(target->nor) {
 				if(in[1]->hasinput)
-					tex_input_vec(target->nor, in[1], cdata->coord, cdata->thread);
+					tex_input_vec(target->nor, in[1], &params, cdata->thread);
 				else
 					target->nor = 0;
 			}
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_proc.c b/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
index ec65cf186a8..ce7324e2085 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -51,7 +51,7 @@ static bNodeSocketType outputs_color_only[]= {
 	{ SOCK_RGBA, 1, "Color 2", 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f }
 
 /* Calls multitex and copies the result to the outputs. Called by xxx_exec, which handles inputs. */
-static void do_proc(float *result, float *coord, float *col1, float *col2, char is_normal, Tex *tex, short thread)
+static void do_proc(float *result, TexParams *p, float *col1, float *col2, char is_normal, Tex *tex, short thread)
 {
 	TexResult texres;
 	int textype;
@@ -62,7 +62,7 @@ static void do_proc(float *result, float *coord, float *col1, float *col2, char
 	else
 		texres.nor = NULL;
 	
-	textype = multitex_thread(tex, coord, 0, 0, 0, &texres, thread, 0);
+	textype = multitex_thread(tex, p->coord, p->dxt, p->dyt, 0, &texres, thread, 0);
 	
 	if(is_normal)
 		return;
@@ -76,11 +76,11 @@ static void do_proc(float *result, float *coord, float *col1, float *col2, char
 	}
 }
 
-typedef void (*MapFn) (Tex *tex, bNodeStack **in, float *coord, short thread);
+typedef void (*MapFn) (Tex *tex, bNodeStack **in, TexParams *p, short thread);
 
 static void texfn(
 	float *result, 
-	float *coord, 
+	TexParams *p,
 	bNode *node, 
 	bNodeStack **in,
 	char is_normal, 
@@ -89,12 +89,12 @@ static void texfn(
 {
 	Tex tex = *((Tex*)(node->storage));
 	float col1[4], col2[4];
-	tex_input_rgba(col1, in[0], coord, thread);
-	tex_input_rgba(col2, in[1], coord, thread);
+	tex_input_rgba(col1, in[0], p, thread);
+	tex_input_rgba(col2, in[1], p, thread);
 	
-	map_inputs(&tex, in, coord, thread);
+	map_inputs(&tex, in, p, thread);
 	
-	do_proc(result, coord, col1, col2, is_normal, &tex, thread);
+	do_proc(result, p, col1, col2, is_normal, &tex, thread);
 }
 
 static int count_outputs(bNode *node)
@@ -110,17 +110,17 @@ static int count_outputs(bNode *node)
 /* Boilerplate generators */
 
 #define ProcNoInputs(name) \
-        static void name##_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread) \
+        static void name##_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread) \
         {}
 
 #define ProcDef(name) \
-        static void name##_colorfn(float *result, float *coord, bNode *node, bNodeStack **in, short thread)  \
+        static void name##_colorfn(float *result, TexParams *p, bNode *node, bNodeStack **in, short thread)  \
         {                                                                                                    \
-                texfn(result, coord, node, in, 0, &name##_map_inputs, thread);                               \
+                texfn(result, p, node, in, 0, &name##_map_inputs, thread);                               \
         }                                                                                                    \
-        static void name##_normalfn(float *result, float *coord, bNode *node, bNodeStack **in, short thread) \
+        static void name##_normalfn(float *result, TexParams *p, bNode *node, bNodeStack **in, short thread) \
         {                                                                                                    \
-                texfn(result, coord, node, in, 1, &name##_map_inputs, thread);                               \
+                texfn(result, p, node, in, 1, &name##_map_inputs, thread);                               \
         }                                                                                                    \
         static void name##_exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)                  \
         {                                                                                                    \
@@ -144,15 +144,15 @@ static bNodeSocketType voronoi_inputs[]= {
 	
 	{ -1, 0, "" }
 };
-static void voronoi_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void voronoi_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->vn_w1 = tex_input_value(in[I+0], coord, thread);
-	tex->vn_w2 = tex_input_value(in[I+1], coord, thread);
-	tex->vn_w3 = tex_input_value(in[I+2], coord, thread);
-	tex->vn_w4 = tex_input_value(in[I+3], coord, thread);
+	tex->vn_w1 = tex_input_value(in[I+0], p, thread);
+	tex->vn_w2 = tex_input_value(in[I+1], p, thread);
+	tex->vn_w3 = tex_input_value(in[I+2], p, thread);
+	tex->vn_w4 = tex_input_value(in[I+3], p, thread);
 	
-	tex->ns_outscale = tex_input_value(in[I+4], coord, thread);
-	tex->noisesize   = tex_input_value(in[I+5], coord, thread);
+	tex->ns_outscale = tex_input_value(in[I+4], p, thread);
+	tex->noisesize   = tex_input_value(in[I+5], p, thread);
 }
 ProcDef(voronoi)
 
@@ -170,9 +170,9 @@ static bNodeSocketType magic_inputs[]= {
 	{ SOCK_VALUE, 1, "Turbulence", 5.0f, 0.0f, 0.0f, 0.0f,   0.0f, 200.0f },
 	{ -1, 0, "" }
 };
-static void magic_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void magic_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->turbul = tex_input_value(in[I+0], coord, thread);
+	tex->turbul = tex_input_value(in[I+0], p, thread);
 }
 ProcDef(magic)
 
@@ -183,10 +183,10 @@ static bNodeSocketType marble_inputs[]= {
 	{ SOCK_VALUE, 1, "Turbulence", 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f },
 	{ -1, 0, "" }
 };
-static void marble_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void marble_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->noisesize = tex_input_value(in[I+0], coord, thread);
-	tex->turbul    = tex_input_value(in[I+1], coord, thread);
+	tex->noisesize = tex_input_value(in[I+0], p, thread);
+	tex->turbul    = tex_input_value(in[I+1], p, thread);
 }
 ProcDef(marble)
 
@@ -196,9 +196,9 @@ static bNodeSocketType clouds_inputs[]= {
 	{ SOCK_VALUE, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f },
 	{ -1, 0, "" }
 };
-static void clouds_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void clouds_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->noisesize = tex_input_value(in[I+0], coord, thread);
+	tex->noisesize = tex_input_value(in[I+0], p, thread);
 }
 ProcDef(clouds)
 
@@ -209,10 +209,10 @@ static bNodeSocketType distnoise_inputs[]= {
 	{ SOCK_VALUE, 1, "Distortion", 1.00f, 0.0f, 0.0f, 0.0f,   0.0000f, 10.0f },
 	{ -1, 0, "" }
 };
-static void distnoise_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void distnoise_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->noisesize   = tex_input_value(in[I+0], coord, thread);
-	tex->dist_amount = tex_input_value(in[I+1], coord, thread);
+	tex->noisesize   = tex_input_value(in[I+0], p, thread);
+	tex->dist_amount = tex_input_value(in[I+1], p, thread);
 }
 ProcDef(distnoise)
 
@@ -223,10 +223,10 @@ static bNodeSocketType wood_inputs[]= {
 	{ SOCK_VALUE, 1, "Turbulence", 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f },
 	{ -1, 0, "" }
 };
-static void wood_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void wood_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->noisesize = tex_input_value(in[I+0], coord, thread);
-	tex->turbul    = tex_input_value(in[I+1], coord, thread);
+	tex->noisesize = tex_input_value(in[I+0], p, thread);
+	tex->turbul    = tex_input_value(in[I+1], p, thread);
 }
 ProcDef(wood)
 
@@ -241,13 +241,13 @@ static bNodeSocketType musgrave_inputs[]= {
 	{ SOCK_VALUE, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,  0.0001f, 2.0f },
 	{ -1, 0, "" }
 };
-static void musgrave_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void musgrave_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->mg_H          = tex_input_value(in[I+0], coord, thread);
-	tex->mg_lacunarity = tex_input_value(in[I+1], coord, thread);
-	tex->mg_octaves    = tex_input_value(in[I+2], coord, thread);
-	tex->ns_outscale   = tex_input_value(in[I+3], coord, thread);
-	tex->noisesize     = tex_input_value(in[I+4], coord, thread);
+	tex->mg_H          = tex_input_value(in[I+0], p, thread);
+	tex->mg_lacunarity = tex_input_value(in[I+1], p, thread);
+	tex->mg_octaves    = tex_input_value(in[I+2], p, thread);
+	tex->ns_outscale   = tex_input_value(in[I+3], p, thread);
+	tex->noisesize     = tex_input_value(in[I+4], p, thread);
 }
 ProcDef(musgrave)
 
@@ -266,10 +266,10 @@ static bNodeSocketType stucci_inputs[]= {
 	{ SOCK_VALUE, 1, "Turbulence", 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f },
 	{ -1, 0, "" }
 };
-static void stucci_map_inputs(Tex *tex, bNodeStack **in, float *coord, short thread)
+static void stucci_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
 {
-	tex->noisesize = tex_input_value(in[I+0], coord, thread);
-	tex->turbul    = tex_input_value(in[I+1], coord, thread);
+	tex->noisesize = tex_input_value(in[I+0], p, thread);
+	tex->turbul    = tex_input_value(in[I+1], p, thread);
 }
 ProcDef(stucci)
 
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
index 3a2c2b1def1..0fd95642be6 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -42,9 +42,10 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" } 
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float new_coord[3];
+	float *coord = p->coord;
 	
 	float ax[4];
 	float para[3];
@@ -53,13 +54,13 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
 	
 	float magsq, ndx;
 	
-	float a = tex_input_value(in[1], coord, thread);
+	float a = tex_input_value(in[1], p, thread);
 	float cos_a = cos(a * 2 * M_PI);
 	float sin_a = sin(a * 2 * M_PI);
 	
 	// x' = xcosa + n(n.x)(1-cosa)+(x*n)sina
 	
-	tex_input_vec(ax, in[2], coord, thread);
+	tex_input_vec(ax, in[2], p, thread);
 	magsq = ax[0]*ax[0] + ax[1]*ax[1] + ax[2]*ax[2];
 	
 	if(magsq == 0) magsq = 1;
@@ -86,7 +87,11 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
 	new_coord[1] = para[1] + perp[1] + cp[1];
 	new_coord[2] = para[2] + perp[2] + cp[2];
 	
-	tex_input_rgba(out, in[0], new_coord, thread);
+	{
+		TexParams np = *p;
+		np.coord = new_coord;
+		tex_input_rgba(out, in[0], &np, thread);
+	}
 }
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out) 
 {
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_scale.c b/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
index 792c3468e9f..3d4415365aa 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -40,17 +40,19 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" } 
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float scale[3], new_coord[3];
+	TexParams np = *p;
+	np.coord = new_coord;
 	
-	tex_input_vec(scale, in[1], coord, thread);
+	tex_input_vec(scale, in[1], p, thread);
 	
-	new_coord[0] = coord[0] * scale[0];
-	new_coord[1] = coord[1] * scale[1];
-	new_coord[2] = coord[2] * scale[2];
+	new_coord[0] = p->coord[0] * scale[0];
+	new_coord[1] = p->coord[1] * scale[1];
+	new_coord[2] = p->coord[2] * scale[2];
 	
-	tex_input_rgba(out, in[0], new_coord, thread);
+	tex_input_rgba(out, in[0], &np, thread);
 }
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out) 
 {
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
index 30492b84764..0ca80a82271 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -40,10 +40,11 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" }
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	static float red[] = {1,0,0,1};
 	static float white[] = {1,1,1,1};
+	float *coord = p->coord;
 	
 	Tex *nodetex = (Tex *)node->id;
 	
@@ -60,8 +61,8 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
 		float nor[] = {0,0,0};
 		float col1[4], col2[4];
 		
-		tex_input_rgba(col1, in[0], coord, thread);
-		tex_input_rgba(col2, in[1], coord, thread);
+		tex_input_rgba(col1, in[0], p, thread);
+		tex_input_rgba(col2, in[1], p, thread);
 		
 		texres.nor = nor;
 		textype = multitex_ext(nodetex, coord, 0, 0, 0, &texres);
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_translate.c b/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
index cadd27612f4..ba3dcfa27a2 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -40,17 +40,19 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" } 
 };
 
-static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float offset[3], new_coord[3];
+	TexParams np = *p;
+	np.coord = new_coord;
 	
-	tex_input_vec(offset, in[1], coord, thread);
+	tex_input_vec(offset, in[1], p, thread);
 	
-	new_coord[0] = coord[0] + offset[0];
-	new_coord[1] = coord[1] + offset[1];
-	new_coord[2] = coord[2] + offset[2];
+	new_coord[0] = p->coord[0] + offset[0];
+	new_coord[1] = p->coord[1] + offset[1];
+	new_coord[2] = p->coord[2] + offset[2];
 	
-	tex_input_rgba(out, in[0], new_coord, thread);
+	tex_input_rgba(out, in[0], &np, thread);
 }
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out) 
 {
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c b/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
index 0d24652a8f6..75b88c3a460 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
@@ -39,28 +39,32 @@ static bNodeSocketType outputs[]= {
 	{ -1, 0, "" } 
 };
 
-static void normalfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void normalfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float new_coord[3];
+	float *coord = p->coord;
 
-	float nabla = tex_input_value(in[1], coord, thread);	
+	float nabla = tex_input_value(in[1], p, thread);	
 	float val;
 	float nor[3];
+	
+	TexParams np = *p;
+	np.coord = new_coord;
 
-	val = tex_input_value(in[0], coord, thread);
+	val = tex_input_value(in[0], p, thread);
 
 	new_coord[0] = coord[0] + nabla;
 	new_coord[1] = coord[1];
 	new_coord[2] = coord[2];
-	nor[0] = tex_input_value(in[0], new_coord, thread);
+	nor[0] = tex_input_value(in[0], &np, thread);
 
 	new_coord[0] = coord[0];
 	new_coord[1] = coord[1] + nabla;
-	nor[1] = tex_input_value(in[0], new_coord, thread);
+	nor[1] = tex_input_value(in[0], &np, thread);
 	
 	new_coord[1] = coord[1];
 	new_coord[2] = coord[2] + nabla;
-	nor[2] = tex_input_value(in[0], new_coord, thread);
+	nor[2] = tex_input_value(in[0], &np, thread);
 
 	out[0] = val-nor[0];
 	out[1] = val-nor[1];
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c b/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
index 71d9cb07e18..90a444bcff0 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -39,10 +39,10 @@ static bNodeSocketType valtorgb_out[]= {
 	{	-1, 0, ""	}
 };
 
-static void valtorgb_colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void valtorgb_colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	if(node->storage) {
-		float fac = tex_input_value(in[0], coord, thread);
+		float fac = tex_input_value(in[0], p, thread);
 
 		do_colorband(node->storage, fac, out);
 	}
@@ -87,10 +87,10 @@ static bNodeSocketType rgbtobw_out[]= {
 };
 
 
-static void rgbtobw_valuefn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+static void rgbtobw_valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
 {
 	float cin[4];
-	tex_input_rgba(cin, in[0], coord, thread);
+	tex_input_rgba(cin, in[0], p, thread);
 	
 	*out = cin[0] * 0.35f + cin[1] * 0.45f + cin[2] * 0.2f;
 }
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c b/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
index acdaacf873c..2d29b03b38c 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
@@ -21,7 +21,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Robin Allen
  *
  * ***** END GPL LICENSE BLOCK *****
  */
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index d25decd4111..b88efb47990 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -47,17 +47,17 @@
 
 #define PREV_RES 128 /* default preview resolution */
 
-void tex_call_delegate(TexDelegate *dg, float *out, float *coord, short thread)
+void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, short thread)
 {
 	if(dg->node->need_exec)
-		dg->fn(out, coord, dg->node, dg->in, thread);
+		dg->fn(out, params, dg->node, dg->in, thread);
 }
 
-void tex_input(float *out, int sz, bNodeStack *in, float *coord, short thread)
+void tex_input(float *out, int sz, bNodeStack *in, TexParams *params, short thread)
 {
 	TexDelegate *dg = in->data;
 	if(dg) {
-		tex_call_delegate(dg, in->vec, coord, thread);
+		tex_call_delegate(dg, in->vec, params, thread);
 	
 		if(in->hasoutput && in->sockettype == SOCK_VALUE)
 			in->vec[1] = in->vec[2] = in->vec[0];
@@ -65,14 +65,14 @@ void tex_input(float *out, int sz, bNodeStack *in, float *coord, short thread)
 	memcpy(out, in->vec, sz * sizeof(float));
 }
 
-void tex_input_vec(float *out, bNodeStack *in, float *coord, short thread)
+void tex_input_vec(float *out, bNodeStack *in, TexParams *params, short thread)
 {
-	tex_input(out, 3, in, coord, thread);
+	tex_input(out, 3, in, params, thread);
 }
 
-void tex_input_rgba(float *out, bNodeStack *in, float *coord, short thread)
+void tex_input_rgba(float *out, bNodeStack *in, TexParams *params, short thread)
 {
-	tex_input(out, 4, in, coord, thread);
+	tex_input(out, 4, in, params, thread);
 	
 	if(in->hasoutput && in->sockettype == SOCK_VALUE)
 	{
@@ -88,10 +88,10 @@ void tex_input_rgba(float *out, bNodeStack *in, float *coord, short thread)
 	}
 }
 
-float tex_input_value(bNodeStack *in, float *coord, short thread)
+float tex_input_value(bNodeStack *in, TexParams *params, short thread)
 {
 	float out[4];
-	tex_input_vec(out, in, coord, thread);
+	tex_input_vec(out, in, params, thread);
 	return out[0];
 }
 
@@ -121,11 +121,21 @@ static void init_preview(bNode *node)
 	}
 }
 
+void params_from_cdata(TexParams *out, TexCallData *in)
+{
+	out->coord = in->coord;
+	out->dxt = in->dxt;
+	out->dyt = in->dyt;
+	out->cfra = in->cfra;
+}
+
 void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata)
 {
 	int x, y;
 	float *result;
 	bNodePreview *preview;
+	float coord[3] = {0, 0, 0};
+	TexParams params;
 	
 	if(!cdata->do_preview)
 		return;
@@ -137,15 +147,20 @@ void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata)
 	
 	preview = node->preview;
 	
+	params.dxt = 0;
+	params.dyt = 0;
+	params.cfra = 0; /* XXX Use current? */
+	params.coord = coord;
+	
 	for(x=0; x<preview->xsize; x++)
 	for(y=0; y<preview->ysize; y++)
 	{
-		cdata->coord[0] = ((float) x / preview->xsize) * 2 - 1;
-		cdata->coord[1] = ((float) y / preview->ysize) * 2 - 1;
+		params.coord[0] = ((float) x / preview->xsize) * 2 - 1;
+		params.coord[1] = ((float) y / preview->ysize) * 2 - 1;
 		
 		result = preview->rect + 4 * (preview->xsize*y + x);
 		
-		tex_input_rgba(result, ns, cdata->coord, cdata->thread);
+		tex_input_rgba(result, ns, &params, cdata->thread);
 	}
 }
 
@@ -192,8 +207,17 @@ void ntreeTexCheckCyclics(struct bNodeTree *ntree)
 	}
 }
 
-void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, char do_preview, short thread, Tex *tex, short which_output, int cfra)
-{
+void ntreeTexExecTree(
+	bNodeTree *nodes,
+	TexResult *texres,
+	float *coord,
+	float *dxt, float *dyt,
+	char do_preview, 
+	short thread, 
+	Tex *tex, 
+	short which_output, 
+	int cfra
+){
 	TexResult dummy_texres;
 	TexCallData data;
 	
@@ -203,6 +227,8 @@ void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, char do
 	
 	if(!texres) texres = &dummy_texres;
 	data.coord = coord;
+	data.dxt = dxt;
+	data.dyt = dyt;
 	data.target = texres;
 	data.do_preview = do_preview;
 	data.thread = thread;
@@ -225,7 +251,7 @@ void ntreeTexUpdatePreviews(bNodeTree* nodetree)
 	dummy_texres.nor = 0;
 	
 	ntreeBeginExecTree(nodetree);
-	ntreeTexExecTree(nodetree, &dummy_texres, coord, 1, 0, tex, 0, 0);
+	ntreeTexExecTree(nodetree, &dummy_texres, coord, 0, 0, 1, 0, tex, 0, 0);
 	ntreeEndExecTree(nodetree);
 	
 }
diff --git a/source/blender/nodes/intern/TEX_util.h b/source/blender/nodes/intern/TEX_util.h
index e560aa57921..7fff8d04651 100644
--- a/source/blender/nodes/intern/TEX_util.h
+++ b/source/blender/nodes/intern/TEX_util.h
@@ -71,13 +71,20 @@
 typedef struct TexCallData {
 	TexResult *target;
 	float *coord;
+	float *dxt, *dyt;
 	char do_preview;
 	short thread;
 	short which_output;
 	int cfra;
 } TexCallData;
 
-typedef void(*TexFn) (float *out, float *coord, bNode *node, bNodeStack **in, short thread);
+typedef struct TexParams {
+	float *coord;
+	float *dxt, *dyt;
+	int cfra;
+} TexParams;
+
+typedef void(*TexFn) (float *out, TexParams *params, bNode *node, bNodeStack **in, short thread);
 
 typedef struct TexDelegate {
 	TexFn fn;
@@ -86,16 +93,18 @@ typedef struct TexDelegate {
 	int type;
 } TexDelegate;
 
-void tex_call_delegate(TexDelegate*, float *out, float *coord, short thread);
+void tex_call_delegate(TexDelegate*, float *out, TexParams *params, short thread);
 
-void tex_input_rgba(float *out, bNodeStack *in, float *coord, short thread);
-void tex_input_vec(float *out, bNodeStack *in, float *coord, short thread);
-float tex_input_value(bNodeStack *in, float *coord, short thread);
+void tex_input_rgba(float *out, bNodeStack *in, TexParams *params, short thread);
+void tex_input_vec(float *out, bNodeStack *in, TexParams *params, short thread);
+float tex_input_value(bNodeStack *in, TexParams *params, short thread);
 
 void tex_output(bNode *node, bNodeStack **in, bNodeStack *out, TexFn texfn);
 void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata);
 
 void ntreeTexUpdatePreviews( bNodeTree* nodetree );
-void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, char do_preview, short thread, struct Tex *tex, short which_output, int cfra);
- 
+void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, float *dxt, float *dyt, char do_preview, short thread, struct Tex *tex, short which_output, int cfra);
+
+void params_from_cdata(TexParams *out, TexCallData *in);
+
 #endif
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index bb491efdaba..3db78bfea93 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -714,12 +714,12 @@ static float voronoiTex(Tex *tex, float *texvec, TexResult *texres)
 
 /* ------------------------------------------------------------------------- */
 
-static int evalnodes(Tex *tex, float *texvec, TexResult *texres, short thread, short which_output)
+static int evalnodes(Tex *tex, float *texvec, float *dxt, float *dyt, TexResult *texres, short thread, short which_output)
 {
 	short rv = TEX_INT;
 	bNodeTree *nodes = tex->nodetree;
 	
-	ntreeTexExecTree(nodes, texres, texvec, 0, thread, tex, which_output, R.r.cfra);
+	ntreeTexExecTree(nodes, texres, texvec, dxt, dyt, 0, thread, tex, which_output, R.r.cfra);
 	
 	if(texres->nor) rv |= TEX_NOR;
 	rv |= TEX_RGB;
@@ -1180,7 +1180,7 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
 	texres->talpha= 0;	/* is set when image texture returns alpha (considered premul) */
 	
 	if(tex->use_nodes && tex->nodetree) {
-		retval = evalnodes(tex, texvec, texres, thread, which_output);
+		retval = evalnodes(tex, texvec, dxt, dyt, texres, thread, which_output);
 	}
 	else
 	switch(tex->type) {

From 6412fe4b92f136fd7b9bdb7592476df26c8e46ce Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 17 Aug 2009 22:09:36 +0000
Subject: [PATCH 104/577] * Point density texture works again

---
 release/ui/buttons_texture.py                 |  12 +-
 source/blender/blenkernel/intern/texture.c    |   3 +
 source/blender/blenlib/intern/BLI_kdopbvh.c   | 188 +++++++++---------
 source/blender/blenloader/intern/readfile.c   |  35 ++--
 source/blender/makesdna/DNA_texture_types.h   |   5 +-
 source/blender/makesrna/intern/rna_texture.c  |  58 ++----
 .../render/intern/source/pointdensity.c       |  10 +-
 .../blender/render/intern/source/volumetric.c |   5 +-
 8 files changed, 146 insertions(+), 170 deletions(-)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 5b48fdfbaa4..acd398ed5ff 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -680,8 +680,18 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 		pd = tex.pointdensity
 
 		layout.itemR(pd, "point_source")
-
+		layout.itemR(pd, "object")
+		if pd.point_source == 'PARTICLE_SYSTEM':
+			layout.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
+		layout.itemR(pd, "radius")
 		layout.itemR(pd, "falloff")
+		if pd.falloff == 'SOFT':
+			layout.itemR(pd, "falloff_softness")
+		layout.itemR(pd, "color_source")
+		layout.itemR(pd, "turbulence")
+		layout.itemR(pd, "turbulence_size")
+		layout.itemR(pd, "turbulence_depth")
+		layout.itemR(pd, "turbulence_influence")
 		
 
 bpy.types.register(TEXTURE_PT_context_texture)
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index fc9948f8d95..96e9f54fc0c 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -922,6 +922,8 @@ PointDensity *BKE_add_pointdensity(void)
 	pd->speed_scale = 1.0f;
 	pd->totpoints = 0;
 	pd->coba = add_colorband(1);
+	pd->object = NULL;
+	pd->psys = NULL;
 	return pd;
 } 
 
@@ -982,6 +984,7 @@ struct VoxelData *BKE_add_voxeldata(void)
 	vd->interp_type= TEX_VD_LINEAR;
 	vd->file_format= TEX_VD_SMOKE;
 	vd->int_multiplier = 1.0;
+	vd->object = NULL;
 	
 	return vd;
  }
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 014c3d52cda..08e8a5871cd 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -72,10 +72,10 @@ struct BVHTree
 	char 	start_axis, stop_axis; // KDOP_AXES array indices according to axis
 };
 
-typedef struct BVHOverlapData
-{
-	BVHTree *tree1, *tree2;
-	BVHTreeOverlap *overlap;
+typedef struct BVHOverlapData 
+{  
+	BVHTree *tree1, *tree2; 
+	BVHTreeOverlap *overlap; 
 	int i, max_overlap; /* i is number of overlaps */
 	int start_axis, stop_axis;
 } BVHOverlapData;
@@ -109,7 +109,7 @@ typedef struct BVHRayCastData
 
 ////////////////////////////////////////////////////////////////////////
 // Bounding Volume Hierarchy Definition
-//
+// 
 // Notes: From OBB until 26-DOP --> all bounding volumes possible, just choose type below
 // Notes: You have to choose the type at compile time ITM
 // Notes: You can choose the tree type --> binary, quad, octree, choose below
@@ -188,10 +188,10 @@ int ADJUST_MEMORY(void *local_memblock, void **memblock, int new_size, int *max_
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
-// Introsort
+// Introsort 
 // with permission deriven from the following Java code:
 // http://ralphunden.net/content/tutorials/a-guide-to-introsort/
-// and he derived it from the SUN STL
+// and he derived it from the SUN STL 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 static int size_threshold = 16;
 /*
@@ -362,7 +362,7 @@ static void create_kdop_hull(BVHTree *tree, BVHNode *node, float *co, int numpoi
 	float newminmax;
 	float *bv = node->bv;
 	int i, k;
-
+	
 	// don't init boudings for the moving case
 	if(!moving)
 	{
@@ -372,7 +372,7 @@ static void create_kdop_hull(BVHTree *tree, BVHNode *node, float *co, int numpoi
 			bv[2*i + 1] = -FLT_MAX;
 		}
 	}
-
+	
 	for(k = 0; k < numpoints; k++)
 	{
 		// for all Axes.
@@ -394,7 +394,7 @@ static void refit_kdop_hull(BVHTree *tree, BVHNode *node, int start, int end)
 	int i, j;
 	float *bv = node->bv;
 
-
+	
 	for (i = tree->start_axis; i < tree->stop_axis; i++)
 	{
 		bv[2*i] = FLT_MAX;
@@ -406,10 +406,10 @@ static void refit_kdop_hull(BVHTree *tree, BVHNode *node, int start, int end)
 // for all Axes.
 		for (i = tree->start_axis; i < tree->stop_axis; i++)
 		{
-			newmin = tree->nodes[j]->bv[(2 * i)];
+			newmin = tree->nodes[j]->bv[(2 * i)];   
 			if ((newmin < bv[(2 * i)]))
 				bv[(2 * i)] = newmin;
-
+ 
 			newmax = tree->nodes[j]->bv[(2 * i) + 1];
 			if ((newmax > bv[(2 * i) + 1]))
 				bv[(2 * i) + 1] = newmax;
@@ -427,14 +427,14 @@ static char get_largest_axis(float *bv)
 	middle_point[0] = (bv[1]) - (bv[0]); // x axis
 	middle_point[1] = (bv[3]) - (bv[2]); // y axis
 	middle_point[2] = (bv[5]) - (bv[4]); // z axis
-	if (middle_point[0] > middle_point[1])
+	if (middle_point[0] > middle_point[1]) 
 	{
 		if (middle_point[0] > middle_point[2])
 			return 1; // max x axis
 		else
 			return 5; // max z axis
 	}
-	else
+	else 
 	{
 		if (middle_point[1] > middle_point[2])
 			return 3; // max y axis
@@ -448,24 +448,24 @@ static char get_largest_axis(float *bv)
 static void node_join(BVHTree *tree, BVHNode *node)
 {
 	int i, j;
-
+	
 	for (i = tree->start_axis; i < tree->stop_axis; i++)
 	{
 		node->bv[2*i] = FLT_MAX;
 		node->bv[2*i + 1] = -FLT_MAX;
 	}
-
+	
 	for (i = 0; i < tree->tree_type; i++)
 	{
-		if (node->children[i])
+		if (node->children[i]) 
 		{
 			for (j = tree->start_axis; j < tree->stop_axis; j++)
 			{
-				// update minimum
-				if (node->children[i]->bv[(2 * j)] < node->bv[(2 * j)])
+				// update minimum 
+				if (node->children[i]->bv[(2 * j)] < node->bv[(2 * j)]) 
 					node->bv[(2 * j)] = node->children[i]->bv[(2 * j)];
-
-				// update maximum
+				
+				// update maximum 
 				if (node->children[i]->bv[(2 * j) + 1] > node->bv[(2 * j) + 1])
 					node->bv[(2 * j) + 1] = node->children[i]->bv[(2 * j) + 1];
 			}
@@ -518,7 +518,7 @@ static void bvhtree_info(BVHTree *tree)
 static void verify_tree(BVHTree *tree)
 {
 	int i, j, check = 0;
-
+	
 	// check the pointer list
 	for(i = 0; i < tree->totleaf; i++)
 	{
@@ -538,7 +538,7 @@ static void verify_tree(BVHTree *tree)
 			check = 0;
 		}
 	}
-
+	
 	// check the leaf list
 	for(i = 0; i < tree->totleaf; i++)
 	{
@@ -558,7 +558,7 @@ static void verify_tree(BVHTree *tree)
 			check = 0;
 		}
 	}
-
+	
 	printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch, tree->totleaf, tree->totbranch + tree->totleaf);
 }
 #endif
@@ -703,7 +703,7 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
 
 	BVHBuildHelper data;
 	int depth;
-
+	
 	// set parent from root node to NULL
 	BVHNode *tmp = branches_array+0;
 	tmp->parent = NULL;
@@ -722,7 +722,7 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
 	}
 
 	branches_array--;	//Implicit trees use 1-based indexs
-
+	
 	build_implicit_tree_helper(tree, &data);
 
 	//Loop tree levels (log N) loops
@@ -806,11 +806,11 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
 {
 	BVHTree *tree;
 	int numnodes, i;
-
+	
 	// theres not support for trees below binary-trees :P
 	if(tree_type < 2)
 		return NULL;
-
+	
 	if(tree_type > MAX_TREETYPE)
 		return NULL;
 
@@ -820,13 +820,13 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
 	//so that tangent rays can still hit a bounding volume..
 	//this bug would show up when casting a ray aligned with a kdop-axis and with an edge of 2 faces
 	epsilon = MAX2(FLT_EPSILON, epsilon);
-
+	
 	if(tree)
 	{
 		tree->epsilon = epsilon;
-		tree->tree_type = tree_type;
+		tree->tree_type = tree_type; 
 		tree->axis = axis;
-
+		
 		if(axis == 26)
 		{
 			tree->start_axis = 0;
@@ -863,13 +863,13 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
 		numnodes = maxsize + implicit_needed_branches(tree_type, maxsize) + tree_type;
 
 		tree->nodes = (BVHNode **)MEM_callocN(sizeof(BVHNode *)*numnodes, "BVHNodes");
-
+		
 		if(!tree->nodes)
 		{
 			MEM_freeN(tree);
 			return NULL;
 		}
-
+		
 		tree->nodebv = (float*)MEM_callocN(sizeof(float)* axis * numnodes, "BVHNodeBV");
 		if(!tree->nodebv)
 		{
@@ -886,7 +886,7 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
 		}
 
 		tree->nodearray = (BVHNode *)MEM_callocN(sizeof(BVHNode)* numnodes, "BVHNodeArray");
-
+		
 		if(!tree->nodearray)
 		{
 			MEM_freeN(tree->nodechild);
@@ -902,14 +902,14 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
 			tree->nodearray[i].bv = tree->nodebv + i * axis;
 			tree->nodearray[i].children = tree->nodechild + i * tree_type;
 		}
-
+		
 	}
 
 	return tree;
 }
 
 void BLI_bvhtree_free(BVHTree *tree)
-{
+{	
 	if(tree)
 	{
 		MEM_freeN(tree->nodes);
@@ -946,27 +946,27 @@ int BLI_bvhtree_insert(BVHTree *tree, int index, float *co, int numpoints)
 {
 	int i;
 	BVHNode *node = NULL;
-
+	
 	// insert should only possible as long as tree->totbranch is 0
 	if(tree->totbranch > 0)
 		return 0;
-
+	
 	if(tree->totleaf+1 >= MEM_allocN_len(tree->nodes)/sizeof(*(tree->nodes)))
 		return 0;
-
+	
 	// TODO check if have enough nodes in array
-
+	
 	node = tree->nodes[tree->totleaf] = &(tree->nodearray[tree->totleaf]);
 	tree->totleaf++;
-
+	
 	create_kdop_hull(tree, node, co, numpoints, 0);
 	node->index= index;
-
+	
 	// inflate the bv with some epsilon
 	for (i = tree->start_axis; i < tree->stop_axis; i++)
 	{
-		node->bv[(2 * i)] -= tree->epsilon; // minimum
-		node->bv[(2 * i) + 1] += tree->epsilon; // maximum
+		node->bv[(2 * i)] -= tree->epsilon; // minimum 
+		node->bv[(2 * i) + 1] += tree->epsilon; // maximum 
 	}
 
 	return 1;
@@ -978,23 +978,23 @@ int BLI_bvhtree_update_node(BVHTree *tree, int index, float *co, float *co_movin
 {
 	int i;
 	BVHNode *node= NULL;
-
+	
 	// check if index exists
 	if(index > tree->totleaf)
 		return 0;
-
+	
 	node = tree->nodearray + index;
-
+	
 	create_kdop_hull(tree, node, co, numpoints, 0);
-
+	
 	if(co_moving)
 		create_kdop_hull(tree, node, co_moving, numpoints, 1);
-
+	
 	// inflate the bv with some epsilon
 	for (i = tree->start_axis; i < tree->stop_axis; i++)
 	{
-		node->bv[(2 * i)] -= tree->epsilon; // minimum
-		node->bv[(2 * i) + 1] += tree->epsilon; // maximum
+		node->bv[(2 * i)] -= tree->epsilon; // minimum 
+		node->bv[(2 * i) + 1] += tree->epsilon; // maximum 
 	}
 
 	return 1;
@@ -1030,24 +1030,24 @@ static int tree_overlap(BVHNode *node1, BVHNode *node2, int start_axis, int stop
 	float *bv2 = node2->bv;
 
 	float *bv1_end = bv1 + (stop_axis<<1);
-
+		
 	bv1 += start_axis<<1;
 	bv2 += start_axis<<1;
-
+	
 	// test all axis if min + max overlap
 	for (; bv1 != bv1_end; bv1+=2, bv2+=2)
 	{
-		if ((*(bv1) > *(bv2 + 1)) || (*(bv2) > *(bv1 + 1)))
+		if ((*(bv1) > *(bv2 + 1)) || (*(bv2) > *(bv1 + 1))) 
 			return 0;
 	}
-
+	
 	return 1;
 }
 
 static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
 {
 	int j;
-
+	
 	if(tree_overlap(node1, node2, data->start_axis, data->stop_axis))
 	{
 		// check if node1 is a leaf
@@ -1056,17 +1056,17 @@ static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
 			// check if node2 is a leaf
 			if(!node2->totnode)
 			{
-
+				
 				if(node1 == node2)
 				{
 					return;
 				}
-
+					
 				if(data->i >= data->max_overlap)
-				{
+				{	
 					// try to make alloc'ed memory bigger
 					data->overlap = realloc(data->overlap, sizeof(BVHTreeOverlap)*data->max_overlap*2);
-
+					
 					if(!data->overlap)
 					{
 						printf("Out of Memory in traverse\n");
@@ -1074,7 +1074,7 @@ static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
 					}
 					data->max_overlap *= 2;
 				}
-
+				
 				// both leafs, insert overlap!
 				data->overlap[data->i].indexA = node1->index;
 				data->overlap[data->i].indexB = node2->index;
@@ -1092,7 +1092,7 @@ static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
 		}
 		else
 		{
-
+			
 			for(j = 0; j < data->tree2->tree_type; j++)
 			{
 				if(node1->children[j])
@@ -1108,21 +1108,21 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
 	int j, total = 0;
 	BVHTreeOverlap *overlap = NULL, *to = NULL;
 	BVHOverlapData **data;
-
+	
 	// check for compatibility of both trees (can't compare 14-DOP with 18-DOP)
 	if((tree1->axis != tree2->axis) && (tree1->axis == 14 || tree2->axis == 14) && (tree1->axis == 18 || tree2->axis == 18))
 		return 0;
-
+	
 	// fast check root nodes for collision before doing big splitting + traversal
 	if(!tree_overlap(tree1->nodes[tree1->totleaf], tree2->nodes[tree2->totleaf], MIN2(tree1->start_axis, tree2->start_axis), MIN2(tree1->stop_axis, tree2->stop_axis)))
 		return 0;
 
 	data = MEM_callocN(sizeof(BVHOverlapData *)* tree1->tree_type, "BVHOverlapData_star");
-
+	
 	for(j = 0; j < tree1->tree_type; j++)
 	{
 		data[j] = (BVHOverlapData *)MEM_callocN(sizeof(BVHOverlapData), "BVHOverlapData");
-
+		
 		// init BVHOverlapData
 		data[j]->overlap = (BVHTreeOverlap *)malloc(sizeof(BVHTreeOverlap)*MAX2(tree1->totleaf, tree2->totleaf));
 		data[j]->tree1 = tree1;
@@ -1138,25 +1138,25 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
 	{
 		traverse(data[j], tree1->nodes[tree1->totleaf]->children[j], tree2->nodes[tree2->totleaf]);
 	}
-
+	
 	for(j = 0; j < tree1->tree_type; j++)
 		total += data[j]->i;
-
+	
 	to = overlap = (BVHTreeOverlap *)MEM_callocN(sizeof(BVHTreeOverlap)*total, "BVHTreeOverlap");
-
+	
 	for(j = 0; j < tree1->tree_type; j++)
 	{
 		memcpy(to, data[j]->overlap, data[j]->i*sizeof(BVHTreeOverlap));
 		to+=data[j]->i;
 	}
-
+	
 	for(j = 0; j < tree1->tree_type; j++)
 	{
 		free(data[j]->overlap);
 		MEM_freeN(data[j]);
 	}
 	MEM_freeN(data);
-
+	
 	(*result) = total;
 	return overlap;
 }
@@ -1173,7 +1173,7 @@ static float squared_dist(const float *a, const float *b)
 }
 
 //Determines the nearest point of the given node BV. Returns the squared distance to that point.
-static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *nearest)
+static float calc_nearest_point(const float *proj, BVHNode *node, float *nearest)
 {
 	int i;
 	const float *bv = node->bv;
@@ -1181,12 +1181,12 @@ static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *near
 	//nearest on AABB hull
 	for(i=0; i != 3; i++, bv += 2)
 	{
-		if(bv[0] > data->proj[i])
+		if(bv[0] > proj[i])
 			nearest[i] = bv[0];
-		else if(bv[1] < data->proj[i])
+		else if(bv[1] < proj[i])
 			nearest[i] = bv[1];
 		else
-			nearest[i] = data->proj[i];
+			nearest[i] = proj[i]; 
 	}
 
 /*
@@ -1208,7 +1208,7 @@ static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *near
 		}
 	}
 */
-	return squared_dist(data->co, nearest);
+	return squared_dist(proj, nearest);
 }
 
 
@@ -1231,7 +1231,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 		else
 		{
 			data->nearest.index	= node->index;
-			data->nearest.dist	= calc_nearest_point(data, node, data->nearest.co);
+			data->nearest.dist	= calc_nearest_point(data->proj, node, data->nearest.co);
 		}
 	}
 	else
@@ -1240,12 +1240,12 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 		int i;
 		float nearest[3];
 
-		if(data->proj[ (int)node->main_axis ] <= node->children[0]->bv[(int)node->main_axis*2+1])
+		if(data->proj[ node->main_axis ] <= node->children[0]->bv[node->main_axis*2+1])
 		{
 
 			for(i=0; i != node->totnode; i++)
 			{
-				if( calc_nearest_point(data, node->children[i], nearest) >= data->nearest.dist) continue;
+				if( calc_nearest_point(data->proj, node->children[i], nearest) >= data->nearest.dist) continue;
 				dfs_find_nearest_dfs(data, node->children[i]);
 			}
 		}
@@ -1253,7 +1253,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 		{
 			for(i=node->totnode-1; i >= 0 ; i--)
 			{
-				if( calc_nearest_point(data, node->children[i], nearest) >= data->nearest.dist) continue;
+				if( calc_nearest_point(data->proj, node->children[i], nearest) >= data->nearest.dist) continue;
 				dfs_find_nearest_dfs(data, node->children[i]);
 			}
 		}
@@ -1263,7 +1263,7 @@ static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
 static void dfs_find_nearest_begin(BVHNearestData *data, BVHNode *node)
 {
 	float nearest[3], sdist;
-	sdist = calc_nearest_point(data, node, nearest);
+	sdist = calc_nearest_point(data->proj, node, nearest);
 	if(sdist >= data->nearest.dist) return;
 	dfs_find_nearest_dfs(data, node);
 }
@@ -1301,7 +1301,7 @@ static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
 	}
 
 	current.node = node;
-	current.dist = calc_nearest_point(data, node, nearest);
+	current.dist = calc_nearest_point(data->proj, node, nearest);
 
 	while(current.dist < data->nearest.dist)
 	{
@@ -1329,7 +1329,7 @@ static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
 				}
 
 				heap[heap_size].node = current.node->children[i];
-				heap[heap_size].dist = calc_nearest_point(data, current.node->children[i], nearest);
+				heap[heap_size].dist = calc_nearest_point(data->proj, current.node->children[i], nearest);
 
 				if(heap[heap_size].dist >= data->nearest.dist) continue;
 				heap_size++;
@@ -1339,7 +1339,7 @@ static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
 				push_heaps++;
 			}
 		}
-
+		
 		if(heap_size == 0) break;
 
 		current = heap[0];
@@ -1355,6 +1355,7 @@ static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
 }
 #endif
 
+
 int BLI_bvhtree_find_nearest(BVHTree *tree, const float *co, BVHTreeNearest *nearest, BVHTree_NearestPointCallback callback, void *userdata)
 {
 	int i;
@@ -1435,7 +1436,7 @@ static float ray_nearest_hit(BVHRayCastData *data, float *bv)
 				if(lu > low)   low = lu;
 				if(ll < upper) upper = ll;
 			}
-
+	
 			if(low > upper) return FLT_MAX;
 		}
 	}
@@ -1530,32 +1531,31 @@ float BLI_bvhtree_bb_raycast(float *bv, float *light_start, float *light_end, fl
 {
 	BVHRayCastData data;
 	float dist = 0.0;
-	int i;
-
+	
 	data.hit.dist = FLT_MAX;
-
+	
 	// get light direction
 	data.ray.direction[0] = light_end[0] - light_start[0];
 	data.ray.direction[1] = light_end[1] - light_start[1];
 	data.ray.direction[2] = light_end[2] - light_start[2];
-
+	
 	data.ray.radius = 0.0;
-
+	
 	data.ray.origin[0] = light_start[0];
 	data.ray.origin[1] = light_start[1];
 	data.ray.origin[2] = light_start[2];
-
+	
 	Normalize(data.ray.direction);
 	VECCOPY(data.ray_dot_axis, data.ray.direction);
-
+	
 	dist = ray_nearest_hit(&data, bv);
-
+	
 	if(dist > 0.0)
 	{
 		VECADDFAC(pos, light_start, data.ray.direction, dist);
 	}
 	return dist;
-
+	
 }
 
 /*
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c5588ccf7d6..8aade4c223e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2820,7 +2820,10 @@ static void lib_link_texture(FileData *fd, Main *main)
 			tex->ima= newlibadr_us(fd, tex->id.lib, tex->ima);
 			tex->ipo= newlibadr_us(fd, tex->id.lib, tex->ipo);
 			if(tex->env) tex->env->object= newlibadr(fd, tex->id.lib, tex->env->object);
-			if(tex->pd) tex->pd->object= newlibadr(fd, tex->id.lib, tex->pd->object);
+			if(tex->pd) {
+				tex->pd->object= newlibadr(fd, tex->id.lib, tex->pd->object);
+				tex->pd->psys= newlibadr(fd, tex->id.lib, tex->pd->psys);
+			}
 			if(tex->vd) tex->vd->object= newlibadr(fd, tex->id.lib, tex->vd->object);
 
 			if(tex->nodetree)
@@ -9491,20 +9494,22 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 			
 			/* volume rendering settings */
-			ma->vol.density = 1.0f;
-			ma->vol.emission = 0.0f;
-			ma->vol.absorption = 1.0f;
-			ma->vol.scattering = 1.0f;
-			ma->vol.emission_col[0] = ma->vol.emission_col[1] = ma->vol.emission_col[2] = 1.0f;
-			ma->vol.absorption_col[0] = ma->vol.absorption_col[1] = ma->vol.absorption_col[2] = 0.0f;
-			ma->vol.density_scale = 1.0f;
-			ma->vol.depth_cutoff = 0.01f;
-			ma->vol.stepsize_type = MA_VOL_STEP_RANDOMIZED;
-			ma->vol.stepsize = 0.2f;
-			ma->vol.shade_stepsize = 0.2f;
-			ma->vol.shade_type = MA_VOL_SHADE_SINGLE;
-			ma->vol.shadeflag |= MA_VOL_PRECACHESHADING;
-			ma->vol.precache_resolution = 50;
+			if (ma->vol.stepsize < 0.0001f) {
+				ma->vol.density = 1.0f;
+				ma->vol.emission = 0.0f;
+				ma->vol.absorption = 1.0f;
+				ma->vol.scattering = 1.0f;
+				ma->vol.emission_col[0] = ma->vol.emission_col[1] = ma->vol.emission_col[2] = 1.0f;
+				ma->vol.absorption_col[0] = ma->vol.absorption_col[1] = ma->vol.absorption_col[2] = 0.0f;
+				ma->vol.density_scale = 1.0f;
+				ma->vol.depth_cutoff = 0.01f;
+				ma->vol.stepsize_type = MA_VOL_STEP_RANDOMIZED;
+				ma->vol.stepsize = 0.2f;
+				ma->vol.shade_stepsize = 0.2f;
+				ma->vol.shade_type = MA_VOL_SHADE_SINGLE;
+				ma->vol.shadeflag |= MA_VOL_PRECACHESHADING;
+				ma->vol.precache_resolution = 50;
+			}
 		}
 
 		for(sce = main->scene.first; sce; sce = sce->id.next) {
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 6e889fda20a..1b6ed1bc032 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -141,12 +141,11 @@ typedef struct PointDensity {
 	int pdpad;
 
 	struct Object *object;	/* for 'Object' or 'Particle system' type - source object */
+	struct ParticleSystem *psys;
 	short psys_cache_space;		/* cache points in worldspace, object space, ... ? */
-	short psysindex;		/* for 'Particle system' type - object's psys number */
-	
 	short ob_cache_space;		/* cache points in worldspace, object space, ... ? */
 	
-	short pdpad2;
+	short pdpad2[2];
 	
 	void *point_tree;		/* the acceleration tree containing points */
 	float *point_data;		/* dynamically allocated extra for extra information, like particle age */
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 01078ac2412..cce1654da52 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -1282,6 +1282,19 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Point Source", "Point data to use as renderable point density");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 	
+	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "object");
+	RNA_def_property_ui_text(prop, "Object", "Object to take point data from");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "particle_system", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "psys");
+	RNA_def_property_ui_text(prop, "Particle System", "Particle System to render as points");
+	RNA_def_property_struct_type(prop, "ParticleSystem");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
 	prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "radius");
 	RNA_def_property_range(prop, 0.01, FLT_MAX);
@@ -1329,52 +1342,7 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Turbulence Influence", "Method for driving added turbulent noise");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 
-	/*
-	 prop= RNA_def_property(srna, "interpolation", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "interp_type");
-	RNA_def_property_enum_items(prop, interpolation_type_items);
-	RNA_def_property_ui_text(prop, "Interpolation", "Method to interpolate/smooth values between voxel cells");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 	
-	prop= RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_sdna(prop, NULL, "int_multiplier");
-	RNA_def_property_range(prop, 0.01, FLT_MAX);
-	RNA_def_property_ui_text(prop, "Intensity", "Multiplier for intensity values");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	
-	prop= RNA_def_property(srna, "file_format", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "file_format");
-	RNA_def_property_enum_items(prop, file_format_items);
-	RNA_def_property_ui_text(prop, "File Format", "Format of the source data set to render	");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	
-	prop= RNA_def_property(srna, "source_path", PROP_STRING, PROP_FILEPATH);
-	RNA_def_property_string_sdna(prop, NULL, "source_path");
-	RNA_def_property_ui_text(prop, "Source Path", "The external source data file to use");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	
-	prop= RNA_def_property(srna, "resolution", PROP_INT, PROP_VECTOR);
-	RNA_def_property_int_sdna(prop, NULL, "resol");
-	RNA_def_property_ui_text(prop, "Resolution", "Resolution of the voxel grid.");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	
-	prop= RNA_def_property(srna, "still", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_VD_STILL);
-	RNA_def_property_ui_text(prop, "Still Frame Only", "Always render a still frame from the voxel data sequence");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	
-	prop= RNA_def_property(srna, "still_frame_number", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "still_frame");
-	RNA_def_property_range(prop, 0, INT_MAX);
-	RNA_def_property_ui_text(prop, "Still Frame Number", "The frame number to always use");
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	
-	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "object");
-	RNA_def_property_ui_text(prop, "Object", "Object to use for smoke simulations");
-	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-	*/
 	
 	srna= RNA_def_struct(brna, "PointDensityTexture", "Texture");
 	RNA_def_struct_sdna(srna, "Tex");
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index fb7ec4dadc2..9a9e3de7247 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -232,15 +232,9 @@ static void cache_pointdensity(Render *re, Tex *tex)
 		int i;
 		
 		if (!ob) return;
-		if (BLI_countlist(&ob->particlesystem) == 0) return;
+		if (!pd->psys) return;
 		
-		
-		for(psys=ob->particlesystem.first, i=0; i< pd->psysindex-1; i++)
-			psys= psys->next;
-		
-		if (!psys) return;
-		
-		pointdensity_cache_psys(re, pd, ob, psys);
+		pointdensity_cache_psys(re, pd, ob, pd->psys);
 	}
 	else if (pd->source == TEX_PD_OBJECT) {
 		Object *ob = pd->object;
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 63c4e97f86e..f112c237319 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -93,10 +93,7 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
 	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
 	
-	if (checkfunc==VOL_IS_BACKFACE)
-		intersected = RE_ray_tree_intersect_check(R.raytree, isect, vol_backface_intersect_check);
-	else
-		intersected = RE_ray_tree_intersect(R.raytree, isect);
+	intersected = RE_ray_tree_intersect(R.raytree, isect);
 	
 	if(intersected)
 	{

From 2de4c8f2b20efe57a27804bd20d7e4882e9137d4 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Mon, 17 Aug 2009 22:17:25 +0000
Subject: [PATCH 105/577] Implemented multisampling for texture nodes.

---
 .../nodes/intern/TEX_nodes/TEX_output.c       | 46 ++++++++++++++++++-
 source/blender/nodes/intern/TEX_util.c        |  2 +-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
index 355de796c7e..96ee5d74f66 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
@@ -35,6 +35,48 @@ static bNodeSocketType inputs[]= {
 	{ -1, 0, ""	}
 };
 
+static void osa(
+	void (*input_fn)(float *, bNodeStack *, TexParams *, short),
+	float *out,
+	bNodeStack *in,
+	TexParams *p,
+	short thread
+){
+	if(!p->dxt) {
+		input_fn(out, in, p, thread);
+	} else {
+		float sample[4] = {0};
+		float coord[3];
+		TexParams sp = *p;
+		int i;
+	
+		sp.coord = coord;
+		sp.dxt = sp.dyt = 0;
+		
+		QUATCOPY(out, sample);
+		
+		for(i=0; i<5; i++) {
+			VECCOPY(coord, p->coord);
+			
+			if(i < 4)
+			{
+				if(i % 2) VECADD(coord, coord, p->dxt);
+				if(i > 1) VECADD(coord, coord, p->dyt);
+			}
+			else
+			{
+				VECADDFAC(coord, coord, p->dxt, 0.5);
+				VECADDFAC(coord, coord, p->dyt, 0.5);
+			}
+			
+			input_fn(sample, in, &sp, thread);
+			
+			QUATADDFAC(out, out, sample, 0.2);
+		}
+	}
+}
+	
+
 /* applies to render pipeline */
 static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 {
@@ -52,14 +94,14 @@ static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 			TexParams params;
 			params_from_cdata(&params, cdata);
 			
-			tex_input_rgba(&target->tr, in[0], &params, cdata->thread);
+			osa(tex_input_rgba, &target->tr, in[0], &params, cdata->thread);
 		
 			target->tin = (target->tr + target->tg + target->tb) / 3.0f;
 			target->talpha = 1.0f;
 		
 			if(target->nor) {
 				if(in[1]->hasinput)
-					tex_input_vec(target->nor, in[1], &params, cdata->thread);
+					osa(tex_input_vec, target->nor, in[1], &params, cdata->thread);
 				else
 					target->nor = 0;
 			}
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index b88efb47990..36182d2498d 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -149,7 +149,7 @@ void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata)
 	
 	params.dxt = 0;
 	params.dyt = 0;
-	params.cfra = 0; /* XXX Use current? */
+	params.cfra = cdata->cfra;
 	params.coord = coord;
 	
 	for(x=0; x<preview->xsize; x++)

From 7d93d1c8f8f537d5213c5014a196d6e1452b483f Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Mon, 17 Aug 2009 22:27:08 +0000
Subject: [PATCH 106/577] Bugfix for time line: Fixing usage of uninitialized
 memory which resulted in e.g. backward playing time line.

---
 source/blender/editors/screen/screen_edit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 76a62128e91..aa36675fb90 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1527,7 +1527,7 @@ void ED_screen_animation_timer(bContext *C, int redraws, int sync, int enable)
 	screen->animtimer= NULL;
 	
 	if(enable) {
-		struct ScreenAnimData *sad= MEM_mallocN(sizeof(ScreenAnimData), "ScreenAnimData");
+		struct ScreenAnimData *sad= MEM_callocN(sizeof(ScreenAnimData), "ScreenAnimData");
 		
 		screen->animtimer= WM_event_add_window_timer(win, TIMER0, (1.0/FPS));
 		sad->ar= CTX_wm_region(C);

From 2d7305f12db9cd07c6c9e7cad565d48de7996aa9 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Mon, 17 Aug 2009 23:37:39 +0000
Subject: [PATCH 107/577] 2.5/Sculpt:

* Fixed tablet pressure for brush size.
---
 source/blender/editors/sculpt_paint/sculpt.c | 29 ++++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 43d70cfcf7a..b24162a76e1 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -125,7 +125,7 @@ typedef enum StrokeFlags {
 */
 typedef struct StrokeCache {
 	/* Invariants */
-	float radius;
+	float initial_radius;
 	float scale[3];
 	int flag;
 	float clip_tolerance[3];
@@ -133,6 +133,7 @@ typedef struct StrokeCache {
 	float depth;
 
 	/* Variants */
+	float radius;
 	float true_location[3];
 	float location[3];
 	float flip;
@@ -214,21 +215,6 @@ static void project(bglMats *mats, const float v[3], short p[2])
  *
  */
 
-/* Return modified brush size. Uses current tablet pressure (if available) to
-   shrink the brush. Skipped for grab brush because only the first mouse down
-   size is used, which is small if the user has just touched the pen to the
-   tablet */
-static char brush_size(Sculpt *sd, SculptSession *ss)
-{
-	Brush *brush = paint_brush(&sd->paint);
-	float size= brush->size;
-	
-	if((brush->sculpt_tool != SCULPT_TOOL_GRAB) && (brush->flag & BRUSH_SIZE_PRESSURE))
-		size *= ss->cache->pressure;
-
-	return size;
-}
-
 /* Return modified brush strength. Includes the direction of the brush, positive
    values pull vertices, negative values push. Uses tablet pressure and a
    special multiplier found experimentally to scale the strength factor. */
@@ -1267,7 +1253,7 @@ static void sculpt_update_cache_invariants(Sculpt *sd, SculptSession *ss, bConte
 	}
 
 	unproject(cache->mats, cache->true_location, cache->initial_mouse[0], cache->initial_mouse[1], cache->depth);
-	cache->radius = unproject_brush_radius(ss, brush_size(sd, ss));
+	cache->initial_radius = unproject_brush_radius(ss, brush->size);
 	cache->rotation = 0;
 	cache->first_time = 1;
 }
@@ -1289,7 +1275,14 @@ static void sculpt_update_cache_variants(Sculpt *sd, SculptSession *ss, PointerR
 	/* Truly temporary data that isn't stored in properties */
 
 	cache->previous_pixel_radius = cache->pixel_radius;
-	cache->pixel_radius = brush_size(sd, ss);
+	cache->pixel_radius = brush->size;
+
+	if(brush->flag & BRUSH_SIZE_PRESSURE) {
+		cache->pixel_radius *= cache->pressure;
+		cache->radius = cache->initial_radius * cache->pressure;
+	}
+	else
+		cache->radius = cache->initial_radius;
 
 	if(brush->flag & BRUSH_ANCHORED) {
 		dx = cache->mouse[0] - cache->initial_mouse[0];

From a5da26f59d8cd820ca4d27a06028dd6aaee65784 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Tue, 18 Aug 2009 01:19:00 +0000
Subject: [PATCH 108/577] 2.5/Sculpt:

* Added UI for brush stroke. Contains for now spacing and smooth stroke
* Removed Sculpt UI for airbrush -- doesn't do anything in sculpt mode
* Improved smooth stroke by using float instead of int precision, so smooth stroke is even smoother now
---
 release/ui/space_view3d_toolbar.py           | 28 ++++++++++++++-
 source/blender/blenkernel/intern/brush.c     |  2 ++
 source/blender/editors/sculpt_paint/sculpt.c | 37 ++++++++++----------
 source/blender/makesdna/DNA_brush_types.h    |  4 ++-
 source/blender/makesrna/intern/rna_brush.c   | 10 +++++-
 5 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 1308791bdbc..be378cc46fe 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -341,7 +341,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 				row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
 			
 				col = layout.column()
-				col.itemR(brush, "airbrush")
+
 				if brush.sculpt_tool != 'LAYER':
 					col.itemR(brush, "anchored")
 
@@ -421,6 +421,31 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			row.itemR(brush, "strength", slider=True)
 			row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
 
+class VIEW3D_PT_tools_brush_stroke(PaintPanel):
+	__label__ = "Stroke"
+	__default_closed__ = True
+
+	def poll(self, context):
+		settings = self.paint_settings(context)
+		return (settings and settings.brush and context.sculpt_object)
+
+	def draw(self, context):
+		settings = self.paint_settings(context)
+		brush = settings.brush
+		layout = self.layout
+
+		layout.itemR(brush, "smooth_stroke")
+		col = layout.column()
+		col.active = brush.smooth_stroke
+		col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
+		col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
+
+		layout.itemR(brush, "space")
+		col = layout.column()
+		col.active = brush.space
+		col.itemR(brush, "spacing", text="Distance", slider=True)
+
+
 class VIEW3D_PT_tools_brush_curve(PaintPanel):
 	__label__ = "Curve"
 	__default_closed__ = True
@@ -602,6 +627,7 @@ bpy.types.register(VIEW3D_PT_tools_mballedit)
 bpy.types.register(VIEW3D_PT_tools_latticeedit)
 bpy.types.register(VIEW3D_PT_tools_posemode)
 bpy.types.register(VIEW3D_PT_tools_brush)
+bpy.types.register(VIEW3D_PT_tools_brush_stroke)
 bpy.types.register(VIEW3D_PT_tools_brush_curve)
 bpy.types.register(VIEW3D_PT_sculpt_options)
 bpy.types.register(VIEW3D_PT_tools_vertexpaint)
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 612f6d2051d..a7b5a16d924 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -75,6 +75,8 @@ Brush *add_brush(const char *name)
 	brush->alpha= 0.2f;
 	brush->size= 25;
 	brush->spacing= 10.0f;
+	brush->smooth_stroke_radius= 75;
+	brush->smooth_stroke_factor= 0.9;
 	brush->rate= 0.1f;
 	brush->innerradius= 0.5f;
 	brush->clone.alpha= 0.5;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index b24162a76e1..f7f72d611dc 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -129,7 +129,7 @@ typedef struct StrokeCache {
 	float scale[3];
 	int flag;
 	float clip_tolerance[3];
-	int initial_mouse[2];
+	float initial_mouse[2];
 	float depth;
 
 	/* Variants */
@@ -138,7 +138,7 @@ typedef struct StrokeCache {
 	float location[3];
 	float flip;
 	float pressure;
-	int mouse[2];
+	float mouse[2];
 
 	/* The rest is temporary storage that isn't saved as a property */
 
@@ -1077,7 +1077,7 @@ static void draw_paint_cursor(bContext *C, int x, int y, void *customdata)
 
 	if(ss && ss->cache && brush && (brush->flag & BRUSH_SMOOTH_STROKE)) {
 		ARegion *ar = CTX_wm_region(C);
-		sdrawline(x, y, ss->cache->mouse[0] - ar->winrct.xmin, ss->cache->mouse[1] - ar->winrct.ymin);
+		sdrawline(x, y, (int)ss->cache->mouse[0] - ar->winrct.xmin, (int)ss->cache->mouse[1] - ar->winrct.ymin);
 	}
 
 	glDisable(GL_BLEND);
@@ -1201,7 +1201,7 @@ static void sculpt_update_cache_invariants(Sculpt *sd, SculptSession *ss, bConte
 	RNA_float_get_array(op->ptr, "scale", cache->scale);
 	cache->flag = RNA_int_get(op->ptr, "flag");
 	RNA_float_get_array(op->ptr, "clip_tolerance", cache->clip_tolerance);
-	RNA_int_get_array(op->ptr, "initial_mouse", cache->initial_mouse);
+	RNA_float_get_array(op->ptr, "initial_mouse", cache->initial_mouse);
 	cache->depth = RNA_float_get(op->ptr, "depth");
 
 	cache->mouse[0] = cache->initial_mouse[0];
@@ -1264,12 +1264,13 @@ static void sculpt_update_cache_variants(Sculpt *sd, SculptSession *ss, PointerR
 	StrokeCache *cache = ss->cache;
 	Brush *brush = paint_brush(&sd->paint);
 	float grab_location[3];
+	
 	int dx, dy;
 
 	if(!(brush->flag & BRUSH_ANCHORED))
 		RNA_float_get_array(ptr, "location", cache->true_location);
 	cache->flip = RNA_boolean_get(ptr, "flip");
-	RNA_int_get_array(ptr, "mouse", cache->mouse);
+	RNA_float_get_array(ptr, "mouse", cache->mouse);
 	cache->pressure = RNA_float_get(ptr, "pressure");
 	
 	/* Truly temporary data that isn't stored in properties */
@@ -1326,7 +1327,8 @@ static void sculpt_brush_stroke_init_properties(bContext *C, wmOperator *op, wmE
 	ModifierData *md;
 	ViewContext vc;
 	float scale[3], clip_tolerance[3] = {0,0,0};
-	int mouse[2], flag = 0;
+	float mouse[2];
+	int flag = 0;
 
 	/* Set scaling adjustment */
 	scale[0] = 1.0f / ob->size[0];
@@ -1353,7 +1355,7 @@ static void sculpt_brush_stroke_init_properties(bContext *C, wmOperator *op, wmE
 	/* Initial mouse location */
 	mouse[0] = event->x;
 	mouse[1] = event->y;
-	RNA_int_set_array(op->ptr, "initial_mouse", mouse);
+	RNA_float_set_array(op->ptr, "initial_mouse", mouse);
 
 	/* Initial screen depth under the mouse */
 	view3d_set_viewcontext(C, &vc);
@@ -1434,7 +1436,7 @@ static void sculpt_flush_update(bContext *C)
 }
 
 /* Returns zero if no sculpt changes should be made, non-zero otherwise */
-static int sculpt_smooth_stroke(Sculpt *s, SculptSession *ss, int output[2], wmEvent *event)
+static int sculpt_smooth_stroke(Sculpt *s, SculptSession *ss, float output[2], wmEvent *event)
 {
 	Brush *brush = paint_brush(&s->paint);
 
@@ -1443,13 +1445,12 @@ static int sculpt_smooth_stroke(Sculpt *s, SculptSession *ss, int output[2], wmE
 
 	if(brush->flag & BRUSH_SMOOTH_STROKE && brush->sculpt_tool != SCULPT_TOOL_GRAB) {
 		StrokeCache *cache = ss->cache;
-		float u = .9, v = 1.0 - u;
-		int dx = cache->mouse[0] - event->x, dy = cache->mouse[1] - event->y;
-		int radius = 50;
+		float u = brush->smooth_stroke_factor, v = 1.0 - u;
+		float dx = cache->mouse[0] - event->x, dy = cache->mouse[1] - event->y;
 
 		/* If the mouse is moving within the radius of the last move,
 		   don't update the mouse position. This allows sharp turns. */
-		if(dx*dx + dy*dy < radius*radius)
+		if(dx*dx + dy*dy < brush->smooth_stroke_radius * brush->smooth_stroke_radius)
 			return 0;
 
 		output[0] = event->x * v + cache->mouse[0] * u;
@@ -1467,7 +1468,7 @@ int sculpt_space_stroke_enabled(Sculpt *s)
 }
 
 /* Put the location of the next sculpt stroke dot into the stroke RNA and apply it to the mesh */
-static void sculpt_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *event, int mouse[2])
+static void sculpt_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *event, float mouse[2])
 {
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	SculptSession *ss = CTX_data_active_object(C)->sculpt;
@@ -1489,7 +1490,7 @@ static void sculpt_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *e
 	/* Add to stroke */
 	RNA_collection_add(op->ptr, "stroke", &itemptr);
 	RNA_float_set_array(&itemptr, "location", center);
-	RNA_int_set_array(&itemptr, "mouse", mouse);
+	RNA_float_set_array(&itemptr, "mouse", mouse);
 	RNA_boolean_set(&itemptr, "flip", event->shift);
 	RNA_float_set(&itemptr, "pressure", pressure);
 	sculpt_update_cache_variants(sd, ss, &itemptr);
@@ -1500,7 +1501,7 @@ static void sculpt_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *e
 
 /* For brushes with stroke spacing enabled, moves mouse in steps
    towards the final mouse location. */
-static int sculpt_space_stroke(bContext *C, wmOperator *op, wmEvent *event, Sculpt *s, SculptSession *ss, const int final_mouse[2])
+static int sculpt_space_stroke(bContext *C, wmOperator *op, wmEvent *event, Sculpt *s, SculptSession *ss, const float final_mouse[2])
 {
 	StrokeCache *cache = ss->cache;
 	Brush *brush = paint_brush(&s->paint);
@@ -1508,7 +1509,7 @@ static int sculpt_space_stroke(bContext *C, wmOperator *op, wmEvent *event, Scul
 
 	if(sculpt_space_stroke_enabled(s)) {
 		float vec[2] = {final_mouse[0] - cache->mouse[0], final_mouse[1] - cache->mouse[1]};
-		int mouse[2] = {cache->mouse[0], cache->mouse[1]};
+		float mouse[2] = {cache->mouse[0], cache->mouse[1]};
 		float length, scale;
 		int steps = 0, i;
 
@@ -1556,7 +1557,7 @@ static int sculpt_brush_stroke_modal(bContext *C, wmOperator *op, wmEvent *event
 	}
 
 	if(ss->cache) {
-		int mouse[2];
+		float mouse[2];
 
 		if(sculpt_smooth_stroke(sd, ss, mouse, event)) {
 			if(sculpt_space_stroke_enabled(sd)) {
@@ -1646,7 +1647,7 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot)
 	RNA_def_float_vector(ot->srna, "clip_tolerance", 3, NULL, 0.0f, FLT_MAX, "clip_tolerance", "", 0.0f, 1000.0f);
 
 	/* The initial 2D location of the mouse */
-	RNA_def_int_vector(ot->srna, "initial_mouse", 2, NULL, INT_MIN, INT_MAX, "initial_mouse", "", INT_MIN, INT_MAX);
+	RNA_def_float_vector(ot->srna, "initial_mouse", 2, NULL, INT_MIN, INT_MAX, "initial_mouse", "", INT_MIN, INT_MAX);
 
 	/* The initial screen depth of the mouse */
 	RNA_def_float(ot->srna, "depth", 0.0f, 0.0f, FLT_MAX, "depth", "", 0.0f, FLT_MAX);
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index e8962d013f4..52ea298c110 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -58,6 +58,8 @@ typedef struct Brush {
 	int size;					/* brush diameter */
 	float innerradius;			/* inner radius after which the falloff starts */
 	float spacing;				/* spacing of paint operations */
+	int smooth_stroke_radius;		/* turning radius (in pixels) for smooth stroke */
+	float smooth_stroke_factor;		/* higher values limit fast changes in the stroke direction */
 	float rate;					/* paint operations / second (airbrush) */
 
 	float rgb[3];				/* color */
@@ -66,7 +68,7 @@ typedef struct Brush {
 	short texact;				/* active texture */
 	char sculpt_tool;			/* active tool */
 	
-	char pad;
+	char pad[1];
 } Brush;
 
 /* Brush.flag */
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 65c66800f41..03b5a44f52b 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -130,6 +130,14 @@ void rna_def_brush(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "spacing");
 	RNA_def_property_range(prop, 1.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Spacing", "Spacing between brush stamps.");
+
+	prop= RNA_def_property(srna, "smooth_stroke_radius", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 10, 200);
+	RNA_def_property_ui_text(prop, "Smooth Stroke Radius", "Minimum distance from last point before stroke continues.");
+
+	prop= RNA_def_property(srna, "smooth_stroke_factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_range(prop, 0.5, 0.99);
+	RNA_def_property_ui_text(prop, "Smooth Stroke Factor", "Higher values give a smoother stroke.");
 	
 	prop= RNA_def_property(srna, "rate", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rate");
@@ -247,7 +255,7 @@ static void rna_def_operator_stroke_element(BlenderRNA *brna)
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Location", "");
 
-	prop= RNA_def_property(srna, "mouse", PROP_INT, PROP_XYZ);
+	prop= RNA_def_property(srna, "mouse", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_flag(prop, PROP_IDPROPERTY);
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_ui_text(prop, "Mouse", "");

From 4fb19159ea47027bbaf31d379da3d6b0ea0f0f28 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 18 Aug 2009 01:29:25 +0000
Subject: [PATCH 109/577] 2.5: RNA, defining enums, pointers and collections
 properties is now possible from python, but it's still work in progress.

Pointers and collections are restricted to types derived from
IDPropertyGroup (same as for operators), because RNA knows how to
allocate/deallocate those.

Collections have .add() and .remove(number) functions that can be
used. The remove function should be fixed to take an other argument
than a number.

With the IDPropertyGroup restriction, pointers are more like nested
structs. They don't have add(), remove() yet, not sure where to put
them. Currently the pointer / nested struct is automatically allocated
in the get() function, this needs to be fixed, rule is that RNA get()
will not change any data for thread safety.

Also, it is only possible to add properties to structs after they have
been registered, which needs to be improved as well.

Example code:
http://www.pasteall.org/7201/python
---
 source/blender/blenkernel/intern/idprop.c     |   2 +-
 source/blender/blenloader/intern/readfile.c   |   7 +-
 source/blender/blenloader/intern/writefile.c  |   6 +-
 source/blender/editors/screen/screen_ops.c    |   1 -
 source/blender/makesrna/RNA_access.h          |   2 +-
 source/blender/makesrna/RNA_types.h           |   2 +-
 source/blender/makesrna/intern/rna_ID.c       |  26 ++
 source/blender/makesrna/intern/rna_access.c   |  36 ++-
 source/blender/makesrna/intern/rna_define.c   |  17 ++
 source/blender/makesrna/intern/rna_internal.h |   3 +
 source/blender/makesrna/intern/rna_main.c     |  58 ++--
 source/blender/makesrna/intern/rna_render.c   |   2 +-
 source/blender/makesrna/intern/rna_ui.c       |   6 +-
 source/blender/python/intern/bpy_rna.c        | 260 ++++++++++++++++--
 source/blender/python/intern/bpy_rna.h        |   7 +-
 15 files changed, 358 insertions(+), 77 deletions(-)

diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 54366aadd92..3cff82f522a 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -167,7 +167,7 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen)
 		for (i=newlen; i<prop->len; i++) {
 			IDP_FreeProperty(GETPROP(prop, i));
 		}
-		memcpy(newarr, prop->data.pointer, newlen*prop->len*sizeof(IDProperty));
+		memcpy(newarr, prop->data.pointer, newlen*sizeof(IDProperty));
 	}
 
 	if(prop->data.pointer)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9272c6fe353..61f6cb8b44c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1366,7 +1366,7 @@ void IDP_LibLinkProperty(IDProperty *prop, int switch_endian, FileData *fd);
 
 static void IDP_DirectLinkIDPArray(IDProperty *prop, int switch_endian, FileData *fd)
 {
-	IDProperty **array;
+	IDProperty *array;
 	int i;
 
 	/*since we didn't save the extra buffer, set totallen to len.*/
@@ -1374,11 +1374,10 @@ static void IDP_DirectLinkIDPArray(IDProperty *prop, int switch_endian, FileData
 	prop->data.pointer = newdataadr(fd, prop->data.pointer);
 
 	if (switch_endian) {
-		test_pointer_array(fd, prop->data.pointer);
-		array= (IDProperty**) prop->data.pointer;
+		array= (IDProperty*) prop->data.pointer;
 
 		for(i=0; i<prop->len; i++)
-			IDP_DirectLinkProperty(array[i], switch_endian, fd);
+			IDP_DirectLinkProperty(&array[i], switch_endian, fd);
 	}
 }
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index cd388cdf9cc..9d059af9887 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -407,13 +407,13 @@ static void IDP_WriteIDPArray(IDProperty *prop, void *wd)
 {
 	/*REMEMBER to set totalen to len in the linking code!!*/
 	if (prop->data.pointer) {
-		IDProperty **array = prop->data.pointer;
+		IDProperty *array = prop->data.pointer;
 		int a;
 
-		writedata(wd, DATA, MEM_allocN_len(prop->data.pointer), prop->data.pointer);
+		writestruct(wd, DATA, "IDProperty", prop->len, array);
 
 		for(a=0; a<prop->len; a++)
-			IDP_WriteProperty(array[a], wd);
+			IDP_WriteProperty_OnlyData(&array[a], wd);
 	}
 }
 
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index b591c6e6856..fab4de50568 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1582,7 +1582,6 @@ static void SCREEN_OT_screen_set(wmOperatorType *ot)
 	ot->poll= ED_operator_screenactive;
 	
 	/* rna */
-	RNA_def_pointer_runtime(ot->srna, "screen", &RNA_Screen, "Screen", "");
 	RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
 }
 
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 95c46515204..d5680ac77ba 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -649,7 +649,7 @@ RawPropertyType RNA_property_raw_type(PropertyRNA *prop);
 void RNA_property_pointer_add(PointerRNA *ptr, PropertyRNA *prop);
 void RNA_property_pointer_remove(PointerRNA *ptr, PropertyRNA *prop);
 void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr);
-void RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key);
+int RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key);
 void RNA_property_collection_clear(PointerRNA *ptr, PropertyRNA *prop);
 
 /* Path
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 72ecf0e7a93..042f7578cf4 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -263,7 +263,7 @@ typedef int (*StructValidateFunc)(struct PointerRNA *ptr, void *data, int *have_
 typedef int (*StructCallbackFunc)(struct PointerRNA *ptr, struct FunctionRNA *func, ParameterList *list);
 typedef void (*StructFreeFunc)(void *data);
 typedef struct StructRNA *(*StructRegisterFunc)(const struct bContext *C, struct ReportList *reports, void *data,
-	StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
+	const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
 typedef void (*StructUnregisterFunc)(const struct bContext *C, struct StructRNA *type);
 
 typedef struct StructRNA StructRNA;
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index cf3d59f78a0..f6e0a2468c4 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -152,6 +152,30 @@ IDProperty *rna_IDPropertyGroup_idproperties(PointerRNA *ptr, int create)
 	return ptr->data;
 }
 
+void rna_IDPropertyGroup_unregister(const bContext *C, StructRNA *type)
+{
+	RNA_struct_free(&BLENDER_RNA, type);
+}
+
+StructRNA *rna_IDPropertyGroup_register(const bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+{
+	PointerRNA dummyptr;
+
+	/* create dummy pointer */
+	RNA_pointer_create(NULL, &RNA_IDPropertyGroup, NULL, &dummyptr);
+
+	/* validate the python class */
+	if(validate(&dummyptr, data, NULL) != 0)
+		return NULL;
+
+	return RNA_def_struct(&BLENDER_RNA, identifier, "IDPropertyGroup");  // XXX
+}
+
+StructRNA* rna_IDPropertyGroup_refine(PointerRNA *ptr)
+{
+	return ptr->type;
+}
+
 #else
 
 static void rna_def_ID_properties(BlenderRNA *brna)
@@ -210,6 +234,8 @@ static void rna_def_ID_properties(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "IDPropertyGroup", NULL);
 	RNA_def_struct_ui_text(srna, "ID Property Group", "Group of ID properties.");
 	RNA_def_struct_idproperties_func(srna, "rna_IDPropertyGroup_idproperties");
+	RNA_def_struct_register_funcs(srna, "rna_IDPropertyGroup_register", "rna_IDPropertyGroup_unregister");
+	RNA_def_struct_refine_func(srna, "rna_IDPropertyGroup_refine");
 }
 
 static void rna_def_ID(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 2de59586611..54cde57a54f 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1259,8 +1259,15 @@ PointerRNA RNA_property_pointer_get(PointerRNA *ptr, PropertyRNA *prop)
 	else if(pprop->get) {
 		return pprop->get(ptr);
 	}
+	else if(prop->flag & PROP_IDPROPERTY) {
+		/* XXX temporary hack to add it automatically, reading should
+		   never do any write ops, to ensure thread safety etc .. */
+		RNA_property_pointer_add(ptr, prop);
+		return RNA_property_pointer_get(ptr, prop);
+	}
 	else {
 		PointerRNA result;
+
 		memset(&result, 0, sizeof(result));
 		return result;
 	}
@@ -1398,7 +1405,7 @@ int RNA_property_collection_length(PointerRNA *ptr, PropertyRNA *prop)
 void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr)
 {
 	IDProperty *idprop;
-	//CollectionPropertyRNA *cprop= (CollectionPropertyRNA*)prop;
+	CollectionPropertyRNA *cprop= (CollectionPropertyRNA*)prop;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
 		IDPropertyTemplate val = {0};
@@ -1424,7 +1431,6 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA
 			MEM_freeN(item);
 		}
 	}
-#if 0
 	else if(cprop->add){
 		if(!(cprop->add->flag & FUNC_USE_CONTEXT)) { /* XXX check for this somewhere else */
 			ParameterList params;
@@ -1433,9 +1439,8 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA
 			RNA_parameter_list_free(&params);
 		}
 	}
-#endif
-	else
-		printf("RNA_property_collection_add %s.%s: not implemented for this property.\n", ptr->type->identifier, prop->identifier);
+	/*else
+		printf("RNA_property_collection_add %s.%s: not implemented for this property.\n", ptr->type->identifier, prop->identifier);*/
 
 	if(r_ptr) {
 		if(idprop) {
@@ -1450,10 +1455,10 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA
 	}
 }
 
-void RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key)
+int RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key)
 {
 	IDProperty *idprop;
-	//CollectionPropertyRNA *cprop= (CollectionPropertyRNA*)prop;
+	CollectionPropertyRNA *cprop= (CollectionPropertyRNA*)prop;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
 		IDProperty tmp, *array;
@@ -1472,20 +1477,25 @@ void RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key)
 
 			IDP_ResizeIDPArray(idprop, len-1);
 		}
+
+		return 1;
 	}
-	else if(prop->flag & PROP_IDPROPERTY);
-#if 0
+	else if(prop->flag & PROP_IDPROPERTY)
+		return 1;
 	else if(cprop->remove){
 		if(!(cprop->remove->flag & FUNC_USE_CONTEXT)) { /* XXX check for this somewhere else */
 			ParameterList params;
-			RNA_parameter_list_create(&ptr, cprop->remove);
+			RNA_parameter_list_create(&params, ptr, cprop->remove);
 			RNA_function_call(NULL, NULL, ptr, cprop->remove, &params);
 			RNA_parameter_list_free(&params);
 		}
+
+		return 0;
 	}
-#endif
-	else
-		printf("RNA_property_collection_remove %s.%s: only supported for id properties.\n", ptr->type->identifier, prop->identifier);
+	/*else
+		printf("RNA_property_collection_remove %s.%s: only supported for id properties.\n", ptr->type->identifier, prop->identifier);*/
+	
+	return 0;
 }
 
 void RNA_property_collection_clear(PointerRNA *ptr, PropertyRNA *prop)
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 0861d7d51a0..9bdbc8baed7 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -2419,6 +2419,7 @@ void RNA_def_property_duplicate_pointers(PropertyRNA *prop)
 	EnumPropertyItem *earray;
 	float *farray;
 	int *iarray;
+	int a;
 
 	if(prop->identifier) prop->identifier= BLI_strdup(prop->identifier);
 	if(prop->name) prop->name= BLI_strdup(prop->name);
@@ -2452,7 +2453,14 @@ void RNA_def_property_duplicate_pointers(PropertyRNA *prop)
 				earray= MEM_callocN(sizeof(EnumPropertyItem)*(eprop->totitem+1), "RNA_def_property_store"),
 				memcpy(earray, eprop->item, sizeof(EnumPropertyItem)*(eprop->totitem+1));
 				eprop->item= earray;
+
+				for(a=0; a<eprop->totitem; a++) {
+					if(eprop->item[a].identifier) eprop->item[a].identifier= BLI_strdup(eprop->item[a].identifier);
+					if(eprop->item[a].name) eprop->item[a].name= BLI_strdup(eprop->item[a].name);
+					if(eprop->item[a].description) eprop->item[a].description= BLI_strdup(eprop->item[a].description);
+				}
 			}
+			break;
 		}
 		case PROP_FLOAT: {
 			FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
@@ -2479,6 +2487,8 @@ void RNA_def_property_duplicate_pointers(PropertyRNA *prop)
 void RNA_def_property_free_pointers(PropertyRNA *prop)
 {
 	if(prop->flag & PROP_FREE_POINTERS) {
+		int a;
+
 		if(prop->identifier) MEM_freeN((void*)prop->identifier);
 		if(prop->name) MEM_freeN((void*)prop->name);
 		if(prop->description) MEM_freeN((void*)prop->description);
@@ -2502,6 +2512,13 @@ void RNA_def_property_free_pointers(PropertyRNA *prop)
 			case PROP_ENUM: {
 				EnumPropertyRNA *eprop= (EnumPropertyRNA*)prop;
 				if(eprop->item) MEM_freeN((void*)eprop->item);
+
+				for(a=0; a<eprop->totitem; a++) {
+					if(eprop->item[a].identifier) MEM_freeN((void*)eprop->item[a].identifier);
+					if(eprop->item[a].name) MEM_freeN((void*)eprop->item[a].name);
+					if(eprop->item[a].description) MEM_freeN((void*)eprop->item[a].description);
+				}
+				break;
 			}
 			case PROP_STRING: {
 				StringPropertyRNA *sprop= (StringPropertyRNA*)prop;
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index a8c7032733f..579441691ff 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -181,6 +181,9 @@ struct StructRNA *rna_ID_refine(struct PointerRNA *ptr);
 struct IDProperty *rna_ID_idproperties(struct PointerRNA *ptr, int create);
 void rna_ID_fake_user_set(struct PointerRNA *ptr, int value);
 struct IDProperty *rna_IDPropertyGroup_idproperties(struct PointerRNA *ptr, int create);
+void rna_IDPropertyGroup_unregister(const struct bContext *C, struct StructRNA *type);
+struct StructRNA *rna_IDPropertyGroup_register(const struct bContext *C, struct ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
+struct StructRNA* rna_IDPropertyGroup_refine(struct PointerRNA *ptr);
 
 void rna_object_vgroup_name_index_get(struct PointerRNA *ptr, char *value, int index);
 int rna_object_vgroup_name_index_length(struct PointerRNA *ptr, int index);
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 26fc3c2941e..c09b83dd682 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -220,34 +220,34 @@ void RNA_def_main(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	const char *lists[][5]= {
-		{"cameras", "Camera", "rna_Main_camera_begin", "Cameras", "Camera datablocks."},
-		{"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene datablocks."},
-		{"objects", "Object", "rna_Main_object_begin", "Objects", "Object datablocks."},
-		{"materials", "Material", "rna_Main_mat_begin", "Materials", "Material datablocks."},
-		{"nodetrees", "NodeTree", "rna_Main_nodetree_begin", "Node Trees", "Nodetree datablocks."},
-		{"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh datablocks."}, 
-		{"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp datablocks."},
-		{"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library datablocks."},
-		{"screens", "Screen", "rna_Main_screen_begin", "Screens", "Screen datablocks."},
-		{"windowmanagers", "WindowManager", "rna_Main_wm_begin", "Window Managers", "Window manager datablocks."},
-		{"images", "Image", "rna_Main_image_begin", "Images", "Image datablocks."},
-		{"lattices", "Lattice", "rna_Main_latt_begin", "Lattices", "Lattice datablocks."},
-		{"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve datablocks."}, 
-		{"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs", "Metaball datablocks."},
-		{"vfonts", "VectorFont", "rna_Main_vfont_begin", "Vector Fonts", "Vector font datablocks."},
-		{"textures", "Texture", "rna_Main_tex_begin", "Textures", "Texture datablocks."},
-		{"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush datablocks."},
-		{"worlds", "World", "rna_Main_world_begin", "Worlds", "World datablocks."},
-		{"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks."},
-		{"keys", "ID", "rna_Main_key_begin", "Keys", "Key datablocks."},
-		{"scripts", "ID", "rna_Main_script_begin", "Scripts", "Script datablocks."},
-		{"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks."},
-		{"sounds", "ID", "rna_Main_sound_begin", "Sounds", "Sound datablocks."},
-		{"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature datablocks."},
-		{"actions", "Action", "rna_Main_action_begin", "Actions", "Action datablocks."},
-		{"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle datablocks."},
-		{NULL, NULL, NULL, NULL, NULL}};
+	const char *lists[][7]= {
+		{"cameras", "Camera", "rna_Main_camera_begin", "Cameras", "Camera datablocks.", NULL, NULL},
+		{"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene datablocks.", NULL, NULL},
+		{"objects", "Object", "rna_Main_object_begin", "Objects", "Object datablocks.", NULL, NULL},
+		{"materials", "Material", "rna_Main_mat_begin", "Materials", "Material datablocks.", NULL, NULL},
+		{"nodetrees", "NodeTree", "rna_Main_nodetree_begin", "Node Trees", "Nodetree datablocks.", NULL, NULL},
+		{"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh datablocks.", "add_mesh", "remove_mesh"}, 
+		{"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp datablocks.", NULL, NULL},
+		{"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library datablocks.", NULL, NULL},
+		{"screens", "Screen", "rna_Main_screen_begin", "Screens", "Screen datablocks.", NULL, NULL},
+		{"windowmanagers", "WindowManager", "rna_Main_wm_begin", "Window Managers", "Window manager datablocks.", NULL, NULL},
+		{"images", "Image", "rna_Main_image_begin", "Images", "Image datablocks.", NULL, NULL},
+		{"lattices", "Lattice", "rna_Main_latt_begin", "Lattices", "Lattice datablocks.", NULL, NULL},
+		{"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve datablocks.", NULL, NULL} ,
+		{"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs", "Metaball datablocks.", NULL, NULL},
+		{"vfonts", "VectorFont", "rna_Main_vfont_begin", "Vector Fonts", "Vector font datablocks.", NULL, NULL},
+		{"textures", "Texture", "rna_Main_tex_begin", "Textures", "Texture datablocks.", NULL, NULL},
+		{"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush datablocks.", NULL, NULL},
+		{"worlds", "World", "rna_Main_world_begin", "Worlds", "World datablocks.", NULL, NULL},
+		{"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks.", NULL, NULL},
+		{"keys", "ID", "rna_Main_key_begin", "Keys", "Key datablocks.", NULL, NULL},
+		{"scripts", "ID", "rna_Main_script_begin", "Scripts", "Script datablocks.", NULL, NULL},
+		{"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks.", NULL, NULL},
+		{"sounds", "ID", "rna_Main_sound_begin", "Sounds", "Sound datablocks.", NULL, NULL},
+		{"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature datablocks.", NULL, NULL},
+		{"actions", "Action", "rna_Main_action_begin", "Actions", "Action datablocks.", NULL, NULL},
+		{"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle datablocks.", NULL, NULL},
+		{NULL, NULL, NULL, NULL, NULL, NULL, NULL}};
 	int i;
 	
 	srna= RNA_def_struct(brna, "Main", NULL);
@@ -264,7 +264,7 @@ void RNA_def_main(BlenderRNA *brna)
 	{
 		prop= RNA_def_property(srna, lists[i][0], PROP_COLLECTION, PROP_NONE);
 		RNA_def_property_struct_type(prop, lists[i][1]);
-		RNA_def_property_collection_funcs(prop, lists[i][2], "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0, 0);
+		RNA_def_property_collection_funcs(prop, lists[i][2], "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, lists[i][5], lists[i][6]);
 		RNA_def_property_ui_text(prop, lists[i][3], lists[i][4]);
 	}
 
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index a219bd5aefa..9137e596da1 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -111,7 +111,7 @@ static void rna_RenderEngine_unregister(const bContext *C, StructRNA *type)
 	RNA_struct_free(&BLENDER_RNA, type);
 }
 
-static StructRNA *rna_RenderEngine_register(const bContext *C, ReportList *reports, void *data, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+static StructRNA *rna_RenderEngine_register(const bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
 {
 	RenderEngineType *et, dummyet = {0};
 	RenderEngine dummyengine= {0};
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 660dbb49027..f16180451a7 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -148,7 +148,7 @@ static void rna_Panel_unregister(const bContext *C, StructRNA *type)
 		WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
 }
 
-static StructRNA *rna_Panel_register(const bContext *C, ReportList *reports, void *data, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+static StructRNA *rna_Panel_register(const bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
 {
 	ARegionType *art;
 	PanelType *pt, dummypt = {0};
@@ -245,7 +245,7 @@ static void rna_Header_unregister(const bContext *C, StructRNA *type)
 		WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
 }
 
-static StructRNA *rna_Header_register(const bContext *C, ReportList *reports, void *data, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+static StructRNA *rna_Header_register(const bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
 {
 	ARegionType *art;
 	HeaderType *ht, dummyht = {0};
@@ -361,7 +361,7 @@ static void rna_Menu_unregister(const bContext *C, StructRNA *type)
 		WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
 }
 
-static StructRNA *rna_Menu_register(const bContext *C, ReportList *reports, void *data, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+static StructRNA *rna_Menu_register(const bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
 {
 	ARegionType *art;
 	MenuType *mt, dummymt = {0};
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 114727eeef5..bece114d8bd 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1451,6 +1451,38 @@ static PyObject *pyrna_prop_get(BPy_PropertyRNA *self, PyObject *args)
 }
 
 
+static PyObject *pyrna_prop_add(BPy_PropertyRNA *self, PyObject *args)
+{
+	PointerRNA newptr;
+
+	RNA_property_collection_add(&self->ptr, self->prop, &newptr);
+	if(!newptr.data) {
+		PyErr_SetString( PyExc_TypeError, "add() not supported for this collection");
+		return NULL;
+	}
+	else {
+		return pyrna_struct_CreatePyObject(&newptr);
+	}
+}
+
+static PyObject *pyrna_prop_remove(BPy_PropertyRNA *self, PyObject *args)
+{
+	PyObject *ret;
+	int key= 0;
+
+	if (!PyArg_ParseTuple(args, "i:remove", &key))
+		return NULL;
+
+	if(!RNA_property_collection_remove(&self->ptr, self->prop, key)) {
+		PyErr_SetString( PyExc_TypeError, "remove() not supported for this collection");
+		return NULL;
+	}
+
+	ret = Py_None;
+	Py_INCREF(ret);
+
+	return ret;
+}
 
 static void foreach_attr_type(	BPy_PropertyRNA *self, char *attr,
 									/* values to assign */
@@ -1736,6 +1768,9 @@ static struct PyMethodDef pyrna_prop_methods[] = {
 	
 	{"get", (PyCFunction)pyrna_prop_get, METH_VARARGS, NULL},
 
+	{"add", (PyCFunction)pyrna_prop_add, METH_VARARGS, NULL},
+	{"remove", (PyCFunction)pyrna_prop_remove, METH_VARARGS, NULL},
+
 	/* array accessor function */
 	{"foreach_get", (PyCFunction)pyrna_prop_foreach_get, METH_VARARGS, NULL},
 	{"foreach_set", (PyCFunction)pyrna_prop_foreach_set, METH_VARARGS, NULL},
@@ -2307,10 +2342,13 @@ PyObject *BPy_GetStructRNA(PyObject *self)
 */
 
 static struct PyMethodDef pyrna_struct_subtype_methods[] = {
-	{"FloatProperty", (PyCFunction)BPy_FloatProperty, METH_VARARGS|METH_KEYWORDS, ""},
-	{"IntProperty", (PyCFunction)BPy_IntProperty, METH_VARARGS|METH_KEYWORDS, ""},
 	{"BoolProperty", (PyCFunction)BPy_BoolProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"IntProperty", (PyCFunction)BPy_IntProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"FloatProperty", (PyCFunction)BPy_FloatProperty, METH_VARARGS|METH_KEYWORDS, ""},
 	{"StringProperty", (PyCFunction)BPy_StringProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"EnumProperty", (PyCFunction)BPy_EnumProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"PointerProperty", (PyCFunction)BPy_PointerProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"CollectionProperty", (PyCFunction)BPy_CollectionProperty, METH_VARARGS|METH_KEYWORDS, ""},
 
 //	{"__get_rna", (PyCFunction)BPy_GetStructRNA, METH_NOARGS, ""},
 	{NULL, NULL, 0, NULL}
@@ -2583,10 +2621,13 @@ PyObject *BPY_rna_types(void)
 }
 
 static struct PyMethodDef props_methods[] = {
-	{"FloatProperty", (PyCFunction)BPy_FloatProperty, METH_VARARGS|METH_KEYWORDS, ""},
-	{"IntProperty", (PyCFunction)BPy_IntProperty, METH_VARARGS|METH_KEYWORDS, ""},
 	{"BoolProperty", (PyCFunction)BPy_BoolProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"IntProperty", (PyCFunction)BPy_IntProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"FloatProperty", (PyCFunction)BPy_FloatProperty, METH_VARARGS|METH_KEYWORDS, ""},
 	{"StringProperty", (PyCFunction)BPy_StringProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"EnumProperty", (PyCFunction)BPy_EnumProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"PointerProperty", (PyCFunction)BPy_PointerProperty, METH_VARARGS|METH_KEYWORDS, ""},
+	{"CollectionProperty", (PyCFunction)BPy_CollectionProperty, METH_VARARGS|METH_KEYWORDS, ""},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -2679,15 +2720,16 @@ static PyObject *bpy_prop_deferred_return(void *func, PyObject *kw)
 
 /* Function that sets RNA, NOTE - self is NULL when called from python, but being abused from C so we can pass the srna allong
  * This isnt incorrect since its a python object - but be careful */
-PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
+
+PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
 {
-	static char *kwlist[] = {"attr", "name", "description", "min", "max", "soft_min", "soft_max", "default", NULL};
+	static char *kwlist[] = {"attr", "name", "description", "default", NULL};
 	char *id, *name="", *description="";
-	float min=FLT_MIN, max=FLT_MAX, soft_min=FLT_MIN, soft_max=FLT_MAX, def=0.0f;
+	int def=0;
 	PropertyRNA *prop;
 	StructRNA *srna;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssfffff:FloatProperty", kwlist, &id, &name, &description, &min, &max, &soft_min, &soft_max, &def))
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssi:BoolProperty", kwlist, &id, &name, &description, &def))
 		return NULL;
 	
 	if (PyTuple_Size(args) > 0) {
@@ -2700,12 +2742,12 @@ PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
 		return NULL; /* self's type was compatible but error getting the srna */
 	}
 	else if(srna) {
-		prop= RNA_def_float(srna, id, def, min, max, name, description, soft_min, soft_max);
+		prop= RNA_def_boolean(srna, id, def, name, description);
 		RNA_def_property_duplicate_pointers(prop);
 		Py_RETURN_NONE;
 	}
 	else { /* operators defer running this function */
-		return bpy_prop_deferred_return((void *)BPy_FloatProperty, kw);
+		return bpy_prop_deferred_return((void *)BPy_BoolProperty, kw);
 	}
 }
 
@@ -2739,15 +2781,15 @@ PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
 	}
 }
 
-PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
+PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
 {
-	static char *kwlist[] = {"attr", "name", "description", "default", NULL};
+	static char *kwlist[] = {"attr", "name", "description", "min", "max", "soft_min", "soft_max", "default", NULL};
 	char *id, *name="", *description="";
-	int def=0;
+	float min=FLT_MIN, max=FLT_MAX, soft_min=FLT_MIN, soft_max=FLT_MAX, def=0.0f;
 	PropertyRNA *prop;
 	StructRNA *srna;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssi:BoolProperty", kwlist, &id, &name, &description, &def))
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssfffff:FloatProperty", kwlist, &id, &name, &description, &min, &max, &soft_min, &soft_max, &def))
 		return NULL;
 	
 	if (PyTuple_Size(args) > 0) {
@@ -2760,12 +2802,12 @@ PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
 		return NULL; /* self's type was compatible but error getting the srna */
 	}
 	else if(srna) {
-		prop= RNA_def_boolean(srna, id, def, name, description);
+		prop= RNA_def_float(srna, id, def, min, max, name, description, soft_min, soft_max);
 		RNA_def_property_duplicate_pointers(prop);
 		Py_RETURN_NONE;
 	}
 	else { /* operators defer running this function */
-		return bpy_prop_deferred_return((void *)BPy_BoolProperty, kw);
+		return bpy_prop_deferred_return((void *)BPy_FloatProperty, kw);
 	}
 }
 
@@ -2799,6 +2841,178 @@ PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw)
 	}
 }
 
+static EnumPropertyItem *enum_items_from_py(PyObject *value, const char *def, int *defvalue)
+{
+	EnumPropertyItem *items= NULL;
+	PyObject *item;
+	int seq_len, i, totitem= 0;
+	
+	if(!PySequence_Check(value)) {
+		PyErr_SetString(PyExc_TypeError, "expected a sequence of tuples for the enum items");
+		return NULL;
+	}
+
+	seq_len = PySequence_Length(value);
+	for(i=0; i<seq_len; i++) {
+		EnumPropertyItem tmp= {0, "", 0, "", ""};
+
+		item= PySequence_GetItem(value, i);
+		if(item==NULL || PyTuple_Check(item)==0) {
+			PyErr_SetString(PyExc_TypeError, "expected a sequence of tuples for the enum items");
+			if(items) MEM_freeN(items);
+			Py_XDECREF(item);
+			return NULL;
+		}
+
+		if(!PyArg_ParseTuple(item, "sss", &tmp.identifier, &tmp.name, &tmp.description)) {
+			PyErr_SetString(PyExc_TypeError, "expected an identifier, name and description in the tuple");
+			Py_DECREF(item);
+			return NULL;
+		}
+
+		tmp.value= i;
+		RNA_enum_item_add(&items, &totitem, &tmp);
+
+		if(def[0] && strcmp(def, tmp.identifier) == 0)
+			*defvalue= tmp.value;
+
+		Py_DECREF(item);
+	}
+
+	if(!def[0])
+		*defvalue= 0;
+
+	RNA_enum_item_end(&items, &totitem);
+
+	return items;
+}
+
+PyObject *BPy_EnumProperty(PyObject *self, PyObject *args, PyObject *kw)
+{
+	static char *kwlist[] = {"attr", "items", "name", "description", "default", NULL};
+	char *id, *name="", *description="", *def="";
+	int defvalue=0;
+	PyObject *items= Py_None;
+	EnumPropertyItem *eitems;
+	PropertyRNA *prop;
+	StructRNA *srna;
+
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "sO|sss:EnumProperty", kwlist, &id, &items, &name, &description, &def))
+		return NULL;
+	
+	if (PyTuple_Size(args) > 0) {
+	 	PyErr_SetString(PyExc_ValueError, "all args must be keywors"); // TODO - py3 can enforce this.
+		return NULL;
+	}
+	
+	srna= srna_from_self(self);
+	if(srna==NULL && PyErr_Occurred()) {
+		return NULL; /* self's type was compatible but error getting the srna */
+	}
+	else if(srna) {
+		eitems= enum_items_from_py(items, def, &defvalue);
+		if(!eitems)
+			return NULL;
+			
+		prop= RNA_def_enum(srna, id, eitems, defvalue, name, description);
+		RNA_def_property_duplicate_pointers(prop);
+		MEM_freeN(eitems);
+
+		Py_RETURN_NONE;
+	}
+	else { /* operators defer running this function */
+		return bpy_prop_deferred_return((void *)BPy_EnumProperty, kw);
+	}
+}
+
+static StructRNA *pointer_type_from_py(PyObject *value)
+{
+	StructRNA *srna;
+
+	srna= srna_from_self(value);
+	if(!srna) {
+	 	PyErr_SetString(PyExc_SystemError, "expected an RNA type derived from IDPropertyGroup (1)");
+		return NULL;
+	}
+
+	if(!RNA_struct_is_a(srna, &RNA_IDPropertyGroup)) {
+	 	PyErr_SetString(PyExc_SystemError, "expected an RNA type derived from IDPropertyGroup (3)");
+		return NULL;
+	}
+
+	return srna;
+}
+
+PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *kw)
+{
+	static char *kwlist[] = {"attr", "type", "name", "description", NULL};
+	char *id, *name="", *description="";
+	PropertyRNA *prop;
+	StructRNA *srna, *ptype;
+	PyObject *type= Py_None;
+
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "sO|ss:PointerProperty", kwlist, &id, &type, &name, &description))
+		return NULL;
+	
+	if (PyTuple_Size(args) > 0) {
+	 	PyErr_SetString(PyExc_ValueError, "all args must be keywors"); // TODO - py3 can enforce this.
+		return NULL;
+	}
+
+	srna= srna_from_self(self);
+	if(srna==NULL && PyErr_Occurred()) {
+		return NULL; /* self's type was compatible but error getting the srna */
+	}
+	else if(srna) {
+		ptype= pointer_type_from_py(type);
+		if(!ptype)
+			return NULL;
+
+		prop= RNA_def_pointer_runtime(srna, id, ptype, name, description);
+		RNA_def_property_duplicate_pointers(prop);
+		Py_RETURN_NONE;
+	}
+	else { /* operators defer running this function */
+		return bpy_prop_deferred_return((void *)BPy_PointerProperty, kw);
+	}
+	return NULL;
+}
+
+PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject *kw)
+{
+	static char *kwlist[] = {"attr", "type", "name", "description", NULL};
+	char *id, *name="", *description="";
+	PropertyRNA *prop;
+	StructRNA *srna, *ptype;
+	PyObject *type= Py_None;
+
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "sO|ss:CollectionProperty", kwlist, &id, &type, &name, &description))
+		return NULL;
+	
+	if (PyTuple_Size(args) > 0) {
+	 	PyErr_SetString(PyExc_ValueError, "all args must be keywors"); // TODO - py3 can enforce this.
+		return NULL;
+	}
+
+	srna= srna_from_self(self);
+	if(srna==NULL && PyErr_Occurred()) {
+		return NULL; /* self's type was compatible but error getting the srna */
+	}
+	else if(srna) {
+		ptype= pointer_type_from_py(type);
+		if(!ptype)
+			return NULL;
+
+		prop= RNA_def_collection_runtime(srna, id, ptype, name, description);
+		RNA_def_property_duplicate_pointers(prop);
+		Py_RETURN_NONE;
+	}
+	else { /* operators defer running this function */
+		return bpy_prop_deferred_return((void *)BPy_CollectionProperty, kw);
+	}
+	return NULL;
+}
+
 /*-------------------- Type Registration ------------------------*/
 
 static int rna_function_arg_count(FunctionRNA *func)
@@ -3113,6 +3327,8 @@ PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class)
 	StructRegisterFunc reg;
 	StructRNA *srna;
 	StructRNA *srna_new;
+	PyObject *item;
+	const char *identifier= "";
 
 	srna= pyrna_struct_as_srna(py_class);
 	if(srna==NULL)
@@ -3129,9 +3345,17 @@ PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class)
 	/* get the context, so register callback can do necessary refreshes */
 	C= BPy_GetContext();
 
-	/* call the register callback */
+	/* call the register callback with reports & identifier */
 	BKE_reports_init(&reports, RPT_STORE);
-	srna_new= reg(C, &reports, py_class, bpy_class_validate, bpy_class_call, bpy_class_free);
+
+	item= PyObject_GetAttrString(py_class, "__name__");
+
+	if(item) {
+		identifier= _PyUnicode_AsString(item);
+		Py_DECREF(item); /* no need to keep a ref, the class owns it */
+	}
+
+	srna_new= reg(C, &reports, py_class, identifier, bpy_class_validate, bpy_class_call, bpy_class_free);
 
 	if(!srna_new) {
 		BPy_reports_to_error(&reports);
diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h
index 717ea75a7a8..1b8d69bc511 100644
--- a/source/blender/python/intern/bpy_rna.h
+++ b/source/blender/python/intern/bpy_rna.h
@@ -75,10 +75,13 @@ int pyrna_pydict_to_props(PointerRNA *ptr, PyObject *kw, int all_args, const cha
 PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop);
 
 /* functions for setting up new props - experemental */
-PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw);
-PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw);
 PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw);
+PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw);
+PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw);
 PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw);
+PyObject *BPy_EnumProperty(PyObject *self, PyObject *args, PyObject *kw);
+PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *kw);
+PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject *kw);
 
 /* function for registering types */
 PyObject *pyrna_basetype_register(PyObject *self, PyObject *args);

From ca20107edb7e80a9a87f1e7a3a38ae2ed63a3d4b Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Tue, 18 Aug 2009 01:39:49 +0000
Subject: [PATCH 110/577] 2.5/Sculpt:

* Added UI for rake mode
---
 release/ui/space_view3d_toolbar.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index be378cc46fe..1b4c1e25c34 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -352,6 +352,8 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 					col.itemR(brush, "persistent")
 					col.itemO("sculpt.set_persistent_base")
 
+				col.itemR(brush, "rake")
+
 			col.itemR(brush, "sculpt_tool")
 				
 		# Texture Paint Mode #

From 0dad5cfbcafeaa45b59b581dc217fe2ebd297f2d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 18 Aug 2009 03:24:46 +0000
Subject: [PATCH 111/577] CMake/Warnings * WITH_GAMEENGINE and WITH_BULLET were
 being added to the compiler flags, only define in areas that use them. *
 removed C++ unix warnings by adding -Wno-invalid-offsetof -Wno-sign-compare.
 the py api uses invalid offsets for attributes. * removed C unix
 -Wnested-externs warning, these are everywhere in blender. * removed unused
 BGE python headers * undefine _XOPEN_SOURCE and _POSIX_C_SOURCE in the BGE,
 python redefines. * renamed USE_BULLET in collision.c to WITH_BULLET for
 consistency

---
 CMakeLists.txt                                | 10 ++----
 source/blender/blenkernel/CMakeLists.txt      | 10 ++++--
 source/blender/blenkernel/intern/collision.c  |  4 +--
 source/blender/editors/CMakeLists.txt         |  4 +++
 source/blender/makesrna/intern/CMakeLists.txt |  4 +++
 source/gameengine/Expressions/KX_Python.h     | 11 ++++++
 .../Expressions/KX_Python_dynamic.h           | 36 -------------------
 .../gameengine/Expressions/KX_Python_static.h | 36 -------------------
 8 files changed, 31 insertions(+), 84 deletions(-)
 delete mode 100644 source/gameengine/Expressions/KX_Python_dynamic.h
 delete mode 100644 source/gameengine/Expressions/KX_Python_static.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e72227982d..16110e76607 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,6 +204,7 @@ IF(UNIX AND NOT APPLE)
 
   # Better warnings
   SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
+  SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
@@ -510,14 +511,8 @@ INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 
 #-----------------------------------------------------------------------------
 # Extra compile flags
-IF(WITH_GAMEENGINE)
-  SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DGAMEBLENDER ")
-ENDIF(WITH_GAMEENGINE)
-IF(WITH_BULLET)
-  SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DWITH_BULLET ")
-ENDIF(WITH_BULLET)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
 
 #-----------------------------------------------------------------------------
 # Libraries
@@ -537,3 +532,4 @@ ADD_SUBDIRECTORY(source/creator)
 IF(WITH_PLAYER)
   ADD_SUBDIRECTORY(blenderplayer)
 ENDIF(WITH_PLAYER)
+
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c1dfc2cf639..08d0d40f5be 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -30,14 +30,18 @@ SET(INC
   . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna
   ../render/extern/include ../../../intern/decimation/extern
   ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
-  ../../../intern/iksolver/extern ../blenloader ../quicktime
-  ../../../extern/bullet2/src
+  ../../../intern/iksolver/extern ../blenloader
   ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
   ../../../intern/bsp/extern
   ../../../intern/audaspace/intern
   ${ZLIB_INC}
 )
 
+IF(WITH_BULLET)
+  SET(INC ${INC} ../../../extern/bullet2/src)
+  ADD_DEFINITIONS(-DWITH_BULLET)
+ENDIF(WITH_BULLET)
+
 IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
@@ -51,7 +55,7 @@ IF(WITH_DDS)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index c122145c98f..37e9c93a108 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -591,7 +591,7 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap
 	ClothModifierData *clmd = ( ClothModifierData * ) md1;
 	CollisionModifierData *collmd = ( CollisionModifierData * ) md2;
 	MFace *face1=NULL, *face2 = NULL;
-#ifdef WITH_BULLET
+#ifdef USE_BULLET
 	ClothVertex *verts1 = clmd->clothObject->verts;
 #endif
 	double distance = 0;
@@ -669,7 +669,7 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap
 				break;
 		}
 
-#ifdef WITH_BULLET
+#ifdef USE_BULLET
 		// calc distance + normal
 		distance = plNearestPoints (
 			verts1[collpair->ap1].txold, verts1[collpair->ap2].txold, verts1[collpair->ap3].txold, collmd->current_x[collpair->bp1].co, collmd->current_x[collpair->bp2].co, collmd->current_x[collpair->bp3].co, collpair->pa,collpair->pb,collpair->vector );
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index fc28e21ab8f..96b6fa5b7ab 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -42,6 +42,10 @@ SET(INC ../windowmanager
   ../blenfont
 )
 
+IF(WITH_GAMEENGINE)
+  ADD_DEFINITIONS(-DGAMEBLENDER)
+ENDIF(WITH_GAMEENGINE)
+
 IF(WITH_INTERNATIONAL)
   ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 343df04d4ff..152f4031b91 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -42,6 +42,10 @@ SET(SRC
 INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib ../../windowmanager ../../editors/include ../../imbuf ../../render/extern/include .)
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
+IF(WITH_GAMEENGINE)
+  ADD_DEFINITIONS(-DGAMEBLENDER)
+ENDIF(WITH_GAMEENGINE)
+
 IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/KX_Python.h
index 61f7ef05042..f41accec730 100644
--- a/source/gameengine/Expressions/KX_Python.h
+++ b/source/gameengine/Expressions/KX_Python.h
@@ -30,6 +30,17 @@
 #define KX_PYTHON_H
 
 //#define USE_DL_EXPORT
+
+/* python redefines, quiet the compiler */
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
+
+#ifdef _POSIX_C_SOURCE
+#undef _POSIX_C_SOURCE
+#endif
+
+
 #include "Python.h"
 
 #define USE_MATHUTILS // Blender 2.5x api will use mathutils, for a while we might want to test without it
diff --git a/source/gameengine/Expressions/KX_Python_dynamic.h b/source/gameengine/Expressions/KX_Python_dynamic.h
deleted file mode 100644
index eb435bdf1c3..00000000000
--- a/source/gameengine/Expressions/KX_Python_dynamic.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef KX_PYTHON_H
-#define KX_PYTHON_H
-
-//#define USE_DL_EXPORT
-#include "Python.h"
-
-#endif // KX_PYTHON_H
-
diff --git a/source/gameengine/Expressions/KX_Python_static.h b/source/gameengine/Expressions/KX_Python_static.h
deleted file mode 100644
index f4f31f9b058..00000000000
--- a/source/gameengine/Expressions/KX_Python_static.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef KX_PYTHON_H
-#define KX_PYTHON_H
-
-#define USE_DL_EXPORT
-#include "Python.h"
-
-#endif // KX_PYTHON_H
-

From 798bed8424c64db8d6ac8e613a37b73eee303ec1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 18 Aug 2009 04:15:28 +0000
Subject: [PATCH 112/577] forgot to updated scons and make for the bullet
 defines

---
 source/blender/blenkernel/SConscript | 2 +-
 source/nan_compile.mk                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 6772cccbda6..261d5ee1471 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -52,7 +52,7 @@ if env['WITH_BF_QUICKTIME']:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 
 if env['WITH_BF_BULLET']:
-	defs.append('WITH_BULLET')
+	defs.append('USE_BULLET')
 
 if env['BF_NO_ELBEEM']:
 	defs.append('DISABLE_ELBEEM')
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index 4a4e472fa66..c62b4f2681b 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -40,8 +40,8 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 ifneq ($(NAN_NO_KETSJI), true)
     CFLAGS  += -DGAMEBLENDER=1
     ifeq ($(NAN_USE_BULLET), true)
-      CFLAGS  += -DUSE_BULLET -DWITH_BULLET
-      CCFLAGS += -DUSE_BULLET -DWITH_BULLET
+      CFLAGS  += -DUSE_BULLET
+      CCFLAGS += -DUSE_BULLET
     endif
 else
    CPPFLAGS += -DNO_KETSJI

From 61ffa9f1319133e5017b668af60644bd6c4eddc6 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 18 Aug 2009 04:15:47 +0000
Subject: [PATCH 113/577] 2.5 - Newly created KeyingSets are now automatically
 named properly.

---
 source/blender/blenkernel/intern/anim_sys.c             | 4 ++--
 source/blender/editors/space_outliner/outliner.c        | 2 +-
 source/blender/editors/space_outliner/outliner_header.c | 4 +++-
 source/blender/makesrna/intern/rna_scene.c              | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 204935cc38d..5eaf2133515 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -276,7 +276,7 @@ KeyingSet *BKE_keyingset_add (ListBase *list, const char name[], short flag, sho
 	if (name)
 		BLI_snprintf(ks->name, 64, name);
 	else
-		strcpy(ks->name, "Keying Set");
+		strcpy(ks->name, "KeyingSet");
 	
 	ks->flag= flag;
 	ks->keyingflag= keyingflag;
@@ -285,7 +285,7 @@ KeyingSet *BKE_keyingset_add (ListBase *list, const char name[], short flag, sho
 	BLI_addtail(list, ks);
 	
 	/* make sure KeyingSet has a unique name (this helps with identification) */
-	BLI_uniquename(list, ks, "Keying Set", ' ', offsetof(KeyingSet, name), 64);
+	BLI_uniquename(list, ks, "KeyingSet", '.', offsetof(KeyingSet, name), 64);
 	
 	/* return new KeyingSet for further editing */
 	return ks;
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index fffec61ec60..762ad82344b 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -3901,7 +3901,7 @@ static KeyingSet *verify_active_keyingset(Scene *scene, short add)
 	/* add if none found */
 	// XXX the default settings have yet to evolve
 	if ((add) && (ks==NULL)) {
-		ks= BKE_keyingset_add(&scene->keyingsets, "Keying Set", KEYINGSET_ABSOLUTE, 0);
+		ks= BKE_keyingset_add(&scene->keyingsets, NULL, KEYINGSET_ABSOLUTE, 0);
 		scene->active_keyingset= BLI_countlist(&scene->keyingsets);
 	}
 	
diff --git a/source/blender/editors/space_outliner/outliner_header.c b/source/blender/editors/space_outliner/outliner_header.c
index 0c7859ed4e2..d4eeaabd1d3 100644
--- a/source/blender/editors/space_outliner/outliner_header.c
+++ b/source/blender/editors/space_outliner/outliner_header.c
@@ -177,7 +177,7 @@ static void do_outliner_buttons(bContext *C, void *arg, int event)
 			/* add a new KeyingSet if active is -1 */
 			if (scene->active_keyingset == -1) {
 				// XXX the default settings have yet to evolve... need to keep this in sync with the 
-				BKE_keyingset_add(&scene->keyingsets, "KeyingSet", KEYINGSET_ABSOLUTE, 0);
+				BKE_keyingset_add(&scene->keyingsets, NULL, KEYINGSET_ABSOLUTE, 0);
 				scene->active_keyingset= BLI_countlist(&scene->keyingsets);
 			}
 			
@@ -196,6 +196,8 @@ static void do_outliner_buttons(bContext *C, void *arg, int event)
 					BLI_freelinkN(&scene->keyingsets, ks);
 					scene->active_keyingset= 0;
 				}
+				else
+					scene->active_keyingset= 0;
 			}
 			
 			/* redraw regions with KeyingSet info */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 440f12be2ce..bb6611205b6 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1845,6 +1845,7 @@ void RNA_def_scene(BlenderRNA *brna)
 	
 	prop= RNA_def_property(srna, "active_keying_set", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "KeyingSet");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_editable_func(prop, "rna_Scene_active_keying_set_editable");
 	RNA_def_property_pointer_funcs(prop, "rna_Scene_active_keying_set_get", "rna_Scene_active_keying_set_set", NULL);
 	RNA_def_property_ui_text(prop, "Active Keying Set", "Active Keying Set used to insert/delete keyframes.");

From 88f114af560d25dcc733695ff3c412144f3023cb Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 18 Aug 2009 11:25:50 +0000
Subject: [PATCH 114/577] Bugfix: Crash in demo file from ZanQdo (reported by
 jaguarandi).

Was caused by old animation-system code that was no longer working. I've commented out this code for now until we need something like this again.
---
 source/blender/editors/animation/anim_deps.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index 13667159fe0..af2355b91a5 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -138,6 +138,7 @@ void ANIM_action_to_pose_sync (Object *ob)
  */
 void ANIM_pose_to_action_sync (Object *ob, ScrArea *sa)
 {
+#if 0 // XXX old animation system
 	SpaceAction *saction= (SpaceAction *)sa->spacedata.first;
 	bArmature *arm= (bArmature *)ob->data;
 	bAction *act= (bAction *)ob->action;
@@ -174,4 +175,5 @@ void ANIM_pose_to_action_sync (Object *ob, ScrArea *sa)
 	
 	// XXX step 2 needs to be coded still... currently missing action/bone group API to do any more work here...	
 	// XXX step 3 needs to be coded still... it's a messy case to deal with (we'll use the temp indices for this?)
+#endif // XXX old animation system
 }

From a238034c61a47d1bc31098a48ee004bc1740ca8e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 18 Aug 2009 11:28:57 +0000
Subject: [PATCH 115/577] missed this define when renaming bullet defines

---
 source/blender/blenkernel/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 08d0d40f5be..516845b5b76 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -39,7 +39,7 @@ SET(INC
 
 IF(WITH_BULLET)
   SET(INC ${INC} ../../../extern/bullet2/src)
-  ADD_DEFINITIONS(-DWITH_BULLET)
+  ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
 IF(WITH_OPENEXR)

From 34b947d0bc0ef196f11b3ac4370d991b2faa2020 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 18 Aug 2009 11:48:34 +0000
Subject: [PATCH 116/577] 2.5 - Fixing some drawing problems I noticed in
 ZanQdo's file...

Alpha for icons wasn't getting set correctly in animation editors anymore. This commit should fix the issues there, though the scrollbars still have a few minor issues still too.

Also, NLA strips with repeats now have the repeat indicators drawn only 80% or so of the height, making it easier to distinguish between strips with repeats and bunches of strips.
---
 source/blender/editors/animation/anim_channels_defines.c | 4 ++++
 source/blender/editors/space_graph/graph_draw.c          | 6 ++++++
 source/blender/editors/space_nla/nla_draw.c              | 8 +++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 25e3c112389..acf7467713b 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -1902,6 +1902,10 @@ void ANIM_channel_draw (bAnimContext *ac, bAnimListElem *ale, float yminc, float
 		selected= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT);
 	else
 		selected= 0;
+		
+	/* set blending again, as may not be set in previous step */
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glEnable(GL_BLEND);
 	
 	/* step 1) draw backdrop ...........................................  */
 	if (acf->draw_backdrop)
diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index c2d8d7b1345..f3aa0fac42b 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -926,6 +926,10 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, SpaceIpo *sipo, ARe
 		
 		y= (float)ACHANNEL_FIRST;
 		
+		/* set blending again, as may not be set in previous step */
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_BLEND);
+		
 		for (ale= anim_data.first, i=0; ale; ale= ale->next, i++) {
 			const float yminc= (float)(y - ACHANNEL_HEIGHT_HALF);
 			const float ymaxc= (float)(y + ACHANNEL_HEIGHT_HALF);
@@ -944,6 +948,8 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, SpaceIpo *sipo, ARe
 		
 		uiEndBlock(C, block);
 		uiDrawBlock(C, block);
+		
+		glDisable(GL_BLEND);
 	}
 	
 	/* free tempolary channels */
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 3a0e150050b..f30954292b4 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -411,7 +411,7 @@ static void nla_draw_strip (SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStr
 			
 			/* don't draw if line would end up on or after the end of the strip */
 			if (repeatPos < strip->end)
-				fdrawline(repeatPos, yminc, repeatPos, ymaxc);
+				fdrawline(repeatPos, yminc+4, repeatPos, ymaxc-4);
 		}
 	}
 	/* or if meta-strip, draw lines delimiting extents of sub-strips (in same color as outline, if more than 1 exists) */
@@ -875,6 +875,10 @@ void draw_nla_channel_list (bContext *C, bAnimContext *ac, SpaceNla *snla, ARegi
 		
 		y= (float)(-NLACHANNEL_HEIGHT);
 		
+		/* set blending again, as may not be set in previous step */
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_BLEND);
+		
 		/* loop through channels, and set up drawing depending on their type  */	
 		for (ale= anim_data.first; ale; ale= ale->next) {
 			const float yminc= (float)(y - NLACHANNEL_HEIGHT_HALF);
@@ -894,6 +898,8 @@ void draw_nla_channel_list (bContext *C, bAnimContext *ac, SpaceNla *snla, ARegi
 		
 		uiEndBlock(C, block);
 		uiDrawBlock(C, block);
+		
+		glDisable(GL_BLEND);
 	}
 	
 	/* free tempolary channels */

From 6e10e93965291f011f48a0fb2cf0b3c149a8a1e6 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Tue, 18 Aug 2009 12:10:12 +0000
Subject: [PATCH 117/577] Renamed Buttons Window to Properties, for these
 reasons:

1) This fits with our splitting the old Buttons Window into Tools and Properties

2) The name Buttons Window doesn't communicate what it is for, only that it includes buttons. Of course, most other editors include a fair amount of 'buttons' too.

3) A 'button' is not usually what you'd associate with a slider, number field, checkbox or menu. Really there are hardly any true buttons in this window space.


Also added some notifiers to sequencer RNA, though there seems to be some refresh errors in the image preview area.
---
 source/blender/editors/screen/area.c          | 51 ++++++++++---------
 source/blender/makesrna/intern/rna_sequence.c | 33 ++++++++++--
 source/blender/makesrna/intern/rna_space.c    |  4 +-
 source/blender/makesrna/intern/rna_userdef.c  |  6 +--
 4 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 296c38fa51a..ff84542a7cd 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1041,39 +1041,42 @@ void ED_area_prevspace(bContext *C)
 static char *windowtype_pup(void)
 {
 	return(
-		   "Window type:%t" //14
-		   "|3D View %x1" //30
+		   "Window type:%t"
+		   "|3D View %x1"
+
+		   "|%l"
+		   "|%l"
 		   
-		   "|%l" // 33
+		   "|Timeline %x15"
+		   "|Graph Editor %x2"
+		   "|DopeSheet %x12"
+		   "|NLA Editor %x13"
 		   
-		   "|Graph Editor %x2" //54
-		   "|DopeSheet %x12" //73
-		   "|NLA Editor %x13" //94
+		   "|%l"
+		   "|%l"
 		   
-		   "|%l" //97
+		   "|UV/Image Editor %x6"
 		   
-		   "|UV/Image Editor %x6" //117
-		   
-		   "|Video Sequence Editor %x8" //143
-		   "|Timeline %x15" //163
-		   // "|Audio Window %x11" //163
-		   "|Text Editor %x9" //179
-		   
-		   "|%l" //192
-		   
-		   
-		   "|User Preferences %x7" //213
-		   "|Outliner %x3" //232
-		   "|Buttons Window %x4" //251
+		   "|Video Sequence Editor %x8"
+		   "|Text Editor %x9" 
 		   "|Node Editor %x16"
 		   "|Logic Editor %x17"
-		   "|%l" //254
 		   
-		   "|File Browser %x5" //290
+		   "|%l"
+		   "|%l"
 		   
-		   "|%l" //293
+		   "|Properties %x4"
+		   "|User Preferences %x7"
+		   "|Outliner %x3"
+		    		   
+		   "|%l"
+		   "|%l"
+		   
+		   "|File Browser %x5"
+		   
+		   "|%l"
+		   "|%l"
 		   
-		   // "|Scripts Window %x14"//313
 		   "|Console %x18"
 		   );
 }
diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c
index 71f5b480061..470909f4eff 100644
--- a/source/blender/makesrna/intern/rna_sequence.c
+++ b/source/blender/makesrna/intern/rna_sequence.c
@@ -443,7 +443,8 @@ static void rna_def_sequence(BlenderRNA *brna)
 	RNA_def_property_range(prop, 1, MAXFRAME);
 	RNA_def_property_ui_text(prop, "Length", "The length of the contents of this strip before the handles are applied");
 	RNA_def_property_int_funcs(prop, "rna_SequenceEditor_length_get", "rna_SequenceEditor_length_set",NULL);
-
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
+	
 	prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "start");
 	RNA_def_property_ui_text(prop, "Start Frame", "");
@@ -638,11 +639,13 @@ static void rna_def_input(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "anim_startofs");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); // overlap test
 	RNA_def_property_ui_text(prop, "Animation Start Offset", "Animation start offset (trim start).");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "animation_end_offset", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "anim_endofs");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); // overlap test
 	RNA_def_property_ui_text(prop, "Animation End Offset", "Animation end offset (trim end).");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 }
 
 static void rna_def_image(BlenderRNA *brna)
@@ -813,21 +816,25 @@ static void rna_def_wipe(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "edgeWidth");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Blur Width", "Width of the blur edge, in percentage relative to the image size.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "angle");
 	RNA_def_property_range(prop, -90.0f, 90.0f);
 	RNA_def_property_ui_text(prop, "Angle", "Edge angle.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "direction", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "forward");
 	RNA_def_property_enum_items(prop, wipe_direction_items);
 	RNA_def_property_ui_text(prop, "Direction", "Wipe direction.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "transition_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "wipetype");
 	RNA_def_property_enum_items(prop, wipe_type_items);
 	RNA_def_property_ui_text(prop, "Transition Type", "");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 }
 
 static void rna_def_glow(BlenderRNA *brna)
@@ -843,30 +850,36 @@ static void rna_def_glow(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "fMini");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Threshold", "Minimum intensity to trigger a glow");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "clamp", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fClamp");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Clamp", "rightness limit of intensity.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "boost_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fBoost");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Boost Factor", "Brightness multiplier.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "blur_distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "dDist");
 	RNA_def_property_range(prop, 0.5f, 20.0f);
 	RNA_def_property_ui_text(prop, "Blur Distance", "Radius of glow effect.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "quality", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "dQuality");
 	RNA_def_property_range(prop, 1, 5);
 	RNA_def_property_ui_text(prop, "Quality", "Accuracy of the blur effect.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "only_boost", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "bNoComp", 0);
 	RNA_def_property_ui_text(prop, "Only Boost", "Show the glow buffer only.");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 }
 
 static void rna_def_transform(BlenderRNA *brna)
@@ -895,60 +908,72 @@ static void rna_def_transform(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "ScalexIni");
 	RNA_def_property_ui_text(prop, "Scale Start X", "");
 	RNA_def_property_ui_range(prop, 0, 10, 3, 10);
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "scale_start_y", PROP_FLOAT, PROP_UNSIGNED);
 	RNA_def_property_float_sdna(prop, NULL, "ScaleyIni");
 	RNA_def_property_ui_text(prop, "Scale Start Y", "");
 	RNA_def_property_ui_range(prop, 0, 10, 3, 10);
-
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
+	
 	prop= RNA_def_property(srna, "scale_end_x", PROP_FLOAT, PROP_UNSIGNED);
 	RNA_def_property_float_sdna(prop, NULL, "ScalexFin");
 	RNA_def_property_ui_text(prop, "Scale End X", "");
 	RNA_def_property_ui_range(prop, 0, 10, 3, 10);
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "scale_end_y", PROP_FLOAT, PROP_UNSIGNED);
 	RNA_def_property_float_sdna(prop, NULL, "ScaleyFin");
 	RNA_def_property_ui_text(prop, "Scale End Y", "");
 	RNA_def_property_ui_range(prop, 0, 10, 3, 10);
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "translate_start_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xIni");
 	RNA_def_property_ui_text(prop, "Translate Start X", "");
 	RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 10);
-
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
+	
 	prop= RNA_def_property(srna, "translate_start_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yIni");
 	RNA_def_property_ui_text(prop, "Translate Start Y", "");
 	RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 10);
-
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
+	
 	prop= RNA_def_property(srna, "translate_end_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xFin");
 	RNA_def_property_ui_text(prop, "Translate End X", "");
 	RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 10);
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 
 	prop= RNA_def_property(srna, "translate_end_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yFin");
 	RNA_def_property_ui_text(prop, "Translate End Y", "");
 	RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 10);
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "rotation_start", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rotIni");
 	RNA_def_property_range(prop, 0.0f, 360.0f);
 	RNA_def_property_ui_text(prop, "Rotation Start", "");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "rotation_end", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rotFin");
 	RNA_def_property_range(prop, 0.0f, 360.0f);
 	RNA_def_property_ui_text(prop, "Rotation End", "");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "translation_unit", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "percent");
 	RNA_def_property_enum_items(prop, translation_unit_items);
 	RNA_def_property_ui_text(prop, "Translation Unit", "");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "interpolation", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, interpolation_items);
 	RNA_def_property_ui_text(prop, "Interpolation", "");
+	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
 }
 
 static void rna_def_solid_color(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 41361dd69a4..991b50afa5a 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -46,7 +46,7 @@ EnumPropertyItem space_type_items[] = {
 	{SPACE_VIEW3D, "VIEW_3D", 0, "3D View", ""},
 	{SPACE_IPO, "GRAPH_EDITOR", 0, "Graph Editor", ""},
 	{SPACE_OUTLINER, "OUTLINER", 0, "Outliner", ""},
-	{SPACE_BUTS, "BUTTONS_WINDOW", 0, "Buttons Window", ""},
+	{SPACE_BUTS, "PROPERTIES", 0, "Properties", ""},
 	{SPACE_FILE, "FILE_BROWSER", 0, "File Browser", ""},
 	{SPACE_IMAGE, "IMAGE_EDITOR", 0, "Image Editor", ""},
 	{SPACE_INFO, "USER_PREFERENCES", 0, "User Preferences", ""},
@@ -1142,7 +1142,7 @@ static void rna_def_space_time(BlenderRNA *brna)
 	
 	prop= RNA_def_property(srna, "play_buttons", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_BUTS_WIN);
-	RNA_def_property_ui_text(prop, "Buttons Windows", "");
+	RNA_def_property_ui_text(prop, "Properties Windows", "");
 	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
 	
 	prop= RNA_def_property(srna, "play_image", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 59333f1191d..836e6a2fda7 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -999,7 +999,7 @@ static void rna_def_userdef_theme_space_buts(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "ThemeButtonsWindow", NULL);
 	RNA_def_struct_sdna(srna, "ThemeSpace");
-	RNA_def_struct_ui_text(srna, "Theme Buttons Window", "Theme settings for the Buttons Window.");
+	RNA_def_struct_ui_text(srna, "Theme Properties", "Theme settings for the Properties.");
 
 	rna_def_userdef_theme_spaces_main(srna, SPACE_BUTS);
 
@@ -1400,10 +1400,10 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "ThemeSequenceEditor");
 	RNA_def_property_ui_text(prop, "Sequence Editor", "");
 
-	prop= RNA_def_property(srna, "buttons_window", PROP_POINTER, PROP_NEVER_NULL);
+	prop= RNA_def_property(srna, "properties", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "tbuts");
 	RNA_def_property_struct_type(prop, "ThemeButtonsWindow");
-	RNA_def_property_ui_text(prop, "Buttons Window", "");
+	RNA_def_property_ui_text(prop, "Properties", "");
 
 	prop= RNA_def_property(srna, "text_editor", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "text");

From ac2451c6be437fba14f9c0ceeeaeab382fd9ad58 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 18 Aug 2009 12:56:43 +0000
Subject: [PATCH 118/577] 2.5: RNA. Default values were not set when calling
 functions, this is fixed now. Also added option for spaces without menus in
 the header in uiTemplateHeader.

---
 source/blender/editors/include/UI_interface.h |  2 +-
 .../editors/interface/interface_templates.c   |  5 ++-
 source/blender/makesrna/intern/rna_access.c   | 42 ++++++++++++++++++-
 source/blender/makesrna/intern/rna_ui_api.c   |  3 +-
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index cc3b243d38d..8da2702b603 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -625,7 +625,7 @@ uiLayout *uiLayoutSplit(uiLayout *layout, float percentage);
 uiBlock *uiLayoutFreeBlock(uiLayout *layout);
 
 /* templates */
-void uiTemplateHeader(uiLayout *layout, struct bContext *C);
+void uiTemplateHeader(uiLayout *layout, struct bContext *C, int menus);
 void uiTemplateID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
 	char *newop, char *unlinkop);
 uiLayout *uiTemplateModifier(uiLayout *layout, struct PointerRNA *ptr);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 1a5c1178983..0ee21cbcf77 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -56,12 +56,13 @@ void ui_template_fix_linking()
 
 /********************** Header Template *************************/
 
-void uiTemplateHeader(uiLayout *layout, bContext *C)
+void uiTemplateHeader(uiLayout *layout, bContext *C, int menus)
 {
 	uiBlock *block;
 	
 	block= uiLayoutFreeBlock(layout);
-	ED_area_header_standardbuttons(C, block, 0);
+	if(menus) ED_area_header_standardbuttons(C, block, 0);
+	else ED_area_header_switchbutton(C, block, 0);
 }
 
 /********************** Search Callbacks *************************/
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 54cde57a54f..c2f1f31a4bc 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -2844,8 +2844,10 @@ const struct ListBase *RNA_function_defined_parameters(FunctionRNA *func)
 ParameterList *RNA_parameter_list_create(ParameterList *parms, PointerRNA *ptr, FunctionRNA *func)
 {
 	PropertyRNA *parm;
-	int tot= 0;
+	void *data;
+	int tot= 0, size;
 
+	/* allocate data */
 	for(parm= func->cont.properties.first; parm; parm= parm->next)
 		tot+= rna_parameter_size(parm);
 
@@ -2853,6 +2855,44 @@ ParameterList *RNA_parameter_list_create(ParameterList *parms, PointerRNA *ptr,
 	parms->func= func;
 	parms->tot= tot;
 
+	/* set default values */
+	data= parms->data;
+
+	for(parm= func->cont.properties.first; parm; parm= parm->next) {
+		size= rna_parameter_size(parm);
+
+		if(!(parm->flag & PROP_REQUIRED)) {
+			switch(parm->type) {
+				case PROP_BOOLEAN:
+					if(parm->arraylength) memcpy(data, &((BooleanPropertyRNA*)parm)->defaultarray, size);
+					else memcpy(data, &((BooleanPropertyRNA*)parm)->defaultvalue, size);
+					break;
+				case PROP_INT:
+					if(parm->arraylength) memcpy(data, &((IntPropertyRNA*)parm)->defaultarray, size);
+					else memcpy(data, &((IntPropertyRNA*)parm)->defaultvalue, size);
+					break;
+				case PROP_FLOAT:
+					if(parm->arraylength) memcpy(data, &((FloatPropertyRNA*)parm)->defaultarray, size);
+					else memcpy(data, &((FloatPropertyRNA*)parm)->defaultvalue, size);
+					break;
+				case PROP_ENUM:
+					memcpy(data, &((EnumPropertyRNA*)parm)->defaultvalue, size);
+					break;
+				case PROP_STRING: {
+					const char *defvalue= ((StringPropertyRNA*)parm)->defaultvalue;
+					if(defvalue && defvalue[0])
+						memcpy(data, &defvalue, size);
+					break;
+				}
+				case PROP_POINTER:
+				case PROP_COLLECTION:
+					break;
+			}
+		}
+
+		data= ((char*)data) + size;
+	}
+
 	return parms;
 }
 
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 40d300315f5..f9287bddc10 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -119,7 +119,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	func= RNA_def_function(srna, "split", "uiLayoutSplit");
 	parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to put items in.");
 	RNA_def_function_return(func, parm);
-	RNA_def_float(func, "percentage", 0.5f, 0.0f, 1.0f, "Percentage", "Percentage of width to split at.", 0.0f, 1.0f);
+	RNA_def_float(func, "percentage", 0.0f, 0.0f, 1.0f, "Percentage", "Percentage of width to split at.", 0.0f, 1.0f);
 
 	/* items */
 	func= RNA_def_function(srna, "itemR", "uiItemR");
@@ -220,6 +220,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	/* templates */
 	func= RNA_def_function(srna, "template_header", "uiTemplateHeader");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
+	RNA_def_boolean(func, "menus", 1, "", "The header has menus, and should show menu expander.");
 
 	func= RNA_def_function(srna, "template_ID", "uiTemplateID");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);

From 990dcd0f7f362828eddeaca191640c1680808a6c Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 18 Aug 2009 12:58:51 +0000
Subject: [PATCH 119/577] 2.5:

* Split Info and User preferences into two separate spaces.
* Renamed Buttons Window to Properties also in RNA identifiers.
---
 release/io/engine_render_pov.py               |   2 +-
 release/ui/buttons_data_armature.py           |   2 +-
 release/ui/buttons_data_bone.py               |   2 +-
 release/ui/buttons_data_camera.py             |   2 +-
 release/ui/buttons_data_curve.py              |   2 +-
 release/ui/buttons_data_empty.py              |   2 +-
 release/ui/buttons_data_lamp.py               |   4 +-
 release/ui/buttons_data_lattice.py            |   2 +-
 release/ui/buttons_data_mesh.py               |   2 +-
 release/ui/buttons_data_metaball.py           |   2 +-
 release/ui/buttons_data_modifier.py           |   2 +-
 release/ui/buttons_data_text.py               |   2 +-
 release/ui/buttons_game.py                    |   6 +-
 release/ui/buttons_material.py                |   2 +-
 release/ui/buttons_object.py                  |   2 +-
 release/ui/buttons_object_constraint.py       |   2 +-
 release/ui/buttons_particle.py                |   2 +-
 release/ui/buttons_physics_cloth.py           |   2 +-
 release/ui/buttons_physics_field.py           |   2 +-
 release/ui/buttons_physics_fluid.py           |   2 +-
 release/ui/buttons_physics_smoke.py           |   4 +-
 release/ui/buttons_physics_softbody.py        |   2 +-
 release/ui/buttons_scene.py                   |   2 +-
 release/ui/buttons_texture.py                 |   2 +-
 release/ui/buttons_world.py                   |   2 +-
 release/ui/space_buttons.py                   |   4 +-
 release/ui/space_info.py                      | 417 +----------------
 release/ui/space_time.py                      |   7 -
 release/ui/space_userpref.py                  | 418 ++++++++++++++++++
 source/blender/blenkernel/BKE_context.h       |   1 +
 source/blender/blenkernel/intern/context.c    |   7 +
 source/blender/blenloader/intern/writefile.c  |   4 +
 source/blender/editors/Makefile               |   1 +
 source/blender/editors/SConscript             |   1 +
 source/blender/editors/include/ED_space_api.h |   1 +
 .../editors/interface/interface_panel.c       |   2 +-
 source/blender/editors/interface/resources.c  |   9 +
 source/blender/editors/screen/area.c          |   3 +-
 source/blender/editors/space_api/spacetypes.c |   1 +
 .../editors/space_buttons/buttons_context.c   |   3 +-
 .../editors/space_buttons/buttons_ops.c       |   2 +-
 .../blender/editors/space_info/info_intern.h  |   3 -
 .../blender/editors/space_userpref/Makefile   |  55 +++
 .../blender/editors/space_userpref/SConscript |  14 +
 .../editors/space_userpref/space_userpref.c   | 188 ++++++++
 .../editors/space_userpref/userpref_intern.h  |  34 ++
 .../editors/space_userpref/userpref_ops.c     |  33 ++
 source/blender/makesdna/DNA_space_types.h     |  10 +-
 source/blender/makesdna/DNA_userdef_types.h   |   1 +
 source/blender/makesrna/RNA_access.h          |  22 +-
 source/blender/makesrna/intern/rna_space.c    |  68 ++-
 source/blender/makesrna/intern/rna_userdef.c  |  32 +-
 .../blender/windowmanager/intern/wm_window.c  |   4 +-
 53 files changed, 923 insertions(+), 480 deletions(-)
 create mode 100644 release/ui/space_userpref.py
 create mode 100644 source/blender/editors/space_userpref/Makefile
 create mode 100644 source/blender/editors/space_userpref/SConscript
 create mode 100644 source/blender/editors/space_userpref/space_userpref.c
 create mode 100644 source/blender/editors/space_userpref/userpref_intern.h
 create mode 100644 source/blender/editors/space_userpref/userpref_ops.c

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index ba9e7377535..97337ebc853 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -791,7 +791,7 @@ for member in dir(buttons_material):
 del buttons_material
 
 class RenderButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "scene"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 681b8ba8954..9b640776a9e 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -2,7 +2,7 @@
 import bpy
  
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index e05b64e5e11..1eb09377892 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -2,7 +2,7 @@
 import bpy
  
 class BoneButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "bone"
 	
diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py
index 51d8c8c61e6..f2fa4207ec8 100644
--- a/release/ui/buttons_data_camera.py
+++ b/release/ui/buttons_data_camera.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 
diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index d0e1756986d..35d557afe32 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_data_empty.py b/release/ui/buttons_data_empty.py
index 827fe02e411..2a2f51ed292 100644
--- a/release/ui/buttons_data_empty.py
+++ b/release/ui/buttons_data_empty.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index 6fb021802f0..a00bb23d5b5 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
@@ -319,4 +319,4 @@ bpy.types.register(DATA_PT_falloff_curve)
 bpy.types.register(DATA_PT_area)
 bpy.types.register(DATA_PT_spot)
 bpy.types.register(DATA_PT_shadow)
-bpy.types.register(DATA_PT_sunsky)
\ No newline at end of file
+bpy.types.register(DATA_PT_sunsky)
diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py
index 3766b9ff1a5..5d8a07c7d44 100644
--- a/release/ui/buttons_data_lattice.py
+++ b/release/ui/buttons_data_lattice.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index d6ca0817edc..b681218a8fe 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_data_metaball.py b/release/ui/buttons_data_metaball.py
index a3781705799..e31c3d7fcd0 100644
--- a/release/ui/buttons_data_metaball.py
+++ b/release/ui/buttons_data_metaball.py
@@ -1,7 +1,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index 6dd11457ec9..436baa540d4 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "modifier"
 	
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 757e61307df..754d6fcda39 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -2,7 +2,7 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "data"
 	
diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py
index b662254f1bb..3158536585e 100644
--- a/release/ui/buttons_game.py
+++ b/release/ui/buttons_game.py
@@ -2,7 +2,7 @@
 import bpy
  
 class PhysicsButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "physics"
 
@@ -171,7 +171,7 @@ bpy.types.register(PHYSICS_PT_game_physics)
 bpy.types.register(PHYSICS_PT_game_collision_bounds)
 
 class SceneButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "scene"
 
@@ -276,7 +276,7 @@ bpy.types.register(SCENE_PT_game_player)
 bpy.types.register(SCENE_PT_game_stereo)
 
 class WorldButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "world"
 
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index ff587d47668..b971a678926 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -2,7 +2,7 @@
 import bpy
 
 class MaterialButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "material"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
diff --git a/release/ui/buttons_object.py b/release/ui/buttons_object.py
index 5bd4bbbd6bd..6b6d583e2ca 100644
--- a/release/ui/buttons_object.py
+++ b/release/ui/buttons_object.py
@@ -2,7 +2,7 @@
 import bpy
 
 class ObjectButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "object"
 
diff --git a/release/ui/buttons_object_constraint.py b/release/ui/buttons_object_constraint.py
index 505fa57fa0b..c67d6e40cfb 100644
--- a/release/ui/buttons_object_constraint.py
+++ b/release/ui/buttons_object_constraint.py
@@ -2,7 +2,7 @@
 import bpy
 
 class ConstraintButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "constraint"
 
diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index 07ad3b7841c..8bc84b734bf 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -11,7 +11,7 @@ def particle_panel_poll(context):
 	return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
 
 class ParticleButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "particle"
 
diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index d18df9e5003..f34077c758a 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -2,7 +2,7 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "physics"
 
diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py
index 02802779c04..fb29dd92833 100644
--- a/release/ui/buttons_physics_field.py
+++ b/release/ui/buttons_physics_field.py
@@ -2,7 +2,7 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "physics"
 
diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py
index 0ad87120a7f..304d419b388 100644
--- a/release/ui/buttons_physics_fluid.py
+++ b/release/ui/buttons_physics_fluid.py
@@ -2,7 +2,7 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "physics"
 
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index a225aedbe23..7e2395216c0 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -2,7 +2,7 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "physics"
 
@@ -156,4 +156,4 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 
 bpy.types.register(PHYSICS_PT_smoke)
 bpy.types.register(PHYSICS_PT_smoke_highres)
-bpy.types.register(PHYSICS_PT_smoke_groups)
\ No newline at end of file
+bpy.types.register(PHYSICS_PT_smoke_groups)
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index d0d3475c11b..2613f9e8032 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -2,7 +2,7 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "physics"
 
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 12200eb26ca..e9ee97468e8 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -2,7 +2,7 @@
 import bpy
 
 class RenderButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "scene"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index a1b89bec0ce..18c836f9080 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -2,7 +2,7 @@
 import bpy
 
 class TextureButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "texture"
 	
diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py
index 7840a4946f2..599f45d160b 100644
--- a/release/ui/buttons_world.py
+++ b/release/ui/buttons_world.py
@@ -2,7 +2,7 @@
 import bpy
 
 class WorldButtonsPanel(bpy.types.Panel):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
 	__context__ = "world"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
diff --git a/release/ui/space_buttons.py b/release/ui/space_buttons.py
index b444913809d..cf1c385e3dc 100644
--- a/release/ui/space_buttons.py
+++ b/release/ui/space_buttons.py
@@ -2,7 +2,7 @@
 import bpy
 
 class Buttons_HT_header(bpy.types.Header):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 
 	def draw(self, context):
 		layout = self.layout
@@ -21,7 +21,7 @@ class Buttons_HT_header(bpy.types.Header):
 		row.itemR(scene, "current_frame")
 
 class Buttons_MT_view(bpy.types.Menu):
-	__space_type__ = "BUTTONS_WINDOW"
+	__space_type__ = "PROPERTIES"
 	__label__ = "View"
 
 	def draw(self, context):
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index af2dac02ccb..12005ea3ecb 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -2,7 +2,7 @@
 import bpy
 
 class INFO_HT_header(bpy.types.Header):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 
 	def draw(self, context):
 		layout = self.layout
@@ -34,7 +34,7 @@ class INFO_HT_header(bpy.types.Header):
 		layout.template_running_jobs()
 			
 class INFO_MT_file(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "File"
 
 	def draw(self, context):
@@ -70,14 +70,14 @@ class INFO_MT_file(bpy.types.Menu):
 		layout.itemO("wm.exit_blender", text="Quit")
 
 class INFO_MT_file_import(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "Import"
 
 	def draw(self, context):
 		layout = self.layout
 
 class INFO_MT_file_export(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "Export"
 
 	def draw(self, context):
@@ -86,7 +86,7 @@ class INFO_MT_file_export(bpy.types.Menu):
 		layout.itemO("export.ply", text="PLY")
 
 class INFO_MT_file_external_data(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "External Data"
 
 	def draw(self, context):
@@ -103,7 +103,7 @@ class INFO_MT_file_external_data(bpy.types.Menu):
 		layout.itemO("file.find_missing_files")
 
 class INFO_MT_add(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "Add"
 
 	def draw(self, context):
@@ -129,7 +129,7 @@ class INFO_MT_add(bpy.types.Menu):
 		layout.item_enumO("OBJECT_OT_object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
 
 class INFO_MT_game(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "Game"
 
 	def draw(self, context):
@@ -138,7 +138,7 @@ class INFO_MT_game(bpy.types.Menu):
 		layout.itemO("view3d.game_start")
 
 class INFO_MT_render(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "Render"
 
 	def draw(self, context):
@@ -154,7 +154,7 @@ class INFO_MT_render(bpy.types.Menu):
 		layout.itemO("screen.render_view_show")
 
 class INFO_MT_help(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = "INFO"
 	__label__ = "Help"
 
 	def draw(self, context):
@@ -170,397 +170,6 @@ class INFO_MT_help(bpy.types.Menu):
 		layout.itemO("help.developer_community")
 		layout.itemO("help.user_community")
 
-class INFO_PT_tabs(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__show_header__ = False
-
-	def draw(self, context):
-		layout = self.layout
-		
-		userpref = context.user_preferences
-
-		layout.itemR(userpref, "active_section", expand=True)
-
-class INFO_PT_view(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__label__ = "View"
-	__show_header__ = False
-
-	def poll(self, context):
-		userpref = context.user_preferences
-		return (userpref.active_section == 'VIEW_CONTROLS')
-
-	def draw(self, context):
-		layout = self.layout
-		
-		userpref = context.user_preferences
-		view = userpref.view
-
-		split = layout.split()
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="Display:")
-		sub1.itemR(view, "tooltips")
-		sub1.itemR(view, "display_object_info", text="Object Info")
-		sub1.itemR(view, "use_large_cursors")
-		sub1.itemR(view, "show_view_name", text="View Name")
-		sub1.itemR(view, "show_playback_fps", text="Playback FPS")
-		sub1.itemR(view, "global_scene")
-		sub1.itemR(view, "pin_floating_panels")
-		sub1.itemR(view, "object_center_size")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemR(view, "show_mini_axis")
-		sub2 = sub1.column()
-		sub2.enabled = view.show_mini_axis
-		sub2.itemR(view, "mini_axis_size")
-		sub2.itemR(view, "mini_axis_brightness")
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="View Manipulation:")
-		sub1.itemR(view, "auto_depth")
-		sub1.itemR(view, "global_pivot")
-		sub1.itemR(view, "zoom_to_mouse")
-		sub1.itemR(view, "rotate_around_selection")
-		sub1.itemS()
-		sub1.itemL(text="Zoom Style:")
-		sub1.row().itemR(view, "viewport_zoom_style", expand=True)
-		sub1.itemL(text="Orbit Style:")
-		sub1.row().itemR(view, "view_rotation", expand=True)
-		sub1.itemR(view, "perspective_orthographic_switch")
-		sub1.itemR(view, "smooth_view")
-		sub1.itemR(view, "rotation_angle")
-		sub1.itemS()
-		sub1.itemL(text="NDOF Device:")
-		sub1.itemR(view, "ndof_pan_speed", text="Pan Speed")
-		sub1.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="Mouse Buttons:")
-		sub1.itemR(view, "left_mouse_button_select")
-		sub1.itemR(view, "right_mouse_button_select")
-		sub1.itemR(view, "emulate_3_button_mouse")
-		sub1.itemR(view, "use_middle_mouse_paste")
-		sub1.itemR(view, "middle_mouse_rotate")
-		sub1.itemR(view, "middle_mouse_pan")
-		sub1.itemR(view, "wheel_invert_zoom")
-		sub1.itemR(view, "wheel_scroll_lines")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemL(text="Menus:")
-		sub1.itemR(view, "open_mouse_over")
-		sub1.itemL(text="Menu Open Delay:")
-		sub1.itemR(view, "open_toplevel_delay", text="Top Level")
-		sub1.itemR(view, "open_sublevel_delay", text="Sub Level")
-
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		#manipulator
-		sub1.itemR(view, "use_manipulator")
-		sub2 = sub1.column()
-		sub2.enabled = view.use_manipulator
-		sub2.itemR(view, "manipulator_size", text="Size")
-		sub2.itemR(view, "manipulator_handle_size", text="Handle Size")
-		sub2.itemR(view, "manipulator_hotspot", text="Hotspot")	
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()			
-		sub1.itemL(text="Toolbox:")
-		sub1.itemR(view, "use_column_layout")
-		sub1.itemL(text="Open Toolbox Delay:")
-		sub1.itemR(view, "open_left_mouse_delay", text="Hold LMB")
-		sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
-
-class INFO_PT_edit(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__label__ = "Edit"
-	__show_header__ = False
-
-	def poll(self, context):
-		userpref = context.user_preferences
-		return (userpref.active_section == 'EDIT_METHODS')
-
-	def draw(self, context):
-		layout = self.layout
-		
-		userpref = context.user_preferences
-		edit = userpref.edit
-		view = userpref.view
-		
-		split = layout.split()
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="Materials:")
-		sub1.itemR(edit, "material_linked_object", text="Linked to Object")
-		sub1.itemR(edit, "material_linked_obdata", text="Linked to ObData")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemL(text="New Objects:")
-		sub1.itemR(edit, "enter_edit_mode")
-		sub1.itemR(edit, "align_to_view")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemL(text="Transform:")
-		sub1.itemR(edit, "drag_immediately")
-
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="Snap:")
-		sub1.itemR(edit, "snap_translate", text="Translate")
-		sub1.itemR(edit, "snap_rotate", text="Rotate")
-		sub1.itemR(edit, "snap_scale", text="Scale")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemL(text="Grease Pencil:")
-		sub1.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
-		sub1.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
-		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
-		# sub1.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
-		sub1.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="Keyframing:")
-		sub1.itemR(edit, "use_visual_keying")
-		sub1.itemR(edit, "new_interpolation_type")
-		sub1.itemS()
-		sub1.itemR(edit, "auto_keying_enable", text="Auto Keyframing")
-		sub2 = sub1.column()
-		sub2.enabled = edit.auto_keying_enable
-		sub2.row().itemR(edit, "auto_keying_mode", expand=True)
-		sub2.itemR(edit, "auto_keyframe_insert_available", text="Only Insert Available")
-		sub2.itemR(edit, "auto_keyframe_insert_needed", text="Only Insert Needed")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemL(text="Undo:")
-		sub1.itemR(edit, "global_undo")
-		sub1.itemR(edit, "undo_steps", text="Steps")
-		sub1.itemR(edit, "undo_memory_limit", text="Memory Limit")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemL(text="Duplicate:")
-		sub1.itemR(edit, "duplicate_mesh", text="Mesh")
-		sub1.itemR(edit, "duplicate_surface", text="Surface")
-		sub1.itemR(edit, "duplicate_curve", text="Curve")
-		sub1.itemR(edit, "duplicate_text", text="Text")
-		sub1.itemR(edit, "duplicate_metaball", text="Metaball")
-		sub1.itemR(edit, "duplicate_armature", text="Armature")
-		sub1.itemR(edit, "duplicate_lamp", text="Lamp")
-		sub1.itemR(edit, "duplicate_material", text="Material")
-		sub1.itemR(edit, "duplicate_texture", text="Texture")
-		sub1.itemR(edit, "duplicate_ipo", text="F-Curve")
-		sub1.itemR(edit, "duplicate_action", text="Action")
-		
-class INFO_PT_system(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__label__ = "System"
-	__show_header__ = False
-
-	def poll(self, context):
-		userpref = context.user_preferences
-		return (userpref.active_section == 'SYSTEM_OPENGL')
-
-	def draw(self, context):
-		layout = self.layout
-		
-		userpref = context.user_preferences
-		system = userpref.system
-		lan = userpref.language
-		
-		split = layout.split()
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		sub1.itemR(system, "emulate_numpad")	
-		sub1.itemS()
-		sub1.itemS()
-		
-		#Weight Colors
-		sub1.itemL(text="Weight Colors:")
-		sub1.itemR(system, "use_weight_color_range", text="Use Custom Range")
-		
-		sub2 = sub1.column()
-		sub2.active = system.use_weight_color_range
-		sub2.template_color_ramp(system.weight_color_range, expand=True)
-		sub1.itemS()
-		sub1.itemS()
-		
-		#sequencer
-		sub1.itemL(text="Sequencer:")
-		sub1.itemR(system, "prefetch_frames")
-		sub1.itemR(system, "memory_cache_limit")
-		
-		col = split.column()	
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub .column()
-		#System
-		sub1.itemL(text="System:")
-		sub1.itemR(lan, "dpi")
-		sub1.itemR(system, "auto_run_python_scripts")
-		sub1.itemR(system, "frame_server_port")
-		sub1.itemR(system, "filter_file_extensions")
-		sub1.itemR(system, "hide_dot_files_datablocks")
-		sub1.itemR(lan, "scrollback", text="Console Scrollback")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemL(text="Sound:")
-		sub1.itemR(system, "audio_device")
-		sub2 = sub1.column()
-		sub2.active = system.audio_device != 'AUDIO_DEVICE_NULL'
-		sub2.itemR(system, "enable_all_codecs")
-		sub2.itemR(system, "game_sound")
-		sub2.itemR(system, "audio_channels")
-		sub2.itemR(system, "audio_mixing_buffer")
-		sub2.itemR(system, "audio_sample_rate")
-		sub2.itemR(system, "audio_sample_format")
-		
-		col = split.column()
-		sub = col.split(percentage=0.85)
-		
-		sub1 = sub.column()
-		#OpenGL
-		sub1.itemL(text="OpenGL:")
-		sub1.itemR(system, "clip_alpha", slider=True)
-		sub1.itemR(system, "use_mipmaps")
-		sub1.itemL(text="Window Draw Method:")
-		sub1.row().itemR(system, "window_draw_method", expand=True)
-		sub1.itemL(text="Textures:")
-		sub1.itemR(system, "gl_texture_limit", text="Limit Size")
-		sub1.itemR(system, "texture_time_out", text="Time Out")
-		sub1.itemR(system, "texture_collection_rate", text="Collection Rate")		
-		
-class INFO_PT_filepaths(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__label__ = "File Paths"
-	__show_header__ = False
-
-	def poll(self, context):
-		userpref = context.user_preferences
-		return (userpref.active_section == 'FILE_PATHS')
-
-	def draw(self, context):
-		layout = self.layout
-		
-		userpref = context.user_preferences
-		paths = userpref.filepaths
-		
-		split = layout.split()
-		
-		col = split.column()
-		col.itemL(text="File Paths:")
-		sub = col.split(percentage=0.3)
-		
-		sub.itemL(text="Fonts:")
-		sub.itemR(paths, "fonts_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Textures:")
-		sub.itemR(paths, "textures_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Texture Plugins:")
-		sub.itemR(paths, "texture_plugin_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Sequence Plugins:")
-		sub.itemR(paths, "sequence_plugin_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Render Output:")
-		sub.itemR(paths, "render_output_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Scripts:")
-		sub.itemR(paths, "python_scripts_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Sounds:")
-		sub.itemR(paths, "sounds_directory", text="")
-		sub = col.split(percentage=0.3)
-		sub.itemL(text="Temp:")
-		sub.itemR(paths, "temporary_directory", text="")
-		
-		col = split.column()
-		sub = col.split(percentage=0.2)
-		sub1 = sub.column()
-		sub2 = sub.column()
-		sub2.itemL(text="Save & Load:")
-		sub2.itemR(paths, "use_relative_paths")
-		sub2.itemR(paths, "compress_file")
-		sub2.itemL(text="Auto Save:")
-		sub2.itemR(paths, "save_version")
-		sub2.itemR(paths, "recent_files")
-		sub2.itemR(paths, "save_preview_images")
-		sub2.itemR(paths, "auto_save_temporary_files")
-		sub3 = sub2.column()
-		sub3.enabled = paths.auto_save_temporary_files
-		sub3.itemR(paths, "auto_save_time")
-
-class INFO_PT_language(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__label__ = "Language"
-	__show_header__ = False
-
-	def poll(self, context):
-		userpref = context.user_preferences
-		return (userpref.active_section == 'LANGUAGE_COLORS')
-
-	def draw(self, context):
-		layout = self.layout
-		
-		userpref = context.user_preferences
-		lan = userpref.language
-		
-		split = layout.split()
-		col = split.column()
-		
-		col.itemR(lan, "language")
-		col.itemR(lan, "translate_tooltips")
-		col.itemR(lan, "translate_buttons")
-		col.itemR(lan, "translate_toolbox")
-		col.itemR(lan, "use_textured_fonts")
-		
-class INFO_PT_bottombar(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
-	__label__ = " "
-	__show_header__ = False
-
-	def draw(self, context):
-		layout = self.layout
-		userpref = context.user_preferences
-	
-		split = layout.split(percentage=0.8)
-		split.itemL(text="")
-		layout.operator_context = "EXEC_AREA"
-		split.itemO("wm.save_homefile", text="Save As Default")
-
 bpy.types.register(INFO_HT_header)
 bpy.types.register(INFO_MT_file)
 bpy.types.register(INFO_MT_file_import)
@@ -570,13 +179,6 @@ bpy.types.register(INFO_MT_add)
 bpy.types.register(INFO_MT_game)
 bpy.types.register(INFO_MT_render)
 bpy.types.register(INFO_MT_help)
-bpy.types.register(INFO_PT_tabs)
-bpy.types.register(INFO_PT_view)
-bpy.types.register(INFO_PT_edit)
-bpy.types.register(INFO_PT_system)
-bpy.types.register(INFO_PT_filepaths)
-bpy.types.register(INFO_PT_language)
-bpy.types.register(INFO_PT_bottombar)
 
 # Help operators
 
@@ -631,3 +233,4 @@ bpy.ops.add(HELP_OT_blender_website)
 bpy.ops.add(HELP_OT_blender_eshop)
 bpy.ops.add(HELP_OT_developer_community)
 bpy.ops.add(HELP_OT_user_community)
+
diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 45fdeb04ead..785d11a8fc5 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -23,8 +23,6 @@ class TIME_HT_header(bpy.types.Header):
 
 		layout.itemR(scene, "use_preview_range", text="PR", toggle=True)
 		
-		layout.itemS()
-		
 		row = layout.row(align=True)
 		if not scene.use_preview_range:
 			row.itemR(scene, "start_frame", text="Start")
@@ -33,10 +31,7 @@ class TIME_HT_header(bpy.types.Header):
 			row.itemR(scene, "preview_range_start_frame", text="Start")
 			row.itemR(scene, "preview_range_end_frame", text="End")
 		
-		layout.itemS()
 		layout.itemR(scene, "current_frame", text="")
-		
-		layout.itemS()
 
 		row = layout.row(align=True)
 		row.item_booleanO("screen.frame_jump", "end", False, text="", icon='ICON_REW')
@@ -51,8 +46,6 @@ class TIME_HT_header(bpy.types.Header):
 		row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME')
 		row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF')
 		
-		layout.itemS()
-		
 		layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
 		
 		layout.itemS()
diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
new file mode 100644
index 00000000000..95054efcb25
--- /dev/null
+++ b/release/ui/space_userpref.py
@@ -0,0 +1,418 @@
+
+import bpy
+
+class USERPREF_HT_header(bpy.types.Header):
+	__space_type__ = "USER_PREFERENCES"
+
+	def draw(self, context):
+		layout = self.layout
+		layout.template_header(menus=False)
+			
+class USERPREF_MT_view(bpy.types.Menu):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = "View"
+
+	def draw(self, context):
+		layout = self.layout
+
+class USERPREF_PT_tabs(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__show_header__ = False
+
+	def draw(self, context):
+		layout = self.layout
+		
+		userpref = context.user_preferences
+
+		layout.itemR(userpref, "active_section", expand=True)
+
+class USERPREF_PT_view(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = "View"
+	__show_header__ = False
+
+	def poll(self, context):
+		userpref = context.user_preferences
+		return (userpref.active_section == 'VIEW_CONTROLS')
+
+	def draw(self, context):
+		layout = self.layout
+		
+		userpref = context.user_preferences
+		view = userpref.view
+
+		split = layout.split()
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="Display:")
+		sub1.itemR(view, "tooltips")
+		sub1.itemR(view, "display_object_info", text="Object Info")
+		sub1.itemR(view, "use_large_cursors")
+		sub1.itemR(view, "show_view_name", text="View Name")
+		sub1.itemR(view, "show_playback_fps", text="Playback FPS")
+		sub1.itemR(view, "global_scene")
+		sub1.itemR(view, "pin_floating_panels")
+		sub1.itemR(view, "object_center_size")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemR(view, "show_mini_axis")
+		sub2 = sub1.column()
+		sub2.enabled = view.show_mini_axis
+		sub2.itemR(view, "mini_axis_size")
+		sub2.itemR(view, "mini_axis_brightness")
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="View Manipulation:")
+		sub1.itemR(view, "auto_depth")
+		sub1.itemR(view, "global_pivot")
+		sub1.itemR(view, "zoom_to_mouse")
+		sub1.itemR(view, "rotate_around_selection")
+		sub1.itemS()
+		sub1.itemL(text="Zoom Style:")
+		sub1.row().itemR(view, "viewport_zoom_style", expand=True)
+		sub1.itemL(text="Orbit Style:")
+		sub1.row().itemR(view, "view_rotation", expand=True)
+		sub1.itemR(view, "perspective_orthographic_switch")
+		sub1.itemR(view, "smooth_view")
+		sub1.itemR(view, "rotation_angle")
+		sub1.itemS()
+		sub1.itemL(text="NDOF Device:")
+		sub1.itemR(view, "ndof_pan_speed", text="Pan Speed")
+		sub1.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="Mouse Buttons:")
+		sub1.itemR(view, "left_mouse_button_select")
+		sub1.itemR(view, "right_mouse_button_select")
+		sub1.itemR(view, "emulate_3_button_mouse")
+		sub1.itemR(view, "use_middle_mouse_paste")
+		sub1.itemR(view, "middle_mouse_rotate")
+		sub1.itemR(view, "middle_mouse_pan")
+		sub1.itemR(view, "wheel_invert_zoom")
+		sub1.itemR(view, "wheel_scroll_lines")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Menus:")
+		sub1.itemR(view, "open_mouse_over")
+		sub1.itemL(text="Menu Open Delay:")
+		sub1.itemR(view, "open_toplevel_delay", text="Top Level")
+		sub1.itemR(view, "open_sublevel_delay", text="Sub Level")
+
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		#manipulator
+		sub1.itemR(view, "use_manipulator")
+		sub2 = sub1.column()
+		sub2.enabled = view.use_manipulator
+		sub2.itemR(view, "manipulator_size", text="Size")
+		sub2.itemR(view, "manipulator_handle_size", text="Handle Size")
+		sub2.itemR(view, "manipulator_hotspot", text="Hotspot")	
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()			
+		sub1.itemL(text="Toolbox:")
+		sub1.itemR(view, "use_column_layout")
+		sub1.itemL(text="Open Toolbox Delay:")
+		sub1.itemR(view, "open_left_mouse_delay", text="Hold LMB")
+		sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
+
+class USERPREF_PT_edit(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = "Edit"
+	__show_header__ = False
+
+	def poll(self, context):
+		userpref = context.user_preferences
+		return (userpref.active_section == 'EDIT_METHODS')
+
+	def draw(self, context):
+		layout = self.layout
+		
+		userpref = context.user_preferences
+		edit = userpref.edit
+		view = userpref.view
+		
+		split = layout.split()
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="Materials:")
+		sub1.itemR(edit, "material_linked_object", text="Linked to Object")
+		sub1.itemR(edit, "material_linked_obdata", text="Linked to ObData")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="New Objects:")
+		sub1.itemR(edit, "enter_edit_mode")
+		sub1.itemR(edit, "align_to_view")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Transform:")
+		sub1.itemR(edit, "drag_immediately")
+
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="Snap:")
+		sub1.itemR(edit, "snap_translate", text="Translate")
+		sub1.itemR(edit, "snap_rotate", text="Rotate")
+		sub1.itemR(edit, "snap_scale", text="Scale")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Grease Pencil:")
+		sub1.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
+		sub1.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
+		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
+		# sub1.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
+		sub1.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="Keyframing:")
+		sub1.itemR(edit, "use_visual_keying")
+		sub1.itemR(edit, "new_interpolation_type")
+		sub1.itemS()
+		sub1.itemR(edit, "auto_keying_enable", text="Auto Keyframing")
+		sub2 = sub1.column()
+		sub2.enabled = edit.auto_keying_enable
+		sub2.row().itemR(edit, "auto_keying_mode", expand=True)
+		sub2.itemR(edit, "auto_keyframe_insert_available", text="Only Insert Available")
+		sub2.itemR(edit, "auto_keyframe_insert_needed", text="Only Insert Needed")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Undo:")
+		sub1.itemR(edit, "global_undo")
+		sub1.itemR(edit, "undo_steps", text="Steps")
+		sub1.itemR(edit, "undo_memory_limit", text="Memory Limit")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemL(text="Duplicate:")
+		sub1.itemR(edit, "duplicate_mesh", text="Mesh")
+		sub1.itemR(edit, "duplicate_surface", text="Surface")
+		sub1.itemR(edit, "duplicate_curve", text="Curve")
+		sub1.itemR(edit, "duplicate_text", text="Text")
+		sub1.itemR(edit, "duplicate_metaball", text="Metaball")
+		sub1.itemR(edit, "duplicate_armature", text="Armature")
+		sub1.itemR(edit, "duplicate_lamp", text="Lamp")
+		sub1.itemR(edit, "duplicate_material", text="Material")
+		sub1.itemR(edit, "duplicate_texture", text="Texture")
+		sub1.itemR(edit, "duplicate_ipo", text="F-Curve")
+		sub1.itemR(edit, "duplicate_action", text="Action")
+		
+class USERPREF_PT_system(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = "System"
+	__show_header__ = False
+
+	def poll(self, context):
+		userpref = context.user_preferences
+		return (userpref.active_section == 'SYSTEM_OPENGL')
+
+	def draw(self, context):
+		layout = self.layout
+		
+		userpref = context.user_preferences
+		system = userpref.system
+		lan = userpref.language
+		
+		split = layout.split()
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		sub1.itemR(system, "emulate_numpad")	
+		sub1.itemS()
+		sub1.itemS()
+		
+		#Weight Colors
+		sub1.itemL(text="Weight Colors:")
+		sub1.itemR(system, "use_weight_color_range", text="Use Custom Range")
+		
+		sub2 = sub1.column()
+		sub2.active = system.use_weight_color_range
+		sub2.template_color_ramp(system.weight_color_range, expand=True)
+		sub1.itemS()
+		sub1.itemS()
+		
+		#sequencer
+		sub1.itemL(text="Sequencer:")
+		sub1.itemR(system, "prefetch_frames")
+		sub1.itemR(system, "memory_cache_limit")
+		
+		col = split.column()	
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub .column()
+		#System
+		sub1.itemL(text="System:")
+		sub1.itemR(lan, "dpi")
+		sub1.itemR(system, "auto_run_python_scripts")
+		sub1.itemR(system, "frame_server_port")
+		sub1.itemR(system, "filter_file_extensions")
+		sub1.itemR(system, "hide_dot_files_datablocks")
+		sub1.itemR(lan, "scrollback", text="Console Scrollback")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Sound:")
+		sub1.itemR(system, "audio_device")
+		sub2 = sub1.column()
+		sub2.active = system.audio_device != 'AUDIO_DEVICE_NULL'
+		sub2.itemR(system, "enable_all_codecs")
+		sub2.itemR(system, "game_sound")
+		sub2.itemR(system, "audio_channels")
+		sub2.itemR(system, "audio_mixing_buffer")
+		sub2.itemR(system, "audio_sample_rate")
+		sub2.itemR(system, "audio_sample_format")
+		
+		col = split.column()
+		sub = col.split(percentage=0.85)
+		
+		sub1 = sub.column()
+		#OpenGL
+		sub1.itemL(text="OpenGL:")
+		sub1.itemR(system, "clip_alpha", slider=True)
+		sub1.itemR(system, "use_mipmaps")
+		sub1.itemL(text="Window Draw Method:")
+		sub1.row().itemR(system, "window_draw_method", expand=True)
+		sub1.itemL(text="Textures:")
+		sub1.itemR(system, "gl_texture_limit", text="Limit Size")
+		sub1.itemR(system, "texture_time_out", text="Time Out")
+		sub1.itemR(system, "texture_collection_rate", text="Collection Rate")		
+		
+class USERPREF_PT_filepaths(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = "File Paths"
+	__show_header__ = False
+
+	def poll(self, context):
+		userpref = context.user_preferences
+		return (userpref.active_section == 'FILE_PATHS')
+
+	def draw(self, context):
+		layout = self.layout
+		
+		userpref = context.user_preferences
+		paths = userpref.filepaths
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="File Paths:")
+		sub = col.split(percentage=0.3)
+		
+		sub.itemL(text="Fonts:")
+		sub.itemR(paths, "fonts_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Textures:")
+		sub.itemR(paths, "textures_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Texture Plugins:")
+		sub.itemR(paths, "texture_plugin_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Sequence Plugins:")
+		sub.itemR(paths, "sequence_plugin_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Render Output:")
+		sub.itemR(paths, "render_output_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Scripts:")
+		sub.itemR(paths, "python_scripts_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Sounds:")
+		sub.itemR(paths, "sounds_directory", text="")
+		sub = col.split(percentage=0.3)
+		sub.itemL(text="Temp:")
+		sub.itemR(paths, "temporary_directory", text="")
+		
+		col = split.column()
+		sub = col.split(percentage=0.2)
+		sub1 = sub.column()
+		sub2 = sub.column()
+		sub2.itemL(text="Save & Load:")
+		sub2.itemR(paths, "use_relative_paths")
+		sub2.itemR(paths, "compress_file")
+		sub2.itemL(text="Auto Save:")
+		sub2.itemR(paths, "save_version")
+		sub2.itemR(paths, "recent_files")
+		sub2.itemR(paths, "save_preview_images")
+		sub2.itemR(paths, "auto_save_temporary_files")
+		sub3 = sub2.column()
+		sub3.enabled = paths.auto_save_temporary_files
+		sub3.itemR(paths, "auto_save_time")
+
+class USERPREF_PT_language(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = "Language"
+	__show_header__ = False
+
+	def poll(self, context):
+		userpref = context.user_preferences
+		return (userpref.active_section == 'LANGUAGE_COLORS')
+
+	def draw(self, context):
+		layout = self.layout
+		
+		userpref = context.user_preferences
+		lan = userpref.language
+		
+		split = layout.split()
+		col = split.column()
+		
+		col.itemR(lan, "language")
+		col.itemR(lan, "translate_tooltips")
+		col.itemR(lan, "translate_buttons")
+		col.itemR(lan, "translate_toolbox")
+		col.itemR(lan, "use_textured_fonts")
+		
+class USERPREF_PT_bottombar(bpy.types.Panel):
+	__space_type__ = "USER_PREFERENCES"
+	__label__ = " "
+	__show_header__ = False
+
+	def draw(self, context):
+		layout = self.layout
+		userpref = context.user_preferences
+	
+		split = layout.split(percentage=0.8)
+		split.itemL(text="")
+		layout.operator_context = "EXEC_AREA"
+		split.itemO("wm.save_homefile", text="Save As Default")
+
+bpy.types.register(USERPREF_HT_header)
+bpy.types.register(USERPREF_MT_view)
+bpy.types.register(USERPREF_PT_tabs)
+bpy.types.register(USERPREF_PT_view)
+bpy.types.register(USERPREF_PT_edit)
+bpy.types.register(USERPREF_PT_system)
+bpy.types.register(USERPREF_PT_filepaths)
+bpy.types.register(USERPREF_PT_language)
+bpy.types.register(USERPREF_PT_bottombar)
+
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 035b7e2e5b9..09e13c2930e 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -152,6 +152,7 @@ struct SpaceLogic *CTX_wm_space_logic(const bContext *C);
 struct SpaceIpo *CTX_wm_space_graph(const bContext *C);
 struct SpaceAction *CTX_wm_space_action(const bContext *C);
 struct SpaceInfo *CTX_wm_space_info(const bContext *C);
+struct SpaceUserPref *CTX_wm_space_userpref(const bContext *C);
 
 void CTX_wm_manager_set(bContext *C, struct wmWindowManager *wm);
 void CTX_wm_window_set(bContext *C, struct wmWindow *win);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index c38b994849a..bbfe077c15e 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -338,6 +338,13 @@ struct SpaceInfo *CTX_wm_space_info(const bContext *C)
 	return NULL;
 }
 
+struct SpaceUserPref *CTX_wm_space_userpref(const bContext *C)
+{
+	if(C->wm.area && C->wm.area->spacetype==SPACE_USERPREF)
+		return C->wm.area->spacedata.first;
+	return NULL;
+}
+
 void CTX_wm_manager_set(bContext *C, wmWindowManager *wm)
 {
 	C->wm.manager= wm;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 9d059af9887..62ec1b71938 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2023,6 +2023,10 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
 				else if(sl->spacetype==SPACE_CONSOLE) {
 					writestruct(wd, DATA, "SpaceConsole", 1, sl);
 				}
+				else if(sl->spacetype==SPACE_USERPREF) {
+					writestruct(wd, DATA, "SpaceUserPref", 1, sl);
+				}
+
 				sl= sl->next;
 			}
 		}
diff --git a/source/blender/editors/Makefile b/source/blender/editors/Makefile
index dbd0ca779aa..bbbb3fb985f 100644
--- a/source/blender/editors/Makefile
+++ b/source/blender/editors/Makefile
@@ -65,5 +65,6 @@ DIRS = armature \
   space_text \
   space_sequencer \
   space_logic \
+  space_userpref \
 
 include nan_subdirs.mk
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript
index 0a13082faaf..05f17dae1a1 100644
--- a/source/blender/editors/SConscript
+++ b/source/blender/editors/SConscript
@@ -32,6 +32,7 @@ SConscript(['datafiles/SConscript',
 			'space_sequencer/SConscript',
 			'space_logic/SConscript',
 			'space_console/SConscript',
+			'space_userpref/SConscript',
 			'transform/SConscript',
 			'screen/SConscript',
 			'sculpt_paint/SConscript',
diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h
index efaf0f56f92..04b6be3bcaa 100644
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@ -52,6 +52,7 @@ void ED_spacetype_text(void);
 void ED_spacetype_sequencer(void);
 void ED_spacetype_logic(void);
 void ED_spacetype_console(void);
+void ED_spacetype_userpref(void);
 
 /* calls for instancing and freeing spacetype static data 
    called in WM_init_exit */
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index efff5b8f39c..05001109b53 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -104,7 +104,7 @@ static int panel_aligned(ScrArea *sa, ARegion *ar)
 		SpaceButs *sbuts= sa->spacedata.first;
 		return sbuts->align;
 	}
-	else if(sa->spacetype==SPACE_INFO && ar->regiontype == RGN_TYPE_WINDOW)
+	else if(sa->spacetype==SPACE_USERPREF && ar->regiontype == RGN_TYPE_WINDOW)
 		return BUT_VERTICAL;
 	else if(sa->spacetype==SPACE_FILE && ar->regiontype == RGN_TYPE_CHANNELS)
 		return BUT_VERTICAL;
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 297e22610a6..5b51d898235 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -150,6 +150,9 @@ char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
 			case SPACE_INFO:
 				ts= &btheme->tinfo;
 				break;
+			case SPACE_USERPREF:
+				ts= &btheme->tuserpref;
+				break;
 			case SPACE_TIME:
 				ts= &btheme->ttime;
 				break;
@@ -402,6 +405,7 @@ static void ui_theme_init_new(bTheme *btheme)
 	ui_theme_init_new_do(&btheme->ttime);
 	ui_theme_init_new_do(&btheme->tnode);
 	ui_theme_init_new_do(&btheme->tlogic);
+	ui_theme_init_new_do(&btheme->tuserpref);
 	
 }
 
@@ -583,6 +587,10 @@ void ui_theme_init_userdef(void)
 	btheme->tinfo= btheme->tv3d;
 	SETCOLF(btheme->tinfo.back, 	0.45, 0.45, 0.45, 1.0);
 
+	/* space user preferences */
+	btheme->tuserpref= btheme->tv3d;
+	SETCOLF(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0);
+
 	/* space sound */
 	btheme->tsnd= btheme->tv3d;
 	SETCOLF(btheme->tsnd.back, 	0.45, 0.45, 0.45, 1.0);
@@ -1233,6 +1241,7 @@ void init_userdef_do_versions(void)
 			}
 
 			SETCOLF(btheme->tinfo.back, 0.45, 0.45, 0.45, 1.0);
+			SETCOLF(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0);
 		}
 	}
 	
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index ff84542a7cd..ea1541a4e02 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1066,8 +1066,9 @@ static char *windowtype_pup(void)
 		   "|%l"
 		   
 		   "|Properties %x4"
-		   "|User Preferences %x7"
 		   "|Outliner %x3"
+		   "|User Preferences %x19"
+		   "|Info%x7"
 		    		   
 		   "|%l"
 		   "|%l"
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 5c33b648947..041e6a09323 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -77,6 +77,7 @@ void ED_spacetypes_init(void)
 	ED_spacetype_sequencer();
 	ED_spacetype_logic();
 	ED_spacetype_console();
+	ED_spacetype_userpref();
 //	...
 	
 	/* register operator types for screen and all spaces */
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 6b89532cdaf..530500cfafa 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -311,7 +311,6 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path)
 	ToolSettings *ts;
 	Brush *br= NULL;
 	PointerRNA *ptr= &path->ptr[path->len-1];
-	const Object *obact = CTX_data_active_object(C);
 
 	/* if we already have a (pinned) brush, we're done */
 	if(RNA_struct_is_a(ptr->type, &RNA_Brush)) {
@@ -333,7 +332,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path)
 		}
 	}
 
-	/* no path to a world possible */
+	/* no path to a brush possible */
 	return 0;
 }
 
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index e52efe8508d..057f35a2487 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -916,7 +916,7 @@ static int toolbox_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	uiPopupMenu *pup;
 	uiLayout *layout;
 
-	RNA_pointer_create(&sc->id, &RNA_SpaceButtonsWindow, sbuts, &ptr);
+	RNA_pointer_create(&sc->id, &RNA_SpaceProperties, sbuts, &ptr);
 
 	pup= uiPupMenuBegin(C, "Align", 0);
 	layout= uiPupMenuLayout(pup);
diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h
index 519364b58d9..070b627af07 100644
--- a/source/blender/editors/space_info/info_intern.h
+++ b/source/blender/editors/space_info/info_intern.h
@@ -32,9 +32,6 @@
 
 struct wmOperatorType;
 
-/* info_header.c */
-void info_header_buttons(const bContext *C, ARegion *ar);
-
 void FILE_OT_pack_all(struct wmOperatorType *ot);
 void FILE_OT_unpack_all(struct wmOperatorType *ot);
 void FILE_OT_make_paths_relative(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_userpref/Makefile b/source/blender/editors/space_userpref/Makefile
new file mode 100644
index 00000000000..be7206f51ce
--- /dev/null
+++ b/source/blender/editors/space_userpref/Makefile
@@ -0,0 +1,55 @@
+#
+# $Id$
+#
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2007 Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# Makes module object directory and bounces make to subdirectories.
+
+LIBNAME = ed_userpref
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I$(NAN_GLEW)/include
+CPPFLAGS += -I$(OPENGL_HEADERS)
+
+# not very neat....
+CPPFLAGS += -I../../windowmanager
+CPPFLAGS += -I../../blenloader
+CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I../../blenlib
+CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../makesrna
+CPPFLAGS += -I../../imbuf
+CPPFLAGS += -I../../python
+CPPFLAGS += -I../../blenfont
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+
+# own include 
+
+CPPFLAGS += -I../include 
diff --git a/source/blender/editors/space_userpref/SConscript b/source/blender/editors/space_userpref/SConscript
new file mode 100644
index 00000000000..1b808a5a7c0
--- /dev/null
+++ b/source/blender/editors/space_userpref/SConscript
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
+incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+
+defs = []
+
+if env['WITH_BF_GAMEENGINE']:
+	defs.append('GAMEBLENDER=1')
+
+env.BlenderLib ( 'bf_editors_space_userpref', sources, Split(incs), defs, libtype=['core'], priority=[70] )
diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c
new file mode 100644
index 00000000000..8c9d723ce2c
--- /dev/null
+++ b/source/blender/editors/space_userpref/space_userpref.c
@@ -0,0 +1,188 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "DNA_space_types.h"
+#include "DNA_screen_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_context.h"
+#include "BKE_screen.h"
+
+#include "ED_space_api.h"
+#include "ED_screen.h"
+
+#include "BIF_gl.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "userpref_intern.h"	// own include
+
+/* ******************** default callbacks for userpref space ***************** */
+
+static SpaceLink *userpref_new(const bContext *C)
+{
+	ARegion *ar;
+	SpaceUserPref *spref;
+	
+	spref= MEM_callocN(sizeof(SpaceUserPref), "inituserpref");
+	spref->spacetype= SPACE_USERPREF;
+	
+	/* header */
+	ar= MEM_callocN(sizeof(ARegion), "header for userpref");
+	
+	BLI_addtail(&spref->regionbase, ar);
+	ar->regiontype= RGN_TYPE_HEADER;
+	ar->alignment= RGN_ALIGN_BOTTOM;
+	
+	/* main area */
+	ar= MEM_callocN(sizeof(ARegion), "main area for userpref");
+	
+	BLI_addtail(&spref->regionbase, ar);
+	ar->regiontype= RGN_TYPE_WINDOW;
+	
+	return (SpaceLink *)spref;
+}
+
+/* not spacelink itself */
+static void userpref_free(SpaceLink *sl)
+{	
+//	SpaceUserPref *spref= (SpaceUserPref*) sl;
+	
+}
+
+
+/* spacetype; init callback */
+static void userpref_init(struct wmWindowManager *wm, ScrArea *sa)
+{
+
+}
+
+static SpaceLink *userpref_duplicate(SpaceLink *sl)
+{
+	SpaceUserPref *sprefn= MEM_dupallocN(sl);
+	
+	/* clear or remove stuff from old */
+	
+	return (SpaceLink *)sprefn;
+}
+
+
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void userpref_main_area_init(wmWindowManager *wm, ARegion *ar)
+{
+	ED_region_panels_init(wm, ar);
+}
+
+static void userpref_main_area_draw(const bContext *C, ARegion *ar)
+{
+	ED_region_panels(C, ar, 1, NULL, -1);
+}
+
+void userpref_operatortypes(void)
+{
+}
+
+void userpref_keymap(struct wmWindowManager *wm)
+{
+	
+}
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void userpref_header_area_init(wmWindowManager *wm, ARegion *ar)
+{
+	ED_region_header_init(ar);
+}
+
+static void userpref_header_area_draw(const bContext *C, ARegion *ar)
+{
+	ED_region_header(C, ar);
+}
+
+static void userpref_main_area_listener(ARegion *ar, wmNotifier *wmn)
+{
+	/* context changes */
+}
+
+static void userpref_header_listener(ARegion *ar, wmNotifier *wmn)
+{
+	/* context changes */
+	switch(wmn->category) {
+		default:
+			break;
+	}
+	
+}
+
+/* only called once, from space/spacetypes.c */
+void ED_spacetype_userpref(void)
+{
+	SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype userpref");
+	ARegionType *art;
+	
+	st->spaceid= SPACE_USERPREF;
+	
+	st->new= userpref_new;
+	st->free= userpref_free;
+	st->init= userpref_init;
+	st->duplicate= userpref_duplicate;
+	st->operatortypes= userpref_operatortypes;
+	st->keymap= userpref_keymap;
+	
+	/* regions: main window */
+	art= MEM_callocN(sizeof(ARegionType), "spacetype userpref region");
+	art->regionid = RGN_TYPE_WINDOW;
+	art->init= userpref_main_area_init;
+	art->draw= userpref_main_area_draw;
+	art->listener= userpref_main_area_listener;
+	art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
+
+	BLI_addhead(&st->regiontypes, art);
+	
+	/* regions: header */
+	art= MEM_callocN(sizeof(ARegionType), "spacetype userpref region");
+	art->regionid = RGN_TYPE_HEADER;
+	art->minsizey= HEADERY;
+	art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
+	art->listener= userpref_header_listener;
+	art->init= userpref_header_area_init;
+	art->draw= userpref_header_area_draw;
+	
+	BLI_addhead(&st->regiontypes, art);
+	
+	
+	BKE_spacetype_register(st);
+}
+
diff --git a/source/blender/editors/space_userpref/userpref_intern.h b/source/blender/editors/space_userpref/userpref_intern.h
new file mode 100644
index 00000000000..596c2675b01
--- /dev/null
+++ b/source/blender/editors/space_userpref/userpref_intern.h
@@ -0,0 +1,34 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef ED_USERPREF_INTERN_H
+#define ED_USERPREF_INTERN_H
+
+/* internal exports only */
+
+#endif /* ED_USERPREF_INTERN_H */
+
diff --git a/source/blender/editors/space_userpref/userpref_ops.c b/source/blender/editors/space_userpref/userpref_ops.c
new file mode 100644
index 00000000000..91a6651bd92
--- /dev/null
+++ b/source/blender/editors/space_userpref/userpref_ops.c
@@ -0,0 +1,33 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "userpref_intern.h"
+
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 6eb5afbd6ac..37f28cfeaa6 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -508,6 +508,13 @@ typedef struct SpaceConsole {
 	
 } SpaceConsole;
 
+typedef struct SpaceUserPref {
+	SpaceLink *next, *prev;
+	ListBase regionbase;		/* storage of regions for inactive spaces */
+	int spacetype;
+
+	int pad;
+} SpaceUserPref;
 
 /* view3d  Now in DNA_view3d_types.h */
 
@@ -861,7 +868,8 @@ enum {
 	SPACE_NODE,
 	SPACE_LOGIC,
 	SPACE_CONSOLE,
-	SPACEICONMAX = SPACE_CONSOLE
+	SPACE_USERPREF,
+	SPACEICONMAX = SPACE_USERPREF
 };
 
 #endif
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 019dad4eed5..c2314e1e3a2 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -260,6 +260,7 @@ typedef struct bTheme {
 	ThemeSpace ttime;
 	ThemeSpace tnode;
 	ThemeSpace tlogic;
+	ThemeSpace tuserpref;	
 	
 	/* 20 sets of bone colors for this theme */
 	ThemeWireColor tarm[20];
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index d5680ac77ba..e08bc734242 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -252,6 +252,7 @@ extern StructRNA RNA_MarbleTexture;
 extern StructRNA RNA_MaskModifier;
 extern StructRNA RNA_Material;
 extern StructRNA RNA_MaterialHalo;
+extern StructRNA RNA_MaterialPhysics;
 extern StructRNA RNA_MaterialRaytraceMirror;
 extern StructRNA RNA_MaterialRaytraceTransparency;
 extern StructRNA RNA_MaterialSlot;
@@ -304,8 +305,11 @@ extern StructRNA RNA_OperatorStrokeElement;
 extern StructRNA RNA_OrController;
 extern StructRNA RNA_OutflowFluidSettings;
 extern StructRNA RNA_PackedFile;
+extern StructRNA RNA_Paint;
 extern StructRNA RNA_Panel;
 extern StructRNA RNA_Particle;
+extern StructRNA RNA_ParticleBrush;
+extern StructRNA RNA_ParticleEdit;
 extern StructRNA RNA_ParticleFluidSettings;
 extern StructRNA RNA_ParticleHairKey;
 extern StructRNA RNA_ParticleInstanceModifier;
@@ -328,6 +332,7 @@ extern StructRNA RNA_RadarSensor;
 extern StructRNA RNA_RandomSensor;
 extern StructRNA RNA_RaySensor;
 extern StructRNA RNA_Region;
+extern StructRNA RNA_RenderEngine;
 extern StructRNA RNA_RenderLayer;
 extern StructRNA RNA_RenderPass;
 extern StructRNA RNA_RenderResult;
@@ -378,6 +383,9 @@ extern StructRNA RNA_ShapeKeyPoint;
 extern StructRNA RNA_ShrinkwrapConstraint;
 extern StructRNA RNA_ShrinkwrapModifier;
 extern StructRNA RNA_SimpleDeformModifier;
+extern StructRNA RNA_SmokeCollSettings;
+extern StructRNA RNA_SmokeDomainSettings;
+extern StructRNA RNA_SmokeFlowSettings;
 extern StructRNA RNA_SmokeModifier;
 extern StructRNA RNA_SmoothModifier;
 extern StructRNA RNA_SoftBodyModifier;
@@ -386,18 +394,22 @@ extern StructRNA RNA_Sound;
 extern StructRNA RNA_SoundSequence;
 extern StructRNA RNA_Space;
 extern StructRNA RNA_Space3DView;
-extern StructRNA RNA_SpaceButtonsWindow;
 extern StructRNA RNA_SpaceConsole;
 extern StructRNA RNA_SpaceDopeSheetEditor;
 extern StructRNA RNA_SpaceFileBrowser;
 extern StructRNA RNA_SpaceGraphEditor;
 extern StructRNA RNA_SpaceImageEditor;
+extern StructRNA RNA_SpaceInfo;
+extern StructRNA RNA_SpaceLogicEditor;
 extern StructRNA RNA_SpaceNLA;
-extern StructRNA RNA_SpaceTimeline;
+extern StructRNA RNA_SpaceNodeEditor;
 extern StructRNA RNA_SpaceOutliner;
+extern StructRNA RNA_SpaceProperties;
 extern StructRNA RNA_SpaceSequenceEditor;
 extern StructRNA RNA_SpaceTextEditor;
+extern StructRNA RNA_SpaceTimeline;
 extern StructRNA RNA_SpaceUVEditor;
+extern StructRNA RNA_SpaceUserPreferences;
 extern StructRNA RNA_SpeedControlSequence;
 extern StructRNA RNA_SpotLamp;
 extern StructRNA RNA_StretchToConstraint;
@@ -443,16 +455,17 @@ extern StructRNA RNA_TextureSlot;
 extern StructRNA RNA_Theme;
 extern StructRNA RNA_ThemeAudioWindow;
 extern StructRNA RNA_ThemeBoneColorSet;
-extern StructRNA RNA_ThemeButtonsWindow;
 extern StructRNA RNA_ThemeDopeSheet;
 extern StructRNA RNA_ThemeFileBrowser;
 extern StructRNA RNA_ThemeFontStyle;
 extern StructRNA RNA_ThemeGraphEditor;
 extern StructRNA RNA_ThemeImageEditor;
+extern StructRNA RNA_ThemeInfo;
 extern StructRNA RNA_ThemeLogicEditor;
 extern StructRNA RNA_ThemeNLAEditor;
 extern StructRNA RNA_ThemeNodeEditor;
 extern StructRNA RNA_ThemeOutliner;
+extern StructRNA RNA_ThemeProperties;
 extern StructRNA RNA_ThemeSequenceEditor;
 extern StructRNA RNA_ThemeStyle;
 extern StructRNA RNA_ThemeTextEditor;
@@ -474,17 +487,16 @@ extern StructRNA RNA_UVProjectModifier;
 extern StructRNA RNA_UnitSettings;
 extern StructRNA RNA_UnknownType;
 extern StructRNA RNA_UserPreferences;
-extern StructRNA RNA_UserPreferencesAutosave;
 extern StructRNA RNA_UserPreferencesEdit;
 extern StructRNA RNA_UserPreferencesFilePaths;
 extern StructRNA RNA_UserPreferencesLanguage;
 extern StructRNA RNA_UserPreferencesSystem;
 extern StructRNA RNA_UserPreferencesView;
 extern StructRNA RNA_UserSolidLight;
-extern StructRNA RNA_VertexPaint;
 extern StructRNA RNA_VectorFont;
 extern StructRNA RNA_VertexGroup;
 extern StructRNA RNA_VertexGroupElement;
+extern StructRNA RNA_VertexPaint;
 extern StructRNA RNA_VoronoiTexture;
 extern StructRNA RNA_WaveModifier;
 extern StructRNA RNA_Window;
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 991b50afa5a..e5332d32f13 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -49,7 +49,7 @@ EnumPropertyItem space_type_items[] = {
 	{SPACE_BUTS, "PROPERTIES", 0, "Properties", ""},
 	{SPACE_FILE, "FILE_BROWSER", 0, "File Browser", ""},
 	{SPACE_IMAGE, "IMAGE_EDITOR", 0, "Image Editor", ""},
-	{SPACE_INFO, "USER_PREFERENCES", 0, "User Preferences", ""},
+	{SPACE_INFO, "INFO", 0, "Info", ""},
 	{SPACE_SEQ, "SEQUENCE_EDITOR", 0, "Sequence Editor", ""},
 	{SPACE_TEXT, "TEXT_EDITOR", 0, "Text Editor", ""},
 	//{SPACE_IMASEL, "IMAGE_BROWSER", 0, "Image Browser", ""},
@@ -61,6 +61,7 @@ EnumPropertyItem space_type_items[] = {
 	{SPACE_NODE, "NODE_EDITOR", 0, "Node Editor", ""},
 	{SPACE_LOGIC, "LOGIC_EDITOR", 0, "Logic Editor", ""},
 	{SPACE_CONSOLE, "CONSOLE", 0, "Console", ""},
+	{SPACE_USERPREF, "USER_PREFERENCES", 0, "User Preferences", ""},
 	{0, NULL, 0, NULL, NULL}};
 
 #define DC_RGB {0, "COLOR", ICON_IMAGE_RGB, "Color", "Draw image with RGB colors."}
@@ -101,13 +102,13 @@ static StructRNA* rna_Space_refine(struct PointerRNA *ptr)
 		case SPACE_OUTLINER:
 			return &RNA_SpaceOutliner;
 		case SPACE_BUTS:
-			return &RNA_SpaceButtonsWindow;
+			return &RNA_SpaceProperties;
 		case SPACE_FILE:
 			return &RNA_SpaceFileBrowser;
 		case SPACE_IMAGE:
 			return &RNA_SpaceImageEditor;
-		/*case SPACE_INFO:
-			return &RNA_SpaceUserPreferences;*/
+		case SPACE_INFO:
+			return &RNA_SpaceInfo;
 		case SPACE_SEQ:
 			return &RNA_SpaceSequenceEditor;
 		case SPACE_TEXT:
@@ -124,12 +125,14 @@ static StructRNA* rna_Space_refine(struct PointerRNA *ptr)
 			return &RNA_SpaceScriptsWindow;*/
 		case SPACE_TIME:
 			return &RNA_SpaceTimeline;
-		/*case SPACE_NODE:
+		case SPACE_NODE:
 			return &RNA_SpaceNodeEditor;
 		case SPACE_LOGIC:
-			return &RNA_SpaceLogicEditor;*/
+			return &RNA_SpaceLogicEditor;
 		case SPACE_CONSOLE:
 			return &RNA_SpaceConsole;
+		case SPACE_USERPREF:
+			return &RNA_SpaceUserPreferences;
 		default:
 			return &RNA_Space;
 	}
@@ -230,9 +233,9 @@ void rna_SpaceFileBrowser_params_set(PointerRNA *ptr, PointerRNA value)
 	sfile->params= value.data;
 }
 
-/* Space Buttons */
+/* Space Properties */
 
-StructRNA *rna_SpaceButtonsWindow_pin_id_typef(PointerRNA *ptr)
+StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr)
 {
 	SpaceButs *sbuts= (SpaceButs*)(ptr->data);
 
@@ -242,7 +245,7 @@ StructRNA *rna_SpaceButtonsWindow_pin_id_typef(PointerRNA *ptr)
 	return &RNA_ID;
 }
 
-void rna_SpaceButtonsWindow_align_set(PointerRNA *ptr, int value)
+void rna_SpaceProperties_align_set(PointerRNA *ptr, int value)
 {
 	SpaceButs *sbuts= (SpaceButs*)(ptr->data);
 
@@ -718,9 +721,9 @@ static void rna_def_space_buttons(BlenderRNA *brna)
 		{BUT_VERTICAL, "VERTICAL", 0, "Vertical", ""},
 		{0, NULL, 0, NULL, NULL}};
 		
-	srna= RNA_def_struct(brna, "SpaceButtonsWindow", "Space");
+	srna= RNA_def_struct(brna, "SpaceProperties", "Space");
 	RNA_def_struct_sdna(srna, "SpaceButs");
-	RNA_def_struct_ui_text(srna, "Buttons Space", "Buttons Window space data");
+	RNA_def_struct_ui_text(srna, "Properties Space", "Properties space data");
 	
 	prop= RNA_def_property(srna, "context", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "mainb");
@@ -731,7 +734,7 @@ static void rna_def_space_buttons(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "align", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "align");
 	RNA_def_property_enum_items(prop, align_items);
-	RNA_def_property_enum_funcs(prop, NULL, "rna_SpaceButtonsWindow_align_set", NULL);
+	RNA_def_property_enum_funcs(prop, NULL, "rna_SpaceProperties_align_set", NULL);
 	RNA_def_property_ui_text(prop, "Align", "Arrangement of the panels.");
 	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
@@ -744,7 +747,7 @@ static void rna_def_space_buttons(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "pin_id", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "pinid");
 	RNA_def_property_struct_type(prop, "ID");
-	RNA_def_property_pointer_funcs(prop, NULL, NULL, "rna_SpaceButtonsWindow_pin_id_typef");
+	RNA_def_property_pointer_funcs(prop, NULL, NULL, "rna_SpaceProperties_pin_id_typef");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 }
 
@@ -1377,7 +1380,42 @@ static void rna_def_space_filebrowser(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "params");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceFileBrowser_params_set", NULL);
 	RNA_def_property_ui_text(prop, "Filebrowser Parameter", "Parameters and Settings for the Filebrowser.");
+}
 
+static void rna_def_space_info(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	srna= RNA_def_struct(brna, "SpaceInfo", "Space");
+	RNA_def_struct_sdna(srna, "SpaceInfo");
+	RNA_def_struct_ui_text(srna, "Space Info", "Info space data.");
+}
+
+static void rna_def_space_userpref(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	srna= RNA_def_struct(brna, "SpaceUserPreferences", "Space");
+	RNA_def_struct_sdna(srna, "SpaceUserPref");
+	RNA_def_struct_ui_text(srna, "Space User Preferences", "User preferences space data.");
+}
+
+static void rna_def_space_node(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	srna= RNA_def_struct(brna, "SpaceNodeEditor", "Space");
+	RNA_def_struct_sdna(srna, "SpaceNode");
+	RNA_def_struct_ui_text(srna, "Space Node Editor", "Node editor space data.");
+}
+
+static void rna_def_space_logic(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	srna= RNA_def_struct(brna, "SpaceLogicEditor", "Space");
+	RNA_def_struct_sdna(srna, "SpaceLogic");
+	RNA_def_struct_ui_text(srna, "Space Logic Editor", "Logic editor space data.");
 }
 
 void RNA_def_space(BlenderRNA *brna)
@@ -1398,6 +1436,10 @@ void RNA_def_space(BlenderRNA *brna)
 	rna_def_space_time(brna);
 	rna_def_space_console(brna);
 	rna_def_console_line(brna);
+	rna_def_space_info(brna);
+	rna_def_space_userpref(brna);
+	rna_def_space_node(brna);
+	rna_def_space_logic(brna);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 836e6a2fda7..d1245528100 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -690,7 +690,7 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "ThemeGraphEditor", NULL);
 	RNA_def_struct_sdna(srna, "ThemeSpace");
-	RNA_def_struct_ui_text(srna, "Theme Graph Editor", "Theme settings for the Ipo Editor.");
+	RNA_def_struct_ui_text(srna, "Theme Graph Editor", "Theme settings for the graph editor.");
 
 	rna_def_userdef_theme_spaces_main(srna, SPACE_IPO);
 
@@ -827,19 +827,33 @@ static void rna_def_userdef_theme_space_outliner(BlenderRNA *brna)
 	rna_def_userdef_theme_spaces_main(srna, SPACE_OUTLINER);
 }
 
+static void rna_def_userdef_theme_space_userpref(BlenderRNA *brna)
+{
+	StructRNA *srna;
+
+	/* space_userpref */
+
+	srna= RNA_def_struct(brna, "ThemeUserPreferences", NULL);
+	RNA_def_struct_sdna(srna, "ThemeSpace");
+	RNA_def_struct_ui_text(srna, "Theme User Preferences", "Theme settings for the User Preferences.");
+
+	rna_def_userdef_theme_spaces_main(srna, SPACE_USERPREF);
+}
+
 static void rna_def_userdef_theme_space_info(BlenderRNA *brna)
 {
 	StructRNA *srna;
 
 	/* space_info */
 
-	srna= RNA_def_struct(brna, "ThemeUserPreferences", NULL);
+	srna= RNA_def_struct(brna, "ThemeInfo", NULL);
 	RNA_def_struct_sdna(srna, "ThemeSpace");
-	RNA_def_struct_ui_text(srna, "Theme User Preferences", "Theme settings for the User Preferences.");
+	RNA_def_struct_ui_text(srna, "Theme Info", "Theme settings for Info.");
 
 	rna_def_userdef_theme_spaces_main(srna, SPACE_INFO);
 }
 
+
 static void rna_def_userdef_theme_space_text(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -997,7 +1011,7 @@ static void rna_def_userdef_theme_space_buts(BlenderRNA *brna)
 
 	/* space_buts */
 
-	srna= RNA_def_struct(brna, "ThemeButtonsWindow", NULL);
+	srna= RNA_def_struct(brna, "ThemeProperties", NULL);
 	RNA_def_struct_sdna(srna, "ThemeSpace");
 	RNA_def_struct_ui_text(srna, "Theme Properties", "Theme settings for the Properties.");
 
@@ -1402,7 +1416,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "properties", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "tbuts");
-	RNA_def_property_struct_type(prop, "ThemeButtonsWindow");
+	RNA_def_property_struct_type(prop, "ThemeProperties");
 	RNA_def_property_ui_text(prop, "Properties", "");
 
 	prop= RNA_def_property(srna, "text_editor", PROP_POINTER, PROP_NEVER_NULL);
@@ -1430,8 +1444,13 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "ThemeOutliner");
 	RNA_def_property_ui_text(prop, "Outliner", "");
 
-	prop= RNA_def_property(srna, "user_preferences", PROP_POINTER, PROP_NEVER_NULL);
+	prop= RNA_def_property(srna, "info", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "tinfo");
+	RNA_def_property_struct_type(prop, "ThemeInfo");
+	RNA_def_property_ui_text(prop, "Info", "");
+
+	prop= RNA_def_property(srna, "user_preferences", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "tuserpref");
 	RNA_def_property_struct_type(prop, "ThemeUserPreferences");
 	RNA_def_property_ui_text(prop, "User Preferences", "");
 
@@ -1460,6 +1479,7 @@ static void rna_def_userdef_dothemes(BlenderRNA *brna)
 	rna_def_userdef_theme_space_node(brna);
 	rna_def_userdef_theme_space_outliner(brna);
 	rna_def_userdef_theme_space_info(brna);
+	rna_def_userdef_theme_space_userpref(brna);
 	rna_def_userdef_theme_space_sound(brna);
 	rna_def_userdef_theme_space_logic(brna);
 	rna_def_userdef_theme_colorset(brna);
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index a6fbb0515bc..d6bde9a468c 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -446,14 +446,14 @@ void WM_window_open_temp(bContext *C, rcti *position, int type)
 		ED_area_newspace(C, sa, SPACE_IMAGE);
 	}
 	else {
-		ED_area_newspace(C, sa, SPACE_INFO);
+		ED_area_newspace(C, sa, SPACE_USERPREF);
 	}
 	
 	ED_screen_set(C, win->screen);
 	
 	if(sa->spacetype==SPACE_IMAGE)
 		GHOST_SetTitle(win->ghostwin, "Blender Render");
-	else if(ELEM(sa->spacetype, SPACE_OUTLINER, SPACE_INFO))
+	else if(ELEM(sa->spacetype, SPACE_OUTLINER, SPACE_USERPREF))
 		GHOST_SetTitle(win->ghostwin, "Blender User Preferences");
 	else if(sa->spacetype==SPACE_FILE)
 		GHOST_SetTitle(win->ghostwin, "Blender File View");

From 3803a3c5a7c063718c6cdbdb025143ff93b2d5bb Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Tue, 18 Aug 2009 14:31:13 +0000
Subject: [PATCH 120/577] Fixed some redraw problems with texture nodes.

---
 source/blender/blenkernel/intern/node.c       |  6 -----
 source/blender/editors/space_node/node_draw.c |  6 ++---
 source/blender/editors/space_node/node_edit.c |  6 ++---
 .../blender/editors/space_node/space_node.c   | 11 ++++++--
 .../nodes/intern/TEX_nodes/TEX_output.c       | 25 ++++++++++++++++---
 source/blender/nodes/intern/TEX_util.c        | 23 -----------------
 6 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 836f4281eb9..bd6919dc115 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -950,9 +950,6 @@ bNode *nodeAddNodeType(bNodeTree *ntree, int type, bNodeTree *ngroup, ID *id)
 	if(ntype->initfunc!=NULL)
 		ntype->initfunc(node);
 	
-	if(type==TEX_NODE_OUTPUT)
-		ntreeTexAssignIndex(ntree, node);
-
 	nodeAddSockets(node, ntype);
 	
 	return node;
@@ -1021,9 +1018,6 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node, int internal)
 	nnode->new_node= NULL;
 	nnode->preview= NULL;
 	
-	if(node->type==TEX_NODE_OUTPUT)
-		ntreeTexAssignIndex(ntree, node);
-
 	return nnode;
 }
 
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 70e2167c1e4..f3df7a29c2e 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -607,9 +607,9 @@ static void do_node_internal_buttons(bContext *C, void *node_v, int event)
 			}
 			WM_event_add_notifier(C, NC_SCENE|ND_NODES, CTX_data_scene(C));
 		}			
-		
-	//	else if(snode->treetype==NTREE_TEXTURE)
-	//		texture_node_event(snode, val);
+		else if(snode->treetype==NTREE_TEXTURE) {
+			WM_event_add_notifier(C, NC_TEXTURE|ND_NODES, snode->id);
+		}
 	}
 	
 }
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index d66cbb55baa..20abcdf9f97 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -213,10 +213,8 @@ void snode_handle_recalc(bContext *C, SpaceNode *snode)
 		WM_event_add_notifier(C, NC_MATERIAL|ND_NODES, snode->id);
 	else if(snode->treetype==NTREE_COMPOSIT)
 		WM_event_add_notifier(C, NC_SCENE|ND_NODES, snode->id);
-	else if(snode->treetype==NTREE_TEXTURE) {
-		// ntreeTexUpdatePreviews(snode->nodetree); /* XXX texture nodes should follow shader node methods (ton) */
-		// XXX BIF_preview_changed(ID_TE);
-	}
+	else if(snode->treetype==NTREE_TEXTURE)
+		WM_event_add_notifier(C, NC_TEXTURE|ND_NODES, snode->id);
 }
 
 #if 0
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 25e1b368ccb..5db9d7331b8 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -152,12 +152,16 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
 			if(wmn->data==ND_FILEREAD)
 				ED_area_tag_refresh(sa);
 			break;
-				
+			
+		/* future: add ID checks? */
 		case NC_MATERIAL:
-			/* future: add ID check? */
 			if(wmn->data==ND_SHADING)
 				ED_area_tag_refresh(sa);
 			break;
+		case NC_TEXTURE:
+			if(wmn->data==ND_NODES)
+				ED_area_tag_refresh(sa);
+			break;
 	}
 }
 
@@ -280,6 +284,9 @@ static void node_region_listener(ARegion *ar, wmNotifier *wmn)
 		case NC_MATERIAL:
 			ED_region_tag_redraw(ar);
 			break;
+		case NC_TEXTURE:
+			ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
index 96ee5d74f66..7ce5ec88c48 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
@@ -152,6 +152,26 @@ static void unique_name(bNode *node)
 	}
 }
 
+static void assign_index(struct bNode *node)
+{
+	bNode *tnode;
+	int index = 1;
+	
+	tnode = node;
+	while(tnode->prev)
+		tnode = tnode->prev;
+	
+	check_index:
+	for(; tnode; tnode= tnode->next)
+		if(tnode->type == TEX_NODE_OUTPUT && tnode != node)
+			if(tnode->custom1 == index) {
+				index ++;
+				goto check_index;
+			}
+			
+	node->custom1 = index;
+}
+
 static void init(bNode *node)
 {
 	TexNodeOutput *tno = MEM_callocN(sizeof(TexNodeOutput), "TEX_output");
@@ -159,17 +179,16 @@ static void init(bNode *node)
 	
 	strcpy(tno->name, "Default");
 	unique_name(node);
-	ntreeTexAssignIndex(0, node);
+	assign_index(node);
 }
 
 static void copy(bNode *orig, bNode *new)
 {
 	node_copy_standard_storage(orig, new);
 	unique_name(new);
-	ntreeTexAssignIndex(0, new);
+	assign_index(new);
 }
 
-
 bNodeType tex_node_output= {
 	/* *next,*prev     */  NULL, NULL,
 	/* type code       */  TEX_NODE_OUTPUT,
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index 36182d2498d..0bb9d887ae3 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -297,26 +297,3 @@ char* ntreeTexOutputMenu(bNodeTree *ntree)
 	return str;
 }
 
-void ntreeTexAssignIndex(struct bNodeTree *ntree, struct bNode *node)
-{
-	bNode *tnode;
-	int index = 1;
-	
-	if(ntree) 
-		tnode = ntree->nodes.first;
-	else {
-		tnode = node;
-		while(tnode->prev) tnode = tnode->prev;
-	}
-	
-	check_index:
-	for(; tnode; tnode= tnode->next)
-		if(tnode->type == TEX_NODE_OUTPUT && tnode != node)
-			if(tnode->custom1 == index) {
-				index ++;
-				goto check_index;
-			}
-			
-	node->custom1 = index;
-}
-

From ede954b93821e3eda5e30ce362ce8472ee17368d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 18 Aug 2009 15:20:29 +0000
Subject: [PATCH 121/577] compile time option to override C++'s new/delete to
 use guardedalloc, useful for debugging. shows memory leaks very quickly.
 currently cmake only - WITH_CXX_GUARDEDALLOC

---
 CMakeLists.txt                      |  6 +++++
 blenderplayer/CMakeLists.txt        |  4 +++
 intern/guardedalloc/CMakeLists.txt  |  7 ++++-
 intern/guardedalloc/cpp/mallocn.cpp | 41 +++++++++++++++++++++++++++++
 source/creator/CMakeLists.txt       |  4 +++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 intern/guardedalloc/cpp/mallocn.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16110e76607..2f12d342726 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)"
 OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_CXX_GUARDEDALLOC "" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -514,6 +515,11 @@ INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
 
+# better not define flags here but this is a debugging option thats off by default.
+IF(WITH_CXX_GUARDEDALLOC)
+  SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+ENDIF(WITH_CXX_GUARDEDALLOC)
+
 #-----------------------------------------------------------------------------
 # Libraries
 FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index 4539701a3ae..77bc059a6a0 100644
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -110,6 +110,10 @@ IF(UNIX)
 	extern_glew
   ) 
 
+  IF(WITH_CXX_GUARDEDALLOC)
+    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+  ENDIF(WITH_CXX_GUARDEDALLOC)
+
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
     SET(REMLIB ${SORTLIB})
     FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index af64fb99d58..b29837fac7d 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -29,4 +29,9 @@ SET(INC .)
 FILE(GLOB SRC intern/*.c)
 
 BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}")
-#, libtype=['intern', 'player'], priority = [10, 175] )
+
+# Override C++ alloc optional
+IF(WITH_CXX_GUARDEDALLOC)
+  FILE(GLOB SRC cpp/*.cpp)
+  BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
+ENDIF(WITH_CXX_GUARDEDALLOC)
diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp
new file mode 100644
index 00000000000..bb2839c7986
--- /dev/null
+++ b/intern/guardedalloc/cpp/mallocn.cpp
@@ -0,0 +1,41 @@
+/**
+ * $Id: mallocn.c 21060 2009-06-21 16:37:13Z campbellbarton $
+ * ***** 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): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <new>
+#include "../MEM_guardedalloc.h"
+
+void* operator new (size_t size)
+{
+	return MEM_mallocN(size, "c++/anonymous");
+}
+
+/* not default but can be used when needing to set a string */
+void* operator new (size_t size, const char *str)
+{
+	return MEM_mallocN(size, str);
+}
+
+void operator delete (void *p)
+{
+	MEM_freeN(p);
+}
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a0ebf627e2c..a9368e021cd 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -348,6 +348,10 @@ IF(UNIX)
     bf_audaspace
   )
 
+  IF(WITH_CXX_GUARDEDALLOC)
+    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+  ENDIF(WITH_CXX_GUARDEDALLOC)
+
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
     SET(REMLIB ${SORTLIB})
     FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})

From 368262461641f23239c1a7bd2e6fa9d5057902e7 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 18 Aug 2009 15:27:48 +0000
Subject: [PATCH 122/577] 2.5: Game Engine

* Added Shading and Performance panels in the scene buttons,
  containing the options previously in the 2.4x game menu.
* Added show framerate/debug/physics/warnings back in game menu.
* Moved these settings from G.fileflags to scene GameData.
* Enabled Display Lists by default.
* Some other small game scene button tweaks.
---
 release/ui/buttons_game.py                    | 52 +++++++++++-
 release/ui/space_info.py                      |  9 ++
 source/blender/blenkernel/BKE_blender.h       |  2 +-
 source/blender/blenkernel/BKE_global.h        | 32 ++++----
 source/blender/blenkernel/intern/scene.c      |  3 +
 source/blender/blenloader/intern/readfile.c   | 39 +++++++++
 source/blender/blenloader/intern/readfile.h   |  1 +
 .../blender/editors/space_view3d/drawobject.c |  3 +-
 .../editors/space_view3d/view3d_draw.c        |  8 +-
 source/blender/gpu/intern/gpu_material.c      | 38 ++++-----
 source/blender/makesdna/DNA_scene_types.h     | 22 ++++-
 source/blender/makesrna/intern/rna_scene.c    | 82 ++++++++++++++++++-
 .../BlenderRoutines/BL_KetsjiEmbedStart.cpp   |  6 +-
 .../GamePlayer/ghost/GPG_Application.cpp      | 13 +--
 source/gameengine/Ketsji/KX_PythonInit.cpp    | 46 +++++------
 15 files changed, 273 insertions(+), 83 deletions(-)

diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py
index 3158536585e..7334b453e91 100644
--- a/release/ui/buttons_game.py
+++ b/release/ui/buttons_game.py
@@ -192,7 +192,7 @@ class SCENE_PT_game(SceneButtonsPanel):
 		row.itemL()
 
 class SCENE_PT_game_player(SceneButtonsPanel):
-	__label__ = "Player"
+	__label__ = "Standalone Player"
 
 	def draw(self, context):
 		layout = self.layout
@@ -219,8 +219,8 @@ class SCENE_PT_game_player(SceneButtonsPanel):
 		col = layout.column()
 		col.itemL(text="Framing:")
 		col.row().itemR(gs, "framing_type", expand=True)
-		sub = col.column()
-		sub.itemR(gs, "framing_color", text="")
+		if gs.framing_type == 'LETTERBOX':
+			col.itemR(gs, "framing_color", text="")
 
 class SCENE_PT_game_stereo(SceneButtonsPanel):
 	__label__ = "Stereo"
@@ -271,9 +271,55 @@ class SCENE_PT_game_stereo(SceneButtonsPanel):
 		
 			layout.itemR(gs, "dome_text")
 
+class SCENE_PT_game_shading(SceneButtonsPanel):
+	__label__ = "Shading"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		gs = context.scene.game_data
+		layout.itemR(gs, "material_mode", expand=True)
+ 
+		if gs.material_mode == 'GLSL':
+			split = layout.split()
+
+			col = split.column()
+			col.itemR(gs, "glsl_lights", text="Lights")
+			col.itemR(gs, "glsl_shaders", text="Shaders")
+			col.itemR(gs, "glsl_shadows", text="Shadows")
+
+			col = split.column()
+			col.itemR(gs, "glsl_ramps", text="Ramps")
+			col.itemR(gs, "glsl_nodes", text="Nodes")
+			col.itemR(gs, "glsl_extra_textures", text="Extra Textures")
+
+class SCENE_PT_game_performance(SceneButtonsPanel):
+	__label__ = "Performance"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		gs = context.scene.game_data
+
+		split = layout.split()
+
+		col = split.column()
+		col.itemL(text="Show:")
+		col.itemR(gs, "show_debug_properties", text="Debug Properties")
+		col.itemR(gs, "show_framerate_profile", text="Framerate and Profile")
+		col.itemR(gs, "show_physics_visualization", text="Physics Visualization")
+		col.itemR(gs, "deprecation_warnings")
+ 
+		col = split.column()
+		col.itemL(text="Render:")
+		col.itemR(gs, "all_frames")
+		col.itemR(gs, "display_lists")
+
 bpy.types.register(SCENE_PT_game)
 bpy.types.register(SCENE_PT_game_player)
 bpy.types.register(SCENE_PT_game_stereo)
+bpy.types.register(SCENE_PT_game_shading)
+bpy.types.register(SCENE_PT_game_performance)
 
 class WorldButtonsPanel(bpy.types.Panel):
 	__space_type__ = "PROPERTIES"
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 12005ea3ecb..e0b5c770f29 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -135,8 +135,17 @@ class INFO_MT_game(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
+		gs = context.scene.game_data
+
 		layout.itemO("view3d.game_start")
 
+		layout.itemS()
+
+		layout.itemR(gs, "show_debug_properties")
+		layout.itemR(gs, "show_framerate_profile")
+		layout.itemR(gs, "show_physics_visualization")
+		layout.itemR(gs, "deprecation_warnings")
+
 class INFO_MT_render(bpy.types.Menu):
 	__space_type__ = "INFO"
 	__label__ = "Render"
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 4fe1eec55c0..42ee11587a7 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -43,7 +43,7 @@ struct bContext;
 struct ReportList;
 
 #define BLENDER_VERSION			250
-#define BLENDER_SUBVERSION		1
+#define BLENDER_SUBVERSION		2
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 7ce616c37c9..6323258ff43 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -126,26 +126,26 @@ typedef struct Global {
 #define G_AUTOPACK               (1 << 0)
 #define G_FILE_COMPRESS          (1 << 1)
 #define G_FILE_AUTOPLAY          (1 << 2)
-#define G_FILE_ENABLE_ALL_FRAMES (1 << 3)
-#define G_FILE_SHOW_DEBUG_PROPS  (1 << 4)
-#define G_FILE_SHOW_FRAMERATE    (1 << 5)
-#define G_FILE_SHOW_PROFILE      (1 << 6)
+#define G_FILE_ENABLE_ALL_FRAMES (1 << 3)				/* deprecated */
+#define G_FILE_SHOW_DEBUG_PROPS  (1 << 4)				/* deprecated */
+#define G_FILE_SHOW_FRAMERATE    (1 << 5)				/* deprecated */
+#define G_FILE_SHOW_PROFILE      (1 << 6)				/* deprecated */
 #define G_FILE_LOCK              (1 << 7)
 #define G_FILE_SIGN              (1 << 8)
 #define G_FIle_PUBLISH			 (1 << 9)
 #define G_FILE_NO_UI			 (1 << 10)
-#define G_FILE_GAME_TO_IPO		 (1 << 11)
-#define G_FILE_GAME_MAT			 (1 << 12)
-#define G_FILE_DISPLAY_LISTS	 (1 << 13)
-#define G_FILE_SHOW_PHYSICS		 (1 << 14)
-#define G_FILE_GAME_MAT_GLSL	 (1 << 15)
-#define G_FILE_GLSL_NO_LIGHTS	 (1 << 16)
-#define G_FILE_GLSL_NO_SHADERS	 (1 << 17)
-#define G_FILE_GLSL_NO_SHADOWS	 (1 << 18)
-#define G_FILE_GLSL_NO_RAMPS	 (1 << 19)
-#define G_FILE_GLSL_NO_NODES	 (1 << 20)
-#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)
-#define G_FILE_IGNORE_DEPRECATION_WARNINGS	(1 << 22)
+#define G_FILE_GAME_TO_IPO		 (1 << 11)				/* deprecated */
+#define G_FILE_GAME_MAT			 (1 << 12)				/* deprecated */
+#define G_FILE_DISPLAY_LISTS	 (1 << 13)				/* deprecated */
+#define G_FILE_SHOW_PHYSICS		 (1 << 14)				/* deprecated */
+#define G_FILE_GAME_MAT_GLSL	 (1 << 15)				/* deprecated */
+#define G_FILE_GLSL_NO_LIGHTS	 (1 << 16)				/* deprecated */
+#define G_FILE_GLSL_NO_SHADERS	 (1 << 17)				/* deprecated */
+#define G_FILE_GLSL_NO_SHADOWS	 (1 << 18)				/* deprecated */
+#define G_FILE_GLSL_NO_RAMPS	 (1 << 19)				/* deprecated */
+#define G_FILE_GLSL_NO_NODES	 (1 << 20)				/* deprecated */
+#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)				/* deprecated */
+#define G_FILE_IGNORE_DEPRECATION_WARNINGS	(1 << 22)	/* deprecated */
 
 /* G.windowstate */
 #define G_WINDOWSTATE_USERDEF		0
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 8488d7ab247..2a8fd765386 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -442,6 +442,9 @@ Scene *add_scene(char *name)
 	sce->gm.physubstep = 1;
 	sce->gm.maxphystep = 5;
 
+	sce->gm.flag = GAME_DISPLAY_LISTS;
+	sce->gm.matmode = GAME_MAT_MULTITEX;
+
 	return sce;
 }
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 61f6cb8b44c..779a898bd6a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5345,6 +5345,9 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead)
 	bfd->curscene= fg->curscene;
 	
 	MEM_freeN(fg);
+
+	fd->globalf= bfd->globalf;
+	fd->fileflags= bfd->fileflags;
 	
 	return blo_nextbhead(fd, bhead);
 }
@@ -9560,6 +9563,42 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		}
 	}
 
+	if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 2)) {
+		Scene *sce;
+
+		for(sce = main->scene.first; sce; sce = sce->id.next) {
+			if(fd->fileflags & G_FILE_ENABLE_ALL_FRAMES)
+				sce->gm.flag |= GAME_ENABLE_ALL_FRAMES;
+			if(fd->fileflags & G_FILE_SHOW_DEBUG_PROPS)
+				sce->gm.flag |= GAME_SHOW_DEBUG_PROPS;
+			if(fd->fileflags & G_FILE_SHOW_FRAMERATE)
+				sce->gm.flag |= GAME_SHOW_FRAMERATE;
+			if(fd->fileflags & G_FILE_SHOW_PHYSICS)
+				sce->gm.flag |= GAME_SHOW_PHYSICS;
+			if(fd->fileflags & G_FILE_GLSL_NO_SHADOWS)
+				sce->gm.flag |= GAME_GLSL_NO_SHADOWS;
+			if(fd->fileflags & G_FILE_GLSL_NO_SHADERS)
+				sce->gm.flag |= GAME_GLSL_NO_SHADERS;
+			if(fd->fileflags & G_FILE_GLSL_NO_RAMPS)
+				sce->gm.flag |= GAME_GLSL_NO_RAMPS;
+			if(fd->fileflags & G_FILE_GLSL_NO_NODES)
+				sce->gm.flag |= GAME_GLSL_NO_NODES;
+			if(fd->fileflags & G_FILE_GLSL_NO_EXTRA_TEX)
+				sce->gm.flag |= GAME_GLSL_NO_EXTRA_TEX;
+			if(fd->fileflags & G_FILE_IGNORE_DEPRECATION_WARNINGS)
+				sce->gm.flag |= GAME_IGNORE_DEPRECATION_WARNINGS;
+
+			if(fd->fileflags & G_FILE_GAME_MAT_GLSL)
+				sce->gm.matmode= GAME_MAT_GLSL;
+			else if(fd->fileflags & G_FILE_GAME_MAT)
+				sce->gm.matmode= GAME_MAT_MULTITEX;
+			else
+				sce->gm.matmode= GAME_MAT_TEXFACE;
+
+			sce->gm.flag |= GAME_DISPLAY_LISTS;
+		}
+	}
+
 	/* put 2.50 compatibility code here until next subversion bump */
 	{
 	}
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index f0e00b75b67..e39fefa8205 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -69,6 +69,7 @@ typedef struct FileData {
 	
 	int fileversion;
 	int id_name_offs;		/* used to retrieve ID names from (bhead+1) */
+	int globalf, fileflags;	/* for do_versions patching */
 	
 	struct OldNewMap *datamap;
 	struct OldNewMap *globmap;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index cb07796ed67..466b55ba862 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -216,8 +216,7 @@ int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt)
 	if(ob==OBACT && (ob && ob->mode & OB_MODE_WEIGHT_PAINT))
 		return 0;
 	
-	return ((G.fileflags & G_FILE_GAME_MAT) &&
-	   (G.fileflags & G_FILE_GAME_MAT_GLSL) && (dt >= OB_SHADED));
+	return (scene->gm.matmode == GAME_MAT_GLSL) && (dt >= OB_SHADED);
 }
 
 static int check_material_alpha(Base *base, Mesh *me, int glsl)
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 01bc330267d..3140ae76d4b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1855,7 +1855,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d)
 /* *********************** customdata **************** */
 
 /* goes over all modes and view3d settings */
-static CustomDataMask get_viewedit_datamask(bScreen *screen, Object *ob)
+static CustomDataMask get_viewedit_datamask(bScreen *screen, Scene *scene, Object *ob)
 {
 	CustomDataMask mask = CD_MASK_BAREMESH;
 	ScrArea *sa;
@@ -1875,10 +1875,8 @@ static CustomDataMask get_viewedit_datamask(bScreen *screen, Object *ob)
 			if((view->drawtype == OB_TEXTURE) || ((view->drawtype == OB_SOLID) && (view->flag2 & V3D_SOLID_TEX))) {
 				mask |= CD_MASK_MTFACE | CD_MASK_MCOL;
 				
-				if((G.fileflags & G_FILE_GAME_MAT) &&
-				   (G.fileflags & G_FILE_GAME_MAT_GLSL)) {
+				if(scene->gm.matmode == GAME_MAT_GLSL)
 					mask |= CD_MASK_ORCO;
-				}
 			}
 		}
 	}
@@ -1909,7 +1907,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	char *grid_unit= NULL;
 	
 	/* from now on all object derived meshes check this */
-	v3d->customdata_mask= get_viewedit_datamask(CTX_wm_screen(C), obact);
+	v3d->customdata_mask= get_viewedit_datamask(CTX_wm_screen(C), scene, obact);
 	
 	/* shadow buffers, before we setup matrices */
 	if(draw_glsl_material(scene, NULL, v3d, v3d->drawtype))
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index c85e2b5a7f1..c0fb069fc41 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -500,7 +500,7 @@ static void ramp_diffuse_result(GPUShadeInput *shi, GPUNodeLink **diff)
 	GPUMaterial *mat= shi->gpumat;
 	GPUNodeLink *fac;
 
-	if(!(G.fileflags & G_FILE_GLSL_NO_RAMPS)) {
+	if(!(mat->scene->gm.flag & GAME_GLSL_NO_RAMPS)) {
 		if(ma->ramp_col) {
 			if(ma->rampin_col==MA_RAMP_IN_RESULT) {
 				GPU_link(mat, "ramp_rgbtobw", *diff, &fac);
@@ -516,7 +516,7 @@ static void add_to_diffuse(GPUMaterial *mat, Material *ma, GPUShadeInput *shi, G
 {
 	GPUNodeLink *fac, *tmp, *addcol;
 	
-	if(!(G.fileflags & G_FILE_GLSL_NO_RAMPS) &&
+	if(!(mat->scene->gm.flag & GAME_GLSL_NO_RAMPS) &&
 	   ma->ramp_col && (ma->mode & MA_RAMP_COL)) {
 		/* MA_RAMP_IN_RESULT is exceptional */
 		if(ma->rampin_col==MA_RAMP_IN_RESULT) {
@@ -556,7 +556,7 @@ static void ramp_spec_result(GPUShadeInput *shi, GPUNodeLink **spec)
 	GPUMaterial *mat= shi->gpumat;
 	GPUNodeLink *fac;
 
-	if(!(G.fileflags & G_FILE_GLSL_NO_RAMPS) &&
+	if(!(mat->scene->gm.flag & GAME_GLSL_NO_RAMPS) &&
 	   ma->ramp_spec && ma->rampin_spec==MA_RAMP_IN_RESULT) {
 		GPU_link(mat, "ramp_rgbtobw", *spec, &fac);
 		
@@ -644,7 +644,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
 
 		is= inp; /* Lambert */
 
-		if(!(G.fileflags & G_FILE_GLSL_NO_SHADERS)) {
+		if(!(mat->scene->gm.flag & GAME_GLSL_NO_SHADERS)) {
 			if(ma->diff_shader==MA_DIFF_ORENNAYAR)
 				GPU_link(mat, "shade_diffuse_oren_nayer", inp, vn, lv, view, GPU_uniform(&ma->roughness), &is);
 			else if(ma->diff_shader==MA_DIFF_TOON)
@@ -656,7 +656,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
 		}
 	}
 
-	if(!(G.fileflags & G_FILE_GLSL_NO_SHADERS))
+	if(!(mat->scene->gm.flag & GAME_GLSL_NO_SHADERS))
 		if(ma->shade_flag & MA_CUBIC)
 			GPU_link(mat, "shade_cubic", is, &is);
 	
@@ -671,7 +671,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
 	// done in shade_visifac now, GPU_link(mat, "mtex_value_clamp_positive", i, &i);
 
 	if((ma->mode & MA_SHADOW) && GPU_lamp_has_shadow_buffer(lamp)) {
-		if(!(G.fileflags & G_FILE_GLSL_NO_SHADOWS)) {
+		if(!(mat->scene->gm.flag & GAME_GLSL_NO_SHADOWS)) {
 			mat->dynproperty |= DYN_LAMP_PERSMAT;
 
 			GPU_link(mat, "test_shadowbuf",
@@ -700,7 +700,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
 			GPU_link(mat, "math_multiply", i, shadfac, &i);
 		}
 	}
-	else if((G.fileflags & G_FILE_GLSL_NO_SHADOWS) && (lamp->mode & LA_ONLYSHADOW)) {
+	else if((mat->scene->gm.flag & GAME_GLSL_NO_SHADOWS) && (lamp->mode & LA_ONLYSHADOW)) {
 		add_user_list(&mat->lamps, lamp);
 		add_user_list(&lamp->materials, shi->gpumat->ma);
 		return;
@@ -716,7 +716,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
 		}
 	}
 
-	if(G.fileflags & G_FILE_GLSL_NO_SHADERS);
+	if(mat->scene->gm.flag & GAME_GLSL_NO_SHADERS);
 	else if(!(lamp->mode & LA_NO_SPEC) && !(lamp->mode & LA_ONLYSHADOW) &&
 	   (GPU_link_changed(shi->spec) || ma->spec != 0.0f)) {
 		if(lamp->type == LA_HEMI) {
@@ -1015,11 +1015,11 @@ static void do_material_tex(GPUShadeInput *shi)
 				if(mtex->mapto & MAP_COL)
 					texture_rgb_blend(mat, tcol, shi->rgb, tin, colfac, mtex->blendtype, &shi->rgb);
 				
-				if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && (mtex->mapto & MAP_COLSPEC))
+				if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && (mtex->mapto & MAP_COLSPEC))
 					texture_rgb_blend(mat, tcol, shi->specrgb, tin, colfac, mtex->blendtype, &shi->specrgb);
 			}
 
-			if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && (mtex->mapto & MAP_NORM)) {
+			if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && (mtex->mapto & MAP_NORM)) {
 				if(mtex->maptoneg & MAP_NORM) tex->norfac= -mtex->norfac;
 				else tex->norfac= mtex->norfac;
 				
@@ -1065,22 +1065,22 @@ static void do_material_tex(GPUShadeInput *shi)
 						GPU_link(mat, "mtex_rgbtoint", trgb, &tin);
 				}
 
-				if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_REF) {
+				if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_REF) {
 					int flip= mtex->maptoneg & MAP_REF;
 					texture_value_blend(mat, GPU_uniform(&mtex->def_var), shi->refl, tin, varfac, mtex->blendtype, flip, &shi->refl);
 					GPU_link(mat, "mtex_value_clamp_positive", shi->refl, &shi->refl);
 				}
-				if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_SPEC) {
+				if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_SPEC) {
 					int flip= mtex->maptoneg & MAP_SPEC;
 					texture_value_blend(mat, GPU_uniform(&mtex->def_var), shi->spec, tin, varfac, mtex->blendtype, flip, &shi->spec);
 					GPU_link(mat, "mtex_value_clamp_positive", shi->spec, &shi->spec);
 				}
-				if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_EMIT) {
+				if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_EMIT) {
 					int flip= mtex->maptoneg & MAP_EMIT;
 					texture_value_blend(mat, GPU_uniform(&mtex->def_var), shi->emit, tin, varfac, mtex->blendtype, flip, &shi->emit);
 					GPU_link(mat, "mtex_value_clamp_positive", shi->emit, &shi->emit);
 				}
-				if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_HAR) {
+				if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_HAR) {
 					int flip= mtex->maptoneg & MAP_HAR;
 					GPU_link(mat, "mtex_har_divide", shi->har, &shi->har);
 					texture_value_blend(mat, GPU_uniform(&mtex->def_var), shi->har, tin, varfac, mtex->blendtype, flip, &shi->har);
@@ -1091,7 +1091,7 @@ static void do_material_tex(GPUShadeInput *shi)
 					texture_value_blend(mat, GPU_uniform(&mtex->def_var), shi->alpha, tin, varfac, mtex->blendtype, flip, &shi->alpha);
 					GPU_link(mat, "mtex_value_clamp", shi->alpha, &shi->alpha);
 				}
-				if(!(G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_AMB) {
+				if(!(mat->scene->gm.flag & GAME_GLSL_NO_EXTRA_TEX) && mtex->mapto & MAP_AMB) {
 					int flip= mtex->maptoneg & MAP_AMB;
 					texture_value_blend(mat, GPU_uniform(&mtex->def_var), shi->amb, tin, varfac, mtex->blendtype, flip, &shi->amb);
 					GPU_link(mat, "mtex_value_clamp", shi->amb, &shi->amb);
@@ -1142,7 +1142,7 @@ void GPU_shaderesult_set(GPUShadeInput *shi, GPUShadeResult *shr)
 	if((ma->mode & MA_TRANSP) && (ma->mode & MA_ZTRANSP))
 		GPU_material_enable_alpha(mat);
 
-	if((G.fileflags & G_FILE_GLSL_NO_LIGHTS) || (ma->mode & MA_SHLESS)) {
+	if((mat->scene->gm.flag & GAME_GLSL_NO_LIGHTS) || (ma->mode & MA_SHLESS)) {
 		shr->combined = shi->rgb;
 		shr->alpha = shi->alpha;
 		GPU_link(mat, "set_rgb", shi->rgb, &shr->diff);
@@ -1251,7 +1251,7 @@ GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma)
 	mat = GPU_material_construct_begin(ma);
 	mat->scene = scene;
 
-	if(!(G.fileflags & G_FILE_GLSL_NO_NODES) && ma->nodetree && ma->use_nodes) {
+	if(!(scene->gm.flag & GAME_GLSL_NO_NODES) && ma->nodetree && ma->use_nodes) {
 		ntreeGPUMaterialNodes(ma->nodetree, mat);
 	}
 	else {
@@ -1458,8 +1458,8 @@ void GPU_lamp_free(Object *ob)
 
 int GPU_lamp_has_shadow_buffer(GPULamp *lamp)
 {
-	return (!(G.fileflags & G_FILE_GLSL_NO_SHADOWS) &&
-	        !(G.fileflags & G_FILE_GLSL_NO_LIGHTS) &&
+	return (!(lamp->scene->gm.flag & GAME_GLSL_NO_SHADOWS) &&
+	        !(lamp->scene->gm.flag & GAME_GLSL_NO_LIGHTS) &&
 			lamp->tex && lamp->fb);
 }
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f00813b58f1..4a3d555ca33 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -387,7 +387,7 @@ typedef struct GameData {
 	 * bit 3: (gameengine): Activity culling is enabled.
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling
 	*/
-	short mode, pad11;
+	short mode, flag, matmode, pad[3];
 	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */
 	short physicsEngine;
 	short ticrate, maxlogicstep, physubstep, maxphystep;
@@ -401,6 +401,7 @@ typedef struct GameData {
 	struct GameDome dome;
 	short stereoflag, stereomode, xsch, ysch; //xsch and ysch can be deleted !!!
 } GameData;
+
 #define STEREO_NOSTEREO		1
 #define STEREO_ENABLED 		2
 #define STEREO_DOME	 		3
@@ -422,6 +423,25 @@ typedef struct GameData {
 #define WOPHY_ODE		4
 #define WOPHY_BULLET	5
 
+/* GameData.flag */
+#define GAME_ENABLE_ALL_FRAMES				(1 << 1)
+#define GAME_SHOW_DEBUG_PROPS				(1 << 2)
+#define GAME_SHOW_FRAMERATE					(1 << 3)
+#define GAME_SHOW_PHYSICS					(1 << 4)
+#define GAME_DISPLAY_LISTS					(1 << 5)
+#define GAME_GLSL_NO_LIGHTS					(1 << 6)
+#define GAME_GLSL_NO_SHADERS				(1 << 7)
+#define GAME_GLSL_NO_SHADOWS				(1 << 8)
+#define GAME_GLSL_NO_RAMPS					(1 << 9)
+#define GAME_GLSL_NO_NODES					(1 << 10)
+#define GAME_GLSL_NO_EXTRA_TEX				(1 << 11)
+#define GAME_IGNORE_DEPRECATION_WARNINGS	(1 << 12)
+
+/* GameData.matmode */
+#define GAME_MAT_TEXFACE	0
+#define GAME_MAT_MULTITEX	1
+#define GAME_MAT_GLSL		2
+
 typedef struct TimeMarker {
 	struct TimeMarker *next, *prev;
 	int frame;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index bb6611205b6..c8be3c7afac 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -776,9 +776,9 @@ void rna_def_scene_game_data(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem framing_types_items[] ={
-		{SCE_GAMEFRAMING_BARS, "BARS", 0, "Stretch", ""},
-		{SCE_GAMEFRAMING_EXTEND, "EXTEND", 0, "Extend", ""},
-		{SCE_GAMEFRAMING_SCALE, "SCALE", 0, "Scale", ""},
+		{SCE_GAMEFRAMING_BARS, "LETTERBOX", 0, "Letterbox", "Show the entire viewport in the display window, using bar horizontally or vertically"},
+		{SCE_GAMEFRAMING_EXTEND, "EXTEND", 0, "Extend", "Show the entire viewport in the display window, viewing more horizontally or vertically"},
+		{SCE_GAMEFRAMING_SCALE, "SCALE", 0, "Scale", "Stretch or squeeze the viewport to fill the display window"},
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem dome_modes_items[] ={
@@ -801,7 +801,7 @@ void rna_def_scene_game_data(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}};
 		
  	static EnumPropertyItem stereo_items[] ={
-		{STEREO_NOSTEREO, "NO_STEREO", 0, "No Stereo", ""},
+		{STEREO_NOSTEREO, "NONE", 0, "None", ""},
 		{STEREO_ENABLED, "STEREO", 0, "Stereo", ""},
 		{STEREO_DOME, "DOME", 0, "Dome", ""},
 		{0, NULL, 0, NULL, NULL}};
@@ -815,6 +815,12 @@ void rna_def_scene_game_data(BlenderRNA *brna)
 		{WOPHY_BULLET, "BULLET", 0, "Bullet", ""},
 		{0, NULL, 0, NULL, NULL}};
 
+	static EnumPropertyItem material_items[] ={
+		{GAME_MAT_TEXFACE, "TEXTURE_FACE", 0, "Texture Face", "Single texture face materials."},
+		{GAME_MAT_MULTITEX, "MULTITEXTURE", 0, "Multitexture", "Multitexture materials."},
+		{GAME_MAT_GLSL, "GLSL", 0, "GLSL", "OpenGL shading language shaders."},
+		{0, NULL, 0, NULL, NULL}};
+
 	srna= RNA_def_struct(brna, "SceneGameData", NULL);
 	RNA_def_struct_sdna(srna, "GameData");
 	RNA_def_struct_nested(brna, srna, "Scene");
@@ -979,6 +985,74 @@ void rna_def_scene_game_data(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0, 1000.0);
 	RNA_def_property_ui_text(prop, "box radius", "Radius of the activity bubble, in Manhattan length. Objects outside the box are activity-culled");
 	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	/* booleans */
+	prop= RNA_def_property(srna, "all_frames", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_ENABLE_ALL_FRAMES);
+	RNA_def_property_ui_text(prop, "All Frames", "Render as many frames as possible, rather than respecting framerate.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "show_debug_properties", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_SHOW_DEBUG_PROPS);
+	RNA_def_property_ui_text(prop, "Show Debug Properties", "Show properties marked for debugging while the game runs.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "show_framerate_profile", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_SHOW_FRAMERATE);
+	RNA_def_property_ui_text(prop, "Show Framerate and Profile", "Show framerate and profiling information while the game runs.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "show_physics_visualization", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_SHOW_PHYSICS);
+	RNA_def_property_ui_text(prop, "Show Physics Visualization", "Show a visualization of physics bounds and interactions.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "display_lists", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_DISPLAY_LISTS);
+	RNA_def_property_ui_text(prop, "Display Lists", "Use display lists to speed up rendering by keeping geometry on the GPU.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "deprecation_warnings", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_IGNORE_DEPRECATION_WARNINGS);
+	RNA_def_property_ui_text(prop, "Deprecation Warnings", "Print warnings when using deprecated features in the python API.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	/* materials */
+	prop= RNA_def_property(srna, "material_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "matmode");
+	RNA_def_property_enum_items(prop, material_items);
+	RNA_def_property_ui_text(prop, "Material Mode", "Material mode to use for rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "glsl_lights", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_LIGHTS);
+	RNA_def_property_ui_text(prop, "GLSL Lights", "Use lights for GLSL rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "glsl_shaders", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_SHADERS);
+	RNA_def_property_ui_text(prop, "GLSL Shaders", "Use shaders for GLSL rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "glsl_shadows", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_SHADOWS);
+	RNA_def_property_ui_text(prop, "GLSL Shadows", "Use shadows for GLSL rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "glsl_ramps", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_RAMPS);
+	RNA_def_property_ui_text(prop, "GLSL Ramps", "Use ramps for GLSL rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "glsl_nodes", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_NODES);
+	RNA_def_property_ui_text(prop, "GLSL Nodes", "Use nodes for GLSL rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop= RNA_def_property(srna, "glsl_extra_textures", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_EXTRA_TEX);
+	RNA_def_property_ui_text(prop, "GLSL Extra Textures", "Use extra textures like normal or specular maps for GLSL rendering.");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
 }
 
 static void rna_def_scene_render_layer(BlenderRNA *brna)
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 4efdf04890e..ae46f880711 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -350,12 +350,12 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, int alw
 
 			if(GPU_extensions_minimum_support())
 				useglslmat = true;
-			else if(G.fileflags & G_FILE_GAME_MAT_GLSL)
+			else if(blscene->gm.matmode == GAME_MAT_GLSL)
 				usemat = false;
 
-            if(usemat && (G.fileflags & G_FILE_GAME_MAT))
+            if(usemat && (blscene->gm.matmode != GAME_MAT_TEXFACE))
 				sceneconverter->SetMaterials(true);
-			if(useglslmat && (G.fileflags & G_FILE_GAME_MAT_GLSL))
+			if(useglslmat && (blscene->gm.matmode == GAME_MAT_GLSL))
 				sceneconverter->SetGLSLMaterials(true);
 					
 			KX_Scene* startscene = new KX_Scene(keyboarddevice,
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 4c824a8df40..c9a2e81bdae 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -524,16 +524,17 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		
 		// SYS_WriteCommandLineInt(syshandle, "fixedtime", 0);
 		// SYS_WriteCommandLineInt(syshandle, "vertexarrays",1);		
+		GameData *gm= &m_startScene->gm;
 		bool properties	= (SYS_GetCommandLineInt(syshandle, "show_properties", 0) != 0);
 		bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0);
-		bool fixedFr = (G.fileflags & G_FILE_ENABLE_ALL_FRAMES);
+		bool fixedFr = (gm->flag & GAME_ENABLE_ALL_FRAMES);
 
-		bool showPhysics = (G.fileflags & G_FILE_SHOW_PHYSICS);
+		bool showPhysics = (gm->flag & GAME_SHOW_PHYSICS);
 		SYS_WriteCommandLineInt(syshandle, "show_physics", showPhysics);
 
 		bool fixed_framerate= (SYS_GetCommandLineInt(syshandle, "fixed_framerate", fixedFr) != 0);
 		bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
-		bool useLists = (SYS_GetCommandLineInt(syshandle, "displaylists", G.fileflags & G_FILE_DISPLAY_LISTS) != 0);
+		bool useLists = (SYS_GetCommandLineInt(syshandle, "displaylists", gm->flag & GAME_DISPLAY_LISTS) != 0);
 		bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 1) != 0);
 
 		if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
@@ -541,7 +542,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 
 		if(GPU_extensions_minimum_support())
 			m_blenderglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 1) != 0);
-		else if(G.fileflags & G_FILE_GAME_MAT_GLSL)
+		else if(gm->matmode == GAME_MAT_GLSL)
 			m_blendermat = false;
 
 		// create the canvas, rasterizer and rendertools
@@ -671,9 +672,9 @@ bool GPG_Application::startEngine(void)
 
 		//	if (always_use_expand_framing)
 		//		sceneconverter->SetAlwaysUseExpandFraming(true);
-		if(m_blendermat && (G.fileflags & G_FILE_GAME_MAT))
+		if(m_blendermat && (m_startScene->gm.matmode != GAME_MAT_TEXFACE))
 			m_sceneconverter->SetMaterials(true);
-		if(m_blenderglslmat && (G.fileflags & G_FILE_GAME_MAT_GLSL))
+		if(m_blenderglslmat && (m_startScene->gm.matmode == GAME_MAT_GLSL))
 			m_sceneconverter->SetGLSLMaterials(true);
 
 		KX_Scene* startscene = new KX_Scene(m_keyboard,
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 0eef33f927e..de3dcd0ebf8 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -92,6 +92,7 @@ extern "C" {
 
 /* we only need this to get a list of libraries from the main struct */
 #include "DNA_ID.h"
+#include "DNA_scene_types.h"
 
 
 #include "marshal.h" /* python header for loading/saving dicts */
@@ -206,8 +207,6 @@ static PyObject* gPySendMessage(PyObject*, PyObject* args)
 	Py_RETURN_NONE;
 }
 
-static bool usedsp = false;
-
 // this gets a pointer to an array filled with floats
 static PyObject* gPyGetSpectrum(PyObject*)
 {
@@ -769,17 +768,17 @@ static PyObject* gPyDisableMotionBlur(PyObject*)
 int getGLSLSettingFlag(char *setting)
 {
 	if(strcmp(setting, "lights") == 0)
-		return G_FILE_GLSL_NO_LIGHTS;
+		return GAME_GLSL_NO_LIGHTS;
 	else if(strcmp(setting, "shaders") == 0)
-		return G_FILE_GLSL_NO_SHADERS;
+		return GAME_GLSL_NO_SHADERS;
 	else if(strcmp(setting, "shadows") == 0)
-		return G_FILE_GLSL_NO_SHADOWS;
+		return GAME_GLSL_NO_SHADOWS;
 	else if(strcmp(setting, "ramps") == 0)
-		return G_FILE_GLSL_NO_RAMPS;
+		return GAME_GLSL_NO_RAMPS;
 	else if(strcmp(setting, "nodes") == 0)
-		return G_FILE_GLSL_NO_NODES;
+		return GAME_GLSL_NO_NODES;
 	else if(strcmp(setting, "extra_textures") == 0)
-		return G_FILE_GLSL_NO_EXTRA_TEX;
+		return GAME_GLSL_NO_EXTRA_TEX;
 	else
 		return -1;
 }
@@ -788,8 +787,9 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*,
 											PyObject* args,
 											PyObject*)
 {
+	GameData *gm= &(gp_KetsjiScene->GetBlenderScene()->gm);
 	char *setting;
-	int enable, flag, fileflags;
+	int enable, flag, sceneflag;
 
 	if (!PyArg_ParseTuple(args,"si:setGLSLMaterialSetting",&setting,&enable))
 		return NULL;
@@ -801,15 +801,15 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*,
 		return NULL;
 	}
 
-	fileflags = G.fileflags;
+	sceneflag= gm->flag;
 	
 	if (enable)
-		G.fileflags &= ~flag;
+		gm->flag &= ~flag;
 	else
-		G.fileflags |= flag;
+		gm->flag |= flag;
 
 	/* display lists and GLSL materials need to be remade */
-	if(G.fileflags != fileflags) {
+	if(sceneflag != gm->flag) {
 		GPU_materials_free();
 		if(gp_KetsjiEngine) {
 			KX_SceneList *scenes = gp_KetsjiEngine->CurrentScenes();
@@ -830,6 +830,7 @@ static PyObject* gPyGetGLSLMaterialSetting(PyObject*,
 									 PyObject* args, 
 									 PyObject*)
 {
+	GameData *gm= &(gp_KetsjiScene->GetBlenderScene()->gm);
 	char *setting;
 	int enabled = 0, flag;
 
@@ -843,7 +844,7 @@ static PyObject* gPyGetGLSLMaterialSetting(PyObject*,
 		return NULL;
 	}
 
-	enabled = ((G.fileflags & flag) != 0);
+	enabled = ((gm->flag & flag) != 0);
 	return PyLong_FromSsize_t(enabled);
 }
 
@@ -855,35 +856,34 @@ static PyObject* gPySetMaterialType(PyObject*,
 									PyObject* args,
 									PyObject*)
 {
-	int flag, type;
+	GameData *gm= &(gp_KetsjiScene->GetBlenderScene()->gm);
+	int type;
 
 	if (!PyArg_ParseTuple(args,"i:setMaterialType",&type))
 		return NULL;
 
 	if(type == KX_BLENDER_GLSL_MATERIAL)
-		flag = G_FILE_GAME_MAT|G_FILE_GAME_MAT_GLSL;
+		gm->matmode= GAME_MAT_GLSL;
 	else if(type == KX_BLENDER_MULTITEX_MATERIAL)
-		flag = G_FILE_GAME_MAT;
+		gm->matmode= GAME_MAT_MULTITEX;
 	else if(type == KX_TEXFACE_MATERIAL)
-		flag = 0;
+		gm->matmode= GAME_MAT_TEXFACE;
 	else {
 		PyErr_SetString(PyExc_ValueError, "Rasterizer.setMaterialType(int): material type is not known");
 		return NULL;
 	}
 
-	G.fileflags &= ~(G_FILE_GAME_MAT|G_FILE_GAME_MAT_GLSL);
-	G.fileflags |= flag;
-
 	Py_RETURN_NONE;
 }
 
 static PyObject* gPyGetMaterialType(PyObject*)
 {
+	GameData *gm= &(gp_KetsjiScene->GetBlenderScene()->gm);
 	int flag;
 
-	if(G.fileflags & G_FILE_GAME_MAT_GLSL)
+	if(gm->matmode == GAME_MAT_GLSL)
 		flag = KX_BLENDER_GLSL_MATERIAL;
-	else if(G.fileflags & G_FILE_GAME_MAT)
+	else if(gm->matmode == GAME_MAT_MULTITEX)
 		flag = KX_BLENDER_MULTITEX_MATERIAL;
 	else
 		flag = KX_TEXFACE_MATERIAL;

From 14d33b3c1fd629ca3ebc2f369b38d9d2ebc09e2e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 18 Aug 2009 15:37:31 +0000
Subject: [PATCH 123/577] BGE guardedalloc, Uses WITH_CXX_GUARDEDALLOC but
 gives a string to MEM_mallocN for better tracking memory usage.

* off by default.
* new/delete are at the bottom of each class
* python BGE objects have the new/delete in the Py_Header macro.
---
 .../BlenderRoutines/KX_BlenderCanvas.h        | 11 +++++++++
 .../BlenderRoutines/KX_BlenderInputDevice.h   | 10 +++++++-
 .../KX_BlenderKeyboardDevice.h                | 11 +++++++++
 .../BlenderRoutines/KX_BlenderMouseDevice.h   | 11 +++++++++
 .../BlenderRoutines/KX_BlenderRenderTools.h   | 11 +++++++++
 .../BlenderRoutines/KX_BlenderSystem.h        | 12 ++++++++++
 .../gameengine/Converter/BL_ArmatureObject.h  |  7 ++++++
 .../Converter/BL_DeformableGameObject.h       |  7 +++++-
 source/gameengine/Converter/BL_MeshDeformer.h |  7 ++++++
 .../Converter/BL_ModifierDeformer.h           |  6 +++++
 .../gameengine/Converter/BL_ShapeDeformer.h   |  6 +++++
 source/gameengine/Converter/BL_SkinDeformer.h |  6 +++++
 .../gameengine/Converter/BL_SkinMeshObject.h  |  7 ++++++
 .../gameengine/Converter/BlenderWorldInfo.h   |  7 ++++++
 .../Converter/KX_BlenderScalarInterpolator.h  | 14 +++++++++++
 .../Converter/KX_BlenderSceneConverter.h      |  6 +++++
 source/gameengine/Expressions/BoolValue.h     |  7 ++++++
 source/gameengine/Expressions/ConstExpr.h     |  7 ++++++
 source/gameengine/Expressions/EmptyValue.h    |  7 ++++++
 source/gameengine/Expressions/ErrorValue.h    |  7 ++++++
 source/gameengine/Expressions/Expression.h    | 13 +++++++++++
 source/gameengine/Expressions/FloatValue.h    |  6 +++++
 .../gameengine/Expressions/IdentifierExpr.h   |  7 ++++++
 source/gameengine/Expressions/IfExpr.h        |  7 ++++++
 source/gameengine/Expressions/InputParser.h   |  8 ++++++-
 source/gameengine/Expressions/IntValue.h      |  6 +++++
 source/gameengine/Expressions/KX_HashedPtr.h  | 11 +++++++++
 source/gameengine/Expressions/Operator1Expr.h |  7 ++++++
 source/gameengine/Expressions/Operator2Expr.h |  8 ++++++-
 source/gameengine/Expressions/PyObjectPlus.h  | 12 +++++++++-
 source/gameengine/Expressions/StringValue.h   |  7 ++++++
 source/gameengine/Expressions/Value.h         | 19 ++++++++++++++-
 source/gameengine/Expressions/VectorValue.h   |  7 ++++++
 source/gameengine/Expressions/VoidValue.h     |  7 ++++++
 .../GameLogic/SCA_ActuatorEventManager.h      |  7 ++++++
 .../GameLogic/SCA_AlwaysEventManager.h        |  5 ++++
 .../gameengine/GameLogic/SCA_EventManager.h   |  7 ++++++
 .../GameLogic/SCA_ExpressionController.h      |  7 ++++++
 source/gameengine/GameLogic/SCA_IActuator.h   |  7 ++++++
 .../gameengine/GameLogic/SCA_IInputDevice.h   | 10 ++++++++
 source/gameengine/GameLogic/SCA_IScene.h      | 11 +++++++++
 .../GameLogic/SCA_JoystickManager.h           |  6 +++++
 .../GameLogic/SCA_KeyboardManager.h           |  7 ++++++
 .../gameengine/GameLogic/SCA_LogicManager.h   |  7 ++++++
 .../gameengine/GameLogic/SCA_MouseManager.h   |  7 ++++++
 .../GameLogic/SCA_PropertyEventManager.h      |  6 +++++
 .../GameLogic/SCA_RandomEventManager.h        |  7 ++++++
 .../GameLogic/SCA_RandomNumberGenerator.h     | 11 +++++++++
 .../GameLogic/SCA_TimeEventManager.h          |  7 ++++++
 source/gameengine/Ketsji/BL_BlenderShader.h   |  7 ++++++
 source/gameengine/Ketsji/BL_Material.h        | 11 +++++++++
 source/gameengine/Ketsji/BL_Shader.h          | 20 ++++++++++++++++
 source/gameengine/Ketsji/BL_Texture.h         |  6 +++++
 source/gameengine/Ketsji/KX_BlenderMaterial.h |  4 ++++
 .../Ketsji/KX_BulletPhysicsController.h       |  7 +++++-
 .../Ketsji/KX_CameraIpoSGController.h         |  7 ++++++
 .../gameengine/Ketsji/KX_ClientObjectInfo.h   |  7 ++++++
 source/gameengine/Ketsji/KX_Dome.h            | 11 +++++++--
 source/gameengine/Ketsji/KX_EmptyObject.h     |  8 ++++++-
 source/gameengine/Ketsji/KX_IInterpolator.h   | 11 +++++++++
 .../gameengine/Ketsji/KX_IPO_SGController.h   |  6 +++++
 .../gameengine/Ketsji/KX_IPhysicsController.h |  7 ++++++
 .../Ketsji/KX_IScalarInterpolator.h           | 11 +++++++++
 source/gameengine/Ketsji/KX_ISceneConverter.h | 11 +++++++++
 source/gameengine/Ketsji/KX_ISystem.h         | 11 +++++++++
 source/gameengine/Ketsji/KX_KetsjiEngine.h    |  8 ++++++-
 .../Ketsji/KX_LightIpoSGController.h          |  7 ++++++
 .../Ketsji/KX_MaterialIpoController.h         |  7 ++++++
 source/gameengine/Ketsji/KX_MotionState.h     | 10 ++++++++
 .../Ketsji/KX_ObColorIpoSGController.h        |  7 ++++++
 .../Ketsji/KX_OrientationInterpolator.h       |  7 ++++++
 source/gameengine/Ketsji/KX_PolygonMaterial.h |  5 ++++
 .../Ketsji/KX_PositionInterpolator.h          |  7 ++++++
 source/gameengine/Ketsji/KX_RayCast.h         | 14 ++++++++++-
 source/gameengine/Ketsji/KX_RayEventManager.h |  7 ++++++
 .../Ketsji/KX_SG_BoneParentNodeRelationship.h |  7 +++++-
 .../Ketsji/KX_SG_NodeRelationships.h          | 19 ++++++++++++++-
 .../gameengine/Ketsji/KX_ScalarInterpolator.h |  7 ++++++
 .../Ketsji/KX_ScalingInterpolator.h           |  7 ++++++
 .../gameengine/Ketsji/KX_TimeCategoryLogger.h |  6 +++++
 source/gameengine/Ketsji/KX_TimeLogger.h      | 11 +++++++++
 .../gameengine/Ketsji/KX_TouchEventManager.h  |  6 +++++
 source/gameengine/Ketsji/KX_WorldInfo.h       | 11 +++++++++
 .../gameengine/Ketsji/KX_WorldIpoController.h |  7 ++++++
 .../Network/NG_NetworkDeviceInterface.h       |  7 ++++++
 source/gameengine/Network/NG_NetworkMessage.h | 11 +++++++++
 source/gameengine/Network/NG_NetworkObject.h  | 11 +++++++++
 source/gameengine/Network/NG_NetworkScene.h   | 13 ++++++++++-
 .../Physics/Bullet/CcdGraphicController.h     |  6 +++++
 .../Physics/Bullet/CcdPhysicsController.h     | 23 +++++++++++++++----
 .../Physics/Bullet/CcdPhysicsEnvironment.h    |  6 ++++-
 .../Physics/Dummy/DummyPhysicsEnvironment.h   |  6 +++++
 .../Physics/common/PHY_IController.h          | 11 +++++++--
 .../Physics/common/PHY_IGraphicController.h   |  7 ++++--
 .../Physics/common/PHY_IMotionState.h         | 14 +++++++++--
 .../Physics/common/PHY_IPhysicsController.h   |  6 ++++-
 .../Physics/common/PHY_IPhysicsEnvironment.h  | 18 +++++++++++++++
 .../gameengine/Physics/common/PHY_IVehicle.h  | 11 ++++++++-
 .../Rasterizer/RAS_2DFilterManager.h          | 11 +++++++++
 .../gameengine/Rasterizer/RAS_BucketManager.h |  6 +++++
 source/gameengine/Rasterizer/RAS_Deformer.h   | 10 ++++++++
 .../Rasterizer/RAS_FramingManager.h           | 19 ++++++++++++++-
 source/gameengine/Rasterizer/RAS_ICanvas.h    | 11 +++++++++
 .../Rasterizer/RAS_IPolygonMaterial.h         | 12 +++++++++-
 .../gameengine/Rasterizer/RAS_IRasterizer.h   | 12 +++++++++-
 .../gameengine/Rasterizer/RAS_IRenderTools.h  | 11 +++++++++
 .../Rasterizer/RAS_MaterialBucket.h           | 20 ++++++++++++++++
 source/gameengine/Rasterizer/RAS_MeshObject.h |  7 ++++++
 .../RAS_OpenGLRasterizer/RAS_ListRasterizer.h |  7 ++++++
 .../RAS_OpenGLRasterizer.h                    |  7 ++++++
 .../RAS_VAOpenGLRasterizer.h                  |  6 +++++
 source/gameengine/Rasterizer/RAS_Polygon.h    | 10 ++++++++
 source/gameengine/Rasterizer/RAS_Rect.h       | 10 ++++++++
 source/gameengine/Rasterizer/RAS_TexVert.h    | 10 ++++++++
 source/gameengine/SceneGraph/SG_BBox.h        | 10 ++++++++
 source/gameengine/SceneGraph/SG_Controller.h  |  6 +++++
 source/gameengine/SceneGraph/SG_DList.h       | 11 +++++++++
 source/gameengine/SceneGraph/SG_IObject.h     |  7 ++++--
 source/gameengine/SceneGraph/SG_Node.h        |  7 +++++-
 .../gameengine/SceneGraph/SG_ParentRelation.h |  8 ++++++-
 source/gameengine/SceneGraph/SG_QList.h       |  7 ++++++
 source/gameengine/SceneGraph/SG_Spatial.h     |  7 +++++-
 source/gameengine/SceneGraph/SG_Tree.h        | 13 +++++++++++
 123 files changed, 1068 insertions(+), 36 deletions(-)

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index fd41fb90f2f..d49c877f610 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -40,6 +40,10 @@
 
 #include "KX_BlenderGL.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct ARegion;
 struct wmWindow;
 
@@ -166,6 +170,13 @@ private:
 	struct ARegion* m_ar;
 	struct wmWindow* m_win;
 	RAS_Rect 	m_area_rect;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // __KX_BLENDERCANVAS
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
index 32391e63264..d4dd9af3d4f 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
@@ -39,7 +39,9 @@
 #include "WM_types.h"
 #include "SCA_IInputDevice.h"
 
-
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
 
 /**
  Base Class for Blender specific inputdevices. Blender specific inputdevices are used when the gameengine is running in embedded mode instead of standalone mode.
@@ -222,6 +224,12 @@ public:
 //	virtual const SCA_InputEvent&	GetEventValue(SCA_IInputDevice::KX_EnumInputs inputcode)=0;
 	virtual bool	ConvertBlenderEvent(unsigned short incode,short val)=0;
 
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };                                                                                                                 
 #endif //__KX_BLENDERINPUTDEVICE
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
index 5bf37acf236..c801322e787 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
@@ -31,6 +31,10 @@
 
 #include "KX_BlenderInputDevice.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class KX_BlenderKeyboardDevice : public BL_BlenderInputDevice
 {
 	bool	m_hookesc;
@@ -43,6 +47,13 @@ public:
 	virtual bool	ConvertBlenderEvent(unsigned short incode,short val);
 	virtual void	NextFrame();
 	virtual void	HookEscape();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_BLENDERKEYBOARDDEVICE
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
index 2f9e956a1d8..92383e4b533 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
@@ -31,6 +31,10 @@
 
 #include "KX_BlenderInputDevice.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class KX_BlenderMouseDevice : public BL_BlenderInputDevice
 {
 public:
@@ -41,6 +45,13 @@ public:
 //	virtual const SCA_InputEvent&	GetEventValue(SCA_IInputDevice::KX_EnumInputs inputcode);
 	virtual bool	ConvertBlenderEvent(unsigned short incode,short val);
 	virtual void	NextFrame();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_BLENDERMOUSEDEVICE
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 60130e6bfc9..70672b8350b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -37,6 +37,10 @@
 
 #include "RAS_IRenderTools.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct KX_ClientObjectInfo;
 class KX_RayCast;
 
@@ -95,6 +99,13 @@ public:
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
 	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_BLENDERRENDERTOOLS
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
index d99bb9b14a8..b6b2841e81c 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
@@ -34,6 +34,10 @@
  */
 #include "KX_ISystem.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class KX_BlenderSystem : public KX_ISystem
 {
 	double	m_starttime;
@@ -42,6 +46,14 @@ public:
 	KX_BlenderSystem();
 	virtual ~KX_BlenderSystem() {};
 	virtual double GetTimeInSeconds();
+
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_BLENDERSYSTEM
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h
index 684d89d492b..af0b7dc201c 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.h
+++ b/source/gameengine/Converter/BL_ArmatureObject.h
@@ -93,6 +93,13 @@ protected:
 	short	m_activePriority;
 
 	double			m_lastapplyframe;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ArmatureObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index b20b8e81b37..ed329e7953d 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -45,7 +45,6 @@ struct Key;
 class BL_DeformableGameObject : public KX_GameObject  
 {
 public:
-
 	CValue*		GetReplica();
 
 	double GetLastFrame ()
@@ -100,6 +99,12 @@ protected:
 	Object*		m_blendobj;
 	short		m_activePriority;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index 289826e45e7..1749d438d21 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -85,6 +85,13 @@ protected:
 	int							m_tvtot;
 	BL_DeformableGameObject*	m_gameobj;
 	double					 	m_lastDeformUpdate;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.h b/source/gameengine/Converter/BL_ModifierDeformer.h
index b09cc2087ca..5cc84c7d1e4 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.h
+++ b/source/gameengine/Converter/BL_ModifierDeformer.h
@@ -101,6 +101,12 @@ protected:
 	Scene					*m_scene;
 	DerivedMesh				*m_dm;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
index 949e5e1e3ad..ca3770d4006 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.h
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -83,6 +83,12 @@ protected:
 	vector<IpoCurve*>		 m_shapeDrivers;
 	double					 m_lastShapeUpdate;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index 7c43246a9d7..b83895d5609 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -105,6 +105,12 @@ protected:
 	bool					m_poseApplied;
 	bool					m_recalcNormal;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.h b/source/gameengine/Converter/BL_SkinMeshObject.h
index e2d0e37664d..838c6c3cb95 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.h
+++ b/source/gameengine/Converter/BL_SkinMeshObject.h
@@ -54,6 +54,13 @@ public:
 	
 	// for shape keys, 
 	void CheckWeightCache(struct Object* obj);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinMeshObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h
index fd6bb0212b7..7ccb96e4683 100644
--- a/source/gameengine/Converter/BlenderWorldInfo.h
+++ b/source/gameengine/Converter/BlenderWorldInfo.h
@@ -94,6 +94,13 @@ public:
 	setMistColorBlue(
 		float d
 	);   
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__BLENDERWORLDINFO_H
diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
index 396a7d197df..eb15cee8ff9 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
@@ -49,6 +49,13 @@ public:
 
 private:
 	struct FCurve *m_fcu;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
@@ -58,6 +65,13 @@ public:
 	~BL_InterpolatorList();
 
 	KX_IScalarInterpolator *GetScalarInterpolator(char *rna_path, int array_index);	
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_SCALARINTERPOLATOR_H
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index 7b5351344ae..bb87a21a683 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -143,6 +143,12 @@ public:
 
 	struct Main* GetMain() { return m_maggie; };
 
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_BLENDERSCENECONVERTER_H
diff --git a/source/gameengine/Expressions/BoolValue.h b/source/gameengine/Expressions/BoolValue.h
index 726619e7193..4d0103ec1dd 100644
--- a/source/gameengine/Expressions/BoolValue.h
+++ b/source/gameengine/Expressions/BoolValue.h
@@ -49,6 +49,13 @@ public:
 
 private:
 	bool				m_bool;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _BOOLVALUE_H
diff --git a/source/gameengine/Expressions/ConstExpr.h b/source/gameengine/Expressions/ConstExpr.h
index b117140fe70..f48b8d34355 100644
--- a/source/gameengine/Expressions/ConstExpr.h
+++ b/source/gameengine/Expressions/ConstExpr.h
@@ -41,6 +41,13 @@ public:
 
 private:
 	CValue* m_value;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined(AFX_CONSTEXPR_H__061ECFC3_BE87_11D1_A51C_00A02472FC58__INCLUDED_)
diff --git a/source/gameengine/Expressions/EmptyValue.h b/source/gameengine/Expressions/EmptyValue.h
index fb6b4a477a6..01029d1655d 100644
--- a/source/gameengine/Expressions/EmptyValue.h
+++ b/source/gameengine/Expressions/EmptyValue.h
@@ -34,6 +34,13 @@ public:
 	CValue *				Calc(VALUE_OPERATOR op, CValue *val);
 	CValue *				CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
 	virtual CValue*			GetReplica();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _EMPTYVALUE_H
diff --git a/source/gameengine/Expressions/ErrorValue.h b/source/gameengine/Expressions/ErrorValue.h
index b4b758feea7..2f65850c4f1 100644
--- a/source/gameengine/Expressions/ErrorValue.h
+++ b/source/gameengine/Expressions/ErrorValue.h
@@ -33,6 +33,13 @@ public:
 
 private:
 	STR_String m_strErrorText;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _ERRORVALUE_H
diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/Expression.h
index 400a2b7c789..bd346fd0552 100644
--- a/source/gameengine/Expressions/Expression.h
+++ b/source/gameengine/Expressions/Expression.h
@@ -63,6 +63,12 @@ class CBrokenLinkInfo
 	CExpression* m_pExpr;
 	bool		m_bRestored;
 	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
@@ -126,6 +132,13 @@ public:
 protected:
 
 	int m_refcount;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _EXPRESSION_H
diff --git a/source/gameengine/Expressions/FloatValue.h b/source/gameengine/Expressions/FloatValue.h
index fb75b7c702b..442f0eb6cf8 100644
--- a/source/gameengine/Expressions/FloatValue.h
+++ b/source/gameengine/Expressions/FloatValue.h
@@ -42,6 +42,12 @@ protected:
 	float m_float;
 	STR_String* m_pstrRep;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _FLOATVALUE_H
diff --git a/source/gameengine/Expressions/IdentifierExpr.h b/source/gameengine/Expressions/IdentifierExpr.h
index b307228c8b9..7c14329f755 100644
--- a/source/gameengine/Expressions/IdentifierExpr.h
+++ b/source/gameengine/Expressions/IdentifierExpr.h
@@ -46,6 +46,13 @@ public:
 	virtual CExpression*	CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
 	virtual void			ClearModified();
 	virtual void			BroadcastOperators(VALUE_OPERATOR op);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__IDENTIFIER_EXPR
diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/IfExpr.h
index 9ab13dca413..f06718c851f 100644
--- a/source/gameengine/Expressions/IfExpr.h
+++ b/source/gameengine/Expressions/IfExpr.h
@@ -44,6 +44,13 @@ public:
 	virtual CExpression*	CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
 	virtual void			ClearModified();
 	virtual void			BroadcastOperators(VALUE_OPERATOR op);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
diff --git a/source/gameengine/Expressions/InputParser.h b/source/gameengine/Expressions/InputParser.h
index 810bdc244a8..0d7eab27aeb 100644
--- a/source/gameengine/Expressions/InputParser.h
+++ b/source/gameengine/Expressions/InputParser.h
@@ -102,7 +102,13 @@ private:
 	int Priority(int optor);
 	CExpression *Ex(int i);
 	CExpression *Expr();
-
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/IntValue.h
index 06bf1755749..0513026c4cf 100644
--- a/source/gameengine/Expressions/IntValue.h
+++ b/source/gameengine/Expressions/IntValue.h
@@ -56,6 +56,12 @@ private:
 	cInt			m_int;
 	STR_String*		m_pstrRep;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _INTVALUE_H
diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h
index b11efb99d68..0b54436147b 100644
--- a/source/gameengine/Expressions/KX_HashedPtr.h
+++ b/source/gameengine/Expressions/KX_HashedPtr.h
@@ -29,6 +29,10 @@
 #ifndef __KX_HASHEDPTR
 #define __KX_HASHEDPTR
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 unsigned int			KX_Hash(void * inDWord);
 
 class CHashedPtr
@@ -44,6 +48,13 @@ public:
 	{
 		return rhs.m_valptr == lhs.m_valptr;
 	}	
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_HASHEDPTR
diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h
index 4a1deb0eca3..c2bc68076a0 100644
--- a/source/gameengine/Expressions/Operator1Expr.h
+++ b/source/gameengine/Expressions/Operator1Expr.h
@@ -46,6 +46,13 @@ public:
 private:
 	VALUE_OPERATOR m_op;
 	CExpression * m_lhs;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
diff --git a/source/gameengine/Expressions/Operator2Expr.h b/source/gameengine/Expressions/Operator2Expr.h
index 4064890bbae..bb26b7c03be 100644
--- a/source/gameengine/Expressions/Operator2Expr.h
+++ b/source/gameengine/Expressions/Operator2Expr.h
@@ -52,7 +52,13 @@ protected:
 	
 private:
 	VALUE_OPERATOR m_op;
-	
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _OPERATOR2EXPR_H
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index d68aa9f0410..e9e81dddaaa 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -102,7 +102,7 @@ typedef struct {
 
 								// This must be the first line of each 
 								// PyC++ class
-#define Py_Header \
+#define __Py_Header \
  public: \
   static PyTypeObject   Type; \
   static PyMethodDef    Methods[]; \
@@ -111,6 +111,16 @@ typedef struct {
   virtual PyObject *GetProxy() {return GetProxy_Ext(this, &Type);}; \
   virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type, py_owns);}; \
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+#define Py_Header __Py_Header \
+  void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
+  void operator delete( void *mem ) { MEM_freeN(mem); } \
+
+#else
+#define Py_Header __Py_Header
+#endif
+
 /*
  * nonzero values are an error for setattr
  * however because of the nested lookups we need to know if the errors
diff --git a/source/gameengine/Expressions/StringValue.h b/source/gameengine/Expressions/StringValue.h
index c580e8fd23a..069eb8d9c24 100644
--- a/source/gameengine/Expressions/StringValue.h
+++ b/source/gameengine/Expressions/StringValue.h
@@ -46,6 +46,13 @@ public:
 private:
 	// data member
 	STR_String				m_strString;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index 8c9f99b335e..5f08736afde 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -42,6 +42,10 @@
 #include <map>		// array functionality for the propertylist
 #include "STR_String.h"	// STR_String class
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 #ifndef GEN_NO_ASSERT
 #undef  assert
 #define	assert(exp)			((void)NULL)
@@ -173,6 +177,13 @@ public:
 	virtual ~CAction(){
 	};
 	virtual void Execute() const =0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 //
@@ -407,7 +418,6 @@ public:																									\
 class CPropValue : public CValue
 {
 public:
-
 #ifndef NO_EXP_PYTHON_EMBEDDING	
 	CPropValue() :
 	  CValue(),
@@ -436,6 +446,13 @@ public:
 	
 protected:
 	STR_String					m_strNewName;				    // Identification
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _VALUEBASECLASS_H
diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h
index 19c7dd30076..49fb1e7ea08 100644
--- a/source/gameengine/Expressions/VectorValue.h
+++ b/source/gameengine/Expressions/VectorValue.h
@@ -79,6 +79,13 @@ public:
 protected:
 	double				m_vec[3];
 	double				m_transformedvec[3];
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _VECTORVALUE_H
diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/VoidValue.h
index 10a6ff9ad3d..50ec4ff1ee7 100644
--- a/source/gameengine/Expressions/VoidValue.h
+++ b/source/gameengine/Expressions/VoidValue.h
@@ -59,6 +59,13 @@ public:
 	/// Data members
 	bool				m_bDeleteOnDestruct;
 	void*				m_pAnything;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // !defined _VOIDVALUE_H
diff --git a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
index a7d61627c23..f3884c87a75 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
@@ -45,6 +45,13 @@ public:
 	virtual void NextFrame();
 	virtual void UpdateFrame();
 	//SCA_LogicManager* GetLogicManager() { return m_logicmgr;}
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_ACTUATOREVENTMANAGER
diff --git a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
index a619eecddd4..9540e3b71f6 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
@@ -41,6 +41,11 @@ public:
 	virtual void NextFrame();
 
 
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_ALWAYSEVENTMGR
diff --git a/source/gameengine/GameLogic/SCA_EventManager.h b/source/gameengine/GameLogic/SCA_EventManager.h
index 5ff55849bfe..424150ffa63 100644
--- a/source/gameengine/GameLogic/SCA_EventManager.h
+++ b/source/gameengine/GameLogic/SCA_EventManager.h
@@ -71,6 +71,13 @@ public:
 
 protected:
 	EVENT_MANAGER_TYPE		m_mgrtype;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h
index 705f6dfc415..4c1dfcb95a2 100644
--- a/source/gameengine/GameLogic/SCA_ExpressionController.h
+++ b/source/gameengine/GameLogic/SCA_ExpressionController.h
@@ -53,6 +53,13 @@ public:
 	 *  so that self references are removed before the controller itself is released
 	 */
 	virtual void Delete();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_EXPRESSIONCONTROLLER
diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h
index 13c718ee837..00ba8c9ce4e 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.h
+++ b/source/gameengine/GameLogic/SCA_IActuator.h
@@ -127,6 +127,13 @@ public:
 	void IncLink() { m_links++; }
 	void DecLink();
 	bool IsNoLink() const { return !m_links; }
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_IACTUATOR
diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h
index a0d77ed3c03..228d7684b0f 100644
--- a/source/gameengine/GameLogic/SCA_IInputDevice.h
+++ b/source/gameengine/GameLogic/SCA_IInputDevice.h
@@ -33,6 +33,10 @@
 #ifndef KX_INPUTDEVICE_H
 #define KX_INPUTDEVICE_H
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class SCA_InputEvent 
 {
 	
@@ -302,6 +306,12 @@ public:
 	*/
 	virtual void	NextFrame();
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif	//KX_INPUTDEVICE_H
diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h
index 79d922a998e..ced9ca94cec 100644
--- a/source/gameengine/GameLogic/SCA_IScene.h
+++ b/source/gameengine/GameLogic/SCA_IScene.h
@@ -33,6 +33,10 @@
 
 #include "STR_String.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct SCA_DebugProp
 {
 	class CValue*	m_obj;
@@ -60,6 +64,13 @@ public:
 	void			AddDebugProperty(class CValue* debugprop,
 									 const STR_String &name);
 	void			RemoveAllDebugProperties();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_ISCENE_H
diff --git a/source/gameengine/GameLogic/SCA_JoystickManager.h b/source/gameengine/GameLogic/SCA_JoystickManager.h
index d3a7ac95bea..be55e95b033 100644
--- a/source/gameengine/GameLogic/SCA_JoystickManager.h
+++ b/source/gameengine/GameLogic/SCA_JoystickManager.h
@@ -47,6 +47,12 @@ public:
 	virtual void NextFrame(double curtime,double deltatime);
 	SCA_Joystick* GetJoystickDevice(short int joyindex);
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.h b/source/gameengine/GameLogic/SCA_KeyboardManager.h
index 8f3cc0ab715..c5553a74aef 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardManager.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardManager.h
@@ -56,6 +56,13 @@ public:
 	
 	virtual void 	NextFrame();	
 	SCA_IInputDevice* GetInputDevice();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_KEYBOARDMANAGER
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h
index 53e75e1eaee..402090357cb 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.h
+++ b/source/gameengine/GameLogic/SCA_LogicManager.h
@@ -137,6 +137,13 @@ public:
 	void	RegisterGameObj(void* blendobj, CValue* gameobj);
 	void	UnregisterGameObj(void* blendobj, CValue* gameobj);
 	CValue*	FindGameObjByBlendObj(void* blendobj);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_LOGICMANAGER
diff --git a/source/gameengine/GameLogic/SCA_MouseManager.h b/source/gameengine/GameLogic/SCA_MouseManager.h
index efa4c639ce7..ef1533c636b 100644
--- a/source/gameengine/GameLogic/SCA_MouseManager.h
+++ b/source/gameengine/GameLogic/SCA_MouseManager.h
@@ -63,6 +63,13 @@ public:
 	bool IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
 	virtual void 	NextFrame();	
 	SCA_IInputDevice* GetInputDevice();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_MOUSEMANAGER
diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
index f166065b198..011f3285f63 100644
--- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h
+++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
@@ -40,6 +40,12 @@ class SCA_PropertyEventManager : public SCA_EventManager
 	class SCA_LogicManager*	m_logicmgr;
 
 public:
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
+
 	SCA_PropertyEventManager(class SCA_LogicManager* logicmgr);
 	virtual ~SCA_PropertyEventManager();
 	virtual void NextFrame();
diff --git a/source/gameengine/GameLogic/SCA_RandomEventManager.h b/source/gameengine/GameLogic/SCA_RandomEventManager.h
index 79138c23c62..c8b511b87b7 100644
--- a/source/gameengine/GameLogic/SCA_RandomEventManager.h
+++ b/source/gameengine/GameLogic/SCA_RandomEventManager.h
@@ -45,6 +45,13 @@ public:
 	SCA_RandomEventManager(class SCA_LogicManager* logicmgr);
 
 	virtual void NextFrame();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_RANDOMEVENTMGR
diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
index 842a0331752..f986fadeaf0 100644
--- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
+++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
@@ -34,6 +34,10 @@
 #ifndef __KX_RANDOMNUMBERGENERATOR
 #define __KX_RANDOMNUMBERGENERATOR
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class SCA_RandomNumberGenerator {
 
 	/* reference counted for memleak */
@@ -69,6 +73,13 @@ class SCA_RandomNumberGenerator {
 		if (--m_refcount == 0)
 			delete this;
 	}
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif /* __KX_RANDOMNUMBERGENERATOR */
diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.h b/source/gameengine/GameLogic/SCA_TimeEventManager.h
index bd57e12eb44..089f21e603b 100644
--- a/source/gameengine/GameLogic/SCA_TimeEventManager.h
+++ b/source/gameengine/GameLogic/SCA_TimeEventManager.h
@@ -48,6 +48,13 @@ public:
 	virtual void	RemoveSensor(class SCA_ISensor* sensor);
 	void			AddTimeProperty(CValue* timeval);
 	void			RemoveTimeProperty(CValue* timeval);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_TIMEEVENTMANAGER
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index 9af53bfc863..073ce8f1ca5 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -57,6 +57,13 @@ public:
 	int GetBlendMode();
 
 	bool Equals(BL_BlenderShader *blshader);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif//__BL_GPUSHADER_H__
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
index 4f572f95891..6b53e7fa8b1 100644
--- a/source/gameengine/Ketsji/BL_Material.h
+++ b/source/gameengine/Ketsji/BL_Material.h
@@ -4,6 +4,10 @@
 #include "STR_String.h"
 #include "MT_Point2.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 // --
 struct MTex;
 struct Material;
@@ -98,6 +102,13 @@ public:
 	void SetSharedMaterial(bool v);
 	bool IsShared();
 	void SetUsers(int num);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 // BL_Material::IdMode
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 42969996b3e..b2610d7762a 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -25,6 +25,12 @@ public:
 	{
 	}
 	int				mLoc;		// Sampler location
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /**
@@ -65,6 +71,13 @@ public:
 
 	int GetLocation()	{ return mLoc; }
 	void* getData()		{ return mData; }
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /**
@@ -83,6 +96,13 @@ public:
 	int				mType;
 	int				mLoc;
 	unsigned int	mFlag;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /**
diff --git a/source/gameengine/Ketsji/BL_Texture.h b/source/gameengine/Ketsji/BL_Texture.h
index 830ffceb0f7..2dfd9c542d3 100644
--- a/source/gameengine/Ketsji/BL_Texture.h
+++ b/source/gameengine/Ketsji/BL_Texture.h
@@ -67,6 +67,12 @@ public:
 		return tmp;
 	}
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif//__BL_TEXTURE_H__
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index 605ca207949..cdbdc4bd429 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -15,6 +15,10 @@
 #include "MT_Vector3.h"
 #include "MT_Vector4.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct MTFace;
 class KX_Scene;
 
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
index 755b1cbd780..7fc799abb7e 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
@@ -18,7 +18,6 @@ private:
 	btCollisionShape* m_bulletChildShape;
 
 public:
-
 	KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna, bool sensor, bool compound);
 	virtual ~KX_BulletPhysicsController ();
 
@@ -81,6 +80,12 @@ public:
 		// intentionally empty
 	};
 
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //KX_BULLET2PHYSICS_CONTROLLER
diff --git a/source/gameengine/Ketsji/KX_CameraIpoSGController.h b/source/gameengine/Ketsji/KX_CameraIpoSGController.h
index 33245e79c23..85d93962a14 100644
--- a/source/gameengine/Ketsji/KX_CameraIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_CameraIpoSGController.h
@@ -84,6 +84,13 @@ public:
 		m_modify_clipstart = modify;
 	}
 	void	AddInterpolator(KX_IInterpolator* interp);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // KX_CAMERAIPOSGCONTROLLER_H
diff --git a/source/gameengine/Ketsji/KX_ClientObjectInfo.h b/source/gameengine/Ketsji/KX_ClientObjectInfo.h
index 1898dc71ef8..74647dd47fd 100644
--- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h
+++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h
@@ -74,6 +74,13 @@ public:
 	
 	bool isActor() { return m_type <= ACTOR; }
 	bool isSensor() { return m_type >= SENSOR && m_type <= OBACTORSENSOR; }
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_CLIENTOBJECT_INFO_H
diff --git a/source/gameengine/Ketsji/KX_Dome.h b/source/gameengine/Ketsji/KX_Dome.h
index 20b60ef0173..9ff33fe2852 100644
--- a/source/gameengine/Ketsji/KX_Dome.h
+++ b/source/gameengine/Ketsji/KX_Dome.h
@@ -18,7 +18,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 Contributor(s): Dalai Felinto
 
 This source uses some of the ideas and code from Paul Bourke.
-Developed as part of a Research and Development project for SAT - La Société des arts technologiques.
+Developed as part of a Research and Development project for SAT - La Soci�t� des arts technologiques.
 -----------------------------------------------------------------------------
 */
 
@@ -78,7 +78,7 @@ public:
 	bool	fboSupported;
 
 	//openGL names:
-	GLuint domefacesId[7];		// ID of the images -- room for 7 images, using only 4 for 180º x 360º dome, 6 for panoramic and +1 for warp mesh
+	GLuint domefacesId[7];		// ID of the images -- room for 7 images, using only 4 for 180� x 360� dome, 6 for panoramic and +1 for warp mesh
 	GLuint dlistId;				// ID of the Display Lists of the images (used as an offset)
 	
 	typedef struct {
@@ -184,6 +184,13 @@ protected:
     RAS_IRenderTools* m_rendertools;
     /// engine
     KX_KetsjiEngine* m_engine;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_EmptyObject.h b/source/gameengine/Ketsji/KX_EmptyObject.h
index 62aa7fcd017..fa405e20076 100644
--- a/source/gameengine/Ketsji/KX_EmptyObject.h
+++ b/source/gameengine/Ketsji/KX_EmptyObject.h
@@ -37,7 +37,13 @@ public:
 	KX_GameObject(sgReplicationInfo,callbacks) 
 	{};
 	virtual ~KX_EmptyObject();
-	
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_EMPTYOBJECT
diff --git a/source/gameengine/Ketsji/KX_IInterpolator.h b/source/gameengine/Ketsji/KX_IInterpolator.h
index 8c899a4db0b..52b9b3be5af 100644
--- a/source/gameengine/Ketsji/KX_IInterpolator.h
+++ b/source/gameengine/Ketsji/KX_IInterpolator.h
@@ -31,11 +31,22 @@
 
 #include <vector>
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class KX_IInterpolator {	
 public:
 	virtual ~KX_IInterpolator() {}
 	
 	virtual void Execute(float currentTime) const = 0; 
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 typedef std::vector<KX_IInterpolator *> T_InterpolatorList;
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h
index 031b74294ce..68a74c3a364 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.h
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.h
@@ -116,6 +116,12 @@ public:
 		m_ipotime = time;
 		m_modified = true;
 	}
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__IPO_SGCONTROLLER_H
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h
index 81c01045071..f9dcf81bca5 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -126,6 +126,13 @@ public:
 	// call from scene graph to update
 	virtual bool Update(double time)=0;
 	void*	GetUserData() { return m_userdata;}
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_IPHYSICSCONTROLLER_H
diff --git a/source/gameengine/Ketsji/KX_IScalarInterpolator.h b/source/gameengine/Ketsji/KX_IScalarInterpolator.h
index 6ba685885e9..ec6183b88a1 100644
--- a/source/gameengine/Ketsji/KX_IScalarInterpolator.h
+++ b/source/gameengine/Ketsji/KX_IScalarInterpolator.h
@@ -29,11 +29,22 @@
 #ifndef KX_ISCALARINTERPOLATOR_H
 #define KX_ISCALARINTERPOLATOR_H
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class KX_IScalarInterpolator {	
 public:
 	virtual ~KX_IScalarInterpolator() {}
 	
 	virtual float GetValue(float currentTime) const = 0; 
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
index 45b3276e98c..f098b0bebf5 100644
--- a/source/gameengine/Ketsji/KX_ISceneConverter.h
+++ b/source/gameengine/Ketsji/KX_ISceneConverter.h
@@ -32,6 +32,10 @@
 #include "STR_String.h"
 #include "KX_Python.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct Scene;
 
 class KX_ISceneConverter 
@@ -80,6 +84,13 @@ public:
 	virtual bool GetGLSLMaterials()=0;
 
 	virtual struct Scene* GetBlenderSceneForName(const STR_String& name)=0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_ISCENECONVERTER_H
diff --git a/source/gameengine/Ketsji/KX_ISystem.h b/source/gameengine/Ketsji/KX_ISystem.h
index 204e116e822..deee91f62e8 100644
--- a/source/gameengine/Ketsji/KX_ISystem.h
+++ b/source/gameengine/Ketsji/KX_ISystem.h
@@ -37,6 +37,10 @@ using namespace std;
 
 #include "STR_String.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /**
  * System Abstraction, needed only for getting some timing stuff from the host.
  */
@@ -47,6 +51,13 @@ public:
 	virtual ~KX_ISystem() {};
 	
 	virtual double GetTimeInSeconds()=0;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index a36b3f163fd..acb9e53df8a 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -190,7 +190,6 @@ private:
 	void					DoSound(KX_Scene* scene);
 
 public:
-
 	KX_KetsjiEngine(class KX_ISystem* system);
 	virtual ~KX_KetsjiEngine();
 
@@ -396,6 +395,13 @@ protected:
 	bool			BeginFrame();
 	void			ClearFrame();
 	void			EndFrame();
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_KETSJI_ENGINE
diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h
index 98870cf5b3f..811dba5dba8 100644
--- a/source/gameengine/Ketsji/KX_LightIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h
@@ -92,6 +92,13 @@ public:
 	};
 
 	void	AddInterpolator(KX_IInterpolator* interp);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // KX_LIGHTIPOSGCONTROLLER_H
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.h b/source/gameengine/Ketsji/KX_MaterialIpoController.h
index 4d2e258bf94..906c12426eb 100644
--- a/source/gameengine/Ketsji/KX_MaterialIpoController.h
+++ b/source/gameengine/Ketsji/KX_MaterialIpoController.h
@@ -50,6 +50,13 @@ public:
 
 
 	void	AddInterpolator(KX_IInterpolator* interp);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
diff --git a/source/gameengine/Ketsji/KX_MotionState.h b/source/gameengine/Ketsji/KX_MotionState.h
index 0e43e88fbeb..63c265aa8a7 100644
--- a/source/gameengine/Ketsji/KX_MotionState.h
+++ b/source/gameengine/Ketsji/KX_MotionState.h
@@ -31,6 +31,10 @@
 
 #include "PHY_IMotionState.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class KX_MotionState : public PHY_IMotionState
 {
 	class	SG_Spatial*		m_node;
@@ -48,6 +52,12 @@ public:
 	virtual void	setWorldOrientation(const float* ori);
 
 	virtual	void	calculateWorldTransformations();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_MOTIONSTATE
diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
index 6d63dd77683..a32d027be9c 100644
--- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
@@ -67,6 +67,13 @@ public:
 
 
 	void	AddInterpolator(KX_IInterpolator* interp);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // KX_OBCOLORIPOSGCONTROLLER_H
diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.h b/source/gameengine/Ketsji/KX_OrientationInterpolator.h
index 2bd9f69d824..d8ecc74277c 100644
--- a/source/gameengine/Ketsji/KX_OrientationInterpolator.h
+++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.h
@@ -50,6 +50,13 @@ public:
 private:
 	MT_Matrix3x3&            m_target;
 	KX_IScalarInterpolator *m_ipos[3];
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+private:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h
index 266b4d7e789..dc42bd2f81b 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.h
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h
@@ -35,6 +35,10 @@
 #include "RAS_IRasterizer.h"
 #include "DNA_ID.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct MTFace;
 struct Material;
 struct MTex;
@@ -57,6 +61,7 @@ private:
 
 	mutable int		m_pass;
 public:
+
 	KX_PolygonMaterial();
 	void Initialize(const STR_String &texname,
 		Material* ma,
diff --git a/source/gameengine/Ketsji/KX_PositionInterpolator.h b/source/gameengine/Ketsji/KX_PositionInterpolator.h
index bff0b4201c2..f6c6fa98a0e 100644
--- a/source/gameengine/Ketsji/KX_PositionInterpolator.h
+++ b/source/gameengine/Ketsji/KX_PositionInterpolator.h
@@ -50,6 +50,13 @@ public:
 private:
 	MT_Point3&               m_target;
 	KX_IScalarInterpolator *m_ipos[3];
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+private:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_RayCast.h b/source/gameengine/Ketsji/KX_RayCast.h
index c3084c997a1..cdafc894f6c 100644
--- a/source/gameengine/Ketsji/KX_RayCast.h
+++ b/source/gameengine/Ketsji/KX_RayCast.h
@@ -89,6 +89,12 @@ public:
 		const MT_Point3& topoint, 
 		KX_RayCast& callback);
 	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 template<class T> class KX_RayCast::Callback : public KX_RayCast
@@ -121,7 +127,13 @@ public:
 		}
 		return self->NeedRayCast(info);
 	}
-
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 	
 
diff --git a/source/gameengine/Ketsji/KX_RayEventManager.h b/source/gameengine/Ketsji/KX_RayEventManager.h
index b816d4d5250..27c9be14d1f 100644
--- a/source/gameengine/Ketsji/KX_RayEventManager.h
+++ b/source/gameengine/Ketsji/KX_RayEventManager.h
@@ -45,6 +45,13 @@ public:
 		  m_logicmgr(logicmgr)
 	{}
 	virtual void NextFrame();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_RAYEVENTMGR
diff --git a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
index c9baf228855..dd4419543a2 100644
--- a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
+++ b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
@@ -59,7 +59,6 @@ class KX_BoneParentRelation : public SG_ParentRelation
 {
 
 public :
-
 	/**
 	 * Allocate and construct a new KX_SG_BoneParentRelation
 	 * on the heap.
@@ -101,6 +100,12 @@ private :
 	KX_BoneParentRelation(Bone* bone
 	);
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
index d8fb9211f21..c1640f3e0a0 100644
--- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
+++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
@@ -53,7 +53,6 @@ class KX_NormalParentRelation : public SG_ParentRelation
 {
 
 public :
-
 	/**
 	 * Allocate and construct a new KX_NormalParentRelation
 	 * on the heap.
@@ -91,6 +90,12 @@ private :
 	KX_NormalParentRelation(
 	);
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
@@ -142,6 +147,12 @@ private :
 	KX_VertexParentRelation(
 	);
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
@@ -219,6 +230,12 @@ private :
 
 	bool m_initialized;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_ScalarInterpolator.h b/source/gameengine/Ketsji/KX_ScalarInterpolator.h
index 8835c98c184..ca011ab5db0 100644
--- a/source/gameengine/Ketsji/KX_ScalarInterpolator.h
+++ b/source/gameengine/Ketsji/KX_ScalarInterpolator.h
@@ -55,6 +55,13 @@ public:
 private:
 	MT_Scalar*               m_target;
 	KX_IScalarInterpolator *m_ipo;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_ScalingInterpolator.h b/source/gameengine/Ketsji/KX_ScalingInterpolator.h
index a7b5d7e559a..460563d4135 100644
--- a/source/gameengine/Ketsji/KX_ScalingInterpolator.h
+++ b/source/gameengine/Ketsji/KX_ScalingInterpolator.h
@@ -50,6 +50,13 @@ public:
 private:
 	MT_Vector3&              m_target;
 	KX_IScalarInterpolator *m_ipos[3];
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
index 0cc34b53736..fe15967f93c 100644
--- a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
+++ b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
@@ -125,6 +125,12 @@ protected:
 	/** Maximum number of measurements. */
 	unsigned int m_maxNumMeasurements;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // __KX_TIME_CATEGORY_LOGGER_H
diff --git a/source/gameengine/Ketsji/KX_TimeLogger.h b/source/gameengine/Ketsji/KX_TimeLogger.h
index 0962f02a877..2e73abc75b5 100644
--- a/source/gameengine/Ketsji/KX_TimeLogger.h
+++ b/source/gameengine/Ketsji/KX_TimeLogger.h
@@ -36,6 +36,10 @@
 
 #include <deque>
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /**
  * Stores and manages time measurements.
  */
@@ -98,6 +102,13 @@ protected:
 
 	/** State of logging. */
 	bool m_logging;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeLogger"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // __KX_TIME_LOGGER_H
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h
index cc77bccfc31..6da37d615a4 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.h
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.h
@@ -76,6 +76,12 @@ public:
 	SCA_LogicManager* GetLogicManager() { return m_logicmgr;}
 	PHY_IPhysicsEnvironment *GetPhysicsEnvironment() { return m_physEnv; }
 
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TouchEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_TOUCHEVENTMANAGER
diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index fe4e0c51b24..2c2346ca38e 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -31,6 +31,10 @@
 
 #include "MT_Scalar.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class MT_CmMatrix4x4;
 
 class KX_WorldInfo
@@ -59,6 +63,13 @@ public:
 	virtual void	setMistColorRed(float)=0;
 	virtual void	setMistColorGreen(float)=0;
 	virtual void	setMistColorBlue(float)=0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldInfo"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_WORLDINFO_H
diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.h b/source/gameengine/Ketsji/KX_WorldIpoController.h
index d90c03d09ee..8622d80a35f 100644
--- a/source/gameengine/Ketsji/KX_WorldIpoController.h
+++ b/source/gameengine/Ketsji/KX_WorldIpoController.h
@@ -90,6 +90,13 @@ public:
 	};
 
 	void	AddInterpolator(KX_IInterpolator* interp);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // KX_LIGHTIPOSGCONTROLLER_H
diff --git a/source/gameengine/Network/NG_NetworkDeviceInterface.h b/source/gameengine/Network/NG_NetworkDeviceInterface.h
index 4a47774a762..2a2a909a04d 100644
--- a/source/gameengine/Network/NG_NetworkDeviceInterface.h
+++ b/source/gameengine/Network/NG_NetworkDeviceInterface.h
@@ -76,6 +76,13 @@ public:
 	  */
 
 	virtual STR_String GetNetworkVersion(void)=0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //NG_NETWORKDEVICEINTERFACE_H
diff --git a/source/gameengine/Network/NG_NetworkMessage.h b/source/gameengine/Network/NG_NetworkMessage.h
index 687c8120eca..a2f76dc1fae 100644
--- a/source/gameengine/Network/NG_NetworkMessage.h
+++ b/source/gameengine/Network/NG_NetworkMessage.h
@@ -32,6 +32,10 @@
 
 #include "STR_HashedString.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class NG_NetworkMessage
 {
 	static int			s_nextID;
@@ -122,6 +126,13 @@ public:
 	int GetMessageID() {
 		return m_uniqueMessageID;
 	}
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //NG_NETWORKMESSAGE_H
diff --git a/source/gameengine/Network/NG_NetworkObject.h b/source/gameengine/Network/NG_NetworkObject.h
index c01d76a47fc..4bf636bf011 100644
--- a/source/gameengine/Network/NG_NetworkObject.h
+++ b/source/gameengine/Network/NG_NetworkObject.h
@@ -32,6 +32,10 @@
 
 #include "STR_String.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class NG_NetworkObject
 {
 	STR_String m_name;
@@ -39,6 +43,13 @@ public:
 	NG_NetworkObject();
 	~NG_NetworkObject();
 	const STR_String& GetName();
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //NG_NETWORKOBJECT_H
diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h
index fc6367c3526..d5d6e8e0534 100644
--- a/source/gameengine/Network/NG_NetworkScene.h
+++ b/source/gameengine/Network/NG_NetworkScene.h
@@ -34,6 +34,10 @@
 #include "STR_HashedString.h"
 #include <vector>
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 //MSVC defines SendMessage as a win api function, even though we aren't using it
 #ifdef SendMessage
 	#undef SendMessage
@@ -52,7 +56,7 @@ class NG_NetworkScene
 	TMessageMap m_messagesBySenderName;
 	TMessageMap m_messagesBySubject;
 
-public:	
+public:
 	NG_NetworkScene(NG_NetworkDeviceInterface *nic);
 	~NG_NetworkScene();
 
@@ -100,6 +104,13 @@ protected:
 	 * @param map	Message map with messages.
 	 */
 	void ClearMessageMap(TMessageMap& map);	
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__NG_NETWORKSCENE_H
diff --git a/source/gameengine/Physics/Bullet/CcdGraphicController.h b/source/gameengine/Physics/Bullet/CcdGraphicController.h
index b0626f902c2..99885eb99ee 100644
--- a/source/gameengine/Physics/Bullet/CcdGraphicController.h
+++ b/source/gameengine/Physics/Bullet/CcdGraphicController.h
@@ -75,6 +75,12 @@ private:
 	btBroadphaseProxy* m_handle;
 	void* m_newClientInfo;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdGraphicController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //BULLET2_PHYSICSCONTROLLER_H
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 8eb2e616ecf..69b16ca35bd 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -58,8 +58,6 @@ class btCollisionShape;
 class CcdShapeConstructionInfo
 {
 public:
-	
-
 	static CcdShapeConstructionInfo* FindMesh(class RAS_MeshObject* mesh, struct DerivedMesh* dm, bool polytope, bool gimpact);
 
 	CcdShapeConstructionInfo() :
@@ -191,6 +189,13 @@ protected:
 	bool	m_forceReInstance; //use gimpact for concave dynamic/moving collision detection
 	float	m_weldingThreshold1;	//welding closeby vertices together can improve softbody stability etc.
 	CcdShapeConstructionInfo* m_shapeProxy;	// only used for PHY_SHAPE_PROXY, pointer to actual shape info
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdShapeConstructionInfo"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 struct CcdConstructionInfo
@@ -559,7 +564,11 @@ protected:
 		}
 
 
-		
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
@@ -587,7 +596,13 @@ class	DefaultMotionState : public PHY_IMotionState
 		
 		btTransform	m_worldTransform;
 		btVector3		m_localScaling;
-
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:DefaultMotionState"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index bc5491e00cc..e087eac32c5 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -275,7 +275,11 @@ protected:
 		bool	m_scalingPropagated;
 
 		
-
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsEnvironment"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //CCDPHYSICSENVIRONMENT
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index 8dbd137f9de..28440ebdad4 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -93,6 +93,12 @@ public:
 			return 0.f;
 		}
 
+		
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:DummyPhysicsEnvironment"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //_DUMMYPHYSICSENVIRONMENT
diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h
index 45e93f9d24e..a053a9679b8 100644
--- a/source/gameengine/Physics/common/PHY_IController.h
+++ b/source/gameengine/Physics/common/PHY_IController.h
@@ -31,7 +31,9 @@
 
 #include "PHY_DynamicTypes.h"
 
-
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
 
 /**
 	PHY_IController is the abstract simplified Interface to objects 
@@ -41,12 +43,17 @@
 class PHY_IController	
 {
 	public:
-		
 		virtual ~PHY_IController();
 		// clientinfo for raycasts for example
 		virtual	void*				getNewClientInfo()=0;
 		virtual	void				setNewClientInfo(void* clientinfo)=0;
 
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //PHY_ICONTROLLER_H
diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h
index 470d42cb84a..aae971ff42a 100644
--- a/source/gameengine/Physics/common/PHY_IGraphicController.h
+++ b/source/gameengine/Physics/common/PHY_IGraphicController.h
@@ -39,9 +39,7 @@
 */
 class PHY_IGraphicController : public PHY_IController
 {
-
 	public:
-		
 		virtual ~PHY_IGraphicController();
 		/**
 			SynchronizeMotionStates ynchronizes dynas, kinematic and deformable entities (and do 'late binding')
@@ -53,6 +51,11 @@ class PHY_IGraphicController : public PHY_IController
 
 		virtual PHY_IGraphicController*	GetReplica(class PHY_IMotionState* motionstate) {return 0;}
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //PHY_IGRAPHICCONTROLLER_H
diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h
index f7bcbd4f2d0..c3d01c010ff 100644
--- a/source/gameengine/Physics/common/PHY_IMotionState.h
+++ b/source/gameengine/Physics/common/PHY_IMotionState.h
@@ -29,6 +29,10 @@
 #ifndef PHY__MOTIONSTATE_H
 #define PHY__MOTIONSTATE_H
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /**
 	PHY_IMotionState is the Interface to explicitly synchronize the world transformation.
 	Default implementations for mayor graphics libraries like OpenGL and DirectX can be provided.
@@ -36,8 +40,7 @@
 class	PHY_IMotionState
 
 {
-	public:
-		
+	public:		
 		virtual ~PHY_IMotionState();
 
 		virtual void	getWorldPosition(float& posX,float& posY,float& posZ)=0;
@@ -52,6 +55,13 @@ class	PHY_IMotionState
 
 
 		virtual	void	calculateWorldTransformations()=0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IMotionState"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //PHY__MOTIONSTATE_H
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h
index d7b8cb0b54f..664e5fddd83 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsController.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h
@@ -41,7 +41,6 @@ class PHY_IPhysicsController : public PHY_IController
 {
 
 	public:
-		
 		virtual ~PHY_IPhysicsController();
 		/**
 			SynchronizeMotionStates ynchronizes dynas, kinematic and deformable entities (and do 'late binding')
@@ -99,6 +98,11 @@ class PHY_IPhysicsController : public PHY_IController
 		
 		PHY__Vector3	GetWorldPosition(PHY__Vector3& localpos);
 
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsController"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //PHY_IPHYSICSCONTROLLER_H
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
index c76e9d175ce..291dac298dc 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
@@ -32,6 +32,11 @@
 
 #include <vector>
 #include "PHY_DynamicTypes.h"
+
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class PHY_IVehicle;
 class RAS_MeshObject;
 class PHY_IPhysicsController;
@@ -76,6 +81,12 @@ public:
 		m_faceNormal(faceNormal)
 	{
 	}
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IRayCastFilterCallback"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /**
@@ -160,6 +171,13 @@ class PHY_IPhysicsEnvironment
 		
 		virtual void	setConstraintParam(int constraintId,int param,float value,float value1) = 0;
 		virtual float	getConstraintParam(int constraintId,int param) = 0;
+		
+		
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsEnvironment"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //_IPHYSICSENVIRONMENT
diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h
index 498df0dd840..261bae480f5 100644
--- a/source/gameengine/Physics/common/PHY_IVehicle.h
+++ b/source/gameengine/Physics/common/PHY_IVehicle.h
@@ -6,10 +6,13 @@
 class PHY_IMotionState;
 #include "PHY_DynamicTypes.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class PHY_IVehicle
 {
 public:
-
 	virtual ~PHY_IVehicle();
 	
 	virtual void	AddWheel(
@@ -52,6 +55,12 @@ public:
 
 	virtual void	SetCoordinateSystem(int rightIndex,int upIndex,int forwardIndex) =0;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IVehicle"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //PHY_IVEHICLE_H
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
index 6a420a974d4..99d4ea595ab 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -30,6 +30,10 @@
 
 #define MAX_RENDER_PASS	100
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class RAS_2DFilterManager
 {
 private:
@@ -97,5 +101,12 @@ public:
 	void RenderFilters(RAS_ICanvas* canvas);
 
 	void EnableFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_2DFilterManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h
index 2b81ddd3c82..dcac41ab6e9 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.h
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.h
@@ -67,6 +67,12 @@ private:
 		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 	void RenderAlphaBuckets(const MT_Transform& cameratrans, 
 		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_BucketManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_BUCKETMANAGER
diff --git a/source/gameengine/Rasterizer/RAS_Deformer.h b/source/gameengine/Rasterizer/RAS_Deformer.h
index 75c0dcd1eeb..6f4cd425c6c 100644
--- a/source/gameengine/Rasterizer/RAS_Deformer.h
+++ b/source/gameengine/Rasterizer/RAS_Deformer.h
@@ -37,6 +37,10 @@
 #include <stdlib.h>
 #include "GEN_Map.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct DerivedMesh;
 class RAS_MeshObject;
 
@@ -82,6 +86,12 @@ public:
 protected:
 	class RAS_MeshObject	*m_pMesh;
 	bool  m_bDynamic;	
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Deformer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h
index 4398e2d00c3..3ae794c430a 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.h
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.h
@@ -29,6 +29,10 @@
 #ifndef RAS_FRAMINGMANAGER_H
 #define RAS_FRAMINGMANAGER_H
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class RAS_Rect;
 
 /**
@@ -55,7 +59,6 @@ class RAS_Rect;
 class RAS_FrameSettings 
 {
 public :
-
 	/**
 	 * enum defining the policy to use 
 	 * in each axis.
@@ -154,6 +157,13 @@ private :
 	float m_bar_b;
 	unsigned int m_design_aspect_width;
 	unsigned int m_design_aspect_height;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FrameSettings"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 }; 
 
 struct RAS_FrameFrustum
@@ -274,6 +284,13 @@ private :
 	RAS_FramingManager(
 		const RAS_FramingManager &
 	);
+	
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FramingManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };		
 		
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index f3f817a943d..dae4fb3f4d2 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -33,6 +33,10 @@
  * 2D rendering device context. The connection from 3d rendercontext to 2d surface.
  */
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class RAS_Rect;
 
 
@@ -173,6 +177,13 @@ public:
 	MakeScreenShot(
 		const char* filename
 	)=0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ICanvas"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_ICANVAS
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index a01196ef307..af909dfa731 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -38,6 +38,10 @@
 #include "MT_Vector3.h"
 #include "STR_HashedString.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class RAS_IRasterizer;
 struct MTFace;
 struct Material;
@@ -82,7 +86,6 @@ protected:
 	unsigned int			m_flag;//MaterialProps
 	int						m_multimode; // sum of values
 public:
-
 	MT_Vector3			m_diffuse;
 	float				m_shininess;
 	MT_Vector3			m_specular;
@@ -165,6 +168,13 @@ public:
 	 * PreCalculate texture gen
 	 */
 	virtual void OnConstruction(int layer){}
+		
+		
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IPolyMaterial"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 inline  bool operator ==( const RAS_IPolyMaterial & rhs,const RAS_IPolyMaterial & lhs)
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index dc8c3c1ebf8..05406413941 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -43,6 +43,10 @@
 #include <vector>
 using namespace std;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class RAS_ICanvas;
 class RAS_IPolyMaterial;
 
@@ -57,7 +61,6 @@ typedef vector< KX_IndexArray* > vecIndexArrays;
 class RAS_IRasterizer
 {
 public:
-
 	RAS_IRasterizer(RAS_ICanvas* canv){};
 	virtual ~RAS_IRasterizer(){};
 	/**
@@ -407,6 +410,13 @@ public:
 
 	virtual void	SetBlendingMode(int blendmode)=0;
 	virtual void	SetFrontFace(bool ccw)=0;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRasterizer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_IRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index 52f6397cf6c..5d52ddc9688 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -36,6 +36,10 @@
 #include <vector>
 #include <algorithm>
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class		RAS_IPolyMaterial;
 struct		RAS_LightObject;
 
@@ -180,6 +184,13 @@ public:
 	virtual
 		void
 		Render2DFilters(RAS_ICanvas* canvas)=0;
+		
+		
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRenderTools"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_IRENDERTOOLS
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 8db75b8b735..207763392b2 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -169,6 +169,13 @@ public:
 	bool IsCulled() { return m_bCulled; }
 #endif
 	void SetCulled(bool culled) { m_bCulled = culled; }
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshSlot"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /* Used by RAS_MeshObject, to point to it's slots in a bucket */
@@ -179,6 +186,13 @@ public:
 	RAS_MeshSlot *m_baseslot;
 	class RAS_MaterialBucket *m_bucket;
 	GEN_Map<GEN_HashedPtr,RAS_MeshSlot*> m_slots;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshMaterial"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /* Contains a list of display arrays with the same material,
@@ -232,6 +246,12 @@ private:
 	RAS_IPolyMaterial*			m_material;
 	SG_DList					m_activeMeshSlotsHead;	// only those which must be rendered
 	
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MaterialBucket"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_MATERIAL_BUCKET
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index f34546a8ff7..1738423c4f3 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -173,6 +173,13 @@ public:
 	};
 
 	vector<vector<SharedVertex> >	m_sharedvertex_map;
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_MESHOBJECT
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
index fe358808e4a..cff48081f02 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
@@ -66,6 +66,13 @@ public:
 	virtual void	SetDrawingMode(int drawingmode);
 
 	virtual bool	QueryLists(){return true;}
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ListRasterizer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index e3422394e9e..db0f97bf46f 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -289,6 +289,13 @@ public:
 
 	virtual void	SetBlendingMode(int blendmode);
 	virtual void	SetFrontFace(bool ccw);
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_OpenGLRasterizer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_OPENGLRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
index 766bbfbed0e..6112c1a4d98 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -58,6 +58,12 @@ private:
 	//virtual bool	QueryArrays(){return true;}
 	//virtual bool	QueryLists(){return m_Lock;}
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_VAOpenGLRasterizer"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_VERTEXARRAYOPENGLRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h
index 41eaa6bdd4a..a5b77738026 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.h
+++ b/source/gameengine/Rasterizer/RAS_Polygon.h
@@ -35,6 +35,10 @@
 #include <vector>
 using namespace std;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /* polygon flags */
 
 class RAS_Polygon
@@ -85,6 +89,12 @@ public:
 
 	RAS_MaterialBucket*	GetMaterial();
 	RAS_DisplayArray*	GetDisplayArray();
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Polygon"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_Rect.h b/source/gameengine/Rasterizer/RAS_Rect.h
index 4cd0c636cfd..ca7435673c9 100644
--- a/source/gameengine/Rasterizer/RAS_Rect.h
+++ b/source/gameengine/Rasterizer/RAS_Rect.h
@@ -30,6 +30,10 @@
 #ifndef _RAS_RECT
 #define _RAS_RECT
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /** 
  * @section interface class.
  * RAS_Rect just encodes a simple rectangle.
@@ -89,6 +93,12 @@ public:
 	{
 		m_y2 = y2;
 	}
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Rect"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // _RAS_RECT
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h
index 811867f3579..b93078f4712 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.h
+++ b/source/gameengine/Rasterizer/RAS_TexVert.h
@@ -34,6 +34,10 @@
 #include "MT_Point2.h"
 #include "MT_Transform.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 static MT_Point3 g_pt3;
 static MT_Point2 g_pt2;
 
@@ -134,6 +138,12 @@ public:
 	// compare two vertices, to test if they can be shared, used for
 	// splitting up based on uv's, colors, etc
 	bool				closeTo(const RAS_TexVert* other);
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_TexVert"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_TEXVERT
diff --git a/source/gameengine/SceneGraph/SG_BBox.h b/source/gameengine/SceneGraph/SG_BBox.h
index c39ad268e25..8dbb9869dae 100644
--- a/source/gameengine/SceneGraph/SG_BBox.h
+++ b/source/gameengine/SceneGraph/SG_BBox.h
@@ -38,6 +38,10 @@
 
 #include <vector> 
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 class SG_Node;
 
 /**
@@ -128,6 +132,12 @@ public:
 	
 	friend class SG_Tree;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_BBox"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif /* __SG_BBOX_H__ */
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h
index c32885b915f..db9d7bdb464 100644
--- a/source/gameengine/SceneGraph/SG_Controller.h
+++ b/source/gameengine/SceneGraph/SG_Controller.h
@@ -40,6 +40,12 @@
 class SG_Controller 
 {
 public:
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "SG_Controller"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
+
 	SG_Controller(
 	) :
 		m_pObject(NULL) {
diff --git a/source/gameengine/SceneGraph/SG_DList.h b/source/gameengine/SceneGraph/SG_DList.h
index 7bef13cc9e3..3e17fb55dc0 100644
--- a/source/gameengine/SceneGraph/SG_DList.h
+++ b/source/gameengine/SceneGraph/SG_DList.h
@@ -31,6 +31,10 @@
 
 #include <stdlib.h>
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /**
  * Double circular linked list
  */
@@ -155,6 +159,13 @@ public:
     { 
         return this; 
     }
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_DList"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__SG_DLIST
diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h
index 8f448a0e890..23e6c1e9c99 100644
--- a/source/gameengine/SceneGraph/SG_IObject.h
+++ b/source/gameengine/SceneGraph/SG_IObject.h
@@ -160,8 +160,6 @@ private :
 	SGControllerList	m_SGcontrollers;
 
 public:
-
-
 	virtual ~SG_IObject();
 
 
@@ -338,6 +336,11 @@ protected :
 	);
 
 
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_IObject"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__SG_IOBJECT
diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h
index 7c6ef92f670..4281bcd11f6 100644
--- a/source/gameengine/SceneGraph/SG_Node.h
+++ b/source/gameengine/SceneGraph/SG_Node.h
@@ -40,7 +40,6 @@ typedef std::vector<SG_Node*> NodeList;
 class SG_Node : public SG_Spatial
 {
 public:
-
 	SG_Node(
 		void* clientobj,
 		void* clientinfo,
@@ -260,6 +259,12 @@ private:
 	 */
 	SG_Node* m_SGparent;
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Node"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__SG_NODE_H
diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h
index 8f45df09b27..a6a43c19115 100644
--- a/source/gameengine/SceneGraph/SG_ParentRelation.h
+++ b/source/gameengine/SceneGraph/SG_ParentRelation.h
@@ -55,7 +55,6 @@ class SG_Spatial;
 class SG_ParentRelation {
 
 public :
-
 	/**
 	 * Update the childs local and global coordinates
 	 * based upon the parents global coordinates. 
@@ -128,6 +127,13 @@ protected :
 	SG_ParentRelation(
 		const SG_ParentRelation &
 	); 
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_ParentRelation"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };	
 
 #endif
diff --git a/source/gameengine/SceneGraph/SG_QList.h b/source/gameengine/SceneGraph/SG_QList.h
index d8afc33ea4f..6399111d80b 100644
--- a/source/gameengine/SceneGraph/SG_QList.h
+++ b/source/gameengine/SceneGraph/SG_QList.h
@@ -151,6 +151,13 @@ public:
     { 
         return m_bqlink; 
     }  
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_QList"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__SG_QLIST
diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h
index 6e274487c9d..a818c8c81f7 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.h
+++ b/source/gameengine/SceneGraph/SG_Spatial.h
@@ -66,7 +66,6 @@ protected:
 	bool			m_ogldirty;		// true if the openGL matrix for this object must be recomputed
 
 public:
-
 	inline void ClearModified() 
 	{ 
 		m_modified = false; 
@@ -284,6 +283,12 @@ protected:
 		bool& parentUpdated
 	);
 
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Spatial"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__SG_SPATIAL_H
diff --git a/source/gameengine/SceneGraph/SG_Tree.h b/source/gameengine/SceneGraph/SG_Tree.h
index 4741af83aae..6ca3307920e 100644
--- a/source/gameengine/SceneGraph/SG_Tree.h
+++ b/source/gameengine/SceneGraph/SG_Tree.h
@@ -111,6 +111,13 @@ public:
 		}
 	};
 	
+	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Tree"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 
@@ -148,6 +155,12 @@ public:
 	
 	SG_Tree* MakeTree();
 	
+	
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_TreeFactory"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif /* __SG_BBOX_H__ */

From b51ebdf0bafd5f9baed88673fb58d947aba426b3 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 18 Aug 2009 16:11:53 +0000
Subject: [PATCH 124/577] 2.5: Middle mouse button emulation with alt + left
 mouse button works again, implemented at windowmanager level this time.

---
 .../blender/windowmanager/intern/wm_event_system.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 737028843d3..f0d9f8c0989 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -672,7 +672,19 @@ static int wm_eventmatch(wmEvent *winevent, wmKeymapItem *kmi)
 	int kmitype= wm_userdef_event_map(kmi->type);
 
 	if(kmi->inactive) return 0;
-	
+
+	/* exception for middlemouse emulation */
+	if((U.flag & USER_TWOBUTTONMOUSE) && (kmi->type == MIDDLEMOUSE)) {
+		if(winevent->type == LEFTMOUSE && winevent->alt) {
+			wmKeymapItem tmp= *kmi;
+
+			tmp.type= winevent->type;
+			tmp.alt= winevent->alt;
+			if(wm_eventmatch(winevent, &tmp))
+				return 1;
+		}
+	}
+
 	/* the matching rules */
 	if(kmitype==KM_TEXTINPUT)
 		if(ISKEYBOARD(winevent->type)) return 1;

From 94511c672920e8ae0ebca4fca2a563a46d07b85b Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Tue, 18 Aug 2009 17:01:59 +0000
Subject: [PATCH 125/577] Missing libed_userpref in source/Makefile

---
 source/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/Makefile b/source/Makefile
index b4d6ba9d013..cd2e7cf75ba 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -244,6 +244,7 @@ PULIB += $(OCGDIR)/blender/ed_image/$(DEBUG_DIR)libed_image.a
 PULIB += $(OCGDIR)/blender/ed_uvedit/$(DEBUG_DIR)libed_uvedit.a
 PULIB += $(OCGDIR)/blender/ed_screen/$(DEBUG_DIR)libed_screen.a
 PULIB += $(OCGDIR)/blender/ed_console/$(DEBUG_DIR)libed_console.a
+PULIB += $(OCGDIR)/blender/ed_userpref/$(DEBUG_DIR)libed_userpref.a
 PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
 PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a

From 7d812822bd9c522efc0730a4f219ccec9cfb4a57 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Tue, 18 Aug 2009 19:26:53 +0000
Subject: [PATCH 126/577] Stamp info back only for float buffer. (next commit
 add unsigned char).

A couple of new functions:
	BLF_width_and_height	- Merge of BLF_width and BLF_height in one call to avoid freetype2 stuff.
	BLF_buffer		- Set the buffer, size and number of channel.
	BLF_buffer_col		- Set the text color (the alpha is not used right now).
	BLF_draw_buffer		- Draw the text in the current buffer.

Also tweak a little the boundbox and draw function to avoid access the freetype2 and use the cache info.
By default the font size is 12, the UI still need work to allow change the font and size.
---
 source/blender/blenfont/BLF_api.h             |  27 +++
 source/blender/blenfont/intern/blf.c          |  45 ++++
 source/blender/blenfont/intern/blf_font.c     | 169 ++++++++++++--
 source/blender/blenfont/intern/blf_glyph.c    |   2 +
 source/blender/blenfont/intern/blf_internal.h |   2 +
 .../blenfont/intern/blf_internal_types.h      |  20 ++
 source/blender/blenkernel/intern/Makefile     |   1 +
 source/blender/blenkernel/intern/image.c      | 220 +++++++++++-------
 8 files changed, 383 insertions(+), 103 deletions(-)

diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 05df927f921..760b7059bc7 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -70,6 +70,11 @@ void BLF_boundbox(char *str, struct rctf *box);
 float BLF_width(char *str);
 float BLF_height(char *str);
 
+/*
+ * The following function return the width and height of the string, but
+ * just in one call, so avoid extra freetype2 stuff.
+ */
+void BLF_width_and_height(char *str, float *width, float *height);
 
 /*
  * For fixed width fonts only, returns the width of a
@@ -116,6 +121,28 @@ void BLF_shadow(int level, float r, float g, float b, float a);
  */
 void BLF_shadow_offset(int x, int y);
 
+/*
+ * Set the buffer, size and number of channels to draw, one thing to take care is call
+ * this function with NULL pointer when we finish, for example:
+ *	BLF_buffer(my_fbuf, my_cbuf, 100, 100, 4);
+ *
+ *	... set color, position and draw ...
+ *
+ *	BLF_buffer(NULL, NULL, 0, 0, 0);
+ */
+void BLF_buffer(float *fbuf, unsigned char *cbuf, unsigned int w, unsigned int h, int nch);
+
+/*
+ * Set the color to be used for text.
+ */
+void BLF_buffer_col(float r, float g, float b, float a);
+
+/*
+ * Draw the string into the buffer, this function draw in both buffer, float and unsigned char _BUT_
+ * it's not necessary set both buffer, NULL is valid here.
+ */
+void BLF_draw_buffer(char *str);
+
 /*
  * Search the path directory to the locale files, this try all
  * the case for Linux, Win and Mac.
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index ded89d18387..8cb237a19ac 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -371,6 +371,15 @@ void BLF_boundbox(char *str, rctf *box)
 		blf_font_boundbox(font, str, box);
 }
 
+void BLF_width_and_height(char *str, float *width, float *height)
+{
+	FontBLF *font;
+
+	font= global_font[global_font_cur];
+	if (font)
+		blf_font_width_and_height(font, str, width, height);
+}
+
 float BLF_width(char *str)
 {
 	FontBLF *font;
@@ -513,3 +522,39 @@ void BLF_shadow_offset(int x, int y)
 		font->shadow_y= y;
 	}
 }
+
+void BLF_buffer(float *fbuf, unsigned char *cbuf, unsigned int w, unsigned int h, int nch)
+{
+	FontBLF *font;
+
+	font= global_font[global_font_cur];
+	if (font) {
+		font->b_fbuf= fbuf;
+		font->b_cbuf= cbuf;
+		font->bw= w;
+		font->bh= h;
+		font->bch= nch;
+	}
+}
+
+void BLF_buffer_col(float r, float g, float b, float a)
+{
+	FontBLF *font;
+
+	font= global_font[global_font_cur];
+	if (font) {
+		font->b_col[0]= r;
+		font->b_col[1]= g;
+		font->b_col[2]= b;
+		font->b_col[3]= a;
+	}
+}
+
+void BLF_draw_buffer(char *str)
+{
+	FontBLF *font;
+
+	font= global_font[global_font_cur];
+	if (font)
+		blf_font_buffer(font, str);
+}
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 7521b7815f1..432c3b5f854 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -100,7 +100,7 @@ void blf_font_draw(FontBLF *font, char *str)
 	unsigned int c;
 	GlyphBLF *g, *g_prev;
 	FT_Vector delta;
-	FT_UInt glyph_index, g_prev_index;
+	FT_UInt glyph_index;
 	int pen_x, pen_y;
 	int i, has_kerning, st;
 
@@ -112,17 +112,17 @@ void blf_font_draw(FontBLF *font, char *str)
 	pen_y= 0;
 	has_kerning= FT_HAS_KERNING(font->face);
 	g_prev= NULL;
-	g_prev_index= 0;
 
 	while (str[i]) {
 		c= blf_utf8_next((unsigned char *)str, &i);
 		if (c == 0)
 			break;
 
-		glyph_index= FT_Get_Char_Index(font->face, c);
 		g= blf_glyph_search(font->glyph_cache, c);
-		if (!g)
+		if (!g) {
+			glyph_index= FT_Get_Char_Index(font->face, c);
 			g= blf_glyph_add(font, glyph_index, c);
+		}
 
 		/* if we don't found a glyph, skip it. */
 		if (!g)
@@ -133,9 +133,9 @@ void blf_font_draw(FontBLF *font, char *str)
 			delta.y= 0;
 
 			if (font->flags & BLF_KERNING_DEFAULT)
-				st= FT_Get_Kerning(font->face, g_prev_index, glyph_index, ft_kerning_default, &delta);
+				st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, ft_kerning_default, &delta);
 			else
-				st= FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta);
+				st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, FT_KERNING_UNFITTED, &delta);
 
 			if (st == 0)
 				pen_x += delta.x >> 6;
@@ -146,7 +146,129 @@ void blf_font_draw(FontBLF *font, char *str)
 
 		pen_x += g->advance;
 		g_prev= g;
-		g_prev_index= glyph_index;
+	}
+}
+
+void blf_font_buffer(FontBLF *font, char *str)
+{
+	unsigned char *data;
+	unsigned int c;
+	GlyphBLF *g, *g_prev;
+	FT_Vector delta;
+	FT_UInt glyph_index;
+	float a, *fbuf;
+	int pen_x, pen_y, y, x, yb, diff;
+	int i, has_kerning, st, chx, chy;
+
+	if (!font->glyph_cache)
+		return;
+
+	i= 0;
+	pen_x= (int)font->pos[0];
+	pen_y= (int)font->pos[1];
+	has_kerning= FT_HAS_KERNING(font->face);
+	g_prev= NULL;
+
+	while (str[i]) {
+		c= blf_utf8_next((unsigned char *)str, &i);
+		if (c == 0)
+			break;
+
+		g= blf_glyph_search(font->glyph_cache, c);
+		if (!g) {
+			glyph_index= FT_Get_Char_Index(font->face, c);
+			g= blf_glyph_add(font, glyph_index, c);
+		}
+
+		/* if we don't found a glyph, skip it. */
+		if (!g)
+			continue;
+
+		if (has_kerning && g_prev) {
+			delta.x= 0;
+			delta.y= 0;
+
+			if (font->flags & BLF_KERNING_DEFAULT)
+				st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, ft_kerning_default, &delta);
+			else
+				st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, FT_KERNING_UNFITTED, &delta);
+
+			if (st == 0)
+				pen_x += delta.x >> 6;
+		}
+
+		if (font->b_fbuf) {
+			chx= pen_x + ((int)g->pos_x);
+
+			diff= g->height - ((int)g->pos_y);
+
+			if (diff > 0) {
+				if (g->pitch < 0)
+					pen_y += diff;
+				else
+					pen_y -= diff;
+			}
+			else if (diff < 0) {
+				if (g->pitch < 0)
+					pen_y -= diff;
+				else
+					pen_y += diff;
+			}
+
+
+			if (g->pitch < 0)
+				chy= pen_y - ((int)g->pos_y);
+			else
+				chy= pen_y + ((int)g->pos_y);
+
+			if (chx >= 0 && chx < font->bw && pen_y >= 0 && pen_y < font->bh) {
+				if (g->pitch < 0)
+					yb= 0;
+				else
+					yb= g->height-1;
+
+				for (y= 0; y < g->height; y++) {
+					for (x= 0; x < g->width; x++) {
+						fbuf= font->b_fbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw));
+						data= g->bitmap + x + (yb * g->pitch);
+						a= data[0]/255.0f;
+
+						if (a == 1.0) {
+							fbuf[0]= font->b_col[0];
+							fbuf[1]= font->b_col[1];
+							fbuf[2]= font->b_col[2];
+						}
+						else {
+							fbuf[0]= (font->b_col[0]*a) + (fbuf[0] * (1-a));
+							fbuf[1]= (font->b_col[1]*a) + (fbuf[1] * (1-a));
+							fbuf[2]= (font->b_col[2]*a) + (fbuf[2] * (1-a));
+						}
+					}
+
+					if (g->pitch < 0)
+						yb++;
+					else
+						yb--;
+				}
+			}
+
+			if (diff > 0) {
+				if (g->pitch < 0)
+					pen_x -= diff;
+				else
+					pen_y += diff;
+			}
+			else if (diff < 0) {
+				if (g->pitch < 0)
+					pen_x += diff;
+				else
+					pen_y -= diff;
+			}
+
+		}
+
+		pen_x += g->advance;
+		g_prev= g;
 	}
 }
 
@@ -155,7 +277,7 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box)
 	unsigned int c;
 	GlyphBLF *g, *g_prev;
 	FT_Vector delta;
-	FT_UInt glyph_index, g_prev_index;
+	FT_UInt glyph_index;
 	rctf gbox;
 	int pen_x, pen_y;
 	int i, has_kerning, st;
@@ -173,17 +295,17 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box)
 	pen_y= 0;
 	has_kerning= FT_HAS_KERNING(font->face);
 	g_prev= NULL;
-	g_prev_index= 0;
 
 	while (str[i]) {
 		c= blf_utf8_next((unsigned char *)str, &i);
 		if (c == 0)
 			break;
 
-		glyph_index= FT_Get_Char_Index(font->face, c);
 		g= blf_glyph_search(font->glyph_cache, c);
-		if (!g)
+		if (!g) {
+			glyph_index= FT_Get_Char_Index(font->face, c);
 			g= blf_glyph_add(font, glyph_index, c);
+		}
 
 		/* if we don't found a glyph, skip it. */
 		if (!g)
@@ -194,9 +316,9 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box)
 			delta.y= 0;
 
 			if (font->flags & BLF_KERNING_DEFAULT)
-				st= FT_Get_Kerning(font->face, g_prev_index, glyph_index, ft_kerning_default, &delta);
+				st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, ft_kerning_default, &delta);
 			else
-				st= FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta);
+				st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, FT_KERNING_UNFITTED, &delta);
 
 			if (st == 0)
 				pen_x += delta.x >> 6;
@@ -219,7 +341,6 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box)
 
 		pen_x += g->advance;
 		g_prev= g;
-		g_prev_index= glyph_index;
 	}
 
 	if (box->xmin > box->xmax) {
@@ -230,6 +351,17 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box)
 	}
 }
 
+void blf_font_width_and_height(FontBLF *font, char *str, float *width, float *height)
+{
+	rctf box;
+
+	if (font->glyph_cache) {
+		blf_font_boundbox(font, str, &box);
+		*width= ((box.xmax - box.xmin) * font->aspect);
+		*height= ((box.ymax - box.ymin) * font->aspect);
+	}
+}
+
 float blf_font_width(FontBLF *font, char *str)
 {
 	rctf box;
@@ -311,6 +443,15 @@ void blf_font_fill(FontBLF *font)
 	font->glyph_cache= NULL;
 	font->blur= 0;
 	font->max_tex_size= -1;
+	font->b_fbuf= NULL;
+	font->b_cbuf= NULL;
+	font->bw= 0;
+	font->bh= 0;
+	font->bch= 0;
+	font->b_col[0]= 0;
+	font->b_col[1]= 0;
+	font->b_col[2]= 0;
+	font->b_col[3]= 0;
 }
 
 FontBLF *blf_font_new(char *name, char *filename)
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 78df8ff2bc6..f3db3ddc9a5 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -217,6 +217,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, FT_UInt index, unsigned int c)
 	g->next= NULL;
 	g->prev= NULL;
 	g->c= c;
+	g->idx= index;
 	g->tex= 0;
 	g->build_tex= 0;
 	g->bitmap= NULL;
@@ -238,6 +239,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, FT_UInt index, unsigned int c)
 	g->advance= ((float)slot->advance.x) / 64.0f;
 	g->pos_x= slot->bitmap_left;
 	g->pos_y= slot->bitmap_top;
+	g->pitch= slot->bitmap.pitch;
 
 	FT_Outline_Get_CBox(&(slot->outline), &bbox);
 	g->box.xmin= ((float)bbox.xMin) / 64.0f;
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index 30d5c8ede65..2a69b8652ea 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -45,7 +45,9 @@ void blf_font_attach_from_mem(FontBLF *font, const unsigned char *mem, int mem_s
 
 void blf_font_size(FontBLF *font, int size, int dpi);
 void blf_font_draw(FontBLF *font, char *str);
+void blf_font_buffer(FontBLF *font, char *str);
 void blf_font_boundbox(FontBLF *font, char *str, rctf *box);
+void blf_font_width_and_height(FontBLF *font, char *str, float *width, float *height);
 float blf_font_width(FontBLF *font, char *str);
 float blf_font_height(FontBLF *font, char *str);
 float blf_font_fixed_width(FontBLF *font);
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index d457225662f..fb4a2e6a9e5 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -85,6 +85,9 @@ typedef struct GlyphBLF {
 	/* and the character, as UTF8 */
 	unsigned int c;
 
+	/* freetype2 index, to speed-up the search. */
+	FT_UInt idx;
+
 	/* glyph box. */
 	rctf box;
 
@@ -106,6 +109,7 @@ typedef struct GlyphBLF {
 	/* glyph width and height. */
 	int width;
 	int height;
+	int pitch;
 
 	/* uv coords. */
 	float uv[2][2];
@@ -176,6 +180,22 @@ typedef struct FontBLF {
 
 	/* freetype2 face. */
 	FT_Face face;
+
+	/* for draw to buffer, always set this to NULL after finish! */
+	float *b_fbuf;
+
+	/* the same but unsigned char */
+	unsigned char *b_cbuf;
+
+	/* buffer size. */
+	unsigned int bw;
+	unsigned int bh;
+
+	/* number of channels. */
+	int bch;
+
+	/* and the color, the alphas is get from the glyph! */
+	float b_col[4];
 } FontBLF;
 
 typedef struct DirBLF {
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index 60ffdc78726..d6d41d6579e 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -51,6 +51,7 @@ CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../blenloader
 CPPFLAGS += -I../../python
+CPPFLAGS += -I../../blenfont
 # also avi is used
 CPPFLAGS += -I../../avi
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 62af05fbc9a..eb8872c43a5 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -73,6 +73,8 @@
 
 //XXX #include "BIF_editseq.h"
 
+#include "BLF_api.h"
+
 #include "PIL_time.h"
 
 #include "RE_pipeline.h"
@@ -978,7 +980,6 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix)
 			if (do_prefix)		strcpy(stamp_data->file, "File <untitled>");
 			else				strcpy(stamp_data->file, "<untitled>");
 		}
-		stamp_data->note[0] = '\0';
 	} else {
 		stamp_data->file[0] = '\0';
 	}
@@ -1046,8 +1047,8 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix)
 	
 	if (scene->r.stamp & R_STAMP_FRAME) {
 		char format[32];
-		if (do_prefix)		sprintf(format, "Frame %%0%di\n", 1 + (int) log10(scene->r.efra));
-		else				sprintf(format, "%%0%di\n", 1 + (int) log10(scene->r.efra));
+		if (do_prefix)		sprintf(format, "Frame %%0%di", 1 + (int) log10(scene->r.efra));
+		else				sprintf(format, "%%0%di", 1 + (int) log10(scene->r.efra));
 		sprintf (stamp_data->frame, format, scene->r.cfra);
 	} else {
 		stamp_data->frame[0] = '\0';
@@ -1083,131 +1084,172 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix)
 	}
 }
 
+// XXX - Bad level call.
+extern int datatoc_bmonofont_ttf_size;
+extern char datatoc_bmonofont_ttf[];
+
+// XXX - copied from text_font_begin
+static void stamp_font_begin(int size)
+{
+	static int mono= -1;
+
+	if (mono == -1)
+		mono= BLF_load_mem("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size);
+
+	BLF_set(mono);
+	BLF_aspect(1.0);
+	BLF_size(size, 72);
+}
+
 void BKE_stamp_buf(Scene *scene, unsigned char *rect, float *rectf, int width, int height, int channels)
 {
-#if 0
-// XXX
-// This go back when BLF_draw_buffer is implemented - Diego
 	struct StampData stamp_data;
-	
-	int x=1,y=1;
-	int font_height;
-	int text_width;
-	int text_pad;
-	struct BMF_Font *font;
+	float w, h, pad;
+	int x, y;
 	
 	if (!rect && !rectf)
 		return;
 	
 	stampdata(scene, &stamp_data, 1);
-	
-	switch (scene->r.stamp_font_id) {
-	case 1: /* tiny */
-		font = BMF_GetFont(BMF_kHelveticaBold8);
-		break;
-	case 2: /* small */
-		font = BMF_GetFont(BMF_kHelveticaBold10);
-		break;
-	case 3: /* medium */
-		font = BMF_GetFont(BMF_kScreen12);
-		break;
-	case 0: /* large - default */
-		font = BMF_GetFont(BMF_kScreen15);
-		break;
-	case 4: /* huge */
-		font = BMF_GetFont(BMF_kHelveticaBold14);
-		break;
-	default:
-		font = NULL;
-		break;
-	}
-	
-	font_height = BMF_GetFontHeight(font);
-	/* All texts get halfspace+1 pixel on each side and 1 pix
-	above and below as padding against their backing rectangles */
-	text_pad = BMF_GetStringWidth(font, " ");
-	
-	x = 1; /* Inits for everyone, text position, so 1 for padding, not 0 */
-	y = height - font_height - 1; /* Also inits for everyone, notice padding pixel */
-	
+	stamp_font_begin(12);
+
+	BLF_buffer(rectf, rect, width, height, channels);
+	BLF_buffer_col(scene->r.fg_stamp[0], scene->r.fg_stamp[1], scene->r.fg_stamp[2], 1.0);
+	pad= BLF_width("--");
+
+	x= 0;
+	y= height;
+
 	if (stamp_data.file[0]) {
 		/* Top left corner */
-		text_width = BMF_GetStringWidth(font, stamp_data.file);
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.file, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
-		y -= font_height+2; /* Top and bottom 1 pix padding each */
+		BLF_width_and_height(stamp_data.file, &w, &h);
+		y -= h;
+
+		/* also a little of space to the background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y-3, w+3, y+h+3);
+
+		/* and draw the text. */
+		BLF_position(x, y, 0.0);
+		BLF_draw_buffer(stamp_data.file);
+
+		/* the extra pixel for background. */
+		y -= 4;
 	}
 
 	/* Top left corner, below File */
 	if (stamp_data.note[0]) {
-		text_width = BMF_GetStringWidth(font, stamp_data.note);
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.note, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
-		y -= font_height+2; /* Top and bottom 1 pix padding each */
+		BLF_width_and_height(stamp_data.note, &w, &h);
+		y -= h;
+
+		/* and space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y-2, w+3, y+h+2);
+
+		BLF_position(x, y+1, 0.0);
+		BLF_draw_buffer(stamp_data.note);
+
+		/* the extra pixel for background. */
+		y -= 4;
 	}
 	
 	/* Top left corner, below File (or Note) */
 	if (stamp_data.date[0]) {
-		text_width = BMF_GetStringWidth(font, stamp_data.date);
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.date, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
+		BLF_width_and_height(stamp_data.date, &w, &h);
+		y -= h;
+
+		/* and space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y-3, w+3, y+h+3);
+
+		BLF_position(x, y, 0.0);
+		BLF_draw_buffer(stamp_data.date);
 	}
 
+	x= 0;
+	y= 0;
+
 	/* Bottom left corner, leaving space for timing */
 	if (stamp_data.marker[0]) {
-		x = 1;
-		y = font_height+2+1; /* 2 for padding in TIME|FRAME fields below and 1 for padding in this one */
-		text_width = BMF_GetStringWidth(font, stamp_data.marker);
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.marker, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
+		BLF_width_and_height(stamp_data.marker, &w, &h);
+
+		/* extra space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y, w+2, y+h+3);
+
+		/* and pad the text. */
+		BLF_position(x, y+3, 0.0);
+		BLF_draw_buffer(stamp_data.marker);
+
+		/* space width. */
+		x += w + pad;
 	}
 	
 	/* Left bottom corner */
 	if (stamp_data.time[0]) {
-		x = 1;
-		y = 1;
-		text_width = BMF_GetStringWidth(font, stamp_data.time);
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.time, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
-		x += text_width+text_pad+2; /* Both sides have 1 pix additional padding each */
+		BLF_width_and_height(stamp_data.time, &w, &h);
+
+		/* extra space for background */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y, x+w+2, y+h+3);
+
+		/* and pad the text. */
+		BLF_position(x, y+3, 0.0);
+		BLF_draw_buffer(stamp_data.time);
+
+		/* space width. */
+		x += w + pad;
 	}
 	
 	if (stamp_data.frame[0]) {
-		text_width = BMF_GetStringWidth(font, stamp_data.frame);
-		/* Left bottom corner (after SMPTE if exists) */
-		if (!stamp_data.time[0])	x = 1;
-		y = 1;
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.frame, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
+		BLF_width_and_height(stamp_data.frame, &w, &h);
+
+		/* extra space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y, x+w+2, y+h+3);
+
+		/* and pad the text. */
+		BLF_position(x, y+3, 0.0);
+
+		BLF_draw_buffer(stamp_data.frame);
+
+		/* space width. */
+		x += w + pad;
 	}
 
 	if (stamp_data.camera[0]) {
-		text_width = BMF_GetStringWidth(font, stamp_data.camera);
-		/* Center of bottom edge */
-		x = (width/2) - (BMF_GetStringWidth(font, stamp_data.camera)/2);
-		y = 1;
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.camera, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
+		BLF_width_and_height(stamp_data.camera, &w, &h);
+
+		/* extra space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y, x+w+2, y+h+3);
+		BLF_position(x, y+3, 0.0);
+		BLF_draw_buffer(stamp_data.camera);
 	}
 	
 	if (stamp_data.scene[0]) {
-		text_width = BMF_GetStringWidth(font, stamp_data.scene);
-		/* Bottom right corner */
-		x = width - (text_width+1+text_pad);
-		y = 1;
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.scene, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
+		BLF_width_and_height(stamp_data.scene, &w, &h);
+
+		/* Bottom right corner, with an extra space because blenfont is too strict! */
+		x= width - w - 2;
+
+		/* extra space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y, x+w+3, y+h+3);
+
+		/* and pad the text. */
+		BLF_position(x, y+3, 0.0);
+		BLF_draw_buffer(stamp_data.scene);
 	}
 	
 	if (stamp_data.strip[0]) {
-		text_width = BMF_GetStringWidth(font, stamp_data.strip);
-		/* Top right corner */
-		x = width - (text_width+1+text_pad);
-		y = height - font_height - 1;
-		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1);
-		BMF_DrawStringBuf(font, stamp_data.strip, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels);
+		BLF_width_and_height(stamp_data.scene, &w, &h);
+
+		/* Top right corner, with an extra space because blenfont is too strict! */
+		x= width - w - pad;
+		y= height - h;
+
+		/* extra space for background. */
+		buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x, y-3, x+w+pad, y+h+3);
+
+		BLF_position(x, y, 0.0);
+		BLF_draw_buffer(stamp_data.strip);
 	}
-#endif // 0 XXX	
+
+	/* cleanup the buffer. */
+	BLF_buffer(NULL, NULL, 0, 0, 0);
 }
 
 void BKE_stamp_info(Scene *scene, struct ImBuf *ibuf)

From c9795eae45c278460e27ae7f5937ca9bd1300531 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Tue, 18 Aug 2009 19:58:27 +0000
Subject: [PATCH 127/577] Fixed the texture preview to work with multi-output
 node-based textures.

---
 release/ui/buttons_texture.py                 | 11 ++++---
 .../editors/include/ED_previewrender.h        |  5 +--
 source/blender/editors/include/UI_interface.h |  5 +--
 source/blender/editors/interface/interface.c  |  5 +--
 .../editors/interface/interface_intern.h      |  5 +--
 .../editors/interface/interface_templates.c   |  4 +--
 .../editors/interface/interface_widgets.c     |  2 +-
 .../blender/editors/preview/previewrender.c   | 13 ++++++--
 .../blender/editors/space_node/space_node.c   |  2 +-
 source/blender/makesrna/intern/rna_texture.c  | 32 ++++++++++++++++---
 source/blender/makesrna/intern/rna_ui_api.c   |  1 +
 11 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 18c836f9080..29e43981fd2 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -17,21 +17,22 @@ class TEXTURE_PT_preview(TextureButtonsPanel):
 		layout = self.layout
 		
 		tex = context.texture
+		slot = context.texture_slot
 		ma = context.material
 		la = context.lamp
 		wo = context.world
 		br = context.brush
 		
 		if ma:
-			layout.template_preview(tex, parent=ma)
+			layout.template_preview(tex, parent=ma, slot=slot)
 		elif la:
-			layout.template_preview(tex, parent=la)
+			layout.template_preview(tex, parent=la, slot=slot)
 		elif wo:
-			layout.template_preview(tex, parent=wo)
+			layout.template_preview(tex, parent=wo, slot=slot)
 		elif br:
-			layout.template_preview(tex, parent=br)
+			layout.template_preview(tex, parent=br, slot=slot)
 		else:
-			layout.template_preview(tex)
+			layout.template_preview(tex, slot=slot)
 			
 class TEXTURE_PT_context_texture(TextureButtonsPanel):
 	__show_header__ = False
diff --git a/source/blender/editors/include/ED_previewrender.h b/source/blender/editors/include/ED_previewrender.h
index 41cbecb5353..7e0d71db7e1 100644
--- a/source/blender/editors/include/ED_previewrender.h
+++ b/source/blender/editors/include/ED_previewrender.h
@@ -34,6 +34,7 @@ struct Image;
 struct Render;
 struct bContext;
 struct ID;
+struct MTex;
 
 #define PREVIEW_RENDERSIZE 140
 
@@ -70,9 +71,9 @@ pr_method:
 void ED_preview_init_dbase(void);
 void ED_preview_free_dbase(void);
 
-void ED_preview_shader_job(const struct bContext *C, void *owner, struct ID *id, struct ID *parent, int sizex, int sizey);
+void ED_preview_shader_job(const struct bContext *C, void *owner, struct ID *id, struct ID *parent, struct MTex *slot, int sizex, int sizey);
 void ED_preview_iconrender(struct Scene *scene, struct ID *id, unsigned int *rect, int sizex, int sizey);
 
-void ED_preview_draw(const struct bContext *C, void *idp, void *parentp, rcti *rect);
+void ED_preview_draw(const struct bContext *C, void *idp, void *parentp, void *slot, rcti *rect);
 
 #endif
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 8da2702b603..46da4b507a7 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -60,6 +60,7 @@ struct Image;
 struct ImageUser;
 struct uiWidgetColors;
 struct Tex;
+struct MTex;
 
 typedef struct uiBut uiBut;
 typedef struct uiBlock uiBlock;
@@ -490,7 +491,7 @@ void	uiButSetNFunc		(uiBut *but,		uiButHandleNFunc func, void *argN, void *arg2)
 
 void	uiButSetCompleteFunc(uiBut *but,		uiButCompleteFunc func, void *arg);
 
-void 	uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)(const struct bContext *C, void *, void *, struct rcti *rect), void *arg);
+void 	uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)(const struct bContext *C, void *, void *, void *, struct rcti *rect), void *arg1, void *arg2);
 
 /* Autocomplete
  *
@@ -630,7 +631,7 @@ void uiTemplateID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr,
 	char *newop, char *unlinkop);
 uiLayout *uiTemplateModifier(uiLayout *layout, struct PointerRNA *ptr);
 uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr);
-void uiTemplatePreview(uiLayout *layout, struct ID *id, struct ID *parent);
+void uiTemplatePreview(uiLayout *layout, struct ID *id, struct ID *parent, struct MTex *slot);
 void uiTemplateColorRamp(uiLayout *layout, struct ColorBand *coba, int expand);
 void uiTemplateCurveMapping(uiLayout *layout, struct CurveMapping *cumap, int type, int compact);
 void uiTemplateTriColorSet(uiLayout *layout, struct PointerRNA *ptr, char *propname);
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 4f6c6db3b16..92a3a4cf841 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2931,10 +2931,11 @@ void uiButSetRenameFunc(uiBut *but, uiButHandleRenameFunc func, void *arg1)
 	but->rename_arg1= arg1;
 }
 
-void uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)(const bContext *C, void *idv, void *argv, rcti *rect), void *arg)
+void uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)(const bContext *C, void *idv, void *arg1, void *arg2, rcti *rect), void *arg1, void *arg2)
 {
 	block->drawextra= func;
-	block->drawextra_arg= arg;
+	block->drawextra_arg1= arg1;
+	block->drawextra_arg2= arg2;
 }
 
 void uiButSetFunc(uiBut *but, uiButHandleFunc func, void *arg1, void *arg2)
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index fbf95a4cde8..9ef5d65b69f 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -273,8 +273,9 @@ struct uiBlock {
 	int (*block_event_func)(const struct bContext *C, struct uiBlock *, struct wmEvent *);
 	
 	/* extra draw function for custom blocks */
-	void (*drawextra)(const struct bContext *C, void *idv, void *argv, rcti *rect);
-	void *drawextra_arg;
+	void (*drawextra)(const struct bContext *C, void *idv, void *arg1, void *arg2, rcti *rect);
+	void *drawextra_arg1;
+	void *drawextra_arg2;
 
 	int afterval, flag;
 	
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 0ee21cbcf77..0557512cc2a 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1088,7 +1088,7 @@ static void do_preview_buttons(bContext *C, void *arg, int event)
 	}
 }
 
-void uiTemplatePreview(uiLayout *layout, ID *id, ID *parent)
+void uiTemplatePreview(uiLayout *layout, ID *id, ID *parent, MTex *slot)
 {
 	uiLayout *row, *col;
 	uiBlock *block;
@@ -1129,7 +1129,7 @@ void uiTemplatePreview(uiLayout *layout, ID *id, ID *parent)
 	
 	/* add preview */
 	uiDefBut(block, BUT_EXTRA, 0, "", 0, 0, UI_UNIT_X*6, UI_UNIT_Y*6, pid, 0.0, 0.0, 0, 0, "");
-	uiBlockSetDrawExtraFunc(block, ED_preview_draw, pparent);
+	uiBlockSetDrawExtraFunc(block, ED_preview_draw, pparent, slot);
 	uiBlockSetHandleFunc(block, do_preview_buttons, NULL);
 	
 	/* add buttons */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index cea3038b901..2e0f0897af4 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2065,7 +2065,7 @@ static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType *
 	
 	if(but->block->drawextra) {
 		/* note: drawextra can change rect +1 or -1, to match round errors of existing previews */
-		but->block->drawextra(C, but->poin, but->block->drawextra_arg, rect);
+		but->block->drawextra(C, but->poin, but->block->drawextra_arg1, but->block->drawextra_arg2, rect);
 		
 		/* make mask to draw over image */
 		UI_GetThemeColor3ubv(TH_BACK, col);
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c
index 159e644bb39..8fcf65202ee 100644
--- a/source/blender/editors/preview/previewrender.c
+++ b/source/blender/editors/preview/previewrender.c
@@ -113,6 +113,7 @@ typedef struct ShaderPreview {
 	Scene *scene;
 	ID *id;
 	ID *parent;
+	MTex *slot;
 	
 	int sizex, sizey;
 	int *pr_rect;
@@ -364,6 +365,10 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre
 					Material *mat= give_current_material(base->object, base->object->actcol);
 					if(mat && mat->mtex[0]) {
 						mat->mtex[0]->tex= tex;
+						
+						if(sp && sp->slot)
+							mat->mtex[0]->which_output = sp->slot->which_output;
+						
 						/* show alpha in this case */
 						if(tex==NULL || (tex->flag & TEX_PRV_ALPHA)) {
 							mat->mtex[0]->mapto |= MAP_ALPHA;
@@ -457,13 +462,14 @@ static int ed_preview_draw_rect(ScrArea *sa, Scene *sce, ID *id, int split, int
 	return 0;
 }
 
-void ED_preview_draw(const bContext *C, void *idp, void *parentp, rcti *rect)
+void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, rcti *rect)
 {
 	if(idp) {
 		ScrArea *sa= CTX_wm_area(C);
 		Scene *sce = CTX_data_scene(C);
 		ID *id = (ID *)idp;
 		ID *parent= (ID *)parentp;
+		MTex *slot= (MTex *)slotp;
 		SpaceButs *sbuts= sa->spacedata.first;
 		rcti newrect;
 		int ok;
@@ -491,7 +497,7 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, rcti *rect)
 		}
 		
 		if(ok==0) {
-			ED_preview_shader_job(C, sa, id, parent, newx, newy);
+			ED_preview_shader_job(C, sa, id, parent, slot, newx, newy);
 		}
 	}	
 }
@@ -932,7 +938,7 @@ static void shader_preview_free(void *customdata)
 	MEM_freeN(sp);
 }
 
-void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, int sizex, int sizey)
+void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, MTex *slot, int sizex, int sizey)
 {
 	wmJob *steve;
 	ShaderPreview *sp;
@@ -952,6 +958,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, i
 	sp->pr_method= PR_DO_RENDER;
 	sp->id = id;
 	sp->parent= parent;
+	sp->slot= slot;
 	
 	/* setup job */
 	WM_jobs_customdata(steve, sp, shader_preview_free);
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 5db9d7331b8..07277fe878d 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -174,7 +174,7 @@ static void node_area_refresh(const struct bContext *C, struct ScrArea *sa)
 		if(snode->treetype==NTREE_SHADER) {
 			Material *ma= (Material *)snode->id;
 			if(ma->use_nodes)
-				ED_preview_shader_job(C, sa, snode->id, NULL, 100, 100);
+				ED_preview_shader_job(C, sa, snode->id, NULL, NULL, 100, 100);
 		}
 		else if(snode->treetype==NTREE_COMPOSIT) {
 			Scene *scene= (Scene *)snode->id;
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 76cb9986306..a5737536b7d 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -110,6 +110,30 @@ static void rna_TextureSlot_name_get(PointerRNA *ptr, char *str)
 		strcpy(str, "");
 }
 
+static int rna_TextureSlot_output_node_get(PointerRNA *ptr)
+{
+	MTex *mtex= ptr->data;
+	Tex *tex= mtex->tex;
+	int cur= mtex->which_output;
+	
+	if(tex) {
+		bNodeTree *ntree= tex->nodetree;
+		bNode *node;
+		if(ntree) {
+			for(node= ntree->nodes.first; node; node= node->next) {
+				if(node->type == TEX_NODE_OUTPUT) {
+					if(cur == node->custom1)
+						return cur;
+				}
+			}
+		}
+	}
+	
+	mtex->which_output= 0;
+	return 0;
+}
+
+
 static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerRNA *ptr, int *free)
 {
 	MTex *mtex= ptr->data;
@@ -117,11 +141,9 @@ static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerR
 	EnumPropertyItem *item= NULL;
 	int totitem= 0;
 	
-	if(tex)
-	{
+	if(tex) {
 		bNodeTree *ntree= tex->nodetree;
-		if(ntree)
-		{
+		if(ntree) {
 			EnumPropertyItem tmp= {0, "", 0, "", ""};
 			bNode *node;
 			
@@ -433,7 +455,7 @@ static void rna_def_mtex(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "output_node", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "which_output");
 	RNA_def_property_enum_items(prop, output_node_items);
-	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_TextureSlot_output_node_itemf");
+	RNA_def_property_enum_funcs(prop, "rna_TextureSlot_output_node_get", NULL, "rna_TextureSlot_output_node_itemf");
 	RNA_def_property_ui_text(prop, "Output Node", "Which output node to use, for node-based textures.");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 }
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index f9287bddc10..82694098e69 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -244,6 +244,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	parm= RNA_def_pointer(func, "id", "ID", "", "ID datablock.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	parm= RNA_def_pointer(func, "parent", "ID", "", "ID datablock.");
+	parm= RNA_def_pointer(func, "slot", "TextureSlot", "", "Texture slot.");
 
 	func= RNA_def_function(srna, "template_curve_mapping", "uiTemplateCurveMapping");
 	parm= RNA_def_pointer(func, "curvemap", "CurveMapping", "", "Curve mapping pointer.");

From 074797731707fbfbd679095f0987478c05113c4d Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Tue, 18 Aug 2009 20:24:40 +0000
Subject: [PATCH 128/577] SVN maintenance.

---
 intern/guardedalloc/cpp/mallocn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp
index bb2839c7986..0ee22e734b9 100644
--- a/intern/guardedalloc/cpp/mallocn.cpp
+++ b/intern/guardedalloc/cpp/mallocn.cpp
@@ -1,5 +1,5 @@
 /**
- * $Id: mallocn.c 21060 2009-06-21 16:37:13Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or

From 05dec4a9d848c33e118c08d4e1067f8f10ebe901 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Tue, 18 Aug 2009 20:47:31 +0000
Subject: [PATCH 129/577] Scons compile fix.

Missing blenfont directory, caused error.
---
 source/blender/blenkernel/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 261d5ee1471..fdc7782a0b1 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('intern/*.c')
 
-incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include ../blenlib ../makesdna'
+incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include ../blenlib ../blenfont ../makesdna'
 incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna'
 incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
 incs += ' #/intern/iksolver/extern ../blenloader'

From 80cbcfed2740d252551baf3542502a240a59129b Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Tue, 18 Aug 2009 21:10:03 +0000
Subject: [PATCH 130/577] Fixed redraw issues in texture node tree.

---
 source/blender/editors/space_node/space_node.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 07277fe878d..877f9133e4a 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -181,6 +181,9 @@ static void node_area_refresh(const struct bContext *C, struct ScrArea *sa)
 			if(scene->use_nodes)
 				snode_composite_job(C, sa);
 		}
+		else if(snode->treetype==NTREE_TEXTURE) {
+			ntreeTexUpdatePreviews(snode->nodetree);
+		}
 	}
 }
 

From d96edd041ef18e53eb47aebdac94b2030979fc32 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Tue, 18 Aug 2009 21:14:36 +0000
Subject: [PATCH 131/577] 2.5:

* Fixed CMake includes for blenkernel
* Fixed an RNA property read that was causing failures in a couple paint modes
---
 source/blender/blenkernel/CMakeLists.txt          |  2 +-
 source/blender/editors/physics/editparticle.c     | 10 ++++++----
 source/blender/editors/sculpt_paint/paint_image.c | 12 ++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 516845b5b76..8d1df98c5b4 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(INC
   ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
   ../../../intern/iksolver/extern ../blenloader
   ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
-  ../../../intern/bsp/extern
+  ../../../intern/bsp/extern ../blenfont
   ../../../intern/audaspace/intern
   ${ZLIB_INC}
 )
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 0317a500196..b92632b45af 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -3068,11 +3068,13 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 	ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
 	ParticleBrushData *brush= &pset->brush[pset->brushtype];
 	ARegion *ar= CTX_wm_region(C);
-	float vec1[3], vec2[3];
+	float vec1[3], vec2[3], mousef[2];
 	short mval[2], mvalo[2];
 	int flip, mouse[2], dx, dy, removed= 0, selected= 0;
 
-	RNA_int_get_array(itemptr, "mouse", mouse);
+	RNA_float_get_array(itemptr, "mouse", mousef);
+	mouse[0] = mousef[0];
+	mouse[1] = mousef[1];
 	flip= RNA_boolean_get(itemptr, "flip");
 
 	if(bedit->first) {
@@ -3283,7 +3285,7 @@ static void brush_edit_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 {
 	ARegion *ar= CTX_wm_region(C);
 	PointerRNA itemptr;
-	int mouse[2];
+	float mouse[2];
 
 	mouse[0]= event->x - ar->winrct.xmin;
 	mouse[1]= event->y - ar->winrct.ymin;
@@ -3291,7 +3293,7 @@ static void brush_edit_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 	/* fill in stroke */
 	RNA_collection_add(op->ptr, "stroke", &itemptr);
 
-	RNA_int_set_array(&itemptr, "mouse", mouse);
+	RNA_float_set_array(&itemptr, "mouse", mouse);
 	RNA_boolean_set(&itemptr, "flip", event->shift != 0); // XXX hardcoded
 
 	/* apply */
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 975bfd8dbe7..465aa281e25 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -4612,11 +4612,13 @@ static int texture_paint_init(bContext *C, wmOperator *op)
 static void paint_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 {
 	PaintOperation *pop= op->customdata;
-	float time;
+	float time, mousef[2];
 	float pressure;
 	int mouse[2], redraw;
 
-	RNA_int_get_array(itemptr, "mouse", mouse);
+	RNA_float_get_array(itemptr, "mouse", mousef);
+	mouse[0] = mousef[0];
+	mouse[1] = mousef[1];
 	time= RNA_float_get(itemptr, "time");
 	pressure= RNA_float_get(itemptr, "pressure");
 
@@ -4696,7 +4698,7 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 	PaintOperation *pop= op->customdata;
 	wmTabletData *wmtab;
 	PointerRNA itemptr;
-	float pressure;
+	float pressure, mousef[2];
 	double time;
 	int tablet, mouse[2];
 
@@ -4737,7 +4739,9 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 	/* fill in stroke */
 	RNA_collection_add(op->ptr, "stroke", &itemptr);
 
-	RNA_int_set_array(&itemptr, "mouse", mouse);
+	mousef[0] = mouse[0];
+	mousef[1] = mouse[1];
+	RNA_float_set_array(&itemptr, "mouse", mousef);
 	RNA_float_set(&itemptr, "time", (float)(time - pop->starttime));
 	RNA_float_set(&itemptr, "pressure", pressure);
 

From d37d6738946bfecd2cf15f13e3067325bb227542 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Tue, 18 Aug 2009 21:19:29 +0000
Subject: [PATCH 132/577] Fix for my previous fix.

---
 source/blender/editors/space_node/node_draw.c  | 1 +
 source/blender/editors/space_node/space_node.c | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index f3df7a29c2e..93e7505693f 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -609,6 +609,7 @@ static void do_node_internal_buttons(bContext *C, void *node_v, int event)
 		}			
 		else if(snode->treetype==NTREE_TEXTURE) {
 			WM_event_add_notifier(C, NC_TEXTURE|ND_NODES, snode->id);
+			ntreeTexUpdatePreviews(snode->nodetree);
 		}
 	}
 	
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 877f9133e4a..07277fe878d 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -181,9 +181,6 @@ static void node_area_refresh(const struct bContext *C, struct ScrArea *sa)
 			if(scene->use_nodes)
 				snode_composite_job(C, sa);
 		}
-		else if(snode->treetype==NTREE_TEXTURE) {
-			ntreeTexUpdatePreviews(snode->nodetree);
-		}
 	}
 }
 

From e21c1dde810b3447eaa1f6a667ae027978b18d9b Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Wed, 19 Aug 2009 00:46:06 +0000
Subject: [PATCH 133/577] Texture node previews: Well and truly fixed.

(Probably.)
---
 source/blender/editors/space_node/node_draw.c  |  1 -
 source/blender/editors/space_node/space_node.c |  6 ++++++
 source/blender/nodes/intern/TEX_util.c         | 12 +++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 93e7505693f..f3df7a29c2e 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -609,7 +609,6 @@ static void do_node_internal_buttons(bContext *C, void *node_v, int event)
 		}			
 		else if(snode->treetype==NTREE_TEXTURE) {
 			WM_event_add_notifier(C, NC_TEXTURE|ND_NODES, snode->id);
-			ntreeTexUpdatePreviews(snode->nodetree);
 		}
 	}
 	
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 07277fe878d..20873566867 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -46,6 +46,7 @@
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_screen.h"
+#include "BKE_node.h"
 
 #include "ED_previewrender.h"
 #include "ED_space_api.h"
@@ -181,6 +182,11 @@ static void node_area_refresh(const struct bContext *C, struct ScrArea *sa)
 			if(scene->use_nodes)
 				snode_composite_job(C, sa);
 		}
+		else if(snode->treetype==NTREE_TEXTURE) {
+			Tex *tex= (Tex *)snode->id;
+			if(tex->use_nodes)
+				ntreeTexUpdatePreviews(tex->nodetree);
+		}
 	}
 }
 
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index 0bb9d887ae3..a6a5877722b 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -246,14 +246,12 @@ void ntreeTexUpdatePreviews(bNodeTree* nodetree)
 	
 	for(tex= G.main->tex.first; tex; tex= tex->id.next)
 		if(tex->nodetree == nodetree) break;
-	if(!tex) return;
-	
-	dummy_texres.nor = 0;
-	
-	ntreeBeginExecTree(nodetree);
-	ntreeTexExecTree(nodetree, &dummy_texres, coord, 0, 0, 1, 0, tex, 0, 0);
-	ntreeEndExecTree(nodetree);
+	if(tex) {
+		dummy_texres.nor = 0;
 	
+		ntreeBeginExecTree(nodetree);
+		ntreeTexExecTree(nodetree, &dummy_texres, coord, 0, 0, 1, 0, tex, 0, 0);
+	}
 }
 
 char* ntreeTexOutputMenu(bNodeTree *ntree)

From 184ac26dd0187d70985cdc49ae527a1900fce840 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 19 Aug 2009 00:55:30 +0000
Subject: [PATCH 134/577] 2.5: Headers

* Fix header menu spacing bug, and make it consistent for all headers.
* For consistency, always put menus first in the header, then any enums
  to switch the type of data displayed.
* Node editor header ported to python layout. Still quite a few
  operators missing to make the menus complete.
* RNA wrapped node editor, and added use_nodes property to material
  and scene.
---
 release/ui/space_buttons.py                   |   7 +-
 release/ui/space_console.py                   |  27 +-
 release/ui/space_filebrowser.py               |   2 +-
 release/ui/space_image.py                     |  15 +-
 release/ui/space_info.py                      |  17 +-
 release/ui/space_node.py                      | 121 ++++
 release/ui/space_outliner.py                  |   7 +-
 release/ui/space_sequencer.py                 |  30 +-
 release/ui/space_text.py                      |  21 +-
 release/ui/space_time.py                      |  11 +-
 release/ui/space_view3d.py                    |  17 +-
 source/blender/editors/armature/poselib.c     |   2 +-
 source/blender/editors/include/ED_node.h      |   9 +
 source/blender/editors/include/UI_interface.h |   2 +-
 .../editors/interface/interface_layout.c      |  24 +-
 .../editors/interface/interface_widgets.c     |   2 +-
 .../editors/space_action/action_header.c      |  14 +-
 .../editors/space_graph/graph_header.c        |  12 +-
 source/blender/editors/space_nla/nla_header.c |   4 +-
 source/blender/editors/space_node/node_edit.c |  33 +-
 .../blender/editors/space_node/node_header.c  | 670 +++---------------
 .../blender/editors/space_node/node_intern.h  |   5 +-
 .../blender/editors/space_node/node_state.c   |   6 +-
 .../blender/editors/space_node/space_node.c   |  34 +-
 .../blender/editors/space_text/text_header.c  |  23 +-
 .../editors/space_view3d/view3d_header.c      |  48 +-
 source/blender/makesrna/intern/rna_main.c     |   2 +-
 source/blender/makesrna/intern/rna_material.c |  17 +
 source/blender/makesrna/intern/rna_scene.c    |  24 +-
 source/blender/makesrna/intern/rna_space.c    |  44 ++
 source/blender/makesrna/intern/rna_texture.c  |   6 +-
 source/blender/windowmanager/WM_types.h       |   1 +
 32 files changed, 510 insertions(+), 747 deletions(-)
 create mode 100644 release/ui/space_node.py

diff --git a/release/ui/space_buttons.py b/release/ui/space_buttons.py
index cf1c385e3dc..3cf782e615f 100644
--- a/release/ui/space_buttons.py
+++ b/release/ui/space_buttons.py
@@ -10,11 +10,12 @@ class Buttons_HT_header(bpy.types.Header):
 		so = context.space_data
 		scene = context.scene
 
-		layout.template_header()
+		row= layout.row(align=True)
+		row.template_header()
 
 		if context.area.show_menus:
-			row = layout.row(align=True)
-			row.itemM("Buttons_MT_view", text="View")
+			sub = row.row(align=True)
+			sub.itemM("Buttons_MT_view", text="View")
 			
 		row = layout.row()
 		row.itemR(so, "buttons_context", expand=True, text="")
diff --git a/release/ui/space_console.py b/release/ui/space_console.py
index 2cf41a1f88f..45cb2a856e1 100644
--- a/release/ui/space_console.py
+++ b/release/ui/space_console.py
@@ -12,17 +12,22 @@ class CONSOLE_HT_header(bpy.types.Header):
 		# text = sc.text
 		layout = self.layout
 
-		layout.template_header()
+		row= layout.row(align=True)
+		row.template_header()
 
-		row = layout.row()
-		row.itemR(sc, "console_type", expand=True)
+		if context.area.show_menus:
+			sub = row.row(align=True)
+
+			if sc.console_type == 'REPORT':
+				sub.itemM("CONSOLE_MT_report")
+			else:
+				sub.itemM("CONSOLE_MT_console")
+
+		layout.itemS()
+		layout.itemR(sc, "console_type", expand=True)
 
 		if sc.console_type == 'REPORT':
-			
-			if context.area.show_menus:
-				row = layout.row()
-				row.itemM("CONSOLE_MT_report")
-			
+			row = layout.row(align=True)
 			row.itemR(sc, "show_report_debug", text="Debug")
 			row.itemR(sc, "show_report_info", text="Info")
 			row.itemR(sc, "show_report_operator", text="Operators")
@@ -32,12 +37,6 @@ class CONSOLE_HT_header(bpy.types.Header):
 			row = layout.row()
 			row.enabled = sc.show_report_operator
 			row.itemO("console.report_replay")
-		
-		else:
-			if context.area.show_menus:
-				row = layout.row()
-				row.itemM("CONSOLE_MT_console")
-
 
 class CONSOLE_MT_console(bpy.types.Menu):
 	__space_type__ = "CONSOLE"
diff --git a/release/ui/space_filebrowser.py b/release/ui/space_filebrowser.py
index 0fecbdbfbba..51a8f3f78e8 100644
--- a/release/ui/space_filebrowser.py
+++ b/release/ui/space_filebrowser.py
@@ -10,7 +10,7 @@ class FILEBROWSER_HT_header(bpy.types.Header):
 		layout = self.layout
 		
 		params = st.params 
-		layout.template_header()
+		layout.template_header(menus=False)
 		
 		row = layout.row(align=True)
 		row.itemO("file.parent", text="", icon='ICON_FILE_PARENT')
diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index 7154bb8ae1c..090067120b1 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -205,23 +205,24 @@ class IMAGE_HT_header(bpy.types.Header):
 		show_paint = sima.show_paint
 		show_uvedit = sima.show_uvedit
 
-		layout.template_header()
+		row = layout.row(align=True)
+		row.template_header()
 
 		# menus
 		if context.area.show_menus:
-			row = layout.row()
-			row.itemM("IMAGE_MT_view")
+			sub = row.row(align=True)
+			sub.itemM("IMAGE_MT_view")
 
 			if show_uvedit:
-				row.itemM("IMAGE_MT_select")
+				sub.itemM("IMAGE_MT_select")
 
 			if ima and ima.dirty:
-				row.itemM("IMAGE_MT_image", text="Image*")
+				sub.itemM("IMAGE_MT_image", text="Image*")
 			else:
-				row.itemM("IMAGE_MT_image", text="Image")
+				sub.itemM("IMAGE_MT_image", text="Image")
 
 			if show_uvedit:
-				row.itemM("IMAGE_MT_uvs")
+				sub.itemM("IMAGE_MT_uvs")
 
 		layout.template_ID(sima, "image", new="image.new")
 
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index e0b5c770f29..770387498a2 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -9,18 +9,19 @@ class INFO_HT_header(bpy.types.Header):
 		
 		st = context.space_data
 		rd = context.scene.render_data
-		
-		layout.template_header()
+
+		row = layout.row(align=True)
+		row.template_header()
 
 		if context.area.show_menus:
-			row = layout.row()
-			row.itemM("INFO_MT_file")
-			row.itemM("INFO_MT_add")
+			sub = row.row(align=True)
+			sub.itemM("INFO_MT_file")
+			sub.itemM("INFO_MT_add")
 			if rd.use_game_engine:
-				row.itemM("INFO_MT_game")
+				sub.itemM("INFO_MT_game")
 			else:
-				row.itemM("INFO_MT_render")
-			row.itemM("INFO_MT_help")
+				sub.itemM("INFO_MT_render")
+			sub.itemM("INFO_MT_help")
 
 		layout.template_ID(context.window, "screen", new="screen.new", unlink="screen.delete")
 		layout.template_ID(context.screen, "scene", new="scene.new", unlink="scene.delete")
diff --git a/release/ui/space_node.py b/release/ui/space_node.py
new file mode 100644
index 00000000000..2e28cfc2eed
--- /dev/null
+++ b/release/ui/space_node.py
@@ -0,0 +1,121 @@
+
+import bpy
+
+class NODE_HT_header(bpy.types.Header):
+	__space_type__ = "NODE_EDITOR"
+
+	def draw(self, context):
+		layout = self.layout
+		snode = context.space_data
+
+		row = layout.row(align=True)
+		row.template_header()
+
+		if context.area.show_menus:
+			sub = row.row(align=True)
+			sub.itemM("NODE_MT_view")
+			sub.itemM("NODE_MT_select")
+			sub.itemM("NODE_MT_add")
+			sub.itemM("NODE_MT_node")
+
+		row = layout.row()
+		row.itemR(snode, "tree_type", text="", expand=True)
+
+		if snode.tree_type == 'MATERIAL':
+			ob = snode.id_from
+			id = snode.id
+			if ob:
+				layout.template_ID(ob, "active_material", new="material.new")
+			if id:
+				layout.itemR(id, "use_nodes", toggle=True)
+
+		elif snode.tree_type == 'TEXTURE':
+			row.itemR(snode, "texture_type", text="", expand=True)
+
+			id = snode.id
+			id_from = snode.id_from
+			if id_from:
+				layout.template_ID(id_from, "active_texture", new="texture.new")
+			if id:
+				layout.itemR(id, "use_nodes", toggle=True)
+
+		elif snode.tree_type == 'COMPOSITING':
+			id = snode.id
+
+			layout.itemR(id, "use_nodes", toggle=True)
+			layout.itemR(id.render_data, "free_unused_nodes", text="Free Unused", toggle=True)
+			layout.itemR(snode, "backdrop", toggle=True)
+
+class NODE_MT_view(bpy.types.Menu):
+	__space_type__ = "NODE_EDITOR"
+	__label__ = "View"
+
+	def draw(self, context):
+		layout = self.layout
+
+		# layout.itemO("grease_pencil..")
+		# layout.itemS()
+
+		layout.itemO("view2d.zoom_in")
+		layout.itemO("view2d.zoom_out")
+
+		layout.itemS()
+
+		layout.itemO("node.view_all")
+		layout.itemO("screen.screen_full_area")
+
+class NODE_MT_select(bpy.types.Menu):
+	__space_type__ = "NODE_EDITOR"
+	__label__ = "Select"
+
+	def draw(self, context):
+		layout = self.layout
+
+		layout.itemO("node.select_border")
+
+		# XXX
+		# layout.itemS()
+		# layout.itemO("node.select_all")
+		# layout.itemO("node.select_linked_from")
+		# layout.itemO("node.select_linked_to")
+
+class NODE_MT_node(bpy.types.Menu):
+	__space_type__ = "NODE_EDITOR"
+	__label__ = "Node"
+
+	def draw(self, context):
+		layout = self.layout
+
+		layout.itemO("tfm.translate")
+		layout.itemO("tfm.resize")
+		layout.itemO("tfm.rotate")
+
+		layout.itemS()
+
+		layout.itemO("node.duplicate")
+		layout.itemO("node.delete")
+
+		# XXX
+		# layout.itemS()
+		# layout.itemO("node.make_link")
+		# layout.itemS()
+		# layout.itemO("node.edit_group")
+		# layout.itemO("node.ungroup")
+		# layout.itemO("node.group")
+		# layout.itemO("node.make_link")
+
+		layout.itemS()
+
+		layout.itemO("node.visibility_toggle")
+
+		# XXX
+		# layout.itemO("node.rename")
+		# layout.itemS()
+		# layout.itemO("node.show_cyclic_dependencies")
+
+
+bpy.types.register(NODE_HT_header)
+bpy.types.register(NODE_MT_view)
+bpy.types.register(NODE_MT_select)
+bpy.types.register(NODE_MT_node)
+
diff --git a/release/ui/space_outliner.py b/release/ui/space_outliner.py
index 5815acc7e12..f55f4633a7b 100644
--- a/release/ui/space_outliner.py
+++ b/release/ui/space_outliner.py
@@ -9,11 +9,12 @@ class OUTLINER_HT_header(bpy.types.Header):
 		sce = context.scene
 		layout = self.layout
 
-		layout.template_header()
+		row = layout.row(align=True)
+		row.template_header()
 
 		if context.area.show_menus:
-			row = layout.row(align=True)
-			row.itemM("OUTLINER_MT_view")
+			sub = row.row(align=True)
+			sub.itemM("OUTLINER_MT_view")
 			
 		row = layout.row()
 		row.itemR(so, "display_mode", text="")
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index a29e0fad895..1edcf32d3b5 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -14,24 +14,28 @@ class SEQUENCER_HT_header(bpy.types.Header):
 		
 		st = context.space_data
 
-		layout.template_header()
+		row = layout.row(align=True)
+		row.template_header()
 		
 		if context.area.show_menus:
-			row = layout.row()
-			row.itemR(st, "display_mode", text="")
-			row.itemM("SEQUENCER_MT_view")
+			sub = row.row(align=True)
+			sub.itemM("SEQUENCER_MT_view")
 			
-			layout.itemS()
+			row.itemS()
 			
 			if st.display_mode == 'SEQUENCER':
-				row.itemM("SEQUENCER_MT_select")
-				row.itemM("SEQUENCER_MT_marker")
-				row.itemM("SEQUENCER_MT_add")
-				row.itemM("SEQUENCER_MT_strip")
-				layout.itemS()
-				row.itemO("sequencer.reload")
-			else:
-				row.itemR(st, "display_channel", text="Channel")
+				sub.itemM("SEQUENCER_MT_select")
+				sub.itemM("SEQUENCER_MT_marker")
+				sub.itemM("SEQUENCER_MT_add")
+				sub.itemM("SEQUENCER_MT_strip")
+
+		layout.itemR(st, "display_mode", text="")
+
+		if st.display_mode == 'SEQUENCER':
+			layout.itemS()
+			layout.itemO("sequencer.reload")
+		else:
+			layout.itemR(st, "display_channel", text="Channel")
 
 class SEQUENCER_MT_view(bpy.types.Menu):
 	__space_type__ = "SEQUENCE_EDITOR"
diff --git a/release/ui/space_text.py b/release/ui/space_text.py
index c54073c2938..61e8d3489a5 100644
--- a/release/ui/space_text.py
+++ b/release/ui/space_text.py
@@ -9,27 +9,28 @@ class TEXT_HT_header(bpy.types.Header):
 		text = st.text
 		layout = self.layout
 
-		layout.template_header()
+		row = layout.row(align=True)
+		row.template_header()
 
 		if context.area.show_menus:
-			row = layout.row()
-			row.itemM("TEXT_MT_text")
+			sub = row.row(align=True)
+			sub.itemM("TEXT_MT_text")
 			if text:
-				row.itemM("TEXT_MT_edit")
-				row.itemM("TEXT_MT_format")
+				sub.itemM("TEXT_MT_edit")
+				sub.itemM("TEXT_MT_format")
 
 		if text and text.modified:
 			row = layout.row()
 			# row.color(redalert)
 			row.itemO("text.resolve_conflict", text="", icon='ICON_HELP')
 
+		layout.template_ID(st, "text", new="text.new", unlink="text.unlink")
+
 		row = layout.row(align=True)
 		row.itemR(st, "line_numbers", text="")
 		row.itemR(st, "word_wrap", text="")
 		row.itemR(st, "syntax_highlight", text="")
 
-		layout.template_ID(st, "text", new="text.new", unlink="text.unlink")
-
 		if text:
 			row = layout.row()
 			if text.filename != "":
@@ -123,6 +124,10 @@ class TEXT_MT_text(bpy.types.Menu):
 			# XXX if(BPY_is_pyconstraint(text))
 			# XXX   uiMenuItemO(head, 0, "text.refresh_pyconstraints");
 			#endif
+
+		layout.itemS()
+
+		layout.itemO("text.properties", icon="ICON_MENU_PANEL")
 		
 		#ifndef DISABLE_PYTHON
 		# XXX layout.column()
@@ -219,7 +224,7 @@ class TEXT_MT_edit(bpy.types.Menu):
 		layout.itemS()
 
 		layout.itemO("text.jump")
-		layout.itemO("text.properties")
+		layout.itemO("text.properties", text="Find...")
 
 		layout.itemS()
 
diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 785d11a8fc5..d1c9f9806f3 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -13,13 +13,14 @@ class TIME_HT_header(bpy.types.Header):
 		tools = context.tool_settings
 		screen = context.screen
 
-		layout.template_header()
+		row = layout.row(align=True)
+		row.template_header()
 
 		if context.area.show_menus:
-			row = layout.row()
-			row.itemM("TIME_MT_view")
-			row.itemM("TIME_MT_frame")
-			row.itemM("TIME_MT_playback")
+			sub = row.row(align=True)
+			sub.itemM("TIME_MT_view")
+			sub.itemM("TIME_MT_frame")
+			sub.itemM("TIME_MT_playback")
 
 		layout.itemR(scene, "use_preview_range", text="PR", toggle=True)
 		
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 1a5dd6b148c..44b1c82ff46 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -13,25 +13,26 @@ class VIEW3D_HT_header(bpy.types.Header):
 		mode_string = context.mode
 		edit_object = context.edit_object
 		
-		layout.template_header()
-		
+		row = layout.row(align=True)
+		row.template_header()
+
 		# Menus
 		if context.area.show_menus:
-			row = layout.row()
+			sub = row.row(align=True)
 
-			row.itemM("VIEW3D_MT_view")
+			sub.itemM("VIEW3D_MT_view")
 			
 			# Select Menu
 			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
 				# XXX: Particle Mode has Select Menu.
-				row.itemM("VIEW3D_MT_select_%s" % mode_string)
+				sub.itemM("VIEW3D_MT_select_%s" % mode_string)
 			
 			if mode_string == 'OBJECT':
-				row.itemM("VIEW3D_MT_object")
+				sub.itemM("VIEW3D_MT_object")
 			elif mode_string == 'SCULPT':
-				row.itemM("VIEW3D_MT_sculpt")
+				sub.itemM("VIEW3D_MT_sculpt")
 			elif edit_object:
-				row.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
+				sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
 
 		layout.template_header_3D()
 
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c
index ef2e5188487..021bec05a3b 100644
--- a/source/blender/editors/armature/poselib.c
+++ b/source/blender/editors/armature/poselib.c
@@ -342,7 +342,7 @@ static int poselib_add_menu_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 		uiItemIntO(layout, "Add New (Current Frame)", 0, "POSELIB_OT_pose_add", "frame", CFRA);
 		
 		/* replace existing - submenu */
-		uiItemMenuF(layout, "Replace Existing...", 0, poselib_add_menu_invoke__replacemenu);
+		uiItemMenuF(layout, "Replace Existing...", 0, poselib_add_menu_invoke__replacemenu, NULL);
 	}
 	
 	uiPupMenuEnd(C, pup);
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index 0cd5551f17f..bf4632dc3da 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -28,8 +28,17 @@
 #ifndef ED_NODE_H
 #define ED_NODE_H
 
+struct Material;
+struct Scene;
+struct Tex;
+
 /* drawnode.c */
 void ED_init_node_butfuncs(void);
 
+/* node_edit.c */
+void ED_node_shader_default(struct Material *ma);
+void ED_node_composit_default(struct Scene *sce);
+void ED_node_texture_default(struct Tex *tex);;
+
 #endif /* ED_NODE_H */
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 46da4b507a7..42280ad17c9 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -678,7 +678,7 @@ void uiItemM(uiLayout *layout, struct bContext *C, char *name, int icon, char *m
 void uiItemV(uiLayout *layout, char *name, int icon, int argval); /* value */
 void uiItemS(uiLayout *layout); /* separator */
 
-void uiItemMenuF(uiLayout *layout, char *name, int icon, uiMenuCreateFunc func);
+void uiItemMenuF(uiLayout *layout, char *name, int icon, uiMenuCreateFunc func, void *arg);
 void uiItemMenuEnumO(uiLayout *layout, char *name, int icon, char *opname, char *propname);
 void uiItemMenuEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname);
 
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index dee486b6b93..fc4f7da56d2 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -215,16 +215,16 @@ static int ui_layout_vary_direction(uiLayout *layout)
 }
 
 /* estimated size of text + icon */
-static int ui_text_icon_width(uiLayout *layout, char *name, int icon)
+static int ui_text_icon_width(uiLayout *layout, char *name, int icon, int compact)
 {
 	int variable = ui_layout_vary_direction(layout) == UI_ITEM_VARY_X;
 
 	if(icon && !name[0])
 		return UI_UNIT_X; /* icon only */
 	else if(icon)
-		return (variable)? UI_GetStringWidth(name) + 10 + UI_UNIT_X: 10*UI_UNIT_X; /* icon + text */
+		return (variable)? UI_GetStringWidth(name) + (compact? 5: 10) + UI_UNIT_X: 10*UI_UNIT_X; /* icon + text */
 	else
-		return (variable)? UI_GetStringWidth(name) + 10 + UI_UNIT_X: 10*UI_UNIT_X; /* text only */
+		return (variable)? UI_GetStringWidth(name) + (compact? 5: 10) + UI_UNIT_X: 10*UI_UNIT_X; /* text only */
 }
 
 static void ui_item_size(uiItem *item, int *r_w, int *r_h)
@@ -433,7 +433,7 @@ static void ui_item_enum_row(uiLayout *layout, uiBlock *block, PointerRNA *ptr,
 		name= (!uiname || uiname[0])? (char*)item[a].name: "";
 		icon= item[a].icon;
 		value= item[a].value;
-		itemw= ui_text_icon_width(block->curlayout, name, icon);
+		itemw= ui_text_icon_width(block->curlayout, name, icon, 0);
 
 		if(icon && strcmp(name, "") != 0)
 			uiDefIconTextButR(block, ROW, 0, icon, name, 0, 0, itemw, h, ptr, identifier, -1, 0, value, -1, -1, NULL);
@@ -526,7 +526,7 @@ static void ui_item_disabled(uiLayout *layout, char *name)
 	if(!name)
 		name= "";
 
-	w= ui_text_icon_width(layout, name, 0);
+	w= ui_text_icon_width(layout, name, 0, 0);
 
 	but= uiDefBut(block, LABEL, 0, (char*)name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 	but->flag |= UI_BUT_DISABLED;
@@ -555,7 +555,7 @@ void uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, IDPropert
 	/* create button */
 	uiBlockSetCurLayout(block, layout);
 
-	w= ui_text_icon_width(layout, name, icon);
+	w= ui_text_icon_width(layout, name, icon, 0);
 
 	if(icon && strcmp(name, "") != 0)
 		but= uiDefIconTextButO(block, BUT, ot->idname, context, icon, (char*)name, 0, 0, w, UI_UNIT_Y, NULL);
@@ -746,7 +746,7 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PropertyRNA
 	else if(type == PROP_BOOLEAN && !name[0])
 		icon= ICON_DOT;
 
-	w= ui_text_icon_width(layout, name, icon);
+	w= ui_text_icon_width(layout, name, icon, 0);
 	h= UI_UNIT_Y;
 
 	/* increase height for arrays */
@@ -1112,7 +1112,7 @@ static void ui_item_menu(uiLayout *layout, char *name, int icon, uiMenuCreateFun
 	if(layout->root->type == UI_LAYOUT_MENU && !icon)
 		icon= ICON_BLANK1;
 
-	w= ui_text_icon_width(layout, name, icon);
+	w= ui_text_icon_width(layout, name, icon, 1);
 	h= UI_UNIT_Y;
 
 	if(layout->root->type == UI_LAYOUT_HEADER) /* ugly .. */
@@ -1170,7 +1170,7 @@ void uiItemL(uiLayout *layout, char *name, int icon)
 	if(layout->root->type == UI_LAYOUT_MENU && !icon)
 		icon= ICON_BLANK1;
 
-	w= ui_text_icon_width(layout, name, icon);
+	w= ui_text_icon_width(layout, name, icon, 0);
 
 	if(icon && strcmp(name, "") != 0)
 		but= uiDefIconTextBut(block, LABEL, 0, icon, (char*)name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
@@ -1195,7 +1195,7 @@ void uiItemV(uiLayout *layout, char *name, int icon, int argval)
 	if(layout->root->type == UI_LAYOUT_MENU && !icon)
 		icon= ICON_BLANK1;
 
-	w= ui_text_icon_width(layout, name, icon);
+	w= ui_text_icon_width(layout, name, icon, 0);
 
 	if(icon && strcmp(name, "") != 0)
 		uiDefIconTextButF(block, BUTM, 0, icon, (char*)name, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, argval, "");
@@ -1215,12 +1215,12 @@ void uiItemS(uiLayout *layout)
 }
 
 /* level items */
-void uiItemMenuF(uiLayout *layout, char *name, int icon, uiMenuCreateFunc func)
+void uiItemMenuF(uiLayout *layout, char *name, int icon, uiMenuCreateFunc func, void *arg)
 {
 	if(!func)
 		return;
 
-	ui_item_menu(layout, name, icon, func, NULL, NULL);
+	ui_item_menu(layout, name, icon, func, arg, NULL);
 }
 
 typedef struct MenuItemLevel {
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 2e0f0897af4..a70fbab1aa4 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1949,7 +1949,7 @@ static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int
 		widget_init(&wtb);
 		
 		/* fully rounded */
-		round_box_edges(&wtb, roundboxalign, rect, rad);
+		round_box_edges(&wtb, 15, rect, rad);
 		
 		widgetbase_draw(&wtb, wcol);
 	}
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index d3929a22342..e4750bd0a37 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -153,7 +153,7 @@ static void act_channelmenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void act_gplayermenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	//uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu);
+	//uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu, NULL, NULL);
 	//uiItemS(layout);
 	//uiItemO(layout, NULL, 0, "NLAEDIT_OT_duplicate");
 }
@@ -210,9 +210,9 @@ static void act_edit_expomenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void act_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiItemMenuF(layout, "Transform", 0, act_edit_transformmenu);
-	uiItemMenuF(layout, "Snap", 0, act_edit_snapmenu);
-	uiItemMenuF(layout, "Mirror", 0, act_edit_mirrormenu);
+	uiItemMenuF(layout, "Transform", 0, act_edit_transformmenu, NULL);
+	uiItemMenuF(layout, "Snap", 0, act_edit_snapmenu, NULL);
+	uiItemMenuF(layout, "Mirror", 0, act_edit_mirrormenu, NULL);
 	
 	uiItemS(layout);
 	
@@ -225,9 +225,9 @@ static void act_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	
 	uiItemS(layout);
 	
-	uiItemMenuF(layout, "Handle Type", 0, act_edit_handlesmenu);
-	uiItemMenuF(layout, "Interpolation Mode", 0, act_edit_ipomenu);
-	uiItemMenuF(layout, "Extrapolation Mode", 0, act_edit_expomenu);
+	uiItemMenuF(layout, "Handle Type", 0, act_edit_handlesmenu, NULL);
+	uiItemMenuF(layout, "Interpolation Mode", 0, act_edit_ipomenu, NULL);
+	uiItemMenuF(layout, "Extrapolation Mode", 0, act_edit_expomenu, NULL);
 	
 	uiItemS(layout);
 	
diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
index 2c9017db649..c4654972dcd 100644
--- a/source/blender/editors/space_graph/graph_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -201,9 +201,9 @@ static void graph_edit_expomenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void graph_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiItemMenuF(layout, "Transform", 0, graph_edit_transformmenu);
-	uiItemMenuF(layout, "Snap", 0, graph_edit_snapmenu);
-	uiItemMenuF(layout, "Mirror", 0, graph_edit_mirrormenu);
+	uiItemMenuF(layout, "Transform", 0, graph_edit_transformmenu, NULL);
+	uiItemMenuF(layout, "Snap", 0, graph_edit_snapmenu, NULL);
+	uiItemMenuF(layout, "Mirror", 0, graph_edit_mirrormenu, NULL);
 	
 	uiItemS(layout);
 	
@@ -217,9 +217,9 @@ static void graph_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	
 	uiItemS(layout);
 	
-	uiItemMenuF(layout, "Handle Type", 0, graph_edit_handlesmenu);
-	uiItemMenuF(layout, "Interpolation Mode", 0, graph_edit_ipomenu);
-	uiItemMenuF(layout, "Extrapolation Mode", 0, graph_edit_expomenu);
+	uiItemMenuF(layout, "Handle Type", 0, graph_edit_handlesmenu, NULL);
+	uiItemMenuF(layout, "Interpolation Mode", 0, graph_edit_ipomenu, NULL);
+	uiItemMenuF(layout, "Extrapolation Mode", 0, graph_edit_expomenu, NULL);
 	
 	uiItemS(layout);
 	
diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c
index 04c2db08bda..e507efb0a30 100644
--- a/source/blender/editors/space_nla/nla_header.c
+++ b/source/blender/editors/space_nla/nla_header.c
@@ -151,8 +151,8 @@ static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
 	Scene *scene= CTX_data_scene(C);
 	
-	uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu);
-	uiItemMenuF(layout, "Snap", 0, nla_edit_snapmenu);
+	uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu, NULL);
+	uiItemMenuF(layout, "Snap", 0, nla_edit_snapmenu, NULL);
 	
 	uiItemS(layout);
 	
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 20abcdf9f97..e1b612d74e1 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -485,7 +485,7 @@ static void texture_node_event(SpaceNode *snode, short event)
 #endif /* 0  */
 /* assumes nothing being done in ntree yet, sets the default in/out node */
 /* called from shading buttons or header */
-void node_shader_default(Material *ma)
+void ED_node_shader_default(Material *ma)
 {
 	bNode *in, *out;
 	bNodeSocket *fromsock, *tosock;
@@ -515,7 +515,7 @@ void node_shader_default(Material *ma)
 
 /* assumes nothing being done in ntree yet, sets the default in/out node */
 /* called from shading buttons or header */
-void node_composit_default(Scene *sce)
+void ED_node_composit_default(Scene *sce)
 {
 	bNode *in, *out;
 	bNodeSocket *fromsock, *tosock;
@@ -549,7 +549,7 @@ void node_composit_default(Scene *sce)
 
 /* assumes nothing being done in ntree yet, sets the default in/out node */
 /* called from shading buttons or header */
-void node_texture_default(Tex *tx)
+void ED_node_texture_default(Tex *tx)
 {
 	bNode *in, *out;
 	bNodeSocket *fromsock, *tosock;
@@ -591,7 +591,7 @@ void snode_set_context(SpaceNode *snode, Scene *scene)
 		if(ob) {
 			Material *ma= give_current_material(ob, ob->actcol);
 			if(ma) {
-				snode->from= material_from(ob, ob->actcol);
+				snode->from= &ob->id;
 				snode->id= &ma->id;
 				snode->nodetree= ma->nodetree;
 			}
@@ -613,7 +613,13 @@ void snode_set_context(SpaceNode *snode, Scene *scene)
 		if(snode->texfrom==SNODE_TEX_OBJECT) {
 			if(ob) {
 				tx= give_current_texture(ob, ob->actcol);
-				snode->from= (ID *)ob;
+
+				if(ob->type == OB_LAMP)
+					snode->from= (ID*)ob->data;
+				else
+					snode->from= (ID*)give_current_material(ob, ob->actcol);
+
+				/* from is not set fully for material nodes, should be ID + Node then */
 			}
 		}
 		else if(snode->texfrom==SNODE_TEX_WORLD) {
@@ -624,21 +630,18 @@ void snode_set_context(SpaceNode *snode, Scene *scene)
 			MTex *mtex= NULL;
 			Brush *brush= NULL;
 			
-			if(ob && ob->mode & OB_MODE_SCULPT) {
+			if(ob && (ob->mode & OB_MODE_SCULPT))
 				brush= paint_brush(&scene->toolsettings->sculpt->paint);
-			}
 			else
 				brush= paint_brush(&scene->toolsettings->imapaint.paint);
 
-			if(brush) {
-				if(brush && brush->texact != -1)
-					mtex= brush->mtex[brush->texact];
-			}
-			
-			if(mtex) {
-				snode->from= (ID *)scene;
+			if(brush && brush->texact != -1)
+				mtex= brush->mtex[brush->texact];
+
+			snode->from= (ID *)brush;
+
+			if(mtex)
 				tx= mtex->tex;
-			}
 		}
 		
 		if(tx) {
diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c
index 367242d1262..2abcd2f2135 100644
--- a/source/blender/editors/space_node/node_header.c
+++ b/source/blender/editors/space_node/node_header.c
@@ -45,6 +45,7 @@
 #include "BKE_screen.h"
 #include "BKE_node.h"
 #include "BKE_main.h"
+#include "BKE_utildefines.h"
 
 #include "ED_screen.h"
 #include "ED_types.h"
@@ -62,67 +63,9 @@
 
 #include "node_intern.h"
 
-/* ************************ header area region *********************** */
+/* ************************ add menu *********************** */
 
-static void do_node_selectmenu(bContext *C, void *arg, int event)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceNode *snode= CTX_wm_space_node(C); 
-	
-	/* functions in editnode.c assume there's a tree */
-	if(snode->nodetree==NULL)
-		return;
-	
-	switch(event) {
-		case 1: /* border select */
-			WM_operator_name_call(C, "NODE_OT_select_border", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 2: /* select/deselect all */
-			// XXX node_deselectall(snode, 1);
-			break;
-		case 3:	/* select linked in */
-			// XXX node_select_linked(snode, 0);
-			break;
-		case 4:	/* select linked out */
-			// XXX node_select_linked(snode, 1);
-			break;
-	}
-	
-	ED_area_tag_redraw(curarea);
-}
-
-static uiBlock *node_selectmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "node_selectmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_selectmenu, NULL);
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select/Deselect All|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Linked From|L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Linked To|Shift L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-void do_node_addmenu(bContext *C, void *arg, int event)
+static void do_node_add(bContext *C, void *arg, int event)
 {
 	SpaceNode *snode= CTX_wm_space_node(C);
 	bNode *node;
@@ -141,311 +84,125 @@ void do_node_addmenu(bContext *C, void *arg, int event)
 	snode_handle_recalc(C, snode);
 }
 
-static void node_make_addmenu(bContext *C, int nodeclass, uiBlock *block)
+static void node_auto_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclass)
 {
 	Main *bmain= CTX_data_main(C);
 	SpaceNode *snode= CTX_wm_space_node(C);
 	bNodeTree *ntree;
+	int nodeclass= GET_INT_FROM_POINTER(arg_nodeclass);
 	int tot= 0, a;
-	short yco= 0, menuwidth=120;
 	
 	ntree = snode->nodetree;
-	if(ntree) {
-		/* mostly taken from toolbox.c, node_add_sublevel() */
-		if(ntree) {
-			if(nodeclass==NODE_CLASS_GROUP) {
-				bNodeTree *ngroup= bmain->nodetree.first;
-				for(; ngroup; ngroup= ngroup->id.next)
-					if(ngroup->type==ntree->type)
-						tot++;
-			}
-			else {
-				bNodeType *type = ntree->alltypes.first;
-				while(type) {
-					if(type->nclass == nodeclass)
-						tot++;
-					type= type->next;
-				}
-			}
-		}	
-		
-		if(tot==0) {
-			uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-			return;
-		}
-		
-		if(nodeclass==NODE_CLASS_GROUP) {
-			bNodeTree *ngroup= bmain->nodetree.first;
-			for(tot=0, a=0; ngroup; ngroup= ngroup->id.next, tot++) {
-				if(ngroup->type==ntree->type) {
-					
-					uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, (ngroup->id.name+2), 0, 
-						yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1.0f, (float)(NODE_GROUP_MENU+tot), "");
-					a++;
-				}
-			}
-		}
-		else {
-			bNodeType *type;
-			int script=0;
-			for(a=0, type= ntree->alltypes.first; type; type=type->next) {
-				if( type->nclass == nodeclass && type->name) {
-					if(type->type == NODE_DYNAMIC) {
-						uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, type->name, 0, 
-							yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1.0f, (float)(NODE_DYNAMIC_MENU+script), "");
-						script++;
-					} else {
-					uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, type->name, 0, 
-						yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1.0f, (float)(type->type), "");
-					}
-					a++;
-				}
-			}
-		}
-	} else {
-		uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+
+	if(!ntree) {
+		uiItemS(layout);
 		return;
 	}
-}
 
-static uiBlock *node_add_inputmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-
-	block= uiBeginBlock(C, ar, "node_add_inputmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_INPUT, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_outputmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_outputmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_OUTPUT, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_colormenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_colormenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_OP_COLOR, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_vectormenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_vectormenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_OP_VECTOR, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_filtermenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_filtermenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_OP_FILTER, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_convertermenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_convertermenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_CONVERTOR, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_mattemenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_mattemenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_MATTE, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_distortmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_distortmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_DISTORT, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_patternmenu(bContext *C, ARegion *ar,  void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_patternmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_PATTERN, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_texturemenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_texturemenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_TEXTURE, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-static uiBlock *node_add_groupmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_groupmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_GROUP, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-static uiBlock *node_add_dynamicmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	
-	block= uiBeginBlock(C, ar, "node_add_dynamicmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	node_make_addmenu(C, NODE_CLASS_OP_DYNAMIC, block);
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-static uiBlock *node_addmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceNode *snode= CTX_wm_space_node(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "node_addmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_addmenu, NULL);
-	
-	if(snode->treetype==NTREE_SHADER) {
-		uiDefIconTextBlockBut(block, node_add_inputmenu, NULL, ICON_RIGHTARROW_THIN, "Input", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_outputmenu, NULL, ICON_RIGHTARROW_THIN, "Output", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_colormenu, NULL, ICON_RIGHTARROW_THIN, "Color", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_vectormenu, NULL, ICON_RIGHTARROW_THIN, "Vector", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_convertermenu, NULL, ICON_RIGHTARROW_THIN, "Convertor", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_groupmenu, NULL, ICON_RIGHTARROW_THIN, "Group", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_dynamicmenu, NULL, ICON_RIGHTARROW_THIN, "Dynamic", 0, yco-=20, 120, 19, "");
-	}
-	else if(snode->treetype==NTREE_COMPOSIT) {
-		uiDefIconTextBlockBut(block, node_add_inputmenu, NULL, ICON_RIGHTARROW_THIN, "Input", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_outputmenu, NULL, ICON_RIGHTARROW_THIN, "Output", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_colormenu, NULL, ICON_RIGHTARROW_THIN, "Color", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_vectormenu, NULL, ICON_RIGHTARROW_THIN, "Vector", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_filtermenu, NULL, ICON_RIGHTARROW_THIN, "Filter", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_convertermenu, NULL, ICON_RIGHTARROW_THIN, "Convertor", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_mattemenu, NULL, ICON_RIGHTARROW_THIN, "Matte", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_distortmenu, NULL, ICON_RIGHTARROW_THIN, "Distort", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_groupmenu, NULL, ICON_RIGHTARROW_THIN, "Group", 0, yco-=20, 120, 19, "");
-
-	} else if(snode->treetype==NTREE_TEXTURE) {
-		uiDefIconTextBlockBut(block, node_add_inputmenu, NULL, ICON_RIGHTARROW_THIN, "Input", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_outputmenu, NULL, ICON_RIGHTARROW_THIN, "Output", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_colormenu, NULL, ICON_RIGHTARROW_THIN, "Color", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_patternmenu, NULL, ICON_RIGHTARROW_THIN, "Patterns", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_texturemenu, NULL, ICON_RIGHTARROW_THIN, "Textures", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_convertermenu, NULL, ICON_RIGHTARROW_THIN, "Convertor", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_distortmenu, NULL, ICON_RIGHTARROW_THIN, "Distort", 0, yco-=20, 120, 19, "");
-		uiDefIconTextBlockBut(block, node_add_groupmenu, NULL, ICON_RIGHTARROW_THIN, "Group", 0, yco-=20, 120, 19, "");
-	}
-	else
-		uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");	
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
+	/* mostly taken from toolbox.c, node_add_sublevel() */
+	if(nodeclass==NODE_CLASS_GROUP) {
+		bNodeTree *ngroup= bmain->nodetree.first;
+		for(; ngroup; ngroup= ngroup->id.next)
+			if(ngroup->type==ntree->type)
+				tot++;
 	}
 	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
+		bNodeType *type = ntree->alltypes.first;
+		while(type) {
+			if(type->nclass == nodeclass)
+				tot++;
+			type= type->next;
+		}
+	}	
+	
+	if(tot==0) {
+		uiItemS(layout);
+		return;
 	}
+
+	uiLayoutSetFunc(layout, do_node_add, NULL);
 	
-	uiTextBoundsBlock(block, 50);
-	
-	return block;
+	if(nodeclass==NODE_CLASS_GROUP) {
+		bNodeTree *ngroup= bmain->nodetree.first;
+
+		for(tot=0, a=0; ngroup; ngroup= ngroup->id.next, tot++) {
+			if(ngroup->type==ntree->type) {
+				uiItemV(layout, ngroup->id.name+2, 0, NODE_GROUP_MENU+tot);
+				a++;
+			}
+		}
+	}
+	else {
+		bNodeType *type;
+		int script=0;
+
+		for(a=0, type= ntree->alltypes.first; type; type=type->next) {
+			if(type->nclass == nodeclass && type->name) {
+				if(type->type == NODE_DYNAMIC) {
+					uiItemV(layout, type->name, 0, NODE_DYNAMIC_MENU+script);
+					script++;
+				}
+				else
+					uiItemV(layout, type->name, 0, type->type);
+
+				a++;
+			}
+		}
+	}
 }
 
+static void node_menu_add(const bContext *C, Menu *menu)
+{
+	uiLayout *layout= menu->layout;
+	SpaceNode *snode= CTX_wm_space_node(C);
+
+	if(!snode->nodetree)
+		uiLayoutSetActive(layout, 0);
+
+	if(snode->treetype==NTREE_SHADER) {
+		uiItemMenuF(layout, "Input", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
+		uiItemMenuF(layout, "Output", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
+		uiItemMenuF(layout, "Color", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
+		uiItemMenuF(layout, "Vector", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_VECTOR));
+		uiItemMenuF(layout, "Convertor", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
+		uiItemMenuF(layout, "Group", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
+		uiItemMenuF(layout, "Dynamic", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_DYNAMIC));
+	}
+	else if(snode->treetype==NTREE_COMPOSIT) {
+		uiItemMenuF(layout, "Input", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
+		uiItemMenuF(layout, "Output", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
+		uiItemMenuF(layout, "Color", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
+		uiItemMenuF(layout, "Vector", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_VECTOR));
+		uiItemMenuF(layout, "Filter", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_FILTER));
+		uiItemMenuF(layout, "Convertor", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
+		uiItemMenuF(layout, "Matte", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_MATTE));
+		uiItemMenuF(layout, "Distort", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DISTORT));
+		uiItemMenuF(layout, "Group", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
+	}
+	else if(snode->treetype==NTREE_TEXTURE) {
+		uiItemMenuF(layout, "Input", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
+		uiItemMenuF(layout, "Output", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
+		uiItemMenuF(layout, "Color", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
+		uiItemMenuF(layout, "Patterns", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_PATTERN));
+		uiItemMenuF(layout, "Textures", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_TEXTURE));
+		uiItemMenuF(layout, "Convertor", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
+		uiItemMenuF(layout, "Distort", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DISTORT));
+		uiItemMenuF(layout, "Group", 0, node_auto_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
+	}
+}
+
+void node_menus_register(ARegionType *art)
+{
+	MenuType *mt;
+
+	mt= MEM_callocN(sizeof(MenuType), "spacetype node menu add");
+	strcpy(mt->idname, "NODE_MT_add");
+	strcpy(mt->label, "Add");
+	mt->draw= node_menu_add;
+	BLI_addtail(&art->menutypes, mt);
+}
+
+#if 0
 static void do_node_nodemenu(bContext *C, void *arg, int event)
 {
 	ScrArea *curarea= CTX_wm_area(C);
@@ -571,218 +328,5 @@ static uiBlock *node_nodemenu(bContext *C, ARegion *ar, void *arg_unused)
 	
 	return block;
 }
-
-static void do_node_viewmenu(bContext *C, void *arg, int event)
-{
-//	SpaceNode *snode= CTX_wm_space_node(C);
-//	ARegion *ar= CTX_wm_region(C);
-	ScrArea *sa= CTX_wm_area(C);
-	
-	switch(event) {
-		case 1: /* Zoom in */
-			WM_operator_name_call(C, "VIEW2D_OT_zoom_in", WM_OP_EXEC_REGION_WIN, NULL);
-			break;
-		case 2: /* View all */
-			WM_operator_name_call(C, "VIEW2D_OT_zoom_out", WM_OP_EXEC_REGION_WIN, NULL);
-			break;
-		case 3: /* View all */
-			WM_operator_name_call(C, "NODE_OT_view_all", WM_OP_EXEC_REGION_WIN, NULL);
-			break;
-		case 4: /* Grease Pencil */
-			// XXX add_blockhandler(sa, NODES_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
-			break;
-	}
-	ED_area_tag_redraw(sa);
-}
-
-static uiBlock *node_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceNode *snode= CTX_wm_space_node(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "node_viewmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_node_viewmenu, NULL);
-
-	if (snode->nodetree) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Grease Pencil...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
-		
-		uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	}
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Zoom In|NumPad +", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Zoom Out|NumPad -", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-	
-	/* XXX if (!curarea->full) 
-		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-	else 
-		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-	*/
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-static void do_node_buttons(bContext *C, void *arg, int event)
-{
-	// NODE_FIX_ME : instead of using "current material/texture/scene", node editor can also pin context?
-	// note: scene context better not gets overridden, that'll clash too much (ton)
-	SpaceNode *snode= CTX_wm_space_node(C);
-	Scene *scene= CTX_data_scene(C);
-	Material *ma;
-	Tex *tx;
-	
-	switch(event) {
-		case B_REDR:
-			ED_area_tag_redraw(CTX_wm_area(C));			
-			break;
-		case B_NODE_USEMAT:
-			ma= (Material *)snode->id;
-			if(ma) {
-				if(ma->use_nodes && ma->nodetree==NULL) {
-					node_shader_default(ma);
-					snode_set_context(snode, scene);
-				}
-			}		
-			ED_area_tag_redraw(CTX_wm_area(C));			
-			break;
-			
-		case B_NODE_USESCENE:
-			if(scene->use_nodes) {
-				if(scene->nodetree==NULL)
-					node_composit_default(scene);
-			}
-			snode_set_context(snode, scene);
-			ED_area_tag_redraw(CTX_wm_area(C));			
-			break;
-			
-		case B_NODE_USETEX:
-			tx = (Tex *)snode->id;
-			if(tx) {
-				tx->type = 0;
-				if(tx->use_nodes && tx->nodetree==NULL) {
-					node_texture_default(tx);
-					snode_set_context(snode, scene);
-				}
-			}
-			ED_area_tag_redraw(CTX_wm_area(C));			
-			break;
-	}
-}
-
-void node_header_buttons(const bContext *C, ARegion *ar)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	SpaceNode *snode= CTX_wm_space_node(C);
-	Scene *scene= CTX_data_scene(C);
-	uiBlock *block;
-	short xco, yco= 3;
-	
-	block= uiBeginBlock(C, ar, "header node", UI_EMBOSS);
-	uiBlockSetHandleFunc(block, do_node_buttons, NULL);
-	
-	xco= ED_area_header_standardbuttons(C, block, yco);
-	
-	if((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		int xmax;
-	
-		xmax= GetButStringLength("View");
-		uiDefPulldownBut(block, node_viewmenu, NULL, 
-					  "View", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Select");
-		uiDefPulldownBut(block, node_selectmenu, NULL, 
-						 "Select", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Add");
-		uiDefPulldownBut(block, node_addmenu, NULL, 
-						 "Add", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Node");
-		uiDefPulldownBut(block, node_nodemenu, NULL, 
-						 "Node", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-	}
-	
-	uiBlockSetEmboss(block, UI_EMBOSS);
-
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	/* main type choosing */
-	uiBlockBeginAlign(block);
-	uiDefIconButI(block, ROW, B_REDR, ICON_MATERIAL_DATA, xco,yco,XIC,YIC-2,
-				  &(snode->treetype), 2.0f, 0.0f, 0.0f, 0.0f, "Material Nodes");
-	xco+= XIC;
-	uiDefIconButI(block, ROW, B_REDR, ICON_IMAGE_DATA, xco,yco,XIC,YIC-2,
-				  &(snode->treetype), 2.0f, 1.0f, 0.0f, 0.0f, "Composite Nodes");
-	xco+= XIC;
-	uiDefIconButI(block, ROW, B_REDR, ICON_TEXTURE_DATA, xco,yco,XIC,YIC-2,
-				  &(snode->treetype), 2.0f, 2.0f, 0.0f, 0.0f, "Texture Nodes");
-	xco+= 2*XIC;
-	uiBlockEndAlign(block);
-
-	/* find and set the context */
-	snode_set_context(snode, scene);
-	
-	if(snode->treetype==NTREE_SHADER) {
-		if(snode->from) {
-										/* 0, NULL -> pin */
-			// XXX xco= std_libbuttons(block, xco, 0, 0, NULL, B_MATBROWSE, ID_MA, 1, snode->id, snode->from, &(snode->menunr), 
-			//   B_MATALONE, B_MATLOCAL, B_MATDELETE, B_AUTOMATNAME, B_KEEPDATA);
-			
-			if(snode->id) {
-				Material *ma= (Material *)snode->id;
-				uiDefButC(block, TOG, B_NODE_USEMAT, "Use Nodes", xco+5,yco,90,19, &ma->use_nodes, 0.0f, 0.0f, 0, 0, "");
-				xco+=80;
-			}
-		}
-	}
-	else if(snode->treetype==NTREE_COMPOSIT) {
-		int icon;
-		
-		if(WM_jobs_test(CTX_wm_manager(C), sa)) icon= ICON_REC; else icon= ICON_BLANK1;
-		uiDefIconTextButS(block, TOG, B_NODE_USESCENE, icon, "Use Nodes", xco+5,yco,100,19, &scene->use_nodes, 0.0f, 0.0f, 0, 0, "Indicate this Scene will use Nodes and execute them while editing");
-		xco+= 100;
-		uiDefButBitI(block, TOG, R_COMP_FREE, B_NOP, "Free Unused", xco+5,yco,100,19, &scene->r.scemode, 0.0f, 0.0f, 0, 0, "Free Nodes that are not used while composite");
-		xco+= 100;
-		uiDefButBitS(block, TOG, SNODE_BACKDRAW, B_REDR, "Backdrop", xco+5,yco,90,19, &snode->flag, 0.0f, 0.0f, 0, 0, "Use active Viewer Node output as backdrop");
-		xco+= 90;
-	}
-	else if(snode->treetype==NTREE_TEXTURE) {
-		if(snode->from) {
-			
-			// XXX xco= std_libbuttons(block, xco, 0, 0, NULL, B_TEXBROWSE, ID_TE, 1, snode->id, snode->from, &(snode->menunr), 
-			//		   B_TEXALONE, B_TEXLOCAL, B_TEXDELETE, B_AUTOTEXNAME, B_KEEPDATA);
-			
-			if(snode->id) {
-				Tex *tx= (Tex *)snode->id;
-				uiDefButC(block, TOG, B_NODE_USETEX, "Use Nodes", xco+5,yco,90,19, &tx->use_nodes, 0.0f, 0.0f, 0, 0, "");
-				xco+=80;
-			}
-		}
-	}
-	
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+100, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin));
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
-}
-
+#endif
 
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index d6680457376..5c66c902797 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -31,6 +31,7 @@
 /* internal exports only */
 
 struct ARegion;
+struct ARegionType;
 struct View2D;
 struct bContext;
 struct wmWindowManager;
@@ -45,6 +46,7 @@ struct wmWindowManager;
 
 /* node_header.c */
 void node_header_buttons(const bContext *C, ARegion *ar);
+void node_menus_register(struct ARegionType *art);
 
 /* node_draw.c */
 void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d);
@@ -75,9 +77,6 @@ void snode_make_group_editable(SpaceNode *snode, bNode *gnode);
 void snode_home(ScrArea *sa, ARegion *ar, SpaceNode *snode);
 void node_set_active(SpaceNode *snode, bNode *node);
 void node_deselectall(SpaceNode *snode, int swap);
-void node_shader_default(Material *ma);
-void node_composit_default(Scene *sce);
-void node_texture_default(Tex *tx);
 void snode_composite_job(const struct bContext *C, ScrArea *sa);
 bNode *snode_get_editgroup(SpaceNode *snode);
 void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag);
diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c
index 8d805490942..dcab3dc0895 100644
--- a/source/blender/editors/space_node/node_state.c
+++ b/source/blender/editors/space_node/node_state.c
@@ -183,7 +183,7 @@ void NODE_OT_visibility_toggle(wmOperatorType *ot)
 	RNA_def_int(ot->srna, "mouse_y", 0, INT_MIN, INT_MAX, "Mouse Y", "", INT_MIN, INT_MAX);
 }
 
-static int node_fit_all_exec(bContext *C, wmOperator *op)
+static int node_view_all_exec(bContext *C, wmOperator *op)
 {
 	ScrArea *sa= CTX_wm_area(C);
 	ARegion *ar= CTX_wm_region(C);
@@ -196,11 +196,11 @@ static int node_fit_all_exec(bContext *C, wmOperator *op)
 void NODE_OT_view_all(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Fit All";
+	ot->name= "View All";
 	ot->idname= "NODE_OT_view_all";
 	
 	/* api callbacks */
-	ot->exec= node_fit_all_exec;
+	ot->exec= node_view_all_exec;
 	ot->poll= ED_operator_node_active;
 	
 	/* flags */
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 20873566867..cb25d29fd27 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -254,29 +254,18 @@ static void node_main_area_draw(const bContext *C, ARegion *ar)
 /* add handlers, stuff you only do once or on area/region changes */
 static void node_header_area_init(wmWindowManager *wm, ARegion *ar)
 {
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
+	ED_region_header_init(ar);
 }
 
 static void node_header_area_draw(const bContext *C, ARegion *ar)
 {
-	float col[3];
-	
-	/* clear */
-	if(ED_screen_area_active(C))
-		UI_GetThemeColor3fv(TH_HEADER, col);
-	else
-		UI_GetThemeColor3fv(TH_HEADERDESEL, col);
-	
-	glClearColor(col[0], col[1], col[2], 0.0);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	/* set view2d view matrix for scrolling (without scrollers) */
-	UI_view2d_view_ortho(C, &ar->v2d);
-	
-	node_header_buttons(C, ar);
-	
-	/* restore view matrix? */
-	UI_view2d_view_restore(C);
+	SpaceNode *snode= CTX_wm_space_node(C);
+	Scene *scene= CTX_data_scene(C);
+
+    /* find and set the context */
+	snode_set_context(snode, scene);
+
+	ED_region_header(C, ar);
 }
 
 /* used for header + main area */
@@ -285,12 +274,9 @@ static void node_region_listener(ARegion *ar, wmNotifier *wmn)
 	/* context changes */
 	switch(wmn->category) {
 		case NC_SCENE:
-			ED_region_tag_redraw(ar);
-			break;
 		case NC_MATERIAL:
-			ED_region_tag_redraw(ar);
-			break;
 		case NC_TEXTURE:
+		case NC_NODE:
 			ED_region_tag_redraw(ar);
 			break;
 	}
@@ -357,6 +343,8 @@ void ED_spacetype_node(void)
 	art->draw= node_header_area_draw;
 	
 	BLI_addhead(&st->regiontypes, art);
+
+	node_menus_register(art);
 	
 #if 0
 	/* regions: channels */
diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c
index c761587198f..0e2d2ce1698 100644
--- a/source/blender/editors/space_text/text_header.c
+++ b/source/blender/editors/space_text/text_header.c
@@ -186,12 +186,18 @@ ARegion *text_has_properties_region(ScrArea *sa)
 	return arnew;
 }
 
+void text_toggle_properties_region(bContext *C, ScrArea *sa, ARegion *ar)
+{
+	ar->flag ^= RGN_FLAG_HIDDEN;
+	ar->v2d.flag &= ~V2D_IS_INITIALISED; /* XXX should become hide/unhide api? */
+	
+	ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
+	ED_area_tag_redraw(sa);
+}
+
 static int properties_poll(bContext *C)
 {
-	SpaceText *st= CTX_wm_space_text(C);
-	Text *text= CTX_data_edit_text(C);
-
-	return (st && text);
+	return (CTX_wm_space_text(C) != NULL);
 }
 
 static int properties_exec(bContext *C, wmOperator *op)
@@ -199,13 +205,8 @@ static int properties_exec(bContext *C, wmOperator *op)
 	ScrArea *sa= CTX_wm_area(C);
 	ARegion *ar= text_has_properties_region(sa);
 	
-	if(ar) {
-		ar->flag ^= RGN_FLAG_HIDDEN;
-		ar->v2d.flag &= ~V2D_IS_INITIALISED; /* XXX should become hide/unhide api? */
-		
-		ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
-		ED_area_tag_redraw(sa);
-	}
+	if(ar)
+		text_toggle_properties_region(C, sa, ar);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 2a7b718a664..6c86c87302c 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -2092,7 +2092,7 @@ static void view3d_edit_meshmenu(bContext *C, uiLayout *layout, void *arg_unused
 	uiDefIconTextBlockBut(block, view3d_edit_snapmenu, NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 19, "");
 #endif
 
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu);
+	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
 
 	uiItemS(layout);
 
@@ -2113,10 +2113,10 @@ static void view3d_edit_meshmenu(bContext *C, uiLayout *layout, void *arg_unused
 
 	uiItemS(layout);
 
-	uiItemMenuF(layout, "Vertices", 0, view3d_edit_mesh_verticesmenu);
-	uiItemMenuF(layout, "Edges", 0, view3d_edit_mesh_edgesmenu);
-	uiItemMenuF(layout, "Faces", 0, view3d_edit_mesh_facesmenu);
-	uiItemMenuF(layout, "Normals", 0, view3d_edit_mesh_normalsmenu);
+	uiItemMenuF(layout, "Vertices", 0, view3d_edit_mesh_verticesmenu, NULL);
+	uiItemMenuF(layout, "Edges", 0, view3d_edit_mesh_edgesmenu, NULL);
+	uiItemMenuF(layout, "Faces", 0, view3d_edit_mesh_facesmenu, NULL);
+	uiItemMenuF(layout, "Normals", 0, view3d_edit_mesh_normalsmenu, NULL);
 
 	uiItemS(layout);
 
@@ -2126,7 +2126,7 @@ static void view3d_edit_meshmenu(bContext *C, uiLayout *layout, void *arg_unused
 
 	uiItemS(layout);
 
-	uiItemMenuF(layout, "Show/Hide", 0, view3d_edit_mesh_showhidemenu);
+	uiItemMenuF(layout, "Show/Hide", 0, view3d_edit_mesh_showhidemenu, NULL);
 
 #if 0
 #ifndef DISABLE_PYTHON
@@ -2180,7 +2180,7 @@ static void view3d_edit_curvemenu(bContext *C, uiLayout *layout, void *arg_unuse
 	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");	
 #endif
 
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu);
+	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
 
 	uiItemS(layout);
 	
@@ -2199,8 +2199,8 @@ static void view3d_edit_curvemenu(bContext *C, uiLayout *layout, void *arg_unuse
 
 	uiItemS(layout);
 
-	uiItemMenuF(layout, "Control Points", 0, view3d_edit_curve_controlpointsmenu);
-	uiItemMenuF(layout, "Segments", 0, view3d_edit_curve_segmentsmenu);
+	uiItemMenuF(layout, "Control Points", 0, view3d_edit_curve_controlpointsmenu, NULL);
+	uiItemMenuF(layout, "Segments", 0, view3d_edit_curve_segmentsmenu, NULL);
 
 	uiItemS(layout);
 
@@ -2209,7 +2209,7 @@ static void view3d_edit_curvemenu(bContext *C, uiLayout *layout, void *arg_unuse
 
 	uiItemS(layout);
 
-	uiItemMenuF(layout, "Show/Hide Control Points", 0, view3d_edit_curve_showhidemenu);
+	uiItemMenuF(layout, "Show/Hide Control Points", 0, view3d_edit_curve_showhidemenu, NULL);
 }
 #endif
 
@@ -2232,7 +2232,7 @@ static void view3d_edit_latticemenu(bContext *C, uiLayout *layout, void *arg_unu
 	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");		
 #endif
 
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu);
+	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
 
 	uiItemS(layout);
 
@@ -2287,8 +2287,8 @@ static void view3d_edit_armaturemenu(bContext *C, uiLayout *layout, void *arg_un
 	uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
 	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");
 #endif
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu);
-	uiItemMenuF(layout, "Bone Roll", 0, view3d_edit_armature_rollmenu);
+	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
+	uiItemMenuF(layout, "Bone Roll", 0, view3d_edit_armature_rollmenu, NULL);
 	
 	if (arm->drawtype == ARM_ENVELOPE)
 		uiItemEnumO(layout, "Scale Envelope Distance", 0, "TFM_OT_transform", "mode", TFM_BONESIZE);
@@ -2325,11 +2325,11 @@ static void view3d_edit_armaturemenu(bContext *C, uiLayout *layout, void *arg_un
 	
 	uiItemS(layout);
 	
-	uiItemMenuF(layout, "Parent", 0, view3d_edit_armature_parentmenu);
+	uiItemMenuF(layout, "Parent", 0, view3d_edit_armature_parentmenu, NULL);
 	
 	uiItemS(layout);
 	
-	uiItemMenuF(layout, "Bone Settings ", 0, view3d_edit_armature_settingsmenu);
+	uiItemMenuF(layout, "Bone Settings ", 0, view3d_edit_armature_settingsmenu, NULL);
 }
 #endif
 
@@ -2430,7 +2430,7 @@ static void view3d_pose_armaturemenu(bContext *C, uiLayout *layout, void *arg_un
 #endif 
 	if ( (arm) && ((arm->drawtype == ARM_B_BONE) || (arm->drawtype == ARM_ENVELOPE)) )
 		uiItemEnumO(layout, "Scale Envelope Distance", 0, "TFM_OT_transform", "mode", TFM_BONESIZE);
-	uiItemMenuF(layout, "Clear Transform", 0, view3d_pose_armature_transformmenu);
+	uiItemMenuF(layout, "Clear Transform", 0, view3d_pose_armature_transformmenu, NULL);
 	
 	uiItemS(layout);
 	
@@ -2453,14 +2453,14 @@ static void view3d_pose_armaturemenu(bContext *C, uiLayout *layout, void *arg_un
 	
 	uiItemS(layout);
 
-	uiItemMenuF(layout, "Pose Library", 0, view3d_pose_armature_poselibmenu);
-	uiItemMenuF(layout, "Motion Paths", 0, view3d_pose_armature_motionpathsmenu);
-	uiItemMenuF(layout, "Bone Groups", 0, view3d_pose_armature_groupmenu);
+	uiItemMenuF(layout, "Pose Library", 0, view3d_pose_armature_poselibmenu, NULL);
+	uiItemMenuF(layout, "Motion Paths", 0, view3d_pose_armature_motionpathsmenu, NULL);
+	uiItemMenuF(layout, "Bone Groups", 0, view3d_pose_armature_groupmenu, NULL);
 	
 	uiItemS(layout);
 	
-	uiItemMenuF(layout, "Inverse Kinematics", 0, view3d_pose_armature_ikmenu);
-	uiItemMenuF(layout, "Constraints", 0, view3d_pose_armature_constraintsmenu);
+	uiItemMenuF(layout, "Inverse Kinematics", 0, view3d_pose_armature_ikmenu, NULL);
+	uiItemMenuF(layout, "Constraints", 0, view3d_pose_armature_constraintsmenu, NULL);
 	
 	uiItemS(layout);
 	
@@ -2477,8 +2477,8 @@ static void view3d_pose_armaturemenu(bContext *C, uiLayout *layout, void *arg_un
 	
 	uiItemS(layout);
 	
-	uiItemMenuF(layout, "Show/Hide Bones", 0, view3d_pose_armature_showhidemenu);
-	uiItemMenuF(layout, "Bone Settings", 0, view3d_pose_armature_settingsmenu);
+	uiItemMenuF(layout, "Show/Hide Bones", 0, view3d_pose_armature_showhidemenu, NULL);
+	uiItemMenuF(layout, "Bone Settings", 0, view3d_pose_armature_settingsmenu, NULL);
 	
 #if 0
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Copy Attributes...|Ctrl C",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
@@ -2776,7 +2776,7 @@ static void view3d_particlemenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 	uiItemS(layout);
 
-	uiItemMenuF(layout, "Show/Hide Particles", 0, view3d_particle_showhidemenu);
+	uiItemMenuF(layout, "Show/Hide Particles", 0, view3d_particle_showhidemenu, NULL);
 }
 
 static char *view3d_modeselect_pup(Scene *scene)
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index c09b83dd682..4a24027f7e9 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -225,7 +225,7 @@ void RNA_def_main(BlenderRNA *brna)
 		{"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene datablocks.", NULL, NULL},
 		{"objects", "Object", "rna_Main_object_begin", "Objects", "Object datablocks.", NULL, NULL},
 		{"materials", "Material", "rna_Main_mat_begin", "Materials", "Material datablocks.", NULL, NULL},
-		{"nodetrees", "NodeTree", "rna_Main_nodetree_begin", "Node Trees", "Nodetree datablocks.", NULL, NULL},
+		{"nodegroups", "NodeTree", "rna_Main_nodetree_begin", "Node Groups", "Node group datablocks.", NULL, NULL},
 		{"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh datablocks.", "add_mesh", "remove_mesh"}, 
 		{"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp datablocks.", NULL, NULL},
 		{"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library datablocks.", NULL, NULL},
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 6f0a19b7aa9..5ebaeb1da8d 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -41,6 +41,8 @@
 
 #include "BKE_texture.h"
 
+#include "ED_node.h"
+
 static PointerRNA rna_Material_mirror_get(PointerRNA *ptr)
 {
 	return rna_pointer_inherit_refine(ptr, &RNA_MaterialRaytraceMirror, ptr->id.data);
@@ -196,6 +198,15 @@ static void rna_Material_use_specular_ramp_set(PointerRNA *ptr, int value)
 		ma->ramp_spec= add_colorband(0);
 }
 
+void rna_Material_use_nodes_set(PointerRNA *ptr, int value)
+{
+	Material *ma= (Material*)ptr->data;
+
+	ma->use_nodes= value;
+	if(ma->use_nodes && ma->nodetree==NULL)
+		ED_node_shader_default(ma);
+}
+
 #else
 
 static void rna_def_material_mtex(BlenderRNA *brna)
@@ -1379,6 +1390,12 @@ void RNA_def_material(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "nodetree");
 	RNA_def_property_ui_text(prop, "Node Tree", "Node tree for node based materials.");
 
+	prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_Material_use_nodes_set");
+	RNA_def_property_ui_text(prop, "Use Nodes", "Use shader nodes to render the material.");
+	RNA_def_property_update(prop, NC_MATERIAL, NULL);
+
 	/* common */
 	rna_def_animdata_common(srna);
 	rna_def_mtex_common(srna, "rna_Material_mtex_begin", "rna_Material_active_texture_get",
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index c8be3c7afac..88796919c3e 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -62,6 +62,8 @@ EnumPropertyItem prop_mode_items[] ={
 
 #include "BLI_threads.h"
 
+#include "ED_node.h"
+
 #include "RE_pipeline.h"
 
 PointerRNA rna_Scene_objects_get(CollectionPropertyIterator *iter)
@@ -371,6 +373,15 @@ static void rna_SceneRenderLayer_pass_update(bContext *C, PointerRNA *ptr)
 		ntreeCompositForceHidden(scene->nodetree, scene);
 }
 
+void rna_Scene_use_nodes_set(PointerRNA *ptr, int value)
+{
+	Scene *scene= (Scene*)ptr->data;
+
+	scene->use_nodes= value;
+	if(scene->use_nodes && scene->nodetree==NULL)
+		ED_node_composit_default(scene);
+}
+
 #else
 
 static void rna_def_tool_settings(BlenderRNA  *brna)
@@ -1663,7 +1674,12 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE);
 	RNA_def_property_ui_text(prop, "Free Image Textures", "Free all image texture from memory after render, to save memory before compositing.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
-	
+
+	prop= RNA_def_property(srna, "free_unused_nodes", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE);
+	RNA_def_property_ui_text(prop, "Free Unused Nodes", "Free Nodes that are not used while compositing, to save memory.");
+	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+
 	prop= RNA_def_property(srna, "save_buffers", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE);
 	RNA_def_property_boolean_funcs(prop, "rna_SceneRenderData_save_buffers_get", NULL);
@@ -1903,6 +1919,12 @@ void RNA_def_scene(BlenderRNA *brna)
 	/* Nodes (Compositing) */
 	prop= RNA_def_property(srna, "nodetree", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Node Tree", "Compositing node tree.");
+
+	prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_use_nodes_set");
+	RNA_def_property_ui_text(prop, "Use Nodes", "Enable the compositing node tree.");
+	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
 	/* Sequencer */
 	prop= RNA_def_property(srna, "sequence_editor", PROP_POINTER, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index e5332d32f13..be0707390c4 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -33,6 +33,7 @@
 #include "rna_internal.h"
 
 #include "DNA_action_types.h"
+#include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
@@ -1403,10 +1404,53 @@ static void rna_def_space_userpref(BlenderRNA *brna)
 static void rna_def_space_node(BlenderRNA *brna)
 {
 	StructRNA *srna;
+	PropertyRNA *prop;
 
+	static EnumPropertyItem tree_type_items[] = {
+		{NTREE_SHADER, "MATERIAL", ICON_MATERIAL, "Material", "Material nodes."},
+		{NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes."},
+		{NTREE_COMPOSIT, "COMPOSITING", ICON_RENDER_RESULT, "Compositing", "Compositing nodes."},
+		{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem texture_type_items[] = {
+		{SNODE_TEX_OBJECT, "OBJECT", ICON_OBJECT_DATA, "Object", "Edit texture nodes from Object."},
+		{SNODE_TEX_WORLD, "WORLD", ICON_WORLD_DATA, "World", "Edit texture nodes from World."},
+		{SNODE_TEX_BRUSH, "BRUSH", ICON_BRUSH_DATA, "Brush", "Edit texture nodes from Brush."},
+		{0, NULL, 0, NULL, NULL}};
+	
 	srna= RNA_def_struct(brna, "SpaceNodeEditor", "Space");
 	RNA_def_struct_sdna(srna, "SpaceNode");
 	RNA_def_struct_ui_text(srna, "Space Node Editor", "Node editor space data.");
+
+	prop= RNA_def_property(srna, "tree_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "treetype");
+	RNA_def_property_enum_items(prop, tree_type_items);
+	RNA_def_property_ui_text(prop, "Tree Type", "Node tree type to display and edit.");
+	RNA_def_property_update(prop, NC_NODE, NULL);
+
+	prop= RNA_def_property(srna, "texture_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "texfrom");
+	RNA_def_property_enum_items(prop, texture_type_items);
+	RNA_def_property_ui_text(prop, "Texture Type", "Type of data to take texture from.");
+	RNA_def_property_update(prop, NC_NODE, NULL);
+
+	prop= RNA_def_property(srna, "id", PROP_POINTER, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "ID", "Datablock whose nodes are being edited.");
+
+	prop= RNA_def_property(srna, "id_from", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "from");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "ID From", "Datablock from which the edited datablock is linked.");
+
+	prop= RNA_def_property(srna, "nodetree", PROP_POINTER, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Node Tree", "Node tree being displayed and edited.");
+
+	prop= RNA_def_property(srna, "backdrop", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_BACKDRAW);
+	RNA_def_property_ui_text(prop, "Backdrop", "Use active Viewer Node output as backdrop for compositing nodes.");
+	RNA_def_property_update(prop, NC_NODE, NULL);
 }
 
 static void rna_def_space_logic(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index a5737536b7d..b7403ab1178 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -53,6 +53,7 @@ static EnumPropertyItem texture_filter_items[] = {
 #ifdef RNA_RUNTIME
 
 #include "BKE_texture.h"
+#include "ED_node.h"
 
 StructRNA *rna_Texture_refine(struct PointerRNA *ptr)
 {
@@ -187,9 +188,8 @@ void rna_Texture_use_nodes_set(PointerRNA *ptr, int v)
 	tex->use_nodes = v;
 	tex->type = 0;
 	
-	if(v && tex->nodetree==NULL) {
-		node_texture_default(tex);
-	}
+	if(v && tex->nodetree==NULL)
+		ED_node_texture_default(tex);
 }
 
 static void rna_ImageTexture_mipmap_set(PointerRNA *ptr, int value)
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 89927003220..00e9f6a2fa2 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -133,6 +133,7 @@ typedef struct wmNotifier {
 #define NC_FILE				(14<<24)
 #define NC_ANIMATION		(15<<24)
 #define NC_CONSOLE			(16<<24)
+#define NC_NODE				(17<<24)
 
 /* data type, 256 entries is enough, it can overlap */
 #define NOTE_DATA			0x00FF0000

From eb6c5d7a7f722493f38255825b908e0f3df831f3 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 19 Aug 2009 01:03:34 +0000
Subject: [PATCH 135/577] New scons option (WITHOUT_BF_PYTHON_INSTALL) to
 disable copying python files from system

---
 tools/Blender.py | 2 +-
 tools/btools.py  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/Blender.py b/tools/Blender.py
index 0d2671dbfac..789a6981558 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -587,7 +587,7 @@ class BlenderEnvironment(SConsEnvironment):
 			lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
 		elif os.sep == '/': # any unix
 			if lenv['WITH_BF_PYTHON']:
-				if not lenv['WITHOUT_BF_INSTALL']:
+				if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL']:
 					lenv.AddPostAction(prog,Action(PyInstall,strfunction=my_pyinst_print))
 		
 		return prog
diff --git a/tools/btools.py b/tools/btools.py
index 0314aba25b5..3e80ac453ce 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -59,8 +59,8 @@ def validate_arguments(args, bc):
 			'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
 			'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
 			'WITHOUT_BF_INSTALL',
+			'WITHOUT_BF_PYTHON_INSTALL',
 			'WITH_BF_OPENMP',
-			'WITHOUT_BF_INSTALL',
 			'BF_FANCY', 'BF_QUIET',
 			'BF_X264_CONFIG',
 			'BF_XVIDCORE_CONFIG',
@@ -363,6 +363,7 @@ def read_opts(cfg, args):
 		(BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
 		(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
 		(BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
+		(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
 		(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
 		(BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
 		(BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),

From 680f88017fda17582ac5b4c7e1b3afecbb56b2f8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 19 Aug 2009 01:11:18 +0000
Subject: [PATCH 136/577] updated for new transparency RNA names

---
 release/io/engine_render_pov.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index 97337ebc853..65add2baacb 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -56,7 +56,7 @@ def write_pov(filename, scene=None, info_callback = None):
 		(matrix[0][0], matrix[0][1], matrix[0][2],  matrix[1][0], matrix[1][1], matrix[1][2],  matrix[2][0], matrix[2][1], matrix[2][2],  matrix[3][0], matrix[3][1], matrix[3][2]) )
 	
 	def writeObjectMaterial(material):
-		if material and material.raytrace_transparency.enabled:
+		if material and material.transparency_method=='RAYTRACE':
 			file.write('\tinterior { ior %.6f }\n' % material.raytrace_transparency.ior)
 			
 			# Other interior args
@@ -114,7 +114,7 @@ def write_pov(filename, scene=None, info_callback = None):
 		
 		# This is written into the object
 		'''
-		if material.raytrace_transparency.enabled:
+		if material and material.transparency_method=='RAYTRACE':
 			'interior { ior %.3g} ' % material.raytrace_transparency.ior
 		'''
 		
@@ -248,8 +248,8 @@ def write_pov(filename, scene=None, info_callback = None):
 				if material:
 					diffuse_color = material.diffuse_color
 					
-					if material.raytrace_transparency.enabled:	trans = 1-material.raytrace_transparency.filter
-					else:										trans = 0.0
+					if material.transparency and material.transparency_method=='RAYTRACE':	trans = 1-material.raytrace_transparency.filter
+					else:																	trans = 0.0
 					
 					file.write(
 						'pigment {rgbft<%.3g, %.3g, %.3g, %.3g, %.3g>} finish {%s} }\n' % \
@@ -425,8 +425,8 @@ def write_pov(filename, scene=None, info_callback = None):
 					material = me_materials[col[3]]
 					material_finish = materialNames[material.name]
 					
-					if material.raytrace_transparency.enabled:	trans = 1-material.raytrace_transparency.filter
-					else:										trans = 0.0
+					if material.transparency and material.transparency_method=='RAYTRACE':	trans = 1-material.raytrace_transparency.filter
+					else:																	trans = 0.0
 					
 				else:
 					material_finish = DEF_MAT_NAME # not working properly,

From 8480ea2b0abacae00c90d37e7d99fa5e0c89eebe Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 19 Aug 2009 05:54:53 +0000
Subject: [PATCH 137/577] *small volume render code cleanups

---
 .../blender/render/intern/source/volumetric.c | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index f112c237319..3c3827d8baf 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -63,17 +63,9 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-static int vol_backface_intersect_check(Isect *is, int ob, RayFace *face)
-{
-	VlakRen *vlr = (VlakRen *)face;
-	
-	/* only consider faces away, so overlapping layers
-	 * of foward facing geometry don't cause the ray to stop */
-	return (INPR(is->vec, vlr->n) < 0.0f);
-}
 
 /* TODO: Box or sphere intersection types could speed things up */
-static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type, int checkfunc)
+static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
 {
 	float maxsize = RE_ray_tree_max_size(R.raytree);
 	int intersected=0;
@@ -132,11 +124,6 @@ float vol_get_stepsize(struct ShadeInput *shi, int context)
 	return shi->mat->vol.stepsize;
 }
 
-static float vol_get_depth_cutoff(struct ShadeInput *shi)
-{
-	return shi->mat->vol.depth_cutoff;
-}
-
 /* trilinear interpolation */
 static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
 {
@@ -335,7 +322,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		Isect is;
 		
 		/* find minimum of volume bounds, or lamp coord */
-		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
+		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS)) {
 			float dist = VecLenf(co, hitco);
 			VlakRen *vlr = (VlakRen *)is.face;
 			
@@ -421,7 +408,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	float tau[3], emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
 	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
 	float density = vol_get_density(shi, co);
-	const float depth_cutoff = vol_get_depth_cutoff(shi);
+	const float depth_cutoff = shi->mat->vol.depth_cutoff;
 	
 	/* multiply col_behind with beam transmittance over entire distance */
 	vol_get_attenuation(shi, tau, co, endco, density, stepsize);
@@ -593,7 +580,7 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 	}
 	/* trace to find a backface, the other side bounds of the volume */
 	/* (ray intersect ignores front faces here) */
-	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH, 0)) {
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
 		VlakRen *vlr = (VlakRen *)is.face;
 		
 		/* if it's another face in the same material */
@@ -657,7 +644,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	}
 	/* trace to find a backface, the other side bounds of the volume */
 	/* (ray intersect ignores front faces here) */
-	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH, 0)) {
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
 		
 		vol_get_attenuation(shi, tau, shi->co, hitco, -1.0f, shade_stepsize);
 		tr[0] = exp(-tau[0]);

From 360235a5f4ce9b56b3790e2c294662a09b5528e4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 19 Aug 2009 07:48:56 +0000
Subject: [PATCH 138/577] cmake cleanup (remove unused includes, make some
 within IF checks)

---
 CMakeLists.txt                                     |  2 +-
 blenderplayer/CMakeLists.txt                       | 14 ++++++--------
 source/blender/editors/CMakeLists.txt              |  6 +++---
 source/blender/editors/screen/CMakeLists.txt       |  5 ++---
 source/blender/imbuf/CMakeLists.txt                |  4 ++--
 source/blender/nodes/CMakeLists.txt                |  4 ++--
 source/blender/render/CMakeLists.txt               |  6 +++---
 source/blender/windowmanager/CMakeLists.txt        |  6 +++---
 source/creator/CMakeLists.txt                      |  6 +++++-
 source/gameengine/BlenderRoutines/CMakeLists.txt   |  5 +----
 source/gameengine/Converter/CMakeLists.txt         |  4 ----
 source/gameengine/GamePlayer/common/CMakeLists.txt |  2 --
 source/gameengine/GamePlayer/ghost/CMakeLists.txt  |  3 ---
 source/gameengine/Ketsji/CMakeLists.txt            |  3 ---
 14 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f12d342726..00d2244511f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)"
 OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
-OPTION(WITH_CXX_GUARDEDALLOC "" OFF)
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index 77bc059a6a0..0407361b845 100644
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -66,17 +66,12 @@ IF(UNIX)
     gp_common 
     bf_string 
     bf_ghost 
-    bf_blenkernel 
-    verse 
-    bf_blenkernel 
+    bf_blenkernel
     bf_blenloader 
     bf_blenpluginapi 
     bf_blroutines 
     bf_converter 
-    bf_sumo 
     bf_ketsji 
-    extern_solid 
-    extern_qhull 
     bf_bullet 
     bf_common 
     bf_dummy 
@@ -105,10 +100,13 @@ IF(UNIX)
     bf_dds
     bf_readblenfile 
     blenkernel_blc
-    bf_quicktime
     extern_binreloc
 	extern_glew
-  ) 
+  )
+  
+  IF(WITH_QUICKTIME)
+    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
+  ENDIF(WITH_QUICKTIME)
 
   IF(WITH_CXX_GUARDEDALLOC)
     SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 96b6fa5b7ab..c40b18ea099 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -31,10 +31,10 @@ SET(INC ../windowmanager
   ../../../intern/guardedalloc ../../../intern/memutil
   ../blenlib ../makesdna ../makesrna ../blenkernel
   ../include ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern ../radiosity/extern/include
+  ../../../intern/bsp/extern
   ../../../intern/decimation/extern ../blenloader ../python
   ../../kernel/gen_system ../readstreamglue
-  ../quicktime ../../../intern/elbeem/extern
+  ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
   ../../../intern/audaspace/intern
   ../nodes
@@ -59,7 +59,7 @@ IF(WITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 6861f82ac3f..7429f45c00f 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -35,10 +35,9 @@ SET(INC ../../windowmanager
   ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
   ../../include ../../imbuf 
   ../../render/extern/include ../../../../intern/bsp/extern 
-  ../../radiosity/extern/include
   ../../../intern/decimation/extern ../../blenloader
   ../../../kernel/gen_system ../../readstreamglue
-  ../../quicktime ../../../../intern/elbeem/extern
+  ../../../../intern/elbeem/extern
   ../../../../intern/ghost ../../../../intern/opennl/extern
   ../../nodes
 )
@@ -52,7 +51,7 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 391f6e9e1a2..76dd2afebdc 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -28,7 +28,7 @@ FILE(GLOB SRC intern/*.c)
 
 SET(INC 
   . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
-  ../avi ../quicktime ../blenkernel
+  ../avi ../blenkernel
   ${JPEG_INC}
   ${PNG_INC}
   ${TIFF_INC}
@@ -45,7 +45,7 @@ IF(WITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index ca21ba592a8..bba96adf25e 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(INC
   . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
   ../render/extern/include ../../../intern/decimation/extern ../makesrna
   ../imbuf ../avi ../../../intern/elbeem/extern
-  ../../../intern/iksolver/extern ../blenloader ../quicktime
+  ../../../intern/iksolver/extern ../blenloader
   ../blenkernel ../../../extern/glew/include ../gpu
   ${ZLIB_INC}
 )
@@ -39,7 +39,7 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 411bd61c3ff..185662c5a42 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -28,8 +28,8 @@ FILE(GLOB SRC intern/source/*.c)
 
 SET(INC 
   intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
-  extern/include ../blenkernel ../radiosity/extern/include ../imbuf
-  ../quicktime ../include ../../kernel/gen_messaging ../blenloader
+  extern/include ../blenkernel ../imbuf
+  ../include ../../kernel/gen_messaging ../blenloader
   ../makesrna
 )
 
@@ -38,7 +38,7 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index a268ffebffb..26d4ab20356 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -31,10 +31,10 @@ SET(INC .
   ../../../intern/guardedalloc ../../../intern/memutil
   ../blenlib ../makesdna ../makesrna ../blenkernel
   ../include ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern ../radiosity/extern/include
+  ../../../intern/bsp/extern
   ../../../intern/decimation/extern ../blenloader
   ../../kernel/gen_system ../readstreamglue
-  ../quicktime ../../../intern/elbeem/extern
+  ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
   ../nodes
   ../gpu
@@ -51,7 +51,7 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a9368e021cd..3a2cef2d038 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -337,7 +337,6 @@ IF(UNIX)
     bf_moto 
     bf_python
     bf_gen_python
-    bf_quicktime
     extern_binreloc
     extern_glew
     extern_libopenjpeg
@@ -352,6 +351,11 @@ IF(UNIX)
     SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
   ENDIF(WITH_CXX_GUARDEDALLOC)
 
+  IF(WITH_QUICKTIME)
+    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
+  ENDIF(WITH_QUICKTIME)
+
+
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
     SET(REMLIB ${SORTLIB})
     FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 704e3cef6cd..42e270d0fe7 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -27,15 +27,12 @@ SET(INC
   ../../../source/gameengine/Network
   ../../../source/gameengine/SceneGraph 
   ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet 
-  ../../../source/gameengine/Physics/Sumo
-  ../../../source/gameengine/Physics/Sumo/Fuzzics/include 
+  ../../../source/gameengine/Physics/Bullet
   ../../../source/gameengine/Network/LoopBackNetwork
   ../../../source/blender/misc 
   ../../../source/blender/blenloader
   ../../../source/blender/gpu
   ../../../extern/bullet2/src
-  ../../../extern/solid
   ../../../extern/glew/include
   ${PYTHON_INC}
 )
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 6732a62a5cb..f16e9e169ab 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -54,16 +54,12 @@ SET(INC
   ../../../source/gameengine/SceneGraph
   ../../../source/gameengine/Physics/common
   ../../../source/gameengine/Physics/Bullet
-  ../../../source/gameengine/Physics/BlOde
   ../../../source/gameengine/Physics/Dummy
-  ../../../source/gameengine/Physics/Sumo
-  ../../../source/gameengine/Physics/Sumo/Fuzzics/include
   ../../../source/gameengine/Network/LoopBackNetwork
   ../../../source/blender/misc
   ../../../source/blender/blenloader
   ../../../source/blender/gpu
   ../../../extern/bullet2/src
-  ../../../extern/solid
   ${PYTHON_INC}
 )
 
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index af25f4b884e..da99087c917 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -60,8 +60,6 @@ SET(INC
   ../../../../source/gameengine/Network
   ../../../../source/gameengine/SceneGraph
   ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Physics/Sumo
-  ../../../../source/gameengine/Physics/Sumo/Fuzzics/include
   ../../../../source/gameengine/Network/LoopBackNetwork
   ../../../../source/gameengine/GamePlayer/ghost
   ../../../../source/blender/misc
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index e07a7fb26ad..377d765af85 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -57,14 +57,11 @@ SET(INC
   ../../../../source/gameengine/Network
   ../../../../source/gameengine/SceneGraph
   ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Physics/Sumo
-  ../../../../source/gameengine/Physics/Sumo/Fuzzics/include
   ../../../../source/gameengine/Network/LoopBackNetwork
   ../../../../source/gameengine/GamePlayer/common
   ../../../../source/blender/misc
   ../../../../source/blender/blenloader
   ../../../../source/blender/gpu
-  ../../../../extern/solid
   ../../../../extern/glew/include
   ${PYTHON_INC}
 )
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 77bdd80721f..c91a3771b45 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -52,15 +52,12 @@ SET(INC
   ../../../source/gameengine/SceneGraph 
   ../../../source/gameengine/Physics/common
   ../../../source/gameengine/Physics/Bullet 
-  ../../../source/gameengine/Physics/Sumo
-  ../../../source/gameengine/Physics/Sumo/Fuzzics/include 
   ../../../source/gameengine/Network/LoopBackNetwork
   ../../../intern/audaspace/intern
   ../../../source/blender/misc 
   ../../../source/blender/blenloader
   ../../../source/blender/gpu
   ../../../extern/bullet2/src
-  ../../../extern/solid
   ../../../extern/glew/include
   ${PYTHON_INC}
 )

From 9b25a3bb2aea0447583a06e4bd89767cee1ee7cb Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Wed, 19 Aug 2009 09:12:21 +0000
Subject: [PATCH 139/577] 2.5 Timeline:

* Removed timeline_header.c with old Buttons code.
---
 .../blender/editors/space_time/space_time.c   |  29 --
 .../blender/editors/space_time/time_header.c  | 476 ------------------
 2 files changed, 505 deletions(-)
 delete mode 100644 source/blender/editors/space_time/time_header.c

diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 784b151f909..f18da93c35d 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -270,42 +270,15 @@ static void time_main_area_listener(ARegion *ar, wmNotifier *wmn)
 
 /* ************************ header time area region *********************** */
 
-#define PY_HEADER
 /* add handlers, stuff you only do once or on area/region changes */
 static void time_header_area_init(wmWindowManager *wm, ARegion *ar)
 {
-#ifdef PY_HEADER
 	ED_region_header_init(ar);
-#else
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
-#endif
 }
 
 static void time_header_area_draw(const bContext *C, ARegion *ar)
 {
-#ifdef PY_HEADER
 	ED_region_header(C, ar);
-#else
-
-	float col[3];
-
-	/* clear */
-	if(ED_screen_area_active(C))
-		UI_GetThemeColor3fv(TH_HEADER, col);
-	else
-		UI_GetThemeColor3fv(TH_HEADERDESEL, col);
-		
-	glClearColor(col[0], col[1], col[2], 0.0);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	/* set view2d view matrix for scrolling (without scrollers) */
-	UI_view2d_view_ortho(C, &ar->v2d);
-	
-	time_header_buttons(C, ar);
-#endif
-
-	/* restore view matrix? */
-	UI_view2d_view_restore(C);
 }
 
 static void time_header_area_listener(ARegion *ar, wmNotifier *wmn)
@@ -382,8 +355,6 @@ static SpaceLink *time_new(const bContext *C)
 static void time_free(SpaceLink *sl)
 {
 }
-
-
 /* spacetype; init callback in ED_area_initialize() */
 /* init is called to (re)initialize an existing editor (file read, screen changes) */
 /* validate spacedata, add own area level handlers */
diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c
deleted file mode 100644
index 13265166d98..00000000000
--- a/source/blender/editors/space_time/time_header.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_userdef_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_screen.h"
-
-#include "ED_keyframing.h"
-#include "ED_screen.h"
-#include "ED_screen_types.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "RNA_access.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "ED_markers.h"
-
-#include "time_intern.h"
-
-
-/* ************************ header time area region *********************** */
-
-static void do_time_viewmenu(bContext *C, void *arg, int event)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceTime *stime= CTX_wm_space_time(C);
-	View2D *v2d= UI_view2d_fromcontext_rwin(C);
-	Scene *scene= CTX_data_scene(C);
-	int first;
-	
-	switch(event) {
-		case 2: /* Play Back Animation */
-			//if(!has_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM))
-			//	start_animated_screen(stime);
-			break;
-		case 3: /* View All */
-			if(v2d) {
-				first= scene->r.sfra;
-				if(first >= scene->r.efra) first= scene->r.efra;
-					v2d->cur.xmin=v2d->tot.xmin= (float)first-2;
-				v2d->cur.xmax=v2d->tot.xmax= (float)scene->r.efra+2;
-			
-				ED_area_tag_redraw(curarea);
-			}
-			break;
-		case 4: /* Maximize Window */
-			/* using event B_FULL */
-			break;
-		case 5:	/* show time or frames */
-			stime->flag ^= TIME_DRAWFRAMES;
-			ED_area_tag_redraw(curarea);
-			break;
-		case 6:
-			//nextprev_marker(1);
-			break;
-		case 7:
-			//nextprev_marker(-1);
-			break;
-		case 10:
-			//timeline_frame_to_center();
-			break;
-		case 11:
-			if(v2d) {
-				v2d->flag ^= V2D_VIEWSYNC_SCREEN_TIME;
-				UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_SET);
-			}
-			break;
-		case 12: /* only show keyframes from selected data */
-			stime->flag ^= TIME_ONLYACTSEL;
-			ED_area_tag_redraw(curarea);
-			break;
-	}
-}
-
-static uiBlock *time_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceTime *stime= CTX_wm_space_time(C);
-	View2D *v2d= UI_view2d_fromcontext_rwin(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "time_viewmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_time_viewmenu, NULL);
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation", 0, yco-=20,
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	if(stime->flag & TIME_DRAWFRAMES)
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Seconds|Ctrl T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
-	else 
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Frames|Ctrl T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, (stime->flag & TIME_ONLYACTSEL)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Only Selected Data Keys|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Next Marker|PageUp", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Prev Marker|PageDown", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Next Key|Ctrl PageUp", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Prev Key|Ctrl PageDown", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Center View|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-	uiDefIconTextBut(block, BUTM, 1, (v2d->flag & V2D_VIEWSYNC_SCREEN_TIME)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Lock Time to Other Windows|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
-	
-//	if (!curarea->full) 
-//		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-//	else 
-//		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-static void do_time_framemenu(bContext *C, void *arg, int event)
-{
-	Scene *scene= CTX_data_scene(C);
-
-	switch(event) {
-		case 1: /*Set as Start */
-			if (scene->r.psfra) {
-				if (scene->r.pefra < scene->r.cfra)
-					scene->r.pefra= scene->r.cfra;
-				scene->r.psfra= scene->r.cfra;
-			}				
-			else
-				scene->r.sfra = scene->r.cfra;
-			WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
-			break;
-		case 2: /* Set as End */
-			if (scene->r.psfra) {
-				if (scene->r.cfra < scene->r.psfra)
-					scene->r.psfra= scene->r.cfra;
-				scene->r.pefra= scene->r.cfra;
-			}				
-			else
-				scene->r.efra = scene->r.cfra;
-			WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
-			break;
-		case 3: /* Rename Marker */
-			//rename_marker();
-			break;
-	}
-}
-
-static uiBlock *time_framemenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "time_framemenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_time_framemenu, NULL);
-
-	uiDefIconTextButO(block, BUTM, "MARKER_OT_add", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Add Marker",
-					  0, yco-=2, menuwidth, 19, "");
-	uiDefIconTextButO(block, BUTM, "MARKER_OT_duplicate", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Duplicate Marker",
-					  0, yco-=20, menuwidth, 19, "");
-	uiDefIconTextButO(block, BUTM, "MARKER_OT_delete", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Delete Marker",
-					  0, yco-=20, menuwidth, 19, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Name Marker|Ctrl M",
-					 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-	uiDefIconTextButO(block, BUTM, "MARKER_OT_move", WM_OP_INVOKE_REGION_WIN, ICON_BLANK1, "Grab/Move Marker",
-					  0, yco-=20, menuwidth, 19, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set as Start|S",
-					 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set as End|E",
-					 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-
-#define B_REDRAWALL		750
-#define B_TL_PLAY		752
-#define B_TL_RPLAY		760
-#define B_TL_STOP		756
-#define B_TL_PREVIEWON	757
-
-#define B_FLIPINFOMENU 0
-#define B_NEWFRAME 0
-#define B_DIFF 0
-
-
-void do_time_buttons(bContext *C, void *arg, int event)
-{
-	Scene *scene= CTX_data_scene(C);
-	
-	switch(event) {
-		case B_REDRAWALL:
-			WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
-			break;
-		case B_NEWFRAME:
-			WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
-			break;
-		case B_TL_PREVIEWON:
-			if (scene->r.psfra) {
-				/* turn on preview range */
-				scene->r.psfra= scene->r.sfra;
-				scene->r.pefra= scene->r.efra;
-			}
-			else {
-				/* turn off preview range */
-				scene->r.psfra= 0;
-				scene->r.pefra= 0;
-			}
-			//BIF_undo_push("Set anim-preview range");
-			WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
-			break;
-	}
-}
-
-
-void time_header_buttons(const bContext *C, ARegion *ar)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	Scene *scene= CTX_data_scene(C);
-	wmTimer *animtimer= CTX_wm_screen(C)->animtimer;
-	uiBlock *block;
-	uiBut *but;
-	int xco, yco= 3;
-	char *menustr= NULL;
-	
-	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
-	uiBlockSetHandleFunc(block, do_time_buttons, NULL);
-	
-	xco= ED_area_header_standardbuttons(C, block, yco);
-	
-	if((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		int xmax;
-		
-		xmax= GetButStringLength("View");
-		uiDefPulldownBut(block, time_viewmenu, sa, 
-						 "View", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		xmax= GetButStringLength("Frame");
-		uiDefPulldownBut(block, time_framemenu, sa, 
-						 "Frame", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-	}
-	
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	
-	
-	uiDefButI(block, TOG, B_TL_PREVIEWON,"PR",	
-			  xco,yco, XIC*2, YIC,
-			  &scene->r.psfra,0, 1, 0, 0,
-			  "Show settings for frame range of animation preview");
-	
-	xco += XIC*2;
-	
-	uiBlockBeginAlign(block);
-	
-	if (scene->r.psfra) {
-		uiDefButI(block, NUM, B_REDRAWALL,"Start:",	
-				  xco,yco, (int)4.5*XIC, YIC,
-				  &scene->r.psfra,MINFRAMEF, MAXFRAMEF, 0, 0,
-				  "The start frame of the animation preview (inclusive)");
-		
-		xco += (int)(4.5*XIC);
-		
-		uiDefButI(block, NUM, B_REDRAWALL,"End:",	
-				  xco,yco, (int)4.5*XIC,YIC,
-				  &scene->r.pefra,(float)PSFRA, MAXFRAMEF, 0, 0,
-				  "The end frame of the animation preview (inclusive)");
-	}
-	else {
-		uiDefButI(block, NUM, B_REDRAWALL,"Start:",	
-				  xco,yco, (int)4.5*XIC, YIC,
-				  &scene->r.sfra,MINFRAMEF, MAXFRAMEF, 0, 0,
-				  "The start frame of the animation (inclusive)");
-		
-		xco += (short)(4.5*XIC);
-		
-		uiDefButI(block, NUM, B_REDRAWALL,"End:",	
-				  xco,yco, (int)4.5*XIC,YIC,
-				  &scene->r.efra,(float)SFRA, MAXFRAMEF, 0, 0,
-				  "The end frame of the animation (inclusive)");
-	}
-	uiBlockEndAlign(block);
-	
-	xco += (short)(4.5 * XIC);
-	
-	/* MINAFRAMEF not MINFRAMEF, since MINAFRAMEF allows to set current frame negative 
-	 * to facilitate easier keyframing in some situations
-	 */
-	uiDefButI(block, NUM, B_NEWFRAME, "",
-			  xco,yco, (int)4.5*XIC,YIC,
-			  &(scene->r.cfra), MINAFRAMEF, MAXFRAMEF, 0, 0,
-			  "Displays Current Frame of animation");
-	
-	xco += (short)(4.5 * XIC);
-	
-	uiBlockBeginAlign(block);
-	
-	but= uiDefIconButO(block, BUT, "SCREEN_OT_frame_jump", WM_OP_INVOKE_REGION_WIN, ICON_REW, xco,yco,XIC,YIC, "Skip to Start frame (Shift DownArrow)");
-		RNA_boolean_set(uiButGetOperatorPtrRNA(but), "end", 0);
-	xco+= XIC;
-	
-	but= uiDefIconButO(block, BUT, "SCREEN_OT_keyframe_jump", WM_OP_INVOKE_REGION_WIN, ICON_PREV_KEYFRAME, xco,yco,XIC,YIC, "Skip to previous keyframe (Ctrl PageDown)");
-		RNA_boolean_set(uiButGetOperatorPtrRNA(but), "next", 0);
-	xco+= XIC;
-	
-	if (animtimer) {
-		/* pause button 2*size to keep buttons in place */
-		but=uiDefIconButO(block, BUT, "SCREEN_OT_animation_play", WM_OP_INVOKE_REGION_WIN, ICON_PAUSE, xco,yco,XIC*2,YIC, "Stop Playing Timeline");
-		
-		xco+= XIC;
-	}
-	else {	   
-		but=uiDefIconButO(block, BUT, "SCREEN_OT_animation_play", WM_OP_INVOKE_REGION_WIN, ICON_PLAY_REVERSE, xco,yco,XIC,YIC, "Play Timeline in Reverse");
-			RNA_boolean_set(uiButGetOperatorPtrRNA(but), "reverse", 1);	
-		xco+= XIC;
-					 
-		but=uiDefIconButO(block, BUT, "SCREEN_OT_animation_play", WM_OP_INVOKE_REGION_WIN, ICON_PLAY, xco,yco,XIC,YIC, "Play Timeline");
-			RNA_boolean_set(uiButGetOperatorPtrRNA(but), "reverse", 0);	
-	}
-	xco+= XIC;
-	
-	but= uiDefIconButO(block, BUT, "SCREEN_OT_keyframe_jump", WM_OP_INVOKE_REGION_WIN, ICON_NEXT_KEYFRAME, xco,yco,XIC,YIC, "Skip to next keyframe (Ctrl PageUp)");
-		RNA_boolean_set(uiButGetOperatorPtrRNA(but), "next", 1);
-	xco+= XIC;
-	
-	but= uiDefIconButO(block, BUT, "SCREEN_OT_frame_jump", WM_OP_INVOKE_REGION_WIN, ICON_FF, xco,yco,XIC,YIC, "Skip to End frame (Shift UpArrow)");
-		RNA_boolean_set(uiButGetOperatorPtrRNA(but), "end", 1);
-	xco+= XIC;
-	uiBlockEndAlign(block);
-
-	xco+= (short)(0.5*XIC);
-	
-	uiBlockBeginAlign(block);
-	uiDefIconButBitS(block, TOG, AUTOKEY_ON, B_REDRAWALL, ICON_REC,
-					 xco, yco, XIC, YIC, &(scene->toolsettings->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
-	xco+= 1*XIC;
-	if (IS_AUTOKEY_ON(scene)) {
-		uiDefButS(block, MENU, B_REDRAWALL, 
-				  "Auto-Keying Mode %t|Add/Replace%x3|Replace%x5", 
-				  xco, yco, (int)(4.25*XIC), YIC, &(scene->toolsettings->autokey_mode), 0, 1, 0, 0, 
-				  "Mode of automatic keyframe insertion for Objects and Bones");
-		xco+= (short)(4.25*XIC);
-		
-		if (animtimer) {
-			uiDefButBitS(block, TOG, ANIMRECORD_FLAG_WITHNLA, B_REDRAWALL, "Layered",	
-				  xco,yco, (int)(3.5*XIC), YIC,
-				  &(scene->toolsettings->autokey_flag),0, 1, 0, 0,
-				  "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking.");
-			uiBlockEndAlign(block);
-			
-			xco+= (short)(3.5*XIC);
-		}
-		
-		xco += XIC;
-		
-		uiBlockEndAlign(block);
-	}
-	else {
-		xco+= (short)(5.25*XIC);
-		uiBlockEndAlign(block);
-	}
-	
-	menustr= ANIM_build_keyingsets_menu(&scene->keyingsets, 0);
-	uiDefButI(block, MENU, B_DIFF, 
-				  menustr, 
-				  xco, yco, (int)5.5*XIC, YIC, &(scene->active_keyingset), 0, 1, 0, 0, 
-				  "Active Keying Set (i.e. set of channels to Insert Keyframes for)");
-	MEM_freeN(menustr);
-	xco+= (5.5*XIC);
-	
-	/* NOTE: order of these buttons needs to be kept in sync with other occurances 
-	 * (see Outliner header for instance, also +/- stuff for filebrowser) 
-	 */
-	uiBlockBeginAlign(block);
-	uiDefIconButO(block, BUT, "ANIM_OT_delete_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_DEHLT, xco,yco,XIC,YIC, "Delete Keyframes for the Active Keying Set (Alt-I)");
-	xco += XIC;
-	uiDefIconButO(block, BUT, "ANIM_OT_insert_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_HLT, xco,yco,XIC,YIC, "Insert Keyframes for the Active Keying Set (I)");
-	xco += XIC;
-	uiBlockEndAlign(block);
-	
-	xco+= XIC;
-	
-	uiDefIconButBitS(block, TOG, AUDIO_SYNC, B_DIFF, ICON_SPEAKER,
-					 xco, yco, XIC, YIC, &(scene->r.audio.flag), 0, 0, 0, 0, "Play back and sync with audio from Sequence Editor");
-	
-	
-	/* always as last  */
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin));
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
-}
-
-

From e611c4756fa17c57855123dc2b5c2c2408b0d790 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 19 Aug 2009 09:35:22 +0000
Subject: [PATCH 140/577] 2.5: svn merge
 https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22291:22625

---
 release/scripts/export_map.py                 | 2 +-
 source/blender/blenkernel/intern/seqeffects.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/release/scripts/export_map.py b/release/scripts/export_map.py
index aca02288c7a..2262ae3b89b 100644
--- a/release/scripts/export_map.py
+++ b/release/scripts/export_map.py
@@ -197,7 +197,7 @@ def is_tricyl_facegroup(faces):
 	is the face group a tri cylinder
 	Returens a bool, true if the faces make an extruded tri solid
 	'''
-	return False
+	
 	# cube must have 5 faces
 	if len(faces) != 5:
 		print '1'
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 2ee95ed928e..078258092f7 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2792,6 +2792,10 @@ void sequence_effect_speed_rebuild_map(Sequence * seq, int force)
 	if (!(force || seq->len != v->length || !v->frameMap)) {
 		return;
 	}
+	if (!seq->seq1) { /* make coverity happy and check for (CID 598)
+	                     input strip ... */
+		return;
+	}
 
 	if (!v->frameMap || v->length != seq->len) {
 		if (v->frameMap) MEM_freeN(v->frameMap);
@@ -2807,7 +2811,7 @@ void sequence_effect_speed_rebuild_map(Sequence * seq, int force)
 	/* if there is no IPO, try to make retiming easy by stretching the
 	   strip */
 	// XXX old animation system - seq
-	if (/*!seq->ipo &&*/ seq->seq1 && seq->seq1->enddisp != seq->seq1->start
+	if (/*!seq->ipo &&*/ seq->seq1->enddisp != seq->seq1->start
 	    && seq->seq1->len != 0) {
 		fallback_fac = (float) seq->seq1->len / 
 			(float) (seq->seq1->enddisp - seq->seq1->start);

From c3041ae7cda20c78040e7deea17530fe5f41029d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 19 Aug 2009 10:26:43 +0000
Subject: [PATCH 141/577] - fix for BGE warnings - when C++ uses guardedalloc
 SYS_DeleteSystem was called after MEM_printmemlist(), making it look like
 there was a leak.

---
 intern/string/STR_String.h                    | 10 +++++++
 .../windowmanager/intern/wm_init_exit.c       |  5 ++--
 .../Converter/BL_ArmatureObject.cpp           |  2 +-
 .../gameengine/Converter/BL_ShapeDeformer.cpp |  4 +--
 .../KX_BlenderScalarInterpolator.cpp          |  2 +-
 .../Converter/KX_BlenderScalarInterpolator.h  |  2 +-
 .../Converter/KX_BlenderSceneConverter.cpp    |  2 +-
 source/gameengine/Converter/KX_IpoConvert.cpp |  2 +-
 .../gameengine/Ketsji/KX_CameraActuator.cpp   | 12 --------
 source/gameengine/Ketsji/KX_GameObject.cpp    | 12 ++++----
 source/gameengine/Ketsji/KX_IpoActuator.cpp   | 28 +++++++++----------
 source/gameengine/Ketsji/KX_IpoActuator.h     | 14 +++++-----
 source/gameengine/Ketsji/KX_PythonInit.cpp    | 14 +++++-----
 .../gameengine/Ketsji/KX_PythonInitTypes.cpp  |  3 --
 source/gameengine/Ketsji/KX_PythonSeq.cpp     |  2 +-
 .../Ketsji/KX_SCA_ReplaceMeshActuator.h       |  2 +-
 .../Physics/Bullet/CcdPhysicsController.cpp   |  2 --
 .../Rasterizer/RAS_IPolygonMaterial.cpp       |  4 +--
 source/gameengine/VideoTexture/ImageBase.cpp  |  8 ++++--
 19 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 941430fd976..a5e7a0721ec 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -50,6 +50,9 @@
 
 using namespace std;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
 
 class STR_String;
 
@@ -191,6 +194,13 @@ protected:
 	char   *pData;													// -> STR_String data
 	int	   Len;														// Data length
 	int	   Max;														// Space in data buffer
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 inline  STR_String operator+(rcSTR_String    lhs, rcSTR_String   rhs)	{ return STR_String(lhs.ReadPtr(), lhs.Length(), rhs.ReadPtr(), rhs.Length()); }
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index ee826d5f57e..9a268f8be17 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -266,6 +266,8 @@ void WM_exit(bContext *C)
 
 	CTX_free(C);
 	
+	SYS_DeleteSystem(SYS_GetSystem());
+
 	if(MEM_get_memory_blocks_in_use()!=0) {
 		printf("Error Totblock: %d\n", MEM_get_memory_blocks_in_use());
 		MEM_printmemlist();
@@ -282,9 +284,6 @@ void WM_exit(bContext *C)
 	}
 #endif 
 	
-	
-	SYS_DeleteSystem(SYS_GetSystem());
-	
 	exit(G.afbreek==1);
 }
 
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index f8a9b1b637f..cfd90813a16 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -54,8 +54,8 @@ BL_ArmatureObject::BL_ArmatureObject(
 
 :	KX_GameObject(sgReplicationInfo,callbacks),
 	m_objArma(armature),
-	m_scene(scene), // maybe remove later. needed for where_is_pose
 	m_framePose(NULL),
+	m_scene(scene), // maybe remove later. needed for where_is_pose
 	m_lastframe(0.0),
 	m_activeAct(NULL),
 	m_activePriority(999),
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp
index d39917b0e5c..20ca7f07f2b 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.cpp
+++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp
@@ -109,8 +109,8 @@ bool BL_ShapeDeformer::ExecuteShapeDrivers(void)
 {
 	if (!m_shapeDrivers.empty() && PoseUpdated()) {
 		vector<IpoCurve*>::iterator it;
-		void *poin;
-		int type;
+//		void *poin;
+//		int type;
 
 		// the shape drivers use the bone matrix as input. Must 
 		// update the matrix now
diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp b/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
index c3264a2bc37..24910422176 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
@@ -62,7 +62,7 @@ BL_InterpolatorList::~BL_InterpolatorList() {
 	}
 }
 
-KX_IScalarInterpolator *BL_InterpolatorList::GetScalarInterpolator(char *rna_path, int array_index) {
+KX_IScalarInterpolator *BL_InterpolatorList::GetScalarInterpolator(const char *rna_path, int array_index) {
 	for(BL_InterpolatorList::iterator i = begin(); (i != end()) ; i++ )
 	{
 		FCurve *fcu= (static_cast<BL_ScalarInterpolator *>(*i))->GetFCurve();
diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
index eb15cee8ff9..e7fbb8083e4 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
@@ -64,7 +64,7 @@ public:
 	BL_InterpolatorList(struct AnimData *adt);
 	~BL_InterpolatorList();
 
-	KX_IScalarInterpolator *GetScalarInterpolator(char *rna_path, int array_index);	
+	KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);	
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index ebabaa55e21..3220672c392 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -795,6 +795,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 				Object* blenderObject = gameObj->GetBlenderObject();
 				if (blenderObject && blenderObject->ipo)
 				{
+#if 0
 					const MT_Point3& position = gameObj->NodeGetWorldPosition();
 					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
 					const MT_Matrix3x3& orn = gameObj->NodeGetWorldOrientation();
@@ -804,7 +805,6 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 					float tmat[3][3];
 					
 					// XXX animato
-#if 0
 					Ipo* ipo = blenderObject->ipo;
 
 					//create the curves, if not existing, set linear if new
diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index d3a2e1a9ba4..848fcfcdaa0 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -175,7 +175,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 			KX_ObColorIpoSGController* ipocontr_obcol=NULL;
 			
 			for(int i=0; i<4; i++) {
-				if (interp = adtList->GetScalarInterpolator("color", i)) {
+				if ((interp = adtList->GetScalarInterpolator("color", i))) {
 					if (!ipocontr_obcol) {
 						ipocontr_obcol = new KX_ObColorIpoSGController();
 						gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index faf0ca50407..b5a0a63cf68 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -38,9 +38,6 @@
 
 #include "PyObjectPlus.h" 
 
-STR_String KX_CameraActuator::X_AXIS_STRING = "x";
-STR_String KX_CameraActuator::Y_AXIS_STRING = "y";
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -353,15 +350,6 @@ CValue *KX_CameraActuator::findObject(char *obName)
 	return NULL;
 }
 
-bool KX_CameraActuator::string2axischoice(const char *axisString) 
-{
-	bool res = true;
-
-	res = !(axisString == Y_AXIS_STRING);
-
-	return res;
-}
-
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
 /* ------------------------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 146b83abd17..a5217273b17 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -464,7 +464,7 @@ void KX_GameObject::AddMeshUser()
 	double* fl = GetOpenGLMatrixPtr()->getPointer();
 
 	SG_QList::iterator<RAS_MeshSlot> mit(m_meshSlots);
-	RAS_MeshSlot* ms;
+//	RAS_MeshSlot* ms;
 	for(mit.begin(); !mit.end(); ++mit)
 	{
 		(*mit)->m_OpenGLMatrix = fl;
@@ -1817,10 +1817,10 @@ int KX_GameObject::pyattr_set_visible(void *self_v, const KX_PYATTRIBUTE_DEF *at
 
 PyObject* KX_GameObject::pyattr_get_worldPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_GLOBAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldPosition());
 #endif
 }
@@ -1839,10 +1839,10 @@ int KX_GameObject::pyattr_set_worldPosition(void *self_v, const KX_PYATTRIBUTE_D
 
 PyObject* KX_GameObject::pyattr_get_localPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS	
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_LOCAL);
 #else	
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalPosition());
 #endif
 }
@@ -1861,10 +1861,10 @@ int KX_GameObject::pyattr_set_localPosition(void *self_v, const KX_PYATTRIBUTE_D
 
 PyObject* KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_INERTIA_LOCAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	if (self->GetPhysicsController())
 		return PyObjectFrom(self->GetPhysicsController()->GetLocalInertia());
 	return Py_BuildValue("fff", 0.0f, 0.0f, 0.0f);
@@ -1922,20 +1922,20 @@ int KX_GameObject::pyattr_set_localOrientation(void *self_v, const KX_PYATTRIBUT
 
 PyObject* KX_GameObject::pyattr_get_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_GLOBAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldScaling());
 #endif
 }
 
 PyObject* KX_GameObject::pyattr_get_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_LOCAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalScaling());
 #endif
 }
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index e4eaff4f401..3f241e90836 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -49,13 +49,13 @@
 /* Type strings                                                              */
 /* ------------------------------------------------------------------------- */
 
-STR_String KX_IpoActuator::S_KX_ACT_IPO_PLAY_STRING      = "Play";
-STR_String KX_IpoActuator::S_KX_ACT_IPO_PINGPONG_STRING  = "PingPong";
-STR_String KX_IpoActuator::S_KX_ACT_IPO_FLIPPER_STRING   = "Flipper";
-STR_String KX_IpoActuator::S_KX_ACT_IPO_LOOPSTOP_STRING  = "LoopStop";
-STR_String KX_IpoActuator::S_KX_ACT_IPO_LOOPEND_STRING   = "LoopEnd";
-STR_String KX_IpoActuator::S_KX_ACT_IPO_KEY2KEY_STRING   = "Key2key";
-STR_String KX_IpoActuator::S_KX_ACT_IPO_FROM_PROP_STRING = "FromProp";
+const char *KX_IpoActuator::S_KX_ACT_IPO_PLAY_STRING      = "Play";
+const char *KX_IpoActuator::S_KX_ACT_IPO_PINGPONG_STRING  = "PingPong";
+const char *KX_IpoActuator::S_KX_ACT_IPO_FLIPPER_STRING   = "Flipper";
+const char *KX_IpoActuator::S_KX_ACT_IPO_LOOPSTOP_STRING  = "LoopStop";
+const char *KX_IpoActuator::S_KX_ACT_IPO_LOOPEND_STRING   = "LoopEnd";
+const char *KX_IpoActuator::S_KX_ACT_IPO_KEY2KEY_STRING   = "Key2key";
+const char *KX_IpoActuator::S_KX_ACT_IPO_FROM_PROP_STRING = "FromProp";
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
@@ -385,19 +385,19 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 int KX_IpoActuator::string2mode(char* modename) {
 	IpoActType res = KX_ACT_IPO_NODEF;
 
-	if (modename == S_KX_ACT_IPO_PLAY_STRING) { 
+	if (strcmp(modename, S_KX_ACT_IPO_PLAY_STRING)==0) { 
 		res = KX_ACT_IPO_PLAY;
-	} else if (modename == S_KX_ACT_IPO_PINGPONG_STRING) {
+	} else if (strcmp(modename, S_KX_ACT_IPO_PINGPONG_STRING)==0) {
 		res = KX_ACT_IPO_PINGPONG;
-	} else if (modename == S_KX_ACT_IPO_FLIPPER_STRING) {
+	} else if (strcmp(modename, S_KX_ACT_IPO_FLIPPER_STRING)==0) {
 		res = KX_ACT_IPO_FLIPPER;
-	} else if (modename == S_KX_ACT_IPO_LOOPSTOP_STRING) {
+	} else if (strcmp(modename, S_KX_ACT_IPO_LOOPSTOP_STRING)==0) {
 		res = KX_ACT_IPO_LOOPSTOP;
-	} else if (modename == S_KX_ACT_IPO_LOOPEND_STRING) {
+	} else if (strcmp(modename, S_KX_ACT_IPO_LOOPEND_STRING)==0) {
 		res = KX_ACT_IPO_LOOPEND;
-	} else if (modename == S_KX_ACT_IPO_KEY2KEY_STRING) {
+	} else if (strcmp(modename, S_KX_ACT_IPO_KEY2KEY_STRING)==0) {
 		res = KX_ACT_IPO_KEY2KEY;
-	} else if (modename == S_KX_ACT_IPO_FROM_PROP_STRING) {
+	} else if (strcmp(modename, S_KX_ACT_IPO_FROM_PROP_STRING)==0) {
 		res = KX_ACT_IPO_FROM_PROP;
 	}
 
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index 01051ca82dc..0581d1644ee 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -100,13 +100,13 @@ public:
 		KX_ACT_IPO_MAX
 	};
 
-	static STR_String S_KX_ACT_IPO_PLAY_STRING;
-	static STR_String S_KX_ACT_IPO_PINGPONG_STRING;
-	static STR_String S_KX_ACT_IPO_FLIPPER_STRING;
-	static STR_String S_KX_ACT_IPO_LOOPSTOP_STRING;
-	static STR_String S_KX_ACT_IPO_LOOPEND_STRING;
-	static STR_String S_KX_ACT_IPO_KEY2KEY_STRING;
-	static STR_String S_KX_ACT_IPO_FROM_PROP_STRING;
+	static const char *S_KX_ACT_IPO_PLAY_STRING;
+	static const char *S_KX_ACT_IPO_PINGPONG_STRING;
+	static const char *S_KX_ACT_IPO_FLIPPER_STRING;
+	static const char *S_KX_ACT_IPO_LOOPSTOP_STRING;
+	static const char *S_KX_ACT_IPO_LOOPEND_STRING;
+	static const char *S_KX_ACT_IPO_KEY2KEY_STRING;
+	static const char *S_KX_ACT_IPO_FROM_PROP_STRING;
 
 	int string2mode(char* modename);
 	
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index de3dcd0ebf8..49cf895af17 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -142,7 +142,7 @@ void	KX_RasterizerDrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,cons
 // List of methods defined in the module
 
 static PyObject* ErrorObject;
-STR_String gPyGetRandomFloat_doc="getRandomFloat returns a random floating point value in the range [0..1)";
+static const char *gPyGetRandomFloat_doc="getRandomFloat returns a random floating point value in the range [0..1]";
 
 static PyObject* gPyGetRandomFloat(PyObject*)
 {
@@ -346,7 +346,7 @@ static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args)
     return list;
 }
 
-static STR_String gPyGetCurrentScene_doc =  
+static const char *gPyGetCurrentScene_doc =
 "getCurrentScene()\n"
 "Gets a reference to the current scene.\n";
 static PyObject* gPyGetCurrentScene(PyObject* self)
@@ -354,7 +354,7 @@ static PyObject* gPyGetCurrentScene(PyObject* self)
 	return gp_KetsjiScene->GetProxy();
 }
 
-static STR_String gPyGetSceneList_doc =  
+static const char *gPyGetSceneList_doc =
 "getSceneList()\n"
 "Return a list of converted scenes.\n";
 static PyObject* gPyGetSceneList(PyObject* self)
@@ -479,15 +479,15 @@ static struct PyMethodDef game_methods[] = {
 	{"sendMessage", (PyCFunction)gPySendMessage, METH_VARARGS, (const char *)gPySendMessage_doc},
 	{"getCurrentController",
 	(PyCFunction) SCA_PythonController::sPyGetCurrentController,
-	METH_NOARGS, (const char *)SCA_PythonController::sPyGetCurrentController__doc__},
+	METH_NOARGS, SCA_PythonController::sPyGetCurrentController__doc__},
 	{"getCurrentScene", (PyCFunction) gPyGetCurrentScene,
-	METH_NOARGS, (const char *)gPyGetCurrentScene_doc.Ptr()},
+	METH_NOARGS, gPyGetCurrentScene_doc},
 	{"getSceneList", (PyCFunction) gPyGetSceneList,
-	METH_NOARGS, (const char *)gPyGetSceneList_doc.Ptr()},
+	METH_NOARGS, (const char *)gPyGetSceneList_doc},
 	{"addActiveActuator",(PyCFunction) SCA_PythonController::sPyAddActiveActuator,
 	METH_VARARGS, (const char *)SCA_PythonController::sPyAddActiveActuator__doc__},
 	{"getRandomFloat",(PyCFunction) gPyGetRandomFloat,
-	METH_NOARGS, (const char *)gPyGetRandomFloat_doc.Ptr()},
+	METH_NOARGS, (const char *)gPyGetRandomFloat_doc},
 	{"setGravity",(PyCFunction) gPySetGravity, METH_O, (const char *)"set Gravitation"},
 	{"getSpectrum",(PyCFunction) gPyGetSpectrum, METH_NOARGS, (const char *)"get audio spectrum"},
 	{"stopDSP",(PyCFunction) gPyStopDSP, METH_VARARGS, (const char *)"stop using the audio dsp (for performance reasons)"},
diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
index 5260c0bb01a..61e563791c3 100644
--- a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
@@ -123,9 +123,6 @@ static void PyType_Ready_ADD(PyObject *dict, PyTypeObject *tp, PyAttributeDef *a
 			memset(attr_getset, 0, sizeof(PyGetSetDef));
 		}
 	} else {
-	
-		PyObject *item;
-
 		PyType_Ready(tp);
 		PyDict_SetItemString(dict, tp->tp_name, reinterpret_cast<PyObject *>(tp));
 	}
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp
index 4fc5252de60..1098dc03b62 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.cpp
+++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp
@@ -375,7 +375,7 @@ PyTypeObject KX_PythonSeq_Type = {
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
 	/* TODO, richcmp */
-	NULL, /* ( cmpfunc ) KX_PythonSeq_compare, /* cmpfunc tp_compare; */
+	NULL, /* ( cmpfunc ) KX_PythonSeq_compare, // cmpfunc tp_compare; */
 	( reprfunc ) KX_PythonSeq_repr,   /* reprfunc tp_repr; */
 
 	/* Method suites for standard classes */
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
index ae2c0d2d6ce..1e258420836 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
@@ -50,8 +50,8 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator
 	// mesh reference (mesh to replace)
 	RAS_MeshObject* m_mesh;
 	SCA_IScene*	 m_scene;
-	bool m_use_phys;
 	bool m_use_gfx; 
+	bool m_use_phys;
 
  public:
 	KX_SCA_ReplaceMeshActuator(
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 20e830c9dc3..12562e34583 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1829,8 +1829,6 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA
 			}
 
 			for(mf= mface, i=0; i < numpolys; mf++, i++) {
-				unsigned int *fv = &mf->v1;
-
 				if(mf->v4) {
 					fv_pt= quad_verts;
 					*poly_index_pt++ = *poly_index_pt++ = index[i];
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index cb5c5a12397..033daabc48f 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -70,7 +70,6 @@ void  RAS_IPolyMaterial::Initialize(
 RAS_IPolyMaterial::RAS_IPolyMaterial() 
 		: m_texturename("__Dummy_Texture_Name__"),
 		m_materialname("__Dummy_Material_Name__"),
-		m_materialindex(0),
 		m_tile(0),
 		m_tilexrep(0),
 		m_tileyrep(0),
@@ -78,6 +77,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial()
 		m_transp(0),
 		m_alpha(false),
 		m_zsort(false),
+		m_materialindex(0),
 		m_polymatid(0),
 		m_flag(0),
 		m_multimode(0)
@@ -100,7 +100,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 									 bool zsort)
 		: m_texturename(texname),
 		m_materialname(matname),
-		m_materialindex(materialindex),
 		m_tile(tile),
 		m_tilexrep(tilexrep),
 		m_tileyrep(tileyrep),
@@ -108,6 +107,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 		m_transp(transp),
 		m_alpha(alpha),
 		m_zsort(zsort),
+		m_materialindex(materialindex),
 		m_polymatid(m_newpolymatid++),
 		m_flag(0),
 		m_multimode(0)
diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
index 5e2841271a6..0740afed2c6 100644
--- a/source/gameengine/VideoTexture/ImageBase.cpp
+++ b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -219,15 +219,17 @@ bool ImageBase::checkSourceSizes (void)
 		// get size of current source
 		short * curSize = (*it)->getSize();
 		// if size is available and is not empty
-		if (curSize[0] != 0 && curSize[1] != 0)
+		if (curSize[0] != 0 && curSize[1] != 0) {
 			// if reference size is not set
-			if (refSize == NULL)
+			if (refSize == NULL) {
 				// set current size as reference
 				refSize = curSize;
 		// otherwise check with current size
-			else if (curSize[0] != refSize[0] || curSize[1] != refSize[1])
+			} else if (curSize[0] != refSize[0] || curSize[1] != refSize[1]) {
 				// if they don't match, report it
 				return false;
+			}
+		}
 	}
 	// all sizes match
 	return true;

From aace6ef551183a3d09635c3103a8e4cba4f9117a Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 19 Aug 2009 12:35:40 +0000
Subject: [PATCH 142/577] 2.5: Restored statistics in the info header.

Implementation:
* NC_SCENE or NC_OBJECT cause scene->stats to be cleared.
* NC_INFO is sent to tag info headers for redraw.
* In UI scene.statistics() creates scene->stats if it is
  NULLd, and then returns the string.
---
 release/ui/space_info.py                      |   5 +-
 source/blender/blenkernel/intern/scene.c      |   4 +
 source/blender/blenloader/intern/readfile.c   |   1 +
 source/blender/editors/include/ED_info.h      |  32 ++
 .../editors/interface/interface_widgets.c     |   8 +-
 .../blender/editors/space_info/info_stats.c   | 434 ++++++++++++++++++
 .../blender/editors/space_info/space_info.c   |   6 +-
 source/blender/makesdna/DNA_scene_types.h     |   2 +-
 source/blender/makesrna/intern/rna_scene.c    |   7 +
 source/blender/windowmanager/WM_types.h       |   1 +
 .../windowmanager/intern/wm_event_system.c    |  11 +-
 11 files changed, 503 insertions(+), 8 deletions(-)
 create mode 100644 source/blender/editors/include/ED_info.h
 create mode 100644 source/blender/editors/space_info/info_stats.c

diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 770387498a2..1a3f9a321ac 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -8,7 +8,8 @@ class INFO_HT_header(bpy.types.Header):
 		layout = self.layout
 		
 		st = context.space_data
-		rd = context.scene.render_data
+		scene = context.scene
+		rd = scene.render_data
 
 		row = layout.row(align=True)
 		row.template_header()
@@ -33,6 +34,8 @@ class INFO_HT_header(bpy.types.Header):
 
 		layout.template_operator_search()
 		layout.template_running_jobs()
+
+		layout.itemL(text=scene.statistics())
 			
 class INFO_MT_file(bpy.types.Menu):
 	__space_type__ = "INFO"
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2a8fd765386..6dd362d15a8 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -155,6 +155,7 @@ Scene *copy_scene(Main *bmain, Scene *sce, int type)
 		scen->theDag= NULL;
 		scen->obedit= NULL;
 		scen->toolsettings= MEM_dupallocN(sce->toolsettings);
+		scen->stats= NULL;
 
 		ts= scen->toolsettings;
 		if(ts) {
@@ -299,6 +300,9 @@ void free_scene(Scene *sce)
 		ntreeFreeTree(sce->nodetree);
 		MEM_freeN(sce->nodetree);
 	}
+
+	if(sce->stats)
+		MEM_freeN(sce->stats);
 }
 
 Scene *add_scene(char *name)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 779a898bd6a..db811b22460 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4134,6 +4134,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 	sce->theDag = NULL;
 	sce->dagisvalid = 0;
 	sce->obedit= NULL;
+	sce->stats= 0;
 
 	memset(&sce->sound_handles, 0, sizeof(sce->sound_handles));
 
diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h
new file mode 100644
index 00000000000..d09e174d71d
--- /dev/null
+++ b/source/blender/editors/include/ED_info.h
@@ -0,0 +1,32 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2009, Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef ED_INFO_H
+#define ED_INFO_H
+
+/* info_stats.c */
+void ED_info_stats_clear(struct Scene *scene);
+char *ED_info_stats_string(struct Scene *scene);
+
+#endif /*  ED_INFO_H */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index a70fbab1aa4..48de2343c97 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -835,9 +835,11 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 //	else transopts= ui_translate_buttons();
 	
 	/* cut string in 2 parts - only for menu entries */
-	if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) {
-		cpoin= strchr(but->drawstr, '|');
-		if(cpoin) *cpoin= 0;		
+	if((but->block->flag & UI_BLOCK_LOOP)) {
+		if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) {
+			cpoin= strchr(but->drawstr, '|');
+			if(cpoin) *cpoin= 0;		
+		}
 	}
 	
 	glColor3ubv((unsigned char*)wcol->text);
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
new file mode 100644
index 00000000000..2d14fbc515e
--- /dev/null
+++ b/source/blender/editors/space_info/info_stats.c
@@ -0,0 +1,434 @@
+/**
+ * $Id$
+ *
+ * ***** 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): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_action_types.h"
+#include "DNA_armature_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_group_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_object_types.h"
+#include "DNA_particle_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_anim.h"
+#include "BKE_context.h"
+#include "BKE_displist.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_key.h"
+#include "BKE_mesh.h"
+#include "BKE_particle.h"
+#include "BKE_utildefines.h"
+
+#include "ED_armature.h"
+#include "ED_mesh.h"
+
+#include "BLI_editVert.h"
+
+typedef struct SceneStats {
+	int totvert, totvertsel;
+	int totedge, totedgesel;
+	int totface, totfacesel;
+	int totbone, totbonesel;
+	int totobj, totobjsel;
+	int totmesh, totlamp, totcurve;
+
+	char infostr[512];
+} SceneStats;
+
+static void stats_object(Object *ob, int sel, int totob, SceneStats *stats)
+{
+	switch(ob->type) {
+	case OB_MESH: {
+		/* we assume derivedmesh is already built, this strictly does stats now. */
+		DerivedMesh *dm= ob->derivedFinal;
+		int totvert, totedge, totface;
+
+		stats->totmesh +=totob;
+
+		if(dm) {
+			totvert = dm->getNumVerts(dm);
+			totedge = dm->getNumEdges(dm);
+			totface = dm->getNumFaces(dm);
+
+			stats->totvert += totvert*totob;
+			stats->totedge += totedge*totob;
+			stats->totface += totface*totob;
+
+			if(sel) {
+				stats->totvertsel += totvert;
+				stats->totfacesel += totface;
+			}
+		}
+		break;
+	}
+	case OB_LAMP:
+		stats->totlamp += totob;
+		break;
+	case OB_SURF:
+	case OB_CURVE:
+	case OB_FONT: {
+		Curve *cu= ob->data;
+		int tot= 0, totf= 0;
+
+		stats->totcurve += totob;
+
+		if(cu->disp.first)
+			count_displist(&cu->disp, &tot, &totf);
+
+		tot *= totob;
+		totf *= totob;
+
+		stats->totvert+= tot;
+		stats->totface+= totf;
+
+		if(sel) {
+			stats->totvertsel += tot;
+			stats->totfacesel += totf;
+		}
+		break;
+	}
+	case OB_MBALL: {
+		int tot= 0, totf= 0;
+
+		count_displist(&ob->disp, &tot, &totf);
+
+		tot *= totob;
+		totf *= totob;
+
+		stats->totvert += tot;
+		stats->totface += totf;
+
+		if(sel) {
+			stats->totvertsel += tot;
+			stats->totfacesel += totf;
+		}
+		break;
+	}
+	}
+}
+
+static void stats_object_edit(Object *obedit, SceneStats *stats)
+{
+	if(obedit->type==OB_MESH) {
+		/* Mesh Edit */
+		EditMesh *em= BKE_mesh_get_editmesh(obedit->data);
+		EditVert *eve;
+		EditEdge *eed;
+		EditFace *efa;
+		
+		for(eve= em->verts.first; eve; eve=eve->next) {
+			stats->totvert++;
+			if(eve->f & SELECT) stats->totvertsel++;
+		}
+		for(eed= em->edges.first; eed; eed=eed->next) {
+			stats->totedge++;
+			if(eed->f & SELECT) stats->totedgesel++;
+		}
+		for(efa= em->faces.first; efa; efa=efa->next) {
+			stats->totface++;
+			if(efa->f & SELECT) stats->totfacesel++;
+		}
+		
+		EM_validate_selections(em);
+	}
+	else if(obedit->type==OB_ARMATURE){
+		/* Armature Edit */
+		bArmature *arm= obedit->data;
+		EditBone *ebo;
+
+		for(ebo=arm->edbo->first; ebo; ebo=ebo->next){
+			stats->totbone++;
+			
+			if((ebo->flag & BONE_CONNECTED) && ebo->parent)
+				stats->totvert--;
+			
+			if(ebo->flag & BONE_TIPSEL)
+				stats->totvertsel++;
+			if(ebo->flag & BONE_ROOTSEL)
+				stats->totvertsel++;
+			
+			if(ebo->flag & BONE_SELECTED) stats->totbonesel++;
+
+			/* if this is a connected child and it's parent is being moved, remove our root */
+			if((ebo->flag & BONE_CONNECTED)&& (ebo->flag & BONE_ROOTSEL) && ebo->parent && (ebo->parent->flag & BONE_TIPSEL))
+				stats->totvertsel--;
+
+			stats->totvert+=2;
+		}
+	}
+	else if ELEM3(obedit->type, OB_CURVE, OB_SURF, OB_FONT) {
+		/* Curve Edit */
+		Curve *cu= obedit->data;
+		Nurb *nu;
+		BezTriple *bezt;
+		BPoint *bp;
+		int a;
+
+		for(nu=cu->editnurb->first; nu; nu=nu->next) {
+			if((nu->type & 7)==CU_BEZIER) {
+				bezt= nu->bezt;
+				a= nu->pntsu;
+				while(a--) {
+					stats->totvert+=3;
+					if(bezt->f1) stats->totvertsel++;
+					if(bezt->f2) stats->totvertsel++;
+					if(bezt->f3) stats->totvertsel++;
+					bezt++;
+				}
+			}
+			else {
+				bp= nu->bp;
+				a= nu->pntsu*nu->pntsv;
+				while(a--) {
+					stats->totvert++;
+					if(bp->f1 & SELECT) stats->totvertsel++;
+					bp++;
+				}
+			}
+		}
+	}
+	else if(obedit->type==OB_MBALL) {
+		/* MetaBall Edit */
+		MetaBall *mball= obedit->data;
+		MetaElem *ml;
+		
+		for(ml= mball->editelems->first; ml; ml=ml->next) {
+			stats->totvert++;
+			if(ml->flag & SELECT) stats->totvertsel++;
+		}
+	}
+	else if(obedit->type==OB_LATTICE) {
+		/* Lattice Edit */
+		Lattice *lt= obedit->data;
+		Lattice *editlatt= lt->editlatt;
+		BPoint *bp;
+		int a;
+
+		bp= editlatt->def;
+		
+		a= editlatt->pntsu*editlatt->pntsv*editlatt->pntsw;
+		while(a--) {
+			stats->totvert++;
+			if(bp->f1 & SELECT) stats->totvertsel++;
+			bp++;
+		}
+	}
+}
+
+static void stats_object_pose(Object *ob, SceneStats *stats)
+{
+	if(ob->pose) {
+		bArmature *arm= ob->data;
+		bPoseChannel *pchan;
+
+		for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+			stats->totbone++;
+			if(pchan->bone && (pchan->bone->flag & BONE_SELECTED))
+				if(pchan->bone->layer & arm->layer)
+					stats->totbonesel++;
+		}
+	}
+}
+
+static void stats_object_paint(Object *ob, SceneStats *stats)
+{
+	if(ob->type == OB_MESH) {
+		Mesh *me= ob->data;
+
+		stats->totface= me->totface;
+		stats->totvert= me->totvert;
+	}
+}
+
+static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
+{
+	if(base->flag & SELECT) stats->totobjsel++;
+
+	if(ob->transflag & OB_DUPLIPARTS) {
+		/* Dupli Particles */
+		ParticleSystem *psys;
+		ParticleSettings *part;
+
+		for(psys=ob->particlesystem.first; psys; psys=psys->next){
+			part=psys->part;
+
+			if(part->draw_as==PART_DRAW_OB && part->dup_ob){
+				int tot=count_particles(psys);
+				stats_object(part->dup_ob, 0, tot, stats);
+			}
+			else if(part->draw_as==PART_DRAW_GR && part->dup_group){
+				GroupObject *go;
+				int tot, totgroup=0, cur=0;
+				
+				for(go= part->dup_group->gobject.first; go; go=go->next)
+					totgroup++;
+
+				for(go= part->dup_group->gobject.first; go; go=go->next) {
+					tot=count_particles_mod(psys,totgroup,cur);
+					stats_object(go->ob, 0, tot, stats);
+					cur++;
+				}
+			}
+		}
+		
+		stats_object(ob, base->flag & SELECT, 1, stats);
+		stats->totobj++;
+	}
+	else if(ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS|OB_DUPLIFACES))) {
+		/* Dupli Verts/Faces */
+		int tot= count_duplilist(ob->parent);
+		stats->totobj+=tot;
+		stats_object(ob, base->flag & SELECT, tot, stats);
+	}
+	else if(ob->transflag & OB_DUPLIFRAMES) {
+		/* Dupli Frames */
+		int tot= count_duplilist(ob);
+		stats->totobj+=tot;
+		stats_object(ob, base->flag & SELECT, tot, stats);
+	}
+	else if((ob->transflag & OB_DUPLIGROUP) && ob->dup_group) {
+		/* Dupli Group */
+		int tot= count_duplilist(ob);
+		stats->totobj+=tot;
+		stats_object(ob, base->flag & SELECT, tot, stats);
+	}
+	else {
+		/* No Dupli */
+		stats_object(ob, base->flag & SELECT, 1, stats);
+		stats->totobj++;
+	}
+}
+
+/* Statistics displayed in info header. Called regularly on scene changes. */
+static void stats_update(Scene *scene)
+{
+	SceneStats stats;
+	Object *ob= (scene->basact)? scene->basact->object: NULL;
+	Base *base;
+	
+	memset(&stats, 0, sizeof(stats));
+
+	if(scene->obedit) {
+		/* Edit Mode */
+		stats_object_edit(scene->obedit, &stats);
+	}
+	else if(ob && (ob->mode & OB_MODE_POSE)) {
+		/* Pose Mode */
+		stats_object_pose(ob, &stats);
+	}
+	else if(ob && (ob->flag & (OB_MODE_SCULPT|OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))) {
+		/* Sculpt and Paint Mode */
+		stats_object_paint(ob, &stats);
+	}
+	else {
+		/* Objects */
+		for(base= scene->base.first; base; base=base->next)
+			if(scene->lay & base->lay)
+				stats_dupli_object(base, base->object, &stats);
+	}
+
+	if(!scene->stats)
+		scene->stats= MEM_mallocN(sizeof(SceneStats), "SceneStats");
+
+	*(scene->stats)= stats;
+}
+
+static void stats_string(Scene *scene)
+{
+	SceneStats *stats= scene->stats;
+	Object *ob= (scene->basact)? scene->basact->object: NULL;
+	uintptr_t mem_in_use, mmap_in_use;
+	char memstr[64];
+	char *s;
+
+	mem_in_use= MEM_get_memory_in_use();
+	mmap_in_use= MEM_get_mapped_memory_in_use();
+
+	/* get memory statistics */
+	s= memstr + sprintf(memstr, " | Mem:%.2fM", ((mem_in_use-mmap_in_use)>>10)/1024.0);
+	if(mmap_in_use)
+		sprintf(s, " (%.2fM)", ((mmap_in_use)>>10)/1024.0);
+
+	s= stats->infostr;
+
+	if(scene->obedit) {
+		if(ob_get_keyblock(scene->obedit))
+			s+= sprintf(s, "(Key) ");
+
+		if(scene->obedit->type==OB_MESH) {
+			if(scene->toolsettings->selectmode & SCE_SELECT_VERTEX)
+				s+= sprintf(s, "Ve:%d-%d | Ed:%d-%d | Fa:%d-%d",
+						stats->totvertsel, stats->totvert, stats->totedgesel, stats->totedge, stats->totfacesel, stats->totface);
+			else if(scene->toolsettings->selectmode & SCE_SELECT_EDGE)
+				s+= sprintf(s, "Ed:%d-%d | Fa:%d-%d",
+						stats->totedgesel, stats->totedge, stats->totfacesel, stats->totface);
+			else
+				s+= sprintf(s, "Fa:%d-%d", stats->totfacesel, stats->totface);
+		}
+		else if(scene->obedit->type==OB_ARMATURE) {
+			s+= sprintf(s, "Ve:%d-%d | Bo:%d-%d", stats->totvertsel, stats->totvert, stats->totbonesel, stats->totbone);
+		}
+		else {
+			s+= sprintf(s, "Ve:%d-%d", stats->totvertsel, stats->totvert);
+		}
+
+		strcat(s, memstr);
+	}
+	else if(ob && (ob->mode & OB_MODE_POSE)) {
+		s += sprintf(s, "Bo:%d-%d %s",
+					stats->totbonesel, stats->totbone, memstr);
+	}
+	else {
+		s += sprintf(s, "Ve:%d | Fa:%d | Ob:%d-%d | La:%d%s",
+			stats->totvert, stats->totface, stats->totobj, stats->totobjsel, stats->totlamp, memstr);
+	}
+
+	if(ob)
+		sprintf(s, " | %s", ob->id.name+2);
+}
+
+void ED_info_stats_clear(Scene *scene)
+{
+	if(scene->stats) {
+		MEM_freeN(scene->stats);
+		scene->stats= NULL;
+	}
+}
+
+char *ED_info_stats_string(Scene *scene)
+{
+	if(!scene->stats)
+		stats_update(scene);
+	stats_string(scene);
+
+	return scene->stats->infostr;
+}
+
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index fe5bbf04af1..b6f9cbeabb5 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -1,5 +1,5 @@
 /**
- * $Id:
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -58,6 +58,7 @@
 #include "UI_view2d.h"
 
 #include "ED_markers.h"
+#include "ED_object.h"
 
 #include "info_intern.h"	// own include
 
@@ -166,6 +167,9 @@ static void info_header_listener(ARegion *ar, wmNotifier *wmn)
 			if(wmn->data==ND_RENDER_RESULT)
 				ED_region_tag_redraw(ar);
 			break;
+		case NC_INFO:
+			ED_region_tag_redraw(ar);
+			break;
 	}
 	
 }
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 4a3d555ca33..f1a77d78b7b 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -47,6 +47,7 @@ struct Text;
 struct bNodeTree;
 struct AnimData;
 struct Editing;
+struct SceneStats;
 
 typedef struct Base {
 	struct Base *next, *prev;
@@ -717,7 +718,6 @@ typedef struct Scene {
 
 	/* Units */
 	struct UnitSettings unit;
-
 } Scene;
 
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 88796919c3e..0301932aef3 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -62,6 +62,7 @@ EnumPropertyItem prop_mode_items[] ={
 
 #include "BLI_threads.h"
 
+#include "ED_info.h"
 #include "ED_node.h"
 
 #include "RE_pipeline.h"
@@ -1823,6 +1824,7 @@ void RNA_def_scene(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
+	FunctionRNA *func;
 	
 	/* Struct definition */
 	srna= RNA_def_struct(brna, "Scene", "ID");
@@ -1982,6 +1984,11 @@ void RNA_def_scene(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "gm");
 	RNA_def_property_struct_type(prop, "SceneGameData");
 	RNA_def_property_ui_text(prop, "Game Data", "");
+
+	/* Statistics */
+	func= RNA_def_function(srna, "statistics", "ED_info_stats_string");
+	prop= RNA_def_string(func, "statistics", "", 0, "Statistics", "");
+	RNA_def_function_return(func, prop);
 	
 	rna_def_tool_settings(brna);
 	rna_def_unit_settings(brna);
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 00e9f6a2fa2..b717df8f61f 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -134,6 +134,7 @@ typedef struct wmNotifier {
 #define NC_ANIMATION		(15<<24)
 #define NC_CONSOLE			(16<<24)
 #define NC_NODE				(17<<24)
+#define NC_INFO				(18<<24)
 
 /* data type, 256 entries is enough, it can overlap */
 #define NOTE_DATA			0x00FF0000
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index f0d9f8c0989..6c34ed6f902 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -52,6 +52,7 @@
 #include "BKE_pointcache.h"
 
 #include "ED_fileselect.h"
+#include "ED_info.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"
 #include "ED_util.h"
@@ -129,7 +130,7 @@ static wmNotifier *wm_notifier_next(wmWindowManager *wm)
 void wm_event_do_notifiers(bContext *C)
 {
 	wmWindowManager *wm= CTX_wm_manager(C);
-	wmNotifier *note;
+	wmNotifier *note, *next;
 	wmWindow *win;
 	
 	if(wm==NULL)
@@ -141,7 +142,9 @@ void wm_event_do_notifiers(bContext *C)
 		
 		CTX_wm_window_set(C, win);
 		
-		for(note= wm->queue.first; note; note= note->next) {
+		for(note= wm->queue.first; note; note= next) {
+			next= note->next;
+
 			if(note->category==NC_WM) {
 				if( ELEM(note->data, ND_FILEREAD, ND_FILESAVE)) {
 					wm->file_saved= 1;
@@ -174,6 +177,10 @@ void wm_event_do_notifiers(bContext *C)
 						do_anim= 1;
 				}
 			}
+			if(note->category == NC_SCENE || note->category == NC_OBJECT) {
+				ED_info_stats_clear(CTX_data_scene(C));
+				WM_event_add_notifier(C, NC_INFO, NULL);
+			}
 		}
 		if(do_anim) {
 			/* depsgraph gets called, might send more notifiers */

From 315229ea5ffb6d0519b0a5d144996760871dd3bb Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 19 Aug 2009 14:04:21 +0000
Subject: [PATCH 143/577] texture enum was crashing when generating docs,
 removed radiosity from makefiles.

---
 source/blender/makesrna/intern/rna_texture.c | 2 +-
 source/blender/render/intern/source/Makefile | 1 -
 source/creator/Makefile                      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index b7403ab1178..f82edee8ff1 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -142,7 +142,7 @@ static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerR
 	EnumPropertyItem *item= NULL;
 	int totitem= 0;
 	
-	if(tex) {
+	if(tex && C) { /* Note, tex/mtex/ntree can be invalid of C is NULL, TODO - can this give valid results when C is NULL? */
 		bNodeTree *ntree= tex->nodetree;
 		if(ntree) {
 			EnumPropertyItem tmp= {0, "", 0, "", ""};
diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile
index 3c8d0f637a3..5d4a224002e 100644
--- a/source/blender/render/intern/source/Makefile
+++ b/source/blender/render/intern/source/Makefile
@@ -39,7 +39,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
 # The external modules follow after. There should be a nicer way to say this.
 CPPFLAGS += -I../include 
 CPPFLAGS += -I../../extern/include 
-CPPFLAGS += -I../../../radiosity/extern/include 
 CPPFLAGS += -I../../../blenlib
 CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../makesdna
diff --git a/source/creator/Makefile b/source/creator/Makefile
index fbe5d252a77..592cf913dfa 100644
--- a/source/creator/Makefile
+++ b/source/creator/Makefile
@@ -40,7 +40,6 @@ include nan_compile.mk
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 CPPFLAGS += -I../blender/render/extern/include
-CPPFLAGS += -I../blender/radiosity/extern/include
 
 # two needed for the kernel
 CPPFLAGS += -I../blender/imbuf

From 792d526489011215db32dba424809d6e741b05c3 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Wed, 19 Aug 2009 15:45:16 +0000
Subject: [PATCH 144/577] More texnode preview fixes. Previews now have correct
 aspect ratio and are drawn by the renderer.

---
 source/blender/blenkernel/BKE_node.h          |  5 +--
 .../blender/editors/preview/previewrender.c   |  6 ++-
 source/blender/editors/space_node/node_edit.c |  5 ---
 .../blender/editors/space_node/space_node.c   |  5 ++-
 source/blender/nodes/intern/TEX_util.c        | 44 ++++++++-----------
 source/blender/nodes/intern/TEX_util.h        |  3 +-
 source/blender/render/intern/source/texture.c |  2 +-
 7 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 4ac95b61a5e..40afa1dba36 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -421,10 +421,9 @@ extern struct ListBase node_all_textures;
 
 /* API */
 int  ntreeTexTagAnimated(struct bNodeTree *ntree);
-void ntreeTexUpdatePreviews( struct bNodeTree* nodetree );
-void ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float *coord, float *dxt, float *dyt, char do_preview, short thread, struct Tex *tex, short which_output, int cfra);
+void ntreeTexSetPreviewFlag(int);
+void ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float *coord, float *dxt, float *dyt, short thread, struct Tex *tex, short which_output, int cfra);
 void ntreeTexCheckCyclics(struct bNodeTree *ntree);
-void ntreeTexAssignIndex(struct bNodeTree *ntree, struct bNode *node);
 char* ntreeTexOutputMenu(struct bNodeTree *ntree);
 
 
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c
index 8fcf65202ee..94db74c18d9 100644
--- a/source/blender/editors/preview/previewrender.c
+++ b/source/blender/editors/preview/previewrender.c
@@ -946,7 +946,11 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
 	/* XXX ugly global still, but we can't do preview while rendering */
 	if(G.rendering)
 		return;
-
+	
+	if(GS(id->name) == ID_TE) {
+		ntreeTexSetPreviewFlag(1);
+	}
+	
 	steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), owner);
 	sp= MEM_callocN(sizeof(ShaderPreview), "shader preview");
 
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index e1b612d74e1..bc81c25d106 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -574,7 +574,6 @@ void ED_node_texture_default(Tex *tx)
 	nodeAddLink(tx->nodetree, in, fromsock, out, tosock);
 	
 	ntreeSolveOrder(tx->nodetree);	/* needed for pointers */
-	ntreeTexUpdatePreviews(tx->nodetree); /* XXX texture nodes should follow shader node methods (ton) */
 }
 
 /* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */
@@ -1111,9 +1110,6 @@ static int node_resize_modal(bContext *C, wmOperator *op, wmEvent *event)
 				node->width= nsw->oldwidth + mx - nsw->mxstart;
 				CLAMP(node->width, node->typeinfo->minwidth, node->typeinfo->maxwidth);
 			}
-			// XXX
-			if(snode->nodetree->type == NTREE_TEXTURE)
-				ntreeTexUpdatePreviews(snode->nodetree); /* XXX texture nodes should follow shader node methods (ton) */
 				
 			ED_region_tag_redraw(ar);
 
@@ -1659,7 +1655,6 @@ bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float
 	
 	if(snode->nodetree->type==NTREE_TEXTURE) {
 		ntreeTexCheckCyclics(snode->edittree);
-		ntreeTexUpdatePreviews(snode->edittree); /* XXX texture nodes should follow shader node methods (ton) */
 	}
 	
 	return node;
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index cb25d29fd27..2233a4db3a0 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -184,8 +184,9 @@ static void node_area_refresh(const struct bContext *C, struct ScrArea *sa)
 		}
 		else if(snode->treetype==NTREE_TEXTURE) {
 			Tex *tex= (Tex *)snode->id;
-			if(tex->use_nodes)
-				ntreeTexUpdatePreviews(tex->nodetree);
+			if(tex->use_nodes) {
+				ED_preview_shader_job(C, sa, snode->id, NULL, NULL, 100, 100);
+			}
 		}
 	}
 }
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index a6a5877722b..2c21627dad9 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -47,6 +47,8 @@
 
 #define PREV_RES 128 /* default preview resolution */
 
+int preview_flag = 0;
+
 void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, short thread)
 {
 	if(dg->node->need_exec)
@@ -108,12 +110,6 @@ static void init_preview(bNode *node)
 	if(node->preview==NULL)
 		node->preview= MEM_callocN(sizeof(bNodePreview), "node preview");
 	
-	if(node->preview->rect)
-		if(node->preview->xsize!=xsize && node->preview->ysize!=ysize) {
-			MEM_freeN(node->preview->rect);
-			node->preview->rect= NULL;
-		}
-	
 	if(node->preview->rect==NULL) {
 		node->preview->rect= MEM_callocN(4*xsize + xsize*ysize*sizeof(float)*4, "node preview rect");
 		node->preview->xsize= xsize;
@@ -136,6 +132,8 @@ void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata)
 	bNodePreview *preview;
 	float coord[3] = {0, 0, 0};
 	TexParams params;
+	int resolution;
+	int xsize, ysize;
 	
 	if(!cdata->do_preview)
 		return;
@@ -146,19 +144,23 @@ void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata)
 	init_preview(node);
 	
 	preview = node->preview;
+	xsize = preview->xsize;
+	ysize = preview->ysize;
 	
 	params.dxt = 0;
 	params.dyt = 0;
 	params.cfra = cdata->cfra;
 	params.coord = coord;
 	
-	for(x=0; x<preview->xsize; x++)
-	for(y=0; y<preview->ysize; y++)
+	resolution = (xsize < ysize) ? xsize : ysize;
+	
+	for(x=0; x<xsize; x++)
+	for(y=0; y<ysize; y++)
 	{
-		params.coord[0] = ((float) x / preview->xsize) * 2 - 1;
-		params.coord[1] = ((float) y / preview->ysize) * 2 - 1;
+		params.coord[0] = ((float) x / resolution) * 2 - 1;
+		params.coord[1] = ((float) y / resolution) * 2 - 1;
 		
-		result = preview->rect + 4 * (preview->xsize*y + x);
+		result = preview->rect + 4 * (xsize*y + x);
 		
 		tex_input_rgba(result, ns, &params, cdata->thread);
 	}
@@ -212,7 +214,6 @@ void ntreeTexExecTree(
 	TexResult *texres,
 	float *coord,
 	float *dxt, float *dyt,
-	char do_preview, 
 	short thread, 
 	Tex *tex, 
 	short which_output, 
@@ -230,28 +231,19 @@ void ntreeTexExecTree(
 	data.dxt = dxt;
 	data.dyt = dyt;
 	data.target = texres;
-	data.do_preview = do_preview;
+	data.do_preview = preview_flag;
 	data.thread = thread;
 	data.which_output = which_output;
 	data.cfra= cfra;
 	
+	preview_flag = 0;
+	
 	ntreeExecTree(nodes, &data, thread);
 }
 
-void ntreeTexUpdatePreviews(bNodeTree* nodetree)
+void ntreeTexSetPreviewFlag(int doit)
 {
-	Tex *tex;
-	float coord[] = {0,0,0};
-	TexResult dummy_texres;
-	
-	for(tex= G.main->tex.first; tex; tex= tex->id.next)
-		if(tex->nodetree == nodetree) break;
-	if(tex) {
-		dummy_texres.nor = 0;
-	
-		ntreeBeginExecTree(nodetree);
-		ntreeTexExecTree(nodetree, &dummy_texres, coord, 0, 0, 1, 0, tex, 0, 0);
-	}
+	preview_flag = doit;
 }
 
 char* ntreeTexOutputMenu(bNodeTree *ntree)
diff --git a/source/blender/nodes/intern/TEX_util.h b/source/blender/nodes/intern/TEX_util.h
index 7fff8d04651..87a9cf288d6 100644
--- a/source/blender/nodes/intern/TEX_util.h
+++ b/source/blender/nodes/intern/TEX_util.h
@@ -102,8 +102,7 @@ float tex_input_value(bNodeStack *in, TexParams *params, short thread);
 void tex_output(bNode *node, bNodeStack **in, bNodeStack *out, TexFn texfn);
 void tex_do_preview(bNode *node, bNodeStack *ns, TexCallData *cdata);
 
-void ntreeTexUpdatePreviews( bNodeTree* nodetree );
-void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, float *dxt, float *dyt, char do_preview, short thread, struct Tex *tex, short which_output, int cfra);
+void ntreeTexExecTree(bNodeTree *nodes, TexResult *texres, float *coord, float *dxt, float *dyt, short thread, struct Tex *tex, short which_output, int cfra);
 
 void params_from_cdata(TexParams *out, TexCallData *in);
 
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 3db78bfea93..e6d6e78e27b 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -719,7 +719,7 @@ static int evalnodes(Tex *tex, float *texvec, float *dxt, float *dyt, TexResult
 	short rv = TEX_INT;
 	bNodeTree *nodes = tex->nodetree;
 	
-	ntreeTexExecTree(nodes, texres, texvec, dxt, dyt, 0, thread, tex, which_output, R.r.cfra);
+	ntreeTexExecTree(nodes, texres, texvec, dxt, dyt, thread, tex, which_output, R.r.cfra);
 	
 	if(texres->nor) rv |= TEX_NOR;
 	rv |= TEX_RGB;

From 8a5a7d3d280f3270ce3115bced8a3975643f7cda Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Wed, 19 Aug 2009 16:49:21 +0000
Subject: [PATCH 145/577] 2.5/Multires:

* Fixed saving most recent sculpting on a multires object. Uses the same hack already in place for saving that info for undo.
---
 source/blender/blenloader/intern/writefile.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 62ec1b71938..ede7aacfea8 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1100,7 +1100,7 @@ static void write_defgroups(WriteData *wd, ListBase *defbase)
 		writestruct(wd, DATA, "bDeformGroup", 1, defgroup);
 }
 
-static void write_modifiers(WriteData *wd, ListBase *modbase, int write_undo)
+static void write_modifiers(WriteData *wd, ListBase *modbase)
 {
 	ModifierData *md;
 
@@ -1166,13 +1166,13 @@ static void write_modifiers(WriteData *wd, ListBase *modbase, int write_undo)
 		else if (md->type==eModifierType_Multires) {
 			MultiresModifierData *mmd = (MultiresModifierData*) md;
 
-			if(mmd->undo_verts && write_undo)
+			if(mmd->undo_verts)
 				writestruct(wd, DATA, "MVert", mmd->undo_verts_tot, mmd->undo_verts);
 		}
 	}
 }
 
-static void write_objects(WriteData *wd, ListBase *idbase, int write_undo)
+static void write_objects(WriteData *wd, ListBase *idbase)
 {
 	Object *ob;
 	
@@ -1206,7 +1206,7 @@ static void write_objects(WriteData *wd, ListBase *idbase, int write_undo)
 			writestruct(wd, DATA, "BulletSoftBody", 1, ob->bsoft);
 			
 			write_particlesystems(wd, &ob->particlesystem);
-			write_modifiers(wd, &ob->modifiers, write_undo);
+			write_modifiers(wd, &ob->modifiers);
 		}
 		ob= ob->id.next;
 	}
@@ -2320,7 +2320,7 @@ static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFil
 	write_groups   (wd, &mainvar->group);
 	write_armatures(wd, &mainvar->armature);
 	write_actions  (wd, &mainvar->action);
-	write_objects  (wd, &mainvar->object, (current != NULL));
+	write_objects  (wd, &mainvar->object);
 	write_materials(wd, &mainvar->mat);
 	write_textures (wd, &mainvar->tex);
 	write_meshs    (wd, &mainvar->mesh);

From c21627e31b0e82f28e35af51cec681897285ff78 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Wed, 19 Aug 2009 21:24:52 +0000
Subject: [PATCH 146/577] 2.5/Paint:

* Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
---
 source/blender/editors/include/ED_view3d.h    |   1 +
 .../editors/sculpt_paint/paint_intern.h       |  15 ++
 .../editors/sculpt_paint/paint_stroke.c       | 224 +++++++++++++++++
 .../editors/sculpt_paint/paint_vertex.c       | 203 ++++++++--------
 source/blender/editors/sculpt_paint/sculpt.c  | 229 +++++-------------
 .../editors/space_view3d/view3d_view.c        |  13 +
 6 files changed, 415 insertions(+), 270 deletions(-)
 create mode 100644 source/blender/editors/sculpt_paint/paint_stroke.c

diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 07aa44cadd8..fd1b7e1351d 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -70,6 +70,7 @@ float *give_cursor(struct Scene *scene, struct View3D *v3d);
 void initgrabz(struct RegionView3D *rv3d, float x, float y, float z);
 void window_to_3d(struct ARegion *ar, float *vec, short mx, short my);
 void window_to_3d_delta(struct ARegion *ar, float *vec, short mx, short my);
+void view3d_unproject(struct bglMats *mats, float out[3], const short x, const short y, const float z);
 
 /* Depth buffer */
 float read_cached_depth(struct ViewContext *vc, int x, int y);
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 40423e17fe4..41764a70686 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -29,13 +29,28 @@
 #ifndef ED_PAINT_INTERN_H
 #define ED_PAINT_INTERN_H
 
+struct bContext;
 struct Scene;
 struct Object;
 struct Mesh;
+struct PaintStroke;
+struct PointerRNA;
 struct ViewContext;
+struct wmEvent;
+struct wmOperator;
 struct wmOperatorType;
 struct ARegion;
 
+/* paint_stroke.c */
+typedef int (*StrokeTestStart)(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+typedef void (*StrokeUpdateStep)(struct bContext *C, struct PaintStroke *stroke, struct PointerRNA *itemptr);
+typedef void (*StrokeDone)(struct bContext *C, struct PaintStroke *stroke);
+
+struct PaintStroke *paint_stroke_new(bContext *C, StrokeTestStart test_start,
+				     StrokeUpdateStep update_step, StrokeDone done);
+int paint_stroke_modal(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+struct ViewContext *paint_stroke_view_context(struct PaintStroke *stroke);
+
 /* paint_vertex.c */
 void PAINT_OT_weight_paint_toggle(struct wmOperatorType *ot);
 void PAINT_OT_weight_paint_radial_control(struct wmOperatorType *ot);
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
new file mode 100644
index 00000000000..634b82674b5
--- /dev/null
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -0,0 +1,224 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software  Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2009 by Nicholas Bishop
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ *
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_brush_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+
+#include "RNA_access.h"
+
+#include "BKE_context.h"
+#include "BKE_paint.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "BLI_arithb.h"
+
+#include "BIF_glutil.h"
+
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
+#include "paint_intern.h"
+
+#include <float.h>
+#include <math.h>
+
+typedef struct PaintStroke {
+	/* Cached values */
+	ViewContext vc;
+	bglMats mats;
+	Brush *brush;
+
+	float last_mouse_position[2];
+
+	/* Set whether any stroke step has yet occured
+	   e.g. in sculpt mode, stroke doesn't start until cursor
+	   passes over the mesh */
+	int stroke_started;
+
+	StrokeTestStart test_start;
+	StrokeUpdateStep update_step;
+	StrokeDone done;
+} PaintStroke;
+
+/* Put the location of the next stroke dot into the stroke RNA and apply it to the mesh */
+static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *event, float mouse[2])
+{
+	PointerRNA itemptr;
+	float cur_depth, pressure = 1;
+	float center[3];
+	PaintStroke *stroke = op->customdata;
+
+	cur_depth = read_cached_depth(&stroke->vc, mouse[0], mouse[1]);
+	view3d_unproject(&stroke->mats, center, mouse[0], mouse[1], cur_depth);	
+
+	/* Tablet */
+	if(event->custom == EVT_DATA_TABLET) {
+		wmTabletData *wmtab= event->customdata;
+		if(wmtab->Active != EVT_TABLET_NONE)
+			pressure= wmtab->Pressure;
+	}
+				
+	/* Add to stroke */
+	RNA_collection_add(op->ptr, "stroke", &itemptr);
+	RNA_float_set_array(&itemptr, "location", center);
+	RNA_float_set_array(&itemptr, "mouse", mouse);
+	RNA_boolean_set(&itemptr, "flip", event->shift);
+	RNA_float_set(&itemptr, "pressure", pressure);
+
+	stroke->last_mouse_position[0] = mouse[0];
+	stroke->last_mouse_position[1] = mouse[1];
+
+	stroke->update_step(C, stroke, &itemptr);
+}
+
+/* Returns zero if no sculpt changes should be made, non-zero otherwise */
+static int paint_smooth_stroke(PaintStroke *stroke, float output[2], wmEvent *event)
+{
+	output[0] = event->x;
+	output[1] = event->y;
+
+	if(stroke->brush->flag & BRUSH_SMOOTH_STROKE && stroke->brush->sculpt_tool != SCULPT_TOOL_GRAB) {
+		float u = stroke->brush->smooth_stroke_factor, v = 1.0 - u;
+		float dx = stroke->last_mouse_position[0] - event->x, dy = stroke->last_mouse_position[1] - event->y;
+
+		/* If the mouse is moving within the radius of the last move,
+		   don't update the mouse position. This allows sharp turns. */
+		if(dx*dx + dy*dy < stroke->brush->smooth_stroke_radius * stroke->brush->smooth_stroke_radius)
+			return 0;
+
+		output[0] = event->x * v + stroke->last_mouse_position[0] * u;
+		output[1] = event->y * v + stroke->last_mouse_position[1] * u;
+	}
+
+	return 1;
+}
+
+/* Returns zero if the stroke dots should not be spaced, non-zero otherwise */
+static int paint_space_stroke_enabled(Brush *br)
+{
+	return (br->flag & BRUSH_SPACE) && !(br->flag & BRUSH_ANCHORED) && (br->sculpt_tool != SCULPT_TOOL_GRAB);
+}
+
+/* For brushes with stroke spacing enabled, moves mouse in steps
+   towards the final mouse location. */
+static int paint_space_stroke(bContext *C, wmOperator *op, wmEvent *event, const float final_mouse[2])
+{
+	PaintStroke *stroke = op->customdata;
+	int cnt = 0;
+
+	if(paint_space_stroke_enabled(stroke->brush)) {
+		float mouse[2] = {stroke->last_mouse_position[0], stroke->last_mouse_position[1]};
+		float vec[2] = {final_mouse[0] - mouse[0], final_mouse[1] - mouse[1]};
+		float length, scale;
+		int steps = 0, i;
+
+		/* Normalize the vector between the last stroke dot and the goal */
+		length = sqrt(vec[0]*vec[0] + vec[1]*vec[1]);
+
+		if(length > FLT_EPSILON) {
+			scale = stroke->brush->spacing / length;
+			vec[0] *= scale;
+			vec[1] *= scale;
+
+			steps = (int)(length / stroke->brush->spacing);
+			for(i = 0; i < steps; ++i, ++cnt) {
+				mouse[0] += vec[0];
+				mouse[1] += vec[1];
+				paint_brush_stroke_add_step(C, op, event, mouse);
+			}
+		}
+	}
+
+	return cnt;
+}
+
+/**** Public API ****/
+
+PaintStroke *paint_stroke_new(bContext *C, StrokeTestStart test_start,
+			      StrokeUpdateStep update_step, StrokeDone done)
+{
+	PaintStroke *stroke = MEM_callocN(sizeof(PaintStroke), "PaintStroke");
+
+	stroke->brush = paint_brush(paint_get_active(CTX_data_scene(C)));
+	view3d_set_viewcontext(C, &stroke->vc);
+	view3d_get_transformation(&stroke->vc, stroke->vc.obact, &stroke->mats);
+
+	stroke->test_start = test_start;
+	stroke->update_step = update_step;
+	stroke->done = done;
+
+	return stroke;
+}
+
+int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	PaintStroke *stroke = op->customdata;
+	float mouse[2];
+
+	if(!stroke->stroke_started) {
+		stroke->last_mouse_position[0] = event->x;
+		stroke->last_mouse_position[1] = event->y;
+		stroke->stroke_started = stroke->test_start(C, op, event);
+		ED_region_tag_redraw(ar);
+	}
+
+	if(stroke->stroke_started) {
+		if(paint_smooth_stroke(stroke, mouse, event)) {
+			if(paint_space_stroke_enabled(stroke->brush)) {
+				if(!paint_space_stroke(C, op, event, mouse))
+					ED_region_tag_redraw(ar);
+			}
+			else
+				paint_brush_stroke_add_step(C, op, event, mouse);
+		}
+		else
+			ED_region_tag_redraw(ar);
+	}
+
+	/* TODO: fix hardcoded event here */
+	if(event->type == LEFTMOUSE && event->val == 0) {
+		stroke->done(C, stroke);
+		MEM_freeN(stroke);
+		return OPERATOR_FINISHED;
+	}
+	else
+		return OPERATOR_RUNNING_MODAL;
+}
+
+ViewContext *paint_stroke_view_context(PaintStroke *stroke)
+{
+	return &stroke->vc;
+}
+
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 1a548708ec8..05faa47e0f4 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1709,122 +1709,123 @@ static void vpaint_exit(bContext *C, wmOperator *op)
 	op->customdata= NULL;
 }
 
-static int vpaint_modal(bContext *C, wmOperator *op, wmEvent *event)
+static void vpaint_dot(bContext *C, struct VPaintData *vpd, wmEvent *event)
 {
 	ToolSettings *ts= CTX_data_tool_settings(C);
 	VPaint *vp= ts->vpaint;
 	Brush *brush = paint_brush(&vp->paint);
-	
-	switch(event->type) {
-		case LEFTMOUSE:
-			if(event->val==0) { /* release */
-				vpaint_exit(C, op);
-				return OPERATOR_FINISHED;
-			}
-			/* pass on, first press gets painted too */
+	ViewContext *vc= &vpd->vc;
+	Object *ob= vc->obact;
+	Mesh *me= ob->data;
+	float mat[4][4];
+	int *indexar= vpd->indexar;
+	int totindex, index;
+	short mval[2];
 			
-		case MOUSEMOVE: 
-		{
-			struct VPaintData *vpd= op->customdata;
-			ViewContext *vc= &vpd->vc;
-			Object *ob= vc->obact;
-			Mesh *me= ob->data;
-			float mat[4][4];
-			int *indexar= vpd->indexar;
-			int totindex, index;
-			short mval[2];
+	view3d_operator_needs_opengl(C);
 			
-			view3d_operator_needs_opengl(C);
+	/* load projection matrix */
+	wmMultMatrix(ob->obmat);
+	wmGetSingleMatrix(mat);
+	wmLoadMatrix(vc->rv3d->viewmat);
 			
-			/* load projection matrix */
-			wmMultMatrix(ob->obmat);
-			wmGetSingleMatrix(mat);
-			wmLoadMatrix(vc->rv3d->viewmat);
-			
-			mval[0]= event->x - vc->ar->winrct.xmin;
-			mval[1]= event->y - vc->ar->winrct.ymin;
+	mval[0]= event->x - vc->ar->winrct.xmin;
+	mval[1]= event->y - vc->ar->winrct.ymin;
 				
-			/* which faces are involved */
-			if(vp->flag & VP_AREA) {
-				totindex= sample_backbuf_area(vc, indexar, me->totface, mval[0], mval[1], brush->size);
-			}
-			else {
-				indexar[0]= view3d_sample_backbuf(vc, mval[0], mval[1]);
-				if(indexar[0]) totindex= 1;
-				else totindex= 0;
-			}
+	/* which faces are involved */
+	if(vp->flag & VP_AREA) {
+		totindex= sample_backbuf_area(vc, indexar, me->totface, mval[0], mval[1], brush->size);
+	}
+	else {
+		indexar[0]= view3d_sample_backbuf(vc, mval[0], mval[1]);
+		if(indexar[0]) totindex= 1;
+		else totindex= 0;
+	}
 			
-			MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
+	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
-			if(vp->flag & VP_COLINDEX) {
-				for(index=0; index<totindex; index++) {
-					if(indexar[index] && indexar[index]<=me->totface) {
-						MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
+	if(vp->flag & VP_COLINDEX) {
+		for(index=0; index<totindex; index++) {
+			if(indexar[index] && indexar[index]<=me->totface) {
+				MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
 						
-						if(mface->mat_nr!=ob->actcol-1) {
-							indexar[index]= 0;
-						}
-					}					
+				if(mface->mat_nr!=ob->actcol-1) {
+					indexar[index]= 0;
 				}
-			}
-			if((G.f & G_FACESELECT) && me->mface) {
-				for(index=0; index<totindex; index++) {
-					if(indexar[index] && indexar[index]<=me->totface) {
-						MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-						
-						if((mface->flag & ME_FACE_SEL)==0)
-							indexar[index]= 0;
-					}					
-				}
-			}
-			
-			for(index=0; index<totindex; index++) {
-				
-				if(indexar[index] && indexar[index]<=me->totface) {
-					MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-					unsigned int *mcol=	  ( (unsigned int *)me->mcol) + 4*(indexar[index]-1);
-					unsigned int *mcolorig= ( (unsigned int *)vp->vpaint_prev) + 4*(indexar[index]-1);
-					int alpha;
-					
-					if(vp->mode==VP_BLUR) {
-						unsigned int fcol1= mcol_blend( mcol[0], mcol[1], 128);
-						if(mface->v4) {
-							unsigned int fcol2= mcol_blend( mcol[2], mcol[3], 128);
-							vpd->paintcol= mcol_blend( fcol1, fcol2, 128);
-						}
-						else {
-							vpd->paintcol= mcol_blend( mcol[2], fcol1, 170);
-						}
-						
-					}
-					
-					alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v1, mval);
-					if(alpha) vpaint_blend(vp, mcol, mcolorig, vpd->paintcol, alpha);
-					
-					alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v2, mval);
-					if(alpha) vpaint_blend(vp, mcol+1, mcolorig+1, vpd->paintcol, alpha);
-					
-					alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v3, mval);
-					if(alpha) vpaint_blend(vp, mcol+2, mcolorig+2, vpd->paintcol, alpha);
-					
-					if(mface->v4) {
-						alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v4, mval);
-						if(alpha) vpaint_blend(vp, mcol+3, mcolorig+3, vpd->paintcol, alpha);
-					}
-				}
-			}
-						
-			MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
-			
-			do_shared_vertexcol(me);
-			
-			ED_region_tag_redraw(vc->ar);
-			
-			DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
+			}					
 		}
+	}
+	if((G.f & G_FACESELECT) && me->mface) {
+		for(index=0; index<totindex; index++) {
+			if(indexar[index] && indexar[index]<=me->totface) {
+				MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
+						
+				if((mface->flag & ME_FACE_SEL)==0)
+					indexar[index]= 0;
+			}					
+		}
+	}
+			
+	for(index=0; index<totindex; index++) {
+				
+		if(indexar[index] && indexar[index]<=me->totface) {
+			MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
+			unsigned int *mcol=	  ( (unsigned int *)me->mcol) + 4*(indexar[index]-1);
+			unsigned int *mcolorig= ( (unsigned int *)vp->vpaint_prev) + 4*(indexar[index]-1);
+			int alpha;
+					
+			if(vp->mode==VP_BLUR) {
+				unsigned int fcol1= mcol_blend( mcol[0], mcol[1], 128);
+				if(mface->v4) {
+					unsigned int fcol2= mcol_blend( mcol[2], mcol[3], 128);
+					vpd->paintcol= mcol_blend( fcol1, fcol2, 128);
+				}
+				else {
+					vpd->paintcol= mcol_blend( mcol[2], fcol1, 170);
+				}
+						
+			}
+					
+			alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v1, mval);
+			if(alpha) vpaint_blend(vp, mcol, mcolorig, vpd->paintcol, alpha);
+					
+			alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v2, mval);
+			if(alpha) vpaint_blend(vp, mcol+1, mcolorig+1, vpd->paintcol, alpha);
+					
+			alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v3, mval);
+			if(alpha) vpaint_blend(vp, mcol+2, mcolorig+2, vpd->paintcol, alpha);
+					
+			if(mface->v4) {
+				alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v4, mval);
+				if(alpha) vpaint_blend(vp, mcol+3, mcolorig+3, vpd->paintcol, alpha);
+			}
+		}
+	}
+						
+	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
+			
+	do_shared_vertexcol(me);
+			
+	ED_region_tag_redraw(vc->ar);
+			
+	DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
+}
+
+static int vpaint_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+	switch(event->type) {
+	case LEFTMOUSE:
+		if(event->val==0) { /* release */
+			vpaint_exit(C, op);
+			return OPERATOR_FINISHED;
+		}
+		/* pass on, first press gets painted too */
+		
+	case MOUSEMOVE: 
+		vpaint_dot(C, op->customdata, event);
 		break;
 	}	
-
+	
 	return OPERATOR_RUNNING_MODAL;
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f7f72d611dc..c01004f5b7e 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -80,6 +80,7 @@
 #include "ED_space_api.h"
 #include "ED_util.h"
 #include "ED_view3d.h"
+#include "paint_intern.h"
 #include "sculpt_intern.h"
 
 #include "RNA_access.h"
@@ -144,7 +145,6 @@ typedef struct StrokeCache {
 
 	int first_time; /* Beginning of stroke may do some things special */
 
-	ViewContext vc;
 	bglMats *mats;
 
 	short (*orig_norms)[3]; /* Copy of the mesh vertices' normals */
@@ -178,19 +178,6 @@ typedef struct ProjVert {
  * Simple functions to get data from the GL
  */
 
-/* Uses window coordinates (x,y) and depth component z to find a point in
-   modelspace */
-static void unproject(bglMats *mats, float out[3], const short x, const short y, const float z)
-{
-	double ux, uy, uz;
-
-        gluUnProject(x,y,z, mats->modelview, mats->projection,
-		     (GLint *)mats->viewport, &ux, &uy, &uz );
-	out[0] = ux;
-	out[1] = uy;
-	out[2] = uz;
-}
-
 /* Convert a point in model coordinates to 2D screen coordinates. */
 static void projectf(bglMats *mats, const float v[3], float p[2])
 {
@@ -547,7 +534,7 @@ static void do_flatten_clay_brush(Sculpt *sd, SculptSession *ss, const ListBase
 	ActiveData *node= active_verts->first;
 	/* area_normal and cntr define the plane towards which vertices are squashed */
 	float area_normal[3];
-	float cntr[3], cntr2[3], bstr;
+	float cntr[3], cntr2[3], bstr = 0;
 	int flip = 0;
 
 	calc_area_normal(sd, ss, area_normal, active_verts);
@@ -1169,7 +1156,7 @@ static float unproject_brush_radius(SculptSession *ss, float offset)
 	float brush_edge[3];
 
 	/* In anchored mode, brush size changes with mouse loc, otherwise it's fixed using the brush radius */
-	unproject(ss->cache->mats, brush_edge, ss->cache->initial_mouse[0] + offset,
+	view3d_unproject(ss->cache->mats, brush_edge, ss->cache->initial_mouse[0] + offset,
 		  ss->cache->initial_mouse[1], ss->cache->depth);
 
 	return VecLenf(ss->cache->true_location, brush_edge);
@@ -1194,6 +1181,7 @@ static void sculpt_update_cache_invariants(Sculpt *sd, SculptSession *ss, bConte
 {
 	StrokeCache *cache = MEM_callocN(sizeof(StrokeCache), "stroke cache");
 	Brush *brush = paint_brush(&sd->paint);
+	ViewContext *vc = paint_stroke_view_context(op->customdata);
 	int i;
 
 	ss->cache = cache;
@@ -1209,10 +1197,8 @@ static void sculpt_update_cache_invariants(Sculpt *sd, SculptSession *ss, bConte
 
 	/* Truly temporary data that isn't stored in properties */
 
-	view3d_set_viewcontext(C, &cache->vc);
-
 	cache->mats = MEM_callocN(sizeof(bglMats), "sculpt bglMats");
-	view3d_get_transformation(&cache->vc, cache->vc.obact, cache->mats);
+	view3d_get_transformation(vc, vc->obact, cache->mats);
 
 	sculpt_update_mesh_elements(C);
 
@@ -1252,7 +1238,7 @@ static void sculpt_update_cache_invariants(Sculpt *sd, SculptSession *ss, bConte
 		}
 	}
 
-	unproject(cache->mats, cache->true_location, cache->initial_mouse[0], cache->initial_mouse[1], cache->depth);
+	view3d_unproject(cache->mats, cache->true_location, cache->initial_mouse[0], cache->initial_mouse[1], cache->depth);
 	cache->initial_radius = unproject_brush_radius(ss, brush->size);
 	cache->rotation = 0;
 	cache->first_time = 1;
@@ -1312,7 +1298,7 @@ static void sculpt_update_cache_variants(Sculpt *sd, SculptSession *ss, PointerR
 
 	/* Find the grab delta */
 	if(brush->sculpt_tool == SCULPT_TOOL_GRAB) {
-		unproject(cache->mats, grab_location, cache->mouse[0], cache->mouse[1], cache->depth);
+		view3d_unproject(cache->mats, grab_location, cache->mouse[0], cache->mouse[1], cache->depth);
 		if(!cache->first_time)
 			VecSubf(cache->grab_delta, grab_location, cache->old_grab_location);
 		VecCopyf(cache->old_grab_location, grab_location);
@@ -1325,7 +1311,6 @@ static void sculpt_brush_stroke_init_properties(bContext *C, wmOperator *op, wmE
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	Object *ob= CTX_data_active_object(C);
 	ModifierData *md;
-	ViewContext vc;
 	float scale[3], clip_tolerance[3] = {0,0,0};
 	float mouse[2];
 	int flag = 0;
@@ -1358,13 +1343,12 @@ static void sculpt_brush_stroke_init_properties(bContext *C, wmOperator *op, wmE
 	RNA_float_set_array(op->ptr, "initial_mouse", mouse);
 
 	/* Initial screen depth under the mouse */
-	view3d_set_viewcontext(C, &vc);
-	RNA_float_set(op->ptr, "depth", read_cached_depth(&vc, event->x, event->y));
+	RNA_float_set(op->ptr, "depth", read_cached_depth(paint_stroke_view_context(op->customdata), event->x, event->y));
 
 	sculpt_update_cache_invariants(sd, ss, C, op);
 }
 
-static int sculpt_brush_stroke_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static void sculpt_brush_stroke_init(bContext *C)
 {
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	SculptSession *ss = CTX_data_active_object(C)->sculpt;
@@ -1376,10 +1360,7 @@ static int sculpt_brush_stroke_invoke(bContext *C, wmOperator *op, wmEvent *even
 	   changes are made to the texture. */
 	sculpt_update_tex(sd, ss);
 
-	/* add modal handler */
-	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
-	
-	return OPERATOR_RUNNING_MODAL;
+	sculpt_update_mesh_elements(C);
 }
 
 static void sculpt_restore_mesh(Sculpt *sd, SculptSession *ss)
@@ -1435,157 +1416,67 @@ static void sculpt_flush_update(bContext *C)
 	ED_region_tag_redraw(ar);
 }
 
-/* Returns zero if no sculpt changes should be made, non-zero otherwise */
-static int sculpt_smooth_stroke(Sculpt *s, SculptSession *ss, float output[2], wmEvent *event)
+static int sculpt_stroke_test_start(bContext *C, struct wmOperator *op, wmEvent *event)
 {
-	Brush *brush = paint_brush(&s->paint);
-
-	output[0] = event->x;
-	output[1] = event->y;
-
-	if(brush->flag & BRUSH_SMOOTH_STROKE && brush->sculpt_tool != SCULPT_TOOL_GRAB) {
-		StrokeCache *cache = ss->cache;
-		float u = brush->smooth_stroke_factor, v = 1.0 - u;
-		float dx = cache->mouse[0] - event->x, dy = cache->mouse[1] - event->y;
-
-		/* If the mouse is moving within the radius of the last move,
-		   don't update the mouse position. This allows sharp turns. */
-		if(dx*dx + dy*dy < brush->smooth_stroke_radius * brush->smooth_stroke_radius)
-			return 0;
-
-		output[0] = event->x * v + cache->mouse[0] * u;
-		output[1] = event->y * v + cache->mouse[1] * u;
-	}
-
-	return 1;
-}
-
-/* Returns zero if the stroke dots should not be spaced, non-zero otherwise */
-int sculpt_space_stroke_enabled(Sculpt *s)
-{
-	Brush *br = paint_brush(&s->paint);
-	return (br->flag & BRUSH_SPACE) && !(br->flag & BRUSH_ANCHORED) && (br->sculpt_tool != SCULPT_TOOL_GRAB);
-}
-
-/* Put the location of the next sculpt stroke dot into the stroke RNA and apply it to the mesh */
-static void sculpt_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *event, float mouse[2])
-{
-	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-	SculptSession *ss = CTX_data_active_object(C)->sculpt;
-	StrokeCache *cache = ss->cache;
-	PointerRNA itemptr;
-	float cur_depth, pressure = 1;
-	float center[3];
-
-	cur_depth = read_cached_depth(&cache->vc, mouse[0], mouse[1]);
-	unproject(ss->cache->mats, center, mouse[0], mouse[1], cur_depth);
-
-	/* Tablet */
-	if(event->custom == EVT_DATA_TABLET) {
-		wmTabletData *wmtab= event->customdata;
-		if(wmtab->Active != EVT_TABLET_NONE)
-			pressure= wmtab->Pressure;
-	}
-				
-	/* Add to stroke */
-	RNA_collection_add(op->ptr, "stroke", &itemptr);
-	RNA_float_set_array(&itemptr, "location", center);
-	RNA_float_set_array(&itemptr, "mouse", mouse);
-	RNA_boolean_set(&itemptr, "flip", event->shift);
-	RNA_float_set(&itemptr, "pressure", pressure);
-	sculpt_update_cache_variants(sd, ss, &itemptr);
-				
-	sculpt_restore_mesh(sd, ss);
-	do_symmetrical_brush_actions(sd, ss);
-}
-
-/* For brushes with stroke spacing enabled, moves mouse in steps
-   towards the final mouse location. */
-static int sculpt_space_stroke(bContext *C, wmOperator *op, wmEvent *event, Sculpt *s, SculptSession *ss, const float final_mouse[2])
-{
-	StrokeCache *cache = ss->cache;
-	Brush *brush = paint_brush(&s->paint);
-	int cnt = 0;
-
-	if(sculpt_space_stroke_enabled(s)) {
-		float vec[2] = {final_mouse[0] - cache->mouse[0], final_mouse[1] - cache->mouse[1]};
-		float mouse[2] = {cache->mouse[0], cache->mouse[1]};
-		float length, scale;
-		int steps = 0, i;
-
-		/* Normalize the vector between the last stroke dot and the goal */
-		length = sqrt(vec[0]*vec[0] + vec[1]*vec[1]);
-
-		if(length > FLT_EPSILON) {
-			scale = brush->spacing / length;
-			vec[0] *= scale;
-			vec[1] *= scale;
-
-			steps = (int)(length / brush->spacing);
-			for(i = 0; i < steps; ++i, ++cnt) {
-				mouse[0] += vec[0];
-				mouse[1] += vec[1];
-				sculpt_brush_stroke_add_step(C, op, event, mouse);
-			}
-		}
-	}
-
-	return cnt;
-}
-
-static int sculpt_brush_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-	SculptSession *ss = CTX_data_active_object(C)->sculpt;
-	ARegion *ar = CTX_wm_region(C);
+	ViewContext vc;
 	float cur_depth;
 
-	sculpt_update_mesh_elements(C);
+	view3d_set_viewcontext(C, &vc);
+	cur_depth = read_cached_depth(&vc, event->x, event->y);
+	
+	/* Don't start the stroke until a valid depth is found */
+	if(cur_depth < 1.0 - FLT_EPSILON) {
+		SculptSession *ss = CTX_data_active_object(C)->sculpt;
 
-	if(!ss->cache) {
-		ViewContext vc;
-		view3d_set_viewcontext(C, &vc);
-		cur_depth = read_cached_depth(&vc, event->x, event->y);
+		sculpt_brush_stroke_init_properties(C, op, event, ss);
+		sculptmode_update_all_projverts(ss);
 
-		/* Don't start the stroke until a valid depth is found */
-		if(cur_depth < 1.0 - FLT_EPSILON) {
-			sculpt_brush_stroke_init_properties(C, op, event, ss);
-			sculptmode_update_all_projverts(ss);
-		}
-
-		ED_region_tag_redraw(ar);
+		return 1;
 	}
+	else
+		return 0;
+}
 
-	if(ss->cache) {
-		float mouse[2];
+static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
+{
+	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
+	SculptSession *ss = CTX_data_active_object(C)->sculpt;
 
-		if(sculpt_smooth_stroke(sd, ss, mouse, event)) {
-			if(sculpt_space_stroke_enabled(sd)) {
-				if(!sculpt_space_stroke(C, op, event, sd, ss, mouse))
-					ED_region_tag_redraw(ar);
-			}
-			else
-				sculpt_brush_stroke_add_step(C, op, event, mouse);
+	sculpt_update_cache_variants(sd, ss, itemptr);
+	sculpt_restore_mesh(sd, ss);
+	do_symmetrical_brush_actions(sd, ss);
 
-			sculpt_flush_update(C);
-			sculpt_post_stroke_free(ss);
-		}
-		else
-			ED_region_tag_redraw(ar);
-	}
+	/* Cleanup */
+	sculpt_flush_update(C); // XXX: during exec, shouldn't do this every time
+	sculpt_post_stroke_free(ss);
+}
+
+static void sculpt_stroke_done(bContext *C, struct PaintStroke *stroke)
+{
+	SculptSession *ss = CTX_data_active_object(C)->sculpt;
 
 	/* Finished */
-	if(event->type == LEFTMOUSE && event->val == 0) {
-		if(ss->cache) {
-			request_depth_update(ss->cache->vc.rv3d);
-			sculpt_cache_free(ss->cache);
-			ss->cache = NULL;
-			sculpt_undo_push(C, sd);
-		}
+	if(ss->cache) {
+		Sculpt *sd = CTX_data_tool_settings(C)->sculpt;		
 
-		return OPERATOR_FINISHED;
+		request_depth_update(paint_stroke_view_context(stroke)->rv3d);
+		sculpt_cache_free(ss->cache);
+		ss->cache = NULL;
+		sculpt_undo_push(C, sd);
 	}
+}
 
+static int sculpt_brush_stroke_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	sculpt_brush_stroke_init(C);
+
+	op->customdata = paint_stroke_new(C, sculpt_stroke_test_start,
+					  sculpt_stroke_update_step,
+					  sculpt_stroke_done);
+
+	/* add modal handler */
+	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+	
 	return OPERATOR_RUNNING_MODAL;
 }
 
@@ -1594,10 +1485,10 @@ static int sculpt_brush_stroke_exec(bContext *C, wmOperator *op)
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	SculptSession *ss = CTX_data_active_object(C)->sculpt;
 
-	view3d_operator_needs_opengl(C);
+	sculpt_brush_stroke_init(C);
+
 	sculpt_update_cache_invariants(sd, ss, C, op);
 	sculptmode_update_all_projverts(ss);
-	sculpt_update_tex(sd, ss);
 
 	RNA_BEGIN(op->ptr, itemptr, "stroke") {
 		sculpt_update_cache_variants(sd, ss, &itemptr);
@@ -1627,7 +1518,7 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->invoke= sculpt_brush_stroke_invoke;
-	ot->modal= sculpt_brush_stroke_modal;
+	ot->modal= paint_stroke_modal;
 	ot->exec= sculpt_brush_stroke_exec;
 	ot->poll= sculpt_poll;
 	
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 58b7a70a128..ce7b6ba454d 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -63,6 +63,7 @@
 #include "RE_pipeline.h"	// make_stars
 
 #include "BIF_gl.h"
+#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -543,6 +544,18 @@ void view3d_get_object_project_mat(RegionView3D *rv3d, Object *ob, float pmat[4]
 	Mat4MulMat4(pmat, vmat, rv3d->winmat);
 }
 
+/* Uses window coordinates (x,y) and depth component z to find a point in
+   modelspace */
+void view3d_unproject(bglMats *mats, float out[3], const short x, const short y, const float z)
+{
+	double ux, uy, uz;
+
+        gluUnProject(x,y,z, mats->modelview, mats->projection,
+		     (GLint *)mats->viewport, &ux, &uy, &uz );
+	out[0] = ux;
+	out[1] = uy;
+	out[2] = uz;
+}
 
 /* use above call to get projecting mat */
 void view3d_project_float(ARegion *ar, float *vec, float *adr, float mat[4][4])

From 33adf41cac96d87d7977844a5ec36697f85c20a0 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 19 Aug 2009 21:47:47 +0000
Subject: [PATCH 147/577] * CMake fixes, mustn't have come through in the merge

---
 CMakeLists.txt | 202 ++++++++++++++++++++++++++++---------------------
 1 file changed, 116 insertions(+), 86 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edbb66290d3..00d2244511f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,22 +53,25 @@ SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
 #-----------------------------------------------------------------------------
 # Set default config options
-OPTION(WITH_PLAYER		"Build Player"						OFF)
-OPTION(WITH_GAMEENGINE		"Enable Game Engine"					ON)
-OPTION(WITH_BULLET		"Enable Bullet (Physics Engine)"			ON)
-OPTION(WITH_INTERNATIONAL	"Enable I18N   (International fonts and text)"		ON)
-OPTION(WITH_ELBEEM		"Enable Elbeem (Fluid Simulation)"			ON)
-OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
-OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
-OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
-OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_PYTHON		"Enable Embedded Python API"				ON)
-OPTION(WITH_SDL			"Enable SDL for sound and joystick support"				ON)
-OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
-OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
-OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
-OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
-OPTION(WITH_FFTW3		"Enable FFTW3 support"				OFF)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_DDS           "Enable DDS Support" ON)
+OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
+OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -94,13 +97,18 @@ IF(UNIX AND NOT APPLE)
     FIND_PACKAGE(OpenAL)
     IF(OPENAL_FOUND)
       SET(WITH_OPENAL ON)
-      SET(OPENAL_LIB ${OPENAL_LIBRARY})
-      SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
     ELSE(OPENAL_FOUND)
       SET(WITH_OPENAL OFF)
     ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
+  IF(WITH_JACK)
+    SET(JACK /usr)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
+  ENDIF(WITH_JACK)
+
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS
@@ -111,34 +119,34 @@ IF(UNIX AND NOT APPLE)
     PATHS
     /sw/lib
   )
+  
   IF(INTL_LIBRARY AND ICONV_LIBRARY)
     SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
   ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
-  
-  FIND_PATH(FREETYPE_INC
-    freetype
-    PATHS
-    /usr/local/include/freetype2
-    /usr/include/freetype2
-    /sw/include/freetype2
-    /opt/local/include/freetype2
-    /opt/csw/include/freetype2
-    /opt/include/freetype2
-    NO_DEFAULT_PATH
-  )
-  SET(FREETYPE_LIB freetype)
 
-  FIND_PACKAGE(PythonLibs)
-  SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
-  SET(PYTHON_LIB "${PYTHON_LIBRARIES}" CACHE STRING "")
-  FIND_PACKAGE(PythonInterp)
-  SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+  FIND_PACKAGE(Freetype)
+  # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+
+  # No way to set py31. remove for now.
+  # FIND_PACKAGE(PythonLibs)
+  SET(PYTHON /usr)
+  SET(PYTHON_VERSION 3.1)
+  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+  # SET(PYTHON_BINARY python) # not used yet
+  SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+  SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+  
+  # FIND_PACKAGE(PythonInterp) # not used yet
+  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+  
   SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
   IF(WITH_SDL)
     FIND_PACKAGE(SDL)
-    SET(SDL_INC ${SDL_INCLUDE_DIR})
-    SET(SDL_LIB ${SDL_LIBRARY})
+    # UNSET(SDLMAIN_LIBRARY CACHE)
+    IF(NOT SDL_FOUND)
+      SET(WITH_SDL OFF)
+    ENDIF(NOT SDL_FOUND)
   ENDIF(WITH_SDL)
 
   FIND_PATH(OPENEXR_INC
@@ -159,10 +167,10 @@ IF(UNIX AND NOT APPLE)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
   IF(WITH_FFTW3)
-	  SET(FFTW3 /usr)
-	  SET(FFTW3_INC ${FFTW3}/include)
-	  SET(FFTW3_LIB fftw3)
-	  SET(FFTW3_LIBPATH ${FFTW3}/lib)
+    SET(FFTW3 /usr)
+    SET(FFTW3_INC ${FFTW3}/include)
+    SET(FFTW3_LIB fftw3)
+    SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
 
   SET(LIBSAMPLERATE /usr)
@@ -176,7 +184,13 @@ IF(UNIX AND NOT APPLE)
 
   FIND_PACKAGE(ZLIB REQUIRED)
 
-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11 -ldl")
+  # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+
+  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    # BSD's dont use libdl.so
+    SET(LLIBS "${LLIBS} -ldl")
+  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
   IF(WITH_OPENMP)
     SET(LLIBS "${LLIBS} -lgomp")
@@ -191,6 +205,7 @@ IF(UNIX AND NOT APPLE)
 
   # Better warnings
   SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
+  SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
@@ -211,22 +226,29 @@ IF(WIN32)
   SET(PYTHON ${LIBDIR}/python)
   SET(PYTHON_VERSION 3.1)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-  SET(PYTHON_BINARY python)
+  # SET(PYTHON_BINARY python) # not used yet
   SET(PYTHON_LIB python31)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   IF(CMAKE_CL_64)
     SET(WITH_OPENAL OFF)
   ELSE(CMAKE_CL_64)
-	#SET(WITH_OPENAL ON)
-	SET(OPENAL ${LIBDIR}/openal)
-	SET(OPENAL_INC ${OPENAL}/include)
-	SET(OPENAL_LIB wrap_oal)
-	SET(OPENAL_LIBPATH ${OPENAL}/lib)
+    #SET(WITH_OPENAL ON)
+    SET(OPENAL ${LIBDIR}/openal)
+    SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+    SET(OPENAL_LIBRARY wrap_oal)
+    SET(OPENAL_LIBPATH ${OPENAL}/lib)
   ENDIF(CMAKE_CL_64)
 
+  IF(WITH_JACK)
+    SET(JACK ${LIBDIR}/jack)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
+  ENDIF(WITH_JACK)
+
   IF(CMAKE_CL_64)
-	SET(PNG_LIBRARIES libpng)
+    SET(PNG_LIBRARIES libpng)
   ELSE(CMAKE_CL_64)
     SET(PNG_LIBRARIES libpng_st)
   ENDIF(CMAKE_CL_64)
@@ -234,7 +256,7 @@ IF(WIN32)
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
-  SET(ZLIB_LIBRARIES libz)
+  SET(ZLIB_LIBRARIES zlib)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
@@ -248,36 +270,36 @@ IF(WIN32)
   SET(ICONV_LIBPATH ${ICONV}/lib)
   
   IF(WITH_FFTW3)
-	  SET(FFTW3 ${LIBDIR}/fftw3)
-	  SET(FFTW3_INC ${FFTW3}/include)
-	  SET(FFTW3_LIB libfftw)
-	  SET(FFTW3_LIBPATH ${FFTW3}/lib)
+    SET(FFTW3 ${LIBDIR}/fftw3)
+    SET(FFTW3_INC ${FFTW3}/include)
+    SET(FFTW3_LIB libfftw)
+    SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
   
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
   IF(CMAKE_CL_64)
-  	SET(GETTEXT_LIB gettext)
+    SET(GETTEXT_LIB gettextlib)
   ELSE(CMAKE_CL_64)
-  	SET(GETTEXT_LIB gnu_gettext)
+    SET(GETTEXT_LIB gnu_gettext)
   ENDIF(CMAKE_CL_64)
   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
 
   SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
   SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIB freetype2ST)
+  SET(FREETYPE_LIBRARY freetype2ST)
   
   SET(OPENEXR ${LIBDIR}/openexr)
   SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
   SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   IF (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
   ELSE (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   ENDIF(MSVC80)
   IF (MSVC90)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
   ENDIF(MSVC90)
 
   
@@ -297,9 +319,9 @@ IF(WIN32)
   SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
   IF(CMAKE_CL_64)
-  SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+    SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
   ELSE(CMAKE_CL_64)
-  SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+    SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   ENDIF(CMAKE_CL_64)
 
   SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -317,8 +339,8 @@ IF(WIN32)
   ENDIF(WITH_OPENMP)
 
   SET(SDL ${LIBDIR}/sdl)
-  SET(SDL_INC ${SDL}/include)
-  SET(SDL_LIB SDL)
+  SET(SDL_INCLUDE_DIR ${SDL}/include)
+  SET(SDL_LIBRARY SDL)
   SET(SDL_LIBPATH ${SDL}/lib)
 
   SET(PNG "${LIBDIR}/png")
@@ -335,10 +357,11 @@ IF(WIN32)
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+    SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+    SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)
+  
   SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
 ENDIF(WIN32)
 
@@ -353,13 +376,17 @@ IF(APPLE)
     FIND_PACKAGE(OpenAL)
     IF(OPENAL_FOUND)
       SET(WITH_OPENAL ON)
-      SET(OPENAL_LIB ${OPENAL_LIBRARY})
-      SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
     ELSE(OPENAL_FOUND)
       SET(WITH_OPENAL OFF)
     ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
+  IF(WITH_JACK)
+    SET(JACK /usr)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
+  ENDIF(WITH_JACK)
 
   SET(PYTHON_VERSION 3.1)
 
@@ -368,7 +395,7 @@ IF(APPLE)
 
     SET(PYTHON ${LIBDIR}/python)
     SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
+    # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
     SET(PYTHON_LIB python${PYTHON_VERSION})
     SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
     #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
@@ -378,7 +405,7 @@ IF(APPLE)
     SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
     SET(PYTHON_VERSION 2.5)
     SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
+    # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
     SET(PYTHON_LIB "")
     SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
     SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
@@ -391,9 +418,9 @@ IF(APPLE)
   
   IF(WITH_FFTW3)
     SET(FFTW3 ${LIBDIR}/fftw3)
-	SET(FFTW3_INC ${FFTW3}/include)
-	SET(FFTW3_LIB libfftw)
-	SET(FFTW3_LIBPATH ${FFTW3}/lib)
+    SET(FFTW3_INC ${FFTW3}/include)
+    SET(FFTW3_LIB libfftw)
+    SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
 
   SET(PNG_LIBRARIES png)
@@ -404,9 +431,9 @@ IF(APPLE)
   SET(ZLIB_LIBRARIES z)
 
   SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
   SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIB freetype)
+  SET(FREETYPE_LIBRARY freetype)
 
   SET(OPENEXR ${LIBDIR}/openexr)
   SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
@@ -435,8 +462,8 @@ IF(APPLE)
   ENDIF(WITH_OPENMP)
 
   SET(SDL ${LIBDIR}/sdl)
-  SET(SDL_INC ${SDL}/include)
-  SET(SDL_LIB SDL)
+  SET(SDL_INCLUDE_DIR ${SDL}/include)
+  SET(SDL_LIBRARY SDL)
   SET(SDL_LIBPATH ${SDL}/lib)
 
   SET(PNG "${LIBDIR}/png")
@@ -480,16 +507,18 @@ ENDIF(WITH_WEBPLUGIN)
 # Configure OpenGL.
 FIND_PACKAGE(OpenGL)
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+# UNSET(OPENGL_LIBRARIES CACHE) # not compat with older cmake 
+# UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake 
+
 #-----------------------------------------------------------------------------
 # Extra compile flags
-IF(WITH_GAMEENGINE)
-  SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DGAMEBLENDER ")
-ENDIF(WITH_GAMEENGINE)
-IF(WITH_BULLET)
-  SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DWITH_BULLET ")
-ENDIF(WITH_BULLET)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
+
+# better not define flags here but this is a debugging option thats off by default.
+IF(WITH_CXX_GUARDEDALLOC)
+  SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+ENDIF(WITH_CXX_GUARDEDALLOC)
 
 #-----------------------------------------------------------------------------
 # Libraries
@@ -509,3 +538,4 @@ ADD_SUBDIRECTORY(source/creator)
 IF(WITH_PLAYER)
   ADD_SUBDIRECTORY(blenderplayer)
 ENDIF(WITH_PLAYER)
+

From fa5838c7be5a3eb64df90d5cc17f15ed997743ba Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 19 Aug 2009 21:48:09 +0000
Subject: [PATCH 148/577] * volume rendering cleanups and optimisations

---
 .../blender/render/intern/source/volumetric.c | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 3c3827d8baf..8a714aef992 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -234,6 +234,23 @@ float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w
 	}
 }
 
+/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
+ * Used in the relationship Transmittance = e^(-attenuation)
+ */
+void vol_get_attenuation_seg(ShadeInput *shi, float *tau, float *stepvec, float *co, float density)
+{
+	/* input density = density at co */
+	float absorb_col[3];
+	const float dist = VecLength(stepvec);
+	
+	vol_get_absorption(shi, absorb_col, co);
+	
+	/* homogenous volume within the sampled distance */
+	tau[0] = tau[1] = tau[2] = dist * density;
+		
+	VecMulVecf(tau, tau, absorb_col);
+}
+
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
  */
@@ -249,18 +266,7 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 
 	nsteps = (int)((dist / stepsize) + 0.5);
 	
-	/* trigger for recalculating density */
-	if (density < -0.001f) density = vol_get_density(shi, co);
-	
-	if (nsteps == 1) {
-		/* homogenous volume within the sampled distance */
-		tau[0] = tau[1] = tau[2] = dist * density;
-		
-		VecMulVecf(tau, tau, absorb_col);
-		return;
-	} else {
-		tau[0] = tau[1] = tau[2] = 0.0;
-	}
+	tau[0] = tau[1] = tau[2] = 0.0;
 	
 	VecSubf(step_vec, endco, co);
 	VecMulf(step_vec, 1.0f / nsteps);
@@ -402,22 +408,14 @@ outgoing radiance from behind surface * beam transmittance/attenuation
 static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
 {
 	float tr[3] = {1.0f, 1.0f, 1.0f};
-	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
+	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f}, radiance_behind[3];
 	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
 	int nsteps, s;
 	float tau[3], emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
 	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
-	float density = vol_get_density(shi, co);
+	float density;
 	const float depth_cutoff = shi->mat->vol.depth_cutoff;
-	
-	/* multiply col_behind with beam transmittance over entire distance */
-	vol_get_attenuation(shi, tau, co, endco, density, stepsize);
-	tr[0] *= exp(-tau[0]);
-	tr[1] *= exp(-tau[1]);
-	tr[2] *= exp(-tau[2]);
-	VecMulVecf(radiance, tr, col);	
-	tr[0] = tr[1] = tr[2] = 1.0f;
-	
+
 	/* ray marching */
 	nsteps = (int)((VecLenf(co, endco) / stepsize) + 0.5);
 	
@@ -429,13 +427,13 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	/* get radiance from all points along the ray due to participating media */
 	for (s = 0; s < nsteps; s++) {
 
-		if (s > 0) density = vol_get_density(shi, step_sta);
+		density = vol_get_density(shi, step_sta);
 		
 		/* there's only any use in shading here if there's actually some density to shade! */
 		if (density > 0.01f) {
 		
 			/* transmittance component (alpha) */
-			vol_get_attenuation(shi, tau, step_sta, step_end, density, stepsize);
+			vol_get_attenuation_seg(shi, tau, stepvec, co, density);
 			tr[0] *= exp(-tau[0]);
 			tr[1] *= exp(-tau[1]);
 			tr[2] *= exp(-tau[2]);
@@ -469,6 +467,10 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		if ((0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]) < depth_cutoff) break;	
 	}
 	
+	/* multiply original color (behind volume) with beam transmittance over entire distance */
+	VecMulVecf(radiance_behind, tr, col);	
+	VecAddf(radiance, radiance, radiance_behind);
+	
 	VecCopyf(col, radiance);
 	col[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
 }

From 286c2ca80be4ae46dc220ada2fcc5bf636d5ff49 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 00:33:59 +0000
Subject: [PATCH 149/577] Smoke: * cache for low res (deactivating high res for
 now) * new way of view3d rendering of smoke (no longer 3 axes) -using
 3dtexture now (introduced into gpu/intern) * introducing LZO and LZMA libs
 into extern (makefiles missing for now) * reducing memory usage after
 simulating for the frame ended (freeing temporary buffers) * splitting smoke
 into 2 modifier for the cache-sake (it cannot handle more than 1 cache on the
 same modifier-index) * no color on gui anymore * fixing non-power-of-2
 resolutions (hopefully) * fixing select-deselect of domain drawing bug *
 fixing drawobject.c coding style (making Ton happy) ;-)

HINT #1: If scons doesn't work -> cmakefiles are up-to-date, couldn't test scons (but i tried to mantain them, too)

CODERS HINT #1: we really need a way to disable adding all modifiers through "Add Modifiers" dropdown!

WARNING #1: before applying this commit, deactivate your SMOKE DOMAIN in your old files and save them then. You can open them then savely after that.

WARNING #2: File and cache format of smoke can be changed, this is not final!
---
 extern/CMakeLists.txt                         |    3 +
 extern/SConscript                             |    4 +-
 extern/lzma/7zBuf.c                           |   36 +
 extern/lzma/7zBuf.h                           |   31 +
 extern/lzma/7zBuf2.c                          |   45 +
 extern/lzma/7zCrc.c                           |   35 +
 extern/lzma/7zCrc.h                           |   24 +
 extern/lzma/7zFile.c                          |  263 ++
 extern/lzma/7zFile.h                          |   74 +
 extern/lzma/7zStream.c                        |  169 +
 extern/lzma/7zVersion.h                       |    7 +
 extern/lzma/Alloc.c                           |  127 +
 extern/lzma/Alloc.h                           |   32 +
 extern/lzma/Bcj2.c                            |  132 +
 extern/lzma/Bcj2.h                            |   30 +
 extern/lzma/Bra.c                             |  133 +
 extern/lzma/Bra.h                             |   60 +
 extern/lzma/Bra86.c                           |   85 +
 extern/lzma/BraIA64.c                         |   67 +
 extern/lzma/CMakeLists.txt                    |   34 +
 extern/lzma/CpuArch.h                         |   69 +
 extern/lzma/LzFind.c                          |  751 +++
 extern/lzma/LzFind.h                          |  107 +
 extern/lzma/LzFindMt.c                        |  793 ++++
 extern/lzma/LzFindMt.h                        |   97 +
 extern/lzma/LzHash.h                          |   54 +
 extern/lzma/LzmaDec.c                         | 1007 ++++
 extern/lzma/LzmaDec.h                         |  223 +
 extern/lzma/LzmaEnc.c                         | 2281 +++++++++
 extern/lzma/LzmaEnc.h                         |   72 +
 extern/lzma/LzmaLib.c                         |   46 +
 extern/lzma/LzmaLib.h                         |  135 +
 extern/lzma/Threads.c                         |  109 +
 extern/lzma/Threads.h                         |   68 +
 extern/lzma/Types.h                           |  208 +
 extern/lzma/history.txt                       |  236 +
 extern/lzma/lzma.txt                          |  594 +++
 extern/lzo/CMakeLists.txt                     |   34 +
 extern/lzo/SConscript                         |    9 +
 extern/lzo/minilzo/COPYING                    |  340 ++
 extern/lzo/minilzo/Makefile                   |  113 +
 extern/lzo/minilzo/README.LZO                 |  123 +
 extern/lzo/minilzo/lzoconf.h                  |  417 ++
 extern/lzo/minilzo/lzodefs.h                  | 1807 ++++++++
 extern/lzo/minilzo/minilzo.c                  | 4112 +++++++++++++++++
 extern/lzo/minilzo/minilzo.h                  |  112 +
 intern/smoke/extern/smoke_API.h               |   15 +-
 intern/smoke/intern/FLUID_3D.cpp              |   79 +-
 intern/smoke/intern/FLUID_3D.h                |   17 +-
 intern/smoke/intern/FLUID_3D_SOLVERS.cpp      |   24 +
 intern/smoke/intern/WTURBULENCE.cpp           |  481 +-
 intern/smoke/intern/WTURBULENCE.h             |   21 +-
 intern/smoke/intern/smoke_API.cpp             |   51 +-
 release/ui/buttons_physics_smoke.py           |  215 +-
 source/blender/blenkernel/BKE_pointcache.h    |    6 +-
 source/blender/blenkernel/BKE_smoke.h         |   17 +-
 source/blender/blenkernel/CMakeLists.txt      |    2 +
 source/blender/blenkernel/SConscript          |    2 +
 source/blender/blenkernel/intern/modifier.c   |   79 +-
 source/blender/blenkernel/intern/pointcache.c |  271 +-
 source/blender/blenkernel/intern/smoke.c      | 1155 +++--
 .../blender/blenkernel/intern/smokehighres.c  |  137 +
 source/blender/blenlib/BLI_winstuff.h         |   30 +-
 source/blender/blenloader/intern/readfile.c   |   21 +-
 source/blender/blenloader/intern/writefile.c  |    9 +-
 .../blender/editors/object/object_modifier.c  |    7 +
 .../editors/space_buttons/buttons_context.c   |   12 +-
 .../blender/editors/space_view3d/drawobject.c |  362 +-
 .../blender/editors/space_view3d/drawvolume.c |  304 ++
 .../editors/space_view3d/view3d_intern.h      |    3 +
 source/blender/gpu/GPU_draw.h                 |    4 +
 source/blender/gpu/GPU_extensions.h           |    1 +
 source/blender/gpu/intern/gpu_draw.c          |   19 +
 source/blender/gpu/intern/gpu_extensions.c    |   72 +
 source/blender/makesdna/DNA_modifier_types.h  |   30 +-
 source/blender/makesdna/DNA_smoke_types.h     |   34 +-
 source/blender/makesrna/RNA_access.h          |    1 +
 source/blender/makesrna/intern/rna_modifier.c |   70 +-
 source/blender/makesrna/intern/rna_smoke.c    |   85 +-
 source/creator/CMakeLists.txt                 |    2 +
 80 files changed, 17406 insertions(+), 1540 deletions(-)
 create mode 100644 extern/lzma/7zBuf.c
 create mode 100644 extern/lzma/7zBuf.h
 create mode 100644 extern/lzma/7zBuf2.c
 create mode 100644 extern/lzma/7zCrc.c
 create mode 100644 extern/lzma/7zCrc.h
 create mode 100644 extern/lzma/7zFile.c
 create mode 100644 extern/lzma/7zFile.h
 create mode 100644 extern/lzma/7zStream.c
 create mode 100644 extern/lzma/7zVersion.h
 create mode 100644 extern/lzma/Alloc.c
 create mode 100644 extern/lzma/Alloc.h
 create mode 100644 extern/lzma/Bcj2.c
 create mode 100644 extern/lzma/Bcj2.h
 create mode 100644 extern/lzma/Bra.c
 create mode 100644 extern/lzma/Bra.h
 create mode 100644 extern/lzma/Bra86.c
 create mode 100644 extern/lzma/BraIA64.c
 create mode 100644 extern/lzma/CMakeLists.txt
 create mode 100644 extern/lzma/CpuArch.h
 create mode 100644 extern/lzma/LzFind.c
 create mode 100644 extern/lzma/LzFind.h
 create mode 100644 extern/lzma/LzFindMt.c
 create mode 100644 extern/lzma/LzFindMt.h
 create mode 100644 extern/lzma/LzHash.h
 create mode 100644 extern/lzma/LzmaDec.c
 create mode 100644 extern/lzma/LzmaDec.h
 create mode 100644 extern/lzma/LzmaEnc.c
 create mode 100644 extern/lzma/LzmaEnc.h
 create mode 100644 extern/lzma/LzmaLib.c
 create mode 100644 extern/lzma/LzmaLib.h
 create mode 100644 extern/lzma/Threads.c
 create mode 100644 extern/lzma/Threads.h
 create mode 100644 extern/lzma/Types.h
 create mode 100644 extern/lzma/history.txt
 create mode 100644 extern/lzma/lzma.txt
 create mode 100644 extern/lzo/CMakeLists.txt
 create mode 100644 extern/lzo/SConscript
 create mode 100644 extern/lzo/minilzo/COPYING
 create mode 100644 extern/lzo/minilzo/Makefile
 create mode 100644 extern/lzo/minilzo/README.LZO
 create mode 100644 extern/lzo/minilzo/lzoconf.h
 create mode 100644 extern/lzo/minilzo/lzodefs.h
 create mode 100644 extern/lzo/minilzo/minilzo.c
 create mode 100644 extern/lzo/minilzo/minilzo.h
 create mode 100644 source/blender/blenkernel/intern/smokehighres.c
 create mode 100644 source/blender/editors/space_view3d/drawvolume.c

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index b6cfe3b113e..019cd9de28b 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -37,3 +37,6 @@ ADD_SUBDIRECTORY(glew)
 IF(WITH_OPENJPEG)
   ADD_SUBDIRECTORY(libopenjpeg)
 ENDIF(WITH_OPENJPEG)
+
+ADD_SUBDIRECTORY(lzo)
+ADD_SUBDIRECTORY(lzma)
diff --git a/extern/SConscript b/extern/SConscript
index 175613c3d2b..20604d87e45 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -22,5 +22,5 @@ if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
 if env['OURPLATFORM'] == 'linux2':
     SConscript(['binreloc/SConscript']);
 
-# FFTW not needed atm - dg
-# SConscript(['fftw/SConscript'])
+SConscript(['lzo/SConscript'])
+SConscript(['lzma/SConscript'])
diff --git a/extern/lzma/7zBuf.c b/extern/lzma/7zBuf.c
new file mode 100644
index 00000000000..14e7f4e2b92
--- /dev/null
+++ b/extern/lzma/7zBuf.c
@@ -0,0 +1,36 @@
+/* 7zBuf.c -- Byte Buffer
+2008-03-28
+Igor Pavlov
+Public domain */
+
+#include "7zBuf.h"
+
+void Buf_Init(CBuf *p)
+{
+  p->data = 0;
+  p->size = 0;
+}
+
+int Buf_Create(CBuf *p, size_t size, ISzAlloc *alloc)
+{
+  p->size = 0;
+  if (size == 0)
+  {
+    p->data = 0;
+    return 1;
+  }
+  p->data = (Byte *)alloc->Alloc(alloc, size);
+  if (p->data != 0)
+  {
+    p->size = size;
+    return 1;
+  }
+  return 0;
+}
+
+void Buf_Free(CBuf *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->data);
+  p->data = 0;
+  p->size = 0;
+}
diff --git a/extern/lzma/7zBuf.h b/extern/lzma/7zBuf.h
new file mode 100644
index 00000000000..c5bd71879cc
--- /dev/null
+++ b/extern/lzma/7zBuf.h
@@ -0,0 +1,31 @@
+/* 7zBuf.h -- Byte Buffer
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_BUF_H
+#define __7Z_BUF_H
+
+#include "Types.h"
+
+typedef struct
+{
+  Byte *data;
+  size_t size;
+} CBuf;
+
+void Buf_Init(CBuf *p);
+int Buf_Create(CBuf *p, size_t size, ISzAlloc *alloc);
+void Buf_Free(CBuf *p, ISzAlloc *alloc);
+
+typedef struct
+{
+  Byte *data;
+  size_t size;
+  size_t pos;
+} CDynBuf;
+
+void DynBuf_Construct(CDynBuf *p);
+void DynBuf_SeekToBeg(CDynBuf *p);
+int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAlloc *alloc);
+void DynBuf_Free(CDynBuf *p, ISzAlloc *alloc);
+
+#endif
diff --git a/extern/lzma/7zBuf2.c b/extern/lzma/7zBuf2.c
new file mode 100644
index 00000000000..8d17e0dcf80
--- /dev/null
+++ b/extern/lzma/7zBuf2.c
@@ -0,0 +1,45 @@
+/* 7zBuf2.c -- Byte Buffer
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include <string.h>
+#include "7zBuf.h"
+
+void DynBuf_Construct(CDynBuf *p)
+{
+  p->data = 0;
+  p->size = 0;
+  p->pos = 0;
+}
+
+void DynBuf_SeekToBeg(CDynBuf *p)
+{
+  p->pos = 0;
+}
+
+int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAlloc *alloc)
+{
+  if (size > p->size - p->pos)
+  {
+    size_t newSize = p->pos + size;
+    Byte *data;
+    newSize += newSize / 4;
+    data = (Byte *)alloc->Alloc(alloc, newSize);
+    if (data == 0)
+      return 0;
+    p->size = newSize;
+    memcpy(data, p->data, p->pos);
+    alloc->Free(alloc, p->data);
+    p->data = data;
+  }
+  memcpy(p->data + p->pos, buf, size);
+  p->pos += size;
+  return 1;
+}
+
+void DynBuf_Free(CDynBuf *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->data);
+  p->data = 0;
+  p->size = 0;
+  p->pos = 0;
+}
diff --git a/extern/lzma/7zCrc.c b/extern/lzma/7zCrc.c
new file mode 100644
index 00000000000..71962b2c28d
--- /dev/null
+++ b/extern/lzma/7zCrc.c
@@ -0,0 +1,35 @@
+/* 7zCrc.c -- CRC32 calculation
+2008-08-05
+Igor Pavlov
+Public domain */
+
+#include "7zCrc.h"
+
+#define kCrcPoly 0xEDB88320
+UInt32 g_CrcTable[256];
+
+void MY_FAST_CALL CrcGenerateTable(void)
+{
+  UInt32 i;
+  for (i = 0; i < 256; i++)
+  {
+    UInt32 r = i;
+    int j;
+    for (j = 0; j < 8; j++)
+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
+    g_CrcTable[i] = r;
+  }
+}
+
+UInt32 MY_FAST_CALL CrcUpdate(UInt32 v, const void *data, size_t size)
+{
+  const Byte *p = (const Byte *)data;
+  for (; size > 0 ; size--, p++)
+    v = CRC_UPDATE_BYTE(v, *p);
+  return v;
+}
+
+UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size)
+{
+  return CrcUpdate(CRC_INIT_VAL, data, size) ^ 0xFFFFFFFF;
+}
diff --git a/extern/lzma/7zCrc.h b/extern/lzma/7zCrc.h
new file mode 100644
index 00000000000..00dc29cee3c
--- /dev/null
+++ b/extern/lzma/7zCrc.h
@@ -0,0 +1,24 @@
+/* 7zCrc.h -- CRC32 calculation
+2008-03-13
+Igor Pavlov
+Public domain */
+
+#ifndef __7Z_CRC_H
+#define __7Z_CRC_H
+
+#include <stddef.h>
+
+#include "Types.h"
+
+extern UInt32 g_CrcTable[];
+
+void MY_FAST_CALL CrcGenerateTable(void);
+
+#define CRC_INIT_VAL 0xFFFFFFFF
+#define CRC_GET_DIGEST(crc) ((crc) ^ 0xFFFFFFFF)
+#define CRC_UPDATE_BYTE(crc, b) (g_CrcTable[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+
+UInt32 MY_FAST_CALL CrcUpdate(UInt32 crc, const void *data, size_t size);
+UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size);
+
+#endif
diff --git a/extern/lzma/7zFile.c b/extern/lzma/7zFile.c
new file mode 100644
index 00000000000..9a44c59ac0c
--- /dev/null
+++ b/extern/lzma/7zFile.c
@@ -0,0 +1,263 @@
+/* 7zFile.c -- File IO
+2008-11-22 : Igor Pavlov : Public domain */
+
+#include "7zFile.h"
+
+#ifndef USE_WINDOWS_FILE
+
+#include <errno.h>
+
+#endif
+
+#ifdef USE_WINDOWS_FILE
+
+/*
+   ReadFile and WriteFile functions in Windows have BUG:
+   If you Read or Write 64MB or more (probably min_failure_size = 64MB - 32KB + 1)
+   from/to Network file, it returns ERROR_NO_SYSTEM_RESOURCES
+   (Insufficient system resources exist to complete the requested service).
+   Probably in some version of Windows there are problems with other sizes:
+   for 32 MB (maybe also for 16 MB).
+   And message can be "Network connection was lost"
+*/
+
+#define kChunkSizeMax (1 << 22)
+
+#endif
+
+void File_Construct(CSzFile *p)
+{
+  #ifdef USE_WINDOWS_FILE
+  p->handle = INVALID_HANDLE_VALUE;
+  #else
+  p->file = NULL;
+  #endif
+}
+
+static WRes File_Open(CSzFile *p, const char *name, int writeMode)
+{
+  #ifdef USE_WINDOWS_FILE
+  p->handle = CreateFileA(name,
+      writeMode ? GENERIC_WRITE : GENERIC_READ,
+      FILE_SHARE_READ, NULL,
+      writeMode ? CREATE_ALWAYS : OPEN_EXISTING,
+      FILE_ATTRIBUTE_NORMAL, NULL);
+  return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();
+  #else
+  p->file = fopen(name, writeMode ? "wb+" : "rb");
+  return (p->file != 0) ? 0 : errno;
+  #endif
+}
+
+WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); }
+WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); }
+
+WRes File_Close(CSzFile *p)
+{
+  #ifdef USE_WINDOWS_FILE
+  if (p->handle != INVALID_HANDLE_VALUE)
+  {
+    if (!CloseHandle(p->handle))
+      return GetLastError();
+    p->handle = INVALID_HANDLE_VALUE;
+  }
+  #else
+  if (p->file != NULL)
+  {
+    int res = fclose(p->file);
+    if (res != 0)
+      return res;
+    p->file = NULL;
+  }
+  #endif
+  return 0;
+}
+
+WRes File_Read(CSzFile *p, void *data, size_t *size)
+{
+  size_t originalSize = *size;
+  if (originalSize == 0)
+    return 0;
+
+  #ifdef USE_WINDOWS_FILE
+
+  *size = 0;
+  do
+  {
+    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
+    DWORD processed = 0;
+    BOOL res = ReadFile(p->handle, data, curSize, &processed, NULL);
+    data = (void *)((Byte *)data + processed);
+    originalSize -= processed;
+    *size += processed;
+    if (!res)
+      return GetLastError();
+    if (processed == 0)
+      break;
+  }
+  while (originalSize > 0);
+  return 0;
+
+  #else
+  
+  *size = fread(data, 1, originalSize, p->file);
+  if (*size == originalSize)
+    return 0;
+  return ferror(p->file);
+  
+  #endif
+}
+
+WRes File_Write(CSzFile *p, const void *data, size_t *size)
+{
+  size_t originalSize = *size;
+  if (originalSize == 0)
+    return 0;
+  
+  #ifdef USE_WINDOWS_FILE
+
+  *size = 0;
+  do
+  {
+    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
+    DWORD processed = 0;
+    BOOL res = WriteFile(p->handle, data, curSize, &processed, NULL);
+    data = (void *)((Byte *)data + processed);
+    originalSize -= processed;
+    *size += processed;
+    if (!res)
+      return GetLastError();
+    if (processed == 0)
+      break;
+  }
+  while (originalSize > 0);
+  return 0;
+
+  #else
+
+  *size = fwrite(data, 1, originalSize, p->file);
+  if (*size == originalSize)
+    return 0;
+  return ferror(p->file);
+  
+  #endif
+}
+
+WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin)
+{
+  #ifdef USE_WINDOWS_FILE
+
+  LARGE_INTEGER value;
+  DWORD moveMethod;
+  value.LowPart = (DWORD)*pos;
+  value.HighPart = (LONG)((UInt64)*pos >> 16 >> 16); /* for case when UInt64 is 32-bit only */
+  switch (origin)
+  {
+    case SZ_SEEK_SET: moveMethod = FILE_BEGIN; break;
+    case SZ_SEEK_CUR: moveMethod = FILE_CURRENT; break;
+    case SZ_SEEK_END: moveMethod = FILE_END; break;
+    default: return ERROR_INVALID_PARAMETER;
+  }
+  value.LowPart = SetFilePointer(p->handle, value.LowPart, &value.HighPart, moveMethod);
+  if (value.LowPart == 0xFFFFFFFF)
+  {
+    WRes res = GetLastError();
+    if (res != NO_ERROR)
+      return res;
+  }
+  *pos = ((Int64)value.HighPart << 32) | value.LowPart;
+  return 0;
+
+  #else
+  
+  int moveMethod;
+  int res;
+  switch (origin)
+  {
+    case SZ_SEEK_SET: moveMethod = SEEK_SET; break;
+    case SZ_SEEK_CUR: moveMethod = SEEK_CUR; break;
+    case SZ_SEEK_END: moveMethod = SEEK_END; break;
+    default: return 1;
+  }
+  res = fseek(p->file, (long)*pos, moveMethod);
+  *pos = ftell(p->file);
+  return res;
+  
+  #endif
+}
+
+WRes File_GetLength(CSzFile *p, UInt64 *length)
+{
+  #ifdef USE_WINDOWS_FILE
+  
+  DWORD sizeHigh;
+  DWORD sizeLow = GetFileSize(p->handle, &sizeHigh);
+  if (sizeLow == 0xFFFFFFFF)
+  {
+    DWORD res = GetLastError();
+    if (res != NO_ERROR)
+      return res;
+  }
+  *length = (((UInt64)sizeHigh) << 32) + sizeLow;
+  return 0;
+  
+  #else
+  
+  long pos = ftell(p->file);
+  int res = fseek(p->file, 0, SEEK_END);
+  *length = ftell(p->file);
+  fseek(p->file, pos, SEEK_SET);
+  return res;
+  
+  #endif
+}
+
+
+/* ---------- FileSeqInStream ---------- */
+
+static SRes FileSeqInStream_Read(void *pp, void *buf, size_t *size)
+{
+  CFileSeqInStream *p = (CFileSeqInStream *)pp;
+  return File_Read(&p->file, buf, size) == 0 ? SZ_OK : SZ_ERROR_READ;
+}
+
+void FileSeqInStream_CreateVTable(CFileSeqInStream *p)
+{
+  p->s.Read = FileSeqInStream_Read;
+}
+
+
+/* ---------- FileInStream ---------- */
+
+static SRes FileInStream_Read(void *pp, void *buf, size_t *size)
+{
+  CFileInStream *p = (CFileInStream *)pp;
+  return (File_Read(&p->file, buf, size) == 0) ? SZ_OK : SZ_ERROR_READ;
+}
+
+static SRes FileInStream_Seek(void *pp, Int64 *pos, ESzSeek origin)
+{
+  CFileInStream *p = (CFileInStream *)pp;
+  return File_Seek(&p->file, pos, origin);
+}
+
+void FileInStream_CreateVTable(CFileInStream *p)
+{
+  p->s.Read = FileInStream_Read;
+  p->s.Seek = FileInStream_Seek;
+}
+
+
+/* ---------- FileOutStream ---------- */
+
+static size_t FileOutStream_Write(void *pp, const void *data, size_t size)
+{
+  CFileOutStream *p = (CFileOutStream *)pp;
+  File_Write(&p->file, data, &size);
+  return size;
+}
+
+void FileOutStream_CreateVTable(CFileOutStream *p)
+{
+  p->s.Write = FileOutStream_Write;
+}
diff --git a/extern/lzma/7zFile.h b/extern/lzma/7zFile.h
new file mode 100644
index 00000000000..fbef6837f86
--- /dev/null
+++ b/extern/lzma/7zFile.h
@@ -0,0 +1,74 @@
+/* 7zFile.h -- File IO
+2008-11-22 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_FILE_H
+#define __7Z_FILE_H
+
+#ifdef _WIN32
+#define USE_WINDOWS_FILE
+#endif
+
+#ifdef USE_WINDOWS_FILE
+#include <windows.h>
+#else
+#include <stdio.h>
+#endif
+
+#include "Types.h"
+
+
+/* ---------- File ---------- */
+
+typedef struct
+{
+  #ifdef USE_WINDOWS_FILE
+  HANDLE handle;
+  #else
+  FILE *file;
+  #endif
+} CSzFile;
+
+void File_Construct(CSzFile *p);
+WRes InFile_Open(CSzFile *p, const char *name);
+WRes OutFile_Open(CSzFile *p, const char *name);
+WRes File_Close(CSzFile *p);
+
+/* reads max(*size, remain file's size) bytes */
+WRes File_Read(CSzFile *p, void *data, size_t *size);
+
+/* writes *size bytes */
+WRes File_Write(CSzFile *p, const void *data, size_t *size);
+
+WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin);
+WRes File_GetLength(CSzFile *p, UInt64 *length);
+
+
+/* ---------- FileInStream ---------- */
+
+typedef struct
+{
+  ISeqInStream s;
+  CSzFile file;
+} CFileSeqInStream;
+
+void FileSeqInStream_CreateVTable(CFileSeqInStream *p);
+
+
+typedef struct
+{
+  ISeekInStream s;
+  CSzFile file;
+} CFileInStream;
+
+void FileInStream_CreateVTable(CFileInStream *p);
+
+
+typedef struct
+{
+  ISeqOutStream s;
+  CSzFile file;
+} CFileOutStream;
+
+void FileOutStream_CreateVTable(CFileOutStream *p);
+
+#endif
diff --git a/extern/lzma/7zStream.c b/extern/lzma/7zStream.c
new file mode 100644
index 00000000000..86232aa3411
--- /dev/null
+++ b/extern/lzma/7zStream.c
@@ -0,0 +1,169 @@
+/* 7zStream.c -- 7z Stream functions
+2008-11-23 : Igor Pavlov : Public domain */
+
+#include <string.h>
+
+#include "Types.h"
+
+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType)
+{
+  while (size != 0)
+  {
+    size_t processed = size;
+    RINOK(stream->Read(stream, buf, &processed));
+    if (processed == 0)
+      return errorType;
+    buf = (void *)((Byte *)buf + processed);
+    size -= processed;
+  }
+  return SZ_OK;
+}
+
+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size)
+{
+  return SeqInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
+}
+
+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf)
+{
+  size_t processed = 1;
+  RINOK(stream->Read(stream, buf, &processed));
+  return (processed == 1) ? SZ_OK : SZ_ERROR_INPUT_EOF;
+}
+
+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset)
+{
+  Int64 t = offset;
+  return stream->Seek(stream, &t, SZ_SEEK_SET);
+}
+
+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size)
+{
+  void *lookBuf;
+  if (*size == 0)
+    return SZ_OK;
+  RINOK(stream->Look(stream, &lookBuf, size));
+  memcpy(buf, lookBuf, *size);
+  return stream->Skip(stream, *size);
+}
+
+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType)
+{
+  while (size != 0)
+  {
+    size_t processed = size;
+    RINOK(stream->Read(stream, buf, &processed));
+    if (processed == 0)
+      return errorType;
+    buf = (void *)((Byte *)buf + processed);
+    size -= processed;
+  }
+  return SZ_OK;
+}
+
+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size)
+{
+  return LookInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
+}
+
+static SRes LookToRead_Look_Lookahead(void *pp, void **buf, size_t *size)
+{
+  SRes res = SZ_OK;
+  CLookToRead *p = (CLookToRead *)pp;
+  size_t size2 = p->size - p->pos;
+  if (size2 == 0 && *size > 0)
+  {
+    p->pos = 0;
+    size2 = LookToRead_BUF_SIZE;
+    res = p->realStream->Read(p->realStream, p->buf, &size2);
+    p->size = size2;
+  }
+  if (size2 < *size)
+    *size = size2;
+  *buf = p->buf + p->pos;
+  return res;
+}
+
+static SRes LookToRead_Look_Exact(void *pp, void **buf, size_t *size)
+{
+  SRes res = SZ_OK;
+  CLookToRead *p = (CLookToRead *)pp;
+  size_t size2 = p->size - p->pos;
+  if (size2 == 0 && *size > 0)
+  {
+    p->pos = 0;
+    if (*size > LookToRead_BUF_SIZE)
+      *size = LookToRead_BUF_SIZE;
+    res = p->realStream->Read(p->realStream, p->buf, size);
+    size2 = p->size = *size;
+  }
+  if (size2 < *size)
+    *size = size2;
+  *buf = p->buf + p->pos;
+  return res;
+}
+
+static SRes LookToRead_Skip(void *pp, size_t offset)
+{
+  CLookToRead *p = (CLookToRead *)pp;
+  p->pos += offset;
+  return SZ_OK;
+}
+
+static SRes LookToRead_Read(void *pp, void *buf, size_t *size)
+{
+  CLookToRead *p = (CLookToRead *)pp;
+  size_t rem = p->size - p->pos;
+  if (rem == 0)
+    return p->realStream->Read(p->realStream, buf, size);
+  if (rem > *size)
+    rem = *size;
+  memcpy(buf, p->buf + p->pos, rem);
+  p->pos += rem;
+  *size = rem;
+  return SZ_OK;
+}
+
+static SRes LookToRead_Seek(void *pp, Int64 *pos, ESzSeek origin)
+{
+  CLookToRead *p = (CLookToRead *)pp;
+  p->pos = p->size = 0;
+  return p->realStream->Seek(p->realStream, pos, origin);
+}
+
+void LookToRead_CreateVTable(CLookToRead *p, int lookahead)
+{
+  p->s.Look = lookahead ?
+      LookToRead_Look_Lookahead :
+      LookToRead_Look_Exact;
+  p->s.Skip = LookToRead_Skip;
+  p->s.Read = LookToRead_Read;
+  p->s.Seek = LookToRead_Seek;
+}
+
+void LookToRead_Init(CLookToRead *p)
+{
+  p->pos = p->size = 0;
+}
+
+static SRes SecToLook_Read(void *pp, void *buf, size_t *size)
+{
+  CSecToLook *p = (CSecToLook *)pp;
+  return LookInStream_LookRead(p->realStream, buf, size);
+}
+
+void SecToLook_CreateVTable(CSecToLook *p)
+{
+  p->s.Read = SecToLook_Read;
+}
+
+static SRes SecToRead_Read(void *pp, void *buf, size_t *size)
+{
+  CSecToRead *p = (CSecToRead *)pp;
+  return p->realStream->Read(p->realStream, buf, size);
+}
+
+void SecToRead_CreateVTable(CSecToRead *p)
+{
+  p->s.Read = SecToRead_Read;
+}
diff --git a/extern/lzma/7zVersion.h b/extern/lzma/7zVersion.h
new file mode 100644
index 00000000000..b7eb235548f
--- /dev/null
+++ b/extern/lzma/7zVersion.h
@@ -0,0 +1,7 @@
+#define MY_VER_MAJOR 4
+#define MY_VER_MINOR 65
+#define MY_VER_BUILD 0
+#define MY_VERSION "4.65"
+#define MY_DATE "2009-02-03"
+#define MY_COPYRIGHT ": Igor Pavlov : Public domain"
+#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE
diff --git a/extern/lzma/Alloc.c b/extern/lzma/Alloc.c
new file mode 100644
index 00000000000..358a7b52650
--- /dev/null
+++ b/extern/lzma/Alloc.c
@@ -0,0 +1,127 @@
+/* Alloc.c -- Memory allocation functions
+2008-09-24
+Igor Pavlov
+Public domain */
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#include <stdlib.h>
+
+#include "Alloc.h"
+
+/* #define _SZ_ALLOC_DEBUG */
+
+/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
+#ifdef _SZ_ALLOC_DEBUG
+#include <stdio.h>
+int g_allocCount = 0;
+int g_allocCountMid = 0;
+int g_allocCountBig = 0;
+#endif
+
+void *MyAlloc(size_t size)
+{
+  if (size == 0)
+    return 0;
+  #ifdef _SZ_ALLOC_DEBUG
+  {
+    void *p = malloc(size);
+    fprintf(stderr, "\nAlloc %10d bytes, count = %10d,  addr = %8X", size, g_allocCount++, (unsigned)p);
+    return p;
+  }
+  #else
+  return malloc(size);
+  #endif
+}
+
+void MyFree(void *address)
+{
+  #ifdef _SZ_ALLOC_DEBUG
+  if (address != 0)
+    fprintf(stderr, "\nFree; count = %10d,  addr = %8X", --g_allocCount, (unsigned)address);
+  #endif
+  free(address);
+}
+
+#ifdef _WIN32
+
+void *MidAlloc(size_t size)
+{
+  if (size == 0)
+    return 0;
+  #ifdef _SZ_ALLOC_DEBUG
+  fprintf(stderr, "\nAlloc_Mid %10d bytes;  count = %10d", size, g_allocCountMid++);
+  #endif
+  return VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
+}
+
+void MidFree(void *address)
+{
+  #ifdef _SZ_ALLOC_DEBUG
+  if (address != 0)
+    fprintf(stderr, "\nFree_Mid; count = %10d", --g_allocCountMid);
+  #endif
+  if (address == 0)
+    return;
+  VirtualFree(address, 0, MEM_RELEASE);
+}
+
+#ifndef MEM_LARGE_PAGES
+#undef _7ZIP_LARGE_PAGES
+#endif
+
+#ifdef _7ZIP_LARGE_PAGES
+SIZE_T g_LargePageSize = 0;
+typedef SIZE_T (WINAPI *GetLargePageMinimumP)();
+#endif
+
+void SetLargePageSize()
+{
+  #ifdef _7ZIP_LARGE_PAGES
+  SIZE_T size = 0;
+  GetLargePageMinimumP largePageMinimum = (GetLargePageMinimumP)
+        GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetLargePageMinimum");
+  if (largePageMinimum == 0)
+    return;
+  size = largePageMinimum();
+  if (size == 0 || (size & (size - 1)) != 0)
+    return;
+  g_LargePageSize = size;
+  #endif
+}
+
+
+void *BigAlloc(size_t size)
+{
+  if (size == 0)
+    return 0;
+  #ifdef _SZ_ALLOC_DEBUG
+  fprintf(stderr, "\nAlloc_Big %10d bytes;  count = %10d", size, g_allocCountBig++);
+  #endif
+  
+  #ifdef _7ZIP_LARGE_PAGES
+  if (g_LargePageSize != 0 && g_LargePageSize <= (1 << 30) && size >= (1 << 18))
+  {
+    void *res = VirtualAlloc(0, (size + g_LargePageSize - 1) & (~(g_LargePageSize - 1)),
+        MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
+    if (res != 0)
+      return res;
+  }
+  #endif
+  return VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
+}
+
+void BigFree(void *address)
+{
+  #ifdef _SZ_ALLOC_DEBUG
+  if (address != 0)
+    fprintf(stderr, "\nFree_Big; count = %10d", --g_allocCountBig);
+  #endif
+  
+  if (address == 0)
+    return;
+  VirtualFree(address, 0, MEM_RELEASE);
+}
+
+#endif
diff --git a/extern/lzma/Alloc.h b/extern/lzma/Alloc.h
new file mode 100644
index 00000000000..ff0669cad8d
--- /dev/null
+++ b/extern/lzma/Alloc.h
@@ -0,0 +1,32 @@
+/* Alloc.h -- Memory allocation functions
+2008-03-13
+Igor Pavlov
+Public domain */
+
+#ifndef __COMMON_ALLOC_H
+#define __COMMON_ALLOC_H
+
+#include <stddef.h>
+
+void *MyAlloc(size_t size);
+void MyFree(void *address);
+
+#ifdef _WIN32
+
+void SetLargePageSize();
+
+void *MidAlloc(size_t size);
+void MidFree(void *address);
+void *BigAlloc(size_t size);
+void BigFree(void *address);
+
+#else
+
+#define MidAlloc(size) MyAlloc(size)
+#define MidFree(address) MyFree(address)
+#define BigAlloc(size) MyAlloc(size)
+#define BigFree(address) MyFree(address)
+
+#endif
+
+#endif
diff --git a/extern/lzma/Bcj2.c b/extern/lzma/Bcj2.c
new file mode 100644
index 00000000000..20199ce5659
--- /dev/null
+++ b/extern/lzma/Bcj2.c
@@ -0,0 +1,132 @@
+/* Bcj2.c -- Converter for x86 code (BCJ2)
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "Bcj2.h"
+
+#ifdef _LZMA_PROB32
+#define CProb UInt32
+#else
+#define CProb UInt16
+#endif
+
+#define IsJcc(b0, b1) ((b0) == 0x0F && ((b1) & 0xF0) == 0x80)
+#define IsJ(b0, b1) ((b1 & 0xFE) == 0xE8 || IsJcc(b0, b1))
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+
+#define RC_READ_BYTE (*buffer++)
+#define RC_TEST { if (buffer == bufferLim) return SZ_ERROR_DATA; }
+#define RC_INIT2 code = 0; range = 0xFFFFFFFF; \
+  { int i; for (i = 0; i < 5; i++) { RC_TEST; code = (code << 8) | RC_READ_BYTE; }}
+
+#define NORMALIZE if (range < kTopValue) { RC_TEST; range <<= 8; code = (code << 8) | RC_READ_BYTE; }
+
+#define IF_BIT_0(p) ttt = *(p); bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
+#define UPDATE_0(p) range = bound; *(p) = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); NORMALIZE;
+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CProb)(ttt - (ttt >> kNumMoveBits)); NORMALIZE;
+
+int Bcj2_Decode(
+    const Byte *buf0, SizeT size0,
+    const Byte *buf1, SizeT size1,
+    const Byte *buf2, SizeT size2,
+    const Byte *buf3, SizeT size3,
+    Byte *outBuf, SizeT outSize)
+{
+  CProb p[256 + 2];
+  SizeT inPos = 0, outPos = 0;
+
+  const Byte *buffer, *bufferLim;
+  UInt32 range, code;
+  Byte prevByte = 0;
+
+  unsigned int i;
+  for (i = 0; i < sizeof(p) / sizeof(p[0]); i++)
+    p[i] = kBitModelTotal >> 1;
+
+  buffer = buf3;
+  bufferLim = buffer + size3;
+  RC_INIT2
+
+  if (outSize == 0)
+    return SZ_OK;
+
+  for (;;)
+  {
+    Byte b;
+    CProb *prob;
+    UInt32 bound;
+    UInt32 ttt;
+
+    SizeT limit = size0 - inPos;
+    if (outSize - outPos < limit)
+      limit = outSize - outPos;
+    while (limit != 0)
+    {
+      Byte b = buf0[inPos];
+      outBuf[outPos++] = b;
+      if (IsJ(prevByte, b))
+        break;
+      inPos++;
+      prevByte = b;
+      limit--;
+    }
+
+    if (limit == 0 || outPos == outSize)
+      break;
+
+    b = buf0[inPos++];
+
+    if (b == 0xE8)
+      prob = p + prevByte;
+    else if (b == 0xE9)
+      prob = p + 256;
+    else
+      prob = p + 257;
+
+    IF_BIT_0(prob)
+    {
+      UPDATE_0(prob)
+      prevByte = b;
+    }
+    else
+    {
+      UInt32 dest;
+      const Byte *v;
+      UPDATE_1(prob)
+      if (b == 0xE8)
+      {
+        v = buf1;
+        if (size1 < 4)
+          return SZ_ERROR_DATA;
+        buf1 += 4;
+        size1 -= 4;
+      }
+      else
+      {
+        v = buf2;
+        if (size2 < 4)
+          return SZ_ERROR_DATA;
+        buf2 += 4;
+        size2 -= 4;
+      }
+      dest = (((UInt32)v[0] << 24) | ((UInt32)v[1] << 16) |
+          ((UInt32)v[2] << 8) | ((UInt32)v[3])) - ((UInt32)outPos + 4);
+      outBuf[outPos++] = (Byte)dest;
+      if (outPos == outSize)
+        break;
+      outBuf[outPos++] = (Byte)(dest >> 8);
+      if (outPos == outSize)
+        break;
+      outBuf[outPos++] = (Byte)(dest >> 16);
+      if (outPos == outSize)
+        break;
+      outBuf[outPos++] = prevByte = (Byte)(dest >> 24);
+    }
+  }
+  return (outPos == outSize) ? SZ_OK : SZ_ERROR_DATA;
+}
diff --git a/extern/lzma/Bcj2.h b/extern/lzma/Bcj2.h
new file mode 100644
index 00000000000..32d450b3b99
--- /dev/null
+++ b/extern/lzma/Bcj2.h
@@ -0,0 +1,30 @@
+/* Bcj2.h -- Converter for x86 code (BCJ2)
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __BCJ2_H
+#define __BCJ2_H
+
+#include "Types.h"
+
+/*
+Conditions:
+  outSize <= FullOutputSize,
+  where FullOutputSize is full size of output stream of x86_2 filter.
+
+If buf0 overlaps outBuf, there are two required conditions:
+  1) (buf0 >= outBuf)
+  2) (buf0 + size0 >= outBuf + FullOutputSize).
+
+Returns:
+  SZ_OK
+  SZ_ERROR_DATA - Data error
+*/
+
+int Bcj2_Decode(
+    const Byte *buf0, SizeT size0,
+    const Byte *buf1, SizeT size1,
+    const Byte *buf2, SizeT size2,
+    const Byte *buf3, SizeT size3,
+    Byte *outBuf, SizeT outSize);
+
+#endif
diff --git a/extern/lzma/Bra.c b/extern/lzma/Bra.c
new file mode 100644
index 00000000000..5e5469592db
--- /dev/null
+++ b/extern/lzma/Bra.c
@@ -0,0 +1,133 @@
+/* Bra.c -- Converters for RISC code
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "Bra.h"
+
+SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  SizeT i;
+  if (size < 4)
+    return 0;
+  size -= 4;
+  ip += 8;
+  for (i = 0; i <= size; i += 4)
+  {
+    if (data[i + 3] == 0xEB)
+    {
+      UInt32 dest;
+      UInt32 src = ((UInt32)data[i + 2] << 16) | ((UInt32)data[i + 1] << 8) | (data[i + 0]);
+      src <<= 2;
+      if (encoding)
+        dest = ip + (UInt32)i + src;
+      else
+        dest = src - (ip + (UInt32)i);
+      dest >>= 2;
+      data[i + 2] = (Byte)(dest >> 16);
+      data[i + 1] = (Byte)(dest >> 8);
+      data[i + 0] = (Byte)dest;
+    }
+  }
+  return i;
+}
+
+SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  SizeT i;
+  if (size < 4)
+    return 0;
+  size -= 4;
+  ip += 4;
+  for (i = 0; i <= size; i += 2)
+  {
+    if ((data[i + 1] & 0xF8) == 0xF0 &&
+        (data[i + 3] & 0xF8) == 0xF8)
+    {
+      UInt32 dest;
+      UInt32 src =
+        (((UInt32)data[i + 1] & 0x7) << 19) |
+        ((UInt32)data[i + 0] << 11) |
+        (((UInt32)data[i + 3] & 0x7) << 8) |
+        (data[i + 2]);
+      
+      src <<= 1;
+      if (encoding)
+        dest = ip + (UInt32)i + src;
+      else
+        dest = src - (ip + (UInt32)i);
+      dest >>= 1;
+      
+      data[i + 1] = (Byte)(0xF0 | ((dest >> 19) & 0x7));
+      data[i + 0] = (Byte)(dest >> 11);
+      data[i + 3] = (Byte)(0xF8 | ((dest >> 8) & 0x7));
+      data[i + 2] = (Byte)dest;
+      i += 2;
+    }
+  }
+  return i;
+}
+
+SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  SizeT i;
+  if (size < 4)
+    return 0;
+  size -= 4;
+  for (i = 0; i <= size; i += 4)
+  {
+    if ((data[i] >> 2) == 0x12 && (data[i + 3] & 3) == 1)
+    {
+      UInt32 src = ((UInt32)(data[i + 0] & 3) << 24) |
+        ((UInt32)data[i + 1] << 16) |
+        ((UInt32)data[i + 2] << 8) |
+        ((UInt32)data[i + 3] & (~3));
+      
+      UInt32 dest;
+      if (encoding)
+        dest = ip + (UInt32)i + src;
+      else
+        dest = src - (ip + (UInt32)i);
+      data[i + 0] = (Byte)(0x48 | ((dest >> 24) &  0x3));
+      data[i + 1] = (Byte)(dest >> 16);
+      data[i + 2] = (Byte)(dest >> 8);
+      data[i + 3] &= 0x3;
+      data[i + 3] |= dest;
+    }
+  }
+  return i;
+}
+
+SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  UInt32 i;
+  if (size < 4)
+    return 0;
+  size -= 4;
+  for (i = 0; i <= size; i += 4)
+  {
+    if (data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00 ||
+        data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0)
+    {
+      UInt32 src =
+        ((UInt32)data[i + 0] << 24) |
+        ((UInt32)data[i + 1] << 16) |
+        ((UInt32)data[i + 2] << 8) |
+        ((UInt32)data[i + 3]);
+      UInt32 dest;
+      
+      src <<= 2;
+      if (encoding)
+        dest = ip + i + src;
+      else
+        dest = src - (ip + i);
+      dest >>= 2;
+      
+      dest = (((0 - ((dest >> 22) & 1)) << 22) & 0x3FFFFFFF) | (dest & 0x3FFFFF) | 0x40000000;
+
+      data[i + 0] = (Byte)(dest >> 24);
+      data[i + 1] = (Byte)(dest >> 16);
+      data[i + 2] = (Byte)(dest >> 8);
+      data[i + 3] = (Byte)dest;
+    }
+  }
+  return i;
+}
diff --git a/extern/lzma/Bra.h b/extern/lzma/Bra.h
new file mode 100644
index 00000000000..45e231e8496
--- /dev/null
+++ b/extern/lzma/Bra.h
@@ -0,0 +1,60 @@
+/* Bra.h -- Branch converters for executables
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __BRA_H
+#define __BRA_H
+
+#include "Types.h"
+
+/*
+These functions convert relative addresses to absolute addresses
+in CALL instructions to increase the compression ratio.
+  
+  In:
+    data     - data buffer
+    size     - size of data
+    ip       - current virtual Instruction Pinter (IP) value
+    state    - state variable for x86 converter
+    encoding - 0 (for decoding), 1 (for encoding)
+  
+  Out:
+    state    - state variable for x86 converter
+
+  Returns:
+    The number of processed bytes. If you call these functions with multiple calls,
+    you must start next call with first byte after block of processed bytes.
+  
+  Type   Endian  Alignment  LookAhead
+  
+  x86    little      1          4
+  ARMT   little      2          2
+  ARM    little      4          0
+  PPC     big        4          0
+  SPARC   big        4          0
+  IA64   little     16          0
+
+  size must be >= Alignment + LookAhead, if it's not last block.
+  If (size < Alignment + LookAhead), converter returns 0.
+
+  Example:
+
+    UInt32 ip = 0;
+    for ()
+    {
+      ; size must be >= Alignment + LookAhead, if it's not last block
+      SizeT processed = Convert(data, size, ip, 1);
+      data += processed;
+      size -= processed;
+      ip += processed;
+    }
+*/
+
+#define x86_Convert_Init(state) { state = 0; }
+SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding);
+SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+
+#endif
diff --git a/extern/lzma/Bra86.c b/extern/lzma/Bra86.c
new file mode 100644
index 00000000000..1ee0e709b88
--- /dev/null
+++ b/extern/lzma/Bra86.c
@@ -0,0 +1,85 @@
+/* Bra86.c -- Converter for x86 code (BCJ)
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "Bra.h"
+
+#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)
+
+const Byte kMaskToAllowedStatus[8] = {1, 1, 1, 0, 1, 0, 0, 0};
+const Byte kMaskToBitNumber[8] = {0, 1, 2, 2, 3, 3, 3, 3};
+
+SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding)
+{
+  SizeT bufferPos = 0, prevPosT;
+  UInt32 prevMask = *state & 0x7;
+  if (size < 5)
+    return 0;
+  ip += 5;
+  prevPosT = (SizeT)0 - 1;
+
+  for (;;)
+  {
+    Byte *p = data + bufferPos;
+    Byte *limit = data + size - 4;
+    for (; p < limit; p++)
+      if ((*p & 0xFE) == 0xE8)
+        break;
+    bufferPos = (SizeT)(p - data);
+    if (p >= limit)
+      break;
+    prevPosT = bufferPos - prevPosT;
+    if (prevPosT > 3)
+      prevMask = 0;
+    else
+    {
+      prevMask = (prevMask << ((int)prevPosT - 1)) & 0x7;
+      if (prevMask != 0)
+      {
+        Byte b = p[4 - kMaskToBitNumber[prevMask]];
+        if (!kMaskToAllowedStatus[prevMask] || Test86MSByte(b))
+        {
+          prevPosT = bufferPos;
+          prevMask = ((prevMask << 1) & 0x7) | 1;
+          bufferPos++;
+          continue;
+        }
+      }
+    }
+    prevPosT = bufferPos;
+
+    if (Test86MSByte(p[4]))
+    {
+      UInt32 src = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
+      UInt32 dest;
+      for (;;)
+      {
+        Byte b;
+        int index;
+        if (encoding)
+          dest = (ip + (UInt32)bufferPos) + src;
+        else
+          dest = src - (ip + (UInt32)bufferPos);
+        if (prevMask == 0)
+          break;
+        index = kMaskToBitNumber[prevMask] * 8;
+        b = (Byte)(dest >> (24 - index));
+        if (!Test86MSByte(b))
+          break;
+        src = dest ^ ((1 << (32 - index)) - 1);
+      }
+      p[4] = (Byte)(~(((dest >> 24) & 1) - 1));
+      p[3] = (Byte)(dest >> 16);
+      p[2] = (Byte)(dest >> 8);
+      p[1] = (Byte)dest;
+      bufferPos += 5;
+    }
+    else
+    {
+      prevMask = ((prevMask << 1) & 0x7) | 1;
+      bufferPos++;
+    }
+  }
+  prevPosT = bufferPos - prevPosT;
+  *state = ((prevPosT > 3) ? 0 : ((prevMask << ((int)prevPosT - 1)) & 0x7));
+  return bufferPos;
+}
diff --git a/extern/lzma/BraIA64.c b/extern/lzma/BraIA64.c
new file mode 100644
index 00000000000..0b4ee85bc76
--- /dev/null
+++ b/extern/lzma/BraIA64.c
@@ -0,0 +1,67 @@
+/* BraIA64.c -- Converter for IA-64 code
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "Bra.h"
+
+static const Byte kBranchTable[32] =
+{
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  4, 4, 6, 6, 0, 0, 7, 7,
+  4, 4, 0, 0, 4, 4, 0, 0
+};
+
+SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  SizeT i;
+  if (size < 16)
+    return 0;
+  size -= 16;
+  for (i = 0; i <= size; i += 16)
+  {
+    UInt32 instrTemplate = data[i] & 0x1F;
+    UInt32 mask = kBranchTable[instrTemplate];
+    UInt32 bitPos = 5;
+    int slot;
+    for (slot = 0; slot < 3; slot++, bitPos += 41)
+    {
+      UInt32 bytePos, bitRes;
+      UInt64 instruction, instNorm;
+      int j;
+      if (((mask >> slot) & 1) == 0)
+        continue;
+      bytePos = (bitPos >> 3);
+      bitRes = bitPos & 0x7;
+      instruction = 0;
+      for (j = 0; j < 6; j++)
+        instruction += (UInt64)data[i + j + bytePos] << (8 * j);
+
+      instNorm = instruction >> bitRes;
+      if (((instNorm >> 37) & 0xF) == 0x5 && ((instNorm >> 9) & 0x7) == 0)
+      {
+        UInt32 src = (UInt32)((instNorm >> 13) & 0xFFFFF);
+        UInt32 dest;
+        src |= ((UInt32)(instNorm >> 36) & 1) << 20;
+        
+        src <<= 4;
+        
+        if (encoding)
+          dest = ip + (UInt32)i + src;
+        else
+          dest = src - (ip + (UInt32)i);
+        
+        dest >>= 4;
+        
+        instNorm &= ~((UInt64)(0x8FFFFF) << 13);
+        instNorm |= ((UInt64)(dest & 0xFFFFF) << 13);
+        instNorm |= ((UInt64)(dest & 0x100000) << (36 - 20));
+        
+        instruction &= (1 << bitRes) - 1;
+        instruction |= (instNorm << bitRes);
+        for (j = 0; j < 6; j++)
+          data[i + j + bytePos] = (Byte)(instruction >> (8 * j));
+      }
+    }
+  }
+  return i;
+}
diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt
new file mode 100644
index 00000000000..235cd8c7f8e
--- /dev/null
+++ b/extern/lzma/CMakeLists.txt
@@ -0,0 +1,34 @@
+# $Id$
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Daniel Genrich
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC . )
+
+FILE(GLOB SRC ./*.c)
+
+
+
+BLENDERLIB(bf_lzma "${SRC}" "${INC}")
+#, libtype='blender', priority = 0 )
diff --git a/extern/lzma/CpuArch.h b/extern/lzma/CpuArch.h
new file mode 100644
index 00000000000..7384b0c32ae
--- /dev/null
+++ b/extern/lzma/CpuArch.h
@@ -0,0 +1,69 @@
+/* CpuArch.h
+2008-08-05
+Igor Pavlov
+Public domain */
+
+#ifndef __CPUARCH_H
+#define __CPUARCH_H
+
+/*
+LITTLE_ENDIAN_UNALIGN means:
+  1) CPU is LITTLE_ENDIAN
+  2) it's allowed to make unaligned memory accesses
+if LITTLE_ENDIAN_UNALIGN is not defined, it means that we don't know
+about these properties of platform.
+*/
+
+#if defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) || defined(__i386__) || defined(__x86_64__)
+#define LITTLE_ENDIAN_UNALIGN
+#endif
+
+#ifdef LITTLE_ENDIAN_UNALIGN
+
+#define GetUi16(p) (*(const UInt16 *)(p))
+#define GetUi32(p) (*(const UInt32 *)(p))
+#define GetUi64(p) (*(const UInt64 *)(p))
+#define SetUi32(p, d) *(UInt32 *)(p) = (d);
+
+#else
+
+#define GetUi16(p) (((const Byte *)(p))[0] | ((UInt16)((const Byte *)(p))[1] << 8))
+
+#define GetUi32(p) ( \
+             ((const Byte *)(p))[0]        | \
+    ((UInt32)((const Byte *)(p))[1] <<  8) | \
+    ((UInt32)((const Byte *)(p))[2] << 16) | \
+    ((UInt32)((const Byte *)(p))[3] << 24))
+
+#define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte *)(p)) + 4) << 32))
+
+#define SetUi32(p, d) { UInt32 _x_ = (d); \
+    ((Byte *)(p))[0] = (Byte)_x_; \
+    ((Byte *)(p))[1] = (Byte)(_x_ >> 8); \
+    ((Byte *)(p))[2] = (Byte)(_x_ >> 16); \
+    ((Byte *)(p))[3] = (Byte)(_x_ >> 24); }
+
+#endif
+
+#if defined(LITTLE_ENDIAN_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
+
+#pragma intrinsic(_byteswap_ulong)
+#pragma intrinsic(_byteswap_uint64)
+#define GetBe32(p) _byteswap_ulong(*(const UInt32 *)(const Byte *)(p))
+#define GetBe64(p) _byteswap_uint64(*(const UInt64 *)(const Byte *)(p))
+
+#else
+
+#define GetBe32(p) ( \
+    ((UInt32)((const Byte *)(p))[0] << 24) | \
+    ((UInt32)((const Byte *)(p))[1] << 16) | \
+    ((UInt32)((const Byte *)(p))[2] <<  8) | \
+             ((const Byte *)(p))[3] )
+
+#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte *)(p)) + 4))
+
+#endif
+
+#define GetBe16(p) (((UInt16)((const Byte *)(p))[0] << 8) | ((const Byte *)(p))[1])
+
+#endif
diff --git a/extern/lzma/LzFind.c b/extern/lzma/LzFind.c
new file mode 100644
index 00000000000..34f4f09ea58
--- /dev/null
+++ b/extern/lzma/LzFind.c
@@ -0,0 +1,751 @@
+/* LzFind.c -- Match finder for LZ algorithms
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include <string.h>
+
+#include "LzFind.h"
+#include "LzHash.h"
+
+#define kEmptyHashValue 0
+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
+#define kNormalizeMask (~(kNormalizeStepMin - 1))
+#define kMaxHistorySize ((UInt32)3 << 30)
+
+#define kStartMaxLen 3
+
+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
+{
+  if (!p->directInput)
+  {
+    alloc->Free(alloc, p->bufferBase);
+    p->bufferBase = 0;
+  }
+}
+
+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
+
+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
+{
+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+  if (p->directInput)
+  {
+    p->blockSize = blockSize;
+    return 1;
+  }
+  if (p->bufferBase == 0 || p->blockSize != blockSize)
+  {
+    LzInWindow_Free(p, alloc);
+    p->blockSize = blockSize;
+    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
+  }
+  return (p->bufferBase != 0);
+}
+
+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+
+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+
+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+{
+  p->posLimit -= subValue;
+  p->pos -= subValue;
+  p->streamPos -= subValue;
+}
+
+static void MatchFinder_ReadBlock(CMatchFinder *p)
+{
+  if (p->streamEndWasReached || p->result != SZ_OK)
+    return;
+  for (;;)
+  {
+    Byte *dest = p->buffer + (p->streamPos - p->pos);
+    size_t size = (p->bufferBase + p->blockSize - dest);
+    if (size == 0)
+      return;
+    p->result = p->stream->Read(p->stream, dest, &size);
+    if (p->result != SZ_OK)
+      return;
+    if (size == 0)
+    {
+      p->streamEndWasReached = 1;
+      return;
+    }
+    p->streamPos += (UInt32)size;
+    if (p->streamPos - p->pos > p->keepSizeAfter)
+      return;
+  }
+}
+
+void MatchFinder_MoveBlock(CMatchFinder *p)
+{
+  memmove(p->bufferBase,
+    p->buffer - p->keepSizeBefore,
+    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
+  p->buffer = p->bufferBase + p->keepSizeBefore;
+}
+
+int MatchFinder_NeedMove(CMatchFinder *p)
+{
+  /* if (p->streamEndWasReached) return 0; */
+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+}
+
+void MatchFinder_ReadIfRequired(CMatchFinder *p)
+{
+  if (p->streamEndWasReached)
+    return;
+  if (p->keepSizeAfter >= p->streamPos - p->pos)
+    MatchFinder_ReadBlock(p);
+}
+
+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+{
+  if (MatchFinder_NeedMove(p))
+    MatchFinder_MoveBlock(p);
+  MatchFinder_ReadBlock(p);
+}
+
+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
+{
+  p->cutValue = 32;
+  p->btMode = 1;
+  p->numHashBytes = 4;
+  /* p->skipModeBits = 0; */
+  p->directInput = 0;
+  p->bigHash = 0;
+}
+
+#define kCrcPoly 0xEDB88320
+
+void MatchFinder_Construct(CMatchFinder *p)
+{
+  UInt32 i;
+  p->bufferBase = 0;
+  p->directInput = 0;
+  p->hash = 0;
+  MatchFinder_SetDefaultSettings(p);
+
+  for (i = 0; i < 256; i++)
+  {
+    UInt32 r = i;
+    int j;
+    for (j = 0; j < 8; j++)
+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
+    p->crc[i] = r;
+  }
+}
+
+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->hash);
+  p->hash = 0;
+}
+
+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
+{
+  MatchFinder_FreeThisClassMemory(p, alloc);
+  LzInWindow_Free(p, alloc);
+}
+
+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
+{
+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
+  if (sizeInBytes / sizeof(CLzRef) != num)
+    return 0;
+  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
+}
+
+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+    ISzAlloc *alloc)
+{
+  UInt32 sizeReserv;
+  if (historySize > kMaxHistorySize)
+  {
+    MatchFinder_Free(p, alloc);
+    return 0;
+  }
+  sizeReserv = historySize >> 1;
+  if (historySize > ((UInt32)2 << 30))
+    sizeReserv = historySize >> 2;
+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
+
+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
+  if (LzInWindow_Create(p, sizeReserv, alloc))
+  {
+    UInt32 newCyclicBufferSize = (historySize /* >> p->skipModeBits */) + 1;
+    UInt32 hs;
+    p->matchMaxLen = matchMaxLen;
+    {
+      p->fixedHashSize = 0;
+      if (p->numHashBytes == 2)
+        hs = (1 << 16) - 1;
+      else
+      {
+        hs = historySize - 1;
+        hs |= (hs >> 1);
+        hs |= (hs >> 2);
+        hs |= (hs >> 4);
+        hs |= (hs >> 8);
+        hs >>= 1;
+        /* hs >>= p->skipModeBits; */
+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
+        if (hs > (1 << 24))
+        {
+          if (p->numHashBytes == 3)
+            hs = (1 << 24) - 1;
+          else
+            hs >>= 1;
+        }
+      }
+      p->hashMask = hs;
+      hs++;
+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
+      hs += p->fixedHashSize;
+    }
+
+    {
+      UInt32 prevSize = p->hashSizeSum + p->numSons;
+      UInt32 newSize;
+      p->historySize = historySize;
+      p->hashSizeSum = hs;
+      p->cyclicBufferSize = newCyclicBufferSize;
+      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
+      newSize = p->hashSizeSum + p->numSons;
+      if (p->hash != 0 && prevSize == newSize)
+        return 1;
+      MatchFinder_FreeThisClassMemory(p, alloc);
+      p->hash = AllocRefs(newSize, alloc);
+      if (p->hash != 0)
+      {
+        p->son = p->hash + p->hashSizeSum;
+        return 1;
+      }
+    }
+  }
+  MatchFinder_Free(p, alloc);
+  return 0;
+}
+
+static void MatchFinder_SetLimits(CMatchFinder *p)
+{
+  UInt32 limit = kMaxValForNormalize - p->pos;
+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
+  if (limit2 < limit)
+    limit = limit2;
+  limit2 = p->streamPos - p->pos;
+  if (limit2 <= p->keepSizeAfter)
+  {
+    if (limit2 > 0)
+      limit2 = 1;
+  }
+  else
+    limit2 -= p->keepSizeAfter;
+  if (limit2 < limit)
+    limit = limit2;
+  {
+    UInt32 lenLimit = p->streamPos - p->pos;
+    if (lenLimit > p->matchMaxLen)
+      lenLimit = p->matchMaxLen;
+    p->lenLimit = lenLimit;
+  }
+  p->posLimit = p->pos + limit;
+}
+
+void MatchFinder_Init(CMatchFinder *p)
+{
+  UInt32 i;
+  for (i = 0; i < p->hashSizeSum; i++)
+    p->hash[i] = kEmptyHashValue;
+  p->cyclicBufferPos = 0;
+  p->buffer = p->bufferBase;
+  p->pos = p->streamPos = p->cyclicBufferSize;
+  p->result = SZ_OK;
+  p->streamEndWasReached = 0;
+  MatchFinder_ReadBlock(p);
+  MatchFinder_SetLimits(p);
+}
+
+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
+{
+  return (p->pos - p->historySize - 1) & kNormalizeMask;
+}
+
+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+{
+  UInt32 i;
+  for (i = 0; i < numItems; i++)
+  {
+    UInt32 value = items[i];
+    if (value <= subValue)
+      value = kEmptyHashValue;
+    else
+      value -= subValue;
+    items[i] = value;
+  }
+}
+
+static void MatchFinder_Normalize(CMatchFinder *p)
+{
+  UInt32 subValue = MatchFinder_GetSubValue(p);
+  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
+  MatchFinder_ReduceOffsets(p, subValue);
+}
+
+static void MatchFinder_CheckLimits(CMatchFinder *p)
+{
+  if (p->pos == kMaxValForNormalize)
+    MatchFinder_Normalize(p);
+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
+    MatchFinder_CheckAndMoveAndRead(p);
+  if (p->cyclicBufferPos == p->cyclicBufferSize)
+    p->cyclicBufferPos = 0;
+  MatchFinder_SetLimits(p);
+}
+
+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+    UInt32 *distances, UInt32 maxLen)
+{
+  son[_cyclicBufferPos] = curMatch;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+      return distances;
+    {
+      const Byte *pb = cur - delta;
+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+      {
+        UInt32 len = 0;
+        while (++len != lenLimit)
+          if (pb[len] != cur[len])
+            break;
+        if (maxLen < len)
+        {
+          *distances++ = maxLen = len;
+          *distances++ = delta - 1;
+          if (len == lenLimit)
+            return distances;
+        }
+      }
+    }
+  }
+}
+
+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+    UInt32 *distances, UInt32 maxLen)
+{
+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
+  UInt32 len0 = 0, len1 = 0;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+    {
+      *ptr0 = *ptr1 = kEmptyHashValue;
+      return distances;
+    }
+    {
+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
+      const Byte *pb = cur - delta;
+      UInt32 len = (len0 < len1 ? len0 : len1);
+      if (pb[len] == cur[len])
+      {
+        if (++len != lenLimit && pb[len] == cur[len])
+          while (++len != lenLimit)
+            if (pb[len] != cur[len])
+              break;
+        if (maxLen < len)
+        {
+          *distances++ = maxLen = len;
+          *distances++ = delta - 1;
+          if (len == lenLimit)
+          {
+            *ptr1 = pair[0];
+            *ptr0 = pair[1];
+            return distances;
+          }
+        }
+      }
+      if (pb[len] < cur[len])
+      {
+        *ptr1 = curMatch;
+        ptr1 = pair + 1;
+        curMatch = *ptr1;
+        len1 = len;
+      }
+      else
+      {
+        *ptr0 = curMatch;
+        ptr0 = pair;
+        curMatch = *ptr0;
+        len0 = len;
+      }
+    }
+  }
+}
+
+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
+{
+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
+  UInt32 len0 = 0, len1 = 0;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+    {
+      *ptr0 = *ptr1 = kEmptyHashValue;
+      return;
+    }
+    {
+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
+      const Byte *pb = cur - delta;
+      UInt32 len = (len0 < len1 ? len0 : len1);
+      if (pb[len] == cur[len])
+      {
+        while (++len != lenLimit)
+          if (pb[len] != cur[len])
+            break;
+        {
+          if (len == lenLimit)
+          {
+            *ptr1 = pair[0];
+            *ptr0 = pair[1];
+            return;
+          }
+        }
+      }
+      if (pb[len] < cur[len])
+      {
+        *ptr1 = curMatch;
+        ptr1 = pair + 1;
+        curMatch = *ptr1;
+        len1 = len;
+      }
+      else
+      {
+        *ptr0 = curMatch;
+        ptr0 = pair;
+        curMatch = *ptr0;
+        len0 = len;
+      }
+    }
+  }
+}
+
+#define MOVE_POS \
+  ++p->cyclicBufferPos; \
+  p->buffer++; \
+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+
+#define MOVE_POS_RET MOVE_POS return offset;
+
+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+
+#define GET_MATCHES_HEADER2(minLen, ret_op) \
+  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
+  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+  cur = p->buffer;
+
+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
+
+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
+
+#define GET_MATCHES_FOOTER(offset, maxLen) \
+  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
+  distances + offset, maxLen) - distances); MOVE_POS_RET;
+
+#define SKIP_FOOTER \
+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+
+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 offset;
+  GET_MATCHES_HEADER(2)
+  HASH2_CALC;
+  curMatch = p->hash[hashValue];
+  p->hash[hashValue] = p->pos;
+  offset = 0;
+  GET_MATCHES_FOOTER(offset, 1)
+}
+
+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 offset;
+  GET_MATCHES_HEADER(3)
+  HASH_ZIP_CALC;
+  curMatch = p->hash[hashValue];
+  p->hash[hashValue] = p->pos;
+  offset = 0;
+  GET_MATCHES_FOOTER(offset, 2)
+}
+
+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 hash2Value, delta2, maxLen, offset;
+  GET_MATCHES_HEADER(3)
+
+  HASH3_CALC;
+
+  delta2 = p->pos - p->hash[hash2Value];
+  curMatch = p->hash[kFix3HashSize + hashValue];
+  
+  p->hash[hash2Value] =
+  p->hash[kFix3HashSize + hashValue] = p->pos;
+
+
+  maxLen = 2;
+  offset = 0;
+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+  {
+    for (; maxLen != lenLimit; maxLen++)
+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+        break;
+    distances[0] = maxLen;
+    distances[1] = delta2 - 1;
+    offset = 2;
+    if (maxLen == lenLimit)
+    {
+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+      MOVE_POS_RET;
+    }
+  }
+  GET_MATCHES_FOOTER(offset, maxLen)
+}
+
+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+  GET_MATCHES_HEADER(4)
+
+  HASH4_CALC;
+
+  delta2 = p->pos - p->hash[                hash2Value];
+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+  curMatch = p->hash[kFix4HashSize + hashValue];
+  
+  p->hash[                hash2Value] =
+  p->hash[kFix3HashSize + hash3Value] =
+  p->hash[kFix4HashSize + hashValue] = p->pos;
+
+  maxLen = 1;
+  offset = 0;
+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+  {
+    distances[0] = maxLen = 2;
+    distances[1] = delta2 - 1;
+    offset = 2;
+  }
+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+  {
+    maxLen = 3;
+    distances[offset + 1] = delta3 - 1;
+    offset += 2;
+    delta2 = delta3;
+  }
+  if (offset != 0)
+  {
+    for (; maxLen != lenLimit; maxLen++)
+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+        break;
+    distances[offset - 2] = maxLen;
+    if (maxLen == lenLimit)
+    {
+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+      MOVE_POS_RET;
+    }
+  }
+  if (maxLen < 3)
+    maxLen = 3;
+  GET_MATCHES_FOOTER(offset, maxLen)
+}
+
+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+  GET_MATCHES_HEADER(4)
+
+  HASH4_CALC;
+
+  delta2 = p->pos - p->hash[                hash2Value];
+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+  curMatch = p->hash[kFix4HashSize + hashValue];
+
+  p->hash[                hash2Value] =
+  p->hash[kFix3HashSize + hash3Value] =
+  p->hash[kFix4HashSize + hashValue] = p->pos;
+
+  maxLen = 1;
+  offset = 0;
+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+  {
+    distances[0] = maxLen = 2;
+    distances[1] = delta2 - 1;
+    offset = 2;
+  }
+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+  {
+    maxLen = 3;
+    distances[offset + 1] = delta3 - 1;
+    offset += 2;
+    delta2 = delta3;
+  }
+  if (offset != 0)
+  {
+    for (; maxLen != lenLimit; maxLen++)
+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+        break;
+    distances[offset - 2] = maxLen;
+    if (maxLen == lenLimit)
+    {
+      p->son[p->cyclicBufferPos] = curMatch;
+      MOVE_POS_RET;
+    }
+  }
+  if (maxLen < 3)
+    maxLen = 3;
+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+    distances + offset, maxLen) - (distances));
+  MOVE_POS_RET
+}
+
+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 offset;
+  GET_MATCHES_HEADER(3)
+  HASH_ZIP_CALC;
+  curMatch = p->hash[hashValue];
+  p->hash[hashValue] = p->pos;
+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+    distances, 2) - (distances));
+  MOVE_POS_RET
+}
+
+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    SKIP_HEADER(2)
+    HASH2_CALC;
+    curMatch = p->hash[hashValue];
+    p->hash[hashValue] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    SKIP_HEADER(3)
+    HASH_ZIP_CALC;
+    curMatch = p->hash[hashValue];
+    p->hash[hashValue] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 hash2Value;
+    SKIP_HEADER(3)
+    HASH3_CALC;
+    curMatch = p->hash[kFix3HashSize + hashValue];
+    p->hash[hash2Value] =
+    p->hash[kFix3HashSize + hashValue] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 hash2Value, hash3Value;
+    SKIP_HEADER(4)
+    HASH4_CALC;
+    curMatch = p->hash[kFix4HashSize + hashValue];
+    p->hash[                hash2Value] =
+    p->hash[kFix3HashSize + hash3Value] = p->pos;
+    p->hash[kFix4HashSize + hashValue] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 hash2Value, hash3Value;
+    SKIP_HEADER(4)
+    HASH4_CALC;
+    curMatch = p->hash[kFix4HashSize + hashValue];
+    p->hash[                hash2Value] =
+    p->hash[kFix3HashSize + hash3Value] =
+    p->hash[kFix4HashSize + hashValue] = p->pos;
+    p->son[p->cyclicBufferPos] = curMatch;
+    MOVE_POS
+  }
+  while (--num != 0);
+}
+
+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    SKIP_HEADER(3)
+    HASH_ZIP_CALC;
+    curMatch = p->hash[hashValue];
+    p->hash[hashValue] = p->pos;
+    p->son[p->cyclicBufferPos] = curMatch;
+    MOVE_POS
+  }
+  while (--num != 0);
+}
+
+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+{
+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+  if (!p->btMode)
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+  }
+  else if (p->numHashBytes == 2)
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+  }
+  else if (p->numHashBytes == 3)
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+  }
+  else
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+  }
+}
diff --git a/extern/lzma/LzFind.h b/extern/lzma/LzFind.h
new file mode 100644
index 00000000000..5b9cebfdffe
--- /dev/null
+++ b/extern/lzma/LzFind.h
@@ -0,0 +1,107 @@
+/* LzFind.h -- Match finder for LZ algorithms
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __LZFIND_H
+#define __LZFIND_H
+
+#include "Types.h"
+
+typedef UInt32 CLzRef;
+
+typedef struct _CMatchFinder
+{
+  Byte *buffer;
+  UInt32 pos;
+  UInt32 posLimit;
+  UInt32 streamPos;
+  UInt32 lenLimit;
+
+  UInt32 cyclicBufferPos;
+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
+
+  UInt32 matchMaxLen;
+  CLzRef *hash;
+  CLzRef *son;
+  UInt32 hashMask;
+  UInt32 cutValue;
+
+  Byte *bufferBase;
+  ISeqInStream *stream;
+  int streamEndWasReached;
+
+  UInt32 blockSize;
+  UInt32 keepSizeBefore;
+  UInt32 keepSizeAfter;
+
+  UInt32 numHashBytes;
+  int directInput;
+  int btMode;
+  /* int skipModeBits; */
+  int bigHash;
+  UInt32 historySize;
+  UInt32 fixedHashSize;
+  UInt32 hashSizeSum;
+  UInt32 numSons;
+  SRes result;
+  UInt32 crc[256];
+} CMatchFinder;
+
+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
+
+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+
+int MatchFinder_NeedMove(CMatchFinder *p);
+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+void MatchFinder_MoveBlock(CMatchFinder *p);
+void MatchFinder_ReadIfRequired(CMatchFinder *p);
+
+void MatchFinder_Construct(CMatchFinder *p);
+
+/* Conditions:
+     historySize <= 3 GB
+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
+*/
+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+    ISzAlloc *alloc);
+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+
+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+    UInt32 *distances, UInt32 maxLen);
+
+/*
+Conditions:
+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
+*/
+
+typedef void (*Mf_Init_Func)(void *object);
+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
+typedef void (*Mf_Skip_Func)(void *object, UInt32);
+
+typedef struct _IMatchFinder
+{
+  Mf_Init_Func Init;
+  Mf_GetIndexByte_Func GetIndexByte;
+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
+  Mf_GetMatches_Func GetMatches;
+  Mf_Skip_Func Skip;
+} IMatchFinder;
+
+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+
+void MatchFinder_Init(CMatchFinder *p);
+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+
+#endif
diff --git a/extern/lzma/LzFindMt.c b/extern/lzma/LzFindMt.c
new file mode 100644
index 00000000000..b49cd76b294
--- /dev/null
+++ b/extern/lzma/LzFindMt.c
@@ -0,0 +1,793 @@
+/* LzFindMt.c -- multithreaded Match finder for LZ algorithms
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "LzHash.h"
+
+#include "LzFindMt.h"
+
+void MtSync_Construct(CMtSync *p)
+{
+  p->wasCreated = False;
+  p->csWasInitialized = False;
+  p->csWasEntered = False;
+  Thread_Construct(&p->thread);
+  Event_Construct(&p->canStart);
+  Event_Construct(&p->wasStarted);
+  Event_Construct(&p->wasStopped);
+  Semaphore_Construct(&p->freeSemaphore);
+  Semaphore_Construct(&p->filledSemaphore);
+}
+
+void MtSync_GetNextBlock(CMtSync *p)
+{
+  if (p->needStart)
+  {
+    p->numProcessedBlocks = 1;
+    p->needStart = False;
+    p->stopWriting = False;
+    p->exit = False;
+    Event_Reset(&p->wasStarted);
+    Event_Reset(&p->wasStopped);
+
+    Event_Set(&p->canStart);
+    Event_Wait(&p->wasStarted);
+  }
+  else
+  {
+    CriticalSection_Leave(&p->cs);
+    p->csWasEntered = False;
+    p->numProcessedBlocks++;
+    Semaphore_Release1(&p->freeSemaphore);
+  }
+  Semaphore_Wait(&p->filledSemaphore);
+  CriticalSection_Enter(&p->cs);
+  p->csWasEntered = True;
+}
+
+/* MtSync_StopWriting must be called if Writing was started */
+
+void MtSync_StopWriting(CMtSync *p)
+{
+  UInt32 myNumBlocks = p->numProcessedBlocks;
+  if (!Thread_WasCreated(&p->thread) || p->needStart)
+    return;
+  p->stopWriting = True;
+  if (p->csWasEntered)
+  {
+    CriticalSection_Leave(&p->cs);
+    p->csWasEntered = False;
+  }
+  Semaphore_Release1(&p->freeSemaphore);
+ 
+  Event_Wait(&p->wasStopped);
+
+  while (myNumBlocks++ != p->numProcessedBlocks)
+  {
+    Semaphore_Wait(&p->filledSemaphore);
+    Semaphore_Release1(&p->freeSemaphore);
+  }
+  p->needStart = True;
+}
+
+void MtSync_Destruct(CMtSync *p)
+{
+  if (Thread_WasCreated(&p->thread))
+  {
+    MtSync_StopWriting(p);
+    p->exit = True;
+    if (p->needStart)
+      Event_Set(&p->canStart);
+    Thread_Wait(&p->thread);
+    Thread_Close(&p->thread);
+  }
+  if (p->csWasInitialized)
+  {
+    CriticalSection_Delete(&p->cs);
+    p->csWasInitialized = False;
+  }
+
+  Event_Close(&p->canStart);
+  Event_Close(&p->wasStarted);
+  Event_Close(&p->wasStopped);
+  Semaphore_Close(&p->freeSemaphore);
+  Semaphore_Close(&p->filledSemaphore);
+
+  p->wasCreated = False;
+}
+
+#define RINOK_THREAD(x) { if ((x) != 0) return SZ_ERROR_THREAD; }
+
+static SRes MtSync_Create2(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void *), void *obj, UInt32 numBlocks)
+{
+  if (p->wasCreated)
+    return SZ_OK;
+
+  RINOK_THREAD(CriticalSection_Init(&p->cs));
+  p->csWasInitialized = True;
+
+  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canStart));
+  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStarted));
+  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStopped));
+  
+  RINOK_THREAD(Semaphore_Create(&p->freeSemaphore, numBlocks, numBlocks));
+  RINOK_THREAD(Semaphore_Create(&p->filledSemaphore, 0, numBlocks));
+
+  p->needStart = True;
+  
+  RINOK_THREAD(Thread_Create(&p->thread, startAddress, obj));
+  p->wasCreated = True;
+  return SZ_OK;
+}
+
+static SRes MtSync_Create(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void *), void *obj, UInt32 numBlocks)
+{
+  SRes res = MtSync_Create2(p, startAddress, obj, numBlocks);
+  if (res != SZ_OK)
+    MtSync_Destruct(p);
+  return res;
+}
+
+void MtSync_Init(CMtSync *p) { p->needStart = True; }
+
+#define kMtMaxValForNormalize 0xFFFFFFFF
+
+#define DEF_GetHeads2(name, v, action) \
+static void GetHeads ## name(const Byte *p, UInt32 pos, \
+UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc) \
+{ action; for (; numHeads != 0; numHeads--) { \
+const UInt32 value = (v); p++; *heads++ = pos - hash[value]; hash[value] = pos++;  } }
+
+#define DEF_GetHeads(name, v) DEF_GetHeads2(name, v, ;)
+
+DEF_GetHeads2(2,  (p[0] | ((UInt32)p[1] << 8)), hashMask = hashMask; crc = crc; )
+DEF_GetHeads(3,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8)) & hashMask)
+DEF_GetHeads(4,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5)) & hashMask)
+DEF_GetHeads(4b, (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ ((UInt32)p[3] << 16)) & hashMask)
+DEF_GetHeads(5,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5) ^ (crc[p[4]] << 3)) & hashMask)
+
+void HashThreadFunc(CMatchFinderMt *mt)
+{
+  CMtSync *p = &mt->hashSync;
+  for (;;)
+  {
+    UInt32 numProcessedBlocks = 0;
+    Event_Wait(&p->canStart);
+    Event_Set(&p->wasStarted);
+    for (;;)
+    {
+      if (p->exit)
+        return;
+      if (p->stopWriting)
+      {
+        p->numProcessedBlocks = numProcessedBlocks;
+        Event_Set(&p->wasStopped);
+        break;
+      }
+
+      {
+        CMatchFinder *mf = mt->MatchFinder;
+        if (MatchFinder_NeedMove(mf))
+        {
+          CriticalSection_Enter(&mt->btSync.cs);
+          CriticalSection_Enter(&mt->hashSync.cs);
+          {
+            const Byte *beforePtr = MatchFinder_GetPointerToCurrentPos(mf);
+            const Byte *afterPtr;
+            MatchFinder_MoveBlock(mf);
+            afterPtr = MatchFinder_GetPointerToCurrentPos(mf);
+            mt->pointerToCurPos -= beforePtr - afterPtr;
+            mt->buffer -= beforePtr - afterPtr;
+          }
+          CriticalSection_Leave(&mt->btSync.cs);
+          CriticalSection_Leave(&mt->hashSync.cs);
+          continue;
+        }
+
+        Semaphore_Wait(&p->freeSemaphore);
+
+        MatchFinder_ReadIfRequired(mf);
+        if (mf->pos > (kMtMaxValForNormalize - kMtHashBlockSize))
+        {
+          UInt32 subValue = (mf->pos - mf->historySize - 1);
+          MatchFinder_ReduceOffsets(mf, subValue);
+          MatchFinder_Normalize3(subValue, mf->hash + mf->fixedHashSize, mf->hashMask + 1);
+        }
+        {
+          UInt32 *heads = mt->hashBuf + ((numProcessedBlocks++) & kMtHashNumBlocksMask) * kMtHashBlockSize;
+          UInt32 num = mf->streamPos - mf->pos;
+          heads[0] = 2;
+          heads[1] = num;
+          if (num >= mf->numHashBytes)
+          {
+            num = num - mf->numHashBytes + 1;
+            if (num > kMtHashBlockSize - 2)
+              num = kMtHashBlockSize - 2;
+            mt->GetHeadsFunc(mf->buffer, mf->pos, mf->hash + mf->fixedHashSize, mf->hashMask, heads + 2, num, mf->crc);
+            heads[0] += num;
+          }
+          mf->pos += num;
+          mf->buffer += num;
+        }
+      }
+
+      Semaphore_Release1(&p->filledSemaphore);
+    }
+  }
+}
+
+void MatchFinderMt_GetNextBlock_Hash(CMatchFinderMt *p)
+{
+  MtSync_GetNextBlock(&p->hashSync);
+  p->hashBufPosLimit = p->hashBufPos = ((p->hashSync.numProcessedBlocks - 1) & kMtHashNumBlocksMask) * kMtHashBlockSize;
+  p->hashBufPosLimit += p->hashBuf[p->hashBufPos++];
+  p->hashNumAvail = p->hashBuf[p->hashBufPos++];
+}
+
+#define kEmptyHashValue 0
+
+/* #define MFMT_GM_INLINE */
+
+#ifdef MFMT_GM_INLINE
+
+#define NO_INLINE MY_FAST_CALL
+
+Int32 NO_INLINE GetMatchesSpecN(UInt32 lenLimit, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+    UInt32 *_distances, UInt32 _maxLen, const UInt32 *hash, Int32 limit, UInt32 size, UInt32 *posRes)
+{
+  do
+  {
+  UInt32 *distances = _distances + 1;
+  UInt32 curMatch = pos - *hash++;
+
+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
+  UInt32 len0 = 0, len1 = 0;
+  UInt32 cutValue = _cutValue;
+  UInt32 maxLen = _maxLen;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+    {
+      *ptr0 = *ptr1 = kEmptyHashValue;
+      break;
+    }
+    {
+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
+      const Byte *pb = cur - delta;
+      UInt32 len = (len0 < len1 ? len0 : len1);
+      if (pb[len] == cur[len])
+      {
+        if (++len != lenLimit && pb[len] == cur[len])
+          while (++len != lenLimit)
+            if (pb[len] != cur[len])
+              break;
+        if (maxLen < len)
+        {
+          *distances++ = maxLen = len;
+          *distances++ = delta - 1;
+          if (len == lenLimit)
+          {
+            *ptr1 = pair[0];
+            *ptr0 = pair[1];
+            break;
+          }
+        }
+      }
+      if (pb[len] < cur[len])
+      {
+        *ptr1 = curMatch;
+        ptr1 = pair + 1;
+        curMatch = *ptr1;
+        len1 = len;
+      }
+      else
+      {
+        *ptr0 = curMatch;
+        ptr0 = pair;
+        curMatch = *ptr0;
+        len0 = len;
+      }
+    }
+  }
+  pos++;
+  _cyclicBufferPos++;
+  cur++;
+  {
+    UInt32 num = (UInt32)(distances - _distances);
+    *_distances = num - 1;
+    _distances += num;
+    limit -= num;
+  }
+  }
+  while (limit > 0 && --size != 0);
+  *posRes = pos;
+  return limit;
+}
+
+#endif
+
+void BtGetMatches(CMatchFinderMt *p, UInt32 *distances)
+{
+  UInt32 numProcessed = 0;
+  UInt32 curPos = 2;
+  UInt32 limit = kMtBtBlockSize - (p->matchMaxLen * 2);
+  distances[1] = p->hashNumAvail;
+  while (curPos < limit)
+  {
+    if (p->hashBufPos == p->hashBufPosLimit)
+    {
+      MatchFinderMt_GetNextBlock_Hash(p);
+      distances[1] = numProcessed + p->hashNumAvail;
+      if (p->hashNumAvail >= p->numHashBytes)
+        continue;
+      for (; p->hashNumAvail != 0; p->hashNumAvail--)
+        distances[curPos++] = 0;
+      break;
+    }
+    {
+      UInt32 size = p->hashBufPosLimit - p->hashBufPos;
+      UInt32 lenLimit = p->matchMaxLen;
+      UInt32 pos = p->pos;
+      UInt32 cyclicBufferPos = p->cyclicBufferPos;
+      if (lenLimit >= p->hashNumAvail)
+        lenLimit = p->hashNumAvail;
+      {
+        UInt32 size2 = p->hashNumAvail - lenLimit + 1;
+        if (size2 < size)
+          size = size2;
+        size2 = p->cyclicBufferSize - cyclicBufferPos;
+        if (size2 < size)
+          size = size2;
+      }
+      #ifndef MFMT_GM_INLINE
+      while (curPos < limit && size-- != 0)
+      {
+        UInt32 *startDistances = distances + curPos;
+        UInt32 num = (UInt32)(GetMatchesSpec1(lenLimit, pos - p->hashBuf[p->hashBufPos++],
+          pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
+          startDistances + 1, p->numHashBytes - 1) - startDistances);
+        *startDistances = num - 1;
+        curPos += num;
+        cyclicBufferPos++;
+        pos++;
+        p->buffer++;
+      }
+      #else
+      {
+        UInt32 posRes;
+        curPos = limit - GetMatchesSpecN(lenLimit, pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
+          distances + curPos, p->numHashBytes - 1, p->hashBuf + p->hashBufPos, (Int32)(limit - curPos) , size, &posRes);
+        p->hashBufPos += posRes - pos;
+        cyclicBufferPos += posRes - pos;
+        p->buffer += posRes - pos;
+        pos = posRes;
+      }
+      #endif
+
+      numProcessed += pos - p->pos;
+      p->hashNumAvail -= pos - p->pos;
+      p->pos = pos;
+      if (cyclicBufferPos == p->cyclicBufferSize)
+        cyclicBufferPos = 0;
+      p->cyclicBufferPos = cyclicBufferPos;
+    }
+  }
+  distances[0] = curPos;
+}
+
+void BtFillBlock(CMatchFinderMt *p, UInt32 globalBlockIndex)
+{
+  CMtSync *sync = &p->hashSync;
+  if (!sync->needStart)
+  {
+    CriticalSection_Enter(&sync->cs);
+    sync->csWasEntered = True;
+  }
+  
+  BtGetMatches(p, p->btBuf + (globalBlockIndex & kMtBtNumBlocksMask) * kMtBtBlockSize);
+
+  if (p->pos > kMtMaxValForNormalize - kMtBtBlockSize)
+  {
+    UInt32 subValue = p->pos - p->cyclicBufferSize;
+    MatchFinder_Normalize3(subValue, p->son, p->cyclicBufferSize * 2);
+    p->pos -= subValue;
+  }
+
+  if (!sync->needStart)
+  {
+    CriticalSection_Leave(&sync->cs);
+    sync->csWasEntered = False;
+  }
+}
+
+void BtThreadFunc(CMatchFinderMt *mt)
+{
+  CMtSync *p = &mt->btSync;
+  for (;;)
+  {
+    UInt32 blockIndex = 0;
+    Event_Wait(&p->canStart);
+    Event_Set(&p->wasStarted);
+    for (;;)
+    {
+      if (p->exit)
+        return;
+      if (p->stopWriting)
+      {
+        p->numProcessedBlocks = blockIndex;
+        MtSync_StopWriting(&mt->hashSync);
+        Event_Set(&p->wasStopped);
+        break;
+      }
+      Semaphore_Wait(&p->freeSemaphore);
+      BtFillBlock(mt, blockIndex++);
+      Semaphore_Release1(&p->filledSemaphore);
+    }
+  }
+}
+
+void MatchFinderMt_Construct(CMatchFinderMt *p)
+{
+  p->hashBuf = 0;
+  MtSync_Construct(&p->hashSync);
+  MtSync_Construct(&p->btSync);
+}
+
+void MatchFinderMt_FreeMem(CMatchFinderMt *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->hashBuf);
+  p->hashBuf = 0;
+}
+
+void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAlloc *alloc)
+{
+  MtSync_Destruct(&p->hashSync);
+  MtSync_Destruct(&p->btSync);
+  MatchFinderMt_FreeMem(p, alloc);
+}
+
+#define kHashBufferSize (kMtHashBlockSize * kMtHashNumBlocks)
+#define kBtBufferSize (kMtBtBlockSize * kMtBtNumBlocks)
+
+static unsigned MY_STD_CALL HashThreadFunc2(void *p) { HashThreadFunc((CMatchFinderMt *)p);  return 0; }
+static unsigned MY_STD_CALL BtThreadFunc2(void *p)
+{
+  Byte allocaDummy[0x180];
+  int i = 0;
+  for (i = 0; i < 16; i++)
+    allocaDummy[i] = (Byte)i;
+  BtThreadFunc((CMatchFinderMt *)p);
+  return 0;
+}
+
+SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
+    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc)
+{
+  CMatchFinder *mf = p->MatchFinder;
+  p->historySize = historySize;
+  if (kMtBtBlockSize <= matchMaxLen * 4)
+    return SZ_ERROR_PARAM;
+  if (p->hashBuf == 0)
+  {
+    p->hashBuf = (UInt32 *)alloc->Alloc(alloc, (kHashBufferSize + kBtBufferSize) * sizeof(UInt32));
+    if (p->hashBuf == 0)
+      return SZ_ERROR_MEM;
+    p->btBuf = p->hashBuf + kHashBufferSize;
+  }
+  keepAddBufferBefore += (kHashBufferSize + kBtBufferSize);
+  keepAddBufferAfter += kMtHashBlockSize;
+  if (!MatchFinder_Create(mf, historySize, keepAddBufferBefore, matchMaxLen, keepAddBufferAfter, alloc))
+    return SZ_ERROR_MEM;
+
+  RINOK(MtSync_Create(&p->hashSync, HashThreadFunc2, p, kMtHashNumBlocks));
+  RINOK(MtSync_Create(&p->btSync, BtThreadFunc2, p, kMtBtNumBlocks));
+  return SZ_OK;
+}
+
+/* Call it after ReleaseStream / SetStream */
+void MatchFinderMt_Init(CMatchFinderMt *p)
+{
+  CMatchFinder *mf = p->MatchFinder;
+  p->btBufPos = p->btBufPosLimit = 0;
+  p->hashBufPos = p->hashBufPosLimit = 0;
+  MatchFinder_Init(mf);
+  p->pointerToCurPos = MatchFinder_GetPointerToCurrentPos(mf);
+  p->btNumAvailBytes = 0;
+  p->lzPos = p->historySize + 1;
+
+  p->hash = mf->hash;
+  p->fixedHashSize = mf->fixedHashSize;
+  p->crc = mf->crc;
+
+  p->son = mf->son;
+  p->matchMaxLen = mf->matchMaxLen;
+  p->numHashBytes = mf->numHashBytes;
+  p->pos = mf->pos;
+  p->buffer = mf->buffer;
+  p->cyclicBufferPos = mf->cyclicBufferPos;
+  p->cyclicBufferSize = mf->cyclicBufferSize;
+  p->cutValue = mf->cutValue;
+}
+
+/* ReleaseStream is required to finish multithreading */
+void MatchFinderMt_ReleaseStream(CMatchFinderMt *p)
+{
+  MtSync_StopWriting(&p->btSync);
+  /* p->MatchFinder->ReleaseStream(); */
+}
+
+void MatchFinderMt_Normalize(CMatchFinderMt *p)
+{
+  MatchFinder_Normalize3(p->lzPos - p->historySize - 1, p->hash, p->fixedHashSize);
+  p->lzPos = p->historySize + 1;
+}
+
+void MatchFinderMt_GetNextBlock_Bt(CMatchFinderMt *p)
+{
+  UInt32 blockIndex;
+  MtSync_GetNextBlock(&p->btSync);
+  blockIndex = ((p->btSync.numProcessedBlocks - 1) & kMtBtNumBlocksMask);
+  p->btBufPosLimit = p->btBufPos = blockIndex * kMtBtBlockSize;
+  p->btBufPosLimit += p->btBuf[p->btBufPos++];
+  p->btNumAvailBytes = p->btBuf[p->btBufPos++];
+  if (p->lzPos >= kMtMaxValForNormalize - kMtBtBlockSize)
+    MatchFinderMt_Normalize(p);
+}
+
+const Byte * MatchFinderMt_GetPointerToCurrentPos(CMatchFinderMt *p)
+{
+  return p->pointerToCurPos;
+}
+
+#define GET_NEXT_BLOCK_IF_REQUIRED if (p->btBufPos == p->btBufPosLimit) MatchFinderMt_GetNextBlock_Bt(p);
+
+UInt32 MatchFinderMt_GetNumAvailableBytes(CMatchFinderMt *p)
+{
+  GET_NEXT_BLOCK_IF_REQUIRED;
+  return p->btNumAvailBytes;
+}
+
+Byte MatchFinderMt_GetIndexByte(CMatchFinderMt *p, Int32 index)
+{
+  return p->pointerToCurPos[index];
+}
+
+UInt32 * MixMatches2(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
+{
+  UInt32 hash2Value, curMatch2;
+  UInt32 *hash = p->hash;
+  const Byte *cur = p->pointerToCurPos;
+  UInt32 lzPos = p->lzPos;
+  MT_HASH2_CALC
+      
+  curMatch2 = hash[hash2Value];
+  hash[hash2Value] = lzPos;
+
+  if (curMatch2 >= matchMinPos)
+    if (cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
+    {
+      *distances++ = 2;
+      *distances++ = lzPos - curMatch2 - 1;
+    }
+  return distances;
+}
+
+UInt32 * MixMatches3(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
+{
+  UInt32 hash2Value, hash3Value, curMatch2, curMatch3;
+  UInt32 *hash = p->hash;
+  const Byte *cur = p->pointerToCurPos;
+  UInt32 lzPos = p->lzPos;
+  MT_HASH3_CALC
+
+  curMatch2 = hash[                hash2Value];
+  curMatch3 = hash[kFix3HashSize + hash3Value];
+  
+  hash[                hash2Value] =
+  hash[kFix3HashSize + hash3Value] =
+    lzPos;
+
+  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
+  {
+    distances[1] = lzPos - curMatch2 - 1;
+    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
+    {
+      distances[0] = 3;
+      return distances + 2;
+    }
+    distances[0] = 2;
+    distances += 2;
+  }
+  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
+  {
+    *distances++ = 3;
+    *distances++ = lzPos - curMatch3 - 1;
+  }
+  return distances;
+}
+
+/*
+UInt32 *MixMatches4(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
+{
+  UInt32 hash2Value, hash3Value, hash4Value, curMatch2, curMatch3, curMatch4;
+  UInt32 *hash = p->hash;
+  const Byte *cur = p->pointerToCurPos;
+  UInt32 lzPos = p->lzPos;
+  MT_HASH4_CALC
+      
+  curMatch2 = hash[                hash2Value];
+  curMatch3 = hash[kFix3HashSize + hash3Value];
+  curMatch4 = hash[kFix4HashSize + hash4Value];
+  
+  hash[                hash2Value] =
+  hash[kFix3HashSize + hash3Value] =
+  hash[kFix4HashSize + hash4Value] =
+    lzPos;
+
+  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
+  {
+    distances[1] = lzPos - curMatch2 - 1;
+    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
+    {
+      distances[0] =  (cur[(ptrdiff_t)curMatch2 - lzPos + 3] == cur[3]) ? 4 : 3;
+      return distances + 2;
+    }
+    distances[0] = 2;
+    distances += 2;
+  }
+  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
+  {
+    distances[1] = lzPos - curMatch3 - 1;
+    if (cur[(ptrdiff_t)curMatch3 - lzPos + 3] == cur[3])
+    {
+      distances[0] = 4;
+      return distances + 2;
+    }
+    distances[0] = 3;
+    distances += 2;
+  }
+
+  if (curMatch4 >= matchMinPos)
+    if (
+      cur[(ptrdiff_t)curMatch4 - lzPos] == cur[0] &&
+      cur[(ptrdiff_t)curMatch4 - lzPos + 3] == cur[3]
+      )
+    {
+      *distances++ = 4;
+      *distances++ = lzPos - curMatch4 - 1;
+    }
+  return distances;
+}
+*/
+
+#define INCREASE_LZ_POS p->lzPos++; p->pointerToCurPos++;
+
+UInt32 MatchFinderMt2_GetMatches(CMatchFinderMt *p, UInt32 *distances)
+{
+  const UInt32 *btBuf = p->btBuf + p->btBufPos;
+  UInt32 len = *btBuf++;
+  p->btBufPos += 1 + len;
+  p->btNumAvailBytes--;
+  {
+    UInt32 i;
+    for (i = 0; i < len; i += 2)
+    {
+      *distances++ = *btBuf++;
+      *distances++ = *btBuf++;
+    }
+  }
+  INCREASE_LZ_POS
+  return len;
+}
+
+UInt32 MatchFinderMt_GetMatches(CMatchFinderMt *p, UInt32 *distances)
+{
+  const UInt32 *btBuf = p->btBuf + p->btBufPos;
+  UInt32 len = *btBuf++;
+  p->btBufPos += 1 + len;
+
+  if (len == 0)
+  {
+    if (p->btNumAvailBytes-- >= 4)
+      len = (UInt32)(p->MixMatchesFunc(p, p->lzPos - p->historySize, distances) - (distances));
+  }
+  else
+  {
+    /* Condition: there are matches in btBuf with length < p->numHashBytes */
+    UInt32 *distances2;
+    p->btNumAvailBytes--;
+    distances2 = p->MixMatchesFunc(p, p->lzPos - btBuf[1], distances);
+    do
+    {
+      *distances2++ = *btBuf++;
+      *distances2++ = *btBuf++;
+    }
+    while ((len -= 2) != 0);
+    len  = (UInt32)(distances2 - (distances));
+  }
+  INCREASE_LZ_POS
+  return len;
+}
+
+#define SKIP_HEADER2  do { GET_NEXT_BLOCK_IF_REQUIRED
+#define SKIP_HEADER(n) SKIP_HEADER2 if (p->btNumAvailBytes-- >= (n)) { const Byte *cur = p->pointerToCurPos; UInt32 *hash = p->hash;
+#define SKIP_FOOTER } INCREASE_LZ_POS p->btBufPos += p->btBuf[p->btBufPos] + 1; } while (--num != 0);
+
+void MatchFinderMt0_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER2 { p->btNumAvailBytes--;
+  SKIP_FOOTER
+}
+
+void MatchFinderMt2_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER(2)
+      UInt32 hash2Value;
+      MT_HASH2_CALC
+      hash[hash2Value] = p->lzPos;
+  SKIP_FOOTER
+}
+
+void MatchFinderMt3_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER(3)
+      UInt32 hash2Value, hash3Value;
+      MT_HASH3_CALC
+      hash[kFix3HashSize + hash3Value] =
+      hash[                hash2Value] =
+        p->lzPos;
+  SKIP_FOOTER
+}
+
+/*
+void MatchFinderMt4_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER(4)
+      UInt32 hash2Value, hash3Value, hash4Value;
+      MT_HASH4_CALC
+      hash[kFix4HashSize + hash4Value] =
+      hash[kFix3HashSize + hash3Value] =
+      hash[                hash2Value] =
+        p->lzPos;
+  SKIP_FOOTER
+}
+*/
+
+void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable)
+{
+  vTable->Init = (Mf_Init_Func)MatchFinderMt_Init;
+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinderMt_GetIndexByte;
+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinderMt_GetNumAvailableBytes;
+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinderMt_GetPointerToCurrentPos;
+  vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt_GetMatches;
+  switch(p->MatchFinder->numHashBytes)
+  {
+    case 2:
+      p->GetHeadsFunc = GetHeads2;
+      p->MixMatchesFunc = (Mf_Mix_Matches)0;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt0_Skip;
+      vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt2_GetMatches;
+      break;
+    case 3:
+      p->GetHeadsFunc = GetHeads3;
+      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches2;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt2_Skip;
+      break;
+    default:
+    /* case 4: */
+      p->GetHeadsFunc = p->MatchFinder->bigHash ? GetHeads4b : GetHeads4;
+      /* p->GetHeadsFunc = GetHeads4; */
+      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches3;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt3_Skip;
+      break;
+    /*
+    default:
+      p->GetHeadsFunc = GetHeads5;
+      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches4;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt4_Skip;
+      break;
+    */
+  }
+}
diff --git a/extern/lzma/LzFindMt.h b/extern/lzma/LzFindMt.h
new file mode 100644
index 00000000000..2c7e462d592
--- /dev/null
+++ b/extern/lzma/LzFindMt.h
@@ -0,0 +1,97 @@
+/* LzFindMt.h -- multithreaded Match finder for LZ algorithms
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __LZFINDMT_H
+#define __LZFINDMT_H
+
+#include "Threads.h"
+#include "LzFind.h"
+
+#define kMtHashBlockSize (1 << 13)
+#define kMtHashNumBlocks (1 << 3)
+#define kMtHashNumBlocksMask (kMtHashNumBlocks - 1)
+
+#define kMtBtBlockSize (1 << 14)
+#define kMtBtNumBlocks (1 << 6)
+#define kMtBtNumBlocksMask (kMtBtNumBlocks - 1)
+
+typedef struct _CMtSync
+{
+  Bool wasCreated;
+  Bool needStart;
+  Bool exit;
+  Bool stopWriting;
+
+  CThread thread;
+  CAutoResetEvent canStart;
+  CAutoResetEvent wasStarted;
+  CAutoResetEvent wasStopped;
+  CSemaphore freeSemaphore;
+  CSemaphore filledSemaphore;
+  Bool csWasInitialized;
+  Bool csWasEntered;
+  CCriticalSection cs;
+  UInt32 numProcessedBlocks;
+} CMtSync;
+
+typedef UInt32 * (*Mf_Mix_Matches)(void *p, UInt32 matchMinPos, UInt32 *distances);
+
+/* kMtCacheLineDummy must be >= size_of_CPU_cache_line */
+#define kMtCacheLineDummy 128
+
+typedef void (*Mf_GetHeads)(const Byte *buffer, UInt32 pos,
+  UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc);
+
+typedef struct _CMatchFinderMt
+{
+  /* LZ */
+  const Byte *pointerToCurPos;
+  UInt32 *btBuf;
+  UInt32 btBufPos;
+  UInt32 btBufPosLimit;
+  UInt32 lzPos;
+  UInt32 btNumAvailBytes;
+
+  UInt32 *hash;
+  UInt32 fixedHashSize;
+  UInt32 historySize;
+  const UInt32 *crc;
+
+  Mf_Mix_Matches MixMatchesFunc;
+  
+  /* LZ + BT */
+  CMtSync btSync;
+  Byte btDummy[kMtCacheLineDummy];
+
+  /* BT */
+  UInt32 *hashBuf;
+  UInt32 hashBufPos;
+  UInt32 hashBufPosLimit;
+  UInt32 hashNumAvail;
+
+  CLzRef *son;
+  UInt32 matchMaxLen;
+  UInt32 numHashBytes;
+  UInt32 pos;
+  Byte *buffer;
+  UInt32 cyclicBufferPos;
+  UInt32 cyclicBufferSize; /* it must be historySize + 1 */
+  UInt32 cutValue;
+
+  /* BT + Hash */
+  CMtSync hashSync;
+  /* Byte hashDummy[kMtCacheLineDummy]; */
+  
+  /* Hash */
+  Mf_GetHeads GetHeadsFunc;
+  CMatchFinder *MatchFinder;
+} CMatchFinderMt;
+
+void MatchFinderMt_Construct(CMatchFinderMt *p);
+void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAlloc *alloc);
+SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
+    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc);
+void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable);
+void MatchFinderMt_ReleaseStream(CMatchFinderMt *p);
+
+#endif
diff --git a/extern/lzma/LzHash.h b/extern/lzma/LzHash.h
new file mode 100644
index 00000000000..9f4173e7e33
--- /dev/null
+++ b/extern/lzma/LzHash.h
@@ -0,0 +1,54 @@
+/* LzHash.h -- HASH functions for LZ algorithms
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __LZHASH_H
+#define __LZHASH_H
+
+#define kHash2Size (1 << 10)
+#define kHash3Size (1 << 16)
+#define kHash4Size (1 << 20)
+
+#define kFix3HashSize (kHash2Size)
+#define kFix4HashSize (kHash2Size + kHash3Size)
+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
+
+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
+
+#define HASH3_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  hash2Value = temp & (kHash2Size - 1); \
+  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
+
+#define HASH4_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  hash2Value = temp & (kHash2Size - 1); \
+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
+  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
+
+#define HASH5_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  hash2Value = temp & (kHash2Size - 1); \
+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
+  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
+  hash4Value &= (kHash4Size - 1); }
+
+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
+
+
+#define MT_HASH2_CALC \
+  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
+
+#define MT_HASH3_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  hash2Value = temp & (kHash2Size - 1); \
+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
+
+#define MT_HASH4_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  hash2Value = temp & (kHash2Size - 1); \
+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
+
+#endif
diff --git a/extern/lzma/LzmaDec.c b/extern/lzma/LzmaDec.c
new file mode 100644
index 00000000000..d87eb1914ea
--- /dev/null
+++ b/extern/lzma/LzmaDec.c
@@ -0,0 +1,1007 @@
+/* LzmaDec.c -- LZMA Decoder
+2008-11-06 : Igor Pavlov : Public domain */
+
+#include "LzmaDec.h"
+
+#include <string.h>
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+
+#define RC_INIT_SIZE 5
+
+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
+
+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
+  { UPDATE_0(p); i = (i + i); A0; } else \
+  { UPDATE_1(p); i = (i + i) + 1; A1; }
+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
+
+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
+#define TREE_DECODE(probs, limit, i) \
+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
+
+/* #define _LZMA_SIZE_OPT */
+
+#ifdef _LZMA_SIZE_OPT
+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
+#else
+#define TREE_6_DECODE(probs, i) \
+  { i = 1; \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  i -= 0x40; }
+#endif
+
+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
+
+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
+#define UPDATE_0_CHECK range = bound;
+#define UPDATE_1_CHECK range -= bound; code -= bound;
+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
+#define TREE_DECODE_CHECK(probs, limit, i) \
+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
+
+
+#define kNumPosBitsMax 4
+#define kNumPosStatesMax (1 << kNumPosBitsMax)
+
+#define kLenNumLowBits 3
+#define kLenNumLowSymbols (1 << kLenNumLowBits)
+#define kLenNumMidBits 3
+#define kLenNumMidSymbols (1 << kLenNumMidBits)
+#define kLenNumHighBits 8
+#define kLenNumHighSymbols (1 << kLenNumHighBits)
+
+#define LenChoice 0
+#define LenChoice2 (LenChoice + 1)
+#define LenLow (LenChoice2 + 1)
+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
+
+
+#define kNumStates 12
+#define kNumLitStates 7
+
+#define kStartPosModelIndex 4
+#define kEndPosModelIndex 14
+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
+
+#define kNumPosSlotBits 6
+#define kNumLenToPosStates 4
+
+#define kNumAlignBits 4
+#define kAlignTableSize (1 << kNumAlignBits)
+
+#define kMatchMinLen 2
+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
+
+#define IsMatch 0
+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
+#define IsRepG0 (IsRep + kNumStates)
+#define IsRepG1 (IsRepG0 + kNumStates)
+#define IsRepG2 (IsRepG1 + kNumStates)
+#define IsRep0Long (IsRepG2 + kNumStates)
+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
+#define LenCoder (Align + kAlignTableSize)
+#define RepLenCoder (LenCoder + kNumLenProbs)
+#define Literal (RepLenCoder + kNumLenProbs)
+
+#define LZMA_BASE_SIZE 1846
+#define LZMA_LIT_SIZE 768
+
+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
+
+#if Literal != LZMA_BASE_SIZE
+StopCompilingDueBUG
+#endif
+
+static const Byte kLiteralNextStates[kNumStates * 2] =
+{
+  0, 0, 0, 0, 1, 2, 3,  4,  5,  6,  4,  5,
+  7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10
+};
+
+#define LZMA_DIC_MIN (1 << 12)
+
+/* First LZMA-symbol is always decoded.
+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
+Out:
+  Result:
+    SZ_OK - OK
+    SZ_ERROR_DATA - Error
+  p->remainLen:
+    < kMatchSpecLenStart : normal remain
+    = kMatchSpecLenStart : finished
+    = kMatchSpecLenStart + 1 : Flush marker
+    = kMatchSpecLenStart + 2 : State Init Marker
+*/
+
+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
+{
+  CLzmaProb *probs = p->probs;
+
+  unsigned state = p->state;
+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
+  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
+  unsigned lc = p->prop.lc;
+
+  Byte *dic = p->dic;
+  SizeT dicBufSize = p->dicBufSize;
+  SizeT dicPos = p->dicPos;
+  
+  UInt32 processedPos = p->processedPos;
+  UInt32 checkDicSize = p->checkDicSize;
+  unsigned len = 0;
+
+  const Byte *buf = p->buf;
+  UInt32 range = p->range;
+  UInt32 code = p->code;
+
+  do
+  {
+    CLzmaProb *prob;
+    UInt32 bound;
+    unsigned ttt;
+    unsigned posState = processedPos & pbMask;
+
+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
+    IF_BIT_0(prob)
+    {
+      unsigned symbol;
+      UPDATE_0(prob);
+      prob = probs + Literal;
+      if (checkDicSize != 0 || processedPos != 0)
+        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
+        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
+
+      if (state < kNumLitStates)
+      {
+        symbol = 1;
+        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
+      }
+      else
+      {
+        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
+        unsigned offs = 0x100;
+        symbol = 1;
+        do
+        {
+          unsigned bit;
+          CLzmaProb *probLit;
+          matchByte <<= 1;
+          bit = (matchByte & offs);
+          probLit = prob + offs + bit + symbol;
+          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
+        }
+        while (symbol < 0x100);
+      }
+      dic[dicPos++] = (Byte)symbol;
+      processedPos++;
+
+      state = kLiteralNextStates[state];
+      /* if (state < 4) state = 0; else if (state < 10) state -= 3; else state -= 6; */
+      continue;
+    }
+    else
+    {
+      UPDATE_1(prob);
+      prob = probs + IsRep + state;
+      IF_BIT_0(prob)
+      {
+        UPDATE_0(prob);
+        state += kNumStates;
+        prob = probs + LenCoder;
+      }
+      else
+      {
+        UPDATE_1(prob);
+        if (checkDicSize == 0 && processedPos == 0)
+          return SZ_ERROR_DATA;
+        prob = probs + IsRepG0 + state;
+        IF_BIT_0(prob)
+        {
+          UPDATE_0(prob);
+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
+          IF_BIT_0(prob)
+          {
+            UPDATE_0(prob);
+            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
+            dicPos++;
+            processedPos++;
+            state = state < kNumLitStates ? 9 : 11;
+            continue;
+          }
+          UPDATE_1(prob);
+        }
+        else
+        {
+          UInt32 distance;
+          UPDATE_1(prob);
+          prob = probs + IsRepG1 + state;
+          IF_BIT_0(prob)
+          {
+            UPDATE_0(prob);
+            distance = rep1;
+          }
+          else
+          {
+            UPDATE_1(prob);
+            prob = probs + IsRepG2 + state;
+            IF_BIT_0(prob)
+            {
+              UPDATE_0(prob);
+              distance = rep2;
+            }
+            else
+            {
+              UPDATE_1(prob);
+              distance = rep3;
+              rep3 = rep2;
+            }
+            rep2 = rep1;
+          }
+          rep1 = rep0;
+          rep0 = distance;
+        }
+        state = state < kNumLitStates ? 8 : 11;
+        prob = probs + RepLenCoder;
+      }
+      {
+        unsigned limit, offset;
+        CLzmaProb *probLen = prob + LenChoice;
+        IF_BIT_0(probLen)
+        {
+          UPDATE_0(probLen);
+          probLen = prob + LenLow + (posState << kLenNumLowBits);
+          offset = 0;
+          limit = (1 << kLenNumLowBits);
+        }
+        else
+        {
+          UPDATE_1(probLen);
+          probLen = prob + LenChoice2;
+          IF_BIT_0(probLen)
+          {
+            UPDATE_0(probLen);
+            probLen = prob + LenMid + (posState << kLenNumMidBits);
+            offset = kLenNumLowSymbols;
+            limit = (1 << kLenNumMidBits);
+          }
+          else
+          {
+            UPDATE_1(probLen);
+            probLen = prob + LenHigh;
+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
+            limit = (1 << kLenNumHighBits);
+          }
+        }
+        TREE_DECODE(probLen, limit, len);
+        len += offset;
+      }
+
+      if (state >= kNumStates)
+      {
+        UInt32 distance;
+        prob = probs + PosSlot +
+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
+        TREE_6_DECODE(prob, distance);
+        if (distance >= kStartPosModelIndex)
+        {
+          unsigned posSlot = (unsigned)distance;
+          int numDirectBits = (int)(((distance >> 1) - 1));
+          distance = (2 | (distance & 1));
+          if (posSlot < kEndPosModelIndex)
+          {
+            distance <<= numDirectBits;
+            prob = probs + SpecPos + distance - posSlot - 1;
+            {
+              UInt32 mask = 1;
+              unsigned i = 1;
+              do
+              {
+                GET_BIT2(prob + i, i, ; , distance |= mask);
+                mask <<= 1;
+              }
+              while (--numDirectBits != 0);
+            }
+          }
+          else
+          {
+            numDirectBits -= kNumAlignBits;
+            do
+            {
+              NORMALIZE
+              range >>= 1;
+              
+              {
+                UInt32 t;
+                code -= range;
+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
+                distance = (distance << 1) + (t + 1);
+                code += range & t;
+              }
+              /*
+              distance <<= 1;
+              if (code >= range)
+              {
+                code -= range;
+                distance |= 1;
+              }
+              */
+            }
+            while (--numDirectBits != 0);
+            prob = probs + Align;
+            distance <<= kNumAlignBits;
+            {
+              unsigned i = 1;
+              GET_BIT2(prob + i, i, ; , distance |= 1);
+              GET_BIT2(prob + i, i, ; , distance |= 2);
+              GET_BIT2(prob + i, i, ; , distance |= 4);
+              GET_BIT2(prob + i, i, ; , distance |= 8);
+            }
+            if (distance == (UInt32)0xFFFFFFFF)
+            {
+              len += kMatchSpecLenStart;
+              state -= kNumStates;
+              break;
+            }
+          }
+        }
+        rep3 = rep2;
+        rep2 = rep1;
+        rep1 = rep0;
+        rep0 = distance + 1;
+        if (checkDicSize == 0)
+        {
+          if (distance >= processedPos)
+            return SZ_ERROR_DATA;
+        }
+        else if (distance >= checkDicSize)
+          return SZ_ERROR_DATA;
+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
+        /* state = kLiteralNextStates[state]; */
+      }
+
+      len += kMatchMinLen;
+
+      if (limit == dicPos)
+        return SZ_ERROR_DATA;
+      {
+        SizeT rem = limit - dicPos;
+        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
+        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
+
+        processedPos += curLen;
+
+        len -= curLen;
+        if (pos + curLen <= dicBufSize)
+        {
+          Byte *dest = dic + dicPos;
+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
+          const Byte *lim = dest + curLen;
+          dicPos += curLen;
+          do
+            *(dest) = (Byte)*(dest + src);
+          while (++dest != lim);
+        }
+        else
+        {
+          do
+          {
+            dic[dicPos++] = dic[pos];
+            if (++pos == dicBufSize)
+              pos = 0;
+          }
+          while (--curLen != 0);
+        }
+      }
+    }
+  }
+  while (dicPos < limit && buf < bufLimit);
+  NORMALIZE;
+  p->buf = buf;
+  p->range = range;
+  p->code = code;
+  p->remainLen = len;
+  p->dicPos = dicPos;
+  p->processedPos = processedPos;
+  p->reps[0] = rep0;
+  p->reps[1] = rep1;
+  p->reps[2] = rep2;
+  p->reps[3] = rep3;
+  p->state = state;
+
+  return SZ_OK;
+}
+
+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
+{
+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
+  {
+    Byte *dic = p->dic;
+    SizeT dicPos = p->dicPos;
+    SizeT dicBufSize = p->dicBufSize;
+    unsigned len = p->remainLen;
+    UInt32 rep0 = p->reps[0];
+    if (limit - dicPos < len)
+      len = (unsigned)(limit - dicPos);
+
+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
+      p->checkDicSize = p->prop.dicSize;
+
+    p->processedPos += len;
+    p->remainLen -= len;
+    while (len-- != 0)
+    {
+      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
+      dicPos++;
+    }
+    p->dicPos = dicPos;
+  }
+}
+
+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
+{
+  do
+  {
+    SizeT limit2 = limit;
+    if (p->checkDicSize == 0)
+    {
+      UInt32 rem = p->prop.dicSize - p->processedPos;
+      if (limit - p->dicPos > rem)
+        limit2 = p->dicPos + rem;
+    }
+    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
+    if (p->processedPos >= p->prop.dicSize)
+      p->checkDicSize = p->prop.dicSize;
+    LzmaDec_WriteRem(p, limit);
+  }
+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
+
+  if (p->remainLen > kMatchSpecLenStart)
+  {
+    p->remainLen = kMatchSpecLenStart;
+  }
+  return 0;
+}
+
+typedef enum
+{
+  DUMMY_ERROR, /* unexpected end of input stream */
+  DUMMY_LIT,
+  DUMMY_MATCH,
+  DUMMY_REP
+} ELzmaDummy;
+
+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
+{
+  UInt32 range = p->range;
+  UInt32 code = p->code;
+  const Byte *bufLimit = buf + inSize;
+  CLzmaProb *probs = p->probs;
+  unsigned state = p->state;
+  ELzmaDummy res;
+
+  {
+    CLzmaProb *prob;
+    UInt32 bound;
+    unsigned ttt;
+    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
+
+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
+    IF_BIT_0_CHECK(prob)
+    {
+      UPDATE_0_CHECK
+
+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
+
+      prob = probs + Literal;
+      if (p->checkDicSize != 0 || p->processedPos != 0)
+        prob += (LZMA_LIT_SIZE *
+          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
+          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
+
+      if (state < kNumLitStates)
+      {
+        unsigned symbol = 1;
+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
+      }
+      else
+      {
+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
+            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
+        unsigned offs = 0x100;
+        unsigned symbol = 1;
+        do
+        {
+          unsigned bit;
+          CLzmaProb *probLit;
+          matchByte <<= 1;
+          bit = (matchByte & offs);
+          probLit = prob + offs + bit + symbol;
+          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
+        }
+        while (symbol < 0x100);
+      }
+      res = DUMMY_LIT;
+    }
+    else
+    {
+      unsigned len;
+      UPDATE_1_CHECK;
+
+      prob = probs + IsRep + state;
+      IF_BIT_0_CHECK(prob)
+      {
+        UPDATE_0_CHECK;
+        state = 0;
+        prob = probs + LenCoder;
+        res = DUMMY_MATCH;
+      }
+      else
+      {
+        UPDATE_1_CHECK;
+        res = DUMMY_REP;
+        prob = probs + IsRepG0 + state;
+        IF_BIT_0_CHECK(prob)
+        {
+          UPDATE_0_CHECK;
+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
+          IF_BIT_0_CHECK(prob)
+          {
+            UPDATE_0_CHECK;
+            NORMALIZE_CHECK;
+            return DUMMY_REP;
+          }
+          else
+          {
+            UPDATE_1_CHECK;
+          }
+        }
+        else
+        {
+          UPDATE_1_CHECK;
+          prob = probs + IsRepG1 + state;
+          IF_BIT_0_CHECK(prob)
+          {
+            UPDATE_0_CHECK;
+          }
+          else
+          {
+            UPDATE_1_CHECK;
+            prob = probs + IsRepG2 + state;
+            IF_BIT_0_CHECK(prob)
+            {
+              UPDATE_0_CHECK;
+            }
+            else
+            {
+              UPDATE_1_CHECK;
+            }
+          }
+        }
+        state = kNumStates;
+        prob = probs + RepLenCoder;
+      }
+      {
+        unsigned limit, offset;
+        CLzmaProb *probLen = prob + LenChoice;
+        IF_BIT_0_CHECK(probLen)
+        {
+          UPDATE_0_CHECK;
+          probLen = prob + LenLow + (posState << kLenNumLowBits);
+          offset = 0;
+          limit = 1 << kLenNumLowBits;
+        }
+        else
+        {
+          UPDATE_1_CHECK;
+          probLen = prob + LenChoice2;
+          IF_BIT_0_CHECK(probLen)
+          {
+            UPDATE_0_CHECK;
+            probLen = prob + LenMid + (posState << kLenNumMidBits);
+            offset = kLenNumLowSymbols;
+            limit = 1 << kLenNumMidBits;
+          }
+          else
+          {
+            UPDATE_1_CHECK;
+            probLen = prob + LenHigh;
+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
+            limit = 1 << kLenNumHighBits;
+          }
+        }
+        TREE_DECODE_CHECK(probLen, limit, len);
+        len += offset;
+      }
+
+      if (state < 4)
+      {
+        unsigned posSlot;
+        prob = probs + PosSlot +
+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
+            kNumPosSlotBits);
+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
+        if (posSlot >= kStartPosModelIndex)
+        {
+          int numDirectBits = ((posSlot >> 1) - 1);
+
+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
+
+          if (posSlot < kEndPosModelIndex)
+          {
+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
+          }
+          else
+          {
+            numDirectBits -= kNumAlignBits;
+            do
+            {
+              NORMALIZE_CHECK
+              range >>= 1;
+              code -= range & (((code - range) >> 31) - 1);
+              /* if (code >= range) code -= range; */
+            }
+            while (--numDirectBits != 0);
+            prob = probs + Align;
+            numDirectBits = kNumAlignBits;
+          }
+          {
+            unsigned i = 1;
+            do
+            {
+              GET_BIT_CHECK(prob + i, i);
+            }
+            while (--numDirectBits != 0);
+          }
+        }
+      }
+    }
+  }
+  NORMALIZE_CHECK;
+  return res;
+}
+
+
+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
+{
+  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
+  p->range = 0xFFFFFFFF;
+  p->needFlush = 0;
+}
+
+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+{
+  p->needFlush = 1;
+  p->remainLen = 0;
+  p->tempBufSize = 0;
+
+  if (initDic)
+  {
+    p->processedPos = 0;
+    p->checkDicSize = 0;
+    p->needInitState = 1;
+  }
+  if (initState)
+    p->needInitState = 1;
+}
+
+void LzmaDec_Init(CLzmaDec *p)
+{
+  p->dicPos = 0;
+  LzmaDec_InitDicAndState(p, True, True);
+}
+
+static void LzmaDec_InitStateReal(CLzmaDec *p)
+{
+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
+  UInt32 i;
+  CLzmaProb *probs = p->probs;
+  for (i = 0; i < numProbs; i++)
+    probs[i] = kBitModelTotal >> 1;
+  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
+  p->state = 0;
+  p->needInitState = 0;
+}
+
+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+    ELzmaFinishMode finishMode, ELzmaStatus *status)
+{
+  SizeT inSize = *srcLen;
+  (*srcLen) = 0;
+  LzmaDec_WriteRem(p, dicLimit);
+  
+  *status = LZMA_STATUS_NOT_SPECIFIED;
+
+  while (p->remainLen != kMatchSpecLenStart)
+  {
+      int checkEndMarkNow;
+
+      if (p->needFlush != 0)
+      {
+        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
+          p->tempBuf[p->tempBufSize++] = *src++;
+        if (p->tempBufSize < RC_INIT_SIZE)
+        {
+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+          return SZ_OK;
+        }
+        if (p->tempBuf[0] != 0)
+          return SZ_ERROR_DATA;
+
+        LzmaDec_InitRc(p, p->tempBuf);
+        p->tempBufSize = 0;
+      }
+
+      checkEndMarkNow = 0;
+      if (p->dicPos >= dicLimit)
+      {
+        if (p->remainLen == 0 && p->code == 0)
+        {
+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
+          return SZ_OK;
+        }
+        if (finishMode == LZMA_FINISH_ANY)
+        {
+          *status = LZMA_STATUS_NOT_FINISHED;
+          return SZ_OK;
+        }
+        if (p->remainLen != 0)
+        {
+          *status = LZMA_STATUS_NOT_FINISHED;
+          return SZ_ERROR_DATA;
+        }
+        checkEndMarkNow = 1;
+      }
+
+      if (p->needInitState)
+        LzmaDec_InitStateReal(p);
+  
+      if (p->tempBufSize == 0)
+      {
+        SizeT processed;
+        const Byte *bufLimit;
+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
+        {
+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
+          if (dummyRes == DUMMY_ERROR)
+          {
+            memcpy(p->tempBuf, src, inSize);
+            p->tempBufSize = (unsigned)inSize;
+            (*srcLen) += inSize;
+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+            return SZ_OK;
+          }
+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
+          {
+            *status = LZMA_STATUS_NOT_FINISHED;
+            return SZ_ERROR_DATA;
+          }
+          bufLimit = src;
+        }
+        else
+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
+        p->buf = src;
+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
+          return SZ_ERROR_DATA;
+        processed = (SizeT)(p->buf - src);
+        (*srcLen) += processed;
+        src += processed;
+        inSize -= processed;
+      }
+      else
+      {
+        unsigned rem = p->tempBufSize, lookAhead = 0;
+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
+          p->tempBuf[rem++] = src[lookAhead++];
+        p->tempBufSize = rem;
+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
+        {
+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
+          if (dummyRes == DUMMY_ERROR)
+          {
+            (*srcLen) += lookAhead;
+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+            return SZ_OK;
+          }
+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
+          {
+            *status = LZMA_STATUS_NOT_FINISHED;
+            return SZ_ERROR_DATA;
+          }
+        }
+        p->buf = p->tempBuf;
+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
+          return SZ_ERROR_DATA;
+        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
+        (*srcLen) += lookAhead;
+        src += lookAhead;
+        inSize -= lookAhead;
+        p->tempBufSize = 0;
+      }
+  }
+  if (p->code == 0)
+    *status = LZMA_STATUS_FINISHED_WITH_MARK;
+  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+}
+
+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+{
+  SizeT outSize = *destLen;
+  SizeT inSize = *srcLen;
+  *srcLen = *destLen = 0;
+  for (;;)
+  {
+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+    ELzmaFinishMode curFinishMode;
+    SRes res;
+    if (p->dicPos == p->dicBufSize)
+      p->dicPos = 0;
+    dicPos = p->dicPos;
+    if (outSize > p->dicBufSize - dicPos)
+    {
+      outSizeCur = p->dicBufSize;
+      curFinishMode = LZMA_FINISH_ANY;
+    }
+    else
+    {
+      outSizeCur = dicPos + outSize;
+      curFinishMode = finishMode;
+    }
+
+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+    src += inSizeCur;
+    inSize -= inSizeCur;
+    *srcLen += inSizeCur;
+    outSizeCur = p->dicPos - dicPos;
+    memcpy(dest, p->dic + dicPos, outSizeCur);
+    dest += outSizeCur;
+    outSize -= outSizeCur;
+    *destLen += outSizeCur;
+    if (res != 0)
+      return res;
+    if (outSizeCur == 0 || outSize == 0)
+      return SZ_OK;
+  }
+}
+
+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->probs);
+  p->probs = 0;
+}
+
+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->dic);
+  p->dic = 0;
+}
+
+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+{
+  LzmaDec_FreeProbs(p, alloc);
+  LzmaDec_FreeDict(p, alloc);
+}
+
+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+{
+  UInt32 dicSize;
+  Byte d;
+  
+  if (size < LZMA_PROPS_SIZE)
+    return SZ_ERROR_UNSUPPORTED;
+  else
+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
+ 
+  if (dicSize < LZMA_DIC_MIN)
+    dicSize = LZMA_DIC_MIN;
+  p->dicSize = dicSize;
+
+  d = data[0];
+  if (d >= (9 * 5 * 5))
+    return SZ_ERROR_UNSUPPORTED;
+
+  p->lc = d % 9;
+  d /= 9;
+  p->pb = d / 5;
+  p->lp = d % 5;
+
+  return SZ_OK;
+}
+
+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
+{
+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
+  if (p->probs == 0 || numProbs != p->numProbs)
+  {
+    LzmaDec_FreeProbs(p, alloc);
+    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
+    p->numProbs = numProbs;
+    if (p->probs == 0)
+      return SZ_ERROR_MEM;
+  }
+  return SZ_OK;
+}
+
+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+{
+  CLzmaProps propNew;
+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+  p->prop = propNew;
+  return SZ_OK;
+}
+
+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+{
+  CLzmaProps propNew;
+  SizeT dicBufSize;
+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+  dicBufSize = propNew.dicSize;
+  if (p->dic == 0 || dicBufSize != p->dicBufSize)
+  {
+    LzmaDec_FreeDict(p, alloc);
+    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
+    if (p->dic == 0)
+    {
+      LzmaDec_FreeProbs(p, alloc);
+      return SZ_ERROR_MEM;
+    }
+  }
+  p->dicBufSize = dicBufSize;
+  p->prop = propNew;
+  return SZ_OK;
+}
+
+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
+    ELzmaStatus *status, ISzAlloc *alloc)
+{
+  CLzmaDec p;
+  SRes res;
+  SizeT inSize = *srcLen;
+  SizeT outSize = *destLen;
+  *srcLen = *destLen = 0;
+  if (inSize < RC_INIT_SIZE)
+    return SZ_ERROR_INPUT_EOF;
+
+  LzmaDec_Construct(&p);
+  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
+  if (res != 0)
+    return res;
+  p.dic = dest;
+  p.dicBufSize = outSize;
+
+  LzmaDec_Init(&p);
+  
+  *srcLen = inSize;
+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
+
+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
+    res = SZ_ERROR_INPUT_EOF;
+
+  (*destLen) = p.dicPos;
+  LzmaDec_FreeProbs(&p, alloc);
+  return res;
+}
diff --git a/extern/lzma/LzmaDec.h b/extern/lzma/LzmaDec.h
new file mode 100644
index 00000000000..98cdbe94949
--- /dev/null
+++ b/extern/lzma/LzmaDec.h
@@ -0,0 +1,223 @@
+/* LzmaDec.h -- LZMA Decoder
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __LZMADEC_H
+#define __LZMADEC_H
+
+#include "Types.h"
+
+/* #define _LZMA_PROB32 */
+/* _LZMA_PROB32 can increase the speed on some CPUs,
+   but memory usage for CLzmaDec::probs will be doubled in that case */
+
+#ifdef _LZMA_PROB32
+#define CLzmaProb UInt32
+#else
+#define CLzmaProb UInt16
+#endif
+
+
+/* ---------- LZMA Properties ---------- */
+
+#define LZMA_PROPS_SIZE 5
+
+typedef struct _CLzmaProps
+{
+  unsigned lc, lp, pb;
+  UInt32 dicSize;
+} CLzmaProps;
+
+/* LzmaProps_Decode - decodes properties
+Returns:
+  SZ_OK
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+*/
+
+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+
+
+/* ---------- LZMA Decoder state ---------- */
+
+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
+
+#define LZMA_REQUIRED_INPUT_MAX 20
+
+typedef struct
+{
+  CLzmaProps prop;
+  CLzmaProb *probs;
+  Byte *dic;
+  const Byte *buf;
+  UInt32 range, code;
+  SizeT dicPos;
+  SizeT dicBufSize;
+  UInt32 processedPos;
+  UInt32 checkDicSize;
+  unsigned state;
+  UInt32 reps[4];
+  unsigned remainLen;
+  int needFlush;
+  int needInitState;
+  UInt32 numProbs;
+  unsigned tempBufSize;
+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
+} CLzmaDec;
+
+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+
+void LzmaDec_Init(CLzmaDec *p);
+
+/* There are two types of LZMA streams:
+     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+
+typedef enum
+{
+  LZMA_FINISH_ANY,   /* finish at any point */
+  LZMA_FINISH_END    /* block must be finished at the end */
+} ELzmaFinishMode;
+
+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
+
+   You must use LZMA_FINISH_END, when you know that current output buffer
+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
+
+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
+   and output value of destLen will be less than output buffer size limit.
+   You can check status result also.
+
+   You can use multiple checks to test data integrity after full decompression:
+     1) Check Result and "status" variable.
+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
+        You must use correct finish mode in that case. */
+
+typedef enum
+{
+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
+} ELzmaStatus;
+
+/* ELzmaStatus is used only as output value for function call */
+
+
+/* ---------- Interfaces ---------- */
+
+/* There are 3 levels of interfaces:
+     1) Dictionary Interface
+     2) Buffer Interface
+     3) One Call Interface
+   You can select any of these interfaces, but don't mix functions from different
+   groups for same object. */
+
+
+/* There are two variants to allocate state for Dictionary Interface:
+     1) LzmaDec_Allocate / LzmaDec_Free
+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+   You can use variant 2, if you set dictionary buffer manually.
+   For Buffer Interface you must always use variant 1.
+
+LzmaDec_Allocate* can return:
+  SZ_OK
+  SZ_ERROR_MEM         - Memory allocation error
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+*/
+   
+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+
+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+
+/* ---------- Dictionary Interface ---------- */
+
+/* You can use it, if you want to eliminate the overhead for data copying from
+   dictionary to some other external buffer.
+   You must work with CLzmaDec variables directly in this interface.
+
+   STEPS:
+     LzmaDec_Constr()
+     LzmaDec_Allocate()
+     for (each new stream)
+     {
+       LzmaDec_Init()
+       while (it needs more decompression)
+       {
+         LzmaDec_DecodeToDic()
+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+       }
+     }
+     LzmaDec_Free()
+*/
+
+/* LzmaDec_DecodeToDic
+   
+   The decoding to internal dictionary buffer (CLzmaDec::dic).
+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+
+finishMode:
+  It has meaning only if the decoding reaches output limit (dicLimit).
+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+  LZMA_FINISH_END - Stream must be finished after dicLimit.
+
+Returns:
+  SZ_OK
+    status:
+      LZMA_STATUS_FINISHED_WITH_MARK
+      LZMA_STATUS_NOT_FINISHED
+      LZMA_STATUS_NEEDS_MORE_INPUT
+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+  SZ_ERROR_DATA - Data error
+*/
+
+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+
+
+/* ---------- Buffer Interface ---------- */
+
+/* It's zlib-like interface.
+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+   to work with CLzmaDec variables manually.
+
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen).
+  LZMA_FINISH_ANY - Decode just destLen bytes.
+  LZMA_FINISH_END - Stream must be finished after (*destLen).
+*/
+
+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+
+
+/* ---------- One Call Interface ---------- */
+
+/* LzmaDecode
+
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen).
+  LZMA_FINISH_ANY - Decode just destLen bytes.
+  LZMA_FINISH_END - Stream must be finished after (*destLen).
+
+Returns:
+  SZ_OK
+    status:
+      LZMA_STATUS_FINISHED_WITH_MARK
+      LZMA_STATUS_NOT_FINISHED
+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+  SZ_ERROR_DATA - Data error
+  SZ_ERROR_MEM  - Memory allocation error
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
+*/
+
+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
+    ELzmaStatus *status, ISzAlloc *alloc);
+
+#endif
diff --git a/extern/lzma/LzmaEnc.c b/extern/lzma/LzmaEnc.c
new file mode 100644
index 00000000000..9196c43f64b
--- /dev/null
+++ b/extern/lzma/LzmaEnc.c
@@ -0,0 +1,2281 @@
+/* LzmaEnc.c -- LZMA Encoder
+2009-02-02 : Igor Pavlov : Public domain */
+
+#include <string.h>
+
+/* #define SHOW_STAT */
+/* #define SHOW_STAT2 */
+
+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
+#include <stdio.h>
+#endif
+
+#include "LzmaEnc.h"
+
+#include "LzFind.h"
+#ifdef COMPRESS_MF_MT
+#include "LzFindMt.h"
+#endif
+
+#ifdef SHOW_STAT
+static int ttt = 0;
+#endif
+
+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
+
+#define kBlockSize (9 << 10)
+#define kUnpackBlockSize (1 << 18)
+#define kMatchArraySize (1 << 21)
+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
+
+#define kNumMaxDirectBits (31)
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+#define kProbInitValue (kBitModelTotal >> 1)
+
+#define kNumMoveReducingBits 4
+#define kNumBitPriceShiftBits 4
+#define kBitPrice (1 << kNumBitPriceShiftBits)
+
+void LzmaEncProps_Init(CLzmaEncProps *p)
+{
+  p->level = 5;
+  p->dictSize = p->mc = 0;
+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
+  p->writeEndMark = 0;
+}
+
+void LzmaEncProps_Normalize(CLzmaEncProps *p)
+{
+  int level = p->level;
+  if (level < 0) level = 5;
+  p->level = level;
+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
+  if (p->lc < 0) p->lc = 3;
+  if (p->lp < 0) p->lp = 0;
+  if (p->pb < 0) p->pb = 2;
+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
+  if (p->numHashBytes < 0) p->numHashBytes = 4;
+  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
+  if (p->numThreads < 0)
+    p->numThreads =
+      #ifdef COMPRESS_MF_MT
+      ((p->btMode && p->algo) ? 2 : 1);
+      #else
+      1;
+      #endif
+}
+
+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+{
+  CLzmaEncProps props = *props2;
+  LzmaEncProps_Normalize(&props);
+  return props.dictSize;
+}
+
+/* #define LZMA_LOG_BSR */
+/* Define it for Intel's CPU */
+
+
+#ifdef LZMA_LOG_BSR
+
+#define kDicLogSizeMaxCompress 30
+
+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+
+UInt32 GetPosSlot1(UInt32 pos)
+{
+  UInt32 res;
+  BSR2_RET(pos, res);
+  return res;
+}
+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
+
+#else
+
+#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+
+void LzmaEnc_FastPosInit(Byte *g_FastPos)
+{
+  int c = 2, slotFast;
+  g_FastPos[0] = 0;
+  g_FastPos[1] = 1;
+  
+  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
+  {
+    UInt32 k = (1 << ((slotFast >> 1) - 1));
+    UInt32 j;
+    for (j = 0; j < k; j++, c++)
+      g_FastPos[c] = (Byte)slotFast;
+  }
+}
+
+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
+  res = p->g_FastPos[pos >> i] + (i * 2); }
+/*
+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
+  p->g_FastPos[pos >> 6] + 12 : \
+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
+*/
+
+#define GetPosSlot1(pos) p->g_FastPos[pos]
+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
+
+#endif
+
+
+#define LZMA_NUM_REPS 4
+
+typedef unsigned CState;
+
+typedef struct _COptimal
+{
+  UInt32 price;
+
+  CState state;
+  int prev1IsChar;
+  int prev2;
+
+  UInt32 posPrev2;
+  UInt32 backPrev2;
+
+  UInt32 posPrev;
+  UInt32 backPrev;
+  UInt32 backs[LZMA_NUM_REPS];
+} COptimal;
+
+#define kNumOpts (1 << 12)
+
+#define kNumLenToPosStates 4
+#define kNumPosSlotBits 6
+#define kDicLogSizeMin 0
+#define kDicLogSizeMax 32
+#define kDistTableSizeMax (kDicLogSizeMax * 2)
+
+
+#define kNumAlignBits 4
+#define kAlignTableSize (1 << kNumAlignBits)
+#define kAlignMask (kAlignTableSize - 1)
+
+#define kStartPosModelIndex 4
+#define kEndPosModelIndex 14
+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
+
+#define kNumFullDistances (1 << (kEndPosModelIndex / 2))
+
+#ifdef _LZMA_PROB32
+#define CLzmaProb UInt32
+#else
+#define CLzmaProb UInt16
+#endif
+
+#define LZMA_PB_MAX 4
+#define LZMA_LC_MAX 8
+#define LZMA_LP_MAX 4
+
+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
+
+
+#define kLenNumLowBits 3
+#define kLenNumLowSymbols (1 << kLenNumLowBits)
+#define kLenNumMidBits 3
+#define kLenNumMidSymbols (1 << kLenNumMidBits)
+#define kLenNumHighBits 8
+#define kLenNumHighSymbols (1 << kLenNumHighBits)
+
+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
+
+#define LZMA_MATCH_LEN_MIN 2
+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
+
+#define kNumStates 12
+
+typedef struct
+{
+  CLzmaProb choice;
+  CLzmaProb choice2;
+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
+  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
+  CLzmaProb high[kLenNumHighSymbols];
+} CLenEnc;
+
+typedef struct
+{
+  CLenEnc p;
+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
+  UInt32 tableSize;
+  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
+} CLenPriceEnc;
+
+typedef struct _CRangeEnc
+{
+  UInt32 range;
+  Byte cache;
+  UInt64 low;
+  UInt64 cacheSize;
+  Byte *buf;
+  Byte *bufLim;
+  Byte *bufBase;
+  ISeqOutStream *outStream;
+  UInt64 processed;
+  SRes res;
+} CRangeEnc;
+
+typedef struct _CSeqInStreamBuf
+{
+  ISeqInStream funcTable;
+  const Byte *data;
+  SizeT rem;
+} CSeqInStreamBuf;
+
+static SRes MyRead(void *pp, void *data, size_t *size)
+{
+  size_t curSize = *size;
+  CSeqInStreamBuf *p = (CSeqInStreamBuf *)pp;
+  if (p->rem < curSize)
+    curSize = p->rem;
+  memcpy(data, p->data, curSize);
+  p->rem -= curSize;
+  p->data += curSize;
+  *size = curSize;
+  return SZ_OK;
+}
+
+typedef struct
+{
+  CLzmaProb *litProbs;
+
+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
+  CLzmaProb isRep[kNumStates];
+  CLzmaProb isRepG0[kNumStates];
+  CLzmaProb isRepG1[kNumStates];
+  CLzmaProb isRepG2[kNumStates];
+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
+
+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
+  
+  CLenPriceEnc lenEnc;
+  CLenPriceEnc repLenEnc;
+
+  UInt32 reps[LZMA_NUM_REPS];
+  UInt32 state;
+} CSaveState;
+
+typedef struct _CLzmaEnc
+{
+  IMatchFinder matchFinder;
+  void *matchFinderObj;
+
+  #ifdef COMPRESS_MF_MT
+  Bool mtMode;
+  CMatchFinderMt matchFinderMt;
+  #endif
+
+  CMatchFinder matchFinderBase;
+
+  #ifdef COMPRESS_MF_MT
+  Byte pad[128];
+  #endif
+  
+  UInt32 optimumEndIndex;
+  UInt32 optimumCurrentIndex;
+
+  UInt32 longestMatchLength;
+  UInt32 numPairs;
+  UInt32 numAvail;
+  COptimal opt[kNumOpts];
+  
+  #ifndef LZMA_LOG_BSR
+  Byte g_FastPos[1 << kNumLogBits];
+  #endif
+
+  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
+  UInt32 numFastBytes;
+  UInt32 additionalOffset;
+  UInt32 reps[LZMA_NUM_REPS];
+  UInt32 state;
+
+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
+  UInt32 alignPrices[kAlignTableSize];
+  UInt32 alignPriceCount;
+
+  UInt32 distTableSize;
+
+  unsigned lc, lp, pb;
+  unsigned lpMask, pbMask;
+
+  CLzmaProb *litProbs;
+
+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
+  CLzmaProb isRep[kNumStates];
+  CLzmaProb isRepG0[kNumStates];
+  CLzmaProb isRepG1[kNumStates];
+  CLzmaProb isRepG2[kNumStates];
+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
+
+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
+  
+  CLenPriceEnc lenEnc;
+  CLenPriceEnc repLenEnc;
+
+  unsigned lclp;
+
+  Bool fastMode;
+  
+  CRangeEnc rc;
+
+  Bool writeEndMark;
+  UInt64 nowPos64;
+  UInt32 matchPriceCount;
+  Bool finished;
+  Bool multiThread;
+
+  SRes result;
+  UInt32 dictSize;
+  UInt32 matchFinderCycles;
+
+  ISeqInStream *inStream;
+  CSeqInStreamBuf seqBufInStream;
+
+  CSaveState saveState;
+} CLzmaEnc;
+
+void LzmaEnc_SaveState(CLzmaEncHandle pp)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  CSaveState *dest = &p->saveState;
+  int i;
+  dest->lenEnc = p->lenEnc;
+  dest->repLenEnc = p->repLenEnc;
+  dest->state = p->state;
+
+  for (i = 0; i < kNumStates; i++)
+  {
+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+  }
+  for (i = 0; i < kNumLenToPosStates; i++)
+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+  memcpy(dest->reps, p->reps, sizeof(p->reps));
+  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+}
+
+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+{
+  CLzmaEnc *dest = (CLzmaEnc *)pp;
+  const CSaveState *p = &dest->saveState;
+  int i;
+  dest->lenEnc = p->lenEnc;
+  dest->repLenEnc = p->repLenEnc;
+  dest->state = p->state;
+
+  for (i = 0; i < kNumStates; i++)
+  {
+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+  }
+  for (i = 0; i < kNumLenToPosStates; i++)
+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+  memcpy(dest->reps, p->reps, sizeof(p->reps));
+  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
+}
+
+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  CLzmaEncProps props = *props2;
+  LzmaEncProps_Normalize(&props);
+
+  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
+      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
+    return SZ_ERROR_PARAM;
+  p->dictSize = props.dictSize;
+  p->matchFinderCycles = props.mc;
+  {
+    unsigned fb = props.fb;
+    if (fb < 5)
+      fb = 5;
+    if (fb > LZMA_MATCH_LEN_MAX)
+      fb = LZMA_MATCH_LEN_MAX;
+    p->numFastBytes = fb;
+  }
+  p->lc = props.lc;
+  p->lp = props.lp;
+  p->pb = props.pb;
+  p->fastMode = (props.algo == 0);
+  p->matchFinderBase.btMode = props.btMode;
+  {
+    UInt32 numHashBytes = 4;
+    if (props.btMode)
+    {
+      if (props.numHashBytes < 2)
+        numHashBytes = 2;
+      else if (props.numHashBytes < 4)
+        numHashBytes = props.numHashBytes;
+    }
+    p->matchFinderBase.numHashBytes = numHashBytes;
+  }
+
+  p->matchFinderBase.cutValue = props.mc;
+
+  p->writeEndMark = props.writeEndMark;
+
+  #ifdef COMPRESS_MF_MT
+  /*
+  if (newMultiThread != _multiThread)
+  {
+    ReleaseMatchFinder();
+    _multiThread = newMultiThread;
+  }
+  */
+  p->multiThread = (props.numThreads > 1);
+  #endif
+
+  return SZ_OK;
+}
+
+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
+static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
+static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
+
+#define IsCharState(s) ((s) < 7)
+
+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
+
+#define kInfinityPrice (1 << 30)
+
+static void RangeEnc_Construct(CRangeEnc *p)
+{
+  p->outStream = 0;
+  p->bufBase = 0;
+}
+
+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
+
+#define RC_BUF_SIZE (1 << 16)
+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
+{
+  if (p->bufBase == 0)
+  {
+    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
+    if (p->bufBase == 0)
+      return 0;
+    p->bufLim = p->bufBase + RC_BUF_SIZE;
+  }
+  return 1;
+}
+
+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->bufBase);
+  p->bufBase = 0;
+}
+
+static void RangeEnc_Init(CRangeEnc *p)
+{
+  /* Stream.Init(); */
+  p->low = 0;
+  p->range = 0xFFFFFFFF;
+  p->cacheSize = 1;
+  p->cache = 0;
+
+  p->buf = p->bufBase;
+
+  p->processed = 0;
+  p->res = SZ_OK;
+}
+
+static void RangeEnc_FlushStream(CRangeEnc *p)
+{
+  size_t num;
+  if (p->res != SZ_OK)
+    return;
+  num = p->buf - p->bufBase;
+  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
+    p->res = SZ_ERROR_WRITE;
+  p->processed += num;
+  p->buf = p->bufBase;
+}
+
+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
+{
+  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
+  {
+    Byte temp = p->cache;
+    do
+    {
+      Byte *buf = p->buf;
+      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
+      p->buf = buf;
+      if (buf == p->bufLim)
+        RangeEnc_FlushStream(p);
+      temp = 0xFF;
+    }
+    while (--p->cacheSize != 0);
+    p->cache = (Byte)((UInt32)p->low >> 24);
+  }
+  p->cacheSize++;
+  p->low = (UInt32)p->low << 8;
+}
+
+static void RangeEnc_FlushData(CRangeEnc *p)
+{
+  int i;
+  for (i = 0; i < 5; i++)
+    RangeEnc_ShiftLow(p);
+}
+
+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
+{
+  do
+  {
+    p->range >>= 1;
+    p->low += p->range & (0 - ((value >> --numBits) & 1));
+    if (p->range < kTopValue)
+    {
+      p->range <<= 8;
+      RangeEnc_ShiftLow(p);
+    }
+  }
+  while (numBits != 0);
+}
+
+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
+{
+  UInt32 ttt = *prob;
+  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
+  if (symbol == 0)
+  {
+    p->range = newBound;
+    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
+  }
+  else
+  {
+    p->low += newBound;
+    p->range -= newBound;
+    ttt -= ttt >> kNumMoveBits;
+  }
+  *prob = (CLzmaProb)ttt;
+  if (p->range < kTopValue)
+  {
+    p->range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
+}
+
+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
+{
+  symbol |= 0x100;
+  do
+  {
+    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
+    symbol <<= 1;
+  }
+  while (symbol < 0x10000);
+}
+
+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
+{
+  UInt32 offs = 0x100;
+  symbol |= 0x100;
+  do
+  {
+    matchByte <<= 1;
+    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
+    symbol <<= 1;
+    offs &= ~(matchByte ^ symbol);
+  }
+  while (symbol < 0x10000);
+}
+
+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+{
+  UInt32 i;
+  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+  {
+    const int kCyclesBits = kNumBitPriceShiftBits;
+    UInt32 w = i;
+    UInt32 bitCount = 0;
+    int j;
+    for (j = 0; j < kCyclesBits; j++)
+    {
+      w = w * w;
+      bitCount <<= 1;
+      while (w >= ((UInt32)1 << 16))
+      {
+        w >>= 1;
+        bitCount++;
+      }
+    }
+    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
+  }
+}
+
+
+#define GET_PRICE(prob, symbol) \
+  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
+
+#define GET_PRICEa(prob, symbol) \
+  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
+
+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
+
+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
+
+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
+{
+  UInt32 price = 0;
+  symbol |= 0x100;
+  do
+  {
+    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
+    symbol <<= 1;
+  }
+  while (symbol < 0x10000);
+  return price;
+}
+
+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
+{
+  UInt32 price = 0;
+  UInt32 offs = 0x100;
+  symbol |= 0x100;
+  do
+  {
+    matchByte <<= 1;
+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
+    symbol <<= 1;
+    offs &= ~(matchByte ^ symbol);
+  }
+  while (symbol < 0x10000);
+  return price;
+}
+
+
+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
+{
+  UInt32 m = 1;
+  int i;
+  for (i = numBitLevels; i != 0;)
+  {
+    UInt32 bit;
+    i--;
+    bit = (symbol >> i) & 1;
+    RangeEnc_EncodeBit(rc, probs + m, bit);
+    m = (m << 1) | bit;
+  }
+}
+
+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
+{
+  UInt32 m = 1;
+  int i;
+  for (i = 0; i < numBitLevels; i++)
+  {
+    UInt32 bit = symbol & 1;
+    RangeEnc_EncodeBit(rc, probs + m, bit);
+    m = (m << 1) | bit;
+    symbol >>= 1;
+  }
+}
+
+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
+{
+  UInt32 price = 0;
+  symbol |= (1 << numBitLevels);
+  while (symbol != 1)
+  {
+    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
+    symbol >>= 1;
+  }
+  return price;
+}
+
+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
+{
+  UInt32 price = 0;
+  UInt32 m = 1;
+  int i;
+  for (i = numBitLevels; i != 0; i--)
+  {
+    UInt32 bit = symbol & 1;
+    symbol >>= 1;
+    price += GET_PRICEa(probs[m], bit);
+    m = (m << 1) | bit;
+  }
+  return price;
+}
+
+
+static void LenEnc_Init(CLenEnc *p)
+{
+  unsigned i;
+  p->choice = p->choice2 = kProbInitValue;
+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
+    p->low[i] = kProbInitValue;
+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
+    p->mid[i] = kProbInitValue;
+  for (i = 0; i < kLenNumHighSymbols; i++)
+    p->high[i] = kProbInitValue;
+}
+
+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
+{
+  if (symbol < kLenNumLowSymbols)
+  {
+    RangeEnc_EncodeBit(rc, &p->choice, 0);
+    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
+  }
+  else
+  {
+    RangeEnc_EncodeBit(rc, &p->choice, 1);
+    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
+    {
+      RangeEnc_EncodeBit(rc, &p->choice2, 0);
+      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
+    }
+    else
+    {
+      RangeEnc_EncodeBit(rc, &p->choice2, 1);
+      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
+    }
+  }
+}
+
+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
+{
+  UInt32 a0 = GET_PRICE_0a(p->choice);
+  UInt32 a1 = GET_PRICE_1a(p->choice);
+  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
+  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
+  UInt32 i = 0;
+  for (i = 0; i < kLenNumLowSymbols; i++)
+  {
+    if (i >= numSymbols)
+      return;
+    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
+  }
+  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
+  {
+    if (i >= numSymbols)
+      return;
+    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
+  }
+  for (; i < numSymbols; i++)
+    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
+}
+
+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
+{
+  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
+  p->counters[posState] = p->tableSize;
+}
+
+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
+{
+  UInt32 posState;
+  for (posState = 0; posState < numPosStates; posState++)
+    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
+}
+
+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
+{
+  LenEnc_Encode(&p->p, rc, symbol, posState);
+  if (updatePrice)
+    if (--p->counters[posState] == 0)
+      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
+}
+
+
+
+
+static void MovePos(CLzmaEnc *p, UInt32 num)
+{
+  #ifdef SHOW_STAT
+  ttt += num;
+  printf("\n MovePos %d", num);
+  #endif
+  if (num != 0)
+  {
+    p->additionalOffset += num;
+    p->matchFinder.Skip(p->matchFinderObj, num);
+  }
+}
+
+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
+{
+  UInt32 lenRes = 0, numPairs;
+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
+  #ifdef SHOW_STAT
+  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
+  ttt++;
+  {
+    UInt32 i;
+    for (i = 0; i < numPairs; i += 2)
+      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
+  }
+  #endif
+  if (numPairs > 0)
+  {
+    lenRes = p->matches[numPairs - 2];
+    if (lenRes == p->numFastBytes)
+    {
+      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+      UInt32 distance = p->matches[numPairs - 1] + 1;
+      UInt32 numAvail = p->numAvail;
+      if (numAvail > LZMA_MATCH_LEN_MAX)
+        numAvail = LZMA_MATCH_LEN_MAX;
+      {
+        const Byte *pby2 = pby - distance;
+        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
+      }
+    }
+  }
+  p->additionalOffset++;
+  *numDistancePairsRes = numPairs;
+  return lenRes;
+}
+
+
+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
+#define IsShortRep(p) ((p)->backPrev == 0)
+
+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
+{
+  return
+    GET_PRICE_0(p->isRepG0[state]) +
+    GET_PRICE_0(p->isRep0Long[state][posState]);
+}
+
+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
+{
+  UInt32 price;
+  if (repIndex == 0)
+  {
+    price = GET_PRICE_0(p->isRepG0[state]);
+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
+  }
+  else
+  {
+    price = GET_PRICE_1(p->isRepG0[state]);
+    if (repIndex == 1)
+      price += GET_PRICE_0(p->isRepG1[state]);
+    else
+    {
+      price += GET_PRICE_1(p->isRepG1[state]);
+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
+    }
+  }
+  return price;
+}
+
+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
+{
+  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
+    GetPureRepPrice(p, repIndex, state, posState);
+}
+
+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
+{
+  UInt32 posMem = p->opt[cur].posPrev;
+  UInt32 backMem = p->opt[cur].backPrev;
+  p->optimumEndIndex = cur;
+  do
+  {
+    if (p->opt[cur].prev1IsChar)
+    {
+      MakeAsChar(&p->opt[posMem])
+      p->opt[posMem].posPrev = posMem - 1;
+      if (p->opt[cur].prev2)
+      {
+        p->opt[posMem - 1].prev1IsChar = False;
+        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
+        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
+      }
+    }
+    {
+      UInt32 posPrev = posMem;
+      UInt32 backCur = backMem;
+      
+      backMem = p->opt[posPrev].backPrev;
+      posMem = p->opt[posPrev].posPrev;
+      
+      p->opt[posPrev].backPrev = backCur;
+      p->opt[posPrev].posPrev = cur;
+      cur = posPrev;
+    }
+  }
+  while (cur != 0);
+  *backRes = p->opt[0].backPrev;
+  p->optimumCurrentIndex  = p->opt[0].posPrev;
+  return p->optimumCurrentIndex;
+}
+
+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
+
+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
+{
+  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
+  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
+  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
+  UInt32 *matches;
+  const Byte *data;
+  Byte curByte, matchByte;
+  if (p->optimumEndIndex != p->optimumCurrentIndex)
+  {
+    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
+    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
+    *backRes = opt->backPrev;
+    p->optimumCurrentIndex = opt->posPrev;
+    return lenRes;
+  }
+  p->optimumCurrentIndex = p->optimumEndIndex = 0;
+  
+  if (p->additionalOffset == 0)
+    mainLen = ReadMatchDistances(p, &numPairs);
+  else
+  {
+    mainLen = p->longestMatchLength;
+    numPairs = p->numPairs;
+  }
+
+  numAvail = p->numAvail;
+  if (numAvail < 2)
+  {
+    *backRes = (UInt32)(-1);
+    return 1;
+  }
+  if (numAvail > LZMA_MATCH_LEN_MAX)
+    numAvail = LZMA_MATCH_LEN_MAX;
+
+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+  repMaxIndex = 0;
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+  {
+    UInt32 lenTest;
+    const Byte *data2;
+    reps[i] = p->reps[i];
+    data2 = data - (reps[i] + 1);
+    if (data[0] != data2[0] || data[1] != data2[1])
+    {
+      repLens[i] = 0;
+      continue;
+    }
+    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
+    repLens[i] = lenTest;
+    if (lenTest > repLens[repMaxIndex])
+      repMaxIndex = i;
+  }
+  if (repLens[repMaxIndex] >= p->numFastBytes)
+  {
+    UInt32 lenRes;
+    *backRes = repMaxIndex;
+    lenRes = repLens[repMaxIndex];
+    MovePos(p, lenRes - 1);
+    return lenRes;
+  }
+
+  matches = p->matches;
+  if (mainLen >= p->numFastBytes)
+  {
+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
+    MovePos(p, mainLen - 1);
+    return mainLen;
+  }
+  curByte = *data;
+  matchByte = *(data - (reps[0] + 1));
+
+  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
+  {
+    *backRes = (UInt32)-1;
+    return 1;
+  }
+
+  p->opt[0].state = (CState)p->state;
+
+  posState = (position & p->pbMask);
+
+  {
+    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
+    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
+        (!IsCharState(p->state) ?
+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
+  }
+
+  MakeAsChar(&p->opt[1]);
+
+  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
+  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
+
+  if (matchByte == curByte)
+  {
+    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
+    if (shortRepPrice < p->opt[1].price)
+    {
+      p->opt[1].price = shortRepPrice;
+      MakeAsShortRep(&p->opt[1]);
+    }
+  }
+  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
+
+  if (lenEnd < 2)
+  {
+    *backRes = p->opt[1].backPrev;
+    return 1;
+  }
+
+  p->opt[1].posPrev = 0;
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+    p->opt[0].backs[i] = reps[i];
+
+  len = lenEnd;
+  do
+    p->opt[len--].price = kInfinityPrice;
+  while (len >= 2);
+
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+  {
+    UInt32 repLen = repLens[i];
+    UInt32 price;
+    if (repLen < 2)
+      continue;
+    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
+    do
+    {
+      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
+      COptimal *opt = &p->opt[repLen];
+      if (curAndLenPrice < opt->price)
+      {
+        opt->price = curAndLenPrice;
+        opt->posPrev = 0;
+        opt->backPrev = i;
+        opt->prev1IsChar = False;
+      }
+    }
+    while (--repLen >= 2);
+  }
+
+  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
+
+  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
+  if (len <= mainLen)
+  {
+    UInt32 offs = 0;
+    while (len > matches[offs])
+      offs += 2;
+    for (; ; len++)
+    {
+      COptimal *opt;
+      UInt32 distance = matches[offs + 1];
+
+      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
+      UInt32 lenToPosState = GetLenToPosState(len);
+      if (distance < kNumFullDistances)
+        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
+      else
+      {
+        UInt32 slot;
+        GetPosSlot2(distance, slot);
+        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
+      }
+      opt = &p->opt[len];
+      if (curAndLenPrice < opt->price)
+      {
+        opt->price = curAndLenPrice;
+        opt->posPrev = 0;
+        opt->backPrev = distance + LZMA_NUM_REPS;
+        opt->prev1IsChar = False;
+      }
+      if (len == matches[offs])
+      {
+        offs += 2;
+        if (offs == numPairs)
+          break;
+      }
+    }
+  }
+
+  cur = 0;
+
+    #ifdef SHOW_STAT2
+    if (position >= 0)
+    {
+      unsigned i;
+      printf("\n pos = %4X", position);
+      for (i = cur; i <= lenEnd; i++)
+      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
+    }
+    #endif
+
+  for (;;)
+  {
+    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
+    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
+    Bool nextIsChar;
+    Byte curByte, matchByte;
+    const Byte *data;
+    COptimal *curOpt;
+    COptimal *nextOpt;
+
+    cur++;
+    if (cur == lenEnd)
+      return Backward(p, backRes, cur);
+
+    newLen = ReadMatchDistances(p, &numPairs);
+    if (newLen >= p->numFastBytes)
+    {
+      p->numPairs = numPairs;
+      p->longestMatchLength = newLen;
+      return Backward(p, backRes, cur);
+    }
+    position++;
+    curOpt = &p->opt[cur];
+    posPrev = curOpt->posPrev;
+    if (curOpt->prev1IsChar)
+    {
+      posPrev--;
+      if (curOpt->prev2)
+      {
+        state = p->opt[curOpt->posPrev2].state;
+        if (curOpt->backPrev2 < LZMA_NUM_REPS)
+          state = kRepNextStates[state];
+        else
+          state = kMatchNextStates[state];
+      }
+      else
+        state = p->opt[posPrev].state;
+      state = kLiteralNextStates[state];
+    }
+    else
+      state = p->opt[posPrev].state;
+    if (posPrev == cur - 1)
+    {
+      if (IsShortRep(curOpt))
+        state = kShortRepNextStates[state];
+      else
+        state = kLiteralNextStates[state];
+    }
+    else
+    {
+      UInt32 pos;
+      const COptimal *prevOpt;
+      if (curOpt->prev1IsChar && curOpt->prev2)
+      {
+        posPrev = curOpt->posPrev2;
+        pos = curOpt->backPrev2;
+        state = kRepNextStates[state];
+      }
+      else
+      {
+        pos = curOpt->backPrev;
+        if (pos < LZMA_NUM_REPS)
+          state = kRepNextStates[state];
+        else
+          state = kMatchNextStates[state];
+      }
+      prevOpt = &p->opt[posPrev];
+      if (pos < LZMA_NUM_REPS)
+      {
+        UInt32 i;
+        reps[0] = prevOpt->backs[pos];
+        for (i = 1; i <= pos; i++)
+          reps[i] = prevOpt->backs[i - 1];
+        for (; i < LZMA_NUM_REPS; i++)
+          reps[i] = prevOpt->backs[i];
+      }
+      else
+      {
+        UInt32 i;
+        reps[0] = (pos - LZMA_NUM_REPS);
+        for (i = 1; i < LZMA_NUM_REPS; i++)
+          reps[i] = prevOpt->backs[i - 1];
+      }
+    }
+    curOpt->state = (CState)state;
+
+    curOpt->backs[0] = reps[0];
+    curOpt->backs[1] = reps[1];
+    curOpt->backs[2] = reps[2];
+    curOpt->backs[3] = reps[3];
+
+    curPrice = curOpt->price;
+    nextIsChar = False;
+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+    curByte = *data;
+    matchByte = *(data - (reps[0] + 1));
+
+    posState = (position & p->pbMask);
+
+    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
+    {
+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
+      curAnd1Price +=
+        (!IsCharState(state) ?
+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
+    }
+
+    nextOpt = &p->opt[cur + 1];
+
+    if (curAnd1Price < nextOpt->price)
+    {
+      nextOpt->price = curAnd1Price;
+      nextOpt->posPrev = cur;
+      MakeAsChar(nextOpt);
+      nextIsChar = True;
+    }
+
+    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
+    
+    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
+    {
+      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
+      if (shortRepPrice <= nextOpt->price)
+      {
+        nextOpt->price = shortRepPrice;
+        nextOpt->posPrev = cur;
+        MakeAsShortRep(nextOpt);
+        nextIsChar = True;
+      }
+    }
+    numAvailFull = p->numAvail;
+    {
+      UInt32 temp = kNumOpts - 1 - cur;
+      if (temp < numAvailFull)
+        numAvailFull = temp;
+    }
+
+    if (numAvailFull < 2)
+      continue;
+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
+
+    if (!nextIsChar && matchByte != curByte) /* speed optimization */
+    {
+      /* try Literal + rep0 */
+      UInt32 temp;
+      UInt32 lenTest2;
+      const Byte *data2 = data - (reps[0] + 1);
+      UInt32 limit = p->numFastBytes + 1;
+      if (limit > numAvailFull)
+        limit = numAvailFull;
+
+      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
+      lenTest2 = temp - 1;
+      if (lenTest2 >= 2)
+      {
+        UInt32 state2 = kLiteralNextStates[state];
+        UInt32 posStateNext = (position + 1) & p->pbMask;
+        UInt32 nextRepMatchPrice = curAnd1Price +
+            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
+            GET_PRICE_1(p->isRep[state2]);
+        /* for (; lenTest2 >= 2; lenTest2--) */
+        {
+          UInt32 curAndLenPrice;
+          COptimal *opt;
+          UInt32 offset = cur + 1 + lenTest2;
+          while (lenEnd < offset)
+            p->opt[++lenEnd].price = kInfinityPrice;
+          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
+          opt = &p->opt[offset];
+          if (curAndLenPrice < opt->price)
+          {
+            opt->price = curAndLenPrice;
+            opt->posPrev = cur + 1;
+            opt->backPrev = 0;
+            opt->prev1IsChar = True;
+            opt->prev2 = False;
+          }
+        }
+      }
+    }
+    
+    startLen = 2; /* speed optimization */
+    {
+    UInt32 repIndex;
+    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
+    {
+      UInt32 lenTest;
+      UInt32 lenTestTemp;
+      UInt32 price;
+      const Byte *data2 = data - (reps[repIndex] + 1);
+      if (data[0] != data2[0] || data[1] != data2[1])
+        continue;
+      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
+      while (lenEnd < cur + lenTest)
+        p->opt[++lenEnd].price = kInfinityPrice;
+      lenTestTemp = lenTest;
+      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
+      do
+      {
+        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
+        COptimal *opt = &p->opt[cur + lenTest];
+        if (curAndLenPrice < opt->price)
+        {
+          opt->price = curAndLenPrice;
+          opt->posPrev = cur;
+          opt->backPrev = repIndex;
+          opt->prev1IsChar = False;
+        }
+      }
+      while (--lenTest >= 2);
+      lenTest = lenTestTemp;
+      
+      if (repIndex == 0)
+        startLen = lenTest + 1;
+        
+      /* if (_maxMode) */
+        {
+          UInt32 lenTest2 = lenTest + 1;
+          UInt32 limit = lenTest2 + p->numFastBytes;
+          UInt32 nextRepMatchPrice;
+          if (limit > numAvailFull)
+            limit = numAvailFull;
+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
+          lenTest2 -= lenTest + 1;
+          if (lenTest2 >= 2)
+          {
+            UInt32 state2 = kRepNextStates[state];
+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
+            UInt32 curAndLenCharPrice =
+                price + p->repLenEnc.prices[posState][lenTest - 2] +
+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
+                    data[lenTest], data2[lenTest], p->ProbPrices);
+            state2 = kLiteralNextStates[state2];
+            posStateNext = (position + lenTest + 1) & p->pbMask;
+            nextRepMatchPrice = curAndLenCharPrice +
+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
+                GET_PRICE_1(p->isRep[state2]);
+            
+            /* for (; lenTest2 >= 2; lenTest2--) */
+            {
+              UInt32 curAndLenPrice;
+              COptimal *opt;
+              UInt32 offset = cur + lenTest + 1 + lenTest2;
+              while (lenEnd < offset)
+                p->opt[++lenEnd].price = kInfinityPrice;
+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
+              opt = &p->opt[offset];
+              if (curAndLenPrice < opt->price)
+              {
+                opt->price = curAndLenPrice;
+                opt->posPrev = cur + lenTest + 1;
+                opt->backPrev = 0;
+                opt->prev1IsChar = True;
+                opt->prev2 = True;
+                opt->posPrev2 = cur;
+                opt->backPrev2 = repIndex;
+              }
+            }
+          }
+        }
+    }
+    }
+    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
+    if (newLen > numAvail)
+    {
+      newLen = numAvail;
+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
+      matches[numPairs] = newLen;
+      numPairs += 2;
+    }
+    if (newLen >= startLen)
+    {
+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
+      UInt32 offs, curBack, posSlot;
+      UInt32 lenTest;
+      while (lenEnd < cur + newLen)
+        p->opt[++lenEnd].price = kInfinityPrice;
+
+      offs = 0;
+      while (startLen > matches[offs])
+        offs += 2;
+      curBack = matches[offs + 1];
+      GetPosSlot2(curBack, posSlot);
+      for (lenTest = /*2*/ startLen; ; lenTest++)
+      {
+        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
+        UInt32 lenToPosState = GetLenToPosState(lenTest);
+        COptimal *opt;
+        if (curBack < kNumFullDistances)
+          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
+        else
+          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
+        
+        opt = &p->opt[cur + lenTest];
+        if (curAndLenPrice < opt->price)
+        {
+          opt->price = curAndLenPrice;
+          opt->posPrev = cur;
+          opt->backPrev = curBack + LZMA_NUM_REPS;
+          opt->prev1IsChar = False;
+        }
+
+        if (/*_maxMode && */lenTest == matches[offs])
+        {
+          /* Try Match + Literal + Rep0 */
+          const Byte *data2 = data - (curBack + 1);
+          UInt32 lenTest2 = lenTest + 1;
+          UInt32 limit = lenTest2 + p->numFastBytes;
+          UInt32 nextRepMatchPrice;
+          if (limit > numAvailFull)
+            limit = numAvailFull;
+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
+          lenTest2 -= lenTest + 1;
+          if (lenTest2 >= 2)
+          {
+            UInt32 state2 = kMatchNextStates[state];
+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
+            UInt32 curAndLenCharPrice = curAndLenPrice +
+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
+                    data[lenTest], data2[lenTest], p->ProbPrices);
+            state2 = kLiteralNextStates[state2];
+            posStateNext = (posStateNext + 1) & p->pbMask;
+            nextRepMatchPrice = curAndLenCharPrice +
+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
+                GET_PRICE_1(p->isRep[state2]);
+            
+            /* for (; lenTest2 >= 2; lenTest2--) */
+            {
+              UInt32 offset = cur + lenTest + 1 + lenTest2;
+              UInt32 curAndLenPrice;
+              COptimal *opt;
+              while (lenEnd < offset)
+                p->opt[++lenEnd].price = kInfinityPrice;
+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
+              opt = &p->opt[offset];
+              if (curAndLenPrice < opt->price)
+              {
+                opt->price = curAndLenPrice;
+                opt->posPrev = cur + lenTest + 1;
+                opt->backPrev = 0;
+                opt->prev1IsChar = True;
+                opt->prev2 = True;
+                opt->posPrev2 = cur;
+                opt->backPrev2 = curBack + LZMA_NUM_REPS;
+              }
+            }
+          }
+          offs += 2;
+          if (offs == numPairs)
+            break;
+          curBack = matches[offs + 1];
+          if (curBack >= kNumFullDistances)
+            GetPosSlot2(curBack, posSlot);
+        }
+      }
+    }
+  }
+}
+
+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
+
+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
+{
+  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
+  const Byte *data;
+  const UInt32 *matches;
+
+  if (p->additionalOffset == 0)
+    mainLen = ReadMatchDistances(p, &numPairs);
+  else
+  {
+    mainLen = p->longestMatchLength;
+    numPairs = p->numPairs;
+  }
+
+  numAvail = p->numAvail;
+  *backRes = (UInt32)-1;
+  if (numAvail < 2)
+    return 1;
+  if (numAvail > LZMA_MATCH_LEN_MAX)
+    numAvail = LZMA_MATCH_LEN_MAX;
+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+
+  repLen = repIndex = 0;
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+  {
+    UInt32 len;
+    const Byte *data2 = data - (p->reps[i] + 1);
+    if (data[0] != data2[0] || data[1] != data2[1])
+      continue;
+    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
+    if (len >= p->numFastBytes)
+    {
+      *backRes = i;
+      MovePos(p, len - 1);
+      return len;
+    }
+    if (len > repLen)
+    {
+      repIndex = i;
+      repLen = len;
+    }
+  }
+
+  matches = p->matches;
+  if (mainLen >= p->numFastBytes)
+  {
+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
+    MovePos(p, mainLen - 1);
+    return mainLen;
+  }
+
+  mainDist = 0; /* for GCC */
+  if (mainLen >= 2)
+  {
+    mainDist = matches[numPairs - 1];
+    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
+    {
+      if (!ChangePair(matches[numPairs - 3], mainDist))
+        break;
+      numPairs -= 2;
+      mainLen = matches[numPairs - 2];
+      mainDist = matches[numPairs - 1];
+    }
+    if (mainLen == 2 && mainDist >= 0x80)
+      mainLen = 1;
+  }
+
+  if (repLen >= 2 && (
+        (repLen + 1 >= mainLen) ||
+        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
+        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
+  {
+    *backRes = repIndex;
+    MovePos(p, repLen - 1);
+    return repLen;
+  }
+  
+  if (mainLen < 2 || numAvail <= 2)
+    return 1;
+
+  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
+  if (p->longestMatchLength >= 2)
+  {
+    UInt32 newDistance = matches[p->numPairs - 1];
+    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
+        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
+        (p->longestMatchLength > mainLen + 1) ||
+        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
+      return 1;
+  }
+  
+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+  {
+    UInt32 len, limit;
+    const Byte *data2 = data - (p->reps[i] + 1);
+    if (data[0] != data2[0] || data[1] != data2[1])
+      continue;
+    limit = mainLen - 1;
+    for (len = 2; len < limit && data[len] == data2[len]; len++);
+    if (len >= limit)
+      return 1;
+  }
+  *backRes = mainDist + LZMA_NUM_REPS;
+  MovePos(p, mainLen - 2);
+  return mainLen;
+}
+
+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
+{
+  UInt32 len;
+  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
+  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
+  p->state = kMatchNextStates[p->state];
+  len = LZMA_MATCH_LEN_MIN;
+  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
+  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
+  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
+  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
+}
+
+static SRes CheckErrors(CLzmaEnc *p)
+{
+  if (p->result != SZ_OK)
+    return p->result;
+  if (p->rc.res != SZ_OK)
+    p->result = SZ_ERROR_WRITE;
+  if (p->matchFinderBase.result != SZ_OK)
+    p->result = SZ_ERROR_READ;
+  if (p->result != SZ_OK)
+    p->finished = True;
+  return p->result;
+}
+
+static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
+{
+  /* ReleaseMFStream(); */
+  p->finished = True;
+  if (p->writeEndMark)
+    WriteEndMarker(p, nowPos & p->pbMask);
+  RangeEnc_FlushData(&p->rc);
+  RangeEnc_FlushStream(&p->rc);
+  return CheckErrors(p);
+}
+
+static void FillAlignPrices(CLzmaEnc *p)
+{
+  UInt32 i;
+  for (i = 0; i < kAlignTableSize; i++)
+    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
+  p->alignPriceCount = 0;
+}
+
+static void FillDistancesPrices(CLzmaEnc *p)
+{
+  UInt32 tempPrices[kNumFullDistances];
+  UInt32 i, lenToPosState;
+  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
+  {
+    UInt32 posSlot = GetPosSlot1(i);
+    UInt32 footerBits = ((posSlot >> 1) - 1);
+    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
+    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
+  }
+
+  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
+  {
+    UInt32 posSlot;
+    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
+    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
+    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
+      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
+    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
+      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
+
+    {
+      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
+      UInt32 i;
+      for (i = 0; i < kStartPosModelIndex; i++)
+        distancesPrices[i] = posSlotPrices[i];
+      for (; i < kNumFullDistances; i++)
+        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
+    }
+  }
+  p->matchPriceCount = 0;
+}
+
+void LzmaEnc_Construct(CLzmaEnc *p)
+{
+  RangeEnc_Construct(&p->rc);
+  MatchFinder_Construct(&p->matchFinderBase);
+  #ifdef COMPRESS_MF_MT
+  MatchFinderMt_Construct(&p->matchFinderMt);
+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
+  #endif
+
+  {
+    CLzmaEncProps props;
+    LzmaEncProps_Init(&props);
+    LzmaEnc_SetProps(p, &props);
+  }
+
+  #ifndef LZMA_LOG_BSR
+  LzmaEnc_FastPosInit(p->g_FastPos);
+  #endif
+
+  LzmaEnc_InitPriceTables(p->ProbPrices);
+  p->litProbs = 0;
+  p->saveState.litProbs = 0;
+}
+
+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
+{
+  void *p;
+  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
+  if (p != 0)
+    LzmaEnc_Construct((CLzmaEnc *)p);
+  return p;
+}
+
+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+{
+  alloc->Free(alloc, p->litProbs);
+  alloc->Free(alloc, p->saveState.litProbs);
+  p->litProbs = 0;
+  p->saveState.litProbs = 0;
+}
+
+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  #ifdef COMPRESS_MF_MT
+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+  #endif
+  MatchFinder_Free(&p->matchFinderBase, allocBig);
+  LzmaEnc_FreeLits(p, alloc);
+  RangeEnc_Free(&p->rc, alloc);
+}
+
+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
+  alloc->Free(alloc, p);
+}
+
+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
+{
+  UInt32 nowPos32, startPos32;
+  if (p->inStream != 0)
+  {
+    p->matchFinderBase.stream = p->inStream;
+    p->matchFinder.Init(p->matchFinderObj);
+    p->inStream = 0;
+  }
+
+  if (p->finished)
+    return p->result;
+  RINOK(CheckErrors(p));
+
+  nowPos32 = (UInt32)p->nowPos64;
+  startPos32 = nowPos32;
+
+  if (p->nowPos64 == 0)
+  {
+    UInt32 numPairs;
+    Byte curByte;
+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
+      return Flush(p, nowPos32);
+    ReadMatchDistances(p, &numPairs);
+    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
+    p->state = kLiteralNextStates[p->state];
+    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
+    p->additionalOffset--;
+    nowPos32++;
+  }
+
+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
+  for (;;)
+  {
+    UInt32 pos, len, posState;
+
+    if (p->fastMode)
+      len = GetOptimumFast(p, &pos);
+    else
+      len = GetOptimum(p, nowPos32, &pos);
+
+    #ifdef SHOW_STAT2
+    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
+    #endif
+
+    posState = nowPos32 & p->pbMask;
+    if (len == 1 && pos == (UInt32)-1)
+    {
+      Byte curByte;
+      CLzmaProb *probs;
+      const Byte *data;
+
+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+      curByte = *data;
+      probs = LIT_PROBS(nowPos32, *(data - 1));
+      if (IsCharState(p->state))
+        LitEnc_Encode(&p->rc, probs, curByte);
+      else
+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
+      p->state = kLiteralNextStates[p->state];
+    }
+    else
+    {
+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
+      if (pos < LZMA_NUM_REPS)
+      {
+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
+        if (pos == 0)
+        {
+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
+          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
+        }
+        else
+        {
+          UInt32 distance = p->reps[pos];
+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
+          if (pos == 1)
+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
+          else
+          {
+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
+            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
+            if (pos == 3)
+              p->reps[3] = p->reps[2];
+            p->reps[2] = p->reps[1];
+          }
+          p->reps[1] = p->reps[0];
+          p->reps[0] = distance;
+        }
+        if (len == 1)
+          p->state = kShortRepNextStates[p->state];
+        else
+        {
+          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
+          p->state = kRepNextStates[p->state];
+        }
+      }
+      else
+      {
+        UInt32 posSlot;
+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
+        p->state = kMatchNextStates[p->state];
+        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
+        pos -= LZMA_NUM_REPS;
+        GetPosSlot(pos, posSlot);
+        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
+        
+        if (posSlot >= kStartPosModelIndex)
+        {
+          UInt32 footerBits = ((posSlot >> 1) - 1);
+          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
+          UInt32 posReduced = pos - base;
+
+          if (posSlot < kEndPosModelIndex)
+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
+          else
+          {
+            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
+            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
+            p->alignPriceCount++;
+          }
+        }
+        p->reps[3] = p->reps[2];
+        p->reps[2] = p->reps[1];
+        p->reps[1] = p->reps[0];
+        p->reps[0] = pos;
+        p->matchPriceCount++;
+      }
+    }
+    p->additionalOffset -= len;
+    nowPos32 += len;
+    if (p->additionalOffset == 0)
+    {
+      UInt32 processed;
+      if (!p->fastMode)
+      {
+        if (p->matchPriceCount >= (1 << 7))
+          FillDistancesPrices(p);
+        if (p->alignPriceCount >= kAlignTableSize)
+          FillAlignPrices(p);
+      }
+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
+        break;
+      processed = nowPos32 - startPos32;
+      if (useLimits)
+      {
+        if (processed + kNumOpts + 300 >= maxUnpackSize ||
+            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
+          break;
+      }
+      else if (processed >= (1 << 15))
+      {
+        p->nowPos64 += nowPos32 - startPos32;
+        return CheckErrors(p);
+      }
+    }
+  }
+  p->nowPos64 += nowPos32 - startPos32;
+  return Flush(p, nowPos32);
+}
+
+#define kBigHashDicLimit ((UInt32)1 << 24)
+
+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  UInt32 beforeSize = kNumOpts;
+  Bool btMode;
+  if (!RangeEnc_Alloc(&p->rc, alloc))
+    return SZ_ERROR_MEM;
+  btMode = (p->matchFinderBase.btMode != 0);
+  #ifdef COMPRESS_MF_MT
+  p->mtMode = (p->multiThread && !p->fastMode && btMode);
+  #endif
+
+  {
+    unsigned lclp = p->lc + p->lp;
+    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
+    {
+      LzmaEnc_FreeLits(p, alloc);
+      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
+      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
+      if (p->litProbs == 0 || p->saveState.litProbs == 0)
+      {
+        LzmaEnc_FreeLits(p, alloc);
+        return SZ_ERROR_MEM;
+      }
+      p->lclp = lclp;
+    }
+  }
+
+  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
+
+  if (beforeSize + p->dictSize < keepWindowSize)
+    beforeSize = keepWindowSize - p->dictSize;
+
+  #ifdef COMPRESS_MF_MT
+  if (p->mtMode)
+  {
+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
+    p->matchFinderObj = &p->matchFinderMt;
+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
+  }
+  else
+  #endif
+  {
+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
+      return SZ_ERROR_MEM;
+    p->matchFinderObj = &p->matchFinderBase;
+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
+  }
+  return SZ_OK;
+}
+
+void LzmaEnc_Init(CLzmaEnc *p)
+{
+  UInt32 i;
+  p->state = 0;
+  for (i = 0 ; i < LZMA_NUM_REPS; i++)
+    p->reps[i] = 0;
+
+  RangeEnc_Init(&p->rc);
+
+
+  for (i = 0; i < kNumStates; i++)
+  {
+    UInt32 j;
+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
+    {
+      p->isMatch[i][j] = kProbInitValue;
+      p->isRep0Long[i][j] = kProbInitValue;
+    }
+    p->isRep[i] = kProbInitValue;
+    p->isRepG0[i] = kProbInitValue;
+    p->isRepG1[i] = kProbInitValue;
+    p->isRepG2[i] = kProbInitValue;
+  }
+
+  {
+    UInt32 num = 0x300 << (p->lp + p->lc);
+    for (i = 0; i < num; i++)
+      p->litProbs[i] = kProbInitValue;
+  }
+
+  {
+    for (i = 0; i < kNumLenToPosStates; i++)
+    {
+      CLzmaProb *probs = p->posSlotEncoder[i];
+      UInt32 j;
+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
+        probs[j] = kProbInitValue;
+    }
+  }
+  {
+    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
+      p->posEncoders[i] = kProbInitValue;
+  }
+
+  LenEnc_Init(&p->lenEnc.p);
+  LenEnc_Init(&p->repLenEnc.p);
+
+  for (i = 0; i < (1 << kNumAlignBits); i++)
+    p->posAlignEncoder[i] = kProbInitValue;
+
+  p->optimumEndIndex = 0;
+  p->optimumCurrentIndex = 0;
+  p->additionalOffset = 0;
+
+  p->pbMask = (1 << p->pb) - 1;
+  p->lpMask = (1 << p->lp) - 1;
+}
+
+void LzmaEnc_InitPrices(CLzmaEnc *p)
+{
+  if (!p->fastMode)
+  {
+    FillDistancesPrices(p);
+    FillAlignPrices(p);
+  }
+
+  p->lenEnc.tableSize =
+  p->repLenEnc.tableSize =
+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
+}
+
+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  UInt32 i;
+  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
+    if (p->dictSize <= ((UInt32)1 << i))
+      break;
+  p->distTableSize = i * 2;
+
+  p->finished = False;
+  p->result = SZ_OK;
+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
+  LzmaEnc_Init(p);
+  LzmaEnc_InitPrices(p);
+  p->nowPos64 = 0;
+  return SZ_OK;
+}
+
+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqInStream *inStream, ISeqOutStream *outStream,
+    ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  p->inStream = inStream;
+  p->rc.outStream = outStream;
+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+}
+
+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+    ISeqInStream *inStream, UInt32 keepWindowSize,
+    ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  p->inStream = inStream;
+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+}
+
+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+{
+  p->seqBufInStream.funcTable.Read = MyRead;
+  p->seqBufInStream.data = src;
+  p->seqBufInStream.rem = srcLen;
+}
+
+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  LzmaEnc_SetInputBuf(p, src, srcLen);
+  p->inStream = &p->seqBufInStream.funcTable;
+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+}
+
+void LzmaEnc_Finish(CLzmaEncHandle pp)
+{
+  #ifdef COMPRESS_MF_MT
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  if (p->mtMode)
+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
+  #else
+  pp = pp;
+  #endif
+}
+
+typedef struct _CSeqOutStreamBuf
+{
+  ISeqOutStream funcTable;
+  Byte *data;
+  SizeT rem;
+  Bool overflow;
+} CSeqOutStreamBuf;
+
+static size_t MyWrite(void *pp, const void *data, size_t size)
+{
+  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
+  if (p->rem < size)
+  {
+    size = p->rem;
+    p->overflow = True;
+  }
+  memcpy(p->data, data, size);
+  p->rem -= size;
+  p->data += size;
+  return size;
+}
+
+
+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+{
+  const CLzmaEnc *p = (CLzmaEnc *)pp;
+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+}
+
+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+{
+  const CLzmaEnc *p = (CLzmaEnc *)pp;
+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+}
+
+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  UInt64 nowPos64;
+  SRes res;
+  CSeqOutStreamBuf outStream;
+
+  outStream.funcTable.Write = MyWrite;
+  outStream.data = dest;
+  outStream.rem = *destLen;
+  outStream.overflow = False;
+
+  p->writeEndMark = False;
+  p->finished = False;
+  p->result = SZ_OK;
+
+  if (reInit)
+    LzmaEnc_Init(p);
+  LzmaEnc_InitPrices(p);
+  nowPos64 = p->nowPos64;
+  RangeEnc_Init(&p->rc);
+  p->rc.outStream = &outStream.funcTable;
+
+  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
+  
+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+  *destLen -= outStream.rem;
+  if (outStream.overflow)
+    return SZ_ERROR_OUTPUT_EOF;
+
+  return res;
+}
+
+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+    ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  SRes res = SZ_OK;
+
+  #ifdef COMPRESS_MF_MT
+  Byte allocaDummy[0x300];
+  int i = 0;
+  for (i = 0; i < 16; i++)
+    allocaDummy[i] = (Byte)i;
+  #endif
+
+  RINOK(LzmaEnc_Prepare(pp, inStream, outStream, alloc, allocBig));
+
+  for (;;)
+  {
+    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
+    if (res != SZ_OK || p->finished != 0)
+      break;
+    if (progress != 0)
+    {
+      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
+      if (res != SZ_OK)
+      {
+        res = SZ_ERROR_PROGRESS;
+        break;
+      }
+    }
+  }
+  LzmaEnc_Finish(pp);
+  return res;
+}
+
+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  int i;
+  UInt32 dictSize = p->dictSize;
+  if (*size < LZMA_PROPS_SIZE)
+    return SZ_ERROR_PARAM;
+  *size = LZMA_PROPS_SIZE;
+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
+
+  for (i = 11; i <= 30; i++)
+  {
+    if (dictSize <= ((UInt32)2 << i))
+    {
+      dictSize = (2 << i);
+      break;
+    }
+    if (dictSize <= ((UInt32)3 << i))
+    {
+      dictSize = (3 << i);
+      break;
+    }
+  }
+
+  for (i = 0; i < 4; i++)
+    props[1 + i] = (Byte)(dictSize >> (8 * i));
+  return SZ_OK;
+}
+
+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  SRes res;
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+
+  CSeqOutStreamBuf outStream;
+
+  LzmaEnc_SetInputBuf(p, src, srcLen);
+
+  outStream.funcTable.Write = MyWrite;
+  outStream.data = dest;
+  outStream.rem = *destLen;
+  outStream.overflow = False;
+
+  p->writeEndMark = writeEndMark;
+  res = LzmaEnc_Encode(pp, &outStream.funcTable, &p->seqBufInStream.funcTable,
+      progress, alloc, allocBig);
+
+  *destLen -= outStream.rem;
+  if (outStream.overflow)
+    return SZ_ERROR_OUTPUT_EOF;
+  return res;
+}
+
+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+  SRes res;
+  if (p == 0)
+    return SZ_ERROR_MEM;
+
+  res = LzmaEnc_SetProps(p, props);
+  if (res == SZ_OK)
+  {
+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+    if (res == SZ_OK)
+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+          writeEndMark, progress, alloc, allocBig);
+  }
+
+  LzmaEnc_Destroy(p, alloc, allocBig);
+  return res;
+}
diff --git a/extern/lzma/LzmaEnc.h b/extern/lzma/LzmaEnc.h
new file mode 100644
index 00000000000..bfbc7d2b9c3
--- /dev/null
+++ b/extern/lzma/LzmaEnc.h
@@ -0,0 +1,72 @@
+/*  LzmaEnc.h -- LZMA Encoder
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __LZMAENC_H
+#define __LZMAENC_H
+
+#include "Types.h"
+
+#define LZMA_PROPS_SIZE 5
+
+typedef struct _CLzmaEncProps
+{
+  int level;       /*  0 <= level <= 9 */
+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
+                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
+                       default = (1 << 24) */
+  int lc;          /* 0 <= lc <= 8, default = 3 */
+  int lp;          /* 0 <= lp <= 4, default = 0 */
+  int pb;          /* 0 <= pb <= 4, default = 2 */
+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
+  int fb;          /* 5 <= fb <= 273, default = 32 */
+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
+  int numHashBytes; /* 2, 3 or 4, default = 4 */
+  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
+  int numThreads;  /* 1 or 2, default = 2 */
+} CLzmaEncProps;
+
+void LzmaEncProps_Init(CLzmaEncProps *p);
+void LzmaEncProps_Normalize(CLzmaEncProps *p);
+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+
+
+/* ---------- CLzmaEncHandle Interface ---------- */
+
+/* LzmaEnc_* functions can return the following exit codes:
+Returns:
+  SZ_OK           - OK
+  SZ_ERROR_MEM    - Memory allocation error
+  SZ_ERROR_PARAM  - Incorrect paramater in props
+  SZ_ERROR_WRITE  - Write callback error.
+  SZ_ERROR_PROGRESS - some break from progress callback
+  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
+*/
+
+typedef void * CLzmaEncHandle;
+
+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+
+/* ---------- One Call Interface ---------- */
+
+/* LzmaEncode
+Return code:
+  SZ_OK               - OK
+  SZ_ERROR_MEM        - Memory allocation error
+  SZ_ERROR_PARAM      - Incorrect paramater
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+*/
+
+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+
+#endif
diff --git a/extern/lzma/LzmaLib.c b/extern/lzma/LzmaLib.c
new file mode 100644
index 00000000000..02a511857c9
--- /dev/null
+++ b/extern/lzma/LzmaLib.c
@@ -0,0 +1,46 @@
+/* LzmaLib.c -- LZMA library wrapper
+2008-08-05
+Igor Pavlov
+Public domain */
+
+#include "LzmaEnc.h"
+#include "LzmaDec.h"
+#include "Alloc.h"
+#include "LzmaLib.h"
+
+static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
+static void SzFree(void *p, void *address) { p = p; MyFree(address); }
+static ISzAlloc g_Alloc = { SzAlloc, SzFree };
+
+MY_STDAPI LzmaCompress(unsigned char *dest, size_t  *destLen, const unsigned char *src, size_t  srcLen,
+  unsigned char *outProps, size_t *outPropsSize,
+  int level, /* 0 <= level <= 9, default = 5 */
+  unsigned dictSize, /* use (1 << N) or (3 << N). 4 KB < dictSize <= 128 MB */
+  int lc, /* 0 <= lc <= 8, default = 3  */
+  int lp, /* 0 <= lp <= 4, default = 0  */
+  int pb, /* 0 <= pb <= 4, default = 2  */
+  int fb,  /* 5 <= fb <= 273, default = 32 */
+  int numThreads /* 1 or 2, default = 2 */
+)
+{
+  CLzmaEncProps props;
+  LzmaEncProps_Init(&props);
+  props.level = level;
+  props.dictSize = dictSize;
+  props.lc = lc;
+  props.lp = lp;
+  props.pb = pb;
+  props.fb = fb;
+  props.numThreads = numThreads;
+
+  return LzmaEncode(dest, destLen, src, srcLen, &props, outProps, outPropsSize, 0,
+      NULL, &g_Alloc, &g_Alloc);
+}
+
+
+MY_STDAPI LzmaUncompress(unsigned char *dest, size_t  *destLen, const unsigned char *src, size_t  *srcLen,
+  const unsigned char *props, size_t propsSize)
+{
+  ELzmaStatus status;
+  return LzmaDecode(dest, destLen, src, srcLen, props, (unsigned)propsSize, LZMA_FINISH_ANY, &status, &g_Alloc);
+}
diff --git a/extern/lzma/LzmaLib.h b/extern/lzma/LzmaLib.h
new file mode 100644
index 00000000000..5c9eeec73ca
--- /dev/null
+++ b/extern/lzma/LzmaLib.h
@@ -0,0 +1,135 @@
+/* LzmaLib.h -- LZMA library interface
+2008-08-05
+Igor Pavlov
+Public domain */
+
+#ifndef __LZMALIB_H
+#define __LZMALIB_H
+
+#include "Types.h"
+
+#ifdef __cplusplus
+  #define MY_EXTERN_C extern "C"
+#else
+  #define MY_EXTERN_C extern
+#endif
+
+#define MY_STDAPI MY_EXTERN_C int MY_STD_CALL
+
+#define LZMA_PROPS_SIZE 5
+
+/*
+RAM requirements for LZMA:
+  for compression:   (dictSize * 11.5 + 6 MB) + state_size
+  for decompression: dictSize + state_size
+    state_size = (4 + (1.5 << (lc + lp))) KB
+    by default (lc=3, lp=0), state_size = 16 KB.
+
+LZMA properties (5 bytes) format
+    Offset Size  Description
+      0     1    lc, lp and pb in encoded form.
+      1     4    dictSize (little endian).
+*/
+
+/*
+LzmaCompress
+------------
+
+outPropsSize -
+     In:  the pointer to the size of outProps buffer; *outPropsSize = LZMA_PROPS_SIZE = 5.
+     Out: the pointer to the size of written properties in outProps buffer; *outPropsSize = LZMA_PROPS_SIZE = 5.
+
+  LZMA Encoder will use defult values for any parameter, if it is
+  -1  for any from: level, loc, lp, pb, fb, numThreads
+   0  for dictSize
+  
+level - compression level: 0 <= level <= 9;
+
+  level dictSize algo  fb
+    0:    16 KB   0    32
+    1:    64 KB   0    32
+    2:   256 KB   0    32
+    3:     1 MB   0    32
+    4:     4 MB   0    32
+    5:    16 MB   1    32
+    6:    32 MB   1    32
+    7+:   64 MB   1    64
+ 
+  The default value for "level" is 5.
+
+  algo = 0 means fast method
+  algo = 1 means normal method
+
+dictSize - The dictionary size in bytes. The maximum value is
+        128 MB = (1 << 27) bytes for 32-bit version
+          1 GB = (1 << 30) bytes for 64-bit version
+     The default value is 16 MB = (1 << 24) bytes.
+     It's recommended to use the dictionary that is larger than 4 KB and
+     that can be calculated as (1 << N) or (3 << N) sizes.
+
+lc - The number of literal context bits (high bits of previous literal).
+     It can be in the range from 0 to 8. The default value is 3.
+     Sometimes lc=4 gives the gain for big files.
+
+lp - The number of literal pos bits (low bits of current position for literals).
+     It can be in the range from 0 to 4. The default value is 0.
+     The lp switch is intended for periodical data when the period is equal to 2^lp.
+     For example, for 32-bit (4 bytes) periodical data you can use lp=2. Often it's
+     better to set lc=0, if you change lp switch.
+
+pb - The number of pos bits (low bits of current position).
+     It can be in the range from 0 to 4. The default value is 2.
+     The pb switch is intended for periodical data when the period is equal 2^pb.
+
+fb - Word size (the number of fast bytes).
+     It can be in the range from 5 to 273. The default value is 32.
+     Usually, a big number gives a little bit better compression ratio and
+     slower compression process.
+
+numThreads - The number of thereads. 1 or 2. The default value is 2.
+     Fast mode (algo = 0) can use only 1 thread.
+
+Out:
+  destLen  - processed output size
+Returns:
+  SZ_OK               - OK
+  SZ_ERROR_MEM        - Memory allocation error
+  SZ_ERROR_PARAM      - Incorrect paramater
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+*/
+
+MY_STDAPI LzmaCompress(unsigned char *dest, size_t *destLen, const unsigned char *src, size_t srcLen,
+  unsigned char *outProps, size_t *outPropsSize, /* *outPropsSize must be = 5 */
+  int level,      /* 0 <= level <= 9, default = 5 */
+  unsigned dictSize,  /* default = (1 << 24) */
+  int lc,        /* 0 <= lc <= 8, default = 3  */
+  int lp,        /* 0 <= lp <= 4, default = 0  */
+  int pb,        /* 0 <= pb <= 4, default = 2  */
+  int fb,        /* 5 <= fb <= 273, default = 32 */
+  int numThreads /* 1 or 2, default = 2 */
+  );
+
+/*
+LzmaUncompress
+--------------
+In:
+  dest     - output data
+  destLen  - output data size
+  src      - input data
+  srcLen   - input data size
+Out:
+  destLen  - processed output size
+  srcLen   - processed input size
+Returns:
+  SZ_OK                - OK
+  SZ_ERROR_DATA        - Data error
+  SZ_ERROR_MEM         - Memory allocation arror
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+  SZ_ERROR_INPUT_EOF   - it needs more bytes in input buffer (src)
+*/
+
+MY_STDAPI LzmaUncompress(unsigned char *dest, size_t *destLen, const unsigned char *src, SizeT *srcLen,
+  const unsigned char *props, size_t propsSize);
+
+#endif
diff --git a/extern/lzma/Threads.c b/extern/lzma/Threads.c
new file mode 100644
index 00000000000..4fdd69b0d5c
--- /dev/null
+++ b/extern/lzma/Threads.c
@@ -0,0 +1,109 @@
+/* Threads.c -- multithreading library
+2008-08-05
+Igor Pavlov
+Public domain */
+
+#include "Threads.h"
+#include <process.h>
+
+static WRes GetError()
+{
+  DWORD res = GetLastError();
+  return (res) ? (WRes)(res) : 1;
+}
+
+WRes HandleToWRes(HANDLE h) { return (h != 0) ? 0 : GetError(); }
+WRes BOOLToWRes(BOOL v) { return v ? 0 : GetError(); }
+
+static WRes MyCloseHandle(HANDLE *h)
+{
+  if (*h != NULL)
+    if (!CloseHandle(*h))
+      return GetError();
+  *h = NULL;
+  return 0;
+}
+
+WRes Thread_Create(CThread *thread, THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE *startAddress)(void *), LPVOID parameter)
+{
+  unsigned threadId; /* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
+  thread->handle =
+    /* CreateThread(0, 0, startAddress, parameter, 0, &threadId); */
+    (HANDLE)_beginthreadex(NULL, 0, startAddress, parameter, 0, &threadId);
+    /* maybe we must use errno here, but probably GetLastError() is also OK. */
+  return HandleToWRes(thread->handle);
+}
+
+WRes WaitObject(HANDLE h)
+{
+  return (WRes)WaitForSingleObject(h, INFINITE);
+}
+
+WRes Thread_Wait(CThread *thread)
+{
+  if (thread->handle == NULL)
+    return 1;
+  return WaitObject(thread->handle);
+}
+
+WRes Thread_Close(CThread *thread)
+{
+  return MyCloseHandle(&thread->handle);
+}
+
+WRes Event_Create(CEvent *p, BOOL manualReset, int initialSignaled)
+{
+  p->handle = CreateEvent(NULL, manualReset, (initialSignaled ? TRUE : FALSE), NULL);
+  return HandleToWRes(p->handle);
+}
+
+WRes ManualResetEvent_Create(CManualResetEvent *p, int initialSignaled)
+  { return Event_Create(p, TRUE, initialSignaled); }
+WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p)
+  { return ManualResetEvent_Create(p, 0); }
+
+WRes AutoResetEvent_Create(CAutoResetEvent *p, int initialSignaled)
+  { return Event_Create(p, FALSE, initialSignaled); }
+WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p)
+  { return AutoResetEvent_Create(p, 0); }
+
+WRes Event_Set(CEvent *p) { return BOOLToWRes(SetEvent(p->handle)); }
+WRes Event_Reset(CEvent *p) { return BOOLToWRes(ResetEvent(p->handle)); }
+WRes Event_Wait(CEvent *p) { return WaitObject(p->handle); }
+WRes Event_Close(CEvent *p) { return MyCloseHandle(&p->handle); }
+
+
+WRes Semaphore_Create(CSemaphore *p, UInt32 initiallyCount, UInt32 maxCount)
+{
+  p->handle = CreateSemaphore(NULL, (LONG)initiallyCount, (LONG)maxCount, NULL);
+  return HandleToWRes(p->handle);
+}
+
+WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount)
+{
+  return BOOLToWRes(ReleaseSemaphore(p->handle, releaseCount, previousCount));
+}
+WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 releaseCount)
+{
+  return Semaphore_Release(p, (LONG)releaseCount, NULL);
+}
+WRes Semaphore_Release1(CSemaphore *p)
+{
+  return Semaphore_ReleaseN(p, 1);
+}
+
+WRes Semaphore_Wait(CSemaphore *p) { return WaitObject(p->handle); }
+WRes Semaphore_Close(CSemaphore *p) { return MyCloseHandle(&p->handle); }
+
+WRes CriticalSection_Init(CCriticalSection *p)
+{
+  /* InitializeCriticalSection can raise only STATUS_NO_MEMORY exception */
+  __try
+  {
+    InitializeCriticalSection(p);
+    /* InitializeCriticalSectionAndSpinCount(p, 0); */
+  }
+  __except (EXCEPTION_EXECUTE_HANDLER) { return 1; }
+  return 0;
+}
+
diff --git a/extern/lzma/Threads.h b/extern/lzma/Threads.h
new file mode 100644
index 00000000000..a823e57858a
--- /dev/null
+++ b/extern/lzma/Threads.h
@@ -0,0 +1,68 @@
+/* Threads.h -- multithreading library
+2008-11-22 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_THRESDS_H
+#define __7Z_THRESDS_H
+
+#include "Types.h"
+
+typedef struct _CThread
+{
+  HANDLE handle;
+} CThread;
+
+#define Thread_Construct(thread) (thread)->handle = NULL
+#define Thread_WasCreated(thread) ((thread)->handle != NULL)
+ 
+typedef unsigned THREAD_FUNC_RET_TYPE;
+#define THREAD_FUNC_CALL_TYPE MY_STD_CALL
+#define THREAD_FUNC_DECL THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE
+
+WRes Thread_Create(CThread *thread, THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE *startAddress)(void *), LPVOID parameter);
+WRes Thread_Wait(CThread *thread);
+WRes Thread_Close(CThread *thread);
+
+typedef struct _CEvent
+{
+  HANDLE handle;
+} CEvent;
+
+typedef CEvent CAutoResetEvent;
+typedef CEvent CManualResetEvent;
+
+#define Event_Construct(event) (event)->handle = NULL
+#define Event_IsCreated(event) ((event)->handle != NULL)
+
+WRes ManualResetEvent_Create(CManualResetEvent *event, int initialSignaled);
+WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *event);
+WRes AutoResetEvent_Create(CAutoResetEvent *event, int initialSignaled);
+WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *event);
+WRes Event_Set(CEvent *event);
+WRes Event_Reset(CEvent *event);
+WRes Event_Wait(CEvent *event);
+WRes Event_Close(CEvent *event);
+
+
+typedef struct _CSemaphore
+{
+  HANDLE handle;
+} CSemaphore;
+
+#define Semaphore_Construct(p) (p)->handle = NULL
+
+WRes Semaphore_Create(CSemaphore *p, UInt32 initiallyCount, UInt32 maxCount);
+WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num);
+WRes Semaphore_Release1(CSemaphore *p);
+WRes Semaphore_Wait(CSemaphore *p);
+WRes Semaphore_Close(CSemaphore *p);
+
+
+typedef CRITICAL_SECTION CCriticalSection;
+
+WRes CriticalSection_Init(CCriticalSection *p);
+#define CriticalSection_Delete(p) DeleteCriticalSection(p)
+#define CriticalSection_Enter(p) EnterCriticalSection(p)
+#define CriticalSection_Leave(p) LeaveCriticalSection(p)
+
+#endif
+
diff --git a/extern/lzma/Types.h b/extern/lzma/Types.h
new file mode 100644
index 00000000000..1af5cfc4d86
--- /dev/null
+++ b/extern/lzma/Types.h
@@ -0,0 +1,208 @@
+/* Types.h -- Basic types
+2008-11-23 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_TYPES_H
+#define __7Z_TYPES_H
+
+#include <stddef.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#define SZ_OK 0
+
+#define SZ_ERROR_DATA 1
+#define SZ_ERROR_MEM 2
+#define SZ_ERROR_CRC 3
+#define SZ_ERROR_UNSUPPORTED 4
+#define SZ_ERROR_PARAM 5
+#define SZ_ERROR_INPUT_EOF 6
+#define SZ_ERROR_OUTPUT_EOF 7
+#define SZ_ERROR_READ 8
+#define SZ_ERROR_WRITE 9
+#define SZ_ERROR_PROGRESS 10
+#define SZ_ERROR_FAIL 11
+#define SZ_ERROR_THREAD 12
+
+#define SZ_ERROR_ARCHIVE 16
+#define SZ_ERROR_NO_ARCHIVE 17
+
+typedef int SRes;
+
+#ifdef _WIN32
+typedef DWORD WRes;
+#else
+typedef int WRes;
+#endif
+
+#ifndef RINOK
+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
+#endif
+
+typedef unsigned char Byte;
+typedef short Int16;
+typedef unsigned short UInt16;
+
+#ifdef _LZMA_UINT32_IS_ULONG
+typedef long Int32;
+typedef unsigned long UInt32;
+#else
+typedef int Int32;
+typedef unsigned int UInt32;
+#endif
+
+#ifdef _SZ_NO_INT_64
+
+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
+   NOTES: Some code will work incorrectly in that case! */
+
+typedef long Int64;
+typedef unsigned long UInt64;
+
+#else
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef __int64 Int64;
+typedef unsigned __int64 UInt64;
+#else
+typedef long long int Int64;
+typedef unsigned long long int UInt64;
+#endif
+
+#endif
+
+#ifdef _LZMA_NO_SYSTEM_SIZE_T
+typedef UInt32 SizeT;
+#else
+typedef size_t SizeT;
+#endif
+
+typedef int Bool;
+#define True 1
+#define False 0
+
+
+#ifdef _MSC_VER
+
+#if _MSC_VER >= 1300
+#define MY_NO_INLINE __declspec(noinline)
+#else
+#define MY_NO_INLINE
+#endif
+
+#define MY_CDECL __cdecl
+#define MY_STD_CALL __stdcall
+#define MY_FAST_CALL MY_NO_INLINE __fastcall
+
+#else
+
+#define MY_CDECL
+#define MY_STD_CALL
+#define MY_FAST_CALL
+
+#endif
+
+
+/* The following interfaces use first parameter as pointer to structure */
+
+typedef struct
+{
+  SRes (*Read)(void *p, void *buf, size_t *size);
+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
+       (output(*size) < input(*size)) is allowed */
+} ISeqInStream;
+
+/* it can return SZ_ERROR_INPUT_EOF */
+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
+
+typedef struct
+{
+  size_t (*Write)(void *p, const void *buf, size_t size);
+    /* Returns: result - the number of actually written bytes.
+       (result < size) means error */
+} ISeqOutStream;
+
+typedef enum
+{
+  SZ_SEEK_SET = 0,
+  SZ_SEEK_CUR = 1,
+  SZ_SEEK_END = 2
+} ESzSeek;
+
+typedef struct
+{
+  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
+} ISeekInStream;
+
+typedef struct
+{
+  SRes (*Look)(void *p, void **buf, size_t *size);
+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
+       (output(*size) > input(*size)) is not allowed
+       (output(*size) < input(*size)) is allowed */
+  SRes (*Skip)(void *p, size_t offset);
+    /* offset must be <= output(*size) of Look */
+
+  SRes (*Read)(void *p, void *buf, size_t *size);
+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
+} ILookInStream;
+
+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
+
+/* reads via ILookInStream::Read */
+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
+
+#define LookToRead_BUF_SIZE (1 << 14)
+
+typedef struct
+{
+  ILookInStream s;
+  ISeekInStream *realStream;
+  size_t pos;
+  size_t size;
+  Byte buf[LookToRead_BUF_SIZE];
+} CLookToRead;
+
+void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
+void LookToRead_Init(CLookToRead *p);
+
+typedef struct
+{
+  ISeqInStream s;
+  ILookInStream *realStream;
+} CSecToLook;
+
+void SecToLook_CreateVTable(CSecToLook *p);
+
+typedef struct
+{
+  ISeqInStream s;
+  ILookInStream *realStream;
+} CSecToRead;
+
+void SecToRead_CreateVTable(CSecToRead *p);
+
+typedef struct
+{
+  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
+    /* Returns: result. (result != SZ_OK) means break.
+       Value (UInt64)(Int64)-1 for size means unknown value. */
+} ICompressProgress;
+
+typedef struct
+{
+  void *(*Alloc)(void *p, size_t size);
+  void (*Free)(void *p, void *address); /* address can be 0 */
+} ISzAlloc;
+
+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
+#define IAlloc_Free(p, a) (p)->Free((p), a)
+
+#endif
diff --git a/extern/lzma/history.txt b/extern/lzma/history.txt
new file mode 100644
index 00000000000..014186717da
--- /dev/null
+++ b/extern/lzma/history.txt
@@ -0,0 +1,236 @@
+HISTORY of the LZMA SDK
+-----------------------
+
+4.65           2009-02-03
+-------------------------
+- Some minor fixes
+
+
+4.63           2008-12-31
+-------------------------
+- Some minor fixes
+
+
+4.61 beta      2008-11-23
+-------------------------
+- The bug in ANSI-C LZMA Decoder was fixed:
+    If encoded stream was corrupted, decoder could access memory 
+    outside of allocated range.
+- Some changes in ANSI-C 7z Decoder interfaces.
+- LZMA SDK is placed in the public domain.
+
+
+4.60 beta      2008-08-19
+-------------------------
+- Some minor fixes.
+
+
+4.59 beta      2008-08-13
+-------------------------
+- The bug was fixed:
+    LZMA Encoder in fast compression mode could access memory outside of 
+    allocated range in some rare cases.
+
+
+4.58 beta      2008-05-05
+-------------------------
+- ANSI-C LZMA Decoder was rewritten for speed optimizations.
+- ANSI-C LZMA Encoder was included to LZMA SDK.
+- C++ LZMA code now is just wrapper over ANSI-C code.
+
+
+4.57           2007-12-12
+-------------------------
+- Speed optimizations in Ñ++ LZMA Decoder. 
+- Small changes for more compatibility with some C/C++ compilers.
+
+
+4.49 beta      2007-07-05
+-------------------------
+- .7z ANSI-C Decoder:
+     - now it supports BCJ and BCJ2 filters
+     - now it supports files larger than 4 GB.
+     - now it supports "Last Write Time" field for files.
+- C++ code for .7z archives compressing/decompressing from 7-zip 
+  was included to LZMA SDK.
+  
+
+4.43           2006-06-04
+-------------------------
+- Small changes for more compatibility with some C/C++ compilers.
+  
+
+4.42           2006-05-15
+-------------------------
+- Small changes in .h files in ANSI-C version.
+  
+
+4.39 beta      2006-04-14
+-------------------------
+- The bug in versions 4.33b:4.38b was fixed:
+  C++ version of LZMA encoder could not correctly compress 
+  files larger than 2 GB with HC4 match finder (-mfhc4).
+  
+
+4.37 beta      2005-04-06
+-------------------------
+- Fixes in C++ code: code could no be compiled if _NO_EXCEPTIONS was defined. 
+
+
+4.35 beta      2005-03-02
+-------------------------
+- The bug was fixed in C++ version of LZMA Decoder:
+    If encoded stream was corrupted, decoder could access memory 
+    outside of allocated range.
+
+
+4.34 beta      2006-02-27
+-------------------------
+- Compressing speed and memory requirements for compressing were increased
+- LZMA now can use only these match finders: HC4, BT2, BT3, BT4
+
+
+4.32           2005-12-09
+-------------------------
+- Java version of LZMA SDK was included
+
+
+4.30           2005-11-20
+-------------------------
+- Compression ratio was improved in -a2 mode
+- Speed optimizations for compressing in -a2 mode
+- -fb switch now supports values up to 273
+- The bug in 7z_C (7zIn.c) was fixed:
+  It used Alloc/Free functions from different memory pools.
+  So if program used two memory pools, it worked incorrectly.
+- 7z_C: .7z format supporting was improved
+- LZMA# SDK (C#.NET version) was included
+
+
+4.27 (Updated) 2005-09-21
+-------------------------
+- Some GUIDs/interfaces in C++ were changed.
+ IStream.h:
+   ISequentialInStream::Read now works as old ReadPart
+   ISequentialOutStream::Write now works as old WritePart
+
+
+4.27           2005-08-07
+-------------------------
+- The bug in LzmaDecodeSize.c was fixed:
+   if _LZMA_IN_CB and _LZMA_OUT_READ were defined,
+   decompressing worked incorrectly.
+
+
+4.26           2005-08-05
+-------------------------
+- Fixes in 7z_C code and LzmaTest.c:
+  previous versions could work incorrectly,
+  if malloc(0) returns 0
+
+
+4.23           2005-06-29
+-------------------------
+- Small fixes in C++ code
+
+
+4.22           2005-06-10
+-------------------------
+- Small fixes
+
+
+4.21           2005-06-08
+-------------------------
+- Interfaces for ANSI-C LZMA Decoder (LzmaDecode.c) were changed
+- New additional version of ANSI-C LZMA Decoder with zlib-like interface:
+    - LzmaStateDecode.h
+    - LzmaStateDecode.c
+    - LzmaStateTest.c
+- ANSI-C LZMA Decoder now can decompress files larger than 4 GB
+
+
+4.17           2005-04-18
+-------------------------
+- New example for RAM->RAM compressing/decompressing: 
+  LZMA + BCJ (filter for x86 code):
+    - LzmaRam.h
+    - LzmaRam.cpp
+    - LzmaRamDecode.h
+    - LzmaRamDecode.c
+    - -f86 switch for lzma.exe
+
+
+4.16           2005-03-29
+-------------------------
+- The bug was fixed in LzmaDecode.c (ANSI-C LZMA Decoder): 
+   If _LZMA_OUT_READ was defined, and if encoded stream was corrupted,
+   decoder could access memory outside of allocated range.
+- Speed optimization of ANSI-C LZMA Decoder (now it's about 20% faster).
+  Old version of LZMA Decoder now is in file LzmaDecodeSize.c. 
+  LzmaDecodeSize.c can provide slightly smaller code than LzmaDecode.c
+- Small speed optimization in LZMA C++ code
+- filter for SPARC's code was added
+- Simplified version of .7z ANSI-C Decoder was included
+
+
+4.06           2004-09-05
+-------------------------
+- The bug in v4.05 was fixed:
+    LZMA-Encoder didn't release output stream in some cases.
+
+
+4.05           2004-08-25
+-------------------------
+- Source code of filters for x86, IA-64, ARM, ARM-Thumb 
+  and PowerPC code was included to SDK
+- Some internal minor changes
+
+
+4.04           2004-07-28
+-------------------------
+- More compatibility with some C++ compilers
+
+
+4.03           2004-06-18
+-------------------------
+- "Benchmark" command was added. It measures compressing 
+  and decompressing speed and shows rating values. 
+  Also it checks hardware errors.
+
+
+4.02           2004-06-10
+-------------------------
+- C++ LZMA Encoder/Decoder code now is more portable
+  and it can be compiled by GCC on Linux.
+
+
+4.01           2004-02-15
+-------------------------
+- Some detection of data corruption was enabled.
+    LzmaDecode.c / RangeDecoderReadByte
+    .....
+    {
+      rd->ExtraBytes = 1;
+      return 0xFF;
+    }
+
+
+4.00           2004-02-13
+-------------------------
+- Original version of LZMA SDK
+
+
+
+HISTORY of the LZMA
+-------------------
+  2001-2008:  Improvements to LZMA compressing/decompressing code, 
+              keeping compatibility with original LZMA format
+  1996-2001:  Development of LZMA compression format
+
+  Some milestones:
+
+  2001-08-30: LZMA compression was added to 7-Zip
+  1999-01-02: First version of 7-Zip was released
+  
+
+End of document
diff --git a/extern/lzma/lzma.txt b/extern/lzma/lzma.txt
new file mode 100644
index 00000000000..715792d6c17
--- /dev/null
+++ b/extern/lzma/lzma.txt
@@ -0,0 +1,594 @@
+LZMA SDK 4.65
+-------------
+
+LZMA SDK provides the documentation, samples, header files, libraries, 
+and tools you need to develop applications that use LZMA compression.
+
+LZMA is default and general compression method of 7z format
+in 7-Zip compression program (www.7-zip.org). LZMA provides high 
+compression ratio and very fast decompression.
+
+LZMA is an improved version of famous LZ77 compression algorithm. 
+It was improved in way of maximum increasing of compression ratio,
+keeping high decompression speed and low memory requirements for 
+decompressing.
+
+
+
+LICENSE
+-------
+
+LZMA SDK is written and placed in the public domain by Igor Pavlov.
+
+
+LZMA SDK Contents
+-----------------
+
+LZMA SDK includes:
+
+  - ANSI-C/C++/C#/Java source code for LZMA compressing and decompressing
+  - Compiled file->file LZMA compressing/decompressing program for Windows system
+
+
+UNIX/Linux version 
+------------------
+To compile C++ version of file->file LZMA encoding, go to directory
+C++/7zip/Compress/LZMA_Alone 
+and call make to recompile it:
+  make -f makefile.gcc clean all
+
+In some UNIX/Linux versions you must compile LZMA with static libraries.
+To compile with static libraries, you can use 
+LIB = -lm -static
+
+
+Files
+---------------------
+lzma.txt     - LZMA SDK description (this file)
+7zFormat.txt - 7z Format description
+7zC.txt      - 7z ANSI-C Decoder description
+methods.txt  - Compression method IDs for .7z
+lzma.exe     - Compiled file->file LZMA encoder/decoder for Windows
+history.txt  - history of the LZMA SDK
+
+
+Source code structure
+---------------------
+
+C/  - C files
+        7zCrc*.*   - CRC code
+        Alloc.*    - Memory allocation functions
+        Bra*.*     - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code
+        LzFind.*   - Match finder for LZ (LZMA) encoders 
+        LzFindMt.* - Match finder for LZ (LZMA) encoders for multithreading encoding
+        LzHash.h   - Additional file for LZ match finder
+        LzmaDec.*  - LZMA decoding
+        LzmaEnc.*  - LZMA encoding
+        LzmaLib.*  - LZMA Library for DLL calling
+        Types.h    - Basic types for another .c files
+	Threads.*  - The code for multithreading.
+
+    LzmaLib  - LZMA Library (.DLL for Windows)
+    
+    LzmaUtil - LZMA Utility (file->file LZMA encoder/decoder).
+
+    Archive - files related to archiving
+      7z     - 7z ANSI-C Decoder
+
+CPP/ -- CPP files
+
+  Common  - common files for C++ projects
+  Windows - common files for Windows related code
+
+  7zip    - files related to 7-Zip Project
+
+    Common   - common files for 7-Zip
+
+    Compress - files related to compression/decompression
+
+      Copy         - Copy coder
+      RangeCoder   - Range Coder (special code of compression/decompression)
+      LZMA         - LZMA compression/decompression on C++
+      LZMA_Alone   - file->file LZMA compression/decompression
+      Branch       - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code
+
+    Archive - files related to archiving
+
+      Common   - common files for archive handling
+      7z       - 7z C++ Encoder/Decoder
+
+    Bundles    - Modules that are bundles of other modules
+  
+      Alone7z           - 7zr.exe: Standalone version of 7z.exe that supports only 7z/LZMA/BCJ/BCJ2
+      Format7zR         - 7zr.dll: Reduced version of 7za.dll: extracting/compressing to 7z/LZMA/BCJ/BCJ2
+      Format7zExtractR  - 7zxr.dll: Reduced version of 7zxa.dll: extracting from 7z/LZMA/BCJ/BCJ2.
+
+    UI        - User Interface files
+         
+      Client7z - Test application for 7za.dll,  7zr.dll, 7zxr.dll
+      Common   - Common UI files
+      Console  - Code for console archiver
+
+
+
+CS/ - C# files
+  7zip
+    Common   - some common files for 7-Zip
+    Compress - files related to compression/decompression
+      LZ     - files related to LZ (Lempel-Ziv) compression algorithm
+      LZMA         - LZMA compression/decompression
+      LzmaAlone    - file->file LZMA compression/decompression
+      RangeCoder   - Range Coder (special code of compression/decompression)
+
+Java/  - Java files
+  SevenZip
+    Compression    - files related to compression/decompression
+      LZ           - files related to LZ (Lempel-Ziv) compression algorithm
+      LZMA         - LZMA compression/decompression
+      RangeCoder   - Range Coder (special code of compression/decompression)
+
+
+C/C++ source code of LZMA SDK is part of 7-Zip project.
+7-Zip source code can be downloaded from 7-Zip's SourceForge page:
+
+  http://sourceforge.net/projects/sevenzip/
+
+
+
+LZMA features
+-------------
+  - Variable dictionary size (up to 1 GB)
+  - Estimated compressing speed: about 2 MB/s on 2 GHz CPU
+  - Estimated decompressing speed: 
+      - 20-30 MB/s on 2 GHz Core 2 or AMD Athlon 64
+      - 1-2 MB/s on 200 MHz ARM, MIPS, PowerPC or other simple RISC
+  - Small memory requirements for decompressing (16 KB + DictionarySize)
+  - Small code size for decompressing: 5-8 KB
+
+LZMA decoder uses only integer operations and can be 
+implemented in any modern 32-bit CPU (or on 16-bit CPU with some conditions).
+
+Some critical operations that affect the speed of LZMA decompression:
+  1) 32*16 bit integer multiply
+  2) Misspredicted branches (penalty mostly depends from pipeline length)
+  3) 32-bit shift and arithmetic operations
+
+The speed of LZMA decompressing mostly depends from CPU speed.
+Memory speed has no big meaning. But if your CPU has small data cache, 
+overall weight of memory speed will slightly increase.
+
+
+How To Use
+----------
+
+Using LZMA encoder/decoder executable
+--------------------------------------
+
+Usage:  LZMA <e|d> inputFile outputFile [<switches>...]
+
+  e: encode file
+
+  d: decode file
+
+  b: Benchmark. There are two tests: compressing and decompressing 
+     with LZMA method. Benchmark shows rating in MIPS (million 
+     instructions per second). Rating value is calculated from 
+     measured speed and it is normalized with Intel's Core 2 results.
+     Also Benchmark checks possible hardware errors (RAM 
+     errors in most cases). Benchmark uses these settings:
+     (-a1, -d21, -fb32, -mfbt4). You can change only -d parameter. 
+     Also you can change the number of iterations. Example for 30 iterations:
+       LZMA b 30
+     Default number of iterations is 10.
+
+<Switches>
+  
+
+  -a{N}:  set compression mode 0 = fast, 1 = normal
+          default: 1 (normal)
+
+  d{N}:   Sets Dictionary size - [0, 30], default: 23 (8MB)
+          The maximum value for dictionary size is 1 GB = 2^30 bytes.
+          Dictionary size is calculated as DictionarySize = 2^N bytes. 
+          For decompressing file compressed by LZMA method with dictionary 
+          size D = 2^N you need about D bytes of memory (RAM).
+
+  -fb{N}: set number of fast bytes - [5, 273], default: 128
+          Usually big number gives a little bit better compression ratio 
+          and slower compression process.
+
+  -lc{N}: set number of literal context bits - [0, 8], default: 3
+          Sometimes lc=4 gives gain for big files.
+
+  -lp{N}: set number of literal pos bits - [0, 4], default: 0
+          lp switch is intended for periodical data when period is 
+          equal 2^N. For example, for 32-bit (4 bytes) 
+          periodical data you can use lp=2. Often it's better to set lc0, 
+          if you change lp switch.
+
+  -pb{N}: set number of pos bits - [0, 4], default: 2
+          pb switch is intended for periodical data 
+          when period is equal 2^N.
+
+  -mf{MF_ID}: set Match Finder. Default: bt4. 
+              Algorithms from hc* group doesn't provide good compression 
+              ratio, but they often works pretty fast in combination with 
+              fast mode (-a0).
+
+              Memory requirements depend from dictionary size 
+              (parameter "d" in table below). 
+
+               MF_ID     Memory                   Description
+
+                bt2    d *  9.5 + 4MB  Binary Tree with 2 bytes hashing.
+                bt3    d * 11.5 + 4MB  Binary Tree with 3 bytes hashing.
+                bt4    d * 11.5 + 4MB  Binary Tree with 4 bytes hashing.
+                hc4    d *  7.5 + 4MB  Hash Chain with 4 bytes hashing.
+
+  -eos:   write End Of Stream marker. By default LZMA doesn't write 
+          eos marker, since LZMA decoder knows uncompressed size 
+          stored in .lzma file header.
+
+  -si:    Read data from stdin (it will write End Of Stream marker).
+  -so:    Write data to stdout
+
+
+Examples:
+
+1) LZMA e file.bin file.lzma -d16 -lc0 
+
+compresses file.bin to file.lzma with 64 KB dictionary (2^16=64K)  
+and 0 literal context bits. -lc0 allows to reduce memory requirements 
+for decompression.
+
+
+2) LZMA e file.bin file.lzma -lc0 -lp2
+
+compresses file.bin to file.lzma with settings suitable 
+for 32-bit periodical data (for example, ARM or MIPS code).
+
+3) LZMA d file.lzma file.bin
+
+decompresses file.lzma to file.bin.
+
+
+Compression ratio hints
+-----------------------
+
+Recommendations
+---------------
+
+To increase the compression ratio for LZMA compressing it's desirable 
+to have aligned data (if it's possible) and also it's desirable to locate
+data in such order, where code is grouped in one place and data is 
+grouped in other place (it's better than such mixing: code, data, code,
+data, ...).
+
+
+Filters
+-------
+You can increase the compression ratio for some data types, using
+special filters before compressing. For example, it's possible to 
+increase the compression ratio on 5-10% for code for those CPU ISAs: 
+x86, IA-64, ARM, ARM-Thumb, PowerPC, SPARC.
+
+You can find C source code of such filters in C/Bra*.* files
+
+You can check the compression ratio gain of these filters with such 
+7-Zip commands (example for ARM code):
+No filter:
+  7z a a1.7z a.bin -m0=lzma
+
+With filter for little-endian ARM code:
+  7z a a2.7z a.bin -m0=arm -m1=lzma        
+
+It works in such manner:
+Compressing    = Filter_encoding + LZMA_encoding
+Decompressing  = LZMA_decoding + Filter_decoding
+
+Compressing and decompressing speed of such filters is very high,
+so it will not increase decompressing time too much.
+Moreover, it reduces decompression time for LZMA_decoding, 
+since compression ratio with filtering is higher.
+
+These filters convert CALL (calling procedure) instructions 
+from relative offsets to absolute addresses, so such data becomes more 
+compressible.
+
+For some ISAs (for example, for MIPS) it's impossible to get gain from such filter.
+
+
+LZMA compressed file format
+---------------------------
+Offset Size Description
+  0     1   Special LZMA properties (lc,lp, pb in encoded form)
+  1     4   Dictionary size (little endian)
+  5     8   Uncompressed size (little endian). -1 means unknown size
+ 13         Compressed data
+
+
+ANSI-C LZMA Decoder
+~~~~~~~~~~~~~~~~~~~
+
+Please note that interfaces for ANSI-C code were changed in LZMA SDK 4.58.
+If you want to use old interfaces you can download previous version of LZMA SDK
+from sourceforge.net site.
+
+To use ANSI-C LZMA Decoder you need the following files:
+1) LzmaDec.h + LzmaDec.c + Types.h
+LzmaUtil/LzmaUtil.c is example application that uses these files.
+
+
+Memory requirements for LZMA decoding
+-------------------------------------
+
+Stack usage of LZMA decoding function for local variables is not 
+larger than 200-400 bytes.
+
+LZMA Decoder uses dictionary buffer and internal state structure.
+Internal state structure consumes
+  state_size = (4 + (1.5 << (lc + lp))) KB
+by default (lc=3, lp=0), state_size = 16 KB.
+
+
+How To decompress data
+----------------------
+
+LZMA Decoder (ANSI-C version) now supports 2 interfaces:
+1) Single-call Decompressing
+2) Multi-call State Decompressing (zlib-like interface)
+
+You must use external allocator:
+Example:
+void *SzAlloc(void *p, size_t size) { p = p; return malloc(size); }
+void SzFree(void *p, void *address) { p = p; free(address); }
+ISzAlloc alloc = { SzAlloc, SzFree };
+
+You can use p = p; operator to disable compiler warnings.
+
+
+Single-call Decompressing
+-------------------------
+When to use: RAM->RAM decompressing
+Compile files: LzmaDec.h + LzmaDec.c + Types.h
+Compile defines: no defines
+Memory Requirements:
+  - Input buffer: compressed size
+  - Output buffer: uncompressed size
+  - LZMA Internal Structures: state_size (16 KB for default settings) 
+
+Interface:
+  int LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+      const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, 
+      ELzmaStatus *status, ISzAlloc *alloc);
+  In: 
+    dest     - output data
+    destLen  - output data size
+    src      - input data
+    srcLen   - input data size
+    propData - LZMA properties  (5 bytes)
+    propSize - size of propData buffer (5 bytes)
+    finishMode - It has meaning only if the decoding reaches output limit (*destLen).
+	 LZMA_FINISH_ANY - Decode just destLen bytes.
+	 LZMA_FINISH_END - Stream must be finished after (*destLen).
+                           You can use LZMA_FINISH_END, when you know that 
+                           current output buffer covers last bytes of stream. 
+    alloc    - Memory allocator.
+
+  Out: 
+    destLen  - processed output size 
+    srcLen   - processed input size 
+
+  Output:
+    SZ_OK
+      status:
+        LZMA_STATUS_FINISHED_WITH_MARK
+        LZMA_STATUS_NOT_FINISHED 
+        LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+    SZ_ERROR_DATA - Data error
+    SZ_ERROR_MEM  - Memory allocation error
+    SZ_ERROR_UNSUPPORTED - Unsupported properties
+    SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
+
+  If LZMA decoder sees end_marker before reaching output limit, it returns OK result,
+  and output value of destLen will be less than output buffer size limit.
+
+  You can use multiple checks to test data integrity after full decompression:
+    1) Check Result and "status" variable.
+    2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
+    3) Check that output(srcLen) = compressedSize, if you know real compressedSize. 
+       You must use correct finish mode in that case. */ 
+
+
+Multi-call State Decompressing (zlib-like interface)
+----------------------------------------------------
+
+When to use: file->file decompressing 
+Compile files: LzmaDec.h + LzmaDec.c + Types.h
+
+Memory Requirements:
+ - Buffer for input stream: any size (for example, 16 KB)
+ - Buffer for output stream: any size (for example, 16 KB)
+ - LZMA Internal Structures: state_size (16 KB for default settings) 
+ - LZMA dictionary (dictionary size is encoded in LZMA properties header)
+
+1) read LZMA properties (5 bytes) and uncompressed size (8 bytes, little-endian) to header:
+   unsigned char header[LZMA_PROPS_SIZE + 8];
+   ReadFile(inFile, header, sizeof(header)
+
+2) Allocate CLzmaDec structures (state + dictionary) using LZMA properties
+
+  CLzmaDec state;
+  LzmaDec_Constr(&state);
+  res = LzmaDec_Allocate(&state, header, LZMA_PROPS_SIZE, &g_Alloc);
+  if (res != SZ_OK)
+    return res;
+
+3) Init LzmaDec structure before any new LZMA stream. And call LzmaDec_DecodeToBuf in loop
+
+  LzmaDec_Init(&state);
+  for (;;)
+  {
+    ... 
+    int res = LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, 
+    	const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode);
+    ...
+  }
+
+
+4) Free all allocated structures
+  LzmaDec_Free(&state, &g_Alloc);
+
+For full code example, look at C/LzmaUtil/LzmaUtil.c code.
+
+
+How To compress data
+--------------------
+
+Compile files: LzmaEnc.h + LzmaEnc.c + Types.h +
+LzFind.c + LzFind.h + LzFindMt.c + LzFindMt.h + LzHash.h
+
+Memory Requirements:
+  - (dictSize * 11.5 + 6 MB) + state_size
+
+Lzma Encoder can use two memory allocators:
+1) alloc - for small arrays.
+2) allocBig - for big arrays.
+
+For example, you can use Large RAM Pages (2 MB) in allocBig allocator for 
+better compression speed. Note that Windows has bad implementation for 
+Large RAM Pages. 
+It's OK to use same allocator for alloc and allocBig.
+
+
+Single-call Compression with callbacks
+--------------------------------------
+
+Check C/LzmaUtil/LzmaUtil.c as example, 
+
+When to use: file->file decompressing 
+
+1) you must implement callback structures for interfaces:
+ISeqInStream
+ISeqOutStream
+ICompressProgress
+ISzAlloc
+
+static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
+static void SzFree(void *p, void *address) {  p = p; MyFree(address); }
+static ISzAlloc g_Alloc = { SzAlloc, SzFree };
+
+  CFileSeqInStream inStream;
+  CFileSeqOutStream outStream;
+
+  inStream.funcTable.Read = MyRead;
+  inStream.file = inFile;
+  outStream.funcTable.Write = MyWrite;
+  outStream.file = outFile;
+
+
+2) Create CLzmaEncHandle object;
+
+  CLzmaEncHandle enc;
+
+  enc = LzmaEnc_Create(&g_Alloc);
+  if (enc == 0)
+    return SZ_ERROR_MEM;
+
+
+3) initialize CLzmaEncProps properties;
+
+  LzmaEncProps_Init(&props);
+
+  Then you can change some properties in that structure.
+
+4) Send LZMA properties to LZMA Encoder
+
+  res = LzmaEnc_SetProps(enc, &props);
+
+5) Write encoded properties to header
+
+    Byte header[LZMA_PROPS_SIZE + 8];
+    size_t headerSize = LZMA_PROPS_SIZE;
+    UInt64 fileSize;
+    int i;
+
+    res = LzmaEnc_WriteProperties(enc, header, &headerSize);
+    fileSize = MyGetFileLength(inFile);
+    for (i = 0; i < 8; i++)
+      header[headerSize++] = (Byte)(fileSize >> (8 * i));
+    MyWriteFileAndCheck(outFile, header, headerSize)
+
+6) Call encoding function:
+      res = LzmaEnc_Encode(enc, &outStream.funcTable, &inStream.funcTable, 
+        NULL, &g_Alloc, &g_Alloc);
+
+7) Destroy LZMA Encoder Object
+  LzmaEnc_Destroy(enc, &g_Alloc, &g_Alloc);
+
+
+If callback function return some error code, LzmaEnc_Encode also returns that code.
+
+
+Single-call RAM->RAM Compression
+--------------------------------
+
+Single-call RAM->RAM Compression is similar to Compression with callbacks,
+but you provide pointers to buffers instead of pointers to stream callbacks:
+
+HRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, 
+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+
+Return code:
+  SZ_OK               - OK
+  SZ_ERROR_MEM        - Memory allocation error 
+  SZ_ERROR_PARAM      - Incorrect paramater
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+
+
+
+LZMA Defines
+------------
+
+_LZMA_SIZE_OPT - Enable some optimizations in LZMA Decoder to get smaller executable code.
+
+_LZMA_PROB32   - It can increase the speed on some 32-bit CPUs, but memory usage for 
+                 some structures will be doubled in that case.
+
+_LZMA_UINT32_IS_ULONG  - Define it if int is 16-bit on your compiler and long is 32-bit.
+
+_LZMA_NO_SYSTEM_SIZE_T  - Define it if you don't want to use size_t type.
+
+
+C++ LZMA Encoder/Decoder 
+~~~~~~~~~~~~~~~~~~~~~~~~
+C++ LZMA code use COM-like interfaces. So if you want to use it, 
+you can study basics of COM/OLE.
+C++ LZMA code is just wrapper over ANSI-C code.
+
+
+C++ Notes
+~~~~~~~~~~~~~~~~~~~~~~~~
+If you use some C++ code folders in 7-Zip (for example, C++ code for .7z handling),
+you must check that you correctly work with "new" operator.
+7-Zip can be compiled with MSVC 6.0 that doesn't throw "exception" from "new" operator.
+So 7-Zip uses "CPP\Common\NewHandler.cpp" that redefines "new" operator:
+operator new(size_t size)
+{
+  void *p = ::malloc(size);
+  if (p == 0)
+    throw CNewException();
+  return p;
+}
+If you use MSCV that throws exception for "new" operator, you can compile without 
+"NewHandler.cpp". So standard exception will be used. Actually some code of 
+7-Zip catches any exception in internal code and converts it to HRESULT code.
+So you don't need to catch CNewException, if you call COM interfaces of 7-Zip.
+
+---
+
+http://www.7-zip.org
+http://www.7-zip.org/sdk.html
+http://www.7-zip.org/support.html
diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt
new file mode 100644
index 00000000000..b640cf658da
--- /dev/null
+++ b/extern/lzo/CMakeLists.txt
@@ -0,0 +1,34 @@
+# $Id$
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Daniel Genrich
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC include)
+
+FILE(GLOB SRC minilzo/*.c)
+
+
+
+BLENDERLIB(bf_minilzo "${SRC}" "${INC}")
+#, libtype='blender', priority = 0 )
diff --git a/extern/lzo/SConscript b/extern/lzo/SConscript
new file mode 100644
index 00000000000..81bedad25d8
--- /dev/null
+++ b/extern/lzo/SConscript
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('minilzo/*.c')
+
+defs = ''
+incs = ' include ' 
+
+env.BlenderLib ('bf_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
diff --git a/extern/lzo/minilzo/COPYING b/extern/lzo/minilzo/COPYING
new file mode 100644
index 00000000000..5ee49f42e91
--- /dev/null
+++ b/extern/lzo/minilzo/COPYING
@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/extern/lzo/minilzo/Makefile b/extern/lzo/minilzo/Makefile
new file mode 100644
index 00000000000..a6ee373e8bc
--- /dev/null
+++ b/extern/lzo/minilzo/Makefile
@@ -0,0 +1,113 @@
+#
+# a very simple Makefile for miniLZO
+#
+# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+#
+
+PROGRAM = testmini
+SOURCES = testmini.c minilzo.c
+
+default:
+	@echo "Please choose one of the following targets:"
+	@echo "    gcc:   gcc"
+	@echo "    unix:  hpux hpux9"
+	@echo "    win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
+	@echo "           win32-intelc win32-mingw win32-vc win32-watcomc"
+	@echo "    dos16: dos16-bc dos16-mc dos16-wc"
+	@echo "    dos32: dos32-djgpp2 dos32-wc"
+
+
+# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
+# current dircectory. Otherwise you may want to adjust CPPFLAGS.
+##CPPFLAGS = -I../include/lzo -I.
+
+GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
+
+
+#
+# gcc (generic)
+#
+
+gcc:
+	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
+
+cc:
+	cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# UNIX
+#
+
+hpux:
+	cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+hpux9:
+	cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# Windows (32-bit)
+#
+
+win32-borlandc win32-bc:
+	bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
+
+win32-cygwin32 win32-cygwin:
+	gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-digitalmars win32-dm:
+	dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
+
+win32-intelc win32-ic:
+	icl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-lccwin32:
+	@echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
+	lc -A -unused -O $(CPPFLAGS) $(SOURCES)
+
+win32-mingw32 win32-mingw:
+	gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-visualc win32-vc:
+	cl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-watcomc win32-wc:
+	wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
+
+
+#
+# DOS (16-bit)
+#
+
+dos16-borlandc dos16-bc:
+	bcc -ml -w -d -O -4 $(CPPFLAGS) $(SOURCES)
+
+dos16-microsoftc dos16-msc dos16-mc:
+	cl -nologo -f- -AL -O -G2 -W3 $(CPPFLAGS) $(SOURCES)
+
+dos16-watcomc dos16-wc:
+	wcl -zq -ml -bt=dos -l=dos -ox -w5 $(CPPFLAGS) $(SOURCES)
+
+
+#
+# DOS (32-bit)
+#
+
+dos32-djgpp2 dos32-dj2:
+	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+dos32-watcomc dos32-wc:
+	wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
+
+
+#
+# other targets
+#
+
+clean:
+	rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
+	rm -f *.err *.o *.obj
+
+.PHONY: default clean
+
diff --git a/extern/lzo/minilzo/README.LZO b/extern/lzo/minilzo/README.LZO
new file mode 100644
index 00000000000..3700f28e310
--- /dev/null
+++ b/extern/lzo/minilzo/README.LZO
@@ -0,0 +1,123 @@
+
+ ============================================================================
+ miniLZO -- mini subset of the LZO real-time data compression library
+ ============================================================================
+
+ Author  : Markus Franz Xaver Johannes Oberhumer
+           <markus@oberhumer.com>
+           http://www.oberhumer.com/opensource/lzo/
+ Version : 2.03
+ Date    : 30 Apr 2008
+
+ I've created miniLZO for projects where it is inconvenient to
+ include (or require) the full LZO source code just because you
+ want to add a little bit of data compression to your application.
+
+ miniLZO implements the LZO1X-1 compressor and both the standard and
+ safe LZO1X decompressor. Apart from fast compression it also useful
+ for situations where you want to use pre-compressed data files (which
+ must have been compressed with LZO1X-999).
+
+ miniLZO consists of one C source file and three header files:
+    minilzo.c
+    minilzo.h, lzoconf.h, lzodefs.h
+
+ To use miniLZO just copy these files into your source directory, add
+ minilzo.c to your Makefile and #include minilzo.h from your program.
+ Note: you also must distribute this file (`README.LZO') with your project.
+
+ minilzo.o compiles to about 6 kB (using gcc or Visual C on a i386), and
+ the sources are about 30 kB when packed with zip - so there's no more
+ excuse that your application doesn't support data compression :-)
+
+ For more information, documentation, example programs and other support
+ files (like Makefiles and build scripts) please download the full LZO
+ package from
+    http://www.oberhumer.com/opensource/lzo/
+
+ Have fun,
+  Markus
+
+
+ P.S. minilzo.c is generated automatically from the LZO sources and
+      therefore functionality is completely identical
+
+
+ Appendix A: building miniLZO
+ ----------------------------
+ miniLZO is written such a way that it should compile and run
+ out-of-the-box on most machines.
+
+ If you are running on a very unusual architecture and lzo_init() fails then
+ you should first recompile with `-DLZO_DEBUG' to see what causes the failure.
+ The most probable case is something like `sizeof(char *) != sizeof(long)'.
+ After identifying the problem you can compile by adding some defines
+ like `-DSIZEOF_CHAR_P=8' to your Makefile.
+
+ The best solution is (of course) using Autoconf - if your project uses
+ Autoconf anyway just add `-DMINILZO_HAVE_CONFIG_H' to your compiler
+ flags when compiling minilzo.c. See the LZO distribution for an example
+ how to set up configure.in.
+
+
+ Appendix B: list of public functions available in miniLZO
+ ---------------------------------------------------------
+ Library initialization
+    lzo_init()
+
+ Compression
+    lzo1x_1_compress()
+
+ Decompression
+    lzo1x_decompress()
+    lzo1x_decompress_safe()
+
+ Checksum functions
+    lzo_adler32()
+
+ Version functions
+    lzo_version()
+    lzo_version_string()
+    lzo_version_date()
+
+ Portable (but slow) string functions
+    lzo_memcmp()
+    lzo_memcpy()
+    lzo_memmove()
+    lzo_memset()
+
+
+ Appendix C: suggested macros for `configure.in' when using Autoconf
+ -------------------------------------------------------------------
+ Checks for typedefs and structures
+    AC_CHECK_TYPE(ptrdiff_t,long)
+    AC_TYPE_SIZE_T
+    AC_CHECK_SIZEOF(short)
+    AC_CHECK_SIZEOF(int)
+    AC_CHECK_SIZEOF(long)
+    AC_CHECK_SIZEOF(long long)
+    AC_CHECK_SIZEOF(__int64)
+    AC_CHECK_SIZEOF(void *)
+    AC_CHECK_SIZEOF(size_t)
+    AC_CHECK_SIZEOF(ptrdiff_t)
+
+ Checks for compiler characteristics
+    AC_C_CONST
+
+ Checks for library functions
+    AC_CHECK_FUNCS(memcmp memcpy memmove memset)
+
+
+ Appendix D: Copyright
+ ---------------------
+ LZO and miniLZO are Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ 2003, 2004, 2005, 2006, 2007, 2008 Markus Franz Xaver Johannes Oberhumer
+
+ LZO and miniLZO are distributed under the terms of the GNU General
+ Public License (GPL).  See the file COPYING.
+
+ Special licenses for commercial and other applications which
+ are not willing to accept the GNU General Public License
+ are available by contacting the author.
+
+
diff --git a/extern/lzo/minilzo/lzoconf.h b/extern/lzo/minilzo/lzoconf.h
new file mode 100644
index 00000000000..cc437f1ebfe
--- /dev/null
+++ b/extern/lzo/minilzo/lzoconf.h
@@ -0,0 +1,417 @@
+/* lzoconf.h -- configuration for the LZO real-time data compression library
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The LZO library 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 LZO library 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 the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/lzo/
+ */
+
+
+#ifndef __LZOCONF_H_INCLUDED
+#define __LZOCONF_H_INCLUDED
+
+#define LZO_VERSION             0x2030
+#define LZO_VERSION_STRING      "2.03"
+#define LZO_VERSION_DATE        "Apr 30 2008"
+
+/* internal Autoconf configuration file - only used when building LZO */
+#if defined(LZO_HAVE_CONFIG_H)
+#  include <config.h>
+#endif
+#include <limits.h>
+#include <stddef.h>
+
+
+/***********************************************************************
+// LZO requires a conforming <limits.h>
+************************************************************************/
+
+#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
+#  error "invalid CHAR_BIT"
+#endif
+#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
+#  error "check your compiler installation"
+#endif
+#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
+#  error "your limits.h macros are broken"
+#endif
+
+/* get OS and architecture defines */
+#ifndef __LZODEFS_H_INCLUDED
+#include "lzodefs.h"
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/***********************************************************************
+// some core defines
+************************************************************************/
+
+#if !defined(LZO_UINT32_C)
+#  if (UINT_MAX < LZO_0xffffffffL)
+#    define LZO_UINT32_C(c)     c ## UL
+#  else
+#    define LZO_UINT32_C(c)     ((c) + 0U)
+#  endif
+#endif
+
+/* memory checkers */
+#if !defined(__LZO_CHECKER)
+#  if defined(__BOUNDS_CHECKING_ON)
+#    define __LZO_CHECKER       1
+#  elif defined(__CHECKER__)
+#    define __LZO_CHECKER       1
+#  elif defined(__INSURE__)
+#    define __LZO_CHECKER       1
+#  elif defined(__PURIFY__)
+#    define __LZO_CHECKER       1
+#  endif
+#endif
+
+
+/***********************************************************************
+// integral and pointer types
+************************************************************************/
+
+/* lzo_uint should match size_t */
+#if !defined(LZO_UINT_MAX)
+#  if defined(LZO_ABI_LLP64) /* WIN64 */
+#    if defined(LZO_OS_WIN64)
+     typedef unsigned __int64   lzo_uint;
+     typedef __int64            lzo_int;
+#    else
+     typedef unsigned long long lzo_uint;
+     typedef long long          lzo_int;
+#    endif
+#    define LZO_UINT_MAX        0xffffffffffffffffull
+#    define LZO_INT_MAX         9223372036854775807LL
+#    define LZO_INT_MIN         (-1LL - LZO_INT_MAX)
+#  elif defined(LZO_ABI_IP32L64) /* MIPS R5900 */
+     typedef unsigned int       lzo_uint;
+     typedef int                lzo_int;
+#    define LZO_UINT_MAX        UINT_MAX
+#    define LZO_INT_MAX         INT_MAX
+#    define LZO_INT_MIN         INT_MIN
+#  elif (ULONG_MAX >= LZO_0xffffffffL)
+     typedef unsigned long      lzo_uint;
+     typedef long               lzo_int;
+#    define LZO_UINT_MAX        ULONG_MAX
+#    define LZO_INT_MAX         LONG_MAX
+#    define LZO_INT_MIN         LONG_MIN
+#  else
+#    error "lzo_uint"
+#  endif
+#endif
+
+/* Integral types with 32 bits or more. */
+#if !defined(LZO_UINT32_MAX)
+#  if (UINT_MAX >= LZO_0xffffffffL)
+     typedef unsigned int       lzo_uint32;
+     typedef int                lzo_int32;
+#    define LZO_UINT32_MAX      UINT_MAX
+#    define LZO_INT32_MAX       INT_MAX
+#    define LZO_INT32_MIN       INT_MIN
+#  elif (ULONG_MAX >= LZO_0xffffffffL)
+     typedef unsigned long      lzo_uint32;
+     typedef long               lzo_int32;
+#    define LZO_UINT32_MAX      ULONG_MAX
+#    define LZO_INT32_MAX       LONG_MAX
+#    define LZO_INT32_MIN       LONG_MIN
+#  else
+#    error "lzo_uint32"
+#  endif
+#endif
+
+/* The larger type of lzo_uint and lzo_uint32. */
+#if (LZO_UINT_MAX >= LZO_UINT32_MAX)
+#  define lzo_xint              lzo_uint
+#else
+#  define lzo_xint              lzo_uint32
+#endif
+
+/* Memory model that allows to access memory at offsets of lzo_uint. */
+#if !defined(__LZO_MMODEL)
+#  if (LZO_UINT_MAX <= UINT_MAX)
+#    define __LZO_MMODEL
+#  elif defined(LZO_HAVE_MM_HUGE_PTR)
+#    define __LZO_MMODEL_HUGE   1
+#    define __LZO_MMODEL        __huge
+#  else
+#    define __LZO_MMODEL
+#  endif
+#endif
+
+/* no typedef here because of const-pointer issues */
+#define lzo_bytep               unsigned char __LZO_MMODEL *
+#define lzo_charp               char __LZO_MMODEL *
+#define lzo_voidp               void __LZO_MMODEL *
+#define lzo_shortp              short __LZO_MMODEL *
+#define lzo_ushortp             unsigned short __LZO_MMODEL *
+#define lzo_uint32p             lzo_uint32 __LZO_MMODEL *
+#define lzo_int32p              lzo_int32 __LZO_MMODEL *
+#define lzo_uintp               lzo_uint __LZO_MMODEL *
+#define lzo_intp                lzo_int __LZO_MMODEL *
+#define lzo_xintp               lzo_xint __LZO_MMODEL *
+#define lzo_voidpp              lzo_voidp __LZO_MMODEL *
+#define lzo_bytepp              lzo_bytep __LZO_MMODEL *
+/* deprecated - use `lzo_bytep' instead of `lzo_byte *' */
+#define lzo_byte                unsigned char __LZO_MMODEL
+
+typedef int lzo_bool;
+
+
+/***********************************************************************
+// function types
+************************************************************************/
+
+/* name mangling */
+#if !defined(__LZO_EXTERN_C)
+#  ifdef __cplusplus
+#    define __LZO_EXTERN_C      extern "C"
+#  else
+#    define __LZO_EXTERN_C      extern
+#  endif
+#endif
+
+/* calling convention */
+#if !defined(__LZO_CDECL)
+#  define __LZO_CDECL           __lzo_cdecl
+#endif
+
+/* DLL export information */
+#if !defined(__LZO_EXPORT1)
+#  define __LZO_EXPORT1
+#endif
+#if !defined(__LZO_EXPORT2)
+#  define __LZO_EXPORT2
+#endif
+
+/* __cdecl calling convention for public C and assembly functions */
+#if !defined(LZO_PUBLIC)
+#  define LZO_PUBLIC(_rettype)  __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
+#endif
+#if !defined(LZO_EXTERN)
+#  define LZO_EXTERN(_rettype)  __LZO_EXTERN_C LZO_PUBLIC(_rettype)
+#endif
+#if !defined(LZO_PRIVATE)
+#  define LZO_PRIVATE(_rettype) static _rettype __LZO_CDECL
+#endif
+
+/* function types */
+typedef int
+(__LZO_CDECL *lzo_compress_t)   ( const lzo_bytep src, lzo_uint  src_len,
+                                        lzo_bytep dst, lzo_uintp dst_len,
+                                        lzo_voidp wrkmem );
+
+typedef int
+(__LZO_CDECL *lzo_decompress_t) ( const lzo_bytep src, lzo_uint  src_len,
+                                        lzo_bytep dst, lzo_uintp dst_len,
+                                        lzo_voidp wrkmem );
+
+typedef int
+(__LZO_CDECL *lzo_optimize_t)   (       lzo_bytep src, lzo_uint  src_len,
+                                        lzo_bytep dst, lzo_uintp dst_len,
+                                        lzo_voidp wrkmem );
+
+typedef int
+(__LZO_CDECL *lzo_compress_dict_t)(const lzo_bytep src, lzo_uint  src_len,
+                                         lzo_bytep dst, lzo_uintp dst_len,
+                                         lzo_voidp wrkmem,
+                                   const lzo_bytep dict, lzo_uint dict_len );
+
+typedef int
+(__LZO_CDECL *lzo_decompress_dict_t)(const lzo_bytep src, lzo_uint  src_len,
+                                           lzo_bytep dst, lzo_uintp dst_len,
+                                           lzo_voidp wrkmem,
+                                     const lzo_bytep dict, lzo_uint dict_len );
+
+
+/* Callback interface. Currently only the progress indicator ("nprogress")
+ * is used, but this may change in a future release. */
+
+struct lzo_callback_t;
+typedef struct lzo_callback_t lzo_callback_t;
+#define lzo_callback_p lzo_callback_t __LZO_MMODEL *
+
+/* malloc & free function types */
+typedef lzo_voidp (__LZO_CDECL *lzo_alloc_func_t)
+    (lzo_callback_p self, lzo_uint items, lzo_uint size);
+typedef void      (__LZO_CDECL *lzo_free_func_t)
+    (lzo_callback_p self, lzo_voidp ptr);
+
+/* a progress indicator callback function */
+typedef void (__LZO_CDECL *lzo_progress_func_t)
+    (lzo_callback_p, lzo_uint, lzo_uint, int);
+
+struct lzo_callback_t
+{
+    /* custom allocators (set to 0 to disable) */
+    lzo_alloc_func_t nalloc;                /* [not used right now] */
+    lzo_free_func_t nfree;                  /* [not used right now] */
+
+    /* a progress indicator callback function (set to 0 to disable) */
+    lzo_progress_func_t nprogress;
+
+    /* NOTE: the first parameter "self" of the nalloc/nfree/nprogress
+     * callbacks points back to this struct, so you are free to store
+     * some extra info in the following variables. */
+    lzo_voidp user1;
+    lzo_xint user2;
+    lzo_xint user3;
+};
+
+
+/***********************************************************************
+// error codes and prototypes
+************************************************************************/
+
+/* Error codes for the compression/decompression functions. Negative
+ * values are errors, positive values will be used for special but
+ * normal events.
+ */
+#define LZO_E_OK                    0
+#define LZO_E_ERROR                 (-1)
+#define LZO_E_OUT_OF_MEMORY         (-2)    /* [not used right now] */
+#define LZO_E_NOT_COMPRESSIBLE      (-3)    /* [not used right now] */
+#define LZO_E_INPUT_OVERRUN         (-4)
+#define LZO_E_OUTPUT_OVERRUN        (-5)
+#define LZO_E_LOOKBEHIND_OVERRUN    (-6)
+#define LZO_E_EOF_NOT_FOUND         (-7)
+#define LZO_E_INPUT_NOT_CONSUMED    (-8)
+#define LZO_E_NOT_YET_IMPLEMENTED   (-9)    /* [not used right now] */
+
+
+#ifndef lzo_sizeof_dict_t
+#  define lzo_sizeof_dict_t     ((unsigned)sizeof(lzo_bytep))
+#endif
+
+/* lzo_init() should be the first function you call.
+ * Check the return code !
+ *
+ * lzo_init() is a macro to allow checking that the library and the
+ * compiler's view of various types are consistent.
+ */
+#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
+    (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
+    (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
+    (int)sizeof(lzo_callback_t))
+LZO_EXTERN(int) __lzo_init_v2(unsigned,int,int,int,int,int,int,int,int,int);
+
+/* version functions (useful for shared libraries) */
+LZO_EXTERN(unsigned) lzo_version(void);
+LZO_EXTERN(const char *) lzo_version_string(void);
+LZO_EXTERN(const char *) lzo_version_date(void);
+LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
+LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
+
+/* string functions */
+LZO_EXTERN(int)
+lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
+LZO_EXTERN(lzo_voidp)
+lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
+LZO_EXTERN(lzo_voidp)
+lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
+LZO_EXTERN(lzo_voidp)
+lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
+
+/* checksum functions */
+LZO_EXTERN(lzo_uint32)
+lzo_adler32(lzo_uint32 _adler, const lzo_bytep _buf, lzo_uint _len);
+LZO_EXTERN(lzo_uint32)
+lzo_crc32(lzo_uint32 _c, const lzo_bytep _buf, lzo_uint _len);
+LZO_EXTERN(const lzo_uint32p)
+lzo_get_crc32_table(void);
+
+/* misc. */
+LZO_EXTERN(int) _lzo_config_check(void);
+typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
+typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u;
+typedef union { void *vp; lzo_bytep bp; lzo_uint32 u32; long l; } lzo_align_t;
+
+/* align a char pointer on a boundary that is a multiple of `size' */
+LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
+#define LZO_PTR_ALIGN_UP(_ptr,_size) \
+    ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
+
+
+/***********************************************************************
+// deprecated macros - only for backward compatibility with LZO v1.xx
+************************************************************************/
+
+#if defined(LZO_CFG_COMPAT)
+
+#define __LZOCONF_H 1
+
+#if defined(LZO_ARCH_I086)
+#  define __LZO_i386 1
+#elif defined(LZO_ARCH_I386)
+#  define __LZO_i386 1
+#endif
+
+#if defined(LZO_OS_DOS16)
+#  define __LZO_DOS 1
+#  define __LZO_DOS16 1
+#elif defined(LZO_OS_DOS32)
+#  define __LZO_DOS 1
+#elif defined(LZO_OS_WIN16)
+#  define __LZO_WIN 1
+#  define __LZO_WIN16 1
+#elif defined(LZO_OS_WIN32)
+#  define __LZO_WIN 1
+#endif
+
+#define __LZO_CMODEL
+#define __LZO_DMODEL
+#define __LZO_ENTRY             __LZO_CDECL
+#define LZO_EXTERN_CDECL        LZO_EXTERN
+#define LZO_ALIGN               LZO_PTR_ALIGN_UP
+
+#define lzo_compress_asm_t      lzo_compress_t
+#define lzo_decompress_asm_t    lzo_decompress_t
+
+#endif /* LZO_CFG_COMPAT */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* already included */
+
+
+/* vim:set ts=4 et: */
diff --git a/extern/lzo/minilzo/lzodefs.h b/extern/lzo/minilzo/lzodefs.h
new file mode 100644
index 00000000000..180563723e5
--- /dev/null
+++ b/extern/lzo/minilzo/lzodefs.h
@@ -0,0 +1,1807 @@
+/* lzodefs.h -- architecture, OS and compiler specific defines
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The LZO library 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 LZO library 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 the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/lzo/
+ */
+
+
+#ifndef __LZODEFS_H_INCLUDED
+#define __LZODEFS_H_INCLUDED 1
+
+#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
+#  define __CYGWIN__ __CYGWIN32__
+#endif
+#if defined(__IBMCPP__) && !defined(__IBMC__)
+#  define __IBMC__ __IBMCPP__
+#endif
+#if defined(__ICL) && defined(_WIN32) && !defined(__INTEL_COMPILER)
+#  define __INTEL_COMPILER __ICL
+#endif
+#if 1 && defined(__INTERIX) && defined(__GNUC__) && !defined(_ALL_SOURCE)
+#  define _ALL_SOURCE 1
+#endif
+#if defined(__mips__) && defined(__R5900__)
+#  if !defined(__LONG_MAX__)
+#    define __LONG_MAX__ 9223372036854775807L
+#  endif
+#endif
+#if defined(__INTEL_COMPILER) && defined(__linux__)
+#  pragma warning(disable: 193)
+#endif
+#if defined(__KEIL__) && defined(__C166__)
+#  pragma warning disable = 322
+#elif 0 && defined(__C251__)
+#  pragma warning disable = 322
+#endif
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
+#  if (_MSC_VER >= 1300)
+#    pragma warning(disable: 4668)
+#  endif
+#endif
+#if 0 && defined(__WATCOMC__)
+#  if (__WATCOMC__ >= 1050) && (__WATCOMC__ < 1060)
+#    pragma warning 203 9
+#  endif
+#endif
+#if defined(__BORLANDC__) && defined(__MSDOS__) && !defined(__FLAT__)
+#  pragma option -h
+#endif
+#if 0
+#define LZO_0xffffL             0xfffful
+#define LZO_0xffffffffL         0xfffffffful
+#else
+#define LZO_0xffffL             65535ul
+#define LZO_0xffffffffL         4294967295ul
+#endif
+#if (LZO_0xffffL == LZO_0xffffffffL)
+#  error "your preprocessor is broken 1"
+#endif
+#if (16ul * 16384ul != 262144ul)
+#  error "your preprocessor is broken 2"
+#endif
+#if 0
+#if (32767 >= 4294967295ul)
+#  error "your preprocessor is broken 3"
+#endif
+#if (65535u >= 4294967295ul)
+#  error "your preprocessor is broken 4"
+#endif
+#endif
+#if (UINT_MAX == LZO_0xffffL)
+#if defined(__ZTC__) && defined(__I86__) && !defined(__OS2__)
+#  if !defined(MSDOS)
+#    define MSDOS 1
+#  endif
+#  if !defined(_MSDOS)
+#    define _MSDOS 1
+#  endif
+#elif 0 && defined(__VERSION) && defined(MB_LEN_MAX)
+#  if (__VERSION == 520) && (MB_LEN_MAX == 1)
+#    if !defined(__AZTEC_C__)
+#      define __AZTEC_C__ __VERSION
+#    endif
+#    if !defined(__DOS__)
+#      define __DOS__ 1
+#    endif
+#  endif
+#endif
+#endif
+#if defined(_MSC_VER) && defined(M_I86HM) && (UINT_MAX == LZO_0xffffL)
+#  define ptrdiff_t long
+#  define _PTRDIFF_T_DEFINED
+#endif
+#if (UINT_MAX == LZO_0xffffL)
+#  undef __LZO_RENAME_A
+#  undef __LZO_RENAME_B
+#  if defined(__AZTEC_C__) && defined(__DOS__)
+#    define __LZO_RENAME_A 1
+#  elif defined(_MSC_VER) && defined(MSDOS)
+#    if (_MSC_VER < 600)
+#      define __LZO_RENAME_A 1
+#    elif (_MSC_VER < 700)
+#      define __LZO_RENAME_B 1
+#    endif
+#  elif defined(__TSC__) && defined(__OS2__)
+#    define __LZO_RENAME_A 1
+#  elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)
+#    define __LZO_RENAME_A 1
+#  elif defined(__PACIFIC__) && defined(DOS)
+#    if !defined(__far)
+#      define __far far
+#    endif
+#    if !defined(__near)
+#      define __near near
+#    endif
+#  endif
+#  if defined(__LZO_RENAME_A)
+#    if !defined(__cdecl)
+#      define __cdecl cdecl
+#    endif
+#    if !defined(__far)
+#      define __far far
+#    endif
+#    if !defined(__huge)
+#      define __huge huge
+#    endif
+#    if !defined(__near)
+#      define __near near
+#    endif
+#    if !defined(__pascal)
+#      define __pascal pascal
+#    endif
+#    if !defined(__huge)
+#      define __huge huge
+#    endif
+#  elif defined(__LZO_RENAME_B)
+#    if !defined(__cdecl)
+#      define __cdecl _cdecl
+#    endif
+#    if !defined(__far)
+#      define __far _far
+#    endif
+#    if !defined(__huge)
+#      define __huge _huge
+#    endif
+#    if !defined(__near)
+#      define __near _near
+#    endif
+#    if !defined(__pascal)
+#      define __pascal _pascal
+#    endif
+#  elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#    if !defined(__cdecl)
+#      define __cdecl cdecl
+#    endif
+#    if !defined(__pascal)
+#      define __pascal pascal
+#    endif
+#  endif
+#  undef __LZO_RENAME_A
+#  undef __LZO_RENAME_B
+#endif
+#if (UINT_MAX == LZO_0xffffL)
+#if defined(__AZTEC_C__) && defined(__DOS__)
+#  define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#elif defined(_MSC_VER) && defined(MSDOS)
+#  if (_MSC_VER < 600)
+#    define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#  endif
+#  if (_MSC_VER < 700)
+#    define LZO_BROKEN_INTEGRAL_PROMOTION 1
+#    define LZO_BROKEN_SIZEOF 1
+#  endif
+#elif defined(__PACIFIC__) && defined(DOS)
+#  define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#elif defined(__TURBOC__) && defined(__MSDOS__)
+#  if (__TURBOC__ < 0x0150)
+#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#    define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#    define LZO_BROKEN_INTEGRAL_PROMOTION 1
+#  endif
+#  if (__TURBOC__ < 0x0200)
+#    define LZO_BROKEN_SIZEOF 1
+#  endif
+#  if (__TURBOC__ < 0x0400) && defined(__cplusplus)
+#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#  endif
+#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#  define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#  define LZO_BROKEN_SIZEOF 1
+#endif
+#endif
+#if defined(__WATCOMC__) && (__WATCOMC__ < 900)
+#  define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#endif
+#if defined(_CRAY) && defined(_CRAY1)
+#  define LZO_BROKEN_SIGNED_RIGHT_SHIFT 1
+#endif
+#define LZO_PP_STRINGIZE(x)             #x
+#define LZO_PP_MACRO_EXPAND(x)          LZO_PP_STRINGIZE(x)
+#define LZO_PP_CONCAT2(a,b)             a ## b
+#define LZO_PP_CONCAT3(a,b,c)           a ## b ## c
+#define LZO_PP_CONCAT4(a,b,c,d)         a ## b ## c ## d
+#define LZO_PP_CONCAT5(a,b,c,d,e)       a ## b ## c ## d ## e
+#define LZO_PP_ECONCAT2(a,b)            LZO_PP_CONCAT2(a,b)
+#define LZO_PP_ECONCAT3(a,b,c)          LZO_PP_CONCAT3(a,b,c)
+#define LZO_PP_ECONCAT4(a,b,c,d)        LZO_PP_CONCAT4(a,b,c,d)
+#define LZO_PP_ECONCAT5(a,b,c,d,e)      LZO_PP_CONCAT5(a,b,c,d,e)
+#if 1
+#define LZO_CPP_STRINGIZE(x)            #x
+#define LZO_CPP_MACRO_EXPAND(x)         LZO_CPP_STRINGIZE(x)
+#define LZO_CPP_CONCAT2(a,b)            a ## b
+#define LZO_CPP_CONCAT3(a,b,c)          a ## b ## c
+#define LZO_CPP_CONCAT4(a,b,c,d)        a ## b ## c ## d
+#define LZO_CPP_CONCAT5(a,b,c,d,e)      a ## b ## c ## d ## e
+#define LZO_CPP_ECONCAT2(a,b)           LZO_CPP_CONCAT2(a,b)
+#define LZO_CPP_ECONCAT3(a,b,c)         LZO_CPP_CONCAT3(a,b,c)
+#define LZO_CPP_ECONCAT4(a,b,c,d)       LZO_CPP_CONCAT4(a,b,c,d)
+#define LZO_CPP_ECONCAT5(a,b,c,d,e)     LZO_CPP_CONCAT5(a,b,c,d,e)
+#endif
+#define __LZO_MASK_GEN(o,b)     (((((o) << ((b)-1)) - (o)) << 1) + (o))
+#if 1 && defined(__cplusplus)
+#  if !defined(__STDC_CONSTANT_MACROS)
+#    define __STDC_CONSTANT_MACROS 1
+#  endif
+#  if !defined(__STDC_LIMIT_MACROS)
+#    define __STDC_LIMIT_MACROS 1
+#  endif
+#endif
+#if defined(__cplusplus)
+#  define LZO_EXTERN_C extern "C"
+#else
+#  define LZO_EXTERN_C extern
+#endif
+#if !defined(__LZO_OS_OVERRIDE)
+#if defined(LZO_OS_FREESTANDING)
+#  define LZO_INFO_OS           "freestanding"
+#elif defined(LZO_OS_EMBEDDED)
+#  define LZO_INFO_OS           "embedded"
+#elif 1 && defined(__IAR_SYSTEMS_ICC__)
+#  define LZO_OS_EMBEDDED       1
+#  define LZO_INFO_OS           "embedded"
+#elif defined(__CYGWIN__) && defined(__GNUC__)
+#  define LZO_OS_CYGWIN         1
+#  define LZO_INFO_OS           "cygwin"
+#elif defined(__EMX__) && defined(__GNUC__)
+#  define LZO_OS_EMX            1
+#  define LZO_INFO_OS           "emx"
+#elif defined(__BEOS__)
+#  define LZO_OS_BEOS           1
+#  define LZO_INFO_OS           "beos"
+#elif defined(__Lynx__)
+#  define LZO_OS_LYNXOS         1
+#  define LZO_INFO_OS           "lynxos"
+#elif defined(__OS400__)
+#  define LZO_OS_OS400          1
+#  define LZO_INFO_OS           "os400"
+#elif defined(__QNX__)
+#  define LZO_OS_QNX            1
+#  define LZO_INFO_OS           "qnx"
+#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
+#  define LZO_OS_DOS32          1
+#  define LZO_INFO_OS           "dos32"
+#elif defined(__BORLANDC__) && defined(__DPMI16__)
+#  define LZO_OS_DOS16          1
+#  define LZO_INFO_OS           "dos16"
+#elif defined(__ZTC__) && defined(DOS386)
+#  define LZO_OS_DOS32          1
+#  define LZO_INFO_OS           "dos32"
+#elif defined(__OS2__) || defined(__OS2V2__)
+#  if (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_OS216        1
+#    define LZO_INFO_OS         "os216"
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_OS_OS2          1
+#    define LZO_INFO_OS         "os2"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64)
+#  define LZO_OS_WIN64          1
+#  define LZO_INFO_OS           "win64"
+#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
+#  define LZO_OS_WIN32          1
+#  define LZO_INFO_OS           "win32"
+#elif defined(__MWERKS__) && defined(__INTEL__)
+#  define LZO_OS_WIN32          1
+#  define LZO_INFO_OS           "win32"
+#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
+#  if (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_WIN16        1
+#    define LZO_INFO_OS         "win16"
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_OS_WIN32        1
+#    define LZO_INFO_OS         "win32"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__DOS__) || defined(__MSDOS__) || defined(_MSDOS) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
+#  if (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_DOS16        1
+#    define LZO_INFO_OS         "dos16"
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_OS_DOS32        1
+#    define LZO_INFO_OS         "dos32"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__WATCOMC__)
+#  if defined(__NT__) && (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_DOS16        1
+#    define LZO_INFO_OS         "dos16"
+#  elif defined(__NT__) && (__WATCOMC__ < 1100)
+#    define LZO_OS_WIN32        1
+#    define LZO_INFO_OS         "win32"
+#  elif defined(__linux__) || defined(__LINUX__)
+#    define LZO_OS_POSIX        1
+#    define LZO_INFO_OS         "posix"
+#  else
+#    error "please specify a target using the -bt compiler option"
+#  endif
+#elif defined(__palmos__)
+#  define LZO_OS_PALMOS         1
+#  define LZO_INFO_OS           "palmos"
+#elif defined(__TOS__) || defined(__atarist__)
+#  define LZO_OS_TOS            1
+#  define LZO_INFO_OS           "tos"
+#elif defined(macintosh) && !defined(__ppc__)
+#  define LZO_OS_MACCLASSIC     1
+#  define LZO_INFO_OS           "macclassic"
+#elif defined(__VMS)
+#  define LZO_OS_VMS            1
+#  define LZO_INFO_OS           "vms"
+#elif ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__))
+#  define LZO_OS_CONSOLE        1
+#  define LZO_OS_CONSOLE_PS2    1
+#  define LZO_INFO_OS           "console"
+#  define LZO_INFO_OS_CONSOLE   "ps2"
+#elif (defined(__mips__) && defined(__psp__))
+#  define LZO_OS_CONSOLE        1
+#  define LZO_OS_CONSOLE_PSP    1
+#  define LZO_INFO_OS           "console"
+#  define LZO_INFO_OS_CONSOLE   "psp"
+#else
+#  define LZO_OS_POSIX          1
+#  define LZO_INFO_OS           "posix"
+#endif
+#if (LZO_OS_POSIX)
+#  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
+#    define LZO_OS_POSIX_AIX        1
+#    define LZO_INFO_OS_POSIX       "aix"
+#  elif defined(__FreeBSD__)
+#    define LZO_OS_POSIX_FREEBSD    1
+#    define LZO_INFO_OS_POSIX       "freebsd"
+#  elif defined(__hpux__) || defined(__hpux)
+#    define LZO_OS_POSIX_HPUX       1
+#    define LZO_INFO_OS_POSIX       "hpux"
+#  elif defined(__INTERIX)
+#    define LZO_OS_POSIX_INTERIX    1
+#    define LZO_INFO_OS_POSIX       "interix"
+#  elif defined(__IRIX__) || defined(__irix__)
+#    define LZO_OS_POSIX_IRIX       1
+#    define LZO_INFO_OS_POSIX       "irix"
+#  elif defined(__linux__) || defined(__linux) || defined(__LINUX__)
+#    define LZO_OS_POSIX_LINUX      1
+#    define LZO_INFO_OS_POSIX       "linux"
+#  elif defined(__APPLE__) || defined(__MACOS__)
+#    define LZO_OS_POSIX_MACOSX     1
+#    define LZO_INFO_OS_POSIX       "macosx"
+#  elif defined(__minix__) || defined(__minix)
+#    define LZO_OS_POSIX_MINIX      1
+#    define LZO_INFO_OS_POSIX       "minix"
+#  elif defined(__NetBSD__)
+#    define LZO_OS_POSIX_NETBSD     1
+#    define LZO_INFO_OS_POSIX       "netbsd"
+#  elif defined(__OpenBSD__)
+#    define LZO_OS_POSIX_OPENBSD    1
+#    define LZO_INFO_OS_POSIX       "openbsd"
+#  elif defined(__osf__)
+#    define LZO_OS_POSIX_OSF        1
+#    define LZO_INFO_OS_POSIX       "osf"
+#  elif defined(__solaris__) || defined(__sun)
+#    if defined(__SVR4) || defined(__svr4__)
+#      define LZO_OS_POSIX_SOLARIS  1
+#      define LZO_INFO_OS_POSIX     "solaris"
+#    else
+#      define LZO_OS_POSIX_SUNOS    1
+#      define LZO_INFO_OS_POSIX     "sunos"
+#    endif
+#  elif defined(__ultrix__) || defined(__ultrix)
+#    define LZO_OS_POSIX_ULTRIX     1
+#    define LZO_INFO_OS_POSIX       "ultrix"
+#  elif defined(_UNICOS)
+#    define LZO_OS_POSIX_UNICOS     1
+#    define LZO_INFO_OS_POSIX       "unicos"
+#  else
+#    define LZO_OS_POSIX_UNKNOWN    1
+#    define LZO_INFO_OS_POSIX       "unknown"
+#  endif
+#endif
+#endif
+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#  if (UINT_MAX != LZO_0xffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if (LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_WIN32 || LZO_OS_WIN64)
+#  if (UINT_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__)
+#  define LZO_CC_CILLY          1
+#  define LZO_INFO_CC           "Cilly"
+#  if defined(__CILLY__)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__CILLY__)
+#  else
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__)
+#  define LZO_CC_SDCC           1
+#  define LZO_INFO_CC           "sdcc"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(SDCC)
+#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__)
+#  define LZO_CC_PATHSCALE      (__PATHCC__ * 0x10000L + __PATHCC_MINOR__ * 0x100 + __PATHCC_PATCHLEVEL__)
+#  define LZO_INFO_CC           "Pathscale C"
+#  define LZO_INFO_CCVER        __PATHSCALE__
+#elif defined(__INTEL_COMPILER)
+#  define LZO_CC_INTELC         1
+#  define LZO_INFO_CC           "Intel C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__INTEL_COMPILER)
+#  if defined(_WIN32) || defined(_WIN64)
+#    define LZO_CC_SYNTAX_MSC 1
+#  else
+#    define LZO_CC_SYNTAX_GNUC 1
+#  endif
+#elif defined(__POCC__) && defined(_WIN32)
+#  define LZO_CC_PELLESC        1
+#  define LZO_INFO_CC           "Pelles C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__POCC__)
+#elif defined(__llvm__) && defined(__GNUC__) && defined(__VERSION__)
+#  if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#    define LZO_CC_LLVM         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
+#  else
+#    define LZO_CC_LLVM         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
+#  endif
+#  define LZO_INFO_CC           "llvm-gcc"
+#  define LZO_INFO_CCVER        __VERSION__
+#elif defined(__GNUC__) && defined(__VERSION__)
+#  if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#    define LZO_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
+#  elif defined(__GNUC_MINOR__)
+#    define LZO_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
+#  else
+#    define LZO_CC_GNUC         (__GNUC__ * 0x10000L)
+#  endif
+#  define LZO_INFO_CC           "gcc"
+#  define LZO_INFO_CCVER        __VERSION__
+#elif defined(__ACK__) && defined(_ACK)
+#  define LZO_CC_ACK            1
+#  define LZO_INFO_CC           "Amsterdam Compiler Kit C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__AZTEC_C__)
+#  define LZO_CC_AZTECC         1
+#  define LZO_INFO_CC           "Aztec C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__AZTEC_C__)
+#elif defined(__BORLANDC__)
+#  define LZO_CC_BORLANDC       1
+#  define LZO_INFO_CC           "Borland C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__BORLANDC__)
+#elif defined(_CRAYC) && defined(_RELEASE)
+#  define LZO_CC_CRAYC          1
+#  define LZO_INFO_CC           "Cray C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(_RELEASE)
+#elif defined(__DMC__) && defined(__SC__)
+#  define LZO_CC_DMC            1
+#  define LZO_INFO_CC           "Digital Mars C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__DMC__)
+#elif defined(__DECC)
+#  define LZO_CC_DECC           1
+#  define LZO_INFO_CC           "DEC C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__DECC)
+#elif defined(__HIGHC__)
+#  define LZO_CC_HIGHC          1
+#  define LZO_INFO_CC           "MetaWare High C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__IAR_SYSTEMS_ICC__)
+#  define LZO_CC_IARC           1
+#  define LZO_INFO_CC           "IAR C"
+#  if defined(__VER__)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__VER__)
+#  else
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(__IBMC__)
+#  define LZO_CC_IBMC           1
+#  define LZO_INFO_CC           "IBM C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__IBMC__)
+#elif defined(__KEIL__) && defined(__C166__)
+#  define LZO_CC_KEILC          1
+#  define LZO_INFO_CC           "Keil C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__C166__)
+#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL)
+#  define LZO_CC_LCCWIN32       1
+#  define LZO_INFO_CC           "lcc-win32"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__LCC__)
+#  define LZO_CC_LCC            1
+#  define LZO_INFO_CC           "lcc"
+#  if defined(__LCC_VERSION__)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__LCC_VERSION__)
+#  else
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(_MSC_VER)
+#  define LZO_CC_MSC            1
+#  define LZO_INFO_CC           "Microsoft C"
+#  if defined(_MSC_FULL_VER)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(_MSC_VER) "." LZO_PP_MACRO_EXPAND(_MSC_FULL_VER)
+#  else
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(_MSC_VER)
+#  endif
+#elif defined(__MWERKS__)
+#  define LZO_CC_MWERKS         1
+#  define LZO_INFO_CC           "Metrowerks C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__MWERKS__)
+#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386)
+#  define LZO_CC_NDPC           1
+#  define LZO_INFO_CC           "Microway NDP C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__PACIFIC__)
+#  define LZO_CC_PACIFICC       1
+#  define LZO_INFO_CC           "Pacific C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__PACIFIC__)
+#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__))
+#  define LZO_CC_PGI            1
+#  define LZO_INFO_CC           "Portland Group PGI C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__PUREC__) && defined(__TOS__)
+#  define LZO_CC_PUREC          1
+#  define LZO_INFO_CC           "Pure C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__PUREC__)
+#elif defined(__SC__) && defined(__ZTC__)
+#  define LZO_CC_SYMANTECC      1
+#  define LZO_INFO_CC           "Symantec C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__SC__)
+#elif defined(__SUNPRO_C)
+#  define LZO_INFO_CC           "SunPro C"
+#  if ((__SUNPRO_C)+0 > 0)
+#    define LZO_CC_SUNPROC      __SUNPRO_C
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__SUNPRO_C)
+#  else
+#    define LZO_CC_SUNPROC      1
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(__SUNPRO_CC)
+#  define LZO_INFO_CC           "SunPro C"
+#  if ((__SUNPRO_CC)+0 > 0)
+#    define LZO_CC_SUNPROC      __SUNPRO_CC
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__SUNPRO_CC)
+#  else
+#    define LZO_CC_SUNPROC      1
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(__TINYC__)
+#  define LZO_CC_TINYC          1
+#  define LZO_INFO_CC           "Tiny C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TINYC__)
+#elif defined(__TSC__)
+#  define LZO_CC_TOPSPEEDC      1
+#  define LZO_INFO_CC           "TopSpeed C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TSC__)
+#elif defined(__WATCOMC__)
+#  define LZO_CC_WATCOMC        1
+#  define LZO_INFO_CC           "Watcom C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__WATCOMC__)
+#elif defined(__TURBOC__)
+#  define LZO_CC_TURBOC         1
+#  define LZO_INFO_CC           "Turbo C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TURBOC__)
+#elif defined(__ZTC__)
+#  define LZO_CC_ZORTECHC       1
+#  define LZO_INFO_CC           "Zortech C"
+#  if (__ZTC__ == 0x310)
+#    define LZO_INFO_CCVER      "0x310"
+#  else
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__ZTC__)
+#  endif
+#else
+#  define LZO_CC_UNKNOWN        1
+#  define LZO_INFO_CC           "unknown"
+#  define LZO_INFO_CCVER        "unknown"
+#endif
+#if 0 && (LZO_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER)
+#  error "LZO_CC_MSC: _MSC_FULL_VER is not defined"
+#endif
+#if !defined(__LZO_ARCH_OVERRIDE) && !defined(LZO_ARCH_GENERIC) && defined(_CRAY)
+#  if (UINT_MAX > LZO_0xffffffffL) && defined(_CRAY)
+#    if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E)
+#      define LZO_ARCH_CRAY_MPP     1
+#    elif defined(_CRAY1)
+#      define LZO_ARCH_CRAY_PVP     1
+#    endif
+#  endif
+#endif
+#if !defined(__LZO_ARCH_OVERRIDE)
+#if defined(LZO_ARCH_GENERIC)
+#  define LZO_INFO_ARCH             "generic"
+#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#  define LZO_ARCH_I086             1
+#  define LZO_ARCH_IA16             1
+#  define LZO_INFO_ARCH             "i086"
+#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA)
+#  define LZO_ARCH_ALPHA            1
+#  define LZO_INFO_ARCH             "alpha"
+#elif (LZO_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E))
+#  define LZO_ARCH_ALPHA            1
+#  define LZO_INFO_ARCH             "alpha"
+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+#  define LZO_ARCH_AMD64            1
+#  define LZO_INFO_ARCH             "amd64"
+#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
+#  define LZO_ARCH_ARM              1
+#  define LZO_ARCH_ARM_THUMB        1
+#  define LZO_INFO_ARCH             "arm_thumb"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__)
+#  define LZO_ARCH_ARM              1
+#  if defined(__CPU_MODE__) && ((__CPU_MODE__)+0 == 1)
+#    define LZO_ARCH_ARM_THUMB      1
+#    define LZO_INFO_ARCH           "arm_thumb"
+#  elif defined(__CPU_MODE__) && ((__CPU_MODE__)+0 == 2)
+#    define LZO_INFO_ARCH           "arm"
+#  else
+#    define LZO_INFO_ARCH           "arm"
+#  endif
+#elif defined(__arm__) || defined(_M_ARM)
+#  define LZO_ARCH_ARM              1
+#  define LZO_INFO_ARCH             "arm"
+#elif (UINT_MAX <= LZO_0xffffL) && defined(__AVR__)
+#  define LZO_ARCH_AVR              1
+#  define LZO_INFO_ARCH             "avr"
+#elif defined(__bfin__)
+#  define LZO_ARCH_BLACKFIN         1
+#  define LZO_INFO_ARCH             "blackfin"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__C166__)
+#  define LZO_ARCH_C166             1
+#  define LZO_INFO_ARCH             "c166"
+#elif defined(__cris__)
+#  define LZO_ARCH_CRIS             1
+#  define LZO_INFO_ARCH             "cris"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__)
+#  define LZO_ARCH_EZ80             1
+#  define LZO_INFO_ARCH             "ez80"
+#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+#  define LZO_ARCH_H8300            1
+#  define LZO_INFO_ARCH             "h8300"
+#elif defined(__hppa__) || defined(__hppa)
+#  define LZO_ARCH_HPPA             1
+#  define LZO_INFO_ARCH             "hppa"
+#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386)
+#  define LZO_ARCH_I386             1
+#  define LZO_ARCH_IA32             1
+#  define LZO_INFO_ARCH             "i386"
+#elif (LZO_CC_ZORTECHC && defined(__I86__))
+#  define LZO_ARCH_I386             1
+#  define LZO_ARCH_IA32             1
+#  define LZO_INFO_ARCH             "i386"
+#elif (LZO_OS_DOS32 && LZO_CC_HIGHC) && defined(_I386)
+#  define LZO_ARCH_I386             1
+#  define LZO_ARCH_IA32             1
+#  define LZO_INFO_ARCH             "i386"
+#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64)
+#  define LZO_ARCH_IA64             1
+#  define LZO_INFO_ARCH             "ia64"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__m32c__)
+#  define LZO_ARCH_M16C             1
+#  define LZO_INFO_ARCH             "m16c"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__)
+#  define LZO_ARCH_M16C             1
+#  define LZO_INFO_ARCH             "m16c"
+#elif defined(__m32r__)
+#  define LZO_ARCH_M32R             1
+#  define LZO_INFO_ARCH             "m32r"
+#elif (LZO_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K)
+#  define LZO_ARCH_M68K             1
+#  define LZO_INFO_ARCH             "m68k"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__C251__)
+#  define LZO_ARCH_MCS251           1
+#  define LZO_INFO_ARCH             "mcs251"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__C51__)
+#  define LZO_ARCH_MCS51            1
+#  define LZO_INFO_ARCH             "mcs51"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__)
+#  define LZO_ARCH_MCS51            1
+#  define LZO_INFO_ARCH             "mcs51"
+#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000)
+#  define LZO_ARCH_MIPS             1
+#  define LZO_INFO_ARCH             "mips"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__MSP430__)
+#  define LZO_ARCH_MSP430           1
+#  define LZO_INFO_ARCH             "msp430"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__)
+#  define LZO_ARCH_MSP430           1
+#  define LZO_INFO_ARCH             "msp430"
+#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR)
+#  define LZO_ARCH_POWERPC          1
+#  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x)
+#  define LZO_ARCH_S390             1
+#  define LZO_INFO_ARCH             "s390"
+#elif defined(__sh__) || defined(_M_SH)
+#  define LZO_ARCH_SH               1
+#  define LZO_INFO_ARCH             "sh"
+#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8)
+#  define LZO_ARCH_SPARC            1
+#  define LZO_INFO_ARCH             "sparc"
+#elif defined(__SPU__)
+#  define LZO_ARCH_SPU              1
+#  define LZO_INFO_ARCH             "spu"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__z80)
+#  define LZO_ARCH_Z80              1
+#  define LZO_INFO_ARCH             "z80"
+#elif (LZO_ARCH_CRAY_PVP)
+#  if defined(_CRAYSV1)
+#    define LZO_ARCH_CRAY_SV1       1
+#    define LZO_INFO_ARCH           "cray_sv1"
+#  elif (_ADDR64)
+#    define LZO_ARCH_CRAY_T90       1
+#    define LZO_INFO_ARCH           "cray_t90"
+#  elif (_ADDR32)
+#    define LZO_ARCH_CRAY_YMP       1
+#    define LZO_INFO_ARCH           "cray_ymp"
+#  else
+#    define LZO_ARCH_CRAY_XMP       1
+#    define LZO_INFO_ARCH           "cray_xmp"
+#  endif
+#else
+#  define LZO_ARCH_UNKNOWN          1
+#  define LZO_INFO_ARCH             "unknown"
+#endif
+#endif
+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2)
+#  error "FIXME - missing define for CPU architecture"
+#endif
+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN32)
+#  error "FIXME - missing WIN32 define for CPU architecture"
+#endif
+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN64)
+#  error "FIXME - missing WIN64 define for CPU architecture"
+#endif
+#if (LZO_OS_OS216 || LZO_OS_WIN16)
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#elif 1 && (LZO_OS_DOS16 && defined(BLX286))
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#elif 1 && (LZO_OS_DOS16 && defined(DOSX286))
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__))
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#endif
+#if defined(LZO_ARCH_ARM_THUMB) && !defined(LZO_ARCH_ARM)
+#  error "this should not happen"
+#endif
+#if defined(LZO_ARCH_I086PM) && !defined(LZO_ARCH_I086)
+#  error "this should not happen"
+#endif
+#if (LZO_ARCH_I086)
+#  if (UINT_MAX != LZO_0xffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if (LZO_ARCH_I386)
+#  if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__)
+#    error "this should not happen"
+#  endif
+#  if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if !defined(__LZO_MM_OVERRIDE)
+#if (LZO_ARCH_I086)
+#if (UINT_MAX != LZO_0xffffL)
+#  error "this should not happen"
+#endif
+#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM)
+#  define LZO_MM_TINY           1
+#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM)
+#  define LZO_MM_HUGE           1
+#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL)
+#  define LZO_MM_SMALL          1
+#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM)
+#  define LZO_MM_MEDIUM         1
+#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM)
+#  define LZO_MM_COMPACT        1
+#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL)
+#  define LZO_MM_LARGE          1
+#elif (LZO_CC_AZTECC)
+#  if defined(_LARGE_CODE) && defined(_LARGE_DATA)
+#    define LZO_MM_LARGE        1
+#  elif defined(_LARGE_CODE)
+#    define LZO_MM_MEDIUM       1
+#  elif defined(_LARGE_DATA)
+#    define LZO_MM_COMPACT      1
+#  else
+#    define LZO_MM_SMALL        1
+#  endif
+#elif (LZO_CC_ZORTECHC && defined(__VCM__))
+#  define LZO_MM_LARGE          1
+#else
+#  error "unknown memory model"
+#endif
+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#define LZO_HAVE_MM_HUGE_PTR        1
+#define LZO_HAVE_MM_HUGE_ARRAY      1
+#if (LZO_MM_TINY)
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#endif
+#if (LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_ZORTECHC)
+#  undef LZO_HAVE_MM_HUGE_PTR
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC)
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#elif (LZO_CC_MSC && defined(_QC))
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#  if (_MSC_VER < 600)
+#    undef LZO_HAVE_MM_HUGE_PTR
+#  endif
+#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295))
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#endif
+#if (LZO_ARCH_I086PM) && !defined(LZO_HAVE_MM_HUGE_PTR)
+#  if (LZO_OS_DOS16)
+#    error "this should not happen"
+#  elif (LZO_CC_ZORTECHC)
+#  else
+#    error "this should not happen"
+#  endif
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC)
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295))
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16)
+#  define LZO_MM_AHSHIFT      12
+#elif (LZO_CC_WATCOMC)
+   extern unsigned char _HShift;
+#  define LZO_MM_AHSHIFT      ((unsigned) _HShift)
+#else
+#  error "FIXME - implement LZO_MM_AHSHIFT"
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+#elif (LZO_ARCH_C166)
+#if !defined(__MODEL__)
+#  error "FIXME - C166 __MODEL__"
+#elif ((__MODEL__) == 0)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 1)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define LZO_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define LZO_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define LZO_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define LZO_MM_XSMALL         1
+#else
+#  error "FIXME - C166 __MODEL__"
+#endif
+#elif (LZO_ARCH_MCS251)
+#if !defined(__MODEL__)
+#  error "FIXME - MCS251 __MODEL__"
+#elif ((__MODEL__) == 0)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define LZO_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define LZO_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define LZO_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define LZO_MM_XSMALL         1
+#else
+#  error "FIXME - MCS251 __MODEL__"
+#endif
+#elif (LZO_ARCH_MCS51)
+#if !defined(__MODEL__)
+#  error "FIXME - MCS51 __MODEL__"
+#elif ((__MODEL__) == 1)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define LZO_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define LZO_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define LZO_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define LZO_MM_XSMALL         1
+#else
+#  error "FIXME - MCS51 __MODEL__"
+#endif
+#elif (LZO_ARCH_CRAY_PVP)
+#  define LZO_MM_PVP            1
+#else
+#  define LZO_MM_FLAT           1
+#endif
+#if (LZO_MM_COMPACT)
+#  define LZO_INFO_MM           "compact"
+#elif (LZO_MM_FLAT)
+#  define LZO_INFO_MM           "flat"
+#elif (LZO_MM_HUGE)
+#  define LZO_INFO_MM           "huge"
+#elif (LZO_MM_LARGE)
+#  define LZO_INFO_MM           "large"
+#elif (LZO_MM_MEDIUM)
+#  define LZO_INFO_MM           "medium"
+#elif (LZO_MM_PVP)
+#  define LZO_INFO_MM           "pvp"
+#elif (LZO_MM_SMALL)
+#  define LZO_INFO_MM           "small"
+#elif (LZO_MM_TINY)
+#  define LZO_INFO_MM           "tiny"
+#else
+#  error "unknown memory model"
+#endif
+#endif
+#if defined(SIZEOF_SHORT)
+#  define LZO_SIZEOF_SHORT          (SIZEOF_SHORT)
+#endif
+#if defined(SIZEOF_INT)
+#  define LZO_SIZEOF_INT            (SIZEOF_INT)
+#endif
+#if defined(SIZEOF_LONG)
+#  define LZO_SIZEOF_LONG           (SIZEOF_LONG)
+#endif
+#if defined(SIZEOF_LONG_LONG)
+#  define LZO_SIZEOF_LONG_LONG      (SIZEOF_LONG_LONG)
+#endif
+#if defined(SIZEOF___INT16)
+#  define LZO_SIZEOF___INT16        (SIZEOF___INT16)
+#endif
+#if defined(SIZEOF___INT32)
+#  define LZO_SIZEOF___INT32        (SIZEOF___INT32)
+#endif
+#if defined(SIZEOF___INT64)
+#  define LZO_SIZEOF___INT64        (SIZEOF___INT64)
+#endif
+#if defined(SIZEOF_VOID_P)
+#  define LZO_SIZEOF_VOID_P         (SIZEOF_VOID_P)
+#endif
+#if defined(SIZEOF_SIZE_T)
+#  define LZO_SIZEOF_SIZE_T         (SIZEOF_SIZE_T)
+#endif
+#if defined(SIZEOF_PTRDIFF_T)
+#  define LZO_SIZEOF_PTRDIFF_T      (SIZEOF_PTRDIFF_T)
+#endif
+#define __LZO_LSR(x,b)    (((x)+0ul) >> (b))
+#if !defined(LZO_SIZEOF_SHORT)
+#  if (LZO_ARCH_CRAY_PVP)
+#    define LZO_SIZEOF_SHORT        8
+#  elif (USHRT_MAX == LZO_0xffffL)
+#    define LZO_SIZEOF_SHORT        2
+#  elif (__LZO_LSR(USHRT_MAX,7) == 1)
+#    define LZO_SIZEOF_SHORT        1
+#  elif (__LZO_LSR(USHRT_MAX,15) == 1)
+#    define LZO_SIZEOF_SHORT        2
+#  elif (__LZO_LSR(USHRT_MAX,31) == 1)
+#    define LZO_SIZEOF_SHORT        4
+#  elif (__LZO_LSR(USHRT_MAX,63) == 1)
+#    define LZO_SIZEOF_SHORT        8
+#  elif (__LZO_LSR(USHRT_MAX,127) == 1)
+#    define LZO_SIZEOF_SHORT        16
+#  else
+#    error "LZO_SIZEOF_SHORT"
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_INT)
+#  if (LZO_ARCH_CRAY_PVP)
+#    define LZO_SIZEOF_INT          8
+#  elif (UINT_MAX == LZO_0xffffL)
+#    define LZO_SIZEOF_INT          2
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_SIZEOF_INT          4
+#  elif (__LZO_LSR(UINT_MAX,7) == 1)
+#    define LZO_SIZEOF_INT          1
+#  elif (__LZO_LSR(UINT_MAX,15) == 1)
+#    define LZO_SIZEOF_INT          2
+#  elif (__LZO_LSR(UINT_MAX,31) == 1)
+#    define LZO_SIZEOF_INT          4
+#  elif (__LZO_LSR(UINT_MAX,63) == 1)
+#    define LZO_SIZEOF_INT          8
+#  elif (__LZO_LSR(UINT_MAX,127) == 1)
+#    define LZO_SIZEOF_INT          16
+#  else
+#    error "LZO_SIZEOF_INT"
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_LONG)
+#  if (ULONG_MAX == LZO_0xffffffffL)
+#    define LZO_SIZEOF_LONG         4
+#  elif (__LZO_LSR(ULONG_MAX,7) == 1)
+#    define LZO_SIZEOF_LONG         1
+#  elif (__LZO_LSR(ULONG_MAX,15) == 1)
+#    define LZO_SIZEOF_LONG         2
+#  elif (__LZO_LSR(ULONG_MAX,31) == 1)
+#    define LZO_SIZEOF_LONG         4
+#  elif (__LZO_LSR(ULONG_MAX,63) == 1)
+#    define LZO_SIZEOF_LONG         8
+#  elif (__LZO_LSR(ULONG_MAX,127) == 1)
+#    define LZO_SIZEOF_LONG         16
+#  else
+#    error "LZO_SIZEOF_LONG"
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64)
+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8)
+#  if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__)
+#    if (LZO_CC_GNUC >= 0x030300ul)
+#      if ((__LONG_MAX__)+0 == (__LONG_LONG_MAX__)+0)
+#        define LZO_SIZEOF_LONG_LONG      LZO_SIZEOF_LONG
+#      elif (__LZO_LSR(__LONG_LONG_MAX__,30) == 1)
+#        define LZO_SIZEOF_LONG_LONG      4
+#      endif
+#    endif
+#  endif
+#endif
+#endif
+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64)
+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8)
+#if (LZO_ARCH_I086 && LZO_CC_DMC)
+#elif (LZO_CC_CILLY) && defined(__GNUC__)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif ((LZO_OS_WIN32 || LZO_OS_WIN64 || defined(_WIN32)) && LZO_CC_MSC && (_MSC_VER >= 1400))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_OS_WIN64 || defined(_WIN64))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_ARCH_I386 && (LZO_CC_DMC))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_SYMANTECC && (__SC__ >= 0x700)))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__)))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC))
+#  define LZO_SIZEOF___INT64        8
+#elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520)))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100)))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && (_INTEGRAL_MAX_BITS == 64))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_CC_SDCC) && (LZO_SIZEOF_INT == 2)
+#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define LZO_SIZEOF_LONG_LONG      8
+#endif
+#endif
+#endif
+#if defined(__cplusplus) && defined(LZO_CC_GNUC)
+#  if (LZO_CC_GNUC < 0x020800ul)
+#    undef LZO_SIZEOF_LONG_LONG
+#  endif
+#endif
+#if defined(LZO_CFG_NO_LONG_LONG) || defined(__NO_LONG_LONG)
+#  undef LZO_SIZEOF_LONG_LONG
+#endif
+#if !defined(LZO_SIZEOF_VOID_P)
+#if (LZO_ARCH_I086)
+#  define __LZO_WORDSIZE            2
+#  if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM)
+#    define LZO_SIZEOF_VOID_P       2
+#  elif (LZO_MM_COMPACT || LZO_MM_LARGE || LZO_MM_HUGE)
+#    define LZO_SIZEOF_VOID_P       4
+#  else
+#    error "LZO_MM"
+#  endif
+#elif (LZO_ARCH_AVR || LZO_ARCH_Z80)
+#  define __LZO_WORDSIZE            1
+#  define LZO_SIZEOF_VOID_P         2
+#elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430)
+#  define LZO_SIZEOF_VOID_P         2
+#elif (LZO_ARCH_H8300)
+#  if defined(__NORMAL_MODE__)
+#    define __LZO_WORDSIZE          4
+#    define LZO_SIZEOF_VOID_P       2
+#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+#    define __LZO_WORDSIZE          4
+#    define LZO_SIZEOF_VOID_P       4
+#  else
+#    define __LZO_WORDSIZE          2
+#    define LZO_SIZEOF_VOID_P       2
+#  endif
+#  if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4)
+#    define LZO_SIZEOF_SIZE_T       LZO_SIZEOF_INT
+#    define LZO_SIZEOF_PTRDIFF_T    LZO_SIZEOF_INT
+#  endif
+#elif (LZO_ARCH_M16C)
+#  define __LZO_WORDSIZE            2
+#  if defined(__m32c_cpu__) || defined(__m32cm_cpu__)
+#    define LZO_SIZEOF_VOID_P       4
+#  else
+#    define LZO_SIZEOF_VOID_P       2
+#  endif
+#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__))
+#  define __LZO_WORDSIZE            8
+#  define LZO_SIZEOF_VOID_P         4
+#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64)
+#  define __LZO_WORDSIZE            8
+#  define LZO_SIZEOF_VOID_P         8
+#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__)
+#  define LZO_SIZEOF_VOID_P         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_LONG
+#elif (LZO_OS_OS400 || defined(__OS400__))
+#  define __LZO_WORDSIZE            LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_VOID_P         16
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_LONG
+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64)
+#  define LZO_SIZEOF_VOID_P         8
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_LONG
+#elif (LZO_ARCH_SPU)
+# if 0
+#  define __LZO_WORDSIZE            16
+# endif
+#  define LZO_SIZEOF_VOID_P         4
+#else
+#  define LZO_SIZEOF_VOID_P         LZO_SIZEOF_LONG
+#endif
+#endif
+#if !defined(LZO_WORDSIZE)
+#  if defined(__LZO_WORDSIZE)
+#    define LZO_WORDSIZE            __LZO_WORDSIZE
+#  else
+#    define LZO_WORDSIZE            LZO_SIZEOF_VOID_P
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_SIZE_T)
+#if (LZO_ARCH_I086 || LZO_ARCH_M16C)
+#  define LZO_SIZEOF_SIZE_T         2
+#else
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_VOID_P
+#endif
+#endif
+#if !defined(LZO_SIZEOF_PTRDIFF_T)
+#if (LZO_ARCH_I086)
+#  if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE)
+#    define LZO_SIZEOF_PTRDIFF_T    LZO_SIZEOF_VOID_P
+#  elif (LZO_MM_COMPACT || LZO_MM_LARGE)
+#    if (LZO_CC_BORLANDC || LZO_CC_TURBOC)
+#      define LZO_SIZEOF_PTRDIFF_T  4
+#    else
+#      define LZO_SIZEOF_PTRDIFF_T  2
+#    endif
+#  else
+#    error "LZO_MM"
+#  endif
+#else
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_SIZE_T
+#endif
+#endif
+#if defined(LZO_ABI_NEUTRAL_ENDIAN)
+#  undef LZO_ABI_BIG_ENDIAN
+#  undef LZO_ABI_LITTLE_ENDIAN
+#elif !defined(LZO_ABI_BIG_ENDIAN) && !defined(LZO_ABI_LITTLE_ENDIAN)
+#if (LZO_ARCH_ALPHA) && (LZO_ARCH_CRAY_MPP)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#elif (LZO_ARCH_M68K || LZO_ARCH_S390)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__)
+#  if (__LITTLE_ENDIAN__ == 1)
+#    define LZO_ABI_LITTLE_ENDIAN   1
+#  else
+#    define LZO_ABI_BIG_ENDIAN      1
+#  endif
+#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#endif
+#endif
+#if defined(LZO_ABI_BIG_ENDIAN) && defined(LZO_ABI_LITTLE_ENDIAN)
+#  error "this should not happen"
+#endif
+#if defined(LZO_ABI_BIG_ENDIAN)
+#  define LZO_INFO_ABI_ENDIAN       "be"
+#elif defined(LZO_ABI_LITTLE_ENDIAN)
+#  define LZO_INFO_ABI_ENDIAN       "le"
+#elif defined(LZO_ABI_NEUTRAL_ENDIAN)
+#  define LZO_INFO_ABI_ENDIAN       "neutral"
+#endif
+#if (LZO_SIZEOF_INT == 1 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2)
+#  define LZO_ABI_I8LP16         1
+#  define LZO_INFO_ABI_PM       "i8lp16"
+#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2)
+#  define LZO_ABI_ILP16         1
+#  define LZO_INFO_ABI_PM       "ilp16"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4)
+#  define LZO_ABI_ILP32         1
+#  define LZO_INFO_ABI_PM       "ilp32"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 8 && LZO_SIZEOF_SIZE_T == 8)
+#  define LZO_ABI_LLP64         1
+#  define LZO_INFO_ABI_PM       "llp64"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8)
+#  define LZO_ABI_LP64          1
+#  define LZO_INFO_ABI_PM       "lp64"
+#elif (LZO_SIZEOF_INT == 8 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8)
+#  define LZO_ABI_ILP64         1
+#  define LZO_INFO_ABI_PM       "ilp64"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 4)
+#  define LZO_ABI_IP32L64       1
+#  define LZO_INFO_ABI_PM       "ip32l64"
+#endif
+#if !defined(__LZO_LIBC_OVERRIDE)
+#if defined(LZO_LIBC_NAKED)
+#  define LZO_INFO_LIBC         "naked"
+#elif defined(LZO_LIBC_FREESTANDING)
+#  define LZO_INFO_LIBC         "freestanding"
+#elif defined(LZO_LIBC_MOSTLY_FREESTANDING)
+#  define LZO_INFO_LIBC         "mfreestanding"
+#elif defined(LZO_LIBC_ISOC90)
+#  define LZO_INFO_LIBC         "isoc90"
+#elif defined(LZO_LIBC_ISOC99)
+#  define LZO_INFO_LIBC         "isoc99"
+#elif defined(__dietlibc__)
+#  define LZO_LIBC_DIETLIBC     1
+#  define LZO_INFO_LIBC         "dietlibc"
+#elif defined(_NEWLIB_VERSION)
+#  define LZO_LIBC_NEWLIB       1
+#  define LZO_INFO_LIBC         "newlib"
+#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__)
+#  if defined(__UCLIBC_SUBLEVEL__)
+#    define LZO_LIBC_UCLIBC     (__UCLIBC_MAJOR__ * 0x10000L + __UCLIBC_MINOR__ * 0x100 + __UCLIBC_SUBLEVEL__)
+#  else
+#    define LZO_LIBC_UCLIBC     0x00090bL
+#  endif
+#  define LZO_INFO_LIBC         "uclibc"
+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#  define LZO_LIBC_GLIBC        (__GLIBC__ * 0x10000L + __GLIBC_MINOR__ * 0x100)
+#  define LZO_INFO_LIBC         "glibc"
+#elif (LZO_CC_MWERKS) && defined(__MSL__)
+#  define LZO_LIBC_MSL          __MSL__
+#  define LZO_INFO_LIBC         "msl"
+#elif 1 && defined(__IAR_SYSTEMS_ICC__)
+#  define LZO_LIBC_ISOC90       1
+#  define LZO_INFO_LIBC         "isoc90"
+#else
+#  define LZO_LIBC_DEFAULT      1
+#  define LZO_INFO_LIBC         "default"
+#endif
+#endif
+#if !defined(__lzo_gnuc_extension__)
+#if (LZO_CC_GNUC >= 0x020800ul)
+#  define __lzo_gnuc_extension__    __extension__
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_gnuc_extension__    __extension__
+#else
+#  define __lzo_gnuc_extension__
+#endif
+#endif
+#if !defined(__lzo_ua_volatile)
+#  define __lzo_ua_volatile     volatile
+#endif
+#if !defined(__lzo_alignof)
+#if (LZO_CC_CILLY || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI)
+#  define __lzo_alignof(e)      __alignof__(e)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 700))
+#  define __lzo_alignof(e)      __alignof__(e)
+#elif (LZO_CC_MSC && (_MSC_VER >= 1300))
+#  define __lzo_alignof(e)      __alignof(e)
+#endif
+#endif
+#if defined(__lzo_alignof)
+#  define __lzo_HAVE_alignof 1
+#endif
+#if !defined(__lzo_constructor)
+#if (LZO_CC_GNUC >= 0x030400ul)
+#  define __lzo_constructor     __attribute__((__constructor__,__used__))
+#elif (LZO_CC_GNUC >= 0x020700ul)
+#  define __lzo_constructor     __attribute__((__constructor__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_constructor     __attribute__((__constructor__))
+#endif
+#endif
+#if defined(__lzo_constructor)
+#  define __lzo_HAVE_constructor 1
+#endif
+#if !defined(__lzo_destructor)
+#if (LZO_CC_GNUC >= 0x030400ul)
+#  define __lzo_destructor      __attribute__((__destructor__,__used__))
+#elif (LZO_CC_GNUC >= 0x020700ul)
+#  define __lzo_destructor      __attribute__((__destructor__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_destructor      __attribute__((__destructor__))
+#endif
+#endif
+#if defined(__lzo_destructor)
+#  define __lzo_HAVE_destructor 1
+#endif
+#if defined(__lzo_HAVE_destructor) && !defined(__lzo_HAVE_constructor)
+#  error "this should not happen"
+#endif
+#if !defined(__lzo_inline)
+#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295))
+#elif defined(__cplusplus)
+#  define __lzo_inline          inline
+#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550))
+#  define __lzo_inline          __inline
+#elif (LZO_CC_CILLY || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI)
+#  define __lzo_inline          __inline__
+#elif (LZO_CC_DMC)
+#  define __lzo_inline          __inline
+#elif (LZO_CC_INTELC)
+#  define __lzo_inline          __inline
+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405))
+#  define __lzo_inline          __inline
+#elif (LZO_CC_MSC && (_MSC_VER >= 900))
+#  define __lzo_inline          __inline
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define __lzo_inline          inline
+#endif
+#endif
+#if defined(__lzo_inline)
+#  define __lzo_HAVE_inline 1
+#else
+#  define __lzo_inline
+#endif
+#if !defined(__lzo_forceinline)
+#if (LZO_CC_GNUC >= 0x030200ul)
+#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 450) && LZO_CC_SYNTAX_MSC)
+#  define __lzo_forceinline     __forceinline
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1200))
+#  define __lzo_forceinline     __forceinline
+#endif
+#endif
+#if defined(__lzo_forceinline)
+#  define __lzo_HAVE_forceinline 1
+#else
+#  define __lzo_forceinline
+#endif
+#if !defined(__lzo_noinline)
+#if 1 && (LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul)
+#  define __lzo_noinline        __attribute__((__noinline__,__used__))
+#elif (LZO_CC_GNUC >= 0x030200ul)
+#  define __lzo_noinline        __attribute__((__noinline__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 600) && LZO_CC_SYNTAX_MSC)
+#  define __lzo_noinline        __declspec(noinline)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_noinline        __attribute__((__noinline__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_noinline        __attribute__((__noinline__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1300))
+#  define __lzo_noinline        __declspec(noinline)
+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64))
+#  if defined(__cplusplus)
+#  else
+#    define __lzo_noinline      __declspec(noinline)
+#  endif
+#endif
+#endif
+#if defined(__lzo_noinline)
+#  define __lzo_HAVE_noinline 1
+#else
+#  define __lzo_noinline
+#endif
+#if (defined(__lzo_HAVE_forceinline) || defined(__lzo_HAVE_noinline)) && !defined(__lzo_HAVE_inline)
+#  error "this should not happen"
+#endif
+#if !defined(__lzo_noreturn)
+#if (LZO_CC_GNUC >= 0x020700ul)
+#  define __lzo_noreturn        __attribute__((__noreturn__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 450) && LZO_CC_SYNTAX_MSC)
+#  define __lzo_noreturn        __declspec(noreturn)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 600) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_noreturn        __attribute__((__noreturn__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_noreturn        __attribute__((__noreturn__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1200))
+#  define __lzo_noreturn        __declspec(noreturn)
+#endif
+#endif
+#if defined(__lzo_noreturn)
+#  define __lzo_HAVE_noreturn 1
+#else
+#  define __lzo_noreturn
+#endif
+#if !defined(__lzo_nothrow)
+#if (LZO_CC_GNUC >= 0x030300ul)
+#  define __lzo_nothrow         __attribute__((__nothrow__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 450) && LZO_CC_SYNTAX_MSC) && defined(__cplusplus)
+#  define __lzo_nothrow         __declspec(nothrow)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_nothrow         __attribute__((__nothrow__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_nothrow         __attribute__((__nothrow__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus)
+#  define __lzo_nothrow         __declspec(nothrow)
+#endif
+#endif
+#if defined(__lzo_nothrow)
+#  define __lzo_HAVE_nothrow 1
+#else
+#  define __lzo_nothrow
+#endif
+#if !defined(__lzo_restrict)
+#if (LZO_CC_GNUC >= 0x030400ul)
+#  define __lzo_restrict        __restrict__
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 600) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_restrict        __restrict__
+#elif (LZO_CC_LLVM)
+#  define __lzo_restrict        __restrict__
+#elif (LZO_CC_MSC && (_MSC_VER >= 1400))
+#  define __lzo_restrict        __restrict
+#endif
+#endif
+#if defined(__lzo_restrict)
+#  define __lzo_HAVE_restrict 1
+#else
+#  define __lzo_restrict
+#endif
+#if !defined(__lzo_likely) && !defined(__lzo_unlikely)
+#if (LZO_CC_GNUC >= 0x030200ul)
+#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
+#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800))
+#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
+#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
+#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#endif
+#endif
+#if defined(__lzo_likely)
+#  define __lzo_HAVE_likely 1
+#else
+#  define __lzo_likely(e)       (e)
+#endif
+#if defined(__lzo_unlikely)
+#  define __lzo_HAVE_unlikely 1
+#else
+#  define __lzo_unlikely(e)     (e)
+#endif
+#if !defined(LZO_UNUSED)
+#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
+#    define LZO_UNUSED(var)         ((void) &var)
+#  elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC)
+#    define LZO_UNUSED(var)         if (&var) ; else
+#  elif (LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#    define LZO_UNUSED(var)         ((void) var)
+#  elif (LZO_CC_MSC && (_MSC_VER < 900))
+#    define LZO_UNUSED(var)         if (&var) ; else
+#  elif (LZO_CC_KEILC)
+#    define LZO_UNUSED(var)         {extern int __lzo_unused[1-2*!(sizeof(var)>0)];}
+#  elif (LZO_CC_PACIFICC)
+#    define LZO_UNUSED(var)         ((void) sizeof(var))
+#  elif (LZO_CC_WATCOMC) && defined(__cplusplus)
+#    define LZO_UNUSED(var)         ((void) var)
+#  else
+#    define LZO_UNUSED(var)         ((void) &var)
+#  endif
+#endif
+#if !defined(LZO_UNUSED_FUNC)
+#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
+#    define LZO_UNUSED_FUNC(func)   ((void) func)
+#  elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC)
+#    define LZO_UNUSED_FUNC(func)   if (func) ; else
+#  elif (LZO_CC_LLVM)
+#    define LZO_UNUSED_FUNC(func)   ((void) &func)
+#  elif (LZO_CC_MSC && (_MSC_VER < 900))
+#    define LZO_UNUSED_FUNC(func)   if (func) ; else
+#  elif (LZO_CC_MSC)
+#    define LZO_UNUSED_FUNC(func)   ((void) &func)
+#  elif (LZO_CC_KEILC || LZO_CC_PELLESC)
+#    define LZO_UNUSED_FUNC(func)   {extern int __lzo_unused[1-2*!(sizeof((int)func)>0)];}
+#  else
+#    define LZO_UNUSED_FUNC(func)   ((void) func)
+#  endif
+#endif
+#if !defined(LZO_UNUSED_LABEL)
+#  if (LZO_CC_WATCOMC) && defined(__cplusplus)
+#    define LZO_UNUSED_LABEL(l)     switch(0) case 1:goto l
+#  elif (LZO_CC_INTELC || LZO_CC_WATCOMC)
+#    define LZO_UNUSED_LABEL(l)     if (0) goto l
+#  else
+#    define LZO_UNUSED_LABEL(l)     switch(0) case 1:goto l
+#  endif
+#endif
+#if !defined(LZO_DEFINE_UNINITIALIZED_VAR)
+#  if 0
+#    define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var
+#  elif 0 && (LZO_CC_GNUC)
+#    define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = var
+#  else
+#    define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = init
+#  endif
+#endif
+#if !defined(LZO_COMPILE_TIME_ASSERT_HEADER)
+#  if (LZO_CC_AZTECC || LZO_CC_ZORTECHC)
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1-!(e)];
+#  elif (LZO_CC_DMC || LZO_CC_SYMANTECC)
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1u-2*!(e)];
+#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1-!(e)];
+#  else
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1-2*!(e)];
+#  endif
+#endif
+#if !defined(LZO_COMPILE_TIME_ASSERT)
+#  if (LZO_CC_AZTECC)
+#    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __lzo_cta_t[1-!(e)];}
+#  elif (LZO_CC_DMC || LZO_CC_PACIFICC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  elif (LZO_CC_MSC && (_MSC_VER < 900))
+#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  else
+#    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __lzo_cta_t[1-2*!(e)];}
+#  endif
+#endif
+#if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64)
+#  if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC)
+#  elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+#    define __lzo_cdecl                 __cdecl
+#    define __lzo_cdecl_atexit
+#    define __lzo_cdecl_main            __cdecl
+#    if (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC))
+#      define __lzo_cdecl_qsort         __pascal
+#    elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC))
+#      define __lzo_cdecl_qsort         _stdcall
+#    else
+#      define __lzo_cdecl_qsort         __cdecl
+#    endif
+#  elif (LZO_CC_WATCOMC)
+#    define __lzo_cdecl                 __cdecl
+#  else
+#    define __lzo_cdecl                 __cdecl
+#    define __lzo_cdecl_atexit          __cdecl
+#    define __lzo_cdecl_main            __cdecl
+#    define __lzo_cdecl_qsort           __cdecl
+#  endif
+#  if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC || LZO_CC_WATCOMC)
+#  elif (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC))
+#    define __lzo_cdecl_sighandler      __pascal
+#  elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC))
+#    define __lzo_cdecl_sighandler      _stdcall
+#  elif (LZO_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE)
+#    define __lzo_cdecl_sighandler      __clrcall
+#  elif (LZO_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700))
+#    if defined(_DLL)
+#      define __lzo_cdecl_sighandler    _far _cdecl _loadds
+#    elif defined(_MT)
+#      define __lzo_cdecl_sighandler    _far _cdecl
+#    else
+#      define __lzo_cdecl_sighandler    _cdecl
+#    endif
+#  else
+#    define __lzo_cdecl_sighandler      __cdecl
+#  endif
+#elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC)
+#  define __lzo_cdecl                   __cdecl
+#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC))
+#  define __lzo_cdecl                   cdecl
+#endif
+#if !defined(__lzo_cdecl)
+#  define __lzo_cdecl
+#endif
+#if !defined(__lzo_cdecl_atexit)
+#  define __lzo_cdecl_atexit
+#endif
+#if !defined(__lzo_cdecl_main)
+#  define __lzo_cdecl_main
+#endif
+#if !defined(__lzo_cdecl_qsort)
+#  define __lzo_cdecl_qsort
+#endif
+#if !defined(__lzo_cdecl_sighandler)
+#  define __lzo_cdecl_sighandler
+#endif
+#if !defined(__lzo_cdecl_va)
+#  define __lzo_cdecl_va                __lzo_cdecl
+#endif
+#if !defined(LZO_CFG_NO_WINDOWS_H)
+#if (LZO_OS_CYGWIN || (LZO_OS_EMX && defined(__RSXNT__)) || LZO_OS_WIN32 || LZO_OS_WIN64)
+#  if (LZO_CC_WATCOMC && (__WATCOMC__ < 1000))
+#  elif (LZO_OS_WIN32 && LZO_CC_GNUC) && defined(__PW32__)
+#  elif ((LZO_OS_CYGWIN || defined(__MINGW32__)) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x025f00ul)))
+#  else
+#    define LZO_HAVE_WINDOWS_H 1
+#  endif
+#endif
+#endif
+#if (LZO_ARCH_ALPHA)
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#  define LZO_OPT_AVOID_SHORT       1
+#  define LZO_OPT_AVOID_USHORT      1
+#elif (LZO_ARCH_AMD64)
+#  define LZO_OPT_AVOID_INT_INDEX   1
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#  define LZO_OPT_UNALIGNED64       1
+#elif (LZO_ARCH_ARM && LZO_ARCH_ARM_THUMB)
+#elif (LZO_ARCH_ARM)
+#  define LZO_OPT_AVOID_SHORT       1
+#  define LZO_OPT_AVOID_USHORT      1
+#elif (LZO_ARCH_CRIS)
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#elif (LZO_ARCH_I386)
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#elif (LZO_ARCH_IA64)
+#  define LZO_OPT_AVOID_INT_INDEX   1
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#  define LZO_OPT_PREFER_POSTINC    1
+#elif (LZO_ARCH_M68K)
+#  define LZO_OPT_PREFER_POSTINC    1
+#  define LZO_OPT_PREFER_PREDEC     1
+#  if defined(__mc68020__) && !defined(__mcoldfire__)
+#    define LZO_OPT_UNALIGNED16     1
+#    define LZO_OPT_UNALIGNED32     1
+#  endif
+#elif (LZO_ARCH_MIPS)
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#elif (LZO_ARCH_POWERPC)
+#  define LZO_OPT_PREFER_PREINC     1
+#  define LZO_OPT_PREFER_PREDEC     1
+#  if defined(LZO_ABI_BIG_ENDIAN)
+#    define LZO_OPT_UNALIGNED16     1
+#    define LZO_OPT_UNALIGNED32     1
+#  endif
+#elif (LZO_ARCH_S390)
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#  if (LZO_SIZEOF_SIZE_T == 8)
+#    define LZO_OPT_UNALIGNED64     1
+#  endif
+#elif (LZO_ARCH_SH)
+#  define LZO_OPT_PREFER_POSTINC    1
+#  define LZO_OPT_PREFER_PREDEC     1
+#endif
+#if !defined(LZO_CFG_NO_INLINE_ASM)
+#if defined(LZO_CC_LLVM)
+#  define LZO_CFG_NO_INLINE_ASM 1
+#endif
+#endif
+#if !defined(LZO_CFG_NO_UNALIGNED)
+#if defined(LZO_ABI_NEUTRAL_ENDIAN) || defined(LZO_ARCH_GENERIC)
+#  define LZO_CFG_NO_UNALIGNED 1
+#endif
+#endif
+#if defined(LZO_CFG_NO_UNALIGNED)
+#  undef LZO_OPT_UNALIGNED16
+#  undef LZO_OPT_UNALIGNED32
+#  undef LZO_OPT_UNALIGNED64
+#endif
+#if defined(LZO_CFG_NO_INLINE_ASM)
+#elif (LZO_ARCH_I386 && (LZO_OS_DOS32 || LZO_OS_WIN32) && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC))
+#  define LZO_ASM_SYNTAX_MSC 1
+#elif (LZO_OS_WIN64 && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC))
+#elif (LZO_ARCH_I386 && (LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE))
+#  define LZO_ASM_SYNTAX_GNUC 1
+#elif (LZO_ARCH_AMD64 && (LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE))
+#  define LZO_ASM_SYNTAX_GNUC 1
+#endif
+#if (LZO_ASM_SYNTAX_GNUC)
+#if (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul))
+#  define __LZO_ASM_CLOBBER         "ax"
+#elif (LZO_CC_INTELC)
+#  define __LZO_ASM_CLOBBER         "memory"
+#else
+#  define __LZO_ASM_CLOBBER         "cc", "memory"
+#endif
+#endif
+#if defined(__LZO_INFOSTR_MM)
+#elif (LZO_MM_FLAT) && (defined(__LZO_INFOSTR_PM) || defined(LZO_INFO_ABI_PM))
+#  define __LZO_INFOSTR_MM          ""
+#elif defined(LZO_INFO_MM)
+#  define __LZO_INFOSTR_MM          "." LZO_INFO_MM
+#else
+#  define __LZO_INFOSTR_MM          ""
+#endif
+#if defined(__LZO_INFOSTR_PM)
+#elif defined(LZO_INFO_ABI_PM)
+#  define __LZO_INFOSTR_PM          "." LZO_INFO_ABI_PM
+#else
+#  define __LZO_INFOSTR_PM          ""
+#endif
+#if defined(__LZO_INFOSTR_ENDIAN)
+#elif defined(LZO_INFO_ABI_ENDIAN)
+#  define __LZO_INFOSTR_ENDIAN      "." LZO_INFO_ABI_ENDIAN
+#else
+#  define __LZO_INFOSTR_ENDIAN      ""
+#endif
+#if defined(__LZO_INFOSTR_OSNAME)
+#elif defined(LZO_INFO_OS_CONSOLE)
+#  define __LZO_INFOSTR_OSNAME      LZO_INFO_OS "." LZO_INFO_OS_CONSOLE
+#elif defined(LZO_INFO_OS_POSIX)
+#  define __LZO_INFOSTR_OSNAME      LZO_INFO_OS "." LZO_INFO_OS_POSIX
+#else
+#  define __LZO_INFOSTR_OSNAME      LZO_INFO_OS
+#endif
+#if defined(__LZO_INFOSTR_LIBC)
+#elif defined(LZO_INFO_LIBC)
+#  define __LZO_INFOSTR_LIBC        "." LZO_INFO_LIBC
+#else
+#  define __LZO_INFOSTR_LIBC        ""
+#endif
+#if defined(__LZO_INFOSTR_CCVER)
+#elif defined(LZO_INFO_CCVER)
+#  define __LZO_INFOSTR_CCVER       " " LZO_INFO_CCVER
+#else
+#  define __LZO_INFOSTR_CCVER       ""
+#endif
+#define LZO_INFO_STRING \
+    LZO_INFO_ARCH __LZO_INFOSTR_MM __LZO_INFOSTR_PM __LZO_INFOSTR_ENDIAN \
+    " " __LZO_INFOSTR_OSNAME __LZO_INFOSTR_LIBC " " LZO_INFO_CC __LZO_INFOSTR_CCVER
+
+#endif /* already included */
+
+/* vim:set ts=4 et: */
diff --git a/extern/lzo/minilzo/minilzo.c b/extern/lzo/minilzo/minilzo.c
new file mode 100644
index 00000000000..6a62b31b94a
--- /dev/null
+++ b/extern/lzo/minilzo/minilzo.c
@@ -0,0 +1,4112 @@
+/* minilzo.c -- mini subset of the LZO real-time data compression library
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The LZO library 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 LZO library 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 the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/lzo/
+ */
+
+/*
+ * NOTE:
+ *   the full LZO package can be found at
+ *   http://www.oberhumer.com/opensource/lzo/
+ */
+
+#define __LZO_IN_MINILZO
+#define LZO_BUILD
+
+#if defined(LZO_CFG_FREESTANDING)
+#  undef MINILZO_HAVE_CONFIG_H
+#  define LZO_LIBC_FREESTANDING 1
+#  define LZO_OS_FREESTANDING 1
+#endif
+
+#ifdef MINILZO_HAVE_CONFIG_H
+#  include <config.h>
+#endif
+#include <limits.h>
+#include <stddef.h>
+#if defined(MINILZO_CFG_USE_INTERNAL_LZODEFS)
+
+#ifndef __LZODEFS_H_INCLUDED
+#define __LZODEFS_H_INCLUDED 1
+
+#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
+#  define __CYGWIN__ __CYGWIN32__
+#endif
+#if defined(__IBMCPP__) && !defined(__IBMC__)
+#  define __IBMC__ __IBMCPP__
+#endif
+#if defined(__ICL) && defined(_WIN32) && !defined(__INTEL_COMPILER)
+#  define __INTEL_COMPILER __ICL
+#endif
+#if 1 && defined(__INTERIX) && defined(__GNUC__) && !defined(_ALL_SOURCE)
+#  define _ALL_SOURCE 1
+#endif
+#if defined(__mips__) && defined(__R5900__)
+#  if !defined(__LONG_MAX__)
+#    define __LONG_MAX__ 9223372036854775807L
+#  endif
+#endif
+#if defined(__INTEL_COMPILER) && defined(__linux__)
+#  pragma warning(disable: 193)
+#endif
+#if defined(__KEIL__) && defined(__C166__)
+#  pragma warning disable = 322
+#elif 0 && defined(__C251__)
+#  pragma warning disable = 322
+#endif
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
+#  if (_MSC_VER >= 1300)
+#    pragma warning(disable: 4668)
+#  endif
+#endif
+#if 0 && defined(__WATCOMC__)
+#  if (__WATCOMC__ >= 1050) && (__WATCOMC__ < 1060)
+#    pragma warning 203 9
+#  endif
+#endif
+#if defined(__BORLANDC__) && defined(__MSDOS__) && !defined(__FLAT__)
+#  pragma option -h
+#endif
+#if 0
+#define LZO_0xffffL             0xfffful
+#define LZO_0xffffffffL         0xfffffffful
+#else
+#define LZO_0xffffL             65535ul
+#define LZO_0xffffffffL         4294967295ul
+#endif
+#if (LZO_0xffffL == LZO_0xffffffffL)
+#  error "your preprocessor is broken 1"
+#endif
+#if (16ul * 16384ul != 262144ul)
+#  error "your preprocessor is broken 2"
+#endif
+#if 0
+#if (32767 >= 4294967295ul)
+#  error "your preprocessor is broken 3"
+#endif
+#if (65535u >= 4294967295ul)
+#  error "your preprocessor is broken 4"
+#endif
+#endif
+#if (UINT_MAX == LZO_0xffffL)
+#if defined(__ZTC__) && defined(__I86__) && !defined(__OS2__)
+#  if !defined(MSDOS)
+#    define MSDOS 1
+#  endif
+#  if !defined(_MSDOS)
+#    define _MSDOS 1
+#  endif
+#elif 0 && defined(__VERSION) && defined(MB_LEN_MAX)
+#  if (__VERSION == 520) && (MB_LEN_MAX == 1)
+#    if !defined(__AZTEC_C__)
+#      define __AZTEC_C__ __VERSION
+#    endif
+#    if !defined(__DOS__)
+#      define __DOS__ 1
+#    endif
+#  endif
+#endif
+#endif
+#if defined(_MSC_VER) && defined(M_I86HM) && (UINT_MAX == LZO_0xffffL)
+#  define ptrdiff_t long
+#  define _PTRDIFF_T_DEFINED
+#endif
+#if (UINT_MAX == LZO_0xffffL)
+#  undef __LZO_RENAME_A
+#  undef __LZO_RENAME_B
+#  if defined(__AZTEC_C__) && defined(__DOS__)
+#    define __LZO_RENAME_A 1
+#  elif defined(_MSC_VER) && defined(MSDOS)
+#    if (_MSC_VER < 600)
+#      define __LZO_RENAME_A 1
+#    elif (_MSC_VER < 700)
+#      define __LZO_RENAME_B 1
+#    endif
+#  elif defined(__TSC__) && defined(__OS2__)
+#    define __LZO_RENAME_A 1
+#  elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)
+#    define __LZO_RENAME_A 1
+#  elif defined(__PACIFIC__) && defined(DOS)
+#    if !defined(__far)
+#      define __far far
+#    endif
+#    if !defined(__near)
+#      define __near near
+#    endif
+#  endif
+#  if defined(__LZO_RENAME_A)
+#    if !defined(__cdecl)
+#      define __cdecl cdecl
+#    endif
+#    if !defined(__far)
+#      define __far far
+#    endif
+#    if !defined(__huge)
+#      define __huge huge
+#    endif
+#    if !defined(__near)
+#      define __near near
+#    endif
+#    if !defined(__pascal)
+#      define __pascal pascal
+#    endif
+#    if !defined(__huge)
+#      define __huge huge
+#    endif
+#  elif defined(__LZO_RENAME_B)
+#    if !defined(__cdecl)
+#      define __cdecl _cdecl
+#    endif
+#    if !defined(__far)
+#      define __far _far
+#    endif
+#    if !defined(__huge)
+#      define __huge _huge
+#    endif
+#    if !defined(__near)
+#      define __near _near
+#    endif
+#    if !defined(__pascal)
+#      define __pascal _pascal
+#    endif
+#  elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#    if !defined(__cdecl)
+#      define __cdecl cdecl
+#    endif
+#    if !defined(__pascal)
+#      define __pascal pascal
+#    endif
+#  endif
+#  undef __LZO_RENAME_A
+#  undef __LZO_RENAME_B
+#endif
+#if (UINT_MAX == LZO_0xffffL)
+#if defined(__AZTEC_C__) && defined(__DOS__)
+#  define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#elif defined(_MSC_VER) && defined(MSDOS)
+#  if (_MSC_VER < 600)
+#    define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#  endif
+#  if (_MSC_VER < 700)
+#    define LZO_BROKEN_INTEGRAL_PROMOTION 1
+#    define LZO_BROKEN_SIZEOF 1
+#  endif
+#elif defined(__PACIFIC__) && defined(DOS)
+#  define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#elif defined(__TURBOC__) && defined(__MSDOS__)
+#  if (__TURBOC__ < 0x0150)
+#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#    define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#    define LZO_BROKEN_INTEGRAL_PROMOTION 1
+#  endif
+#  if (__TURBOC__ < 0x0200)
+#    define LZO_BROKEN_SIZEOF 1
+#  endif
+#  if (__TURBOC__ < 0x0400) && defined(__cplusplus)
+#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#  endif
+#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#  define LZO_BROKEN_CDECL_ALT_SYNTAX 1
+#  define LZO_BROKEN_SIZEOF 1
+#endif
+#endif
+#if defined(__WATCOMC__) && (__WATCOMC__ < 900)
+#  define LZO_BROKEN_INTEGRAL_CONSTANTS 1
+#endif
+#if defined(_CRAY) && defined(_CRAY1)
+#  define LZO_BROKEN_SIGNED_RIGHT_SHIFT 1
+#endif
+#define LZO_PP_STRINGIZE(x)             #x
+#define LZO_PP_MACRO_EXPAND(x)          LZO_PP_STRINGIZE(x)
+#define LZO_PP_CONCAT2(a,b)             a ## b
+#define LZO_PP_CONCAT3(a,b,c)           a ## b ## c
+#define LZO_PP_CONCAT4(a,b,c,d)         a ## b ## c ## d
+#define LZO_PP_CONCAT5(a,b,c,d,e)       a ## b ## c ## d ## e
+#define LZO_PP_ECONCAT2(a,b)            LZO_PP_CONCAT2(a,b)
+#define LZO_PP_ECONCAT3(a,b,c)          LZO_PP_CONCAT3(a,b,c)
+#define LZO_PP_ECONCAT4(a,b,c,d)        LZO_PP_CONCAT4(a,b,c,d)
+#define LZO_PP_ECONCAT5(a,b,c,d,e)      LZO_PP_CONCAT5(a,b,c,d,e)
+#if 1
+#define LZO_CPP_STRINGIZE(x)            #x
+#define LZO_CPP_MACRO_EXPAND(x)         LZO_CPP_STRINGIZE(x)
+#define LZO_CPP_CONCAT2(a,b)            a ## b
+#define LZO_CPP_CONCAT3(a,b,c)          a ## b ## c
+#define LZO_CPP_CONCAT4(a,b,c,d)        a ## b ## c ## d
+#define LZO_CPP_CONCAT5(a,b,c,d,e)      a ## b ## c ## d ## e
+#define LZO_CPP_ECONCAT2(a,b)           LZO_CPP_CONCAT2(a,b)
+#define LZO_CPP_ECONCAT3(a,b,c)         LZO_CPP_CONCAT3(a,b,c)
+#define LZO_CPP_ECONCAT4(a,b,c,d)       LZO_CPP_CONCAT4(a,b,c,d)
+#define LZO_CPP_ECONCAT5(a,b,c,d,e)     LZO_CPP_CONCAT5(a,b,c,d,e)
+#endif
+#define __LZO_MASK_GEN(o,b)     (((((o) << ((b)-1)) - (o)) << 1) + (o))
+#if 1 && defined(__cplusplus)
+#  if !defined(__STDC_CONSTANT_MACROS)
+#    define __STDC_CONSTANT_MACROS 1
+#  endif
+#  if !defined(__STDC_LIMIT_MACROS)
+#    define __STDC_LIMIT_MACROS 1
+#  endif
+#endif
+#if defined(__cplusplus)
+#  define LZO_EXTERN_C extern "C"
+#else
+#  define LZO_EXTERN_C extern
+#endif
+#if !defined(__LZO_OS_OVERRIDE)
+#if defined(LZO_OS_FREESTANDING)
+#  define LZO_INFO_OS           "freestanding"
+#elif defined(LZO_OS_EMBEDDED)
+#  define LZO_INFO_OS           "embedded"
+#elif 1 && defined(__IAR_SYSTEMS_ICC__)
+#  define LZO_OS_EMBEDDED       1
+#  define LZO_INFO_OS           "embedded"
+#elif defined(__CYGWIN__) && defined(__GNUC__)
+#  define LZO_OS_CYGWIN         1
+#  define LZO_INFO_OS           "cygwin"
+#elif defined(__EMX__) && defined(__GNUC__)
+#  define LZO_OS_EMX            1
+#  define LZO_INFO_OS           "emx"
+#elif defined(__BEOS__)
+#  define LZO_OS_BEOS           1
+#  define LZO_INFO_OS           "beos"
+#elif defined(__Lynx__)
+#  define LZO_OS_LYNXOS         1
+#  define LZO_INFO_OS           "lynxos"
+#elif defined(__OS400__)
+#  define LZO_OS_OS400          1
+#  define LZO_INFO_OS           "os400"
+#elif defined(__QNX__)
+#  define LZO_OS_QNX            1
+#  define LZO_INFO_OS           "qnx"
+#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
+#  define LZO_OS_DOS32          1
+#  define LZO_INFO_OS           "dos32"
+#elif defined(__BORLANDC__) && defined(__DPMI16__)
+#  define LZO_OS_DOS16          1
+#  define LZO_INFO_OS           "dos16"
+#elif defined(__ZTC__) && defined(DOS386)
+#  define LZO_OS_DOS32          1
+#  define LZO_INFO_OS           "dos32"
+#elif defined(__OS2__) || defined(__OS2V2__)
+#  if (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_OS216        1
+#    define LZO_INFO_OS         "os216"
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_OS_OS2          1
+#    define LZO_INFO_OS         "os2"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64)
+#  define LZO_OS_WIN64          1
+#  define LZO_INFO_OS           "win64"
+#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
+#  define LZO_OS_WIN32          1
+#  define LZO_INFO_OS           "win32"
+#elif defined(__MWERKS__) && defined(__INTEL__)
+#  define LZO_OS_WIN32          1
+#  define LZO_INFO_OS           "win32"
+#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
+#  if (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_WIN16        1
+#    define LZO_INFO_OS         "win16"
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_OS_WIN32        1
+#    define LZO_INFO_OS         "win32"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__DOS__) || defined(__MSDOS__) || defined(_MSDOS) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
+#  if (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_DOS16        1
+#    define LZO_INFO_OS         "dos16"
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_OS_DOS32        1
+#    define LZO_INFO_OS         "dos32"
+#  else
+#    error "check your limits.h header"
+#  endif
+#elif defined(__WATCOMC__)
+#  if defined(__NT__) && (UINT_MAX == LZO_0xffffL)
+#    define LZO_OS_DOS16        1
+#    define LZO_INFO_OS         "dos16"
+#  elif defined(__NT__) && (__WATCOMC__ < 1100)
+#    define LZO_OS_WIN32        1
+#    define LZO_INFO_OS         "win32"
+#  elif defined(__linux__) || defined(__LINUX__)
+#    define LZO_OS_POSIX        1
+#    define LZO_INFO_OS         "posix"
+#  else
+#    error "please specify a target using the -bt compiler option"
+#  endif
+#elif defined(__palmos__)
+#  define LZO_OS_PALMOS         1
+#  define LZO_INFO_OS           "palmos"
+#elif defined(__TOS__) || defined(__atarist__)
+#  define LZO_OS_TOS            1
+#  define LZO_INFO_OS           "tos"
+#elif defined(macintosh) && !defined(__ppc__)
+#  define LZO_OS_MACCLASSIC     1
+#  define LZO_INFO_OS           "macclassic"
+#elif defined(__VMS)
+#  define LZO_OS_VMS            1
+#  define LZO_INFO_OS           "vms"
+#elif ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__))
+#  define LZO_OS_CONSOLE        1
+#  define LZO_OS_CONSOLE_PS2    1
+#  define LZO_INFO_OS           "console"
+#  define LZO_INFO_OS_CONSOLE   "ps2"
+#elif (defined(__mips__) && defined(__psp__))
+#  define LZO_OS_CONSOLE        1
+#  define LZO_OS_CONSOLE_PSP    1
+#  define LZO_INFO_OS           "console"
+#  define LZO_INFO_OS_CONSOLE   "psp"
+#else
+#  define LZO_OS_POSIX          1
+#  define LZO_INFO_OS           "posix"
+#endif
+#if (LZO_OS_POSIX)
+#  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
+#    define LZO_OS_POSIX_AIX        1
+#    define LZO_INFO_OS_POSIX       "aix"
+#  elif defined(__FreeBSD__)
+#    define LZO_OS_POSIX_FREEBSD    1
+#    define LZO_INFO_OS_POSIX       "freebsd"
+#  elif defined(__hpux__) || defined(__hpux)
+#    define LZO_OS_POSIX_HPUX       1
+#    define LZO_INFO_OS_POSIX       "hpux"
+#  elif defined(__INTERIX)
+#    define LZO_OS_POSIX_INTERIX    1
+#    define LZO_INFO_OS_POSIX       "interix"
+#  elif defined(__IRIX__) || defined(__irix__)
+#    define LZO_OS_POSIX_IRIX       1
+#    define LZO_INFO_OS_POSIX       "irix"
+#  elif defined(__linux__) || defined(__linux) || defined(__LINUX__)
+#    define LZO_OS_POSIX_LINUX      1
+#    define LZO_INFO_OS_POSIX       "linux"
+#  elif defined(__APPLE__) || defined(__MACOS__)
+#    define LZO_OS_POSIX_MACOSX     1
+#    define LZO_INFO_OS_POSIX       "macosx"
+#  elif defined(__minix__) || defined(__minix)
+#    define LZO_OS_POSIX_MINIX      1
+#    define LZO_INFO_OS_POSIX       "minix"
+#  elif defined(__NetBSD__)
+#    define LZO_OS_POSIX_NETBSD     1
+#    define LZO_INFO_OS_POSIX       "netbsd"
+#  elif defined(__OpenBSD__)
+#    define LZO_OS_POSIX_OPENBSD    1
+#    define LZO_INFO_OS_POSIX       "openbsd"
+#  elif defined(__osf__)
+#    define LZO_OS_POSIX_OSF        1
+#    define LZO_INFO_OS_POSIX       "osf"
+#  elif defined(__solaris__) || defined(__sun)
+#    if defined(__SVR4) || defined(__svr4__)
+#      define LZO_OS_POSIX_SOLARIS  1
+#      define LZO_INFO_OS_POSIX     "solaris"
+#    else
+#      define LZO_OS_POSIX_SUNOS    1
+#      define LZO_INFO_OS_POSIX     "sunos"
+#    endif
+#  elif defined(__ultrix__) || defined(__ultrix)
+#    define LZO_OS_POSIX_ULTRIX     1
+#    define LZO_INFO_OS_POSIX       "ultrix"
+#  elif defined(_UNICOS)
+#    define LZO_OS_POSIX_UNICOS     1
+#    define LZO_INFO_OS_POSIX       "unicos"
+#  else
+#    define LZO_OS_POSIX_UNKNOWN    1
+#    define LZO_INFO_OS_POSIX       "unknown"
+#  endif
+#endif
+#endif
+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#  if (UINT_MAX != LZO_0xffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if (LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_WIN32 || LZO_OS_WIN64)
+#  if (UINT_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__)
+#  define LZO_CC_CILLY          1
+#  define LZO_INFO_CC           "Cilly"
+#  if defined(__CILLY__)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__CILLY__)
+#  else
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__)
+#  define LZO_CC_SDCC           1
+#  define LZO_INFO_CC           "sdcc"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(SDCC)
+#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__)
+#  define LZO_CC_PATHSCALE      (__PATHCC__ * 0x10000L + __PATHCC_MINOR__ * 0x100 + __PATHCC_PATCHLEVEL__)
+#  define LZO_INFO_CC           "Pathscale C"
+#  define LZO_INFO_CCVER        __PATHSCALE__
+#elif defined(__INTEL_COMPILER)
+#  define LZO_CC_INTELC         1
+#  define LZO_INFO_CC           "Intel C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__INTEL_COMPILER)
+#  if defined(_WIN32) || defined(_WIN64)
+#    define LZO_CC_SYNTAX_MSC 1
+#  else
+#    define LZO_CC_SYNTAX_GNUC 1
+#  endif
+#elif defined(__POCC__) && defined(_WIN32)
+#  define LZO_CC_PELLESC        1
+#  define LZO_INFO_CC           "Pelles C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__POCC__)
+#elif defined(__llvm__) && defined(__GNUC__) && defined(__VERSION__)
+#  if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#    define LZO_CC_LLVM         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
+#  else
+#    define LZO_CC_LLVM         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
+#  endif
+#  define LZO_INFO_CC           "llvm-gcc"
+#  define LZO_INFO_CCVER        __VERSION__
+#elif defined(__GNUC__) && defined(__VERSION__)
+#  if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#    define LZO_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
+#  elif defined(__GNUC_MINOR__)
+#    define LZO_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
+#  else
+#    define LZO_CC_GNUC         (__GNUC__ * 0x10000L)
+#  endif
+#  define LZO_INFO_CC           "gcc"
+#  define LZO_INFO_CCVER        __VERSION__
+#elif defined(__ACK__) && defined(_ACK)
+#  define LZO_CC_ACK            1
+#  define LZO_INFO_CC           "Amsterdam Compiler Kit C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__AZTEC_C__)
+#  define LZO_CC_AZTECC         1
+#  define LZO_INFO_CC           "Aztec C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__AZTEC_C__)
+#elif defined(__BORLANDC__)
+#  define LZO_CC_BORLANDC       1
+#  define LZO_INFO_CC           "Borland C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__BORLANDC__)
+#elif defined(_CRAYC) && defined(_RELEASE)
+#  define LZO_CC_CRAYC          1
+#  define LZO_INFO_CC           "Cray C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(_RELEASE)
+#elif defined(__DMC__) && defined(__SC__)
+#  define LZO_CC_DMC            1
+#  define LZO_INFO_CC           "Digital Mars C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__DMC__)
+#elif defined(__DECC)
+#  define LZO_CC_DECC           1
+#  define LZO_INFO_CC           "DEC C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__DECC)
+#elif defined(__HIGHC__)
+#  define LZO_CC_HIGHC          1
+#  define LZO_INFO_CC           "MetaWare High C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__IAR_SYSTEMS_ICC__)
+#  define LZO_CC_IARC           1
+#  define LZO_INFO_CC           "IAR C"
+#  if defined(__VER__)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__VER__)
+#  else
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(__IBMC__)
+#  define LZO_CC_IBMC           1
+#  define LZO_INFO_CC           "IBM C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__IBMC__)
+#elif defined(__KEIL__) && defined(__C166__)
+#  define LZO_CC_KEILC          1
+#  define LZO_INFO_CC           "Keil C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__C166__)
+#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL)
+#  define LZO_CC_LCCWIN32       1
+#  define LZO_INFO_CC           "lcc-win32"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__LCC__)
+#  define LZO_CC_LCC            1
+#  define LZO_INFO_CC           "lcc"
+#  if defined(__LCC_VERSION__)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__LCC_VERSION__)
+#  else
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(_MSC_VER)
+#  define LZO_CC_MSC            1
+#  define LZO_INFO_CC           "Microsoft C"
+#  if defined(_MSC_FULL_VER)
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(_MSC_VER) "." LZO_PP_MACRO_EXPAND(_MSC_FULL_VER)
+#  else
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(_MSC_VER)
+#  endif
+#elif defined(__MWERKS__)
+#  define LZO_CC_MWERKS         1
+#  define LZO_INFO_CC           "Metrowerks C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__MWERKS__)
+#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386)
+#  define LZO_CC_NDPC           1
+#  define LZO_INFO_CC           "Microway NDP C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__PACIFIC__)
+#  define LZO_CC_PACIFICC       1
+#  define LZO_INFO_CC           "Pacific C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__PACIFIC__)
+#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__))
+#  define LZO_CC_PGI            1
+#  define LZO_INFO_CC           "Portland Group PGI C"
+#  define LZO_INFO_CCVER        "unknown"
+#elif defined(__PUREC__) && defined(__TOS__)
+#  define LZO_CC_PUREC          1
+#  define LZO_INFO_CC           "Pure C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__PUREC__)
+#elif defined(__SC__) && defined(__ZTC__)
+#  define LZO_CC_SYMANTECC      1
+#  define LZO_INFO_CC           "Symantec C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__SC__)
+#elif defined(__SUNPRO_C)
+#  define LZO_INFO_CC           "SunPro C"
+#  if ((__SUNPRO_C)+0 > 0)
+#    define LZO_CC_SUNPROC      __SUNPRO_C
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__SUNPRO_C)
+#  else
+#    define LZO_CC_SUNPROC      1
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(__SUNPRO_CC)
+#  define LZO_INFO_CC           "SunPro C"
+#  if ((__SUNPRO_CC)+0 > 0)
+#    define LZO_CC_SUNPROC      __SUNPRO_CC
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__SUNPRO_CC)
+#  else
+#    define LZO_CC_SUNPROC      1
+#    define LZO_INFO_CCVER      "unknown"
+#  endif
+#elif defined(__TINYC__)
+#  define LZO_CC_TINYC          1
+#  define LZO_INFO_CC           "Tiny C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TINYC__)
+#elif defined(__TSC__)
+#  define LZO_CC_TOPSPEEDC      1
+#  define LZO_INFO_CC           "TopSpeed C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TSC__)
+#elif defined(__WATCOMC__)
+#  define LZO_CC_WATCOMC        1
+#  define LZO_INFO_CC           "Watcom C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__WATCOMC__)
+#elif defined(__TURBOC__)
+#  define LZO_CC_TURBOC         1
+#  define LZO_INFO_CC           "Turbo C"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TURBOC__)
+#elif defined(__ZTC__)
+#  define LZO_CC_ZORTECHC       1
+#  define LZO_INFO_CC           "Zortech C"
+#  if (__ZTC__ == 0x310)
+#    define LZO_INFO_CCVER      "0x310"
+#  else
+#    define LZO_INFO_CCVER      LZO_PP_MACRO_EXPAND(__ZTC__)
+#  endif
+#else
+#  define LZO_CC_UNKNOWN        1
+#  define LZO_INFO_CC           "unknown"
+#  define LZO_INFO_CCVER        "unknown"
+#endif
+#if 0 && (LZO_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER)
+#  error "LZO_CC_MSC: _MSC_FULL_VER is not defined"
+#endif
+#if !defined(__LZO_ARCH_OVERRIDE) && !defined(LZO_ARCH_GENERIC) && defined(_CRAY)
+#  if (UINT_MAX > LZO_0xffffffffL) && defined(_CRAY)
+#    if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E)
+#      define LZO_ARCH_CRAY_MPP     1
+#    elif defined(_CRAY1)
+#      define LZO_ARCH_CRAY_PVP     1
+#    endif
+#  endif
+#endif
+#if !defined(__LZO_ARCH_OVERRIDE)
+#if defined(LZO_ARCH_GENERIC)
+#  define LZO_INFO_ARCH             "generic"
+#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#  define LZO_ARCH_I086             1
+#  define LZO_ARCH_IA16             1
+#  define LZO_INFO_ARCH             "i086"
+#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA)
+#  define LZO_ARCH_ALPHA            1
+#  define LZO_INFO_ARCH             "alpha"
+#elif (LZO_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E))
+#  define LZO_ARCH_ALPHA            1
+#  define LZO_INFO_ARCH             "alpha"
+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+#  define LZO_ARCH_AMD64            1
+#  define LZO_INFO_ARCH             "amd64"
+#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
+#  define LZO_ARCH_ARM              1
+#  define LZO_ARCH_ARM_THUMB        1
+#  define LZO_INFO_ARCH             "arm_thumb"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__)
+#  define LZO_ARCH_ARM              1
+#  if defined(__CPU_MODE__) && ((__CPU_MODE__)+0 == 1)
+#    define LZO_ARCH_ARM_THUMB      1
+#    define LZO_INFO_ARCH           "arm_thumb"
+#  elif defined(__CPU_MODE__) && ((__CPU_MODE__)+0 == 2)
+#    define LZO_INFO_ARCH           "arm"
+#  else
+#    define LZO_INFO_ARCH           "arm"
+#  endif
+#elif defined(__arm__) || defined(_M_ARM)
+#  define LZO_ARCH_ARM              1
+#  define LZO_INFO_ARCH             "arm"
+#elif (UINT_MAX <= LZO_0xffffL) && defined(__AVR__)
+#  define LZO_ARCH_AVR              1
+#  define LZO_INFO_ARCH             "avr"
+#elif defined(__bfin__)
+#  define LZO_ARCH_BLACKFIN         1
+#  define LZO_INFO_ARCH             "blackfin"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__C166__)
+#  define LZO_ARCH_C166             1
+#  define LZO_INFO_ARCH             "c166"
+#elif defined(__cris__)
+#  define LZO_ARCH_CRIS             1
+#  define LZO_INFO_ARCH             "cris"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__)
+#  define LZO_ARCH_EZ80             1
+#  define LZO_INFO_ARCH             "ez80"
+#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+#  define LZO_ARCH_H8300            1
+#  define LZO_INFO_ARCH             "h8300"
+#elif defined(__hppa__) || defined(__hppa)
+#  define LZO_ARCH_HPPA             1
+#  define LZO_INFO_ARCH             "hppa"
+#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386)
+#  define LZO_ARCH_I386             1
+#  define LZO_ARCH_IA32             1
+#  define LZO_INFO_ARCH             "i386"
+#elif (LZO_CC_ZORTECHC && defined(__I86__))
+#  define LZO_ARCH_I386             1
+#  define LZO_ARCH_IA32             1
+#  define LZO_INFO_ARCH             "i386"
+#elif (LZO_OS_DOS32 && LZO_CC_HIGHC) && defined(_I386)
+#  define LZO_ARCH_I386             1
+#  define LZO_ARCH_IA32             1
+#  define LZO_INFO_ARCH             "i386"
+#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64)
+#  define LZO_ARCH_IA64             1
+#  define LZO_INFO_ARCH             "ia64"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__m32c__)
+#  define LZO_ARCH_M16C             1
+#  define LZO_INFO_ARCH             "m16c"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__)
+#  define LZO_ARCH_M16C             1
+#  define LZO_INFO_ARCH             "m16c"
+#elif defined(__m32r__)
+#  define LZO_ARCH_M32R             1
+#  define LZO_INFO_ARCH             "m32r"
+#elif (LZO_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K)
+#  define LZO_ARCH_M68K             1
+#  define LZO_INFO_ARCH             "m68k"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__C251__)
+#  define LZO_ARCH_MCS251           1
+#  define LZO_INFO_ARCH             "mcs251"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__C51__)
+#  define LZO_ARCH_MCS51            1
+#  define LZO_INFO_ARCH             "mcs51"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__)
+#  define LZO_ARCH_MCS51            1
+#  define LZO_INFO_ARCH             "mcs51"
+#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000)
+#  define LZO_ARCH_MIPS             1
+#  define LZO_INFO_ARCH             "mips"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__MSP430__)
+#  define LZO_ARCH_MSP430           1
+#  define LZO_INFO_ARCH             "msp430"
+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__)
+#  define LZO_ARCH_MSP430           1
+#  define LZO_INFO_ARCH             "msp430"
+#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR)
+#  define LZO_ARCH_POWERPC          1
+#  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x)
+#  define LZO_ARCH_S390             1
+#  define LZO_INFO_ARCH             "s390"
+#elif defined(__sh__) || defined(_M_SH)
+#  define LZO_ARCH_SH               1
+#  define LZO_INFO_ARCH             "sh"
+#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8)
+#  define LZO_ARCH_SPARC            1
+#  define LZO_INFO_ARCH             "sparc"
+#elif defined(__SPU__)
+#  define LZO_ARCH_SPU              1
+#  define LZO_INFO_ARCH             "spu"
+#elif (UINT_MAX == LZO_0xffffL) && defined(__z80)
+#  define LZO_ARCH_Z80              1
+#  define LZO_INFO_ARCH             "z80"
+#elif (LZO_ARCH_CRAY_PVP)
+#  if defined(_CRAYSV1)
+#    define LZO_ARCH_CRAY_SV1       1
+#    define LZO_INFO_ARCH           "cray_sv1"
+#  elif (_ADDR64)
+#    define LZO_ARCH_CRAY_T90       1
+#    define LZO_INFO_ARCH           "cray_t90"
+#  elif (_ADDR32)
+#    define LZO_ARCH_CRAY_YMP       1
+#    define LZO_INFO_ARCH           "cray_ymp"
+#  else
+#    define LZO_ARCH_CRAY_XMP       1
+#    define LZO_INFO_ARCH           "cray_xmp"
+#  endif
+#else
+#  define LZO_ARCH_UNKNOWN          1
+#  define LZO_INFO_ARCH             "unknown"
+#endif
+#endif
+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2)
+#  error "FIXME - missing define for CPU architecture"
+#endif
+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN32)
+#  error "FIXME - missing WIN32 define for CPU architecture"
+#endif
+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN64)
+#  error "FIXME - missing WIN64 define for CPU architecture"
+#endif
+#if (LZO_OS_OS216 || LZO_OS_WIN16)
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#elif 1 && (LZO_OS_DOS16 && defined(BLX286))
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#elif 1 && (LZO_OS_DOS16 && defined(DOSX286))
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__))
+#  define LZO_ARCH_I086PM           1
+#  define LZO_ARCH_IA16PM           1
+#endif
+#if defined(LZO_ARCH_ARM_THUMB) && !defined(LZO_ARCH_ARM)
+#  error "this should not happen"
+#endif
+#if defined(LZO_ARCH_I086PM) && !defined(LZO_ARCH_I086)
+#  error "this should not happen"
+#endif
+#if (LZO_ARCH_I086)
+#  if (UINT_MAX != LZO_0xffffL)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if (LZO_ARCH_I386)
+#  if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__)
+#    error "this should not happen"
+#  endif
+#  if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__)
+#    error "this should not happen"
+#  endif
+#  if (ULONG_MAX != LZO_0xffffffffL)
+#    error "this should not happen"
+#  endif
+#endif
+#if !defined(__LZO_MM_OVERRIDE)
+#if (LZO_ARCH_I086)
+#if (UINT_MAX != LZO_0xffffL)
+#  error "this should not happen"
+#endif
+#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM)
+#  define LZO_MM_TINY           1
+#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM)
+#  define LZO_MM_HUGE           1
+#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL)
+#  define LZO_MM_SMALL          1
+#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM)
+#  define LZO_MM_MEDIUM         1
+#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM)
+#  define LZO_MM_COMPACT        1
+#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL)
+#  define LZO_MM_LARGE          1
+#elif (LZO_CC_AZTECC)
+#  if defined(_LARGE_CODE) && defined(_LARGE_DATA)
+#    define LZO_MM_LARGE        1
+#  elif defined(_LARGE_CODE)
+#    define LZO_MM_MEDIUM       1
+#  elif defined(_LARGE_DATA)
+#    define LZO_MM_COMPACT      1
+#  else
+#    define LZO_MM_SMALL        1
+#  endif
+#elif (LZO_CC_ZORTECHC && defined(__VCM__))
+#  define LZO_MM_LARGE          1
+#else
+#  error "unknown memory model"
+#endif
+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#define LZO_HAVE_MM_HUGE_PTR        1
+#define LZO_HAVE_MM_HUGE_ARRAY      1
+#if (LZO_MM_TINY)
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#endif
+#if (LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_ZORTECHC)
+#  undef LZO_HAVE_MM_HUGE_PTR
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC)
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#elif (LZO_CC_MSC && defined(_QC))
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#  if (_MSC_VER < 600)
+#    undef LZO_HAVE_MM_HUGE_PTR
+#  endif
+#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295))
+#  undef LZO_HAVE_MM_HUGE_ARRAY
+#endif
+#if (LZO_ARCH_I086PM) && !defined(LZO_HAVE_MM_HUGE_PTR)
+#  if (LZO_OS_DOS16)
+#    error "this should not happen"
+#  elif (LZO_CC_ZORTECHC)
+#  else
+#    error "this should not happen"
+#  endif
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC)
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295))
+   extern void __near __cdecl _AHSHIFT(void);
+#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
+#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16)
+#  define LZO_MM_AHSHIFT      12
+#elif (LZO_CC_WATCOMC)
+   extern unsigned char _HShift;
+#  define LZO_MM_AHSHIFT      ((unsigned) _HShift)
+#else
+#  error "FIXME - implement LZO_MM_AHSHIFT"
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+#elif (LZO_ARCH_C166)
+#if !defined(__MODEL__)
+#  error "FIXME - C166 __MODEL__"
+#elif ((__MODEL__) == 0)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 1)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define LZO_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define LZO_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define LZO_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define LZO_MM_XSMALL         1
+#else
+#  error "FIXME - C166 __MODEL__"
+#endif
+#elif (LZO_ARCH_MCS251)
+#if !defined(__MODEL__)
+#  error "FIXME - MCS251 __MODEL__"
+#elif ((__MODEL__) == 0)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define LZO_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define LZO_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define LZO_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define LZO_MM_XSMALL         1
+#else
+#  error "FIXME - MCS251 __MODEL__"
+#endif
+#elif (LZO_ARCH_MCS51)
+#if !defined(__MODEL__)
+#  error "FIXME - MCS51 __MODEL__"
+#elif ((__MODEL__) == 1)
+#  define LZO_MM_SMALL          1
+#elif ((__MODEL__) == 2)
+#  define LZO_MM_LARGE          1
+#elif ((__MODEL__) == 3)
+#  define LZO_MM_TINY           1
+#elif ((__MODEL__) == 4)
+#  define LZO_MM_XTINY          1
+#elif ((__MODEL__) == 5)
+#  define LZO_MM_XSMALL         1
+#else
+#  error "FIXME - MCS51 __MODEL__"
+#endif
+#elif (LZO_ARCH_CRAY_PVP)
+#  define LZO_MM_PVP            1
+#else
+#  define LZO_MM_FLAT           1
+#endif
+#if (LZO_MM_COMPACT)
+#  define LZO_INFO_MM           "compact"
+#elif (LZO_MM_FLAT)
+#  define LZO_INFO_MM           "flat"
+#elif (LZO_MM_HUGE)
+#  define LZO_INFO_MM           "huge"
+#elif (LZO_MM_LARGE)
+#  define LZO_INFO_MM           "large"
+#elif (LZO_MM_MEDIUM)
+#  define LZO_INFO_MM           "medium"
+#elif (LZO_MM_PVP)
+#  define LZO_INFO_MM           "pvp"
+#elif (LZO_MM_SMALL)
+#  define LZO_INFO_MM           "small"
+#elif (LZO_MM_TINY)
+#  define LZO_INFO_MM           "tiny"
+#else
+#  error "unknown memory model"
+#endif
+#endif
+#if defined(SIZEOF_SHORT)
+#  define LZO_SIZEOF_SHORT          (SIZEOF_SHORT)
+#endif
+#if defined(SIZEOF_INT)
+#  define LZO_SIZEOF_INT            (SIZEOF_INT)
+#endif
+#if defined(SIZEOF_LONG)
+#  define LZO_SIZEOF_LONG           (SIZEOF_LONG)
+#endif
+#if defined(SIZEOF_LONG_LONG)
+#  define LZO_SIZEOF_LONG_LONG      (SIZEOF_LONG_LONG)
+#endif
+#if defined(SIZEOF___INT16)
+#  define LZO_SIZEOF___INT16        (SIZEOF___INT16)
+#endif
+#if defined(SIZEOF___INT32)
+#  define LZO_SIZEOF___INT32        (SIZEOF___INT32)
+#endif
+#if defined(SIZEOF___INT64)
+#  define LZO_SIZEOF___INT64        (SIZEOF___INT64)
+#endif
+#if defined(SIZEOF_VOID_P)
+#  define LZO_SIZEOF_VOID_P         (SIZEOF_VOID_P)
+#endif
+#if defined(SIZEOF_SIZE_T)
+#  define LZO_SIZEOF_SIZE_T         (SIZEOF_SIZE_T)
+#endif
+#if defined(SIZEOF_PTRDIFF_T)
+#  define LZO_SIZEOF_PTRDIFF_T      (SIZEOF_PTRDIFF_T)
+#endif
+#define __LZO_LSR(x,b)    (((x)+0ul) >> (b))
+#if !defined(LZO_SIZEOF_SHORT)
+#  if (LZO_ARCH_CRAY_PVP)
+#    define LZO_SIZEOF_SHORT        8
+#  elif (USHRT_MAX == LZO_0xffffL)
+#    define LZO_SIZEOF_SHORT        2
+#  elif (__LZO_LSR(USHRT_MAX,7) == 1)
+#    define LZO_SIZEOF_SHORT        1
+#  elif (__LZO_LSR(USHRT_MAX,15) == 1)
+#    define LZO_SIZEOF_SHORT        2
+#  elif (__LZO_LSR(USHRT_MAX,31) == 1)
+#    define LZO_SIZEOF_SHORT        4
+#  elif (__LZO_LSR(USHRT_MAX,63) == 1)
+#    define LZO_SIZEOF_SHORT        8
+#  elif (__LZO_LSR(USHRT_MAX,127) == 1)
+#    define LZO_SIZEOF_SHORT        16
+#  else
+#    error "LZO_SIZEOF_SHORT"
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_INT)
+#  if (LZO_ARCH_CRAY_PVP)
+#    define LZO_SIZEOF_INT          8
+#  elif (UINT_MAX == LZO_0xffffL)
+#    define LZO_SIZEOF_INT          2
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define LZO_SIZEOF_INT          4
+#  elif (__LZO_LSR(UINT_MAX,7) == 1)
+#    define LZO_SIZEOF_INT          1
+#  elif (__LZO_LSR(UINT_MAX,15) == 1)
+#    define LZO_SIZEOF_INT          2
+#  elif (__LZO_LSR(UINT_MAX,31) == 1)
+#    define LZO_SIZEOF_INT          4
+#  elif (__LZO_LSR(UINT_MAX,63) == 1)
+#    define LZO_SIZEOF_INT          8
+#  elif (__LZO_LSR(UINT_MAX,127) == 1)
+#    define LZO_SIZEOF_INT          16
+#  else
+#    error "LZO_SIZEOF_INT"
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_LONG)
+#  if (ULONG_MAX == LZO_0xffffffffL)
+#    define LZO_SIZEOF_LONG         4
+#  elif (__LZO_LSR(ULONG_MAX,7) == 1)
+#    define LZO_SIZEOF_LONG         1
+#  elif (__LZO_LSR(ULONG_MAX,15) == 1)
+#    define LZO_SIZEOF_LONG         2
+#  elif (__LZO_LSR(ULONG_MAX,31) == 1)
+#    define LZO_SIZEOF_LONG         4
+#  elif (__LZO_LSR(ULONG_MAX,63) == 1)
+#    define LZO_SIZEOF_LONG         8
+#  elif (__LZO_LSR(ULONG_MAX,127) == 1)
+#    define LZO_SIZEOF_LONG         16
+#  else
+#    error "LZO_SIZEOF_LONG"
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64)
+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8)
+#  if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__)
+#    if (LZO_CC_GNUC >= 0x030300ul)
+#      if ((__LONG_MAX__)+0 == (__LONG_LONG_MAX__)+0)
+#        define LZO_SIZEOF_LONG_LONG      LZO_SIZEOF_LONG
+#      elif (__LZO_LSR(__LONG_LONG_MAX__,30) == 1)
+#        define LZO_SIZEOF_LONG_LONG      4
+#      endif
+#    endif
+#  endif
+#endif
+#endif
+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64)
+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8)
+#if (LZO_ARCH_I086 && LZO_CC_DMC)
+#elif (LZO_CC_CILLY) && defined(__GNUC__)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif ((LZO_OS_WIN32 || LZO_OS_WIN64 || defined(_WIN32)) && LZO_CC_MSC && (_MSC_VER >= 1400))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_OS_WIN64 || defined(_WIN64))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_ARCH_I386 && (LZO_CC_DMC))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_SYMANTECC && (__SC__ >= 0x700)))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__)))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC))
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC))
+#  define LZO_SIZEOF___INT64        8
+#elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520)))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100)))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && (_INTEGRAL_MAX_BITS == 64))
+#  define LZO_SIZEOF___INT64        8
+#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64)
+#  define LZO_SIZEOF_LONG_LONG      8
+#elif (LZO_CC_SDCC) && (LZO_SIZEOF_INT == 2)
+#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define LZO_SIZEOF_LONG_LONG      8
+#endif
+#endif
+#endif
+#if defined(__cplusplus) && defined(LZO_CC_GNUC)
+#  if (LZO_CC_GNUC < 0x020800ul)
+#    undef LZO_SIZEOF_LONG_LONG
+#  endif
+#endif
+#if defined(LZO_CFG_NO_LONG_LONG) || defined(__NO_LONG_LONG)
+#  undef LZO_SIZEOF_LONG_LONG
+#endif
+#if !defined(LZO_SIZEOF_VOID_P)
+#if (LZO_ARCH_I086)
+#  define __LZO_WORDSIZE            2
+#  if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM)
+#    define LZO_SIZEOF_VOID_P       2
+#  elif (LZO_MM_COMPACT || LZO_MM_LARGE || LZO_MM_HUGE)
+#    define LZO_SIZEOF_VOID_P       4
+#  else
+#    error "LZO_MM"
+#  endif
+#elif (LZO_ARCH_AVR || LZO_ARCH_Z80)
+#  define __LZO_WORDSIZE            1
+#  define LZO_SIZEOF_VOID_P         2
+#elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430)
+#  define LZO_SIZEOF_VOID_P         2
+#elif (LZO_ARCH_H8300)
+#  if defined(__NORMAL_MODE__)
+#    define __LZO_WORDSIZE          4
+#    define LZO_SIZEOF_VOID_P       2
+#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+#    define __LZO_WORDSIZE          4
+#    define LZO_SIZEOF_VOID_P       4
+#  else
+#    define __LZO_WORDSIZE          2
+#    define LZO_SIZEOF_VOID_P       2
+#  endif
+#  if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4)
+#    define LZO_SIZEOF_SIZE_T       LZO_SIZEOF_INT
+#    define LZO_SIZEOF_PTRDIFF_T    LZO_SIZEOF_INT
+#  endif
+#elif (LZO_ARCH_M16C)
+#  define __LZO_WORDSIZE            2
+#  if defined(__m32c_cpu__) || defined(__m32cm_cpu__)
+#    define LZO_SIZEOF_VOID_P       4
+#  else
+#    define LZO_SIZEOF_VOID_P       2
+#  endif
+#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__))
+#  define __LZO_WORDSIZE            8
+#  define LZO_SIZEOF_VOID_P         4
+#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64)
+#  define __LZO_WORDSIZE            8
+#  define LZO_SIZEOF_VOID_P         8
+#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__)
+#  define LZO_SIZEOF_VOID_P         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_LONG
+#elif (LZO_OS_OS400 || defined(__OS400__))
+#  define __LZO_WORDSIZE            LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_VOID_P         16
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_LONG
+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64)
+#  define LZO_SIZEOF_VOID_P         8
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_LONG
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_LONG
+#elif (LZO_ARCH_SPU)
+# if 0
+#  define __LZO_WORDSIZE            16
+# endif
+#  define LZO_SIZEOF_VOID_P         4
+#else
+#  define LZO_SIZEOF_VOID_P         LZO_SIZEOF_LONG
+#endif
+#endif
+#if !defined(LZO_WORDSIZE)
+#  if defined(__LZO_WORDSIZE)
+#    define LZO_WORDSIZE            __LZO_WORDSIZE
+#  else
+#    define LZO_WORDSIZE            LZO_SIZEOF_VOID_P
+#  endif
+#endif
+#if !defined(LZO_SIZEOF_SIZE_T)
+#if (LZO_ARCH_I086 || LZO_ARCH_M16C)
+#  define LZO_SIZEOF_SIZE_T         2
+#else
+#  define LZO_SIZEOF_SIZE_T         LZO_SIZEOF_VOID_P
+#endif
+#endif
+#if !defined(LZO_SIZEOF_PTRDIFF_T)
+#if (LZO_ARCH_I086)
+#  if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE)
+#    define LZO_SIZEOF_PTRDIFF_T    LZO_SIZEOF_VOID_P
+#  elif (LZO_MM_COMPACT || LZO_MM_LARGE)
+#    if (LZO_CC_BORLANDC || LZO_CC_TURBOC)
+#      define LZO_SIZEOF_PTRDIFF_T  4
+#    else
+#      define LZO_SIZEOF_PTRDIFF_T  2
+#    endif
+#  else
+#    error "LZO_MM"
+#  endif
+#else
+#  define LZO_SIZEOF_PTRDIFF_T      LZO_SIZEOF_SIZE_T
+#endif
+#endif
+#if defined(LZO_ABI_NEUTRAL_ENDIAN)
+#  undef LZO_ABI_BIG_ENDIAN
+#  undef LZO_ABI_LITTLE_ENDIAN
+#elif !defined(LZO_ABI_BIG_ENDIAN) && !defined(LZO_ABI_LITTLE_ENDIAN)
+#if (LZO_ARCH_ALPHA) && (LZO_ARCH_CRAY_MPP)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#elif (LZO_ARCH_M68K || LZO_ARCH_S390)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__)
+#  if (__LITTLE_ENDIAN__ == 1)
+#    define LZO_ABI_LITTLE_ENDIAN   1
+#  else
+#    define LZO_ABI_BIG_ENDIAN      1
+#  endif
+#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__)
+#  define LZO_ABI_BIG_ENDIAN        1
+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
+#  define LZO_ABI_LITTLE_ENDIAN     1
+#endif
+#endif
+#if defined(LZO_ABI_BIG_ENDIAN) && defined(LZO_ABI_LITTLE_ENDIAN)
+#  error "this should not happen"
+#endif
+#if defined(LZO_ABI_BIG_ENDIAN)
+#  define LZO_INFO_ABI_ENDIAN       "be"
+#elif defined(LZO_ABI_LITTLE_ENDIAN)
+#  define LZO_INFO_ABI_ENDIAN       "le"
+#elif defined(LZO_ABI_NEUTRAL_ENDIAN)
+#  define LZO_INFO_ABI_ENDIAN       "neutral"
+#endif
+#if (LZO_SIZEOF_INT == 1 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2)
+#  define LZO_ABI_I8LP16         1
+#  define LZO_INFO_ABI_PM       "i8lp16"
+#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2)
+#  define LZO_ABI_ILP16         1
+#  define LZO_INFO_ABI_PM       "ilp16"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4)
+#  define LZO_ABI_ILP32         1
+#  define LZO_INFO_ABI_PM       "ilp32"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 8 && LZO_SIZEOF_SIZE_T == 8)
+#  define LZO_ABI_LLP64         1
+#  define LZO_INFO_ABI_PM       "llp64"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8)
+#  define LZO_ABI_LP64          1
+#  define LZO_INFO_ABI_PM       "lp64"
+#elif (LZO_SIZEOF_INT == 8 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8)
+#  define LZO_ABI_ILP64         1
+#  define LZO_INFO_ABI_PM       "ilp64"
+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 4)
+#  define LZO_ABI_IP32L64       1
+#  define LZO_INFO_ABI_PM       "ip32l64"
+#endif
+#if !defined(__LZO_LIBC_OVERRIDE)
+#if defined(LZO_LIBC_NAKED)
+#  define LZO_INFO_LIBC         "naked"
+#elif defined(LZO_LIBC_FREESTANDING)
+#  define LZO_INFO_LIBC         "freestanding"
+#elif defined(LZO_LIBC_MOSTLY_FREESTANDING)
+#  define LZO_INFO_LIBC         "mfreestanding"
+#elif defined(LZO_LIBC_ISOC90)
+#  define LZO_INFO_LIBC         "isoc90"
+#elif defined(LZO_LIBC_ISOC99)
+#  define LZO_INFO_LIBC         "isoc99"
+#elif defined(__dietlibc__)
+#  define LZO_LIBC_DIETLIBC     1
+#  define LZO_INFO_LIBC         "dietlibc"
+#elif defined(_NEWLIB_VERSION)
+#  define LZO_LIBC_NEWLIB       1
+#  define LZO_INFO_LIBC         "newlib"
+#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__)
+#  if defined(__UCLIBC_SUBLEVEL__)
+#    define LZO_LIBC_UCLIBC     (__UCLIBC_MAJOR__ * 0x10000L + __UCLIBC_MINOR__ * 0x100 + __UCLIBC_SUBLEVEL__)
+#  else
+#    define LZO_LIBC_UCLIBC     0x00090bL
+#  endif
+#  define LZO_INFO_LIBC         "uclibc"
+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#  define LZO_LIBC_GLIBC        (__GLIBC__ * 0x10000L + __GLIBC_MINOR__ * 0x100)
+#  define LZO_INFO_LIBC         "glibc"
+#elif (LZO_CC_MWERKS) && defined(__MSL__)
+#  define LZO_LIBC_MSL          __MSL__
+#  define LZO_INFO_LIBC         "msl"
+#elif 1 && defined(__IAR_SYSTEMS_ICC__)
+#  define LZO_LIBC_ISOC90       1
+#  define LZO_INFO_LIBC         "isoc90"
+#else
+#  define LZO_LIBC_DEFAULT      1
+#  define LZO_INFO_LIBC         "default"
+#endif
+#endif
+#if !defined(__lzo_gnuc_extension__)
+#if (LZO_CC_GNUC >= 0x020800ul)
+#  define __lzo_gnuc_extension__    __extension__
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_gnuc_extension__    __extension__
+#else
+#  define __lzo_gnuc_extension__
+#endif
+#endif
+#if !defined(__lzo_ua_volatile)
+#  define __lzo_ua_volatile     volatile
+#endif
+#if !defined(__lzo_alignof)
+#if (LZO_CC_CILLY || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI)
+#  define __lzo_alignof(e)      __alignof__(e)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 700))
+#  define __lzo_alignof(e)      __alignof__(e)
+#elif (LZO_CC_MSC && (_MSC_VER >= 1300))
+#  define __lzo_alignof(e)      __alignof(e)
+#endif
+#endif
+#if defined(__lzo_alignof)
+#  define __lzo_HAVE_alignof 1
+#endif
+#if !defined(__lzo_constructor)
+#if (LZO_CC_GNUC >= 0x030400ul)
+#  define __lzo_constructor     __attribute__((__constructor__,__used__))
+#elif (LZO_CC_GNUC >= 0x020700ul)
+#  define __lzo_constructor     __attribute__((__constructor__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_constructor     __attribute__((__constructor__))
+#endif
+#endif
+#if defined(__lzo_constructor)
+#  define __lzo_HAVE_constructor 1
+#endif
+#if !defined(__lzo_destructor)
+#if (LZO_CC_GNUC >= 0x030400ul)
+#  define __lzo_destructor      __attribute__((__destructor__,__used__))
+#elif (LZO_CC_GNUC >= 0x020700ul)
+#  define __lzo_destructor      __attribute__((__destructor__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_destructor      __attribute__((__destructor__))
+#endif
+#endif
+#if defined(__lzo_destructor)
+#  define __lzo_HAVE_destructor 1
+#endif
+#if defined(__lzo_HAVE_destructor) && !defined(__lzo_HAVE_constructor)
+#  error "this should not happen"
+#endif
+#if !defined(__lzo_inline)
+#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295))
+#elif defined(__cplusplus)
+#  define __lzo_inline          inline
+#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550))
+#  define __lzo_inline          __inline
+#elif (LZO_CC_CILLY || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI)
+#  define __lzo_inline          __inline__
+#elif (LZO_CC_DMC)
+#  define __lzo_inline          __inline
+#elif (LZO_CC_INTELC)
+#  define __lzo_inline          __inline
+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405))
+#  define __lzo_inline          __inline
+#elif (LZO_CC_MSC && (_MSC_VER >= 900))
+#  define __lzo_inline          __inline
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define __lzo_inline          inline
+#endif
+#endif
+#if defined(__lzo_inline)
+#  define __lzo_HAVE_inline 1
+#else
+#  define __lzo_inline
+#endif
+#if !defined(__lzo_forceinline)
+#if (LZO_CC_GNUC >= 0x030200ul)
+#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 450) && LZO_CC_SYNTAX_MSC)
+#  define __lzo_forceinline     __forceinline
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1200))
+#  define __lzo_forceinline     __forceinline
+#endif
+#endif
+#if defined(__lzo_forceinline)
+#  define __lzo_HAVE_forceinline 1
+#else
+#  define __lzo_forceinline
+#endif
+#if !defined(__lzo_noinline)
+#if 1 && (LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul)
+#  define __lzo_noinline        __attribute__((__noinline__,__used__))
+#elif (LZO_CC_GNUC >= 0x030200ul)
+#  define __lzo_noinline        __attribute__((__noinline__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 600) && LZO_CC_SYNTAX_MSC)
+#  define __lzo_noinline        __declspec(noinline)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_noinline        __attribute__((__noinline__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_noinline        __attribute__((__noinline__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1300))
+#  define __lzo_noinline        __declspec(noinline)
+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64))
+#  if defined(__cplusplus)
+#  else
+#    define __lzo_noinline      __declspec(noinline)
+#  endif
+#endif
+#endif
+#if defined(__lzo_noinline)
+#  define __lzo_HAVE_noinline 1
+#else
+#  define __lzo_noinline
+#endif
+#if (defined(__lzo_HAVE_forceinline) || defined(__lzo_HAVE_noinline)) && !defined(__lzo_HAVE_inline)
+#  error "this should not happen"
+#endif
+#if !defined(__lzo_noreturn)
+#if (LZO_CC_GNUC >= 0x020700ul)
+#  define __lzo_noreturn        __attribute__((__noreturn__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 450) && LZO_CC_SYNTAX_MSC)
+#  define __lzo_noreturn        __declspec(noreturn)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 600) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_noreturn        __attribute__((__noreturn__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_noreturn        __attribute__((__noreturn__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1200))
+#  define __lzo_noreturn        __declspec(noreturn)
+#endif
+#endif
+#if defined(__lzo_noreturn)
+#  define __lzo_HAVE_noreturn 1
+#else
+#  define __lzo_noreturn
+#endif
+#if !defined(__lzo_nothrow)
+#if (LZO_CC_GNUC >= 0x030300ul)
+#  define __lzo_nothrow         __attribute__((__nothrow__))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 450) && LZO_CC_SYNTAX_MSC) && defined(__cplusplus)
+#  define __lzo_nothrow         __declspec(nothrow)
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_nothrow         __attribute__((__nothrow__))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_nothrow         __attribute__((__nothrow__))
+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus)
+#  define __lzo_nothrow         __declspec(nothrow)
+#endif
+#endif
+#if defined(__lzo_nothrow)
+#  define __lzo_HAVE_nothrow 1
+#else
+#  define __lzo_nothrow
+#endif
+#if !defined(__lzo_restrict)
+#if (LZO_CC_GNUC >= 0x030400ul)
+#  define __lzo_restrict        __restrict__
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 600) && LZO_CC_SYNTAX_GNUC)
+#  define __lzo_restrict        __restrict__
+#elif (LZO_CC_LLVM)
+#  define __lzo_restrict        __restrict__
+#elif (LZO_CC_MSC && (_MSC_VER >= 1400))
+#  define __lzo_restrict        __restrict
+#endif
+#endif
+#if defined(__lzo_restrict)
+#  define __lzo_HAVE_restrict 1
+#else
+#  define __lzo_restrict
+#endif
+#if !defined(__lzo_likely) && !defined(__lzo_unlikely)
+#if (LZO_CC_GNUC >= 0x030200ul)
+#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
+#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800))
+#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
+#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
+#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#endif
+#endif
+#if defined(__lzo_likely)
+#  define __lzo_HAVE_likely 1
+#else
+#  define __lzo_likely(e)       (e)
+#endif
+#if defined(__lzo_unlikely)
+#  define __lzo_HAVE_unlikely 1
+#else
+#  define __lzo_unlikely(e)     (e)
+#endif
+#if !defined(LZO_UNUSED)
+#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
+#    define LZO_UNUSED(var)         ((void) &var)
+#  elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC)
+#    define LZO_UNUSED(var)         if (&var) ; else
+#  elif (LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE)
+#    define LZO_UNUSED(var)         ((void) var)
+#  elif (LZO_CC_MSC && (_MSC_VER < 900))
+#    define LZO_UNUSED(var)         if (&var) ; else
+#  elif (LZO_CC_KEILC)
+#    define LZO_UNUSED(var)         {extern int __lzo_unused[1-2*!(sizeof(var)>0)];}
+#  elif (LZO_CC_PACIFICC)
+#    define LZO_UNUSED(var)         ((void) sizeof(var))
+#  elif (LZO_CC_WATCOMC) && defined(__cplusplus)
+#    define LZO_UNUSED(var)         ((void) var)
+#  else
+#    define LZO_UNUSED(var)         ((void) &var)
+#  endif
+#endif
+#if !defined(LZO_UNUSED_FUNC)
+#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
+#    define LZO_UNUSED_FUNC(func)   ((void) func)
+#  elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC)
+#    define LZO_UNUSED_FUNC(func)   if (func) ; else
+#  elif (LZO_CC_LLVM)
+#    define LZO_UNUSED_FUNC(func)   ((void) &func)
+#  elif (LZO_CC_MSC && (_MSC_VER < 900))
+#    define LZO_UNUSED_FUNC(func)   if (func) ; else
+#  elif (LZO_CC_MSC)
+#    define LZO_UNUSED_FUNC(func)   ((void) &func)
+#  elif (LZO_CC_KEILC || LZO_CC_PELLESC)
+#    define LZO_UNUSED_FUNC(func)   {extern int __lzo_unused[1-2*!(sizeof((int)func)>0)];}
+#  else
+#    define LZO_UNUSED_FUNC(func)   ((void) func)
+#  endif
+#endif
+#if !defined(LZO_UNUSED_LABEL)
+#  if (LZO_CC_WATCOMC) && defined(__cplusplus)
+#    define LZO_UNUSED_LABEL(l)     switch(0) case 1:goto l
+#  elif (LZO_CC_INTELC || LZO_CC_WATCOMC)
+#    define LZO_UNUSED_LABEL(l)     if (0) goto l
+#  else
+#    define LZO_UNUSED_LABEL(l)     switch(0) case 1:goto l
+#  endif
+#endif
+#if !defined(LZO_DEFINE_UNINITIALIZED_VAR)
+#  if 0
+#    define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var
+#  elif 0 && (LZO_CC_GNUC)
+#    define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = var
+#  else
+#    define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = init
+#  endif
+#endif
+#if !defined(LZO_COMPILE_TIME_ASSERT_HEADER)
+#  if (LZO_CC_AZTECC || LZO_CC_ZORTECHC)
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1-!(e)];
+#  elif (LZO_CC_DMC || LZO_CC_SYMANTECC)
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1u-2*!(e)];
+#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1-!(e)];
+#  else
+#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  extern int __lzo_cta[1-2*!(e)];
+#  endif
+#endif
+#if !defined(LZO_COMPILE_TIME_ASSERT)
+#  if (LZO_CC_AZTECC)
+#    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __lzo_cta_t[1-!(e)];}
+#  elif (LZO_CC_DMC || LZO_CC_PACIFICC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  elif (LZO_CC_MSC && (_MSC_VER < 900))
+#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
+#  else
+#    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __lzo_cta_t[1-2*!(e)];}
+#  endif
+#endif
+#if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64)
+#  if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC)
+#  elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+#    define __lzo_cdecl                 __cdecl
+#    define __lzo_cdecl_atexit
+#    define __lzo_cdecl_main            __cdecl
+#    if (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC))
+#      define __lzo_cdecl_qsort         __pascal
+#    elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC))
+#      define __lzo_cdecl_qsort         _stdcall
+#    else
+#      define __lzo_cdecl_qsort         __cdecl
+#    endif
+#  elif (LZO_CC_WATCOMC)
+#    define __lzo_cdecl                 __cdecl
+#  else
+#    define __lzo_cdecl                 __cdecl
+#    define __lzo_cdecl_atexit          __cdecl
+#    define __lzo_cdecl_main            __cdecl
+#    define __lzo_cdecl_qsort           __cdecl
+#  endif
+#  if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC || LZO_CC_WATCOMC)
+#  elif (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC))
+#    define __lzo_cdecl_sighandler      __pascal
+#  elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC))
+#    define __lzo_cdecl_sighandler      _stdcall
+#  elif (LZO_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE)
+#    define __lzo_cdecl_sighandler      __clrcall
+#  elif (LZO_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700))
+#    if defined(_DLL)
+#      define __lzo_cdecl_sighandler    _far _cdecl _loadds
+#    elif defined(_MT)
+#      define __lzo_cdecl_sighandler    _far _cdecl
+#    else
+#      define __lzo_cdecl_sighandler    _cdecl
+#    endif
+#  else
+#    define __lzo_cdecl_sighandler      __cdecl
+#  endif
+#elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC)
+#  define __lzo_cdecl                   __cdecl
+#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC))
+#  define __lzo_cdecl                   cdecl
+#endif
+#if !defined(__lzo_cdecl)
+#  define __lzo_cdecl
+#endif
+#if !defined(__lzo_cdecl_atexit)
+#  define __lzo_cdecl_atexit
+#endif
+#if !defined(__lzo_cdecl_main)
+#  define __lzo_cdecl_main
+#endif
+#if !defined(__lzo_cdecl_qsort)
+#  define __lzo_cdecl_qsort
+#endif
+#if !defined(__lzo_cdecl_sighandler)
+#  define __lzo_cdecl_sighandler
+#endif
+#if !defined(__lzo_cdecl_va)
+#  define __lzo_cdecl_va                __lzo_cdecl
+#endif
+#if !defined(LZO_CFG_NO_WINDOWS_H)
+#if (LZO_OS_CYGWIN || (LZO_OS_EMX && defined(__RSXNT__)) || LZO_OS_WIN32 || LZO_OS_WIN64)
+#  if (LZO_CC_WATCOMC && (__WATCOMC__ < 1000))
+#  elif (LZO_OS_WIN32 && LZO_CC_GNUC) && defined(__PW32__)
+#  elif ((LZO_OS_CYGWIN || defined(__MINGW32__)) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x025f00ul)))
+#  else
+#    define LZO_HAVE_WINDOWS_H 1
+#  endif
+#endif
+#endif
+#if (LZO_ARCH_ALPHA)
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#  define LZO_OPT_AVOID_SHORT       1
+#  define LZO_OPT_AVOID_USHORT      1
+#elif (LZO_ARCH_AMD64)
+#  define LZO_OPT_AVOID_INT_INDEX   1
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#  define LZO_OPT_UNALIGNED64       1
+#elif (LZO_ARCH_ARM && LZO_ARCH_ARM_THUMB)
+#elif (LZO_ARCH_ARM)
+#  define LZO_OPT_AVOID_SHORT       1
+#  define LZO_OPT_AVOID_USHORT      1
+#elif (LZO_ARCH_CRIS)
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#elif (LZO_ARCH_I386)
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#elif (LZO_ARCH_IA64)
+#  define LZO_OPT_AVOID_INT_INDEX   1
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#  define LZO_OPT_PREFER_POSTINC    1
+#elif (LZO_ARCH_M68K)
+#  define LZO_OPT_PREFER_POSTINC    1
+#  define LZO_OPT_PREFER_PREDEC     1
+#  if defined(__mc68020__) && !defined(__mcoldfire__)
+#    define LZO_OPT_UNALIGNED16     1
+#    define LZO_OPT_UNALIGNED32     1
+#  endif
+#elif (LZO_ARCH_MIPS)
+#  define LZO_OPT_AVOID_UINT_INDEX  1
+#elif (LZO_ARCH_POWERPC)
+#  define LZO_OPT_PREFER_PREINC     1
+#  define LZO_OPT_PREFER_PREDEC     1
+#  if defined(LZO_ABI_BIG_ENDIAN)
+#    define LZO_OPT_UNALIGNED16     1
+#    define LZO_OPT_UNALIGNED32     1
+#  endif
+#elif (LZO_ARCH_S390)
+#  define LZO_OPT_UNALIGNED16       1
+#  define LZO_OPT_UNALIGNED32       1
+#  if (LZO_SIZEOF_SIZE_T == 8)
+#    define LZO_OPT_UNALIGNED64     1
+#  endif
+#elif (LZO_ARCH_SH)
+#  define LZO_OPT_PREFER_POSTINC    1
+#  define LZO_OPT_PREFER_PREDEC     1
+#endif
+#if !defined(LZO_CFG_NO_INLINE_ASM)
+#if defined(LZO_CC_LLVM)
+#  define LZO_CFG_NO_INLINE_ASM 1
+#endif
+#endif
+#if !defined(LZO_CFG_NO_UNALIGNED)
+#if defined(LZO_ABI_NEUTRAL_ENDIAN) || defined(LZO_ARCH_GENERIC)
+#  define LZO_CFG_NO_UNALIGNED 1
+#endif
+#endif
+#if defined(LZO_CFG_NO_UNALIGNED)
+#  undef LZO_OPT_UNALIGNED16
+#  undef LZO_OPT_UNALIGNED32
+#  undef LZO_OPT_UNALIGNED64
+#endif
+#if defined(LZO_CFG_NO_INLINE_ASM)
+#elif (LZO_ARCH_I386 && (LZO_OS_DOS32 || LZO_OS_WIN32) && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC))
+#  define LZO_ASM_SYNTAX_MSC 1
+#elif (LZO_OS_WIN64 && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC))
+#elif (LZO_ARCH_I386 && (LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE))
+#  define LZO_ASM_SYNTAX_GNUC 1
+#elif (LZO_ARCH_AMD64 && (LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE))
+#  define LZO_ASM_SYNTAX_GNUC 1
+#endif
+#if (LZO_ASM_SYNTAX_GNUC)
+#if (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul))
+#  define __LZO_ASM_CLOBBER         "ax"
+#elif (LZO_CC_INTELC)
+#  define __LZO_ASM_CLOBBER         "memory"
+#else
+#  define __LZO_ASM_CLOBBER         "cc", "memory"
+#endif
+#endif
+#if defined(__LZO_INFOSTR_MM)
+#elif (LZO_MM_FLAT) && (defined(__LZO_INFOSTR_PM) || defined(LZO_INFO_ABI_PM))
+#  define __LZO_INFOSTR_MM          ""
+#elif defined(LZO_INFO_MM)
+#  define __LZO_INFOSTR_MM          "." LZO_INFO_MM
+#else
+#  define __LZO_INFOSTR_MM          ""
+#endif
+#if defined(__LZO_INFOSTR_PM)
+#elif defined(LZO_INFO_ABI_PM)
+#  define __LZO_INFOSTR_PM          "." LZO_INFO_ABI_PM
+#else
+#  define __LZO_INFOSTR_PM          ""
+#endif
+#if defined(__LZO_INFOSTR_ENDIAN)
+#elif defined(LZO_INFO_ABI_ENDIAN)
+#  define __LZO_INFOSTR_ENDIAN      "." LZO_INFO_ABI_ENDIAN
+#else
+#  define __LZO_INFOSTR_ENDIAN      ""
+#endif
+#if defined(__LZO_INFOSTR_OSNAME)
+#elif defined(LZO_INFO_OS_CONSOLE)
+#  define __LZO_INFOSTR_OSNAME      LZO_INFO_OS "." LZO_INFO_OS_CONSOLE
+#elif defined(LZO_INFO_OS_POSIX)
+#  define __LZO_INFOSTR_OSNAME      LZO_INFO_OS "." LZO_INFO_OS_POSIX
+#else
+#  define __LZO_INFOSTR_OSNAME      LZO_INFO_OS
+#endif
+#if defined(__LZO_INFOSTR_LIBC)
+#elif defined(LZO_INFO_LIBC)
+#  define __LZO_INFOSTR_LIBC        "." LZO_INFO_LIBC
+#else
+#  define __LZO_INFOSTR_LIBC        ""
+#endif
+#if defined(__LZO_INFOSTR_CCVER)
+#elif defined(LZO_INFO_CCVER)
+#  define __LZO_INFOSTR_CCVER       " " LZO_INFO_CCVER
+#else
+#  define __LZO_INFOSTR_CCVER       ""
+#endif
+#define LZO_INFO_STRING \
+    LZO_INFO_ARCH __LZO_INFOSTR_MM __LZO_INFOSTR_PM __LZO_INFOSTR_ENDIAN \
+    " " __LZO_INFOSTR_OSNAME __LZO_INFOSTR_LIBC " " LZO_INFO_CC __LZO_INFOSTR_CCVER
+
+#endif
+
+#endif
+
+#undef LZO_HAVE_CONFIG_H
+#include "minilzo.h"
+
+#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x2030)
+#  error "version mismatch in miniLZO source files"
+#endif
+
+#ifdef MINILZO_HAVE_CONFIG_H
+#  define LZO_HAVE_CONFIG_H
+#endif
+
+#ifndef __LZO_CONF_H
+#define __LZO_CONF_H
+
+#if !defined(__LZO_IN_MINILZO)
+#if defined(LZO_CFG_FREESTANDING)
+#  define LZO_LIBC_FREESTANDING 1
+#  define LZO_OS_FREESTANDING 1
+#  define ACC_LIBC_FREESTANDING 1
+#  define ACC_OS_FREESTANDING 1
+#endif
+#if defined(LZO_CFG_NO_UNALIGNED)
+#  define ACC_CFG_NO_UNALIGNED 1
+#endif
+#if defined(LZO_ARCH_GENERIC)
+#  define ACC_ARCH_GENERIC 1
+#endif
+#if defined(LZO_ABI_NEUTRAL_ENDIAN)
+#  define ACC_ABI_NEUTRAL_ENDIAN 1
+#endif
+#if defined(LZO_HAVE_CONFIG_H)
+#  define ACC_CONFIG_NO_HEADER 1
+#endif
+#if defined(LZO_CFG_EXTRA_CONFIG_HEADER)
+#  include LZO_CFG_EXTRA_CONFIG_HEADER
+#endif
+#if defined(__LZOCONF_H) || defined(__LZOCONF_H_INCLUDED)
+#  error "include this file first"
+#endif
+#include "lzo/lzoconf.h"
+#endif
+
+#if (LZO_VERSION < 0x02000) || !defined(__LZOCONF_H_INCLUDED)
+#  error "version mismatch"
+#endif
+
+#if (LZO_CC_BORLANDC && LZO_ARCH_I086)
+#  pragma option -h
+#endif
+
+#if (LZO_CC_MSC && (_MSC_VER >= 1000))
+#  pragma warning(disable: 4127 4701)
+#endif
+#if (LZO_CC_MSC && (_MSC_VER >= 1300))
+#  pragma warning(disable: 4820)
+#  pragma warning(disable: 4514 4710 4711)
+#endif
+
+#if (LZO_CC_SUNPROC)
+#  pragma error_messages(off,E_END_OF_LOOP_CODE_NOT_REACHED)
+#  pragma error_messages(off,E_LOOP_NOT_ENTERED_AT_TOP)
+#endif
+
+#if defined(__LZO_MMODEL_HUGE) && (!LZO_HAVE_MM_HUGE_PTR)
+#  error "this should not happen - check defines for __huge"
+#endif
+
+#if defined(__LZO_IN_MINILZO) || defined(LZO_CFG_FREESTANDING)
+#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
+#  define ACC_WANT_ACC_INCD_H 1
+#  define ACC_WANT_ACC_INCE_H 1
+#  define ACC_WANT_ACC_INCI_H 1
+#elif 1
+#  include <string.h>
+#else
+#  define ACC_WANT_ACC_INCD_H 1
+#endif
+
+#if (LZO_ARCH_I086)
+#  define ACC_MM_AHSHIFT        LZO_MM_AHSHIFT
+#  define ACC_PTR_FP_OFF(x)     (((const unsigned __far*)&(x))[0])
+#  define ACC_PTR_FP_SEG(x)     (((const unsigned __far*)&(x))[1])
+#  define ACC_PTR_MK_FP(s,o)    ((void __far*)(((unsigned long)(s)<<16)+(unsigned)(o)))
+#endif
+
+#if !defined(lzo_uintptr_t)
+#  if defined(__LZO_MMODEL_HUGE)
+#    define lzo_uintptr_t       unsigned long
+#  elif 1 && defined(LZO_OS_OS400) && (LZO_SIZEOF_VOID_P == 16)
+#    define __LZO_UINTPTR_T_IS_POINTER 1
+     typedef char*              lzo_uintptr_t;
+#    define lzo_uintptr_t       lzo_uintptr_t
+#  elif (LZO_SIZEOF_SIZE_T == LZO_SIZEOF_VOID_P)
+#    define lzo_uintptr_t       size_t
+#  elif (LZO_SIZEOF_LONG == LZO_SIZEOF_VOID_P)
+#    define lzo_uintptr_t       unsigned long
+#  elif (LZO_SIZEOF_INT == LZO_SIZEOF_VOID_P)
+#    define lzo_uintptr_t       unsigned int
+#  elif (LZO_SIZEOF_LONG_LONG == LZO_SIZEOF_VOID_P)
+#    define lzo_uintptr_t       unsigned long long
+#  else
+#    define lzo_uintptr_t       size_t
+#  endif
+#endif
+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uintptr_t) >= sizeof(lzo_voidp))
+
+#if 1 && !defined(LZO_CFG_FREESTANDING)
+#if 1 && !defined(HAVE_STRING_H)
+#define HAVE_STRING_H 1
+#endif
+#if 1 && !defined(HAVE_MEMCMP)
+#define HAVE_MEMCMP 1
+#endif
+#if 1 && !defined(HAVE_MEMCPY)
+#define HAVE_MEMCPY 1
+#endif
+#if 1 && !defined(HAVE_MEMMOVE)
+#define HAVE_MEMMOVE 1
+#endif
+#if 1 && !defined(HAVE_MEMSET)
+#define HAVE_MEMSET 1
+#endif
+#endif
+
+#if 1 && defined(HAVE_STRING_H)
+#include <string.h>
+#endif
+
+#if defined(LZO_CFG_FREESTANDING)
+#  undef HAVE_MEMCMP
+#  undef HAVE_MEMCPY
+#  undef HAVE_MEMMOVE
+#  undef HAVE_MEMSET
+#endif
+
+#if !defined(HAVE_MEMCMP)
+#  undef memcmp
+#  define memcmp(a,b,c)         lzo_memcmp(a,b,c)
+#elif !defined(__LZO_MMODEL_HUGE)
+#  define lzo_memcmp(a,b,c)     memcmp(a,b,c)
+#endif
+#if !defined(HAVE_MEMCPY)
+#  undef memcpy
+#  define memcpy(a,b,c)         lzo_memcpy(a,b,c)
+#elif !defined(__LZO_MMODEL_HUGE)
+#  define lzo_memcpy(a,b,c)     memcpy(a,b,c)
+#endif
+#if !defined(HAVE_MEMMOVE)
+#  undef memmove
+#  define memmove(a,b,c)        lzo_memmove(a,b,c)
+#elif !defined(__LZO_MMODEL_HUGE)
+#  define lzo_memmove(a,b,c)    memmove(a,b,c)
+#endif
+#if !defined(HAVE_MEMSET)
+#  undef memset
+#  define memset(a,b,c)         lzo_memset(a,b,c)
+#elif !defined(__LZO_MMODEL_HUGE)
+#  define lzo_memset(a,b,c)     memset(a,b,c)
+#endif
+
+#undef NDEBUG
+#if defined(LZO_CFG_FREESTANDING)
+#  undef LZO_DEBUG
+#  define NDEBUG 1
+#  undef assert
+#  define assert(e) ((void)0)
+#else
+#  if !defined(LZO_DEBUG)
+#    define NDEBUG 1
+#  endif
+#  include <assert.h>
+#endif
+
+#if 0 && defined(__BOUNDS_CHECKING_ON)
+#  include <unchecked.h>
+#else
+#  define BOUNDS_CHECKING_OFF_DURING(stmt)      stmt
+#  define BOUNDS_CHECKING_OFF_IN_EXPR(expr)     (expr)
+#endif
+
+#if !defined(__lzo_inline)
+#  define __lzo_inline
+#endif
+#if !defined(__lzo_forceinline)
+#  define __lzo_forceinline
+#endif
+#if !defined(__lzo_noinline)
+#  define __lzo_noinline
+#endif
+
+#if 1
+#  define LZO_BYTE(x)       ((unsigned char) (x))
+#else
+#  define LZO_BYTE(x)       ((unsigned char) ((x) & 0xff))
+#endif
+
+#define LZO_MAX(a,b)        ((a) >= (b) ? (a) : (b))
+#define LZO_MIN(a,b)        ((a) <= (b) ? (a) : (b))
+#define LZO_MAX3(a,b,c)     ((a) >= (b) ? LZO_MAX(a,c) : LZO_MAX(b,c))
+#define LZO_MIN3(a,b,c)     ((a) <= (b) ? LZO_MIN(a,c) : LZO_MIN(b,c))
+
+#define lzo_sizeof(type)    ((lzo_uint) (sizeof(type)))
+
+#define LZO_HIGH(array)     ((lzo_uint) (sizeof(array)/sizeof(*(array))))
+
+#define LZO_SIZE(bits)      (1u << (bits))
+#define LZO_MASK(bits)      (LZO_SIZE(bits) - 1)
+
+#define LZO_LSIZE(bits)     (1ul << (bits))
+#define LZO_LMASK(bits)     (LZO_LSIZE(bits) - 1)
+
+#define LZO_USIZE(bits)     ((lzo_uint) 1 << (bits))
+#define LZO_UMASK(bits)     (LZO_USIZE(bits) - 1)
+
+#if !defined(DMUL)
+#if 0
+
+#  define DMUL(a,b) ((lzo_xint) ((lzo_uint32)(a) * (lzo_uint32)(b)))
+#else
+#  define DMUL(a,b) ((lzo_xint) ((a) * (b)))
+#endif
+#endif
+
+#if 1 && !defined(LZO_CFG_NO_UNALIGNED)
+#if 1 && (LZO_ARCH_AMD64 || LZO_ARCH_I386)
+#  if (LZO_SIZEOF_SHORT == 2)
+#    define LZO_UNALIGNED_OK_2
+#  endif
+#  if (LZO_SIZEOF_INT == 4)
+#    define LZO_UNALIGNED_OK_4
+#  endif
+#endif
+#endif
+
+#if defined(LZO_UNALIGNED_OK_2)
+  LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(short) == 2)
+#endif
+#if defined(LZO_UNALIGNED_OK_4)
+  LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint32) == 4)
+#elif defined(LZO_ALIGNED_OK_4)
+  LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint32) == 4)
+#endif
+
+#define MEMCPY8_DS(dest,src,len) \
+    lzo_memcpy(dest,src,len); dest += len; src += len
+
+#define BZERO8_PTR(s,l,n) \
+    lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n))
+
+#define MEMCPY_DS(dest,src,len) \
+    do *dest++ = *src++; while (--len > 0)
+
+__LZO_EXTERN_C int __lzo_init_done;
+__LZO_EXTERN_C const char __lzo_copyright[];
+LZO_EXTERN(const lzo_bytep) lzo_copyright(void);
+
+#ifndef __LZO_PTR_H
+#define __LZO_PTR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(lzo_uintptr_t)
+#  if defined(__LZO_MMODEL_HUGE)
+#    define lzo_uintptr_t   unsigned long
+#  else
+#    define lzo_uintptr_t   acc_uintptr_t
+#    ifdef __ACC_INTPTR_T_IS_POINTER
+#      define __LZO_UINTPTR_T_IS_POINTER 1
+#    endif
+#  endif
+#endif
+
+#if (LZO_ARCH_I086)
+#define PTR(a)              ((lzo_bytep) (a))
+#define PTR_ALIGNED_4(a)    ((ACC_PTR_FP_OFF(a) & 3) == 0)
+#define PTR_ALIGNED2_4(a,b) (((ACC_PTR_FP_OFF(a) | ACC_PTR_FP_OFF(b)) & 3) == 0)
+#elif (LZO_MM_PVP)
+#define PTR(a)              ((lzo_bytep) (a))
+#define PTR_ALIGNED_8(a)    ((((lzo_uintptr_t)(a)) >> 61) == 0)
+#define PTR_ALIGNED2_8(a,b) ((((lzo_uintptr_t)(a)|(lzo_uintptr_t)(b)) >> 61) == 0)
+#else
+#define PTR(a)              ((lzo_uintptr_t) (a))
+#define PTR_LINEAR(a)       PTR(a)
+#define PTR_ALIGNED_4(a)    ((PTR_LINEAR(a) & 3) == 0)
+#define PTR_ALIGNED_8(a)    ((PTR_LINEAR(a) & 7) == 0)
+#define PTR_ALIGNED2_4(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 3) == 0)
+#define PTR_ALIGNED2_8(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 7) == 0)
+#endif
+
+#define PTR_LT(a,b)         (PTR(a) < PTR(b))
+#define PTR_GE(a,b)         (PTR(a) >= PTR(b))
+#define PTR_DIFF(a,b)       (PTR(a) - PTR(b))
+#define pd(a,b)             ((lzo_uint) ((a)-(b)))
+
+LZO_EXTERN(lzo_uintptr_t)
+__lzo_ptr_linear(const lzo_voidp ptr);
+
+typedef union
+{
+    char            a_char;
+    unsigned char   a_uchar;
+    short           a_short;
+    unsigned short  a_ushort;
+    int             a_int;
+    unsigned int    a_uint;
+    long            a_long;
+    unsigned long   a_ulong;
+    lzo_int         a_lzo_int;
+    lzo_uint        a_lzo_uint;
+    lzo_int32       a_lzo_int32;
+    lzo_uint32      a_lzo_uint32;
+    ptrdiff_t       a_ptrdiff_t;
+    lzo_uintptr_t   a_lzo_uintptr_t;
+    lzo_voidp       a_lzo_voidp;
+    void *          a_void_p;
+    lzo_bytep       a_lzo_bytep;
+    lzo_bytepp      a_lzo_bytepp;
+    lzo_uintp       a_lzo_uintp;
+    lzo_uint *      a_lzo_uint_p;
+    lzo_uint32p     a_lzo_uint32p;
+    lzo_uint32 *    a_lzo_uint32_p;
+    unsigned char * a_uchar_p;
+    char *          a_char_p;
+}
+lzo_full_align_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#define LZO_DETERMINISTIC
+
+#define LZO_DICT_USE_PTR
+#if 0 && (LZO_ARCH_I086)
+#  undef LZO_DICT_USE_PTR
+#endif
+
+#if defined(LZO_DICT_USE_PTR)
+#  define lzo_dict_t    const lzo_bytep
+#  define lzo_dict_p    lzo_dict_t __LZO_MMODEL *
+#else
+#  define lzo_dict_t    lzo_uint
+#  define lzo_dict_p    lzo_dict_t __LZO_MMODEL *
+#endif
+
+#endif
+
+#if !defined(MINILZO_CFG_SKIP_LZO_PTR)
+
+LZO_PUBLIC(lzo_uintptr_t)
+__lzo_ptr_linear(const lzo_voidp ptr)
+{
+    lzo_uintptr_t p;
+
+#if (LZO_ARCH_I086)
+    p = (((lzo_uintptr_t)(ACC_PTR_FP_SEG(ptr))) << (16 - ACC_MM_AHSHIFT)) + (ACC_PTR_FP_OFF(ptr));
+#elif (LZO_MM_PVP)
+    p = (lzo_uintptr_t) (ptr);
+    p = (p << 3) | (p >> 61);
+#else
+    p = (lzo_uintptr_t) PTR_LINEAR(ptr);
+#endif
+
+    return p;
+}
+
+LZO_PUBLIC(unsigned)
+__lzo_align_gap(const lzo_voidp ptr, lzo_uint size)
+{
+#if defined(__LZO_UINTPTR_T_IS_POINTER)
+    size_t n = (size_t) ptr;
+    n = (((n + size - 1) / size) * size) - n;
+#else
+    lzo_uintptr_t p, n;
+    p = __lzo_ptr_linear(ptr);
+    n = (((p + size - 1) / size) * size) - p;
+#endif
+
+    assert(size > 0);
+    assert((long)n >= 0);
+    assert(n <= size);
+    return (unsigned)n;
+}
+
+#endif
+
+/* If you use the LZO library in a product, I would appreciate that you
+ * keep this copyright string in the executable of your product.
+ */
+
+const char __lzo_copyright[] =
+#if !defined(__LZO_IN_MINLZO)
+    LZO_VERSION_STRING;
+#else
+    "\r\n\n"
+    "LZO data compression library.\n"
+    "$Copyright: LZO (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Markus Franz Xaver Johannes Oberhumer\n"
+    "<markus@oberhumer.com>\n"
+    "http://www.oberhumer.com $\n\n"
+    "$Id: LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE " $\n"
+    "$Built: " __DATE__ " " __TIME__ " $\n"
+    "$Info: " LZO_INFO_STRING " $\n";
+#endif
+
+LZO_PUBLIC(const lzo_bytep)
+lzo_copyright(void)
+{
+#if (LZO_OS_DOS16 && LZO_CC_TURBOC)
+    return (lzo_voidp) __lzo_copyright;
+#else
+    return (const lzo_bytep) __lzo_copyright;
+#endif
+}
+
+LZO_PUBLIC(unsigned)
+lzo_version(void)
+{
+    return LZO_VERSION;
+}
+
+LZO_PUBLIC(const char *)
+lzo_version_string(void)
+{
+    return LZO_VERSION_STRING;
+}
+
+LZO_PUBLIC(const char *)
+lzo_version_date(void)
+{
+    return LZO_VERSION_DATE;
+}
+
+LZO_PUBLIC(const lzo_charp)
+_lzo_version_string(void)
+{
+    return LZO_VERSION_STRING;
+}
+
+LZO_PUBLIC(const lzo_charp)
+_lzo_version_date(void)
+{
+    return LZO_VERSION_DATE;
+}
+
+#define LZO_BASE 65521u
+#define LZO_NMAX 5552
+
+#define LZO_DO1(buf,i)  s1 += buf[i]; s2 += s1
+#define LZO_DO2(buf,i)  LZO_DO1(buf,i); LZO_DO1(buf,i+1);
+#define LZO_DO4(buf,i)  LZO_DO2(buf,i); LZO_DO2(buf,i+2);
+#define LZO_DO8(buf,i)  LZO_DO4(buf,i); LZO_DO4(buf,i+4);
+#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8);
+
+LZO_PUBLIC(lzo_uint32)
+lzo_adler32(lzo_uint32 adler, const lzo_bytep buf, lzo_uint len)
+{
+    lzo_uint32 s1 = adler & 0xffff;
+    lzo_uint32 s2 = (adler >> 16) & 0xffff;
+    unsigned k;
+
+    if (buf == NULL)
+        return 1;
+
+    while (len > 0)
+    {
+        k = len < LZO_NMAX ? (unsigned) len : LZO_NMAX;
+        len -= k;
+        if (k >= 16) do
+        {
+            LZO_DO16(buf,0);
+            buf += 16;
+            k -= 16;
+        } while (k >= 16);
+        if (k != 0) do
+        {
+            s1 += *buf++;
+            s2 += s1;
+        } while (--k > 0);
+        s1 %= LZO_BASE;
+        s2 %= LZO_BASE;
+    }
+    return (s2 << 16) | s1;
+}
+
+#undef LZO_DO1
+#undef LZO_DO2
+#undef LZO_DO4
+#undef LZO_DO8
+#undef LZO_DO16
+
+#if !defined(MINILZO_CFG_SKIP_LZO_STRING)
+#undef lzo_memcmp
+#undef lzo_memcpy
+#undef lzo_memmove
+#undef lzo_memset
+#if !defined(__LZO_MMODEL_HUGE)
+#  undef LZO_HAVE_MM_HUGE_PTR
+#endif
+#define lzo_hsize_t             lzo_uint
+#define lzo_hvoid_p             lzo_voidp
+#define lzo_hbyte_p             lzo_bytep
+#define LZOLIB_PUBLIC(r,f)      LZO_PUBLIC(r) f
+#define lzo_hmemcmp             lzo_memcmp
+#define lzo_hmemcpy             lzo_memcpy
+#define lzo_hmemmove            lzo_memmove
+#define lzo_hmemset             lzo_memset
+#define __LZOLIB_HMEMCPY_CH_INCLUDED 1
+#if !defined(LZOLIB_PUBLIC)
+#  define LZOLIB_PUBLIC(r,f)    r __LZOLIB_FUNCNAME(f)
+#endif
+LZOLIB_PUBLIC(int, lzo_hmemcmp) (const lzo_hvoid_p s1, const lzo_hvoid_p s2, lzo_hsize_t len)
+{
+#if (LZO_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMCMP)
+    const lzo_hbyte_p p1 = (const lzo_hbyte_p) s1;
+    const lzo_hbyte_p p2 = (const lzo_hbyte_p) s2;
+    if __lzo_likely(len > 0) do
+    {
+        int d = *p1 - *p2;
+        if (d != 0)
+            return d;
+        p1++; p2++;
+    } while __lzo_likely(--len > 0);
+    return 0;
+#else
+    return memcmp(s1, s2, len);
+#endif
+}
+LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemcpy) (lzo_hvoid_p dest, const lzo_hvoid_p src, lzo_hsize_t len)
+{
+#if (LZO_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMCPY)
+    lzo_hbyte_p p1 = (lzo_hbyte_p) dest;
+    const lzo_hbyte_p p2 = (const lzo_hbyte_p) src;
+    if (!(len > 0) || p1 == p2)
+        return dest;
+    do
+        *p1++ = *p2++;
+    while __lzo_likely(--len > 0);
+    return dest;
+#else
+    return memcpy(dest, src, len);
+#endif
+}
+LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemmove) (lzo_hvoid_p dest, const lzo_hvoid_p src, lzo_hsize_t len)
+{
+#if (LZO_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMMOVE)
+    lzo_hbyte_p p1 = (lzo_hbyte_p) dest;
+    const lzo_hbyte_p p2 = (const lzo_hbyte_p) src;
+    if (!(len > 0) || p1 == p2)
+        return dest;
+    if (p1 < p2)
+    {
+        do
+            *p1++ = *p2++;
+        while __lzo_likely(--len > 0);
+    }
+    else
+    {
+        p1 += len;
+        p2 += len;
+        do
+            *--p1 = *--p2;
+        while __lzo_likely(--len > 0);
+    }
+    return dest;
+#else
+    return memmove(dest, src, len);
+#endif
+}
+LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemset) (lzo_hvoid_p s, int c, lzo_hsize_t len)
+{
+#if (LZO_HAVE_MM_HUGE_PTR) || !defined(HAVE_MEMSET)
+    lzo_hbyte_p p = (lzo_hbyte_p) s;
+    if __lzo_likely(len > 0) do
+        *p++ = (unsigned char) c;
+    while __lzo_likely(--len > 0);
+    return s;
+#else
+    return memset(s, c, len);
+#endif
+}
+#undef LZOLIB_PUBLIC
+#endif
+
+#if !defined(__LZO_IN_MINILZO)
+
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+
+    ACCCHK_ASSERT_IS_SIGNED_T(lzo_int)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uint)
+
+    ACCCHK_ASSERT_IS_SIGNED_T(lzo_int32)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uint32)
+    ACCCHK_ASSERT((LZO_UINT32_C(1) << (int)(8*sizeof(LZO_UINT32_C(1))-1)) > 0)
+    ACCCHK_ASSERT(sizeof(lzo_uint32) >= 4)
+
+#if !defined(__LZO_UINTPTR_T_IS_POINTER)
+    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uintptr_t)
+#endif
+    ACCCHK_ASSERT(sizeof(lzo_uintptr_t) >= sizeof(lzo_voidp))
+
+    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_xint)
+    ACCCHK_ASSERT(sizeof(lzo_xint) >= sizeof(lzo_uint32))
+    ACCCHK_ASSERT(sizeof(lzo_xint) >= sizeof(lzo_uint))
+    ACCCHK_ASSERT(sizeof(lzo_xint) == sizeof(lzo_uint32) || sizeof(lzo_xint) == sizeof(lzo_uint))
+
+#endif
+#undef ACCCHK_ASSERT
+
+LZO_PUBLIC(int)
+_lzo_config_check(void)
+{
+    lzo_bool r = 1;
+    union { unsigned char c[2*sizeof(lzo_xint)]; lzo_xint l[2]; } u;
+    lzo_uintptr_t p;
+
+#if !defined(LZO_CFG_NO_CONFIG_CHECK)
+#if defined(LZO_ABI_BIG_ENDIAN)
+    u.l[0] = u.l[1] = 0; u.c[sizeof(lzo_xint) - 1] = 128;
+    r &= (u.l[0] == 128);
+#endif
+#if defined(LZO_ABI_LITTLE_ENDIAN)
+    u.l[0] = u.l[1] = 0; u.c[0] = 128;
+    r &= (u.l[0] == 128);
+#endif
+#if defined(LZO_UNALIGNED_OK_2)
+    p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];
+    u.l[0] = u.l[1] = 0;
+    r &= ((* (const lzo_ushortp) (p+1)) == 0);
+#endif
+#if defined(LZO_UNALIGNED_OK_4)
+    p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];
+    u.l[0] = u.l[1] = 0;
+    r &= ((* (const lzo_uint32p) (p+1)) == 0);
+#endif
+#endif
+
+    LZO_UNUSED(u); LZO_UNUSED(p);
+    return r == 1 ? LZO_E_OK : LZO_E_ERROR;
+}
+
+int __lzo_init_done = 0;
+
+LZO_PUBLIC(int)
+__lzo_init_v2(unsigned v, int s1, int s2, int s3, int s4, int s5,
+                          int s6, int s7, int s8, int s9)
+{
+    int r;
+
+#if defined(__LZO_IN_MINILZO)
+#elif (LZO_CC_MSC && ((_MSC_VER) < 700))
+#else
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr)  LZO_COMPILE_TIME_ASSERT(expr)
+#endif
+#undef ACCCHK_ASSERT
+
+    __lzo_init_done = 1;
+
+    if (v == 0)
+        return LZO_E_ERROR;
+
+    r = (s1 == -1 || s1 == (int) sizeof(short)) &&
+        (s2 == -1 || s2 == (int) sizeof(int)) &&
+        (s3 == -1 || s3 == (int) sizeof(long)) &&
+        (s4 == -1 || s4 == (int) sizeof(lzo_uint32)) &&
+        (s5 == -1 || s5 == (int) sizeof(lzo_uint)) &&
+        (s6 == -1 || s6 == (int) lzo_sizeof_dict_t) &&
+        (s7 == -1 || s7 == (int) sizeof(char *)) &&
+        (s8 == -1 || s8 == (int) sizeof(lzo_voidp)) &&
+        (s9 == -1 || s9 == (int) sizeof(lzo_callback_t));
+    if (!r)
+        return LZO_E_ERROR;
+
+    r = _lzo_config_check();
+    if (r != LZO_E_OK)
+        return r;
+
+    return r;
+}
+
+#if !defined(__LZO_IN_MINILZO)
+
+#if (LZO_OS_WIN16 && LZO_CC_WATCOMC) && defined(__SW_BD)
+
+#if 0
+BOOL FAR PASCAL LibMain ( HANDLE hInstance, WORD wDataSegment,
+                          WORD wHeapSize, LPSTR lpszCmdLine )
+#else
+int __far __pascal LibMain ( int a, short b, short c, long d )
+#endif
+{
+    LZO_UNUSED(a); LZO_UNUSED(b); LZO_UNUSED(c); LZO_UNUSED(d);
+    return 1;
+}
+
+#endif
+
+#endif
+
+#define do_compress         _lzo1x_1_do_compress
+
+#if !defined(MINILZO_CFG_SKIP_LZO1X_1_COMPRESS)
+
+#define LZO_NEED_DICT_H
+#define D_BITS          14
+#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5)
+#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
+
+#ifndef __LZO_CONFIG1X_H
+#define __LZO_CONFIG1X_H
+
+#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
+#  define LZO1X
+#endif
+
+#if !defined(__LZO_IN_MINILZO)
+#include "lzo/lzo1x.h"
+#endif
+
+#define LZO_EOF_CODE
+#undef LZO_DETERMINISTIC
+
+#define M1_MAX_OFFSET   0x0400
+#ifndef M2_MAX_OFFSET
+#define M2_MAX_OFFSET   0x0800
+#endif
+#define M3_MAX_OFFSET   0x4000
+#define M4_MAX_OFFSET   0xbfff
+
+#define MX_MAX_OFFSET   (M1_MAX_OFFSET + M2_MAX_OFFSET)
+
+#define M1_MIN_LEN      2
+#define M1_MAX_LEN      2
+#define M2_MIN_LEN      3
+#ifndef M2_MAX_LEN
+#define M2_MAX_LEN      8
+#endif
+#define M3_MIN_LEN      3
+#define M3_MAX_LEN      33
+#define M4_MIN_LEN      3
+#define M4_MAX_LEN      9
+
+#define M1_MARKER       0
+#define M2_MARKER       64
+#define M3_MARKER       32
+#define M4_MARKER       16
+
+#ifndef MIN_LOOKAHEAD
+#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
+#endif
+
+#if defined(LZO_NEED_DICT_H)
+
+#ifndef LZO_HASH
+#define LZO_HASH            LZO_HASH_LZO_INCREMENTAL_B
+#endif
+#define DL_MIN_LEN          M2_MIN_LEN
+
+#ifndef __LZO_DICT_H
+#define __LZO_DICT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(D_BITS) && defined(DBITS)
+#  define D_BITS        DBITS
+#endif
+#if !defined(D_BITS)
+#  error "D_BITS is not defined"
+#endif
+#if (D_BITS < 16)
+#  define D_SIZE        LZO_SIZE(D_BITS)
+#  define D_MASK        LZO_MASK(D_BITS)
+#else
+#  define D_SIZE        LZO_USIZE(D_BITS)
+#  define D_MASK        LZO_UMASK(D_BITS)
+#endif
+#define D_HIGH          ((D_MASK >> 1) + 1)
+
+#if !defined(DD_BITS)
+#  define DD_BITS       0
+#endif
+#define DD_SIZE         LZO_SIZE(DD_BITS)
+#define DD_MASK         LZO_MASK(DD_BITS)
+
+#if !defined(DL_BITS)
+#  define DL_BITS       (D_BITS - DD_BITS)
+#endif
+#if (DL_BITS < 16)
+#  define DL_SIZE       LZO_SIZE(DL_BITS)
+#  define DL_MASK       LZO_MASK(DL_BITS)
+#else
+#  define DL_SIZE       LZO_USIZE(DL_BITS)
+#  define DL_MASK       LZO_UMASK(DL_BITS)
+#endif
+
+#if (D_BITS != DL_BITS + DD_BITS)
+#  error "D_BITS does not match"
+#endif
+#if (D_BITS < 8 || D_BITS > 18)
+#  error "invalid D_BITS"
+#endif
+#if (DL_BITS < 8 || DL_BITS > 20)
+#  error "invalid DL_BITS"
+#endif
+#if (DD_BITS < 0 || DD_BITS > 6)
+#  error "invalid DD_BITS"
+#endif
+
+#if !defined(DL_MIN_LEN)
+#  define DL_MIN_LEN    3
+#endif
+#if !defined(DL_SHIFT)
+#  define DL_SHIFT      ((DL_BITS + (DL_MIN_LEN - 1)) / DL_MIN_LEN)
+#endif
+
+#define LZO_HASH_GZIP                   1
+#define LZO_HASH_GZIP_INCREMENTAL       2
+#define LZO_HASH_LZO_INCREMENTAL_A      3
+#define LZO_HASH_LZO_INCREMENTAL_B      4
+
+#if !defined(LZO_HASH)
+#  error "choose a hashing strategy"
+#endif
+
+#undef DM
+#undef DX
+
+#if (DL_MIN_LEN == 3)
+#  define _DV2_A(p,shift1,shift2) \
+        (((( (lzo_xint)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2])
+#  define _DV2_B(p,shift1,shift2) \
+        (((( (lzo_xint)((p)[2]) << shift1) ^ (p)[1]) << shift2) ^ (p)[0])
+#  define _DV3_B(p,shift1,shift2,shift3) \
+        ((_DV2_B((p)+1,shift1,shift2) << (shift3)) ^ (p)[0])
+#elif (DL_MIN_LEN == 2)
+#  define _DV2_A(p,shift1,shift2) \
+        (( (lzo_xint)(p[0]) << shift1) ^ p[1])
+#  define _DV2_B(p,shift1,shift2) \
+        (( (lzo_xint)(p[1]) << shift1) ^ p[2])
+#else
+#  error "invalid DL_MIN_LEN"
+#endif
+#define _DV_A(p,shift)      _DV2_A(p,shift,shift)
+#define _DV_B(p,shift)      _DV2_B(p,shift,shift)
+#define DA2(p,s1,s2) \
+        (((((lzo_xint)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0])
+#define DS2(p,s1,s2) \
+        (((((lzo_xint)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0])
+#define DX2(p,s1,s2) \
+        (((((lzo_xint)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0])
+#define DA3(p,s1,s2,s3) ((DA2((p)+1,s2,s3) << (s1)) + (p)[0])
+#define DS3(p,s1,s2,s3) ((DS2((p)+1,s2,s3) << (s1)) - (p)[0])
+#define DX3(p,s1,s2,s3) ((DX2((p)+1,s2,s3) << (s1)) ^ (p)[0])
+#define DMS(v,s)        ((lzo_uint) (((v) & (D_MASK >> (s))) << (s)))
+#define DM(v)           DMS(v,0)
+
+#if (LZO_HASH == LZO_HASH_GZIP)
+#  define _DINDEX(dv,p)     (_DV_A((p),DL_SHIFT))
+
+#elif (LZO_HASH == LZO_HASH_GZIP_INCREMENTAL)
+#  define __LZO_HASH_INCREMENTAL
+#  define DVAL_FIRST(dv,p)  dv = _DV_A((p),DL_SHIFT)
+#  define DVAL_NEXT(dv,p)   dv = (((dv) << DL_SHIFT) ^ p[2])
+#  define _DINDEX(dv,p)     (dv)
+#  define DVAL_LOOKAHEAD    DL_MIN_LEN
+
+#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_A)
+#  define __LZO_HASH_INCREMENTAL
+#  define DVAL_FIRST(dv,p)  dv = _DV_A((p),5)
+#  define DVAL_NEXT(dv,p) \
+                dv ^= (lzo_xint)(p[-1]) << (2*5); dv = (((dv) << 5) ^ p[2])
+#  define _DINDEX(dv,p)     ((DMUL(0x9f5f,dv)) >> 5)
+#  define DVAL_LOOKAHEAD    DL_MIN_LEN
+
+#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_B)
+#  define __LZO_HASH_INCREMENTAL
+#  define DVAL_FIRST(dv,p)  dv = _DV_B((p),5)
+#  define DVAL_NEXT(dv,p) \
+                dv ^= p[-1]; dv = (((dv) >> 5) ^ ((lzo_xint)(p[2]) << (2*5)))
+#  define _DINDEX(dv,p)     ((DMUL(0x9f5f,dv)) >> 5)
+#  define DVAL_LOOKAHEAD    DL_MIN_LEN
+
+#else
+#  error "choose a hashing strategy"
+#endif
+
+#ifndef DINDEX
+#define DINDEX(dv,p)        ((lzo_uint)((_DINDEX(dv,p)) & DL_MASK) << DD_BITS)
+#endif
+#if !defined(DINDEX1) && defined(D_INDEX1)
+#define DINDEX1             D_INDEX1
+#endif
+#if !defined(DINDEX2) && defined(D_INDEX2)
+#define DINDEX2             D_INDEX2
+#endif
+
+#if !defined(__LZO_HASH_INCREMENTAL)
+#  define DVAL_FIRST(dv,p)  ((void) 0)
+#  define DVAL_NEXT(dv,p)   ((void) 0)
+#  define DVAL_LOOKAHEAD    0
+#endif
+
+#if !defined(DVAL_ASSERT)
+#if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG)
+static void DVAL_ASSERT(lzo_xint dv, const lzo_bytep p)
+{
+    lzo_xint df;
+    DVAL_FIRST(df,(p));
+    assert(DINDEX(dv,p) == DINDEX(df,p));
+}
+#else
+#  define DVAL_ASSERT(dv,p) ((void) 0)
+#endif
+#endif
+
+#if defined(LZO_DICT_USE_PTR)
+#  define DENTRY(p,in)                          (p)
+#  define GINDEX(m_pos,m_off,dict,dindex,in)    m_pos = dict[dindex]
+#else
+#  define DENTRY(p,in)                          ((lzo_uint) ((p)-(in)))
+#  define GINDEX(m_pos,m_off,dict,dindex,in)    m_off = dict[dindex]
+#endif
+
+#if (DD_BITS == 0)
+
+#  define UPDATE_D(dict,drun,dv,p,in)       dict[ DINDEX(dv,p) ] = DENTRY(p,in)
+#  define UPDATE_I(dict,drun,index,p,in)    dict[index] = DENTRY(p,in)
+#  define UPDATE_P(ptr,drun,p,in)           (ptr)[0] = DENTRY(p,in)
+
+#else
+
+#  define UPDATE_D(dict,drun,dv,p,in)   \
+        dict[ DINDEX(dv,p) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
+#  define UPDATE_I(dict,drun,index,p,in)    \
+        dict[ (index) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
+#  define UPDATE_P(ptr,drun,p,in)   \
+        (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK
+
+#endif
+
+#if defined(LZO_DICT_USE_PTR)
+
+#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
+        (m_pos == NULL || (m_off = pd(ip, m_pos)) > max_offset)
+
+#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
+    (BOUNDS_CHECKING_OFF_IN_EXPR(( \
+        m_pos = ip - (lzo_uint) PTR_DIFF(ip,m_pos), \
+        PTR_LT(m_pos,in) || \
+        (m_off = (lzo_uint) PTR_DIFF(ip,m_pos)) <= 0 || \
+         m_off > max_offset )))
+
+#else
+
+#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
+        (m_off == 0 || \
+         ((m_off = pd(ip, in) - m_off) > max_offset) || \
+         (m_pos = (ip) - (m_off), 0) )
+
+#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
+        (pd(ip, in) <= m_off || \
+         ((m_off = pd(ip, in) - m_off) > max_offset) || \
+         (m_pos = (ip) - (m_off), 0) )
+
+#endif
+
+#if defined(LZO_DETERMINISTIC)
+#  define LZO_CHECK_MPOS    LZO_CHECK_MPOS_DET
+#else
+#  define LZO_CHECK_MPOS    LZO_CHECK_MPOS_NON_DET
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif
+
+#endif
+
+#define DO_COMPRESS     lzo1x_1_compress
+
+static __lzo_noinline lzo_uint
+do_compress ( const lzo_bytep in , lzo_uint  in_len,
+                    lzo_bytep out, lzo_uintp out_len,
+                    lzo_voidp wrkmem )
+{
+    register const lzo_bytep ip;
+    lzo_bytep op;
+    const lzo_bytep const in_end = in + in_len;
+    const lzo_bytep const ip_end = in + in_len - M2_MAX_LEN - 5;
+    const lzo_bytep ii;
+    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
+
+    op = out;
+    ip = in;
+    ii = ip;
+
+    ip += 4;
+    for (;;)
+    {
+        register const lzo_bytep m_pos;
+        lzo_uint m_off;
+        lzo_uint m_len;
+        lzo_uint dindex;
+
+        DINDEX1(dindex,ip);
+        GINDEX(m_pos,m_off,dict,dindex,in);
+        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
+            goto literal;
+#if 1
+        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
+            goto try_match;
+        DINDEX2(dindex,ip);
+#endif
+        GINDEX(m_pos,m_off,dict,dindex,in);
+        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
+            goto literal;
+        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
+            goto try_match;
+        goto literal;
+
+try_match:
+#if 1 && defined(LZO_UNALIGNED_OK_2)
+        if (* (const lzo_ushortp) m_pos != * (const lzo_ushortp) ip)
+#else
+        if (m_pos[0] != ip[0] || m_pos[1] != ip[1])
+#endif
+        {
+        }
+        else
+        {
+            if __lzo_likely(m_pos[2] == ip[2])
+            {
+#if 0
+                if (m_off <= M2_MAX_OFFSET)
+                    goto match;
+                if (lit <= 3)
+                    goto match;
+                if (lit == 3)
+                {
+                    assert(op - 2 > out); op[-2] |= LZO_BYTE(3);
+                    *op++ = *ii++; *op++ = *ii++; *op++ = *ii++;
+                    goto code_match;
+                }
+                if (m_pos[3] == ip[3])
+#endif
+                    goto match;
+            }
+            else
+            {
+#if 0
+#if 0
+                if (m_off <= M1_MAX_OFFSET && lit > 0 && lit <= 3)
+#else
+                if (m_off <= M1_MAX_OFFSET && lit == 3)
+#endif
+                {
+                    register lzo_uint t;
+
+                    t = lit;
+                    assert(op - 2 > out); op[-2] |= LZO_BYTE(t);
+                    do *op++ = *ii++; while (--t > 0);
+                    assert(ii == ip);
+                    m_off -= 1;
+                    *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
+                    *op++ = LZO_BYTE(m_off >> 2);
+                    ip += 2;
+                    goto match_done;
+                }
+#endif
+            }
+        }
+
+literal:
+        UPDATE_I(dict,0,dindex,ip,in);
+        ++ip;
+        if __lzo_unlikely(ip >= ip_end)
+            break;
+        continue;
+
+match:
+        UPDATE_I(dict,0,dindex,ip,in);
+        if (pd(ip,ii) > 0)
+        {
+            register lzo_uint t = pd(ip,ii);
+
+            if (t <= 3)
+            {
+                assert(op - 2 > out);
+                op[-2] |= LZO_BYTE(t);
+            }
+            else if (t <= 18)
+                *op++ = LZO_BYTE(t - 3);
+            else
+            {
+                register lzo_uint tt = t - 18;
+
+                *op++ = 0;
+                while (tt > 255)
+                {
+                    tt -= 255;
+                    *op++ = 0;
+                }
+                assert(tt > 0);
+                *op++ = LZO_BYTE(tt);
+            }
+            do *op++ = *ii++; while (--t > 0);
+        }
+
+        assert(ii == ip);
+        ip += 3;
+        if (m_pos[3] != *ip++ || m_pos[4] != *ip++ || m_pos[5] != *ip++ ||
+            m_pos[6] != *ip++ || m_pos[7] != *ip++ || m_pos[8] != *ip++
+#ifdef LZO1Y
+            || m_pos[ 9] != *ip++ || m_pos[10] != *ip++ || m_pos[11] != *ip++
+            || m_pos[12] != *ip++ || m_pos[13] != *ip++ || m_pos[14] != *ip++
+#endif
+           )
+        {
+            --ip;
+            m_len = pd(ip, ii);
+            assert(m_len >= 3); assert(m_len <= M2_MAX_LEN);
+
+            if (m_off <= M2_MAX_OFFSET)
+            {
+                m_off -= 1;
+#if defined(LZO1X)
+                *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2));
+                *op++ = LZO_BYTE(m_off >> 3);
+#elif defined(LZO1Y)
+                *op++ = LZO_BYTE(((m_len + 1) << 4) | ((m_off & 3) << 2));
+                *op++ = LZO_BYTE(m_off >> 2);
+#endif
+            }
+            else if (m_off <= M3_MAX_OFFSET)
+            {
+                m_off -= 1;
+                *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
+                goto m3_m4_offset;
+            }
+            else
+#if defined(LZO1X)
+            {
+                m_off -= 0x4000;
+                assert(m_off > 0); assert(m_off <= 0x7fff);
+                *op++ = LZO_BYTE(M4_MARKER |
+                                 ((m_off & 0x4000) >> 11) | (m_len - 2));
+                goto m3_m4_offset;
+            }
+#elif defined(LZO1Y)
+                goto m4_match;
+#endif
+        }
+        else
+        {
+            {
+                const lzo_bytep end = in_end;
+                const lzo_bytep m = m_pos + M2_MAX_LEN + 1;
+                while (ip < end && *m == *ip)
+                    m++, ip++;
+                m_len = pd(ip, ii);
+            }
+            assert(m_len > M2_MAX_LEN);
+
+            if (m_off <= M3_MAX_OFFSET)
+            {
+                m_off -= 1;
+                if (m_len <= 33)
+                    *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
+                else
+                {
+                    m_len -= 33;
+                    *op++ = M3_MARKER | 0;
+                    goto m3_m4_len;
+                }
+            }
+            else
+            {
+#if defined(LZO1Y)
+m4_match:
+#endif
+                m_off -= 0x4000;
+                assert(m_off > 0); assert(m_off <= 0x7fff);
+                if (m_len <= M4_MAX_LEN)
+                    *op++ = LZO_BYTE(M4_MARKER |
+                                     ((m_off & 0x4000) >> 11) | (m_len - 2));
+                else
+                {
+                    m_len -= M4_MAX_LEN;
+                    *op++ = LZO_BYTE(M4_MARKER | ((m_off & 0x4000) >> 11));
+m3_m4_len:
+                    while (m_len > 255)
+                    {
+                        m_len -= 255;
+                        *op++ = 0;
+                    }
+                    assert(m_len > 0);
+                    *op++ = LZO_BYTE(m_len);
+                }
+            }
+
+m3_m4_offset:
+            *op++ = LZO_BYTE((m_off & 63) << 2);
+            *op++ = LZO_BYTE(m_off >> 6);
+        }
+
+#if 0
+match_done:
+#endif
+        ii = ip;
+        if __lzo_unlikely(ip >= ip_end)
+            break;
+    }
+
+    *out_len = pd(op, out);
+    return pd(in_end,ii);
+}
+
+LZO_PUBLIC(int)
+DO_COMPRESS      ( const lzo_bytep in , lzo_uint  in_len,
+                         lzo_bytep out, lzo_uintp out_len,
+                         lzo_voidp wrkmem )
+{
+    lzo_bytep op = out;
+    lzo_uint t;
+
+    if __lzo_unlikely(in_len <= M2_MAX_LEN + 5)
+        t = in_len;
+    else
+    {
+        t = do_compress(in,in_len,op,out_len,wrkmem);
+        op += *out_len;
+    }
+
+    if (t > 0)
+    {
+        const lzo_bytep ii = in + in_len - t;
+
+        if (op == out && t <= 238)
+            *op++ = LZO_BYTE(17 + t);
+        else if (t <= 3)
+            op[-2] |= LZO_BYTE(t);
+        else if (t <= 18)
+            *op++ = LZO_BYTE(t - 3);
+        else
+        {
+            lzo_uint tt = t - 18;
+
+            *op++ = 0;
+            while (tt > 255)
+            {
+                tt -= 255;
+                *op++ = 0;
+            }
+            assert(tt > 0);
+            *op++ = LZO_BYTE(tt);
+        }
+        do *op++ = *ii++; while (--t > 0);
+    }
+
+    *op++ = M4_MARKER | 1;
+    *op++ = 0;
+    *op++ = 0;
+
+    *out_len = pd(op, out);
+    return LZO_E_OK;
+}
+
+#endif
+
+#undef do_compress
+#undef DO_COMPRESS
+#undef LZO_HASH
+
+#undef LZO_TEST_OVERRUN
+#undef DO_DECOMPRESS
+#define DO_DECOMPRESS       lzo1x_decompress
+
+#if !defined(MINILZO_CFG_SKIP_LZO1X_DECOMPRESS)
+
+#if defined(LZO_TEST_OVERRUN)
+#  if !defined(LZO_TEST_OVERRUN_INPUT)
+#    define LZO_TEST_OVERRUN_INPUT       2
+#  endif
+#  if !defined(LZO_TEST_OVERRUN_OUTPUT)
+#    define LZO_TEST_OVERRUN_OUTPUT      2
+#  endif
+#  if !defined(LZO_TEST_OVERRUN_LOOKBEHIND)
+#    define LZO_TEST_OVERRUN_LOOKBEHIND
+#  endif
+#endif
+
+#undef TEST_IP
+#undef TEST_OP
+#undef TEST_LB
+#undef TEST_LBO
+#undef NEED_IP
+#undef NEED_OP
+#undef HAVE_TEST_IP
+#undef HAVE_TEST_OP
+#undef HAVE_NEED_IP
+#undef HAVE_NEED_OP
+#undef HAVE_ANY_IP
+#undef HAVE_ANY_OP
+
+#if defined(LZO_TEST_OVERRUN_INPUT)
+#  if (LZO_TEST_OVERRUN_INPUT >= 1)
+#    define TEST_IP             (ip < ip_end)
+#  endif
+#  if (LZO_TEST_OVERRUN_INPUT >= 2)
+#    define NEED_IP(x) \
+            if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_OVERRUN_OUTPUT)
+#  if (LZO_TEST_OVERRUN_OUTPUT >= 1)
+#    define TEST_OP             (op <= op_end)
+#  endif
+#  if (LZO_TEST_OVERRUN_OUTPUT >= 2)
+#    undef TEST_OP
+#    define NEED_OP(x) \
+            if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
+#  define TEST_LB(m_pos)        if (m_pos < out || m_pos >= op) goto lookbehind_overrun
+#  define TEST_LBO(m_pos,o)     if (m_pos < out || m_pos >= op - (o)) goto lookbehind_overrun
+#else
+#  define TEST_LB(m_pos)        ((void) 0)
+#  define TEST_LBO(m_pos,o)     ((void) 0)
+#endif
+
+#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
+#  define TEST_IP               (ip < ip_end)
+#endif
+
+#if defined(TEST_IP)
+#  define HAVE_TEST_IP
+#else
+#  define TEST_IP               1
+#endif
+#if defined(TEST_OP)
+#  define HAVE_TEST_OP
+#else
+#  define TEST_OP               1
+#endif
+
+#if defined(NEED_IP)
+#  define HAVE_NEED_IP
+#else
+#  define NEED_IP(x)            ((void) 0)
+#endif
+#if defined(NEED_OP)
+#  define HAVE_NEED_OP
+#else
+#  define NEED_OP(x)            ((void) 0)
+#endif
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
+#  define HAVE_ANY_IP
+#endif
+#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
+#  define HAVE_ANY_OP
+#endif
+
+#undef __COPY4
+#define __COPY4(dst,src)    * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src)
+
+#undef COPY4
+#if defined(LZO_UNALIGNED_OK_4)
+#  define COPY4(dst,src)    __COPY4(dst,src)
+#elif defined(LZO_ALIGNED_OK_4)
+#  define COPY4(dst,src)    __COPY4((lzo_uintptr_t)(dst),(lzo_uintptr_t)(src))
+#endif
+
+#if defined(DO_DECOMPRESS)
+LZO_PUBLIC(int)
+DO_DECOMPRESS  ( const lzo_bytep in , lzo_uint  in_len,
+                       lzo_bytep out, lzo_uintp out_len,
+                       lzo_voidp wrkmem )
+#endif
+{
+    register lzo_bytep op;
+    register const lzo_bytep ip;
+    register lzo_uint t;
+#if defined(COPY_DICT)
+    lzo_uint m_off;
+    const lzo_bytep dict_end;
+#else
+    register const lzo_bytep m_pos;
+#endif
+
+    const lzo_bytep const ip_end = in + in_len;
+#if defined(HAVE_ANY_OP)
+    lzo_bytep const op_end = out + *out_len;
+#endif
+#if defined(LZO1Z)
+    lzo_uint last_m_off = 0;
+#endif
+
+    LZO_UNUSED(wrkmem);
+
+#if defined(COPY_DICT)
+    if (dict)
+    {
+        if (dict_len > M4_MAX_OFFSET)
+        {
+            dict += dict_len - M4_MAX_OFFSET;
+            dict_len = M4_MAX_OFFSET;
+        }
+        dict_end = dict + dict_len;
+    }
+    else
+    {
+        dict_len = 0;
+        dict_end = NULL;
+    }
+#endif
+
+    *out_len = 0;
+
+    op = out;
+    ip = in;
+
+    if (*ip > 17)
+    {
+        t = *ip++ - 17;
+        if (t < 4)
+            goto match_next;
+        assert(t > 0); NEED_OP(t); NEED_IP(t+1);
+        do *op++ = *ip++; while (--t > 0);
+        goto first_literal_run;
+    }
+
+    while (TEST_IP && TEST_OP)
+    {
+        t = *ip++;
+        if (t >= 16)
+            goto match;
+        if (t == 0)
+        {
+            NEED_IP(1);
+            while (*ip == 0)
+            {
+                t += 255;
+                ip++;
+                NEED_IP(1);
+            }
+            t += 15 + *ip++;
+        }
+        assert(t > 0); NEED_OP(t+3); NEED_IP(t+4);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+        if (PTR_ALIGNED2_4(op,ip))
+        {
+#endif
+        COPY4(op,ip);
+        op += 4; ip += 4;
+        if (--t > 0)
+        {
+            if (t >= 4)
+            {
+                do {
+                    COPY4(op,ip);
+                    op += 4; ip += 4; t -= 4;
+                } while (t >= 4);
+                if (t > 0) do *op++ = *ip++; while (--t > 0);
+            }
+            else
+                do *op++ = *ip++; while (--t > 0);
+        }
+#if !defined(LZO_UNALIGNED_OK_4)
+        }
+        else
+#endif
+#endif
+#if !defined(LZO_UNALIGNED_OK_4)
+        {
+            *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
+            do *op++ = *ip++; while (--t > 0);
+        }
+#endif
+
+first_literal_run:
+
+        t = *ip++;
+        if (t >= 16)
+            goto match;
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+        m_off = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+        last_m_off = m_off;
+#else
+        m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2);
+#endif
+        NEED_OP(3);
+        t = 3; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+        t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+        m_pos = op - t;
+        last_m_off = t;
+#else
+        m_pos = op - (1 + M2_MAX_OFFSET);
+        m_pos -= t >> 2;
+        m_pos -= *ip++ << 2;
+#endif
+        TEST_LB(m_pos); NEED_OP(3);
+        *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos;
+#endif
+        goto match_done;
+
+        do {
+match:
+            if (t >= 64)
+            {
+#if defined(COPY_DICT)
+#if defined(LZO1X)
+                m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3);
+                t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+                m_off = 1 + ((t >> 2) & 3) + (*ip++ << 2);
+                t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+                m_off = t & 0x1f;
+                if (m_off >= 0x1c)
+                    m_off = last_m_off;
+                else
+                {
+                    m_off = 1 + (m_off << 6) + (*ip++ >> 2);
+                    last_m_off = m_off;
+                }
+                t = (t >> 5) - 1;
+#endif
+#else
+#if defined(LZO1X)
+                m_pos = op - 1;
+                m_pos -= (t >> 2) & 7;
+                m_pos -= *ip++ << 3;
+                t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+                m_pos = op - 1;
+                m_pos -= (t >> 2) & 3;
+                m_pos -= *ip++ << 2;
+                t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+                {
+                    lzo_uint off = t & 0x1f;
+                    m_pos = op;
+                    if (off >= 0x1c)
+                    {
+                        assert(last_m_off > 0);
+                        m_pos -= last_m_off;
+                    }
+                    else
+                    {
+                        off = 1 + (off << 6) + (*ip++ >> 2);
+                        m_pos -= off;
+                        last_m_off = off;
+                    }
+                }
+                t = (t >> 5) - 1;
+#endif
+                TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
+                goto copy_match;
+#endif
+            }
+            else if (t >= 32)
+            {
+                t &= 31;
+                if (t == 0)
+                {
+                    NEED_IP(1);
+                    while (*ip == 0)
+                    {
+                        t += 255;
+                        ip++;
+                        NEED_IP(1);
+                    }
+                    t += 31 + *ip++;
+                }
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+                m_off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+                last_m_off = m_off;
+#else
+                m_off = 1 + (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#else
+#if defined(LZO1Z)
+                {
+                    lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+                    m_pos = op - off;
+                    last_m_off = off;
+                }
+#elif defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
+                m_pos = op - 1;
+                m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+                m_pos = op - 1;
+                m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#endif
+                ip += 2;
+            }
+            else if (t >= 16)
+            {
+#if defined(COPY_DICT)
+                m_off = (t & 8) << 11;
+#else
+                m_pos = op;
+                m_pos -= (t & 8) << 11;
+#endif
+                t &= 7;
+                if (t == 0)
+                {
+                    NEED_IP(1);
+                    while (*ip == 0)
+                    {
+                        t += 255;
+                        ip++;
+                        NEED_IP(1);
+                    }
+                    t += 7 + *ip++;
+                }
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+                m_off += (ip[0] << 6) + (ip[1] >> 2);
+#else
+                m_off += (ip[0] >> 2) + (ip[1] << 6);
+#endif
+                ip += 2;
+                if (m_off == 0)
+                    goto eof_found;
+                m_off += 0x4000;
+#if defined(LZO1Z)
+                last_m_off = m_off;
+#endif
+#else
+#if defined(LZO1Z)
+                m_pos -= (ip[0] << 6) + (ip[1] >> 2);
+#elif defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
+                m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+                m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+                ip += 2;
+                if (m_pos == op)
+                    goto eof_found;
+                m_pos -= 0x4000;
+#if defined(LZO1Z)
+                last_m_off = pd((const lzo_bytep)op, m_pos);
+#endif
+#endif
+            }
+            else
+            {
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+                m_off = 1 + (t << 6) + (*ip++ >> 2);
+                last_m_off = m_off;
+#else
+                m_off = 1 + (t >> 2) + (*ip++ << 2);
+#endif
+                NEED_OP(2);
+                t = 2; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+                t = 1 + (t << 6) + (*ip++ >> 2);
+                m_pos = op - t;
+                last_m_off = t;
+#else
+                m_pos = op - 1;
+                m_pos -= t >> 2;
+                m_pos -= *ip++ << 2;
+#endif
+                TEST_LB(m_pos); NEED_OP(2);
+                *op++ = *m_pos++; *op++ = *m_pos;
+#endif
+                goto match_done;
+            }
+
+#if defined(COPY_DICT)
+
+            NEED_OP(t+3-1);
+            t += 3-1; COPY_DICT(t,m_off)
+
+#else
+
+            TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+            if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos))
+            {
+                assert((op - m_pos) >= 4);
+#else
+            if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
+            {
+#endif
+                COPY4(op,m_pos);
+                op += 4; m_pos += 4; t -= 4 - (3 - 1);
+                do {
+                    COPY4(op,m_pos);
+                    op += 4; m_pos += 4; t -= 4;
+                } while (t >= 4);
+                if (t > 0) do *op++ = *m_pos++; while (--t > 0);
+            }
+            else
+#endif
+            {
+copy_match:
+                *op++ = *m_pos++; *op++ = *m_pos++;
+                do *op++ = *m_pos++; while (--t > 0);
+            }
+
+#endif
+
+match_done:
+#if defined(LZO1Z)
+            t = ip[-1] & 3;
+#else
+            t = ip[-2] & 3;
+#endif
+            if (t == 0)
+                break;
+
+match_next:
+            assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+1);
+#if 0
+            do *op++ = *ip++; while (--t > 0);
+#else
+            *op++ = *ip++;
+            if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } }
+#endif
+            t = *ip++;
+        } while (TEST_IP && TEST_OP);
+    }
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
+    *out_len = pd(op, out);
+    return LZO_E_EOF_NOT_FOUND;
+#endif
+
+eof_found:
+    assert(t == 1);
+    *out_len = pd(op, out);
+    return (ip == ip_end ? LZO_E_OK :
+           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
+
+#if defined(HAVE_NEED_IP)
+input_overrun:
+    *out_len = pd(op, out);
+    return LZO_E_INPUT_OVERRUN;
+#endif
+
+#if defined(HAVE_NEED_OP)
+output_overrun:
+    *out_len = pd(op, out);
+    return LZO_E_OUTPUT_OVERRUN;
+#endif
+
+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
+lookbehind_overrun:
+    *out_len = pd(op, out);
+    return LZO_E_LOOKBEHIND_OVERRUN;
+#endif
+}
+
+#endif
+
+#define LZO_TEST_OVERRUN
+#undef DO_DECOMPRESS
+#define DO_DECOMPRESS       lzo1x_decompress_safe
+
+#if !defined(MINILZO_CFG_SKIP_LZO1X_DECOMPRESS_SAFE)
+
+#if defined(LZO_TEST_OVERRUN)
+#  if !defined(LZO_TEST_OVERRUN_INPUT)
+#    define LZO_TEST_OVERRUN_INPUT       2
+#  endif
+#  if !defined(LZO_TEST_OVERRUN_OUTPUT)
+#    define LZO_TEST_OVERRUN_OUTPUT      2
+#  endif
+#  if !defined(LZO_TEST_OVERRUN_LOOKBEHIND)
+#    define LZO_TEST_OVERRUN_LOOKBEHIND
+#  endif
+#endif
+
+#undef TEST_IP
+#undef TEST_OP
+#undef TEST_LB
+#undef TEST_LBO
+#undef NEED_IP
+#undef NEED_OP
+#undef HAVE_TEST_IP
+#undef HAVE_TEST_OP
+#undef HAVE_NEED_IP
+#undef HAVE_NEED_OP
+#undef HAVE_ANY_IP
+#undef HAVE_ANY_OP
+
+#if defined(LZO_TEST_OVERRUN_INPUT)
+#  if (LZO_TEST_OVERRUN_INPUT >= 1)
+#    define TEST_IP             (ip < ip_end)
+#  endif
+#  if (LZO_TEST_OVERRUN_INPUT >= 2)
+#    define NEED_IP(x) \
+            if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_OVERRUN_OUTPUT)
+#  if (LZO_TEST_OVERRUN_OUTPUT >= 1)
+#    define TEST_OP             (op <= op_end)
+#  endif
+#  if (LZO_TEST_OVERRUN_OUTPUT >= 2)
+#    undef TEST_OP
+#    define NEED_OP(x) \
+            if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
+#  define TEST_LB(m_pos)        if (m_pos < out || m_pos >= op) goto lookbehind_overrun
+#  define TEST_LBO(m_pos,o)     if (m_pos < out || m_pos >= op - (o)) goto lookbehind_overrun
+#else
+#  define TEST_LB(m_pos)        ((void) 0)
+#  define TEST_LBO(m_pos,o)     ((void) 0)
+#endif
+
+#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
+#  define TEST_IP               (ip < ip_end)
+#endif
+
+#if defined(TEST_IP)
+#  define HAVE_TEST_IP
+#else
+#  define TEST_IP               1
+#endif
+#if defined(TEST_OP)
+#  define HAVE_TEST_OP
+#else
+#  define TEST_OP               1
+#endif
+
+#if defined(NEED_IP)
+#  define HAVE_NEED_IP
+#else
+#  define NEED_IP(x)            ((void) 0)
+#endif
+#if defined(NEED_OP)
+#  define HAVE_NEED_OP
+#else
+#  define NEED_OP(x)            ((void) 0)
+#endif
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
+#  define HAVE_ANY_IP
+#endif
+#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
+#  define HAVE_ANY_OP
+#endif
+
+#undef __COPY4
+#define __COPY4(dst,src)    * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src)
+
+#undef COPY4
+#if defined(LZO_UNALIGNED_OK_4)
+#  define COPY4(dst,src)    __COPY4(dst,src)
+#elif defined(LZO_ALIGNED_OK_4)
+#  define COPY4(dst,src)    __COPY4((lzo_uintptr_t)(dst),(lzo_uintptr_t)(src))
+#endif
+
+#if defined(DO_DECOMPRESS)
+LZO_PUBLIC(int)
+DO_DECOMPRESS  ( const lzo_bytep in , lzo_uint  in_len,
+                       lzo_bytep out, lzo_uintp out_len,
+                       lzo_voidp wrkmem )
+#endif
+{
+    register lzo_bytep op;
+    register const lzo_bytep ip;
+    register lzo_uint t;
+#if defined(COPY_DICT)
+    lzo_uint m_off;
+    const lzo_bytep dict_end;
+#else
+    register const lzo_bytep m_pos;
+#endif
+
+    const lzo_bytep const ip_end = in + in_len;
+#if defined(HAVE_ANY_OP)
+    lzo_bytep const op_end = out + *out_len;
+#endif
+#if defined(LZO1Z)
+    lzo_uint last_m_off = 0;
+#endif
+
+    LZO_UNUSED(wrkmem);
+
+#if defined(COPY_DICT)
+    if (dict)
+    {
+        if (dict_len > M4_MAX_OFFSET)
+        {
+            dict += dict_len - M4_MAX_OFFSET;
+            dict_len = M4_MAX_OFFSET;
+        }
+        dict_end = dict + dict_len;
+    }
+    else
+    {
+        dict_len = 0;
+        dict_end = NULL;
+    }
+#endif
+
+    *out_len = 0;
+
+    op = out;
+    ip = in;
+
+    if (*ip > 17)
+    {
+        t = *ip++ - 17;
+        if (t < 4)
+            goto match_next;
+        assert(t > 0); NEED_OP(t); NEED_IP(t+1);
+        do *op++ = *ip++; while (--t > 0);
+        goto first_literal_run;
+    }
+
+    while (TEST_IP && TEST_OP)
+    {
+        t = *ip++;
+        if (t >= 16)
+            goto match;
+        if (t == 0)
+        {
+            NEED_IP(1);
+            while (*ip == 0)
+            {
+                t += 255;
+                ip++;
+                NEED_IP(1);
+            }
+            t += 15 + *ip++;
+        }
+        assert(t > 0); NEED_OP(t+3); NEED_IP(t+4);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+        if (PTR_ALIGNED2_4(op,ip))
+        {
+#endif
+        COPY4(op,ip);
+        op += 4; ip += 4;
+        if (--t > 0)
+        {
+            if (t >= 4)
+            {
+                do {
+                    COPY4(op,ip);
+                    op += 4; ip += 4; t -= 4;
+                } while (t >= 4);
+                if (t > 0) do *op++ = *ip++; while (--t > 0);
+            }
+            else
+                do *op++ = *ip++; while (--t > 0);
+        }
+#if !defined(LZO_UNALIGNED_OK_4)
+        }
+        else
+#endif
+#endif
+#if !defined(LZO_UNALIGNED_OK_4)
+        {
+            *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
+            do *op++ = *ip++; while (--t > 0);
+        }
+#endif
+
+first_literal_run:
+
+        t = *ip++;
+        if (t >= 16)
+            goto match;
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+        m_off = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+        last_m_off = m_off;
+#else
+        m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2);
+#endif
+        NEED_OP(3);
+        t = 3; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+        t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+        m_pos = op - t;
+        last_m_off = t;
+#else
+        m_pos = op - (1 + M2_MAX_OFFSET);
+        m_pos -= t >> 2;
+        m_pos -= *ip++ << 2;
+#endif
+        TEST_LB(m_pos); NEED_OP(3);
+        *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos;
+#endif
+        goto match_done;
+
+        do {
+match:
+            if (t >= 64)
+            {
+#if defined(COPY_DICT)
+#if defined(LZO1X)
+                m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3);
+                t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+                m_off = 1 + ((t >> 2) & 3) + (*ip++ << 2);
+                t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+                m_off = t & 0x1f;
+                if (m_off >= 0x1c)
+                    m_off = last_m_off;
+                else
+                {
+                    m_off = 1 + (m_off << 6) + (*ip++ >> 2);
+                    last_m_off = m_off;
+                }
+                t = (t >> 5) - 1;
+#endif
+#else
+#if defined(LZO1X)
+                m_pos = op - 1;
+                m_pos -= (t >> 2) & 7;
+                m_pos -= *ip++ << 3;
+                t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+                m_pos = op - 1;
+                m_pos -= (t >> 2) & 3;
+                m_pos -= *ip++ << 2;
+                t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+                {
+                    lzo_uint off = t & 0x1f;
+                    m_pos = op;
+                    if (off >= 0x1c)
+                    {
+                        assert(last_m_off > 0);
+                        m_pos -= last_m_off;
+                    }
+                    else
+                    {
+                        off = 1 + (off << 6) + (*ip++ >> 2);
+                        m_pos -= off;
+                        last_m_off = off;
+                    }
+                }
+                t = (t >> 5) - 1;
+#endif
+                TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
+                goto copy_match;
+#endif
+            }
+            else if (t >= 32)
+            {
+                t &= 31;
+                if (t == 0)
+                {
+                    NEED_IP(1);
+                    while (*ip == 0)
+                    {
+                        t += 255;
+                        ip++;
+                        NEED_IP(1);
+                    }
+                    t += 31 + *ip++;
+                }
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+                m_off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+                last_m_off = m_off;
+#else
+                m_off = 1 + (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#else
+#if defined(LZO1Z)
+                {
+                    lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+                    m_pos = op - off;
+                    last_m_off = off;
+                }
+#elif defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
+                m_pos = op - 1;
+                m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+                m_pos = op - 1;
+                m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#endif
+                ip += 2;
+            }
+            else if (t >= 16)
+            {
+#if defined(COPY_DICT)
+                m_off = (t & 8) << 11;
+#else
+                m_pos = op;
+                m_pos -= (t & 8) << 11;
+#endif
+                t &= 7;
+                if (t == 0)
+                {
+                    NEED_IP(1);
+                    while (*ip == 0)
+                    {
+                        t += 255;
+                        ip++;
+                        NEED_IP(1);
+                    }
+                    t += 7 + *ip++;
+                }
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+                m_off += (ip[0] << 6) + (ip[1] >> 2);
+#else
+                m_off += (ip[0] >> 2) + (ip[1] << 6);
+#endif
+                ip += 2;
+                if (m_off == 0)
+                    goto eof_found;
+                m_off += 0x4000;
+#if defined(LZO1Z)
+                last_m_off = m_off;
+#endif
+#else
+#if defined(LZO1Z)
+                m_pos -= (ip[0] << 6) + (ip[1] >> 2);
+#elif defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
+                m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+                m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+                ip += 2;
+                if (m_pos == op)
+                    goto eof_found;
+                m_pos -= 0x4000;
+#if defined(LZO1Z)
+                last_m_off = pd((const lzo_bytep)op, m_pos);
+#endif
+#endif
+            }
+            else
+            {
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+                m_off = 1 + (t << 6) + (*ip++ >> 2);
+                last_m_off = m_off;
+#else
+                m_off = 1 + (t >> 2) + (*ip++ << 2);
+#endif
+                NEED_OP(2);
+                t = 2; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+                t = 1 + (t << 6) + (*ip++ >> 2);
+                m_pos = op - t;
+                last_m_off = t;
+#else
+                m_pos = op - 1;
+                m_pos -= t >> 2;
+                m_pos -= *ip++ << 2;
+#endif
+                TEST_LB(m_pos); NEED_OP(2);
+                *op++ = *m_pos++; *op++ = *m_pos;
+#endif
+                goto match_done;
+            }
+
+#if defined(COPY_DICT)
+
+            NEED_OP(t+3-1);
+            t += 3-1; COPY_DICT(t,m_off)
+
+#else
+
+            TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+            if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos))
+            {
+                assert((op - m_pos) >= 4);
+#else
+            if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
+            {
+#endif
+                COPY4(op,m_pos);
+                op += 4; m_pos += 4; t -= 4 - (3 - 1);
+                do {
+                    COPY4(op,m_pos);
+                    op += 4; m_pos += 4; t -= 4;
+                } while (t >= 4);
+                if (t > 0) do *op++ = *m_pos++; while (--t > 0);
+            }
+            else
+#endif
+            {
+copy_match:
+                *op++ = *m_pos++; *op++ = *m_pos++;
+                do *op++ = *m_pos++; while (--t > 0);
+            }
+
+#endif
+
+match_done:
+#if defined(LZO1Z)
+            t = ip[-1] & 3;
+#else
+            t = ip[-2] & 3;
+#endif
+            if (t == 0)
+                break;
+
+match_next:
+            assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+1);
+#if 0
+            do *op++ = *ip++; while (--t > 0);
+#else
+            *op++ = *ip++;
+            if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } }
+#endif
+            t = *ip++;
+        } while (TEST_IP && TEST_OP);
+    }
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
+    *out_len = pd(op, out);
+    return LZO_E_EOF_NOT_FOUND;
+#endif
+
+eof_found:
+    assert(t == 1);
+    *out_len = pd(op, out);
+    return (ip == ip_end ? LZO_E_OK :
+           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
+
+#if defined(HAVE_NEED_IP)
+input_overrun:
+    *out_len = pd(op, out);
+    return LZO_E_INPUT_OVERRUN;
+#endif
+
+#if defined(HAVE_NEED_OP)
+output_overrun:
+    *out_len = pd(op, out);
+    return LZO_E_OUTPUT_OVERRUN;
+#endif
+
+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
+lookbehind_overrun:
+    *out_len = pd(op, out);
+    return LZO_E_LOOKBEHIND_OVERRUN;
+#endif
+}
+
+#endif
+
+/***** End of minilzo.c *****/
+
diff --git a/extern/lzo/minilzo/minilzo.h b/extern/lzo/minilzo/minilzo.h
new file mode 100644
index 00000000000..93916bc89b2
--- /dev/null
+++ b/extern/lzo/minilzo/minilzo.h
@@ -0,0 +1,112 @@
+/* minilzo.h -- mini subset of the LZO real-time data compression library
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   The LZO library 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 LZO library 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 the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+   http://www.oberhumer.com/opensource/lzo/
+ */
+
+/*
+ * NOTE:
+ *   the full LZO package can be found at
+ *   http://www.oberhumer.com/opensource/lzo/
+ */
+
+
+#ifndef __MINILZO_H
+#define __MINILZO_H
+
+#define MINILZO_VERSION         0x2030
+
+#ifdef __LZOCONF_H
+#  error "you cannot use both LZO and miniLZO"
+#endif
+
+#undef LZO_HAVE_CONFIG_H
+#include "lzoconf.h"
+
+#if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION)
+#  error "version mismatch in header files"
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/***********************************************************************
+//
+************************************************************************/
+
+/* Memory required for the wrkmem parameter.
+ * When the required size is 0, you can also pass a NULL pointer.
+ */
+
+#define LZO1X_MEM_COMPRESS      LZO1X_1_MEM_COMPRESS
+#define LZO1X_1_MEM_COMPRESS    ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
+#define LZO1X_MEM_DECOMPRESS    (0)
+
+
+/* compression */
+LZO_EXTERN(int)
+lzo1x_1_compress        ( const lzo_bytep src, lzo_uint  src_len,
+                                lzo_bytep dst, lzo_uintp dst_len,
+                                lzo_voidp wrkmem );
+
+/* decompression */
+LZO_EXTERN(int)
+lzo1x_decompress        ( const lzo_bytep src, lzo_uint  src_len,
+                                lzo_bytep dst, lzo_uintp dst_len,
+                                lzo_voidp wrkmem /* NOT USED */ );
+
+/* safe decompression with overrun testing */
+LZO_EXTERN(int)
+lzo1x_decompress_safe   ( const lzo_bytep src, lzo_uint  src_len,
+                                lzo_bytep dst, lzo_uintp dst_len,
+                                lzo_voidp wrkmem /* NOT USED */ );
+
+
+#define LZO_OUT_LEN(size)     ((size) + (size) / 16 + 64 + 3)
+
+#define LZO_HEAP_ALLOC(var,size) \
+    lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ]
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* already included */
+
diff --git a/intern/smoke/extern/smoke_API.h b/intern/smoke/extern/smoke_API.h
index f0dba3cc7a4..b21ce473202 100644
--- a/intern/smoke/extern/smoke_API.h
+++ b/intern/smoke/extern/smoke_API.h
@@ -20,7 +20,7 @@
  * The Original Code is Copyright (C) 2009 by Daniel Genrich
  * All rights reserved.
  *
- * Contributor(s): None
+ * Contributor(s): Daniel Genrich
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -32,6 +32,10 @@
 extern "C" {
 #endif
 
+// export
+void smoke_export(struct FLUID_3D *fluid, float *dt, float *dx, float **dens, float **densold, float **heat, float **heatold, float **vx, float **vy, float **vz, float **vxold, float **vyold, float **vzold, unsigned char **obstacles);
+
+// low res
 struct FLUID_3D *smoke_init(int *res, float *p0, float dt);
 void smoke_free(struct FLUID_3D *fluid);
 
@@ -57,11 +61,14 @@ void smoke_turbulence_free(struct WTURBULENCE *wt);
 void smoke_turbulence_step(struct WTURBULENCE *wt, struct FLUID_3D *fluid);
 
 float *smoke_turbulence_get_density(struct WTURBULENCE *wt);
-void smoke_turbulence_get_res(struct WTURBULENCE *wt, int *res);
+void smoke_turbulence_get_res(struct WTURBULENCE *wt, unsigned int *res);
 void smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type);
-void smoke_initWaveletBlenderRNA(struct WTURBULENCE *wt, float *strength);
+void smoke_turbulence_initBlenderRNA(struct WTURBULENCE *wt, float *strength);
 
-void smoke_dissolve_wavelet(struct WTURBULENCE *wt, int speed, int log);
+void smoke_turbulence_dissolve(struct WTURBULENCE *wt, int speed, int log);
+
+// export
+void smoke_turbulence_export(struct WTURBULENCE *wt, float **dens, float **densold, float **tcu, float **tcv, float **tcw);
 
 #ifdef __cplusplus
 }
diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index ff66f29143c..89dd893198b 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -75,8 +75,6 @@ FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
 	// allocate arrays
 	_totalCells   = _xRes * _yRes * _zRes;
 	_slabSize = _xRes * _yRes;
-	_divergence   = new float[_totalCells];
-	_pressure     = new float[_totalCells];
 	_xVelocity    = new float[_totalCells];
 	_yVelocity    = new float[_totalCells];
 	_zVelocity    = new float[_totalCells];
@@ -86,20 +84,11 @@ FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
 	_xForce       = new float[_totalCells];
 	_yForce       = new float[_totalCells];
 	_zForce       = new float[_totalCells];
-	_vorticity    = new float[_totalCells];
 	_density      = new float[_totalCells];
 	_densityOld   = new float[_totalCells];
 	_heat         = new float[_totalCells];
 	_heatOld      = new float[_totalCells];
-	_residual     = new float[_totalCells];
-	_direction    = new float[_totalCells];
-	_q            = new float[_totalCells];
-	_obstacles    = new unsigned char[_totalCells];
-	_xVorticity   = new float[_totalCells];
-	_yVorticity   = new float[_totalCells];
-	_zVorticity   = new float[_totalCells];
-	_h			  = new float[_totalCells];
-	_Precond	  = new float[_totalCells];
+	_obstacles    = new unsigned char[_totalCells]; // set 0 at end of step
 
 	// DG TODO: check if alloc went fine
 
@@ -109,8 +98,6 @@ FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
 		_densityOld[x]   = 0.0f;
 		_heat[x]         = 0.0f;
 		_heatOld[x]      = 0.0f;
-		_divergence[x]   = 0.0f;
-		_pressure[x]     = 0.0f;
 		_xVelocity[x]    = 0.0f;
 		_yVelocity[x]    = 0.0f;
 		_zVelocity[x]    = 0.0f;
@@ -120,19 +107,11 @@ FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
 		_xForce[x]       = 0.0f;
 		_yForce[x]       = 0.0f;
 		_zForce[x]       = 0.0f;
-		_xVorticity[x]   = 0.0f;
-		_yVorticity[x]   = 0.0f;
-		_zVorticity[x]   = 0.0f;
-		_residual[x]     = 0.0f;
-		_q[x]			 = 0.0f;
-		_direction[x]    = 0.0f;
-		_h[x]			 = 0.0f;
-		_Precond[x]		 = 0.0f;
 		_obstacles[x]    = false;
 	}
 
 	// set side obstacles
-  int index;
+  size_t index;
   for (int y = 0; y < _yRes; y++) // z
     for (int x = 0; x < _xRes; x++)
     {
@@ -177,8 +156,6 @@ FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
 
 FLUID_3D::~FLUID_3D()
 {
-	if (_divergence) delete[] _divergence;
-	if (_pressure) delete[] _pressure;
 	if (_xVelocity) delete[] _xVelocity;
 	if (_yVelocity) delete[] _yVelocity;
 	if (_zVelocity) delete[] _zVelocity;
@@ -188,23 +165,14 @@ FLUID_3D::~FLUID_3D()
 	if (_xForce) delete[] _xForce;
 	if (_yForce) delete[] _yForce;
 	if (_zForce) delete[] _zForce;
-	if (_residual) delete[] _residual;
-	if (_direction) delete[] _direction;
-	if (_q)       delete[] _q;
 	if (_density) delete[] _density;
 	if (_densityOld) delete[] _densityOld;
 	if (_heat) delete[] _heat;
 	if (_heatOld) delete[] _heatOld;
-	if (_xVorticity) delete[] _xVorticity;
-	if (_yVorticity) delete[] _yVorticity;
-	if (_zVorticity) delete[] _zVorticity;
-	if (_vorticity) delete[] _vorticity;
-	if (_h) delete[] _h;
-	if (_Precond) delete[] _Precond;
 	if (_obstacles) delete[] _obstacles;
     // if (_wTurbulence) delete _wTurbulence;
 
-    printf("deleted fluid\n");
+    // printf("deleted fluid\n");
 }
 
 // init direct access functions from blender
@@ -263,6 +231,8 @@ void FLUID_3D::step()
   */
 	_totalTime += _dt;
 	_totalSteps++;	
+
+	memset(_obstacles, 0, sizeof(unsigned char)*_xRes*_yRes*_zRes);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -300,7 +270,7 @@ void FLUID_3D::artificialDamping(float* field) {
 //////////////////////////////////////////////////////////////////////
 void FLUID_3D::copyBorderAll(float* field)
 {
-	int index;
+	size_t index;
 	for (int y = 0; y < _yRes; y++)
 		for (int x = 0; x < _xRes; x++)
 		{
@@ -367,9 +337,16 @@ void FLUID_3D::addForce()
 //////////////////////////////////////////////////////////////////////
 void FLUID_3D::project()
 {
-	int index, x, y, z;
+	int x, y, z;
+	size_t index;
 
-	setObstacleBoundaries();
+	float *_pressure = new float[_totalCells];
+	float *_divergence   = new float[_totalCells];
+
+	memset(_pressure, 0, sizeof(float)*_totalCells);
+	memset(_divergence, 0, sizeof(float)*_totalCells);
+
+	setObstacleBoundaries(_pressure);
 
 	// copy out the boundaries
 	if(DOMAIN_BC_LEFT == 0)  setNeumannX(_xVelocity, _res);
@@ -414,7 +391,7 @@ void FLUID_3D::project()
 	// solve Poisson equation
 	solvePressurePre(_pressure, _divergence, _obstacles);
 
-	setObstaclePressure();
+	setObstaclePressure(_pressure);
 
 	// project out solution
 	float invDx = 1.0f / _dx;
@@ -430,6 +407,9 @@ void FLUID_3D::project()
 					_zVelocity[index] -= 0.5f * (_pressure[index + _slabSize] - _pressure[index - _slabSize]) * invDx;
 				}
 			}
+
+	if (_pressure) delete[] _pressure;
+	if (_divergence) delete[] _divergence;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -465,7 +445,7 @@ void FLUID_3D::addObstacle(OBSTACLE* obstacle)
 //////////////////////////////////////////////////////////////////////
 // calculate the obstacle directional types
 //////////////////////////////////////////////////////////////////////
-void FLUID_3D::setObstaclePressure()
+void FLUID_3D::setObstaclePressure(float *_pressure)
 {
 	// tag remaining obstacle blocks
 	for (int z = 1, index = _slabSize + _xRes + 1;
@@ -539,7 +519,7 @@ void FLUID_3D::setObstaclePressure()
 		}
 }
 
-void FLUID_3D::setObstacleBoundaries()
+void FLUID_3D::setObstacleBoundaries(float *_pressure)
 {
 	// cull degenerate obstacles , move to addObstacle?
 	for (int z = 1, index = _slabSize + _xRes + 1;
@@ -600,6 +580,18 @@ void FLUID_3D::addVorticity()
 	int x,y,z,index;
 	if(_vorticityEps<=0.) return;
 
+	float *_xVorticity, *_yVorticity, *_zVorticity, *_vorticity;
+
+	_xVorticity = new float[_totalCells];
+	_yVorticity = new float[_totalCells];
+	_zVorticity = new float[_totalCells];
+	_vorticity = new float[_totalCells];
+
+	memset(_xVorticity, 0, sizeof(float)*_totalCells);
+	memset(_yVorticity, 0, sizeof(float)*_totalCells);
+	memset(_zVorticity, 0, sizeof(float)*_totalCells);
+	memset(_vorticity, 0, sizeof(float)*_totalCells);
+
 	// calculate vorticity
 	float gridSize = 0.5f / _dx;
 	index = _slabSize + _xRes + 1;
@@ -662,6 +654,11 @@ void FLUID_3D::addVorticity()
 						_zForce[index] += (N[0] * _yVorticity[index] - N[1] * _xVorticity[index]) * _dx * eps;
 					}
 				}
+				
+	if (_xVorticity) delete[] _xVorticity;
+	if (_yVorticity) delete[] _yVorticity;
+	if (_zVorticity) delete[] _zVorticity;
+	if (_vorticity) delete[] _vorticity;
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/intern/smoke/intern/FLUID_3D.h b/intern/smoke/intern/FLUID_3D.h
index 78a4cf076e3..9d9e7318204 100644
--- a/intern/smoke/intern/FLUID_3D.h
+++ b/intern/smoke/intern/FLUID_3D.h
@@ -64,7 +64,7 @@ class FLUID_3D
 		// dimensions
 		int _xRes, _yRes, _zRes, _maxRes;
 		Vec3Int _res;
-		int _totalCells;
+		size_t _totalCells;
 		int _slabSize;
 		float _dx;
 		float _p0[3];
@@ -81,7 +81,6 @@ class FLUID_3D
 		float* _densityOld;
 		float* _heat;
 		float* _heatOld;
-		float* _pressure;
 		float* _xVelocity;
 		float* _yVelocity;
 		float* _zVelocity;
@@ -91,19 +90,9 @@ class FLUID_3D
 		float* _xForce;
 		float* _yForce;
 		float* _zForce;
-		float* _divergence;
-		float* _xVorticity;
-		float* _yVorticity;
-		float* _zVorticity;
-		float* _vorticity;
-		float* _h;
-		float* _Precond;
 		unsigned char*  _obstacles;
 
 		// CG fields
-		float* _residual;
-		float* _direction;
-		float* _q;
 		int _iterations;
 
 		// simulation constants
@@ -134,8 +123,8 @@ class FLUID_3D
 		void solveHeat(float* field, float* b, unsigned char* skip);
 
 		// handle obstacle boundaries
-		void setObstacleBoundaries();
-		void setObstaclePressure();
+		void setObstacleBoundaries(float *_pressure);
+		void setObstaclePressure(float *_pressure);
 
 	public:
 		// advection, accessed e.g. by WTURBULENCE class
diff --git a/intern/smoke/intern/FLUID_3D_SOLVERS.cpp b/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
index a35beaa05d7..7d078d86d61 100644
--- a/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
+++ b/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
@@ -28,10 +28,17 @@ void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip)
 {
 	int x, y, z;
 	size_t index;
+	float *_q, *_Precond, *_h, *_residual, *_direction;
 
 	// i = 0
 	int i = 0;
 
+	_residual     = new float[_totalCells]; // set 0
+	_direction    = new float[_totalCells]; // set 0
+	_q            = new float[_totalCells]; // set 0
+	_h			  = new float[_totalCells]; // set 0
+	_Precond	  = new float[_totalCells]; // set 0
+
 	memset(_residual, 0, sizeof(float)*_xRes*_yRes*_zRes);
 	memset(_q, 0, sizeof(float)*_xRes*_yRes*_zRes);
 	memset(_direction, 0, sizeof(float)*_xRes*_yRes*_zRes);
@@ -191,11 +198,18 @@ void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip)
     i++;
   }
   // cout << i << " iterations converged to " << sqrt(maxR) << endl;
+
+	if (_h) delete[] _h;
+	if (_Precond) delete[] _Precond;
+	if (_residual) delete[] _residual;
+	if (_direction) delete[] _direction;
+	if (_q)       delete[] _q;
 }
 
 //////////////////////////////////////////////////////////////////////
 // solve the poisson equation with CG
 //////////////////////////////////////////////////////////////////////
+#if 0
 void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip)
 {
 	int x, y, z;
@@ -344,6 +358,7 @@ void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip)
   }
   // cout << i << " iterations converged to " << maxR << endl;
 }
+#endif
 
 //////////////////////////////////////////////////////////////////////
 // solve the heat equation with CG
@@ -353,10 +368,15 @@ void FLUID_3D::solveHeat(float* field, float* b, unsigned char* skip)
 	int x, y, z;
 	size_t index;
 	const float heatConst = _dt * _heatDiffusion / (_dx * _dx);
+	float *_q, *_residual, *_direction;
 
 	// i = 0
 	int i = 0;
 
+	_residual     = new float[_totalCells]; // set 0
+	_direction    = new float[_totalCells]; // set 0
+	_q            = new float[_totalCells]; // set 0
+
   	memset(_residual, 0, sizeof(float)*_xRes*_yRes*_zRes);
 	memset(_q, 0, sizeof(float)*_xRes*_yRes*_zRes);
 	memset(_direction, 0, sizeof(float)*_xRes*_yRes*_zRes);
@@ -496,5 +516,9 @@ void FLUID_3D::solveHeat(float* field, float* b, unsigned char* skip)
     i++;
   }
   // cout << i << " iterations converged to " << maxR << endl;
+
+	if (_residual) delete[] _residual;
+	if (_direction) delete[] _direction;
+	if (_q)       delete[] _q;
 }
 
diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index db7a1b55afa..dd092d4f0cc 100644
--- a/intern/smoke/intern/WTURBULENCE.cpp
+++ b/intern/smoke/intern/WTURBULENCE.cpp
@@ -81,25 +81,9 @@ WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int no
 	_densityBig = new float[_totalCellsBig];
 	_densityBigOld = new float[_totalCellsBig]; 
 	
-	// allocate high resolution velocity field. Note that this is only
-	// necessary because we use MacCormack advection. For semi-Lagrangian
-	// advection, these arrays are not necessary.
-	_tempBig1 = _tempBig2 = 
-	_bigUx = _bigUy = _bigUz = NULL;
-	_tempBig1 = new float[_totalCellsBig];
-	_tempBig2 = new float[_totalCellsBig];
-	_bigUx = new float[_totalCellsBig];
-	_bigUy = new float[_totalCellsBig];
-	_bigUz = new float[_totalCellsBig]; 
-	
 	for(int i = 0; i < _totalCellsBig; i++) {
 		_densityBig[i] = 
-		_densityBigOld[i] = 
-		_bigUx[i] =  
-		_bigUy[i] =  
-		_bigUz[i] =  
-		_tempBig1[i] =  
-		_tempBig2[i] = 0.;
+		_densityBigOld[i] = 0.;
 	}
 	
 	// allocate & init texture coordinates
@@ -154,12 +138,6 @@ WTURBULENCE::~WTURBULENCE() {
   delete[] _densityBig;
   delete[] _densityBigOld;
 
-  delete[] _bigUx;
-  delete[] _bigUy;
-  delete[] _bigUz;
-  delete[] _tempBig1;
-  delete[] _tempBig2;
-
   delete[] _tcU;
   delete[] _tcV;
   delete[] _tcW;
@@ -315,7 +293,7 @@ static float minDz(int x, int y, int z, float* input, Vec3Int res)
 // handle texture coordinates (advection, reset, eigenvalues), 
 // Beware -- uses big density maccormack as temporary arrays
 ////////////////////////////////////////////////////////////////////// 
-void WTURBULENCE::advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel) {
+void WTURBULENCE::advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel, float *_tempBig1, float *_tempBig2) {
   // advection
   SWAP_POINTERS(_tcTemp, _tcU);
   FLUID_3D::copyBorderX(_tcTemp, _resSm);
@@ -602,12 +580,32 @@ Vec3 WTURBULENCE::WVelocityWithJacobian(Vec3 orgPos, float* xUnwarped, float* yU
 //////////////////////////////////////////////////////////////////////
 void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel, float* zvel, unsigned char *obstacles) 
 {
+  // big velocity macCormack fields
+	float* _bigUx;
+	float* _bigUy;
+	float* _bigUz;
+
+	// temp arrays for BFECC and MacCormack - they have more convenient
+	// names in the actual implementations
+	float* _tempBig1;
+	float* _tempBig2;
+
+	// allocate high resolution velocity field. Note that this is only
+	// necessary because we use MacCormack advection. For semi-Lagrangian
+	// advection, these arrays are not necessary.
+	_tempBig1 = new float[_totalCellsBig];
+	_tempBig2 = new float[_totalCellsBig];
+
   // enlarge timestep to match grid
   const float dt = dtOrg * _amplify;
   const float invAmp = 1.0f / _amplify;
 
+  _bigUx = new float[_totalCellsBig];
+  _bigUy = new float[_totalCellsBig];
+  _bigUz = new float[_totalCellsBig]; 
+
   // prepare textures
-  advectTextureCoordinates(dtOrg, xvel,yvel,zvel);
+  advectTextureCoordinates(dtOrg, xvel,yvel,zvel, _tempBig1, _tempBig2);
 
   // compute eigenvalues of the texture coordinates
   computeEigenvalues();
@@ -744,6 +742,13 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
   IMAGE::dumpPBRT(_totalStepsBig, pbrtPrefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
 	*/
   _totalStepsBig++;
+
+  	delete[] _bigUx;
+	delete[] _bigUy;
+	delete[] _bigUz;
+
+	delete[] _tempBig1;
+    delete[] _tempBig2;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -752,225 +757,257 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
 //////////////////////////////////////////////////////////////////////
 void WTURBULENCE::stepTurbulenceFull(float dtOrg, float* xvel, float* yvel, float* zvel, unsigned char *obstacles)
 {
-  // enlarge timestep to match grid
-  const float dt = dtOrg * _amplify;
-  const float invAmp = 1.0f / _amplify;
+	// big velocity macCormack fields
+	float* _bigUx;
+	float* _bigUy;
+	float* _bigUz;
 
-  // prepare textures
-  advectTextureCoordinates(dtOrg, xvel,yvel,zvel);
+	// temp arrays for BFECC and MacCormack - they have more convenient
+	// names in the actual implementations
+	float* _tempBig1;
+	float* _tempBig2;
 
-  // do wavelet decomposition of energy
-  computeEnergy(xvel, yvel, zvel, obstacles);
-  decomposeEnergy();
+	// allocate high resolution velocity field. Note that this is only
+	// necessary because we use MacCormack advection. For semi-Lagrangian
+	// advection, these arrays are not necessary.
+	_tempBig1 = new float[_totalCellsBig];
+	_tempBig2 = new float[_totalCellsBig];
 
-  // zero out coefficients inside of the obstacle
-  for (int x = 0; x < _totalCellsSm; x++)
-    if (obstacles[x]) _energy[x] = 0.f;
+	// enlarge timestep to match grid
+	const float dt = dtOrg * _amplify;
+	const float invAmp = 1.0f / _amplify;
 
-  // parallel region setup
-  float maxVelMagThreads[8] = { -1., -1., -1., -1., -1., -1., -1., -1. };
-#if PARALLEL==1
-#pragma omp parallel
-#endif
-  { float maxVelMag1 = 0.;
-#if PARALLEL==1
-    const int id  = omp_get_thread_num(); /*, num = omp_get_num_threads(); */
-#endif
+	_bigUx = new float[_totalCellsBig];
+	_bigUy = new float[_totalCellsBig];
+	_bigUz = new float[_totalCellsBig]; 
 
-  // vector noise main loop
-#if PARALLEL==1
-#pragma omp for  schedule(static)
-#endif
-  for (int zSmall = 0; zSmall < _zResSm; zSmall++) 
-  for (int ySmall = 0; ySmall < _yResSm; ySmall++) 
-  for (int xSmall = 0; xSmall < _xResSm; xSmall++)
-  {
-    const int indexSmall = xSmall + ySmall * _xResSm + zSmall * _slabSizeSm;
+	// prepare textures
+	advectTextureCoordinates(dtOrg, xvel,yvel,zvel, _tempBig1, _tempBig2);
 
-    // compute jacobian
-    float jacobian[3][3] = {
-      { minDx(xSmall, ySmall, zSmall, _tcU, _resSm), minDx(xSmall, ySmall, zSmall, _tcV, _resSm), minDx(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
-      { minDy(xSmall, ySmall, zSmall, _tcU, _resSm), minDy(xSmall, ySmall, zSmall, _tcV, _resSm), minDy(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
-      { minDz(xSmall, ySmall, zSmall, _tcU, _resSm), minDz(xSmall, ySmall, zSmall, _tcV, _resSm), minDz(xSmall, ySmall, zSmall, _tcW, _resSm) }
-    };
+	// do wavelet decomposition of energy
+	computeEnergy(xvel, yvel, zvel, obstacles);
+	decomposeEnergy();
 
-    // get LU factorization of texture jacobian and apply 
-    // it to unit vectors
-    JAMA::LU<float> LU = computeLU3x3(jacobian);
-    float xUnwarped[] = {1.0f, 0.0f, 0.0f};
-    float yUnwarped[] = {0.0f, 1.0f, 0.0f};
-    float zUnwarped[] = {0.0f, 0.0f, 1.0f};
-    float xWarped[] = {1.0f, 0.0f, 0.0f};
-    float yWarped[] = {0.0f, 1.0f, 0.0f};
-    float zWarped[] = {0.0f, 0.0f, 1.0f};
-    bool nonSingular = LU.isNonsingular();
-#if 0
-	// UNUSED
-    float eigMax = 10.0f;
-    float eigMin = 0.1f;
-#endif
-    if (nonSingular)
-    {
-      solveLU3x3(LU, xUnwarped, xWarped);
-      solveLU3x3(LU, yUnwarped, yWarped);
-      solveLU3x3(LU, zUnwarped, zWarped);
+	// zero out coefficients inside of the obstacle
+	for (int x = 0; x < _totalCellsSm; x++)
+		if (obstacles[x]) _energy[x] = 0.f;
 
-      // compute the eigenvalues while we have the Jacobian available
-      Vec3 eigenvalues = Vec3(1.);
-      computeEigenvalues3x3( &eigenvalues[0], jacobian);
-      _eigMax[indexSmall] = MAX3V(eigenvalues);
-      _eigMin[indexSmall] = MIN3V(eigenvalues);
-    }
-    
-    // make sure to skip one on the beginning and end
-    int xStart = (xSmall == 0) ? 1 : 0;
-    int xEnd   = (xSmall == _xResSm - 1) ? _amplify - 1 : _amplify;
-    int yStart = (ySmall == 0) ? 1 : 0;
-    int yEnd   = (ySmall == _yResSm - 1) ? _amplify - 1 : _amplify;
-    int zStart = (zSmall == 0) ? 1 : 0;
-    int zEnd   = (zSmall == _zResSm - 1) ? _amplify - 1 : _amplify;
-      
-    for (int zBig = zStart; zBig < zEnd; zBig++) 
-    for (int yBig = yStart; yBig < yEnd; yBig++) 
-    for (int xBig = xStart; xBig < xEnd; xBig++)
-    {
-      const int x = xSmall * _amplify + xBig;
-      const int y = ySmall * _amplify + yBig;
-      const int z = zSmall * _amplify + zBig;
-      
-      // get unit position for both fine and coarse grid
-      const Vec3 pos = Vec3(x,y,z);
-      const Vec3 posSm = pos * invAmp;
-      
-      // get grid index for both fine and coarse grid
-      const int index = x + y *_xResBig + z *_slabSizeBig;
-      
-      // get a linearly interpolated velocity and texcoords
-      // from the coarse grid
-      Vec3 vel = INTERPOLATE::lerp3dVec( xvel,yvel,zvel, 
-          posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
-      Vec3 uvw = INTERPOLATE::lerp3dVec( _tcU,_tcV,_tcW, 
-          posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
+	// parallel region setup
+	float maxVelMagThreads[8] = { -1., -1., -1., -1., -1., -1., -1., -1. };
 
-      // multiply the texture coordinate by _resSm so that turbulence
-      // synthesis begins at the first octave that the coarse grid 
-      // cannot capture
-      Vec3 texCoord = Vec3(uvw[0] * _resSm[0], 
-                           uvw[1] * _resSm[1],
-                           uvw[2] * _resSm[2]); 
+	#if PARALLEL==1
+		#pragma omp parallel
+	#endif
+	  { float maxVelMag1 = 0.;
+	#if PARALLEL==1
+		const int id  = omp_get_thread_num(); /*, num = omp_get_num_threads(); */
+	#endif
 
-      // retrieve wavelet energy at highest frequency
-      float energy = INTERPOLATE::lerp3d(
-          _highFreqEnergy, posSm[0],posSm[1],posSm[2], _xResSm, _yResSm, _zResSm);
+	// vector noise main loop
+	#if PARALLEL==1
+	#pragma omp for  schedule(static)
+	#endif
+	for (int zSmall = 0; zSmall < _zResSm; zSmall++) 
+	for (int ySmall = 0; ySmall < _yResSm; ySmall++) 
+	for (int xSmall = 0; xSmall < _xResSm; xSmall++)
+	{
+		const int indexSmall = xSmall + ySmall * _xResSm + zSmall * _slabSizeSm;
 
-      // base amplitude for octave 0
-      float coefficient = sqrtf(2.0f * fabs(energy));
-      const float amplitude = *_strength * fabs(0.5 * coefficient) * persistence;
+		// compute jacobian
+		float jacobian[3][3] = {
+		  { minDx(xSmall, ySmall, zSmall, _tcU, _resSm), minDx(xSmall, ySmall, zSmall, _tcV, _resSm), minDx(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
+		  { minDy(xSmall, ySmall, zSmall, _tcU, _resSm), minDy(xSmall, ySmall, zSmall, _tcV, _resSm), minDy(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
+		  { minDz(xSmall, ySmall, zSmall, _tcU, _resSm), minDz(xSmall, ySmall, zSmall, _tcV, _resSm), minDz(xSmall, ySmall, zSmall, _tcW, _resSm) }
+		};
 
-      // add noise to velocity, but only if the turbulence is
-      // sufficiently undeformed, and the energy is large enough
-      // to make a difference
-      const bool addNoise = _eigMax[indexSmall] < 2. && 
-                            _eigMin[indexSmall] > 0.5;
-      if (addNoise && amplitude > _cullingThreshold) {
-        // base amplitude for octave 0
-        float amplitudeScaled = amplitude;
+		// get LU factorization of texture jacobian and apply 
+		// it to unit vectors
+		JAMA::LU<float> LU = computeLU3x3(jacobian);
+		float xUnwarped[] = {1.0f, 0.0f, 0.0f};
+		float yUnwarped[] = {0.0f, 1.0f, 0.0f};
+		float zUnwarped[] = {0.0f, 0.0f, 1.0f};
+		float xWarped[] = {1.0f, 0.0f, 0.0f};
+		float yWarped[] = {0.0f, 1.0f, 0.0f};
+		float zWarped[] = {0.0f, 0.0f, 1.0f};
+		bool nonSingular = LU.isNonsingular();
 
-        for (int octave = 0; octave < _octaves; octave++)
-        {
-          // multiply the vector noise times the maximum allowed
-          // noise amplitude at this octave, and add it to the total
-          vel += WVelocityWithJacobian(texCoord, &xUnwarped[0], &yUnwarped[0], &zUnwarped[0]) * amplitudeScaled;
+		#if 0
+			// UNUSED
+			float eigMax = 10.0f;
+			float eigMin = 0.1f;
+		#endif
 
-          // scale coefficient for next octave
-          amplitudeScaled *= persistence;
-          texCoord *= 2.0f;
-        }
-      }
+		if (nonSingular)
+		{
+			solveLU3x3(LU, xUnwarped, xWarped);
+			solveLU3x3(LU, yUnwarped, yWarped);
+			solveLU3x3(LU, zUnwarped, zWarped);
 
-      // Store velocity + turbulence in big grid for maccormack step
-      //
-      // If you wanted to save memory, you would instead perform a 
-      // semi-Lagrangian backtrace for the current grid cell here. Then
-      // you could just throw the velocity away.
-      _bigUx[index] = vel[0];
-      _bigUy[index] = vel[1];
-      _bigUz[index] = vel[2];
+			// compute the eigenvalues while we have the Jacobian available
+			Vec3 eigenvalues = Vec3(1.);
+			computeEigenvalues3x3( &eigenvalues[0], jacobian);
+			_eigMax[indexSmall] = MAX3V(eigenvalues);
+			_eigMin[indexSmall] = MIN3V(eigenvalues);
+		}
 
-      // compute the velocity magnitude for substepping later
-      const float velMag = _bigUx[index] * _bigUx[index] + 
-                           _bigUy[index] * _bigUy[index] + 
-                           _bigUz[index] * _bigUz[index];
-      if (velMag > maxVelMag1) maxVelMag1 = velMag;
+		// make sure to skip one on the beginning and end
+		int xStart = (xSmall == 0) ? 1 : 0;
+		int xEnd   = (xSmall == _xResSm - 1) ? _amplify - 1 : _amplify;
+		int yStart = (ySmall == 0) ? 1 : 0;
+		int yEnd   = (ySmall == _yResSm - 1) ? _amplify - 1 : _amplify;
+		int zStart = (zSmall == 0) ? 1 : 0;
+		int zEnd   = (zSmall == _zResSm - 1) ? _amplify - 1 : _amplify;
+		  
+		for (int zBig = zStart; zBig < zEnd; zBig++) 
+		for (int yBig = yStart; yBig < yEnd; yBig++) 
+		for (int xBig = xStart; xBig < xEnd; xBig++)
+		{
+			const int x = xSmall * _amplify + xBig;
+			const int y = ySmall * _amplify + yBig;
+			const int z = zSmall * _amplify + zBig;
 
-      // zero out velocity inside obstacles
-      float obsCheck = INTERPOLATE::lerp3dToFloat(
-          obstacles, posSm[0], posSm[1], posSm[2], _xResSm, _yResSm, _zResSm); 
-      if (obsCheck > 0.95) 
-        _bigUx[index] = _bigUy[index] = _bigUz[index] = 0.;
-    } // xyz
+			// get unit position for both fine and coarse grid
+			const Vec3 pos = Vec3(x,y,z);
+			const Vec3 posSm = pos * invAmp;
 
-#if PARALLEL==1
-    maxVelMagThreads[id] = maxVelMag1;
-#else
-    maxVelMagThreads[0] = maxVelMag1;
-#endif
-  }
-  } // omp
-  
-  // compute maximum over threads
-  float maxVelMag = maxVelMagThreads[0];
-#if PARALLEL==1
-  for (int i = 1; i < 8; i++) 
-    if (maxVelMag < maxVelMagThreads[i]) 
-      maxVelMag = maxVelMagThreads[i];
-#endif
+			// get grid index for both fine and coarse grid
+			const int index = x + y *_xResBig + z *_slabSizeBig;
 
-  // prepare density for an advection
-  SWAP_POINTERS(_densityBig, _densityBigOld);
+			// get a linearly interpolated velocity and texcoords
+			// from the coarse grid
+			Vec3 vel = INTERPOLATE::lerp3dVec( xvel,yvel,zvel, 
+			  posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
+			Vec3 uvw = INTERPOLATE::lerp3dVec( _tcU,_tcV,_tcW, 
+			  posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
 
-  // based on the maximum velocity present, see if we need to substep,
-  // but cap the maximum number of substeps to 5
-  const int maxSubSteps = 25;
-  const int maxVel = 5;
-  maxVelMag = sqrt(maxVelMag) * dt;
-  int totalSubsteps = (int)(maxVelMag / (float)maxVel);
-  totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
-  // printf("totalSubsteps: %d\n", totalSubsteps);
-  totalSubsteps = (totalSubsteps > maxSubSteps) ? maxSubSteps : totalSubsteps;
-  const float dtSubdiv = dt / (float)totalSubsteps;
+			// multiply the texture coordinate by _resSm so that turbulence
+			// synthesis begins at the first octave that the coarse grid 
+			// cannot capture
+			Vec3 texCoord = Vec3(uvw[0] * _resSm[0], 
+							   uvw[1] * _resSm[1],
+							   uvw[2] * _resSm[2]); 
 
-  // set boundaries of big velocity grid
-  FLUID_3D::setZeroX(_bigUx, _resBig); 
-  FLUID_3D::setZeroY(_bigUy, _resBig); 
-  FLUID_3D::setZeroZ(_bigUz, _resBig);
+			// retrieve wavelet energy at highest frequency
+			float energy = INTERPOLATE::lerp3d(
+			  _highFreqEnergy, posSm[0],posSm[1],posSm[2], _xResSm, _yResSm, _zResSm);
 
-  // do the MacCormack advection, with substepping if necessary
-  for(int substep = 0; substep < totalSubsteps; substep++)
-  {
-    FLUID_3D::advectFieldMacCormack(dtSubdiv, _bigUx, _bigUy, _bigUz, 
-        _densityBigOld, _densityBig, _tempBig1, _tempBig2, _resBig, NULL);
+			// base amplitude for octave 0
+			float coefficient = sqrtf(2.0f * fabs(energy));
+			const float amplitude = *_strength * fabs(0.5 * coefficient) * persistence;
 
-    if (substep < totalSubsteps - 1) 
-      SWAP_POINTERS(_densityBig, _densityBigOld);
-  } // substep
-  
-  // wipe the density borders
-  FLUID_3D::setZeroBorder(_densityBig, _resBig);
-    
-  // reset texture coordinates now in preparation for next timestep
-  // Shouldn't do this before generating the noise because then the 
-  // eigenvalues stored do not reflect the underlying texture coordinates
-  resetTextureCoordinates();
-  
-  // output files
-  // string prefix = string("./amplified.preview/density_bigxy_");
-  // FLUID_3D::writeImageSliceXY(_densityBig, _resBig, _resBig[2]/2, prefix, _totalStepsBig, 1.0f);
-  //string df3prefix = string("./df3/density_big_");
-  //IMAGE::dumpDF3(_totalStepsBig, df3prefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
-  // string pbrtPrefix = string("./pbrt/density_big_");
-  // IMAGE::dumpPBRT(_totalStepsBig, pbrtPrefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
-  
-  _totalStepsBig++;
+			// add noise to velocity, but only if the turbulence is
+			// sufficiently undeformed, and the energy is large enough
+			// to make a difference
+			const bool addNoise = _eigMax[indexSmall] < 2. && 
+								_eigMin[indexSmall] > 0.5;
+
+			if (addNoise && amplitude > _cullingThreshold) {
+				// base amplitude for octave 0
+				float amplitudeScaled = amplitude;
+
+				for (int octave = 0; octave < _octaves; octave++)
+				{
+					// multiply the vector noise times the maximum allowed
+					// noise amplitude at this octave, and add it to the total
+					vel += WVelocityWithJacobian(texCoord, &xUnwarped[0], &yUnwarped[0], &zUnwarped[0]) * amplitudeScaled;
+
+					// scale coefficient for next octave
+					amplitudeScaled *= persistence;
+					texCoord *= 2.0f;
+				}
+			}
+
+			// Store velocity + turbulence in big grid for maccormack step
+			//
+			// If you wanted to save memory, you would instead perform a 
+			// semi-Lagrangian backtrace for the current grid cell here. Then
+			// you could just throw the velocity away.
+			_bigUx[index] = vel[0];
+			_bigUy[index] = vel[1];
+			_bigUz[index] = vel[2];
+
+			// compute the velocity magnitude for substepping later
+			const float velMag = _bigUx[index] * _bigUx[index] + 
+							   _bigUy[index] * _bigUy[index] + 
+							   _bigUz[index] * _bigUz[index];
+			if (velMag > maxVelMag1) maxVelMag1 = velMag;
+
+			// zero out velocity inside obstacles
+			float obsCheck = INTERPOLATE::lerp3dToFloat(
+			  obstacles, posSm[0], posSm[1], posSm[2], _xResSm, _yResSm, _zResSm); 
+
+			if (obsCheck > 0.95) 
+				_bigUx[index] = _bigUy[index] = _bigUz[index] = 0.;
+		} // xyz
+
+		#if PARALLEL==1
+		maxVelMagThreads[id] = maxVelMag1;
+		#else
+		maxVelMagThreads[0] = maxVelMag1;
+		#endif
+		}
+	} // omp
+
+	// compute maximum over threads
+	float maxVelMag = maxVelMagThreads[0];
+	#if PARALLEL==1
+	for (int i = 1; i < 8; i++) 
+	if (maxVelMag < maxVelMagThreads[i]) 
+	  maxVelMag = maxVelMagThreads[i];
+	#endif
+
+	// prepare density for an advection
+	SWAP_POINTERS(_densityBig, _densityBigOld);
+
+	// based on the maximum velocity present, see if we need to substep,
+	// but cap the maximum number of substeps to 5
+	const int maxSubSteps = 25;
+	const int maxVel = 5;
+	maxVelMag = sqrt(maxVelMag) * dt;
+	int totalSubsteps = (int)(maxVelMag / (float)maxVel);
+	totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
+	// printf("totalSubsteps: %d\n", totalSubsteps);
+	totalSubsteps = (totalSubsteps > maxSubSteps) ? maxSubSteps : totalSubsteps;
+	const float dtSubdiv = dt / (float)totalSubsteps;
+
+	// set boundaries of big velocity grid
+	FLUID_3D::setZeroX(_bigUx, _resBig); 
+	FLUID_3D::setZeroY(_bigUy, _resBig); 
+	FLUID_3D::setZeroZ(_bigUz, _resBig);
+
+	// do the MacCormack advection, with substepping if necessary
+	for(int substep = 0; substep < totalSubsteps; substep++)
+	{
+	FLUID_3D::advectFieldMacCormack(dtSubdiv, _bigUx, _bigUy, _bigUz, 
+		_densityBigOld, _densityBig, _tempBig1, _tempBig2, _resBig, NULL);
+
+	if (substep < totalSubsteps - 1) 
+	  SWAP_POINTERS(_densityBig, _densityBigOld);
+	} // substep
+
+	// wipe the density borders
+	FLUID_3D::setZeroBorder(_densityBig, _resBig);
+
+	// reset texture coordinates now in preparation for next timestep
+	// Shouldn't do this before generating the noise because then the 
+	// eigenvalues stored do not reflect the underlying texture coordinates
+	resetTextureCoordinates();
+
+	// output files
+	// string prefix = string("./amplified.preview/density_bigxy_");
+	// FLUID_3D::writeImageSliceXY(_densityBig, _resBig, _resBig[2]/2, prefix, _totalStepsBig, 1.0f);
+	//string df3prefix = string("./df3/density_big_");
+	//IMAGE::dumpDF3(_totalStepsBig, df3prefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
+	// string pbrtPrefix = string("./pbrt/density_big_");
+	// IMAGE::dumpPBRT(_totalStepsBig, pbrtPrefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
+
+	_totalStepsBig++;
+
+	delete[] _bigUx;
+	delete[] _bigUy;
+	delete[] _bigUz;
+
+	delete[] _tempBig1;
+	delete[] _tempBig2;
 }
 
diff --git a/intern/smoke/intern/WTURBULENCE.h b/intern/smoke/intern/WTURBULENCE.h
index d4e6b0c6a17..c21e002ad48 100644
--- a/intern/smoke/intern/WTURBULENCE.h
+++ b/intern/smoke/intern/WTURBULENCE.h
@@ -49,7 +49,7 @@ class WTURBULENCE
 		void stepTurbulenceFull(float dt, float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
 	
 		// texcoord functions
-		void advectTextureCoordinates(float dtOrg, float* xvel, float* yvel, float* zvel);
+		void advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel, float *_tempBig1, float *_tempBig2);
 		void resetTextureCoordinates();
 
 		void computeEnergy(float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
@@ -73,7 +73,7 @@ class WTURBULENCE
 		// is accessed on through rna gui
 		float *_strength;
 
-	protected:
+	// protected:
 		// enlargement factor from original velocity field / simulation
 		// _Big = _amplify * _Sm
 		int _amplify;
@@ -111,26 +111,17 @@ class WTURBULENCE
 		float* _densityBig;
 		float* _densityBigOld;
 
-		// big velocity macCormack fields
-		float* _bigUx;
-		float* _bigUy;
-		float* _bigUz;
-		// temp arrays for BFECC and MacCormack - they have more convenient
-		// names in the actual implementations
-		float* _tempBig1;
-		float* _tempBig2;
-
 		// texture coordinates for noise
 		float* _tcU;
 		float* _tcV;
 		float* _tcW;
 		float* _tcTemp;
 
-		float* _eigMin;
-		float* _eigMax;
+		float* _eigMin; // no save -dg
+		float* _eigMax; // no save -dg
 
 		// wavelet decomposition of velocity energies
-		float* _energy;
+		float* _energy; // no save -dg
 
 		// noise data
 		float* _noiseTile;
@@ -140,7 +131,7 @@ class WTURBULENCE
 		int _totalStepsBig;
 
 		// highest frequency component of wavelet decomposition
-		float* _highFreqEnergy;
+		float* _highFreqEnergy; // no save -dg
 		
 		void computeEigenvalues();
 		void decomposeEnergy();
diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 2e95a576eaf..5a016b51bbe 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -20,7 +20,7 @@
  * The Original Code is Copyright (C) 2009 by Daniel Genrich
  * All rights reserved.
  *
- * Contributor(s): None
+ * Contributor(s): Daniel Genrich
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -137,7 +137,7 @@ extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log)
 	}
 }
 
-extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log)
+extern "C" void smoke_turbulence_dissolve(WTURBULENCE *wt, int speed, int log)
 {
 	float *density = wt->getDensityBig();
 	Vec3Int r = wt->getResBig();
@@ -172,7 +172,7 @@ extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log)
 	}
 }
 
-extern "C" void smoke_initWaveletBlenderRNA(WTURBULENCE *wt, float *strength)
+extern "C" void smoke_turbulence_initBlenderRNA(WTURBULENCE *wt, float *strength)
 {
 	wt->initBlenderRNA(strength);
 }
@@ -181,6 +181,36 @@ template < class T > inline T ABS( T a ) {
 	return (0 < a) ? a : -a ;
 }
 
+extern "C" void smoke_export(FLUID_3D *fluid, float *dt, float *dx, float **dens, float **densold, float **heat, float **heatold, float **vx, float **vy, float **vz, float **vxold, float **vyold, float **vzold, unsigned char **obstacles)
+{
+	*dens = fluid->_density;
+	*densold = fluid->_densityOld;
+	*heat = fluid->_heat;
+	*heatold = fluid->_heatOld;
+	*vx = fluid->_xVelocity;
+	*vy = fluid->_yVelocity;
+	*vz = fluid->_zVelocity;
+	*vxold = fluid->_xVelocityOld;
+	*vyold = fluid->_yVelocityOld;
+	*vzold = fluid->_zVelocityOld;
+	*obstacles = fluid->_obstacles;
+	dt = &(fluid->_dt);
+	dx = &(fluid->_dx);
+
+}
+
+extern "C" void smoke_turbulence_export(WTURBULENCE *wt, float **dens, float **densold, float **tcu, float **tcv, float **tcw)
+{
+	if(!wt)
+		return;
+
+	*dens = wt->_densityBig;
+	*densold = wt->_densityBigOld;
+	*tcu = wt->_tcU;
+	*tcv = wt->_tcV;
+	*tcw = wt->_tcW;
+}
+
 extern "C" float *smoke_get_density(FLUID_3D *fluid)
 {
 	return fluid->_density;
@@ -193,17 +223,17 @@ extern "C" float *smoke_get_heat(FLUID_3D *fluid)
 
 extern "C" float *smoke_get_velocity_x(FLUID_3D *fluid)
 {
-	return fluid->_xVorticity;
+	return fluid->_xVelocity;
 }
 
 extern "C" float *smoke_get_velocity_y(FLUID_3D *fluid)
 {
-	return fluid->_yVorticity;
+	return fluid->_yVelocity;
 }
 
 extern "C" float *smoke_get_velocity_z(FLUID_3D *fluid)
 {
-	return fluid->_zVorticity;
+	return fluid->_zVelocity;
 }
 
 extern "C" float *smoke_turbulence_get_density(WTURBULENCE *wt)
@@ -211,14 +241,13 @@ extern "C" float *smoke_turbulence_get_density(WTURBULENCE *wt)
 	return wt ? wt->getDensityBig() : NULL;
 }
 
-extern "C" void smoke_turbulence_get_res(WTURBULENCE *wt, int *res)
+extern "C" void smoke_turbulence_get_res(WTURBULENCE *wt, unsigned int *res)
 {
 	if(wt)
 	{
-		Vec3Int r = wt->getResBig();
-		res[0] = r[0];
-		res[1] = r[1];
-		res[2] = r[2];
+		res[0] = wt->_resBig[0];
+		res[1] = wt->_resBig[1];
+		res[2] = wt->_resBig[2];
 	}
 }
 
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index 7e2395216c0..d187e4c5901 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -1,6 +1,11 @@
 
 import bpy
 
+def smoke_panel_enabled_low(smd):
+	if smd.smoke_type == 'TYPE_DOMAIN':
+		return smd.domain.point_cache.baked==False
+	return True
+
 class PhysicButtonsPanel(bpy.types.Panel):
 	__space_type__ = "PROPERTIES"
 	__region_type__ = "WINDOW"
@@ -38,6 +43,8 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
 			split.itemL()
 
 		if md:
+		
+			# layout.enabled = smoke_panel_enabled(md)
 			layout.itemR(md, "smoke_type", expand=True)
 		
 			if md.smoke_type == 'TYPE_DOMAIN':
@@ -49,13 +56,6 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
 				col = split.column()
 				col.itemL(text="Resolution:")
 				col.itemR(domain, "maxres", text="Divisions")
-
-				col.itemL(text="Display:")
-				col.itemR(domain, "visibility", text="Resolution")
-				col.itemR(domain, "color", slider=True)
-				sub = col.column()
-				sub.active = domain.highres
-				sub.itemR(domain, "viewhighres")
 				
 				col = split.column()
 				col.itemL(text="Behavior:")
@@ -88,43 +88,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
 					
 			#elif md.smoke_type == 'TYPE_COLL':
 			#	layout.itemS()
-			
-class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
-	__label__ = "Smoke High Resolution"
-	__default_closed__ = True
-	
-	def poll(self, context):
-		md = context.smoke
-		if md:
-				return (md.smoke_type == 'TYPE_DOMAIN')
-		
-		return False
-
-	def draw_header(self, context):
-		layout = self.layout
-		
-		high = context.smoke.domain_settings
-	
-		layout.itemR(high, "highres", text="")
-		
-	def draw(self, context):
-		layout = self.layout
-		
-		high = context.smoke.domain_settings
-		
-		layout.active = high.highres
-		
-		split = layout.split()
-		
-		col = split.column()
-		col.itemL(text="Resolution:")
-		col.itemR(high, "amplify", text="Divisions")
-		
-		sub = split.column()
-		sub.itemL(text="Noise Method:")
-		sub.row().itemR(high, "noise_type", text="")
-		sub.itemR(high, "strength")
-			
+					
 class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 	__label__ = "Smoke Groups"
 	__default_closed__ = True
@@ -153,7 +117,168 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 		col = split.column()
 		col.itemL(text="Collision Group:")
 		col.itemR(group, "coll_group", text="")
+		
+class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
+	__label__ = "Smoke Cache"
+	__default_closed__ = True
+
+	def poll(self, context):
+		md = context.smoke
+		if md:
+				return (md.smoke_type == 'TYPE_DOMAIN')
+		
+		return False
+
+	def draw(self, context):
+		layout = self.layout
+
+		md = context.smoke
+		
+		if md.smoke_type == 'TYPE_DOMAIN':
+			
+			domain = md.domain_settings
+			cache = domain.point_cache
+			
+			layout.set_context_pointer("PointCache", cache)
+			
+			row = layout.row()
+			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+			col = row.column(align=True)
+			col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+			col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+			
+			row = layout.row()
+			row.itemR(cache, "name")
+			
+			row = layout.row()
+			row.itemR(cache, "start_frame")
+			row.itemR(cache, "end_frame")
+			
+			row = layout.row()
+			
+			if cache.baked == True:
+				row.itemO("ptcache.free_bake", text="Free Bake")
+			else:
+				row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
+			
+			subrow = row.row()
+			subrow.enabled = cache.frames_skipped or cache.outdated
+			subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
+				
+			row = layout.row()
+			#row.enabled = smoke_panel_enabled(psys)
+			row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
+		
+			row = layout.row()
+			#row.enabled = smoke_panel_enabled(psys)
+			
+			layout.itemL(text=cache.info)
+			
+			layout.itemS()
+			
+			row = layout.row()
+			row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
+			row.itemO("ptcache.free_bake_all", text="Free All Bakes")
+			layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
+			
+class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
+	__label__ = "Smoke High Resolution"
+	__default_closed__ = True
+	
+	def poll(self, context):
+		md = context.smoke
+		if md:
+				return (md.smoke_type == 'TYPE_DOMAIN')
+		
+		return False
+
+	def draw_header(self, context):
+		layout = self.layout
+		
+		high = context.smoke.domain_settings
+	
+		layout.itemR(high, "highres", text="")
+		
+	def draw(self, context):
+		layout = self.layout
+		
+		md = context.smoke_hr
+		
+		if md:
+		
+			split = layout.split()
+			
+			col = split.column()
+			col.itemL(text="Resolution:")
+			col.itemR(md, "amplify", text="Divisions")
+			
+			sub = split.column()
+			sub.itemL(text="Noise Method:")
+			sub.row().itemR(md, "noise_type", text="")
+			sub.itemR(md, "strength")
+			sub.itemR(md, "show_highres")
+		
+class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
+	__label__ = "Smoke Cache"
+	__default_closed__ = True
+
+	def poll(self, context):
+		return (context.smoke_hr != None)
+
+	def draw(self, context):
+		layout = self.layout
+
+		md = context.smoke_hr
+		
+		if md:
+			
+			cache = md.point_cache
+			
+			layout.set_context_pointer("PointCache", cache)
+			
+			row = layout.row()
+			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+			col = row.column(align=True)
+			col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+			col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+			
+			row = layout.row()
+			row.itemR(cache, "name")
+			
+			row = layout.row()
+			row.itemR(cache, "start_frame")
+			row.itemR(cache, "end_frame")
+			
+			row = layout.row()
+			
+			if cache.baked == True:
+				row.itemO("ptcache.free_bake", text="Free Bake")
+			else:
+				row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
+			
+			subrow = row.row()
+			subrow.enabled = cache.frames_skipped or cache.outdated
+			subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
+				
+			row = layout.row()
+			#row.enabled = smoke_panel_enabled(psys)
+			row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
+		
+			row = layout.row()
+			#row.enabled = smoke_panel_enabled(psys)
+			
+			layout.itemL(text=cache.info)
+			
+			layout.itemS()
+			
+			row = layout.row()
+			row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
+			row.itemO("ptcache.free_bake_all", text="Free All Bakes")
+			layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
+
 
 bpy.types.register(PHYSICS_PT_smoke)
-bpy.types.register(PHYSICS_PT_smoke_highres)
+bpy.types.register(PHYSICS_PT_smoke_cache)
 bpy.types.register(PHYSICS_PT_smoke_groups)
+#bpy.types.register(PHYSICS_PT_smoke_highres)
+#bpy.types.register(PHYSICS_PT_smoke_cache_highres)
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index 5d9dddfe30d..531487549da 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -60,8 +60,8 @@
 #define PTCACHE_TYPE_SOFTBODY			0
 #define PTCACHE_TYPE_PARTICLES			1
 #define PTCACHE_TYPE_CLOTH				2
-#define PTCACHE_TYPE_SMOKE_DOMAIN_LOW	3
-#define PTCACHE_TYPE_SMOKE_DOMAIN_HIGH	4
+#define PTCACHE_TYPE_SMOKE_DOMAIN		3
+#define PTCACHE_TYPE_SMOKE_HIGHRES		4
 
 /* PTCache read return code */
 #define PTCACHE_READ_EXACT				1
@@ -158,7 +158,7 @@ void BKE_ptcache_make_particle_key(struct ParticleKey *key, int index, void **da
 void BKE_ptcache_id_from_softbody(PTCacheID *pid, struct Object *ob, struct SoftBody *sb);
 void BKE_ptcache_id_from_particles(PTCacheID *pid, struct Object *ob, struct ParticleSystem *psys);
 void BKE_ptcache_id_from_cloth(PTCacheID *pid, struct Object *ob, struct ClothModifierData *clmd);
-void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd, int num);
+void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd);
 
 void BKE_ptcache_ids_from_object(struct ListBase *lb, struct Object *ob);
 
diff --git a/source/blender/blenkernel/BKE_smoke.h b/source/blender/blenkernel/BKE_smoke.h
index 8dc38640e9a..bd8581112f8 100644
--- a/source/blender/blenkernel/BKE_smoke.h
+++ b/source/blender/blenkernel/BKE_smoke.h
@@ -32,24 +32,17 @@
 #ifndef BKE_SMOKE_H_
 #define BKE_SMOKE_H_
 
+typedef int (*bresenham_callback) (float *input, int res[3], int *pixel, float *tRay);
+
 void smokeModifier_do(struct SmokeModifierData *smd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int isFinalCalc);
 
 void smokeModifier_free (struct SmokeModifierData *smd);
 void smokeModifier_reset(struct SmokeModifierData *smd);
 void smokeModifier_createType(struct SmokeModifierData *smd);
 
-void smoke_set_tray(struct SmokeModifierData *smd, size_t index, float transparency);
-float smoke_get_tray(struct SmokeModifierData *smd, size_t index);
-float smoke_get_tvox(struct SmokeModifierData *smd, size_t index);
-void smoke_set_tvox(struct SmokeModifierData *smd, size_t index, float tvox);
+// high res modifier
+void smokeHRModifier_do(struct SmokeHRModifierData *shrmd, struct Scene *scene, struct Object *ob, int useRenderParams, int isFinalCalc);
+void smokeHRModifier_free(struct SmokeHRModifierData *shrmd);
 
-void smoke_set_bigtray(struct SmokeModifierData *smd, size_t index, float transparency);
-float smoke_get_bigtray(struct SmokeModifierData *smd, size_t index);
-float smoke_get_bigtvox(struct SmokeModifierData *smd, size_t index);
-void smoke_set_bigtvox(struct SmokeModifierData *smd, size_t index, float tvox);
-
-long long smoke_get_mem_req(int xres, int yres, int zres, int amplify);
-void smoke_prepare_View(struct SmokeModifierData *smd, float *light);
-void smoke_prepare_bigView(struct SmokeModifierData *smd, float *light);
 
 #endif /* BKE_SMOKE_H_ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 8d1df98c5b4..17079205423 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -34,6 +34,8 @@ SET(INC
   ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
   ../../../intern/bsp/extern ../blenfont
   ../../../intern/audaspace/intern
+  ../../../extern/lzo/minilzo
+  ../../../extern/lzma
   ${ZLIB_INC}
 )
 
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index fdc7782a0b1..0c7922de6ff 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -11,6 +11,8 @@ incs += ' #/extern/bullet2/src'
 incs += ' #/intern/opennl/extern #/intern/bsp/extern'
 incs += ' ../gpu #/extern/glew/include'
 incs += ' #/intern/smoke/extern'
+incs += ' #/extern/lzo/minilzo'
+incs += ' #/extern/lzma'
 incs += ' #/intern/audaspace/intern'
 
 incs += ' ' + env['BF_OPENGL_INC']
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 53d1baa5c9c..1e2560bf809 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -5801,26 +5801,6 @@ static void smokeModifier_initData(ModifierData *md)
 	smd->coll = NULL;
 	smd->type = 0;
 	smd->time = -1;
-	
-	/*
-	smd->fluid = NULL;
-	smd->maxres = 48;
-	smd->amplify = 4;
-	smd->omega = 0.5;
-	smd->time = 0;
-	smd->flags = 0;
-	smd->noise = MOD_SMOKE_NOISEWAVE;
-	smd->visibility = 1;
-	
-	// init 3dview buffer
-	smd->tvox = NULL;
-	smd->tray = NULL;
-	smd->tvoxbig = NULL;
-	smd->traybig = NULL;
-	smd->viewsettings = 0;
-	smd->bind = NULL;
-	smd->max_textures = 0;
-	*/
 }
 
 static void smokeModifier_freeData(ModifierData *md)
@@ -5884,6 +5864,50 @@ static void smokeModifier_updateDepgraph(
 	*/
 }
 
+
+/* Smoke High Resolution */
+
+static void smokeHRModifier_initData(ModifierData *md) 
+{
+	SmokeHRModifierData *shrmd = (SmokeHRModifierData*) md;
+	
+	shrmd->wt = NULL;
+	shrmd->time = -1;
+	shrmd->strength = 2.0f;
+	shrmd->amplify = 1;
+	shrmd->noise = MOD_SMOKE_NOISEWAVE;
+	shrmd->point_cache = BKE_ptcache_add(&shrmd->ptcaches);
+	shrmd->point_cache->flag |= PTCACHE_DISK_CACHE;
+	shrmd->point_cache->step = 1;
+}
+
+static void smokeHRModifier_freeData(ModifierData *md)
+{
+	SmokeHRModifierData *shrmd = (SmokeHRModifierData*) md;
+	
+	smokeHRModifier_free (shrmd);
+}
+
+static void smokeHRModifier_deformVerts(
+					 ModifierData *md, Object *ob, DerivedMesh *derivedData,
+      float (*vertexCos)[3], int numVerts, int useRenderParams, int isFinalCalc)
+{
+	SmokeHRModifierData *shrmd = (SmokeHRModifierData*) md;
+	smokeHRModifier_do(shrmd, md->scene, ob, useRenderParams, isFinalCalc);
+}
+
+static int smokeHRModifier_dependsOnTime(ModifierData *md)
+{
+	return 1;
+}
+
+static void smokeHRModifier_updateDepgraph(
+					 ModifierData *md, DagForest *forest, Scene *scene, Object *ob,
+      DagNode *obNode)
+{
+	;
+}
+
 /* Cloth */
 
 static void clothModifier_initData(ModifierData *md) 
@@ -8580,10 +8604,23 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->type = eModifierTypeType_OnlyDeform;
 		mti->initData = smokeModifier_initData;
 		mti->freeData = smokeModifier_freeData; 
-		mti->flags = eModifierTypeFlag_AcceptsMesh;
+		mti->flags = eModifierTypeFlag_AcceptsMesh
+				| eModifierTypeFlag_UsesPointCache
+				| eModifierTypeFlag_Single;
 		mti->deformVerts = smokeModifier_deformVerts;
 		mti->dependsOnTime = smokeModifier_dependsOnTime;
 		mti->updateDepgraph = smokeModifier_updateDepgraph;
+
+		mti = INIT_TYPE(SmokeHR);
+		mti->type = eModifierTypeType_OnlyDeform;
+		mti->initData = smokeHRModifier_initData;
+		mti->freeData = smokeHRModifier_freeData; 
+		mti->flags = eModifierTypeFlag_AcceptsMesh 
+				| eModifierTypeFlag_UsesPointCache
+				| eModifierTypeFlag_Single;
+		mti->deformVerts = smokeHRModifier_deformVerts;
+		mti->dependsOnTime = smokeHRModifier_dependsOnTime;
+		mti->updateDepgraph = smokeHRModifier_updateDepgraph;
 	
 		mti = INIT_TYPE(Cloth);
 		mti->type = eModifierTypeType_Nonconstructive;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 09170d92866..ca27bde039b 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -59,7 +59,12 @@
 
 #include "BLI_blenlib.h"
 
+/* both in intern */
 #include "smoke_API.h"
+#include "minilzo.h"
+
+#include "LzmaLib.h"
+
 
 /* needed for directory lookup */
 #ifndef WIN32
@@ -469,43 +474,116 @@ void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *p
 	pid->info_types= (1<<BPHYS_DATA_TIMES);
 }
 
-#if 0 // XXX smoke pointcache stuff breaks compiling now
 /* Smoke functions */
 static int ptcache_totpoint_smoke(void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
 	
-	if(sds->fluid)
-	{
+	if(sds->fluid) {
 		return sds->res[0]*sds->res[1]*sds->res[2];
 	}
 	else
 		return 0;
 }
 
+static int ptcache_totpoint_smoke_turbulence(void *smoke_v)
+{
+	SmokeHRModifierData *shrmd= (SmokeHRModifierData *)smoke_v;
+	
+	if(shrmd->wt) {
+		/*
+		unsigned int res[3];
+
+		smoke_turbulence_get_res(sds->wt, res);
+		return res[0]*res[1]*res[2];
+		*/
+		return 0;
+	}
+	else
+		return 0;
+}
+
 // forward decleration
 static int ptcache_file_write(PTCacheFile *pf, void *f, size_t tot, int size);
 
+static int ptcache_compress_write(PTCacheFile *pf, unsigned char *in, unsigned int in_len, unsigned char *out, int mode)
+{
+	int r;
+	unsigned char compressed;
+	LZO_HEAP_ALLOC(wrkmem, LZO1X_MEM_COMPRESS);
+	unsigned int out_len = LZO_OUT_LEN(in_len);
+	unsigned char *props = MEM_callocN(16*sizeof(char), "tmp");
+	size_t sizeOfIt = 5;
+
+	if(mode == 1) {
+		r = lzo1x_1_compress(in, (lzo_uint)in_len, out, (lzo_uint *)&out_len, wrkmem);	
+		if (!(r == LZO_E_OK) || (out_len >= in_len))
+			compressed = 0;
+		else
+			compressed = 1;
+	}
+	else if(mode == 2) {
+		
+		r = LzmaCompress(out, (size_t *)&out_len, in, in_len,//assume sizeof(char)==1....
+						props, &sizeOfIt, 5, 1 << 24, 3, 0, 2, 32, 2);
+
+		if(!(r == SZ_OK) || (out_len >= in_len))
+			compressed = 0;
+		else
+			compressed = 2;
+	}
+
+	ptcache_file_write(pf, &compressed, 1, sizeof(unsigned char));
+	if(compressed) {
+		ptcache_file_write(pf, &out_len, 1, sizeof(unsigned int));
+		ptcache_file_write(pf, out, out_len, sizeof(unsigned char));
+	}
+	else
+		ptcache_file_write(pf, in, in_len, sizeof(unsigned char));
+
+	if(compressed == 2)
+	{
+		ptcache_file_write(pf, &sizeOfIt, 1, sizeof(unsigned int));
+		ptcache_file_write(pf, props, sizeOfIt, sizeof(unsigned char));
+	}
+
+	MEM_freeN(props);
+
+	return r;
+}
+
 static int ptcache_write_smoke(PTCacheFile *pf, void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
 	
-	if(sds->fluid)
-	{
+	if(sds->fluid) {
 		size_t res = sds->res[0]*sds->res[1]*sds->res[2];
-		float *dens, *densold, *heat, *heatold, *vx, *vy, *vz;
-		
-		smoke_export(sds->fluid, &dens, &densold, &heat, &heatold, &vx, &vy, &vz);
-		
-		ptcache_file_write(pf, dens, res, sizeof(float));
-		ptcache_file_write(pf, densold, res, sizeof(float));
-		ptcache_file_write(pf, heat, res, sizeof(float));
-		ptcache_file_write(pf, heatold, res, sizeof(float));
-		ptcache_file_write(pf, vx, res, sizeof(float));
-		ptcache_file_write(pf, vy, res, sizeof(float));
-		ptcache_file_write(pf, vz, res, sizeof(float));
+		float dt, dx, *dens, *densold, *heat, *heatold, *vx, *vy, *vz, *vxold, *vyold, *vzold;
+		unsigned char *obstacles;
+		unsigned int in_len = sizeof(float)*(unsigned int)res;
+		unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len)*4, "pointcache_lzo_buffer");
+		int mode = res >= 1000000 ? 2 : 1;
+
+		smoke_export(sds->fluid, &dt, &dx, &dens, &densold, &heat, &heatold, &vx, &vy, &vz, &vxold, &vyold, &vzold, &obstacles);
+
+		ptcache_compress_write(pf, (unsigned char *)sds->view3d, in_len*4, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)dens, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)densold, in_len, out, mode);	
+		ptcache_compress_write(pf, (unsigned char *)heat, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)heatold, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)vx, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)vy, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)vz, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)vxold, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)vyold, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)vzold, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)obstacles, (unsigned int)res, out, mode);
+		ptcache_file_write(pf, &dt, 1, sizeof(float));
+		ptcache_file_write(pf, &dx, 1, sizeof(float));
+
+		MEM_freeN(out);
 		
 		return 1;
 	}
@@ -513,32 +591,134 @@ static int ptcache_write_smoke(PTCacheFile *pf, void *smoke_v)
 	return 0;
 }
 
+static int ptcache_write_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
+{
+	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
+	SmokeDomainSettings *sds = smd->domain;
+	/*
+	if(sds->wt) {
+		unsigned int res_big[3];
+		size_t res = sds->res[0]*sds->res[1]*sds->res[2];
+		float *dens, *densold, *tcu, *tcv, *tcw;
+		unsigned int in_len = sizeof(float)*(unsigned int)res;
+		unsigned int in_len_big = sizeof(float) * (unsigned int)res_big;
+		unsigned char *out;
+		int mode;
+
+		smoke_turbulence_get_res(sds->wt, res_big);
+		mode = res_big[0]*res_big[1]*res_big[2] >= 1000000 ? 2 : 1;
+
+		smoke_turbulence_export(sds->wt, &dens, &densold, &tcu, &tcv, &tcw);
+
+		out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len_big), "pointcache_lzo_buffer");
+
+		ptcache_compress_write(pf, (unsigned char *)dens, in_len_big, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)densold, in_len_big, out, mode);	
+
+		MEM_freeN(out);
+		out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len), "pointcache_lzo_buffer");
+		ptcache_compress_write(pf, (unsigned char *)tcu, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)tcv, in_len, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)tcw, in_len, out, mode);
+		MEM_freeN(out);
+		
+		return 1;
+	}
+*/
+	return 0;
+}
+
 // forward decleration
 static int ptcache_file_read(PTCacheFile *pf, void *f, size_t tot, int size);
 
+static int ptcache_compress_read(PTCacheFile *pf, unsigned char *result, unsigned int len)
+{
+	int r;
+	unsigned char compressed = 0;
+	unsigned int in_len;
+	unsigned int out_len = len;
+	unsigned char *in;
+	unsigned char *props = MEM_callocN(16*sizeof(char), "tmp");
+	size_t sizeOfIt = 5;
+
+	ptcache_file_read(pf, &compressed, 1, sizeof(unsigned char));
+	if(compressed) {
+		ptcache_file_read(pf, &in_len, 1, sizeof(unsigned int));
+		in = (unsigned char *)MEM_callocN(sizeof(unsigned char)*in_len, "pointcache_compressed_buffer");
+		ptcache_file_read(pf, in, in_len, sizeof(unsigned char));
+
+		if(compressed == 1)
+				r = lzo1x_decompress(in, (lzo_uint)in_len, result, (lzo_uint *)&out_len, NULL);
+		else if(compressed == 2)
+		{
+			size_t leni = in_len, leno = out_len;
+			ptcache_file_read(pf, &sizeOfIt, 1, sizeof(unsigned int));
+			ptcache_file_read(pf, props, sizeOfIt, sizeof(unsigned char));
+			r = LzmaUncompress(result, &leno, in, &leni, props, sizeOfIt);
+		}
+
+		MEM_freeN(in);
+	}
+	else {
+		ptcache_file_read(pf, result, len, sizeof(unsigned char));
+	}
+
+	MEM_freeN(props);
+
+	return r;
+}
+
 static void ptcache_read_smoke(PTCacheFile *pf, void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
 	
-	if(sds->fluid)
-	{
+	if(sds->fluid) {
 		size_t res = sds->res[0]*sds->res[1]*sds->res[2];
-		float *dens, *densold, *heat, *heatold, *vx, *vy, *vz;
+		float dt, dx, *dens, *densold, *heat, *heatold, *vx, *vy, *vz, *vxold, *vyold, *vzold;
+		unsigned char *obstacles;
+		unsigned int out_len = (unsigned int)res * sizeof(float);
 		
-		smoke_export(sds->fluid, &dens, &densold, &heat, &heatold, &vx, &vy, &vz);
+		smoke_export(sds->fluid, &dt, &dx, &dens, &densold, &heat, &heatold, &vx, &vy, &vz, &vxold, &vyold, &vzold, &obstacles);
 
-		ptcache_file_read(pf, dens, res, sizeof(float));
-		ptcache_file_read(pf, densold, res, sizeof(float));
-		ptcache_file_read(pf, heat, res, sizeof(float));
-		ptcache_file_read(pf, heatold, res, sizeof(float));
-		ptcache_file_read(pf, vx, res, sizeof(float));
-		ptcache_file_read(pf, vy, res, sizeof(float));
-		ptcache_file_read(pf, vz, res, sizeof(float));
-		
+		ptcache_compress_read(pf, (unsigned char *)sds->view3d, out_len*4);
+		ptcache_compress_read(pf, (unsigned char*)dens, out_len);
+		ptcache_compress_read(pf, (unsigned char*)densold, out_len);
+		ptcache_compress_read(pf, (unsigned char*)heat, out_len);
+		ptcache_compress_read(pf, (unsigned char*)heatold, out_len);
+		ptcache_compress_read(pf, (unsigned char*)vx, out_len);
+		ptcache_compress_read(pf, (unsigned char*)vy, out_len);
+		ptcache_compress_read(pf, (unsigned char*)vz, out_len);
+		ptcache_compress_read(pf, (unsigned char*)vxold, out_len);
+		ptcache_compress_read(pf, (unsigned char*)vyold, out_len);
+		ptcache_compress_read(pf, (unsigned char*)vzold, out_len);
+		ptcache_compress_read(pf, (unsigned char*)obstacles, (unsigned int)res);
+		ptcache_file_read(pf, &dt, 1, sizeof(float));
+		ptcache_file_read(pf, &dx, 1, sizeof(float));
 	}
 }
-void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd, int num)
+
+static void ptcache_read_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
+{
+	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
+	SmokeDomainSettings *sds = smd->domain;
+	/*
+	if(sds->fluid) {
+		unsigned int res[3];
+		float *dens, *densold, *tcu, *tcv, *tcw;
+		unsigned int out_len = sizeof(float)*(unsigned int)res;
+
+		smoke_turbulence_get_res(sds->wt, res);
+
+		smoke_turbulence_export(sds->wt, &dens, &densold, &tcu, &tcv, &tcw);
+
+		ptcache_compress_read(pf, (unsigned char*)dens, out_len);
+		
+	}
+	*/
+}
+
+void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd)
 {
 	SmokeDomainSettings *sds = smd->domain;
 
@@ -547,24 +727,21 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeMo
 	pid->ob= ob;
 	pid->calldata= smd;
 	
-	// if(num == 0)
-	pid->type= PTCACHE_TYPE_SMOKE_DOMAIN_LOW;
-	// else if(num == 1)
-	// 	pid->type= PTCACHE_TYPE_SMOKE_DOMAIN_HIGH;
-
+	pid->type= PTCACHE_TYPE_SMOKE_DOMAIN;
 	pid->stack_index= modifiers_indexInObject(ob, (ModifierData *)smd);
 
 	pid->cache= sds->point_cache;
 	pid->cache_ptr= &sds->point_cache;
 	pid->ptcaches= &sds->ptcaches;
 
-	
 	pid->totpoint= pid->totwrite= ptcache_totpoint_smoke;
 
 	pid->write_elem= NULL;
 	pid->read_elem= NULL;
+
 	pid->read_stream = ptcache_read_smoke;
 	pid->write_stream = ptcache_write_smoke;
+	
 	pid->interpolate_elem= NULL;
 
 	pid->write_header= ptcache_write_basic_header;
@@ -573,7 +750,6 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeMo
 	pid->data_types= (1<<BPHYS_DATA_LOCATION); // bogus values tot make pointcache happy
 	pid->info_types= 0;
 }
-#endif // XXX smoke poitcache stuff breaks compiling
 
 void BKE_ptcache_id_from_cloth(PTCacheID *pid, Object *ob, ClothModifierData *clmd)
 {
@@ -633,18 +809,15 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob)
 			BKE_ptcache_id_from_cloth(pid, ob, (ClothModifierData*)md);
 			BLI_addtail(lb, pid);
 		}
-		/*
-		// enabled on next commit 
 		if(md->type == eModifierType_Smoke) {
 			SmokeModifierData *smd = (SmokeModifierData *)md;
 			if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 			{
 				pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
-				BKE_ptcache_id_from_smoke(pid, ob, (SmokeModifierData*)md, 0);
+				BKE_ptcache_id_from_smoke(pid, ob, (SmokeModifierData*)md);
 				BLI_addtail(lb, pid);
 			}
 		}
-		*/
 	}
 }
 
@@ -1140,13 +1313,13 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 			if(use_old) {
 				if(pid->read_elem && ptcache_file_read(pf, (void*)old_data1, 1, old_elemsize))
 					pid->read_elem(i, pid->calldata, NULL, frs_sec, cfra, old_data1);
-				else
+				else if(pid->read_elem)
 					{ error = 1; break; }
 			}
 			else {
 				if(pid->read_elem && (pm || ptcache_file_read_data(pf)))
 					pid->read_elem(*index, pid->calldata, pm ? pm->cur : pf->cur, frs_sec, cfra1 ? (float)cfra1 : (float)cfrai, NULL);
-				else
+				else if(pid->read_elem)
 					{ error = 1; break; }
 			}
 
@@ -1185,7 +1358,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 					else
 					{ error = 1; break; }
 				}
-				else
+				else if(pid->read_elem)
 					{ error = 1; break; }
 			}
 			else {
@@ -1197,7 +1370,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 					else
 					{ error = 1; break; }
 				}
-				else
+				else if(pid->read_elem)
 					{ error = 1; break; }
 			}
 
@@ -1639,8 +1812,11 @@ int BKE_ptcache_id_reset(Scene *scene, PTCacheID *pid, int mode)
 			sbFreeSimulation(pid->calldata);
 		else if(pid->type == PTCACHE_TYPE_PARTICLES)
 			psys_reset(pid->calldata, PSYS_RESET_DEPSGRAPH);
-		else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN_LOW)
+		else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
+		{
 			smokeModifier_reset(pid->calldata);
+			printf("reset PTCACHE_TYPE_SMOKE_DOMAIN\n");
+		}
 	}
 	if(clear)
 		BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
@@ -1689,17 +1865,14 @@ int BKE_ptcache_object_reset(Scene *scene, Object *ob, int mode)
 			BKE_ptcache_id_from_cloth(&pid, ob, (ClothModifierData*)md);
 			reset |= BKE_ptcache_id_reset(scene, &pid, mode);
 		}
-		/*
-		// enabled on next commit 
 		if(md->type == eModifierType_Smoke) {
 			SmokeModifierData *smd = (SmokeModifierData *)md;
 			if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 			{
-				BKE_ptcache_id_from_smoke(&pid, ob, (SmokeModifierData*)md, 0);
+				BKE_ptcache_id_from_smoke(&pid, ob, (SmokeModifierData*)md);
 				reset |= BKE_ptcache_id_reset(scene, &pid, mode);
 			}
 		}
-		*/
 	}
 
 	return reset;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 22ea41276ff..6449ae10eee 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -54,10 +54,13 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
+#include "BKE_smoke.h"
 #include "BKE_utildefines.h"
 
 #include "DNA_customdata_types.h"
 #include "DNA_group_types.h"
+#include "DNA_lamp_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
@@ -120,9 +123,9 @@ struct DerivedMesh;
 struct SmokeModifierData;
 
 // forward declerations
-static void get_cell(struct SmokeModifierData *smd, float *pos, int *cell, int correct);
-static void get_bigcell(struct SmokeModifierData *smd, float *pos, int *cell, int correct);
+void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);
 void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
+void smoke_prepare_View(SmokeModifierData *smd, float framenr, float *light, int have_light);
 
 #define TRI_UVOFFSET (1./4.)
 
@@ -205,17 +208,18 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		// TODO: put in failsafe if res<=0 - dg
 
 		// printf("res[0]: %d, res[1]: %d, res[2]: %d\n", smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]);
-
 		// dt max is 0.1
 		smd->domain->fluid = smoke_init(smd->domain->res, smd->domain->p0, 0.1);
-		smd->domain->wt = smoke_turbulence_init(smd->domain->res,  (smd->domain->flags & MOD_SMOKE_HIGHRES) ? (smd->domain->amplify + 1) : 0, smd->domain->noise);
 		smd->time = scene->r.cfra;
 		smd->domain->firstframe = smd->time;
-		
-		smoke_initBlenderRNA(smd->domain->fluid, &(smd->domain->alpha), &(smd->domain->beta));
 
-		if(smd->domain->wt)
-			smoke_initWaveletBlenderRNA(smd->domain->wt, &(smd->domain->strength));
+		if(!smd->domain->view3d)
+		{
+			// TVox is for transparency
+			smd->domain->view3d = MEM_callocN(sizeof(float)*smd->domain->res[0]*smd->domain->res[1]*smd->domain->res[2]*4, "Smoke_tVox");
+		}
+
+		smoke_initBlenderRNA(smd->domain->fluid, &(smd->domain->alpha), &(smd->domain->beta));
 
 		return 1;
 	}
@@ -256,7 +260,8 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 			SmokeCollSettings *scs = smd->coll;
 			MVert *mvert = dm->getVertArray(dm);
 			MFace *mface = dm->getFaceArray(dm);
-			size_t i = 0, divs = 0;
+			size_t i = 0;
+			int divs = 0;
 			int *tridivs = NULL;
 			float cell_len = 1.0 / 50.0; // for res = 50
 			size_t newdivs = 0;
@@ -507,27 +512,14 @@ void smokeModifier_freeDomain(SmokeModifierData *smd)
 	if(smd->domain)
 	{
 		// free visualisation buffers
-		if(smd->domain->bind)
-		{
-			glDeleteTextures(smd->domain->max_textures, (GLuint *)smd->domain->bind);
-			MEM_freeN(smd->domain->bind);
-		}
-		smd->domain->max_textures = 0; // unnecessary but let's be sure
-
-		if(smd->domain->tray)
-			MEM_freeN(smd->domain->tray);
-		if(smd->domain->tvox)
-			MEM_freeN(smd->domain->tvox);
-		if(smd->domain->traybig)
-			MEM_freeN(smd->domain->traybig);
-		if(smd->domain->tvoxbig)
-			MEM_freeN(smd->domain->tvoxbig);
-
+		if(smd->domain->view3d)
+			MEM_freeN(smd->domain->view3d);
+		
 		if(smd->domain->fluid)
 			smoke_free(smd->domain->fluid);
 
-		if(smd->domain->wt)
-			smoke_turbulence_free(smd->domain->wt);
+		BKE_ptcache_free_list(&smd->domain->ptcaches);
+		smd->domain->point_cache = NULL;
 
 		MEM_freeN(smd->domain);
 		smd->domain = NULL;
@@ -582,44 +574,24 @@ void smokeModifier_reset(struct SmokeModifierData *smd)
 	{
 		if(smd->domain)
 		{
-			// free visualisation buffers
-			if(smd->domain->bind)
-			{
-				glDeleteTextures(smd->domain->max_textures, (GLuint *)smd->domain->bind);
-				MEM_freeN(smd->domain->bind);
-				smd->domain->bind = NULL;
-			}
-			smd->domain->max_textures = 0;
-			if(smd->domain->viewsettings < MOD_SMOKE_VIEW_USEBIG)
-				smd->domain->viewsettings = 0;
-			else
-				smd->domain->viewsettings = MOD_SMOKE_VIEW_USEBIG;
+			if(smd->domain->view3d)
+				MEM_freeN(smd->domain->view3d);
+			smd->domain->view3d = NULL;
 
-			if(smd->domain->tray)
-				MEM_freeN(smd->domain->tray);
-			if(smd->domain->tvox)
-				MEM_freeN(smd->domain->tvox);
-			if(smd->domain->traybig)
-				MEM_freeN(smd->domain->traybig);
-			if(smd->domain->tvoxbig)
-				MEM_freeN(smd->domain->tvoxbig);
-
-			smd->domain->tvox = NULL;
-			smd->domain->tray = NULL;
-			smd->domain->tvoxbig = NULL;
-			smd->domain->traybig = NULL;
+			smd->domain->tex = NULL;
 
 			if(smd->domain->fluid)
 			{
 				smoke_free(smd->domain->fluid);
 				smd->domain->fluid = NULL;
 			}
-			
-			if(smd->domain->wt)
-			{
-				smoke_turbulence_free(smd->domain->wt);
-				smd->domain->wt = NULL;
-			}
+		
+			smd->domain->point_cache->flag &= ~PTCACHE_SIMULATION_VALID;
+			smd->domain->point_cache->flag |= PTCACHE_OUTDATED;
+			smd->domain->point_cache->simframe= 0;
+			smd->domain->point_cache->last_exact= 0;
+
+			printf("reset_domain\n");
 		}
 		else if(smd->flow)
 		{
@@ -677,31 +649,24 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 
 			smd->domain->smd = smd;
 
+			smd->domain->point_cache = BKE_ptcache_add(&smd->domain->ptcaches);
+			smd->domain->point_cache->flag |= PTCACHE_DISK_CACHE;
+			smd->domain->point_cache->step = 1;
+
 			/* set some standard values */
 			smd->domain->fluid = NULL;
-			smd->domain->wt = NULL;
 			smd->domain->eff_group = NULL;
 			smd->domain->fluid_group = NULL;
 			smd->domain->coll_group = NULL;
 			smd->domain->maxres = 32;
-			smd->domain->amplify = 1;
-			smd->domain->omega = 1.0;
 			smd->domain->alpha = -0.001;
 			smd->domain->beta = 0.1;
 			smd->domain->flags = MOD_SMOKE_DISSOLVE_LOG;
-			smd->domain->strength = 2.0;
-			smd->domain->noise = MOD_SMOKE_NOISEWAVE;
-			smd->domain->visibility = 1;
 			smd->domain->diss_speed = 5;
 
 			// init 3dview buffer
-			smd->domain->tvox = NULL;
-			smd->domain->tray = NULL;
-			smd->domain->tvoxbig = NULL;
-			smd->domain->traybig = NULL;
-			smd->domain->viewsettings = 0;
-			smd->domain->bind = NULL;
-			smd->domain->max_textures = 0;
+			smd->domain->view3d = NULL;
+			smd->domain->tex = NULL;
 		}
 		else if(smd->type & MOD_SMOKE_TYPE_FLOW)
 		{
@@ -736,15 +701,15 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 }
 
 // forward declaration
-void smoke_calc_transparency(struct SmokeModifierData *smd, float *light, int big);
+void smoke_simulate_domain(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm);
 
 void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm, int useRenderParams, int isFinalCalc)
 {	
-	if(scene->r.cfra >= smd->time)
-		smokeModifier_init(smd, ob, scene, dm);
-
 	if((smd->type & MOD_SMOKE_TYPE_FLOW))
 	{
+		if(scene->r.cfra >= smd->time)
+			smokeModifier_init(smd, ob, scene, dm);
+
 		if(scene->r.cfra > smd->time)
 		{
 			// XXX TODO
@@ -764,6 +729,9 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 	}
 	else if(smd->type & MOD_SMOKE_TYPE_COLL)
 	{
+		if(scene->r.cfra >= smd->time)
+			smokeModifier_init(smd, ob, scene, dm);
+
 		if(scene->r.cfra > smd->time)
 		{
 			// XXX TODO
@@ -786,459 +754,484 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 	}
 	else if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 	{
+		PointCache *cache;
+		PTCacheID pid;
+		float timescale;
+		int cache_result = 0;
+		int startframe, endframe, framenr;
 		SmokeDomainSettings *sds = smd->domain;
+		float light[3] = {0.0,0.0,0.0};
+		int have_lamp = 0;
+
+		printf("smd->type & MOD_SMOKE_TYPE_DOMAIN\n");
+
+		framenr = scene->r.cfra;
+
+		cache = sds->point_cache;
+
+		BKE_ptcache_id_from_smoke(&pid, ob, smd);
+		BKE_ptcache_id_time(&pid, scene, framenr, &startframe, &endframe, &timescale);
+
+		/* handle continuous simulation with the play button */
+		if(BKE_ptcache_get_continue_physics()) 
+		{
+			cache->flag &= ~PTCACHE_SIMULATION_VALID;
+			cache->simframe= 0;
+			cache->last_exact= 0;
+
+			smokeModifier_init(smd, ob, scene, dm);
+
+			smoke_simulate_domain(smd, scene, ob, dm);
+
+			return;
+		}
 		
-		if(scene->r.cfra > smd->time)
+		if(framenr < startframe)
 		{
-			GroupObject *go = NULL;
-			Base *base = NULL;
-			
-			tstart();
-			
-			if(sds->flags & MOD_SMOKE_DISSOLVE)
-			{
-				smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
-				
-				if(sds->wt)
-					smoke_dissolve_wavelet(sds->wt, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
-			}
+			cache->flag &= ~PTCACHE_SIMULATION_VALID;
+			cache->simframe= 0;
+			cache->last_exact= 0;
 
-			/* reset view for new frame */
-			if(sds->viewsettings < MOD_SMOKE_VIEW_USEBIG)
-				sds->viewsettings = 0;
-			else
-				sds->viewsettings = MOD_SMOKE_VIEW_USEBIG;
-
-			// do flows and fluids
-			if(1)
-			{
-				Object *otherobj = NULL;
-				ModifierData *md = NULL;
-
-				if(sds->fluid_group) // we use groups since we have 2 domains
-					go = sds->fluid_group->gobject.first;
-				else
-					base = scene->base.first;
-
-				while(base || go)
-				{
-					otherobj = NULL;
-
-					if(sds->fluid_group) 
-					{
-						if(go->ob)
-							otherobj = go->ob;
-					}
-					else
-						otherobj = base->object;
-
-					if(!otherobj)
-					{
-						if(sds->fluid_group)
-							go = go->next;
-						else
-							base= base->next;
-
-						continue;
-					}
-
-					md = modifiers_findByType(otherobj, eModifierType_Smoke);
-					
-					// check for active smoke modifier
-					if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
-					{
-						SmokeModifierData *smd2 = (SmokeModifierData *)md;
-						
-						// check for initialized smoke object
-						if((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow)
-						{
-							// we got nice flow object
-							SmokeFlowSettings *sfs = smd2->flow;
-							
-							if(sfs->psys && sfs->psys->part && sfs->psys->part->type==PART_EMITTER) // is particle system selected
-							{
-								ParticleSystem *psys = sfs->psys;
-								ParticleSettings *part=psys->part;
-								ParticleData *pa = NULL;
-								int p = 0;
-								float *density = smoke_get_density(sds->fluid);
-								float *bigdensity = smoke_turbulence_get_density(sds->wt);
-								float *heat = smoke_get_heat(sds->fluid);
-								float *velocity_x = smoke_get_velocity_x(sds->fluid);
-								float *velocity_y = smoke_get_velocity_y(sds->fluid);
-								float *velocity_z = smoke_get_velocity_z(sds->fluid);
-								unsigned char *obstacle = smoke_get_obstacle(sds->fluid);
-								int bigres[3];	
-
-								printf("found flow psys\n");
-								
-								// mostly copied from particle code
-								for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++)
-								{
-									int cell[3];
-									size_t i = 0;
-									size_t index = 0;
-									int badcell = 0;
-									
-									if(pa->alive == PARS_KILLED) continue;
-									else if(pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN)==0) continue;
-									else if(pa->alive == PARS_DEAD && (part->flag & PART_DIED)==0) continue;
-									else if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;
-									
-									// VECCOPY(pos, pa->state.co);
-									// Mat4MulVecfl (ob->imat, pos);
-									
-									// 1. get corresponding cell
-									get_cell(smd, pa->state.co, cell, 0);
-								
-									// check if cell is valid (in the domain boundary)
-									for(i = 0; i < 3; i++)
-									{
-										if((cell[i] > sds->res[i] - 1) || (cell[i] < 0))
-										{
-											badcell = 1;
-											break;
-										}
-									}
-										
-									if(badcell)
-										continue;
-									
-									// 2. set cell values (heat, density and velocity)
-									index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
-									
-									if(!(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) && !(obstacle[index] & 2)) // this is inflow
-									{
-										// heat[index] += sfs->temp * 0.1;
-										// density[index] += sfs->density * 0.1;
-
-										heat[index] = sfs->temp;
-										density[index] = sfs->density;
-
-										/*
-										velocity_x[index] = pa->state.vel[0];
-										velocity_y[index] = pa->state.vel[1];
-										velocity_z[index] = pa->state.vel[2];
-										*/
-										obstacle[index] |= 2;
-
-										// we need different handling for the high-res feature
-										if(bigdensity)
-										{
-											// init all surrounding cells according to amplification, too
-											int i, j, k;
-
-											smoke_turbulence_get_res(smd->domain->wt, bigres);
-
-											for(i = 0; i < smd->domain->amplify + 1; i++)
-												for(j = 0; j < smd->domain->amplify + 1; j++)
-													for(k = 0; k < smd->domain->amplify + 1; k++)
-													{
-														index = smoke_get_index((smd->domain->amplify + 1)* cell[0] + i, bigres[0], (smd->domain->amplify + 1)* cell[1] + j, bigres[1], (smd->domain->amplify + 1)* cell[2] + k);
-														bigdensity[index] = sfs->density;
-													}
-										}
-									}
-									else if(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) // outflow
-									{
-										heat[index] = 0.f;
-										density[index] = 0.f;
-										velocity_x[index] = 0.f;
-										velocity_y[index] = 0.f;
-										velocity_z[index] = 0.f;
-
-										// we need different handling for the high-res feature
-										if(bigdensity)
-										{
-											// init all surrounding cells according to amplification, too
-											int i, j, k;
-
-											smoke_turbulence_get_res(smd->domain->wt, bigres);
-
-											for(i = 0; i < smd->domain->amplify + 1; i++)
-												for(j = 0; j < smd->domain->amplify + 1; j++)
-													for(k = 0; k < smd->domain->amplify + 1; k++)
-													{
-														index = smoke_get_index((smd->domain->amplify + 1)* cell[0] + i, bigres[0], (smd->domain->amplify + 1)* cell[1] + j, bigres[1], (smd->domain->amplify + 1)* cell[2] + k);
-														bigdensity[index] = 0.f;
-													}
-										}
-									}
-								}
-							}
-							else
-							{
-								/*
-								for()
-								{
-									// no psys
-									BVHTreeNearest nearest;
-
-									nearest.index = -1;
-									nearest.dist = FLT_MAX;
-
-									BLI_bvhtree_find_nearest(sfs->bvh->tree, pco, &nearest, sfs->bvh->nearest_callback, sfs->bvh);
-								}*/
-							}
-						}	
-					}
-
-					if(sds->fluid_group)
-						go = go->next;
-					else
-						base= base->next;
-				}
-			}
-
-			// do effectors
-			/*
-			if(sds->eff_group)
-			{
-				for(go = sds->eff_group->gobject.first; go; go = go->next) 
-				{
-					if(go->ob)
-					{
-						if(ob->pd)
-						{
-							
-						}
-					}
-				}
-			}
-			*/
-
-			// do collisions	
-			if(1)
-			{
-				Object *otherobj = NULL;
-				ModifierData *md = NULL;
-
-				if(sds->coll_group) // we use groups since we have 2 domains
-					go = sds->coll_group->gobject.first;
-				else
-					base = scene->base.first;
-
-				while(base || go)
-				{
-					otherobj = NULL;
-
-					if(sds->coll_group) 
-					{
-						if(go->ob)
-							otherobj = go->ob;
-					}
-					else
-						otherobj = base->object;
-
-					if(!otherobj)
-					{
-						if(sds->coll_group)
-							go = go->next;
-						else
-							base= base->next;
-
-						continue;
-					}
-			
-					md = modifiers_findByType(otherobj, eModifierType_Smoke);
-					
-					// check for active smoke modifier
-					if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
-					{
-						SmokeModifierData *smd2 = (SmokeModifierData *)md;
-
-						if((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll)
-						{
-							// we got nice collision object
-							SmokeCollSettings *scs = smd2->coll;
-							size_t i, j;
-							unsigned char *obstacles = smoke_get_obstacle(smd->domain->fluid);
-
-							for(i = 0; i < scs->numpoints; i++)
-							{
-								int badcell = 0;
-								size_t index = 0;
-								int cell[3];
-
-								// 1. get corresponding cell
-								get_cell(smd, &scs->points[3 * i], cell, 0);
-							
-								// check if cell is valid (in the domain boundary)
-								for(j = 0; j < 3; j++)
-									if((cell[j] > sds->res[j] - 1) || (cell[j] < 0))
-									{
-										badcell = 1;
-										break;
-									}
-										
-								if(badcell)
-									continue;
-
-								// 2. set cell values (heat, density and velocity)
-								index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
-								
-								// printf("cell[0]: %d, cell[1]: %d, cell[2]: %d\n", cell[0], cell[1], cell[2]);
-								// printf("res[0]: %d, res[1]: %d, res[2]: %d, index: %d\n\n", sds->res[0], sds->res[1], sds->res[2], index);
-									
-								obstacles[index] = 1;
-
-								// for moving gobstacles
-								/*
-								const LbmFloat maxVelVal = 0.1666;
-								const LbmFloat maxusqr = maxVelVal*maxVelVal*3. *1.5;
-
-								LbmVec objvel = vec2L((mMOIVertices[n]-mMOIVerticesOld[n]) /dvec); { 
-								const LbmFloat usqr = (objvel[0]*objvel[0]+objvel[1]*objvel[1]+objvel[2]*objvel[2])*1.5; 
-								USQRMAXCHECK(usqr, objvel[0],objvel[1],objvel[2], mMaxVlen, mMxvx,mMxvy,mMxvz); 
-								if(usqr>maxusqr) { 
-									// cutoff at maxVelVal 
-									for(int jj=0; jj<3; jj++) { 
-										if(objvel[jj]>0.) objvel[jj] =  maxVelVal;  
-										if(objvel[jj]<0.) objvel[jj] = -maxVelVal; 
-									} 
-								} } 
-
-								const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); 
-								const LbmVec oldov=objvel; // debug
-								objvel = vec2L((*pNormals)[n]) *dp;
-								*/
-							}
-						}
-					}
-
-					if(sds->coll_group)
-						go = go->next;
-					else
-						base= base->next;
-				}
-			}
-			
-			// set new time
-			smd->time = scene->r.cfra;
-
-			// simulate the actual smoke (c++ code in intern/smoke)
-			smoke_step(sds->fluid, smd->time);
-			if(sds->wt)
-				smoke_turbulence_step(sds->wt, sds->fluid);
-
-			tend();
-			printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
-		}
-		else if(scene->r.cfra < smd->time)
-		{
 			// we got back in time, reset smoke in this case (TODO: use cache later)
-			smd->time = scene->r.cfra;
-			smokeModifier_reset(smd);
+			// smd->time = scene->r.cfra;
+			// smokeModifier_reset(smd);
+
+			return;
 		}
+		else if(framenr > endframe) 
+		{
+			framenr = endframe;
+		}
+
+		if(!(cache->flag & PTCACHE_SIMULATION_VALID))
+		{
+			// printf("reseting\n");
+			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+		}
+	
+		smokeModifier_init(smd, ob, scene, dm);
+
+		/* try to read from cache */
+		cache_result = BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
+		printf("cache_result: %d\n", cache_result);
+
+		if(cache_result == PTCACHE_READ_EXACT) 
+		{
+			SmokeDomainSettings *sds = smd->domain;
+
+			cache->flag |= PTCACHE_SIMULATION_VALID;
+			cache->simframe= framenr;
+			sds->v3dnum = framenr;
+
+			// printf("PTCACHE_READ_EXACT\n");
+			return;
+		}
+		else if(cache_result==PTCACHE_READ_OLD) 
+		{
+			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_FREE);
+
+			// printf("PTCACHE_READ_OLD\n");
+
+			cache->flag |= PTCACHE_SIMULATION_VALID;
+		}
+		else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) 
+		{
+			/* if baked and nothing in cache, do nothing */
+			cache->flag &= ~PTCACHE_SIMULATION_VALID;
+			cache->simframe= 0;
+			cache->last_exact= 0;
+
+			// printf("PTCACHE_BAKED\n");
+			return;
+		}
+		else if((cache_result==0) && (startframe!=framenr) && !(cache->flag & PTCACHE_SIMULATION_VALID))
+		{
+			cache->flag &= ~PTCACHE_SIMULATION_VALID;
+			cache->simframe= 0;
+			cache->last_exact= 0;
+
+			return;
+		}
+		
+		/* do simulation */
+
+		// low res
+		cache->flag |= PTCACHE_SIMULATION_VALID;
+		cache->simframe= framenr;
+
+		smoke_simulate_domain(smd, scene, ob, dm);
+
+		{
+			// float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
+			Base *base_tmp = NULL;
+
+			for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
+			{
+				if(base_tmp->object->type == OB_LAMP) 
+				{
+					Lamp *la = (Lamp *)base_tmp->object->data;
+					
+					if(la->type == LA_LOCAL)
+					{
+						VECCOPY(light, base_tmp->object->obmat[3]);
+						have_lamp = 1;
+						break;
+					}
+				}
+			}
+		}
+
+		smoke_prepare_View(smd, (float)framenr, light, have_lamp);
+
+		BKE_ptcache_write_cache(&pid, framenr);
+
+		printf("Writing cache_low\n");
+	
+
+		tend();
+		printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
 	}
 }
 
+void smoke_simulate_domain(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm)
+{
+	GroupObject *go = NULL;
+	Base *base = NULL;
+	SmokeDomainSettings *sds = smd->domain;
+	
+	tstart();
+	
+	if(sds->flags & MOD_SMOKE_DISSOLVE)
+		smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
+
+	// do flows and fluids
+	if(1)
+	{
+		Object *otherobj = NULL;
+		ModifierData *md = NULL;
+
+		if(sds->fluid_group) // we use groups since we have 2 domains
+			go = sds->fluid_group->gobject.first;
+		else
+			base = scene->base.first;
+
+		while(base || go)
+		{
+			otherobj = NULL;
+
+			if(sds->fluid_group) 
+			{
+				if(go->ob)
+					otherobj = go->ob;
+			}
+			else
+				otherobj = base->object;
+
+			if(!otherobj)
+			{
+				if(sds->fluid_group)
+					go = go->next;
+				else
+					base= base->next;
+
+				continue;
+			}
+
+			md = modifiers_findByType(otherobj, eModifierType_Smoke);
+			
+			// check for active smoke modifier
+			if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
+			{
+				SmokeModifierData *smd2 = (SmokeModifierData *)md;
+				
+				// check for initialized smoke object
+				if((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow)
+				{
+					// we got nice flow object
+					SmokeFlowSettings *sfs = smd2->flow;
+					
+					if(sfs->psys && sfs->psys->part && sfs->psys->part->type==PART_EMITTER) // is particle system selected
+					{
+						ParticleSystem *psys = sfs->psys;
+						ParticleSettings *part=psys->part;
+						ParticleData *pa = NULL;
+						int p = 0;
+						float *density = smoke_get_density(sds->fluid);
+						// float *bigdensity = smoke_turbulence_get_density(sds->wt);
+						float *heat = smoke_get_heat(sds->fluid);
+						float *velocity_x = smoke_get_velocity_x(sds->fluid);
+						float *velocity_y = smoke_get_velocity_y(sds->fluid);
+						float *velocity_z = smoke_get_velocity_z(sds->fluid);
+						unsigned char *obstacle = smoke_get_obstacle(sds->fluid);
+
+						// debug printf("found flow psys\n");
+						
+						// mostly copied from particle code
+						for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++)
+						{
+							int cell[3];
+							size_t i = 0;
+							size_t index = 0;
+							int badcell = 0;
+							
+							if(pa->alive == PARS_KILLED) continue;
+							else if(pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN)==0) continue;
+							else if(pa->alive == PARS_DEAD && (part->flag & PART_DIED)==0) continue;
+							else if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;
+							
+							// VECCOPY(pos, pa->state.co);
+							// Mat4MulVecfl (ob->imat, pos);
+							
+							// 1. get corresponding cell
+							get_cell(sds->p0, sds->res, sds->dx, pa->state.co, cell, 0);
+						
+							// check if cell is valid (in the domain boundary)
+							for(i = 0; i < 3; i++)
+							{
+								if((cell[i] > sds->res[i] - 1) || (cell[i] < 0))
+								{
+									badcell = 1;
+									break;
+								}
+							}
+								
+							if(badcell)
+								continue;
+							
+							// 2. set cell values (heat, density and velocity)
+							index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
+							
+							if(!(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) && !(obstacle[index] & 2)) // this is inflow
+							{
+								// heat[index] += sfs->temp * 0.1;
+								// density[index] += sfs->density * 0.1;
+
+								heat[index] = sfs->temp;
+								density[index] = sfs->density;
+
+								/*
+								velocity_x[index] = pa->state.vel[0];
+								velocity_y[index] = pa->state.vel[1];
+								velocity_z[index] = pa->state.vel[2];
+								*/
+								obstacle[index] |= 2;
+							}
+							else if(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) // outflow
+							{
+								heat[index] = 0.f;
+								density[index] = 0.f;
+								velocity_x[index] = 0.f;
+								velocity_y[index] = 0.f;
+								velocity_z[index] = 0.f;
+							}
+						}
+					}
+					else
+					{
+						/*
+						for()
+						{
+							// no psys
+							BVHTreeNearest nearest;
+
+							nearest.index = -1;
+							nearest.dist = FLT_MAX;
+
+							BLI_bvhtree_find_nearest(sfs->bvh->tree, pco, &nearest, sfs->bvh->nearest_callback, sfs->bvh);
+						}*/
+					}
+				}	
+			}
+
+			if(sds->fluid_group)
+				go = go->next;
+			else
+				base= base->next;
+		}
+	}
+
+	// do effectors
+	/*
+	if(sds->eff_group)
+	{
+		for(go = sds->eff_group->gobject.first; go; go = go->next) 
+		{
+			if(go->ob)
+			{
+				if(ob->pd)
+				{
+					
+				}
+			}
+		}
+	}
+	*/
+
+	// do collisions	
+	if(1)
+	{
+		Object *otherobj = NULL;
+		ModifierData *md = NULL;
+
+		if(sds->coll_group) // we use groups since we have 2 domains
+			go = sds->coll_group->gobject.first;
+		else
+			base = scene->base.first;
+
+		while(base || go)
+		{
+			otherobj = NULL;
+
+			if(sds->coll_group) 
+			{
+				if(go->ob)
+					otherobj = go->ob;
+			}
+			else
+				otherobj = base->object;
+
+			if(!otherobj)
+			{
+				if(sds->coll_group)
+					go = go->next;
+				else
+					base= base->next;
+
+				continue;
+			}
+	
+			md = modifiers_findByType(otherobj, eModifierType_Smoke);
+			
+			// check for active smoke modifier
+			if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
+			{
+				SmokeModifierData *smd2 = (SmokeModifierData *)md;
+
+				if((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll)
+				{
+					// we got nice collision object
+					SmokeCollSettings *scs = smd2->coll;
+					size_t i, j;
+					unsigned char *obstacles = smoke_get_obstacle(smd->domain->fluid);
+
+					for(i = 0; i < scs->numpoints; i++)
+					{
+						int badcell = 0;
+						size_t index = 0;
+						int cell[3];
+
+						// 1. get corresponding cell
+						get_cell(sds->p0, sds->res, sds->dx, &scs->points[3 * i], cell, 0);
+					
+						// check if cell is valid (in the domain boundary)
+						for(j = 0; j < 3; j++)
+							if((cell[j] > sds->res[j] - 1) || (cell[j] < 0))
+							{
+								badcell = 1;
+								break;
+							}
+								
+						if(badcell)
+							continue;
+
+						// 2. set cell values (heat, density and velocity)
+						index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
+						
+						// printf("cell[0]: %d, cell[1]: %d, cell[2]: %d\n", cell[0], cell[1], cell[2]);
+						// printf("res[0]: %d, res[1]: %d, res[2]: %d, index: %d\n\n", sds->res[0], sds->res[1], sds->res[2], index);
+							
+						obstacles[index] = 1;
+
+						// for moving gobstacles
+						/*
+						const LbmFloat maxVelVal = 0.1666;
+						const LbmFloat maxusqr = maxVelVal*maxVelVal*3. *1.5;
+
+						LbmVec objvel = vec2L((mMOIVertices[n]-mMOIVerticesOld[n]) /dvec); { 
+						const LbmFloat usqr = (objvel[0]*objvel[0]+objvel[1]*objvel[1]+objvel[2]*objvel[2])*1.5; 
+						USQRMAXCHECK(usqr, objvel[0],objvel[1],objvel[2], mMaxVlen, mMxvx,mMxvy,mMxvz); 
+						if(usqr>maxusqr) { 
+							// cutoff at maxVelVal 
+							for(int jj=0; jj<3; jj++) { 
+								if(objvel[jj]>0.) objvel[jj] =  maxVelVal;  
+								if(objvel[jj]<0.) objvel[jj] = -maxVelVal; 
+							} 
+						} } 
+
+						const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); 
+						const LbmVec oldov=objvel; // debug
+						objvel = vec2L((*pNormals)[n]) *dp;
+						*/
+					}
+				}
+			}
+
+			if(sds->coll_group)
+				go = go->next;
+			else
+				base= base->next;
+		}
+	}
+	
+	// set new time
+	smd->time = scene->r.cfra;
+
+	// simulate the actual smoke (c++ code in intern/smoke)
+	smoke_step(sds->fluid, smd->time);
+}
+
+static int calc_voxel_transp(float *input, int res[3], int *pixel, float *tRay)
+{
+	const size_t index = smoke_get_index(pixel[0], res[0], pixel[1], res[1], pixel[2]);
+
+	// T_ray *= T_vox
+	*tRay *= input[index*4];
+
+	return *tRay;
+}
+
+// forward decleration
+void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb);
+
 // update necessary information for 3dview
-void smoke_prepare_View(SmokeModifierData *smd, float *light)
+void smoke_prepare_View(SmokeModifierData *smd, float framenr, float *light, int have_light)
 {
 	float *density = NULL;
 	int x, y, z;
-
-	if(!smd->domain->tray)
-	{
-		// TRay is for self shadowing
-		smd->domain->tray = MEM_callocN(sizeof(float)*smd->domain->res[0]*smd->domain->res[1]*smd->domain->res[2], "Smoke_tRay");
-	}
-	if(!smd->domain->tvox)
-	{
-		// TVox is for tranaparency
-		smd->domain->tvox = MEM_callocN(sizeof(float)*smd->domain->res[0]*smd->domain->res[1]*smd->domain->res[2], "Smoke_tVox");
-	}
+	size_t cells, i;
+	SmokeDomainSettings *sds = smd->domain;
 
 	// update 3dview
 	density = smoke_get_density(smd->domain->fluid);
 	for(x = 0; x < smd->domain->res[0]; x++)
-			for(y = 0; y < smd->domain->res[1]; y++)
-				for(z = 0; z < smd->domain->res[2]; z++)
-				{
-					size_t index;
+		for(y = 0; y < smd->domain->res[1]; y++)
+			for(z = 0; z < smd->domain->res[2]; z++)
+			{
+				size_t index;
 
-					index = smoke_get_index(x, smd->domain->res[0], y, smd->domain->res[1], z);
-					// Transparency computation
-					// formula taken from "Visual Simulation of Smoke" / Fedkiw et al. pg. 4
-					// T_vox = exp(-C_ext * h)
-					// C_ext/sigma_t = density * C_ext
-					smoke_set_tvox(smd, index, exp(-density[index] * 7.0 * smd->domain->dx));
-	}
-	smoke_calc_transparency(smd, light, 0);
-}
+				index = smoke_get_index(x, smd->domain->res[0], y, smd->domain->res[1], z);
+				// Transparency computation
+				// formula taken from "Visual Simulation of Smoke" / Fedkiw et al. pg. 4
+				// T_vox = exp(-C_ext * h)
+				// C_ext/sigma_t = density * C_ext
+				smd->domain->view3d[index * 4] = smd->domain->view3d[index * 4 + 1] = 
+				smd->domain->view3d[index * 4 + 2] = exp(-density[index] * 7.0 * smd->domain->dx);
+				smd->domain->view3d[index * 4 + 3] = 1.0 - smd->domain->view3d[index * 4];
+				
+			}
 
-// update necessary information for 3dview ("high res" option)
-void smoke_prepare_bigView(SmokeModifierData *smd, float *light)
-{
-	float *density = NULL;
-	size_t i = 0;
-	int bigres[3];
-
-	smoke_turbulence_get_res(smd->domain->wt, bigres);
-
-	if(!smd->domain->traybig)
+	if(have_light)
 	{
-		// TRay is for self shadowing
-		smd->domain->traybig = MEM_callocN(sizeof(float)*bigres[0]*bigres[1]*bigres[2], "Smoke_tRayBig");
+		smoke_calc_transparency(sds->view3d, sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp);
+
+		cells = smd->domain->res[0]*smd->domain->res[1]*smd->domain->res[2];
+		for(i = 0; i < cells; i++)
+		{
+			smd->domain->view3d[i * 4] = smd->domain->view3d[i * 4 + 1] = 
+			smd->domain->view3d[i * 4 + 2] = smd->domain->view3d[i * 4 + 1] * smd->domain->view3d[i * 4 + 0];
+		}
 	}
-	if(!smd->domain->tvoxbig)
-	{
-		// TVox is for tranaparency
-		smd->domain->tvoxbig = MEM_callocN(sizeof(float)*bigres[0]*bigres[1]*bigres[2], "Smoke_tVoxBig");
-	}
-
-	density = smoke_turbulence_get_density(smd->domain->wt);
-	for (i = 0; i < bigres[0] * bigres[1] * bigres[2]; i++)
-	{
-		// Transparency computation
-		// formula taken from "Visual Simulation of Smoke" / Fedkiw et al. pg. 4
-		// T_vox = exp(-C_ext * h)
-		// C_ext/sigma_t = density * C_ext
-		smoke_set_bigtvox(smd, i, exp(-density[i] * 7.0 * smd->domain->dx / (smd->domain->amplify + 1)) );
-	}
-	smoke_calc_transparency(smd, light, 1);
-}
-
-
-float smoke_get_tvox(SmokeModifierData *smd, size_t index)
-{
-	return smd->domain->tvox[index];
-}
-
-void smoke_set_tvox(SmokeModifierData *smd, size_t index, float tvox)
-{
-	smd->domain->tvox[index] = tvox;
-}
-
-float smoke_get_tray(SmokeModifierData *smd, size_t index)
-{
-	return smd->domain->tray[index];
-}
-
-void smoke_set_tray(SmokeModifierData *smd, size_t index, float transparency)
-{
-	smd->domain->tray[index] = transparency;
-}
-
-float smoke_get_bigtvox(SmokeModifierData *smd, size_t index)
-{
-	return smd->domain->tvoxbig[index];
-}
-
-void smoke_set_bigtvox(SmokeModifierData *smd, size_t index, float tvox)
-{
-	smd->domain->tvoxbig[index] = tvox;
-}
-
-float smoke_get_bigtray(SmokeModifierData *smd, size_t index)
-{
-	return smd->domain->traybig[index];
-}
-
-void smoke_set_bigtray(SmokeModifierData *smd, size_t index, float transparency)
-{
-	smd->domain->traybig[index] = transparency;
+	smd->domain->v3dnum = framenr;
 }
 
 long long smoke_get_mem_req(int xres, int yres, int zres, int amplify)
@@ -1259,34 +1252,7 @@ long long smoke_get_mem_req(int xres, int yres, int zres, int amplify)
 	  return totalMB;
 }
 
-
-static void calc_voxel_transp(SmokeModifierData *smd, int *pixel, float *tRay)
-{
-	// printf("Pixel(%d, %d, %d)\n", pixel[0], pixel[1], pixel[2]);
-	const size_t index = smoke_get_index(pixel[0], smd->domain->res[0], pixel[1], smd->domain->res[1], pixel[2]);
-
-	// T_ray *= T_vox
-	*tRay *= smoke_get_tvox(smd, index);
-}
-
-static void calc_voxel_transp_big(SmokeModifierData *smd, int *pixel, float *tRay)
-{
-	int bigres[3];
-	size_t index;
-
-	smoke_turbulence_get_res(smd->domain->wt, bigres);
-	index = smoke_get_index(pixel[0], bigres[0], pixel[1], bigres[1], pixel[2]);
-
-	/*
-	if(index > bigres[0]*bigres[1]*bigres[2])
-		printf("pixel[0]: %d, [1]: %d, [2]: %d\n", pixel[0], pixel[1], pixel[2]);
-	*/
-
-	// T_ray *= T_vox
-	*tRay *= smoke_get_bigtvox(smd, index);
-}
-
-static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, int x2, int y2, int z2, float *tRay, int big)
+static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, float *tRay, bresenham_callback cb, float *input, int res[3])
 {
     int dx, dy, dz, i, l, m, n, x_inc, y_inc, z_inc, err_1, err_2, dx2, dy2, dz2;
     int pixel[3];
@@ -1313,11 +1279,7 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
         err_1 = dy2 - l;
         err_2 = dz2 - l;
         for (i = 0; i < l; i++) {
-        	if(!big)
-				calc_voxel_transp(smd, pixel, tRay);
-			else
-				calc_voxel_transp_big(smd, pixel, tRay);
-        	if(*tRay < 0.0f)
+        	if(cb(input, res, pixel, tRay) < 0.0)
         		return;
             if (err_1 > 0) {
                 pixel[1] += y_inc;
@@ -1335,11 +1297,7 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
         err_1 = dx2 - m;
         err_2 = dz2 - m;
         for (i = 0; i < m; i++) {
-        	if(!big)
-				calc_voxel_transp(smd, pixel, tRay);
-			else
-				calc_voxel_transp_big(smd, pixel, tRay);
-        	if(*tRay < 0.0f)
+        	if(cb(input, res, pixel, tRay) < 0.0f)
         		return;
             if (err_1 > 0) {
                 pixel[0] += x_inc;
@@ -1357,11 +1315,7 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
         err_1 = dy2 - n;
         err_2 = dx2 - n;
         for (i = 0; i < n; i++) {
-        	if(!big)
-				calc_voxel_transp(smd, pixel, tRay);
-			else
-				calc_voxel_transp_big(smd, pixel, tRay);
-        	if(*tRay < 0.0f)
+        	if(cb(input, res, pixel, tRay) < 0.0f)
         		return;
             if (err_1 > 0) {
                 pixel[1] += y_inc;
@@ -1376,41 +1330,15 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
             pixel[2] += z_inc;
         }
     }
-    if(!big)
-    	calc_voxel_transp(smd, pixel, tRay);
-    else
-    	calc_voxel_transp_big(smd, pixel, tRay);
+    cb(input, res, pixel, tRay);
 }
 
-static void get_cell(struct SmokeModifierData *smd, float *pos, int *cell, int correct)
+static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct)
 {
 	float tmp[3];
 
-	VECSUB(tmp, pos, smd->domain->p0);
-	VecMulf(tmp, 1.0 / smd->domain->dx);
-
-	if(correct)
-	{
-		cell[0] = MIN2(smd->domain->res[0] - 1, MAX2(0, (int)floor(tmp[0])));
-		cell[1] = MIN2(smd->domain->res[1] - 1, MAX2(0, (int)floor(tmp[1])));
-		cell[2] = MIN2(smd->domain->res[2] - 1, MAX2(0, (int)floor(tmp[2])));
-	}
-	else
-	{
-		cell[0] = (int)floor(tmp[0]);
-		cell[1] = (int)floor(tmp[1]);
-		cell[2] = (int)floor(tmp[2]);
-	}
-}
-static void get_bigcell(struct SmokeModifierData *smd, float *pos, int *cell, int correct)
-{
-	float tmp[3];
-	int res[3];
-	smoke_turbulence_get_res(smd->domain->wt, res);
-
-	VECSUB(tmp, pos, smd->domain->p0);
-
-	VecMulf(tmp, (smd->domain->amplify + 1)/ smd->domain->dx );
+	VECSUB(tmp, pos, p0);
+	VecMulf(tmp, 1.0 / dx);
 
 	if(correct)
 	{
@@ -1426,43 +1354,23 @@ static void get_bigcell(struct SmokeModifierData *smd, float *pos, int *cell, in
 	}
 }
 
-
-void smoke_calc_transparency(struct SmokeModifierData *smd, float *light, int big)
+void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb)
 {
 	int x, y, z;
 	float bv[6];
-	int res[3];
 	float bigfactor = 1.0;
 
 	// x
-	bv[0] = smd->domain->p0[0];
-	bv[1] = smd->domain->p1[0];
+	bv[0] = p0[0];
+	bv[1] = p1[0];
 	// y
-	bv[2] = smd->domain->p0[1];
-	bv[3] = smd->domain->p1[1];
+	bv[2] = p0[1];
+	bv[3] = p1[1];
 	// z
-	bv[4] = smd->domain->p0[2];
-	bv[5] = smd->domain->p1[2];
-/*
-	printf("bv[0]: %f, [1]: %f, [2]: %f, [3]: %f, [4]: %f, [5]: %f\n", bv[0], bv[1], bv[2], bv[3], bv[4], bv[5]);
+	bv[4] = p0[2];
+	bv[5] = p1[2];
 
-	printf("p0[0]: %f, p0[1]: %f, p0[2]: %f\n", smd->domain->p0[0], smd->domain->p0[1], smd->domain->p0[2]);
-	printf("p1[0]: %f, p1[1]: %f, p1[2]: %f\n", smd->domain->p1[0], smd->domain->p1[1], smd->domain->p1[2]);
-	printf("dx: %f, amp: %d\n", smd->domain->dx, smd->domain->amplify);
-*/
-	if(!big)
-	{
-		res[0] = smd->domain->res[0];
-		res[1] = smd->domain->res[1];
-		res[2] = smd->domain->res[2];
-	}
-	else
-	{
-		smoke_turbulence_get_res(smd->domain->wt, res);
-		bigfactor = 1.0 / (smd->domain->amplify + 1);
-	}
-
-#pragma omp parallel for schedule(static) private(y, z) shared(big, smd, light, res, bigfactor)
+// #pragma omp parallel for schedule(static) private(y, z)
 	for(x = 0; x < res[0]; x++)
 		for(y = 0; y < res[1]; y++)
 			for(z = 0; z < res[2]; z++)
@@ -1475,41 +1383,26 @@ void smoke_calc_transparency(struct SmokeModifierData *smd, float *light, int bi
 
 				index = smoke_get_index(x, res[0], y, res[1], z);
 
-				// voxelCenter = m_voxelarray[i].GetCenter();
-				voxelCenter[0] = smd->domain->p0[0] + smd->domain->dx * bigfactor * x + smd->domain->dx * bigfactor * 0.5;
-				voxelCenter[1] = smd->domain->p0[1] + smd->domain->dx * bigfactor * y + smd->domain->dx * bigfactor * 0.5;
-				voxelCenter[2] = smd->domain->p0[2] + smd->domain->dx * bigfactor * z + smd->domain->dx * bigfactor * 0.5;
-
-				// printf("vc[0]: %f, vc[1]: %f, vc[2]: %f\n", voxelCenter[0], voxelCenter[1], voxelCenter[2]);
-				// printf("light[0]: %f, light[1]: %f, light[2]: %f\n", light[0], light[1], light[2]);
+				voxelCenter[0] = p0[0] + dx *  x + dx * 0.5;
+				voxelCenter[1] = p0[1] + dx *  y + dx * 0.5;
+				voxelCenter[2] = p0[2] + dx *  z + dx * 0.5;
 
 				// get starting position (in voxel coords)
 				if(BLI_bvhtree_bb_raycast(bv, light, voxelCenter, pos) > FLT_EPSILON)
 				{
 					// we're ouside
-					// printf("out: pos[0]: %f, pos[1]: %f, pos[2]: %f\n", pos[0], pos[1], pos[2]);
-					if(!big)
-						get_cell(smd, pos, cell, 1);
-					else
-						get_bigcell(smd, pos, cell, 1);
+					get_cell(p0, res, dx, pos, cell, 1);
 				}
 				else
 				{
-					// printf("in: pos[0]: %f, pos[1]: %f, pos[2]: %f\n", light[0], light[1], light[2]);
 					// we're inside
-					if(!big)
-						get_cell(smd, light, cell, 1);
-					else
-						get_bigcell(smd, light, cell, 1);
+					get_cell(p0, res, dx, light, cell, 1);
 				}
 
-				// printf("cell - [0]: %d, [1]: %d, [2]: %d\n", cell[0], cell[1], cell[2]);
-				bresenham_linie_3D(smd, cell[0], cell[1], cell[2], x, y, z, &tRay, big);
+				bresenham_linie_3D(cell[0], cell[1], cell[2], x, y, z, &tRay, cb, result, res);
 
-				if(!big)
-					smoke_set_tray(smd, index, tRay);
-				else
-					smoke_set_bigtray(smd, index, tRay);
+				// convention -> from a RGBA float array, use G value for tRay
+				result[index*4 + 1] = tRay;
 			}
 }
 
diff --git a/source/blender/blenkernel/intern/smokehighres.c b/source/blender/blenkernel/intern/smokehighres.c
new file mode 100644
index 00000000000..6a2e0549158
--- /dev/null
+++ b/source/blender/blenkernel/intern/smokehighres.c
@@ -0,0 +1,137 @@
+/**
+ * smokehighres.c
+ *
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Daniel Genrich
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/* Part of the code copied from elbeem fluid library, copyright by Nils Thuerey */
+
+#include "DNA_scene_types.h"
+#include "DNA_listBase.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+#include "DNA_smoke_types.h"
+
+#include "BKE_modifier.h"
+#include "BKE_smoke.h"
+#include "BKE_pointcache.h"
+
+#include "smoke_API.h"
+
+// we need different handling for the high-res feature
+/*
+if(bigdensity)
+{
+	// init all surrounding cells according to amplification, too
+	int i, j, k;
+
+	smoke_turbulence_get_res(smd->domain->wt, bigres);
+
+	for(i = 0; i < smd->domain->amplify + 1; i++)
+		for(j = 0; j < smd->domain->amplify + 1; j++)
+			for(k = 0; k < smd->domain->amplify + 1; k++)
+			{
+				index = smoke_get_index((smd->domain->amplify + 1)* cell[0] + i, bigres[0], (smd->domain->amplify + 1)* cell[1] + j, bigres[1], (smd->domain->amplify + 1)* cell[2] + k);
+				bigdensity[index] = sfs->density;
+			}
+}
+*/
+
+static void smokeHRinit(SmokeHRModifierData *shrmd, SmokeDomainSettings *sds)
+{
+	if(!shrmd->wt)
+	{
+		shrmd->wt = smoke_turbulence_init(sds->res,  shrmd->amplify + 1, shrmd->noise);
+		smoke_turbulence_initBlenderRNA(shrmd->wt, &shrmd->strength);
+	}
+}
+
+void smokeHRModifier_free(SmokeHRModifierData *shrmd)
+{
+	if(shrmd->wt)
+		smoke_turbulence_free(shrmd->wt);
+
+	BKE_ptcache_free_list(&shrmd->ptcaches);
+	shrmd->point_cache = NULL;
+}
+
+void smokeHRModifier_do(SmokeHRModifierData *shrmd, Scene *scene, Object *ob, int useRenderParams, int isFinalCalc)
+{
+	ModifierData *md = NULL;
+	SmokeModifierData *smd = NULL;
+	SmokeDomainSettings *sds = NULL;
+
+	// find underlaying smoke domain
+	smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
+	if(!(smd && smd->type == MOD_SMOKE_TYPE_DOMAIN))
+		return;
+
+	sds = smd->domain;
+
+	smokeHRinit(shrmd, sds);
+
+	// smoke_turbulence_dissolve(shrmd->wt, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
+
+	// smoke_turbulence_step(shrmd->wt, sds->fluid);
+}
+
+
+// update necessary information for 3dview ("high res" option)
+void smoke_prepare_bigView(SmokeHRModifierData *shrmd, float *light)
+{
+	float *density = NULL;
+	size_t i = 0;
+	int bigres[3];
+/*
+	smoke_turbulence_get_res(shrmd->wt, bigres);
+
+	if(!smd->domain->traybig)
+	{
+		// TRay is for self shadowing
+		smd->domain->traybig = MEM_callocN(sizeof(float)*bigres[0]*bigres[1]*bigres[2], "Smoke_tRayBig");
+	}
+	if(!smd->domain->tvoxbig)
+	{
+		// TVox is for tranaparency
+		smd->domain->tvoxbig = MEM_callocN(sizeof(float)*bigres[0]*bigres[1]*bigres[2], "Smoke_tVoxBig");
+	}
+
+	density = smoke_turbulence_get_density(smd->domain->wt);
+	for (i = 0; i < bigres[0] * bigres[1] * bigres[2]; i++)
+	{
+		// Transparency computation
+		// formula taken from "Visual Simulation of Smoke" / Fedkiw et al. pg. 4
+		// T_vox = exp(-C_ext * h)
+		// C_ext/sigma_t = density * C_ext
+		smoke_set_bigtvox(smd, i, exp(-density[i] * 7.0 * smd->domain->dx / (smd->domain->amplify + 1)) );
+	}
+	smoke_calc_transparency(smd, light, 1);
+	*/
+}
+
+
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 3e1b73e51be..fad45f1b6c3 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -65,20 +65,22 @@
 extern "C" {
 #endif
 
-#ifndef M_PI
-#define M_PI		3.14159265358979323846
-#endif
-#ifndef M_PI_2
-#define M_PI_2		1.57079632679489661923
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2		1.41421356237309504880
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2	0.70710678118654752440
-#endif
-#ifndef M_1_PI
-#define M_1_PI		0.318309886183790671538
+# ifndef _WIN64
+	#ifndef M_PI
+	#define M_PI		3.14159265358979323846
+	#endif
+	#ifndef M_PI_2
+	#define M_PI_2		1.57079632679489661923
+	#endif
+	#ifndef M_SQRT2
+	#define M_SQRT2		1.41421356237309504880
+	#endif
+	#ifndef M_SQRT1_2
+	#define M_SQRT1_2	0.70710678118654752440
+	#endif
+	#ifndef M_1_PI
+	#define M_1_PI		0.318309886183790671538
+	#endif
 #endif
 
 #define MAXPATHLEN MAX_PATH
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index db811b22460..71994b97521 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3669,8 +3669,6 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 		else if (md->type==eModifierType_Smoke) {
 			SmokeModifierData *smd = (SmokeModifierData*) md;
 
-			smd->point_cache = NULL;
-
 			if(smd->type==MOD_SMOKE_TYPE_DOMAIN)
 			{
 				smd->flow = NULL;
@@ -3679,23 +3677,10 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 				smd->domain->smd = smd;
 
 				smd->domain->fluid = NULL;
-				smd->domain->wt = NULL;
-				smd->domain->tvox = NULL;
-				smd->domain->tray = NULL;
-				smd->domain->tvoxbig = NULL;
-				smd->domain->traybig = NULL;
-				smd->domain->bind = NULL;
-				smd->domain->max_textures= 0;
+				smd->domain->view3d = NULL;
+				smd->domain->tex = NULL;
 
-				// do_versions trick
-				if(smd->domain->strength < 1.0)
-					smd->domain->strength = 2.0;
-
-				// reset 3dview
-				if(smd->domain->viewsettings < MOD_SMOKE_VIEW_USEBIG)
-					smd->domain->viewsettings = 0;
-				else
-					smd->domain->viewsettings = MOD_SMOKE_VIEW_USEBIG;
+				direct_link_pointcache_list(fd, &smd->domain->ptcaches, &smd->domain->point_cache);
 			}
 			else if(smd->type==MOD_SMOKE_TYPE_FLOW)
 			{
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ede7aacfea8..31fe0c01900 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1126,14 +1126,17 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 		else if(md->type==eModifierType_Smoke) {
 			SmokeModifierData *smd = (SmokeModifierData*) md;
 			
-			if(smd->type==MOD_SMOKE_TYPE_DOMAIN)
+			if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 				writestruct(wd, DATA, "SmokeDomainSettings", 1, smd->domain);
-			else if(smd->type==MOD_SMOKE_TYPE_FLOW)
+			else if(smd->type & MOD_SMOKE_TYPE_FLOW)
 				writestruct(wd, DATA, "SmokeFlowSettings", 1, smd->flow);
 			/*
-			else if(smd->type==MOD_SMOKE_TYPE_COLL)
+			else if(smd->type & MOD_SMOKE_TYPE_COLL)
 				writestruct(wd, DATA, "SmokeCollSettings", 1, smd->coll);
 			*/
+
+			if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
+				write_pointcaches(wd, &smd->domain->ptcaches);
 		} 
 		else if(md->type==eModifierType_Fluidsim) {
 			FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 9983e24f2c9..16900d6d894 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -161,6 +161,13 @@ int ED_object_modifier_remove(ReportList *reports, Scene *scene, Object *ob, Mod
 
         DAG_scene_sort(scene);
 	}
+	else if(md->type == eModifierType_Smoke) {
+		ModifierData *tmd = modifiers_findByType(ob, eModifierType_SmokeHR);
+		if(tmd) {
+			BLI_remlink(&ob->modifiers, tmd);
+			modifier_free(tmd);
+		}
+	}
 
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 530500cfafa..994bb0010d8 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -553,7 +553,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 			"world", "object", "mesh", "armature", "lattice", "curve",
 			"meta_ball", "lamp", "camera", "material", "material_slot",
 			"texture", "texture_slot", "bone", "edit_bone", "particle_system",
-			"cloth", "soft_body", "fluid", "smoke", "collision", "brush", NULL};
+			"cloth", "soft_body", "fluid", "smoke", "smoke_hr", "collision", "brush", NULL};
 
 		CTX_data_dir_set(result, dir);
 		return 1;
@@ -697,6 +697,16 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 			return 1;
 		}
 	}
+	else if(CTX_data_equals(member, "smoke_hr")) {
+		PointerRNA *ptr= get_pointer_type(path, &RNA_Object);
+
+		if(ptr && ptr->data) {
+			Object *ob= ptr->data;
+			ModifierData *md= modifiers_findByType(ob, eModifierType_SmokeHR);
+			CTX_data_pointer_set(result, &ob->id, &RNA_SmokeHRModifier, md);
+			return 1;
+		}
+	}
 	else if(CTX_data_equals(member, "collision")) {
 		PointerRNA *ptr= get_pointer_type(path, &RNA_Object);
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 466b55ba862..55565c83f5e 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5309,356 +5309,20 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* draw code for smoke */
-	if((md = modifiers_findByType(ob, eModifierType_Smoke)))
-	{
-		SmokeModifierData *smd = (SmokeModifierData *)md;
-
-		// draw collision objects
-		if((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll)
-		{
-			/*SmokeCollSettings *scs = smd->coll;
-			if(scs->points)
-			{
-				size_t i;
-
-				wmLoadMatrix(rv3d->viewmat);
-
-				if(col || (ob->flag & SELECT)) cpack(0xFFFFFF);	
-				glDepthMask(GL_FALSE);
-				glEnable(GL_BLEND);
-				
-
-				// glPointSize(3.0);
-				bglBegin(GL_POINTS);
-
-				for(i = 0; i < scs->numpoints; i++)
-				{
-					bglVertex3fv(&scs->points[3*i]);
-				}
-
-				bglEnd();
-				glPointSize(1.0);
-
-				wmMultMatrix(ob->obmat);
-				glDisable(GL_BLEND);
-				glDepthMask(GL_TRUE);
-				if(col) cpack(col);
-				
+	if(((SmokeHRModifierData *)(md = modifiers_findByType(ob, eModifierType_SmokeHR)) && (((SmokeHRModifierData *)md)->flags & MOD_SMOKE_SHOWHIGHRES))) {
+		// GPU_create_smoke(smd);
+		// draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res);
+		// GPU_free_smoke(smd);
+	}
+	else {
+		md = modifiers_findByType(ob, eModifierType_Smoke);
+		if (md) {
+			SmokeModifierData *smd = (SmokeModifierData *)md;
+			if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain) {
+				GPU_create_smoke(smd);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res);
+				GPU_free_smoke(smd);
 			}
-			*/
-		}
-
-		// only draw domains
-		if(smd->domain && smd->domain->fluid)
-		{
-			int x, y, z, i;
-			float viewnormal[3];
-			int mainaxis[3] = {0,0,0};
-			float align = 0, signed_align = 0;
-			int max_textures = 0, counter_textures = 0;
-			float *buffer = NULL;
-			int res[3];
-			float bigfactor = 1.0;
-			int big = (smd->domain->flags & MOD_SMOKE_HIGHRES) && (smd->domain->viewsettings & MOD_SMOKE_VIEW_USEBIG);
-			int new = 0;
-			int have_lamp = 0;
-			
-			// GUI sent redraw event
-			if(smd->domain->flags & MOD_SMOKE_VIEW_REDRAWNICE)
-			{
-				new = 1;
-				smd->domain->flags &= ~MOD_SMOKE_VIEW_REDRAWNICE;
-			}
-			
-			if(!big)
-			{
-				res[0] = smd->domain->res[0];
-				res[1] = smd->domain->res[1];
-				res[2] = smd->domain->res[2];
-			}
-			else
-			{
-				smoke_turbulence_get_res(smd->domain->wt, res);
-				bigfactor = 1.0 / (smd->domain->amplify + 1);
-			}
-
-			wmLoadMatrix(rv3d->viewmat);
-
-			if(col || (ob->flag & SELECT)) cpack(0xFFFFFF);	/* for visibility, also while wpaint */
-			glDepthMask(GL_FALSE);
-			glEnable(GL_BLEND);
-
-			// get view vector
-			VECCOPY(viewnormal, rv3d->viewinv[2]);
-			Normalize(viewnormal);
-			for(i = 0; i < 3; i++)
-			{
-				if(ABS(viewnormal[i]) > align)
-				{
-					mainaxis[0] = i;
-					align = ABS(viewnormal[i]);
-					signed_align = viewnormal[i];
-				}
-			}
-			mainaxis[1] = (mainaxis[0] + 1) % 3;
-			mainaxis[2] = (mainaxis[0] + 2) % 3;
-			
-			if(!smd->domain->bind)
-			{
-				smd->domain->bind = MEM_callocN(sizeof(GLuint)*256, "Smoke_bind");
-				if(big)
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_CHANGETOBIG;
-				new = 3;
-			}
-			
-			// check if view axis / mode has been changed
-			if(smd->domain->viewsettings)
-			{
-				if(big)
-				{
-					if(!(smd->domain->viewsettings & MOD_SMOKE_VIEW_BIG))
-						new = 2;
-					else if(!(smd->domain->viewsettings & MOD_SMOKE_VIEW_CHANGETOBIG))
-						new = 1;
-					
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_CHANGETOBIG;
-				}
-				else
-				{
-					if(!(smd->domain->viewsettings & MOD_SMOKE_VIEW_SMALL))
-						new = 2;
-					else if(smd->domain->viewsettings & MOD_SMOKE_VIEW_CHANGETOBIG)
-						new = 1;
-					
-					smd->domain->viewsettings &= ~MOD_SMOKE_VIEW_CHANGETOBIG;
-				}
-	
-				if(!new)
-				{
-					if((mainaxis[0] == 0) && !(smd->domain->viewsettings & MOD_SMOKE_VIEW_X))
-						new = 1;
-					else if((mainaxis[0] == 1) && !(smd->domain->viewsettings & MOD_SMOKE_VIEW_Y))
-						new = 1;
-					else if((mainaxis[0] == 2) && !(smd->domain->viewsettings & MOD_SMOKE_VIEW_Z))
-						new = 1;
-					
-					// printf("check axis\n");
-				}
-			}
-			else
-				new = 3;
-			
-			if(new > 1)
-			{
-				float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
-				Base *base_tmp = NULL;
-
-				for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
-				{
-					if(base_tmp->object->type == OB_LAMP) 
-					{
-						Lamp *la = (Lamp *)base_tmp->object->data;
-						
-						if(la->type == LA_LOCAL)
-						{
-							VECCOPY(light, base_tmp->object->obmat[3]);
-							have_lamp = 1;
-							break;
-						}
-					}
-				}
-
-				if(!big && !(smd->domain->viewsettings & MOD_SMOKE_VIEW_SMALL))
-				{
-					smoke_prepare_View(smd, light);
-					// printf("prepared View!\n");
-				}
-				else if(big && !(smd->domain->viewsettings & MOD_SMOKE_VIEW_BIG))
-				{
-					smoke_prepare_bigView(smd, light);
-					// printf("prepared bigView!\n");
-				}
-			}
-			
-			// printf("big: %d, new: %d\n", big, new);
-			
-			// only create buffer if we need to create new textures
-			if(new)	
-				buffer = MEM_mallocN(sizeof(float)*res[mainaxis[1]]*res[mainaxis[2]]*4, "SmokeDrawBuffer");
-			
-			if(buffer || smd->domain->viewsettings)
-			{
-				int mod_texture = 0;
-				
-				// printf("if(buffer || smd->domain->viewsettings)\n");
-				
-				max_textures = (res[mainaxis[0]] > 256) ? 256 : res[mainaxis[0]];
-				
-				if(!smd->domain->viewsettings) // new frame or new start
-				{
-					smd->domain->max_textures = max_textures;
-					glGenTextures(smd->domain->max_textures, (GLuint *)smd->domain->bind);
-					new = 1;
-					// printf("glGenTextures\n");
-				}
-				else
-				{
-					if(new)
-					{
-						// printf("glDeleteTextures\n");
-						glDeleteTextures(smd->domain->max_textures, (GLuint *)smd->domain->bind);
-						smd->domain->max_textures = max_textures;
-						glGenTextures(smd->domain->max_textures, (GLuint *)smd->domain->bind);
-					}
-				}
-
-				mod_texture = MAX3(1, smd->domain->visibility, (int)(res[mainaxis[0]] / smd->domain->max_textures ));
-				
-				// align order of billboards to be front or backview (e.g. +x or -x axis)
-				if(signed_align < 0)
-				{
-					z = res[mainaxis[0]] - 1;
-				}
-				else
-				{
-					z = 0;
-				}
-
-				for (; signed_align > 0 ? (z < res[mainaxis[0]]) : (z >= 0); signed_align > 0 ? z++ : z--) // 2
-				{
-					float quad[4][3];
-
-					if(new)
-					{
-						for (y = 0; y < res[mainaxis[1]]; y++) // 1
-						{
-							for (x = 0; x < res[mainaxis[2]]; x++) // 0
-							{
-								size_t index;
-								size_t image_index;
-								float tray, tvox;
-
-								image_index = smoke_get_index2d(y, res[mainaxis[1]], x);
-		
-								if(mainaxis[0] == 0)
-								{
-									// mainaxis[1] == 1, mainaxis[2] == 2
-									index = smoke_get_index(z, res[mainaxis[0]], y, res[mainaxis[1]], x);
-								}
-								else if(mainaxis[0] == 1)
-								{
-									// mainaxis[1] == 2, mainaxis[2] == 0
-									index = smoke_get_index(x, res[mainaxis[2]], z, res[mainaxis[0]], y);
-								}
-								else // mainaxis[0] == 2
-								{
-									// mainaxis[1] == 0, mainaxis[2] == 1
-									index = smoke_get_index(y, res[mainaxis[1]], x, res[mainaxis[2]], z);
-								}
-								
-								if(!big)
-								{
-									tvox =  smoke_get_tvox(smd, index);
-									tray = smoke_get_tray(smd, index);
-								}
-								else
-								{
-									tvox =  smoke_get_bigtvox(smd, index);
-									tray = smoke_get_bigtray(smd, index);
-								}
-
-								if(!have_lamp)
-									tray = 1.0;
-								
-								// fill buffer with luminance and alpha
-								// 1 - T_vox
-								buffer[image_index*4 + 3] = 1.0 - tvox; // 0 = transparent => d.h. tvox = 1
-		
-								// L_vox = Omega * L_light * (1 - T_vox) * T_ray
-								buffer[image_index*4] = buffer[image_index*4 + 1] = buffer[image_index*4 + 2] = smd->domain->omega * 1.0 * tvox * tray; 
-							}
-						}
-					}
-					glBindTexture(GL_TEXTURE_2D, smd->domain->bind[counter_textures]);
-					glEnable(GL_TEXTURE_2D);
-	
-					if(new)
-					{
-						glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, res[mainaxis[1]], res[mainaxis[2]], 0, GL_RGBA, GL_FLOAT, buffer);
-						glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);	// Linear Filtering
-						glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);	// Linear Filtering
-					}
-					
-					if((z % mod_texture) == 0 )
-					{
-						// botttom left
-						quad[3][mainaxis[0]] =  smd->domain->p0[mainaxis[0]] + z * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-						quad[3][mainaxis[1]] =  smd->domain->p0[mainaxis[1]] + smd->domain->dx * bigfactor * 0.5;
-						quad[3][mainaxis[2]] =  smd->domain->p0[mainaxis[2]] + smd->domain->dx * bigfactor * 0.5;
-		
-						// top right
-						quad[1][mainaxis[0]] =  smd->domain->p0[mainaxis[0]] + z * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-						quad[1][mainaxis[1]] =  smd->domain->p0[mainaxis[1]] + (res[mainaxis[1]] - 1) * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-						quad[1][mainaxis[2]] =  smd->domain->p0[mainaxis[2]] + (res[mainaxis[2]] - 1) * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-		
-						// top left
-						quad[2][mainaxis[0]] =  smd->domain->p0[mainaxis[0]] + z * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-						quad[2][mainaxis[1]] =  smd->domain->p0[mainaxis[1]] + smd->domain->dx * bigfactor * 0.5;
-						quad[2][mainaxis[2]] =  smd->domain->p0[mainaxis[2]] + (res[mainaxis[2]] - 1) * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-		
-						// bottom right
-						quad[0][mainaxis[0]] =  smd->domain->p0[mainaxis[0]] + z * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-						quad[0][mainaxis[1]] =  smd->domain->p0[mainaxis[1]] + (res[mainaxis[1]] - 1) * smd->domain->dx * bigfactor + smd->domain->dx * bigfactor * 0.5;
-						quad[0][mainaxis[2]] =  smd->domain->p0[mainaxis[2]] + smd->domain->dx * bigfactor * 0.5;
-		
-						glBegin(GL_QUADS); // Start Drawing Quads
-		
-						glTexCoord2f(1.0f, 0.0f);
-						glVertex3fv(quad[0]);	// Left And Up 1 Unit (Top Left)
-						glTexCoord2f(1.0f, 1.0f);
-						glVertex3fv(quad[1]);	// Right And Up 1 Unit (Top Right)
-						glTexCoord2f(0.0f, 1.0f);
-						glVertex3fv(quad[2]);	// Right And Down One Unit (Bottom Right)
-						glTexCoord2f(0.0f, 0.0f);
-						glVertex3fv(quad[3]);	// Left And Down One Unit (Bottom Left)
-		
-						glEnd();
-					}
-					counter_textures++;
-				}
-			}
-			if(buffer)
-			{
-				MEM_freeN(buffer);
-				buffer = NULL;
-			}
-			
-			// set correct flag for viewsettings
-			if(1)
-			{
-				// do not clear BIG/SMALL flag
-				smd->domain->viewsettings &= ~MOD_SMOKE_VIEW_X;
-				smd->domain->viewsettings &= ~MOD_SMOKE_VIEW_Y;
-				smd->domain->viewsettings &= ~MOD_SMOKE_VIEW_Z;
-				
-				// set what caches we have
-				if(big)
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_BIG;
-				else
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_SMALL;
-	
-				if(mainaxis[0] == 0)
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_X;
-				else if(mainaxis[0] == 1)
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_Y;
-				else if(mainaxis[0] == 2)
-					smd->domain->viewsettings |= MOD_SMOKE_VIEW_Z;
-			}
-
-			wmMultMatrix(ob->obmat);
-			glDisable(GL_BLEND);
-			glDepthMask(GL_TRUE);
-			if(col) cpack(col);
 		}
 	}
 
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
new file mode 100644
index 00000000000..221003360f4
--- /dev/null
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -0,0 +1,304 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributor(s): Daniel Genrich
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+#include <string.h>
+#include <math.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "MEM_guardedalloc.h"
+
+#include "IMB_imbuf.h"
+
+
+#include "MTC_matrixops.h"
+
+#include "DNA_armature_types.h"
+#include "DNA_boid_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_constraint_types.h" // for drawing constraint
+#include "DNA_effect_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+#include "DNA_object_force.h"
+#include "DNA_object_fluidsim.h"
+#include "DNA_particle_types.h"
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_smoke_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "BLI_editVert.h"
+#include "BLI_edgehash.h"
+#include "BLI_rand.h"
+
+#include "BKE_anim.h"			//for the where_on_path function
+#include "BKE_curve.h"
+#include "BKE_constraint.h" // for the get_constraint_target function
+#include "BKE_DerivedMesh.h"
+#include "BKE_deform.h"
+#include "BKE_displist.h"
+#include "BKE_effect.h"
+#include "BKE_font.h"
+#include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_key.h"
+#include "BKE_lattice.h"
+#include "BKE_mesh.h"
+#include "BKE_material.h"
+#include "BKE_mball.h"
+#include "BKE_modifier.h"
+#include "BKE_object.h"
+#include "BKE_paint.h"
+#include "BKE_particle.h"
+#include "BKE_property.h"
+#include "BKE_smoke.h"
+#include "BKE_unit.h"
+#include "BKE_utildefines.h"
+#include "smoke_API.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "GPU_draw.h"
+#include "GPU_material.h"
+#include "GPU_extensions.h"
+
+#include "ED_mesh.h"
+#include "ED_particle.h"
+#include "ED_screen.h"
+#include "ED_types.h"
+#include "ED_util.h"
+
+#include "UI_resources.h"
+#include "UI_interface_icons.h"
+
+#include "WM_api.h"
+#include "BLF_api.h"
+
+#include "GPU_extensions.h"
+
+#include "view3d_intern.h"	// own include
+
+struct GPUTexture;
+
+/* draw slices of smoke is adapted from c++ code authored by: Johannes Schmid and Ingemar Rask, 2006, johnny@grob.org */
+static float cv[][3] = {
+	{1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f}, {1.0f, -1.0f, 1.0f},
+	{1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, {-1.0f, -1.0f, -1.0f}, {1.0f, -1.0f, -1.0f}
+};
+
+// edges have the form edges[n][0][xyz] + t*edges[n][1][xyz]
+static float edges[12][2][3] = {
+	{{1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
+	{{-1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
+	{{-1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
+	{{1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
+
+	{{1.0f, -1.0f, 1.0f}, {0.0f, 1.0f, 0.0f}},
+	{{-1.0f, -1.0f, 1.0f}, {0.0f, 1.0f, 0.0f}},
+	{{-1.0f, -1.0f, -1.0f}, {0.0f, 1.0f, 0.0f}},
+	{{1.0f, -1.0f, -1.0f}, {0.0f, 1.0f, 0.0f}},
+
+	{{-1.0f, 1.0f, 1.0f}, {1.0f, 0.0f, 0.0f}},
+	{{-1.0f, -1.0f, 1.0f}, {1.0f, 0.0f, 0.0f}},
+	{{-1.0f, -1.0f, -1.0f}, {1.0f, 0.0f, 0.0f}},
+	{{-1.0f, 1.0f, -1.0f}, {1.0f, 0.0f, 0.0f}}
+};
+
+int intersect_edges(float *points, float a, float b, float c, float d)
+{
+	int i;
+	float t;
+	int numpoints = 0;
+	
+	for (i=0; i<12; i++) {
+		t = -(a*edges[i][0][0] + b*edges[i][0][1] + c*edges[i][0][2] + d)
+			/ (a*edges[i][1][0] + b*edges[i][1][1] + c*edges[i][1][2]);
+		if ((t>0)&&(t<2)) {
+			points[numpoints * 3 + 0] = edges[i][0][0] + edges[i][1][0]*t;
+			points[numpoints * 3 + 1] = edges[i][0][1] + edges[i][1][1]*t;
+			points[numpoints * 3 + 2] = edges[i][0][2] + edges[i][1][2]*t;
+			numpoints++;
+		}
+	}
+	return numpoints;
+}
+
+static int convex(float *p0, float *up, float *a, float *b)
+{
+	// Vec3 va = a-p0, vb = b-p0;
+	float va[3], vb[3], tmp[3];
+	VECSUB(va, a, p0);
+	VECSUB(vb, b, p0);
+	Crossf(tmp, va, vb);
+	return INPR(up, tmp) >= 0;
+}
+
+// copied from gpu_extension.c
+static int is_pow2(int n)
+{
+	return ((n)&(n-1))==0;
+}
+
+static int larger_pow2(int n)
+{
+	if (is_pow2(n))
+		return n;
+
+	while(!is_pow2(n))
+		n= n&(n-1);
+
+	return n*2;
+}
+
+void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, int res[3])
+{
+	Object *ob = base->object;
+	RegionView3D *rv3d= ar->regiondata;
+
+	float viewnormal[3];
+	// int res[3];
+	int i, j, n;
+	float d, d0, dd;
+	float *points = NULL;
+	int numpoints = 0;
+	float cor[3] = {1.,1.,1.};
+
+	/*
+	res[0] = smd->domain->res[0];
+	res[1] = smd->domain->res[1];
+	res[2] = smd->domain->res[2];
+	*/
+
+	wmLoadMatrix(rv3d->viewmat);
+
+	glDepthMask(GL_FALSE);
+	glEnable(GL_TEXTURE_3D);
+	glDisable(GL_DEPTH_TEST);
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	// get view vector
+	VECCOPY(viewnormal, rv3d->viewinv[2]);
+	Normalize(viewnormal);
+
+	// find cube vertex that is closest to the viewer
+	for (i=0; i<8; i++) {
+		float x,y,z;
+
+		x = cv[i][0] + viewnormal[0];
+		y = cv[i][1] + viewnormal[1];
+		z = cv[i][2] + viewnormal[2];
+
+		if ((x>=-1.0f)&&(x<=1.0f)
+			&&(y>=-1.0f)&&(y<=1.0f)
+			&&(z>=-1.0f)&&(z<=1.0f)) {
+			break;
+		}
+	}
+
+	GPU_texture_bind(tex, 0);
+
+	cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
+	cor[1] = (float)res[1]/(float)larger_pow2(res[1]);
+	cor[2] = (float)res[2]/(float)larger_pow2(res[2]);
+
+	// our slices are defined by the plane equation a*x + b*y +c*z + d = 0
+	// (a,b,c), the plane normal, are given by viewdir
+	// d is the parameter along the view direction. the first d is given by
+	// inserting previously found vertex into the plane equation
+	d0 = -(viewnormal[0]*cv[i][0] + viewnormal[1]*cv[i][1] + viewnormal[2]*cv[i][2]);
+	dd = 2.0*d0/64.0f;
+	n = 0;
+
+	// printf("d0: %f, dd: %f\n", d0, dd);
+
+	points = MEM_callocN(sizeof(float)*12*3, "smoke_points_preview");
+
+	for (d = d0; d > -d0; d -= dd) {
+		float p0[3];
+		// intersect_edges returns the intersection points of all cube edges with
+		// the given plane that lie within the cube
+		numpoints = intersect_edges(points, viewnormal[0], viewnormal[1], viewnormal[2], d);
+
+		if (numpoints > 2) {
+			VECCOPY(p0, points);
+
+			// sort points to get a convex polygon
+			for(i = 1; i < numpoints - 1; i++)
+			{
+				for(j = i + 1; j < numpoints; j++)
+				{
+					if(convex(p0, viewnormal, &points[j * 3], &points[i * 3]))
+					{
+						float tmp2[3];
+						VECCOPY(tmp2, &points[i * 3]);
+						VECCOPY(&points[i * 3], &points[j * 3]);
+						VECCOPY(&points[j * 3], tmp2);
+					}
+				}
+			}
+
+			glBegin(GL_POLYGON);
+			for (i = 0; i < numpoints; i++) {
+				glColor3f(1.0, 1.0, 1.0);
+				glTexCoord3d((points[i * 3 + 0] + 1.0)*cor[0]/2.0, (points[i * 3 + 1] + 1)*cor[1]/2.0, (points[i * 3 + 2] + 1.0)*cor[2]/2.0);
+				glVertex3f(points[i * 3 + 0], points[i * 3 + 1], points[i * 3 + 2]);
+			}
+			glEnd();
+		}
+		n++;
+	}
+
+	GPU_texture_unbind(tex);
+
+	MEM_freeN(points);
+
+	wmMultMatrix(ob->obmat);	
+
+	glDisable(GL_TEXTURE_3D);
+	glDisable(GL_BLEND);
+	glEnable(GL_DEPTH_TEST);
+	glDepthMask(GL_TRUE);	
+}
+
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index acd1c62bc17..e5e85cf9d16 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -156,6 +156,9 @@ void VIEW3D_OT_snap_menu(struct wmOperatorType *ot);
 ARegion *view3d_has_buttons_region(ScrArea *sa);
 ARegion *view3d_has_tools_region(ScrArea *sa);
 
+/* draw_volume.c */
+void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, int res[3]);
+
 
 #endif /* ED_VIEW3D_INTERN_H */
 
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 82ff51dc5ce..1c6b8399422 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -112,6 +112,10 @@ int GPU_verify_image(struct Image *ima, int tftile, int tfmode, int compare, int
 void GPU_free_image(struct Image *ima);
 void GPU_free_images(void);
 
+/* smoke drawing functions */
+void GPU_free_smoke(struct SmokeModifierData *smd);
+void GPU_create_smoke(struct SmokeModifierData *smd);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h
index eba585e8838..e00cab79ce0 100644
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@ -73,6 +73,7 @@ int GPU_print_error(char *str);
 
 GPUTexture *GPU_texture_create_1D(int w, float *pixels);
 GPUTexture *GPU_texture_create_2D(int w, int h, float *pixels);
+GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels);
 GPUTexture *GPU_texture_create_depth(int w, int h);
 GPUTexture *GPU_texture_from_blender(struct Image *ima,
 	struct ImageUser *iuser, double time, int mipmap);
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index e7846a23905..a81c7e03455 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -38,9 +38,11 @@
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_smoke_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 
@@ -744,6 +746,23 @@ int GPU_update_image_time(Image *ima, double time)
 	return inc;
 }
 
+
+void GPU_free_smoke(SmokeModifierData *smd)
+{
+	if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain)
+	{
+		if(smd->domain->tex)
+	 		GPU_texture_free(smd->domain->tex);
+		smd->domain->tex = NULL;
+	}
+}
+
+void GPU_create_smoke(SmokeModifierData *smd)
+{
+	if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && !smd->domain->tex)
+		smd->domain->tex = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smd->domain->view3d);
+}
+
 void GPU_free_image(Image *ima)
 {
 	/* free regular image binding */
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 467b2c4a7f4..0b6640b9e27 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -312,6 +312,78 @@ static GPUTexture *GPU_texture_create_nD(int w, int h, int n, float *fpixels, in
 	return tex;
 }
 
+
+GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
+{
+	GPUTexture *tex;
+	GLenum type, format, internalformat;
+	void *pixels = NULL;
+
+	tex = MEM_callocN(sizeof(GPUTexture), "GPUTexture");
+	tex->w = w;
+	tex->h = h;
+	tex->depth = depth;
+	tex->number = -1;
+	tex->refcount = 1;
+	tex->target = GL_TEXTURE_3D;
+
+	glGenTextures(1, &tex->bindcode);
+
+	if (!tex->bindcode) {
+		fprintf(stderr, "GPUTexture: texture create failed: %d\n",
+			(int)glGetError());
+		GPU_texture_free(tex);
+		return NULL;
+	}
+
+	// if (!GLEW_ARB_texture_non_power_of_two) 
+	{
+		tex->w = larger_pow2(tex->w);
+		tex->h = larger_pow2(tex->h);
+		tex->depth = larger_pow2(tex->depth);
+	}
+
+	tex->number = 0;
+	glBindTexture(tex->target, tex->bindcode);
+
+	type = GL_UNSIGNED_BYTE;
+	format = GL_RGBA;
+	internalformat = GL_RGBA8;
+
+	if (fpixels)
+		pixels = GPU_texture_convert_pixels(w*h*depth, fpixels);
+
+	glTexImage3D(tex->target, 0, internalformat, tex->w, tex->h, tex->depth, 0, format, type, 0);
+
+	if (fpixels) {
+		glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format, type, pixels);
+
+		/*
+		if (tex->w > w)
+			GPU_glTexSubImageEmpty(tex->target, format, w, 0, tex->w-w, tex->h);
+		if (tex->h > h)
+			GPU_glTexSubImageEmpty(tex->target, format, 0, h, w, tex->h-h);
+		*/
+	}
+
+	// glTexImage3D(tex->target, 0, GL_RGBA, w, h, depth, 0, GL_RGBA, GL_FLOAT, fpixels);
+
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S,GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T,GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R,GL_CLAMP_TO_BORDER);
+
+
+	if (pixels)
+		MEM_freeN(pixels);
+
+	if (tex)
+		GPU_texture_unbind(tex);
+
+	return tex;
+}
+
 GPUTexture *GPU_texture_from_blender(Image *ima, ImageUser *iuser, double time, int mipmap)
 {
 	GPUTexture *tex;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 9d1707599b9..33499574012 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -42,6 +42,7 @@ typedef enum ModifierType {
 	eModifierType_Multires,
 	eModifierType_Surface,
 	eModifierType_Smoke,
+	eModifierType_SmokeHR,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -252,9 +253,36 @@ typedef struct SmokeModifierData {
 	struct SmokeCollSettings *coll; /* collision objects */
 	float time;
 	int type;  /* domain, inflow, outflow, ... */
-	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
 } SmokeModifierData;
 
+
+/* noise */
+#define MOD_SMOKE_NOISEWAVE (1<<0)
+#define MOD_SMOKE_NOISEFFT (1<<1)
+#define MOD_SMOKE_NOISECURL (1<<2)
+
+/* flags */
+#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */
+
+typedef struct SmokeHRModifierData {
+	ModifierData modifier;
+
+	struct WTURBULENCE *wt; // WTURBULENCE object, if active
+	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
+	struct ListBase ptcaches;
+	struct GPUTexture *tex;
+	float *view3d; /* voxel data for display */
+	unsigned int v3dnum; /* number of frame in view3d buffer */
+	float time;
+	float strength;
+	int res[3];
+	int maxres;
+	short noise; /* noise type: wave, curl, anisotropic */
+	short pad;
+	int amplify;
+	int flags;
+} SmokeHRModifierData;
+
 typedef struct DisplaceModifierData {
 	ModifierData modifier;
 
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index c7f49d3ddd2..2d8b21b86de 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -30,24 +30,12 @@
 #define DNA_SMOKE_TYPES_H
 
 /* flags */
-#define MOD_SMOKE_HIGHRES (1<<1) /* compute high resolution */
+#define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */
 #define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */
 #define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */
 
-/* noise */
-#define MOD_SMOKE_NOISEWAVE (1<<0)
-#define MOD_SMOKE_NOISEFFT (1<<1)
-#define MOD_SMOKE_NOISECURL (1<<2)
 /* viewsettings */
-#define MOD_SMOKE_VIEW_X (1<<0)
-#define MOD_SMOKE_VIEW_Y (1<<1)
-#define MOD_SMOKE_VIEW_Z (1<<2)
-#define MOD_SMOKE_VIEW_SMALL (1<<3)
-#define MOD_SMOKE_VIEW_BIG (1<<4)
-#define MOD_SMOKE_VIEW_CHANGETOBIG (1<<5)
-#define MOD_SMOKE_VIEW_REDRAWNICE (1<<6)
-#define MOD_SMOKE_VIEW_REDRAWALL (1<<7)
-#define MOD_SMOKE_VIEW_USEBIG (1<<8)
+/* nothing so far */
 
 typedef struct SmokeDomainSettings {
 	struct SmokeModifierData *smd; /* for fast RNA access */
@@ -55,33 +43,27 @@ typedef struct SmokeDomainSettings {
 	struct Group *fluid_group;
 	struct Group *eff_group; // effector group for e.g. wind force
 	struct Group *coll_group; // collision objects group
-	unsigned int *bind;
-	float *tvox;
-	float *tray;
-	float *tvoxbig;
-	float *traybig;
+	struct GPUTexture *tex;
+	float *view3d; /* voxel data for display */
+	unsigned int v3dnum; /* number of frame in view3d buffer */
 	float p0[3]; /* start point of BB */
 	float p1[3]; /* end point of BB */
 	float dx; /* edge length of one cell */
 	float firstframe;
 	float lastframe;
-	float omega; /* smoke color - from 0 to 1 */
 	float temp; /* fluid temperature */
 	float tempAmb; /* ambient temperature */
 	float alpha;
 	float beta;
 	int res[3]; /* domain resolution */
-	int amplify; /* wavelet amplification */
 	int maxres; /* longest axis on the BB gets this resolution assigned */
 	int flags; /* show up-res or low res, etc */
-	int visibility; /* how many billboards to show (every 2nd, 3rd, 4th,..) */
 	int viewsettings;
-	int max_textures;
-	short noise; /* noise type: wave, curl, anisotropic */
 	short diss_percent; 
+	short pad;
 	int diss_speed;/* in frames */
-	float strength;
-	struct WTURBULENCE *wt; // WTURBULENCE object, if active
+	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
+	struct ListBase ptcaches;
 } SmokeDomainSettings;
 
 
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index e08bc734242..e4fe92317d4 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -387,6 +387,7 @@ extern StructRNA RNA_SmokeCollSettings;
 extern StructRNA RNA_SmokeDomainSettings;
 extern StructRNA RNA_SmokeFlowSettings;
 extern StructRNA RNA_SmokeModifier;
+extern StructRNA RNA_SmokeHRModifier;
 extern StructRNA RNA_SmoothModifier;
 extern StructRNA RNA_SoftBodyModifier;
 extern StructRNA RNA_SoftBodySettings;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 837158b9ec8..f2c8e404a52 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -68,6 +68,7 @@ EnumPropertyItem modifier_type_items[] ={
 	{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""},
 	{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""},
 	{eModifierType_Smoke, "SMOKE", 0, "Smoke", ""},
+	{eModifierType_SmokeHR, "SMOKE_HR", 0, "SmokeHR", ""},
 	{eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""},
 	{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
 	{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
@@ -156,6 +157,8 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr)
 			return &RNA_SurfaceModifier;
 		case eModifierType_Smoke:
 			return &RNA_SmokeModifier;
+		case eModifierType_SmokeHR:
+			return &RNA_SmokeHRModifier;
 		default:
 			return &RNA_Modifier;
 	}
@@ -181,19 +184,30 @@ static void rna_Smoke_set_type(bContext *C, PointerRNA *ptr)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)ptr->data;
 	Object *ob= (Object*)ptr->id.data;
+
+	// nothing changed
+	if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
+		return;
 		
 	smokeModifier_free(smd); // XXX TODO: completely free all 3 pointers
 	smokeModifier_createType(smd); // create regarding of selected type
-	// particle_system_slot_add_exec(C, NULL);
-	// particle_system_slot_remove_exec(C, NULL);
 
-	if(smd->type == MOD_SMOKE_TYPE_DOMAIN)
+	if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 		ob->dt = OB_WIRE;
 	
 	// update dependancy since a domain - other type switch could have happened
 	rna_Modifier_dependency_update(C, ptr);
 }
 
+static void rna_SmokeHR_reset(bContext *C, PointerRNA *ptr)
+{
+	// SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
+
+	// smokeModifier_reset(settings->smd);
+
+	// rna_Smoke_update(C, ptr);
+}
+
 static void rna_ExplodeModifier_vgroup_get(PointerRNA *ptr, char *value)
 {
 	ExplodeModifierData *emd= (ExplodeModifierData*)ptr->data;
@@ -1499,6 +1513,55 @@ static void rna_def_modifier_cloth(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Point Cache", "");
 }
 
+static void rna_def_modifier_smoke_highresolution(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+		static EnumPropertyItem prop_noise_type_items[] = {
+				{MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""},
+#if FFTW3 == 1
+				{MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, 
+#endif
+			/* 	{MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */
+				{0, NULL, 0, NULL, NULL}};
+	
+	srna= RNA_def_struct(brna, "SmokeHRModifier", "Modifier");
+	RNA_def_struct_ui_text(srna, "Smoke High Resolution Modifier", "Smoke high resolution simulation modifier.");
+	RNA_def_struct_sdna(srna, "SmokeHRModifierData");
+
+	prop= RNA_def_property(srna, "show_highres", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_SHOWHIGHRES);
+	RNA_def_property_ui_text(prop, "High res", "Show high resolution (using amplification).");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
+
+	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "noise");
+	RNA_def_property_enum_items(prop, prop_noise_type_items);
+	RNA_def_property_ui_text(prop, "Noise Method", "Noise method which is used for creating the high resolution");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_SmokeHR_reset");
+
+	prop= RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "amplify");
+	RNA_def_property_range(prop, 1, 10);
+	RNA_def_property_ui_range(prop, 1, 10, 1, 0);
+	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_SmokeHR_reset");
+
+	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "strength");
+	RNA_def_property_range(prop, 1.0, 10.0);
+	RNA_def_property_ui_range(prop, 1.0, 10.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Strength", "Strength of wavelet noise");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_SmokeHR_reset");
+
+	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
+	RNA_def_property_struct_type(prop, "PointCache");
+	RNA_def_property_ui_text(prop, "Point Cache", "");
+
+}
+
 static void rna_def_modifier_smoke(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -1915,6 +1978,7 @@ void RNA_def_modifier(BlenderRNA *brna)
 	rna_def_modifier_multires(brna);
 	rna_def_modifier_surface(brna);
 	rna_def_modifier_smoke(brna);
+	rna_def_modifier_smoke_highresolution(brna);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 6f1babb495a..a119eefa62c 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -78,11 +78,28 @@ static void rna_Smoke_reset_dependancy(bContext *C, PointerRNA *ptr)
 	rna_Smoke_dependency_update(C, ptr);
 }
 
+static void rna_Smoke_enable_HR(bContext *C, PointerRNA *ptr)
+{
+	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
+	Object *ob = (Object*)ptr->id.data;
+
+	if(settings->flags & MOD_SMOKE_HIGHRES)
+		BLI_addtail(&ob->modifiers, modifier_new(eModifierType_SmokeHR));
+	else
+	{
+		ModifierData *tmd = modifiers_findByType(ob, eModifierType_SmokeHR);
+		if(tmd) {
+			BLI_remlink(&ob->modifiers, tmd);
+			modifier_free(tmd);
+		}
+	}
+}
+
 static void rna_Smoke_redraw(bContext *C, PointerRNA *ptr)
 {
 	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
 
-	settings->flags |= MOD_SMOKE_VIEW_REDRAWNICE;
+	// settings->flags |= MOD_SMOKE_VIEW_REDRAWNICE;
 }
 
 static char *rna_SmokeDomainSettings_path(PointerRNA *ptr)
@@ -116,14 +133,6 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	static EnumPropertyItem prop_noise_type_items[] = {
-				{MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""},
-#if FFTW3 == 1
-				{MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, 
-#endif
-			/* 	{MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */
-				{0, NULL, 0, NULL, NULL}};
-
 	srna = RNA_def_struct(brna, "SmokeDomainSettings", NULL);
 	RNA_def_struct_ui_text(srna, "Domain Settings", "Smoke domain settings.");
 	RNA_def_struct_sdna(srna, "SmokeDomainSettings");
@@ -136,56 +145,19 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Max Res", "Maximal resolution used in the fluid domain.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
-	prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_sdna(prop, NULL, "omega");
-	RNA_def_property_range(prop, 0.02, 1.0);
-	RNA_def_property_ui_range(prop, 0.02, 1.0, 0.02, 2);
-	RNA_def_property_ui_text(prop, "Color", "Smoke color (0 = black, 1 = white).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Smoke_redraw");
-
-	prop= RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "amplify");
-	RNA_def_property_range(prop, 1, 10);
-	RNA_def_property_ui_range(prop, 1, 10, 1, 0);
-	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES);
-	RNA_def_property_ui_text(prop, "High res", "Enable high resolution (using amplification).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "viewhighres", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_VIEW_USEBIG);
-	RNA_def_property_ui_text(prop, "Show High Resolution", "Show high resolution (using amplification).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_redraw");
-
-	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "noise");
-	RNA_def_property_enum_items(prop, prop_noise_type_items);
-	RNA_def_property_ui_text(prop, "Noise Method", "Noise method which is used for creating the high resolution");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "visibility", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "visibility");
-	RNA_def_property_range(prop, 1, 15);
-	RNA_def_property_ui_range(prop, 1, 15, 1, 0);
-	RNA_def_property_ui_text(prop, "Display", "How much of the resolution should be shown during preview (every 2nd, 3rd, etc).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Smoke_redraw");
-
 	prop= RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "alpha");
 	RNA_def_property_range(prop, -5.0, 5.0);
 	RNA_def_property_ui_range(prop, -5.0, 5.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Gravity", "Higher value results in sinking smoke");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
 
 	prop= RNA_def_property(srna, "beta", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "beta");
 	RNA_def_property_range(prop, -5.0, 5.0);
 	RNA_def_property_ui_range(prop, -5.0, 5.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Heat", "Higher value results in faster rising smoke.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
 
 	prop= RNA_def_property(srna, "coll_group", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "coll_group");
@@ -208,13 +180,6 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Effector Group", "Limit effectors to this group.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_dependancy");
 
-	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_sdna(prop, NULL, "strength");
-	RNA_def_property_range(prop, 1.0, 10.0);
-	RNA_def_property_ui_range(prop, 1.0, 10.0, 1, 2);
-	RNA_def_property_ui_text(prop, "Strength", "Strength of wavelet noise");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
 	prop= RNA_def_property(srna, "dissolve_speed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "diss_speed");
 	RNA_def_property_range(prop, 1.0, 100.0);
@@ -222,6 +187,11 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Dissolve Speed", "Dissolve Speed");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
 
+	prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES);
+	RNA_def_property_ui_text(prop, "High Resolution Smoke", "Enable high resolution smoke");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_enable_HR");
+
 	prop= RNA_def_property(srna, "dissolve_smoke", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE);
 	RNA_def_property_ui_text(prop, "Dissolve Smoke", "Enable smoke to disappear over time.");
@@ -231,6 +201,11 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE_LOG);
 	RNA_def_property_ui_text(prop, "Logarithmic dissolve", "Using 1/x ");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+
+	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
+	RNA_def_property_struct_type(prop, "PointCache");
+	RNA_def_property_ui_text(prop, "Point Cache", "");
 }
 
 static void rna_def_smoke_flow_settings(BlenderRNA *brna)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 3a2cef2d038..3b95c409b30 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -319,6 +319,8 @@ IF(UNIX)
     bf_dummy 
     bf_bullet 
     bf_smoke
+    bf_minilzo
+    bf_lzma
     bf_common 
     bf_ketsji 
     bf_logic 

From 89658db5761516d4c07a2b975e3e6e290cd67cea Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 00:37:27 +0000
Subject: [PATCH 150/577] Fix Smoke #1: * compile error reported by nudelZ
 (static/nonstatic)

---
 source/blender/blenkernel/intern/smoke.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 6449ae10eee..9be60a0a975 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -123,7 +123,7 @@ struct DerivedMesh;
 struct SmokeModifierData;
 
 // forward declerations
-void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);
+static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);
 void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
 void smoke_prepare_View(SmokeModifierData *smd, float framenr, float *light, int have_light);
 

From 858dbbe232cce6a8e1d13a98385122ff236b146e Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 00:42:57 +0000
Subject: [PATCH 151/577] Fix Smoke: *totally forgot scons file for lzma

---
 extern/lzma/SConscript | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 extern/lzma/SConscript

diff --git a/extern/lzma/SConscript b/extern/lzma/SConscript
new file mode 100644
index 00000000000..015cdfe339f
--- /dev/null
+++ b/extern/lzma/SConscript
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('./*.c')
+
+defs = ''
+incs = ' . ' 
+
+env.BlenderLib ('bf_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )

From 147bcc92b618701c4906ff99b09da07a5b13a9a4 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 20 Aug 2009 00:54:40 +0000
Subject: [PATCH 152/577] * Library path fixes for win64

---
 CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00d2244511f..9db25115099 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,7 +256,11 @@ IF(WIN32)
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
-  SET(ZLIB_LIBRARIES zlib)
+  IF(CMAKE_CL_64)
+    SET(ZLIB_LIBRARIES libz)
+  ELSE(CMAKE_CL_64)
+    SET(ZLIB_LIBRARIES zlib)
+  ENDIF(CMAKE_CL_64)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
@@ -279,7 +283,7 @@ IF(WIN32)
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
   IF(CMAKE_CL_64)
-    SET(GETTEXT_LIB gettextlib)
+    SET(GETTEXT_LIB gettext)
   ELSE(CMAKE_CL_64)
     SET(GETTEXT_LIB gnu_gettext)
   ENDIF(CMAKE_CL_64)

From e56c32073d8b4855e9a6b83d281b80d4b0a2aa4d Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 01:02:34 +0000
Subject: [PATCH 153/577] LZMA: Deleting unused bad files (bad for gcc)

---
 extern/lzma/7zBuf.c     |  36 --
 extern/lzma/7zBuf.h     |  31 --
 extern/lzma/7zBuf2.c    |  45 ---
 extern/lzma/7zCrc.c     |  35 --
 extern/lzma/7zCrc.h     |  24 --
 extern/lzma/7zFile.c    | 263 -------------
 extern/lzma/7zFile.h    |  74 ----
 extern/lzma/7zStream.c  | 169 ---------
 extern/lzma/7zVersion.h |   7 -
 extern/lzma/Bcj2.c      | 132 -------
 extern/lzma/Bcj2.h      |  30 --
 extern/lzma/Bra.c       | 133 -------
 extern/lzma/Bra.h       |  60 ---
 extern/lzma/Bra86.c     |  85 -----
 extern/lzma/BraIA64.c   |  67 ----
 extern/lzma/CpuArch.h   |  69 ----
 extern/lzma/LzFindMt.c  | 793 ----------------------------------------
 extern/lzma/LzFindMt.h  |  97 -----
 extern/lzma/Threads.c   | 109 ------
 extern/lzma/Threads.h   |  68 ----
 20 files changed, 2327 deletions(-)
 delete mode 100644 extern/lzma/7zBuf.c
 delete mode 100644 extern/lzma/7zBuf.h
 delete mode 100644 extern/lzma/7zBuf2.c
 delete mode 100644 extern/lzma/7zCrc.c
 delete mode 100644 extern/lzma/7zCrc.h
 delete mode 100644 extern/lzma/7zFile.c
 delete mode 100644 extern/lzma/7zFile.h
 delete mode 100644 extern/lzma/7zStream.c
 delete mode 100644 extern/lzma/7zVersion.h
 delete mode 100644 extern/lzma/Bcj2.c
 delete mode 100644 extern/lzma/Bcj2.h
 delete mode 100644 extern/lzma/Bra.c
 delete mode 100644 extern/lzma/Bra.h
 delete mode 100644 extern/lzma/Bra86.c
 delete mode 100644 extern/lzma/BraIA64.c
 delete mode 100644 extern/lzma/CpuArch.h
 delete mode 100644 extern/lzma/LzFindMt.c
 delete mode 100644 extern/lzma/LzFindMt.h
 delete mode 100644 extern/lzma/Threads.c
 delete mode 100644 extern/lzma/Threads.h

diff --git a/extern/lzma/7zBuf.c b/extern/lzma/7zBuf.c
deleted file mode 100644
index 14e7f4e2b92..00000000000
--- a/extern/lzma/7zBuf.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 7zBuf.c -- Byte Buffer
-2008-03-28
-Igor Pavlov
-Public domain */
-
-#include "7zBuf.h"
-
-void Buf_Init(CBuf *p)
-{
-  p->data = 0;
-  p->size = 0;
-}
-
-int Buf_Create(CBuf *p, size_t size, ISzAlloc *alloc)
-{
-  p->size = 0;
-  if (size == 0)
-  {
-    p->data = 0;
-    return 1;
-  }
-  p->data = (Byte *)alloc->Alloc(alloc, size);
-  if (p->data != 0)
-  {
-    p->size = size;
-    return 1;
-  }
-  return 0;
-}
-
-void Buf_Free(CBuf *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->data);
-  p->data = 0;
-  p->size = 0;
-}
diff --git a/extern/lzma/7zBuf.h b/extern/lzma/7zBuf.h
deleted file mode 100644
index c5bd71879cc..00000000000
--- a/extern/lzma/7zBuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 7zBuf.h -- Byte Buffer
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_BUF_H
-#define __7Z_BUF_H
-
-#include "Types.h"
-
-typedef struct
-{
-  Byte *data;
-  size_t size;
-} CBuf;
-
-void Buf_Init(CBuf *p);
-int Buf_Create(CBuf *p, size_t size, ISzAlloc *alloc);
-void Buf_Free(CBuf *p, ISzAlloc *alloc);
-
-typedef struct
-{
-  Byte *data;
-  size_t size;
-  size_t pos;
-} CDynBuf;
-
-void DynBuf_Construct(CDynBuf *p);
-void DynBuf_SeekToBeg(CDynBuf *p);
-int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAlloc *alloc);
-void DynBuf_Free(CDynBuf *p, ISzAlloc *alloc);
-
-#endif
diff --git a/extern/lzma/7zBuf2.c b/extern/lzma/7zBuf2.c
deleted file mode 100644
index 8d17e0dcf80..00000000000
--- a/extern/lzma/7zBuf2.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 7zBuf2.c -- Byte Buffer
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include <string.h>
-#include "7zBuf.h"
-
-void DynBuf_Construct(CDynBuf *p)
-{
-  p->data = 0;
-  p->size = 0;
-  p->pos = 0;
-}
-
-void DynBuf_SeekToBeg(CDynBuf *p)
-{
-  p->pos = 0;
-}
-
-int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAlloc *alloc)
-{
-  if (size > p->size - p->pos)
-  {
-    size_t newSize = p->pos + size;
-    Byte *data;
-    newSize += newSize / 4;
-    data = (Byte *)alloc->Alloc(alloc, newSize);
-    if (data == 0)
-      return 0;
-    p->size = newSize;
-    memcpy(data, p->data, p->pos);
-    alloc->Free(alloc, p->data);
-    p->data = data;
-  }
-  memcpy(p->data + p->pos, buf, size);
-  p->pos += size;
-  return 1;
-}
-
-void DynBuf_Free(CDynBuf *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->data);
-  p->data = 0;
-  p->size = 0;
-  p->pos = 0;
-}
diff --git a/extern/lzma/7zCrc.c b/extern/lzma/7zCrc.c
deleted file mode 100644
index 71962b2c28d..00000000000
--- a/extern/lzma/7zCrc.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 7zCrc.c -- CRC32 calculation
-2008-08-05
-Igor Pavlov
-Public domain */
-
-#include "7zCrc.h"
-
-#define kCrcPoly 0xEDB88320
-UInt32 g_CrcTable[256];
-
-void MY_FAST_CALL CrcGenerateTable(void)
-{
-  UInt32 i;
-  for (i = 0; i < 256; i++)
-  {
-    UInt32 r = i;
-    int j;
-    for (j = 0; j < 8; j++)
-      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-    g_CrcTable[i] = r;
-  }
-}
-
-UInt32 MY_FAST_CALL CrcUpdate(UInt32 v, const void *data, size_t size)
-{
-  const Byte *p = (const Byte *)data;
-  for (; size > 0 ; size--, p++)
-    v = CRC_UPDATE_BYTE(v, *p);
-  return v;
-}
-
-UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size)
-{
-  return CrcUpdate(CRC_INIT_VAL, data, size) ^ 0xFFFFFFFF;
-}
diff --git a/extern/lzma/7zCrc.h b/extern/lzma/7zCrc.h
deleted file mode 100644
index 00dc29cee3c..00000000000
--- a/extern/lzma/7zCrc.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 7zCrc.h -- CRC32 calculation
-2008-03-13
-Igor Pavlov
-Public domain */
-
-#ifndef __7Z_CRC_H
-#define __7Z_CRC_H
-
-#include <stddef.h>
-
-#include "Types.h"
-
-extern UInt32 g_CrcTable[];
-
-void MY_FAST_CALL CrcGenerateTable(void);
-
-#define CRC_INIT_VAL 0xFFFFFFFF
-#define CRC_GET_DIGEST(crc) ((crc) ^ 0xFFFFFFFF)
-#define CRC_UPDATE_BYTE(crc, b) (g_CrcTable[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
-
-UInt32 MY_FAST_CALL CrcUpdate(UInt32 crc, const void *data, size_t size);
-UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size);
-
-#endif
diff --git a/extern/lzma/7zFile.c b/extern/lzma/7zFile.c
deleted file mode 100644
index 9a44c59ac0c..00000000000
--- a/extern/lzma/7zFile.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* 7zFile.c -- File IO
-2008-11-22 : Igor Pavlov : Public domain */
-
-#include "7zFile.h"
-
-#ifndef USE_WINDOWS_FILE
-
-#include <errno.h>
-
-#endif
-
-#ifdef USE_WINDOWS_FILE
-
-/*
-   ReadFile and WriteFile functions in Windows have BUG:
-   If you Read or Write 64MB or more (probably min_failure_size = 64MB - 32KB + 1)
-   from/to Network file, it returns ERROR_NO_SYSTEM_RESOURCES
-   (Insufficient system resources exist to complete the requested service).
-   Probably in some version of Windows there are problems with other sizes:
-   for 32 MB (maybe also for 16 MB).
-   And message can be "Network connection was lost"
-*/
-
-#define kChunkSizeMax (1 << 22)
-
-#endif
-
-void File_Construct(CSzFile *p)
-{
-  #ifdef USE_WINDOWS_FILE
-  p->handle = INVALID_HANDLE_VALUE;
-  #else
-  p->file = NULL;
-  #endif
-}
-
-static WRes File_Open(CSzFile *p, const char *name, int writeMode)
-{
-  #ifdef USE_WINDOWS_FILE
-  p->handle = CreateFileA(name,
-      writeMode ? GENERIC_WRITE : GENERIC_READ,
-      FILE_SHARE_READ, NULL,
-      writeMode ? CREATE_ALWAYS : OPEN_EXISTING,
-      FILE_ATTRIBUTE_NORMAL, NULL);
-  return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();
-  #else
-  p->file = fopen(name, writeMode ? "wb+" : "rb");
-  return (p->file != 0) ? 0 : errno;
-  #endif
-}
-
-WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); }
-WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); }
-
-WRes File_Close(CSzFile *p)
-{
-  #ifdef USE_WINDOWS_FILE
-  if (p->handle != INVALID_HANDLE_VALUE)
-  {
-    if (!CloseHandle(p->handle))
-      return GetLastError();
-    p->handle = INVALID_HANDLE_VALUE;
-  }
-  #else
-  if (p->file != NULL)
-  {
-    int res = fclose(p->file);
-    if (res != 0)
-      return res;
-    p->file = NULL;
-  }
-  #endif
-  return 0;
-}
-
-WRes File_Read(CSzFile *p, void *data, size_t *size)
-{
-  size_t originalSize = *size;
-  if (originalSize == 0)
-    return 0;
-
-  #ifdef USE_WINDOWS_FILE
-
-  *size = 0;
-  do
-  {
-    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
-    DWORD processed = 0;
-    BOOL res = ReadFile(p->handle, data, curSize, &processed, NULL);
-    data = (void *)((Byte *)data + processed);
-    originalSize -= processed;
-    *size += processed;
-    if (!res)
-      return GetLastError();
-    if (processed == 0)
-      break;
-  }
-  while (originalSize > 0);
-  return 0;
-
-  #else
-  
-  *size = fread(data, 1, originalSize, p->file);
-  if (*size == originalSize)
-    return 0;
-  return ferror(p->file);
-  
-  #endif
-}
-
-WRes File_Write(CSzFile *p, const void *data, size_t *size)
-{
-  size_t originalSize = *size;
-  if (originalSize == 0)
-    return 0;
-  
-  #ifdef USE_WINDOWS_FILE
-
-  *size = 0;
-  do
-  {
-    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
-    DWORD processed = 0;
-    BOOL res = WriteFile(p->handle, data, curSize, &processed, NULL);
-    data = (void *)((Byte *)data + processed);
-    originalSize -= processed;
-    *size += processed;
-    if (!res)
-      return GetLastError();
-    if (processed == 0)
-      break;
-  }
-  while (originalSize > 0);
-  return 0;
-
-  #else
-
-  *size = fwrite(data, 1, originalSize, p->file);
-  if (*size == originalSize)
-    return 0;
-  return ferror(p->file);
-  
-  #endif
-}
-
-WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin)
-{
-  #ifdef USE_WINDOWS_FILE
-
-  LARGE_INTEGER value;
-  DWORD moveMethod;
-  value.LowPart = (DWORD)*pos;
-  value.HighPart = (LONG)((UInt64)*pos >> 16 >> 16); /* for case when UInt64 is 32-bit only */
-  switch (origin)
-  {
-    case SZ_SEEK_SET: moveMethod = FILE_BEGIN; break;
-    case SZ_SEEK_CUR: moveMethod = FILE_CURRENT; break;
-    case SZ_SEEK_END: moveMethod = FILE_END; break;
-    default: return ERROR_INVALID_PARAMETER;
-  }
-  value.LowPart = SetFilePointer(p->handle, value.LowPart, &value.HighPart, moveMethod);
-  if (value.LowPart == 0xFFFFFFFF)
-  {
-    WRes res = GetLastError();
-    if (res != NO_ERROR)
-      return res;
-  }
-  *pos = ((Int64)value.HighPart << 32) | value.LowPart;
-  return 0;
-
-  #else
-  
-  int moveMethod;
-  int res;
-  switch (origin)
-  {
-    case SZ_SEEK_SET: moveMethod = SEEK_SET; break;
-    case SZ_SEEK_CUR: moveMethod = SEEK_CUR; break;
-    case SZ_SEEK_END: moveMethod = SEEK_END; break;
-    default: return 1;
-  }
-  res = fseek(p->file, (long)*pos, moveMethod);
-  *pos = ftell(p->file);
-  return res;
-  
-  #endif
-}
-
-WRes File_GetLength(CSzFile *p, UInt64 *length)
-{
-  #ifdef USE_WINDOWS_FILE
-  
-  DWORD sizeHigh;
-  DWORD sizeLow = GetFileSize(p->handle, &sizeHigh);
-  if (sizeLow == 0xFFFFFFFF)
-  {
-    DWORD res = GetLastError();
-    if (res != NO_ERROR)
-      return res;
-  }
-  *length = (((UInt64)sizeHigh) << 32) + sizeLow;
-  return 0;
-  
-  #else
-  
-  long pos = ftell(p->file);
-  int res = fseek(p->file, 0, SEEK_END);
-  *length = ftell(p->file);
-  fseek(p->file, pos, SEEK_SET);
-  return res;
-  
-  #endif
-}
-
-
-/* ---------- FileSeqInStream ---------- */
-
-static SRes FileSeqInStream_Read(void *pp, void *buf, size_t *size)
-{
-  CFileSeqInStream *p = (CFileSeqInStream *)pp;
-  return File_Read(&p->file, buf, size) == 0 ? SZ_OK : SZ_ERROR_READ;
-}
-
-void FileSeqInStream_CreateVTable(CFileSeqInStream *p)
-{
-  p->s.Read = FileSeqInStream_Read;
-}
-
-
-/* ---------- FileInStream ---------- */
-
-static SRes FileInStream_Read(void *pp, void *buf, size_t *size)
-{
-  CFileInStream *p = (CFileInStream *)pp;
-  return (File_Read(&p->file, buf, size) == 0) ? SZ_OK : SZ_ERROR_READ;
-}
-
-static SRes FileInStream_Seek(void *pp, Int64 *pos, ESzSeek origin)
-{
-  CFileInStream *p = (CFileInStream *)pp;
-  return File_Seek(&p->file, pos, origin);
-}
-
-void FileInStream_CreateVTable(CFileInStream *p)
-{
-  p->s.Read = FileInStream_Read;
-  p->s.Seek = FileInStream_Seek;
-}
-
-
-/* ---------- FileOutStream ---------- */
-
-static size_t FileOutStream_Write(void *pp, const void *data, size_t size)
-{
-  CFileOutStream *p = (CFileOutStream *)pp;
-  File_Write(&p->file, data, &size);
-  return size;
-}
-
-void FileOutStream_CreateVTable(CFileOutStream *p)
-{
-  p->s.Write = FileOutStream_Write;
-}
diff --git a/extern/lzma/7zFile.h b/extern/lzma/7zFile.h
deleted file mode 100644
index fbef6837f86..00000000000
--- a/extern/lzma/7zFile.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* 7zFile.h -- File IO
-2008-11-22 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_FILE_H
-#define __7Z_FILE_H
-
-#ifdef _WIN32
-#define USE_WINDOWS_FILE
-#endif
-
-#ifdef USE_WINDOWS_FILE
-#include <windows.h>
-#else
-#include <stdio.h>
-#endif
-
-#include "Types.h"
-
-
-/* ---------- File ---------- */
-
-typedef struct
-{
-  #ifdef USE_WINDOWS_FILE
-  HANDLE handle;
-  #else
-  FILE *file;
-  #endif
-} CSzFile;
-
-void File_Construct(CSzFile *p);
-WRes InFile_Open(CSzFile *p, const char *name);
-WRes OutFile_Open(CSzFile *p, const char *name);
-WRes File_Close(CSzFile *p);
-
-/* reads max(*size, remain file's size) bytes */
-WRes File_Read(CSzFile *p, void *data, size_t *size);
-
-/* writes *size bytes */
-WRes File_Write(CSzFile *p, const void *data, size_t *size);
-
-WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin);
-WRes File_GetLength(CSzFile *p, UInt64 *length);
-
-
-/* ---------- FileInStream ---------- */
-
-typedef struct
-{
-  ISeqInStream s;
-  CSzFile file;
-} CFileSeqInStream;
-
-void FileSeqInStream_CreateVTable(CFileSeqInStream *p);
-
-
-typedef struct
-{
-  ISeekInStream s;
-  CSzFile file;
-} CFileInStream;
-
-void FileInStream_CreateVTable(CFileInStream *p);
-
-
-typedef struct
-{
-  ISeqOutStream s;
-  CSzFile file;
-} CFileOutStream;
-
-void FileOutStream_CreateVTable(CFileOutStream *p);
-
-#endif
diff --git a/extern/lzma/7zStream.c b/extern/lzma/7zStream.c
deleted file mode 100644
index 86232aa3411..00000000000
--- a/extern/lzma/7zStream.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* 7zStream.c -- 7z Stream functions
-2008-11-23 : Igor Pavlov : Public domain */
-
-#include <string.h>
-
-#include "Types.h"
-
-SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType)
-{
-  while (size != 0)
-  {
-    size_t processed = size;
-    RINOK(stream->Read(stream, buf, &processed));
-    if (processed == 0)
-      return errorType;
-    buf = (void *)((Byte *)buf + processed);
-    size -= processed;
-  }
-  return SZ_OK;
-}
-
-SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size)
-{
-  return SeqInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
-}
-
-SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf)
-{
-  size_t processed = 1;
-  RINOK(stream->Read(stream, buf, &processed));
-  return (processed == 1) ? SZ_OK : SZ_ERROR_INPUT_EOF;
-}
-
-SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset)
-{
-  Int64 t = offset;
-  return stream->Seek(stream, &t, SZ_SEEK_SET);
-}
-
-SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size)
-{
-  void *lookBuf;
-  if (*size == 0)
-    return SZ_OK;
-  RINOK(stream->Look(stream, &lookBuf, size));
-  memcpy(buf, lookBuf, *size);
-  return stream->Skip(stream, *size);
-}
-
-SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType)
-{
-  while (size != 0)
-  {
-    size_t processed = size;
-    RINOK(stream->Read(stream, buf, &processed));
-    if (processed == 0)
-      return errorType;
-    buf = (void *)((Byte *)buf + processed);
-    size -= processed;
-  }
-  return SZ_OK;
-}
-
-SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size)
-{
-  return LookInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
-}
-
-static SRes LookToRead_Look_Lookahead(void *pp, void **buf, size_t *size)
-{
-  SRes res = SZ_OK;
-  CLookToRead *p = (CLookToRead *)pp;
-  size_t size2 = p->size - p->pos;
-  if (size2 == 0 && *size > 0)
-  {
-    p->pos = 0;
-    size2 = LookToRead_BUF_SIZE;
-    res = p->realStream->Read(p->realStream, p->buf, &size2);
-    p->size = size2;
-  }
-  if (size2 < *size)
-    *size = size2;
-  *buf = p->buf + p->pos;
-  return res;
-}
-
-static SRes LookToRead_Look_Exact(void *pp, void **buf, size_t *size)
-{
-  SRes res = SZ_OK;
-  CLookToRead *p = (CLookToRead *)pp;
-  size_t size2 = p->size - p->pos;
-  if (size2 == 0 && *size > 0)
-  {
-    p->pos = 0;
-    if (*size > LookToRead_BUF_SIZE)
-      *size = LookToRead_BUF_SIZE;
-    res = p->realStream->Read(p->realStream, p->buf, size);
-    size2 = p->size = *size;
-  }
-  if (size2 < *size)
-    *size = size2;
-  *buf = p->buf + p->pos;
-  return res;
-}
-
-static SRes LookToRead_Skip(void *pp, size_t offset)
-{
-  CLookToRead *p = (CLookToRead *)pp;
-  p->pos += offset;
-  return SZ_OK;
-}
-
-static SRes LookToRead_Read(void *pp, void *buf, size_t *size)
-{
-  CLookToRead *p = (CLookToRead *)pp;
-  size_t rem = p->size - p->pos;
-  if (rem == 0)
-    return p->realStream->Read(p->realStream, buf, size);
-  if (rem > *size)
-    rem = *size;
-  memcpy(buf, p->buf + p->pos, rem);
-  p->pos += rem;
-  *size = rem;
-  return SZ_OK;
-}
-
-static SRes LookToRead_Seek(void *pp, Int64 *pos, ESzSeek origin)
-{
-  CLookToRead *p = (CLookToRead *)pp;
-  p->pos = p->size = 0;
-  return p->realStream->Seek(p->realStream, pos, origin);
-}
-
-void LookToRead_CreateVTable(CLookToRead *p, int lookahead)
-{
-  p->s.Look = lookahead ?
-      LookToRead_Look_Lookahead :
-      LookToRead_Look_Exact;
-  p->s.Skip = LookToRead_Skip;
-  p->s.Read = LookToRead_Read;
-  p->s.Seek = LookToRead_Seek;
-}
-
-void LookToRead_Init(CLookToRead *p)
-{
-  p->pos = p->size = 0;
-}
-
-static SRes SecToLook_Read(void *pp, void *buf, size_t *size)
-{
-  CSecToLook *p = (CSecToLook *)pp;
-  return LookInStream_LookRead(p->realStream, buf, size);
-}
-
-void SecToLook_CreateVTable(CSecToLook *p)
-{
-  p->s.Read = SecToLook_Read;
-}
-
-static SRes SecToRead_Read(void *pp, void *buf, size_t *size)
-{
-  CSecToRead *p = (CSecToRead *)pp;
-  return p->realStream->Read(p->realStream, buf, size);
-}
-
-void SecToRead_CreateVTable(CSecToRead *p)
-{
-  p->s.Read = SecToRead_Read;
-}
diff --git a/extern/lzma/7zVersion.h b/extern/lzma/7zVersion.h
deleted file mode 100644
index b7eb235548f..00000000000
--- a/extern/lzma/7zVersion.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define MY_VER_MAJOR 4
-#define MY_VER_MINOR 65
-#define MY_VER_BUILD 0
-#define MY_VERSION "4.65"
-#define MY_DATE "2009-02-03"
-#define MY_COPYRIGHT ": Igor Pavlov : Public domain"
-#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE
diff --git a/extern/lzma/Bcj2.c b/extern/lzma/Bcj2.c
deleted file mode 100644
index 20199ce5659..00000000000
--- a/extern/lzma/Bcj2.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Bcj2.c -- Converter for x86 code (BCJ2)
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bcj2.h"
-
-#ifdef _LZMA_PROB32
-#define CProb UInt32
-#else
-#define CProb UInt16
-#endif
-
-#define IsJcc(b0, b1) ((b0) == 0x0F && ((b1) & 0xF0) == 0x80)
-#define IsJ(b0, b1) ((b1 & 0xFE) == 0xE8 || IsJcc(b0, b1))
-
-#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << kNumTopBits)
-
-#define kNumBitModelTotalBits 11
-#define kBitModelTotal (1 << kNumBitModelTotalBits)
-#define kNumMoveBits 5
-
-#define RC_READ_BYTE (*buffer++)
-#define RC_TEST { if (buffer == bufferLim) return SZ_ERROR_DATA; }
-#define RC_INIT2 code = 0; range = 0xFFFFFFFF; \
-  { int i; for (i = 0; i < 5; i++) { RC_TEST; code = (code << 8) | RC_READ_BYTE; }}
-
-#define NORMALIZE if (range < kTopValue) { RC_TEST; range <<= 8; code = (code << 8) | RC_READ_BYTE; }
-
-#define IF_BIT_0(p) ttt = *(p); bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-#define UPDATE_0(p) range = bound; *(p) = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); NORMALIZE;
-#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CProb)(ttt - (ttt >> kNumMoveBits)); NORMALIZE;
-
-int Bcj2_Decode(
-    const Byte *buf0, SizeT size0,
-    const Byte *buf1, SizeT size1,
-    const Byte *buf2, SizeT size2,
-    const Byte *buf3, SizeT size3,
-    Byte *outBuf, SizeT outSize)
-{
-  CProb p[256 + 2];
-  SizeT inPos = 0, outPos = 0;
-
-  const Byte *buffer, *bufferLim;
-  UInt32 range, code;
-  Byte prevByte = 0;
-
-  unsigned int i;
-  for (i = 0; i < sizeof(p) / sizeof(p[0]); i++)
-    p[i] = kBitModelTotal >> 1;
-
-  buffer = buf3;
-  bufferLim = buffer + size3;
-  RC_INIT2
-
-  if (outSize == 0)
-    return SZ_OK;
-
-  for (;;)
-  {
-    Byte b;
-    CProb *prob;
-    UInt32 bound;
-    UInt32 ttt;
-
-    SizeT limit = size0 - inPos;
-    if (outSize - outPos < limit)
-      limit = outSize - outPos;
-    while (limit != 0)
-    {
-      Byte b = buf0[inPos];
-      outBuf[outPos++] = b;
-      if (IsJ(prevByte, b))
-        break;
-      inPos++;
-      prevByte = b;
-      limit--;
-    }
-
-    if (limit == 0 || outPos == outSize)
-      break;
-
-    b = buf0[inPos++];
-
-    if (b == 0xE8)
-      prob = p + prevByte;
-    else if (b == 0xE9)
-      prob = p + 256;
-    else
-      prob = p + 257;
-
-    IF_BIT_0(prob)
-    {
-      UPDATE_0(prob)
-      prevByte = b;
-    }
-    else
-    {
-      UInt32 dest;
-      const Byte *v;
-      UPDATE_1(prob)
-      if (b == 0xE8)
-      {
-        v = buf1;
-        if (size1 < 4)
-          return SZ_ERROR_DATA;
-        buf1 += 4;
-        size1 -= 4;
-      }
-      else
-      {
-        v = buf2;
-        if (size2 < 4)
-          return SZ_ERROR_DATA;
-        buf2 += 4;
-        size2 -= 4;
-      }
-      dest = (((UInt32)v[0] << 24) | ((UInt32)v[1] << 16) |
-          ((UInt32)v[2] << 8) | ((UInt32)v[3])) - ((UInt32)outPos + 4);
-      outBuf[outPos++] = (Byte)dest;
-      if (outPos == outSize)
-        break;
-      outBuf[outPos++] = (Byte)(dest >> 8);
-      if (outPos == outSize)
-        break;
-      outBuf[outPos++] = (Byte)(dest >> 16);
-      if (outPos == outSize)
-        break;
-      outBuf[outPos++] = prevByte = (Byte)(dest >> 24);
-    }
-  }
-  return (outPos == outSize) ? SZ_OK : SZ_ERROR_DATA;
-}
diff --git a/extern/lzma/Bcj2.h b/extern/lzma/Bcj2.h
deleted file mode 100644
index 32d450b3b99..00000000000
--- a/extern/lzma/Bcj2.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Bcj2.h -- Converter for x86 code (BCJ2)
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __BCJ2_H
-#define __BCJ2_H
-
-#include "Types.h"
-
-/*
-Conditions:
-  outSize <= FullOutputSize,
-  where FullOutputSize is full size of output stream of x86_2 filter.
-
-If buf0 overlaps outBuf, there are two required conditions:
-  1) (buf0 >= outBuf)
-  2) (buf0 + size0 >= outBuf + FullOutputSize).
-
-Returns:
-  SZ_OK
-  SZ_ERROR_DATA - Data error
-*/
-
-int Bcj2_Decode(
-    const Byte *buf0, SizeT size0,
-    const Byte *buf1, SizeT size1,
-    const Byte *buf2, SizeT size2,
-    const Byte *buf3, SizeT size3,
-    Byte *outBuf, SizeT outSize);
-
-#endif
diff --git a/extern/lzma/Bra.c b/extern/lzma/Bra.c
deleted file mode 100644
index 5e5469592db..00000000000
--- a/extern/lzma/Bra.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Bra.c -- Converters for RISC code
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bra.h"
-
-SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-{
-  SizeT i;
-  if (size < 4)
-    return 0;
-  size -= 4;
-  ip += 8;
-  for (i = 0; i <= size; i += 4)
-  {
-    if (data[i + 3] == 0xEB)
-    {
-      UInt32 dest;
-      UInt32 src = ((UInt32)data[i + 2] << 16) | ((UInt32)data[i + 1] << 8) | (data[i + 0]);
-      src <<= 2;
-      if (encoding)
-        dest = ip + (UInt32)i + src;
-      else
-        dest = src - (ip + (UInt32)i);
-      dest >>= 2;
-      data[i + 2] = (Byte)(dest >> 16);
-      data[i + 1] = (Byte)(dest >> 8);
-      data[i + 0] = (Byte)dest;
-    }
-  }
-  return i;
-}
-
-SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-{
-  SizeT i;
-  if (size < 4)
-    return 0;
-  size -= 4;
-  ip += 4;
-  for (i = 0; i <= size; i += 2)
-  {
-    if ((data[i + 1] & 0xF8) == 0xF0 &&
-        (data[i + 3] & 0xF8) == 0xF8)
-    {
-      UInt32 dest;
-      UInt32 src =
-        (((UInt32)data[i + 1] & 0x7) << 19) |
-        ((UInt32)data[i + 0] << 11) |
-        (((UInt32)data[i + 3] & 0x7) << 8) |
-        (data[i + 2]);
-      
-      src <<= 1;
-      if (encoding)
-        dest = ip + (UInt32)i + src;
-      else
-        dest = src - (ip + (UInt32)i);
-      dest >>= 1;
-      
-      data[i + 1] = (Byte)(0xF0 | ((dest >> 19) & 0x7));
-      data[i + 0] = (Byte)(dest >> 11);
-      data[i + 3] = (Byte)(0xF8 | ((dest >> 8) & 0x7));
-      data[i + 2] = (Byte)dest;
-      i += 2;
-    }
-  }
-  return i;
-}
-
-SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-{
-  SizeT i;
-  if (size < 4)
-    return 0;
-  size -= 4;
-  for (i = 0; i <= size; i += 4)
-  {
-    if ((data[i] >> 2) == 0x12 && (data[i + 3] & 3) == 1)
-    {
-      UInt32 src = ((UInt32)(data[i + 0] & 3) << 24) |
-        ((UInt32)data[i + 1] << 16) |
-        ((UInt32)data[i + 2] << 8) |
-        ((UInt32)data[i + 3] & (~3));
-      
-      UInt32 dest;
-      if (encoding)
-        dest = ip + (UInt32)i + src;
-      else
-        dest = src - (ip + (UInt32)i);
-      data[i + 0] = (Byte)(0x48 | ((dest >> 24) &  0x3));
-      data[i + 1] = (Byte)(dest >> 16);
-      data[i + 2] = (Byte)(dest >> 8);
-      data[i + 3] &= 0x3;
-      data[i + 3] |= dest;
-    }
-  }
-  return i;
-}
-
-SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-{
-  UInt32 i;
-  if (size < 4)
-    return 0;
-  size -= 4;
-  for (i = 0; i <= size; i += 4)
-  {
-    if (data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00 ||
-        data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0)
-    {
-      UInt32 src =
-        ((UInt32)data[i + 0] << 24) |
-        ((UInt32)data[i + 1] << 16) |
-        ((UInt32)data[i + 2] << 8) |
-        ((UInt32)data[i + 3]);
-      UInt32 dest;
-      
-      src <<= 2;
-      if (encoding)
-        dest = ip + i + src;
-      else
-        dest = src - (ip + i);
-      dest >>= 2;
-      
-      dest = (((0 - ((dest >> 22) & 1)) << 22) & 0x3FFFFFFF) | (dest & 0x3FFFFF) | 0x40000000;
-
-      data[i + 0] = (Byte)(dest >> 24);
-      data[i + 1] = (Byte)(dest >> 16);
-      data[i + 2] = (Byte)(dest >> 8);
-      data[i + 3] = (Byte)dest;
-    }
-  }
-  return i;
-}
diff --git a/extern/lzma/Bra.h b/extern/lzma/Bra.h
deleted file mode 100644
index 45e231e8496..00000000000
--- a/extern/lzma/Bra.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Bra.h -- Branch converters for executables
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __BRA_H
-#define __BRA_H
-
-#include "Types.h"
-
-/*
-These functions convert relative addresses to absolute addresses
-in CALL instructions to increase the compression ratio.
-  
-  In:
-    data     - data buffer
-    size     - size of data
-    ip       - current virtual Instruction Pinter (IP) value
-    state    - state variable for x86 converter
-    encoding - 0 (for decoding), 1 (for encoding)
-  
-  Out:
-    state    - state variable for x86 converter
-
-  Returns:
-    The number of processed bytes. If you call these functions with multiple calls,
-    you must start next call with first byte after block of processed bytes.
-  
-  Type   Endian  Alignment  LookAhead
-  
-  x86    little      1          4
-  ARMT   little      2          2
-  ARM    little      4          0
-  PPC     big        4          0
-  SPARC   big        4          0
-  IA64   little     16          0
-
-  size must be >= Alignment + LookAhead, if it's not last block.
-  If (size < Alignment + LookAhead), converter returns 0.
-
-  Example:
-
-    UInt32 ip = 0;
-    for ()
-    {
-      ; size must be >= Alignment + LookAhead, if it's not last block
-      SizeT processed = Convert(data, size, ip, 1);
-      data += processed;
-      size -= processed;
-      ip += processed;
-    }
-*/
-
-#define x86_Convert_Init(state) { state = 0; }
-SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding);
-SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
-SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
-SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
-SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
-SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
-
-#endif
diff --git a/extern/lzma/Bra86.c b/extern/lzma/Bra86.c
deleted file mode 100644
index 1ee0e709b88..00000000000
--- a/extern/lzma/Bra86.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Bra86.c -- Converter for x86 code (BCJ)
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bra.h"
-
-#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)
-
-const Byte kMaskToAllowedStatus[8] = {1, 1, 1, 0, 1, 0, 0, 0};
-const Byte kMaskToBitNumber[8] = {0, 1, 2, 2, 3, 3, 3, 3};
-
-SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding)
-{
-  SizeT bufferPos = 0, prevPosT;
-  UInt32 prevMask = *state & 0x7;
-  if (size < 5)
-    return 0;
-  ip += 5;
-  prevPosT = (SizeT)0 - 1;
-
-  for (;;)
-  {
-    Byte *p = data + bufferPos;
-    Byte *limit = data + size - 4;
-    for (; p < limit; p++)
-      if ((*p & 0xFE) == 0xE8)
-        break;
-    bufferPos = (SizeT)(p - data);
-    if (p >= limit)
-      break;
-    prevPosT = bufferPos - prevPosT;
-    if (prevPosT > 3)
-      prevMask = 0;
-    else
-    {
-      prevMask = (prevMask << ((int)prevPosT - 1)) & 0x7;
-      if (prevMask != 0)
-      {
-        Byte b = p[4 - kMaskToBitNumber[prevMask]];
-        if (!kMaskToAllowedStatus[prevMask] || Test86MSByte(b))
-        {
-          prevPosT = bufferPos;
-          prevMask = ((prevMask << 1) & 0x7) | 1;
-          bufferPos++;
-          continue;
-        }
-      }
-    }
-    prevPosT = bufferPos;
-
-    if (Test86MSByte(p[4]))
-    {
-      UInt32 src = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
-      UInt32 dest;
-      for (;;)
-      {
-        Byte b;
-        int index;
-        if (encoding)
-          dest = (ip + (UInt32)bufferPos) + src;
-        else
-          dest = src - (ip + (UInt32)bufferPos);
-        if (prevMask == 0)
-          break;
-        index = kMaskToBitNumber[prevMask] * 8;
-        b = (Byte)(dest >> (24 - index));
-        if (!Test86MSByte(b))
-          break;
-        src = dest ^ ((1 << (32 - index)) - 1);
-      }
-      p[4] = (Byte)(~(((dest >> 24) & 1) - 1));
-      p[3] = (Byte)(dest >> 16);
-      p[2] = (Byte)(dest >> 8);
-      p[1] = (Byte)dest;
-      bufferPos += 5;
-    }
-    else
-    {
-      prevMask = ((prevMask << 1) & 0x7) | 1;
-      bufferPos++;
-    }
-  }
-  prevPosT = bufferPos - prevPosT;
-  *state = ((prevPosT > 3) ? 0 : ((prevMask << ((int)prevPosT - 1)) & 0x7));
-  return bufferPos;
-}
diff --git a/extern/lzma/BraIA64.c b/extern/lzma/BraIA64.c
deleted file mode 100644
index 0b4ee85bc76..00000000000
--- a/extern/lzma/BraIA64.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* BraIA64.c -- Converter for IA-64 code
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bra.h"
-
-static const Byte kBranchTable[32] =
-{
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  4, 4, 6, 6, 0, 0, 7, 7,
-  4, 4, 0, 0, 4, 4, 0, 0
-};
-
-SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-{
-  SizeT i;
-  if (size < 16)
-    return 0;
-  size -= 16;
-  for (i = 0; i <= size; i += 16)
-  {
-    UInt32 instrTemplate = data[i] & 0x1F;
-    UInt32 mask = kBranchTable[instrTemplate];
-    UInt32 bitPos = 5;
-    int slot;
-    for (slot = 0; slot < 3; slot++, bitPos += 41)
-    {
-      UInt32 bytePos, bitRes;
-      UInt64 instruction, instNorm;
-      int j;
-      if (((mask >> slot) & 1) == 0)
-        continue;
-      bytePos = (bitPos >> 3);
-      bitRes = bitPos & 0x7;
-      instruction = 0;
-      for (j = 0; j < 6; j++)
-        instruction += (UInt64)data[i + j + bytePos] << (8 * j);
-
-      instNorm = instruction >> bitRes;
-      if (((instNorm >> 37) & 0xF) == 0x5 && ((instNorm >> 9) & 0x7) == 0)
-      {
-        UInt32 src = (UInt32)((instNorm >> 13) & 0xFFFFF);
-        UInt32 dest;
-        src |= ((UInt32)(instNorm >> 36) & 1) << 20;
-        
-        src <<= 4;
-        
-        if (encoding)
-          dest = ip + (UInt32)i + src;
-        else
-          dest = src - (ip + (UInt32)i);
-        
-        dest >>= 4;
-        
-        instNorm &= ~((UInt64)(0x8FFFFF) << 13);
-        instNorm |= ((UInt64)(dest & 0xFFFFF) << 13);
-        instNorm |= ((UInt64)(dest & 0x100000) << (36 - 20));
-        
-        instruction &= (1 << bitRes) - 1;
-        instruction |= (instNorm << bitRes);
-        for (j = 0; j < 6; j++)
-          data[i + j + bytePos] = (Byte)(instruction >> (8 * j));
-      }
-    }
-  }
-  return i;
-}
diff --git a/extern/lzma/CpuArch.h b/extern/lzma/CpuArch.h
deleted file mode 100644
index 7384b0c32ae..00000000000
--- a/extern/lzma/CpuArch.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* CpuArch.h
-2008-08-05
-Igor Pavlov
-Public domain */
-
-#ifndef __CPUARCH_H
-#define __CPUARCH_H
-
-/*
-LITTLE_ENDIAN_UNALIGN means:
-  1) CPU is LITTLE_ENDIAN
-  2) it's allowed to make unaligned memory accesses
-if LITTLE_ENDIAN_UNALIGN is not defined, it means that we don't know
-about these properties of platform.
-*/
-
-#if defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) || defined(__i386__) || defined(__x86_64__)
-#define LITTLE_ENDIAN_UNALIGN
-#endif
-
-#ifdef LITTLE_ENDIAN_UNALIGN
-
-#define GetUi16(p) (*(const UInt16 *)(p))
-#define GetUi32(p) (*(const UInt32 *)(p))
-#define GetUi64(p) (*(const UInt64 *)(p))
-#define SetUi32(p, d) *(UInt32 *)(p) = (d);
-
-#else
-
-#define GetUi16(p) (((const Byte *)(p))[0] | ((UInt16)((const Byte *)(p))[1] << 8))
-
-#define GetUi32(p) ( \
-             ((const Byte *)(p))[0]        | \
-    ((UInt32)((const Byte *)(p))[1] <<  8) | \
-    ((UInt32)((const Byte *)(p))[2] << 16) | \
-    ((UInt32)((const Byte *)(p))[3] << 24))
-
-#define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte *)(p)) + 4) << 32))
-
-#define SetUi32(p, d) { UInt32 _x_ = (d); \
-    ((Byte *)(p))[0] = (Byte)_x_; \
-    ((Byte *)(p))[1] = (Byte)(_x_ >> 8); \
-    ((Byte *)(p))[2] = (Byte)(_x_ >> 16); \
-    ((Byte *)(p))[3] = (Byte)(_x_ >> 24); }
-
-#endif
-
-#if defined(LITTLE_ENDIAN_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
-
-#pragma intrinsic(_byteswap_ulong)
-#pragma intrinsic(_byteswap_uint64)
-#define GetBe32(p) _byteswap_ulong(*(const UInt32 *)(const Byte *)(p))
-#define GetBe64(p) _byteswap_uint64(*(const UInt64 *)(const Byte *)(p))
-
-#else
-
-#define GetBe32(p) ( \
-    ((UInt32)((const Byte *)(p))[0] << 24) | \
-    ((UInt32)((const Byte *)(p))[1] << 16) | \
-    ((UInt32)((const Byte *)(p))[2] <<  8) | \
-             ((const Byte *)(p))[3] )
-
-#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte *)(p)) + 4))
-
-#endif
-
-#define GetBe16(p) (((UInt16)((const Byte *)(p))[0] << 8) | ((const Byte *)(p))[1])
-
-#endif
diff --git a/extern/lzma/LzFindMt.c b/extern/lzma/LzFindMt.c
deleted file mode 100644
index b49cd76b294..00000000000
--- a/extern/lzma/LzFindMt.c
+++ /dev/null
@@ -1,793 +0,0 @@
-/* LzFindMt.c -- multithreaded Match finder for LZ algorithms
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "LzHash.h"
-
-#include "LzFindMt.h"
-
-void MtSync_Construct(CMtSync *p)
-{
-  p->wasCreated = False;
-  p->csWasInitialized = False;
-  p->csWasEntered = False;
-  Thread_Construct(&p->thread);
-  Event_Construct(&p->canStart);
-  Event_Construct(&p->wasStarted);
-  Event_Construct(&p->wasStopped);
-  Semaphore_Construct(&p->freeSemaphore);
-  Semaphore_Construct(&p->filledSemaphore);
-}
-
-void MtSync_GetNextBlock(CMtSync *p)
-{
-  if (p->needStart)
-  {
-    p->numProcessedBlocks = 1;
-    p->needStart = False;
-    p->stopWriting = False;
-    p->exit = False;
-    Event_Reset(&p->wasStarted);
-    Event_Reset(&p->wasStopped);
-
-    Event_Set(&p->canStart);
-    Event_Wait(&p->wasStarted);
-  }
-  else
-  {
-    CriticalSection_Leave(&p->cs);
-    p->csWasEntered = False;
-    p->numProcessedBlocks++;
-    Semaphore_Release1(&p->freeSemaphore);
-  }
-  Semaphore_Wait(&p->filledSemaphore);
-  CriticalSection_Enter(&p->cs);
-  p->csWasEntered = True;
-}
-
-/* MtSync_StopWriting must be called if Writing was started */
-
-void MtSync_StopWriting(CMtSync *p)
-{
-  UInt32 myNumBlocks = p->numProcessedBlocks;
-  if (!Thread_WasCreated(&p->thread) || p->needStart)
-    return;
-  p->stopWriting = True;
-  if (p->csWasEntered)
-  {
-    CriticalSection_Leave(&p->cs);
-    p->csWasEntered = False;
-  }
-  Semaphore_Release1(&p->freeSemaphore);
- 
-  Event_Wait(&p->wasStopped);
-
-  while (myNumBlocks++ != p->numProcessedBlocks)
-  {
-    Semaphore_Wait(&p->filledSemaphore);
-    Semaphore_Release1(&p->freeSemaphore);
-  }
-  p->needStart = True;
-}
-
-void MtSync_Destruct(CMtSync *p)
-{
-  if (Thread_WasCreated(&p->thread))
-  {
-    MtSync_StopWriting(p);
-    p->exit = True;
-    if (p->needStart)
-      Event_Set(&p->canStart);
-    Thread_Wait(&p->thread);
-    Thread_Close(&p->thread);
-  }
-  if (p->csWasInitialized)
-  {
-    CriticalSection_Delete(&p->cs);
-    p->csWasInitialized = False;
-  }
-
-  Event_Close(&p->canStart);
-  Event_Close(&p->wasStarted);
-  Event_Close(&p->wasStopped);
-  Semaphore_Close(&p->freeSemaphore);
-  Semaphore_Close(&p->filledSemaphore);
-
-  p->wasCreated = False;
-}
-
-#define RINOK_THREAD(x) { if ((x) != 0) return SZ_ERROR_THREAD; }
-
-static SRes MtSync_Create2(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void *), void *obj, UInt32 numBlocks)
-{
-  if (p->wasCreated)
-    return SZ_OK;
-
-  RINOK_THREAD(CriticalSection_Init(&p->cs));
-  p->csWasInitialized = True;
-
-  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canStart));
-  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStarted));
-  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStopped));
-  
-  RINOK_THREAD(Semaphore_Create(&p->freeSemaphore, numBlocks, numBlocks));
-  RINOK_THREAD(Semaphore_Create(&p->filledSemaphore, 0, numBlocks));
-
-  p->needStart = True;
-  
-  RINOK_THREAD(Thread_Create(&p->thread, startAddress, obj));
-  p->wasCreated = True;
-  return SZ_OK;
-}
-
-static SRes MtSync_Create(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void *), void *obj, UInt32 numBlocks)
-{
-  SRes res = MtSync_Create2(p, startAddress, obj, numBlocks);
-  if (res != SZ_OK)
-    MtSync_Destruct(p);
-  return res;
-}
-
-void MtSync_Init(CMtSync *p) { p->needStart = True; }
-
-#define kMtMaxValForNormalize 0xFFFFFFFF
-
-#define DEF_GetHeads2(name, v, action) \
-static void GetHeads ## name(const Byte *p, UInt32 pos, \
-UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc) \
-{ action; for (; numHeads != 0; numHeads--) { \
-const UInt32 value = (v); p++; *heads++ = pos - hash[value]; hash[value] = pos++;  } }
-
-#define DEF_GetHeads(name, v) DEF_GetHeads2(name, v, ;)
-
-DEF_GetHeads2(2,  (p[0] | ((UInt32)p[1] << 8)), hashMask = hashMask; crc = crc; )
-DEF_GetHeads(3,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8)) & hashMask)
-DEF_GetHeads(4,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5)) & hashMask)
-DEF_GetHeads(4b, (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ ((UInt32)p[3] << 16)) & hashMask)
-DEF_GetHeads(5,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5) ^ (crc[p[4]] << 3)) & hashMask)
-
-void HashThreadFunc(CMatchFinderMt *mt)
-{
-  CMtSync *p = &mt->hashSync;
-  for (;;)
-  {
-    UInt32 numProcessedBlocks = 0;
-    Event_Wait(&p->canStart);
-    Event_Set(&p->wasStarted);
-    for (;;)
-    {
-      if (p->exit)
-        return;
-      if (p->stopWriting)
-      {
-        p->numProcessedBlocks = numProcessedBlocks;
-        Event_Set(&p->wasStopped);
-        break;
-      }
-
-      {
-        CMatchFinder *mf = mt->MatchFinder;
-        if (MatchFinder_NeedMove(mf))
-        {
-          CriticalSection_Enter(&mt->btSync.cs);
-          CriticalSection_Enter(&mt->hashSync.cs);
-          {
-            const Byte *beforePtr = MatchFinder_GetPointerToCurrentPos(mf);
-            const Byte *afterPtr;
-            MatchFinder_MoveBlock(mf);
-            afterPtr = MatchFinder_GetPointerToCurrentPos(mf);
-            mt->pointerToCurPos -= beforePtr - afterPtr;
-            mt->buffer -= beforePtr - afterPtr;
-          }
-          CriticalSection_Leave(&mt->btSync.cs);
-          CriticalSection_Leave(&mt->hashSync.cs);
-          continue;
-        }
-
-        Semaphore_Wait(&p->freeSemaphore);
-
-        MatchFinder_ReadIfRequired(mf);
-        if (mf->pos > (kMtMaxValForNormalize - kMtHashBlockSize))
-        {
-          UInt32 subValue = (mf->pos - mf->historySize - 1);
-          MatchFinder_ReduceOffsets(mf, subValue);
-          MatchFinder_Normalize3(subValue, mf->hash + mf->fixedHashSize, mf->hashMask + 1);
-        }
-        {
-          UInt32 *heads = mt->hashBuf + ((numProcessedBlocks++) & kMtHashNumBlocksMask) * kMtHashBlockSize;
-          UInt32 num = mf->streamPos - mf->pos;
-          heads[0] = 2;
-          heads[1] = num;
-          if (num >= mf->numHashBytes)
-          {
-            num = num - mf->numHashBytes + 1;
-            if (num > kMtHashBlockSize - 2)
-              num = kMtHashBlockSize - 2;
-            mt->GetHeadsFunc(mf->buffer, mf->pos, mf->hash + mf->fixedHashSize, mf->hashMask, heads + 2, num, mf->crc);
-            heads[0] += num;
-          }
-          mf->pos += num;
-          mf->buffer += num;
-        }
-      }
-
-      Semaphore_Release1(&p->filledSemaphore);
-    }
-  }
-}
-
-void MatchFinderMt_GetNextBlock_Hash(CMatchFinderMt *p)
-{
-  MtSync_GetNextBlock(&p->hashSync);
-  p->hashBufPosLimit = p->hashBufPos = ((p->hashSync.numProcessedBlocks - 1) & kMtHashNumBlocksMask) * kMtHashBlockSize;
-  p->hashBufPosLimit += p->hashBuf[p->hashBufPos++];
-  p->hashNumAvail = p->hashBuf[p->hashBufPos++];
-}
-
-#define kEmptyHashValue 0
-
-/* #define MFMT_GM_INLINE */
-
-#ifdef MFMT_GM_INLINE
-
-#define NO_INLINE MY_FAST_CALL
-
-Int32 NO_INLINE GetMatchesSpecN(UInt32 lenLimit, UInt32 pos, const Byte *cur, CLzRef *son,
-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-    UInt32 *_distances, UInt32 _maxLen, const UInt32 *hash, Int32 limit, UInt32 size, UInt32 *posRes)
-{
-  do
-  {
-  UInt32 *distances = _distances + 1;
-  UInt32 curMatch = pos - *hash++;
-
-  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-  UInt32 len0 = 0, len1 = 0;
-  UInt32 cutValue = _cutValue;
-  UInt32 maxLen = _maxLen;
-  for (;;)
-  {
-    UInt32 delta = pos - curMatch;
-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-    {
-      *ptr0 = *ptr1 = kEmptyHashValue;
-      break;
-    }
-    {
-      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-      const Byte *pb = cur - delta;
-      UInt32 len = (len0 < len1 ? len0 : len1);
-      if (pb[len] == cur[len])
-      {
-        if (++len != lenLimit && pb[len] == cur[len])
-          while (++len != lenLimit)
-            if (pb[len] != cur[len])
-              break;
-        if (maxLen < len)
-        {
-          *distances++ = maxLen = len;
-          *distances++ = delta - 1;
-          if (len == lenLimit)
-          {
-            *ptr1 = pair[0];
-            *ptr0 = pair[1];
-            break;
-          }
-        }
-      }
-      if (pb[len] < cur[len])
-      {
-        *ptr1 = curMatch;
-        ptr1 = pair + 1;
-        curMatch = *ptr1;
-        len1 = len;
-      }
-      else
-      {
-        *ptr0 = curMatch;
-        ptr0 = pair;
-        curMatch = *ptr0;
-        len0 = len;
-      }
-    }
-  }
-  pos++;
-  _cyclicBufferPos++;
-  cur++;
-  {
-    UInt32 num = (UInt32)(distances - _distances);
-    *_distances = num - 1;
-    _distances += num;
-    limit -= num;
-  }
-  }
-  while (limit > 0 && --size != 0);
-  *posRes = pos;
-  return limit;
-}
-
-#endif
-
-void BtGetMatches(CMatchFinderMt *p, UInt32 *distances)
-{
-  UInt32 numProcessed = 0;
-  UInt32 curPos = 2;
-  UInt32 limit = kMtBtBlockSize - (p->matchMaxLen * 2);
-  distances[1] = p->hashNumAvail;
-  while (curPos < limit)
-  {
-    if (p->hashBufPos == p->hashBufPosLimit)
-    {
-      MatchFinderMt_GetNextBlock_Hash(p);
-      distances[1] = numProcessed + p->hashNumAvail;
-      if (p->hashNumAvail >= p->numHashBytes)
-        continue;
-      for (; p->hashNumAvail != 0; p->hashNumAvail--)
-        distances[curPos++] = 0;
-      break;
-    }
-    {
-      UInt32 size = p->hashBufPosLimit - p->hashBufPos;
-      UInt32 lenLimit = p->matchMaxLen;
-      UInt32 pos = p->pos;
-      UInt32 cyclicBufferPos = p->cyclicBufferPos;
-      if (lenLimit >= p->hashNumAvail)
-        lenLimit = p->hashNumAvail;
-      {
-        UInt32 size2 = p->hashNumAvail - lenLimit + 1;
-        if (size2 < size)
-          size = size2;
-        size2 = p->cyclicBufferSize - cyclicBufferPos;
-        if (size2 < size)
-          size = size2;
-      }
-      #ifndef MFMT_GM_INLINE
-      while (curPos < limit && size-- != 0)
-      {
-        UInt32 *startDistances = distances + curPos;
-        UInt32 num = (UInt32)(GetMatchesSpec1(lenLimit, pos - p->hashBuf[p->hashBufPos++],
-          pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
-          startDistances + 1, p->numHashBytes - 1) - startDistances);
-        *startDistances = num - 1;
-        curPos += num;
-        cyclicBufferPos++;
-        pos++;
-        p->buffer++;
-      }
-      #else
-      {
-        UInt32 posRes;
-        curPos = limit - GetMatchesSpecN(lenLimit, pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
-          distances + curPos, p->numHashBytes - 1, p->hashBuf + p->hashBufPos, (Int32)(limit - curPos) , size, &posRes);
-        p->hashBufPos += posRes - pos;
-        cyclicBufferPos += posRes - pos;
-        p->buffer += posRes - pos;
-        pos = posRes;
-      }
-      #endif
-
-      numProcessed += pos - p->pos;
-      p->hashNumAvail -= pos - p->pos;
-      p->pos = pos;
-      if (cyclicBufferPos == p->cyclicBufferSize)
-        cyclicBufferPos = 0;
-      p->cyclicBufferPos = cyclicBufferPos;
-    }
-  }
-  distances[0] = curPos;
-}
-
-void BtFillBlock(CMatchFinderMt *p, UInt32 globalBlockIndex)
-{
-  CMtSync *sync = &p->hashSync;
-  if (!sync->needStart)
-  {
-    CriticalSection_Enter(&sync->cs);
-    sync->csWasEntered = True;
-  }
-  
-  BtGetMatches(p, p->btBuf + (globalBlockIndex & kMtBtNumBlocksMask) * kMtBtBlockSize);
-
-  if (p->pos > kMtMaxValForNormalize - kMtBtBlockSize)
-  {
-    UInt32 subValue = p->pos - p->cyclicBufferSize;
-    MatchFinder_Normalize3(subValue, p->son, p->cyclicBufferSize * 2);
-    p->pos -= subValue;
-  }
-
-  if (!sync->needStart)
-  {
-    CriticalSection_Leave(&sync->cs);
-    sync->csWasEntered = False;
-  }
-}
-
-void BtThreadFunc(CMatchFinderMt *mt)
-{
-  CMtSync *p = &mt->btSync;
-  for (;;)
-  {
-    UInt32 blockIndex = 0;
-    Event_Wait(&p->canStart);
-    Event_Set(&p->wasStarted);
-    for (;;)
-    {
-      if (p->exit)
-        return;
-      if (p->stopWriting)
-      {
-        p->numProcessedBlocks = blockIndex;
-        MtSync_StopWriting(&mt->hashSync);
-        Event_Set(&p->wasStopped);
-        break;
-      }
-      Semaphore_Wait(&p->freeSemaphore);
-      BtFillBlock(mt, blockIndex++);
-      Semaphore_Release1(&p->filledSemaphore);
-    }
-  }
-}
-
-void MatchFinderMt_Construct(CMatchFinderMt *p)
-{
-  p->hashBuf = 0;
-  MtSync_Construct(&p->hashSync);
-  MtSync_Construct(&p->btSync);
-}
-
-void MatchFinderMt_FreeMem(CMatchFinderMt *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->hashBuf);
-  p->hashBuf = 0;
-}
-
-void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAlloc *alloc)
-{
-  MtSync_Destruct(&p->hashSync);
-  MtSync_Destruct(&p->btSync);
-  MatchFinderMt_FreeMem(p, alloc);
-}
-
-#define kHashBufferSize (kMtHashBlockSize * kMtHashNumBlocks)
-#define kBtBufferSize (kMtBtBlockSize * kMtBtNumBlocks)
-
-static unsigned MY_STD_CALL HashThreadFunc2(void *p) { HashThreadFunc((CMatchFinderMt *)p);  return 0; }
-static unsigned MY_STD_CALL BtThreadFunc2(void *p)
-{
-  Byte allocaDummy[0x180];
-  int i = 0;
-  for (i = 0; i < 16; i++)
-    allocaDummy[i] = (Byte)i;
-  BtThreadFunc((CMatchFinderMt *)p);
-  return 0;
-}
-
-SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
-    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc)
-{
-  CMatchFinder *mf = p->MatchFinder;
-  p->historySize = historySize;
-  if (kMtBtBlockSize <= matchMaxLen * 4)
-    return SZ_ERROR_PARAM;
-  if (p->hashBuf == 0)
-  {
-    p->hashBuf = (UInt32 *)alloc->Alloc(alloc, (kHashBufferSize + kBtBufferSize) * sizeof(UInt32));
-    if (p->hashBuf == 0)
-      return SZ_ERROR_MEM;
-    p->btBuf = p->hashBuf + kHashBufferSize;
-  }
-  keepAddBufferBefore += (kHashBufferSize + kBtBufferSize);
-  keepAddBufferAfter += kMtHashBlockSize;
-  if (!MatchFinder_Create(mf, historySize, keepAddBufferBefore, matchMaxLen, keepAddBufferAfter, alloc))
-    return SZ_ERROR_MEM;
-
-  RINOK(MtSync_Create(&p->hashSync, HashThreadFunc2, p, kMtHashNumBlocks));
-  RINOK(MtSync_Create(&p->btSync, BtThreadFunc2, p, kMtBtNumBlocks));
-  return SZ_OK;
-}
-
-/* Call it after ReleaseStream / SetStream */
-void MatchFinderMt_Init(CMatchFinderMt *p)
-{
-  CMatchFinder *mf = p->MatchFinder;
-  p->btBufPos = p->btBufPosLimit = 0;
-  p->hashBufPos = p->hashBufPosLimit = 0;
-  MatchFinder_Init(mf);
-  p->pointerToCurPos = MatchFinder_GetPointerToCurrentPos(mf);
-  p->btNumAvailBytes = 0;
-  p->lzPos = p->historySize + 1;
-
-  p->hash = mf->hash;
-  p->fixedHashSize = mf->fixedHashSize;
-  p->crc = mf->crc;
-
-  p->son = mf->son;
-  p->matchMaxLen = mf->matchMaxLen;
-  p->numHashBytes = mf->numHashBytes;
-  p->pos = mf->pos;
-  p->buffer = mf->buffer;
-  p->cyclicBufferPos = mf->cyclicBufferPos;
-  p->cyclicBufferSize = mf->cyclicBufferSize;
-  p->cutValue = mf->cutValue;
-}
-
-/* ReleaseStream is required to finish multithreading */
-void MatchFinderMt_ReleaseStream(CMatchFinderMt *p)
-{
-  MtSync_StopWriting(&p->btSync);
-  /* p->MatchFinder->ReleaseStream(); */
-}
-
-void MatchFinderMt_Normalize(CMatchFinderMt *p)
-{
-  MatchFinder_Normalize3(p->lzPos - p->historySize - 1, p->hash, p->fixedHashSize);
-  p->lzPos = p->historySize + 1;
-}
-
-void MatchFinderMt_GetNextBlock_Bt(CMatchFinderMt *p)
-{
-  UInt32 blockIndex;
-  MtSync_GetNextBlock(&p->btSync);
-  blockIndex = ((p->btSync.numProcessedBlocks - 1) & kMtBtNumBlocksMask);
-  p->btBufPosLimit = p->btBufPos = blockIndex * kMtBtBlockSize;
-  p->btBufPosLimit += p->btBuf[p->btBufPos++];
-  p->btNumAvailBytes = p->btBuf[p->btBufPos++];
-  if (p->lzPos >= kMtMaxValForNormalize - kMtBtBlockSize)
-    MatchFinderMt_Normalize(p);
-}
-
-const Byte * MatchFinderMt_GetPointerToCurrentPos(CMatchFinderMt *p)
-{
-  return p->pointerToCurPos;
-}
-
-#define GET_NEXT_BLOCK_IF_REQUIRED if (p->btBufPos == p->btBufPosLimit) MatchFinderMt_GetNextBlock_Bt(p);
-
-UInt32 MatchFinderMt_GetNumAvailableBytes(CMatchFinderMt *p)
-{
-  GET_NEXT_BLOCK_IF_REQUIRED;
-  return p->btNumAvailBytes;
-}
-
-Byte MatchFinderMt_GetIndexByte(CMatchFinderMt *p, Int32 index)
-{
-  return p->pointerToCurPos[index];
-}
-
-UInt32 * MixMatches2(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
-{
-  UInt32 hash2Value, curMatch2;
-  UInt32 *hash = p->hash;
-  const Byte *cur = p->pointerToCurPos;
-  UInt32 lzPos = p->lzPos;
-  MT_HASH2_CALC
-      
-  curMatch2 = hash[hash2Value];
-  hash[hash2Value] = lzPos;
-
-  if (curMatch2 >= matchMinPos)
-    if (cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
-    {
-      *distances++ = 2;
-      *distances++ = lzPos - curMatch2 - 1;
-    }
-  return distances;
-}
-
-UInt32 * MixMatches3(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
-{
-  UInt32 hash2Value, hash3Value, curMatch2, curMatch3;
-  UInt32 *hash = p->hash;
-  const Byte *cur = p->pointerToCurPos;
-  UInt32 lzPos = p->lzPos;
-  MT_HASH3_CALC
-
-  curMatch2 = hash[                hash2Value];
-  curMatch3 = hash[kFix3HashSize + hash3Value];
-  
-  hash[                hash2Value] =
-  hash[kFix3HashSize + hash3Value] =
-    lzPos;
-
-  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
-  {
-    distances[1] = lzPos - curMatch2 - 1;
-    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
-    {
-      distances[0] = 3;
-      return distances + 2;
-    }
-    distances[0] = 2;
-    distances += 2;
-  }
-  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
-  {
-    *distances++ = 3;
-    *distances++ = lzPos - curMatch3 - 1;
-  }
-  return distances;
-}
-
-/*
-UInt32 *MixMatches4(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
-{
-  UInt32 hash2Value, hash3Value, hash4Value, curMatch2, curMatch3, curMatch4;
-  UInt32 *hash = p->hash;
-  const Byte *cur = p->pointerToCurPos;
-  UInt32 lzPos = p->lzPos;
-  MT_HASH4_CALC
-      
-  curMatch2 = hash[                hash2Value];
-  curMatch3 = hash[kFix3HashSize + hash3Value];
-  curMatch4 = hash[kFix4HashSize + hash4Value];
-  
-  hash[                hash2Value] =
-  hash[kFix3HashSize + hash3Value] =
-  hash[kFix4HashSize + hash4Value] =
-    lzPos;
-
-  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
-  {
-    distances[1] = lzPos - curMatch2 - 1;
-    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
-    {
-      distances[0] =  (cur[(ptrdiff_t)curMatch2 - lzPos + 3] == cur[3]) ? 4 : 3;
-      return distances + 2;
-    }
-    distances[0] = 2;
-    distances += 2;
-  }
-  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
-  {
-    distances[1] = lzPos - curMatch3 - 1;
-    if (cur[(ptrdiff_t)curMatch3 - lzPos + 3] == cur[3])
-    {
-      distances[0] = 4;
-      return distances + 2;
-    }
-    distances[0] = 3;
-    distances += 2;
-  }
-
-  if (curMatch4 >= matchMinPos)
-    if (
-      cur[(ptrdiff_t)curMatch4 - lzPos] == cur[0] &&
-      cur[(ptrdiff_t)curMatch4 - lzPos + 3] == cur[3]
-      )
-    {
-      *distances++ = 4;
-      *distances++ = lzPos - curMatch4 - 1;
-    }
-  return distances;
-}
-*/
-
-#define INCREASE_LZ_POS p->lzPos++; p->pointerToCurPos++;
-
-UInt32 MatchFinderMt2_GetMatches(CMatchFinderMt *p, UInt32 *distances)
-{
-  const UInt32 *btBuf = p->btBuf + p->btBufPos;
-  UInt32 len = *btBuf++;
-  p->btBufPos += 1 + len;
-  p->btNumAvailBytes--;
-  {
-    UInt32 i;
-    for (i = 0; i < len; i += 2)
-    {
-      *distances++ = *btBuf++;
-      *distances++ = *btBuf++;
-    }
-  }
-  INCREASE_LZ_POS
-  return len;
-}
-
-UInt32 MatchFinderMt_GetMatches(CMatchFinderMt *p, UInt32 *distances)
-{
-  const UInt32 *btBuf = p->btBuf + p->btBufPos;
-  UInt32 len = *btBuf++;
-  p->btBufPos += 1 + len;
-
-  if (len == 0)
-  {
-    if (p->btNumAvailBytes-- >= 4)
-      len = (UInt32)(p->MixMatchesFunc(p, p->lzPos - p->historySize, distances) - (distances));
-  }
-  else
-  {
-    /* Condition: there are matches in btBuf with length < p->numHashBytes */
-    UInt32 *distances2;
-    p->btNumAvailBytes--;
-    distances2 = p->MixMatchesFunc(p, p->lzPos - btBuf[1], distances);
-    do
-    {
-      *distances2++ = *btBuf++;
-      *distances2++ = *btBuf++;
-    }
-    while ((len -= 2) != 0);
-    len  = (UInt32)(distances2 - (distances));
-  }
-  INCREASE_LZ_POS
-  return len;
-}
-
-#define SKIP_HEADER2  do { GET_NEXT_BLOCK_IF_REQUIRED
-#define SKIP_HEADER(n) SKIP_HEADER2 if (p->btNumAvailBytes-- >= (n)) { const Byte *cur = p->pointerToCurPos; UInt32 *hash = p->hash;
-#define SKIP_FOOTER } INCREASE_LZ_POS p->btBufPos += p->btBuf[p->btBufPos] + 1; } while (--num != 0);
-
-void MatchFinderMt0_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER2 { p->btNumAvailBytes--;
-  SKIP_FOOTER
-}
-
-void MatchFinderMt2_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER(2)
-      UInt32 hash2Value;
-      MT_HASH2_CALC
-      hash[hash2Value] = p->lzPos;
-  SKIP_FOOTER
-}
-
-void MatchFinderMt3_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER(3)
-      UInt32 hash2Value, hash3Value;
-      MT_HASH3_CALC
-      hash[kFix3HashSize + hash3Value] =
-      hash[                hash2Value] =
-        p->lzPos;
-  SKIP_FOOTER
-}
-
-/*
-void MatchFinderMt4_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER(4)
-      UInt32 hash2Value, hash3Value, hash4Value;
-      MT_HASH4_CALC
-      hash[kFix4HashSize + hash4Value] =
-      hash[kFix3HashSize + hash3Value] =
-      hash[                hash2Value] =
-        p->lzPos;
-  SKIP_FOOTER
-}
-*/
-
-void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable)
-{
-  vTable->Init = (Mf_Init_Func)MatchFinderMt_Init;
-  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinderMt_GetIndexByte;
-  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinderMt_GetNumAvailableBytes;
-  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinderMt_GetPointerToCurrentPos;
-  vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt_GetMatches;
-  switch(p->MatchFinder->numHashBytes)
-  {
-    case 2:
-      p->GetHeadsFunc = GetHeads2;
-      p->MixMatchesFunc = (Mf_Mix_Matches)0;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt0_Skip;
-      vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt2_GetMatches;
-      break;
-    case 3:
-      p->GetHeadsFunc = GetHeads3;
-      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches2;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt2_Skip;
-      break;
-    default:
-    /* case 4: */
-      p->GetHeadsFunc = p->MatchFinder->bigHash ? GetHeads4b : GetHeads4;
-      /* p->GetHeadsFunc = GetHeads4; */
-      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches3;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt3_Skip;
-      break;
-    /*
-    default:
-      p->GetHeadsFunc = GetHeads5;
-      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches4;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt4_Skip;
-      break;
-    */
-  }
-}
diff --git a/extern/lzma/LzFindMt.h b/extern/lzma/LzFindMt.h
deleted file mode 100644
index 2c7e462d592..00000000000
--- a/extern/lzma/LzFindMt.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* LzFindMt.h -- multithreaded Match finder for LZ algorithms
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __LZFINDMT_H
-#define __LZFINDMT_H
-
-#include "Threads.h"
-#include "LzFind.h"
-
-#define kMtHashBlockSize (1 << 13)
-#define kMtHashNumBlocks (1 << 3)
-#define kMtHashNumBlocksMask (kMtHashNumBlocks - 1)
-
-#define kMtBtBlockSize (1 << 14)
-#define kMtBtNumBlocks (1 << 6)
-#define kMtBtNumBlocksMask (kMtBtNumBlocks - 1)
-
-typedef struct _CMtSync
-{
-  Bool wasCreated;
-  Bool needStart;
-  Bool exit;
-  Bool stopWriting;
-
-  CThread thread;
-  CAutoResetEvent canStart;
-  CAutoResetEvent wasStarted;
-  CAutoResetEvent wasStopped;
-  CSemaphore freeSemaphore;
-  CSemaphore filledSemaphore;
-  Bool csWasInitialized;
-  Bool csWasEntered;
-  CCriticalSection cs;
-  UInt32 numProcessedBlocks;
-} CMtSync;
-
-typedef UInt32 * (*Mf_Mix_Matches)(void *p, UInt32 matchMinPos, UInt32 *distances);
-
-/* kMtCacheLineDummy must be >= size_of_CPU_cache_line */
-#define kMtCacheLineDummy 128
-
-typedef void (*Mf_GetHeads)(const Byte *buffer, UInt32 pos,
-  UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc);
-
-typedef struct _CMatchFinderMt
-{
-  /* LZ */
-  const Byte *pointerToCurPos;
-  UInt32 *btBuf;
-  UInt32 btBufPos;
-  UInt32 btBufPosLimit;
-  UInt32 lzPos;
-  UInt32 btNumAvailBytes;
-
-  UInt32 *hash;
-  UInt32 fixedHashSize;
-  UInt32 historySize;
-  const UInt32 *crc;
-
-  Mf_Mix_Matches MixMatchesFunc;
-  
-  /* LZ + BT */
-  CMtSync btSync;
-  Byte btDummy[kMtCacheLineDummy];
-
-  /* BT */
-  UInt32 *hashBuf;
-  UInt32 hashBufPos;
-  UInt32 hashBufPosLimit;
-  UInt32 hashNumAvail;
-
-  CLzRef *son;
-  UInt32 matchMaxLen;
-  UInt32 numHashBytes;
-  UInt32 pos;
-  Byte *buffer;
-  UInt32 cyclicBufferPos;
-  UInt32 cyclicBufferSize; /* it must be historySize + 1 */
-  UInt32 cutValue;
-
-  /* BT + Hash */
-  CMtSync hashSync;
-  /* Byte hashDummy[kMtCacheLineDummy]; */
-  
-  /* Hash */
-  Mf_GetHeads GetHeadsFunc;
-  CMatchFinder *MatchFinder;
-} CMatchFinderMt;
-
-void MatchFinderMt_Construct(CMatchFinderMt *p);
-void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAlloc *alloc);
-SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
-    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc);
-void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable);
-void MatchFinderMt_ReleaseStream(CMatchFinderMt *p);
-
-#endif
diff --git a/extern/lzma/Threads.c b/extern/lzma/Threads.c
deleted file mode 100644
index 4fdd69b0d5c..00000000000
--- a/extern/lzma/Threads.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Threads.c -- multithreading library
-2008-08-05
-Igor Pavlov
-Public domain */
-
-#include "Threads.h"
-#include <process.h>
-
-static WRes GetError()
-{
-  DWORD res = GetLastError();
-  return (res) ? (WRes)(res) : 1;
-}
-
-WRes HandleToWRes(HANDLE h) { return (h != 0) ? 0 : GetError(); }
-WRes BOOLToWRes(BOOL v) { return v ? 0 : GetError(); }
-
-static WRes MyCloseHandle(HANDLE *h)
-{
-  if (*h != NULL)
-    if (!CloseHandle(*h))
-      return GetError();
-  *h = NULL;
-  return 0;
-}
-
-WRes Thread_Create(CThread *thread, THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE *startAddress)(void *), LPVOID parameter)
-{
-  unsigned threadId; /* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
-  thread->handle =
-    /* CreateThread(0, 0, startAddress, parameter, 0, &threadId); */
-    (HANDLE)_beginthreadex(NULL, 0, startAddress, parameter, 0, &threadId);
-    /* maybe we must use errno here, but probably GetLastError() is also OK. */
-  return HandleToWRes(thread->handle);
-}
-
-WRes WaitObject(HANDLE h)
-{
-  return (WRes)WaitForSingleObject(h, INFINITE);
-}
-
-WRes Thread_Wait(CThread *thread)
-{
-  if (thread->handle == NULL)
-    return 1;
-  return WaitObject(thread->handle);
-}
-
-WRes Thread_Close(CThread *thread)
-{
-  return MyCloseHandle(&thread->handle);
-}
-
-WRes Event_Create(CEvent *p, BOOL manualReset, int initialSignaled)
-{
-  p->handle = CreateEvent(NULL, manualReset, (initialSignaled ? TRUE : FALSE), NULL);
-  return HandleToWRes(p->handle);
-}
-
-WRes ManualResetEvent_Create(CManualResetEvent *p, int initialSignaled)
-  { return Event_Create(p, TRUE, initialSignaled); }
-WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p)
-  { return ManualResetEvent_Create(p, 0); }
-
-WRes AutoResetEvent_Create(CAutoResetEvent *p, int initialSignaled)
-  { return Event_Create(p, FALSE, initialSignaled); }
-WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p)
-  { return AutoResetEvent_Create(p, 0); }
-
-WRes Event_Set(CEvent *p) { return BOOLToWRes(SetEvent(p->handle)); }
-WRes Event_Reset(CEvent *p) { return BOOLToWRes(ResetEvent(p->handle)); }
-WRes Event_Wait(CEvent *p) { return WaitObject(p->handle); }
-WRes Event_Close(CEvent *p) { return MyCloseHandle(&p->handle); }
-
-
-WRes Semaphore_Create(CSemaphore *p, UInt32 initiallyCount, UInt32 maxCount)
-{
-  p->handle = CreateSemaphore(NULL, (LONG)initiallyCount, (LONG)maxCount, NULL);
-  return HandleToWRes(p->handle);
-}
-
-WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount)
-{
-  return BOOLToWRes(ReleaseSemaphore(p->handle, releaseCount, previousCount));
-}
-WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 releaseCount)
-{
-  return Semaphore_Release(p, (LONG)releaseCount, NULL);
-}
-WRes Semaphore_Release1(CSemaphore *p)
-{
-  return Semaphore_ReleaseN(p, 1);
-}
-
-WRes Semaphore_Wait(CSemaphore *p) { return WaitObject(p->handle); }
-WRes Semaphore_Close(CSemaphore *p) { return MyCloseHandle(&p->handle); }
-
-WRes CriticalSection_Init(CCriticalSection *p)
-{
-  /* InitializeCriticalSection can raise only STATUS_NO_MEMORY exception */
-  __try
-  {
-    InitializeCriticalSection(p);
-    /* InitializeCriticalSectionAndSpinCount(p, 0); */
-  }
-  __except (EXCEPTION_EXECUTE_HANDLER) { return 1; }
-  return 0;
-}
-
diff --git a/extern/lzma/Threads.h b/extern/lzma/Threads.h
deleted file mode 100644
index a823e57858a..00000000000
--- a/extern/lzma/Threads.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Threads.h -- multithreading library
-2008-11-22 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_THRESDS_H
-#define __7Z_THRESDS_H
-
-#include "Types.h"
-
-typedef struct _CThread
-{
-  HANDLE handle;
-} CThread;
-
-#define Thread_Construct(thread) (thread)->handle = NULL
-#define Thread_WasCreated(thread) ((thread)->handle != NULL)
- 
-typedef unsigned THREAD_FUNC_RET_TYPE;
-#define THREAD_FUNC_CALL_TYPE MY_STD_CALL
-#define THREAD_FUNC_DECL THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE
-
-WRes Thread_Create(CThread *thread, THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE *startAddress)(void *), LPVOID parameter);
-WRes Thread_Wait(CThread *thread);
-WRes Thread_Close(CThread *thread);
-
-typedef struct _CEvent
-{
-  HANDLE handle;
-} CEvent;
-
-typedef CEvent CAutoResetEvent;
-typedef CEvent CManualResetEvent;
-
-#define Event_Construct(event) (event)->handle = NULL
-#define Event_IsCreated(event) ((event)->handle != NULL)
-
-WRes ManualResetEvent_Create(CManualResetEvent *event, int initialSignaled);
-WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *event);
-WRes AutoResetEvent_Create(CAutoResetEvent *event, int initialSignaled);
-WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *event);
-WRes Event_Set(CEvent *event);
-WRes Event_Reset(CEvent *event);
-WRes Event_Wait(CEvent *event);
-WRes Event_Close(CEvent *event);
-
-
-typedef struct _CSemaphore
-{
-  HANDLE handle;
-} CSemaphore;
-
-#define Semaphore_Construct(p) (p)->handle = NULL
-
-WRes Semaphore_Create(CSemaphore *p, UInt32 initiallyCount, UInt32 maxCount);
-WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num);
-WRes Semaphore_Release1(CSemaphore *p);
-WRes Semaphore_Wait(CSemaphore *p);
-WRes Semaphore_Close(CSemaphore *p);
-
-
-typedef CRITICAL_SECTION CCriticalSection;
-
-WRes CriticalSection_Init(CCriticalSection *p);
-#define CriticalSection_Delete(p) DeleteCriticalSection(p)
-#define CriticalSection_Enter(p) EnterCriticalSection(p)
-#define CriticalSection_Leave(p) LeaveCriticalSection(p)
-
-#endif
-

From 2878eed1c125d07bcfc893eb04d1307c6aa19e3a Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 01:22:07 +0000
Subject: [PATCH 154/577] Fix Smoke: * Making it less verbose

---
 source/blender/blenkernel/intern/smoke.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 9be60a0a975..7af67364bc5 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -591,7 +591,7 @@ void smokeModifier_reset(struct SmokeModifierData *smd)
 			smd->domain->point_cache->simframe= 0;
 			smd->domain->point_cache->last_exact= 0;
 
-			printf("reset_domain\n");
+			// printf("reset_domain\n");
 		}
 		else if(smd->flow)
 		{
@@ -763,7 +763,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		float light[3] = {0.0,0.0,0.0};
 		int have_lamp = 0;
 
-		printf("smd->type & MOD_SMOKE_TYPE_DOMAIN\n");
+		// printf("smd->type & MOD_SMOKE_TYPE_DOMAIN\n");
 
 		framenr = scene->r.cfra;
 
@@ -813,7 +813,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 		/* try to read from cache */
 		cache_result = BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
-		printf("cache_result: %d\n", cache_result);
+		// printf("cache_result: %d\n", cache_result);
 
 		if(cache_result == PTCACHE_READ_EXACT) 
 		{
@@ -885,7 +885,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 		BKE_ptcache_write_cache(&pid, framenr);
 
-		printf("Writing cache_low\n");
+		// printf("Writing cache_low\n");
 	
 
 		tend();

From 7dfc1317acc63aea67d4ebd5db8d64c5bef4b8c8 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 05:13:07 +0000
Subject: [PATCH 155/577] 2.5/Paint:

* Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode.
* Refactored the paint cursor a bit, just sculpt for now but other modes soon.
* A couple warning fixes
---
 release/ui/space_view3d_toolbar.py            |   2 +-
 source/blender/blenkernel/BKE_paint.h         |   2 +-
 source/blender/blenkernel/intern/paint.c      |  13 +-
 source/blender/editors/object/object_edit.c   |  40 ++++--
 .../editors/sculpt_paint/paint_image.c        |   2 +-
 .../editors/sculpt_paint/paint_intern.h       |   4 +
 .../blender/editors/sculpt_paint/paint_ops.c  |   6 -
 .../editors/sculpt_paint/paint_stroke.c       |  76 +++++++++++
 .../editors/sculpt_paint/paint_vertex.c       | 127 +++++++++---------
 source/blender/editors/sculpt_paint/sculpt.c  |  60 ++-------
 source/blender/gpu/GPU_draw.h                 |   1 +
 source/blender/makesdna/DNA_scene_types.h     |   8 +-
 source/blender/makesrna/intern/rna_space.c    |   2 +-
 source/blender/windowmanager/WM_types.h       |   5 +
 .../windowmanager/intern/wm_operators.c       |   2 +-
 15 files changed, 207 insertions(+), 143 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 1b4c1e25c34..5d882866e96 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -429,7 +429,7 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 
 	def poll(self, context):
 		settings = self.paint_settings(context)
-		return (settings and settings.brush and context.sculpt_object)
+		return (settings and settings.brush and (context.sculpt_object or context.vertex_paint_object))
 
 	def draw(self, context):
 		settings = self.paint_settings(context)
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 67b260b2348..45d2e24c7f6 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -33,7 +33,7 @@ struct Object;
 struct Paint;
 struct Scene;
 
-void paint_init(struct Paint *p, const char *brush_name);
+void paint_init(struct Paint *p, const char *col);
 void free_paint(struct Paint *p);
 void copy_paint(struct Paint *orig, struct Paint *new);
 
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 80016f23d7c..f0893e058fa 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -154,14 +154,23 @@ int paint_facesel_test(Object *ob)
 
 }
 
-void paint_init(Paint *p, const char *name)
+void paint_init(Paint *p, const char *col)
 {
 	Brush *brush;
 
 	/* If there's no brush, create one */
 	brush = paint_brush(p);
-	brush_check_exists(&brush, name);
+	brush_check_exists(&brush, "Brush");
 	paint_brush_set(p, brush);
+
+	if(col)
+		memcpy(p->paint_cursor_col, col, 3);
+	else {
+		p->paint_cursor_col[0] = 255;
+		p->paint_cursor_col[1] = 255;
+		p->paint_cursor_col[2] = 255;
+	}
+	p->paint_cursor_col[3] = 128;
 }
 
 void free_paint(Paint *paint)
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index f8d969d2462..39fd6433548 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -7073,6 +7073,25 @@ static EnumPropertyItem *object_mode_set_itemsf(bContext *C, PointerRNA *ptr, in
 	return item;
 }
 
+static const char *object_mode_op_string(int mode)
+{
+	if(mode == OB_MODE_EDIT)
+		return "OBJECT_OT_editmode_toggle";
+	if(mode == OB_MODE_SCULPT)
+		return "SCULPT_OT_sculptmode_toggle";
+	if(mode == OB_MODE_VERTEX_PAINT)
+		return "PAINT_OT_vertex_paint_toggle";
+	if(mode == OB_MODE_WEIGHT_PAINT)
+		return "PAINT_OT_weight_paint_toggle";
+	if(mode == OB_MODE_TEXTURE_PAINT)
+		return "PAINT_OT_texture_paint_toggle";
+	if(mode == OB_MODE_PARTICLE_EDIT)
+		return "PARTICLE_OT_particle_edit_toggle";
+	if(mode == OB_MODE_POSE)
+		return "OBJECT_OT_posemode_toggle";
+	return NULL;
+}
+
 static int object_mode_set_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
@@ -7081,20 +7100,13 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 	if(!ob)
 		return OPERATOR_CANCELLED;
 
-	if((mode == OB_MODE_EDIT) == !(ob->mode & OB_MODE_EDIT))
-		WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	if((mode == OB_MODE_SCULPT) == !(ob->mode & OB_MODE_SCULPT))
-		WM_operator_name_call(C, "SCULPT_OT_sculptmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	if((mode == OB_MODE_VERTEX_PAINT) == !(ob->mode & OB_MODE_VERTEX_PAINT))
-		WM_operator_name_call(C, "PAINT_OT_vertex_paint_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	if((mode == OB_MODE_WEIGHT_PAINT) == !(ob->mode & OB_MODE_WEIGHT_PAINT))
-		WM_operator_name_call(C, "PAINT_OT_weight_paint_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	if((mode == OB_MODE_TEXTURE_PAINT) == !(ob->mode & OB_MODE_TEXTURE_PAINT))
-		WM_operator_name_call(C, "PAINT_OT_texture_paint_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	if((mode == OB_MODE_PARTICLE_EDIT) == !(ob->mode & OB_MODE_PARTICLE_EDIT))
-		WM_operator_name_call(C, "PARTICLE_OT_particle_edit_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	if((mode == OB_MODE_POSE) == !(ob->mode & OB_MODE_POSE))
-		WM_operator_name_call(C, "OBJECT_OT_posemode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
+	/* Exit off current mode */
+	if(ob->mode != OB_MODE_OBJECT)
+		WM_operator_name_call(C, object_mode_op_string(ob->mode), WM_OP_EXEC_REGION_WIN, NULL);
+
+	/* Enter new mode */
+	if(mode != OB_MODE_OBJECT)
+		WM_operator_name_call(C, object_mode_op_string(mode), WM_OP_EXEC_REGION_WIN, NULL);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 465aa281e25..8a8041abbff 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -5174,7 +5174,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
 			me->mtface= CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DEFAULT,
 							 NULL, me->totface);
 
-		paint_init(&scene->toolsettings->imapaint.paint, "Brush");
+		paint_init(&scene->toolsettings->imapaint.paint, NULL);
 
 		if(U.glreslimit != 0)
 			GPU_free_images();
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 41764a70686..c6c93026c44 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -50,6 +50,10 @@ struct PaintStroke *paint_stroke_new(bContext *C, StrokeTestStart test_start,
 				     StrokeUpdateStep update_step, StrokeDone done);
 int paint_stroke_modal(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
 struct ViewContext *paint_stroke_view_context(struct PaintStroke *stroke);
+void *paint_stroke_mode_data(struct PaintStroke *stroke);
+void paint_stroke_set_mode_data(struct PaintStroke *stroke, void *mode_data);
+int paint_poll(bContext *C);
+void paint_cursor_start(struct bContext *C, int (*poll)(struct bContext *C));
 
 /* paint_vertex.c */
 void PAINT_OT_weight_paint_toggle(struct wmOperatorType *ot);
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index 63a6591d057..1ea612c0aa5 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -77,12 +77,6 @@ void BRUSH_OT_add(wmOperatorType *ot)
 	RNA_def_enum(ot->srna, "type", brush_type_items, OB_MODE_VERTEX_PAINT, "Type", "Which paint mode to create the brush for.");
 }
 
-/* Paint operators */
-static int paint_poll(bContext *C)
-{
-	return !!paint_get_active(CTX_data_scene(C));
-}
-
 /**************************** registration **********************************/
 
 void ED_operatortypes_paint(void)
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 634b82674b5..1167e011c86 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -43,6 +43,7 @@
 
 #include "BLI_arithb.h"
 
+#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
 #include "ED_screen.h"
@@ -54,6 +55,9 @@
 #include <math.h>
 
 typedef struct PaintStroke {
+	void *mode_data;
+	void *smooth_stroke_cursor;
+
 	/* Cached values */
 	ViewContext vc;
 	bglMats mats;
@@ -71,6 +75,42 @@ typedef struct PaintStroke {
 	StrokeDone done;
 } PaintStroke;
 
+/*** Cursor ***/
+static void paint_draw_smooth_stroke(bContext *C, int x, int y, void *customdata) 
+{
+	Brush *brush = paint_brush(paint_get_active(CTX_data_scene(C)));
+	PaintStroke *stroke = customdata;
+
+	glColor4ubv(paint_get_active(CTX_data_scene(C))->paint_cursor_col);
+	glEnable(GL_LINE_SMOOTH);
+	glEnable(GL_BLEND);
+
+	if(stroke && brush && (brush->flag & BRUSH_SMOOTH_STROKE)) {
+		ARegion *ar = CTX_wm_region(C);
+		sdrawline(x, y, (int)stroke->last_mouse_position[0] - ar->winrct.xmin,
+			  (int)stroke->last_mouse_position[1] - ar->winrct.ymin);
+	}
+
+	glDisable(GL_BLEND);
+	glDisable(GL_LINE_SMOOTH);
+}
+
+static void paint_draw_cursor(bContext *C, int x, int y, void *customdata)
+{
+	Brush *brush = paint_brush(paint_get_active(CTX_data_scene(C)));
+
+	glColor4ubv(paint_get_active(CTX_data_scene(C))->paint_cursor_col);
+	glEnable(GL_LINE_SMOOTH);
+	glEnable(GL_BLEND);
+
+	glTranslatef((float)x, (float)y, 0.0f);
+	glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
+	glTranslatef((float)-x, (float)-y, 0.0f);
+
+	glDisable(GL_BLEND);
+	glDisable(GL_LINE_SMOOTH);
+}
+
 /* Put the location of the next stroke dot into the stroke RNA and apply it to the mesh */
 static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *event, float mouse[2])
 {
@@ -191,6 +231,11 @@ int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 		stroke->last_mouse_position[0] = event->x;
 		stroke->last_mouse_position[1] = event->y;
 		stroke->stroke_started = stroke->test_start(C, op, event);
+
+		if(stroke->stroke_started)
+			stroke->smooth_stroke_cursor =
+				WM_paint_cursor_activate(CTX_wm_manager(C), paint_poll, paint_draw_smooth_stroke, stroke);
+
 		ED_region_tag_redraw(ar);
 	}
 
@@ -209,6 +254,9 @@ int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 
 	/* TODO: fix hardcoded event here */
 	if(event->type == LEFTMOUSE && event->val == 0) {
+		if(stroke->smooth_stroke_cursor)
+			WM_paint_cursor_end(CTX_wm_manager(C), stroke->smooth_stroke_cursor);
+
 		stroke->done(C, stroke);
 		MEM_freeN(stroke);
 		return OPERATOR_FINISHED;
@@ -222,3 +270,31 @@ ViewContext *paint_stroke_view_context(PaintStroke *stroke)
 	return &stroke->vc;
 }
 
+void *paint_stroke_mode_data(struct PaintStroke *stroke)
+{
+	return stroke->mode_data;
+}
+
+void paint_stroke_set_mode_data(PaintStroke *stroke, void *mode_data)
+{
+	stroke->mode_data = mode_data;
+}
+
+int paint_poll(bContext *C)
+{
+	Paint *p = paint_get_active(CTX_data_scene(C));
+	Object *ob = CTX_data_active_object(C);
+
+	return p && ob && paint_brush(p) &&
+		CTX_wm_area(C)->spacetype == SPACE_VIEW3D &&
+		CTX_wm_region(C)->regiontype == RGN_TYPE_WINDOW;
+}
+
+void paint_cursor_start(bContext *C, int (*poll)(bContext *C))
+{
+	Paint *p = paint_get_active(CTX_data_scene(C));
+
+	if(p && !p->paint_cursor)
+		p->paint_cursor = WM_paint_cursor_activate(CTX_wm_manager(C), poll, paint_draw_cursor, NULL);
+}
+
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 05faa47e0f4..19f0293c1b8 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -62,6 +62,7 @@
 #include "DNA_userdef_types.h"
 
 #include "RNA_access.h"
+#include "RNA_define.h"
 
 #include "BKE_armature.h"
 #include "BKE_brush.h"
@@ -91,6 +92,8 @@
 #include "ED_util.h"
 #include "ED_view3d.h"
 
+#include "paint_intern.h"
+
 	/* vp->mode */
 #define VP_MIX	0
 #define VP_ADD	1
@@ -807,7 +810,7 @@ static int sample_backbuf_area(ViewContext *vc, int *indexar, int totface, int x
 	return tot;
 }
 
-static int calc_vp_alpha_dl(VPaint *vp, ViewContext *vc, float vpimat[][3], float *vert_nor, short *mval)
+static int calc_vp_alpha_dl(VPaint *vp, ViewContext *vc, float vpimat[][3], float *vert_nor, float *mval)
 {
 	Brush *brush = paint_brush(&vp->paint);
 	float fac, dx, dy;
@@ -1124,7 +1127,7 @@ static int set_wpaint(bContext *C, wmOperator *op)		/* toggle */
 		if(wp==NULL)
 			wp= scene->toolsettings->wpaint= new_vpaint(1);
 
-		paint_init(&wp->paint, "Brush");
+		paint_init(&wp->paint, NULL);
 
 		toggle_paint_cursor(C, 1);
 		
@@ -1329,7 +1332,7 @@ static int wpaint_modal(bContext *C, wmOperator *op, wmEvent *event)
 			float paintweight= ts->vgroup_weight;
 			int *indexar= wpd->indexar;
 			int totindex, index, alpha, totw;
-			short mval[2];
+			float mval[2];
 			
 			view3d_operator_needs_opengl(C);
 			
@@ -1634,7 +1637,7 @@ static int set_vpaint(bContext *C, wmOperator *op)		/* toggle */
 		
 		toggle_paint_cursor(C, 0);
 
-		paint_init(&vp->paint, "Brush");
+		paint_init(&vp->paint, NULL);
 	}
 	
 	if (me)
@@ -1693,25 +1696,47 @@ struct VPaintData {
 	float vpimat[3][3];
 };
 
-static void vpaint_exit(bContext *C, wmOperator *op)
+static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, wmEvent *event)
 {
 	ToolSettings *ts= CTX_data_tool_settings(C);
-	struct VPaintData *vpd= op->customdata;
+	struct PaintStroke *stroke = op->customdata;
+	VPaint *vp= ts->vpaint;
+	struct VPaintData *vpd;
+	Object *ob= CTX_data_active_object(C);
+	Mesh *me;
+	float mat[4][4], imat[4][4];
+
+	/* context checks could be a poll() */
+	me= get_mesh(ob);
+	if(me==NULL || me->totface==0) return OPERATOR_PASS_THROUGH;
 	
-	if(vpd->vertexcosnos)
-		MEM_freeN(vpd->vertexcosnos);
-	MEM_freeN(vpd->indexar);
+	if(me->mcol==NULL) make_vertexcol(CTX_data_scene(C), 0);
+	if(me->mcol==NULL) return OPERATOR_CANCELLED;
 	
-	/* frees prev buffer */
-	copy_vpaint_prev(ts->vpaint, NULL, 0);
+	/* make mode data storage */
+	vpd= MEM_callocN(sizeof(struct VPaintData), "VPaintData");
+	paint_stroke_set_mode_data(stroke, vpd);
+	view3d_set_viewcontext(C, &vpd->vc);
 	
-	MEM_freeN(vpd);
-	op->customdata= NULL;
+	vpd->vertexcosnos= mesh_get_mapped_verts_nors(vpd->vc.scene, ob);
+	vpd->indexar= get_indexarray();
+	vpd->paintcol= vpaint_get_current_col(vp);
+	
+	/* for filtering */
+	copy_vpaint_prev(vp, (unsigned int *)me->mcol, me->totface);
+	
+	/* some old cruft to sort out later */
+	Mat4MulMat4(mat, ob->obmat, vpd->vc.rv3d->viewmat);
+	Mat4Invert(imat, mat);
+	Mat3CpyMat4(vpd->vpimat, imat);
+
+	return 1;
 }
 
-static void vpaint_dot(bContext *C, struct VPaintData *vpd, wmEvent *event)
+static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
 {
 	ToolSettings *ts= CTX_data_tool_settings(C);
+	struct VPaintData *vpd = paint_stroke_mode_data(stroke);
 	VPaint *vp= ts->vpaint;
 	Brush *brush = paint_brush(&vp->paint);
 	ViewContext *vc= &vpd->vc;
@@ -1720,7 +1745,9 @@ static void vpaint_dot(bContext *C, struct VPaintData *vpd, wmEvent *event)
 	float mat[4][4];
 	int *indexar= vpd->indexar;
 	int totindex, index;
-	short mval[2];
+	float mval[2];
+
+	RNA_float_get_array(itemptr, "mouse", mval);
 			
 	view3d_operator_needs_opengl(C);
 			
@@ -1728,10 +1755,11 @@ static void vpaint_dot(bContext *C, struct VPaintData *vpd, wmEvent *event)
 	wmMultMatrix(ob->obmat);
 	wmGetSingleMatrix(mat);
 	wmLoadMatrix(vc->rv3d->viewmat);
+
+	mval[0]-= vc->ar->winrct.xmin;
+	mval[1]-= vc->ar->winrct.ymin;
+
 			
-	mval[0]= event->x - vc->ar->winrct.xmin;
-	mval[1]= event->y - vc->ar->winrct.ymin;
-				
 	/* which faces are involved */
 	if(vp->flag & VP_AREA) {
 		totindex= sample_backbuf_area(vc, indexar, me->totface, mval[0], mval[1], brush->size);
@@ -1811,58 +1839,27 @@ static void vpaint_dot(bContext *C, struct VPaintData *vpd, wmEvent *event)
 	DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
 }
 
-static int vpaint_modal(bContext *C, wmOperator *op, wmEvent *event)
+static void vpaint_stroke_done(bContext *C, struct PaintStroke *stroke)
 {
-	switch(event->type) {
-	case LEFTMOUSE:
-		if(event->val==0) { /* release */
-			vpaint_exit(C, op);
-			return OPERATOR_FINISHED;
-		}
-		/* pass on, first press gets painted too */
-		
-	case MOUSEMOVE: 
-		vpaint_dot(C, op->customdata, event);
-		break;
-	}	
+	ToolSettings *ts= CTX_data_tool_settings(C);
+	struct VPaintData *vpd= paint_stroke_mode_data(stroke);
 	
-	return OPERATOR_RUNNING_MODAL;
+	if(vpd->vertexcosnos)
+		MEM_freeN(vpd->vertexcosnos);
+	MEM_freeN(vpd->indexar);
+	
+	/* frees prev buffer */
+	copy_vpaint_prev(ts->vpaint, NULL, 0);
+	
+	MEM_freeN(vpd);
 }
 
 static int vpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	ToolSettings *ts= CTX_data_tool_settings(C);
-	VPaint *vp= ts->vpaint;
-	struct VPaintData *vpd;
-	Object *ob= CTX_data_active_object(C);
-	Mesh *me;
-	float mat[4][4], imat[4][4];
 	
-	/* context checks could be a poll() */
-	me= get_mesh(ob);
-	if(me==NULL || me->totface==0) return OPERATOR_PASS_THROUGH;
-	
-	if(me->mcol==NULL) make_vertexcol(CTX_data_scene(C), 0);
-	if(me->mcol==NULL) return OPERATOR_CANCELLED;
-	
-	/* make customdata storage */
-	op->customdata= vpd= MEM_callocN(sizeof(struct VPaintData), "VPaintData");
-	view3d_set_viewcontext(C, &vpd->vc);
-	
-	vpd->vertexcosnos= mesh_get_mapped_verts_nors(vpd->vc.scene, ob);
-	vpd->indexar= get_indexarray();
-	vpd->paintcol= vpaint_get_current_col(vp);
-	
-	/* for filtering */
-	copy_vpaint_prev(vp, (unsigned int *)me->mcol, me->totface);
-	
-	/* some old cruft to sort out later */
-	Mat4MulMat4(mat, ob->obmat, vpd->vc.rv3d->viewmat);
-	Mat4Invert(imat, mat);
-	Mat3CpyMat4(vpd->vpimat, imat);
-	
-	/* do paint once for click only paint */
-	vpaint_modal(C, op, event);
+	op->customdata = paint_stroke_new(C, vpaint_stroke_test_start,
+					  vpaint_stroke_update_step,
+					  vpaint_stroke_done);
 	
 	/* add modal handler */
 	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
@@ -1878,11 +1875,13 @@ void PAINT_OT_vertex_paint(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->invoke= vpaint_invoke;
-	ot->modal= vpaint_modal;
+	ot->modal= paint_stroke_modal;
 	/* ot->exec= vpaint_exec; <-- needs stroke property */
 	ot->poll= vp_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+
+	RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index c01004f5b7e..94703dbe4ff 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1042,47 +1042,7 @@ static int sculpt_mode_poll(bContext *C)
 
 static int sculpt_poll(bContext *C)
 {
-	return sculpt_mode_poll(C) && paint_brush(&CTX_data_tool_settings(C)->sculpt->paint) &&
-		CTX_wm_area(C)->spacetype == SPACE_VIEW3D &&
-		CTX_wm_region(C)->regiontype == RGN_TYPE_WINDOW;
-}
-
-/*** Sculpt Cursor ***/
-static void draw_paint_cursor(bContext *C, int x, int y, void *customdata)
-{
-	Sculpt *sd= CTX_data_tool_settings(C)->sculpt;
-	SculptSession *ss= CTX_data_active_object(C)->sculpt;
-	Brush *brush = paint_brush(&sd->paint);
-	
-	glColor4ub(255, 100, 100, 128);
-	glEnable( GL_LINE_SMOOTH );
-	glEnable(GL_BLEND);
-
-	glTranslatef((float)x, (float)y, 0.0f);
-	glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
-	glTranslatef((float)-x, (float)-y, 0.0f);
-
-	if(ss && ss->cache && brush && (brush->flag & BRUSH_SMOOTH_STROKE)) {
-		ARegion *ar = CTX_wm_region(C);
-		sdrawline(x, y, (int)ss->cache->mouse[0] - ar->winrct.xmin, (int)ss->cache->mouse[1] - ar->winrct.ymin);
-	}
-
-	glDisable(GL_BLEND);
-	glDisable( GL_LINE_SMOOTH );
-}
-
-static void toggle_paint_cursor(bContext *C)
-{
-	Sculpt *s = CTX_data_scene(C)->toolsettings->sculpt;
-
-	if(s->cursor) {
-		WM_paint_cursor_end(CTX_wm_manager(C), s->cursor);
-		s->cursor = NULL;
-	}
-	else {
-		s->cursor =
-			WM_paint_cursor_activate(CTX_wm_manager(C), sculpt_poll, draw_paint_cursor, NULL);
-	}
+	return sculpt_mode_poll(C) && paint_poll(C);
 }
 
 static void sculpt_undo_push(bContext *C, Sculpt *sd)
@@ -1112,8 +1072,11 @@ static void sculpt_undo_push(bContext *C, Sculpt *sd)
 /**** Radial control ****/
 static int sculpt_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Brush *brush = paint_brush(&CTX_data_tool_settings(C)->sculpt->paint);
-	toggle_paint_cursor(C);
+	Paint *p = paint_get_active(CTX_data_scene(C));
+	Brush *brush = paint_brush(p);
+
+	WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
+	p->paint_cursor = NULL;
 	brush_radial_control_invoke(op, brush, 1);
 	return WM_radial_control_invoke(C, op, event);
 }
@@ -1122,7 +1085,7 @@ static int sculpt_radial_control_modal(bContext *C, wmOperator *op, wmEvent *eve
 {
 	int ret = WM_radial_control_modal(C, op, event);
 	if(ret != OPERATOR_RUNNING_MODAL)
-		toggle_paint_cursor(C);
+		paint_cursor_start(C, sculpt_poll);
 	return ret;
 }
 
@@ -1592,6 +1555,8 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *op)
 		free_sculptsession(&ob->sculpt);
 	}
 	else {
+		const char col[3] = {255, 100, 100};
+		
 		/* Enter sculptmode */
 
 		ob->mode |= OB_MODE_SCULPT;
@@ -1605,10 +1570,9 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *op)
 			free_sculptsession(&ob->sculpt);
 		ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
 
-		if(!ts->sculpt->cursor)
-			toggle_paint_cursor(C);
-
-		paint_init(&ts->sculpt->paint, "Brush");
+		paint_init(&ts->sculpt->paint, col);
+		
+		paint_cursor_start(C, sculpt_poll);
 
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE, CTX_data_scene(C));
 	}
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 1c6b8399422..00d0e3131e5 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -43,6 +43,7 @@ struct Object;
 struct Scene;
 struct View3D;
 struct RegionView3D;
+struct SmokeModifierData;
 
 /* OpenGL drawing functions related to shading. These are also
  * shared with the game engine, where there were previously
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f1a77d78b7b..9161157f597 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -455,8 +455,11 @@ typedef struct Paint {
 	Brush **brushes;
 	int active_brush_index, brush_count;
 	
-	/* WM handle */
+	/* WM Paint cursor */
 	void *paint_cursor;
+	unsigned char paint_cursor_col[4];
+
+	int pad;
 } Paint;
 
 typedef struct ImagePaintSettings {
@@ -498,9 +501,6 @@ typedef struct TransformOrientation {
 
 typedef struct Sculpt {
 	Paint paint;
-	
-	/* WM handle */
-	void *cursor;
 
 	/* For rotating around a pivot point */
 	float pivot[3];
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index be0707390c4..fb71b297683 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -151,7 +151,7 @@ static void rna_SpaceImageEditor_paint_update(bContext *C, PointerRNA *ptr)
 	Scene *scene= CTX_data_scene(C);
 
 	if(scene)
-		paint_init(&scene->toolsettings->imapaint.paint, "Brush");
+		paint_init(&scene->toolsettings->imapaint.paint, NULL);
 }
 
 static int rna_SpaceImageEditor_show_render_get(PointerRNA *ptr)
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index b717df8f61f..c400b6c9b20 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -287,6 +287,11 @@ typedef struct wmTimer {
 } wmTimer;
 
 
+/* **************** Paint Cursor ******************* */
+
+typedef void (*wmPaintCursorDraw)(struct bContext *C, int, int, void *customdata);
+
+
 /* ****************** Messages ********************* */
 
 enum {
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 2e813bac37d..304da25017b 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1067,7 +1067,7 @@ static void WM_OT_exit_blender(wmOperatorType *ot)
 */
 
 void *WM_paint_cursor_activate(wmWindowManager *wm, int (*poll)(bContext *C),
-			       void (*draw)(bContext *C, int, int, void *customdata), void *customdata)
+			       wmPaintCursorDraw draw, void *customdata)
 {
 	wmPaintCursor *pc= MEM_callocN(sizeof(wmPaintCursor), "paint cursor");
 	

From 210ef4c07c0f8fe602068bfc797ef8dd588a6204 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 05:44:32 +0000
Subject: [PATCH 156/577] 2.5/Sculpt:

* Fixed sculpt brush stroke exec (F4 operator)
* Made a generic paint stroke exec
---
 .../blender/editors/sculpt_paint/paint_intern.h   |  1 +
 .../blender/editors/sculpt_paint/paint_stroke.c   | 15 +++++++++++++++
 source/blender/editors/sculpt_paint/sculpt.c      | 14 ++++----------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index c6c93026c44..a0187566c43 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -49,6 +49,7 @@ typedef void (*StrokeDone)(struct bContext *C, struct PaintStroke *stroke);
 struct PaintStroke *paint_stroke_new(bContext *C, StrokeTestStart test_start,
 				     StrokeUpdateStep update_step, StrokeDone done);
 int paint_stroke_modal(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
+int paint_stroke_exec(struct bContext *C, struct wmOperator *op);
 struct ViewContext *paint_stroke_view_context(struct PaintStroke *stroke);
 void *paint_stroke_mode_data(struct PaintStroke *stroke);
 void paint_stroke_set_mode_data(struct PaintStroke *stroke, void *mode_data);
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 1167e011c86..715399af888 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -265,6 +265,21 @@ int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 		return OPERATOR_RUNNING_MODAL;
 }
 
+int paint_stroke_exec(bContext *C, wmOperator *op)
+{
+	PaintStroke *stroke = op->customdata;
+
+	RNA_BEGIN(op->ptr, itemptr, "stroke") {
+		stroke->update_step(C, stroke, &itemptr);
+	}
+	RNA_END;
+
+	MEM_freeN(stroke);
+	op->customdata = NULL;
+
+	return OPERATOR_FINISHED;
+}
+
 ViewContext *paint_stroke_view_context(PaintStroke *stroke)
 {
 	return &stroke->vc;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 94703dbe4ff..e0206210799 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1410,7 +1410,7 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 	do_symmetrical_brush_actions(sd, ss);
 
 	/* Cleanup */
-	sculpt_flush_update(C); // XXX: during exec, shouldn't do this every time
+	sculpt_flush_update(C);
 	sculpt_post_stroke_free(ss);
 }
 
@@ -1448,20 +1448,14 @@ static int sculpt_brush_stroke_exec(bContext *C, wmOperator *op)
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 	SculptSession *ss = CTX_data_active_object(C)->sculpt;
 
+	op->customdata = paint_stroke_new(C, sculpt_stroke_test_start, sculpt_stroke_update_step, sculpt_stroke_done);
+
 	sculpt_brush_stroke_init(C);
 
 	sculpt_update_cache_invariants(sd, ss, C, op);
 	sculptmode_update_all_projverts(ss);
 
-	RNA_BEGIN(op->ptr, itemptr, "stroke") {
-		sculpt_update_cache_variants(sd, ss, &itemptr);
-
-		sculpt_restore_mesh(sd, ss);
-		do_symmetrical_brush_actions(sd, ss);
-
-		sculpt_post_stroke_free(ss);
-	}
-	RNA_END;
+	paint_stroke_exec(C, op);
 
 	sculpt_flush_update(C);
 	sculpt_cache_free(ss->cache);

From d8cd7a22e815afd49dfb96197ed3ecd670dc8f11 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 20 Aug 2009 08:18:54 +0000
Subject: [PATCH 157/577] * a few more small cleanups

---
 source/blender/render/intern/include/texture.h     | 1 +
 source/blender/render/intern/include/volumetric.h  | 2 +-
 source/blender/render/intern/source/pointdensity.c | 4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index c254b768292..78d6a912af1 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -56,6 +56,7 @@ void do_halo_tex(struct HaloRen *har, float xn, float yn, float *colf);
 void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, float *blend, int skyflag, short thread);
 void do_material_tex(struct ShadeInput *shi);
 void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf, int effect);
+void do_volume_tex(struct ShadeInput *shi, float *xyz, int mapto_flag, float *col, float *val);
 
 void init_render_textures(Render *re);
 void end_render_textures(void);
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index 40d79e8d173..543e179bc88 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -28,7 +28,7 @@
 
 float vol_get_stepsize(struct ShadeInput *shi, int context);
 float vol_get_density(struct ShadeInput *shi, float *co);
-void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density);
+void vol_get_scattering(ShadeInput *shi, float *scatter_col, float *co, float stepsize, float density);
 
 void shade_volume_outside(ShadeInput *shi, ShadeResult *shr);
 void shade_volume_inside(ShadeInput *shi, ShadeResult *shr);
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 9a9e3de7247..fbc39b61257 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -227,10 +227,8 @@ static void cache_pointdensity(Render *re, Tex *tex)
 	}
 	
 	if (pd->source == TEX_PD_PSYS) {
-		ParticleSystem *psys;
 		Object *ob = pd->object;
-		int i;
-		
+
 		if (!ob) return;
 		if (!pd->psys) return;
 		

From e75bf81ac683cccb244c4be57b81d217d9f675db Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 08:59:09 +0000
Subject: [PATCH 158/577] Smoke: * Fix OpenGL drawing resulting (at least on
 windows) in missing panels when switching fullscreen + back

---
 .../blender/editors/space_view3d/drawvolume.c | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 221003360f4..1fd17951e8a 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -203,17 +203,14 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 	float *points = NULL;
 	int numpoints = 0;
 	float cor[3] = {1.,1.,1.};
+	int gl_depth = 0, gl_blend = 0;
 
-	/*
-	res[0] = smd->domain->res[0];
-	res[1] = smd->domain->res[1];
-	res[2] = smd->domain->res[2];
-	*/
+	glGetBooleanv(GL_BLEND, (GLboolean *)&gl_blend);
+	glGetBooleanv(GL_DEPTH_TEST, (GLboolean *)&gl_depth);
 
 	wmLoadMatrix(rv3d->viewmat);
 
 	glDepthMask(GL_FALSE);
-	glEnable(GL_TEXTURE_3D);
 	glDisable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -296,9 +293,12 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 
 	wmMultMatrix(ob->obmat);	
 
-	glDisable(GL_TEXTURE_3D);
-	glDisable(GL_BLEND);
-	glEnable(GL_DEPTH_TEST);
-	glDepthMask(GL_TRUE);	
+	if(gl_blend)
+		glDisable(GL_BLEND);
+	if(gl_depth)
+	{
+		glEnable(GL_DEPTH_TEST);
+		glDepthMask(GL_TRUE);	
+	}
 }
 

From bc4806579b3b8504ba09854f127d2a65f3dad405 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 09:00:23 +0000
Subject: [PATCH 159/577] Smoke: * Fixing my fix for opengl GL_BLEND

---
 source/blender/editors/space_view3d/drawvolume.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 1fd17951e8a..325997ebf4d 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -293,7 +293,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 
 	wmMultMatrix(ob->obmat);	
 
-	if(gl_blend)
+	if(!gl_blend)
 		glDisable(GL_BLEND);
 	if(gl_depth)
 	{

From 9f764ae36dbdf571778ec6fc8823ec7e721a2baf Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 20 Aug 2009 09:13:57 +0000
Subject: [PATCH 160/577] Smoke: * Fix for OpenGL domain
 scaling/rotating/translating reported by Wahooney

---
 source/blender/editors/space_view3d/drawvolume.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 325997ebf4d..53f193382bd 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -209,6 +209,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 	glGetBooleanv(GL_DEPTH_TEST, (GLboolean *)&gl_depth);
 
 	wmLoadMatrix(rv3d->viewmat);
+	wmMultMatrix(ob->obmat);	
 
 	glDepthMask(GL_FALSE);
 	glDisable(GL_DEPTH_TEST);
@@ -291,8 +292,6 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 
 	MEM_freeN(points);
 
-	wmMultMatrix(ob->obmat);	
-
 	if(!gl_blend)
 		glDisable(GL_BLEND);
 	if(gl_depth)

From 6dbadb23ce26967608710412e9e74396e624c597 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Thu, 20 Aug 2009 09:18:55 +0000
Subject: [PATCH 161/577] update MSVC project files.

---
 extern/lzma/make/msvc_9_0/lzma.vcproj         | 385 ++++++++++++++++++
 extern/lzo/make/msvc_9_0/lzo.vcproj           | 353 ++++++++++++++++
 intern/audaspace/jack/AUD_JackDevice.cpp      |   4 +
 intern/audaspace/jack/AUD_JackDevice.h        |   4 +
 .../audaspace/make/msvc_9_0/audaspace.vcproj  |  19 +
 intern/ghost/intern/GHOST_System.cpp          |   4 +-
 projectfiles_vc9/blender/blender.sln          |  53 +++
 .../blender/blenkernel/BKE_blenkernel.vcproj  |  24 +-
 .../blender/editors/ED_editors.vcproj         |  36 +-
 9 files changed, 870 insertions(+), 12 deletions(-)
 create mode 100644 extern/lzma/make/msvc_9_0/lzma.vcproj
 create mode 100644 extern/lzo/make/msvc_9_0/lzo.vcproj

diff --git a/extern/lzma/make/msvc_9_0/lzma.vcproj b/extern/lzma/make/msvc_9_0/lzma.vcproj
new file mode 100644
index 00000000000..ec0676f6ca6
--- /dev/null
+++ b/extern/lzma/make/msvc_9_0/lzma.vcproj
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="EXT_lzma"
+	ProjectGUID="{79D0B232-208C-F208-DA71-79B4AC088602}"
+	RootNamespace="lzma"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Blender Debug|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzma\debug"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzma\debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzma\debug\lzma.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzma\debug\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzma\debug\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzma\debug\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\debug\lzma.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Blender Release|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzma"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzma"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzma\lzma.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzma\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzma\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzma\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\lzma.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="3D Plugin Debug|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\debug"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\debug\lzma.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\debug\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\debug\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\debug\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\mtdll\debug\lzma.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="3D Plugin Release|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\lzma.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzma\mtdll\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\mtdll\lzma.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath="..\..\Alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzFind.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzmaDec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzmaEnc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzmaLib.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\..\Alloc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzFind.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzHash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzmaDec.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzmaEnc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\LzmaLib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Types.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/extern/lzo/make/msvc_9_0/lzo.vcproj b/extern/lzo/make/msvc_9_0/lzo.vcproj
new file mode 100644
index 00000000000..80516ef964e
--- /dev/null
+++ b/extern/lzo/make/msvc_9_0/lzo.vcproj
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="EXT_lzo"
+	ProjectGUID="{8BFA4082-773B-D100-BC24-659083BA023F}"
+	RootNamespace="lzo"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Blender Debug|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzo\debug"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzo\debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzo\debug\lzo.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzo\debug\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzo\debug\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzo\debug\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\debug\lzo.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Blender Release|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzo"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzo"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzo\lzo.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzo\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzo\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzo\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\lzo.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="3D Plugin Debug|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\debug"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\debug\lzo.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\debug\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\debug\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\debug\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\mtdll\debug\lzo.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="3D Plugin Release|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\lzo.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\"
+				ObjectFile="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\lzo\mtdll\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\mtdll\lzo.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath="..\..\minilzo\minilzo.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\..\minilzo\lzoconf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minilzo\lzodefs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\minilzo\minilzo.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/intern/audaspace/jack/AUD_JackDevice.cpp b/intern/audaspace/jack/AUD_JackDevice.cpp
index 445e68e1a9a..1f2c6faa511 100644
--- a/intern/audaspace/jack/AUD_JackDevice.cpp
+++ b/intern/audaspace/jack/AUD_JackDevice.cpp
@@ -31,6 +31,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef WITH_JACK
+
 // AUD_XXX this is not realtime suitable!
 int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data)
 {
@@ -147,3 +149,5 @@ void AUD_JackDevice::playing(bool playing)
 {
 	// Do nothing.
 }
+
+#endif
diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h
index 0b09e20b354..e6d332e1160 100644
--- a/intern/audaspace/jack/AUD_JackDevice.h
+++ b/intern/audaspace/jack/AUD_JackDevice.h
@@ -26,6 +26,8 @@
 #ifndef AUD_JACKDEVICE
 #define AUD_JACKDEVICE
 
+#ifdef WITH_JACK
+
 #include "AUD_SoftwareDevice.h"
 class AUD_Buffer;
 
@@ -88,4 +90,6 @@ public:
 	virtual ~AUD_JackDevice();
 };
 
+#endif //WITH_JACK
+
 #endif //AUD_JACKDEVICE
diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
index 2bb97502c4e..a4d775a415c 100644
--- a/intern/audaspace/make/msvc_9_0/audaspace.vcproj
+++ b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
@@ -717,6 +717,25 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="jack"
+			>
+			<File
+				RelativePath="..\..\jack\AUD_JackDevice.cpp"
+				>
+				<FileConfiguration
+					Name="Blender Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\jack\AUD_JackDevice.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\AUD_C-API.h"
 			>
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp
index 603452cfcbd..229744e2000 100644
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@ -289,9 +289,9 @@ GHOST_TSuccess GHOST_System::init()
 #endif
 	
 #ifdef GHOST_DEBUG
-	m_eventPrinter = new GHOST_EventPrinter();
 	if (m_eventManager) {
-		m_eventManager->addConsumer(m_eventPrinter);
+		m_eventPrinter = new GHOST_EventPrinter();
+		//m_eventManager->addConsumer(m_eventPrinter);
 	}
 #endif // GHOST_DEBUG
 
diff --git a/projectfiles_vc9/blender/blender.sln b/projectfiles_vc9/blender/blender.sln
index 602105dc501..1bd132ea223 100644
--- a/projectfiles_vc9/blender/blender.sln
+++ b/projectfiles_vc9/blender/blender.sln
@@ -10,6 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj",
 		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} = {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}
 		{D1A9312F-4557-4982-A0F4-4D08508235F4} = {D1A9312F-4557-4982-A0F4-4D08508235F4}
 		{884D8731-654C-4C7F-9A75-8F37A305BE1E} = {884D8731-654C-4C7F-9A75-8F37A305BE1E}
+		{79D0B232-208C-F208-DA71-79B4AC088602} = {79D0B232-208C-F208-DA71-79B4AC088602}
 		{E645CC32-4823-463E-82F0-46ADDE664018} = {E645CC32-4823-463E-82F0-46ADDE664018}
 		{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} = {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
 		{51FB3D48-2467-4BFA-A321-D848252B437E} = {51FB3D48-2467-4BFA-A321-D848252B437E}
@@ -24,6 +25,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj",
 		{415BFD6E-64CF-422B-AF88-C07F040A7292} = {415BFD6E-64CF-422B-AF88-C07F040A7292}
 		{106AE171-0083-41D6-A949-20DB0E8DC251} = {106AE171-0083-41D6-A949-20DB0E8DC251}
 		{670EC17A-0548-4BBF-A27B-636C7C188139} = {670EC17A-0548-4BBF-A27B-636C7C188139}
+		{8BFA4082-773B-D100-BC24-659083BA023F} = {8BFA4082-773B-D100-BC24-659083BA023F}
 		{4C3AB78A-52CA-4276-A041-39776E52D8C8} = {4C3AB78A-52CA-4276-A041-39776E52D8C8}
 		{6B801390-5F95-4F07-81A7-97FBA046AACC} = {6B801390-5F95-4F07-81A7-97FBA046AACC}
 		{CAE37E91-6570-43AC-A4B4-7A37A4B0FC94} = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
@@ -84,6 +86,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNA_makesdna", "makesdna\DNA_makesdna.vcproj", "{E013786A-9575-4F34-81B2-33290357EE87}"
 	ProjectSection(ProjectDependencies) = postProject
 		{31628053-825D-4C06-8A21-D13883489718} = {31628053-825D-4C06-8A21-D13883489718}
+		{1CC733F1-6AB5-4904-8F63-C08C46B79DD9} = {1CC733F1-6AB5-4904-8F63-C08C46B79DD9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXP_expressions", "..\gameengine\expression\EXP_expressions.vcproj", "{EADC3C5A-6C51-4F03-8038-1553E7D7F740}"
@@ -220,7 +223,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXT_glew", "..\..\extern\gl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXT_build_install_all", "..\..\extern\make\msvc_9_0\build_install_all.vcproj", "{9C71A793-C177-4CAB-8EC5-923D500B39F8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{79D0B232-208C-F208-DA71-79B4AC088602} = {79D0B232-208C-F208-DA71-79B4AC088602}
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400} = {FFD3C64A-30E2-4BC7-BC8F-51818C320400}
+		{8BFA4082-773B-D100-BC24-659083BA023F} = {8BFA4082-773B-D100-BC24-659083BA023F}
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A} = {BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_boolop", "..\..\intern\boolop\make\msvc_9_0\boolop.vcproj", "{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}"
@@ -242,6 +248,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_elbeem", "..\..\intern\elbeem\make\msvc_9_0\elbeem.vcproj", "{A90C4918-4B21-4277-93BD-AF65F30951D9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_ghost", "..\..\intern\ghost\make\msvc_9_0\ghost.vcproj", "{76D90B92-ECC7-409C-9F98-A8814B90F3C0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_guardedalloc", "..\..\intern\guardedalloc\make\msvc_9_0\guardedalloc.vcproj", "{1CC733F1-6AB5-4904-8F63-C08C46B79DD9}"
 EndProject
@@ -301,6 +310,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_smoke", "..\..\intern\s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_audaspace", "..\..\intern\audaspace\make\msvc_9_0\audaspace.vcproj", "{87032FD2-9BA0-6B43-BE33-8902BA8F9172}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXT_lzma", "..\..\extern\lzma\make\msvc_9_0\lzma.vcproj", "{79D0B232-208C-F208-DA71-79B4AC088602}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXT_lzo", "..\..\extern\lzo\make\msvc_9_0\lzo.vcproj", "{8BFA4082-773B-D100-BC24-659083BA023F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		3D Plugin Debug|Win32 = 3D Plugin Debug|Win32
@@ -1443,6 +1456,46 @@ Global
 		{87032FD2-9BA0-6B43-BE33-8902BA8F9172}.Debug|Win32.Build.0 = 3DPlugin Debug|Win32
 		{87032FD2-9BA0-6B43-BE33-8902BA8F9172}.Release|Win32.ActiveCfg = 3DPlugin Release|Win32
 		{87032FD2-9BA0-6B43-BE33-8902BA8F9172}.Release|Win32.Build.0 = 3DPlugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3D Plugin Debug|Win32.ActiveCfg = 3D Plugin Debug|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3D Plugin Debug|Win32.Build.0 = 3D Plugin Debug|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3DPlugin Debug|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3DPlugin Debug|Win32.Build.0 = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3DPlugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.3DPlugin Release|Win32.Build.0 = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Blender Release|Win32.Build.0 = Blender Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.BlenderPlayer Debug|Win32.Build.0 = Blender Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Debug|Win32.ActiveCfg = 3D Plugin Debug|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Debug|Win32.Build.0 = 3D Plugin Debug|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Release|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{79D0B232-208C-F208-DA71-79B4AC088602}.Release|Win32.Build.0 = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3D Plugin Debug|Win32.ActiveCfg = 3D Plugin Debug|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3D Plugin Debug|Win32.Build.0 = 3D Plugin Debug|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3DPlugin Debug|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3DPlugin Debug|Win32.Build.0 = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3DPlugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.3DPlugin Release|Win32.Build.0 = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Blender Release|Win32.Build.0 = Blender Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.BlenderPlayer Debug|Win32.Build.0 = Blender Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Debug|Win32.ActiveCfg = 3D Plugin Debug|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Debug|Win32.Build.0 = 3D Plugin Debug|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Release|Win32.ActiveCfg = 3D Plugin Release|Win32
+		{8BFA4082-773B-D100-BC24-659083BA023F}.Release|Win32.Build.0 = 3D Plugin Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
index 7ba3aac65f0..7f0867cc7b6 100644
--- a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_OPENEXR;WITH_DDS;WITH_BULLET;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;UNWRAPPER;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;UNWRAPPER;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -697,6 +697,10 @@
 				RelativePath="..\..\..\source\blender\blenkernel\intern\packedFile.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\paint.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\particle.c"
 				>
@@ -757,6 +761,10 @@
 				RelativePath="..\..\..\source\blender\blenkernel\intern\smoke.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\smokehighres.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c"
 				>
@@ -1018,6 +1026,10 @@
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_packedFile.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_paint.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_particle.h"
 				>
diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj
index 174ceb5ca99..0482fa9067a 100644
--- a/projectfiles_vc9/blender/editors/ED_editors.vcproj
+++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj
@@ -217,6 +217,10 @@
 				RelativePath="..\..\..\source\blender\editors\include\ED_image.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\include\ED_info.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\include\ED_interface.h"
 				>
@@ -458,6 +462,10 @@
 				RelativePath="..\..\..\source\blender\editors\space_view3d\drawobject.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\space_view3d\drawvolume.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\space_view3d\space_view3d.c"
 				>
@@ -510,10 +518,6 @@
 				RelativePath="..\..\..\source\blender\editors\space_time\space_time.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\editors\space_time\time_header.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\space_time\time_intern.h"
 				>
@@ -806,6 +810,10 @@
 				RelativePath="..\..\..\source\blender\editors\space_info\info_ops.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\space_info\info_stats.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\space_info\space_info.c"
 				>
@@ -1274,6 +1282,10 @@
 				RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_ops.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_stroke.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_utils.c"
 				>
@@ -1467,6 +1479,22 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="space_userpref"
+			>
+			<File
+				RelativePath="..\..\..\source\blender\editors\space_userpref\space_userpref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\space_userpref\userpref_intern.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\space_userpref\userpref_ops.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

From 1e0bd0752244961366ae0f5416c8c0cc57556e7c Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Thu, 20 Aug 2009 11:38:09 +0000
Subject: [PATCH 162/577] Swapped some icons in the node editor. The Render
 Layers menu was using wrong icon, for example.

---
 release/ui/space_node.py                     | 10 +++++-----
 source/blender/editors/space_node/drawnode.c |  6 +++---
 source/blender/makesrna/intern/rna_space.c   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/release/ui/space_node.py b/release/ui/space_node.py
index 2e28cfc2eed..fd5dd9e6ee7 100644
--- a/release/ui/space_node.py
+++ b/release/ui/space_node.py
@@ -27,7 +27,7 @@ class NODE_HT_header(bpy.types.Header):
 			if ob:
 				layout.template_ID(ob, "active_material", new="material.new")
 			if id:
-				layout.itemR(id, "use_nodes", toggle=True)
+				layout.itemR(id, "use_nodes")
 
 		elif snode.tree_type == 'TEXTURE':
 			row.itemR(snode, "texture_type", text="", expand=True)
@@ -37,14 +37,14 @@ class NODE_HT_header(bpy.types.Header):
 			if id_from:
 				layout.template_ID(id_from, "active_texture", new="texture.new")
 			if id:
-				layout.itemR(id, "use_nodes", toggle=True)
+				layout.itemR(id, "use_nodes")
 
 		elif snode.tree_type == 'COMPOSITING':
 			id = snode.id
 
-			layout.itemR(id, "use_nodes", toggle=True)
-			layout.itemR(id.render_data, "free_unused_nodes", text="Free Unused", toggle=True)
-			layout.itemR(snode, "backdrop", toggle=True)
+			layout.itemR(id, "use_nodes")
+			layout.itemR(id.render_data, "free_unused_nodes", text="Free Unused")
+			layout.itemR(snode, "backdrop")
 
 class NODE_MT_view(bpy.types.Menu):
 	__space_type__ = "NODE_EDITOR"
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 50cf193f37b..1fb8cb3452b 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -253,7 +253,7 @@ static int node_buts_mix_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
 		uiButSetFunc(bt, node_but_title_cb, node, bt);
 		/* Alpha option, composite */
 		if(a_but)
-			uiDefButS(block, TOG, B_NODE_EXEC, "A",
+			uiDefIconButS(block, TOG, B_NODE_EXEC, ICON_IMAGE_RGB_ALPHA,
 				  (short)butr->xmax-20, (short)butr->ymin, 20, 20, 
 				  &node->custom2, 0, 0, 0, 0, "Include Alpha of 2nd input in this operation");
 	}
@@ -1077,7 +1077,7 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo
 		/* browse button layer */
 		strp= scene_layer_menu(node->id?(Scene *)node->id:scene);
 		if(node->id)
-			bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DATA, strp, 
+			bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_RENDERLAYERS, strp, 
 				  butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, 
 				  &node->custom1, 0, 0, 0, 0, "Choose Render Layer");
 		else
@@ -1473,7 +1473,7 @@ static int node_composit_buts_vecblur(uiBlock *block, bNodeTree *ntree, bNode *n
 		uiDefButS(block, NUM, B_NODE_EXEC, "MaxSpeed:",
 				  butr->xmin, dy+38, dx, 19, 
 				  &nbd->maxspeed, 0, 1024, 0, 0, "If not zero, maximum speed in pixels");
-		uiDefButF(block, NUM, B_NODE_EXEC, "BlurFac:",
+		uiDefButF(block, NUM, B_NODE_EXEC, "Blur:",
 				  butr->xmin, dy+19, dx, 19, 
 				  &nbd->fac, 0.0f, 2.0f, 10, 2, "Scaling factor for motion vectors, actually 'shutter speed' in frames");
 		uiDefButS(block, TOG, B_NODE_EXEC, "Curved",
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index fb71b297683..d220c707143 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1409,7 +1409,7 @@ static void rna_def_space_node(BlenderRNA *brna)
 	static EnumPropertyItem tree_type_items[] = {
 		{NTREE_SHADER, "MATERIAL", ICON_MATERIAL, "Material", "Material nodes."},
 		{NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes."},
-		{NTREE_COMPOSIT, "COMPOSITING", ICON_RENDER_RESULT, "Compositing", "Compositing nodes."},
+		{NTREE_COMPOSIT, "COMPOSITING", ICON_RENDERLAYERS, "Compositing", "Compositing nodes."},
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem texture_type_items[] = {

From 8df1d6d13af4509fbf1378e26e400c282c8a0fde Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Thu, 20 Aug 2009 13:45:04 +0000
Subject: [PATCH 163/577] * cleaning and simplification

---
 release/ui/buttons_material.py                |   5 +-
 .../blender/render/intern/source/volumetric.c | 101 +++++++-----------
 2 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index ca84cc88853..67ba4d326ba 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -73,6 +73,9 @@ class MATERIAL_PT_shading(MaterialButtonsPanel):
 	__label__ = "Shading"
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 
+	def poll(self, context):
+		return (context.material.type in ('SURFACE', 'WIRE', 'HALO'))
+
 	def draw(self, context):
 		layout = self.layout
 		
@@ -83,7 +86,7 @@ class MATERIAL_PT_shading(MaterialButtonsPanel):
 
 		if mat:
 
-			if mat.type in ['SURFACE', 'WIRE']:
+			if mat.type in ('SURFACE', 'WIRE'):
 				split = layout.split()
 	
 				col = split.column()
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 8a714aef992..7943d9ae526 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -52,6 +52,7 @@
 #include "shading.h"
 #include "texture.h"
 #include "volumetric.h"
+#include "volume_precache.h"
 
 #if defined( _MSC_VER ) && !defined( __cplusplus )
 # define inline __inline
@@ -68,7 +69,6 @@ extern struct Render R;
 static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
 {
 	float maxsize = RE_ray_tree_max_size(R.raytree);
-	int intersected=0;
 
 	/* TODO: use object's bounding box to calculate max size */
 	VECCOPY(isect->start, co);
@@ -85,17 +85,11 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
 	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
 	
-	intersected = RE_ray_tree_intersect(R.raytree, isect);
-	
-	if(intersected)
+	if(RE_ray_tree_intersect(R.raytree, isect))
 	{
-		float isvec[3];
-
-		VECCOPY(isvec, isect->vec);
-		hitco[0] = isect->start[0] + isect->labda*isvec[0];
-		hitco[1] = isect->start[1] + isect->labda*isvec[1];
-		hitco[2] = isect->start[2] + isect->labda*isvec[2];
-		
+		hitco[0] = isect->start[0] + isect->labda*isect->vec[0];
+		hitco[1] = isect->start[1] + isect->labda*isect->vec[1];
+		hitco[2] = isect->start[2] + isect->labda*isect->vec[2];
 		return 1;
 	} else {
 		return 0;
@@ -237,26 +231,31 @@ float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
  */
-void vol_get_attenuation_seg(ShadeInput *shi, float *tau, float *stepvec, float *co, float density)
+void vol_get_attenuation_seg(ShadeInput *shi, float *transmission, float stepsize, float *co, float density)
 {
 	/* input density = density at co */
+	float tau[3] = {0.f, 0.f, 0.f};
 	float absorb_col[3];
-	const float dist = VecLength(stepvec);
-	
+
 	vol_get_absorption(shi, absorb_col, co);
 	
 	/* homogenous volume within the sampled distance */
-	tau[0] = tau[1] = tau[2] = dist * density;
-		
-	VecMulVecf(tau, tau, absorb_col);
+	tau[0] = stepsize * density * absorb_col[0];
+	tau[1] = stepsize * density * absorb_col[1];
+	tau[2] = stepsize * density * absorb_col[2];
+	
+	transmission[0] *= exp(-tau[0]);
+	transmission[1] *= exp(-tau[1]);
+	transmission[2] *= exp(-tau[2]);
 }
 
 /* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
  * Used in the relationship Transmittance = e^(-attenuation)
  */
-void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, float density, float stepsize)
+void vol_get_attenuation(ShadeInput *shi, float *transmission, float *co, float *endco, float density, float stepsize)
 {
 	/* input density = density at co */
+	float tau[3] = {0.f, 0.f, 0.f};
 	float absorb_col[3];
 	int s, nsteps;
 	float step_vec[3], step_sta[3], step_end[3];
@@ -266,8 +265,6 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 
 	nsteps = (int)((dist / stepsize) + 0.5);
 	
-	tau[0] = tau[1] = tau[2] = 0.0;
-	
 	VecSubf(step_vec, endco, co);
 	VecMulf(step_vec, 1.0f / nsteps);
 	
@@ -288,12 +285,16 @@ void vol_get_attenuation(ShadeInput *shi, float *tau, float *co, float *endco, f
 		}
 	}
 	VecMulVecf(tau, tau, absorb_col);
+	
+	transmission[0] *= exp(-tau[0]);
+	transmission[1] *= exp(-tau[1]);
+	transmission[2] *= exp(-tau[2]);
 }
 
 void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *lacol, float stepsize, float density)
 {
 	float visifac, lv[3], lampdist;
-	float tau[3], tr[3]={1.0,1.0,1.0};
+	float tr[3]={1.0,1.0,1.0};
 	float hitco[3], *atten_co;
 	float p;
 	float scatter_fac;
@@ -303,12 +304,9 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 	if ((lar->lay & shi->lay)==0) return;
 	if (lar->energy == 0.0) return;
 	
-	visifac= lamp_get_visibility(lar, co, lv, &lampdist);
-	if(visifac==0.0f) return;
-
-	lacol[0] = lar->r;
-	lacol[1] = lar->g;
-	lacol[2] = lar->b;
+	if ((visifac= lamp_get_visibility(lar, co, lv, &lampdist)) == 0.f) return;
+	
+	VecCopyf(lacol, &lar->r);
 	
 	if(lar->mode & LA_TEXTURE) {
 		shi->osatex= 0;
@@ -345,10 +343,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 			} else
 				atten_co = hitco;
 			
-			vol_get_attenuation(shi, tau, co, atten_co, density, shade_stepsize);
-			tr[0] = exp(-tau[0]);
-			tr[1] = exp(-tau[1]);
-			tr[2] = exp(-tau[2]);
+			vol_get_attenuation(shi, tr, co, atten_co, density, shade_stepsize);
 			
 			VecMulVecf(lacol, lacol, tr);
 		}
@@ -364,12 +359,13 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 }
 
 /* single scattering only for now */
-void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density)
+void vol_get_scattering(ShadeInput *shi, float *scatter_col, float *co, float stepsize, float density)
 {
 	ListBase *lights;
 	GroupObject *go;
 	LampRen *lar;
-	float col[3] = {0.f, 0.f, 0.f};
+	
+	scatter_col[0] = scatter_col[1] = scatter_col[2] = 0.f;
 	
 	lights= get_lights(shi);
 	for(go=lights->first; go; go= go->next)
@@ -379,11 +375,9 @@ void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsi
 		
 		if (lar) {
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
-			VecAddf(col, col, lacol);
+			VecAddf(scatter_col, scatter_col, lacol);
 		}
 	}
-	
-	VECCOPY(scatter, col);
 }
 
 	
@@ -408,10 +402,10 @@ outgoing radiance from behind surface * beam transmittance/attenuation
 static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
 {
 	float tr[3] = {1.0f, 1.0f, 1.0f};
-	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f}, radiance_behind[3];
+	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
 	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
 	int nsteps, s;
-	float tau[3], emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
+	float emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
 	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
 	float density;
 	const float depth_cutoff = shi->mat->vol.depth_cutoff;
@@ -433,11 +427,8 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		if (density > 0.01f) {
 		
 			/* transmittance component (alpha) */
-			vol_get_attenuation_seg(shi, tau, stepvec, co, density);
-			tr[0] *= exp(-tau[0]);
-			tr[1] *= exp(-tau[1]);
-			tr[2] *= exp(-tau[2]);
-			
+			vol_get_attenuation_seg(shi, tr, stepsize, co, density);
+
 			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
 			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
 			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
@@ -449,7 +440,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 				vol_get_precached_scattering(shi, scatter_col, step_mid);
 			} else
 				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
-						
+			
 			VecMulf(scatter_col, density);
 			VecAddf(d_radiance, emit_col, scatter_col);
 			
@@ -468,10 +459,10 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	}
 	
 	/* multiply original color (behind volume) with beam transmittance over entire distance */
-	VecMulVecf(radiance_behind, tr, col);	
-	VecAddf(radiance, radiance, radiance_behind);
+	VecMulVecf(col, tr, col);	
+	VecAddf(col, col, radiance);
 	
-	VecCopyf(col, radiance);
+	/* alpha - transmission */
 	col[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
 }
 
@@ -633,11 +624,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	 * then we're inside the volume already. */
 	if (shi->flippednor) {
 	
-		vol_get_attenuation(shi, tau, last_is->start, shi->co, -1.0f, shade_stepsize);
-		tr[0] = exp(-tau[0]);
-		tr[1] = exp(-tau[1]);
-		tr[2] = exp(-tau[2]);
-		
+		vol_get_attenuation(shi, tr, last_is->start, shi->co, -1.0f, shade_stepsize);
 		
 		VecCopyf(shr->combined, tr);
 		
@@ -648,10 +635,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	/* (ray intersect ignores front faces here) */
 	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
 		
-		vol_get_attenuation(shi, tau, shi->co, hitco, -1.0f, shade_stepsize);
-		tr[0] = exp(-tau[0]);
-		tr[1] = exp(-tau[1]);
-		tr[2] = exp(-tau[2]);
+		vol_get_attenuation(shi, tr, shi->co, hitco, -1.0f, shade_stepsize);
 		
 		VecCopyf(shr->combined, tr);
 		
@@ -685,11 +669,6 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 	if (BLI_countlist(&R.render_volumes_inside) == 0) return;
 	
 	mat_backup = shi->mat;
-	
-//	for (m=R.render_volumes_inside.first; m; m=m->next) {
-//		printf("matinside: ma: %s \n", m->ma->id.name+2);
-//	}
-
 	m = R.render_volumes_inside.first;
 	shi->mat = m->ma;
 	

From a54af8e3baa8b3b3698f4196f61a0b5453df6954 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 15:25:12 +0000
Subject: [PATCH 164/577] 2.5 weight paint:

* Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing.

Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
---
 release/ui/space_view3d_toolbar.py            |   4 +-
 .../editors/sculpt_paint/paint_vertex.c       | 406 +++++++++---------
 2 files changed, 203 insertions(+), 207 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 5d882866e96..5f42ff1d8b8 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -429,7 +429,9 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 
 	def poll(self, context):
 		settings = self.paint_settings(context)
-		return (settings and settings.brush and (context.sculpt_object or context.vertex_paint_object))
+		return (settings and settings.brush and (context.sculpt_object or
+							 context.vertex_paint_object or
+							 context.weight_paint_object))
 
 	def draw(self, context):
 		settings = self.paint_settings(context)
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 19f0293c1b8..0d8213b28d6 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1273,207 +1273,10 @@ struct WPaintData {
 	float wpimat[3][3];
 };
 
-static void wpaint_exit(bContext *C, wmOperator *op)
-{
-	ToolSettings *ts= CTX_data_tool_settings(C);
-	Object *ob= CTX_data_active_object(C);
-	struct WPaintData *wpd= op->customdata;
-	
-	if(wpd->vertexcosnos)
-		MEM_freeN(wpd->vertexcosnos);
-	MEM_freeN(wpd->indexar);
-	
-	/* frees prev buffer */
-	copy_wpaint_prev(ts->wpaint, NULL, 0);
-	
-	/* and particles too */
-	if(ob->particlesystem.first) {
-		ParticleSystem *psys;
-		int i;
-		
-		for(psys= ob->particlesystem.first; psys; psys= psys->next) {
-			for(i=0; i<PSYS_TOT_VG; i++) {
-				if(psys->vgroup[i]==ob->actdef) {
-					psys->recalc |= PSYS_RECALC_RESET;
-					break;
-				}
-			}
-		}
-	}
-	
-	DAG_object_flush_update(CTX_data_scene(C), ob, OB_RECALC_DATA);
-	
-	MEM_freeN(wpd);
-	op->customdata= NULL;
-}
-
-
-static int wpaint_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-	ToolSettings *ts= CTX_data_tool_settings(C);
-	VPaint *wp= ts->wpaint;
-	Brush *brush = paint_brush(&wp->paint);
-	
-	switch(event->type) {
-		case LEFTMOUSE:
-			if(event->val==0) { /* release */
-				wpaint_exit(C, op);
-				return OPERATOR_FINISHED;
-			}
-			/* pass on, first press gets painted too */
-			
-		case MOUSEMOVE: 
-		{
-			struct WPaintData *wpd= op->customdata;
-			ViewContext *vc= &wpd->vc;
-			Object *ob= vc->obact;
-			Mesh *me= ob->data;
-			float mat[4][4];
-			float paintweight= ts->vgroup_weight;
-			int *indexar= wpd->indexar;
-			int totindex, index, alpha, totw;
-			float mval[2];
-			
-			view3d_operator_needs_opengl(C);
-			
-			/* load projection matrix */
-			wmMultMatrix(ob->obmat);
-			wmGetSingleMatrix(mat);
-			wmLoadMatrix(wpd->vc.rv3d->viewmat);
-			
-			MTC_Mat4SwapMat4(wpd->vc.rv3d->persmat, mat);
-			
-			mval[0]= event->x - vc->ar->winrct.xmin;
-			mval[1]= event->y - vc->ar->winrct.ymin;
-			
-			/* which faces are involved */
-			if(wp->flag & VP_AREA) {
-				totindex= sample_backbuf_area(vc, indexar, me->totface, mval[0], mval[1], brush->size);
-			}
-			else {
-				indexar[0]= view3d_sample_backbuf(vc, mval[0], mval[1]);
-				if(indexar[0]) totindex= 1;
-				else totindex= 0;
-			}
-			
-			if(wp->flag & VP_COLINDEX) {
-				for(index=0; index<totindex; index++) {
-					if(indexar[index] && indexar[index]<=me->totface) {
-						MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-						
-						if(mface->mat_nr!=ob->actcol-1) {
-							indexar[index]= 0;
-						}
-					}					
-				}
-			}
-			
-			if((G.f & G_FACESELECT) && me->mface) {
-				for(index=0; index<totindex; index++) {
-					if(indexar[index] && indexar[index]<=me->totface) {
-						MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-						
-						if((mface->flag & ME_FACE_SEL)==0) {
-							indexar[index]= 0;
-						}
-					}					
-				}
-			}
-			
-			/* make sure each vertex gets treated only once */
-			/* and calculate filter weight */
-			totw= 0;
-			if(wp->mode==VP_BLUR) 
-				paintweight= 0.0f;
-			else
-				paintweight= ts->vgroup_weight;
-			
-			for(index=0; index<totindex; index++) {
-				if(indexar[index] && indexar[index]<=me->totface) {
-					MFace *mface= me->mface + (indexar[index]-1);
-					
-					(me->dvert+mface->v1)->flag= 1;
-					(me->dvert+mface->v2)->flag= 1;
-					(me->dvert+mface->v3)->flag= 1;
-					if(mface->v4) (me->dvert+mface->v4)->flag= 1;
-					
-					if(wp->mode==VP_BLUR) {
-						MDeformWeight *dw, *(*dw_func)(MDeformVert *, int) = verify_defweight;
-						
-						if(wp->flag & VP_ONLYVGROUP)
-							dw_func= get_defweight;
-						
-						dw= dw_func(me->dvert+mface->v1, ob->actdef-1);
-						if(dw) {paintweight+= dw->weight; totw++;}
-						dw= dw_func(me->dvert+mface->v2, ob->actdef-1);
-						if(dw) {paintweight+= dw->weight; totw++;}
-						dw= dw_func(me->dvert+mface->v3, ob->actdef-1);
-						if(dw) {paintweight+= dw->weight; totw++;}
-						if(mface->v4) {
-							dw= dw_func(me->dvert+mface->v4, ob->actdef-1);
-							if(dw) {paintweight+= dw->weight; totw++;}
-						}
-					}
-				}
-			}
-			
-			if(wp->mode==VP_BLUR) 
-				paintweight/= (float)totw;
-			
-			for(index=0; index<totindex; index++) {
-				
-				if(indexar[index] && indexar[index]<=me->totface) {
-					MFace *mface= me->mface + (indexar[index]-1);
-					
-					if((me->dvert+mface->v1)->flag) {
-						alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v1, mval);
-						if(alpha) {
-							do_weight_paint_vertex(wp, ob, mface->v1, alpha, paintweight, wpd->vgroup_mirror);
-						}
-						(me->dvert+mface->v1)->flag= 0;
-					}
-					
-					if((me->dvert+mface->v2)->flag) {
-						alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v2, mval);
-						if(alpha) {
-							do_weight_paint_vertex(wp, ob, mface->v2, alpha, paintweight, wpd->vgroup_mirror);
-						}
-						(me->dvert+mface->v2)->flag= 0;
-					}
-					
-					if((me->dvert+mface->v3)->flag) {
-						alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v3, mval);
-						if(alpha) {
-							do_weight_paint_vertex(wp, ob, mface->v3, alpha, paintweight, wpd->vgroup_mirror);
-						}
-						(me->dvert+mface->v3)->flag= 0;
-					}
-					
-					if((me->dvert+mface->v4)->flag) {
-						if(mface->v4) {
-							alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v4, mval);
-							if(alpha) {
-								do_weight_paint_vertex(wp, ob, mface->v4, alpha, paintweight, wpd->vgroup_mirror);
-							}
-							(me->dvert+mface->v4)->flag= 0;
-						}
-					}
-				}
-			}
-			
-			MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
-			
-			DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
-			ED_region_tag_redraw(vc->ar);
-		}
-	}
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int wpaint_stroke_test_start(bContext *C, wmOperator *op, wmEvent *event)
 {
 	Scene *scene= CTX_data_scene(C);
+	struct PaintStroke *stroke = op->customdata;
 	ToolSettings *ts= CTX_data_tool_settings(C);
 	VPaint *wp= ts->wpaint;
 	Object *ob= CTX_data_active_object(C);
@@ -1482,7 +1285,6 @@ static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	float mat[4][4], imat[4][4];
 	
 	if(scene->obedit) return OPERATOR_CANCELLED;
-	// XXX	if(multires_level1_test()) return;
 	
 	me= get_mesh(ob);
 	if(me==NULL || me->totface==0) return OPERATOR_PASS_THROUGH;
@@ -1491,8 +1293,9 @@ static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	if (!me->dvert)
 		create_dverts(&me->id);
 	
-	/* make customdata storage */
-	op->customdata= wpd= MEM_callocN(sizeof(struct WPaintData), "WPaintData");
+	/* make mode data storage */
+	wpd= MEM_callocN(sizeof(struct WPaintData), "WPaintData");
+	paint_stroke_set_mode_data(stroke, wpd);
 	view3d_set_viewcontext(C, &wpd->vc);
 	wpd->vgroup_mirror= -1;
 	
@@ -1564,8 +1367,198 @@ static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		}
 	}
 	
-	/* do paint once for click only paint */
-	wpaint_modal(C, op, event);
+	return 1;
+}
+
+static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
+{
+	ToolSettings *ts= CTX_data_tool_settings(C);
+	VPaint *wp= ts->wpaint;
+	Brush *brush = paint_brush(&wp->paint);
+	struct WPaintData *wpd= paint_stroke_mode_data(stroke);
+	ViewContext *vc= &wpd->vc;
+	Object *ob= vc->obact;
+	Mesh *me= ob->data;
+	float mat[4][4];
+	float paintweight= ts->vgroup_weight;
+	int *indexar= wpd->indexar;
+	int totindex, index, alpha, totw;
+	float mval[2];
+
+	view3d_operator_needs_opengl(C);
+			
+	/* load projection matrix */
+	wmMultMatrix(ob->obmat);
+	wmGetSingleMatrix(mat);
+	wmLoadMatrix(wpd->vc.rv3d->viewmat);
+
+	RNA_float_get_array(itemptr, "mouse", mval);
+	mval[0]-= vc->ar->winrct.xmin;
+	mval[1]-= vc->ar->winrct.ymin;
+			
+	MTC_Mat4SwapMat4(wpd->vc.rv3d->persmat, mat);
+			
+	/* which faces are involved */
+	if(wp->flag & VP_AREA) {
+		totindex= sample_backbuf_area(vc, indexar, me->totface, mval[0], mval[1], brush->size);
+	}
+	else {
+		indexar[0]= view3d_sample_backbuf(vc, mval[0], mval[1]);
+		if(indexar[0]) totindex= 1;
+		else totindex= 0;
+	}
+			
+	if(wp->flag & VP_COLINDEX) {
+		for(index=0; index<totindex; index++) {
+			if(indexar[index] && indexar[index]<=me->totface) {
+				MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
+						
+				if(mface->mat_nr!=ob->actcol-1) {
+					indexar[index]= 0;
+				}
+			}					
+		}
+	}
+			
+	if((G.f & G_FACESELECT) && me->mface) {
+		for(index=0; index<totindex; index++) {
+			if(indexar[index] && indexar[index]<=me->totface) {
+				MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
+						
+				if((mface->flag & ME_FACE_SEL)==0) {
+					indexar[index]= 0;
+				}
+			}					
+		}
+	}
+			
+	/* make sure each vertex gets treated only once */
+	/* and calculate filter weight */
+	totw= 0;
+	if(wp->mode==VP_BLUR) 
+		paintweight= 0.0f;
+	else
+		paintweight= ts->vgroup_weight;
+			
+	for(index=0; index<totindex; index++) {
+		if(indexar[index] && indexar[index]<=me->totface) {
+			MFace *mface= me->mface + (indexar[index]-1);
+					
+			(me->dvert+mface->v1)->flag= 1;
+			(me->dvert+mface->v2)->flag= 1;
+			(me->dvert+mface->v3)->flag= 1;
+			if(mface->v4) (me->dvert+mface->v4)->flag= 1;
+					
+			if(wp->mode==VP_BLUR) {
+				MDeformWeight *dw, *(*dw_func)(MDeformVert *, int) = verify_defweight;
+						
+				if(wp->flag & VP_ONLYVGROUP)
+					dw_func= get_defweight;
+						
+				dw= dw_func(me->dvert+mface->v1, ob->actdef-1);
+				if(dw) {paintweight+= dw->weight; totw++;}
+				dw= dw_func(me->dvert+mface->v2, ob->actdef-1);
+				if(dw) {paintweight+= dw->weight; totw++;}
+				dw= dw_func(me->dvert+mface->v3, ob->actdef-1);
+				if(dw) {paintweight+= dw->weight; totw++;}
+				if(mface->v4) {
+					dw= dw_func(me->dvert+mface->v4, ob->actdef-1);
+					if(dw) {paintweight+= dw->weight; totw++;}
+				}
+			}
+		}
+	}
+			
+	if(wp->mode==VP_BLUR) 
+		paintweight/= (float)totw;
+			
+	for(index=0; index<totindex; index++) {
+				
+		if(indexar[index] && indexar[index]<=me->totface) {
+			MFace *mface= me->mface + (indexar[index]-1);
+					
+			if((me->dvert+mface->v1)->flag) {
+				alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v1, mval);
+				if(alpha) {
+					do_weight_paint_vertex(wp, ob, mface->v1, alpha, paintweight, wpd->vgroup_mirror);
+				}
+				(me->dvert+mface->v1)->flag= 0;
+			}
+					
+			if((me->dvert+mface->v2)->flag) {
+				alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v2, mval);
+				if(alpha) {
+					do_weight_paint_vertex(wp, ob, mface->v2, alpha, paintweight, wpd->vgroup_mirror);
+				}
+				(me->dvert+mface->v2)->flag= 0;
+			}
+					
+			if((me->dvert+mface->v3)->flag) {
+				alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v3, mval);
+				if(alpha) {
+					do_weight_paint_vertex(wp, ob, mface->v3, alpha, paintweight, wpd->vgroup_mirror);
+				}
+				(me->dvert+mface->v3)->flag= 0;
+			}
+					
+			if((me->dvert+mface->v4)->flag) {
+				if(mface->v4) {
+					alpha= calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos+6*mface->v4, mval);
+					if(alpha) {
+						do_weight_paint_vertex(wp, ob, mface->v4, alpha, paintweight, wpd->vgroup_mirror);
+					}
+					(me->dvert+mface->v4)->flag= 0;
+				}
+			}
+		}
+	}
+			
+	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
+			
+	DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
+	ED_region_tag_redraw(vc->ar);
+}
+
+static void wpaint_stroke_done(bContext *C, struct PaintStroke *stroke)
+{
+	ToolSettings *ts= CTX_data_tool_settings(C);
+	Object *ob= CTX_data_active_object(C);
+	struct WPaintData *wpd= paint_stroke_mode_data(stroke);
+	
+	if(wpd->vertexcosnos)
+		MEM_freeN(wpd->vertexcosnos);
+	MEM_freeN(wpd->indexar);
+	
+	/* frees prev buffer */
+	copy_wpaint_prev(ts->wpaint, NULL, 0);
+	
+	/* and particles too */
+	if(ob->particlesystem.first) {
+		ParticleSystem *psys;
+		int i;
+		
+		for(psys= ob->particlesystem.first; psys; psys= psys->next) {
+			for(i=0; i<PSYS_TOT_VG; i++) {
+				if(psys->vgroup[i]==ob->actdef) {
+					psys->recalc |= PSYS_RECALC_RESET;
+					break;
+				}
+			}
+		}
+	}
+	
+	DAG_object_flush_update(CTX_data_scene(C), ob, OB_RECALC_DATA);
+	
+	MEM_freeN(wpd);
+}
+
+
+static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	
+	op->customdata = paint_stroke_new(C, wpaint_stroke_test_start,
+					  wpaint_stroke_update_step,
+					  wpaint_stroke_done);
 	
 	/* add modal handler */
 	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
@@ -1582,13 +1575,14 @@ void PAINT_OT_weight_paint(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->invoke= wpaint_invoke;
-	ot->modal= wpaint_modal;
+	ot->modal= paint_stroke_modal;
 	/* ot->exec= vpaint_exec; <-- needs stroke property */
 	ot->poll= wp_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
-	
+
+	RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
 
 /* ************ set / clear vertex paint mode ********** */

From ff27281f2e235ca5c7b776b390f0deb00799c97a Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Thu, 20 Aug 2009 15:58:28 +0000
Subject: [PATCH 165/577] changed layout of PovRay radiosity panel to be more
 consistent with other render panels

---
 release/io/engine_render_pov.py | 40 +++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index 65add2baacb..539f705a6ee 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -821,21 +821,37 @@ class SCENE_PT_povray_radiosity(RenderButtonsPanel):
 		
 		col = split.column()
 		
-		col.itemR(scene, "pov_radio_count")
-		col.itemR(scene, "pov_radio_recursion_limit")
-		col.itemR(scene, "pov_radio_error_bound")
+		col.itemR(scene, "pov_radio_count", text="Rays")
+		col.itemR(scene, "pov_radio_recursion_limit", text="Recursions")
+		col = split.column()
+		col.itemR(scene, "pov_radio_error_bound", text="Error")
 		
-		col.itemR(scene, "pov_radio_display_advanced")
+		layout.itemR(scene, "pov_radio_display_advanced")
 		
 		if scene.pov_radio_display_advanced:
-			col.itemR(scene, "pov_radio_adc_bailout")
+			split = layout.split()
+		
+			col = split.column()
+			col.itemR(scene, "pov_radio_adc_bailout", slider=True)
+			col.itemR(scene, "pov_radio_gray_threshold", slider=True)
+			col.itemR(scene, "pov_radio_low_error_factor", slider=True)
+			
+			
+			
+			col = split.column()
 			col.itemR(scene, "pov_radio_brightness")
-			col.itemR(scene, "pov_radio_gray_threshold")
-			col.itemR(scene, "pov_radio_low_error_factor")
-			col.itemR(scene, "pov_radio_minimum_reuse")
-			col.itemR(scene, "pov_radio_media")
+			col.itemR(scene, "pov_radio_minimum_reuse", text="Min Reuse")
 			col.itemR(scene, "pov_radio_nearest_count")
+			
+			
+			split = layout.split()
+		
+			col = split.column()
+			col.itemL(text="Estimation Influence:")
+			col.itemR(scene, "pov_radio_media")
 			col.itemR(scene, "pov_radio_normal")
+			
+			col = split.column()
 			col.itemR(scene, "pov_radio_always_sample")
 		
 
@@ -885,17 +901,17 @@ FloatProperty(	attr="pov_radio_error_bound",
 FloatProperty(	attr="pov_radio_gray_threshold",
 				name="Gray Threshold",
 				description="one of the two main speed/quality tuning values, lower values are more accurate.",
-				min=0.0, max=1.0, default= 0.0)
+				min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0)
 								
 FloatProperty(	attr="pov_radio_low_error_factor",
 				name="Low Error Factor",
 				description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
-				min=0.0, max=1.0, default= 0.5)
+				min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5)
 
 # max_sample - not available yet
 
 BoolProperty(	attr="pov_radio_media",
-				name="Use Media",
+				name="Media",
 				description="Radiosity estimation can be affected by media.",
 				default= False)
 

From 4df4b17ed65331b39d77c319f98b7114c0f2ead0 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 16:00:17 +0000
Subject: [PATCH 166/577] 2.5 Paint:

* Weight paint and vertex paint now use the same cursor setup as sculpt
---
 source/blender/blenkernel/BKE_paint.h         |  7 +-
 source/blender/blenkernel/intern/paint.c      | 15 ++--
 .../editors/sculpt_paint/paint_vertex.c       | 86 ++++---------------
 source/blender/editors/sculpt_paint/sculpt.c  |  4 +-
 source/blender/makesrna/intern/rna_space.c    |  2 +-
 5 files changed, 31 insertions(+), 83 deletions(-)

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 45d2e24c7f6..4337d275776 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -33,7 +33,12 @@ struct Object;
 struct Paint;
 struct Scene;
 
-void paint_init(struct Paint *p, const char *col);
+extern const char PAINT_CURSOR_SCULPT[3];
+extern const char PAINT_CURSOR_VERTEX_PAINT[3];
+extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
+extern const char PAINT_CURSOR_TEXTURE_PAINT[3];
+
+void paint_init(struct Paint *p, const char col[3]);
 void free_paint(struct Paint *p);
 void copy_paint(struct Paint *orig, struct Paint *new);
 
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index f0893e058fa..7c5b2b82b4b 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -39,6 +39,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+const char PAINT_CURSOR_SCULPT[3] = {255, 100, 100};
+const char PAINT_CURSOR_VERTEX_PAINT[3] = {255, 255, 255};
+const char PAINT_CURSOR_WEIGHT_PAINT[3] = {200, 200, 255};
+const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255};
+
 Paint *paint_get_active(Scene *sce)
 {
 	if(sce && sce->basact && sce->basact->object) {
@@ -154,7 +159,7 @@ int paint_facesel_test(Object *ob)
 
 }
 
-void paint_init(Paint *p, const char *col)
+void paint_init(Paint *p, const char col[3])
 {
 	Brush *brush;
 
@@ -163,13 +168,7 @@ void paint_init(Paint *p, const char *col)
 	brush_check_exists(&brush, "Brush");
 	paint_brush_set(p, brush);
 
-	if(col)
-		memcpy(p->paint_cursor_col, col, 3);
-	else {
-		p->paint_cursor_col[0] = 255;
-		p->paint_cursor_col[1] = 255;
-		p->paint_cursor_col[2] = 255;
-	}
+	memcpy(p->paint_cursor_col, col, 3);
 	p->paint_cursor_col[3] = 128;
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 0d8213b28d6..704773795e8 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -142,56 +142,6 @@ static int wp_poll(bContext *C)
 	return 0;
 }
 
-
-/* Cursors */
-static void vp_drawcursor(bContext *C, int x, int y, void *customdata)
-{
-	Brush *brush = paint_brush(&CTX_data_tool_settings(C)->vpaint->paint);
-	
-	glTranslatef((float)x, (float)y, 0.0f);
-	
-	glColor4ub(255, 255, 255, 128);
-	glEnable( GL_LINE_SMOOTH );
-	glEnable(GL_BLEND);
-	glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
-	glDisable(GL_BLEND);
-	glDisable( GL_LINE_SMOOTH );
-	
-	glTranslatef((float)-x, (float)-y, 0.0f);
-}
-
-static void wp_drawcursor(bContext *C, int x, int y, void *customdata)
-{
-	Brush *brush = paint_brush(&CTX_data_tool_settings(C)->wpaint->paint);
-
-	glTranslatef((float)x, (float)y, 0.0f);
-	
-	glColor4ub(200, 200, 255, 128);
-	glEnable( GL_LINE_SMOOTH );
-	glEnable(GL_BLEND);
-	glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
-	glDisable(GL_BLEND);
-	glDisable( GL_LINE_SMOOTH );
-	
-	glTranslatef((float)-x, (float)-y, 0.0f);
-}
-
-static void toggle_paint_cursor(bContext *C, int wpaint)
-{
-	ToolSettings *ts = CTX_data_scene(C)->toolsettings;
-	VPaint *vp = wpaint ? ts->wpaint : ts->vpaint;
-
-	if(vp->paintcursor) {
-		WM_paint_cursor_end(CTX_wm_manager(C), vp->paintcursor);
-		vp->paintcursor = NULL;
-	}
-	else {
-		vp->paintcursor = wpaint ?
-			WM_paint_cursor_activate(CTX_wm_manager(C), wp_poll, wp_drawcursor, NULL) :
-			WM_paint_cursor_activate(CTX_wm_manager(C), vp_poll, vp_drawcursor, NULL);
-	}
-}
-
 static VPaint *new_vpaint(int wpaint)
 {
 	VPaint *vp= MEM_callocN(sizeof(VPaint), "VPaint");
@@ -1127,9 +1077,8 @@ static int set_wpaint(bContext *C, wmOperator *op)		/* toggle */
 		if(wp==NULL)
 			wp= scene->toolsettings->wpaint= new_vpaint(1);
 
-		paint_init(&wp->paint, NULL);
-
-		toggle_paint_cursor(C, 1);
+		paint_init(&wp->paint, PAINT_CURSOR_WEIGHT_PAINT);
+		paint_cursor_start(C, wp_poll);
 		
 		mesh_octree_table(ob, NULL, NULL, 's');
 		
@@ -1145,9 +1094,6 @@ static int set_wpaint(bContext *C, wmOperator *op)		/* toggle */
 		}
 	}
 	else {
-		if(wp)
-			toggle_paint_cursor(C, 1);
-		
 		mesh_octree_table(ob, NULL, NULL, 'e');
 	}
 	
@@ -1188,9 +1134,11 @@ void PAINT_OT_weight_paint_toggle(wmOperatorType *ot)
 
 static int vpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->vpaint->paint);
-
-	toggle_paint_cursor(C, 0);
+	Paint *p = paint_get_active(CTX_data_scene(C));
+	Brush *brush = paint_brush(p);
+	
+	WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
+	p->paint_cursor = NULL;
 	brush_radial_control_invoke(op, brush, 1);
 	return WM_radial_control_invoke(C, op, event);
 }
@@ -1199,7 +1147,7 @@ static int vpaint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *eve
 {
 	int ret = WM_radial_control_modal(C, op, event);
 	if(ret != OPERATOR_RUNNING_MODAL)
-		toggle_paint_cursor(C, 0);
+		paint_cursor_start(C, vp_poll);
 	return ret;
 }
 
@@ -1211,8 +1159,11 @@ static int vpaint_radial_control_exec(bContext *C, wmOperator *op)
 
 static int wpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Brush *brush = paint_brush(&CTX_data_scene(C)->toolsettings->wpaint->paint);
-	toggle_paint_cursor(C, 1);
+	Paint *p = paint_get_active(CTX_data_scene(C));
+	Brush *brush = paint_brush(p);
+	
+	WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor);
+	p->paint_cursor = NULL;
 	brush_radial_control_invoke(op, brush, 1);
 	return WM_radial_control_invoke(C, op, event);
 }
@@ -1221,7 +1172,7 @@ static int wpaint_radial_control_modal(bContext *C, wmOperator *op, wmEvent *eve
 {
 	int ret = WM_radial_control_modal(C, op, event);
 	if(ret != OPERATOR_RUNNING_MODAL)
-		toggle_paint_cursor(C, 1);
+		paint_cursor_start(C, wp_poll);
 	return ret;
 }
 
@@ -1614,11 +1565,6 @@ static int set_vpaint(bContext *C, wmOperator *op)		/* toggle */
 	if(ob->mode & OB_MODE_VERTEX_PAINT) {
 		
 		ob->mode &= ~OB_MODE_VERTEX_PAINT;
-		
-		if(vp) {
-			toggle_paint_cursor(C, 0);
-			vp->paintcursor= NULL;
-		}
 	}
 	else {
 		ob->mode |= OB_MODE_VERTEX_PAINT;
@@ -1629,9 +1575,9 @@ static int set_vpaint(bContext *C, wmOperator *op)		/* toggle */
 		if(vp==NULL)
 			vp= scene->toolsettings->vpaint= new_vpaint(0);
 		
-		toggle_paint_cursor(C, 0);
+		paint_cursor_start(C, vp_poll);
 
-		paint_init(&vp->paint, NULL);
+		paint_init(&vp->paint, PAINT_CURSOR_VERTEX_PAINT);
 	}
 	
 	if (me)
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index e0206210799..76c5c3504da 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1549,8 +1549,6 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *op)
 		free_sculptsession(&ob->sculpt);
 	}
 	else {
-		const char col[3] = {255, 100, 100};
-		
 		/* Enter sculptmode */
 
 		ob->mode |= OB_MODE_SCULPT;
@@ -1564,7 +1562,7 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *op)
 			free_sculptsession(&ob->sculpt);
 		ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
 
-		paint_init(&ts->sculpt->paint, col);
+		paint_init(&ts->sculpt->paint, PAINT_CURSOR_SCULPT);
 		
 		paint_cursor_start(C, sculpt_poll);
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index d220c707143..8e8c9a9837c 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -151,7 +151,7 @@ static void rna_SpaceImageEditor_paint_update(bContext *C, PointerRNA *ptr)
 	Scene *scene= CTX_data_scene(C);
 
 	if(scene)
-		paint_init(&scene->toolsettings->imapaint.paint, NULL);
+		paint_init(&scene->toolsettings->imapaint.paint, PAINT_CURSOR_TEXTURE_PAINT);
 }
 
 static int rna_SpaceImageEditor_show_render_get(PointerRNA *ptr)

From ec6b14bb073fdd207b9cd2f93c8db4a8cfd9aaf3 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 16:43:55 +0000
Subject: [PATCH 167/577] 2.5 texture paint:

* Little bugfix, was passing an invalid pointer
---
 source/blender/editors/sculpt_paint/paint_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 8a8041abbff..2dcd7a64947 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -5174,7 +5174,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
 			me->mtface= CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DEFAULT,
 							 NULL, me->totface);
 
-		paint_init(&scene->toolsettings->imapaint.paint, NULL);
+		paint_init(&scene->toolsettings->imapaint.paint, PAINT_CURSOR_TEXTURE_PAINT);
 
 		if(U.glreslimit != 0)
 			GPU_free_images();

From fda97809bc6521e746e56341d5c7e7f19864d52c Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 17:37:38 +0000
Subject: [PATCH 168/577] 2.5 Multires:

* Fixed a memory corruption bug when deleting a multiresmodifier, was hanging on to a bad pointer. Reported on IRC by lusque
---
 source/blender/blenkernel/BKE_multires.h      |  5 +--
 .../blender/blenkernel/intern/cdderivedmesh.c | 36 ++++++++++++-------
 source/blender/blenkernel/intern/modifier.c   |  3 +-
 source/blender/blenkernel/intern/multires.c   | 21 ++++++-----
 source/blender/blenloader/intern/readfile.c   |  2 +-
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 6558212519f..e7c7d92c955 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -35,10 +35,11 @@ struct Object;
 
 typedef struct MultiresSubsurf {
 	struct MultiresModifierData *mmd;
-	struct Mesh *me;
+	struct Object *ob;
 } MultiresSubsurf;
 
 /* MultiresDM */
+struct Object *MultiresDM_get_object(struct DerivedMesh *dm);
 struct Mesh *MultiresDM_get_mesh(struct DerivedMesh *dm);
 struct DerivedMesh *MultiresDM_new(struct MultiresSubsurf *, struct DerivedMesh*, int, int, int);
 void *MultiresDM_get_vertnorm(struct DerivedMesh *);
@@ -59,7 +60,7 @@ void multires_mark_as_modified(struct Object *ob);
 void multires_force_update(struct Object *ob);
 
 struct DerivedMesh *multires_dm_create_from_derived(struct MultiresModifierData*, struct DerivedMesh*,
-						    struct Mesh *, int, int);
+						    struct Object *, int, int);
 
 struct MultiresModifierData *find_multires_modifier(struct Object *ob);
 int multiresModifier_switch_level(struct Object *, const int);
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 706eece108c..4829be21ed8 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1297,7 +1297,7 @@ typedef struct MultiresDM {
 	IndexNode *vert_face_map_mem, *vert_edge_map_mem;
 	int *face_offsets;
 
-	Mesh *me;
+	Object *ob;
 	int modified;
 
 	void (*update)(DerivedMesh*);
@@ -1308,15 +1308,19 @@ static void MultiresDM_release(DerivedMesh *dm)
 	MultiresDM *mrdm = (MultiresDM*)dm;
 	int mvert_layer;
 
+	/* Check that mmd still exists */
+	if(BLI_findindex(&mrdm->ob->modifiers, mrdm->mmd) < 0)
+		mrdm->mmd = NULL;
+
 	/* Before freeing, need to update the displacement map */
-	if(dm->needsFree && mrdm->modified)
+	if(dm->needsFree && mrdm->modified && mrdm->mmd)
 		mrdm->update(dm);
 
 	/* If the MVert data is being used as the sculpt undo store, don't free it */
 	mvert_layer = CustomData_get_layer_index(&dm->vertData, CD_MVERT);
 	if(mvert_layer != -1) {
 		CustomDataLayer *cd = &dm->vertData.layers[mvert_layer];
-		if(cd->data == mrdm->mmd->undo_verts)
+		if(mrdm->mmd && cd->data == mrdm->mmd->undo_verts)
 			cd->flag |= CD_FLAG_NOFREE;
 	}
 
@@ -1348,7 +1352,7 @@ DerivedMesh *MultiresDM_new(MultiresSubsurf *ms, DerivedMesh *orig, int numVerts
 	dm = &mrdm->cddm.dm;
 
 	mrdm->mmd = ms->mmd;
-	mrdm->me = ms->me;
+	mrdm->ob = ms->ob;
 
 	if(dm) {
 		MDisps *disps;
@@ -1391,7 +1395,12 @@ DerivedMesh *MultiresDM_new(MultiresSubsurf *ms, DerivedMesh *orig, int numVerts
 
 Mesh *MultiresDM_get_mesh(DerivedMesh *dm)
 {
-	return ((MultiresDM*)dm)->me;
+	return get_mesh(((MultiresDM*)dm)->ob);
+}
+
+Object *MultiresDM_get_object(DerivedMesh *dm)
+{
+	return ((MultiresDM*)dm)->ob;
 }
 
 void *MultiresDM_get_orco(DerivedMesh *dm)
@@ -1428,10 +1437,11 @@ void MultiresDM_set_update(DerivedMesh *dm, void (*update)(DerivedMesh*))
 ListBase *MultiresDM_get_vert_face_map(DerivedMesh *dm)
 {
 	MultiresDM *mrdm = (MultiresDM*)dm;
+	Mesh *me = mrdm->ob->data;
 
 	if(!mrdm->vert_face_map)
-		create_vert_face_map(&mrdm->vert_face_map, &mrdm->vert_face_map_mem, mrdm->me->mface,
-				     mrdm->me->totvert, mrdm->me->totface);
+		create_vert_face_map(&mrdm->vert_face_map, &mrdm->vert_face_map_mem, me->mface,
+				     me->totvert, me->totface);
 
 	return mrdm->vert_face_map;
 }
@@ -1439,10 +1449,11 @@ ListBase *MultiresDM_get_vert_face_map(DerivedMesh *dm)
 ListBase *MultiresDM_get_vert_edge_map(DerivedMesh *dm)
 {
 	MultiresDM *mrdm = (MultiresDM*)dm;
+	Mesh *me = mrdm->ob->data;
 
 	if(!mrdm->vert_edge_map)
-		create_vert_edge_map(&mrdm->vert_edge_map, &mrdm->vert_edge_map_mem, mrdm->me->medge,
-				     mrdm->me->totvert, mrdm->me->totedge);
+		create_vert_edge_map(&mrdm->vert_edge_map, &mrdm->vert_edge_map_mem, me->medge,
+				     me->totvert, me->totedge);
 
 	return mrdm->vert_edge_map;
 }
@@ -1450,6 +1461,7 @@ ListBase *MultiresDM_get_vert_edge_map(DerivedMesh *dm)
 int *MultiresDM_get_face_offsets(DerivedMesh *dm)
 {
 	MultiresDM *mrdm = (MultiresDM*)dm;
+	Mesh *me = mrdm->ob->data;
 	int i, accum = 0;
 
 	if(!mrdm->face_offsets) {
@@ -1457,11 +1469,11 @@ int *MultiresDM_get_face_offsets(DerivedMesh *dm)
 		int area = len * len;
 		int t = 1 + len * 3 + area * 3, q = t + len + area;
 
-		mrdm->face_offsets = MEM_callocN(sizeof(int) * mrdm->me->totface, "mrdm face offsets");
-		for(i = 0; i < mrdm->me->totface; ++i) {
+		mrdm->face_offsets = MEM_callocN(sizeof(int) * me->totface, "mrdm face offsets");
+		for(i = 0; i < me->totface; ++i) {
 			mrdm->face_offsets[i] = accum;
 
-			accum += (mrdm->me->mface[i].v4 ? q : t);
+			accum += (me->mface[i].v4 ? q : t);
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 1e2560bf809..4d567245ce1 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -8102,14 +8102,13 @@ static DerivedMesh *multiresModifier_applyModifier(ModifierData *md, Object *ob,
 						   int useRenderParams, int isFinalCalc)
 {
 	MultiresModifierData *mmd = (MultiresModifierData*)md;
-	Mesh *me = get_mesh(ob);
 	DerivedMesh *final;
 
 	/* TODO: for now just skip a level1 mesh */
 	if(mmd->lvl == 1)
 		return dm;
 
-	final = multires_dm_create_from_derived(mmd, dm, me, useRenderParams, isFinalCalc);
+	final = multires_dm_create_from_derived(mmd, dm, ob, useRenderParams, isFinalCalc);
 	if(mmd->undo_signal && mmd->undo_verts && mmd->undo_verts_tot == final->getNumVerts(final)) {
 		int i;
 		MVert *dst = CDDM_get_verts(final);
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index e91f318adad..09a6c27a88c 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -204,10 +204,11 @@ static void VecAddUf(float a[3], float b[3])
 	a[2] += b[2];
 }
 
-static void multires_subdisp(DerivedMesh *orig, Mesh *me, DerivedMesh *final, int lvl, int totlvl,
+static void multires_subdisp(DerivedMesh *orig, Object *ob, DerivedMesh *final, int lvl, int totlvl,
 			     int totsubvert, int totsubedge, int totsubface, int addverts)
 {
 	DerivedMesh *mrdm;
+	Mesh *me = ob->data;
 	MultiresModifierData mmd_sub;
 	MVert *mvs = CDDM_get_verts(final);
 	MVert *mvd, *mvd_f1, *mvs_f1, *mvd_f3, *mvd_f4;
@@ -222,7 +223,7 @@ static void multires_subdisp(DerivedMesh *orig, Mesh *me, DerivedMesh *final, in
 
 	memset(&mmd_sub, 0, sizeof(MultiresModifierData));
 	mmd_sub.lvl = mmd_sub.totlvl = totlvl;
-	mrdm = multires_dm_create_from_derived(&mmd_sub, orig, me, 0, 0);
+	mrdm = multires_dm_create_from_derived(&mmd_sub, orig, ob, 0, 0);
 		
 	mvd = CDDM_get_verts(mrdm);
 	/* Need to map from ccg to mrdm */
@@ -395,7 +396,7 @@ static void multires_subdisp(DerivedMesh *orig, Mesh *me, DerivedMesh *final, in
 		}
 	}
 
-	final->needsFree = 1;
+	final->needsFree  = 1;
 	final->release(final);
 	mrdm->needsFree = 1;
 	MultiresDM_mark_as_modified(mrdm);
@@ -468,7 +469,7 @@ void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int dista
 		orig = CDDM_from_mesh(me, NULL);
 		memset(&mmd_sub, 0, sizeof(MultiresModifierData));
 		mmd_sub.lvl = mmd_sub.totlvl = mmd->lvl;
-		mrdm = multires_dm_create_from_derived(&mmd_sub, orig, me, 0, 0);
+		mrdm = multires_dm_create_from_derived(&mmd_sub, orig, ob, 0, 0);
 		totsubvert = mrdm->getNumVerts(mrdm);
 		totsubedge = mrdm->getNumEdges(mrdm);
 		totsubface = mrdm->getNumFaces(mrdm);
@@ -497,7 +498,7 @@ void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int dista
 
 		orig = CDDM_from_mesh(me, NULL);
 
-		multires_subdisp(orig, me, final, mmd->lvl, mmd->totlvl, totsubvert, totsubedge, totsubface, 0);
+		multires_subdisp(orig, ob, final, mmd->lvl, mmd->totlvl, totsubvert, totsubedge, totsubface, 0);
 
 		orig->needsFree = 1;
 		orig->release(orig);
@@ -1166,9 +1167,11 @@ static void multiresModifier_disp_run(DerivedMesh *dm, MVert *subco, int invert)
 
 static void multiresModifier_update(DerivedMesh *dm)
 {
+	Object *ob;
 	Mesh *me;
 	MDisps *mdisps;
 
+	ob = MultiresDM_get_object(dm);
 	me = MultiresDM_get_mesh(dm);
 	mdisps = CustomData_get_layer(&me->fdata, CD_MDISPS);
 
@@ -1189,7 +1192,7 @@ static void multiresModifier_update(DerivedMesh *dm)
 			   (includes older displacements but not new sculpts) */
 			mmd.totlvl = totlvl;
 			mmd.lvl = lvl;
-			subco_dm = multires_dm_create_from_derived(&mmd, orig, me, 0, 0);
+			subco_dm = multires_dm_create_from_derived(&mmd, orig, ob, 0, 0);
 			cur_lvl_orig_verts = CDDM_get_verts(subco_dm);
 
 			/* Subtract the original vertex cos from the new vertex cos */
@@ -1199,7 +1202,7 @@ static void multiresModifier_update(DerivedMesh *dm)
 
 			final = multires_subdisp_pre(dm, totlvl - lvl, 0);
 
-			multires_subdisp(orig, me, final, lvl, totlvl, dm->getNumVerts(dm), dm->getNumEdges(dm),
+			multires_subdisp(orig, ob, final, lvl, totlvl, dm->getNumVerts(dm), dm->getNumEdges(dm),
 					 dm->getNumFaces(dm), 1);
 
 			subco_dm->release(subco_dm);
@@ -1226,7 +1229,7 @@ void multires_force_update(Object *ob)
 	}
 }
 
-struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, DerivedMesh *dm, Mesh *me,
+struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, DerivedMesh *dm, Object *ob,
 						    int useRenderParams, int isFinalCalc)
 {
 	SubsurfModifierData smd;
@@ -1235,7 +1238,7 @@ struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, D
 	int i;
 
 	ms.mmd = mmd;
-	ms.me = me;
+	ms.ob = ob;
 
 	memset(&smd, 0, sizeof(SubsurfModifierData));
 	smd.levels = smd.renderLevels = mmd->lvl - 1;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 71994b97521..58b439e4cb4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9416,7 +9416,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 					mmd->lvl = mmd->totlvl;
 					orig = CDDM_from_mesh(me, NULL);
-					dm = multires_dm_create_from_derived(mmd, orig, me, 0, 0);
+					dm = multires_dm_create_from_derived(mmd, orig, ob, 0, 0);
                                        
 					multires_load_old(dm, me->mr);
 

From f6dcd9376b2d2d0e0b126f6e12a7d83d21d81783 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Thu, 20 Aug 2009 17:59:37 +0000
Subject: [PATCH 169/577] 2.5 Texture RNA: Distorted Noise: "Distortion" Flag
 was swapped with "Basis". Reported by schuh in IRC. Thanks.

---
 source/blender/makesrna/intern/rna_texture.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index f82edee8ff1..69298fbb8a4 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -1286,13 +1286,13 @@ static void rna_def_texture_distorted_noise(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
+	RNA_def_property_enum_sdna(prop, NULL, "noisebasis2");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
 	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 
 	prop= RNA_def_property(srna, "noise_distortion", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "noisebasis2");
+	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
 	RNA_def_property_ui_text(prop, "Noise Distortion", "Sets the noise basis for the distortion");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);

From 1772a0a62f86268f01540d4a3692c2bb4c7e6432 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Thu, 20 Aug 2009 18:34:14 +0000
Subject: [PATCH 170/577] Add unsigned char buffer to BLF_draw_buffer and
 update makefiles for lzo and lzma.

I rename the original makefile of lzo (Makefile.bak) and a new one.
Also four new option for user-def.mk:
	WITH_LZO, default true
	WITH_LZMA, default true
	NAN_LZO, default extern/lzo
	NAN_LZMA, default extern/lzma

It's easy add support for system libs (using lzo and lzma from OS) but I don't
know if it have much sense.

Note that I can't test the "unsigned char" buffer because the OGL animation
is not working (right ?), but is the same code that for float also the new
Makefile work fine here (Linux), but maybe need some tweak on other OS.
---
 extern/Makefile                           |   8 ++
 extern/lzma/Makefile                      |  46 ++++++++
 extern/lzo/minilzo/Makefile               | 131 +++++-----------------
 source/Makefile                           |   3 +
 source/blender/blenfont/intern/blf_font.c |  93 +++++++++------
 source/blender/blenkernel/intern/Makefile |   5 +
 source/nan_definitions.mk                 |   5 +-
 7 files changed, 156 insertions(+), 135 deletions(-)
 create mode 100644 extern/lzma/Makefile

diff --git a/extern/Makefile b/extern/Makefile
index 61499da8743..1bebf1e1994 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -54,6 +54,14 @@ ifeq ($(WITH_OPENJPEG), true)
     DIRS += libopenjpeg
 endif
 
+ifeq ($(WITH_LZO), true)
+    DIRS += lzo/minilzo
+endif
+
+ifeq ($(WITH_LZMA), true)
+    DIRS += lzma
+endif
+
 TARGET = solid
 
 all::
diff --git a/extern/lzma/Makefile b/extern/lzma/Makefile
new file mode 100644
index 00000000000..11d70dc7847
--- /dev/null
+++ b/extern/lzma/Makefile
@@ -0,0 +1,46 @@
+#
+# $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):
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = lzma
+DIR = $(OCGDIR)/extern/$(LIBNAME)
+
+include nan_compile.mk 
+
+install: $(ALL_OR_DEBUG)
+	@[ -d $(NAN_LZMA) ] || mkdir -p $(NAN_LZMA)
+	@[ -d $(NAN_LZMA)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_LZMA)/lib/$(DEBUG_DIR)
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_LZMA)/lib/$(DEBUG_DIR)
+ifeq ($(OS),darwin)
+	ranlib $(NAN_LZMA)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
+endif
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh *.h $(NAN_LZMA)
diff --git a/extern/lzo/minilzo/Makefile b/extern/lzo/minilzo/Makefile
index a6ee373e8bc..8f3d5042579 100644
--- a/extern/lzo/minilzo/Makefile
+++ b/extern/lzo/minilzo/Makefile
@@ -1,113 +1,40 @@
 #
-# a very simple Makefile for miniLZO
+# $Id:
 #
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+# ***** BEGIN GPL LICENSE BLOCK *****
 #
-
-PROGRAM = testmini
-SOURCES = testmini.c minilzo.c
-
-default:
-	@echo "Please choose one of the following targets:"
-	@echo "    gcc:   gcc"
-	@echo "    unix:  hpux hpux9"
-	@echo "    win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
-	@echo "           win32-intelc win32-mingw win32-vc win32-watcomc"
-	@echo "    dos16: dos16-bc dos16-mc dos16-wc"
-	@echo "    dos32: dos32-djgpp2 dos32-wc"
-
-
-# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
-# current dircectory. Otherwise you may want to adjust CPPFLAGS.
-##CPPFLAGS = -I../include/lzo -I.
-
-GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
-
-
+# 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.
 #
-# gcc (generic)
+# 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.
 #
-
-gcc:
-	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
-
-cc:
-	cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
-
-
+# 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.
 #
-# UNIX
+# The Original Code is Copyright (C) 2009 Blender Foundation
+# All rights reserved.
 #
-
-hpux:
-	cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
-
-hpux9:
-	cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
-
-
-#
-# Windows (32-bit)
+# Contributor(s): none yet.
 #
+# ***** END GPL LICENSE BLOCK *****
 
-win32-borlandc win32-bc:
-	bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
+LIBNAME = minilzo
+DIR = $(OCGDIR)/extern/$(LIBNAME)
 
-win32-cygwin32 win32-cygwin:
-	gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
-
-win32-digitalmars win32-dm:
-	dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
-
-win32-intelc win32-ic:
-	icl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
-
-win32-lccwin32:
-	@echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
-	lc -A -unused -O $(CPPFLAGS) $(SOURCES)
-
-win32-mingw32 win32-mingw:
-	gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
-
-win32-visualc win32-vc:
-	cl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
-
-win32-watcomc win32-wc:
-	wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
-
-
-#
-# DOS (16-bit)
-#
-
-dos16-borlandc dos16-bc:
-	bcc -ml -w -d -O -4 $(CPPFLAGS) $(SOURCES)
-
-dos16-microsoftc dos16-msc dos16-mc:
-	cl -nologo -f- -AL -O -G2 -W3 $(CPPFLAGS) $(SOURCES)
-
-dos16-watcomc dos16-wc:
-	wcl -zq -ml -bt=dos -l=dos -ox -w5 $(CPPFLAGS) $(SOURCES)
-
-
-#
-# DOS (32-bit)
-#
-
-dos32-djgpp2 dos32-dj2:
-	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
-
-dos32-watcomc dos32-wc:
-	wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
-
-
-#
-# other targets
-#
-
-clean:
-	rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
-	rm -f *.err *.o *.obj
-
-.PHONY: default clean
+include nan_compile.mk
 
+install: $(ALL_OR_DEBUG)
+	@[ -d $(NAN_LZO) ] || mkdir -p $(NAN_LZO)
+	@[ -d $(NAN_LZO)/minilzo ] || mkdir -p $(NAN_LZO)/minilzo
+	@[ -d $(NAN_LZO)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_LZO)/lib/$(DEBUG_DIR)
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_LZO)/lib/$(DEBUG_DIR)
+ifeq ($(OS),darwin)
+	ranlib $(NAN_LZO)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
+endif
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh *.h $(NAN_LZO)/minilzo
diff --git a/source/Makefile b/source/Makefile
index cd2e7cf75ba..8e9f66bbe42 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -110,6 +110,9 @@ COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a
 COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
+COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
+COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
+COMLIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a 
 
 ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 432c3b5f854..2cd72809579 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -151,7 +151,7 @@ void blf_font_draw(FontBLF *font, char *str)
 
 void blf_font_buffer(FontBLF *font, char *str)
 {
-	unsigned char *data;
+	unsigned char *data, *cbuf;
 	unsigned int c;
 	GlyphBLF *g, *g_prev;
 	FT_Vector delta;
@@ -197,30 +197,27 @@ void blf_font_buffer(FontBLF *font, char *str)
 				pen_x += delta.x >> 6;
 		}
 
-		if (font->b_fbuf) {
-			chx= pen_x + ((int)g->pos_x);
-
-			diff= g->height - ((int)g->pos_y);
-
-			if (diff > 0) {
-				if (g->pitch < 0)
-					pen_y += diff;
-				else
-					pen_y -= diff;
-			}
-			else if (diff < 0) {
-				if (g->pitch < 0)
-					pen_y -= diff;
-				else
-					pen_y += diff;
-			}
-
-
+		chx= pen_x + ((int)g->pos_x);
+		diff= g->height - ((int)g->pos_y);
+		if (diff > 0) {
 			if (g->pitch < 0)
-				chy= pen_y - ((int)g->pos_y);
+				pen_y += diff;
 			else
-				chy= pen_y + ((int)g->pos_y);
+				pen_y -= diff;
+		}
+		else if (diff < 0) {
+			if (g->pitch < 0)
+				pen_y -= diff;
+			else
+				pen_y += diff;
+		}
 
+		if (g->pitch < 0)
+			chy= pen_y - ((int)g->pos_y);
+		else
+			chy= pen_y + ((int)g->pos_y);
+
+		if (font->b_fbuf) {
 			if (chx >= 0 && chx < font->bw && pen_y >= 0 && pen_y < font->bh) {
 				if (g->pitch < 0)
 					yb= 0;
@@ -251,20 +248,52 @@ void blf_font_buffer(FontBLF *font, char *str)
 						yb--;
 				}
 			}
+		}
 
-			if (diff > 0) {
+		if (font->b_cbuf) {
+			if (chx >= 0 && chx < font->bw && pen_y >= 0 && pen_y < font->bh) {
 				if (g->pitch < 0)
-					pen_x -= diff;
+					yb= 0;
 				else
-					pen_y += diff;
-			}
-			else if (diff < 0) {
-				if (g->pitch < 0)
-					pen_x += diff;
-				else
-					pen_y -= diff;
-			}
+					yb= g->height-1;
 
+				for (y= 0; y < g->height; y++) {
+					for (x= 0; x < g->width; x++) {
+						cbuf= font->b_cbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw));
+						data= g->bitmap + x + (yb * g->pitch);
+						a= data[0];
+
+						if (a == 256) {
+							cbuf[0]= font->b_col[0];
+							cbuf[1]= font->b_col[1];
+							cbuf[2]= font->b_col[2];
+						}
+						else {
+							cbuf[0]= (font->b_col[0]*a) + (cbuf[0] * (256-a));
+							cbuf[1]= (font->b_col[1]*a) + (cbuf[1] * (256-a));
+							cbuf[2]= (font->b_col[2]*a) + (cbuf[2] * (256-a));
+						}
+					}
+
+					if (g->pitch < 0)
+						yb++;
+					else
+						yb--;
+				}
+			}
+		}
+
+		if (diff > 0) {
+			if (g->pitch < 0)
+				pen_x -= diff;
+			else
+				pen_y += diff;
+		}
+		else if (diff < 0) {
+			if (g->pitch < 0)
+				pen_x += diff;
+			else
+				pen_y -= diff;
 		}
 
 		pen_x += g->advance;
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index d6d41d6579e..6c2edc9e25f 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -90,6 +90,10 @@ CPPFLAGS += -I$(NAN_BULLET2)/include
 CPPFLAGS += -I$(NAN_FREETYPE)/include
 CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
 
+# lzo and lzma, for pointcache
+CPPFLAGS += -I$(NAN_LZO)/minilzo
+CPPFLAGS += -I$(NAN_LZMA)
+
 ifeq ($(WITH_FFMPEG),true)
     CPPFLAGS += -DWITH_FFMPEG
     CPPFLAGS += $(NAN_FFMPEGCFLAGS)
@@ -111,3 +115,4 @@ ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -I../../quicktime
 	CPPFLAGS += -DWITH_QUICKTIME
 endif
+
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index b3f36dd3b5c..7fab61d5247 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -113,7 +113,10 @@ ifndef CONFIG_GUESS
     export WITH_OPENEXR ?= true
     export WITH_DDS ?= true
     export WITH_OPENJPEG ?= true
-
+    export WITH_LZO ?= true
+    export WITH_LZMA ?= true
+    export NAN_LZO ?= $(LCGDIR)/lzo
+    export NAN_LZMA ?= $(LCGDIR)/lzma
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
     export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)

From c1100361e20ad174aea83160e2072427d12d4fd3 Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Thu, 20 Aug 2009 18:39:25 +0000
Subject: [PATCH 171/577] 2.5 filebrowser * code cleanup: remove duplication in
 drawing, join list and preview drawing

---
 .../blender/editors/include/ED_fileselect.h   |   1 +
 source/blender/editors/space_file/file_draw.c | 229 ++++++++----------
 source/blender/editors/space_file/filesel.c   |   1 +
 .../blender/editors/space_file/space_file.c   |   7 +-
 4 files changed, 98 insertions(+), 140 deletions(-)

diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index c56807ad09a..57ab6a5f8f6 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -65,6 +65,7 @@ typedef struct FileLayout
 	short height;
 	short flag;
 	short dirty;
+	short textheight;
 	float column_widths[MAX_FILE_COLUMN];
 } FileLayout;
 
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 5a07c6a7550..00024ffa961 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -353,59 +353,9 @@ void file_calc_previews(const bContext *C, ARegion *ar)
 	UI_view2d_totRect_set(v2d, sfile->layout->width, sfile->layout->height);
 }
 
-void file_draw_previews(const bContext *C, ARegion *ar)
+static void file_draw_preview(short sx, short sy, ImBuf *imb, FileLayout *layout, short dropshadow)
 {
-	SpaceFile *sfile= CTX_wm_space_file(C);
-	FileSelectParams* params= ED_fileselect_get_params(sfile);
-	FileLayout* layout= ED_fileselect_get_layout(sfile, ar);
-	View2D *v2d= &ar->v2d;
-	struct FileList* files = sfile->files;
-	int numfiles;
-	struct direntry *file;
-	short sx, sy;
-	ImBuf* imb=0;
-	int i;
-	int colorid = 0;
-	int offset;
-	int is_icon;
-
-	if (!files) return;
-
-	filelist_imgsize(files,sfile->layout->prv_w,sfile->layout->prv_h);
-	numfiles = filelist_numfiles(files);
-
-	sx = v2d->cur.xmin + layout->tile_border_x;
-	sy = v2d->cur.ymax - layout->tile_border_y;
-	
-	offset = ED_fileselect_layout_offset(layout, 0, 0);
-	if (offset<0) offset=0;
-	for (i=offset; (i < numfiles) && (i < (offset+(layout->rows+2)*layout->columns)); ++i)
-	{
-		ED_fileselect_layout_tilepos(layout, i, &sx, &sy);
-		sx += v2d->tot.xmin+2;
-		sy = v2d->tot.ymax - sy;
-		file = filelist_file(files, i);	
-
-		if (file->flags & ACTIVE) {
-			colorid = TH_HILITE;
-			draw_tile(sx - 1, sy, sfile->layout->tile_w + 1, sfile->layout->tile_h, colorid,0);
-		} else if (params->active_file == i) {
-			colorid = TH_ACTIVE;
-			draw_tile(sx - 1, sy, sfile->layout->tile_w + 1, sfile->layout->tile_h, colorid,0);
-		}
-		
-		if ( (file->flags & IMAGEFILE) /* || (file->flags & MOVIEFILE) */)
-		{			
-			filelist_loadimage(files, i);
-		}
-		is_icon = 0;
-		imb = filelist_getimage(files, i);
-		if (!imb) {
-			imb = filelist_geticon(files,i);
-			is_icon = 1;
-		}
-
-		if (imb) {
+	if (imb) {
 			float fx, fy;
 			float dx, dy;
 			short xco, yco;
@@ -433,15 +383,15 @@ void file_draw_previews(const bContext *C, ARegion *ar)
 			ey = (short)scaledy;
 			fx = ((float)layout->prv_w - (float)ex)/2.0f;
 			fy = ((float)layout->prv_h - (float)ey)/2.0f;
-			dx = (fx + 0.5f + sfile->layout->prv_border_x);
-			dy = (fy + 0.5f - sfile->layout->prv_border_y);
+			dx = (fx + 0.5f + layout->prv_border_x);
+			dy = (fy + 0.5f - layout->prv_border_y);
 			xco = (float)sx + dx;
-			yco = (float)sy - sfile->layout->prv_h + dy;
+			yco = (float)sy - layout->prv_h + dy;
 
 			glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA);
 			
 			/* shadow */
-			if (!is_icon && (file->flags & IMAGEFILE))
+			if (dropshadow)
 				uiDrawBoxShadow(220, xco, yco, xco + ex, yco + ey);
 			
 			glEnable(GL_BLEND);
@@ -451,7 +401,7 @@ void file_draw_previews(const bContext *C, ARegion *ar)
 			glaDrawPixelsTexScaled(xco, yco, imb->x, imb->y, GL_UNSIGNED_BYTE, imb->rect, scale, scale);
 			
 			/* border */
-			if (!is_icon && (file->flags & IMAGEFILE)) {
+			if (dropshadow) {
 				glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
 				fdrawbox(xco, yco, xco + ex, yco + ey);
 			}
@@ -459,41 +409,6 @@ void file_draw_previews(const bContext *C, ARegion *ar)
 			glDisable(GL_BLEND);
 			imb = 0;
 		}
-
-		/* shadow */
-		UI_ThemeColorShade(TH_BACK, -20);
-		
-		
-		if (S_ISDIR(file->type)) {
-			glColor4f(1.0f, 1.0f, 0.9f, 1.0f);
-		}
-		else if (file->flags & IMAGEFILE) {
-			UI_ThemeColor(TH_SEQ_IMAGE);
-		}
-		else if (file->flags & MOVIEFILE) {
-			UI_ThemeColor(TH_SEQ_MOVIE);
-		}
-		else if (file->flags & BLENDERFILE) {
-			UI_ThemeColor(TH_SEQ_SCENE);
-		}
-		else {
-			if (params->active_file == i) {
-				UI_ThemeColor(TH_GRID); /* grid used for active text */
-			} else if (file->flags & ACTIVE) {
-				UI_ThemeColor(TH_TEXT_HI);			
-			} else {
-				UI_ThemeColor(TH_TEXT);
-			}
-		}
-
-		file_draw_string(sx + layout->prv_border_x, sy+4, file->relname, layout->tile_w, layout->tile_h, FILE_SHORTEN_END);
-
-		if (!sfile->loadimage_timer)
-			sfile->loadimage_timer= WM_event_add_window_timer(CTX_wm_window(C), TIMER1, 1.0/30.0);	/* max 30 frames/sec. */
-
-	}
-
-	uiSetRoundBox(0);
 }
 
 static void renamebutton_cb(bContext *C, void *arg1, char *oldname)
@@ -523,6 +438,39 @@ static void renamebutton_cb(bContext *C, void *arg1, char *oldname)
 	}
 }
 
+
+static void draw_background(FileLayout *layout, View2D *v2d)
+{
+	int i;
+	short sy;
+
+	/* alternating flat shade background */
+	for (i=0; (i <= layout->rows); i+=2)
+	{
+		sy = v2d->cur.ymax - i*(layout->tile_h+2*layout->tile_border_y) - layout->tile_border_y;
+
+		UI_ThemeColorShade(TH_BACK, -7);
+		glRectf(v2d->cur.xmin, sy, v2d->cur.xmax, sy+layout->tile_h+2*layout->tile_border_y);
+		
+	}
+}
+
+static void draw_dividers(FileLayout *layout, View2D *v2d)
+{
+	short sx;
+
+	/* vertical column dividers */
+	sx = v2d->tot.xmin;
+	while (sx < v2d->cur.xmax) {
+		sx += (layout->tile_w+2*layout->tile_border_x);
+		
+		UI_ThemeColorShade(TH_BACK, 30);
+		sdrawline(sx+1,  v2d->cur.ymax - layout->tile_border_y ,  sx+1,  v2d->cur.ymin); 
+		UI_ThemeColorShade(TH_BACK, -30);
+		sdrawline(sx,  v2d->cur.ymax - layout->tile_border_y ,  sx,  v2d->cur.ymin); 
+	}
+}
+
 void file_draw_list(const bContext *C, ARegion *ar)
 {
 	SpaceFile *sfile= CTX_wm_space_file(C);
@@ -531,6 +479,7 @@ void file_draw_list(const bContext *C, ARegion *ar)
 	View2D *v2d= &ar->v2d;
 	struct FileList* files = sfile->files;
 	struct direntry *file;
+	ImBuf *imb;
 	int numfiles;
 	int numfiles_layout;
 	int colorid = 0;
@@ -538,6 +487,7 @@ void file_draw_list(const bContext *C, ARegion *ar)
 	int offset;
 	int i;
 	float sw, spos;
+	short is_icon;
 
 	numfiles = filelist_numfiles(files);
 	
@@ -547,26 +497,11 @@ void file_draw_list(const bContext *C, ARegion *ar)
 	offset = ED_fileselect_layout_offset(layout, 0, 0);
 	if (offset<0) offset=0;
 
-	/* alternating flat shade background */
-	for (i=0; (i <= layout->rows); i+=2)
-	{
-		sx = v2d->cur.xmin;
-		sy = v2d->cur.ymax - i*(layout->tile_h+2*layout->tile_border_y) - layout->tile_border_y;
+	if (params->display != FILE_IMGDISPLAY) {
 
-		UI_ThemeColorShade(TH_BACK, -7);
-		glRectf(v2d->cur.xmin, sy, v2d->cur.xmax, sy+layout->tile_h+2*layout->tile_border_y);
-		
-	}
+		draw_background(layout, v2d);
 	
-	/* vertical column dividers */
-	sx = v2d->tot.xmin;
-	while (sx < ar->v2d.cur.xmax) {
-		sx += (sfile->layout->tile_w+2*sfile->layout->tile_border_x);
-		
-		UI_ThemeColorShade(TH_BACK, 30);
-		sdrawline(sx+1,  ar->v2d.cur.ymax - layout->tile_border_y ,  sx+1,  ar->v2d.cur.ymin); 
-		UI_ThemeColorShade(TH_BACK, -30);
-		sdrawline(sx,  ar->v2d.cur.ymax - layout->tile_border_y ,  sx,  ar->v2d.cur.ymin); 
+		draw_dividers(layout, v2d);
 	}
 
 	sx = ar->v2d.cur.xmin + layout->tile_border_x;
@@ -594,16 +529,33 @@ void file_draw_list(const bContext *C, ARegion *ar)
 		}
 
 		spos = sx;
-		file_draw_icon(spos, sy-3, get_file_icon(file), ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH);
-		spos += ICON_DEFAULT_WIDTH + 4;
-		
+
+		if ( FILE_IMGDISPLAY == params->display ) {
+			if ( (file->flags & IMAGEFILE) /* || (file->flags & MOVIEFILE) */) {			
+				filelist_loadimage(files, i);
+			}
+			is_icon = 0;
+			imb = filelist_getimage(files, i);
+			if (!imb) {
+				imb = filelist_geticon(files,i);
+				is_icon = 1;
+			}
+			
+			file_draw_preview(sx, sy, imb, layout, !is_icon && (file->flags & IMAGEFILE));
+
+		} else {
+				file_draw_icon(spos, sy-3, get_file_icon(file), ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH);
+				spos += ICON_DEFAULT_WIDTH + 4;
+		}
+
 		UI_ThemeColor4(TH_TEXT);
-		
+
 		sw = file_string_width(file->relname);
 		if (file->flags & EDITING) {
+			short but_width = (FILE_IMGDISPLAY == params->display) ? layout->tile_w : layout->column_widths[COLUMN_NAME];
 			uiBlock *block = uiBeginBlock(C, ar, "FileName", UI_EMBOSS);
 			uiBut *but = uiDefBut(block, TEX, 1, "", spos, sy-layout->tile_h-3, 
-				layout->column_widths[COLUMN_NAME], layout->tile_h, file->relname, 1.0f, (float)FILE_MAX,0,0,"");
+				but_width, layout->textheight*2, file->relname, 1.0f, (float)FILE_MAX,0,0,"");
 			uiButSetRenameFunc(but, renamebutton_cb, file);
 			if ( 0 == uiButActiveOnly(C, block, but)) {
 				file->flags &= ~EDITING;
@@ -611,36 +563,42 @@ void file_draw_list(const bContext *C, ARegion *ar)
 			uiEndBlock(C, block);
 			uiDrawBlock(C, block);
 		} else {
-			file_draw_string(spos, sy, file->relname, sw, layout->tile_h, FILE_SHORTEN_END);
+			float name_width = (FILE_IMGDISPLAY == params->display) ? layout->tile_w : sw;
+			file_draw_string(spos, sy, file->relname, name_width, layout->tile_h, FILE_SHORTEN_END);
 		}
-		spos += layout->column_widths[COLUMN_NAME] + 12;
-		if (params->display == FILE_SHOWSHORT) {
+
+		uiSetRoundBox(0);
+
+		if (params->display == FILE_SHORTDISPLAY) {
+			spos += layout->column_widths[COLUMN_NAME] + 12;
 			if (!(file->type & S_IFDIR)) {
 				sw = file_string_width(file->size);
 				spos += layout->column_widths[COLUMN_SIZE] + 12 - sw;
 				file_draw_string(spos, sy, file->size, sw+1, layout->tile_h, FILE_SHORTEN_END);	
 			}
-		} else {
-#if 0 // XXX TODO: add this for non-windows systems
+		} else if (params->display == FILE_LONGDISPLAY) {
+			spos += layout->column_widths[COLUMN_NAME] + 12;
+
+#ifndef WIN32
 			/* rwx rwx rwx */
 			spos += 20;
-			sw = UI_GetStringWidth(file->mode1);
-			file_draw_string(spos, sy, file->mode1, sw, layout->tile_h); 
-			
-			spos += 30;
-			sw = UI_GetStringWidth(file->mode2);
-			file_draw_string(spos, sy, file->mode2, sw, layout->tile_h);
+			sw = file_string_width(file->mode1);
+			file_draw_string(spos, sy, file->mode1, sw, layout->tile_h, FILE_SHORTEN_END); 
+			spos += layout->column_widths[COLUMN_MODE1] + 12;
 
-			spos += 30;
-			sw = UI_GetStringWidth(file->mode3);
-			file_draw_string(spos, sy, file->mode3, sw, layout->tile_h);
-			
-			spos += 30;
-			sw = UI_GetStringWidth(file->owner);
-			file_draw_string(spos, sy, file->owner, sw, layout->tile_h);
+			sw = file_string_width(file->mode2);
+			file_draw_string(spos, sy, file->mode2, sw, layout->tile_h, FILE_SHORTEN_END);
+			spos += layout->column_widths[COLUMN_MODE2] + 12;
+
+			sw = file_string_width(file->mode3);
+			file_draw_string(spos, sy, file->mode3, sw, layout->tile_h, FILE_SHORTEN_END);
+			spos += layout->column_widths[COLUMN_MODE3] + 12;
+
+			sw = file_string_width(file->owner);
+			file_draw_string(spos, sy, file->owner, sw, layout->tile_h, FILE_SHORTEN_END);
+			spos += layout->column_widths[COLUMN_OWNER] + 12;
 #endif
 
-			
 			sw = file_string_width(file->date);
 			file_draw_string(spos, sy, file->date, sw, layout->tile_h, FILE_SHORTEN_END);
 			spos += layout->column_widths[COLUMN_DATE] + 12;
@@ -656,6 +614,9 @@ void file_draw_list(const bContext *C, ARegion *ar)
 			}
 		}
 	}
+
+	if (!sfile->loadimage_timer)
+		sfile->loadimage_timer= WM_event_add_window_timer(CTX_wm_window(C), TIMER1, 1.0/30.0);	/* max 30 frames/sec. */
 }
 
 
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index 8ee7d3515b5..f300505933f 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -287,6 +287,7 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, struct ARegion *ar)
 	numfiles = filelist_numfiles(sfile->files);
 	textheight = file_font_pointsize();
 	layout = sfile->layout;
+	layout->textheight = textheight;
 
 	if (params->display == FILE_IMGDISPLAY) {
 		layout->prv_w = 96;
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index ea640eab090..22ad03f3523 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -310,12 +310,7 @@ static void file_main_area_draw(const bContext *C, ARegion *ar)
 		file_hilight_set(sfile, ar, event->x, event->y);
 	}
 	
-	if (params->display == FILE_IMGDISPLAY) {
-		file_draw_previews(C, ar);
-	} else {
-		file_draw_list(C, ar);
-	}
-	
+	file_draw_list(C, ar);
 	
 	/* reset view matrix */
 	UI_view2d_view_restore(C);

From 86e38ef6f7d9d1970826b8b5e944b189d0065fd9 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 20 Aug 2009 19:46:53 +0000
Subject: [PATCH 172/577] 2.5 Paint:

* Evil backbuf drawing strikes again. In paint modes, it was causing the tool panel to flash black, bad glScissor.
---
 source/blender/editors/include/ED_screen.h        | 1 +
 source/blender/editors/screen/area.c              | 2 +-
 source/blender/editors/space_view3d/view3d_draw.c | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 6cb7593e07d..22a3e737277 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -58,6 +58,7 @@ void	ED_region_panels_init(struct wmWindowManager *wm, struct ARegion *ar);
 void	ED_region_panels(const struct bContext *C, struct ARegion *ar, int vertical, char *context, int contextnr);
 void	ED_region_header_init(struct ARegion *ar);
 void	ED_region_header(const struct bContext *C, struct ARegion *ar);
+void	region_scissor_winrct(struct ARegion *ar, struct rcti *winrct);
 
 /* spaces */
 void	ED_spacetypes_init(void);
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index ea1541a4e02..320574fe8b3 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -249,7 +249,7 @@ void ED_area_overdraw(bContext *C)
 }
 
 /* get scissor rect, checking overlapping regions */
-static void region_scissor_winrct(ARegion *ar, rcti *winrct)
+void region_scissor_winrct(ARegion *ar, rcti *winrct)
 {
 	*winrct= ar->winrct;
 	
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 3140ae76d4b..905657910b8 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1092,6 +1092,7 @@ void backdrawview3d(Scene *scene, ARegion *ar, View3D *v3d)
 {
 	RegionView3D *rv3d= ar->regiondata;
 	struct Base *base = scene->basact;
+	rcti winrct;
 
 /*for 2.43 release, don't use glext and just define the constant.
   this to avoid possibly breaking platforms before release.*/
@@ -1137,6 +1138,9 @@ void backdrawview3d(Scene *scene, ARegion *ar, View3D *v3d)
 	
 	glDisable(GL_DITHER);
 
+	region_scissor_winrct(ar, &winrct);
+	glScissor(winrct.xmin, winrct.ymin, winrct.xmax - winrct.xmin, winrct.ymax - winrct.ymin);
+
 	glClearColor(0.0, 0.0, 0.0, 0.0); 
 	if(v3d->zbuf) {
 		glEnable(GL_DEPTH_TEST);

From 23d9b6bcec742307498d927738c8837458a212c1 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Thu, 20 Aug 2009 21:09:48 +0000
Subject: [PATCH 173/577] View3D: shift+c center the view but no the cursor
 like 2.4x

Probably missing because is not inside view3d_home, it's in the main
winqreadview3dspace function.
---
 source/blender/editors/space_view3d/view3d_edit.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 5ef64274e72..a7ea19e49f9 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -857,6 +857,7 @@ static int viewhome_exec(bContext *C, wmOperator *op) /* was view3d_home() in 2.
 	RegionView3D *rv3d= CTX_wm_region_view3d(C);
 	Scene *scene= CTX_data_scene(C);
 	Base *base;
+	float *curs;
 
 	int center= RNA_boolean_get(op->ptr, "center");
 
@@ -866,6 +867,10 @@ static int viewhome_exec(bContext *C, wmOperator *op) /* was view3d_home() in 2.
 	if(center) {
 		min[0]= min[1]= min[2]= 0.0f;
 		max[0]= max[1]= max[2]= 0.0f;
+
+		/* in 2.4x this also move the cursor to (0, 0, 0) (with shift+c). */
+		curs= give_cursor(scene, v3d);
+		curs[0]= curs[1]= curs[2]= 0.0;
 	}
 	else {
 		INIT_MINMAX(min, max);

From 2881393fbb42cca81ee4d36895fc248a22c54823 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 21 Aug 2009 00:46:36 +0000
Subject: [PATCH 174/577] 2.5 Paint:

* Added airbrush and airbrush rate options to paint stroke. Works for sculpt, vertex paint, and weight paint.
---
 release/ui/space_view3d_toolbar.py              |  5 +++++
 .../blender/editors/sculpt_paint/paint_stroke.c | 17 ++++++++++++++++-
 .../blender/editors/sculpt_paint/paint_vertex.c |  4 ++++
 source/blender/editors/sculpt_paint/sculpt.c    |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 5f42ff1d8b8..35df4dc8b54 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -449,6 +449,11 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 		col.active = brush.space
 		col.itemR(brush, "spacing", text="Distance", slider=True)
 
+		layout.itemR(brush, "airbrush")
+		col = layout.column()
+		col.active = brush.airbrush
+		col.itemR(brush, "rate", slider=True)
+
 
 class VIEW3D_PT_tools_brush_curve(PaintPanel):
 	__label__ = "Curve"
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 715399af888..bd9ea50e0f8 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -43,6 +43,8 @@
 
 #include "BLI_arithb.h"
 
+#include "PIL_time.h"
+
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
@@ -57,6 +59,7 @@
 typedef struct PaintStroke {
 	void *mode_data;
 	void *smooth_stroke_cursor;
+	wmTimer *timer;
 
 	/* Cached values */
 	ViewContext vc;
@@ -227,15 +230,22 @@ int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 	PaintStroke *stroke = op->customdata;
 	float mouse[2];
 
+	if(event->type == TIMER && (event->customdata != stroke->timer))
+		return OPERATOR_RUNNING_MODAL;
+
 	if(!stroke->stroke_started) {
 		stroke->last_mouse_position[0] = event->x;
 		stroke->last_mouse_position[1] = event->y;
 		stroke->stroke_started = stroke->test_start(C, op, event);
 
-		if(stroke->stroke_started)
+		if(stroke->stroke_started) {
 			stroke->smooth_stroke_cursor =
 				WM_paint_cursor_activate(CTX_wm_manager(C), paint_poll, paint_draw_smooth_stroke, stroke);
 
+			if(stroke->brush->flag & BRUSH_AIRBRUSH)
+				stroke->timer = WM_event_add_window_timer(CTX_wm_window(C), TIMER, stroke->brush->rate);
+		}
+
 		ED_region_tag_redraw(ar);
 	}
 
@@ -254,9 +264,14 @@ int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 
 	/* TODO: fix hardcoded event here */
 	if(event->type == LEFTMOUSE && event->val == 0) {
+		/* Exit stroke, free data */
+
 		if(stroke->smooth_stroke_cursor)
 			WM_paint_cursor_end(CTX_wm_manager(C), stroke->smooth_stroke_cursor);
 
+		if(stroke->timer)
+			WM_event_remove_window_timer(CTX_wm_window(C), stroke->timer);
+
 		stroke->done(C, stroke);
 		MEM_freeN(stroke);
 		return OPERATOR_FINISHED;
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 704773795e8..bc2ac480657 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1513,6 +1513,8 @@ static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	
 	/* add modal handler */
 	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+	op->type->modal(C, op, event);
 	
 	return OPERATOR_RUNNING_MODAL;
 }
@@ -1803,6 +1805,8 @@ static int vpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	
 	/* add modal handler */
 	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+	op->type->modal(C, op, event);
 	
 	return OPERATOR_RUNNING_MODAL;
 }
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 76c5c3504da..adaba804799 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1439,6 +1439,8 @@ static int sculpt_brush_stroke_invoke(bContext *C, wmOperator *op, wmEvent *even
 
 	/* add modal handler */
 	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+	op->type->modal(C, op, event);
 	
 	return OPERATOR_RUNNING_MODAL;
 }

From 1be67b60fd08f640b56db23e08ad0469318f26b3 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 21 Aug 2009 02:51:56 +0000
Subject: [PATCH 175/577] 2.5: Modifiers & Menus

* Popup menus now remember the last clicked item again.
* Modifier and File Format menus are now organized in multiple
  columns with categories.
* Hook, explode, uv project modifiers have all their buttons
  again with the relevant operators implemented.
* Modifiers that can't be added by the user, or don't work on
  curves for example, are not in the menu anymore.
* Fix search menu overlapping buttons when near the bottom of
  the screen.
* Fix uv layers search menu not working in some modifiers.
* Cleanup popup menu code a bit, layout engine is used in more
  cases now instead of ugly position calculation code.
---
 release/ui/buttons_data_mesh.py               |   4 +-
 release/ui/buttons_data_modifier.py           |  63 +-
 release/ui/buttons_material.py                |   2 +-
 release/ui/space_image.py                     |   2 +-
 source/blender/blenkernel/BKE_modifier.h      |   5 +-
 source/blender/blenkernel/intern/modifier.c   |   5 +-
 source/blender/editors/include/UI_interface.h |   4 +-
 source/blender/editors/interface/interface.c  |  25 +-
 .../editors/interface/interface_handlers.c    |  21 +-
 .../editors/interface/interface_intern.h      |  14 +-
 .../editors/interface/interface_layout.c      |  62 +-
 .../editors/interface/interface_regions.c     | 840 +++++-------------
 .../editors/interface/interface_templates.c   |   4 +-
 source/blender/editors/object/object_edit.c   |   9 +-
 source/blender/editors/object/object_intern.h |  11 +-
 .../blender/editors/object/object_modifier.c  | 302 +++++--
 source/blender/editors/object/object_ops.c    |   7 +-
 source/blender/editors/screen/area.c          |   5 -
 .../editors/space_view3d/view3d_header.c      |   5 -
 source/blender/makesdna/DNA_modifier_types.h  |   4 +-
 source/blender/makesrna/intern/rna_define.c   |  10 +-
 source/blender/makesrna/intern/rna_modifier.c |  89 +-
 source/blender/makesrna/intern/rna_scene.c    |   8 +-
 .../windowmanager/intern/wm_operators.c       |   2 -
 24 files changed, 708 insertions(+), 795 deletions(-)

diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index b681218a8fe..c7663be1923 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -105,7 +105,7 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
 			row = layout.row()
 			row.itemR(group, "name")
 
-		if context.edit_object:
+		if ob.mode == 'EDIT':
 			row = layout.row()
 			
 			sub = row.row(align=True)
@@ -180,7 +180,7 @@ class DATA_PT_shape_keys(DataButtonsPanel):
 
 				layout.itemR(kb, "name")
 
-		if context.edit_object:
+		if ob.mode == 'EDIT':
 			layout.enabled = False
 
 class DATA_PT_uv_texture(DataButtonsPanel):
diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index 436baa540d4..cc50256f216 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -170,7 +170,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		if md.texture_coordinates == 'OBJECT':
 			layout.itemR(md, "texture_coordinate_object", text="Object")
 		elif md.texture_coordinates == 'UV' and ob.type == 'MESH':
-			layout.item_pointerR(md, "uv_layer", ob.data, "uv_layers")
+			layout.item_pointerR(md, "uv_layer", ob.data, "uv_textures")
 	
 	def EDGE_SPLIT(self, layout, ob, md):
 		split = layout.split()
@@ -187,21 +187,36 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	def EXPLODE(self, layout, ob, md):
 		layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
 		layout.itemR(md, "protect")
-		layout.itemR(md, "split_edges")
-		layout.itemR(md, "unborn")
-		layout.itemR(md, "alive")
-		layout.itemR(md, "dead")
-		# Missing: "Refresh" and "Clear Vertex Group" Operator
+
+		flow = layout.column_flow(2)
+		flow.itemR(md, "split_edges")
+		flow.itemR(md, "unborn")
+		flow.itemR(md, "alive")
+		flow.itemR(md, "dead")
+
+		layout.itemO("object.explode_refresh", text="Refresh");
 		
 	def FLUID_SIMULATION(self, layout, ob, md):
 		layout.itemL(text="See Fluid panel.")
 		
 	def HOOK(self, layout, ob, md):
-		layout.itemR(md, "falloff")
-		layout.itemR(md, "force", slider=True)
 		layout.itemR(md, "object")
 		layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
-		# Missing: "Reset" and "Recenter" Operator
+
+		split = layout.split()
+		split.itemR(md, "falloff")
+		split.itemR(md, "force", slider=True)
+
+		layout.itemS()
+
+		row = layout.row()
+		row.itemO("object.hook_reset", text="Reset")
+		row.itemO("object.hook_recenter", text="Recenter")
+
+		if ob.mode == 'EDIT':
+			row = layout.row()
+			row.itemO("object.hook_select", text="Select")
+			row.itemO("object.hook_assign", text="Assign")
 		
 	def LATTICE(self, layout, ob, md):
 		layout.itemR(md, "object")
@@ -222,7 +237,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 
 		layout.itemS()
 		
-		layout.itemO("object.modifier_mdef_bind", text="Bind")
+		layout.itemO("object.meshdeform_bind", text="Bind")
 		row = layout.row()
 		row.itemR(md, "precision")
 		row.itemR(md, "dynamic")
@@ -346,16 +361,26 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	
 	def UV_PROJECT(self, layout, ob, md):
 		if ob.type == 'MESH':
-			layout.item_pointerR(md, "uv_layer", ob.data, "uv_layers")
-			#layout.itemR(md, "projectors")
+			layout.item_pointerR(md, "uv_layer", ob.data, "uv_textures")
 			layout.itemR(md, "image")
 			layout.itemR(md, "override_image")
-			layout.itemL(text="Aspect Ratio:")
-			col = layout.column(align=True)
-			col.itemR(md, "horizontal_aspect_ratio", text="Horizontal")
-			col.itemR(md, "vertical_aspect_ratio", text="Vertical")
-			
-			#"Projectors" don't work.
+
+			split = layout.split()
+
+			col = split.column()
+			col.itemL(text="Aspect Ratio:")
+
+			sub = col.column(align=True)
+			sub.itemR(md, "horizontal_aspect_ratio", text="Horizontal")
+			sub.itemR(md, "vertical_aspect_ratio", text="Vertical")
+
+			col = split.column()
+			col.itemL(text="Projectors:")
+
+			sub = col.column(align=True)
+			sub.itemR(md, "num_projectors", text="Number")
+			for proj in md.projectors:
+				sub.itemR(proj, "object", text="")
 		
 	def WAVE(self, layout, ob, md):
 		split = layout.split()
@@ -387,7 +412,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		layout.itemR(md, "texture")
 		layout.itemR(md, "texture_coordinates")
 		if md.texture_coordinates == 'MAP_UV' and ob.type == 'MESH':
-			layout.item_pointerR(md, "uv_layer", ob.data, "uv_layers")
+			layout.item_pointerR(md, "uv_layer", ob.data, "uv_textures")
 		elif md.texture_coordinates == 'OBJECT':
 			layout.itemR(md, "texture_coordinates_object")
 		
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index b971a678926..ed3888ee4d8 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -48,7 +48,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
 			col.itemO("object.material_slot_add", icon="ICON_ZOOMIN", text="")
 			col.itemO("object.material_slot_remove", icon="ICON_ZOOMOUT", text="")
 
-			if context.edit_object:
+			if ob.mode == 'EDIT':
 				row = layout.row(align=True)
 				row.itemO("object.material_slot_assign", text="Assign")
 				row.itemO("object.material_slot_select", text="Select")
diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index 090067120b1..888b46e060e 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -247,7 +247,7 @@ class IMAGE_HT_header(bpy.types.Header):
 
 			"""
 			mesh = context.edit_object.data
-			row.item_pointerR(mesh, "active_uv_layer", mesh, "uv_layers")
+			row.item_pointerR(mesh, "active_uv_layer", mesh, "uv_textures")
 			"""
 
 		if ima:
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index b65d77751e2..27c75126026 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -90,7 +90,10 @@ typedef enum {
 	eModifierTypeFlag_UsesPointCache = (1<<6),
 
 	/* For physics modifiers, max one per type */
-	eModifierTypeFlag_Single = (1<<7)
+	eModifierTypeFlag_Single = (1<<7),
+
+	/* Some modifier can't be added manually by user */
+	eModifierTypeFlag_NoUserAdd = (1<<8)
 } ModifierTypeFlag;
 
 typedef void (*ObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 4d567245ce1..37cf427b897 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -8616,7 +8616,8 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->freeData = smokeHRModifier_freeData; 
 		mti->flags = eModifierTypeFlag_AcceptsMesh 
 				| eModifierTypeFlag_UsesPointCache
-				| eModifierTypeFlag_Single;
+				| eModifierTypeFlag_Single
+				| eModifierTypeFlag_NoUserAdd;
 		mti->deformVerts = smokeHRModifier_deformVerts;
 		mti->dependsOnTime = smokeHRModifier_dependsOnTime;
 		mti->updateDepgraph = smokeHRModifier_updateDepgraph;
@@ -8647,7 +8648,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti = INIT_TYPE(Surface);
 		mti->type = eModifierTypeType_OnlyDeform;
 		mti->initData = surfaceModifier_initData;
-		mti->flags = eModifierTypeFlag_AcceptsMesh;
+		mti->flags = eModifierTypeFlag_AcceptsMesh|eModifierTypeFlag_NoUserAdd;
 		mti->dependsOnTime = surfaceModifier_dependsOnTime;
 		mti->freeData = surfaceModifier_freeData; 
 		mti->deformVerts = surfaceModifier_deformVerts;
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 42280ad17c9..5bf59b06bc4 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -100,6 +100,8 @@ typedef struct uiLayout uiLayout;
 #define UI_BLOCK_KEEP_OPEN		256
 #define UI_BLOCK_POPUP			512
 #define UI_BLOCK_OUT_1			1024
+#define UI_BLOCK_NO_FLIP		2048
+#define UI_BLOCK_POPUP_MEMORY	4096
 
 /* uiPopupBlockHandle->menuretval */
 #define UI_RETURN_CANCEL	1       /* cancel all menus cascading */
@@ -254,8 +256,6 @@ void uiPupMenuNotice(struct bContext *C, char *str, ...);
 void uiPupMenuError(struct bContext *C, char *str, ...);
 void uiPupMenuReports(struct bContext *C, struct ReportList *reports);
 
-void uiPupMenuSetActive(int val);
-
 /* Popup Blocks
  *
  * Functions used to create popup blocks. These are like popup menus
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 92a3a4cf841..9bd6c2577ff 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -225,6 +225,7 @@ static void ui_text_bounds_block(uiBlock *block, float offset)
 	uiStyle *style= U.uistyles.first;	// XXX pass on as arg
 	uiBut *bt;
 	int i = 0, j, x1addval= offset, nextcol;
+	int lastcol= 0, col= 0;
 	
 	uiStyleFontSet(&style->widget);
 	
@@ -237,18 +238,26 @@ static void ui_text_bounds_block(uiBlock *block, float offset)
 
 			if(j > i) i = j;
 		}
+
+		if(bt->next && bt->x1 < bt->next->x1)
+			lastcol++;
 	}
 
 	/* cope with multi collumns */
 	bt= block->buttons.first;
 	while(bt) {
-		if(bt->next && bt->x1 < bt->next->x1)
+		if(bt->next && bt->x1 < bt->next->x1) {
 			nextcol= 1;
+			col++;
+		}
 		else nextcol= 0;
 		
 		bt->x1 = x1addval;
 		bt->x2 = bt->x1 + i + block->bounds;
 		
+		if(col == lastcol)
+			bt->x2= MAX2(bt->x2, offset + block->minbounds);
+
 		ui_check_but(bt);	// clips text again
 		
 		if(nextcol)
@@ -281,7 +290,7 @@ void ui_bounds_block(uiBlock *block)
 	
   			if(bt->x2 > block->maxx) block->maxx= bt->x2;
 			if(bt->y2 > block->maxy) block->maxy= bt->y2;
-			
+
 			bt= bt->next;
 		}
 		
@@ -291,6 +300,8 @@ void ui_bounds_block(uiBlock *block)
 		block->maxy += block->bounds;
 	}
 
+	block->maxx= block->minx + MAX2(block->maxx - block->minx, block->minbounds);
+
 	/* hardcoded exception... but that one is annoying with larger safety */ 
 	bt= block->buttons.first;
 	if(bt && strncmp(bt->str, "ERROR", 5)==0) xof= 10;
@@ -2286,8 +2297,12 @@ uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, char *str, short x1,
 				dynstr= BLI_dynstr_new();
 				BLI_dynstr_appendf(dynstr, "%s%%t", RNA_property_ui_name(prop));
 				for(i=0; i<totitem; i++) {
-					if(!item[i].identifier[0])
-						BLI_dynstr_append(dynstr, "|%l");
+					if(!item[i].identifier[0]) {
+						if(item[i].name)
+							BLI_dynstr_appendf(dynstr, "|%s%%l", item[i].name);
+						else
+							BLI_dynstr_append(dynstr, "|%l");
+					}
 					else if(item[i].icon)
 						BLI_dynstr_appendf(dynstr, "|%s %%i%d %%x%d", item[i].name, item[i].icon, item[i].value);
 					else
@@ -2839,6 +2854,8 @@ void uiBlockFlipOrder(uiBlock *block)
 
 	if(U.uiflag & USER_MENUFIXEDORDER)
 		return;
+	else if(block->flag & UI_BLOCK_NO_FLIP)
+		return;
 	
 	for(but= block->buttons.first; but; but= but->next) {
 		if(but->flag & UI_BUT_ALIGN) return;
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index e3518b446ba..b69e8319956 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1720,6 +1720,7 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data
 	uiBlockCreateFunc func= NULL;
 	uiBlockHandleCreateFunc handlefunc= NULL;
 	uiMenuCreateFunc menufunc= NULL;
+	char *menustr= NULL;
 	void *arg= NULL;
 
 	switch(but->type) {
@@ -1744,16 +1745,15 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data
 				data->value= data->origvalue;
 				but->editval= &data->value;
 
-				handlefunc= ui_block_func_MENU;
-				arg= but;
+				menustr= but->str;
 			}
 			break;
 		case ICONROW:
-			handlefunc= ui_block_func_ICONROW;
+			menufunc= ui_block_func_ICONROW;
 			arg= but;
 			break;
 		case ICONTEXTROW:
-			handlefunc= ui_block_func_ICONTEXTROW;
+			menufunc= ui_block_func_ICONTEXTROW;
 			arg= but;
 			break;
 		case COL:
@@ -1771,8 +1771,8 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data
 		if(but->block->handle)
 			data->menu->popup= but->block->handle->popup;
 	}
-	else if(menufunc) {
-		data->menu= ui_popup_menu_create(C, data->region, but, menufunc, arg);
+	else if(menufunc || menustr) {
+		data->menu= ui_popup_menu_create(C, data->region, but, menufunc, arg, menustr);
 		if(but->block->handle)
 			data->menu->popup= but->block->handle->popup;
 	}
@@ -3729,10 +3729,15 @@ static void button_activate_exit(bContext *C, uiHandleButtonData *data, uiBut *b
 		}
 	}
 
-	/* autokey & undo push */
-	if(!data->cancel)
+	if(!data->cancel) {
+		/* autokey & undo push */
 		ui_apply_autokey_undo(C, but);
 
+		/* popup menu memory */
+		if(block->flag & UI_BLOCK_POPUP_MEMORY)
+			ui_popup_menu_memory(block, but);
+	}
+
 	/* disable tooltips until mousemove + last active flag */
 	for(block=data->region->uiblocks.first; block; block=block->next) {
 		for(bt=block->buttons.first; bt; bt=bt->next)
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 9ef5d65b69f..806b40b8646 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -287,7 +287,8 @@ struct uiBlock {
 	char *lockstr;
 	
 	float xofs, yofs;				// offset to parent button
-	int bounds, dobounds, mx, my;	// for doing delayed
+	int dobounds, mx, my;			// for doing delayed
+	int bounds, minbounds;			// for doing delayed
 	int endblock;					// uiEndBlock done?
 
 	rctf safety;				// pulldowns, to detect outside, can differ per case how it is created
@@ -297,6 +298,7 @@ struct uiBlock {
 	int tooltipdisabled;		// to avoid tooltip after click
 
 	int active;					// to keep blocks while drawing and free them afterwards
+	int puphash;				// popup menu hash for memory
 
 	void *evil_C;				// XXX hack for dynamic operator enums
 };
@@ -372,14 +374,15 @@ struct uiPopupBlockHandle {
 	float retvec[3];
 };
 
-uiBlock *ui_block_func_MENU(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
-uiBlock *ui_block_func_ICONROW(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
-uiBlock *ui_block_func_ICONTEXTROW(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
 uiBlock *ui_block_func_COL(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
+void ui_block_func_ICONROW(struct bContext *C, uiLayout *layout, void *arg_but);
+void ui_block_func_ICONTEXTROW(struct bContext *C, uiLayout *layout, void *arg_but);
 
 struct ARegion *ui_tooltip_create(struct bContext *C, struct ARegion *butregion, uiBut *but);
 void ui_tooltip_free(struct bContext *C, struct ARegion *ar);
 
+uiBut *ui_popup_menu_memory(uiBlock *block, uiBut *but);
+
 /* searchbox for string button */
 ARegion *ui_searchbox_create(struct bContext *C, struct ARegion *butregion, uiBut *but);
 int ui_searchbox_inside(struct ARegion *ar, int x, int y);
@@ -394,7 +397,8 @@ typedef uiBlock* (*uiBlockHandleCreateFunc)(struct bContext *C, struct uiPopupBl
 uiPopupBlockHandle *ui_popup_block_create(struct bContext *C, struct ARegion *butregion, uiBut *but,
 	uiBlockCreateFunc create_func, uiBlockHandleCreateFunc handle_create_func, void *arg);
 uiPopupBlockHandle *ui_popup_menu_create(struct bContext *C, struct ARegion *butregion, uiBut *but,
-	uiMenuCreateFunc create_func, void *arg);
+	uiMenuCreateFunc create_func, void *arg, char *str);
+
 void ui_popup_block_free(struct bContext *C, uiPopupBlockHandle *handle);
 
 void ui_set_name_menu(uiBut *but, int value);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index fc4f7da56d2..ab27f8fb0f6 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -619,6 +619,8 @@ void uiItemsEnumO(uiLayout *layout, char *opname, char *propname)
 	wmOperatorType *ot= WM_operatortype_find(opname, 0);
 	PointerRNA ptr;
 	PropertyRNA *prop;
+	uiBut *bt;
+	uiBlock *block= layout->root->block;
 
 	if(!ot || !ot->srna) {
 		ui_item_disabled(layout, opname);
@@ -631,14 +633,31 @@ void uiItemsEnumO(uiLayout *layout, char *opname, char *propname)
 	if(prop && RNA_property_type(prop) == PROP_ENUM) {
 		EnumPropertyItem *item;
 		int totitem, i, free;
+		uiLayout *split= uiLayoutSplit(layout, 0);
+		uiLayout *column= uiLayoutColumn(split, 0);
 
-		RNA_property_enum_items(layout->root->block->evil_C, &ptr, prop, &item, &totitem, &free);
+		RNA_property_enum_items(block->evil_C, &ptr, prop, &item, &totitem, &free);
 
-		for(i=0; i<totitem; i++)
-			if(item[i].identifier[0])
-				uiItemEnumO(layout, (char*)item[i].name, item[i].icon, opname, propname, item[i].value);
-			else
-				uiItemS(layout);
+		for(i=0; i<totitem; i++) {
+			if(item[i].identifier[0]) {
+				uiItemEnumO(column, (char*)item[i].name, item[i].icon, opname, propname, item[i].value);
+			}
+			else {
+				if(item[i].name) {
+					if(i != 0) {
+						column= uiLayoutColumn(split, 0);
+						/* inconsistent, but menus with labels do not look good flipped */
+						block->flag |= UI_BLOCK_NO_FLIP;
+					}
+
+					uiItemL(column, (char*)item[i].name, 0);
+					bt= block->buttons.last;
+					bt->flag= UI_TEXT_LEFT;
+				}
+				else
+					uiItemS(column);
+			}
+		}
 
 		if(free)
 			MEM_freeN(item);
@@ -924,6 +943,8 @@ void uiItemEnumR_string(uiLayout *layout, char *name, int icon, struct PointerRN
 void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname)
 {
 	PropertyRNA *prop;
+	uiBlock *block= layout->root->block;
+	uiBut *bt;
 
 	prop= RNA_struct_find_property(ptr, propname);
 
@@ -935,14 +956,31 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname)
 	if(RNA_property_type(prop) == PROP_ENUM) {
 		EnumPropertyItem *item;
 		int totitem, i, free;
+		uiLayout *split= uiLayoutSplit(layout, 0);
+		uiLayout *column= uiLayoutColumn(split, 0);
 
-		RNA_property_enum_items(layout->root->block->evil_C, ptr, prop, &item, &totitem, &free);
+		RNA_property_enum_items(block->evil_C, ptr, prop, &item, &totitem, &free);
 
-		for(i=0; i<totitem; i++)
-			if(item[i].identifier[0])
-				uiItemEnumR(layout, (char*)item[i].name, 0, ptr, propname, item[i].value);
-			else
-				uiItemS(layout);
+		for(i=0; i<totitem; i++) {
+			if(item[i].identifier[0]) {
+				uiItemEnumR(column, (char*)item[i].name, 0, ptr, propname, item[i].value);
+			}
+			else {
+				if(item[i].name) {
+					if(i != 0) {
+						column= uiLayoutColumn(split, 0);
+						/* inconsistent, but menus with labels do not look good flipped */
+						block->flag |= UI_BLOCK_NO_FLIP;
+					}
+
+					uiItemL(column, (char*)item[i].name, 0);
+					bt= block->buttons.last;
+					bt->flag= UI_TEXT_LEFT;
+				}
+				else
+					uiItemS(column);
+			}
+		}
 
 		if(free)
 			MEM_freeN(item);
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index bf921715524..e83dca5a500 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -38,6 +38,7 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_ghash.h"
 
 #include "BKE_context.h"
 #include "BKE_icons.h"
@@ -75,13 +76,14 @@
 
 /*********************** Menu Data Parsing ********************* */
 
-typedef struct {
+typedef struct MenuEntry {
 	char *str;
 	int retval;
 	int icon;
+	int sepr;
 } MenuEntry;
 
-typedef struct {
+typedef struct MenuData {
 	char *instr;
 	char *title;
 	int titleicon;
@@ -111,7 +113,7 @@ static void menudata_set_title(MenuData *md, char *title, int titleicon)
 		md->titleicon= titleicon;
 }
 
-static void menudata_add_item(MenuData *md, char *str, int retval, int icon)
+static void menudata_add_item(MenuData *md, char *str, int retval, int icon, int sepr)
 {
 	if (md->nitems==md->itemssize) {
 		int nsize= md->itemssize?(md->itemssize<<1):1;
@@ -129,6 +131,7 @@ static void menudata_add_item(MenuData *md, char *str, int retval, int icon)
 	md->items[md->nitems].str= str;
 	md->items[md->nitems].retval= retval;
 	md->items[md->nitems].icon= icon;
+	md->items[md->nitems].sepr= sepr;
 	md->nitems++;
 }
 
@@ -142,12 +145,13 @@ void menudata_free(MenuData *md)
 
 	/**
 	 * Parse menu description strings, string is of the
-	 * form "[sss%t|]{(sss[%xNN]|), (%l|)}", ssss%t indicates the
+	 * form "[sss%t|]{(sss[%xNN]|), (%l|), (sss%l|)}", ssss%t indicates the
 	 * menu title, sss or sss%xNN indicates an option, 
 	 * if %xNN is given then NN is the return value if
 	 * that option is selected otherwise the return value
 	 * is the index of the option (starting with 1). %l
-	 * indicates a seperator.
+	 * indicates a seperator, sss%l indicates a label and
+	 * new column.
 	 * 
 	 * @param str String to be parsed.
 	 * @retval new menudata structure, free with menudata_free()
@@ -157,7 +161,7 @@ MenuData *decompose_menu_string(char *str)
 	char *instr= BLI_strdup(str);
 	MenuData *md= menudata_new(instr);
 	char *nitem= NULL, *s= instr;
-	int nicon=0, nretval= 1, nitem_is_title= 0;
+	int nicon=0, nretval= 1, nitem_is_title= 0, nitem_is_sepr= 0;
 	
 	while (1) {
 		char c= *s;
@@ -174,7 +178,10 @@ MenuData *decompose_menu_string(char *str)
 				*s= '\0';
 				s++;
 			} else if (s[1]=='l') {
-				nitem= "%l";
+				nitem_is_sepr= 1;
+				if(!nitem) nitem= "";
+
+				*s= '\0';
 				s++;
 			} else if (s[1]=='i') {
 				nicon= atoi(s+2);
@@ -186,15 +193,18 @@ MenuData *decompose_menu_string(char *str)
 			if (nitem) {
 				*s= '\0';
 
-				if (nitem_is_title) {
+				if(nitem_is_title) {
 					menudata_set_title(md, nitem, nicon);
 					nitem_is_title= 0;
-				} else {
+				}
+				else if(nitem_is_sepr) {
 					/* prevent separator to get a value */
-					if(nitem[0]=='%' && nitem[1]=='l')
-						menudata_add_item(md, nitem, -1, nicon);
-					else
-						menudata_add_item(md, nitem, nretval, nicon);
+					menudata_add_item(md, nitem, -1, nicon, 1);
+					nretval= md->nitems+1;
+					nitem_is_sepr= 0;
+				}
+				else {
+					menudata_add_item(md, nitem, nretval, nicon, 0);
 					nretval= md->nitems+1;
 				} 
 				
@@ -827,6 +837,8 @@ static void ui_searchbox_region_free(ARegion *ar)
 	ar->regiondata= NULL;
 }
 
+static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, uiBlock *block);
+
 ARegion *ui_searchbox_create(bContext *C, ARegion *butregion, uiBut *but)
 {
 	uiStyle *style= U.uistyles.first;	// XXX pass on as arg
@@ -847,7 +859,7 @@ ARegion *ui_searchbox_create(bContext *C, ARegion *butregion, uiBut *but)
 	
 	/* create searchbox data */
 	data= MEM_callocN(sizeof(uiSearchboxData), "uiSearchboxData");
-	
+
 	/* set font, get bb */
 	data->fstyle= style->widget; /* copy struct */
 	data->fstyle.align= UI_STYLE_TEXT_CENTER;
@@ -929,10 +941,14 @@ ARegion *ui_searchbox_create(bContext *C, ARegion *butregion, uiBut *but)
 			}
 		}
 		if(y1 < 0) {
-			y1 += 36;
-			y2 += 36;
+			int newy1;
+			UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->y2 + ofsy, 0, &newy1);
+			newy1 += butregion->winrct.ymin;
+
+			y2= y2-y1 + newy1;
+			y1= newy1;
 		}
-		
+
 		/* widget rect, in region coords */
 		data->bbox.xmin= MENU_SHADOW_SIDE;
 		data->bbox.xmax= x2-x1 + MENU_SHADOW_SIDE;
@@ -1310,24 +1326,21 @@ void ui_popup_block_free(bContext *C, uiPopupBlockHandle *handle)
 
 /***************************** Menu Button ***************************/
 
-uiBlock *ui_block_func_MENU(bContext *C, uiPopupBlockHandle *handle, void *arg_but)
+static void ui_block_func_MENUSTR(bContext *C, uiLayout *layout, void *arg_str)
 {
-	uiBut *but= arg_but;
-	uiBlock *block;
+	uiBlock *block= uiLayoutGetBlock(layout);
+	uiPopupBlockHandle *handle= block->handle;
+	uiLayout *split, *column;
 	uiBut *bt;
 	MenuData *md;
-	ListBase lb;
-	float aspect;
-	int width, height, boxh, columns, rows, startx, starty, x1, y1, xmax, a;
-
-	/* create the block */
-	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
-	block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
+	MenuEntry *entry;
+	char *instr= arg_str;
+	int columns, rows, a, b;
 
 	/* compute menu data */
-	md= decompose_menu_string(but->str);
+	md= decompose_menu_string(instr);
 
-	/* columns and row calculation */
+	/* columns and row estimation */
 	columns= (md->nitems+20)/20;
 	if(columns<1)
 		columns= 1;
@@ -1339,180 +1352,114 @@ uiBlock *ui_block_func_MENU(bContext *C, uiPopupBlockHandle *handle, void *arg_b
 		rows= 1;
 	while(rows*columns<md->nitems)
 		rows++;
-		
-	/* prevent scaling up of pupmenu */
-	aspect= but->block->aspect;
-	if(aspect < 1.0f)
-		aspect = 1.0f;
 
-	/* size and location */
-	if(md->title)
-		width= 1.5*aspect*strlen(md->title)+UI_GetStringWidth(md->title);
-	else
-		width= 0;
-
-	for(a=0; a<md->nitems; a++) {
-		xmax= aspect*UI_GetStringWidth(md->items[a].str);
-		if(md->items[a].icon)
-			xmax += 20*aspect;
-		if(xmax>width)
-			width= xmax;
-	}
-
-	width+= 10;
-	if(width < (but->x2 - but->x1))
-		width = (but->x2 - but->x1);
-	if(width<50)
-		width=50;
-	
-	boxh= MENU_BUTTON_HEIGHT;
-	
-	height= rows*boxh;
-	if(md->title)
-		height+= boxh;
-
-	/* here we go! */
-	startx= but->x1;
-	starty= but->y1;
-	
+	/* create title */
 	if(md->title) {
-		uiBut *bt;
-
-		if (md->titleicon) {
-			bt= uiDefIconTextBut(block, LABEL, 0, md->titleicon, md->title, startx, (short)(starty+rows*boxh), (short)width, (short)boxh, NULL, 0.0, 0.0, 0, 0, "");
-		} else {
-			bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+rows*boxh), (short)width, (short)boxh, NULL, 0.0, 0.0, 0, 0, "");
+		if(md->titleicon) {
+			uiItemL(layout, md->title, md->titleicon);
+		}
+		else {
+			uiItemL(layout, md->title, 0);
+			bt= block->buttons.last;
 			bt->flag= UI_TEXT_LEFT;
 		}
 	}
 
-	for(a=0; a<md->nitems; a++) {
-		
-		x1= startx + width*((int)(md->nitems-a-1)/rows);
-		y1= starty - boxh*(rows - ((md->nitems - a - 1)%rows)) + (rows*boxh);
+	/* inconsistent, but menus with labels do not look good flipped */
+	for(a=0, b=0; a<md->nitems; a++, b++) {
+		entry= &md->items[a];
 
-		if (strcmp(md->items[md->nitems-a-1].str, "%l")==0) {
-			bt= uiDefBut(block, SEPR, B_NOP, "", x1, y1,(short)(width-(rows>1)), (short)(boxh-1), NULL, 0.0, 0.0, 0, 0, "");
+		if(entry->sepr && entry->str[0])
+			block->flag |= UI_BLOCK_NO_FLIP;
+	}
+
+	/* create items */
+	split= uiLayoutSplit(layout, 0);
+
+	for(a=0, b=0; a<md->nitems; a++, b++) {
+		if(block->flag & UI_BLOCK_NO_FLIP)
+			entry= &md->items[a];
+		else
+			entry= &md->items[md->nitems-a-1];
+		
+		/* new column on N rows or on separation label */
+		if((b % rows == 0) || (entry->sepr && entry->str[0])) {
+			column= uiLayoutColumn(split, 0);
+			b= 0;
 		}
-		else if(md->items[md->nitems-a-1].icon) {
-			bt= uiDefIconTextButF(block, BUTM|FLO, B_NOP, md->items[md->nitems-a-1].icon ,md->items[md->nitems-a-1].str, x1, y1,(short)(width-(rows>1)), (short)(boxh-1), &handle->retvalue, (float) md->items[md->nitems-a-1].retval, 0.0, 0, 0, "");
+
+		if(entry->sepr) {
+			uiItemL(column, entry->str, entry->icon);
+			bt= block->buttons.last;
+			bt->flag= UI_TEXT_LEFT;
+		}
+		else if(entry->icon) {
+			uiDefIconTextButF(block, BUTM|FLO, B_NOP, entry->icon, entry->str, 0, 0,
+				UI_UNIT_X*5, UI_UNIT_Y, &handle->retvalue, (float) entry->retval, 0.0, 0, 0, "");
 		}
 		else {
-			bt= uiDefButF(block, BUTM|FLO, B_NOP, md->items[md->nitems-a-1].str, x1, y1,(short)(width-(rows>1)), (short)(boxh-1), &handle->retvalue, (float) md->items[md->nitems-a-1].retval, 0.0, 0, 0, "");
+			uiDefButF(block, BUTM|FLO, B_NOP, entry->str, 0, 0,
+				UI_UNIT_X*5, UI_UNIT_X, &handle->retvalue, (float) entry->retval, 0.0, 0, 0, "");
 		}
 	}
 	
 	menudata_free(md);
-
-	/* the code up here has flipped locations, because of change of preferred order */
-	/* thats why we have to switch list order too, to make arrowkeys work */
-	
-	lb.first= lb.last= NULL;
-	bt= block->buttons.first;
-	while(bt) {
-		uiBut *next= bt->next;
-		BLI_remlink(&block->buttons, bt);
-		BLI_addhead(&lb, bt);
-		bt= next;
-	}
-	block->buttons= lb;
-
-	block->direction= UI_TOP;
-	uiEndBlock(C, block);
-
-	return block;
 }
 
-uiBlock *ui_block_func_ICONROW(bContext *C, uiPopupBlockHandle *handle, void *arg_but)
+void ui_block_func_ICONROW(bContext *C, uiLayout *layout, void *arg_but)
 {
+	uiBlock *block= uiLayoutGetBlock(layout);
+	uiPopupBlockHandle *handle= block->handle;
 	uiBut *but= arg_but;
-	uiBlock *block;
 	int a;
 	
-	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
-	block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
-	
-	for(a=(int)but->hardmin; a<=(int)but->hardmax; a++) {
-		uiDefIconButF(block, BUTM|FLO, B_NOP, but->icon+(a-but->hardmin), 0, (short)(18*a), (short)(but->x2-but->x1-4), 18, &handle->retvalue, (float)a, 0.0, 0, 0, "");
-	}
-
-	block->direction= UI_TOP;	
-
-	uiEndBlock(C, block);
-
-	return block;
+	for(a=(int)but->hardmin; a<=(int)but->hardmax; a++)
+		uiDefIconButF(block, BUTM|FLO, B_NOP, but->icon+(a-but->hardmin), 0, 0, UI_UNIT_X*5, UI_UNIT_Y,
+			&handle->retvalue, (float)a, 0.0, 0, 0, "");
 }
 
-uiBlock *ui_block_func_ICONTEXTROW(bContext *C, uiPopupBlockHandle *handle, void *arg_but)
+void ui_block_func_ICONTEXTROW(bContext *C, uiLayout *layout, void *arg_but)
 {
-	uiBut *but= arg_but;
-	uiBlock *block;
+	uiBlock *block= uiLayoutGetBlock(layout);
+	uiPopupBlockHandle *handle= block->handle;
+	uiBut *but= arg_but, *bt;
 	MenuData *md;
-	int width, xmax, ypos, a;
-
-	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
-	block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
+	MenuEntry *entry;
+	int a;
 
 	md= decompose_menu_string(but->str);
 
-	/* size and location */
-	/* expand menu width to fit labels */
-	if(md->title)
-		width= 2*strlen(md->title)+UI_GetStringWidth(md->title);
-	else
-		width= 0;
-
-	for(a=0; a<md->nitems; a++) {
-		xmax= UI_GetStringWidth(md->items[a].str);
-		if(xmax>width) width= xmax;
+	/* title */
+	if(md->title) {
+		bt= uiDefBut(block, LABEL, 0, md->title, 0, 0, UI_UNIT_X*5, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+		bt->flag= UI_TEXT_LEFT;
 	}
 
-	width+= 30;
-	if (width<50) width=50;
-
-	ypos = 1;
-
 	/* loop through the menu options and draw them out with icons & text labels */
 	for(a=0; a<md->nitems; a++) {
+		entry= &md->items[md->nitems-a-1];
 
-		/* add a space if there's a separator (%l) */
-	        if (strcmp(md->items[a].str, "%l")==0) {
-			ypos +=3;
-		}
-		else {
-			uiDefIconTextButF(block, BUTM|FLO, B_NOP, (short)((but->icon)+(md->items[a].retval-but->hardmin)), md->items[a].str, 0, ypos,(short)width, 19, &handle->retvalue, (float) md->items[a].retval, 0.0, 0, 0, "");
-			ypos += 20;
-		}
+		if(entry->sepr)
+			uiItemS(layout);
+		else
+			uiDefIconTextButF(block, BUTM|FLO, B_NOP, (short)((but->icon)+(entry->retval-but->hardmin)), entry->str,
+				0, 0, UI_UNIT_X*5, UI_UNIT_Y, &handle->retvalue, (float) entry->retval, 0.0, 0, 0, "");
 	}
-	
-	if(md->title) {
-		uiBut *bt;
 
-		bt= uiDefBut(block, LABEL, 0, md->title, 0, ypos, (short)width, 19, NULL, 0.0, 0.0, 0, 0, "");
-		bt->flag= UI_TEXT_LEFT;
-	}
-	
 	menudata_free(md);
-
-	block->direction= UI_TOP;
-
-	uiBoundsBlock(block, 3);
-	uiEndBlock(C, block);
-
-	return block;
 }
 
+#if 0
 static void ui_warp_pointer(short x, short y)
 {
 	/* XXX 2.50 which function to use for this? */
-#if 0
 	/* OSX has very poor mousewarp support, it sends events;
 	   this causes a menu being pressed immediately ... */
 	#ifndef __APPLE__
 	warp_pointer(x, y);
 	#endif
-#endif
 }
+#endif
 
 /********************* Color Button ****************/
 
@@ -2158,406 +2105,115 @@ void uiBlockColorbandButtons(uiBlock *block, ColorBand *coba, rctf *butr, int ev
 }
 
 
-/* ******************** PUPmenu ****************** */
+/************************ Popup Menu Memory ****************************/
 
-static int pupmenu_set= 0;
-
-void uiPupMenuSetActive(int val)
+static int ui_popup_menu_hash(char *str)
 {
-	pupmenu_set= val;
+	return BLI_ghashutil_strhash(str);
 }
 
-/* value== -1 read, otherwise set */
-static int pupmenu_memory(char *str, int value)
+/* but == NULL read, otherwise set */
+uiBut *ui_popup_menu_memory(uiBlock *block, uiBut *but)
 {
 	static char mem[256], first=1;
-	int val=0, nr=0;
+	int hash= block->puphash;
 	
 	if(first) {
-		memset(mem, 0, 256);
+		/* init */
+		memset(mem, -1, sizeof(mem));
 		first= 0;
 	}
-	while(str[nr]) {
-		val+= str[nr];
-		nr++;
-	}
 
-	if(value >= 0) mem[ val & 255 ]= value;
-	else return mem[ val & 255 ];
-	
-	return 0;
+	if(but) {
+		/* set */
+		mem[hash & 255 ]= BLI_findindex(&block->buttons, but);
+		return NULL;
+	}
+	else {
+		/* get */
+		return BLI_findlink(&block->buttons, mem[hash & 255]);
+	}
 }
 
-#define PUP_LABELH	6
-
-typedef struct uiPupMenuInfo {
-	char *instr;
-	int mx, my;
-	int startx, starty;
-	int maxrow;
-} uiPupMenuInfo;
-
-uiBlock *ui_block_func_PUPMENU(bContext *C, uiPopupBlockHandle *handle, void *arg_info)
-{
-	uiBlock *block;
-	uiPupMenuInfo *info;
-	int columns, rows, mousemove[2]= {0, 0}, mousewarp= 0;
-	int width, height, xmax, ymax, maxrow;
-	int a, startx, starty, endx, endy, x1, y1;
-	int lastselected;
-	MenuData *md;
-
-	info= arg_info;
-	maxrow= info->maxrow;
-	height= 0;
-
-	/* block stuff first, need to know the font */
-	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
-	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
-	block->direction= UI_DOWN;
-	
-	md= decompose_menu_string(info->instr);
-
-	rows= md->nitems;
-	if(rows<1)
-		rows= 1;
-	
-	columns= 1;
-
-	/* size and location, title slightly bigger for bold */
-	if(md->title) {
-		width= 2*strlen(md->title)+UI_GetStringWidth(md->title);
-		width /= columns;
-	}
-	else width= 0;
-
-	for(a=0; a<md->nitems; a++) {
-		xmax= UI_GetStringWidth(md->items[a].str);
-		if(xmax>width) width= xmax;
-
-		if(strcmp(md->items[a].str, "%l")==0) height+= PUP_LABELH;
-		else height+= MENU_BUTTON_HEIGHT;
-	}
-
-	width+= 10;
-	if (width<50) width=50;
-	
-	wm_window_get_size(CTX_wm_window(C), &xmax, &ymax);
-
-	/* set first item */
-	lastselected= 0;
-	if(pupmenu_set) {
-		lastselected= pupmenu_set-1;
-		pupmenu_set= 0;
-	}
-	else if(md->nitems>1) {
-		lastselected= pupmenu_memory(info->instr, -1);
-	}
-
-	startx= info->mx-(0.8*(width));
-	starty= info->my-height+MENU_BUTTON_HEIGHT/2;
-	if(lastselected>=0 && lastselected<md->nitems) {
-		for(a=0; a<md->nitems; a++) {
-			if(a==lastselected) break;
-			if( strcmp(md->items[a].str, "%l")==0) starty+= PUP_LABELH;
-			else starty+=MENU_BUTTON_HEIGHT;
-		}
-		
-		//starty= info->my-height+MENU_BUTTON_HEIGHT/2+lastselected*MENU_BUTTON_HEIGHT;
-	}
-	
-	if(startx<10) {
-		startx= 10;
-	}
-	if(starty<10) {
-		mousemove[1]= 10-starty;
-		starty= 10;
-	}
-	
-	endx= startx+width*columns;
-	endy= starty+height;
-
-	if(endx>xmax) {
-		endx= xmax-10;
-		startx= endx-width*columns;
-	}
-	if(endy>ymax-20) {
-		mousemove[1]= ymax-endy-20;
-		endy= ymax-20;
-		starty= endy-height;
-	}
-
-	if(mousemove[0] || mousemove[1]) {
-		ui_warp_pointer(info->mx+mousemove[0], info->my+mousemove[1]);
-		mousemove[0]= info->mx;
-		mousemove[1]= info->my;
-		mousewarp= 1;
-	}
-
-	/* here we go! */
-	if(md->title) {
-		uiBut *bt;
-		char titlestr[256];
-
-		if(md->titleicon) {
-			width+= 20;
-			sprintf(titlestr, " %s", md->title);
-			uiDefIconTextBut(block, LABEL, 0, md->titleicon, titlestr, startx, (short)(starty+height), width, MENU_BUTTON_HEIGHT, NULL, 0.0, 0.0, 0, 0, "");
-		}
-		else {
-			bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+height), columns*width, MENU_BUTTON_HEIGHT, NULL, 0.0, 0.0, 0, 0, "");
-			bt->flag= UI_TEXT_LEFT;
-		}
-		
-		//uiDefBut(block, SEPR, 0, "", startx, (short)(starty+height)-MENU_SEPR_HEIGHT, width, MENU_SEPR_HEIGHT, NULL, 0.0, 0.0, 0, 0, "");
-	}
-
-	x1= startx + width*((int)a/rows);
-	y1= starty + height - MENU_BUTTON_HEIGHT; // - MENU_SEPR_HEIGHT;
-		
-	for(a=0; a<md->nitems; a++) {
-		char *name= md->items[a].str;
-		int icon = md->items[a].icon;
-
-		if(strcmp(name, "%l")==0) {
-			uiDefBut(block, SEPR, B_NOP, "", x1, y1, width, PUP_LABELH, NULL, 0, 0.0, 0, 0, "");
-			y1 -= PUP_LABELH;
-		}
-		else if (icon) {
-			uiDefIconButF(block, BUTM, B_NOP, icon, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, &handle->retvalue, (float) md->items[a].retval, 0.0, 0, 0, "");
-			y1 -= MENU_BUTTON_HEIGHT;
-		}
-		else {
-			uiDefButF(block, BUTM, B_NOP, name, x1, y1, width, MENU_BUTTON_HEIGHT-1, &handle->retvalue, (float) md->items[a].retval, 0.0, 0, 0, "");
-			y1 -= MENU_BUTTON_HEIGHT;
-		}
-	}
-	
-	uiBoundsBlock(block, 1);
-	uiEndBlock(C, block);
-
-	menudata_free(md);
-
-	/* XXX 2.5 need to store last selected */
-#if 0
-	/* calculate last selected */
-	if(event & ui_return_ok) {
-		lastselected= 0;
-		for(a=0; a<md->nitems; a++) {
-			if(val==md->items[a].retval) lastselected= a;
-		}
-		
-		pupmenu_memory(info->instr, lastselected);
-	}
-#endif
-	
-	/* XXX 2.5 need to warp back */
-#if 0
-	if(mousemove[1] && (event & ui_return_out)==0)
-		ui_warp_pointer(mousemove[0], mousemove[1]);
-	return val;
-#endif
-
-	return block;
-}
-
-uiBlock *ui_block_func_PUPMENUCOL(bContext *C, uiPopupBlockHandle *handle, void *arg_info)
-{
-	uiBlock *block;
-	uiPupMenuInfo *info;
-	int columns, rows, mousemove[2]= {0, 0}, mousewarp;
-	int width, height, xmax, ymax, maxrow;
-	int a, startx, starty, endx, endy, x1, y1;
-	float fvalue;
-	MenuData *md;
-
-	info= arg_info;
-	maxrow= info->maxrow;
-	height= 0;
-
-	/* block stuff first, need to know the font */
-	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
-	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
-	block->direction= UI_DOWN;
-	
-	md= decompose_menu_string(info->instr);
-
-	/* columns and row calculation */
-	columns= (md->nitems+maxrow)/maxrow;
-	if (columns<1) columns= 1;
-	
-	if(columns > 8) {
-		maxrow += 5;
-		columns= (md->nitems+maxrow)/maxrow;
-	}
-	
-	rows= (int) md->nitems/columns;
-	if (rows<1) rows= 1;
-	
-	while (rows*columns<(md->nitems+columns) ) rows++;
-
-	/* size and location, title slightly bigger for bold */
-	if(md->title) {
-		width= 2*strlen(md->title)+UI_GetStringWidth(md->title);
-		width /= columns;
-	}
-	else width= 0;
-
-	for(a=0; a<md->nitems; a++) {
-		xmax= UI_GetStringWidth(md->items[a].str);
-		if(xmax>width) width= xmax;
-	}
-
-	width+= 10;
-	if (width<50) width=50;
-	
-	height= rows*MENU_BUTTON_HEIGHT;
-	if (md->title) height+= MENU_BUTTON_HEIGHT;
-	
-	wm_window_get_size(CTX_wm_window(C), &xmax, &ymax);
-
-	/* find active item */
-	fvalue= handle->retvalue;
-	for(a=0; a<md->nitems; a++) {
-		if( md->items[a].retval== (int)fvalue ) break;
-	}
-
-	/* no active item? */
-	if(a==md->nitems) {
-		if(md->title) a= -1;
-		else a= 0;
-	}
-
-	if(a>0)
-		startx = info->mx-width/2 - ((int)(a)/rows)*width;
-	else
-		startx= info->mx-width/2;
-	starty = info->my-height + MENU_BUTTON_HEIGHT/2 + ((a)%rows)*MENU_BUTTON_HEIGHT;
-
-	if (md->title) starty+= MENU_BUTTON_HEIGHT;
-	
-	if(startx<10) {
-		mousemove[0]= 10-startx;
-		startx= 10;
-	}
-	if(starty<10) {
-		mousemove[1]= 10-starty;
-		starty= 10;
-	}
-	
-	endx= startx+width*columns;
-	endy= starty+height;
-
-	if(endx>xmax) {
-		mousemove[0]= xmax-endx-10;
-		endx= xmax-10;
-		startx= endx-width*columns;
-	}
-	if(endy>ymax) {
-		mousemove[1]= ymax-endy-10;
-		endy= ymax-10;
-		starty= endy-height;
-	}
-
-	if(mousemove[0] || mousemove[1]) {
-		ui_warp_pointer(info->mx+mousemove[0], info->my+mousemove[1]);
-		mousemove[0]= info->mx;
-		mousemove[1]= info->my;
-		mousewarp= 1;
-	}
-
-	/* here we go! */
-	if(md->title) {
-		uiBut *bt;
-
-		if(md->titleicon) {
-		}
-		else {
-			bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+rows*MENU_BUTTON_HEIGHT), columns*width, MENU_BUTTON_HEIGHT, NULL, 0.0, 0.0, 0, 0, "");
-			bt->flag= UI_TEXT_LEFT;
-		}
-	}
-
-	for(a=0; a<md->nitems; a++) {
-		char *name= md->items[a].str;
-		int icon = md->items[a].icon;
-
-		x1= startx + width*((int)a/rows);
-		y1= starty - MENU_BUTTON_HEIGHT*(a%rows) + (rows-1)*MENU_BUTTON_HEIGHT; 
-		
-		if(strcmp(name, "%l")==0) {
-			uiDefBut(block, SEPR, B_NOP, "", x1, y1, width, PUP_LABELH, NULL, 0, 0.0, 0, 0, "");
-			y1 -= PUP_LABELH;
-		}
-		else if (icon) {
-			uiDefIconButF(block, BUTM, B_NOP, icon, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, &handle->retvalue, (float) md->items[a].retval, 0.0, 0, 0, "");
-			y1 -= MENU_BUTTON_HEIGHT;
-		}
-		else {
-			uiDefButF(block, BUTM, B_NOP, name, x1, y1, width, MENU_BUTTON_HEIGHT-1, &handle->retvalue, (float) md->items[a].retval, 0.0, 0, 0, "");
-			y1 -= MENU_BUTTON_HEIGHT;
-		}
-	}
-	
-	uiBoundsBlock(block, 1);
-	uiEndBlock(C, block);
-	
-	menudata_free(md);
-	
-	/* XXX 2.5 need to warp back */
-#if 0
-	if((event & UI_RETURN_OUT)==0)
-		ui_warp_pointer(mousemove[0], mousemove[1]);
-#endif
-
-	return block;
-}
-
-/************************** Menu Definitions ***************************/
-
-/* prototype */
-static uiBlock *ui_block_func_MENU_ITEM(bContext *C, uiPopupBlockHandle *handle, void *arg_info);
+/******************** Popup Menu with callback or string **********************/
 
 struct uiPopupMenu {
 	uiBlock *block;
 	uiLayout *layout;
+	uiBut *but;
+
+	int mx, my, popup, slideout;
+	int startx, starty, maxrow;
+
+	uiMenuCreateFunc menu_func;
+	void *menu_arg;
 };
 
-typedef struct uiMenuInfo {
-	uiPopupMenu *pup;
-	int mx, my, popup, slideout;
-	int startx, starty;
-} uiMenuInfo;
-
-/************************ Menu Definitions to uiBlocks ***********************/
-
-static uiBlock *ui_block_func_MENU_ITEM(bContext *C, uiPopupBlockHandle *handle, void *arg_info)
+static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, void *arg_pup)
 {
 	uiBlock *block;
-	uiMenuInfo *info= arg_info;
-	uiPopupMenu *pup;
+	uiBut *bt;
 	ScrArea *sa;
 	ARegion *ar;
-	
-	pup= info->pup;
+	uiPopupMenu *pup= arg_pup;
+	int offset, direction, minwidth, flip;
+
+	if(pup->menu_func) {
+		pup->block->handle= handle;
+		pup->menu_func(C, pup->layout, pup->menu_arg);
+		pup->block->handle= NULL;
+	}
+
+	if(pup->but) {
+		/* minimum width to enforece */
+		minwidth= pup->but->x2 - pup->but->x1;
+
+		if(pup->but->type == PULLDOWN || pup->but->menu_create_func) {
+			direction= UI_DOWN;
+			flip= 1;
+		}
+		else {
+			direction= UI_TOP;
+			flip= 0;
+		}
+	}
+	else {
+		minwidth= 50;
+		direction= UI_DOWN;
+		flip= 1;
+	}
+
 	block= pup->block;
 	
-	/* block stuff first, need to know the font */
-	uiBlockSetRegion(block, handle->region);
-	block->direction= UI_DOWN;
+	/* in some cases we create the block before the region,
+	   so we set it delayed here if necessary */
+	if(BLI_findindex(&handle->region->uiblocks, block) == -1)
+		uiBlockSetRegion(block, handle->region);
+
+	block->direction= direction;
 
 	uiBlockLayoutResolve(C, block, NULL, NULL);
 
-	if(info->popup) {
+	if(pup->popup) {
 		uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT|UI_BLOCK_RET_1);
-		uiBlockSetDirection(block, UI_DOWN);
+		uiBlockSetDirection(block, direction);
 
-		/* here we set an offset for the mouse position */
-		uiMenuPopupBoundsBlock(block, 1, 0, 1.5*MENU_BUTTON_HEIGHT);
+		/* offset the mouse position, possibly based on earlier selection */
+		offset= 1.5*MENU_BUTTON_HEIGHT;
+
+		if(block->flag & UI_BLOCK_POPUP_MEMORY) {
+			bt= ui_popup_menu_memory(block, NULL);
+
+			if(bt)
+				offset= -bt->y1 - 0.5f*MENU_BUTTON_HEIGHT;
+		}
+
+		block->minbounds= minwidth;
+		uiMenuPopupBoundsBlock(block, 1, 20, offset);
 	}
 	else {
 		/* for a header menu we set the direction automatic */
-		if(!info->slideout) {
+		if(!pup->slideout && flip) {
 			sa= CTX_wm_area(C);
 			ar= CTX_wm_region(C);
 
@@ -2569,59 +2225,77 @@ static uiBlock *ui_block_func_MENU_ITEM(bContext *C, uiPopupBlockHandle *handle,
 			}
 		}
 
-		uiTextBoundsBlock(block, 50);
+		block->minbounds= minwidth;
+		uiTextBoundsBlock(block, 40);
 	}
 
 	/* if menu slides out of other menu, override direction */
-	if(info->slideout)
+	if(pup->slideout)
 		uiBlockSetDirection(block, UI_RIGHT);
 
 	uiEndBlock(C, block);
-	
-	return block;
+
+	return pup->block;
 }
 
-uiPopupBlockHandle *ui_popup_menu_create(bContext *C, ARegion *butregion, uiBut *but, uiMenuCreateFunc menu_func, void *arg)
+uiPopupBlockHandle *ui_popup_menu_create(bContext *C, ARegion *butregion, uiBut *but, uiMenuCreateFunc menu_func, void *arg, char *str)
 {
+	wmWindow *window= CTX_wm_window(C);
 	uiStyle *style= U.uistyles.first;
 	uiPopupBlockHandle *handle;
 	uiPopupMenu *pup;
-	uiMenuInfo info;
 	
 	pup= MEM_callocN(sizeof(uiPopupMenu), "menu dummy");
-	pup->block= uiBeginBlock(C, NULL, "ui_popup_menu_create", UI_EMBOSSP);
+	pup->block= uiBeginBlock(C, NULL, "ui_button_menu_create", UI_EMBOSSP);
 	pup->layout= uiBlockLayout(pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_MENU, 0, 0, 200, 0, style);
+	pup->slideout= (but && (but->block->flag & UI_BLOCK_LOOP));
+	pup->but= but;
 	uiLayoutSetOperatorContext(pup->layout, WM_OP_INVOKE_REGION_WIN);
 
-	/* create in advance so we can let buttons point to retval already */
-	pup->block->handle= MEM_callocN(sizeof(uiPopupBlockHandle), "uiPopupBlockHandle");
+	if(!but) {
+		/* no button to start from, means we are a popup */
+		pup->mx= window->eventstate->x;
+		pup->my= window->eventstate->y;
+		pup->popup= 1;
+	}
 
-	menu_func(C, pup->layout, arg);
+	if(str) {
+		/* menu is created from a string */
+		pup->menu_func= ui_block_func_MENUSTR;
+		pup->menu_arg= str;
+	}
+	else {
+		/* menu is created from a callback */
+		pup->menu_func= menu_func;
+		pup->menu_arg= arg;
+	}
 	
-	memset(&info, 0, sizeof(info));
-	info.pup= pup;
-	info.slideout= (but && (but->block->flag & UI_BLOCK_LOOP));
-	
-	handle= ui_popup_block_create(C, butregion, but, NULL, ui_block_func_MENU_ITEM, &info);
+	handle= ui_popup_block_create(C, butregion, but, NULL, ui_block_func_POPUP, pup);
+
+	if(!but) {
+		handle->popup= 1;
+
+		UI_add_popup_handlers(C, &window->handlers, handle);
+		WM_event_add_mousemove(C);
+	}
 	
 	MEM_freeN(pup);
 
 	return handle;
 }
 
-/*************************** Menu Creating API **************************/
-
-
-/*************************** Popup Menu API **************************/
+/******************** Popup Menu API with begin and end ***********************/
 
 /* only return handler, and set optional title */
 uiPopupMenu *uiPupMenuBegin(bContext *C, const char *title, int icon)
 {
 	uiStyle *style= U.uistyles.first;
-	uiPopupMenu *pup= MEM_callocN(sizeof(uiPopupMenu), "menu start");
+	uiPopupMenu *pup= MEM_callocN(sizeof(uiPopupMenu), "popup menu");
 	uiBut *but;
 	
 	pup->block= uiBeginBlock(C, NULL, "uiPupMenuBegin", UI_EMBOSSP);
+	pup->block->flag |= UI_BLOCK_POPUP_MEMORY;
+	pup->block->puphash= ui_popup_menu_hash((char*)title);
 	pup->layout= uiBlockLayout(pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_MENU, 0, 0, 200, 0, style);
 	uiLayoutSetOperatorContext(pup->layout, WM_OP_EXEC_REGION_WIN);
 
@@ -2640,8 +2314,6 @@ uiPopupMenu *uiPupMenuBegin(bContext *C, const char *title, int icon)
 			but= uiDefBut(pup->block, LABEL, 0, (char*)title, 0, 0, 200, MENU_BUTTON_HEIGHT, NULL, 0.0, 0.0, 0, 0, "");
 			but->flag= UI_TEXT_LEFT;
 		}
-		
-		//uiDefBut(block, SEPR, 0, "", startx, (short)(starty+height)-MENU_SEPR_HEIGHT, width, MENU_SEPR_HEIGHT, NULL, 0.0, 0.0, 0, 0, "");
 	}
 
 	return pup;
@@ -2651,16 +2323,13 @@ uiPopupMenu *uiPupMenuBegin(bContext *C, const char *title, int icon)
 void uiPupMenuEnd(bContext *C, uiPopupMenu *pup)
 {
 	wmWindow *window= CTX_wm_window(C);
-	uiMenuInfo info;
 	uiPopupBlockHandle *menu;
 	
-	memset(&info, 0, sizeof(info));
-	info.popup= 1;
-	info.mx= window->eventstate->x;
-	info.my= window->eventstate->y;
-	info.pup= pup;
+	pup->popup= 1;
+	pup->mx= window->eventstate->x;
+	pup->my= window->eventstate->y;
 	
-	menu= ui_popup_block_create(C, NULL, NULL, NULL, ui_block_func_MENU_ITEM, &info);
+	menu= ui_popup_block_create(C, NULL, NULL, NULL, ui_block_func_POPUP, pup);
 	menu->popup= 1;
 	
 	UI_add_popup_handlers(C, &window->handlers, menu);
@@ -2674,32 +2343,7 @@ uiLayout *uiPupMenuLayout(uiPopupMenu *pup)
 	return pup->layout;
 }
 
-/* ************** standard pupmenus *************** */
-
-/* this one can called with operatortype name and operators */
-static uiPopupBlockHandle *ui_pup_menu(bContext *C, int maxrow, uiMenuHandleFunc func, void *arg, char *str, ...)
-{
-	wmWindow *window= CTX_wm_window(C);
-	uiPupMenuInfo info;
-	uiPopupBlockHandle *menu;
-
-	memset(&info, 0, sizeof(info));
-	info.mx= window->eventstate->x;
-	info.my= window->eventstate->y;
-	info.maxrow= maxrow;
-	info.instr= str;
-
-	menu= ui_popup_block_create(C, NULL, NULL, NULL, ui_block_func_PUPMENU, &info);
-	menu->popup= 1;
-
-	UI_add_popup_handlers(C, &window->handlers, menu);
-	WM_event_add_mousemove(C);
-
-	menu->popup_func= func;
-	menu->popup_arg= arg;
-	
-	return menu;
-}
+/*************************** Standard Popup Menus ****************************/
 
 static void operator_name_cb(bContext *C, void *arg, int retval)
 {
@@ -2709,17 +2353,6 @@ static void operator_name_cb(bContext *C, void *arg, int retval)
 		WM_operator_name_call(C, opname, WM_OP_EXEC_DEFAULT, NULL);
 }
 
-static void vconfirm_opname(bContext *C, char *opname, char *title, char *itemfmt, va_list ap)
-{
-	char *s, buf[512];
-
-	s= buf;
-	if (title) s+= sprintf(s, "%s%%t|", title);
-	vsprintf(s, itemfmt, ap);
-
-	ui_pup_menu(C, 0, operator_name_cb, opname, buf);
-}
-
 static void operator_cb(bContext *C, void *arg, int retval)
 {
 	wmOperator *op= arg;
@@ -2735,6 +2368,21 @@ static void confirm_cancel_operator(void *opv)
 	WM_operator_free(opv);
 }
 
+static void vconfirm_opname(bContext *C, char *opname, char *title, char *itemfmt, va_list ap)
+{
+	uiPopupBlockHandle *handle;
+	char *s, buf[512];
+
+	s= buf;
+	if (title) s+= sprintf(s, "%s%%t|", title);
+	vsprintf(s, itemfmt, ap);
+
+	handle= ui_popup_menu_create(C, NULL, NULL, NULL, NULL, buf);
+
+	handle->popup_func= operator_name_cb;
+	handle->popup_arg= opname;
+}
+
 static void confirm_operator(bContext *C, wmOperator *op, char *title, char *item)
 {
 	uiPopupBlockHandle *handle;
@@ -2743,11 +2391,13 @@ static void confirm_operator(bContext *C, wmOperator *op, char *title, char *ite
 	s= buf;
 	if (title) s+= sprintf(s, "%s%%t|%s", title, item);
 	
-	handle= ui_pup_menu(C, 0, operator_cb, op, buf);
+	handle= ui_popup_menu_create(C, NULL, NULL, NULL, NULL, buf);
+
+	handle->popup_func= operator_cb;
+	handle->popup_arg= op;
 	handle->cancel_func= confirm_cancel_operator;
 }
 
-
 void uiPupMenuOkee(bContext *C, char *opname, char *str, ...)
 {
 	va_list ap;
@@ -2760,7 +2410,6 @@ void uiPupMenuOkee(bContext *C, char *opname, char *str, ...)
 	va_end(ap);
 }
 
-
 void uiPupMenuSaveOver(bContext *C, wmOperator *op, char *filename)
 {
 	size_t len= strlen(filename);
@@ -2776,7 +2425,7 @@ void uiPupMenuSaveOver(bContext *C, wmOperator *op, char *filename)
 	if(BLI_exists(filename)==0)
 		operator_cb(C, op, 1);
 	else
-		confirm_operator(C, op, "Save over", filename);
+		confirm_operator(C, op, "Save Over", filename);
 }
 
 void uiPupMenuNotice(bContext *C, char *str, ...)
@@ -2826,7 +2475,7 @@ void uiPupMenuReports(bContext *C, ReportList *reports)
 	}
 
 	str= BLI_dynstr_get_cstring(ds);
-	ui_pup_menu(C, 0, NULL, NULL, str);
+	ui_popup_menu_create(C, NULL, NULL, NULL, NULL, str);
 	MEM_freeN(str);
 
 	BLI_dynstr_free(ds);
@@ -2870,3 +2519,4 @@ void uiPupBlockOperator(bContext *C, uiBlockCreateFunc func, wmOperator *op, int
 	UI_add_popup_handlers(C, &window->handlers, handle);
 	WM_event_add_mousemove(C);
 }
+
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 0557512cc2a..e7c99f10a66 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -237,11 +237,11 @@ static void template_ID(bContext *C, uiBlock *block, TemplateID *template, Struc
 		int w= idptr.data?UI_UNIT_X:UI_UNIT_X*6;
 		
 		if(newop) {
-			but= uiDefIconTextButO(block, BUT, newop, WM_OP_INVOKE_REGION_WIN, ICON_ZOOMIN, "Add New", 0, 0, w, UI_UNIT_Y, NULL);
+			but= uiDefIconTextButO(block, BUT, newop, WM_OP_INVOKE_REGION_WIN, ICON_ZOOMIN, (idptr.data)? "": "Add New", 0, 0, w, UI_UNIT_Y, NULL);
 			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
 		}
 		else {
-			but= uiDefIconTextBut(block, BUT, 0, ICON_ZOOMIN, "Add New", 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+			but= uiDefIconTextBut(block, BUT, 0, ICON_ZOOMIN, (idptr.data)? "": "Add New", 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
 			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
 		}
 	}
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 39fd6433548..2fb9835f833 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1150,7 +1150,7 @@ void ED_object_apply_obmat(Object *ob)
 	
 }
 
-int hook_getIndexArray(Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
+int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
 {
 	*indexar= NULL;
 	*tot= 0;
@@ -1232,9 +1232,8 @@ static void select_editcurve_hook(Object *obedit, HookModifierData *hmd)
 	}
 }
 
-void obedit_hook_select(Object *ob, HookModifierData *hmd) 
+void object_hook_select(Object *ob, HookModifierData *hmd) 
 {
-	
 	if(ob->type==OB_MESH) select_editmesh_hook(ob, hmd);
 	else if(ob->type==OB_LATTICE) select_editlattice_hook(ob, hmd);
 	else if(ob->type==OB_CURVE) select_editcurve_hook(ob, hmd);
@@ -1318,7 +1317,7 @@ void add_hook(Scene *scene, View3D *v3d, int mode)
 		int tot, ok, *indexar;
 		char name[32];
 		
-		ok = hook_getIndexArray(obedit, &tot, &indexar, name, cent);
+		ok = object_hook_index_array(obedit, &tot, &indexar, name, cent);
 		
 		if(ok==0) {
 			error("Requires selected vertices or active Vertex Group");
@@ -1381,7 +1380,7 @@ void add_hook(Scene *scene, View3D *v3d, int mode)
 		modifier_free(md);
 	}
 	else if(mode==5) { /* select */
-		obedit_hook_select(obedit, hmd);
+		object_hook_select(obedit, hmd);
 	}
 	else if(mode==6) { /* clear offset */
 		where_is_object(scene, ob);	/* ob is hook->parent */
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index e47087a3c27..2f164102be2 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -34,6 +34,7 @@ struct Lattice;
 struct Curve;
 struct Object;
 struct Mesh;
+struct HookModifierData;
 
 /* internal exports only */
 
@@ -80,6 +81,9 @@ void OBJECT_OT_armature_add(struct wmOperatorType *ot);
 	/* only used as menu */
 void OBJECT_OT_primitive_add(struct wmOperatorType *ot);
 
+int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r);
+void object_hook_select(Object *obedit, struct HookModifierData *hmd);
+
 /* editlattice.c */
 void free_editLatt(Object *ob);
 void make_editLatt(Object *obedit);
@@ -104,7 +108,12 @@ void OBJECT_OT_modifier_apply(struct wmOperatorType *ot);
 void OBJECT_OT_modifier_convert(struct wmOperatorType *ot);
 void OBJECT_OT_modifier_copy(struct wmOperatorType *ot);
 void OBJECT_OT_multires_subdivide(struct wmOperatorType *ot);
-void OBJECT_OT_modifier_mdef_bind(struct wmOperatorType *ot);
+void OBJECT_OT_meshdeform_bind(struct wmOperatorType *ot);
+void OBJECT_OT_hook_reset(struct wmOperatorType *ot);
+void OBJECT_OT_hook_recenter(struct wmOperatorType *ot);
+void OBJECT_OT_hook_select(struct wmOperatorType *ot);
+void OBJECT_OT_hook_assign(struct wmOperatorType *ot);
+void OBJECT_OT_explode_refresh(struct wmOperatorType *ot);
 
 /* editconstraint.c */
 void OBJECT_OT_constraint_add(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 16900d6d894..32a1297aaf4 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -39,6 +39,7 @@
 #include "DNA_object_force.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_arithb.h"
 #include "BLI_listbase.h"
 
 #include "BKE_curve.h"
@@ -410,6 +411,11 @@ int ED_object_modifier_copy(ReportList *reports, Object *ob, ModifierData *md)
 
 /***************************** OPERATORS ****************************/
 
+static int modifier_poll(bContext *C)
+{
+	return (CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier).data != NULL);
+}
+
 /************************ add modifier operator *********************/
 
 static int modifier_add_exec(bContext *C, wmOperator *op)
@@ -426,8 +432,46 @@ static int modifier_add_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
+static EnumPropertyItem *modifier_add_itemf(bContext *C, PointerRNA *ptr, int *free)
+{	
+	EnumPropertyItem *item= NULL, *md_item;
+	ModifierTypeInfo *mti;
+	Object *ob;
+	int totitem= 0, a;
+	
+	if(!C) /* needed for docs */
+		return modifier_type_items;
+	
+	ob= CTX_data_active_object(C);
+
+	for(a=0; modifier_type_items[a].identifier; a++) {
+		md_item= &modifier_type_items[a];
+
+		if(md_item->identifier[0]) {
+			mti= modifierType_getInfo(md_item->value);
+
+			if(mti->flags & eModifierTypeFlag_NoUserAdd)
+				continue;
+
+			if(!((mti->flags & eModifierTypeFlag_AcceptsCVs) ||
+			   (ob->type==OB_MESH && (mti->flags & eModifierTypeFlag_AcceptsMesh))))
+				continue;
+		}
+
+		RNA_enum_item_add(&item, &totitem, md_item);
+	}
+
+	RNA_enum_item_end(&item, &totitem);
+
+	*free= 1;
+
+	return item;
+}
+
 void OBJECT_OT_modifier_add(wmOperatorType *ot)
 {
+	PropertyRNA *prop;
+
 	/* identifiers */
 	ot->name= "Add Modifier";
 	ot->description = "Add a modifier to the active object.";
@@ -436,14 +480,14 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
 	ot->exec= modifier_add_exec;
-	
 	ot->poll= ED_operator_object_active;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	/* XXX only some types should be here */
-	RNA_def_enum(ot->srna, "type", modifier_type_items, 0, "Type", "");
+	/* properties */
+	prop= RNA_def_enum(ot->srna, "type", modifier_type_items, eModifierType_Subsurf, "Type", "");
+	RNA_def_enum_funcs(prop, modifier_add_itemf);
 }
 
 /************************ remove modifier operator *********************/
@@ -455,7 +499,7 @@ static int modifier_remove_exec(bContext *C, wmOperator *op)
 	Object *ob= ptr.id.data;
 	ModifierData *md= ptr.data;
 
-	if(!ob || !md || !ED_object_modifier_remove(op->reports, scene, ob, md))
+	if(!ED_object_modifier_remove(op->reports, scene, ob, md))
 		return OPERATOR_CANCELLED;
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
@@ -471,6 +515,7 @@ void OBJECT_OT_modifier_remove(wmOperatorType *ot)
 	ot->poll= ED_operator_object_active;
 
 	ot->exec= modifier_remove_exec;
+	ot->poll= modifier_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -485,7 +530,7 @@ static int modifier_move_up_exec(bContext *C, wmOperator *op)
 	Object *ob= ptr.id.data;
 	ModifierData *md= ptr.data;
 
-	if(!ob || !md || !ED_object_modifier_move_up(op->reports, ob, md))
+	if(!ED_object_modifier_move_up(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
@@ -502,6 +547,7 @@ void OBJECT_OT_modifier_move_up(wmOperatorType *ot)
 	ot->poll= ED_operator_object_active;
 
 	ot->exec= modifier_move_up_exec;
+	ot->poll= modifier_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -533,6 +579,7 @@ void OBJECT_OT_modifier_move_down(wmOperatorType *ot)
 	ot->poll= ED_operator_object_active;
 
 	ot->exec= modifier_move_down_exec;
+	ot->poll= modifier_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -564,6 +611,7 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot)
 	ot->poll= ED_operator_object_active;
 
 	ot->exec= modifier_apply_exec;
+	ot->poll= modifier_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -595,6 +643,7 @@ void OBJECT_OT_modifier_convert(wmOperatorType *ot)
 	ot->poll= ED_operator_object_active;
 
 	ot->exec= modifier_convert_exec;
+	ot->poll= modifier_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -626,6 +675,7 @@ void OBJECT_OT_modifier_copy(wmOperatorType *ot)
 	ot->poll= ED_operator_object_active;
 
 	ot->exec= modifier_copy_exec;
+	ot->poll= modifier_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -639,17 +689,15 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
 	Object *ob= ptr.id.data;
 	MultiresModifierData *mmd= ptr.data;
 
-	if(mmd) {
-		multiresModifier_subdivide(mmd, ob, 1, 0, mmd->simple);
-		WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
-	}
+	multiresModifier_subdivide(mmd, ob, 1, 0, mmd->simple);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
 }
 
 static int multires_subdivide_poll(bContext *C)
 {
-	return NULL != CTX_data_active_object(C) && NULL == CTX_data_edit_object(C);
+	return (CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier).data != NULL);
 }
 
 void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
@@ -667,12 +715,12 @@ void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
 
 /************************ mdef bind operator *********************/
 
-static int modifier_mdef_bind_poll(bContext *C)
+static int meshdeform_poll(bContext *C)
 {
 	return CTX_data_pointer_get_type(C, "modifier", &RNA_MeshDeformModifier).data != NULL;
 }
 
-static int modifier_mdef_bind_exec(bContext *C, wmOperator *op)
+static int meshdeform_bind_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get(C, "modifier");
@@ -723,41 +771,22 @@ static int modifier_mdef_bind_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_modifier_mdef_bind(wmOperatorType *ot)
+void OBJECT_OT_meshdeform_bind(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Mesh Deform Bind";
 	ot->description = "Bind mesh to cage in mesh deform modifier.";
-	ot->idname= "OBJECT_OT_modifier_mdef_bind";
+	ot->idname= "OBJECT_OT_meshdeform_bind";
 	
 	/* api callbacks */
-	ot->poll= modifier_mdef_bind_poll;
-	ot->exec= modifier_mdef_bind_exec;
+	ot->poll= meshdeform_poll;
+	ot->exec= meshdeform_bind_exec;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
 #if 0
-static void modifiers_add(void *ob_v, int type)
-{
-	Object *ob = ob_v;
-	ModifierTypeInfo *mti = modifierType_getInfo(type);
-	
-	if (mti->flags&eModifierTypeFlag_RequiresOriginalData) {
-		ModifierData *md = ob->modifiers.first;
-
-		while (md && modifierType_getInfo(md->type)->type==eModifierTypeType_OnlyDeform) {
-			md = md->next;
-		}
-
-		BLI_insertlinkbefore(&ob->modifiers, md, modifier_new(type));
-	} else {
-		BLI_addtail(&ob->modifiers, modifier_new(type));
-	}
-	ED_undo_push("Add modifier");
-}
-
 typedef struct MenuEntry {
 	char *name;
 	int ID;
@@ -809,89 +838,176 @@ static uiBlock *modifiers_add_menu(void *ob_v)
 }
 #endif
 
-#if 0
-static void modifiers_clearHookOffset(bContext *C, void *ob_v, void *md_v)
+/******************** hook operators ************************/
+
+static int hook_poll(bContext *C)
 {
-	Object *ob = ob_v;
-	ModifierData *md = md_v;
-	HookModifierData *hmd = (HookModifierData*) md;
-	
-	if (hmd->object) {
+	return CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier).data != NULL;
+}
+
+static int hook_reset_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
+	Object *ob= ptr.id.data;
+	HookModifierData *hmd= ptr.data;
+
+	if(hmd->object) {
 		Mat4Invert(hmd->object->imat, hmd->object->obmat);
 		Mat4MulSerie(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
-		ED_undo_push(C, "Clear hook offset");
 	}
-}
 
-static void modifiers_cursorHookCenter(bContext *C, void *ob_v, void *md_v)
-{
-	/* XXX 
-	Object *ob = ob_v;
-	ModifierData *md = md_v;
-	HookModifierData *hmd = (HookModifierData*) md;
-
-	if(G.vd) {
-		float *curs = give_cursor();
-		float bmat[3][3], imat[3][3];
-
-		where_is_object(ob);
+	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
-		Mat3CpyMat4(bmat, ob->obmat);
-		Mat3Inv(imat, bmat);
-
-		curs= give_cursor();
-		hmd->cent[0]= curs[0]-ob->obmat[3][0];
-		hmd->cent[1]= curs[1]-ob->obmat[3][1];
-		hmd->cent[2]= curs[2]-ob->obmat[3][2];
-		Mat3MulVecfl(imat, hmd->cent);
-
-		ED_undo_push(C, "Hook cursor center");
-	}*/
+	return OPERATOR_FINISHED;
 }
 
-static void modifiers_selectHook(bContext *C, void *ob_v, void *md_v)
+void OBJECT_OT_hook_reset(wmOperatorType *ot)
 {
-	/* XXX ModifierData *md = md_v;
-	HookModifierData *hmd = (HookModifierData*) md;
+	ot->name= "Hook Reset";
+	ot->description= "Recalculate and and clear offset transformation.";
+	ot->idname= "OBJECT_OT_hook_reset";
 
-	hook_select(hmd);*/
+	ot->exec= hook_reset_exec;
+	ot->poll= hook_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static void modifiers_reassignHook(bContext *C, void *ob_v, void *md_v)
+static int hook_recenter_exec(bContext *C, wmOperator *op)
 {
-	/* XXX ModifierData *md = md_v;
-	HookModifierData *hmd = (HookModifierData*) md;
+	Scene *scene= CTX_data_scene(C);
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
+	Object *ob= ptr.id.data;
+	HookModifierData *hmd= ptr.data;
+	float bmat[3][3], imat[3][3];
+
+	Mat3CpyMat4(bmat, ob->obmat);
+	Mat3Inv(imat, bmat);
+
+	VECSUB(hmd->cent, scene->cursor, ob->obmat[3]);
+	Mat3MulVecfl(imat, hmd->cent);
+
+	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_hook_recenter(wmOperatorType *ot)
+{
+	ot->name= "Hook Recenter";
+	ot->description= "Set hook center to cursor position.";
+	ot->idname= "OBJECT_OT_hook_recenter";
+
+	ot->exec= hook_recenter_exec;
+	ot->poll= hook_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int hook_select_exec(bContext *C, wmOperator *op)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
+	Object *ob= ptr.id.data;
+	HookModifierData *hmd= ptr.data;
+
+	object_hook_select(ob, hmd);
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_hook_select(wmOperatorType *ot)
+{
+	ot->name= "Hook Select";
+	ot->description= "Selects effected vertices on mesh.";
+	ot->idname= "OBJECT_OT_hook_select";
+
+	ot->exec= hook_select_exec;
+	ot->poll= hook_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int hook_assign_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
+	Object *ob= ptr.id.data;
+	HookModifierData *hmd= ptr.data;
 	float cent[3];
-	int *indexar, tot, ok;
 	char name[32];
+	int *indexar, tot;
 		
-	ok= hook_getIndexArray(&tot, &indexar, name, cent);
+	if(!object_hook_index_array(ob, &tot, &indexar, name, cent)) {
+		BKE_report(op->reports, RPT_WARNING, "Requires selected vertices or active vertex group");
+		return OPERATOR_CANCELLED;
+	}
 
-	if (!ok) {
-		uiPupMenuError(C, "Requires selected vertices or active Vertex Group");
-	} else {
-		if (hmd->indexar) {
-			MEM_freeN(hmd->indexar);
-		}
+	if(hmd->indexar)
+		MEM_freeN(hmd->indexar);
 
-		VECCOPY(hmd->cent, cent);
-		hmd->indexar = indexar;
-		hmd->totindex = tot;
-	}*/
+	VECCOPY(hmd->cent, cent);
+	hmd->indexar= indexar;
+	hmd->totindex= tot;
+
+	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+	
+	return OPERATOR_FINISHED;
 }
 
-void modifiers_explodeFacepa(bContext *C, void *arg1, void *arg2)
+void OBJECT_OT_hook_assign(wmOperatorType *ot)
 {
-	ExplodeModifierData *emd=arg1;
+	ot->name= "Hook Assign";
+	ot->description= "Reassigns selected vertices to hook.";
+	ot->idname= "OBJECT_OT_hook_assign";
+
+	ot->exec= hook_assign_exec;
+	ot->poll= hook_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/****************** explode refresh operator *********************/
+
+static int explode_refresh_poll(bContext *C)
+{
+	return CTX_data_pointer_get_type(C, "modifier", &RNA_ExplodeModifier).data != NULL;
+}
+
+static int explode_refresh_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_ExplodeModifier);
+	Object *ob= ptr.id.data;
+	ExplodeModifierData *emd= ptr.data;
 
 	emd->flag |= eExplodeFlag_CalcFaces;
+
+	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+	
+	return OPERATOR_FINISHED;
 }
 
-void modifiers_explodeDelVg(bContext *C, void *arg1, void *arg2)
+void OBJECT_OT_explode_refresh(wmOperatorType *ot)
 {
-	ExplodeModifierData *emd=arg1;
-	emd->vgroup = 0;
+	ot->name= "Explode Refresh";
+	ot->description= "Refresh data in the Explode modifier.";
+	ot->idname= "OBJECT_OT_explode_refresh";
+
+	ot->exec= explode_refresh_exec;
+	ot->poll= explode_refresh_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
-#endif
-
 
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index f2e048284f4..6f1a3b5f6cb 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -118,7 +118,12 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_modifier_convert);
 	WM_operatortype_append(OBJECT_OT_modifier_copy);
 	WM_operatortype_append(OBJECT_OT_multires_subdivide);
-	WM_operatortype_append(OBJECT_OT_modifier_mdef_bind);
+	WM_operatortype_append(OBJECT_OT_meshdeform_bind);
+	WM_operatortype_append(OBJECT_OT_hook_reset);
+	WM_operatortype_append(OBJECT_OT_hook_recenter);
+	WM_operatortype_append(OBJECT_OT_hook_select);
+	WM_operatortype_append(OBJECT_OT_hook_assign);
+	WM_operatortype_append(OBJECT_OT_explode_refresh);
 
 	WM_operatortype_append(OBJECT_OT_constraint_add);
 	WM_operatortype_append(OBJECT_OT_constraint_add_with_targets);
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 320574fe8b3..f714a291bd7 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1044,7 +1044,6 @@ static char *windowtype_pup(void)
 		   "Window type:%t"
 		   "|3D View %x1"
 
-		   "|%l"
 		   "|%l"
 		   
 		   "|Timeline %x15"
@@ -1052,7 +1051,6 @@ static char *windowtype_pup(void)
 		   "|DopeSheet %x12"
 		   "|NLA Editor %x13"
 		   
-		   "|%l"
 		   "|%l"
 		   
 		   "|UV/Image Editor %x6"
@@ -1062,7 +1060,6 @@ static char *windowtype_pup(void)
 		   "|Node Editor %x16"
 		   "|Logic Editor %x17"
 		   
-		   "|%l"
 		   "|%l"
 		   
 		   "|Properties %x4"
@@ -1070,12 +1067,10 @@ static char *windowtype_pup(void)
 		   "|User Preferences %x19"
 		   "|Info%x7"
 		    		   
-		   "|%l"
 		   "|%l"
 		   
 		   "|File Browser %x5"
 		   
-		   "|%l"
 		   "|%l"
 		   
 		   "|Console %x18"
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 6c86c87302c..3487efc4218 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -3442,10 +3442,5 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 
 		}
 	}
-	
-	/* do not do view2d totrect set here, it's now a template */
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
 }
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 33499574012..912d11dcc8c 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -318,7 +318,7 @@ typedef struct UVProjectModifierData {
 	ModifierData modifier;
 
 	/* the objects which do the projecting */
-	struct Object *projectors[10];
+	struct Object *projectors[10]; /* MOD_UVPROJECT_MAX */
 	struct Image *image;      /* the image to project */
 	int flags;
 	int num_projectors;
@@ -669,4 +669,6 @@ typedef struct SimpleDeformModifierData {
    coordinates or global coordinates of origin */
 #define MOD_SIMPLEDEFORM_ORIGIN_LOCAL			(1<<0)
 
+#define MOD_UVPROJECT_MAX				10
+
 #endif
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 9bdbc8baed7..3b0db949350 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -1173,8 +1173,14 @@ void RNA_def_property_enum_items(PropertyRNA *prop, const EnumPropertyItem *item
 					defaultfound= 1;
 			}
 
-			if(!defaultfound)
-				eprop->defaultvalue= item[0].value;
+			if(!defaultfound) {
+				for(i=0; item[i].identifier; i++) {
+					if(item[i].identifier[0]) {
+						eprop->defaultvalue= item[i].value;
+						break;
+					}
+				}
+			}
 
 			break;
 		}
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index f2c8e404a52..c080b88feaf 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -43,41 +43,43 @@
 #include "WM_types.h"
 
 EnumPropertyItem modifier_type_items[] ={
-	{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
+	{0, "", 0, "Generate", ""},
 	{eModifierType_Array, "ARRAY", ICON_MOD_ARRAY, "Array", ""},
 	{eModifierType_Bevel, "BEVEL", ICON_MOD_BEVEL, "Bevel", ""},
 	{eModifierType_Boolean, "BOOLEAN", ICON_MOD_BOOLEAN, "Boolean", ""},
 	{eModifierType_Build, "BUILD", ICON_MOD_BUILD, "Build", ""},
-	{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
-	{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
-	{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
-	{eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""},
 	{eModifierType_Decimate, "DECIMATE", ICON_MOD_DECIM, "Decimate", ""},
-	{eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, "Displace", ""},
 	{eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MOD_EDGESPLIT, "Edge Split", ""},
-	{eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
-	{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
-	{eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", ""},
-	{eModifierType_Lattice, "LATTICE", ICON_MOD_LATTICE, "Lattice", ""},
 	{eModifierType_Mask, "MASK", ICON_MOD_MASK, "Mask", ""},
-	{eModifierType_MeshDeform, "MESH_DEFORM", ICON_MOD_MESHDEFORM, "Mesh Deform", ""},
 	{eModifierType_Mirror, "MIRROR", ICON_MOD_MIRROR, "Mirror", ""},
 	{eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, "Multiresolution", ""},
-	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
-	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
+	{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
+	{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""},
+	{0, "", 0, "Deformers", ""},
+	{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
+	{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
+	{eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""},
+	{eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, "Displace", ""},
+	{eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", ""},
+	{eModifierType_Lattice, "LATTICE", ICON_MOD_LATTICE, "Lattice", ""},
+	{eModifierType_MeshDeform, "MESH_DEFORM", ICON_MOD_MESHDEFORM, "Mesh Deform", ""},
 	{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""},
 	{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""},
+	{eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""},
+	{eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""},
+	{0, "", 0, "Physics", ""},
+	{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
+	{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
+	{eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
+	{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
+	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
+	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
 	{eModifierType_Smoke, "SMOKE", 0, "Smoke", ""},
 	{eModifierType_SmokeHR, "SMOKE_HR", 0, "SmokeHR", ""},
-	{eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""},
 	{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
-	{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
 	{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
-	{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""},
-	{eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""},
 	{0, NULL, 0, NULL, NULL}};
 
-
 #ifdef RNA_RUNTIME
 
 #include "BKE_context.h"
@@ -87,7 +89,7 @@ EnumPropertyItem modifier_type_items[] ={
 static void rna_UVProject_projectors_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	UVProjectModifierData *uvp= (UVProjectModifierData*)ptr->data;
-	rna_iterator_array_begin(iter, (void*)uvp->projectors, sizeof(Object*), 10, 0, NULL);
+	rna_iterator_array_begin(iter, (void*)uvp->projectors, sizeof(Object*), uvp->num_projectors, 0, NULL);
 }
 
 static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr)
@@ -410,6 +412,34 @@ static PointerRNA rna_CollisionModifier_settings_get(PointerRNA *ptr)
 	return rna_pointer_inherit_refine(ptr, &RNA_CollisionSettings, ob->pd);
 }
 
+static PointerRNA rna_UVProjector_object_get(PointerRNA *ptr)
+{
+	Object **ob= (Object**)ptr->data;
+	return rna_pointer_inherit_refine(ptr, &RNA_Object, *ob);
+}
+
+static void rna_UVProjector_object_set(PointerRNA *ptr, PointerRNA value)
+{
+	Object **ob= (Object**)ptr->data;
+
+    if(*ob)
+		id_us_min((ID*)*ob);
+	if(value.data)
+		id_us_plus((ID*)value.data);
+
+	*ob= value.data;
+}
+
+static void rna_UVProjectModifier_num_projectors_set(PointerRNA *ptr, int value)
+{
+	UVProjectModifierData *md= (UVProjectModifierData*)ptr->data;
+	int a;
+
+	md->num_projectors= CLAMPIS(value, 1, MOD_UVPROJECT_MAX);
+	for(a=md->num_projectors; a<MOD_UVPROJECT_MAX; a++)
+		md->projectors[a]= NULL;
+}
+
 #else
 
 static void rna_def_property_subdivision_common(StructRNA *srna, const char type[])
@@ -1150,7 +1180,7 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	srna= RNA_def_struct(brna, "UVProjectModifier", "Modifier");
-	RNA_def_struct_ui_text(srna, "UVProject Modifier", "UV projection modifier to sets UVs from a projector.");
+	RNA_def_struct_ui_text(srna, "UV Project Modifier", "UV projection modifier to sets UVs from a projector.");
 	RNA_def_struct_sdna(srna, "UVProjectModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_MOD_UVPROJECT);
 
@@ -1160,9 +1190,15 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVProjectModifier_uvlayer_set");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
 
+	prop= RNA_def_property(srna, "num_projectors", PROP_INT, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Number of Projectors", "Number of projectors to use.");
+	RNA_def_property_int_funcs(prop, NULL, "rna_UVProjectModifier_num_projectors_set", NULL);
+	RNA_def_property_range(prop, 1, MOD_UVPROJECT_MAX);
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+
 	prop= RNA_def_property(srna, "projectors", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_struct_type(prop, "Object");
-	RNA_def_property_collection_funcs(prop, "rna_UVProject_projectors_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_dereference_get", 0, 0, 0, 0, 0);
+	RNA_def_property_struct_type(prop, "UVProjector");
+	RNA_def_property_collection_funcs(prop, "rna_UVProject_projectors_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", 0, 0, 0, 0, 0);
 	RNA_def_property_ui_text(prop, "Projectors", "");
 
 	prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
@@ -1188,6 +1224,15 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_UVPROJECT_OVERRIDEIMAGE);
 	RNA_def_property_ui_text(prop, "Override Image", "Override faces' current images with the given image.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+
+	srna= RNA_def_struct(brna, "UVProjector", NULL);
+	RNA_def_struct_ui_text(srna, "UVProjector", "UV projector used by the UV project modifier.");
+
+	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "Object");
+	RNA_def_property_pointer_funcs(prop, "rna_UVProjector_object_get", "rna_UVProjector_object_set", NULL);
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Object", "Object to use as projector transform.");
 }
 
 static void rna_def_modifier_smooth(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 0301932aef3..40e3efc9e46 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1144,27 +1144,28 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 		
 	
 	static EnumPropertyItem image_type_items[] = {
+		{0, "", 0, "Image", NULL},
 		{R_PNG, "PNG", 0, "PNG", ""},
 		{R_JPEG90, "JPEG", 0, "JPEG", ""},
 #ifdef WITH_OPENJPEG
 		{R_JP2, "JPEG2000", 0, "JPEG 2000", ""},
 #endif		
-		{R_TIFF, "TIFF", 0, "TIFF", ""},	// XXX only with G.have_libtiff
 		{R_BMP, "BMP", 0, "BMP", ""},
 		{R_TARGA, "TARGA", 0, "Targa", ""},
 		{R_RAWTGA, "RAWTARGA", 0, "Targa Raw", ""},
 		//{R_DDS, "DDS", 0, "DDS", ""}, // XXX not yet implemented
 		{R_HAMX, "HAMX", 0, "HamX", ""},
 		{R_IRIS, "IRIS", 0, "Iris", ""},
-		{0, "", 0, NULL, NULL},
+		{0, "", 0, " ", NULL},
 #ifdef WITH_OPENEXR
 		{R_OPENEXR, "OPENEXR", 0, "OpenEXR", ""},
 		{R_MULTILAYER, "MULTILAYER", 0, "MultiLayer", ""},
 #endif
+		{R_TIFF, "TIFF", 0, "TIFF", ""},	// XXX only with G.have_libtiff
 		{R_RADHDR, "RADHDR", 0, "Radiance HDR", ""},
 		{R_CINEON, "CINEON", 0, "Cineon", ""},
 		{R_DPX, "DPX", 0, "DPX", ""},
-		{0, "", 0, NULL, NULL},
+		{0, "", 0, "Movie", NULL},
 		{R_AVIRAW, "AVIRAW", 0, "AVI Raw", ""},
 		{R_AVIJPEG, "AVIJPEG", 0, "AVI JPEG", ""},
 #ifdef _WIN32
@@ -1187,7 +1188,6 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 #endif
 		{R_FFMPEG, "FFMPEG", 0, "FFMpeg", ""},
 #endif
-		{0, "", 0, NULL, NULL},
 		{R_FRAMESERVER, "FRAMESERVER", 0, "Frame Server", ""},
 		{0, NULL, 0, NULL, NULL}};
 		
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 304da25017b..ab8dfeabe4f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -741,7 +741,6 @@ static void WM_OT_window_duplicate(wmOperatorType *ot)
 	ot->name= "Duplicate Window";
 	ot->idname= "WM_OT_window_duplicate";
 	
-	ot->invoke= WM_operator_confirm;
 	ot->exec= wm_window_duplicate_op;
 	ot->poll= WM_operator_winactive;
 }
@@ -1035,7 +1034,6 @@ static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot)
     ot->name= "Toggle Fullscreen";
     ot->idname= "WM_OT_window_fullscreen_toggle";
 
-    ot->invoke= WM_operator_confirm;
     ot->exec= wm_window_fullscreen_toggle_op;
     ot->poll= WM_operator_winactive;
 }

From 442ba39d49d9453f84791989c9149692b70ddad5 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 21 Aug 2009 03:06:36 +0000
Subject: [PATCH 176/577] fix for own bug added since 2.49a, 2.49a tries to
 remove the object from the conversion list every time. Now remove from the
 conversion list directly without being apart of the remove object function.

---
 source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 +++
 source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 5b03bbbbc4e..d2e6bbb43f7 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2422,8 +2422,11 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 					obj->Release();
 			}
 			childrenlist->Release();
+			
 			// now destroy recursively
+			converter->UnregisterGameObject(childobj); // removing objects during conversion make sure this runs too
 			kxscene->RemoveObject(childobj);
+			
 			continue;
 		}
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 59c073c2b1f..4f47ce7a036 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -492,10 +492,11 @@ void KX_BlenderSceneConverter::RegisterGameObject(
 	m_map_blender_to_gameobject.insert(CHashedPtr(for_blenderobject),gameobject);
 }
 
+/* only need to run this during conversion since
+ * m_map_blender_to_gameobject is freed after conversion */
 void KX_BlenderSceneConverter::UnregisterGameObject(
 									KX_GameObject *gameobject) 
 {
-#if 0
 	struct Object *bobp= gameobject->GetBlenderObject();
 	if (bobp) {
 		CHashedPtr bptr(bobp);
@@ -507,7 +508,6 @@ void KX_BlenderSceneConverter::UnregisterGameObject(
 			m_map_blender_to_gameobject.remove(bptr);
 		}
 	}
-#endif
 }
 
 KX_GameObject *KX_BlenderSceneConverter::FindGameObject(

From 589ea76833778a37fe0ec93cc28de1102d9793b5 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 21 Aug 2009 06:23:38 +0000
Subject: [PATCH 177/577] 2.5/Paint:

* Updated texture paint UI for stroke settings.
* Removed duplicate brush blend types, just use the ones defined in imbuf instead
---
 release/ui/space_view3d_toolbar.py            | 38 ++++++++-----------
 .../editors/sculpt_paint/paint_image.c        |  2 +-
 source/blender/makesdna/DNA_brush_types.h     | 10 -----
 source/blender/makesrna/intern/rna_brush.c    | 18 +++++----
 4 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 35df4dc8b54..d0f07c70657 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -369,7 +369,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 				
 			col = layout.column()
 			col.itemR(brush, "color", text="")
-				
+
 			row = col.row(align=True)
 			row.itemR(brush, "size", slider=True)
 			row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
@@ -382,18 +382,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			row.itemR(brush, "falloff", slider=True)
 			row.itemR(brush, "falloff_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
 			
-			row = col.row(align=True)
-			row.itemR(brush, "space", text="")
-			rowsub = row.row(align=True)
-			rowsub.active = brush.space
-			rowsub.itemR(brush, "spacing", text="Spacing", slider=True)
-			rowsub.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
-			
-			col = layout.column()
-			col.itemR(brush, "airbrush")
-			sub = col.column()
-			sub.active = brush.airbrush
-			sub.itemR(brush, "rate")
+			col.itemR(brush, "blend")
 		
 		# Weight Paint Mode #
 	
@@ -431,23 +420,28 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 		settings = self.paint_settings(context)
 		return (settings and settings.brush and (context.sculpt_object or
 							 context.vertex_paint_object or
-							 context.weight_paint_object))
+							 context.weight_paint_object or
+							 context.texture_paint_object))
 
 	def draw(self, context):
 		settings = self.paint_settings(context)
 		brush = settings.brush
+		texture_paint = context.texture_paint_object
 		layout = self.layout
 
-		layout.itemR(brush, "smooth_stroke")
-		col = layout.column()
-		col.active = brush.smooth_stroke
-		col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
-		col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
+		if not texture_paint:
+			layout.itemR(brush, "smooth_stroke")
+			col = layout.column()
+			col.active = brush.smooth_stroke
+			col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
+			col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
 
 		layout.itemR(brush, "space")
-		col = layout.column()
-		col.active = brush.space
-		col.itemR(brush, "spacing", text="Distance", slider=True)
+		row = layout.row(align=True)
+		row.active = brush.space
+		row.itemR(brush, "spacing", text="Distance", slider=True)
+		if texture_paint:
+			row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
 
 		layout.itemR(brush, "airbrush")
 		col = layout.column()
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 2dcd7a64947..afd8336c2a9 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -4719,7 +4719,7 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 		tablet= (wmtab->Active != EVT_TABLET_NONE);
 		pressure= wmtab->Pressure;
 		if(wmtab->Active == EVT_TABLET_ERASER)
-			pop->s.blend= BRUSH_BLEND_ERASE_ALPHA;
+			pop->s.blend= IMB_BLEND_ERASE_ALPHA;
 	}
 	else
 		pressure= 1.0f;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 52ea298c110..a3a1a342584 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -86,16 +86,6 @@ typedef struct Brush {
 #define BRUSH_SMOOTH_STROKE	2048
 #define BRUSH_PERSISTENT	4096
 
-/* Brush.blend */
-#define BRUSH_BLEND_MIX 		0
-#define BRUSH_BLEND_ADD 		1
-#define BRUSH_BLEND_SUB 		2
-#define BRUSH_BLEND_MUL 		3
-#define BRUSH_BLEND_LIGHTEN		4
-#define BRUSH_BLEND_DARKEN		5
-#define BRUSH_BLEND_ERASE_ALPHA	6
-#define BRUSH_BLEND_ADD_ALPHA	7
-
 /* Brush.sculpt_tool */
 #define SCULPT_TOOL_DRAW    1
 #define SCULPT_TOOL_SMOOTH  2
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 03b5a44f52b..9c453ac44df 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -32,6 +32,8 @@
 #include "DNA_brush_types.h"
 #include "DNA_texture_types.h"
 
+#include "IMB_imbuf.h"
+
 EnumPropertyItem brush_sculpt_tool_items[] = {
 	{SCULPT_TOOL_DRAW, "DRAW", 0, "Draw", ""},
 	{SCULPT_TOOL_SMOOTH, "SMOOTH", 0, "Smooth", ""},
@@ -93,14 +95,14 @@ void rna_def_brush(BlenderRNA *brna)
 	PropertyRNA *prop;
 	
 	static EnumPropertyItem prop_blend_items[] = {
-		{BRUSH_BLEND_MIX, "MIX", 0, "Mix", "Use mix blending mode while painting."},
-		{BRUSH_BLEND_ADD, "ADD", 0, "Add", "Use add blending mode while painting."},
-		{BRUSH_BLEND_SUB, "SUB", 0, "Subtract", "Use subtract blending mode while painting."},
-		{BRUSH_BLEND_MUL, "MUL", 0, "Multiply", "Use multiply blending mode while painting."},
-		{BRUSH_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", "Use lighten blending mode while painting."},
-		{BRUSH_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use darken blending mode while painting."},
-		{BRUSH_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting."},
-		{BRUSH_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting."},
+		{IMB_BLEND_MIX, "MIX", 0, "Mix", "Use mix blending mode while painting."},
+		{IMB_BLEND_ADD, "ADD", 0, "Add", "Use add blending mode while painting."},
+		{IMB_BLEND_SUB, "SUB", 0, "Subtract", "Use subtract blending mode while painting."},
+		{IMB_BLEND_MUL, "MUL", 0, "Multiply", "Use multiply blending mode while painting."},
+		{IMB_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", "Use lighten blending mode while painting."},
+		{IMB_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use darken blending mode while painting."},
+		{IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting."},
+		{IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting."},
 		{0, NULL, 0, NULL, NULL}};
 		
 	srna= RNA_def_struct(brna, "Brush", "ID");

From 46fb2d37e347b6ecbd0097aa662cd2fdc4b65f33 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 21 Aug 2009 07:19:06 +0000
Subject: [PATCH 178/577] have texture paint use the curve rather then the
 falloff setting (falloff gave ugly center area of 100% opacity)

---
 release/ui/space_view3d_toolbar.py              |  4 ----
 source/blender/blenkernel/BKE_brush.h           |  1 -
 source/blender/blenkernel/intern/brush.c        | 17 -----------------
 .../blender/editors/sculpt_paint/paint_image.c  |  7 ++++---
 source/blender/windowmanager/intern/Makefile    |  1 -
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index d0f07c70657..254fb3fd560 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -378,10 +378,6 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			row.itemR(brush, "strength", slider=True)
 			row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
 			
-			row = col.row(align=True)
-			row.itemR(brush, "falloff", slider=True)
-			row.itemR(brush, "falloff_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
-			
 			col.itemR(brush, "blend")
 		
 		# Weight Paint Mode #
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index 6ec988e111e..4d24a2433b3 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -64,7 +64,6 @@ float brush_curve_strength(struct Brush *br, float p, const float len);
 
 /* sampling */
 float brush_sample_falloff(struct Brush *brush, float dist);
-float brush_sample_falloff_noalpha(struct Brush *brush, float dist);
 void brush_sample_tex(struct Brush *brush, float *xy, float *rgba);
 void brush_imbuf_new(struct Brush *brush, short flt, short texfalloff, int size,
 	struct ImBuf **imbuf);
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index a7b5a16d924..bce4e1120be 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -409,23 +409,6 @@ float brush_sample_falloff(Brush *brush, float dist)
 		return 0.0f;
 }
 
-float brush_sample_falloff_noalpha(Brush *brush, float dist)
-{
-	float outer, inner;
-
-	outer = brush->size >> 1;
-	inner = outer*brush->innerradius;
-
-	if (dist <= inner) {
-		return 1.0f;
-	}
-	else if ((dist < outer) && (inner < outer)) {
-		return 1.0f - sqrt((dist - inner)/(outer - inner));
-	}
-	else 
-		return 0.0f;
-}
-
 void brush_sample_tex(Brush *brush, float *xy, float *rgba)
 {
 	MTex *mtex= brush->mtex[brush->texact];
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index afd8336c2a9..d082e17cda3 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -3707,7 +3707,7 @@ static void *do_projectpaint_thread(void *ph_v)
 	ProjPaintImage *last_projIma= NULL;
 	ImagePaintPartialRedraw *last_partial_redraw_cell;
 	
-	float rgba[4], alpha, dist_nosqrt;
+	float rgba[4], alpha, dist_nosqrt, dist;
 	
 	float brush_size_sqared;
 	float falloff;
@@ -3721,6 +3721,7 @@ static void *do_projectpaint_thread(void *ph_v)
 	float co[2];
 	float mask = 1.0f; /* airbrush wont use mask */
 	unsigned short mask_short;
+	float size_half = ((float)ps->brush->size) * 0.5f;
 	
 	LinkNode *smearPixels = NULL;
 	LinkNode *smearPixels_f = NULL;
@@ -3755,8 +3756,8 @@ static void *do_projectpaint_thread(void *ph_v)
 			dist_nosqrt = Vec2Lenf_nosqrt(projPixel->projCoSS, pos);
 			
 			/*if (dist < s->brush->size) {*/ /* correct but uses a sqrtf */
-			if (dist_nosqrt < brush_size_sqared) {
-				falloff = brush_sample_falloff_noalpha(ps->brush, sqrtf(dist_nosqrt));
+			if (dist_nosqrt < brush_size_sqared && (dist=sqrtf(dist_nosqrt)) < size_half) {
+				falloff = brush_curve_strength(ps->brush, dist, size_half);
 				if (falloff > 0.0f) {
 					if (ps->is_texbrush) {
 						brush_sample_tex(ps->brush, projPixel->projCoSS, rgba);
diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile
index 823423cc28b..f4d65975d43 100644
--- a/source/blender/windowmanager/intern/Makefile
+++ b/source/blender/windowmanager/intern/Makefile
@@ -58,7 +58,6 @@ CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../blenloader
 CPPFLAGS += -I../../gpu
 CPPFLAGS += -I../../render/extern/include
-CPPFLAGS += -I../../radiosity/extern/include
 CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I../../blenfont
 

From 9125fe55fbe18d0fafdf388ce69f9bd29657da2f Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 21 Aug 2009 10:47:27 +0000
Subject: [PATCH 179/577] Hook Modifier - Bone Targets

Made Hook Modifier be able to use bone targets. However, I haven't been able to verify that everything will work perfectly, since just creating a new Hook Modifier and assigning targets doesn't set hmd->indexar correctly.
---
 release/ui/buttons_data_modifier.py           |  6 ++++-
 source/blender/blenkernel/intern/action.c     |  5 ++--
 source/blender/blenkernel/intern/modifier.c   | 27 ++++++++++++++-----
 source/blender/editors/object/object_edit.c   |  4 +++
 .../blender/editors/object/object_modifier.c  | 19 +++++++++++--
 source/blender/makesdna/DNA_modifier_types.h  |  2 ++
 source/blender/makesrna/intern/rna_modifier.c |  5 ++++
 7 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index cc50256f216..f5af26f8746 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -200,7 +200,11 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		layout.itemL(text="See Fluid panel.")
 		
 	def HOOK(self, layout, ob, md):
-		layout.itemR(md, "object")
+		col = layout.column()
+		col.itemR(md, "object")
+		if md.object and md.object.type == "ARMATURE":
+			layout.item_pointerR(md, "subtarget", md.object.data, "bones", text="Bone")
+		
 		layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
 
 		split = layout.split()
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index f4d4eb1cc9c..6a39139d250 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -410,8 +410,9 @@ bActionGroup *action_groups_find_named (bAction *act, const char name[])
 bPoseChannel *get_pose_channel(const bPose *pose, const char *name)
 {
 	bPoseChannel *chan;
-
-	if (pose==NULL) return NULL;
+	
+	if (ELEM(NULL, pose, name) || (name[0] == 0))
+		return NULL;
 	
 	for (chan=pose->chanbase.first; chan; chan=chan->next) {
 		if (chan->name[0] == name[0]) {
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 37cf427b897..501638aba0d 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -5598,6 +5598,7 @@ static void hookModifier_copyData(ModifierData *md, ModifierData *target)
 	thmd->indexar = MEM_dupallocN(hmd->indexar);
 	memcpy(thmd->parentinv, hmd->parentinv, sizeof(hmd->parentinv));
 	strncpy(thmd->name, hmd->name, 32);
+	strncpy(thmd->subtarget, hmd->subtarget, 32);
 }
 
 CustomDataMask hookModifier_requiredDataMask(Object *ob, ModifierData *md)
@@ -5642,9 +5643,11 @@ static void hookModifier_updateDepgraph(ModifierData *md, DagForest *forest, Sce
 
 	if (hmd->object) {
 		DagNode *curNode = dag_get_node(forest, hmd->object);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-			"Hook Modifier");
+		
+		if (hmd->subtarget[0])
+			dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA|DAG_RL_DATA_DATA, "Hook Modifier");
+		else
+			dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, "Hook Modifier");
 	}
 }
 
@@ -5653,12 +5656,22 @@ static void hookModifier_deformVerts(
 	 float (*vertexCos)[3], int numVerts, int useRenderParams, int isFinalCalc)
 {
 	HookModifierData *hmd = (HookModifierData*) md;
-	float vec[3], mat[4][4];
+	bPoseChannel *pchan= get_pose_channel(hmd->object->pose, hmd->subtarget);
+	float vec[3], mat[4][4], dmat[4][4], imat[4][4];
 	int i;
 	DerivedMesh *dm = derivedData;
-
-	Mat4Invert(ob->imat, ob->obmat);
-	Mat4MulSerie(mat, ob->imat, hmd->object->obmat, hmd->parentinv,
+	
+	/* get world-space matrix of target, corrected for the space the verts are in */
+	if (hmd->subtarget[0] && pchan) {
+		/* bone target if there's a matching pose-channel */
+		Mat4MulMat4(dmat, pchan->pose_mat, hmd->object->obmat);
+	}
+	else {
+		/* just object target */
+		Mat4CpyMat4(dmat, hmd->object->obmat);
+	}
+	Mat4Invert(imat, dmat);
+	Mat4MulSerie(mat, imat, dmat, hmd->parentinv,
 		     NULL, NULL, NULL, NULL, NULL);
 
 	/* vertex indices? */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 2fb9835f833..e1b8858937c 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -979,6 +979,9 @@ static void select_editmesh_hook(Object *ob, HookModifierData *hmd)
 	EditVert *eve;
 	int index=0, nr=0;
 	
+	if (hmd->indexar == NULL)
+		return;
+	
 	for(eve= em->verts.first; eve; eve= eve->next, nr++) {
 		if(nr==hmd->indexar[index]) {
 			eve->f |= SELECT;
@@ -1361,6 +1364,7 @@ void add_hook(Scene *scene, View3D *v3d, int mode)
 			hmd->totindex= tot;
 			BLI_strncpy(hmd->name, name, 32);
 			
+			// TODO: need to take into account bone targets here too now...
 			if(mode==1 || mode==2) {
 				/* matrix calculus */
 				/* vert x (obmat x hook->imat) x hook->obmat x ob->imat */
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 32a1297aaf4..3785e17f67c 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -31,6 +31,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_action_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -42,6 +43,7 @@
 #include "BLI_arithb.h"
 #include "BLI_listbase.h"
 
+#include "BKE_action.h"
 #include "BKE_curve.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
@@ -853,8 +855,21 @@ static int hook_reset_exec(bContext *C, wmOperator *op)
 	HookModifierData *hmd= ptr.data;
 
 	if(hmd->object) {
-		Mat4Invert(hmd->object->imat, hmd->object->obmat);
-		Mat4MulSerie(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
+		bPoseChannel *pchan= get_pose_channel(hmd->object->pose, hmd->subtarget);
+		
+		if(hmd->subtarget[0] && pchan) {
+			float imat[4][4], mat[4][4];
+			
+			/* calculate the world-space matrix for the pose-channel target first, then carry on as usual */
+			Mat4MulMat4(mat, pchan->pose_mat, hmd->object->obmat);
+			
+			Mat4Invert(imat, mat);
+			Mat4MulSerie(hmd->parentinv, imat, mat, NULL, NULL, NULL, NULL, NULL, NULL);
+		}
+		else {
+			Mat4Invert(hmd->object->imat, hmd->object->obmat);
+			Mat4MulSerie(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
+		}
 	}
 
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 912d11dcc8c..a4587c34e89 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -426,6 +426,8 @@ typedef struct HookModifierData {
 	ModifierData modifier;
 
 	struct Object *object;
+	char subtarget[32];		/* optional name of bone target */
+	
 	float parentinv[4][4];	/* matrix making current transform unmodified */
 	float cent[3];			/* visualization of hook */
 	float falloff;			/* if not zero, falloff is distance where influence zero */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index c080b88feaf..bfd93a4218b 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -912,6 +912,11 @@ static void rna_def_modifier_hook(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Object", "Parent Object for hook, also recalculates and clears offset");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	
+	prop= RNA_def_property(srna, "subtarget", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "subtarget");
+	RNA_def_property_ui_text(prop, "Sub-Target", "Name of Parent Bone for hook (if applicable), also recalculates and clears offset");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");

From df61b5f9fd2d92777a9bd00cb7f5f94b130e8c42 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 21 Aug 2009 11:04:33 +0000
Subject: [PATCH 180/577] 2.5 - 2 Bugfixes

* Alt-S in Object Mode would crash. Was caused by modal-keymaps for Pose Mode not being cleared when not in Pose Mode.
Also fixed what appears to have been a copy+paste error for Armature Sketching keymaps.

* Active KeyingSet menu in TimeLine header is now properly editable. Was using the wrong type of layout call to do this.
---
 release/ui/space_time.py                         | 2 +-
 source/blender/editors/space_view3d/drawobject.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index d1c9f9806f3..17deb4c550f 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -63,7 +63,7 @@ class TIME_HT_header(bpy.types.Header):
 		layout.itemS()
 		
 		row = layout.row(align=True)
-		row.itemR(scene, "active_keying_set", text="")
+		row.item_pointerR(scene, "active_keying_set", scene, "keying_sets", text="")
 		row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")
 		row.itemO("anim.delete_keyframe", text="", icon="ICON_KEY_DEHLT")
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 55565c83f5e..9fc9bf94cd7 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5023,6 +5023,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 	/* patch? children objects with a timeoffs change the parents. How to solve! */
 	/* if( ((int)ob->ctime) != F_(scene->r.cfra)) where_is_object(scene, ob); */
+	
+	/* draw paths... */
+	// TODO...
 
 	/* multiply view with object matrix */
 	wmMultMatrix(ob->obmat);

From d9283fc0cc9efc6b7aac8a5fc44c4790bdfba3c7 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 21 Aug 2009 11:22:38 +0000
Subject: [PATCH 181/577] Ack... committed wrong file before (fortunately it
 was just a harmless comment added)

---
 source/blender/editors/space_view3d/space_view3d.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 8b719dd2d80..3dd65a6f796 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -280,7 +280,7 @@ static void view3d_modal_keymaps(wmWindowManager *wm, ARegion *ar, int stype)
 	
 	/* copy last mode, then we can re-init the region maps */
 	rv3d->lastmode= stype;
-
+	
 	keymap= WM_keymap_listbase(wm, "Object Mode", 0, 0);
 	if(ELEM(stype, 0, NS_MODE_OBJECT))
 		WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -304,6 +304,12 @@ static void view3d_modal_keymaps(wmWindowManager *wm, ARegion *ar, int stype)
 		WM_event_add_keymap_handler(&ar->handlers, keymap);
 	else
 		WM_event_remove_keymap_handler(&ar->handlers, keymap);
+		
+	keymap= WM_keymap_listbase(wm, "Pose", 0, 0);
+	if(stype==NS_MODE_POSE)
+		WM_event_add_keymap_handler(&ar->handlers, keymap);
+	else
+		WM_event_remove_keymap_handler(&ar->handlers, keymap);
 
 	keymap= WM_keymap_listbase(wm, "Metaball", 0, 0);
 	if(stype==NS_EDITMODE_MBALL)
@@ -319,7 +325,7 @@ static void view3d_modal_keymaps(wmWindowManager *wm, ARegion *ar, int stype)
 
 	/* armature sketching needs to take over mouse */
 	keymap= WM_keymap_listbase(wm, "Armature_Sketch", 0, 0);
-	if(stype==NS_EDITMODE_TEXT)
+	if(stype==NS_EDITMODE_ARMATURE)
 		WM_event_add_keymap_handler_priority(&ar->handlers, keymap, 10);
 	else
 		WM_event_remove_keymap_handler(&ar->handlers, keymap);

From 27797a45ee6cbc987350269e6827197f47daf036 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Fri, 21 Aug 2009 11:52:20 +0000
Subject: [PATCH 182/577] 2.5:

* Deleted Help scripts, there are now operators in space_info.py.

* Some code cleanup.
---
 release/scripts/help_getting_started.py | 50 -------------------------
 release/scripts/help_manual.py          | 48 ------------------------
 release/scripts/help_release_notes.py   | 47 -----------------------
 release/scripts/help_tutorials.py       | 47 -----------------------
 release/scripts/help_web_blender.py     | 48 ------------------------
 release/scripts/help_web_devcomm.py     | 47 -----------------------
 release/scripts/help_web_eshop.py       | 47 -----------------------
 release/scripts/help_web_usercomm.py    | 47 -----------------------
 release/ui/space_filebrowser.py         |  5 +--
 release/ui/space_info.py                | 20 +++++-----
 10 files changed, 12 insertions(+), 394 deletions(-)
 delete mode 100644 release/scripts/help_getting_started.py
 delete mode 100644 release/scripts/help_manual.py
 delete mode 100644 release/scripts/help_release_notes.py
 delete mode 100644 release/scripts/help_tutorials.py
 delete mode 100644 release/scripts/help_web_blender.py
 delete mode 100644 release/scripts/help_web_devcomm.py
 delete mode 100644 release/scripts/help_web_eshop.py
 delete mode 100644 release/scripts/help_web_usercomm.py

diff --git a/release/scripts/help_getting_started.py b/release/scripts/help_getting_started.py
deleted file mode 100644
index 77dda2cf88f..00000000000
--- a/release/scripts/help_getting_started.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!BPY
-"""
-Name: 'Getting Started'
-Blender: 248
-Group: 'Help'
-Tooltip: 'Help for new users'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"Getting Started" page.
-"""
-
-# $Id$
-#
-# --------------------------------------------------------------------------
-# Getting Started Help Menu Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender.org/education-help/tutorials/getting-started/')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
-
-
diff --git a/release/scripts/help_manual.py b/release/scripts/help_manual.py
deleted file mode 100644
index 27900040eb4..00000000000
--- a/release/scripts/help_manual.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!BPY
-"""
-Name: 'Manual'
-Blender: 248
-Group: 'Help'
-Tooltip: 'The Blender Wiki manual'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"Manual" page.
-"""
-
-# --------------------------------------------------------------------------
-# Manual Help Menu Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://wiki.blender.org/index.php/Manual')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
-
-
diff --git a/release/scripts/help_release_notes.py b/release/scripts/help_release_notes.py
deleted file mode 100644
index 870f2391487..00000000000
--- a/release/scripts/help_release_notes.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!BPY
-"""
-Name: 'Release Logs'
-Blender: 248
-Group: 'Help'
-Tooltip: 'Information about the changes in this version of Blender'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"Release Logs" page.
-"""
-
-# --------------------------------------------------------------------------
-# Release Notes Help Menu Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender.org/development/release-logs/')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
-
diff --git a/release/scripts/help_tutorials.py b/release/scripts/help_tutorials.py
deleted file mode 100644
index e0cef1abdbf..00000000000
--- a/release/scripts/help_tutorials.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!BPY
-
-"""
-Name: 'Tutorials'
-Blender: 248
-Group: 'Help'
-Tooltip: 'Tutorials for learning to use Blender'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"Tutorials" page.
-"""
-
-# --------------------------------------------------------------------------
-# Tutorials Help Menu Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender.org/education-help/tutorials/')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
diff --git a/release/scripts/help_web_blender.py b/release/scripts/help_web_blender.py
deleted file mode 100644
index 2a0f90844ae..00000000000
--- a/release/scripts/help_web_blender.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!BPY
-
-"""
-Name: 'Blender Website'
-Blender: 248
-Group: 'HelpWebsites'
-Tooltip: 'The official Blender website'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at Blender's main site,
-www.blender.org.
-"""
-
-
-# --------------------------------------------------------------------------
-# Blender Website Help Menu -> Websites Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender.org/')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
diff --git a/release/scripts/help_web_devcomm.py b/release/scripts/help_web_devcomm.py
deleted file mode 100644
index 46fa2487a89..00000000000
--- a/release/scripts/help_web_devcomm.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!BPY
-
-"""
-Name: 'Developer Community'
-Blender: 248
-Group: 'HelpWebsites'
-Tooltip: 'Get involved with Blender development'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"Get Involved" page.
-"""
-
-# --------------------------------------------------------------------------
-# Blender Website Help Menu -> Websites Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender.org/community/get-involved/')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
diff --git a/release/scripts/help_web_eshop.py b/release/scripts/help_web_eshop.py
deleted file mode 100644
index e40795b3a0d..00000000000
--- a/release/scripts/help_web_eshop.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!BPY
-
-"""
-Name: 'Blender E-Shop'
-Blender: 248
-Group: 'HelpWebsites'
-Tooltip: 'Buy official Blender resources and merchandise online'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"E-Shop" section.
-"""
-
-# --------------------------------------------------------------------------
-# Blender Website Help Menu -> Websites Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender3d.org/e-shop')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
diff --git a/release/scripts/help_web_usercomm.py b/release/scripts/help_web_usercomm.py
deleted file mode 100644
index dda5e42f34e..00000000000
--- a/release/scripts/help_web_usercomm.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!BPY
-
-"""
-Name: 'User Community'
-Blender: 248
-Group: 'HelpWebsites'
-Tooltip: 'Get involved with other Blender users'
-"""
-
-__author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0.1"
-__bpydoc__ = """\
-This script opens the user's default web browser at www.blender.org's
-"User Community" page.
-"""
-
-# --------------------------------------------------------------------------
-# Blender Website Help Menu -> Websites Item
-# --------------------------------------------------------------------------
-# ***** 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-import Blender
-try: import webbrowser
-except: webbrowser = None
-
-if webbrowser:
-    webbrowser.open('http://www.blender.org/community/user-community/')
-else:
-    Blender.Draw.PupMenu("Error%t|This script requires a full python installation")
diff --git a/release/ui/space_filebrowser.py b/release/ui/space_filebrowser.py
index 51a8f3f78e8..a37b89e8db4 100644
--- a/release/ui/space_filebrowser.py
+++ b/release/ui/space_filebrowser.py
@@ -1,15 +1,15 @@
 
 import bpy
 
-
 class FILEBROWSER_HT_header(bpy.types.Header):
 	__space_type__ = "FILE_BROWSER"
 
 	def draw(self, context):
-		st = context.space_data
 		layout = self.layout
 		
+		st = context.space_data
 		params = st.params 
+		
 		layout.template_header(menus=False)
 		
 		row = layout.row(align=True)
@@ -39,5 +39,4 @@ class FILEBROWSER_HT_header(bpy.types.Header):
 
 		row.active = params.do_filter
 
-		
 bpy.types.register(FILEBROWSER_HT_header)
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 1a3f9a321ac..83eb2c75a2c 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -115,22 +115,22 @@ class INFO_MT_add(bpy.types.Menu):
 
 		layout.operator_context = "EXEC_SCREEN"
 
-		layout.item_menu_enumO( "OBJECT_OT_mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH')
-		layout.item_menu_enumO( "OBJECT_OT_curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE')
-		layout.item_menu_enumO( "OBJECT_OT_surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE')
-		layout.item_menu_enumO( "OBJECT_OT_metaball_add", "type", 'META', icon='ICON_OUTLINER_OB_META')
-		layout.itemO("OBJECT_OT_text_add", text="Text", icon='ICON_OUTLINER_OB_FONT')
+		layout.item_menu_enumO( "object.mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH')
+		layout.item_menu_enumO( "object.curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE')
+		layout.item_menu_enumO( "object.surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE')
+		layout.item_menu_enumO( "object.metaball_add", "type", 'META', icon='ICON_OUTLINER_OB_META')
+		layout.itemO("object.text_add", text="Text", icon='ICON_OUTLINER_OB_FONT')
 
 		layout.itemS()
 
-		layout.itemO("OBJECT_OT_armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE')
-		layout.item_enumO("OBJECT_OT_object_add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE')
-		layout.item_enumO("OBJECT_OT_object_add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY')
+		layout.itemO("object.armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE')
+		layout.item_enumO("object.object_add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE')
+		layout.item_enumO("object.object_add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY')
 
 		layout.itemS()
 
-		layout.item_enumO("OBJECT_OT_object_add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA')
-		layout.item_enumO("OBJECT_OT_object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
+		layout.item_enumO("object.object_add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA')
+		layout.item_enumO("object.object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
 
 class INFO_MT_game(bpy.types.Menu):
 	__space_type__ = "INFO"

From 93dd95b6c2c9ed69916060aa438c13ba1ee6431f Mon Sep 17 00:00:00 2001
From: Jens Ole Wund <bjornmose@gmx.net>
Date: Fri, 21 Aug 2009 12:49:21 +0000
Subject: [PATCH 183/577] bug fix #18982 non mesh objects missing initializers

---
 source/blender/blenkernel/intern/softbody.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 25eb999cc4f..01fa3b544ff 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -867,7 +867,8 @@ static void renew_softbody(Object *ob, int totpoint, int totspring)
 			bp->frozen = 1.0f;
 			bp->colball = 0.0f;
 			bp->flag = 0;
-
+			bp->springweight = 1.0f;
+			bp->mass = sb->nodemass;
 		}
 	}
 }

From 1c614f6cf63fb65622b855123d8db76898d3c9ca Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 21 Aug 2009 12:57:47 +0000
Subject: [PATCH 184/577] 2.5: layout.itemO now returns OperatorProperties to
 be filled in, when passing properties=True as argument.

Other changes:
* uiItemR, uiItemFullR, uiItemFullO now accept a flag argument rather
  than multiple different "boolean" arguments, but still exposed as
  booleans to python.
* Fix RNA to support setting PROP_RNAPTR for return values.
---
 release/ui/space_view3d.py                    | 20 ++++--
 .../blender/editors/animation/fmodifier_ui.c  | 52 +++++++-------
 source/blender/editors/include/UI_interface.h | 15 +++--
 .../editors/interface/interface_layout.c      | 49 +++++++++-----
 .../editors/interface/interface_templates.c   | 16 ++---
 .../editors/interface/interface_utils.c       |  2 +-
 source/blender/editors/object/object_edit.c   | 20 ++----
 .../editors/space_action/action_header.c      |  6 +-
 .../blender/editors/space_file/file_panels.c  |  2 +-
 .../editors/space_graph/graph_header.c        |  6 +-
 .../blender/editors/space_nla/nla_buttons.c   | 50 +++++++-------
 source/blender/editors/space_nla/nla_header.c |  4 +-
 .../editors/space_view3d/view3d_header.c      | 67 ++-----------------
 .../editors/space_view3d/view3d_toolbar.c     |  2 +-
 source/blender/makesrna/intern/makesrna.c     | 12 +++-
 source/blender/makesrna/intern/rna_ui_api.c   | 29 ++++++--
 16 files changed, 170 insertions(+), 182 deletions(-)

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 44b1c82ff46..0b08b213cd4 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -157,7 +157,13 @@ class VIEW3D_MT_select_POSE(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.view3d_select_posemenu()
+		props = layout.itemO("pose.select_hierarchy", properties=True, text="Extend Parent")
+		props.extend = True
+		props.direction = 'PARENT'
+
+		props = layout.itemO("pose.select_hierarchy", properties=True, text="Extend Child")
+		props.extend = True
+		props.direction = 'CHILD'
 
 class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
 	__space_type__ = "VIEW_3D"
@@ -327,12 +333,18 @@ class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
 
 		layout.itemS()
 		
-		layout.item_enumO("armature.select_hierarchy", "direction", 'PARENT')
-		layout.item_enumO("armature.select_hierarchy", "direction", 'CHILD')
+		layout.item_enumO("armature.select_hierarchy", "direction", 'PARENT', text="Parent")
+		layout.item_enumO("armature.select_hierarchy", "direction", 'CHILD', text="Child")
 		
 		layout.itemS()
 		
-		layout.view3d_select_armaturemenu()
+		props = layout.itemO("armature.select_hierarchy", properties=True, text="Extend Parent")
+		props.extend = True
+		props.direction = 'PARENT'
+
+		props = layout.itemO("armature.select_hierarchy", properties=True, text="Extend Child")
+		props.extend = True
+		props.direction = 'CHILD'
 
 class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
 	__space_type__ = "VIEW_3D"
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index 7a618f4d222..4aff26105f3 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -258,14 +258,14 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm
 	
 	/* add the settings */
 	col= uiLayoutColumn(layout, 1);
-		uiItemR(col, "", 0, &ptr, "type", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "additive", 0, 0, 1);
+		uiItemR(col, "", 0, &ptr, "type", 0);
+		uiItemR(col, NULL, 0, &ptr, "additive", UI_ITEM_R_TOGGLE);
 	
 	col= uiLayoutColumn(layout, 0); // no grouping for now
-		uiItemR(col, NULL, 0, &ptr, "amplitude", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "phase_multiplier", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "phase_offset", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "value_offset", 0, 0, 0);
+		uiItemR(col, NULL, 0, &ptr, "amplitude", 0);
+		uiItemR(col, NULL, 0, &ptr, "phase_multiplier", 0);
+		uiItemR(col, NULL, 0, &ptr, "phase_offset", 0);
+		uiItemR(col, NULL, 0, &ptr, "value_offset", 0);
 }
 
 /* --------------- */
@@ -287,14 +287,14 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor
 	/* before range */
 	col= uiLayoutColumn(split, 1);
 	uiItemL(col, "Before:", 0);
-	uiItemR(col, "", 0, &ptr, "before_mode", 0, 0, 0);
-	uiItemR(col, NULL, 0, &ptr, "before_cycles", 0, 0, 0);
+	uiItemR(col, "", 0, &ptr, "before_mode", 0);
+	uiItemR(col, NULL, 0, &ptr, "before_cycles", 0);
 		
 	/* after range */
 	col= uiLayoutColumn(split, 1);
 	uiItemL(col, "After:", 0);
-	uiItemR(col, "", 0, &ptr, "after_mode", 0, 0, 0);
-	uiItemR(col, NULL, 0, &ptr, "after_cycles", 0, 0, 0);
+	uiItemR(col, "", 0, &ptr, "after_mode", 0);
+	uiItemR(col, NULL, 0, &ptr, "after_cycles", 0);
 }
 
 /* --------------- */
@@ -309,20 +309,20 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short
 	RNA_pointer_create(id, &RNA_FModifierNoise, fcm, &ptr);
 	
 	/* blending mode */
-	uiItemR(layout, NULL, 0, &ptr, "modification", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &ptr, "modification", 0);
 	
 	/* split into 2 columns */
 	split= uiLayoutSplit(layout, 0.5f);
 	
 	/* col 1 */
 	col= uiLayoutColumn(split, 0);
-	uiItemR(col, NULL, 0, &ptr, "size", 0, 0, 0);
-	uiItemR(col, NULL, 0, &ptr, "strength", 0, 0, 0);
+	uiItemR(col, NULL, 0, &ptr, "size", 0);
+	uiItemR(col, NULL, 0, &ptr, "strength", 0);
 	
 	/* col 2 */
 	col= uiLayoutColumn(split, 0);
-	uiItemR(col, NULL, 0, &ptr, "phase", 0, 0, 0);
-	uiItemR(col, NULL, 0, &ptr, "depth", 0, 0, 0);
+	uiItemR(col, NULL, 0, &ptr, "phase", 0);
+	uiItemR(col, NULL, 0, &ptr, "depth", 0);
 }
 
 /* --------------- */
@@ -503,11 +503,11 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh
 	/* general settings */
 	col= uiLayoutColumn(layout, 1);
 		uiItemL(col, "Envelope:", 0);
-		uiItemR(col, NULL, 0, &ptr, "reference_value", 0, 0, 0);
+		uiItemR(col, NULL, 0, &ptr, "reference_value", 0);
 		
 		row= uiLayoutRow(col, 1);
-			uiItemR(row, "Min", 0, &ptr, "default_minimum", 0, 0, 0);
-			uiItemR(row, "Max", 0, &ptr, "default_maximum", 0, 0, 0);
+			uiItemR(row, "Min", 0, &ptr, "default_minimum", 0);
+			uiItemR(row, "Max", 0, &ptr, "default_maximum", 0);
 			
 	/* control points header */
 	// TODO: move this control-point control stuff to using the new special widgets for lists
@@ -559,13 +559,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
 		
 		/* x-minimum */
 		col= uiLayoutColumn(split, 1);
-		uiItemR(col, NULL, 0, &ptr, "use_minimum_x", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "minimum_x", 0, 0, 0);
+		uiItemR(col, NULL, 0, &ptr, "use_minimum_x", 0);
+		uiItemR(col, NULL, 0, &ptr, "minimum_x", 0);
 			
 		/* y-minimum*/
 		col= uiLayoutColumn(split, 1);
-		uiItemR(col, NULL, 0, &ptr, "use_minimum_y", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "minimum_y", 0, 0, 0);
+		uiItemR(col, NULL, 0, &ptr, "use_minimum_y", 0);
+		uiItemR(col, NULL, 0, &ptr, "minimum_y", 0);
 	}
 	
 	/* row 2: minimum */
@@ -577,13 +577,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
 		
 		/* x-minimum */
 		col= uiLayoutColumn(split, 1);
-		uiItemR(col, NULL, 0, &ptr, "use_maximum_x", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "maximum_x", 0, 0, 0);
+		uiItemR(col, NULL, 0, &ptr, "use_maximum_x", 0);
+		uiItemR(col, NULL, 0, &ptr, "maximum_x", 0);
 			
 		/* y-minimum*/
 		col= uiLayoutColumn(split, 1);
-		uiItemR(col, NULL, 0, &ptr, "use_maximum_y", 0, 0, 0);
-		uiItemR(col, NULL, 0, &ptr, "maximum_y", 0, 0, 0);
+		uiItemR(col, NULL, 0, &ptr, "use_maximum_y", 0);
+		uiItemR(col, NULL, 0, &ptr, "maximum_y", 0);
 	}
 }
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 5bf59b06bc4..5f93743493a 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -585,16 +585,21 @@ void UI_exit(void);
 #define UI_LAYOUT_ALIGN_CENTER	2
 #define UI_LAYOUT_ALIGN_RIGHT	3
 
+#define UI_ITEM_O_RETURN_PROPS	1
+#define UI_ITEM_R_EXPAND		2
+#define UI_ITEM_R_SLIDER		4
+#define UI_ITEM_R_TOGGLE		8
+
 uiLayout *uiBlockLayout(uiBlock *block, int dir, int type, int x, int y, int size, int em, struct uiStyle *style);
 void uiBlockSetCurLayout(uiBlock *block, uiLayout *layout);
 void uiBlockLayoutResolve(const struct bContext *C, uiBlock *block, int *x, int *y);
 
 uiBlock *uiLayoutGetBlock(uiLayout *layout);
 
-void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext);
 void uiLayoutSetFunc(uiLayout *layout, uiMenuHandleFunc handlefunc, void *argv);
 void uiLayoutSetContextPointer(uiLayout *layout, char *name, struct PointerRNA *ptr);
 
+void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext);
 void uiLayoutSetActive(uiLayout *layout, int active);
 void uiLayoutSetEnabled(uiLayout *layout, int enabled);
 void uiLayoutSetRedAlert(uiLayout *layout, int redalert);
@@ -641,8 +646,6 @@ void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
 void uiTemplateOperatorSearch(uiLayout *layout);
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
 void uiTemplate_view3d_select_metaballmenu(uiLayout *layout, struct bContext *C);
-void uiTemplate_view3d_select_armaturemenu(uiLayout *layout, struct bContext *C);
-void uiTemplate_view3d_select_posemenu(uiLayout *layout, struct bContext *C);
 void uiTemplate_view3d_select_faceselmenu(uiLayout *layout, struct bContext *C);
 void uiTemplateTextureImage(uiLayout *layout, struct bContext *C, struct Tex *tex);
 
@@ -664,10 +667,10 @@ void uiItemBooleanO(uiLayout *layout, char *name, int icon, char *opname, char *
 void uiItemIntO(uiLayout *layout, char *name, int icon, char *opname, char *propname, int value);
 void uiItemFloatO(uiLayout *layout, char *name, int icon, char *opname, char *propname, float value);
 void uiItemStringO(uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value);
-void uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, struct IDProperty *properties, int context);
+PointerRNA uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, struct IDProperty *properties, int context, int flag);
 
-void uiItemR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int expand, int slider, int toggle);
-void uiItemFullR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int expand, int slider, int toggle);
+void uiItemR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int flag);
+void uiItemFullR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int flag);
 void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int value);
 void uiItemEnumR_string(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, char *value);
 void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index ab27f8fb0f6..8676fe62a3a 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -535,7 +535,7 @@ static void ui_item_disabled(uiLayout *layout, char *name)
 }
 
 /* operator items */
-void uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, IDProperty *properties, int context)
+PointerRNA uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, IDProperty *properties, int context, int flag)
 {
 	uiBlock *block= layout->root->block;
 	wmOperatorType *ot= WM_operatortype_find(idname, 0);
@@ -544,7 +544,7 @@ void uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, IDPropert
 
 	if(!ot) {
 		ui_item_disabled(layout, idname);
-		return;
+		return PointerRNA_NULL;
 	}
 
 	if(!name)
@@ -565,10 +565,21 @@ void uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, IDPropert
 		but= uiDefButO(block, BUT, ot->idname, context, (char*)name, 0, 0, w, UI_UNIT_Y, NULL);
 
 	/* assign properties */
-	if(properties) {
+	if(properties || (flag & UI_ITEM_O_RETURN_PROPS)) {
 		PointerRNA *opptr= uiButGetOperatorPtrRNA(but);
-		opptr->data= properties;
+
+		if(properties) {
+			opptr->data= properties;
+		}
+		else {
+			IDPropertyTemplate val = {0};
+			opptr->data= IDP_New(IDP_GROUP, val, "wmOperatorProperties");
+		}
+
+		return *opptr;
 	}
+
+	return PointerRNA_NULL;
 }
 
 static char *ui_menu_enumpropname(uiLayout *layout, char *opname, char *propname, int retval)
@@ -611,7 +622,7 @@ void uiItemEnumO(uiLayout *layout, char *name, int icon, char *opname, char *pro
 	if(!name)
 		name= ui_menu_enumpropname(layout, opname, propname, value);
 
-	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext, 0);
 }
 
 void uiItemsEnumO(uiLayout *layout, char *opname, char *propname)
@@ -699,7 +710,7 @@ void uiItemEnumO_string(uiLayout *layout, char *name, int icon, char *opname, ch
 	if(!name)
 		name= ui_menu_enumpropname(layout, opname, propname, value);
 
-	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext, 0);
 }
 
 void uiItemBooleanO(uiLayout *layout, char *name, int icon, char *opname, char *propname, int value)
@@ -709,7 +720,7 @@ void uiItemBooleanO(uiLayout *layout, char *name, int icon, char *opname, char *
 	WM_operator_properties_create(&ptr, opname);
 	RNA_boolean_set(&ptr, propname, value);
 
-	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext, 0);
 }
 
 void uiItemIntO(uiLayout *layout, char *name, int icon, char *opname, char *propname, int value)
@@ -719,7 +730,7 @@ void uiItemIntO(uiLayout *layout, char *name, int icon, char *opname, char *prop
 	WM_operator_properties_create(&ptr, opname);
 	RNA_int_set(&ptr, propname, value);
 
-	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext, 0);
 }
 
 void uiItemFloatO(uiLayout *layout, char *name, int icon, char *opname, char *propname, float value)
@@ -729,7 +740,7 @@ void uiItemFloatO(uiLayout *layout, char *name, int icon, char *opname, char *pr
 	WM_operator_properties_create(&ptr, opname);
 	RNA_float_set(&ptr, propname, value);
 
-	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext, 0);
 }
 
 void uiItemStringO(uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value)
@@ -739,12 +750,12 @@ void uiItemStringO(uiLayout *layout, char *name, int icon, char *opname, char *p
 	WM_operator_properties_create(&ptr, opname);
 	RNA_string_set(&ptr, propname, value);
 
-	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, ptr.data, layout->root->opcontext, 0);
 }
 
 void uiItemO(uiLayout *layout, char *name, int icon, char *opname)
 {
-	uiItemFullO(layout, name, icon, opname, NULL, layout->root->opcontext);
+	uiItemFullO(layout, name, icon, opname, NULL, layout->root->opcontext, 0);
 }
 
 /* RNA property items */
@@ -793,13 +804,13 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PropertyRNA
 	*r_h= h;
 }
 
-void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int value, int expand, int slider, int toggle)
+void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int value, int flag)
 {
 	uiBlock *block= layout->root->block;
 	uiBut *but;
 	PropertyType type;
 	char namestr[UI_MAX_NAME_STR];
-	int len, w, h;
+	int len, w, h, slider, toggle, expand;
 
 	if(!ptr->data || !prop)
 		return;
@@ -830,6 +841,10 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 			icon= (RNA_property_enum_get(ptr, prop) == value)? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT; 
 	}
 
+	slider= (flag & UI_ITEM_R_SLIDER);
+	toggle= (flag & UI_ITEM_R_TOGGLE);
+	expand= (flag & UI_ITEM_R_EXPAND);
+
 	/* get size */
 	ui_item_rna_size(layout, name, icon, prop, index, &w, &h);
 
@@ -867,7 +882,7 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 	}
 }
 
-void uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *propname, int expand, int slider, int toggle)
+void uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *propname, int flag)
 {
 	PropertyRNA *prop;
 
@@ -882,7 +897,7 @@ void uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *prop
 		return;
 	}
 
-	uiItemFullR(layout, name, icon, ptr, prop, RNA_NO_INDEX, 0, expand, slider, toggle);
+	uiItemFullR(layout, name, icon, ptr, prop, RNA_NO_INDEX, 0, flag);
 }
 
 void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int value)
@@ -900,7 +915,7 @@ void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr,
 		return;
 	}
 
-	uiItemFullR(layout, name, icon, ptr, prop, RNA_ENUM_VALUE, value, 0, 0, 0);
+	uiItemFullR(layout, name, icon, ptr, prop, RNA_ENUM_VALUE, value, 0);
 }
 
 void uiItemEnumR_string(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, char *value)
@@ -931,7 +946,7 @@ void uiItemEnumR_string(uiLayout *layout, char *name, int icon, struct PointerRN
 
 	for(a=0; item[a].identifier; a++) {
 		if(item[a].value == ivalue) {
-			uiItemFullR(layout, (char*)item[a].name, item[a].icon, ptr, prop, RNA_ENUM_VALUE, ivalue, 0, 0, 0);
+			uiItemFullR(layout, (char*)item[a].name, item[a].icon, ptr, prop, RNA_ENUM_VALUE, ivalue, 0);
 			break;
 		}
 	}
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index e7c99f10a66..56badedaded 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -428,15 +428,15 @@ static uiLayout *draw_modifier(uiLayout *layout, Object *ob, ModifierData *md, i
 	else {
 		/* real modifier */
 		uiBlockBeginAlign(block);
-		uiItemR(row, "", 0, &ptr, "name", 0, 0, 0);
+		uiItemR(row, "", 0, &ptr, "name", 0);
 
 		/* Softbody not allowed in this situation, enforce! */
 		if(((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) && (md->type!=eModifierType_Surface)) {
-			uiItemR(row, "", ICON_SCENE, &ptr, "render", 0, 0, 0);
-			uiItemR(row, "", ICON_RESTRICT_VIEW_OFF, &ptr, "realtime", 0, 0, 0);
+			uiItemR(row, "", ICON_SCENE, &ptr, "render", 0);
+			uiItemR(row, "", ICON_RESTRICT_VIEW_OFF, &ptr, "realtime", 0);
 
 			if(mti->flags & eModifierTypeFlag_SupportsEditmode)
-				uiItemR(row, "", ICON_EDITMODE_HLT, &ptr, "editmode", 0, 0, 0);
+				uiItemR(row, "", ICON_EDITMODE_HLT, &ptr, "editmode", 0);
 		}
 		
 
@@ -1224,9 +1224,9 @@ void uiTemplateTriColorSet(uiLayout *layout, PointerRNA *ptr, char *propname)
 	/* nselected, selected, active color swatches */
 	csPtr= RNA_property_pointer_get(ptr, prop);
 	
-	uiItemR(row, "", 0, &csPtr, "normal", 0, 0, 0);
-	uiItemR(row, "", 0, &csPtr, "selected", 0, 0, 0);
-	uiItemR(row, "", 0, &csPtr, "active", 0, 0, 0);
+	uiItemR(row, "", 0, &csPtr, "normal", 0);
+	uiItemR(row, "", 0, &csPtr, "selected", 0);
+	uiItemR(row, "", 0, &csPtr, "active", 0);
 }
 
 /********************* Layer Buttons Template ************************/
@@ -1278,7 +1278,7 @@ void uiTemplateLayers(uiLayout *layout, PointerRNA *ptr, char *propname)
 			/* add layers as toggle buts */
 			for (col= 0; (col < cols) && (layer < layers); col++, layer++) {
 				int icon=0; // XXX - add some way of setting this...
-				uiItemFullR(uRow, "", icon, ptr, prop, layer, 0, 0, 0, 1);
+				uiItemFullR(uRow, "", icon, ptr, prop, layer, 0, UI_ITEM_R_TOGGLE);
 			}
 		}
 	}
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 4201850f5e4..b5cfbe19466 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -175,7 +175,7 @@ void uiDefAutoButsRNA(const bContext *C, uiLayout *layout, PointerRNA *ptr, int
 		if(strcmp(name, "Axis")==0) {
 			uiDefButR(uiLayoutGetBlock(col), BUT_NORMAL, 0, name, 0, 0, 100, 100, ptr, "axis", -1, 0, 0, -1, -1, NULL);
 		}
-		else uiItemFullR(col, "", 0, ptr, prop, -1, 0, 0, 0, 0);
+		else uiItemFullR(col, "", 0, ptr, prop, -1, 0, 0);
 	}
 	RNA_STRUCT_END;
 }
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index e1b8858937c..47eaf1757ac 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2759,13 +2759,10 @@ static void proxy_group_objects_menu (bContext *C, wmOperator *op, Object *ob, G
 		if (go->ob) {
 			PointerRNA props_ptr;
 			
-			/* create operator properties, and assign the relevant pointers to that, 
-			 * and add a menu entry which uses these props 
-			 */
-			WM_operator_properties_create(&props_ptr, op->idname);
-				RNA_string_set(&props_ptr, "object", go->ob->id.name+2);
-				RNA_string_set(&props_ptr, "group_object", go->ob->id.name+2);
-			uiItemFullO(layout, go->ob->id.name+2, 0, op->idname, props_ptr.data, WM_OP_EXEC_REGION_WIN);
+			/* create operator menu item with relevant properties filled in */
+			props_ptr= uiItemFullO(layout, go->ob->id.name+2, 0, op->idname, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+			RNA_string_set(&props_ptr, "object", go->ob->id.name+2);
+			RNA_string_set(&props_ptr, "group_object", go->ob->id.name+2);
 		}
 	}
 	
@@ -2793,12 +2790,9 @@ static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 		uiLayout *layout= uiPupMenuLayout(pup);
 		PointerRNA props_ptr;
 		
-		/* create operator properties, and assign the relevant pointers to that, 
-		 * and add a menu entry which uses these props 
-		 */
-		WM_operator_properties_create(&props_ptr, op->idname);
-			RNA_string_set(&props_ptr, "object", ob->id.name+2);
-		uiItemFullO(layout, op->type->name, 0, op->idname, props_ptr.data, WM_OP_EXEC_REGION_WIN);
+		/* create operator menu item with relevant properties filled in */
+		props_ptr= uiItemFullO(layout, op->type->name, 0, op->idname, props_ptr.data, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+		RNA_string_set(&props_ptr, "object", ob->id.name+2);
 		
 		/* present the menu and be done... */
 		uiPupMenuEnd(C, pup);
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index e4750bd0a37..375136d199e 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -88,9 +88,9 @@ static void act_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	
 	//uiItemS(layout);
 	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0, 0, 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "show_sliders", 0, 0, 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_sliders", 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0);
 	
 	if (sact->flag & SACTION_DRAWTIME)
 		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index 30598d39d58..c48b3529389 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -184,7 +184,7 @@ static void file_panel_operator(const bContext *C, Panel *pa)
 			if(strncmp(RNA_property_identifier(prop), "filter", 6) == 0)
 				continue;
 
-			uiItemFullR(pa->layout, NULL, 0, op->ptr, prop, -1, 0, 0, 0, 0);
+			uiItemFullR(pa->layout, NULL, 0, op->ptr, prop, -1, 0, 0);
 			empty= 0;
 		}
 		RNA_STRUCT_END;
diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
index c4654972dcd..fc02cadb475 100644
--- a/source/blender/editors/space_graph/graph_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -80,15 +80,15 @@ static void graph_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	
 	uiItemS(layout);
 	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
 	
 	if (sipo->flag & SIPO_NOHANDLES)
 		uiItemO(layout, "Show Handles", ICON_CHECKBOX_DEHLT, "GRAPH_OT_handles_view_toggle");
 	else
 		uiItemO(layout, "Show Handles", ICON_CHECKBOX_HLT, "GRAPH_OT_handles_view_toggle");
 	
-	uiItemR(layout, NULL, 0, &spaceptr, "only_selected_curves_handles", 0, 0, 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "only_selected_curves_handles", 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0);
 	
 	if (sipo->flag & SIPO_DRAWTIME)
 		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index 7184737e0ba..2ffca5185f2 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -210,19 +210,19 @@ static void nla_panel_animdata (const bContext *C, Panel *pa)
 	/* Active Action Properties ------------------------------------- */
 	/* action */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action", 0, 0, 0);
+		uiItemR(row, NULL, 0, &adt_ptr, "action", 0);
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action_extrapolation", 0, 0, 0);
+		uiItemR(row, NULL, 0, &adt_ptr, "action_extrapolation", 0);
 	
 	/* blending */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action_blending", 0, 0, 0);	
+		uiItemR(row, NULL, 0, &adt_ptr, "action_blending", 0);	
 		
 	/* influence */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action_influence", 0, 0, 0);
+		uiItemR(row, NULL, 0, &adt_ptr, "action_influence", 0);
 }
 
 /* active NLA-Track */
@@ -242,7 +242,7 @@ static void nla_panel_track (const bContext *C, Panel *pa)
 	
 	/* Info - Active NLA-Context:Track ----------------------  */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, ICON_NLA, &nlt_ptr, "name", 0, 0, 0);
+		uiItemR(row, NULL, ICON_NLA, &nlt_ptr, "name", 0);
 }
 
 /* generic settings for active NLA-Strip */
@@ -262,41 +262,41 @@ static void nla_panel_properties(const bContext *C, Panel *pa)
 	/* Strip Properties ------------------------------------- */
 	/* strip type */
 	row= uiLayoutColumn(layout, 1);
-		uiItemR(row, NULL, ICON_NLA, &strip_ptr, "name", 0, 0, 0); // XXX icon?
-		uiItemR(row, NULL, 0, &strip_ptr, "type", 0, 0, 0);
+		uiItemR(row, NULL, ICON_NLA, &strip_ptr, "name", 0); // XXX icon?
+		uiItemR(row, NULL, 0, &strip_ptr, "type", 0);
 	
 	/* strip extents */
 	column= uiLayoutColumn(layout, 1);
 		uiItemL(column, "Strip Extents:", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "start_frame", 0, 0, 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "end_frame", 0, 0, 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "start_frame", 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "end_frame", 0);
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &strip_ptr, "extrapolation", 0, 0, 0);
+		uiItemR(row, NULL, 0, &strip_ptr, "extrapolation", 0);
 	
 	/* blending */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &strip_ptr, "blending", 0, 0, 0);
+		uiItemR(row, NULL, 0, &strip_ptr, "blending", 0);
 		
 	/* blend in/out + autoblending
 	 *	- blend in/out can only be set when autoblending is off
 	 */
 	column= uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_influence")==0); 
-		uiItemR(column, NULL, 0, &strip_ptr, "auto_blending", 0, 0, 0); // XXX as toggle?
+		uiItemR(column, NULL, 0, &strip_ptr, "auto_blending", 0); // XXX as toggle?
 		
 		subcol= uiLayoutColumn(column, 1);
 			uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "auto_blending")==0); 
-			uiItemR(subcol, NULL, 0, &strip_ptr, "blend_in", 0, 0, 0);
-			uiItemR(subcol, NULL, 0, &strip_ptr, "blend_out", 0, 0, 0);
+			uiItemR(subcol, NULL, 0, &strip_ptr, "blend_in", 0);
+			uiItemR(subcol, NULL, 0, &strip_ptr, "blend_out", 0);
 		
 	/* settings */
 	column= uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "animated_time"))); 
 		uiItemL(column, "Playback Settings:", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "muted", 0, 0, 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "reversed", 0, 0, 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "muted", 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "reversed", 0);
 }
 
 
@@ -318,21 +318,21 @@ static void nla_panel_actclip(const bContext *C, Panel *pa)
 	/* Strip Properties ------------------------------------- */
 	/* action pointer */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, ICON_ACTION, &strip_ptr, "action", 0, 0, 0);
+		uiItemR(row, NULL, ICON_ACTION, &strip_ptr, "action", 0);
 		
 	/* action extents */
 	// XXX custom names were used here (to avoid the prefixes)... probably not necessary in future?
 	column= uiLayoutColumn(layout, 1);
 		uiItemL(column, "Action Extents:", 0);
-		uiItemR(column, "Start Frame", 0, &strip_ptr, "action_start_frame", 0, 0, 0);
-		uiItemR(column, "End Frame", 0, &strip_ptr, "action_end_frame", 0, 0, 0);
+		uiItemR(column, "Start Frame", 0, &strip_ptr, "action_start_frame", 0);
+		uiItemR(column, "End Frame", 0, &strip_ptr, "action_end_frame", 0);
 		
 	/* action usage */
 	column= uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_time")==0); 
 		uiItemL(column, "Playback Settings:", 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "scale", 0, 0, 0);
-		uiItemR(column, NULL, 0, &strip_ptr, "repeat", 0, 0, 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "scale", 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "repeat", 0);
 }
 
 /* evaluation settings for active NLA-Strip */
@@ -351,19 +351,19 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa)
 	uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL);
 		
 	column= uiLayoutColumn(layout, 1);
-		uiItemR(column, NULL, 0, &strip_ptr, "animated_influence", 0, 0, 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "animated_influence", 0);
 		
 		subcolumn= uiLayoutColumn(column, 1);
 		uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "animated_influence"));	
-			uiItemR(subcolumn, NULL, 0, &strip_ptr, "influence", 0, 0, 0);
+			uiItemR(subcolumn, NULL, 0, &strip_ptr, "influence", 0);
 		
 	
 	column= uiLayoutColumn(layout, 1);
-		uiItemR(column, NULL, 0, &strip_ptr, "animated_time", 0, 0, 0);
+		uiItemR(column, NULL, 0, &strip_ptr, "animated_time", 0);
 		
 		subcolumn= uiLayoutColumn(column, 1);
 		uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "animated_time"));
-			uiItemR(subcolumn, NULL, 0, &strip_ptr, "strip_time", 0, 0, 0);
+			uiItemR(subcolumn, NULL, 0, &strip_ptr, "strip_time", 0);
 }
 
 /* F-Modifiers for active NLA-Strip */
diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c
index e507efb0a30..0d3bf2cb6b1 100644
--- a/source/blender/editors/space_nla/nla_header.c
+++ b/source/blender/editors/space_nla/nla_header.c
@@ -94,14 +94,14 @@ static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	
 	uiItemS(layout);
 	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
 	
 	if (snla->flag & SNLA_DRAWTIME)
 		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
 	else
 		uiItemO(layout, "Show Seconds", 0, "ANIM_OT_time_toggle");
 	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_strip_curves", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_strip_curves", 0);
 	
 	uiItemS(layout);
 	
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 3487efc4218..9fa1b222868 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -949,65 +949,6 @@ void uiTemplate_view3d_select_metaballmenu(uiLayout *layout, bContext *C)
 	view3d_select_metaballmenu(C, layout, arg_unused);
 }
 
-static void view3d_select_armaturemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	PointerRNA ptr;
-
-	/* this part of the menu has been moved to python */
-	/*uiItemO(layout, NULL, 0, "VIEW3D_OT_select_border");
-
-	uiItemS(layout);
-
-	uiItemO(layout, "Select/Deselect All", 0, "ARMATURE_OT_select_all_toggle");
-	uiItemO(layout, "Inverse", 0, "ARMATURE_OT_select_inverse");
-
-	uiItemS(layout);
-
-	uiItemEnumO(layout, "Parent", 0, "ARMATURE_OT_select_hierarchy", "direction", BONE_SELECT_PARENT);
-	uiItemEnumO(layout, "Child", 0, "ARMATURE_OT_select_hierarchy", "direction", BONE_SELECT_CHILD);
-
-	uiItemS(layout);*/
-
-	WM_operator_properties_create(&ptr, "ARMATURE_OT_select_hierarchy");
-	RNA_boolean_set(&ptr, "extend", 1);
-	RNA_enum_set(&ptr, "direction", BONE_SELECT_PARENT);
-	uiItemFullO(layout, "Extend Parent", 0, "ARMATURE_OT_select_hierarchy", ptr.data, WM_OP_EXEC_REGION_WIN);
-
-	WM_operator_properties_create(&ptr, "ARMATURE_OT_select_hierarchy");
-	RNA_boolean_set(&ptr, "extend", 1);
-	RNA_enum_set(&ptr, "direction", BONE_SELECT_CHILD);
-	uiItemFullO(layout, "Extend Child", 0, "ARMATURE_OT_select_hierarchy", ptr.data, WM_OP_EXEC_REGION_WIN);
-}
-
-/* wrapper for python layouts */
-void uiTemplate_view3d_select_armaturemenu(uiLayout *layout, bContext *C)
-{
-	void *arg_unused = NULL;
-	view3d_select_armaturemenu(C, layout, arg_unused);
-}
-
-static void view3d_select_posemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	PointerRNA ptr;
-
-	WM_operator_properties_create(&ptr, "POSE_OT_select_hierarchy");
-	RNA_boolean_set(&ptr, "extend", 1);
-	RNA_enum_set(&ptr, "direction", BONE_SELECT_PARENT);
-	uiItemFullO(layout, "Extend Parent", 0, "POSE_OT_select_hierarchy", ptr.data, WM_OP_EXEC_REGION_WIN);
-
-	WM_operator_properties_create(&ptr, "POSE_OT_select_hierarchy");
-	RNA_boolean_set(&ptr, "extend", 1);
-	RNA_enum_set(&ptr, "direction", BONE_SELECT_CHILD);
-	uiItemFullO(layout, "Extend Child", 0, "POSE_OT_select_hierarchy", ptr.data, WM_OP_EXEC_REGION_WIN);
-}
-
-/* wrapper for python layouts */
-void uiTemplate_view3d_select_posemenu(uiLayout *layout, bContext *C)
-{
-	void *arg_unused = NULL;
-	view3d_select_posemenu(C, layout, arg_unused);
-}
-
 void do_view3d_select_faceselmenu(bContext *C, void *arg, int event)
 {
 #if 0
@@ -2120,8 +2061,8 @@ static void view3d_edit_meshmenu(bContext *C, uiLayout *layout, void *arg_unused
 
 	uiItemS(layout);
 
-	uiItemR(layout, NULL, 0, &tsptr, "automerge_editing", 0, 0, 0);
-	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0, 0, 0); // |O
+	uiItemR(layout, NULL, 0, &tsptr, "automerge_editing", 0);
+	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0); // |O
 	uiItemMenuEnumR(layout, NULL, 0, &tsptr, "proportional_editing_falloff"); // |Shift O
 
 	uiItemS(layout);
@@ -2204,7 +2145,7 @@ static void view3d_edit_curvemenu(bContext *C, uiLayout *layout, void *arg_unuse
 
 	uiItemS(layout);
 
-	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0, 0, 0); // |O
+	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0); // |O
 	uiItemMenuEnumR(layout, NULL, 0, &tsptr, "proportional_editing_falloff"); // |Shift O
 
 	uiItemS(layout);
@@ -2245,7 +2186,7 @@ static void view3d_edit_latticemenu(bContext *C, uiLayout *layout, void *arg_unu
 
 	uiItemS(layout);
 
-	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0, 0, 0); // |O
+	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0); // |O
 	uiItemMenuEnumR(layout, NULL, 0, &tsptr, "proportional_editing_falloff"); // |Shift O
 }
 #endif
diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c
index 32378a915bd..c87dd0b7948 100644
--- a/source/blender/editors/space_view3d/view3d_toolbar.c
+++ b/source/blender/editors/space_view3d/view3d_toolbar.c
@@ -270,7 +270,7 @@ static void view3d_panel_tool_shelf(const bContext *C, Panel *pa)
 		for(ct= st->toolshelf.first; ct; ct= ct->next) {
 			if(0==strncmp(context, ct->context, OP_MAX_TYPENAME)) {
 				col= uiLayoutColumn(pa->layout, 1);
-				uiItemFullO(col, NULL, 0, ct->opname, NULL, WM_OP_INVOKE_REGION_WIN);
+				uiItemFullO(col, NULL, 0, ct->opname, NULL, WM_OP_INVOKE_REGION_WIN, 0);
 			}
 		}
 	}
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 05eac06de7f..83178f32d5f 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1198,7 +1198,13 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 
 	dparm= dfunc->cont.properties.first;
 	for(; dparm; dparm= dparm->next) {
-		ptrstr= (dparm->prop->type == PROP_POINTER || dparm->prop->arraylength > 0)? "*" : "";
+		if(dparm->prop->arraylength > 0)
+			ptrstr= "*";
+		else if(dparm->prop==func->ret)
+			ptrstr= ((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR))? "*": "";
+		else
+			ptrstr= (dparm->prop->type == PROP_POINTER)? "*": "";
+			 
 		fprintf(f, "\t%s%s %s%s;\n", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), ptrstr, dparm->prop->identifier);
 	}
 
@@ -1274,7 +1280,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 
 		if(func->ret) {
 			dparm= rna_find_parameter_def(func->ret);
-			ptrstr= dparm->prop->type == PROP_POINTER || dparm->prop->arraylength > 0 ? "*" : "";
+			ptrstr= (((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR)) || (dparm->prop->arraylength > 0))? "*": "";
 			fprintf(f, "\t*((%s%s%s*)_retdata)= %s;\n", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), ptrstr, func->ret->identifier);
 		}
 	}
@@ -1516,7 +1522,7 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
 		if(dparm->prop==func->ret) {
 			if(dparm->prop->arraylength)
 				fprintf(f, "XXX no array return types yet"); /* XXX not supported */
-			else if(dparm->prop->type == PROP_POINTER)
+			else if(dparm->prop->type == PROP_POINTER && !(dparm->prop->flag & PROP_RNAPTR))
 				fprintf(f, "%s%s *", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop));
 			else
 				fprintf(f, "%s%s ", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop));
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 82694098e69..587ff57a0b5 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -37,6 +37,23 @@
 
 #ifdef RNA_RUNTIME
 
+static void rna_uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *propname, int expand, int slider, int toggle)
+{
+	int flag= 0;
+
+	flag |= (slider)? UI_ITEM_R_SLIDER: 0;
+	flag |= (expand)? UI_ITEM_R_EXPAND: 0;
+	flag |= (toggle)? UI_ITEM_R_TOGGLE: 0;
+
+	uiItemR(layout, name, icon, ptr, propname, flag);
+}
+
+static PointerRNA rna_uiItemO(uiLayout *layout, char *name, int icon, char *opname, int properties)
+{
+	int flag= (properties)? UI_ITEM_O_RETURN_PROPS: 0;
+	return uiItemFullO(layout, name, icon, opname, NULL, uiLayoutGetOperatorContext(layout), flag);
+}
+
 #else
 
 #define DEF_ICON(name) {name, #name, 0, #name, ""},
@@ -122,7 +139,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	RNA_def_float(func, "percentage", 0.0f, 0.0f, 1.0f, "Percentage", "Percentage of width to split at.", 0.0f, 1.0f);
 
 	/* items */
-	func= RNA_def_function(srna, "itemR", "uiItemR");
+	func= RNA_def_function(srna, "itemR", "rna_uiItemR");
 	api_ui_item_common(func);
 	api_ui_item_rna_common(func);
 	RNA_def_boolean(func, "expand", 0, "", "Expand button to show more detail.");
@@ -150,8 +167,12 @@ void RNA_api_ui_layout(StructRNA *srna)
 	parm= RNA_def_string(func, "search_property", "", 0, "", "Identifier of search collection property.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 
-	func= RNA_def_function(srna, "itemO", "uiItemO");
+	func= RNA_def_function(srna, "itemO", "rna_uiItemO");
 	api_ui_item_op_common(func);
+	parm= RNA_def_boolean(func, "properties", 0, "Properties", "Return operator properties to fill in manually.");
+	parm= RNA_def_pointer(func, "return_properties", "OperatorProperties", "", "Operator properties to fill in, return when 'properties' is set to true.");
+	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR);
+	RNA_def_function_return(func, parm);
 
 	func= RNA_def_function(srna, "item_enumO", "uiItemEnumO_string");
 	api_ui_item_op_common(func);
@@ -292,10 +313,6 @@ void RNA_api_ui_layout(StructRNA *srna)
 
 	func= RNA_def_function(srna, "view3d_select_metaballmenu", "uiTemplate_view3d_select_metaballmenu");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
-	func= RNA_def_function(srna, "view3d_select_armaturemenu", "uiTemplate_view3d_select_armaturemenu");
-	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
-	func= RNA_def_function(srna, "view3d_select_posemenu", "uiTemplate_view3d_select_posemenu");
-	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 	func= RNA_def_function(srna, "view3d_select_faceselmenu", "uiTemplate_view3d_select_faceselmenu");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 

From f2e7ca0de39ef3ff83feb05e6bae949e12a9fb7b Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 21 Aug 2009 14:33:53 +0000
Subject: [PATCH 185/577] 2.5: Load UI is now an operator property, and a user
 preference to define what the default is, just like file compression for
 saving.

---
 release/ui/space_userpref.py                     |  1 +
 source/blender/makesdna/DNA_userdef_types.h      |  1 +
 source/blender/makesrna/intern/rna_userdef.c     |  4 ++++
 .../blender/windowmanager/intern/wm_operators.c  | 16 ++++++++++++++++
 4 files changed, 22 insertions(+)

diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
index 95054efcb25..bd963c65cd0 100644
--- a/release/ui/space_userpref.py
+++ b/release/ui/space_userpref.py
@@ -359,6 +359,7 @@ class USERPREF_PT_filepaths(bpy.types.Panel):
 		sub2.itemL(text="Save & Load:")
 		sub2.itemR(paths, "use_relative_paths")
 		sub2.itemR(paths, "compress_file")
+		sub2.itemR(paths, "load_ui")
 		sub2.itemL(text="Auto Save:")
 		sub2.itemR(paths, "save_version")
 		sub2.itemR(paths, "recent_files")
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index c2314e1e3a2..100f55ffe33 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -369,6 +369,7 @@ extern UserDef U; /* from blenkernel blender.c */
 #define USER_RELPATHS			(1 << 20)
 #define USER_DRAGIMMEDIATE		(1 << 21)
 #define USER_DONT_DOSCRIPTLINKS	(1 << 22)
+#define USER_FILENOUI			(1 << 23)
 
 /* viewzom */
 #define USER_ZOOM_CONT			0
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index d1245528100..b74dc6f757b 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2199,6 +2199,10 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_FILECOMPRESS);
 	RNA_def_property_ui_text(prop, "Compress File", "Enable file compression when saving .blend files.");
 
+	prop= RNA_def_property(srna, "load_ui", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_FILENOUI);
+	RNA_def_property_ui_text(prop, "Load UI", "Load user interface setup when loading .blend files.");
+
 	prop= RNA_def_property(srna, "fonts_directory", PROP_STRING, PROP_DIRPATH);
 	RNA_def_property_string_sdna(prop, NULL, "fontdir");
 	RNA_def_property_ui_text(prop, "Fonts Directory", "The default directory to search for loading fonts.");
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index ab8dfeabe4f..87a145ceee2 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -868,10 +868,17 @@ static void untitled(char *name)
 	}
 }
 
+static void load_set_load_ui(wmOperator *op)
+{
+	if(!RNA_property_is_set(op->ptr, "load_ui"))
+		RNA_boolean_set(op->ptr, "load_ui", !(U.flag & USER_FILENOUI));
+}
 
 static int wm_open_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	RNA_string_set(op->ptr, "filename", G.sce);
+	load_set_load_ui(op);
+
 	WM_event_add_fileselect(C, op);
 
 	return OPERATOR_RUNNING_MODAL;
@@ -880,7 +887,14 @@ static int wm_open_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
 static int wm_open_mainfile_exec(bContext *C, wmOperator *op)
 {
 	char filename[FILE_MAX];
+
 	RNA_string_get(op->ptr, "filename", filename);
+	load_set_load_ui(op);
+
+	if(RNA_boolean_get(op->ptr, "load_ui"))
+		G.fileflags &= ~G_FILE_NO_UI;
+	else
+		G.fileflags |= G_FILE_NO_UI;
 	
 	// XXX wm in context is not set correctly after WM_read_file -> crash
 	// do it before for now, but is this correct with multiple windows?
@@ -901,6 +915,8 @@ static void WM_OT_open_mainfile(wmOperatorType *ot)
 	ot->poll= WM_operator_winactive;
 	
 	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE);
+
+	RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file.");
 }
 
 static int wm_recover_last_session_exec(bContext *C, wmOperator *op)

From bc41c845f355c0e4fed427bfa3ab7fc5f7e96660 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 21 Aug 2009 16:28:49 +0000
Subject: [PATCH 186/577] 2.5: Animation playback without sync option was
 slightly slower than expected time, even when it could keep up. Changed the
 WM timer logic a bit to always target the next frame time exactly,

---
 source/blender/windowmanager/WM_types.h         | 2 ++
 source/blender/windowmanager/intern/wm_window.c | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index c400b6c9b20..42ee6e926fc 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -283,6 +283,8 @@ typedef struct wmTimer {
 	double delta;			/* time since previous step in seconds */
 	
 	double ltime;			/* internal, last time timer was activated */
+	double ntime;			/* internal, next time we want to activate the timer */
+	double stime;			/* internal, when the timer started */
 	int sleep;				/* internal, put timers to sleep when needed */
 } wmTimer;
 
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index d6bde9a468c..27a1b076a28 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -26,6 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -690,12 +691,13 @@ static int wm_window_timer(const bContext *C)
 		wmTimer *wt;
 		for(wt= win->timers.first; wt; wt= wt->next) {
 			if(wt->sleep==0) {
-				if(wt->timestep < time - wt->ltime) {
+				if(time > wt->ntime) {
 					wmEvent event= *(win->eventstate);
 					
 					wt->delta= time - wt->ltime;
 					wt->duration += wt->delta;
 					wt->ltime= time;
+					wt->ntime= wt->stime + wt->timestep*ceil(wt->duration/wt->timestep);
 					
 					event.type= wt->event_type;
 					event.custom= EVT_DATA_TIMER;
@@ -790,6 +792,8 @@ wmTimer *WM_event_add_window_timer(wmWindow *win, int event_type, double timeste
 	
 	wt->event_type= event_type;
 	wt->ltime= PIL_check_seconds_timer();
+	wt->ntime= wt->ltime + timestep;
+	wt->stime= wt->ltime;
 	wt->timestep= timestep;
 	
 	BLI_addtail(&win->timers, wt);

From 5280c2884b3395376eec8c9b6f7521375b88f51c Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 21 Aug 2009 17:35:35 +0000
Subject: [PATCH 187/577] 2.5 Object mode:

* Made object mode an enum, shows better in the debugger
* Added a toggle mode to the set object mode operator
* Toggling a mode on and off goes back to the previous mode, not just object mode
* Changed the vertex mode and weight mode shortcuts to call the toggle mode operator
---
 source/blender/editors/object/object_edit.c   | 27 ++++++++++++++-----
 .../blender/editors/space_view3d/view3d_ops.c |  8 ++++--
 source/blender/makesdna/DNA_object_types.h    | 26 +++++++++---------
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 47eaf1757ac..8ac12a5e3a4 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -7092,18 +7092,31 @@ static const char *object_mode_op_string(int mode)
 static int object_mode_set_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
-	int mode = RNA_enum_get(op->ptr, "mode");
+	ObjectMode mode = RNA_enum_get(op->ptr, "mode");
+	ObjectMode restore_mode = ob->mode;
+	int toggle = RNA_boolean_get(op->ptr, "toggle");
 
 	if(!ob)
 		return OPERATOR_CANCELLED;
 
-	/* Exit off current mode */
-	if(ob->mode != OB_MODE_OBJECT)
+	/* Exit current mode if it's not the mode we're setting */
+	if(ob->mode != OB_MODE_OBJECT && ob->mode != mode)
 		WM_operator_name_call(C, object_mode_op_string(ob->mode), WM_OP_EXEC_REGION_WIN, NULL);
 
-	/* Enter new mode */
-	if(mode != OB_MODE_OBJECT)
-		WM_operator_name_call(C, object_mode_op_string(mode), WM_OP_EXEC_REGION_WIN, NULL);
+	if(mode != OB_MODE_OBJECT) {
+		/* Enter new mode */
+		if(ob->mode != mode || toggle)
+			WM_operator_name_call(C, object_mode_op_string(mode), WM_OP_EXEC_REGION_WIN, NULL);
+
+		if(toggle) {
+			if(ob->mode == mode)
+				/* For toggling, store old mode so we know what to go back to */
+				ob->restore_mode = restore_mode;
+			else if(ob->restore_mode != OB_MODE_OBJECT && ob->restore_mode != mode) {
+				WM_operator_name_call(C, object_mode_op_string(ob->restore_mode), WM_OP_EXEC_REGION_WIN, NULL);
+			}
+		}
+	}
 
 	return OPERATOR_FINISHED;
 }
@@ -7127,6 +7140,8 @@ void OBJECT_OT_mode_set(wmOperatorType *ot)
 	
 	prop= RNA_def_enum(ot->srna, "mode", object_mode_items, 0, "Mode", "");
 	RNA_def_enum_funcs(prop, object_mode_set_itemsf);
+
+	RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "");
 }
 
 
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 112847272e5..b0eabae3f5d 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -106,8 +106,12 @@ void view3d_keymap(wmWindowManager *wm)
 	ListBase *keymap= WM_keymap_listbase(wm, "View3D Generic", SPACE_VIEW3D, 0);
 	wmKeymapItem *km;
 	
-	WM_keymap_add_item(keymap, "PAINT_OT_vertex_paint_toggle", VKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "PAINT_OT_weight_paint_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
+	km = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", VKEY, KM_PRESS, 0, 0);
+	RNA_enum_set(km->ptr, "mode", OB_MODE_VERTEX_PAINT);
+	RNA_boolean_set(km->ptr, "toggle", 1);
+	km = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
+	RNA_enum_set(km->ptr, "mode", OB_MODE_WEIGHT_PAINT);
+	RNA_boolean_set(km->ptr, "toggle", 1);
 	
 	WM_keymap_add_item(keymap, "VIEW3D_OT_properties", NKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "VIEW3D_OT_toolbar", TKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 5c821b532fb..be43ae7f99d 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -116,8 +116,8 @@ typedef struct Object {
 	ListBase defbase;
 	ListBase modifiers; /* list of ModifierData structures */
 
-	/* For now just a flag for sculpt mode, eventually we make the other modes local too */
-	int mode, pad2;
+	int mode;           /* Local object mode */
+	int restore_mode;   /* Keep track of what mode to return to after toggling a mode */
 
 	/* materials */
 	struct Material **mat;	/* material slots */
@@ -234,7 +234,7 @@ typedef struct Object {
 	unsigned int state;			/* bit masks of game controllers that are active */
 	unsigned int init_state;	/* bit masks of initial state as recorded by the users */
 
-	int restore_mode;		/* Keep track of what mode to return to after edit mode exits */
+	int pad2;
 
 	ListBase gpulamp;		/* runtime, for lamps only */
 } Object;
@@ -511,16 +511,16 @@ extern Object workob;
 #define OB_LOCK_SCALE	448
 
 /* ob->mode */
-#define OB_MODE_OBJECT          0
-#define OB_MODE_EDIT            1
-#define OB_MODE_SCULPT          2
-#define OB_MODE_VERTEX_PAINT    4
-#define OB_MODE_WEIGHT_PAINT    8
-#define OB_MODE_TEXTURE_PAINT  16
-#define OB_MODE_PARTICLE_EDIT  32
-#define OB_MODE_POSE           64
-
-/* ob->softflag in DNA_object_force.h */
+typedef enum ObjectMode {
+	OB_MODE_OBJECT = 0,
+	OB_MODE_EDIT = 1,
+	OB_MODE_SCULPT = 2,
+	OB_MODE_VERTEX_PAINT = 4,
+	OB_MODE_WEIGHT_PAINT = 8,
+	OB_MODE_TEXTURE_PAINT = 16,
+	OB_MODE_PARTICLE_EDIT = 32,
+	OB_MODE_POSE = 64
+} ObjectMode;
 
 #ifdef __cplusplus
 }

From fc5df351b30445e697f27aa815d956cc3e9c58ea Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Fri, 21 Aug 2009 17:53:27 +0000
Subject: [PATCH 188/577] Material buttons tweaks

-Made Mirror and Transparency panels more consistent.
-Improved greying out, and better communicated the fact that alpha settings do work even if Ztransp/Ray Transp are not enabled. The results of low alpha and no Ztransp/Ray Transp look weird though - is this supposed to be supported?
-Added Flare panel for halo.
-Improved SSS panel.
---
 release/ui/buttons_material.py | 114 ++++++++++++++++++++++-----------
 1 file changed, 77 insertions(+), 37 deletions(-)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index ed3888ee4d8..73d28d6964c 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -87,10 +87,12 @@ class MATERIAL_PT_shading(MaterialButtonsPanel):
 				split = layout.split()
 	
 				col = split.column()
-				col.active = not mat.shadeless
-				col.itemR(mat, "ambient")
-				col.itemR(mat, "emit")
-				col.itemR(mat, "translucency")
+				sub = col.column()
+				sub.active = not mat.shadeless
+				sub.itemR(mat, "emit")
+				sub.itemR(mat, "ambient")
+				sub = col.column()
+				sub.itemR(mat, "translucency")
 				
 				col = split.column()
 				col.itemR(mat, "shadeless")	
@@ -119,7 +121,7 @@ class MATERIAL_PT_strand(MaterialButtonsPanel):
 		
 		split = layout.split()
 		
-		col = split.column()
+		col = split.column(align=True)
 		col.itemL(text="Size:")
 		col.itemR(tan, "start_size", text="Root")
 		col.itemR(tan, "end_size", text="Tip")
@@ -128,11 +130,13 @@ class MATERIAL_PT_strand(MaterialButtonsPanel):
 		sub = col.column()
 		sub.active = (not mat.shadeless)
 		sub.itemR(tan, "tangent_shading")
+		col.itemR(tan, "shape")
 		
 		col = split.column()
-		col.itemR(tan, "shape")
+		col.itemL(text="Shading:")
 		col.itemR(tan, "width_fade")
 		col.itemR(tan, "uv_layer")
+		col.itemS()
 		sub = col.column()
 		sub.active = (not mat.shadeless)
 		sub.itemR(tan, "surface_diffuse")
@@ -343,7 +347,9 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
 	def draw_header(self, context):
 		layout = self.layout
 		sss = context.material.subsurface_scattering
-
+		mat = context.material
+		
+		layout.active = (not mat.shadeless)
 		layout.itemR(sss, "enabled", text="")
 	
 	def draw(self, context):
@@ -357,21 +363,22 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
 		split = layout.split()
 		split.active = (not mat.shadeless)
 		
-		col = split.column(align=True)
+		col = split.column()
+		col.itemR(sss, "ior")
+		col.itemR(sss, "scale")
 		col.itemR(sss, "color", text="")
-		col.itemL(text="Blend:")
-		col.itemR(sss, "color_factor", text="Color")
-		col.itemR(sss, "texture_factor", text="Texture")
-		col.itemL(text="Scattering Weight:")
-		col.itemR(sss, "front")
-		col.itemR(sss, "back")
+		col.itemR(sss, "radius", text="RGB Radius")
 		
 		col = split.column()
 		sub = col.column(align=True)
-		sub.itemR(sss, "ior")
-		sub.itemR(sss, "scale")
-		col.itemR(sss, "radius", text="RGB Radius")
-		col.itemR(sss, "error_tolerance")
+		sub.itemL(text="Blend:")
+		sub.itemR(sss, "color_factor", text="Color")
+		sub.itemR(sss, "texture_factor", text="Texture")
+		sub.itemL(text="Scattering Weight:")
+		sub.itemR(sss, "front")
+		sub.itemR(sss, "back")
+		col.itemS()
+		col.itemR(sss, "error_tolerance", text="Error")
 
 class MATERIAL_PT_mirror(MaterialButtonsPanel):
 	__label__ = "Mirror"
@@ -402,20 +409,26 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		col = split.column()
 		col.itemR(raym, "reflect", text="Reflectivity")
 		col.itemR(mat, "mirror_color", text="")
-		col.itemL(text="Fresnel:")
-		col.itemR(raym, "fresnel", text="Amount")
+		
+		
+		col = split.column()
+		col.itemR(raym, "fresnel")
 		sub = col.column()
 		sub.active = raym.fresnel > 0
 		sub.itemR(raym, "fresnel_factor", text="Blend")
+		
+		split = layout.split()
+		
+		col = split.column()
 		col.itemS()
+		col.itemR(raym, "distance", text="Max Dist")
+		col.itemR(raym, "depth")
 		col.itemS()
 		sub = col.split(percentage=0.4)
 		sub.itemL(text="Fade To:")
 		sub.itemR(raym, "fade_to", text="")
 		
 		col = split.column()
-		col.itemR(raym, "depth")
-		col.itemR(raym, "distance", text="Max Dist")
 		col.itemL(text="Gloss:")
 		col.itemR(raym, "gloss", text="Amount")
 		sub = col.column()
@@ -453,25 +466,24 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 		split = layout.split()
 		
 		col = split.column()
-		col.itemL(text="Transparency:")
 		row = col.row()
 		row.itemR(mat, "alpha")
-		row.active = mat.transparency
 		row = col.row()
-		row.itemR(mat, "specular_alpha", text="Specular")
 		row.active = mat.transparency and (not mat.shadeless)
+		row.itemR(mat, "specular_alpha", text="Specular")
+		
 		
 		col = split.column()
-		col.active = mat.transparency and (not mat.shadeless)
-		col.itemL(text="Fresnel:")
-		col.itemR(rayt, "fresnel", text="Amount")
+		col.active = (not mat.shadeless)
+		col.itemR(rayt, "fresnel")
 		sub = col.column()
 		sub.active = rayt.fresnel > 0
 		sub.itemR(rayt, "fresnel_factor", text="Blend")
 
 		if mat.transparency_method == 'RAYTRACE':
+			layout.itemS()
 			split = layout.split()
-			split.active = mat.transparency and (not mat.shadeless)
+			split.active = mat.transparency
 
 			col = split.column()
 			col.itemR(rayt, "ior")
@@ -522,23 +534,50 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
 		sub.active = halo.ring
 		sub.itemR(halo, "rings")
 		sub.itemR(mat, "mirror_color", text="")
+		col.itemS()
 		col.itemR(halo, "lines")
 		sub = col.column()
 		sub.active = halo.lines
 		sub.itemR(halo, "line_number", text="Lines")
 		sub.itemR(mat, "specular_color", text="")
+		col.itemS()
 		col.itemR(halo, "star")
 		sub = col.column()
 		sub.active = halo.star
 		sub.itemR(halo, "star_tips")
-		col.itemR(halo, "flare_mode")
-		sub = col.column()
-		sub.active = halo.flare_mode
-		sub.itemR(halo, "flare_size", text="Size")
-		sub.itemR(halo, "flare_subsize", text="Subsize")
-		sub.itemR(halo, "flare_boost", text="Boost")
-		sub.itemR(halo, "flare_seed", text="Seed")
-		sub.itemR(halo, "flares_sub", text="Sub")
+		
+class MATERIAL_PT_flare(MaterialButtonsPanel):
+	__label__= "Flare"
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+	
+	def poll(self, context):
+		mat = context.material
+		return mat and (mat.type == 'HALO') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+	
+	def draw_header(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		halo = mat.halo
+		layout.itemR(halo, "flare_mode", text="")
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		halo = mat.halo
+
+		layout.active = halo.flare_mode
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemR(halo, "flare_size", text="Size")
+		col.itemR(halo, "flare_boost", text="Boost")
+		col.itemR(halo, "flare_seed", text="Seed")
+		col = split.column()
+		col.itemR(halo, "flares_sub", text="Subflares")
+		col.itemR(halo, "flare_subsize", text="Subsize")
 
 bpy.types.register(MATERIAL_PT_context_material)
 bpy.types.register(MATERIAL_PT_preview)
@@ -549,6 +588,7 @@ bpy.types.register(MATERIAL_PT_transp)
 bpy.types.register(MATERIAL_PT_mirror)
 bpy.types.register(MATERIAL_PT_sss)
 bpy.types.register(MATERIAL_PT_halo)
+bpy.types.register(MATERIAL_PT_flare)
 bpy.types.register(MATERIAL_PT_physics)
 bpy.types.register(MATERIAL_PT_strand)
 bpy.types.register(MATERIAL_PT_options)

From b6548c21c209516f9ec60e3a403274f20566680d Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 21 Aug 2009 18:15:50 +0000
Subject: [PATCH 189/577] 2.5/Multires:

* Fixed multires subdivision of a sculpted object. Accidentally broke this when I fixed removing a multires modifier.
---
 source/blender/blenkernel/BKE_multires.h         |  3 ++-
 source/blender/blenkernel/intern/cdderivedmesh.c | 15 +++++++++------
 source/blender/blenkernel/intern/modifier.c      |  2 +-
 source/blender/blenkernel/intern/multires.c      |  9 +++++----
 source/blender/blenloader/intern/readfile.c      |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index e7c7d92c955..a331479cad1 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -36,6 +36,7 @@ struct Object;
 typedef struct MultiresSubsurf {
 	struct MultiresModifierData *mmd;
 	struct Object *ob;
+	int local_mmd;
 } MultiresSubsurf;
 
 /* MultiresDM */
@@ -59,7 +60,7 @@ void multires_mark_as_modified(struct Object *ob);
 
 void multires_force_update(struct Object *ob);
 
-struct DerivedMesh *multires_dm_create_from_derived(struct MultiresModifierData*, struct DerivedMesh*,
+struct DerivedMesh *multires_dm_create_from_derived(struct MultiresModifierData*, int local_mmd, struct DerivedMesh*,
 						    struct Object *, int, int);
 
 struct MultiresModifierData *find_multires_modifier(struct Object *ob);
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 4829be21ed8..b20da0962a7 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1288,6 +1288,7 @@ typedef struct MultiresDM {
 	CDDerivedMesh cddm;
 
 	MultiresModifierData *mmd;
+	int local_mmd;
 
 	int lvl, totlvl;
 	float (*orco)[3];
@@ -1308,13 +1309,14 @@ static void MultiresDM_release(DerivedMesh *dm)
 	MultiresDM *mrdm = (MultiresDM*)dm;
 	int mvert_layer;
 
-	/* Check that mmd still exists */
-	if(BLI_findindex(&mrdm->ob->modifiers, mrdm->mmd) < 0)
-		mrdm->mmd = NULL;
-
 	/* Before freeing, need to update the displacement map */
-	if(dm->needsFree && mrdm->modified && mrdm->mmd)
-		mrdm->update(dm);
+	if(dm->needsFree && mrdm->modified) {
+		/* Check that mmd still exists */
+		if(!mrdm->local_mmd && BLI_findindex(&mrdm->ob->modifiers, mrdm->mmd) < 0)
+			mrdm->mmd = NULL;
+		if(mrdm->mmd)
+			mrdm->update(dm);
+	}
 
 	/* If the MVert data is being used as the sculpt undo store, don't free it */
 	mvert_layer = CustomData_get_layer_index(&dm->vertData, CD_MVERT);
@@ -1353,6 +1355,7 @@ DerivedMesh *MultiresDM_new(MultiresSubsurf *ms, DerivedMesh *orig, int numVerts
 
 	mrdm->mmd = ms->mmd;
 	mrdm->ob = ms->ob;
+	mrdm->local_mmd = ms->local_mmd;
 
 	if(dm) {
 		MDisps *disps;
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 501638aba0d..6da2c94fab8 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -8121,7 +8121,7 @@ static DerivedMesh *multiresModifier_applyModifier(ModifierData *md, Object *ob,
 	if(mmd->lvl == 1)
 		return dm;
 
-	final = multires_dm_create_from_derived(mmd, dm, ob, useRenderParams, isFinalCalc);
+	final = multires_dm_create_from_derived(mmd, 0, dm, ob, useRenderParams, isFinalCalc);
 	if(mmd->undo_signal && mmd->undo_verts && mmd->undo_verts_tot == final->getNumVerts(final)) {
 		int i;
 		MVert *dst = CDDM_get_verts(final);
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 09a6c27a88c..0f3ab5be16e 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -223,7 +223,7 @@ static void multires_subdisp(DerivedMesh *orig, Object *ob, DerivedMesh *final,
 
 	memset(&mmd_sub, 0, sizeof(MultiresModifierData));
 	mmd_sub.lvl = mmd_sub.totlvl = totlvl;
-	mrdm = multires_dm_create_from_derived(&mmd_sub, orig, ob, 0, 0);
+	mrdm = multires_dm_create_from_derived(&mmd_sub, 1, orig, ob, 0, 0);
 		
 	mvd = CDDM_get_verts(mrdm);
 	/* Need to map from ccg to mrdm */
@@ -469,7 +469,7 @@ void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int dista
 		orig = CDDM_from_mesh(me, NULL);
 		memset(&mmd_sub, 0, sizeof(MultiresModifierData));
 		mmd_sub.lvl = mmd_sub.totlvl = mmd->lvl;
-		mrdm = multires_dm_create_from_derived(&mmd_sub, orig, ob, 0, 0);
+		mrdm = multires_dm_create_from_derived(&mmd_sub, 1, orig, ob, 0, 0);
 		totsubvert = mrdm->getNumVerts(mrdm);
 		totsubedge = mrdm->getNumEdges(mrdm);
 		totsubface = mrdm->getNumFaces(mrdm);
@@ -1192,7 +1192,7 @@ static void multiresModifier_update(DerivedMesh *dm)
 			   (includes older displacements but not new sculpts) */
 			mmd.totlvl = totlvl;
 			mmd.lvl = lvl;
-			subco_dm = multires_dm_create_from_derived(&mmd, orig, ob, 0, 0);
+			subco_dm = multires_dm_create_from_derived(&mmd, 1, orig, ob, 0, 0);
 			cur_lvl_orig_verts = CDDM_get_verts(subco_dm);
 
 			/* Subtract the original vertex cos from the new vertex cos */
@@ -1229,7 +1229,7 @@ void multires_force_update(Object *ob)
 	}
 }
 
-struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, DerivedMesh *dm, Object *ob,
+struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, int local_mmd, DerivedMesh *dm, Object *ob,
 						    int useRenderParams, int isFinalCalc)
 {
 	SubsurfModifierData smd;
@@ -1239,6 +1239,7 @@ struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, D
 
 	ms.mmd = mmd;
 	ms.ob = ob;
+	ms.local_mmd = local_mmd;
 
 	memset(&smd, 0, sizeof(SubsurfModifierData));
 	smd.levels = smd.renderLevels = mmd->lvl - 1;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 58b439e4cb4..72aba02f723 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9416,7 +9416,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 					mmd->lvl = mmd->totlvl;
 					orig = CDDM_from_mesh(me, NULL);
-					dm = multires_dm_create_from_derived(mmd, orig, ob, 0, 0);
+					dm = multires_dm_create_from_derived(mmd, 0, orig, ob, 0, 0);
                                        
 					multires_load_old(dm, me->mr);
 

From 647fd95c7fc25170ec2f1c75137f4e6f39c66651 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 21 Aug 2009 18:35:40 +0000
Subject: [PATCH 190/577] 2.5 Multires:

* Fixed doing a simple subdivide, rather than Catmull-Clark. Note that the first subdivision will still appear to be CC rather than simple, this is a bug we just have to live with for now.
---
 source/blender/blenkernel/intern/multires.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 0f3ab5be16e..9ba5769843f 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -469,6 +469,7 @@ void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int dista
 		orig = CDDM_from_mesh(me, NULL);
 		memset(&mmd_sub, 0, sizeof(MultiresModifierData));
 		mmd_sub.lvl = mmd_sub.totlvl = mmd->lvl;
+		mmd_sub.simple = simple;
 		mrdm = multires_dm_create_from_derived(&mmd_sub, 1, orig, ob, 0, 0);
 		totsubvert = mrdm->getNumVerts(mrdm);
 		totsubedge = mrdm->getNumEdges(mrdm);

From f248b25152db25c03c9e296ed965b6925924829a Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 21 Aug 2009 19:39:28 +0000
Subject: [PATCH 191/577] Audio file loading backend libsndfile!

---
 CMake/macros.cmake                            |   6 +
 CMakeLists.txt                                |  22 ++
 intern/audaspace/CMakeLists.txt               |   8 +-
 intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp |  49 +---
 intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h   |   9 +-
 intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp  |   9 +-
 intern/audaspace/ffmpeg/AUD_FFMPEGReader.h    |  10 +-
 intern/audaspace/intern/AUD_C-API.cpp         |  14 +-
 intern/audaspace/intern/AUD_FileFactory.cpp   |  95 +++++++
 intern/audaspace/intern/AUD_FileFactory.h     |  71 ++++++
 .../audaspace/sndfile/AUD_SndFileFactory.cpp  |  67 +++++
 intern/audaspace/sndfile/AUD_SndFileFactory.h |  71 ++++++
 .../audaspace/sndfile/AUD_SndFileReader.cpp   | 233 ++++++++++++++++++
 intern/audaspace/sndfile/AUD_SndFileReader.h  | 131 ++++++++++
 14 files changed, 735 insertions(+), 60 deletions(-)
 create mode 100644 intern/audaspace/intern/AUD_FileFactory.cpp
 create mode 100644 intern/audaspace/intern/AUD_FileFactory.h
 create mode 100644 intern/audaspace/sndfile/AUD_SndFileFactory.cpp
 create mode 100644 intern/audaspace/sndfile/AUD_SndFileFactory.h
 create mode 100644 intern/audaspace/sndfile/AUD_SndFileReader.cpp
 create mode 100644 intern/audaspace/sndfile/AUD_SndFileReader.h

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 9ba33dfb158..6a337505c00 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -70,6 +70,9 @@ MACRO(SETUP_LIBDIRS)
   IF(WITH_JACK)
     LINK_DIRECTORIES(${JACK_LIBPATH})
   ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+  ENDIF(WITH_SNDFILE)
   IF(WITH_FFTW3)
     LINK_DIRECTORIES(${FFTW3_LIBPATH})
   ENDIF(WITH_FFTW3)
@@ -118,6 +121,9 @@ MACRO(SETUP_LIBLINKS
   IF(WITH_JACK)
     TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
   ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+  ENDIF(WITH_SNDFILE)
   IF(WITH_SDL)
     TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
   ENDIF(WITH_SDL)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9db25115099..749284def28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)"
 OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
@@ -109,6 +110,13 @@ IF(UNIX AND NOT APPLE)
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS
@@ -247,6 +255,13 @@ IF(WIN32)
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE ${LIBDIR}/sndfile)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   IF(CMAKE_CL_64)
     SET(PNG_LIBRARIES libpng)
   ELSE(CMAKE_CL_64)
@@ -392,6 +407,13 @@ IF(APPLE)
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   SET(PYTHON_VERSION 3.1)
 
   IF(PYTHON_VERSION MATCHES 3.1)
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 940a4b2bedc..1b48de3190b 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -53,6 +53,12 @@ IF(WITH_JACK)
   ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
-SET(SRC ${SRC} ${FFMPEGSRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC})
+IF(WITH_SNDFILE)
+  SET(INC ${INC} sndfile ${SNDFILE_INC})
+  FILE(GLOB SNDFILESRC sndfile/*.cpp)
+  ADD_DEFINITIONS(-DWITH_SNDFILE)
+ENDIF(WITH_SNDFILE)
+
+SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC})
 
 BLENDERLIB(bf_audaspace "${SRC}" "${INC}")
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
index 5f9006b0ec0..f67c819ff10 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
@@ -25,31 +25,24 @@
 
 #include "AUD_FFMPEGFactory.h"
 #include "AUD_FFMPEGReader.h"
-#include "AUD_Space.h"
-
-extern "C" {
-#include <libavformat/avformat.h>
-}
+#include "AUD_Buffer.h"
 
 AUD_FFMPEGFactory::AUD_FFMPEGFactory(const char* filename)
 {
-	if(filename != 0)
+	if(filename != NULL)
 	{
 		m_filename = new char[strlen(filename)+1]; AUD_NEW("string")
 		strcpy(m_filename, filename);
 	}
 	else
-		m_filename = 0;
-	m_buffer = 0;
-	m_size = 0;
+		m_filename = NULL;
 }
 
 AUD_FFMPEGFactory::AUD_FFMPEGFactory(unsigned char* buffer, int size)
 {
-	m_filename = 0;
-	m_buffer = (unsigned char*)av_malloc(size); AUD_NEW("buffer")
-	m_size = size;
-	memcpy(m_buffer, buffer, size);
+	m_filename = NULL;
+	m_buffer = AUD_Reference<AUD_Buffer>(new AUD_Buffer(size));
+	memcpy(m_buffer.get()->getBuffer(), buffer, size);
 }
 
 AUD_FFMPEGFactory::~AUD_FFMPEGFactory()
@@ -58,31 +51,15 @@ AUD_FFMPEGFactory::~AUD_FFMPEGFactory()
 	{
 		delete[] m_filename; AUD_DELETE("string")
 	}
-	if(m_buffer)
-	{
-		av_free(m_buffer); AUD_DELETE("buffer")
-	}
 }
 
 AUD_IReader* AUD_FFMPEGFactory::createReader()
 {
-	try
-	{
-		AUD_IReader* reader;
-		if(m_filename)
-			reader = new AUD_FFMPEGReader(m_filename);
-		else
-			reader = new AUD_FFMPEGReader(m_buffer, m_size);
-		AUD_NEW("reader")
-		return reader;
-	}
-	catch(AUD_Exception e)
-	{
-		// return 0 if ffmpeg cannot read the file
-		if(e.error == AUD_ERROR_FFMPEG)
-			return 0;
-		// but throw an exception if the file doesn't exist
-		else
-			throw;
-	}
+	AUD_IReader* reader;
+	if(m_filename)
+		reader = new AUD_FFMPEGReader(m_filename);
+	else
+		reader = new AUD_FFMPEGReader(m_buffer);
+	AUD_NEW("reader")
+	return reader;
 }
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
index 0a9fcc22c8b..22560303a73 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
@@ -27,6 +27,8 @@
 #define AUD_FFMPEGFACTORY
 
 #include "AUD_IFactory.h"
+#include "AUD_Reference.h"
+class AUD_Buffer;
 
 /**
  * This factory reads a sound file via ffmpeg.
@@ -44,12 +46,7 @@ private:
 	/**
 	 * The buffer to read from.
 	 */
-	unsigned char* m_buffer;
-
-	/**
-	 * The size of the buffer.
-	 */
-	int m_size;
+	AUD_Reference<AUD_Buffer> m_buffer;
 
 public:
 	/**
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
index b79375c2dc5..de0e47300f8 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -158,21 +158,22 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(const char* filename)
 	AUD_NEW("buffer")
 }
 
-AUD_FFMPEGReader::AUD_FFMPEGReader(unsigned char* buffer, int size)
+AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer)
 {
 	m_position = 0;
 	m_pkgbuf_left = 0;
 	m_byteiocontext = (ByteIOContext*)av_mallocz(sizeof(ByteIOContext));
 	AUD_NEW("byteiocontext")
+	m_membuffer = buffer;
 
-	if(init_put_byte(m_byteiocontext, buffer, size, 0,
+	if(init_put_byte(m_byteiocontext, buffer.get()->getBuffer(), buffer.get()->getSize(), 0,
 					 NULL, NULL, NULL, NULL) != 0)
 		AUD_THROW(AUD_ERROR_FILE);
 
 	AVProbeData probe_data;
 	probe_data.filename = "";
-	probe_data.buf = buffer;
-	probe_data.buf_size = size;
+	probe_data.buf = buffer.get()->getBuffer();
+	probe_data.buf_size = buffer.get()->getSize();
 	AVInputFormat* fmt = av_probe_input_format(&probe_data, 1);
 
 	// open stream
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
index 645f5f356f0..6e303934f36 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
@@ -27,7 +27,9 @@
 #define AUD_FFMPEGREADER
 
 #include "AUD_IReader.h"
+#include "AUD_Reference.h"
 class AUD_Buffer;
+
 struct AVCodecContext;
 extern "C" {
 #include <libavformat/avformat.h>
@@ -89,6 +91,11 @@ private:
 	 */
 	int m_stream;
 
+	/**
+	 * The memory file to read from, only saved to keep the buffer alive.
+	 */
+	AUD_Reference<AUD_Buffer> m_membuffer;
+
 	/**
 	 * Decodes a packet into the given buffer.
 	 * \param packet The AVPacket to decode.
@@ -109,11 +116,10 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param buffer The buffer to read from.
-	 * \param size The size of the buffer.
 	 * \exception AUD_Exception Thrown if the buffer specified cannot be read
 	 *                          with ffmpeg.
 	 */
-	AUD_FFMPEGReader(unsigned char* buffer, int size);
+	AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer);
 
 	/**
 	 * Destroys the reader and closes the file.
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index d2c8e94c949..9481e2139e8 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -25,6 +25,7 @@
 
 #include "AUD_NULLDevice.h"
 #include "AUD_I3DDevice.h"
+#include "AUD_FileFactory.h"
 #include "AUD_StreamBufferFactory.h"
 #include "AUD_DelayFactory.h"
 #include "AUD_LimiterFactory.h"
@@ -48,7 +49,6 @@
 #endif
 
 #ifdef WITH_FFMPEG
-#include "AUD_FFMPEGFactory.h"
 extern "C" {
 #include <libavformat/avformat.h>
 }
@@ -187,21 +187,13 @@ AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 AUD_Sound* AUD_load(const char* filename)
 {
 	assert(filename);
-#ifdef WITH_FFMPEG
-	return new AUD_FFMPEGFactory(filename);
-#else
-	return NULL;
-#endif
+	return new AUD_FileFactory(filename);
 }
 
 AUD_Sound* AUD_loadBuffer(unsigned char* buffer, int size)
 {
 	assert(buffer);
-#ifdef WITH_FFMPEG
-	return new AUD_FFMPEGFactory(buffer, size);
-#else
-	return NULL;
-#endif
+	return new AUD_FileFactory(buffer, size);
 }
 
 AUD_Sound* AUD_bufferSound(AUD_Sound* sound)
diff --git a/intern/audaspace/intern/AUD_FileFactory.cpp b/intern/audaspace/intern/AUD_FileFactory.cpp
new file mode 100644
index 00000000000..a1f81f49061
--- /dev/null
+++ b/intern/audaspace/intern/AUD_FileFactory.cpp
@@ -0,0 +1,95 @@
+/*
+ * $Id: AUD_FFMPEGFactory.cpp 22328 2009-08-09 23:23:19Z gsrb3d $
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_FileFactory.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+#ifdef WITH_FFMPEG
+#include "AUD_FFMPEGReader.h"
+#endif
+#ifdef WITH_SNDFILE
+#include "AUD_SndFileReader.h"
+#endif
+
+AUD_FileFactory::AUD_FileFactory(const char* filename)
+{
+	if(filename != NULL)
+	{
+		m_filename = new char[strlen(filename)+1]; AUD_NEW("string")
+		strcpy(m_filename, filename);
+	}
+	else
+		m_filename = NULL;
+}
+
+AUD_FileFactory::AUD_FileFactory(unsigned char* buffer, int size)
+{
+	m_filename = NULL;
+	m_buffer = AUD_Reference<AUD_Buffer>(new AUD_Buffer(size));
+	memcpy(m_buffer.get()->getBuffer(), buffer, size);
+}
+
+AUD_FileFactory::~AUD_FileFactory()
+{
+	if(m_filename)
+	{
+		delete[] m_filename; AUD_DELETE("string")
+	}
+}
+
+AUD_IReader* AUD_FileFactory::createReader()
+{
+	AUD_IReader* reader = 0;
+
+#ifdef WITH_SNDFILE
+	try
+	{
+		if(m_filename)
+			reader = new AUD_SndFileReader(m_filename);
+		else
+			reader = new AUD_SndFileReader(m_buffer);
+		AUD_NEW("reader")
+		return reader;
+	}
+	catch(AUD_Exception e) {}
+#endif
+
+#ifdef WITH_FFMPEG
+	try
+	{
+		if(m_filename)
+			reader = new AUD_FFMPEGReader(m_filename);
+		else
+			reader = new AUD_FFMPEGReader(m_buffer);
+		AUD_NEW("reader")
+		return reader;
+	}
+	catch(AUD_Exception e) {}
+#endif
+
+	return reader;
+}
diff --git a/intern/audaspace/intern/AUD_FileFactory.h b/intern/audaspace/intern/AUD_FileFactory.h
new file mode 100644
index 00000000000..8badb4429df
--- /dev/null
+++ b/intern/audaspace/intern/AUD_FileFactory.h
@@ -0,0 +1,71 @@
+/*
+ * $Id: AUD_FFMPEGFactory.h 22328 2009-08-09 23:23:19Z gsrb3d $
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_FILEFACTORY
+#define AUD_FILEFACTORY
+
+#include "AUD_IFactory.h"
+#include "AUD_Reference.h"
+class AUD_Buffer;
+
+/**
+ * This factory tries to read a sound file via all available file readers.
+ */
+class AUD_FileFactory : public AUD_IFactory
+{
+private:
+	/**
+	 * The filename of the sound source file.
+	 */
+	char* m_filename;
+
+	/**
+	 * The buffer to read from.
+	 */
+	AUD_Reference<AUD_Buffer> m_buffer;
+
+public:
+	/**
+	 * Creates a new factory.
+	 * \param filename The sound file path.
+	 */
+	AUD_FileFactory(const char* filename);
+
+	/**
+	 * Creates a new factory.
+	 * \param buffer The buffer to read from.
+	 * \param size The size of the buffer.
+	 */
+	AUD_FileFactory(unsigned char* buffer, int size);
+
+	/**
+	 * Destroys the factory.
+	 */
+	~AUD_FileFactory();
+
+	virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_FILEFACTORY
diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.cpp b/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
new file mode 100644
index 00000000000..d3c5ea8a273
--- /dev/null
+++ b/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
@@ -0,0 +1,67 @@
+/*
+ * $Id: AUD_FFMPEGFactory.cpp 22328 2009-08-09 23:23:19Z gsrb3d $
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SndFileFactory.h"
+#include "AUD_SndFileReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_SndFileFactory::AUD_SndFileFactory(const char* filename)
+{
+	if(filename != NULL)
+	{
+		m_filename = new char[strlen(filename)+1]; AUD_NEW("string")
+		strcpy(m_filename, filename);
+	}
+	else
+		m_filename = NULL;
+}
+
+AUD_SndFileFactory::AUD_SndFileFactory(unsigned char* buffer, int size)
+{
+	m_filename = NULL;
+	m_buffer = AUD_Reference<AUD_Buffer>(new AUD_Buffer(size));
+	memcpy(m_buffer.get()->getBuffer(), buffer, size);
+}
+
+AUD_SndFileFactory::~AUD_SndFileFactory()
+{
+	if(m_filename)
+	{
+		delete[] m_filename; AUD_DELETE("string")
+	}
+}
+
+AUD_IReader* AUD_SndFileFactory::createReader()
+{
+	AUD_IReader* reader;
+	if(m_filename)
+		reader = new AUD_SndFileReader(m_filename);
+	else
+		reader = new AUD_SndFileReader(m_buffer);
+	AUD_NEW("reader")
+	return reader;
+}
diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.h b/intern/audaspace/sndfile/AUD_SndFileFactory.h
new file mode 100644
index 00000000000..6e265a63abe
--- /dev/null
+++ b/intern/audaspace/sndfile/AUD_SndFileFactory.h
@@ -0,0 +1,71 @@
+/*
+ * $Id: AUD_FFMPEGFactory.h 22328 2009-08-09 23:23:19Z gsrb3d $
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SNDFILEFACTORY
+#define AUD_SNDFILEFACTORY
+
+#include "AUD_IFactory.h"
+#include "AUD_Reference.h"
+class AUD_Buffer;
+
+/**
+ * This factory reads a sound file via libsndfile.
+ */
+class AUD_SndFileFactory : public AUD_IFactory
+{
+private:
+	/**
+	 * The filename of the sound source file.
+	 */
+	char* m_filename;
+
+	/**
+	 * The buffer to read from.
+	 */
+	AUD_Reference<AUD_Buffer> m_buffer;
+
+public:
+	/**
+	 * Creates a new factory.
+	 * \param filename The sound file path.
+	 */
+	AUD_SndFileFactory(const char* filename);
+
+	/**
+	 * Creates a new factory.
+	 * \param buffer The buffer to read from.
+	 * \param size The size of the buffer.
+	 */
+	AUD_SndFileFactory(unsigned char* buffer, int size);
+
+	/**
+	 * Destroys the factory.
+	 */
+	~AUD_SndFileFactory();
+
+	virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_SNDFILEFACTORY
diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.cpp b/intern/audaspace/sndfile/AUD_SndFileReader.cpp
new file mode 100644
index 00000000000..8daef573d37
--- /dev/null
+++ b/intern/audaspace/sndfile/AUD_SndFileReader.cpp
@@ -0,0 +1,233 @@
+/*
+ * $Id: AUD_FFMPEGReader.cpp 22328 2009-08-09 23:23:19Z gsrb3d $
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SndFileReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+// This function transforms a  SampleFormat to our own sample format
+static inline AUD_SampleFormat SNDFILE_TO_AUD(int fmt)
+{
+	switch(fmt & SF_FORMAT_SUBMASK)
+	{
+	// only read s16, s32 and double as they are
+	case SF_FORMAT_PCM_16:
+		return AUD_FORMAT_S16;
+	case SF_FORMAT_PCM_32:
+		return AUD_FORMAT_S32;
+	case SF_FORMAT_DOUBLE:
+		return AUD_FORMAT_FLOAT64;
+	// read all other formats as floats
+	default:
+		return AUD_FORMAT_FLOAT32;
+	}
+}
+
+sf_count_t AUD_SndFileReader::vio_get_filelen(void *user_data)
+{
+	AUD_SndFileReader* reader = (AUD_SndFileReader*)user_data;
+	return reader->m_membuffer.get()->getSize();
+}
+
+sf_count_t AUD_SndFileReader::vio_seek(sf_count_t offset, int whence, void *user_data)
+{
+	AUD_SndFileReader* reader = (AUD_SndFileReader*)user_data;
+
+	switch(whence)
+	{
+	case SEEK_SET:
+		reader->m_memoffset = offset;
+		break;
+	case SEEK_CUR:
+		reader->m_memoffset = reader->m_memoffset + offset;
+		break;
+	case SEEK_END:
+		reader->m_memoffset = reader->m_membuffer.get()->getSize() + offset;
+		break;
+	}
+
+	return reader->m_memoffset;
+}
+
+sf_count_t AUD_SndFileReader::vio_read(void *ptr, sf_count_t count, void *user_data)
+{
+	AUD_SndFileReader* reader = (AUD_SndFileReader*)user_data;
+
+	if(reader->m_memoffset + count > reader->m_membuffer.get()->getSize())
+		count = reader->m_membuffer.get()->getSize() - reader->m_memoffset;
+
+	memcpy(ptr, reader->m_membuffer.get()->getBuffer() + reader->m_memoffset, count);
+	reader->m_memoffset += count;
+
+	return count;
+}
+
+sf_count_t AUD_SndFileReader::vio_tell(void *user_data)
+{
+	AUD_SndFileReader* reader = (AUD_SndFileReader*)user_data;
+
+	return reader->m_memoffset;
+}
+
+AUD_SndFileReader::AUD_SndFileReader(const char* filename)
+{
+	SF_INFO sfinfo;
+
+	sfinfo.format = 0;
+	m_sndfile = sf_open(filename, SFM_READ, &sfinfo);
+
+	if(!m_sndfile)
+		AUD_THROW(AUD_ERROR_FILE);
+
+	m_specs.channels = (AUD_Channels) sfinfo.channels;
+	m_specs.format = SNDFILE_TO_AUD(sfinfo.format);
+	m_specs.rate = (AUD_SampleRate) sfinfo.samplerate;
+	m_length = sfinfo.frames;
+	m_seekable = sfinfo.seekable;
+	m_position = 0;
+
+	switch(m_specs.format)
+	{
+	case AUD_FORMAT_S16:
+		m_read = (sf_read_f) sf_readf_short;
+		break;
+	case AUD_FORMAT_S32:
+		m_read = (sf_read_f) sf_readf_int;
+		break;
+	case AUD_FORMAT_FLOAT64:
+		m_read = (sf_read_f) sf_readf_double;
+		break;
+	default:
+		m_read = (sf_read_f) sf_readf_float;
+	}
+
+	m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_SndFileReader::AUD_SndFileReader(AUD_Reference<AUD_Buffer> buffer)
+{
+	m_membuffer = buffer;
+	m_memoffset = 0;
+
+	m_vio.get_filelen = vio_get_filelen;
+	m_vio.read = vio_read;
+	m_vio.seek = vio_seek;
+	m_vio.tell = vio_tell;
+	m_vio.write = NULL;
+
+	SF_INFO sfinfo;
+
+	sfinfo.format = 0;
+	m_sndfile = sf_open_virtual(&m_vio, SFM_READ, &sfinfo, this);
+
+	if(!m_sndfile)
+		AUD_THROW(AUD_ERROR_FILE);
+
+	m_specs.channels = (AUD_Channels) sfinfo.channels;
+	m_specs.format = SNDFILE_TO_AUD(sfinfo.format);
+	m_specs.rate = (AUD_SampleRate) sfinfo.samplerate;
+	m_length = sfinfo.frames;
+	m_seekable = sfinfo.seekable;
+	m_position = 0;
+
+	switch(m_specs.format)
+	{
+	case AUD_FORMAT_S16:
+		m_read = (sf_read_f) sf_readf_short;
+		break;
+	case AUD_FORMAT_S32:
+		m_read = (sf_read_f) sf_readf_int;
+		break;
+	case AUD_FORMAT_FLOAT64:
+		m_read = (sf_read_f) sf_readf_double;
+		break;
+	default:
+		m_read = (sf_read_f) sf_readf_float;
+	}
+
+	m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_SndFileReader::~AUD_SndFileReader()
+{
+	sf_close(m_sndfile);
+
+	delete m_buffer; AUD_DELETE("buffer")
+}
+
+bool AUD_SndFileReader::isSeekable()
+{
+	return m_seekable;
+}
+
+void AUD_SndFileReader::seek(int position)
+{
+	if(m_seekable)
+	{
+		position = sf_seek(m_sndfile, position, SEEK_SET);
+		m_position = position;
+	}
+}
+
+int AUD_SndFileReader::getLength()
+{
+	return m_length;
+}
+
+int AUD_SndFileReader::getPosition()
+{
+	return m_position;
+}
+
+AUD_Specs AUD_SndFileReader::getSpecs()
+{
+	return m_specs;
+}
+
+AUD_ReaderType AUD_SndFileReader::getType()
+{
+	return AUD_TYPE_STREAM;
+}
+
+bool AUD_SndFileReader::notify(AUD_Message &message)
+{
+	return false;
+}
+
+void AUD_SndFileReader::read(int & length, sample_t* & buffer)
+{
+	int sample_size = AUD_SAMPLE_SIZE(m_specs);
+
+	// resize output buffer if necessary
+	if(m_buffer->getSize() < length*sample_size)
+		m_buffer->resize(length*sample_size);
+
+	buffer = m_buffer->getBuffer();
+
+	length = m_read(m_sndfile, buffer, length);
+
+	m_position += length;
+}
diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.h b/intern/audaspace/sndfile/AUD_SndFileReader.h
new file mode 100644
index 00000000000..f55c36b47e8
--- /dev/null
+++ b/intern/audaspace/sndfile/AUD_SndFileReader.h
@@ -0,0 +1,131 @@
+/*
+ * $Id: AUD_FFMPEGReader.h 22328 2009-08-09 23:23:19Z gsrb3d $
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SNDFILEREADER
+#define AUD_SNDFILEREADER
+
+#include "AUD_IReader.h"
+#include "AUD_Reference.h"
+class AUD_Buffer;
+
+#include <sndfile.h>
+
+typedef sf_count_t (*sf_read_f)(SNDFILE *sndfile, void *ptr, sf_count_t frames);
+
+/**
+ * This class reads a sound file via libsndfile.
+ */
+class AUD_SndFileReader : public AUD_IReader
+{
+private:
+	/**
+	 * The current position in samples.
+	 */
+	int m_position;
+
+	/**
+	 * The sample count in the file.
+	 */
+	int m_length;
+
+	/**
+	 * Whether the file is seekable.
+	 */
+	bool m_seekable;
+
+	/**
+	 * The specification of the audio data.
+	 */
+	AUD_Specs m_specs;
+
+	/**
+	 * The playback buffer.
+	 */
+	AUD_Buffer* m_buffer;
+
+	/**
+	 * The sndfile.
+	 */
+	SNDFILE* m_sndfile;
+
+	/**
+	 * The reading function.
+	 */
+	sf_read_f m_read;
+
+	/**
+	 * The virtual IO structure for memory file reading.
+	 */
+	SF_VIRTUAL_IO m_vio;
+
+	/**
+	 * The pointer to the memory file.
+	 */
+	AUD_Reference<AUD_Buffer> m_membuffer;
+
+	/**
+	 * The current reading pointer of the memory file.
+	 */
+	int m_memoffset;
+
+	// Functions for libsndfile virtual IO functionality
+	static sf_count_t vio_get_filelen(void *user_data);
+	static sf_count_t vio_seek(sf_count_t offset, int whence, void *user_data);
+	static sf_count_t vio_read(void *ptr, sf_count_t count, void *user_data);
+	static sf_count_t vio_tell(void *user_data);
+
+public:
+	/**
+	 * Creates a new reader.
+	 * \param filename The path to the file to be read.
+	 * \exception AUD_Exception Thrown if the file specified does not exist or
+	 *            cannot be read with libsndfile.
+	 */
+	AUD_SndFileReader(const char* filename);
+
+	/**
+	 * Creates a new reader.
+	 * \param buffer The buffer to read from.
+	 * \exception AUD_Exception Thrown if the buffer specified cannot be read
+	 *                          with libsndfile.
+	 */
+	AUD_SndFileReader(AUD_Reference<AUD_Buffer> buffer);
+
+	/**
+	 * Destroys the reader and closes the file.
+	 */
+	virtual ~AUD_SndFileReader();
+
+	virtual bool isSeekable();
+	virtual void seek(int position);
+	virtual int getLength();
+	virtual int getPosition();
+	virtual AUD_Specs getSpecs();
+	virtual AUD_ReaderType getType();
+	virtual bool notify(AUD_Message &message);
+	virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_SNDFILEREADER

From d82935a327203e41da7913b75ab9981d61cdc927 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Fri, 21 Aug 2009 22:06:19 +0000
Subject: [PATCH 192/577] SVN maintenance.

---
 intern/audaspace/intern/AUD_FileFactory.cpp     | 2 +-
 intern/audaspace/intern/AUD_FileFactory.h       | 2 +-
 intern/audaspace/sndfile/AUD_SndFileFactory.cpp | 2 +-
 intern/audaspace/sndfile/AUD_SndFileFactory.h   | 2 +-
 intern/audaspace/sndfile/AUD_SndFileReader.cpp  | 2 +-
 intern/audaspace/sndfile/AUD_SndFileReader.h    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/intern/audaspace/intern/AUD_FileFactory.cpp b/intern/audaspace/intern/AUD_FileFactory.cpp
index a1f81f49061..b63390803b1 100644
--- a/intern/audaspace/intern/AUD_FileFactory.cpp
+++ b/intern/audaspace/intern/AUD_FileFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGFactory.cpp 22328 2009-08-09 23:23:19Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN LGPL LICENSE BLOCK *****
  *
diff --git a/intern/audaspace/intern/AUD_FileFactory.h b/intern/audaspace/intern/AUD_FileFactory.h
index 8badb4429df..6ab8f280534 100644
--- a/intern/audaspace/intern/AUD_FileFactory.h
+++ b/intern/audaspace/intern/AUD_FileFactory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGFactory.h 22328 2009-08-09 23:23:19Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN LGPL LICENSE BLOCK *****
  *
diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.cpp b/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
index d3c5ea8a273..bac6dc321f4 100644
--- a/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
+++ b/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGFactory.cpp 22328 2009-08-09 23:23:19Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN LGPL LICENSE BLOCK *****
  *
diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.h b/intern/audaspace/sndfile/AUD_SndFileFactory.h
index 6e265a63abe..98187ff1590 100644
--- a/intern/audaspace/sndfile/AUD_SndFileFactory.h
+++ b/intern/audaspace/sndfile/AUD_SndFileFactory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGFactory.h 22328 2009-08-09 23:23:19Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN LGPL LICENSE BLOCK *****
  *
diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.cpp b/intern/audaspace/sndfile/AUD_SndFileReader.cpp
index 8daef573d37..485818552bb 100644
--- a/intern/audaspace/sndfile/AUD_SndFileReader.cpp
+++ b/intern/audaspace/sndfile/AUD_SndFileReader.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGReader.cpp 22328 2009-08-09 23:23:19Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN LGPL LICENSE BLOCK *****
  *
diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.h b/intern/audaspace/sndfile/AUD_SndFileReader.h
index f55c36b47e8..da890ef53ca 100644
--- a/intern/audaspace/sndfile/AUD_SndFileReader.h
+++ b/intern/audaspace/sndfile/AUD_SndFileReader.h
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGReader.h 22328 2009-08-09 23:23:19Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN LGPL LICENSE BLOCK *****
  *

From 9202aaa2dc4b4bf70621c06bc82a5d836a4afc14 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Fri, 21 Aug 2009 22:56:26 +0000
Subject: [PATCH 193/577] Update Makefiles for audaspace.

This add support for: sdl, ffmpeg, openal, jack and sndfile.
We have new options:
	WITH_OPENAL, default false
	WITH_JACK, default false
	WITH_SNDFILE, default false

and with this:
	NAN_OPENAL, default /usr

	NAN_JACK, default /usr
	NAN_JACKCFLAGS, default -I$(NAN_JACK)/include/jack
	NAN_JACKLIBS, default $(NAN_JACK)/lib/libjack.a

	NAN_SNDFILE, default /usr
	NAN_SNDFILECFLAGS, default -I$(NAN_SNDFILE)/include
	NAN_SNDFILELIBS, default $(NAN_SNDFILE)/lib/libsndfile.

Also add two new option on source/Makefile for jack and sndfile libs,
but only for linux, so let me know for other OS.
---
 intern/audaspace/Makefile         | 50 +++++++++++++++++++++++++++++--
 intern/audaspace/OpenAL/Makefile  | 39 ++++++++++++++++++++++++
 intern/audaspace/SDL/Makefile     |  2 +-
 intern/audaspace/ffmpeg/Makefile  |  2 +-
 intern/audaspace/intern/Makefile  | 25 ++++++++++++++++
 intern/audaspace/jack/Makefile    |  4 +++
 intern/audaspace/sndfile/Makefile | 40 +++++++++++++++++++++++++
 source/Makefile                   | 36 ++++++++++++++++++----
 source/nan_definitions.mk         | 22 ++++++++++++--
 9 files changed, 207 insertions(+), 13 deletions(-)
 create mode 100644 intern/audaspace/OpenAL/Makefile
 create mode 100644 intern/audaspace/sndfile/Makefile

diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile
index 2d66dcf67fa..474f53f0e0f 100644
--- a/intern/audaspace/Makefile
+++ b/intern/audaspace/Makefile
@@ -44,19 +44,63 @@ ifeq ($(WITH_FFMPEG),true)
   DIRS += ffmpeg
 endif
 
+ifeq ($(WITH_OPENAL),true)
+  DIRS += OpenAL
+endif
+
+ifeq ($(WITH_JACK),true)
+  DIRS += jack
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+  DIRS += sndfile
+endif
+
 include nan_subdirs.mk
 
 install: $(ALL_OR_DEBUG)
 	@[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE)
 	@[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include
 	@[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_sdl.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+
+ifeq ($(WITH_FFMPEG),true)
+	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_ffmpeg.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+endif
+
+ifeq ($(WITH_OPENAL),true)
+	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_openal.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+endif
+
+ifeq ($(WITH_JACK),true)
+	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_jack.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_sndfile.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+endif
 
 ifeq ($(OS),darwin)
 	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
 	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
 	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a
+	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a
+
+ifeq ($(WITH_FFMPEG),true)
+	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a
+endif
+
+ifeq ($(WITH_OPENAL),true)
+	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a
+endif
+
+ifeq ($(WITH_JACK),true)
+	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
+endif
+
 endif
 	@../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/
-
-
diff --git a/intern/audaspace/OpenAL/Makefile b/intern/audaspace/OpenAL/Makefile
new file mode 100644
index 00000000000..4cf9f66b06c
--- /dev/null
+++ b/intern/audaspace/OpenAL/Makefile
@@ -0,0 +1,39 @@
+#
+# $Id$
+#
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = aud_openal
+DIR = $(OCGDIR)/intern/audaspace
+
+include nan_compile.mk
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CPPFLAGS += -I../intern
+CPPFLAGS += -I.
diff --git a/intern/audaspace/SDL/Makefile b/intern/audaspace/SDL/Makefile
index e36b2de41fe..02a4068f3dc 100644
--- a/intern/audaspace/SDL/Makefile
+++ b/intern/audaspace/SDL/Makefile
@@ -29,7 +29,7 @@
 #
 
 LIBNAME = aud_sdl
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+DIR = $(OCGDIR)/intern/audaspace
 
 include nan_compile.mk
 
diff --git a/intern/audaspace/ffmpeg/Makefile b/intern/audaspace/ffmpeg/Makefile
index 0bfe6494559..492ac83f532 100644
--- a/intern/audaspace/ffmpeg/Makefile
+++ b/intern/audaspace/ffmpeg/Makefile
@@ -29,7 +29,7 @@
 #
 
 LIBNAME = aud_ffmpeg
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+DIR = $(OCGDIR)/intern/audaspace
 
 include nan_compile.mk
 
diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile
index 2dcc7798f1c..a99f44c54d7 100644
--- a/intern/audaspace/intern/Makefile
+++ b/intern/audaspace/intern/Makefile
@@ -35,6 +35,31 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+ifeq ($(WITH_SDL),true)
+	CPPFLAGS += -DWITH_SDL
+	CPPFLAGS += $(NAN_SDLCFLAGS)
+endif
+
+ifeq ($(WITH_OPENAL),true)
+	CPPFLAGS += -DWITH_OPENAL
+	CPPFLAGS += -I../OpenAL
+endif
+
+ifeq ($(WITH_JACK),true)
+	CPPFLAGS += -DWITH_JACK
+	CPPFLAGS += -I$(NAN_JACKCFLAGS)
+	CPPFLAGS += -I../jack
+endif
+
+ifeq ($(WITH_FFMPEG),true)
+	CPPFLAGS += -DWITH_FFMPEG
+	CPPFLAGS += $(NAN_FFMPEGCFLAGS)
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+	CPPFLAGS += -DWITH_SNDFILE
+endif
+
 CPPFLAGS += -I$(LCGDIR)/samplerate/include/
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
diff --git a/intern/audaspace/jack/Makefile b/intern/audaspace/jack/Makefile
index a6cc9119c6d..23cadf559c0 100644
--- a/intern/audaspace/jack/Makefile
+++ b/intern/audaspace/jack/Makefile
@@ -35,6 +35,10 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+# If we are here, jack is enable.
+CPPFLAGS += -DWITH_JACK
+CPPFLAGS += $(NAN_JACKCFLAGS)
+
 CPPFLAGS += -I../intern
 CPPFLAGS += -I..
 CPPFLAGS += -I.
diff --git a/intern/audaspace/sndfile/Makefile b/intern/audaspace/sndfile/Makefile
new file mode 100644
index 00000000000..1cf0b2683fb
--- /dev/null
+++ b/intern/audaspace/sndfile/Makefile
@@ -0,0 +1,40 @@
+#
+# $Id$
+#
+# ***** 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.
+#
+# 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):
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = aud_sndfile
+DIR = $(OCGDIR)/intern/audaspace
+
+include nan_compile.mk
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CPPFLAGS += -I../intern
+CPPFLAGS += -I..
+CPPFLAGS += -I.
diff --git a/source/Makefile b/source/Makefile
index 8e9f66bbe42..93bd2e23903 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -109,11 +109,28 @@ COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a
+COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a
 COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
 COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
 COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
 COMLIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a 
 
+ifeq ($(WITH_FFMPEG),true)
+    COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a
+endif
+
+ifeq ($(WITH_OPENAL),true)
+    COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a
+endif
+
+ifeq ($(WITH_JACK),true)
+    COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+    COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
+endif
+
 ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
@@ -356,12 +373,7 @@ ifeq ($(OS),solaris)
     SPLIB += $(NAN_ZLIB)/lib/libz.a
 endif
 
-# OpenAL libs are already compiled as shared code!
-
-# Some kooky logic going on here ...
-ifeq ($(NAN_NO_OPENAL), true)
-#    NAN_SND_LIBS = 
-else
+ifeq ($(WITH_OPENAL),true)
   ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
     ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64 parisc64"))
         NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
@@ -381,6 +393,18 @@ else
   endif
 endif
 
+ifeq ($(WITH_JACK),true)
+  ifeq ($(OS),$(findstring $(OS), "linux"))
+    NAN_SND_LIBS += $(NAN_JACKLIBS)
+  endif
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+  ifeq ($(OS),$(findstring $(OS), "linux"))
+    NAN_SND_LIBS += $(NAN_SNDFILELIBS)
+  endif
+endif
+
 ifeq ($(OS),windows)
 
     # Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 7fab61d5247..50a606496f5 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -117,6 +117,25 @@ ifndef CONFIG_GUESS
     export WITH_LZMA ?= true
     export NAN_LZO ?= $(LCGDIR)/lzo
     export NAN_LZMA ?= $(LCGDIR)/lzma
+    export WITH_OPENAL ?= false
+    export WITH_JACK ?= false
+    export WITH_SNDFILE ?= false
+
+  ifeq ($(WITH_OPENAL), true)
+    export NAN_OPENAL ?= /usr
+  endif
+
+  ifeq ($(WITH_JACK), true)
+    export NAN_JACK ?= /usr
+    export NAN_JACKCFLAGS ?= -I$(NAN_JACK)/include/jack
+    export NAN_JACKLIBS ?= $(NAN_JACK)/lib/libjack.a
+  endif
+
+  ifeq ($(WITH_SNDFILE),true)
+    export NAN_SNDFILE ?= /usr
+    export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
+    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a
+  endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
     export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)
@@ -175,7 +194,7 @@ ifndef CONFIG_GUESS
     export NAN_NO_KETSJI=false
 
     ifeq ($(CPU), i386)
-      export NAN_NO_OPENAL=true
+      export WITH_OPENAL=false
     endif
 
     # Location of MOZILLA/Netscape header files...
@@ -535,5 +554,4 @@ endif # CONFIG_GUESS
 # Don't want to build the gameengine?
 ifeq ($(NAN_NO_KETSJI), true)
    export NAN_JUST_BLENDERDYNAMIC=true
-   export NAN_NO_OPENAL=true
 endif

From 2355130c3a6c698eaccf279d2b626809e95a48d6 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sat, 22 Aug 2009 00:19:24 +0000
Subject: [PATCH 194/577] Added standard hotkeys for standard features like
 copying, cutting, pasting, saving, loading.

Saving/Loading:
Save - Ctrl S / Cmd S
Save As - Ctrl+Shift S / Cmd+Shift S
Open - Ctrl O / Cmd O
Open Recent - Ctrl+Shift O / Cmd+Shift O
New File - Ctrl N / Cmd N

Text:
Copy- Ctrl+C / Cmd+C
Cut- Ctrl+C / Cmd+C
Paste- Ctrl+V / Cmd+V
Select text- Ctrl+A / Cmd+A

Misc:
Repeat Last Op - Ctrl+R / Cmd+R
Render - Ctrl+Return / Cmd+Return
Render Animation- Shift+Ctrl+Return / Shift+Cmd+Return
User Preferences - Ctrl+Comma / Cmd+Comma
Changed the important search menu to Space key.

Old hotkeys are still preserved, at least for now.
---
 source/blender/editors/curve/curve_ops.c      |  5 +++-
 source/blender/editors/screen/screen_ops.c    | 14 +++++++++--
 .../blender/editors/space_text/space_text.c   |  8 +++++++
 .../windowmanager/intern/wm_operators.c       | 24 +++++++++++++------
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index 6006c7e656b..d3bcdcb69bb 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -202,8 +202,11 @@ void ED_keymap_curve(wmWindowManager *wm)
 	RNA_int_set(WM_keymap_add_item(keymap, "FONT_OT_change_character", DOWNARROWKEY, KM_PRESS, KM_ALT, 0)->ptr, "delta", -1);
 
 	WM_keymap_add_item(keymap, "FONT_OT_text_copy", CKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "FONT_OT_text_copy", CKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_cut", XKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "FONT_OT_text_paste", PKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "FONT_OT_text_cut", XKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "FONT_OT_text_paste", VKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "FONT_OT_text_paste", VKEY, KM_PRESS, KM_OSKEY, 0);
 
 	WM_keymap_add_item(keymap, "FONT_OT_line_break", RETKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_insert", KM_TEXTINPUT, KM_ANY, KM_ANY, 0); // last!
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index fab4de50568..380390cf543 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3298,6 +3298,7 @@ void ED_keymap_screen(wmWindowManager *wm)
 	/* Screen General ------------------------------------------------ */
 	keymap= WM_keymap_listbase(wm, "Screen", 0, 0);
 	
+	
 	/* standard timers */
 	WM_keymap_add_item(keymap, "SCREEN_OT_animation_step", TIMER0, KM_ANY, KM_ANY, 0);
 	
@@ -3326,7 +3327,9 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_foursplit", SKEY, KM_PRESS, KM_CTRL|KM_ALT|KM_SHIFT, 0);
 	
 	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_last", F4KEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", F4KEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);
 	
@@ -3345,11 +3348,17 @@ void ED_keymap_screen(wmWindowManager *wm)
 						  
 	/* render */
 	WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY, 0);
 	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, KM_CTRL, 0)->ptr, "animation", 1);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "animation", 1);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY|KM_SHIFT, 0)->ptr, "animation", 1);
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY, KM_PRESS, 0, 0);
 	
 	/* user prefs */
+	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", UKEY, KM_PRESS, KM_ALT, 0);
 	
 	/* Anim Playback ------------------------------------------------ */
@@ -3362,7 +3371,8 @@ void ED_keymap_screen(wmWindowManager *wm)
 	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
 	
 	WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", DOWNARROWKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", UPARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", 1);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", 1);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", 0);
 	
 	WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", PAGEUPKEY, KM_PRESS, KM_CTRL, 0);
 	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", PAGEDOWNKEY, KM_PRESS, KM_CTRL, 0)->ptr, "next", 0);
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index a9c0d3ff76b..4394fbfe1f5 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -210,21 +210,28 @@ static void text_keymap(struct wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "TEXT_OT_open", OKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_reload", RKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_save", SKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_save", SKEY, KM_PRESS, KM_ALT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_save_as", SKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_save_as", SKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_OSKEY, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_run_script", PKEY, KM_PRESS, KM_ALT, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY, 0);
 
 	if(U.uiflag & USER_MMB_PASTE) // XXX not dynamic
 		RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_paste", MIDDLEMOUSE, KM_PRESS, 0, 0)->ptr, "selection", 1);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_jump", JKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_ALT, 0);
@@ -233,6 +240,7 @@ static void text_keymap(struct wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "TEXT_OT_to_3d_object", MKEY, KM_PRESS, KM_ALT, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_OSKEY, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_indent", TABKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_unindent", TABKEY, KM_PRESS, KM_SHIFT, 0);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 87a145ceee2..22c7b6ae277 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1908,19 +1908,29 @@ void wm_window_keymap(wmWindowManager *wm)
 	
 	/* note, this doesn't replace existing keymap items */
 	WM_keymap_verify_item(keymap, "WM_OT_window_duplicate", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_read_homefile", XKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_open_mainfile", F1KEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_save_as_mainfile", F2KEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", XKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", F1KEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", F2KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
 
 	/* debug/testing */
 	WM_keymap_verify_item(keymap, "WM_OT_ten_timer", TKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_debug_menu", DKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_search_menu", SPACEKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "WM_OT_search_menu", SPACEKEY, KM_PRESS, 0, 0);
 	
 }
 

From 095ec3a6e9357e6ce14fd200396ea221ac88e3b6 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Sat, 22 Aug 2009 01:01:53 +0000
Subject: [PATCH 195/577] 2.5/Multires:

* Disabled multires subdivide button in editmode (again)

SVN weirdness:
I already did this in r22447. Somehow it got changed back -- but I can't find any log of it getting reverted, either in my email or on p.b.o. This is extremely weird!
---
 source/blender/editors/object/object_modifier.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 3785e17f67c..1b20f90360a 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -699,7 +699,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
 
 static int multires_subdivide_poll(bContext *C)
 {
-	return (CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier).data != NULL);
+	return (CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier).data != NULL) &&
+		CTX_data_edit_object(C) == NULL;
 }
 
 void OBJECT_OT_multires_subdivide(wmOperatorType *ot)

From 0be1e72dca48a6709c2ae8b3805387d4ef5bcdcb Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Sat, 22 Aug 2009 02:27:37 +0000
Subject: [PATCH 196/577] 2.5/Vertex paint:

* Added operator for filling vertex colors with the brush color
* Pythonized the vertex paint menu
---
 release/ui/space_view3d.py                    | 28 ++++++--
 .../editors/sculpt_paint/paint_intern.h       |  3 +
 .../blender/editors/sculpt_paint/paint_ops.c  | 27 +++++++
 .../editors/sculpt_paint/paint_vertex.c       | 42 +++--------
 .../editors/space_view3d/view3d_header.c      | 70 -------------------
 5 files changed, 65 insertions(+), 105 deletions(-)

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 0b08b213cd4..ae04c8875ce 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -12,6 +12,7 @@ class VIEW3D_HT_header(bpy.types.Header):
 		view = context.space_data
 		mode_string = context.mode
 		edit_object = context.edit_object
+		object = context.active_object
 		
 		row = layout.row(align=True)
 		row.template_header()
@@ -26,12 +27,14 @@ class VIEW3D_HT_header(bpy.types.Header):
 			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
 				# XXX: Particle Mode has Select Menu.
 				sub.itemM("VIEW3D_MT_select_%s" % mode_string)
-			
-			if mode_string == 'OBJECT':
+				
+			if object.mode == 'OBJECT':
 				sub.itemM("VIEW3D_MT_object")
-			elif mode_string == 'SCULPT':
+			elif object.mode == 'SCULPT':
 				sub.itemM("VIEW3D_MT_sculpt")
-			elif edit_object:
+			elif object.mode == 'VERTEX_PAINT':
+				sub.itemM("VIEW3D_MT_vertex_paint")
+			elif object.mode:
 				sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
 
 		layout.template_header_3D()
@@ -480,6 +483,21 @@ class VIEW3D_MT_object_show(bpy.types.Menu):
 		layout.itemO("object.restrictview_set")
 		layout.item_booleanO("object.restrictview_set", "unselected", True, text="Hide Unselected")
 
+# ********** Vertex paint menu **********	
+	
+class VIEW3D_MT_vertex_paint(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Paint"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		sculpt = context.tool_settings.sculpt
+
+		layout.itemO("paint.vertex_color_set")
+		props = layout.itemO("paint.vertex_color_set", text="Set Selected Vertex Colors", properties=True)
+		props.selected = True
+
 # ********** Sculpt menu **********	
 	
 class VIEW3D_MT_sculpt(bpy.types.Menu):
@@ -1076,6 +1094,8 @@ bpy.types.register(VIEW3D_MT_object_show)
 
 bpy.types.register(VIEW3D_MT_sculpt) # Sculpt Menu
 
+bpy.types.register(VIEW3D_MT_vertex_paint)
+
 bpy.types.register(VIEW3D_MT_edit_snap) # Edit Menus
 
 bpy.types.register(VIEW3D_MT_edit_MESH)
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index a0187566c43..ba1b57a1bef 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -57,6 +57,9 @@ int paint_poll(bContext *C);
 void paint_cursor_start(struct bContext *C, int (*poll)(struct bContext *C));
 
 /* paint_vertex.c */
+int vertex_paint_mode_poll(bContext *C);
+void clear_vpaint(Scene *scene, int selected);
+
 void PAINT_OT_weight_paint_toggle(struct wmOperatorType *ot);
 void PAINT_OT_weight_paint_radial_control(struct wmOperatorType *ot);
 void PAINT_OT_weight_paint(struct wmOperatorType *ot);
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index 1ea612c0aa5..c38b36007e9 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -77,6 +77,32 @@ void BRUSH_OT_add(wmOperatorType *ot)
 	RNA_def_enum(ot->srna, "type", brush_type_items, OB_MODE_VERTEX_PAINT, "Type", "Which paint mode to create the brush for.");
 }
 
+static int vertex_color_set_exec(bContext *C, wmOperator *op)
+{
+	int selected = RNA_boolean_get(op->ptr, "selected");
+	Scene *scene = CTX_data_scene(C);
+
+	clear_vpaint(scene, selected);
+	
+	return OPERATOR_FINISHED;
+}
+
+void PAINT_OT_vertex_color_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Set Vertex Colors";
+	ot->idname= "PAINT_OT_vertex_color_set";
+	
+	/* api callbacks */
+	ot->exec= vertex_color_set_exec;
+	ot->poll= vertex_paint_mode_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "selected", 0, "Type", "Only color selected faces.");
+}
+
 /**************************** registration **********************************/
 
 void ED_operatortypes_paint(void)
@@ -103,5 +129,6 @@ void ED_operatortypes_paint(void)
 	WM_operatortype_append(PAINT_OT_vertex_paint_radial_control);
 	WM_operatortype_append(PAINT_OT_vertex_paint_toggle);
 	WM_operatortype_append(PAINT_OT_vertex_paint);
+	WM_operatortype_append(PAINT_OT_vertex_color_set);
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index bc2ac480657..ee3d9e5baa1 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -110,11 +110,18 @@ static void error() {}
 
 /* polling - retrieve whether cursor should be set or operator should be done */
 
-static int vp_poll(bContext *C)
+
+/* Returns true if vertex paint mode is active */
+int vertex_paint_mode_poll(bContext *C)
 {
 	Object *ob = CTX_data_active_object(C);
 
-	if(ob && ob->mode & OB_MODE_VERTEX_PAINT &&
+	return ob && ob->mode == OB_MODE_VERTEX_PAINT;
+}
+
+static int vp_poll(bContext *C)
+{
+	if(vertex_paint_mode_poll(C) && 
 	   paint_brush(&CTX_data_tool_settings(C)->vpaint->paint)) {
 		ScrArea *sa= CTX_wm_area(C);
 		if(sa->spacetype==SPACE_VIEW3D) {
@@ -323,34 +330,7 @@ static void copy_wpaint_prev (VPaint *wp, MDeformVert *dverts, int dcount)
 }
 
 
-void clear_vpaint(Scene *scene)
-{
-	Mesh *me;
-	Object *ob;
-	unsigned int *to, paintcol;
-	int a;
-	
-	ob= OBACT;
-	me= get_mesh(ob);
-	if(!ob || ob->id.lib) return;
-
-	if(!(ob->mode & OB_MODE_VERTEX_PAINT)) return;
-
-	if(me==0 || me->mcol==0 || me->totface==0) return;
-
-	paintcol= vpaint_get_current_col(scene->toolsettings->vpaint);
-
-	to= (unsigned int *)me->mcol;
-	a= 4*me->totface;
-	while(a--) {
-		*to= paintcol;
-		to++; 
-	}
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	
-}
-
-void clear_vpaint_selectedfaces(Scene *scene)
+void clear_vpaint(Scene *scene, int selected)
 {
 	Mesh *me;
 	MFace *mf;
@@ -370,7 +350,7 @@ void clear_vpaint_selectedfaces(Scene *scene)
 	mf = me->mface;
 	mcol = (unsigned int*)me->mcol;
 	for (i = 0; i < me->totface; i++, mf++, mcol+=4) {
-		if (mf->flag & ME_FACE_SEL) {
+		if (!selected || mf->flag & ME_FACE_SEL) {
 			mcol[0] = paintcol;
 			mcol[1] = paintcol;
 			mcol[2] = paintcol;
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 9fa1b222868..73cd65cafcd 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -2426,71 +2426,6 @@ static void view3d_pose_armaturemenu(bContext *C, uiLayout *layout, void *arg_un
 #endif
 }
 
-
-/* vertex paint menu */
-static void do_view3d_vpaintmenu(bContext *C, void *arg, int event)
-{
-#if 0
-	/* events >= 3 are registered bpython scripts */
-#ifndef DISABLE_PYTHON
-	if (event >= 3) BPY_menu_do_python(PYMENU_VERTEXPAINT, event - 3);
-#endif
-	switch(event) {
-	case 0: /* undo vertex painting */
-		BIF_undo();
-		break;
-	case 1: /* set vertex colors/weight */
-		if(paint_facesel_test(CTX_data_active_object(C)))
-			clear_vpaint_selectedfaces();
-		else /* we know were in vertex paint mode */
-			clear_vpaint();
-		break;
-	case 2:
-		make_vertexcol(1);
-		break;
-	}
-#endif
-}
-
-static uiBlock *view3d_vpaintmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-#ifndef DISABLE_PYTHON
-// XXX	BPyMenu *pym;
-//	int i=0;
-#endif
-	
-	block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_vpaintmenu, NULL);
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Vertex Painting|U",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Vertex Colors|Shift K",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Shaded Vertex Colors",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	
-#ifndef DISABLE_PYTHON
-	/* note that we account for the 3 previous entries with i+3:
-	even if the last item isnt displayed, it dosent matter */
-//	for (pym = BPyMenuTable[PYMENU_VERTEXPAINT]; pym; pym = pym->next, i++) {
-//		uiDefIconTextBut(block, BUTM, 1, ICON_PYTHON, pym->name, 0, yco-=20,
-//			menuwidth, 19, NULL, 0.0, 0.0, 1, i+3,
-//			pym->tooltip?pym->tooltip:pym->filename);
-//	}
-#endif
-
-	if(ar->alignment==RGN_ALIGN_TOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-
-	uiTextBoundsBlock(block, 50);
-	return block;
-}
-
-
 /* texture paint menu (placeholder, no items yet??) */
 static void do_view3d_tpaintmenu(bContext *C, void *arg, int event)
 {
@@ -3050,11 +2985,6 @@ static void view3d_header_pulldowns(const bContext *C, uiBlock *block, Object *o
 		uiDefPulldownBut(block, view3d_wpaintmenu, NULL, "Paint", xco,yco, xmax-3, 20, "");
 		xco+= xmax;
 	}
-	else if (ob && ob->mode & OB_MODE_VERTEX_PAINT) {
-		xmax= GetButStringLength("Paint");
-		uiDefPulldownBut(block, view3d_vpaintmenu, NULL, "Paint", xco,yco, xmax-3, 20, "");
-		xco+= xmax;
-	} 
 	else if (ob && ob->mode & OB_MODE_TEXTURE_PAINT) {
 		xmax= GetButStringLength("Paint");
 		uiDefPulldownBut(block, view3d_tpaintmenu, NULL, "Paint", xco,yco, xmax-3, 20, "");

From 98272a0138454311ada78f3a8b4e90e6f61aebc9 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 22 Aug 2009 02:53:14 +0000
Subject: [PATCH 197/577] 2.5 - Code shuffling

Moved WeightPaint/VertexPaint toggling hotkeys to the same place that the ones for PoseMode/EditMode are defined. This means that the hotkey for toggling PoseMode works again (instead of being overwritten by WeightPaint).
---
 source/blender/editors/object/object_ops.c       | 9 +++++++++
 source/blender/editors/space_view3d/view3d_ops.c | 7 -------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 6f1a3b5f6cb..239b162c14f 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -167,10 +167,19 @@ void ED_operatortypes_object(void)
 void ED_keymap_object(wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Object Non-modal", 0, 0);
+	wmKeymapItem *kmi;
 	
 	/* Note: this keymap works disregarding mode */
 	WM_keymap_add_item(keymap, "OBJECT_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "OBJECT_OT_posemode_toggle", TABKEY, KM_PRESS, KM_CTRL, 0);
+	
+	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", VKEY, KM_PRESS, 0, 0);
+		RNA_enum_set(kmi->ptr, "mode", OB_MODE_VERTEX_PAINT);
+		RNA_boolean_set(kmi->ptr, "toggle", 1);
+	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
+		RNA_enum_set(kmi->ptr, "mode", OB_MODE_WEIGHT_PAINT);
+		RNA_boolean_set(kmi->ptr, "toggle", 1);
+	
 	WM_keymap_add_item(keymap, "OBJECT_OT_center_set", CKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_CTRL, 0);
 
 	/* Note: this keymap gets disabled in non-objectmode,  */
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index b0eabae3f5d..929272bc066 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -106,13 +106,6 @@ void view3d_keymap(wmWindowManager *wm)
 	ListBase *keymap= WM_keymap_listbase(wm, "View3D Generic", SPACE_VIEW3D, 0);
 	wmKeymapItem *km;
 	
-	km = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", VKEY, KM_PRESS, 0, 0);
-	RNA_enum_set(km->ptr, "mode", OB_MODE_VERTEX_PAINT);
-	RNA_boolean_set(km->ptr, "toggle", 1);
-	km = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
-	RNA_enum_set(km->ptr, "mode", OB_MODE_WEIGHT_PAINT);
-	RNA_boolean_set(km->ptr, "toggle", 1);
-	
 	WM_keymap_add_item(keymap, "VIEW3D_OT_properties", NKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "VIEW3D_OT_toolbar", TKEY, KM_PRESS, 0, 0);
 	

From 17e3b09e88ad48c1659f2c586c33a725a3bd601f Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 22 Aug 2009 03:10:52 +0000
Subject: [PATCH 198/577] 2.5 - Timeline now updates correctly after keyframes
 have been edited

---
 source/blender/editors/space_time/space_time.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index f18da93c35d..ce6846a4489 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -260,11 +260,15 @@ static void time_main_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch(wmn->category) {
+		case NC_ANIMATION:
+			ED_region_tag_redraw(ar);
+			break;
 		
 		case NC_SCENE:
 			/* any scene change for now */
 			ED_region_tag_redraw(ar);
 			break;
+		
 	}
 }
 

From d4407115faaf89061eed36cb69664f071db3fa31 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 22 Aug 2009 04:11:17 +0000
Subject: [PATCH 199/577] Hook Modifier Bugfixes:

Fixed some typos made in previous commit. Hook Modifier should now work correctly again (and also for newly added Hook relationships)

Notes:
* To add a hook, you currently need to perform the following steps
1) add modifier from menu (no operator in EditMode)
2) specify the object (and/or bone to use as the hook target)
3a) in EditMode, select the vertices you wish to be affected by the hook, and press 'Assign'
3b) alternatively, fill in the vertex-group field for the Vertex Group which contains the vertices to be affected
4) press 'Reset' (to make sure hook will behave correctly)
5) optionally, also press 'Recenter' if the hook position isn't right...

* BUG ALERT (Brecht/Ton): it is impossible to clear the vertexgroup/bone fields once you have assigned some value. Doing backspace+enter (or any other variation) will always result in the first item in the search menu being used.
---
 source/blender/blenkernel/intern/modifier.c   |  9 +++--
 source/blender/editors/object/object_edit.c   | 40 ++++++++++---------
 .../blender/editors/object/object_modifier.c  |  2 +-
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 6da2c94fab8..1cb163a4de7 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -5657,7 +5657,7 @@ static void hookModifier_deformVerts(
 {
 	HookModifierData *hmd = (HookModifierData*) md;
 	bPoseChannel *pchan= get_pose_channel(hmd->object->pose, hmd->subtarget);
-	float vec[3], mat[4][4], dmat[4][4], imat[4][4];
+	float vec[3], mat[4][4], dmat[4][4];
 	int i;
 	DerivedMesh *dm = derivedData;
 	
@@ -5670,8 +5670,8 @@ static void hookModifier_deformVerts(
 		/* just object target */
 		Mat4CpyMat4(dmat, hmd->object->obmat);
 	}
-	Mat4Invert(imat, dmat);
-	Mat4MulSerie(mat, imat, dmat, hmd->parentinv,
+	Mat4Invert(ob->imat, ob->obmat);
+	Mat4MulSerie(mat, ob->imat, dmat, hmd->parentinv,
 		     NULL, NULL, NULL, NULL, NULL);
 
 	/* vertex indices? */
@@ -5728,7 +5728,8 @@ static void hookModifier_deformVerts(
 				}
 			}
 		}
-	} else {	/* vertex group hook */
+	} 
+	else if(hmd->name[0]) {	/* vertex group hook */
 		bDeformGroup *curdef;
 		Mesh *me = ob->data;
 		int index = 0;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 8ac12a5e3a4..3d2ddba3757 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1384,9 +1384,11 @@ void add_hook(Scene *scene, View3D *v3d, int mode)
 		modifier_free(md);
 	}
 	else if(mode==5) { /* select */
+		// FIXME: this is now OBJECT_OT_hook_select
 		object_hook_select(obedit, hmd);
 	}
 	else if(mode==6) { /* clear offset */
+		// FIXME: this is now OBJECT_OT_hook_reset operator
 		where_is_object(scene, ob);	/* ob is hook->parent */
 
 		Mat4Invert(ob->imat, ob->obmat);
@@ -1398,25 +1400,6 @@ void add_hook(Scene *scene, View3D *v3d, int mode)
 	DAG_scene_sort(scene);
 }
 
-
-/* use this when the loc/size/rot of the parent has changed but the children should stay in the same place
- * apply-size-rot or object center for eg */
-static void ignore_parent_tx(Scene *scene, Object *ob ) 
-{
-	Object workob;
-	Object *ob_child;
-	
-	/* a change was made, adjust the children to compensate */
-	for (ob_child=G.main->object.first; ob_child; ob_child=ob_child->id.next) {
-		if (ob_child->parent == ob) {
-			ED_object_apply_obmat(ob_child);
-			what_does_parent(scene, ob_child, &workob);
-			Mat4Invert(ob_child->parentinv, workob.obmat);
-		}
-	}
-}
-
-
 void add_hook_menu(Scene *scene, View3D *v3d)
 {
 	Object *obedit= scene->obedit;  // XXX get from context
@@ -1435,6 +1418,25 @@ void add_hook_menu(Scene *scene, View3D *v3d)
 	add_hook(scene, v3d, mode);
 }
 
+
+
+/* use this when the loc/size/rot of the parent has changed but the children should stay in the same place
+ * apply-size-rot or object center for eg */
+static void ignore_parent_tx(Scene *scene, Object *ob ) 
+{
+	Object workob;
+	Object *ob_child;
+	
+	/* a change was made, adjust the children to compensate */
+	for (ob_child=G.main->object.first; ob_child; ob_child=ob_child->id.next) {
+		if (ob_child->parent == ob) {
+			ED_object_apply_obmat(ob_child);
+			what_does_parent(scene, ob_child, &workob);
+			Mat4Invert(ob_child->parentinv, workob.obmat);
+		}
+	}
+}
+
 /* ******************** clear parent operator ******************* */
 
 static EnumPropertyItem prop_clear_parent_types[] = {
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 1b20f90360a..ec46cea8e84 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -865,7 +865,7 @@ static int hook_reset_exec(bContext *C, wmOperator *op)
 			Mat4MulMat4(mat, pchan->pose_mat, hmd->object->obmat);
 			
 			Mat4Invert(imat, mat);
-			Mat4MulSerie(hmd->parentinv, imat, mat, NULL, NULL, NULL, NULL, NULL, NULL);
+			Mat4MulSerie(hmd->parentinv, imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
 		}
 		else {
 			Mat4Invert(hmd->object->imat, hmd->object->obmat);

From b20f4e46c686f9c9fb0043eb3b95f639773d4a41 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 05:46:03 +0000
Subject: [PATCH 200/577] remove -Wnested-externs warning for CMake/unix, since
 this is used a lot, if we want to remove it can be re-enabled. fix view3d
 python errors with no object/edit object.

---
 CMakeLists.txt             | 14 +++++++++++++-
 release/ui/space_view3d.py | 19 +++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 749284def28..8ef4296e266 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
+# OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -212,7 +213,7 @@ IF(UNIX AND NOT APPLE)
   SET(PLATFORM_LINKFLAGS "-pthread")
 
   # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
+  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
   SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
@@ -511,6 +512,17 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SET(BINRELOC_INC ${BINRELOC}/include)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
+
+# TODO - buildinfo
+# IF(UNIX)
+#   IF(WITH_BUILDINFO)
+#     EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
+#     EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
+#     EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+#     SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+#   ENDIF(WITH_BUILDINFO)
+# ENDIF(UNIX)
+
 #-----------------------------------------------------------------------------
 # Common.
 
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index ae04c8875ce..f9e185f44f2 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -27,15 +27,18 @@ class VIEW3D_HT_header(bpy.types.Header):
 			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
 				# XXX: Particle Mode has Select Menu.
 				sub.itemM("VIEW3D_MT_select_%s" % mode_string)
-				
-			if object.mode == 'OBJECT':
-				sub.itemM("VIEW3D_MT_object")
-			elif object.mode == 'SCULPT':
-				sub.itemM("VIEW3D_MT_sculpt")
-			elif object.mode == 'VERTEX_PAINT':
-				sub.itemM("VIEW3D_MT_vertex_paint")
-			elif object.mode:
+			
+			if edit_object:
 				sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
+			elif object:
+				ob_mode_string = object.mode
+				
+				if ob_mode_string == 'OBJECT':
+					sub.itemM("VIEW3D_MT_object")
+				elif ob_mode_string == 'SCULPT':
+					sub.itemM("VIEW3D_MT_sculpt")
+				elif ob_mode_string == 'VERTEX_PAINT':
+					sub.itemM("VIEW3D_MT_vertex_paint")
 
 		layout.template_header_3D()
 

From 9e3ac3c1f2cbd44cbb821d266400d70320ac6ccc Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sat, 22 Aug 2009 08:06:54 +0000
Subject: [PATCH 201/577] Added extra padding for OS X at the top of the screen
 when opening user prefs. The window header was still getting clipped slightly
 behind the menu bar.

---
 source/blender/windowmanager/intern/wm_window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 27a1b076a28..d70516ef02e 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -91,7 +91,7 @@ static void wm_window_check_position(rcti *rect)
 	wm_get_screensize(&width, &height);
 	
 #ifdef __APPLE__
-	height -= 42;
+	height -= 70;
 #endif
 	
 	if(rect->xmin < 0) {

From 977a50ad77b8c31329a6fb6117741c83a984a763 Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sat, 22 Aug 2009 08:35:39 +0000
Subject: [PATCH 202/577] 2.5 MSVC projectfiles maintenance * AUD_filefactory
 added. * imbuf added to RNA include dirs.

---
 intern/audaspace/make/msvc_9_0/audaspace.vcproj   | 15 ++++++++-------
 .../blender/makesrna/RNA_makesrna.vcproj          | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
index a4d775a415c..67ab4d44d72 100644
--- a/intern/audaspace/make/msvc_9_0/audaspace.vcproj
+++ b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
@@ -380,6 +380,14 @@
 				RelativePath="..\..\intern\AUD_ConverterReader.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\intern\AUD_FileFactory.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\intern\AUD_FileFactory.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\intern\AUD_FloatMixer.cpp"
 				>
@@ -723,13 +731,6 @@
 			<File
 				RelativePath="..\..\jack\AUD_JackDevice.cpp"
 				>
-				<FileConfiguration
-					Name="Blender Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\jack\AUD_JackDevice.h"
diff --git a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
index b907997f190..afd5a7f0c0d 100644
--- a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -328,7 +328,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -425,7 +425,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -522,7 +522,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"

From fe0dfc23159e93a7d8d544749ff5e87f0ba6191f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 08:48:01 +0000
Subject: [PATCH 203/577] use '' for enums rather then ""

---
 release/io/engine_render_pov.py         |   4 +-
 release/ui/buttons_data_armature.py     |   8 +-
 release/ui/buttons_data_bone.py         |   6 +-
 release/ui/buttons_data_camera.py       |   4 +-
 release/ui/buttons_data_curve.py        |   8 +-
 release/ui/buttons_data_empty.py        |   4 +-
 release/ui/buttons_data_lamp.py         |   4 +-
 release/ui/buttons_data_lattice.py      |   4 +-
 release/ui/buttons_data_mesh.py         |  28 +++----
 release/ui/buttons_data_metaball.py     |   4 +-
 release/ui/buttons_data_modifier.py     |   6 +-
 release/ui/buttons_data_text.py         |   4 +-
 release/ui/buttons_game.py              |  12 +--
 release/ui/buttons_material.py          |   8 +-
 release/ui/buttons_object.py            |   8 +-
 release/ui/buttons_object_constraint.py |   8 +-
 release/ui/buttons_particle.py          |  40 +++++-----
 release/ui/buttons_physics_cloth.py     |   8 +-
 release/ui/buttons_physics_field.py     |  14 ++--
 release/ui/buttons_physics_fluid.py     |   4 +-
 release/ui/buttons_physics_smoke.py     |  12 +--
 release/ui/buttons_physics_softbody.py  |   8 +-
 release/ui/buttons_scene.py             |  18 ++---
 release/ui/buttons_texture.py           |   4 +-
 release/ui/buttons_world.py             |   4 +-
 release/ui/space_buttons.py             |   4 +-
 release/ui/space_console.py             |   6 +-
 release/ui/space_filebrowser.py         |   2 +-
 release/ui/space_image.py               |  40 +++++-----
 release/ui/space_info.py                |  18 ++---
 release/ui/space_logic.py               |   4 +-
 release/ui/space_node.py                |   8 +-
 release/ui/space_outliner.py            |   4 +-
 release/ui/space_sequencer.py           |  22 ++---
 release/ui/space_text.py                |  26 +++---
 release/ui/space_time.py                |  12 +--
 release/ui/space_userpref.py            |  18 ++---
 release/ui/space_view3d.py              | 102 ++++++++++++------------
 release/ui/space_view3d_toolbar.py      |   8 +-
 39 files changed, 253 insertions(+), 253 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index 539f705a6ee..51aa26f7fb9 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -791,8 +791,8 @@ for member in dir(buttons_material):
 del buttons_material
 
 class RenderButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "scene"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 	
diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 9b640776a9e..3a1de0d5f0b 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -2,8 +2,8 @@
 import bpy
  
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
@@ -90,8 +90,8 @@ class DATA_PT_bone_groups(DataButtonsPanel):
 		
 		col = row.column(align=True)
 		col.active = (ob.proxy == None)
-		col.itemO("pose.group_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("pose.group_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("pose.group_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("pose.group_remove", icon='ICON_ZOOMOUT', text="")
 		
 		group = pose.active_bone_group
 		if group:
diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 1eb09377892..17c9c2d89d9 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -2,8 +2,8 @@
 import bpy
  
 class BoneButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "bone"
 	
 	def poll(self, context):
@@ -20,7 +20,7 @@ class BONE_PT_context_bone(BoneButtonsPanel):
 			bone = context.edit_bone
 		
 		row = layout.row()
-		row.itemL(text="", icon="ICON_BONE_DATA")
+		row.itemL(text="", icon='ICON_BONE_DATA')
 		row.itemR(bone, "name", text="")
 
 class BONE_PT_transform(BoneButtonsPanel):
diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py
index f2fa4207ec8..0480897d641 100644
--- a/release/ui/buttons_data_camera.py
+++ b/release/ui/buttons_data_camera.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 
 	def poll(self, context):
diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 35d557afe32..92e414ba2f3 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
@@ -80,13 +80,13 @@ class DATA_PT_geometry_curve(DataButtonsPanel):
 		sub.itemL(text="Modification:")
 		sub.itemR(curve, "width")
 		sub.itemR(curve, "extrude")
-		sub.itemR(curve, "taper_object", icon="ICON_OUTLINER_OB_CURVE")
+		sub.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
 		
 		sub = split.column()
 		sub.itemL(text="Bevel:")
 		sub.itemR(curve, "bevel_depth", text="Depth")
 		sub.itemR(curve, "bevel_resolution", text="Resolution")
-		sub.itemR(curve, "bevel_object", icon="ICON_OUTLINER_OB_CURVE")
+		sub.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
 	
 class DATA_PT_pathanim(DataButtonsPanel):
 	__label__ = "Path Animation"
diff --git a/release/ui/buttons_data_empty.py b/release/ui/buttons_data_empty.py
index 2a2f51ed292..98c9b88e9f5 100644
--- a/release/ui/buttons_data_empty.py
+++ b/release/ui/buttons_data_empty.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index a00bb23d5b5..c1873d934c4 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py
index 5d8a07c7d44..5535f973b27 100644
--- a/release/ui/buttons_data_lattice.py
+++ b/release/ui/buttons_data_lattice.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index c7663be1923..c1311b32180 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
@@ -93,12 +93,12 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
 		row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index")
 
 		col = row.column(align=True)
-		col.itemO("object.vertex_group_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("object.vertex_group_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
 
-		col.itemO("object.vertex_group_copy", icon="ICON_BLANK1", text="")
+		col.itemO("object.vertex_group_copy", icon='ICON_BLANK1', text="")
 		if ob.data.users > 1:
-			col.itemO("object.vertex_group_copy_to_linked", icon="ICON_BLANK1", text="")
+			col.itemO("object.vertex_group_copy_to_linked", icon='ICON_BLANK1', text="")
 
 		group = ob.active_vertex_group
 		if group:
@@ -137,15 +137,15 @@ class DATA_PT_shape_keys(DataButtonsPanel):
 		col = row.column()
 
 		subcol = col.column(align=True)
-		subcol.itemO("object.shape_key_add", icon="ICON_ZOOMIN", text="")
-		subcol.itemO("object.shape_key_remove", icon="ICON_ZOOMOUT", text="")
+		subcol.itemO("object.shape_key_add", icon='ICON_ZOOMIN', text="")
+		subcol.itemO("object.shape_key_remove", icon='ICON_ZOOMOUT', text="")
 
 		if kb:
 			col.itemS()
 
 			subcol = col.column(align=True)
-			subcol.itemR(ob, "shape_key_lock", icon="ICON_UNPINNED", text="")
-			subcol.itemR(kb, "mute", icon="ICON_MUTE_IPO_ON", text="")
+			subcol.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
+			subcol.itemR(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
 
 			if key.relative:
 				row = layout.row()
@@ -197,8 +197,8 @@ class DATA_PT_uv_texture(DataButtonsPanel):
 		col.template_list(me, "uv_textures", me, "active_uv_texture_index", rows=2)
 
 		col = row.column(align=True)
-		col.itemO("mesh.uv_texture_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("mesh.uv_texture_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("mesh.uv_texture_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("mesh.uv_texture_remove", icon='ICON_ZOOMOUT', text="")
 
 		lay = me.active_uv_texture
 		if lay:
@@ -218,8 +218,8 @@ class DATA_PT_vertex_colors(DataButtonsPanel):
 		col.template_list(me, "vertex_colors", me, "active_vertex_color_index", rows=2)
 
 		col = row.column(align=True)
-		col.itemO("mesh.vertex_color_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("mesh.vertex_color_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("mesh.vertex_color_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("mesh.vertex_color_remove", icon='ICON_ZOOMOUT', text="")
 
 		lay = me.active_vertex_color
 		if lay:
diff --git a/release/ui/buttons_data_metaball.py b/release/ui/buttons_data_metaball.py
index e31c3d7fcd0..88c0066c67f 100644
--- a/release/ui/buttons_data_metaball.py
+++ b/release/ui/buttons_data_metaball.py
@@ -1,8 +1,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index f5af26f8746..9b2481b0195 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "modifier"
 	
 class DATA_PT_modifiers(DataButtonsPanel):
@@ -202,7 +202,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	def HOOK(self, layout, ob, md):
 		col = layout.column()
 		col.itemR(md, "object")
-		if md.object and md.object.type == "ARMATURE":
+		if md.object and md.object.type == 'ARMATURE':
 			layout.item_pointerR(md, "subtarget", md.object.data, "bones", text="Bone")
 		
 		layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 754d6fcda39..62d4d0a4d21 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -2,8 +2,8 @@
 import bpy
 
 class DataButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py
index 7334b453e91..e28e3fda2c6 100644
--- a/release/ui/buttons_game.py
+++ b/release/ui/buttons_game.py
@@ -2,8 +2,8 @@
 import bpy
  
 class PhysicsButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -171,8 +171,8 @@ bpy.types.register(PHYSICS_PT_game_physics)
 bpy.types.register(PHYSICS_PT_game_collision_bounds)
 
 class SceneButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "scene"
 
 	def poll(self, context):
@@ -322,8 +322,8 @@ bpy.types.register(SCENE_PT_game_shading)
 bpy.types.register(SCENE_PT_game_performance)
 
 class WorldButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "world"
 
 	def poll(self, context):
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 73d28d6964c..eaba26c7e51 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -2,8 +2,8 @@
 import bpy
 
 class MaterialButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "material"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 
@@ -45,8 +45,8 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
 			row.template_list(ob, "materials", ob, "active_material_index", rows=2)
 
 			col = row.column(align=True)
-			col.itemO("object.material_slot_add", icon="ICON_ZOOMIN", text="")
-			col.itemO("object.material_slot_remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("object.material_slot_add", icon='ICON_ZOOMIN', text="")
+			col.itemO("object.material_slot_remove", icon='ICON_ZOOMOUT', text="")
 
 			if ob.mode == 'EDIT':
 				row = layout.row(align=True)
diff --git a/release/ui/buttons_object.py b/release/ui/buttons_object.py
index 6b6d583e2ca..af2c7cfb58a 100644
--- a/release/ui/buttons_object.py
+++ b/release/ui/buttons_object.py
@@ -2,8 +2,8 @@
 import bpy
 
 class ObjectButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "object"
 
 class OBJECT_PT_context_object(ObjectButtonsPanel):
@@ -15,7 +15,7 @@ class OBJECT_PT_context_object(ObjectButtonsPanel):
 		ob = context.object
 		
 		row = layout.row()
-		row.itemL(text="", icon="ICON_OBJECT_DATA")
+		row.itemL(text="", icon='ICON_OBJECT_DATA')
 		row.itemR(ob, "name", text="")
 
 class OBJECT_PT_transform(ObjectButtonsPanel):
@@ -79,7 +79,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
 
 				row = col.box().row()
 				row.itemR(group, "name", text="")
-				row.itemO("object.group_remove", text="", icon="VICON_X")
+				row.itemO("object.group_remove", text="", icon='VICON_X')
 
 				split = col.box().split()
 				split.column().itemR(group, "layer", text="Dupli")
diff --git a/release/ui/buttons_object_constraint.py b/release/ui/buttons_object_constraint.py
index c67d6e40cfb..cdc18e3545c 100644
--- a/release/ui/buttons_object_constraint.py
+++ b/release/ui/buttons_object_constraint.py
@@ -2,8 +2,8 @@
 import bpy
 
 class ConstraintButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "constraint"
 
 	def draw_constraint(self, con):
@@ -39,7 +39,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 		layout.itemR(con, "target") # XXX limiting settings for only 'curves' or some type of object
 		
 		if con.target and subtargets:
-			if con.target.type == "ARMATURE":
+			if con.target.type == 'ARMATURE':
 				layout.item_pointerR(con, "subtarget", con.target.data, "bones", text="Bone")
 				
 				if con.type == 'COPY_LOCATION':
@@ -478,7 +478,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 		layout.itemR(con, "distance")
 		layout.itemR(con, "shrinkwrap_type")
 		
-		if con.shrinkwrap_type == "PROJECT":
+		if con.shrinkwrap_type == 'PROJECT':
 			row = layout.row(align=True)
 			row.itemR(con, "axis_x")
 			row.itemR(con, "axis_y")
diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index 8bc84b734bf..0454f2a4023 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -11,8 +11,8 @@ def particle_panel_poll(context):
 	return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
 
 class ParticleButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "particle"
 
 	def poll(self, context):
@@ -35,8 +35,8 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
 			row.template_list(ob, "particle_systems", ob, "active_particle_system_index", rows=2)
 
 			col = row.column(align=True)
-			col.itemO("object.particle_system_add", icon="ICON_ZOOMIN", text="")
-			col.itemO("object.particle_system_remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("object.particle_system_add", icon='ICON_ZOOMIN', text="")
+			col.itemO("object.particle_system_remove", icon='ICON_ZOOMOUT', text="")
 
 		if psys:
 			part = psys.settings
@@ -156,8 +156,8 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
 		row = layout.row()
 		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2 )
 		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-		col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 		
 		row = layout.row()
 		row.itemL(text="File Name:")
@@ -400,12 +400,12 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
 			col = row.column()
 			subrow = col.row()
 			subcol = subrow.column(align=True)
-			subcol.itemO("particle.new_target", icon="ICON_ZOOMIN", text="")
-			subcol.itemO("particle.remove_target", icon="ICON_ZOOMOUT", text="")
+			subcol.itemO("particle.new_target", icon='ICON_ZOOMIN', text="")
+			subcol.itemO("particle.remove_target", icon='ICON_ZOOMOUT', text="")
 			subrow = col.row()
 			subcol = subrow.column(align=True)
-			subcol.itemO("particle.target_move_up", icon="VICON_MOVE_UP", text="")
-			subcol.itemO("particle.target_move_down", icon="VICON_MOVE_DOWN", text="")
+			subcol.itemO("particle.target_move_up", icon='VICON_MOVE_UP', text="")
+			subcol.itemO("particle.target_move_down", icon='VICON_MOVE_DOWN', text="")
 			
 			key = psys.active_particle_target
 			if key:
@@ -450,11 +450,11 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
 		#row.template_list(boids, "states", boids, "active_boid_state_index", compact="True")
 		#col = row.row()
 		#subrow = col.row(align=True)
-		#subrow.itemO("boid.boidstate_add", icon="ICON_ZOOMIN", text="")
-		#subrow.itemO("boid.boidstate_del", icon="ICON_ZOOMOUT", text="")
+		#subrow.itemO("boid.boidstate_add", icon='ICON_ZOOMIN', text="")
+		#subrow.itemO("boid.boidstate_del", icon='ICON_ZOOMOUT', text="")
 		#subrow = row.row(align=True)
-		#subrow.itemO("boid.boidstate_move_up", icon="VICON_MOVE_UP", text="")
-		#subrow.itemO("boid.boidstate_move_down", icon="VICON_MOVE_DOWN", text="")
+		#subrow.itemO("boid.boidstate_move_up", icon='VICON_MOVE_UP', text="")
+		#subrow.itemO("boid.boidstate_move_down", icon='VICON_MOVE_DOWN', text="")
 		
 		state = boids.active_boid_state
 		
@@ -473,12 +473,12 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
 		col = row.column()
 		subrow = col.row()
 		subcol = subrow.column(align=True)
-		subcol.item_menu_enumO("boid.boidrule_add", "type", icon="ICON_ZOOMIN", text="")
-		subcol.itemO("boid.boidrule_del", icon="ICON_ZOOMOUT", text="")
+		subcol.item_menu_enumO("boid.boidrule_add", "type", icon='ICON_ZOOMIN', text="")
+		subcol.itemO("boid.boidrule_del", icon='ICON_ZOOMOUT', text="")
 		subrow = col.row()
 		subcol = subrow.column(align=True)
-		subcol.itemO("boid.boidrule_move_up", icon="VICON_MOVE_UP", text="")
-		subcol.itemO("boid.boidrule_move_down", icon="VICON_MOVE_DOWN", text="")
+		subcol.itemO("boid.boidrule_move_up", icon='VICON_MOVE_UP', text="")
+		subcol.itemO("boid.boidrule_move_down", icon='VICON_MOVE_DOWN', text="")
 		
 		rule = state.active_boid_rule
 		
@@ -486,8 +486,8 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel):
 			row = layout.row()
 			row.itemR(rule, "name", text="")
 			#somebody make nice icons for boids here please! -jahka
-			row.itemR(rule, "in_air", icon="VICON_MOVE_UP", text="")
-			row.itemR(rule, "on_land", icon="VICON_MOVE_DOWN", text="")
+			row.itemR(rule, "in_air", icon='VICON_MOVE_UP', text="")
+			row.itemR(rule, "on_land", icon='VICON_MOVE_DOWN', text="")
 			
 			row = layout.row()
 
diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index f34077c758a..6c499625685 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -93,8 +93,8 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
 		row = layout.row()
 		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-		col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 		
 		row = layout.row()
 		row.itemR(cache, "name")
diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py
index fb29dd92833..3c68327ba79 100644
--- a/release/ui/buttons_physics_field.py
+++ b/release/ui/buttons_physics_field.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -146,15 +146,15 @@ class PHYSICS_PT_field(PhysicButtonsPanel):
 				sub.active = field.use_radial_max
 				sub.itemR(field, "radial_maximum", text="Distance")
 				
-		#if ob.type in "CURVE":
-			#if field.type == "GUIDE":
+		#if ob.type in 'CURVE':
+			#if field.type == 'GUIDE':
 				#colsub = col.column(align=True)
 			
-		#if field.type != "NONE":
+		#if field.type != 'NONE':
 			#layout.itemR(field, "strength")
 
-		#if field.type in ("HARMONIC", "SPHERICAL", "CHARGE", "LENNARDj"):
-			#if ob.type in ("MESH", "SURFACE", "FONT", "CURVE"):
+		#if field.type in ('HARMONIC', 'SPHERICAL', 'CHARGE', "LENNARDj"):
+			#if ob.type in ('MESH', 'SURFACE', 'FONT', 'CURVE'):
 				#layout.itemR(field, "surface")
 
 class PHYSICS_PT_collision(PhysicButtonsPanel):
diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py
index 304d419b388..1d0a64c517a 100644
--- a/release/ui/buttons_physics_fluid.py
+++ b/release/ui/buttons_physics_fluid.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index d187e4c5901..5e1ec227080 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -7,8 +7,8 @@ def smoke_panel_enabled_low(smd):
 	return True
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -144,8 +144,8 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 			row = layout.row()
 			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 			col = row.column(align=True)
-			col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-			col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+			col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 			
 			row = layout.row()
 			row.itemR(cache, "name")
@@ -239,8 +239,8 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
 			row = layout.row()
 			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 			col = row.column(align=True)
-			col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-			col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+			col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+			col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 			
 			row = layout.row()
 			row.itemR(cache, "name")
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 2613f9e8032..35c0c498436 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -2,8 +2,8 @@
 import bpy
 
 class PhysicButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "physics"
 
 	def poll(self, context):
@@ -68,8 +68,8 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
 		row = layout.row()
 		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
 		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
-		col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
 		
 		row = layout.row()
 		row.itemR(cache, "name")
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index e9ee97468e8..08eee7ef43a 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -2,8 +2,8 @@
 import bpy
 
 class RenderButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "scene"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 	
@@ -41,8 +41,8 @@ class SCENE_PT_layers(RenderButtonsPanel):
 		row.template_list(rd, "layers", rd, "active_layer_index", rows=2)
 
 		col = row.column(align=True)
-		col.itemO("scene.render_layer_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("scene.render_layer_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("scene.render_layer_add", icon='ICON_ZOOMIN', text="")
+		col.itemO("scene.render_layer_remove", icon='ICON_ZOOMOUT', text="")
 
 		rl = rd.layers[rd.active_layer_index]
 
@@ -103,19 +103,19 @@ class SCENE_PT_layers(RenderButtonsPanel):
 		col.itemR(rl, "pass_diffuse")
 		row = col.row()
 		row.itemR(rl, "pass_specular")
-		row.itemR(rl, "pass_specular_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_specular_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_shadow")
-		row.itemR(rl, "pass_shadow_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_shadow_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_ao")
-		row.itemR(rl, "pass_ao_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_ao_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_reflection")
-		row.itemR(rl, "pass_reflection_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_reflection_exclude", text="", icon='ICON_X')
 		row = col.row()
 		row.itemR(rl, "pass_refraction")
-		row.itemR(rl, "pass_refraction_exclude", text="", icon="ICON_X")
+		row.itemR(rl, "pass_refraction_exclude", text="", icon='ICON_X')
 
 class SCENE_PT_shading(RenderButtonsPanel):
 	__label__ = "Shading"
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 29e43981fd2..20b3c7bca3e 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -2,8 +2,8 @@
 import bpy
 
 class TextureButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "texture"
 	
 	def poll(self, context):
diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py
index 599f45d160b..342adfaf4af 100644
--- a/release/ui/buttons_world.py
+++ b/release/ui/buttons_world.py
@@ -2,8 +2,8 @@
 import bpy
 
 class WorldButtonsPanel(bpy.types.Panel):
-	__space_type__ = "PROPERTIES"
-	__region_type__ = "WINDOW"
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
 	__context__ = "world"
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 	
diff --git a/release/ui/space_buttons.py b/release/ui/space_buttons.py
index 3cf782e615f..aa89c06ea08 100644
--- a/release/ui/space_buttons.py
+++ b/release/ui/space_buttons.py
@@ -2,7 +2,7 @@
 import bpy
 
 class Buttons_HT_header(bpy.types.Header):
-	__space_type__ = "PROPERTIES"
+	__space_type__ = 'PROPERTIES'
 
 	def draw(self, context):
 		layout = self.layout
@@ -22,7 +22,7 @@ class Buttons_HT_header(bpy.types.Header):
 		row.itemR(scene, "current_frame")
 
 class Buttons_MT_view(bpy.types.Menu):
-	__space_type__ = "PROPERTIES"
+	__space_type__ = 'PROPERTIES'
 	__label__ = "View"
 
 	def draw(self, context):
diff --git a/release/ui/space_console.py b/release/ui/space_console.py
index 45cb2a856e1..f1038b5616a 100644
--- a/release/ui/space_console.py
+++ b/release/ui/space_console.py
@@ -5,7 +5,7 @@ import bpy_ops # XXX - should not need to do this
 del bpy_ops
 
 class CONSOLE_HT_header(bpy.types.Header):
-	__space_type__ = "CONSOLE"
+	__space_type__ = 'CONSOLE'
 
 	def draw(self, context):
 		sc = context.space_data
@@ -39,7 +39,7 @@ class CONSOLE_HT_header(bpy.types.Header):
 			row.itemO("console.report_replay")
 
 class CONSOLE_MT_console(bpy.types.Menu):
-	__space_type__ = "CONSOLE"
+	__space_type__ = 'CONSOLE'
 	__label__ = "Console"
 
 	def draw(self, context):
@@ -52,7 +52,7 @@ class CONSOLE_MT_console(bpy.types.Menu):
 		layout.itemO("console.paste")
 
 class CONSOLE_MT_report(bpy.types.Menu):
-	__space_type__ = "CONSOLE"
+	__space_type__ = 'CONSOLE'
 	__label__ = "Report"
 
 	def draw(self, context):
diff --git a/release/ui/space_filebrowser.py b/release/ui/space_filebrowser.py
index a37b89e8db4..f1ea5555787 100644
--- a/release/ui/space_filebrowser.py
+++ b/release/ui/space_filebrowser.py
@@ -2,7 +2,7 @@
 import bpy
 
 class FILEBROWSER_HT_header(bpy.types.Header):
-	__space_type__ = "FILE_BROWSER"
+	__space_type__ = 'FILE_BROWSER'
 
 	def draw(self, context):
 		layout = self.layout
diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index 888b46e060e..aa43b14b974 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -2,7 +2,7 @@
 import bpy
 
 class IMAGE_MT_view(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -13,7 +13,7 @@ class IMAGE_MT_view(bpy.types.Menu):
 
 		show_uvedit = sima.show_uvedit
 
-		layout.itemO("image.properties", icon="ICON_MENU_PANEL")
+		layout.itemO("image.properties", icon='ICON_MENU_PANEL')
 
 		layout.itemS()
 
@@ -43,7 +43,7 @@ class IMAGE_MT_view(bpy.types.Menu):
 		layout.itemO("screen.screen_full_area")
 
 class IMAGE_MT_select(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -64,7 +64,7 @@ class IMAGE_MT_select(bpy.types.Menu):
 		layout.itemO("uv.select_linked")
 
 class IMAGE_MT_image(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Image"
 
 	def draw(self, context):
@@ -85,7 +85,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 			layout.itemO("image.save")
 			layout.itemO("image.save_as")
 
-			if ima.source == "SEQUENCE":
+			if ima.source == 'SEQUENCE':
 				layout.itemO("image.save_sequence")
 
 			if not show_render:
@@ -99,7 +99,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 				# only for dirty && specific image types, perhaps
 				# this could be done in operator poll too
 				if ima.dirty:
-					if ima.source in ("FILE", "GENERATED") and ima.type != "MULTILAYER":
+					if ima.source in ('FILE', 'GENERATED') and ima.type != 'MULTILAYER':
 						layout.item_booleanO("image.pack", "as_png", True, text="Pack As PNG")
 
 			layout.itemS()
@@ -107,7 +107,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 			layout.itemR(sima, "image_painting")
 
 class IMAGE_MT_uvs_showhide(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Show/Hide Faces"
 
 	def draw(self, context):
@@ -118,7 +118,7 @@ class IMAGE_MT_uvs_showhide(bpy.types.Menu):
 		layout.item_booleanO("uv.hide", "unselected", True)
 
 class IMAGE_MT_uvs_transform(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Transform"
 
 	def draw(self, context):
@@ -129,7 +129,7 @@ class IMAGE_MT_uvs_transform(bpy.types.Menu):
 		layout.item_enumO("tfm.transform", "mode", 'RESIZE')
 
 class IMAGE_MT_uvs_mirror(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Mirror"
 
 	def draw(self, context):
@@ -139,7 +139,7 @@ class IMAGE_MT_uvs_mirror(bpy.types.Menu):
 		layout.item_enumO("uv.mirror", "axis", 'MIRROR_Y') # "Y Axis", M, 
 
 class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "Weld/Align"
 
 	def draw(self, context):
@@ -150,7 +150,7 @@ class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
 
 
 class IMAGE_MT_uvs(bpy.types.Menu):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "UVs"
 
 	def draw(self, context):
@@ -192,7 +192,7 @@ class IMAGE_MT_uvs(bpy.types.Menu):
 		layout.itemM("IMAGE_MT_uvs_showhide")
 
 class IMAGE_HT_header(bpy.types.Header):
-	__space_type__ = "IMAGE_EDITOR"
+	__space_type__ = 'IMAGE_EDITOR'
 
 	def draw(self, context):
 		sima = context.space_data
@@ -262,17 +262,17 @@ class IMAGE_HT_header(bpy.types.Header):
 			row.itemR(sima, "draw_channels", text="", expand=True)
 
 			row = layout.row(align=True)
-			if ima.type == "COMPOSITE":
-				row.itemO("image.record_composite", icon="ICON_REC")
-			if ima.type == "COMPOSITE" and ima.source in ("MOVIE", "SEQUENCE"):
-				row.itemO("image.play_composite", icon="ICON_PLAY")
+			if ima.type == 'COMPOSITE':
+				row.itemO("image.record_composite", icon='ICON_REC')
+			if ima.type == 'COMPOSITE' and ima.source in ('MOVIE', 'SEQUENCE'):
+				row.itemO("image.play_composite", icon='ICON_PLAY')
 		
 		if show_uvedit or sima.image_painting:
 			layout.itemR(sima, "update_automatically", text="")
 
 class IMAGE_PT_game_properties(bpy.types.Panel):
-	__space_type__ = "IMAGE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'IMAGE_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Game Properties"
 
 	def poll(self, context):
@@ -315,8 +315,8 @@ class IMAGE_PT_game_properties(bpy.types.Panel):
 			subrow.active = ima.tiles or ima.animated
 
 class IMAGE_PT_view_properties(bpy.types.Panel):
-	__space_type__ = "IMAGE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'IMAGE_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "View Properties"
 
 	def poll(self, context):
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 83eb2c75a2c..4188209e393 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -2,7 +2,7 @@
 import bpy
 
 class INFO_HT_header(bpy.types.Header):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 
 	def draw(self, context):
 		layout = self.layout
@@ -38,7 +38,7 @@ class INFO_HT_header(bpy.types.Header):
 		layout.itemL(text=scene.statistics())
 			
 class INFO_MT_file(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "File"
 
 	def draw(self, context):
@@ -74,14 +74,14 @@ class INFO_MT_file(bpy.types.Menu):
 		layout.itemO("wm.exit_blender", text="Quit")
 
 class INFO_MT_file_import(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Import"
 
 	def draw(self, context):
 		layout = self.layout
 
 class INFO_MT_file_export(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Export"
 
 	def draw(self, context):
@@ -90,7 +90,7 @@ class INFO_MT_file_export(bpy.types.Menu):
 		layout.itemO("export.ply", text="PLY")
 
 class INFO_MT_file_external_data(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "External Data"
 
 	def draw(self, context):
@@ -107,7 +107,7 @@ class INFO_MT_file_external_data(bpy.types.Menu):
 		layout.itemO("file.find_missing_files")
 
 class INFO_MT_add(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Add"
 
 	def draw(self, context):
@@ -133,7 +133,7 @@ class INFO_MT_add(bpy.types.Menu):
 		layout.item_enumO("object.object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
 
 class INFO_MT_game(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Game"
 
 	def draw(self, context):
@@ -151,7 +151,7 @@ class INFO_MT_game(bpy.types.Menu):
 		layout.itemR(gs, "deprecation_warnings")
 
 class INFO_MT_render(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Render"
 
 	def draw(self, context):
@@ -167,7 +167,7 @@ class INFO_MT_render(bpy.types.Menu):
 		layout.itemO("screen.render_view_show")
 
 class INFO_MT_help(bpy.types.Menu):
-	__space_type__ = "INFO"
+	__space_type__ = 'INFO'
 	__label__ = "Help"
 
 	def draw(self, context):
diff --git a/release/ui/space_logic.py b/release/ui/space_logic.py
index 728e5e6307b..68ddceb8534 100644
--- a/release/ui/space_logic.py
+++ b/release/ui/space_logic.py
@@ -1,8 +1,8 @@
 import bpy
 
 class LOGIC_PT_properties(bpy.types.Panel):
-	__space_type__ = "LOGIC_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'LOGIC_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Properties"
 
 	def poll(self, context):
diff --git a/release/ui/space_node.py b/release/ui/space_node.py
index fd5dd9e6ee7..875aca7fd82 100644
--- a/release/ui/space_node.py
+++ b/release/ui/space_node.py
@@ -2,7 +2,7 @@
 import bpy
 
 class NODE_HT_header(bpy.types.Header):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 
 	def draw(self, context):
 		layout = self.layout
@@ -47,7 +47,7 @@ class NODE_HT_header(bpy.types.Header):
 			layout.itemR(snode, "backdrop")
 
 class NODE_MT_view(bpy.types.Menu):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -65,7 +65,7 @@ class NODE_MT_view(bpy.types.Menu):
 		layout.itemO("screen.screen_full_area")
 
 class NODE_MT_select(bpy.types.Menu):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -80,7 +80,7 @@ class NODE_MT_select(bpy.types.Menu):
 		# layout.itemO("node.select_linked_to")
 
 class NODE_MT_node(bpy.types.Menu):
-	__space_type__ = "NODE_EDITOR"
+	__space_type__ = 'NODE_EDITOR'
 	__label__ = "Node"
 
 	def draw(self, context):
diff --git a/release/ui/space_outliner.py b/release/ui/space_outliner.py
index f55f4633a7b..522b620e29d 100644
--- a/release/ui/space_outliner.py
+++ b/release/ui/space_outliner.py
@@ -2,7 +2,7 @@
 import bpy
 
 class OUTLINER_HT_header(bpy.types.Header):
-	__space_type__ = "OUTLINER"
+	__space_type__ = 'OUTLINER'
 
 	def draw(self, context):
 		so = context.space_data
@@ -36,7 +36,7 @@ class OUTLINER_HT_header(bpy.types.Header):
 		
 
 class OUTLINER_MT_view(bpy.types.Menu):
-	__space_type__ = "OUTLINER"
+	__space_type__ = 'OUTLINER'
 	__label__ = "View"
 
 	def draw(self, context):
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 1edcf32d3b5..1498c37d761 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -7,7 +7,7 @@ def act_strip(context):
 
 # Header
 class SEQUENCER_HT_header(bpy.types.Header):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 
 	def draw(self, context):
 		layout = self.layout
@@ -38,7 +38,7 @@ class SEQUENCER_HT_header(bpy.types.Header):
 			layout.itemR(st, "display_channel", text="Channel")
 
 class SEQUENCER_MT_view(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "View"
 	
 	def draw(self, context):
@@ -106,7 +106,7 @@ class SEQUENCER_MT_view(bpy.types.Menu):
 		"""
 
 class SEQUENCER_MT_select(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -127,7 +127,7 @@ class SEQUENCER_MT_select(bpy.types.Menu):
 		layout.itemO("sequencer.select_inverse")
 
 class SEQUENCER_MT_marker(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Marker (TODO)"
 
 	def draw(self, context):
@@ -146,7 +146,7 @@ class SEQUENCER_MT_marker(bpy.types.Menu):
 		#layout.itemO("sequencer.sound_strip_add", text="Transform Markers") # toggle, will be rna - (sseq->flag & SEQ_MARKER_TRANS)
 
 class SEQUENCER_MT_add(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Add"
 
 	def draw(self, context):
@@ -163,7 +163,7 @@ class SEQUENCER_MT_add(bpy.types.Menu):
 		layout.itemM("SEQUENCER_MT_add_effect")
 
 class SEQUENCER_MT_add_effect(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Effect Strip..."
 
 	def draw(self, context):
@@ -187,7 +187,7 @@ class SEQUENCER_MT_add_effect(bpy.types.Menu):
 		layout.item_enumO("sequencer.effect_strip_add", 'type', 'SPEED')
 
 class SEQUENCER_MT_strip(bpy.types.Menu):
-	__space_type__ = "SEQUENCE_EDITOR"
+	__space_type__ = 'SEQUENCE_EDITOR'
 	__label__ = "Strip"
 
 	def draw(self, context):
@@ -254,15 +254,15 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
 
 # Panels
 class SequencerButtonsPanel(bpy.types.Panel):
-	__space_type__ = "SEQUENCE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'SEQUENCE_EDITOR'
+	__region_type__ = 'UI'
 
 	def poll(self, context):
 		return context.space_data.display_mode == 'SEQUENCER' and act_strip(context) != None
 		
 class SequencerButtonsPanel_Output(bpy.types.Panel):
-	__space_type__ = "SEQUENCE_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'SEQUENCE_EDITOR'
+	__region_type__ = 'UI'
 
 	def poll(self, context):
 		return context.space_data.display_mode != 'SEQUENCER'
diff --git a/release/ui/space_text.py b/release/ui/space_text.py
index 61e8d3489a5..7b7ec176b72 100644
--- a/release/ui/space_text.py
+++ b/release/ui/space_text.py
@@ -2,7 +2,7 @@
 import bpy
 
 class TEXT_HT_header(bpy.types.Header):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 
 	def draw(self, context):
 		st = context.space_data
@@ -45,8 +45,8 @@ class TEXT_HT_header(bpy.types.Header):
 					row.itemL(text="Text: Internal")
 
 class TEXT_PT_properties(bpy.types.Panel):
-	__space_type__ = "TEXT_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'TEXT_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Properties"
 
 	def draw(self, context):
@@ -64,8 +64,8 @@ class TEXT_PT_properties(bpy.types.Panel):
 		flow.itemR(st, "tab_width")
 
 class TEXT_PT_find(bpy.types.Panel):
-	__space_type__ = "TEXT_EDITOR"
-	__region_type__ = "UI"
+	__space_type__ = 'TEXT_EDITOR'
+	__region_type__ = 'UI'
 	__label__ = "Find"
 
 	def draw(self, context):
@@ -95,7 +95,7 @@ class TEXT_PT_find(bpy.types.Panel):
 		row.itemR(st, "find_all", text="All")
 
 class TEXT_MT_text(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Text"
 
 	def draw(self, context):
@@ -127,7 +127,7 @@ class TEXT_MT_text(bpy.types.Menu):
 
 		layout.itemS()
 
-		layout.itemO("text.properties", icon="ICON_MENU_PANEL")
+		layout.itemO("text.properties", icon='ICON_MENU_PANEL')
 		
 		#ifndef DISABLE_PYTHON
 		# XXX layout.column()
@@ -136,7 +136,7 @@ class TEXT_MT_text(bpy.types.Menu):
 		#endif
 
 class TEXT_MT_edit_view(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -146,7 +146,7 @@ class TEXT_MT_edit_view(bpy.types.Menu):
 		layout.item_enumO("text.move", "type", 'FILE_BOTTOM', text="Bottom of File")
 
 class TEXT_MT_edit_select(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -156,7 +156,7 @@ class TEXT_MT_edit_select(bpy.types.Menu):
 		layout.itemO("text.select_line")
 
 class TEXT_MT_edit_markers(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Markers"
 
 	def draw(self, context):
@@ -167,7 +167,7 @@ class TEXT_MT_edit_markers(bpy.types.Menu):
 		layout.itemO("text.previous_marker")
 
 class TEXT_MT_format(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Format"
 
 	def draw(self, context):
@@ -186,7 +186,7 @@ class TEXT_MT_format(bpy.types.Menu):
 		layout.item_menu_enumO("text.convert_whitespace", "type")
 
 class TEXT_MT_edit_to3d(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Text To 3D Object"
 
 	def draw(self, context):
@@ -196,7 +196,7 @@ class TEXT_MT_edit_to3d(bpy.types.Menu):
 		layout.item_booleanO("text.to_3d_object", "split_lines", True, text="One Object Per Line");
 
 class TEXT_MT_edit(bpy.types.Menu):
-	__space_type__ = "TEXT_EDITOR"
+	__space_type__ = 'TEXT_EDITOR'
 	__label__ = "Edit"
 
 	def poll(self, context):
diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 17deb4c550f..bfa4d5b6485 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -2,7 +2,7 @@
 import bpy
 
 class TIME_HT_header(bpy.types.Header):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 
 	def draw(self, context):
 		layout = self.layout
@@ -64,11 +64,11 @@ class TIME_HT_header(bpy.types.Header):
 		
 		row = layout.row(align=True)
 		row.item_pointerR(scene, "active_keying_set", scene, "keying_sets", text="")
-		row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")
-		row.itemO("anim.delete_keyframe", text="", icon="ICON_KEY_DEHLT")
+		row.itemO("anim.insert_keyframe", text="", icon='ICON_KEY_HLT')
+		row.itemO("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT')
 
 class TIME_MT_view(bpy.types.Menu):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 	__label__ = "View"
 
 	def draw(self, context):
@@ -83,7 +83,7 @@ class TIME_MT_view(bpy.types.Menu):
 		layout.itemR(st, "only_selected")
 
 class TIME_MT_frame(bpy.types.Menu):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 	__label__ = "Frame"
 
 	def draw(self, context):
@@ -101,7 +101,7 @@ class TIME_MT_frame(bpy.types.Menu):
 		layout.itemO("time.end_frame_set")
 
 class TIME_MT_playback(bpy.types.Menu):
-	__space_type__ = "TIMELINE"
+	__space_type__ = 'TIMELINE'
 	__label__ = "Playback"
 
 	def draw(self, context):
diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
index bd963c65cd0..acd3d3eb44b 100644
--- a/release/ui/space_userpref.py
+++ b/release/ui/space_userpref.py
@@ -2,21 +2,21 @@
 import bpy
 
 class USERPREF_HT_header(bpy.types.Header):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 
 	def draw(self, context):
 		layout = self.layout
 		layout.template_header(menus=False)
 			
 class USERPREF_MT_view(bpy.types.Menu):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "View"
 
 	def draw(self, context):
 		layout = self.layout
 
 class USERPREF_PT_tabs(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__show_header__ = False
 
 	def draw(self, context):
@@ -27,7 +27,7 @@ class USERPREF_PT_tabs(bpy.types.Panel):
 		layout.itemR(userpref, "active_section", expand=True)
 
 class USERPREF_PT_view(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "View"
 	__show_header__ = False
 
@@ -130,7 +130,7 @@ class USERPREF_PT_view(bpy.types.Panel):
 		sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
 
 class USERPREF_PT_edit(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "Edit"
 	__show_header__ = False
 
@@ -227,7 +227,7 @@ class USERPREF_PT_edit(bpy.types.Panel):
 		sub1.itemR(edit, "duplicate_action", text="Action")
 		
 class USERPREF_PT_system(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "System"
 	__show_header__ = False
 
@@ -308,7 +308,7 @@ class USERPREF_PT_system(bpy.types.Panel):
 		sub1.itemR(system, "texture_collection_rate", text="Collection Rate")		
 		
 class USERPREF_PT_filepaths(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "File Paths"
 	__show_header__ = False
 
@@ -370,7 +370,7 @@ class USERPREF_PT_filepaths(bpy.types.Panel):
 		sub3.itemR(paths, "auto_save_time")
 
 class USERPREF_PT_language(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = "Language"
 	__show_header__ = False
 
@@ -394,7 +394,7 @@ class USERPREF_PT_language(bpy.types.Panel):
 		col.itemR(lan, "use_textured_fonts")
 		
 class USERPREF_PT_bottombar(bpy.types.Panel):
-	__space_type__ = "USER_PREFERENCES"
+	__space_type__ = 'USER_PREFERENCES'
 	__label__ = " "
 	__show_header__ = False
 
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index f9e185f44f2..8f37b34e3b4 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -4,7 +4,7 @@ import bpy
 # ********** Header **********
 
 class VIEW3D_HT_header(bpy.types.Header):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 
 	def draw(self, context):
 		layout = self.layout
@@ -47,14 +47,14 @@ class VIEW3D_HT_header(bpy.types.Header):
 # ********** View menus **********
 
 class VIEW3D_MT_view(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "View"
 
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.properties", icon="ICON_MENU_PANEL")
-		layout.itemO("view3d.toolbar", icon="ICON_MENU_PANEL")
+		layout.itemO("view3d.properties", icon='ICON_MENU_PANEL')
+		layout.itemO("view3d.toolbar", icon='ICON_MENU_PANEL')
 		
 		layout.itemS()
 		
@@ -101,7 +101,7 @@ class VIEW3D_MT_view(bpy.types.Menu):
 		layout.itemO("screen.screen_full_area", text="Toggle Full Screen")
 		
 class VIEW3D_MT_view_navigation(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Navigation"
 
 	def draw(self, context):
@@ -124,7 +124,7 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu):
 # ********** Select menus, suffix from context.mode **********
 
 class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -142,7 +142,7 @@ class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
 		layout.itemO("object.select_grouped", text="Select Grouped")
 
 class VIEW3D_MT_select_POSE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -172,7 +172,7 @@ class VIEW3D_MT_select_POSE(bpy.types.Menu):
 		props.direction = 'CHILD'
 
 class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -194,7 +194,7 @@ class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
 		layout.itemO("particle.select_less")
 
 class VIEW3D_MT_select_EDIT_MESH(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -238,7 +238,7 @@ class VIEW3D_MT_select_EDIT_MESH(bpy.types.Menu):
 		layout.itemO("mesh.region_to_loop")
 
 class VIEW3D_MT_select_EDIT_CURVE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -267,7 +267,7 @@ class VIEW3D_MT_select_EDIT_CURVE(bpy.types.Menu):
 		layout.itemO("curve.select_less")
 
 class VIEW3D_MT_select_EDIT_SURFACE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -293,7 +293,7 @@ class VIEW3D_MT_select_EDIT_SURFACE(bpy.types.Menu):
 		layout.itemO("curve.select_less")
 
 class VIEW3D_MT_select_EDIT_METABALL(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -311,7 +311,7 @@ class VIEW3D_MT_select_EDIT_METABALL(bpy.types.Menu):
 		layout.itemL(text="Random")
 
 class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -324,7 +324,7 @@ class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
 		layout.itemO("lattice.select_all_toggle", text="Select/Deselect All")
 
 class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -353,7 +353,7 @@ class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
 		props.direction = 'CHILD'
 
 class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Select"
 
 	def draw(self, context):
@@ -364,7 +364,7 @@ class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
 # ********** Object menu **********
 
 class VIEW3D_MT_object(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__context__ = "objectmode"
 	__label__ = "Object"
 
@@ -402,7 +402,7 @@ class VIEW3D_MT_object(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_object_show")
 		
 class VIEW3D_MT_object_clear(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Clear"
 
 	def draw(self, context):
@@ -414,7 +414,7 @@ class VIEW3D_MT_object_clear(bpy.types.Menu):
 		layout.itemO("object.origin_clear")
 		
 class VIEW3D_MT_object_snap(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Snap"
 
 	def draw(self, context):
@@ -431,7 +431,7 @@ class VIEW3D_MT_object_snap(bpy.types.Menu):
 		layout.itemO("view3d.snap_cursor_to_active")
 		
 class VIEW3D_MT_object_parent(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Parent"
 
 	def draw(self, context):
@@ -441,7 +441,7 @@ class VIEW3D_MT_object_parent(bpy.types.Menu):
 		layout.itemO("object.parent_clear")
 		
 class VIEW3D_MT_object_track(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Track"
 
 	def draw(self, context):
@@ -451,7 +451,7 @@ class VIEW3D_MT_object_track(bpy.types.Menu):
 		layout.itemO("object.track_clear")
 		
 class VIEW3D_MT_object_group(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Group"
 
 	def draw(self, context):
@@ -466,7 +466,7 @@ class VIEW3D_MT_object_group(bpy.types.Menu):
 		layout.itemO("group.objects_remove_active")
 		
 class VIEW3D_MT_object_constraints(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Constraints"
 
 	def draw(self, context):
@@ -476,7 +476,7 @@ class VIEW3D_MT_object_constraints(bpy.types.Menu):
 		layout.itemO("object.constraints_clear")
 		
 class VIEW3D_MT_object_show(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -489,7 +489,7 @@ class VIEW3D_MT_object_show(bpy.types.Menu):
 # ********** Vertex paint menu **********	
 	
 class VIEW3D_MT_vertex_paint(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Paint"
 
 	def draw(self, context):
@@ -504,7 +504,7 @@ class VIEW3D_MT_vertex_paint(bpy.types.Menu):
 # ********** Sculpt menu **********	
 	
 class VIEW3D_MT_sculpt(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Sculpt"
 
 	def draw(self, context):
@@ -540,7 +540,7 @@ class VIEW3D_MT_sculpt(bpy.types.Menu):
 # ********** Edit Menus, suffix from ob.type **********
 
 class VIEW3D_MT_edit_snap(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Snap"
 
 	def draw(self, context):
@@ -558,7 +558,7 @@ class VIEW3D_MT_edit_snap(bpy.types.Menu):
 
 # Edit MESH
 class VIEW3D_MT_edit_MESH(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Mesh"
 
 	def draw(self, context):
@@ -601,7 +601,7 @@ class VIEW3D_MT_edit_MESH(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_MESH_showhide")
 
 class VIEW3D_MT_edit_MESH_vertices(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Vertices"
 
 	def draw(self, context):
@@ -618,7 +618,7 @@ class VIEW3D_MT_edit_MESH_vertices(bpy.types.Menu):
 		layout.itemO("mesh.remove_doubles")
 		
 class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Edges"
 
 	def draw(self, context):
@@ -644,7 +644,7 @@ class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
 		layout.item_enumO("mesh.edge_rotate", "direction", 'CCW', text="Rotate Edge CCW")
 		
 class VIEW3D_MT_edit_MESH_faces(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Faces"
 
 	def draw(self, context):
@@ -666,7 +666,7 @@ class VIEW3D_MT_edit_MESH_faces(bpy.types.Menu):
 		layout.itemO("mesh.faces_shade_flat")
 
 class VIEW3D_MT_edit_MESH_normals(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Normals"
 
 	def draw(self, context):
@@ -680,7 +680,7 @@ class VIEW3D_MT_edit_MESH_normals(bpy.types.Menu):
 		layout.itemO("mesh.flip_normals")
 		
 class VIEW3D_MT_edit_MESH_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -724,13 +724,13 @@ def draw_CURVE(self, context):
 	layout.itemM("VIEW3D_MT_edit_CURVE_showhide")
 
 class VIEW3D_MT_edit_CURVE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Curve"
 
 	draw = draw_CURVE
 	
 class VIEW3D_MT_edit_CURVE_ctrlpoints(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Control Points"
 
 	def draw(self, context):
@@ -748,7 +748,7 @@ class VIEW3D_MT_edit_CURVE_ctrlpoints(bpy.types.Menu):
 			layout.item_menu_enumO("curve.handle_type_set", "type")
 		
 class VIEW3D_MT_edit_CURVE_segments(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Segments"
 
 	def draw(self, context):
@@ -758,7 +758,7 @@ class VIEW3D_MT_edit_CURVE_segments(bpy.types.Menu):
 		layout.itemO("curve.switch_direction")
 
 class VIEW3D_MT_edit_CURVE_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -770,14 +770,14 @@ class VIEW3D_MT_edit_CURVE_showhide(bpy.types.Menu):
 
 # Edit SURFACE
 class VIEW3D_MT_edit_SURFACE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Surface"
 
 	draw = draw_CURVE
 
 # Edit TEXT
 class VIEW3D_MT_edit_TEXT(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Text"
 
 	def draw(self, context):
@@ -790,7 +790,7 @@ class VIEW3D_MT_edit_TEXT(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_TEXT_chars")
 
 class VIEW3D_MT_edit_TEXT_chars(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Special Characters"
 
 	def draw(self, context):
@@ -825,7 +825,7 @@ class VIEW3D_MT_edit_TEXT_chars(bpy.types.Menu):
 
 # Edit META
 class VIEW3D_MT_edit_META(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Metaball"
 
 	def draw(self, context):
@@ -855,7 +855,7 @@ class VIEW3D_MT_edit_META(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_META_showhide")
 
 class VIEW3D_MT_edit_META_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
@@ -867,7 +867,7 @@ class VIEW3D_MT_edit_META_showhide(bpy.types.Menu):
 
 # Edit LATTICE
 class VIEW3D_MT_edit_LATTICE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Lattice"
 
 	def draw(self, context):
@@ -888,7 +888,7 @@ class VIEW3D_MT_edit_LATTICE(bpy.types.Menu):
 
 # Edit ARMATURE
 class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Armature"
 
 	def draw(self, context):
@@ -944,7 +944,7 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 		layout.item_menu_enumO("armature.flags_set", "mode", text="Bone Settings")
 
 class VIEW3D_MT_edit_ARMATURE_parent(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Parent"
 
 	def draw(self, context):
@@ -954,7 +954,7 @@ class VIEW3D_MT_edit_ARMATURE_parent(bpy.types.Menu):
 		layout.itemO("armature.parent_clear")
 
 class VIEW3D_MT_edit_ARMATURE_roll(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Bone Roll"
 
 	def draw(self, context):
@@ -970,8 +970,8 @@ class VIEW3D_MT_edit_ARMATURE_roll(bpy.types.Menu):
 # ********** Panel **********
 
 class VIEW3D_PT_3dview_properties(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "UI"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
 	__label__ = "View"
 
 	def poll(self, context):
@@ -1002,8 +1002,8 @@ class VIEW3D_PT_3dview_properties(bpy.types.Panel):
 		layout.column().itemR(scene, "cursor_location", text="3D Cursor:")
 		
 class VIEW3D_PT_3dview_display(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "UI"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
 	__label__ = "Display"
 
 	def poll(self, context):
@@ -1034,8 +1034,8 @@ class VIEW3D_PT_3dview_display(bpy.types.Panel):
 		col.itemR(view, "box_clip")
 	
 class VIEW3D_PT_background_image(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "UI"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
 	__label__ = "Background Image"
 	__default_closed__ = True
 
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 254fb3fd560..bbca43279a7 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -2,8 +2,8 @@
 import bpy
 
 class View3DPanel(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "TOOLS"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'TOOLS'
 
 # ********** default tools for objectmode ****************
 
@@ -262,8 +262,8 @@ class VIEW3D_PT_tools_posemode(View3DPanel):
 # ********** default tools for paint modes ****************
 
 class PaintPanel(bpy.types.Panel):
-	__space_type__ = "VIEW_3D"
-	__region_type__ = "TOOLS"
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'TOOLS'
 
 	def paint_settings(self, context):
 		ts = context.tool_settings

From 2aa2512a43781f6ac8937c152398e9de731aef07 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sat, 22 Aug 2009 09:21:08 +0000
Subject: [PATCH 204/577] Tiny User Prefs tweaks. Also put the Save As Default
 button in header so it stays put.

---
 release/ui/space_userpref.py | 40 +++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
index acd3d3eb44b..82ed857c7ea 100644
--- a/release/ui/space_userpref.py
+++ b/release/ui/space_userpref.py
@@ -7,6 +7,11 @@ class USERPREF_HT_header(bpy.types.Header):
 	def draw(self, context):
 		layout = self.layout
 		layout.template_header(menus=False)
+		
+		userpref = context.user_preferences
+	
+		layout.operator_context = "EXEC_AREA"
+		layout.itemO("wm.save_homefile", text="Save As Default")
 			
 class USERPREF_MT_view(bpy.types.Menu):
 	__space_type__ = 'USER_PREFERENCES'
@@ -59,11 +64,11 @@ class USERPREF_PT_view(bpy.types.Panel):
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemS()
-		sub1.itemR(view, "show_mini_axis")
+		sub1.itemR(view, "show_mini_axis", text="Display Mini Axis")
 		sub2 = sub1.column()
 		sub2.enabled = view.show_mini_axis
-		sub2.itemR(view, "mini_axis_size")
-		sub2.itemR(view, "mini_axis_brightness")
+		sub2.itemR(view, "mini_axis_size", text="Size")
+		sub2.itemR(view, "mini_axis_brightness", text="Brightness")
 		
 		col = split.column()
 		sub = col.split(percentage=0.85)
@@ -360,6 +365,8 @@ class USERPREF_PT_filepaths(bpy.types.Panel):
 		sub2.itemR(paths, "use_relative_paths")
 		sub2.itemR(paths, "compress_file")
 		sub2.itemR(paths, "load_ui")
+		sub2.itemS()
+		sub2.itemS()
 		sub2.itemL(text="Auto Save:")
 		sub2.itemR(paths, "save_version")
 		sub2.itemR(paths, "recent_files")
@@ -367,7 +374,7 @@ class USERPREF_PT_filepaths(bpy.types.Panel):
 		sub2.itemR(paths, "auto_save_temporary_files")
 		sub3 = sub2.column()
 		sub3.enabled = paths.auto_save_temporary_files
-		sub3.itemR(paths, "auto_save_time")
+		sub3.itemR(paths, "auto_save_time", text="Timer (mins)")
 
 class USERPREF_PT_language(bpy.types.Panel):
 	__space_type__ = 'USER_PREFERENCES'
@@ -388,24 +395,16 @@ class USERPREF_PT_language(bpy.types.Panel):
 		col = split.column()
 		
 		col.itemR(lan, "language")
-		col.itemR(lan, "translate_tooltips")
-		col.itemR(lan, "translate_buttons")
-		col.itemR(lan, "translate_toolbox")
+		col.itemL(text="Translate:")
+		col.itemR(lan, "translate_tooltips", text="Tooltips")
+		col.itemR(lan, "translate_buttons", text="Labels")
+		col.itemR(lan, "translate_toolbox", text="Toolbox")
+		col.itemS()
+		col.itemS()
 		col.itemR(lan, "use_textured_fonts")
 		
-class USERPREF_PT_bottombar(bpy.types.Panel):
-	__space_type__ = 'USER_PREFERENCES'
-	__label__ = " "
-	__show_header__ = False
-
-	def draw(self, context):
-		layout = self.layout
-		userpref = context.user_preferences
-	
-		split = layout.split(percentage=0.8)
-		split.itemL(text="")
-		layout.operator_context = "EXEC_AREA"
-		split.itemO("wm.save_homefile", text="Save As Default")
+		col = split.column()
+		
 
 bpy.types.register(USERPREF_HT_header)
 bpy.types.register(USERPREF_MT_view)
@@ -415,5 +414,4 @@ bpy.types.register(USERPREF_PT_edit)
 bpy.types.register(USERPREF_PT_system)
 bpy.types.register(USERPREF_PT_filepaths)
 bpy.types.register(USERPREF_PT_language)
-bpy.types.register(USERPREF_PT_bottombar)
 

From a4f3f5c23c4201bc885310aa17226d2ee3922a2a Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 10:51:21 +0000
Subject: [PATCH 205/577] - BGE, Some sensors, stored the event manager in 2
 places (became confusing to do changes in this area) - Change compiler
 warnings for linux/scons/C++

---
 config/linux2-config.py                       |  3 +-
 .../GameLogic/SCA_JoystickSensor.cpp          | 33 +++++++++----------
 .../gameengine/GameLogic/SCA_JoystickSensor.h |  1 -
 .../gameengine/GameLogic/SCA_MouseSensor.cpp  |  5 ++-
 source/gameengine/GameLogic/SCA_MouseSensor.h |  1 -
 .../KXNetwork/KX_NetworkMessageSensor.cpp     |  1 -
 .../KXNetwork/KX_NetworkMessageSensor.h       |  1 -
 source/gameengine/Ketsji/KX_TouchSensor.cpp   |  3 +-
 source/gameengine/Ketsji/KX_TouchSensor.h     |  1 -
 9 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/config/linux2-config.py b/config/linux2-config.py
index b0ff0b89d3d..3e84070fabb 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -190,8 +190,9 @@ REL_CCFLAGS = ['-O2']
 ##ARFLAGSQUIET = ru
 ##
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
-
 CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
 
 ##FIX_STUBS_WARNINGS = -Wno-unused
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 336529667d7..81aa3020f49 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -49,7 +49,6 @@ SCA_JoystickSensor::SCA_JoystickSensor(class SCA_JoystickManager* eventmgr,
 									   int hat, int hatf, bool allevents,
 									   PyTypeObject* T )
 									   :SCA_ISensor(gameobj,eventmgr,T),
-									   m_pJoystickMgr(eventmgr),
 									   m_axis(axis),
 									   m_axisf(axisf),
 									   m_button(button),
@@ -104,7 +103,7 @@ bool SCA_JoystickSensor::IsPositiveTrigger()
 
 bool SCA_JoystickSensor::Evaluate()
 {
-	SCA_Joystick *js = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *js = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	bool result = false;
 	bool reset = m_reset && m_level;
 	
@@ -404,7 +403,7 @@ const char SCA_JoystickSensor::GetAxisValue_doc[] =
 "\tReturns a list of the values for the current state of each axis.\n";
 PyObject* SCA_JoystickSensor::PyGetAxisValue( ) {
 	ShowDeprecationWarning("getAxisValue()", "the axisPosition property");
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	
 	int axis_index= joy->GetNumberOfAxes();
 	PyObject *list= PyList_New(axis_index);
@@ -479,7 +478,7 @@ const char SCA_JoystickSensor::GetButtonActiveList_doc[] =
 "getButtonActiveList\n"
 "\tReturns a list containing the indicies of the button currently pressed.\n";
 PyObject* SCA_JoystickSensor::PyGetButtonActiveList( ) {
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	PyObject *ls = PyList_New(0);
 	PyObject *value;
 	int i;
@@ -501,7 +500,7 @@ const char SCA_JoystickSensor::GetButtonStatus_doc[] =
 "getButtonStatus(buttonIndex)\n"
 "\tReturns a bool of the current pressed state of the specified button.\n";
 PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args ) {
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	int index;
 	
 	if(!PyArg_ParseTuple(args, "i:getButtonStatus", &index)){
@@ -547,7 +546,7 @@ const char SCA_JoystickSensor::NumberOfAxes_doc[] =
 "\tReturns the number of axes .\n";
 PyObject* SCA_JoystickSensor::PyNumberOfAxes( ) {
 	ShowDeprecationWarning("getNumAxes()", "the numAxis property");
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	// when the joystick is null their is 0 exis still. dumb but scripters should use isConnected()
 	return PyInt_FromLong( joy ? joy->GetNumberOfAxes() : 0 );
 }
@@ -558,7 +557,7 @@ const char SCA_JoystickSensor::NumberOfButtons_doc[] =
 "\tReturns the number of buttons .\n";
 PyObject* SCA_JoystickSensor::PyNumberOfButtons( ) {
 	ShowDeprecationWarning("getNumButtons()", "the numButtons property");
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	return PyInt_FromLong( joy ? joy->GetNumberOfButtons() : 0 );
 }
 
@@ -568,7 +567,7 @@ const char SCA_JoystickSensor::NumberOfHats_doc[] =
 "\tReturns the number of hats .\n";
 PyObject* SCA_JoystickSensor::PyNumberOfHats( ) {
 	ShowDeprecationWarning("getNumHats()", "the numHats property");
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	return PyInt_FromLong( joy ? joy->GetNumberOfHats() : 0 );
 }
 
@@ -577,7 +576,7 @@ const char SCA_JoystickSensor::Connected_doc[] =
 "\tReturns True if a joystick is connected at this joysticks index.\n";
 PyObject* SCA_JoystickSensor::PyConnected( ) {
 	ShowDeprecationWarning("getConnected()", "the connected property");
-	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
 	return PyBool_FromLong( joy ? joy->Connected() : 0 );
 }
 
@@ -585,7 +584,7 @@ PyObject* SCA_JoystickSensor::PyConnected( ) {
 PyObject* SCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	
 	int axis_index= joy->GetNumberOfAxes();
 	PyObject *list= PyList_New(axis_index);
@@ -600,7 +599,7 @@ PyObject* SCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const KX_PYAT
 PyObject* SCA_JoystickSensor::pyattr_get_axis_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	
 	if(self->m_joymode != KX_JOYSENSORMODE_AXIS_SINGLE) {
 		PyErr_SetString(PyExc_TypeError, "val = sensor.axisSingle: Joystick Sensor, not 'Single Axis' type");
@@ -613,7 +612,7 @@ PyObject* SCA_JoystickSensor::pyattr_get_axis_single(void *self_v, const KX_PYAT
 PyObject* SCA_JoystickSensor::pyattr_get_hat_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	
 	int hat_index= joy->GetNumberOfHats();
 	PyObject *list= PyList_New(hat_index);
@@ -628,7 +627,7 @@ PyObject* SCA_JoystickSensor::pyattr_get_hat_values(void *self_v, const KX_PYATT
 PyObject* SCA_JoystickSensor::pyattr_get_hat_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	
 	return PyInt_FromLong(joy->GetHat(self->m_hat-1));
 }
@@ -636,27 +635,27 @@ PyObject* SCA_JoystickSensor::pyattr_get_hat_single(void *self_v, const KX_PYATT
 PyObject* SCA_JoystickSensor::pyattr_get_num_axis(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	return PyInt_FromLong( joy ? joy->GetNumberOfAxes() : 0 );
 }
 
 PyObject* SCA_JoystickSensor::pyattr_get_num_buttons(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	return PyInt_FromLong( joy ? joy->GetNumberOfButtons() : 0 );
 }
 
 PyObject* SCA_JoystickSensor::pyattr_get_num_hats(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	return PyInt_FromLong( joy ? joy->GetNumberOfHats() : 0 );
 }
 
 PyObject* SCA_JoystickSensor::pyattr_get_connected(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
-	SCA_Joystick *joy = self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+	SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
 	return PyBool_FromLong( joy ? joy->Connected() : 0 );
 }
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index e6a1d2eef32..f5ff25c73dc 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -35,7 +35,6 @@
 class SCA_JoystickSensor :public SCA_ISensor
 {
 	Py_Header;
-	class SCA_JoystickManager*	m_pJoystickMgr;
 	
 	/**
 	 * Axis 1-JOYAXIS_MAX, MUST be followed by m_axisf
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
index c5e1c3c0441..1a0a3939d54 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
@@ -52,7 +52,6 @@ SCA_MouseSensor::SCA_MouseSensor(SCA_MouseManager* eventmgr,
 								 SCA_IObject* gameobj, 
 								 PyTypeObject* T)
     : SCA_ISensor(gameobj,eventmgr, T),
-	m_pMouseMgr(eventmgr),
 	m_x(startx),
 	m_y(starty)
 {
@@ -148,7 +147,7 @@ bool SCA_MouseSensor::Evaluate()
 {
 	bool result = false;
 	bool reset = m_reset && m_level;
-	SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice();
+	SCA_IInputDevice* mousedev = ((SCA_MouseManager *)m_eventmgr)->GetInputDevice();
 
 	m_reset = false;
 	switch (m_mousemode) {
@@ -283,7 +282,7 @@ KX_PYMETHODDEF_DOC_O(SCA_MouseSensor, getButtonStatus,
 			return NULL;
 		}
 		
-		SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice();
+		SCA_IInputDevice* mousedev = ((SCA_MouseManager *)m_eventmgr)->GetInputDevice();
 		const SCA_InputEvent& event = mousedev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) button);
 		return PyInt_FromLong(event.m_status);
 	}
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index 6d6302b514a..14d3ace5408 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -39,7 +39,6 @@
 class SCA_MouseSensor : public SCA_ISensor
 {
 	Py_Header;
-	class SCA_MouseManager*	m_pMouseMgr;
 	
 	/**
 	 * Use SCA_IInputDevice values to encode the mouse mode for now.
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index 8ddcd87b66f..014670dd76d 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -54,7 +54,6 @@ KX_NetworkMessageSensor::KX_NetworkMessageSensor(
 	PyTypeObject* T
 ) :
     SCA_ISensor(gameobj,eventmgr,T),
-    m_Networkeventmgr(eventmgr),
     m_NetworkScene(NetworkScene),
     m_subject(subject),
     m_frame_message_count (0),
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
index 53183f33826..dd207230e0c 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
@@ -39,7 +39,6 @@ class KX_NetworkMessageSensor : public SCA_ISensor
 {
 	// note: Py_Header MUST BE the first listed here
 	Py_Header;
-	KX_NetworkEventManager *m_Networkeventmgr;
 	NG_NetworkScene        *m_NetworkScene;
 
 	// The subject we filter on.
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index c06acd4a873..5b23a9d0e3e 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -101,8 +101,7 @@ KX_TouchSensor::KX_TouchSensor(SCA_EventManager* eventmgr,KX_GameObject* gameobj
 :SCA_ISensor(gameobj,eventmgr,T),
 m_touchedpropname(touchedpropname),
 m_bFindMaterial(bFindMaterial),
-m_bTouchPulse(bTouchPulse),
-m_eventmgr(eventmgr)
+m_bTouchPulse(bTouchPulse)
 /*m_sumoObj(sumoObj),*/
 {
 //	KX_TouchEventManager* touchmgr = (KX_TouchEventManager*) eventmgr;
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 476c63e89db..7ec8d1277aa 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -58,7 +58,6 @@ protected:
 	STR_String				m_touchedpropname;	
 	bool					m_bFindMaterial;
 	bool					m_bTouchPulse;		/* changes in the colliding objects trigger pulses */
-	class SCA_EventManager*	m_eventmgr;
 	
 	class PHY_IPhysicsController*	m_physCtrl;
 

From 580d38336481bcd9a149bd2e2dc9f0faaf872f49 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sat, 22 Aug 2009 11:51:26 +0000
Subject: [PATCH 206/577] Moved mesh display options to the 3D view n-key area,
 next to other display options. The DNA/RNA for these options should be
 changed to reflect this.

---
 release/ui/buttons_data_mesh.py | 31 -----------------------------
 release/ui/space_view3d.py      | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index c1311b32180..f91d706ead7 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -48,36 +48,6 @@ class DATA_PT_normals(DataButtonsPanel):
 		col.itemR(mesh, "vertex_normal_flip")
 		col.itemR(mesh, "double_sided")
 
-class DATA_PT_meshdraw(DataButtonsPanel):
-	__label__ = "Draw"
-
-	def draw(self, context):
-		layout = self.layout
-		
-		mesh = context.mesh
-		
-		layout.itemL(text="Edit Mode only, WIP")
-		
-		split = layout.split()
-		
-		col = split.column()
-		col.itemR(mesh, "draw_edges", text="Edges")
-		col.itemR(mesh, "draw_faces", text="Faces")
-		col.itemR(mesh, "draw_creases", text="Creases")
-		col.itemR(mesh, "draw_bevel_weights", text="Bevel Weights")
-		col.itemR(mesh, "draw_seams", text="Seams")
-		col.itemR(mesh, "draw_sharp", text="Sharp")
-		
-		col = split.column()
-		col.itemR(mesh, "draw_normals", text="Face Normals")
-		col.itemR(mesh, "draw_vertex_normals", text="Vertex Normals")
-		
-		col.itemS()
-		
-		col.itemR(mesh, "draw_edge_lenght")
-		col.itemR(mesh, "draw_edge_angle")
-		col.itemR(mesh, "draw_face_area")
-
 class DATA_PT_vertex_groups(DataButtonsPanel):
 	__label__ = "Vertex Groups"
 	
@@ -227,7 +197,6 @@ class DATA_PT_vertex_colors(DataButtonsPanel):
 
 bpy.types.register(DATA_PT_context_mesh)
 bpy.types.register(DATA_PT_normals)
-bpy.types.register(DATA_PT_meshdraw)
 bpy.types.register(DATA_PT_vertex_groups)
 bpy.types.register(DATA_PT_shape_keys)
 bpy.types.register(DATA_PT_uv_texture)
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 8f37b34e3b4..8e5bc100af1 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -1032,6 +1032,40 @@ class VIEW3D_PT_3dview_display(bpy.types.Panel):
 		col.itemR(view, "lock_rotation")
 		col.itemR(view, "box_preview")
 		col.itemR(view, "box_clip")
+
+class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
+	__label__ = "Mesh Display"
+
+	def poll(self, context):
+		editmesh = context.mode == 'EDIT_MESH'
+		return (editmesh)
+
+	def draw(self, context):
+		layout = self.layout
+
+		mesh = context.active_object.data
+		
+		col = layout.column()
+		col.itemL(text="Overlays:")
+		col.itemR(mesh, "draw_edges", text="Edges")
+		col.itemR(mesh, "draw_faces", text="Faces")
+		col.itemR(mesh, "draw_creases", text="Creases")
+		col.itemR(mesh, "draw_bevel_weights", text="Bevel Weights")
+		col.itemR(mesh, "draw_seams", text="Seams")
+		col.itemR(mesh, "draw_sharp", text="Sharp")
+		
+		col.itemS()
+		col.itemL(text="Normals:")
+		col.itemR(mesh, "draw_normals", text="Face")
+		col.itemR(mesh, "draw_vertex_normals", text="Vertex")
+		
+		col.itemS()
+		col.itemL(text="Numerics:")
+		col.itemR(mesh, "draw_edge_lenght")
+		col.itemR(mesh, "draw_edge_angle")
+		col.itemR(mesh, "draw_face_area")
 	
 class VIEW3D_PT_background_image(bpy.types.Panel):
 	__space_type__ = 'VIEW_3D'
@@ -1129,4 +1163,5 @@ bpy.types.register(VIEW3D_MT_edit_ARMATURE_roll)
 
 bpy.types.register(VIEW3D_PT_3dview_properties) # Panels
 bpy.types.register(VIEW3D_PT_3dview_display)
+bpy.types.register(VIEW3D_PT_3dview_meshdisplay)
 bpy.types.register(VIEW3D_PT_background_image)

From f08a4c9719ac3d745dfcbae3acc3ca48c38777ad Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 14:19:27 +0000
Subject: [PATCH 207/577] missed this in last commit. keyboard event manager
 was stored twice.

---
 .../gameengine/GameLogic/SCA_KeyboardSensor.cpp   | 15 +++++++--------
 source/gameengine/GameLogic/SCA_KeyboardSensor.h  |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index f8ee8ed8b41..a5581f0d987 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -51,7 +51,6 @@ SCA_KeyboardSensor::SCA_KeyboardSensor(SCA_KeyboardManager* keybdmgr,
 									   SCA_IObject* gameobj,
 									   PyTypeObject* T )
 	:SCA_ISensor(gameobj,keybdmgr,T),
-	 m_pKeyboardMgr(keybdmgr),
 	 m_hotkey(hotkey),
 	 m_qual(qual),
 	 m_qual2(qual2),
@@ -126,7 +125,7 @@ bool SCA_KeyboardSensor::Evaluate()
 	bool qual_change = false;
 	short int m_val_orig = m_val;
 	
-	SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
 	//  	cerr << "SCA_KeyboardSensor::Eval event, sensing for "<< m_hotkey << " at device " << inputdev << "\n";
 
 	/* See if we need to do logging: togPropState exists and is
@@ -361,7 +360,7 @@ void SCA_KeyboardSensor::AddToTargetProp(int keyIndex)
  */	
 bool SCA_KeyboardSensor::IsShifted(void)
 {
-	SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
 	
 	if ( (inputdev->GetEventValue(SCA_IInputDevice::KX_RIGHTSHIFTKEY).m_status 
 		  == SCA_InputEvent::KX_ACTIVE)
@@ -380,7 +379,7 @@ bool SCA_KeyboardSensor::IsShifted(void)
 
 void SCA_KeyboardSensor::LogKeystrokes(void) 
 {
-	SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
 	int num = inputdev->GetNumActiveEvents();
 
 	/* weird loop, this one... */
@@ -515,7 +514,7 @@ PyObject* SCA_KeyboardSensor::PyGetPressedKeys()
 {
 	ShowDeprecationWarning("getPressedKeys()", "events");
 
-	SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
 
 	int num = inputdev->GetNumJustEvents();
 	PyObject* resultlist = PyList_New(num);
@@ -556,7 +555,7 @@ PyObject* SCA_KeyboardSensor::PyGetCurrentlyPressedKeys()
 {
 	ShowDeprecationWarning("getCurrentlyPressedKeys()", "events");
 
-	SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
 
 	int num = inputdev->GetNumActiveEvents();
 	PyObject* resultlist = PyList_New(num);
@@ -605,7 +604,7 @@ KX_PYMETHODDEF_DOC_O(SCA_KeyboardSensor, getKeyStatus,
 		return NULL;
 	}
 	
-	SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
 	const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) keycode);
 	return PyInt_FromLong(inevent.m_status);
 }
@@ -691,7 +690,7 @@ PyObject* SCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBU
 {
 	SCA_KeyboardSensor* self= static_cast<SCA_KeyboardSensor*>(self_v);
 	
-	SCA_IInputDevice* inputdev = self->m_pKeyboardMgr->GetInputDevice();
+	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)self->m_eventmgr)->GetInputDevice();
 
 	PyObject* resultlist = PyList_New(0);
 	
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index 033225cd9be..13fcc21ab7b 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -43,8 +43,6 @@
 class SCA_KeyboardSensor : public SCA_ISensor
 {
 	Py_Header;
-	class SCA_KeyboardManager*	m_pKeyboardMgr;
-
 
 	/**
 	 * the key this sensor is sensing for

From 98e9ddbf5b2b9dcf8a6a2440126f928d4394a5f4 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sat, 22 Aug 2009 16:54:18 +0000
Subject: [PATCH 208/577] Bugfixing.

---
 intern/audaspace/jack/AUD_JackDevice.cpp   | 4 ----
 intern/audaspace/jack/AUD_JackDevice.h     | 3 ---
 source/blender/blenkernel/intern/blender.c | 3 +--
 source/blender/blenkernel/intern/sound.c   | 8 ++------
 source/creator/creator.c                   | 1 -
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/intern/audaspace/jack/AUD_JackDevice.cpp b/intern/audaspace/jack/AUD_JackDevice.cpp
index 1f2c6faa511..445e68e1a9a 100644
--- a/intern/audaspace/jack/AUD_JackDevice.cpp
+++ b/intern/audaspace/jack/AUD_JackDevice.cpp
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef WITH_JACK
-
 // AUD_XXX this is not realtime suitable!
 int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data)
 {
@@ -149,5 +147,3 @@ void AUD_JackDevice::playing(bool playing)
 {
 	// Do nothing.
 }
-
-#endif
diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h
index e6d332e1160..f0c887a2f43 100644
--- a/intern/audaspace/jack/AUD_JackDevice.h
+++ b/intern/audaspace/jack/AUD_JackDevice.h
@@ -26,7 +26,6 @@
 #ifndef AUD_JACKDEVICE
 #define AUD_JACKDEVICE
 
-#ifdef WITH_JACK
 
 #include "AUD_SoftwareDevice.h"
 class AUD_Buffer;
@@ -90,6 +89,4 @@ public:
 	virtual ~AUD_JackDevice();
 };
 
-#endif //WITH_JACK
-
 #endif //AUD_JACKDEVICE
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 746dc6c59cc..f261b020717 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -626,8 +626,7 @@ void BKE_write_undo(bContext *C, char *name)
 	}
 }
 
-/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation
- * Note, ALWAYS call sound_initialize_sounds after BKE_undo_step() */
+/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */
 void BKE_undo_step(bContext *C, int step)
 {
 	
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index a3275792a85..74ab41ff577 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -319,8 +319,6 @@ void sound_stop_all(struct bContext *C)
 	}
 }
 
-#define SOUND_PLAYBACK_LAMBDA 1.0
-
 void sound_update_playing(struct bContext *C)
 {
 	SoundHandle *handle;
@@ -366,12 +364,10 @@ void sound_update_playing(struct bContext *C)
 						action = 3;
 					else
 					{
-						float diff = AUD_getPosition(handle->handle) - (cfra - handle->startframe) / fps;
-// AUD_XXX						float diff = AUD_getPosition(handle->handle) * fps - cfra + handle->startframe
+						float diff = AUD_getPosition(handle->handle) * fps - cfra + handle->startframe;
 						if(diff < 0.0)
 							diff = -diff;
-						if(diff > SOUND_PLAYBACK_LAMBDA)
-// AUD_XXX						if(diff > 5.0f)
+						if(diff > 1.0f)
 						{
 							action = 2;
 						}
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 5ecd95ecc21..41b27b1c915 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -821,7 +821,6 @@ int main(int argc, char **argv)
 			
 			if (G.background) {
 				int retval = BKE_read_file(C, argv[a], NULL, NULL);
-// XXX			sound_initialize_sounds();
 				
 				/*we successfully loaded a blend file, get sure that
 				pointcache works */

From 215f80361cfeb294aed9e93cb6899d18c28d8bbf Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 17:06:10 +0000
Subject: [PATCH 209/577] bpy's __rna__ attribute doesnt work as it should,
 since the parent classes __rna__ overrides the subtypes.

For now have pyrna_struct_as_srna look in the dict first for __rna__ before using PyDict_GetItemString.
Somehow __rna__ is not calling the pyrna_struct_getattro function, python find it first.

The only relyable way to get the rna from python currently is.
bpy.types.SomeType.__dict__['__rna__']
---
 source/blender/python/intern/bpy_rna.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index bece114d8bd..31648037346 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -2655,8 +2655,17 @@ PyObject *BPY_rna_props( void )
 
 static StructRNA *pyrna_struct_as_srna(PyObject *self)
 {
-	BPy_StructRNA *py_srna= (BPy_StructRNA*)PyObject_GetAttrString(self, "__rna__");
+	BPy_StructRNA *py_srna;
 	StructRNA *srna;
+	
+	/* ack, PyObject_GetAttrString wont look up this types tp_dict first :/ */
+	if(PyType_Check(self)) {
+		py_srna = (BPy_StructRNA *)PyDict_GetItemString(((PyTypeObject *)self)->tp_dict, "__rna__");
+		Py_XINCREF(py_srna);
+	}
+	
+	if(py_srna==NULL)
+		py_srna = (BPy_StructRNA*)PyObject_GetAttrString(self, "__rna__");
 
 	if(py_srna==NULL) {
 	 	PyErr_SetString(PyExc_SystemError, "internal error, self had no __rna__ attribute, should never happen.");

From 4ca76ac543b2dff8e3c7bf796203d07033703983 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 17:11:36 +0000
Subject: [PATCH 210/577] [#19229] 1 line fix resolves - segmentation Fault
 from Martin Frances (martinfrances)

Added a scene check when appending objects so you can append data without a scene.
---
 source/blender/blenloader/intern/readfile.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 72aba02f723..77b51d950b9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3093,7 +3093,7 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
 			psys->flag &= ~PSYS_KEYED;
 		}
 
-		if(psys->particles->boid) {
+		if(psys->particles && psys->particles->boid) {
 			pa = psys->particles;
 			pa->boid = newdataadr(fd, pa->boid);
 			for(a=1,pa++; a<psys->totpart; a++, pa++)
@@ -10804,14 +10804,16 @@ static Library* library_append(Main *mainvar, Scene *scene, char* file, char *di
 	fix_relpaths_library(G.sce, mainvar); /* make all relative paths, relative to the open blend file */
 
 	/* give a base to loose objects. If group append, do it for objects too */
-	if(idcode==ID_GR) {
-		if (flag & FILE_LINK) {
-			give_base_to_objects(mainvar, scene, NULL, 0);
+	if(scene) {
+		if(idcode==ID_GR) {
+			if (flag & FILE_LINK) {
+				give_base_to_objects(mainvar, scene, NULL, 0);
+			} else {
+				give_base_to_objects(mainvar, scene, curlib, 1);
+			}	
 		} else {
-			give_base_to_objects(mainvar, scene, curlib, 1);
-		}	
-	} else {
-		give_base_to_objects(mainvar, scene, NULL, 0);
+			give_base_to_objects(mainvar, scene, NULL, 0);
+		}
 	}
 	/* has been removed... erm, why? s..ton) */
 	/* 20040907: looks like they are give base already in append_named_part(); -Nathan L */

From 9cd19fd210d95d4442b47b05e7d550560bc17db8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 17:19:31 +0000
Subject: [PATCH 211/577] [#19226] (2.5) blender uses deprecated 'strstream'
 STL class, causes warnings with gcc thanks to Mauro Toffanin (equilibrium)

This is the only place where strstream were used.
---
 source/gameengine/VideoTexture/Exception.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp
index 8704d49f2a7..35d335b5981 100644
--- a/source/gameengine/VideoTexture/Exception.cpp
+++ b/source/gameengine/VideoTexture/Exception.cpp
@@ -21,7 +21,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 */
 
 
-#include <strstream>
+#include <sstream>
 #include <fstream>
 
 #include <PyObjectPlus.h>
@@ -170,11 +170,11 @@ void Exception::setXptDesc (void)
 		// length of result code
 		const size_t rsltSize = 11;
 		// delimit description
-		const char delimRslt[] = ": ";
+		//const char delimRslt[] = ": ";
 		// set text of description
 		char rsltTxt[rsltSize];
-		std::ostrstream os(rsltTxt, rsltSize);
-		os << std::hex << m_hRslt << delimRslt << '\0';
+		std::ostringstream os;
+		os << std::hex << m_hRslt << ": " << '\0';
 		// copy result to description
 		m_desc.insert(0, rsltTxt);
 		// copy exception description to last exception string

From 45bb3293b418745d515f237b8d39308f0a574000 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Sat, 22 Aug 2009 17:30:47 +0000
Subject: [PATCH 212/577] 2.5: Python subclasses can now define RNA properties
 by making a __props__ list in the class, same as for operators.

---
 source/blender/python/intern/bpy_rna.c | 54 ++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 31648037346..70ff8e48084 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -2940,12 +2940,12 @@ static StructRNA *pointer_type_from_py(PyObject *value)
 
 	srna= srna_from_self(value);
 	if(!srna) {
-	 	PyErr_SetString(PyExc_SystemError, "expected an RNA type derived from IDPropertyGroup (1)");
+	 	PyErr_SetString(PyExc_SystemError, "expected an RNA type derived from IDPropertyGroup");
 		return NULL;
 	}
 
 	if(!RNA_struct_is_a(srna, &RNA_IDPropertyGroup)) {
-	 	PyErr_SetString(PyExc_SystemError, "expected an RNA type derived from IDPropertyGroup (3)");
+	 	PyErr_SetString(PyExc_SystemError, "expected an RNA type derived from IDPropertyGroup");
 		return NULL;
 	}
 
@@ -3022,6 +3022,52 @@ PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject *kw)
 	return NULL;
 }
 
+static int deferred_register_props(PyObject *py_class, StructRNA *srna)
+{
+	PyObject *props, *dummy_args, *item;
+	int i;
+
+	props= PyObject_GetAttrString(py_class, "__props__");
+	
+	if(!props) {
+		PyErr_Clear();
+		return 1;
+	}
+
+	dummy_args = PyTuple_New(0);
+
+	for(i=0; i<PyList_Size(props); i++) {
+		PyObject *py_func_ptr, *py_kw, *py_srna_cobject, *py_ret;
+		item = PyList_GET_ITEM(props, i);
+		
+		if(PyArg_ParseTuple(item, "O!O!", &PyCObject_Type, &py_func_ptr, &PyDict_Type, &py_kw)) {
+			PyObject *(*pyfunc)(PyObject *, PyObject *, PyObject *);
+			pyfunc = PyCObject_AsVoidPtr(py_func_ptr);
+			py_srna_cobject = PyCObject_FromVoidPtr(srna, NULL);
+			
+			py_ret = pyfunc(py_srna_cobject, dummy_args, py_kw);
+			Py_DECREF(py_srna_cobject);
+
+			if(py_ret) {
+				Py_DECREF(py_ret);
+			}
+			else {
+				Py_DECREF(dummy_args);
+				return 0;
+			}
+		}
+		else {
+			PyErr_Clear();
+			PyErr_SetString(PyExc_AttributeError, "expected list of dicts for __props__.");
+			Py_DECREF(dummy_args);
+			return 0;
+		}
+	}
+
+	Py_DECREF(dummy_args);
+	return 1;
+}
+
 /*-------------------- Type Registration ------------------------*/
 
 static int rna_function_arg_count(FunctionRNA *func)
@@ -3382,6 +3428,9 @@ PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class)
 		// Py_DECREF(py_class); // shuld be able to do this XXX since the old rna adds a new ref.
 	}
 
+	if(!deferred_register_props(py_class, srna_new))
+		return NULL;
+
 	Py_RETURN_NONE;
 }
 
@@ -3405,7 +3454,6 @@ PyObject *pyrna_basetype_unregister(PyObject *self, PyObject *py_class)
 	
 	/* get the context, so register callback can do necessary refreshes */
 	C= BPy_GetContext();
-	
 
 	/* call unregister */
 	unreg(C, srna); /* calls bpy_class_free, this decref's py_class */

From 7a0e545c64cf7c7a4d24b9ea846d225a25f4a694 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 22 Aug 2009 17:50:10 +0000
Subject: [PATCH 213/577] use class __props__ for povray settings.

---
 release/io/engine_render_pov.py | 156 ++++++++++++++++----------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index 51aa26f7fb9..f89bdd05e06 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -801,9 +801,87 @@ class RenderButtonsPanel(bpy.types.Panel):
 		return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
 
 # Radiosity panel, use in the scene for now.
+FloatProperty= bpy.types.Scene.FloatProperty
+IntProperty= bpy.types.Scene.IntProperty
+BoolProperty= bpy.types.Scene.BoolProperty
+		
 class SCENE_PT_povray_radiosity(RenderButtonsPanel):
 	__label__ = "Radiosity"
 	COMPAT_ENGINES = set(['POVRAY_RENDER'])
+	
+	__props__ = [ \
+		# Not a real pov option, just to know if we should write
+		BoolProperty(	attr="pov_radio_enable",
+						name="Enable Radiosity",
+						description="Enable povrays radiosity calculation.",
+						default= False),
+		BoolProperty(	attr="pov_radio_display_advanced",
+						name="Advanced Options",
+						description="Show advanced options.",
+						default= False),
+
+		# Real pov options
+		FloatProperty(	attr="pov_radio_adc_bailout",
+						name="ADC Bailout",
+						description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results.",
+						min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default= 0.01),
+
+		BoolProperty(	attr="pov_radio_always_sample",
+						name="Always Sample",
+						description="Only use the data from the pretrace step and not gather any new samples during the final radiosity pass..",
+						default= True),
+
+		FloatProperty(	attr="pov_radio_brightness",
+						name="Brightness",
+						description="Ammount objects are brightened before being returned upwards to the rest of the system.",
+						min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default= 1.0),
+
+		IntProperty(	attr="pov_radio_count",
+						name="Ray Count",
+						description="number of rays that are sent out whenever a new radiosity value has to be calculated.",
+						min=1, max=1600, default= 35),
+
+		FloatProperty(	attr="pov_radio_error_bound",
+						name="Error Bound",
+						description="one of the two main speed/quality tuning values, lower values are more accurate.",
+						min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default= 1.8),
+
+		FloatProperty(	attr="pov_radio_gray_threshold",
+						name="Gray Threshold",
+						description="one of the two main speed/quality tuning values, lower values are more accurate.",
+						min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0),
+										
+		FloatProperty(	attr="pov_radio_low_error_factor",
+						name="Low Error Factor",
+						description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
+						min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5),
+		
+		# max_sample - not available yet
+		BoolProperty(	attr="pov_radio_media", 
+						name="Media",
+						description="Radiosity estimation can be affected by media.",
+						default= False),
+
+		FloatProperty(	attr="pov_radio_minimum_reuse",
+						name="Minimum Reuse",
+						description="Fraction of the screen width which sets the minimum radius of reuse for each sample point (At values higher than 2% expect errors).",
+						min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default= 0.015),
+						
+		IntProperty(	attr="pov_radio_nearest_count",
+						name="Nearest Count",
+						description="Number of old ambient values blended together to create a new interpolated value.",
+						min=1, max=20, default= 5),
+						
+		BoolProperty(	attr="pov_radio_normal",
+						name="Normals",
+						description="Radiosity estimation can be affected by normals.",
+						default= False),
+
+		IntProperty(	attr="pov_radio_recursion_limit",
+						name="Recursion Limit",
+						description="how many recursion levels are used to calculate the diffuse inter-reflection.",
+						min=1, max=20, default= 3),
+	]
 
 	def draw_header(self, context):
 		layout = self.layout
@@ -856,81 +934,3 @@ class SCENE_PT_povray_radiosity(RenderButtonsPanel):
 		
 
 bpy.types.register(SCENE_PT_povray_radiosity)
-
-
-FloatProperty= bpy.types.Scene.FloatProperty
-IntProperty= bpy.types.Scene.IntProperty
-BoolProperty= bpy.types.Scene.BoolProperty
-
-# Not a real pov option, just to know if we should write
-BoolProperty(	attr="pov_radio_enable",
-				name="Enable Radiosity",
-				description="Enable povrays radiosity calculation.",
-				default= False)
-BoolProperty(	attr="pov_radio_display_advanced",
-				name="Advanced Options",
-				description="Show advanced options.",
-				default= False)
-
-# Real pov options
-FloatProperty(	attr="pov_radio_adc_bailout",
-				name="ADC Bailout",
-				description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results.",
-				min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default= 0.01)
-
-BoolProperty(	attr="pov_radio_always_sample",
-				name="Always Sample",
-				description="Only use the data from the pretrace step and not gather any new samples during the final radiosity pass..",
-				default= True)
-
-FloatProperty(	attr="pov_radio_brightness",
-				name="Brightness",
-				description="Ammount objects are brightened before being returned upwards to the rest of the system.",
-				min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default= 1.0)
-
-IntProperty(	attr="pov_radio_count",
-				name="Ray Count",
-				description="number of rays that are sent out whenever a new radiosity value has to be calculated.",
-				min=1, max=1600, default= 35)
-
-FloatProperty(	attr="pov_radio_error_bound",
-				name="Error Bound",
-				description="one of the two main speed/quality tuning values, lower values are more accurate.",
-				min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default= 1.8)
-
-FloatProperty(	attr="pov_radio_gray_threshold",
-				name="Gray Threshold",
-				description="one of the two main speed/quality tuning values, lower values are more accurate.",
-				min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0)
-								
-FloatProperty(	attr="pov_radio_low_error_factor",
-				name="Low Error Factor",
-				description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
-				min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5)
-
-# max_sample - not available yet
-
-BoolProperty(	attr="pov_radio_media",
-				name="Media",
-				description="Radiosity estimation can be affected by media.",
-				default= False)
-
-FloatProperty(	attr="pov_radio_minimum_reuse",
-				name="Minimum Reuse",
-				description="Fraction of the screen width which sets the minimum radius of reuse for each sample point (At values higher than 2% expect errors).",
-				min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default= 0.015)
-				
-IntProperty(	attr="pov_radio_nearest_count",
-				name="Nearest Count",
-				description="Number of old ambient values blended together to create a new interpolated value.",
-				min=1, max=20, default= 5)
-				
-BoolProperty(	attr="pov_radio_normal",
-				name="Normals",
-				description="Radiosity estimation can be affected by normals.",
-				default= False)
-
-IntProperty(	attr="pov_radio_recursion_limit",
-				name="Recursion Limit",
-				description="how many recursion levels are used to calculate the diffuse inter-reflection.",
-				min=1, max=20, default= 3)

From 46aac7b4fc5456daf8faabd7e6f2e65832c96268 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 23 Aug 2009 02:54:30 +0000
Subject: [PATCH 214/577] * Volume rendering - z transparency

This solves one of the last remaining hurdles for
volume rendering. Previously it always used ray
tracing to shade other objects inside or behind the
volume. This meant that said objects would look
aliased, unless you used Full OSA on the volume
(which is slow!). As well as this, it meant that you didn't
get a good alpha channel out of the volume to use for
compositing, similar to ray refracting materials.

This commit enables z transparency for volume
materials. Although it can be potentially less
physically correct, in most situations there's no
difference, and you get the benefit of nice sampling for
other objects and an alpha channel for compositing too.
---
 release/ui/buttons_material.py                |  22 ++
 source/blender/makesdna/DNA_material_types.h  |   1 -
 source/blender/makesrna/intern/rna_material.c |   5 -
 .../render/intern/source/convertblender.c     |   7 +-
 .../blender/render/intern/source/shadeinput.c |  10 +-
 .../blender/render/intern/source/volumetric.c | 318 +++++++++---------
 6 files changed, 196 insertions(+), 167 deletions(-)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 67ba4d326ba..3aec2517bf1 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -568,6 +568,27 @@ class MATERIAL_PT_volume_scattering(MaterialButtonsPanel):
 		col.itemR(vol, "phase_function", text="")
 		if vol.phase_function in ('SCHLICK', 'HENYEY-GREENSTEIN'):
 			col.itemR(vol, "asymmetry")
+
+class MATERIAL_PT_volume_transp(MaterialButtonsPanel):
+	__label__= "Transparency"
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+		
+	def poll(self, context):
+		mat = context.material
+		return mat and (mat.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+
+	def draw_header(self, context):
+		layout = self.layout
+
+	def draw(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		rayt = context.material.raytrace_transparency
+		
+		row= layout.row()
+		row.itemR(mat, "transparency_method", expand=True)
+		row.active = mat.transparency and (not mat.shadeless)
 		
 class MATERIAL_PT_volume_integration(MaterialButtonsPanel):
 	__label__ = "Integration"
@@ -660,6 +681,7 @@ bpy.types.register(MATERIAL_PT_mirror)
 bpy.types.register(MATERIAL_PT_sss)
 bpy.types.register(MATERIAL_PT_volume_shading)
 bpy.types.register(MATERIAL_PT_volume_scattering)
+bpy.types.register(MATERIAL_PT_volume_transp)
 bpy.types.register(MATERIAL_PT_volume_integration)
 bpy.types.register(MATERIAL_PT_halo)
 bpy.types.register(MATERIAL_PT_physics)
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index b4fdb07b520..f268c117065 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -377,7 +377,6 @@ typedef struct Material {
 #define MA_VOL_SHADED		1
 #define MA_VOL_RECVSHADOW	4
 #define MA_VOL_PRECACHESHADING	8
-#define MA_VOL_USEALPHA		16
 
 /* vol_shading_type */
 #define MA_VOL_SHADE_NONE					0
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 0c5fc70fabd..cde65f46e5c 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1017,11 +1017,6 @@ static void rna_def_material_volume(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Emission Color", "");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING_DRAW, NULL);
 	
-	prop= RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "shadeflag", MA_VOL_USEALPHA); /* use bitflags */
-	RNA_def_property_ui_text(prop, "Use Alpha", "Temp method for getting a usable alpha channel");
-	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
-	
 	prop= RNA_def_property(srna, "phase_function", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "phasefunc_type");
 	RNA_def_property_enum_items(prop, prop_phasefunction_items);
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index f91e48ea287..e486daf2585 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -920,6 +920,7 @@ static Material *give_render_material(Render *re, Object *ob, int nr)
 	
 	if(re->r.mode & R_SPEED) ma->texco |= NEED_UV;
 	
+	if(ma->material_type == MA_TYPE_VOLUME) ma->mode |= MA_TRANSP;
 	if((ma->mode & MA_TRANSP) && (ma->mode & MA_ZTRANSP))
 		re->flag |= R_ZTRA;
 	
@@ -3005,13 +3006,12 @@ static void init_camera_inside_volumes(Render *re)
 		}
 	}
 	
-	{
+	/* debug {
 	MatInside *m;
 	for (m=re->render_volumes_inside.first; m; m=m->next) {
 		printf("matinside: ma: %s \n", m->ma->id.name+2);
 	}
-	
-	}
+	}*/
 }
 
 static void add_volume(Render *re, ObjectRen *obr, Material *ma)
@@ -3862,6 +3862,7 @@ static void set_fullsample_flag(Render *re, ObjectRen *obr)
 			vlr->flag |= R_FULL_OSA;
 		else if(trace) {
 			if(mode & MA_SHLESS);
+			else if(vlr->mat->material_type == MA_TYPE_VOLUME);
 			else if((mode & MA_RAYMIRROR) || ((mode & MA_TRANSP) && (mode & MA_RAYTRANSP)))
 				/* for blurry reflect/refract, better to take more samples 
 				 * inside the raytrace than as OSA samples */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 1a97440cec3..7887392f1d2 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -216,15 +216,17 @@ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr)
 	}
 	else alpha= 1.0f;
 	
+	
 	/* add mist and premul color */
 	if(shr->alpha!=1.0f || alpha!=1.0f) {
 		float fac= alpha*(shr->alpha);
 		shr->combined[3]= fac;
-		shr->combined[0]*= fac;
-		shr->combined[1]*= fac;
-		shr->combined[2]*= fac;
+		
+		if (shi->mat->material_type!= MA_TYPE_VOLUME)
+			VecMulf(shr->combined, fac);
 	}
-	else shr->combined[3]= 1.0f;
+	else
+		shr->combined[3]= 1.0f;
 	
 	/* add z */
 	shr->z= -shi->co[2];
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 7943d9ae526..cf66d580944 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -65,12 +65,20 @@ extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 
-/* TODO: Box or sphere intersection types could speed things up */
+/* tracing */
+
 static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
 {
 	float maxsize = RE_ray_tree_max_size(R.raytree);
-
-	/* TODO: use object's bounding box to calculate max size */
+	
+	/* XXX TODO - get raytrace max distance from object instance's bounding box */
+	/* need to account for scaling only, but keep coords in camera space...
+	 * below code is WIP and doesn't work!
+	VecSubf(bb_dim, shi->obi->obr->boundbox[1], shi->obi->obr->boundbox[2]);
+	Mat3MulVecfl(shi->obi->nmat, bb_dim);
+	maxsize = VecLength(bb_dim);
+	*/
+	
 	VECCOPY(isect->start, co);
 	isect->end[0] = co[0] + vec[0] * maxsize;
 	isect->end[1] = co[1] + vec[1] * maxsize;
@@ -96,6 +104,68 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
 	}
 }
 
+static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
+{
+	ShadeInput shi_new;
+	ShadeResult shr_new;
+	
+	memset(&shi_new, 0, sizeof(ShadeInput)); 
+	
+	shi_new.mask= shi->mask;
+	shi_new.osatex= shi->osatex;
+	shi_new.thread= shi->thread;
+	shi_new.depth = shi->depth + 1;
+	shi_new.volume_depth= shi->volume_depth + 1;
+	shi_new.xs= shi->xs;
+	shi_new.ys= shi->ys;
+	shi_new.lay= shi->lay;
+	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
+	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
+	shi_new.light_override= shi->light_override;
+	shi_new.mat_override= shi->mat_override;
+	
+	VECCOPY(shi_new.camera_co, is->start);
+	
+	memset(&shr_new, 0, sizeof(ShadeResult));
+	
+	/* hardcoded limit of 100 for now - prevents problems in weird geometry */
+	if (shi->volume_depth < 100) {
+		shade_ray(is, &shi_new, &shr_new);
+	}
+	
+	VecCopyf(col, shr_new.combined);
+	col[3] = shr_new.alpha;
+}
+
+static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
+{
+	Isect isect;
+	float maxsize = RE_ray_tree_max_size(R.raytree);
+	
+	VECCOPY(isect.start, co);
+	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
+	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
+	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
+	
+	isect.faceorig= (RayFace *)vlr;
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect.face_last= NULL;
+	isect.ob_last= 0;
+	isect.lay= -1;
+	
+	/* check to see if there's anything behind the volume, otherwise shade the sky */
+	if(RE_ray_tree_intersect(R.raytree, &isect)) {
+		shade_intersection(shi, col, &isect);
+	} else {
+		shadeSkyView(col, co, shi->view, NULL, shi->thread);
+		shadeSunView(col, shi->view);
+	}
+}
+
+/* input shader data */
+
 float vol_get_stepsize(struct ShadeInput *shi, int context)
 {
 	if (shi->mat->vol.stepsize_type == MA_VOL_STEP_RANDOMIZED) {
@@ -280,7 +350,7 @@ void vol_get_attenuation(ShadeInput *shi, float *transmission, float *co, float
 		tau[2] += stepsize * density;
 		
 		if (s < nsteps-1) {
-			VECCOPY(step_sta, step_end);
+			VecCopyf(step_sta, step_end);
 			VecAddf(step_end, step_end, step_vec);
 		}
 	}
@@ -319,9 +389,6 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		VECCOPY(lv, lar->vec);
 	VecMulf(lv, -1.0f);
 	
-	p = vol_get_phasefunc(shi, shi->mat->vol.phasefunc_type, shi->mat->vol.phasefunc_g, shi->view, lv);
-	VecMulf(lacol, p);
-	
 	if (shi->mat->vol.shade_type != MA_VOL_SHADE_NONE) {
 		Isect is;
 		
@@ -337,6 +404,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 			}
 
 			if (ELEM(lar->type, LA_SUN, LA_HEMI))
+				/* infinite lights, can never be inside volume */
 				atten_co = hitco;
 			else if ( lampdist < dist ) {
 				atten_co = lar->co;
@@ -354,6 +422,9 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		}
 	}
 	
+	p = vol_get_phasefunc(shi, shi->mat->vol.phasefunc_type, shi->mat->vol.phasefunc_g, shi->view, lv);
+	VecMulf(lacol, p);
+	
 	scatter_fac = vol_get_scattering_fac(shi, co);
 	VecMulf(lacol, scatter_fac);
 }
@@ -390,14 +461,6 @@ outgoing radiance from behind surface * beam transmittance/attenuation
 + added radiance from all points along the ray due to participating media
 	--> radiance for each segment = 
 		(radiance added by scattering + radiance added by emission) * beam transmittance/attenuation
-
--- To find transmittance:
-	compute optical thickness with tau (perhaps involving monte carlo integration)
-	transmittance = exp(-tau)
-	
--- To find radiance from segments along the way:
-	find radiance for one step: 
-	- loop over lights and weight by phase function
 */
 static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
 {
@@ -462,150 +525,102 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 	VecMulVecf(col, tr, col);	
 	VecAddf(col, col, radiance);
 	
-	/* alpha - transmission */
-	col[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
-}
-
-static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
-{
-	ShadeInput shi_new;
-	ShadeResult shr_new;
-	
-	memset(&shi_new, 0, sizeof(ShadeInput)); 
-	
-	shi_new.mask= shi->mask;
-	shi_new.osatex= shi->osatex;
-	shi_new.thread= shi->thread;
-	shi_new.depth = shi->depth + 1;
-	shi_new.volume_depth= shi->volume_depth + 1;
-	shi_new.xs= shi->xs;
-	shi_new.ys= shi->ys;
-	shi_new.lay= shi->lay;
-	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
-	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
-	shi_new.light_override= shi->light_override;
-	shi_new.mat_override= shi->mat_override;
-	
-	VECCOPY(shi_new.camera_co, is->start);
-	
-	memset(&shr_new, 0, sizeof(ShadeResult));
-
-	/* hardcoded limit of 100 for now - prevents problems in weird geometry */
-	if (shi->volume_depth < 100) {
-		shade_ray(is, &shi_new, &shr_new);
-	}
-	
-	col[0] = shr_new.combined[0];
-	col[1] = shr_new.combined[1];
-	col[2] = shr_new.combined[2];
-	col[3] = shr_new.alpha;
-}
-
-static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
-{
-	Isect isect;
-	float maxsize = RE_ray_tree_max_size(R.raytree);
-
-	VECCOPY(isect.start, co);
-	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
-	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
-	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
-
-	isect.faceorig= (RayFace *)vlr;
-	
-	isect.mode= RE_RAY_MIRROR;
-	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
-	isect.face_last= NULL;
-	isect.ob_last= 0;
-	isect.lay= -1;
-	
-	/* check to see if there's anything behind the volume, otherwise shade the sky */
-	if(RE_ray_tree_intersect(R.raytree, &isect)) {
-		shade_intersection(shi, col, &isect);
-	} else {
-		shadeSkyView(col, co, shi->view, NULL, shi->thread);
-		shadeSunView(col, shi->view);
-	}
+	/* alpha <-- transmission luminance */
+	col[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);
 }
 
 /* the main entry point for volume shading */
 static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int inside_volume)
 {
 	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
+	float *startco, *endco;
 	int trace_behind = 1;
+	const int ztransp= ((shi->depth==0) && (shi->mat->mode & MA_TRANSP) && (shi->mat->mode & MA_ZTRANSP));
 	Isect is;
 
 	/* check for shading an internal face a volume object directly */
-	if (inside_volume == VOL_SHADE_INSIDE) {
+	if (inside_volume == VOL_SHADE_INSIDE)
 		trace_behind = 0;
-	}
-	if (inside_volume == VOL_SHADE_OUTSIDE) {
+	else if (inside_volume == VOL_SHADE_OUTSIDE) {
 		if (shi->flippednor)
 			inside_volume = VOL_SHADE_INSIDE;
 	}
-
-	if (inside_volume == VOL_SHADE_INSIDE) {
+	
+	if (ztransp && inside_volume == VOL_SHADE_INSIDE) {
+		MatInside *mi;
+		int render_this=0;
 		
-		if (trace_behind) {
-			/* trace behind the volume object */
-			vol_trace_behind(shi, shi->vlr, shi->co, col);
-		} else {
-			/* we're tracing through the volume between the camera 
-			 * and a solid surface, so use that pre-shaded radiance */
-			QUATCOPY(col, shr->combined);
+		/* don't render the backfaces of ztransp volume materials.
+		 
+		 * volume shading renders the internal volume from between the
+		 * near view intersection of the solid volume to the
+		 * intersection on the other side, as part of the shading of
+		 * the front face.
+		 
+		 * Because ztransp renders both front and back faces independently
+		 * this will double up, so here we prevent rendering the backface as well, 
+		 * which would otherwise render the volume in between the camera and the backface
+		 * --matt */
+		
+		for (mi=R.render_volumes_inside.first; mi; mi=mi->next) {
+			/* weak... */
+			if (mi->ma == shi->mat) render_this=1;
+		}
+		if (!render_this) return;
+	}
+	
+
+	if (inside_volume == VOL_SHADE_INSIDE)
+	{
+		startco = shi->camera_co;
+		endco = shi->co;
+		
+		if (!ztransp) {
+			if (trace_behind) {
+				/* trace behind the volume object */
+				vol_trace_behind(shi, shi->vlr, endco, col);
+			} else {
+				/* we're tracing through the volume between the camera 
+				 * and a solid surface, so use that pre-shaded radiance */
+				QUATCOPY(col, shr->combined);
+			}
 		}
 		
 		/* shade volume from 'camera' to 1st hit point */
-		volumeintegrate(shi, col, shi->camera_co, shi->co);
-		
-		VecCopyf(shr->combined, col);
-		
-		if (shi->mat->vol.shadeflag & MA_VOL_USEALPHA) {
-			if (col[3] > 1.0f)
-				col[3] = 1.0f;
-		}
-		else
-			col[3] = 1.0f;
-		shr->combined[3] = col[3];
-		shr->alpha = col[3];
-		
-		VECCOPY(shr->diff, shr->combined);
+		volumeintegrate(shi, col, startco, endco);
 	}
 	/* trace to find a backface, the other side bounds of the volume */
 	/* (ray intersect ignores front faces here) */
-	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH))
+	{
 		VlakRen *vlr = (VlakRen *)is.face;
 		
-		/* if it's another face in the same material */
-		if (vlr->mat == shi->mat) {
-			/* trace behind the 2nd (raytrace) hit point */
-			vol_trace_behind(shi, (VlakRen *)is.face, hitco, col);
-		} else {
-			shade_intersection(shi, col, &is);
+		startco = shi->co;
+		endco = hitco;
+		
+		if (!ztransp) {
+			/* if it's another face in the same material */
+			if (vlr->mat == shi->mat) {
+				/* trace behind the 2nd (raytrace) hit point */
+				vol_trace_behind(shi, (VlakRen *)is.face, endco, col);
+			} else {
+				shade_intersection(shi, col, &is);
+			}
 		}
-	
+		
 		/* shade volume from 1st hit point to 2nd hit point */
-		volumeintegrate(shi, col, shi->co, hitco);
-		
-		VecCopyf(shr->combined, col);
-		
-		if (shi->mat->vol.shadeflag & MA_VOL_USEALPHA) {
-			if (col[3] > 1.0f)
-				col[3] = 1.0f;
-		}
-		else
-			col[3] = 1.0f;
-		shr->combined[3] = col[3];
-		shr->alpha = col[3];
-		
-		VECCOPY(shr->diff, shr->combined);
-	}
-	else {
-		shr->combined[0] = 0.0f;
-		shr->combined[1] = 0.0f;
-		shr->combined[2] = 0.0f;
-		shr->combined[3] = shr->alpha =  1.0f;
+		volumeintegrate(shi, col, startco, endco);
 	}
+	
+	if (ztransp)
+		col[3] = col[3]>1.f?1.f:col[3];
+	else
+		col[3] = 1.f;
+	
+	VecCopyf(shr->combined, col);
+	shr->alpha = col[3];
+	
+	VECCOPY(shr->diff, shr->combined);
 }
 
 /* Traces a shadow through the object, 
@@ -614,41 +629,37 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 {
 	float hitco[3];
 	float tr[3] = {1.0,1.0,1.0};
-	float tau[3] = {0.0,0.0,0.0};
 	Isect is;
 	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
+	float *startco, *endco;
+	float density=0.f;
 
 	memset(shr, 0, sizeof(ShadeResult));
 	
 	/* if 1st hit normal is facing away from the camera, 
 	 * then we're inside the volume already. */
 	if (shi->flippednor) {
-	
-		vol_get_attenuation(shi, tr, last_is->start, shi->co, -1.0f, shade_stepsize);
-		
-		VecCopyf(shr->combined, tr);
-		
-		shr->combined[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
-		shr->alpha = shr->combined[3];
+		startco = last_is->start;
+		endco = shi->co;
 	}
 	/* trace to find a backface, the other side bounds of the volume */
 	/* (ray intersect ignores front faces here) */
 	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
-		
-		vol_get_attenuation(shi, tr, shi->co, hitco, -1.0f, shade_stepsize);
-		
-		VecCopyf(shr->combined, tr);
-		
-		shr->combined[3] = 1.0f -(tr[0] + tr[1] + tr[2]) * 0.333f;
-		shr->alpha = shr->combined[3];
-
+		startco = shi->co;
+		endco = hitco;
 	}
 	else {
-		shr->combined[0] = 0.0f;
-		shr->combined[1] = 0.0f;
-		shr->combined[2] = 0.0f;
-		shr->combined[3] = shr->alpha =  0.0f;
+		shr->combined[0] = shr->combined[1] = shr->combined[2] = 0.f;
+		shr->alpha = shr->combined[3] = 1.f;
+		return;
 	}
+	
+	density = vol_get_density(shi, startco);
+	vol_get_attenuation(shi, tr, startco, endco, density, shade_stepsize);
+	
+	VecCopyf(shr->combined, tr);
+	shr->combined[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);
+	shr->alpha = shr->combined[3];
 }
 
 
@@ -656,7 +667,6 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 void shade_volume_outside(ShadeInput *shi, ShadeResult *shr)
 {
 	memset(shr, 0, sizeof(ShadeResult));
-	
 	volume_trace(shi, shr, VOL_SHADE_OUTSIDE);
 }
 

From f82ce68a9eda382fead176398b624f28b5c9945c Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 23 Aug 2009 02:59:18 +0000
Subject: [PATCH 215/577] * enable ztransp transparency type for new materials
 by default.

---
 source/blender/blenkernel/intern/material.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 50db2bfe706..62ec12349aa 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -170,7 +170,7 @@ void init_material(Material *ma)
 	ma->sss_front= 1.0f;
 	ma->sss_back= 1.0f;
 
-	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RAYBIAS|MA_TANGENT_STR;
+	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RAYBIAS|MA_TANGENT_STR|MA_ZTRANSP;
 
 	ma->preview = NULL;
 }

From 4a4a3b4989355c699b72a8dc15df09fd47621528 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 23 Aug 2009 06:17:59 +0000
Subject: [PATCH 216/577] Option for MouseFocus sensor. only used when 'Mouse
 over any' type is set.

Previously the only way to detect if the mouse moved over a different object was to enable true-level-triggering and have a python script detect the change.

When the Pulse option is set, focusing on a different object pulses true.
Python attribute is focusSensor.usePulseFocus.

This is similar to the collision sensors pulse option where changes in the set of collision objects generates an event too.

Found this functionality missing when trying to make a logic demo that used mouse-over with overlapping objects.
---
 source/blender/makesdna/DNA_sensor_types.h        |  3 +++
 source/blender/src/buttons_logic.c                |  8 +++++++-
 source/gameengine/Converter/KX_ConvertSensors.cpp |  1 +
 source/gameengine/Ketsji/KX_MouseFocusSensor.cpp  | 12 ++++++++++--
 source/gameengine/Ketsji/KX_MouseFocusSensor.h    |  9 ++++++++-
 source/gameengine/PyDoc/GameTypes.py              |  4 +++-
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 8b29ce1338d..cc998de7eec 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -178,6 +178,9 @@ typedef struct bJoystickSensor {
 
 /* bMouseSensor->type: uses blender event defines */
 
+/* bMouseSensor->flag: only pulse for now */
+#define SENS_MOUSE_FOCUS_PULSE	1
+
 /* propertysensor->type */
 #define SENS_PROP_EQUAL		0
 #define SENS_PROP_NEQUAL	1
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index a57bcf5d7df..0412aa72b37 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -1367,10 +1367,16 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
 			* proper compatibility with older .blend files. */
 			str= "Type %t|Left button %x1|Middle button %x2|"
 				"Right button %x4|Wheel Up %x5|Wheel Down %x6|Movement %x8|Mouse over %x16|Mouse over any%x32"; 
-			uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, width-20, 19,
+			uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, (width*0.8f)-20, 19,
 				&ms->type, 0, 31, 0, 0,
 				"Specify the type of event this mouse sensor should trigger on");
 			
+			if(ms->type==32) {
+				uiDefButBitS(block, TOG, SENS_MOUSE_FOCUS_PULSE, B_REDR, "Pulse",(short)(xco + 10) + (width*0.8f)-20,(short)(yco - 44),
+					(short)(0.20 * (width-20)), 19, &ms->flag, 0.0, 0.0, 0, 0,
+					"Moving the mouse over a different object generates a pulse");	
+			}
+			
 			yco-= ysize;
 			break;
 		}
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index 31a3cfbd1ac..a628881058a 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -522,6 +522,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 							starty,
 							keytype,
 							trackfocus,
+							(bmouse->flag & SENS_MOUSE_FOCUS_PULSE) ? true:false,
 							kxscene,
 							kxengine,
 							gameobj); 
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index fde10a493db..1880fcfb6f0 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -61,12 +61,14 @@ KX_MouseFocusSensor::KX_MouseFocusSensor(SCA_MouseManager* eventmgr,
 										 int starty,
 										 short int mousemode,
 										 int focusmode,
+										 bool bTouchPulse,
 										 KX_Scene* kxscene,
 										 KX_KetsjiEngine *kxengine,
 										 SCA_IObject* gameobj, 
 										 PyTypeObject* T)
     : SCA_MouseSensor(eventmgr, startx, starty, mousemode, gameobj, T),
 	  m_focusmode(focusmode),
+	  m_bTouchPulse(bTouchPulse),
 	  m_kxscene(kxscene),
 	  m_kxengine(kxengine)
 {
@@ -78,6 +80,7 @@ void KX_MouseFocusSensor::Init()
 	m_mouse_over_in_previous_frame = (m_invert)?true:false;
 	m_positive_event = false;
 	m_hitObject = 0;
+	m_hitObject_Last = NULL;
 	m_reset = true;
 	
 	m_hitPosition.setValue(0,0,0);
@@ -108,7 +111,10 @@ bool KX_MouseFocusSensor::Evaluate()
 			m_positive_event = true;
 			if (!m_mouse_over_in_previous_frame) {
 				result = true;
-			} 
+			}
+			else if(m_bTouchPulse && (m_hitObject != m_hitObject_Last)) {
+				result = true;
+			}
 		} 
 		if (reset) {
 			// force an event 
@@ -124,7 +130,8 @@ bool KX_MouseFocusSensor::Evaluate()
 	}
 
 	m_mouse_over_in_previous_frame = obHasFocus;
-
+	m_hitObject_Last = (void *)m_hitObject;
+					   
 	return result;
 }
 
@@ -390,6 +397,7 @@ PyAttributeDef KX_MouseFocusSensor::Attributes[] = {
 	KX_PYATTRIBUTE_RO_FUNCTION("hitObject",		KX_MouseFocusSensor, pyattr_get_hit_object),
 	KX_PYATTRIBUTE_RO_FUNCTION("hitPosition",	KX_MouseFocusSensor, pyattr_get_hit_position),
 	KX_PYATTRIBUTE_RO_FUNCTION("hitNormal",		KX_MouseFocusSensor, pyattr_get_hit_normal),
+	KX_PYATTRIBUTE_BOOL_RW("usePulseFocus",	KX_MouseFocusSensor,m_bTouchPulse),
 	{ NULL }	//Sentinel
 };
 
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 29d674eb305..e1f8d9246e3 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -49,11 +49,12 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	
  public:
 	
-	KX_MouseFocusSensor(class SCA_MouseManager* keybdmgr,
+	KX_MouseFocusSensor(class SCA_MouseManager* eventmgr,
 						int startx,
 						int starty,
 						short int mousemode,
 						int focusmode,
+						bool bTouchPulse,
 						KX_Scene* kxscene,
 						KX_KetsjiEngine* kxengine,
 						SCA_IObject* gameobj,
@@ -110,6 +111,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 		
 	/* --------------------------------------------------------------------- */
 	SCA_IObject*	m_hitObject;
+	void*			m_hitObject_Last; /* only use for comparison, never access */
 
  private:
 	/**
@@ -122,6 +124,11 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	 */
 	bool m_mouse_over_in_previous_frame;
 
+	/**
+	 * Flags whether changes in hit object should trigger a pulse
+	 */
+	bool m_bTouchPulse;
+	
 	/**
 	 * Flags whether the previous test evaluated positive.
 	 */
diff --git a/source/gameengine/PyDoc/GameTypes.py b/source/gameengine/PyDoc/GameTypes.py
index b1d1ce71173..71a0c8c1a47 100644
--- a/source/gameengine/PyDoc/GameTypes.py
+++ b/source/gameengine/PyDoc/GameTypes.py
@@ -2472,6 +2472,8 @@ class KX_MouseFocusSensor(SCA_MouseSensor):
 	@type hitPosition: list (vector of 3 floats)
 	@ivar hitNormal: the worldspace normal from the face at point of intersection.
 	@type hitNormal: list (normalized vector of 3 floats)
+	@ivar usePulseFocus: When enabled, moving the mouse over a different object generates a pulse. (only used when the 'Mouse Over Any' sensor option is set)
+	@type usePulseFocus: bool
 	"""
 #{ Deprecated
 	def getHitNormal():
@@ -2533,7 +2535,7 @@ class KX_TouchSensor(SCA_ISensor):
 	@ivar useMaterial: Determines if the sensor is looking for a property or material.
 						KX_True = Find material; KX_False = Find property
 	@type useMaterial: boolean
-	@ivar usePulseCollision: The last collided object.
+	@ivar usePulseCollision: When enabled, changes to the set of colliding objects generate a pulse.
 	@type usePulseCollision: bool
 	@ivar hitObject: The last collided object. (read-only)
 	@type hitObject: L{KX_GameObject} or None

From 2ed155b98a52108a39133185b145ceee0d21ebf8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 23 Aug 2009 07:33:29 +0000
Subject: [PATCH 217/577] spacebar for the search menu was overriding space in
 the text editor

---
 source/blender/windowmanager/intern/wm_operators.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 22c7b6ae277..6ecbc172c37 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -720,6 +720,7 @@ int wm_search_menu_poll(bContext *C)
 {
 	if(CTX_wm_window(C)==NULL) return 0;
 	if(CTX_wm_area(C) && CTX_wm_area(C)->spacetype==SPACE_CONSOLE) return 0;  // XXX - so we can use the shortcut in the console
+	if(CTX_wm_area(C) && CTX_wm_area(C)->spacetype==SPACE_TEXT) return 0;  // XXX - so we can use the spacebar in the text editor
 	return 1;
 }
 

From 834f509c5a9f3b76a5edfb15717bdd4ba3fd8b80 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 23 Aug 2009 12:50:08 +0000
Subject: [PATCH 218/577] missed this in last commit.

---
 release/io/engine_render_pov.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index f89bdd05e06..e2f7ae5d454 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -801,9 +801,9 @@ class RenderButtonsPanel(bpy.types.Panel):
 		return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
 
 # Radiosity panel, use in the scene for now.
-FloatProperty= bpy.types.Scene.FloatProperty
-IntProperty= bpy.types.Scene.IntProperty
-BoolProperty= bpy.types.Scene.BoolProperty
+FloatProperty= bpy.props.FloatProperty
+IntProperty= bpy.props.IntProperty
+BoolProperty= bpy.props.BoolProperty
 		
 class SCENE_PT_povray_radiosity(RenderButtonsPanel):
 	__label__ = "Radiosity"

From 19b81733cc28fdd3ec90bbb146933d4b8760a357 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 23 Aug 2009 12:53:55 +0000
Subject: [PATCH 219/577] 2.5 - Custom Shape and Bone Groups can be viewed/set
 on Bones again.

---
 release/ui/buttons_data_bone.py           |  20 ++-
 source/blender/makesrna/intern/rna_pose.c | 180 ++++++++++++++++------
 2 files changed, 149 insertions(+), 51 deletions(-)

diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 17c9c2d89d9..cfdaabadf79 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -74,10 +74,13 @@ class BONE_PT_bone(BoneButtonsPanel):
 	def draw(self, context):
 		layout = self.layout
 		
+		ob = context.object
 		bone = context.bone
 		arm = context.armature
 		if not bone:
 			bone = context.edit_bone
+		else:
+			pchan = ob.pose.pose_channels[context.bone.name]
 
 		split = layout.split()
 
@@ -87,14 +90,14 @@ class BONE_PT_bone(BoneButtonsPanel):
 			col.itemR(bone, "parent", text="")
 		else:
 			col.item_pointerR(bone, "parent", arm, "edit_bones", text="")
-
+		
 		row = col.row()
 		row.active = bone.parent != None
 		row.itemR(bone, "connected")
-
+		
 		col.itemL(text="Layers:")
 		col.template_layers(bone, "layer")
-
+		
 		col = split.column()
 		col.itemL(text="Inherit:")
 		col.itemR(bone, "hinge", text="Rotation")
@@ -102,6 +105,17 @@ class BONE_PT_bone(BoneButtonsPanel):
 		col.itemL(text="Display:")
 		col.itemR(bone, "draw_wire", text="Wireframe")
 		col.itemR(bone, "hidden", text="Hide")
+		
+		if ob and pchan:
+			split = layout.split()
+			
+			col = split.column()
+			col.itemL(text="Bone Group:")
+			col.item_pointerR(pchan, "bone_group", ob.pose, "bone_groups", text="")
+			
+			col = split.column()
+			col.itemL(text="Custom Shape:")
+			col.itemR(pchan, "custom_shape", text="")
 
 class BONE_PT_inverse_kinematics(BoneButtonsPanel):
 	__label__ = "Inverse Kinematics"
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 6cf4722494f..bfebc5ee49f 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -151,12 +151,72 @@ static int rna_PoseChannel_has_ik_get(PointerRNA *ptr)
 	return ED_pose_channel_in_IK_chain(ob, pchan);
 }
 
+static PointerRNA rna_PoseChannel_bone_group_get(PointerRNA *ptr)
+{
+	Object *ob= (Object*)ptr->id.data;
+	bPose *pose= (ob) ? ob->pose : NULL;
+	bPoseChannel *pchan= (bPoseChannel*)ptr->data;
+	bActionGroup *grp;
+	
+	if (pose)
+		grp= BLI_findlink(&pose->agroups, pchan->agrp_index-1);
+	else
+		grp= NULL;
+	
+	return rna_pointer_inherit_refine(ptr, &RNA_BoneGroup, grp);
+}
+
+static void rna_PoseChannel_bone_group_set(PointerRNA *ptr, PointerRNA value)
+{
+	Object *ob= (Object*)ptr->id.data;
+	bPose *pose= (ob) ? ob->pose : NULL;
+	bPoseChannel *pchan= (bPoseChannel*)ptr->data;
+	
+	if (pose)
+		pchan->agrp_index= BLI_findindex(&pose->agroups, value.data) + 1;
+	else
+		pchan->agrp_index= 0;
+}
+
+static int rna_PoseChannel_bone_group_index_get(PointerRNA *ptr)
+{
+	bPoseChannel *pchan= (bPoseChannel*)ptr->data;
+	return MAX2(pchan->agrp_index-1, 0);
+}
+
+static void rna_PoseChannel_bone_group_index_set(PointerRNA *ptr, int value)
+{
+	bPoseChannel *pchan= (bPoseChannel*)ptr->data;
+	pchan->agrp_index= value+1;
+}
+
+static void rna_PoseChannel_bone_group_index_range(PointerRNA *ptr, int *min, int *max)
+{
+	Object *ob= (Object*)ptr->id.data;
+	bPose *pose= (ob) ? ob->pose : NULL;
+	
+	*min= 0;
+	
+	if (pose) {
+		*max= BLI_countlist(&pose->agroups)-1;
+		*max= MAX2(0, *max);
+	}
+	else
+		*max= 0;
+}
+
 static PointerRNA rna_Pose_active_bone_group_get(PointerRNA *ptr)
 {
 	bPose *pose= (bPose*)ptr->data;
 	return rna_pointer_inherit_refine(ptr, &RNA_BoneGroup, BLI_findlink(&pose->agroups, pose->active_group-1));
 }
 
+static void rna_Pose_active_bone_group_set(PointerRNA *ptr, PointerRNA value)
+{
+	bPose *pose= (bPose*)ptr->data;
+	pose->active_group= BLI_findindex(&pose->agroups, value.data) + 1;
+}
+
 static int rna_Pose_active_bone_group_index_get(PointerRNA *ptr)
 {
 	bPose *pose= (bPose*)ptr->data;
@@ -304,60 +364,23 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Pose Channel", "Channel defining pose data for a bone in a Pose.");
 	RNA_def_struct_path_func(srna, "rna_PoseChannel_path");
 	RNA_def_struct_idproperties_func(srna, "rna_PoseChannel_idproperties");
-
+	
+	/* Bone Constraints */
 	prop= RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "Constraint");
 	RNA_def_property_ui_text(prop, "Constraints", "Constraints that act on this PoseChannel."); 
 
+	/* Name + Selection Status */
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_PoseChannel_name_set");
 	RNA_def_property_ui_text(prop, "Name", "");
 	RNA_def_struct_name_property(srna, prop);
-
-	prop= RNA_def_property(srna, "has_ik", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_funcs(prop,  "rna_PoseChannel_has_ik_get", NULL);
-	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Has IK", "Is part of an IK chain.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "ik_dof_x", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF);
-	RNA_def_property_ui_text(prop, "IK X DoF", "Allow movement around the X axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "ik_dof_y", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF);
-	RNA_def_property_ui_text(prop, "IK Y DoF", "Allow movement around the Y axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "ik_dof_z", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_ZDOF);
-	RNA_def_property_ui_text(prop, "IK Z DoF", "Allow movement around the Z axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "ik_limit_x", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_XLIMIT);
-	RNA_def_property_ui_text(prop, "IK X Limit", "Limit movement around the X axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "ik_limit_y", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_YLIMIT);
-	RNA_def_property_ui_text(prop, "IK Y Limit", "Limit movement around the Y axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "ik_limit_z", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_ZLIMIT);
-	RNA_def_property_ui_text(prop, "IK Z Limit", "Limit movement around the Z axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
 	
 	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "selectflag", BONE_SELECTED);
 	RNA_def_property_ui_text(prop, "Selected", "");
-	
-	prop= RNA_def_property(srna, "bone_group_index", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "agrp_index");
-	RNA_def_property_ui_text(prop, "Bone Group Index", "Bone Group this pose channel belongs to (0=no group).");
 
+	/* Baked Bone Path cache data s*/
 	prop= RNA_def_property(srna, "path_start_frame", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "pathsf");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -369,7 +392,8 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Bone Paths Calculation End Frame", "End frame of range of frames to use for Bone Path calculations.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
+	
+	/* Relationships to other bones */
 	prop= RNA_def_property(srna, "bone", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_struct_type(prop, "Bone");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -384,7 +408,8 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "PoseChannel");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Child", "Child of this pose channel.");
-
+	
+	/* Transformation settings */
 	prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "loc");
 	RNA_def_property_ui_text(prop, "Location", "");
@@ -429,6 +454,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Constraint Inverse Matrix", "4x4 matrix, defines transform from final position to unconstrained position."); */
 	
+	/* Head/Tail Coordinates (in Pose Space) - Automatically calculated... */
 	prop= RNA_def_property(srna, "pose_head", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Pose Head Position", "Location of head of the channel's bone.");
@@ -436,7 +462,44 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "pose_tail", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Pose Tail Position", "Location of tail of the channel's bone.");
+	
+	/* IK Settings */
+	prop= RNA_def_property(srna, "has_ik", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop,  "rna_PoseChannel_has_ik_get", NULL);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Has IK", "Is part of an IK chain.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
 
+	prop= RNA_def_property(srna, "ik_dof_x", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF);
+	RNA_def_property_ui_text(prop, "IK X DoF", "Allow movement around the X axis.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+
+	prop= RNA_def_property(srna, "ik_dof_y", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF);
+	RNA_def_property_ui_text(prop, "IK Y DoF", "Allow movement around the Y axis.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+
+	prop= RNA_def_property(srna, "ik_dof_z", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_ZDOF);
+	RNA_def_property_ui_text(prop, "IK Z DoF", "Allow movement around the Z axis.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+
+	prop= RNA_def_property(srna, "ik_limit_x", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_XLIMIT);
+	RNA_def_property_ui_text(prop, "IK X Limit", "Limit movement around the X axis.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+
+	prop= RNA_def_property(srna, "ik_limit_y", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_YLIMIT);
+	RNA_def_property_ui_text(prop, "IK Y Limit", "Limit movement around the Y axis.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+
+	prop= RNA_def_property(srna, "ik_limit_z", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_ZLIMIT);
+	RNA_def_property_ui_text(prop, "IK Z Limit", "Limit movement around the Z axis.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	
 	prop= RNA_def_property(srna, "ik_min_x", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmin[0]");
 	RNA_def_property_range(prop, -180.0f, 0.0f);
@@ -496,11 +559,31 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f,1.0f);
 	RNA_def_property_ui_text(prop, "IK Stretch", "Allow scaling of the bone for IK.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
-	prop= RNA_def_property(srna, "custom", PROP_POINTER, PROP_NONE);
+	
+	/* custom bone shapes */
+	prop= RNA_def_property(srna, "custom_shape", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "custom");
+	RNA_def_property_struct_type(prop, "Object");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Custom Object", "Object that defines custom draw type for this bone.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
-
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
+	
+	/* bone groups */
+	prop= RNA_def_property(srna, "bone_group_index", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "agrp_index");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_int_funcs(prop, "rna_PoseChannel_bone_group_index_get", "rna_PoseChannel_bone_group_index_set", "rna_PoseChannel_bone_group_index_range");
+	RNA_def_property_ui_text(prop, "Bone Group Index", "Bone Group this pose channel belongs to (0=no group).");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
+	
+	prop= RNA_def_property(srna, "bone_group", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "BoneGroup");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_pointer_funcs(prop, "rna_PoseChannel_bone_group_get", "rna_PoseChannel_bone_group_set", NULL);
+	RNA_def_property_ui_text(prop, "Bone Group", "Bone Group this pose channel belongs to");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
+	
+	/* transform locks */
 	prop= RNA_def_property(srna, "lock_location", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_LOCX);
 	RNA_def_property_array(prop, 3);
@@ -541,8 +624,9 @@ static void rna_def_pose(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "active_bone_group", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "BoneGroup");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_pointer_funcs(prop, "rna_Pose_active_bone_group_get", "rna_Pose_active_bone_group_set", NULL);
-	RNA_def_property_ui_text(prop, "Active Bone Group", "Bone groups of the pose.");
+	RNA_def_property_ui_text(prop, "Active Bone Group", "Active bone group for this pose.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "active_bone_group_index", PROP_INT, PROP_NONE);

From 971435f2a1332f897be00ce9ced3e7721d20994b Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 23 Aug 2009 13:15:10 +0000
Subject: [PATCH 220/577] * Compile fix after merge - disabled high-res smoke
 rendering in voxeldata texture. Will re-enable when the modifier situation
 has been worked out.

---
 source/blender/render/intern/source/voxeldata.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 81fd1a408e1..ff076579788 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -166,11 +166,12 @@ void init_frame_smoke(Render *re, VoxelData *vd, Tex *tex)
 		SmokeModifierData *smd = (SmokeModifierData *)md;
 		
 		if(smd->domain && smd->domain->fluid) {
-			int big = (smd->domain->flags & MOD_SMOKE_HIGHRES);
+			//int big = (smd->domain->flags & MOD_SMOKE_HIGHRES);
+			int big=0;
 			
 			if (big) {
-				smoke_turbulence_get_res(smd->domain->wt, vd->resol);
-				vd->dataset = smoke_turbulence_get_density(smd->domain->wt);
+				//smoke_turbulence_get_res(smd->domain->wt, vd->resol);
+				//vd->dataset = smoke_turbulence_get_density(smd->domain->wt);
 			} else {
 				VECCOPY(vd->resol, smd->domain->res);
 				vd->dataset = smoke_get_density(smd->domain->fluid);

From 2c5cbd4c7c9d2cd3ee8bb25f1bfdced6781b58fd Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Sun, 23 Aug 2009 17:03:06 +0000
Subject: [PATCH 221/577] 2.5/Sculpt:

* Deleted unused file
---
 .../editors/sculpt_paint/sculpt_stroke.c      | 274 ------------------
 1 file changed, 274 deletions(-)
 delete mode 100644 source/blender/editors/sculpt_paint/sculpt_stroke.c

diff --git a/source/blender/editors/sculpt_paint/sculpt_stroke.c b/source/blender/editors/sculpt_paint/sculpt_stroke.c
deleted file mode 100644
index 554ff580358..00000000000
--- a/source/blender/editors/sculpt_paint/sculpt_stroke.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2007 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- * Storage and manipulation of sculptmode brush strokes.
- *
- */
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_listBase.h"
-#include "DNA_scene_types.h"
-
-#include "BKE_sculpt.h"
-#include "BLI_blenlib.h"
-#include "BIF_gl.h"
-
-#include "sculpt_intern.h"
-
-#include <math.h>
-
-/* Temporary storage of input stroke control points */
-typedef struct StrokePoint {
-	struct StrokePoint *next, *prev;
-	short x, y;
-} StrokePoint;
-typedef struct SculptStroke {
-	short (*loc)[2];
-	int max;
-	int index;
-	float length;
-	ListBase final;
-	StrokePoint *final_mem;
-	float offset;
-} SculptStroke;
-
-SculptStroke *sculpt_stroke_new(const int max)
-{
-	SculptStroke *stroke = MEM_callocN(sizeof(SculptStroke), "SculptStroke");
-	stroke->loc = MEM_callocN(sizeof(short) * 4 * max, "SculptStroke.loc");
-	stroke->max = max;
-	stroke->index = -1;
-	return stroke;
-}
-
-void sculpt_stroke_free(SculptStroke *stroke)
-{
-	if(stroke) {
-		if(stroke->loc) MEM_freeN(stroke->loc);
-		if(stroke->final_mem) MEM_freeN(stroke->final_mem);
-
-		MEM_freeN(stroke);
-	}
-}
-
-void sculpt_stroke_add_point(SculptStroke *stroke, const short x, const short y)
-{
-	const int next = stroke->index + 1;
-
-	if(stroke->index == -1) {
-		stroke->loc[0][0] = x;
-		stroke->loc[0][1] = y;
-		stroke->index = 0;
-	}
-	else if(next < stroke->max) {
-		const int dx = x - stroke->loc[stroke->index][0];
-		const int dy = y - stroke->loc[stroke->index][1];
-		stroke->loc[next][0] = x;
-		stroke->loc[next][1] = y;
-		stroke->length += sqrt(dx*dx + dy*dy);
-		stroke->index = next;
-	}
-}
-
-static void sculpt_stroke_smooth(SculptStroke *stroke)
-{
-	/* Apply smoothing (exclude the first and last points)*/
-	StrokePoint *p = stroke->final.first;
-	if(p && p->next && p->next->next) {
-		for(p = p->next->next; p && p->next && p->next->next; p = p->next) {
-			p->x = p->prev->prev->x*0.1 + p->prev->x*0.2 + p->x*0.4 + p->next->x*0.2 + p->next->next->x*0.1;
-			p->y = p->prev->prev->y*0.1 + p->prev->y*0.2 + p->y*0.4 + p->next->y*0.2 + p->next->next->y*0.1;
-		}
-	}	
-}
-
-static void sculpt_stroke_create_final(SculptStroke *stroke)
-{
-	if(stroke) {
-		StrokePoint *p, *pnext;
-		int i;
-
-		/* Copy loc into final */
-		if(stroke->final_mem)
-			MEM_freeN(stroke->final_mem);
-		stroke->final_mem = MEM_callocN(sizeof(StrokePoint) * (stroke->index + 1) * 2, "SculptStroke.final");
-		stroke->final.first = stroke->final.last = NULL;
-		for(i = 0; i <= stroke->index; ++i) {
-			p = &stroke->final_mem[i];
-			p->x = stroke->loc[i][0];
-			p->y = stroke->loc[i][1];
-			BLI_addtail(&stroke->final, p);
-		}
-
-		/* Remove shortest edges */
-		if(stroke->final.first) {
-			for(p = ((StrokePoint*)stroke->final.first)->next; p && p->next; p = pnext) {
-				const int dx = p->x - p->prev->x;
-				const int dy = p->y - p->prev->y;
-				const float len = sqrt(dx*dx + dy*dy);
-				pnext = p->next;
-				if(len < 10) {
-					BLI_remlink(&stroke->final, p);
-				}
-			}
-		}
-
-		sculpt_stroke_smooth(stroke);
-
-		/* Subdivide edges */
-		for(p = stroke->final.first; p && p->next; p = pnext) {
-			StrokePoint *np = &stroke->final_mem[i++];
-
-			pnext = p->next;
-			np->x = (p->x + p->next->x) / 2;
-			np->y = (p->y + p->next->y) / 2;
-			BLI_insertlink(&stroke->final, p, np);
-		}
-
-		sculpt_stroke_smooth(stroke);
-	}
-}
-
-static float sculpt_stroke_seglen(StrokePoint *p1, StrokePoint *p2)
-{
-	int dx = p2->x - p1->x;
-	int dy = p2->y - p1->y;
-	return sqrt(dx*dx + dy*dy);
-}
-
-static float sculpt_stroke_final_length(SculptStroke *stroke)
-{
-	StrokePoint *p;
-	float len = 0;
-	for(p = stroke->final.first; p && p->next; ++p)
-		len += sculpt_stroke_seglen(p, p->next);
-	return len;
-}
-
-/* If partial is nonzero, cuts off apply after that length has been processed */
-static StrokePoint *sculpt_stroke_apply_generic(Sculpt *sd, SculptStroke *stroke, const int partial)
-{
-	const int sdspace = 0; //XXX: sd->spacing;
-	const short spacing = sdspace > 0 ? sdspace : 2;
-	const int dots = sculpt_stroke_final_length(stroke) / spacing;
-	int i;
-	StrokePoint *p = stroke->final.first;
-	float startloc = stroke->offset;
-
-	for(i = 0; i < dots && p && p->next; ++i) {
-		const float dotloc = spacing * i;
-		short co[2];
-		float len = sculpt_stroke_seglen(p, p->next);
-		float u, v;
-
-		/* Find edge containing dot */
-		while(dotloc > startloc + len && p && p->next && p->next->next) {
-			p = p->next;
-			startloc += len;
-			len = sculpt_stroke_seglen(p, p->next);
-		}
-
-		if(!p || !p->next || dotloc > startloc + len)
-			break;
-
-		if(partial && startloc > partial) {
-			/* Calculate offset for next stroke segment */
-			stroke->offset = startloc + len - dotloc;
-			break;
-		}
-
-		u = (dotloc - startloc) / len;
-		v = 1 - u;
-					
-		co[0] = p->x*v + p->next->x*u;
-		co[1] = p->y*v + p->next->y*u;
-
-		//do_symmetrical_brush_actions(sd, a, co, NULL);
-	}
-
-	return p ? p->next : NULL;
-}
-
-void sculpt_stroke_apply(Sculpt *sd, SculptStroke *stroke)
-{
-	/* TODO: make these values user-modifiable? */
-	const int partial_len = 100;
-	const int min_len = 200;
-
-	if(stroke) {
-		sculpt_stroke_create_final(stroke);
-
-		if(sculpt_stroke_final_length(stroke) > min_len) {
-			StrokePoint *p = sculpt_stroke_apply_generic(sd, stroke, partial_len);
-
-			/* Replace remaining values in stroke->loc with remaining stroke->final values */
-			stroke->index = -1;
-			stroke->length = 0;
-			for(; p; p = p->next) {
-				++stroke->index;
-				stroke->loc[stroke->index][0] = p->x;
-				stroke->loc[stroke->index][1] = p->y;
-				if(p->next) {
-					stroke->length += sculpt_stroke_seglen(p, p->next);
-				}
-			}
-		}
-	}
-}
-
-void sculpt_stroke_apply_all(Sculpt *sd, SculptStroke *stroke)
-{
-	sculpt_stroke_create_final(stroke);
-
-	if(stroke) {
-		sculpt_stroke_apply_generic(sd, stroke, 0);
-	}
-}
-
-/* XXX: drawing goes elsewhere */
-void sculpt_stroke_draw(SculptStroke *stroke)
-{
-	if(stroke) {
-		StrokePoint *p;
-
-		/* Draws the original stroke */
-		/*glColor3f(1, 0, 0);		
-		glBegin(GL_LINE_STRIP);
-		for(i = 0; i <= stroke->index; ++i)
-			glVertex2s(stroke->loc[i][0], stroke->loc[i][1]);
-		glEnd();*/
-
-		/* Draws the smoothed stroke */
-		glColor3f(0, 1, 0);
-		glBegin(GL_LINE_STRIP);
-		for(p = stroke->final.first; p; p = p->next)
-			glVertex2s(p->x, p->y);
-		glEnd();
-	}
-}

From 77ec3a1239b33e2cf5eaebd611b68d8de5a56f19 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 23 Aug 2009 17:33:34 +0000
Subject: [PATCH 222/577] deprecated world settings were being used making new
 world's have zero gravity in the game engine. Double checked these aren't
 used anymore by renaming the vars in DNA_world_types.h

---
 .../gameengine/Converter/BL_BlenderDataConversion.cpp  |  4 ++--
 source/gameengine/Ketsji/KX_KetsjiEngine.cpp           | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 6cb4e980a3d..ed03bb0bdd5 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2485,10 +2485,10 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 			}
 		}
 		if (occlusion)
-			kxscene->SetDbvtOcclusionRes(blenderscene->world->occlusionRes);
+			kxscene->SetDbvtOcclusionRes(blenderscene->gm.occlusionRes);
 	}
 	if (blenderscene->world)
-		kxscene->GetPhysicsEnvironment()->setNumTimeSubSteps(blenderscene->world->physubstep);
+		kxscene->GetPhysicsEnvironment()->setNumTimeSubSteps(blenderscene->gm.physubstep);
 
 	// now that the scenegraph is complete, let's instantiate the deformers.
 	// We need that to create reusable derived mesh and physic shapes
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 13643e3a1ac..4117e493322 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -382,12 +382,12 @@ void KX_KetsjiEngine::StartEngine(bool clearIpo)
 	m_firstframe = true;
 	m_bInitialized = true;
 	// there is always one scene enabled at startup
-	World* world = m_scenes[0]->GetBlenderScene()->world;
-	if (world)
+	Scene* scene = m_scenes[0]->GetBlenderScene();
+	if (scene)
 	{
-		m_ticrate = world->ticrate ? world->ticrate : DEFAULT_LOGIC_TIC_RATE;
-		m_maxLogicFrame = world->maxlogicstep ? world->maxlogicstep : 5;
-		m_maxPhysicsFrame = world->maxphystep ? world->maxlogicstep : 5;
+		m_ticrate = scene->gm.ticrate ? scene->gm.ticrate : DEFAULT_LOGIC_TIC_RATE;
+		m_maxLogicFrame = scene->gm.maxlogicstep ? scene->gm.maxlogicstep : 5;
+		m_maxPhysicsFrame = scene->gm.maxphystep ? scene->gm.maxlogicstep : 5;
 	}
 	else
 	{

From bb4f5801d1e4457beeee5d52dbd5b18863ac5d03 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 23 Aug 2009 18:20:31 +0000
Subject: [PATCH 223/577] revert previous change, povray rendering works again,
 somehow I managed to render with previous changes (probably failed to reload
 the module and was using the register un-modified version)

---
 release/io/engine_render_pov.py | 160 ++++++++++++++++----------------
 1 file changed, 78 insertions(+), 82 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index e2f7ae5d454..f064add505b 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -635,11 +635,89 @@ def write_pov_ini(filename_ini, filename_pov, filename_image):
 	
 	file.close()
 
+# Radiosity panel, use in the scene for now.
+FloatProperty= bpy.types.Scene.FloatProperty
+IntProperty= bpy.types.Scene.IntProperty
+BoolProperty= bpy.types.Scene.BoolProperty
+
+# Not a real pov option, just to know if we should write
+BoolProperty(	attr="pov_radio_enable",
+				name="Enable Radiosity",
+				description="Enable povrays radiosity calculation.",
+				default= False)
+BoolProperty(	attr="pov_radio_display_advanced",
+				name="Advanced Options",
+				description="Show advanced options.",
+				default= False)
+
+# Real pov options
+FloatProperty(	attr="pov_radio_adc_bailout",
+				name="ADC Bailout",
+				description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results.",
+				min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default= 0.01)
+
+BoolProperty(	attr="pov_radio_always_sample",
+				name="Always Sample",
+				description="Only use the data from the pretrace step and not gather any new samples during the final radiosity pass..",
+				default= True)
+
+FloatProperty(	attr="pov_radio_brightness",
+				name="Brightness",
+				description="Ammount objects are brightened before being returned upwards to the rest of the system.",
+				min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default= 1.0)
+
+IntProperty(	attr="pov_radio_count",
+				name="Ray Count",
+				description="number of rays that are sent out whenever a new radiosity value has to be calculated.",
+				min=1, max=1600, default= 35)
+
+FloatProperty(	attr="pov_radio_error_bound",
+				name="Error Bound",
+				description="one of the two main speed/quality tuning values, lower values are more accurate.",
+				min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default= 1.8)
+
+FloatProperty(	attr="pov_radio_gray_threshold",
+				name="Gray Threshold",
+				description="one of the two main speed/quality tuning values, lower values are more accurate.",
+				min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0)
+								
+FloatProperty(	attr="pov_radio_low_error_factor",
+				name="Low Error Factor",
+				description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
+				min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5)
+
+# max_sample - not available yet
+BoolProperty(	attr="pov_radio_media", 
+				name="Media",
+				description="Radiosity estimation can be affected by media.",
+				default= False)
+
+FloatProperty(	attr="pov_radio_minimum_reuse",
+				name="Minimum Reuse",
+				description="Fraction of the screen width which sets the minimum radius of reuse for each sample point (At values higher than 2% expect errors).",
+				min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default= 0.015)
+				
+IntProperty(	attr="pov_radio_nearest_count",
+				name="Nearest Count",
+				description="Number of old ambient values blended together to create a new interpolated value.",
+				min=1, max=20, default= 5)
+				
+BoolProperty(	attr="pov_radio_normal",
+				name="Normals",
+				description="Radiosity estimation can be affected by normals.",
+				default= False)
+
+IntProperty(	attr="pov_radio_recursion_limit",
+				name="Recursion Limit",
+				description="how many recursion levels are used to calculate the diffuse inter-reflection.",
+				min=1, max=20, default= 3)
+	
 
 class PovrayRender(bpy.types.RenderEngine):
 	__idname__ = 'POVRAY_RENDER'
 	__label__ = "Povray"
 	DELAY = 0.02
+	
 	def _export(self, scene):
 		import tempfile
 		
@@ -761,11 +839,8 @@ class PovrayRender(bpy.types.RenderEngine):
 		
 		self._cleanup()
 
-
 bpy.types.register(PovrayRender)
 
-
-
 # Use some of the existing buttons.
 import buttons_scene
 buttons_scene.SCENE_PT_render.COMPAT_ENGINES.add('POVRAY_RENDER')
@@ -800,88 +875,9 @@ class RenderButtonsPanel(bpy.types.Panel):
 		rd = context.scene.render_data
 		return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
 
-# Radiosity panel, use in the scene for now.
-FloatProperty= bpy.props.FloatProperty
-IntProperty= bpy.props.IntProperty
-BoolProperty= bpy.props.BoolProperty
-		
 class SCENE_PT_povray_radiosity(RenderButtonsPanel):
 	__label__ = "Radiosity"
 	COMPAT_ENGINES = set(['POVRAY_RENDER'])
-	
-	__props__ = [ \
-		# Not a real pov option, just to know if we should write
-		BoolProperty(	attr="pov_radio_enable",
-						name="Enable Radiosity",
-						description="Enable povrays radiosity calculation.",
-						default= False),
-		BoolProperty(	attr="pov_radio_display_advanced",
-						name="Advanced Options",
-						description="Show advanced options.",
-						default= False),
-
-		# Real pov options
-		FloatProperty(	attr="pov_radio_adc_bailout",
-						name="ADC Bailout",
-						description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results.",
-						min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default= 0.01),
-
-		BoolProperty(	attr="pov_radio_always_sample",
-						name="Always Sample",
-						description="Only use the data from the pretrace step and not gather any new samples during the final radiosity pass..",
-						default= True),
-
-		FloatProperty(	attr="pov_radio_brightness",
-						name="Brightness",
-						description="Ammount objects are brightened before being returned upwards to the rest of the system.",
-						min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default= 1.0),
-
-		IntProperty(	attr="pov_radio_count",
-						name="Ray Count",
-						description="number of rays that are sent out whenever a new radiosity value has to be calculated.",
-						min=1, max=1600, default= 35),
-
-		FloatProperty(	attr="pov_radio_error_bound",
-						name="Error Bound",
-						description="one of the two main speed/quality tuning values, lower values are more accurate.",
-						min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default= 1.8),
-
-		FloatProperty(	attr="pov_radio_gray_threshold",
-						name="Gray Threshold",
-						description="one of the two main speed/quality tuning values, lower values are more accurate.",
-						min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0),
-										
-		FloatProperty(	attr="pov_radio_low_error_factor",
-						name="Low Error Factor",
-						description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
-						min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5),
-		
-		# max_sample - not available yet
-		BoolProperty(	attr="pov_radio_media", 
-						name="Media",
-						description="Radiosity estimation can be affected by media.",
-						default= False),
-
-		FloatProperty(	attr="pov_radio_minimum_reuse",
-						name="Minimum Reuse",
-						description="Fraction of the screen width which sets the minimum radius of reuse for each sample point (At values higher than 2% expect errors).",
-						min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default= 0.015),
-						
-		IntProperty(	attr="pov_radio_nearest_count",
-						name="Nearest Count",
-						description="Number of old ambient values blended together to create a new interpolated value.",
-						min=1, max=20, default= 5),
-						
-		BoolProperty(	attr="pov_radio_normal",
-						name="Normals",
-						description="Radiosity estimation can be affected by normals.",
-						default= False),
-
-		IntProperty(	attr="pov_radio_recursion_limit",
-						name="Recursion Limit",
-						description="how many recursion levels are used to calculate the diffuse inter-reflection.",
-						min=1, max=20, default= 3),
-	]
 
 	def draw_header(self, context):
 		layout = self.layout

From 7da7103d1aad0294e0e7c39eef1716b276a94259 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sun, 23 Aug 2009 21:56:32 +0000
Subject: [PATCH 224/577] UI

Changed the rounding of action buttons. The round style looked pleasing when they were isolated, viewed by themselves, but looked terrible when grouped, or at small sizes with icons as it was often used. The old Filebrowse or Render This Window buttons were examples of how badly they looked with an icon, and the rounding in the tools area made for some weird visual shapes. When combined in groups of widgets, such as the datablock selectors it looked even weirder, because one side of the group would be square and the other would be round, causing some spatial clashes.

http://www.reynish.com/files/blender25/actionbuttons_new.png

Also tweaked the tools sub-area color which stood out as being much brighter than the rest of the UI. When the tools area was open in the default layout, the overall impression was asymmetrical, non-harmonic.
---
 .../blender/editors/interface/interface_widgets.c  | 14 +++++++-------
 source/blender/editors/interface/resources.c       |  1 +
 source/blender/makesrna/intern/rna_modifier.c      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 48de2343c97..ba0d1900344 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1085,7 +1085,7 @@ static struct uiWidgetColors wcol_tool= {
 	{255, 255, 255, 255},
 	
 	1,
-	25, -25
+	15, -15
 };
 
 static struct uiWidgetColors wcol_box= {
@@ -1897,7 +1897,7 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
 	widget_init(&wtb);
 	
 	/* half rounded */
-	round_box_edges(&wtb, roundboxalign, rect, 4.0f);
+	round_box_edges(&wtb, roundboxalign, rect, 5.0f);
 		
 	ui_get_but_vectorf(but, col);
 	wcol->inner[0]= FTOCHAR(col[0]);
@@ -1916,7 +1916,7 @@ static void widget_textbut(uiWidgetColors *wcol, rcti *rect, int state, int roun
 	widget_init(&wtb);
 	
 	/* half rounded */
-	round_box_edges(&wtb, roundboxalign, rect, 5.0f);
+	round_box_edges(&wtb, roundboxalign, rect, 4.0f);
 	
 	widgetbase_draw(&wtb, wcol);
 
@@ -1950,8 +1950,8 @@ static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int
 		
 		widget_init(&wtb);
 		
-		/* fully rounded */
-		round_box_edges(&wtb, 15, rect, rad);
+		/* half rounded */
+		round_box_edges(&wtb, 15, rect, 4.0f);
 		
 		widgetbase_draw(&wtb, wcol);
 	}
@@ -2049,8 +2049,8 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int rou
 	
 	widget_init(&wtb);
 	
-	/* fully rounded */
-	round_box_edges(&wtb, roundboxalign, rect, rad);
+	/* half rounded */
+	round_box_edges(&wtb, roundboxalign, rect, 4.0f);
 
 	widgetbase_draw(&wtb, wcol);
 }
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 5b51d898235..8aaede7515a 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -445,6 +445,7 @@ void ui_theme_init_userdef(void)
 	SETCOL(btheme->tv3d.text_hi, 255, 255, 255, 255);
 	
 	SETCOLF(btheme->tv3d.header,	0.45, 0.45, 0.45, 1.0);
+	SETCOLF(btheme->tv3d.button,	0.45, 0.45, 0.45, 1.0);
 	SETCOL(btheme->tv3d.panel,      165, 165, 165, 127);
 	
 	SETCOL(btheme->tv3d.shade1,  160, 160, 160, 100);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index bfd93a4218b..4845ad28d47 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -55,7 +55,7 @@ EnumPropertyItem modifier_type_items[] ={
 	{eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, "Multiresolution", ""},
 	{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
 	{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""},
-	{0, "", 0, "Deformers", ""},
+	{0, "", 0, "Deform", ""},
 	{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
 	{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
 	{eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""},

From c1edc2f3135f7b0f7936270b2edbdef95f7a66bf Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 23 Aug 2009 22:11:19 +0000
Subject: [PATCH 225/577] * Fix for rendering wire materials

---
 source/blender/render/intern/source/shadeinput.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 7887392f1d2..ede3c2e0503 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -188,11 +188,11 @@ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr)
 		/* copy all relevant material vars, note, keep this synced with render_types.h */
 		shade_input_init_material(shi);
 		
-		if (shi->mat->material_type == MA_TYPE_SURFACE) {
-			shade_material_loop(shi, shr);
-		} else if (shi->mat->material_type == MA_TYPE_VOLUME) {
+		if (shi->mat->material_type == MA_TYPE_VOLUME) {
 			if(R.r.mode & R_RAYTRACE)
 				shade_volume_outside(shi, shr);
+		} else { /* MA_TYPE_SURFACE, MA_TYPE_WIRE */
+			shade_material_loop(shi, shr);
 		}
 	}
 	

From 53f66e5c88d1f08ad5df83df67b0f0a27366c8df Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Sun, 23 Aug 2009 22:13:56 +0000
Subject: [PATCH 226/577] 2.5 3DView: Patch by Lorenzo Pierfederici (lento).
 Many thanks!

* Ported some more menus to python (Pose, Particle...)
* Some cleanup and reorganization in the python file to reduce code. :)
* Cleanup of old C buttons code.
---
 release/ui/space_view3d.py                    |  389 ++++--
 source/blender/editors/include/UI_interface.h |    1 -
 .../editors/space_view3d/view3d_header.c      | 1129 +----------------
 source/blender/makesrna/intern/rna_ui_api.c   |    2 -
 4 files changed, 274 insertions(+), 1247 deletions(-)

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 8e5bc100af1..b88ecaba5cd 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -24,8 +24,7 @@ class VIEW3D_HT_header(bpy.types.Header):
 			sub.itemM("VIEW3D_MT_view")
 			
 			# Select Menu
-			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
-				# XXX: Particle Mode has Select Menu.
+			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'):
 				sub.itemM("VIEW3D_MT_select_%s" % mode_string)
 			
 			if edit_object:
@@ -33,17 +32,44 @@ class VIEW3D_HT_header(bpy.types.Header):
 			elif object:
 				ob_mode_string = object.mode
 				
-				if ob_mode_string == 'OBJECT':
-					sub.itemM("VIEW3D_MT_object")
-				elif ob_mode_string == 'SCULPT':
-					sub.itemM("VIEW3D_MT_sculpt")
-				elif ob_mode_string == 'VERTEX_PAINT':
-					sub.itemM("VIEW3D_MT_vertex_paint")
+				if mode_string not in ['PAINT_WEIGHT', 'PAINT_TEXTURE']:
+					sub.itemM("VIEW3D_MT_%s" % mode_string)
 
 		layout.template_header_3D()
 
 # ********** Menu **********
 
+# ********** Utilities **********
+
+class VIEW3D_MT_showhide(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Show/Hide"
+	_operator_name = ""
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("%s.reveal" % self._operator_name, text="Show Hidden")
+		layout.itemO("%s.hide" % self._operator_name, text="Hide Selected")
+		layout.item_booleanO("%s.hide" % self._operator_name, "unselected", True, text="Hide Unselected")
+
+class VIEW3D_MT_snap(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Snap"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("view3d.snap_selected_to_grid")
+		layout.itemO("view3d.snap_selected_to_cursor")
+		layout.itemO("view3d.snap_selected_to_center")
+		
+		layout.itemS()
+		
+		layout.itemO("view3d.snap_cursor_to_selected")
+		layout.itemO("view3d.snap_cursor_to_grid")
+		layout.itemO("view3d.snap_cursor_to_active")
+
 # ********** View menus **********
 
 class VIEW3D_MT_view(bpy.types.Menu):
@@ -63,30 +89,21 @@ class VIEW3D_MT_view(bpy.types.Menu):
 		layout.item_enumO("view3d.viewnumpad", "type", 'FRONT')
 		layout.item_enumO("view3d.viewnumpad", "type", 'RIGHT')
 		
-		# layout.itemM("VIEW3D_MT_view_cameras", text="Cameras")
+		layout.itemM("VIEW3D_MT_view_cameras", text="Cameras")
 		
 		layout.itemS()
-
+		
 		layout.itemO("view3d.view_persportho")
 		
 		layout.itemS()
 		
-		# layout.itemO("view3d.view_show_all_layers")
-		
-		# layout.itemS()
-		
-		# layout.itemO("view3d.view_local_view")
-		# layout.itemO("view3d.view_global_view")
-		
-		# layout.itemS()
-		
 		layout.itemM("VIEW3D_MT_view_navigation")
-		# layout.itemM("VIEW3D_MT_view_align", text="Align View")
+		layout.itemM("VIEW3D_MT_view_align")
 		
 		layout.itemS()
 
 		layout.operator_context = "INVOKE_REGION_WIN"
-
+		
 		layout.itemO("view3d.clip_border")
 		layout.itemO("view3d.zoom_border")
 		
@@ -99,7 +116,7 @@ class VIEW3D_MT_view(bpy.types.Menu):
 		
 		layout.itemO("screen.region_foursplit", text="Toggle Quad View")
 		layout.itemO("screen.screen_full_area", text="Toggle Full Screen")
-		
+
 class VIEW3D_MT_view_navigation(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Navigation"
@@ -107,9 +124,6 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		# layout.itemO("view3d.view_fly_mode")
-		# layout.itemS()
-		
 		layout.items_enumO("view3d.view_orbit", "type")
 		
 		layout.itemS()
@@ -121,6 +135,22 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu):
 		layout.item_floatO("view3d.zoom", "delta", 1.0, text="Zoom In")
 		layout.item_floatO("view3d.zoom", "delta", -1.0, text="Zoom Out")
 
+class VIEW3D_MT_view_align(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Align View"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("view3d.view_center")
+		
+class VIEW3D_MT_view_cameras(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Cameras"
+
+	def draw(self, context):
+		layout = self.layout
+
 # ********** Select menus, suffix from context.mode **********
 
 class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
@@ -187,9 +217,6 @@ class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		#layout.itemO("particle.select_last")
-		#layout.itemO("particle.select_first")
-		
 		layout.itemO("particle.select_more")
 		layout.itemO("particle.select_less")
 
@@ -303,12 +330,12 @@ class VIEW3D_MT_select_EDIT_METABALL(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemL(text="Select/Deselect All")
-		layout.itemL(text="Inverse")
+		layout.itemO("mball.select_deselect_all_metaelems")
+		layout.itemO("mball.select_inverse_metaelems")
 		
 		layout.itemS()
 		
-		layout.itemL(text="Random")
+		layout.itemO("mball.select_random_metaelems")
 
 class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
@@ -363,7 +390,7 @@ class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
 
 # ********** Object menu **********
 
-class VIEW3D_MT_object(bpy.types.Menu):
+class VIEW3D_MT_OBJECT(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__context__ = "objectmode"
 	__label__ = "Object"
@@ -371,8 +398,8 @@ class VIEW3D_MT_object(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemM("VIEW3D_MT_object_clear")
-		layout.itemM("VIEW3D_MT_object_snap")
+		layout.itemM("VIEW3D_MT_OBJECT_clear")
+		layout.itemM("VIEW3D_MT_snap")
 		
 		layout.itemS()
 		
@@ -388,10 +415,10 @@ class VIEW3D_MT_object(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemM("VIEW3D_MT_object_parent")
-		layout.itemM("VIEW3D_MT_object_track")
-		layout.itemM("VIEW3D_MT_object_group")
-		layout.itemM("VIEW3D_MT_object_constraints")
+		layout.itemM("VIEW3D_MT_OBJECT_parent")
+		layout.itemM("VIEW3D_MT_OBJECT_track")
+		layout.itemM("VIEW3D_MT_OBJECT_group")
+		layout.itemM("VIEW3D_MT_OBJECT_constraints")
 		
 		layout.itemS()
 		
@@ -399,9 +426,9 @@ class VIEW3D_MT_object(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemM("VIEW3D_MT_object_show")
+		layout.itemM("VIEW3D_MT_OBJECT_showhide")
 		
-class VIEW3D_MT_object_clear(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_clear(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Clear"
 
@@ -413,24 +440,7 @@ class VIEW3D_MT_object_clear(bpy.types.Menu):
 		layout.itemO("object.scale_clear")
 		layout.itemO("object.origin_clear")
 		
-class VIEW3D_MT_object_snap(bpy.types.Menu):
-	__space_type__ = 'VIEW_3D'
-	__label__ = "Snap"
-
-	def draw(self, context):
-		layout = self.layout
-		
-		layout.itemO("view3d.snap_selected_to_grid")
-		layout.itemO("view3d.snap_selected_to_cursor")
-		layout.itemO("view3d.snap_selected_to_center")
-		
-		layout.itemS()
-		
-		layout.itemO("view3d.snap_cursor_to_selected")
-		layout.itemO("view3d.snap_cursor_to_grid")
-		layout.itemO("view3d.snap_cursor_to_active")
-		
-class VIEW3D_MT_object_parent(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_parent(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Parent"
 
@@ -440,7 +450,7 @@ class VIEW3D_MT_object_parent(bpy.types.Menu):
 		layout.itemO("object.parent_set")
 		layout.itemO("object.parent_clear")
 		
-class VIEW3D_MT_object_track(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_track(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Track"
 
@@ -450,7 +460,7 @@ class VIEW3D_MT_object_track(bpy.types.Menu):
 		layout.itemO("object.track_set")
 		layout.itemO("object.track_clear")
 		
-class VIEW3D_MT_object_group(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_group(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Group"
 
@@ -465,7 +475,7 @@ class VIEW3D_MT_object_group(bpy.types.Menu):
 		layout.itemO("group.objects_add_active")
 		layout.itemO("group.objects_remove_active")
 		
-class VIEW3D_MT_object_constraints(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_constraints(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Constraints"
 
@@ -475,20 +485,20 @@ class VIEW3D_MT_object_constraints(bpy.types.Menu):
 		layout.itemO("object.constraint_add_with_targets")
 		layout.itemO("object.constraints_clear")
 		
-class VIEW3D_MT_object_show(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_showhide(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("object.restrictview_clear")
-		layout.itemO("object.restrictview_set")
+		layout.itemO("object.restrictview_clear", text="Show Hidden")
+		layout.itemO("object.restrictview_set", text="Hide Selected")
 		layout.item_booleanO("object.restrictview_set", "unselected", True, text="Hide Unselected")
 
 # ********** Vertex paint menu **********	
 	
-class VIEW3D_MT_vertex_paint(bpy.types.Menu):
+class VIEW3D_MT_PAINT_VERTEX(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Paint"
 
@@ -503,7 +513,7 @@ class VIEW3D_MT_vertex_paint(bpy.types.Menu):
 
 # ********** Sculpt menu **********	
 	
-class VIEW3D_MT_sculpt(bpy.types.Menu):
+class VIEW3D_MT_SCULPT(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Sculpt"
 
@@ -537,24 +547,172 @@ class VIEW3D_MT_sculpt(bpy.types.Menu):
 				layout.itemR(brush, "persistent")
 				layout.itemO("sculpt.set_persistent_base")
 
-# ********** Edit Menus, suffix from ob.type **********
-
-class VIEW3D_MT_edit_snap(bpy.types.Menu):
+# ********** Particle menu **********	
+	
+class VIEW3D_MT_PARTICLE(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
-	__label__ = "Snap"
+	__label__ = "Particle"
 
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("view3d.snap_selected_to_grid")
-		layout.itemO("view3d.snap_selected_to_cursor")
-		layout.itemO("view3d.snap_selected_to_center")
+		particle_edit = context.tool_settings.particle_edit
+		
+		layout.itemO("particle.mirror")
 		
 		layout.itemS()
 		
-		layout.itemO("view3d.snap_cursor_to_selected")
-		layout.itemO("view3d.snap_cursor_to_grid")
-		layout.itemO("view3d.snap_cursor_to_active")
+		layout.itemO("particle.remove_doubles")
+		layout.itemO("particle.delete")
+		
+		if particle_edit.selection_mode == 'POINT':
+			layout.itemO("particle.subdivide")
+		
+		layout.itemO("particle.rekey")
+		
+		layout.itemS()
+		
+		layout.itemM("VIEW3D_MT_PARTICLE_showhide")
+
+class VIEW3D_MT_PARTICLE_showhide(VIEW3D_MT_showhide):
+	_operator_name = "particle"
+
+# ********** Pose Menu **********
+
+class VIEW3D_MT_POSE(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Pose"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		arm = context.active_object.data
+		
+		if arm.drawtype in ('BBONE', 'ENVELOPE'):
+			layout.item_enumO("tfm.transform", "mode", 'BONESIZE', text="Scale Envelope Distance")
+		
+		layout.itemM("VIEW3D_MT_POSE_transform")
+		
+		layout.itemS()
+		
+		layout.itemO("anim.insert_keyframe_menu")
+		layout.itemO("anim.delete_keyframe_v3d")
+		
+		layout.itemS()
+		
+		layout.itemO("pose.apply")
+		
+		layout.itemS()
+		
+		layout.itemO("pose.copy")
+		layout.itemO("pose.paste")
+		layout.item_booleanO("pose.paste", "flipped", True, text="Paste X-Flipped Pose")
+		
+		layout.itemS()
+		
+		layout.itemM("VIEW3D_MT_POSE_pose")
+		layout.itemM("VIEW3D_MT_POSE_motion")
+		layout.itemM("VIEW3D_MT_POSE_group")
+		
+		layout.itemS()
+		
+		layout.itemM("VIEW3D_MT_POSE_ik")
+		layout.itemM("VIEW3D_MT_POSE_constraints")
+		
+		layout.itemS()
+		
+		layout.item_enumO("pose.autoside_names", "axis", 'XAXIS', text="AutoName Left/Right")
+		layout.item_enumO("pose.autoside_names", "axis", 'YAXIS', text="AutoName Front/Back")
+		layout.item_enumO("pose.autoside_names", "axis", 'ZAXIS', text="AutoName Top/Bottom")
+		
+		layout.itemO("pose.flip_names")
+		
+		layout.itemS()
+		
+		layout.itemO("pose.armature_layers")
+		layout.itemO("pose.bone_layers")
+		
+		layout.itemS()
+		
+		layout.itemM("VIEW3D_MT_POSE_showhide")
+		layout.item_menu_enumO("pose.flags_set", 'mode', text="Bone Settings")
+
+class VIEW3D_MT_POSE_transform(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Clear Transform"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemL(text="Clear User Transform")
+		
+		layout.itemO("pose.loc_clear")
+		layout.itemO("pose.rot_clear")
+		layout.itemO("pose.scale_clear")
+		
+		layout.itemL(text="Clear Origin")
+		
+class VIEW3D_MT_POSE_pose(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Pose Library"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("poselib.browse_interactive")
+		
+		layout.itemS()
+		
+		layout.itemO("poselib.pose_add")
+		layout.itemO("poselib.pose_rename")
+		layout.itemO("poselib.pose_remove")
+
+class VIEW3D_MT_POSE_motion(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Motion Paths"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("pose.paths_calculate")
+		layout.itemO("pose.paths_clear")
+		
+class VIEW3D_MT_POSE_group(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Bone Groups"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("pose.group_assign")
+		layout.itemO("pose.group_add")
+		layout.itemO("pose.group_unassign")
+		layout.itemO("pose.group_remove")
+		
+class VIEW3D_MT_POSE_ik(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Inverse Kinematics"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("pose.ik_add")
+		layout.itemO("pose.ik_clear")
+		
+class VIEW3D_MT_POSE_constraints(bpy.types.Menu):
+	__space_type__ = "VIEW_3D"
+	__label__ = "Constraints"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		layout.itemO("pose.constraint_add_with_targets")
+		layout.itemO("pose.constraints_clear")
+		
+class VIEW3D_MT_POSE_showhide(VIEW3D_MT_showhide):
+	_operator_name = "pose"
+
+# ********** Edit Menus, suffix from ob.type **********
 
 # Edit MESH
 class VIEW3D_MT_edit_MESH(bpy.types.Menu):
@@ -571,7 +729,7 @@ class VIEW3D_MT_edit_MESH(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemM("VIEW3D_MT_edit_snap")
+		layout.itemM("VIEW3D_MT_snap")
 		
 		layout.itemS()
 		
@@ -616,7 +774,7 @@ class VIEW3D_MT_edit_MESH_vertices(bpy.types.Menu):
 		
 		layout.itemO("mesh.vertices_smooth")
 		layout.itemO("mesh.remove_doubles")
-		
+
 class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Edges"
@@ -642,7 +800,7 @@ class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
 		
 		layout.item_enumO("mesh.edge_rotate", "direction", 'CW', text="Rotate Edge CW")
 		layout.item_enumO("mesh.edge_rotate", "direction", 'CCW', text="Rotate Edge CCW")
-		
+
 class VIEW3D_MT_edit_MESH_faces(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
 	__label__ = "Faces"
@@ -679,16 +837,8 @@ class VIEW3D_MT_edit_MESH_normals(bpy.types.Menu):
 		
 		layout.itemO("mesh.flip_normals")
 		
-class VIEW3D_MT_edit_MESH_showhide(bpy.types.Menu):
-	__space_type__ = 'VIEW_3D'
-	__label__ = "Show/Hide"
-
-	def draw(self, context):
-		layout = self.layout
-
-		layout.itemO("mesh.reveal")
-		layout.itemO("mesh.hide")
-		layout.item_booleanO("mesh.hide", "unselected", True, text="Hide Unselected")
+class VIEW3D_MT_edit_MESH_showhide(VIEW3D_MT_showhide):
+	_operator_name = "mesh"
 
 # Edit CURVE
 
@@ -697,8 +847,8 @@ def draw_CURVE(self, context):
 	layout = self.layout
 	
 	settings = context.tool_settings
-
-	layout.itemM("VIEW3D_MT_edit_snap")
+	
+	layout.itemM("VIEW3D_MT_snap")
 	
 	layout.itemS()
 	
@@ -757,16 +907,8 @@ class VIEW3D_MT_edit_CURVE_segments(bpy.types.Menu):
 		layout.itemO("curve.subdivide")
 		layout.itemO("curve.switch_direction")
 
-class VIEW3D_MT_edit_CURVE_showhide(bpy.types.Menu):
-	__space_type__ = 'VIEW_3D'
-	__label__ = "Show/Hide"
-
-	def draw(self, context):
-		layout = self.layout
-		
-		layout.itemO("curve.reveal")
-		layout.itemO("curve.hide")
-		layout.item_booleanO("curve.hide", "unselected", True, text="Hide Unselected")
+class VIEW3D_MT_edit_CURVE_showhide(VIEW3D_MT_showhide):
+	_operator_name = "curve"
 
 # Edit SURFACE
 class VIEW3D_MT_edit_SURFACE(bpy.types.Menu):
@@ -838,7 +980,7 @@ class VIEW3D_MT_edit_META(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemM("VIEW3D_MT_edit_snap")
+		layout.itemM("VIEW3D_MT_snap")
 		
 		layout.itemS()
 		
@@ -861,8 +1003,8 @@ class VIEW3D_MT_edit_META_showhide(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("mball.reveal_metaelems")
-		layout.itemO("mball.hide_metaelems")
+		layout.itemO("mball.reveal_metaelems", text="Show Hidden")
+		layout.itemO("mball.hide_metaelems", text="Hide Selected")
 		layout.item_booleanO("mball.hide_metaelems", "unselected", True, text="Hide Unselected")
 
 # Edit LATTICE
@@ -875,7 +1017,7 @@ class VIEW3D_MT_edit_LATTICE(bpy.types.Menu):
 		
 		settings = context.tool_settings
 
-		layout.itemM("VIEW3D_MT_edit_snap")
+		layout.itemM("VIEW3D_MT_snap")
 		
 		layout.itemS()
 		
@@ -897,7 +1039,7 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 		edit_object = context.edit_object
 		arm = edit_object.data
 		
-		layout.itemM("VIEW3D_MT_edit_snap")
+		layout.itemM("VIEW3D_MT_snap")
 		layout.itemM("VIEW3D_MT_edit_ARMATURE_roll")
 		
 		if arm.drawtype == 'ENVELOPE':
@@ -1108,6 +1250,8 @@ bpy.types.register(VIEW3D_HT_header) # Header
 
 bpy.types.register(VIEW3D_MT_view) #View Menus
 bpy.types.register(VIEW3D_MT_view_navigation)
+bpy.types.register(VIEW3D_MT_view_align)
+bpy.types.register(VIEW3D_MT_view_cameras)
 
 bpy.types.register(VIEW3D_MT_select_OBJECT) # Select Menus
 bpy.types.register(VIEW3D_MT_select_POSE)
@@ -1120,20 +1264,31 @@ bpy.types.register(VIEW3D_MT_select_EDIT_LATTICE)
 bpy.types.register(VIEW3D_MT_select_EDIT_ARMATURE)
 bpy.types.register(VIEW3D_MT_select_FACE) # XXX todo
 
-bpy.types.register(VIEW3D_MT_object) # Object Menu
-bpy.types.register(VIEW3D_MT_object_clear)
-bpy.types.register(VIEW3D_MT_object_snap)
-bpy.types.register(VIEW3D_MT_object_parent)
-bpy.types.register(VIEW3D_MT_object_track)
-bpy.types.register(VIEW3D_MT_object_group)
-bpy.types.register(VIEW3D_MT_object_constraints)
-bpy.types.register(VIEW3D_MT_object_show)
+bpy.types.register(VIEW3D_MT_OBJECT) # Object Menu
+bpy.types.register(VIEW3D_MT_OBJECT_clear)
+bpy.types.register(VIEW3D_MT_OBJECT_parent)
+bpy.types.register(VIEW3D_MT_OBJECT_track)
+bpy.types.register(VIEW3D_MT_OBJECT_group)
+bpy.types.register(VIEW3D_MT_OBJECT_constraints)
+bpy.types.register(VIEW3D_MT_OBJECT_showhide)
 
-bpy.types.register(VIEW3D_MT_sculpt) # Sculpt Menu
+bpy.types.register(VIEW3D_MT_SCULPT) # Sculpt Menu
 
-bpy.types.register(VIEW3D_MT_vertex_paint)
+bpy.types.register(VIEW3D_MT_PAINT_VERTEX)
 
-bpy.types.register(VIEW3D_MT_edit_snap) # Edit Menus
+bpy.types.register(VIEW3D_MT_PARTICLE) # Particle Menu
+bpy.types.register(VIEW3D_MT_PARTICLE_showhide)
+
+bpy.types.register(VIEW3D_MT_POSE) # POSE Menu
+bpy.types.register(VIEW3D_MT_POSE_transform)
+bpy.types.register(VIEW3D_MT_POSE_pose)
+bpy.types.register(VIEW3D_MT_POSE_motion)
+bpy.types.register(VIEW3D_MT_POSE_group)
+bpy.types.register(VIEW3D_MT_POSE_ik)
+bpy.types.register(VIEW3D_MT_POSE_constraints)
+bpy.types.register(VIEW3D_MT_POSE_showhide)
+
+bpy.types.register(VIEW3D_MT_snap) # Edit Menus
 
 bpy.types.register(VIEW3D_MT_edit_MESH)
 bpy.types.register(VIEW3D_MT_edit_MESH_vertices)
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 5f93743493a..0cb6964b39e 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -645,7 +645,6 @@ void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *i
 void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
 void uiTemplateOperatorSearch(uiLayout *layout);
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
-void uiTemplate_view3d_select_metaballmenu(uiLayout *layout, struct bContext *C);
 void uiTemplate_view3d_select_faceselmenu(uiLayout *layout, struct bContext *C);
 void uiTemplateTextureImage(uiLayout *layout, struct bContext *C, struct Tex *tex);
 
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 73cd65cafcd..6773985e07c 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -188,55 +188,6 @@ static void handle_view3d_lock(bContext *C)
 	}
 }
 
-/* XXX; all this context stuff...  should become operator */
-void do_layer_buttons(bContext *C, short event)
-{
-	wmWindow *win= CTX_wm_window(C);
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	static int oldlay= 1;
-	short shift, alt, ctrl;
-	
-	shift= win->eventstate->shift;
-	alt= win->eventstate->alt;
-	ctrl= win->eventstate->ctrl;
-	
-	if(v3d==0) return;
-	if(v3d->localview) return;
-	
-	if(event==-1 && ctrl) {
-		v3d->scenelock= !v3d->scenelock;
-		do_view3d_header_buttons(C, NULL, B_SCENELOCK);
-	} else if (event<0) {
-		if(v3d->lay== (1<<20)-1) {
-			if(event==-2 || shift) v3d->lay= oldlay;
-		}
-		else {
-			oldlay= v3d->lay;
-			v3d->lay= (1<<20)-1;
-		}
-		
-		if(v3d->scenelock) handle_view3d_lock(C);
-		
-		/* new layers might need unflushed events events */
-		DAG_scene_update_flags(scene, v3d->lay);	/* tags all that moves and flushes */
-	}
-	else {
-		if(alt) {
-			if(event<11) event+= 10;
-		}
-		if(shift) {
-			if(v3d->lay & (1<<event)) v3d->lay -= (1<<event);
-			else	v3d->lay += (1<<event);
-		}
-		do_view3d_header_buttons(C, NULL, event+B_LAY);
-	}
-	ED_area_tag_redraw(sa);
-	
-	if(v3d->drawtype == OB_SHADED) reshadeall_displist(scene);
-}
-
 static int layers_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
@@ -315,403 +266,6 @@ void VIEW3D_OT_layers(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "");
 }
 
-
-#if 0
-static void do_view3d_view_camerasmenu(bContext *C, void *arg, int event)
-{
-	Scene *scene= CTX_data_scene(C);
-	Base *base;
-	int i=1;
-	
-	if (event == 1) {
-		/* Set Active Object as Active Camera */
-		/* XXX ugly hack alert */
-//		G.qual |= LR_CTRLKEY;
-//		persptoetsen(PAD0);
-//		G.qual &= ~LR_CTRLKEY;
-	} else {
-
-		for( base = FIRSTBASE; base; base = base->next ) {
-			if (base->object->type == OB_CAMERA) {
-				i++;
-				
-				if (event==i) {
-					/* XXX use api call! */
-					
-					break;
-				}
-			}
-		}
-	}
-	
-}
-
-
-static uiBlock *view3d_view_camerasmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	Scene *scene= CTX_data_scene(C);
-	Base *base;
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	int i=1;
-	char camname[48];
-	
-	block= uiBeginBlock(C, ar, "view3d_view_camerasmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_view_camerasmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Active Object as Active Camera|Ctrl NumPad 0",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, 140, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	for( base = FIRSTBASE; base; base = base->next ) {
-		if (base->object->type == OB_CAMERA) {
-			i++;
-			
-			strcpy(camname, base->object->id.name+2);
-			if (base->object == scene->camera) strcat(camname, " (Active)");
-			
-			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, camname,	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,  i, "");
-		}
-	}
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 50);
-	return block;
-}
-#endif
-
-#if 0
-static void do_view3d_view_cameracontrolsmenu(bContext *C, void *arg, int event)
-{
-	switch(event) {
-	case 0: /* Orbit Left */
-		persptoetsen(PAD4);
-		break;
-	case 1: /* Orbit Right */
-		persptoetsen(PAD6);
-		break;
-	case 2: /* Orbit Up */
-		persptoetsen(PAD8);
-		break;
-	case 3: /* Orbit Down */
-		persptoetsen(PAD2);
-		break;
-	case 4: /* Pan left */
-		/* XXX ugly hack alert */
-//		G.qual |= LR_CTRLKEY;
-		persptoetsen(PAD4);
-//		G.qual &= ~LR_CTRLKEY;
-		break;
-	case 5: /* Pan right */
-		/* XXX ugly hack alert */
-//		G.qual |= LR_CTRLKEY;
-		persptoetsen(PAD6);
-//		G.qual &= ~LR_CTRLKEY;
-		break;
-	case 6: /* Pan up */
-		/* ugly hack alert */
-//		G.qual |= LR_CTRLKEY;
-		persptoetsen(PAD8);
-//		G.qual &= ~LR_CTRLKEY;
-		break;
-	case 7: /* Pan down */
-		/* ugly hack alert */
-//		G.qual |= LR_CTRLKEY;
-		persptoetsen(PAD2);
-//		G.qual &= ~LR_CTRLKEY;
-		break;
-	case 8: /* Zoom In */
-		persptoetsen(PADPLUSKEY);
-		break;
-	case 9: /* Zoom Out */
-		persptoetsen(PADMINUS);
-		break;
-	case 10: /* Reset Zoom */
-		persptoetsen(PADENTER);
-		break;
-	case 11: /* Camera Fly mode */
-		fly();
-		break;
-	}
-}
-
-
-static uiBlock *view3d_view_cameracontrolsmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-/*		static short tog=0; */
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "view3d_view_cameracontrolsmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_view_cameracontrolsmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera Fly Mode|Shift F",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, 140, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Orbit Left|NumPad 4",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Orbit Right|NumPad 6", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Orbit Up|NumPad 8",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Orbit Down|NumPad 2",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, 140, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pan Left|Ctrl NumPad 4",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pan Right|Ctrl NumPad 6", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pan Up|Ctrl NumPad 8",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pan Down|Ctrl NumPad 2",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, 140, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Zoom In|NumPad +", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Zoom Out|NumPad -",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Zoom|NumPad Enter",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, "");
-
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 50);
-	return block;
-}
-
-static void do_view3d_view_alignviewmenu(bContext *C, void *arg, int event)
-{
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	Object *obedit = CTX_data_edit_object(C);
-	float *curs;
-	
-	switch(event) {
-
-	case 0: /* Align View to Selected (edit/faceselect mode) */
-	case 1:
-	case 2:
-		if ((obedit) && (obedit->type == OB_MESH)) {
-			editmesh_align_view_to_selected(v3d, event + 1);
-		} 
-		else if (paint_facesel_test(CTX_data_active_object(C))) {
-			Object *obact= OBACT;
-			if (obact && obact->type==OB_MESH) {
-				Mesh *me= obact->data;
-
-				if (me->mtface) {
-// XXX					faceselect_align_view_to_selected(v3d, me, event + 1);
-					ED_area_tag_redraw(sa);
-				}
-			}
-		}
-		break;
-	case 3: /* Center View to Cursor */
-		curs= give_cursor(scene, v3d);
-		v3d->ofs[0]= -curs[0];
-		v3d->ofs[1]= -curs[1];
-		v3d->ofs[2]= -curs[2];
-		ED_area_tag_redraw(sa);
-		break;
-	case 4: /* Align Active Camera to View */
-		/* XXX This ugly hack is a symptom of the nasty persptoetsen function, 
-		 * but at least it works for now.
-		 */
-//		G.qual |= LR_CTRLKEY|LR_ALTKEY;
-		persptoetsen(PAD0);
-//		G.qual &= ~(LR_CTRLKEY|LR_ALTKEY);
-		break;
-	case 5: /* Align View to Selected (object mode) */
-// XXX		mainqenter(PADASTERKEY, 1);
-		break;
-	case 6: /* Center View and Cursor to Origin */
-		WM_operator_name_call(C, "VIEW3D_OT_view_center", WM_OP_EXEC_REGION_WIN, NULL);
-		curs= give_cursor(scene, v3d);
-		curs[0]=curs[1]=curs[2]= 0.0;
-		break;
-	}
-}
-
-static uiBlock *view3d_view_alignviewmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-/*		static short tog=0; */
-	uiBlock *block;
-	Object *obedit = CTX_data_edit_object(C);
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "view3d_view_alignviewmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_view_alignviewmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Center View to Cursor|C",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Center Cursor and View All|Shift C",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align Active Camera to View|Ctrl Alt NumPad 0",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");	
-
-	if (((obedit) && (obedit->type == OB_MESH)) || (paint_facesel_test(CTX_data_active_object(C)))) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align View to Selected (Top)|Shift V",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align View to Selected (Front)|Shift V",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align View to Selected (Side)|Shift V",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
-	} else {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align View to Selected|NumPad *",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
-	}
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 50);
-	return block;
-}
-#endif
-
-#if 0
-static uiBlock *view3d_view_spacehandlers(bContext *C, ARegion *ar, void *arg_unused)
-{
-	/* XXX */
-	return NULL;
-}
-
-
-static void do_view3d_viewmenu(bContext *C, void *arg, int event)
-{
-	
-	switch(event) {
-	case 0: /* User */
-		break;
-	case 1: /* Camera */
-		break;
-	case 2: /* Top */
-		break;
-	case 3: /* Front */
-		break;
-	case 4: /* Side */
-		break;
-	case 5: /* Perspective */
-		break;
-	case 6: /* Orthographic */
-		break;
-	case 7: /* Local View */
-		break;
-	case 8: /* Global View */
-		break;
-	case 9: /* View All (Home) */
-		WM_operator_name_call(C, "VIEW3D_OT_view_all", WM_OP_EXEC_REGION_WIN, NULL);
-		break;
-	case 11: /* View Selected */
-		WM_operator_name_call(C, "VIEW3D_OT_view_center", WM_OP_EXEC_REGION_WIN, NULL);
-		break;
-	case 13: /* Play Back Animation */
-		break;
-	case 15: /* Background Image... */
-//		add_blockhandler(sa, VIEW3D_HANDLER_BACKGROUND, UI_PNL_UNSTOW);
-		break;
-	case 16: /* View  Panel */
-//		add_blockhandler(sa, VIEW3D_HANDLER_PROPERTIES, UI_PNL_UNSTOW);
-		break;
-	case 17: /* Set Clipping Border */
-		WM_operator_name_call(C, "VIEW3D_OT_clip_border", WM_OP_INVOKE_REGION_WIN, NULL);
-		break;
-	case 18: /* render preview */
-//		toggle_blockhandler(sa, VIEW3D_HANDLER_PREVIEW, 0);
-		break;
-	case 19: /* zoom within border */
-//		view3d_border_zoom();
-		break;
-	case 20: /* Transform  Space Panel */
-//		add_blockhandler(sa, VIEW3D_HANDLER_TRANSFORM, UI_PNL_UNSTOW);
-		break;	
-	case 21: /* Grease Pencil */
-//		add_blockhandler(sa, VIEW3D_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
-		break;		
-	case 22: /* View all layers */
-		do_layer_buttons(C, -2);
-		break;
-	}
-}
-#endif
-
-#if 0
-static uiBlock *view3d_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= wm_region_view3d(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "view3d_viewmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_viewmenu, NULL);
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Orientations...",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 20, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Render Preview...|Shift P",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 18, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "View Properties...",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 16, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Background Image...",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 15, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Grease Pencil...",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 21, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	if ((rv3d->viewbut == 0) && !(rv3d->persp == V3D_CAMOB)) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "User",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "User",						0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
-	if (rv3d->persp == V3D_CAMOB) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Camera|NumPad 0",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Camera|NumPad 0",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-	if (rv3d->viewbut == 1) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Top|NumPad 7",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Top|NumPad 7",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
-	if (rv3d->viewbut == 2) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Front|NumPad 1",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Front|NumPad 1",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
-	if (rv3d->viewbut == 3) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Side|NumPad 3",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Side|NumPad 3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
-	
-	uiDefIconTextBlockBut(block, view3d_view_camerasmenu, NULL, ICON_RIGHTARROW_THIN, "Cameras", 0, yco-=20, 120, 19, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	if(rv3d->persp==V3D_PERSP) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Perspective|NumPad 5",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Perspective|NumPad 5",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
-	if(rv3d->persp==V3D_ORTHO) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Orthographic|NumPad 5", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Orthographic|NumPad 5", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	if(v3d->lay== (1<<20)-1) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Previous Layers|Shift ~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 22, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show All Layers| ~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 22, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	if(v3d->localview) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Local View|NumPad /",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Local View|NumPad /", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
-	if(!v3d->localview) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Global View|NumPad /",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
-	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Global View|NumPad /",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBlockBut(block, view3d_view_cameracontrolsmenu, NULL, ICON_RIGHTARROW_THIN, "View Navigation", 0, yco-=20, 120, 19, "");
-	uiDefIconTextBlockBut(block, view3d_view_alignviewmenu, NULL, ICON_RIGHTARROW_THIN, "Align View", 0, yco-=20, 120, 19, "");
-	
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	if(rv3d->rflag & RV3D_CLIPPING)
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Clipping Border|Alt B",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 17, "");
-	else
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Clipping Border|Alt B",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 17, "");
-	if (rv3d->persp==V3D_ORTHO) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Zoom Within Border...|Shift B",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 19, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View Selected|NumPad .",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View All|Home",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
-	if(!sa->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
-	else uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
-
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation|Alt A",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 13, "");
-
-#ifndef DISABLE_PYTHON
-	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefIconTextBlockBut(block, view3d_view_spacehandlers, NULL, ICON_RIGHTARROW_THIN, "Space Handler Scripts", 0, yco-=20, 120, 19, "");
-#endif
-
-	if(ar->alignment==RGN_ALIGN_TOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-
-	uiTextBoundsBlock(block, 50);
-	
-	return block;
-}
-#endif
-
 #if 0
 void do_view3d_select_object_typemenu(bContext *C, void *arg, int event)
 {
@@ -932,23 +486,6 @@ static uiBlock *view3d_select_object_groupedmenu(bContext *C, ARegion *ar, void
 
 #endif
 
-static void view3d_select_metaballmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_select_border");
-	uiItemS(layout);
-	uiItemO(layout, NULL, 0, "MBALL_OT_select_deselect_all_metaelems");
-	uiItemO(layout, NULL, 0, "MBALL_OT_select_inverse_metaelems");
-	uiItemS(layout);
-	uiItemO(layout, NULL, 0, "MBALL_OT_select_random_metaelems");
-}
-
-/* wrapper for python layouts */
-void uiTemplate_view3d_select_metaballmenu(uiLayout *layout, bContext *C)
-{
-	void *arg_unused = NULL;
-	view3d_select_metaballmenu(C, layout, arg_unused);
-}
-
 void do_view3d_select_faceselmenu(bContext *C, void *arg, int event)
 {
 #if 0
@@ -1027,19 +564,6 @@ void uiTemplate_view3d_select_faceselmenu(uiLayout *layout, bContext *C)
 	view3d_select_faceselmenu(C, ar, arg_unused);
 }
 
-static void view3d_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_selected_to_grid");
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_selected_to_cursor");
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_selected_to_center");
-
-	uiItemS(layout);
-
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_cursor_to_selected");
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_cursor_to_grid");
-	uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_cursor_to_active");
-}
-
 #if 0
 void do_view3d_transform_moveaxismenu(bContext *C, void *arg, int event)
 {
@@ -1813,618 +1337,6 @@ static void do_view3d_edit_objectmenu(bContext *C, void *arg, int event)
 }
 #endif
 
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_mesh_verticesmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, "Merge...", 0, "MESH_OT_merge");
-	uiItemO(layout, "Rip", 0, "MESH_OT_rip");
-	uiItemO(layout, "Split", 0, "MESH_OT_split");
-	uiItemO(layout, "Separate", 0, "MESH_OT_separate");
-
-	uiItemS(layout);
-
-	uiItemO(layout, "Smooth", 0, "MESH_OT_vertices_smooth");
-	uiItemO(layout, "Remove Doubles", 0, "MESH_OT_remove_doubles");
-
-#if 0
-	uiItemS(layout);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Vertex Parent|Ctrl P",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, ""); // add_hook_menu();
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Hook|Ctrl H",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); // make_parent();
-#endif
-}
-#endif
-
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_mesh_edgesmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "MESH_OT_edge_face_add");
-
-#if 0
-	uiItemO(layout, "Bevel", 0, "MESH_OT_bevel"); // bevelmenu(em)
-	uiItemO(layout, "Loop Subdivide...", 0, "MESH_OT_loop_subdivide"); // Ctr R, CutEdgeloop(1);
-	uiItemO(layout, "Knife Subdivide...", 0, "MESH_OT_loop_subdivide"); // Shift K, KnifeSubdivide(KNIFE_PROMPT);
-
-	uiItemS(layout);
-#endif
-
-	uiItemO(layout, "Subdivide", 0, "MESH_OT_subdivide");
-	uiItemFloatO(layout, "Subdivide Smooth", 0, "MESH_OT_subdivide", "smoothness", 1.0f);
-
-	uiItemS(layout);
-
-	uiItemO(layout, "Mark Seam", 0, "MESH_OT_mark_seam");
-	uiItemBooleanO(layout, "Clear Seam", 0, "MESH_OT_mark_seam", "clear", 1);
-
-	uiItemS(layout);
-
-	uiItemO(layout, "Mark Sharp", 0, "MESH_OT_mark_sharp");
-	uiItemBooleanO(layout, "Clear Sharp", 0, "MESH_OT_mark_sharp", "clear", 1);
-
-#if 0
-	uiItemS(layout);
-	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Adjust Bevel Weight|Ctrl Shift E",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 17, "");
-
-	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Crease SubSurf|Shift E",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
-#endif
-
-	uiItemS(layout);
-
-	uiItemEnumO(layout, "Rotate Edge CW", 0, "MESH_OT_edge_rotate", "direction", 1);
-	uiItemEnumO(layout, "Rotate Edge CCW", 0, "MESH_OT_edge_rotate", "direction", 2);
-
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Slide Edge |Ctrl E",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, "");	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Edge Loop|X",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, "");	
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Collapse",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 14, "");	
-#endif
-}
-#endif
-
-#if 0
-void do_view3d_edit_mirrormenu(bContext *C, void *arg, int event)
-{
-	float mat[3][3];
-	
-	Mat3One(mat);
-	
-	switch(event) {
-		case 0:
-			initTransform(TFM_MIRROR, CTX_NO_PET);
-			Transform();
-			break;
-		case 1:
-			initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-			BIF_setSingleAxisConstraint(mat[0], " on global X axis");
-			Transform();
-			break;
-		case 2:
-			initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-			BIF_setSingleAxisConstraint(mat[1], " on global Y axis");
-			Transform();
-			break;
-		case 3:
-			initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-			BIF_setSingleAxisConstraint(mat[2], "on global Z axis");
-			Transform();
-			break;
-		case 4:
-			initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-			BIF_setLocalAxisConstraint('X', " on local X axis");
-			Transform();
-			break;
-		case 5:
-			initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-			BIF_setLocalAxisConstraint('Y', " on local Y axis");
-			Transform();
-			break;
-		case 6:
-			initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-			BIF_setLocalAxisConstraint('Z', " on local Z axis");
-			Transform();
-			break;
-	}
-}
-
-static uiBlock *view3d_edit_mirrormenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco = 20, menuwidth = 120;
-
-	block= uiBeginBlock(C, ar, "view3d_edit_mirrormenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_edit_mirrormenu, NULL);
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Interactive Mirror|Ctrl M",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
-
-	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Global|Ctrl M, X",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Global|Ctrl M, Y",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Global|Ctrl M, Z",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-	
-	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Local|Ctrl M, X X",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Local|Ctrl M, Y Y",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Local|Ctrl M, Z Z",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
-
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-	return block;
-}
-#endif
-
-#ifndef DISABLE_PYTHON
-#if 0
-static void do_view3d_edit_mesh_scriptsmenu(bContext *C, void *arg, int event)
-{
-	BPY_menu_do_python(PYMENU_MESH, event);
-}
-
-static uiBlock *view3d_edit_mesh_scriptsmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-//	short yco = 20, menuwidth = 120;
-// XXX	BPyMenu *pym;
-//	int i = 0;
-
-	block= uiBeginBlock(C, ar, "v3d_emesh_pymenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_view3d_edit_mesh_scriptsmenu, NULL);
-
-//	for (pym = BPyMenuTable[PYMENU_MESH]; pym; pym = pym->next, i++) {
-//		uiDefIconTextBut(block, BUTM, 1, ICON_PYTHON, pym->name, 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, i, pym->tooltip?pym->tooltip:pym->filename);
-//	}
-
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-
-	return block;
-}
-#endif
-#endif /* DISABLE_PYTHON */
-
-#if 0
-static void do_view3d_edit_meshmenu(bContext *C, void *arg, int event)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	
-	switch(event) {
-	
-	case 2: /* transform properties */
-		add_blockhandler(sa, VIEW3D_HANDLER_OBJECT, 0);
-		break;
-	case 4: /* insert keyframe */
-		common_insertkey();
-		break;
-	case 16: /* delete keyframe */
-		common_deletekey();
-		break;
-	}
-}
-#endif
-
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_meshmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	Scene *scene= CTX_data_scene(C);
-	ToolSettings *ts= CTX_data_tool_settings(C);
-	PointerRNA tsptr;
-	
-	RNA_pointer_create(&scene->id, &RNA_ToolSettings, ts, &tsptr);
-
-	uiItemO(layout, "Undo Editing", 0, "ED_OT_undo");
-	uiItemO(layout, "Redo Editing", 0, "ED_OT_redo");
-
-#if 0
-	uiDefIconTextBlockBut(block, editmode_undohistorymenu, NULL, ICON_RIGHTARROW_THIN, "Undo History", 0, yco-=20, 120, 19, "");
-#endif
-
-	uiItemS(layout);
-	
-#if 0
-	uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
-	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, 120, 19, "");
-	uiDefIconTextBlockBut(block, view3d_edit_snapmenu, NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 19, "");
-#endif
-
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
-
-	uiItemS(layout);
-
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
-		
-	uiItemS(layout);
-#endif
-
-	uiItemO(layout, NULL, 0, "UV_OT_mapping_menu");
-
-	uiItemS(layout);
-
-	uiItemO(layout, NULL, 0, "MESH_OT_extrude");
-	uiItemO(layout, NULL, 0, "MESH_OT_duplicate");
-	uiItemO(layout, "Delete...", 0, "MESH_OT_delete");
-
-	uiItemS(layout);
-
-	uiItemMenuF(layout, "Vertices", 0, view3d_edit_mesh_verticesmenu, NULL);
-	uiItemMenuF(layout, "Edges", 0, view3d_edit_mesh_edgesmenu, NULL);
-	uiItemMenuF(layout, "Faces", 0, view3d_edit_mesh_facesmenu, NULL);
-	uiItemMenuF(layout, "Normals", 0, view3d_edit_mesh_normalsmenu, NULL);
-
-	uiItemS(layout);
-
-	uiItemR(layout, NULL, 0, &tsptr, "automerge_editing", 0);
-	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0); // |O
-	uiItemMenuEnumR(layout, NULL, 0, &tsptr, "proportional_editing_falloff"); // |Shift O
-
-	uiItemS(layout);
-
-	uiItemMenuF(layout, "Show/Hide", 0, view3d_edit_mesh_showhidemenu, NULL);
-
-#if 0
-#ifndef DISABLE_PYTHON
-	uiItemS(layout);
-	uiDefIconTextBlockBut(block, view3d_edit_mesh_scriptsmenu, NULL, ICON_RIGHTARROW_THIN, "Scripts", 0, yco-=20, 120, 19, "");
-#endif
-#endif
-}
-#endif
-
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_curve_controlpointsmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	Object *obedit= CTX_data_edit_object(C);
-
-	if(obedit->type == OB_CURVE) {
-		uiItemEnumO(layout, NULL, 0, "TFM_OT_transform", "mode", TFM_TILT);
-		uiItemO(layout, NULL, 0, "CURVE_OT_tilt_clear");
-		uiItemO(layout, NULL, 0, "CURVE_OT_separate");
-		
-		uiItemS(layout);
-
-		uiItemEnumO(layout, NULL, 0, "CURVE_OT_handle_type_set", "type", 1);
-		uiItemEnumO(layout, NULL, 0, "CURVE_OT_handle_type_set", "type", 3);
-		uiItemEnumO(layout, NULL, 0, "CURVE_OT_handle_type_set", "type", 2);
-
-		uiItemS(layout);
-	}
-
-	// XXX uiItemO(layout, NULL, 0, "OBJECT_OT_make_vertex_parent"); Make VertexParent|Ctrl P
-	// make_parent()
-	// XXX uiItemO(layout, NULL, 0, "OBJECT_OT_add_hook"); Add Hook| Ctrl H
-	// add_hook_menu()
-}
-#endif
-
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_curvemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	Scene *scene= CTX_data_scene(C);
-	ToolSettings *ts= CTX_data_tool_settings(C);
-	PointerRNA tsptr;
-	
-	RNA_pointer_create(&scene->id, &RNA_ToolSettings, ts, &tsptr);
-
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties...|N",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
-	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");	
-#endif
-
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
-
-	uiItemS(layout);
-	
-	// XXX uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	// common_insertkey();
-	// XXX uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
-	// common_deletekey();
-
-
-	uiItemO(layout, NULL, 0, "CURVE_OT_extrude");
-	uiItemO(layout, NULL, 0, "CURVE_OT_duplicate");
-	uiItemO(layout, NULL, 0, "CURVE_OT_separate");
-	uiItemO(layout, NULL, 0, "CURVE_OT_make_segment");
-	uiItemO(layout, NULL, 0, "CURVE_OT_cyclic_toggle");
-	uiItemO(layout, NULL, 0, "CURVE_OT_delete"); // Delete...
-
-	uiItemS(layout);
-
-	uiItemMenuF(layout, "Control Points", 0, view3d_edit_curve_controlpointsmenu, NULL);
-	uiItemMenuF(layout, "Segments", 0, view3d_edit_curve_segmentsmenu, NULL);
-
-	uiItemS(layout);
-
-	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0); // |O
-	uiItemMenuEnumR(layout, NULL, 0, &tsptr, "proportional_editing_falloff"); // |Shift O
-
-	uiItemS(layout);
-
-	uiItemMenuF(layout, "Show/Hide Control Points", 0, view3d_edit_curve_showhidemenu, NULL);
-}
-#endif
-
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_latticemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	Scene *scene= CTX_data_scene(C);
-	ToolSettings *ts= CTX_data_tool_settings(C);
-	PointerRNA tsptr;
-	
-	RNA_pointer_create(&scene->id, &RNA_ToolSettings, ts, &tsptr);
-
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Editing|U",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
-	
-	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
-	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");		
-#endif
-
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
-
-	uiItemS(layout);
-
-	// XXX uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	// common_insertkey();
-	// XXX uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
-	// common_deletekey();
-	
-	uiItemO(layout, NULL, 0, "LATTICE_OT_make_regular");
-
-	uiItemS(layout);
-
-	uiItemR(layout, NULL, 0, &tsptr, "proportional_editing", 0); // |O
-	uiItemMenuEnumR(layout, NULL, 0, &tsptr, "proportional_editing_falloff"); // |Shift O
-}
-#endif
-
-#if 0
-static void do_view3d_edit_armaturemenu(bContext *C, void *arg, int event)
-{
-	static short numcuts= 2;
-
-	switch(event) {
-	case 0: /* Undo Editing */
-		remake_editArmature();
-		break;
-	
-	case 6: /* Shear */
-		initTransform(TFM_SHEAR, CTX_NONE);
-		Transform();
-		break;
-	case 7: /* Warp */
-		initTransform(TFM_WARP, CTX_NONE);
-		Transform();
-	case 23: /* bone sketching panel */
-		add_blockhandler(curarea, VIEW3D_HANDLER_BONESKETCH, UI_PNL_UNSTOW);
-		break;
-	}
-}
-#endif
-
-#if 0
-/* visible buttons ported to python, check ifedout buttons */
-static void view3d_edit_armaturemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	Object *obedit = CTX_data_edit_object(C);
-	bArmature *arm= obedit->data;
-	
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Editing|U",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Bone Sketching|P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 23, "");
-	uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
-	uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");
-#endif
-	uiItemMenuF(layout, "Snap", 0, view3d_edit_snapmenu, NULL);
-	uiItemMenuF(layout, "Bone Roll", 0, view3d_edit_armature_rollmenu, NULL);
-	
-	if (arm->drawtype == ARM_ENVELOPE)
-		uiItemEnumO(layout, "Scale Envelope Distance", 0, "TFM_OT_transform", "mode", TFM_BONESIZE);
-	else
-		uiItemEnumO(layout, "Scale B-Bone Width", 0, "TFM_OT_transform", "mode", TFM_BONESIZE);
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, "Extrude", 0, "ARMATURE_OT_extrude");
-	if (arm->flag & ARM_MIRROR_EDIT)
-		uiItemBooleanO(layout, "Extrude Forked", 0, "ARMATURE_OT_extrude", "forked", 1);
-	
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_duplicate");
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_merge");
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_fill");
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_delete");
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_separate");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_subdivide_simple");
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_subdivide_multi");
-	
-	uiItemEnumO(layout, "AutoName Left/Right", 0, "ARMATURE_OT_autoside_names", "axis", 0);
-	uiItemEnumO(layout, "AutoName Front/Back", 0, "ARMATURE_OT_autoside_names", "axis", 1);
-	uiItemEnumO(layout, "AutoName Top/Bottom", 0, "ARMATURE_OT_autoside_names", "axis", 2);
-	
-	uiItemO(layout, "Flip Left/Right Names", 0, "ARMATURE_OT_flip_names");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_armature_layers");
-	uiItemO(layout, NULL, 0, "ARMATURE_OT_bone_layers");
-	
-	uiItemS(layout);
-	
-	uiItemMenuF(layout, "Parent", 0, view3d_edit_armature_parentmenu, NULL);
-	
-	uiItemS(layout);
-	
-	uiItemMenuF(layout, "Bone Settings ", 0, view3d_edit_armature_settingsmenu, NULL);
-}
-#endif
-
-static void view3d_pose_armature_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	//uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear User Transform|W", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
-		//used: clear_user_transform(scene, ob);
-	//uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiItemO(layout, NULL, 0, "POSE_OT_loc_clear");
-	uiItemO(layout, NULL, 0, "POSE_OT_rot_clear");
-	uiItemO(layout, NULL, 0, "POSE_OT_scale_clear");
-	
-	// ???
-	//uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Origin|Alt O",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
-		//used:clear_object('o');
-}
-
-static void view3d_pose_armature_showhidemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, "Show Hidden", 0, "POSE_OT_reveal");
-	
-	uiItemO(layout, "Hide Selected", 0, "POSE_OT_hide");
-	uiItemBooleanO(layout, "Hide Unselected", 0, "POSE_OT_hide", "unselected", 1);
-}
-
-static void view3d_pose_armature_ikmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "POSE_OT_ik_add");
-	uiItemO(layout, NULL, 0, "POSE_OT_ik_clear");
-}
-
-static void view3d_pose_armature_constraintsmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "POSE_OT_constraint_add_with_targets");
-	uiItemO(layout, NULL, 0, "POSE_OT_constraints_clear");
-}
-
-static void view3d_pose_armature_groupmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, "Add Selected to Active Group", 0, "POSE_OT_group_assign");
-	//uiItemO(layout, "Add Selected to Group", 0, "POSE_OT_group_assign");
-	
-	uiItemO(layout, "Add New Group", 0, "POSE_OT_group_add");
-	
-	uiItemO(layout, "Remove from All Groups", 0, "POSE_OT_group_unassign");
-	uiItemO(layout, "Remove Active Group", 0, "POSE_OT_group_remove");
-}
-
-static void view3d_pose_armature_motionpathsmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "POSE_OT_paths_calculate");
-	uiItemO(layout, NULL, 0, "POSE_OT_paths_clear");
-}
-
-static void view3d_pose_armature_poselibmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "POSELIB_OT_browse_interactive");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "POSELIB_OT_pose_add");
-	uiItemO(layout, NULL, 0, "POSELIB_OT_pose_rename");
-	uiItemO(layout, NULL, 0, "POSELIB_OT_pose_remove");
-}
-
-static void view3d_pose_armature_settingsmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemEnumO(layout, "Toggle a Setting", 0, "POSE_OT_flags_set", "mode", 2);
-	uiItemEnumO(layout, "Enable a Setting", 0, "POSE_OT_flags_set", "mode", 1);
-	uiItemEnumO(layout, "Disable a Setting", 0, "POSE_OT_flags_set", "mode", 0);
-}
-
-#if 0
-static void do_view3d_pose_armaturemenu(bContext *C, void *arg, int event)
-{
-	Object *ob;
-	ob=OBACT;
-	
-	switch(event) {
-	case 5:
-		pose_copy_menu();
-		break;
-	case 15:
-		pose_relax();
-		break;
-	}
-}
-#endif
-
-static void view3d_pose_armaturemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{	
-	Object *ob = CTX_data_active_object(C);
-	bArmature *arm= ob->data;
-	
-#if 0 // XXX to be ported, using uiItemMenuF(layout, "<Name>", 0, view3d_pose_armature_<category>menu);
-	uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
-#endif 
-	if ( (arm) && ((arm->drawtype == ARM_B_BONE) || (arm->drawtype == ARM_ENVELOPE)) )
-		uiItemEnumO(layout, "Scale Envelope Distance", 0, "TFM_OT_transform", "mode", TFM_BONESIZE);
-	uiItemMenuF(layout, "Clear Transform", 0, view3d_pose_armature_transformmenu, NULL);
-	
-	uiItemS(layout);
-	
-	// TODO: these operators may get renamed
-	uiItemO(layout, NULL, 0, "ANIM_OT_insert_keyframe_menu");
-	uiItemO(layout, NULL, 0, "ANIM_OT_delete_keyframe_v3d");
-
-	uiItemS(layout);
-	
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Relax Pose|W",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 15, "");
-#endif
-	uiItemO(layout, NULL, 0, "POSE_OT_apply");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, "Copy Current Pose", 0, "POSE_OT_copy");
-	uiItemO(layout, "Paste Pose", 0, "POSE_OT_paste");
-	uiItemBooleanO(layout, "Paste X-Flipped Pose", 0, "POSE_OT_paste", "flipped", 1);
-	
-	uiItemS(layout);
-
-	uiItemMenuF(layout, "Pose Library", 0, view3d_pose_armature_poselibmenu, NULL);
-	uiItemMenuF(layout, "Motion Paths", 0, view3d_pose_armature_motionpathsmenu, NULL);
-	uiItemMenuF(layout, "Bone Groups", 0, view3d_pose_armature_groupmenu, NULL);
-	
-	uiItemS(layout);
-	
-	uiItemMenuF(layout, "Inverse Kinematics", 0, view3d_pose_armature_ikmenu, NULL);
-	uiItemMenuF(layout, "Constraints", 0, view3d_pose_armature_constraintsmenu, NULL);
-	
-	uiItemS(layout);
-	
-	uiItemEnumO(layout, "AutoName Left/Right", 0, "POSE_OT_autoside_names", "axis", 0);
-	uiItemEnumO(layout, "AutoName Front/Back", 0, "POSE_OT_autoside_names", "axis", 1);
-	uiItemEnumO(layout, "AutoName Top/Bottom", 0, "POSE_OT_autoside_names", "axis", 2);
-	
-	uiItemO(layout, "Flip Left/Right Names", 0, "POSE_OT_flip_names");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "POSE_OT_armature_layers");
-	uiItemO(layout, NULL, 0, "POSE_OT_bone_layers");
-	
-	uiItemS(layout);
-	
-	uiItemMenuF(layout, "Show/Hide Bones", 0, view3d_pose_armature_showhidemenu, NULL);
-	uiItemMenuF(layout, "Bone Settings", 0, view3d_pose_armature_settingsmenu, NULL);
-	
-#if 0
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Copy Attributes...|Ctrl C",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
-#endif
-}
 
 /* texture paint menu (placeholder, no items yet??) */
 static void do_view3d_tpaintmenu(bContext *C, void *arg, int event)
@@ -2622,39 +1534,6 @@ static uiBlock *view3d_faceselmenu(bContext *C, ARegion *ar, void *arg_unused)
 	return block;
 }
 
-static void view3d_particle_showhidemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_reveal");
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_hide");
-	uiItemBooleanO(layout, "Hide Unselected", 0, "PARTICLE_OT_hide", "unselected", 1);
-}
-
-static void view3d_particlemenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	ToolSettings *ts= CTX_data_tool_settings(C);
-
-	// XXX uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Particle Edit Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-	// add_blockhandler(sa, VIEW3D_HANDLER_OBJECT, UI_PNL_UNSTOW);
-	// XXX uiItemS(layout);
-	//
-	// XXX uiDefIconTextBut(block, BUTM, 1, (pset->flag & PE_X_MIRROR)? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT, "X-Axis Mirror Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
-	// pset->flag ^= PE_X_MIRROR;
-
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_mirror"); // |Ctrl M
-
-	uiItemS(layout);
-
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_remove_doubles"); // |W, 5
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_delete");
-	if(ts->particle.selectmode & SCE_SELECT_POINT)
-		uiItemO(layout, NULL, 0, "PARTICLE_OT_subdivide"); // |W, 2
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_rekey"); // |W, 1
-
-	uiItemS(layout);
-
-	uiItemMenuF(layout, "Show/Hide Particles", 0, view3d_particle_showhidemenu, NULL);
-}
-
 static char *view3d_modeselect_pup(Scene *scene)
 {
 	Object *ob= OBACT;
@@ -2998,15 +1877,11 @@ static void view3d_header_pulldowns(const bContext *C, uiBlock *block, Object *o
 		}
 	}
 	else if(ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
-		xmax= GetButStringLength("Particle");
-		uiDefMenuBut(block, view3d_particlemenu, NULL, "Particle",	xco,yco, xmax-3, 20, "");
-		xco+= xmax;
+		/* ported to python */
 	}
 	else {
 		if (ob && (ob->mode & OB_MODE_POSE)) {
-			xmax= GetButStringLength("Pose");
-			uiDefMenuBut(block, view3d_pose_armaturemenu, NULL, "Pose",	xco,yco, xmax-3, 20, "");
-			xco+= xmax;
+		/* ported to python */
 		}
 	}
 
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 587ff57a0b5..7fc2d75a708 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -311,8 +311,6 @@ void RNA_api_ui_layout(StructRNA *srna)
 	func= RNA_def_function(srna, "template_header_3D", "uiTemplateHeader3D");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 
-	func= RNA_def_function(srna, "view3d_select_metaballmenu", "uiTemplate_view3d_select_metaballmenu");
-	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 	func= RNA_def_function(srna, "view3d_select_faceselmenu", "uiTemplate_view3d_select_faceselmenu");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 

From 6ddcb4774609d882ce869a0fe60a3c0516129d58 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 23 Aug 2009 22:19:45 +0000
Subject: [PATCH 227/577] * Fix for volume materials + AAO

---
 source/blender/render/intern/source/occlusion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index a24454a38c4..a15377a8c6d 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -663,7 +663,7 @@ static OcclusionTree *occ_tree_build(Render *re)
 			if((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak;
 			else vlr++;
 
-			if(vlr->mat->mode & MA_TRACEBLE) {
+			if((vlr->mat->mode & MA_TRACEBLE) && (vlr->mat->material_type == MA_TYPE_SURFACE)) {
 				tree->face[b].obi= c;
 				tree->face[b].facenr= a;
 				tree->occlusion[b]= 1.0f;

From 3eed35ada1f30aa1cdddca1556ed4f83bc57a930 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sun, 23 Aug 2009 22:22:58 +0000
Subject: [PATCH 228/577] Adjusted spacing of header items. Made toggle buttons
 less wide, with less extra space around them Made number widgets wider to
 allow larger numbers, such as the current frame field in the timeline.

---
 release/ui/space_time.py                            | 2 +-
 source/blender/editors/interface/interface_layout.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index bfa4d5b6485..6e4b5beb161 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -22,7 +22,7 @@ class TIME_HT_header(bpy.types.Header):
 			sub.itemM("TIME_MT_frame")
 			sub.itemM("TIME_MT_playback")
 
-		layout.itemR(scene, "use_preview_range", text="PR", toggle=True)
+		layout.itemR(scene, "use_preview_range", text="PR")
 		
 		row = layout.row(align=True)
 		if not scene.use_preview_range:
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 8676fe62a3a..3b4471bd4b9 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -793,11 +793,11 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PropertyRNA
 	}
 	else if(ui_layout_vary_direction(layout) == UI_ITEM_VARY_X) {
 		if(type == PROP_BOOLEAN && strcmp(name, "") != 0)
-			w += UI_UNIT_X;
+			w += UI_UNIT_X/5;
 		else if(type == PROP_ENUM)
 			w += UI_UNIT_X/2;
 		else if(type == PROP_FLOAT || type == PROP_INT)
-			w += UI_UNIT_X*2;
+			w += UI_UNIT_X*3;
 	}
 
 	*r_w= w;

From ac44d73acdb5297d3e0a177b00a03ef8cca5e696 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Mon, 24 Aug 2009 00:01:09 +0000
Subject: [PATCH 229/577] Made menu text more consistent, using '...' when a
 menu item spawns a popup or confirmation, and removing redundant starting
 words in submenus.

Also added notifiers for user prefs, and tweaked wave modifier layout.
---
 release/ui/buttons_data_modifier.py          |  34 ++++--
 release/ui/space_view3d.py                   | 113 ++++++++++---------
 source/blender/makesrna/intern/rna_userdef.c |   7 ++
 3 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index 9b2481b0195..bc41b04d32c 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -397,19 +397,29 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		
 		col = split.column()
 		col.itemR(md, "normals")
-		sub = col.row(align=True)
+		sub = col.column()
 		sub.active = md.normals
-		sub.itemR(md, "x_normal", text="X", toggle=True)
-		sub.itemR(md, "y_normal", text="Y", toggle=True)
-		sub.itemR(md, "z_normal", text="Z", toggle=True)
+		sub.itemR(md, "x_normal", text="X")
+		sub.itemR(md, "y_normal", text="Y")
+		sub.itemR(md, "z_normal", text="Z")
 		
-		flow = layout.column_flow()
-		flow.itemR(md, "time_offset")
-		flow.itemR(md, "lifetime")
-		flow.itemR(md, "damping_time")
-		flow.itemR(md, "falloff_radius")
-		flow.itemR(md, "start_position_x")
-		flow.itemR(md, "start_position_y")
+		split = layout.split()
+
+		col = split.column()
+		col.itemL(text="Time:")
+		sub = col.column(align=True)
+		sub.itemR(md, "time_offset", text="Offset")
+		sub.itemR(md, "lifetime", text="Life")
+		col.itemR(md, "damping_time", text="Damping")
+		
+		col = split.column()
+		col.itemL(text="Position:")
+		sub = col.column(align=True)
+		sub.itemR(md, "start_position_x", text="X")
+		sub.itemR(md, "start_position_y", text="Y")
+		col.itemR(md, "falloff_radius", text="Falloff")
+		
+		layout.itemS()
 		
 		layout.itemR(md, "start_position_object")
 		layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
@@ -420,6 +430,8 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		elif md.texture_coordinates == 'OBJECT':
 			layout.itemR(md, "texture_coordinates_object")
 		
+		layout.itemS()
+		
 		flow = layout.column_flow()
 		flow.itemR(md, "speed", slider=True)
 		flow.itemR(md, "height", slider=True)
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index b88ecaba5cd..ae17307080f 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -60,15 +60,15 @@ class VIEW3D_MT_snap(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("view3d.snap_selected_to_grid")
-		layout.itemO("view3d.snap_selected_to_cursor")
-		layout.itemO("view3d.snap_selected_to_center")
+		layout.itemO("view3d.snap_selected_to_grid", text="Selection to Grid")
+		layout.itemO("view3d.snap_selected_to_cursor", text="Selection to Cursor")
+		layout.itemO("view3d.snap_selected_to_center", text="Selection to Center")
 		
 		layout.itemS()
 		
-		layout.itemO("view3d.snap_cursor_to_selected")
-		layout.itemO("view3d.snap_cursor_to_grid")
-		layout.itemO("view3d.snap_cursor_to_active")
+		layout.itemO("view3d.snap_cursor_to_selected", text="Cursor to Selected")
+		layout.itemO("view3d.snap_cursor_to_grid", text="Cursor to Grid")
+		layout.itemO("view3d.snap_cursor_to_active", text="Cursor to Active")
 
 # ********** View menus **********
 
@@ -104,8 +104,8 @@ class VIEW3D_MT_view(bpy.types.Menu):
 
 		layout.operator_context = "INVOKE_REGION_WIN"
 		
-		layout.itemO("view3d.clip_border")
-		layout.itemO("view3d.zoom_border")
+		layout.itemO("view3d.clip_border", text="Clipping Border...")
+		layout.itemO("view3d.zoom_border", text="Zoom Border...")
 		
 		layout.itemS()
 		
@@ -168,8 +168,8 @@ class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
 		layout.itemO("object.select_inverse", text="Inverse")
 		layout.itemO("object.select_random", text="Random")
 		layout.itemO("object.select_by_layer", text="Select All by Layer")
-		layout.item_enumO("object.select_by_type", "type", "", text="Select All by Type")
-		layout.itemO("object.select_grouped", text="Select Grouped")
+		layout.item_enumO("object.select_by_type", "type", "", text="Select All by Type...")
+		layout.itemO("object.select_grouped", text="Select Grouped...")
 
 class VIEW3D_MT_select_POSE(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
@@ -178,7 +178,7 @@ class VIEW3D_MT_select_POSE(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.select_border")
+		layout.itemO("view3d.select_border", text="Border Select...")
 
 		layout.itemS()
 		
@@ -227,7 +227,7 @@ class VIEW3D_MT_select_EDIT_MESH(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.select_border")
+		layout.itemO("view3d.select_border", text="Border Select...")
 
 		layout.itemS()
 
@@ -271,8 +271,8 @@ class VIEW3D_MT_select_EDIT_CURVE(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.select_border")
-		layout.itemO("view3d.select_circle")
+		layout.itemO("view3d.select_border", text="Border Select...")
+		layout.itemO("view3d.select_circle", text="Circle Select...")
 
 		layout.itemS()
 		
@@ -300,8 +300,8 @@ class VIEW3D_MT_select_EDIT_SURFACE(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.select_border")
-		layout.itemO("view3d.select_circle")
+		layout.itemO("view3d.select_border", text="Border Select...")
+		layout.itemO("view3d.select_circle", text="Circle Select...")
 
 		layout.itemS()
 		
@@ -357,7 +357,7 @@ class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.itemO("view3d.select_border")
+		layout.itemO("view3d.select_border", text="Border Select...")
 
 		layout.itemS()
 		
@@ -403,15 +403,15 @@ class VIEW3D_MT_OBJECT(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemO("anim.insert_keyframe_menu")
-		layout.itemO("anim.delete_keyframe_v3d")
+		layout.itemO("anim.insert_keyframe_menu", text="Insert Keyframe...")
+		layout.itemO("anim.delete_keyframe_v3d", text="Delete Keyframe...")
 		
 		layout.itemS()
 		
 		layout.itemO("object.duplicate")
 		layout.item_booleanO("object.duplicate", "linked", True, text="Duplicate Linked")
-		layout.itemO("object.delete")
-		layout.itemO("object.proxy_make")
+		layout.itemO("object.delete", text="Delete...")
+		layout.itemO("object.proxy_make", text="Make Proxy...")
 		
 		layout.itemS()
 		
@@ -435,10 +435,10 @@ class VIEW3D_MT_OBJECT_clear(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("object.location_clear")
-		layout.itemO("object.rotation_clear")
-		layout.itemO("object.scale_clear")
-		layout.itemO("object.origin_clear")
+		layout.itemO("object.location_clear", text="Location")
+		layout.itemO("object.rotation_clear", text="Rotation")
+		layout.itemO("object.scale_clear", text="Scale")
+		layout.itemO("object.origin_clear", text="Origin")
 		
 class VIEW3D_MT_OBJECT_parent(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
@@ -447,8 +447,8 @@ class VIEW3D_MT_OBJECT_parent(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("object.parent_set")
-		layout.itemO("object.parent_clear")
+		layout.itemO("object.parent_set", text="Set")
+		layout.itemO("object.parent_clear", text="Clear")
 		
 class VIEW3D_MT_OBJECT_track(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
@@ -457,8 +457,8 @@ class VIEW3D_MT_OBJECT_track(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("object.track_set")
-		layout.itemO("object.track_clear")
+		layout.itemO("object.track_set", text="Set")
+		layout.itemO("object.track_clear", text="Clear")
 		
 class VIEW3D_MT_OBJECT_group(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
@@ -595,8 +595,8 @@ class VIEW3D_MT_POSE(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemO("anim.insert_keyframe_menu")
-		layout.itemO("anim.delete_keyframe_v3d")
+		layout.itemO("anim.insert_keyframe_menu", text="Insert Keyframe...")
+		layout.itemO("anim.delete_keyframe_v3d", text="Delete Keyframe...")
 		
 		layout.itemS()
 		
@@ -629,8 +629,8 @@ class VIEW3D_MT_POSE(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemO("pose.armature_layers")
-		layout.itemO("pose.bone_layers")
+		layout.itemO("pose.armature_layers", text="Change Armature Layers...")
+		layout.itemO("pose.bone_layers", text="Change Bone Layers...")
 		
 		layout.itemS()
 		
@@ -644,13 +644,13 @@ class VIEW3D_MT_POSE_transform(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemL(text="Clear User Transform")
+		layout.itemL(text="User Transform")
 		
-		layout.itemO("pose.loc_clear")
-		layout.itemO("pose.rot_clear")
-		layout.itemO("pose.scale_clear")
+		layout.itemO("pose.loc_clear", text="Location")
+		layout.itemO("pose.rot_clear", text="Rotation")
+		layout.itemO("pose.scale_clear", text="Scale")
 		
-		layout.itemL(text="Clear Origin")
+		layout.itemL(text="Origin")
 		
 class VIEW3D_MT_POSE_pose(bpy.types.Menu):
 	__space_type__ = "VIEW_3D"
@@ -659,13 +659,13 @@ class VIEW3D_MT_POSE_pose(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("poselib.browse_interactive")
+		layout.itemO("poselib.browse_interactive", text="Browse Poses...")
 		
 		layout.itemS()
 		
-		layout.itemO("poselib.pose_add")
-		layout.itemO("poselib.pose_rename")
-		layout.itemO("poselib.pose_remove")
+		layout.itemO("poselib.pose_add", text="Add Pose...")
+		layout.itemO("poselib.pose_rename", text="Rename Pose...")
+		layout.itemO("poselib.pose_remove", text="Remove Pose...")
 
 class VIEW3D_MT_POSE_motion(bpy.types.Menu):
 	__space_type__ = "VIEW_3D"
@@ -674,8 +674,8 @@ class VIEW3D_MT_POSE_motion(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("pose.paths_calculate")
-		layout.itemO("pose.paths_clear")
+		layout.itemO("pose.paths_calculate", text="Calculate")
+		layout.itemO("pose.paths_clear", text="Clear")
 		
 class VIEW3D_MT_POSE_group(bpy.types.Menu):
 	__space_type__ = "VIEW_3D"
@@ -683,11 +683,14 @@ class VIEW3D_MT_POSE_group(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+		layout.itemO("pose.group_add")
+		layout.itemO("pose.group_remove")
+		
+		layout.itemS()
 		
 		layout.itemO("pose.group_assign")
-		layout.itemO("pose.group_add")
 		layout.itemO("pose.group_unassign")
-		layout.itemO("pose.group_remove")
+		
 		
 class VIEW3D_MT_POSE_ik(bpy.types.Menu):
 	__space_type__ = "VIEW_3D"
@@ -706,7 +709,7 @@ class VIEW3D_MT_POSE_constraints(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("pose.constraint_add_with_targets")
+		layout.itemO("pose.constraint_add_with_targets", text="Add (With Targets)...")
 		layout.itemO("pose.constraints_clear")
 		
 class VIEW3D_MT_POSE_showhide(VIEW3D_MT_showhide):
@@ -733,13 +736,13 @@ class VIEW3D_MT_edit_MESH(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemO("uv.mapping_menu")
+		layout.itemO("uv.mapping_menu", text="UV Unwrap...")
 		
 		layout.itemS()
 		
 		layout.itemO("mesh.extrude")
 		layout.itemO("mesh.duplicate")
-		layout.itemO("mesh.delete")
+		layout.itemO("mesh.delete", text="Delete...")
 		
 		layout.itemS()
 		
@@ -784,7 +787,6 @@ class VIEW3D_MT_edit_MESH_edges(bpy.types.Menu):
 
 		layout.itemO("mesh.edge_face_add")
 		layout.itemO("mesh.subdivide")
-		layout.item_floatO("mesh.subdivide", "smoothness", 1.0, text="Subdivide Smooth")
 
 		layout.itemS()
 		
@@ -857,7 +859,7 @@ def draw_CURVE(self, context):
 	layout.itemO("curve.separate")
 	layout.itemO("curve.make_segment")
 	layout.itemO("curve.cyclic_toggle")
-	layout.itemO("curve.delete")
+	layout.itemO("curve.delete", text="Delete...")
 	
 	layout.itemS()
 	
@@ -984,7 +986,7 @@ class VIEW3D_MT_edit_META(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemO("mball.delete_metaelems")
+		layout.itemO("mball.delete_metaelems", text="Delete...")
 		layout.itemO("mball.duplicate_metaelems")
 		
 		layout.itemS()
@@ -1062,8 +1064,7 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 
 		layout.itemS()
 
-		layout.itemO("armature.subdivide_simple")
-		layout.itemO("armature.subdivide_multi")
+		layout.itemO("armature.subdivide_multi", text="Subdivide")
 		
 		layout.itemS()
 
@@ -1092,8 +1093,8 @@ class VIEW3D_MT_edit_ARMATURE_parent(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 		
-		layout.itemO("armature.parent_set")
-		layout.itemO("armature.parent_clear")
+		layout.itemO("armature.parent_set", text="Make")
+		layout.itemO("armature.parent_clear", text="Clear")
 
 class VIEW3D_MT_edit_ARMATURE_roll(bpy.types.Menu):
 	__space_type__ = 'VIEW_3D'
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b74dc6f757b..946aa1cd682 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1662,16 +1662,19 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "show_mini_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_ROTVIEWICON);
 	RNA_def_property_ui_text(prop, "Show Mini Axis", "Show a small rotating 3D axis in the bottom left corner of the 3D View.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	prop= RNA_def_property(srna, "mini_axis_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "rvisize");
 	RNA_def_property_range(prop, 10, 64);
 	RNA_def_property_ui_text(prop, "Mini Axis Size", "The axis icon's size.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	prop= RNA_def_property(srna, "mini_axis_brightness", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "rvibright");
 	RNA_def_property_range(prop, 0, 10);
 	RNA_def_property_ui_text(prop, "Mini Axis Brightness", "The brightness of the icon.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	/* middle mouse button */
 	prop= RNA_def_property(srna, "middle_mouse_rotate", PROP_BOOLEAN, PROP_NONE);
@@ -1705,16 +1708,19 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "use_manipulator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "tw_flag", 1);
 	RNA_def_property_ui_text(prop, "Manipulator", "Use 3d transform manipulator.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	prop= RNA_def_property(srna, "manipulator_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tw_size");
 	RNA_def_property_range(prop, 2, 40);
 	RNA_def_property_ui_text(prop, "Manipulator Size", "Diameter of widget, in 10 pixel units.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	prop= RNA_def_property(srna, "manipulator_handle_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tw_handlesize");
 	RNA_def_property_range(prop, 2, 40);
 	RNA_def_property_ui_text(prop, "Manipulator Handle Size", "Size of widget handles as percentage of widget radius.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	prop= RNA_def_property(srna, "manipulator_hotspot", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tw_hotspot");
@@ -1725,6 +1731,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "obcenter_dia");
 	RNA_def_property_range(prop, 4, 10);
 	RNA_def_property_ui_text(prop, "Object Center Size", "Diameter in Pixels for Object/Lamp center display.");
+	RNA_def_property_update(prop, NC_WINDOW, NULL);
 
 	prop= RNA_def_property(srna, "ndof_pan_speed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "ndof_pan");

From 5e9e6df2a24b28cbb8c1de293725ebe4af3f9a2d Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Mon, 24 Aug 2009 02:49:57 +0000
Subject: [PATCH 230/577] * changes to work with updated FFMPEG libs. Mainly
 build system. CMake files may need changing too.

NOTE: remember to svn up in lib/windows!
---
 SConstruct                       | 10 +++++-----
 config/win32-mingw-config.py     |  8 ++++----
 config/win32-vc-config.py        |  2 +-
 source/blender/src/header_info.c |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/SConstruct b/SConstruct
index a5c70f40366..4ce3aa25d11 100644
--- a/SConstruct
+++ b/SConstruct
@@ -570,11 +570,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 						'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-						'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-						'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-						'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-						'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
-						'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
+#						'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+#						'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+#						'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+#						'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
+#						'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
 						'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
 	windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
 	allinstall += windlls
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 5801df86c27..f7130cb4ac3 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -26,10 +26,10 @@ BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
-WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
-BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
-BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
+WITH_BF_FFMPEG = True
+BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
 
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 359f52e6bf8..3ec76d464bc 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -7,7 +7,7 @@ BF_VERSE_INCLUDE = "#extern/verse/dist"
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
 
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index 65baa4df830..4b560139b0f 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -565,8 +565,8 @@ static void copy_game_dll(char *dll_filename, char *source_dir, char *dest_dir)
 
 static void copy_all_game_dlls(char *str)
 {
-#define GAME_DLL_COUNT		17
-	char *game_dll_list[GAME_DLL_COUNT]={"avcodec-52.dll", "avdevice-52.dll", "avformat-52.dll", "avutil-50.dll", "libfaac-0.dll", "libfaad-2.dll", "libmp3lame-0.dll", "libx264-67.dll", "swscale-0.dll", "xvidcore.dll", "gnu_gettext.dll", "libtiff.dll", "python26.dll", "SDL.dll", "pthreadVC2.dll", "libpng.dll", "zlib.dll"};
+#define GAME_DLL_COUNT		12
+	char *game_dll_list[GAME_DLL_COUNT]={"avcodec-52.dll", "avdevice-52.dll", "avformat-52.dll", "avutil-50.dll", "swscale-0.dll", "gnu_gettext.dll", "libtiff.dll", "python26.dll", "SDL.dll", "pthreadVC2.dll", "libpng.dll", "zlib.dll"};
 
 	char dest_dir[FILE_MAX];
 	char source_dir[FILE_MAX];

From b33b6babbd2e5b87dcf0dee35074120cbcf5f934 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Mon, 24 Aug 2009 04:31:13 +0000
Subject: [PATCH 231/577] 2.5 - Sliders in Animation Editors

The 'Show Sliders' option for DopeSheet and Graph Editors now works again. When this option is enabled (it is disabled by default), a slider (or combobox) is shown beside the mute/lock toggles for F-Curves. Editing the slider will result in a new keyframe being added on the current frame.

So, for all the (ex)-Maya animators out there, you can now animate in a channelbox-like way. :)

Also in this commit:
* Fixed some warnings in modifier.c from previous commits there
* Fixed some refresh problems with DopeSheet channel list (which were only obvious after adding back the sliders)
* Removed the old/unrestored and nasty slider code used in the past by the Action Editor only.
---
 source/blender/blenkernel/intern/modifier.c   |   1 +
 .../editors/animation/anim_channels_defines.c | 138 +++++--
 .../editors/animation/anim_ipo_utils.c        |   3 +-
 .../editors/interface/interface_widgets.c     |   2 +-
 .../editors/space_action/action_draw.c        | 336 +-----------------
 .../editors/space_action/space_action.c       |   3 +-
 .../editors/space_graph/graph_header.c        |   4 +-
 source/blender/makesdna/DNA_space_types.h     |   1 +
 source/blender/makesrna/intern/rna_space.c    |   4 +
 9 files changed, 125 insertions(+), 367 deletions(-)

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 1cb163a4de7..c78227a363f 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -78,6 +78,7 @@
 
 #include "BKE_main.h"
 #include "BKE_anim.h"
+#include "BKE_action.h"
 #include "BKE_bmesh.h"
 // XXX #include "BKE_booleanops.h"
 #include "BKE_cloth.h"
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index acf7467713b..b16420a7094 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -79,6 +79,7 @@
 #include "UI_view2d.h"
 
 #include "ED_anim_api.h"
+#include "ED_keyframing.h"
 #include "ED_keyframes_edit.h" // XXX move the select modes out of there!
 #include "ED_screen.h"
 #include "ED_space_api.h"
@@ -1869,13 +1870,14 @@ void ANIM_channel_setting_set (bAnimContext *ac, bAnimListElem *ale, int setting
 
 // XXX hardcoded size of icons
 #define ICON_WIDTH		17
+// XXX hardcoded width of sliders
+#define SLIDER_WIDTH	70
 
 /* Draw the given channel */
 // TODO: make this use UI controls for the buttons
 void ANIM_channel_draw (bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
 	bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-	View2D *v2d= &ac->ar->v2d;
 	short selected, offset;
 	float y, ymid, ytext;
 	
@@ -1970,26 +1972,6 @@ void ANIM_channel_draw (bAnimContext *ac, bAnimListElem *ale, float yminc, float
 		offset += 3;
 		UI_DrawString(offset, ytext, name);
 	}
-	
-	/* step 6) draw mute+protection toggles + (sliders) ....................... */
-	/* reset offset - now goes from RHS of panel */
-	offset = 0;
-	
-	// TODO: we need a mechanism of drawing over (and hiding) stuff from here...
-	// TODO: when drawing sliders, make those draw instead of these toggles if not enough space
-	
-	if (v2d) {
-		/* protect... */
-		if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) {
-			/* just skip - drawn as widget now */
-			offset += ICON_WIDTH;
-		}
-		/* mute... */
-		if (acf->has_setting(ac, ale, ACHANNEL_SETTING_MUTE)) {
-			/* just skip - drawn as widget now */
-			offset += ICON_WIDTH;
-		}
-	}
 }
 
 /* ------------------ */
@@ -2000,6 +1982,44 @@ static void achannel_setting_widget_cb(bContext *C, void *poin, void *poin2)
 	WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
 }
 
+/* callback for widget sliders - insert keyframes */
+static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poin)
+{
+	ID *id= (ID *)id_poin;
+	FCurve *fcu= (FCurve *)fcu_poin;
+	
+	Scene *scene= CTX_data_scene(C);
+	PointerRNA id_ptr, ptr;
+	PropertyRNA *prop;
+	short flag=0, done=0;
+	float cfra;
+	
+	/* get current frame */
+	// NOTE: this will do for now...
+	cfra= (float)CFRA;
+	
+	/* get flags for keyframing */
+	if (IS_AUTOKEY_FLAG(INSERTNEEDED))
+		flag |= INSERTKEY_NEEDED;
+	if (IS_AUTOKEY_FLAG(AUTOMATKEY))
+		flag |= INSERTKEY_MATRIX;
+	
+	
+	/* get RNA pointer, and resolve the path */
+	RNA_id_pointer_create(id, &id_ptr);
+	
+	/* try to resolve the path stored in the F-Curve */
+	if (RNA_path_resolve(&id_ptr, fcu->rna_path, &ptr, &prop)) {
+		/* insert a keyframe for this F-Curve */
+		done= insert_keyframe_direct(ptr, prop, fcu, cfra, flag);
+		
+		if (done)
+			WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);
+	}
+}
+
+
+
 /* Draw a widget for some setting */
 static void draw_setting_widget (bAnimContext *ac, bAnimListElem *ale, bAnimChannelType *acf, uiBlock *block, int xpos, int ypos, int setting)
 {
@@ -2164,15 +2184,75 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b
 	// TODO: when drawing sliders, make those draw instead of these toggles if not enough space
 	
 	if (v2d) {
-		/* protect... */
-		if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) {
-			offset += ICON_WIDTH; 
-			draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_PROTECT);
+		short draw_sliders = 0;
+		
+		/* check if we need to show the sliders */
+		if ((ac->sa) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_IPO)) {
+			switch (ac->spacetype) {
+				case SPACE_ACTION:
+				{
+					SpaceAction *saction= (SpaceAction *)ac->sa->spacedata.first;
+					draw_sliders= (saction->flag & SACTION_SLIDERS);
+				}
+					break;
+				case SPACE_IPO:
+				{
+					SpaceIpo *sipo= (SpaceIpo *)ac->sa->spacedata.first;
+					draw_sliders= (sipo->flag & SIPO_SLIDERS);
+				}
+					break;
+			}
 		}
-		/* mute... */
-		if (acf->has_setting(ac, ale, ACHANNEL_SETTING_MUTE)) {
-			offset += ICON_WIDTH;
-			draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_MUTE);
+		
+		/* check if there's enough space for the toggles if the sliders are drawn too */
+		if ( !(draw_sliders) || ((v2d->mask.xmax-v2d->mask.xmin) > ACHANNEL_BUTTON_WIDTH/2) ) {
+			/* protect... */
+			if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) {
+				offset += ICON_WIDTH; 
+				draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_PROTECT);
+			}
+			/* mute... */
+			if (acf->has_setting(ac, ale, ACHANNEL_SETTING_MUTE)) {
+				offset += ICON_WIDTH;
+				draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_MUTE);
+			}
+		}
+		
+		/* draw slider
+		 *	- even if we can draw sliders for this view, we must also check that the channel-type supports them
+		 *	  (only only F-Curves really can support them for now)
+		 *	- to make things easier, we use RNA-autobuts for this so that changes are reflected immediately, 
+		 *	  whereever they occurred. BUT, we don't use the layout engine, otherwise we'd get wrong alignment,
+		 *	  and wouldn't be able to auto-keyframe...
+		 *	- slider should start before the toggles (if they're visible) to keep a clean line down the side
+		 */
+		if ((draw_sliders) && (ale->type == ANIMTYPE_FCURVE)) {
+			/* adjust offset */
+			offset += SLIDER_WIDTH;
+			
+			/* need backdrop behind sliders... */
+			uiBlockSetEmboss(block, UI_EMBOSS);
+			
+			if (ale->id) { /* Slider using RNA Access -------------------- */
+				FCurve *fcu= (FCurve *)ale->data;
+				PointerRNA id_ptr, ptr;
+				PropertyRNA *prop;
+				
+				/* get RNA pointer, and resolve the path */
+				RNA_id_pointer_create(ale->id, &id_ptr);
+				
+				/* try to resolve the path */
+				if (RNA_path_resolve(&id_ptr, fcu->rna_path, &ptr, &prop)) {
+					uiBut *but;
+					
+					/* create the slider button, and assign relevant callback to ensure keyframes are inserted... */
+					but= uiDefAutoButR(block, &ptr, prop, fcu->array_index, "", 0, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc);
+					uiButSetFunc(but, achannel_setting_slider_cb, ale->id, fcu);
+				}
+			}
+			else { /* Special Slider for stuff without RNA Access ---------- */
+				// TODO: only implement this case when we really need it...
+			}
 		}
 	}
 }
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c
index 394cc53dda2..ecf0bdbf285 100644
--- a/source/blender/editors/animation/anim_ipo_utils.c
+++ b/source/blender/editors/animation/anim_ipo_utils.c
@@ -93,9 +93,8 @@ int geticon_anim_blocktype(short blocktype)
 }
 
 /* Write into "name" buffer, the name of the property (retrieved using RNA from the curve's settings) 
- * WARNING: name buffer we're writing to cannot exceed 128 chars (check action_draw.c for details)
+ * WARNING: name buffer we're writing to cannot exceed 256 chars (check anim_channels_defines.c for details)
  */
-// TODO: have an extra var to indicate if prop was valid?
 void getname_anim_fcurve(char *name, ID *id, FCurve *fcu)
 {
 	/* sanity checks */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index ba0d1900344..a55b11afe48 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2050,7 +2050,7 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int rou
 	widget_init(&wtb);
 	
 	/* half rounded */
-	round_box_edges(&wtb, roundboxalign, rect, 4.0f);
+	round_box_edges(&wtb, roundboxalign, rect, 5.0f);
 
 	widgetbase_draw(&wtb, wcol);
 }
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 4fb22064c17..4288cc10a26 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -92,306 +92,6 @@
 #include "ED_screen.h"
 #include "ED_space_api.h"
 
-#if 0 // XXX old includes for reference only
-	#include "BIF_editaction.h"
-	#include "BIF_editkey.h"
-	#include "BIF_editnla.h"
-	#include "BIF_drawgpencil.h"
-	#include "BIF_keyframing.h"
-	#include "BIF_language.h"
-	#include "BIF_space.h"
-	
-	#include "BDR_editcurve.h"
-	#include "BDR_gpencil.h"
-
-	#include "BSE_drawnla.h"
-	#include "BSE_drawipo.h"
-	#include "BSE_drawview.h"
-	#include "BSE_editaction_types.h"
-	#include "BSE_editipo.h"
-	#include "BSE_headerbuttons.h"
-	#include "BSE_time.h"
-	#include "BSE_view.h"
-#endif // XXX old defines for reference only
-
-/* XXX */
-extern void gl_round_box(int mode, float minx, float miny, float maxx, float maxy, float rad);
-
-/********************************** Slider Stuff **************************** */
-
-#if 0 // XXX all of this slider stuff will need a rethink!
-/* sliders for shapekeys */
-static void meshactionbuts(SpaceAction *saction, Object *ob, Key *key)
-{
-	int           i;
-	char          str[64];
-	float	      x, y;
-	uiBlock       *block;
-	uiBut 		  *but;
-	
-	/* lets make the shapekey sliders */
-	
-	/* reset the damn myortho2 or the sliders won't draw/redraw
-	 * correctly *grumble*
-	 */
-	mywinset(curarea->win);
-	myortho2(-0.375f, curarea->winx-0.375f, G.v2d->cur.ymin, G.v2d->cur.ymax);
-	
-    sprintf(str, "actionbuttonswin %d", curarea->win);
-    block= uiNewBlock (&curarea->uiblocks, str, UI_EMBOSS);
-
-	x = ACHANNEL_NAMEWIDTH + 1;
-    y = 0.0f;
-	
-	uiBlockSetEmboss(block, UI_EMBOSSN);
-
-	if (!(G.saction->flag & SACTION_SLIDERS)) {
-		ACTWIDTH = ACHANNEL_NAMEWIDTH;
-		but=uiDefIconButBitS(block, TOG, SACTION_SLIDERS, B_REDR, 
-					  ICON_DISCLOSURE_TRI_RIGHT,
-					  ACHANNEL_NAMEWIDTH - XIC - 5, (short)y + CHANNELHEIGHT,
-					  XIC,YIC-2,
-					  &(G.saction->flag), 0, 0, 0, 0, 
-					  "Show action window sliders");
-		/* no hilite, the winmatrix is not correct later on... */
-		uiButSetFlag(but, UI_NO_HILITE);
-	}
-	else {
-		but= uiDefIconButBitS(block, TOG, SACTION_SLIDERS, B_REDR, 
-					  ICON_DISCLOSURE_TRI_DOWN,
-					  ACHANNEL_NAMEWIDTH - XIC - 5, (short)y + CHANNELHEIGHT,
-					  XIC,YIC-2,
-					  &(G.saction->flag), 0, 0, 0, 0, 
-					  "Hide action window sliders");
-		/* no hilite, the winmatrix is not correct later on... */
-		uiButSetFlag(but, UI_NO_HILITE);
-		
-		ACTWIDTH = ACHANNEL_NAMEWIDTH + SLIDERWIDTH;
-		
-		/* sliders are open so draw them */
-		BIF_ThemeColor(TH_FACE); 
-		
-		glRects(ACHANNEL_NAMEWIDTH,  0,  ACHANNEL_NAMEWIDTH+SLIDERWIDTH,  curarea->winy);
-		uiBlockSetEmboss(block, UI_EMBOSS);
-		for (i=1; i < key->totkey; i++) {
-			make_rvk_slider(block, ob, i, 
-							(int)x, (int)y, SLIDERWIDTH-2, CHANNELHEIGHT-1, "Slider to control Shape Keys");
-			
-			y-=CHANNELHEIGHT+CHANNELSKIP;
-			
-			/* see sliderval array in editkey.c */
-			if (i >= 255) break;
-		}
-	}
-	uiDrawBlock(C, block);
-}
-
-static void icu_slider_func(void *voidicu, void *voidignore) 
-{
-	/* the callback for the icu sliders ... copies the
-	 * value from the icu->curval into a bezier at the
-	 * right frame on the right ipo curve (creating both the
-	 * ipo curve and the bezier if needed).
-	 */
-	IpoCurve  *icu= voidicu;
-	BezTriple *bezt=NULL;
-	float cfra, icuval;
-
-	cfra = frame_to_float(CFRA);
-	if (G.saction->pin==0 && OBACT)
-		cfra= get_action_frame(OBACT, cfra);
-	
-	/* if the ipocurve exists, try to get a bezier
-	 * for this frame
-	 */
-	bezt = get_bezt_icu_time(icu, &cfra, &icuval);
-
-	/* create the bezier triple if one doesn't exist,
-	 * otherwise modify it's value
-	 */
-	if (bezt == NULL) {
-		insert_vert_icu(icu, cfra, icu->curval, 0);
-	}
-	else {
-		bezt->vec[1][1] = icu->curval;
-	}
-
-	/* make sure the Ipo's are properly processed and
-	 * redraw as necessary
-	 */
-	sort_time_ipocurve(icu);
-	testhandles_ipocurve(icu);
-	
-	/* nla-update (in case this affects anything) */
-	synchronize_action_strips();
-	
-	/* do redraw pushes, and also the depsgraph flushes */
-	if (OBACT->pose || ob_get_key(OBACT))
-		DAG_object_flush_update(G.scene, OBACT, OB_RECALC);
-	else
-		DAG_object_flush_update(G.scene, OBACT, OB_RECALC_OB);
-	
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWACTION, 0);
-	allqueue(REDRAWNLA, 0);
-	allqueue(REDRAWIPO, 0);
-	allspace(REMAKEIPO, 0);
-	allqueue(REDRAWBUTSALL, 0);
-}
-
-static void make_icu_slider(uiBlock *block, IpoCurve *icu,
-					 int x, int y, int w, int h, char *tip)
-{
-	/* create a slider for the ipo-curve*/
-	uiBut *but;
-	
-	if(icu == NULL) return;
-	
-	if (IS_EQ(icu->slide_max, icu->slide_min)) {
-		if (IS_EQ(icu->ymax, icu->ymin)) {
-			if (ELEM(icu->blocktype, ID_CO, ID_KE)) {
-				/* hack for constraints and shapekeys (and maybe a few others) */
-				icu->slide_min= 0.0;
-				icu->slide_max= 1.0;
-			}
-			else {
-				icu->slide_min= -100;
-				icu->slide_max= 100;
-			}
-		}
-		else {
-			icu->slide_min= icu->ymin;
-			icu->slide_max= icu->ymax;
-		}
-	}
-	if (icu->slide_min >= icu->slide_max) {
-		SWAP(float, icu->slide_min, icu->slide_max);
-	}
-
-	but=uiDefButF(block, NUMSLI, REDRAWVIEW3D, "",
-				  x, y , w, h,
-				  &(icu->curval), icu->slide_min, icu->slide_max, 
-				  10, 2, tip);
-	
-	uiButSetFunc(but, icu_slider_func, icu, NULL);
-	
-	// no hilite, the winmatrix is not correct later on...
-	uiButSetFlag(but, UI_NO_HILITE);
-}
-
-/* sliders for ipo-curves of active action-channel */
-static void action_icu_buts(SpaceAction *saction)
-{
-	ListBase act_data = {NULL, NULL};
-	bActListElem *ale;
-	int filter;
-	void *data;
-	short datatype;
-	
-	char          str[64];
-	float	        x, y;
-	uiBlock       *block;
-
-	/* lets make the action sliders */
-
-	/* reset the damn myortho2 or the sliders won't draw/redraw
-	 * correctly *grumble*
-	 */
-	mywinset(curarea->win);
-	myortho2(-0.375f, curarea->winx-0.375f, G.v2d->cur.ymin, G.v2d->cur.ymax);
-	
-    sprintf(str, "actionbuttonswin %d", curarea->win);
-    block= uiNewBlock (&curarea->uiblocks, str, UI_EMBOSS);
-
-	x = (float)ACHANNEL_NAMEWIDTH + 1;
-    y = 0.0f;
-	
-	uiBlockSetEmboss(block, UI_EMBOSSN);
-
-	if (G.saction->flag & SACTION_SLIDERS) {
-		/* sliders are open so draw them */
-		
-		/* get editor data */
-		data= get_action_context(&datatype);
-		if (data == NULL) return;
-		
-		/* build list of channels to draw */
-		filter= (ACTFILTER_FORDRAWING|ACTFILTER_VISIBLE|ACTFILTER_CHANNELS);
-		actdata_filter(&act_data, filter, data, datatype);
-		
-		/* draw backdrop first */
-		BIF_ThemeColor(TH_FACE); // change this color... it's ugly
-		glRects(ACHANNEL_NAMEWIDTH,  (short)G.v2d->cur.ymin,  ACHANNEL_NAMEWIDTH+SLIDERWIDTH,  (short)G.v2d->cur.ymax);
-		
-		uiBlockSetEmboss(block, UI_EMBOSS);
-		for (ale= act_data.first; ale; ale= ale->next) {
-			const float yminc= y-CHANNELHEIGHT/2;
-			const float ymaxc= y+CHANNELHEIGHT/2;
-			
-			/* check if visible */
-			if ( IN_RANGE(yminc, G.v2d->cur.ymin, G.v2d->cur.ymax) ||
-				 IN_RANGE(ymaxc, G.v2d->cur.ymin, G.v2d->cur.ymax) ) 
-			{
-				/* determine what needs to be drawn */
-				switch (ale->type) {
-					case ACTTYPE_CONCHAN: /* constraint channel */
-					{
-						bActionChannel *achan = (bActionChannel *)ale->owner;
-						IpoCurve *icu = (IpoCurve *)ale->key_data;
-						
-						/* only show if owner is selected */
-						if ((ale->ownertype == ACTTYPE_OBJECT) || SEL_ACHAN(achan)) {
-							make_icu_slider(block, icu,
-											(int)x, (int)y, SLIDERWIDTH-2, CHANNELHEIGHT-2, 
-											"Slider to control current value of Constraint Influence");
-						}
-					}
-						break;
-					case ACTTYPE_ICU: /* ipo-curve channel */
-					{
-						bActionChannel *achan = (bActionChannel *)ale->owner;
-						IpoCurve *icu = (IpoCurve *)ale->key_data;
-						
-						/* only show if owner is selected */
-						if ((ale->ownertype == ACTTYPE_OBJECT) || SEL_ACHAN(achan)) {
-							make_icu_slider(block, icu,
-											(int)x, (int)y, SLIDERWIDTH-2, CHANNELHEIGHT-2, 
-											"Slider to control current value of IPO-Curve");
-						}
-					}
-						break;
-					case ACTTYPE_SHAPEKEY: /* shapekey channel */
-					{
-						Object *ob= (Object *)ale->id;
-						IpoCurve *icu= (IpoCurve *)ale->key_data;
-						
-						// TODO: only show if object is active 
-						if (icu) {
-							make_icu_slider(block, icu,
-										(int)x, (int)y, SLIDERWIDTH-2, CHANNELHEIGHT-2, 
-										"Slider to control ShapeKey");
-						}
-						else if (ob && ale->index) {
-							make_rvk_slider(block, ob, ale->index, 
-									(int)x, (int)y, SLIDERWIDTH-2, CHANNELHEIGHT-1, "Slider to control Shape Keys");
-						}
-					}
-						break;
-				}
-			}
-			
-			/* adjust y-position for next one */
-			y-=CHANNELHEIGHT+CHANNELSKIP;
-		}
-		
-		/* free tempolary channels */
-		BLI_freelistN(&act_data);
-	}
-	uiDrawBlock(C, block);
-}
-
-#endif // XXX all of this slider stuff will need a rethink 
-
 
 /* ************************************************************************* */
 /* Channel List */
@@ -518,7 +218,6 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 		adt= ANIM_nla_mapping_get(ac, NULL);
 		
 		/* start and end of action itself */
-		// TODO: this has not had scaling applied
 		calc_action_range(ac->data, &act_start, &act_end, 0);
 	}
 	
@@ -550,43 +249,14 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 		if ( IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
 			 IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax) ) 
 		{
+			bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
 			int sel=0;
 			
 			/* determine if any need to draw channel */
 			if (ale->datatype != ALE_NONE) {
 				/* determine if channel is selected */
-				switch (ale->type) {
-					case ANIMTYPE_SCENE:
-					{
-						Scene *sce= (Scene *)ale->data;
-						sel = SEL_SCEC(sce);
-					}
-						break;
-					case ANIMTYPE_OBJECT:
-					{
-						Base *base= (Base *)ale->data;
-						sel = SEL_OBJC(base);
-					}
-						break;
-					case ANIMTYPE_GROUP:
-					{
-						bActionGroup *agrp = (bActionGroup *)ale->data;
-						sel = SEL_AGRP(agrp);
-					}
-						break;
-					case ANIMTYPE_FCURVE:
-					{
-						FCurve *fcu = (FCurve *)ale->data;
-						sel = SEL_FCU(fcu);
-					}
-						break;
-					case ANIMTYPE_GPLAYER:
-					{
-						bGPDlayer *gpl = (bGPDlayer *)ale->data;
-						sel = SEL_GPL(gpl);
-					}
-						break;
-				}
+				if (acf->has_setting(ac, ale, ACHANNEL_SETTING_SELECT))
+					sel= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT);
 				
 				if (ELEM(ac->datatype, ANIMCONT_ACTION, ANIMCONT_DOPESHEET)) {
 					switch (ale->type) {
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 275ac4ea4c1..2977d07d845 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -243,7 +243,7 @@ static void action_channel_area_draw(const bContext *C, ARegion *ar)
 	
 	/* data */
 	if (ANIM_animdata_get_context(C, &ac)) {
-		draw_channel_names(C, &ac, saction, ar);
+		draw_channel_names((bContext *)C, &ac, saction, ar);
 	}
 	
 	/* reset view matrix */
@@ -294,6 +294,7 @@ static void action_channel_area_listener(ARegion *ar, wmNotifier *wmn)
 		case NC_SCENE:
 			switch(wmn->data) {
 				case ND_OB_ACTIVE:
+				case ND_FRAME:
 					ED_region_tag_redraw(ar);
 					break;
 			}
diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
index fc02cadb475..06d48fe20f3 100644
--- a/source/blender/editors/space_graph/graph_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -81,6 +81,8 @@ static void graph_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	uiItemS(layout);
 	
 	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_sliders", 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0);
 	
 	if (sipo->flag & SIPO_NOHANDLES)
 		uiItemO(layout, "Show Handles", ICON_CHECKBOX_DEHLT, "GRAPH_OT_handles_view_toggle");
@@ -88,7 +90,7 @@ static void graph_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
 		uiItemO(layout, "Show Handles", ICON_CHECKBOX_HLT, "GRAPH_OT_handles_view_toggle");
 	
 	uiItemR(layout, NULL, 0, &spaceptr, "only_selected_curves_handles", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0);
+	
 	
 	if (sipo->flag & SIPO_DRAWTIME)
 		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 37f28cfeaa6..6fdc3a7787b 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -720,6 +720,7 @@ enum FileSortTypeE {
 #define SIPO_DRAWTIME			(1<<4)
 #define SIPO_SELCUVERTSONLY		(1<<5)
 #define SIPO_DRAWNAMES			(1<<6)
+#define SIPO_SLIDERS			(1<<7)
 
 /* SpaceIpo->mode (Graph Editor Mode) */
 enum {
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 8e8c9a9837c..a754d619741 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1075,6 +1075,10 @@ static void rna_def_space_graph(BlenderRNA *brna)
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NODRAWCFRANUM);
 	RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line.");
 	
+	prop= RNA_def_property(srna, "show_sliders", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_SLIDERS);
+	RNA_def_property_ui_text(prop, "Show Sliders", "Show sliders beside F-Curve channels.");
+	
 	prop= RNA_def_property(srna, "show_handles", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_NOHANDLES);
 	RNA_def_property_ui_text(prop, "Show Handles", "Show handles of Bezier control points.");

From 90895fce8ca4f40bd41026b0406d80e8e83e0e8d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 24 Aug 2009 08:13:09 +0000
Subject: [PATCH 232/577] * Fix for camera+internal surface object inside
 ztransp volume

---
 source/blender/render/intern/source/shadeinput.c |  3 ++-
 source/blender/render/intern/source/volumetric.c | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index ede3c2e0503..ed654eaf526 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -169,7 +169,8 @@ void shade_material_loop(ShadeInput *shi, ShadeResult *shr)
 	}	
 	
 	if(R.r.mode & R_RAYTRACE) {
-		shade_volume_inside(shi, shr);
+		if (R.render_volumes_inside.first)
+			shade_volume_inside(shi, shr);
 	}
 }
 
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index cf66d580944..0e2e3913819 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -575,15 +575,14 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 		startco = shi->camera_co;
 		endco = shi->co;
 		
-		if (!ztransp) {
-			if (trace_behind) {
+		if (trace_behind) {
+			if (!ztransp)
 				/* trace behind the volume object */
 				vol_trace_behind(shi, shi->vlr, endco, col);
-			} else {
-				/* we're tracing through the volume between the camera 
-				 * and a solid surface, so use that pre-shaded radiance */
-				QUATCOPY(col, shr->combined);
-			}
+		} else {
+			/* we're tracing through the volume between the camera 
+			 * and a solid surface, so use that pre-shaded radiance */
+			QUATCOPY(col, shr->combined);
 		}
 		
 		/* shade volume from 'camera' to 1st hit point */
@@ -676,8 +675,9 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 	MatInside *m;
 	Material *mat_backup;
 	
-	if (BLI_countlist(&R.render_volumes_inside) == 0) return;
+	//if (BLI_countlist(&R.render_volumes_inside) == 0) return;
 	
+	/* XXX: extend to multiple volumes perhaps later */
 	mat_backup = shi->mat;
 	m = R.render_volumes_inside.first;
 	shi->mat = m->ma;

From 1ef190088ba9ffd7c3ab4c62ff102fd8eddd1331 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 24 Aug 2009 09:17:09 +0000
Subject: [PATCH 233/577] patch from Ron Walker (o6a). Descriptions for TFM,
 TEXT, CONSOLE and ED operators. - Made some minor edits.

---
 source/blender/editors/mesh/editmesh_mods.c   |  3 +-
 .../editors/space_console/console_ops.c       | 12 ++++++
 .../editors/space_console/console_report.c    |  6 +++
 .../blender/editors/space_text/text_header.c  |  1 +
 source/blender/editors/space_text/text_ops.c  | 43 +++++++++++++++++++
 .../blender/editors/transform/transform_ops.c | 15 +++++++
 source/blender/editors/util/undo.c            |  2 +
 .../GameLogic/SCA_PropertyEventManager.h      | 13 +++---
 8 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index d27aa3f7e3a..789527fd96d 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -4475,7 +4475,8 @@ void MESH_OT_vertices_transform_to_sphere(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Vertices to Sphere";
-	ot->description= "Move selected vertices outward in a spherical shape.";
+	//added "around cursor" to differentiate between "TFM_OT_tosphere()"
+	ot->description= "Move selected vertices outward in a spherical shape around cursor.";
 	ot->idname= "MESH_OT_vertices_transform_to_sphere";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index fa9055f2d8d..f8dbe0c3dd4 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -280,6 +280,7 @@ void CONSOLE_OT_move(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Cursor";
+    ot->description= "Move cursor position.";
 	ot->idname= "CONSOLE_OT_move";
 	
 	/* api callbacks */
@@ -324,6 +325,7 @@ void CONSOLE_OT_insert(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Insert";
+    ot->description= "Insert text at cursor position.";
 	ot->idname= "CONSOLE_OT_insert";
 	
 	/* api callbacks */
@@ -391,6 +393,7 @@ void CONSOLE_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete";
+    ot->description= "Delete text by cursor position.";
 	ot->idname= "CONSOLE_OT_delete";
 	
 	/* api callbacks */
@@ -434,6 +437,7 @@ void CONSOLE_OT_clear(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clear";
+    ot->description= "Clear text by type.";
 	ot->idname= "CONSOLE_OT_clear";
 	
 	/* api callbacks */
@@ -478,6 +482,7 @@ void CONSOLE_OT_history_cycle(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "History Cycle";
+    ot->description= "Cycle through history.";
 	ot->idname= "CONSOLE_OT_history_cycle";
 	
 	/* api callbacks */
@@ -525,6 +530,7 @@ void CONSOLE_OT_history_append(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "History Append";
+    ot->description= "Append history at cursor position.";
 	ot->idname= "CONSOLE_OT_history_append";
 	
 	/* api callbacks */
@@ -572,6 +578,7 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot)
 
 	/* identifiers */
 	ot->name= "Scrollback Append";
+    ot->description= "Append scrollback text by type.";
 	ot->idname= "CONSOLE_OT_scrollback_append";
 	
 	/* api callbacks */
@@ -614,6 +621,7 @@ void CONSOLE_OT_copy(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Copy to Clipboard";
+    ot->description= "Copy selected text to clipboard.";
 	ot->idname= "CONSOLE_OT_copy";
 
 	/* api callbacks */
@@ -648,6 +656,7 @@ void CONSOLE_OT_paste(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste from Clipboard";
+    ot->description= "Paste text from clipboard.";
 	ot->idname= "CONSOLE_OT_paste";
 
 	/* api callbacks */
@@ -679,6 +688,9 @@ void CONSOLE_OT_zoom(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Console Zoom";
+    /*optionals - 
+      "Zoom view font." */
+    ot->description= "Zoom screen area.";
 	ot->idname= "CONSOLE_OT_zoom";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_console/console_report.c b/source/blender/editors/space_console/console_report.c
index 2e23c4039f1..08d003f0706 100644
--- a/source/blender/editors/space_console/console_report.c
+++ b/source/blender/editors/space_console/console_report.c
@@ -114,6 +114,7 @@ void CONSOLE_OT_report_replay(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Replay Operators";
+    ot->description= "Replay selected reports.";
 	ot->idname= "CONSOLE_OT_report_replay";
 
 	/* api callbacks */
@@ -160,6 +161,7 @@ void CONSOLE_OT_select_pick(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select report";
+    ot->description= "Select reports by index.";
 	ot->idname= "CONSOLE_OT_select_pick";
 
 	/* api callbacks */
@@ -213,6 +215,7 @@ void CONSOLE_OT_select_all_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "(De)Select All";
+    ot->description= "(de)select all reports.";
 	ot->idname= "CONSOLE_OT_select_all_toggle";
 
 	/* api callbacks */
@@ -304,6 +307,7 @@ void CONSOLE_OT_select_border(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Border Select";
+    ot->description= "Toggle border selection.";
 	ot->idname= "CONSOLE_OT_select_border";
 
 	/* api callbacks */
@@ -357,6 +361,7 @@ void CONSOLE_OT_report_delete(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete Reports";
+    ot->description= "Delete selected reports.";
 	ot->idname= "CONSOLE_OT_report_delete";
 
 	/* api callbacks */
@@ -401,6 +406,7 @@ void CONSOLE_OT_report_copy(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Copy Reports to Clipboard";
+    ot->description= "Copy selected reports to Clipboard.";
 	ot->idname= "CONSOLE_OT_report_copy";
 
 	/* api callbacks */
diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c
index 0e2d2ce1698..089436cfcf9 100644
--- a/source/blender/editors/space_text/text_header.c
+++ b/source/blender/editors/space_text/text_header.c
@@ -215,6 +215,7 @@ void TEXT_OT_properties(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Properties";
+    ot->description= "Toggle text properties panel.";
 	ot->idname= "TEXT_OT_properties";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 4c9f47ed170..7e514ea723a 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -176,6 +176,7 @@ void TEXT_OT_new(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "New";
+    ot->description= "Create a new text data block.";
 	ot->idname= "TEXT_OT_new";
 
 	/* api callbacks */
@@ -223,6 +224,7 @@ void TEXT_OT_open(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Open";
+    ot->description= "Open a new text data block.";
 	ot->idname= "TEXT_OT_open";
 
 	/* api callbacks */
@@ -260,6 +262,7 @@ void TEXT_OT_reload(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Reload";
+    ot->description= "Reload active text data block from its file.";
 	ot->idname= "TEXT_OT_reload";
 
 	/* api callbacks */
@@ -337,6 +340,7 @@ void TEXT_OT_unlink(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Unlink";
+    ot->description= "Unlink active text data block.";
 	ot->idname= "TEXT_OT_unlink";
 
 	/* api callbacks */
@@ -367,6 +371,7 @@ void TEXT_OT_make_internal(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Make Internal";
+    ot->description= "Make active text file internal.";
 	ot->idname= "TEXT_OT_make_internal";
 
 	/* api callbacks */
@@ -435,6 +440,7 @@ void TEXT_OT_save(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Save";
+    ot->description= "Save active text data block.";
 	ot->idname= "TEXT_OT_save";
 
 	/* api callbacks */
@@ -490,6 +496,7 @@ void TEXT_OT_save_as(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Save As";
+    ot->description= "Save active text file with options.";
 	ot->idname= "TEXT_OT_save_as";
 
 	/* api callbacks */
@@ -527,6 +534,7 @@ void TEXT_OT_run_script(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Run Script";
+    ot->description= "Run active script.";
 	ot->idname= "TEXT_OT_run_script";
 
 	/* api callbacks */
@@ -583,6 +591,7 @@ void TEXT_OT_refresh_pyconstraints(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Refresh PyConstraints";
+    ot->description= "Refresh all pyconstraints.";
 	ot->idname= "TEXT_OT_refresh_pyconstraints";
 
 	/* api callbacks */
@@ -704,6 +713,7 @@ void TEXT_OT_paste(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste";
+    ot->description= "Paste text from clipboard.";
 	ot->idname= "TEXT_OT_paste";
 
 	/* api callbacks */
@@ -744,6 +754,7 @@ void TEXT_OT_copy(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Copy";
+    ot->description= "Copy selected text to clipboard.";
 	ot->idname= "TEXT_OT_copy";
 
 	/* api callbacks */
@@ -774,6 +785,7 @@ void TEXT_OT_cut(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Cut";
+    ot->description= "Cut selected text to clipboard.";
 	ot->idname= "TEXT_OT_cut";
 
 	/* api callbacks */
@@ -809,6 +821,7 @@ void TEXT_OT_indent(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Indent";
+    ot->description= "Indent selected text.";
 	ot->idname= "TEXT_OT_indent";
 
 	/* api callbacks */
@@ -844,6 +857,7 @@ void TEXT_OT_unindent(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Unindent";
+    ot->description= "Unindent selected text.";
 	ot->idname= "TEXT_OT_unindent";
 
 	/* api callbacks */
@@ -884,6 +898,7 @@ void TEXT_OT_line_break(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Line Break";
+    ot->description= "Insert line break at cursor position.";
 	ot->idname= "TEXT_OT_line_break";
 
 	/* api callbacks */
@@ -916,6 +931,7 @@ void TEXT_OT_comment(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Comment";
+    ot->description= "Convert selected text to comment.";
 	ot->idname= "TEXT_OT_comment";
 
 	/* api callbacks */
@@ -949,6 +965,7 @@ void TEXT_OT_uncomment(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Uncomment";
+    ot->description= "Convert selected comment to text.";
 	ot->idname= "TEXT_OT_uncomment";
 
 	/* api callbacks */
@@ -1090,6 +1107,7 @@ void TEXT_OT_convert_whitespace(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Convert Whitespace";
+    ot->description= "Convert whitespaces by type.";
 	ot->idname= "TEXT_OT_convert_whitespace";
 
 	/* api callbacks */
@@ -1120,6 +1138,7 @@ void TEXT_OT_select_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select All";
+    ot->description= "Select all text.";
 	ot->idname= "TEXT_OT_select_all";
 
 	/* api callbacks */
@@ -1147,6 +1166,7 @@ void TEXT_OT_select_line(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select Line";
+    ot->description= "Select text by line.";
 	ot->idname= "TEXT_OT_select_line";
 
 	/* api clinebacks */
@@ -1184,6 +1204,7 @@ void TEXT_OT_previous_marker(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Previous Marker";
+    ot->description= "Move to previous marker.";
 	ot->idname= "TEXT_OT_previous_marker";
 
 	/* api callbacks */
@@ -1221,6 +1242,7 @@ void TEXT_OT_next_marker(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Next Marker";
+    ot->description= "Move to next marker";
 	ot->idname= "TEXT_OT_next_marker";
 
 	/* api callbacks */
@@ -1248,6 +1270,7 @@ void TEXT_OT_markers_clear(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clear All Markers";
+    ot->description= "Clear all markers.";
 	ot->idname= "TEXT_OT_markers_clear";
 
 	/* api callbacks */
@@ -1531,6 +1554,7 @@ void TEXT_OT_move(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Cursor";
+    ot->description= "Move cursor to position type.";
 	ot->idname= "TEXT_OT_move";
 	
 	/* api callbacks */
@@ -1557,6 +1581,7 @@ void TEXT_OT_move_select(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Select";
+    ot->description= "Make selection from current cursor position to new cursor position type.";
 	ot->idname= "TEXT_OT_move_select";
 	
 	/* api callbacks */
@@ -1596,6 +1621,7 @@ void TEXT_OT_jump(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Jump";
+    ot->description= "Jump cursor to line.";
 	ot->idname= "TEXT_OT_jump";
 
 	/* api callbacks */
@@ -1648,6 +1674,7 @@ void TEXT_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete";
+    ot->description= "Delete text by cursor position.";
 	ot->idname= "TEXT_OT_delete";
 	
 	/* api callbacks */
@@ -1828,6 +1855,10 @@ void TEXT_OT_scroll(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroll";
+    /*don't really see the difference between this and
+      scroll_bar. Both do basically the same thing (aside 
+      from keymaps).*/
+    ot->description= "Scroll text screen.";
 	ot->idname= "TEXT_OT_scroll";
 	
 	/* api callbacks */
@@ -1876,6 +1907,10 @@ void TEXT_OT_scroll_bar(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scrollbar";
+    /*don't really see the difference between this and
+      scroll. Both do basically the same thing (aside 
+      from keymaps).*/
+    ot->description= "Scroll text screen.";
 	ot->idname= "TEXT_OT_scroll_bar";
 	
 	/* api callbacks */
@@ -2151,6 +2186,7 @@ void TEXT_OT_cursor_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Cursor";
+    ot->description= "Set cursor selection.";
 	ot->idname= "TEXT_OT_cursor_set";
 	
 	/* api callbacks */
@@ -2274,6 +2310,7 @@ void TEXT_OT_insert(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Insert";
+    ot->description= "Insert text at cursor position.";
 	ot->idname= "TEXT_OT_insert";
 	
 	/* api callbacks */
@@ -2378,6 +2415,7 @@ void TEXT_OT_find(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Find";
+    ot->description= "Find specified text.";
 	ot->idname= "TEXT_OT_find";
 
 	/* api callbacks */
@@ -2396,6 +2434,7 @@ void TEXT_OT_replace(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Replace";
+    ot->description= "Replace text with specified text.";
 	ot->idname= "TEXT_OT_replace";
 
 	/* api callbacks */
@@ -2414,6 +2453,7 @@ void TEXT_OT_mark_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Mark All";
+    ot->description= "Mark all specified text.";
 	ot->idname= "TEXT_OT_mark_all";
 
 	/* api callbacks */
@@ -2443,6 +2483,7 @@ void TEXT_OT_find_set_selected(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Find Set Selected";
+    ot->description= "Find specified text and set as selected.";
 	ot->idname= "TEXT_OT_find_set_selected";
 
 	/* api callbacks */
@@ -2469,6 +2510,7 @@ void TEXT_OT_replace_set_selected(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Replace Set Selected";
+    ot->description= "Replace text with specified text and set as selected.";
 	ot->idname= "TEXT_OT_replace_set_selected";
 
 	/* api callbacks */
@@ -2631,6 +2673,7 @@ void TEXT_OT_to_3d_object(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "To 3D Object";
+    ot->description= "Create 3d text object from active text data block.";
 	ot->idname= "TEXT_OT_to_3d_object";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 081e9589fb8..e50a8205afa 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -148,6 +148,7 @@ void TFM_OT_select_orientation(struct wmOperatorType *ot)
 
 	/* identifiers */
 	ot->name   = "Select Orientation";
+	ot->description= "Select orientation type.";
 	ot->idname = "TFM_OT_select_orientation";
 
 	/* api callbacks */
@@ -308,6 +309,7 @@ void TFM_OT_translate(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Translate";
+	ot->description= "Translate selected items.";
 	ot->idname = OP_TRANSLATION;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -333,6 +335,7 @@ void TFM_OT_resize(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Resize";
+	ot->description= "Resize selected items."; 
 	ot->idname = OP_RESIZE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -359,6 +362,7 @@ void TFM_OT_trackball(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Trackball";
+	ot->description= "Trackball style rotation of selected items.";
 	ot->idname = OP_TRACKBALL;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -380,6 +384,7 @@ void TFM_OT_rotate(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Rotate";
+	ot->description= "Rotate selected items.";
 	ot->idname = OP_ROTATION;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -405,6 +410,10 @@ void TFM_OT_tilt(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Tilt";
+    /*optionals - 
+        "Tilt selected vertices."
+        "Specify an extra axis rotation for selected vertices of 3d curve." */
+	ot->description= "Tilt selected vertices of 3d curve."; 
 	ot->idname = OP_TILT;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -428,6 +437,7 @@ void TFM_OT_warp(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Warp";
+	ot->description= "Warp selected vertices around the cursor.";
 	ot->idname = OP_WARP;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -452,6 +462,7 @@ void TFM_OT_shear(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Shear";
+	ot->description= "Shear selected vertices along the horizontal screen axis.";
 	ot->idname = OP_SHEAR;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -476,6 +487,7 @@ void TFM_OT_shrink_fatten(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Shrink/Fatten";
+	ot->description= "Shrink/fatten selected vertices along vertex normals.";
 	ot->idname = OP_SHRINK_FATTEN;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -497,6 +509,8 @@ void TFM_OT_tosphere(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "To Sphere";
+    //added "around mesh center" to defferentiate between "MESH_OT_vertices_to_sphere()" 
+	ot->description= "Move selected vertices outward in a spherical shape around mesh center.";
 	ot->idname = OP_TOSPHERE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -548,6 +562,7 @@ void TFM_OT_transform(struct wmOperatorType *ot)
 
 	/* identifiers */
 	ot->name   = "Transform";
+	ot->description= "Transform selected items by mode type.";
 	ot->idname = "TFM_OT_transform";
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index 18159414cf6..41159397634 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -239,6 +239,7 @@ void ED_OT_undo(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Undo";
+    ot->description= "Undo previous action.";
 	ot->idname= "ED_OT_undo";
 	
 	/* api callbacks */
@@ -250,6 +251,7 @@ void ED_OT_redo(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Redo";
+    ot->description= "Redo previous action.";
 	ot->idname= "ED_OT_redo";
 	
 	/* api callbacks */
diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
index 011f3285f63..a9692377df8 100644
--- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h
+++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
@@ -40,16 +40,17 @@ class SCA_PropertyEventManager : public SCA_EventManager
 	class SCA_LogicManager*	m_logicmgr;
 
 public:
-
-#ifdef WITH_CXX_GUARDEDALLOC
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
-#endif
-
 	SCA_PropertyEventManager(class SCA_LogicManager* logicmgr);
 	virtual ~SCA_PropertyEventManager();
 	virtual void NextFrame();
 	//SCA_LogicManager* GetLogicManager() { return m_logicmgr;}
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_PROPERTYEVENTMANAGER

From b39f73431a644dc0164d06bca8e54f1a734c6950 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 24 Aug 2009 10:07:49 +0000
Subject: [PATCH 234/577] [#19232] (2.5) Correction of cmake for windows about
 audio (jack and openal) from Guillaume Lecocq (lguillaume)

[#19247] (2.5) useless WITH_OPENEXR redefinition
from Mauro Toffanin (equilibrium)
---
 CMakeLists.txt                                |  4 ++--
 .../imbuf/intern/openexr/openexr_api.cpp      |  1 -
 source/creator/CMakeLists.txt                 | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef4296e266..d1e18723f5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,8 +251,8 @@ IF(WIN32)
 
   IF(WITH_JACK)
     SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
+    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+    SET(JACK_LIB libjack)
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 32d97d79bd7..a780727b1a2 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -51,7 +51,6 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include "IMB_imbuf.h"
 #include "IMB_allocimbuf.h"
 
-#define WITH_OPENEXR
 #include "openexr_multi.h"
 }
 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 3b95c409b30..24b70c5664a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -261,6 +261,26 @@ IF(WITH_INSTALL)
         COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
       )
     ENDIF(WITH_FFMPEG)
+
+    IF(WITH_JACK)
+      ADD_CUSTOM_COMMAND(TARGET blender
+        POST_BUILD
+        MAIN_DEPENDENCY blender
+        COMMAND copy /Y \"${WIN_LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
+      )
+    ENDIF(WITH_JACK)
+
+    IF(WITH_OPENAL)
+      ADD_CUSTOM_COMMAND(TARGET blender
+        POST_BUILD
+        MAIN_DEPENDENCY blender
+        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
+        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
+
+      )
+    ENDIF(WITH_OPENAL)
+
+
   ENDIF(WIN32)
 ENDIF(WITH_INSTALL)
 

From 9967037e92ad75e76c3536a93a63a7100e4ccdc9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 24 Aug 2009 10:16:39 +0000
Subject: [PATCH 235/577] [#19029] Baking selected to active with nearby
 dupliframes objects crashes blender from Jorge Hodge (watcom)

Confirmed the crash. baking didn't account for RE_RAY_TRANSFORM_OFFS in R.objectinstance.
---
 source/blender/render/intern/source/rendercore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 2793e238dc7..6b6a736a420 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -2241,7 +2241,7 @@ static int bake_check_intersect(Isect *is, int ob, RayFace *face)
 	/* no direction checking for now, doesn't always improve the result
 	 * (INPR(shi->facenor, bs->dir) > 0.0f); */
 
-	return (R.objectinstance[ob].obr->ob != bs->actob);
+	return (R.objectinstance[ob & ~RE_RAY_TRANSFORM_OFFS].obr->ob != bs->actob);
 }
 
 static int bake_intersect_tree(RayTree* raytree, Isect* isect, float *start, float *dir, float sign, float *hitco, float *dist)

From 0b459178e1a247c647def869566da3d901d059ae Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 24 Aug 2009 10:21:53 +0000
Subject: [PATCH 236/577] [#19232] (2.5) Correction of cmake for windows about
 audio (jack and openal)

Didnt apply the patch updated with sndfile.
---
 source/creator/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 24b70c5664a..0d9d0fe8856 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -262,6 +262,14 @@ IF(WITH_INSTALL)
       )
     ENDIF(WITH_FFMPEG)
 
+    IF(WITH_SNDFILE)
+      ADD_CUSTOM_COMMAND(TARGET blender
+        POST_BUILD
+        MAIN_DEPENDENCY blender
+        COMMAND copy /Y \"${WIN_LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
+      )
+    ENDIF(WITH_SNDFILE)
+
     IF(WITH_JACK)
       ADD_CUSTOM_COMMAND(TARGET blender
         POST_BUILD

From 9261efa4d6dd59f9284443fea85a24282eb72d27 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 24 Aug 2009 10:37:39 +0000
Subject: [PATCH 237/577] [#18936] Particle Related Patch from Alberto Santos
 (dnakhain)

This also adds the option to duplicate a particle system with an object.

 --- description from the patch submission.

This patch includes my latest additions to the Python API developed for my Degree's Project.

It includes:
 - Particle
    - Vertex group dictionary in doc (to use with setvertexgroup/getvertexgroup)
    - Particle.New return psys (not specified in doc)
    - Draw As variable and dict
    - Strand render toggle
 - Object
   - psys variable in duplicate
 - Material
   - Strand render variables
 - Texture
   - Use colorbands
 - Lamp
   - Spot buffer type selection
---
 source/blender/makesdna/DNA_userdef_types.h   |   1 +
 source/blender/python/api2_2x/Lamp.c          |  41 +++-
 source/blender/python/api2_2x/Material.c      | 203 ++++++++++++++++++
 source/blender/python/api2_2x/Object.c        |  10 +-
 source/blender/python/api2_2x/Particle.c      | 100 ++++++++-
 source/blender/python/api2_2x/Texture.c       |  29 +++
 source/blender/python/api2_2x/doc/Lamp.py     |   7 +
 source/blender/python/api2_2x/doc/Material.py |  18 ++
 source/blender/python/api2_2x/doc/Object.py   |   5 +-
 source/blender/python/api2_2x/doc/Particle.py |  32 ++-
 source/blender/python/api2_2x/doc/Texture.py  |   2 +
 source/blender/src/editobject.c               |  11 +
 12 files changed, 450 insertions(+), 9 deletions(-)

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index fbd962f9372..a986f993722 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -313,6 +313,7 @@ extern UserDef U; /* from usiblender.c !!!! */
 #define USER_DUP_TEX			(1 << 8)
 #define	USER_DUP_ARM			(1 << 9)
 #define	USER_DUP_ACT			(1 << 10)
+#define	USER_DUP_PSYS			(1 << 11)
 
 /* gameflags */
 #define USER_DEPRECATED_FLAG	1
diff --git a/source/blender/python/api2_2x/Lamp.c b/source/blender/python/api2_2x/Lamp.c
index 3b7a785f32e..d3acc089944 100644
--- a/source/blender/python/api2_2x/Lamp.c
+++ b/source/blender/python/api2_2x/Lamp.c
@@ -125,6 +125,8 @@
 #define EXPP_LAMP_COL_MAX 1.0
 #define EXPP_LAMP_FALLOFF_MIN LA_FALLOFF_CONSTANT
 #define EXPP_LAMP_FALLOFF_MAX LA_FALLOFF_SLIDERS
+#define EXPP_LAMP_BUFFERTYPE_MIN LA_SHADBUF_REGULAR
+#define EXPP_LAMP_BUFFERTYPE_MAX LA_SHADBUF_HALFWAY
 
 /* Raytracing settings */
 #define EXPP_LAMP_RAYSAMPLES_MIN 1
@@ -268,6 +270,8 @@ static PyObject *Lamp_clearScriptLinks( BPy_Lamp * self, PyObject * args );
 static int Lamp_setComponent( BPy_Lamp * self, PyObject * value, void * closure );
 static PyObject *Lamp_getFalloffType( BPy_Lamp * self );
 static int Lamp_setFalloffType( BPy_Lamp * self, PyObject * value );
+static PyObject *Lamp_getBufferType( BPy_Lamp * self );
+static int Lamp_setBufferType( BPy_Lamp * self, PyObject * value );
 
 /*****************************************************************************/
 /* Python BPy_Lamp methods table:                                            */
@@ -489,6 +493,10 @@ static PyGetSetDef BPy_Lamp_getseters[] = {
 	 (getter)Lamp_getFalloffType, (setter)Lamp_setFalloffType,
 	 "Lamp falloff type",
 	 NULL},
+	{"bufferType",
+	 (getter)Lamp_getBufferType, (setter)Lamp_setBufferType,
+	 "Lamp buffer type",
+	 NULL},
 	{"R",
 	 (getter)Lamp_getComponent, (setter)Lamp_setComponent,
 	 "Lamp color red component",
@@ -828,13 +836,31 @@ static PyObject *Lamp_FalloffsDict( void )
 	return Falloffs;
 }
 
+static PyObject *Lamp_BufferTypesDict( void )
+{			/* create the Blender.Lamp.BufferTypes constant dict */
+	PyObject *Types = PyConstant_New(  );
+
+	if( Types ) {
+		BPy_constant *c = ( BPy_constant * ) Types;
+
+		PyConstant_Insert( c, "REGULAR",
+				 PyInt_FromLong( LA_SHADBUF_REGULAR ) );
+		PyConstant_Insert( c, "IRREGULAR",
+				 PyInt_FromLong( LA_SHADBUF_IRREGULAR ) );
+		PyConstant_Insert( c, "HALFWAY",
+				 PyInt_FromLong( LA_SHADBUF_HALFWAY ) );
+	}
+
+	return Types;
+}
+
 /*****************************************************************************/
 /* Function:              Lamp_Init                                          */
 /*****************************************************************************/
 /* Needed by the Blender module, to register the Blender.Lamp submodule */
 PyObject *Lamp_Init( void )
 {
-	PyObject *submodule, *Types, *Modes, *Falloffs;
+	PyObject *submodule, *Types, *Modes, *Falloffs, *BufferTypes;
 
 	if( PyType_Ready( &Lamp_Type ) < 0)
 		return NULL;
@@ -842,6 +868,7 @@ PyObject *Lamp_Init( void )
 	Types = Lamp_TypesDict(  );
 	Modes = Lamp_ModesDict(  );
 	Falloffs = Lamp_FalloffsDict(  );
+	BufferTypes = Lamp_BufferTypesDict(  );
 
 	submodule =
 		Py_InitModule3( "Blender.Lamp", M_Lamp_methods, M_Lamp_doc );
@@ -852,6 +879,8 @@ PyObject *Lamp_Init( void )
 		PyModule_AddObject( submodule, "Modes", Modes );
 	if( Falloffs )
 		PyModule_AddObject( submodule, "Falloffs", Falloffs );
+	if( BufferTypes )
+		PyModule_AddObject( submodule, "BufferTypes", BufferTypes );
 
 	PyModule_AddIntConstant( submodule, "RGB",      IPOKEY_RGB );
 	PyModule_AddIntConstant( submodule, "ENERGY",   IPOKEY_ENERGY );
@@ -1029,6 +1058,11 @@ static PyObject *Lamp_getFalloffType( BPy_Lamp * self )
 	return PyInt_FromLong( (int)self->lamp->falloff_type );
 }
 
+static PyObject *Lamp_getBufferType( BPy_Lamp * self )
+{
+	return PyInt_FromLong( (int)self->lamp->buftype );
+}
+
 static int Lamp_setType( BPy_Lamp * self, PyObject * value )
 {
 	return EXPP_setIValueRange ( value, &self->lamp->type,
@@ -1217,6 +1251,11 @@ static int Lamp_setFalloffType( BPy_Lamp * self, PyObject * value )
 				  				EXPP_LAMP_FALLOFF_MIN, EXPP_LAMP_FALLOFF_MAX, 'h' );
 }
 
+static int Lamp_setBufferType( BPy_Lamp * self, PyObject * value )
+{
+	return EXPP_setIValueRange ( value, &self->lamp->buftype,
+				  				EXPP_LAMP_BUFFERTYPE_MIN, EXPP_LAMP_BUFFERTYPE_MAX, 'h' );
+}
 
 static PyObject *Lamp_getComponent( BPy_Lamp * self, void * closure )
 {
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index 50a1be3fa97..cc0dd9ff6a5 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -747,6 +747,26 @@ static PyObject *Material_getColorbandSpecularInput( BPy_Material * self );
 static int Material_setColorbandDiffuseInput ( BPy_Material * self, PyObject * value);
 static int Material_setColorbandSpecularInput ( BPy_Material * self, PyObject * value);
 
+static PyObject *Material_getStrandTangentShad( BPy_Material * self );
+static int Material_setStrandTangentShad( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandSurfDiff( BPy_Material * self );
+static int Material_setStrandSurfDiff( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandDist( BPy_Material * self );
+static int Material_setStrandDist( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandBlendUnit( BPy_Material * self );
+static int Material_setStrandBlendUnit( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandStart( BPy_Material * self );
+static int Material_setStrandStart( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandEnd( BPy_Material * self );
+static int Material_setStrandEnd( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandMin( BPy_Material * self );
+static int Material_setStrandMin( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandShape( BPy_Material * self );
+static int Material_setStrandShape( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandWidthFad( BPy_Material * self );
+static int Material_setStrandWidthFad( BPy_Material * self, PyObject * value);
+static PyObject *Material_getStrandUV( BPy_Material * self );
+static int Material_setStrandUV( BPy_Material * self, PyObject * value);
 
 
 /*****************************************************************************/
@@ -1313,6 +1333,46 @@ static PyGetSetDef BPy_Material_getseters[] = {
 	 (getter)Material_getColorbandDiffuseInput, (setter)Material_setColorbandDiffuseInput,
 	 "The diffuse colorband input for this material",
 	 NULL},
+	{"strandTanShad",
+	 (getter)Material_getStrandTangentShad, (setter)Material_setStrandTangentShad,
+	 "Uses direction of strands as normal for tangent-shading",
+	 NULL},
+	{"strandSurfDiff",
+	 (getter)Material_getStrandSurfDiff, (setter)Material_setStrandSurfDiff,
+	 "Make diffuse shading more similar to shading the surface",
+	 NULL},
+	{"strandDist",
+	 (getter)Material_getStrandDist, (setter)Material_setStrandDist,
+	 "Distance in Blender units over which to blend in the surface normal",
+	 NULL},
+	{"strandBlendUnit",
+	 (getter)Material_getStrandBlendUnit, (setter)Material_setStrandBlendUnit,
+	 "Use actual Blender units for widths instead of pixels",
+	 NULL},
+	{"strandStart",
+	 (getter)Material_getStrandStart, (setter)Material_setStrandStart,
+	 "Start size of strands",
+	 NULL},
+	{"strandEnd",
+	 (getter)Material_getStrandEnd, (setter)Material_setStrandEnd,
+	 "End size of strands",
+	 NULL},
+	{"strandMin",
+	 (getter)Material_getStrandMin, (setter)Material_setStrandMin,
+	 "Minimum size of strands in pixels",
+	 NULL},
+	{"strandShape",
+	 (getter)Material_getStrandShape, (setter)Material_setStrandShape,
+	 "Shape of strands, positive value makes it rounder, negative makes it spiky",
+	 NULL},
+	{"strandFade",
+	 (getter)Material_getStrandWidthFad, (setter)Material_setStrandWidthFad,
+	 "Transparency along the width of the strand",
+	 NULL},
+	{"strandUV",
+	 (getter)Material_getStrandUV, (setter)Material_setStrandUV,
+	 "Set name of UV layer to override",
+	 NULL},
 
 	/* SSS settings */
 	{"enableSSS",
@@ -3582,3 +3642,146 @@ static int Material_setColorbandSpecularInput ( BPy_Material * self, PyObject *
 	return EXPP_setIValueClamped(value, &self->material->rampin_spec,
 			MA_RAMP_IN_SHADER, MA_RAMP_IN_RESULT, 'b');
 }
+
+/* Strand */
+
+static PyObject *Material_getStrandTangentShad( BPy_Material * self )
+{
+	return PyInt_FromLong( ((long)( self->material->mode & MA_TANGENT_STR )) > 0 );
+}
+
+static int Material_setStrandTangentShad( BPy_Material * self, PyObject * value)
+{
+	int number;
+
+	if( !PyInt_Check( value ) )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected int argument" );
+
+	number = PyInt_AS_LONG( value );
+
+	if (number){
+		self->material->mode |= MA_TANGENT_STR;
+	}else{
+		self->material->mode &= ~MA_TANGENT_STR;
+	}
+
+	return 0;
+}
+
+static PyObject *Material_getStrandSurfDiff( BPy_Material * self )
+{
+	return PyInt_FromLong( ((long)( self->material->mode & MA_STR_SURFDIFF )) > 0 );
+}
+
+static int Material_setStrandSurfDiff( BPy_Material * self, PyObject * value)
+{
+	int number;
+
+	if( !PyInt_Check( value ) )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected int argument" );
+
+	number = PyInt_AS_LONG( value );
+
+	if (number){
+		self->material->mode |= MA_STR_SURFDIFF;
+	}else{
+		self->material->mode &= ~MA_STR_SURFDIFF;
+	}
+
+	return 0;
+}
+
+static PyObject *Material_getStrandDist( BPy_Material * self )
+{
+	return PyFloat_FromDouble( ((float)( self->material->strand_surfnor )) );
+}
+
+static int Material_setStrandDist( BPy_Material * self, PyObject * value)
+{
+	return EXPP_setFloatRange( value, &self->material->strand_surfnor,	0.0, 10.0 );
+}
+
+static PyObject *Material_getStrandBlendUnit( BPy_Material * self )
+{
+	return PyInt_FromLong( ((long)( self->material->mode & MA_STR_B_UNITS )) > 0 );
+}
+
+static int Material_setStrandBlendUnit( BPy_Material * self, PyObject * value)
+{
+	int number;
+
+	if( !PyInt_Check( value ) )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected int argument" );
+
+	number = PyInt_AS_LONG( value );
+
+	if (number){
+		self->material->mode |= MA_STR_B_UNITS;
+	}else{
+		self->material->mode &= ~MA_STR_B_UNITS;
+	}
+
+	return 0;
+}
+
+static PyObject *Material_getStrandStart( BPy_Material * self )
+{
+	return PyFloat_FromDouble( ((float)( self->material->strand_sta )) );
+}
+
+static int Material_setStrandStart( BPy_Material * self, PyObject * value)
+{
+	return EXPP_setFloatRange( value, &self->material->strand_sta,	0.0001, 2.0 );
+}
+
+static PyObject *Material_getStrandEnd( BPy_Material * self )
+{
+	return PyFloat_FromDouble( ((float)( self->material->strand_end )) );
+}
+
+static int Material_setStrandEnd( BPy_Material * self, PyObject * value)
+{
+	return EXPP_setFloatRange( value, &self->material->strand_end,	0.0001, 1.0 );
+}
+
+static PyObject *Material_getStrandMin( BPy_Material * self )
+{
+	return PyFloat_FromDouble( ((float)( self->material->strand_min )) );
+}
+
+static int Material_setStrandMin( BPy_Material * self, PyObject * value)
+{
+	return EXPP_setFloatRange( value, &self->material->strand_min,	0.0001, 10.0 );
+}
+
+static PyObject *Material_getStrandShape( BPy_Material * self )
+{
+	return PyFloat_FromDouble( ((float)( self->material->strand_ease )) );
+}
+
+static int Material_setStrandShape( BPy_Material * self, PyObject * value)
+{
+	return EXPP_setFloatRange( value, &self->material->strand_ease,	-0.9, 0.9 );
+}
+
+static PyObject *Material_getStrandWidthFad( BPy_Material * self )
+{
+	return PyFloat_FromDouble( ((float)( self->material->strand_widthfade )) );
+}
+
+static int Material_setStrandWidthFad( BPy_Material * self, PyObject * value)
+{
+	return EXPP_setFloatRange( value, &self->material->strand_widthfade,	0.0, 2.0 );
+}
+
+static PyObject *Material_getStrandUV( BPy_Material * self )
+{
+	return EXPP_ReturnPyObjError( PyExc_NotImplementedError,
+		"Material.strandUV not implemented" );
+}
+
+static int Material_setStrandUV( BPy_Material * self, PyObject * value)
+{
+	return EXPP_ReturnPyObjError( PyExc_NotImplementedError,
+		"Material.strandUV not implemented" );
+}
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c
index b50b0082bf4..8617491e950 100644
--- a/source/blender/python/api2_2x/Object.c
+++ b/source/blender/python/api2_2x/Object.c
@@ -1001,9 +1001,10 @@ static PyObject *M_Object_Duplicate( PyObject * self_unused,
 	int material_dupe = 0;
 	int texture_dupe = 0;
 	int ipo_dupe = 0;
+	int psys_dupe = 0;
 	
 	static char *kwlist[] = {"mesh", "surface", "curve",
-			"text", "metaball", "armature", "lamp", "material", "texture", "ipo", NULL};
+			"text", "metaball", "armature", "lamp", "material", "texture", "ipo", "psys", NULL};
 	
 	/* duplicating in background causes segfaults */
 	if( G.background == 1 )
@@ -1011,11 +1012,11 @@ static PyObject *M_Object_Duplicate( PyObject * self_unused,
 					"cannot duplicate objects in background mode" );
 	
 	
-	if (!PyArg_ParseTupleAndKeywords(args, kwd, "|iiiiiiiiii", kwlist,
+	if (!PyArg_ParseTupleAndKeywords(args, kwd, "|iiiiiiiiiii", kwlist,
 		&mesh_dupe, &surface_dupe, &curve_dupe, &text_dupe, &metaball_dupe,
-		&armature_dupe, &lamp_dupe, &material_dupe, &texture_dupe, &ipo_dupe))
+		&armature_dupe, &lamp_dupe, &material_dupe, &texture_dupe, &ipo_dupe, &psys_dupe))
 			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected nothing or bool keywords 'mesh', 'surface', 'curve', 'text', 'metaball', 'armature', 'lamp' 'material', 'texture' and 'ipo' as arguments" );
+				"expected nothing or bool keywords 'mesh', 'surface', 'curve', 'text', 'metaball', 'armature', 'lamp' 'material', 'texture', 'ipo' and 'psys' as arguments" );
 	
 	/* USER_DUP_ACT for actions is not supported in the UI so dont support it here */
 	if (mesh_dupe)		dupflag |= USER_DUP_MESH;
@@ -1028,6 +1029,7 @@ static PyObject *M_Object_Duplicate( PyObject * self_unused,
 	if (material_dupe)	dupflag |= USER_DUP_MAT;
 	if (texture_dupe)	dupflag |= USER_DUP_TEX;
 	if (ipo_dupe)		dupflag |= USER_DUP_IPO;
+	if (psys_dupe)		dupflag |= USER_DUP_PSYS;
 	adduplicate(2, dupflag); /* 2 is a mode with no transform and no redraw, Duplicate the current selection, context sensitive */
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c
index f69cb6a01b9..850100d29a9 100644
--- a/source/blender/python/api2_2x/Particle.c
+++ b/source/blender/python/api2_2x/Particle.c
@@ -42,6 +42,7 @@
 #include "BKE_utildefines.h"
 #include "BKE_pointcache.h"
 #include "BKE_DerivedMesh.h"
+#include "BKE_library.h"
 #include "BIF_editparticle.h"
 #include "BIF_space.h"
 #include "blendef.h"
@@ -70,6 +71,9 @@ static PyObject *Part_GetMat( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_GetVertGroup( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_SetVertGroup( BPy_PartSys * self, PyObject * args );
+static int Part_SetName( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_SetNameWithMethod( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_GetName( BPy_PartSys * self, PyObject * args );
 static int Part_setSeed( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getSeed( BPy_PartSys * self );
 static int Part_setType( BPy_PartSys * self, PyObject * args );
@@ -141,11 +145,16 @@ static int Part_setRenderDied( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getRenderDied( BPy_PartSys * self );
 static int Part_setRenderMaterialIndex( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getRenderMaterialIndex( BPy_PartSys * self );
+static int Part_setStrandRender( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getStrandRender( BPy_PartSys * self );
+static int Part_setStrandRenderAn( BPy_PartSys * self, PyObject * args );
+static PyObject *Part_getStrandRenderAn( BPy_PartSys * self );
 static int Part_setStep( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getStep( BPy_PartSys * self );
 static int Part_setRenderStep( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getRenderStep( BPy_PartSys * self );
 static PyObject *Part_getDupOb( BPy_PartSys * self );
+static int Part_setDrawAs( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getDrawAs( BPy_PartSys * self );
 static int Part_setPhysType( BPy_PartSys * self, PyObject * args );
 static PyObject *Part_getPhysType( BPy_PartSys * self );
@@ -283,6 +292,10 @@ static PyMethodDef BPy_ParticleSys_methods[] = {
 	 METH_VARARGS, "() - Get the vertex group which affects a particles attribute"},
 	{"setVertGroup", ( PyCFunction ) Part_SetVertGroup,
 	 METH_VARARGS, "() - Set the vertex group to affect a particles attribute"},
+	{"getName", ( PyCFunction ) Part_GetName, METH_NOARGS,
+	 "() - Return particle system's name"},
+	{"setName", ( PyCFunction ) Part_SetNameWithMethod, METH_VARARGS,
+	 "(s) - Change particle system's name"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -430,6 +443,14 @@ static PyGetSetDef BPy_ParticleSys_getseters[] = {
 	 (getter)Part_getRenderMaterialIndex, (setter)Part_setRenderMaterialIndex,
 	 "Specify material index used for the particles",
 	 NULL},
+	 {"strandRender",
+	 (getter)Part_getStrandRender, (setter)Part_setStrandRender,
+	 "Use the strand primitive to render",
+	 NULL},
+	 {"strandRenderAngle",
+	 (getter)Part_getStrandRenderAn, (setter)Part_setStrandRenderAn,
+	 "How many degrees path has to curve to make another render segment",
+	 NULL},
      {"displayPercentage",
 	 (getter)Part_getParticleDisp, (setter)Part_setParticleDisp,
 	 "Particle display percentage",
@@ -447,8 +468,8 @@ static PyGetSetDef BPy_ParticleSys_getseters[] = {
 	 "Get the duplicate ob",
 	 NULL},
      {"drawAs",
-	 (getter)Part_getDrawAs, NULL,
-	 "Get draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ] )",
+	 (getter)Part_getDrawAs, (setter)Part_setDrawAs,
+	 "Draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ] )",
 	 NULL},
 /* Newtonian Physics */
 	{"physics",
@@ -2008,6 +2029,33 @@ static PyObject *Part_SetVertGroup( BPy_PartSys * self, PyObject * args ){
 	Py_RETURN_NONE;
 }
 
+PyObject *Part_GetName( BPy_PartSys * self, PyObject * args )
+{	
+	ID *id = (ID*) self->psys->part;
+	if (!id) return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, "data has been removed" ) );
+	return PyString_FromString( id->name + 2 );
+}
+
+int Part_SetName( BPy_PartSys * self, PyObject * args )
+{
+	ID *id = (ID*) self->psys->part;
+	char *name = NULL;
+	if (!id) return ( EXPP_ReturnIntError( PyExc_RuntimeError, "data has been removed" ) );
+	
+	name = PyString_AsString ( args );
+	if( !name )
+		return EXPP_ReturnIntError( PyExc_TypeError,
+					      "expected string argument" );
+
+	rename_id( id, name );
+
+	return 0;
+}
+
+PyObject * Part_SetNameWithMethod( BPy_PartSys *self, PyObject *args )
+{
+	return EXPP_setterWrapper( (void *)self, args, (setter)Part_SetName );
+}
 
 /*****************************************************************************/
 /* Function:              Set/Get Seed                                       */
@@ -2714,6 +2762,44 @@ static PyObject *Part_getRenderDied( BPy_PartSys * self )
 	return PyInt_FromLong( ((long)( self->psys->part->flag & PART_DIED )) > 0 );
 }
 
+static int Part_setStrandRender( BPy_PartSys * self, PyObject * args )
+{
+	int number;
+
+	if( !PyInt_Check( args ) )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected int argument" );
+
+	number = PyInt_AS_LONG( args );
+
+	if (number){
+		self->psys->part->draw |= PART_DRAW_REN_STRAND;
+	}else{
+		self->psys->part->draw &= ~PART_DRAW_REN_STRAND;
+	}
+
+	return 0;
+}
+
+static PyObject *Part_getStrandRender( BPy_PartSys * self )
+{
+	return PyInt_FromLong( ((long)( self->psys->part->draw & PART_DRAW_REN_STRAND )) > 0 );
+}
+
+static int Part_setStrandRenderAn( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setIValueRange( args, &self->psys->part->adapt_angle,
+			0, 45, 'i' );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
+static PyObject *Part_getStrandRenderAn( BPy_PartSys * self )
+{
+	return PyInt_FromLong( ((int)( self->psys->part->adapt_angle )) );
+}
+
 static int Part_setParticleDisp( BPy_PartSys * self, PyObject * args )
 {
 	int res = EXPP_setIValueRange( args, &self->psys->part->disp,
@@ -2762,6 +2848,16 @@ static PyObject *Part_getRenderStep( BPy_PartSys * self )
 	return PyInt_FromLong( ((short)( self->psys->part->ren_step )) );
 }
 
+static int Part_setDrawAs( BPy_PartSys * self, PyObject * args )
+{
+	int res = EXPP_setIValueRange( args, &self->psys->part->draw_as,
+			0, 9, 'h' );
+
+	psys_flush_settings( self->psys->part, PSYS_ALLOC, 1 );
+
+	return res;
+}
+
 static PyObject *Part_getDrawAs( BPy_PartSys * self )
 {
 	return PyInt_FromLong( (long)( self->psys->part->draw_as ) );
diff --git a/source/blender/python/api2_2x/Texture.c b/source/blender/python/api2_2x/Texture.c
index 455badef4ad..e9e1c898fca 100644
--- a/source/blender/python/api2_2x/Texture.c
+++ b/source/blender/python/api2_2x/Texture.c
@@ -511,6 +511,8 @@ static int Texture_setNoiseBasis2( BPy_Texture *self, PyObject *args,
 								
 static PyObject *Texture_getColorband( BPy_Texture * self);
 int Texture_setColorband( BPy_Texture * self, PyObject * value);
+static PyObject *Texture_getUseColorband( BPy_Texture * self);
+int Texture_setUseColorband( BPy_Texture * self, PyObject * value);
 static PyObject *Texture_evaluate( BPy_Texture *self, PyObject *value );
 static PyObject *Texture_copy( BPy_Texture *self );
 
@@ -791,6 +793,10 @@ static PyGetSetDef BPy_Texture_getseters[] = {
 	 (getter)Texture_getColorband, (setter)Texture_setColorband,
 	 "The colorband for this texture",
 	 NULL},
+	{"useColorband",
+	 (getter)Texture_getUseColorband, (setter)Texture_setUseColorband,
+	 "Use colorband for this texture",
+	 NULL},
 	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
 };
 
@@ -2525,6 +2531,29 @@ int Texture_setColorband( BPy_Texture * self, PyObject * value)
 	return EXPP_Colorband_fromPyList( &self->texture->coba, value );
 }
 
+static PyObject *Texture_getUseColorband( BPy_Texture * self)
+{
+	return PyInt_FromLong( ((long)( self->texture->flag & TEX_COLORBAND )) > 0 );
+}
+
+int Texture_setUseColorband( BPy_Texture * self, PyObject * value)
+{
+	int number;
+
+	if( !PyInt_Check( value ) )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected int argument" );
+
+	number = PyInt_AS_LONG( value );
+
+	if (number){
+		self->texture->flag |= TEX_COLORBAND;
+	}else{
+		self->texture->flag &= ~TEX_COLORBAND;
+	}
+
+	return 0;
+}
+
 static PyObject *Texture_evaluate( BPy_Texture * self, PyObject * value )
 {
 	TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
diff --git a/source/blender/python/api2_2x/doc/Lamp.py b/source/blender/python/api2_2x/doc/Lamp.py
index 878ca53bb15..88b1c2cf800 100644
--- a/source/blender/python/api2_2x/doc/Lamp.py
+++ b/source/blender/python/api2_2x/doc/Lamp.py
@@ -46,6 +46,11 @@ Example::
 	- 'NoDiffuse'
 	- 'NoSpecular'
 	- 'RayShadow'
+@type BufferTypes: read-only dictionary
+@var BufferTypes: The lamp shadowbuffer types.
+	- 'Regular'
+	- 'Irregular'
+	- 'Halfway'
 
 	Example::
 		from Blender import Lamp, Object
@@ -101,6 +106,8 @@ class Lamp:
 	@ivar bufferSize:  Lamp shadow buffer size.
 	Value is clamped to the range [512,5120].
 	@type bufferSize:  int
+	@ivar bufferType:	Lamp shadowbuffer type.  See L{BufferTypes} for values.
+	@type bufferType:	int
 	@ivar clipEnd:  Lamp shadow map clip end.
 	Value is clamped to the range [1.0,5000.0].
 	@type clipEnd:  float
diff --git a/source/blender/python/api2_2x/doc/Material.py b/source/blender/python/api2_2x/doc/Material.py
index 59ff4bc8503..801bb4cb04d 100644
--- a/source/blender/python/api2_2x/doc/Material.py
+++ b/source/blender/python/api2_2x/doc/Material.py
@@ -408,6 +408,24 @@ class Material:
 
 	@type textures: a tuple of Blender MTex objects.
 	@ivar textures: the Material's Texture list.  Empty texture channels contains None.
+	@ivar strandTanShad: Uses direction of strands as normal for tangent-shading
+	@type strandTanShad: int
+	@ivar strandSurfDiff: Make diffuse shading more similar to shading the surface
+	@type strandSurfDiff: int
+	@ivar strandDist: Distance in Blender units over which to blend in the surface normal
+	@type strandDist: float
+	@ivar strandBlendUnit: Use actual Blender units for widths instead of pixels
+	@type strandBlendUnit: int
+	@ivar strandStart: Start size of strands
+	@type strandStart: float
+	@ivar strandEnd: End size of strands
+	@type strandEnd: float
+	@ivar strandMin: Minimum size of strands in pixels
+	@type strandMin: float
+	@ivar strandShape: Shape of strands, positive value makes it rounder, negative makes it spiky
+	@type strandShape: float
+	@ivar strandFade: Transparency along the width of the strand
+	@type strandFade: float
 	@ivar enableSSS:  If True, subsurface scattering will be rendered on this material.
 	@type enableSSS:  bool
 	@ivar sssScale:  If True, subsurface scattering will be rendered on this material.
diff --git a/source/blender/python/api2_2x/doc/Object.py b/source/blender/python/api2_2x/doc/Object.py
index 212ff95ef74..bd1bd2eb0b3 100644
--- a/source/blender/python/api2_2x/doc/Object.py
+++ b/source/blender/python/api2_2x/doc/Object.py
@@ -205,7 +205,7 @@ def GetSelected ():
 	"""
 
 
-def Duplicate (mesh=0, surface=0, curve=0, text=0, metaball=0, armature=0, lamp=0, material=0, texture=0, ipo=0):
+def Duplicate (mesh=0, surface=0, curve=0, text=0, metaball=0, armature=0, lamp=0, material=0, texture=0, ipo=0, psys=0):
 	"""
 	Duplicate selected objects on visible layers from Blenders current scene,
 	de-selecting the currently visible, selected objects and making a copy where all new objects are selected.
@@ -234,6 +234,8 @@ def Duplicate (mesh=0, surface=0, curve=0, text=0, metaball=0, armature=0, lamp=
 	@param texture: When non-zero, texture data used by the object's materials will be duplicated with the objects.
 	@type ipo: bool
 	@param ipo: When non-zero, Ipo data linked to the object will be duplicated with the objects.
+	@type psys: bool
+	@param psys: When non-zero, particle systems used by the object or its object data will be duplicated with the objects.
 
 	I{B{Example:}}
 
@@ -663,6 +665,7 @@ class Object:
 		particle system  with that name exists, it is linked to the object.
 		@type name: string
 		@param name: The name of the requested Particle system (optional).
+		@return: The particle system linked.
 		"""
 		
 	def addVertexGroupsFromArmature(object):
diff --git a/source/blender/python/api2_2x/doc/Particle.py b/source/blender/python/api2_2x/doc/Particle.py
index 7193e365536..15481c9dd63 100644
--- a/source/blender/python/api2_2x/doc/Particle.py
+++ b/source/blender/python/api2_2x/doc/Particle.py
@@ -69,6 +69,20 @@ This module provides access to the B{Particle} in Blender.
 		- NONE: No particle angular velocity
 		- SPIN: Spin particle angular velocity
 		- RANDOM: Random particle angular velocity
+@type VERTEXGROUPS: readonly dictionary
+@var VERTEXGROUPS: Constant dict used for with L{Particle.VERTEXGROUP}
+		- DENSITY: VertexGroup affect to particles density
+		- VELOCITY: VertexGroup affect to particles velocity
+		- LENGHT: VertexGroup affect to particles lenght
+		- CLUMP: VertexGroup affect to particles clump
+		- KINK: VertexGroup affect to particles kink
+		- ROUGH1: VertexGroup affect to particles rough1
+		- ROUGH2: VertexGroup affect to particles rough2
+		- ROUGHE: VertexGroup affect to particles roughE
+		- SIZE: VertexGroup affect to particles size
+		- TANVEL: VertexGroup affect to particles tangent velocity
+		- TANROT: VertexGroup affect to particles tangent rotation
+		- EFFECTOR: VertexGroup affect to particles effector
 @type CHILDTYPE: readonly dictionary
 @var CHILDTYPE: Constant dict used for with L{Particle.CHILDTYPE}
 		- NONE: set no children
@@ -171,6 +185,10 @@ class Particle:
 	@type renderDied: int
 	@ivar renderMaterial: Specify material used for the particles.
 	@type renderMaterial: int
+	@ivar strandRender: Use the strand primitive to render.
+	@type strandRender: int
+	@ivar strandRenderAngle: How many degrees path has to curve to make another render segment.
+	@type strandRenderAngle: int
 	@ivar displayPercentage: Particle display percentage.
 	@type displayPercentage: int
 	@ivar hairDisplayStep: How many steps paths are drawn with (power of 2) in visu mode.
@@ -179,7 +197,7 @@ class Particle:
 	@type hairRenderStep: int
 	@ivar duplicateObject: Get the duplicate object.
 	@type duplicateObject: Blender Object
-	@ivar drawAs: Get draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ]).
+	@ivar drawAs: Draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ]).
 	@type drawAs: int
 	@ivar physics: Select particle physics type Particle.PHYSICS([ 'BOIDS' | 'KEYED' | 'NEWTONIAN' | 'NONE' ])
 	@type physics: int
@@ -276,6 +294,18 @@ class Particle:
 	@ivar childBranch: Threshold of branching
 	@type childBranch: float
 	"""
+	def getName():
+		"""
+		Get the name of this Particle System object.
+		@rtype: string
+		"""
+
+	def setName(name):
+		"""
+		Set the name of this Particle System object.
+		@type name: string
+		@param name: The new name.
+		"""
 	
 	def freeEdit():
 		"""
diff --git a/source/blender/python/api2_2x/doc/Texture.py b/source/blender/python/api2_2x/doc/Texture.py
index ad57c303ed2..3431dceb6cd 100644
--- a/source/blender/python/api2_2x/doc/Texture.py
+++ b/source/blender/python/api2_2x/doc/Texture.py
@@ -393,6 +393,8 @@ class Texture:
 	each color a list of 5 floats [0 - 1], [r,g,b,a,pos].
 	The colorband can have between 1 and 31 colors.
 	@type colorband:  list
+	@ivar useColorband: Use colorband for this texture.
+	@type colorband: int
 	@ivar autoRefresh: Refresh image on frame changes enabled.
 	@type autoRefresh:  boolean
 	"""
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index b6b6c3c8df9..801b086f980 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -5185,6 +5185,7 @@ void adduplicate(int mode, int dupflag)
 	Object *ob, *obn;
 	ID *id;
 	int a, didit;
+	ParticleSystem *psys;
 	
 	if(G.scene->id.lib) return;
 	clear_id_newpoins();
@@ -5260,6 +5261,16 @@ void adduplicate(int mode, int dupflag)
 						}
 					}
 				}
+				if(dupflag & USER_DUP_PSYS) {
+					for(psys=obn->particlesystem.first; psys; psys=psys->next) {
+						id= (ID*) psys->part;
+						if(id) {
+							ID_NEW_US(psys->part)
+							else psys->part= psys_copy_settings(psys->part);
+							id->us--;
+						}
+					}
+				}
 				
 				id= obn->data;
 				didit= 0;

From 819a0d2f773a6db9b4dc6b2490f11d087014b1f3 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 24 Aug 2009 11:34:48 +0000
Subject: [PATCH 238/577] EDL importer for the sequencer. supports... - audio
 and video edits - fades, wipes, speed changes (video only) - importing from
 multiple reels

example import from final cut pro.
http://www.graphicall.org/ftp/ideasman42/edl_in_blender_px.png
http://www.graphicall.org/ftp/ideasman42/edl_import_ui.png
---
 release/scripts/import_edl.py | 961 ++++++++++++++++++++++++++++++++++
 1 file changed, 961 insertions(+)
 create mode 100755 release/scripts/import_edl.py

diff --git a/release/scripts/import_edl.py b/release/scripts/import_edl.py
new file mode 100755
index 00000000000..8c5d041b34c
--- /dev/null
+++ b/release/scripts/import_edl.py
@@ -0,0 +1,961 @@
+#!BPY
+ 
+"""
+Name: 'Video Sequence (.edl)...'
+Blender: 248
+Group: 'Import'
+Tooltip: 'Load a CMX formatted EDL into the sequencer'
+"""
+
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# Copyright (C) 2009: Campbell Barton, ideasman42@gmail.com
+#
+# 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,
+# --------------------------------------------------------------------------
+
+class TimeCode(object):
+	'''
+	Simple timecode class
+	also supports conversion from other time strings used by EDL
+	'''
+	def __init__(self, data, fps):
+		self.fps= fps
+		if type(data)==str:
+			self.fromString(data)
+			frame = self.asFrame()
+			self.fromFrame(frame)
+		else:
+			self.fromFrame(data)
+		
+	def fromString(self, text):
+		# hh:mm:ss:ff
+		# No dropframe support yet
+
+		if text.lower().endswith('mps'): # 5.2mps
+			return self.fromFrame( int( float(text[:-3]) * self.fps ) )
+		elif text.lower().endswith('s'): # 5.2s
+			return self.fromFrame( int( float(text[:-1]) * self.fps ) )
+		elif text.isdigit(): # 1234
+			return self.fromFrame( int(text) )
+		elif ':' in text: # hh:mm:ss:ff
+			text= text.replace(';', ':').replace(',', ':').replace('.', ':')
+			text= text.split(':')
+			
+			self.hours= int(text[0])
+			self.minutes= int(text[1])
+			self.seconds= int(text[2])
+			self.frame= int(text[3])
+			return self
+		else:
+			print 'ERROR: could not convert this into timecode "%s"' % test
+			return self
+
+		
+	def fromFrame(self, frame):
+		
+		if frame < 0:
+			frame = -frame;
+			neg=True
+		else:
+			neg=False
+		
+		fpm = 60 * self.fps
+		fph = 60 * fpm
+		
+		if frame < fph:
+			self.hours= 0
+		else:
+			self.hours= int(frame/fph)
+			frame = frame % fph
+		
+		if frame < fpm:
+			self.minutes= 0
+		else:
+			self.minutes= int(frame/fpm)
+			frame = frame % fpm
+		
+		if frame < self.fps:
+			self.seconds= 0
+		else:
+			self.seconds= int(frame/self.fps)
+			frame = frame % self.fps
+		
+		self.frame= frame
+		
+		if neg:
+			self.frame = -self.frame
+			self.seconds = -self.seconds
+			self.minutes = -self.minutes
+			self.hours = -self.hours
+		
+		return self
+		
+	def asFrame(self):
+		abs_frame= self.frame
+		abs_frame += self.seconds * self.fps
+		abs_frame += self.minutes * 60 * self.fps
+		abs_frame += self.hours * 60 * 60 * self.fps
+		
+		return abs_frame
+	
+	def asString(self):
+		self.fromFrame(int(self))
+		return '%.2d:%.2d:%.2d:%.2d' % (self.hours, self.minutes, self.seconds, self.frame)
+	
+	def __repr__(self):
+		return self.asString()
+	
+	# Numeric stuff, may as well have this
+	def __neg__(self):			return TimeCode(-int(self), self.fps)
+	def __int__(self):			return self.asFrame()
+	def __sub__(self, other):		return TimeCode(int(self)-int(other), self.fps)
+	def __add__(self, other):		return TimeCode(int(self)+int(other), self.fps)
+	def __mul__(self, other):		return TimeCode(int(self)*int(other), self.fps)
+	def __div__(self, other):		return TimeCode(int(self)/int(other), self.fps)
+	def __abs__(self):			return TimeCode(abs(int(self)), self.fps)
+	def __iadd__(self, other):	return self.fromFrame(int(self)+int(other))
+	def __imul__(self, other):	return self.fromFrame(int(self)*int(other))
+	def __idiv__(self, other):		return self.fromFrame(int(self)/int(other))
+# end timecode
+
+
+'''Comments
+Comments can appear at the beginning of the EDL file (header) or between the edit lines in the EDL. The first block of comments in the file is defined to be the header comments and they are associated with the EDL as a whole. Subsequent comments in the EDL file are associated with the first edit line that appears after them.
+Edit Entries
+<filename|tag>  <EditMode>  <TransitionType>[num]  [duration]  [srcIn]  [srcOut]  [recIn]  [recOut]
+
+    * <filename|tag>: Filename or tag value. Filename can be for an MPEG file, Image file, or Image file template. Image file templates use the same pattern matching as for command line glob, and can be used to specify images to encode into MPEG. i.e. /usr/data/images/image*.jpg
+    * <EditMode>: 'V' | 'A' | 'VA' | 'B' | 'v' | 'a' | 'va' | 'b' which equals Video, Audio, Video_Audio edits (note B or b can be used in place of VA or va).
+    * <TransitonType>: 'C' | 'D' | 'E' | 'FI' | 'FO' | 'W' | 'c' | 'd' | 'e' | 'fi' | 'fo' | 'w'. which equals Cut, Dissolve, Effect, FadeIn, FadeOut, Wipe.
+    * [num]: if TransitionType = Wipe, then a wipe number must be given. At the moment only wipe 'W0' and 'W1' are supported.
+    * [duration]: if the TransitionType is not equal to Cut, then an effect duration must be given. Duration is in frames.
+    * [srcIn]: Src in. If no srcIn is given, then it defaults to the first frame of the video or the first frame in the image pattern. If srcIn isn't specified, then srcOut, recIn, recOut can't be specified.
+    * [srcOut]: Src out. If no srcOut is given, then it defaults to the last frame of the video - or last image in the image pattern. if srcOut isn't given, then recIn and recOut can't be specified.
+    * [recIn]: Rec in. If no recIn is given, then it is calculated based on its position in the EDL and the length of its input.
+      [recOut]: Rec out. If no recOut is given, then it is calculated based on its position in the EDL and the length of its input. first frame of the video. 
+
+For srcIn, srcOut, recIn, recOut, the values can be specified as either timecode, frame number, seconds, or mps seconds. i.e.
+[tcode | fnum | sec | mps], where:
+
+    * tcode : SMPTE timecode in hh:mm:ss:ff
+    * fnum : frame number (the first decodable frame in the video is taken to be frame 0).
+    * sec : seconds with 's' suffix (e.g. 5.2s)
+    * mps : seconds with 'mps' suffix (e.g. 5.2mps). This corresponds to the 'seconds' value displayed by Windows MediaPlayer.
+
+More notes, 
+Key
+	
+'''
+
+enum= 0
+TRANSITION_UNKNOWN= enum
+TRANSITION_CUT= enum;				enum+=1
+TRANSITION_DISSOLVE= enum;			enum+=1
+TRANSITION_EFFECT= enum;			enum+=1
+TRANSITION_FADEIN= enum;			enum+=1
+TRANSITION_FADEOUT= enum;			enum+=1
+TRANSITION_WIPE= enum;				enum+=1
+TRANSITION_KEY= enum;				enum+=1
+
+TRANSITION_DICT={ \
+				'c':TRANSITION_CUT,
+				'd':TRANSITION_DISSOLVE,
+				'e':TRANSITION_EFFECT,
+				'fi':TRANSITION_FADEIN,
+				'fo':TRANSITION_FADEOUT,
+				'w':TRANSITION_WIPE,
+				'k':TRANSITION_KEY,
+				}
+
+enum= 0
+EDIT_UNKNOWN= 				1<<enum; enum+=1
+EDIT_VIDEO= 				1<<enum; enum+=1
+EDIT_AUDIO= 				1<<enum; enum+=1
+EDIT_AUDIO_STEREO=			1<<enum; enum+=1
+EDIT_VIDEO_AUDIO=			1<<enum; enum+=1
+
+EDIT_DICT=		{ \
+				'v':EDIT_VIDEO,
+				'a':EDIT_AUDIO,
+				'aa':EDIT_AUDIO_STEREO,
+				'va':EDIT_VIDEO_AUDIO,
+				'b':EDIT_VIDEO_AUDIO
+				}
+
+
+enum= 0
+WIPE_UNKNOWN= enum
+WIPE_0= enum;					enum+=1
+WIPE_1= enum;					enum+=1
+
+enum= 0
+KEY_UNKNOWN= enum
+KEY_BG= enum;					enum+=1 # K B
+KEY_IN= enum;					enum+=1 # This is assumed if no second type is set
+KEY_OUT= enum;					enum+=1 # K O
+
+
+'''
+Most sytems:
+Non-dropframe: 1:00:00:00 - colon in last position
+Dropframe: 1:00:00;00 - semicolon in last position
+PAL/SECAM: 1:00:00:00 - colon in last position
+
+SONY:
+Non-dropframe: 1:00:00.00 - period in last position
+Dropframe: 1:00:00,00 - comma in last position
+PAL/SECAM: 1:00:00.00 - period in last position
+'''
+
+'''
+t = abs(timecode('-124:-12:-43:-22', 25))
+t /= 2
+print t
+'''
+
+def editFlagsToText(flag):
+	items = []
+	for item, val in EDIT_DICT.items():
+		if val & flag:
+			items.append(item)
+	return '/'.join(items)
+	
+
+class EditDecision(object):
+	def __init__(self, text= None, fps= 25):
+		# print text
+		self.number = -1
+		self.reel = '' # Uniqie name for this 'file' but not filename, when BL signifies black
+		self.transition_duration= 0
+		self.edit_type= EDIT_UNKNOWN
+		self.transition_type= TRANSITION_UNKNOWN
+		self.wipe_type = WIPE_UNKNOWN
+		self.key_type = KEY_UNKNOWN
+		self.key_fade = -1	# true/false
+		self.srcIn = None  # Where on the original field recording the event begins
+		self.srcOut = None # Where on the original field recording the event ends
+		self.recIn = None  # Beginning of the original event in the edited program
+		self.recOut = None # End of the original event in the edited program
+		self.m2 = None		# fps set by the m2 command
+		self.filename = '' 
+		
+		self.custom_data= [] # use for storing any data you want (blender strip for eg)
+
+		if text != None:
+			self.read(text, fps)
+	
+	def __repr__(self):
+		txt= 'num: %d, ' % self.number
+		txt += 'reel: %s, ' % self.reel
+		txt += 'edit_type: '
+		txt += editFlagsToText(self.edit_type) + ', '
+		
+		txt += 'trans_type: '
+		for item, val in TRANSITION_DICT.items():
+			if val == self.transition_type:
+				txt += item + ', '
+				break
+		
+		
+		txt += 'm2: '
+		if self.m2:
+			txt += '%g' % float(self.m2.fps)
+			txt += '\n\t'
+			txt += self.m2.data
+		else:
+			txt += 'nil'
+			
+		txt += ', '
+		txt += 'recIn: ' + str(self.recIn) + ', '
+		txt += 'recOut: ' + str(self.recOut) + ', '
+		txt += 'srcIn: ' + str(self.srcIn) + ', '
+		txt += 'srcOut: ' + str(self.srcOut) + ', '
+		
+		return txt
+		
+		
+	def read(self, line, fps):
+		line= line.split()
+		index= 0
+		self.number= int(line[index]); index+=1
+		self.reel= line[index].lower(); index+=1
+		
+		# AA/V can be an edit type
+		self.edit_type= 0
+		for edit_type in line[index].lower().split('/'):
+			self.edit_type |= EDIT_DICT[edit_type]; 
+		index+=1
+		
+		tx_name = ''.join([c for c in line[index].lower() if not c.isdigit()])
+		self.transition_type= TRANSITION_DICT[tx_name]; # advance the index later
+		
+		if self.transition_type== TRANSITION_WIPE:
+			tx_num = ''.join([c for c in line[index].lower() if c.isdigit()])
+			if tx_num:	tx_num = int(tx_num)
+			else:		tx_num = 0
+					
+			self.wipe_type= tx_num
+		
+		elif self.transition_type== TRANSITION_KEY: # UNTESTED
+			
+			val= line[index+1].lower()
+			
+			if val == 'b':
+				self.key_type= KEY_BG
+				index+=1
+			elif val == 'o':
+				self.key_type= KEY_OUT
+				index+=1
+			else:
+				self.key_type= KEY_IN # if no args given
+				
+			# there may be an (F) after, eg 'K B (F)'
+			# in the docs this should only be after K B but who knows, it may be after K O also?
+			val= line[index+1].lower()
+			if val == '(f)':
+				index+=1
+				self.key_fade = True
+			else:
+				self.key_fade = False
+			
+		index+=1
+
+		if self.transition_type in (TRANSITION_DISSOLVE, TRANSITION_EFFECT, TRANSITION_FADEIN, TRANSITION_FADEOUT, TRANSITION_WIPE):
+			self.transition_duration= TimeCode(line[index], fps); index+=1
+
+		if index < len(line):
+			self.srcIn= TimeCode(line[index], fps); index+=1
+		if index < len(line):
+			self.srcOut= TimeCode(line[index], fps); index+=1
+		
+		if index < len(line):
+			self.recIn= TimeCode(line[index], fps); index+=1
+		if index < len(line):
+			self.recOut= TimeCode(line[index], fps); index+=1
+	
+	def renumber(self):
+		self.edits.sort( key=lambda e: int(e.recIn) )
+		for i, edit in enumerate(self.edits):
+			edit.number= i
+		
+	def clean(self):
+		'''
+		Clean up double ups
+		'''
+		self.renumber()
+		
+		# TODO
+	def asName(self):
+		cut_type = 'nil'
+		for k,v in TRANSITION_DICT.iteritems():
+			if v==self.transition_type:
+				cut_type = k
+				break
+		
+		return '%d_%s_%s' % (self.number, self.reel, cut_type)
+
+class M2(object):
+	def __init__(self):
+		self.reel = None
+		self.fps = None
+		self.time = None
+		self.data = None
+		
+		self.index = -1
+		self.tot = -1
+	
+	def read(self, line, fps):
+		
+		# M2   TAPEC          050.5                00:08:11:08
+		words = line.split()
+		
+		self.reel= 	words[1].lower()
+		self.fps=	float(words[2])
+		self.time=	TimeCode(words[3], fps)
+		
+		self.data = line
+	
+class EditList(object):
+	def __init__(self):
+		self.edits= []
+		self.title= ''
+		
+	def parse(self, filename, fps):
+		try:
+			file= open(filename, 'rU')
+		except:
+			return False
+
+		self.edits= []
+		edits_m2 = [] # edits with m2's
+		
+		has_m2 = False
+		
+		for line in file:
+			line= ' '.join(line.split())
+			
+			if not line or line.startswith('*') or line.startswith('#'):
+				continue
+			elif line.startswith('TITLE:'):
+				self.title= ' '.join(line.split()[1:])
+			elif line.split()[0].lower() == 'm2':
+				has_m2 = True
+				m2 = M2()
+				m2.read(line, fps)
+				edits_m2.append( m2 )
+			elif not line.split()[0].isdigit():
+				print 'Ignoring:', line
+			else:
+				self.edits.append( EditDecision(line, fps) )
+				edits_m2.append( self.edits[-1] )
+		
+		if has_m2:
+			# Group indexes
+			i = 0
+			for item in edits_m2:
+				if isinstance(item, M2):
+					item.index = i
+					i += 1
+				else:
+					# not an m2
+					i = 0
+			
+			# Set total group indexes
+			for item in reversed(edits_m2):
+				if isinstance(item, M2):
+					if tot_m2 == -1:
+						tot_m2 = item.index + 1
+					
+					item.tot = tot_m2
+				else:
+					# not an m2
+					tot_m2 = -1
+			
+			
+			for i, item in enumerate(edits_m2):
+				if isinstance(item, M2):
+					# make a list of all items that match the m2's reel name
+					edits_m2_tmp = [item_tmp for item_tmp in edits_m2 if (isinstance(item, M2) or item_tmp.reel == item.reel)]
+					
+					# get the new index
+					i_tmp = edits_m2_tmp.index(item)
+					
+					# Seek back to get the edit.
+					edit = edits_m2[i_tmp-item.tot]
+					
+					# Note, docs say time should also match with edit start time
+					# but from final cut pro, this seems not to be the case
+					if not isinstance(edit, EditDecision):
+						print "ERROR!", 'M2 incorrect'
+					else:
+						edit.m2 = item
+			
+			
+		return True
+	
+	def testOverlap(self, edit_test):
+		recIn= int(edit_test.recIn)
+		recOut= int(edit_test.recOut)
+		
+		for edit in self.edits:
+			if edit is edit_test:
+				break
+			
+			recIn_other= int(edit.recIn)
+			recOut_other= int(edit.recOut)
+			
+			if recIn_other < recIn < recOut_other:
+				return True
+			if recIn_other < recOut < recOut_other:
+				return True
+			
+			if recIn < recIn_other < recOut:
+				return True
+			if recIn < recOut_other < recOut:
+				return True
+			
+		return False
+	
+	def getReels(self):
+		reels = {}
+		for edit in self.edits:
+			reels.setdefault(edit.reel, []).append(edit)
+		
+		return reels
+		
+		
+		
+# from DNA
+SEQ_IMAGE=		0
+SEQ_META=		1
+SEQ_SCENE=		2
+SEQ_MOVIE=		3
+SEQ_RAM_SOUND=	4
+SEQ_HD_SOUND=            5
+SEQ_MOVIE_AND_HD_SOUND=  6
+
+SEQ_EFFECT=		8
+SEQ_CROSS=		8
+SEQ_ADD=		9
+SEQ_SUB=		10
+SEQ_ALPHAOVER=	11
+SEQ_ALPHAUNDER=	12
+SEQ_GAMCROSS=	13
+SEQ_MUL=		14
+SEQ_OVERDROP=	15
+SEQ_PLUGIN=		24
+SEQ_WIPE=		25
+SEQ_GLOW=		26
+SEQ_TRANSFORM=	27
+SEQ_COLOR=		28
+SEQ_SPEED=		29
+
+# Blender spesific stuff starts here
+import bpy
+import Blender
+
+def scale_meta_speed(seq, mov, scale):
+	# Add an effect
+	speed= seq.new((SEQ_SPEED, mov,), 199, mov.channel+1)
+	speed.speedEffectFrameBlending = True
+	meta= seq.new([mov, speed], 199, mov.channel)
+
+	if scale >= 1.0:
+		mov.endStill = int(mov.length * (scale - 1.0))
+	else:
+		speed.speedEffectGlobalSpeed = 1.0/scale
+		meta.endOffset = mov.length - int(mov.length*scale)
+
+	speed.update()
+	meta.update()
+	return meta
+
+def apply_dissolve_ipo(mov, blendin):
+	len_disp = float(mov.endDisp - mov.startDisp)
+	
+	if len_disp <= 0.0:
+		print 'Error, strip is zero length'
+		return
+	
+	mov.ipo= ipo= bpy.data.ipos.new("fade", "Sequence")
+	icu= ipo.addCurve('Fac')
+	
+	icu.interpolation= Blender.IpoCurve.InterpTypes.LINEAR
+	icu.append((0, 0))
+	icu.append(((int(blendin)/len_disp) * 100, 1))
+	
+	if mov.type not in (SEQ_HD_SOUND, SEQ_RAM_SOUND):
+		mov.blendMode = Blender.Scene.Sequence.BlendModes.ALPHAOVER
+
+
+def replace_ext(path, ext):
+	return path[:path.rfind('.')+1] + ext
+
+def load_edl(filename, reel_files, reel_offsets):
+	'''
+	reel_files - key:reel <--> reel:filename
+	'''
+	
+	# For test file
+	# frame_offset = -769
+	
+	
+	sce= bpy.data.scenes.active
+	fps= sce.render.fps
+	
+	elist= EditList()
+	if not elist.parse(filename, fps):
+		return 'Unable to parse "%s"' % filename
+	# elist.clean()
+	
+	
+	seq= sce.sequence
+	
+	track= 0 
+	
+	edits = elist.edits[:]
+	# edits.sort(key = lambda edit: int(edit.recIn))
+	
+	prev_edit = None
+	for edit in edits:
+		print edit
+		frame_offset = reel_offsets[edit.reel]
+		
+		
+		src_start=	int(edit.srcIn) + frame_offset
+		src_end=	int(edit.srcOut) + frame_offset
+		src_length=	src_end-src_start
+		
+		rec_start=	int(edit.recIn) + 1
+		rec_end=	int(edit.recOut) + 1
+		rec_length=	rec_end-rec_start
+		
+		# print src_length, rec_length, src_start
+		
+		if edit.m2 != None:	scale = fps/float(edit.m2.fps)
+		else:					scale = 1.0
+		
+		unedited_start= rec_start - src_start
+		offset_start = src_start - int(src_start*scale) # works for scaling up AND down
+		
+		if edit.transition_type == TRANSITION_CUT and (not elist.testOverlap(edit)):
+			track = 1
+		
+		strip= None
+		final_strips = []
+		if edit.reel.lower()=='bw':
+			strip= seq.new((0,0,0), rec_start, track+1)
+			strip.length= rec_length # for color its simple
+			final_strips.append(strip)
+		else:
+
+			path_full = reel_files[edit.reel]
+			path_fileonly= path_full.split('/')[-1].split('\\')[-1] # os.path.basename(full)
+			path_dironly= path_full[:-len(path_fileonly)] # os.path.dirname(full)
+			
+			if edit.edit_type & EDIT_VIDEO: #and edit.transition_type == TRANSITION_CUT:	
+				
+				try:
+					strip= seq.new((path_fileonly, path_dironly, path_full, 'movie'), unedited_start + offset_start, track+1)
+				except:
+					return 'Invalid input for movie'
+				
+				# Apply scaled rec in bounds
+				if scale != 1.0:
+					meta = scale_meta_speed(seq, strip, scale)
+					final_strip = meta
+				else:
+					final_strip = strip
+				
+				
+				final_strip.update()
+				final_strip.startOffset= rec_start - final_strip.startDisp
+				final_strip.endOffset= rec_end- final_strip.endDisp
+				final_strip.update()
+				final_strip.endOffset += (final_strip.endDisp - rec_end)
+				final_strip.update()
+				
+				
+				if edit.transition_duration:
+					if not prev_edit:
+						print "Error no previous strip"
+					else:
+						new_end = rec_start + int(edit.transition_duration)
+						for other in prev_edit.custom_data:
+							if other.type != SEQ_HD_SOUND and other.type != SEQ_RAM_SOUND:
+								other.endOffset += (other.endDisp - new_end)
+								other.update()
+						
+				# Apply disolve
+				if edit.transition_type == TRANSITION_DISSOLVE:
+					apply_dissolve_ipo(final_strip, edit.transition_duration)
+				
+				if edit.transition_type == TRANSITION_WIPE:
+					other_track = track + 2
+					for other in prev_edit.custom_data:
+						if other.type != SEQ_HD_SOUND and other.type != SEQ_RAM_SOUND:
+							
+							strip_wipe= seq.new((SEQ_WIPE, other, final_strip), 1, other_track)
+							
+							if edit.wipe_type == WIPE_0:
+								strip_wipe.wipeEffectAngle =  90
+							else:
+								strip_wipe.wipeEffectAngle = -90
+							
+							other_track += 1
+							
+				
+				
+				# strip.endOffset= strip.length - int(edit.srcOut)
+				#end_offset= (unedited_start+strip.length) - end
+				# print start, end, end_offset
+				#strip.endOffset = end_offset
+				
+				# break
+				# print strip
+				
+				final_strips.append(final_strip)
+			
+				
+			if edit.edit_type & (EDIT_AUDIO | EDIT_AUDIO_STEREO | EDIT_VIDEO_AUDIO):
+				
+				if scale == 1.0:  # TODO - scaled audio
+					
+					try:
+						strip= seq.new((path_fileonly, path_dironly, path_full, 'audio_hd'), unedited_start + offset_start, track+6)
+					except:
+						
+						# See if there is a wave file there
+						path_full_wav = replace_ext(path_full, 'wav')
+						path_fileonly_wav = replace_ext(path_fileonly, 'wav')
+						
+						#try:
+						strip= seq.new((path_fileonly_wav, path_dironly, path_full_wav, 'audio_hd'), unedited_start + offset_start, track+6)
+						#except:
+						#	return 'Invalid input for audio'
+					
+					final_strip = strip
+					
+					# Copied from above
+					final_strip.update()
+					final_strip.startOffset= rec_start - final_strip.startDisp
+					final_strip.endOffset= rec_end- final_strip.endDisp
+					final_strip.update()
+					final_strip.endOffset += (final_strip.endDisp - rec_end)
+					final_strip.update()
+					
+					if edit.transition_type == TRANSITION_DISSOLVE:
+						apply_dissolve_ipo(final_strip, edit.transition_duration)
+					
+					final_strips.append(final_strip)
+				
+			# strip= seq.new((0.6, 0.6, 0.6), start, track+1)
+			
+		if final_strips:
+			for strip in final_strips:
+				# strip.length= length
+				final_strip.name = edit.asName()
+				edit.custom_data[:]= final_strips
+				# track = not track
+				prev_edit = edit
+			track += 1
+			
+		#break
+	
+	
+	def recursive_update(s):
+		s.update(1)
+		for s_kid in s:
+			recursive_update(s_kid)
+			
+		
+	for s in seq:
+		recursive_update(s)
+	
+	return ''
+
+
+
+#load_edl('/fe/edl/EP30CMXtrk1.edl') # /tmp/test.edl
+#load_edl('/fe/edl/EP30CMXtrk2.edl') # /tmp/test.edl
+#load_edl('/fe/edl/EP30CMXtrk3.edl') # /tmp/test.edl
+#load_edl('/root/vid/rush/blender_edl.edl', ['/root/vid/rush/rushes3.avi',]) # /tmp/test.edl
+
+
+
+
+# ---------------------- Blender UI part
+from Blender import Draw, Window
+import BPyWindow
+
+if 0:
+	DEFAULT_FILE_EDL = '/root/vid/rush/blender_edl.edl'
+	DEFAULT_FILE_MEDIA = '/root/vid/rush/rushes3_wav.avi'
+	DEFAULT_FRAME_OFFSET = -769
+else:
+	DEFAULT_FILE_EDL = ''
+	DEFAULT_FILE_MEDIA = ''
+	DEFAULT_FRAME_OFFSET = 0
+
+B_EVENT_IMPORT = 1
+B_EVENT_RELOAD = 2
+B_EVENT_FILESEL_EDL = 3
+B_EVENT_NOP = 4
+
+B_EVENT_FILESEL = 100 # or greater
+
+class ReelItemUI(object):
+	__slots__ = 'filename_but', 'offset_but', 'ui_text'
+	def __init__(self):
+		self.filename_but =	Draw.Create(DEFAULT_FILE_MEDIA)
+		self.offset_but =	Draw.Create(DEFAULT_FRAME_OFFSET)
+		self.ui_text = ''
+	
+
+
+REEL_UI = {}	# reel:ui_string
+
+
+#REEL_FILENAMES = {}		# reel:filename
+#REEL_OFFSETS = {}		# reel:filename
+
+PREF = {}
+
+PREF['filename'] = Draw.Create(DEFAULT_FILE_EDL)
+PREF['reel_act'] = ''
+
+def edl_reload():
+	Window.WaitCursor(1)
+	filename = PREF['filename'].val
+	sce= bpy.data.scenes.active
+	fps= sce.render.fps
+	
+	elist= EditList()
+	
+	if filename:
+		if not elist.parse(filename, fps):
+			Draw.PupMenu('Error%t|Could not open the file "' + filename + '"')
+		reels = elist.getReels()
+	else:
+		reels = {}
+	
+	REEL_UI.clear()
+	for reel_key, edits in reels.iteritems():
+		
+		if reel_key == 'bw':
+			continue
+		
+		flag = 0
+		for edit in edits:
+			flag |= edit.edit_type
+		
+		reel_item = REEL_UI[reel_key] = ReelItemUI()
+		
+		reel_item.ui_text = '%s (%s): ' % (reel_key, editFlagsToText(flag))
+		
+	Window.WaitCursor(0)
+
+def edl_set_path(filename):
+	PREF['filename'].val = filename
+	edl_reload()
+	Draw.Redraw()
+	
+def edl_set_path_reel(filename):
+	REEL_UI[PREF['reel_act']].filename_but.val = filename
+	Draw.Redraw()
+
+def edl_reel_keys():
+	reel_keys = REEL_UI.keys()
+	
+	if 'bw' in reel_keys:
+		reel_keys.remove('bw')
+	
+	reel_keys.sort()
+	return reel_keys
+
+def edl_draw():
+	
+	MARGIN = 4
+	rect = BPyWindow.spaceRect()
+	but_width = int((rect[2]-MARGIN*2)/4.0) # 72
+	# Clamp
+	if but_width>100: but_width = 100
+	but_height = 17
+	
+	x=MARGIN
+	y=rect[3]-but_height-MARGIN
+	xtmp = x
+	
+	
+	
+	# ---------- ---------- ---------- ----------
+	Blender.Draw.BeginAlign()
+	PREF['filename'] =	Draw.String('edl path: ', B_EVENT_RELOAD, xtmp, y, (but_width*3)-20, but_height, PREF['filename'].val, 256, 'EDL Path'); xtmp += (but_width*3)-20;
+	Draw.PushButton('..',	B_EVENT_FILESEL_EDL, xtmp, y, 20, but_height,	'Select an EDL file'); xtmp += 20;
+	Blender.Draw.EndAlign()
+	
+	Draw.PushButton('Reload',	B_EVENT_RELOAD, xtmp + MARGIN, y, but_width - MARGIN, but_height,	'Read the ID Property settings from the active curve object'); xtmp += but_width;
+	y-=but_height + MARGIN
+	xtmp = x
+	# ---------- ---------- ---------- ----------
+	
+	reel_keys = edl_reel_keys()
+	
+	
+	
+	if reel_keys:						text = 'Reel file list...'
+	elif PREF['filename'].val == '':	text = 'No EDL loaded.'
+	else:								text = 'No reels found!'
+
+	Draw.Label(text, xtmp + MARGIN, y, but_width*4, but_height); xtmp += but_width*4;
+	
+	y-=but_height + MARGIN
+	xtmp = x
+	
+	# ---------- ---------- ---------- ----------
+
+	
+	for i, reel_key in enumerate(reel_keys):
+		reel_item = REEL_UI[reel_key]
+		
+		Blender.Draw.BeginAlign()
+		REEL_UI[reel_key].filename_but = Draw.String(reel_item.ui_text, B_EVENT_NOP, xtmp, y, (but_width*3)-20, but_height, REEL_UI[reel_key].filename_but.val, 256, 'Select the reel path'); xtmp += (but_width*3)-20;
+		Draw.PushButton('..',	B_EVENT_FILESEL + i, xtmp, y, 20, but_height,	'Media path to use for this reel'); xtmp += 20;
+		Blender.Draw.EndAlign()
+		
+		reel_item.offset_but= Draw.Number('ofs:',	B_EVENT_NOP, xtmp + MARGIN, y, but_width - MARGIN, but_height, reel_item.offset_but.val, -100000, 100000,	'Start offset in frames when applying timecode'); xtmp += but_width - MARGIN;
+		
+		y-=but_height + MARGIN
+		xtmp = x
+	
+	# ---------- ---------- ---------- ----------
+	
+	Draw.PushButton('Import CMX-EDL Sequencer Strips',	B_EVENT_IMPORT, xtmp + MARGIN, MARGIN, but_width*4 - MARGIN, but_height,	'Load the EDL file into the sequencer'); xtmp += but_width*4;
+	y-=but_height + MARGIN
+	xtmp = x
+
+
+def edl_event(evt, val):
+	pass
+
+def edl_bevent(evt):
+	
+	if evt == B_EVENT_NOP:
+		pass
+	elif evt == B_EVENT_IMPORT:
+		'''
+		Load the file into blender with UI settings
+		'''
+		filename = PREF['filename'].val
+
+		reel_files = {}
+		reel_offsets = {}
+		
+		for reel_key, reel_item in REEL_UI.iteritems():
+			reel_files[reel_key] = reel_item.filename_but.val
+			reel_offsets[reel_key] = reel_item.offset_but.val
+		
+		error = load_edl(filename, reel_files, reel_offsets)
+		if error != '':
+			Draw.PupMenu('Error%t|' + error)
+		else:
+			Window.RedrawAll()
+		
+	elif evt == B_EVENT_RELOAD:
+		edl_reload()
+		Draw.Redraw()
+		
+	elif evt == B_EVENT_FILESEL_EDL:
+		filename = PREF['filename'].val
+		if not filename: filename = Blender.sys.join(Blender.sys.expandpath('//'), '*.edl')
+			
+		Window.FileSelector(edl_set_path, 'Select EDL', filename)
+		
+	elif evt >= B_EVENT_FILESEL:
+		reel_keys = edl_reel_keys()
+		reel_key = reel_keys[evt - B_EVENT_FILESEL]
+		
+		filename = REEL_UI[reel_key].filename_but.val
+		if not filename: filename = Blender.sys.expandpath('//')
+
+		PREF['reel_act'] = reel_key # so file set path knows which one to set
+		Window.FileSelector(edl_set_path_reel, 'Reel Media', filename)
+		
+		
+
+if __name__ == '__main__':
+	Draw.Register(edl_draw, edl_event, edl_bevent)
+	edl_reload()
+

From 01e2aa02495fc200115c49f65aef82f77d80267c Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Mon, 24 Aug 2009 12:34:19 +0000
Subject: [PATCH 239/577] * r22739 broke compilation with scons. Make sure
 WITH_OPENEXR definition is given

---
 source/blender/imbuf/intern/openexr/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index aa166a1983c..30757db1cef 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -13,6 +13,6 @@ incs = ['.',
 	'../../../makesdna']
 incs += Split(env['BF_OPENEXR_INC'])
 
-defs = []
+defs = ['WITH_OPENEXR']
 
 env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225, 85])

From 8eeb71e6d9eabe99ee774140481b3ad073c46767 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 24 Aug 2009 14:26:58 +0000
Subject: [PATCH 240/577] Correct transform descriptions.

Some operations were described as vertex only when they aren't.
---
 source/blender/editors/transform/transform_ops.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index e50a8205afa..08d22faf7e7 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -413,7 +413,7 @@ void TFM_OT_tilt(struct wmOperatorType *ot)
     /*optionals - 
         "Tilt selected vertices."
         "Specify an extra axis rotation for selected vertices of 3d curve." */
-	ot->description= "Tilt selected vertices of 3d curve."; 
+	ot->description= "Tilt selected control vertices of 3d curve."; 
 	ot->idname = OP_TILT;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -437,7 +437,7 @@ void TFM_OT_warp(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Warp";
-	ot->description= "Warp selected vertices around the cursor.";
+	ot->description= "Warp selected items around the cursor.";
 	ot->idname = OP_WARP;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -462,7 +462,7 @@ void TFM_OT_shear(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Shear";
-	ot->description= "Shear selected vertices along the horizontal screen axis.";
+	ot->description= "Shear selected items along the horizontal screen axis.";
 	ot->idname = OP_SHEAR;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -487,7 +487,7 @@ void TFM_OT_shrink_fatten(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Shrink/Fatten";
-	ot->description= "Shrink/fatten selected vertices along vertex normals.";
+	ot->description= "Shrink/fatten selected vertices along normals.";
 	ot->idname = OP_SHRINK_FATTEN;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -509,7 +509,7 @@ void TFM_OT_tosphere(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "To Sphere";
-    //added "around mesh center" to defferentiate between "MESH_OT_vertices_to_sphere()" 
+    //added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()" 
 	ot->description= "Move selected vertices outward in a spherical shape around mesh center.";
 	ot->idname = OP_TOSPHERE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;

From 8b51b993dbbfe7b1dd092f3d553ccc5b1ac6172a Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Mon, 24 Aug 2009 21:06:55 +0000
Subject: [PATCH 241/577] Smoke: * Bugfix for scaling on non-2^n-textures

---
 .../blender/editors/space_view3d/drawvolume.c | 10 ++++++----
 source/blender/gpu/intern/gpu_extensions.c    | 19 ++++++-------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 53f193382bd..237ffe71ddb 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -197,7 +197,6 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 	RegionView3D *rv3d= ar->regiondata;
 
 	float viewnormal[3];
-	// int res[3];
 	int i, j, n;
 	float d, d0, dd;
 	float *points = NULL;
@@ -237,9 +236,12 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 
 	GPU_texture_bind(tex, 0);
 
-	cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
-	cor[1] = (float)res[1]/(float)larger_pow2(res[1]);
-	cor[2] = (float)res[2]/(float)larger_pow2(res[2]);
+	// if (!GLEW_ARB_texture_non_power_of_two) 
+	{
+		cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
+		cor[1] = (float)res[1]/(float)larger_pow2(res[1]);
+		cor[2] = (float)res[2]/(float)larger_pow2(res[2]);
+	}
 
 	// our slices are defined by the plane equation a*x + b*y +c*z + d = 0
 	// (a,b,c), the plane normal, are given by viewdir
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 0b6640b9e27..9e53c85a5ba 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -326,6 +326,7 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 	tex->number = -1;
 	tex->refcount = 1;
 	tex->target = GL_TEXTURE_3D;
+	float vfBorderColor[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
 	glGenTextures(1, &tex->bindcode);
 
@@ -336,7 +337,7 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 		return NULL;
 	}
 
-	// if (!GLEW_ARB_texture_non_power_of_two) 
+	if (!GLEW_ARB_texture_non_power_of_two) 
 	{
 		tex->w = larger_pow2(tex->w);
 		tex->h = larger_pow2(tex->h);
@@ -357,22 +358,14 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 
 	if (fpixels) {
 		glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format, type, pixels);
-
-		/*
-		if (tex->w > w)
-			GPU_glTexSubImageEmpty(tex->target, format, w, 0, tex->w-w, tex->h);
-		if (tex->h > h)
-			GPU_glTexSubImageEmpty(tex->target, format, 0, h, w, tex->h-h);
-		*/
 	}
 
-	// glTexImage3D(tex->target, 0, GL_RGBA, w, h, depth, 0, GL_RGBA, GL_FLOAT, fpixels);
-
+	// glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S,GL_CLAMP_TO_BORDER);
-	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T,GL_CLAMP_TO_BORDER);
-	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R,GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER);
 
 
 	if (pixels)

From 75f1166b6c478ca459b98035da9fb29f4dc1a80e Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Mon, 24 Aug 2009 21:16:23 +0000
Subject: [PATCH 242/577] Smoke: *fixing the fix as usual

---
 source/blender/gpu/intern/gpu_extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 9e53c85a5ba..23f3a491487 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -318,6 +318,7 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 	GPUTexture *tex;
 	GLenum type, format, internalformat;
 	void *pixels = NULL;
+	float vfBorderColor[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
 	tex = MEM_callocN(sizeof(GPUTexture), "GPUTexture");
 	tex->w = w;
@@ -326,7 +327,6 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 	tex->number = -1;
 	tex->refcount = 1;
 	tex->target = GL_TEXTURE_3D;
-	float vfBorderColor[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
 	glGenTextures(1, &tex->bindcode);
 

From 6faf7eb2baea210273d83186f1a4e7d54b3fab4b Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Mon, 24 Aug 2009 21:39:48 +0000
Subject: [PATCH 243/577] Smoke: *enable non-2^n textrues for all gfx cards
 which support it. * try to enhance the visual quality under linux a bit when
 gfx card doesn't support it (still errors visible)

---
 source/blender/editors/space_view3d/drawvolume.c | 2 +-
 source/blender/gpu/intern/gpu_extensions.c       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 237ffe71ddb..5e0ffb9ba48 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -236,7 +236,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 
 	GPU_texture_bind(tex, 0);
 
-	// if (!GLEW_ARB_texture_non_power_of_two) 
+	if (!GLEW_ARB_texture_non_power_of_two) 
 	{
 		cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
 		cor[1] = (float)res[1]/(float)larger_pow2(res[1]);
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 23f3a491487..36936a9fcb0 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -360,14 +360,13 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 		glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format, type, pixels);
 	}
 
-	// glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
+	glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER);
 
-
 	if (pixels)
 		MEM_freeN(pixels);
 

From 7793848db223e7128bb24f9dfda418b029fab2ef Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Mon, 24 Aug 2009 21:45:09 +0000
Subject: [PATCH 244/577] Reverted some keymap changes.

Moving to standards for opening/saving etc was causing uproar in IRC.
---
 source/blender/editors/mesh/editmesh_mods.c      |  2 +-
 source/blender/editors/screen/screen_ops.c       | 10 ++++------
 .../blender/windowmanager/intern/wm_operators.c  | 16 ++++++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index 789527fd96d..f2c5b7fb727 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -4349,7 +4349,7 @@ void MESH_OT_vertices_smooth(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	RNA_def_int(ot->srna, "repeat", 1, 1, 100, "Number of times to smooth the mesh", "", 1, INT_MAX);
+	RNA_def_int(ot->srna, "repeat", 1, 1, 100, "Smooth Iterations", "", 1, INT_MAX);
 }
 
 void vertexnoise(Object *obedit, EditMesh *em)
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 380390cf543..799bb0741f3 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3329,7 +3329,6 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", F4KEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);
 	
@@ -3348,18 +3347,17 @@ void ED_keymap_screen(wmWindowManager *wm)
 						  
 	/* render */
 	WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY, 0);
+//	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL, 0);
+//	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY, 0);
 	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, KM_CTRL, 0)->ptr, "animation", 1);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "animation", 1);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY|KM_SHIFT, 0)->ptr, "animation", 1);
+//	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "animation", 1);
+//	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY|KM_SHIFT, 0)->ptr, "animation", 1);
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY, KM_PRESS, 0, 0);
 	
 	/* user prefs */
 	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", UKEY, KM_PRESS, KM_ALT, 0);
 	
 	/* Anim Playback ------------------------------------------------ */
 	keymap= WM_keymap_listbase(wm, "Frames", 0, 0);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 6ecbc172c37..5a385418e5d 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1909,22 +1909,22 @@ void wm_window_keymap(wmWindowManager *wm)
 	
 	/* note, this doesn't replace existing keymap items */
 	WM_keymap_verify_item(keymap, "WM_OT_window_duplicate", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
-	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);
+//	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_read_homefile", XKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);
+//	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", F1KEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);
+//	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);
+//	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", F2KEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
 

From 9dff2ad3d043de606dbc744cd13c11e1ef76e00b Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Mon, 24 Aug 2009 23:09:35 +0000
Subject: [PATCH 245/577] SVN maintenance.

---
 release/scripts/import_edl.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 release/scripts/import_edl.py

diff --git a/release/scripts/import_edl.py b/release/scripts/import_edl.py
old mode 100755
new mode 100644

From 8ed64f785491c10467e83584caecc13ec5199aaf Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Mon, 24 Aug 2009 23:27:07 +0000
Subject: [PATCH 246/577] Tiny tweaks to Display panel in image editor

---
 release/ui/space_image.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index aa43b14b974..8dc016f55b7 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -317,7 +317,7 @@ class IMAGE_PT_game_properties(bpy.types.Panel):
 class IMAGE_PT_view_properties(bpy.types.Panel):
 	__space_type__ = 'IMAGE_EDITOR'
 	__region_type__ = 'UI'
-	__label__ = "View Properties"
+	__label__ = "Display"
 
 	def poll(self, context):
 		sima = context.space_data
@@ -335,26 +335,33 @@ class IMAGE_PT_view_properties(bpy.types.Panel):
 
 		col = split.column()
 		if ima:
-			col.itemR(ima, "display_aspect")
+			col.itemR(ima, "display_aspect", text="Aspect Ratio")
 
 			col = split.column()
+			col.itemL(text="Coordinates:")
 			col.itemR(sima, "draw_repeated", text="Repeat")
 			if show_uvedit:
 				col.itemR(uvedit, "normalized_coordinates", text="Normalized")
 		elif show_uvedit:
+			col.itemL(text="Coordinates:")
 			col.itemR(uvedit, "normalized_coordinates", text="Normalized")
 
 		if show_uvedit:
 			col = layout.column()
 			row = col.row()
 			row.itemR(uvedit, "edge_draw_type", expand=True)
-			row = col.row()
-			row.itemR(uvedit, "draw_smooth_edges", text="Smooth")
-			row.itemR(uvedit, "draw_modified_edges", text="Modified")
+			
+			split = layout.split()
 
-			row = col.row()
-			row.itemR(uvedit, "draw_stretch", text="Stretch")
-			row.itemR(uvedit, "draw_stretch_type", text="")
+			col = split.column()
+			col.itemR(uvedit, "draw_stretch", text="Stretch")
+			sub = col.column()
+			sub.active = uvedit.draw_stretch
+			sub.row().itemR(uvedit, "draw_stretch_type", expand=True)
+			
+			col = split.column()
+			col.itemR(uvedit, "draw_smooth_edges", text="Smooth")
+			col.itemR(uvedit, "draw_modified_edges", text="Modified")
 			#col.itemR(uvedit, "draw_edges")
 			#col.itemR(uvedit, "draw_faces")
 

From 4a78b9e9046567e86ed3ccada83a50c43684facd Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 25 Aug 2009 00:12:11 +0000
Subject: [PATCH 247/577] 2.5 - Assorted Bugfixes for Animation Editing

* Inserting keyframes now takes into account whether the F-Curve was editable or not.

* Editing keyframes in animation editors now sends proper depsgraph updates instead of just tagging the relevant objects.

Thanks JiriH for reporting these bugs.
---
 source/blender/editors/animation/keyframing.c | 21 +++++++++++++++++--
 .../editors/space_action/action_header.c      |  4 ++--
 .../editors/transform/transform_generics.c    | 11 +++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 2da082a9b7c..b62c69c7b38 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -740,6 +740,12 @@ short insert_keyframe_direct (PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, fl
 		printf("ERROR: no F-Curve to add keyframes to \n");
 		return 0;
 	}
+	/* F-Curve not editable? */
+	if ( (fcu->flag & FCURVE_PROTECTED) || ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED)) ) {
+		if (G.f & G_DEBUG)
+			printf("WARNING: not inserting keyframe for locked F-Curve \n");
+		return 0;
+	}
 	
 	/* if no property given yet, try to validate from F-Curve info */
 	if ((ptr.id.data == NULL) && (ptr.data==NULL)) {
@@ -911,8 +917,19 @@ short delete_keyframe (ID *id, bAction *act, const char group[], const char rna_
 	/* we don't check the validity of the path here yet, but it should be ok... */
 	fcu= verify_fcurve(act, group, rna_path, array_index, 0);
 	
-	/* only continue if we have an F-Curve to remove keyframes from */
-	if (act && fcu) {
+	/* check if F-Curve exists and/or whether it can be edited */
+	if ELEM(NULL, act, fcu) {
+		printf("ERROR: no F-Curve and/or Action to delete keyframe from \n");
+		return 0;
+	}
+	if ( (fcu->flag & FCURVE_PROTECTED) || ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED)) ) {
+		if (G.f & G_DEBUG)
+			printf("WARNING: not inserting keyframe for locked F-Curve \n");
+		return 0;
+	}
+	
+	/* it should be fine to continue now... */
+	{
 		short found = -1;
 		int i;
 		
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index 375136d199e..33a97b5a80a 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -404,13 +404,13 @@ void action_header_buttons(const bContext *C, ARegion *ar)
 			if (saction->flag & SACTION_DRAWTIME) {
 				uiDefButC(block, MENU, B_REDR,
 						"Auto-Snap Keyframes %t|No Snap %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3", 
-						xco,yco,70,YIC, &(saction->autosnap), 0, 1, 0, 0, 
+						xco,yco,90,YIC, &(saction->autosnap), 0, 1, 0, 0, 
 						"Auto-snapping mode for keyframes when transforming");
 			}
 			else {
 				uiDefButC(block, MENU, B_REDR, 
 						"Auto-Snap Keyframes %t|No Snap %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3", 
-						xco,yco,70,YIC, &(saction->autosnap), 0, 1, 0, 0, 
+						xco,yco,90,YIC, &(saction->autosnap), 0, 1, 0, 0, 
 						"Auto-snapping mode for keyframes when transforming");
 			}
 			
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 168a65a2e75..edcbd858e37 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -269,7 +269,7 @@ static void editmesh_apply_to_mirror(TransInfo *t)
 /* tags the given ID block for refreshes (if applicable) due to 
  * Animation Editor editing
  */
-static void animedit_refresh_id_tags (ID *id)
+static void animedit_refresh_id_tags (Scene *scene, ID *id)
 {
 	if (id) {
 		AnimData *adt= BKE_animdata_from_id(id);
@@ -279,12 +279,11 @@ static void animedit_refresh_id_tags (ID *id)
 			adt->recalc |= ADT_RECALC_ANIM;
 			
 		/* if ID-block is Object, set recalc flags */
-		// TODO: this should probably go through the depsgraph instead... but for now, let's be lazy
 		switch (GS(id->name)) {
 			case ID_OB:
 			{
 				Object *ob= (Object *)id;
-				ob->recalc |= OB_RECALC;
+				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);  /* sets recalc flags */
 			}
 				break;
 		}
@@ -384,7 +383,7 @@ void recalcData(TransInfo *t)
 		/* just tag these animdata-blocks to recalc, assuming that some data there changed */
 		for (ale= anim_data.first; ale; ale= ale->next) {
 			/* set refresh tags for objects using this animation */
-			animedit_refresh_id_tags(ale->id);
+			animedit_refresh_id_tags(t->scene, ale->id);
 		}
 		
 		/* now free temp channels */
@@ -432,7 +431,7 @@ void recalcData(TransInfo *t)
 				calchandles_fcurve(fcu);
 				
 			/* set refresh tags for objects using this animation */
-			animedit_refresh_id_tags(ale->id);
+			animedit_refresh_id_tags(t->scene, ale->id);
 		}
 		
 		/* do resort and other updates? */
@@ -463,7 +462,7 @@ void recalcData(TransInfo *t)
 				continue;
 			
 			/* set refresh tags for objects using this animation */
-			animedit_refresh_id_tags(tdn->id);
+			animedit_refresh_id_tags(t->scene, tdn->id);
 			
 			/* if cancelling transform, just write the values without validating, then move on */
 			if (t->state == TRANS_CANCEL) {

From e2eaf269350d972daec1f19ae5aa5ee7fbad4685 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 25 Aug 2009 01:46:05 +0000
Subject: [PATCH 248/577] 2.5 - NLA Bugfixes:

* F-Modifiers on F-Curves can now taken into account when calculating the extents of actions. This is used when there are some NLA strips and some action with some F-Modifiers is being played back on top of those.

* The toggles in the NLA channels list now respect the width of the list instead of using a hardcoded position. This means that clicking on these toggles when the list is resized works again.
---
 source/blender/blenkernel/BKE_action.h        |  2 +-
 source/blender/blenkernel/intern/action.c     | 50 +++++++++++++++++--
 source/blender/blenkernel/intern/anim_sys.c   |  1 -
 source/blender/blenkernel/intern/nla.c        |  2 +-
 .../blender/editors/space_nla/nla_channels.c  |  7 +--
 source/blender/editors/space_nla/nla_edit.c   |  2 +-
 6 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index d35acb5447a..4724ee19aaa 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -66,7 +66,7 @@ void free_action(struct bAction *act);
 void make_local_action(struct bAction *act);
 
 /* Some kind of bounding box operation on the action */
-void calc_action_range(const struct bAction *act, float *start, float *end, int incl_hidden);
+void calc_action_range(const struct bAction *act, float *start, float *end, short incl_modifiers);
 
 /* Does action have any motion data at all? */
 short action_has_motion(const struct bAction *act);
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 6a39139d250..47de044ea25 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -838,14 +838,15 @@ short action_has_motion(const bAction *act)
 }
 
 /* Calculate the extents of given action */
-void calc_action_range(const bAction *act, float *start, float *end, int incl_hidden)
+void calc_action_range(const bAction *act, float *start, float *end, short incl_modifiers)
 {
 	FCurve *fcu;
 	float min=999999999.0f, max=-999999999.0f;
-	short foundvert=0;
+	short foundvert=0, foundmod=0;
 
 	if (act) {
 		for (fcu= act->curves.first; fcu; fcu= fcu->next) {
+			/* if curve has keyframes, consider them first */
 			if (fcu->totvert) {
 				float nmin, nmax;
 				
@@ -858,10 +859,53 @@ void calc_action_range(const bAction *act, float *start, float *end, int incl_hi
 				
 				foundvert= 1;
 			}
+			
+			/* if incl_modifiers is enabled, need to consider modifiers too
+			 *	- only really care about the last modifier
+			 */
+			if ((incl_modifiers) && (fcu->modifiers.last)) {
+				FModifier *fcm= fcu->modifiers.last;
+				
+				/* only use the maximum sensible limits of the modifiers if they are more extreme */
+				switch (fcm->type) {
+					case FMODIFIER_TYPE_LIMITS: /* Limits F-Modifier */
+					{
+						FMod_Limits *fmd= (FMod_Limits *)fcm->data;
+						
+						if (fmd->flag & FCM_LIMIT_XMIN) {
+							min= MIN2(min, fmd->rect.xmin);
+						}
+						if (fmd->flag & FCM_LIMIT_XMAX) {
+							max= MAX2(max, fmd->rect.xmax);
+						}
+					}
+						break;
+						
+					case FMODIFIER_TYPE_CYCLES: /* Cycles F-Modifier */
+					{
+						FMod_Cycles *fmd= (FMod_Cycles *)fcm->data;
+						
+						if (fmd->before_mode != FCM_EXTRAPOLATE_NONE)
+							min= MINAFRAMEF;
+						if (fmd->after_mode != FCM_EXTRAPOLATE_NONE)
+							max= MAXFRAMEF;
+					}
+						break;
+						
+					// TODO: function modifier may need some special limits
+						
+					default: /* all other standard modifiers are on the infinite range... */
+						min= MINAFRAMEF;
+						max= MAXFRAMEF;
+						break;
+				}
+				
+				foundmod= 1;
+			}
 		}
 	}	
 	
-	if (foundvert) {
+	if (foundvert || foundmod) {
 		if(min==max) max+= 1.0f;
 		*start= min;
 		*end= max;
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 5eaf2133515..8daaaab62d4 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1263,7 +1263,6 @@ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime)
 			dummy_strip.act= adt->action;
 			dummy_strip.remap= adt->remap;
 			
-				// FIXME: what happens when we want to included F-Modifier access?
 			calc_action_range(dummy_strip.act, &dummy_strip.actstart, &dummy_strip.actend, 1);
 			dummy_strip.start = dummy_strip.actstart;
 			dummy_strip.end = (IS_EQ(dummy_strip.actstart, dummy_strip.actend)) ?  (dummy_strip.actstart + 1.0f): (dummy_strip.actend);
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index c41c4ae78e4..480c79fbc1a 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -291,7 +291,7 @@ NlaStrip *add_nlastrip (bAction *act)
 	/* determine initial range 
 	 *	- strip length cannot be 0... ever...
 	 */
-	calc_action_range(strip->act, &strip->actstart, &strip->actend, 1);
+	calc_action_range(strip->act, &strip->actstart, &strip->actend, 0);
 	
 	strip->start = strip->actstart;
 	strip->end = (IS_EQ(strip->actstart, strip->actend)) ?  (strip->actstart + 1.0f): (strip->actend);
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index 063b329b7a1..ccf23266427 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -97,6 +97,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
+	View2D *v2d= &ac->ar->v2d;
 	int notifierFlags = 0;
 	
 	/* get the channel that was clicked on */
@@ -186,14 +187,14 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
 			else
 				offset= 0;
 			
-			if (x >= (NLACHANNEL_NAMEWIDTH-NLACHANNEL_BUTTON_WIDTH)) {
+			if (x >= (v2d->cur.xmax-NLACHANNEL_BUTTON_WIDTH)) {
 				/* toggle protection (only if there's a toggle there) */
 				nlt->flag ^= NLATRACK_PROTECTED;
 				
 				/* notifier flags - channel was edited */
 				notifierFlags |= ND_ANIMCHAN_EDIT;
 			}
-			else if (x >= (NLACHANNEL_NAMEWIDTH-2*NLACHANNEL_BUTTON_WIDTH)) {
+			else if (x >= (v2d->cur.xmax-2*NLACHANNEL_BUTTON_WIDTH)) {
 				/* toggle mute */
 				nlt->flag ^= NLATRACK_MUTED;
 				
@@ -232,7 +233,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
 		{
 			AnimData *adt= BKE_animdata_from_id(ale->owner); /* this won't crash, right? */
 			
-			if (x >= (NLACHANNEL_NAMEWIDTH-NLACHANNEL_BUTTON_WIDTH)) {
+			if (x >= (v2d->cur.xmax-NLACHANNEL_BUTTON_WIDTH)) {
 				if (nlaedit_is_tweakmode_on(ac) == 0) {
 					/* 'push-down' action - only usable when not in TweakMode */
 					// TODO: make this use the operator instead of calling the function directly
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c
index 763f4116416..e53ccd004db 100644
--- a/source/blender/editors/space_nla/nla_edit.c
+++ b/source/blender/editors/space_nla/nla_edit.c
@@ -1249,7 +1249,7 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *op)
 				 * but leave everything else alone 
 				 */
 				strip->scale= 1.0f;
-				calc_action_range(strip->act, &strip->actstart, &strip->actend, 1);
+				calc_action_range(strip->act, &strip->actstart, &strip->actend, 0);
 			}
 		}
 	}

From e80ac54a22214a8ecc499aa70f59bb61fcba4fa3 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 25 Aug 2009 04:05:37 +0000
Subject: [PATCH 249/577] 2.5 - Keying Sets API (now usable from Py-Scripts)

Wrapped the Keying Sets API with RNA Functions so that they can now be called from Py-Scripts. This will ultimately be useful for riggers to create Keying Sets which can get loaded up/created for animators to use after importing their rig.

I've created a demo for this, which can be found at:
http://www.pasteall.org/blend/552

Notes:
- Kazanbas, I've had to create a rna_scene_api.c here to hold some of the relevant functions. Hopefully this won't cause you too much pain when you do your next merge from 2.5 to your branch ;)
- I've noticed that there seem to be a few cases mentioned in the demo which don't totally work yet. I'll commit some fixes for those later.
---
 source/blender/blenkernel/intern/anim_sys.c   |  20 +--
 source/blender/editors/animation/anim_ops.c   |   3 -
 source/blender/editors/animation/keyingsets.c | 131 ------------------
 .../blender/editors/include/ED_keyframing.h   |   9 --
 source/blender/makesrna/RNA_enum_types.h      |   2 +
 source/blender/makesrna/intern/makesrna.c     |   4 +-
 .../blender/makesrna/intern/rna_animation.c   |  20 +--
 .../makesrna/intern/rna_animation_api.c       |  89 ++++++++++++
 source/blender/makesrna/intern/rna_internal.h |   2 +
 source/blender/makesrna/intern/rna_scene.c    |   3 +
 .../blender/makesrna/intern/rna_scene_api.c   | 100 +++++++++++++
 11 files changed, 220 insertions(+), 163 deletions(-)
 create mode 100644 source/blender/makesrna/intern/rna_animation_api.c
 create mode 100644 source/blender/makesrna/intern/rna_scene_api.c

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 8daaaab62d4..44d73a7f5b4 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -207,12 +207,6 @@ AnimData *BKE_copy_animdata (AnimData *adt)
 /* *********************************** */ 
 /* KeyingSet API */
 
-/* NOTES:
- * It is very likely that there will be two copies of the api - one for internal use,
- * and one 'operator' based wrapper of the internal API, which should allow for access
- * from Python/scripts so that riggers can automate the creation of KeyingSets for their rigs.
- */
-
 /* Finding Tools --------------------------- */
 
 /* Find the first path that matches the given criteria */
@@ -299,18 +293,25 @@ void BKE_keyingset_add_destination (KeyingSet *ks, ID *id, const char group_name
 	KS_Path *ksp;
 	
 	/* sanity checks */
-	if ELEM(NULL, ks, rna_path)
+	if ELEM(NULL, ks, rna_path) {
+		printf("ERROR: no Keying Set and/or RNA Path to add destination with \n");
 		return;
+	}
 	
 	/* ID is optional for relative KeyingSets, but is necessary for absolute KeyingSets */
 	if (id == NULL) {
-		if (ks->flag & KEYINGSET_ABSOLUTE)
+		if (ks->flag & KEYINGSET_ABSOLUTE) {
+			printf("ERROR: No ID provided for absolute destination. \n");
 			return;
+		}
 	}
 	
 	/* don't add if there is already a matching KS_Path in the KeyingSet */
-	if (BKE_keyingset_find_destination(ks, id, group_name, rna_path, array_index, groupmode))
+	if (BKE_keyingset_find_destination(ks, id, group_name, rna_path, array_index, groupmode)) {
+		if (G.f & G_DEBUG)
+			printf("ERROR: destination already exists in Keying Set \n");
 		return;
+	}
 	
 	/* allocate a new KeyingSet Path */
 	ksp= MEM_callocN(sizeof(KS_Path), "KeyingSet Path");
@@ -1263,6 +1264,7 @@ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime)
 			dummy_strip.act= adt->action;
 			dummy_strip.remap= adt->remap;
 			
+			/* action range is calculated taking F-Modifiers into account (which making new strips doesn't do due to the troublesome nature of that) */
 			calc_action_range(dummy_strip.act, &dummy_strip.actstart, &dummy_strip.actend, 1);
 			dummy_strip.start = dummy_strip.actstart;
 			dummy_strip.end = (IS_EQ(dummy_strip.actstart, dummy_strip.actend)) ?  (dummy_strip.actstart + 1.0f): (dummy_strip.actend);
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index ffa44e60d00..72fee937e25 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -398,9 +398,6 @@ void ED_operatortypes_anim(void)
 	
 	WM_operatortype_append(ANIM_OT_add_driver_button);
 	WM_operatortype_append(ANIM_OT_remove_driver_button);
-	
-	WM_operatortype_append(ANIM_OT_keyingset_add_new);
-	WM_operatortype_append(ANIM_OT_keyingset_add_destination);
 }
 
 void ED_keymap_anim(wmWindowManager *wm)
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 5bd37ba7831..f19372069c3 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -80,137 +80,6 @@
 /* ************************************************** */
 /* KEYING SETS - EDITING API  */
 
-/* Operators ------------------------------------------- */
-
-/* These operators are only provided for scripting/macro usage, not for direct
- * calling from the UI since they wrap some of the data-access API code for these
- * (defined in blenkernel) which have quite a few properties.
- */
-
-/* ----- */
-
-static int keyingset_add_destination_exec (bContext *C, wmOperator *op)
-{
-	PointerRNA ptr;
-	KeyingSet *ks= NULL;
-	ID *id= NULL;
-	char rna_path[256], group_name[64]; // xxx
-	short groupmode=0, flag=0;
-	int array_index=0;
-	
-	/* get settings from operator properties */
-	ptr = RNA_pointer_get(op->ptr, "keyingset");
-	if (ptr.data) 
-		ks= (KeyingSet *)ptr.data;
-	
-	ptr = RNA_pointer_get(op->ptr, "id");
-	if (ptr.data)
-		id= (ID *)ptr.data;
-	
-	groupmode= RNA_enum_get(op->ptr, "grouping_method");
-	RNA_string_get(op->ptr, "group_name", group_name);		
-	
-	RNA_string_get(op->ptr, "rna_path", rna_path);
-	array_index= RNA_int_get(op->ptr, "array_index");
-	
-	if (RNA_boolean_get(op->ptr, "entire_array"))
-		flag |= KSP_FLAG_WHOLE_ARRAY;
-	
-	/* if enough args are provided, call API method */
-	if (ks) {
-		BKE_keyingset_add_destination(ks, id, group_name, rna_path, array_index, flag, groupmode);
-		return OPERATOR_FINISHED;
-	}
-	else {
-		BKE_report(op->reports, RPT_ERROR, "Keying Set could not be added.");
-		return OPERATOR_CANCELLED;
-	}	
-}
-
-void ANIM_OT_keyingset_add_destination (wmOperatorType *ot)
-{
-	// XXX: this is also defined in rna_animation.c
-	static EnumPropertyItem prop_mode_grouping_items[] = {
-		{KSP_GROUP_NAMED, "NAMED", 0, "Named Group", ""},
-		{KSP_GROUP_NONE, "NONE", 0, "None", ""},
-		{KSP_GROUP_KSNAME, "KEYINGSET", 0, "Keying Set Name", ""},
-		{0, NULL, 0, NULL, NULL}};
-	
-	/* identifiers */
-	ot->name= "Add Keying Set Destination";
-	ot->idname= "ANIM_OT_keyingset_add_destination";
-	
-	/* callbacks */
-	ot->exec= keyingset_add_destination_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* props */
-		/* pointers */ // xxx - do we want to directly expose these?
-	RNA_def_pointer_runtime(ot->srna, "keyingset", &RNA_KeyingSet, "Keying Set", "Keying Set to add destination to.");
-	RNA_def_pointer_runtime(ot->srna, "id", &RNA_ID, "ID", "ID-block for the destination.");
-		/* grouping */
-	RNA_def_enum(ot->srna, "grouping_method", prop_mode_grouping_items, KSP_GROUP_NAMED, "Grouping Method", "Method used to define which Group-name to use.");
-	RNA_def_string(ot->srna, "group_name", "", 64, "Group Name", "Name of Action Group to assign destination to (only if grouping mode is to use this name).");
-		/* rna-path */
-	RNA_def_string(ot->srna, "rna_path", "", 256, "RNA-Path", "RNA-Path to destination property."); // xxx hopefully this is long enough
-	RNA_def_int(ot->srna, "array_index", 0, 0, INT_MAX, "Array Index", "If applicable, the index ", 0, INT_MAX);
-		/* flags */
-	RNA_def_boolean(ot->srna, "entire_array", 1, "Entire Array", "hen an 'array/vector' type is chosen (Location, Rotation, Color, etc.), entire array is to be used.");
-	
-}
- 
-/* ----- */
-
-static int keyingset_add_new_exec (bContext *C, wmOperator *op)
-{
-	Scene *sce= CTX_data_scene(C);
-	KeyingSet *ks= NULL;
-	short flag=0, keyingflag=0;
-	char name[64];
-	
-	/* get settings from operator properties */
-	RNA_string_get(op->ptr, "name", name);
-	
-	if (RNA_boolean_get(op->ptr, "absolute"))
-		flag |= KEYINGSET_ABSOLUTE;
-	if (RNA_boolean_get(op->ptr, "insertkey_needed"))
-		keyingflag |= INSERTKEY_NEEDED;
-	if (RNA_boolean_get(op->ptr, "insertkey_visual"))
-		keyingflag |= INSERTKEY_MATRIX;
-		
-	/* call the API func, and set the active keyingset index */
-	ks= BKE_keyingset_add(&sce->keyingsets, name, flag, keyingflag);
-	
-	if (ks) {
-		sce->active_keyingset= BLI_countlist(&sce->keyingsets);
-		return OPERATOR_FINISHED;
-	}
-	else {
-		BKE_report(op->reports, RPT_ERROR, "Keying Set could not be added.");
-		return OPERATOR_CANCELLED;
-	}
-}
-
-void ANIM_OT_keyingset_add_new (wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Keying Set";
-	ot->idname= "ANIM_OT_keyingset_add_new";
-	
-	/* callbacks */
-	ot->exec= keyingset_add_new_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* props */
-		/* name */
-	RNA_def_string(ot->srna, "name", "KeyingSet", 64, "Name", "Name of Keying Set");
-		/* flags */
-	RNA_def_boolean(ot->srna, "absolute", 1, "Absolute", "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)");
-		/* keying flags */
-	RNA_def_boolean(ot->srna, "insertkey_needed", 0, "Insert Keyframes - Only Needed", "Only insert keyframes where they're needed in the relevant F-Curves.");
-	RNA_def_boolean(ot->srna, "insertkey_visual", 0, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'.");
-}
-
 /* UI API --------------------------------------------- */
 
 /* Build menu-string of available keying-sets (allocates memory for string)
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 64672e3502b..4bc24a0adeb 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -154,15 +154,6 @@ struct KeyingSet *ANIM_builtin_keyingset_get_named(struct KeyingSet *prevKS, cha
 /* Initialise builtin KeyingSets on startup */
 void init_builtin_keyingsets(void);
 
-/* -------- */
-
-/* KeyingSet Editing Operators:
- *	These can add a new KeyingSet and/or add 'destinations' to the KeyingSets,
- *	acting as a means by which they can be added outside the Outliner.
- */
-void ANIM_OT_keyingset_add_new(struct wmOperatorType *ot);
-void ANIM_OT_keyingset_add_destination(struct wmOperatorType *ot);
-
 /* ************ Drivers ********************** */
 
 /* Main Driver Management API calls:
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 46d8c50caa6..06be0e69be5 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -41,6 +41,8 @@ extern EnumPropertyItem boidrule_type_items[];
 extern EnumPropertyItem beztriple_handle_type_items[];
 extern EnumPropertyItem beztriple_interpolation_mode_items[];
 
+extern EnumPropertyItem keyingset_path_grouping_items[];
+
 extern EnumPropertyItem fmodifier_type_items[];
 
 extern EnumPropertyItem nla_mode_extend_items[];
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 83178f32d5f..fa3a5a40686 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1942,7 +1942,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
 	{"rna_ID.c", NULL, RNA_def_ID},
 	{"rna_texture.c", NULL, RNA_def_texture},
 	{"rna_action.c", NULL, RNA_def_action},
-	{"rna_animation.c", NULL, RNA_def_animation},
+	{"rna_animation.c", "rna_animation_api.c", RNA_def_animation},
 	{"rna_actuator.c", NULL, RNA_def_actuator},
 	{"rna_armature.c", NULL, RNA_def_armature},
 	{"rna_boid.c", NULL, RNA_def_boid},
@@ -1975,7 +1975,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
 	{"rna_pose.c", NULL, RNA_def_pose},
 	{"rna_property.c", NULL, RNA_def_gameproperty},
 	{"rna_render.c", NULL, RNA_def_render},
-	{"rna_scene.c", NULL, RNA_def_scene},
+	{"rna_scene.c", "rna_scene_api.c", RNA_def_scene},
 	{"rna_screen.c", NULL, RNA_def_screen},
 	{"rna_sculpt_paint.c", NULL, RNA_def_sculpt_paint},
 	{"rna_sensor.c", NULL, RNA_def_sensor},
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c
index e334e2b5e90..7652987ac86 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -36,6 +36,14 @@
 
 #include "MEM_guardedalloc.h"
 
+/* exported for use in API */
+EnumPropertyItem keyingset_path_grouping_items[] = {
+	{KSP_GROUP_NAMED, "NAMED", 0, "Named Group", ""},
+	{KSP_GROUP_NONE, "NONE", 0, "None", ""},
+	{KSP_GROUP_KSNAME, "KEYINGSET", 0, "Keying Set Name", ""},
+	{KSP_GROUP_TEMPLATE_ITEM, "TEMPLATE", 0, "Innermost Context-Item Name", ""},
+	{0, NULL, 0, NULL, NULL}};
+
 #ifdef RNA_RUNTIME
 
 static int rna_AnimData_action_editable(PointerRNA *ptr)
@@ -90,13 +98,6 @@ void rna_def_keyingset_path(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 	
-	static EnumPropertyItem prop_mode_grouping_items[] = {
-		{KSP_GROUP_NAMED, "NAMED", 0, "Named Group", ""},
-		{KSP_GROUP_NONE, "NONE", 0, "None", ""},
-		{KSP_GROUP_KSNAME, "KEYINGSET", 0, "Keying Set Name", ""},
-		{KSP_GROUP_TEMPLATE_ITEM, "TEMPLATE", 0, "Innermost Context-Item Name", ""},
-		{0, NULL, 0, NULL, NULL}};
-	
 	srna= RNA_def_struct(brna, "KeyingSetPath", NULL);
 	RNA_def_struct_sdna(srna, "KS_Path");
 	RNA_def_struct_ui_text(srna, "Keying Set Path", "Path to a setting for use in a Keying Set.");
@@ -112,7 +113,7 @@ void rna_def_keyingset_path(BlenderRNA *brna)
 	/* Grouping */
 	prop= RNA_def_property(srna, "grouping", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "groupmode");
-	RNA_def_property_enum_items(prop, prop_mode_grouping_items);
+	RNA_def_property_enum_items(prop, keyingset_path_grouping_items);
 	RNA_def_property_ui_text(prop, "Grouping Method", "Method used to define which Group-name to use.");
 	
 	/* Path + Array Index */
@@ -170,7 +171,8 @@ void rna_def_keyingset(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "keyingflag", INSERTKEY_MATRIX);
 	RNA_def_property_ui_text(prop, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'.");
 	
-	
+	/* Keying Set API */
+	RNA_api_keyingset(srna);
 }
 
 /* --- */
diff --git a/source/blender/makesrna/intern/rna_animation_api.c b/source/blender/makesrna/intern/rna_animation_api.c
new file mode 100644
index 00000000000..6af87335e02
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_animation_api.c
@@ -0,0 +1,89 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+#include "RNA_types.h"
+
+#include "DNA_anim_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#ifdef RNA_RUNTIME
+
+#include "BKE_animsys.h"
+
+static void rna_KeyingSet_add_destination(KeyingSet *keyingset, ReportList *reports, 
+		ID *id, char rna_path[], int array_index, int entire_array,
+		int grouping_method, char group_name[])
+{
+	short flag = 0;
+	
+	/* validate flags */
+	if (entire_array)
+		flag |= KSP_FLAG_WHOLE_ARRAY;
+	
+	/* if data is valid, call the API function for this */
+	if (keyingset) {
+		BKE_keyingset_add_destination(keyingset, id, group_name, rna_path, array_index, flag, grouping_method);
+	}
+	else {
+		BKE_report(reports, RPT_ERROR, "Keying Set Destination could not be added.");
+	}
+}
+
+#else
+
+void RNA_api_keyingset(StructRNA *srna)
+{
+	FunctionRNA *func;
+	PropertyRNA *parm;
+	
+	/* Add Destination */
+	func= RNA_def_function(srna, "add_destination", "rna_KeyingSet_add_destination");
+	RNA_def_function_ui_description(func, "Add a new destination for the Keying Set.");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
+		/* ID-block for target */
+	parm= RNA_def_pointer(func, "target_id", "ID", "Target ID", "ID-Datablock for the destination."); 
+		RNA_def_property_flag(parm, PROP_REQUIRED);
+		/* rna-path */
+	parm= RNA_def_string(func, "rna_path", "", 256, "RNA-Path", "RNA-Path to destination property."); // xxx hopefully this is long enough
+		RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm=RNA_def_int(func, "array_index", 0, 0, INT_MAX, "Array Index", "If applicable, the index ", 0, INT_MAX);
+		/* flags */
+	parm=RNA_def_boolean(func, "entire_array", 1, "Entire Array", "When an 'array/vector' type is chosen (Location, Rotation, Color, etc.), entire array is to be used.");
+		/* grouping */
+	parm=RNA_def_enum(func, "grouping_method", keyingset_path_grouping_items, KSP_GROUP_KSNAME, "Grouping Method", "Method used to define which Group-name to use.");
+	parm=RNA_def_string(func, "group_name", "", 64, "Group Name", "Name of Action Group to assign destination to (only if grouping mode is to use this name).");
+}
+
+#endif
+
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 579441691ff..bd28085692f 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -197,9 +197,11 @@ void rna_Object_update_data(struct bContext *C, struct PointerRNA *ptr);
 
 /* API functions */
 
+void RNA_api_keyingset(struct StructRNA *srna);
 void RNA_api_main(struct StructRNA *srna);
 void RNA_api_mesh(struct StructRNA *srna);
 void RNA_api_object(struct StructRNA *srna);
+void RNA_api_scene(struct StructRNA *srna);
 void RNA_api_ui_layout(struct StructRNA *srna);
 void RNA_api_wm(struct StructRNA *srna);
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 40e3efc9e46..592836c8278 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1995,6 +1995,9 @@ void RNA_def_scene(BlenderRNA *brna)
 	rna_def_scene_render_data(brna);
 	rna_def_scene_game_data(brna);
 	rna_def_scene_render_layer(brna);
+	
+	/* Scene API */
+	RNA_api_scene(srna);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
new file mode 100644
index 00000000000..26047ab5dc3
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -0,0 +1,100 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+#include "RNA_types.h"
+
+#include "DNA_anim_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#ifdef RNA_RUNTIME
+
+#include "BKE_animsys.h"
+
+// Scene API stuff from kazanbas branch here...
+
+
+static KeyingSet *rna_Scene_add_keying_set(Scene *sce, ReportList *reports, 
+		char name[], int absolute, int insertkey_needed, int insertkey_visual)
+{
+	KeyingSet *ks= NULL;
+	short flag=0, keyingflag=0;
+	
+	/* validate flags */
+	if (absolute)
+		flag |= KEYINGSET_ABSOLUTE;
+	if (insertkey_needed)
+		keyingflag |= INSERTKEY_NEEDED;
+	if (insertkey_visual)
+		keyingflag |= INSERTKEY_MATRIX;
+		
+	/* call the API func, and set the active keyingset index */
+	ks= BKE_keyingset_add(&sce->keyingsets, name, flag, keyingflag);
+	
+	if (ks) {
+		sce->active_keyingset= BLI_countlist(&sce->keyingsets);
+		return ks;
+	}
+	else {
+		BKE_report(reports, RPT_ERROR, "Keying Set could not be added.");
+		return NULL;
+	}
+}
+
+#else
+
+void RNA_api_scene(StructRNA *srna)
+{
+	FunctionRNA *func;
+	PropertyRNA *parm;
+	
+	// Scene API stuff from kazanbas branch here...
+	
+	/* Add Keying Set */
+	func= RNA_def_function(srna, "add_keying_set", "rna_Scene_add_keying_set");
+	RNA_def_function_ui_description(func, "Add a new Keying Set to Scene.");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
+		/* returns the new KeyingSet */
+	parm= RNA_def_pointer(func, "keyingset", "KeyingSet", "", "Newly created Keying Set.");
+		RNA_def_function_return(func, parm);
+		/* name */
+	RNA_def_string(func, "name", "KeyingSet", 64, "Name", "Name of Keying Set");
+		/* flags */
+	RNA_def_boolean(func, "absolute", 1, "Absolute", "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)");
+		/* keying flags */
+	RNA_def_boolean(func, "insertkey_needed", 0, "Insert Keyframes - Only Needed", "Only insert keyframes where they're needed in the relevant F-Curves.");
+	RNA_def_boolean(func, "insertkey_visual", 0, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'.");
+}
+
+#endif
+

From 33343fced5d7be2585228300392bfb3adde7ff2e Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 25 Aug 2009 04:32:40 +0000
Subject: [PATCH 250/577] 2.5 - Action Editor

New Actions can now be added again from the Action Editor.

There are no guarantees that this works totally safely yet (reference counting may be quite off), so you've been warned.
---
 source/blender/editors/interface/interface_utils.c | 14 ++++++++++++++
 .../blender/editors/space_action/action_header.c   | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index b5cfbe19466..997ac8b78c6 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -444,6 +444,20 @@ int uiDefIDPoinButs(uiBlock *block, Main *bmain, ID *parid, ID *id, int id_code,
 			uiBlockClearButLock(block);
 		}
 		
+		/* add button */
+		if(events & UI_ID_ADD_NEW) {
+			uiBlockSetButLock(block, (events & UI_ID_PIN) && *pin_p, "Can't unlink pinned data");
+			if(parid && parid->lib);
+			else {
+				dup_params= MEM_dupallocN(params);
+				but= uiDefIconBut(block, BUT, 0, ICON_ZOOMIN, x,y,DEF_ICON_BUT_WIDTH,DEF_BUT_HEIGHT, &dup_params->browsenr, params->browsenr, 32767.0, 0, 0, "Add new data block");
+				uiButSetNFunc(but, idpoin_cb, MEM_dupallocN(params), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
+				x+= DEF_ICON_BUT_WIDTH;
+			}
+			
+			uiBlockClearButLock(block);
+		}
+		
 		/* delete button */
 		if(events & UI_ID_DELETE) {
 			uiBlockSetButLock(block, (events & UI_ID_PIN) && *pin_p, "Can't unlink pinned data");
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index 33a97b5a80a..e2a725164c9 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -43,6 +43,7 @@
 #include "BLI_blenlib.h"
 
 #include "BKE_animsys.h"
+#include "BKE_action.h"
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
@@ -272,6 +273,7 @@ static void saction_idpoin_handle(bContext *C, ID *id, int event)
 				/* set action */
 				printf("\tset action \n");
 				adt->action= saction->action;
+				adt->action->id.us++;
 			}
 			
 			ED_area_tag_redraw(CTX_wm_area(C));
@@ -282,7 +284,14 @@ static void saction_idpoin_handle(bContext *C, ID *id, int event)
 			break;
 		case UI_ID_ADD_NEW:
 			printf("actedit addnew \n");
-			/* XXX not implemented */
+			if (saction->pin == 0) {
+				AnimData *adt= BKE_id_add_animdata(&obact->id); /* this only adds if non-existant */
+				
+				/* set new action */
+				// XXX need to restore behaviour to copy old actions...
+				printf("\tset new action \n");
+				adt->action= saction->action= add_empty_action("Action");
+			}
 			break;
 		case UI_ID_OPEN:
 			printf("actedit open \n");

From 1441f337fb1140a5d5d852cfdc9320eb38c2bc33 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 25 Aug 2009 08:11:37 +0000
Subject: [PATCH 251/577] Small error detected by valgrind, thanks cam

---
 source/blender/render/intern/source/volume_precache.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 0b81d775649..71200aa8b0d 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -712,6 +712,7 @@ void free_volume_precache(Render *re)
 			MEM_freeN(obi->volume_precache->data_r);
 			MEM_freeN(obi->volume_precache->data_g);
 			MEM_freeN(obi->volume_precache->data_b);
+			obi->volume_precache = NULL;
 		}
 	}
 	

From 01bd67bd1ac402ccb5d8e549d3b4fb8e8e7752ec Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 25 Aug 2009 09:47:14 +0000
Subject: [PATCH 252/577] * removed misleading comments. In short: NEVER EVER
 copy platform defaults in their entirety as your user-config.py.   I'm taking
 this commit log as an opportunity to also remind people of the existance of
 doc/blender-scons.txt .   If you're a user reading these commit logs, and you
 haven't pre-ordered the Durian DVD yet, do so now:
 http://www.blender3d.org/e-shop/product_info_n.php?products_id=120

---
 config/darwin-config.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 5c0fa9a5086..ba1d12542d0 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -1,10 +1,3 @@
-#
-# Note : if you want to alter this file
-# copy it as a whole in the upper folder
-# as user-config.py
-# dont create a new file with only some
-# vars changed.
-
 import commands
 
 # IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs

From 2d38d0d1e1cf8a2a62639eeb3fcbd81de6e69080 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 25 Aug 2009 10:32:53 +0000
Subject: [PATCH 253/577] 2.5 - Keying Sets Bugfix

Single-value properties in KeyingSets were not getting keyframed.
---
 source/blender/editors/animation/keyingsets.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index f19372069c3..d22fe763ad4 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -916,7 +916,7 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *
 			 * normal non-array entries get keyframed correctly
 			 */
 			i= ksp->array_index;
-			arraylen= i+1;
+			arraylen= i;
 			
 			/* get length of array if whole array option is enabled */
 			if (ksp->flag & KSP_FLAG_WHOLE_ARRAY) {
@@ -928,6 +928,10 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *
 					arraylen= RNA_property_array_length(prop);
 			}
 			
+			/* we should do at least one step */
+			if (arraylen == i)
+				arraylen++;
+			
 			/* for each possible index, perform operation 
 			 *	- assume that arraylen is greater than index
 			 */

From 4c8d32b4bf624bd70a4c2b20a9c971ae92e8f8a3 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 25 Aug 2009 10:56:01 +0000
Subject: [PATCH 254/577] == SCons == * Add sndfile support (False by default).
   Note: for this to work, make sure that FFMPEG-support is disabled.

---
 config/linux2-config.py      | 23 ++++++-----------------
 config/win32-mingw-config.py | 25 ++++++-------------------
 config/win32-vc-config.py    | 28 ++++++----------------------
 intern/audaspace/SConscript  |  5 +++++
 tools/Blender.py             |  4 ++++
 tools/btools.py              | 15 +++++++++++----
 6 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/config/linux2-config.py b/config/linux2-config.py
index a5ac9f4e00e..757b8210e49 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -33,6 +33,12 @@ BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = '/usr' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -85,23 +91,6 @@ BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB = 
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
 # enable freetype2 support for text objects
 BF_FREETYPE = '/usr'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index cde41d6ffba..26fa0835255 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -3,14 +3,9 @@ LIBDIR = "${LCGDIR}"
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.1'
-#BF_PYTHON_VERSION = '2.6'
-#BF_PYTHON_VERSION = '2.6'
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-#BF_PYTHON_LIB = 'python25'
-#BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
-#BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
@@ -37,6 +32,12 @@ BF_JACK_INC = '${BF_JACK}/include'
 BF_JACK_LIB = 'libjack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
@@ -99,20 +100,6 @@ BF_BULLET_LIB = 'extern_bullet'
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB = 
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-
 # enable freetype2 support for text objects
 BF_FREETYPE = LIBDIR + '/gcc/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 2c219633540..c50f41b6d4b 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -21,11 +21,6 @@ BF_OPENAL_INC = '${BF_OPENAL}/include '
 BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
-# TODO - are these useful on win32?
-# BF_CXX = '/usr'
-# WITH_BF_STATICCXX = False
-# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
 WITH_BF_ICONV = True
 BF_ICONV = LIBDIR + '/iconv'
 BF_ICONV_INC = '${BF_ICONV}/include'
@@ -43,6 +38,12 @@ BF_JACK_INC = '${BF_JACK}/include'
 BF_JACK_LIB = 'libjack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
@@ -108,23 +109,6 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
 WITH_BF_BINRELOC = False
 
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB = 
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
 # enable freetype2 support for text objects
 BF_WITH_FREETYPE = True
 BF_FREETYPE = LIBDIR + '/freetype'
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index caae070359a..0dfd0bb9e3a 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -26,4 +26,9 @@ if env['WITH_BF_JACK']:
 	incs += ' jack ' + env['BF_JACK_INC']
 	defs.append('WITH_JACK')
 
+if env['WITH_BF_SNDFILE']:
+	sources += env.Glob('sndfile/*.cpp')
+	incs += ' sndfile ' + env['BF_SNDFILE_INC']
+	defs.append('WITH_SNDFILE')
+
 env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] )
diff --git a/tools/Blender.py b/tools/Blender.py
index 789a6981558..421a79454df 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -130,6 +130,8 @@ def setup_staticlibs(lenv):
 		libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
 	if lenv['WITH_BF_JACK']:
 		libincs += Split(lenv['BF_JACK_LIBPATH'])
+	if lenv['WITH_BF_SNDFILE']:
+		libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
 	if lenv['WITH_BF_OPENEXR']:
 		libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
 		if lenv['WITH_BF_STATICOPENEXR']:
@@ -191,6 +193,8 @@ def setup_syslibs(lenv):
 			syslibs += Split(lenv['BF_OGG_LIB'])
 	if lenv['WITH_BF_JACK']:
 			syslibs += Split(lenv['BF_JACK_LIB'])
+	if lenv['WITH_BF_SNDFILE']:
+			syslibs += Split(lenv['BF_SNDFILE_LIB'])
 	if lenv['WITH_BF_FFTW3']:
 		syslibs += Split(lenv['BF_FFTW3_LIB'])
 	if lenv['WITH_BF_SDL']:
diff --git a/tools/btools.py b/tools/btools.py
index 3e80ac453ce..1ae952adbc7 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -32,6 +32,7 @@ def validate_arguments(args, bc):
 			'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
 			'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH',
 			'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
+			'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_LIBPATH',
 			'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
 			'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC',
 			'WITH_BF_DDS',
@@ -171,13 +172,13 @@ def read_opts(cfg, args):
 
 		(BoolVariable('WITH_BF_SDL', 'Use SDL if true', False)),
 		('BF_SDL', 'SDL base path', ''),
-		('BF_SDL_INC', 'SDL include path', ''),	 #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-		('BF_SDL_LIB', 'SDL library', ''),	  #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+		('BF_SDL_INC', 'SDL include path', ''),
+		('BF_SDL_LIB', 'SDL library', ''),
 		('BF_SDL_LIBPATH', 'SDL library path', ''),
 
 		('BF_LIBSAMPLERATE', 'libsamplerate aka SRC base path', ''),
-		('BF_LIBSAMPLERATE_INC', 'libsamplerate aka SRC include path', ''),	 #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-		('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''),	  #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+		('BF_LIBSAMPLERATE_INC', 'libsamplerate aka SRC include path', ''),
+		('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''),
 		('BF_LIBSAMPLERATE_LIBPATH', 'libsamplerate aka SRC library path', ''),
 
 		(BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)),
@@ -186,6 +187,12 @@ def read_opts(cfg, args):
 		('BF_JACK_LIB', 'jack library', ''),
 		('BF_JACK_LIBPATH', 'jack library path', ''),
 
+		(BoolVariable('WITH_BF_SNDFILE', 'Enable sndfile support if true', True)),
+		('BF_SNDFILE', 'sndfile base path', ''),
+		('BF_SNDFILE_INC', 'sndfile include path', ''),
+		('BF_SNDFILE_LIB', 'sndfile library', ''),
+		('BF_SNDFILE_LIBPATH', 'sndfile library path', ''),
+
 		('BF_PTHREADS', 'Pthreads base path', ''),
 		('BF_PTHREADS_INC', 'Pthreads include path', ''),
 		('BF_PTHREADS_LIB', 'Pthreads library', ''),

From 8aa6f672bab266986c7d775cfb01c48d834d3ad9 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Tue, 25 Aug 2009 12:31:35 +0000
Subject: [PATCH 255/577] Moved the autokey mode menu from the timeline header
 into the timeline menus. Its previous prominent large size made it seem like
 this setting was very important, when in fact it's a setting you are almost
 never likely to touch. This helps clean up the main UI.

---
 release/ui/buttons_physics_cloth.py        |  2 +-
 release/ui/buttons_physics_softbody.py     |  2 +-
 release/ui/space_time.py                   | 41 ++++++++++++++++++----
 source/blender/makesrna/intern/rna_scene.c |  2 +-
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index 6c499625685..9ddf03e3d4d 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -91,7 +91,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
 		layout.set_context_pointer("PointCache", cache)
 		
 		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
 		col = row.column(align=True)
 		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
 		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 35c0c498436..2beba8c95a0 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -66,7 +66,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
 		layout.set_context_pointer("PointCache", cache)
 		
 		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
 		col = row.column(align=True)
 		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
 		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 6e4b5beb161..81681e42d92 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -33,6 +33,8 @@ class TIME_HT_header(bpy.types.Header):
 			row.itemR(scene, "preview_range_end_frame", text="End")
 		
 		layout.itemR(scene, "current_frame", text="")
+		
+		layout.itemS()
 
 		row = layout.row(align=True)
 		row.item_booleanO("screen.frame_jump", "end", False, text="", icon='ICON_REW')
@@ -47,18 +49,13 @@ class TIME_HT_header(bpy.types.Header):
 		row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME')
 		row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF')
 		
-		layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
-		
-		layout.itemS()
-		
 		row = layout.row(align=True)
 		row.itemR(tools, "enable_auto_key", text="", toggle=True, icon='ICON_REC')
-		sub = row.row()
-		sub.active = tools.enable_auto_key
-		sub.itemR(tools, "autokey_mode", text="")
 		if screen.animation_playing and tools.enable_auto_key:
 			subsub = row.row()
 			subsub.itemR(tools, "record_with_nla", toggle=True)
+			
+		layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
 		
 		layout.itemS()
 		
@@ -88,6 +85,7 @@ class TIME_MT_frame(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+		tools = context.tool_settings
 		
 		layout.itemO("marker.add", text="Add Marker")
 		layout.itemO("marker.duplicate", text="Duplicate Marker")
@@ -99,6 +97,12 @@ class TIME_MT_frame(bpy.types.Menu):
 		
 		layout.itemO("time.start_frame_set")
 		layout.itemO("time.end_frame_set")
+		
+		layout.itemS()
+		
+		sub = layout.row()
+		sub.active = tools.enable_auto_key
+		sub.itemM("TIME_MT_autokey")
 
 class TIME_MT_playback(bpy.types.Menu):
 	__space_type__ = 'TIMELINE'
@@ -108,6 +112,7 @@ class TIME_MT_playback(bpy.types.Menu):
 		layout = self.layout
 		
 		st = context.space_data
+		rd = context.scene.render_data
 		
 		layout.itemR(st, "play_top_left")
 		layout.itemR(st, "play_all_3d")
@@ -115,10 +120,32 @@ class TIME_MT_playback(bpy.types.Menu):
 		layout.itemR(st, "play_buttons")
 		layout.itemR(st, "play_image")
 		layout.itemR(st, "play_sequencer")
+		
 		layout.itemS()
+		
 		layout.itemR(st, "continue_physics")
+		
+		layout.itemS()
+		
+		layout.itemR(rd, "sync_audio", icon='ICON_SPEAKER')
+
+		
+		
+class TIME_MT_autokey(bpy.types.Menu):
+	__space_type__ = 'TIMELINE'
+	__label__ = "Auto-Keyframing Mode"
+
+	def draw(self, context):
+		layout = self.layout
+		tools = context.tool_settings
+		
+		layout.active = tools.enable_auto_key
+		
+		layout.item_enumR(tools, "autokey_mode", "ADD_REPLACE_KEYS")
+		layout.item_enumR(tools, "autokey_mode", "REPLACE_KEYS")
 
 bpy.types.register(TIME_HT_header)
 bpy.types.register(TIME_MT_view)
 bpy.types.register(TIME_MT_frame)
+bpy.types.register(TIME_MT_autokey)
 bpy.types.register(TIME_MT_playback)
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 592836c8278..209c771834d 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -418,7 +418,7 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 		{0, NULL, 0, NULL, NULL}};
 		
 	static EnumPropertyItem auto_key_items[] = {
-		{AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add/Replace", ""},
+		{AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add & Replace", ""},
 		{AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", 0, "Replace", ""},
 		{0, NULL, 0, NULL, NULL}};
 

From 33e2d118bcc8d8301144cd90e7896175ae14d141 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 25 Aug 2009 12:43:25 +0000
Subject: [PATCH 256/577] removing GameLogic.EvalExpression(), unlikely anyone
 will miss it, was only accessible in 2.49, invalid expressions would crash,
 valid ones leak memory.

---
 source/gameengine/Ketsji/KX_PythonInit.cpp | 28 ----------------------
 source/gameengine/PyDoc/GameLogic.py       |  8 -------
 2 files changed, 36 deletions(-)

diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index fcada7bfce4..91515587e8d 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -498,33 +498,6 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *)
 	Py_RETURN_NONE;
 }
 
-
-static PyObject *gEvalExpression(PyObject*, PyObject* value)
-{
-	char* txt= PyString_AsString(value);
-	
-	if (txt==NULL) {
-		PyErr_SetString(PyExc_TypeError, "Expression.calc(text): expects a single string argument");
-		return NULL;
-	}
-	
-	CParser parser;
-	CExpression* expr = parser.ProcessText(txt);
-	CValue* val = expr->Calculate();
-	expr->Release();
-	
-	if (val) {	
-		PyObject* pyobj = val->ConvertValueToPython();
-		if (pyobj)
-			return pyobj;
-		else
-			return val->GetProxy();
-	}
-	
-	Py_RETURN_NONE;
-}
-
-
 static struct PyMethodDef game_methods[] = {
 	{"expandPath", (PyCFunction)gPyExpandPath, METH_VARARGS, (PY_METHODCHAR)gPyExpandPath_doc},
 	{"sendMessage", (PyCFunction)gPySendMessage, METH_VARARGS, (PY_METHODCHAR)gPySendMessage_doc},
@@ -553,7 +526,6 @@ static struct PyMethodDef game_methods[] = {
 	{"getAverageFrameRate", (PyCFunction) gPyGetAverageFrameRate, METH_NOARGS, (PY_METHODCHAR)"Gets the estimated average frame rate"},
 	{"getBlendFileList", (PyCFunction)gPyGetBlendFileList, METH_VARARGS, (PY_METHODCHAR)"Gets a list of blend files in the same directory as the current blend file"},
 	{"PrintGLInfo", (PyCFunction)pyPrintExt, METH_NOARGS, (PY_METHODCHAR)"Prints GL Extension Info"},
-	{"EvalExpression", (PyCFunction)gEvalExpression, METH_O, (PY_METHODCHAR)"Evaluate a string as a game logic expression"},
 	{NULL, (PyCFunction) NULL, 0, NULL }
 };
 
diff --git a/source/gameengine/PyDoc/GameLogic.py b/source/gameengine/PyDoc/GameLogic.py
index 46f00fa7ea6..5d9b17316be 100644
--- a/source/gameengine/PyDoc/GameLogic.py
+++ b/source/gameengine/PyDoc/GameLogic.py
@@ -448,14 +448,6 @@ def setPhysicsTicRate(ticrate):
 	@type ticrate: float
 	"""
 
-def EvalExpression(text):
-	"""
-	Evaluate the string as an expression, similar to the expression controller logic brick.
-	@param text: The expression to evaluate.
-	@type text: string
-	@return: The result of the expression. The type depends on the expression.
-	"""
-
 #{ Utility functions
 def getAverageFrameRate():
 	"""

From 855974dad931bcba8a63260d1f642da49902d569 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 25 Aug 2009 13:43:21 +0000
Subject: [PATCH 257/577] patch from Mitchell Stokes adding dictionary like
 access to a scene. (like KX_GameObjects have)

val = scene["prop"]
scene["prop"] = newval
if "prop" in scene: ...
val = scene.get("prop", fallback_val)
---
 source/gameengine/Ketsji/KX_Scene.cpp | 131 +++++++++++++++++++++++++-
 source/gameengine/Ketsji/KX_Scene.h   |  16 ++--
 source/gameengine/PyDoc/GameTypes.py  |   6 ++
 3 files changed, 145 insertions(+), 8 deletions(-)

diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 5c19911fe58..a9bb583bba7 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1615,7 +1615,10 @@ PyTypeObject KX_Scene::Type = {
 	0,
 	0,
 	py_base_repr,
-	0,0,0,0,0,0,0,0,0,
+	0,
+	&Sequence,
+	&Mapping,
+	0,0,0,0,0,0,
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
 	0,0,0,0,0,0,0,
 	Methods,
@@ -1632,8 +1635,115 @@ PyMethodDef KX_Scene::Methods[] = {
 	KX_PYMETHODTABLE_NOARGS(KX_Scene, getName),
 	KX_PYMETHODTABLE(KX_Scene, addObject),
 	
+	/* dict style access */
+	KX_PYMETHODTABLE(KX_Scene, get),
+	
 	{NULL,NULL} //Sentinel
 };
+static PyObject *Map_GetItem(PyObject *self_v, PyObject *item)
+{
+	KX_Scene* self= static_cast<KX_Scene*>BGE_PROXY_REF(self_v);
+	const char *attr_str= _PyUnicode_AsString(item);
+	PyObject* pyconvert;
+	
+	if (self==NULL) {
+		PyErr_SetString(PyExc_SystemError, "val = scene[key]: KX_Scene, "BGE_PROXY_ERROR_MSG);
+		return NULL;
+	}
+	
+	if (self->m_attr_dict && (pyconvert=PyDict_GetItem(self->m_attr_dict, item))) {
+		
+		if (attr_str)
+			PyErr_Clear();
+		Py_INCREF(pyconvert);
+		return pyconvert;
+	}
+	else {
+		if(attr_str)	PyErr_Format(PyExc_KeyError, "value = scene[key]: KX_Scene, key \"%s\" does not exist", attr_str);
+		else			PyErr_SetString(PyExc_KeyError, "value = scene[key]: KX_Scene, key does not exist");
+		return NULL;
+	}
+		
+}
+
+static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val)
+{
+	KX_Scene* self= static_cast<KX_Scene*>BGE_PROXY_REF(self_v);
+	const char *attr_str= _PyUnicode_AsString(key);
+	if(attr_str==NULL)
+		PyErr_Clear();
+	
+	if (self==NULL) {
+		PyErr_SetString(PyExc_SystemError, "scene[key] = value: KX_Scene, "BGE_PROXY_ERROR_MSG);
+		return -1;
+	}
+	
+	if (val==NULL) { /* del ob["key"] */
+		int del= 0;
+		
+		if(self->m_attr_dict)
+			del |= (PyDict_DelItem(self->m_attr_dict, key)==0) ? 1:0;
+		
+		if (del==0) {
+			if(attr_str)	PyErr_Format(PyExc_KeyError, "scene[key] = value: KX_Scene, key \"%s\" could not be set", attr_str);
+			else			PyErr_SetString(PyExc_KeyError, "del scene[key]: KX_Scene, key could not be deleted");
+			return -1;
+		}
+		else if (self->m_attr_dict) {
+			PyErr_Clear(); /* PyDict_DelItem sets an error when it fails */
+		}
+	}
+	else { /* ob["key"] = value */
+		int set = 0;
+
+		if (self->m_attr_dict==NULL) /* lazy init */
+			self->m_attr_dict= PyDict_New();
+		
+		
+		if(PyDict_SetItem(self->m_attr_dict, key, val)==0)
+			set= 1;
+		else
+			PyErr_SetString(PyExc_KeyError, "scene[key] = value: KX_Scene, key not be added to internal dictionary");
+	
+		if(set==0)
+			return -1; /* pythons error value */
+		
+	}
+	
+	return 0; /* success */
+}
+
+static int Seq_Contains(PyObject *self_v, PyObject *value)
+{
+	KX_Scene* self= static_cast<KX_Scene*>BGE_PROXY_REF(self_v);
+	
+	if (self==NULL) {
+		PyErr_SetString(PyExc_SystemError, "val in scene: KX_Scene, "BGE_PROXY_ERROR_MSG);
+		return -1;
+	}
+	
+	if (self->m_attr_dict && PyDict_GetItem(self->m_attr_dict, value))
+		return 1;
+	
+	return 0;
+}
+
+PyMappingMethods KX_Scene::Mapping = {
+	(lenfunc)NULL					, 			/*inquiry mp_length */
+	(binaryfunc)Map_GetItem,		/*binaryfunc mp_subscript */
+	(objobjargproc)Map_SetItem,	/*objobjargproc mp_ass_subscript */
+};
+
+PySequenceMethods KX_Scene::Sequence = {
+	NULL,		/* Cant set the len otherwise it can evaluate as false */
+	NULL,		/* sq_concat */
+	NULL,		/* sq_repeat */
+	NULL,		/* sq_item */
+	NULL,		/* sq_slice */
+	NULL,		/* sq_ass_item */
+	NULL,		/* sq_ass_slice */
+	(objobjproc)Seq_Contains,	/* sq_contains */
+};
 
 PyObject* KX_Scene::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
@@ -1765,3 +1875,22 @@ KX_PYMETHODDEF_DOC(KX_Scene, addObject,
 	replica->Release();
 	return replica->GetProxy();
 }
+
+/* Matches python dict.get(key, [default]) */
+KX_PYMETHODDEF_DOC(KX_Scene, get, "")
+{
+	PyObject *key;
+	PyObject* def = Py_None;
+	PyObject* ret;
+
+	if (!PyArg_ParseTuple(args, "O|O:get", &key, &def))
+		return NULL;
+	
+	if (m_attr_dict && (ret=PyDict_GetItem(m_attr_dict, key))) {
+		Py_INCREF(ret);
+		return ret;
+	}
+	
+	Py_INCREF(def);
+	return def;
+}
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index f48e9520f53..8d7c0ad8dec 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -90,6 +90,7 @@ struct KX_ClientObjectInfo;
 class KX_Scene : public PyObjectPlus, public SCA_IScene
 {
 	Py_Header;
+	PyObject*	m_attr_dict;
 
 	struct CullingInfo {
 		int m_layer;
@@ -262,15 +263,10 @@ protected:
 
 	double				m_suspendedtime;
 	double				m_suspendeddelta;
-	
-	/**
-	 * This stores anything from python
-	 */
-	PyObject* m_attr_dict;
 
 	struct Scene* m_blenderScene;
 
-public:
+public:	
 	KX_Scene(class SCA_IInputDevice* keyboarddevice,
 		class SCA_IInputDevice* mousedevice,
 		class NG_NetworkDeviceInterface* ndi,
@@ -525,6 +521,8 @@ public:
 	KX_PYMETHOD_DOC_NOARGS(KX_Scene, getObjectList);
 	KX_PYMETHOD_DOC_NOARGS(KX_Scene, getName);
 	KX_PYMETHOD_DOC(KX_Scene, addObject);
+	KX_PYMETHOD_DOC(KX_Scene, get);
+	
 /*	
 	KX_PYMETHOD_DOC(KX_Scene, getActiveCamera);
 	KX_PYMETHOD_DOC(KX_Scene, getActiveCamera);
@@ -549,7 +547,11 @@ public:
 	static int			pyattr_set_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
 	virtual PyObject* py_repr(void) { return PyUnicode_FromString(GetName().ReadPtr()); }
-		
+	
+	/* getitem/setitem */
+	static PyMappingMethods	Mapping;
+	static PySequenceMethods	Sequence;
+
 	/**
 	 * Sets the time the scene was suspended
 	 */ 
diff --git a/source/gameengine/PyDoc/GameTypes.py b/source/gameengine/PyDoc/GameTypes.py
index c82623e6409..9c426aed8e0 100644
--- a/source/gameengine/PyDoc/GameTypes.py
+++ b/source/gameengine/PyDoc/GameTypes.py
@@ -3868,6 +3868,12 @@ class KX_Scene(PyObjectPlus):
 		
 		@rtype: L{KX_GameObject}
 		"""
+	
+	def get(key, default=None):
+		"""
+		Return the value matching key, or the default value if its not found.
+		@return: The key value or a default.
+		"""
 
 class KX_SceneActuator(SCA_IActuator):
 	"""

From 9521fa94569b0ab1fe5c9f451e8abf7dd2290b13 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 25 Aug 2009 13:54:56 +0000
Subject: [PATCH 258/577] remove gameOb.has_key(key) method from KX_GameObject
 and ListValue since python 3.x removes has_key from dictionaries. Instead use
 __contains__, eg.  if key in gameOb: ...

Mathutils returns from PyMath.cpp were incorrectly using wrapped Mathutils types. Wrapped types should only be used with a callback now.
---
 source/gameengine/Expressions/ListValue.cpp |  9 ---------
 source/gameengine/Expressions/ListValue.h   |  1 -
 source/gameengine/Ketsji/KX_GameObject.cpp  |  9 ---------
 source/gameengine/Ketsji/KX_GameObject.h    |  1 -
 source/gameengine/Ketsji/KX_PyMath.cpp      |  8 ++++----
 source/gameengine/PyDoc/GameTypes.py        | 18 +++---------------
 6 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index 5f45cdc48a2..002674450d1 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -300,7 +300,6 @@ PyMethodDef CListValue::Methods[] = {
 	
 	/* Dict style access */
 	{"get", (PyCFunction)CListValue::sPyget,METH_VARARGS},
-	{"has_key", (PyCFunction)CListValue::sPyhas_key,METH_O},
 	
 	/* Own cvalue funcs */
 	{"from_id", (PyCFunction)CListValue::sPyfrom_id,METH_O},
@@ -594,14 +593,6 @@ PyObject* CListValue::Pyget(PyObject *args)
 	return def;
 }
 
-/* Matches python dict.has_key() */
-PyObject* CListValue::Pyhas_key(PyObject* value)
-{
-	if (PyUnicode_Check(value) && FindValue((const char *)_PyUnicode_AsString(value)))
-		Py_RETURN_TRUE;
-	
-	Py_RETURN_FALSE;
-}
 
 PyObject* CListValue::Pyfrom_id(PyObject* value)
 {
diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h
index 98e6f216f11..2dc458e0148 100644
--- a/source/gameengine/Expressions/ListValue.h
+++ b/source/gameengine/Expressions/ListValue.h
@@ -74,7 +74,6 @@ public:
 	KX_PYMETHOD_O(CListValue,index);
 	KX_PYMETHOD_O(CListValue,count);
 	KX_PYMETHOD_VARARGS(CListValue,get);
-	KX_PYMETHOD_O(CListValue,has_key);
 	KX_PYMETHOD_O(CListValue,from_id);
 
 	
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index a5217273b17..3aef41743a7 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1398,7 +1398,6 @@ PyMethodDef KX_GameObject::Methods[] = {
 	KX_PYMETHODTABLE(KX_GameObject, sendMessage),
 	
 	// dict style access for props
-	{"has_key",(PyCFunction) KX_GameObject::sPyhas_key, METH_O},
 	{"get",(PyCFunction) KX_GameObject::sPyget, METH_VARARGS},
 	
 	// deprecated
@@ -2919,14 +2918,6 @@ PyObject* KX_GameObject::Pyget(PyObject *args)
 	return def;
 }
 
-/* Matches python dict.has_key() */
-PyObject* KX_GameObject::Pyhas_key(PyObject* value)
-{
-	// the ONLY error case is invalid data, this is checked by the macro'd static function
-	// that calls this one. but make sure Seq_Contains doesnt add extra errors later on.
-	return PyBool_FromLong(Seq_Contains((PyObject *)this, value));
-}
-
 /* --------------------------------------------------------------------- 
  * Some stuff taken from the header
  * --------------------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index ba7451fdeef..a5cd084b4d4 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -844,7 +844,6 @@ public:
 	
 	/* Dict access */
 	KX_PYMETHOD_VARARGS(KX_GameObject,get);
-	KX_PYMETHOD_O(KX_GameObject,has_key);
 	
 	/* attributes */
 	static PyObject*	pyattr_get_name(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp
index 6d33c38190c..a41dab194dd 100644
--- a/source/gameengine/Ketsji/KX_PyMath.cpp
+++ b/source/gameengine/Ketsji/KX_PyMath.cpp
@@ -146,7 +146,7 @@ PyObject* PyObjectFrom(const MT_Quaternion &qrot)
 {
 	/* NOTE, were re-ordering here for Mathutils compat */
 	float fvec[4]= {qrot[3], qrot[0], qrot[1], qrot[2]};
-	return newQuaternionObject(fvec, Py_WRAP, NULL);
+	return newQuaternionObject(fvec, Py_NEW, NULL);
 }
 #endif
 
@@ -154,7 +154,7 @@ PyObject* PyObjectFrom(const MT_Tuple4 &vec)
 {
 #ifdef USE_MATHUTILS
 	float fvec[4]= {vec[0], vec[1], vec[2], vec[3]};
-	return newVectorObject(fvec, 4, Py_WRAP, NULL);
+	return newVectorObject(fvec, 4, Py_NEW, NULL);
 #else
 	PyObject *list = PyList_New(4);
 	PyList_SET_ITEM(list, 0, PyFloat_FromDouble(vec[0]));
@@ -169,7 +169,7 @@ PyObject* PyObjectFrom(const MT_Tuple3 &vec)
 {
 #ifdef USE_MATHUTILS
 	float fvec[3]= {vec[0], vec[1], vec[2]};
-	return newVectorObject(fvec, 3, Py_WRAP, NULL);
+	return newVectorObject(fvec, 3, Py_NEW, NULL);
 #else
 	PyObject *list = PyList_New(3);
 	PyList_SET_ITEM(list, 0, PyFloat_FromDouble(vec[0]));
@@ -183,7 +183,7 @@ PyObject* PyObjectFrom(const MT_Tuple2 &vec)
 {
 #ifdef USE_MATHUTILS
 	float fvec[2]= {vec[0], vec[1]};
-	return newVectorObject(fvec, 2, Py_WRAP, NULL);
+	return newVectorObject(fvec, 2, Py_NEW, NULL);
 #else
 	PyObject *list = PyList_New(2);
 	PyList_SET_ITEM(list, 0, PyFloat_FromDouble(vec[0]));
diff --git a/source/gameengine/PyDoc/GameTypes.py b/source/gameengine/PyDoc/GameTypes.py
index 9c426aed8e0..c391d0c3dec 100644
--- a/source/gameengine/PyDoc/GameTypes.py
+++ b/source/gameengine/PyDoc/GameTypes.py
@@ -1023,12 +1023,6 @@ class CListValue(CPropValue):
 		Return the value matching key, or the default value if its not found.
 		@return: The key value or a default.
 		"""
-	def has_key(key):
-		"""
-		Return True if the key is found.
-		@rtype: boolean
-		@return: The key value or a default.
-		"""
 	def from_id(id):
 		"""
 		This is a funtion especially for the game engine to return a value with a spesific id.
@@ -1582,7 +1576,7 @@ class KX_GameObject(SCA_IObject):
 	@ivar childrenRecursive: all children of this object including childrens children, (read-only).
 	@type childrenRecursive: L{CListValue} of L{KX_GameObject}'s
 	@group Deprecated: getPosition, setPosition, setWorldPosition, getOrientation, setOrientation, getState, setState, getParent, getVisible, getMass, getMesh, getChildren, getChildrenRecursive
-	@group Property Access: get, has_key, attrDict, getPropertyNames
+	@group Property Access: get, attrDict, getPropertyNames
 	"""
 	def endObject():
 		"""
@@ -2054,12 +2048,6 @@ class KX_GameObject(SCA_IObject):
 		Return the value matching key, or the default value if its not found.
 		@return: The key value or a default.
 		"""
-	def has_key(key):
-		"""
-		Return True if the key is found.
-		@rtype: boolean
-		@return: The key value or a default.
-		"""
 
 
 class KX_IpoActuator(SCA_IActuator):
@@ -5745,7 +5733,7 @@ for name, val in locals().items():
 			
 			# Store the mappings to new attributes in a list (because there
 			# could be collisions).
-			if not depAttrs.has_key(attrName):
+			if attrName not in depAttrs:
 				depAttrs[attrName] = {}
 			mapping = depAttrs[attrName]
 			
@@ -5770,7 +5758,7 @@ for name, val in locals().items():
 					# Another mapping, from a conversion tuple to lists of class
 					# names.
 					conversion = (func, newAttrName)
-					if not mapping.has_key(conversion):
+					if conversion not in mapping:
 						mapping[conversion] = []
 					mapping[conversion].append(name)
 					break

From 3d7215da581b5c1dac6d566aa43ef3cfccd13c92 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Tue, 25 Aug 2009 14:26:27 +0000
Subject: [PATCH 259/577] 2.5 Material Buttons:

* Fixed some poll checks, they showed empty panels when there was no active material.
* Some minor code/whitespace cleanup.
---
 release/ui/buttons_material.py | 76 +++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 21201166eda..30b107d452f 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -29,7 +29,8 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
 		# An exception, dont call the parent poll func because
 		# this manages materials for all engine types
 		
-		return (context.object) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return (context.object) and (engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -74,7 +75,9 @@ class MATERIAL_PT_shading(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 
 	def poll(self, context):
-		return (context.material.type in ('SURFACE', 'WIRE', 'HALO'))
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -114,10 +117,8 @@ class MATERIAL_PT_strand(MaterialButtonsPanel):
 
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
-	
-	def poll(self, context):
-		return context.material.type in ('SURFACE', 'WIRE', 'HALO')
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES)
 	
 	def draw(self, context):
 		layout = self.layout
@@ -177,7 +178,9 @@ class MATERIAL_PT_options(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 
 	def poll(self, context):
-		return (context.material.type in ('SURFACE', 'WIRE', 'HALO'))
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -215,7 +218,9 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 	
 	def poll(self, context):
-		return context.material.type in ('SURFACE', 'WIRE')
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -240,7 +245,6 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel):
 		sub = col.column()
 		sub.active = (not mat.ray_shadow_bias)
 		sub.itemR(mat, "shadow_ray_bias", text="Ray Bias")
-		
 
 class MATERIAL_PT_diffuse(MaterialButtonsPanel):
 	__label__ = "Diffuse"
@@ -248,7 +252,8 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
 
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -294,15 +299,15 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
 			split = row.split(percentage=0.3)
 			split.itemL(text="Blend:")
 			split.itemR(mat, "diffuse_ramp_blend", text="")
-			
-		
+
 class MATERIAL_PT_specular(MaterialButtonsPanel):
 	__label__ = "Specular"
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
 	def draw(self, context):
 		layout = self.layout
@@ -354,7 +359,8 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
 	
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
 	def draw_header(self, context):
 		layout = self.layout
@@ -399,7 +405,8 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 	
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 	
 	def draw_header(self, context):
 		layout = self.layout
@@ -421,8 +428,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		col = split.column()
 		col.itemR(raym, "reflect", text="Reflectivity")
 		col.itemR(mat, "mirror_color", text="")
-		
-		
+
 		col = split.column()
 		col.itemR(raym, "fresnel")
 		sub = col.column()
@@ -448,8 +454,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		sub.itemR(raym, "gloss_threshold", text="Threshold")
 		sub.itemR(raym, "gloss_samples", text="Samples")
 		sub.itemR(raym, "gloss_anisotropic", text="Anisotropic")
-		
-		
+
 class MATERIAL_PT_transp(MaterialButtonsPanel):
 	__label__= "Transparency"
 	__default_closed__ = True
@@ -457,7 +462,8 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 		
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type in ('SURFACE', 'WIRE')) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
 	def draw_header(self, context):
 		layout = self.layout
@@ -483,8 +489,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 		row = col.row()
 		row.active = mat.transparency and (not mat.shadeless)
 		row.itemR(mat, "specular_alpha", text="Specular")
-		
-		
+
 		col = split.column()
 		col.active = (not mat.shadeless)
 		col.itemR(rayt, "fresnel")
@@ -518,7 +523,9 @@ class MATERIAL_PT_volume_shading(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 	
 	def poll(self, context):
-		return (context.material.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
 	
 	def draw(self, context):
 		layout = self.layout
@@ -536,13 +543,10 @@ class MATERIAL_PT_volume_shading(MaterialButtonsPanel):
 		col = split.column()
 		col.itemR(vol, "absorption")
 		col.itemR(vol, "absorption_color", text="")
-		
-				
+
 		col = split.column()
 		col.itemR(vol, "emission")
 		col.itemR(vol, "emission_color", text="")
-		
-		
 
 class MATERIAL_PT_volume_scattering(MaterialButtonsPanel):
 	__label__ = "Scattering"
@@ -550,7 +554,9 @@ class MATERIAL_PT_volume_scattering(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 	
 	def poll(self, context):
-		return (context.material.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
 	
 	def draw(self, context):
 		layout = self.layout
@@ -587,7 +593,8 @@ class MATERIAL_PT_volume_transp(MaterialButtonsPanel):
 		
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
 
 	def draw_header(self, context):
 		layout = self.layout
@@ -608,7 +615,9 @@ class MATERIAL_PT_volume_integration(MaterialButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 	
 	def poll(self, context):
-		return (context.material.type == 'VOLUME') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
 	
 	def draw(self, context):
 		layout = self.layout
@@ -637,7 +646,8 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
 	
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type == 'HALO') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'HALO') and (engine in self.COMPAT_ENGINES)
 	
 	def draw(self, context):
 		layout = self.layout
@@ -683,7 +693,8 @@ class MATERIAL_PT_flare(MaterialButtonsPanel):
 	
 	def poll(self, context):
 		mat = context.material
-		return mat and (mat.type == 'HALO') and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'HALO') and (engine in self.COMPAT_ENGINES)
 	
 	def draw_header(self, context):
 		layout = self.layout
@@ -728,4 +739,3 @@ bpy.types.register(MATERIAL_PT_physics)
 bpy.types.register(MATERIAL_PT_strand)
 bpy.types.register(MATERIAL_PT_options)
 bpy.types.register(MATERIAL_PT_shadow)
-

From 4ba6dbce767c7e3fe4c91aaca79da6f35d5492c9 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Tue, 25 Aug 2009 15:30:04 +0000
Subject: [PATCH 260/577] Replaced G.sce by Main.name in sound.c. I hoped for
 it to resolve the bug of loading sounds with relative paths didn't work, but
 Main.name isn't set before the sounds are loaded, so the bug resists! Someone
 who is into file loading should please fix this!

---
 intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp  |  1 -
 source/blender/blenkernel/BKE_sound.h         |  2 +-
 source/blender/blenkernel/intern/packedFile.c |  2 +-
 source/blender/blenkernel/intern/sound.c      | 12 ++++++------
 source/blender/blenloader/intern/readfile.c   |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
index de0e47300f8..d70a9c25bcb 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -334,7 +334,6 @@ void AUD_FFMPEGReader::read(int & length, sample_t* & buffer)
 	// read packages and decode them
 	AVPacket packet;
 	int data_size = 0;
-	int pkgbuf_size = m_pkgbuf->getSize();
 	int pkgbuf_pos;
 	int left = length;
 	int sample_size = AUD_SAMPLE_SIZE(m_specs);
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index 1dd90b4dbda..84ecd79a008 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -54,7 +54,7 @@ void sound_delete(struct bContext *C, struct bSound* sound);
 
 void sound_cache(struct bSound* sound, int ignore);
 
-void sound_load(struct bSound* sound);
+void sound_load(struct Main *main, struct bSound* sound);
 
 void sound_free(struct bSound* sound);
 
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index 8c77ed92aa1..3e47c1006e5 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -473,7 +473,7 @@ int unpackSound(ReportList *reports, bSound *sound, int how)
 			freePackedFile(sound->packedfile);
 			sound->packedfile = 0;
 
-			sound_load(sound);
+			sound_load(NULL, sound);
 
 			ret_value = RET_OK;
 		}
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 74ab41ff577..c6f9db6fda9 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -78,7 +78,7 @@ struct bSound* sound_new_file(struct Main *main, char* filename)
 	int len;
 
 	strcpy(str, filename);
-	BLI_convertstringcode(str, G.sce);
+	BLI_convertstringcode(str, main->name);
 
 	len = strlen(filename);
 	while(len > 0 && filename[len-1] != '/' && filename[len-1] != '\\')
@@ -88,7 +88,7 @@ struct bSound* sound_new_file(struct Main *main, char* filename)
 	strcpy(sound->name, filename);
 	sound->type = SOUND_TYPE_FILE;
 
-	sound_load(sound);
+	sound_load(main, sound);
 
 	if(!sound->snd_sound)
 	{
@@ -114,7 +114,7 @@ struct bSound* sound_new_buffer(struct bContext *C, struct bSound *source)
 	sound->child_sound = source;
 	sound->type = SOUND_TYPE_BUFFER;
 
-	sound_load(sound);
+	sound_load(CTX_data_main(C), sound);
 
 	if(!sound->snd_sound)
 	{
@@ -140,7 +140,7 @@ struct bSound* sound_new_limiter(struct bContext *C, struct bSound *source, floa
 	sound->end = end;
 	sound->type = SOUND_TYPE_LIMITER;
 
-	sound_load(sound);
+	sound_load(CTX_data_main(C), sound);
 
 	if(!sound->snd_sound)
 	{
@@ -172,7 +172,7 @@ void sound_cache(struct bSound* sound, int ignore)
 	sound->cache = AUD_bufferSound(sound->snd_sound);
 }
 
-void sound_load(struct bSound* sound)
+void sound_load(struct Main *main, struct bSound* sound)
 {
 	if(sound)
 	{
@@ -198,7 +198,7 @@ void sound_load(struct bSound* sound)
 			if(sound->id.lib)
 				path = sound->id.lib->filename;
 			else
-				path = G.sce;
+				path = main ? main->name : NULL;
 
 			BLI_convertstringcode(fullpath, path);
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5cc3ff7695a..920e202520e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5075,7 +5075,7 @@ static void lib_link_sound(FileData *fd, Main *main)
 			sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system
 			sound->stream = 0;
 
-			sound_load(sound);
+			sound_load(main, sound);
 		}
 		sound= sound->id.next;
 	}

From 7288bacad9bbe5e670de3454c9a64dee0c3d920c Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Tue, 25 Aug 2009 17:05:04 +0000
Subject: [PATCH 261/577] blender 2.5 MSVC projectfiles * update for volume
 rendering * update for audaspace jack * update for rna: animation_api.c,
 scene_api.c

---
 .../audaspace/make/msvc_9_0/audaspace.vcproj  |  8 ++--
 .../blender/blenlib/BLI_blenlib.vcproj        |  8 ++++
 .../blender/editors/ED_editors.vcproj         |  4 --
 .../blender/makesrna/RNA_makesrna.vcproj      |  8 ++++
 .../blender/render/BRE_render.vcproj          | 40 ++++++++++++++++++-
 5 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
index 67ab4d44d72..4c0b26f1c4e 100644
--- a/intern/audaspace/make/msvc_9_0/audaspace.vcproj
+++ b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -117,7 +117,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -192,7 +192,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -266,7 +266,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
index c2268694735..75bd6686d01 100644
--- a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
@@ -610,6 +610,10 @@
 				RelativePath="..\..\..\source\blender\blenlib\intern\vectorops.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\voxel.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\winstuff.c"
 				>
@@ -723,6 +727,10 @@
 				RelativePath="..\..\..\source\blender\blenlib\BLI_util.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_voxel.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_winstuff.h"
 				>
diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj
index 0482fa9067a..c70e66b6c2b 100644
--- a/projectfiles_vc9/blender/editors/ED_editors.vcproj
+++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj
@@ -1302,10 +1302,6 @@
 				RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt_intern.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt_stroke.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="uvedit"
diff --git a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
index afd5a7f0c0d..2a18b2c6c90 100644
--- a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
@@ -610,6 +610,10 @@
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_animation.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesrna\intern\rna_animation_api.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_armature.c"
 				>
@@ -762,6 +766,10 @@
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_scene.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesrna\intern\rna_scene_api.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_screen.c"
 				>
diff --git a/projectfiles_vc9/blender/render/BRE_render.vcproj b/projectfiles_vc9/blender/render/BRE_render.vcproj
index d7851674857..4e354c6dde3 100644
--- a/projectfiles_vc9/blender/render/BRE_render.vcproj
+++ b/projectfiles_vc9/blender/render/BRE_render.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -117,7 +117,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;_USE_MATH_DEFINES"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -208,6 +208,10 @@
 				RelativePath="..\..\..\source\blender\render\intern\source\pixelshading.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\pointdensity.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\rayshade.c"
 				>
@@ -252,6 +256,18 @@
 				RelativePath="..\..\..\source\blender\render\intern\source\texture.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\volume_precache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\volumetric.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\voxeldata.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\zbuf.c"
 				>
@@ -297,6 +313,10 @@
 				RelativePath="..\..\..\source\blender\render\intern\include\pixelshading.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\pointdensity.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\extern\include\RE_pipeline.h"
 				>
@@ -309,6 +329,10 @@
 				RelativePath="..\..\..\source\blender\render\extern\include\RE_shader_ext.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\render_types.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\rendercore.h"
 				>
@@ -353,6 +377,18 @@
 				RelativePath="..\..\..\source\blender\render\intern\include\vanillaRenderPipe_int.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\volume_precache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\volumetric.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\voxeldata.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\zbuf.h"
 				>

From 706a4c22b54ede250fbdb2c2bd772c63cdbf7d09 Mon Sep 17 00:00:00 2001
From: Arystanbek Dyussenov <arystan.d@gmail.com>
Date: Tue, 25 Aug 2009 17:06:36 +0000
Subject: [PATCH 262/577] Implemented dynamic and multidimensional array
 support in RNA.

Example code: http://www.pasteall.org/7332/c.
New API functions: http://www.pasteall.org/7330/c.

Maximum number of dimensions is currently limited to 3, but can be increased arbitrarily if needed.

What this means for ID property access:

* MeshFace.verts - dynamic array, size 3 or 4 depending on MFace.v4
* MeshTextureFace.uv - dynamic, 2-dimensional array, size depends on MFace.v4
* Object.matrix - 2-dimensional array

What this means for functions:

* more intuitive API possibility, for example:
  Mesh.add_vertices([(x, y, z), (x, y, z), ...])
  Mesh.add_faces([(1, 2, 3), (4, 5, 6), ...])

Python part is not complete yet, e.g. it is possible to:

MeshFace.verts = (1, 2, 3) # even if Mesh.verts is (1, 2, 3, 4) and vice-versa
MeshTextureFace.uv = [(0.0, 0.0)] * 4 # only if a corresponding MFace is a quad

but the following won't work:

MeshTextureFace.uv[3] = (0.0, 0.0) # setting uv[3] modifies MTFace.uv[1][0] instead of MTFace.uv[3]
---
 source/blender/blenkernel/intern/anim_sys.c   |  12 +-
 source/blender/blenkernel/intern/fcurve.c     |   6 +-
 .../editors/animation/anim_ipo_utils.c        |   2 +-
 source/blender/editors/animation/drivers.c    |   6 +-
 source/blender/editors/animation/keyframing.c |  10 +-
 source/blender/editors/animation/keyingsets.c |   4 +-
 source/blender/editors/interface/interface.c  |  18 +-
 .../editors/interface/interface_anim.c        |   2 +-
 .../editors/interface/interface_layout.c      |  10 +-
 .../editors/interface/interface_templates.c   |   2 +-
 .../editors/interface/interface_utils.c       |   4 +-
 .../blender/editors/space_outliner/outliner.c |   4 +-
 source/blender/makesrna/RNA_access.h          |   4 +-
 source/blender/makesrna/RNA_define.h          |   8 +-
 source/blender/makesrna/RNA_types.h           |   3 +-
 source/blender/makesrna/intern/makesrna.c     |   8 +
 source/blender/makesrna/intern/rna_access.c   |  45 +++-
 source/blender/makesrna/intern/rna_define.c   |  46 +++-
 .../makesrna/intern/rna_internal_types.h      |  11 +
 source/blender/makesrna/intern/rna_mesh.c     |  97 ++++++++
 source/blender/makesrna/intern/rna_object.c   |   4 +-
 source/blender/python/intern/bpy_array.c      | 235 ++++++++++++++++++
 source/blender/python/intern/bpy_rna.c        | 131 ++--------
 source/blender/python/intern/bpy_rna.h        |   5 +
 24 files changed, 513 insertions(+), 164 deletions(-)
 create mode 100644 source/blender/python/intern/bpy_array.c

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 44d73a7f5b4..df7004d3f6b 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -441,19 +441,19 @@ static short animsys_write_rna_setting (PointerRNA *ptr, char *path, int array_i
 			switch (RNA_property_type(prop)) 
 			{
 				case PROP_BOOLEAN:
-					if (RNA_property_array_length(prop))
+					if (RNA_property_array_length(&new_ptr, prop))
 						RNA_property_boolean_set_index(&new_ptr, prop, array_index, (int)value);
 					else
 						RNA_property_boolean_set(&new_ptr, prop, (int)value);
 					break;
 				case PROP_INT:
-					if (RNA_property_array_length(prop))
+					if (RNA_property_array_length(&new_ptr, prop))
 						RNA_property_int_set_index(&new_ptr, prop, array_index, (int)value);
 					else
 						RNA_property_int_set(&new_ptr, prop, (int)value);
 					break;
 				case PROP_FLOAT:
-					if (RNA_property_array_length(prop))
+					if (RNA_property_array_length(&new_ptr, prop))
 						RNA_property_float_set_index(&new_ptr, prop, array_index, value);
 					else
 						RNA_property_float_set(&new_ptr, prop, value);
@@ -1178,19 +1178,19 @@ void nladata_flush_channels (ListBase *channels)
 		switch (RNA_property_type(prop)) 
 		{
 			case PROP_BOOLEAN:
-				if (RNA_property_array_length(prop))
+				if (RNA_property_array_length(ptr, prop))
 					RNA_property_boolean_set_index(ptr, prop, array_index, (int)value);
 				else
 					RNA_property_boolean_set(ptr, prop, (int)value);
 				break;
 			case PROP_INT:
-				if (RNA_property_array_length(prop))
+				if (RNA_property_array_length(ptr, prop))
 					RNA_property_int_set_index(ptr, prop, array_index, (int)value);
 				else
 					RNA_property_int_set(ptr, prop, (int)value);
 				break;
 			case PROP_FLOAT:
-				if (RNA_property_array_length(prop))
+				if (RNA_property_array_length(ptr, prop))
 					RNA_property_float_set_index(ptr, prop, array_index, value);
 				else
 					RNA_property_float_set(ptr, prop, value);
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 90bf08059d7..31f6e2c6067 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -698,19 +698,19 @@ float driver_get_target_value (ChannelDriver *driver, DriverTarget *dtar)
 	if (RNA_path_resolve(&id_ptr, path, &ptr, &prop)) {
 		switch (RNA_property_type(prop)) {
 			case PROP_BOOLEAN:
-				if (RNA_property_array_length(prop))
+				if (RNA_property_array_length(&ptr, prop))
 					value= (float)RNA_property_boolean_get_index(&ptr, prop, index);
 				else
 					value= (float)RNA_property_boolean_get(&ptr, prop);
 				break;
 			case PROP_INT:
-				if (RNA_property_array_length(prop))
+				if (RNA_property_array_length(&ptr, prop))
 					value= (float)RNA_property_int_get_index(&ptr, prop, index);
 				else
 					value= (float)RNA_property_int_get(&ptr, prop);
 				break;
 			case PROP_FLOAT:
-				if (RNA_property_array_length(prop))
+				if (RNA_property_array_length(&ptr, prop))
 					value= RNA_property_float_get_index(&ptr, prop, index);
 				else
 					value= RNA_property_float_get(&ptr, prop);
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c
index ecf0bdbf285..26edf930f0b 100644
--- a/source/blender/editors/animation/anim_ipo_utils.c
+++ b/source/blender/editors/animation/anim_ipo_utils.c
@@ -147,7 +147,7 @@ void getname_anim_fcurve(char *name, ID *id, FCurve *fcu)
 			propname= (char *)RNA_property_ui_name(prop);
 			
 			/* Array Index - only if applicable */
-			if (RNA_property_array_length(prop)) {
+			if (RNA_property_array_length(&ptr, prop)) {
 				char c= RNA_property_array_item_char(prop, fcu->array_index);
 				
 				/* we need to write the index to a temp buffer (in py syntax) */
diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c
index 849e2d2eede..e7b7d785d7b 100644
--- a/source/blender/editors/animation/drivers.c
+++ b/source/blender/editors/animation/drivers.c
@@ -157,7 +157,7 @@ short ANIM_add_driver (ID *id, const char rna_path[], int array_index, short fla
 		/* fill in current value for python */
 		if(type == DRIVER_TYPE_PYTHON) {
 			PropertyType proptype= RNA_property_type(prop);
-			int array= RNA_property_array_length(prop);
+			int array= RNA_property_array_length(&ptr, prop);
 			char *expression= fcu->driver->expression;
 			int val, maxlen= sizeof(fcu->driver->expression);
 			float fval;
@@ -241,7 +241,7 @@ static int add_driver_button_exec (bContext *C, wmOperator *op)
 		
 		if (path) {
 			if (all) {
-				length= RNA_property_array_length(prop);
+				length= RNA_property_array_length(&ptr, prop);
 				
 				if (length) index= 0;
 				else length= 1;
@@ -303,7 +303,7 @@ static int remove_driver_button_exec (bContext *C, wmOperator *op)
 		
 		if (path) {
 			if (all) {
-				length= RNA_property_array_length(prop);
+				length= RNA_property_array_length(&ptr, prop);
 				
 				if(length) index= 0;
 				else length= 1;
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index b62c69c7b38..dc73011549c 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -503,19 +503,19 @@ static float setting_get_rna_value (PointerRNA *ptr, PropertyRNA *prop, int inde
 	
 	switch (RNA_property_type(prop)) {
 		case PROP_BOOLEAN:
-			if (RNA_property_array_length(prop))
+			if (RNA_property_array_length(ptr, prop))
 				value= (float)RNA_property_boolean_get_index(ptr, prop, index);
 			else
 				value= (float)RNA_property_boolean_get(ptr, prop);
 			break;
 		case PROP_INT:
-			if (RNA_property_array_length(prop))
+			if (RNA_property_array_length(ptr, prop))
 				value= (float)RNA_property_int_get_index(ptr, prop, index);
 			else
 				value= (float)RNA_property_int_get(ptr, prop);
 			break;
 		case PROP_FLOAT:
-			if (RNA_property_array_length(prop))
+			if (RNA_property_array_length(ptr, prop))
 				value= RNA_property_float_get_index(ptr, prop, index);
 			else
 				value= RNA_property_float_get(ptr, prop);
@@ -1313,7 +1313,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
 		
 		if (path) {
 			if (all) {
-				length= RNA_property_array_length(prop);
+				length= RNA_property_array_length(&ptr, prop);
 				
 				if(length) index= 0;
 				else length= 1;
@@ -1396,7 +1396,7 @@ static int delete_key_button_exec (bContext *C, wmOperator *op)
 		
 		if (path) {
 			if (all) {
-				length= RNA_property_array_length(prop);
+				length= RNA_property_array_length(&ptr, prop);
 				
 				if(length) index= 0;
 				else length= 1;
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index d22fe763ad4..21f969467aa 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -925,7 +925,7 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *
 				
 				RNA_id_pointer_create(ksp->id, &id_ptr);
 				if (RNA_path_resolve(&id_ptr, ksp->rna_path, &ptr, &prop) && prop)
-					arraylen= RNA_property_array_length(prop);
+					arraylen= RNA_property_array_length(&ptr, prop);
 			}
 			
 			/* we should do at least one step */
@@ -1048,7 +1048,7 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *
 					
 					RNA_id_pointer_create(cks->id, &id_ptr);
 					if (RNA_path_resolve(&id_ptr, path, &ptr, &prop) && prop)
-						arraylen= RNA_property_array_length(prop);
+						arraylen= RNA_property_array_length(&ptr, prop);
 				}
 				
 				/* for each possible index, perform operation 
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 9bd6c2577ff..3c6e12905d6 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1089,7 +1089,7 @@ void ui_get_but_vectorf(uiBut *but, float *vec)
 		vec[0]= vec[1]= vec[2]= 0.0f;
 
 		if(RNA_property_type(prop) == PROP_FLOAT) {
-			tot= RNA_property_array_length(prop);
+			tot= RNA_property_array_length(&but->rnapoin, prop);
 			tot= MIN2(tot, 3);
 
 			for(a=0; a<tot; a++)
@@ -1123,7 +1123,7 @@ void ui_set_but_vectorf(uiBut *but, float *vec)
 		prop= but->rnaprop;
 
 		if(RNA_property_type(prop) == PROP_FLOAT) {
-			tot= RNA_property_array_length(prop);
+			tot= RNA_property_array_length(&but->rnapoin, prop);
 			tot= MIN2(tot, 3);
 
 			for(a=0; a<tot; a++)
@@ -1181,19 +1181,19 @@ double ui_get_but_val(uiBut *but)
 
 		switch(RNA_property_type(prop)) {
 			case PROP_BOOLEAN:
-				if(RNA_property_array_length(prop))
+				if(RNA_property_array_length(&but->rnapoin, prop))
 					value= RNA_property_boolean_get_index(&but->rnapoin, prop, but->rnaindex);
 				else
 					value= RNA_property_boolean_get(&but->rnapoin, prop);
 				break;
 			case PROP_INT:
-				if(RNA_property_array_length(prop))
+				if(RNA_property_array_length(&but->rnapoin, prop))
 					value= RNA_property_int_get_index(&but->rnapoin, prop, but->rnaindex);
 				else
 					value= RNA_property_int_get(&but->rnapoin, prop);
 				break;
 			case PROP_FLOAT:
-				if(RNA_property_array_length(prop))
+				if(RNA_property_array_length(&but->rnapoin, prop))
 					value= RNA_property_float_get_index(&but->rnapoin, prop, but->rnaindex);
 				else
 					value= RNA_property_float_get(&but->rnapoin, prop);
@@ -1245,19 +1245,19 @@ void ui_set_but_val(uiBut *but, double value)
 		if(RNA_property_editable(&but->rnapoin, prop)) {
 			switch(RNA_property_type(prop)) {
 				case PROP_BOOLEAN:
-					if(RNA_property_array_length(prop))
+					if(RNA_property_array_length(&but->rnapoin, prop))
 						RNA_property_boolean_set_index(&but->rnapoin, prop, but->rnaindex, value);
 					else
 						RNA_property_boolean_set(&but->rnapoin, prop, value);
 					break;
 				case PROP_INT:
-					if(RNA_property_array_length(prop))
+					if(RNA_property_array_length(&but->rnapoin, prop))
 						RNA_property_int_set_index(&but->rnapoin, prop, but->rnaindex, value);
 					else
 						RNA_property_int_set(&but->rnapoin, prop, value);
 					break;
 				case PROP_FLOAT:
-					if(RNA_property_array_length(prop))
+					if(RNA_property_array_length(&but->rnapoin, prop))
 						RNA_property_float_set_index(&but->rnapoin, prop, but->rnaindex, value);
 					else
 						RNA_property_float_set(&but->rnapoin, prop, value);
@@ -2414,7 +2414,7 @@ uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, char *str, short x1,
 		but->rnapoin= *ptr;
 		but->rnaprop= prop;
 
-		if(RNA_property_array_length(but->rnaprop))
+		if(RNA_property_array_length(&but->rnapoin, but->rnaprop))
 			but->rnaindex= index;
 		else
 			but->rnaindex= 0;
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 2993a1aba15..784d820ea52 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -217,7 +217,7 @@ void ui_but_anim_menu(bContext *C, uiBut *but)
 		pup= uiPupMenuBegin(C, RNA_property_ui_name(but->rnaprop), 0);
 		layout= uiPupMenuLayout(pup);
 		
-		length= RNA_property_array_length(but->rnaprop);
+		length= RNA_property_array_length(&but->rnapoin, but->rnaprop);
 		
 		if(but->flag & UI_BUT_ANIMATED_KEY) {
 			if(length) {
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 3b4471bd4b9..a52afcb1a92 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -760,7 +760,7 @@ void uiItemO(uiLayout *layout, char *name, int icon, char *opname)
 
 /* RNA property items */
 
-static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PropertyRNA *prop, int index, int *r_w, int *r_h)
+static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int *r_w, int *r_h)
 {
 	PropertyType type;
 	PropertySubType subtype;
@@ -769,7 +769,7 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PropertyRNA
 	/* arbitrary extended width by type */
 	type= RNA_property_type(prop);
 	subtype= RNA_property_subtype(prop);
-	len= RNA_property_array_length(prop);
+	len= RNA_property_array_length(ptr, prop);
 
 	if(ELEM3(type, PROP_STRING, PROP_POINTER, PROP_ENUM) && !name[0])
 		name= "non-empty text";
@@ -819,7 +819,7 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 
 	/* retrieve info */
 	type= RNA_property_type(prop);
-	len= RNA_property_array_length(prop);
+	len= RNA_property_array_length(ptr, prop);
 
 	/* set name and icon */
 	if(!name)
@@ -846,7 +846,7 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 	expand= (flag & UI_ITEM_R_EXPAND);
 
 	/* get size */
-	ui_item_rna_size(layout, name, icon, prop, index, &w, &h);
+	ui_item_rna_size(layout, name, icon, ptr, prop, index, &w, &h);
 
 	/* array property */
 	if(index == RNA_NO_INDEX && len > 0)
@@ -1132,7 +1132,7 @@ void uiItemPointerR(uiLayout *layout, char *name, int icon, struct PointerRNA *p
 	/* create button */
 	block= uiLayoutGetBlock(layout);
 
-	ui_item_rna_size(layout, name, icon, prop, 0, &w, &h);
+	ui_item_rna_size(layout, name, icon, ptr, prop, 0, &w, &h);
 	but= ui_item_with_label(layout, block, name, icon, ptr, prop, 0, 0, 0, w, h);
 
 	ui_but_add_search(but, ptr, prop, searchptr, searchprop);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 56badedaded..4cfc44e56c8 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1258,7 +1258,7 @@ void uiTemplateLayers(uiLayout *layout, PointerRNA *ptr, char *propname)
 	 *	  the 'remainder' is added to this, as it will be ok to have first row slightly wider if need be
 	 *	- for now, only split into groups if if group will have at least 5 items
 	 */
-	layers= RNA_property_array_length(prop);
+	layers= RNA_property_array_length(ptr, prop);
 	cols= (layers / 2) + (layers % 2);
 	groups= ((cols / 2) < 5) ? (1) : (cols / 2);
 	
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 997ac8b78c6..5b44f6544d1 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -72,7 +72,7 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 {
 	uiBut *but=NULL;
 	const char *propname= RNA_property_identifier(prop);
-	int arraylen= RNA_property_array_length(prop);
+	int arraylen= RNA_property_array_length(ptr, prop);
 
 	switch(RNA_property_type(prop)) {
 		case PROP_BOOLEAN: {
@@ -81,7 +81,7 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 			if(arraylen && index == -1)
 				return NULL;
 
-			length= RNA_property_array_length(prop);
+			length= RNA_property_array_length(ptr, prop);
 
 			if(length)
 				value= RNA_property_boolean_get_index(ptr, prop, index);
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index 762ad82344b..d564573a543 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -1084,7 +1084,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 					te->flag |= TE_LAZY_CLOSED;
 			}
 			else if(ELEM3(proptype, PROP_BOOLEAN, PROP_INT, PROP_FLOAT)) {
-				tot= RNA_property_array_length(prop);
+				tot= RNA_property_array_length(ptr, prop);
 
 				if(!(tselem->flag & TSE_CLOSED)) {
 					for(a=0; a<tot; a++)
@@ -3721,7 +3721,7 @@ static void tree_element_to_path(SpaceOops *soops, TreeElement *te, TreeStoreEle
 			/* item is part of an array, so must set the array_index */
 			*array_index= te->index;
 		}
-		else if (RNA_property_array_length(prop)) {
+		else if (RNA_property_array_length(ptr, prop)) {
 			/* entire array was selected, so keyframe all */
 			*flag |= KSP_FLAG_WHOLE_ARRAY;
 		}
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index fb351efed66..cb54fe2ad8d 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -581,8 +581,10 @@ PropertySubType RNA_property_subtype(PropertyRNA *prop);
 PropertyUnit RNA_property_unit(PropertyRNA *prop);
 int RNA_property_flag(PropertyRNA *prop);
 
-int RNA_property_array_length(PropertyRNA *prop);
+int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop);
+int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length);
 char RNA_property_array_item_char(PropertyRNA *prop, int index);
+unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dim_size[]);
 
 int RNA_property_string_maxlength(PropertyRNA *prop);
 
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h
index 33f5d7137b8..1c6837bbcc8 100644
--- a/source/blender/makesrna/RNA_define.h
+++ b/source/blender/makesrna/RNA_define.h
@@ -88,11 +88,15 @@ void RNA_def_enum_funcs(PropertyRNA *prop, EnumPropertyItemFunc itemfunc);
 PropertyRNA *RNA_def_float(StructOrFunctionRNA *cont, const char *identifier, float default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_vector(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_color(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
-PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
+PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int len, int rowsize, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_rotation(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value,
 	float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_array(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value,
 	float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
+	/*
+PropertyRNA *RNA_def_float_dynamic_array(StructOrFunctionRNA *cont, const char *identifier, float hardmin, float hardmax,
+	const char *ui_name, const char *ui_description, float softmin, float softmax, unsigned int dimension, unsigned short dim_size[]);
+	*/
 PropertyRNA *RNA_def_float_percentage(StructOrFunctionRNA *cont, const char *identifier, float default_value, float hardmin, float hardmax,
 	const char *ui_name, const char *ui_description, float softmin, float softmax);
 
@@ -123,6 +127,7 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
 void RNA_def_property_flag(PropertyRNA *prop, int flag);
 void RNA_def_property_clear_flag(PropertyRNA *prop, int flag);
 void RNA_def_property_array(PropertyRNA *prop, int arraylength);
+void RNA_def_property_multidimensional_array(PropertyRNA *prop, int arraylength, unsigned short arraydimension, unsigned short dimsize[]);
 void RNA_def_property_range(PropertyRNA *prop, double min, double max);
 
 void RNA_def_property_enum_items(PropertyRNA *prop, const EnumPropertyItem *item);
@@ -146,6 +151,7 @@ void RNA_def_property_ui_icon(PropertyRNA *prop, int icon, int consecutive);
 void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *updatefunc);
 void RNA_def_property_editable_func(PropertyRNA *prop, const char *editable);
 
+void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength, const char *setlength);
 void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const char *set);
 void RNA_def_property_int_funcs(PropertyRNA *prop, const char *get, const char *set, const char *range);
 void RNA_def_property_float_funcs(PropertyRNA *prop, const char *get, const char *set, const char *range);
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 042f7578cf4..1acbfb21385 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -152,7 +152,8 @@ typedef enum PropertyFlag {
 	PROP_IDPROPERTY = 1024,
 	PROP_RAW_ACCESS = 8192,
 	PROP_RAW_ARRAY = 16384,
-	PROP_FREE_POINTERS = 32768
+	PROP_FREE_POINTERS = 32768,
+	PROP_DYNAMIC = 131072 /* for dynamic arrays, and retvals of type string */
 } PropertyFlag;
 
 typedef struct CollectionPropertyIterator {
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index fa3a5a40686..0c90a28a0e9 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1724,6 +1724,14 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 	rna_print_c_string(f, prop->description); fprintf(f, ",\n\t");
 	fprintf(f, "%d,\n", prop->icon);
 	fprintf(f, "\t%s, %s|%s, %d,\n", rna_property_typename(prop->type), rna_property_subtypename(prop->subtype), rna_property_subtype_unit(prop->subtype), prop->arraylength);
+	{
+		int i;
+		int tot= sizeof(prop->dimsize) / sizeof(prop->dimsize[0]);
+		fprintf(f, "\t%s, %s, %d, {", rna_function_string(prop->getlength), rna_function_string(prop->setlength), (int)prop->arraydimension);
+		for(i= 0; i < tot; i++) {
+			fprintf(f, i == tot - 1 ? "%d},\n" : "%d, ", (int)prop->dimsize[i]);
+		}
+	}
 	fprintf(f, "\t%s, %d, %s,\n", rna_function_string(prop->update), prop->noteflag, rna_function_string(prop->editable));
 
 	if(prop->flag & PROP_RAW_ACCESS) rna_set_raw_offset(f, srna, prop);
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index c2f1f31a4bc..e71dcc2a586 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -343,10 +343,11 @@ const char *rna_ensure_property_name(PropertyRNA *prop)
 		return ((IDProperty*)prop)->name;
 }
 
-int rna_ensure_property_array_length(PropertyRNA *prop)
+int rna_ensure_property_array_length(PointerRNA *ptr, PropertyRNA *prop)
 {
-	if(prop->magic == RNA_MAGIC)
-		return prop->arraylength;
+	if(prop->magic == RNA_MAGIC) {
+		return prop->getlength ? prop->getlength(ptr) : prop->arraylength;
+	}
 	else {
 		IDProperty *idprop= (IDProperty*)prop;
 
@@ -549,9 +550,27 @@ int RNA_property_flag(PropertyRNA *prop)
 	return rna_ensure_property(prop)->flag;
 }
 
-int RNA_property_array_length(PropertyRNA *prop)
+int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop)
 {
-	return rna_ensure_property_array_length(prop);
+	return rna_ensure_property_array_length(ptr, prop);
+}
+
+int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length)
+{
+	if (prop->setlength)
+		return prop->setlength(ptr, length);
+	else
+		prop->arraylength= length; /* function parameters only? */
+
+	return 1;
+}
+
+unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dimsize[])
+{
+	if (dimsize && prop->arraydimension > 1) {
+		memcpy(dimsize, prop->dimsize, sizeof(prop->dimsize[0]) * (prop->arraydimension - 1));
+	}
+	return prop->arraydimension;
 }
 
 char RNA_property_array_item_char(PropertyRNA *prop, int index)
@@ -1684,7 +1703,7 @@ static int rna_raw_access(ReportList *reports, PointerRNA *ptr, PropertyRNA *pro
 		}
 
 		/* check item array */
-		itemlen= RNA_property_array_length(itemprop);
+		itemlen= RNA_property_array_length(&itemptr, itemprop);
 
 		/* try to access as raw array */
 		if(RNA_property_collection_raw_array(ptr, prop, itemprop, &out)) {
@@ -1736,7 +1755,7 @@ static int rna_raw_access(ReportList *reports, PointerRNA *ptr, PropertyRNA *pro
 					iprop= RNA_struct_find_property(&itemptr, propname);
 
 					if(iprop) {
-						itemlen= RNA_property_array_length(iprop);
+						itemlen= RNA_property_array_length(&itemptr, iprop);
 						itemtype= RNA_property_type(iprop);
 					}
 					else {
@@ -2675,7 +2694,7 @@ char *RNA_pointer_as_string(PointerRNA *ptr)
 char *RNA_property_as_string(bContext *C, PointerRNA *ptr, PropertyRNA *prop)
 {
 	int type = RNA_property_type(prop);
-	int len = RNA_property_array_length(prop);
+	int len = RNA_property_array_length(ptr, prop);
 	int i;
 
 	DynStr *dynstr= BLI_dynstr_new();
@@ -2905,6 +2924,12 @@ void RNA_parameter_list_free(ParameterList *parms)
 	for(tot= 0; parm; parm= parm->next) {
 		if(parm->type == PROP_COLLECTION)
 			BLI_freelistN((ListBase*)((char*)parms->data+tot));
+		else if (parm->flag & PROP_DYNAMIC) {
+			/* for dynamic arrays and strings, data is a pointer to an array */
+			char *array= *(char**)((char*)parms->data+tot);
+			if(array)
+				MEM_freeN(array);
+		}
 
 		tot+= rna_parameter_size(parm);
 	}
@@ -3277,7 +3302,7 @@ int RNA_function_call_direct_va(bContext *C, ReportList *reports, PointerRNA *pt
 
 		type= RNA_property_type(parm);
 		ftype= format[ofs++];
-		len= RNA_property_array_length(parm);
+		len= RNA_property_array_length(&funcptr, parm);
 		alen= rna_function_format_array_length(format, ofs, flen);
 
 		if (len!=alen) {
@@ -3342,7 +3367,7 @@ int RNA_function_call_direct_va(bContext *C, ReportList *reports, PointerRNA *pt
 
 		type= RNA_property_type(parm);
 		ftype= format[ofs++];
-		len= RNA_property_array_length(parm);
+		len= RNA_property_array_length(&funcptr, parm);
 		alen= rna_function_format_array_length(format, ofs, flen);
 
 		if (len!=alen) {
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 3b0db949350..1f51b3ff34c 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -1028,6 +1028,26 @@ void RNA_def_property_array(PropertyRNA *prop, int arraylength)
 			DefRNA.error= 1;
 			break;
 	}
+
+	prop->arraydimension= 1;
+}
+
+void RNA_def_property_multidimensional_array(PropertyRNA *prop, int arraylength, unsigned short dimension, unsigned short dimsize[])
+{
+	StructRNA *srna= DefRNA.laststruct;
+	
+	if (dimension < 1 || dimension > RNA_MAX_ARRAY_DIMENSION) {
+		fprintf(stderr, "RNA_def_property_multidimensional_array: %s.%s, array dimension must be between 1 and %d.\n", srna->identifier, prop->identifier, RNA_MAX_ARRAY_DIMENSION);
+		DefRNA.error= 1;
+		return;
+	}
+
+	RNA_def_property_array(prop, arraylength);
+
+	prop->arraydimension= dimension;
+
+	if (dimension > 1)
+		memcpy(prop->dimsize, dimsize, sizeof(dimsize[0]) * (dimension - 1));
 }
 
 void RNA_def_property_ui_text(PropertyRNA *prop, const char *name, const char *description)
@@ -1688,6 +1708,23 @@ void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *func)
 	prop->update= (UpdateFunc)func;
 }
 
+void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength, const char *setlength)
+{
+	if(!DefRNA.preprocess) {
+		fprintf(stderr, "RNA_def_property_*_funcs: only during preprocessing.\n");
+		return;
+	}
+
+	if (!(prop->flag & PROP_DYNAMIC)) {
+		fprintf(stderr, "RNA_def_property_dynamic_array_funcs: property is a not dynamic array.\n");
+		DefRNA.error= 1;
+		return;
+	}
+
+	if(getlength) prop->getlength= (PropArrayLengthGetFunc)getlength;
+	if(setlength) prop->setlength= (PropArrayLengthSetFunc)setlength;
+}
+
 void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const char *set)
 {
 	StructRNA *srna= DefRNA.laststruct;
@@ -2085,14 +2122,15 @@ PropertyRNA *RNA_def_float_color(StructOrFunctionRNA *cont_, const char *identif
 }
 
 
-PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont_, const char *identifier, int len, const float *default_value, 
+PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont_, const char *identifier, int len, int rowsize, const float *default_value, 
 	float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax)
 {
 	ContainerRNA *cont= cont_;
 	PropertyRNA *prop;
+	unsigned short dimsize[1]= {rowsize};
 	
 	prop= RNA_def_property(cont, identifier, PROP_FLOAT, PROP_MATRIX);
-	if(len != 0) RNA_def_property_array(prop, len);
+	if(len != 0) RNA_def_property_multidimensional_array(prop, len, 2, dimsize);
 	if(default_value) RNA_def_property_float_array_default(prop, default_value);
 	if(hardmin != hardmax) RNA_def_property_range(prop, hardmin, hardmax);
 	RNA_def_property_ui_text(prop, ui_name, ui_description);
@@ -2292,6 +2330,10 @@ int rna_parameter_size(PropertyRNA *parm)
 	int len= parm->arraylength;
 
 	if(len > 0) {
+
+		if (parm->flag & PROP_DYNAMIC)
+			return sizeof(void *);
+
 		switch (ptype) {
 			case PROP_BOOLEAN:
 			case PROP_INT:
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h
index 12bd876ce52..d706fd5ac19 100644
--- a/source/blender/makesrna/intern/rna_internal_types.h
+++ b/source/blender/makesrna/intern/rna_internal_types.h
@@ -40,6 +40,7 @@ struct IDProperty;
 struct GHash;
 
 #define RNA_MAX_ARRAY 32
+#define RNA_MAX_ARRAY_DIMENSION 3
 
 /* Function Callbacks */
 
@@ -49,6 +50,8 @@ typedef struct IDProperty* (*IDPropertiesFunc)(struct PointerRNA *ptr, int creat
 typedef struct StructRNA *(*StructRefineFunc)(struct PointerRNA *ptr);
 typedef char *(*StructPathFunc)(struct PointerRNA *ptr);
 
+typedef int (*PropArrayLengthGetFunc)(struct PointerRNA *ptr);
+typedef int (*PropArrayLengthSetFunc)(struct PointerRNA *ptr, int length);
 typedef int (*PropBooleanGetFunc)(struct PointerRNA *ptr);
 typedef void (*PropBooleanSetFunc)(struct PointerRNA *ptr, int value);
 typedef void (*PropBooleanArrayGetFunc)(struct PointerRNA *ptr, int *values);
@@ -131,6 +134,14 @@ struct PropertyRNA {
 	PropertySubType subtype;
 	/* if an array this is > 0, specifying the length */
 	unsigned int arraylength;
+	/* these, if non-NULL, override arraylength */
+	PropArrayLengthGetFunc getlength;
+	/* if NULL, length cannot be changed by a user */
+	PropArrayLengthSetFunc setlength;
+	/* used only for dynamic arrays for now, default 1 */
+	unsigned short arraydimension;
+	/* dimension sizes for dimensions greater than 1, first dimension size is not specified */
+	unsigned short dimsize[RNA_MAX_ARRAY_DIMENSION - 1];
 	
 	/* callback for updates on change */
 	UpdateFunc update;
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 84190d60d11..4d53986be4f 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -398,6 +398,51 @@ static void rna_MeshTextureFace_uv4_set(PointerRNA *ptr, const float *values)
 	mtface->uv[3][1]= values[1];
 }
 
+static int rna_CustomDataData_numverts(PointerRNA *ptr, int type)
+{
+    Mesh *me= (Mesh*)ptr->id.data;
+    CustomData *fdata= rna_mesh_fdata(me);
+    CustomDataLayer *cdl;
+    int a;
+    size_t b;
+
+    for(cdl=fdata->layers, a=0; a<fdata->totlayer; cdl++, a++) {
+        if(cdl->type == type) {
+            b= ((char*)ptr->data - ((char*)cdl->data))/CustomData_sizeof(type);
+            if(b >= 0 && b < me->totface)
+                return (me->mface[b].v4? 4: 3);
+        }
+    }
+
+    return 0;
+}
+
+static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr)
+{
+    return rna_CustomDataData_numverts(ptr, CD_MTFACE) * 2;
+}
+
+static int rna_MeshTextureFace_uv_set_length(PointerRNA *ptr, int length)
+{
+    return length == rna_MeshTextureFace_uv_get_length(ptr);
+}
+
+static void rna_MeshTextureFace_uv_get(PointerRNA *ptr, float *values)
+{
+	MTFace *mtface= (MTFace*)ptr->data;
+	int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE);
+
+	memcpy(values, mtface->uv, totvert * 2 * sizeof(float));
+}
+
+static void rna_MeshTextureFace_uv_set(PointerRNA *ptr, const float *values)
+{
+	MTFace *mtface= (MTFace*)ptr->data;
+	int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE);
+
+	memcpy(mtface->uv, values, totvert * 2 * sizeof(float));
+}
+
 static void rna_MeshTextureFaceLayer_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	Mesh *me= (Mesh*)ptr->id.data;
@@ -660,6 +705,40 @@ static void rna_TextureFace_image_set(PointerRNA *ptr, PointerRNA value)
 	tf->tpage= (struct Image*)id;
 }
 
+static int rna_MeshFace_verts_get_length(PointerRNA *ptr)
+{
+	MFace *face= (MFace*)ptr->data;
+	return face->v4 ? 4 : 3;
+}
+
+static int rna_MeshFace_verts_set_length(PointerRNA *ptr, int length)
+{
+	MFace *face= (MFace*)ptr->data;
+	if (length == 3) {
+		face->v4= 0;
+	}
+	else if(length == 4) {
+		face->v4= 1;
+	}
+	else
+		return 0;
+	
+	return 1;
+}
+
+static void rna_MeshFace_verts_get(PointerRNA *ptr, int *values)
+{
+	MFace *face= (MFace*)ptr->data;
+	int verts[4] = {face->v1, face->v2, face->v3, face->v4};
+	memcpy(values, verts, (face->v4 ? 4 : 3) * sizeof(int));
+}
+
+static void rna_MeshFace_verts_set(PointerRNA *ptr, const int *values)
+{
+	MFace *face= (MFace*)ptr->data;
+	memcpy(&face->v1, values, (face->v4 ? 4 : 3) * sizeof(int));
+}
+
 /* path construction */
 
 static char *rna_VertexGroupElement_path(PointerRNA *ptr)
@@ -882,11 +961,21 @@ static void rna_def_mface(BlenderRNA *brna)
 	RNA_def_struct_path_func(srna, "rna_MeshFace_path");
 	RNA_def_struct_ui_icon(srna, ICON_FACESEL);
 
+	/*
+	// XXX allows creating invalid meshes
 	prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "v1");
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Vertices", "Vertex indices");
+	*/
+
 	// XXX allows creating invalid meshes
+	prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshFace_verts_get_length", "rna_MeshFace_verts_set_length");
+	RNA_def_property_int_funcs(prop, "rna_MeshFace_verts_get", "rna_MeshFace_verts_set", NULL);
+	RNA_def_property_ui_text(prop, "Vertices", "Vertex indices");
 
 	prop= RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "mat_nr");
@@ -923,6 +1012,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 		{TF_ALPHA, "ALPHA", 0, "Alpha", "Render polygon transparent, depending on alpha channel of the texture"},
 		{TF_CLIP, "CLIPALPHA", 0, "Clip Alpha", "Use the images alpha values clipped with no blending (binary alpha)"},
 		{0, NULL, 0, NULL, NULL}};
+	unsigned short uv_dim[1]= {2};
 
 	srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL);
 	RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock.");
@@ -1041,6 +1131,13 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv4_get", "rna_MeshTextureFace_uv4_set", NULL);
 	RNA_def_property_ui_text(prop, "UV 4", "");
+
+	prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_XYZ);
+	RNA_def_property_multidimensional_array(prop, 4 * 2, 2, uv_dim);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length", "rna_MeshTextureFace_uv_set_length");
+	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv_get", "rna_MeshTextureFace_uv_set", NULL);
+	RNA_def_property_ui_text(prop, "UV", "");
 }
 
 static void rna_def_msticky(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index bad36025eda..f0b055bd0e8 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1029,6 +1029,8 @@ static void rna_def_object(BlenderRNA *brna)
 		{OB_DUPLIGROUP, "GROUP", 0, "Group", "Enable group instancing."},
 		{0, NULL, 0, NULL, NULL}};
 
+	unsigned short matrix_dimsize[]= {4};
+
 	srna= RNA_def_struct(brna, "Object", "ID");
 	RNA_def_struct_ui_text(srna, "Object", "Object datablock defining an object in a scene..");
 	RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
@@ -1190,7 +1192,7 @@ static void rna_def_object(BlenderRNA *brna)
 	/* matrix */
 	prop= RNA_def_property(srna, "matrix", PROP_FLOAT, PROP_MATRIX);
 	RNA_def_property_float_sdna(prop, NULL, "obmat");
-	RNA_def_property_array(prop, 16);
+	RNA_def_property_multidimensional_array(prop, 16, 2, matrix_dimsize);
 	RNA_def_property_ui_text(prop, "Matrix", "Transformation matrix.");
 
 	/* collections */
diff --git a/source/blender/python/intern/bpy_array.c b/source/blender/python/intern/bpy_array.c
new file mode 100644
index 00000000000..d52bfda202d
--- /dev/null
+++ b/source/blender/python/intern/bpy_array.c
@@ -0,0 +1,235 @@
+/**
+ * 
+ *
+ * ***** 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): Arystanbek Dyussenov
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "Python.h"
+
+#include "bpy_rna.h"
+
+#include "RNA_access.h"
+
+#include "BLI_string.h"
+
+#include "MEM_guardedalloc.h"
+
+typedef void (*ItemConvertFunc)(PyObject *, char *);
+typedef int (*ItemTypeCheckFunc)(PyObject *);
+typedef void (*RNA_SetArrayFunc)(PointerRNA *, PropertyRNA *, const char *);
+
+/* Ensures that a python sequence has an expected number of items/sub-items and items are of expected type. */
+static int pyrna_validate_array(PyObject *seq, unsigned short dim, unsigned short totdim, unsigned short dim_size[],
+								ItemTypeCheckFunc check_item_type, const char *item_type_str, char *error_str, int error_str_size)
+{
+	int i;
+	if (dim < totdim) {
+		for (i= 0; i < PySequence_Length(seq); i++) {
+			PyObject *item;
+			int ok= 1;
+			item= PySequence_GetItem(seq, i);
+
+			if (!PySequence_Check(item)) {
+				BLI_snprintf(error_str, error_str_size, "expected a %d-dimensional sequence of %s", (int)totdim, item_type_str);
+				ok= 0;
+			}
+			else if (PySequence_Length(item) != dim_size[dim - 1]) {
+				BLI_snprintf(error_str, error_str_size, "dimension %d should contain %d items", (int)dim, (int)dim_size[dim - 1]);
+				ok= 0;
+			}
+
+			if (!pyrna_validate_array(item, dim + 1, totdim, dim_size, check_item_type, item_type_str, error_str, error_str_size)) {
+				ok= 0;
+			}
+
+			Py_DECREF(item);
+
+			if (!ok)
+				return 0;
+		}
+	}
+	else {
+		for (i= 0; i < PySequence_Length(seq); i++) {
+			PyObject *item= PySequence_GetItem(seq, i);
+
+			if (!check_item_type(item)) {
+				Py_DECREF(item);
+							
+				BLI_snprintf(error_str, error_str_size, "sequence items should be of type %s", item_type_str);
+				return 0;
+			}
+
+			Py_DECREF(item);
+		}
+	}
+
+	return 1;
+}
+
+/* Returns the number of items in a single- or multi-dimensional sequence. */
+static int pyrna_count_items(PyObject *seq)
+{
+	int totitem= 0;
+
+	if (PySequence_Check(seq)) {
+		int i;
+		for (i= 0; i < PySequence_Length(seq); i++) {
+			PyObject *item= PySequence_GetItem(seq, i);
+			totitem += pyrna_count_items(item);
+			Py_DECREF(item);
+		}
+	}
+	else
+		totitem= 1;
+
+	return totitem;
+}
+
+static int pyrna_apply_array_length(PointerRNA *ptr, PropertyRNA *prop, int totitem, char *error_str, int error_str_size)
+{
+	if (RNA_property_flag(prop) & PROP_DYNAMIC) {
+		/* length can be flexible */
+		if (RNA_property_array_length(ptr, prop) != totitem) {
+			if (!RNA_property_dynamic_array_set_length(ptr, prop, totitem)) {
+				BLI_snprintf(error_str, error_str_size, "%s.%s: array length cannot be changed to %d", RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), totitem);
+				return 0;
+			}
+		}
+	}
+	else {
+		/* length is a constraint */
+		int len= RNA_property_array_length(ptr, prop);
+		if (totitem != len) {
+			BLI_snprintf(error_str, error_str_size, "sequence must have length of %d", len);
+			return 0;
+		}
+	}
+	return 1;
+}
+
+static char *pyrna_py_to_array(PyObject *seq, unsigned short dim, unsigned short totdim, char *data, unsigned int item_size, ItemConvertFunc convert_item)
+{
+	unsigned int i;
+	for (i= 0; i < PySequence_Length(seq); i++) {
+		PyObject *item= PySequence_GetItem(seq, i);
+
+		if (dim < totdim) {
+			data= pyrna_py_to_array(item, dim + 1, totdim, data, item_size, convert_item);
+		}
+		else {
+			convert_item(item, data);
+			data += item_size;
+		}
+			
+		Py_DECREF(item);
+	}
+
+	return data;
+}
+
+static int pyrna_py_to_array_generic(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size,
+									 ItemTypeCheckFunc check_item_type, const char *item_type_str, int item_size, ItemConvertFunc convert_item, RNA_SetArrayFunc rna_set_array)
+{
+	unsigned short totdim, dim_size[100];
+	int totitem;
+	char *data= NULL;
+
+	totdim= RNA_property_array_dimension(prop, dim_size);
+
+	if (!pyrna_validate_array(py, 1, totdim, dim_size, check_item_type, item_type_str, error_str, error_str_size))
+		return 0;
+
+	totitem= pyrna_count_items(py);
+
+	if (!pyrna_apply_array_length(ptr, prop, totitem, error_str, error_str_size))
+		return 0;
+
+	if (totitem) {
+		if (!param_data || RNA_property_flag(prop) & PROP_DYNAMIC)
+			data= MEM_callocN(item_size * totitem, "pyrna primitive type array");
+		else
+			data= param_data;
+
+		pyrna_py_to_array(py, 1, totdim, data, item_size, convert_item);
+
+		if (param_data) {
+			if (RNA_property_flag(prop) & PROP_DYNAMIC) {
+				/* not freeing allocated mem, RNA_parameter_list_free will do this */
+				*(char**)param_data= data;
+			}
+		}
+		else {
+			/* NULL can only pass through in case RNA property arraylength is 0 (impossible?) */
+			rna_set_array(ptr, prop, data);
+			MEM_freeN(data);
+		}
+	}
+
+	return 1;
+}
+
+static void pyrna_py_to_float(PyObject *py, char *data)
+{
+	*(float*)data= (float)PyFloat_AsDouble(py);
+}
+
+static void pyrna_py_to_int(PyObject *py, char *data)
+{
+	*(int*)data= (int)PyLong_AsSsize_t(py);
+}
+
+static void pyrna_py_to_boolean(PyObject *py, char *data)
+{
+	*(int*)data= (int)PyObject_IsTrue(py);
+}
+
+static int py_float_check(PyObject *py)
+{
+	return PyFloat_Check(py);
+}
+
+static int py_int_check(PyObject *py)
+{
+	return PyLong_Check(py);
+}
+
+static int py_bool_check(PyObject *py)
+{
+	return PyBool_Check(py);
+}
+
+int pyrna_py_to_float_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
+{
+	return pyrna_py_to_array_generic(py, ptr, prop, param_data, error_str, error_str_size,
+									 py_float_check, "float", sizeof(float), pyrna_py_to_float, (RNA_SetArrayFunc)RNA_property_float_set_array);
+}
+
+int pyrna_py_to_int_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
+{
+	return pyrna_py_to_array_generic(py, ptr, prop, param_data, error_str, error_str_size,
+									 py_int_check, "int", sizeof(int), pyrna_py_to_int, (RNA_SetArrayFunc)RNA_property_int_set_array);
+}
+
+int pyrna_py_to_boolean_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
+{
+	return pyrna_py_to_array_generic(py, ptr, prop, param_data, error_str, error_str_size,
+									 py_bool_check, "boolean", sizeof(int), pyrna_py_to_boolean, (RNA_SetArrayFunc)RNA_property_boolean_set_array);
+}
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 70ff8e48084..3902a9fd9b5 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -246,7 +246,7 @@ PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
 {
 	PyObject *ret;
 	int type = RNA_property_type(prop);
-	int len = RNA_property_array_length(prop);
+	int len = RNA_property_array_length(ptr, prop);
 
 	if (len > 0) {
 		/* resolve the array from a new pytype */
@@ -469,128 +469,43 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
 {
 	/* XXX hard limits should be checked here */
 	int type = RNA_property_type(prop);
-	int len = RNA_property_array_length(prop);
+	int len = RNA_property_array_length(ptr, prop);
 	
 	if (len > 0) {
-		PyObject *item;
-		int py_len = -1;
-		int i;
-		
+		char error_str[512];
+		int ok= 1;
 
 #ifdef USE_MATHUTILS
 		if(MatrixObject_Check(value)) {
 			MatrixObject *mat = (MatrixObject*)value;
 			if(!BaseMath_ReadCallback(mat))
 				return -1;
-
-			py_len = mat->rowSize * mat->colSize;
 		} else /* continue... */
 #endif
-		if (PySequence_Check(value)) {
-			py_len= (int)PySequence_Length(value);
-		}
-		else {
+		if (!PySequence_Check(value)) {
 			PyErr_Format(PyExc_TypeError, "%.200s RNA array assignment expected a sequence instead of %.200s instance.", error_prefix, Py_TYPE(value)->tp_name);
 			return -1;
 		}
 		/* done getting the length */
 		
-		if (py_len != len) {
-			PyErr_Format(PyExc_TypeError, "%.200s python sequence length %d did not match the RNA array length %d.", error_prefix, py_len, len);
-			return -1;
-		}
-		
 		/* for arrays we have a limited number of types */
 		switch (type) {
 		case PROP_BOOLEAN:
-		{
-			int *param_arr;
-			if(data)	param_arr= (int*)data;
-			else		param_arr= MEM_mallocN(sizeof(int) * len, "pyrna bool array");
-
-			
-			/* collect the variables before assigning, incase one of them is incorrect */
-			for (i=0; i<len; i++) {
-				item = PySequence_GetItem(value, i);
-				param_arr[i] = PyObject_IsTrue( item );
-				Py_DECREF(item);
-				
-				if (param_arr[i] < 0) {
-					if(data==NULL)
-						MEM_freeN(param_arr);
-					PyErr_Format(PyExc_AttributeError, "%.200s one or more of the values in the sequence is not a boolean", error_prefix);
-					return -1;
-				}
-			}
-			if(data==NULL) {
-				RNA_property_boolean_set_array(ptr, prop, param_arr);
-				MEM_freeN(param_arr);
-			}
-
+			ok= pyrna_py_to_boolean_array(value, ptr, prop, data, error_str, sizeof(error_str));
 			break;
-		}
 		case PROP_INT:
-		{
-			int *param_arr;
-			if(data)	param_arr= (int*)data;
-			else		param_arr= MEM_mallocN(sizeof(int) * len, "pyrna int array");
-
-			
-			/* collect the variables */
-			for (i=0; i<len; i++) {
-				item = PySequence_GetItem(value, i);
-				param_arr[i] = (int)PyLong_AsSsize_t(item); /* deal with any errors later */
-				Py_DECREF(item);
-			}
-			
-			if (PyErr_Occurred()) {
-				if(data==NULL)
-					MEM_freeN(param_arr);
-				PyErr_Format(PyExc_AttributeError, "%.200s one or more of the values in the sequence could not be used as an int", error_prefix);
-				return -1;
-			}
-			if(data==NULL) {
-				RNA_property_int_set_array(ptr, prop, param_arr);
-				MEM_freeN(param_arr);
-			}
+			ok= pyrna_py_to_int_array(value, ptr, prop, data, error_str, sizeof(error_str));
 			break;
-		}
 		case PROP_FLOAT:
-		{
-			float *param_arr;
-			if(data)	param_arr = (float*)data;
-			else		param_arr = MEM_mallocN(sizeof(float) * len, "pyrna float array");
-
-
-#ifdef USE_MATHUTILS
-			if(MatrixObject_Check(value) && RNA_property_subtype(prop) == PROP_MATRIX) {
-				MatrixObject *mat = (MatrixObject*)value;
-				memcpy(param_arr, mat->contigPtr, sizeof(float) * len);
-			} else /* continue... */
-#endif
-			{
-				/* collect the variables */
-				for (i=0; i<len; i++) {
-					item = PySequence_GetItem(value, i);
-					param_arr[i] = (float)PyFloat_AsDouble(item); /* deal with any errors later */
-					Py_DECREF(item);
-				}
-			}
-
-			if (PyErr_Occurred()) {
-				if(data==NULL)
-					MEM_freeN(param_arr);
-				PyErr_Format(PyExc_AttributeError, "%.200s one or more of the values in the sequence could not be used as a float", error_prefix);
-				return -1;
-			}
-			if(data==NULL) {
-				RNA_property_float_set_array(ptr, prop, param_arr);				
-				MEM_freeN(param_arr);
-			}
+			ok= pyrna_py_to_float_array(value, ptr, prop, data, error_str, sizeof(error_str));
 			break;
 		}
+		if (!ok) {
+			PyErr_Format(PyExc_AttributeError, "%.200s %s", error_prefix, error_str);
+			return -1;
 		}
-	} else {
+	}
+	else {
 		/* Normal Property (not an array) */
 		
 		/* see if we can coorce into a python type - PropertyType */
@@ -862,7 +777,7 @@ static Py_ssize_t pyrna_prop_len( BPy_PropertyRNA * self )
 	if (RNA_property_type(self->prop) == PROP_COLLECTION) {
 		len = RNA_property_collection_length(&self->ptr, self->prop);
 	} else {
-		len = RNA_property_array_length(self->prop);
+		len = RNA_property_array_length(&self->ptr, self->prop);
 		
 		if (len==0) { /* not an array*/
 			PyErr_SetString(PyExc_AttributeError, "len() only available for collection RNA types");
@@ -888,7 +803,7 @@ static PyObject *prop_subscript_collection_int(BPy_PropertyRNA * self, int keynu
 }
 static PyObject *prop_subscript_array_int(BPy_PropertyRNA * self, int keynum)
 {
-	int len= RNA_property_array_length(self->prop);
+	int len= RNA_property_array_length(&self->ptr, self->prop);
 
 	if(keynum < 0) keynum += len;
 
@@ -993,7 +908,7 @@ static PyObject *prop_subscript_array(BPy_PropertyRNA * self, PyObject *key)
 		return prop_subscript_array_int(self, PyLong_AsSsize_t(key));
 	}
 	else if (PySlice_Check(key)) {
-		int len= RNA_property_array_length(self->prop);
+		int len= RNA_property_array_length(&self->ptr, self->prop);
 		Py_ssize_t start, stop, step, slicelength;
 
 		if (PySlice_GetIndicesEx((PySliceObject*)key, len, &start, &stop, &step, &slicelength) < 0)
@@ -1020,7 +935,7 @@ static PyObject *pyrna_prop_subscript( BPy_PropertyRNA * self, PyObject *key )
 {
 	if (RNA_property_type(self->prop) == PROP_COLLECTION) {
 		return prop_subscript_collection(self, key);
-	} else if (RNA_property_array_length(self->prop)) { /* arrays are currently fixed length, zero length means its not an array */
+	} else if (RNA_property_array_length(&self->ptr, self->prop)) { /* arrays are currently fixed length, zero length means its not an array */
 		return prop_subscript_array(self, key);
 	} else {
 		PyErr_SetString(PyExc_TypeError, "rna type is not an array or a collection");
@@ -1049,7 +964,7 @@ static int prop_subscript_ass_array_slice(BPy_PropertyRNA * self, int begin, int
 static int prop_subscript_ass_array_int(BPy_PropertyRNA * self, int keynum, PyObject *value)
 {
 
-	int len= RNA_property_array_length(self->prop);
+	int len= RNA_property_array_length(&self->ptr, self->prop);
 
 	if(keynum < 0) keynum += len;
 
@@ -1083,7 +998,7 @@ static int pyrna_prop_ass_subscript( BPy_PropertyRNA * self, PyObject *key, PyOb
 		return prop_subscript_ass_array_int(self, i, value);
 	}
 	else if (PySlice_Check(key)) {
-		int len= RNA_property_array_length(self->prop);
+		int len= RNA_property_array_length(&self->ptr, self->prop);
 		Py_ssize_t start, stop, step, slicelength;
 
 		if (PySlice_GetIndicesEx((PySliceObject*)key, len, &start, &stop, &step, &slicelength) < 0)
@@ -1496,7 +1411,7 @@ static void foreach_attr_type(	BPy_PropertyRNA *self, char *attr,
 	RNA_PROP_BEGIN(&self->ptr, itemptr, self->prop) {
 		prop = RNA_struct_find_property(&itemptr, attr);
 		*raw_type= RNA_property_raw_type(prop);
-		*attr_tot = RNA_property_array_length(prop);
+		*attr_tot = RNA_property_array_length(&itemptr, prop);
 		*attr_signed= (RNA_property_subtype(prop)==PROP_UNSIGNED) ? FALSE:TRUE;
 		break;
 	}
@@ -1535,7 +1450,7 @@ static int foreach_parse_args(
 		if (RNA_property_type(self->prop) == PROP_COLLECTION)
 			array_tot = RNA_property_collection_length(&self->ptr, self->prop);
 		else
-			array_tot = RNA_property_array_length(self->prop);
+			array_tot = RNA_property_array_length(&self->ptr, self->prop);
 
 
 		target_tot= array_tot * (*attr_tot);
@@ -1728,7 +1643,7 @@ PyObject *pyrna_prop_iter(BPy_PropertyRNA *self)
 	
 	if (ret==NULL) {
 		/* collection did not work, try array */
-		int len = RNA_property_array_length(self->prop);
+		int len = RNA_property_array_length(&self->ptr, self->prop);
 		
 		if (len) {
 			int i;
@@ -1819,7 +1734,7 @@ PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *data)
 {
 	PyObject *ret;
 	int type = RNA_property_type(prop);
-	int len = RNA_property_array_length(prop);
+	int len = RNA_property_array_length(ptr, prop);
 
 	int a;
 
diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h
index 1b8d69bc511..d65849ad8a4 100644
--- a/source/blender/python/intern/bpy_rna.h
+++ b/source/blender/python/intern/bpy_rna.h
@@ -91,4 +91,9 @@ PyObject *pyrna_basetype_unregister(PyObject *self, PyObject *args);
 void pyrna_alloc_types(void);
 void pyrna_free_types(void);
 
+/* primitive type conversion */
+int pyrna_py_to_boolean_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size);
+int pyrna_py_to_int_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size);
+int pyrna_py_to_float_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size);
+
 #endif

From 0ff90bb2586e9e50e962106b6bcafa97484c31ca Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Tue, 25 Aug 2009 17:32:01 +0000
Subject: [PATCH 263/577] blender 2.5 MSVC projectfiles * update for
 bpy_array.c

---
 projectfiles_vc9/blender/BPY_python/BPY_python.vcproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
index d0872a43403..7f1eff21e6f 100644
--- a/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
+++ b/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
@@ -334,6 +334,10 @@
 			<Filter
 				Name="internal"
 				>
+				<File
+					RelativePath="..\..\..\source\blender\python\intern\bpy_array.c"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\source\blender\python\intern\bpy_interface.c"
 					>

From 1d1e8595f23579e940ca403023305f2499c39a54 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 25 Aug 2009 18:41:36 +0000
Subject: [PATCH 264/577] Pointcache: *introducing unique ID's following
 brechts hint from ML

Enhancements resulting from this:
* multiple caches per modifier stack position
---
 source/blender/blenkernel/BKE_object.h        |  5 ++
 source/blender/blenkernel/intern/object.c     | 65 ++++++++++++++++++-
 source/blender/blenkernel/intern/pointcache.c | 25 ++++---
 source/blender/blenloader/intern/readfile.c   |  1 +
 .../blender/editors/space_view3d/drawvolume.c |  3 +-
 source/blender/gpu/intern/gpu_extensions.c    |  3 +-
 source/blender/makesdna/DNA_object_types.h    |  1 +
 7 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index a57529ccf75..68173a1b5c4 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -115,6 +115,11 @@ void object_handle_update(struct Scene *scene, struct Object *ob);
 
 float give_timeoffset(struct Object *ob);
 int give_obdata_texspace(struct Object *ob, int **texflag, float **loc, float **size, float **rot);
+
+int object_insert_pc(struct Object *ob);
+// void object_delete_pc(struct Object *ob, int index);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 0e45aedc3ed..8f5ff988745 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -307,6 +307,8 @@ void free_object(Object *ob)
 	if(ob->gpulamp.first) GPU_lamp_free(ob);
 
 	free_sculptsession(&ob->sculpt);
+
+	if(ob->pc_ids.first) BLI_freelistN(&ob->pc_ids);
 }
 
 static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, Object **obpoin)
@@ -1016,6 +1018,8 @@ Object *add_only_object(int type, char *name)
 	ob->fluidsimFlag = 0;
 	ob->fluidsimSettings = NULL;
 
+	ob->pc_ids.first = ob->pc_ids.last = NULL;
+
 	return ob;
 }
 
@@ -1268,7 +1272,8 @@ Object *copy_object(Object *ob)
 	obn->derivedFinal = NULL;
 
 	obn->gpulamp.first = obn->gpulamp.last = NULL;
-
+	obn->pc_ids.first = obn->pc_ids.last = NULL;
+	
 	return obn;
 }
 
@@ -2535,3 +2540,61 @@ int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3
 	
 	return result;
 }
+
+static int pc_cmp(void *a, void *b)
+{
+	LinkData *ad = a, *bd = b;
+	if((int)ad->data > (int)bd->data)
+		return 1;
+	else return 0;
+}
+
+int object_insert_pc(Object *ob) 
+{
+	LinkData *link = NULL;
+	int i = 0;
+
+	BLI_sortlist(&ob->pc_ids, pc_cmp);
+
+	for(link=ob->pc_ids.first, i = 0; link; link=link->next, i++) 
+	{
+		int index =(int)link->data;
+
+		if(i < index)
+			break;
+	}
+
+	link = MEM_callocN(sizeof(LinkData), "PCLink");
+	link->data = (void *)i;
+	BLI_addtail(&ob->pc_ids, link);
+
+	return i;
+}
+
+static int pc_findindex(ListBase *listbase, int index)
+{
+	LinkData *link= NULL;
+	int number= 0;
+	
+	if (listbase == NULL) return -1;
+	
+	link= listbase->first;
+	while (link) {
+		if ((int)link->data == index)
+			return number;
+		
+		number++;
+		link= link->next;
+	}
+	
+	return -1;
+}
+
+#if 0
+void object_delete_pc(Object *ob, int index) 
+{
+	int list_index = pc_findindex(&ob->pc_ids, index);
+	LinkData *link = BLI_findlink(&ob->pc_ids, list_index);
+	BLI_freelinkN(&ob->pc_ids, link);
+}
+#endif
\ No newline at end of file
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index ca27bde039b..75b49817812 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -391,8 +391,6 @@ static int ptcache_totpoint_cloth(void *cloth_v)
 void BKE_ptcache_id_from_softbody(PTCacheID *pid, Object *ob, SoftBody *sb)
 {
 	ParticleSystemModifierData *psmd;
-	ModifierData *md;
-	int a;
 
 	memset(pid, 0, sizeof(PTCacheID));
 
@@ -418,16 +416,10 @@ void BKE_ptcache_id_from_softbody(PTCacheID *pid, Object *ob, SoftBody *sb)
 
 	if(sb->particles) {
 		psmd= psys_get_modifier(ob, sb->particles);
-		pid->stack_index= modifiers_indexInObject(ob, (ModifierData*)psmd);
-	}
-	else {
-		for(a=0, md=ob->modifiers.first; md; md=md->next, a++) {
-			if(md->type == eModifierType_Softbody) {
-				pid->stack_index = a;
-				break;
-			}
-		}
+		// pid->stack_index= modifiers_indexInObject(ob, (ModifierData*)psmd);  XXX TODO - get other index DG
 	}
+	else 
+		pid->stack_index = pid->cache->index;
 }
 
 void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *psys)
@@ -439,7 +431,7 @@ void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *p
 	pid->ob= ob;
 	pid->calldata= psys;
 	pid->type= PTCACHE_TYPE_PARTICLES;
-	pid->stack_index= modifiers_indexInObject(ob, (ModifierData *)psmd);
+	pid->stack_index= psys->pointcache->index;
 	pid->cache= psys->pointcache;
 	pid->cache_ptr= &psys->pointcache;
 	pid->ptcaches= &psys->ptcaches;
@@ -728,7 +720,7 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeMo
 	pid->calldata= smd;
 	
 	pid->type= PTCACHE_TYPE_SMOKE_DOMAIN;
-	pid->stack_index= modifiers_indexInObject(ob, (ModifierData *)smd);
+	pid->stack_index= sds->point_cache->index;
 
 	pid->cache= sds->point_cache;
 	pid->cache_ptr= &sds->point_cache;
@@ -758,7 +750,7 @@ void BKE_ptcache_id_from_cloth(PTCacheID *pid, Object *ob, ClothModifierData *cl
 	pid->ob= ob;
 	pid->calldata= clmd;
 	pid->type= PTCACHE_TYPE_CLOTH;
-	pid->stack_index= modifiers_indexInObject(ob, (ModifierData *)clmd);
+	pid->stack_index= clmd->point_cache->index;
 	pid->cache= clmd->point_cache;
 	pid->cache_ptr= &clmd->point_cache;
 	pid->ptcaches= &clmd->ptcaches;
@@ -901,6 +893,10 @@ static int BKE_ptcache_id_filename(PTCacheID *pid, char *filename, int cfra, sho
 	}
 
 	if (do_ext) {
+
+		if(pid->cache->index < 0)
+			pid->cache->index =  pid->stack_index = object_insert_pc(pid->ob);
+
 		if(pid->cache->flag & PTCACHE_EXTERNAL) {
 			if(pid->cache->index >= 0)
 				snprintf(newname, MAX_PTCACHE_FILE, "_%06d_%02d"PTCACHE_EXT, cfra, pid->stack_index); /* always 6 chars */
@@ -1952,6 +1948,7 @@ PointCache *BKE_ptcache_add(ListBase *ptcaches)
 	cache->startframe= 1;
 	cache->endframe= 250;
 	cache->step= 10;
+	cache->index = -1;
 
 	BLI_addtail(ptcaches, cache);
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 920e202520e..26e3d5bf6f1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3993,6 +3993,7 @@ static void direct_link_object(FileData *fd, Object *ob)
 	ob->derivedDeform= NULL;
 	ob->derivedFinal= NULL;
 	ob->gpulamp.first= ob->gpulamp.last= NULL;
+	link_list(fd, &ob->pc_ids);
 
 	if(ob->sculpt)
 		ob->sculpt= MEM_callocN(sizeof(SculptSession), "reload sculpt session");
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 5e0ffb9ba48..f4242c70139 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -236,8 +236,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 
 	GPU_texture_bind(tex, 0);
 
-	if (!GLEW_ARB_texture_non_power_of_two) 
-	{
+	if (!GLEW_ARB_texture_non_power_of_two) {
 		cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
 		cor[1] = (float)res[1]/(float)larger_pow2(res[1]);
 		cor[2] = (float)res[2]/(float)larger_pow2(res[2]);
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 36936a9fcb0..850b46dc28c 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -337,8 +337,7 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 		return NULL;
 	}
 
-	if (!GLEW_ARB_texture_non_power_of_two) 
-	{
+	if (!GLEW_ARB_texture_non_power_of_two) {
 		tex->w = larger_pow2(tex->w);
 		tex->h = larger_pow2(tex->h);
 		tex->depth = larger_pow2(tex->depth);
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index be43ae7f99d..25fdf615adb 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -237,6 +237,7 @@ typedef struct Object {
 	int pad2;
 
 	ListBase gpulamp;		/* runtime, for lamps only */
+	ListBase pc_ids;
 } Object;
 
 /* Warning, this is not used anymore because hooks are now modifiers */

From e2d91a5e5f61cf6ff1398c742ada7fd806299767 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 25 Aug 2009 18:53:20 +0000
Subject: [PATCH 265/577] Pointcache: * change function names

---
 source/blender/blenkernel/BKE_object.h    | 4 ++--
 source/blender/blenkernel/intern/object.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 68173a1b5c4..1cb6efeb838 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -116,8 +116,8 @@ void object_handle_update(struct Scene *scene, struct Object *ob);
 float give_timeoffset(struct Object *ob);
 int give_obdata_texspace(struct Object *ob, int **texflag, float **loc, float **size, float **rot);
 
-int object_insert_pc(struct Object *ob);
-// void object_delete_pc(struct Object *ob, int index);
+int object_insert_ptcache(struct Object *ob);
+// void object_delete_ptcache(struct Object *ob, int index);
 
 
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8f5ff988745..32f70bc690c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2549,7 +2549,7 @@ static int pc_cmp(void *a, void *b)
 	else return 0;
 }
 
-int object_insert_pc(Object *ob) 
+int object_insert_ptcache(Object *ob) 
 {
 	LinkData *link = NULL;
 	int i = 0;
@@ -2591,7 +2591,7 @@ static int pc_findindex(ListBase *listbase, int index)
 }
 
 #if 0
-void object_delete_pc(Object *ob, int index) 
+void object_delete_ptcache(Object *ob, int index) 
 {
 	int list_index = pc_findindex(&ob->pc_ids, index);
 	LinkData *link = BLI_findlink(&ob->pc_ids, list_index);

From 0e9f7757b9f1988d3c1ffa86dd48956341e86e9b Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 25 Aug 2009 19:58:42 +0000
Subject: [PATCH 266/577] Pointcache: *forgot 1 rename

---
 source/blender/blenkernel/intern/pointcache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 75b49817812..4110570760f 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -895,7 +895,7 @@ static int BKE_ptcache_id_filename(PTCacheID *pid, char *filename, int cfra, sho
 	if (do_ext) {
 
 		if(pid->cache->index < 0)
-			pid->cache->index =  pid->stack_index = object_insert_pc(pid->ob);
+			pid->cache->index =  pid->stack_index = object_insert_ptcache(pid->ob);
 
 		if(pid->cache->flag & PTCACHE_EXTERNAL) {
 			if(pid->cache->index >= 0)

From 37144b81784356be71e254148de3ed20db34cf06 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 25 Aug 2009 20:22:40 +0000
Subject: [PATCH 267/577] Smoke: * reset cache when changing heat or gravity

---
 source/blender/makesrna/intern/rna_smoke.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index a119eefa62c..70a5ddf72dd 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -46,6 +46,7 @@
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 
 #include "ED_object.h"
 
@@ -60,6 +61,21 @@ static void rna_Smoke_dependency_update(bContext *C, PointerRNA *ptr)
     DAG_scene_sort(CTX_data_scene(C));
 }
 
+static void rna_Smoke_reset_cache(bContext *C, PointerRNA *ptr)
+{
+	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
+	PointCache *cache = settings->point_cache;
+
+	printf("rna_Smoke_reset_cache\n");
+
+	cache->flag &= ~PTCACHE_SIMULATION_VALID;
+	cache->flag |= PTCACHE_OUTDATED;
+	cache->simframe= 0;
+	cache->last_exact= 0;
+
+	rna_Smoke_update(C, ptr);
+}
+
 static void rna_Smoke_reset(bContext *C, PointerRNA *ptr)
 {
 	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
@@ -150,14 +166,14 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, -5.0, 5.0);
 	RNA_def_property_ui_range(prop, -5.0, 5.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Gravity", "Higher value results in sinking smoke");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_cache");
 
 	prop= RNA_def_property(srna, "beta", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "beta");
 	RNA_def_property_range(prop, -5.0, 5.0);
 	RNA_def_property_ui_range(prop, -5.0, 5.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Heat", "Higher value results in faster rising smoke.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_cache");
 
 	prop= RNA_def_property(srna, "coll_group", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "coll_group");

From 91cd6fe2c4ff44f721e4ef1b3aa8f48a2ddb8501 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Tue, 25 Aug 2009 20:42:21 +0000
Subject: [PATCH 268/577] libsndfile is not available yet for darwin, builders
 feel free to add the lib!

---
 config/darwin-config.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/darwin-config.py b/config/darwin-config.py
index ba1d12542d0..92f70d716fc 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -112,6 +112,12 @@ BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)

From cfcd355c27ba1f923d04dec1f735989b260b190c Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Tue, 25 Aug 2009 21:25:41 +0000
Subject: [PATCH 269/577] Update Makefile and missing include on voxeldata.c

Note that With libsndfile also need libflac and libogg here (Linux), right
now I just add this two librarys to the NAN_SNDFILELIBS, but maybe
it's better split this ? (NAN_FLAC/NAN_OGG)
---
 intern/audaspace/intern/Makefile                | 3 ++-
 source/blender/render/intern/source/Makefile    | 1 +
 source/blender/render/intern/source/voxeldata.c | 1 +
 source/nan_definitions.mk                       | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile
index a99f44c54d7..4bdca04c1cb 100644
--- a/intern/audaspace/intern/Makefile
+++ b/intern/audaspace/intern/Makefile
@@ -47,7 +47,7 @@ endif
 
 ifeq ($(WITH_JACK),true)
 	CPPFLAGS += -DWITH_JACK
-	CPPFLAGS += -I$(NAN_JACKCFLAGS)
+	CPPFLAGS += $(NAN_JACKCFLAGS)
 	CPPFLAGS += -I../jack
 endif
 
@@ -58,6 +58,7 @@ endif
 
 ifeq ($(WITH_SNDFILE),true)
 	CPPFLAGS += -DWITH_SNDFILE
+	CPPFLAGS += -I../sndfile
 endif
 
 CPPFLAGS += -I$(LCGDIR)/samplerate/include/
diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile
index 5d4a224002e..c313549f9b9 100644
--- a/source/blender/render/intern/source/Makefile
+++ b/source/blender/render/intern/source/Makefile
@@ -50,6 +50,7 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 # not very neat: the rest of blender..
 CPPFLAGS += -I../../../editors/include 
 CPPFLAGS += $(NAN_SDLCFLAGS)
+CPPFLAGS += -I../../../../../intern/smoke/extern
 
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -DWITH_QUICKTIME
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index ff076579788..f1f01f873a5 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -42,6 +42,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_modifier.h"
 
 #include "smoke_API.h"
 
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 50a606496f5..f8afc7f3fa6 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -134,7 +134,7 @@ ifndef CONFIG_GUESS
   ifeq ($(WITH_SNDFILE),true)
     export NAN_SNDFILE ?= /usr
     export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
-    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a
+    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a $(NAN_SNDFILE)/lib/libFLAC.a $(NAN_SNDFILE)/lib/libogg.a
   endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)

From 6a5773d4a8633374a1f54864c077a0cd5fa122ea Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 25 Aug 2009 21:53:52 +0000
Subject: [PATCH 270/577] Smoke: * Deleting high res modifier again * fixing
 smoke + continue physics drawing * fixing cache reset when changing dissolve

---
 release/ui/buttons_physics_smoke.py           |   8 +-
 source/blender/blenkernel/BKE_smoke.h         |   4 -
 source/blender/blenkernel/intern/modifier.c   |  56 -------
 source/blender/blenkernel/intern/pointcache.c |  17 ---
 source/blender/blenkernel/intern/smoke.c      |  47 +++++-
 .../blender/blenkernel/intern/smokehighres.c  | 137 ------------------
 .../blender/editors/object/object_modifier.c  |   7 -
 .../editors/space_buttons/buttons_context.c   |  10 --
 .../blender/editors/space_view3d/drawobject.c |   7 +-
 source/blender/makesdna/DNA_modifier_types.h  |  29 ----
 source/blender/makesdna/DNA_smoke_types.h     |  17 ++-
 source/blender/makesrna/RNA_access.h          |   1 -
 source/blender/makesrna/intern/rna_modifier.c |  62 --------
 source/blender/makesrna/intern/rna_smoke.c    |  82 ++++++-----
 14 files changed, 110 insertions(+), 374 deletions(-)
 delete mode 100644 source/blender/blenkernel/intern/smokehighres.c

diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index 5e1ec227080..3cfba0f9df9 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -125,7 +125,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 	def poll(self, context):
 		md = context.smoke
 		if md:
-				return (md.smoke_type == 'TYPE_DOMAIN')
+			return (md.smoke_type == 'TYPE_DOMAIN')
 		
 		return False
 
@@ -202,7 +202,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 	def draw(self, context):
 		layout = self.layout
 		
-		md = context.smoke_hr
+		md = context.smoke.domain_settings
 		
 		if md:
 		
@@ -223,12 +223,12 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
 	__default_closed__ = True
 
 	def poll(self, context):
-		return (context.smoke_hr != None)
+		return (context.smoke != None)
 
 	def draw(self, context):
 		layout = self.layout
 
-		md = context.smoke_hr
+		md = context.smoke
 		
 		if md:
 			
diff --git a/source/blender/blenkernel/BKE_smoke.h b/source/blender/blenkernel/BKE_smoke.h
index bd8581112f8..fddcf0fea83 100644
--- a/source/blender/blenkernel/BKE_smoke.h
+++ b/source/blender/blenkernel/BKE_smoke.h
@@ -40,9 +40,5 @@ void smokeModifier_free (struct SmokeModifierData *smd);
 void smokeModifier_reset(struct SmokeModifierData *smd);
 void smokeModifier_createType(struct SmokeModifierData *smd);
 
-// high res modifier
-void smokeHRModifier_do(struct SmokeHRModifierData *shrmd, struct Scene *scene, struct Object *ob, int useRenderParams, int isFinalCalc);
-void smokeHRModifier_free(struct SmokeHRModifierData *shrmd);
-
 
 #endif /* BKE_SMOKE_H_ */
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index c78227a363f..7a0eb882083 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -5879,50 +5879,6 @@ static void smokeModifier_updateDepgraph(
 	*/
 }
 
-
-/* Smoke High Resolution */
-
-static void smokeHRModifier_initData(ModifierData *md) 
-{
-	SmokeHRModifierData *shrmd = (SmokeHRModifierData*) md;
-	
-	shrmd->wt = NULL;
-	shrmd->time = -1;
-	shrmd->strength = 2.0f;
-	shrmd->amplify = 1;
-	shrmd->noise = MOD_SMOKE_NOISEWAVE;
-	shrmd->point_cache = BKE_ptcache_add(&shrmd->ptcaches);
-	shrmd->point_cache->flag |= PTCACHE_DISK_CACHE;
-	shrmd->point_cache->step = 1;
-}
-
-static void smokeHRModifier_freeData(ModifierData *md)
-{
-	SmokeHRModifierData *shrmd = (SmokeHRModifierData*) md;
-	
-	smokeHRModifier_free (shrmd);
-}
-
-static void smokeHRModifier_deformVerts(
-					 ModifierData *md, Object *ob, DerivedMesh *derivedData,
-      float (*vertexCos)[3], int numVerts, int useRenderParams, int isFinalCalc)
-{
-	SmokeHRModifierData *shrmd = (SmokeHRModifierData*) md;
-	smokeHRModifier_do(shrmd, md->scene, ob, useRenderParams, isFinalCalc);
-}
-
-static int smokeHRModifier_dependsOnTime(ModifierData *md)
-{
-	return 1;
-}
-
-static void smokeHRModifier_updateDepgraph(
-					 ModifierData *md, DagForest *forest, Scene *scene, Object *ob,
-      DagNode *obNode)
-{
-	;
-}
-
 /* Cloth */
 
 static void clothModifier_initData(ModifierData *md) 
@@ -8624,18 +8580,6 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->deformVerts = smokeModifier_deformVerts;
 		mti->dependsOnTime = smokeModifier_dependsOnTime;
 		mti->updateDepgraph = smokeModifier_updateDepgraph;
-
-		mti = INIT_TYPE(SmokeHR);
-		mti->type = eModifierTypeType_OnlyDeform;
-		mti->initData = smokeHRModifier_initData;
-		mti->freeData = smokeHRModifier_freeData; 
-		mti->flags = eModifierTypeFlag_AcceptsMesh 
-				| eModifierTypeFlag_UsesPointCache
-				| eModifierTypeFlag_Single
-				| eModifierTypeFlag_NoUserAdd;
-		mti->deformVerts = smokeHRModifier_deformVerts;
-		mti->dependsOnTime = smokeHRModifier_dependsOnTime;
-		mti->updateDepgraph = smokeHRModifier_updateDepgraph;
 	
 		mti = INIT_TYPE(Cloth);
 		mti->type = eModifierTypeType_Nonconstructive;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 4110570760f..d9740091912 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -479,23 +479,6 @@ static int ptcache_totpoint_smoke(void *smoke_v)
 		return 0;
 }
 
-static int ptcache_totpoint_smoke_turbulence(void *smoke_v)
-{
-	SmokeHRModifierData *shrmd= (SmokeHRModifierData *)smoke_v;
-	
-	if(shrmd->wt) {
-		/*
-		unsigned int res[3];
-
-		smoke_turbulence_get_res(sds->wt, res);
-		return res[0]*res[1]*res[2];
-		*/
-		return 0;
-	}
-	else
-		return 0;
-}
-
 // forward decleration
 static int ptcache_file_write(PTCacheFile *pf, void *f, size_t tot, int size);
 
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 7af67364bc5..28d1c264376 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -213,6 +213,14 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		smd->time = scene->r.cfra;
 		smd->domain->firstframe = smd->time;
 
+		/*
+		if(!smd->domain->wt)
+		{
+			smd->domain->wt = smoke_turbulence_init(sds->res,  smd->domain->amplify + 1, smd->domain->noise);
+			smoke_turbulence_initBlenderRNA(smd->domain->wt, &smd->domain->strength);
+		}
+		*/
+
 		if(!smd->domain->view3d)
 		{
 			// TVox is for transparency
@@ -518,6 +526,9 @@ void smokeModifier_freeDomain(SmokeModifierData *smd)
 		if(smd->domain->fluid)
 			smoke_free(smd->domain->fluid);
 
+		if(smd->domain->wt)
+			smoke_turbulence_free(smd->domain->wt);
+
 		BKE_ptcache_free_list(&smd->domain->ptcaches);
 		smd->domain->point_cache = NULL;
 
@@ -585,6 +596,12 @@ void smokeModifier_reset(struct SmokeModifierData *smd)
 				smoke_free(smd->domain->fluid);
 				smd->domain->fluid = NULL;
 			}
+
+			if(smd->domain->wt)
+			{
+				smoke_turbulence_free(smd->domain->wt);
+				smd->domain->wt = NULL;
+			}
 		
 			smd->domain->point_cache->flag &= ~PTCACHE_SIMULATION_VALID;
 			smd->domain->point_cache->flag |= PTCACHE_OUTDATED;
@@ -663,6 +680,10 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 			smd->domain->beta = 0.1;
 			smd->domain->flags = MOD_SMOKE_DISSOLVE_LOG;
 			smd->domain->diss_speed = 5;
+			smd->domain->strength = 2.0f;
+			smd->domain->amplify = 1;
+			smd->domain->noise = MOD_SMOKE_NOISEWAVE;
+			smd->domain->wt = NULL;
 
 			// init 3dview buffer
 			smd->domain->view3d = NULL;
@@ -783,6 +804,28 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 			smoke_simulate_domain(smd, scene, ob, dm);
 
+			{
+				// float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
+				Base *base_tmp = NULL;
+
+				for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
+				{
+					if(base_tmp->object->type == OB_LAMP) 
+					{
+						Lamp *la = (Lamp *)base_tmp->object->data;
+						
+						if(la->type == LA_LOCAL)
+						{
+							VECCOPY(light, base_tmp->object->obmat[3]);
+							have_lamp = 1;
+							break;
+						}
+					}
+				}
+			}
+
+			smoke_prepare_View(smd, (float)framenr, light, have_lamp);
+
 			return;
 		}
 		
@@ -885,11 +928,11 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 		BKE_ptcache_write_cache(&pid, framenr);
 
-		// printf("Writing cache_low\n");
+		// printf("Writing cache_low, %d\n", framenr);
 	
 
 		tend();
-		printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
+		// printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/smokehighres.c b/source/blender/blenkernel/intern/smokehighres.c
deleted file mode 100644
index 6a2e0549158..00000000000
--- a/source/blender/blenkernel/intern/smokehighres.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * smokehighres.c
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Daniel Genrich
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/* Part of the code copied from elbeem fluid library, copyright by Nils Thuerey */
-
-#include "DNA_scene_types.h"
-#include "DNA_listBase.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_smoke_types.h"
-
-#include "BKE_modifier.h"
-#include "BKE_smoke.h"
-#include "BKE_pointcache.h"
-
-#include "smoke_API.h"
-
-// we need different handling for the high-res feature
-/*
-if(bigdensity)
-{
-	// init all surrounding cells according to amplification, too
-	int i, j, k;
-
-	smoke_turbulence_get_res(smd->domain->wt, bigres);
-
-	for(i = 0; i < smd->domain->amplify + 1; i++)
-		for(j = 0; j < smd->domain->amplify + 1; j++)
-			for(k = 0; k < smd->domain->amplify + 1; k++)
-			{
-				index = smoke_get_index((smd->domain->amplify + 1)* cell[0] + i, bigres[0], (smd->domain->amplify + 1)* cell[1] + j, bigres[1], (smd->domain->amplify + 1)* cell[2] + k);
-				bigdensity[index] = sfs->density;
-			}
-}
-*/
-
-static void smokeHRinit(SmokeHRModifierData *shrmd, SmokeDomainSettings *sds)
-{
-	if(!shrmd->wt)
-	{
-		shrmd->wt = smoke_turbulence_init(sds->res,  shrmd->amplify + 1, shrmd->noise);
-		smoke_turbulence_initBlenderRNA(shrmd->wt, &shrmd->strength);
-	}
-}
-
-void smokeHRModifier_free(SmokeHRModifierData *shrmd)
-{
-	if(shrmd->wt)
-		smoke_turbulence_free(shrmd->wt);
-
-	BKE_ptcache_free_list(&shrmd->ptcaches);
-	shrmd->point_cache = NULL;
-}
-
-void smokeHRModifier_do(SmokeHRModifierData *shrmd, Scene *scene, Object *ob, int useRenderParams, int isFinalCalc)
-{
-	ModifierData *md = NULL;
-	SmokeModifierData *smd = NULL;
-	SmokeDomainSettings *sds = NULL;
-
-	// find underlaying smoke domain
-	smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
-	if(!(smd && smd->type == MOD_SMOKE_TYPE_DOMAIN))
-		return;
-
-	sds = smd->domain;
-
-	smokeHRinit(shrmd, sds);
-
-	// smoke_turbulence_dissolve(shrmd->wt, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
-
-	// smoke_turbulence_step(shrmd->wt, sds->fluid);
-}
-
-
-// update necessary information for 3dview ("high res" option)
-void smoke_prepare_bigView(SmokeHRModifierData *shrmd, float *light)
-{
-	float *density = NULL;
-	size_t i = 0;
-	int bigres[3];
-/*
-	smoke_turbulence_get_res(shrmd->wt, bigres);
-
-	if(!smd->domain->traybig)
-	{
-		// TRay is for self shadowing
-		smd->domain->traybig = MEM_callocN(sizeof(float)*bigres[0]*bigres[1]*bigres[2], "Smoke_tRayBig");
-	}
-	if(!smd->domain->tvoxbig)
-	{
-		// TVox is for tranaparency
-		smd->domain->tvoxbig = MEM_callocN(sizeof(float)*bigres[0]*bigres[1]*bigres[2], "Smoke_tVoxBig");
-	}
-
-	density = smoke_turbulence_get_density(smd->domain->wt);
-	for (i = 0; i < bigres[0] * bigres[1] * bigres[2]; i++)
-	{
-		// Transparency computation
-		// formula taken from "Visual Simulation of Smoke" / Fedkiw et al. pg. 4
-		// T_vox = exp(-C_ext * h)
-		// C_ext/sigma_t = density * C_ext
-		smoke_set_bigtvox(smd, i, exp(-density[i] * 7.0 * smd->domain->dx / (smd->domain->amplify + 1)) );
-	}
-	smoke_calc_transparency(smd, light, 1);
-	*/
-}
-
-
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index ec46cea8e84..0b8fedd2eda 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -164,13 +164,6 @@ int ED_object_modifier_remove(ReportList *reports, Scene *scene, Object *ob, Mod
 
         DAG_scene_sort(scene);
 	}
-	else if(md->type == eModifierType_Smoke) {
-		ModifierData *tmd = modifiers_findByType(ob, eModifierType_SmokeHR);
-		if(tmd) {
-			BLI_remlink(&ob->modifiers, tmd);
-			modifier_free(tmd);
-		}
-	}
 
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 994bb0010d8..8306487013a 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -697,16 +697,6 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 			return 1;
 		}
 	}
-	else if(CTX_data_equals(member, "smoke_hr")) {
-		PointerRNA *ptr= get_pointer_type(path, &RNA_Object);
-
-		if(ptr && ptr->data) {
-			Object *ob= ptr->data;
-			ModifierData *md= modifiers_findByType(ob, eModifierType_SmokeHR);
-			CTX_data_pointer_set(result, &ob->id, &RNA_SmokeHRModifier, md);
-			return 1;
-		}
-	}
 	else if(CTX_data_equals(member, "collision")) {
 		PointerRNA *ptr= get_pointer_type(path, &RNA_Object);
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 9fc9bf94cd7..bcb962bdcd7 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5312,12 +5312,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* draw code for smoke */
-	if(((SmokeHRModifierData *)(md = modifiers_findByType(ob, eModifierType_SmokeHR)) && (((SmokeHRModifierData *)md)->flags & MOD_SMOKE_SHOWHIGHRES))) {
-		// GPU_create_smoke(smd);
-		// draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res);
-		// GPU_free_smoke(smd);
-	}
-	else {
+	{
 		md = modifiers_findByType(ob, eModifierType_Smoke);
 		if (md) {
 			SmokeModifierData *smd = (SmokeModifierData *)md;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a4587c34e89..be7452c4ae1 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -42,7 +42,6 @@ typedef enum ModifierType {
 	eModifierType_Multires,
 	eModifierType_Surface,
 	eModifierType_Smoke,
-	eModifierType_SmokeHR,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -255,34 +254,6 @@ typedef struct SmokeModifierData {
 	int type;  /* domain, inflow, outflow, ... */
 } SmokeModifierData;
 
-
-/* noise */
-#define MOD_SMOKE_NOISEWAVE (1<<0)
-#define MOD_SMOKE_NOISEFFT (1<<1)
-#define MOD_SMOKE_NOISECURL (1<<2)
-
-/* flags */
-#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */
-
-typedef struct SmokeHRModifierData {
-	ModifierData modifier;
-
-	struct WTURBULENCE *wt; // WTURBULENCE object, if active
-	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
-	struct ListBase ptcaches;
-	struct GPUTexture *tex;
-	float *view3d; /* voxel data for display */
-	unsigned int v3dnum; /* number of frame in view3d buffer */
-	float time;
-	float strength;
-	int res[3];
-	int maxres;
-	short noise; /* noise type: wave, curl, anisotropic */
-	short pad;
-	int amplify;
-	int flags;
-} SmokeHRModifierData;
-
 typedef struct DisplaceModifierData {
 	ModifierData modifier;
 
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 2d8b21b86de..542281e1960 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -32,10 +32,15 @@
 /* flags */
 #define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */
 #define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */
-#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */
+#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve *
+
+/* noise */
+#define MOD_SMOKE_NOISEWAVE (1<<0)
+#define MOD_SMOKE_NOISEFFT (1<<1)
+#define MOD_SMOKE_NOISECURL (1<<2)
 
 /* viewsettings */
-/* nothing so far */
+#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */
 
 typedef struct SmokeDomainSettings {
 	struct SmokeModifierData *smd; /* for fast RNA access */
@@ -64,6 +69,14 @@ typedef struct SmokeDomainSettings {
 	int diss_speed;/* in frames */
 	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
 	struct ListBase ptcaches;
+	struct WTURBULENCE *wt; // WTURBULENCE object, if active
+	int pad3;
+	float strength;
+	int res_wt[3];
+	int maxres_wt;
+	short noise; /* noise type: wave, curl, anisotropic */
+	short pad2;
+	int amplify;
 } SmokeDomainSettings;
 
 
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index cb54fe2ad8d..ea7451ee77a 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -389,7 +389,6 @@ extern StructRNA RNA_SmokeCollSettings;
 extern StructRNA RNA_SmokeDomainSettings;
 extern StructRNA RNA_SmokeFlowSettings;
 extern StructRNA RNA_SmokeModifier;
-extern StructRNA RNA_SmokeHRModifier;
 extern StructRNA RNA_SmoothModifier;
 extern StructRNA RNA_SoftBodyModifier;
 extern StructRNA RNA_SoftBodySettings;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 4845ad28d47..bb073d19a46 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -75,7 +75,6 @@ EnumPropertyItem modifier_type_items[] ={
 	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
 	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
 	{eModifierType_Smoke, "SMOKE", 0, "Smoke", ""},
-	{eModifierType_SmokeHR, "SMOKE_HR", 0, "SmokeHR", ""},
 	{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
 	{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
 	{0, NULL, 0, NULL, NULL}};
@@ -159,8 +158,6 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr)
 			return &RNA_SurfaceModifier;
 		case eModifierType_Smoke:
 			return &RNA_SmokeModifier;
-		case eModifierType_SmokeHR:
-			return &RNA_SmokeHRModifier;
 		default:
 			return &RNA_Modifier;
 	}
@@ -201,15 +198,6 @@ static void rna_Smoke_set_type(bContext *C, PointerRNA *ptr)
 	rna_Modifier_dependency_update(C, ptr);
 }
 
-static void rna_SmokeHR_reset(bContext *C, PointerRNA *ptr)
-{
-	// SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
-
-	// smokeModifier_reset(settings->smd);
-
-	// rna_Smoke_update(C, ptr);
-}
-
 static void rna_ExplodeModifier_vgroup_get(PointerRNA *ptr, char *value)
 {
 	ExplodeModifierData *emd= (ExplodeModifierData*)ptr->data;
@@ -1563,55 +1551,6 @@ static void rna_def_modifier_cloth(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Point Cache", "");
 }
 
-static void rna_def_modifier_smoke_highresolution(BlenderRNA *brna)
-{
-	StructRNA *srna;
-	PropertyRNA *prop;
-
-		static EnumPropertyItem prop_noise_type_items[] = {
-				{MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""},
-#if FFTW3 == 1
-				{MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, 
-#endif
-			/* 	{MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */
-				{0, NULL, 0, NULL, NULL}};
-	
-	srna= RNA_def_struct(brna, "SmokeHRModifier", "Modifier");
-	RNA_def_struct_ui_text(srna, "Smoke High Resolution Modifier", "Smoke high resolution simulation modifier.");
-	RNA_def_struct_sdna(srna, "SmokeHRModifierData");
-
-	prop= RNA_def_property(srna, "show_highres", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_SHOWHIGHRES);
-	RNA_def_property_ui_text(prop, "High res", "Show high resolution (using amplification).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
-
-	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "noise");
-	RNA_def_property_enum_items(prop, prop_noise_type_items);
-	RNA_def_property_ui_text(prop, "Noise Method", "Noise method which is used for creating the high resolution");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_SmokeHR_reset");
-
-	prop= RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "amplify");
-	RNA_def_property_range(prop, 1, 10);
-	RNA_def_property_ui_range(prop, 1, 10, 1, 0);
-	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_SmokeHR_reset");
-
-	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_sdna(prop, NULL, "strength");
-	RNA_def_property_range(prop, 1.0, 10.0);
-	RNA_def_property_ui_range(prop, 1.0, 10.0, 1, 2);
-	RNA_def_property_ui_text(prop, "Strength", "Strength of wavelet noise");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_SmokeHR_reset");
-
-	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
-	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
-	RNA_def_property_struct_type(prop, "PointCache");
-	RNA_def_property_ui_text(prop, "Point Cache", "");
-
-}
-
 static void rna_def_modifier_smoke(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -2028,7 +1967,6 @@ void RNA_def_modifier(BlenderRNA *brna)
 	rna_def_modifier_multires(brna);
 	rna_def_modifier_surface(brna);
 	rna_def_modifier_smoke(brna);
-	rna_def_modifier_smoke_highresolution(brna);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 70a5ddf72dd..e671665bd17 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -61,21 +61,6 @@ static void rna_Smoke_dependency_update(bContext *C, PointerRNA *ptr)
     DAG_scene_sort(CTX_data_scene(C));
 }
 
-static void rna_Smoke_reset_cache(bContext *C, PointerRNA *ptr)
-{
-	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
-	PointCache *cache = settings->point_cache;
-
-	printf("rna_Smoke_reset_cache\n");
-
-	cache->flag &= ~PTCACHE_SIMULATION_VALID;
-	cache->flag |= PTCACHE_OUTDATED;
-	cache->simframe= 0;
-	cache->last_exact= 0;
-
-	rna_Smoke_update(C, ptr);
-}
-
 static void rna_Smoke_reset(bContext *C, PointerRNA *ptr)
 {
 	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
@@ -94,23 +79,6 @@ static void rna_Smoke_reset_dependancy(bContext *C, PointerRNA *ptr)
 	rna_Smoke_dependency_update(C, ptr);
 }
 
-static void rna_Smoke_enable_HR(bContext *C, PointerRNA *ptr)
-{
-	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
-	Object *ob = (Object*)ptr->id.data;
-
-	if(settings->flags & MOD_SMOKE_HIGHRES)
-		BLI_addtail(&ob->modifiers, modifier_new(eModifierType_SmokeHR));
-	else
-	{
-		ModifierData *tmd = modifiers_findByType(ob, eModifierType_SmokeHR);
-		if(tmd) {
-			BLI_remlink(&ob->modifiers, tmd);
-			modifier_free(tmd);
-		}
-	}
-}
-
 static void rna_Smoke_redraw(bContext *C, PointerRNA *ptr)
 {
 	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
@@ -149,6 +117,14 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
+	static EnumPropertyItem prop_noise_type_items[] = {
+				{MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""},
+#if FFTW3 == 1
+				{MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, 
+#endif
+			/* 	{MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */
+				{0, NULL, 0, NULL, NULL}};
+
 	srna = RNA_def_struct(brna, "SmokeDomainSettings", NULL);
 	RNA_def_struct_ui_text(srna, "Domain Settings", "Smoke domain settings.");
 	RNA_def_struct_sdna(srna, "SmokeDomainSettings");
@@ -166,14 +142,14 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, -5.0, 5.0);
 	RNA_def_property_ui_range(prop, -5.0, 5.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Gravity", "Higher value results in sinking smoke");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_cache");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
 	prop= RNA_def_property(srna, "beta", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "beta");
 	RNA_def_property_range(prop, -5.0, 5.0);
 	RNA_def_property_ui_range(prop, -5.0, 5.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Heat", "Higher value results in faster rising smoke.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_cache");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
 	prop= RNA_def_property(srna, "coll_group", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "coll_group");
@@ -206,22 +182,54 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES);
 	RNA_def_property_ui_text(prop, "High Resolution Smoke", "Enable high resolution smoke");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_enable_HR");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
 
 	prop= RNA_def_property(srna, "dissolve_smoke", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE);
 	RNA_def_property_ui_text(prop, "Dissolve Smoke", "Enable smoke to disappear over time.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
 	prop= RNA_def_property(srna, "dissolve_smoke_log", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE_LOG);
 	RNA_def_property_ui_text(prop, "Logarithmic dissolve", "Using 1/x ");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
 	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
 	RNA_def_property_struct_type(prop, "PointCache");
 	RNA_def_property_ui_text(prop, "Point Cache", "");
+
+	prop= RNA_def_property(srna, "show_highres", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_SHOWHIGHRES);
+	RNA_def_property_ui_text(prop, "High res", "Show high resolution (using amplification).");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
+
+	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "noise");
+	RNA_def_property_enum_items(prop, prop_noise_type_items);
+	RNA_def_property_ui_text(prop, "Noise Method", "Noise method which is used for creating the high resolution");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+
+	prop= RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "amplify");
+	RNA_def_property_range(prop, 1, 10);
+	RNA_def_property_ui_range(prop, 1, 10, 1, 0);
+	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+
+	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "strength");
+	RNA_def_property_range(prop, 1.0, 10.0);
+	RNA_def_property_ui_range(prop, 1.0, 10.0, 1, 2);
+	RNA_def_property_ui_text(prop, "Strength", "Strength of wavelet noise");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+
+	/*
+	prop= RNA_def_property(srna, "point_cache_hr", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
+	RNA_def_property_struct_type(prop, "PointCache");
+	RNA_def_property_ui_text(prop, "Point Cache", "");
+	*/
 }
 
 static void rna_def_smoke_flow_settings(BlenderRNA *brna)

From 0a23895f95382a8c6d5c36bc8b36802c4474eb2e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 25 Aug 2009 22:51:18 +0000
Subject: [PATCH 271/577] remove all python api functions deprecated in 2.49

---
 .../Converter/BL_ActionActuator.cpp           | 449 ------------------
 .../gameengine/Converter/BL_ActionActuator.h  |  25 -
 .../Converter/BL_ShapeActionActuator.cpp      | 384 ---------------
 .../Converter/BL_ShapeActionActuator.h        |  23 -
 source/gameengine/Expressions/Value.cpp       |   8 -
 source/gameengine/Expressions/Value.h         |   2 -
 .../GameLogic/SCA_ActuatorSensor.cpp          |  41 --
 .../gameengine/GameLogic/SCA_ActuatorSensor.h |   5 -
 .../gameengine/GameLogic/SCA_DelaySensor.cpp  |  97 ----
 source/gameengine/GameLogic/SCA_DelaySensor.h |   8 -
 .../gameengine/GameLogic/SCA_IController.cpp  |  86 ----
 source/gameengine/GameLogic/SCA_IController.h |   6 -
 .../gameengine/GameLogic/SCA_ILogicBrick.cpp  |  45 --
 source/gameengine/GameLogic/SCA_ILogicBrick.h |   4 -
 source/gameengine/GameLogic/SCA_ISensor.cpp   | 191 --------
 source/gameengine/GameLogic/SCA_ISensor.h     |  15 -
 .../GameLogic/SCA_JoystickSensor.cpp          | 219 ---------
 .../gameengine/GameLogic/SCA_JoystickSensor.h |  20 -
 .../GameLogic/SCA_KeyboardSensor.cpp          | 188 --------
 .../gameengine/GameLogic/SCA_KeyboardSensor.h |  19 -
 .../gameengine/GameLogic/SCA_MouseSensor.cpp  |  28 --
 source/gameengine/GameLogic/SCA_MouseSensor.h |   7 -
 .../GameLogic/SCA_PropertyActuator.cpp        |  73 ---
 .../GameLogic/SCA_PropertyActuator.h          |   8 -
 .../GameLogic/SCA_PropertySensor.cpp          | 115 -----
 .../gameengine/GameLogic/SCA_PropertySensor.h |  12 -
 .../GameLogic/SCA_PythonController.cpp        |  52 --
 .../GameLogic/SCA_RandomActuator.cpp          | 107 -----
 .../gameengine/GameLogic/SCA_RandomActuator.h |  10 -
 .../gameengine/GameLogic/SCA_RandomSensor.cpp |  44 --
 .../gameengine/GameLogic/SCA_RandomSensor.h   |   7 -
 .../KXNetwork/KX_NetworkMessageActuator.cpp   |  85 ----
 .../KXNetwork/KX_NetworkMessageActuator.h     |   7 -
 .../KXNetwork/KX_NetworkMessageSensor.cpp     |  89 ----
 .../KXNetwork/KX_NetworkMessageSensor.h       |   8 -
 source/gameengine/Ketsji/KX_Camera.cpp        |  92 ----
 source/gameengine/Ketsji/KX_Camera.h          |   3 -
 .../gameengine/Ketsji/KX_CameraActuator.cpp   | 157 ------
 source/gameengine/Ketsji/KX_CameraActuator.h  |  12 -
 .../Ketsji/KX_ConstraintActuator.cpp          | 338 -------------
 .../gameengine/Ketsji/KX_ConstraintActuator.h |  22 -
 source/gameengine/Ketsji/KX_GameActuator.cpp  |  37 --
 source/gameengine/Ketsji/KX_GameActuator.h    |   5 -
 source/gameengine/Ketsji/KX_GameObject.cpp    | 163 +------
 source/gameengine/Ketsji/KX_GameObject.h      |  12 +-
 source/gameengine/Ketsji/KX_IpoActuator.cpp   | 248 ----------
 source/gameengine/Ketsji/KX_IpoActuator.h     |  17 -
 source/gameengine/Ketsji/KX_MeshProxy.cpp     |  20 -
 .../gameengine/Ketsji/KX_MouseFocusSensor.cpp |  79 ---
 .../gameengine/Ketsji/KX_MouseFocusSensor.h   |   8 -
 .../gameengine/Ketsji/KX_ObjectActuator.cpp   | 327 -------------
 source/gameengine/Ketsji/KX_ObjectActuator.h  |  23 -
 .../gameengine/Ketsji/KX_ParentActuator.cpp   |  55 ---
 source/gameengine/Ketsji/KX_ParentActuator.h  |   5 -
 source/gameengine/Ketsji/KX_PythonInit.cpp    |   2 -
 source/gameengine/Ketsji/KX_RadarSensor.cpp   |  54 +--
 source/gameengine/Ketsji/KX_RadarSensor.h     |   5 -
 source/gameengine/Ketsji/KX_RaySensor.cpp     |  71 ---
 source/gameengine/Ketsji/KX_RaySensor.h       |   6 -
 .../Ketsji/KX_SCA_AddObjectActuator.cpp       | 209 --------
 .../Ketsji/KX_SCA_AddObjectActuator.h         |  19 -
 .../Ketsji/KX_SCA_DynamicActuator.cpp         |  39 --
 .../Ketsji/KX_SCA_DynamicActuator.h           |   5 -
 .../Ketsji/KX_SCA_ReplaceMeshActuator.cpp     |  34 --
 .../Ketsji/KX_SCA_ReplaceMeshActuator.h       |   7 +-
 source/gameengine/Ketsji/KX_Scene.cpp         |  30 --
 source/gameengine/Ketsji/KX_Scene.h           |  21 +-
 source/gameengine/Ketsji/KX_SceneActuator.cpp | 121 -----
 source/gameengine/Ketsji/KX_SceneActuator.h   |  16 -
 source/gameengine/Ketsji/KX_SoundActuator.cpp | 117 -----
 source/gameengine/Ketsji/KX_SoundActuator.h   |  12 -
 source/gameengine/Ketsji/KX_StateActuator.cpp |  55 ---
 source/gameengine/Ketsji/KX_StateActuator.h   |   4 +-
 source/gameengine/Ketsji/KX_TouchSensor.cpp   | 105 ----
 source/gameengine/Ketsji/KX_TouchSensor.h     |  17 -
 .../gameengine/Ketsji/KX_TrackToActuator.cpp  | 127 -----
 source/gameengine/Ketsji/KX_TrackToActuator.h |  13 -
 .../Ketsji/KX_VisibilityActuator.cpp          |  27 --
 .../gameengine/Ketsji/KX_VisibilityActuator.h |   5 -
 79 files changed, 17 insertions(+), 5214 deletions(-)

diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 5a3629cfcd3..ca4290703e1 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -436,365 +436,6 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 /* Python functions                                                          */
 /* ------------------------------------------------------------------------- */
 
-/*     setStart                                                              */
-const char BL_ActionActuator::GetAction_doc[] = 
-"getAction()\n"
-"\tReturns a string containing the name of the current action.\n";
-
-PyObject* BL_ActionActuator::PyGetAction(PyObject* args, 
-										 PyObject* kwds) {
-	ShowDeprecationWarning("getAction()", "the action property");
-
-	if (m_action){
-		return PyUnicode_FromString(m_action->id.name+2);
-	}
-	Py_RETURN_NONE;
-}
-
-/*     getProperty                                                             */
-const char BL_ActionActuator::GetProperty_doc[] = 
-"getProperty()\n"
-"\tReturns the name of the property to be used in FromProp mode.\n";
-
-PyObject* BL_ActionActuator::PyGetProperty(PyObject* args, 
-										   PyObject* kwds) {
-	ShowDeprecationWarning("getProperty()", "the property property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("s", (const char *)m_propname);
-	
-	return result;
-}
-
-/*     getProperty                                                             */
-const char BL_ActionActuator::GetFrameProperty_doc[] = 
-"getFrameProperty()\n"
-"\tReturns the name of the property, that is set to the current frame number.\n";
-
-PyObject* BL_ActionActuator::PyGetFrameProperty(PyObject* args, 
-										   PyObject* kwds) {
-	ShowDeprecationWarning("getFrameProperty()", "the frameProperty property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("s", (const char *)m_framepropname);
-	
-	return result;
-}
-
-/*     getFrame                                                              */
-const char BL_ActionActuator::GetFrame_doc[] = 
-"getFrame()\n"
-"\tReturns the current frame number.\n";
-
-PyObject* BL_ActionActuator::PyGetFrame(PyObject* args, 
-										PyObject* kwds) {
-	ShowDeprecationWarning("getFrame()", "the frame property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_localtime);
-	
-	return result;
-}
-
-/*     getEnd                                                                */
-const char BL_ActionActuator::GetEnd_doc[] = 
-"getEnd()\n"
-"\tReturns the last frame of the action.\n";
-
-PyObject* BL_ActionActuator::PyGetEnd(PyObject* args, 
-									  PyObject* kwds) {
-	ShowDeprecationWarning("getEnd()", "the end property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_endframe);
-	
-	return result;
-}
-
-/*     getStart                                                              */
-const char BL_ActionActuator::GetStart_doc[] = 
-"getStart()\n"
-"\tReturns the starting frame of the action.\n";
-
-PyObject* BL_ActionActuator::PyGetStart(PyObject* args, 
-										PyObject* kwds) {
-	ShowDeprecationWarning("getStart()", "the start property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_startframe);
-	
-	return result;
-}
-
-/*     getBlendin                                                            */
-const char BL_ActionActuator::GetBlendin_doc[] = 
-"getBlendin()\n"
-"\tReturns the number of interpolation animation frames to be\n"
-"\tgenerated when this actuator is triggered.\n";
-
-PyObject* BL_ActionActuator::PyGetBlendin(PyObject* args, 
-										  PyObject* kwds) {
-	ShowDeprecationWarning("getBlendin()", "the blendin property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_blendin);
-	
-	return result;
-}
-
-/*     getPriority                                                           */
-const char BL_ActionActuator::GetPriority_doc[] = 
-"getPriority()\n"
-"\tReturns the priority for this actuator.  Actuators with lower\n"
-"\tPriority numbers will override actuators with higher numbers.\n";
-
-PyObject* BL_ActionActuator::PyGetPriority(PyObject* args, 
-										   PyObject* kwds) {
-	ShowDeprecationWarning("getPriority()", "the priority property");
-
-	PyObject *result;
-	
-	result = Py_BuildValue("i", m_priority);
-	
-	return result;
-}
-
-/*     setAction                                                             */
-const char BL_ActionActuator::SetAction_doc[] = 
-"setAction(action, (reset))\n"
-"\t - action    : The name of the action to set as the current action.\n"
-"\t - reset     : Optional parameter indicating whether to reset the\n"
-"\t               blend timer or not.  A value of 1 indicates that the\n"
-"\t               timer should be reset.  A value of 0 will leave it\n"
-"\t               unchanged.  If reset is not specified, the timer will"
-"\t	              be reset.\n";
-
-PyObject* BL_ActionActuator::PySetAction(PyObject* args, 
-										 PyObject* kwds) {
-	ShowDeprecationWarning("setAction()", "the action property");
-
-	char *string;
-	int	reset = 1;
-
-	if (PyArg_ParseTuple(args,"s|i:setAction",&string, &reset))
-	{
-		bAction *action;
-		
-		action = (bAction*)SCA_ILogicBrick::m_sCurrentLogicManager->GetActionByName(STR_String(string));
-		
-		if (!action){
-			/* NOTE!  Throw an exception or something */
-			//			printf ("setAction failed: Action not found\n", string);
-		}
-		else{
-			m_action=action;
-			if (reset)
-				m_blendframe = 0;
-		}
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setStart                                                              */
-const char BL_ActionActuator::SetStart_doc[] = 
-"setStart(start)\n"
-"\t - start     : Specifies the starting frame of the animation.\n";
-
-PyObject* BL_ActionActuator::PySetStart(PyObject* args, 
-										PyObject* kwds) {
-	ShowDeprecationWarning("setStart()", "the start property");
-
-	float start;
-	
-	if (PyArg_ParseTuple(args,"f:setStart",&start))
-	{
-		m_startframe = start;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setEnd                                                                */
-const char BL_ActionActuator::SetEnd_doc[] = 
-"setEnd(end)\n"
-"\t - end       : Specifies the ending frame of the animation.\n";
-
-PyObject* BL_ActionActuator::PySetEnd(PyObject* args, 
-									  PyObject* kwds) {
-	ShowDeprecationWarning("setEnd()", "the end property");
-
-	float end;
-	
-	if (PyArg_ParseTuple(args,"f:setEnd",&end))
-	{
-		m_endframe = end;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setBlendin                                                            */
-const char BL_ActionActuator::SetBlendin_doc[] = 
-"setBlendin(blendin)\n"
-"\t - blendin   : Specifies the number of frames of animation to generate\n"
-"\t               when making transitions between actions.\n";
-
-PyObject* BL_ActionActuator::PySetBlendin(PyObject* args, 
-										  PyObject* kwds) {
-	ShowDeprecationWarning("setBlendin()", "the blendin property");
-
-	float blendin;
-	
-	if (PyArg_ParseTuple(args,"f:setBlendin",&blendin))
-	{
-		m_blendin = blendin;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setBlendtime                                                          */
-const char BL_ActionActuator::SetBlendtime_doc[] = 
-"setBlendtime(blendtime)\n"
-"\t - blendtime : Allows the script to directly modify the internal timer\n"
-"\t               used when generating transitions between actions.  This\n"
-"\t               parameter must be in the range from 0.0 to 1.0.\n";
-
-PyObject* BL_ActionActuator::PySetBlendtime(PyObject* args, 
-										  PyObject* kwds) {
-	ShowDeprecationWarning("setBlendtime()", "the blendtime property");
-
-	float blendframe;
-	
-	if (PyArg_ParseTuple(args,"f:setBlendtime",&blendframe))
-	{
-		m_blendframe = blendframe * m_blendin;
-		if (m_blendframe<0)
-			m_blendframe = 0;
-		if (m_blendframe>m_blendin)
-			m_blendframe = m_blendin;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setPriority                                                           */
-const char BL_ActionActuator::SetPriority_doc[] = 
-"setPriority(priority)\n"
-"\t - priority  : Specifies the new priority.  Actuators will lower\n"
-"\t               priority numbers will override actuators with higher\n"
-"\t               numbers.\n";
-
-PyObject* BL_ActionActuator::PySetPriority(PyObject* args, 
-										   PyObject* kwds) {
-	ShowDeprecationWarning("setPriority()", "the priority property");
-
-	int priority;
-	
-	if (PyArg_ParseTuple(args,"i:setPriority",&priority))
-	{
-		m_priority = priority;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setFrame                                                              */
-const char BL_ActionActuator::SetFrame_doc[] = 
-"setFrame(frame)\n"
-"\t - frame     : Specifies the new current frame for the animation\n";
-
-PyObject* BL_ActionActuator::PySetFrame(PyObject* args, 
-										PyObject* kwds) {
-	ShowDeprecationWarning("setFrame()", "the frame property");
-
-	float frame;
-	
-	if (PyArg_ParseTuple(args,"f:setFrame",&frame))
-	{
-		m_localtime = frame;
-		if (m_localtime<m_startframe)
-			m_localtime=m_startframe;
-		else if (m_localtime>m_endframe)
-			m_localtime=m_endframe;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setProperty                                                           */
-const char BL_ActionActuator::SetProperty_doc[] = 
-"setProperty(prop)\n"
-"\t - prop      : A string specifying the property name to be used in\n"
-"\t               FromProp playback mode.\n";
-
-PyObject* BL_ActionActuator::PySetProperty(PyObject* args, 
-										   PyObject* kwds) {
-	ShowDeprecationWarning("setProperty()", "the property property");
-
-	char *string;
-	
-	if (PyArg_ParseTuple(args,"s:setProperty",&string))
-	{
-		m_propname = string;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setFrameProperty                                                          */
-const char BL_ActionActuator::SetFrameProperty_doc[] = 
-"setFrameProperty(prop)\n"
-"\t - prop      : A string specifying the property of the frame set up update.\n";
-
-PyObject* BL_ActionActuator::PySetFrameProperty(PyObject* args, 
-										   PyObject* kwds) {
-	ShowDeprecationWarning("setFrameProperty()", "the frameProperty property");
-
-	char *string;
-	
-	if (PyArg_ParseTuple(args,"s:setFrameProperty",&string))
-	{
-		m_framepropname = string;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
 PyObject* BL_ActionActuator::PyGetChannel(PyObject* value) {
 	char *string= _PyUnicode_AsString(value);
 	
@@ -849,72 +490,6 @@ PyObject* BL_ActionActuator::PyGetChannel(PyObject* value) {
 */
 }
 
-/* getType */
-const char BL_ActionActuator::GetType_doc[] =
-"getType()\n"
-"\tReturns the operation mode of the actuator.\n";
-PyObject* BL_ActionActuator::PyGetType(PyObject* args, 
-                                       PyObject* kwds) {
-	ShowDeprecationWarning("getType()", "the type property");
-
-    return Py_BuildValue("h", m_playtype);
-}
-
-/* setType */
-const char BL_ActionActuator::SetType_doc[] =
-"setType(mode)\n"
-"\t - mode: Play (0), Flipper (2), LoopStop (3), LoopEnd (4) or Property (6)\n"
-"\tSet the operation mode of the actuator.\n";
-PyObject* BL_ActionActuator::PySetType(PyObject* args,
-                                       PyObject* kwds) {
-	ShowDeprecationWarning("setType()", "the type property");
-
-	short typeArg;
-                                                                                                             
-    if (!PyArg_ParseTuple(args, "h:setType", &typeArg)) {
-        return NULL;
-    }
-
-	switch (typeArg) {
-	case ACT_ACTION_PLAY:
-	case ACT_ACTION_FLIPPER:
-	case ACT_ACTION_LOOP_STOP:
-	case ACT_ACTION_LOOP_END:
-	case ACT_ACTION_FROM_PROP:
-		m_playtype = typeArg;
-		break;
-	default:
-		printf("Invalid type for action actuator: %d\n", typeArg); /* error */
-    }
-	Py_RETURN_NONE;
-}
-
-PyObject* BL_ActionActuator::PyGetContinue() {
-	ShowDeprecationWarning("getContinue()", "the continue property");
-
-    return PyLong_FromSsize_t((long)(m_end_reset==0));
-}
-
-PyObject* BL_ActionActuator::PySetContinue(PyObject* value) {
-	ShowDeprecationWarning("setContinue()", "the continue property");
-
-	int param = PyObject_IsTrue( value );
-	
-	if( param == -1 ) {
-		PyErr_SetString( PyExc_TypeError, "expected True/False or 0/1" );
-		return NULL;
-	}
-
-	if (param) {
-		m_end_reset = 0;
-	} else {
-		m_end_reset = 1;
-	}
-    Py_RETURN_NONE;
-}
-
-//<-----Deprecated
-
 /*     setChannel                                                         */
 KX_PYMETHODDEF_DOC(BL_ActionActuator, setChannel,
 "setChannel(channel, matrix)\n"
@@ -1028,31 +603,7 @@ PyTypeObject BL_ActionActuator::Type = {
 };
 
 PyMethodDef BL_ActionActuator::Methods[] = {
-	//Deprecated ----->
-	{"setAction", (PyCFunction) BL_ActionActuator::sPySetAction, METH_VARARGS, (const char *)SetAction_doc},
-	{"setStart", (PyCFunction) BL_ActionActuator::sPySetStart, METH_VARARGS, (const char *)SetStart_doc},
-	{"setEnd", (PyCFunction) BL_ActionActuator::sPySetEnd, METH_VARARGS, (const char *)SetEnd_doc},
-	{"setBlendin", (PyCFunction) BL_ActionActuator::sPySetBlendin, METH_VARARGS, (const char *)SetBlendin_doc},
-	{"setPriority", (PyCFunction) BL_ActionActuator::sPySetPriority, METH_VARARGS, (const char *)SetPriority_doc},
-	{"setFrame", (PyCFunction) BL_ActionActuator::sPySetFrame, METH_VARARGS, (const char *)SetFrame_doc},
-	{"setProperty", (PyCFunction) BL_ActionActuator::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"setFrameProperty", (PyCFunction) BL_ActionActuator::sPySetFrameProperty, METH_VARARGS, (const char *)SetFrameProperty_doc},
-	{"setBlendtime", (PyCFunction) BL_ActionActuator::sPySetBlendtime, METH_VARARGS, (const char *)SetBlendtime_doc},
-
-	{"getAction", (PyCFunction) BL_ActionActuator::sPyGetAction, METH_VARARGS, (const char *)GetAction_doc},
-	{"getStart", (PyCFunction) BL_ActionActuator::sPyGetStart, METH_VARARGS, (const char *)GetStart_doc},
-	{"getEnd", (PyCFunction) BL_ActionActuator::sPyGetEnd, METH_VARARGS, (const char *)GetEnd_doc},
-	{"getBlendin", (PyCFunction) BL_ActionActuator::sPyGetBlendin, METH_VARARGS, (const char *)GetBlendin_doc},
-	{"getPriority", (PyCFunction) BL_ActionActuator::sPyGetPriority, METH_VARARGS, (const char *)GetPriority_doc},
-	{"getFrame", (PyCFunction) BL_ActionActuator::sPyGetFrame, METH_VARARGS, (const char *)GetFrame_doc},
-	{"getProperty", (PyCFunction) BL_ActionActuator::sPyGetProperty, METH_VARARGS, (const char *)GetProperty_doc},
-	{"getFrameProperty", (PyCFunction) BL_ActionActuator::sPyGetFrameProperty, METH_VARARGS, (const char *)GetFrameProperty_doc},
 	{"getChannel", (PyCFunction) BL_ActionActuator::sPyGetChannel, METH_O},
-	{"getType", (PyCFunction) BL_ActionActuator::sPyGetType, METH_VARARGS, (const char *)GetType_doc},
-	{"setType", (PyCFunction) BL_ActionActuator::sPySetType, METH_VARARGS, (const char *)SetType_doc},
-	{"getContinue", (PyCFunction) BL_ActionActuator::sPyGetContinue, METH_NOARGS, 0},	
-	{"setContinue", (PyCFunction) BL_ActionActuator::sPySetContinue, METH_O, 0},
-	//<------
 	KX_PYMETHODTABLE(BL_ActionActuator, setChannel),
 	{NULL,NULL} //Sentinel
 };
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 6003e23e315..a6b4c4a055d 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -84,32 +84,7 @@ public:
 	bAction*	GetAction() { return m_action; }
 	void		SetAction(bAction* act) { m_action= act; }
 
-	//Deprecated ----->
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetAction);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetBlendin);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetPriority);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetStart);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetEnd);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetFrame);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetProperty);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetFrameProperty);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetBlendtime);
-
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetAction);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetBlendin);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetPriority);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetStart);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetEnd);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetFrame);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetProperty);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetFrameProperty);
 	KX_PYMETHOD_O(BL_ActionActuator,GetChannel);
-	KX_PYMETHOD_DOC(BL_ActionActuator,GetType);
-	KX_PYMETHOD_DOC(BL_ActionActuator,SetType);
-	KX_PYMETHOD_NOARGS(BL_ActionActuator,GetContinue);
-	KX_PYMETHOD_O(BL_ActionActuator,SetContinue);
-	//<-----
-
 	KX_PYMETHOD_DOC(BL_ActionActuator,setChannel);
 
 	static PyObject*	pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 4af9a6c83a9..44eb603a940 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -434,26 +434,6 @@ PyTypeObject BL_ShapeActionActuator::Type = {
 
 
 PyMethodDef BL_ShapeActionActuator::Methods[] = {
-	{"setAction", (PyCFunction) BL_ShapeActionActuator::sPySetAction, METH_VARARGS, (const char *)SetAction_doc},
-	{"setStart", (PyCFunction) BL_ShapeActionActuator::sPySetStart, METH_VARARGS, (const char *)SetStart_doc},
-	{"setEnd", (PyCFunction) BL_ShapeActionActuator::sPySetEnd, METH_VARARGS, (const char *)SetEnd_doc},
-	{"setBlendin", (PyCFunction) BL_ShapeActionActuator::sPySetBlendin, METH_VARARGS, (const char *)SetBlendin_doc},
-	{"setPriority", (PyCFunction) BL_ShapeActionActuator::sPySetPriority, METH_VARARGS, (const char *)SetPriority_doc},
-	{"setFrame", (PyCFunction) BL_ShapeActionActuator::sPySetFrame, METH_VARARGS, (const char *)SetFrame_doc},
-	{"setProperty", (PyCFunction) BL_ShapeActionActuator::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"setFrameProperty", (PyCFunction) BL_ShapeActionActuator::sPySetFrameProperty, METH_VARARGS, (const char *)SetFrameProperty_doc},
-	{"setBlendtime", (PyCFunction) BL_ShapeActionActuator::sPySetBlendtime, METH_VARARGS, (const char *)SetBlendtime_doc},
-
-	{"getAction", (PyCFunction) BL_ShapeActionActuator::sPyGetAction, METH_NOARGS, (const char *)GetAction_doc},
-	{"getStart", (PyCFunction) BL_ShapeActionActuator::sPyGetStart, METH_NOARGS, (const char *)GetStart_doc},
-	{"getEnd", (PyCFunction) BL_ShapeActionActuator::sPyGetEnd, METH_NOARGS, (const char *)GetEnd_doc},
-	{"getBlendin", (PyCFunction) BL_ShapeActionActuator::sPyGetBlendin, METH_NOARGS, (const char *)GetBlendin_doc},
-	{"getPriority", (PyCFunction) BL_ShapeActionActuator::sPyGetPriority, METH_NOARGS, (const char *)GetPriority_doc},
-	{"getFrame", (PyCFunction) BL_ShapeActionActuator::sPyGetFrame, METH_NOARGS, (const char *)GetFrame_doc},
-	{"getProperty", (PyCFunction) BL_ShapeActionActuator::sPyGetProperty, METH_NOARGS, (const char *)GetProperty_doc},
-	{"getFrameProperty", (PyCFunction) BL_ShapeActionActuator::sPyGetFrameProperty, METH_NOARGS, (const char *)GetFrameProperty_doc},
-	{"getType", (PyCFunction) BL_ShapeActionActuator::sPyGetType, METH_NOARGS, (const char *)GetType_doc},	
-	{"setType", (PyCFunction) BL_ShapeActionActuator::sPySetType, METH_NOARGS, (const char *)SetType_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -471,370 +451,6 @@ PyAttributeDef BL_ShapeActionActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-/*     setStart                                                              */
-const char BL_ShapeActionActuator::GetAction_doc[] = 
-"getAction()\n"
-"\tReturns a string containing the name of the current action.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetAction() {
-	ShowDeprecationWarning("getAction()", "the action property");
-	if (m_action){
-		return PyUnicode_FromString(m_action->id.name+2);
-	}
-	Py_RETURN_NONE;
-}
-
-/*     getProperty                                                             */
-const char BL_ShapeActionActuator::GetProperty_doc[] = 
-"getProperty()\n"
-"\tReturns the name of the property to be used in FromProp mode.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetProperty() {
-	ShowDeprecationWarning("getProperty()", "the property property");
-	PyObject *result;
-	
-	result = Py_BuildValue("s", (const char *)m_propname);
-	
-	return result;
-}
-
-/*     getFrame                                                              */
-const char BL_ShapeActionActuator::GetFrame_doc[] = 
-"getFrame()\n"
-"\tReturns the current frame number.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetFrame() {
-	ShowDeprecationWarning("getFrame()", "the frame property");
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_localtime);
-	
-	return result;
-}
-
-/*     getEnd                                                                */
-const char BL_ShapeActionActuator::GetEnd_doc[] = 
-"getEnd()\n"
-"\tReturns the last frame of the action.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetEnd() {
-	ShowDeprecationWarning("getEnd()", "the end property");
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_endframe);
-	
-	return result;
-}
-
-/*     getStart                                                              */
-const char BL_ShapeActionActuator::GetStart_doc[] = 
-"getStart()\n"
-"\tReturns the starting frame of the action.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetStart() {
-	ShowDeprecationWarning("getStart()", "the start property");
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_startframe);
-	
-	return result;
-}
-
-/*     getBlendin                                                            */
-const char BL_ShapeActionActuator::GetBlendin_doc[] = 
-"getBlendin()\n"
-"\tReturns the number of interpolation animation frames to be\n"
-"\tgenerated when this actuator is triggered.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetBlendin() {
-	ShowDeprecationWarning("getBlendin()", "the blendin property");
-	PyObject *result;
-	
-	result = Py_BuildValue("f", m_blendin);
-	
-	return result;
-}
-
-/*     getPriority                                                           */
-const char BL_ShapeActionActuator::GetPriority_doc[] = 
-"getPriority()\n"
-"\tReturns the priority for this actuator.  Actuators with lower\n"
-"\tPriority numbers will override actuators with higher numbers.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetPriority() {
-	ShowDeprecationWarning("getPriority()", "the priority property");
-	PyObject *result;
-	
-	result = Py_BuildValue("i", m_priority);
-	
-	return result;
-}
-
-/*     setAction                                                             */
-const char BL_ShapeActionActuator::SetAction_doc[] = 
-"setAction(action, (reset))\n"
-"\t - action    : The name of the action to set as the current action.\n"
-"\t               Should be an action with Shape channels.\n"
-"\t - reset     : Optional parameter indicating whether to reset the\n"
-"\t               blend timer or not.  A value of 1 indicates that the\n"
-"\t               timer should be reset.  A value of 0 will leave it\n"
-"\t               unchanged.  If reset is not specified, the timer will"
-"\t	              be reset.\n";
-
-PyObject* BL_ShapeActionActuator::PySetAction(PyObject* args) {
-	ShowDeprecationWarning("setAction()", "the action property");
-	char *string;
-	int	reset = 1;
-
-	if (PyArg_ParseTuple(args,"s|i:setAction",&string, &reset))
-	{
-		bAction *action;
-		
-		action = (bAction*)SCA_ILogicBrick::m_sCurrentLogicManager->GetActionByName(STR_String(string));
-		
-		if (!action){
-			/* NOTE!  Throw an exception or something */
-			//			printf ("setAction failed: Action not found\n", string);
-		}
-		else{
-			m_action=action;
-			if (reset)
-				m_blendframe = 0.f;
-		}
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setStart                                                              */
-const char BL_ShapeActionActuator::SetStart_doc[] = 
-"setStart(start)\n"
-"\t - start     : Specifies the starting frame of the animation.\n";
-
-PyObject* BL_ShapeActionActuator::PySetStart(PyObject* args) {
-	ShowDeprecationWarning("setStart()", "the start property");
-	float start;
-	
-	if (PyArg_ParseTuple(args,"f:setStart",&start))
-	{
-		m_startframe = start;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setEnd                                                                */
-const char BL_ShapeActionActuator::SetEnd_doc[] = 
-"setEnd(end)\n"
-"\t - end       : Specifies the ending frame of the animation.\n";
-
-PyObject* BL_ShapeActionActuator::PySetEnd(PyObject* args) {
-	ShowDeprecationWarning("setEnd()", "the end property");
-	float end;
-	
-	if (PyArg_ParseTuple(args,"f:setEnd",&end))
-	{
-		m_endframe = end;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setBlendin                                                            */
-const char BL_ShapeActionActuator::SetBlendin_doc[] = 
-"setBlendin(blendin)\n"
-"\t - blendin   : Specifies the number of frames of animation to generate\n"
-"\t               when making transitions between actions.\n";
-
-PyObject* BL_ShapeActionActuator::PySetBlendin(PyObject* args) {
-	ShowDeprecationWarning("setBlendin()", "the blendin property");
-	float blendin;
-	
-	if (PyArg_ParseTuple(args,"f:setBlendin",&blendin))
-	{
-		m_blendin = blendin;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setBlendtime                                                          */
-const char BL_ShapeActionActuator::SetBlendtime_doc[] = 
-"setBlendtime(blendtime)\n"
-"\t - blendtime : Allows the script to directly modify the internal timer\n"
-"\t               used when generating transitions between actions.  This\n"
-"\t               parameter must be in the range from 0.0 to 1.0.\n";
-
-PyObject* BL_ShapeActionActuator::PySetBlendtime(PyObject* args) {
-	ShowDeprecationWarning("setBlendtime()", "the blendTime property");
-	float blendframe;
-	
-	if (PyArg_ParseTuple(args,"f:setBlendtime",&blendframe))
-	{
-		m_blendframe = blendframe * m_blendin;
-		if (m_blendframe<0.f)
-			m_blendframe = 0.f;
-		if (m_blendframe>m_blendin)
-			m_blendframe = m_blendin;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setPriority                                                           */
-const char BL_ShapeActionActuator::SetPriority_doc[] = 
-"setPriority(priority)\n"
-"\t - priority  : Specifies the new priority.  Actuators will lower\n"
-"\t               priority numbers will override actuators with higher\n"
-"\t               numbers.\n";
-
-PyObject* BL_ShapeActionActuator::PySetPriority(PyObject* args) {
-	ShowDeprecationWarning("setPriority()", "the priority property");
-	int priority;
-	
-	if (PyArg_ParseTuple(args,"i:setPriority",&priority))
-	{
-		m_priority = priority;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     getProperty                                                             */
-const char BL_ShapeActionActuator::GetFrameProperty_doc[] = 
-"getFrameProperty()\n"
-"\tReturns the name of the property, that is set to the current frame number.\n";
-
-PyObject* BL_ShapeActionActuator::PyGetFrameProperty() {
-	ShowDeprecationWarning("getFrameProperty()", "the frameProperty property");
-	PyObject *result;
-	
-	result = Py_BuildValue("s", (const char *)m_framepropname);
-	
-	return result;
-}
-
-
-/*     setFrame                                                              */
-const char BL_ShapeActionActuator::SetFrame_doc[] = 
-"setFrame(frame)\n"
-"\t - frame     : Specifies the new current frame for the animation\n";
-
-PyObject* BL_ShapeActionActuator::PySetFrame(PyObject* args) {
-	ShowDeprecationWarning("setFrame()", "the frame property");
-	float frame;
-	
-	if (PyArg_ParseTuple(args,"f:setFrame",&frame))
-	{
-		m_localtime = frame;
-		if (m_localtime<m_startframe)
-			m_localtime=m_startframe;
-		else if (m_localtime>m_endframe)
-			m_localtime=m_endframe;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setProperty                                                           */
-const char BL_ShapeActionActuator::SetProperty_doc[] = 
-"setProperty(prop)\n"
-"\t - prop      : A string specifying the property name to be used in\n"
-"\t               FromProp playback mode.\n";
-
-PyObject* BL_ShapeActionActuator::PySetProperty(PyObject* args) {
-	ShowDeprecationWarning("setProperty()", "the property property");
-	char *string;
-	
-	if (PyArg_ParseTuple(args,"s:setProperty",&string))
-	{
-		m_propname = string;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/*     setFrameProperty                                                          */
-const char BL_ShapeActionActuator::SetFrameProperty_doc[] = 
-"setFrameProperty(prop)\n"
-"\t - prop      : A string specifying the property of the frame set up update.\n";
-
-PyObject* BL_ShapeActionActuator::PySetFrameProperty(PyObject* args) {
-	ShowDeprecationWarning("setFrameProperty()", "the frameProperty property");
-	char *string;
-	
-	if (PyArg_ParseTuple(args,"s:setFrameProperty",&string))
-	{
-		m_framepropname = string;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/* getType */
-const char BL_ShapeActionActuator::GetType_doc[] =
-"getType()\n"
-"\tReturns the operation mode of the actuator.\n";
-PyObject* BL_ShapeActionActuator::PyGetType() {
-	ShowDeprecationWarning("getType()", "the type property");
-    return Py_BuildValue("h", m_playtype);
-}
-
-/* setType */
-const char BL_ShapeActionActuator::SetType_doc[] =
-"setType(mode)\n"
-"\t - mode: Play (0), Flipper (2), LoopStop (3), LoopEnd (4) or Property (6)\n"
-"\tSet the operation mode of the actuator.\n";
-PyObject* BL_ShapeActionActuator::PySetType(PyObject* args) {
-	ShowDeprecationWarning("setType()", "the type property");
-	short typeArg;
-                                                                                                             
-    if (!PyArg_ParseTuple(args, "h:setType", &typeArg)) {
-        return NULL;
-    }
-
-	switch (typeArg) {
-	case ACT_ACTION_PLAY:
-	case ACT_ACTION_FLIPPER:
-	case ACT_ACTION_LOOP_STOP:
-	case ACT_ACTION_LOOP_END:
-	case ACT_ACTION_FROM_PROP:
-		m_playtype = typeArg;
-		break;
-	default:
-		printf("Invalid type for action actuator: %d\n", typeArg); /* error */
-    }
-	
-    Py_RETURN_NONE;
-}
-
 PyObject* BL_ShapeActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	BL_ShapeActionActuator* self= static_cast<BL_ShapeActionActuator*>(self_v);
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index 890fe3f9de9..28a6d90abdf 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -82,29 +82,6 @@ public:
 	bAction*	GetAction() { return m_action; }
 	void		SetAction(bAction* act) { m_action= act; }
 
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetAction);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetBlendin);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetPriority);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetStart);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetEnd);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetFrame);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetProperty);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetFrameProperty);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetBlendtime);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetChannel);
-
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetAction);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetBlendin);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetPriority);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetStart);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetEnd);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetFrame);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetProperty);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetFrameProperty);
-//	KX_PYMETHOD(BL_ActionActuator,GetChannel);
-	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetType);
-	KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetType);
-
 	static PyObject*	pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 04bcc3a5561..130317d77e2 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -62,17 +62,9 @@ PyTypeObject CValue::Type = {
 };
 
 PyMethodDef CValue::Methods[] = {
-	{ "getName", (PyCFunction) CValue::sPyGetName, METH_NOARGS},
 	{NULL,NULL} //Sentinel
 };
 
-PyObject* CValue::PyGetName()
-{
-	ShowDeprecationWarning("getName()", "the name property");
-	
-	return PyUnicode_FromString(this->GetName());
-}
-
 /*#define CVALUE_DEBUG*/
 #ifdef CVALUE_DEBUG
 int gRefCount;
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index 5f08736afde..7d4adcdb64f 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -242,8 +242,6 @@ public:
 	static PyObject * pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
 	
 	virtual PyObject* ConvertKeysToPython( void );
-	
-	KX_PYMETHOD_NOARGS(CValue,GetName);
 
 #else
 	CValue();
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
index 11ea089270a..428362a0a24 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
@@ -143,10 +143,6 @@ PyTypeObject SCA_ActuatorSensor::Type = {
 };
 
 PyMethodDef SCA_ActuatorSensor::Methods[] = {
-	//Deprecated functions ------>
-	{"getActuator", (PyCFunction) SCA_ActuatorSensor::sPyGetActuator, METH_NOARGS, (const char *)GetActuator_doc},
-	{"setActuator", (PyCFunction) SCA_ActuatorSensor::sPySetActuator, METH_VARARGS, (const char *)SetActuator_doc},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -167,41 +163,4 @@ int SCA_ActuatorSensor::CheckActuator(void *self, const PyAttributeDef*)
 	return 1;
 }
 
-/* 3. getActuator */
-const char SCA_ActuatorSensor::GetActuator_doc[] = 
-"getActuator()\n"
-"\tReturn the Actuator with which the sensor operates.\n";
-PyObject* SCA_ActuatorSensor::PyGetActuator() 
-{
-	ShowDeprecationWarning("getActuator()", "the actuator property");
-	return PyUnicode_FromString(m_checkactname);
-}
-
-/* 4. setActuator */
-const char SCA_ActuatorSensor::SetActuator_doc[] = 
-"setActuator(name)\n"
-"\t- name: string\n"
-"\tSets the Actuator with which to operate. If there is no Actuator\n"
-"\tof this name, the call is ignored.\n";
-PyObject* SCA_ActuatorSensor::PySetActuator(PyObject* args) 
-{
-	ShowDeprecationWarning("setActuator()", "the actuator property");
-	/* We should query whether the name exists. Or should we create a prop   */
-	/* on the fly?                                                           */
-	char *actNameArg = NULL;
-
-	if (!PyArg_ParseTuple(args, "s:setActuator", &actNameArg)) {
-		return NULL;
-	}
-
-	SCA_IActuator* act = GetParent()->FindActuator(STR_String(actNameArg));
-	if (act) {
-		m_checkactname = actNameArg;
-		m_actuator = act;
-	} else {
-		; /* error: bad actuator name */
-	}
-	Py_RETURN_NONE;
-}
-
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
index cf8e735cad4..1a095148500 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
@@ -59,11 +59,6 @@ public:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	/* 3. setProperty */
-	KX_PYMETHOD_DOC_VARARGS(SCA_ActuatorSensor,SetActuator);
-	/* 4. getProperty */
-	KX_PYMETHOD_DOC_NOARGS(SCA_ActuatorSensor,GetActuator);
 	
 	static int CheckActuator(void *self, const PyAttributeDef*);
 };
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.cpp b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
index 0d563db910e..0f67ddd56a5 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
@@ -152,16 +152,6 @@ PyTypeObject SCA_DelaySensor::Type = {
 };
 
 PyMethodDef SCA_DelaySensor::Methods[] = {
-	//Deprecated functions ------>
-	/* setProperty */
-	{"setDelay", (PyCFunction) SCA_DelaySensor::sPySetDelay, METH_VARARGS, (const char *)SetDelay_doc},
-	{"setDuration", (PyCFunction) SCA_DelaySensor::sPySetDuration, METH_VARARGS, (const char *)SetDuration_doc},
-	{"setRepeat", (PyCFunction) SCA_DelaySensor::sPySetRepeat, METH_VARARGS, (const char *)SetRepeat_doc},
-	/* getProperty */
-	{"getDelay", (PyCFunction) SCA_DelaySensor::sPyGetDelay, METH_NOARGS, (const char *)GetDelay_doc},
-	{"getDuration", (PyCFunction) SCA_DelaySensor::sPyGetDuration, METH_NOARGS, (const char *)GetDuration_doc},
-	{"getRepeat", (PyCFunction) SCA_DelaySensor::sPyGetRepeat, METH_NOARGS, (const char *)GetRepeat_doc},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -172,91 +162,4 @@ PyAttributeDef SCA_DelaySensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-const char SCA_DelaySensor::SetDelay_doc[] = 
-"setDelay(delay)\n"
-"\t- delay: length of the initial OFF period as number of frame\n"
-"\t         0 for immediate trigger\n"
-"\tSet the initial delay before the positive trigger\n";
-PyObject* SCA_DelaySensor::PySetDelay(PyObject* args)
-{
-	ShowDeprecationWarning("setDelay()", "the delay property");
-	int delay;
-	
-	if(!PyArg_ParseTuple(args, "i:setDelay", &delay)) {
-		return NULL;
-	}
-	if (delay < 0) {
-		PyErr_SetString(PyExc_ValueError, "Delay cannot be negative");
-		return NULL;
-	}
-	m_delay = delay;
-	Py_RETURN_NONE;
-}
-
-const char SCA_DelaySensor::SetDuration_doc[] = 
-"setDuration(duration)\n"
-"\t- duration: length of the ON period in number of frame after the initial off period\n"
-"\t            0 for no ON period\n"
-"\tSet the duration of the ON pulse after initial delay.\n"
-"\tIf > 0, a negative trigger is fired at the end of the ON pulse.\n";
-PyObject* SCA_DelaySensor::PySetDuration(PyObject* args)
-{
-	ShowDeprecationWarning("setDuration()", "the duration property");
-	int duration;
-	
-	if(!PyArg_ParseTuple(args, "i:setDuration", &duration)) {
-		return NULL;
-	}
-	if (duration < 0) {
-		PyErr_SetString(PyExc_ValueError, "Duration cannot be negative");
-		return NULL;
-	}
-	m_duration = duration;
-	Py_RETURN_NONE;
-}
-
-const char SCA_DelaySensor::SetRepeat_doc[] = 
-"setRepeat(repeat)\n"
-"\t- repeat: 1 if the initial OFF-ON cycle should be repeated indefinately\n"
-"\t          0 if the initial OFF-ON cycle should run only once\n"
-"\tSet the sensor repeat mode\n";
-PyObject* SCA_DelaySensor::PySetRepeat(PyObject* args)
-{
-	ShowDeprecationWarning("setRepeat()", "the repeat property");
-	int repeat;
-	
-	if(!PyArg_ParseTuple(args, "i:setRepeat", &repeat)) {
-		return NULL;
-	}
-	m_repeat = (repeat != 0);
-	Py_RETURN_NONE;
-}
-
-const char SCA_DelaySensor::GetDelay_doc[] = 
-"getDelay()\n"
-"\tReturn the delay parameter value\n";
-PyObject* SCA_DelaySensor::PyGetDelay()
-{
-	ShowDeprecationWarning("getDelay()", "the delay property");
-	return PyLong_FromSsize_t(m_delay);
-}
-
-const char SCA_DelaySensor::GetDuration_doc[] = 
-"getDuration()\n"
-"\tReturn the duration parameter value\n";
-PyObject* SCA_DelaySensor::PyGetDuration()
-{
-	ShowDeprecationWarning("getDuration()", "the duration property");
-	return PyLong_FromSsize_t(m_duration);
-}
-
-const char SCA_DelaySensor::GetRepeat_doc[] = 
-"getRepeat()\n"
-"\tReturn the repeat parameter value\n";
-PyObject* SCA_DelaySensor::PyGetRepeat()
-{
-	ShowDeprecationWarning("getRepeat()", "the repeat property");
-	return BoolToPyArg(m_repeat);
-}
-
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h
index 8270e8959b7..187a9179b5d 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.h
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.h
@@ -59,14 +59,6 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	/* setProperty */
-	KX_PYMETHOD_DOC_VARARGS(SCA_DelaySensor,SetDelay);
-	KX_PYMETHOD_DOC_VARARGS(SCA_DelaySensor,SetDuration);
-	KX_PYMETHOD_DOC_VARARGS(SCA_DelaySensor,SetRepeat);
-	/* getProperty */
-	KX_PYMETHOD_DOC_NOARGS(SCA_DelaySensor,GetDelay);
-	KX_PYMETHOD_DOC_NOARGS(SCA_DelaySensor,GetDuration);
-	KX_PYMETHOD_DOC_NOARGS(SCA_DelaySensor,GetRepeat);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp
index 24c39563c28..7cfd2adc1d0 100644
--- a/source/gameengine/GameLogic/SCA_IController.cpp
+++ b/source/gameengine/GameLogic/SCA_IController.cpp
@@ -221,13 +221,6 @@ PyTypeObject SCA_IController::Type = {
 };
 
 PyMethodDef SCA_IController::Methods[] = {
-	//Deprecated functions ------>
-	{"getSensor", (PyCFunction) SCA_IController::sPyGetSensor, METH_O},
-	{"getActuator", (PyCFunction) SCA_IController::sPyGetActuator, METH_O},
-	{"getSensors", (PyCFunction) SCA_IController::sPyGetSensors, METH_NOARGS},
-	{"getActuators", (PyCFunction) SCA_IController::sPyGetActuators, METH_NOARGS},
-	{"getState", (PyCFunction) SCA_IController::sPyGetState, METH_NOARGS},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -239,85 +232,6 @@ PyAttributeDef SCA_IController::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* SCA_IController::PyGetActuators()
-{
-	ShowDeprecationWarning("getActuators()", "the actuators property");
-	
-	PyObject* resultlist = PyList_New(m_linkedactuators.size());
-	for (unsigned int index=0;index<m_linkedactuators.size();index++)
-	{
-		PyList_SET_ITEM(resultlist,index, m_linkedactuators[index]->GetProxy());
-	}
-
-	return resultlist;
-}
-
-PyObject* SCA_IController::PyGetSensor(PyObject* value)
-{
-	ShowDeprecationWarning("getSensor(string)", "the sensors[string] property");
-	
-	char *scriptArg = _PyUnicode_AsString(value);
-	if (scriptArg==NULL) {
-		PyErr_SetString(PyExc_TypeError, "controller.getSensor(string): Python Controller, expected a string (sensor name)");
-		return NULL;
-	}
-	
-	for (unsigned int index=0;index<m_linkedsensors.size();index++)
-	{
-		SCA_ISensor* sensor = m_linkedsensors[index];
-		STR_String& realname = sensor->GetName();
-		if (realname == scriptArg)
-		{
-			return sensor->GetProxy();
-		}
-	}
-	
-	PyErr_Format(PyExc_AttributeError, "controller.getSensor(string): Python Controller, unable to find requested sensor \"%s\"", scriptArg);
-	return NULL;
-}
-
-PyObject* SCA_IController::PyGetActuator(PyObject* value)
-{
-	ShowDeprecationWarning("getActuator(string)", "the actuators[string] property");
-	
-	char *scriptArg = _PyUnicode_AsString(value);
-	if (scriptArg==NULL) {
-		PyErr_SetString(PyExc_TypeError, "controller.getActuator(string): Python Controller, expected a string (actuator name)");
-		return NULL;
-	}
-	
-	for (unsigned int index=0;index<m_linkedactuators.size();index++)
-	{
-		SCA_IActuator* actua = m_linkedactuators[index];
-		if (actua->GetName() == scriptArg)
-		{
-			return actua->GetProxy();
-		}
-	}
-	
-	PyErr_Format(PyExc_AttributeError, "controller.getActuator(string): Python Controller, unable to find requested actuator \"%s\"", scriptArg);
-	return NULL;
-}
-
-PyObject* SCA_IController::PyGetSensors()
-{
-	ShowDeprecationWarning("getSensors()", "the sensors property");
-	
-	PyObject* resultlist = PyList_New(m_linkedsensors.size());
-	for (unsigned int index=0;index<m_linkedsensors.size();index++)
-	{
-		PyList_SET_ITEM(resultlist,index, m_linkedsensors[index]->GetProxy());
-	}
-	
-	return resultlist;
-}
-
-PyObject* SCA_IController::PyGetState()
-{
-	ShowDeprecationWarning("getState()", "the state property");
-	return PyLong_FromSsize_t(m_statemask);
-}
-
 PyObject* SCA_IController::pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_IController* self= static_cast<SCA_IController*>(self_v);
diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h
index 523878bee26..202921c6986 100644
--- a/source/gameengine/GameLogic/SCA_IController.h
+++ b/source/gameengine/GameLogic/SCA_IController.h
@@ -97,12 +97,6 @@ public:
 			}
 		}
 	}
-
-	KX_PYMETHOD_NOARGS(SCA_IController,GetSensors);
-	KX_PYMETHOD_NOARGS(SCA_IController,GetActuators);
-	KX_PYMETHOD_O(SCA_IController,GetSensor);
-	KX_PYMETHOD_O(SCA_IController,GetActuator);
-	KX_PYMETHOD_NOARGS(SCA_IController,GetState);
 	
 	static PyObject*	pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
index 2c64e02913d..f679d0ee487 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
@@ -199,11 +199,6 @@ PyTypeObject SCA_ILogicBrick::Type = {
 };
 
 PyMethodDef SCA_ILogicBrick::Methods[] = {
-	// --> Deprecated
-  {"getOwner", (PyCFunction) SCA_ILogicBrick::sPyGetOwner, METH_NOARGS},
-  {"getExecutePriority", (PyCFunction) SCA_ILogicBrick::sPyGetExecutePriority, METH_NOARGS},
-  {"setExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_VARARGS},
-  // <-- Deprecated
   {NULL,NULL} //Sentinel
 };
 
@@ -232,46 +227,6 @@ int SCA_ILogicBrick::CheckProperty(void *self, const PyAttributeDef *attrdef)
 	return 0;
 }
 
-PyObject* SCA_ILogicBrick::PyGetOwner()
-{
-	ShowDeprecationWarning("getOwner()", "the owner property");
-	
-	CValue* parent = GetParent();
-	if (parent)
-	{
-		return parent->GetProxy();
-	}
-
-	printf("ERROR: Python scriptblock without owner\n");
-	Py_RETURN_NONE; //Int_FromLong(IsPositiveTrigger());
-}
-
-
-
-PyObject* SCA_ILogicBrick::PySetExecutePriority(PyObject* args)
-{
-	ShowDeprecationWarning("setExecutePriority()", "the executePriority property");
-
-	int priority=0;
-
-    if (!PyArg_ParseTuple(args, "i:setExecutePriority", &priority)) {
-		return NULL;
-    }
-	
-	m_Execute_Priority = priority;
-
-	Py_RETURN_NONE;
-}
-
-
-
-PyObject* SCA_ILogicBrick::PyGetExecutePriority()
-{
-	ShowDeprecationWarning("getExecutePriority()", "the executePriority property");
-	return PyLong_FromSsize_t(m_Execute_Priority);
-}
-
-
 /*Attribute functions */
 PyObject* SCA_ILogicBrick::pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h
index 50679856802..ac533335f0b 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.h
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h
@@ -126,10 +126,6 @@ public:
 
 
 	// python methods
-
-	KX_PYMETHOD_NOARGS(SCA_ILogicBrick,GetOwner);
-	KX_PYMETHOD_VARARGS(SCA_ILogicBrick,SetExecutePriority);
-	KX_PYMETHOD_NOARGS(SCA_ILogicBrick,GetExecutePriority);
 	
 	static PyObject*	pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index b018124dcca..497a5d1095a 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -292,171 +292,6 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr)
 /* Python Functions						           */
 /* ----------------------------------------------- */
 
-//Deprecated Functions ------>
-const char SCA_ISensor::IsPositive_doc[] = 
-"isPositive()\n"
-"\tReturns whether the sensor is in an active state.\n";
-PyObject* SCA_ISensor::PyIsPositive()
-{
-	ShowDeprecationWarning("isPositive()", "the read-only positive property");
-	int retval = GetState();
-	return PyLong_FromSsize_t(retval);
-}
-
-const char SCA_ISensor::IsTriggered_doc[] = 
-"isTriggered()\n"
-"\tReturns whether the sensor has triggered the current controller.\n";
-PyObject* SCA_ISensor::PyIsTriggered()
-{
-	ShowDeprecationWarning("isTriggered()", "the read-only triggered property");
-	// check with the current controller
-	int retval = 0;
-	if (SCA_PythonController::m_sCurrentController)
-		retval = SCA_PythonController::m_sCurrentController->IsTriggered(this);
-	return PyLong_FromSsize_t(retval);
-}
-
-/**
- * getUsePulseMode: getter for the pulse mode (KX_TRUE = on)
- */
-const char SCA_ISensor::GetUsePosPulseMode_doc[] = 
-"getUsePosPulseMode()\n"
-"\tReturns whether positive pulse mode is active.\n";
-PyObject* SCA_ISensor::PyGetUsePosPulseMode()
-{
-	ShowDeprecationWarning("getUsePosPulseMode()", "the usePosPulseMode property");
-	return BoolToPyArg(m_pos_pulsemode);
-}
-
-/**
- * setUsePulseMode: setter for the pulse mode (KX_TRUE = on)
- */
-const char SCA_ISensor::SetUsePosPulseMode_doc[] = 
-"setUsePosPulseMode(pulse?)\n"
-"\t - pulse? : Pulse when a positive event occurs?\n"
-"\t            (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to do pulsing when positive pulses occur.\n";
-PyObject* SCA_ISensor::PySetUsePosPulseMode(PyObject* args)
-{
-	ShowDeprecationWarning("setUsePosPulseMode()", "the usePosPulseMode property");
-	int pyarg = 0;
-	if(!PyArg_ParseTuple(args, "i:setUsePosPulseMode", &pyarg)) { return NULL; }
-	m_pos_pulsemode = PyArgToBool(pyarg);
-	Py_RETURN_NONE;
-}
-
-/**
- * getFrequency: getter for the pulse mode interval
- */
-const char SCA_ISensor::GetFrequency_doc[] = 
-"getFrequency()\n"
-"\tReturns the frequency of the updates in pulse mode.\n" ;
-PyObject* SCA_ISensor::PyGetFrequency()
-{
-	ShowDeprecationWarning("getFrequency()", "the frequency property");
-	return PyLong_FromSsize_t(m_pulse_frequency);
-}
-
-/**
- * setFrequency: setter for the pulse mode (KX_TRUE = on)
- */
-const char SCA_ISensor::SetFrequency_doc[] = 
-"setFrequency(pulse_frequency)\n"
-"\t- pulse_frequency: The frequency of the updates in pulse mode (integer)"
-"\tSet the frequency of the updates in pulse mode.\n"
-"\tIf the frequency is negative, it is set to 0.\n" ;
-PyObject* SCA_ISensor::PySetFrequency(PyObject* args)
-{
-	ShowDeprecationWarning("setFrequency()", "the frequency property");
-	int pulse_frequencyArg = 0;
-
-	if(!PyArg_ParseTuple(args, "i:setFrequency", &pulse_frequencyArg)) {
-		return NULL;
-	}
-	
-	/* We can do three things here: clip, ignore and raise an exception.  */
-	/* Exceptions don't work yet, ignoring is not desirable now...        */
-	if (pulse_frequencyArg < 0) {
-		pulse_frequencyArg = 0;
-	};	
-	m_pulse_frequency = pulse_frequencyArg;
-
-	Py_RETURN_NONE;
-}
-
-
-const char SCA_ISensor::GetInvert_doc[] = 
-"getInvert()\n"
-"\tReturns whether or not pulses from this sensor are inverted.\n" ;
-PyObject* SCA_ISensor::PyGetInvert()
-{
-	ShowDeprecationWarning("getInvert()", "the invert property");
-	return BoolToPyArg(m_invert);
-}
-
-const char SCA_ISensor::SetInvert_doc[] = 
-"setInvert(invert?)\n"
-"\t- invert?: Invert the event-values? (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to invert pulses.\n";
-PyObject* SCA_ISensor::PySetInvert(PyObject* args)
-{
-	ShowDeprecationWarning("setInvert()", "the invert property");
-	int pyarg = 0;
-	if(!PyArg_ParseTuple(args, "i:setInvert", &pyarg)) { return NULL; }
-	m_invert = PyArgToBool(pyarg);
-	Py_RETURN_NONE;
-}
-
-const char SCA_ISensor::GetLevel_doc[] = 
-"getLevel()\n"
-"\tReturns whether this sensor is a level detector or a edge detector.\n"
-"\tIt makes a difference only in case of logic state transition (state actuator).\n"
-"\tA level detector will immediately generate a pulse, negative or positive\n"
-"\tdepending on the sensor condition, as soon as the state is activated.\n"
-"\tA edge detector will wait for a state change before generating a pulse.\n";
-PyObject* SCA_ISensor::PyGetLevel()
-{
-	ShowDeprecationWarning("getLevel()", "the level property");
-	return BoolToPyArg(m_level);
-}
-
-const char SCA_ISensor::SetLevel_doc[] = 
-"setLevel(level?)\n"
-"\t- level?: Detect level instead of edge? (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to detect level or edge transition when entering a state.\n";
-PyObject* SCA_ISensor::PySetLevel(PyObject* args)
-{
-	ShowDeprecationWarning("setLevel()", "the level property");
-	int pyarg = 0;
-	if(!PyArg_ParseTuple(args, "i:setLevel", &pyarg)) { return NULL; }
-	m_level = PyArgToBool(pyarg);
-	Py_RETURN_NONE;
-}
-
-const char SCA_ISensor::GetUseNegPulseMode_doc[] = 
-"getUseNegPulseMode()\n"
-"\tReturns whether negative pulse mode is active.\n";
-PyObject* SCA_ISensor::PyGetUseNegPulseMode()
-{
-	ShowDeprecationWarning("getUseNegPulseMode()", "the useNegPulseMode property");
-	return BoolToPyArg(m_neg_pulsemode);
-}
-
-const char SCA_ISensor::SetUseNegPulseMode_doc[] = 
-"setUseNegPulseMode(pulse?)\n"
-"\t - pulse? : Pulse when a negative event occurs?\n"
-"\t            (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to do pulsing when negative pulses occur.\n";
-PyObject* SCA_ISensor::PySetUseNegPulseMode(PyObject* args)
-{
-	ShowDeprecationWarning("setUseNegPulseMode()", "the useNegPulseMode property");
-	int pyarg = 0;
-	if(!PyArg_ParseTuple(args, "i:setUseNegPulseMode", &pyarg)) { return NULL; }
-	m_neg_pulsemode = PyArgToBool(pyarg);
-	Py_RETURN_NONE;
-}
-//<------Deprecated
-
 KX_PYMETHODDEF_DOC_NOARGS(SCA_ISensor, reset,
 "reset()\n"
 "\tReset sensor internal state, effect depends on the type of sensor and settings.\n"
@@ -494,32 +329,6 @@ PyTypeObject SCA_ISensor::Type = {
 };
 
 PyMethodDef SCA_ISensor::Methods[] = {
-	//Deprecated functions ----->
-	{"isPositive", (PyCFunction) SCA_ISensor::sPyIsPositive, 
-	 METH_NOARGS, (const char *)IsPositive_doc},
-	{"isTriggered", (PyCFunction) SCA_ISensor::sPyIsTriggered, 
-	 METH_VARARGS, (const char *)IsTriggered_doc},
-	{"getUsePosPulseMode", (PyCFunction) SCA_ISensor::sPyGetUsePosPulseMode, 
-	 METH_NOARGS, (const char *)GetUsePosPulseMode_doc},
-	{"setUsePosPulseMode", (PyCFunction) SCA_ISensor::sPySetUsePosPulseMode, 
-	 METH_VARARGS, (const char *)SetUsePosPulseMode_doc},
-	{"getFrequency", (PyCFunction) SCA_ISensor::sPyGetFrequency, 
-	 METH_NOARGS, (const char *)GetFrequency_doc},
-	{"setFrequency", (PyCFunction) SCA_ISensor::sPySetFrequency, 
-	 METH_VARARGS, (const char *)SetFrequency_doc},
-	{"getUseNegPulseMode", (PyCFunction) SCA_ISensor::sPyGetUseNegPulseMode, 
-	 METH_NOARGS, (const char *)GetUseNegPulseMode_doc},
-	{"setUseNegPulseMode", (PyCFunction) SCA_ISensor::sPySetUseNegPulseMode, 
-	 METH_VARARGS, (const char *)SetUseNegPulseMode_doc},
-	{"getInvert", (PyCFunction) SCA_ISensor::sPyGetInvert, 
-	 METH_NOARGS, (const char *)GetInvert_doc},
-	{"setInvert", (PyCFunction) SCA_ISensor::sPySetInvert, 
-	 METH_VARARGS, (const char *)SetInvert_doc},
-	{"getLevel", (PyCFunction) SCA_ISensor::sPyGetLevel, 
-	 METH_NOARGS, (const char *)GetLevel_doc},
-	{"setLevel", (PyCFunction) SCA_ISensor::sPySetLevel, 
-	 METH_VARARGS, (const char *)SetLevel_doc},
-	 //<----- Deprecated
 	KX_PYMETHODTABLE_NOARGS(SCA_ISensor, reset),
 	{NULL,NULL} //Sentinel
 };
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index 81864ab6a34..742b05bd88b 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -172,21 +172,6 @@ public:
 		{ return !m_links; }
 
 	/* Python functions: */
-
-	//Deprecated functions ----->
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsPositive);
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsTriggered);
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUsePosPulseMode);
-	KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetUsePosPulseMode);
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetFrequency);
-	KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetFrequency);
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUseNegPulseMode);
-	KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetUseNegPulseMode);
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetInvert);
-	KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetInvert);
-	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetLevel);
-	KX_PYMETHOD_DOC_VARARGS(SCA_ISensor,SetLevel);
-	//<------
 	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,reset);
 	
 	static PyObject*	pyattr_get_triggered(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 76d35e6d615..4936b380352 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -273,24 +273,6 @@ PyTypeObject SCA_JoystickSensor::Type = {
 };
 
 PyMethodDef SCA_JoystickSensor::Methods[] = {
-	//Deprecated functions ------>
-	{"getIndex", 	 (PyCFunction) SCA_JoystickSensor::sPyGetIndex,		METH_NOARGS,	(const char *)GetIndex_doc},
-	{"setIndex",	 (PyCFunction) SCA_JoystickSensor::sPySetIndex,		METH_O,			(const char *)SetIndex_doc},
-	{"getAxis", 	 (PyCFunction) SCA_JoystickSensor::sPyGetAxis,		METH_NOARGS,	(const char *)GetAxis_doc},
-	{"setAxis", 	 (PyCFunction) SCA_JoystickSensor::sPySetAxis,		METH_VARARGS,	(const char *)SetAxis_doc},
-	{"getAxisValue", (PyCFunction) SCA_JoystickSensor::sPyGetAxisValue,	METH_NOARGS,	(const char *)GetAxisValue_doc},
-	{"getThreshold", (PyCFunction) SCA_JoystickSensor::sPyGetThreshold, METH_NOARGS,	(const char *)GetThreshold_doc},
-	{"setThreshold", (PyCFunction) SCA_JoystickSensor::sPySetThreshold, METH_VARARGS,	(const char *)SetThreshold_doc},
-	{"getButton",	 (PyCFunction) SCA_JoystickSensor::sPyGetButton,	METH_NOARGS,	(const char *)GetButton_doc},
-	{"setButton",	 (PyCFunction) SCA_JoystickSensor::sPySetButton,	METH_O,			(const char *)SetButton_doc},
-	{"getHat",		 (PyCFunction) SCA_JoystickSensor::sPyGetHat,		METH_NOARGS,	(const char *)GetHat_doc},
-	{"setHat",		 (PyCFunction) SCA_JoystickSensor::sPySetHat,		METH_VARARGS,	(const char *)SetHat_doc},
-	{"getNumAxes",	 (PyCFunction) SCA_JoystickSensor::sPyNumberOfAxes,	METH_NOARGS,	(const char *)NumberOfAxes_doc},
-	{"getNumButtons",(PyCFunction) SCA_JoystickSensor::sPyNumberOfButtons,METH_NOARGS,	(const char *)NumberOfButtons_doc},
-	{"getNumHats",	 (PyCFunction) SCA_JoystickSensor::sPyNumberOfHats,	METH_NOARGS,	(const char *)NumberOfHats_doc},
-	{"isConnected", (PyCFunction) SCA_JoystickSensor::sPyConnected,		METH_NOARGS,	(const char *)Connected_doc},
-	{"getButtonValue",(PyCFunction) SCA_JoystickSensor::sPyGetButtonValue,	METH_NOARGS,(const char *)GetButtonValue_doc},
-	//<----- Deprecated
 	{"getButtonActiveList",(PyCFunction) SCA_JoystickSensor::sPyGetButtonActiveList,	METH_NOARGS,(const char *)GetButtonActiveList_doc},
 	{"getButtonStatus",(PyCFunction) SCA_JoystickSensor::sPyGetButtonStatus,	METH_VARARGS,(const char *)GetButtonStatus_doc},
 	{NULL,NULL} //Sentinel
@@ -314,138 +296,6 @@ PyAttributeDef SCA_JoystickSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-
-/* get index ---------------------------------------------------------- */
-const char SCA_JoystickSensor::GetIndex_doc[] = 
-"getIndex\n"
-"\tReturns the joystick index to use.\n";
-PyObject* SCA_JoystickSensor::PyGetIndex( ) {
-	ShowDeprecationWarning("getIndex()", "the index property");
-	return PyLong_FromSsize_t(m_joyindex);
-}
-
-
-/* set index ---------------------------------------------------------- */
-const char SCA_JoystickSensor::SetIndex_doc[] = 
-"setIndex\n"
-"\tSets the joystick index to use.\n";
-PyObject* SCA_JoystickSensor::PySetIndex( PyObject* value ) {
-	ShowDeprecationWarning("setIndex()", "the index property");
-	int index = PyLong_AsSsize_t( value ); /* -1 on error, will raise an error in this case */
-	if (index < 0 || index >= JOYINDEX_MAX) {
-		PyErr_SetString(PyExc_ValueError, "joystick index out of range or not an int");
-		return NULL;
-	}
-	
-	m_joyindex = index;
-	Py_RETURN_NONE;
-}
-
-/* get axis  ---------------------------------------------------------- */
-const char SCA_JoystickSensor::GetAxis_doc[] = 
-"getAxis\n"
-"\tReturns the current axis this sensor reacts to.\n";
-PyObject* SCA_JoystickSensor::PyGetAxis( ) {
-	ShowDeprecationWarning("getAxis()", "the axis property");
-	return Py_BuildValue("[ii]",m_axis, m_axisf);
-}
-
-
-/* set axis  ---------------------------------------------------------- */
-const char SCA_JoystickSensor::SetAxis_doc[] = 
-"setAxis\n"
-"\tSets the current axis this sensor reacts to.\n";
-PyObject* SCA_JoystickSensor::PySetAxis( PyObject* args ) {
-	ShowDeprecationWarning("setAxis()", "the axis property");
-	
-	int axis,axisflag;
-	if(!PyArg_ParseTuple(args, "ii:setAxis", &axis, &axisflag)){
-		return NULL;
-	}
-	m_axis = axis;
-	m_axisf = axisflag;
-	
-	CheckAxis((void *)this, NULL); /* clamp values */
-	Py_RETURN_NONE;
-}
-
-
-/* get axis value ----------------------------------------------------- */
-const char SCA_JoystickSensor::GetAxisValue_doc[] = 
-"getAxisValue\n"
-"\tReturns a list of the values for the current state of each axis.\n";
-PyObject* SCA_JoystickSensor::PyGetAxisValue( ) {
-	ShowDeprecationWarning("getAxisValue()", "the axisPosition property");
-	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
-	
-	int axis_index= joy->GetNumberOfAxes();
-	PyObject *list= PyList_New(axis_index);
-	
-	while(axis_index--) {
-		PyList_SET_ITEM(list, axis_index, PyLong_FromSsize_t(joy->GetAxisPosition(axis_index)));
-	}
-	
-	return list;
-}
-
-
-/* get threshold  ----------------------------------------------------- */
-const char SCA_JoystickSensor::GetThreshold_doc[] = 
-"getThreshold\n"
-"\tReturns the threshold of the axis.\n";
-PyObject* SCA_JoystickSensor::PyGetThreshold( ) {
-	ShowDeprecationWarning("getThreshold()", "the threshold property");
-	return PyLong_FromSsize_t(m_precision);
-}
-
-
-/* set threshold  ----------------------------------------------------- */
-const char SCA_JoystickSensor::SetThreshold_doc[] = 
-"setThreshold\n"
-"\tSets the threshold of the axis.\n";
-PyObject* SCA_JoystickSensor::PySetThreshold( PyObject* args ) {
-	ShowDeprecationWarning("setThreshold()", "the threshold property");
-	int thresh;
-	if(!PyArg_ParseTuple(args, "i:setThreshold", &thresh)){
-		return NULL;
-	}
-	m_precision = thresh;
-	Py_RETURN_NONE;
-}
-
-/* get button  -------------------------------------------------------- */
-const char SCA_JoystickSensor::GetButton_doc[] = 
-"getButton\n"
-"\tReturns the current button this sensor is checking.\n";
-PyObject* SCA_JoystickSensor::PyGetButton( ) {
-	ShowDeprecationWarning("getButton()", "the button property");
-	return PyLong_FromSsize_t(m_button);
-}
-
-/* set button  -------------------------------------------------------- */
-const char SCA_JoystickSensor::SetButton_doc[] = 
-"setButton\n"
-"\tSets the button the sensor reacts to.\n";
-PyObject* SCA_JoystickSensor::PySetButton( PyObject* value ) {
-	ShowDeprecationWarning("setButton()", "the button property");
-	int button = PyLong_AsSsize_t(value);
-	if(button==-1 && PyErr_Occurred()) {
-		PyErr_SetString(PyExc_ValueError, "expected an int");
-		return NULL;
-	}
-	m_button = button;
-	Py_RETURN_NONE;	
-}
-
-/* get button value  -------------------------------------------------- */
-const char SCA_JoystickSensor::GetButtonValue_doc[] = 
-"getButtonValue\n"
-"\tReturns a list containing the indicies of the current pressed state of each button.\n";
-PyObject* SCA_JoystickSensor::PyGetButtonValue( ) {
-	ShowDeprecationWarning("getButtonValue()", "getButtonActiveList");
-	return PyGetButtonActiveList( );
-}
-
 /* get button active list  -------------------------------------------------- */
 const char SCA_JoystickSensor::GetButtonActiveList_doc[] = 
 "getButtonActiveList\n"
@@ -485,75 +335,6 @@ PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args ) {
 	return PyBool_FromLong(0);
 }
 
-/* get hat	----------------------------------------------------------- */
-const char SCA_JoystickSensor::GetHat_doc[] = 
-"getHat\n"
-"\tReturns the current direction of the hat.\n";
-PyObject* SCA_JoystickSensor::PyGetHat( ) {
-	ShowDeprecationWarning("getHat()", "the hat property");
-	return Py_BuildValue("[ii]",m_hat, m_hatf);
-}
-
-
-/* set hat	----------------------------------------------------------- */
-const char SCA_JoystickSensor::SetHat_doc[] = 
-"setHat\n"
-"\tSets the hat the sensor reacts to.\n";
-PyObject* SCA_JoystickSensor::PySetHat( PyObject* args ) {
-	ShowDeprecationWarning("setHat()", "the hat property");
-	int hat,hatflag;
-	if(!PyArg_ParseTuple(args, "ii:setHat", &hat, &hatflag)){
-		return NULL;
-	}
-	m_hat = hat;
-	m_hatf = hatflag;
-	
-	CheckHat((void *)this, NULL); /* clamp values */
-	Py_RETURN_NONE;
-}
-
-
-/* get # of ----------------------------------------------------- */
-const char SCA_JoystickSensor::NumberOfAxes_doc[] = 
-"getNumAxes\n"
-"\tReturns the number of axes .\n";
-PyObject* SCA_JoystickSensor::PyNumberOfAxes( ) {
-	ShowDeprecationWarning("getNumAxes()", "the numAxis property");
-	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
-	// when the joystick is null their is 0 exis still. dumb but scripters should use isConnected()
-	return PyLong_FromSsize_t( joy ? joy->GetNumberOfAxes() : 0 );
-}
-
-
-const char SCA_JoystickSensor::NumberOfButtons_doc[] = 
-"getNumButtons\n"
-"\tReturns the number of buttons .\n";
-PyObject* SCA_JoystickSensor::PyNumberOfButtons( ) {
-	ShowDeprecationWarning("getNumButtons()", "the numButtons property");
-	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
-	return PyLong_FromSsize_t( joy ? joy->GetNumberOfButtons() : 0 );
-}
-
-
-const char SCA_JoystickSensor::NumberOfHats_doc[] = 
-"getNumHats\n"
-"\tReturns the number of hats .\n";
-PyObject* SCA_JoystickSensor::PyNumberOfHats( ) {
-	ShowDeprecationWarning("getNumHats()", "the numHats property");
-	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
-	return PyLong_FromSsize_t( joy ? joy->GetNumberOfHats() : 0 );
-}
-
-const char SCA_JoystickSensor::Connected_doc[] = 
-"getConnected\n"
-"\tReturns True if a joystick is connected at this joysticks index.\n";
-PyObject* SCA_JoystickSensor::PyConnected( ) {
-	ShowDeprecationWarning("getConnected()", "the connected property");
-	SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
-	return PyBool_FromLong( joy ? joy->Connected() : 0 );
-}
-
-
 PyObject* SCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index 1189b1ec18c..b793c591ac1 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -122,28 +122,8 @@ public:
 	/* --------------------------------------------------------------------- */
 
 	/* Joystick Index */
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetIndex);
-	KX_PYMETHOD_DOC_O(SCA_JoystickSensor,SetIndex);
-	/* Axes*/
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetAxis);
-	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetAxis);
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetAxisValue);
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetThreshold);
-	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetThreshold);
-	/* Buttons */
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetButton);
-	KX_PYMETHOD_DOC_O(SCA_JoystickSensor,SetButton);
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetButtonValue);
 	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetButtonActiveList);
 	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,GetButtonStatus);
-	/* Hats */
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetHat);
-	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetHat);
-	/* number of */
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,NumberOfAxes);
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,NumberOfButtons);
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,NumberOfHats);
-	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,Connected);
 
 	static PyObject*	pyattr_get_axis_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_axis_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index 13b32b5446c..d2e3871fec2 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -408,184 +408,6 @@ void SCA_KeyboardSensor::LogKeystrokes(void)
 /* Python Functions						       */
 /* ------------------------------------------------------------------------- */
 
-//Deprecated ----->
-/** 1. GetKey : check which key this sensor looks at */
-const char SCA_KeyboardSensor::GetKey_doc[] = 
-"getKey()\n"
-"\tReturn the code of the key this sensor is listening to.\n" ;
-PyObject* SCA_KeyboardSensor::PyGetKey()
-{
-	ShowDeprecationWarning("getKey()", "the key property");
-	return PyLong_FromSsize_t(m_hotkey);
-}
-
-/** 2. SetKey: change the key to look at */
-const char SCA_KeyboardSensor::SetKey_doc[] = 
-"setKey(keycode)\n"
-"\t- keycode: any code from GameKeys\n"
-"\tSet the key this sensor should listen to.\n" ;
-PyObject* SCA_KeyboardSensor::PySetKey(PyObject* args)
-{
-	ShowDeprecationWarning("setKey()", "the key property");
-	int keyCode;
-	
-	if(!PyArg_ParseTuple(args, "i:setKey", &keyCode)) {
-		return NULL;
-	}
-
-	/* Since we have symbolic constants for this in Python, we don't guard   */
-	/* anything. It's up to the user to provide a sensible number.           */
-	m_hotkey = keyCode;
-
-	Py_RETURN_NONE;
-}
-
-/** 3. GetHold1 : set the first bucky bit */
-const char SCA_KeyboardSensor::GetHold1_doc[] = 
-"getHold1()\n"
-"\tReturn the code of the first key modifier to the key this \n"
-"\tsensor is listening to.\n" ;
-PyObject* SCA_KeyboardSensor::PyGetHold1()
-{
-	ShowDeprecationWarning("getHold1()", "the hold1 property");
-	return PyLong_FromSsize_t(m_qual);
-}
-
-/** 4. SetHold1: change the first bucky bit */
-const char SCA_KeyboardSensor::SetHold1_doc[] = 
-"setHold1(keycode)\n"
-"\t- keycode: any code from GameKeys\n"
-"\tSet the first modifier to the key this sensor should listen to.\n" ;
-PyObject* SCA_KeyboardSensor::PySetHold1(PyObject* args)
-{
-	ShowDeprecationWarning("setHold1()", "the hold1 property");
-	int keyCode;
-
-	if(!PyArg_ParseTuple(args, "i:setHold1", &keyCode)) {
-		return NULL;
-	}
-	
-	/* Since we have symbolic constants for this in Python, we don't guard   */
-	/* anything. It's up to the user to provide a sensible number.           */
-	m_qual = keyCode;
-
-	Py_RETURN_NONE;
-}
-	
-/** 5. GetHold2 : get the second bucky bit */
-const char SCA_KeyboardSensor::GetHold2_doc[] = 
-"getHold2()\n"
-"\tReturn the code of the second key modifier to the key this \n"
-"\tsensor is listening to.\n" ;
-PyObject* SCA_KeyboardSensor::PyGetHold2()
-{
-	ShowDeprecationWarning("getHold2()", "the hold2 property");
-	return PyLong_FromSsize_t(m_qual2);
-}
-
-/** 6. SetHold2: change the second bucky bit */
-const char SCA_KeyboardSensor::SetHold2_doc[] = 
-"setHold2(keycode)\n"
-"\t- keycode: any code from GameKeys\n"
-"\tSet the first modifier to the key this sensor should listen to.\n" ;
-PyObject* SCA_KeyboardSensor::PySetHold2(PyObject* args)
-{
-	ShowDeprecationWarning("setHold2()", "the hold2 property");
-	int keyCode;
-
-	if(!PyArg_ParseTuple(args, "i:setHold2", &keyCode)) {
-		return NULL;
-	}
-	
-	/* Since we have symbolic constants for this in Python, we don't guard   */
-	/* anything. It's up to the user to provide a sensible number.           */
-	m_qual2 = keyCode;
-
-	Py_RETURN_NONE;
-}
-
-	
-const char SCA_KeyboardSensor::GetPressedKeys_doc[] = 
-"getPressedKeys()\n"
-"\tGet a list of pressed keys that have either been pressed, or just released this frame.\n" ;
-
-PyObject* SCA_KeyboardSensor::PyGetPressedKeys()
-{
-	ShowDeprecationWarning("getPressedKeys()", "events");
-
-	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
-
-	int num = inputdev->GetNumJustEvents();
-	PyObject* resultlist = PyList_New(num);
-
-	if (num > 0)
-	{
-		
-		int index = 0;
-		
-		for (int i=SCA_IInputDevice::KX_BEGINKEY ; i<= SCA_IInputDevice::KX_ENDKEY;i++)
-		{
-			const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) i);
-			if ((inevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED)
-				|| (inevent.m_status == SCA_InputEvent::KX_JUSTRELEASED))
-			{
-				PyObject* keypair = PyList_New(2);
-				PyList_SET_ITEM(keypair,0,PyLong_FromSsize_t(i));
-				PyList_SET_ITEM(keypair,1,PyLong_FromSsize_t(inevent.m_status));
-				PyList_SET_ITEM(resultlist,index,keypair);
-				index++;
-				
-				if (index >= num) /* should not happen */
-					break; 
-			}
-		}
-	}
-	
-	return resultlist;
-}
-
-
-
-const char SCA_KeyboardSensor::GetCurrentlyPressedKeys_doc[] = 
-"getCurrentlyPressedKeys()\n"
-"\tGet a list of keys that are currently pressed.\n" ;
-
-PyObject* SCA_KeyboardSensor::PyGetCurrentlyPressedKeys()
-{
-	ShowDeprecationWarning("getCurrentlyPressedKeys()", "events");
-
-	SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
-
-	int num = inputdev->GetNumActiveEvents();
-	PyObject* resultlist = PyList_New(num);
-
-	if (num > 0)
-	{
-		int index = 0;
-		
-		for (int i=SCA_IInputDevice::KX_BEGINKEY ; i<= SCA_IInputDevice::KX_ENDKEY;i++)
-		{
-			const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) i);
-			if ( (inevent.m_status == SCA_InputEvent::KX_ACTIVE)
-				 || (inevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED))
-			{
-				PyObject* keypair = PyList_New(2);
-				PyList_SET_ITEM(keypair,0,PyLong_FromSsize_t(i));
-				PyList_SET_ITEM(keypair,1,PyLong_FromSsize_t(inevent.m_status));
-				PyList_SET_ITEM(resultlist,index,keypair);
-				index++;
-				
-				if (index >= num) /* should never happen */
-					break;
-			}
-		}
-	}
-
-	return resultlist;
-}
-
-//<---- Deprecated
-
 KX_PYMETHODDEF_DOC_O(SCA_KeyboardSensor, getKeyStatus,
 "getKeyStatus(keycode)\n"
 "\tGet the given key's status (KX_NO_INPUTSTATUS, KX_JUSTACTIVATED, KX_ACTIVE or KX_JUSTRELEASED).\n")
@@ -635,16 +457,6 @@ PyTypeObject SCA_KeyboardSensor::Type = {
 };
 
 PyMethodDef SCA_KeyboardSensor::Methods[] = {
-	//Deprecated functions ------>
-	{"getKey", (PyCFunction) SCA_KeyboardSensor::sPyGetKey, METH_NOARGS, (const char *)GetKey_doc},
-	{"setKey", (PyCFunction) SCA_KeyboardSensor::sPySetKey, METH_VARARGS, (const char *)SetKey_doc},
-	{"getHold1", (PyCFunction) SCA_KeyboardSensor::sPyGetHold1, METH_NOARGS, (const char *)GetHold1_doc},
-	{"setHold1", (PyCFunction) SCA_KeyboardSensor::sPySetHold1, METH_VARARGS, (const char *)SetHold1_doc},
-	{"getHold2", (PyCFunction) SCA_KeyboardSensor::sPyGetHold2, METH_NOARGS, (const char *)GetHold2_doc},
-	{"setHold2", (PyCFunction) SCA_KeyboardSensor::sPySetHold2, METH_VARARGS, (const char *)SetHold2_doc},
-	{"getPressedKeys", (PyCFunction) SCA_KeyboardSensor::sPyGetPressedKeys, METH_NOARGS, (const char *)GetPressedKeys_doc},
-	{"getCurrentlyPressedKeys", (PyCFunction) SCA_KeyboardSensor::sPyGetCurrentlyPressedKeys, METH_NOARGS, (const char *)GetCurrentlyPressedKeys_doc},
-	//<----- Deprecated
 	KX_PYMETHODTABLE_O(SCA_KeyboardSensor, getKeyStatus),
 	{NULL,NULL} //Sentinel
 };
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index bce56b800e6..d7e0f301a9d 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -107,25 +107,6 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	//Deprecated functions ----->
-	/** 1. GetKey : check which key this sensor looks at */
-	KX_PYMETHOD_DOC_NOARGS(SCA_KeyboardSensor,GetKey);
-	/** 2. SetKey: change the key to look at */
-	KX_PYMETHOD_DOC_VARARGS(SCA_KeyboardSensor,SetKey);
-	/** 3. GetHold1 : set the first bucky bit */
-	KX_PYMETHOD_DOC_NOARGS(SCA_KeyboardSensor,GetHold1);
-	/** 4. SetHold1: change the first bucky bit */
-	KX_PYMETHOD_DOC_VARARGS(SCA_KeyboardSensor,SetHold1);
-	/** 5. GetHold2 : set the second bucky bit */
-	KX_PYMETHOD_DOC_NOARGS(SCA_KeyboardSensor,GetHold2);
-	/** 6. SetHold2: change the second bucky bit */
-	KX_PYMETHOD_DOC_VARARGS(SCA_KeyboardSensor,SetHold2);
-	/** 9. GetPressedKeys: */
-	KX_PYMETHOD_DOC_NOARGS(SCA_KeyboardSensor,GetPressedKeys); 
-	/** 9. GetCurrrentlyPressedKeys: */
-	KX_PYMETHOD_DOC_NOARGS(SCA_KeyboardSensor,GetCurrentlyPressedKeys); 
-	// <------
-	
 	// KeyEvents: 
 	KX_PYMETHOD_DOC_NOARGS(SCA_KeyboardSensor,getEventList); 
 	// KeyStatus: 
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
index e19b5a3956b..9d32682eaa9 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
@@ -243,30 +243,6 @@ bool SCA_MouseSensor::isValid(SCA_MouseSensor::KX_MOUSESENSORMODE m)
 /* Python functions                                                          */
 /* ------------------------------------------------------------------------- */
 
-//Deprecated functions ------>
-/* get x position ---------------------------------------------------------- */
-const char SCA_MouseSensor::GetXPosition_doc[] = 
-"getXPosition\n"
-"\tReturns the x-coordinate of the mouse sensor, in frame coordinates.\n"
-"\tThe lower-left corner is the origin. The coordinate is given in\n"
-"\tpixels\n";
-PyObject* SCA_MouseSensor::PyGetXPosition() {
-	ShowDeprecationWarning("getXPosition()", "the position property");
-	return PyLong_FromSsize_t(m_x);
-}
-
-/* get y position ---------------------------------------------------------- */
-const char SCA_MouseSensor::GetYPosition_doc[] = 
-"getYPosition\n"
-"\tReturns the y-coordinate of the mouse sensor, in frame coordinates.\n"
-"\tThe lower-left corner is the origin. The coordinate is given in\n"
-"\tpixels\n";
-PyObject* SCA_MouseSensor::PyGetYPosition() {
-	ShowDeprecationWarning("getYPosition()", "the position property");
-	return PyLong_FromSsize_t(m_y);
-}
-//<----- Deprecated
-
 KX_PYMETHODDEF_DOC_O(SCA_MouseSensor, getButtonStatus,
 "getButtonStatus(button)\n"
 "\tGet the given button's status (KX_INPUT_NONE, KX_INPUT_NONE, KX_INPUT_JUST_ACTIVATED, KX_INPUT_ACTIVE, KX_INPUT_JUST_RELEASED).\n")
@@ -316,10 +292,6 @@ PyTypeObject SCA_MouseSensor::Type = {
 };
 
 PyMethodDef SCA_MouseSensor::Methods[] = {
-	//Deprecated functions ------>
-	{"getXPosition", (PyCFunction) SCA_MouseSensor::sPyGetXPosition, METH_VARARGS, (const char *)GetXPosition_doc},
-	{"getYPosition", (PyCFunction) SCA_MouseSensor::sPyGetYPosition, METH_VARARGS, (const char *)GetYPosition_doc},
-	//<----- Deprecated
 	KX_PYMETHODTABLE_O(SCA_MouseSensor, getButtonStatus),
 	{NULL,NULL} //Sentinel
 };
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index ad74a77a219..a679e605428 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -106,13 +106,6 @@ class SCA_MouseSensor : public SCA_ISensor
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	//Deprecated functions ----->
-	/* read x-coordinate */
-	KX_PYMETHOD_DOC_NOARGS(SCA_MouseSensor,GetXPosition);
-	/* read y-coordinate */
-	KX_PYMETHOD_DOC_NOARGS(SCA_MouseSensor,GetYPosition);
-	//<----- deprecated
 	
 	// get button status
 	KX_PYMETHOD_DOC_O(SCA_MouseSensor,getButtonStatus);
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
index 5afb537c28a..9446487cdb7 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
@@ -250,12 +250,6 @@ PyTypeObject SCA_PropertyActuator::Type = {
 };
 
 PyMethodDef SCA_PropertyActuator::Methods[] = {
-	//Deprecated functions ------>
-	{"setProperty", (PyCFunction) SCA_PropertyActuator::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"getProperty", (PyCFunction) SCA_PropertyActuator::sPyGetProperty, METH_VARARGS, (const char *)GetProperty_doc},
-	{"setValue", (PyCFunction) SCA_PropertyActuator::sPySetValue, METH_VARARGS, (const char *)SetValue_doc},
-	{"getValue", (PyCFunction) SCA_PropertyActuator::sPyGetValue, METH_VARARGS, (const char *)GetValue_doc},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -266,71 +260,4 @@ PyAttributeDef SCA_PropertyActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-/* 1. setProperty                                                        */
-const char SCA_PropertyActuator::SetProperty_doc[] = 
-"setProperty(name)\n"
-"\t- name: string\n"
-"\tSet the property on which to operate. If there is no property\n"
-"\tof this name, the call is ignored.\n";
-PyObject* SCA_PropertyActuator::PySetProperty(PyObject* args, PyObject* kwds)
-{
-	ShowDeprecationWarning("setProperty()", "the 'propName' property");
-	/* Check whether the name exists first ! */
-	char *nameArg;
-	if (!PyArg_ParseTuple(args, "s:setProperty", &nameArg)) {
-		return NULL;
-	}
-
-	CValue* prop = GetParent()->FindIdentifier(nameArg);
-
-	if (!prop->IsError()) {
-		m_propname = nameArg;
-	} else {
-		; /* not found ... */
-	}
-	prop->Release();
-	
-	Py_RETURN_NONE;
-}
-
-/* 2. getProperty                                                        */
-const char SCA_PropertyActuator::GetProperty_doc[] = 
-"getProperty(name)\n"
-"\tReturn the property on which the actuator operates.\n";
-PyObject* SCA_PropertyActuator::PyGetProperty(PyObject* args, PyObject* kwds)
-{
-	ShowDeprecationWarning("getProperty()", "the 'propName' property");
-	return PyUnicode_FromString(m_propname);
-}
-
-/* 3. setValue                                                        */
-const char SCA_PropertyActuator::SetValue_doc[] = 
-"setValue(value)\n"
-"\t- value: string\n"
-"\tSet the value with which the actuator operates. If the value\n"
-"\tis not compatible with the type of the property, the subsequent\n"
-"\t action is ignored.\n";
-PyObject* SCA_PropertyActuator::PySetValue(PyObject* args, PyObject* kwds)
-{
-	ShowDeprecationWarning("setValue()", "the value property");
-	char *valArg;
-	if(!PyArg_ParseTuple(args, "s:setValue", &valArg)) {
-		return NULL;		
-	}
-	
-	if (valArg)	m_exprtxt = valArg;
-
-	Py_RETURN_NONE;
-}
-
-/* 4. getValue                                                        */
-const char SCA_PropertyActuator::GetValue_doc[] = 
-"getValue()\n"
-"\tReturns the value with which the actuator operates.\n";
-PyObject* SCA_PropertyActuator::PyGetValue(PyObject* args, PyObject* kwds)
-{
-	ShowDeprecationWarning("getValue()", "the value property");
-	return PyUnicode_FromString(m_exprtxt);
-}
-
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h
index 8fb2e7a7bc5..833547a5cd3 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.h
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h
@@ -83,14 +83,6 @@ public:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	// python wrapped methods
-	KX_PYMETHOD_DOC(SCA_PropertyActuator,SetProperty);
-	KX_PYMETHOD_DOC(SCA_PropertyActuator,GetProperty);
-	KX_PYMETHOD_DOC(SCA_PropertyActuator,SetValue);
-	KX_PYMETHOD_DOC(SCA_PropertyActuator,GetValue);
-	
-	/* 5. - ... setObject, getObject, setProp2, getProp2, setMode, getMode*/
 	
 };
 
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index 96c769bd3d3..9c09c8410fb 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -324,14 +324,6 @@ PyTypeObject SCA_PropertySensor::Type = {
 };
 
 PyMethodDef SCA_PropertySensor::Methods[] = {
-	//Deprecated functions ------>
-	{"getType", (PyCFunction) SCA_PropertySensor::sPyGetType, METH_NOARGS, (const char *)GetType_doc},
-	{"setType", (PyCFunction) SCA_PropertySensor::sPySetType, METH_VARARGS, (const char *)SetType_doc},
-	{"getProperty", (PyCFunction) SCA_PropertySensor::sPyGetProperty, METH_NOARGS, (const char *)GetProperty_doc},
-	{"setProperty", (PyCFunction) SCA_PropertySensor::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"getValue", (PyCFunction) SCA_PropertySensor::sPyGetValue, METH_NOARGS, (const char *)GetValue_doc},
-	{"setValue", (PyCFunction) SCA_PropertySensor::sPySetValue, METH_VARARGS, (const char *)SetValue_doc},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -342,111 +334,4 @@ PyAttributeDef SCA_PropertySensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-/* 1. getType */
-const char SCA_PropertySensor::GetType_doc[] = 
-"getType()\n"
-"\tReturns the type of check this sensor performs.\n";
-PyObject* SCA_PropertySensor::PyGetType()
-{
-	ShowDeprecationWarning("getType()", "the mode property");
-	return PyLong_FromSsize_t(m_checktype);
-}
-
-/* 2. setType */
-const char SCA_PropertySensor::SetType_doc[] = 
-"setType(type)\n"
-"\t- type: KX_PROPSENSOR_EQUAL, KX_PROPSENSOR_NOTEQUAL,\n"
-"\t        KX_PROPSENSOR_INTERVAL, KX_PROPSENSOR_CHANGED,\n"
-"\t        or KX_PROPSENSOR_EXPRESSION.\n"
-"\tSet the type of check to perform.\n";
-PyObject* SCA_PropertySensor::PySetType(PyObject* args) 
-{
-	ShowDeprecationWarning("setType()", "the mode property");
-	int typeArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setType", &typeArg)) {
-		return NULL;
-	}
-	
-	if ( (typeArg > KX_PROPSENSOR_NODEF) 
-		 && (typeArg < KX_PROPSENSOR_MAX) ) {
-		m_checktype =  typeArg;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-/* 3. getProperty */
-const char SCA_PropertySensor::GetProperty_doc[] = 
-"getProperty()\n"
-"\tReturn the property with which the sensor operates.\n";
-PyObject* SCA_PropertySensor::PyGetProperty() 
-{
-	ShowDeprecationWarning("getProperty()", "the 'propName' property");
-	return PyUnicode_FromString(m_checkpropname);
-}
-
-/* 4. setProperty */
-const char SCA_PropertySensor::SetProperty_doc[] = 
-"setProperty(name)\n"
-"\t- name: string\n"
-"\tSets the property with which to operate. If there is no property\n"
-"\tof this name, the call is ignored.\n";
-PyObject* SCA_PropertySensor::PySetProperty(PyObject* args) 
-{
-	ShowDeprecationWarning("setProperty()", "the 'propName' property");
-	/* We should query whether the name exists. Or should we create a prop   */
-	/* on the fly?                                                           */
-	char *propNameArg = NULL;
-
-	if (!PyArg_ParseTuple(args, "s:setProperty", &propNameArg)) {
-		return NULL;
-	}
-
-	CValue *prop = FindIdentifier(STR_String(propNameArg));
-	if (!prop->IsError()) {
-		m_checkpropname = propNameArg;
-	} else {
-		; /* error: bad property name */
-	}
-	prop->Release();
-	Py_RETURN_NONE;
-}
-
-/* 5. getValue */
-const char SCA_PropertySensor::GetValue_doc[] = 
-"getValue()\n"
-"\tReturns the value with which the sensor operates.\n";
-PyObject* SCA_PropertySensor::PyGetValue() 
-{
-	ShowDeprecationWarning("getValue()", "the value property");
-	return PyUnicode_FromString(m_checkpropval);
-}
-
-/* 6. setValue */
-const char SCA_PropertySensor::SetValue_doc[] = 
-"setValue(value)\n"
-"\t- value: string\n"
-"\tSet the value with which the sensor operates. If the value\n"
-"\tis not compatible with the type of the property, the subsequent\n"
-"\t action is ignored.\n";
-PyObject* SCA_PropertySensor::PySetValue(PyObject* args) 
-{
-	ShowDeprecationWarning("setValue()", "the value property");
-	/* Here, we need to check whether the value is 'valid' for this property.*/
-	/* We know that the property exists, or is NULL.                         */
-	char *propValArg = NULL;
-
-	if(!PyArg_ParseTuple(args, "s:setValue", &propValArg)) {
-		return NULL;
-	}
-	STR_String oldval = m_checkpropval;
-	m_checkpropval = propValArg;
-	if (validValueForProperty(m_proxy, NULL)) {
-		m_checkpropval = oldval;
-		return NULL;
-	}	
-	Py_RETURN_NONE;
-}
-
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h
index 3513fcdf5ae..a5bbfc8438b 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.h
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.h
@@ -88,18 +88,6 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	/* 1. getType */
-	KX_PYMETHOD_DOC_NOARGS(SCA_PropertySensor,GetType);
-	/* 2. setType */
-	KX_PYMETHOD_DOC_VARARGS(SCA_PropertySensor,SetType);
-	/* 3. setProperty */
-	KX_PYMETHOD_DOC_VARARGS(SCA_PropertySensor,SetProperty);
-	/* 4. getProperty */
-	KX_PYMETHOD_DOC_NOARGS(SCA_PropertySensor,GetProperty);
-	/* 5. getValue */
-	KX_PYMETHOD_DOC_NOARGS(SCA_PropertySensor,GetValue);
-	/* 6. setValue */
-	KX_PYMETHOD_DOC_VARARGS(SCA_PropertySensor,SetValue);
 	/**
 	 * Test whether this is a sensible value (type check)
 	 */
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 8ece7fb4ae1..ecaa8c508db 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -204,27 +204,7 @@ SCA_IActuator* SCA_PythonController::LinkedActuatorFromPy(PyObject *value)
 	return false;
 }
 
-/* warning, self is not the SCA_PythonController, its a PyObjectPlus_Proxy */
-PyObject* SCA_PythonController::sPyAddActiveActuator(PyObject* self, PyObject* args)
-{
-	ShowDeprecationWarning("GameLogic.addActiveActuator(act, bool)", "controller.activate(act) or controller.deactivate(act)");
-	
-	PyObject* ob1;
-	int activate;
-	if (!PyArg_ParseTuple(args, "Oi:addActiveActuator", &ob1,&activate))
-		return NULL;
-	
-	SCA_IActuator* actu = LinkedActuatorFromPy(ob1);
-	if(actu==NULL)
-		return NULL;
-	
-	bool boolval = (activate!=0);
-	m_sCurrentLogicManager->AddActiveActuator((SCA_IActuator*)actu,boolval);
-	Py_RETURN_NONE;
-}
-
 const char* SCA_PythonController::sPyGetCurrentController__doc__ = "getCurrentController()";
-const char* SCA_PythonController::sPyAddActiveActuator__doc__= "addActiveActuator(actuator,bool)";
 
 PyTypeObject SCA_PythonController::Type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
@@ -251,11 +231,6 @@ PyTypeObject SCA_PythonController::Type = {
 PyMethodDef SCA_PythonController::Methods[] = {
 	{"activate", (PyCFunction) SCA_PythonController::sPyActivate, METH_O},
 	{"deactivate", (PyCFunction) SCA_PythonController::sPyDeActivate, METH_O},
-	
-	//Deprecated functions ------>
-	{"setScript", (PyCFunction) SCA_PythonController::sPySetScript, METH_O},
-	{"getScript", (PyCFunction) SCA_PythonController::sPyGetScript, METH_NOARGS},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -510,33 +485,6 @@ PyObject* SCA_PythonController::PyDeActivate(PyObject *value)
 	Py_RETURN_NONE;
 }
 
-/* 1. getScript */
-PyObject* SCA_PythonController::PyGetScript()
-{
-	ShowDeprecationWarning("getScript()", "the script property");
-	return PyUnicode_FromString(m_scriptText);
-}
-
-/* 2. setScript */
-PyObject* SCA_PythonController::PySetScript(PyObject* value)
-{
-	char *scriptArg = _PyUnicode_AsString(value);
-	
-	ShowDeprecationWarning("setScript()", "the script property");
-	
-	if (scriptArg==NULL) {
-		PyErr_SetString(PyExc_TypeError, "expected a string (script name)");
-		return NULL;
-	}
-	
-	/* set scripttext sets m_bModified to true, 
-		so next time the script is needed, a reparse into byte code is done */
-
-	this->SetScriptText(scriptArg);
-	
-	Py_RETURN_NONE;
-}
-
 PyObject* SCA_PythonController::pyattr_get_script(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	//SCA_PythonController* self= static_cast<SCA_PythonController*>(static_cast<SCA_IController*>(static_cast<SCA_ILogicBrick*>(static_cast<CValue*>(static_cast<PyObjectPlus*>(self_v)))));
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
index 2b10f491378..a3a5cc2303e 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
@@ -337,15 +337,6 @@ PyTypeObject SCA_RandomActuator::Type = {
 };
 
 PyMethodDef SCA_RandomActuator::Methods[] = {
-	//Deprecated functions ------>
-	{"setSeed",         (PyCFunction) SCA_RandomActuator::sPySetSeed, METH_VARARGS, (const char *)SetSeed_doc},
-	{"getSeed",         (PyCFunction) SCA_RandomActuator::sPyGetSeed, METH_NOARGS, (const char *)GetSeed_doc},
-	{"getPara1",        (PyCFunction) SCA_RandomActuator::sPyGetPara1, METH_NOARGS, (const char *)GetPara1_doc},
-	{"getPara2",        (PyCFunction) SCA_RandomActuator::sPyGetPara2, METH_NOARGS, (const char *)GetPara2_doc},
-	{"getDistribution", (PyCFunction) SCA_RandomActuator::sPyGetDistribution, METH_NOARGS, (const char *)GetDistribution_doc},
-	{"setProperty",     (PyCFunction) SCA_RandomActuator::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"getProperty",     (PyCFunction) SCA_RandomActuator::sPyGetProperty, METH_NOARGS, (const char *)GetProperty_doc},
-	//<----- Deprecated
 	KX_PYMETHODTABLE(SCA_RandomActuator, setBoolConst),
 	KX_PYMETHODTABLE_NOARGS(SCA_RandomActuator, setBoolUniform),
 	KX_PYMETHODTABLE(SCA_RandomActuator, setBoolBernouilli),
@@ -389,104 +380,6 @@ int SCA_RandomActuator::pyattr_set_seed(void *self, const struct KX_PYATTRIBUTE_
 	}
 }
 
-/* 1. setSeed                                                            */
-const char SCA_RandomActuator::SetSeed_doc[] = 
-"setSeed(seed)\n"
-"\t- seed: integer\n"
-"\tSet the initial seed of the generator. Equal seeds produce\n"
-"\tequal series. If the seed is 0, the generator will produce\n"
-"\tthe same value on every call.\n";
-PyObject* SCA_RandomActuator::PySetSeed(PyObject* args) {
-	ShowDeprecationWarning("setSeed()", "the seed property");
-	long seedArg;
-	if(!PyArg_ParseTuple(args, "i:setSeed", &seedArg)) {
-		return NULL;
-	}
-	
-	m_base->SetSeed(seedArg);
-	
-	Py_RETURN_NONE;
-}
-/* 2. getSeed                                                            */
-const char SCA_RandomActuator::GetSeed_doc[] = 
-"getSeed()\n"
-"\tReturns the initial seed of the generator. Equal seeds produce\n"
-"\tequal series.\n";
-PyObject* SCA_RandomActuator::PyGetSeed()
-{
-	ShowDeprecationWarning("getSeed()", "the seed property");
-	return PyLong_FromSsize_t(m_base->GetSeed());
-}
-
-/* 4. getPara1                                                           */
-const char SCA_RandomActuator::GetPara1_doc[] = 
-"getPara1()\n"
-"\tReturns the first parameter of the active distribution. Refer\n"
-"\tto the documentation of the generator types for the meaning\n"
-"\tof this value.";
-PyObject* SCA_RandomActuator::PyGetPara1()
-{
-	ShowDeprecationWarning("getPara1()", "the para1 property");
-	return PyFloat_FromDouble(m_parameter1);
-}
-
-/* 6. getPara2                                                           */
-const char SCA_RandomActuator::GetPara2_doc[] = 
-"getPara2()\n"
-"\tReturns the first parameter of the active distribution. Refer\n"
-"\tto the documentation of the generator types for the meaning\n"
-"\tof this value.";
-PyObject* SCA_RandomActuator::PyGetPara2()
-{
-	ShowDeprecationWarning("getPara2()", "the para2 property");
-	return PyFloat_FromDouble(m_parameter2);
-}
-
-/* 8. getDistribution                                                    */
-const char SCA_RandomActuator::GetDistribution_doc[] = 
-"getDistribution()\n"
-"\tReturns the type of the active distribution.\n";
-PyObject* SCA_RandomActuator::PyGetDistribution()
-{
-	ShowDeprecationWarning("getDistribution()", "the distribution property");
-	return PyLong_FromSsize_t(m_distribution);
-}
-
-/* 9. setProperty                                                        */
-const char SCA_RandomActuator::SetProperty_doc[] = 
-"setProperty(name)\n"
-"\t- name: string\n"
-"\tSet the property to which the random value is assigned. If the \n"
-"\tgenerator and property types do not match, the assignment is ignored.\n";
-PyObject* SCA_RandomActuator::PySetProperty(PyObject* args) {
-	ShowDeprecationWarning("setProperty()", "the 'propName' property");
-	char *nameArg;
-	if (!PyArg_ParseTuple(args, "s:setProperty", &nameArg)) {
-		return NULL;
-	}
-
-	CValue* prop = GetParent()->FindIdentifier(nameArg);
-
-	if (!prop->IsError()) {
-		m_propname = nameArg;
-	} else {
-		; /* not found ... */
-	}
-	prop->Release();
-	
-	Py_RETURN_NONE;
-}
-/* 10. getProperty                                                       */
-const char SCA_RandomActuator::GetProperty_doc[] = 
-"getProperty(name)\n"
-"\tReturn the property to which the random value is assigned. If the \n"
-"\tgenerator and property types do not match, the assignment is ignored.\n";
-PyObject* SCA_RandomActuator::PyGetProperty()
-{
-	ShowDeprecationWarning("getProperty()", "the 'propName' property");
-	return PyUnicode_FromString(m_propname);
-}
-
 /* 11. setBoolConst */
 KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setBoolConst,
 "setBoolConst(value)\n"
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h
index c7d3fe21217..f84c44b43c9 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.h
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.h
@@ -99,16 +99,6 @@ class SCA_RandomActuator : public SCA_IActuator
 	static PyObject* pyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-	// Deprecated methods ----->
-	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator,SetSeed);
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator,GetSeed);
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator,GetPara1);
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator,GetPara2);
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator,GetDistribution);
-	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator,SetProperty);
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator,GetProperty);
-	// <-----
-
 	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setBoolConst);
 	KX_PYMETHOD_DOC_NOARGS(SCA_RandomActuator, setBoolUniform);
 	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setBoolBernouilli);
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
index a09d8328906..890875e61c6 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
@@ -152,11 +152,6 @@ PyTypeObject SCA_RandomSensor::Type = {
 };
 
 PyMethodDef SCA_RandomSensor::Methods[] = {
-	//Deprecated functions ----->
-	{"setSeed",     (PyCFunction) SCA_RandomSensor::sPySetSeed, METH_VARARGS, (const char *)SetSeed_doc},
-	{"getSeed",     (PyCFunction) SCA_RandomSensor::sPyGetSeed, METH_NOARGS, (const char *)GetSeed_doc},
-	{"getLastDraw", (PyCFunction) SCA_RandomSensor::sPyGetLastDraw, METH_NOARGS, (const char *)GetLastDraw_doc},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -166,45 +161,6 @@ PyAttributeDef SCA_RandomSensor::Attributes[] = {
 	{NULL} //Sentinel
 };
 
-/* 1. setSeed                                                            */
-const char SCA_RandomSensor::SetSeed_doc[] = 
-"setSeed(seed)\n"
-"\t- seed: integer\n"
-"\tSet the initial seed of the generator. Equal seeds produce\n"
-"\tequal series. If the seed is 0, the generator will produce\n"
-"\tthe same value on every call.\n";
-PyObject* SCA_RandomSensor::PySetSeed(PyObject* args) {
-	ShowDeprecationWarning("setSeed()", "the seed property");
-	long seedArg;
-	if(!PyArg_ParseTuple(args, "i:setSeed", &seedArg)) {
-		return NULL;
-	}
-	
-	m_basegenerator->SetSeed(seedArg);
-	
-	Py_RETURN_NONE;
-}
-
-/* 2. getSeed                                                            */
-const char SCA_RandomSensor::GetSeed_doc[] = 
-"getSeed()\n"
-"\tReturns the initial seed of the generator. Equal seeds produce\n"
-"\tequal series.\n";
-PyObject* SCA_RandomSensor::PyGetSeed() {
-	ShowDeprecationWarning("getSeed()", "the seed property");
-	return PyLong_FromSsize_t(m_basegenerator->GetSeed());
-}
-
-/* 3. getLastDraw                                                            */
-const char SCA_RandomSensor::GetLastDraw_doc[] = 
-"getLastDraw()\n"
-"\tReturn the last value that was drawn.\n";
-PyObject* SCA_RandomSensor::PyGetLastDraw() {
-	ShowDeprecationWarning("getLastDraw()", "the lastDraw property");
-	return PyLong_FromSsize_t(m_lastdraw);
-}
-
-
 PyObject* SCA_RandomSensor::pyattr_get_seed(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	SCA_RandomSensor* self= static_cast<SCA_RandomSensor*>(self_v);
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h
index 5e66c36cccf..f93cf57370e 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.h
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.h
@@ -59,13 +59,6 @@ public:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	/* 1. setSeed                                                            */
-	KX_PYMETHOD_DOC_VARARGS(SCA_RandomSensor,SetSeed);
-	/* 2. getSeed                                                            */
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomSensor,GetSeed);
-	/* 3. getLastDraw                                                        */
-	KX_PYMETHOD_DOC_NOARGS(SCA_RandomSensor,GetLastDraw);
 	
 	static PyObject*	pyattr_get_seed(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_seed(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
index 410cf308217..3af8f765251 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
@@ -123,16 +123,6 @@ PyTypeObject KX_NetworkMessageActuator::Type = {
 };
 
 PyMethodDef KX_NetworkMessageActuator::Methods[] = {
-	// Deprecated ----->
-	{"setToPropName", (PyCFunction)
-		KX_NetworkMessageActuator::sPySetToPropName, METH_VARARGS},
-	{"setSubject", (PyCFunction)
-		KX_NetworkMessageActuator::sPySetSubject, METH_VARARGS},
-	{"setBodyType", (PyCFunction)
-		KX_NetworkMessageActuator::sPySetBodyType, METH_VARARGS},
-	{"setBody", (PyCFunction)
-		KX_NetworkMessageActuator::sPySetBody, METH_VARARGS},
-	// <-----
 	{NULL,NULL} // Sentinel
 };
 
@@ -143,78 +133,3 @@ PyAttributeDef KX_NetworkMessageActuator::Attributes[] = {
 	KX_PYATTRIBUTE_STRING_RW("body", 0, 16384, false, KX_NetworkMessageActuator, m_body),
 	{ NULL }	//Sentinel
 };
-
-// Deprecated ----->
-// 1. SetToPropName
-PyObject* KX_NetworkMessageActuator::PySetToPropName(
-	PyObject* args,
-	PyObject* kwds)
-{
-	ShowDeprecationWarning("setToProp()", "the propName property");
-    char* ToPropName;
-
-	if (PyArg_ParseTuple(args, "s:setToPropName", &ToPropName)) {
-	     m_toPropName = ToPropName;
-	}
-	else {
-		return NULL;
-	}
-
-	Py_RETURN_NONE;
-}
-
-// 2. SetSubject
-PyObject* KX_NetworkMessageActuator::PySetSubject(
-	PyObject* args,
-	PyObject* kwds)
-{
-	ShowDeprecationWarning("setSubject()", "the subject property");
-    char* Subject;
-
-	if (PyArg_ParseTuple(args, "s:setSubject", &Subject)) {
-	     m_subject = Subject;
-	}
-	else {
-		return NULL;
-	}
-	
-	Py_RETURN_NONE;
-}
-
-// 3. SetBodyType
-PyObject* KX_NetworkMessageActuator::PySetBodyType(
-	PyObject* args,
-	PyObject* kwds)
-{
-	ShowDeprecationWarning("setBodyType()", "the usePropBody property");
-    int BodyType;
-
-	if (PyArg_ParseTuple(args, "i:setBodyType", &BodyType)) {
-		m_bPropBody = (BodyType != 0);
-	}
-	else {
-		return NULL;
-	}
-
-	Py_RETURN_NONE;
-}
-
-// 4. SetBody
-PyObject* KX_NetworkMessageActuator::PySetBody(
-	PyObject* args,
-	PyObject* kwds)
-{
-	ShowDeprecationWarning("setBody()", "the body property");
-    char* Body;
-
-	if (PyArg_ParseTuple(args, "s:setBody", &Body)) {
-	     m_body = Body;
-	}
-	else {
-		return NULL;
-	}
-
-	Py_RETURN_NONE;
-}
-
-// <----- Deprecated
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
index b4f55f2a466..fa7a674c250 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
@@ -60,13 +60,6 @@ public:
 	/* Python interface ------------------------------------------- */
 	/* ------------------------------------------------------------ */
 
-	// Deprecated ----->
-	KX_PYMETHOD(KX_NetworkMessageActuator, SetToPropName);
-	KX_PYMETHOD(KX_NetworkMessageActuator, SetSubject);
-	KX_PYMETHOD(KX_NetworkMessageActuator, SetBodyType);
-	KX_PYMETHOD(KX_NetworkMessageActuator, SetBody);
-	// <-----
-
 };
 
 #endif //__KX_NETWORKMESSAGEACTUATOR_H
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index 779c75b484f..392e9dd9d1b 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -186,23 +186,6 @@ PyTypeObject KX_NetworkMessageSensor::Type = {
 };
 
 PyMethodDef KX_NetworkMessageSensor::Methods[] = {
-	// Deprecated ----->
-	{"setSubjectFilterText", (PyCFunction)
-		KX_NetworkMessageSensor::sPySetSubjectFilterText, METH_O,
-		(const char *)SetSubjectFilterText_doc},
-	{"getFrameMessageCount", (PyCFunction)
-		KX_NetworkMessageSensor::sPyGetFrameMessageCount, METH_NOARGS,
-		(const char *)GetFrameMessageCount_doc},
-	{"getBodies", (PyCFunction)
-		KX_NetworkMessageSensor::sPyGetBodies, METH_NOARGS,
-		(const char *)GetBodies_doc},
-	{"getSubject", (PyCFunction)
-		KX_NetworkMessageSensor::sPyGetSubject, METH_NOARGS,
-		(const char *)GetSubject_doc},
-	{"getSubjects", (PyCFunction)
-		KX_NetworkMessageSensor::sPyGetSubjects, METH_NOARGS,
-		(const char *)GetSubjects_doc},
-	// <-----
 	{NULL,NULL} //Sentinel
 };
 
@@ -233,75 +216,3 @@ PyObject* KX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PY
 		return (new CListValue())->NewProxy(true);
 	}
 }
-
-// Deprecated ----->
-// 1. Set the message subject that this sensor listens for
-const char KX_NetworkMessageSensor::SetSubjectFilterText_doc[] = 
-"\tsetSubjectFilterText(value)\n"
-"\tChange the message subject text that this sensor is listening to.\n";
-
-PyObject* KX_NetworkMessageSensor::PySetSubjectFilterText(PyObject* value)
-{
-	ShowDeprecationWarning("setSubjectFilterText()", "subject");
-	char* Subject = _PyUnicode_AsString(value);
-	if (Subject==NULL) {
-		PyErr_SetString(PyExc_TypeError, "sensor.tsetSubjectFilterText(string): KX_NetworkMessageSensor, expected a string message");
-		return NULL;
-	}
-	
-	m_subject = Subject;
-	Py_RETURN_NONE;
-}
-
-// 2. Get the number of messages received since the last frame
-const char KX_NetworkMessageSensor::GetFrameMessageCount_doc[] =
-"\tgetFrameMessageCount()\n"
-"\tGet the number of messages received since the last frame.\n";
-
-PyObject* KX_NetworkMessageSensor::PyGetFrameMessageCount()
-{
-	ShowDeprecationWarning("getFrameMessageCount()", "frameMessageCount");
-	return PyLong_FromSsize_t(long(m_frame_message_count));
-}
-
-// 3. Get the message bodies
-const char KX_NetworkMessageSensor::GetBodies_doc[] =
-"\tgetBodies()\n"
-"\tGet the list of message bodies.\n";
-
-PyObject* KX_NetworkMessageSensor::PyGetBodies()
-{
-	ShowDeprecationWarning("getBodies()", "bodies");
-	if (m_BodyList) {
-		return m_BodyList->GetProxy();
-	} else {
-		return (new CListValue())->NewProxy(true);
-	}
-}
-
-// 4. Get the message subject: field of the message sensor
-const char KX_NetworkMessageSensor::GetSubject_doc[] =
-"\tgetSubject()\n"
-"\tGet the subject: field of the message sensor.\n";
-
-PyObject* KX_NetworkMessageSensor::PyGetSubject()
-{
-	ShowDeprecationWarning("getSubject()", "subject");
-	return PyUnicode_FromString(m_subject ? m_subject : "");
-}
-
-// 5. Get the message subjects
-const char KX_NetworkMessageSensor::GetSubjects_doc[] =
-"\tgetSubjects()\n"
-"\tGet list of message subjects.\n";
-
-PyObject* KX_NetworkMessageSensor::PyGetSubjects()
-{
-	ShowDeprecationWarning("getSubjects()", "subjects");
-	if (m_SubjectList) {
-		return m_SubjectList->GetProxy();
-	} else {
-		return (new CListValue())->NewProxy(true);
-	}
-}
-// <----- Deprecated
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
index c955e560e0a..d8a0651d2f1 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
@@ -70,14 +70,6 @@ public:
 	/* Python interface -------------------------------------------- */
 	/* ------------------------------------------------------------- */
 
-	// Deprecated ----->
-	KX_PYMETHOD_DOC_O(KX_NetworkMessageSensor, SetSubjectFilterText);
-	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetFrameMessageCount);
-	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetBodies);
-	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetSubject);
-	KX_PYMETHOD_DOC_NOARGS(KX_NetworkMessageSensor, GetSubjects);
-	// <-----
-
 	/* attributes */
 	static PyObject*	pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);	
 	static PyObject*	pyattr_get_subjects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index fd289a0b55e..0832809772d 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -496,12 +496,6 @@ PyMethodDef KX_Camera::Methods[] = {
 	KX_PYMETHODTABLE_O(KX_Camera, getScreenPosition),
 	KX_PYMETHODTABLE(KX_Camera, getScreenVect),
 	KX_PYMETHODTABLE(KX_Camera, getScreenRay),
-
-	// DEPRECATED
-	KX_PYMETHODTABLE_O(KX_Camera, enableViewport),
-	KX_PYMETHODTABLE_NOARGS(KX_Camera, getProjectionMatrix),
-	KX_PYMETHODTABLE_O(KX_Camera, setProjectionMatrix),
-	
 	{NULL,NULL} //Sentinel
 };
 
@@ -680,92 +674,6 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_Camera, getWorldToCamera,
 	return PyObjectFrom(GetWorldToCamera()); /* new ref */
 }
 
-KX_PYMETHODDEF_DOC_NOARGS(KX_Camera, getProjectionMatrix,
-"getProjectionMatrix() -> Matrix4x4\n"
-"\treturns this camera's projection matrix, as a list of four lists of four values.\n\n"
-"\tie: [[1.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0], [0.0, 0.0, 1.0, 0.0], [0.0, 0.0, 0.0, 1.0]])\n"
-)
-{
-	ShowDeprecationWarning("getProjectionMatrix()", "the projection_matrix property");
-	return PyObjectFrom(GetProjectionMatrix()); /* new ref */
-}
-
-KX_PYMETHODDEF_DOC_O(KX_Camera, setProjectionMatrix,
-"setProjectionMatrix(MT_Matrix4x4 m) -> None\n"
-"\tSets this camera's projection matrix\n"
-"\n"
-"\tExample:\n"
-"\timport GameLogic\n"
-"\t# Set a perspective projection matrix\n"
-"\tdef Perspective(left, right, bottom, top, near, far):\n"
-"\t\tm = MT_Matrix4x4()\n"
-"\t\tm[0][0] = m[0][2] = right - left\n"
-"\t\tm[1][1] = m[1][2] = top - bottom\n"
-"\t\tm[2][2] = m[2][3] = -far - near\n"
-"\t\tm[3][2] = -1\n"
-"\t\tm[3][3] = 0\n"
-"\t\treturn m\n"
-"\n"
-"\t# Set an orthographic projection matrix\n"
-"\tdef Orthographic(left, right, bottom, top, near, far):\n"
-"\t\tm = MT_Matrix4x4()\n"
-"\t\tm[0][0] = right - left\n"
-"\t\tm[0][3] = -right - left\n"
-"\t\tm[1][1] = top - bottom\n"
-"\t\tm[1][3] = -top - bottom\n"
-"\t\tm[2][2] = far - near\n"
-"\t\tm[2][3] = -far - near\n"
-"\t\tm[3][3] = 1\n"
-"\t\treturn m\n"
-"\n"
-"\t# Set an isometric projection matrix\n"
-"\tdef Isometric(left, right, bottom, top, near, far):\n"
-"\t\tm = MT_Matrix4x4()\n"
-"\t\tm[0][0] = m[0][2] = m[1][1] = 0.8660254037844386\n"
-"\t\tm[1][0] = 0.25\n"
-"\t\tm[1][2] = -0.25\n"
-"\t\tm[3][3] = 1\n"
-"\t\treturn m\n"
-"\n"
-"\t"
-"\tco = GameLogic.getCurrentController()\n"
-"\tcam = co.getOwner()\n"
-"\tcam.setProjectionMatrix(Perspective(-1.0, 1.0, -1.0, 1.0, 0.1, 1))\n")
-{
-	ShowDeprecationWarning("setProjectionMatrix(mat)", "the projection_matrix property");
-	
-	MT_Matrix4x4 mat;
-	if (!PyMatTo(value, mat))
-	{
-		PyErr_SetString(PyExc_TypeError, "camera.setProjectionMatrix(matrix): KX_Camera, expected 4x4 list as matrix argument.");
-		return NULL;
-	}
-	
-	SetProjectionMatrix(mat);
-	Py_RETURN_NONE;
-}
-
-KX_PYMETHODDEF_DOC_O(KX_Camera, enableViewport,
-"enableViewport(viewport)\n"
-"Sets this camera's viewport status\n"
-)
-{
-	ShowDeprecationWarning("enableViewport(bool)", "the useViewport property");
-	
-	int viewport = PyObject_IsTrue(value);
-	if (viewport == -1) {
-		PyErr_SetString(PyExc_ValueError, "camera.enableViewport(bool): KX_Camera, expected True/False or 0/1");
-		return NULL;
-	}
-	
-	if(viewport)
-		EnableViewport(true);
-	else
-		EnableViewport(false);
-	
-	Py_RETURN_NONE;
-}
-
 KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, setViewport,
 "setViewport(left, bottom, right, top)\n"
 "Sets this camera's viewport\n")
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index 74c8e6d4e4f..bf7a39d93c8 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -273,10 +273,7 @@ public:
 	
 	KX_PYMETHOD_DOC_NOARGS(KX_Camera, getCameraToWorld);
 	KX_PYMETHOD_DOC_NOARGS(KX_Camera, getWorldToCamera);
-	KX_PYMETHOD_DOC_NOARGS(KX_Camera, getProjectionMatrix);
-	KX_PYMETHOD_DOC_O(KX_Camera, setProjectionMatrix);
 	
-	KX_PYMETHOD_DOC_O(KX_Camera, enableViewport);
 	KX_PYMETHOD_DOC_VARARGS(KX_Camera, setViewport);	
 	KX_PYMETHOD_DOC_NOARGS(KX_Camera, setOnTop);	
 
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index b5a0a63cf68..9c00b5991af 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -378,17 +378,6 @@ PyTypeObject KX_CameraActuator::Type = {
 };
 
 PyMethodDef KX_CameraActuator::Methods[] = {
-	// ---> deprecated (all)
-	{"setObject",(PyCFunction) KX_CameraActuator::sPySetObject, METH_O,			(const char *)SetObject_doc},
-	{"getObject",(PyCFunction) KX_CameraActuator::sPyGetObject, METH_VARARGS,	(const char *)GetObject_doc},
-	{"setMin"	,(PyCFunction) KX_CameraActuator::sPySetMin,	METH_VARARGS,	(const char *)SetMin_doc},
-	{"getMin"	,(PyCFunction) KX_CameraActuator::sPyGetMin,	METH_NOARGS,	(const char *)GetMin_doc},
-	{"setMax"	,(PyCFunction) KX_CameraActuator::sPySetMax,	METH_VARARGS,	(const char *)SetMax_doc},
-	{"getMax"	,(PyCFunction) KX_CameraActuator::sPyGetMax,	METH_NOARGS,	(const char *)GetMax_doc},
-	{"setHeight",(PyCFunction) KX_CameraActuator::sPySetHeight,	METH_VARARGS,	(const char *)SetHeight_doc},
-	{"getHeight",(PyCFunction) KX_CameraActuator::sPyGetHeight,	METH_NOARGS,	(const char *)GetHeight_doc},
-	{"setXY"	,(PyCFunction) KX_CameraActuator::sPySetXY,		METH_VARARGS,	(const char *)SetXY_doc},
-	{"getXY"	,(PyCFunction) KX_CameraActuator::sPyGetXY,		METH_NOARGS,	(const char *)GetXY_doc},
 	{NULL,NULL,NULL,NULL} //Sentinel
 };
 
@@ -401,152 +390,6 @@ PyAttributeDef KX_CameraActuator::Attributes[] = {
 	{NULL}
 };
 
-/* get obj  ---------------------------------------------------------- */
-const char KX_CameraActuator::GetObject_doc[] = 
-"getObject(name_only = 1)\n"
-"name_only - optional arg, when true will return the KX_GameObject rather then its name\n"
-"\tReturns the object this sensor reacts to.\n";
-PyObject* KX_CameraActuator::PyGetObject(PyObject* args)
-{
-	int ret_name_only = 1;
-	
-	ShowDeprecationWarning("getObject()", "the object property");
-	
-	if (!PyArg_ParseTuple(args, "|i:getObject", &ret_name_only))
-		return NULL;
-	
-	if (!m_ob)
-		Py_RETURN_NONE;
-	
-	if (ret_name_only)
-		return PyUnicode_FromString(m_ob->GetName().ReadPtr());
-	else
-		return m_ob->GetProxy();
-}
-/* set obj  ---------------------------------------------------------- */
-const char KX_CameraActuator::SetObject_doc[] = 
-"setObject(object)\n"
-"\t- object: KX_GameObject, string or None\n"
-"\tSets the object this sensor reacts to.\n";
-PyObject* KX_CameraActuator::PySetObject(PyObject* value)
-{
-	KX_GameObject *gameobj;
-	
-	ShowDeprecationWarning("setObject()", "the object property");
-	
-	if (!ConvertPythonToGameObject(value, &gameobj, true, "actuator.setObject(value): KX_CameraActuator"))
-		return NULL; // ConvertPythonToGameObject sets the error
-	
-	if (m_ob != NULL)
-		m_ob->UnregisterActuator(this);	
-
-	m_ob = (SCA_IObject*)gameobj;
-	if (m_ob)
-		m_ob->RegisterActuator(this);
-	
-	Py_RETURN_NONE;
-}
-
-/* get min  ---------------------------------------------------------- */
-const char KX_CameraActuator::GetMin_doc[] = 
-"getMin\n"
-"\tReturns the minimum value set in the Min: field.\n";
-PyObject* KX_CameraActuator::PyGetMin()
-{
-	ShowDeprecationWarning("getMin()", "the min property");
-	return PyFloat_FromDouble(m_minHeight);
-}
-/* set min  ---------------------------------------------------------- */
-const char KX_CameraActuator::SetMin_doc[] = 
-"setMin\n"
-"\tSets the minimum value.\n";
-PyObject* KX_CameraActuator::PySetMin(PyObject* args)
-{
-	ShowDeprecationWarning("setMin()", "the min property");
-	float min;
-	if(PyArg_ParseTuple(args,"f:setMin", &min))
-	{
-		m_minHeight = min;
-		Py_RETURN_NONE;
-	}
-	return NULL;
-}
-/* get min  ---------------------------------------------------------- */
-const char KX_CameraActuator::GetMax_doc[] = 
-"getMax\n"
-"\tReturns the maximum value set in the Max: field.\n";
-PyObject* KX_CameraActuator::PyGetMax()
-{
-	ShowDeprecationWarning("getMax()", "the max property");
-	return PyFloat_FromDouble(m_maxHeight);
-}
-/* set min  ---------------------------------------------------------- */
-const char KX_CameraActuator::SetMax_doc[] = 
-"setMax\n"
-"\tSets the maximum value.\n";
-PyObject* KX_CameraActuator::PySetMax(PyObject* args)
-{
-	ShowDeprecationWarning("getMax()", "the max property");
-	float max;
-	if(PyArg_ParseTuple(args,"f:setMax", &max))
-	{
-		m_maxHeight = max;
-		Py_RETURN_NONE;
-	}
-	return NULL;
-}
-/* get height  ---------------------------------------------------------- */
-const char KX_CameraActuator::GetHeight_doc[] = 
-"getHeight\n"
-"\tReturns the height value set in the height: field.\n";
-PyObject* KX_CameraActuator::PyGetHeight()
-{
-	ShowDeprecationWarning("getHeight()", "the height property");
-	return PyFloat_FromDouble(m_height);
-}
-/* set height  ---------------------------------------------------------- */
-const char KX_CameraActuator::SetHeight_doc[] = 
-"setHeight\n"
-"\tSets the height value.\n";
-PyObject* KX_CameraActuator::PySetHeight(PyObject* args)
-{
-	ShowDeprecationWarning("getHeight()", "the height property");
-	float height;
-	if(PyArg_ParseTuple(args,"f:setHeight", &height))
-	{
-		m_height = height;
-		Py_RETURN_NONE;
-	}
-	return NULL;
-}
-/* set XY  ---------------------------------------------------------- */
-const char KX_CameraActuator::SetXY_doc[] = 
-"setXY\n"
-"\tSets axis the camera tries to get behind.\n"
-"\t1=x, 0=y\n";
-PyObject* KX_CameraActuator::PySetXY(PyObject* args)
-{
-	ShowDeprecationWarning("setXY()", "the useXY property");
-	int value;
-	if(PyArg_ParseTuple(args,"i:setXY", &value))
-	{
-		m_x = value != 0;
-		Py_RETURN_NONE;
-	}
-	return NULL;
-}
-
-/* get XY -------------------------------------------------------------*/
-const char KX_CameraActuator::GetXY_doc[] =
-"getXY\n"
-"\tGets the axis the camera tries to get behind.\n"
-"\tTrue = X, False = Y\n";
-PyObject* KX_CameraActuator::PyGetXY()
-{
-	ShowDeprecationWarning("getXY()", "the xy property");
-	return PyLong_FromSsize_t(m_x);
-}
-
 PyObject* KX_CameraActuator::pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	KX_CameraActuator* self= static_cast<KX_CameraActuator*>(self_v);
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h
index 057c6fed770..e047e3724ea 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.h
+++ b/source/gameengine/Ketsji/KX_CameraActuator.h
@@ -119,18 +119,6 @@ private :
 	/* --------------------------------------------------------------------- */
 
 	/* set object to look at */
-	KX_PYMETHOD_DOC_O(KX_CameraActuator,SetObject);
-	/* get current object  */
-	KX_PYMETHOD_DOC_VARARGS(KX_CameraActuator,GetObject);
-	KX_PYMETHOD_DOC_VARARGS(KX_CameraActuator,SetMin);
-	KX_PYMETHOD_DOC_NOARGS(KX_CameraActuator,GetMin);
-	KX_PYMETHOD_DOC_VARARGS(KX_CameraActuator,SetMax);
-	KX_PYMETHOD_DOC_NOARGS(KX_CameraActuator,GetMax);
-	KX_PYMETHOD_DOC_VARARGS(KX_CameraActuator,SetHeight);
-	KX_PYMETHOD_DOC_NOARGS(KX_CameraActuator,GetHeight);
-	KX_PYMETHOD_DOC_VARARGS(KX_CameraActuator,SetXY);
-	KX_PYMETHOD_DOC_NOARGS(KX_CameraActuator,GetXY);
-	
 	static PyObject*	pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index 5f6244c3ab6..7f1d2c7d53c 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -587,30 +587,6 @@ PyTypeObject KX_ConstraintActuator::Type = {
 };
 
 PyMethodDef KX_ConstraintActuator::Methods[] = {
-	// Deprecated -->
-	{"setDamp", (PyCFunction) KX_ConstraintActuator::sPySetDamp, METH_VARARGS, (const char *)SetDamp_doc},
-	{"getDamp", (PyCFunction) KX_ConstraintActuator::sPyGetDamp, METH_NOARGS, (const char *)GetDamp_doc},
-	{"setRotDamp", (PyCFunction) KX_ConstraintActuator::sPySetRotDamp, METH_VARARGS, (const char *)SetRotDamp_doc},
-	{"getRotDamp", (PyCFunction) KX_ConstraintActuator::sPyGetRotDamp, METH_NOARGS, (const char *)GetRotDamp_doc},
-	{"setDirection", (PyCFunction) KX_ConstraintActuator::sPySetDirection, METH_VARARGS, (const char *)SetDirection_doc},
-	{"getDirection", (PyCFunction) KX_ConstraintActuator::sPyGetDirection, METH_NOARGS, (const char *)GetDirection_doc},
-	{"setOption", (PyCFunction) KX_ConstraintActuator::sPySetOption, METH_VARARGS, (const char *)SetOption_doc},
-	{"getOption", (PyCFunction) KX_ConstraintActuator::sPyGetOption, METH_NOARGS, (const char *)GetOption_doc},
-	{"setTime", (PyCFunction) KX_ConstraintActuator::sPySetTime, METH_VARARGS, (const char *)SetTime_doc},
-	{"getTime", (PyCFunction) KX_ConstraintActuator::sPyGetTime, METH_NOARGS, (const char *)GetTime_doc},
-	{"setProperty", (PyCFunction) KX_ConstraintActuator::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"getProperty", (PyCFunction) KX_ConstraintActuator::sPyGetProperty, METH_NOARGS, (const char *)GetProperty_doc},
-	{"setMin", (PyCFunction) KX_ConstraintActuator::sPySetMin, METH_VARARGS, (const char *)SetMin_doc},
-	{"getMin", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_NOARGS, (const char *)GetMin_doc},
-	{"setDistance", (PyCFunction) KX_ConstraintActuator::sPySetMin, METH_VARARGS, (const char *)SetDistance_doc},
-	{"getDistance", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_NOARGS, (const char *)GetDistance_doc},
-	{"setMax", (PyCFunction) KX_ConstraintActuator::sPySetMax, METH_VARARGS, (const char *)SetMax_doc},
-	{"getMax", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_NOARGS, (const char *)GetMax_doc},
-	{"setRayLength", (PyCFunction) KX_ConstraintActuator::sPySetMax, METH_VARARGS, (const char *)SetRayLength_doc},
-	{"getRayLength", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_NOARGS, (const char *)GetRayLength_doc},
-	{"setLimit", (PyCFunction) KX_ConstraintActuator::sPySetLimit, METH_VARARGS, (const char *)SetLimit_doc},
-	{"getLimit", (PyCFunction) KX_ConstraintActuator::sPyGetLimit, METH_NOARGS, (const char *)GetLimit_doc},
-	// <--
 	{NULL,NULL} //Sentinel
 };
 
@@ -642,318 +618,4 @@ int KX_ConstraintActuator::pyattr_check_direction(void *self, const struct KX_PY
 	return 0;	
 }
 
-/* 2. setDamp                                                                */
-const char KX_ConstraintActuator::SetDamp_doc[] = 
-"setDamp(duration)\n"
-"\t- duration: integer\n"
-"\tSets the time constant of the orientation and distance constraint.\n"
-"\tIf the duration is negative, it is set to 0.\n";
-PyObject* KX_ConstraintActuator::PySetDamp(PyObject* args) {
-	ShowDeprecationWarning("setDamp()", "the damp property");
-	int dampArg;
-	if(!PyArg_ParseTuple(args, "i:setDamp", &dampArg)) {
-		return NULL;		
-	}
-	
-	m_posDampTime = dampArg;
-	if (m_posDampTime < 0) m_posDampTime = 0;
-
-	Py_RETURN_NONE;
-}
-/* 3. getDamp                                                                */
-const char KX_ConstraintActuator::GetDamp_doc[] = 
-"getDamp()\n"
-"\tReturns the damping parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetDamp(){
-	ShowDeprecationWarning("getDamp()", "the damp property");
-	return PyLong_FromSsize_t(m_posDampTime);
-}
-
-/* 2. setRotDamp                                                                */
-const char KX_ConstraintActuator::SetRotDamp_doc[] = 
-"setRotDamp(duration)\n"
-"\t- duration: integer\n"
-"\tSets the time constant of the orientation constraint.\n"
-"\tIf the duration is negative, it is set to 0.\n";
-PyObject* KX_ConstraintActuator::PySetRotDamp(PyObject* args) {
-	ShowDeprecationWarning("setRotDamp()", "the rotDamp property");
-	int dampArg;
-	if(!PyArg_ParseTuple(args, "i:setRotDamp", &dampArg)) {
-		return NULL;		
-	}
-	
-	m_rotDampTime = dampArg;
-	if (m_rotDampTime < 0) m_rotDampTime = 0;
-
-	Py_RETURN_NONE;
-}
-/* 3. getRotDamp                                                                */
-const char KX_ConstraintActuator::GetRotDamp_doc[] = 
-"getRotDamp()\n"
-"\tReturns the damping time for application of the constraint.\n";
-PyObject* KX_ConstraintActuator::PyGetRotDamp(){
-	ShowDeprecationWarning("getRotDamp()", "the rotDamp property");
-	return PyLong_FromSsize_t(m_rotDampTime);
-}
-
-/* 2. setDirection                                                                */
-const char KX_ConstraintActuator::SetDirection_doc[] = 
-"setDirection(vector)\n"
-"\t- vector: 3-tuple\n"
-"\tSets the reference direction in world coordinate for the orientation constraint.\n";
-PyObject* KX_ConstraintActuator::PySetDirection(PyObject* args) {
-	ShowDeprecationWarning("setDirection()", "the direction property");
-	float x, y, z;
-	MT_Scalar len;
-	MT_Vector3 dir;
-
-	if(!PyArg_ParseTuple(args, "(fff):setDirection", &x, &y, &z)) {
-		return NULL;		
-	}
-	dir[0] = x;
-	dir[1] = y;
-	dir[2] = z;
-	len = dir.length();
-	if (MT_fuzzyZero(len)) {
-		std::cout << "Invalid direction" << std::endl;
-		return NULL;
-	}
-	m_refDirVector = dir/len;
-	m_refDirection[0] = x/len;
-	m_refDirection[1] = y/len;
-	m_refDirection[2] = z/len;
-
-	Py_RETURN_NONE;
-}
-/* 3. getDirection                                                                */
-const char KX_ConstraintActuator::GetDirection_doc[] = 
-"getDirection()\n"
-"\tReturns the reference direction of the orientation constraint as a 3-tuple.\n";
-PyObject* KX_ConstraintActuator::PyGetDirection(){
-	ShowDeprecationWarning("getDirection()", "the direction property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_refDirection[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_refDirection[2]));
-	return retVal;
-}
-
-/* 2. setOption                                                                */
-const char KX_ConstraintActuator::SetOption_doc[] = 
-"setOption(option)\n"
-"\t- option: integer\n"
-"\tSets several options of the distance  constraint.\n"
-"\tBinary combination of the following values:\n"
-"\t\t 64 : Activate alignment to surface\n"
-"\t\t128 : Detect material rather than property\n"
-"\t\t256 : No deactivation if ray does not hit target\n"
-"\t\t512 : Activate distance control\n";
-PyObject* KX_ConstraintActuator::PySetOption(PyObject* args) {
-	ShowDeprecationWarning("setOption()", "the option property");
-	int option;
-	if(!PyArg_ParseTuple(args, "i:setOption", &option)) {
-		return NULL;		
-	}
-	
-	m_option = option;
-
-	Py_RETURN_NONE;
-}
-/* 3. getOption                                                              */
-const char KX_ConstraintActuator::GetOption_doc[] = 
-"getOption()\n"
-"\tReturns the option parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetOption(){
-	ShowDeprecationWarning("getOption()", "the option property");
-	return PyLong_FromSsize_t(m_option);
-}
-
-/* 2. setTime                                                                */
-const char KX_ConstraintActuator::SetTime_doc[] = 
-"setTime(duration)\n"
-"\t- duration: integer\n"
-"\tSets the activation time of the actuator.\n"
-"\tThe actuator disables itself after this many frame.\n"
-"\tIf set to 0 or negative, the actuator is not limited in time.\n";
-PyObject* KX_ConstraintActuator::PySetTime(PyObject* args) {
-	ShowDeprecationWarning("setTime()", "the time property");
-	int t;
-	if(!PyArg_ParseTuple(args, "i:setTime", &t)) {
-		return NULL;		
-	}
-	
-	if (t < 0)
-		t = 0;
-	m_activeTime = t;
-
-	Py_RETURN_NONE;
-}
-/* 3. getTime                                                                */
-const char KX_ConstraintActuator::GetTime_doc[] = 
-"getTime()\n"
-"\tReturns the time parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetTime(){
-	ShowDeprecationWarning("getTime()", "the time property");
-	return PyLong_FromSsize_t(m_activeTime);
-}
-
-/* 2. setProperty                                                                */
-const char KX_ConstraintActuator::SetProperty_doc[] = 
-"setProperty(property)\n"
-"\t- property: string\n"
-"\tSets the name of the property or material for the ray detection of the distance constraint.\n"
-"\tIf empty, the ray will detect any collisioning object.\n";
-PyObject* KX_ConstraintActuator::PySetProperty(PyObject* args) {
-	ShowDeprecationWarning("setProperty()", "the 'property' property");
-	char *property;
-	if (!PyArg_ParseTuple(args, "s:setProperty", &property)) {
-		return NULL;
-	}
-	if (property == NULL) {
-		m_property = "";
-	} else {
-		m_property = property;
-	}
-
-	Py_RETURN_NONE;
-}
-/* 3. getProperty                                                                */
-const char KX_ConstraintActuator::GetProperty_doc[] = 
-"getProperty()\n"
-"\tReturns the property parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetProperty(){
-	ShowDeprecationWarning("getProperty()", "the 'property' property");
-	return PyUnicode_FromString(m_property.Ptr());
-}
-
-/* 4. setDistance                                                                 */
-const char KX_ConstraintActuator::SetDistance_doc[] = 
-"setDistance(distance)\n"
-"\t- distance: float\n"
-"\tSets the target distance in distance constraint\n";
-/* 4. setMin                                                                 */
-const char KX_ConstraintActuator::SetMin_doc[] = 
-"setMin(lower_bound)\n"
-"\t- lower_bound: float\n"
-"\tSets the lower value of the interval to which the value\n"
-"\tis clipped.\n";
-PyObject* KX_ConstraintActuator::PySetMin(PyObject* args) {
-	ShowDeprecationWarning("setMin() or setDistance()", "the min or distance property");
-	float minArg;
-	if(!PyArg_ParseTuple(args, "f:setMin", &minArg)) {
-		return NULL;		
-	}
-
-	switch (m_locrot) {
-	default:
-		m_minimumBound = minArg;
-		break;
-	case KX_ACT_CONSTRAINT_ROTX:
-	case KX_ACT_CONSTRAINT_ROTY:
-	case KX_ACT_CONSTRAINT_ROTZ:
-		m_minimumBound = MT_radians(minArg);
-		break;
-	}
-
-	Py_RETURN_NONE;
-}
-/* 5. getDistance                                                                 */
-const char KX_ConstraintActuator::GetDistance_doc[] = 
-"getDistance()\n"
-"\tReturns the distance parameter \n";
-/* 5. getMin                                                                 */
-const char KX_ConstraintActuator::GetMin_doc[] = 
-"getMin()\n"
-"\tReturns the lower value of the interval to which the value\n"
-"\tis clipped.\n";
-PyObject* KX_ConstraintActuator::PyGetMin() {
-	ShowDeprecationWarning("getMin() or getDistance()", "the min or distance property");
-	return PyFloat_FromDouble(m_minimumBound);
-}
-
-/* 6. setRayLength                                                                 */
-const char KX_ConstraintActuator::SetRayLength_doc[] = 
-"setRayLength(length)\n"
-"\t- length: float\n"
-"\tSets the maximum ray length of the distance constraint\n";
-/* 6. setMax                                                                 */
-const char KX_ConstraintActuator::SetMax_doc[] = 
-"setMax(upper_bound)\n"
-"\t- upper_bound: float\n"
-"\tSets the upper value of the interval to which the value\n"
-"\tis clipped.\n";
-PyObject* KX_ConstraintActuator::PySetMax(PyObject* args){
-	ShowDeprecationWarning("setMax() or setRayLength()", "the max or rayLength property");
-	float maxArg;
-	if(!PyArg_ParseTuple(args, "f:setMax", &maxArg)) {
-		return NULL;		
-	}
-
-	switch (m_locrot) {
-	default:
-		m_maximumBound = maxArg;
-		break;
-	case KX_ACT_CONSTRAINT_ROTX:
-	case KX_ACT_CONSTRAINT_ROTY:
-	case KX_ACT_CONSTRAINT_ROTZ:
-		m_maximumBound = MT_radians(maxArg);
-		break;
-	}
-
-	Py_RETURN_NONE;
-}
-/* 7. getRayLength                                                                 */
-const char KX_ConstraintActuator::GetRayLength_doc[] = 
-"getRayLength()\n"
-"\tReturns the length of the ray\n";
-/* 7. getMax                                                                 */
-const char KX_ConstraintActuator::GetMax_doc[] = 
-"getMax()\n"
-"\tReturns the upper value of the interval to which the value\n"
-"\tis clipped.\n";
-PyObject* KX_ConstraintActuator::PyGetMax() {
-	ShowDeprecationWarning("getMax() or getRayLength()", "the max or rayLength property");
-	return PyFloat_FromDouble(m_maximumBound);
-}
-
-
-/* This setter/getter probably for the constraint type                       */
-/* 8. setLimit                                                               */
-const char KX_ConstraintActuator::SetLimit_doc[] = 
-"setLimit(type)\n"
-"\t- type: integer\n"
-"\t  1  : LocX\n"
-"\t  2  : LocY\n"
-"\t  3  : LocZ\n"
-"\t  7  : Distance along +X axis\n"
-"\t  8  : Distance along +Y axis\n"
-"\t  9  : Distance along +Z axis\n"
-"\t  10 : Distance along -X axis\n"
-"\t  11 : Distance along -Y axis\n"
-"\t  12 : Distance along -Z axis\n"
-"\t  13 : Align X axis\n"
-"\t  14 : Align Y axis\n"
-"\t  15 : Align Z axis\n"
-"\tSets the type of constraint.\n";
-PyObject* KX_ConstraintActuator::PySetLimit(PyObject* args) {
-	ShowDeprecationWarning("setLimit()", "the limit property");
-	int locrotArg;
-	if(!PyArg_ParseTuple(args, "i:setLimit", &locrotArg)) {
-		return NULL;		
-	}
-	
-	if (IsValidMode((KX_CONSTRAINTTYPE)locrotArg)) m_locrot = locrotArg;
-
-	Py_RETURN_NONE;
-}
-/* 9. getLimit                                                               */
-const char KX_ConstraintActuator::GetLimit_doc[] = 
-"getLimit()\n"
-"\tReturns the type of constraint.\n";
-PyObject* KX_ConstraintActuator::PyGetLimit() {
-	ShowDeprecationWarning("setLimit()", "the limit property");
-	return PyLong_FromSsize_t(m_locrot);
-}
-
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index 677904aedc9..9b6ed59e75c 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -143,28 +143,6 @@ protected:
 	static int pyattr_check_direction(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_check_min(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetDamp);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetDamp);
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetRotDamp);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetRotDamp);
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetDirection);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetDirection);
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetOption);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetOption);
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetTime);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetTime);
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetProperty);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetProperty);
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetMin);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetMin);
-	static const char SetDistance_doc[];
-	static const char GetDistance_doc[];
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetMax);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetMax);
-	static const char SetRayLength_doc[];
-	static const char GetRayLength_doc[];
-	KX_PYMETHOD_DOC_VARARGS(KX_ConstraintActuator,SetLimit);
-	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetLimit);
 };
 
 #endif //__KX_CONSTRAINTACTUATOR
diff --git a/source/gameengine/Ketsji/KX_GameActuator.cpp b/source/gameengine/Ketsji/KX_GameActuator.cpp
index 3f67de1e9a9..42dc4d8fd24 100644
--- a/source/gameengine/Ketsji/KX_GameActuator.cpp
+++ b/source/gameengine/Ketsji/KX_GameActuator.cpp
@@ -230,10 +230,6 @@ PyTypeObject KX_GameActuator::Type = {
 
 PyMethodDef KX_GameActuator::Methods[] =
 {
-	// Deprecated ----->
-	{"getFile",	(PyCFunction) KX_GameActuator::sPyGetFile, METH_VARARGS, (const char *)GetFile_doc},
-	{"setFile", (PyCFunction) KX_GameActuator::sPySetFile, METH_VARARGS, (const char *)SetFile_doc},
-	// <-----
 	{NULL,NULL} //Sentinel
 };
 
@@ -242,36 +238,3 @@ PyAttributeDef KX_GameActuator::Attributes[] = {
 	KX_PYATTRIBUTE_INT_RW("mode", KX_GAME_NODEF+1, KX_GAME_MAX-1, true, KX_GameActuator, m_mode),
 	{ NULL }	//Sentinel
 };
-
-// Deprecated ----->
-/* getFile */
-const char KX_GameActuator::GetFile_doc[] = 
-"getFile()\n"
-"get the name of the file to start.\n";
-PyObject* KX_GameActuator::PyGetFile(PyObject* args, PyObject* kwds)
-{	
-	ShowDeprecationWarning("getFile()", "the fileName property");
-	return PyUnicode_FromString(m_filename);
-}
-
-/* setFile */
-const char KX_GameActuator::SetFile_doc[] =
-"setFile(name)\n"
-"set the name of the file to start.\n";
-PyObject* KX_GameActuator::PySetFile(PyObject* args, PyObject* kwds)
-{
-	char* new_file;
-
-	ShowDeprecationWarning("setFile()", "the fileName property");
-	
-	if (!PyArg_ParseTuple(args, "s:setFile", &new_file))
-	{
-		return NULL;
-	}
-	
-	m_filename = STR_String(new_file);
-
-	Py_RETURN_NONE;
-
-}
-// <-----	
diff --git a/source/gameengine/Ketsji/KX_GameActuator.h b/source/gameengine/Ketsji/KX_GameActuator.h
index cabbf827b40..37d09a5a9fb 100644
--- a/source/gameengine/Ketsji/KX_GameActuator.h
+++ b/source/gameengine/Ketsji/KX_GameActuator.h
@@ -75,11 +75,6 @@ protected:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	// Deprecated functions ----->
-	KX_PYMETHOD_DOC(KX_GameActuator,GetFile);
-	KX_PYMETHOD_DOC(KX_GameActuator,SetFile);
-	// <-----
 	
 }; /* end of class KX_GameActuator */
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 3aef41743a7..79b110b11ef 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1383,8 +1383,8 @@ PyMethodDef KX_GameObject::Methods[] = {
 	{"setVisible",(PyCFunction) KX_GameObject::sPySetVisible, METH_VARARGS},
 	{"setOcclusion",(PyCFunction) KX_GameObject::sPySetOcclusion, METH_VARARGS},
 	{"removeParent", (PyCFunction)KX_GameObject::sPyRemoveParent,METH_NOARGS},
-	{"getChildren", (PyCFunction)KX_GameObject::sPyGetChildren,METH_NOARGS},
-	{"getChildrenRecursive", (PyCFunction)KX_GameObject::sPyGetChildrenRecursive,METH_NOARGS},
+
+
 	{"getPhysicsId", (PyCFunction)KX_GameObject::sPyGetPhysicsId,METH_NOARGS},
 	{"getPropertyNames", (PyCFunction)KX_GameObject::sPyGetPropertyNames,METH_NOARGS},
 	{"replaceMesh",(PyCFunction) KX_GameObject::sPyReplaceMesh, METH_VARARGS},
@@ -1400,18 +1400,6 @@ PyMethodDef KX_GameObject::Methods[] = {
 	// dict style access for props
 	{"get",(PyCFunction) KX_GameObject::sPyget, METH_VARARGS},
 	
-	// deprecated
-	{"getPosition", (PyCFunction) KX_GameObject::sPyGetPosition, METH_NOARGS},
-	{"setPosition", (PyCFunction) KX_GameObject::sPySetPosition, METH_O},
-	{"setWorldPosition", (PyCFunction) KX_GameObject::sPySetWorldPosition, METH_O},
-	{"getOrientation", (PyCFunction) KX_GameObject::sPyGetOrientation, METH_NOARGS},
-	{"setOrientation", (PyCFunction) KX_GameObject::sPySetOrientation, METH_O},
-	{"getState",(PyCFunction) KX_GameObject::sPyGetState, METH_NOARGS},
-	{"setState",(PyCFunction) KX_GameObject::sPySetState, METH_O},
-	{"getParent", (PyCFunction)KX_GameObject::sPyGetParent,METH_NOARGS},
-	{"getVisible",(PyCFunction) KX_GameObject::sPyGetVisible, METH_NOARGS},
-	{"getMass", (PyCFunction) KX_GameObject::sPyGetMass, METH_NOARGS},
-	{"getMesh", (PyCFunction)KX_GameObject::sPyGetMesh,METH_VARARGS},
 	{NULL,NULL} //Sentinel
 };
 
@@ -1514,13 +1502,6 @@ PyObject* KX_GameObject::PyReinstancePhysicsMesh(PyObject* args)
 	Py_RETURN_FALSE;
 }
 
-
-PyObject* KX_GameObject::PyGetPosition()
-{
-	ShowDeprecationWarning("getPosition()", "the position property");
-	return PyObjectFrom(NodeGetWorldPosition());
-}
-
 static PyObject *Map_GetItem(PyObject *self_v, PyObject *item)
 {
 	KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(self_v);
@@ -2200,41 +2181,6 @@ PyObject* KX_GameObject::PySetOcclusion(PyObject* args)
 	Py_RETURN_NONE;
 }
 
-PyObject* KX_GameObject::PyGetVisible()
-{
-	ShowDeprecationWarning("getVisible()", "the visible property");
-	return PyLong_FromSsize_t(m_bVisible);	
-}
-
-PyObject* KX_GameObject::PyGetState()
-{
-	ShowDeprecationWarning("getState()", "the state property");
-	int state = 0;
-	state |= GetState();
-	return PyLong_FromSsize_t(state);
-}
-
-PyObject* KX_GameObject::PySetState(PyObject* value)
-{
-	ShowDeprecationWarning("setState()", "the state property");
-	int state_i = PyLong_AsSsize_t(value);
-	unsigned int state = 0;
-	
-	if (state_i == -1 && PyErr_Occurred()) {
-		PyErr_SetString(PyExc_TypeError, "expected an int bit field");
-		return NULL;
-	}
-	
-	state |= state_i;
-	if ((state & ((1<<30)-1)) == 0) {
-		PyErr_SetString(PyExc_AttributeError, "The state bitfield was not between 0 and 30 (1<<0 and 1<<29)");
-		return NULL;
-	}
-	SetState(state);
-	
-	Py_RETURN_NONE;
-}
-
 PyObject* KX_GameObject::PyGetVelocity(PyObject* args)
 {
 	// only can get the velocity if we have a physics object connected to us...
@@ -2253,14 +2199,6 @@ PyObject* KX_GameObject::PyGetVelocity(PyObject* args)
 	}
 }
 
-
-
-PyObject* KX_GameObject::PyGetMass()
-{
-	ShowDeprecationWarning("getMass()", "the mass property");
-	return PyFloat_FromDouble((GetPhysicsController() != NULL) ? GetPhysicsController()->GetMass() : 0.0f);
-}
-
 PyObject* KX_GameObject::PyGetReactionForce()
 {
 	// only can get the velocity if we have a physics object connected to us...
@@ -2297,18 +2235,6 @@ PyObject* KX_GameObject::PyDisableRigidBody()
 }
 
 
-
-PyObject* KX_GameObject::PyGetParent()
-{
-	ShowDeprecationWarning("getParent()", "the parent property");
-	KX_GameObject* parent = this->GetParent();
-	if (parent) {
-		parent->Release(); /* self->GetParent() AddRef's */
-		return parent->GetProxy();
-	}
-	Py_RETURN_NONE;
-}
-
 PyObject* KX_GameObject::PySetParent(PyObject* args)
 {
 	KX_Scene *scene = KX_GetActiveScene();
@@ -2334,41 +2260,6 @@ PyObject* KX_GameObject::PyRemoveParent()
 	Py_RETURN_NONE;
 }
 
-PyObject* KX_GameObject::PyGetChildren()
-{
-	ShowDeprecationWarning("getChildren()", "the children property");
-	
-	return GetChildren()->NewProxy(true);
-}
-
-PyObject* KX_GameObject::PyGetChildrenRecursive()
-{
-	ShowDeprecationWarning("getChildrenRecursive()", "the childrenRecursive property");
-	
-	return GetChildrenRecursive()->NewProxy(true);
-}
-
-PyObject* KX_GameObject::PyGetMesh(PyObject* args)
-{
-	ShowDeprecationWarning("getMesh()", "the meshes property (now a list of meshes)");
-	
-	int mesh = 0;
-
-	if (!PyArg_ParseTuple(args, "|i:getMesh", &mesh))
-		return NULL; // python sets a simple error
-	
-	if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0)
-	{
-		KX_MeshProxy* meshproxy = new KX_MeshProxy(m_meshes[mesh]);
-		return meshproxy->NewProxy(true); // XXX Todo Python own.
-	}
-	
-	Py_RETURN_NONE;
-}
-
-
-
-
 
 PyObject* KX_GameObject::PySetCollisionMargin(PyObject* value)
 {
@@ -2432,29 +2323,6 @@ PyObject* KX_GameObject::PyRestoreDynamics()
 }
 
 
-
-PyObject* KX_GameObject::PyGetOrientation() //keywords
-{
-	ShowDeprecationWarning("getOrientation()", "the orientation property");
-	return PyObjectFrom(NodeGetWorldOrientation());
-}
-
-
-
-PyObject* KX_GameObject::PySetOrientation(PyObject* value)
-{
-	ShowDeprecationWarning("setOrientation()", "the orientation property");
-	MT_Matrix3x3 rot;
-	
-	/* if value is not a sequence PyOrientationTo makes an error */
-	if (!PyOrientationTo(value, rot, "gameOb.setOrientation(sequence): KX_GameObject, "))
-		return NULL;
-
-	NodeSetLocalOrientation(rot);
-	NodeUpdateGS(0.f);
-	Py_RETURN_NONE;
-}
-
 PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* args)
 {
 	PyObject* pyvect;
@@ -2487,33 +2355,6 @@ PyObject* KX_GameObject::PyGetAxisVect(PyObject* value)
 	return NULL;
 }
 
-PyObject* KX_GameObject::PySetPosition(PyObject* value)
-{
-	ShowDeprecationWarning("setPosition()", "the localPosition property");
-	MT_Point3 pos;
-	if (PyVecTo(value, pos))
-	{
-		NodeSetLocalPosition(pos);
-		NodeUpdateGS(0.f);
-		Py_RETURN_NONE;
-	}
-
-	return NULL;
-}
-
-PyObject* KX_GameObject::PySetWorldPosition(PyObject* value)
-{
-	ShowDeprecationWarning("setWorldPosition()", "the worldPosition property");
-	MT_Point3 pos;
-	if (PyVecTo(value, pos))
-	{
-		NodeSetWorldPosition(pos);
-		NodeUpdateGS(0.f);
-		Py_RETURN_NONE;
-	}
-
-	return NULL;
-}
 
 PyObject* KX_GameObject::PyGetPhysicsId()
 {
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index a5cd084b4d4..845cead1cdb 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -795,9 +795,7 @@ public:
 	{
 		return PyUnicode_FromString(GetName().ReadPtr());
 	}
-		
-	KX_PYMETHOD_NOARGS(KX_GameObject,GetPosition);
-	KX_PYMETHOD_O(KX_GameObject,SetPosition);
+
 	KX_PYMETHOD_O(KX_GameObject,SetWorldPosition);
 	KX_PYMETHOD_VARARGS(KX_GameObject, ApplyForce);
 	KX_PYMETHOD_VARARGS(KX_GameObject, ApplyTorque);
@@ -808,10 +806,10 @@ public:
 	KX_PYMETHOD_VARARGS(KX_GameObject,GetAngularVelocity);
 	KX_PYMETHOD_VARARGS(KX_GameObject,SetAngularVelocity);
 	KX_PYMETHOD_VARARGS(KX_GameObject,GetVelocity);
-	KX_PYMETHOD_NOARGS(KX_GameObject,GetMass);
+
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetReactionForce);
-	KX_PYMETHOD_NOARGS(KX_GameObject,GetOrientation);
-	KX_PYMETHOD_O(KX_GameObject,SetOrientation);
+
+
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetVisible);
 	KX_PYMETHOD_VARARGS(KX_GameObject,SetVisible);
 	KX_PYMETHOD_VARARGS(KX_GameObject,SetOcclusion);
@@ -828,7 +826,7 @@ public:
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetParent);
 	KX_PYMETHOD_VARARGS(KX_GameObject,SetParent);
 	KX_PYMETHOD_NOARGS(KX_GameObject,RemoveParent);
-	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildren);	
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildren);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildrenRecursive);
 	KX_PYMETHOD_VARARGS(KX_GameObject,GetMesh);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPhysicsId);
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index 3f241e90836..b71907be961 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -434,21 +434,6 @@ PyTypeObject KX_IpoActuator::Type = {
 };
 
 PyMethodDef KX_IpoActuator::Methods[] = {
-	// deprecated 
-	{"set", (PyCFunction) KX_IpoActuator::sPySet, METH_VARARGS, (const char *)Set_doc},
-	{"setProperty", (PyCFunction) KX_IpoActuator::sPySetProperty, METH_VARARGS, (const char *)SetProperty_doc},
-	{"setStart", (PyCFunction) KX_IpoActuator::sPySetStart, METH_VARARGS, (const char *)SetStart_doc},
-	{"getStart", (PyCFunction) KX_IpoActuator::sPyGetStart, METH_NOARGS, (const char *)GetStart_doc},
-	{"setEnd", (PyCFunction) KX_IpoActuator::sPySetEnd, METH_VARARGS, (const char *)SetEnd_doc},
-	{"getEnd", (PyCFunction) KX_IpoActuator::sPyGetEnd, METH_NOARGS, (const char *)GetEnd_doc},
-	{"setIpoAsForce", (PyCFunction) KX_IpoActuator::sPySetIpoAsForce, METH_VARARGS, (const char *)SetIpoAsForce_doc},
-	{"getIpoAsForce", (PyCFunction) KX_IpoActuator::sPyGetIpoAsForce, METH_NOARGS, (const char *)GetIpoAsForce_doc},
-	{"setIpoAdd", (PyCFunction) KX_IpoActuator::sPySetIpoAdd, METH_VARARGS, (const char *)SetIpoAdd_doc},
-	{"getIpoAdd", (PyCFunction) KX_IpoActuator::sPyGetIpoAdd, METH_NOARGS, (const char *)GetIpoAdd_doc},
-	{"setForceIpoActsLocal", (PyCFunction) KX_IpoActuator::sPySetForceIpoActsLocal, METH_VARARGS, (const char *)SetForceIpoActsLocal_doc},
-	{"getForceIpoActsLocal", (PyCFunction) KX_IpoActuator::sPyGetForceIpoActsLocal,	METH_NOARGS, (const char *)GetForceIpoActsLocal_doc},
-	{"setType", (PyCFunction) KX_IpoActuator::sPySetType, METH_VARARGS, (const char *)SetType_doc},
-	{"getType", (PyCFunction) KX_IpoActuator::sPyGetType, METH_NOARGS, (const char *)GetType_doc},	
 	{NULL,NULL} //Sentinel
 };
 
@@ -466,237 +451,4 @@ PyAttributeDef KX_IpoActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-
-/* set --------------------------------------------------------------------- */
-const char KX_IpoActuator::Set_doc[] = 
-"set(type, startframe, endframe, mode?)\n"
-"\t - type:       Play, PingPong, Flipper, LoopStop, LoopEnd or FromProp (string)\n"
-"\t - startframe: first frame to use (int)\n"
-"\t - endframe  : last frame to use (int)\n"
-"\t - mode?     : special mode (0=normal, 1=interpret location as force, 2=additive)"
-"\tSet the properties of the actuator.\n";
-PyObject* KX_IpoActuator::PySet(PyObject* args) {
-	
-	ShowDeprecationWarning("set()", "a range properties");
-									
-	/* sets modes PLAY, PINGPONG, FLIPPER, LOOPSTOP, LOOPEND                 */
-	/* arg 1 = mode string, arg 2 = startframe, arg3 = stopframe,            */
-	/* arg4 = force toggle                                                   */
-	char* mode;
-	int forceToggle;
-	int modenum;
-	int startFrame, stopFrame;
-	if(!PyArg_ParseTuple(args, "siii:set", &mode, &startFrame, 
-						 &stopFrame, &forceToggle)) {
-		return NULL;
-	}
-	modenum = string2mode(mode);
-	
-	switch (modenum) {
-	case KX_ACT_IPO_PLAY:
-	case KX_ACT_IPO_PINGPONG:
-	case KX_ACT_IPO_FLIPPER:
-	case KX_ACT_IPO_LOOPSTOP:
-	case KX_ACT_IPO_LOOPEND:
-		m_type         = modenum;
-		m_startframe    = startFrame;
-		m_endframe      = stopFrame;
-		m_ipo_as_force = forceToggle == 1;
-		m_ipo_add = forceToggle == 2;
-		break;
-	default:
-		; /* error */
-	}
-
-	Py_RETURN_NONE;
-}
-
-/* set property  ----------------------------------------------------------- */
-const char KX_IpoActuator::SetProperty_doc[] = 
-"setProperty(propname)\n"
-"\t - propname: name of the property (string)\n"
-"\tSet the property to be used in FromProp mode.\n";
-PyObject* KX_IpoActuator::PySetProperty(PyObject* args) {
-
-	ShowDeprecationWarning("setProperty()", "the propName property");
-
-	/* mode is implicit here, but not supported yet... */
-	/* args: property */
-	char *propertyName;
-	if(!PyArg_ParseTuple(args, "s:setProperty", &propertyName)) {
-		return NULL;
-	}
-
-	m_propname = propertyName;
-	
-	Py_RETURN_NONE;
-}
-
-/* 4. setStart:                                                              */
-const char KX_IpoActuator::SetStart_doc[] = 
-"setStart(frame)\n"
-"\t - frame: first frame to use (int)\n"
-"\tSet the frame from which the ipo starts playing.\n";
-PyObject* KX_IpoActuator::PySetStart(PyObject* args) {
-
-	ShowDeprecationWarning("setStart()", "the frameStart property");
-
-	float startArg;
-	if(!PyArg_ParseTuple(args, "f:setStart", &startArg)) {
-		return NULL;		
-	}
-	
-	m_startframe = startArg;
-
-	Py_RETURN_NONE;
-}
-/* 5. getStart:                                                              */
-const char KX_IpoActuator::GetStart_doc[] = 
-"getStart()\n"
-"\tReturns the frame from which the ipo starts playing.\n";
-PyObject* KX_IpoActuator::PyGetStart() {
-	ShowDeprecationWarning("getStart()", "the frameStart property");
-	return PyFloat_FromDouble(m_startframe);
-}
-
-/* 6. setEnd:                                                                */
-const char KX_IpoActuator::SetEnd_doc[] = 
-"setEnd(frame)\n"
-"\t - frame: last frame to use (int)\n"
-"\tSet the frame at which the ipo stops playing.\n";
-PyObject* KX_IpoActuator::PySetEnd(PyObject* args) {
-	ShowDeprecationWarning("setEnd()", "the frameEnd property");
-	float endArg;
-	if(!PyArg_ParseTuple(args, "f:setEnd", &endArg)) {
-		return NULL;		
-	}
-	
-	m_endframe = endArg;
-
-	Py_RETURN_NONE;
-}
-/* 7. getEnd:                                                                */
-const char KX_IpoActuator::GetEnd_doc[] = 
-"getEnd()\n"
-"\tReturns the frame at which the ipo stops playing.\n";
-PyObject* KX_IpoActuator::PyGetEnd() {
-	ShowDeprecationWarning("getEnd()", "the frameEnd property");
-	return PyFloat_FromDouble(m_endframe);
-}
-
-/* 6. setIpoAsForce:                                                           */
-const char KX_IpoActuator::SetIpoAsForce_doc[] = 
-"setIpoAsForce(force?)\n"
-"\t - force?    : interpret this ipo as a force? (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to interpret the ipo as a force rather than a displacement.\n";
-PyObject* KX_IpoActuator::PySetIpoAsForce(PyObject* args) { 
-	ShowDeprecationWarning("setIpoAsForce()", "the useIpoAsForce property");
-	int boolArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setIpoAsForce", &boolArg)) {
-		return NULL;
-	}
-
-	m_ipo_as_force = PyArgToBool(boolArg);
-	if (m_ipo_as_force)
-		m_ipo_add = false;
-	
-	Py_RETURN_NONE;	
-}
-/* 7. getIpoAsForce:                                                         */
-const char KX_IpoActuator::GetIpoAsForce_doc[] = 
-"getIpoAsForce()\n"
-"\tReturns whether to interpret the ipo as a force rather than a displacement.\n";
-PyObject* KX_IpoActuator::PyGetIpoAsForce() {
-	ShowDeprecationWarning("getIpoAsForce()", "the useIpoAsForce property");
-	return BoolToPyArg(m_ipo_as_force);
-}
-
-/* 6. setIpoAsForce:                                                           */
-const char KX_IpoActuator::SetIpoAdd_doc[] = 
-"setIpoAdd(add?)\n"
-"\t - add?    : add flag (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to interpret the ipo as additive rather than absolute.\n";
-PyObject* KX_IpoActuator::PySetIpoAdd(PyObject* args) { 
-	ShowDeprecationWarning("setIpoAdd()", "the useIpoAdd property");
-	int boolArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setIpoAdd", &boolArg)) {
-		return NULL;
-	}
-
-	m_ipo_add = PyArgToBool(boolArg);
-	if (m_ipo_add)
-		m_ipo_as_force = false;
-	
-	Py_RETURN_NONE;	
-}
-/* 7. getIpoAsForce:                                                         */
-const char KX_IpoActuator::GetIpoAdd_doc[] = 
-"getIpoAsAdd()\n"
-"\tReturns whether to interpret the ipo as additive rather than absolute.\n";
-PyObject* KX_IpoActuator::PyGetIpoAdd() {
-	ShowDeprecationWarning("getIpoAdd()", "the useIpoAdd property");
-	return BoolToPyArg(m_ipo_add);
-}
-
-/* 8. setType:                                                               */
-const char KX_IpoActuator::SetType_doc[] = 
-"setType(mode)\n"
-"\t - mode: Play, PingPong, Flipper, LoopStop, LoopEnd or FromProp (string)\n"
-"\tSet the operation mode of the actuator.\n";
-PyObject* KX_IpoActuator::PySetType(PyObject* args) {
-	ShowDeprecationWarning("setType()", "the mode property");
-	int typeArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setType", &typeArg)) {
-		return NULL;
-	}
-	
-	if ( (typeArg > KX_ACT_IPO_NODEF) 
-		 && (typeArg < KX_ACT_IPO_MAX) ) {
-		m_type = typeArg;
-	}
-	
-	Py_RETURN_NONE;
-}
-/* 9. getType:                                                               */
-const char KX_IpoActuator::GetType_doc[] = 
-"getType()\n"
-"\tReturns the operation mode of the actuator.\n";
-PyObject* KX_IpoActuator::PyGetType() {
-	ShowDeprecationWarning("getType()", "the mode property");
-	return PyLong_FromSsize_t(m_type);
-}
-
-/* 10. setForceIpoActsLocal:                                                 */
-const char KX_IpoActuator::SetForceIpoActsLocal_doc[] = 
-"setForceIpoActsLocal(local?)\n"
-"\t - local?    : Apply the ipo-as-force in the object's local\n"
-"\t               coordinates? (KX_TRUE, KX_FALSE)\n"
-"\tSet whether to apply the force in the object's local\n"
-"\tcoordinates rather than the world global coordinates.\n";
-PyObject* KX_IpoActuator::PySetForceIpoActsLocal(PyObject* args) { 
-	ShowDeprecationWarning("setForceIpoActsLocal()", "the useIpoLocal property");
-	int boolArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setForceIpoActsLocal", &boolArg)) {
-		return NULL;
-	}
-
-	m_ipo_local = PyArgToBool(boolArg);
-	
-	Py_RETURN_NONE;	
-}
-/* 11. getForceIpoActsLocal:                                                */
-const char KX_IpoActuator::GetForceIpoActsLocal_doc[] = 
-"getForceIpoActsLocal()\n"
-"\tReturn whether to apply the force in the object's local\n"
-"\tcoordinates rather than the world global coordinates.\n";
-PyObject* KX_IpoActuator::PyGetForceIpoActsLocal() {
-	ShowDeprecationWarning("getForceIpoActsLocal()", "the useIpoLocal property");
-	return BoolToPyArg(m_ipo_local);
-}
-
-
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index 0581d1644ee..72fe812f98e 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -138,23 +138,6 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 	
-	//KX_PYMETHOD_DOC
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,Set);
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetProperty);
-/*  	KX_PYMETHOD_DOC(KX_IpoActuator,SetKey2Key); */
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetStart);
-	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetStart);
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetEnd);
-	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetEnd);
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetIpoAsForce);
-	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetIpoAsForce);
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetIpoAdd);
-	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetIpoAdd);
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetType);
-	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetType);
-	KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetForceIpoActsLocal);
-	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetForceIpoActsLocal);
-	
 };
 
 #endif //__KX_IPOACTUATOR
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index e15847fe6c6..744fdb75796 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -68,18 +68,12 @@ PyTypeObject KX_MeshProxy::Type = {
 };
 
 PyMethodDef KX_MeshProxy::Methods[] = {
-// Deprecated ----->
-{"getNumMaterials", (PyCFunction)KX_MeshProxy::sPyGetNumMaterials,METH_VARARGS},
-{"getNumPolygons", (PyCFunction)KX_MeshProxy::sPyGetNumPolygons,METH_NOARGS},
-// <-----
-
 {"getMaterialName", (PyCFunction)KX_MeshProxy::sPyGetMaterialName,METH_VARARGS},
 {"getTextureName", (PyCFunction)KX_MeshProxy::sPyGetTextureName,METH_VARARGS},
 {"getVertexArrayLength", (PyCFunction)KX_MeshProxy::sPyGetVertexArrayLength,METH_VARARGS},
 {"getVertex", (PyCFunction)KX_MeshProxy::sPyGetVertex,METH_VARARGS},
 {"getPolygon", (PyCFunction)KX_MeshProxy::sPyGetPolygon,METH_VARARGS},
 //{"getIndexArrayLength", (PyCFunction)KX_MeshProxy::sPyGetIndexArrayLength,METH_VARARGS},
-
   {NULL,NULL} //Sentinel
 };
 
@@ -119,20 +113,6 @@ CValue*		KX_MeshProxy::GetReplica() { return NULL;}
 
 
 // stuff for python integration
-	
-PyObject* KX_MeshProxy::PyGetNumMaterials(PyObject* args, PyObject* kwds)
-{
-	int num = m_meshobj->NumMaterials();
-	ShowDeprecationWarning("getNumMaterials()", "the numMaterials property");
-	return PyLong_FromSsize_t(num);
-}
-
-PyObject* KX_MeshProxy::PyGetNumPolygons()
-{
-	int num = m_meshobj->NumPolygons();
-	ShowDeprecationWarning("getNumPolygons()", "the numPolygons property");
-	return PyLong_FromSsize_t(num);
-}
 
 PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* args, PyObject* kwds)
 {
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index 881747edff2..8abc4f6b897 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -368,13 +368,6 @@ PyTypeObject KX_MouseFocusSensor::Type = {
 };
 
 PyMethodDef KX_MouseFocusSensor::Methods[] = {
-	{"getRayTarget", (PyCFunction) KX_MouseFocusSensor::sPyGetRayTarget, METH_NOARGS, (const char *)GetRayTarget_doc},
-	{"getRaySource", (PyCFunction) KX_MouseFocusSensor::sPyGetRaySource, METH_NOARGS, (const char *)GetRaySource_doc},
-	{"getHitObject",(PyCFunction) KX_MouseFocusSensor::sPyGetHitObject,METH_NOARGS, (const char *)GetHitObject_doc},
-	{"getHitPosition",(PyCFunction) KX_MouseFocusSensor::sPyGetHitPosition,METH_NOARGS, (const char *)GetHitPosition_doc},
-	{"getHitNormal",(PyCFunction) KX_MouseFocusSensor::sPyGetHitNormal,METH_NOARGS, (const char *)GetHitNormal_doc},
-	{"getRayDirection",(PyCFunction) KX_MouseFocusSensor::sPyGetRayDirection,METH_NOARGS, (const char *)GetRayDirection_doc},
-
 	{NULL,NULL} //Sentinel
 };
 
@@ -389,78 +382,6 @@ PyAttributeDef KX_MouseFocusSensor::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-const char KX_MouseFocusSensor::GetHitObject_doc[] = 
-"getHitObject()\n"
-"\tReturns the object that was hit by this ray.\n";
-PyObject* KX_MouseFocusSensor::PyGetHitObject()
-{
-	ShowDeprecationWarning("GetHitObject()", "the hitObject property");
-	
-	if (m_hitObject)
-		return m_hitObject->GetProxy();
-	
-	Py_RETURN_NONE;
-}
-
-
-const char KX_MouseFocusSensor::GetHitPosition_doc[] = 
-"getHitPosition()\n"
-"\tReturns the position (in worldcoordinates) where the object was hit by this ray.\n";
-PyObject* KX_MouseFocusSensor::PyGetHitPosition()
-{
-	ShowDeprecationWarning("getHitPosition()", "the hitPosition property");
-	
-	return PyObjectFrom(m_hitPosition);
-}
-
-const char KX_MouseFocusSensor::GetRayDirection_doc[] = 
-"getRayDirection()\n"
-"\tReturns the direction from the ray (in worldcoordinates) .\n";
-PyObject* KX_MouseFocusSensor::PyGetRayDirection()
-{
-	ShowDeprecationWarning("getRayDirection()", "the rayDirection property");
-	
-	MT_Vector3 dir = m_prevTargetPoint - m_prevSourcePoint;
-	if(MT_fuzzyZero(dir))	dir.setValue(0,0,0);
-	else					dir.normalize();
-	return PyObjectFrom(dir);
-}
-
-const char KX_MouseFocusSensor::GetHitNormal_doc[] = 
-"getHitNormal()\n"
-"\tReturns the normal (in worldcoordinates) at the point of collision where the object was hit by this ray.\n";
-PyObject* KX_MouseFocusSensor::PyGetHitNormal()
-{
-	ShowDeprecationWarning("getHitNormal()", "the hitNormal property");
-	
-	return PyObjectFrom(m_hitNormal);
-}
-
-
-/*  getRayTarget                                                */
-const char KX_MouseFocusSensor::GetRayTarget_doc[] = 
-"getRayTarget()\n"
-"\tReturns the target of the ray that seeks the focus object,\n"
-"\tin worldcoordinates.";
-PyObject* KX_MouseFocusSensor::PyGetRayTarget()
-{
-	ShowDeprecationWarning("getRayTarget()", "the rayTarget property");
-	
-	return PyObjectFrom(m_prevTargetPoint);
-}
-
-/*  getRayTarget                                                */
-const char KX_MouseFocusSensor::GetRaySource_doc[] = 
-"getRaySource()\n"
-"\tReturns the source of the ray that seeks the focus object,\n"
-"\tin worldcoordinates.";
-PyObject* KX_MouseFocusSensor::PyGetRaySource()
-{
-	ShowDeprecationWarning("getRaySource()", "the raySource property");
-	
-	return PyObjectFrom(m_prevSourcePoint);
-}
-
 /* Attributes */
 PyObject* KX_MouseFocusSensor::pyattr_get_ray_source(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 89ac012c068..7b53557467f 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -90,14 +90,6 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetRayTarget);
-	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetRaySource);
-	
-	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetHitObject);
-	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetHitPosition);
-	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetHitNormal);
-	KX_PYMETHOD_DOC_NOARGS(KX_MouseFocusSensor,GetRayDirection);
-
 	/* attributes */
 	static PyObject*	pyattr_get_ray_source(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_ray_target(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 2ee30ee0bfa..99179c5ed96 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -347,32 +347,6 @@ PyTypeObject KX_ObjectActuator::Type = {
 };
 
 PyMethodDef KX_ObjectActuator::Methods[] = {
-	// Deprecated ----->
-	{"getForce", (PyCFunction) KX_ObjectActuator::sPyGetForce, METH_NOARGS},
-	{"setForce", (PyCFunction) KX_ObjectActuator::sPySetForce, METH_VARARGS},
-	{"getTorque", (PyCFunction) KX_ObjectActuator::sPyGetTorque, METH_NOARGS},
-	{"setTorque", (PyCFunction) KX_ObjectActuator::sPySetTorque, METH_VARARGS},
-	{"getDLoc", (PyCFunction) KX_ObjectActuator::sPyGetDLoc, METH_NOARGS},
-	{"setDLoc", (PyCFunction) KX_ObjectActuator::sPySetDLoc, METH_VARARGS},
-	{"getDRot", (PyCFunction) KX_ObjectActuator::sPyGetDRot, METH_NOARGS},
-	{"setDRot", (PyCFunction) KX_ObjectActuator::sPySetDRot, METH_VARARGS},
-	{"getLinearVelocity", (PyCFunction) KX_ObjectActuator::sPyGetLinearVelocity, METH_NOARGS},
-	{"setLinearVelocity", (PyCFunction) KX_ObjectActuator::sPySetLinearVelocity, METH_VARARGS},
-	{"getAngularVelocity", (PyCFunction) KX_ObjectActuator::sPyGetAngularVelocity, METH_NOARGS},
-	{"setAngularVelocity", (PyCFunction) KX_ObjectActuator::sPySetAngularVelocity, METH_VARARGS},
-	{"setDamping", (PyCFunction) KX_ObjectActuator::sPySetDamping, METH_VARARGS},
-	{"getDamping", (PyCFunction) KX_ObjectActuator::sPyGetDamping, METH_NOARGS},
-	{"setForceLimitX", (PyCFunction) KX_ObjectActuator::sPySetForceLimitX, METH_VARARGS},
-	{"getForceLimitX", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitX, METH_NOARGS},
-	{"setForceLimitY", (PyCFunction) KX_ObjectActuator::sPySetForceLimitY, METH_VARARGS},
-	{"getForceLimitY", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitY, METH_NOARGS},
-	{"setForceLimitZ", (PyCFunction) KX_ObjectActuator::sPySetForceLimitZ, METH_VARARGS},
-	{"getForceLimitZ", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitZ, METH_NOARGS},
-	{"setPID", (PyCFunction) KX_ObjectActuator::sPyGetPID, METH_NOARGS},
-	{"getPID", (PyCFunction) KX_ObjectActuator::sPySetPID, METH_VARARGS},
-
-	// <----- Deprecated
-
 	{NULL,NULL} //Sentinel
 };
 
@@ -667,305 +641,4 @@ int KX_ObjectActuator::pyattr_set_reference(void *self, const struct KX_PYATTRIB
 	return PY_SET_ATTR_SUCCESS;
 }
 
-
-/* 1. set ------------------------------------------------------------------ */
-/* Removed! */
-
-/* 2. getForce                                                               */
-PyObject* KX_ObjectActuator::PyGetForce()
-{
-	ShowDeprecationWarning("getForce()", "the force and the useLocalForce properties");
-	PyObject *retVal = PyList_New(4);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_force[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_force[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_force[2]));
-	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.Force));
-	
-	return retVal;
-}
-/* 3. setForce                                                               */
-PyObject* KX_ObjectActuator::PySetForce(PyObject* args)
-{
-	ShowDeprecationWarning("setForce()", "the force and the useLocalForce properties");
-	float vecArg[3];
-	int bToggle = 0;
-	if (!PyArg_ParseTuple(args, "fffi:setForce", &vecArg[0], &vecArg[1], 
-						  &vecArg[2], &bToggle)) {
-		return NULL;
-	}
-	m_force.setValue(vecArg);
-	m_bitLocalFlag.Force = PyArgToBool(bToggle);
-	UpdateFuzzyFlags();
-	Py_RETURN_NONE;
-}
-
-/* 4. getTorque                                                              */
-PyObject* KX_ObjectActuator::PyGetTorque()
-{
-	ShowDeprecationWarning("getTorque()", "the torque and the useLocalTorque properties");
-	PyObject *retVal = PyList_New(4);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_torque[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_torque[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_torque[2]));
-	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.Torque));
-	
-	return retVal;
-}
-/* 5. setTorque                                                              */
-PyObject* KX_ObjectActuator::PySetTorque(PyObject* args)
-{
-	ShowDeprecationWarning("setTorque()", "the torque and the useLocalTorque properties");
-	float vecArg[3];
-	int bToggle = 0;
-	if (!PyArg_ParseTuple(args, "fffi:setTorque", &vecArg[0], &vecArg[1], 
-						  &vecArg[2], &bToggle)) {
-		return NULL;
-	}
-	m_torque.setValue(vecArg);
-	m_bitLocalFlag.Torque = PyArgToBool(bToggle);
-	UpdateFuzzyFlags();
-	Py_RETURN_NONE;
-}
-
-/* 6. getDLoc                                                                */
-PyObject* KX_ObjectActuator::PyGetDLoc()
-{
-	ShowDeprecationWarning("getDLoc()", "the dLoc and the useLocalDLoc properties");
-	PyObject *retVal = PyList_New(4);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_dloc[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_dloc[2]));
-	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.DLoc));
-	
-	return retVal;
-}
-/* 7. setDLoc                                                                */
-PyObject* KX_ObjectActuator::PySetDLoc(PyObject* args)
-{
-	ShowDeprecationWarning("setDLoc()", "the dLoc and the useLocalDLoc properties");
-	float vecArg[3];
-	int bToggle = 0;
-	if(!PyArg_ParseTuple(args, "fffi:setDLoc", &vecArg[0], &vecArg[1], 
-						 &vecArg[2], &bToggle)) {
-		return NULL;
-	}
-	m_dloc.setValue(vecArg);
-	m_bitLocalFlag.DLoc = PyArgToBool(bToggle);
-	UpdateFuzzyFlags();
-	Py_RETURN_NONE;
-}
-
-/* 8. getDRot                                                                */
-PyObject* KX_ObjectActuator::PyGetDRot()
-{
-	ShowDeprecationWarning("getDRot()", "the dRot and the useLocalDRot properties");
-	PyObject *retVal = PyList_New(4);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_drot[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_drot[2]));
-	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.DRot));
-	
-	return retVal;
-}
-/* 9. setDRot                                                                */
-PyObject* KX_ObjectActuator::PySetDRot(PyObject* args)
-{
-	ShowDeprecationWarning("setDRot()", "the dRot and the useLocalDRot properties");
-	float vecArg[3];
-	int bToggle = 0;
-	if (!PyArg_ParseTuple(args, "fffi:setDRot", &vecArg[0], &vecArg[1], 
-						  &vecArg[2], &bToggle)) {
-		return NULL;
-	}
-	m_drot.setValue(vecArg);
-	m_bitLocalFlag.DRot = PyArgToBool(bToggle);
-	UpdateFuzzyFlags();
-	Py_RETURN_NONE;
-}
-
-/* 10. getLinearVelocity                                                 */
-PyObject* KX_ObjectActuator::PyGetLinearVelocity() {
-	ShowDeprecationWarning("getLinearVelocity()", "the linV and the useLocalLinV properties");
-	PyObject *retVal = PyList_New(4);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
-	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.LinearVelocity));
-	
-	return retVal;
-}
-
-/* 11. setLinearVelocity                                                 */
-PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* args) {
-	ShowDeprecationWarning("setLinearVelocity()", "the linV and the useLocalLinV properties");
-	float vecArg[3];
-	int bToggle = 0;
-	if (!PyArg_ParseTuple(args, "fffi:setLinearVelocity", &vecArg[0], &vecArg[1], 
-						  &vecArg[2], &bToggle)) {
-		return NULL;
-	}
-	m_linear_velocity.setValue(vecArg);
-	m_bitLocalFlag.LinearVelocity = PyArgToBool(bToggle);
-	UpdateFuzzyFlags();
-	Py_RETURN_NONE;
-}
-
-
-/* 12. getAngularVelocity                                                */
-PyObject* KX_ObjectActuator::PyGetAngularVelocity() {
-	ShowDeprecationWarning("getAngularVelocity()", "the angV and the useLocalAngV properties");
-	PyObject *retVal = PyList_New(4);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_angular_velocity[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_angular_velocity[2]));
-	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.AngularVelocity));
-	
-	return retVal;
-}
-/* 13. setAngularVelocity                                                */
-PyObject* KX_ObjectActuator::PySetAngularVelocity(PyObject* args) {
-	ShowDeprecationWarning("setAngularVelocity()", "the angV and the useLocalAngV properties");
-	float vecArg[3];
-	int bToggle = 0;
-	if (!PyArg_ParseTuple(args, "fffi:setAngularVelocity", &vecArg[0], &vecArg[1], 
-						  &vecArg[2], &bToggle)) {
-		return NULL;
-	}
-	m_angular_velocity.setValue(vecArg);
-	m_bitLocalFlag.AngularVelocity = PyArgToBool(bToggle);
-	UpdateFuzzyFlags();
-	Py_RETURN_NONE;
-}
-
-/* 13. setDamping                                                */
-PyObject* KX_ObjectActuator::PySetDamping(PyObject* args) {
-	ShowDeprecationWarning("setDamping()", "the damping property");
-	int damping = 0;
-	if (!PyArg_ParseTuple(args, "i:setDamping", &damping) || damping < 0 || damping > 1000) {
-		return NULL;
-	}
-	m_damping = damping;
-	Py_RETURN_NONE;
-}
-
-/* 13. getVelocityDamping                                                */
-PyObject* KX_ObjectActuator::PyGetDamping() {
-	ShowDeprecationWarning("getDamping()", "the damping property");
-	return Py_BuildValue("i",m_damping);
-}
-/* 6. getForceLimitX                                                                */
-PyObject* KX_ObjectActuator::PyGetForceLimitX()
-{
-	ShowDeprecationWarning("getForceLimitX()", "the forceLimitX property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[0]));
-	PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.Torque));
-	
-	return retVal;
-}
-/* 7. setForceLimitX                                                         */
-PyObject* KX_ObjectActuator::PySetForceLimitX(PyObject* args)
-{
-	ShowDeprecationWarning("setForceLimitX()", "the forceLimitX property");
-	float vecArg[2];
-	int bToggle = 0;
-	if(!PyArg_ParseTuple(args, "ffi:setForceLimitX", &vecArg[0], &vecArg[1], &bToggle)) {
-		return NULL;
-	}
-	m_drot[0] = vecArg[0];
-	m_dloc[0] = vecArg[1];
-	m_bitLocalFlag.Torque = PyArgToBool(bToggle);
-	Py_RETURN_NONE;
-}
-
-/* 6. getForceLimitY                                                                */
-PyObject* KX_ObjectActuator::PyGetForceLimitY()
-{
-	ShowDeprecationWarning("getForceLimitY()", "the forceLimitY property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[1]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
-	PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.DLoc));
-	
-	return retVal;
-}
-/* 7. setForceLimitY                                                                */
-PyObject* KX_ObjectActuator::PySetForceLimitY(PyObject* args)
-{
-	ShowDeprecationWarning("setForceLimitY()", "the forceLimitY property");
-	float vecArg[2];
-	int bToggle = 0;
-	if(!PyArg_ParseTuple(args, "ffi:setForceLimitY", &vecArg[0], &vecArg[1], &bToggle)) {
-		return NULL;
-	}
-	m_drot[1] = vecArg[0];
-	m_dloc[1] = vecArg[1];
-	m_bitLocalFlag.DLoc = PyArgToBool(bToggle);
-	Py_RETURN_NONE;
-}
-
-/* 6. getForceLimitZ                                                                */
-PyObject* KX_ObjectActuator::PyGetForceLimitZ()
-{
-	ShowDeprecationWarning("getForceLimitZ()", "the forceLimitZ property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[2]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[2]));
-	PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.DRot));
-	
-	return retVal;
-}
-/* 7. setForceLimitZ                                                                */
-PyObject* KX_ObjectActuator::PySetForceLimitZ(PyObject* args)
-{
-	ShowDeprecationWarning("setForceLimitZ()", "the forceLimitZ property");
-	float vecArg[2];
-	int bToggle = 0;
-	if(!PyArg_ParseTuple(args, "ffi:setForceLimitZ", &vecArg[0], &vecArg[1], &bToggle)) {
-		return NULL;
-	}
-	m_drot[2] = vecArg[0];
-	m_dloc[2] = vecArg[1];
-	m_bitLocalFlag.DRot = PyArgToBool(bToggle);
-	Py_RETURN_NONE;
-}
-
-/* 4. getPID                                                              */
-PyObject* KX_ObjectActuator::PyGetPID()
-{
-	ShowDeprecationWarning("getPID()", "the pid property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_pid[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_pid[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_pid[2]));
-	
-	return retVal;
-}
-/* 5. setPID                                                              */
-PyObject* KX_ObjectActuator::PySetPID(PyObject* args)
-{
-	ShowDeprecationWarning("setPID()", "the pid property");
-	float vecArg[3];
-	if (!PyArg_ParseTuple(args, "fff:setPID", &vecArg[0], &vecArg[1], &vecArg[2])) {
-		return NULL;
-	}
-	m_pid.setValue(vecArg);
-	Py_RETURN_NONE;
-}
-
-
-
-
-
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h
index 20aec9e0e86..7a8c7de16b1 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -163,29 +163,6 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForce);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetForce);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetTorque);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetTorque);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetDLoc);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetDLoc);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetDRot);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetDRot);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetLinearVelocity);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetLinearVelocity);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetAngularVelocity);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetAngularVelocity);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetDamping);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetDamping);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForceLimitX);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetForceLimitX);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForceLimitY);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetForceLimitY);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForceLimitZ);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetForceLimitZ);
-	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetPID);
-	KX_PYMETHOD_VARARGS(KX_ObjectActuator,SetPID);
-
 	/* Attributes */
 	static PyObject*	pyattr_get_forceLimitX(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_forceLimitX(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 621aeea87be..20e982f03e0 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -162,10 +162,6 @@ PyTypeObject KX_ParentActuator::Type = {
 };
 
 PyMethodDef KX_ParentActuator::Methods[] = {
-	// Deprecated ----->
-	{"setObject", (PyCFunction) KX_ParentActuator::sPySetObject, METH_O, (const char *)SetObject_doc},
-	{"getObject", (PyCFunction) KX_ParentActuator::sPyGetObject, METH_VARARGS, (const char *)GetObject_doc},
-	// <-----
 	{NULL,NULL} //Sentinel
 };
 
@@ -205,55 +201,4 @@ int KX_ParentActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUTE
 	return PY_SET_ATTR_SUCCESS;
 }
 
-
-/* Deprecated -----> */
-/* 1. setObject                                                            */
-const char KX_ParentActuator::SetObject_doc[] = 
-"setObject(object)\n"
-"\t- object: KX_GameObject, string or None\n"
-"\tSet the object to set as parent.\n";
-PyObject* KX_ParentActuator::PySetObject(PyObject* value) {
-	KX_GameObject *gameobj;
-	
-	ShowDeprecationWarning("setObject()", "the object property");
-	
-	if (!ConvertPythonToGameObject(value, &gameobj, true, "actuator.setObject(value): KX_ParentActuator"))
-		return NULL; // ConvertPythonToGameObject sets the error
-	
-	if (m_ob != NULL)
-		m_ob->UnregisterActuator(this);	
-
-	m_ob = (SCA_IObject*)gameobj;
-	if (m_ob)
-		m_ob->RegisterActuator(this);
-	
-	Py_RETURN_NONE;
-}
-
-/* 2. getObject                                                            */
-
-/* get obj  ---------------------------------------------------------- */
-const char KX_ParentActuator::GetObject_doc[] = 
-"getObject(name_only = 1)\n"
-"name_only - optional arg, when true will return the KX_GameObject rather then its name\n"
-"\tReturns the object that is set to.\n";
-PyObject* KX_ParentActuator::PyGetObject(PyObject* args)
-{
-	int ret_name_only = 1;
-	
-	ShowDeprecationWarning("getObject()", "the object property");
-	
-	if (!PyArg_ParseTuple(args, "|i:getObject", &ret_name_only))
-		return NULL;
-	
-	if (!m_ob)
-		Py_RETURN_NONE;
-	
-	if (ret_name_only)
-		return PyUnicode_FromString(m_ob->GetName().ReadPtr());
-	else
-		return m_ob->GetProxy();
-}
-/* <----- */
-
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h
index aeb39eabf89..f750affc8a1 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.h
+++ b/source/gameengine/Ketsji/KX_ParentActuator.h
@@ -84,11 +84,6 @@ class KX_ParentActuator : public SCA_IActuator
 	/* These are used to get and set m_ob */
 	static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-
-	// Deprecated ----->
-	KX_PYMETHOD_DOC_O(KX_ParentActuator,SetObject);
-	KX_PYMETHOD_DOC_VARARGS(KX_ParentActuator,GetObject);
-	// <-----
 	
 }; /* end of class KX_ParentActuator : public SCA_PropertyActuator */
 
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 49cf895af17..5afaf61dee2 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -484,8 +484,6 @@ static struct PyMethodDef game_methods[] = {
 	METH_NOARGS, gPyGetCurrentScene_doc},
 	{"getSceneList", (PyCFunction) gPyGetSceneList,
 	METH_NOARGS, (const char *)gPyGetSceneList_doc},
-	{"addActiveActuator",(PyCFunction) SCA_PythonController::sPyAddActiveActuator,
-	METH_VARARGS, (const char *)SCA_PythonController::sPyAddActiveActuator__doc__},
 	{"getRandomFloat",(PyCFunction) gPyGetRandomFloat,
 	METH_NOARGS, (const char *)gPyGetRandomFloat_doc},
 	{"setGravity",(PyCFunction) gPySetGravity, METH_O, (const char *)"set Gravitation"},
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index d020a2544d2..eb127be8044 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -176,51 +176,7 @@ void KX_RadarSensor::SynchronizeTransform()
 /* Python Functions															 */
 /* ------------------------------------------------------------------------- */
 
-//Deprecated ----->
-/* getConeOrigin */
-const char KX_RadarSensor::GetConeOrigin_doc[] = 
-"getConeOrigin()\n"
-"\tReturns the origin of the cone with which to test. The origin\n"
-"\tis in the middle of the cone.";
-PyObject* KX_RadarSensor::PyGetConeOrigin() {
-	ShowDeprecationWarning("getConeOrigin()", "the coneOrigin property");
-
-	PyObject *retVal = PyList_New(3);
-	
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_cone_origin[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_cone_origin[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_cone_origin[2]));
-	
-	return retVal;
-}
-
-/* getConeOrigin */
-const char KX_RadarSensor::GetConeTarget_doc[] = 
-"getConeTarget()\n"
-"\tReturns the center of the bottom face of the cone with which to test.\n";
-PyObject* KX_RadarSensor::PyGetConeTarget() {
-	ShowDeprecationWarning("getConeTarget()", "the coneTarget property");
-
-	PyObject *retVal = PyList_New(3);
-	
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_cone_target[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_cone_target[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_cone_target[2]));
-	
-	return retVal;
-}
-
-/* getConeHeight */
-const char KX_RadarSensor::GetConeHeight_doc[] = 
-"getConeHeight()\n"
-"\tReturns the height of the cone with which to test.\n";
-PyObject* KX_RadarSensor::PyGetConeHeight() {
-											  
-	ShowDeprecationWarning("getConeHeight()", "the distance property");
-
-	return PyFloat_FromDouble(m_coneheight);
-}
-//<----- Deprecated
+/* none */
 
 /* ------------------------------------------------------------------------- */
 /* Python Integration Hooks                                                  */
@@ -248,14 +204,6 @@ PyTypeObject KX_RadarSensor::Type = {
 };
 
 PyMethodDef KX_RadarSensor::Methods[] = {
-	//Deprecated ----->
-	{"getConeOrigin", (PyCFunction) KX_RadarSensor::sPyGetConeOrigin, 
-	 METH_VARARGS, (const char *)GetConeOrigin_doc},
-	{"getConeTarget", (PyCFunction) KX_RadarSensor::sPyGetConeTarget, 
-	 METH_VARARGS, (const char *)GetConeTarget_doc},
-	{"getConeHeight", (PyCFunction) KX_RadarSensor::sPyGetConeHeight, 
-	 METH_VARARGS, (const char *)GetConeHeight_doc},
-	 //<-----
 	{NULL} //Sentinel
 };
 
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index 9f38d75abc4..487e9f1aaa7 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -90,11 +90,6 @@ public:
 	/* python */
 	virtual sensortype GetSensorType() { return ST_RADAR; }
 
-	//Deprecated ----->
-	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeOrigin);
-	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeTarget);
-	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeHeight);
-	//<-----
 };
 
 #endif //__KX_RADAR_SENSOR_H
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index 8616145d709..1f36945ccaa 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -342,12 +342,6 @@ PyTypeObject KX_RaySensor::Type = {
 };
 
 PyMethodDef KX_RaySensor::Methods[] = {
-	// Deprecated ----->
-	{"getHitObject",(PyCFunction) KX_RaySensor::sPyGetHitObject,METH_NOARGS, (const char *)GetHitObject_doc},
-	{"getHitPosition",(PyCFunction) KX_RaySensor::sPyGetHitPosition,METH_NOARGS, (const char *)GetHitPosition_doc},
-	{"getHitNormal",(PyCFunction) KX_RaySensor::sPyGetHitNormal,METH_NOARGS, (const char *)GetHitNormal_doc},
-	{"getRayDirection",(PyCFunction) KX_RaySensor::sPyGetRayDirection,METH_NOARGS, (const char *)GetRayDirection_doc},
-	// <-----
 	{NULL,NULL} //Sentinel
 };
 
@@ -372,68 +366,3 @@ PyObject* KX_RaySensor::pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_
 
 	Py_RETURN_NONE;
 }
-
-// Deprecated ----->
-const char KX_RaySensor::GetHitObject_doc[] = 
-"getHitObject()\n"
-"\tReturns the name of the object that was hit by this ray.\n";
-PyObject* KX_RaySensor::PyGetHitObject()
-{
-	ShowDeprecationWarning("getHitObject()", "the hitObject property");
-	if (m_hitObject)
-	{
-		return m_hitObject->GetProxy();
-	}
-	Py_RETURN_NONE;
-}
-
-
-const char KX_RaySensor::GetHitPosition_doc[] = 
-"getHitPosition()\n"
-"\tReturns the position (in worldcoordinates) where the object was hit by this ray.\n";
-PyObject* KX_RaySensor::PyGetHitPosition()
-{
-	ShowDeprecationWarning("getHitPosition()", "the hitPosition property");
-
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_hitPosition[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_hitPosition[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_hitPosition[2]));
-
-	return retVal;
-}
-
-const char KX_RaySensor::GetRayDirection_doc[] = 
-"getRayDirection()\n"
-"\tReturns the direction from the ray (in worldcoordinates) .\n";
-PyObject* KX_RaySensor::PyGetRayDirection()
-{
-	ShowDeprecationWarning("getRayDirection()", "the rayDirection property");
-
-	PyObject *retVal = PyList_New(3);
-	
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_rayDirection[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_rayDirection[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_rayDirection[2]));
-
-	return retVal;
-}
-
-const char KX_RaySensor::GetHitNormal_doc[] = 
-"getHitNormal()\n"
-"\tReturns the normal (in worldcoordinates) of the object at the location where the object was hit by this ray.\n";
-PyObject* KX_RaySensor::PyGetHitNormal()
-{
-	ShowDeprecationWarning("getHitNormal()", "the hitNormal property");
-
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_hitNormal[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_hitNormal[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_hitNormal[2]));
-
-	return retVal;
-}
-
-// <----- Deprecated
diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h
index 530c8ce54e5..d3e92a14214 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.h
+++ b/source/gameengine/Ketsji/KX_RaySensor.h
@@ -84,12 +84,6 @@ public:
 		KX_RAY_AXIS_NEG_Z
 	};
 	
-	// Deprecated ----->
-	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetHitObject);
-	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetHitPosition);
-	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetHitNormal);
-	KX_PYMETHOD_DOC_NOARGS(KX_RaySensor,GetRayDirection);
-	// <-----
 
 	/* Attributes */
 	static PyObject* pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index fffb0ac1220..099403fc28d 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -192,18 +192,7 @@ PyTypeObject KX_SCA_AddObjectActuator::Type = {
 };
 
 PyMethodDef KX_SCA_AddObjectActuator::Methods[] = {
-  // ---> deprecated
-  {"setTime", (PyCFunction) KX_SCA_AddObjectActuator::sPySetTime, METH_O, (const char *)SetTime_doc},
-  {"getTime", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetTime, METH_NOARGS, (const char *)GetTime_doc},
-  {"getLinearVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetLinearVelocity, METH_NOARGS, (const char *)GetLinearVelocity_doc},
-  {"setLinearVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPySetLinearVelocity, METH_VARARGS, (const char *)SetLinearVelocity_doc},
-  {"getAngularVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetAngularVelocity, METH_NOARGS, (const char *)GetAngularVelocity_doc},
-  {"setAngularVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPySetAngularVelocity, METH_VARARGS, (const char *)SetAngularVelocity_doc},
-  {"getLastCreatedObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetLastCreatedObject, METH_NOARGS,"getLastCreatedObject() : get the object handle to the last created object\n"},
   {"instantAddObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyInstantAddObject, METH_NOARGS,"instantAddObject() : immediately add object without delay\n"},
-  {"setObject", (PyCFunction) KX_SCA_AddObjectActuator::sPySetObject, METH_O, (const char *)SetObject_doc},
-  {"getObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetObject, METH_VARARGS, (const char *)GetObject_doc},
-  
   {NULL,NULL} //Sentinel
 };
 
@@ -253,181 +242,6 @@ PyObject* KX_SCA_AddObjectActuator::pyattr_get_objectLastCreated(void *self, con
 		return actuator->m_lastCreatedObject->GetProxy();
 }
 
-/* 1. setObject */
-const char KX_SCA_AddObjectActuator::SetObject_doc[] = 
-"setObject(object)\n"
-"\t- object: KX_GameObject, string or None\n"
-"\tSets the object that will be added. There has to be an object\n"
-"\tof this name. If not, this function does nothing.\n";
-PyObject* KX_SCA_AddObjectActuator::PySetObject(PyObject* value)
-{
-	KX_GameObject *gameobj;
-	
-	ShowDeprecationWarning("setObject()", "the object property");
-	
-	if (!ConvertPythonToGameObject(value, &gameobj, true, "actuator.setObject(value): KX_SCA_AddObjectActuator"))
-		return NULL; // ConvertPythonToGameObject sets the error
-	
-	if (m_OriginalObject != NULL)
-		m_OriginalObject->UnregisterActuator(this);	
-
-	m_OriginalObject = (SCA_IObject*)gameobj;
-	if (m_OriginalObject)
-		m_OriginalObject->RegisterActuator(this);
-	
-	Py_RETURN_NONE;
-}
-
-
-
-/* 2. setTime */
-const char KX_SCA_AddObjectActuator::SetTime_doc[] = 
-"setTime(duration)\n"
-"\t- duration: integer\n"
-"\tSets the lifetime of the object that will be added, in frames. \n"
-"\tIf the duration is negative, it is set to 0.\n";
-
-
-PyObject* KX_SCA_AddObjectActuator::PySetTime(PyObject* value)
-{
-	ShowDeprecationWarning("setTime()", "the time property");
-	int deltatime = PyLong_AsSsize_t(value);
-	if (deltatime==-1 && PyErr_Occurred()) {
-		PyErr_SetString(PyExc_TypeError, "expected an int");
-		return NULL;
-	}
-	
-	m_timeProp = deltatime;
-	if (m_timeProp < 0) m_timeProp = 0;
-	
-	Py_RETURN_NONE;
-}
-
-
-
-/* 3. getTime */
-const char KX_SCA_AddObjectActuator::GetTime_doc[] = 
-"getTime()\n"
-"\tReturns the lifetime of the object that will be added.\n";
-
-
-PyObject* KX_SCA_AddObjectActuator::PyGetTime()
-{
-	ShowDeprecationWarning("getTime()", "the time property");
-	return PyLong_FromSsize_t(m_timeProp);
-}
-
-
-/* 4. getObject */
-const char KX_SCA_AddObjectActuator::GetObject_doc[] = 
-"getObject(name_only = 1)\n"
-"name_only - optional arg, when true will return the KX_GameObject rather then its name\n"
-"\tReturns the name of the object that will be added.\n";
-PyObject* KX_SCA_AddObjectActuator::PyGetObject(PyObject* args)
-{
-	int ret_name_only = 1;
-	
-	ShowDeprecationWarning("getObject()", "the object property");
-	
-	if (!PyArg_ParseTuple(args, "|i:getObject", &ret_name_only))
-		return NULL;
-	
-	if (!m_OriginalObject)
-		Py_RETURN_NONE;
-	
-	if (ret_name_only)
-		return PyUnicode_FromString(m_OriginalObject->GetName().ReadPtr());
-	else
-		return m_OriginalObject->GetProxy();
-}
-
-
-
-/* 5. getLinearVelocity */
-const char KX_SCA_AddObjectActuator::GetLinearVelocity_doc[] = 
-"GetLinearVelocity()\n"
-"\tReturns the linear velocity that will be assigned to \n"
-"\tthe created object.\n";
-
-PyObject* KX_SCA_AddObjectActuator::PyGetLinearVelocity()
-{
-	ShowDeprecationWarning("getLinearVelocity()", "the linearVelocity property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
-	
-	return retVal;
-}
-
-
-
-/* 6. setLinearVelocity                                                 */
-const char KX_SCA_AddObjectActuator::SetLinearVelocity_doc[] = 
-"setLinearVelocity(vx, vy, vz)\n"
-"\t- vx: float\n"
-"\t- vy: float\n"
-"\t- vz: float\n"
-"\t- local: bool\n"
-"\tAssign this velocity to the created object. \n";
-
-PyObject* KX_SCA_AddObjectActuator::PySetLinearVelocity(PyObject* args)
-{
-	ShowDeprecationWarning("setLinearVelocity()", "the linearVelocity property");
-	
-	float vecArg[3];
-	if (!PyArg_ParseTuple(args, "fff:setLinearVelocity", &vecArg[0], &vecArg[1], &vecArg[2]))
-		return NULL;
-
-	m_linear_velocity[0] = vecArg[0];
-	m_linear_velocity[1] = vecArg[1];
-	m_linear_velocity[2] = vecArg[2];
-	Py_RETURN_NONE;
-}
-
-/* 7. getAngularVelocity */
-const char KX_SCA_AddObjectActuator::GetAngularVelocity_doc[] = 
-"GetAngularVelocity()\n"
-"\tReturns the angular velocity that will be assigned to \n"
-"\tthe created object.\n";
-
-PyObject* KX_SCA_AddObjectActuator::PyGetAngularVelocity()
-{
-	ShowDeprecationWarning("getAngularVelocity()", "the angularVelocity property");
-	PyObject *retVal = PyList_New(3);
-
-	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
-	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_angular_velocity[1]));
-	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_angular_velocity[2]));
-	
-	return retVal;
-}
-
-
-
-/* 8. setAngularVelocity                                                 */
-const char KX_SCA_AddObjectActuator::SetAngularVelocity_doc[] = 
-"setAngularVelocity(vx, vy, vz)\n"
-"\t- vx: float\n"
-"\t- vy: float\n"
-"\t- vz: float\n"
-"\t- local: bool\n"
-"\tAssign this angular velocity to the created object. \n";
-
-PyObject* KX_SCA_AddObjectActuator::PySetAngularVelocity(PyObject* args)
-{
-	ShowDeprecationWarning("setAngularVelocity()", "the angularVelocity property");
-	
-	float vecArg[3];
-	if (!PyArg_ParseTuple(args, "fff:setAngularVelocity", &vecArg[0], &vecArg[1], &vecArg[2]))
-		return NULL;
-
-	m_angular_velocity[0] = vecArg[0];
-	m_angular_velocity[1] = vecArg[1];
-	m_angular_velocity[2] = vecArg[2];
-	Py_RETURN_NONE;
-}
 
 void	KX_SCA_AddObjectActuator::InstantAddObject()
 {
@@ -470,26 +284,3 @@ PyObject* KX_SCA_AddObjectActuator::PyInstantAddObject()
 
 	Py_RETURN_NONE;
 }
-
-
-
-/* 7. GetLastCreatedObject                                                */
-const char KX_SCA_AddObjectActuator::GetLastCreatedObject_doc[] = 
-"getLastCreatedObject()\n"
-"\tReturn the last created object. \n";
-
-
-PyObject* KX_SCA_AddObjectActuator::PyGetLastCreatedObject()
-{
-	ShowDeprecationWarning("getLastCreatedObject()", "the objectLastCreated property");
-	SCA_IObject* result = this->GetLastCreatedObject();
-	
-	// if result->GetSGNode() is NULL
-	// it means the object has ended, The BGE python api crashes in many places if the object is returned.
-	if (result && (static_cast<KX_GameObject *>(result))->GetSGNode()) 
-	{
-		return result->GetProxy();
-	}
-	// don't return NULL to python anymore, it gives trouble in the scripts
-	Py_RETURN_NONE;
-}
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index 3151e7a89ca..7137ba5209e 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -115,25 +115,6 @@ public:
 
 	void	InstantAddObject();
 
-	/* 1. setObject */
-	KX_PYMETHOD_DOC_O(KX_SCA_AddObjectActuator,SetObject);
-	/* 2. setTime */
-	KX_PYMETHOD_DOC_O(KX_SCA_AddObjectActuator,SetTime);
-	/* 3. getTime */
-	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,GetTime);
-	/* 4. getObject */
-	KX_PYMETHOD_DOC_VARARGS(KX_SCA_AddObjectActuator,GetObject);
-	/* 5. getLinearVelocity */
-	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,GetLinearVelocity);
-	/* 6. setLinearVelocity */
-	KX_PYMETHOD_DOC_VARARGS(KX_SCA_AddObjectActuator,SetLinearVelocity);
-	/* 7. getAngularVelocity */
-	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,GetAngularVelocity);
-	/* 8. setAngularVelocity */
-	KX_PYMETHOD_DOC_VARARGS(KX_SCA_AddObjectActuator,SetAngularVelocity);
-	/* 9. getLastCreatedObject */
-	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,GetLastCreatedObject);
-	/* 10. instantAddObject*/
 	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,InstantAddObject);
 
 	static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
index 196c1915f72..646cfb7219f 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
@@ -70,9 +70,6 @@ PyTypeObject KX_SCA_DynamicActuator::Type = {
 };
 
 PyMethodDef KX_SCA_DynamicActuator::Methods[] = {
-	// ---> deprecated
-	KX_PYMETHODTABLE(KX_SCA_DynamicActuator, setOperation),
-   	KX_PYMETHODTABLE(KX_SCA_DynamicActuator, getOperation),
 	{NULL,NULL} //Sentinel
 };
 
@@ -82,42 +79,6 @@ PyAttributeDef KX_SCA_DynamicActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-
-/* 1. setOperation */
-KX_PYMETHODDEF_DOC(KX_SCA_DynamicActuator, setOperation,
-"setOperation(operation?)\n"
-"\t - operation? : type of dynamic operation\n"
-"\t                0 = restore dynamics\n"
-"\t                1 = disable dynamics\n"
-"\t                2 = enable rigid body\n"
-"\t                3 = disable rigid body\n"
-"Change the dynamic status of the parent object.\n")
-{
-	ShowDeprecationWarning("setOperation()", "the mode property");
-	int dyn_operation;
-	
-	if (!PyArg_ParseTuple(args, "i:setOperation", &dyn_operation))
-	{
-		return NULL;	
-	}
-	if (dyn_operation <0 || dyn_operation>3) {
-		PyErr_SetString(PyExc_IndexError, "Dynamic Actuator's setOperation() range must be between 0 and 3");
-		return NULL;
-	}
-	m_dyn_operation= dyn_operation;
-	Py_RETURN_NONE;
-}
-
-KX_PYMETHODDEF_DOC(KX_SCA_DynamicActuator, getOperation,
-"getOperation() -> integer\n"
-"Returns the operation type of this actuator.\n"
-)
-{
-	ShowDeprecationWarning("getOperation()", "the mode property");
-	return PyLong_FromSsize_t((long)m_dyn_operation);
-}
-
-
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
 /* ------------------------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
index 8b598c9ecfa..58b28654eca 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
@@ -71,11 +71,6 @@ class KX_SCA_DynamicActuator : public SCA_IActuator
 		KX_DYN_DISABLE_RIGID_BODY,
 		KX_DYN_SET_MASS,
 	};
-
-	/* 1. setOperation */
-	KX_PYMETHOD_DOC(KX_SCA_DynamicActuator,setOperation);
-	KX_PYMETHOD_DOC(KX_SCA_DynamicActuator,getOperation);
-
 }; 
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
index 0819ad99633..e85b8a32798 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
@@ -74,9 +74,6 @@ PyTypeObject KX_SCA_ReplaceMeshActuator::Type = {
 
 PyMethodDef KX_SCA_ReplaceMeshActuator::Methods[] = {
 	KX_PYMETHODTABLE(KX_SCA_ReplaceMeshActuator, instantReplaceMesh),
-	// Deprecated ----->
-	{"setMesh", (PyCFunction) KX_SCA_ReplaceMeshActuator::sPySetMesh, METH_O, (const char *)SetMesh_doc},
-   	KX_PYMETHODTABLE(KX_SCA_ReplaceMeshActuator, getMesh),
 	{NULL,NULL} //Sentinel
 };
 
@@ -108,37 +105,6 @@ int KX_SCA_ReplaceMeshActuator::pyattr_set_mesh(void *self, const struct KX_PYAT
 	return PY_SET_ATTR_SUCCESS;
 }
 
-/* 1. setMesh */
-const char KX_SCA_ReplaceMeshActuator::SetMesh_doc[] = 
-	"setMesh(name)\n"
-	"\t- name: string or None\n"
-	"\tSet the mesh that will be substituted for the current one.\n";
-
-PyObject* KX_SCA_ReplaceMeshActuator::PySetMesh(PyObject* value)
-{
-	ShowDeprecationWarning("setMesh()", "the mesh property");
-	RAS_MeshObject* new_mesh;
-	
-	if (!ConvertPythonToMesh(value, &new_mesh, true, "actuator.mesh = value: KX_SCA_ReplaceMeshActuator"))
-		return NULL;
-	
-	m_mesh = new_mesh;
-	Py_RETURN_NONE;
-}
-
-KX_PYMETHODDEF_DOC(KX_SCA_ReplaceMeshActuator, getMesh,
-"getMesh() -> string\n"
-"Returns the name of the mesh to be substituted.\n"
-)
-{
-	ShowDeprecationWarning("getMesh()", "the mesh property");
-	if (!m_mesh)
-		Py_RETURN_NONE;
-
-	return PyUnicode_FromString(const_cast<char *>(m_mesh->GetName().ReadPtr()));
-}
-
-
 KX_PYMETHODDEF_DOC(KX_SCA_ReplaceMeshActuator, instantReplaceMesh,
 "instantReplaceMesh() : immediately replace mesh without delay\n")
 {
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
index 1e258420836..e5482c29aa7 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
@@ -74,12 +74,13 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator
 
 	void	InstantReplaceMesh();
 
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
 	static PyObject* pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-	/* 1. setMesh */
-	KX_PYMETHOD_DOC_O(KX_SCA_ReplaceMeshActuator,SetMesh);
-	KX_PYMETHOD_DOC(KX_SCA_ReplaceMeshActuator,getMesh);
 	KX_PYMETHOD_DOC(KX_SCA_ReplaceMeshActuator,instantReplaceMesh);
 
 }; 
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index a9bb583bba7..3483496c3a6 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1630,9 +1630,6 @@ PyTypeObject KX_Scene::Type = {
 };
 
 PyMethodDef KX_Scene::Methods[] = {
-	KX_PYMETHODTABLE_NOARGS(KX_Scene, getLightList),
-	KX_PYMETHODTABLE_NOARGS(KX_Scene, getObjectList),
-	KX_PYMETHODTABLE_NOARGS(KX_Scene, getName),
 	KX_PYMETHODTABLE(KX_Scene, addObject),
 	
 	/* dict style access */
@@ -1824,33 +1821,6 @@ PyAttributeDef KX_Scene::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-KX_PYMETHODDEF_DOC_NOARGS(KX_Scene, getLightList,
-"getLightList() -> list [KX_Light]\n"
-"Returns a list of all lights in the scene.\n"
-)
-{
-	ShowDeprecationWarning("getLightList()", "the lights property");
-	return m_lightlist->GetProxy();
-}
-
-KX_PYMETHODDEF_DOC_NOARGS(KX_Scene, getObjectList,
-"getObjectList() -> list [KX_GameObject]\n"
-"Returns a list of all game objects in the scene.\n"
-)
-{
-	ShowDeprecationWarning("getObjectList()", "the objects property");
-	return m_objectlist->GetProxy();
-}
-
-KX_PYMETHODDEF_DOC_NOARGS(KX_Scene, getName,
-"getName() -> string\n"
-"Returns the name of the scene.\n"
-)
-{
-	ShowDeprecationWarning("getName()", "the name property");
-	return PyUnicode_FromString(GetName());
-}
-
 KX_PYMETHODDEF_DOC(KX_Scene, addObject,
 "addObject(object, other, time=0)\n"
 "Returns the added object.\n")
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 8d7c0ad8dec..3e0dc303d72 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -517,25 +517,12 @@ public:
 	 */
 	void SetNodeTree(SG_Tree* root);
 
-	KX_PYMETHOD_DOC_NOARGS(KX_Scene, getLightList);
-	KX_PYMETHOD_DOC_NOARGS(KX_Scene, getObjectList);
-	KX_PYMETHOD_DOC_NOARGS(KX_Scene, getName);
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
 	KX_PYMETHOD_DOC(KX_Scene, addObject);
 	KX_PYMETHOD_DOC(KX_Scene, get);
-	
-/*	
-	KX_PYMETHOD_DOC(KX_Scene, getActiveCamera);
-	KX_PYMETHOD_DOC(KX_Scene, getActiveCamera);
-	KX_PYMETHOD_DOC(KX_Scene, findCamera);
-	
-	KX_PYMETHOD_DOC(KX_Scene, getGravity);
-	
-	KX_PYMETHOD_DOC(KX_Scene, setActivityCulling);
-	KX_PYMETHOD_DOC(KX_Scene, setActivityCullingRadius);
-	
-	KX_PYMETHOD_DOC(KX_Scene, setSceneViewport);
-	KX_PYMETHOD_DOC(KX_Scene, setSceneViewport);
-	*/
 
 	/* attributes */
 	static PyObject*	pyattr_get_name(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp
index a0b7664d63a..ea1be7bca6c 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp
@@ -245,14 +245,6 @@ PyTypeObject KX_SceneActuator::Type = {
 
 PyMethodDef KX_SceneActuator::Methods[] =
 {
-	//Deprecated functions ------>
-	{"setUseRestart", (PyCFunction) KX_SceneActuator::sPySetUseRestart, METH_VARARGS, (const char *)SetUseRestart_doc},
-	{"setScene",      (PyCFunction) KX_SceneActuator::sPySetScene, METH_VARARGS, (const char *)SetScene_doc},
-	{"setCamera",     (PyCFunction) KX_SceneActuator::sPySetCamera, METH_O, (const char *)SetCamera_doc},
-	{"getUseRestart", (PyCFunction) KX_SceneActuator::sPyGetUseRestart, METH_NOARGS, (const char *)GetUseRestart_doc},
-	{"getScene",      (PyCFunction) KX_SceneActuator::sPyGetScene, METH_NOARGS, (const char *)GetScene_doc},
-	{"getCamera",     (PyCFunction) KX_SceneActuator::sPyGetCamera, METH_NOARGS, (const char *)GetCamera_doc},
-	//<----- Deprecated
 	{NULL,NULL} //Sentinel
 };
 
@@ -295,117 +287,4 @@ int KX_SceneActuator::pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_
 	return PY_SET_ATTR_SUCCESS;
 }
 
-
-/* 2. setUseRestart--------------------------------------------------------- */
-const char KX_SceneActuator::SetUseRestart_doc[] = 
-"setUseRestart(flag)\n"
-"\t- flag: 0 or 1.\n"
-"\tSet flag to 1 to restart the scene.\n" ;
-PyObject* KX_SceneActuator::PySetUseRestart(PyObject* args)
-{
-	ShowDeprecationWarning("setUseRestart()", "the useRestart property");
-	int boolArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setUseRestart", &boolArg))
-	{
-		return NULL;
-	}
-	
-	m_restart = boolArg != 0;
-	
-	Py_RETURN_NONE;
-}
-
-
-
-/* 3. getUseRestart:                                                         */
-const char KX_SceneActuator::GetUseRestart_doc[] = 
-"getUseRestart()\n"
-"\tReturn whether the scene will be restarted.\n" ;
-PyObject* KX_SceneActuator::PyGetUseRestart()
-{
-	ShowDeprecationWarning("getUseRestart()", "the useRestart property");
-	return PyLong_FromSsize_t(!(m_restart == 0));
-}
-
-
-
-/* 4. set scene------------------------------------------------------------- */
-const char KX_SceneActuator::SetScene_doc[] = 
-"setScene(scene)\n"
-"\t- scene: string\n"
-"\tSet the name of scene the actuator will switch to.\n" ;
-PyObject* KX_SceneActuator::PySetScene(PyObject* args)
-{
-	ShowDeprecationWarning("setScene()", "the scene property");
-	/* one argument: a scene, ignore the rest */
-	char *scene_name;
-
-	if(!PyArg_ParseTuple(args, "s:setScene", &scene_name))
-	{
-		return NULL;
-	}
-
-	/* Scene switch is done by name. */
-	m_nextSceneName = scene_name;
-
-	Py_RETURN_NONE;
-}
-
-
-
-/* 5. getScene:                                                              */
-const char KX_SceneActuator::GetScene_doc[] = 
-"getScene()\n"
-"\tReturn the name of the scene the actuator wants to switch to.\n" ;
-PyObject* KX_SceneActuator::PyGetScene()
-{
-	ShowDeprecationWarning("getScene()", "the scene property");
-	return PyUnicode_FromString(m_nextSceneName);
-}
-
-
-
-/* 6. set camera------------------------------------------------------------ */
-const char KX_SceneActuator::SetCamera_doc[] = 
-"setCamera(camera)\n"
-"\t- camera: string\n"
-"\tSet the camera to switch to.\n" ;
-PyObject* KX_SceneActuator::PySetCamera(PyObject* value)
-{
-	ShowDeprecationWarning("setCamera()", "the camera property");
-	KX_Camera *camOb;
-	
-	if (!ConvertPythonToCamera(value, &camOb, true, "actu.setCamera(value): KX_SceneActuator"))
-		return NULL;
-	
-	if (m_camera)
-		m_camera->UnregisterActuator(this);
-	
-	if(camOb==NULL) {
-		m_camera= NULL;
-	}
-	else {	
-		m_camera = camOb;
-		m_camera->RegisterActuator(this);
-	}
-	Py_RETURN_NONE;
-}
-
-
-
-/* 7. getCamera:                                                             */
-const char KX_SceneActuator::GetCamera_doc[] = 
-"getCamera()\n"
-"\tReturn the name of the camera to switch to.\n" ;
-PyObject* KX_SceneActuator::PyGetCamera()
-{
-	ShowDeprecationWarning("getCamera()", "the camera property");
-	if (m_camera) {
-		return PyUnicode_FromString(m_camera->GetName());
-	}
-	else {
-		Py_RETURN_NONE;
-	}
-}
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h
index 86de3395d1e..e979a8ce559 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.h
+++ b/source/gameengine/Ketsji/KX_SceneActuator.h
@@ -90,22 +90,6 @@ class KX_SceneActuator : public SCA_IActuator
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	/* 1. set                                                                */
-	/* Removed */
-	  
-	/* 2. setUseRestart:                                                     */
-	KX_PYMETHOD_DOC_VARARGS(KX_SceneActuator,SetUseRestart);
-	/* 3. getUseRestart:                                                     */
-	KX_PYMETHOD_DOC_NOARGS(KX_SceneActuator,GetUseRestart);
-	/* 4. setScene:                                                          */
-	KX_PYMETHOD_DOC_VARARGS(KX_SceneActuator,SetScene);
-	/* 5. getScene:                                                          */
-	KX_PYMETHOD_DOC_NOARGS(KX_SceneActuator,GetScene);
-	/* 6. setCamera:                                                          */
-	KX_PYMETHOD_DOC_O(KX_SceneActuator,SetCamera);
-	/* 7. getCamera:                                                          */
-	KX_PYMETHOD_DOC_NOARGS(KX_SceneActuator,GetCamera);
 	
 	static PyObject* pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 024c51cabc1..e2b4022a312 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -296,17 +296,6 @@ PyTypeObject KX_SoundActuator::Type = {
 };
 
 PyMethodDef KX_SoundActuator::Methods[] = {
-	// Deprecated ----->
-	{"setGain",(PyCFunction) KX_SoundActuator::sPySetGain,METH_VARARGS,NULL},
-	{"getGain",(PyCFunction) KX_SoundActuator::sPyGetGain,METH_NOARGS,NULL},
-	{"setPitch",(PyCFunction) KX_SoundActuator::sPySetPitch,METH_VARARGS,NULL},
-	{"getPitch",(PyCFunction) KX_SoundActuator::sPyGetPitch,METH_NOARGS,NULL},
-	{"setRollOffFactor",(PyCFunction) KX_SoundActuator::sPySetRollOffFactor,METH_VARARGS,NULL},
-	{"getRollOffFactor",(PyCFunction) KX_SoundActuator::sPyGetRollOffFactor,METH_NOARGS,NULL},
-	{"setType",(PyCFunction) KX_SoundActuator::sPySetType,METH_VARARGS,NULL},
-	{"getType",(PyCFunction) KX_SoundActuator::sPyGetType,METH_NOARGS,NULL},
-	// <-----
-
 	KX_PYMETHODTABLE_NOARGS(KX_SoundActuator, startSound),
 	KX_PYMETHODTABLE_NOARGS(KX_SoundActuator, pauseSound),
 	KX_PYMETHODTABLE_NOARGS(KX_SoundActuator, stopSound),
@@ -427,109 +416,3 @@ int KX_SoundActuator::pyattr_set_rollOffFactor(void *self, const struct KX_PYATT
 
 	return PY_SET_ATTR_SUCCESS;
 }
-
-PyObject* KX_SoundActuator::PySetGain(PyObject* args)
-{
-	ShowDeprecationWarning("setGain()", "the volume property");
-	float gain = 1.0;
-	if (!PyArg_ParseTuple(args, "f:setGain", &gain))
-		return NULL;
-
-	m_volume = gain;
-	if(m_handle)
-		AUD_setSoundVolume(m_handle, gain);
-
-	Py_RETURN_NONE;
-}
-
-
-
-PyObject* KX_SoundActuator::PyGetGain()
-{
-	ShowDeprecationWarning("getGain()", "the volume property");
-	float gain = m_volume;
-	PyObject* result = PyFloat_FromDouble(gain);
-
-	return result;
-}
-
-
-
-PyObject* KX_SoundActuator::PySetPitch(PyObject* args)
-{
-	ShowDeprecationWarning("setPitch()", "the pitch property");
-	float pitch = 1.0;
-	if (!PyArg_ParseTuple(args, "f:setPitch", &pitch))
-		return NULL;
-
-	m_pitch = pitch;
-	if(m_handle)
-		AUD_setSoundPitch(m_handle, pitch);
-
-	Py_RETURN_NONE;
-}
-
-
-
-PyObject* KX_SoundActuator::PyGetPitch()
-{
-	ShowDeprecationWarning("getPitch()", "the pitch property");
-	float pitch = m_pitch;
-	PyObject* result = PyFloat_FromDouble(pitch);
-
-	return result;
-}
-
-
-
-PyObject* KX_SoundActuator::PySetRollOffFactor(PyObject* args)
-{
-	ShowDeprecationWarning("setRollOffFactor()", "the rollOffFactor property");
-	float rollofffactor = 1.0;
-	if (!PyArg_ParseTuple(args, "f:setRollOffFactor", &rollofffactor))
-		return NULL;
-
-	m_3d.rolloff_factor = rollofffactor;
-	if(m_handle)
-		AUD_set3DSourceSetting(m_handle, AUD_3DSS_ROLLOFF_FACTOR, rollofffactor);
-
-	Py_RETURN_NONE;
-}
-
-
-
-PyObject* KX_SoundActuator::PyGetRollOffFactor()
-{
-	ShowDeprecationWarning("getRollOffFactor()", "the rollOffFactor property");
-	float rollofffactor = m_3d.rolloff_factor;
-	PyObject* result = PyFloat_FromDouble(rollofffactor);
-
-	return result;
-}
-
-
-
-PyObject* KX_SoundActuator::PySetType(PyObject* args)
-{
-	int typeArg;
-	ShowDeprecationWarning("setType()", "the mode property");
-
-	if (!PyArg_ParseTuple(args, "i:setType", &typeArg)) {
-		return NULL;
-	}
-
-	if ( (typeArg > KX_SOUNDACT_NODEF)
-	  && (typeArg < KX_SOUNDACT_MAX) ) {
-		m_type = (KX_SOUNDACT_TYPE) typeArg;
-	}
-
-	Py_RETURN_NONE;
-}
-
-PyObject* KX_SoundActuator::PyGetType()
-{
-	ShowDeprecationWarning("getType()", "the mode property");
-	return PyLong_FromSsize_t(m_type);
-}
-// <-----
-
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index bc0293ed2b4..43198f1a253 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -110,18 +110,6 @@ public:
 	static PyObject* pyattr_get_pitch(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject* pyattr_get_rollOffFactor(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject* pyattr_get_type(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
-
-	// Deprecated ----->
-	KX_PYMETHOD_VARARGS(KX_SoundActuator,SetGain);
-	KX_PYMETHOD_NOARGS(KX_SoundActuator,GetGain);
-	KX_PYMETHOD_VARARGS(KX_SoundActuator,SetPitch);
-	KX_PYMETHOD_NOARGS(KX_SoundActuator,GetPitch);
-	KX_PYMETHOD_VARARGS(KX_SoundActuator,SetRollOffFactor);
-	KX_PYMETHOD_NOARGS(KX_SoundActuator,GetRollOffFactor);
-	KX_PYMETHOD_VARARGS(KX_SoundActuator,SetType);
-	KX_PYMETHOD_NOARGS(KX_SoundActuator,GetType);
-	// <-----
-
 };
 
 #endif //__KX_SOUNDACTUATOR
diff --git a/source/gameengine/Ketsji/KX_StateActuator.cpp b/source/gameengine/Ketsji/KX_StateActuator.cpp
index 09d95612cbb..4159e9c373d 100644
--- a/source/gameengine/Ketsji/KX_StateActuator.cpp
+++ b/source/gameengine/Ketsji/KX_StateActuator.cpp
@@ -159,12 +159,6 @@ PyTypeObject KX_StateActuator::Type = {
 };
 
 PyMethodDef KX_StateActuator::Methods[] = {
-	// deprecated -->
-	{"setOperation", (PyCFunction) KX_StateActuator::sPySetOperation, 
-	 METH_VARARGS, (const char *)SetOperation_doc},
-	{"setMask", (PyCFunction) KX_StateActuator::sPySetMask, 
-	 METH_VARARGS, (const char *)SetMask_doc},
-	 // <--
 	{NULL,NULL} //Sentinel
 };
 
@@ -173,52 +167,3 @@ PyAttributeDef KX_StateActuator::Attributes[] = {
 	KX_PYATTRIBUTE_INT_RW("mask",0,0x3FFFFFFF,false,KX_StateActuator,m_mask),
 	{ NULL }	//Sentinel
 };
-
-
-/* set operation ---------------------------------------------------------- */
-const char 
-KX_StateActuator::SetOperation_doc[] = 
-"setOperation(op)\n"
-"\t - op : bit operation (0=Copy, 1=Set, 2=Clear, 3=Negate)"
-"\tSet the type of bit operation to be applied on object state mask.\n"
-"\tUse setMask() to specify the bits that will be modified.\n";
-PyObject* 
-
-KX_StateActuator::PySetOperation(PyObject* args) {
-	ShowDeprecationWarning("setOperation()", "the operation property");
-	int oper;
-
-	if(!PyArg_ParseTuple(args, "i:setOperation", &oper)) {
-		return NULL;
-	}
-
-	m_operation = oper;
-
-	Py_RETURN_NONE;
-}
-
-/* set mask ---------------------------------------------------------- */
-const char 
-KX_StateActuator::SetMask_doc[] = 
-"setMask(mask)\n"
-"\t - mask : bits that will be modified"
-"\tSet the value that defines the bits that will be modified by the operation.\n"
-"\tThe bits that are 1 in the value will be updated in the object state,\n"
-"\tthe bits that are 0 are will be left unmodified expect for the Copy operation\n"
-"\twhich copies the value to the object state.\n";
-PyObject* 
-
-KX_StateActuator::PySetMask(PyObject* args) {
-	ShowDeprecationWarning("setMask()", "the mask property");
-	int mask;
-
-	if(!PyArg_ParseTuple(args, "i:setMask", &mask)) {
-		return NULL;
-	}
-
-	m_mask = mask;
-
-	Py_RETURN_NONE;
-}
-
-
diff --git a/source/gameengine/Ketsji/KX_StateActuator.h b/source/gameengine/Ketsji/KX_StateActuator.h
index ce86c4b44fe..4cf84f74287 100644
--- a/source/gameengine/Ketsji/KX_StateActuator.h
+++ b/source/gameengine/Ketsji/KX_StateActuator.h
@@ -88,9 +88,7 @@ class KX_StateActuator : public SCA_IActuator
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-	//KX_PYMETHOD_DOC
-	KX_PYMETHOD_DOC_VARARGS(KX_StateActuator,SetOperation);
-	KX_PYMETHOD_DOC_VARARGS(KX_StateActuator,SetMask);
+
 };
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 26e414c5b47..cde67787e2f 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -315,16 +315,6 @@ PyTypeObject KX_TouchSensor::Type = {
 };
 
 PyMethodDef KX_TouchSensor::Methods[] = {
-	//Deprecated ----->
-	{"setProperty", 
-	 (PyCFunction) KX_TouchSensor::sPySetProperty,      METH_O, (const char *)SetProperty_doc},
-	{"getProperty", 
-	 (PyCFunction) KX_TouchSensor::sPyGetProperty,      METH_NOARGS, (const char *)GetProperty_doc},
-	{"getHitObject", 
-	 (PyCFunction) KX_TouchSensor::sPyGetHitObject,     METH_NOARGS, (const char *)GetHitObject_doc},
-	{"getHitObjectList", 
-	 (PyCFunction) KX_TouchSensor::sPyGetHitObjectList, METH_NOARGS, (const char *)GetHitObjectList_doc},
-	 //<-----
 	{NULL,NULL} //Sentinel
 };
 
@@ -339,101 +329,6 @@ PyAttributeDef KX_TouchSensor::Attributes[] = {
 
 /* Python API */
 
-/* 1. setProperty */
-const char KX_TouchSensor::SetProperty_doc[] = 
-"setProperty(name)\n"
-"\t- name: string\n"
-"\tSet the property or material to collide with. Use\n"
-"\tsetTouchMaterial() to switch between properties and\n"
-"\tmaterials.";
-PyObject* KX_TouchSensor::PySetProperty(PyObject* value)
-{
-	ShowDeprecationWarning("setProperty()", "the propName property");
-	char *nameArg= _PyUnicode_AsString(value);
-	if (nameArg==NULL) {
-		PyErr_SetString(PyExc_ValueError, "expected a ");
-		return NULL;
-	}
-	
-	m_touchedpropname = nameArg;
-	Py_RETURN_NONE;
-}
-/* 2. getProperty */
-const char KX_TouchSensor::GetProperty_doc[] = 
-"getProperty(name)\n"
-"\tReturns the property or material to collide with. Use\n"
-"\tgetTouchMaterial() to find out whether this sensor\n"
-"\tlooks for properties or materials.";
-PyObject*  KX_TouchSensor::PyGetProperty() {
-	ShowDeprecationWarning("getProperty()", "the propName property");
-	
-	return PyUnicode_FromString(m_touchedpropname);
-}
-
-const char KX_TouchSensor::GetHitObject_doc[] = 
-"getHitObject()\n"
-;
-PyObject* KX_TouchSensor::PyGetHitObject()
-{
-	ShowDeprecationWarning("getHitObject()", "the hitObject property");
-	/* to do: do Py_IncRef if the object is already known in Python */
-	/* otherwise, this leaks memory */
-	if (m_hitObject)
-	{
-		return m_hitObject->GetProxy();
-	}
-	Py_RETURN_NONE;
-}
-
-const char KX_TouchSensor::GetHitObjectList_doc[] = 
-"getHitObjectList()\n"
-"\tReturn a list of the objects this object collided with,\n"
-"\tbut only those matching the property/material condition.\n";
-PyObject* KX_TouchSensor::PyGetHitObjectList()
-{
-	ShowDeprecationWarning("getHitObjectList()", "the hitObjectList property");
-	/* to do: do Py_IncRef if the object is already known in Python */
-	/* otherwise, this leaks memory */ /* Edit, this seems ok and not to leak memory - Campbell */
-	return m_colliders->GetProxy();
-}
-
-/*getTouchMaterial and setTouchMaterial were never added to the api,
-they can probably be removed with out anyone noticing*/
-
-/* 5. getTouchMaterial */
-const char KX_TouchSensor::GetTouchMaterial_doc[] = 
-"getTouchMaterial()\n"
-"\tReturns KX_TRUE if this sensor looks for a specific material,\n"
-"\tKX_FALSE if it looks for a specific property.\n" ;
-PyObject* KX_TouchSensor::PyGetTouchMaterial()
-{
-	ShowDeprecationWarning("getTouchMaterial()", "the useMaterial property");
-	return PyLong_FromSsize_t(m_bFindMaterial);
-}
-
-/* 6. setTouchMaterial */
-#if 0
-const char KX_TouchSensor::SetTouchMaterial_doc[] = 
-"setTouchMaterial(flag)\n"
-"\t- flag: KX_TRUE or KX_FALSE.\n"
-"\tSet flag to KX_TRUE to switch on positive pulse mode,\n"
-"\tKX_FALSE to switch off positive pulse mode.\n" ;
-PyObject* KX_TouchSensor::PySetTouchMaterial(PyObject *value)
-{
-	ShowDeprecationWarning("setTouchMaterial()", "the useMaterial property");
-	int pulseArg = PyLong_AsSsize_t(value);
-
-	if(pulseArg ==-1 && PyErr_Occurred()) {
-		PyErr_SetString(PyExc_ValueError, "expected a bool");
-		return NULL;
-	}
-	
-	m_bFindMaterial = pulseArg != 0;
-
-	Py_RETURN_NONE;
-}
-#endif
-
 PyObject* KX_TouchSensor::pyattr_get_object_hit(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	KX_TouchSensor* self= static_cast<KX_TouchSensor*>(self_v);
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 5f571614b06..ad1830e05c9 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -119,23 +119,6 @@ public:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-
-	//Deprecated ----->
-	/* 1. setProperty */
-	KX_PYMETHOD_DOC_O(KX_TouchSensor,SetProperty);
-	/* 2. getProperty */
-	KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetProperty);
-	/* 3. getHitObject */
-	KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetHitObject);
-	/* 4. getHitObject */
-	KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetHitObjectList);
-	/* 5. getTouchMaterial */
-	KX_PYMETHOD_DOC_NOARGS(KX_TouchSensor,GetTouchMaterial);
-#if 0
-	/* 6. setTouchMaterial */
-	KX_PYMETHOD_DOC_O(KX_TouchSensor,SetTouchMaterial);
-#endif
-	//<-----
 	
 	static PyObject*	pyattr_get_object_hit(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_object_hit_list(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index b5b7e9de444..e6c2f86bbce 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -453,14 +453,6 @@ PyTypeObject KX_TrackToActuator::Type = {
 };
 
 PyMethodDef KX_TrackToActuator::Methods[] = {
-	// ---> deprecated
-	{"setTime", (PyCFunction) KX_TrackToActuator::sPySetTime, METH_VARARGS, (const char *)SetTime_doc},
-	{"getTime", (PyCFunction) KX_TrackToActuator::sPyGetTime, METH_NOARGS, (const char *)GetTime_doc},
-	{"setUse3D", (PyCFunction) KX_TrackToActuator::sPySetUse3D, METH_VARARGS, (const char *)SetUse3D_doc},
-	{"getUse3D", (PyCFunction) KX_TrackToActuator::sPyGetUse3D, METH_NOARGS, (const char *)GetUse3D_doc},
-	{"setObject", (PyCFunction) KX_TrackToActuator::sPySetObject, METH_O, (const char *)SetObject_doc},
-	{"getObject", (PyCFunction) KX_TrackToActuator::sPyGetObject, METH_VARARGS, (const char *)GetObject_doc},
-	
 	{NULL,NULL} //Sentinel
 };
 
@@ -500,123 +492,4 @@ int KX_TrackToActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUT
 	return PY_SET_ATTR_SUCCESS;
 }
 
-
-/* 1. setObject */
-const char KX_TrackToActuator::SetObject_doc[] = 
-"setObject(object)\n"
-"\t- object: KX_GameObject, string or None\n"
-"\tSet the object to track with the parent of this actuator.\n";
-PyObject* KX_TrackToActuator::PySetObject(PyObject* value)
-{
-	KX_GameObject *gameobj;
-	
-	ShowDeprecationWarning("setObject()", "the object property");
-	
-	if (!ConvertPythonToGameObject(value, &gameobj, true, "actuator.setObject(value): KX_TrackToActuator"))
-		return NULL; // ConvertPythonToGameObject sets the error
-	
-	if (m_object != NULL)
-		m_object->UnregisterActuator(this);	
-
-	m_object = (SCA_IObject*)gameobj;
-	if (m_object)
-		m_object->RegisterActuator(this);
-	
-	Py_RETURN_NONE;
-}
-
-
-
-/* 2. getObject */
-const char KX_TrackToActuator::GetObject_doc[] = 
-"getObject(name_only = 1)\n"
-"name_only - optional arg, when true will return the KX_GameObject rather then its name\n"
-"\tReturns the object to track with the parent of this actuator\n";
-PyObject* KX_TrackToActuator::PyGetObject(PyObject* args)
-{
-	int ret_name_only = 1;
-	
-	ShowDeprecationWarning("getObject()", "the object property");
-	
-	if (!PyArg_ParseTuple(args, "|i:getObject", &ret_name_only))
-		return NULL;
-	
-	if (!m_object)
-		Py_RETURN_NONE;
-	
-	if (ret_name_only)
-		return PyUnicode_FromString(m_object->GetName());
-	else
-		return m_object->GetProxy();
-}
-
-
-
-/* 3. setTime */
-const char KX_TrackToActuator::SetTime_doc[] = 
-"setTime(time)\n"
-"\t- time: integer\n"
-"\tSet the time in frames with which to delay the tracking motion.\n";
-PyObject* KX_TrackToActuator::PySetTime(PyObject* args)
-{
-	ShowDeprecationWarning("setTime()", "the timer property");
-	int timeArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setTime", &timeArg))
-	{
-		return NULL;
-	}
-	
-	m_time= timeArg;
-	
-	Py_RETURN_NONE;
-}
-
-
-
-/* 4.getTime */
-const char KX_TrackToActuator::GetTime_doc[] = 
-"getTime()\n"
-"\t- time: integer\n"
-"\tReturn the time in frames with which the tracking motion is delayed.\n";
-PyObject* KX_TrackToActuator::PyGetTime()
-{
-	ShowDeprecationWarning("getTime()", "the timer property");
-	return PyLong_FromSsize_t(m_time);
-}
-
-
-
-/* 5. getUse3D */
-const char KX_TrackToActuator::GetUse3D_doc[] = 
-"getUse3D()\n"
-"\tReturns 1 if the motion is allowed to extend in the z-direction.\n";
-PyObject* KX_TrackToActuator::PyGetUse3D()
-{
-	ShowDeprecationWarning("setTime()", "the use3D property");
-	return PyLong_FromSsize_t(!(m_allow3D == 0));
-}
-
-
-
-/* 6. setUse3D */
-const char KX_TrackToActuator::SetUse3D_doc[] = 
-"setUse3D(value)\n"
-"\t- value: 0 or 1\n"
-"\tSet to 1 to allow the tracking motion to extend in the z-direction,\n"
-"\tset to 0 to lock the tracking motion to the x-y plane.\n";
-PyObject* KX_TrackToActuator::PySetUse3D(PyObject* args)
-{
-	ShowDeprecationWarning("setTime()", "the use3D property");
-	int boolArg;
-	
-	if (!PyArg_ParseTuple(args, "i:setUse3D", &boolArg)) {
-		return NULL;
-	}
-	
-	m_allow3D = !(boolArg == 0);
-	
-	Py_RETURN_NONE;
-}
-
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h
index 801e695bb9b..bbfc1d17576 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.h
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.h
@@ -74,19 +74,6 @@ class KX_TrackToActuator : public SCA_IActuator
 	/* These are used to get and set m_ob */
 	static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-
-	/* 1. setObject */
-	KX_PYMETHOD_DOC_O(KX_TrackToActuator,SetObject);
-	/* 2. getObject */
-	KX_PYMETHOD_DOC_VARARGS(KX_TrackToActuator,GetObject);
-	/* 3. setTime */
-	KX_PYMETHOD_DOC_VARARGS(KX_TrackToActuator,SetTime);
-	/* 4. getTime */
-	KX_PYMETHOD_DOC_NOARGS(KX_TrackToActuator,GetTime);
-	/* 5. getUse3D */
-	KX_PYMETHOD_DOC_NOARGS(KX_TrackToActuator,GetUse3D);
-	/* 6. setUse3D */
-	KX_PYMETHOD_DOC_VARARGS(KX_TrackToActuator,SetUse3D);
 	
 }; /* end of class KX_TrackToActuator : public KX_EditObjectActuator */
 
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
index 97c893c6caa..184e127209f 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
@@ -113,10 +113,6 @@ PyTypeObject KX_VisibilityActuator::Type = {
 };
 
 PyMethodDef KX_VisibilityActuator::Methods[] = {
-	// Deprecated ----->
-	{"set", (PyCFunction) KX_VisibilityActuator::sPySetVisible, METH_VARARGS,
-		(const char *) SetVisible_doc},
-	// <-----
 	{NULL,NULL} //Sentinel
 };
 
@@ -126,26 +122,3 @@ PyAttributeDef KX_VisibilityActuator::Attributes[] = {
 	KX_PYATTRIBUTE_BOOL_RW("useRecursion", KX_VisibilityActuator, m_recursive),
 	{ NULL }	//Sentinel
 };
-
-/* set visibility ---------------------------------------------------------- */
-const char 
-KX_VisibilityActuator::SetVisible_doc[] = 
-"setVisible(visible?)\n"
-"\t - visible? : Make the object visible? (KX_TRUE, KX_FALSE)"
-"\tSet the properties of the actuator.\n";
-PyObject* 
-
-KX_VisibilityActuator::PySetVisible(PyObject* args) {
-	int vis;
-	ShowDeprecationWarning("SetVisible()", "the visible property");
-
-	if(!PyArg_ParseTuple(args, "i:setVisible", &vis)) {
-		return NULL;
-	}
-
-	m_visible = PyArgToBool(vis);
-
-	Py_RETURN_NONE;
-}
-
-
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.h b/source/gameengine/Ketsji/KX_VisibilityActuator.h
index 3ad50c6cea2..e75551644a4 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.h
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.h
@@ -67,11 +67,6 @@ class KX_VisibilityActuator : public SCA_IActuator
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-	// Deprecated ----->
-	KX_PYMETHOD_DOC_VARARGS(KX_VisibilityActuator,SetVisible);
-	// <-----
-
-
 };
 
 #endif

From c4a1c8fbeb86396788866d6dc3eb1b5b5dc3f67d Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Tue, 25 Aug 2009 22:56:08 +0000
Subject: [PATCH 272/577] Unconditionally define WITH_OPENEXR. Compiling
 openexr_api.cpp requires WITH_OPENEXR, to get the right part of the
 openexr_multi.h file. Broken since r22739.

---
 source/blender/imbuf/intern/openexr/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/blender/imbuf/intern/openexr/Makefile b/source/blender/imbuf/intern/openexr/Makefile
index f77e3723e8a..083089b11d5 100644
--- a/source/blender/imbuf/intern/openexr/Makefile
+++ b/source/blender/imbuf/intern/openexr/Makefile
@@ -35,6 +35,9 @@ include nan_compile.mk
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
+# If compiling the API, WITH_OPENEXR must be set.
+CPPFLAGS += -DWITH_OPENEXR
+
 CPPFLAGS += -I../../../makesdna
 CPPFLAGS += -I../../../blenkernel
 CPPFLAGS += -I../../../blenlib

From 3f5a2a11944a2e983d62babe8bb02b03e14c805d Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Tue, 25 Aug 2009 23:39:49 +0000
Subject: [PATCH 273/577] Smoke: *Bugfix for crash on using a plane as smoke
 domain (reported by DingTo) * Bringing slowly high res back, not yet working

---
 source/blender/blenkernel/intern/pointcache.c | 44 +++++++++++--
 source/blender/blenkernel/intern/smoke.c      | 65 +++++++++++++------
 source/blender/blenloader/intern/readfile.c   |  3 +-
 source/blender/blenloader/intern/writefile.c  |  5 +-
 .../blender/editors/space_view3d/drawobject.c |  2 +-
 source/blender/makesdna/DNA_smoke_types.h     |  4 +-
 source/blender/makesrna/intern/rna_smoke.c    | 10 ++-
 7 files changed, 94 insertions(+), 39 deletions(-)

diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index d9740091912..42bea260450 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -703,11 +703,44 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeMo
 	pid->calldata= smd;
 	
 	pid->type= PTCACHE_TYPE_SMOKE_DOMAIN;
-	pid->stack_index= sds->point_cache->index;
+	pid->stack_index= sds->point_cache[0]->index;
 
-	pid->cache= sds->point_cache;
-	pid->cache_ptr= &sds->point_cache;
-	pid->ptcaches= &sds->ptcaches;
+	pid->cache= sds->point_cache[0];
+	pid->cache_ptr= &(sds->point_cache[0]);
+	pid->ptcaches= &(sds->ptcaches[0]);
+
+	pid->totpoint= pid->totwrite= ptcache_totpoint_smoke;
+
+	pid->write_elem= NULL;
+	pid->read_elem= NULL;
+
+	pid->read_stream = ptcache_read_smoke;
+	pid->write_stream = ptcache_write_smoke;
+	
+	pid->interpolate_elem= NULL;
+
+	pid->write_header= ptcache_write_basic_header;
+	pid->read_header= ptcache_read_basic_header;
+
+	pid->data_types= (1<<BPHYS_DATA_LOCATION); // bogus values tot make pointcache happy
+	pid->info_types= 0;
+}
+
+void BKE_ptcache_id_from_smoke_turbulence(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd)
+{
+	SmokeDomainSettings *sds = smd->domain;
+
+	memset(pid, 0, sizeof(PTCacheID));
+
+	pid->ob= ob;
+	pid->calldata= smd;
+	
+	pid->type= PTCACHE_TYPE_SMOKE_HIGHRES;
+	pid->stack_index= sds->point_cache[1]->index;
+
+	pid->cache= sds->point_cache[1];
+	pid->cache_ptr= &sds->point_cache[1];
+	pid->ptcaches= &sds->ptcaches[1];
 
 	pid->totpoint= pid->totwrite= ptcache_totpoint_smoke;
 
@@ -1792,10 +1825,7 @@ int BKE_ptcache_id_reset(Scene *scene, PTCacheID *pid, int mode)
 		else if(pid->type == PTCACHE_TYPE_PARTICLES)
 			psys_reset(pid->calldata, PSYS_RESET_DEPSGRAPH);
 		else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
-		{
 			smokeModifier_reset(pid->calldata);
-			printf("reset PTCACHE_TYPE_SMOKE_DOMAIN\n");
-		}
 	}
 	if(clear)
 		BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 28d1c264376..cd9679be486 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -166,6 +166,10 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 
 		// calc other res with max_res provided
 		VECSUB(size, max, min);
+
+		if((size[0] < FLT_EPSILON) || (size[1] < FLT_EPSILON) || (size[2] < FLT_EPSILON))
+			return 0;
+
 		if(size[0] > size[1])
 		{
 			if(size[0] > size[1])
@@ -213,13 +217,11 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		smd->time = scene->r.cfra;
 		smd->domain->firstframe = smd->time;
 
-		/*
-		if(!smd->domain->wt)
+		if(!smd->domain->wt && (smd->domain->flags & MOD_SMOKE_HIGHRES))
 		{
-			smd->domain->wt = smoke_turbulence_init(sds->res,  smd->domain->amplify + 1, smd->domain->noise);
+			smd->domain->wt = smoke_turbulence_init(smd->domain->res,  smd->domain->amplify + 1, smd->domain->noise);
 			smoke_turbulence_initBlenderRNA(smd->domain->wt, &smd->domain->strength);
 		}
-		*/
 
 		if(!smd->domain->view3d)
 		{
@@ -409,10 +411,10 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		{
 			smd->coll->bvhtree = NULL; // bvhtree_build_from_smoke ( ob->obmat, dm->getFaceArray(dm), dm->getNumFaces(dm), dm->getVertArray(dm), dm->getNumVerts(dm), 0.0 );
 		}
-
+		return 1;
 	}
 
-	return 0;
+	return 1;
 }
 
 /*! init triangle divisions */
@@ -529,8 +531,10 @@ void smokeModifier_freeDomain(SmokeModifierData *smd)
 		if(smd->domain->wt)
 			smoke_turbulence_free(smd->domain->wt);
 
-		BKE_ptcache_free_list(&smd->domain->ptcaches);
-		smd->domain->point_cache = NULL;
+		BKE_ptcache_free_list(&(smd->domain->ptcaches[0]));
+		smd->domain->point_cache[0] = NULL;
+		BKE_ptcache_free_list(&(smd->domain->ptcaches[1]));
+		smd->domain->point_cache[1] = NULL;
 
 		MEM_freeN(smd->domain);
 		smd->domain = NULL;
@@ -603,10 +607,15 @@ void smokeModifier_reset(struct SmokeModifierData *smd)
 				smd->domain->wt = NULL;
 			}
 		
-			smd->domain->point_cache->flag &= ~PTCACHE_SIMULATION_VALID;
-			smd->domain->point_cache->flag |= PTCACHE_OUTDATED;
-			smd->domain->point_cache->simframe= 0;
-			smd->domain->point_cache->last_exact= 0;
+			smd->domain->point_cache[0]->flag &= ~PTCACHE_SIMULATION_VALID;
+			smd->domain->point_cache[0]->flag |= PTCACHE_OUTDATED;
+			smd->domain->point_cache[0]->simframe= 0;
+			smd->domain->point_cache[0]->last_exact= 0;
+
+			smd->domain->point_cache[1]->flag &= ~PTCACHE_SIMULATION_VALID;
+			smd->domain->point_cache[1]->flag |= PTCACHE_OUTDATED;
+			smd->domain->point_cache[1]->simframe= 0;
+			smd->domain->point_cache[1]->last_exact= 0;
 
 			// printf("reset_domain\n");
 		}
@@ -666,9 +675,13 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 
 			smd->domain->smd = smd;
 
-			smd->domain->point_cache = BKE_ptcache_add(&smd->domain->ptcaches);
-			smd->domain->point_cache->flag |= PTCACHE_DISK_CACHE;
-			smd->domain->point_cache->step = 1;
+			smd->domain->point_cache[0] = BKE_ptcache_add(&(smd->domain->ptcaches[0]));
+			smd->domain->point_cache[0]->flag |= PTCACHE_DISK_CACHE;
+			smd->domain->point_cache[0]->step = 1;
+
+			smd->domain->point_cache[1] = BKE_ptcache_add(&(smd->domain->ptcaches[1]));
+			smd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE;
+			smd->domain->point_cache[1]->step = 1;
 
 			/* set some standard values */
 			smd->domain->fluid = NULL;
@@ -775,8 +788,9 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 	}
 	else if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 	{
-		PointCache *cache;
+		PointCache *cache, *cache_wt;
 		PTCacheID pid;
+		PTCacheID pid_wt;
 		float timescale;
 		int cache_result = 0;
 		int startframe, endframe, framenr;
@@ -788,7 +802,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 		framenr = scene->r.cfra;
 
-		cache = sds->point_cache;
+		cache = sds->point_cache[0];
 
 		BKE_ptcache_id_from_smoke(&pid, ob, smd);
 		BKE_ptcache_id_time(&pid, scene, framenr, &startframe, &endframe, &timescale);
@@ -800,12 +814,15 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 			cache->simframe= 0;
 			cache->last_exact= 0;
 
-			smokeModifier_init(smd, ob, scene, dm);
+			if(!smokeModifier_init(smd, ob, scene, dm))
+				return;
+
+			if(!smd->domain->fluid)
+				return;
 
 			smoke_simulate_domain(smd, scene, ob, dm);
 
 			{
-				// float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
 				Base *base_tmp = NULL;
 
 				for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
@@ -852,7 +869,11 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
 		}
 	
-		smokeModifier_init(smd, ob, scene, dm);
+		if(!smokeModifier_init(smd, ob, scene, dm))
+			return;
+
+		if(!smd->domain->fluid)
+				return;
 
 		/* try to read from cache */
 		cache_result = BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
@@ -904,8 +925,10 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 
 		smoke_simulate_domain(smd, scene, ob, dm);
 
+		if(sds->wt)
+			smoke_turbulence_step(sds->wt, sds->fluid);
+
 		{
-			// float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
 			Base *base_tmp = NULL;
 
 			for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 26e3d5bf6f1..aaba65b21af 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3695,7 +3695,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 				smd->domain->view3d = NULL;
 				smd->domain->tex = NULL;
 
-				direct_link_pointcache_list(fd, &smd->domain->ptcaches, &smd->domain->point_cache);
+				direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]));
+				direct_link_pointcache_list(fd, &(smd->domain->ptcaches[1]), &(smd->domain->point_cache[1]));
 			}
 			else if(smd->type==MOD_SMOKE_TYPE_FLOW)
 			{
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index eb3f17f368c..26fd0cf6af6 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1136,7 +1136,10 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 			*/
 
 			if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
-				write_pointcaches(wd, &smd->domain->ptcaches);
+			{
+				write_pointcaches(wd, &(smd->domain->ptcaches[0]));
+				write_pointcaches(wd, &(smd->domain->ptcaches[1]));
+			}
 		} 
 		else if(md->type==eModifierType_Fluidsim) {
 			FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index bcb962bdcd7..6cf229ead31 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5316,7 +5316,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		md = modifiers_findByType(ob, eModifierType_Smoke);
 		if (md) {
 			SmokeModifierData *smd = (SmokeModifierData *)md;
-			if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain) {
+			if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && smd->domain->fluid) {
 				GPU_create_smoke(smd);
 				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res);
 				GPU_free_smoke(smd);
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 542281e1960..a8ab4734af0 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -67,8 +67,8 @@ typedef struct SmokeDomainSettings {
 	short diss_percent; 
 	short pad;
 	int diss_speed;/* in frames */
-	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
-	struct ListBase ptcaches;
+	struct PointCache *point_cache[2];	/* definition is in DNA_object_force.h */
+	struct ListBase ptcaches[2];
 	struct WTURBULENCE *wt; // WTURBULENCE object, if active
 	int pad3;
 	float strength;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index e671665bd17..5ef25edacf7 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -177,7 +177,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 1.0, 100.0);
 	RNA_def_property_ui_range(prop, 1.0, 1000.0, 1, 0);
 	RNA_def_property_ui_text(prop, "Dissolve Speed", "Dissolve Speed");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
 	prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES);
@@ -195,7 +195,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
 	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
-	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
+	RNA_def_property_pointer_sdna(prop, NULL, "point_cache[0]");
 	RNA_def_property_struct_type(prop, "PointCache");
 	RNA_def_property_ui_text(prop, "Point Cache", "");
 
@@ -224,12 +224,10 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Strength", "Strength of wavelet noise");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
-	/*
-	prop= RNA_def_property(srna, "point_cache_hr", PROP_POINTER, PROP_NEVER_NULL);
-	RNA_def_property_pointer_sdna(prop, NULL, "point_cache");
+	prop= RNA_def_property(srna, "point_cache_turbulence", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "point_cache[1]");
 	RNA_def_property_struct_type(prop, "PointCache");
 	RNA_def_property_ui_text(prop, "Point Cache", "");
-	*/
 }
 
 static void rna_def_smoke_flow_settings(BlenderRNA *brna)

From 4893cdc33855e566dade323fa2f8486536821018 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Wed, 26 Aug 2009 00:38:43 +0000
Subject: [PATCH 274/577] 2.5 - Warning cleanups (for mingw+scons)

Also, made the Outliner's horizontal scrollbar work better for keymaps view. It's still using an approximation of the width, but at least you can scroll now.
---
 intern/smoke/extern/smoke_API.h               |   4 +-
 source/blender/blenkernel/intern/boids.c      |   4 +-
 source/blender/blenkernel/intern/object.c     |   4 +-
 .../blenkernel/intern/particle_system.c       |   2 +-
 source/blender/blenkernel/intern/pointcache.c |  20 +--
 source/blender/blenkernel/intern/smoke.c      |  12 +-
 source/blender/blenkernel/intern/texture.c    |   2 +-
 source/blender/blenlib/BLI_voxel.h            |   2 +-
 .../editors/animation/keyframes_general.c     | 139 +++++++++---------
 .../editors/interface/interface_regions.c     |   2 +-
 .../editors/interface/interface_templates.c   |   2 +-
 .../editors/interface/interface_widgets.c     |   8 +-
 .../blender/editors/space_outliner/outliner.c |   5 +-
 .../editors/space_sequencer/sequencer_add.c   |   2 +-
 .../editors/space_view3d/view3d_header.c      |   4 +-
 source/blender/makesdna/DNA_smoke_types.h     |   2 +-
 source/blender/makesrna/intern/rna_smoke.c    |   4 +-
 .../render/intern/include/volume_precache.h   |   2 +-
 .../render/intern/include/volumetric.h        |   2 +-
 .../render/intern/source/pointdensity.c       |   2 +-
 .../blender/render/intern/source/volumetric.c |   2 +-
 .../blender/render/intern/source/voxeldata.c  |   2 +-
 22 files changed, 117 insertions(+), 111 deletions(-)

diff --git a/intern/smoke/extern/smoke_API.h b/intern/smoke/extern/smoke_API.h
index b21ce473202..1a3edce2344 100644
--- a/intern/smoke/extern/smoke_API.h
+++ b/intern/smoke/extern/smoke_API.h
@@ -32,6 +32,8 @@
 extern "C" {
 #endif
 
+struct FLUID_3D;
+
 // export
 void smoke_export(struct FLUID_3D *fluid, float *dt, float *dx, float **dens, float **densold, float **heat, float **heatold, float **vx, float **vy, float **vz, float **vxold, float **vyold, float **vzold, unsigned char **obstacles);
 
@@ -74,4 +76,4 @@ void smoke_turbulence_export(struct WTURBULENCE *wt, float **dens, float **denso
 }
 #endif
 
-#endif /* SMOKE_API_H_ */
\ No newline at end of file
+#endif /* SMOKE_API_H_ */
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c
index d8926fc5753..5c62e434cb6 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -76,7 +76,7 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
 	Object *priority_ob = NULL;
 	float vec[3] = {0.0f, 0.0f, 0.0f}, loc[3] = {0.0f, 0.0f, 0.0f};
 	float mul = (rule->type == eBoidRuleType_Avoid ? 1.0 : -1.0);
-	float priority = 0.0f, len;
+	float priority = 0.0f, len = 0.0f;
 	int ret = 0;
 
 	/* first find out goal/predator with highest priority */
@@ -614,7 +614,7 @@ static int rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti
 	KDTreeNearest *ptn = NULL;
 	ParticleTarget *pt;
 	ParticleData *epars;
-	ParticleData *enemy_pa;
+	ParticleData *enemy_pa = NULL;
 	/* friends & enemies */
 	float closest_enemy[3] = {0.0f,0.0f,0.0f};
 	float closest_dist = fbr->distance + 1.0f;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 32f70bc690c..5e2a00c219d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2571,6 +2571,7 @@ int object_insert_ptcache(Object *ob)
 	return i;
 }
 
+#if 0
 static int pc_findindex(ListBase *listbase, int index)
 {
 	LinkData *link= NULL;
@@ -2590,11 +2591,10 @@ static int pc_findindex(ListBase *listbase, int index)
 	return -1;
 }
 
-#if 0
 void object_delete_ptcache(Object *ob, int index) 
 {
 	int list_index = pc_findindex(&ob->pc_ids, index);
 	LinkData *link = BLI_findlink(&ob->pc_ids, list_index);
 	BLI_freelinkN(&ob->pc_ids, link);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index dcd3fcd2f89..bf642a14a49 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3238,7 +3238,7 @@ static void deflect_particle(Scene *scene, Object *pob, ParticleSystemModifierDa
 	ParticleCollision col;
 	BVHTreeRayHit hit;
 	float ray_dir[3], zerovec[3]={0.0,0.0,0.0};
-	float radius = ((part->flag & PART_SIZE_DEFL)?pa->size:0.0f), boid_z;
+	float radius = ((part->flag & PART_SIZE_DEFL)?pa->size:0.0f), boid_z = 0.0f;
 	int deflections=0, max_deflections=10;
 
 	VECCOPY(col.co1, pa->prev_state.co);
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 42bea260450..69da8f19d8c 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -424,8 +424,6 @@ void BKE_ptcache_id_from_softbody(PTCacheID *pid, Object *ob, SoftBody *sb)
 
 void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *psys)
 {
-	ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
-
 	memset(pid, 0, sizeof(PTCacheID));
 
 	pid->ob= ob;
@@ -484,7 +482,7 @@ static int ptcache_file_write(PTCacheFile *pf, void *f, size_t tot, int size);
 
 static int ptcache_compress_write(PTCacheFile *pf, unsigned char *in, unsigned int in_len, unsigned char *out, int mode)
 {
-	int r;
+	int r = 0;
 	unsigned char compressed;
 	LZO_HEAP_ALLOC(wrkmem, LZO1X_MEM_COMPRESS);
 	unsigned int out_len = LZO_OUT_LEN(in_len);
@@ -566,11 +564,12 @@ static int ptcache_write_smoke(PTCacheFile *pf, void *smoke_v)
 	return 0;
 }
 
+/*
 static int ptcache_write_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
-	/*
+	
 	if(sds->wt) {
 		unsigned int res_big[3];
 		size_t res = sds->res[0]*sds->res[1]*sds->res[2];
@@ -599,16 +598,16 @@ static int ptcache_write_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 		
 		return 1;
 	}
-*/
 	return 0;
 }
+*/
 
 // forward decleration
 static int ptcache_file_read(PTCacheFile *pf, void *f, size_t tot, int size);
 
 static int ptcache_compress_read(PTCacheFile *pf, unsigned char *result, unsigned int len)
 {
-	int r;
+	int r = 0;
 	unsigned char compressed = 0;
 	unsigned int in_len;
 	unsigned int out_len = len;
@@ -673,11 +672,12 @@ static void ptcache_read_smoke(PTCacheFile *pf, void *smoke_v)
 	}
 }
 
+/*
 static void ptcache_read_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
-	/*
+	
 	if(sds->fluid) {
 		unsigned int res[3];
 		float *dens, *densold, *tcu, *tcv, *tcw;
@@ -690,8 +690,8 @@ static void ptcache_read_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 		ptcache_compress_read(pf, (unsigned char*)dens, out_len);
 		
 	}
-	*/
 }
+*/
 
 void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd)
 {
@@ -1162,7 +1162,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 	int cfra1 = 0, cfra2 = 0;
 	int totpoint = 0, totpoint2 = 0;
 	int *index = &i, *index2 = &i;
-	int use_old = 0, old_frame;
+	int use_old = 0, old_frame = 0;
 
 	int ret = 0, error = 0;
 
@@ -2084,7 +2084,7 @@ void BKE_ptcache_make_cache(PTCacheBaker* baker)
 	Base *base;
 	ListBase pidlist;
 	PTCacheID *pid = baker->pid;
-	PointCache *cache;
+	PointCache *cache = NULL;
 	float frameleno = scene->r.framelen;
 	int cfrao = CFRA;
 	int startframe = MAXFRAME;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index cd9679be486..223d48012df 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -92,10 +92,10 @@ static void tend ( void )
 {
 	QueryPerformanceCounter ( &liCurrentTime );
 }
-static double tval()
-{
-	return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
-}
+//static double tval()
+//{
+//	return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
+//}
 #else
 #include <sys/time.h>
 static struct timeval _tstart, _tend;
@@ -788,9 +788,8 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 	}
 	else if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 	{
-		PointCache *cache, *cache_wt;
+		PointCache *cache;
 		PTCacheID pid;
-		PTCacheID pid_wt;
 		float timescale;
 		int cache_result = 0;
 		int startframe, endframe, framenr;
@@ -1424,7 +1423,6 @@ void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], fl
 {
 	int x, y, z;
 	float bv[6];
-	float bigfactor = 1.0;
 
 	// x
 	bv[0] = p0[0];
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 96e9f54fc0c..61f62b2222d 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -750,7 +750,7 @@ void make_local_texture(Tex *tex)
 
 void autotexname(Tex *tex)
 {
-	char texstr[20][12]= {"None"  , "Clouds" , "Wood", "Marble", "Magic"  , "Blend",
+	char texstr[20][15]= {"None"  , "Clouds" , "Wood", "Marble", "Magic"  , "Blend",
 		"Stucci", "Noise"  , "Image", "Plugin", "EnvMap" , "Musgrave",
 		"Voronoi", "DistNoise", "Point Density", "Voxel Data", "", "", "", ""};
 	Image *ima;
diff --git a/source/blender/blenlib/BLI_voxel.h b/source/blender/blenlib/BLI_voxel.h
index 091d8e3682d..9b815ccbf42 100644
--- a/source/blender/blenlib/BLI_voxel.h
+++ b/source/blender/blenlib/BLI_voxel.h
@@ -37,4 +37,4 @@ float voxel_sample_nearest(float *data, int *res, float *co);
 float voxel_sample_trilinear(float *data, int *res, float *co);
 float voxel_sample_tricubic(float *data, int *res, float *co);
 
-#endif /* BLI_VOXEL_H */
\ No newline at end of file
+#endif /* BLI_VOXEL_H */
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index fc67ee34a2e..ced3c117700 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -127,11 +127,11 @@ void duplicate_fcurve_keys(FCurve *fcu)
 {
 	BezTriple *newbezt;
 	int i;
-
-	if (fcu == NULL)
+	
+	/* this can only work when there is an F-Curve, and also when there are some BezTriples */
+	if ELEM(NULL, fcu, fcu->bezt)
 		return;
 	
-	// XXX this does not take into account sample data...
 	for (i=0; i < fcu->totvert; i++) {
 		/* If a key is selected */
 		if (fcu->bezt[i].f2 & SELECT) {
@@ -160,7 +160,7 @@ void duplicate_fcurve_keys(FCurve *fcu)
 /* **************************************************** */
 /* Various Tools */
 
-/* Basic IPO-Curve 'cleanup' function that removes 'double points' and unnecessary keyframes on linear-segments only */
+/* Basic F-Curve 'cleanup' function that removes 'double points' and unnecessary keyframes on linear-segments only */
 void clean_fcurve(FCurve *fcu, float thresh)
 {
 	BezTriple *old_bezts, *bezt, *beztn;
@@ -285,74 +285,74 @@ void smooth_fcurve (FCurve *fcu)
 		}
 	}
 	
-		/* if any points were selected, allocate tSmooth_Bezt points to work on */
-		if (totSel >= 3) {
-			tSmooth_Bezt *tarray, *tsb;
-			
-			/* allocate memory in one go */
-			tsb= tarray= MEM_callocN(totSel*sizeof(tSmooth_Bezt), "tSmooth_Bezt Array");
-			
-			/* populate tarray with data of selected points */
-			bezt= fcu->bezt;
-			for (i=0, x=0; (i < fcu->totvert) && (x < totSel); i++, bezt++) {
-				if (BEZSELECTED(bezt)) {
-					/* tsb simply needs pointer to vec, and index */
-					tsb->h1 = &bezt->vec[0][1];
-					tsb->h2 = &bezt->vec[1][1];
-					tsb->h3 = &bezt->vec[2][1];
-					
-					/* advance to the next tsb to populate */
-					if (x < totSel- 1) 
-						tsb++;
-					else
-						break;
-				}
-			}
-			
-	/* calculate the new smoothed F-Curve's with weighted averages:
-	 *	- this is done with two passes
-	 *	- uses 5 points for each operation (which stores in the relevant handles)
-	 *	-	previous: w/a ratio = 3:5:2:1:1
-	 *	- 	next: w/a ratio = 1:1:2:5:3
-	 */
-	
-	/* round 1: calculate previous and next */ 
-	tsb= tarray;
-	for (i=0; i < totSel; i++, tsb++) {
-		/* don't touch end points (otherwise, curves slowly explode) */
-		if (ELEM(i, 0, (totSel-1)) == 0) {
-			const tSmooth_Bezt *tP1 = tsb - 1;
-			const tSmooth_Bezt *tP2 = (i-2 > 0) ? (tsb - 2) : (NULL);
-			const tSmooth_Bezt *tN1 = tsb + 1;
-			const tSmooth_Bezt *tN2 = (i+2 < totSel) ? (tsb + 2) : (NULL);
-			
-			const float p1 = *tP1->h2;
-			const float p2 = (tP2) ? (*tP2->h2) : (*tP1->h2);
-			const float c1 = *tsb->h2;
-			const float n1 = *tN1->h2;
-			const float n2 = (tN2) ? (*tN2->h2) : (*tN1->h2);
-			
-			/* calculate previous and next */
-			*tsb->h1= (3*p2 + 5*p1 + 2*c1 + n1 + n2) / 12;
-			*tsb->h3= (p2 + p1 + 2*c1 + 5*n1 + 3*n2) / 12;
-		}
-	}
-	
-	/* round 2: calculate new values and reset handles */
-	tsb= tarray;
-	for (i=0; i < totSel; i++, tsb++) {
-		/* calculate new position by averaging handles */
-		*tsb->h2 = (*tsb->h1 + *tsb->h3) / 2;
+	/* if any points were selected, allocate tSmooth_Bezt points to work on */
+	if (totSel >= 3) {
+		tSmooth_Bezt *tarray, *tsb;
 		
-		/* reset handles now */
-		*tsb->h1 = *tsb->h2;
-		*tsb->h3 = *tsb->h2;
+		/* allocate memory in one go */
+		tsb= tarray= MEM_callocN(totSel*sizeof(tSmooth_Bezt), "tSmooth_Bezt Array");
+		
+		/* populate tarray with data of selected points */
+		bezt= fcu->bezt;
+		for (i=0, x=0; (i < fcu->totvert) && (x < totSel); i++, bezt++) {
+			if (BEZSELECTED(bezt)) {
+				/* tsb simply needs pointer to vec, and index */
+				tsb->h1 = &bezt->vec[0][1];
+				tsb->h2 = &bezt->vec[1][1];
+				tsb->h3 = &bezt->vec[2][1];
+				
+				/* advance to the next tsb to populate */
+				if (x < totSel- 1) 
+					tsb++;
+				else
+					break;
+			}
+		}
+			
+		/* calculate the new smoothed F-Curve's with weighted averages:
+		 *	- this is done with two passes
+		 *	- uses 5 points for each operation (which stores in the relevant handles)
+		 *	-	previous: w/a ratio = 3:5:2:1:1
+		 *	- 	next: w/a ratio = 1:1:2:5:3
+		 */
+		
+		/* round 1: calculate previous and next */ 
+		tsb= tarray;
+		for (i=0; i < totSel; i++, tsb++) {
+			/* don't touch end points (otherwise, curves slowly explode) */
+			if (ELEM(i, 0, (totSel-1)) == 0) {
+				const tSmooth_Bezt *tP1 = tsb - 1;
+				const tSmooth_Bezt *tP2 = (i-2 > 0) ? (tsb - 2) : (NULL);
+				const tSmooth_Bezt *tN1 = tsb + 1;
+				const tSmooth_Bezt *tN2 = (i+2 < totSel) ? (tsb + 2) : (NULL);
+				
+				const float p1 = *tP1->h2;
+				const float p2 = (tP2) ? (*tP2->h2) : (*tP1->h2);
+				const float c1 = *tsb->h2;
+				const float n1 = *tN1->h2;
+				const float n2 = (tN2) ? (*tN2->h2) : (*tN1->h2);
+				
+				/* calculate previous and next */
+				*tsb->h1= (3*p2 + 5*p1 + 2*c1 + n1 + n2) / 12;
+				*tsb->h3= (p2 + p1 + 2*c1 + 5*n1 + 3*n2) / 12;
+			}
+		}
+		
+		/* round 2: calculate new values and reset handles */
+		tsb= tarray;
+		for (i=0; i < totSel; i++, tsb++) {
+			/* calculate new position by averaging handles */
+			*tsb->h2 = (*tsb->h1 + *tsb->h3) / 2;
+			
+			/* reset handles now */
+			*tsb->h1 = *tsb->h2;
+			*tsb->h3 = *tsb->h2;
+		}
+		
+		/* free memory required for tarray */
+		MEM_freeN(tarray);
 	}
 	
-	/* free memory required for tarray */
-	MEM_freeN(tarray);
-}
-	
 	/* recalculate handles */
 	calchandles_fcurve(fcu);
 }
@@ -371,7 +371,6 @@ ListBase animcopybuf = {NULL, NULL};
 static float animcopy_firstframe= 999999999.0f;
 
 /* datatype for use in copy/paste buffer */
-// XXX F-Curve editor should use this too
 typedef struct tAnimCopybufItem {
 	struct tAnimCopybufItem *next, *prev;
 	
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index e83dca5a500..1d911fef418 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1330,7 +1330,7 @@ static void ui_block_func_MENUSTR(bContext *C, uiLayout *layout, void *arg_str)
 {
 	uiBlock *block= uiLayoutGetBlock(layout);
 	uiPopupBlockHandle *handle= block->handle;
-	uiLayout *split, *column;
+	uiLayout *split, *column=NULL;
 	uiBut *bt;
 	MenuData *md;
 	MenuEntry *entry;
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 4cfc44e56c8..6aa5f5efc41 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1318,7 +1318,7 @@ ListBase uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, char *pr
 	Panel *pa;
 	ListBase lb, *itemlb;
 	char *name, str[32];
-	int icon=0, i= 0, activei= 0, len, items, found, min, max;
+	int icon=0, i= 0, activei= 0, len= 0, items, found, min, max;
 
 	lb.first= lb.last= NULL;
 	
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index a55b11afe48..f0085f71373 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1946,12 +1946,12 @@ static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int
 {
 	if(state & UI_ACTIVE) {
 		uiWidgetBase wtb;
-		float rad= 0.5f*(rect->ymax - rect->ymin);
+		float rad= 0.5f*(rect->ymax - rect->ymin); // 4.0f
 		
 		widget_init(&wtb);
 		
 		/* half rounded */
-		round_box_edges(&wtb, 15, rect, 4.0f);
+		round_box_edges(&wtb, 15, rect, rad);
 		
 		widgetbase_draw(&wtb, wcol);
 	}
@@ -2045,12 +2045,12 @@ static void widget_but(uiWidgetColors *wcol, rcti *rect, int state, int roundbox
 static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
 {
 	uiWidgetBase wtb;
-	float rad= 0.5f*(rect->ymax - rect->ymin);
+	float rad= 5.0f; //0.5f*(rect->ymax - rect->ymin);
 	
 	widget_init(&wtb);
 	
 	/* half rounded */
-	round_box_edges(&wtb, roundboxalign, rect, 5.0f);
+	round_box_edges(&wtb, roundboxalign, rect, rad);
 
 	widgetbase_draw(&wtb, wcol);
 }
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index d564573a543..fca5b0cc59a 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -5274,7 +5274,10 @@ void draw_outliner(const bContext *C)
 		sizex_rna= MAX2(OL_RNA_COLX, sizex_rna+OL_RNA_COL_SPACEX);
 		
 		/* get width of data (for setting 'tot' rect, this is column 1 + column 2 + a bit extra) */
-		sizex= sizex_rna + OL_RNA_COL_SIZEX + 50;
+		if (soops->outlinevis == SO_KEYMAP) 
+			sizex= sizex_rna + OL_RNA_COL_SIZEX*3 + 50; // XXX this is only really a quick hack to make this wide enough...
+		else
+			sizex= sizex_rna + OL_RNA_COL_SIZEX + 50;
 	}
 	else {
 		/* width must take into account restriction columns (if visible) so that entries will still be visible */
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 5d58ea431a9..bdedef4b6c8 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -291,7 +291,7 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op)
 	struct anim *an;
 	char filename[FILE_MAX];
 
-	Sequence *seq, *soundseq;	/* generic strip vars */
+	Sequence *seq, *soundseq=NULL;	/* generic strip vars */
 	Strip *strip;
 	StripElem *se;
 
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 6773985e07c..eee85f21798 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -1005,9 +1005,10 @@ static uiBlock *view3d_object_mirrormenu(bContext *C, ARegion *ar, void *arg_unu
 #endif
 #endif
 
+#if 0
 static void view3d_edit_object_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-#if 0
+#if 0 // XXX not used anymore
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Scale/Rotation to ObData|Ctrl A, 1",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
 	apply_objects_locrot();
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Visual Transform|Ctrl A, 2",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
@@ -1024,6 +1025,7 @@ static void view3d_edit_object_transformmenu(bContext *C, uiLayout *layout, void
 	uiItemO(layout, NULL, 0, "OBJECT_OT_scale_clear");
 	uiItemO(layout, NULL, 0, "OBJECT_OT_origin_clear");
 }
+#endif 
 
 #if 0
 static void do_view3d_edit_object_makelocalmenu(bContext *C, void *arg, int event)
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index a8ab4734af0..7c6c7fab9e4 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -32,7 +32,7 @@
 /* flags */
 #define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */
 #define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */
-#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve *
+#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */
 
 /* noise */
 #define MOD_SMOKE_NOISEWAVE (1<<0)
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 5ef25edacf7..d7c70d8b9e9 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -79,12 +79,14 @@ static void rna_Smoke_reset_dependancy(bContext *C, PointerRNA *ptr)
 	rna_Smoke_dependency_update(C, ptr);
 }
 
+#if 0
 static void rna_Smoke_redraw(bContext *C, PointerRNA *ptr)
 {
 	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
 
-	// settings->flags |= MOD_SMOKE_VIEW_REDRAWNICE;
+	settings->flags |= MOD_SMOKE_VIEW_REDRAWNICE;
 }
+#endif
 
 static char *rna_SmokeDomainSettings_path(PointerRNA *ptr)
 {
diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index d8a94c2d560..dbd02759a63 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -31,4 +31,4 @@ void free_volume_precache(Render *re);
 int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
 int using_lightcache(Material *ma);
 
-#define VOL_MS_TIMESTEP	0.1f
\ No newline at end of file
+#define VOL_MS_TIMESTEP	0.1f
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index 543e179bc88..026b4840ea3 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -44,4 +44,4 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 #define VOL_BOUNDS_SS		1
 
 #define VOL_SHADE_OUTSIDE	0
-#define VOL_SHADE_INSIDE	1
\ No newline at end of file
+#define VOL_SHADE_INSIDE	1
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index fbc39b61257..5f8cf5504fa 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -324,7 +324,7 @@ void accum_density(void *userdata, int index, float squared_dist)
 {
 	PointDensityRangeData *pdr = (PointDensityRangeData *)userdata;
 	const float dist = (pdr->squared_radius - squared_dist) / pdr->squared_radius * 0.5f;
-	float density;
+	float density = 0.0f;
 	
 	if (pdr->falloff_type == TEX_PD_FALLOFF_STD)
 		density = dist;
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 0e2e3913819..13996905437 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -685,4 +685,4 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 	volume_trace(shi, shr, VOL_SHADE_INSIDE);
 
 	shi->mat = mat_backup;
-}
\ No newline at end of file
+}
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index f1f01f873a5..836faeb05b9 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -162,7 +162,7 @@ void init_frame_smoke(Render *re, VoxelData *vd, Tex *tex)
 	ob= vd->object;
 	
 	/* draw code for smoke */
-	if(md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke))
+	if( (md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke)) )
 	{
 		SmokeModifierData *smd = (SmokeModifierData *)md;
 		

From 833afdd9e7fe50b80ce67f11f113b03f751eca18 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 26 Aug 2009 01:49:57 +0000
Subject: [PATCH 275/577] Map manipulator to leftmouse, not actionmouse.

We don't want this to flip around when people change left or right mouse select.
---
 source/blender/editors/space_view3d/view3d_ops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 929272bc066..e9d1f6406b0 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -132,7 +132,8 @@ void view3d_keymap(wmWindowManager *wm)
 	km = WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, KM_CTRL, 0);
 	RNA_boolean_set(km->ptr, "snap", 1);
 
-	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", ACTIONMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, 0, 0); /* manipulator always on left mouse, not on action mouse*/
+	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_PRESS, 0, 0);
 	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_viewrotate", MIDDLEMOUSE, KM_PRESS, 0, 0);

From d893b0f9ff5fc21277b9c24568e224961537c23c Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 26 Aug 2009 02:18:47 +0000
Subject: [PATCH 276/577] Clear transform flag on all bones that are not
 transformed.

---
 source/blender/editors/transform/transform_conversions.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 57a77ae75b8..48947794620 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -698,6 +698,8 @@ int count_set_pose_transflags(int *out_mode, short around, Object *ob)
 			bone->flag &= ~BONE_HINGE_CHILD_TRANSFORM;
 			bone->flag &= ~BONE_TRANSFORM_CHILD;
 		}
+		else
+			bone->flag &= ~BONE_TRANSFORM;
 	}
 
 	/* make sure no bone can be transformed when a parent is transformed */

From 43422354895bb620d6731f928d121ae6cd06da48 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 26 Aug 2009 06:15:43 +0000
Subject: [PATCH 277/577] - Mathutils.Vector assignment wasnt working in the
 BGE's py api, was using getValue() rather than setValue() - added GPL header
 to bpy_interface.c from 2.4x's BPY_interface.c - warning fixes

---
 source/blender/editors/object/object_vgroup.c |  2 +-
 .../python/generic/bpy_internal_import.h      |  9 ++++++
 source/blender/python/generic/vector.c        |  4 +--
 source/blender/python/intern/bpy_interface.c  | 31 ++++++++++++++++++-
 source/gameengine/Ketsji/KX_PyMath.h          |  6 ++--
 .../Physics/Bullet/CcdPhysicsEnvironment.cpp  |  4 +--
 6 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 154ab14df60..767a04d9170 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1076,7 +1076,7 @@ void vgroup_operation_with_menu(Object *ob)
 				short nr;
 				
 				if (menustr) {
-// XXX					nr= pupmenu(menustr);
+					nr= 1; // pupmenu(menustr); // XXX
 					
 					if ((nr >= 1) && (nr <= defCount)) 
 						ob->actdef= nr;
diff --git a/source/blender/python/generic/bpy_internal_import.h b/source/blender/python/generic/bpy_internal_import.h
index c93d930dab0..4e761fe8da0 100644
--- a/source/blender/python/generic/bpy_internal_import.h
+++ b/source/blender/python/generic/bpy_internal_import.h
@@ -31,6 +31,15 @@
 #ifndef EXPP_bpy_import_h
 #define EXPP_bpy_import_h
 
+/* python redefines :/ */
+#ifdef _POSIX_C_SOURCE
+#undef _POSIX_C_SOURCE
+#endif
+
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
+
 #include <Python.h>
 #include "compile.h"		/* for the PyCodeObject */
 #include "eval.h"		/* for PyEval_EvalCode */
diff --git a/source/blender/python/generic/vector.c b/source/blender/python/generic/vector.c
index 923c4bbe58a..c4a8a37ee05 100644
--- a/source/blender/python/generic/vector.c
+++ b/source/blender/python/generic/vector.c
@@ -168,7 +168,7 @@ static PyObject *Vector_Resize2D(VectorObject * self)
 		return NULL;
 	}
 	if(self->cb_user) {
-		PyErr_SetString(PyExc_TypeError, "vector.resize4d(): cannot resize a vector that has an owner");
+		PyErr_SetString(PyExc_TypeError, "vector.resize2d(): cannot resize a vector that has an owner");
 		return NULL;
 	}
 	
@@ -191,7 +191,7 @@ static PyObject *Vector_Resize3D(VectorObject * self)
 		return NULL;
 	}
 	if(self->cb_user) {
-		PyErr_SetString(PyExc_TypeError, "vector.resize4d(): cannot resize a vector that has an owner");
+		PyErr_SetString(PyExc_TypeError, "vector.resize3d(): cannot resize a vector that has an owner");
 		return NULL;
 	}
 	
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 69b733d3fda..43db337c6db 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -1,4 +1,28 @@
-
+/**
+ * $Id:
+ *
+ * ***** 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): Michel Selten, Willian P. Germano, Stephen Swaney,
+ * Chris Keith, Chris Want, Ken Hughes, Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -10,6 +34,11 @@
 #include "BLI_winstuff.h"
 #endif
 
+/* grr, python redefines */
+#ifdef _POSIX_C_SOURCE
+#undef _POSIX_C_SOURCE
+#endif
+
 #include <Python.h>
 #include "compile.h"		/* for the PyCodeObject */
 #include "eval.h"		/* for PyEval_EvalCode */
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index 9ee11c9e745..a8488e8e60a 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -113,7 +113,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
 			PyErr_Format(PyExc_AttributeError, "error setting vector, %d args, should be %d", pyvec->size, Size(vec));
 			return false;
 		}
-		vec.getValue((float *) pyvec->vec);
+		vec.setValue((float *) pyvec->vec);
 		return true;
 	}
 	else if(QuaternionObject_Check(pyval)) {
@@ -123,7 +123,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
 			return false;
 		}
 		/* xyzw -> wxyz reordering is done by PyQuatTo */
-		vec.getValue((float *) pyquat->quat);
+		vec.setValue((float *) pyquat->quat);
 		return true;
 	}
 	else if(EulerObject_Check(pyval)) {
@@ -132,7 +132,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
 			PyErr_Format(PyExc_AttributeError, "error setting vector, %d args, should be %d", 3, Size(vec));
 			return false;
 		}
-		vec.getValue((float *) pyeul->eul);
+		vec.setValue((float *) pyeul->eul);
 		return true;
 	} else
 #endif
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index bc7ccacc39b..bf28802870a 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -327,7 +327,6 @@ CcdPhysicsEnvironment::CcdPhysicsEnvironment(bool useDbvtCulling,btDispatcher* d
 :m_cullingCache(NULL),
 m_cullingTree(NULL),
 m_numIterations(10),
-m_scalingPropagated(false),
 m_numTimeSubSteps(1),
 m_ccdMode(0),
 m_solverType(-1),
@@ -336,7 +335,8 @@ m_enableSatCollisionDetection(false),
 m_solver(NULL),
 m_ownPairCache(NULL),
 m_filterCallback(NULL),
-m_ownDispatcher(NULL)
+m_ownDispatcher(NULL),
+m_scalingPropagated(false)
 {
 
 	for (int i=0;i<PHY_NUM_RESPONSE;i++)

From 163d0bb8114904686fa1227ebfd170fe0a8f5dd3 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 26 Aug 2009 06:17:39 +0000
Subject: [PATCH 278/577] * Fix for yesterday's valgrind fix

* Fix for plane material preview render. Now, light cache aborts if there isn't enough volume, and falls back on non-cached single scattering. It still doesn't make much sense to render a plane as a volume, but for now in the preview it will shade the region in between the plane and the checker background.
---
 .../render/intern/include/volume_precache.h   |  35 +
 .../render/intern/source/volume_precache.c    |  23 +-
 .../blender/render/intern/source/volumetric.c | 690 ++++++++++++++++++
 3 files changed, 741 insertions(+), 7 deletions(-)

diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index dbd02759a63..93620dc9bf4 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -1,3 +1,37 @@
+<<<<<<< .mine
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+void volume_precache(Render *re);
+void free_volume_precache(Render *re);
+int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
+
+#define VOL_MS_TIMESTEP	0.1f=======
 /**
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -32,3 +66,4 @@ int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
 int using_lightcache(Material *ma);
 
 #define VOL_MS_TIMESTEP	0.1f
+>>>>>>> .r22793
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 71200aa8b0d..d5a54759332 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -499,8 +499,7 @@ static void precache_init_parts(Render *re, RayTree *tree, ShadeInput *shi, Obje
 	res = vp->res;
 	
 	VecSubf(voxel, bbmax, bbmin);
-	if ((voxel[0] < FLT_EPSILON) || (voxel[1] < FLT_EPSILON) || (voxel[2] < FLT_EPSILON))
-		return;
+	
 	voxel[0] /= res[0];
 	voxel[1] /= res[1];
 	voxel[2] /= res[2];
@@ -564,7 +563,7 @@ static VolPrecachePart *precache_get_new_part(Render *re)
 	return nextpa;
 }
 
-static void precache_resolution(VolumePrecache *vp, float *bbmin, float *bbmax, int res)
+static int precache_resolution(VolumePrecache *vp, float *bbmin, float *bbmax, int res)
 {
 	float dim[3], div;
 	
@@ -574,10 +573,15 @@ static void precache_resolution(VolumePrecache *vp, float *bbmin, float *bbmax,
 	dim[0] /= div;
 	dim[1] /= div;
 	dim[2] /= div;
-			   
+	
 	vp->res[0] = dim[0] * (float)res;
 	vp->res[1] = dim[1] * (float)res;
 	vp->res[2] = dim[2] * (float)res;
+	
+	if ((vp->res[0] < 1) || (vp->res[1] < 1) || (vp->res[2] < 1))
+		return 0;
+	
+	return 1;
 }
 
 /* Precache a volume into a 3D voxel grid.
@@ -608,7 +612,12 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	if (!tree) return;
 
 	vp = MEM_callocN(sizeof(VolumePrecache), "volume light cache");
-	precache_resolution(vp, bbmin, bbmax, ma->vol.precache_resolution);
+	
+	if (!precache_resolution(vp, bbmin, bbmax, ma->vol.precache_resolution)) {
+		MEM_freeN(vp);
+		vp = NULL;
+		return;
+	}
 
 	vp->data_r = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data red channel");
 	vp->data_g = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data green channel");
@@ -675,7 +684,7 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
 	}
 }
 
-int using_lightcache(Material *ma)
+static int using_lightcache(Material *ma)
 {
 	return (((ma->vol.shadeflag & MA_VOL_PRECACHESHADING) && (ma->vol.shade_type == MA_VOL_SHADE_SINGLE))
 		|| (ELEM(ma->vol.shade_type, MA_VOL_SHADE_MULTIPLE, MA_VOL_SHADE_SINGLEPLUSMULTIPLE)));
@@ -708,10 +717,10 @@ void free_volume_precache(Render *re)
 	
 	for(obi= re->instancetable.first; obi; obi= obi->next) {
 		if (obi->volume_precache != NULL) {
-			MEM_freeN(obi->volume_precache);
 			MEM_freeN(obi->volume_precache->data_r);
 			MEM_freeN(obi->volume_precache->data_g);
 			MEM_freeN(obi->volume_precache->data_b);
+			MEM_freeN(obi->volume_precache);
 			obi->volume_precache = NULL;
 		}
 	}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 13996905437..441237dab79 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -1,3 +1,692 @@
+<<<<<<< .mine
+/**
+ *
+ * ***** 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.
+ *
+ * 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): Matt Ebb, Raul Fernandez Hernandez (Farsthary)
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <float.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "BLI_rand.h"
+#include "BLI_voxel.h"
+
+#include "RE_shader_ext.h"
+#include "RE_raytrace.h"
+
+#include "DNA_material_types.h"
+#include "DNA_group_types.h"
+#include "DNA_lamp_types.h"
+
+#include "BKE_global.h"
+
+#include "render_types.h"
+#include "pixelshading.h"
+#include "shading.h"
+#include "texture.h"
+#include "volumetric.h"
+#include "volume_precache.h"
+
+#if defined( _MSC_VER ) && !defined( __cplusplus )
+# define inline __inline
+#endif // defined( _MSC_VER ) && !defined( __cplusplus )
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
+/* only to be used here in this file, it's for speed */
+extern struct Render R;
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+
+/* tracing */
+
+static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
+{
+	float maxsize = RE_ray_tree_max_size(R.raytree);
+	
+	/* XXX TODO - get raytrace max distance from object instance's bounding box */
+	/* need to account for scaling only, but keep coords in camera space...
+	 * below code is WIP and doesn't work!
+	VecSubf(bb_dim, shi->obi->obr->boundbox[1], shi->obi->obr->boundbox[2]);
+	Mat3MulVecfl(shi->obi->nmat, bb_dim);
+	maxsize = VecLength(bb_dim);
+	*/
+	
+	VECCOPY(isect->start, co);
+	isect->end[0] = co[0] + vec[0] * maxsize;
+	isect->end[1] = co[1] + vec[1] * maxsize;
+	isect->end[2] = co[2] + vec[2] * maxsize;
+	
+	isect->mode= RE_RAY_MIRROR;
+	isect->oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect->face_last= NULL;
+	isect->ob_last= 0;
+	isect->lay= -1;
+	
+	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
+	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
+	
+	if(RE_ray_tree_intersect(R.raytree, isect))
+	{
+		hitco[0] = isect->start[0] + isect->labda*isect->vec[0];
+		hitco[1] = isect->start[1] + isect->labda*isect->vec[1];
+		hitco[2] = isect->start[2] + isect->labda*isect->vec[2];
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
+{
+	ShadeInput shi_new;
+	ShadeResult shr_new;
+	
+	memset(&shi_new, 0, sizeof(ShadeInput)); 
+	
+	shi_new.mask= shi->mask;
+	shi_new.osatex= shi->osatex;
+	shi_new.thread= shi->thread;
+	shi_new.depth = shi->depth + 1;
+	shi_new.volume_depth= shi->volume_depth + 1;
+	shi_new.xs= shi->xs;
+	shi_new.ys= shi->ys;
+	shi_new.lay= shi->lay;
+	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
+	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
+	shi_new.light_override= shi->light_override;
+	shi_new.mat_override= shi->mat_override;
+	
+	VECCOPY(shi_new.camera_co, is->start);
+	
+	memset(&shr_new, 0, sizeof(ShadeResult));
+	
+	/* hardcoded limit of 100 for now - prevents problems in weird geometry */
+	if (shi->volume_depth < 100) {
+		shade_ray(is, &shi_new, &shr_new);
+	}
+	
+	VecCopyf(col, shr_new.combined);
+	col[3] = shr_new.alpha;
+}
+
+static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
+{
+	Isect isect;
+	float maxsize = RE_ray_tree_max_size(R.raytree);
+	
+	VECCOPY(isect.start, co);
+	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
+	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
+	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
+	
+	isect.faceorig= (RayFace *)vlr;
+	
+	isect.mode= RE_RAY_MIRROR;
+	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
+	isect.face_last= NULL;
+	isect.ob_last= 0;
+	isect.lay= -1;
+	
+	/* check to see if there's anything behind the volume, otherwise shade the sky */
+	if(RE_ray_tree_intersect(R.raytree, &isect)) {
+		shade_intersection(shi, col, &isect);
+	} else {
+		shadeSkyView(col, co, shi->view, NULL, shi->thread);
+		shadeSunView(col, shi->view);
+	}
+}
+
+/* input shader data */
+
+float vol_get_stepsize(struct ShadeInput *shi, int context)
+{
+	if (shi->mat->vol.stepsize_type == MA_VOL_STEP_RANDOMIZED) {
+		/* range between 0.75 and 1.25 */
+		const float rnd = 0.5f * BLI_thread_frand(shi->thread) + 0.75f;
+	
+		if (context == STEPSIZE_VIEW)
+			return shi->mat->vol.stepsize * rnd;
+		else if (context == STEPSIZE_SHADE)
+			return shi->mat->vol.shade_stepsize * rnd;
+	}
+	else {	// MA_VOL_STEP_CONSTANT
+		
+		if (context == STEPSIZE_VIEW)
+			return shi->mat->vol.stepsize;
+		else if (context == STEPSIZE_SHADE)
+			return shi->mat->vol.shade_stepsize;
+	}
+	
+	return shi->mat->vol.stepsize;
+}
+
+/* trilinear interpolation */
+static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
+{
+	VolumePrecache *vp = shi->obi->volume_precache;
+	float bbmin[3], bbmax[3], dim[3];
+	float sample_co[3];
+	
+	if (!vp) return;
+	
+	/* convert input coords to 0.0, 1.0 */
+	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
+	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
+	VecSubf(dim, bbmax, bbmin);
+
+	sample_co[0] = ((co[0] - bbmin[0]) / dim[0]);
+	sample_co[1] = ((co[1] - bbmin[1]) / dim[1]);
+	sample_co[2] = ((co[2] - bbmin[2]) / dim[2]);
+
+	scatter_col[0] = voxel_sample_trilinear(vp->data_r, vp->res, sample_co);
+	scatter_col[1] = voxel_sample_trilinear(vp->data_g, vp->res, sample_co);
+	scatter_col[2] = voxel_sample_trilinear(vp->data_b, vp->res, sample_co);
+}
+
+float vol_get_density(struct ShadeInput *shi, float *co)
+{
+	float density = shi->mat->vol.density;
+	float density_scale = shi->mat->vol.density_scale;
+	float col[3] = {0.0, 0.0, 0.0};
+	
+	do_volume_tex(shi, co, MAP_DENSITY, col, &density);
+	
+	return density * density_scale;
+}
+
+/* scattering multiplier, values above 1.0 are non-physical, 
+ * but can be useful to tweak lighting */
+float vol_get_scattering_fac(ShadeInput *shi, float *co)
+{
+	float scatter = shi->mat->vol.scattering;
+	float col[3] = {0.0, 0.0, 0.0};
+	
+	do_volume_tex(shi, co, MAP_SCATTERING, col, &scatter);
+	
+	return scatter;
+}
+
+/* compute emission component, amount of radiance to add per segment
+ * can be textured with 'emit' */
+void vol_get_emission(ShadeInput *shi, float *emission_col, float *co, float density)
+{
+	float emission = shi->mat->vol.emission;
+	VECCOPY(emission_col, shi->mat->vol.emission_col);
+	
+	do_volume_tex(shi, co, MAP_EMISSION+MAP_EMISSION_COL, emission_col, &emission);
+	
+	emission_col[0] = emission_col[0] * emission * density;
+	emission_col[1] = emission_col[1] * emission * density;
+	emission_col[2] = emission_col[2] * emission * density;
+}
+
+void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
+{
+	float absorption = shi->mat->vol.absorption;
+	VECCOPY(absorb_col, shi->mat->vol.absorption_col);
+	
+	do_volume_tex(shi, co, MAP_ABSORPTION+MAP_ABSORPTION_COL, absorb_col, &absorption);
+	
+	absorb_col[0] = (1.0f - absorb_col[0]) * absorption;
+	absorb_col[1] = (1.0f - absorb_col[1]) * absorption;
+	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
+}
+
+
+/* phase function - determines in which directions the light 
+ * is scattered in the volume relative to incoming direction 
+ * and view direction */
+float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w, float *wp)
+{
+	const float costheta = Inpf(w, wp);
+	const float scale = M_PI;
+	
+	/*
+	 * Scale constant is required, since Blender's shading system doesn't normalise for
+	 * energy conservation - eg. scaling by 1/pi for a lambert shader.
+	 * This makes volumes darker than other solid objects, for the same lighting intensity.
+	 * To correct this, scale up the phase function values
+	 * until Blender's shading system supports this better. --matt
+	 */
+	
+	switch (phasefunc_type) {
+		case MA_VOL_PH_MIEHAZY:
+			return scale * (0.5f + 4.5f * powf(0.5 * (1.f + costheta), 8.f)) / (4.f*M_PI);
+		case MA_VOL_PH_MIEMURKY:
+			return scale * (0.5f + 16.5f * powf(0.5 * (1.f + costheta), 32.f)) / (4.f*M_PI);
+		case MA_VOL_PH_RAYLEIGH:
+			return scale * 3.f/(16.f*M_PI) * (1 + costheta * costheta);
+		case MA_VOL_PH_HG:
+			return scale * (1.f / (4.f * M_PI) * (1.f - g*g) / powf(1.f + g*g - 2.f * g * costheta, 1.5f));
+		case MA_VOL_PH_SCHLICK:
+		{
+			const float k = 1.55f * g - .55f * g * g * g;
+			const float kcostheta = k * costheta;
+			return scale * (1.f / (4.f * M_PI) * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta)));
+		}
+		case MA_VOL_PH_ISOTROPIC:
+		default:
+			return scale * (1.f / (4.f * M_PI));
+	}
+}
+
+/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
+ * Used in the relationship Transmittance = e^(-attenuation)
+ */
+void vol_get_attenuation_seg(ShadeInput *shi, float *transmission, float stepsize, float *co, float density)
+{
+	/* input density = density at co */
+	float tau[3] = {0.f, 0.f, 0.f};
+	float absorb_col[3];
+
+	vol_get_absorption(shi, absorb_col, co);
+	
+	/* homogenous volume within the sampled distance */
+	tau[0] = stepsize * density * absorb_col[0];
+	tau[1] = stepsize * density * absorb_col[1];
+	tau[2] = stepsize * density * absorb_col[2];
+	
+	transmission[0] *= exp(-tau[0]);
+	transmission[1] *= exp(-tau[1]);
+	transmission[2] *= exp(-tau[2]);
+}
+
+/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
+ * Used in the relationship Transmittance = e^(-attenuation)
+ */
+void vol_get_attenuation(ShadeInput *shi, float *transmission, float *co, float *endco, float density, float stepsize)
+{
+	/* input density = density at co */
+	float tau[3] = {0.f, 0.f, 0.f};
+	float absorb_col[3];
+	int s, nsteps;
+	float step_vec[3], step_sta[3], step_end[3];
+	const float dist = VecLenf(co, endco);
+
+	vol_get_absorption(shi, absorb_col, co);
+
+	nsteps = (int)((dist / stepsize) + 0.5);
+	
+	VecSubf(step_vec, endco, co);
+	VecMulf(step_vec, 1.0f / nsteps);
+	
+	VecCopyf(step_sta, co);
+	VecAddf(step_end, step_sta, step_vec);
+	
+	for (s = 0;  s < nsteps; s++) {
+		if (s > 0)
+			density = vol_get_density(shi, step_sta);
+		
+		tau[0] += stepsize * density;
+		tau[1] += stepsize * density;
+		tau[2] += stepsize * density;
+		
+		if (s < nsteps-1) {
+			VecCopyf(step_sta, step_end);
+			VecAddf(step_end, step_end, step_vec);
+		}
+	}
+	VecMulVecf(tau, tau, absorb_col);
+	
+	transmission[0] *= exp(-tau[0]);
+	transmission[1] *= exp(-tau[1]);
+	transmission[2] *= exp(-tau[2]);
+}
+
+void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *lacol, float stepsize, float density)
+{
+	float visifac, lv[3], lampdist;
+	float tr[3]={1.0,1.0,1.0};
+	float hitco[3], *atten_co;
+	float p;
+	float scatter_fac;
+	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
+	
+	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
+	if ((lar->lay & shi->lay)==0) return;
+	if (lar->energy == 0.0) return;
+	
+	if ((visifac= lamp_get_visibility(lar, co, lv, &lampdist)) == 0.f) return;
+	
+	VecCopyf(lacol, &lar->r);
+	
+	if(lar->mode & LA_TEXTURE) {
+		shi->osatex= 0;
+		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
+	}
+
+	VecMulf(lacol, visifac*lar->energy);
+
+	if (ELEM(lar->type, LA_SUN, LA_HEMI))
+		VECCOPY(lv, lar->vec);
+	VecMulf(lv, -1.0f);
+	
+	if (shi->mat->vol.shade_type != MA_VOL_SHADE_NONE) {
+		Isect is;
+		
+		/* find minimum of volume bounds, or lamp coord */
+		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS)) {
+			float dist = VecLenf(co, hitco);
+			VlakRen *vlr = (VlakRen *)is.face;
+			
+			/* simple internal shadowing */
+			if (vlr->mat->material_type == MA_TYPE_SURFACE) {
+				lacol[0] = lacol[1] = lacol[2] = 0.0f;
+				return;
+			}
+
+			if (ELEM(lar->type, LA_SUN, LA_HEMI))
+				/* infinite lights, can never be inside volume */
+				atten_co = hitco;
+			else if ( lampdist < dist ) {
+				atten_co = lar->co;
+			} else
+				atten_co = hitco;
+			
+			vol_get_attenuation(shi, tr, co, atten_co, density, shade_stepsize);
+			
+			VecMulVecf(lacol, lacol, tr);
+		}
+		else {
+			/* Point is on the outside edge of the volume,
+			 * therefore no attenuation, full transmission.
+			 * Radiance from lamp remains unchanged */
+		}
+	}
+	
+	p = vol_get_phasefunc(shi, shi->mat->vol.phasefunc_type, shi->mat->vol.phasefunc_g, shi->view, lv);
+	VecMulf(lacol, p);
+	
+	scatter_fac = vol_get_scattering_fac(shi, co);
+	VecMulf(lacol, scatter_fac);
+}
+
+/* single scattering only for now */
+void vol_get_scattering(ShadeInput *shi, float *scatter_col, float *co, float stepsize, float density)
+{
+	ListBase *lights;
+	GroupObject *go;
+	LampRen *lar;
+	
+	scatter_col[0] = scatter_col[1] = scatter_col[2] = 0.f;
+	
+	lights= get_lights(shi);
+	for(go=lights->first; go; go= go->next)
+	{
+		float lacol[3] = {0.f, 0.f, 0.f};
+		lar= go->lampren;
+		
+		if (lar) {
+			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
+			VecAddf(scatter_col, scatter_col, lacol);
+		}
+	}
+}
+
+	
+/*
+The main volumetric integrator, using an emission/absorption/scattering model.
+
+Incoming radiance = 
+
+outgoing radiance from behind surface * beam transmittance/attenuation
++ added radiance from all points along the ray due to participating media
+	--> radiance for each segment = 
+		(radiance added by scattering + radiance added by emission) * beam transmittance/attenuation
+*/
+static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
+{
+	float tr[3] = {1.0f, 1.0f, 1.0f};
+	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
+	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
+	int nsteps, s;
+	float emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
+	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
+	float density;
+	const float depth_cutoff = shi->mat->vol.depth_cutoff;
+
+	/* ray marching */
+	nsteps = (int)((VecLenf(co, endco) / stepsize) + 0.5);
+	
+	VecSubf(stepvec, endco, co);
+	VecMulf(stepvec, 1.0f / nsteps);
+	VecCopyf(step_sta, co);
+	VecAddf(step_end, step_sta, stepvec);
+	
+	/* get radiance from all points along the ray due to participating media */
+	for (s = 0; s < nsteps; s++) {
+
+		density = vol_get_density(shi, step_sta);
+		
+		/* there's only any use in shading here if there's actually some density to shade! */
+		if (density > 0.01f) {
+		
+			/* transmittance component (alpha) */
+			vol_get_attenuation_seg(shi, tr, stepsize, co, density);
+
+			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
+			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
+			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
+		
+			/* incoming light via emission or scattering (additive) */
+			vol_get_emission(shi, emit_col, step_mid, density);
+			
+			if (shi->obi->volume_precache)
+				vol_get_precached_scattering(shi, scatter_col, step_mid);
+			else
+				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
+			
+			VecMulf(scatter_col, density);
+			VecAddf(d_radiance, emit_col, scatter_col);
+			
+			/*   Lv += Tr * (Lve() + Ld) */
+			VecMulVecf(d_radiance, tr, d_radiance);
+			VecMulf(d_radiance, stepsize);
+			
+			VecAddf(radiance, radiance, d_radiance);	
+		}
+
+		VecCopyf(step_sta, step_end);
+		VecAddf(step_end, step_end, stepvec);
+		
+		/* luminance rec. 709 */
+		if ((0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]) < depth_cutoff) break;	
+	}
+	
+	/* multiply original color (behind volume) with beam transmittance over entire distance */
+	VecMulVecf(col, tr, col);	
+	VecAddf(col, col, radiance);
+	
+	/* alpha <-- transmission luminance */
+	col[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);
+}
+
+/* the main entry point for volume shading */
+static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int inside_volume)
+{
+	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
+	float *startco, *endco;
+	int trace_behind = 1;
+	const int ztransp= ((shi->depth==0) && (shi->mat->mode & MA_TRANSP) && (shi->mat->mode & MA_ZTRANSP));
+	Isect is;
+
+	/* check for shading an internal face a volume object directly */
+	if (inside_volume == VOL_SHADE_INSIDE)
+		trace_behind = 0;
+	else if (inside_volume == VOL_SHADE_OUTSIDE) {
+		if (shi->flippednor)
+			inside_volume = VOL_SHADE_INSIDE;
+	}
+	
+	if (ztransp && inside_volume == VOL_SHADE_INSIDE) {
+		MatInside *mi;
+		int render_this=0;
+		
+		/* don't render the backfaces of ztransp volume materials.
+		 
+		 * volume shading renders the internal volume from between the
+		 * near view intersection of the solid volume to the
+		 * intersection on the other side, as part of the shading of
+		 * the front face.
+		 
+		 * Because ztransp renders both front and back faces independently
+		 * this will double up, so here we prevent rendering the backface as well, 
+		 * which would otherwise render the volume in between the camera and the backface
+		 * --matt */
+		
+		for (mi=R.render_volumes_inside.first; mi; mi=mi->next) {
+			/* weak... */
+			if (mi->ma == shi->mat) render_this=1;
+		}
+		if (!render_this) return;
+	}
+	
+
+	if (inside_volume == VOL_SHADE_INSIDE)
+	{
+		startco = shi->camera_co;
+		endco = shi->co;
+		
+		if (trace_behind) {
+			if (!ztransp)
+				/* trace behind the volume object */
+				vol_trace_behind(shi, shi->vlr, endco, col);
+		} else {
+			/* we're tracing through the volume between the camera 
+			 * and a solid surface, so use that pre-shaded radiance */
+			QUATCOPY(col, shr->combined);
+		}
+		
+		/* shade volume from 'camera' to 1st hit point */
+		volumeintegrate(shi, col, startco, endco);
+	}
+	/* trace to find a backface, the other side bounds of the volume */
+	/* (ray intersect ignores front faces here) */
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH))
+	{
+		VlakRen *vlr = (VlakRen *)is.face;
+		
+		startco = shi->co;
+		endco = hitco;
+		
+		if (!ztransp) {
+			/* if it's another face in the same material */
+			if (vlr->mat == shi->mat) {
+				/* trace behind the 2nd (raytrace) hit point */
+				vol_trace_behind(shi, (VlakRen *)is.face, endco, col);
+			} else {
+				shade_intersection(shi, col, &is);
+			}
+		}
+		
+		/* shade volume from 1st hit point to 2nd hit point */
+		volumeintegrate(shi, col, startco, endco);
+	}
+	
+	if (ztransp)
+		col[3] = col[3]>1.f?1.f:col[3];
+	else
+		col[3] = 1.f;
+	
+	VecCopyf(shr->combined, col);
+	shr->alpha = col[3];
+	
+	VECCOPY(shr->diff, shr->combined);
+}
+
+/* Traces a shadow through the object, 
+ * pretty much gets the transmission over a ray path */
+void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
+{
+	float hitco[3];
+	float tr[3] = {1.0,1.0,1.0};
+	Isect is;
+	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
+	float *startco, *endco;
+	float density=0.f;
+
+	memset(shr, 0, sizeof(ShadeResult));
+	
+	/* if 1st hit normal is facing away from the camera, 
+	 * then we're inside the volume already. */
+	if (shi->flippednor) {
+		startco = last_is->start;
+		endco = shi->co;
+	}
+	/* trace to find a backface, the other side bounds of the volume */
+	/* (ray intersect ignores front faces here) */
+	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
+		startco = shi->co;
+		endco = hitco;
+	}
+	else {
+		shr->combined[0] = shr->combined[1] = shr->combined[2] = 0.f;
+		shr->alpha = shr->combined[3] = 1.f;
+		return;
+	}
+	
+	density = vol_get_density(shi, startco);
+	vol_get_attenuation(shi, tr, startco, endco, density, shade_stepsize);
+	
+	VecCopyf(shr->combined, tr);
+	shr->combined[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);
+	shr->alpha = shr->combined[3];
+}
+
+
+/* delivers a fully filled in ShadeResult, for all passes */
+void shade_volume_outside(ShadeInput *shi, ShadeResult *shr)
+{
+	memset(shr, 0, sizeof(ShadeResult));
+	volume_trace(shi, shr, VOL_SHADE_OUTSIDE);
+}
+
+
+void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
+{
+	MatInside *m;
+	Material *mat_backup;
+	
+	//if (BLI_countlist(&R.render_volumes_inside) == 0) return;
+	
+	/* XXX: extend to multiple volumes perhaps later */
+	mat_backup = shi->mat;
+	m = R.render_volumes_inside.first;
+	shi->mat = m->ma;
+	
+	volume_trace(shi, shr, VOL_SHADE_INSIDE);
+
+	shi->mat = mat_backup;
+}=======
 /**
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -686,3 +1375,4 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 
 	shi->mat = mat_backup;
 }
+>>>>>>> .r22793

From 740752da12543c5d6183a6956ed4f439693ba288 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 26 Aug 2009 06:51:26 +0000
Subject: [PATCH 279/577] * Hopefully fix some weird merging business

---
 .../render/intern/include/volume_precache.h   |  38 +-
 .../blender/render/intern/source/volumetric.c | 692 +-----------------
 2 files changed, 2 insertions(+), 728 deletions(-)

diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index 93620dc9bf4..9d87a219c82 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 /**
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -31,39 +30,4 @@ void volume_precache(Render *re);
 void free_volume_precache(Render *re);
 int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
 
-#define VOL_MS_TIMESTEP	0.1f=======
-/**
- *
- * ***** 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.
- *
- * 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): Matt Ebb.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
- 
-void volume_precache(Render *re);
-void free_volume_precache(Render *re);
-int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
-int using_lightcache(Material *ma);
-
-#define VOL_MS_TIMESTEP	0.1f
->>>>>>> .r22793
+#define VOL_MS_TIMESTEP	0.1f
\ No newline at end of file
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 441237dab79..046a145e9da 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 /**
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -686,693 +685,4 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 	volume_trace(shi, shr, VOL_SHADE_INSIDE);
 
 	shi->mat = mat_backup;
-}=======
-/**
- *
- * ***** 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.
- *
- * 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): Matt Ebb, Raul Fernandez Hernandez (Farsthary)
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_arithb.h"
-#include "BLI_rand.h"
-#include "BLI_voxel.h"
-
-#include "RE_shader_ext.h"
-#include "RE_raytrace.h"
-
-#include "DNA_material_types.h"
-#include "DNA_group_types.h"
-#include "DNA_lamp_types.h"
-
-#include "BKE_global.h"
-
-#include "render_types.h"
-#include "pixelshading.h"
-#include "shading.h"
-#include "texture.h"
-#include "volumetric.h"
-#include "volume_precache.h"
-
-#if defined( _MSC_VER ) && !defined( __cplusplus )
-# define inline __inline
-#endif // defined( _MSC_VER ) && !defined( __cplusplus )
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
-/* only to be used here in this file, it's for speed */
-extern struct Render R;
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
-/* tracing */
-
-static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, Isect *isect, int intersect_type)
-{
-	float maxsize = RE_ray_tree_max_size(R.raytree);
-	
-	/* XXX TODO - get raytrace max distance from object instance's bounding box */
-	/* need to account for scaling only, but keep coords in camera space...
-	 * below code is WIP and doesn't work!
-	VecSubf(bb_dim, shi->obi->obr->boundbox[1], shi->obi->obr->boundbox[2]);
-	Mat3MulVecfl(shi->obi->nmat, bb_dim);
-	maxsize = VecLength(bb_dim);
-	*/
-	
-	VECCOPY(isect->start, co);
-	isect->end[0] = co[0] + vec[0] * maxsize;
-	isect->end[1] = co[1] + vec[1] * maxsize;
-	isect->end[2] = co[2] + vec[2] * maxsize;
-	
-	isect->mode= RE_RAY_MIRROR;
-	isect->oborig= RAY_OBJECT_SET(&R, shi->obi);
-	isect->face_last= NULL;
-	isect->ob_last= 0;
-	isect->lay= -1;
-	
-	if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr;
-	else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL;
-	
-	if(RE_ray_tree_intersect(R.raytree, isect))
-	{
-		hitco[0] = isect->start[0] + isect->labda*isect->vec[0];
-		hitco[1] = isect->start[1] + isect->labda*isect->vec[1];
-		hitco[2] = isect->start[2] + isect->labda*isect->vec[2];
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-static void shade_intersection(ShadeInput *shi, float *col, Isect *is)
-{
-	ShadeInput shi_new;
-	ShadeResult shr_new;
-	
-	memset(&shi_new, 0, sizeof(ShadeInput)); 
-	
-	shi_new.mask= shi->mask;
-	shi_new.osatex= shi->osatex;
-	shi_new.thread= shi->thread;
-	shi_new.depth = shi->depth + 1;
-	shi_new.volume_depth= shi->volume_depth + 1;
-	shi_new.xs= shi->xs;
-	shi_new.ys= shi->ys;
-	shi_new.lay= shi->lay;
-	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
-	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
-	shi_new.light_override= shi->light_override;
-	shi_new.mat_override= shi->mat_override;
-	
-	VECCOPY(shi_new.camera_co, is->start);
-	
-	memset(&shr_new, 0, sizeof(ShadeResult));
-	
-	/* hardcoded limit of 100 for now - prevents problems in weird geometry */
-	if (shi->volume_depth < 100) {
-		shade_ray(is, &shi_new, &shr_new);
-	}
-	
-	VecCopyf(col, shr_new.combined);
-	col[3] = shr_new.alpha;
-}
-
-static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *col)
-{
-	Isect isect;
-	float maxsize = RE_ray_tree_max_size(R.raytree);
-	
-	VECCOPY(isect.start, co);
-	isect.end[0] = isect.start[0] + shi->view[0] * maxsize;
-	isect.end[1] = isect.start[1] + shi->view[1] * maxsize;
-	isect.end[2] = isect.start[2] + shi->view[2] * maxsize;
-	
-	isect.faceorig= (RayFace *)vlr;
-	
-	isect.mode= RE_RAY_MIRROR;
-	isect.oborig= RAY_OBJECT_SET(&R, shi->obi);
-	isect.face_last= NULL;
-	isect.ob_last= 0;
-	isect.lay= -1;
-	
-	/* check to see if there's anything behind the volume, otherwise shade the sky */
-	if(RE_ray_tree_intersect(R.raytree, &isect)) {
-		shade_intersection(shi, col, &isect);
-	} else {
-		shadeSkyView(col, co, shi->view, NULL, shi->thread);
-		shadeSunView(col, shi->view);
-	}
-}
-
-/* input shader data */
-
-float vol_get_stepsize(struct ShadeInput *shi, int context)
-{
-	if (shi->mat->vol.stepsize_type == MA_VOL_STEP_RANDOMIZED) {
-		/* range between 0.75 and 1.25 */
-		const float rnd = 0.5f * BLI_thread_frand(shi->thread) + 0.75f;
-	
-		if (context == STEPSIZE_VIEW)
-			return shi->mat->vol.stepsize * rnd;
-		else if (context == STEPSIZE_SHADE)
-			return shi->mat->vol.shade_stepsize * rnd;
-	}
-	else {	// MA_VOL_STEP_CONSTANT
-		
-		if (context == STEPSIZE_VIEW)
-			return shi->mat->vol.stepsize;
-		else if (context == STEPSIZE_SHADE)
-			return shi->mat->vol.shade_stepsize;
-	}
-	
-	return shi->mat->vol.stepsize;
-}
-
-/* trilinear interpolation */
-static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
-{
-	VolumePrecache *vp = shi->obi->volume_precache;
-	float bbmin[3], bbmax[3], dim[3];
-	float sample_co[3];
-	
-	if (!vp) return;
-	
-	/* convert input coords to 0.0, 1.0 */
-	VECCOPY(bbmin, shi->obi->obr->boundbox[0]);
-	VECCOPY(bbmax, shi->obi->obr->boundbox[1]);
-	VecSubf(dim, bbmax, bbmin);
-
-	sample_co[0] = ((co[0] - bbmin[0]) / dim[0]);
-	sample_co[1] = ((co[1] - bbmin[1]) / dim[1]);
-	sample_co[2] = ((co[2] - bbmin[2]) / dim[2]);
-
-	scatter_col[0] = voxel_sample_trilinear(vp->data_r, vp->res, sample_co);
-	scatter_col[1] = voxel_sample_trilinear(vp->data_g, vp->res, sample_co);
-	scatter_col[2] = voxel_sample_trilinear(vp->data_b, vp->res, sample_co);
-}
-
-float vol_get_density(struct ShadeInput *shi, float *co)
-{
-	float density = shi->mat->vol.density;
-	float density_scale = shi->mat->vol.density_scale;
-	float col[3] = {0.0, 0.0, 0.0};
-	
-	do_volume_tex(shi, co, MAP_DENSITY, col, &density);
-	
-	return density * density_scale;
-}
-
-/* scattering multiplier, values above 1.0 are non-physical, 
- * but can be useful to tweak lighting */
-float vol_get_scattering_fac(ShadeInput *shi, float *co)
-{
-	float scatter = shi->mat->vol.scattering;
-	float col[3] = {0.0, 0.0, 0.0};
-	
-	do_volume_tex(shi, co, MAP_SCATTERING, col, &scatter);
-	
-	return scatter;
-}
-
-/* compute emission component, amount of radiance to add per segment
- * can be textured with 'emit' */
-void vol_get_emission(ShadeInput *shi, float *emission_col, float *co, float density)
-{
-	float emission = shi->mat->vol.emission;
-	VECCOPY(emission_col, shi->mat->vol.emission_col);
-	
-	do_volume_tex(shi, co, MAP_EMISSION+MAP_EMISSION_COL, emission_col, &emission);
-	
-	emission_col[0] = emission_col[0] * emission * density;
-	emission_col[1] = emission_col[1] * emission * density;
-	emission_col[2] = emission_col[2] * emission * density;
-}
-
-void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
-{
-	float absorption = shi->mat->vol.absorption;
-	VECCOPY(absorb_col, shi->mat->vol.absorption_col);
-	
-	do_volume_tex(shi, co, MAP_ABSORPTION+MAP_ABSORPTION_COL, absorb_col, &absorption);
-	
-	absorb_col[0] = (1.0f - absorb_col[0]) * absorption;
-	absorb_col[1] = (1.0f - absorb_col[1]) * absorption;
-	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
-}
-
-
-/* phase function - determines in which directions the light 
- * is scattered in the volume relative to incoming direction 
- * and view direction */
-float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w, float *wp)
-{
-	const float costheta = Inpf(w, wp);
-	const float scale = M_PI;
-	
-	/*
-	 * Scale constant is required, since Blender's shading system doesn't normalise for
-	 * energy conservation - eg. scaling by 1/pi for a lambert shader.
-	 * This makes volumes darker than other solid objects, for the same lighting intensity.
-	 * To correct this, scale up the phase function values
-	 * until Blender's shading system supports this better. --matt
-	 */
-	
-	switch (phasefunc_type) {
-		case MA_VOL_PH_MIEHAZY:
-			return scale * (0.5f + 4.5f * powf(0.5 * (1.f + costheta), 8.f)) / (4.f*M_PI);
-		case MA_VOL_PH_MIEMURKY:
-			return scale * (0.5f + 16.5f * powf(0.5 * (1.f + costheta), 32.f)) / (4.f*M_PI);
-		case MA_VOL_PH_RAYLEIGH:
-			return scale * 3.f/(16.f*M_PI) * (1 + costheta * costheta);
-		case MA_VOL_PH_HG:
-			return scale * (1.f / (4.f * M_PI) * (1.f - g*g) / powf(1.f + g*g - 2.f * g * costheta, 1.5f));
-		case MA_VOL_PH_SCHLICK:
-		{
-			const float k = 1.55f * g - .55f * g * g * g;
-			const float kcostheta = k * costheta;
-			return scale * (1.f / (4.f * M_PI) * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta)));
-		}
-		case MA_VOL_PH_ISOTROPIC:
-		default:
-			return scale * (1.f / (4.f * M_PI));
-	}
-}
-
-/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
- * Used in the relationship Transmittance = e^(-attenuation)
- */
-void vol_get_attenuation_seg(ShadeInput *shi, float *transmission, float stepsize, float *co, float density)
-{
-	/* input density = density at co */
-	float tau[3] = {0.f, 0.f, 0.f};
-	float absorb_col[3];
-
-	vol_get_absorption(shi, absorb_col, co);
-	
-	/* homogenous volume within the sampled distance */
-	tau[0] = stepsize * density * absorb_col[0];
-	tau[1] = stepsize * density * absorb_col[1];
-	tau[2] = stepsize * density * absorb_col[2];
-	
-	transmission[0] *= exp(-tau[0]);
-	transmission[1] *= exp(-tau[1]);
-	transmission[2] *= exp(-tau[2]);
-}
-
-/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
- * Used in the relationship Transmittance = e^(-attenuation)
- */
-void vol_get_attenuation(ShadeInput *shi, float *transmission, float *co, float *endco, float density, float stepsize)
-{
-	/* input density = density at co */
-	float tau[3] = {0.f, 0.f, 0.f};
-	float absorb_col[3];
-	int s, nsteps;
-	float step_vec[3], step_sta[3], step_end[3];
-	const float dist = VecLenf(co, endco);
-
-	vol_get_absorption(shi, absorb_col, co);
-
-	nsteps = (int)((dist / stepsize) + 0.5);
-	
-	VecSubf(step_vec, endco, co);
-	VecMulf(step_vec, 1.0f / nsteps);
-	
-	VecCopyf(step_sta, co);
-	VecAddf(step_end, step_sta, step_vec);
-	
-	for (s = 0;  s < nsteps; s++) {
-		if (s > 0)
-			density = vol_get_density(shi, step_sta);
-		
-		tau[0] += stepsize * density;
-		tau[1] += stepsize * density;
-		tau[2] += stepsize * density;
-		
-		if (s < nsteps-1) {
-			VecCopyf(step_sta, step_end);
-			VecAddf(step_end, step_end, step_vec);
-		}
-	}
-	VecMulVecf(tau, tau, absorb_col);
-	
-	transmission[0] *= exp(-tau[0]);
-	transmission[1] *= exp(-tau[1]);
-	transmission[2] *= exp(-tau[2]);
-}
-
-void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *lacol, float stepsize, float density)
-{
-	float visifac, lv[3], lampdist;
-	float tr[3]={1.0,1.0,1.0};
-	float hitco[3], *atten_co;
-	float p;
-	float scatter_fac;
-	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
-	
-	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
-	if ((lar->lay & shi->lay)==0) return;
-	if (lar->energy == 0.0) return;
-	
-	if ((visifac= lamp_get_visibility(lar, co, lv, &lampdist)) == 0.f) return;
-	
-	VecCopyf(lacol, &lar->r);
-	
-	if(lar->mode & LA_TEXTURE) {
-		shi->osatex= 0;
-		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
-	}
-
-	VecMulf(lacol, visifac*lar->energy);
-
-	if (ELEM(lar->type, LA_SUN, LA_HEMI))
-		VECCOPY(lv, lar->vec);
-	VecMulf(lv, -1.0f);
-	
-	if (shi->mat->vol.shade_type != MA_VOL_SHADE_NONE) {
-		Isect is;
-		
-		/* find minimum of volume bounds, or lamp coord */
-		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS)) {
-			float dist = VecLenf(co, hitco);
-			VlakRen *vlr = (VlakRen *)is.face;
-			
-			/* simple internal shadowing */
-			if (vlr->mat->material_type == MA_TYPE_SURFACE) {
-				lacol[0] = lacol[1] = lacol[2] = 0.0f;
-				return;
-			}
-
-			if (ELEM(lar->type, LA_SUN, LA_HEMI))
-				/* infinite lights, can never be inside volume */
-				atten_co = hitco;
-			else if ( lampdist < dist ) {
-				atten_co = lar->co;
-			} else
-				atten_co = hitco;
-			
-			vol_get_attenuation(shi, tr, co, atten_co, density, shade_stepsize);
-			
-			VecMulVecf(lacol, lacol, tr);
-		}
-		else {
-			/* Point is on the outside edge of the volume,
-			 * therefore no attenuation, full transmission.
-			 * Radiance from lamp remains unchanged */
-		}
-	}
-	
-	p = vol_get_phasefunc(shi, shi->mat->vol.phasefunc_type, shi->mat->vol.phasefunc_g, shi->view, lv);
-	VecMulf(lacol, p);
-	
-	scatter_fac = vol_get_scattering_fac(shi, co);
-	VecMulf(lacol, scatter_fac);
-}
-
-/* single scattering only for now */
-void vol_get_scattering(ShadeInput *shi, float *scatter_col, float *co, float stepsize, float density)
-{
-	ListBase *lights;
-	GroupObject *go;
-	LampRen *lar;
-	
-	scatter_col[0] = scatter_col[1] = scatter_col[2] = 0.f;
-	
-	lights= get_lights(shi);
-	for(go=lights->first; go; go= go->next)
-	{
-		float lacol[3] = {0.f, 0.f, 0.f};
-		lar= go->lampren;
-		
-		if (lar) {
-			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
-			VecAddf(scatter_col, scatter_col, lacol);
-		}
-	}
-}
-
-	
-/*
-The main volumetric integrator, using an emission/absorption/scattering model.
-
-Incoming radiance = 
-
-outgoing radiance from behind surface * beam transmittance/attenuation
-+ added radiance from all points along the ray due to participating media
-	--> radiance for each segment = 
-		(radiance added by scattering + radiance added by emission) * beam transmittance/attenuation
-*/
-static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float *endco)
-{
-	float tr[3] = {1.0f, 1.0f, 1.0f};
-	float radiance[3] = {0.f, 0.f, 0.f}, d_radiance[3] = {0.f, 0.f, 0.f};
-	float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
-	int nsteps, s;
-	float emit_col[3], scatter_col[3] = {0.0, 0.0, 0.0};
-	float stepvec[3], step_sta[3], step_end[3], step_mid[3];
-	float density;
-	const float depth_cutoff = shi->mat->vol.depth_cutoff;
-
-	/* ray marching */
-	nsteps = (int)((VecLenf(co, endco) / stepsize) + 0.5);
-	
-	VecSubf(stepvec, endco, co);
-	VecMulf(stepvec, 1.0f / nsteps);
-	VecCopyf(step_sta, co);
-	VecAddf(step_end, step_sta, stepvec);
-	
-	/* get radiance from all points along the ray due to participating media */
-	for (s = 0; s < nsteps; s++) {
-
-		density = vol_get_density(shi, step_sta);
-		
-		/* there's only any use in shading here if there's actually some density to shade! */
-		if (density > 0.01f) {
-		
-			/* transmittance component (alpha) */
-			vol_get_attenuation_seg(shi, tr, stepsize, co, density);
-
-			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
-			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
-			step_mid[2] = step_sta[2] + (stepvec[2] * 0.5);
-		
-			/* incoming light via emission or scattering (additive) */
-			vol_get_emission(shi, emit_col, step_mid, density);
-			
-			if (using_lightcache(shi->mat)) {
-				vol_get_precached_scattering(shi, scatter_col, step_mid);
-			} else
-				vol_get_scattering(shi, scatter_col, step_mid, stepsize, density);
-			
-			VecMulf(scatter_col, density);
-			VecAddf(d_radiance, emit_col, scatter_col);
-			
-			/*   Lv += Tr * (Lve() + Ld) */
-			VecMulVecf(d_radiance, tr, d_radiance);
-			VecMulf(d_radiance, stepsize);
-			
-			VecAddf(radiance, radiance, d_radiance);	
-		}
-
-		VecCopyf(step_sta, step_end);
-		VecAddf(step_end, step_end, stepvec);
-		
-		/* luminance rec. 709 */
-		if ((0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]) < depth_cutoff) break;	
-	}
-	
-	/* multiply original color (behind volume) with beam transmittance over entire distance */
-	VecMulVecf(col, tr, col);	
-	VecAddf(col, col, radiance);
-	
-	/* alpha <-- transmission luminance */
-	col[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);
-}
-
-/* the main entry point for volume shading */
-static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int inside_volume)
-{
-	float hitco[3], col[4] = {0.f,0.f,0.f,0.f};
-	float *startco, *endco;
-	int trace_behind = 1;
-	const int ztransp= ((shi->depth==0) && (shi->mat->mode & MA_TRANSP) && (shi->mat->mode & MA_ZTRANSP));
-	Isect is;
-
-	/* check for shading an internal face a volume object directly */
-	if (inside_volume == VOL_SHADE_INSIDE)
-		trace_behind = 0;
-	else if (inside_volume == VOL_SHADE_OUTSIDE) {
-		if (shi->flippednor)
-			inside_volume = VOL_SHADE_INSIDE;
-	}
-	
-	if (ztransp && inside_volume == VOL_SHADE_INSIDE) {
-		MatInside *mi;
-		int render_this=0;
-		
-		/* don't render the backfaces of ztransp volume materials.
-		 
-		 * volume shading renders the internal volume from between the
-		 * near view intersection of the solid volume to the
-		 * intersection on the other side, as part of the shading of
-		 * the front face.
-		 
-		 * Because ztransp renders both front and back faces independently
-		 * this will double up, so here we prevent rendering the backface as well, 
-		 * which would otherwise render the volume in between the camera and the backface
-		 * --matt */
-		
-		for (mi=R.render_volumes_inside.first; mi; mi=mi->next) {
-			/* weak... */
-			if (mi->ma == shi->mat) render_this=1;
-		}
-		if (!render_this) return;
-	}
-	
-
-	if (inside_volume == VOL_SHADE_INSIDE)
-	{
-		startco = shi->camera_co;
-		endco = shi->co;
-		
-		if (trace_behind) {
-			if (!ztransp)
-				/* trace behind the volume object */
-				vol_trace_behind(shi, shi->vlr, endco, col);
-		} else {
-			/* we're tracing through the volume between the camera 
-			 * and a solid surface, so use that pre-shaded radiance */
-			QUATCOPY(col, shr->combined);
-		}
-		
-		/* shade volume from 'camera' to 1st hit point */
-		volumeintegrate(shi, col, startco, endco);
-	}
-	/* trace to find a backface, the other side bounds of the volume */
-	/* (ray intersect ignores front faces here) */
-	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH))
-	{
-		VlakRen *vlr = (VlakRen *)is.face;
-		
-		startco = shi->co;
-		endco = hitco;
-		
-		if (!ztransp) {
-			/* if it's another face in the same material */
-			if (vlr->mat == shi->mat) {
-				/* trace behind the 2nd (raytrace) hit point */
-				vol_trace_behind(shi, (VlakRen *)is.face, endco, col);
-			} else {
-				shade_intersection(shi, col, &is);
-			}
-		}
-		
-		/* shade volume from 1st hit point to 2nd hit point */
-		volumeintegrate(shi, col, startco, endco);
-	}
-	
-	if (ztransp)
-		col[3] = col[3]>1.f?1.f:col[3];
-	else
-		col[3] = 1.f;
-	
-	VecCopyf(shr->combined, col);
-	shr->alpha = col[3];
-	
-	VECCOPY(shr->diff, shr->combined);
-}
-
-/* Traces a shadow through the object, 
- * pretty much gets the transmission over a ray path */
-void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is)
-{
-	float hitco[3];
-	float tr[3] = {1.0,1.0,1.0};
-	Isect is;
-	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
-	float *startco, *endco;
-	float density=0.f;
-
-	memset(shr, 0, sizeof(ShadeResult));
-	
-	/* if 1st hit normal is facing away from the camera, 
-	 * then we're inside the volume already. */
-	if (shi->flippednor) {
-		startco = last_is->start;
-		endco = shi->co;
-	}
-	/* trace to find a backface, the other side bounds of the volume */
-	/* (ray intersect ignores front faces here) */
-	else if (vol_get_bounds(shi, shi->co, shi->view, hitco, &is, VOL_BOUNDS_DEPTH)) {
-		startco = shi->co;
-		endco = hitco;
-	}
-	else {
-		shr->combined[0] = shr->combined[1] = shr->combined[2] = 0.f;
-		shr->alpha = shr->combined[3] = 1.f;
-		return;
-	}
-	
-	density = vol_get_density(shi, startco);
-	vol_get_attenuation(shi, tr, startco, endco, density, shade_stepsize);
-	
-	VecCopyf(shr->combined, tr);
-	shr->combined[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);
-	shr->alpha = shr->combined[3];
-}
-
-
-/* delivers a fully filled in ShadeResult, for all passes */
-void shade_volume_outside(ShadeInput *shi, ShadeResult *shr)
-{
-	memset(shr, 0, sizeof(ShadeResult));
-	volume_trace(shi, shr, VOL_SHADE_OUTSIDE);
-}
-
-
-void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
-{
-	MatInside *m;
-	Material *mat_backup;
-	
-	//if (BLI_countlist(&R.render_volumes_inside) == 0) return;
-	
-	/* XXX: extend to multiple volumes perhaps later */
-	mat_backup = shi->mat;
-	m = R.render_volumes_inside.first;
-	shi->mat = m->ma;
-	
-	volume_trace(shi, shr, VOL_SHADE_INSIDE);
-
-	shi->mat = mat_backup;
-}
->>>>>>> .r22793
+}
\ No newline at end of file

From 7abb8c4bde4973ed84348c96102204abdf353187 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 26 Aug 2009 07:59:58 +0000
Subject: [PATCH 280/577] this was causing failed build when the file was
 missing

---
 source/creator/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0d9d0fe8856..f563dec9575 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -139,7 +139,7 @@ IF(WITH_INSTALL)
         COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
         COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
 
-        COMMAND rm ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
+        COMMAND rm -f ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
         COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
         COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
         COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"

From 36b85d4508106752b0595fcb5150fd19f90b8739 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Wed, 26 Aug 2009 08:09:29 +0000
Subject: [PATCH 281/577] Changed default audio device from SDL to OpenAL after
 a discussion in IRC, we're testing if OpenAL works flawlessly on all
 plattforms and if so we'll keep it as default device as it supports 3D Audio
 for the GE what SDL doesn't.

---
 source/blender/blenkernel/intern/sound.c    | 13 +++----------
 source/blender/blenloader/intern/readfile.c |  6 +++---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index c6f9db6fda9..f6fb1ddcc5a 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -34,7 +34,7 @@
 void sound_init()
 {
 	AUD_Specs specs;
-	int device, buffersize, success;
+	int device, buffersize;
 
 	device = U.audiodevice;
 	buffersize = U.mixbufsize;
@@ -54,15 +54,8 @@ void sound_init()
 	if(specs.channels <= AUD_CHANNELS_INVALID)
 		specs.channels = AUD_CHANNELS_STEREO;
 
-	if(!AUD_init(device, specs, buffersize)) {
-		if(device == AUD_SDL_DEVICE)
-			success= AUD_init(AUD_OPENAL_DEVICE, specs, AUD_DEFAULT_BUFFER_SIZE*4);
-		else
-			success= AUD_init(AUD_SDL_DEVICE, specs, AUD_DEFAULT_BUFFER_SIZE*4);
-
-		if(!success)
-			AUD_init(AUD_NULL_DEVICE, specs, buffersize);
-	}
+	if(!AUD_init(device, specs, buffersize))
+		AUD_init(AUD_NULL_DEVICE, specs, buffersize);
 }
 
 void sound_exit()
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index aaba65b21af..877f23aad92 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9675,13 +9675,13 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
 	bfd->user->uifonts.first= bfd->user->uifonts.last= NULL;
 	bfd->user->uistyles.first= bfd->user->uistyles.last= NULL;
 
-	// AUD_XXX
+	// AUD_XXX that's bad because if the user has saved No Audio, it changes to OpenAL always
 	if(bfd->user->audiochannels == 0)
 		bfd->user->audiochannels = 2;
 	if(bfd->user->audiodevice == 0)
-		bfd->user->audiodevice = 1;
+		bfd->user->audiodevice = 2;
 	if(bfd->user->audioformat == 0)
-		bfd->user->audioformat = 0x12;
+		bfd->user->audioformat = 0x24;
 	if(bfd->user->audiorate == 0)
 		bfd->user->audiorate = 44100;
 

From adcb21b1f4b079f892e259446bab32c1bc74304f Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Wed, 26 Aug 2009 10:02:17 +0000
Subject: [PATCH 282/577] Close the old audio device before and not after
 opening the new.

---
 intern/audaspace/intern/AUD_C-API.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index 9481e2139e8..995d4c5f99e 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -77,6 +77,9 @@ int AUD_init(AUD_DeviceType device, AUD_Specs specs, int buffersize)
 #endif
 	AUD_IDevice* dev = NULL;
 
+	if(AUD_device)
+		AUD_exit();
+
 	try
 	{
 		switch(device)
@@ -107,9 +110,6 @@ int AUD_init(AUD_DeviceType device, AUD_Specs specs, int buffersize)
 			return false;
 		}
 
-		if(AUD_device)
-			AUD_exit();
-
 		AUD_device = dev;
 		if(AUD_device->checkCapability(AUD_CAPS_3D_DEVICE))
 			AUD_3ddevice = dynamic_cast<AUD_I3DDevice*>(AUD_device);

From 043ad7bc8e8e32161563798268727c1f42c9b3d6 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Wed, 26 Aug 2009 12:01:15 +0000
Subject: [PATCH 283/577] 2.5 - Grease Pencil Version 2 (Crude rebirth)

This commit is the start of the new Grease Pencil implementation. I've just ported the old code to make it work with operators, and to store its data in Grease-Pencil datablocks.

However, this is currently still really buggy, with only the barebones of the drawing/creation tools restored (no UI panels, no options). To use (not recommended), use D+S+move_mouse (and click when finished) for now. There are some rather serious event handling errors going on here...
---
 source/blender/blenloader/intern/readfile.c   |    4 +
 source/blender/editors/gpencil/drawgpencil.c  |    9 +-
 source/blender/editors/gpencil/gpencil_edit.c |    3 +
 .../blender/editors/gpencil/gpencil_intern.h  |   14 +-
 source/blender/editors/gpencil/gpencil_ops.c  |   68 +
 .../blender/editors/gpencil/gpencil_paint.c   | 1296 +++++++++++++++++
 source/blender/editors/include/ED_gpencil.h   |   14 +-
 source/blender/editors/space_api/spacetypes.c |    4 +-
 .../editors/space_view3d/view3d_draw.c        |    5 +-
 .../blender/editors/space_view3d/view3d_ops.c |    6 +-
 source/blender/makesdna/DNA_scene_types.h     |    4 +
 11 files changed, 1415 insertions(+), 12 deletions(-)
 create mode 100644 source/blender/editors/gpencil/gpencil_ops.c
 create mode 100644 source/blender/editors/gpencil/gpencil_paint.c

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 877f23aad92..913477198b8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4042,6 +4042,7 @@ static void lib_link_scene(FileData *fd, Main *main)
 			sce->world= newlibadr_us(fd, sce->id.lib, sce->world);
 			sce->set= newlibadr(fd, sce->id.lib, sce->set);
 			sce->ima= newlibadr_us(fd, sce->id.lib, sce->ima);
+			sce->gpd= newlibadr_us(fd, sce->id.lib, sce->gpd);
 			
 			link_paint(fd, sce, &sce->toolsettings->sculpt->paint);
 			link_paint(fd, sce, &sce->toolsettings->vpaint->paint);
@@ -10547,6 +10548,9 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
 
 	if(sce->r.dometext)
 		expand_doit(fd, mainvar, sce->gm.dome.warptext);
+		
+	if(sce->gpd)
+		expand_doit(fd, mainvar, sce->gpd);
 }
 
 static void expand_camera(FileData *fd, Main *mainvar, Camera *ca)
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 735f1ffddb9..242be943507 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -933,7 +933,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf)
 	
 	/* check that we have grease-pencil stuff to draw */
 	if (ELEM(NULL, sa, ibuf)) return;
-	gpd= gpencil_data_getactive(sa);
+	gpd= gpencil_data_getactive(C);
 	if (gpd == NULL) return;
 	
 	/* calculate rect */
@@ -1007,7 +1007,7 @@ void draw_gpencil_2dview (bContext *C, short onlyv2d)
 	
 	/* check that we have grease-pencil stuff to draw */
 	if (sa == NULL) return;
-	gpd= gpencil_data_getactive(sa);
+	gpd= gpencil_data_getactive(C);
 	if (gpd == NULL) return;
 	
 	/* draw it! */
@@ -1020,14 +1020,13 @@ void draw_gpencil_2dview (bContext *C, short onlyv2d)
  */
 void draw_gpencil_3dview (bContext *C, short only3d)
 {
-	ScrArea *sa= CTX_wm_area(C);
 	ARegion *ar= CTX_wm_region(C);
 	Scene *scene= CTX_data_scene(C);
 	bGPdata *gpd;
 	int dflag = 0;
 	
 	/* check that we have grease-pencil stuff to draw */
-	gpd= gpencil_data_getactive(sa);
+	gpd= gpencil_data_getactive(C);
 	if (gpd == NULL) return;
 	
 	/* draw it! */
@@ -1047,7 +1046,7 @@ void draw_gpencil_oglrender (bContext *C)
 	
 	/* assume gpencil data comes from v3d */
 	if (v3d == NULL) return;
-	gpd= v3d->gpd;
+	gpd= gpencil_data_getactive(C);
 	if (gpd == NULL) return;
 	
 	/* pass 1: draw 3d-strokes ------------ > */
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index ef4e09274f2..4480da45572 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -25,6 +25,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
  
+#if 0 // XXX COMPILE GUARDS FOR OLD CODE
+ 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -1697,3 +1699,4 @@ short gpencil_do_paint (bContext *C)
 }
 
 /* ************************************************** */
+#endif // XXX COMPILE GUARDS FOR OLD CODE
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 721d8544225..b134328c8a0 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -29,8 +29,20 @@
 #define ED_GPENCIL_INTERN_H
 
 /* internal exports only */
+
+
+/* ***************************************************** */
+/* Operator Defines */
+
+struct wmOperatorType;
+
+/* drawing ---------- */
+
+void GPENCIL_OT_draw(struct wmOperatorType *ot);
+
+
 /******************************************************* */
-/* FILTERED ACTION DATA - TYPES */
+/* FILTERED ACTION DATA - TYPES  ---> XXX DEPRECEATED OLD ANIM SYSTEM CODE! */
 
 /* XXX - TODO: replace this with the modern bAnimListElem... */
 /* This struct defines a structure used for quick access */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
new file mode 100644
index 00000000000..cb6d66b2fcc
--- /dev/null
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -0,0 +1,68 @@
+/**
+ * $Id: gpencil_ops.c 21617 2009-07-16 04:45:52Z aligorith $
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2009, Blender Foundation, Joshua Leung
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#include "BLI_blenlib.h"
+
+#include "DNA_windowmanager_types.h" 
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "gpencil_intern.h"
+
+/* ****************************************** */
+/* Generic Editing Keymap */
+
+void gpencil_common_keymap(wmWindowManager *wm, ListBase *keymap)
+{
+	wmKeymapItem *km;
+	
+	/* if no keymap provided, use default */
+	if (keymap == NULL)
+		keymap= WM_keymap_listbase(wm, "Grease Pencil Generic", 0, 0);
+	
+	/* Draw */
+	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", SKEY, KM_PRESS, 0, DKEY);
+}
+
+/* ****************************************** */
+
+void ED_operatortypes_gpencil (void)
+{
+	/* Drawing ----------------------- */
+	WM_operatortype_append(GPENCIL_OT_draw);
+}
+
+/* ****************************************** */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
new file mode 100644
index 00000000000..dc701924b3e
--- /dev/null
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -0,0 +1,1296 @@
+/* Grease Pencil  - version 2
+ * By Joshua Leung
+ */
+
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+
+#include "BKE_gpencil.h"
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_report.h"
+#include "BKE_utildefines.h"
+
+#include "DNA_gpencil_types.h"
+#include "DNA_action_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_view2d_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "UI_view2d.h"
+
+#include "ED_armature.h"
+#include "ED_gpencil.h"
+#include "ED_sequencer.h"
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "gpencil_intern.h"
+
+/* ******************************************* */
+/* Context Wrangling... */
+
+/* Get the active Grease Pencil datablock */
+// TODO: move this to a gpencil_utils.c? 
+bGPdata *gpencil_data_getactive (bContext *C)
+{
+	Scene *scene= CTX_data_scene(C);
+	ScrArea *sa= CTX_wm_area(C);
+	
+	/* if there's an active area, check if the particular editor may
+	 * have defined any special Grease Pencil context for editing...
+	 */
+	if (sa) {
+		switch (sa->spacetype) {
+			case SPACE_VIEW3D: /* 3D-View */
+			{
+				Object *ob= CTX_data_active_object(C);
+				
+				/* just in case... */
+				if (ob) {
+					/* depending on the mode of the object, we may be able to get some GP data 
+					 * from different elements - i.e. bones...
+					 */
+					if (ob->mode & OB_MODE_POSE) {
+						//bPoseChannel *pchan= CTX_data_active_pchan(C);
+						
+						/* if posechannel has GP data, use that... */
+						//if (pchan && pchan->gpd)
+						//	return pchan->gpd;
+					}
+					
+					/* still here, so check if active Object has GP data */
+					//if (ob->gpd)
+					//	return ob->gpd;
+				}
+			}
+				break;
+			
+			case SPACE_NODE: /* Nodes Editor */
+			{
+				//SpaceNode *snode= (SpaceNode *)CTX_wm_space_data(C);
+				
+				/* return the GP data for the active node block/node */
+			}
+				break;
+				
+			case SPACE_SEQ: /* Sequencer */
+			{
+				//SpaceSeq *sseq= (SpaceSeq *)CTX_wm_space_data(C);
+				
+				/* return the GP data for the active strips/image/etc. */
+			}
+				break;
+		}
+	}
+	
+	/* just fall back on the scene's GP data */
+	return (scene) ? scene->gpd : NULL;
+}
+
+
+/* check if context is suitable for drawing */
+static int gpencil_draw_poll (bContext *C)
+{
+	// TODO: must check context for Grease Pencil data...
+	return 1;
+}
+
+/* ******************************************* */
+/* 'Globals' and Defines */
+
+/* Temporary 'Stroke' Operation data */
+typedef struct tGPsdata {
+	Scene *scene;       /* current scene from context */
+	ScrArea *sa;		/* area where painting originated */
+	ARegion *ar;        /* region where painting originated */
+	View2D *v2d;		/* needed for GP_STROKE_2DSPACE */
+	
+#if 0 // XXX review this 2d image stuff...
+	ImBuf *ibuf;		/* needed for GP_STROKE_2DIMAGE */
+	struct IBufViewSettings {
+		int offsx, offsy;			/* offsets */
+		int sizex, sizey;			/* dimensions to use as scale-factor */
+	} im2d_settings;	/* needed for GP_STROKE_2DIMAGE */
+#endif
+	
+	bGPdata *gpd;		/* gp-datablock layer comes from */
+	bGPDlayer *gpl;		/* layer we're working on */
+	bGPDframe *gpf;		/* frame we're working on */
+	
+	short status;		/* current status of painting */
+	short paintmode;	/* mode for painting */
+	
+	int mval[2];		/* current mouse-position */
+	int mvalo[2];		/* previous recorded mouse-position */
+	
+	float pressure;		/* current stylus pressure */
+	float opressure;	/* previous stylus pressure */
+	
+	short radius;		/* radius of influence for eraser */
+	short flags;		/* flags that can get set during runtime */
+} tGPsdata;
+
+/* values for tGPsdata->status */
+enum {
+	GP_STATUS_NORMAL = 0,	/* running normally */
+	GP_STATUS_ERROR,		/* something wasn't correctly set up */
+	GP_STATUS_DONE			/* painting done */
+};
+
+/* values for tGPsdata->paintmode */
+enum {
+	GP_PAINTMODE_DRAW = 0,
+	GP_PAINTMODE_ERASER
+};
+
+/* Return flags for adding points to stroke buffer */
+enum {
+	GP_STROKEADD_INVALID	= -2,		/* error occurred - insufficient info to do so */
+	GP_STROKEADD_OVERFLOW	= -1,		/* error occurred - cannot fit any more points */
+	GP_STROKEADD_NORMAL,				/* point was successfully added */
+	GP_STROKEADD_FULL					/* cannot add any more points to buffer */
+};
+
+/* Runtime flags */
+enum {
+	GP_PAINTFLAG_FIRSTRUN		= (1<<0),	/* operator just started */
+	GP_PAINTFLAG_STRAIGHTLINES	= (1<<1),	/* only take the endpoints of a stroke */
+};
+
+/* ------ */
+
+/* maximum sizes of gp-session buffer */
+#define GP_STROKE_BUFFER_MAX	5000
+
+/* Macros for accessing sensitivity thresholds... */
+	/* minimum number of pixels mouse should move before new point created */
+#define MIN_MANHATTEN_PX	(U.gp_manhattendist)
+	/* minimum length of new segment before new point can be added */
+#define MIN_EUCLIDEAN_PX	(U.gp_euclideandist)
+
+/* macro to test if only converting endpoints - only for use when converting!  */	
+// XXX for now, don't test for editpaint too...
+//#define GP_BUFFER2STROKE_ENDPOINTS ((gpd->flag & GP_DATA_EDITPAINT) && (p->flags & GP_PAINTFLAG_STRAIGHTLINES))
+#define GP_BUFFER2STROKE_ENDPOINTS ((p->flags & GP_PAINTFLAG_STRAIGHTLINES))
+
+/* ------ */
+/* Forward defines for some functions... */
+
+static void gp_session_validatebuffer(tGPsdata *p);
+
+/* ******************************************* */
+/* Calculations/Conversions */
+
+/* Stroke Editing ---------------------------- */
+
+/* check if the current mouse position is suitable for adding a new point */
+static short gp_stroke_filtermval (tGPsdata *p, int mval[2], int pmval[2])
+{
+	int dx= abs(mval[0] - pmval[0]);
+	int dy= abs(mval[1] - pmval[1]);
+	
+	/* check if mouse moved at least certain distance on both axes (best case) */
+	if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX))
+		return 1;
+	
+	/* check if the distance since the last point is significant enough */
+	// future optimisation: sqrt here may be too slow?
+	else if (sqrt(dx*dx + dy*dy) > MIN_EUCLIDEAN_PX)
+		return 1;
+	
+	/* mouse 'didn't move' */
+	else
+		return 0;
+}
+
+/* convert screen-coordinates to buffer-coordinates */
+// XXX this method needs a total overhaul!
+static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
+{
+	bGPdata *gpd= p->gpd;
+	
+	/* in 3d-space - pt->x/y/z are 3 side-by-side floats */
+	if (gpd->sbuffer_sflag & GP_STROKE_3DSPACE) {
+		View3D *v3d= p->sa->spacedata.first;
+		const short mx=mval[0], my=mval[1];
+		float *fp= give_cursor(p->scene, v3d); // XXX NULL could be v3d
+		float dvec[3];
+		
+		/* Current method just converts each point in screen-coordinates to 
+		 * 3D-coordinates using the 3D-cursor as reference. In general, this 
+		 * works OK, but it could of course be improved.
+		 *
+		 * TODO:
+		 *	- investigate using nearest point(s) on a previous stroke as
+		 *	  reference point instead or as offset, for easier stroke matching
+		 *	- investigate projection onto geometry (ala retopo)
+		 */
+		
+		/* method taken from editview.c - mouse_cursor() */
+		project_short_noclip(p->ar, fp, mval);
+		window_to_3d_delta(p->ar, dvec, mval[0]-mx, mval[1]-my);
+		VecSubf(out, fp, dvec);
+	}
+	
+	/* 2d - on 'canvas' (assume that p->v2d is set) */
+	else if ((gpd->sbuffer_sflag & GP_STROKE_2DSPACE) && (p->v2d)) {
+		float x, y;
+		
+		UI_view2d_region_to_view(p->v2d, mval[0], mval[1], &x, &y);
+		
+		out[0]= x;
+		out[1]= y;
+	}
+	
+#if 0
+	/* 2d - on image 'canvas' (assume that p->v2d is set) */
+	else if (gpd->sbuffer_sflag & GP_STROKE_2DIMAGE) {
+		int sizex, sizey, offsx, offsy;
+		
+		/* get stored settings 
+		 *	- assume that these have been set already (there are checks that set sane 'defaults' just in case)
+		 */
+		sizex= p->im2d_settings.sizex;
+		sizey= p->im2d_settings.sizey;
+		offsx= p->im2d_settings.offsx;
+		offsy= p->im2d_settings.offsy;
+		
+		/* calculate new points */
+		out[0]= (float)(mval[0] - offsx) / (float)sizex;
+		out[1]= (float)(mval[1] - offsy) / (float)sizey;
+	}
+#endif
+	
+	/* 2d - relative to screen (viewport area) */
+	else {
+		out[0] = (float)(mval[0]) / (float)(p->sa->winx) * 1000;
+		out[1] = (float)(mval[1]) / (float)(p->sa->winy) * 1000;
+	}
+}
+
+/* add current stroke-point to buffer (returns whether point was successfully added) */
+static short gp_stroke_addpoint (tGPsdata *p, int mval[2], float pressure)
+{
+	bGPdata *gpd= p->gpd;
+	tGPspoint *pt;
+	
+	/* check if still room in buffer */
+	if (gpd->sbuffer_size >= GP_STROKE_BUFFER_MAX)
+		return GP_STROKEADD_OVERFLOW;
+	
+	/* get pointer to destination point */
+	pt= ((tGPspoint *)(gpd->sbuffer) + gpd->sbuffer_size);
+	
+	/* store settings */
+	pt->x= mval[0];
+	pt->y= mval[1];
+	pt->pressure= pressure;
+	
+	/* increment counters */
+	gpd->sbuffer_size++;
+	
+	/* check if another operation can still occur */
+	if (gpd->sbuffer_size == GP_STROKE_BUFFER_MAX)
+		return GP_STROKEADD_FULL;
+	else
+		return GP_STROKEADD_NORMAL;
+}
+
+/* smooth a stroke (in buffer) before storing it */
+static void gp_stroke_smooth (tGPsdata *p)
+{
+	bGPdata *gpd= p->gpd;
+	int i=0, cmx=gpd->sbuffer_size;
+	
+	/* only smooth if smoothing is enabled, and we're not doing a straight line */
+	if (!(U.gp_settings & GP_PAINT_DOSMOOTH) || GP_BUFFER2STROKE_ENDPOINTS)
+		return;
+	
+	/* don't try if less than 2 points in buffer */
+	if ((cmx <= 2) || (gpd->sbuffer == NULL))
+		return;
+	
+	/* apply weighting-average (note doing this along path sequentially does introduce slight error) */
+	for (i=0; i < gpd->sbuffer_size; i++) {
+		tGPspoint *pc= (((tGPspoint *)gpd->sbuffer) + i);
+		tGPspoint *pb= (i-1 > 0)?(pc-1):(pc);
+		tGPspoint *pa= (i-2 > 0)?(pc-2):(pb);
+		tGPspoint *pd= (i+1 < cmx)?(pc+1):(pc);
+		tGPspoint *pe= (i+2 < cmx)?(pc+2):(pd);
+		
+		pc->x= (short)(0.1*pa->x + 0.2*pb->x + 0.4*pc->x + 0.2*pd->x + 0.1*pe->x);
+		pc->y= (short)(0.1*pa->y + 0.2*pb->y + 0.4*pc->y + 0.2*pd->y + 0.1*pe->y);
+	}
+}
+
+/* simplify a stroke (in buffer) before storing it 
+ *	- applies a reverse Chaikin filter
+ *	- code adapted from etch-a-ton branch (editarmature_sketch.c)
+ */
+static void gp_stroke_simplify (tGPsdata *p)
+{
+	bGPdata *gpd= p->gpd;
+	tGPspoint *old_points= (tGPspoint *)gpd->sbuffer;
+	short num_points= gpd->sbuffer_size;
+	short flag= gpd->sbuffer_sflag;
+	short i, j;
+	
+	/* only simplify if simlification is enabled, and we're not doing a straight line */
+	if (!(U.gp_settings & GP_PAINT_DOSIMPLIFY) || GP_BUFFER2STROKE_ENDPOINTS)
+		return;
+	
+	/* don't simplify if less than 4 points in buffer */
+	if ((num_points <= 2) || (old_points == NULL))
+		return;
+		
+	/* clear buffer (but don't free mem yet) so that we can write to it 
+	 *	- firstly set sbuffer to NULL, so a new one is allocated
+	 *	- secondly, reset flag after, as it gets cleared auto
+	 */
+	gpd->sbuffer= NULL;
+	gp_session_validatebuffer(p);
+	gpd->sbuffer_sflag = flag;
+	
+/* macro used in loop to get position of new point
+ *	- used due to the mixture of datatypes in use here
+ */
+#define GP_SIMPLIFY_AVPOINT(offs, sfac) \
+	{ \
+		co[0] += (float)(old_points[offs].x * sfac); \
+		co[1] += (float)(old_points[offs].y * sfac); \
+		pressure += old_points[offs].pressure * sfac; \
+	}
+	
+	for (i = 0, j = 0; i < num_points; i++)
+	{
+		if (i - j == 3)
+		{
+			float co[2], pressure;
+			int mco[2];
+			
+			/* initialise values */
+			co[0]= 0;
+			co[1]= 0;
+			pressure = 0;
+			
+			/* using macro, calculate new point */
+			GP_SIMPLIFY_AVPOINT(j, -0.25f);
+			GP_SIMPLIFY_AVPOINT(j+1, 0.75f);
+			GP_SIMPLIFY_AVPOINT(j+2, 0.75f);
+			GP_SIMPLIFY_AVPOINT(j+3, -0.25f);
+			
+			/* set values for adding */
+			mco[0]= (int)co[0];
+			mco[1]= (int)co[1];
+			
+			/* ignore return values on this... assume to be ok for now */
+			gp_stroke_addpoint(p, mco, pressure);
+			
+			j += 2;
+		}
+	} 
+	
+	/* free old buffer */
+	MEM_freeN(old_points);
+}
+
+
+/* make a new stroke from the buffer data */
+static void gp_stroke_newfrombuffer (tGPsdata *p)
+{
+	bGPdata *gpd= p->gpd;
+	bGPDstroke *gps;
+	bGPDspoint *pt;
+	tGPspoint *ptc;
+	int i, totelem;
+	
+	/* get total number of points to allocate space for:
+	 *	- in 'Draw Mode', holding the Ctrl-Modifier will only take endpoints
+	 *	- otherwise, do whole stroke
+	 */
+	if (GP_BUFFER2STROKE_ENDPOINTS)
+		totelem = (gpd->sbuffer_size >= 2) ? 2: gpd->sbuffer_size;
+	else
+		totelem = gpd->sbuffer_size;
+	
+	/* exit with error if no valid points from this stroke */
+	if (totelem == 0) {
+		if (G.f & G_DEBUG) 
+			printf("Error: No valid points in stroke buffer to convert (tot=%d) \n", gpd->sbuffer_size);
+		return;
+	}
+	
+	/* allocate memory for a new stroke */
+	gps= MEM_callocN(sizeof(bGPDstroke), "gp_stroke");
+	
+	/* allocate enough memory for a continuous array for storage points */
+	pt= gps->points= MEM_callocN(sizeof(bGPDspoint)*totelem, "gp_stroke_points");
+	
+	/* copy appropriate settings for stroke */
+	gps->totpoints= totelem;
+	gps->thickness= p->gpl->thickness;
+	gps->flag= gpd->sbuffer_sflag;
+	
+	/* copy points from the buffer to the stroke */
+	if (GP_BUFFER2STROKE_ENDPOINTS) {
+		/* 'Draw Mode' + Ctrl-Modifier - only endpoints */
+		{
+			/* first point */
+			ptc= gpd->sbuffer;
+			
+			/* convert screen-coordinates to appropriate coordinates (and store them) */
+			gp_stroke_convertcoords(p, &ptc->x, &pt->x);
+			
+			/* copy pressure */
+			pt->pressure= ptc->pressure;
+			
+			pt++;
+		}
+			
+		if (totelem == 2) {
+			/* last point if applicable */
+			ptc= ((tGPspoint *)gpd->sbuffer) + (gpd->sbuffer_size - 1);
+			
+			/* convert screen-coordinates to appropriate coordinates (and store them) */
+			gp_stroke_convertcoords(p, &ptc->x, &pt->x);
+			
+			/* copy pressure */
+			pt->pressure= ptc->pressure;
+		}
+	}
+	else {
+		/* convert all points (normal behaviour) */
+		for (i=0, ptc=gpd->sbuffer; i < gpd->sbuffer_size && ptc; i++, ptc++) {
+			/* convert screen-coordinates to appropriate coordinates (and store them) */
+			gp_stroke_convertcoords(p, &ptc->x, &pt->x);
+			
+			/* copy pressure */
+			pt->pressure= ptc->pressure;
+			
+			pt++;
+		}
+	}
+	
+	/* add stroke to frame */
+	BLI_addtail(&p->gpf->strokes, gps);
+}
+
+/* --- 'Eraser' for 'Paint' Tool ------ */
+
+/* eraser tool - remove segment from stroke/split stroke (after lasso inside) */
+static short gp_stroke_eraser_splitdel (bGPDframe *gpf, bGPDstroke *gps, int i)
+{
+	bGPDspoint *pt_tmp= gps->points;
+	bGPDstroke *gsn = NULL;
+
+	/* if stroke only had two points, get rid of stroke */
+	if (gps->totpoints == 2) {
+		/* free stroke points, then stroke */
+		MEM_freeN(pt_tmp);
+		BLI_freelinkN(&gpf->strokes, gps);
+		
+		/* nothing left in stroke, so stop */
+		return 1;
+	}
+
+	/* if last segment, just remove segment from the stroke */
+	else if (i == gps->totpoints - 2) {
+		/* allocate new points array, and assign most of the old stroke there */
+		gps->totpoints--;
+		gps->points= MEM_callocN(sizeof(bGPDspoint)*gps->totpoints, "gp_stroke_points");
+		memcpy(gps->points, pt_tmp, sizeof(bGPDspoint)*gps->totpoints);
+		
+		/* free temp buffer */
+		MEM_freeN(pt_tmp);
+		
+		/* nothing left in stroke, so stop */
+		return 1;
+	}
+
+	/* if first segment, just remove segment from the stroke */
+	else if (i == 0) {
+		/* allocate new points array, and assign most of the old stroke there */
+		gps->totpoints--;
+		gps->points= MEM_callocN(sizeof(bGPDspoint)*gps->totpoints, "gp_stroke_points");
+		memcpy(gps->points, pt_tmp + 1, sizeof(bGPDspoint)*gps->totpoints);
+		
+		/* free temp buffer */
+		MEM_freeN(pt_tmp);
+		
+		/* no break here, as there might still be stuff to remove in this stroke */
+		return 0;
+	}
+
+	/* segment occurs in 'middle' of stroke, so split */
+	else {
+		/* duplicate stroke, and assign 'later' data to that stroke */
+		gsn= MEM_dupallocN(gps);
+		gsn->prev= gsn->next= NULL;
+		BLI_insertlinkafter(&gpf->strokes, gps, gsn);
+		
+		gsn->totpoints= gps->totpoints - i;
+		gsn->points= MEM_callocN(sizeof(bGPDspoint)*gsn->totpoints, "gp_stroke_points");
+		memcpy(gsn->points, pt_tmp + i, sizeof(bGPDspoint)*gsn->totpoints);
+		
+		/* adjust existing stroke  */
+		gps->totpoints= i;
+		gps->points= MEM_callocN(sizeof(bGPDspoint)*gps->totpoints, "gp_stroke_points");
+		memcpy(gps->points, pt_tmp, sizeof(bGPDspoint)*i);
+		
+		/* free temp buffer */
+		MEM_freeN(pt_tmp);
+		
+		/* nothing left in stroke, so stop */
+		return 1;
+	}
+}
+
+/* eraser tool - check if part of stroke occurs within last segment drawn by eraser */
+static short gp_stroke_eraser_strokeinside (int mval[], int mvalo[], short rad, short x0, short y0, short x1, short y1)
+{
+	/* simple within-radius check for now */
+	if (edge_inside_circle(mval[0], mval[1], rad, x0, y0, x1, y1))
+		return 1;
+	
+	/* not inside */
+	return 0;
+} 
+
+/* eraser tool - evaluation per stroke */
+// TODO: this could really do with some optimisation (KD-Tree/BVH?)
+static void gp_stroke_eraser_dostroke (tGPsdata *p, int mval[], int mvalo[], short rad, rcti *rect, bGPDframe *gpf, bGPDstroke *gps)
+{
+	bGPDspoint *pt1, *pt2;
+	int x0=0, y0=0, x1=0, y1=0;
+	short xyval[2];
+	int i;
+	
+	if (gps->totpoints == 0) {
+		/* just free stroke */
+		if (gps->points) 
+			MEM_freeN(gps->points);
+		BLI_freelinkN(&gpf->strokes, gps);
+	}
+	else if (gps->totpoints == 1) {
+		/* get coordinates */
+		if (gps->flag & GP_STROKE_3DSPACE) {
+			project_short(p->ar, &gps->points->x, xyval);
+			x0= xyval[0];
+			y0= xyval[1];
+		}
+		else if (gps->flag & GP_STROKE_2DSPACE) {			
+			UI_view2d_view_to_region(p->v2d, gps->points->x, gps->points->y, &x0, &y0);
+		}
+#if 0
+		else if (gps->flag & GP_STROKE_2DIMAGE) {			
+			int offsx, offsy, sizex, sizey;
+			
+			/* get stored settings */
+			sizex= p->im2d_settings.sizex;
+			sizey= p->im2d_settings.sizey;
+			offsx= p->im2d_settings.offsx;
+			offsy= p->im2d_settings.offsy;
+			
+			/* calculate new points */
+			x0= (int)((gps->points->x * sizex) + offsx);
+			y0= (int)((gps->points->y * sizey) + offsy);
+		}
+#endif
+		else {
+			x0= (int)(gps->points->x / 1000 * p->sa->winx);
+			y0= (int)(gps->points->y / 1000 * p->sa->winy);
+		}
+		
+		/* do boundbox check first */
+		if (BLI_in_rcti(rect, x0, y0)) {
+			/* only check if point is inside */
+			if ( ((x0-mval[0])*(x0-mval[0]) + (y0-mval[1])*(y0-mval[1])) <= rad*rad ) {
+				/* free stroke */
+				MEM_freeN(gps->points);
+				BLI_freelinkN(&gpf->strokes, gps);
+			}
+		}
+	}
+	else {	
+		/* loop over the points in the stroke, checking for intersections 
+		 * 	- an intersection will require the stroke to be split
+		 */
+		for (i=0; (i+1) < gps->totpoints; i++) {
+			/* get points to work with */
+			pt1= gps->points + i;
+			pt2= gps->points + i + 1;
+			
+			/* get coordinates */
+			if (gps->flag & GP_STROKE_3DSPACE) {
+				project_short(p->ar, &pt1->x, xyval);
+				x0= xyval[0];
+				y0= xyval[1];
+				
+				project_short(p->ar, &pt2->x, xyval);
+				x1= xyval[0];
+				y1= xyval[1];
+			}
+			else if (gps->flag & GP_STROKE_2DSPACE) {
+				UI_view2d_view_to_region(p->v2d, pt1->x, pt1->y, &x0, &y0);
+				
+				UI_view2d_view_to_region(p->v2d, pt2->x, pt2->y, &x1, &y1);
+			}
+#if 0
+			else if (gps->flag & GP_STROKE_2DIMAGE) {
+				int offsx, offsy, sizex, sizey;
+				
+				/* get stored settings */
+				sizex= p->im2d_settings.sizex;
+				sizey= p->im2d_settings.sizey;
+				offsx= p->im2d_settings.offsx;
+				offsy= p->im2d_settings.offsy;
+				
+				/* calculate new points */
+				x0= (int)((pt1->x * sizex) + offsx);
+				y0= (int)((pt1->y * sizey) + offsy);
+				
+				x1= (int)((pt2->x * sizex) + offsx);
+				y1= (int)((pt2->y * sizey) + offsy);
+			}
+#endif
+			else {
+				x0= (int)(pt1->x / 1000 * p->sa->winx);
+				y0= (int)(pt1->y / 1000 * p->sa->winy);
+				x1= (int)(pt2->x / 1000 * p->sa->winx);
+				y1= (int)(pt2->y / 1000 * p->sa->winy);
+			}
+			
+			/* check that point segment of the boundbox of the eraser stroke */
+			if (BLI_in_rcti(rect, x0, y0) || BLI_in_rcti(rect, x1, y1)) {
+				/* check if point segment of stroke had anything to do with
+				 * eraser region  (either within stroke painted, or on its lines)
+				 * 	- this assumes that linewidth is irrelevant
+				 */
+				if (gp_stroke_eraser_strokeinside(mval, mvalo, rad, x0, y0, x1, y1)) {
+					/* if function returns true, break this loop (as no more point to check) */
+					if (gp_stroke_eraser_splitdel(gpf, gps, i))
+						break;
+				}
+			}
+		}
+	}
+}
+
+/* erase strokes which fall under the eraser strokes */
+static void gp_stroke_doeraser (tGPsdata *p)
+{
+	bGPDframe *gpf= p->gpf;
+	bGPDstroke *gps, *gpn;
+	rcti rect;
+	
+	/* rect is rectangle of eraser */
+	rect.xmin= p->mval[0] - p->radius;
+	rect.ymin= p->mval[1] - p->radius;
+	rect.xmax= p->mval[0] + p->radius;
+	rect.ymax= p->mval[1] + p->radius;
+	
+	/* loop over strokes, checking segments for intersections */
+	for (gps= gpf->strokes.first; gps; gps= gpn) {
+		gpn= gps->next;
+		gp_stroke_eraser_dostroke(p, p->mval, p->mvalo, p->radius, &rect, gpf, gps);
+	}
+}
+
+/* ******************************************* */
+/* Sketching Operator */
+
+/* clear the session buffers (call this before AND after a paint operation) */
+static void gp_session_validatebuffer (tGPsdata *p)
+{
+	bGPdata *gpd= p->gpd;
+	
+	/* clear memory of buffer (or allocate it if starting a new session) */
+	if (gpd->sbuffer)
+		memset(gpd->sbuffer, 0, sizeof(tGPspoint)*GP_STROKE_BUFFER_MAX);
+	else
+		gpd->sbuffer= MEM_callocN(sizeof(tGPspoint)*GP_STROKE_BUFFER_MAX, "gp_session_strokebuffer");
+	
+	/* reset indices */
+	gpd->sbuffer_size = 0;
+	
+	/* reset flags */
+	gpd->sbuffer_sflag= 0;
+}
+
+/* init new painting session */
+static tGPsdata *gp_session_initpaint (bContext *C)
+{
+	tGPsdata *p = NULL;
+	ScrArea *curarea= CTX_wm_area(C);
+	ARegion *ar= CTX_wm_region(C);
+	
+	/* make sure the active view (at the starting time) is a 3d-view */
+	if (curarea == NULL) {
+		if (G.f & G_DEBUG) 
+			printf("Error: No active view for painting \n");
+		return NULL;
+	}
+	
+	/* create new context data */
+	p= MEM_callocN(sizeof(tGPsdata), "GPencil Drawing Data");
+	
+	/* pass on current scene */
+	p->scene= CTX_data_scene(C);
+	
+	switch (curarea->spacetype) {
+		/* supported views first */
+		case SPACE_VIEW3D:
+		{
+			//View3D *v3d= curarea->spacedata.first;
+			
+			/* set current area */
+			p->sa= curarea;
+			p->ar= ar;
+			
+#if 0 // XXX will this sort of antiquated stuff be restored?
+			/* check that gpencil data is allowed to be drawn */
+			if ((v3d->flag2 & V3D_DISPGP)==0) {
+				p->status= GP_STATUS_ERROR;
+				if (G.f & G_DEBUG) 
+					printf("Error: In active view, Grease Pencil not shown \n");
+				return p;
+			}
+#endif
+		}
+			break;
+#if 0 // XXX these other spaces will come over time...
+		case SPACE_NODE:
+		{
+			SpaceNode *snode= curarea->spacedata.first;
+			
+			/* set current area */
+			p->sa= curarea;
+			p->ar= ar;
+			p->v2d= &ar->v2d;
+			
+			/* check that gpencil data is allowed to be drawn */
+			if ((snode->flag & SNODE_DISPGP)==0) {
+				p->status= GP_STATUS_ERROR;
+				if (G.f & G_DEBUG) 
+					printf("Error: In active view, Grease Pencil not shown \n");
+				return;
+			}
+		}
+			break;
+		case SPACE_SEQ:
+		{
+			SpaceSeq *sseq= curarea->spacedata.first;
+			
+			/* set current area */
+			p->sa= curarea;
+			p->ar= ar;
+			p->v2d= &ar->v2d;
+			
+			/* check that gpencil data is allowed to be drawn */
+			if (sseq->mainb == SEQ_DRAW_SEQUENCE) {
+				p->status= GP_STATUS_ERROR;
+				if (G.f & G_DEBUG) 
+					printf("Error: In active view (sequencer), active mode doesn't support Grease Pencil \n");
+				return;
+			}
+			if ((sseq->flag & SEQ_DRAW_GPENCIL)==0) {
+				p->status= GP_STATUS_ERROR;
+				if (G.f & G_DEBUG) 
+					printf("Error: In active view, Grease Pencil not shown \n");
+				return;
+			}
+		}
+			break;	
+		case SPACE_IMAGE:
+		{
+			SpaceImage *sima= curarea->spacedata.first;
+			
+			/* set the current area */
+			p->sa= curarea;
+			p->ar= ar;
+			p->v2d= &ar->v2d;
+			p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
+			
+			/* check that gpencil data is allowed to be drawn */
+			if ((sima->flag & SI_DISPGP)==0) {
+				p->status= GP_STATUS_ERROR;
+				if (G.f & G_DEBUG)
+					printf("Error: In active view, Grease Pencil not shown \n");
+				return;
+			}
+		}
+			break;
+#endif
+		/* unsupported views */
+		default:
+		{
+			p->status= GP_STATUS_ERROR;
+			if (G.f & G_DEBUG) 
+				printf("Error: Active view not appropriate for Grease Pencil drawing \n");
+			return p;
+		}
+			break;
+	}
+	
+	/* get gp-data */
+	p->gpd= gpencil_data_getactive(C);
+	if (p->gpd == NULL) {
+		/* add new GPencil block for the active scene for now... */
+		p->gpd= gpencil_data_addnew("GPencil");
+		p->scene->gpd= p->gpd;
+	}
+	
+	/* set edit flags */
+	G.f |= G_GREASEPENCIL;
+	
+	/* set initial run flag */
+	p->flags |= GP_PAINTFLAG_FIRSTRUN;
+	
+	/* clear out buffer (stored in gp-data), in case something contaminated it */
+	gp_session_validatebuffer(p);
+	
+#if 0
+	/* set 'default' im2d_settings just in case something that uses this doesn't set it */
+	p->im2d_settings.sizex= 1;
+	p->im2d_settings.sizey= 1;
+#endif
+	
+	/* return context data for running paint operator */
+	return p;
+}
+
+/* cleanup after a painting session */
+static void gp_session_cleanup (tGPsdata *p)
+{
+	bGPdata *gpd= (p) ? p->gpd : NULL;
+	
+	/* error checking */
+	if (gpd == NULL)
+		return;
+	
+	/* free stroke buffer */
+	if (gpd->sbuffer) {
+		MEM_freeN(gpd->sbuffer);
+		gpd->sbuffer= NULL;
+	}
+	
+	/* clear flags */
+	gpd->sbuffer_size= 0;
+	gpd->sbuffer_sflag= 0;
+}
+
+/* init new stroke */
+static void gp_paint_initstroke (tGPsdata *p, short paintmode)
+{	
+	/* get active layer (or add a new one if non-existent) */
+	p->gpl= gpencil_layer_getactive(p->gpd);
+	if (p->gpl == NULL)
+		p->gpl= gpencil_layer_addnew(p->gpd);
+	if (p->gpl->flag & GP_LAYER_LOCKED) {
+		p->status= GP_STATUS_ERROR;
+		if (G.f & G_DEBUG)
+			printf("Error: Cannot paint on locked layer \n");
+		return;
+	}
+		
+	/* get active frame (add a new one if not matching frame) */
+	p->gpf= gpencil_layer_getframe(p->gpl, p->scene->r.cfra, 1);
+	if (p->gpf == NULL) {
+		p->status= GP_STATUS_ERROR;
+		if (G.f & G_DEBUG) 
+			printf("Error: No frame created (gpencil_paint_init) \n");
+		return;
+	}
+	else
+		p->gpf->flag |= GP_FRAME_PAINT;
+	
+	/* set 'eraser' for this stroke if using eraser */
+	p->paintmode= paintmode;
+	if (p->paintmode == GP_PAINTMODE_ERASER)
+		p->gpd->sbuffer_sflag |= GP_STROKE_ERASER;
+	
+	/* check if points will need to be made in view-aligned space */
+	// XXX this should be the default? this is something that needs review
+	/*if (p->gpd->flag & GP_DATA_VIEWALIGN)*/ {
+		switch (p->sa->spacetype) {
+			case SPACE_VIEW3D:
+			{
+				View3D *v3d= (View3D *)p->sa->spacedata.first;
+				RegionView3D *rv3d= p->ar->regiondata;
+				
+				// TODO: this should only happen for scene... otherwise use object center!
+				float *fp= give_cursor(p->scene, v3d);
+				initgrabz(rv3d, fp[0], fp[1], fp[2]);
+				
+				p->gpd->sbuffer_sflag |= GP_STROKE_3DSPACE;
+			}
+				break;
+#if 0 // XXX other spacetypes to be restored in due course
+			case SPACE_NODE:
+			{
+				p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
+			}
+				break;
+			case SPACE_SEQ:
+			{
+				SpaceSeq *sseq= (SpaceSeq *)p->sa->spacedata.first;
+				int rectx, recty;
+				float zoom, zoomx, zoomy;
+				
+				/* set draw 2d-stroke flag */
+				p->gpd->sbuffer_sflag |= GP_STROKE_2DIMAGE;
+				
+				/* calculate zoom factor */
+				zoom= (float)(SEQ_ZOOM_FAC(sseq->zoom));
+				if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
+					zoomx = zoom * ((float)p->scene->r.xasp / (float)p->scene->r.yasp);
+					zoomy = zoom;
+				} 
+				else
+					zoomx = zoomy = zoom;
+				
+				/* calculate rect size to use to calculate the size of the drawing area
+				 *	- We use the size of the output image not the size of the ibuf being shown
+				 *	  as it is too messy getting the ibuf (and could be too slow). This should be
+				 *	  a reasonable for most cases anyway.
+				 */
+				rectx= (p->scene->r.size * p->scene->r.xsch) / 100;
+				recty= (p->scene->r.size * p->scene->r.ysch) / 100; 
+				
+				/* set offset and scale values for opertations to use */
+				p->im2d_settings.sizex= (int)(zoomx * rectx);
+				p->im2d_settings.sizey= (int)(zoomy * recty);
+				p->im2d_settings.offsx= (int)((p->sa->winx-p->im2d_settings.sizex)/2 + sseq->xof);
+				p->im2d_settings.offsy= (int)((p->sa->winy-p->im2d_settings.sizey)/2 + sseq->yof);
+			}
+				break;
+			case SPACE_IMAGE:
+			{
+				/* check if any ibuf available */
+				if (p->ibuf)
+					p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
+			}
+				break;
+#endif
+		}
+	}
+}
+
+/* finish off a stroke (clears buffer, but doesn't finish the paint operation) */
+static void gp_paint_strokeend (tGPsdata *p)
+{
+	/* check if doing eraser or not */
+	if ((p->gpd->sbuffer_sflag & GP_STROKE_ERASER) == 0) {
+		/* smooth stroke before transferring? */
+		gp_stroke_smooth(p);
+		
+		/* simplify stroke before transferring? */
+		gp_stroke_simplify(p);
+		
+		/* transfer stroke to frame */
+		gp_stroke_newfrombuffer(p);
+	}
+	
+	/* clean up buffer now */
+	gp_session_validatebuffer(p);
+}
+
+/* finish off stroke painting operation */
+static void gp_paint_cleanup (tGPsdata *p)
+{
+	/* finish off a stroke */
+	gp_paint_strokeend(p);
+	
+	/* "unlock" frame */
+	p->gpf->flag &= ~GP_FRAME_PAINT;
+}
+
+/* ------------------------------- */
+
+
+static int gpencil_draw_init (bContext *C, wmOperator *op)
+{
+	tGPsdata *p;
+	int paintmode= RNA_enum_get(op->ptr, "mode");
+	
+	/* check context */
+	p= op->customdata= gp_session_initpaint(C);
+	if ((p == NULL) || (p->status == GP_STATUS_ERROR)) {
+		/* something wasn't set correctly in context */
+		gp_session_cleanup(p);
+		return 0;
+	}
+	
+	/* init painting data */
+	gp_paint_initstroke(p, paintmode);
+	if (p->status == GP_STATUS_ERROR) {
+		gp_session_cleanup(p);
+		return 0;
+	}
+	
+	/* radius for eraser circle is defined in userprefs now */
+	// TODO: make this more easily tweaked... 
+	p->radius= U.gp_eraser;
+	
+	/* everything is now setup ok */
+	return 1;
+}
+
+/* ------------------------------- */
+
+static void gpencil_draw_exit (bContext *C, wmOperator *op)
+{
+	tGPsdata *p= op->customdata;
+	
+	/* clear edit flags */
+	G.f &= ~G_GREASEPENCIL;
+	
+	/* restore cursor to indicate end of drawing */
+	// XXX  (cursor callbacks in regiontype) setcursor_space(p.sa->spacetype, CURSOR_STD);
+	
+	/* check size of buffer before cleanup, to determine if anything happened here */
+	if (p->paintmode == GP_PAINTMODE_ERASER) {
+		// TODO clear radial cursor thing
+		// XXX draw_sel_circle(NULL, p.mvalo, 0, p.radius, 0);
+	}
+	
+	/* cleanup */
+	gp_paint_cleanup(p);
+	gp_session_cleanup(p);
+	
+	/* finally, free the temp data */
+	MEM_freeN(p);
+	op->customdata= NULL;
+}
+
+static int gpencil_draw_cancel (bContext *C, wmOperator *op)
+{
+	/* this is just a wrapper around exit() */
+	gpencil_draw_exit(C, op);
+	return OPERATOR_CANCELLED;
+}
+
+/* ------------------------------- */
+
+static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *event)
+{
+	tGPsdata *p= op->customdata;
+	ARegion *ar= p->ar;
+	int tablet=0;
+
+	/* convert from window-space to area-space mouse coordintes */
+	// NOTE: float to ints conversions, +1 factor is probably used to ensure a bit more accurate rounding...
+	p->mval[0]= event->x - ar->winrct.xmin + 1;
+	p->mval[1]= event->y - ar->winrct.ymin + 1;
+	
+	/* handle pressure sensitivity (which is supplied by tablets) */
+	if (event->custom == EVT_DATA_TABLET) {
+		wmTabletData *wmtab= event->customdata;
+		
+		tablet= (wmtab->Active != EVT_TABLET_NONE);
+		p->pressure= wmtab->Pressure;
+		//if (wmtab->Active == EVT_TABLET_ERASER)
+			// TODO... this should get caught by the keymaps which call drawing in the first place
+	}
+	else
+		p->pressure= 1.0f;
+	
+	/* special exception for start of strokes (i.e. maybe for just a dot) */
+	if (p->flags & GP_PAINTFLAG_FIRSTRUN) {
+		p->flags &= ~GP_PAINTFLAG_FIRSTRUN;
+		
+		p->mvalo[0]= p->mval[0];
+		p->mvalo[1]= p->mval[1];
+		p->opressure= p->pressure;
+		
+		/* special exception here for too high pressure values on first touch in
+		 *  windows for some tablets, then we just skip first touch ..  
+		 */
+		if (tablet && (p->pressure >= 0.99f))
+			return;
+	}
+	
+	
+	/* handle drawing/erasing -> test for erasing first */
+	if (p->paintmode == GP_PAINTMODE_ERASER) {
+		/* do 'live' erasing now */
+		gp_stroke_doeraser(p);
+		
+		/* store used values */
+		p->mvalo[0]= p->mval[0];
+		p->mvalo[1]= p->mval[1];
+		p->opressure= p->pressure;
+	}
+	/* only add current point to buffer if mouse moved (even though we got an event, it might be just noise) */
+	else if (gp_stroke_filtermval(p, p->mval, p->mvalo)) {
+		/* try to add point */
+		short ok= gp_stroke_addpoint(p, p->mval, p->pressure);
+		
+		/* handle errors while adding point */
+		if ((ok == GP_STROKEADD_FULL) || (ok == GP_STROKEADD_OVERFLOW)) {
+			/* finish off old stroke */
+			gp_paint_strokeend(p);
+			
+			/* start a new stroke, starting from previous point */
+			gp_stroke_addpoint(p, p->mvalo, p->opressure);
+			ok= gp_stroke_addpoint(p, p->mval, p->pressure);
+		}
+		else if (ok == GP_STROKEADD_INVALID) {
+			/* the painting operation cannot continue... */
+			BKE_report(op->reports, RPT_ERROR, "Cannot paint stroke");
+			p->status = GP_STATUS_ERROR;
+			
+			if (G.f & G_DEBUG) 
+				printf("Error: Grease-Pencil Paint - Add Point Invalid \n");
+			// XXX break!
+		}
+		
+		/* store used values */
+		p->mvalo[0]= p->mval[0];
+		p->mvalo[1]= p->mval[1];
+		p->opressure= p->pressure;
+	}
+	
+	/* force refresh */
+	ED_area_tag_redraw(p->sa); // XXX this is crude
+}
+
+/* ------------------------------- */
+
+static int gpencil_draw_invoke (bContext *C, wmOperator *op, wmEvent *event)
+{
+	tGPsdata *p = NULL;
+	
+	printf("GPencil - Starting Drawing \n");
+	
+	/* try to initialise context data needed while drawing */
+	if (!gpencil_draw_init(C, op)) {
+		if (op->customdata) MEM_freeN(op->customdata);
+		printf("\tGP - no valid data \n");
+		return OPERATOR_CANCELLED;
+	}
+	else
+		p= op->customdata;
+	
+	// TODO: set any additional settings that we can take from the events?
+	// TODO? if tablet is erasing, force eraser to be on?
+	
+	/* if eraser is on, draw radial aid */
+	if (p->paintmode == GP_PAINTMODE_ERASER) {
+		// TODO: this involves mucking around with radial control, so we leave this for now..
+	}
+	
+	printf("\tGP - set first spot\n");
+	
+	/* handle the initial drawing - i.e. for just doing a simple dot */
+	gpencil_draw_apply_event(C, op, event);
+	
+	/* add a modal handler for this operator, so that we can then draw continuous strokes */
+	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
+{
+	tGPsdata *p= op->customdata;
+	
+	printf("\tGP - handle modal event...\n");
+	
+	switch (event->type) {
+		/* moving mouse - assumed that mouse button is down */
+		case MOUSEMOVE:
+			/* handle drawing event */
+			printf("\t\tGP - add point\n");
+			gpencil_draw_apply_event(C, op, event);
+			
+			/* finish painting operation if anything went wrong just now */
+			if (p->status == GP_STATUS_ERROR) {
+				printf("\t\t\tGP - error done! \n");
+				gpencil_draw_exit(C, op);
+				return OPERATOR_CANCELLED;
+			}
+			break;
+		
+		/* end of stroke - i.e. when a mouse-button release occurs */
+		case LEFTMOUSE:
+		case MIDDLEMOUSE:
+		case RIGHTMOUSE: 
+			printf("\t\tGP - end of stroke \n");
+			gpencil_draw_exit(C, op);
+			return OPERATOR_FINISHED;
+			
+		/* scrolling mouse-wheel increases radius of eraser 
+		 * 	- though this is quite a difficult action to perform
+		 */
+		case WHEELUPMOUSE:
+			p->radius += 1.5f;
+			break;
+		case WHEELDOWNMOUSE:
+			p->radius -= 1.5f;
+			break;
+			
+		/* handle ctrl key - used to toggle straight-lines only (for drawing) */
+		// XXX hardcoded keymap stuff
+		case LEFTCTRLKEY:
+		case RIGHTCTRLKEY:
+			if (event->val == KM_PRESS)
+				p->flags |= GP_PAINTFLAG_STRAIGHTLINES;
+			else if (event->val == KM_RELEASE)
+				p->flags &= ~GP_PAINTFLAG_STRAIGHTLINES;
+			break;
+			
+		default:
+			return OPERATOR_RUNNING_MODAL|OPERATOR_PASS_THROUGH;
+			break;
+	}
+	
+	return OPERATOR_RUNNING_MODAL;
+}
+
+/* ------------------------------- */
+
+static EnumPropertyItem prop_gpencil_drawmodes[] = {
+	{GP_PAINTMODE_DRAW, "DRAW", 0, "Draw", ""},
+	{GP_PAINTMODE_ERASER, "ERASER", 0, "Eraser", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+void GPENCIL_OT_draw (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Grease Pencil Draw";
+	ot->idname= "GPENCIL_OT_draw";
+	ot->description= "Make annotations on the active data.";
+	
+	/* api callbacks */
+	//ot->exec= gpencil_draw_exec;
+	ot->invoke= gpencil_draw_invoke;
+	ot->modal= gpencil_draw_modal;
+	ot->cancel= gpencil_draw_cancel;
+	ot->poll= gpencil_draw_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	
+	/* settings for drawing */
+	RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to intepret mouse movements.");
+}
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index ad8124c89d7..c1e37ce2e81 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -41,7 +41,7 @@ struct bGPDframe;
 struct bGPdata;
 struct uiBlock;
 struct ImBuf;
-
+struct wmWindowManager;
 
 
 /* ------------- Grease-Pencil Helpers -------------- */
@@ -52,9 +52,19 @@ typedef struct tGPspoint {
 	float pressure;			/* pressure of tablet at this point */
 } tGPspoint;
 
+/* ----------- Grease Pencil New Tools ------------- */
+
+struct bGPdata *gpencil_data_getactive(struct bContext *C);
+
+/* ----------- Grease Pencil Operators ------------- */
+
+void gpencil_common_keymap(struct wmWindowManager *wm, ListBase *keymap);
+
+void ED_operatortypes_gpencil(void);
+
 /* ------------ Grease-Pencil Depreceated Stuff ------------------ */
 
-struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
+//struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
 short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd);
 struct ScrArea *gpencil_data_findowner(struct bGPdata *gpd);
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 041e6a09323..61b6fe391ae 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -42,6 +42,7 @@
 #include "ED_anim_api.h"
 #include "ED_armature.h"
 #include "ED_curve.h"
+#include "ED_gpencil.h"
 #include "ED_markers.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
@@ -83,7 +84,7 @@ void ED_spacetypes_init(void)
 	/* register operator types for screen and all spaces */
 	ED_operatortypes_screen();
 	ED_operatortypes_anim();
-	ED_operatortypes_animchannels(); // XXX have this as part of anim() ones instead?
+	ED_operatortypes_animchannels();
 	ED_operatortypes_object();
 	ED_operatortypes_mesh();
 	ED_operatortypes_sculpt();
@@ -97,6 +98,7 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_fluid();
 	ED_operatortypes_metaball();
 	ED_operatortypes_boids();
+	ED_operatortypes_gpencil();
 	
 	ui_view2d_operatortypes();
 	
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 905657910b8..07ffb35f807 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -78,6 +78,7 @@
 
 #include "ED_armature.h"
 #include "ED_keyframing.h"
+#include "ED_gpencil.h"
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"
@@ -2082,8 +2083,8 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	}
 	
 	/* draw grease-pencil stuff */
-//	if (v3d->flag2 & V3D_DISPGP)
-//		draw_gpencil_3dview(ar, 1);
+	//if (v3d->flag2 & V3D_DISPGP)
+		draw_gpencil_3dview(C, 1);
 	
 	BDR_drawSketch(C);
 	
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index e9d1f6406b0..19a70834587 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -52,6 +52,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_gpencil.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 
@@ -131,7 +132,10 @@ void view3d_keymap(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, 0, 0);
 	km = WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, KM_CTRL, 0);
 	RNA_boolean_set(km->ptr, "snap", 1);
-
+	
+	/* grease pencil */
+	gpencil_common_keymap(wm, keymap); // XXX
+	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, 0, 0); /* manipulator always on left mouse, not on action mouse*/
 	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_PRESS, 0, 0);
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 9161157f597..20429120812 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -48,6 +48,7 @@ struct bNodeTree;
 struct AnimData;
 struct Editing;
 struct SceneStats;
+struct bGPdata;
 
 typedef struct Base {
 	struct Base *next, *prev;
@@ -718,6 +719,9 @@ typedef struct Scene {
 
 	/* Units */
 	struct UnitSettings unit;
+	
+	/* Grease Pencil */
+	struct bGPdata *gpd;
 } Scene;
 
 

From c97d964064bfb9d64e3f866f62095ccdc32a80fd Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 26 Aug 2009 12:51:27 +0000
Subject: [PATCH 284/577] - Add remove game properties now possible from the
 logic space properties panel. - PyDebugLine, utility function to run if the
 BGE crashes, you can see which python file and line called the C/C++ code.

---
 release/ui/space_logic.py                     | 13 ++--
 source/blender/editors/object/object_edit.c   | 69 +++++++++++++++++++
 source/blender/editors/object/object_intern.h |  3 +
 source/blender/editors/object/object_ops.c    |  3 +
 .../gameengine/Expressions/PyObjectPlus.cpp   | 68 +++++++++---------
 5 files changed, 119 insertions(+), 37 deletions(-)

diff --git a/release/ui/space_logic.py b/release/ui/space_logic.py
index 68ddceb8534..f9920f78497 100644
--- a/release/ui/space_logic.py
+++ b/release/ui/space_logic.py
@@ -14,12 +14,17 @@ class LOGIC_PT_properties(bpy.types.Panel):
 		ob = context.active_object
 		game = ob.game
 		
-		for prop in game.properties:
-			flow = layout.row()
+		for i, prop in enumerate(game.properties):
+			flow = layout.row(align=True)
 			flow.itemR(prop, "name", text="")
 			flow.itemR(prop, "type", text="")
 			flow.itemR(prop, "value", text="") # we dont care about the type. rna will display correctly
-			flow.itemR(prop, "debug")
+			flow.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO')
+			flow.item_intO("object.game_property_remove", "index", i, text="", icon='ICON_X')
+		
+		flow = layout.row()
+		flow.itemO("object.game_property_new")
+			
+			
 
 bpy.types.register(LOGIC_PT_properties)
-
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 3d2ddba3757..4b7d3474d98 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -7161,3 +7161,72 @@ void ED_object_toggle_modes(bContext *C, int mode)
 	if(mode & OB_MODE_PARTICLE_EDIT)
 		WM_operator_name_call(C, "PARTICLE_OT_particle_edit_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 }
+
+/* game property ops */
+
+static int game_property_new(bContext *C, wmOperator *op)
+{
+	Object *ob= CTX_data_active_object(C);
+	bProperty *prop;
+
+	if(!ob)
+		return OPERATOR_CANCELLED;
+
+	prop= new_property(PROP_FLOAT);
+	BLI_addtail(&ob->prop, prop);
+	unique_property(NULL, prop, 0); // make_unique_prop_names(prop->name);
+
+	return OPERATOR_FINISHED;
+}
+
+
+void OBJECT_OT_game_property_new(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "New Game Property";
+	ot->idname= "OBJECT_OT_game_property_new";
+
+	/* api callbacks */
+	ot->exec= game_property_new;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int game_property_remove(bContext *C, wmOperator *op)
+{
+	Object *ob= CTX_data_active_object(C);
+	bProperty *prop;
+	int index;
+
+	if(!ob)
+		return OPERATOR_CANCELLED;
+
+	index = RNA_int_get(op->ptr, "index");
+
+    prop= BLI_findlink(&ob->prop, index);
+
+    if(prop) {
+		BLI_remlink(&ob->prop, prop);
+		free_property(prop);
+		return OPERATOR_FINISHED;
+    }
+    else {
+    	return OPERATOR_CANCELLED;
+    }
+}
+
+void OBJECT_OT_game_property_remove(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Remove Game Property";
+	ot->idname= "OBJECT_OT_game_property_remove";
+
+	/* api callbacks */
+	ot->exec= game_property_remove;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Property index to remove ", 0, INT_MAX);
+}
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 2f164102be2..82bbb34f59a 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -147,6 +147,9 @@ void OBJECT_OT_vertex_group_deselect(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_copy_to_linked(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_copy(struct wmOperatorType *ot);
 
+void OBJECT_OT_game_property_new(struct wmOperatorType *ot);
+void OBJECT_OT_game_property_remove(struct wmOperatorType *ot);
+
 /* editkey.c */
 void OBJECT_OT_shape_key_add(struct wmOperatorType *ot);
 void OBJECT_OT_shape_key_remove(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 239b162c14f..73dad7895a1 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -150,6 +150,9 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_vertex_group_copy_to_linked);
 	WM_operatortype_append(OBJECT_OT_vertex_group_copy);
 
+	WM_operatortype_append(OBJECT_OT_game_property_new);
+	WM_operatortype_append(OBJECT_OT_game_property_remove);
+
 	WM_operatortype_append(OBJECT_OT_shape_key_add);
 	WM_operatortype_append(OBJECT_OT_shape_key_remove);
 
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 5be703f0fa4..99c943d4f24 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -906,45 +906,47 @@ void PyObjectPlus::SetDeprecationWarnings(bool ignoreDeprecationWarnings)
 	m_ignore_deprecation_warnings = ignoreDeprecationWarnings;
 }
 
-void PyObjectPlus::ShowDeprecationWarning_func(const char* old_way,const char* new_way)
+void PyDebugLine()
 {
-	{
-		printf("Method %s is deprecated, please use %s instead.\n", old_way, new_way);
-		
-		// import sys; print '\t%s:%d' % (sys._getframe(0).f_code.co_filename, sys._getframe(0).f_lineno)
-		
-		PyObject *getframe, *frame;
-		PyObject *f_lineno, *f_code, *co_filename;
-		
-		getframe = PySys_GetObject((char *)"_getframe"); // borrowed
-		if (getframe) {
-			frame = PyObject_CallObject(getframe, NULL);
-			if (frame) {
-				f_lineno= PyObject_GetAttrString(frame, "f_lineno");
-				f_code= PyObject_GetAttrString(frame, "f_code");
-				if (f_lineno && f_code) {
-					co_filename= PyObject_GetAttrString(f_code, "co_filename");
-					if (co_filename) {
-						
-						printf("\t%s:%d\n", _PyUnicode_AsString(co_filename), (int)PyLong_AsSsize_t(f_lineno));
-						
-						Py_DECREF(f_lineno);
-						Py_DECREF(f_code);
-						Py_DECREF(co_filename);
-						Py_DECREF(frame);
-						return;
-					}
+	// import sys; print '\t%s:%d' % (sys._getframe(0).f_code.co_filename, sys._getframe(0).f_lineno)
+
+	PyObject *getframe, *frame;
+	PyObject *f_lineno, *f_code, *co_filename;
+
+	getframe = PySys_GetObject((char *)"_getframe"); // borrowed
+	if (getframe) {
+		frame = PyObject_CallObject(getframe, NULL);
+		if (frame) {
+			f_lineno= PyObject_GetAttrString(frame, "f_lineno");
+			f_code= PyObject_GetAttrString(frame, "f_code");
+			if (f_lineno && f_code) {
+				co_filename= PyObject_GetAttrString(f_code, "co_filename");
+				if (co_filename) {
+
+					printf("\t%s:%d\n", _PyUnicode_AsString(co_filename), (int)PyLong_AsSsize_t(f_lineno));
+
+					Py_DECREF(f_lineno);
+					Py_DECREF(f_code);
+					Py_DECREF(co_filename);
+					Py_DECREF(frame);
+					return;
 				}
-				
-				Py_XDECREF(f_lineno);
-				Py_XDECREF(f_code);
-				Py_DECREF(frame);
 			}
 			
+			Py_XDECREF(f_lineno);
+			Py_XDECREF(f_code);
+			Py_DECREF(frame);
 		}
-		PyErr_Clear();
-		printf("\tERROR - Could not access sys._getframe(0).f_lineno or sys._getframe().f_code.co_filename\n");
+
 	}
+	PyErr_Clear();
+	printf("\tERROR - Could not access sys._getframe(0).f_lineno or sys._getframe().f_code.co_filename\n");
+}
+
+void PyObjectPlus::ShowDeprecationWarning_func(const char* old_way,const char* new_way)
+{
+	printf("Method %s is deprecated, please use %s instead.\n", old_way, new_way);
+	PyDebugLine();
 }
 
 void PyObjectPlus::ClearDeprecationWarning()

From 47ce314bc5be90f63799c43805ef509c22d7fcf2 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Wed, 26 Aug 2009 14:19:29 +0000
Subject: [PATCH 285/577] 2.5 Sound:

- Cleaned up DNA_sound_types.h, especially the bSound structure.
- Fixed a caching bug.
---
 source/blender/blenkernel/intern/sequence.c   |   2 +-
 source/blender/blenkernel/intern/sound.c      |  67 ++++++-----
 source/blender/blenloader/intern/readfile.c   |   8 +-
 .../editors/space_sequencer/sequencer_add.c   |   4 +-
 .../editors/space_sequencer/sequencer_draw.c  | 106 ------------------
 source/blender/makesdna/DNA_sound_types.h     |  93 +++++++--------
 .../Converter/KX_ConvertActuators.cpp         |   2 +-
 7 files changed, 87 insertions(+), 195 deletions(-)

diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c
index 159a60ad3af..c6b714c3125 100644
--- a/source/blender/blenkernel/intern/sequence.c
+++ b/source/blender/blenkernel/intern/sequence.c
@@ -570,7 +570,7 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq)
 		}
 		seq->strip->len = seq->len;
 	} else if (seq->type == SEQ_SOUND) {
-		seq->len = AUD_getInfo(seq->sound->snd_sound).length * FPS;
+		seq->len = AUD_getInfo(seq->sound->handle).length * FPS;
 		seq->len -= seq->anim_startofs;
 		seq->len -= seq->anim_endofs;
 		if (seq->len < 0) {
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index f6fb1ddcc5a..070b5786a74 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -79,11 +79,11 @@ struct bSound* sound_new_file(struct Main *main, char* filename)
 
 	sound = alloc_libblock(&main->sound, ID_SO, filename+len);
 	strcpy(sound->name, filename);
-	sound->type = SOUND_TYPE_FILE;
+// XXX unused currently	sound->type = SOUND_TYPE_FILE;
 
 	sound_load(main, sound);
 
-	if(!sound->snd_sound)
+	if(!sound->handle)
 	{
 		free_libblock(&main->sound, sound);
 		sound = NULL;
@@ -109,7 +109,7 @@ struct bSound* sound_new_buffer(struct bContext *C, struct bSound *source)
 
 	sound_load(CTX_data_main(C), sound);
 
-	if(!sound->snd_sound)
+	if(!sound->handle)
 	{
 		free_libblock(&CTX_data_main(C)->sound, sound);
 		sound = NULL;
@@ -135,7 +135,7 @@ struct bSound* sound_new_limiter(struct bContext *C, struct bSound *source, floa
 
 	sound_load(CTX_data_main(C), sound);
 
-	if(!sound->snd_sound)
+	if(!sound->handle)
 	{
 		free_libblock(&CTX_data_main(C)->sound, sound);
 		sound = NULL;
@@ -162,22 +162,25 @@ void sound_cache(struct bSound* sound, int ignore)
 	if(sound->cache && !ignore)
 		AUD_unload(sound->cache);
 
-	sound->cache = AUD_bufferSound(sound->snd_sound);
+	sound->cache = AUD_bufferSound(sound->handle);
 }
 
 void sound_load(struct Main *main, struct bSound* sound)
 {
 	if(sound)
 	{
-		if(sound->snd_sound)
+		if(sound->handle)
 		{
-			AUD_unload(sound->snd_sound);
-			sound->snd_sound = NULL;
+			AUD_unload(sound->handle);
+			sound->handle = NULL;
 		}
 
+// XXX unused currently
+#if 0
 		switch(sound->type)
 		{
 		case SOUND_TYPE_FILE:
+#endif
 		{
 			char fullpath[FILE_MAX];
 			char *path;
@@ -197,26 +200,25 @@ void sound_load(struct Main *main, struct bSound* sound)
 
 			/* but we need a packed file then */
 			if (pf)
-				sound->snd_sound = AUD_loadBuffer((unsigned char*) pf->data, pf->size);
+				sound->handle = AUD_loadBuffer((unsigned char*) pf->data, pf->size);
 			/* or else load it from disk */
 			else
-				sound->snd_sound = AUD_load(fullpath);
+				sound->handle = AUD_load(fullpath);
+		} // XXX
+// XXX unused currently
+#if 0
 			break;
 		}
 		case SOUND_TYPE_BUFFER:
-			if(sound->child_sound && sound->child_sound->snd_sound)
-				sound->snd_sound = AUD_bufferSound(sound->child_sound->snd_sound);
+			if(sound->child_sound && sound->child_sound->handle)
+				sound->handle = AUD_bufferSound(sound->child_sound->handle);
 			break;
 		case SOUND_TYPE_LIMITER:
-			if(sound->child_sound && sound->child_sound->snd_sound)
-				sound->snd_sound = AUD_limitSound(sound->child_sound, sound->start, sound->end);
+			if(sound->child_sound && sound->child_sound->handle)
+				sound->handle = AUD_limitSound(sound->child_sound, sound->start, sound->end);
 			break;
 		}
-
-		if(sound->cache)
-		{
-
-		}
+#endif
 	}
 }
 
@@ -228,10 +230,10 @@ void sound_free(struct bSound* sound)
 		sound->packedfile = NULL;
 	}
 
-	if(sound->snd_sound)
+	if(sound->handle)
 	{
-		AUD_unload(sound->snd_sound);
-		sound->snd_sound = NULL;
+		AUD_unload(sound->handle);
+		sound->handle = NULL;
 	}
 }
 
@@ -241,20 +243,23 @@ void sound_unlink(struct bContext *C, struct bSound* sound)
 	Scene *scene;
 	SoundHandle *handle;
 
+// XXX unused currently
+#if 0
 	for(snd = CTX_data_main(C)->sound.first; snd; snd = snd->id.next)
 	{
 		if(snd->child_sound == sound)
 		{
 			snd->child_sound = NULL;
-			if(snd->snd_sound)
+			if(snd->handle)
 			{
-				AUD_unload(sound->snd_sound);
-				snd->snd_sound = NULL;
+				AUD_unload(sound->handle);
+				snd->handle = NULL;
 			}
 
 			sound_unlink(C, snd);
 		}
 	}
+#endif
 
 	for(scene = CTX_data_main(C)->scene.first; scene; scene = scene->id.next)
 	{
@@ -372,9 +377,9 @@ void sound_update_playing(struct bContext *C)
 			{
 				if(handle->state == AUD_STATUS_INVALID)
 				{
-					if(handle->source && handle->source->snd_sound)
+					if(handle->source && handle->source->handle)
 					{
-						AUD_Sound* limiter = AUD_limitSound(handle->source->cache ? handle->source->cache : handle->source->snd_sound, handle->frameskip / fps, (handle->frameskip + handle->endframe - handle->startframe)/fps);
+						AUD_Sound* limiter = AUD_limitSound(handle->source->cache ? handle->source->cache : handle->source->handle, handle->frameskip / fps, (handle->frameskip + handle->endframe - handle->startframe)/fps);
 						handle->handle = AUD_play(limiter, 1);
 						AUD_unload(limiter);
 						if(handle->handle)
@@ -413,10 +418,10 @@ void sound_scrub(struct bContext *C)
 		{
 			if(cfra >= handle->startframe && cfra < handle->endframe && !handle->mute)
 			{
-				if(handle->source && handle->source->snd_sound)
+				if(handle->source && handle->source->handle)
 				{
 					int frameskip = handle->frameskip + cfra - handle->startframe;
-					AUD_Sound* limiter = AUD_limitSound(handle->source->cache ? handle->source->cache : handle->source->snd_sound, frameskip / fps, (frameskip + 1)/fps);
+					AUD_Sound* limiter = AUD_limitSound(handle->source->cache ? handle->source->cache : handle->source->handle, frameskip / fps, (frameskip + 1)/fps);
 					AUD_play(limiter, 0);
 					AUD_unload(limiter);
 				}
@@ -439,7 +444,7 @@ AUD_Device* sound_mixdown(struct Scene *scene, AUD_Specs specs, int start, int e
 
 	for(handle = scene->sound_handles.first; handle; handle = handle->next)
 	{
-		if(start < handle->endframe && end > handle->startframe && !handle->mute && handle->source && handle->source->snd_sound)
+		if(start < handle->endframe && end > handle->startframe && !handle->mute && handle->source && handle->source->handle)
 		{
 			frameskip = handle->frameskip;
 			s = handle->startframe - start;
@@ -451,7 +456,7 @@ AUD_Device* sound_mixdown(struct Scene *scene, AUD_Specs specs, int start, int e
 				s = 0;
 			}
 
-			limiter = AUD_limitSound(handle->source->snd_sound, frameskip / fps, e / fps);
+			limiter = AUD_limitSound(handle->source->handle, frameskip / fps, e / fps);
 			delayer = AUD_delaySound(limiter, s / fps);
 
 			AUD_playDevice(mixdown, delayer);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 913477198b8..6771135a772 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5061,10 +5061,13 @@ static void fix_relpaths_library(const char *basepath, Main *main)
 
 static void direct_link_sound(FileData *fd, bSound *sound)
 {
-	sound->snd_sound = NULL;
+	sound->handle = NULL;
 
 	sound->packedfile = direct_link_packedfile(fd, sound->packedfile);
 	sound->newpackedfile = direct_link_packedfile(fd, sound->newpackedfile);
+
+	if(sound->cache)
+		sound_cache(sound, 1);
 }
 
 static void lib_link_sound(FileData *fd, Main *main)
@@ -5076,8 +5079,7 @@ static void lib_link_sound(FileData *fd, Main *main)
 		if(sound->id.flag & LIB_NEEDLINK) {
 			sound->id.flag -= LIB_NEEDLINK;
 			sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system
-			sound->stream = 0;
-
+			
 			sound_load(main, sound);
 		}
 		sound= sound->id.next;
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index bdedef4b6c8..e6d50976957 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -242,13 +242,13 @@ static Sequence* sequencer_add_sound_strip(bContext *C, wmOperator *op, int star
 
 	sound = sound_new_file(CTX_data_main(C), filename);
 
-	if (sound==NULL || sound->snd_sound == NULL) {
+	if (sound==NULL || sound->handle == NULL) {
 		if(op)
 			BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
 		return NULL;
 	}
 
-	info = AUD_getInfo(sound->snd_sound);
+	info = AUD_getInfo(sound->handle);
 
 	if (info.specs.format == AUD_FORMAT_INVALID) {
 		sound_delete(C, sound);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 367bfb68208..76bed3772b1 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -225,108 +225,6 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 	}
 }
 
-static void drawseqwave(Scene *scene, View2D *v2d, Sequence *seq, float x1, float y1, float x2, float y2, int winx)
-{
-	/*
-	x1 is the starting x value to draw the wave,
-	x2 the end x value, same for y1 and y2
-	winx is the zoom level.
-	*/
-	
-	float
-	f, /* floating point value used to store the X draw location for the wave lines when openGL drawing*/
-	midy, /* fast access to the middle location (y1+y2)/2 */
-	clipxmin, /* the minimum X value, clip this with the window */
-	clipxmax, /* the maximum X value, clip this with the window */
-	sample_step, /* steps to move per sample, floating value must later translate into an int */
-	fsofs, /* steps to move per sample, floating value must later translate into an int */
-	feofs_sofs, /*  */
-	sound_width, /* convenience: x2-x1 */
-	wavemulti; /* scale the samples by this value when GL_LINE drawing so it renders the right height */
-	
-	int
-	offset, /* initial offset value for the wave drawing */
-	offset_next, /* when in the wave drawing loop this value is the samples intil the next vert */
-	sofs, /* Constrained offset value (~3) for the wave, start */
-	eofs, /* ditto, end */
-	wavesample, /* inner loop storage if the current wave sample value, used to make the 2 values below */
-	wavesamplemin, /* used for finding the min and max wave peaks */
-	wavesamplemax, /* ditto */
-	subsample_step=4; /* when the sample step is 4 every sample of
-	the wave is evaluated for min and max values used to draw the wave,
-	however this is slow ehrn zoomed out so when the sample step is above
-	1 (the larger the further out the zoom is) so not evaluate all samples, only some. */
-	
-	signed short* s;
-	bSound *sound;
-	uint8_t *stream;
-	
-// XXX	audio_makestream(seq->sound);
-	if(seq->sound==NULL || seq->sound->stream==NULL) return;
-	
-	if (seq->flag & SEQ_MUTE) glColor3ub(0x70, 0x80, 0x80); else glColor3ub(0x70, 0xc0, 0xc0);
-	
-	sofs = ((int)( FRA2TIME(seq->startdisp-seq->start+seq->anim_startofs)*(float)scene->r.audio.mixrate*4.0 )) & (~3);
-	eofs = ((int)( FRA2TIME(seq->enddisp-seq->start+seq->anim_startofs)*(float)scene->r.audio.mixrate*4.0 )) & (~3);
-	
-	/* clip the drawing area to the screen bounds to save time */
-	sample_step= (v2d->cur.xmax - v2d->cur.xmin)/winx;
-	clipxmin= MAX2(x1, v2d->cur.xmin);
-	clipxmax= MIN2(x2, v2d->cur.xmax);
-	
-	if (sample_step > 1)
-		subsample_step= ((int)(subsample_step*sample_step*8)) & (~3);
-	
-	/* for speedy access */
-	midy = (y1+y2)/2;
-	fsofs= (float)sofs;
-	feofs_sofs= (float)(eofs-sofs);
-	sound_width= x2-x1;
-	sound = seq->sound;
-	stream = sound->stream;
-	wavemulti = (y2-y1)/196605; /*y2-y1 is the height*/
-	wavesample=0;
-	
-	/* we need to get the starting offset value, excuse the duplicate code */
-	f=clipxmin;
-	offset= (int) (fsofs + ((f-x1)/sound_width) * feofs_sofs) & (~3);
-	
-	/* start the loop, draw a line per sample_step -sample_step is about 1 line drawn per pixel */
-	glBegin(GL_LINES);
-	for (f=x1+sample_step; f<=clipxmax; f+=sample_step) {
-		
-		offset_next = (int) (fsofs + ((f-x1)/sound_width) * feofs_sofs) & (~3);
-		if (f > v2d->cur.xmin) {
-			/* if this is close to the last sample just exit */
-			if (offset_next >= sound->streamlen) break;
-			
-			wavesamplemin = 131070;
-			wavesamplemax = -131070;
-			
-			/*find with high and low of the waveform for this draw,
-			evaluate small samples to find this range */
-			while (offset < offset_next) {
-				s = (signed short*)(stream+offset);
-				
-				wavesample = s[0]*2 + s[1];
-				if (wavesamplemin>wavesample)
-					wavesamplemin=wavesample;
-				if (wavesamplemax<wavesample)
-					wavesamplemax=wavesample;
-				offset+=subsample_step;
-			}
-			/* draw the wave line, looks good up close and zoomed out */
-			glVertex2f(f,  midy-(wavemulti*wavesamplemin) );
-			glVertex2f(f,  midy-(wavemulti*wavesamplemax) );
-		} else {
-			while (offset < offset_next) offset+=subsample_step;
-		}
-		
-		offset=offset_next;
-	}
-	glEnd();
-}
-
 /* draw a handle, for each end of a sequence strip */
 static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short direction)
 {
@@ -660,10 +558,6 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, SpaceSeq *sseq, Sequence *
 		draw_shadedstrip(seq, background_col, x1, y1, x2, y2);
 	
 	/* draw additional info and controls */
-	// XXX
-	if(0) // (seq->type == SEQ_SOUND)
-		drawseqwave(scene, v2d, seq, x1, y1, x2, y2, ar->winx);
-	
 	if (!is_single_image)
 		draw_seq_extensions(scene, sseq, seq);
 	
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 5f6ebf60865..55b48e4aacd 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -70,57 +70,59 @@ typedef struct Sound3D
 
 typedef struct bSound {
 	ID id;
-	char name[160];
-	void *stream; // AUD_XXX deprecated
-	struct PackedFile *packedfile;
-	struct PackedFile *newpackedfile; // AUD_XXX deprecated
-	void *snd_sound; // AUD_XXX used for AUD_Sound now
-	struct Ipo *ipo; // AUD_XXX deprecated
-	float volume, panning; // AUD_XXX deprecated
-	/**
-	 * Sets the rollofffactor. The	rollofffactor is a per-Source parameter
-	 * the application can use to increase or decrease	the range of a source
-	 * by decreasing or increasing the attenuation, respectively. The default
-	 * value is 1. The implementation is free to optimize for a rollofffactor
-	 * value of 0, which indicates that the application does not wish any
-	 * distance attenuation on the respective Source.
-	 */
-	float attenuation; // AUD_XXX deprecated
-	float pitch; // AUD_XXX deprecated
-	/**
-	 * min_gain indicates the minimal gain which is always guaranteed for this sound
-	 */
-	float min_gain; // AUD_XXX deprecated
-	/**
-	 * max_gain indicates the maximal gain which is always guaranteed for this sound
-	 */
-	float max_gain; // AUD_XXX deprecated
-	/**
-	 * Sets the referencedistance at which the listener will experience gain.
-	 */
-	float distance; // AUD_XXX deprecated
-	int flags; // AUD_XXX deprecated
-	int streamlen; // AUD_XXX deprecated
-	char channels; // AUD_XXX deprecated
-	char highprio; // AUD_XXX deprecated
-	char pad[10]; // AUD_XXX deprecated
 
-	// AUD_XXX NEW
-	int type;
+	/**
+	 * The path to the sound file.
+	 */
+	char name[160];
+
+	/**
+	 * The packed file.
+	 */
+	struct PackedFile *packedfile;
+
+	/**
+	 * The handle for audaspace.
+	 */
+	void *handle;
+
+	/**
+	 * Deprecated; used for loading pre 2.5 files.
+	 */
+	struct PackedFile *newpackedfile;
+	struct Ipo *ipo;
+	float volume;
+	float attenuation;
+	float pitch;
+	float min_gain;
+	float max_gain;
+	float distance;
+	int flags;
+
+/**	currently	int type;
+	struct bSound *child_sound;*/
+
+	/**
+	 * Whether the sound has been changed and must be restarted if playing.
+	 */
 	int changed;
-	struct bSound *child_sound;
+
+	/**
+	 * The audaspace handle for cache.
+	 */
 	void *cache;
 
-	// SOUND_TYPE_LIMITER
-	float start, end;
+/**	XXX unused currently	// SOUND_TYPE_LIMITER
+	float start, end;*/
 } bSound;
 
+/* XXX unused currently
 typedef enum eSound_Type {
 	SOUND_TYPE_INVALID = -1,
 	SOUND_TYPE_FILE = 0,
 	SOUND_TYPE_BUFFER,
 	SOUND_TYPE_LIMITER
-} eSound_Type;
+} eSound_Type;*/
 
 /* spacesound->flag */
 #define SND_DRAWFRAMES	1
@@ -142,18 +144,7 @@ typedef struct SpaceSound {
 	int pad2;
 } SpaceSound;
 
-
-#define SOUND_CHANNELS_STEREO	0
-#define SOUND_CHANNELS_LEFT		1
-#define SOUND_CHANNELS_RIGHT	2
-
-#define SOUND_FLAGS_LOOP 				(1 << 0)
-#define SOUND_FLAGS_FIXED_VOLUME 		(1 << 1)
-#define SOUND_FLAGS_FIXED_PANNING 		(1 << 2)
 #define SOUND_FLAGS_3D					(1 << 3)
-#define SOUND_FLAGS_BIDIRECTIONAL_LOOP	(1 << 4)
-#define SOUND_FLAGS_PRIORITY			(1 << 5)
-#define SOUND_FLAGS_SEQUENCE			(1 << 6)
 
 /* to DNA_sound_types.h*/
 
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 07f6f628e06..91a39bd7686 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -396,7 +396,7 @@ void BL_ConvertActuators(char* maggiename,
 										"\" has no sound datablock." << std::endl;
 					}
 					else
-						snd_sound = sound->cache ? sound->cache : sound->snd_sound;
+						snd_sound = sound->cache ? sound->cache : sound->handle;
 					KX_SoundActuator* tmpsoundact =
 						new KX_SoundActuator(gameobj,
 						snd_sound,

From 6badfa583671cea43e6617e5485c56558ff3ec14 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Wed, 26 Aug 2009 15:13:58 +0000
Subject: [PATCH 286/577] 2.5 Scene RNA:

* Added RNA for Render Baking.
Missing: Bake Operator and property "Quad Split Order".
---
 source/blender/makesrna/intern/rna_scene.c | 81 +++++++++++++++++++++-
 1 file changed, 79 insertions(+), 2 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 209c771834d..86ceee55f47 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -32,6 +32,9 @@
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
 
+/* Include for Bake Options */
+#include "RE_pipeline.h"
+
 #ifdef WITH_FFMPEG
 #include "BKE_writeffmpeg.h"
 #include <libavcodec/avcodec.h> 
@@ -1110,6 +1113,30 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 		{R_OUTPUT_WINDOW, "WINDOW", 0, "New Window", "Images are rendered in new Window"},
 		{0, NULL, 0, NULL, NULL}};
 	
+	/* Bake */
+	static EnumPropertyItem bake_mode_items[] ={
+		{RE_BAKE_ALL, "FULL", 0, "Full Render", ""},
+		{RE_BAKE_AO, "AO", 0, "Ambient Occlusion", ""},
+		{RE_BAKE_SHADOW, "SHADOW", 0, "Shadow", ""},
+		{RE_BAKE_NORMALS, "NORMALS", 0, "Normals", ""},
+		{RE_BAKE_TEXTURE, "TEXTURE", 0, "Textures", ""},
+		{RE_BAKE_DISPLACEMENT, "DISPLACEMENT", 0, "Displacement", ""},
+		{0, NULL, 0, NULL, NULL}};
+
+	static EnumPropertyItem bake_normal_space_items[] ={
+		{R_BAKE_SPACE_CAMERA, "CAMERA", 0, "Camera", ""},
+		{R_BAKE_SPACE_WORLD, "WORLD", 0, "World", ""},
+		{R_BAKE_SPACE_OBJECT, "OBJECT", 0, "Object", ""},
+		{R_BAKE_SPACE_TANGENT, "TANGENT", 0, "Tangent", ""},
+		{0, NULL, 0, NULL, NULL}};
+		
+	static EnumPropertyItem bake_aa_items[] ={
+		{5, "AA_5", 0, "5", ""},
+		{8, "AA_8", 0, "8", ""},
+		{11, "AA_11", 0, "11", ""},
+		{16, "AA_16", 0, "16", ""},
+		{0, NULL, 0, NULL, NULL}};
+	
 	static EnumPropertyItem octree_resolution_items[] = {
 		{64, "OCTREE_RES_64", 0, "64", ""},
 		{128, "OCTREE_RES_128", 0, "128", ""},
@@ -1141,8 +1168,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 		{0, "STAMP_FONT_LARGE", 0, "Large", ""},
 		{4, "STAMP_FONT_EXTRALARGE", 0, "Extra Large", ""},
 		{0, NULL, 0, NULL, NULL}};
-		
-	
+
 	static EnumPropertyItem image_type_items[] = {
 		{0, "", 0, "Image", NULL},
 		{R_PNG, "PNG", 0, "PNG", ""},
@@ -1707,6 +1733,57 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Output Path", "Directory/name to save animations, # characters defines the position and length of frame numbers.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
+	/* Bake */
+	
+	prop= RNA_def_property(srna, "bake_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_mode");
+	RNA_def_property_enum_items(prop, bake_mode_items);
+	RNA_def_property_ui_text(prop, "Bake Mode", "");
+	
+	prop= RNA_def_property(srna, "bake_normal_space", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_normal_space");
+	RNA_def_property_enum_items(prop, bake_normal_space_items);
+	RNA_def_property_ui_text(prop, "Normal Space", "Choose normal space for baking");
+	
+	prop= RNA_def_property(srna, "bake_aa_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_osa");
+	RNA_def_property_enum_items(prop, bake_aa_items);
+	RNA_def_property_ui_text(prop, "Anti-Aliasing Level", "");
+	
+	prop= RNA_def_property(srna, "bake_active", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_TO_ACTIVE);
+	RNA_def_property_ui_text(prop, "Selected to Active", "Bake shading on the surface of selected objects to the active object");
+	
+	prop= RNA_def_property(srna, "bake_normalized", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_NORMALIZE);
+	RNA_def_property_ui_text(prop, "Normalized", "");
+	//"Bake ambient occlusion normalized, without taking into acount material settings"
+	//"Normalized displacement value to fit the 'Dist' range"
+	// XXX: Need 1 tooltip here...
+	
+	prop= RNA_def_property(srna, "bake_clear", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_CLEAR);
+	RNA_def_property_ui_text(prop, "Clear", "Clear Images before baking");
+	
+	prop= RNA_def_property(srna, "bake_enable_aa", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_OSA);
+	RNA_def_property_ui_text(prop, "Anti-Aliasing", "Enables Anti-aliasing");
+	
+	prop= RNA_def_property(srna, "bake_margin", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "bake_filter");
+	RNA_def_property_range(prop, 0, 32);
+	RNA_def_property_ui_text(prop, "Margin", "Amount of pixels to extend the baked result with, as post process filter");
+
+	prop= RNA_def_property(srna, "bake_distance", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "bake_maxdist");
+	RNA_def_property_range(prop, 0.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Distance", "Maximum distance from active object to other object (in blender units");
+	
+	prop= RNA_def_property(srna, "bake_bias", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "bake_biasdist");
+	RNA_def_property_range(prop, 0.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Bias", "Bias towards faces further away from the object (in blender units)");
+	
 	/* stamp */
 	
 	prop= RNA_def_property(srna, "stamp_time", PROP_BOOLEAN, PROP_NONE);

From 0db2975ff6cc2592b062f749059e640dc1e2b140 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 26 Aug 2009 16:05:01 +0000
Subject: [PATCH 287/577] [#18837] if a sunlamp is set to a too high energy,
 speculars turn black

shr->spec values could be greater then 1.0, causing negative color when using (1.0-shr->spec[i]) as a blending factor.

When shr->spec[i] is 1.0 the mircol is ignored, so only mix the mircol when needed (like clamping the spec).
---
 source/blender/render/intern/source/rayshade.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 75b9557f337..182e60365a6 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -1239,15 +1239,18 @@ void ray_trace(ShadeInput *shi, ShadeResult *shr)
 			}
 			
 			if(shi->combinedflag & SCE_PASS_REFLECT) {
+				/* values in shr->spec can be greater then 1.0.
+				 * in the case when it is 1.0 diff */
 				
-				f= fr*(1.0f-shr->spec[0]);	f1= 1.0f-i;
-				diff[0]= f*mircol[0] + f1*diff[0];
+				f1= 1.0f-i;
 				
-				f= fg*(1.0f-shr->spec[1]);	f1= 1.0f-i;
-				diff[1]= f*mircol[1] + f1*diff[1];
+				diff[0] *= f1;
+				diff[1] *= f1;
+				diff[2] *= f1;
 				
-				f= fb*(1.0f-shr->spec[2]);	f1= 1.0f-i;
-				diff[2]= f*mircol[2] + f1*diff[2];
+				if(shr->spec[0]<1.0f)	diff[0] += mircol[0] * (fr*(1.0f-shr->spec[0]));
+				if(shr->spec[1]<1.0f)	diff[1] += mircol[1] * (fg*(1.0f-shr->spec[1]));
+				if(shr->spec[2]<1.0f)	diff[2] += mircol[2] * (fb*(1.0f-shr->spec[2]));
 			}
 		}
 	}

From 1e50c17f91cbd09929ab9624b045ba2e8ea0f979 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Wed, 26 Aug 2009 17:13:20 +0000
Subject: [PATCH 288/577] Update makefile for libed_gpencil.

---
 source/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/Makefile b/source/Makefile
index 93bd2e23903..a13d8bb41d5 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -265,6 +265,7 @@ PULIB += $(OCGDIR)/blender/ed_uvedit/$(DEBUG_DIR)libed_uvedit.a
 PULIB += $(OCGDIR)/blender/ed_screen/$(DEBUG_DIR)libed_screen.a
 PULIB += $(OCGDIR)/blender/ed_console/$(DEBUG_DIR)libed_console.a
 PULIB += $(OCGDIR)/blender/ed_userpref/$(DEBUG_DIR)libed_userpref.a
+PULIB += $(OCGDIR)/blender/ed_gpencil/$(DEBUG_DIR)libed_gpencil.a
 PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
 PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a

From c30f54e326aa38c383c24dd288d3e0b8ce07d2d4 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Wed, 26 Aug 2009 18:20:17 +0000
Subject: [PATCH 289/577] 2.5 Sound: RNA for bSound.

---
 source/blender/blenkernel/BKE_sound.h      |  2 ++
 source/blender/blenkernel/intern/sound.c   | 11 ++++++++
 source/blender/makesrna/intern/rna_sound.c | 29 ++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index 84ecd79a008..e9f6eb21e36 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -54,6 +54,8 @@ void sound_delete(struct bContext *C, struct bSound* sound);
 
 void sound_cache(struct bSound* sound, int ignore);
 
+void sound_delete_cache(struct bSound* sound);
+
 void sound_load(struct Main *main, struct bSound* sound);
 
 void sound_free(struct bSound* sound);
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 070b5786a74..3794fbe90ef 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -163,6 +163,16 @@ void sound_cache(struct bSound* sound, int ignore)
 		AUD_unload(sound->cache);
 
 	sound->cache = AUD_bufferSound(sound->handle);
+	sound->changed = TRUE;
+}
+
+void sound_delete_cache(struct bSound* sound)
+{
+	if(sound->cache)
+	{
+		AUD_unload(sound->cache);
+		sound->cache = NULL;
+	}
 }
 
 void sound_load(struct Main *main, struct bSound* sound)
@@ -219,6 +229,7 @@ void sound_load(struct Main *main, struct bSound* sound)
 			break;
 		}
 #endif
+		sound->changed = TRUE;
 	}
 }
 
diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c
index a029ef85544..38e4d850c68 100644
--- a/source/blender/makesrna/intern/rna_sound.c
+++ b/source/blender/makesrna/intern/rna_sound.c
@@ -34,6 +34,29 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BKE_sound.h"
+#include "BKE_context.h"
+
+static void rna_Sound_filename_update(bContext *C, PointerRNA *ptr)
+{
+	sound_load(CTX_data_main(C), (bSound*)ptr->data);
+}
+
+static int rna_Sound_caching_get(PointerRNA *ptr)
+{
+	bSound *sound = (bSound*)(ptr->data);
+	return sound->cache != NULL;
+}
+
+static void rna_Sound_caching_set(PointerRNA *ptr, const int value)
+{
+	bSound *sound = (bSound*)(ptr->data);
+	if(value)
+		sound_cache(sound, 0);
+	else
+		sound_delete_cache(sound);
+}
+
 #else
 
 static void rna_def_sound(BlenderRNA *brna)
@@ -51,10 +74,16 @@ static void rna_def_sound(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "Filename", "Sound sample file used by this Sound datablock.");
+	RNA_def_property_update(prop, 0, "rna_Sound_filename_update");
 
 	prop= RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "packedfile");
 	RNA_def_property_ui_text(prop, "Packed File", "");
+
+	prop= RNA_def_property(srna, "caching", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_Sound_caching_get", "rna_Sound_caching_set");
+	RNA_def_property_ui_text(prop, "Caching", "The sound file is decoded and loaded into RAM.");
+	RNA_def_property_update(prop, 0, "rna_Sound_filename_update");
 }
 
 void RNA_def_sound(BlenderRNA *brna)

From ae8dcde0e2daa9c74ef6db40abe20256fe5675cb Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Wed, 26 Aug 2009 19:30:02 +0000
Subject: [PATCH 290/577] SVN maintenance.

---
 source/blender/editors/gpencil/gpencil_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index cb6d66b2fcc..c5fa8398cd8 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -1,5 +1,5 @@
 /**
- * $Id: gpencil_ops.c 21617 2009-07-16 04:45:52Z aligorith $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *

From a3bc7f3d1d2824a1d05832a4c9186f440fbb91b0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 26 Aug 2009 20:06:16 +0000
Subject: [PATCH 291/577] BGE shape key actuator working, though only tried a
 simple testcase.

---
 source/blender/blenkernel/intern/sca.c               |  2 --
 .../gameengine/Converter/BL_ShapeActionActuator.cpp  | 12 ++++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index 139895bbdaf..e4d73208c64 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -418,12 +418,10 @@ void init_actuator(bActuator *act)
 	act->data= 0;
 	
 	switch(act->type) {
-#ifdef __NLA
 	case ACT_ACTION:
 	case ACT_SHAPEACTION:
 		act->data= MEM_callocN(sizeof(bActionActuator), "actionact");
 		break;
-#endif
 	case ACT_SOUND:
 		sa = act->data= MEM_callocN(sizeof(bSoundActuator), "soundact");
 		sa->volume = 1.0f;
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 44eb603a940..81ce9ff6154 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -40,6 +40,7 @@
 #include "STR_HashedString.h"
 #include "DNA_nla_types.h"
 #include "DNA_action_types.h"
+#include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 #include "BKE_action.h"
 #include "DNA_armature_types.h"
@@ -51,6 +52,10 @@
 #include "FloatValue.h"
 #include "PyObjectPlus.h"
 
+extern "C" {
+	#include "BKE_animsys.h"
+}
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -370,8 +375,11 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame)
 					m_blendstart = curtime;
 				}
 				// only interested in shape channel
-				// XXX extract_ipochannels_from_action(&tchanbase, &key->id, m_action, "Shape", m_localtime);
-		
+
+				// in 2.4x was // extract_ipochannels_from_action(&tchanbase, &key->id, m_action, "Shape", m_localtime);
+				BKE_animsys_evaluate_animdata(&key->id, key->adt, m_localtime, ADT_RECALC_ANIM);
+
+				// XXX - in 2.5 theres no way to do this. possibly not that important to support - Campbell
 				if (0) { // XXX !execute_ipochannels(&tchanbase)) {
 					// no update, this is possible if action does not match the keys, stop the action
 					keepgoing = false;

From 65b7d58fa212377226f9a132cfd274a76328e2a6 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Thu, 27 Aug 2009 01:01:13 +0000
Subject: [PATCH 292/577] Grease Pencil: Bugfixes

* Realtime updates now work again
* Fixed problems with clicks to start drawing resulting in a stroke being ended.
* Changed the hotkeys to Ctrl-Alt-Shift-LMB (draw) and Ctrl-Alt-Shift-RMB (erase). Still very temporary stuff, will probably change these a few more times as I experiment with new approaches.
---
 source/blender/editors/gpencil/gpencil_ops.c  |  8 ++++--
 .../blender/editors/gpencil/gpencil_paint.c   | 26 +++++++++++--------
 .../editors/space_view3d/view3d_draw.c        |  6 ++---
 source/blender/windowmanager/WM_types.h       |  1 +
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index c5fa8398cd8..c18c7bb3f78 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -47,14 +47,18 @@
 
 void gpencil_common_keymap(wmWindowManager *wm, ListBase *keymap)
 {
-	wmKeymapItem *km;
+	wmKeymapItem *kmi;
 	
 	/* if no keymap provided, use default */
 	if (keymap == NULL)
 		keymap= WM_keymap_listbase(wm, "Grease Pencil Generic", 0, 0);
 	
 	/* Draw */
-	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", SKEY, KM_PRESS, 0, DKEY);
+		/* draw */
+	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0);
+		/* erase */
+	kmi=WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0);
+		RNA_enum_set(kmi->ptr, "mode", 1); // XXX need to make the defines for this public (this is GP_PAINTMODE_ERASER)
 }
 
 /* ****************************************** */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index dc701924b3e..059c3417a04 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -859,7 +859,7 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 		p->scene->gpd= p->gpd;
 	}
 	
-	/* set edit flags */
+	/* set edit flags - so that buffer will get drawn */
 	G.f |= G_GREASEPENCIL;
 	
 	/* set initial run flag */
@@ -1171,7 +1171,7 @@ static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *even
 	}
 	
 	/* force refresh */
-	ED_area_tag_redraw(p->sa); // XXX this is crude
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
 }
 
 /* ------------------------------- */
@@ -1216,6 +1216,18 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 	printf("\tGP - handle modal event...\n");
 	
 	switch (event->type) {
+		/* end of stroke -> ONLY when a mouse-button release occurs 
+		 * otherwise, carry on to mouse-move...
+		 */
+		case LEFTMOUSE:
+		case MIDDLEMOUSE:
+		case RIGHTMOUSE: 
+			if (event->val != KM_PRESS) {
+				printf("\t\tGP - end of stroke \n");
+				gpencil_draw_exit(C, op);
+				return OPERATOR_FINISHED;
+			}
+		
 		/* moving mouse - assumed that mouse button is down */
 		case MOUSEMOVE:
 			/* handle drawing event */
@@ -1230,14 +1242,6 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 			}
 			break;
 		
-		/* end of stroke - i.e. when a mouse-button release occurs */
-		case LEFTMOUSE:
-		case MIDDLEMOUSE:
-		case RIGHTMOUSE: 
-			printf("\t\tGP - end of stroke \n");
-			gpencil_draw_exit(C, op);
-			return OPERATOR_FINISHED;
-			
 		/* scrolling mouse-wheel increases radius of eraser 
 		 * 	- though this is quite a difficult action to perform
 		 */
@@ -1259,7 +1263,7 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 			break;
 			
 		default:
-			return OPERATOR_RUNNING_MODAL|OPERATOR_PASS_THROUGH;
+			printf("\t\tGP unknown event - %d \n", event->type);
 			break;
 	}
 	
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 07ffb35f807..4ca1f296f15 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2084,7 +2084,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	
 	/* draw grease-pencil stuff */
 	//if (v3d->flag2 & V3D_DISPGP)
-		draw_gpencil_3dview(C, 1);
+		draw_gpencil_3dview((bContext *)C, 1);
 	
 	BDR_drawSketch(C);
 	
@@ -2100,9 +2100,9 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	if(rv3d->persp>1) drawviewborder(scene, ar, v3d);
 	if(rv3d->rflag & RV3D_FLYMODE) drawviewborder_flymode(ar);
 	
-	/* draw grease-pencil stuff */
+	/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
 //	if (v3d->flag2 & V3D_DISPGP)
-//		draw_gpencil_3dview(ar, 0);
+		draw_gpencil_3dview((bContext *)C, 0);
 
 	drawcursor(scene, ar, v3d);
 	
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 42ee6e926fc..5687cb565d1 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -149,6 +149,7 @@ typedef struct wmNotifier {
 #define ND_SCREENDELETE		(2<<16)
 #define ND_SCREENCAST		(3<<16)
 #define ND_ANIMPLAY			(4<<16)
+#define ND_GPENCIL			(5<<16)
 
 	/* NC_SCENE Scene */
 #define ND_SCENEBROWSE		(1<<16)

From 7994ff39b8acff9a7addbacb97a26387ce181025 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Thu, 27 Aug 2009 01:57:09 +0000
Subject: [PATCH 293/577] Grease Pencil: Another quick experiment - easier
 usage

* Changed the hotkey to simply be:
Hold DKEY, click+drag using Left-Mouse (draw) or Right-Mouse (erase). How to get tablet erasers to work (via keymaps) is on todo...
You can simply hold DKEY until you've finished drawing, thanks to the nice way that keymaps can support standard-key modifiers now.

* Eraser works now too.
---
 source/blender/editors/gpencil/gpencil_ops.c   |  8 ++++++--
 source/blender/editors/gpencil/gpencil_paint.c | 10 ++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index c18c7bb3f78..347a611ee30 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -55,9 +55,9 @@ void gpencil_common_keymap(wmWindowManager *wm, ListBase *keymap)
 	
 	/* Draw */
 		/* draw */
-	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0);
+	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, 0, DKEY);
 		/* erase */
-	kmi=WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0);
+	kmi=WM_keymap_add_item(keymap, "GPENCIL_OT_draw", RIGHTMOUSE, KM_PRESS, 0, DKEY);
 		RNA_enum_set(kmi->ptr, "mode", 1); // XXX need to make the defines for this public (this is GP_PAINTMODE_ERASER)
 }
 
@@ -67,6 +67,10 @@ void ED_operatortypes_gpencil (void)
 {
 	/* Drawing ----------------------- */
 	WM_operatortype_append(GPENCIL_OT_draw);
+	
+	/* Editing (Buttons) ------------ */
+	
+	/* Editing (Time) --------------- */
 }
 
 /* ****************************************** */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 059c3417a04..2f60efb2179 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1030,6 +1030,7 @@ static void gp_paint_cleanup (tGPsdata *p)
 static int gpencil_draw_init (bContext *C, wmOperator *op)
 {
 	tGPsdata *p;
+	wmWindow *win= CTX_wm_window(C);
 	int paintmode= RNA_enum_get(op->ptr, "mode");
 	
 	/* check context */
@@ -1048,9 +1049,14 @@ static int gpencil_draw_init (bContext *C, wmOperator *op)
 	}
 	
 	/* radius for eraser circle is defined in userprefs now */
-	// TODO: make this more easily tweaked... 
 	p->radius= U.gp_eraser;
 	
+	/* set cursor */
+	if (p->paintmode == GP_PAINTMODE_ERASER)
+		WM_cursor_modal(win, BC_CROSSCURSOR); // XXX need a better cursor
+	else
+		WM_cursor_modal(win, BC_PAINTBRUSHCURSOR);
+	
 	/* everything is now setup ok */
 	return 1;
 }
@@ -1065,7 +1071,7 @@ static void gpencil_draw_exit (bContext *C, wmOperator *op)
 	G.f &= ~G_GREASEPENCIL;
 	
 	/* restore cursor to indicate end of drawing */
-	// XXX  (cursor callbacks in regiontype) setcursor_space(p.sa->spacetype, CURSOR_STD);
+	WM_cursor_restore(CTX_wm_window(C));
 	
 	/* check size of buffer before cleanup, to determine if anything happened here */
 	if (p->paintmode == GP_PAINTMODE_ERASER) {

From fe46d5ba7ac6679121acc08574955b22f7653fc7 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Thu, 27 Aug 2009 06:03:41 +0000
Subject: [PATCH 294/577] Grease Pencil: RNA Wrapping

* Wrapped Grease Pencil datatypes in RNA.
* Hooked up Grease Pencil access in RNA (i.e. via Main, ID, and Scene)

TODO:
Updates to properties are currently lacking property-update calls, since there's no good notifier for this.
---
 source/blender/makesdna/DNA_gpencil_types.h   |   4 +-
 source/blender/makesrna/RNA_access.h          |   5 +
 source/blender/makesrna/intern/makesrna.c     |   1 +
 source/blender/makesrna/intern/rna_ID.c       |   1 +
 source/blender/makesrna/intern/rna_action.c   |  20 +-
 .../blender/makesrna/intern/rna_animation.c   |   3 +-
 source/blender/makesrna/intern/rna_gpencil.c  | 242 ++++++++++++++++++
 source/blender/makesrna/intern/rna_internal.h |   1 +
 source/blender/makesrna/intern/rna_main.c     |   9 +-
 source/blender/makesrna/intern/rna_scene.c    |   8 +
 10 files changed, 280 insertions(+), 14 deletions(-)
 create mode 100644 source/blender/makesrna/intern/rna_gpencil.c

diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index ed209a127c7..4bae9935ea7 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -33,7 +33,7 @@
 /* Grease-Pencil Annotations - 'Stroke Point'
  *	-> Coordinates may either be 2d or 3d depending on settings at the time
  * 	-> Coordinates of point on stroke, in proportions of window size
- *		(i.e. n/1000). This assumes that the bottom-left corner is (0,0)
+ *	   This assumes that the bottom-left corner is (0,0)
  */
 typedef struct bGPDspoint {
 	float x, y, z;			/* co-ordinates of point (usually 2d, but can be 3d as well) */				
@@ -135,12 +135,14 @@ typedef struct bGPdata {
 /* bGPdata->flag */
 // XXX many of these flags should be depreceated for more general ideas in 2.5
 	/* don't allow painting to occur at all */
+	// XXX is depreceated - not well understood
 #define GP_DATA_LMBPLOCK	(1<<0)
 	/* show debugging info in viewport (i.e. status print) */
 #define GP_DATA_DISPINFO	(1<<1)
 	/* in Action Editor, show as expanded channel */
 #define GP_DATA_EXPAND		(1<<2)
 	/* is the block overriding all clicks? */
+	// XXX is depreceated - nasty old concept
 #define GP_DATA_EDITPAINT	(1<<3)
 	/* new strokes are added in viewport space */
 #define GP_DATA_VIEWALIGN	(1<<4)
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index ea7451ee77a..98205d17ef3 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -213,6 +213,11 @@ extern StructRNA RNA_GameSoftBodySettings;
 extern StructRNA RNA_GameStringProperty;
 extern StructRNA RNA_GameTimerProperty;
 extern StructRNA RNA_GlowSequence;
+extern StructRNA RNA_GreasePencil;
+extern StructRNA RNA_GPencilLayer;
+extern StructRNA RNA_GPencilFrame;
+extern StructRNA RNA_GPencilStroke;
+extern StructRNA RNA_GPencilStrokePoint;
 extern StructRNA RNA_Group;
 extern StructRNA RNA_Header;
 extern StructRNA RNA_HemiLamp;
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 0c90a28a0e9..bb7b6cbcd37 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1964,6 +1964,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
 	{"rna_curve.c", NULL, RNA_def_curve},
 	{"rna_fcurve.c", NULL, RNA_def_fcurve},
 	{"rna_fluidsim.c", NULL, RNA_def_fluidsim},
+	{"rna_gpencil.c", NULL, RNA_def_gpencil},
 	{"rna_group.c", NULL, RNA_def_group},
 	{"rna_image.c", NULL, RNA_def_image},
 	{"rna_key.c", NULL, RNA_def_key},
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index f6e0a2468c4..dd26391b11e 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -97,6 +97,7 @@ StructRNA *ID_code_to_RNA_type(short idcode)
 		case ID_BR: return &RNA_Brush;
 		case ID_CA: return &RNA_Camera;
 		case ID_CU: return &RNA_Curve;
+		case ID_GD: return &RNA_GreasePencil;
 		case ID_GR: return &RNA_Group;
 		case ID_IM: return &RNA_Image;
 		case ID_KE: return &RNA_Key;
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 3639d6d3fff..e376d3125e3 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -42,15 +42,15 @@ void rna_def_action_group(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
-
+	
 	srna= RNA_def_struct(brna, "ActionGroup", NULL);
 	RNA_def_struct_sdna(srna, "bActionGroup");
 	RNA_def_struct_ui_text(srna, "Action Group", "Groups of F-Curves.");
-
+	
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "");
 	RNA_def_struct_name_property(srna, prop);
-
+	
 	/* dna warns not to treat the Action Channel listbase in the Action Group struct like a
 	   normal listbase. I'll leave this here but comment out, for Joshua to review. He can 
  	   probably shed some more light on why this is */
@@ -58,19 +58,19 @@ void rna_def_action_group(BlenderRNA *brna)
 	RNA_def_property_collection_sdna(prop, NULL, "channels", NULL);
 	RNA_def_property_struct_type(prop, "FCurve");
 	RNA_def_property_ui_text(prop, "Channels", "F-Curves in this group.");*/
-
+	
 	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED);
 	RNA_def_property_ui_text(prop, "Selected", "Action Group is selected.");
-
+	
 	prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED);
 	RNA_def_property_ui_text(prop, "Locked", "Action Group is locked.");
-
+	
 	prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_EXPANDED);
 	RNA_def_property_ui_text(prop, "Expanded", "Action Group is expanded.");
-
+	
 	prop= RNA_def_property(srna, "custom_color", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "customCol");
 	RNA_def_property_ui_text(prop, "Custom Color", "Index of custom color set.");
@@ -85,17 +85,17 @@ void rna_def_action(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "bAction");
 	RNA_def_struct_ui_text(srna, "Action", "A collection of F-Curves for animation.");
 	RNA_def_struct_ui_icon(srna, ICON_ACTION);
-
+	
 	prop= RNA_def_property(srna, "fcurves", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "curves", NULL);
 	RNA_def_property_struct_type(prop, "FCurve");
 	RNA_def_property_ui_text(prop, "F-Curves", "The individual F-Curves that make up the Action.");
-
+	
 	prop= RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "groups", NULL);
 	RNA_def_property_struct_type(prop, "ActionGroup");
 	RNA_def_property_ui_text(prop, "Groups", "Convenient groupings of F-Curves.");
-
+	
 	prop= RNA_def_property(srna, "pose_markers", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "markers", NULL);
 	RNA_def_property_struct_type(prop, "TimelineMarker");
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c
index 7652987ac86..e4bea893992 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -17,7 +17,7 @@
  * 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): Blender Foundation (2008), Roland Hess
+ * Contributor(s): Blender Foundation (2009), Joshua Leung
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -157,7 +157,6 @@ void rna_def_keyingset(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", KEYINGSET_BUILTIN);
 	RNA_def_property_ui_text(prop, "Built-In", "Keying Set is a built-in to Blender.");
 	
-		/* TODO: for now, this is editable, but do we really want this to happen? */
 	prop= RNA_def_property(srna, "absolute", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", KEYINGSET_ABSOLUTE);
 	RNA_def_property_ui_text(prop, "Absolute", "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)");
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
new file mode 100644
index 00000000000..2ef7d9d2d90
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -0,0 +1,242 @@
+/**
+ * $Id: rna_gpencil.c 22756 2009-08-25 04:05:37Z aligorith $
+ *
+ * ***** 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): Blender Foundation (2009), Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+#include "RNA_enum_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_gpencil_types.h"
+#include "DNA_scene_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#ifdef RNA_RUNTIME
+
+static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr)
+{
+	bGPDlayer *gpl= (bGPDlayer *)ptr->data;
+	
+	/* surely there must be other criteria too... */
+	if (gpl->flag & GP_LAYER_LOCKED)
+		return 0;
+	else
+		return 1;
+}
+
+void rna_GPencilLayer_active_set(PointerRNA *ptr, int value)
+{
+	bGPdata *gpd= ptr->id.data;
+	bGPDlayer *gpl= ptr->data;
+	
+	/* disabled all other layers anyway */
+	if (GS(gpd->id.name) == ID_GD) {
+		bGPDlayer *gl;
+		
+		for (gl= gpd->layers.first; gl; gl= gl->next)
+			gl->flag &= ~GP_LAYER_ACTIVE;
+	}	
+	
+	/* if enabling value, make it active */
+	if (value)
+		gpl->flag |= GP_LAYER_ACTIVE;
+}
+
+#else
+
+void rna_def_gpencil_stroke_point(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "GPencilStrokePoint", NULL);
+	RNA_def_struct_sdna(srna, "bGPDspoint");
+	RNA_def_struct_ui_text(srna, "Grease Pencil Stroke Point", "Data point for freehand stroke curve.");
+	
+	prop= RNA_def_property(srna, "coordinates", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "x");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Coordinates", "");
+	
+	prop= RNA_def_property(srna, "pressure", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "pressure");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Pressure", "Pressure of tablet at point when drawing it.");
+}
+
+void rna_def_gpencil_stroke(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "GPencilStroke", NULL);
+	RNA_def_struct_sdna(srna, "bGPDstroke");
+	RNA_def_struct_ui_text(srna, "Grease Pencil Stroke", "Freehand curve defining part of a sketch.");
+	
+	/* Points */
+	prop= RNA_def_property(srna, "points", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "points", "totpoints");
+	RNA_def_property_struct_type(prop, "GPencilStrokePoint");
+	RNA_def_property_ui_text(prop, "Stroke Points", "Stroke data points");
+	
+	/* Flags - Readonly type-info really... */
+	// TODO...
+}
+
+void rna_def_gpencil_frame(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "GPencilFrame", NULL);
+	RNA_def_struct_sdna(srna, "bGPDframe");
+	RNA_def_struct_ui_text(srna, "Grease Pencil Frame", "Collection of related sketches on a particular frame");
+	
+	/* Strokes */
+	prop= RNA_def_property(srna, "strokes", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "strokes", NULL);
+	RNA_def_property_struct_type(prop, "GPencilStroke");
+	RNA_def_property_ui_text(prop, "Strokes", "Freehand curves defining the sketch on this frame.");
+	
+	/* Frame Number */
+	prop= RNA_def_property(srna, "frame_number", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "framenum");
+	RNA_def_property_range(prop, MINFRAME, MAXFRAME); // XXX note: this cannot occur on the same frame as another sketch
+	RNA_def_property_ui_text(prop, "Frame Number", "The frame on which this sketch appears.");
+	
+	/* Flags */
+	prop= RNA_def_property(srna, "paint_lock", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_FRAME_PAINT); // XXX should it be editable?
+	RNA_def_property_ui_text(prop, "Paint Lock", "Frame is being edited (painted on).");
+	
+	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_FRAME_SELECT);
+	RNA_def_property_ui_text(prop, "Selected", "Frame is selected for editing in the DopeSheet.");
+}
+
+void rna_def_gpencil_layer(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "GPencilLayer", NULL);
+	RNA_def_struct_sdna(srna, "bGPDlayer");
+	RNA_def_struct_ui_text(srna, "Grease Pencil Layer", "Collection of related sketches");
+	
+	/* Name */
+	prop= RNA_def_property(srna, "info", PROP_STRING, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Info", "Description of layer");
+	RNA_def_struct_name_property(srna, prop);
+	
+	/* Frames */
+	prop= RNA_def_property(srna, "frames", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "frames", NULL);
+	RNA_def_property_struct_type(prop, "GPencilFrame");
+	RNA_def_property_ui_text(prop, "Frames", "Sketches for this layer on different frames.");
+	
+	/* Active Frame */
+	prop= RNA_def_property(srna, "active_frame", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "actframe");
+	RNA_def_property_ui_text(prop, "Active Frame", "Frame currently being displayed for this layer.");
+	RNA_def_property_editable_func(prop, "rna_GPencilLayer_active_frame_editable");
+	
+	/* Drawing Color */
+	prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Color", "Color that all sketches in this layer are drawn with.");
+	
+	prop= RNA_def_property(srna, "opacity", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "color[3]");
+	RNA_def_property_range(prop, 0.3, 1.0f);
+	RNA_def_property_ui_text(prop, "Opacity", "Visibility of strokes.");
+	
+	/* Line Thickness */
+	prop= RNA_def_property(srna, "line_thickness", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "thickness");
+	RNA_def_property_range(prop, 1, 10);
+	RNA_def_property_ui_text(prop, "Thickness", "Thickness of strokes (in pixels).");
+	
+	/* Onion-Skinning */
+	prop= RNA_def_property(srna, "use_onion_skinning", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_ONIONSKIN);
+	RNA_def_property_ui_text(prop, "Use Onion Skinning", "Ghost frames on either side of frame.");
+	
+	prop= RNA_def_property(srna, "max_ghost_range", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "gstep");
+	RNA_def_property_range(prop, 0, 120);
+	RNA_def_property_ui_text(prop, "Max Ghost Range", "Maximum number of frames on either side of the active frame to show. (0 = just show the 'first' available sketch on either side)");
+	
+	/* Flags */
+	prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_HIDE);
+	RNA_def_property_ui_text(prop, "Hide", "Layer doesn't get drawn.");
+	
+	prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_LOCKED);
+	RNA_def_property_ui_text(prop, "Locked", "Layer is protected from further editing and/or frame changes.");
+	
+	prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_ACTIVE);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_GPencilLayer_active_set");
+	RNA_def_property_ui_text(prop, "Active", "Layer is 'active' layer being edited.");
+	
+	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_SELECT);
+	RNA_def_property_ui_text(prop, "Selected", "Layer is selected for editing in the DopeSheet.");
+	
+}
+
+void rna_def_gpencil_data(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "GreasePencil", "ID");
+	RNA_def_struct_sdna(srna, "bGPdata");
+	RNA_def_struct_ui_text(srna, "Grease Pencil", "Freehand annotation sketchbook.");
+	//RNA_def_struct_ui_icon(srna, ICON_GPENCIL);
+	
+	/* Layers */
+	prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "layers", NULL);
+	RNA_def_property_struct_type(prop, "GPencilLayer");
+	RNA_def_property_ui_text(prop, "Layers", "Similar to layers in Photoshop.");
+}
+
+/* --- */
+
+void RNA_def_gpencil(BlenderRNA *brna)
+{
+	rna_def_gpencil_data(brna);
+	
+	rna_def_gpencil_layer(brna);
+	rna_def_gpencil_frame(brna);
+	rna_def_gpencil_stroke(brna);
+	rna_def_gpencil_stroke_point(brna);
+}
+
+#endif
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index bd28085692f..0a9ef9f90d1 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -130,6 +130,7 @@ void RNA_def_curve(struct BlenderRNA *brna);
 void RNA_def_fluidsim(struct BlenderRNA *brna);
 void RNA_def_fcurve(struct BlenderRNA *brna);
 void RNA_def_gameproperty(struct BlenderRNA *brna);
+void RNA_def_gpencil(struct BlenderRNA *brna);
 void RNA_def_group(struct BlenderRNA *brna);
 void RNA_def_image(struct BlenderRNA *brna);
 void RNA_def_key(struct BlenderRNA *brna);
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 4a24027f7e9..82e460ea57d 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -207,6 +207,12 @@ static void rna_Main_particle_begin(CollectionPropertyIterator *iter, PointerRNA
 	rna_iterator_listbase_begin(iter, &bmain->particle, NULL);
 }
 
+static void rna_Main_gpencil_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+	Main *bmain= (Main*)ptr->data;
+	rna_iterator_listbase_begin(iter, &bmain->gpencil, NULL);
+}
+
 static void rna_Main_wm_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	Main *bmain= (Main*)ptr->data;
@@ -240,13 +246,14 @@ void RNA_def_main(BlenderRNA *brna)
 		{"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush datablocks.", NULL, NULL},
 		{"worlds", "World", "rna_Main_world_begin", "Worlds", "World datablocks.", NULL, NULL},
 		{"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks.", NULL, NULL},
-		{"keys", "ID", "rna_Main_key_begin", "Keys", "Key datablocks.", NULL, NULL},
+		{"keys", "Key", "rna_Main_key_begin", "Keys", "Key datablocks.", NULL, NULL},
 		{"scripts", "ID", "rna_Main_script_begin", "Scripts", "Script datablocks.", NULL, NULL},
 		{"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks.", NULL, NULL},
 		{"sounds", "ID", "rna_Main_sound_begin", "Sounds", "Sound datablocks.", NULL, NULL},
 		{"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature datablocks.", NULL, NULL},
 		{"actions", "Action", "rna_Main_action_begin", "Actions", "Action datablocks.", NULL, NULL},
 		{"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle datablocks.", NULL, NULL},
+		{"gpencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil datablocks.", NULL, NULL},
 		{NULL, NULL, NULL, NULL, NULL, NULL, NULL}};
 	int i;
 	
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 86ceee55f47..2408d9337e1 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2067,6 +2067,14 @@ void RNA_def_scene(BlenderRNA *brna)
 	prop= RNA_def_string(func, "statistics", "", 0, "Statistics", "");
 	RNA_def_function_return(func, prop);
 	
+	/* Grease Pencil */
+	prop= RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "gpd");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_struct_type(prop, "GreasePencil");
+	RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock");
+	
+	/* Nestled Data  */
 	rna_def_tool_settings(brna);
 	rna_def_unit_settings(brna);
 	rna_def_scene_render_data(brna);

From 324b3fbe747a6544b60be1eb8a0cb6b01db736de Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 27 Aug 2009 06:55:54 +0000
Subject: [PATCH 295/577] - BGE crash fix when casting a ray to the same
 location as the object from python. - Incorrect Mathutils vector docstrings.
 - last rayshade commit had an incomplete comment.

---
 source/blender/python/api2_2x/vector.c         | 4 ++--
 source/blender/render/intern/source/rayshade.c | 4 +++-
 source/gameengine/Ketsji/KX_GameObject.cpp     | 8 +++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/blender/python/api2_2x/vector.c b/source/blender/python/api2_2x/vector.c
index cb206363dbf..a7e00e2878a 100644
--- a/source/blender/python/api2_2x/vector.c
+++ b/source/blender/python/api2_2x/vector.c
@@ -58,8 +58,8 @@ struct PyMethodDef Vector_methods[] = {
 	{"normalize", (PyCFunction) Vector_Normalize, METH_NOARGS, Vector_Normalize_doc},
 	{"negate", (PyCFunction) Vector_Negate, METH_NOARGS, Vector_Negate_doc},
 	{"resize2D", (PyCFunction) Vector_Resize2D, METH_NOARGS, Vector_Resize2D_doc},
-	{"resize3D", (PyCFunction) Vector_Resize3D, METH_NOARGS, Vector_Resize2D_doc},
-	{"resize4D", (PyCFunction) Vector_Resize4D, METH_NOARGS, Vector_Resize2D_doc},
+	{"resize3D", (PyCFunction) Vector_Resize3D, METH_NOARGS, Vector_Resize3D_doc},
+	{"resize4D", (PyCFunction) Vector_Resize4D, METH_NOARGS, Vector_Resize4D_doc},
 	{"toTrackQuat", ( PyCFunction ) Vector_ToTrackQuat, METH_VARARGS, Vector_ToTrackQuat_doc},
 	{"reflect", ( PyCFunction ) Vector_Reflect, METH_O, Vector_Reflect_doc},
 	{"cross", ( PyCFunction ) Vector_Cross, METH_O, Vector_Dot_doc},
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 182e60365a6..e683a499e17 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -1240,7 +1240,9 @@ void ray_trace(ShadeInput *shi, ShadeResult *shr)
 			
 			if(shi->combinedflag & SCE_PASS_REFLECT) {
 				/* values in shr->spec can be greater then 1.0.
-				 * in the case when it is 1.0 diff */
+				 * In this case the mircol uses a zero blending factor, so ignoring it is ok.
+				 * Fixes bug #18837 - when the spec is higher then 1.0,
+				 * diff can become a negative color - Campbell  */
 				
 				f1= 1.0f-i;
 				
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index d04174a32aa..ba8905973d5 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -2597,12 +2597,10 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 		}
 	}
 	MT_Point3 fromPoint = NodeGetWorldPosition();
+	
 	if (dist != 0.0f)
-	{
-		MT_Vector3 toDir = toPoint-fromPoint;
-		toDir.normalize();
-		toPoint = fromPoint + (dist) * toDir;
-	}
+		toPoint = fromPoint + dist * (toPoint-fromPoint).safe_normalized();
+	
 	PHY_IPhysicsEnvironment* pe = KX_GetActiveScene()->GetPhysicsEnvironment();
 	KX_IPhysicsController *spc = GetPhysicsController();
 	KX_GameObject *parent = GetParent();

From 55f82852ca4a88080bf9928445e52d24330a4889 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Thu, 27 Aug 2009 08:46:39 +0000
Subject: [PATCH 296/577] Tweaked layout of game properties. The Add button is
 now at the top, meaning it doesn't move around - this is also more consistent
 with constraints/modifiers etc. Used the same 'box' layout as
 constraints/modifiers.

Also ported some name changes from the materials UI script to RNA to keep these consistent. Animation editors always show the RNA name after all, so it's good to keep the names similar.
---
 release/ui/buttons_material.py                | 24 +++++------
 release/ui/space_logic.py                     | 23 +++++------
 source/blender/editors/animation/anim_ops.c   |  4 +-
 source/blender/makesrna/intern/rna_material.c | 40 +++++++++----------
 4 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index 30b107d452f..e7add9c59f3 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -130,8 +130,8 @@ class MATERIAL_PT_strand(MaterialButtonsPanel):
 		
 		col = split.column(align=True)
 		col.itemL(text="Size:")
-		col.itemR(tan, "start_size", text="Root")
-		col.itemR(tan, "end_size", text="Tip")
+		col.itemR(tan, "root_size", text="Root")
+		col.itemR(tan, "tip_size", text="Tip")
 		col.itemR(tan, "min_size", text="Minimum")
 		col.itemR(tan, "blender_units")
 		sub = col.column()
@@ -231,7 +231,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel):
 		
 		col = split.column()
 		col.itemR(mat, "shadows", text="Receive")
-		col.itemR(mat, "transparent_shadows", text="Receive Transparent")
+		col.itemR(mat, "receive_transparent_shadows", text="Receive Transparent")
 		col.itemR(mat, "only_shadow", text="Shadows Only")
 		col.itemR(mat, "cast_shadows_only", text="Cast Only")
 		col.itemR(mat, "shadow_casting_alpha", text="Casting Alpha")
@@ -266,7 +266,7 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
 		col.itemR(mat, "diffuse_color", text="")
 		sub = col.column()
 		sub.active = (not mat.shadeless)
-		sub.itemR(mat, "diffuse_reflection", text="Intensity")
+		sub.itemR(mat, "diffuse_intensity", text="Intensity")
 		
 		col = split.column()
 		col.active = (not mat.shadeless)
@@ -320,7 +320,7 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
 		
 		col = split.column()
 		col.itemR(mat, "specular_color", text="")
-		col.itemR(mat, "specular_reflection", text="Intensity")
+		col.itemR(mat, "specular_intensity", text="Intensity")
 
 		col = split.column()
 		col.itemR(mat, "specular_shader", text="")
@@ -426,7 +426,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		split = layout.split()
 		
 		col = split.column()
-		col.itemR(raym, "reflect", text="Reflectivity")
+		col.itemR(raym, "reflectivity")
 		col.itemR(mat, "mirror_color", text="")
 
 		col = split.column()
@@ -448,9 +448,9 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		
 		col = split.column()
 		col.itemL(text="Gloss:")
-		col.itemR(raym, "gloss", text="Amount")
+		col.itemR(raym, "gloss_amount", text="Amount")
 		sub = col.column()
-		sub.active = raym.gloss < 1
+		sub.active = raym.gloss_amount < 1
 		sub.itemR(raym, "gloss_threshold", text="Threshold")
 		sub.itemR(raym, "gloss_samples", text="Samples")
 		sub.itemR(raym, "gloss_anisotropic", text="Anisotropic")
@@ -511,9 +511,9 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 			
 			col = split.column()
 			col.itemL(text="Gloss:")
-			col.itemR(rayt, "gloss", text="Amount")
+			col.itemR(rayt, "gloss_amount", text="Amount")
 			sub = col.column()
-			sub.active = rayt.gloss < 1
+			sub.active = rayt.gloss_amount < 1
 			sub.itemR(rayt, "gloss_threshold", text="Threshold")
 			sub.itemR(rayt, "gloss_samples", text="Samples")
 
@@ -663,8 +663,8 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
 		col.itemR(halo, "hardness")
 		col.itemR(halo, "add")
 		col.itemL(text="Options:")
-		col.itemR(halo, "use_texture", text="Texture")
-		col.itemR(halo, "use_vertex_normal", text="Vertex Normal")
+		col.itemR(halo, "texture")
+		col.itemR(halo, "vertex_normal")
 		col.itemR(halo, "xalpha")
 		col.itemR(halo, "shaded")
 		col.itemR(halo, "soft")
diff --git a/release/ui/space_logic.py b/release/ui/space_logic.py
index f9920f78497..9b0e3dc7f38 100644
--- a/release/ui/space_logic.py
+++ b/release/ui/space_logic.py
@@ -14,17 +14,16 @@ class LOGIC_PT_properties(bpy.types.Panel):
 		ob = context.active_object
 		game = ob.game
 		
-		for i, prop in enumerate(game.properties):
-			flow = layout.row(align=True)
-			flow.itemR(prop, "name", text="")
-			flow.itemR(prop, "type", text="")
-			flow.itemR(prop, "value", text="") # we dont care about the type. rna will display correctly
-			flow.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO')
-			flow.item_intO("object.game_property_remove", "index", i, text="", icon='ICON_X')
+		layout.itemO("object.game_property_new", text="Add Game Property")
+		
+		for i, prop in enumerate(game.properties):
+		
+			box = layout.box()
+			row = box.row()
+			row.itemR(prop, "name", text="")
+			row.itemR(prop, "type", text="")
+			row.itemR(prop, "value", text="") # we dont care about the type. rna will display correctly
+			row.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO')
+			row.item_intO("object.game_property_remove", "index", i, text="", icon='ICON_X')
 		
-		flow = layout.row()
-		flow.itemO("object.game_property_new")
-			
-			
-
 bpy.types.register(LOGIC_PT_properties)
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index 72fee937e25..3d45dcc92ca 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -406,10 +406,10 @@ void ED_keymap_anim(wmWindowManager *wm)
 	
 	/* frame management */
 		/* NOTE: 'ACTIONMOUSE' not 'LEFTMOUSE', as user may have swapped mouse-buttons */
-	WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", ACTIONMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "ANIM_OT_change_frame", ACTIONMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "ANIM_OT_time_toggle", TKEY, KM_PRESS, KM_CTRL, 0);
 	
 	/* preview range */
-	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_set", PKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_clear", PKEY, KM_PRESS, KM_ALT, 0);
 }
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index cde65f46e5c..e9970e4391e 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -685,10 +685,10 @@ static void rna_def_material_diffuse(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Diffuse Shader Model", "");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "diffuse_reflection", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "diffuse_intensity", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "ref");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Diffuse Reflection", "Amount of diffuse reflection.");
+	RNA_def_property_ui_text(prop, "Diffuse Intensity", "Amount of diffuse reflection.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING_DRAW, NULL);
 	
 	prop= RNA_def_property(srna, "roughness", PROP_FLOAT, PROP_NONE);
@@ -746,10 +746,10 @@ static void rna_def_material_raymirror(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Enabled", "Enable raytraced reflections.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 		
-	prop= RNA_def_property(srna, "reflect", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "reflectivity", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "ray_mirror");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Reflect", "Sets the amount mirror reflection for raytrace.");
+	RNA_def_property_ui_text(prop, "Reflectivity", "Sets the amount mirror reflection for raytrace.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "fresnel", PROP_FLOAT, PROP_NONE);
@@ -764,10 +764,10 @@ static void rna_def_material_raymirror(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "gloss", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "gloss_amount", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "gloss_mir");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Gloss", "The shininess of the reflection. Values < 1.0 give diffuse, blurry reflections.");
+	RNA_def_property_ui_text(prop, "Gloss Amount", "The shininess of the reflection. Values < 1.0 give diffuse, blurry reflections.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "gloss_anisotropic", PROP_FLOAT, PROP_PERCENTAGE);
@@ -835,10 +835,10 @@ static void rna_def_material_raytra(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "gloss", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "gloss_amount", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "gloss_tra");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Gloss", "The clarity of the refraction. Values < 1.0 give diffuse, blurry refractions.");
+	RNA_def_property_ui_text(prop, "Gloss Amount", "The clarity of the refraction. Values < 1.0 give diffuse, blurry refractions.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "gloss_samples", PROP_INT, PROP_NONE);
@@ -1133,14 +1133,14 @@ static void rna_def_material_halo(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Star", "Renders halo as a star.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "use_texture", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "texture", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALOTEX);
-	RNA_def_property_ui_text(prop, "Use Texture", "Gives halo a texture.");
+	RNA_def_property_ui_text(prop, "Texture", "Gives halo a texture.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "use_vertex_normal", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "vertex_normal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALOPUNO);
-	RNA_def_property_ui_text(prop, "Use Vertex Normal", "Uses the vertex normal to specify the dimension of the halo.");
+	RNA_def_property_ui_text(prop, "Vertex Normal", "Uses the vertex normal to specify the dimension of the halo.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "xalpha", PROP_BOOLEAN, PROP_NONE);
@@ -1247,10 +1247,10 @@ void rna_def_material_specularity(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Specular Shader Model", "");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "specular_reflection", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "specular_intensity", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "spec");
 	RNA_def_property_range(prop, 0, 1);
-	RNA_def_property_ui_text(prop, "Specularity Intensity", "");
+	RNA_def_property_ui_text(prop, "Specular Intensity", "");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 
 	/* NOTE: "har", "param", etc are used for multiple purposes depending on
@@ -1320,16 +1320,16 @@ void rna_def_material_strand(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Blender Units", "Use Blender units for widths instead of pixels.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 
-	prop= RNA_def_property(srna, "start_size", PROP_FLOAT, PROP_UNSIGNED);
+	prop= RNA_def_property(srna, "root_size", PROP_FLOAT, PROP_UNSIGNED);
 	RNA_def_property_float_sdna(prop, NULL, "strand_sta");
 	RNA_def_property_float_funcs(prop, NULL, NULL, "rna_MaterialStrand_start_size_range");
-	RNA_def_property_ui_text(prop, "Start Size", "Start size of strands in pixels Blender units.");
+	RNA_def_property_ui_text(prop, "Root Size", "Start size of strands in pixels Blender units.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 
-	prop= RNA_def_property(srna, "end_size", PROP_FLOAT, PROP_UNSIGNED);
+	prop= RNA_def_property(srna, "tip_size", PROP_FLOAT, PROP_UNSIGNED);
 	RNA_def_property_float_sdna(prop, NULL, "strand_end");
 	RNA_def_property_float_funcs(prop, NULL, NULL, "rna_MaterialStrand_end_size_range");
-	RNA_def_property_ui_text(prop, "End Size", "Start size of strands in pixels or Blender units.");
+	RNA_def_property_ui_text(prop, "Tip Size", "Start size of strands in pixels or Blender units.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 
 	prop= RNA_def_property(srna, "min_size", PROP_FLOAT, PROP_UNSIGNED);
@@ -1551,9 +1551,9 @@ void RNA_def_material(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Exclude Mist", "Excludes this material from mist effects (in world settings)");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "transparent_shadows", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "receive_transparent_shadows", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADOW_TRA);
-	RNA_def_property_ui_text(prop, "Transparent Shadows", "Allow this object to receive transparent shadows casted through other objects");
+	RNA_def_property_ui_text(prop, "Receive Transparent Shadows", "Allow this object to receive transparent shadows casted through other objects");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
 	prop= RNA_def_property(srna, "ray_shadow_bias", PROP_BOOLEAN, PROP_NONE);

From 12a0f2c0987688b2fcf8daf44d9462b524fe139a Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Thu, 27 Aug 2009 09:52:41 +0000
Subject: [PATCH 297/577] Fix for sounds with relative paths not being loaded
 correctly.

---
 .../blender/blenloader/intern/readblenentry.c  | 18 +++---------------
 source/blender/blenloader/intern/readfile.c    |  7 +++++--
 source/blender/blenloader/intern/readfile.h    |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index 1f276913ea8..ac561eb6186 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -331,11 +331,7 @@ BlendFileData *BLO_read_from_file(char *file, ReportList *reports)
 	fd = blo_openblenderfile(file, reports);
 	if (fd) {
 		fd->reports= reports;
-		bfd= blo_read_file_internal(fd);
-		if (bfd) {
-			bfd->type= BLENFILETYPE_BLEND;
-			strncpy(bfd->main->name, file, sizeof(bfd->main->name)-1);
-		}
+		bfd= blo_read_file_internal(fd, file);
 		blo_freefiledata(fd);			
 	}
 
@@ -350,11 +346,7 @@ BlendFileData *BLO_read_from_memory(void *mem, int memsize, ReportList *reports)
 	fd = blo_openblendermemory(mem, memsize,  reports);
 	if (fd) {
 		fd->reports= reports;
-		bfd= blo_read_file_internal(fd);
-		if (bfd) {
-			bfd->type= BLENFILETYPE_BLEND;
-			strcpy(bfd->main->name, "");
-		}
+		bfd= blo_read_file_internal(fd, "");
 		blo_freefiledata(fd);			
 	}
 
@@ -383,11 +375,7 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, const char *filename, MemFil
 		/* makes lookup of existing images in old main */
 		blo_make_image_pointer_map(fd, oldmain);
 		
-		bfd= blo_read_file_internal(fd);
-		if (bfd) {
-			bfd->type= BLENFILETYPE_BLEND;
-			strcpy(bfd->main->name, "");
-		}
+		bfd= blo_read_file_internal(fd, "");
 		
 		/* ensures relinked images are not freed */
 		blo_end_image_pointer_map(fd, oldmain);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6771135a772..5d61e3d305e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9700,7 +9700,7 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
 	return bhead;
 }
 
-BlendFileData *blo_read_file_internal(FileData *fd)
+BlendFileData *blo_read_file_internal(FileData *fd, char *file)
 {
 	BHead *bhead= blo_firstbhead(fd);
 	BlendFileData *bfd;
@@ -9711,6 +9711,9 @@ BlendFileData *blo_read_file_internal(FileData *fd)
 
 	bfd->main->versionfile= fd->fileversion;
 	
+	bfd->type= BLENFILETYPE_BLEND;
+	strncpy(bfd->main->name, file, sizeof(bfd->main->name)-1);
+
 	while(bhead) {
 		switch(bhead->code) {
 		case DATA:
@@ -11131,7 +11134,7 @@ BlendFileData *blo_read_blendafterruntime(int file, char *name, int actualsize,
 		return NULL;
 
 	fd->reports= reports;
-	bfd= blo_read_file_internal(fd);
+	bfd= blo_read_file_internal(fd, "");
 	blo_freefiledata(fd);
 
 	return bfd;
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index e39fefa8205..2a0b6c327d3 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -108,7 +108,7 @@ struct Main;
 void blo_join_main(ListBase *mainlist);
 void blo_split_main(ListBase *mainlist, struct Main *main);
 
-BlendFileData *blo_read_file_internal(FileData *fd);
+BlendFileData *blo_read_file_internal(FileData *fd, char *file);
 
 FileData *blo_openblenderfile(char *name, struct ReportList *reports);
 FileData *blo_openblendermemory(void *buffer, int buffersize, struct ReportList *reports);

From 2c7065e541f1ea51dbeea045bc3214ce22d4ca82 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 27 Aug 2009 15:22:41 +0000
Subject: [PATCH 298/577] - assigning vectors in the BGE wasn't updating the
 vector from the callback - Pkey only starts in BGE in Object Mode - warning
 in readblenentry.c, is silent on 64bit too.

---
 source/blender/blenloader/intern/readblenentry.c  | 2 +-
 source/blender/editors/space_view3d/view3d_view.c | 7 ++++++-
 source/gameengine/Ketsji/KX_PyMath.h              | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index ac561eb6186..33641a0b004 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -200,7 +200,7 @@ void BLO_blendhandle_print_sizes(BlendHandle *bh, void *fp)
 			buf[2]= buf[2]?buf[2]:' ';
 			buf[3]= buf[3]?buf[3]:' ';
 			
-			fprintf(fp, "['%.4s', '%s', %d, %ld ], \n", buf, name, bhead->nr, (intptr_t)bhead->len+sizeof(BHead));
+			fprintf(fp, "['%.4s', '%s', %d, %ld ], \n", buf, name, bhead->nr, (long int)bhead->len+sizeof(BHead));
 		}
 	}
 	fprintf(fp, "]\n");
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index ce7b6ba454d..771c02e95b6 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1444,6 +1444,11 @@ extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar, int always_
 
 #endif // GAMEBLENDER == 1
 
+int game_engine_poll(bContext *C)
+{
+	return CTX_data_mode_enum(C)==CTX_MODE_OBJECT ? 1:0;
+}
+
 static int game_engine_exec(bContext *C, wmOperator *unused)
 {
 #if GAMEBLENDER == 1
@@ -1503,7 +1508,7 @@ void VIEW3D_OT_game_start(wmOperatorType *ot)
 	/* api callbacks */
 	ot->exec= game_engine_exec;
 	
-	//ot->poll= ED_operator_view3d_active;
+	ot->poll= game_engine_poll;
 }
 
 /* ************************************** */
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index a8488e8e60a..17102905607 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -109,6 +109,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
 	
 	if(VectorObject_Check(pyval)) {
 		VectorObject *pyvec= (VectorObject *)pyval;
+		BaseMath_ReadCallback(pyvec);
 		if (pyvec->size != Size(vec)) {
 			PyErr_Format(PyExc_AttributeError, "error setting vector, %d args, should be %d", pyvec->size, Size(vec));
 			return false;
@@ -118,6 +119,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
 	}
 	else if(QuaternionObject_Check(pyval)) {
 		QuaternionObject *pyquat= (QuaternionObject *)pyval;
+		BaseMath_ReadCallback(pyquat);
 		if (4 != Size(vec)) {
 			PyErr_Format(PyExc_AttributeError, "error setting vector, %d args, should be %d", 4, Size(vec));
 			return false;
@@ -128,6 +130,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
 	}
 	else if(EulerObject_Check(pyval)) {
 		EulerObject *pyeul= (EulerObject *)pyval;
+		BaseMath_ReadCallback(pyeul);
 		if (3 != Size(vec)) {
 			PyErr_Format(PyExc_AttributeError, "error setting vector, %d args, should be %d", 3, Size(vec));
 			return false;

From 28392eedbefe1bf9322d30d8697128b2dafb55d5 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 27 Aug 2009 16:34:13 +0000
Subject: [PATCH 299/577] was casting the PyObjectPlus type to a PyObject for
 new BGE vector and matrix types, need to get its proxy instead.

---
 source/gameengine/Expressions/PyObjectPlus.h   |  5 ++++-
 source/gameengine/Ketsji/KX_GameObject.cpp     | 14 +++++++-------
 source/gameengine/Ketsji/KX_ObjectActuator.cpp |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index e9e81dddaaa..f9edb7877b0 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -86,7 +86,7 @@ typedef struct {
 
 
 
-typedef struct {
+typedef struct PyObjectPlus_Proxy {
 	PyObject_HEAD		/* required python macro   */
 	class PyObjectPlus *ref;
 	bool py_owns;
@@ -99,6 +99,9 @@ typedef struct {
 /* Note, sometimes we dont care what BGE type this is as long as its a proxy */
 #define BGE_PROXY_CHECK_TYPE(_type) ((_type)->tp_dealloc == PyObjectPlus::py_base_dealloc)
 
+/* Opposite of BGE_PROXY_REF */
+#define BGE_PROXY_FROM_REF(_self) (((PyObjectPlus *)_self)->GetProxy())
+
 
 								// This must be the first line of each 
 								// PyC++ class
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 79b110b11ef..91213bee865 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1798,7 +1798,7 @@ int KX_GameObject::pyattr_set_visible(void *self_v, const KX_PYATTRIBUTE_DEF *at
 PyObject* KX_GameObject::pyattr_get_worldPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_GLOBAL);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_GLOBAL);
 #else
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldPosition());
@@ -1820,7 +1820,7 @@ int KX_GameObject::pyattr_set_worldPosition(void *self_v, const KX_PYATTRIBUTE_D
 PyObject* KX_GameObject::pyattr_get_localPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS	
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_LOCAL);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_LOCAL);
 #else	
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalPosition());
@@ -1842,7 +1842,7 @@ int KX_GameObject::pyattr_set_localPosition(void *self_v, const KX_PYATTRIBUTE_D
 PyObject* KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_INERTIA_LOCAL);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_INERTIA_LOCAL);
 #else
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	if (self->GetPhysicsController())
@@ -1854,7 +1854,7 @@ PyObject* KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIB
 PyObject* KX_GameObject::pyattr_get_worldOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
-	return newMatrixObject_cb((PyObject *)self_v, 3, 3, mathutils_kxgameob_matrix_cb_index, MATHUTILS_MAT_CB_ORI_GLOBAL);
+	return newMatrixObject_cb(BGE_PROXY_FROM_REF(self_v), 3, 3, mathutils_kxgameob_matrix_cb_index, MATHUTILS_MAT_CB_ORI_GLOBAL);
 #else
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldOrientation());
@@ -1879,7 +1879,7 @@ int KX_GameObject::pyattr_set_worldOrientation(void *self_v, const KX_PYATTRIBUT
 PyObject* KX_GameObject::pyattr_get_localOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
-	return newMatrixObject_cb((PyObject *)self_v, 3, 3, mathutils_kxgameob_matrix_cb_index, MATHUTILS_MAT_CB_ORI_LOCAL);
+	return newMatrixObject_cb(BGE_PROXY_FROM_REF(self_v), 3, 3, mathutils_kxgameob_matrix_cb_index, MATHUTILS_MAT_CB_ORI_LOCAL);
 #else
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalOrientation());
@@ -1903,7 +1903,7 @@ int KX_GameObject::pyattr_set_localOrientation(void *self_v, const KX_PYATTRIBUT
 PyObject* KX_GameObject::pyattr_get_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_GLOBAL);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_GLOBAL);
 #else
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldScaling());
@@ -1913,7 +1913,7 @@ PyObject* KX_GameObject::pyattr_get_worldScaling(void *self_v, const KX_PYATTRIB
 PyObject* KX_GameObject::pyattr_get_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_LOCAL);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_LOCAL);
 #else
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalScaling());
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 99179c5ed96..2601ced9c38 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -467,7 +467,7 @@ Mathutils_Callback mathutils_obactu_vector_cb = {
 
 PyObject* KX_ObjectActuator::pyattr_get_linV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxobactu_vector_cb_index, MATHUTILS_VEC_CB_LINV);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxobactu_vector_cb_index, MATHUTILS_VEC_CB_LINV);
 }
 
 int KX_ObjectActuator::pyattr_set_linV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
@@ -481,7 +481,7 @@ int KX_ObjectActuator::pyattr_set_linV(void *self_v, const KX_PYATTRIBUTE_DEF *a
 
 PyObject* KX_ObjectActuator::pyattr_get_angV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxobactu_vector_cb_index, MATHUTILS_VEC_CB_ANGV);
+	return newVectorObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxobactu_vector_cb_index, MATHUTILS_VEC_CB_ANGV);
 }
 
 int KX_ObjectActuator::pyattr_set_angV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)

From 9c1cf53e9ab023e281697e2810ba45031c024101 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Thu, 27 Aug 2009 18:24:12 +0000
Subject: [PATCH 300/577] 2.5 Volumetric:

* Wrapped some missing Point Density RNA and added the options to the UI.
* Some UI changes (greying out...)

Matt: Please check. :)
---
 release/ui/buttons_texture.py                | 49 +++++++++++++----
 source/blender/makesrna/intern/rna_texture.c | 56 ++++++++++++++++++--
 2 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 4827f677336..c9f1585ec81 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -623,6 +623,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		tex = context.texture
 		vd = tex.voxeldata
 
@@ -631,12 +632,13 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel):
 			layout.itemR(vd, "source_path")
 		if vd.file_format == 'RAW_8BIT':
 			layout.itemR(vd, "resolution")
-		if vd.file_format == 'SMOKE':
+		elif vd.file_format == 'SMOKE':
 			layout.itemR(vd, "domain_object")
 		
 		layout.itemR(vd, "still")
-		if vd.still:
-			layout.itemR(vd, "still_frame_number")
+		row = layout.row()
+		row.active = vd.still
+		row.itemR(vd, "still_frame_number")
 		
 		layout.itemR(vd, "interpolation")
 		layout.itemR(vd, "intensity")
@@ -651,27 +653,51 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		tex = context.texture
 		pd = tex.pointdensity
+		ob = context.object
 
-		layout.itemR(pd, "point_source")
-		layout.itemR(pd, "object")
+		layout.itemR(pd, "point_source", expand=True)
 		if pd.point_source == 'PARTICLE_SYSTEM':
-			layout.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
+			layout.item_pointerR(pd, "particle_system", ob, "particle_systems", text="System")
+			layout.itemR(pd, "particle_cache", text="Cache")
+		else:
+			layout.itemR(pd, "object")
+			layout.itemR(pd, "vertices_cache", text="Cache")
+		
+		layout.itemS()
+		
 		layout.itemR(pd, "radius")
 		layout.itemR(pd, "falloff")
 		if pd.falloff == 'SOFT':
 			layout.itemR(pd, "falloff_softness")
-		layout.itemR(pd, "color_source")
+			
+		layout.itemS()
+
 		layout.itemR(pd, "turbulence")
-		layout.itemR(pd, "turbulence_size")
-		layout.itemR(pd, "turbulence_depth")
-		layout.itemR(pd, "turbulence_influence")
 		
+		col = layout.column()
+		col.active = pd.turbulence
+		sub = col.column_flow()
+		sub.itemR(pd, "turbulence_size")
+		sub.itemR(pd, "turbulence_depth")
+		sub.itemR(pd, "turbulence_strength")
+		col.itemR(pd, "turbulence_influence", text="Influence")
+		col.itemR(pd, "noise_basis")
+		
+		layout.itemS()
+		
+		layout.itemR(pd, "color_source")
+		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_VELOCITY'):
+			layout.itemR(pd, "speed_scale")
+		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_AGE'):
+			layout.template_color_ramp(pd.color_ramp, expand=True)
 
 bpy.types.register(TEXTURE_PT_context_texture)
 bpy.types.register(TEXTURE_PT_preview)
-bpy.types.register(TEXTURE_PT_clouds)
+
+bpy.types.register(TEXTURE_PT_clouds) # Texture Type Panels
 bpy.types.register(TEXTURE_PT_wood)
 bpy.types.register(TEXTURE_PT_marble)
 bpy.types.register(TEXTURE_PT_magic)
@@ -687,6 +713,7 @@ bpy.types.register(TEXTURE_PT_voronoi)
 bpy.types.register(TEXTURE_PT_distortednoise)
 bpy.types.register(TEXTURE_PT_voxeldata)
 bpy.types.register(TEXTURE_PT_pointdensity)
+
 bpy.types.register(TEXTURE_PT_colors)
 bpy.types.register(TEXTURE_PT_mapping)
 bpy.types.register(TEXTURE_PT_influence)
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index a949d26f51a..f899d52543e 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -1333,8 +1333,21 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	static EnumPropertyItem point_source_items[] = {
 		{TEX_PD_PSYS, "PARTICLE_SYSTEM", 0, "Particle System", "Generate point density from a particle system"},
 		{TEX_PD_OBJECT, "OBJECT", 0, "Object Vertices", "Generate point density from an object's vertices"},
+		//{TEX_PD_FILE, "FILE", 0 , "File", ""},
 		{0, NULL, 0, NULL, NULL}};
 	
+	static EnumPropertyItem particle_cache_items[] = {
+		{TEX_PD_OBJECTLOC, "OBJECT_LOCATION", 0, "Emit Object Location", ""},
+		{TEX_PD_OBJECTSPACE, "OBJECT_SPACE", 0, "Emit Object Space", ""},
+		{TEX_PD_WORLDSPACE, "WORLD_SPACE", 0 , "Global Space", ""},
+		{0, NULL, 0, NULL, NULL}};
+		
+	static EnumPropertyItem vertice_cache_items[] = {
+		{TEX_PD_OBJECTLOC, "OBJECT_LOCATION", 0, "Object Location", ""},
+		{TEX_PD_OBJECTSPACE, "OBJECT_SPACE", 0, "Object Space", ""},
+		{TEX_PD_WORLDSPACE, "WORLD_SPACE", 0 , "Global Space", ""},
+		{0, NULL, 0, NULL, NULL}};
+
 	static EnumPropertyItem falloff_items[] = {
 		{TEX_PD_FALLOFF_STD, "STANDARD", 0, "Standard", ""},
 		{TEX_PD_FALLOFF_SMOOTH, "SMOOTH", 0, "Smooth", ""},
@@ -1354,7 +1367,7 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 		{TEX_PD_NOISE_STATIC, "STATIC", 0, "Static", "Noise patterns will remain unchanged, faster and suitable for stills"},
 		{TEX_PD_NOISE_VEL, "PARTICLE_VELOCITY", 0, "Particle Velocity", "Turbulent noise driven by particle velocity"},
 		{TEX_PD_NOISE_AGE, "PARTICLE_AGE", 0, "Particle Age", "Turbulent noise driven by the particle's age between birth and death"},
-			{TEX_PD_NOISE_TIME, "GLOBAL_TIME", 0, "Global Time", "Turbulent noise driven by the global current frame"},
+		{TEX_PD_NOISE_TIME, "GLOBAL_TIME", 0, "Global Time", "Turbulent noise driven by the global current frame"},
 		{0, NULL, 0, NULL, NULL}};
 	
 	srna= RNA_def_struct(brna, "PointDensity", NULL);
@@ -1380,6 +1393,18 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 	
+	prop= RNA_def_property(srna, "particle_cache", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "psys_cache_space");
+	RNA_def_property_enum_items(prop, particle_cache_items);
+	RNA_def_property_ui_text(prop, "Particle Cache", "Co-ordinate system to cache particles in");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "vertices_cache", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "ob_cache_space");
+	RNA_def_property_enum_items(prop, vertice_cache_items);
+	RNA_def_property_ui_text(prop, "Vertices Cache", "Co-ordinate system to cache vertices in");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
 	prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "radius");
 	RNA_def_property_range(prop, 0.01, FLT_MAX);
@@ -1404,6 +1429,19 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Color Source", "Data to derive color results from");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 	
+	prop= RNA_def_property(srna, "speed_scale", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "speed_scale");
+	RNA_def_property_range(prop, 0.001, 100.0);
+	RNA_def_property_ui_text(prop, "Scale", "Multipler to bring particle speed within an acceptable range");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "color_ramp", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "coba");
+	RNA_def_property_struct_type(prop, "ColorRamp");
+	RNA_def_property_ui_text(prop, "Color Ramp", "");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	/* Turbulence */
 	prop= RNA_def_property(srna, "turbulence", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_PD_TURBULENCE);
 	RNA_def_property_ui_text(prop, "Turbulence", "Add directed noise to the density at render-time");
@@ -1415,6 +1453,12 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Size", "Scale of the added turbulent noise");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
 	
+	prop= RNA_def_property(srna, "turbulence_strength", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "noise_fac");
+	RNA_def_property_range(prop, 0.01, FLT_MAX);
+	RNA_def_property_ui_text(prop, "Strength", "");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
 	prop= RNA_def_property(srna, "turbulence_depth", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "noise_depth");
 	RNA_def_property_range(prop, 0, INT_MAX);
@@ -1426,9 +1470,14 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna)
 	RNA_def_property_enum_items(prop, turbulence_influence_items);
 	RNA_def_property_ui_text(prop, "Turbulence Influence", "Method for driving added turbulent noise");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+	
+	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "noise_basis");
+	RNA_def_property_enum_items(prop, prop_noise_basis_items);
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise formula used for tubulence");
+	RNA_def_property_update(prop, NC_TEXTURE, NULL);
+
 
-	
-	
 	srna= RNA_def_struct(brna, "PointDensityTexture", "Texture");
 	RNA_def_struct_sdna(srna, "Tex");
 	RNA_def_struct_ui_text(srna, "Point Density", "Settings for the Point Density texture");
@@ -1454,6 +1503,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
 	static EnumPropertyItem file_format_items[] = {
 		{TEX_VD_BLENDERVOXEL, "BLENDER_VOXEL", 0, "Blender Voxel", "Default binary voxel file format"},
 		{TEX_VD_RAW_8BIT, "RAW_8BIT", 0, "8 bit RAW", "8 bit greyscale binary data"},
+		//{TEX_VD_RAW_16BIT, "RAW_16BIT", 0, "16 bit RAW", ""},
 		{TEX_VD_IMAGE_SEQUENCE, "IMAGE_SEQUENCE", 0, "Image Sequence", "Generate voxels from a sequence of image slices"},
 		{TEX_VD_SMOKE, "SMOKE", 0, "Smoke", "Render voxels from a Blender smoke simulation"},
 		{0, NULL, 0, NULL, NULL}};

From 590950a0fafb7e56ac32f32f1dff76b5c9cbce81 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Thu, 27 Aug 2009 19:10:53 +0000
Subject: [PATCH 301/577] 2.5: * Deleted the box layout in logic editor, as
 discussed in IRC. We need a better solution here, maybe 2 lines?

* Typo in Sequencer RNA.
---
 release/ui/buttons_texture.py                 | 90 +++++++++++++------
 release/ui/space_logic.py                     | 14 +--
 source/blender/makesrna/intern/rna_sequence.c |  2 +-
 3 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index c9f1585ec81..78d5e6af790 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -657,43 +657,76 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 		tex = context.texture
 		pd = tex.pointdensity
 		ob = context.object
-
+		
 		layout.itemR(pd, "point_source", expand=True)
-		if pd.point_source == 'PARTICLE_SYSTEM':
-			layout.item_pointerR(pd, "particle_system", ob, "particle_systems", text="System")
-			layout.itemR(pd, "particle_cache", text="Cache")
-		else:
-			layout.itemR(pd, "object")
-			layout.itemR(pd, "vertices_cache", text="Cache")
-		
-		layout.itemS()
-		
-		layout.itemR(pd, "radius")
-		layout.itemR(pd, "falloff")
-		if pd.falloff == 'SOFT':
-			layout.itemR(pd, "falloff_softness")
-			
-		layout.itemS()
 
-		layout.itemR(pd, "turbulence")
+		split = layout.split()
 		
-		col = layout.column()
-		col.active = pd.turbulence
-		sub = col.column_flow()
-		sub.itemR(pd, "turbulence_size")
-		sub.itemR(pd, "turbulence_depth")
-		sub.itemR(pd, "turbulence_strength")
-		col.itemR(pd, "turbulence_influence", text="Influence")
-		col.itemR(pd, "noise_basis")
+		col = split.column()
+		if pd.point_source == 'PARTICLE_SYSTEM':
+			col.itemL(text="System:")
+			col.item_pointerR(pd, "particle_system", ob, "particle_systems", text="")
+			col.itemL(text="Cache:")
+			col.itemR(pd, "particle_cache", text="")
+		else:
+			col.itemL(text="Object:")
+			col.itemR(pd, "object", text="")
+			col.itemL(text="Cache:")
+			col.itemR(pd, "vertices_cache", text="")
 		
-		layout.itemS()
+		sub = split.column()
 		
-		layout.itemR(pd, "color_source")
+		sub.itemL()
+		sub.itemR(pd, "radius")
+		
+		sub.itemL(text="Falloff:")
+		sub.itemR(pd, "falloff", text="")
+		if pd.falloff == 'SOFT':
+			sub.itemR(pd, "falloff_softness")
+		
+		col.itemL(text="Color Source:")	
+		col.itemR(pd, "color_source", text="")
 		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_VELOCITY'):
-			layout.itemR(pd, "speed_scale")
+			col.itemR(pd, "speed_scale")
 		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_AGE'):
 			layout.template_color_ramp(pd.color_ramp, expand=True)
 
+class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel):
+	__label__ = "Turbulence"
+	
+	def poll(self, context):
+		tex = context.texture
+		return (tex and tex.type == 'POINT_DENSITY')
+		
+	def draw_header(self, context):
+		layout = self.layout
+		
+		tex = context.texture
+		pd = tex.pointdensity
+		
+		layout.itemR(pd, "turbulence", text="")
+		
+	def draw(self, context):
+		layout = self.layout
+		
+		tex = context.texture
+		pd = tex.pointdensity
+		layout.active = pd.turbulence
+
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="Influence:")
+		col.itemR(pd, "turbulence_influence", text="")
+		col.itemL(text="Noise Basis:")
+		col.itemR(pd, "noise_basis", text="")
+		
+		col = split.column()
+		col.itemL()		
+		col.itemR(pd, "turbulence_size")
+		col.itemR(pd, "turbulence_depth")
+		col.itemR(pd, "turbulence_strength")
+
 bpy.types.register(TEXTURE_PT_context_texture)
 bpy.types.register(TEXTURE_PT_preview)
 
@@ -713,6 +746,7 @@ bpy.types.register(TEXTURE_PT_voronoi)
 bpy.types.register(TEXTURE_PT_distortednoise)
 bpy.types.register(TEXTURE_PT_voxeldata)
 bpy.types.register(TEXTURE_PT_pointdensity)
+bpy.types.register(TEXTURE_PT_pointdensity_turbulence)
 
 bpy.types.register(TEXTURE_PT_colors)
 bpy.types.register(TEXTURE_PT_mapping)
diff --git a/release/ui/space_logic.py b/release/ui/space_logic.py
index 9b0e3dc7f38..5748d15a53a 100644
--- a/release/ui/space_logic.py
+++ b/release/ui/space_logic.py
@@ -11,19 +11,19 @@ class LOGIC_PT_properties(bpy.types.Panel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		ob = context.active_object
 		game = ob.game
 		
 		layout.itemO("object.game_property_new", text="Add Game Property")
-		
+	
 		for i, prop in enumerate(game.properties):
 		
-			box = layout.box()
-			row = box.row()
-			row.itemR(prop, "name", text="")
-			row.itemR(prop, "type", text="")
-			row.itemR(prop, "value", text="") # we dont care about the type. rna will display correctly
-			row.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO')
+			row = layout.row(align=True) 	 
+			row.itemR(prop, "name", text="") 	 
+			row.itemR(prop, "type", text="") 	 
+			row.itemR(prop, "value", text="", toggle=True) # we dont care about the type. rna will display correctly 	 
+			row.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO') 	 
 			row.item_intO("object.game_property_remove", "index", i, text="", icon='ICON_X')
 		
 bpy.types.register(LOGIC_PT_properties)
diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c
index 470909f4eff..5d275f7a87c 100644
--- a/source/blender/makesrna/intern/rna_sequence.c
+++ b/source/blender/makesrna/intern/rna_sequence.c
@@ -360,7 +360,7 @@ static void rna_def_sequence(BlenderRNA *brna)
 		{SEQ_META, "META", 0, "Meta", ""}, 
 		{SEQ_SCENE, "SCENE", 0, "Scene", ""}, 
 		{SEQ_MOVIE, "MOVIE", 0, "Movie", ""}, 
-		{SEQ_SOUND, "_SOUND", 0, "Sound", ""},
+		{SEQ_SOUND, "SOUND", 0, "Sound", ""},
 		{SEQ_EFFECT, "REPLACE", 0, "Replace", ""}, 
 		{SEQ_CROSS, "CROSS", 0, "Cross", ""}, 
 		{SEQ_ADD, "ADD", 0, "Add", ""}, 

From 9c66deb47a1c2c7330d483090ec715a4c35e3e07 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Thu, 27 Aug 2009 20:37:50 +0000
Subject: [PATCH 302/577] SVN maintenance.

---
 source/blender/makesrna/intern/rna_gpencil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 2ef7d9d2d90..340ba1a0f31 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1,5 +1,5 @@
 /**
- * $Id: rna_gpencil.c 22756 2009-08-25 04:05:37Z aligorith $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *

From d7bf9688ac78169a37fbfc0d3d5bcd5b5be19170 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 27 Aug 2009 23:29:07 +0000
Subject: [PATCH 303/577] fix for crash when a parent compound object didn't
 get a physics controller. also show this in the UI.

---
 source/blender/src/buttons_logic.c            | 22 ++++++++++++-------
 .../Converter/BL_BlenderDataConversion.cpp    |  4 +++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 0412aa72b37..6117c10c718 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -3513,14 +3513,20 @@ static void buttons_bullet(uiBlock *block, Object *ob)
 			}
 			if (ob->body_type!=OB_BODY_TYPE_SOFT)
 			{
-				if (ob->parent)
-					uiDefButBitI(block, TOG, OB_CHILD, B_REDR, "Add to parent", 240,105,110,19, 
-							&ob->gameflag, 0, 0, 0, 0, 
-							"Add this shape to the parent compound shape");
-				else
-					uiDefButBitI(block, TOG, OB_CHILD, B_REDR, "Compound", 240,105,110,19, 
-							&ob->gameflag, 0, 0, 0, 0, 
-							"Create a compound shape with the children's shape that are tagged for addition");
+				if (ob->parent) {
+					if(ob->parent->gameflag & (OB_DYNAMIC|OB_COLLISION)) {
+						uiDefButBitI(block, TOG, OB_CHILD, B_REDR, "Add to parent", 240,105,110,19, 
+								&ob->gameflag, 0, 0, 0, 0, 
+								"Add this shape to the parent compound shape");
+					}
+				}
+				else {
+					if(ob->gameflag & (OB_DYNAMIC|OB_COLLISION)) {
+						uiDefButBitI(block, TOG, OB_CHILD, B_REDR, "Compound", 240,105,110,19, 
+								&ob->gameflag, 0, 0, 0, 0, 
+								"Create a compound shape with the children's shape that are tagged for addition");
+					}
+				}
 			}
 		}
 		uiBlockEndAlign(block);
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index d2e6bbb43f7..c2566caba1e 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1381,7 +1381,9 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 	bool isCompoundChild = false;
 	bool hasCompoundChildren = !parent && (blenderobject->gameflag & OB_CHILD);
 
-	if (parent/* && (parent->gameflag & OB_DYNAMIC)*/) {
+	/* When the parent is not OB_DYNAMIC and has no OB_COLLISION then it gets no bullet controller
+	 * and cant be apart of the parents compound shape */
+	if (parent && (parent->gameflag & (OB_DYNAMIC | OB_COLLISION))) {
 		
 		if ((parent->gameflag & OB_CHILD) != 0 && (blenderobject->gameflag & OB_CHILD))
 		{

From 208f6daa1d2631e0643a97e6d0f456255a0dcde4 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 28 Aug 2009 02:24:14 +0000
Subject: [PATCH 304/577] * Tweak texture paint view3d settings, make
 projection paint options dependent on the tool, rather than (weirdly) the
 tool's availability dependent on projection paint settings.

---
 release/ui/space_view3d_toolbar.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index bbca43279a7..0e6dc76d49d 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -362,10 +362,8 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			col = layout.column(align=True)
 			col.item_enumR(settings, "tool", 'DRAW')
 			col.item_enumR(settings, "tool", 'SOFTEN')
-			if settings.use_projection:
-				col.item_enumR(settings, "tool", 'CLONE')
-			else:
-				col.item_enumR(settings, "tool", 'SMEAR')
+			col.item_enumR(settings, "tool", 'CLONE')
+			col.item_enumR(settings, "tool", 'SMEAR')
 				
 			col = layout.column()
 			col.itemR(brush, "color", text="")
@@ -540,12 +538,22 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel):
 #		col.itemR(vpaint, "mul", text="")
 
 
-# ********** default tools for texturepaint ****************
+# ********** options for projection paint ****************
 
-class VIEW3D_PT_tools_texturepaint(View3DPanel):
+class VIEW3D_PT_tools_projectpaint(View3DPanel):
 	__context__ = "texturepaint"
-	__label__ = "Options"
+	__label__ = "Project Paint"
+	
+	def poll(self, context):
+		return context.tool_settings.image_paint.tool != 'SMEAR'
+	
+	def draw_header(self, context):
+		layout = self.layout
+		
+		ipaint = context.tool_settings.image_paint
 
+		layout.itemR(ipaint, "use_projection", text="")
+	
 	def draw(self, context):
 		layout = self.layout
 		
@@ -554,7 +562,6 @@ class VIEW3D_PT_tools_texturepaint(View3DPanel):
 		use_projection= ipaint.use_projection
 		
 		col = layout.column()
-		col.itemR(ipaint, "use_projection")
 		sub = col.column()
 		sub.active = use_projection
 		sub.itemR(ipaint, "use_occlude")
@@ -631,5 +638,5 @@ bpy.types.register(VIEW3D_PT_tools_brush_curve)
 bpy.types.register(VIEW3D_PT_sculpt_options)
 bpy.types.register(VIEW3D_PT_tools_vertexpaint)
 bpy.types.register(VIEW3D_PT_tools_weightpaint)
-bpy.types.register(VIEW3D_PT_tools_texturepaint)
+bpy.types.register(VIEW3D_PT_tools_projectpaint)
 bpy.types.register(VIEW3D_PT_tools_particlemode)

From 8794951d9f5b408568ea35d916b6217d165ba440 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 09:38:36 +0000
Subject: [PATCH 305/577] A python port of dataoc.

---
 release/datafiles/datatoc.py | 72 ++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 release/datafiles/datatoc.py

diff --git a/release/datafiles/datatoc.py b/release/datafiles/datatoc.py
new file mode 100644
index 00000000000..805d7205651
--- /dev/null
+++ b/release/datafiles/datatoc.py
@@ -0,0 +1,72 @@
+#!/usr/bin/python3
+#
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2009 Blender Foundation.
+# All rights reserved.
+#
+# Contributor(s): Jörg Müller
+#
+# ***** END GPL LICENCE BLOCK *****
+
+import sys
+
+if len(sys.argv) < 2:
+	print("Usage: datatoc <data_file>")
+	sys.exit(1)
+
+filename = sys.argv[1]
+
+try:
+	fpin = open(filename, "rb");
+except:
+	print("Unable to open input <{0}>".format(sys.argv[1]))
+	sys.exit(1)
+
+size = fpin.seek(0, 2)
+fpin.seek(0)
+
+if filename[0] == ".":
+	filename = filename[1:]
+
+cname = filename + ".c"
+print("Making C file <{0}>".format(cname))
+
+filename = filename.replace(".", "_")
+
+try:
+	fpout = open(cname, "w")
+except:
+	print("Unable to open output <{0}>".format(cname))
+	sys.exit(1)
+
+fpout.write("/* DataToC output of file <{0}> */\n\n".format(filename))
+fpout.write("int datatoc_{0}_size= {1};\n".format(filename, size))
+
+fpout.write("char datatoc_{0}[]= {{\n".format(filename))
+
+while size > 0:
+	size -= 1
+	if size % 32 == 31:
+		fpout.write("\n")
+	
+	fpout.write("{0:3d},".format(ord(fpin.read(1))))
+
+fpout.write("\n  0};\n\n")
+
+fpin.close()
+fpout.close()

From 3ac11df33bf47d98e1a945beaea99e9a98f716d2 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 11:13:45 +0000
Subject: [PATCH 306/577] First try of sound operators, untested.

---
 source/blender/editors/sound/sound_intern.h |  39 +++++++
 source/blender/editors/sound/sound_ops.c    | 107 ++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 source/blender/editors/sound/sound_intern.h
 create mode 100644 source/blender/editors/sound/sound_ops.c

diff --git a/source/blender/editors/sound/sound_intern.h b/source/blender/editors/sound/sound_intern.h
new file mode 100644
index 00000000000..b0d6abb3f00
--- /dev/null
+++ b/source/blender/editors/sound/sound_intern.h
@@ -0,0 +1,39 @@
+/**
+ * $Id:$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef ED_SOUND_INTERN_H
+#define ED_SOUND_INTERN_H
+
+struct wmOperatorType;
+
+void SOUND_OT_open(wmOperatorType *ot);
+
+void sound_operatortype_init(void);
+
+#endif /* ED_SOUND_INTERN_H */
+
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
new file mode 100644
index 00000000000..59bb9c5319c
--- /dev/null
+++ b/source/blender/editors/sound/sound_ops.c
@@ -0,0 +1,107 @@
+/**
+ * $Id:$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdio.h>
+
+#include "DNA_scene_types.h"
+#include "DNA_space_types.h"
+#include "DNA_sound_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "BKE_context.h"
+#include "BKE_main.h"
+#include "BKE_report.h"
+#include "BKE_sound.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "AUD_C-API.h"
+
+#include "sound_intern.h"
+
+/******************** open sound operator ********************/
+
+static int open_exec(bContext *C, wmOperator *op)
+{
+	char filename[FILE_MAX];
+	bSound *sound;
+	AUD_SoundInfo info;
+
+	RNA_string_get(op->ptr, "filename", filename);
+
+	sound = sound_new_file(CTX_data_main(C), filename);
+
+	if (sound==NULL || sound->handle == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
+		return OPERATOR_CANCELLED;
+	}
+
+	info = AUD_getInfo(sound->handle);
+
+	if (info.specs.format == AUD_FORMAT_INVALID) {
+		sound_delete(C, sound);
+		BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
+		return OPERATOR_CANCELLED;
+	}
+
+	return OPERATOR_FINISHED;
+}
+
+static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	return WM_operator_filesel(C, op, event);
+}
+
+void SOUND_OT_open(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Open";
+	ot->idname= "SOUND_OT_open";
+	ot->description= "Load a sound file into blender";
+
+	/* api callbacks */
+	ot->exec= open_exec;
+	ot->invoke= open_invoke;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE);
+}
+
+/* ******************************************************* */
+
+void sound_operatortype_init(void)
+{
+	WM_operatortype_append(SOUND_OT_open);
+}

From 6a8020b9c6693bdb14885914e8688847e2d11629 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 12:27:29 +0000
Subject: [PATCH 307/577] First try in sound UI for the sequencer.

---
 release/ui/space_sequencer.py                 | 24 +++++++++++++
 source/blender/editors/include/ED_sound.h     | 35 +++++++++++++++++++
 source/blender/editors/sound/sound_intern.h   |  2 --
 source/blender/editors/sound/sound_ops.c      |  6 ++--
 source/blender/editors/space_api/spacetypes.c |  2 ++
 .../blender/editors/space_image/image_ops.c   |  2 +-
 6 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 source/blender/editors/include/ED_sound.h

diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 1498c37d761..6b86ea5dabe 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -455,6 +455,29 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
 		col.itemR(strip, "animation_start_offset", text="Start")
 		col.itemR(strip, "animation_end_offset", text="End")
 
+class SEQUENCER_PT_sound(SequencerButtonsPanel):
+	__label__ = "Sound"
+	
+	def poll(self, context):
+		if context.space_data.display_mode != 'SEQUENCER':
+			return False
+		
+		strip = act_strip(context)
+		if not strip:
+			return False
+		
+		return strip.type in ('SOUND')
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		strip = act_strip(context)
+		
+		layout.template_ID(strip, "sound", new="sound.open")
+		
+		layout.itemR(strip.sound, "filename")
+		layout.itemR(strip.sound, "caching")
+
 class SEQUENCER_PT_filter(SequencerButtonsPanel):
 	__label__ = "Filter"
 	
@@ -558,6 +581,7 @@ bpy.types.register(SEQUENCER_MT_strip)
 bpy.types.register(SEQUENCER_PT_edit) # sequencer panels
 bpy.types.register(SEQUENCER_PT_effect)
 bpy.types.register(SEQUENCER_PT_input)
+bpy.types.register(SEQUENCER_PT_sound)
 bpy.types.register(SEQUENCER_PT_filter)
 bpy.types.register(SEQUENCER_PT_proxy)
 
diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.h
new file mode 100644
index 00000000000..584370bc738
--- /dev/null
+++ b/source/blender/editors/include/ED_sound.h
@@ -0,0 +1,35 @@
+/**
+ * $Id:$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef ED_SOUND_H
+#define ED_SOUND_H
+
+void ED_operatortypes_sound(void);
+
+#endif /* ED_SOUND_H */
+
diff --git a/source/blender/editors/sound/sound_intern.h b/source/blender/editors/sound/sound_intern.h
index b0d6abb3f00..eb793a0b661 100644
--- a/source/blender/editors/sound/sound_intern.h
+++ b/source/blender/editors/sound/sound_intern.h
@@ -33,7 +33,5 @@ struct wmOperatorType;
 
 void SOUND_OT_open(wmOperatorType *ot);
 
-void sound_operatortype_init(void);
-
 #endif /* ED_SOUND_INTERN_H */
 
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 59bb9c5319c..a23a28423ef 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -38,6 +38,8 @@
 #include "BKE_report.h"
 #include "BKE_sound.h"
 
+#include "ED_sound.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -84,7 +86,7 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void SOUND_OT_open(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Open";
+	ot->name= "Open Sound";
 	ot->idname= "SOUND_OT_open";
 	ot->description= "Load a sound file into blender";
 
@@ -101,7 +103,7 @@ void SOUND_OT_open(wmOperatorType *ot)
 
 /* ******************************************************* */
 
-void sound_operatortype_init(void)
+void ED_operatortypes_sound(void)
 {
 	WM_operatortype_append(SOUND_OT_open);
 }
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 61b6fe391ae..0d702144959 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -51,6 +51,7 @@
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 #include "ED_space_api.h"
+#include "ED_sound.h"
 #include "ED_uvedit.h"
 #include "ED_mball.h"
 
@@ -99,6 +100,7 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_metaball();
 	ED_operatortypes_boids();
 	ED_operatortypes_gpencil();
+	ED_operatortypes_sound();
 	
 	ui_view2d_operatortypes();
 	
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index d9f02a35142..7a39cd587eb 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -650,7 +650,7 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void IMAGE_OT_open(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Open";
+	ot->name= "Open Image";
 	ot->idname= "IMAGE_OT_open";
 	
 	/* api callbacks */

From d7656684e213e4755e6f499d2e3a0734507e803d Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 12:38:59 +0000
Subject: [PATCH 308/577] Quick fix for scons (untested though :/).

---
 source/blender/editors/SConscript       |  1 +
 source/blender/editors/sound/SConscript | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 source/blender/editors/sound/SConscript

diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript
index 05f17dae1a1..ccffbdb15d5 100644
--- a/source/blender/editors/SConscript
+++ b/source/blender/editors/SConscript
@@ -15,6 +15,7 @@ SConscript(['datafiles/SConscript',
 			'gpencil/SConscript',
 			'physics/SConscript',
 			'preview/SConscript',
+			'sound/SConscript',
 			'space_buttons/SConscript',
 			'space_file/SConscript',
 			'space_image/SConscript',
diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript
new file mode 100644
index 00000000000..7968f4c53a9
--- /dev/null
+++ b/source/blender/editors/sound/SConscript
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' ../../windowmanager #/intern/guardedalloc'
+incs += ' #/intern/guardedalloc'
+incs += ' ../../makesrna ../../python'
+incs += ' #/intern/audaspace/intern'
+
+defs = []
+
+env.BlenderLib ( 'bf_editors_sound', sources, Split(incs), defs, libtype=['core'], priority=[35] )

From c15db042cc1b1168a9894a7f5848a866e7b3575a Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 28 Aug 2009 12:41:45 +0000
Subject: [PATCH 309/577] Grease Pencil: WIP Code Reordering + Context Stuff

* Shuffled some code around, and renamed some functions used for getting context info
- Split UI-buttons into a separate file from stroke-drawing code
- Removed some obsolete code (i.e. old paint code that used to be in _edit, but which has been moved to _paint).

* Made drawing in 3D-View default to using the active object as the owner of the Grease Pencil data. For now, the drawing code will therefore only show the GP data for the active object only. More work to come on this.

* Fixed freeing code for Objects/Scenes with GP data.
---
 source/blender/blenkernel/intern/object.c     |    1 +
 source/blender/blenkernel/intern/scene.c      |    5 +
 source/blender/blenloader/intern/readfile.c   |    4 +
 .../blender/editors/animation/anim_filter.c   |    2 +-
 source/blender/editors/gpencil/drawgpencil.c  |  341 +---
 .../blender/editors/gpencil/gpencil_buttons.c |  334 ++++
 source/blender/editors/gpencil/gpencil_edit.c | 1638 +----------------
 .../blender/editors/gpencil/gpencil_paint.c   |  122 +-
 source/blender/editors/include/ED_gpencil.h   |   36 +-
 .../editors/transform/transform_conversions.c |    2 +-
 source/blender/makesdna/DNA_object_types.h    |    7 +-
 source/blender/makesrna/intern/rna_object.c   |    7 +
 12 files changed, 478 insertions(+), 2021 deletions(-)
 create mode 100644 source/blender/editors/gpencil/gpencil_buttons.c

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 5e2a00c219d..6f57a658efa 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -284,6 +284,7 @@ void free_object(Object *ob)
 	if(ob->adt) BKE_free_animdata((ID *)ob);
 	if(ob->poselib) ob->poselib->id.us--;
 	if(ob->dup_group) ob->dup_group->id.us--;
+	if(ob->gpd) ob->gpd->id.us--;
 	if(ob->defbase.first)
 		BLI_freelistN(&ob->defbase);
 	if(ob->pose)
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 6dd362d15a8..63dabf18faa 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -245,6 +245,11 @@ void free_scene(Scene *sce)
 		base= base->next;
 	}
 	/* do not free objects! */
+	
+	if(sce->gpd) {
+		sce->gpd->id.us--;
+		sce->gpd= NULL;
+	}
 
 	BLI_freelistN(&sce->base);
 	seq_free_editing(sce);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5d61e3d305e..1a811ebc08a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3449,6 +3449,8 @@ static void lib_link_object(FileData *fd, Main *main)
 			}
 			for(a=0; a<ob->totcol; a++) ob->mat[a]= newlibadr_us(fd, ob->id.lib, ob->mat[a]);
 			
+			ob->gpd= newlibadr_us(fd, ob->id.lib, ob->gpd);
+			
 			ob->id.flag -= LIB_NEEDLINK;
 			/* if id.us==0 a new base will be created later on */
 			
@@ -10418,6 +10420,8 @@ static void expand_object(FileData *fd, Main *mainvar, Object *ob)
 	expand_doit(fd, mainvar, ob->poselib);
 	expand_constraints(fd, mainvar, &ob->constraints);
 	
+	expand_doit(fd, mainvar, ob->gpd);
+	
 // XXX depreceated - old animation system (for version patching only) 
 	expand_doit(fd, mainvar, ob->ipo);
 	expand_doit(fd, mainvar, ob->action);
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 37c8aeac13a..55fb1ccace0 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -885,7 +885,7 @@ static int animdata_filter_gpencil (ListBase *anim_data, bScreen *sc, int filter
 		for (sa= sc->areabase.first; sa; sa= sa->next) {
 			/* try to get gp data */
 			// XXX need to put back grease pencil api...
-			gpd= gpencil_data_getactive(sa);
+			gpd= gpencil_data_get_active(sa);
 			if (gpd == NULL) continue;
 			
 			/* add gpd as channel too (if for drawing, and it has layers) */
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 242be943507..4a48e9a4e3b 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -67,278 +67,11 @@
 #include "ED_sequencer.h"
 #include "ED_util.h"
 
-#include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
 #include "gpencil_intern.h"
 
-/* ************************************************** */
-/* GREASE PENCIL PANEL-UI DRAWING */
-
-/* Every space which implements Grease-Pencil functionality should have a panel
- * for the settings. All of the space-dependent parts should be coded in the panel
- * code for that space, but the rest is all handled by generic panel here.
- */
-
-/* ------- Callbacks ----------- */
-/* These are just 'dummy wrappers' around gpencil api calls */
-
-#if 0
-// XXX
-/* make layer active one after being clicked on */
-void gp_ui_activelayer_cb (void *gpd, void *gpl)
-{
-	gpencil_layer_setactive(gpd, gpl);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* rename layer and set active */
-void gp_ui_renamelayer_cb (void *gpd_arg, void *gpl_arg)
-{
-	bGPdata *gpd= (bGPdata *)gpd_arg;
-	bGPDlayer *gpl= (bGPDlayer *)gpl_arg;
-	
-	BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info[0]), 128);
-	gpencil_layer_setactive(gpd, gpl);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* add a new layer */
-void gp_ui_addlayer_cb (void *gpd, void *dummy)
-{
-	gpencil_layer_addnew(gpd);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* delete active layer */
-void gp_ui_dellayer_cb (void *gpd, void *dummy)
-{
-	gpencil_layer_delactive(gpd);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* delete last stroke of active layer */
-void gp_ui_delstroke_cb (void *gpd, void *gpl)
-{
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
-	
-	if (gpf) {
-		if (gpf->framenum != CFRA) return;
-
-		gpencil_layer_setactive(gpd, gpl);
-		gpencil_frame_delete_laststroke(gpl, gpf);
-		
-		scrarea_queue_winredraw(curarea);
-	}
-}
-
-/* delete active frame of active layer */
-void gp_ui_delframe_cb (void *gpd, void *gpl)
-{
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
-	
-	gpencil_layer_setactive(gpd, gpl);
-	gpencil_layer_delframe(gpl, gpf);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* convert the active layer to geometry */
-void gp_ui_convertlayer_cb (void *gpd, void *gpl)
-{
-	gpencil_layer_setactive(gpd, gpl);
-	gpencil_convert_menu();
-	
-	scrarea_queue_winredraw(curarea);
-}
-#endif
-
-/* ------- Drawing Code ------- */
-
-#if 0
-/* XXX */
-/* draw the controls for a given layer */
-static void gp_drawui_layer (uiBlock *block, bGPdata *gpd, bGPDlayer *gpl, short *xco, short *yco)
-{
-	uiBut *but;
-	short active= (gpl->flag & GP_LAYER_ACTIVE);
-	short width= 314;
-	short height;
-	int rb_col;
-	
-	/* unless button has own callback, it adds this callback to button */
-	uiBlockSetFunc(block, gp_ui_activelayer_cb, gpd, gpl);
-	
-	/* draw header */
-	{
-		uiBlockSetEmboss(block, UI_EMBOSSN);
-		
-		/* rounded header */
-		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
-			rb_col= (active)?-20:20;
-			uiDefBut(block, ROUNDBOX, B_REDR, "", *xco-8, *yco-2, width, 24, NULL, 5.0, 0.0, 15.0, (float)(rb_col-20), ""); 
-		if (active) uiBlockSetCol(block, TH_AUTO);
-		
-		/* lock toggle */
-		uiDefIconButBitI(block, ICONTOG, GP_LAYER_LOCKED, B_REDR, ICON_UNLOCKED,	*xco-7, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Layer cannot be modified");
-	}
-	
-	/* when layer is locked or hidden, only draw header */
-	if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) {
-		char name[256]; /* gpl->info is 128, but we need space for 'locked/hidden' as well */
-		
-		height= 0;
-		
-		/* visibility button (only if hidden but not locked!) */
-		if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
-			uiDefIconButBitI(block, ICONTOG, GP_LAYER_HIDE, B_REDR, ICON_RESTRICT_VIEW_OFF,	*xco+12, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Visibility of layer");
-		
-		/* name */
-		if (gpl->flag & GP_LAYER_HIDE)
-			sprintf(name, "%s (Hidden)", gpl->info);
-		else
-			sprintf(name, "%s (Locked)", gpl->info);
-		uiDefBut(block, LABEL, 1, name,	*xco+35, *yco, 240, 20, NULL, 0.0, 0.0, 0, 0, "Short description of what this layer is for (optional)");
-			
-		/* delete button (only if hidden but not locked!) */
-		if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) {
-			but= uiDefIconBut(block, BUT, B_REDR, ICON_X, *xco+(width-30), *yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
-			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, NULL);
-		}	
-		uiBlockSetEmboss(block, UI_EMBOSS);
-	}
-	else {
-		height= 97;
-		
-		/* draw rest of header */
-		{
-			/* visibility button */
-			uiDefIconButBitI(block, ICONTOG, GP_LAYER_HIDE, B_REDR, ICON_RESTRICT_VIEW_OFF,	*xco+12, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Visibility of layer");
-			
-			uiBlockSetEmboss(block, UI_EMBOSS);
-			
-			/* name */
-			but= uiDefButC(block, TEX, B_REDR, "Info:",	*xco+36, *yco, 240, 19, gpl->info, 0, 127, 0, 0, "Short description of what this layer is for (optional)");
-			uiButSetFunc(but, gp_ui_renamelayer_cb, gpd, gpl);
-			
-			/* delete 'button' */
-			uiBlockSetEmboss(block, UI_EMBOSSN);
-			
-			but= uiDefIconBut(block, BUT, B_REDR, ICON_X, *xco+(width-30), *yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
-			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, NULL);
-			
-			uiBlockSetEmboss(block, UI_EMBOSS);
-		}
-		
-		/* draw backdrop */
-		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
-			uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-8, *yco-height, width, height-1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); 
-		if (active) uiBlockSetCol(block, TH_AUTO);
-		
-		/* draw settings */
-		{
-			/* color */
-			uiBlockBeginAlign(block);
-				uiDefButF(block, COL, B_REDR, "",		*xco, *yco-26, 150, 19, gpl->color, 0, 0, 0, 0, "Color to use for all strokes on this Grease Pencil Layer");
-				uiDefButF(block, NUMSLI, B_REDR, "Opacity: ",		*xco,*yco-45,150,19, &gpl->color[3], 0.3f, 1.0f, 0, 0, "Visibility of stroke (0.3 to 1.0)");
-			uiBlockEndAlign(block);
-			
-			/* stroke thickness */
-			uiDefButS(block, NUMSLI, B_REDR, "Thickness:",	*xco, *yco-75, 150, 20, &gpl->thickness, 1, 10, 0, 0, "Thickness of strokes (in pixels)");
-			
-			/* debugging options */
-			if (G.f & G_DEBUG) {
-				uiDefButBitI(block, TOG, GP_LAYER_DRAWDEBUG, B_REDR, "Show Points", *xco, *yco-95, 150, 20, &gpl->flag, 0, 0, 0, 0, "Show points which form the strokes");
-			}
-			
-			/* onion-skinning */
-			uiBlockBeginAlign(block);
-				uiDefButBitI(block, TOG, GP_LAYER_ONIONSKIN, B_REDR, "Onion-Skin", *xco+160, *yco-26, 140, 20, &gpl->flag, 0, 0, 0, 0, "Ghost frames on either side of frame");
-				uiDefButS(block, NUMSLI, B_REDR, "GStep:",	*xco+160, *yco-46, 140, 20, &gpl->gstep, 0, 120, 0, 0, "Max number of frames on either side of active frame to show (0 = just 'first' available sketch on either side)");
-			uiBlockEndAlign(block);
-			
-			/* options */
-			uiBlockBeginAlign(block);
-				if (curarea->spacetype == SPACE_VIEW3D) {
-					but= uiDefBut(block, BUT, B_REDR, "Convert to...", *xco+160, *yco-75, 140, 20, NULL, 0, 0, 0, 0, "Converts this layer's strokes to geometry (Hotkey = Alt-Shift-C)");
-					uiButSetFunc(but, gp_ui_convertlayer_cb, gpd, gpl);
-				}
-				else {
-					but= uiDefBut(block, BUT, B_REDR, "Del Active Frame", *xco+160, *yco-75, 140, 20, NULL, 0, 0, 0, 0, "Erases the the active frame for this layer (Hotkey = Alt-XKEY/DEL)");
-					uiButSetFunc(but, gp_ui_delframe_cb, gpd, gpl);
-				}
-				
-				but= uiDefBut(block, BUT, B_REDR, "Del Last Stroke", *xco+160, *yco-95, 140, 20, NULL, 0, 0, 0, 0, "Erases the last stroke from the active frame (Hotkey = Alt-XKEY/DEL)");
-				uiButSetFunc(but, gp_ui_delstroke_cb, gpd, gpl);
-			uiBlockEndAlign(block);
-		}
-	}
-	
-	/* adjust height for new to start */
-	(*yco) -= (height + 27); 
-} 
-#endif
-/* Draw the contents for a grease-pencil panel. This assumes several things:
- * 	- that panel has been created, is 318 x 204. max yco is 225
- *	- that a toggle for turning on/off gpencil drawing is 150 x 20, starting from (10,225)
- *		which is basically the top left-hand corner
- * It will return the amount of extra space to extend the panel by
- */
-short draw_gpencil_panel (uiBlock *block, bGPdata *gpd, ScrArea *sa)
-{
-#if 0
-	uiBut *but;
-	bGPDlayer *gpl;
-	short xco= 10, yco= 170;
-	
-	/* draw gpd settings first */
-	{
-		/* add new layer buttons */
-		but= uiDefBut(block, BUT, B_REDR, "Add New Layer", 10,205,150,20, 0, 0, 0, 0, 0, "Adds a new Grease Pencil Layer");
-		uiButSetFunc(but, gp_ui_addlayer_cb, gpd, NULL);
-		
-		
-		/* show override lmb-clicks button + painting lock */
-		uiBlockBeginAlign(block);
-			if ((gpd->flag & GP_DATA_EDITPAINT)==0) {
-				uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 130, 20, &gpd->flag, 0, 0, 0, 0, "Interpret click-drag as new strokes");
-				
-				uiBlockSetCol(block, TH_BUT_SETTING);
-					uiDefIconButBitI(block, ICONTOG, GP_DATA_LMBPLOCK, B_REDR, ICON_UNLOCKED,	300, 225, 20, 20, &gpd->flag, 0.0, 0.0, 0, 0, "Painting cannot occur with Shift-LMB (when making selections)");
-				uiBlockSetCol(block, TH_AUTO);
-			}
-			else
-				uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 150, 20, &gpd->flag, 0, 0, 0, 0, "Interpret click-drag as new strokes");
-		uiBlockEndAlign(block);
-		
-		/* 'view align' button (naming depends on context) */
-		if (sa->spacetype == SPACE_VIEW3D)
-			uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Sketch in 3D", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added in 3D-space");
-		else
-			uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Stick to View", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added on 2d-canvas");
-	}
-	
-	/* draw for each layer */
-	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
-		gp_drawui_layer(block, gpd, gpl, &xco, &yco);
-	}
-	
-	/* return new height if necessary */
-	return (yco < 0) ? (204 - yco) : 204;
-#endif
-	return 0;
-}	
-
 /* ************************************************** */
 /* GREASE PENCIL DRAWING */
 
@@ -432,8 +165,8 @@ static void gp_draw_stroke_point (bGPDspoint *points, short thickness, short sfl
 			co[1]= (points->y * winy) + offsy;
 		}
 		else {
-			co[0]= (points->x / 1000 * winx);
-			co[1]= (points->y / 1000 * winy);
+			co[0]= (points->x / 100 * winx);
+			co[1]= (points->y / 100 * winy);
 		}
 		
 		/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, simple dot looks ok
@@ -525,8 +258,8 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
 				glVertex2f(x, y);
 			}
 			else {
-				const float x= (pt->x / 1000 * winx);
-				const float y= (pt->y / 1000 * winy);
+				const float x= (pt->x / 100 * winx);
+				const float y= (pt->y / 100 * winy);
 				
 				glVertex2f(x, y);
 			}
@@ -565,10 +298,10 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
 				s1[1]= (pt2->y * winy) + offsy;
 			}
 			else {
-				s0[0]= (pt1->x / 1000 * winx);
-				s0[1]= (pt1->y / 1000 * winy);
-				s1[0]= (pt2->x / 1000 * winx);
-				s1[1]= (pt2->y / 1000 * winy);
+				s0[0]= (pt1->x / 100 * winx);
+				s0[1]= (pt1->y / 100 * winy);
+				s1[0]= (pt2->x / 100 * winx);
+				s1[1]= (pt2->y / 100 * winy);
 			}		
 			
 			/* calculate gradient and normal - 'angle'=(ny/nx) */
@@ -713,8 +446,8 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
 				glVertex2f(x, y);
 			}
 			else {
-				const float x= (float)(pt->x / 1000 * winx);
-				const float y= (float)(pt->y / 1000 * winy);
+				const float x= (float)(pt->x / 100 * winx);
+				const float y= (float)(pt->y / 100 * winy);
 				
 				glVertex2f(x, y);
 			}
@@ -872,47 +605,7 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy
 	/* turn off alpha blending, then smooth lines */
 	glDisable(GL_BLEND); // alpha blending
 	glDisable(GL_LINE_SMOOTH); // smooth lines
-	
-	/* show info for debugging the status of gpencil */
-#if 0
-	if ( ((dflag & GP_DRAWDATA_NOSTATUS)==0) && (gpd->flag & GP_DATA_DISPINFO) ) {
-		char printable[256];
-		short xmax;
 		
-		/* get text to display */
-		if (actlay) {
-			if (gpd->flag & GP_DATA_EDITPAINT)
-				UI_ThemeColor(TH_BONE_POSE); // should be blue-ish
-			else if (actlay->actframe == NULL)
-				UI_ThemeColor(TH_REDALERT);
-			else if (actlay->actframe->framenum == cfra)
-				UI_ThemeColor(TH_VERTEX_SELECT); // should be yellow
-			else
-				UI_ThemeColor(TH_TEXT_HI);
-			
-			if (actlay->actframe) {
-				sprintf(printable, "GPencil: Layer ('%s'), Frame (%d)%s", 
-					actlay->info, actlay->actframe->framenum,
-					((gpd->flag & GP_DATA_EDITPAINT)?" , Draw Mode On":"") );
-			}
-			else {
-				sprintf(printable, "GPencil: Layer ('%s'), Frame <None>%s", 
-					actlay->info, ((gpd->flag & GP_DATA_EDITPAINT)?" , Draw Mode On":"") );
-			}
-		}
-		else {
-			UI_ThemeColor(TH_REDALERT);
-			sprintf(printable, "GPencil: Layer <None>");
-		}
-		xmax= GetButStringLength(printable);
-		
-		/* only draw it if view is wide enough (assume padding of 20 is enough for now) */
-		if (winx > (xmax + 20)) { 
-			BLF_draw_default(winx-xmax, winy-20, 0.0f, printable);
-		}
-	}
-#endif
-	
 	/* restore initial gl conditions */
 	glLineWidth(1.0);
 	glPointSize(1.0);
@@ -921,6 +614,12 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy
 
 /* ----- Grease Pencil Sketches Drawing API ------ */
 
+// ............................
+// XXX 
+//	We need to review the calls below, since they may be/are not that suitable for
+//	the new ways that we intend to be drawing data...
+// ............................
+
 /* draw grease-pencil sketches to specified 2d-view that uses ibuf corrections */
 void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf)
 {
@@ -933,7 +632,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf)
 	
 	/* check that we have grease-pencil stuff to draw */
 	if (ELEM(NULL, sa, ibuf)) return;
-	gpd= gpencil_data_getactive(C);
+	gpd= gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 	
 	/* calculate rect */
@@ -1007,7 +706,7 @@ void draw_gpencil_2dview (bContext *C, short onlyv2d)
 	
 	/* check that we have grease-pencil stuff to draw */
 	if (sa == NULL) return;
-	gpd= gpencil_data_getactive(C);
+	gpd= gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 	
 	/* draw it! */
@@ -1026,7 +725,7 @@ void draw_gpencil_3dview (bContext *C, short only3d)
 	int dflag = 0;
 	
 	/* check that we have grease-pencil stuff to draw */
-	gpd= gpencil_data_getactive(C);
+	gpd= gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 	
 	/* draw it! */
@@ -1046,7 +745,7 @@ void draw_gpencil_oglrender (bContext *C)
 	
 	/* assume gpencil data comes from v3d */
 	if (v3d == NULL) return;
-	gpd= gpencil_data_getactive(C);
+	gpd= gpencil_data_get_active(C);
 	if (gpd == NULL) return;
 	
 	/* pass 1: draw 3d-strokes ------------ > */
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
new file mode 100644
index 00000000000..87f3b60dcc2
--- /dev/null
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -0,0 +1,334 @@
+/**
+ * $Id: drawgpencil.c 22802 2009-08-26 12:01:15Z aligorith $
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008, Blender Foundation, Joshua Leung
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+
+#include "DNA_gpencil_types.h"
+#include "DNA_listBase.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_gpencil.h"
+#include "BKE_utildefines.h"
+
+#include "PIL_time.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "ED_gpencil.h"
+#include "ED_sequencer.h"
+#include "ED_util.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "gpencil_intern.h"
+
+/* ************************************************** */
+/* GREASE PENCIL PANEL-UI DRAWING */
+
+/* Every space which implements Grease-Pencil functionality should have a panel
+ * for the settings. All of the space-dependent parts should be coded in the panel
+ * code for that space, but the rest is all handled by generic panel here.
+ */
+
+/* ------- Callbacks ----------- */
+/* These are just 'dummy wrappers' around gpencil api calls */
+
+#if 0
+// XXX
+/* make layer active one after being clicked on */
+void gp_ui_activelayer_cb (void *gpd, void *gpl)
+{
+	gpencil_layer_setactive(gpd, gpl);
+	
+	scrarea_queue_winredraw(curarea);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* rename layer and set active */
+void gp_ui_renamelayer_cb (void *gpd_arg, void *gpl_arg)
+{
+	bGPdata *gpd= (bGPdata *)gpd_arg;
+	bGPDlayer *gpl= (bGPDlayer *)gpl_arg;
+	
+	BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info[0]), 128);
+	gpencil_layer_setactive(gpd, gpl);
+	
+	scrarea_queue_winredraw(curarea);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* add a new layer */
+void gp_ui_addlayer_cb (void *gpd, void *dummy)
+{
+	gpencil_layer_addnew(gpd);
+	
+	scrarea_queue_winredraw(curarea);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* delete active layer */
+void gp_ui_dellayer_cb (void *gpd, void *dummy)
+{
+	gpencil_layer_delactive(gpd);
+	
+	scrarea_queue_winredraw(curarea);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* delete last stroke of active layer */
+void gp_ui_delstroke_cb (void *gpd, void *gpl)
+{
+	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
+	
+	if (gpf) {
+		if (gpf->framenum != CFRA) return;
+
+		gpencil_layer_setactive(gpd, gpl);
+		gpencil_frame_delete_laststroke(gpl, gpf);
+		
+		scrarea_queue_winredraw(curarea);
+	}
+}
+
+/* delete active frame of active layer */
+void gp_ui_delframe_cb (void *gpd, void *gpl)
+{
+	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
+	
+	gpencil_layer_setactive(gpd, gpl);
+	gpencil_layer_delframe(gpl, gpf);
+	
+	scrarea_queue_winredraw(curarea);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* convert the active layer to geometry */
+void gp_ui_convertlayer_cb (void *gpd, void *gpl)
+{
+	gpencil_layer_setactive(gpd, gpl);
+	gpencil_convert_menu();
+	
+	scrarea_queue_winredraw(curarea);
+}
+#endif
+
+/* ------- Drawing Code ------- */
+
+#if 0
+/* XXX */
+/* draw the controls for a given layer */
+static void gp_drawui_layer (uiBlock *block, bGPdata *gpd, bGPDlayer *gpl, short *xco, short *yco)
+{
+	uiBut *but;
+	short active= (gpl->flag & GP_LAYER_ACTIVE);
+	short width= 314;
+	short height;
+	int rb_col;
+	
+	/* unless button has own callback, it adds this callback to button */
+	uiBlockSetFunc(block, gp_ui_activelayer_cb, gpd, gpl);
+	
+	/* draw header */
+	{
+		uiBlockSetEmboss(block, UI_EMBOSSN);
+		
+		/* rounded header */
+		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
+			rb_col= (active)?-20:20;
+			uiDefBut(block, ROUNDBOX, B_REDR, "", *xco-8, *yco-2, width, 24, NULL, 5.0, 0.0, 15.0, (float)(rb_col-20), ""); 
+		if (active) uiBlockSetCol(block, TH_AUTO);
+		
+		/* lock toggle */
+		uiDefIconButBitI(block, ICONTOG, GP_LAYER_LOCKED, B_REDR, ICON_UNLOCKED,	*xco-7, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Layer cannot be modified");
+	}
+	
+	/* when layer is locked or hidden, only draw header */
+	if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) {
+		char name[256]; /* gpl->info is 128, but we need space for 'locked/hidden' as well */
+		
+		height= 0;
+		
+		/* visibility button (only if hidden but not locked!) */
+		if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
+			uiDefIconButBitI(block, ICONTOG, GP_LAYER_HIDE, B_REDR, ICON_RESTRICT_VIEW_OFF,	*xco+12, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Visibility of layer");
+		
+		/* name */
+		if (gpl->flag & GP_LAYER_HIDE)
+			sprintf(name, "%s (Hidden)", gpl->info);
+		else
+			sprintf(name, "%s (Locked)", gpl->info);
+		uiDefBut(block, LABEL, 1, name,	*xco+35, *yco, 240, 20, NULL, 0.0, 0.0, 0, 0, "Short description of what this layer is for (optional)");
+			
+		/* delete button (only if hidden but not locked!) */
+		if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) {
+			but= uiDefIconBut(block, BUT, B_REDR, ICON_X, *xco+(width-30), *yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
+			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, NULL);
+		}	
+		uiBlockSetEmboss(block, UI_EMBOSS);
+	}
+	else {
+		height= 97;
+		
+		/* draw rest of header */
+		{
+			/* visibility button */
+			uiDefIconButBitI(block, ICONTOG, GP_LAYER_HIDE, B_REDR, ICON_RESTRICT_VIEW_OFF,	*xco+12, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Visibility of layer");
+			
+			uiBlockSetEmboss(block, UI_EMBOSS);
+			
+			/* name */
+			but= uiDefButC(block, TEX, B_REDR, "Info:",	*xco+36, *yco, 240, 19, gpl->info, 0, 127, 0, 0, "Short description of what this layer is for (optional)");
+			uiButSetFunc(but, gp_ui_renamelayer_cb, gpd, gpl);
+			
+			/* delete 'button' */
+			uiBlockSetEmboss(block, UI_EMBOSSN);
+			
+			but= uiDefIconBut(block, BUT, B_REDR, ICON_X, *xco+(width-30), *yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
+			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, NULL);
+			
+			uiBlockSetEmboss(block, UI_EMBOSS);
+		}
+		
+		/* draw backdrop */
+		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
+			uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-8, *yco-height, width, height-1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); 
+		if (active) uiBlockSetCol(block, TH_AUTO);
+		
+		/* draw settings */
+		{
+			/* color */
+			uiBlockBeginAlign(block);
+				uiDefButF(block, COL, B_REDR, "",		*xco, *yco-26, 150, 19, gpl->color, 0, 0, 0, 0, "Color to use for all strokes on this Grease Pencil Layer");
+				uiDefButF(block, NUMSLI, B_REDR, "Opacity: ",		*xco,*yco-45,150,19, &gpl->color[3], 0.3f, 1.0f, 0, 0, "Visibility of stroke (0.3 to 1.0)");
+			uiBlockEndAlign(block);
+			
+			/* stroke thickness */
+			uiDefButS(block, NUMSLI, B_REDR, "Thickness:",	*xco, *yco-75, 150, 20, &gpl->thickness, 1, 10, 0, 0, "Thickness of strokes (in pixels)");
+			
+			/* debugging options */
+			if (G.f & G_DEBUG) {
+				uiDefButBitI(block, TOG, GP_LAYER_DRAWDEBUG, B_REDR, "Show Points", *xco, *yco-95, 150, 20, &gpl->flag, 0, 0, 0, 0, "Show points which form the strokes");
+			}
+			
+			/* onion-skinning */
+			uiBlockBeginAlign(block);
+				uiDefButBitI(block, TOG, GP_LAYER_ONIONSKIN, B_REDR, "Onion-Skin", *xco+160, *yco-26, 140, 20, &gpl->flag, 0, 0, 0, 0, "Ghost frames on either side of frame");
+				uiDefButS(block, NUMSLI, B_REDR, "GStep:",	*xco+160, *yco-46, 140, 20, &gpl->gstep, 0, 120, 0, 0, "Max number of frames on either side of active frame to show (0 = just 'first' available sketch on either side)");
+			uiBlockEndAlign(block);
+			
+			/* options */
+			uiBlockBeginAlign(block);
+				if (curarea->spacetype == SPACE_VIEW3D) {
+					but= uiDefBut(block, BUT, B_REDR, "Convert to...", *xco+160, *yco-75, 140, 20, NULL, 0, 0, 0, 0, "Converts this layer's strokes to geometry (Hotkey = Alt-Shift-C)");
+					uiButSetFunc(but, gp_ui_convertlayer_cb, gpd, gpl);
+				}
+				else {
+					but= uiDefBut(block, BUT, B_REDR, "Del Active Frame", *xco+160, *yco-75, 140, 20, NULL, 0, 0, 0, 0, "Erases the the active frame for this layer (Hotkey = Alt-XKEY/DEL)");
+					uiButSetFunc(but, gp_ui_delframe_cb, gpd, gpl);
+				}
+				
+				but= uiDefBut(block, BUT, B_REDR, "Del Last Stroke", *xco+160, *yco-95, 140, 20, NULL, 0, 0, 0, 0, "Erases the last stroke from the active frame (Hotkey = Alt-XKEY/DEL)");
+				uiButSetFunc(but, gp_ui_delstroke_cb, gpd, gpl);
+			uiBlockEndAlign(block);
+		}
+	}
+	
+	/* adjust height for new to start */
+	(*yco) -= (height + 27); 
+} 
+#endif
+/* Draw the contents for a grease-pencil panel. This assumes several things:
+ * 	- that panel has been created, is 318 x 204. max yco is 225
+ *	- that a toggle for turning on/off gpencil drawing is 150 x 20, starting from (10,225)
+ *		which is basically the top left-hand corner
+ * It will return the amount of extra space to extend the panel by
+ */
+short draw_gpencil_panel (uiBlock *block, bGPdata *gpd, ScrArea *sa)
+{
+#if 0
+	uiBut *but;
+	bGPDlayer *gpl;
+	short xco= 10, yco= 170;
+	
+	/* draw gpd settings first */
+	{
+		/* add new layer buttons */
+		but= uiDefBut(block, BUT, B_REDR, "Add New Layer", 10,205,150,20, 0, 0, 0, 0, 0, "Adds a new Grease Pencil Layer");
+		uiButSetFunc(but, gp_ui_addlayer_cb, gpd, NULL);
+		
+		
+		/* show override lmb-clicks button + painting lock */
+		uiBlockBeginAlign(block);
+			if ((gpd->flag & GP_DATA_EDITPAINT)==0) {
+				uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 130, 20, &gpd->flag, 0, 0, 0, 0, "Interpret click-drag as new strokes");
+				
+				uiBlockSetCol(block, TH_BUT_SETTING);
+					uiDefIconButBitI(block, ICONTOG, GP_DATA_LMBPLOCK, B_REDR, ICON_UNLOCKED,	300, 225, 20, 20, &gpd->flag, 0.0, 0.0, 0, 0, "Painting cannot occur with Shift-LMB (when making selections)");
+				uiBlockSetCol(block, TH_AUTO);
+			}
+			else
+				uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 150, 20, &gpd->flag, 0, 0, 0, 0, "Interpret click-drag as new strokes");
+		uiBlockEndAlign(block);
+		
+		/* 'view align' button (naming depends on context) */
+		if (sa->spacetype == SPACE_VIEW3D)
+			uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Sketch in 3D", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added in 3D-space");
+		else
+			uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Stick to View", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added on 2d-canvas");
+	}
+	
+	/* draw for each layer */
+	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+		gp_drawui_layer(block, gpd, gpl, &xco, &yco);
+	}
+	
+	/* return new height if necessary */
+	return (yco < 0) ? (204 - yco) : 204;
+#endif
+	return 0;
+}	
+
+/* ************************************************** */
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 4480da45572..3130e190ce2 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -17,7 +17,7 @@
  * 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) 2008, Blender Foundation
+ * The Original Code is Copyright (C) 2008, Blender Foundation, Joshua Leung
  * This is a new part of Blender
  *
  * Contributor(s): Joshua Leung
@@ -25,8 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
  
-#if 0 // XXX COMPILE GUARDS FOR OLD CODE
- 
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -69,6 +68,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "RNA_access.h"
+
 #include "UI_view2d.h"
 
 #include "ED_armature.h"
@@ -76,1627 +77,70 @@
 #include "ED_sequencer.h"
 #include "ED_view3d.h"
 
-#include "PIL_time.h"			/* sleep				*/
-
 #include "gpencil_intern.h"
 
-/* XXX */
-static void BIF_undo_push() {}
-static void error() {}
-static int pupmenu() {return 0;}
-static void add_object_draw() {}
-static int get_activedevice() {return 0;}
-#define L_MOUSE 0
-#define R_MOUSE 0
+/* ************************************************ */
+/* Context Wrangling... */
 
-/* ************************************************** */
-/* XXX - OLD DEPRECEATED CODE... */
-
-/* ----------- GP-Datablock API ------------- */
-
-/* get the appropriate bGPdata from the active/given context */
-// XXX region or region data?
-bGPdata *gpencil_data_getactive (ScrArea *sa)
+/* Get pointer to active Grease Pencil datablock, and an RNA-pointer to trace back to whatever owns it */
+bGPdata **gpencil_data_get_pointers (bContext *C, PointerRNA *ptr)
 {
-	ScrArea *curarea= NULL; // XXX
+	Scene *scene= CTX_data_scene(C);
+	ScrArea *sa= CTX_wm_area(C);
 	
-	/* error checking */
-	if ((sa == NULL) && (curarea == NULL))
-		return NULL;
-	if (sa == NULL)
-		sa= curarea;
-		
-	/* handle depending on spacetype */
-	switch (sa->spacetype) {
-		case SPACE_VIEW3D:
-		{
-			View3D *v3d= sa->spacedata.first;
-			return v3d->gpd;
-		}
-			break;
-		case SPACE_NODE:
-		{
-			SpaceNode *snode= sa->spacedata.first;
-			return snode->gpd;
-		}
-			break;
-		case SPACE_SEQ:
-		{
-			SpaceSeq *sseq= sa->spacedata.first;
-			
-			/* only applicable for image modes */
-			if (sseq->mainb != SEQ_DRAW_SEQUENCE)
-				return sseq->gpd;
-		}
-			break;
-		case SPACE_IMAGE:
-		{
-			SpaceImage *sima= sa->spacedata.first;
-			return sima->gpd;
-		}
-			break;
-	}
-	
-	/* nothing found */
-	return NULL;
-}
-
-/* set bGPdata for the active/given context, and return success/fail */
-short gpencil_data_setactive (ScrArea *sa, bGPdata *gpd)
-{
-	ScrArea *curarea= NULL; // XXX
-	
-	/* error checking */
-	if ((sa == NULL) && (curarea == NULL))
-		return 0;
-	if (gpd == NULL)
-		return 0;
-	if (sa == NULL)
-		sa= curarea;
-	
-	/* handle depending on spacetype */
-	// TODO: someday we should have multi-user data, so no need to loose old data
-	switch (sa->spacetype) {
-		case SPACE_VIEW3D:
-		{
-			View3D *v3d= sa->spacedata.first;
-			
-			/* free the existing block */
-			if (v3d->gpd)
-				free_gpencil_data(v3d->gpd);
-			v3d->gpd= gpd;
-			
-			return 1;
-		}
-			break;
-		case SPACE_NODE:
-		{
-			SpaceNode *snode= sa->spacedata.first;
-			
-			/* free the existing block */
-			if (snode->gpd)
-				free_gpencil_data(snode->gpd);
-			snode->gpd= gpd;
-			
-			/* set special settings */
-			gpd->flag |= GP_DATA_VIEWALIGN;
-			
-			return 1;
-		}
-			break;
-		case SPACE_SEQ:
-		{
-			SpaceSeq *sseq= sa->spacedata.first;
-			
-			/* only applicable if right mode */
-			if (sseq->mainb != SEQ_DRAW_SEQUENCE) {
-				/* free the existing block */
-				if (sseq->gpd)
-					free_gpencil_data(sseq->gpd);
-				sseq->gpd= gpd;
-				
-				return 1;
-			}
-		}
-			break;
-		case SPACE_IMAGE:
-		{
-			SpaceImage *sima= sa->spacedata.first;
-			
-			if (sima->gpd)
-				free_gpencil_data(sima->gpd);
-			sima->gpd= gpd;
-			
-			return 1;
-		}
-			break;
-	}
-	
-	/* failed to add */
-	return 0;
-}
-
-/* return the ScrArea that has the given GP-datablock
- *	- assumes that only searching in current screen
- *	- is based on GP-datablocks only being able to 
- * 	  exist for one area at a time (i.e. not multiuser)
- */
-ScrArea *gpencil_data_findowner (bGPdata *gpd)
-{
-	bScreen *curscreen= NULL; // XXX
-	ScrArea *sa;
-	
-	/* error checking */
-	if (gpd == NULL)
-		return NULL;
-		
-	/* loop over all scrareas for current screen, and check if that area has this gpd */
-	for (sa= curscreen->areabase.first; sa; sa= sa->next) {
-		/* use get-active func to see if match */
-		if (gpencil_data_getactive(sa) == gpd)
-			return sa;
-	}
-	
-	/* not found */
-	return NULL;
-}
-
-/* ************************************************** */
-/* GREASE-PENCIL EDITING - Tools */
-
-/* --------- Data Deletion ---------- */
-
-/* delete the last stroke on the active layer */
-void gpencil_delete_laststroke (bGPdata *gpd, int cfra)
-{
-	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, cfra, 0);
-	
-	gpencil_frame_delete_laststroke(gpl, gpf);
-}
-
-/* delete the active frame */
-void gpencil_delete_actframe (bGPdata *gpd, int cfra)
-{
-	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, cfra, 0);
-	
-	gpencil_layer_delframe(gpl, gpf);
-}
-
-
-
-/* delete various grase-pencil elements 
- *	mode: 	1 - last stroke
- *		 	2 - active frame
- *			3 - active layer
- */
-void gpencil_delete_operation (int cfra, short mode)
-{
-	bGPdata *gpd;
-	
-	/* get datablock to work on */
-	gpd= gpencil_data_getactive(NULL);
-	if (gpd == NULL) return;
-	
-	switch (mode) {
-		case 1: /* last stroke */
-			gpencil_delete_laststroke(gpd, cfra);
-			break;
-		case 2: /* active frame */
-			gpencil_delete_actframe(gpd, cfra);
-			break;
-		case 3: /* active layer */
-			gpencil_layer_delactive(gpd);
-			break;
-	}
-	
-	/* redraw and undo-push */
-	BIF_undo_push("GPencil Delete");
-}
-
-/* display a menu for deleting different grease-pencil elements */
-void gpencil_delete_menu (void)
-{
-	bGPdata *gpd= gpencil_data_getactive(NULL);
-	int cfra= 0; // XXX
-	short mode;
-	
-	/* only show menu if it will be relevant */
-	if (gpd == NULL) return;
-	
-	mode= pupmenu("Grease Pencil Erase...%t|Last Stroke%x1|Active Frame%x2|Active Layer%x3");
-	if (mode <= 0) return;
-	
-	gpencil_delete_operation(cfra, mode);
-}
-
-/* --------- Data Conversion ---------- */
-
-/* convert the coordinates from the given stroke point into 3d-coordinates */
-static void gp_strokepoint_convertcoords (bGPDstroke *gps, bGPDspoint *pt, float p3d[3])
-{
-	ARegion *ar= NULL; // XXX
-	
-	if (gps->flag & GP_STROKE_3DSPACE) {
-		/* directly use 3d-coordinates */
-		VecCopyf(p3d, &pt->x);
-	}
-	else {
-		short mval[2];
-		int mx=0, my=0;
-		float *fp= give_cursor(NULL, NULL); // XXX should be scene, v3d
-		float dvec[3];
-		
-		/* get screen coordinate */
-		if (gps->flag & GP_STROKE_2DSPACE) {
-			// XXX
-			// View2D *v2d= spacelink_get_view2d(curarea->spacedata.first);
-			// UI_view2d_view_to_region(v2d, pt->x, pt->y, &mx, &my);
-		}
-		else {
-			// XXX
-			// mx= (short)(pt->x / 1000 * curarea->winx);
-			// my= (short)(pt->y / 1000 * curarea->winy);
-		}
-		
-		/* convert screen coordinate to 3d coordinates 
-		 *	- method taken from editview.c - mouse_cursor() 
-		 */
-		project_short_noclip(ar, fp, mval);
-		window_to_3d_delta(ar, dvec, mval[0]-mx, mval[1]-my);
-		VecSubf(p3d, fp, dvec);
-	}
-}
-
-/* --- */
-
-/* convert stroke to 3d path */
-static void gp_stroke_to_path (bGPDlayer *gpl, bGPDstroke *gps, Curve *cu)
-{
-	bGPDspoint *pt;
-	Nurb *nu;
-	BPoint *bp;
-	int i;
-	
-	/* create new 'nurb' within the curve */
-	nu = (Nurb *)MEM_callocN(sizeof(Nurb), "gpstroke_to_path(nurb)");
-	
-	nu->pntsu= gps->totpoints;
-	nu->pntsv= 1;
-	nu->orderu= gps->totpoints;
-	nu->flagu= 2;	/* endpoint */
-	nu->resolu= 32;
-	
-	nu->bp= (BPoint *)MEM_callocN(sizeof(BPoint)*gps->totpoints, "bpoints");
-	
-	/* add points */
-	for (i=0, pt=gps->points, bp=nu->bp; i < gps->totpoints; i++, pt++, bp++) {
-		float p3d[3];
-		
-		/* get coordinates to add at */
-		gp_strokepoint_convertcoords(gps, pt, p3d);
-		VecCopyf(bp->vec, p3d);
-		
-		/* set settings */
-		bp->f1= SELECT;
-		bp->radius = bp->weight = pt->pressure * gpl->thickness;
-	}
-	
-	/* add nurb to curve */
-	BLI_addtail(&cu->nurb, nu);
-}
-
-/* convert stroke to 3d bezier */
-static void gp_stroke_to_bezier (bGPDlayer *gpl, bGPDstroke *gps, Curve *cu)
-{
-	bGPDspoint *pt;
-	Nurb *nu;
-	BezTriple *bezt;
-	int i;
-	
-	/* create new 'nurb' within the curve */
-	nu = (Nurb *)MEM_callocN(sizeof(Nurb), "gpstroke_to_bezier(nurb)");
-	
-	nu->pntsu= gps->totpoints;
-	nu->resolu= 12;
-	nu->resolv= 12;
-	nu->type= CU_BEZIER;
-	nu->bezt = (BezTriple *)MEM_callocN(gps->totpoints*sizeof(BezTriple), "bezts");
-	
-	/* add points */
-	for (i=0, pt=gps->points, bezt=nu->bezt; i < gps->totpoints; i++, pt++, bezt++) {
-		float p3d[3];
-		
-		/* get coordinates to add at */
-		gp_strokepoint_convertcoords(gps, pt, p3d);
-		
-		/* TODO: maybe in future the handles shouldn't be in same place */
-		VecCopyf(bezt->vec[0], p3d);
-		VecCopyf(bezt->vec[1], p3d);
-		VecCopyf(bezt->vec[2], p3d);
-		
-		/* set settings */
-		bezt->h1= bezt->h2= HD_FREE;
-		bezt->f1= bezt->f2= bezt->f3= SELECT;
-		bezt->radius = bezt->weight = pt->pressure * gpl->thickness * 0.1f;
-	}
-	
-	/* must calculate handles or else we crash */
-	calchandlesNurb(nu);
-	
-	/* add nurb to curve */
-	BLI_addtail(&cu->nurb, nu);
-}
-
-/* convert a given grease-pencil layer to a 3d-curve representation (using current view if appropriate) */
-static void gp_layer_to_curve (bGPdata *gpd, bGPDlayer *gpl, Scene *scene, short mode)
-{
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, scene->r.cfra, 0);
-	bGPDstroke *gps;
-	Object *ob;
-	Curve *cu;
-	
-	/* error checking */
-	if (ELEM3(NULL, gpd, gpl, gpf))
-		return;
-		
-	/* only convert if there are any strokes on this layer's frame to convert */
-	if (gpf->strokes.first == NULL)
-		return;
-	
-	/* init the curve object (remove rotation and get curve data from it)
-	 *	- must clear transforms set on object, as those skew our results
+	/* if there's an active area, check if the particular editor may
+	 * have defined any special Grease Pencil context for editing...
 	 */
-	add_object_draw(OB_CURVE);
-	ob= OBACT;
-	ob->loc[0]= ob->loc[1]= ob->loc[2]= 0;
-	ob->rot[0]= ob->rot[1]= ob->rot[2]= 0;
-	cu= ob->data;
-	cu->flag |= CU_3D;
-	
-	/* rename object and curve to layer name */
-	rename_id((ID *)ob, gpl->info);
-	rename_id((ID *)cu, gpl->info);
-	
-	/* add points to curve */
-	for (gps= gpf->strokes.first; gps; gps= gps->next) {
-		switch (mode) {
-			case 1: 
-				gp_stroke_to_path(gpl, gps, cu);
-				break;
-			case 2:
-				gp_stroke_to_bezier(gpl, gps, cu);
-				break;
-		}
-	}
-}
-
-/* --- */
-
-/* convert a stroke to a bone chain */
-static void gp_stroke_to_bonechain (bGPDlayer *gpl, bGPDstroke *gps, bArmature *arm, ListBase *bones)
-{
-	EditBone *ebo, *prev=NULL;
-	bGPDspoint *pt, *ptn;
-	int i;
-	
-	/* add each segment separately */
-	for (i=0, pt=gps->points, ptn=gps->points+1; i < (gps->totpoints-1); prev=ebo, i++, pt++, ptn++) {
-		float p3da[3], p3db[3];
-		
-		/* get coordinates to add at */
-		gp_strokepoint_convertcoords(gps, pt, p3da);
-		gp_strokepoint_convertcoords(gps, ptn, p3db);
-		
-		/* allocate new bone */
-		ebo= MEM_callocN(sizeof(EditBone), "eBone");
-		
-		VecCopyf(ebo->head, p3da);
-		VecCopyf(ebo->tail, p3db);
-		
-		/* add new bone - note: sync with editarmature.c::add_editbone() */
-		{
-			BLI_strncpy(ebo->name, "Stroke", 32);
-			unique_editbone_name(bones, ebo->name, NULL);
-			
-			BLI_addtail(bones, ebo);
-			
-			if (i > 0)
+	if (sa) {
+		switch (sa->spacetype) {
+			case SPACE_VIEW3D: /* 3D-View */
 			{
-				ebo->flag |= BONE_CONNECTED;
-			}
-			ebo->weight= 1.0f;
-			ebo->dist= 0.25f;
-			ebo->xwidth= 0.1f;
-			ebo->zwidth= 0.1f;
-			ebo->ease1= 1.0f;
-			ebo->ease2= 1.0f;
-			ebo->rad_head= pt->pressure * gpl->thickness * 0.1f;
-			ebo->rad_tail= ptn->pressure * gpl->thickness * 0.1f;
-			ebo->segments= 1;
-			ebo->layer= arm->layer;
-		}
-		
-		/* set parenting */
-		ebo->parent= prev;
-	}
-}
-
-/* convert a given grease-pencil layer to a 3d-curve representation (using current view if appropriate) */
-// XXX depreceated... we now have etch-a-ton for this...
-static void gp_layer_to_armature (bGPdata *gpd, bGPDlayer *gpl, Scene *scene, View3D *v3d, short mode)
-{
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, scene->r.cfra, 0);
-	bGPDstroke *gps;
-	Object *ob;
-	bArmature *arm;
-	
-	/* error checking */
-	if (ELEM3(NULL, gpd, gpl, gpf))
-		return;
-		
-	/* only convert if there are any strokes on this layer's frame to convert */
-	if (gpf->strokes.first == NULL)
-		return;
-	
-	/* init the armature object (remove rotation and assign armature data to it) 
-	 *	- must clear transforms set on object, as those skew our results
-	 */
-	add_object_draw(OB_ARMATURE);
-	ob= OBACT;
-	ob->loc[0]= ob->loc[1]= ob->loc[2]= 0;
-	ob->rot[0]= ob->rot[1]= ob->rot[2]= 0;
-	arm= ob->data;
-	
-	/* rename object and armature to layer name */
-	rename_id((ID *)ob, gpl->info);
-	rename_id((ID *)arm, gpl->info);
-	
-	/* this is editmode armature */
-	arm->edbo= MEM_callocN(sizeof(ListBase), "arm edbo");
-	
-	/* convert segments to bones, strokes to bone chains */
-	for (gps= gpf->strokes.first; gps; gps= gps->next) {
-		gp_stroke_to_bonechain(gpl, gps, arm, arm->edbo);
-	}
-	
-	/* adjust roll of bones
-	 * 	- set object as EditMode object, but need to clear afterwards!
-	 *	- use 'align to world z-up' option
-	 */
-	{
-		/* set our data as if we're in editmode to fool auto_align_armature() */
-		scene->obedit= ob;
-		
-		/* WARNING: need to make sure this magic number doesn't change */
-		auto_align_armature(scene, v3d, 2);	
-		
-		scene->obedit= NULL;
-	}
-	
-	/* flush editbones to armature */
-	ED_armature_from_edit(scene, ob);
-	ED_armature_edit_free(ob);
-}
-
-/* --- */
-
-/* convert grease-pencil strokes to another representation 
- *	mode: 	1 - Active layer to path
- *			2 - Active layer to bezier
- *			3 - Active layer to armature
- */
-void gpencil_convert_operation (short mode)
-{
-	Scene *scene= NULL; // XXX
-	View3D *v3d= NULL; // XXX
-	RegionView3D *rv3d= NULL; // XXX
-	bGPdata *gpd;	
-	float *fp= give_cursor(scene, v3d);
-	
-	/* get datablock to work on */
-	gpd= gpencil_data_getactive(NULL);
-	if (gpd == NULL) return;
-	
-	/* initialise 3d-cursor correction globals */
-	initgrabz(rv3d, fp[0], fp[1], fp[2]);
-	
-	/* handle selection modes */
-	switch (mode) {
-		case 1: /* active layer only (to path) */
-		case 2: /* active layer only (to bezier) */
-		{
-			bGPDlayer *gpl= gpencil_layer_getactive(gpd);
-			gp_layer_to_curve(gpd, gpl, scene, mode);
-		}
-			break;
-		case 3: /* active layer only (to armature) */
-		{
-			bGPDlayer *gpl= gpencil_layer_getactive(gpd);
-			gp_layer_to_armature(gpd, gpl, scene, v3d, mode);
-		}
-			break;
-	}
-	
-	/* redraw and undo-push */
-	BIF_undo_push("GPencil Convert");
-}
-
-/* ************************************************** */
-/* GREASE-PENCIL EDITING MODE - Painting */
-
-/* ---------- 'Globals' and Defines ----------------- */
-
-/* maximum sizes of gp-session buffer */
-#define GP_STROKE_BUFFER_MAX	5000
-
-/* Macros for accessing sensitivity thresholds... */
-	/* minimum number of pixels mouse should move before new point created */
-#define MIN_MANHATTEN_PX	(U.gp_manhattendist)
-	/* minimum length of new segment before new point can be added */
-#define MIN_EUCLIDEAN_PX	(U.gp_euclideandist)
-
-/* macro to test if only converting endpoints - only for use when converting!  */	
-#define GP_BUFFER2STROKE_ENDPOINTS ((gpd->flag & GP_DATA_EDITPAINT) && (ctrl))
-	
-/* ------ */
-
-/* Temporary 'Stroke' Operation data */
-typedef struct tGPsdata {
-	Scene *scene;       /* current scene from context */
-	ScrArea *sa;		/* area where painting originated */
-	ARegion *ar;        /* region where painting originated */
-	View2D *v2d;		/* needed for GP_STROKE_2DSPACE */
-	
-	ImBuf *ibuf;		/* needed for GP_STROKE_2DIMAGE */
-	struct IBufViewSettings {
-		int offsx, offsy;			/* offsets */
-		int sizex, sizey;			/* dimensions to use as scale-factor */
-	} im2d_settings;	/* needed for GP_STROKE_2DIMAGE */
-	
-	bGPdata *gpd;		/* gp-datablock layer comes from */
-	bGPDlayer *gpl;		/* layer we're working on */
-	bGPDframe *gpf;		/* frame we're working on */
-	
-	short status;		/* current status of painting */
-	short paintmode;	/* mode for painting */
-	
-	short mval[2];		/* current mouse-position */
-	short mvalo[2];		/* previous recorded mouse-position */
-	
-	float pressure;		/* current stylus pressure */
-	float opressure;	/* previous stylus pressure */
-	
-	short radius;		/* radius of influence for eraser */
-} tGPsdata;
-
-/* values for tGPsdata->status */
-enum {
-	GP_STATUS_NORMAL = 0,	/* running normally */
-	GP_STATUS_ERROR,		/* something wasn't correctly set up */
-	GP_STATUS_DONE			/* painting done */
-};
-
-/* values for tGPsdata->paintmode */
-enum {
-	GP_PAINTMODE_DRAW = 0,
-	GP_PAINTMODE_ERASER
-};
-
-/* Return flags for adding points to stroke buffer */
-enum {
-	GP_STROKEADD_INVALID	= -2,		/* error occurred - insufficient info to do so */
-	GP_STROKEADD_OVERFLOW	= -1,		/* error occurred - cannot fit any more points */
-	GP_STROKEADD_NORMAL,				/* point was successfully added */
-	GP_STROKEADD_FULL					/* cannot add any more points to buffer */
-};
-
-/* ---------- Stroke Editing ------------ */
-
-/* clear the session buffers (call this before AND after a paint operation) */
-static void gp_session_validatebuffer (tGPsdata *p)
-{
-	bGPdata *gpd= p->gpd;
-	
-	/* clear memory of buffer (or allocate it if starting a new session) */
-	if (gpd->sbuffer)
-		memset(gpd->sbuffer, 0, sizeof(tGPspoint)*GP_STROKE_BUFFER_MAX);
-	else
-		gpd->sbuffer= MEM_callocN(sizeof(tGPspoint)*GP_STROKE_BUFFER_MAX, "gp_session_strokebuffer");
-	
-	/* reset indices */
-	gpd->sbuffer_size = 0;
-	
-	/* reset flags */
-	gpd->sbuffer_sflag= 0;
-}
-
-/* check if the current mouse position is suitable for adding a new point */
-static short gp_stroke_filtermval (tGPsdata *p, short mval[2], short pmval[2])
-{
-	short dx= abs(mval[0] - pmval[0]);
-	short dy= abs(mval[1] - pmval[1]);
-	
-	/* check if mouse moved at least certain distance on both axes (best case) */
-	if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX))
-		return 1;
-	
-	/* check if the distance since the last point is significant enough */
-	// future optimisation: sqrt here may be too slow?
-	else if (sqrt(dx*dx + dy*dy) > MIN_EUCLIDEAN_PX)
-		return 1;
-	
-	/* mouse 'didn't move' */
-	else
-		return 0;
-}
-
-/* convert screen-coordinates to buffer-coordinates */
-static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
-{
-	bGPdata *gpd= p->gpd;
-	
-	/* in 3d-space - pt->x/y/z are 3 side-by-side floats */
-	if (gpd->sbuffer_sflag & GP_STROKE_3DSPACE) {
-		const short mx=mval[0], my=mval[1];
-		float *fp= give_cursor(p->scene, NULL); // XXX NULL could be v3d
-		float dvec[3];
-		
-		/* Current method just converts each point in screen-coordinates to 
-		 * 3D-coordinates using the 3D-cursor as reference. In general, this 
-		 * works OK, but it could of course be improved.
-		 *
-		 * TODO:
-		 *	- investigate using nearest point(s) on a previous stroke as
-		 *	  reference point instead or as offset, for easier stroke matching
-		 *	- investigate projection onto geometry (ala retopo)
-		 */
-		
-		/* method taken from editview.c - mouse_cursor() */
-		project_short_noclip(p->ar, fp, mval);
-		window_to_3d_delta(p->ar, dvec, mval[0]-mx, mval[1]-my);
-		VecSubf(out, fp, dvec);
-	}
-	
-	/* 2d - on 'canvas' (assume that p->v2d is set) */
-	else if ((gpd->sbuffer_sflag & GP_STROKE_2DSPACE) && (p->v2d)) {
-		float x, y;
-		
-		UI_view2d_region_to_view(p->v2d, mval[0], mval[1], &x, &y);
-		
-		out[0]= x;
-		out[1]= y;
-	}
-	
-	/* 2d - on image 'canvas' (assume that p->v2d is set) */
-	else if (gpd->sbuffer_sflag & GP_STROKE_2DIMAGE) {
-		int sizex, sizey, offsx, offsy;
-		
-		/* get stored settings 
-		 *	- assume that these have been set already (there are checks that set sane 'defaults' just in case)
-		 */
-		sizex= p->im2d_settings.sizex;
-		sizey= p->im2d_settings.sizey;
-		offsx= p->im2d_settings.offsx;
-		offsy= p->im2d_settings.offsy;
-		
-		/* calculate new points */
-		out[0]= (float)(mval[0] - offsx) / (float)sizex;
-		out[1]= (float)(mval[1] - offsy) / (float)sizey;
-	}
-	
-	/* 2d - relative to screen (viewport area) */
-	else {
-		out[0] = (float)(mval[0]) / (float)(p->sa->winx) * 1000;
-		out[1] = (float)(mval[1]) / (float)(p->sa->winy) * 1000;
-	}
-}
-
-/* add current stroke-point to buffer (returns whether point was successfully added) */
-static short gp_stroke_addpoint (tGPsdata *p, short mval[2], float pressure)
-{
-	bGPdata *gpd= p->gpd;
-	tGPspoint *pt;
-	
-	/* check if still room in buffer */
-	if (gpd->sbuffer_size >= GP_STROKE_BUFFER_MAX)
-		return GP_STROKEADD_OVERFLOW;
-	
-	/* get pointer to destination point */
-	pt= ((tGPspoint *)(gpd->sbuffer) + gpd->sbuffer_size);
-	
-	/* store settings */
-	pt->x= mval[0];
-	pt->y= mval[1];
-	pt->pressure= pressure;
-	
-	/* increment counters */
-	gpd->sbuffer_size++;
-	
-	/* check if another operation can still occur */
-	if (gpd->sbuffer_size == GP_STROKE_BUFFER_MAX)
-		return GP_STROKEADD_FULL;
-	else
-		return GP_STROKEADD_NORMAL;
-}
-
-/* smooth a stroke (in buffer) before storing it */
-static void gp_stroke_smooth (tGPsdata *p)
-{
-	bGPdata *gpd= p->gpd;
-	int i=0, cmx=gpd->sbuffer_size;
-	int ctrl= 0; // XXX
-	
-	/* only smooth if smoothing is enabled, and we're not doing a straight line */
-	if (!(U.gp_settings & GP_PAINT_DOSMOOTH) || GP_BUFFER2STROKE_ENDPOINTS)
-		return;
-	
-	/* don't try if less than 2 points in buffer */
-	if ((cmx <= 2) || (gpd->sbuffer == NULL))
-		return;
-	
-	/* apply weighting-average (note doing this along path sequentially does introduce slight error) */
-	for (i=0; i < gpd->sbuffer_size; i++) {
-		tGPspoint *pc= (((tGPspoint *)gpd->sbuffer) + i);
-		tGPspoint *pb= (i-1 > 0)?(pc-1):(pc);
-		tGPspoint *pa= (i-2 > 0)?(pc-2):(pb);
-		tGPspoint *pd= (i+1 < cmx)?(pc+1):(pc);
-		tGPspoint *pe= (i+2 < cmx)?(pc+2):(pd);
-		
-		pc->x= (short)(0.1*pa->x + 0.2*pb->x + 0.4*pc->x + 0.2*pd->x + 0.1*pe->x);
-		pc->y= (short)(0.1*pa->y + 0.2*pb->y + 0.4*pc->y + 0.2*pd->y + 0.1*pe->y);
-	}
-}
-
-/* simplify a stroke (in buffer) before storing it 
- *	- applies a reverse Chaikin filter
- *	- code adapted from etch-a-ton branch (editarmature_sketch.c)
- */
-static void gp_stroke_simplify (tGPsdata *p)
-{
-	bGPdata *gpd= p->gpd;
-	tGPspoint *old_points= (tGPspoint *)gpd->sbuffer;
-	short num_points= gpd->sbuffer_size;
-	short flag= gpd->sbuffer_sflag;
-	short i, j;
-	int ctrl= 0; // XXX
-	
-	/* only simplify if simlification is enabled, and we're not doing a straight line */
-	if (!(U.gp_settings & GP_PAINT_DOSIMPLIFY) || GP_BUFFER2STROKE_ENDPOINTS)
-		return;
-	
-	/* don't simplify if less than 4 points in buffer */
-	if ((num_points <= 2) || (old_points == NULL))
-		return;
-		
-	/* clear buffer (but don't free mem yet) so that we can write to it 
-	 *	- firstly set sbuffer to NULL, so a new one is allocated
-	 *	- secondly, reset flag after, as it gets cleared auto
-	 */
-	gpd->sbuffer= NULL;
-	gp_session_validatebuffer(p);
-	gpd->sbuffer_sflag = flag;
-	
-/* macro used in loop to get position of new point
- *	- used due to the mixture of datatypes in use here
- */
-#define GP_SIMPLIFY_AVPOINT(offs, sfac) \
-	{ \
-		co[0] += (float)(old_points[offs].x * sfac); \
-		co[1] += (float)(old_points[offs].y * sfac); \
-		pressure += old_points[offs].pressure * sfac; \
-	}
-	
-	for (i = 0, j = 0; i < num_points; i++)
-	{
-		if (i - j == 3)
-		{
-			float co[2], pressure;
-			short mco[2];
-			
-			/* initialise values */
-			co[0]= 0;
-			co[1]= 0;
-			pressure = 0;
-			
-			/* using macro, calculate new point */
-			GP_SIMPLIFY_AVPOINT(j, -0.25f);
-			GP_SIMPLIFY_AVPOINT(j+1, 0.75f);
-			GP_SIMPLIFY_AVPOINT(j+2, 0.75f);
-			GP_SIMPLIFY_AVPOINT(j+3, -0.25f);
-			
-			/* set values for adding */
-			mco[0]= (short)co[0];
-			mco[1]= (short)co[1];
-			
-			/* ignore return values on this... assume to be ok for now */
-			gp_stroke_addpoint(p, mco, pressure);
-			
-			j += 2;
-		}
-	} 
-	
-	/* free old buffer */
-	MEM_freeN(old_points);
-}
-
-
-/* make a new stroke from the buffer data */
-static void gp_stroke_newfrombuffer (tGPsdata *p)
-{
-	bGPdata *gpd= p->gpd;
-	bGPDstroke *gps;
-	bGPDspoint *pt;
-	tGPspoint *ptc;
-	int i, totelem;
-	int ctrl= 0; // XXX
-	
-	/* get total number of points to allocate space for:
-	 *	- in 'Draw Mode', holding the Ctrl-Modifier will only take endpoints
-	 *	- otherwise, do whole stroke
-	 */
-	if (GP_BUFFER2STROKE_ENDPOINTS)
-		totelem = (gpd->sbuffer_size >= 2) ? 2: gpd->sbuffer_size;
-	else
-		totelem = gpd->sbuffer_size;
-	
-	/* exit with error if no valid points from this stroke */
-	if (totelem == 0) {
-		if (G.f & G_DEBUG) 
-			printf("Error: No valid points in stroke buffer to convert (tot=%d) \n", gpd->sbuffer_size);
-		return;
-	}
-	
-	/* allocate memory for a new stroke */
-	gps= MEM_callocN(sizeof(bGPDstroke), "gp_stroke");
-	
-	/* allocate enough memory for a continuous array for storage points */
-	pt= gps->points= MEM_callocN(sizeof(bGPDspoint)*totelem, "gp_stroke_points");
-	
-	/* copy appropriate settings for stroke */
-	gps->totpoints= totelem;
-	gps->thickness= p->gpl->thickness;
-	gps->flag= gpd->sbuffer_sflag;
-	
-	/* copy points from the buffer to the stroke */
-	if (GP_BUFFER2STROKE_ENDPOINTS) {
-		/* 'Draw Mode' + Ctrl-Modifier - only endpoints */
-		{
-			/* first point */
-			ptc= gpd->sbuffer;
-			
-			/* convert screen-coordinates to appropriate coordinates (and store them) */
-			gp_stroke_convertcoords(p, &ptc->x, &pt->x);
-			
-			/* copy pressure */
-			pt->pressure= ptc->pressure;
-			
-			pt++;
-		}
-			
-		if (totelem == 2) {
-			/* last point if applicable */
-			ptc= ((tGPspoint *)gpd->sbuffer) + (gpd->sbuffer_size - 1);
-			
-			/* convert screen-coordinates to appropriate coordinates (and store them) */
-			gp_stroke_convertcoords(p, &ptc->x, &pt->x);
-			
-			/* copy pressure */
-			pt->pressure= ptc->pressure;
-		}
-	}
-	else {
-		/* convert all points (normal behaviour) */
-		for (i=0, ptc=gpd->sbuffer; i < gpd->sbuffer_size && ptc; i++, ptc++) {
-			/* convert screen-coordinates to appropriate coordinates (and store them) */
-			gp_stroke_convertcoords(p, &ptc->x, &pt->x);
-			
-			/* copy pressure */
-			pt->pressure= ptc->pressure;
-			
-			pt++;
-		}
-	}
-	
-	/* add stroke to frame */
-	BLI_addtail(&p->gpf->strokes, gps);
-}
-
-/* --- 'Eraser' for 'Paint' Tool ------ */
-
-/* eraser tool - remove segment from stroke/split stroke (after lasso inside) */
-static short gp_stroke_eraser_splitdel (bGPDframe *gpf, bGPDstroke *gps, int i)
-{
-	bGPDspoint *pt_tmp= gps->points;
-	bGPDstroke *gsn = NULL;
-
-	/* if stroke only had two points, get rid of stroke */
-	if (gps->totpoints == 2) {
-		/* free stroke points, then stroke */
-		MEM_freeN(pt_tmp);
-		BLI_freelinkN(&gpf->strokes, gps);
-		
-		/* nothing left in stroke, so stop */
-		return 1;
-	}
-
-	/* if last segment, just remove segment from the stroke */
-	else if (i == gps->totpoints - 2) {
-		/* allocate new points array, and assign most of the old stroke there */
-		gps->totpoints--;
-		gps->points= MEM_callocN(sizeof(bGPDspoint)*gps->totpoints, "gp_stroke_points");
-		memcpy(gps->points, pt_tmp, sizeof(bGPDspoint)*gps->totpoints);
-		
-		/* free temp buffer */
-		MEM_freeN(pt_tmp);
-		
-		/* nothing left in stroke, so stop */
-		return 1;
-	}
-
-	/* if first segment, just remove segment from the stroke */
-	else if (i == 0) {
-		/* allocate new points array, and assign most of the old stroke there */
-		gps->totpoints--;
-		gps->points= MEM_callocN(sizeof(bGPDspoint)*gps->totpoints, "gp_stroke_points");
-		memcpy(gps->points, pt_tmp + 1, sizeof(bGPDspoint)*gps->totpoints);
-		
-		/* free temp buffer */
-		MEM_freeN(pt_tmp);
-		
-		/* no break here, as there might still be stuff to remove in this stroke */
-		return 0;
-	}
-
-	/* segment occurs in 'middle' of stroke, so split */
-	else {
-		/* duplicate stroke, and assign 'later' data to that stroke */
-		gsn= MEM_dupallocN(gps);
-		gsn->prev= gsn->next= NULL;
-		BLI_insertlinkafter(&gpf->strokes, gps, gsn);
-		
-		gsn->totpoints= gps->totpoints - i;
-		gsn->points= MEM_callocN(sizeof(bGPDspoint)*gsn->totpoints, "gp_stroke_points");
-		memcpy(gsn->points, pt_tmp + i, sizeof(bGPDspoint)*gsn->totpoints);
-		
-		/* adjust existing stroke  */
-		gps->totpoints= i;
-		gps->points= MEM_callocN(sizeof(bGPDspoint)*gps->totpoints, "gp_stroke_points");
-		memcpy(gps->points, pt_tmp, sizeof(bGPDspoint)*i);
-		
-		/* free temp buffer */
-		MEM_freeN(pt_tmp);
-		
-		/* nothing left in stroke, so stop */
-		return 1;
-	}
-}
-
-/* eraser tool - check if part of stroke occurs within last segment drawn by eraser */
-static short gp_stroke_eraser_strokeinside (short mval[], short mvalo[], short rad, short x0, short y0, short x1, short y1)
-{
-	/* simple within-radius check for now */
-	if (edge_inside_circle(mval[0], mval[1], rad, x0, y0, x1, y1))
-		return 1;
-	
-	/* not inside */
-	return 0;
-} 
-
-/* eraser tool - evaluation per stroke */
-static void gp_stroke_eraser_dostroke (tGPsdata *p, short mval[], short mvalo[], short rad, rcti *rect, bGPDframe *gpf, bGPDstroke *gps)
-{
-	bGPDspoint *pt1, *pt2;
-	int x0=0, y0=0, x1=0, y1=0;
-	short xyval[2];
-	int i;
-	
-	if (gps->totpoints == 0) {
-		/* just free stroke */
-		if (gps->points) 
-			MEM_freeN(gps->points);
-		BLI_freelinkN(&gpf->strokes, gps);
-	}
-	else if (gps->totpoints == 1) {
-		/* get coordinates */
-		if (gps->flag & GP_STROKE_3DSPACE) {
-			project_short(p->ar, &gps->points->x, xyval);
-			x0= xyval[0];
-			y0= xyval[1];
-		}
-		else if (gps->flag & GP_STROKE_2DSPACE) {			
-			UI_view2d_view_to_region(p->v2d, gps->points->x, gps->points->y, &x0, &y0);
-		}
-		else if (gps->flag & GP_STROKE_2DIMAGE) {			
-			int offsx, offsy, sizex, sizey;
-			
-			/* get stored settings */
-			sizex= p->im2d_settings.sizex;
-			sizey= p->im2d_settings.sizey;
-			offsx= p->im2d_settings.offsx;
-			offsy= p->im2d_settings.offsy;
-			
-			/* calculate new points */
-			x0= (short)((gps->points->x * sizex) + offsx);
-			y0= (short)((gps->points->y * sizey) + offsy);
-		}
-		else {
-			x0= (short)(gps->points->x / 1000 * p->sa->winx);
-			y0= (short)(gps->points->y / 1000 * p->sa->winy);
-		}
-		
-		/* do boundbox check first */
-		if (BLI_in_rcti(rect, x0, y0)) {
-			/* only check if point is inside */
-			if ( ((x0-mval[0])*(x0-mval[0]) + (y0-mval[1])*(y0-mval[1])) <= rad*rad ) {
-				/* free stroke */
-				MEM_freeN(gps->points);
-				BLI_freelinkN(&gpf->strokes, gps);
-			}
-		}
-	}
-	else {	
-		/* loop over the points in the stroke, checking for intersections 
-		 * 	- an intersection will require the stroke to be split
-		 */
-		for (i=0; (i+1) < gps->totpoints; i++) {
-			/* get points to work with */
-			pt1= gps->points + i;
-			pt2= gps->points + i + 1;
-			
-			/* get coordinates */
-			if (gps->flag & GP_STROKE_3DSPACE) {
-				project_short(p->ar, &pt1->x, xyval);
-				x0= xyval[0];
-				y0= xyval[1];
+				Object *ob= CTX_data_active_object(C);
 				
-				project_short(p->ar, &pt2->x, xyval);
-				x1= xyval[0];
-				y1= xyval[1];
-			}
-			else if (gps->flag & GP_STROKE_2DSPACE) {
-				UI_view2d_view_to_region(p->v2d, pt1->x, pt1->y, &x0, &y0);
+				// TODO: we can include other data-types such as bones later if need be...
 				
-				UI_view2d_view_to_region(p->v2d, pt2->x, pt2->y, &x1, &y1);
-			}
-			else if (gps->flag & GP_STROKE_2DIMAGE) {
-				int offsx, offsy, sizex, sizey;
-				
-				/* get stored settings */
-				sizex= p->im2d_settings.sizex;
-				sizey= p->im2d_settings.sizey;
-				offsx= p->im2d_settings.offsx;
-				offsy= p->im2d_settings.offsy;
-				
-				/* calculate new points */
-				x0= (short)((pt1->x * sizex) + offsx);
-				y0= (short)((pt1->y * sizey) + offsy);
-				
-				x1= (short)((pt2->x * sizex) + offsx);
-				y1= (short)((pt2->y * sizey) + offsy);
-			}
-			else {
-				x0= (short)(pt1->x / 1000 * p->sa->winx);
-				y0= (short)(pt1->y / 1000 * p->sa->winy);
-				x1= (short)(pt2->x / 1000 * p->sa->winx);
-				y1= (short)(pt2->y / 1000 * p->sa->winy);
-			}
-			
-			/* check that point segment of the boundbox of the eraser stroke */
-			if (BLI_in_rcti(rect, x0, y0) || BLI_in_rcti(rect, x1, y1)) {
-				/* check if point segment of stroke had anything to do with
-				 * eraser region  (either within stroke painted, or on its lines)
-				 * 	- this assumes that linewidth is irrelevant
-				 */
-				if (gp_stroke_eraser_strokeinside(mval, mvalo, rad, x0, y0, x1, y1)) {
-					/* if function returns true, break this loop (as no more point to check) */
-					if (gp_stroke_eraser_splitdel(gpf, gps, i))
-						break;
+				/* just in case no active object */
+				if (ob) {
+					/* for now, as long as there's an object, default to using that in 3D-View */
+					if (ptr) RNA_id_pointer_create(&ob->id, ptr);
+					return &ob->gpd;
 				}
 			}
-		}
-	}
-}
-
-/* erase strokes which fall under the eraser strokes */
-static void gp_stroke_doeraser (tGPsdata *p)
-{
-	bGPDframe *gpf= p->gpf;
-	bGPDstroke *gps, *gpn;
-	rcti rect;
-	
-	/* rect is rectangle of eraser */
-	rect.xmin= p->mval[0] - p->radius;
-	rect.ymin= p->mval[1] - p->radius;
-	rect.xmax= p->mval[0] + p->radius;
-	rect.ymax= p->mval[1] + p->radius;
-	
-	/* loop over strokes, checking segments for intersections */
-	for (gps= gpf->strokes.first; gps; gps= gpn) {
-		gpn= gps->next;
-		gp_stroke_eraser_dostroke(p, p->mval, p->mvalo, p->radius, &rect, gpf, gps);
-	}
-}
-
-/* ---------- 'Paint' Tool ------------ */
-
-/* init new painting session */
-static void gp_session_initpaint (bContext *C, tGPsdata *p)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	ARegion *ar= CTX_wm_region(C);
-	
-	/* clear previous data (note: is on stack) */
-	memset(p, 0, sizeof(tGPsdata));
-	
-	/* make sure the active view (at the starting time) is a 3d-view */
-	if (curarea == NULL) {
-		p->status= GP_STATUS_ERROR;
-		if (G.f & G_DEBUG) 
-			printf("Error: No active view for painting \n");
-		return;
-	}
-	
-	/* pass on current scene */
-	p->scene= CTX_data_scene(C);
-	
-	switch (curarea->spacetype) {
-		/* supported views first */
-		case SPACE_VIEW3D:
-		{
-			View3D *v3d= curarea->spacedata.first;
+				break;
 			
-			/* set current area */
-			p->sa= curarea;
-			p->ar= ar;
-			
-			/* check that gpencil data is allowed to be drawn */
-			if ((v3d->flag2 & V3D_DISPGP)==0) {
-				p->status= GP_STATUS_ERROR;
-				if (G.f & G_DEBUG) 
-					printf("Error: In active view, Grease Pencil not shown \n");
-				return;
-			}
-		}
-			break;
-		case SPACE_NODE:
-		{
-			SpaceNode *snode= curarea->spacedata.first;
-			
-			/* set current area */
-			p->sa= curarea;
-			p->ar= ar;
-			p->v2d= &ar->v2d;
-			
-			/* check that gpencil data is allowed to be drawn */
-			if ((snode->flag & SNODE_DISPGP)==0) {
-				p->status= GP_STATUS_ERROR;
-				if (G.f & G_DEBUG) 
-					printf("Error: In active view, Grease Pencil not shown \n");
-				return;
-			}
-		}
-			break;
-		case SPACE_SEQ:
-		{
-			SpaceSeq *sseq= curarea->spacedata.first;
-			
-			/* set current area */
-			p->sa= curarea;
-			p->ar= ar;
-			p->v2d= &ar->v2d;
-			
-			/* check that gpencil data is allowed to be drawn */
-			if (sseq->mainb == SEQ_DRAW_SEQUENCE) {
-				p->status= GP_STATUS_ERROR;
-				if (G.f & G_DEBUG) 
-					printf("Error: In active view (sequencer), active mode doesn't support Grease Pencil \n");
-				return;
-			}
-			if ((sseq->flag & SEQ_DRAW_GPENCIL)==0) {
-				p->status= GP_STATUS_ERROR;
-				if (G.f & G_DEBUG) 
-					printf("Error: In active view, Grease Pencil not shown \n");
-				return;
-			}
-		}
-			break;	
-		case SPACE_IMAGE:
-		{
-			SpaceImage *sima= curarea->spacedata.first;
-			
-			/* set the current area */
-			p->sa= curarea;
-			p->ar= ar;
-			p->v2d= &ar->v2d;
-			p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
-			
-			/* check that gpencil data is allowed to be drawn */
-			if ((sima->flag & SI_DISPGP)==0) {
-				p->status= GP_STATUS_ERROR;
-				if (G.f & G_DEBUG)
-					printf("Error: In active view, Grease Pencil not shown \n");
-				return;
-			}
-		}
-			break;
-		/* unsupported views */
-		default:
-		{
-			p->status= GP_STATUS_ERROR;
-			if (G.f & G_DEBUG) 
-				printf("Error: Active view not appropriate for Grease Pencil drawing \n");
-			return;
-		}
-			break;
-	}
-	
-	/* get gp-data */
-	p->gpd= gpencil_data_getactive(p->sa);
-	if (p->gpd == NULL) {
-		short ok;
-		
-		p->gpd= gpencil_data_addnew("GPencil");
-		ok= gpencil_data_setactive(p->sa, p->gpd);
-		
-		/* most of the time, the following check isn't needed */
-		if (ok == 0) {
-			/* free gpencil data as it can't be used */
-			free_gpencil_data(p->gpd);
-			p->gpd= NULL;
-			p->status= GP_STATUS_ERROR;
-			if (G.f & G_DEBUG) 
-				printf("Error: Could not assign newly created Grease Pencil data to active area \n");
-			return;
-		}
-	}
-	
-	/* set edit flags */
-	G.f |= G_GREASEPENCIL;
-	
-	/* clear out buffer (stored in gp-data) in case something contaminated it */
-	gp_session_validatebuffer(p);
-	
-	/* set 'default' im2d_settings just in case something that uses this doesn't set it */
-	p->im2d_settings.sizex= 1;
-	p->im2d_settings.sizey= 1;
-}
-
-/* cleanup after a painting session */
-static void gp_session_cleanup (tGPsdata *p)
-{
-	bGPdata *gpd= p->gpd;
-	
-	/* error checking */
-	if (gpd == NULL)
-		return;
-	
-	/* free stroke buffer */
-	if (gpd->sbuffer) {
-		MEM_freeN(gpd->sbuffer);
-		gpd->sbuffer= NULL;
-	}
-	
-	/* clear flags */
-	gpd->sbuffer_size= 0;
-	gpd->sbuffer_sflag= 0;
-}
-
-/* init new stroke */
-static void gp_paint_initstroke (tGPsdata *p, short paintmode)
-{	
-	/* get active layer (or add a new one if non-existent) */
-	p->gpl= gpencil_layer_getactive(p->gpd);
-	if (p->gpl == NULL)
-		p->gpl= gpencil_layer_addnew(p->gpd);
-	if (p->gpl->flag & GP_LAYER_LOCKED) {
-		p->status= GP_STATUS_ERROR;
-		if (G.f & G_DEBUG)
-			printf("Error: Cannot paint on locked layer \n");
-		return;
-	}
-		
-	/* get active frame (add a new one if not matching frame) */
-	p->gpf= gpencil_layer_getframe(p->gpl, p->scene->r.cfra, 1);
-	if (p->gpf == NULL) {
-		p->status= GP_STATUS_ERROR;
-		if (G.f & G_DEBUG) 
-			printf("Error: No frame created (gpencil_paint_init) \n");
-		return;
-	}
-	else
-		p->gpf->flag |= GP_FRAME_PAINT;
-	
-	/* set 'eraser' for this stroke if using eraser */
-	p->paintmode= paintmode;
-	if (p->paintmode == GP_PAINTMODE_ERASER)
-		p->gpd->sbuffer_sflag |= GP_STROKE_ERASER;
-	
-	/* check if points will need to be made in view-aligned space */
-	if (p->gpd->flag & GP_DATA_VIEWALIGN) {
-		switch (p->sa->spacetype) {
-			case SPACE_VIEW3D:
+			case SPACE_NODE: /* Nodes Editor */
 			{
-				View3D *v3d= (View3D *)p->sa->spacedata.first;
-				RegionView3D *rv3d= NULL; // XXX
-				float *fp= give_cursor(p->scene, v3d);
+				//SpaceNode *snode= (SpaceNode *)CTX_wm_space_data(C);
 				
-				initgrabz(rv3d, fp[0], fp[1], fp[2]);
-				
-				p->gpd->sbuffer_sflag |= GP_STROKE_3DSPACE;
+				/* return the GP data for the active node block/node */
 			}
 				break;
-			case SPACE_NODE:
+				
+			case SPACE_SEQ: /* Sequencer */
 			{
-				p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
-			}
-				break;
-			case SPACE_SEQ:
-			{
-				SpaceSeq *sseq= (SpaceSeq *)p->sa->spacedata.first;
-				int rectx, recty;
-				float zoom, zoomx, zoomy;
+				//SpaceSeq *sseq= (SpaceSeq *)CTX_wm_space_data(C);
 				
-				/* set draw 2d-stroke flag */
-				p->gpd->sbuffer_sflag |= GP_STROKE_2DIMAGE;
-				
-				/* calculate zoom factor */
-				zoom= (float)(SEQ_ZOOM_FAC(sseq->zoom));
-				if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
-					zoomx = zoom * ((float)p->scene->r.xasp / (float)p->scene->r.yasp);
-					zoomy = zoom;
-				} 
-				else
-					zoomx = zoomy = zoom;
-				
-				/* calculate rect size to use to calculate the size of the drawing area
-				 *	- We use the size of the output image not the size of the ibuf being shown
-				 *	  as it is too messy getting the ibuf (and could be too slow). This should be
-				 *	  a reasonable for most cases anyway.
-				 */
-				rectx= (p->scene->r.size * p->scene->r.xsch) / 100;
-				recty= (p->scene->r.size * p->scene->r.ysch) / 100; 
-				
-				/* set offset and scale values for opertations to use */
-				p->im2d_settings.sizex= (int)(zoomx * rectx);
-				p->im2d_settings.sizey= (int)(zoomy * recty);
-				p->im2d_settings.offsx= (int)((p->sa->winx-p->im2d_settings.sizex)/2 + sseq->xof);
-				p->im2d_settings.offsy= (int)((p->sa->winy-p->im2d_settings.sizey)/2 + sseq->yof);
-			}
-				break;
-			case SPACE_IMAGE:
-			{
-				/* check if any ibuf available */
-				if (p->ibuf)
-					p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
+				/* return the GP data for the active strips/image/etc. */
 			}
 				break;
 		}
 	}
+	
+	/* just fall back on the scene's GP data */
+	if (ptr) RNA_id_pointer_create((ID *)scene, ptr);
+	return (scene) ? &scene->gpd : NULL;
 }
 
-/* finish off a stroke (clears buffer, but doesn't finish the paint operation) */
-static void gp_paint_strokeend (tGPsdata *p)
+/* Get the active Grease Pencil datablock */
+bGPdata *gpencil_data_get_active (bContext *C)
 {
-	/* check if doing eraser or not */
-	if ((p->gpd->sbuffer_sflag & GP_STROKE_ERASER) == 0) {
-		/* smooth stroke before transferring? */
-		gp_stroke_smooth(p);
-		
-		/* simplify stroke before transferring? */
-		gp_stroke_simplify(p);
-		
-		/* transfer stroke to frame */
-		gp_stroke_newfrombuffer(p);
-	}
-	
-	/* clean up buffer now */
-	gp_session_validatebuffer(p);
+	bGPdata **gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	return (gpd_ptr) ? *(gpd_ptr) : NULL;
 }
 
-/* finish off stroke painting operation */
-static void gp_paint_cleanup (tGPsdata *p)
-{
-	/* finish off a stroke */
-	gp_paint_strokeend(p);
-	
-	/* "unlock" frame */
-	p->gpf->flag &= ~GP_FRAME_PAINT;
-	
-	/* add undo-push so stroke can be undone */
-	/* FIXME: currently disabled, as it's impossible to get this working nice
-	 * as gpenci data is on currently screen-level (which isn't saved to undo files)
-	 */
-	//BIF_undo_push("GPencil Stroke");
-	
-	/* force redraw after drawing action */
-	// XXX force_draw_plus(SPACE_ACTION, 0);
-}
-
-/* -------- */
-
-/* main call to paint a new stroke */
-// XXX will become modal(), gets event, includes all info!
-short gpencil_paint (bContext *C, short paintmode)
-{
-	tGPsdata p;
-	short ok = GP_STROKEADD_NORMAL;
-	
-	/* init paint-data */
-	gp_session_initpaint(C, &p);
-	if (p.status == GP_STATUS_ERROR) {
-		gp_session_cleanup(&p);
-		return 0;
-	}
-	gp_paint_initstroke(&p, paintmode);
-	if (p.status == GP_STATUS_ERROR) {
-		gp_session_cleanup(&p);
-		return 0;
-	}
-	
-	/* set cursor to indicate drawing */
-	// XXX (cursor callbacks in regiontype) setcursor_space(p.sa->spacetype, CURSOR_VPAINT);
-	
-	/* init drawing-device settings */
-	// XXX getmouseco_areawin(p.mval);
-	// XXX p.pressure = get_pressure();
-	
-	p.mvalo[0]= p.mval[0];
-	p.mvalo[1]= p.mval[1];
-	p.opressure= p.pressure;
-	
-	/* radius for eraser circle is defined in userprefs now */
-	// TODO: make this more easily tweaked... 
-	p.radius= U.gp_eraser;
-	
-	/* start drawing eraser-circle (if applicable) */
-	//if (paintmode == GP_PAINTMODE_ERASER)
-	// XXX	draw_sel_circle(p.mval, NULL, p.radius, p.radius, 0); // draws frontbuffer, but sets backbuf again
-	
-	/* only allow painting of single 'dots' if: 
-	 *	- pressure is not excessive (as it can be on some windows tablets)
-	 *	- draw-mode for active datablock is turned on
-	 * 	- not erasing
-	 */
-	if (paintmode != GP_PAINTMODE_ERASER) {
-		if (!(p.pressure >= 0.99f) || (p.gpd->flag & GP_DATA_EDITPAINT)) { 
-			gp_stroke_addpoint(&p, p.mval, p.pressure);
-		}
-	}
-	
-	/* XXX paint loop */
-	if(0) {
-		/* get current user input */
-		// XXX getmouseco_areawin(p.mval);
-		// XXX p.pressure = get_pressure();
-		
-		/* only add current point to buffer if mouse moved (otherwise wait until it does) */
-		if (paintmode == GP_PAINTMODE_ERASER) {
-			/* do 'live' erasing now */
-			gp_stroke_doeraser(&p);
-			
-			// XXX draw_sel_circle(p.mval, p.mvalo, p.radius, p.radius, 0);
-			// XXX force_draw(0);
-			
-			p.mvalo[0]= p.mval[0];
-			p.mvalo[1]= p.mval[1];
-			p.opressure= p.pressure;
-		}
-		else if (gp_stroke_filtermval(&p, p.mval, p.mvalo)) {
-			/* try to add point */
-			ok= gp_stroke_addpoint(&p, p.mval, p.pressure);
-			
-			/* handle errors while adding point */
-			if ((ok == GP_STROKEADD_FULL) || (ok == GP_STROKEADD_OVERFLOW)) {
-				/* finish off old stroke */
-				gp_paint_strokeend(&p);
-				
-				/* start a new stroke, starting from previous point */
-				gp_stroke_addpoint(&p, p.mvalo, p.opressure);
-				ok= gp_stroke_addpoint(&p, p.mval, p.pressure);
-			}
-			else if (ok == GP_STROKEADD_INVALID) {
-				/* the painting operation cannot continue... */
-				error("Cannot paint stroke");
-				p.status = GP_STATUS_ERROR;
-				
-				if (G.f & G_DEBUG) 
-					printf("Error: Grease-Pencil Paint - Add Point Invalid \n");
-				// XXX break;
-			}
-			// XXX force_draw(0);
-			
-			p.mvalo[0]= p.mval[0];
-			p.mvalo[1]= p.mval[1];
-			p.opressure= p.pressure;
-		}
-		
-		/* do mouse checking at the end, so don't check twice, and potentially
-		 * miss a short tap 
-		 */
-	}
-	
-	/* clear edit flags */
-	G.f &= ~G_GREASEPENCIL;
-	
-	/* restore cursor to indicate end of drawing */
-	// XXX  (cursor callbacks in regiontype) setcursor_space(p.sa->spacetype, CURSOR_STD);
-	
-	/* check size of buffer before cleanup, to determine if anything happened here */
-	if (paintmode == GP_PAINTMODE_ERASER) {
-		ok= 1; /* assume that we did something... */
-		// XXX draw_sel_circle(NULL, p.mvalo, 0, p.radius, 0);
-	}
-	else
-		ok= p.gpd->sbuffer_size;
-	
-	/* cleanup */
-	gp_paint_cleanup(&p);
-	gp_session_cleanup(&p);
-	
-	/* done! return if a stroke was successfully added */
-	return ok;
-}
+/* ************************************************ */
+/* Panel Operators */
 
 
-/* All event (loops) handling checking if stroke drawing should be initiated
- * should call this function.
- */
-short gpencil_do_paint (bContext *C)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	bGPdata *gpd = gpencil_data_getactive(sa);
-	short retval= 0;
-	int alt= 0, shift= 0, mbut= 0; // XXX
-	
-	/* check if possible to do painting */
-	if (gpd == NULL) 
-		return 0;
-	
-	/* currently, we will only 'paint' if:
-	 * 	1. draw-mode on gpd is set (for accessibility reasons)
-	 *		a) single dots are only available by this method if a single click is made
-	 *		b) a straight line is drawn if ctrl-modifier is held (check is done when stroke is converted!)
-	 *	2. if shift-modifier is held + lmb -> 'quick paint'
-	 *
-	 *	OR
-	 * 
-	 * draw eraser stroke if:
-	 *	1. using the eraser on a tablet
-	 *	2. draw-mode on gpd is set (for accessiblity reasons)
-	 *		(eraser is mapped to right-mouse)
-	 *	3. Alt + 'select' mouse-button
-	 *		i.e.  if LMB = select: Alt-LMB
-	 *			  if RMB = select: Alt-RMB
-	 */
-	if (get_activedevice() == 2) {
-		/* eraser on a tablet - always try to erase strokes */
-		retval = gpencil_paint(C, GP_PAINTMODE_ERASER);
-	}
-	else if (gpd->flag & GP_DATA_EDITPAINT) {
-		/* try to paint/erase */
-		if (mbut == L_MOUSE)
-			retval = gpencil_paint(C, GP_PAINTMODE_DRAW);
-		else if (mbut == R_MOUSE)
-			retval = gpencil_paint(C, GP_PAINTMODE_ERASER);
-	}
-	else if (!(gpd->flag & GP_DATA_LMBPLOCK)) {
-		/* try to paint/erase as not locked */
-		if (shift && (mbut == L_MOUSE)) {
-			retval = gpencil_paint(C, GP_PAINTMODE_DRAW);
-		}
-		else if (alt) {
-			if ((U.flag & USER_LMOUSESELECT) && (mbut == L_MOUSE))
-				retval = gpencil_paint(C, GP_PAINTMODE_ERASER);
-			else if (!(U.flag & USER_LMOUSESELECT) && (mbut == R_MOUSE))
-				retval = gpencil_paint(C, GP_PAINTMODE_ERASER);
-		}
-	}
-	
-	/* return result of trying to paint */
-	return retval;
-}
 
-/* ************************************************** */
-#endif // XXX COMPILE GUARDS FOR OLD CODE
+/* ************************************************ */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 2f60efb2179..d6bdea2db55 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1,5 +1,28 @@
-/* Grease Pencil  - version 2
- * By Joshua Leung
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008, Blender Foundation, Joshua Leung
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
  */
 
 #include <stdio.h>
@@ -38,8 +61,8 @@
 #include "ED_view3d.h"
 
 #include "RNA_access.h"
-#include "RNA_define.h"
 
+#include "RNA_define.h"
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -48,65 +71,6 @@
 /* ******************************************* */
 /* Context Wrangling... */
 
-/* Get the active Grease Pencil datablock */
-// TODO: move this to a gpencil_utils.c? 
-bGPdata *gpencil_data_getactive (bContext *C)
-{
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	
-	/* if there's an active area, check if the particular editor may
-	 * have defined any special Grease Pencil context for editing...
-	 */
-	if (sa) {
-		switch (sa->spacetype) {
-			case SPACE_VIEW3D: /* 3D-View */
-			{
-				Object *ob= CTX_data_active_object(C);
-				
-				/* just in case... */
-				if (ob) {
-					/* depending on the mode of the object, we may be able to get some GP data 
-					 * from different elements - i.e. bones...
-					 */
-					if (ob->mode & OB_MODE_POSE) {
-						//bPoseChannel *pchan= CTX_data_active_pchan(C);
-						
-						/* if posechannel has GP data, use that... */
-						//if (pchan && pchan->gpd)
-						//	return pchan->gpd;
-					}
-					
-					/* still here, so check if active Object has GP data */
-					//if (ob->gpd)
-					//	return ob->gpd;
-				}
-			}
-				break;
-			
-			case SPACE_NODE: /* Nodes Editor */
-			{
-				//SpaceNode *snode= (SpaceNode *)CTX_wm_space_data(C);
-				
-				/* return the GP data for the active node block/node */
-			}
-				break;
-				
-			case SPACE_SEQ: /* Sequencer */
-			{
-				//SpaceSeq *sseq= (SpaceSeq *)CTX_wm_space_data(C);
-				
-				/* return the GP data for the active strips/image/etc. */
-			}
-				break;
-		}
-	}
-	
-	/* just fall back on the scene's GP data */
-	return (scene) ? scene->gpd : NULL;
-}
-
-
 /* check if context is suitable for drawing */
 static int gpencil_draw_poll (bContext *C)
 {
@@ -282,8 +246,8 @@ static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
 	
 	/* 2d - relative to screen (viewport area) */
 	else {
-		out[0] = (float)(mval[0]) / (float)(p->sa->winx) * 1000;
-		out[1] = (float)(mval[1]) / (float)(p->sa->winy) * 1000;
+		out[0] = (float)(mval[0]) / (float)(p->sa->winx) * 100;
+		out[1] = (float)(mval[1]) / (float)(p->sa->winy) * 100;
 	}
 }
 
@@ -616,8 +580,8 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, int mval[], int mvalo[], sho
 		}
 #endif
 		else {
-			x0= (int)(gps->points->x / 1000 * p->sa->winx);
-			y0= (int)(gps->points->y / 1000 * p->sa->winy);
+			x0= (int)(gps->points->x / 100 * p->sa->winx);
+			y0= (int)(gps->points->y / 100 * p->sa->winy);
 		}
 		
 		/* do boundbox check first */
@@ -673,10 +637,10 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, int mval[], int mvalo[], sho
 			}
 #endif
 			else {
-				x0= (int)(pt1->x / 1000 * p->sa->winx);
-				y0= (int)(pt1->y / 1000 * p->sa->winy);
-				x1= (int)(pt2->x / 1000 * p->sa->winx);
-				y1= (int)(pt2->y / 1000 * p->sa->winy);
+				x0= (int)(pt1->x / 100 * p->sa->winx);
+				y0= (int)(pt1->y / 100 * p->sa->winy);
+				x1= (int)(pt2->x / 100 * p->sa->winx);
+				y1= (int)(pt2->y / 100 * p->sa->winy);
 			}
 			
 			/* check that point segment of the boundbox of the eraser stroke */
@@ -740,6 +704,7 @@ static void gp_session_validatebuffer (tGPsdata *p)
 static tGPsdata *gp_session_initpaint (bContext *C)
 {
 	tGPsdata *p = NULL;
+	bGPdata **gpd_ptr = NULL;
 	ScrArea *curarea= CTX_wm_area(C);
 	ARegion *ar= CTX_wm_region(C);
 	
@@ -852,11 +817,18 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 	}
 	
 	/* get gp-data */
-	p->gpd= gpencil_data_getactive(C);
-	if (p->gpd == NULL) {
-		/* add new GPencil block for the active scene for now... */
-		p->gpd= gpencil_data_addnew("GPencil");
-		p->scene->gpd= p->gpd;
+	gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	if (gpd_ptr == NULL) {
+		p->status= GP_STATUS_ERROR;
+		if (G.f & G_DEBUG)
+			printf("Error: Current context doesn't allow for any Grease Pencil data \n");
+		return p;
+	}
+	else {
+		/* if no existing GPencil block exists, add one */
+		if (*gpd_ptr == NULL)
+			*gpd_ptr= gpencil_data_addnew("GPencil");
+		p->gpd= *gpd_ptr;
 	}
 	
 	/* set edit flags - so that buffer will get drawn */
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index c1e37ce2e81..25e622d8551 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -38,49 +38,35 @@ struct SpaceSeq;
 struct bGPdata;
 struct bGPDlayer;
 struct bGPDframe;
-struct bGPdata;
+struct PointerRNA;
+struct uiLayout;
 struct uiBlock;
 struct ImBuf;
 struct wmWindowManager;
 
 
-/* ------------- Grease-Pencil Helpers -------------- */
+/* ------------- Grease-Pencil Helpers ---------------- */
 
-/* Temporary 'Stroke Point' data */
+/* Temporary 'Stroke Point' data 
+ *
+ * Used as part of the 'stroke cache' used during drawing of new strokes
+ */
 typedef struct tGPspoint {
 	short x, y;				/* x and y coordinates of cursor (in relative to area) */
 	float pressure;			/* pressure of tablet at this point */
 } tGPspoint;
 
-/* ----------- Grease Pencil New Tools ------------- */
+/* ----------- Grease Pencil Tools/Context ------------- */
 
-struct bGPdata *gpencil_data_getactive(struct bContext *C);
+struct bGPdata **gpencil_data_get_pointers(struct bContext *C, struct PointerRNA *ptr);
+struct bGPdata *gpencil_data_get_active(struct bContext *C);
 
-/* ----------- Grease Pencil Operators ------------- */
+/* ----------- Grease Pencil Operators ----------------- */
 
 void gpencil_common_keymap(struct wmWindowManager *wm, ListBase *keymap);
 
 void ED_operatortypes_gpencil(void);
 
-/* ------------ Grease-Pencil Depreceated Stuff ------------------ */
-
-//struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
-short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd);
-struct ScrArea *gpencil_data_findowner(struct bGPdata *gpd);
-
-/* ------------ Grease-Pencil Editing API ------------------ */
-
-void gpencil_delete_actframe(struct bGPdata *gpd, int cfra);
-void gpencil_delete_laststroke(struct bGPdata *gpd, int cfra);
-
-void gpencil_delete_operation(int cfra, short mode);
-void gpencil_delete_menu(void);
-
-void gpencil_convert_operation(short mode);
-void gpencil_convert_menu(void);
-
-short gpencil_do_paint(struct bContext *C);
-
 /* ------------ Grease-Pencil Drawing API ------------------ */
 /* drawgpencil.c */
 
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 48947794620..5c5b7281f20 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4736,7 +4736,7 @@ void special_aftertrans_update(TransInfo *t)
 				 * 	- sync this with actdata_filter_gpencil() in editaction.c
 				 */
 				for (sa= sc->areabase.first; sa; sa= sa->next) {
-					bGPdata *gpd= gpencil_data_getactive(sa);
+					bGPdata *gpd= gpencil_data_get_active(sa);
 					
 					if (gpd)
 						posttrans_gpd_clean(gpd);
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 25fdf615adb..d1e70c16408 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -54,7 +54,10 @@ struct FluidsimSettings;
 struct ParticleSystem;
 struct DerivedMesh;
 struct SculptSession;
+struct bGPdata;
 
+
+/* Vertex Groups - Name Info */
 typedef struct bDeformGroup {
 	struct bDeformGroup *next, *prev;
 	char name[32];
@@ -110,6 +113,8 @@ typedef struct Object {
 	struct bPose *pose;	
 	void *data;
 	
+	struct bGPdata *gpd;	/* Grease Pencil data */
+	
 	ListBase constraintChannels; // XXX depreceated... old animation system
 	ListBase effect;
 	ListBase disp;
@@ -209,7 +214,7 @@ typedef struct Object {
 	short recalc;			/* dependency flag */
 	float anisotropicFriction[3];
 
-	ListBase constraints;
+	ListBase constraints;		/* object constraints */
 	ListBase nlastrips;			// XXX depreceated... old animation system
 	ListBase hooks;
 	ListBase particlesystem;	/* particle systems */
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index f0b055bd0e8..cae96b0af4b 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1464,6 +1464,13 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "X-Ray", "Makes the object draw in front of others.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 	
+	/* Grease Pencil */
+	prop= RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "gpd");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_struct_type(prop, "GreasePencil");
+	RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock");
+	
 	/* pose */
 	prop= RNA_def_property(srna, "pose_library", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "poselib");

From af85ee01f8b9facf76761e8c3c758ee1ccd18986 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Fri, 28 Aug 2009 13:42:58 +0000
Subject: [PATCH 310/577] Update MSVC project files.

---
 .../audaspace/make/msvc_9_0/audaspace.vcproj  | 28 ++++++++++++++++---
 projectfiles_vc9/blender/blender.vcproj       | 12 ++++----
 .../blender/blenkernel/BKE_blenkernel.vcproj  | 16 ++++-------
 .../blender/editors/ED_editors.vcproj         | 28 +++++++++++++++++++
 .../blender/imbuf/BL_imbuf.vcproj             | 12 ++++----
 .../blender/makesrna/RNA_makesrna.vcproj      |  4 +++
 .../blender/makesrna/RNA_rna.vcproj           |  4 +++
 .../gameengine/videotexture/TEX_Video.vcproj  |  4 +--
 8 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
index 4c0b26f1c4e..0d8ade43e07 100644
--- a/intern/audaspace/make/msvc_9_0/audaspace.vcproj
+++ b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -117,7 +117,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -192,7 +192,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -266,7 +266,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include"
+				AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -737,6 +737,26 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="sndfile"
+			>
+			<File
+				RelativePath="..\..\sndfile\AUD_SndFileFactory.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\sndfile\AUD_SndFileFactory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\sndfile\AUD_SndFileReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\sndfile\AUD_SndFileReader.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\AUD_C-API.h"
 			>
diff --git a/projectfiles_vc9/blender/blender.vcproj b/projectfiles_vc9/blender/blender.vcproj
index 7b71ee49870..56913cb8160 100644
--- a/projectfiles_vc9/blender/blender.vcproj
+++ b/projectfiles_vc9/blender/blender.vcproj
@@ -73,12 +73,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libsamplerate.lib SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+				AdditionalDependencies="libsamplerate.lib SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib libsndfile-1.lib"
 				ShowProgress="0"
 				OutputFile="..\..\..\install\msvc_9\blender.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_9\libs\intern;..\..\..\build\msvc_9\libs\extern;..\..\..\lib\windows\ffmpeg\lib;..\..\..\lib\windows\samplerate\lib"
+				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_9\libs\intern;..\..\..\build\msvc_9\libs\extern;..\..\..\lib\windows\ffmpeg\lib;..\..\..\lib\windows\samplerate\lib;..\..\..\lib\windows\sndfile\lib"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="msvcprt.lib;glut32.lib;libc.lib;libcd.lib;libcpd.lib;libcp.lib;libcmtd.lib;odbc32.lib;odbccp32.lib"
 				GenerateDebugInformation="true"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.lib ..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.exp ..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\python31.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\python31.zip ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\zlib.pyd ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\wrap_oal.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\OpenAL32.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9\.blender MKDIR ..\..\..\install\msvc_9\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\..\install\msvc_9\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9\.blender\scripts MKDIR ..\..\..\install\msvc_9\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\..\install\msvc_9\.blender\scripts /E&#x0D;&#x0A;ECHO Copying python ui scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\.blender\ui MKDIR ..\..\..\install\msvc_9\.blender\ui&#x0D;&#x0A;XCOPY /Y ..\..\release\ui ..\..\..\install\msvc_9\.blender\ui /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\..\install\msvc_9 /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.lib ..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.exp ..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\python31.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\python31.zip ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\zlib.pyd ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\wrap_oal.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\OpenAL32.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sndfile\lib\*.dll ..\..\..\install\msvc_9&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9\.blender MKDIR ..\..\..\install\msvc_9\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\..\install\msvc_9\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9\.blender\scripts MKDIR ..\..\..\install\msvc_9\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\..\install\msvc_9\.blender\scripts /E&#x0D;&#x0A;ECHO Copying python ui scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\.blender\ui MKDIR ..\..\..\install\msvc_9\.blender\ui&#x0D;&#x0A;XCOPY /Y ..\..\release\ui ..\..\..\install\msvc_9\.blender\ui /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\..\install\msvc_9 /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -168,12 +168,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;"
-				AdditionalDependencies="libsamplerate.lib SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib"
+				AdditionalDependencies="libsamplerate.lib SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib libsndfile-1.lib"
 				ShowProgress="0"
 				OutputFile="..\..\..\install\msvc_9d\blender.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\ffmpeg\lib;..\..\..\build\msvc_9\libs\intern\debug;..\..\..\build\msvc_9\libs\extern\debug;..\..\..\lib\windows\samplerate\lib"
+				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\ffmpeg\lib;..\..\..\build\msvc_9\libs\intern\debug;..\..\..\build\msvc_9\libs\extern\debug;..\..\..\lib\windows\samplerate\lib;..\..\..\lib\windows\sndfile\lib"
 				IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, odbc32.lib, odbccp32.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\..\build\msvc_9\libs\debug\blender.pdb"
@@ -201,7 +201,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.lib ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.exp ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.ilk ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\python31_d.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\python31.zip ..\..\..\install\msvc_9d\python31_d.zip&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\zlib.pyd ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\wrap_oal.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\OpenAL32.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender MKDIR ..\..\..\install\msvc_9d\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\..\install\msvc_9d\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\scripts MKDIR ..\..\..\install\msvc_9d\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\..\install\msvc_9d\.blender\scripts /E&#x0D;&#x0A;ECHO Copying python ui scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\ui MKDIR ..\..\..\install\msvc_9d\.blender\ui&#x0D;&#x0A;XCOPY /Y ..\..\release\ui ..\..\..\install\msvc_9d\.blender\ui /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\..\install\msvc_9d /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.lib ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.exp ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.ilk ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\python31_d.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\python31.zip ..\..\..\install\msvc_9d\python31_d.zip&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\zlib.pyd ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\wrap_oal.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\OpenAL32.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sndfile\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender MKDIR ..\..\..\install\msvc_9d\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\..\install\msvc_9d\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\scripts MKDIR ..\..\..\install\msvc_9d\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\..\install\msvc_9d\.blender\scripts /E&#x0D;&#x0A;ECHO Copying python ui scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\ui MKDIR ..\..\..\install\msvc_9d\.blender\ui&#x0D;&#x0A;XCOPY /Y ..\..\release\ui ..\..\..\install\msvc_9d\.blender\ui /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\..\install\msvc_9d /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
index 7f0867cc7b6..87f10346726 100644
--- a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_OPENEXR;WITH_DDS;WITH_BULLET;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;UNWRAPPER;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\editors\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu;..\..\..\intern\audaspace\intern;..\..\..\extern\lzo\minilzo;..\..\..\extern\lzma;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;UNWRAPPER;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -761,10 +761,6 @@
 				RelativePath="..\..\..\source\blender\blenkernel\intern\smoke.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenkernel\intern\smokehighres.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c"
 				>
diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj
index c70e66b6c2b..9f2fc769e49 100644
--- a/projectfiles_vc9/blender/editors/ED_editors.vcproj
+++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj
@@ -293,6 +293,10 @@
 				RelativePath="..\..\..\source\blender\editors\include\ED_sequencer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\include\ED_sound.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\include\ED_space_api.h"
 				>
@@ -1342,6 +1346,10 @@
 				RelativePath="..\..\..\source\blender\editors\gpencil\editaction_gpencil.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_buttons.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_edit.c"
 				>
@@ -1350,6 +1358,14 @@
 				RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_intern.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_ops.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_paint.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="curve"
@@ -1491,6 +1507,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="sound"
+			>
+			<File
+				RelativePath="..\..\..\source\blender\editors\sound\sound_intern.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\sound\sound_ops.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj b/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
index f9470dcebfe..0e25b26831b 100644
--- a/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
+++ b/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -192,7 +192,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -267,7 +267,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -342,7 +342,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -417,7 +417,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
index 2a18b2c6c90..9ed358efc0b 100644
--- a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
@@ -666,6 +666,10 @@
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_fluidsim.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesrna\intern\rna_gpencil.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_group.c"
 				>
diff --git a/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
index 1d7c3f38581..84359390f41 100644
--- a/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
@@ -230,6 +230,10 @@
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_fluidsim_gen.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesrna\intern\rna_gpencil_gen.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_group_gen.c"
 				>
diff --git a/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj b/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
index e2731cf94e9..94e09303a1b 100644
--- a/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
+++ b/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
 				StringPooling="false"
 				BasicRuntimeChecks="3"
@@ -113,7 +113,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python3.1;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
 				StringPooling="true"
 				RuntimeLibrary="0"

From 9ea58be54ef62f79017678c20e04590bb5cbdaa1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 28 Aug 2009 14:25:17 +0000
Subject: [PATCH 311/577] - povray and ply work now.   Again, please try not to
 break scripts - at least grep the release dir for the names you change.

- rna material property rename
  gloss_amount -> gloss_factor, since its from 0.0 to 1.0, prefix factor is used on other material settings.
  reflectivity -> reflect_factor
---
 release/io/engine_render_pov.py               | 17 +++++------------
 release/io/export_ply.py                      | 17 ++++++++---------
 release/ui/buttons_material.py                | 10 +++++-----
 release/ui/space_sequencer.py                 |  2 +-
 source/blender/makesrna/intern/rna_material.c |  6 +++---
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index f064add505b..c3165d22540 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -82,8 +82,8 @@ def write_pov(filename, scene=None, info_callback = None):
 		file.write('#declare %s = finish {\n' % name)
 		
 		if material:
-			file.write('\tdiffuse %.3g\n' % material.diffuse_reflection)
-			file.write('\tspecular %.3g\n' % material.specular_reflection)
+			file.write('\tdiffuse %.3g\n' % material.diffuse_intensity)
+			file.write('\tspecular %.3g\n' % material.specular_intensity)
 			
 			file.write('\tambient %.3g\n' % material.ambient)
 			#file.write('\tambient rgb <%.3g, %.3g, %.3g>\n' % tuple([c*material.ambient for c in world.ambient_color])) # povray blends the global value
@@ -101,10 +101,10 @@ def write_pov(filename, scene=None, info_callback = None):
 			
 			if material.raytrace_mirror.enabled:
 				raytrace_mirror= material.raytrace_mirror
-				if raytrace_mirror.reflect:
+				if raytrace_mirror.reflect_factor:
 					file.write('\treflection {\n')
 					file.write('\t\trgb <%.3g, %.3g, %.3g>' % tuple(material.mirror_color))
-					file.write('\t\tfresnel 1 falloff %.3g exponent %.3g metallic %.3g} ' % (raytrace_mirror.fresnel, raytrace_mirror.fresnel_fac, raytrace_mirror.reflect))
+					file.write('\t\tfresnel 1 falloff %.3g exponent %.3g metallic %.3g} ' % (raytrace_mirror.fresnel, raytrace_mirror.fresnel_factor, raytrace_mirror.reflect_factor))
 		
 		else:
 			file.write('\tdiffuse 0.8\n')
@@ -300,14 +300,7 @@ def write_pov(filename, scene=None, info_callback = None):
 			try:	vcol_layer = me.active_vertex_color.data
 			except:vcol_layer = None
 			
-			
-			def regular_face(f):
-				fv = f.verts
-				if fv[3]== 0:
-					return fv[0], fv[1], fv[2]
-				return fv[0], fv[1], fv[2], fv[3]
-			
-			faces_verts = [regular_face(f) for f in me.faces]
+			faces_verts = [f.verts for f in me.faces]
 			faces_normals = [tuple(f.normal) for f in me.faces]
 			verts_normals = [tuple(v.normal) for v in me.verts]
 			
diff --git a/release/io/export_ply.py b/release/io/export_ply.py
index 3668693db16..c293119d3c8 100644
--- a/release/io/export_ply.py
+++ b/release/io/export_ply.py
@@ -64,7 +64,7 @@ def write(filename, scene, ob, \
 		raise Exception("Error, Select 1 active object")
 		return
 	
-	file = open(filename, 'wb')
+	file = open(filename, 'w')
 	
 	
 	#EXPORT_EDGES = Draw.Create(0)
@@ -88,9 +88,9 @@ def write(filename, scene, ob, \
 	
 	# mesh.transform(ob.matrixWorld) # XXX
 	
-	faceUV = len(mesh.uv_layers) > 0
+	faceUV = len(mesh.uv_textures) > 0
 	vertexUV = len(mesh.sticky) > 0
-	vertexColors = len(mesh.vcol_layers) > 0
+	vertexColors = len(mesh.vertex_colors) > 0
 	
 	if (not faceUV) and (not vertexUV):	EXPORT_UV = False
 	if not vertexColors:					EXPORT_COLORS = False
@@ -100,7 +100,7 @@ def write(filename, scene, ob, \
 		
 	if faceUV:
 		active_uv_layer = None
-		for lay in mesh.uv_layers:
+		for lay in mesh.uv_textures:
 			if lay.active:
 				active_uv_layer= lay.data
 				break
@@ -110,7 +110,7 @@ def write(filename, scene, ob, \
 	
 	if vertexColors:
 		active_col_layer = None
-		for lay in mesh.vcol_layers:
+		for lay in mesh.vertex_colors:
 			if lay.active:
 				active_col_layer= lay.data
 		if not active_col_layer:
@@ -123,8 +123,8 @@ def write(filename, scene, ob, \
 	mesh_verts = mesh.verts # save a lookup
 	ply_verts = [] # list of dictionaries
 	# vdict = {} # (index, normal, uv) -> new index
-	vdict = [{} for i in xrange(len(mesh_verts))]
-	ply_faces = [[] for f in xrange(len(mesh.faces))]
+	vdict = [{} for i in range(len(mesh_verts))]
+	ply_faces = [[] for f in range(len(mesh.faces))]
 	vert_count = 0
 	for i, f in enumerate(mesh.faces):
 		
@@ -141,8 +141,7 @@ def write(filename, scene, ob, \
 			col = active_col_layer[i]
 			col = col.color1, col.color2, col.color3, col.color4
 		
-		f_verts= list(f.verts)
-		if not f_verts[3]: f_verts.pop() # XXX face length should be 3/4, not always 4
+		f_verts= f.verts
 		
 		pf= ply_faces[i]
 		for j, vidx in enumerate(f_verts):
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index e7add9c59f3..e317d990c39 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -426,7 +426,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		split = layout.split()
 		
 		col = split.column()
-		col.itemR(raym, "reflectivity")
+		col.itemR(raym, "reflect_factor")
 		col.itemR(mat, "mirror_color", text="")
 
 		col = split.column()
@@ -448,9 +448,9 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		
 		col = split.column()
 		col.itemL(text="Gloss:")
-		col.itemR(raym, "gloss_amount", text="Amount")
+		col.itemR(raym, "gloss_factor", text="Amount")
 		sub = col.column()
-		sub.active = raym.gloss_amount < 1
+		sub.active = raym.gloss_factor < 1.0
 		sub.itemR(raym, "gloss_threshold", text="Threshold")
 		sub.itemR(raym, "gloss_samples", text="Samples")
 		sub.itemR(raym, "gloss_anisotropic", text="Anisotropic")
@@ -511,9 +511,9 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 			
 			col = split.column()
 			col.itemL(text="Gloss:")
-			col.itemR(rayt, "gloss_amount", text="Amount")
+			col.itemR(rayt, "gloss_factor", text="Amount")
 			sub = col.column()
-			sub.active = rayt.gloss_amount < 1
+			sub.active = rayt.gloss_factor < 1.0
 			sub.itemR(rayt, "gloss_threshold", text="Threshold")
 			sub.itemR(rayt, "gloss_samples", text="Samples")
 
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 6b86ea5dabe..de3cfa17987 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -466,7 +466,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
 		if not strip:
 			return False
 		
-		return strip.type in ('SOUND')
+		return strip.type in ('SOUND', )
 	
 	def draw(self, context):
 		layout = self.layout
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index e9970e4391e..db573f0a666 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -746,7 +746,7 @@ static void rna_def_material_raymirror(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Enabled", "Enable raytraced reflections.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 		
-	prop= RNA_def_property(srna, "reflectivity", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "reflect_factor", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "ray_mirror");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Reflectivity", "Sets the amount mirror reflection for raytrace.");
@@ -764,7 +764,7 @@ static void rna_def_material_raymirror(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "gloss_amount", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "gloss_factor", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "gloss_mir");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Gloss Amount", "The shininess of the reflection. Values < 1.0 give diffuse, blurry reflections.");
@@ -835,7 +835,7 @@ static void rna_def_material_raytra(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel.");
 	RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
 	
-	prop= RNA_def_property(srna, "gloss_amount", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "gloss_factor", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "gloss_tra");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Gloss Amount", "The clarity of the refraction. Values < 1.0 give diffuse, blurry refractions.");

From 9e7b276dba2493fe1597fbdb0d906d1bab776fe9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 28 Aug 2009 15:03:49 +0000
Subject: [PATCH 312/577] Sequence sound was raising a python exception with
 crop and offset buttons.

renamed RNA properties.
 x_offset, y_offset -> offset_x, offset_y, this order is more common in rna.
 render.border ->  render.use_border
 render.placeholders -> render.use_placeholder
 render.no_overwrite -> render.use_overwrite
---
 release/ui/buttons_data_text.py            |  4 +--
 release/ui/buttons_scene.py                |  8 ++---
 release/ui/space_sequencer.py              | 39 +++++++++++-----------
 release/ui/space_view3d.py                 |  4 +--
 source/blender/makesrna/intern/rna_curve.c |  4 +--
 source/blender/makesrna/intern/rna_scene.c | 10 +++---
 source/blender/makesrna/intern/rna_space.c |  8 ++---
 7 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 62d4d0a4d21..1abc82cfaa3 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -134,8 +134,8 @@ class DATA_PT_paragraph(DataButtonsPanel):
 
 		col = split.column(align=True)
 		col.itemL(text="Offset:")
-		col.itemR(text, "x_offset", text="X")
-		col.itemR(text, "y_offset", text="Y")
+		col.itemR(text, "offset_x", text="X")
+		col.itemR(text, "offset_y", text="Y")
 		#col.itemR(text, "wrap")
 
 """		
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 08eee7ef43a..abd42e32e35 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -222,8 +222,8 @@ class SCENE_PT_output(RenderButtonsPanel):
 
 		col = split.column()
 		col.itemR(rd, "file_extensions")
-		col.itemR(rd, "placeholders")
-		col.itemR(rd, "no_overwrite")
+		col.itemR(rd, "use_overwrite")
+		col.itemR(rd, "use_placeholder")
 
 		if rd.file_format in ('AVIJPEG', 'JPEG'):
 			split = layout.split()
@@ -370,9 +370,9 @@ class SCENE_PT_dimensions(RenderButtonsPanel):
 		sub.itemR(rd, "pixel_aspect_y", text="Y")
 
 		row = col.row()
-		row.itemR(rd, "border", text="Border")
+		row.itemR(rd, "use_border", text="Border")
 		rowsub = row.row()
-		rowsub.active = rd.border
+		rowsub.active = rd.use_border
 		rowsub.itemR(rd, "crop_to_border", text="Crop")
 		
 		col = split.column(align=True)
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index de3cfa17987..cf9d89edec8 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -434,26 +434,27 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
 		if elem:
 			col.itemR(elem, "filename", text="") # strip.elements[0] could be a fallback
 		
-		layout.itemR(strip, "use_translation", text="Image Offset:")
-		if strip.transform:
-			col = layout.column(align=True)
-			col.active = strip.use_translation
-			col.itemR(strip.transform, "offset_x", text="X")
-			col.itemR(strip.transform, "offset_y", text="Y")
-	
-		layout.itemR(strip, "use_crop", text="Image Crop:")
-		if strip.crop:
-			col = layout.column(align=True)
-			col.active = strip.use_crop
-			col.itemR(strip.crop, "top")
-			col.itemR(strip.crop, "left")
-			col.itemR(strip.crop, "bottom")
-			col.itemR(strip.crop, "right")
+		if strip.type != 'SOUND':
+			layout.itemR(strip, "use_translation", text="Image Offset:")
+			if strip.transform:
+				col = layout.column(align=True)
+				col.active = strip.use_translation
+				col.itemR(strip.transform, "offset_x", text="X")
+				col.itemR(strip.transform, "offset_y", text="Y")
 		
-		col = layout.column(align=True)
-		col.itemL(text="Trim Duration:")
-		col.itemR(strip, "animation_start_offset", text="Start")
-		col.itemR(strip, "animation_end_offset", text="End")
+			layout.itemR(strip, "use_crop", text="Image Crop:")
+			if strip.crop:
+				col = layout.column(align=True)
+				col.active = strip.use_crop
+				col.itemR(strip.crop, "top")
+				col.itemR(strip.crop, "left")
+				col.itemR(strip.crop, "bottom")
+				col.itemR(strip.crop, "right")
+			
+			col = layout.column(align=True)
+			col.itemL(text="Trim Duration:")
+			col.itemR(strip, "animation_start_offset", text="Start")
+			col.itemR(strip, "animation_end_offset", text="End")
 
 class SEQUENCER_PT_sound(SequencerButtonsPanel):
 	__label__ = "Sound"
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index ae17307080f..5801f9e7941 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -1244,8 +1244,8 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
 			col.itemL(text="Offset:")
 			
 			col = layout.column(align=True)
-			col.itemR(bg, "x_offset", text="X")
-			col.itemR(bg, "y_offset", text="Y")
+			col.itemR(bg, "offset_x", text="X")
+			col.itemR(bg, "offset_y", text="Y")
 
 bpy.types.register(VIEW3D_HT_header) # Header
 
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 1dd3d0e63c5..bb094eef962 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -401,13 +401,13 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Shear", "Italic angle of the characters");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
-	prop= RNA_def_property(srna, "x_offset", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xof");
 	RNA_def_property_range(prop, -50.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "X Offset", "Horizontal offset from the object center");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
-	prop= RNA_def_property(srna, "y_offset", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yof");
 	RNA_def_property_range(prop, -50.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Y Offset", "Vertical offset from the object center");
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 2408d9337e1..02b891c6cd2 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1650,7 +1650,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Motion Blur", "Use multi-sampled 3D scene motion blur (uses number of anti-aliasing samples).");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
-	prop= RNA_def_property(srna, "border", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_border", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", R_BORDER);
 	RNA_def_property_ui_text(prop, "Border", "Render a user-defined border region, within the frame size.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
@@ -1660,14 +1660,14 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Crop to Border", "Crop the rendered frame to the defined border size.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
-	prop= RNA_def_property(srna, "placeholders", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_placeholder", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", R_TOUCH);
 	RNA_def_property_ui_text(prop, "Placeholders", "Create empty placeholder files while rendering frames (similar to Unix 'touch').");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
-	prop= RNA_def_property(srna, "no_overwrite", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "mode", R_NO_OVERWRITE);
-	RNA_def_property_ui_text(prop, "No Overwrite", "Skip and don't overwrite existing files while rendering");
+	prop= RNA_def_property(srna, "use_overwrite", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", R_NO_OVERWRITE);
+	RNA_def_property_ui_text(prop, "Overwrite", "Overwrite existing files while rendering.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
 	prop= RNA_def_property(srna, "use_compositing", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index a754d619741..d6a17526a65 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -493,12 +493,12 @@ static void rna_def_background_image(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Image User", "Parameters defining which layer, pass and frame of the image is displayed.");
 	RNA_def_property_update(prop, NC_WINDOW, NULL);
 	
-	prop= RNA_def_property(srna, "x_offset", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xof");
 	RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally from the view center");
 	RNA_def_property_update(prop, NC_WINDOW, NULL);
 	
-	prop= RNA_def_property(srna, "y_offset", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yof");
 	RNA_def_property_ui_text(prop, "Y Offset", "Offsets image vertically from the view center");
 	RNA_def_property_update(prop, NC_WINDOW, NULL);
@@ -913,11 +913,11 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
 	
 	
 	/* not sure we need rna access to these but adding anyway */
-	prop= RNA_def_property(srna, "x_offset", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xof");
 	RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally from the view center");
 
-	prop= RNA_def_property(srna, "y_offset", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yof");
 	RNA_def_property_ui_text(prop, "Y Offset", "Offsets image horizontally from the view center");
 	

From 9781320716c32adec710c3d616685fb4171faa29 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Fri, 28 Aug 2009 15:54:15 +0000
Subject: [PATCH 313/577] Add Makefile for sound ops.

---
 source/Makefile                       |  1 +
 source/blender/editors/Makefile       |  1 +
 source/blender/editors/sound/Makefile | 51 +++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 source/blender/editors/sound/Makefile

diff --git a/source/Makefile b/source/Makefile
index a13d8bb41d5..d9acd4bf059 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -266,6 +266,7 @@ PULIB += $(OCGDIR)/blender/ed_screen/$(DEBUG_DIR)libed_screen.a
 PULIB += $(OCGDIR)/blender/ed_console/$(DEBUG_DIR)libed_console.a
 PULIB += $(OCGDIR)/blender/ed_userpref/$(DEBUG_DIR)libed_userpref.a
 PULIB += $(OCGDIR)/blender/ed_gpencil/$(DEBUG_DIR)libed_gpencil.a
+PULIB += $(OCGDIR)/blender/ed_opsound/$(DEBUG_DIR)libed_opsound.a
 PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
 PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a
diff --git a/source/blender/editors/Makefile b/source/blender/editors/Makefile
index bbbb3fb985f..6a9d695ab0e 100644
--- a/source/blender/editors/Makefile
+++ b/source/blender/editors/Makefile
@@ -66,5 +66,6 @@ DIRS = armature \
   space_sequencer \
   space_logic \
   space_userpref \
+  sound
 
 include nan_subdirs.mk
diff --git a/source/blender/editors/sound/Makefile b/source/blender/editors/sound/Makefile
new file mode 100644
index 00000000000..10145035eb4
--- /dev/null
+++ b/source/blender/editors/sound/Makefile
@@ -0,0 +1,51 @@
+#
+# $Id$
+#
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2007 Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# Makes module object directory and bounces make to subdirectories.
+
+LIBNAME = ed_opsound
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+
+CPPFLAGS += -I../../windowmanager
+CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I../../blenloader
+CPPFLAGS += -I../../blenlib
+CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../makesrna
+CPPFLAGS += -I../../imbuf
+CPPFLAGS += -I$(NAN_AUDASPACE)/include
+
+# own include 
+
+CPPFLAGS += -I../include 

From a179d16550d15a4543aef940d515ae039ce43e45 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 20:41:12 +0000
Subject: [PATCH 314/577] Moved unpack_method_items to the right place.

---
 source/blender/editors/space_image/image_ops.c  | 10 +---------
 source/blender/makesrna/RNA_enum_types.h        |  2 ++
 source/blender/makesrna/intern/rna_packedfile.c |  7 +++++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 7a39cd587eb..bee06e6892f 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -61,6 +61,7 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_types.h"
+#include "RNA_enum_types.h"
 
 #include "ED_image.h"
 #include "ED_screen.h"
@@ -1166,15 +1167,6 @@ void IMAGE_OT_pack(wmOperatorType *ot)
 
 /********************* unpack operator *********************/
 
-/* XXX move this to some place where it can be reused */
-
-const EnumPropertyItem unpack_method_items[] = {
-	{PF_USE_LOCAL, "USE_LOCAL", 0, "Use Local File", ""},
-	{PF_WRITE_LOCAL, "WRITE_LOCAL", 0, "Write Local File (overwrite existing)", ""},
-	{PF_USE_ORIGINAL, "USE_ORIGINAL", 0, "Use Original File", ""},
-	{PF_WRITE_ORIGINAL, "WRITE_ORIGINAL", 0, "Write Original File (overwrite existing)", ""},
-	{0, NULL, 0, NULL, NULL}};
-
 void unpack_menu(bContext *C, char *opname, char *abs_name, char *folder, PackedFile *pf)
 {
 	uiPopupMenu *pup;
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 06be0e69be5..3bba474677f 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -53,6 +53,8 @@ extern EnumPropertyItem event_type_items[];
 
 extern EnumPropertyItem brush_sculpt_tool_items[];
 
+extern EnumPropertyItem unpack_method_items[];
+
 #endif /* RNA_ENUM_TYPES */
 
 
diff --git a/source/blender/makesrna/intern/rna_packedfile.c b/source/blender/makesrna/intern/rna_packedfile.c
index 6b9a708f555..85918bce05b 100644
--- a/source/blender/makesrna/intern/rna_packedfile.c
+++ b/source/blender/makesrna/intern/rna_packedfile.c
@@ -31,6 +31,13 @@
 
 #include "DNA_packedFile_types.h"
 
+EnumPropertyItem unpack_method_items[] = {
+	{PF_USE_LOCAL, "USE_LOCAL", 0, "Use Local File", ""},
+	{PF_WRITE_LOCAL, "WRITE_LOCAL", 0, "Write Local File (overwrite existing)", ""},
+	{PF_USE_ORIGINAL, "USE_ORIGINAL", 0, "Use Original File", ""},
+	{PF_WRITE_ORIGINAL, "WRITE_ORIGINAL", 0, "Write Original File (overwrite existing)", ""},
+	{0, NULL, 0, NULL, NULL}};
+
 #ifdef RNA_RUNTIME
 #else
 

From 6f80bff0e2390f3e93ee31967e7ada417c7ba0c3 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 28 Aug 2009 20:51:30 +0000
Subject: [PATCH 315/577] 2.5: fix bug in ID property loading, which also
 loading python RNA collections saves as ID properties.

---
 source/blender/blenloader/intern/readfile.c | 29 +++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1a811ebc08a..89dfa4e2557 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1373,12 +1373,10 @@ static void IDP_DirectLinkIDPArray(IDProperty *prop, int switch_endian, FileData
 	prop->totallen = prop->len;
 	prop->data.pointer = newdataadr(fd, prop->data.pointer);
 
-	if (switch_endian) {
-		array= (IDProperty*) prop->data.pointer;
+	array= (IDProperty*) prop->data.pointer;
 
-		for(i=0; i<prop->len; i++)
-			IDP_DirectLinkProperty(&array[i], switch_endian, fd);
-	}
+	for(i=0; i<prop->len; i++)
+		IDP_DirectLinkProperty(&array[i], switch_endian, fd);
 }
 
 static void IDP_DirectLinkArray(IDProperty *prop, int switch_endian, FileData *fd)
@@ -1390,19 +1388,22 @@ static void IDP_DirectLinkArray(IDProperty *prop, int switch_endian, FileData *f
 	prop->totallen = prop->len;
 	prop->data.pointer = newdataadr(fd, prop->data.pointer);
 
-	if (switch_endian) {
-		if(prop->subtype == IDP_GROUP) {
-			test_pointer_array(fd, prop->data.pointer);
-			array= prop->data.pointer;
+	if(prop->subtype == IDP_GROUP) {
+		test_pointer_array(fd, prop->data.pointer);
+		array= prop->data.pointer;
 
-			for(i=0; i<prop->len; i++)
-				IDP_DirectLinkProperty(array[i], switch_endian, fd);
-		}
-		else if(prop->subtype == IDP_DOUBLE) {
+		for(i=0; i<prop->len; i++)
+			IDP_DirectLinkProperty(array[i], switch_endian, fd);
+	}
+	else if(prop->subtype == IDP_DOUBLE) {
+		if (switch_endian) {
 			for (i=0; i<prop->len; i++) {
 				SWITCH_LONGINT(((double*)prop->data.pointer)[i]);
 			}
-		} else {
+		}
+	}
+	else {
+		if (switch_endian) {
 			for (i=0; i<prop->len; i++) {
 				SWITCH_INT(((int*)prop->data.pointer)[i]);
 			}

From 6f4e0e8e54aba3b674b86dcfb367cceb8619e786 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 28 Aug 2009 21:07:55 +0000
Subject: [PATCH 316/577] 2.5 Paint:

* Cleaned up some vertex paint code. Reduces code duplication a bit.
---
 .../editors/sculpt_paint/paint_vertex.c       | 95 ++++++++-----------
 1 file changed, 37 insertions(+), 58 deletions(-)

diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index ee3d9e5baa1..581d10ee883 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1610,13 +1610,13 @@ For future:
 
 */
 
-struct VPaintData {
+typedef struct VPaintData {
 	ViewContext vc;
 	unsigned int paintcol;
 	int *indexar;
 	float *vertexcosnos;
 	float vpimat[3][3];
-};
+} VPaintData;
 
 static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, wmEvent *event)
 {
@@ -1655,6 +1655,38 @@ static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, wmEvent
 	return 1;
 }
 
+static void vpaint_paint_face(VPaint *vp, VPaintData *vpd, Object *ob, int index, float mval[2])
+{
+	ViewContext *vc = &vpd->vc;
+	Mesh *me = get_mesh(ob);
+	MFace *mface= ((MFace*)me->mface) + index;
+	unsigned int *mcol= ((unsigned int*)me->mcol) + 4*index;
+	unsigned int *mcolorig= ((unsigned int*)vp->vpaint_prev) + 4*index;
+	int alpha, i;
+	
+	if((vp->flag & VP_COLINDEX && mface->mat_nr!=ob->actcol-1) ||
+	   (G.f & G_FACESELECT && !(mface->flag & ME_FACE_SEL)))
+		return;
+
+	if(vp->mode==VP_BLUR) {
+		unsigned int fcol1= mcol_blend( mcol[0], mcol[1], 128);
+		if(mface->v4) {
+			unsigned int fcol2= mcol_blend( mcol[2], mcol[3], 128);
+			vpd->paintcol= mcol_blend( fcol1, fcol2, 128);
+		}
+		else {
+			vpd->paintcol= mcol_blend( mcol[2], fcol1, 170);
+		}
+		
+	}
+
+	for(i = 0; i < (mface->v4 ? 4 : 3); ++i) {
+		alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*(&mface->v1)[i], mval);
+		if(alpha)
+			vpaint_blend(vp, mcol+i, mcolorig+i, vpd->paintcol, alpha);
+	}
+}
+
 static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
 {
 	ToolSettings *ts= CTX_data_tool_settings(C);
@@ -1694,62 +1726,9 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 			
 	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
-	if(vp->flag & VP_COLINDEX) {
-		for(index=0; index<totindex; index++) {
-			if(indexar[index] && indexar[index]<=me->totface) {
-				MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-						
-				if(mface->mat_nr!=ob->actcol-1) {
-					indexar[index]= 0;
-				}
-			}					
-		}
-	}
-	if((G.f & G_FACESELECT) && me->mface) {
-		for(index=0; index<totindex; index++) {
-			if(indexar[index] && indexar[index]<=me->totface) {
-				MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-						
-				if((mface->flag & ME_FACE_SEL)==0)
-					indexar[index]= 0;
-			}					
-		}
-	}
-			
-	for(index=0; index<totindex; index++) {
-				
-		if(indexar[index] && indexar[index]<=me->totface) {
-			MFace *mface= ((MFace *)me->mface) + (indexar[index]-1);
-			unsigned int *mcol=	  ( (unsigned int *)me->mcol) + 4*(indexar[index]-1);
-			unsigned int *mcolorig= ( (unsigned int *)vp->vpaint_prev) + 4*(indexar[index]-1);
-			int alpha;
-					
-			if(vp->mode==VP_BLUR) {
-				unsigned int fcol1= mcol_blend( mcol[0], mcol[1], 128);
-				if(mface->v4) {
-					unsigned int fcol2= mcol_blend( mcol[2], mcol[3], 128);
-					vpd->paintcol= mcol_blend( fcol1, fcol2, 128);
-				}
-				else {
-					vpd->paintcol= mcol_blend( mcol[2], fcol1, 170);
-				}
-						
-			}
-					
-			alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v1, mval);
-			if(alpha) vpaint_blend(vp, mcol, mcolorig, vpd->paintcol, alpha);
-					
-			alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v2, mval);
-			if(alpha) vpaint_blend(vp, mcol+1, mcolorig+1, vpd->paintcol, alpha);
-					
-			alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v3, mval);
-			if(alpha) vpaint_blend(vp, mcol+2, mcolorig+2, vpd->paintcol, alpha);
-					
-			if(mface->v4) {
-				alpha= calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos+6*mface->v4, mval);
-				if(alpha) vpaint_blend(vp, mcol+3, mcolorig+3, vpd->paintcol, alpha);
-			}
-		}
+	for(index=0; index<totindex; index++) {				
+		if(indexar[index] && indexar[index]<=me->totface)
+			vpaint_paint_face(vp, vpd, ob, indexar[index]-1, mval);
 	}
 						
 	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);

From 99eae3d93a8281b7c947ce8a42aafbe8b3c9a706 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Fri, 28 Aug 2009 21:31:13 +0000
Subject: [PATCH 317/577] SVN maintenance.

---
 source/blender/editors/gpencil/gpencil_buttons.c | 2 +-
 source/blender/editors/include/ED_sound.h        | 2 +-
 source/blender/editors/sound/sound_intern.h      | 2 +-
 source/blender/editors/sound/sound_ops.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 87f3b60dcc2..12e987af47b 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -1,5 +1,5 @@
 /**
- * $Id: drawgpencil.c 22802 2009-08-26 12:01:15Z aligorith $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.h
index 584370bc738..afb2752fa6b 100644
--- a/source/blender/editors/include/ED_sound.h
+++ b/source/blender/editors/include/ED_sound.h
@@ -1,5 +1,5 @@
 /**
- * $Id:$
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/editors/sound/sound_intern.h b/source/blender/editors/sound/sound_intern.h
index eb793a0b661..ec8b0688305 100644
--- a/source/blender/editors/sound/sound_intern.h
+++ b/source/blender/editors/sound/sound_intern.h
@@ -1,5 +1,5 @@
 /**
- * $Id:$
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index a23a28423ef..83f83c637bf 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -1,5 +1,5 @@
 /**
- * $Id:$
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *

From 03b3d2cb794c5fe03fc4c27b006044e24e294cfc Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 21:47:05 +0000
Subject: [PATCH 318/577] Sound packing/unpacking operators.

---
 source/blender/blenkernel/intern/sound.c |   6 +-
 source/blender/editors/sound/sound_ops.c | 178 +++++++++++++++++++++++
 2 files changed, 181 insertions(+), 3 deletions(-)

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 3794fbe90ef..8159f2f8c4c 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -163,7 +163,7 @@ void sound_cache(struct bSound* sound, int ignore)
 		AUD_unload(sound->cache);
 
 	sound->cache = AUD_bufferSound(sound->handle);
-	sound->changed = TRUE;
+	sound->changed++;
 }
 
 void sound_delete_cache(struct bSound* sound)
@@ -204,7 +204,7 @@ void sound_load(struct Main *main, struct bSound* sound)
 			if(sound->id.lib)
 				path = sound->id.lib->filename;
 			else
-				path = main ? main->name : NULL;
+				path = main ? main->name : G.sce;
 
 			BLI_convertstringcode(fullpath, path);
 
@@ -229,7 +229,7 @@ void sound_load(struct Main *main, struct bSound* sound)
 			break;
 		}
 #endif
-		sound->changed = TRUE;
+		sound->changed++;
 	}
 }
 
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 83f83c637bf..e03d647602e 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -26,22 +26,33 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 
+#include "DNA_packedFile_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_sound_types.h"
+#include "DNA_sequence_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BKE_context.h"
+#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
+#include "BKE_packedFile.h"
 #include "BKE_sound.h"
 
+#include "BLI_blenlib.h"
+
 #include "ED_sound.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "UI_interface.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -103,7 +114,174 @@ void SOUND_OT_open(wmOperatorType *ot)
 
 /* ******************************************************* */
 
+static int sound_poll(bContext *C)
+{
+	Editing* ed = CTX_data_scene(C)->ed;
+
+	if(!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND || !ed->act_seq->sound)
+		return 0;
+
+	return 1;
+}
+/********************* pack operator *********************/
+
+static int pack_exec(bContext *C, wmOperator *op)
+{
+	Editing* ed = CTX_data_scene(C)->ed;
+	bSound* sound;
+
+	if(!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
+		return OPERATOR_CANCELLED;
+
+	sound = ed->act_seq->sound;
+
+	if(!sound || sound->packedfile)
+		return OPERATOR_CANCELLED;
+
+	sound->packedfile= newPackedFile(op->reports, sound->name);
+	sound_load(CTX_data_main(C), sound);
+
+	return OPERATOR_FINISHED;
+}
+
+void SOUND_OT_pack(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Pack Sound";
+	ot->idname= "SOUND_OT_pack";
+
+	/* api callbacks */
+	ot->exec= pack_exec;
+	ot->poll= sound_poll;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/********************* unpack operator *********************/
+
+// XXX this function is in image_ops.c too, exactly the same, should be moved to a generally accessible position
+void unpack_menu(bContext *C, char *opname, char *abs_name, char *folder, PackedFile *pf)
+{
+	uiPopupMenu *pup;
+	uiLayout *layout;
+	char line[FILE_MAX + 100];
+	char local_name[FILE_MAXDIR + FILE_MAX], fi[FILE_MAX];
+
+	strcpy(local_name, abs_name);
+	BLI_splitdirstring(local_name, fi);
+	sprintf(local_name, "//%s/%s", folder, fi);
+
+	pup= uiPupMenuBegin(C, "Unpack file", 0);
+	layout= uiPupMenuLayout(pup);
+
+	uiItemEnumO(layout, "Remove Pack", 0, opname, "method", PF_REMOVE);
+
+	if(strcmp(abs_name, local_name)) {
+		switch(checkPackedFile(local_name, pf)) {
+			case PF_NOFILE:
+				sprintf(line, "Create %s", local_name);
+				uiItemEnumO(layout, line, 0, opname, "method", PF_WRITE_LOCAL);
+				break;
+			case PF_EQUAL:
+				sprintf(line, "Use %s (identical)", local_name);
+				uiItemEnumO(layout, line, 0, opname, "method", PF_USE_LOCAL);
+				break;
+			case PF_DIFFERS:
+				sprintf(line, "Use %s (differs)", local_name);
+				uiItemEnumO(layout, line, 0, opname, "method", PF_USE_LOCAL);
+				sprintf(line, "Overwrite %s", local_name);
+				uiItemEnumO(layout, line, 0, opname, "method", PF_WRITE_LOCAL);
+				break;
+		}
+	}
+
+	switch(checkPackedFile(abs_name, pf)) {
+		case PF_NOFILE:
+			sprintf(line, "Create %s", abs_name);
+			uiItemEnumO(layout, line, 0, opname, "method", PF_WRITE_ORIGINAL);
+			break;
+		case PF_EQUAL:
+			sprintf(line, "Use %s (identical)", abs_name);
+			uiItemEnumO(layout, line, 0, opname, "method", PF_USE_ORIGINAL);
+			break;
+		case PF_DIFFERS:
+			sprintf(line, "Use %s (differs)", local_name);
+			uiItemEnumO(layout, line, 0, opname, "method", PF_USE_ORIGINAL);
+			sprintf(line, "Overwrite %s", local_name);
+			uiItemEnumO(layout, line, 0, opname, "method", PF_WRITE_ORIGINAL);
+			break;
+	}
+
+	uiPupMenuEnd(C, pup);
+}
+
+static int unpack_exec(bContext *C, wmOperator *op)
+{
+	int method= RNA_enum_get(op->ptr, "method");
+	Editing* ed = CTX_data_scene(C)->ed;
+	bSound* sound;
+
+	if(!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
+		return OPERATOR_CANCELLED;
+
+	sound = ed->act_seq->sound;
+
+	if(!sound || !sound->packedfile)
+		return OPERATOR_CANCELLED;
+
+	if(G.fileflags & G_AUTOPACK)
+		BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save.");
+
+	unpackSound(op->reports, sound, method);
+
+	return OPERATOR_FINISHED;
+}
+
+static int unpack_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Editing* ed = CTX_data_scene(C)->ed;
+	bSound* sound;
+
+	if(!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
+		return OPERATOR_CANCELLED;
+
+	sound = ed->act_seq->sound;
+
+	if(!sound || !sound->packedfile)
+		return OPERATOR_CANCELLED;
+
+	if(G.fileflags & G_AUTOPACK)
+		BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save.");
+
+	unpack_menu(C, "SOUND_OT_unpack", sound->name, "audio", sound->packedfile);
+
+	return OPERATOR_FINISHED;
+}
+
+void SOUND_OT_unpack(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Unpack Sound";
+	ot->idname= "SOUND_OT_unpack";
+
+	/* api callbacks */
+	ot->exec= unpack_exec;
+	ot->invoke= unpack_invoke;
+	ot->poll= sound_poll;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack.");
+}
+
+/* ******************************************************* */
+
 void ED_operatortypes_sound(void)
 {
 	WM_operatortype_append(SOUND_OT_open);
+	WM_operatortype_append(SOUND_OT_pack);
+	WM_operatortype_append(SOUND_OT_unpack);
 }

From 77c587a8250cd21c751bbab0c4dd263989d88b9a Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Fri, 28 Aug 2009 21:47:11 +0000
Subject: [PATCH 319/577] 2.5 Paint:

* Removed the BKE_sculpt file and moved it's contents (basically just the sculpt session struct) to BKE_paint
---
 source/blender/blenkernel/BKE_paint.h         | 39 ++++++++++
 source/blender/blenkernel/BKE_sculpt.h        | 72 -------------------
 source/blender/blenkernel/intern/object.c     |  2 +-
 source/blender/blenloader/intern/readfile.c   |  2 +-
 source/blender/editors/sculpt_paint/sculpt.c  |  1 -
 .../editors/sculpt_paint/sculpt_intern.h      |  1 -
 6 files changed, 41 insertions(+), 76 deletions(-)
 delete mode 100644 source/blender/blenkernel/BKE_sculpt.h

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 4337d275776..7dc9e4499c6 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -29,9 +29,13 @@
 #define BKE_PAINT_H
 
 struct Brush;
+struct MFace;
+struct MultireModifierData;
+struct MVert;
 struct Object;
 struct Paint;
 struct Scene;
+struct StrokeCache;
 
 extern const char PAINT_CURSOR_SCULPT[3];
 extern const char PAINT_CURSOR_VERTEX_PAINT[3];
@@ -53,4 +57,39 @@ void paint_brush_slot_remove(struct Paint *p);
  * however hiding faces is useful */
 int paint_facesel_test(struct Object *ob);
 
+/* Session data (mode-specific) */
+
+typedef struct SculptSession {
+	struct ProjVert *projverts;
+
+	/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
+	struct MultiresModifierData *multires; /* Special handling for multires meshes */
+	struct MVert *mvert;
+	struct MFace *mface;
+	int totvert, totface;
+	float *face_normals;
+	
+	/* Mesh connectivity */
+	struct ListBase *fmap;
+	struct IndexNode *fmap_mem;
+	int fmap_size;
+
+	/* Used temporarily per-stroke */
+	float *vertexcosnos;
+	ListBase damaged_rects;
+	ListBase damaged_verts;
+	
+	/* Used to cache the render of the active texture */
+	unsigned int texcache_side, *texcache, texcache_actual;
+
+	/* Layer brush persistence between strokes */
+ 	float (*mesh_co_orig)[3]; /* Copy of the mesh vertices' locations */
+	float *layer_disps; /* Displacements for each vertex */
+
+	struct SculptStroke *stroke;
+	struct StrokeCache *cache;
+} SculptSession;
+
+void free_sculptsession(SculptSession **);
+
 #endif
diff --git a/source/blender/blenkernel/BKE_sculpt.h b/source/blender/blenkernel/BKE_sculpt.h
deleted file mode 100644
index 9e5647a8775..00000000000
--- a/source/blender/blenkernel/BKE_sculpt.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2007 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BKE_SCULPT_H
-#define BKE_SCULPT_H
-
-struct MFace;
-struct MultireModifierData;
-struct MVert;
-struct Object;
-struct StrokeCache;
-
-typedef struct SculptSession {
-	struct ProjVert *projverts;
-
-	/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
-	struct MultiresModifierData *multires; /* Special handling for multires meshes */
-	struct MVert *mvert;
-	struct MFace *mface;
-	int totvert, totface;
-	float *face_normals;
-	
-	/* Mesh connectivity */
-	struct ListBase *fmap;
-	struct IndexNode *fmap_mem;
-	int fmap_size;
-
-	/* Used temporarily per-stroke */
-	float *vertexcosnos;
-	ListBase damaged_rects;
-	ListBase damaged_verts;
-	
-	/* Used to cache the render of the active texture */
-	unsigned int texcache_side, *texcache, texcache_actual;
-
-	/* Layer brush persistence between strokes */
- 	float (*mesh_co_orig)[3]; /* Copy of the mesh vertices' locations */
-	float *layer_disps; /* Displacements for each vertex */
-
-	struct SculptStroke *stroke;
-	struct StrokeCache *cache;
-} SculptSession;
-
-void free_sculptsession(SculptSession **);
-
-#endif
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 6f57a658efa..1cb0abfe21c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -101,13 +101,13 @@
 #include "BKE_mball.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
+#include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_property.h"
 #include "BKE_sca.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
-#include "BKE_sculpt.h"
 #include "BKE_softbody.h"
 
 #include "LBM_fluidsim.h"
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 89dfa4e2557..9d5ae3062a1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -135,6 +135,7 @@
 #include "BKE_multires.h"
 #include "BKE_node.h" // for tree type defines
 #include "BKE_object.h"
+#include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_property.h" // for get_ob_property
@@ -143,7 +144,6 @@
 #include "BKE_scene.h"
 #include "BKE_softbody.h"	// sbNew()
 #include "BKE_bullet.h"		// bsbNew()
-#include "BKE_sculpt.h"
 #include "BKE_sequence.h"
 #include "BKE_texture.h" // for open_plugin_tex
 #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index adaba804799..b08e8ab5c2b 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -65,7 +65,6 @@
 #include "BKE_modifier.h"
 #include "BKE_multires.h"
 #include "BKE_paint.h"
-#include "BKE_sculpt.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 #include "BKE_colortools.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index febca301939..25f97b862e6 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -32,7 +32,6 @@
 
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
-#include "BKE_sculpt.h"
 
 struct Brush;
 struct Mesh;

From 17fc83e537f8bfca643d555b8f5e2d14afebd93d Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 21:54:41 +0000
Subject: [PATCH 320/577] Error in last commit.

---
 source/blender/editors/sound/sound_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index e03d647602e..d8a84611298 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -161,7 +161,7 @@ void SOUND_OT_pack(wmOperatorType *ot)
 /********************* unpack operator *********************/
 
 // XXX this function is in image_ops.c too, exactly the same, should be moved to a generally accessible position
-void unpack_menu(bContext *C, char *opname, char *abs_name, char *folder, PackedFile *pf)
+static void unpack_menu(bContext *C, char *opname, char *abs_name, char *folder, PackedFile *pf)
 {
 	uiPopupMenu *pup;
 	uiLayout *layout;

From beee5161a9a48eb1610dcad6d9c136b907b2d8ee Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 28 Aug 2009 22:04:37 +0000
Subject: [PATCH 321/577] UI for sound (un)packing.

---
 release/ui/space_sequencer.py            | 7 +++++++
 source/blender/editors/sound/sound_ops.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index cf9d89edec8..87111b2925f 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -476,6 +476,13 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
 		
 		layout.template_ID(strip, "sound", new="sound.open")
 		
+		layout.itemS()
+		
+		if strip.sound.packed_file:
+			layout.itemO("sound.unpack")
+		else:
+			layout.itemO("sound.pack")
+		
 		layout.itemR(strip.sound, "filename")
 		layout.itemR(strip.sound, "caching")
 
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index d8a84611298..75204207284 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -118,7 +118,7 @@ static int sound_poll(bContext *C)
 {
 	Editing* ed = CTX_data_scene(C)->ed;
 
-	if(!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND || !ed->act_seq->sound)
+	if(!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
 		return 0;
 
 	return 1;

From 732844bb28f1ad7b14d91455ad24df3d3be86e0c Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 29 Aug 2009 00:41:14 +0000
Subject: [PATCH 322/577] * Fixes for point density texture

---
 release/ui/buttons_texture.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 78d5e6af790..ad0542d787a 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -656,7 +656,6 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 		
 		tex = context.texture
 		pd = tex.pointdensity
-		ob = context.object
 		
 		layout.itemR(pd, "point_source", expand=True)
 
@@ -664,8 +663,12 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 		
 		col = split.column()
 		if pd.point_source == 'PARTICLE_SYSTEM':
+			col.itemL(text="Object:")
+			col.itemR(pd, "object", text="")
+			col = col.column()
+			col.enabled = pd.object
 			col.itemL(text="System:")
-			col.item_pointerR(pd, "particle_system", ob, "particle_systems", text="")
+			col.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
 			col.itemL(text="Cache:")
 			col.itemR(pd, "particle_cache", text="")
 		else:

From f46f6dc7ba32411a8031a243bba635c8cc3ade29 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 29 Aug 2009 01:54:10 +0000
Subject: [PATCH 323/577] Grease Pencil: Toolbar Compatability Fixes

* When starting Grease Pencil from the toolbar, strokes are now started only when a click-drag begins.

* Made the 'straight-lines' option an RNA property for the operator

* Added an exec() callback and relevant stroke-collection stuff so that interactive redo/changing settings can work.
WARNING: this is highly unstable here - keeps crashing though I cannot determine the cause yet.
---
 .../blender/editors/gpencil/gpencil_paint.c   | 255 +++++++++++++-----
 .../blender/editors/space_view3d/view3d_ops.c |   2 +-
 2 files changed, 182 insertions(+), 75 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index d6bdea2db55..445d9ae346d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -115,7 +115,8 @@ typedef struct tGPsdata {
 
 /* values for tGPsdata->status */
 enum {
-	GP_STATUS_NORMAL = 0,	/* running normally */
+	GP_STATUS_IDLING = 0,	/* stroke isn't in progress yet */
+	GP_STATUS_PAINTING,		/* a stroke is in progress */
 	GP_STATUS_ERROR,		/* something wasn't correctly set up */
 	GP_STATUS_DONE			/* painting done */
 };
@@ -196,7 +197,7 @@ static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
 	if (gpd->sbuffer_sflag & GP_STROKE_3DSPACE) {
 		View3D *v3d= p->sa->spacedata.first;
 		const short mx=mval[0], my=mval[1];
-		float *fp= give_cursor(p->scene, v3d); // XXX NULL could be v3d
+		float *fp= give_cursor(p->scene, v3d);
 		float dvec[3];
 		
 		/* Current method just converts each point in screen-coordinates to 
@@ -727,10 +728,19 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 		{
 			//View3D *v3d= curarea->spacedata.first;
 			
-			/* set current area */
+			/* set current area 
+			 *	- must verify that region data is 3D-view (and not something else)
+			 */
 			p->sa= curarea;
 			p->ar= ar;
 			
+			if (ar->regiondata == NULL) {
+				p->status= GP_STATUS_ERROR;
+				if (G.f & G_DEBUG)
+					printf("Error: 3D-View active region doesn't have any region data, so cannot be drawable \n");
+				return p;
+			}
+			
 #if 0 // XXX will this sort of antiquated stuff be restored?
 			/* check that gpencil data is allowed to be drawn */
 			if ((v3d->flag2 & V3D_DISPGP)==0) {
@@ -1002,8 +1012,8 @@ static void gp_paint_cleanup (tGPsdata *p)
 static int gpencil_draw_init (bContext *C, wmOperator *op)
 {
 	tGPsdata *p;
-	wmWindow *win= CTX_wm_window(C);
 	int paintmode= RNA_enum_get(op->ptr, "mode");
+	int straightLines= RNA_boolean_get(op->ptr, "straight_lines");
 	
 	/* check context */
 	p= op->customdata= gp_session_initpaint(C);
@@ -1023,11 +1033,9 @@ static int gpencil_draw_init (bContext *C, wmOperator *op)
 	/* radius for eraser circle is defined in userprefs now */
 	p->radius= U.gp_eraser;
 	
-	/* set cursor */
-	if (p->paintmode == GP_PAINTMODE_ERASER)
-		WM_cursor_modal(win, BC_CROSSCURSOR); // XXX need a better cursor
-	else
-		WM_cursor_modal(win, BC_PAINTBRUSHCURSOR);
+	/* set line-drawing settings (straight or freehand lines) */
+	if (straightLines)
+		p->flags |= GP_PAINTFLAG_STRAIGHTLINES;
 	
 	/* everything is now setup ok */
 	return 1;
@@ -1069,45 +1077,9 @@ static int gpencil_draw_cancel (bContext *C, wmOperator *op)
 
 /* ------------------------------- */
 
-static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *event)
+/* create a new stroke point at the point indicated by the painting context */
+static void gpencil_draw_apply (bContext *C, wmOperator *op, tGPsdata *p)
 {
-	tGPsdata *p= op->customdata;
-	ARegion *ar= p->ar;
-	int tablet=0;
-
-	/* convert from window-space to area-space mouse coordintes */
-	// NOTE: float to ints conversions, +1 factor is probably used to ensure a bit more accurate rounding...
-	p->mval[0]= event->x - ar->winrct.xmin + 1;
-	p->mval[1]= event->y - ar->winrct.ymin + 1;
-	
-	/* handle pressure sensitivity (which is supplied by tablets) */
-	if (event->custom == EVT_DATA_TABLET) {
-		wmTabletData *wmtab= event->customdata;
-		
-		tablet= (wmtab->Active != EVT_TABLET_NONE);
-		p->pressure= wmtab->Pressure;
-		//if (wmtab->Active == EVT_TABLET_ERASER)
-			// TODO... this should get caught by the keymaps which call drawing in the first place
-	}
-	else
-		p->pressure= 1.0f;
-	
-	/* special exception for start of strokes (i.e. maybe for just a dot) */
-	if (p->flags & GP_PAINTFLAG_FIRSTRUN) {
-		p->flags &= ~GP_PAINTFLAG_FIRSTRUN;
-		
-		p->mvalo[0]= p->mval[0];
-		p->mvalo[1]= p->mval[1];
-		p->opressure= p->pressure;
-		
-		/* special exception here for too high pressure values on first touch in
-		 *  windows for some tablets, then we just skip first touch ..  
-		 */
-		if (tablet && (p->pressure >= 0.99f))
-			return;
-	}
-	
-	
 	/* handle drawing/erasing -> test for erasing first */
 	if (p->paintmode == GP_PAINTMODE_ERASER) {
 		/* do 'live' erasing now */
@@ -1147,6 +1119,59 @@ static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *even
 		p->mvalo[1]= p->mval[1];
 		p->opressure= p->pressure;
 	}
+}
+
+/* handle draw event */
+static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *event)
+{
+	tGPsdata *p= op->customdata;
+	ARegion *ar= p->ar;
+	PointerRNA itemptr;
+	float mousef[2];
+	int tablet=0;
+
+	/* convert from window-space to area-space mouse coordintes */
+	// NOTE: float to ints conversions, +1 factor is probably used to ensure a bit more accurate rounding...
+	p->mval[0]= event->x - ar->winrct.xmin + 1;
+	p->mval[1]= event->y - ar->winrct.ymin + 1;
+	
+	/* handle pressure sensitivity (which is supplied by tablets) */
+	if (event->custom == EVT_DATA_TABLET) {
+		wmTabletData *wmtab= event->customdata;
+		
+		tablet= (wmtab->Active != EVT_TABLET_NONE);
+		p->pressure= wmtab->Pressure;
+		//if (wmtab->Active == EVT_TABLET_ERASER)
+			// TODO... this should get caught by the keymaps which call drawing in the first place
+	}
+	else
+		p->pressure= 1.0f;
+	
+	/* special exception for start of strokes (i.e. maybe for just a dot) */
+	if (p->flags & GP_PAINTFLAG_FIRSTRUN) {
+		p->flags &= ~GP_PAINTFLAG_FIRSTRUN;
+		
+		p->mvalo[0]= p->mval[0];
+		p->mvalo[1]= p->mval[1];
+		p->opressure= p->pressure;
+		
+		/* special exception here for too high pressure values on first touch in
+		 *  windows for some tablets, then we just skip first touch ..  
+		 */
+		if (tablet && (p->pressure >= 0.99f))
+			return;
+	}
+	
+	/* fill in stroke data (not actually used directly by gpencil_draw_apply) */
+	RNA_collection_add(op->ptr, "stroke", &itemptr);
+
+	mousef[0]= p->mval[0];
+	mousef[1]= p->mval[1];
+	RNA_float_set_array(&itemptr, "mouse", mousef);
+	RNA_float_set(&itemptr, "pressure", p->pressure);
+	
+	/* apply the current latest drawing point */
+	gpencil_draw_apply(C, op, p);
 	
 	/* force refresh */
 	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
@@ -1154,9 +1179,69 @@ static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *even
 
 /* ------------------------------- */
 
+/* operator 'redo' (i.e. after changing some properties) */
+static int gpencil_draw_exec (bContext *C, wmOperator *op)
+{
+	tGPsdata *p = NULL;
+	
+	printf("GPencil - Starting Re-Drawing \n");
+	
+	/* try to initialise context data needed while drawing */
+	if (!gpencil_draw_init(C, op)) {
+		if (op->customdata) MEM_freeN(op->customdata);
+		printf("\tGP - no valid data \n");
+		return OPERATOR_CANCELLED;
+	}
+	else
+		p= op->customdata;
+	
+	printf("\tGP - Start redrawing stroke \n");
+	
+	/* loop over the stroke RNA elements recorded (i.e. progress of mouse movement),
+	 * setting the relevant values in context at each step, then applying
+	 */
+	RNA_BEGIN(op->ptr, itemptr, "stroke") 
+	{
+		float mousef[2];
+		
+		printf("\t\tGP - stroke elem \n");
+		
+		/* get relevant data for this point from stroke */
+		RNA_float_get_array(&itemptr, "mouse", mousef);
+		p->mval[0] = (short)mousef[0];
+		p->mval[1] = (short)mousef[1];
+		p->pressure= RNA_float_get(&itemptr, "pressure");
+		
+		/* if first run, set previous data too */
+		if (p->flags & GP_PAINTFLAG_FIRSTRUN) {
+			p->flags &= ~GP_PAINTFLAG_FIRSTRUN;
+			
+			p->mvalo[0]= p->mval[0];
+			p->mvalo[1]= p->mval[1];
+			p->opressure= p->pressure;
+		}
+		
+		/* apply this data as necessary now (as per usual) */
+		gpencil_draw_apply(C, op, p);
+	}
+	RNA_END;
+	
+	printf("\tGP - done \n");
+	
+	/* cleanup */
+	gpencil_draw_exit(C, op);
+	
+	/* done */
+	return OPERATOR_FINISHED;
+}
+
+/* ------------------------------- */
+
+/* start of interactive drawing part of operator */
 static int gpencil_draw_invoke (bContext *C, wmOperator *op, wmEvent *event)
 {
 	tGPsdata *p = NULL;
+	wmWindow *win= CTX_wm_window(C);
 	
 	printf("GPencil - Starting Drawing \n");
 	
@@ -1177,16 +1262,35 @@ static int gpencil_draw_invoke (bContext *C, wmOperator *op, wmEvent *event)
 		// TODO: this involves mucking around with radial control, so we leave this for now..
 	}
 	
-	printf("\tGP - set first spot\n");
+	/* set cursor */
+	if (p->paintmode == GP_PAINTMODE_ERASER)
+		WM_cursor_modal(win, BC_CROSSCURSOR); // XXX need a better cursor
+	else
+		WM_cursor_modal(win, BC_PAINTBRUSHCURSOR);
 	
-	/* handle the initial drawing - i.e. for just doing a simple dot */
-	gpencil_draw_apply_event(C, op, event);
+	/* special hack: if there was an initial event, then we were invoked via a hotkey, and 
+	 * painting should start immediately. Otherwise, this was called from a toolbar, in which
+	 * case we should wait for the mouse to be clicked.
+	 */
+	if (event->type) {
+		/* hotkey invoked - start drawing */
+		printf("\tGP - set first spot\n");
+		p->status= GP_STATUS_PAINTING;
+		
+		/* handle the initial drawing - i.e. for just doing a simple dot */
+		gpencil_draw_apply_event(C, op, event);
+	}
+	else {
+		/* toolbar invoked - don't start drawing yet... */
+		printf("\tGP - hotkey invoked... waiting for click-drag\n");
+	}
 	
 	/* add a modal handler for this operator, so that we can then draw continuous strokes */
 	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
 	return OPERATOR_RUNNING_MODAL;
 }
 
+/* events handling during interactive drawing part of operator */
 static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 {
 	tGPsdata *p= op->customdata;
@@ -1198,25 +1302,35 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 		 * otherwise, carry on to mouse-move...
 		 */
 		case LEFTMOUSE:
-		case MIDDLEMOUSE:
 		case RIGHTMOUSE: 
-			if (event->val != KM_PRESS) {
+			/* if painting, end stroke */
+			if (p->status == GP_STATUS_PAINTING) {
+				/* basically, this should be mouse-button up */
 				printf("\t\tGP - end of stroke \n");
 				gpencil_draw_exit(C, op);
 				return OPERATOR_FINISHED;
 			}
+			else {
+				/* not painting, so start stroke (this should be mouse-button down) */
+				printf("\t\tGP - start stroke \n");
+				p->status= GP_STATUS_PAINTING;
+				/* no break now, since we should immediately start painting */
+			}
 		
-		/* moving mouse - assumed that mouse button is down */
+		/* moving mouse - assumed that mouse button is down if in painting status */
 		case MOUSEMOVE:
-			/* handle drawing event */
-			printf("\t\tGP - add point\n");
-			gpencil_draw_apply_event(C, op, event);
-			
-			/* finish painting operation if anything went wrong just now */
-			if (p->status == GP_STATUS_ERROR) {
-				printf("\t\t\tGP - error done! \n");
-				gpencil_draw_exit(C, op);
-				return OPERATOR_CANCELLED;
+			/* check if we're currently painting */
+			if (p->status == GP_STATUS_PAINTING) {
+				/* handle drawing event */
+				printf("\t\tGP - add point\n");
+				gpencil_draw_apply_event(C, op, event);
+				
+				/* finish painting operation if anything went wrong just now */
+				if (p->status == GP_STATUS_ERROR) {
+					printf("\t\t\tGP - error done! \n");
+					gpencil_draw_exit(C, op);
+					return OPERATOR_CANCELLED;
+				}
 			}
 			break;
 		
@@ -1229,17 +1343,7 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 		case WHEELDOWNMOUSE:
 			p->radius -= 1.5f;
 			break;
-			
-		/* handle ctrl key - used to toggle straight-lines only (for drawing) */
-		// XXX hardcoded keymap stuff
-		case LEFTCTRLKEY:
-		case RIGHTCTRLKEY:
-			if (event->val == KM_PRESS)
-				p->flags |= GP_PAINTFLAG_STRAIGHTLINES;
-			else if (event->val == KM_RELEASE)
-				p->flags &= ~GP_PAINTFLAG_STRAIGHTLINES;
-			break;
-			
+		
 		default:
 			printf("\t\tGP unknown event - %d \n", event->type);
 			break;
@@ -1264,7 +1368,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot)
 	ot->description= "Make annotations on the active data.";
 	
 	/* api callbacks */
-	//ot->exec= gpencil_draw_exec;
+	ot->exec= gpencil_draw_exec;
 	ot->invoke= gpencil_draw_invoke;
 	ot->modal= gpencil_draw_modal;
 	ot->cancel= gpencil_draw_cancel;
@@ -1275,4 +1379,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot)
 	
 	/* settings for drawing */
 	RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to intepret mouse movements.");
+	RNA_def_boolean(ot->srna, "straight_lines", 0, "Straight Lines", "Only take the endpoints of the strokes, so that straight lines can be drawn.");
+	
+	RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 19a70834587..f4e1e008099 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -134,7 +134,7 @@ void view3d_keymap(wmWindowManager *wm)
 	RNA_boolean_set(km->ptr, "snap", 1);
 	
 	/* grease pencil */
-	gpencil_common_keymap(wm, keymap); // XXX
+	gpencil_common_keymap(wm, keymap);
 	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, 0, 0); /* manipulator always on left mouse, not on action mouse*/
 	

From 8930a4fd332e69442b4de2efe42019bf5a41c946 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 29 Aug 2009 06:50:32 +0000
Subject: [PATCH 324/577] Grease Pencil: UI (i.e. Panel) for Settings

Restored the UI for access to the GP layers.

There are still a few minor bugs here:
* Wrong icons on the toggles - even when they're enabled, they only show a single state
* The ID-template doesn't seem to be showing up. Dunno what's going wrong there...
---
 .../blender/editors/gpencil/gpencil_buttons.c | 338 +++++++-----------
 source/blender/editors/gpencil/gpencil_edit.c | 126 +++++++
 .../blender/editors/gpencil/gpencil_intern.h  |   7 +
 source/blender/editors/gpencil/gpencil_ops.c  |   6 +
 .../blender/editors/gpencil/gpencil_paint.c   |   5 +-
 source/blender/editors/include/ED_gpencil.h   |   5 +-
 .../editors/space_view3d/view3d_buttons.c     |  35 +-
 7 files changed, 291 insertions(+), 231 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 12e987af47b..b572cd6916a 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -47,11 +47,11 @@
 #include "BKE_gpencil.h"
 #include "BKE_utildefines.h"
 
-#include "PIL_time.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "RNA_access.h"
+
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
@@ -76,259 +76,195 @@
 /* ------- Callbacks ----------- */
 /* These are just 'dummy wrappers' around gpencil api calls */
 
-#if 0
-// XXX
+
 /* make layer active one after being clicked on */
-void gp_ui_activelayer_cb (void *gpd, void *gpl)
+void gp_ui_activelayer_cb (bContext *C, void *gpd, void *gpl)
 {
 	gpencil_layer_setactive(gpd, gpl);
 	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
 }
 
-/* rename layer and set active */
-void gp_ui_renamelayer_cb (void *gpd_arg, void *gpl_arg)
-{
-	bGPdata *gpd= (bGPdata *)gpd_arg;
-	bGPDlayer *gpl= (bGPDlayer *)gpl_arg;
-	
-	BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info[0]), 128);
-	gpencil_layer_setactive(gpd, gpl);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* add a new layer */
-void gp_ui_addlayer_cb (void *gpd, void *dummy)
-{
-	gpencil_layer_addnew(gpd);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* delete active layer */
-void gp_ui_dellayer_cb (void *gpd, void *dummy)
+/* delete 'active' layer */
+void gp_ui_dellayer_cb (bContext *C, void *gpd, void *gpl)
 {
+	/* make sure the layer we want to remove is the active one */
+	gpencil_layer_setactive(gpd, gpl); 
 	gpencil_layer_delactive(gpd);
 	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
 }
 
-/* delete last stroke of active layer */
-void gp_ui_delstroke_cb (void *gpd, void *gpl)
-{
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
-	
-	if (gpf) {
-		if (gpf->framenum != CFRA) return;
-
-		gpencil_layer_setactive(gpd, gpl);
-		gpencil_frame_delete_laststroke(gpl, gpf);
-		
-		scrarea_queue_winredraw(curarea);
-	}
-}
-
-/* delete active frame of active layer */
-void gp_ui_delframe_cb (void *gpd, void *gpl)
-{
-	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
-	
-	gpencil_layer_setactive(gpd, gpl);
-	gpencil_layer_delframe(gpl, gpf);
-	
-	scrarea_queue_winredraw(curarea);
-	allqueue(REDRAWACTION, 0);
-}
-
-/* convert the active layer to geometry */
-void gp_ui_convertlayer_cb (void *gpd, void *gpl)
-{
-	gpencil_layer_setactive(gpd, gpl);
-	gpencil_convert_menu();
-	
-	scrarea_queue_winredraw(curarea);
-}
-#endif
-
 /* ------- Drawing Code ------- */
 
-#if 0
-/* XXX */
 /* draw the controls for a given layer */
-static void gp_drawui_layer (uiBlock *block, bGPdata *gpd, bGPDlayer *gpl, short *xco, short *yco)
+static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 {
+	uiLayout *box=NULL, *split=NULL;
+	uiLayout *col=NULL, *subcol=NULL;
+	uiLayout *row=NULL, *subrow=NULL;
+	uiBlock *block;
 	uiBut *but;
-	short active= (gpl->flag & GP_LAYER_ACTIVE);
-	short width= 314;
-	short height;
-	int rb_col;
+	PointerRNA ptr;
+	
+	/* make pointer to layer data */
+	RNA_pointer_create((ID *)gpd, &RNA_GPencilLayer, gpl, &ptr);
 	
 	/* unless button has own callback, it adds this callback to button */
+	block= uiLayoutGetBlock(layout);
 	uiBlockSetFunc(block, gp_ui_activelayer_cb, gpd, gpl);
 	
-	/* draw header */
-	{
-		uiBlockSetEmboss(block, UI_EMBOSSN);
-		
-		/* rounded header */
-		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
-			rb_col= (active)?-20:20;
-			uiDefBut(block, ROUNDBOX, B_REDR, "", *xco-8, *yco-2, width, 24, NULL, 5.0, 0.0, 15.0, (float)(rb_col-20), ""); 
-		if (active) uiBlockSetCol(block, TH_AUTO);
-		
-		/* lock toggle */
-		uiDefIconButBitI(block, ICONTOG, GP_LAYER_LOCKED, B_REDR, ICON_UNLOCKED,	*xco-7, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Layer cannot be modified");
-	}
+	/* draw header ---------------------------------- */
+	/* get layout-row + UI-block for header */
+	box= uiLayoutBox(layout);
+	
+	row= uiLayoutRow(box, 0);
+	block= uiLayoutGetBlock(row); // err...
+	
+	uiBlockSetEmboss(block, UI_EMBOSSN);
+	
+	/* left-align ............................... */
+	subrow= uiLayoutRow(row, 1);
+	uiLayoutSetAlignment(subrow, UI_LAYOUT_ALIGN_LEFT);
+	
+	/* active */
+	uiItemR(subrow, "", ICON_RADIOBUT_OFF, &ptr, "active", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
+	
+	/* locked */
+	uiItemR(subrow, "", ICON_UNLOCKED, &ptr, "locked", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
 	
 	/* when layer is locked or hidden, only draw header */
 	if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) {
 		char name[256]; /* gpl->info is 128, but we need space for 'locked/hidden' as well */
 		
-		height= 0;
-		
 		/* visibility button (only if hidden but not locked!) */
 		if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
-			uiDefIconButBitI(block, ICONTOG, GP_LAYER_HIDE, B_REDR, ICON_RESTRICT_VIEW_OFF,	*xco+12, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Visibility of layer");
+			uiItemR(subrow, "", ICON_RESTRICT_VIEW_OFF, &ptr, "hide", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
 		
 		/* name */
 		if (gpl->flag & GP_LAYER_HIDE)
 			sprintf(name, "%s (Hidden)", gpl->info);
 		else
 			sprintf(name, "%s (Locked)", gpl->info);
-		uiDefBut(block, LABEL, 1, name,	*xco+35, *yco, 240, 20, NULL, 0.0, 0.0, 0, 0, "Short description of what this layer is for (optional)");
+		uiItemL(subrow, name, 0);
 			
 		/* delete button (only if hidden but not locked!) */
 		if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) {
-			but= uiDefIconBut(block, BUT, B_REDR, ICON_X, *xco+(width-30), *yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
-			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, NULL);
+			/* right-align ............................... */
+			subrow= uiLayoutRow(row, 1);
+			uiLayoutSetAlignment(subrow, UI_LAYOUT_ALIGN_RIGHT);
+			block= uiLayoutGetBlock(subrow); // XXX... err...
+			
+			but= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
+			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, gpl);
 		}	
 		uiBlockSetEmboss(block, UI_EMBOSS);
 	}
 	else {
-		height= 97;
+		/* draw rest of header -------------------------------- */
+		/* visibility button */
+		uiItemR(subrow, "", ICON_RESTRICT_VIEW_OFF, &ptr, "hide", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
 		
-		/* draw rest of header */
-		{
-			/* visibility button */
-			uiDefIconButBitI(block, ICONTOG, GP_LAYER_HIDE, B_REDR, ICON_RESTRICT_VIEW_OFF,	*xco+12, *yco-1, 20, 20, &gpl->flag, 0.0, 0.0, 0, 0, "Visibility of layer");
+		uiBlockSetEmboss(block, UI_EMBOSS);
+		
+		/* name */
+		uiItemR(subrow, "", 0, &ptr, "info", 0);
+		
+		/* delete 'button' */
+		uiBlockSetEmboss(block, UI_EMBOSSN);
+			/* right-align ............................... */
+			subrow= uiLayoutRow(row, 1);
+			uiLayoutSetAlignment(subrow, UI_LAYOUT_ALIGN_RIGHT);
+			block= uiLayoutGetBlock(subrow); // XXX... err...
 			
-			uiBlockSetEmboss(block, UI_EMBOSS);
+			but= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
+			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, gpl);
+		uiBlockSetEmboss(block, UI_EMBOSS);
+		
+		
+		/* new backdrop ----------------------------------- */
+		box= uiLayoutBox(layout);
+		split= uiLayoutSplit(box, 0.5f);
+		
+		
+		/* draw settings ---------------------------------- */
+		/* left column ..................... */
+		col= uiLayoutColumn(split, 0);
+		
+		/* color */
+		subcol= uiLayoutColumn(col, 1);
+			uiItemR(subcol, "", 0, &ptr, "color", 0);
+			uiItemR(subcol, NULL, 0, &ptr, "opacity", UI_ITEM_R_SLIDER);
 			
-			/* name */
-			but= uiDefButC(block, TEX, B_REDR, "Info:",	*xco+36, *yco, 240, 19, gpl->info, 0, 127, 0, 0, "Short description of what this layer is for (optional)");
-			uiButSetFunc(but, gp_ui_renamelayer_cb, gpd, gpl);
-			
-			/* delete 'button' */
-			uiBlockSetEmboss(block, UI_EMBOSSN);
-			
-			but= uiDefIconBut(block, BUT, B_REDR, ICON_X, *xco+(width-30), *yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Delete layer");
-			uiButSetFunc(but, gp_ui_dellayer_cb, gpd, NULL);
-			
-			uiBlockSetEmboss(block, UI_EMBOSS);
+		/* stroke thickness */
+		subcol= uiLayoutColumn(col, 1);
+			uiItemR(subcol, NULL, 0, &ptr, "line_thickness", UI_ITEM_R_SLIDER);
+		
+		/* debugging options */
+		if (G.f & G_DEBUG) {
+			// XXX this option hasn't been wrapped yet... since it's just debug
+			//subcol= uiLayoutColumn(col, 1);
+			//	uiItemR(subrow, NULL, 0, &ptr, "show_points", 0);
 		}
 		
-		/* draw backdrop */
-		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
-			uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-8, *yco-height, width, height-1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); 
-		if (active) uiBlockSetCol(block, TH_AUTO);
+		/* right column ................... */
+		col= uiLayoutColumn(split, 0);
 		
-		/* draw settings */
-		{
-			/* color */
-			uiBlockBeginAlign(block);
-				uiDefButF(block, COL, B_REDR, "",		*xco, *yco-26, 150, 19, gpl->color, 0, 0, 0, 0, "Color to use for all strokes on this Grease Pencil Layer");
-				uiDefButF(block, NUMSLI, B_REDR, "Opacity: ",		*xco,*yco-45,150,19, &gpl->color[3], 0.3f, 1.0f, 0, 0, "Visibility of stroke (0.3 to 1.0)");
-			uiBlockEndAlign(block);
-			
-			/* stroke thickness */
-			uiDefButS(block, NUMSLI, B_REDR, "Thickness:",	*xco, *yco-75, 150, 20, &gpl->thickness, 1, 10, 0, 0, "Thickness of strokes (in pixels)");
-			
-			/* debugging options */
-			if (G.f & G_DEBUG) {
-				uiDefButBitI(block, TOG, GP_LAYER_DRAWDEBUG, B_REDR, "Show Points", *xco, *yco-95, 150, 20, &gpl->flag, 0, 0, 0, 0, "Show points which form the strokes");
-			}
-			
-			/* onion-skinning */
-			uiBlockBeginAlign(block);
-				uiDefButBitI(block, TOG, GP_LAYER_ONIONSKIN, B_REDR, "Onion-Skin", *xco+160, *yco-26, 140, 20, &gpl->flag, 0, 0, 0, 0, "Ghost frames on either side of frame");
-				uiDefButS(block, NUMSLI, B_REDR, "GStep:",	*xco+160, *yco-46, 140, 20, &gpl->gstep, 0, 120, 0, 0, "Max number of frames on either side of active frame to show (0 = just 'first' available sketch on either side)");
-			uiBlockEndAlign(block);
-			
-			/* options */
-			uiBlockBeginAlign(block);
-				if (curarea->spacetype == SPACE_VIEW3D) {
-					but= uiDefBut(block, BUT, B_REDR, "Convert to...", *xco+160, *yco-75, 140, 20, NULL, 0, 0, 0, 0, "Converts this layer's strokes to geometry (Hotkey = Alt-Shift-C)");
-					uiButSetFunc(but, gp_ui_convertlayer_cb, gpd, gpl);
-				}
-				else {
-					but= uiDefBut(block, BUT, B_REDR, "Del Active Frame", *xco+160, *yco-75, 140, 20, NULL, 0, 0, 0, 0, "Erases the the active frame for this layer (Hotkey = Alt-XKEY/DEL)");
-					uiButSetFunc(but, gp_ui_delframe_cb, gpd, gpl);
-				}
-				
-				but= uiDefBut(block, BUT, B_REDR, "Del Last Stroke", *xco+160, *yco-95, 140, 20, NULL, 0, 0, 0, 0, "Erases the last stroke from the active frame (Hotkey = Alt-XKEY/DEL)");
-				uiButSetFunc(but, gp_ui_delstroke_cb, gpd, gpl);
-			uiBlockEndAlign(block);
-		}
+		/* onion-skinning */
+		subcol= uiLayoutColumn(col, 1);
+			uiItemR(subcol, "Onion Skinning", 0, &ptr, "use_onion_skinning", 0);
+			uiItemR(subcol, "GStep", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep)
+		
+		/* additional options... */
+		// None at the moment...
 	}
-	
-	/* adjust height for new to start */
-	(*yco) -= (height + 27); 
 } 
-#endif
-/* Draw the contents for a grease-pencil panel. This assumes several things:
- * 	- that panel has been created, is 318 x 204. max yco is 225
- *	- that a toggle for turning on/off gpencil drawing is 150 x 20, starting from (10,225)
- *		which is basically the top left-hand corner
- * It will return the amount of extra space to extend the panel by
- */
-short draw_gpencil_panel (uiBlock *block, bGPdata *gpd, ScrArea *sa)
+
+/* Draw the contents for a grease-pencil panel*/
+static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, PointerRNA *ctx_ptr)
 {
-#if 0
-	uiBut *but;
 	bGPDlayer *gpl;
-	short xco= 10, yco= 170;
+	uiLayout *col;
 	
-	/* draw gpd settings first */
-	{
-		/* add new layer buttons */
-		but= uiDefBut(block, BUT, B_REDR, "Add New Layer", 10,205,150,20, 0, 0, 0, 0, 0, "Adds a new Grease Pencil Layer");
-		uiButSetFunc(but, gp_ui_addlayer_cb, gpd, NULL);
+	/* draw gpd settings first ------------------------------------- */
+	col= uiLayoutColumn(layout, 1);
+		/* current Grease Pencil block */
+		// TODO: show some info about who owns this?
+			// XXX: this template doesn't show up!
+		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_new", "GPENCIL_OT_data_unlink");
 		
-		
-		/* show override lmb-clicks button + painting lock */
-		uiBlockBeginAlign(block);
-			if ((gpd->flag & GP_DATA_EDITPAINT)==0) {
-				uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 130, 20, &gpd->flag, 0, 0, 0, 0, "Interpret click-drag as new strokes");
-				
-				uiBlockSetCol(block, TH_BUT_SETTING);
-					uiDefIconButBitI(block, ICONTOG, GP_DATA_LMBPLOCK, B_REDR, ICON_UNLOCKED,	300, 225, 20, 20, &gpd->flag, 0.0, 0.0, 0, 0, "Painting cannot occur with Shift-LMB (when making selections)");
-				uiBlockSetCol(block, TH_AUTO);
-			}
-			else
-				uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 150, 20, &gpd->flag, 0, 0, 0, 0, "Interpret click-drag as new strokes");
-		uiBlockEndAlign(block);
-		
-		/* 'view align' button (naming depends on context) */
-		if (sa->spacetype == SPACE_VIEW3D)
-			uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Sketch in 3D", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added in 3D-space");
-		else
-			uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Stick to View", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added on 2d-canvas");
-	}
+		/* add new layer button */
+		uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add");
 	
-	/* draw for each layer */
-	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
-		gp_drawui_layer(block, gpd, gpl, &xco, &yco);
-	}
-	
-	/* return new height if necessary */
-	return (yco < 0) ? (204 - yco) : 204;
+	/* 'view align' button (naming depends on context) */
+#if 0 // XXX for now, this is enabled by default anyways
+	if (sa->spacetype == SPACE_VIEW3D)
+		uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Sketch in 3D", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added in 3D-space");
+	else
+		uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Stick to View", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added on 2d-canvas");
 #endif
-	return 0;
+	
+	/* draw each layer --------------------------------------------- */
+	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+		col= uiLayoutColumn(layout, 1);
+			gp_drawui_layer(col, gpd, gpl);
+	}
 }	
 
+
+/* Standard panel to be included whereever Grease Pencil is used... */
+void gpencil_panel_standard(const bContext *C, Panel *pa)
+{
+	bGPdata **gpd_ptr = NULL;
+	PointerRNA ptr;
+	
+	//if (v3d->flag2 & V3D_DISPGP)... etc.
+	
+	/* get pointer to Grease Pencil Data */
+	gpd_ptr= gpencil_data_get_pointers((bContext *)C, &ptr);
+	
+	if (gpd_ptr && *gpd_ptr)
+		draw_gpencil_panel((bContext *)C, pa->layout, *gpd_ptr, &ptr);
+}
+
 /* ************************************************** */
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 3130e190ce2..2faf3ccbbda 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -60,6 +60,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
+#include "BKE_report.h"
 #include "BKE_utildefines.h"
 
 #include "BIF_gl.h"
@@ -123,6 +124,9 @@ bGPdata **gpencil_data_get_pointers (bContext *C, PointerRNA *ptr)
 				/* return the GP data for the active strips/image/etc. */
 			}
 				break;
+				
+			default: /* unsupported space */
+				return NULL;
 		}
 	}
 	
@@ -141,6 +145,128 @@ bGPdata *gpencil_data_get_active (bContext *C)
 /* ************************************************ */
 /* Panel Operators */
 
+/* poll callback for adding data/layers - special */
+static int gp_add_poll (bContext *C)
+{
+	/* the base line we have is that we have somewhere to add Grease Pencil data */
+	return gpencil_data_get_pointers(C, NULL) != NULL;
+}
 
+/* ******************* Add New Data ************************ */
+
+/* add new datablock - wrapper around API */
+static int gp_data_add_exec (bContext *C, wmOperator *op)
+{
+	bGPdata **gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	
+	if (gpd_ptr == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Nowhere for Grease Pencil data to go");
+		return OPERATOR_CANCELLED;
+	}
+	else {
+		/* just add new datablock now */
+		*gpd_ptr= gpencil_data_addnew("GPencil");
+	}
+	
+	/* notifiers */
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_data_add (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Grease Pencil Add New";
+	ot->idname= "GPENCIL_OT_data_add";
+	ot->description= "Add new Grease Pencil datablock.";
+	
+	/* callbacks */
+	ot->exec= gp_data_add_exec;
+	ot->poll= gp_add_poll;
+}
+
+/* ******************* Unlink Data ************************ */
+
+/* poll callback for adding data/layers - special */
+static int gp_data_unlink_poll (bContext *C)
+{
+	bGPdata **gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	
+	/* if we have access to some active data, make sure there's a datablock before enabling this */
+	return (gpd_ptr && *gpd_ptr);
+}
+
+
+/* unlink datablock - wrapper around API */
+static int gp_data_unlink_exec (bContext *C, wmOperator *op)
+{
+	bGPdata **gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	
+	if (gpd_ptr == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Nowhere for Grease Pencil data to go");
+		return OPERATOR_CANCELLED;
+	}
+	else {
+		/* just unlink datablock now, decreasing its user count */
+		bGPdata *gpd= (*gpd_ptr);
+		
+		gpd->id.us--;
+		*gpd_ptr= NULL;
+	}
+	
+	/* notifiers */
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_data_unlink (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Grease Pencil Unlink";
+	ot->idname= "GPENCIL_OT_data_unlink";
+	ot->description= "Unlink active Grease Pencil datablock.";
+	
+	/* callbacks */
+	ot->exec= gp_data_unlink_exec;
+	ot->poll= gp_data_unlink_poll;
+}
+
+/* ******************* Add New Layer ************************ */
+
+/* add new layer - wrapper around API */
+static int gp_layer_add_exec (bContext *C, wmOperator *op)
+{
+	bGPdata **gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	
+	/* if there's no existing Grease-Pencil data there, add some */
+	if (gpd_ptr == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Nowhere for Grease Pencil data to go");
+		return OPERATOR_CANCELLED;
+	}
+	if (*gpd_ptr == NULL)
+		*gpd_ptr= gpencil_data_addnew("GPencil");
+		
+	/* add new layer now */
+	gpencil_layer_addnew(*gpd_ptr);
+	
+	/* notifiers */
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_layer_add (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add New Layer";
+	ot->idname= "GPENCIL_OT_layer_add";
+	ot->description= "Add new Grease Pencil layer for the active Grease Pencil datablock.";
+	
+	/* callbacks */
+	ot->exec= gp_layer_add_exec;
+	ot->poll= gp_add_poll;
+}
 
 /* ************************************************ */
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index b134328c8a0..cc98d491f7a 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -40,6 +40,13 @@ struct wmOperatorType;
 
 void GPENCIL_OT_draw(struct wmOperatorType *ot);
 
+/* buttons editing --- */
+
+void GPENCIL_OT_data_add(struct wmOperatorType *ot);
+void GPENCIL_OT_data_unlink(struct wmOperatorType *ot);
+
+void GPENCIL_OT_layer_add(struct wmOperatorType *ot);
+
 
 /******************************************************* */
 /* FILTERED ACTION DATA - TYPES  ---> XXX DEPRECEATED OLD ANIM SYSTEM CODE! */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 347a611ee30..364b27b61b0 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -66,10 +66,16 @@ void gpencil_common_keymap(wmWindowManager *wm, ListBase *keymap)
 void ED_operatortypes_gpencil (void)
 {
 	/* Drawing ----------------------- */
+	
 	WM_operatortype_append(GPENCIL_OT_draw);
 	
 	/* Editing (Buttons) ------------ */
 	
+	WM_operatortype_append(GPENCIL_OT_data_add);
+	WM_operatortype_append(GPENCIL_OT_data_unlink);
+	
+	WM_operatortype_append(GPENCIL_OT_layer_add);
+	
 	/* Editing (Time) --------------- */
 }
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 445d9ae346d..82dc76a2152 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -919,7 +919,7 @@ static void gp_paint_initstroke (tGPsdata *p, short paintmode)
 				View3D *v3d= (View3D *)p->sa->spacedata.first;
 				RegionView3D *rv3d= p->ar->regiondata;
 				
-				// TODO: this should only happen for scene... otherwise use object center!
+				// TODO: this should only happen for scene... otherwise apply correction for object center!
 				float *fp= give_cursor(p->scene, v3d);
 				initgrabz(rv3d, fp[0], fp[1], fp[2]);
 				
@@ -1231,6 +1231,9 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op)
 	/* cleanup */
 	gpencil_draw_exit(C, op);
 	
+	/* refreshes */
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	
 	/* done */
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 25e622d8551..ba60211ef3f 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -39,8 +39,7 @@ struct bGPdata;
 struct bGPDlayer;
 struct bGPDframe;
 struct PointerRNA;
-struct uiLayout;
-struct uiBlock;
+struct Panel;
 struct ImBuf;
 struct wmWindowManager;
 
@@ -75,5 +74,7 @@ void draw_gpencil_2dview(struct bContext *C, short onlyv2d);
 void draw_gpencil_3dview(struct bContext *C, short only3d);
 void draw_gpencil_oglrender(struct bContext *C);
 
+void gpencil_panel_standard(const struct bContext *C, struct Panel *pa);
+
 
 #endif /*  ED_GPENCIL_H */
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 9b05f5b25b2..2fbe7e5db79 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -36,6 +36,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_camera_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_meta_types.h"
@@ -81,6 +82,7 @@
 #include "ED_armature.h"
 #include "ED_curve.h"
 #include "ED_image.h"
+#include "ED_gpencil.h"
 #include "ED_keyframing.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
@@ -1199,33 +1201,6 @@ static void view3d_panel_preview(bContext *C, ARegion *ar, short cntrl)	// VIEW3
 }
 #endif
 
-#if 0
-static void view3d_panel_gpencil(const bContext *C, Panel *pa)
-{
-	View3D *v3d= CTX_wm_view3d(C);
-	uiBlock *block;
-
-	block= uiLayoutFreeBlock(pa->layout);
-
-	/* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
-	if (v3d->flag2 & V3D_DISPGP) {
-//		if (v3d->gpd == NULL)
-// XXX			gpencil_data_setactive(ar, gpencil_data_addnew());
-	}
-	
-	if (v3d->flag2 & V3D_DISPGP) {
-// XXX		bGPdata *gpd= v3d->gpd;
-		
-		/* draw button for showing gpencil settings and drawings */
-		uiDefButBitS(block, TOG, V3D_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &v3d->flag2, 0, 0, 0, 0, "Display freehand annotations overlay over this 3D View (draw using Shift-LMB)");
-	}
-	else {
-		uiDefButBitS(block, TOG, V3D_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &v3d->flag2, 0, 0, 0, 0, "Display freehand annotations overlay over this 3D View");
-		uiDefBut(block, LABEL, 1, " ",	160, 180, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
-	}
-}
-#endif
-
 static void delete_sketch_armature(bContext *C, void *arg1, void *arg2)
 {
 	BIF_deleteSketch(C);
@@ -1416,6 +1391,12 @@ void view3d_buttons_register(ARegionType *art)
 	strcpy(pt->label, "Transform");
 	pt->draw= view3d_panel_object;
 	BLI_addtail(&art->paneltypes, pt);
+	
+	pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel gpencil");
+	strcpy(pt->idname, "VIEW3D_PT_gpencil");
+	strcpy(pt->label, "Grease Pencil");
+	pt->draw= gpencil_panel_standard;
+	BLI_addtail(&art->paneltypes, pt);
 /*
 	pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel properties");
 	strcpy(pt->idname, "VIEW3D_PT_properties");

From e055bb7f7d35d36be7083c637fb90d1ef9f10fd7 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 29 Aug 2009 07:44:21 +0000
Subject: [PATCH 325/577] ui layout tweaks

---
 release/ui/buttons_data_armature.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 3a1de0d5f0b..f207b556a6d 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -40,6 +40,12 @@ class DATA_PT_skeleton(DataButtonsPanel):
 
 		split = layout.split()
 
+		col = split.column()
+		col.itemL(text="Layers:")
+		col.template_layers(arm, "layer")
+		col.itemL(text="Protected Layers:")
+		col.template_layers(arm, "layer_protection")
+		
 		col = split.column()
 		col.itemR(arm, "rest_position")
 		col.itemL(text="Deform:")
@@ -49,13 +55,7 @@ class DATA_PT_skeleton(DataButtonsPanel):
 		col.itemR(arm, "deform_bbone_rest", text="B-Bones Rest")
 		#col.itemR(arm, "x_axis_mirror")
 		#col.itemR(arm, "auto_ik")
-			
-		col = split.column()
-		col.itemL(text="Layers:")
-		col.template_layers(arm, "layer")
-		col.itemL(text="Protected Layers:")
-		col.template_layers(arm, "layer_protection")
-
+		
 class DATA_PT_display(DataButtonsPanel):
 	__label__ = "Display"
 	
@@ -154,7 +154,7 @@ class DATA_PT_ghost(DataButtonsPanel):
 		split = layout.split()
 
 		col = split.column()
-		col.itemR(arm, "ghost_type", text="Scope")
+		col.itemR(arm, "ghost_type", text="")
 
 		sub = col.column(align=True)
 		if arm.ghost_type == 'RANGE':

From a9947b33b23a3b0d53ad0451c35996daec14b8ae Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 29 Aug 2009 10:34:31 +0000
Subject: [PATCH 326/577] minor tweaks

---
 release/ui/buttons_physics_fluid.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py
index 1d0a64c517a..5af63bdc3ba 100644
--- a/release/ui/buttons_physics_fluid.py
+++ b/release/ui/buttons_physics_fluid.py
@@ -46,7 +46,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel):
 			layout.itemR(fluid, "type")
 
 			if fluid.type == 'DOMAIN':
-				layout.itemO("fluid.bake", text="BAKE")
+				layout.itemO("fluid.bake", text="Bake Fluid Simulation", icon='ICON_MOD_FLUIDSIM')
 				split = layout.split()
 				
 				col = split.column()

From 3080a6273325bdfcde3d1898334e3749aa2f9b2d Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 29 Aug 2009 11:48:38 +0000
Subject: [PATCH 327/577] Grease Pencil UI - Small fixes for the toggles (icons
 working correctly now)

---
 source/blender/editors/gpencil/gpencil_buttons.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index b572cd6916a..954f6c7e61e 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -76,7 +76,6 @@
 /* ------- Callbacks ----------- */
 /* These are just 'dummy wrappers' around gpencil api calls */
 
-
 /* make layer active one after being clicked on */
 void gp_ui_activelayer_cb (bContext *C, void *gpd, void *gpl)
 {
@@ -106,6 +105,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 	uiBlock *block;
 	uiBut *but;
 	PointerRNA ptr;
+	int icon;
 	
 	/* make pointer to layer data */
 	RNA_pointer_create((ID *)gpd, &RNA_GPencilLayer, gpl, &ptr);
@@ -128,10 +128,12 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 	uiLayoutSetAlignment(subrow, UI_LAYOUT_ALIGN_LEFT);
 	
 	/* active */
-	uiItemR(subrow, "", ICON_RADIOBUT_OFF, &ptr, "active", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
+	icon= (gpl->flag & GP_LAYER_ACTIVE) ? ICON_RADIOBUT_ON : ICON_RADIOBUT_OFF;
+	uiItemR(subrow, "", icon, &ptr, "active", 0);
 	
 	/* locked */
-	uiItemR(subrow, "", ICON_UNLOCKED, &ptr, "locked", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
+	icon= (gpl->flag & GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED;
+	uiItemR(subrow, "", icon, &ptr, "locked", 0);
 	
 	/* when layer is locked or hidden, only draw header */
 	if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) {
@@ -139,7 +141,8 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		
 		/* visibility button (only if hidden but not locked!) */
 		if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
-			uiItemR(subrow, "", ICON_RESTRICT_VIEW_OFF, &ptr, "hide", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
+			uiItemR(subrow, "", ICON_RESTRICT_VIEW_ON, &ptr, "hide", 0); 
+			
 		
 		/* name */
 		if (gpl->flag & GP_LAYER_HIDE)
@@ -163,7 +166,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 	else {
 		/* draw rest of header -------------------------------- */
 		/* visibility button */
-		uiItemR(subrow, "", ICON_RESTRICT_VIEW_OFF, &ptr, "hide", UI_ITEM_R_TOGGLE); // XXX we need to set it to toggle to get icon
+		uiItemR(subrow, "", ICON_RESTRICT_VIEW_OFF, &ptr, "hide", 0); 
 		
 		uiBlockSetEmboss(block, UI_EMBOSS);
 		
@@ -227,10 +230,9 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
 	uiLayout *col;
 	
 	/* draw gpd settings first ------------------------------------- */
-	col= uiLayoutColumn(layout, 1);
+	col= uiLayoutColumn(layout, 0);
 		/* current Grease Pencil block */
 		// TODO: show some info about who owns this?
-			// XXX: this template doesn't show up!
 		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_new", "GPENCIL_OT_data_unlink");
 		
 		/* add new layer button */

From c03004f93eb94d4af10acaf0b7e8ca7adb097dd0 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sat, 29 Aug 2009 14:53:00 +0000
Subject: [PATCH 328/577] 2.5: Added some sound actuator UI to reveal its real
 power, check it out! :)

---
 source/blender/editors/sound/sound_ops.c        |  6 ++++++
 .../blender/editors/space_logic/logic_window.c  | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 75204207284..303ca0eaefd 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -43,6 +43,7 @@
 #include "BKE_report.h"
 #include "BKE_packedFile.h"
 #include "BKE_sound.h"
+#include "BKE_utildefines.h"
 
 #include "BLI_blenlib.h"
 
@@ -86,6 +87,10 @@ static int open_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
+	if (RNA_boolean_get(op->ptr, "cache")) {
+		sound_cache(sound, 0);
+	}
+
 	return OPERATOR_FINISHED;
 }
 
@@ -110,6 +115,7 @@ void SOUND_OT_open(wmOperatorType *ot)
 
 	/* properties */
 	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE);
+	RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory.");
 }
 
 /* ******************************************************* */
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index 06bd95f060f..d4475527058 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -1990,7 +1990,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			sa->sndnr = 0;
 			
 			if(sa->flag & ACT_SND_3D_SOUND)
-				ysize = 114;
+				ysize = 180;
 			else
 				ysize = 92;
 
@@ -2003,24 +2003,31 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 				/* reset this value, it is for handling the event */
 				sa->sndnr = 0;
 				uiDefButS(block, MENU, B_SOUNDACT_BROWSE, str, xco+10,yco-22,20,19, &(sa->sndnr), 0, 0, 0, 0, "");	
+				uiDefButO(block, BUT, "sound.open", 0, "Load Sound", xco+wval+10, yco-22, wval, 19, "Load a sound file. Remember to set caching on for small sounds that are played often.");
 
 				if(sa->sound) {
 					char dummy_str[] = "Sound mode %t|Play Stop %x0|Play End %x1|Loop Stop %x2|Loop End %x3|Loop Ping Pong Stop %x5|Loop Ping Pong %x4";
-					uiDefBut(block, TEX, B_IDNAME, "SO:",xco+30,yco-22,width-40,19, sa->sound->id.name+2,    0.0, 21.0, 0, 0, "");
+					uiDefBut(block, TEX, B_IDNAME, "SO:",xco+30,yco-22,wval-20,19, sa->sound->id.name+2,    0.0, 21.0, 0, 0, "");
 					uiDefButS(block, MENU, 1, dummy_str,xco+10,yco-44,width-20, 19, &sa->type, 0.0, 0.0, 0, 0, "");
 					uiDefButF(block, NUM, 0, "Volume:", xco+10,yco-66,wval, 19, &sa->volume, 0.0,  1.0, 0, 0, "Sets the volume of this sound");
 					uiDefButF(block, NUM, 0, "Pitch:",xco+wval+10,yco-66,wval, 19, &sa->pitch,-12.0, 12.0, 0, 0, "Sets the pitch of this sound");
 					uiDefButS(block, TOG | BIT, 0, "3D Sound", xco+10, yco-88, width-20, 19, &sa->flag, 0.0, 1.0, 0.0, 0.0, "Plays the sound positioned in 3D space.");
 					if(sa->flag & ACT_SND_3D_SOUND)
 					{
-						uiDefButF(block, NUM, 0, "Rolloff: ", xco+10, yco-110, wval, 19, &sa->sound3D.rolloff_factor, 0.0, 5.0, 0.0, 0.0, "The rolloff factor defines the influence factor on volume depending on distance.");
-						uiDefButF(block, NUM, 0, "Reference distance: ", xco+wval+10, yco-110, wval, 19, &sa->sound3D.reference_distance, 0.0, 1000.0, 0.0, 0.0, "The reference distance is the distance where the sound has a gain of 1.0.");
+						uiDefButF(block, NUM, 0, "Minimum Gain: ", xco+10, yco-110, wval, 19, &sa->sound3D.min_gain, 0.0, 1.0, 0.0, 0.0, "The minimum gain of the sound, no matter how far it is away.");
+						uiDefButF(block, NUM, 0, "Maximum Gain: ", xco+10, yco-132, wval, 19, &sa->sound3D.max_gain, 0.0, 1.0, 0.0, 0.0, "The maximum gain of the sound, no matter how near it is..");
+						uiDefButF(block, NUM, 0, "Reference Distance: ", xco+10, yco-154, wval, 19, &sa->sound3D.reference_distance, 0.0, 1000.0, 0.0, 0.0, "The reference distance is the distance where the sound has a gain of 1.0.");
+						uiDefButF(block, NUM, 0, "Maximum Distance: ", xco+10, yco-176, wval, 19, &sa->sound3D.max_distance, 0.0, 1000.0, 0.0, 0.0, "The maximum distance at which you can hear the sound.");
+						uiDefButF(block, NUM, 0, "Rolloff: ", xco+wval+10, yco-110, wval, 19, &sa->sound3D.rolloff_factor, 0.0, 5.0, 0.0, 0.0, "The rolloff factor defines the influence factor on volume depending on distance.");
+						uiDefButF(block, NUM, 0, "Cone Outer Gain: ", xco+wval+10, yco-132, wval, 19, &sa->sound3D.cone_outer_gain, 0.0, 1.0, 0.0, 0.0, "The gain outside the outer cone. The gain in the outer cone will be interpolated between this value und the normal gain in the inner cone.");
+						uiDefButF(block, NUM, 0, "Cone Outer Angle: ", xco+wval+10, yco-154, wval, 19, &sa->sound3D.cone_outer_angle, 0.0, 360.0, 0.0, 0.0, "The angle of the outer cone.");
+						uiDefButF(block, NUM, 0, "Cone Inner Angle: ", xco+wval+10, yco-176, wval, 19, &sa->sound3D.cone_inner_angle, 0.0, 360.0, 0.0, 0.0, "The angle of the inner cone.");
 					}
 				}
 				MEM_freeN(str);
 			} 
 			else {
-				uiDefBut(block, LABEL, 0, "Use Sound window (F10) to load samples", xco, yco-24, width, 19, NULL, 0, 0, 0, 0, "");
+				uiDefButO(block, BUT, "sound.open", 0, "Load Sound", xco+10, yco-22, width-20, 19, "Load a sound file.");
 			}
 					
 			yco-= ysize;

From 874d38eeb401a75f849cc36c7d7b911129c3aa75 Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Sat, 29 Aug 2009 15:20:36 +0000
Subject: [PATCH 329/577] Point cache editing: - Baked point caches for
 particles, cloth and softbody can now be edited in particle mode. 	* This
 overwrites the old cloth/sb cache editmode editing. 	* The type of editable
 system is chosen from a menu. 	* For particles the current particle system
 and it's current cache are used. - Currently this only works for caches that
 are in memory, but some automatic conversion from disk to memory and back can
 be implemented later. - All tools from hair editing can't be applied to point
 caches and are hidden in the tool panel and specials menu. Some functionality
 like subdividing paths can be later implemented in a slightly different way
 from how it works for hair. - Code is not yet optimized for speed, so editing
 might be slow sometimes.

Known issues:
- Cloth doesn't update properly while in particle mode, due to the way cloth modifier currently works. Daniel can you check on this?
- As "particle mode" is not only for particles any more some other name would be in place?
- Better icons are needed for the path, point, and tip-modes as the current icons from mesh edit mode are quite misleading.
- Direct editing of point velocities is not yet implemented, but will be in the future.

Other changes:
- Hair editing doesn't require a "make editable" button press any more.
- Multiple caches in single particle system disables changing emission properties.
- Unified ui code for all point cache panels.
	* Defined in buttons_particle.py and imported for cloth, smoke & softbody.
- Proper disabling of properties in ui after baking point caches. (Daniel could you please make needed disable code for smoke panels as their functionality is not familiar to me.)
- Hair weight brush has been removed. Once hair dynamics is re-implemented I'll code a more useable alternative to the functionality.

Bug fixes:
- Unlinking particle settings crashed.
- Deleting the active object with particles in the scene crashed.
- Softbody didn't write point caches correctly on save.
---
 release/ui/buttons_particle.py                |  157 +-
 release/ui/buttons_physics_cloth.py           |   64 +-
 release/ui/buttons_physics_smoke.py           |   46 +-
 release/ui/buttons_physics_softbody.py        |   64 +-
 release/ui/space_view3d_toolbar.py            |   83 +-
 source/blender/blenkernel/BKE_particle.h      |   50 +-
 source/blender/blenkernel/BKE_pointcache.h    |   78 +-
 source/blender/blenkernel/intern/cloth.c      |    2 +-
 source/blender/blenkernel/intern/particle.c   |  428 ++--
 .../blenkernel/intern/particle_system.c       |   49 +-
 source/blender/blenkernel/intern/pointcache.c |   63 +-
 source/blender/blenkernel/intern/scene.c      |    4 +-
 source/blender/blenloader/intern/readfile.c   |    6 +-
 source/blender/blenloader/intern/writefile.c  |    2 +-
 source/blender/editors/include/ED_particle.h  |   10 +-
 source/blender/editors/mesh/editmesh.c        |  156 +-
 .../blender/editors/physics/ed_pointcache.c   |   13 +-
 source/blender/editors/physics/editparticle.c | 2172 +++++++++--------
 .../blender/editors/space_outliner/outliner.c |    2 -
 .../blender/editors/space_view3d/drawobject.c |  197 +-
 .../editors/space_view3d/view3d_header.c      |    6 +-
 .../editors/transform/transform_conversions.c |   96 +-
 .../editors/transform/transform_manipulator.c |   18 +-
 source/blender/makesdna/DNA_object_force.h    |    9 +-
 source/blender/makesdna/DNA_particle_types.h  |   12 +-
 source/blender/makesdna/DNA_scene_types.h     |   26 +-
 source/blender/makesrna/intern/rna_particle.c |   62 +-
 .../makesrna/intern/rna_sculpt_paint.c        |  158 +-
 28 files changed, 2076 insertions(+), 1957 deletions(-)

diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index 0454f2a4023..0b18b7c2072 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -2,13 +2,79 @@
 import bpy
 
 def particle_panel_enabled(psys):
-	return psys.point_cache.baked==False and psys.editable==False
+	return psys.point_cache.baked==False and psys.edited==False
 	
 def particle_panel_poll(context):
 	psys = context.particle_system
 	if psys==None:	return False
 	if psys.settings==None:  return False
 	return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
+	
+def point_cache_ui(self, cache, enabled, particles, smoke):
+	layout = self.layout
+	layout.set_context_pointer("PointCache", cache)
+	
+	row = layout.row()
+	row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2 )
+	col = row.column(align=True)
+	col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+	col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
+	
+	row = layout.row()
+	row.itemL(text="File Name:")
+	if particles:
+		row.itemR(cache, "external")
+	
+	if cache.external:
+		split = layout.split(percentage=0.80)
+		split.itemR(cache, "name", text="")
+		split.itemR(cache, "index", text="")
+		
+		layout.itemL(text="File Path:")
+		layout.itemR(cache, "filepath", text="")
+		
+		layout.itemL(text=cache.info)
+	else:
+		layout.itemR(cache, "name", text="")
+		
+		if not particles:
+			row = layout.row()
+			row.enabled = enabled
+			row.itemR(cache, "start_frame")
+			row.itemR(cache, "end_frame")
+		
+		row = layout.row()
+	
+		if cache.baked == True:
+			row.itemO("ptcache.free_bake", text="Free Bake")
+		else:
+			row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
+	
+		sub = row.row()
+		sub.enabled = (cache.frames_skipped or cache.outdated) and enabled
+		sub.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
+		
+		row = layout.row()
+		row.enabled = enabled
+		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
+		row.itemR(cache, "step");
+	
+		if not smoke:
+			row = layout.row()
+			sub = row.row()
+			sub.enabled = enabled
+			sub.itemR(cache, "quick_cache")
+			row.itemR(cache, "disk_cache")
+	
+		layout.itemL(text=cache.info)
+		
+		layout.itemS()
+		
+		row = layout.row()
+		row.item_booleanO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
+		row.itemO("ptcache.free_bake_all", text="Free All Bakes")
+		layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
+	
 
 class ParticleButtonsPanel(bpy.types.Panel):
 	__space_type__ = 'PROPERTIES'
@@ -38,7 +104,16 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
 			col.itemO("object.particle_system_add", icon='ICON_ZOOMIN', text="")
 			col.itemO("object.particle_system_remove", icon='ICON_ZOOMOUT', text="")
 
-		if psys:
+		if psys and not psys.settings:
+			split = layout.split(percentage=0.32)
+			col = split.column()
+			col.itemL(text="Name:")
+			col.itemL(text="Settings:")
+			
+			col = split.column()
+			col.itemR(psys, "name", text="")
+			col.template_ID(psys, "settings", new="particle.new")
+		elif psys:
 			part = psys.settings
 			
 			split = layout.split(percentage=0.32)
@@ -69,10 +144,10 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
 				
 				split = layout.split(percentage=0.65)
 				if part.type=='HAIR':
-					if psys.editable==True:
-						split.itemO("particle.editable_set", text="Free Edit")
+					if psys.edited==True:
+						split.itemO("particle.edited_clear", text="Free Edit")
 					else:
-						split.itemO("particle.editable_set", text="Make Editable")
+						split.itemL(text="")
 					row = split.row()
 					row.enabled = particle_panel_enabled(psys)
 					row.itemR(part, "hair_step")
@@ -96,7 +171,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel):
 		psys = context.particle_system
 		part = psys.settings
 		
-		layout.enabled = particle_panel_enabled(psys)
+		layout.enabled = particle_panel_enabled(psys) and not psys.multiple_caches
 		
 		row = layout.row()
 		row.itemR(part, "amount")
@@ -149,76 +224,8 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
 		layout = self.layout
 
 		psys = context.particle_system
-		part = psys.settings
-		cache = psys.point_cache
-		layout.set_context_pointer("PointCache", cache)
 		
-		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2 )
-		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-		
-		row = layout.row()
-		row.itemL(text="File Name:")
-		row.itemR(cache, "external")
-		
-		if cache.external:
-			split = layout.split(percentage=0.80)
-			split.itemR(cache, "name", text="")
-			split.itemR(cache, "index", text="")
-			
-			layout.itemL(text="File Path:")
-			layout.itemR(cache, "filepath", text="")
-			
-			layout.itemL(text=cache.info)
-			
-			#split = layout.split()
-			
-			#col = split.column(align=True)
-			#col.itemR(part, "start")
-			#col.itemR(part, "end")
-
-			#col = split.column(align=True)
-			#col.itemR(part, "lifetime")
-			#col.itemR(part, "random_lifetime", slider=True)
-		else:
-			layout.itemR(cache, "name", text="")
-			
-			row = layout.row()
-		
-			if cache.baked == True:
-				row.itemO("ptcache.free_bake", text="Free Bake")
-			else:
-				row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-		
-			subrow = row.row()
-			subrow.enabled = (cache.frames_skipped or cache.outdated) and particle_panel_enabled(psys)
-			subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
-			
-			row = layout.row()
-			row.enabled = particle_panel_enabled(psys)
-			row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-			row.itemR(cache, "step");
-		
-			row = layout.row()
-			subrow = row.row()
-			subrow.enabled = particle_panel_enabled(psys)
-			subrow.itemR(cache, "quick_cache")
-			row.itemR(cache, "disk_cache")
-		
-			layout.itemL(text=cache.info)
-			
-			layout.itemS()
-			
-			row = layout.row()
-			row.item_booleanO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-			row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-			layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
-		
-		# for particles these are figured out automatically
-		#row.itemR(cache, "start_frame")
-		#row.itemR(cache, "end_frame")
+		point_cache_ui(self, psys.point_cache, particle_panel_enabled(psys), 1, 0)
 
 class PARTICLE_PT_initial(ParticleButtonsPanel):
 	__label__ = "Velocity"
diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index 9ddf03e3d4d..9399d557a51 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -1,6 +1,11 @@
 
 import bpy
 
+from buttons_particle import point_cache_ui
+
+def cloth_panel_enabled(md):
+	return md.point_cache.baked==False
+
 class PhysicButtonsPanel(bpy.types.Panel):
 	__space_type__ = 'PROPERTIES'
 	__region_type__ = 'WINDOW'
@@ -41,6 +46,8 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel):
 
 			split = layout.split()
 			
+			split.active = cloth_panel_enabled(md)
+			
 			col = split.column()
 			col.itemL(text="Quality:")
 			col.itemR(cloth, "quality", text="Steps",slider=True)
@@ -85,53 +92,8 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
 		return (context.cloth != None)
 
 	def draw(self, context):
-		layout = self.layout
-
-		cache = context.cloth.point_cache
-		layout.set_context_pointer("PointCache", cache)
-		
-		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
-		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-		
-		row = layout.row()
-		row.itemR(cache, "name")
-		
-		row = layout.row()
-		row.itemR(cache, "start_frame")
-		row.itemR(cache, "end_frame")
-		
-		row = layout.row()
-		
-		if cache.baked == True:
-			row.itemO("ptcache.free_bake", text="Free Bake")
-		else:
-			row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-		
-		subrow = row.row()
-		subrow.enabled = cache.frames_skipped or cache.outdated
-		subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
-			
-		row = layout.row()
-		#row.enabled = particle_panel_enabled(psys)
-		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		row.itemR(cache, "step");
-	
-		row = layout.row()
-		#row.enabled = particle_panel_enabled(psys)
-		row.itemR(cache, "quick_cache")
-		row.itemR(cache, "disk_cache")
-		
-		layout.itemL(text=cache.info)
-		
-		layout.itemS()
-		
-		row = layout.row()
-		row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-		row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-		layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
+		md = context.cloth
+		point_cache_ui(self, md.point_cache, cloth_panel_enabled(md), 0, 0)
 		
 class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 	__label__ = "Cloth Collision"
@@ -143,7 +105,8 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 	def draw_header(self, context):
 		layout = self.layout
 		cloth = context.cloth.collision_settings
-	
+		
+		layout.active = cloth_panel_enabled(context.cloth)
 		layout.itemR(cloth, "enable_collision", text="")
 
 	def draw(self, context):
@@ -151,7 +114,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 		cloth = context.cloth.collision_settings
 		split = layout.split()
 		
-		layout.active = cloth.enable_collision
+		layout.active = cloth.enable_collision and cloth_panel_enabled(md)
 		
 		col = split.column()
 		col.itemR(cloth, "collision_quality", slider=True, text="Quality")
@@ -176,6 +139,7 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
 		layout = self.layout
 		cloth = context.cloth.settings
 	
+		layout.active = cloth_panel_enabled(context.cloth)
 		layout.itemR(cloth, "stiffness_scaling", text="")
 
 	def draw(self, context):
@@ -183,7 +147,7 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
 		ob = context.object
 		cloth = context.cloth.settings
 		
-		layout.active = cloth.stiffness_scaling	
+		layout.active = cloth.stiffness_scaling	and cloth_panel_enabled(md)
 		
 		split = layout.split()
 		
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index 3cfba0f9df9..d7313632638 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -1,6 +1,8 @@
 
 import bpy
 
+from buttons_particle import point_cache_ui
+
 def smoke_panel_enabled_low(smd):
 	if smd.smoke_type == 'TYPE_DOMAIN':
 		return smd.domain.point_cache.baked==False
@@ -139,48 +141,8 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 			domain = md.domain_settings
 			cache = domain.point_cache
 			
-			layout.set_context_pointer("PointCache", cache)
-			
-			row = layout.row()
-			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
-			col = row.column(align=True)
-			col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-			col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-			
-			row = layout.row()
-			row.itemR(cache, "name")
-			
-			row = layout.row()
-			row.itemR(cache, "start_frame")
-			row.itemR(cache, "end_frame")
-			
-			row = layout.row()
-			
-			if cache.baked == True:
-				row.itemO("ptcache.free_bake", text="Free Bake")
-			else:
-				row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-			
-			subrow = row.row()
-			subrow.enabled = cache.frames_skipped or cache.outdated
-			subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
-				
-			row = layout.row()
-			#row.enabled = smoke_panel_enabled(psys)
-			row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		
-			row = layout.row()
-			#row.enabled = smoke_panel_enabled(psys)
-			
-			layout.itemL(text=cache.info)
-			
-			layout.itemS()
-			
-			row = layout.row()
-			row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-			row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-			layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
-			
+			point_cache_ui(self, cache, cache.baked==False, 0, 1)
+					
 class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 	__label__ = "Smoke High Resolution"
 	__default_closed__ = True
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 2beba8c95a0..3d3c3c23faf 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -1,6 +1,11 @@
 
 import bpy
 
+from buttons_particle import point_cache_ui
+
+def softbody_panel_enabled(md):
+	return md.point_cache.baked==False
+
 class PhysicButtonsPanel(bpy.types.Panel):
 	__space_type__ = 'PROPERTIES'
 	__region_type__ = 'WINDOW'
@@ -41,6 +46,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel):
 
 			# General
 			split = layout.split()
+			split.enabled = softbody_panel_enabled(md)
 			
 			col = split.column()
 			col.itemL(text="Object:")
@@ -60,52 +66,9 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
 		return (context.soft_body)
 
 	def draw(self, context):
-		layout = self.layout
-
-		cache = context.soft_body.point_cache
-		layout.set_context_pointer("PointCache", cache)
-		
-		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
-		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-		
-		row = layout.row()
-		row.itemR(cache, "name")
-		
-		row = layout.row()
-		row.itemR(cache, "start_frame")
-		row.itemR(cache, "end_frame")
-		
-		row = layout.row()
-		
-		if cache.baked == True:
-			row.itemO("ptcache.free_bake", text="Free Bake")
-		else:
-			row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-		
-		sub = row.row()
-		sub.enabled = cache.frames_skipped or cache.outdated
-		sub.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
+		md = context.soft_body
+		point_cache_ui(self, md.point_cache, softbody_panel_enabled(md), 0, 0)
 			
-		row = layout.row()
-		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		row.itemR(cache, "step");
-	
-		row = layout.row()
-		row.itemR(cache, "quick_cache")
-		row.itemR(cache, "disk_cache")
-		
-		layout.itemL(text=cache.info)
-		
-		layout.itemS()
-		
-		row = layout.row()
-		row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-		row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-		layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
-		
 class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
 	__label__ = "Soft Body Goal"
 	
@@ -117,6 +80,7 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
 		
 		softbody = context.soft_body.settings
 	
+		layout.active = softbody_panel_enabled(context.soft_body)
 		layout.itemR(softbody, "use_goal", text="")
 		
 	def draw(self, context):
@@ -129,7 +93,7 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
 			
 		if md:
 			softbody = md.settings
-			layout.active = softbody.use_goal
+			layout.active = softbody.use_goal and softbody_panel_enabled(md)
 
 			# Goal 
 			split = layout.split()
@@ -159,6 +123,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
 		
 		softbody = context.soft_body.settings
 	
+		layout.active = softbody_panel_enabled(context.soft_body)
 		layout.itemR(softbody, "use_edges", text="")
 		
 	def draw(self, context):
@@ -170,7 +135,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
 		if md:
 			softbody = md.settings
 			
-			layout.active = softbody.use_edges
+			layout.active = softbody.use_edges and softbody_panel_enabled(md)
 			
 			split = layout.split()
 			
@@ -209,6 +174,7 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
 		
 		softbody = context.soft_body.settings
 	
+		layout.active = softbody_panel_enabled(context.soft_body)
 		layout.itemR(softbody, "self_collision", text="")
 		
 	def draw(self, context):
@@ -220,7 +186,7 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
 		if md:
 			softbody = md.settings
 
-			layout.active = softbody.self_collision
+			layout.active = softbody.self_collision and softbody_panel_enabled(md)
 			
 			layout.itemL(text="Collision Type:")
 			layout.itemR(softbody, "collision_type", expand=True)
@@ -245,6 +211,8 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel):
 		
 		if md:
 			softbody = md.settings
+			
+			layout.active = softbody_panel_enabled(md)
 
 			# Solver
 			split = layout.split()
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 0e6dc76d49d..517571e1b09 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -362,8 +362,10 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			col = layout.column(align=True)
 			col.item_enumR(settings, "tool", 'DRAW')
 			col.item_enumR(settings, "tool", 'SOFTEN')
-			col.item_enumR(settings, "tool", 'CLONE')
-			col.item_enumR(settings, "tool", 'SMEAR')
+			if settings.use_projection:
+				col.item_enumR(settings, "tool", 'CLONE')
+			else:
+				col.item_enumR(settings, "tool", 'SMEAR')
 				
 			col = layout.column()
 			col.itemR(brush, "color", text="")
@@ -426,9 +428,9 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 		if not texture_paint:
 			layout.itemR(brush, "smooth_stroke")
 			col = layout.column()
-			col.active = brush.smooth_stroke
-			col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
-			col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
+			col.itemR(brush, "airbrush")
+			col.itemR(brush, "anchored")
+			col.itemR(brush, "rake")
 
 		layout.itemR(brush, "space")
 		row = layout.row(align=True)
@@ -538,22 +540,12 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel):
 #		col.itemR(vpaint, "mul", text="")
 
 
-# ********** options for projection paint ****************
+# ********** default tools for texturepaint ****************
 
-class VIEW3D_PT_tools_projectpaint(View3DPanel):
+class VIEW3D_PT_tools_texturepaint(View3DPanel):
 	__context__ = "texturepaint"
-	__label__ = "Project Paint"
-	
-	def poll(self, context):
-		return context.tool_settings.image_paint.tool != 'SMEAR'
-	
-	def draw_header(self, context):
-		layout = self.layout
-		
-		ipaint = context.tool_settings.image_paint
+	__label__ = "Options"
 
-		layout.itemR(ipaint, "use_projection", text="")
-	
 	def draw(self, context):
 		layout = self.layout
 		
@@ -562,6 +554,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel):
 		use_projection= ipaint.use_projection
 		
 		col = layout.column()
+		col.itemR(ipaint, "use_projection")
 		sub = col.column()
 		sub.active = use_projection
 		sub.itemR(ipaint, "use_occlude")
@@ -606,22 +599,58 @@ class VIEW3D_PT_tools_particlemode(View3DPanel):
 	def draw(self, context):
 		layout = self.layout
 		pe = context.tool_settings.particle_edit
+		ob = pe.object
 
-		col = layout.column(align=True)
-		col.itemR(pe, "emitter_deflect", text="Deflect")
-		sub = col.row()
-		sub.active = pe.emitter_deflect
-		sub.itemR(pe, "emitter_distance", text="Distance")
+		row = layout.row()
+		row.itemL(text="Edit:")
+		row.itemR(pe, "type", text="")
+		
+		if pe.type == 'PARTICLES':
+			if ob.particle_systems:
+				if len(ob.particle_systems) > 1:
+					layout.template_list(ob, "particle_systems", ob, "active_particle_system_index", type='ICONS')
+				
+				ptcache = ob.particle_systems[ob.active_particle_system_index].point_cache
+		else:
+			for md in ob.modifiers:
+				if md.type==pe.type:
+					ptcache = md.point_cache
+					
+		if ptcache and len(ptcache.point_cache_list) > 1:
+			layout.template_list(ptcache, "point_cache_list", ptcache, "active_point_cache_index", type='ICONS')
+			
+		
+		if not pe.editable:
+			layout.itemL(text="Point cache must be baked")
+			layout.itemL(text="to enable editing!")
 		
 		col = layout.column(align=True)
+		if pe.hair:
+			col.active = pe.editable
+			col.itemR(pe, "emitter_deflect", text="Deflect emitter")
+			sub = col.row()
+			sub.active = pe.emitter_deflect
+			sub.itemR(pe, "emitter_distance", text="Distance")
+		
+		col = layout.column(align=True)
+		col.active = pe.editable
 		col.itemL(text="Keep:")
 		col.itemR(pe, "keep_lengths", text="Lenghts")
 		col.itemR(pe, "keep_root", text="Root")
+		if not pe.hair:
+			col.itemL(text="Correct:")
+			col.itemR(pe, "auto_velocity", text="Velocity")
 		
 		col = layout.column(align=True)
-		col.itemL(text="Display:")
-		col.itemR(pe, "show_time", text="Time")
-		col.itemR(pe, "show_children", text="Children")
+		col.active = pe.editable
+		col.itemL(text="Draw:")
+		col.itemR(pe, "draw_step", text="Path Steps")
+		if pe.type == 'PARTICLES':
+			col.itemR(pe, "draw_particles", text="Particles")
+		col.itemR(pe, "fade_time")
+		sub = col.row()
+		sub.active = pe.fade_time
+		sub.itemR(pe, "fade_frames", slider=True)
 
 bpy.types.register(VIEW3D_PT_tools_objectmode)
 bpy.types.register(VIEW3D_PT_tools_meshedit)
@@ -638,5 +667,5 @@ bpy.types.register(VIEW3D_PT_tools_brush_curve)
 bpy.types.register(VIEW3D_PT_sculpt_options)
 bpy.types.register(VIEW3D_PT_tools_vertexpaint)
 bpy.types.register(VIEW3D_PT_tools_weightpaint)
-bpy.types.register(VIEW3D_PT_tools_projectpaint)
+bpy.types.register(VIEW3D_PT_tools_texturepaint)
 bpy.types.register(VIEW3D_PT_tools_particlemode)
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index cf02efc34ac..e24114cd219 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -109,46 +109,10 @@ typedef struct ParticleCacheKey{
 	float vel[3];
 	float rot[4];
 	float col[3];
+	float time;
 	int steps;
 } ParticleCacheKey;
 
-typedef struct ParticleEditKey{
-	float *co;
-	float *vel;
-	float *rot;
-	float *time;
-
-	float world_co[3];
-	float length;
-	short flag;
-} ParticleEditKey;
-
-typedef struct ParticleUndo {
-	struct ParticleUndo *next, *prev;
-	struct ParticleEditKey **keys;
-	struct KDTree *emitter_field;
-	struct ParticleData *particles;
-	float *emitter_cosnos;
-	int totpart, totkeys;
-	char name[64];
-} ParticleUndo;
-
-typedef struct ParticleEdit {
-	ListBase undo;
-	struct ParticleUndo *curundo;
-
-	ParticleEditKey **keys;
-	int totkeys;
-
-	int *mirror_cache;
-
-	struct KDTree *emitter_field;
-	float *emitter_cosnos;
-
-	char sel_col[3];
-	char nosel_col[3];
-} ParticleEdit;
-
 typedef struct ParticleThreadContext {
 	/* shared */
 	struct Scene *scene;
@@ -240,7 +204,7 @@ int psys_check_enabled(struct Object *ob, struct ParticleSystem *psys);
 void psys_free_boid_rules(struct ListBase *list);
 void psys_free_settings(struct ParticleSettings *part);
 void free_child_path_cache(struct ParticleSystem *psys);
-void psys_free_path_cache(struct ParticleSystem *psys);
+void psys_free_path_cache(struct ParticleSystem *psys, struct PTCacheEdit *edit);
 void free_hair(struct ParticleSystem *psys, int softbody);
 void free_keyed_keys(struct ParticleSystem *psys);
 void psys_free(struct Object * ob, struct ParticleSystem * psys);
@@ -271,9 +235,9 @@ void psys_reset(struct ParticleSystem *psys, int mode);
 
 void psys_find_parents(struct Object *ob, struct ParticleSystemModifierData *psmd, struct ParticleSystem *psys);
 
-void psys_cache_paths(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys, float cfra, int editupdate);
+void psys_cache_paths(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys, float cfra);
+void psys_cache_edit_paths(struct Scene *scene, struct Object *ob, struct PTCacheEdit *edit, float cfra);
 void psys_cache_child_paths(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys, float cfra, int editupdate);
-void psys_update_world_cos(struct Object *ob, struct ParticleSystem *psys);
 int do_guide(struct Scene *scene, struct ParticleKey *state, int pa_num, float time, struct ListBase *lb);
 float psys_get_size(struct Object *ob, struct Material *ma, struct ParticleSystemModifierData *psmd, struct IpoCurve *icu_size, struct ParticleSystem *psys, struct ParticleSettings *part, struct ParticleData *pa, float *vg_size);
 float psys_get_timestep(struct ParticleSettings *part);
@@ -359,12 +323,6 @@ void reset_particle(struct Scene *scene, struct ParticleData *pa, struct Particl
 #define PSYS_EC_PARTICLE	4
 #define PSYS_EC_REACTOR		8
 
-/* ParticleEditKey->flag */
-#define PEK_SELECT		1
-#define PEK_TO_SELECT	2
-#define PEK_TAG			4
-#define PEK_HIDE		8
-
 /* index_dmcache */
 #define DMCACHE_NOTFOUND	-1
 #define DMCACHE_ISCHILD		-2
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index 531487549da..9ba34091064 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -101,6 +101,8 @@ typedef struct PTCacheFile {
 	void *cur[BPHYS_TOT_DATA];
 } PTCacheFile;
 
+#define PTCACHE_VEL_PER_SEC		1
+
 typedef struct PTCacheID {
 	struct PTCacheID *next, *prev;
 
@@ -109,6 +111,7 @@ typedef struct PTCacheID {
 	void *calldata;
 	int type;
 	int stack_index;
+	int flag;
 
 	/* flags defined in DNA_object_force.h */
 	unsigned int data_types, info_types;
@@ -151,6 +154,75 @@ typedef struct PTCacheBaker {
 	void *progresscontext;
 } PTCacheBaker;
 
+/* PTCacheEditKey->flag */
+#define PEK_SELECT		1
+#define PEK_TAG			2
+#define PEK_HIDE		4
+#define PEK_USE_WCO		8
+
+typedef struct PTCacheEditKey{
+	float *co;
+	float *vel;
+	float *rot;
+	float *time;
+
+	float world_co[3];
+	float ftime;
+	float length;
+	short flag;
+} PTCacheEditKey;
+
+/* PTCacheEditPoint->flag */
+#define PEP_TAG				1
+#define PEP_EDIT_RECALC		2
+#define PEP_TRANSFORM		4
+#define PEP_HIDE			8
+
+typedef struct PTCacheEditPoint {
+	struct PTCacheEditKey *keys;
+	int totkey;
+	short flag;
+} PTCacheEditPoint;
+
+typedef struct PTCacheUndo {
+	struct PTCacheUndo *next, *prev;
+	struct PTCacheEditPoint *points;
+
+	/* particles stuff */
+	struct ParticleData *particles;
+	struct KDTree *emitter_field;
+	float *emitter_cosnos;
+
+	/* cache stuff */
+	struct ListBase mem_cache;
+
+	int totpoint;
+	char name[64];
+} PTCacheUndo;
+
+typedef struct PTCacheEdit {
+	ListBase undo;
+	struct PTCacheUndo *curundo;
+	PTCacheEditPoint *points;
+
+	struct PTCacheID pid;
+
+	/* particles stuff */
+	struct ParticleSystem *psys;
+	struct ParticleData *particles;
+	struct KDTree *emitter_field;
+	float *emitter_cosnos;
+	int *mirror_cache;
+
+	struct ParticleCacheKey **pathcache;	/* path cache (runtime) */
+	ListBase pathcachebufs;
+
+	int totpoint, totframes, totcached, edited;
+
+	char sel_col[3];
+	char nosel_col[3];
+} PTCacheEdit;
+
 /* Particle functions */
 void BKE_ptcache_make_particle_key(struct ParticleKey *key, int index, void **data, float time);
 
@@ -179,6 +251,10 @@ void BKE_ptcache_update_info(PTCacheID *pid);
 /* Size of cache data type. */
 int		BKE_ptcache_data_size(int data_type);
 
+/* Memory cache read/write helpers. */
+void BKE_ptcache_mem_init_pointers(struct PTCacheMem *pm);
+void BKE_ptcache_mem_incr_pointers(struct PTCacheMem *pm);
+
 /* Copy a specific data type from cache data to point data. */
 void	BKE_ptcache_data_get(void **data, int type, int index, void *to);
 
@@ -197,7 +273,7 @@ int BKE_ptcache_get_continue_physics(void);
 
 /******************* Allocate & free ***************/
 struct PointCache *BKE_ptcache_add(struct ListBase *ptcaches);
-void BKE_ptache_free_mem(struct PointCache *cache);
+void BKE_ptcache_free_mem(struct ListBase *mem_cache);
 void BKE_ptcache_free(struct PointCache *cache);
 void BKE_ptcache_free_list(struct ListBase *ptcaches);
 struct PointCache *BKE_ptcache_copy_list(struct ListBase *ptcaches_new, struct ListBase *ptcaches_old);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 3acaaecb1e8..eafd9eb01fe 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -347,7 +347,7 @@ void cloth_clear_cache(Object *ob, ClothModifierData *clmd, float framenr)
 	BKE_ptcache_id_from_cloth(&pid, ob, clmd);
 
 	// don't do anything as long as we're in editmode!
-	if(pid.cache->flag & PTCACHE_BAKE_EDIT_ACTIVE)
+	if(pid.cache->edit && ob->mode & OB_MODE_PARTICLE_EDIT)
 		return;
 	
 	BKE_ptcache_id_clear(&pid, PTCACHE_CLEAR_AFTER, framenr);
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index e1987d34a6c..18e3512967a 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -321,7 +321,7 @@ int psys_ob_has_hair(Object *ob)
 }
 int psys_in_edit_mode(Scene *scene, ParticleSystem *psys)
 {
-	return ((scene->basact->object->mode & OB_MODE_PARTICLE_EDIT) && psys==psys_get_current((scene->basact)->object) && psys->edit);
+	return (scene->basact && (scene->basact->object->mode & OB_MODE_PARTICLE_EDIT) && psys==psys_get_current((scene->basact)->object) && (psys->edit || psys->pointcache->edit));
 }
 int psys_check_enabled(Object *ob, ParticleSystem *psys)
 {
@@ -406,13 +406,20 @@ void free_child_path_cache(ParticleSystem *psys)
 	psys->childcache = NULL;
 	psys->totchildcache = 0;
 }
-void psys_free_path_cache(ParticleSystem *psys)
+void psys_free_path_cache(ParticleSystem *psys, PTCacheEdit *edit)
 {
-	psys_free_path_cache_buffers(psys->pathcache, &psys->pathcachebufs);
-	psys->pathcache= NULL;
-	psys->totcached= 0;
+	if(edit) {
+		psys_free_path_cache_buffers(edit->pathcache, &edit->pathcachebufs);
+		edit->pathcache= NULL;
+		edit->totcached= 0;
+	}
+	else {
+		psys_free_path_cache_buffers(psys->pathcache, &psys->pathcachebufs);
+		psys->pathcache= NULL;
+		psys->totcached= 0;
 
-	free_child_path_cache(psys);
+		free_child_path_cache(psys);
+	}
 }
 void psys_free_children(ParticleSystem *psys)
 {
@@ -431,14 +438,14 @@ void psys_free(Object *ob, ParticleSystem * psys)
 		int nr = 0;
 		ParticleSystem * tpsys;
 		
-		psys_free_path_cache(psys);
+		psys_free_path_cache(psys, NULL);
 
 		free_hair(psys, 1);
 
 		free_keyed_keys(psys);
 
 		if(psys->edit && psys->free_edit)
-			psys->free_edit(psys);
+			psys->free_edit(psys->edit);
 
 		if(psys->particles){
 			if(psys->particles->boid)
@@ -645,7 +652,7 @@ void psys_render_restore(Object *ob, ParticleSystem *psys)
 		psmd->dm->release(psmd->dm);
 	}
 
-	psys_free_path_cache(psys);
+	psys_free_path_cache(psys, NULL);
 
 	if(psys->child){
 		MEM_freeN(psys->child);
@@ -953,17 +960,25 @@ void psys_interpolate_particle(short type, ParticleKey keys[4], float dt, Partic
 
 
 typedef struct ParticleInterpolationData {
-	ParticleKey *kkey[2];
 	HairKey *hkey[2];
-	BodyPoint *bp[2];
+
+	int keyed;
+	ParticleKey *kkey[2];
+	
 	SoftBody *soft;
-	int keyed, cached;
+	BodyPoint *bp[2];
+
+	PointCache *cache;
+
+	PTCacheEditPoint *epoint;
+	PTCacheEditKey *ekey[2];
+
 	float birthtime, dietime;
+	int bspline;
 } ParticleInterpolationData;
 /* Assumes pointcache->mem_cache exists, so for disk cached particles call psys_make_temp_pointcache() before use */
-static void get_pointcache_keys_for_time(Object *ob, ParticleSystem *psys, int index, float t, ParticleKey *key1, ParticleKey *key2)
+static void get_pointcache_keys_for_time(Object *ob, PointCache *cache, int index, float t, ParticleKey *key1, ParticleKey *key2)
 {
-	PointCache *cache = psys->pointcache;
 	static PTCacheMem *pm = NULL; /* not thread safe */
 
 	if(index < 0) { /* initialize */
@@ -990,22 +1005,27 @@ static void get_pointcache_keys_for_time(Object *ob, ParticleSystem *psys, int i
 static void init_particle_interpolation(Object *ob, ParticleSystem *psys, ParticleData *pa, ParticleInterpolationData *pind)
 {
 
-	if(pind->keyed) {
-		pind->kkey[0] = pa->keys;
+	if(pind->epoint) {
+		PTCacheEditPoint *point = pind->epoint;
 
-		if(pa->totkey > 1)
-			pind->kkey[1] = pa->keys + 1;
-		else
-			pind->kkey[1] = NULL;
+		pind->ekey[0] = point->keys;
+		pind->ekey[1] = point->totkey > 1 ? point->keys + 1 : NULL;
+
+		pind->birthtime = *(point->keys->time);
+		pind->dietime = *((point->keys + point->totkey - 1)->time);
+	}
+	else if(pind->keyed) {
+		pind->kkey[0] = pa->keys;
+		pind->kkey[1] = pa->totkey > 1 ? pa->keys + 1 : NULL;
 
 		pind->birthtime = pa->keys->time;
 		pind->dietime = (pa->keys + pa->totkey - 1)->time;
 	}
-	else if(pind->cached) {
-		get_pointcache_keys_for_time(ob, psys, -1, 0.0f, NULL, NULL);
+	else if(pind->cache) {
+		get_pointcache_keys_for_time(ob, pind->cache, -1, 0.0f, NULL, NULL);
 
-		pind->birthtime = pa->time;
-		pind->dietime = pa->dietime;
+		pind->birthtime = pa ? pa->time : pind->cache->startframe;
+		pind->dietime = pa ? pa->dietime : pind->cache->endframe;
 	}
 	else {
 		pind->hkey[0] = pa->hair;
@@ -1020,6 +1040,14 @@ static void init_particle_interpolation(Object *ob, ParticleSystem *psys, Partic
 		pind->bp[1] = pind->soft->bpoint + pa->bpi + 1;
 	}
 }
+static void edit_to_particle(ParticleKey *key, PTCacheEditKey *ekey)
+{
+	VECCOPY(key->co, ekey->co);
+	if(ekey->vel) {
+		VECCOPY(key->vel, ekey->vel);
+	}
+	key->time = *(ekey->time);
+}
 static void hair_to_particle(ParticleKey *key, HairKey *hkey)
 {
 	VECCOPY(key->co, hkey->co);
@@ -1033,11 +1061,24 @@ static void bp_to_particle(ParticleKey *key, BodyPoint *bp, HairKey *hkey)
 
 static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData *pa, float t, float frs_sec, ParticleInterpolationData *pind, ParticleKey *result)
 {
+	PTCacheEditPoint *point = pind->epoint;
 	ParticleKey keys[4];
+	int point_vel = (point && point->keys->vel);
 	float real_t, dfra, keytime;
 
 	/* interpret timing and find keys */
-	if(pind->keyed) {
+	if(point) {
+		if(result->time < 0.0f)
+			real_t = -result->time;
+		else
+			real_t = *(pind->ekey[0]->time) + t * (*(pind->ekey[0][point->totkey-1].time) - *(pind->ekey[0]->time));
+
+		while(*(pind->ekey[1]->time) < real_t)
+			pind->ekey[1]++;
+
+		pind->ekey[0] = pind->ekey[1] - 1;
+	}
+	else if(pind->keyed) {
 		/* we have only one key, so let's use that */
 		if(pind->kkey[1]==NULL) {
 			copy_particle_key(result, pind->kkey[0], 1);
@@ -1074,7 +1115,7 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 		
 		pind->kkey[0] = pind->kkey[1] - 1;
 	}
-	else if(pind->cached) {
+	else if(pind->cache) {
 		if(result->time < 0.0f) /* flag for time in frames */
 			real_t = -result->time;
 		else
@@ -1095,7 +1136,11 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 	}
 
 	/* set actual interpolation keys */
-	if(pind->soft) {
+	if(point) {
+		edit_to_particle(keys + 1, pind->ekey[0]);
+		edit_to_particle(keys + 2, pind->ekey[1]);
+	}
+	else if(pind->soft) {
 		pind->bp[0] = pind->bp[1] - 1;
 		bp_to_particle(keys + 1, pind->bp[0], pind->hkey[0]);
 		bp_to_particle(keys + 2, pind->bp[1], pind->hkey[1]);
@@ -1104,8 +1149,8 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 		memcpy(keys + 1, pind->kkey[0], sizeof(ParticleKey));
 		memcpy(keys + 2, pind->kkey[1], sizeof(ParticleKey));
 	}
-	else if(pind->cached) {
-		get_pointcache_keys_for_time(NULL, psys, p, real_t, keys+1, keys+2);
+	else if(pind->cache) {
+		get_pointcache_keys_for_time(NULL, pind->cache, p, real_t, keys+1, keys+2);
 	}
 	else {
 		hair_to_particle(keys + 1, pind->hkey[0]);
@@ -1113,8 +1158,14 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 	}
 
 	/* set secondary interpolation keys for hair */
-	if(!pind->keyed && !pind->cached) {
-		if(pind->soft) {
+	if(!pind->keyed && !pind->cache && !point_vel) {
+		if(point) {
+			if(pind->ekey[0] != point->keys)
+				edit_to_particle(keys, pind->ekey[0] - 1);
+			else
+				edit_to_particle(keys, pind->ekey[0]);
+		}
+		else if(pind->soft) {
 			if(pind->hkey[0] != pa->hair)
 				bp_to_particle(keys, pind->bp[0] - 1, pind->hkey[0] - 1);
 			else
@@ -1127,7 +1178,13 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 				hair_to_particle(keys, pind->hkey[0]);
 		}
 
-		if(pind->soft) {
+		if(point) {
+			if(pind->ekey[1] != point->keys + point->totkey - 1)
+				edit_to_particle(keys + 3, pind->ekey[1] + 1);
+			else
+				edit_to_particle(keys + 3, pind->ekey[1]);
+		}
+		else if(pind->soft) {
 			if(pind->hkey[1] != pa->hair + pa->totkey - 1)
 				bp_to_particle(keys + 3, pind->bp[1] + 1, pind->hkey[1] + 1);
 			else
@@ -1145,19 +1202,19 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 	keytime = (real_t - keys[1].time) / dfra;
 
 	/* convert velocity to timestep size */
-	if(pind->keyed || pind->cached){
+	if(pind->keyed || pind->cache || point_vel){
 		VecMulf(keys[1].vel, dfra / frs_sec);
 		VecMulf(keys[2].vel, dfra / frs_sec);
 		QuatInterpol(result->rot,keys[1].rot,keys[2].rot,keytime);
 	}
 
 	/* now we should have in chronologiacl order k1<=k2<=t<=k3<=k4 with keytime between [0,1]->[k2,k3] (k1 & k4 used for cardinal & bspline interpolation)*/
-	psys_interpolate_particle((pind->keyed || pind->cached) ? -1 /* signal for cubic interpolation */
-		: ((psys->part->flag & PART_HAIR_BSPLINE) ? KEY_BSPLINE : KEY_CARDINAL)
+	psys_interpolate_particle((pind->keyed || pind->cache || point_vel) ? -1 /* signal for cubic interpolation */
+		: (pind->bspline ? KEY_BSPLINE : KEY_CARDINAL)
 		,keys, keytime, result, 1);
 
 	/* the velocity needs to be converted back from cubic interpolation */
-	if(pind->keyed || pind->cached)
+	if(pind->keyed || pind->cache || point_vel)
 		VecMulf(result->vel, frs_sec / dfra);
 }
 /************************************************/
@@ -1610,7 +1667,7 @@ ParticleSystemModifierData *psys_get_modifier(Object *ob, ParticleSystem *psys)
 			}
 		}
 	}
-	return 0;
+	return NULL;
 }
 /************************************************/
 /*			Particles on a shape				*/
@@ -2129,7 +2186,7 @@ int psys_threads_init_path(ParticleThread *threads, Scene *scene, float cfra, in
 
 	/*---start figuring out what is actually wanted---*/
 	if(psys_in_edit_mode(scene, psys))
-		if(psys->renderdata==0 && (psys->edit==NULL || pset->flag & PE_SHOW_CHILD)==0)
+		if(psys->renderdata==0 && (psys->edit==NULL || pset->flag & PE_DRAW_PART)==0)
 			totchild=0;
 
 	if(totchild && part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES){
@@ -2245,7 +2302,7 @@ void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa,
 			needupdate= 0;
 			w= 0;
 			while(w<4 && cpa->pa[w]>=0) {
-				if(psys->particles[cpa->pa[w]].flag & PARS_EDIT_RECALC) {
+				if(psys->edit->points[cpa->pa[w]].flag & PEP_EDIT_RECALC) {
 					needupdate= 1;
 					break;
 				}
@@ -2288,7 +2345,7 @@ void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa,
 	}
 	else{
 		if(ctx->editupdate && !(part->flag & PART_BRANCHING)) {
-			if(!(psys->particles[cpa->parent].flag & PARS_EDIT_RECALC))
+			if(!(psys->edit->points[cpa->parent].flag & PEP_EDIT_RECALC))
 				return;
 
 			memset(keys, 0, sizeof(*keys)*(ctx->steps+1));
@@ -2557,24 +2614,20 @@ void psys_cache_child_paths(Scene *scene, Object *ob, ParticleSystem *psys, floa
 /* -Usefull for making use of opengl vertex arrays for super fast strand drawing.	*/
 /* -Makes child strands possible and creates them too into the cache.				*/
 /* -Cached path data is also used to determine cut position for the editmode tool.	*/
-void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra, int editupdate)
+void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra)
 {
-	ParticleCacheKey *ca, **cache=psys->pathcache;
+	ParticleCacheKey *ca, **cache= psys->pathcache;
 	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
-	ParticleEditSettings *pset = &scene->toolsettings->particle;
 	ParticleSettings *part = psys->part;
+	ParticleEditSettings *pset = &scene->toolsettings->particle;
 	
-	ParticleData *pa;
+	ParticleData *pa = psys->particles;
 	ParticleKey result;
 
-	ParticleEdit *edit = 0;
-	ParticleEditKey *ekey = 0;
-
-	SoftBody *soft = 0;
+	SoftBody *soft = NULL;
 	BodyPoint *bp[2] = {NULL, NULL};
 	
 	Material *ma;
-
 	ParticleInterpolationData pind;
 	
 	float birthtime = 0.0, dietime = 0.0;
@@ -2583,132 +2636,98 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	float prev_tangent[3], hairmat[4][4];
 	float rotmat[3][3];
 	int k,i;
-	int steps = (int)pow(2.0, (double)psys->part->draw_step);
+	int steps = (int)pow(2.0, (double)(psys->renderdata ? part->ren_step : part->draw_step));
 	int totpart = psys->totpart;
-	float sel_col[3];
-	float nosel_col[3];
 	float length, vec[3];
 	float *vg_effector= NULL, effector=0.0f;
 	float *vg_length= NULL, pa_length=1.0f;
 	int keyed, baked;
 
 	/* we don't have anything valid to create paths from so let's quit here */
-	if((psys->flag & PSYS_HAIR_DONE)==0 && (psys->flag & PSYS_KEYED)==0 && (psys->pointcache->flag & PTCACHE_BAKED)==0)
+	if(!(psys->flag & PSYS_HAIR_DONE) && !(psys->flag & PSYS_KEYED) && !(psys->pointcache->flag & PTCACHE_BAKED))
 		return;
 
+	if(psys_in_edit_mode(scene, psys))
+		if(psys->renderdata==0 && (psys->edit==NULL || pset->flag & PE_DRAW_PART)==0)
+			return;
+	
 	BLI_srandom(psys->seed);
 
 	keyed = psys->flag & PSYS_KEYED;
 	baked = psys->pointcache->flag & PTCACHE_BAKED;
 
-	if(psys->renderdata) {
-		steps = (int)pow(2.0, (double)psys->part->ren_step);
-	}
-	else if(psys_in_edit_mode(scene, psys)) {
-		edit=psys->edit;
-		
-		//timed = edit->draw_timed;
+	/* clear out old and create new empty path cache */
+	psys_free_path_cache(psys, NULL);
+	cache= psys->pathcache= psys_alloc_path_cache_buffers(&psys->pathcachebufs, totpart, steps+1);
 
-		if(pset->brushtype == PE_BRUSH_WEIGHT) {
-			sel_col[0] = sel_col[1] = sel_col[2] = 1.0f;
-			nosel_col[0] = nosel_col[1] = nosel_col[2] = 0.0f;
-		}
-		else{
-			sel_col[0] = (float)edit->sel_col[0] / 255.0f;
-			sel_col[1] = (float)edit->sel_col[1] / 255.0f;
-			sel_col[2] = (float)edit->sel_col[2] / 255.0f;
-			nosel_col[0] = (float)edit->nosel_col[0] / 255.0f;
-			nosel_col[1] = (float)edit->nosel_col[1] / 255.0f;
-			nosel_col[2] = (float)edit->nosel_col[2] / 255.0f;
-		}
-	}
-
-	if(editupdate && psys->pathcache && totpart == psys->totcached) {
-		cache = psys->pathcache;
-	}
-	else {
-		/* clear out old and create new empty path cache */
-		psys_free_path_cache(psys);
-		cache= psys_alloc_path_cache_buffers(&psys->pathcachebufs, totpart, steps+1);
-		psys->pathcache= cache;
-	}
-
-	if(edit==NULL && psys->soft && psys->softflag & OB_SB_ENABLE) {
+	if(psys->soft && psys->softflag & OB_SB_ENABLE) {
 		soft = psys->soft;
 		if(!soft->bpoint)
 			soft= NULL;
 	}
-	
+
 	psys->lattice = psys_get_lattice(scene, ob, psys);
 	ma= give_current_material(ob, psys->part->omat);
 	if(ma && (psys->part->draw & PART_DRAW_MAT_COL))
 		VECCOPY(col, &ma->r)
-	
+
 	if(psys->part->from!=PART_FROM_PARTICLE) {
 		if(!(psys->part->flag & PART_CHILD_EFFECT))
 			vg_effector = psys_cache_vgroup(psmd->dm, psys, PSYS_VG_EFFECTOR);
 		
-		if(!edit && !psys->totchild)
+		if(!psys->totchild)
 			vg_length = psys_cache_vgroup(psmd->dm, psys, PSYS_VG_LENGTH);
 	}
 
 	/*---first main loop: create all actual particles' paths---*/
-	for(i=0,pa=psys->particles; i<totpart; i++, pa++){
-		if(psys && edit==NULL && (pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST)) {
+	for(i=0; i<totpart; i++, pa++){
+		if(pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST) {
 			if(soft)
 				bp[0] += pa->totkey; /* TODO use of initialized value? */
 			continue;
 		}
 
-		if(editupdate && !(pa->flag & PARS_EDIT_RECALC)) continue;
-		else memset(cache[i], 0, sizeof(*cache[i])*(steps+1));
-
-		if(!edit && !psys->totchild) {
+		if(!psys->totchild) {
 			pa_length = 1.0f - part->randlength * 0.5 * (1.0f + pa->r_ave[0]);
 			if(vg_length)
 				pa_length *= psys_particle_value_from_verts(psmd->dm,part->from,pa,vg_length);
 		}
 
+		pind.keyed = keyed;
+		pind.cache = baked ? psys->pointcache : NULL;
+		pind.soft = soft;
+		pind.epoint = NULL;
+		pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE);
+
+		memset(cache[i], 0, sizeof(*cache[i])*(steps+1));
+
 		cache[i]->steps = steps;
 
-		if(edit)
-			ekey = edit->keys[i];
-
 		/*--get the first data points--*/
-		pind.keyed = keyed;
-		pind.cached = baked;
-		pind.soft = soft;
 		init_particle_interpolation(ob, psys, pa, &pind);
 
-
 		/* hairmat is needed for for non-hair particle too so we get proper rotations */
 		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
 		VECCOPY(rotmat[0], hairmat[2]);
 		VECCOPY(rotmat[1], hairmat[1]);
 		VECCOPY(rotmat[2], hairmat[0]);
 
-		if(!edit) {
-			if(part->draw & PART_ABS_PATH_TIME) {
-				birthtime = MAX2(pind.birthtime, part->path_start);
-				dietime = MIN2(pind.dietime, part->path_end);
-			}
-			else {
-				float tb = pind.birthtime;
-				birthtime = tb + part->path_start * (pind.dietime - tb);
-				dietime = tb + part->path_end * (pind.dietime - tb);
-			}
-
-			if(birthtime >= dietime) {
-				cache[i]->steps = -1;
-				continue;
-			}
-
-			dietime = birthtime + pa_length * (dietime - birthtime);
+		if(part->draw & PART_ABS_PATH_TIME) {
+			birthtime = MAX2(pind.birthtime, part->path_start);
+			dietime = MIN2(pind.dietime, part->path_end);
 		}
-		else
-			/* XXX brecht: don't know if this code from 2.4 is correct
-			 * still, but makes hair appear again in particle mode */
-			dietime= pind.hkey[0][pa->totkey-1].time;
+		else {
+			float tb = pind.birthtime;
+			birthtime = tb + part->path_start * (pind.dietime - tb);
+			dietime = tb + part->path_end * (pind.dietime - tb);
+		}
+
+		if(birthtime >= dietime) {
+			cache[i]->steps = -1;
+			continue;
+		}
+
+		dietime = birthtime + pa_length * (dietime - birthtime);
 
 		/*--interpolate actual path from data points--*/
 		for(k=0, ca=cache[i]; k<=steps; k++, ca++){
@@ -2726,40 +2745,8 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 			}
 
 			VECCOPY(ca->co, result.co);
-
-			/* selection coloring in edit mode */
-			if(edit){
-				if(pset->brushtype==PE_BRUSH_WEIGHT){
-					if(k==steps)
-						VecLerpf(ca->col, nosel_col, sel_col, pind.hkey[0]->weight);
-					else
-						VecLerpf(ca->col, nosel_col, sel_col,
-						(1.0f - keytime) * pind.hkey[0]->weight + keytime * pind.hkey[1]->weight);
-				}
-				else{
-					if((ekey + (pind.hkey[0] - pa->hair))->flag & PEK_SELECT){
-						if((ekey + (pind.hkey[1] - pa->hair))->flag & PEK_SELECT){
-							VECCOPY(ca->col, sel_col);
-						}
-						else{
-							VecLerpf(ca->col, sel_col, nosel_col, keytime);
-						}
-					}
-					else{
-						if((ekey + (pind.hkey[1] - pa->hair))->flag & PEK_SELECT){
-							VecLerpf(ca->col, nosel_col, sel_col, keytime);
-						}
-						else{
-							VECCOPY(ca->col, nosel_col);
-						}
-					}
-				}
-			}
-			else{
-				VECCOPY(ca->col, col);
-			}
+			VECCOPY(ca->col, col);
 		}
-
 		
 		/*--modify paths and calculate rotation & velocity--*/
 
@@ -2772,16 +2759,16 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 
 		for(k=0, ca=cache[i]; k<=steps; k++, ca++) {
 			/* apply effectors */
-			if(!(psys->part->flag & PART_CHILD_EFFECT) && edit==0 && k)
+			if(!(psys->part->flag & PART_CHILD_EFFECT) && k)
 				do_path_effectors(scene, ob, psys, i, ca, k, steps, cache[i]->co, effector, dfra, cfra, &length, vec);
 
 			/* apply guide curves to path data */
-			if(edit==0 && psys->effectors.first && (psys->part->flag & PART_CHILD_EFFECT)==0)
+			if(psys->effectors.first && (psys->part->flag & PART_CHILD_EFFECT)==0)
 				/* ca is safe to cast, since only co and vel are used */
 				do_guide(scene, (ParticleKey*)ca, i, (float)k/(float)steps, &psys->effectors);
 
 			/* apply lattice */
-			if(psys->lattice && edit==0)
+			if(psys->lattice)
 				calc_latt_deform(psys->lattice, ca->co, 1.0f);
 
 			/* figure out rotation */
@@ -2810,8 +2797,8 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 					cosangle= Inpf(tangent, prev_tangent);
 
 					/* note we do the comparison on cosangle instead of
-					 * angle, since floating point accuracy makes it give
-					 * different results across platforms */
+					* angle, since floating point accuracy makes it give
+					* different results across platforms */
 					if(cosangle > 0.999999f) {
 						QUATCOPY((ca - 1)->rot, (ca - 2)->rot);
 					}
@@ -2856,6 +2843,124 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	if(vg_length)
 		MEM_freeN(vg_length);
 }
+void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cfra)
+{
+	ParticleCacheKey *ca, **cache= edit->pathcache;
+	ParticleEditSettings *pset = &scene->toolsettings->particle;
+	
+	PTCacheEditPoint *point = edit->points;
+	PTCacheEditKey *ekey = NULL;
+
+	ParticleSystem *psys = edit->psys;
+	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
+	ParticleSettings *part = psys ? psys->part : NULL;
+	ParticleData *pa = psys ? psys->particles : NULL;
+
+	ParticleInterpolationData pind;
+	ParticleKey result;
+	
+	float birthtime = 0.0, dietime = 0.0;
+	float t, time = 0.0, keytime = 0.0, dfra = 1.0, frs_sec;
+	float hairmat[4][4];
+	int k,i;
+	int steps = (int)pow(2.0, (double)pset->draw_step);
+	int totpart = edit->totpoint;
+	float sel_col[3];
+	float nosel_col[3];
+
+	steps = MAX2(steps, 4);
+
+	if(!cache || edit->totpoint != edit->totcached) {
+		/* clear out old and create new empty path cache */
+		psys_free_path_cache(NULL, edit);
+		cache= edit->pathcache= psys_alloc_path_cache_buffers(&edit->pathcachebufs, totpart, steps+1);
+	}
+
+	frs_sec = (psys || edit->pid.flag & PTCACHE_VEL_PER_SEC) ? 25.0f : 1.0f;
+
+	sel_col[0] = (float)edit->sel_col[0] / 255.0f;
+	sel_col[1] = (float)edit->sel_col[1] / 255.0f;
+	sel_col[2] = (float)edit->sel_col[2] / 255.0f;
+	nosel_col[0] = (float)edit->nosel_col[0] / 255.0f;
+	nosel_col[1] = (float)edit->nosel_col[1] / 255.0f;
+	nosel_col[2] = (float)edit->nosel_col[2] / 255.0f;
+
+	/*---first main loop: create all actual particles' paths---*/
+	for(i=0; i<totpart; i++, pa+=pa?1:0, point++){
+		if(edit->totcached && !(point->flag & PEP_EDIT_RECALC))
+			continue;
+
+		ekey = point->keys;
+
+		pind.keyed = 0;
+		pind.cache = NULL;
+		pind.soft = NULL;
+		pind.epoint = point;
+		pind.bspline = psys ? (psys->part->flag & PART_HAIR_BSPLINE) : 0;
+
+		memset(cache[i], 0, sizeof(*cache[i])*(steps+1));
+
+		cache[i]->steps = steps;
+
+		/*--get the first data points--*/
+		init_particle_interpolation(ob, psys, pa, &pind);
+
+		if(psys)
+			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
+
+		birthtime = pind.birthtime;
+		dietime = pind.dietime;
+
+		if(birthtime >= dietime) {
+			cache[i]->steps = -1;
+			continue;
+		}
+
+		/*--interpolate actual path from data points--*/
+		for(k=0, ca=cache[i]; k<=steps; k++, ca++){
+			time = (float)k / (float)steps;
+
+			t = birthtime + time * (dietime - birthtime);
+
+			result.time = -t;
+
+			do_particle_interpolation(psys, i, pa, t, frs_sec, &pind, &result);
+
+			 /* non-hair points are allready in global space */
+			if(psys)
+				Mat4MulVecfl(hairmat, result.co);
+
+			VECCOPY(ca->co, result.co);
+
+			ca->vel[0] = ca->vel[1] = 0.0f;
+			ca->vel[1] = 1.0f;
+
+			/* selection coloring in edit mode */
+			if((ekey + (pind.ekey[0] - point->keys))->flag & PEK_SELECT){
+				if((ekey + (pind.ekey[1] - point->keys))->flag & PEK_SELECT){
+					VECCOPY(ca->col, sel_col);
+				}
+				else{
+					keytime = (t - (*pind.ekey[0]->time))/((*pind.ekey[1]->time) - (*pind.ekey[0]->time));
+					VecLerpf(ca->col, sel_col, nosel_col, keytime);
+				}
+			}
+			else{
+				if((ekey + (pind.ekey[1] - point->keys))->flag & PEK_SELECT){
+					keytime = (t - (*pind.ekey[0]->time))/((*pind.ekey[1]->time) - (*pind.ekey[0]->time));
+					VecLerpf(ca->col, nosel_col, sel_col, keytime);
+				}
+				else{
+					VECCOPY(ca->col, nosel_col);
+				}
+			}
+
+			ca->time = t;
+		}
+	}
+
+	edit->totcached = totpart;
+}
 /************************************************/
 /*			Particle Key handling				*/
 /************************************************/
@@ -3663,8 +3768,9 @@ void psys_get_particle_on_path(Scene *scene, Object *ob, ParticleSystem *psys, i
 		}
 
 		pind.keyed = keyed;
-		pind.cached = cached;
+		pind.cache = cached ? psys->pointcache : NULL;
 		pind.soft = NULL;
+		pind.epoint = NULL;
 		init_particle_interpolation(ob, psys, pa, &pind);
 		do_particle_interpolation(psys, p, pa, t, frs_sec, &pind, state);
 
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index bf642a14a49..0f72c1c5866 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -127,7 +127,7 @@ void psys_reset(ParticleSystem *psys, int mode)
 	int i;
 
 	if(ELEM(mode, PSYS_RESET_ALL, PSYS_RESET_DEPSGRAPH)) {
-		if(mode == PSYS_RESET_ALL || !(part->type == PART_HAIR && (psys->flag & PSYS_EDITED))) {
+		if(mode == PSYS_RESET_ALL || !(part->type == PART_HAIR && (psys->edit && psys->edit->edited))) {
 			if(psys->particles) {
 				if(psys->particles->keys)
 					MEM_freeN(psys->particles->keys);
@@ -145,6 +145,12 @@ void psys_reset(ParticleSystem *psys, int mode)
 
 			if(psys->reactevents.first)
 				BLI_freelistN(&psys->reactevents);
+
+			if(psys->edit && psys->free_edit) {
+				psys->free_edit(psys->edit);
+				psys->edit = NULL;
+				psys->free_edit = NULL;
+			}
 		}
 	}
 	else if(mode == PSYS_RESET_CACHE_MISS) {
@@ -165,7 +171,7 @@ void psys_reset(ParticleSystem *psys, int mode)
 	psys->totchild= 0;
 
 	/* reset path cache */
-	psys_free_path_cache(psys);
+	psys_free_path_cache(psys, NULL);
 
 	/* reset point cache */
 	psys->pointcache->flag &= ~PTCACHE_SIMULATION_VALID;
@@ -2274,7 +2280,7 @@ void psys_clear_temp_pointcache(ParticleSystem *psys)
 	if((psys->pointcache->flag & PTCACHE_DISK_CACHE)==0)
 		return;
 
-	BKE_ptache_free_mem(psys->pointcache);
+	BKE_ptcache_free_mem(&psys->pointcache->mem_cache);
 }
 void psys_get_pointcache_start_end(Scene *scene, ParticleSystem *psys, int *sfra, int *efra)
 {
@@ -3747,41 +3753,17 @@ static void psys_update_path_cache(Scene *scene, Object *ob, ParticleSystemModif
 	if((part->type==PART_HAIR || psys->flag&PSYS_KEYED || psys->pointcache->flag & PTCACHE_BAKED) && ( psys_in_edit_mode(scene, psys) || (part->type==PART_HAIR 
 		|| (part->ren_as == PART_DRAW_PATH && (part->draw_as == PART_DRAW_REND || psys->renderdata))))){
 
-		psys_cache_paths(scene, ob, psys, cfra, 0);
+		psys_cache_paths(scene, ob, psys, cfra);
 
 		/* for render, child particle paths are computed on the fly */
 		if(part->childtype) {
-			if(((psys->totchild!=0)) || (psys_in_edit_mode(scene, psys) && (pset->flag&PE_SHOW_CHILD)))
+			if(((psys->totchild!=0)) || (psys_in_edit_mode(scene, psys) && (pset->flag&PE_DRAW_PART)))
 				if(!(psys->part->type == PART_HAIR) || (psys->flag & PSYS_HAIR_DONE))
 					psys_cache_child_paths(scene, ob, psys, cfra, 0);
 		}
 	}
 	else if(psys->pathcache)
-		psys_free_path_cache(psys);
-}
-
-/* calculate and store key locations in world coordinates */
-void psys_update_world_cos(Object *ob, ParticleSystem *psys)
-{
-	ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
-	ParticleData *pa;
-	ParticleEditKey *key;
-	int i, k, totpart;
-	float hairmat[4][4];
-
-	if(psys==0 || psys->edit==0)
-		return;
-
-	totpart= psys->totpart;
-
-	for(i=0, pa=psys->particles; i<totpart; i++, pa++) {
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
-
-		for(k=0, key=psys->edit->keys[i]; k<pa->totkey; k++, key++) {
-			VECCOPY(key->world_co,key->co);
-			Mat4MulVecfl(hairmat, key->world_co);
-		}
-	}
+		psys_free_path_cache(psys, NULL);
 }
 
 static void hair_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
@@ -3808,9 +3790,6 @@ static void hair_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd
 	psys_init_effectors(scene, ob, part->eff_group, psys);
 	if(psys->effectors.first)
 		precalc_effectors(scene, ob,psys,psmd,cfra);
-		
-	if(psys_in_edit_mode(scene, psys))
-		psys_update_world_cos(ob, psys);
 
 	psys_update_path_cache(scene, ob,psmd,psys,cfra);
 }
@@ -4339,7 +4318,7 @@ static void system_step(Scene *scene, Object *ob, ParticleSystem *psys, Particle
 		psys_update_path_cache(scene, ob, psmd, psys,(int)cfra);
 	}
 	else if(psys->pathcache)
-		psys_free_path_cache(psys);
+		psys_free_path_cache(psys, NULL);
 
 	/* cleanup */
 	if(vg_vel) MEM_freeN(vg_vel);
@@ -4385,7 +4364,7 @@ static void psys_to_softbody(Scene *scene, Object *ob, ParticleSystem *psys)
 
 static int hair_needs_recalc(ParticleSystem *psys)
 {
-	if((psys->flag & PSYS_EDITED)==0 &&
+	if((!psys->edit || !psys->edit->edited) &&
 		((psys->flag & PSYS_HAIR_DONE)==0 || psys->recalc & PSYS_RECALC_RESET)) {
 		return 1;
 	}
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 69da8f19d8c..c0223d1690c 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -434,6 +434,8 @@ void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *p
 	pid->cache_ptr= &psys->pointcache;
 	pid->ptcaches= &psys->ptcaches;
 
+	pid->flag |= PTCACHE_VEL_PER_SEC;
+
 	pid->write_elem= ptcache_write_particle;
 	pid->write_stream = NULL;
 	pid->read_stream = NULL;
@@ -800,14 +802,16 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob)
 	}
 
 	for(psys=ob->particlesystem.first; psys; psys=psys->next) {
-		pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
-		BKE_ptcache_id_from_particles(pid, ob, psys);
-		BLI_addtail(lb, pid);
-
-		if(psys->soft) {
+		if(psys->part) {
 			pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
-			BKE_ptcache_id_from_softbody(pid, ob, psys->soft);
+			BKE_ptcache_id_from_particles(pid, ob, psys);
 			BLI_addtail(lb, pid);
+
+			if(psys->soft) {
+				pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
+				BKE_ptcache_id_from_softbody(pid, ob, psys->soft);
+				BLI_addtail(lb, pid);
+			}
 		}
 	}
 
@@ -1087,7 +1091,7 @@ static void ptcache_file_init_pointers(PTCacheFile *pf)
 	pf->cur[BPHYS_DATA_BOIDS] =		data_types & (1<<BPHYS_DATA_BOIDS) ?		&pf->data.boids	: NULL;
 }
 
-static void ptcache_mem_init_pointers(PTCacheMem *pm)
+void BKE_ptcache_mem_init_pointers(PTCacheMem *pm)
 {
 	int data_types = pm->data_types;
 	int i;
@@ -1096,7 +1100,7 @@ static void ptcache_mem_init_pointers(PTCacheMem *pm)
 		pm->cur[i] = data_types & (1<<i) ? pm->data[i] : NULL;
 }
 
-static void ptcache_mem_incr_pointers(PTCacheMem *pm)
+void BKE_ptcache_mem_incr_pointers(PTCacheMem *pm)
 {
 	int i;
 
@@ -1249,12 +1253,12 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 		return 0;
 
 	if(pm) {
-		ptcache_mem_init_pointers(pm);
+		BKE_ptcache_mem_init_pointers(pm);
 		totpoint = pm->totpoint;
 		index = pm->data_types & (1<<BPHYS_DATA_INDEX) ? pm->cur[BPHYS_DATA_INDEX] : &i;
 	}
 	if(pm2) {
-		ptcache_mem_init_pointers(pm2);
+		BKE_ptcache_mem_init_pointers(pm2);
 		totpoint2 = pm2->totpoint;
 		index2 = pm2->data_types & (1<<BPHYS_DATA_INDEX) ? pm2->cur[BPHYS_DATA_INDEX] : &i;
 	}
@@ -1336,7 +1340,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 			}
 
 			if(pm) {
-				ptcache_mem_incr_pointers(pm);
+				BKE_ptcache_mem_incr_pointers(pm);
 				index = pm->data_types & (1<<BPHYS_DATA_INDEX) ? pm->cur[BPHYS_DATA_INDEX] : &i;
 			}
 		}
@@ -1387,7 +1391,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec)
 			}
 
 			if(pm2) {
-				ptcache_mem_incr_pointers(pm2);
+				BKE_ptcache_mem_incr_pointers(pm2);
 				index2 = pm2->data_types & (1<<BPHYS_DATA_INDEX) ? pm2->cur[BPHYS_DATA_INDEX] : &i;
 			}
 		}
@@ -1559,11 +1563,11 @@ int BKE_ptcache_write_cache(PTCacheID *pid, int cfra)
 			pm->data_types = cfra ? pid->data_types : pid->info_types;
 
 			ptcache_alloc_data(pm);
-			ptcache_mem_init_pointers(pm);
+			BKE_ptcache_mem_init_pointers(pm);
 
 			for(i=0; i<totpoint; i++) {
 				if(pid->write_elem && pid->write_elem(i, pid->calldata, pm->cur))
-					ptcache_mem_incr_pointers(pm);
+					BKE_ptcache_mem_incr_pointers(pm);
 			}
 			//ptcache_make_index_array(pm, pid->totpoint(pid->calldata));
 
@@ -1664,6 +1668,8 @@ void BKE_ptcache_id_clear(PTCacheID *pid, int mode, int cfra)
 			PTCacheMem *pm= pid->cache->mem_cache.first;
 			PTCacheMem *link= NULL;
 
+			pm= pid->cache->mem_cache.first;
+
 			if(mode == PTCACHE_CLEAR_ALL) {
 				pid->cache->last_exact = 0;
 				for(; pm; pm=pm->next)
@@ -1863,7 +1869,7 @@ int BKE_ptcache_object_reset(Scene *scene, Object *ob, int mode)
 		else if(psys->recalc & PSYS_RECALC_REDO || psys->recalc & PSYS_RECALC_CHILD)
 			skip = 1;
 
-		if(skip == 0) {
+		if(skip == 0 && psys->part) {
 			BKE_ptcache_id_from_particles(&pid, ob, psys);
 			reset |= BKE_ptcache_id_reset(scene, &pid, mode);
 		}
@@ -1968,9 +1974,9 @@ PointCache *BKE_ptcache_add(ListBase *ptcaches)
 	return cache;
 }
 
-void BKE_ptache_free_mem(PointCache *cache)
+void BKE_ptcache_free_mem(ListBase *mem_cache)
 {
-	PTCacheMem *pm = cache->mem_cache.first;
+	PTCacheMem *pm = mem_cache->first;
 
 	if(pm) {
 		for(; pm; pm=pm->next) {
@@ -1979,22 +1985,25 @@ void BKE_ptache_free_mem(PointCache *cache)
 				MEM_freeN(pm->index_array);
 		}
 
-		BLI_freelistN(&cache->mem_cache);
+		BLI_freelistN(mem_cache);
 	}
 }
 void BKE_ptcache_free(PointCache *cache)
 {
-	BKE_ptache_free_mem(cache);
+	BKE_ptcache_free_mem(&cache->mem_cache);
+	if(cache->edit && cache->free_edit)
+		cache->free_edit(cache->edit);
 	MEM_freeN(cache);
 }
 void BKE_ptcache_free_list(ListBase *ptcaches)
 {
 	PointCache *cache = ptcaches->first;
 
-	for(; cache; cache=cache->next)
-		BKE_ptache_free_mem(cache);
-
-	BLI_freelistN(ptcaches);
+	while(cache) {
+		BLI_remlink(ptcaches, cache);
+		BKE_ptcache_free(cache);
+		cache = ptcaches->first;
+	}
 }
 
 static PointCache *ptcache_copy(PointCache *cache)
@@ -2258,7 +2267,7 @@ void BKE_ptcache_disk_to_mem(PTCacheID *pid)
 			pm->frame = cfra;
 
 			ptcache_alloc_data(pm);
-			ptcache_mem_init_pointers(pm);
+			BKE_ptcache_mem_init_pointers(pm);
 			ptcache_file_init_pointers(pf);
 
 			for(i=0; i<pm->totpoint; i++) {
@@ -2274,7 +2283,7 @@ void BKE_ptcache_disk_to_mem(PTCacheID *pid)
 					return;
 				}
 				ptcache_copy_data(pf->cur, pm->cur);
-				ptcache_mem_incr_pointers(pm);
+				BKE_ptcache_mem_incr_pointers(pm);
 			}
 
 			//ptcache_make_index_array(pm, pid->totpoint(pid->calldata));
@@ -2305,7 +2314,7 @@ void BKE_ptcache_mem_to_disk(PTCacheID *pid)
 			pf->totpoint = pm->totpoint;
 			pf->type = pid->type;
 
-			ptcache_mem_init_pointers(pm);
+			BKE_ptcache_mem_init_pointers(pm);
 			ptcache_file_init_pointers(pf);
 
 			if(!ptcache_file_write_header_begin(pf) || !pid->write_header(pf)) {
@@ -2325,7 +2334,7 @@ void BKE_ptcache_mem_to_disk(PTCacheID *pid)
 					ptcache_file_close(pf);
 					return;
 				}
-				ptcache_mem_incr_pointers(pm);
+				BKE_ptcache_mem_incr_pointers(pm);
 			}
 
 			ptcache_file_close(pf);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 63dabf18faa..10f6a8cf47c 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -404,11 +404,13 @@ Scene *add_scene(char *name)
 	sce->unit.scale_length = 1.0f;
 
 	pset= &sce->toolsettings->particle;
-	pset->flag= PE_KEEP_LENGTHS|PE_LOCK_FIRST|PE_DEFLECT_EMITTER;
+	pset->flag= PE_KEEP_LENGTHS|PE_LOCK_FIRST|PE_DEFLECT_EMITTER|PE_AUTO_VELOCITY;
 	pset->emitterdist= 0.25f;
 	pset->totrekey= 5;
 	pset->totaddkey= 5;
 	pset->brushtype= PE_BRUSH_NONE;
+	pset->draw_step= 2;
+	pset->fade_frames= 2;
 	for(a=0; a<PE_TOT_BRUSH; a++) {
 		pset->brush[a].strength= 50;
 		pset->brush[a].size= 50;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9d5ae3062a1..070c873686c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2963,8 +2963,10 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache)
 	else
 		cache->mem_cache.first = cache->mem_cache.last = NULL;
 
-	cache->flag &= ~(PTCACHE_SIMULATION_VALID|PTCACHE_BAKE_EDIT_ACTIVE);
+	cache->flag &= ~PTCACHE_SIMULATION_VALID;
 	cache->simframe= 0;
+	cache->edit= NULL;
+	cache->free_edit= NULL;
 }
 
 static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointCache **ocache)
@@ -3137,7 +3139,7 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
 
 		link_list(fd, &psys->targets);
 
-		psys->edit = 0;
+		psys->edit = NULL;
 		psys->free_edit = NULL;
 		psys->pathcache = 0;
 		psys->childcache = 0;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 26fd0cf6af6..88c6f205d15 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1208,7 +1208,7 @@ static void write_objects(WriteData *wd, ListBase *idbase)
 			
 			writestruct(wd, DATA, "PartDeflect", 1, ob->pd);
 			writestruct(wd, DATA, "SoftBody", 1, ob->soft);
-			if(ob->soft) writestruct(wd, DATA, "PointCache", 1, ob->soft->pointcache);
+			if(ob->soft) write_pointcaches(wd, &ob->soft->ptcaches);
 			writestruct(wd, DATA, "BulletSoftBody", 1, ob->bsoft);
 			
 			write_particlesystems(wd, &ob->particlesystem);
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 43cb5053f48..dcac51928a3 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -39,18 +39,16 @@ struct rcti;
 struct wmWindowManager;
 
 /* particle edit mode */
-void PE_change_act(void *ob_v, void *act_v);
-void PE_change_act_psys(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys);
-int PE_can_edit(struct ParticleSystem *psys);
+void PE_free_ptcache_edit(struct PTCacheEdit *edit);
+int PE_start_edit(struct PTCacheEdit *edit);
 
 /* access */
-struct ParticleSystem *PE_get_current(struct Scene *scene, struct Object *ob);
-short PE_get_current_num(struct Object *ob);
+struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob);
 int PE_minmax(struct Scene *scene, float *min, float *max);
 struct ParticleEditSettings *PE_settings(Scene *scene);
 
 /* update calls */
-void PE_hide_keys_time(struct Scene *scene, struct ParticleSystem *psys, float cfra);
+void PE_hide_keys_time(struct Scene *scene, struct PTCacheEdit *edit, float cfra);
 void PE_update_object(struct Scene *scene, struct Object *ob, int useflag);
 
 /* selection tools */
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 17838d6042c..c3f1637d3af 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -743,78 +743,6 @@ static void edge_drawflags(Mesh *me, EditMesh *em)
 	}
 }
 
-static int editmesh_pointcache_edit(Scene *scene, Object *ob, int totvert, PTCacheID *pid_p, float mat[][4], int load)
-{
-	Cloth *cloth;
-	SoftBody *sb;
-	ClothModifierData *clmd;
-	PTCacheID pid, tmpid;
-	int cfra= (int)scene->r.cfra, found= 0;
-
-	pid.cache= NULL;
-
-	/* check for cloth */
-	if(modifiers_isClothEnabled(ob)) {
-		clmd= (ClothModifierData*)modifiers_findByType(ob, eModifierType_Cloth);
-		cloth= clmd->clothObject;
-		
-		BKE_ptcache_id_from_cloth(&tmpid, ob, clmd);
-
-		/* verify vertex count and baked status */
-		if(cloth && (totvert == cloth->numverts)) {
-			if((tmpid.cache->flag & PTCACHE_BAKED) && (tmpid.cache->flag & PTCACHE_BAKE_EDIT)) {
-				pid= tmpid;
-
-				if(load && (pid.cache->flag & PTCACHE_BAKE_EDIT_ACTIVE))
-					found= 1;
-			}
-		}
-	}
-
-	/* check for softbody */
-	if(!found && ob->soft) {
-		sb= ob->soft;
-
-		BKE_ptcache_id_from_softbody(&tmpid, ob, sb);
-
-		/* verify vertex count and baked status */
-		if(sb->bpoint && (totvert == sb->totpoint)) {
-			if((tmpid.cache->flag & PTCACHE_BAKED) && (tmpid.cache->flag & PTCACHE_BAKE_EDIT)) {
-				pid= tmpid;
-
-				if(load && (pid.cache->flag & PTCACHE_BAKE_EDIT_ACTIVE))
-					found= 1;
-			}
-		}
-	}
-
-	/* if not making editmesh verify editing was active for this point cache */
-	if(load) {
-		if(found)
-			pid.cache->flag &= ~PTCACHE_BAKE_EDIT_ACTIVE;
-		else
-			return 0;
-	}
-
-	/* check if we have cache for this frame */
-	if(pid.cache && BKE_ptcache_id_exist(&pid, cfra)) {
-		*pid_p = pid;
-		
-		if(load) {
-			Mat4CpyMat4(mat, ob->obmat);
-		}
-		else {
-			pid.cache->editframe= cfra;
-			pid.cache->flag |= PTCACHE_BAKE_EDIT_ACTIVE;
-			Mat4Invert(mat, ob->obmat); /* ob->imat is not up to date */
-		}
-
-		return 1;
-	}
-
-	return 0;
-}
-
 /* turns Mesh into editmesh */
 void make_editMesh(Scene *scene, Object *ob)
 {
@@ -828,11 +756,8 @@ void make_editMesh(Scene *scene, Object *ob)
 	EditFace *efa;
 	EditEdge *eed;
 	EditSelection *ese;
-	PTCacheID pid;
-	Cloth *cloth;
-	SoftBody *sb;
-	float cacheco[3], cachemat[4][4], *co;
-	int tot, a, cacheedit= 0, eekadoodle= 0;
+	float *co;
+	int tot, a, eekadoodle= 0;
 
 	if(me->edit_mesh==NULL)
 		me->edit_mesh= MEM_callocN(sizeof(EditMesh), "editmesh");
@@ -867,26 +792,10 @@ void make_editMesh(Scene *scene, Object *ob)
 	CustomData_copy(&me->vdata, &em->vdata, CD_MASK_EDITMESH, CD_CALLOC, 0);
 	mvert= me->mvert;
 
-	cacheedit= editmesh_pointcache_edit(scene, ob, tot, &pid, cachemat, 0);
-
 	evlist= (EditVert **)MEM_mallocN(tot*sizeof(void *),"evlist");
 	for(a=0; a<tot; a++, mvert++) {
 		
-		if(cacheedit) {
-			if(pid.type == PTCACHE_TYPE_CLOTH) {
-				cloth= ((ClothModifierData*)pid.calldata)->clothObject;
-				VECCOPY(cacheco, cloth->verts[a].x)
-			}
-			else if(pid.type == PTCACHE_TYPE_SOFTBODY) {
-				sb= (SoftBody*)pid.calldata;
-				VECCOPY(cacheco, sb->bpoint[a].pos)
-			}
-
-			Mat4MulVecfl(cachemat, cacheco);
-			co= cacheco;
-		}
-		else
-			co= mvert->co;
+		co= mvert->co;
 
 		eve= addvertlist(em, co, NULL);
 		evlist[a]= eve;
@@ -1011,11 +920,6 @@ void make_editMesh(Scene *scene, Object *ob)
 	if (EM_get_actFace(em, 0)==NULL) {
 		EM_set_actFace(em, em->faces.first ); /* will use the first face, this is so we alwats have an active face */
 	}
-		
-	/* vertex coordinates change with cache edit, need to recalc */
-	if(cacheedit)
-		recalc_editnormals(em);
-	
 }
 
 /* makes Mesh out of editmesh */
@@ -1031,12 +935,8 @@ void load_editMesh(Scene *scene, Object *ob)
 	EditFace *efa, *efa_act;
 	EditEdge *eed;
 	EditSelection *ese;
-	SoftBody *sb;
-	Cloth *cloth;
-	ClothModifierData *clmd;
-	PTCacheID pid;
-	float *fp, *newkey, *oldkey, nor[3], cacheco[3], cachemat[4][4];
-	int i, a, ototvert, cacheedit= 0;
+	float *fp, *newkey, *oldkey, nor[3];
+	int i, a, ototvert;
 	
 	/* this one also tests of edges are not in faces: */
 	/* eed->f2==0: not in face, f2==1: draw it */
@@ -1090,48 +990,8 @@ void load_editMesh(Scene *scene, Object *ob)
 	eve= em->verts.first;
 	a= 0;
 
-	/* check for point cache editing */
-	cacheedit= editmesh_pointcache_edit(scene, ob, em->totvert, &pid, cachemat, 1);
-
 	while(eve) {
-		if(cacheedit) {
-			if(pid.type == PTCACHE_TYPE_CLOTH) {
-				clmd= (ClothModifierData*)pid.calldata;
-				cloth= clmd->clothObject;
-
-				/* assign position */
-				VECCOPY(cacheco, cloth->verts[a].x)
-				VECCOPY(cloth->verts[a].x, eve->co);
-				Mat4MulVecfl(cachemat, cloth->verts[a].x);
-
-				/* find plausible velocity, not physical correct but gives
-				 * nicer results when commented */
-				VECSUB(cacheco, cloth->verts[a].x, cacheco);
-				VecMulf(cacheco, clmd->sim_parms->stepsPerFrame*10.0f);
-				VECADD(cloth->verts[a].v, cloth->verts[a].v, cacheco);
-			}
-			else if(pid.type == PTCACHE_TYPE_SOFTBODY) {
-				sb= (SoftBody*)pid.calldata;
-
-				/* assign position */
-				VECCOPY(cacheco, sb->bpoint[a].pos)
-				VECCOPY(sb->bpoint[a].pos, eve->co);
-				Mat4MulVecfl(cachemat, sb->bpoint[a].pos);
-
-				/* changing velocity for softbody doesn't seem to give
-				 * good results? */
-#if 0
-				VECSUB(cacheco, sb->bpoint[a].pos, cacheco);
-				VecMulf(cacheco, sb->minloops*10.0f);
-				VECADD(sb->bpoint[a].vec, sb->bpoint[a].pos, cacheco);
-#endif
-			}
-
-			if(oldverts)
-				VECCOPY(mvert->co, oldverts[a].co)
-		}
-		else
-			VECCOPY(mvert->co, eve->co);
+		VECCOPY(mvert->co, eve->co);
 
 		mvert->mat_nr= 32767;  /* what was this for, halos? */
 		
@@ -1155,10 +1015,6 @@ void load_editMesh(Scene *scene, Object *ob)
 		eve= eve->next;
 		mvert++;
 	}
-	
-	/* write changes to cache */
-	if(cacheedit)
-		BKE_ptcache_write_cache(&pid, pid.cache->editframe);
 
 	/* the edges */
 	a= 0;
diff --git a/source/blender/editors/physics/ed_pointcache.c b/source/blender/editors/physics/ed_pointcache.c
index 917e2b40d72..68e0c28e9c1 100644
--- a/source/blender/editors/physics/ed_pointcache.c
+++ b/source/blender/editors/physics/ed_pointcache.c
@@ -46,6 +46,7 @@
 
 #include "ED_screen.h"
 #include "ED_physics.h"
+#include "ED_particle.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -184,8 +185,16 @@ static int ptcache_free_bake_exec(bContext *C, wmOperator *op)
 {
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
 	PointCache *cache= ptr.data;
-	
-	cache->flag &= ~PTCACHE_BAKED;
+
+	if(cache->edit) {
+		if(!cache->edit->edited || 1) {// XXX okee("Lose changes done in particle mode?")) {
+			PE_free_ptcache_edit(cache->edit);
+			cache->edit = NULL;
+			cache->flag &= ~PTCACHE_BAKED;
+		}
+	}
+	else
+		cache->flag &= ~PTCACHE_BAKED;
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index b92632b45af..dbb11f72890 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -57,7 +57,8 @@
 #include "BKE_particle.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_utildefines.h" 
+#include "BKE_utildefines.h"
+#include "BKE_pointcache.h"
 
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
@@ -85,11 +86,25 @@
 
 #include "physics_intern.h"
 
-static void PE_create_particle_edit(Scene *scene, Object *ob, ParticleSystem *psys);
-static void ParticleUndo_clear(ParticleSystem *psys);
+static void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, ParticleSystem *psys);
+static void PTCacheUndo_clear(PTCacheEdit *edit);
 
-#define LOOP_PARTICLES(i, pa) for(i=0, pa=psys->particles; i<totpart; i++, pa++)
-#define LOOP_KEYS(k, key) if(psys->edit)for(k=0, key=psys->edit->keys[i]; k<pa->totkey; k++, key++)
+#define KEY_K					PTCacheEditKey *key; int k
+#define POINT_P					PTCacheEditPoint *point; int p
+#define LOOP_POINTS				for(p=0, point=edit->points; p<edit->totpoint; p++, point++)
+#define LOOP_VISIBLE_POINTS		for(p=0, point=edit->points; p<edit->totpoint; p++, point++) if(!(point->flag & PEP_HIDE))
+#define LOOP_SELECTED_POINTS	for(p=0, point=edit->points; p<edit->totpoint; p++, point++) if(point_is_selected(point))
+#define LOOP_UNSELECTED_POINTS	for(p=0, point=edit->points; p<edit->totpoint; p++, point++) if(!point_is_selected(point))
+#define LOOP_EDITED_POINTS		for(p=0, point=edit->points; p<edit->totpoint; p++, point++) if(point->flag & PEP_EDIT_RECALC)
+#define LOOP_TAGGED_POINTS		for(p=0, point=edit->points; p<edit->totpoint; p++, point++) if(point->flag & PEP_TAG)
+#define LOOP_KEYS				for(k=0, key=point->keys; k<point->totkey; k++, key++)
+#define LOOP_VISIBLE_KEYS		for(k=0, key=point->keys; k<point->totkey; k++, key++) if(!(key->flag & PEK_HIDE))
+#define LOOP_SELECTED_KEYS		for(k=0, key=point->keys; k<point->totkey; k++, key++) if((key->flag & PEK_SELECT) && !(key->flag & PEK_HIDE))
+#define LOOP_TAGGED_KEYS		for(k=0, key=point->keys; k<point->totkey; k++, key++) if(key->flag & PEK_TAG)
+
+#define LOOP_PARTICLES(i, pa)	for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++)
+
+#define KEY_WCO					(key->flag & PEK_USE_WCO ? key->world_co : key->co)
 
 /**************************** utilities *******************************/
 
@@ -97,14 +112,14 @@ static int PE_poll(bContext *C)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys;
+	PTCacheEdit *edit;
 
 	if(!scene || !ob)
 		return 0;
 	
-	psys= PE_get_current(scene, ob);
+	edit= PE_get_current(scene, ob);
 
-	return (psys && psys->edit && (ob && ob->mode & OB_MODE_PARTICLE_EDIT));
+	return (edit && (ob->mode & OB_MODE_PARTICLE_EDIT));
 }
 
 static int PE_poll_3dview(bContext *C)
@@ -113,22 +128,21 @@ static int PE_poll_3dview(bContext *C)
 		CTX_wm_region(C)->regiontype == RGN_TYPE_WINDOW;
 }
 
-static void PE_free_particle_edit(ParticleSystem *psys)
+void PE_free_ptcache_edit(PTCacheEdit *edit)
 {
-	ParticleEdit *edit= psys->edit;
-	int i, totpart= psys->totpart;
+	POINT_P;
 
 	if(edit==0) return;
 
-	ParticleUndo_clear(psys);
+	PTCacheUndo_clear(edit);
 
-	if(edit->keys) {
-		for(i=0; i<totpart; i++) {
-			if(edit->keys[i])
-				MEM_freeN(edit->keys[i]);
+	if(edit->points) {
+		LOOP_POINTS {
+			if(point->keys) 
+				MEM_freeN(point->keys);
 		}
 
-		MEM_freeN(edit->keys);
+		MEM_freeN(edit->points);
 	}
 
 	if(edit->mirror_cache)
@@ -144,19 +158,23 @@ static void PE_free_particle_edit(ParticleSystem *psys)
 		edit->emitter_field= 0;
 	}
 
-	MEM_freeN(edit);
+	psys_free_path_cache(NULL, edit);
 
-	psys->edit= NULL;
-	psys->free_edit= NULL;
+	MEM_freeN(edit);
 }
 
 /************************************************/
 /*			Edit Mode Helpers					*/
 /************************************************/
 
-int PE_can_edit(ParticleSystem *psys)
+int PE_start_edit(PTCacheEdit *edit)
 {
-	return (psys && psys->edit);
+	if(edit) {
+		edit->edited = 1;
+		return 1;
+	}
+
+	return 0;
 }
 
 ParticleEditSettings *PE_settings(Scene *scene)
@@ -165,73 +183,99 @@ ParticleEditSettings *PE_settings(Scene *scene)
 }
 
 /* always gets atleast the first particlesystem even if PSYS_CURRENT flag is not set */
-ParticleSystem *PE_get_current(Scene *scene, Object *ob)
+PTCacheEdit *PE_get_current(Scene *scene, Object *ob)
 {
-	ParticleSystem *psys;
+	ParticleEditSettings *pset= PE_settings(scene);
+	PTCacheEdit *edit = NULL;
+	ListBase pidlist;
+	PTCacheID *pid;
+
+	pset->scene = scene;
+	pset->object = ob;
 
 	if(ob==NULL)
 		return NULL;
 
-	psys= ob->particlesystem.first;
-	while(psys) {
-		if(psys->flag & PSYS_CURRENT)
+	BKE_ptcache_ids_from_object(&pidlist, ob);
+
+	/* in the case of only one editable thing, set pset->edittype accordingly */
+	if(pidlist.first == pidlist.last) {
+		pid = pidlist.first;
+		switch(pid->type) {
+			case PTCACHE_TYPE_PARTICLES:
+				pset->edittype = PE_TYPE_PARTICLES;
+				break;
+			case PTCACHE_TYPE_SOFTBODY:
+				pset->edittype = PE_TYPE_SOFTBODY;
+				break;
+			case PTCACHE_TYPE_CLOTH:
+				pset->edittype = PE_TYPE_CLOTH;
+				break;
+		}
+	}
+
+	for(pid=pidlist.first; pid; pid=pid->next) {
+		if(pset->edittype == PE_TYPE_PARTICLES && pid->type == PTCACHE_TYPE_PARTICLES) {
+			ParticleSystem *psys = pid->calldata;
+
+			if(psys->flag & PSYS_CURRENT) {
+				if(psys->part && psys->part->type == PART_HAIR) {
+					if(!psys->edit && psys->flag & PSYS_HAIR_DONE)
+						PE_create_particle_edit(scene, ob, NULL, psys);
+					edit = psys->edit;
+				}
+				else {
+					if(pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit)
+						PE_create_particle_edit(scene, ob, pid->cache, psys);
+					edit = pid->cache->edit;
+				}
+
+				break;
+			}
+		}
+		else if(pset->edittype == PE_TYPE_SOFTBODY && pid->type == PTCACHE_TYPE_SOFTBODY) {
+			if(pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit)
+				PE_create_particle_edit(scene, ob, pid->cache, NULL);
+			edit = pid->cache->edit;
 			break;
-		psys=psys->next;
+		}
+		else if(pset->edittype == PE_TYPE_CLOTH && pid->type == PTCACHE_TYPE_CLOTH) {
+			if(pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit)
+				PE_create_particle_edit(scene, ob, pid->cache, NULL);
+			edit = pid->cache->edit;
+			break;
+		}
 	}
 
-	if(psys==NULL && ob->particlesystem.first) {
-		psys=ob->particlesystem.first;
-		psys->flag |= PSYS_CURRENT;
-	}
+	if(edit)
+		edit->pid = *pid;
 
-	/* this happens when Blender is started with particle
-	 * edit mode enabled XXX there's a draw error then? */
-	if(psys && psys_check_enabled(ob, psys) && (ob == OBACT) && (ob->mode & OB_MODE_PARTICLE_EDIT))
-		if(psys->part->type == PART_HAIR && psys->flag & PSYS_EDITED)
-			if(psys->edit == NULL)
-				PE_create_particle_edit(scene, ob, psys);
+	BLI_freelistN(&pidlist);
 
-	return psys;
+	return edit;
 }
 
-/* returns -1 if no system has PSYS_CURRENT flag */
-short PE_get_current_num(Object *ob)
+void PE_hide_keys_time(Scene *scene, PTCacheEdit *edit, float cfra)
 {
-	short num=0;
-	ParticleSystem *psys= ob->particlesystem.first;
-
-	while(psys) {
-		if(psys->flag & PSYS_CURRENT)
-			return num;
-		num++;
-		psys=psys->next;
-	}
-
-	return -1;
-}
-
-void PE_hide_keys_time(Scene *scene, ParticleSystem *psys, float cfra)
-{
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset=PE_settings(scene);
-	int i, k, totpart= psys->totpart;
+	POINT_P; KEY_K;
 
-	if(pset->draw_timed && pset->selectmode==SCE_SELECT_POINT) {
-		LOOP_PARTICLES(i, pa) {
-			LOOP_KEYS(k, key) {
-				if(fabs(cfra-*key->time) < pset->draw_timed)
+
+	if(pset->flag & PE_FADE_TIME && pset->selectmode==SCE_SELECT_POINT) {
+		LOOP_POINTS {
+			LOOP_KEYS {
+				if(fabs(cfra-*key->time) < pset->fade_frames)
 					key->flag &= ~PEK_HIDE;
 				else {
 					key->flag |= PEK_HIDE;
-					key->flag &= ~PEK_SELECT;
+					//key->flag &= ~PEK_SELECT;
 				}
 			}
 		}
 	}
 	else {
-		LOOP_PARTICLES(i, pa) {
-			LOOP_KEYS(k, key) {
+		LOOP_POINTS {
+			LOOP_KEYS {
 				key->flag &= ~PEK_HIDE;
 			}
 		}
@@ -247,7 +291,7 @@ typedef struct PEData {
 	Scene *scene;
 	Object *ob;
 	DerivedMesh *dm;
-	ParticleSystem *psys;
+	PTCacheEdit *edit;
 
 	short *mval;
 	rcti *rect;
@@ -276,7 +320,7 @@ static void PE_set_data(bContext *C, PEData *data)
 
 	data->scene= CTX_data_scene(C);
 	data->ob= CTX_data_active_object(C);
-	data->psys= PE_get_current(data->scene, data->ob);
+	data->edit= PE_get_current(data->scene, data->ob);
 }
 
 static void PE_set_view3d_data(bContext *C, PEData *data)
@@ -388,121 +432,103 @@ static int key_inside_test(PEData *data, float co[3])
 		return key_inside_rect(data, co);
 }
 
-static int particle_is_selected(ParticleSystem *psys, ParticleData *pa)
+static int point_is_selected(PTCacheEditPoint *point)
 {
-	ParticleEditKey *key;
-	int sel, i, k;
+	KEY_K;
+	int sel;
 
-	if(pa->flag & PARS_HIDE)
+	if(point->flag & PEP_HIDE)
 		return 0;
 
 	sel= 0;
-	i= pa - psys->particles;
 
-	LOOP_KEYS(k, key)
-		if(key->flag & PEK_SELECT)
-			return 1;
+	LOOP_SELECTED_KEYS {
+		return 1;
+	}
 	
 	return 0;
 }
 
 /*************************** iterators *******************************/
 
-typedef void (*ForParticleFunc)(PEData *data, int pa_index);
-typedef void (*ForKeyFunc)(PEData *data, int pa_index, int key_index);
-typedef void (*ForKeyMatFunc)(PEData *data, float mat[][4], float imat[][4], int pa_index, int key_index);
+typedef void (*ForPointFunc)(PEData *data, int point_index);
+typedef void (*ForKeyFunc)(PEData *data, int point_index, int key_index);
+typedef void (*ForKeyMatFunc)(PEData *data, float mat[][4], float imat[][4], int point_index, int key_index, PTCacheEditKey *key);
 
 static void for_mouse_hit_keys(PEData *data, ForKeyFunc func, int nearest)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleEdit *edit= psys->edit;
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset= PE_settings(data->scene);
-	int i, k, totpart, nearest_pa, nearest_key;
+	PTCacheEdit *edit= data->edit;
+	POINT_P; KEY_K;
+	int nearest_point, nearest_key;
 	float dist= data->rad;
 
 	/* in path select mode we have no keys */
 	if(pset->selectmode==SCE_SELECT_PATH)
 		return;
 
-	totpart= psys->totpart;
-	nearest_pa= -1;
+	nearest_point= -1;
 	nearest_key= -1;
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
+	LOOP_VISIBLE_POINTS {
 		if(pset->selectmode == SCE_SELECT_END) {
 			/* only do end keys */
-			key= edit->keys[i] + pa->totkey-1;
+			key= point->keys + point->totkey-1;
 
 			if(nearest) {
-				if(key_inside_circle(data, dist, key->world_co, &dist)) {
-					nearest_pa= i;
-					nearest_key= pa->totkey-1;
+				if(key_inside_circle(data, dist, KEY_WCO, &dist)) {
+					nearest_point= p;
+					nearest_key= point->totkey-1;
 				}
 			}
-			else if(key_inside_test(data, key->world_co))
-				func(data, i, pa->totkey-1);
+			else if(key_inside_test(data, KEY_WCO))
+				func(data, p, point->totkey-1);
 		}
 		else {
 			/* do all keys */
-			key= edit->keys[i];
-
-			LOOP_KEYS(k, key) {
-				if(key->flag & PEK_HIDE) continue;
-
+			LOOP_VISIBLE_KEYS {
 				if(nearest) {
-					if(key_inside_circle(data, dist, key->world_co, &dist)) {
-						nearest_pa= i;
+					if(key_inside_circle(data, dist, KEY_WCO, &dist)) {
+						nearest_point= p;
 						nearest_key= k;
 					}
 				}
-				else if(key_inside_test(data, key->world_co))
-					func(data, i, k);
+				else if(key_inside_test(data, KEY_WCO))
+					func(data, p, k);
 			}
 		}
 	}
 
 	/* do nearest only */
-	if(nearest && nearest_pa > -1)
-		func(data, nearest_pa, nearest_key);
+	if(nearest && nearest_point > -1)
+		func(data, nearest_point, nearest_key);
 }
 
-static void foreach_mouse_hit_particle(PEData *data, ForParticleFunc func, int selected)
+static void foreach_mouse_hit_point(PEData *data, ForPointFunc func, int selected)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset= PE_settings(data->scene);
-	int i, k, totpart;
-
-	totpart= psys->totpart;
+	PTCacheEdit *edit= data->edit;
+	POINT_P; KEY_K;
 
 	/* all is selected in path mode */
 	if(pset->selectmode==SCE_SELECT_PATH)
 		selected=0;
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
+	LOOP_VISIBLE_POINTS {
 		if(pset->selectmode==SCE_SELECT_END) {
 			/* only do end keys */
-			key= psys->edit->keys[i] + pa->totkey-1;
+			key= point->keys + point->totkey - 1;
 
 			if(selected==0 || key->flag & PEK_SELECT)
-				if(key_inside_circle(data, data->rad, key->world_co, &data->dist))
-					func(data, i);
+				if(key_inside_circle(data, data->rad, KEY_WCO, &data->dist))
+					func(data, p);
 		}
 		else {
 			/* do all keys */
-			LOOP_KEYS(k, key) {
-				if(key->flag & PEK_HIDE) continue;
-
+			LOOP_VISIBLE_KEYS {
 				if(selected==0 || key->flag & PEK_SELECT) {
-					if(key_inside_circle(data, data->rad, key->world_co, &data->dist)) {
-						func(data, i);
+					if(key_inside_circle(data, data->rad, KEY_WCO, &data->dist)) {
+						func(data, p);
 						break;
 					}
 				}
@@ -513,16 +539,15 @@ static void foreach_mouse_hit_particle(PEData *data, ForParticleFunc func, int s
 
 static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa;
-	ParticleEditKey *key;
-	ParticleSystemModifierData *psmd=0;
+	PTCacheEdit *edit = data->edit;
+	ParticleSystem *psys = edit->psys;
+	ParticleSystemModifierData *psmd = NULL;
 	ParticleEditSettings *pset= PE_settings(data->scene);
-	int i, k, totpart;
+	POINT_P; KEY_K;
 	float mat[4][4], imat[4][4];
 
-	psmd= psys_get_modifier(data->ob,psys);
-	totpart= psys->totpart;
+	if(edit->psys)
+		psmd= psys_get_modifier(data->ob, edit->psys);
 
 	/* all is selected in path mode */
 	if(pset->selectmode==SCE_SELECT_PATH)
@@ -531,99 +556,77 @@ static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected
 	Mat4One(imat);
 	Mat4One(mat);
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
-		psys_mat_hair_to_global(data->ob, psmd->dm, psys->part->from, pa, mat);
-		Mat4Invert(imat,mat);
+	LOOP_VISIBLE_POINTS {
+		if(edit->psys) {
+			psys_mat_hair_to_global(data->ob, psmd->dm, psys->part->from, psys->particles + p, mat);
+			Mat4Invert(imat,mat);
+		}
 
 		if(pset->selectmode==SCE_SELECT_END) {
 			/* only do end keys */
-			key= psys->edit->keys[i] + pa->totkey-1;
+			key= point->keys + point->totkey-1;
 
 			if(selected==0 || key->flag & PEK_SELECT)
-				if(key_inside_circle(data, data->rad, key->world_co, &data->dist))
-					func(data, mat, imat, i, pa->totkey-1);
+				if(key_inside_circle(data, data->rad, KEY_WCO, &data->dist))
+					func(data, mat, imat, p, point->totkey-1, key);
 		}
 		else {
 			/* do all keys */
-			LOOP_KEYS(k, key) {
-				if(key->flag&PEK_HIDE) continue;
-
+			LOOP_VISIBLE_KEYS {
 				if(selected==0 || key->flag & PEK_SELECT)
-					if(key_inside_circle(data, data->rad, key->world_co, &data->dist))
-						func(data, mat, imat, i, k);
+					if(key_inside_circle(data, data->rad, KEY_WCO, &data->dist))
+						func(data, mat, imat, p, k, key);
 			}
 		}
 	}
 }
 
-static void foreach_selected_particle(PEData *data, ForParticleFunc func)
+static void foreach_selected_point(PEData *data, ForPointFunc func)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa;
-	int i, totpart;
+	PTCacheEdit *edit = data->edit;
+	POINT_P;
 
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa)
-		if(particle_is_selected(psys, pa))
-			func(data, i);
+	LOOP_SELECTED_POINTS {
+		func(data, p);
+	}
 }
 
 static void foreach_selected_key(PEData *data, ForKeyFunc func)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa;
-	ParticleEditKey *key;
-	int i, k, totpart;
+	PTCacheEdit *edit = data->edit;
+	POINT_P; KEY_K;
 
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
-		key= psys->edit->keys[i];
-
-		LOOP_KEYS(k, key)
-			if(key->flag & PEK_SELECT)
-				func(data, i, k);
+	LOOP_VISIBLE_POINTS {
+		LOOP_SELECTED_KEYS {
+			func(data, p, k);
+		}
 	}
 }
 
-void PE_foreach_particle(PEData *data, ForParticleFunc func)
+static void foreach_point(PEData *data, ForPointFunc func)
 {
-	ParticleSystem *psys= data->psys;
-	int i, totpart;
+	PTCacheEdit *edit = data->edit;
+	POINT_P;
 
-	totpart= psys->totpart;
-
-	for(i=0; i<totpart; i++)
-		func(data, i);
+	LOOP_POINTS { 
+		func(data, p);
+	}
 }
 
-static int count_selected_keys(Scene *scene, ParticleSystem *psys)
+static int count_selected_keys(Scene *scene, PTCacheEdit *edit)
 {
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset= PE_settings(scene);
-	int i, k, totpart, sel= 0;
-
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
-		key= psys->edit->keys[i];
+	POINT_P; KEY_K;
+	int sel= 0;
 
+	LOOP_VISIBLE_POINTS {
 		if(pset->selectmode==SCE_SELECT_POINT) {
-			for(k=0; k<pa->totkey; k++,key++)
-				if(key->flag & PEK_SELECT)
-					sel++;
+			LOOP_SELECTED_KEYS {
+				sel++;
+			}
 		}
 		else if(pset->selectmode==SCE_SELECT_END) {
-			key += pa->totkey-1;
-
+			key = point->keys + point->totkey - 1;
 			if(key->flag & PEK_SELECT)
 				sel++;
 		}
@@ -638,7 +641,7 @@ static int count_selected_keys(Scene *scene, ParticleSystem *psys)
 
 static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 {
-	ParticleEdit *edit;
+	PTCacheEdit *edit;
 	ParticleData *pa;
 	ParticleSystemModifierData *psmd;
 	KDTree *tree;
@@ -696,8 +699,9 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys, ParticleData *pa, ParticleData *mpa)
 {
 	HairKey *hkey, *mhkey;
-	ParticleEditKey *key, *mkey;
-	ParticleEdit *edit;
+	PTCacheEditPoint *point, *mpoint;
+	PTCacheEditKey *key, *mkey;
+	PTCacheEdit *edit;
 	float mat[4][4], mmat[4][4], immat[4][4];
 	int i, mi, k;
 
@@ -717,17 +721,20 @@ static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys
 	else
 		mi= mpa - psys->particles;
 
+	point = edit->points + i;
+	mpoint = edit->points + mi;
+
 	/* make sure they have the same amount of keys */
 	if(pa->totkey != mpa->totkey) {
 		if(mpa->hair) MEM_freeN(mpa->hair);
-		if(edit->keys[mi]) MEM_freeN(edit->keys[mi]);
+		if(mpoint->keys) MEM_freeN(mpoint->keys);
 
 		mpa->hair= MEM_dupallocN(pa->hair);
-		edit->keys[mi]= MEM_dupallocN(edit->keys[i]);
-		mpa->totkey= pa->totkey;
+		mpoint->keys= MEM_dupallocN(point->keys);
+		mpoint->totkey= point->totkey;
 
 		mhkey= mpa->hair;
-		mkey= edit->keys[mi];
+		mkey= mpoint->keys;
 		for(k=0; k<mpa->totkey; k++, mkey++, mhkey++) {
 			mkey->co= mhkey->co;
 			mkey->time= &mhkey->time;
@@ -742,8 +749,8 @@ static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys
 
 	hkey=pa->hair;
 	mhkey=mpa->hair;
-	key= edit->keys[i];
-	mkey= edit->keys[mi];
+	key= point->keys;
+	mkey= mpoint->keys;
 	for(k=0; k<pa->totkey; k++, hkey++, mhkey++, key++, mkey++) {
 		VECCOPY(mhkey->co, hkey->co);
 		Mat4MulVecfl(mat, mhkey->co);
@@ -754,199 +761,172 @@ static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys
 			mkey->flag |= PEK_TAG;
 	}
 
-	if(pa->flag & PARS_TAG)
-		mpa->flag |= PARS_TAG;
-	if(pa->flag & PARS_EDIT_RECALC)
-		mpa->flag |= PARS_EDIT_RECALC;
+	if(point->flag & PEP_TAG)
+		mpoint->flag |= PEP_TAG;
+	if(point->flag & PEP_EDIT_RECALC)
+		mpoint->flag |= PEP_EDIT_RECALC;
 }
 
 static void PE_apply_mirror(Object *ob, ParticleSystem *psys)
 {
-	ParticleEdit *edit;
-	ParticleData *pa;
+	PTCacheEdit *edit;
 	ParticleSystemModifierData *psmd;
-	int i, totpart;
+	POINT_P;
+
+	if(!psys)
+		return;
 
 	edit= psys->edit;
 	psmd= psys_get_modifier(ob, psys);
-	totpart= psys->totpart;
 
 	/* we delay settings the PARS_EDIT_RECALC for mirrored particles
 	 * to avoid doing mirror twice */
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_EDIT_RECALC) {
-			PE_mirror_particle(ob, psmd->dm, psys, pa, NULL);
+	LOOP_POINTS {
+		if(point->flag & PEP_EDIT_RECALC) {
+			PE_mirror_particle(ob, psmd->dm, psys, psys->particles + p, NULL);
 
-			if(edit->mirror_cache[i] != -1)
-				psys->particles[edit->mirror_cache[i]].flag &= ~PARS_EDIT_RECALC;
+			if(edit->mirror_cache[p] != -1)
+				edit->points[edit->mirror_cache[p]].flag &= ~PEP_EDIT_RECALC;
 		}
 	}
 
-	LOOP_PARTICLES(i, pa)
-		if(pa->flag & PARS_EDIT_RECALC)
-			if(edit->mirror_cache[i] != -1)
-				psys->particles[edit->mirror_cache[i]].flag |= PARS_EDIT_RECALC;
-
-	edit->totkeys= psys_count_keys(psys);
+	LOOP_POINTS {
+		if(point->flag & PEP_EDIT_RECALC)
+			if(edit->mirror_cache[p] != -1)
+				edit->points[edit->mirror_cache[p]].flag |= PEP_EDIT_RECALC;
+	}
 }
 
 /************************************************/
 /*			Edit Calculation					*/
 /************************************************/
 /* tries to stop edited particles from going through the emitter's surface */
-static void pe_deflect_emitter(Scene *scene, Object *ob, ParticleSystem *psys)
+static void pe_deflect_emitter(Scene *scene, Object *ob, PTCacheEdit *edit)
 {
-	ParticleEdit *edit;
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset= PE_settings(scene);
-	ParticleSystemModifierData *psmd= psys_get_modifier(ob,psys);
-	int i, k, totpart,index;
+	ParticleSystem *psys;
+	ParticleSystemModifierData *psmd;
+	POINT_P; KEY_K;
+	int index;
 	float *vec, *nor, dvec[3], dot, dist_1st;
 	float hairimat[4][4], hairmat[4][4];
 
-	if(psys==0)
+	if(edit==NULL || edit->psys==NULL || (pset->flag & PE_DEFLECT_EMITTER)==0)
 		return;
 
-	if((pset->flag & PE_DEFLECT_EMITTER)==0)
-		return;
+	psys = edit->psys;
+	psmd = psys_get_modifier(ob,psys);
 
-	edit= psys->edit;
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
-		if(!(pa->flag & PARS_EDIT_RECALC))
-			continue;
-		
-		psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, pa, hairmat);
-		
-		LOOP_KEYS(k, key) {
+	LOOP_EDITED_POINTS {
+		psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, psys->particles + p, hairmat);
+	
+		LOOP_KEYS {
 			Mat4MulVecfl(hairmat, key->co);
 		}
-	//}
 
-	//LOOP_PARTICLES(i, pa) {
-		key=psys->edit->keys[i]+1;
+		LOOP_KEYS {
+			if(k==0) {
+				dist_1st = VecLenf((key+1)->co, key->co);
+				dist_1st *= 0.75f * pset->emitterdist;
+			}
+			else {
+				index= BLI_kdtree_find_nearest(edit->emitter_field,key->co,NULL,NULL);
+				
+				vec=edit->emitter_cosnos +index*6;
+				nor=vec+3;
 
-		dist_1st=VecLenf((key-1)->co,key->co);
-		dist_1st*=0.75f*pset->emitterdist;
+				VecSubf(dvec, key->co, vec);
 
-		for(k=1; k<pa->totkey; k++, key++) {
-			index= BLI_kdtree_find_nearest(edit->emitter_field,key->co,NULL,NULL);
-			
-			vec=edit->emitter_cosnos +index*6;
-			nor=vec+3;
+				dot=Inpf(dvec,nor);
+				VECCOPY(dvec,nor);
 
-			VecSubf(dvec, key->co, vec);
-
-			dot=Inpf(dvec,nor);
-			VECCOPY(dvec,nor);
-
-			if(dot>0.0f) {
-				if(dot<dist_1st) {
+				if(dot>0.0f) {
+					if(dot<dist_1st) {
+						Normalize(dvec);
+						VecMulf(dvec,dist_1st-dot);
+						VecAddf(key->co,key->co,dvec);
+					}
+				}
+				else {
 					Normalize(dvec);
 					VecMulf(dvec,dist_1st-dot);
 					VecAddf(key->co,key->co,dvec);
 				}
+				if(k==1)
+					dist_1st*=1.3333f;
 			}
-			else {
-				Normalize(dvec);
-				VecMulf(dvec,dist_1st-dot);
-				VecAddf(key->co,key->co,dvec);
-			}
-			if(k==1)
-				dist_1st*=1.3333f;
 		}
-	//}
-
-	//LOOP_PARTICLES(i, pa) {
 		
 		Mat4Invert(hairimat,hairmat);
 
-		LOOP_KEYS(k, key) {
+		LOOP_KEYS {
 			Mat4MulVecfl(hairimat, key->co);
 		}
 	}
 }
 /* force set distances between neighbouring keys */
-void PE_apply_lengths(Scene *scene, ParticleSystem *psys)
+void PE_apply_lengths(Scene *scene, PTCacheEdit *edit)
 {
-	ParticleEdit *edit;
-	ParticleData *pa;
-	ParticleEditKey *key;
+	
 	ParticleEditSettings *pset=PE_settings(scene);
-	int i, k, totpart;
+	POINT_P; KEY_K;
 	float dv1[3];
 
-	if(psys==0)
+	if(edit==0 || (pset->flag & PE_KEEP_LENGTHS)==0)
 		return;
 
-	if((pset->flag & PE_KEEP_LENGTHS)==0)
-		return;
-
-	edit= psys->edit;
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
-		if(!(pa->flag & PARS_EDIT_RECALC))
-			continue;
-		
-		for(k=1, key=edit->keys[i] + 1; k<pa->totkey; k++, key++) {
-			VecSubf(dv1, key->co, (key - 1)->co);
-			Normalize(dv1);
-			VecMulf(dv1, (key - 1)->length);
-			VecAddf(key->co, (key - 1)->co, dv1);
+	LOOP_EDITED_POINTS {
+		LOOP_KEYS {
+			if(k) {
+				VecSubf(dv1, key->co, (key - 1)->co);
+				Normalize(dv1);
+				VecMulf(dv1, (key - 1)->length);
+				VecAddf(key->co, (key - 1)->co, dv1);
+			}
 		}
 	}
 }
 /* try to find a nice solution to keep distances between neighbouring keys */
-static void pe_iterate_lengths(Scene *scene, ParticleSystem *psys)
+static void pe_iterate_lengths(Scene *scene, PTCacheEdit *edit)
 {
-	ParticleEdit *edit;
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset=PE_settings(scene);
-	int i, j, k, totpart;
+	POINT_P;
+	PTCacheEditKey *key;
+	int j, k;
 	float tlen;
 	float dv0[3]= {0.0f, 0.0f, 0.0f};
 	float dv1[3]= {0.0f, 0.0f, 0.0f};
 	float dv2[3]= {0.0f, 0.0f, 0.0f};
 
-	if(psys==0)
+	if(edit==0)
 		return;
 
 	if((pset->flag & PE_KEEP_LENGTHS)==0)
 		return;
 
-	edit= psys->edit;
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
-		if(!(pa->flag & PARS_EDIT_RECALC))
-			continue;
-
-		for(j=1; j<pa->totkey; j++) {
-			float mul= 1.0f / (float)pa->totkey;
+	LOOP_EDITED_POINTS {
+		for(j=1; j<point->totkey; j++) {
+			float mul= 1.0f / (float)point->totkey;
 
 			if(pset->flag & PE_LOCK_FIRST) {
-				key= edit->keys[i] + 1;
+				key= point->keys + 1;
 				k= 1;
 				dv1[0]= dv1[1]= dv1[2]= 0.0;
 			}
 			else {
-				key= edit->keys[i];
+				key= point->keys;
 				k= 0;
 				dv0[0]= dv0[1]= dv0[2]= 0.0;
 			}
 
-			for(; k<pa->totkey; k++, key++) {
+			for(; k<point->totkey; k++, key++) {
 				if(k) {
 					VecSubf(dv0, (key - 1)->co, key->co);
 					tlen= Normalize(dv0);
 					VecMulf(dv0, (mul * (tlen - (key - 1)->length)));
 				}
 
-				if(k < pa->totkey - 1) {
+				if(k < point->totkey - 1) {
 					VecSubf(dv2, (key + 1)->co, key->co);
 					tlen= Normalize(dv2);
 					VecMulf(dv2, mul * (tlen - key->length));
@@ -962,20 +942,16 @@ static void pe_iterate_lengths(Scene *scene, ParticleSystem *psys)
 	}
 }
 /* set current distances to be kept between neighbouting keys */
-static void recalc_lengths(ParticleSystem *psys)
+static void recalc_lengths(PTCacheEdit *edit)
 {
-	ParticleData *pa;
-	ParticleEditKey *key;
-	int i, k, totpart;
+	POINT_P; KEY_K;
 
-	if(psys==0)
+	if(edit==0)
 		return;
 
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
-		key= psys->edit->keys[i];
-		for(k=0; k<pa->totkey-1; k++, key++) {
+	LOOP_EDITED_POINTS {
+		key= point->keys;
+		for(k=0; k<point->totkey-1; k++, key++) {
 			key->length= VecLenf(key->co, (key + 1)->co);
 		}
 	}
@@ -985,7 +961,7 @@ static void recalc_lengths(ParticleSystem *psys)
 static void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 {
 	DerivedMesh *dm=psys_get_modifier(ob,psys)->dm;
-	ParticleEdit *edit= psys->edit;
+	PTCacheEdit *edit= psys->edit;
 	MFace *mface;
 	MVert *mvert;
 	float *vec, *nor;
@@ -1042,74 +1018,145 @@ static void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 
 static void PE_update_selection(Scene *scene, Object *ob, int useflag)
 {
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit= psys->edit;
 	ParticleEditSettings *pset= PE_settings(scene);
-	ParticleSettings *part= psys->part;
-	ParticleData *pa;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 	HairKey *hkey;
-	ParticleEditKey *key;
-	float cfra= CFRA;
-	int i, k, totpart;
-
-	totpart= psys->totpart;
+	POINT_P; KEY_K;
 
 	/* flag all particles to be updated if not using flag */
 	if(!useflag)
-		LOOP_PARTICLES(i, pa)
-			pa->flag |= PARS_EDIT_RECALC;
+		LOOP_POINTS
+			point->flag |= PEP_EDIT_RECALC;
 
 	/* flush edit key flag to hair key flag to preserve selection 
 	 * on save */
-	LOOP_PARTICLES(i, pa) {
-		key= edit->keys[i];
-
-		for(k=0, hkey=pa->hair; k<pa->totkey; k++, hkey++, key++)
+	if(edit->psys) LOOP_POINTS {
+		hkey = edit->psys->particles[p].hair;
+		LOOP_KEYS {
 			hkey->editflag= key->flag;
+			hkey++;
+		}
 	}
 
-	psys_cache_paths(scene, ob, psys, CFRA, 1);
+	psys_cache_edit_paths(scene, ob, edit, CFRA);
 
-	if(part->childtype && (pset->flag & PE_SHOW_CHILD))
-		psys_cache_child_paths(scene, ob, psys, cfra, 1);
 
 	/* disable update flag */
-	LOOP_PARTICLES(i, pa)
-		pa->flag &= ~PARS_EDIT_RECALC;
+	LOOP_POINTS
+		point->flag &= ~PEP_EDIT_RECALC;
 }
 
+static void update_world_cos(Object *ob, PTCacheEdit *edit)
+{
+	ParticleSystem *psys = edit->psys;
+	ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
+	POINT_P; KEY_K;
+	float hairmat[4][4];
+
+	if(psys==0 || psys->edit==0)
+		return;
+
+	LOOP_POINTS {
+		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles+p, hairmat);
+
+		LOOP_KEYS {
+			VECCOPY(key->world_co,key->co);
+			Mat4MulVecfl(hairmat, key->world_co);
+		}
+	}
+}
+static void update_velocities(Object *ob, PTCacheEdit *edit)
+{
+	/*TODO: get frs_sec properly */
+	float vec1[3], vec2[3], frs_sec, dfra;
+	POINT_P; KEY_K;
+
+	/* hair doesn't use velocities */
+	if(edit->psys || !edit->points || !edit->points->keys->vel)
+		return;
+
+	frs_sec = edit->pid.flag & PTCACHE_VEL_PER_SEC ? 25.0f : 1.0f;
+
+	LOOP_EDITED_POINTS {
+		LOOP_KEYS {
+			if(k==0) {
+				dfra = *(key+1)->time - *key->time;
+
+				if(dfra <= 0.0f)
+					continue;
+
+				VECSUB(key->vel, (key+1)->co, key->co);
+
+				if(point->totkey>2) {
+					VECSUB(vec1, (key+1)->co, (key+2)->co);
+					Projf(vec2, vec1, key->vel);
+					VECSUB(vec2, vec1, vec2);
+					VECADDFAC(key->vel, key->vel, vec2, 0.5f);
+				}
+			}
+			else if(k==point->totkey-1) {
+				dfra = *key->time - *(key-1)->time;
+
+				if(dfra <= 0.0f)
+					continue;
+
+				VECSUB(key->vel, key->co, (key-1)->co);
+
+				if(point->totkey>2) {
+					VECSUB(vec1, (key-2)->co, (key-1)->co);
+					Projf(vec2, vec1, key->vel);
+					VECSUB(vec2, vec1, vec2);
+					VECADDFAC(key->vel, key->vel, vec2, 0.5f);
+				}
+			}
+			else {
+				dfra = *(key+1)->time - *(key-1)->time;
+				
+				if(dfra <= 0.0f)
+					continue;
+
+				VECSUB(key->vel, (key+1)->co, (key-1)->co);
+			}
+			VecMulf(key->vel, frs_sec/dfra);
+		}
+	}
+}
 void PE_update_object(Scene *scene, Object *ob, int useflag)
 {
-	ParticleSystem *psys= PE_get_current(scene, ob);
 	ParticleEditSettings *pset= PE_settings(scene);
-	ParticleSettings *part= psys->part;
-	ParticleData *pa;
-	float cfra= CFRA;
-	int i, totpart= psys->totpart;
+	PTCacheEdit *edit = PE_get_current(scene, ob);
+	POINT_P;
+
+	if(!edit)
+		return;
 
 	/* flag all particles to be updated if not using flag */
 	if(!useflag)
-		LOOP_PARTICLES(i, pa)
-			pa->flag |= PARS_EDIT_RECALC;
+		LOOP_POINTS {
+			point->flag |= PEP_EDIT_RECALC;
+		}
 
 	/* do post process on particle edit keys */
-	pe_iterate_lengths(scene, psys);
-	pe_deflect_emitter(scene, ob, psys);
-	PE_apply_lengths(scene, psys);
+	pe_iterate_lengths(scene, edit);
+	pe_deflect_emitter(scene, ob, edit);
+	PE_apply_lengths(scene, edit);
 	if(pset->flag & PE_X_MIRROR)
-		PE_apply_mirror(ob,psys);
-	psys_update_world_cos(ob,psys);
-	PE_hide_keys_time(scene, psys, cfra);
+		PE_apply_mirror(ob,edit->psys);
+	if(edit->psys)
+		update_world_cos(ob, edit);
+	if(pset->flag & PE_AUTO_VELOCITY)
+		update_velocities(ob, edit);
+	PE_hide_keys_time(scene, edit, CFRA);
 
 	/* regenerate path caches */
-	psys_cache_paths(scene, ob, psys, cfra, 1);
-
-	if(part->childtype && (pset->flag & PE_SHOW_CHILD))
-		psys_cache_child_paths(scene, ob, psys, cfra, 1);
+	psys_cache_edit_paths(scene, ob, edit, CFRA);
 
 	/* disable update flag */
-	LOOP_PARTICLES(i, pa)
-		pa->flag &= ~PARS_EDIT_RECALC;
+	LOOP_POINTS {
+		point->flag &= ~PEP_EDIT_RECALC;
+	}
+
+	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 }
 
 /************************************************/
@@ -1118,48 +1165,44 @@ void PE_update_object(Scene *scene, Object *ob, int useflag)
 
 /*-----selection callbacks-----*/
 
-static void select_key(PEData *data, int pa_index, int key_index)
+static void select_key(PEData *data, int point_index, int key_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= psys->particles + pa_index;
-	ParticleEditKey *key= psys->edit->keys[pa_index] + key_index;
+	PTCacheEdit *edit = data->edit;
+	PTCacheEditPoint *point = edit->points + point_index;
+	PTCacheEditKey *key = point->keys + key_index;
 
 	if(data->select)
 		key->flag |= PEK_SELECT;
 	else
 		key->flag &= ~PEK_SELECT;
 
-	pa->flag |= PARS_EDIT_RECALC;
+	point->flag |= PEP_EDIT_RECALC;
 }
 
-static void select_keys(PEData *data, int pa_index, int key_index)
+static void select_keys(PEData *data, int point_index, int key_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= psys->particles + pa_index;
-	ParticleEditKey *key= psys->edit->keys[pa_index];
-	int k;
+	PTCacheEdit *edit = data->edit;
+	PTCacheEditPoint *point = edit->points + point_index;
+	KEY_K;
 
-	for(k=0; k<pa->totkey; k++,key++) {
+	LOOP_KEYS {
 		if(data->select)
 			key->flag |= PEK_SELECT;
 		else
 			key->flag &= ~PEK_SELECT;
 	}
 
-	pa->flag |= PARS_EDIT_RECALC;
+	point->flag |= PEP_EDIT_RECALC;
 }
 
-static void toggle_key_select(PEData *data, int pa_index, int key_index)
+static void toggle_key_select(PEData *data, int point_index, int key_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= psys->particles + pa_index;
+	PTCacheEdit *edit = data->edit;
+	PTCacheEditPoint *point = edit->points + point_index;
+	PTCacheEditKey *key = point->keys + key_index;
 
-	if(psys->edit->keys[pa_index][key_index].flag&PEK_SELECT)
-		psys->edit->keys[pa_index][key_index].flag &= ~PEK_SELECT;
-	else
-		psys->edit->keys[pa_index][key_index].flag |= PEK_SELECT;
-	
-	pa->flag |= PARS_EDIT_RECALC;
+	key->flag ^= PEK_SELECT;
+	point->flag |= PEP_EDIT_RECALC;
 }
 
 /************************ de select all operator ************************/
@@ -1168,33 +1211,24 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit= 0;
-	ParticleData *pa;
-	ParticleEditKey *key;
-	int i, k, totpart, sel= 0;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	POINT_P; KEY_K;
+	int sel= 0;
 	
-	edit= psys->edit;
-	totpart= psys->totpart;
-	
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-		LOOP_KEYS(k, key) {
-			if(key->flag & PEK_SELECT) {
-				sel= 1;
-				key->flag &= ~PEK_SELECT;
-				pa->flag |= PARS_EDIT_RECALC;
-			}
+	LOOP_VISIBLE_POINTS {
+		LOOP_SELECTED_KEYS {
+			sel= 1;
+			key->flag &= ~PEK_SELECT;
+			point->flag |= PEP_EDIT_RECALC;
 		}
 	}
 
 	if(sel==0) {
-		LOOP_PARTICLES(i, pa) {
-			if(pa->flag & PARS_HIDE) continue;
-			LOOP_KEYS(k, key) {
+		LOOP_VISIBLE_POINTS {
+			LOOP_KEYS {
 				if(!(key->flag & PEK_SELECT)) {
 					key->flag |= PEK_SELECT;
-					pa->flag |= PARS_EDIT_RECALC;
+					point->flag |= PEP_EDIT_RECALC;
 				}
 			}
 		}
@@ -1227,26 +1261,17 @@ int PE_mouse_particles(bContext *C, short *mval, int extend)
 	PEData data;
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit= 0;
-	ParticleData *pa;
-	ParticleEditKey *key;
-	int i, k, totpart;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	POINT_P; KEY_K;
 	
-	if(!PE_can_edit(psys))
+	if(!PE_start_edit(edit))
 		return OPERATOR_CANCELLED;
 
-	edit= psys->edit;
-	totpart= psys->totpart;
-
 	if(!extend) {
-		LOOP_PARTICLES(i, pa) {
-			if(pa->flag & PARS_HIDE) continue;
-			LOOP_KEYS(k, key) {
-				if(key->flag & PEK_SELECT) {
-					key->flag &= ~PEK_SELECT;
-					pa->flag |= PARS_EDIT_RECALC;
-				}
+		LOOP_VISIBLE_POINTS {
+			LOOP_SELECTED_KEYS {
+				key->flag &= ~PEK_SELECT;
+				point->flag |= PEP_EDIT_RECALC;
 			}
 		}
 	}
@@ -1265,11 +1290,9 @@ int PE_mouse_particles(bContext *C, short *mval, int extend)
 
 /************************ select first operator ************************/
 
-static void select_root(PEData *data, int pa_index)
+static void select_root(PEData *data, int point_index)
 {
-	ParticleSystem *psys= data->psys;
-
-	psys->edit->keys[pa_index]->flag |= PEK_SELECT;
+	data->edit->points[point_index].keys->flag |= PEK_SELECT;
 }
 
 static int select_first_exec(bContext *C, wmOperator *op)
@@ -1277,7 +1300,7 @@ static int select_first_exec(bContext *C, wmOperator *op)
 	PEData data;
 
 	PE_set_data(C, &data);
-	PE_foreach_particle(&data, select_root);
+	foreach_point(&data, select_root);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1299,13 +1322,10 @@ void PARTICLE_OT_select_first(wmOperatorType *ot)
 
 /************************ select last operator ************************/
 
-static void select_tip(PEData *data, int pa_index)
+static void select_tip(PEData *data, int point_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= psys->particles + pa_index;
-	ParticleEditKey *key= psys->edit->keys[pa_index] + pa->totkey-1;
-
-	key->flag |= PEK_SELECT;
+	PTCacheEditPoint *point = data->edit->points + point_index;
+	point->keys[point->totkey - 1].flag |= PEK_SELECT;
 }
 
 static int select_last_exec(bContext *C, wmOperator *op)
@@ -1313,7 +1333,7 @@ static int select_last_exec(bContext *C, wmOperator *op)
 	PEData data;
 
 	PE_set_data(C, &data);
-	PE_foreach_particle(&data, select_tip);
+	foreach_point(&data, select_tip);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1396,10 +1416,10 @@ int PE_border_select(bContext *C, rcti *rect, int select)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 	PEData data;
 
-	if(!PE_can_edit(psys))
+	if(!PE_start_edit(edit))
 		return OPERATOR_CANCELLED;
 
 	PE_set_view3d_data(C, &data);
@@ -1420,10 +1440,10 @@ int PE_circle_select(bContext *C, int selecting, short *mval, float rad)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 	PEData data;
 
-	if(!PE_can_edit(psys))
+	if(!PE_start_edit(edit))
 		return OPERATOR_FINISHED;
 
 	PE_set_view3d_data(C, &data);
@@ -1446,47 +1466,42 @@ int PE_lasso_select(bContext *C, short mcords[][2], short moves, short select)
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	ARegion *ar= CTX_wm_region(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleSystemModifierData *psmd;
-	ParticleEdit *edit;
-	ParticleData *pa;
-	ParticleEditKey *key;
 	ParticleEditSettings *pset= PE_settings(scene);
+	PTCacheEdit *edit = PE_get_current(scene, ob);
+	ParticleSystem *psys = edit->psys;
+	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
+	POINT_P; KEY_K;
 	float co[3], mat[4][4];
 	short vertco[2];
-	int i, k, totpart;
 
-	if(!PE_can_edit(psys))
+	if(!PE_start_edit(edit))
 		return OPERATOR_CANCELLED;
 
-	psmd= psys_get_modifier(ob, psys);
-	edit= psys->edit;
-	totpart= psys->totpart;
+	Mat4One(mat);
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, mat);
+	LOOP_VISIBLE_POINTS {
+		if(edit->psys)
+			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + p, mat);
 
 		if(pset->selectmode==SCE_SELECT_POINT) {
-			LOOP_KEYS(k, key) {
+			LOOP_KEYS {
 				VECCOPY(co, key->co);
 				Mat4MulVecfl(mat, co);
 				project_short(ar, co, vertco);
 				if((vertco[0] != IS_CLIPPED) && lasso_inside(mcords,moves,vertco[0],vertco[1])) {
 					if(select && !(key->flag & PEK_SELECT)) {
 						key->flag |= PEK_SELECT;
-						pa->flag |= PARS_EDIT_RECALC;
+						point->flag |= PEP_EDIT_RECALC;
 					}
 					else if(key->flag & PEK_SELECT) {
 						key->flag &= ~PEK_SELECT;
-						pa->flag |= PARS_EDIT_RECALC;
+						point->flag |= PEP_EDIT_RECALC;
 					}
 				}
 			}
 		}
 		else if(pset->selectmode==SCE_SELECT_END) {
-			key= edit->keys[i] + pa->totkey - 1;
+			key= point->keys + point->totkey - 1;
 
 			VECCOPY(co, key->co);
 			Mat4MulVecfl(mat, co);
@@ -1494,11 +1509,11 @@ int PE_lasso_select(bContext *C, short mcords[][2], short moves, short select)
 			if((vertco[0] != IS_CLIPPED) && lasso_inside(mcords,moves,vertco[0],vertco[1])) {
 				if(select && !(key->flag & PEK_SELECT)) {
 					key->flag |= PEK_SELECT;
-					pa->flag |= PARS_EDIT_RECALC;
+					point->flag |= PEP_EDIT_RECALC;
 				}
 				else if(key->flag & PEK_SELECT) {
 					key->flag &= ~PEK_SELECT;
-					pa->flag |= PARS_EDIT_RECALC;
+					point->flag |= PEP_EDIT_RECALC;
 				}
 			}
 		}
@@ -1516,35 +1531,25 @@ static int hide_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
 	Scene *scene= CTX_data_scene(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit;
-	ParticleEditKey *key;
-	ParticleData *pa;
-	int i, k, totpart;
-
-	edit= psys->edit;
-	totpart= psys->totpart;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	POINT_P; KEY_K;
 	
 	if(RNA_enum_get(op->ptr, "unselected")) {
-		LOOP_PARTICLES(i, pa) {
-			if(!particle_is_selected(psys, pa)) {
-				pa->flag |= PARS_HIDE;
-				pa->flag |= PARS_EDIT_RECALC;
+		LOOP_UNSELECTED_POINTS {
+			point->flag |= PEP_HIDE;
+			point->flag |= PEP_EDIT_RECALC;
 
-				LOOP_KEYS(k, key)
-					key->flag &= ~PEK_SELECT;
-			}
+			LOOP_KEYS
+				key->flag &= ~PEK_SELECT;
 		}
 	}
 	else {
-		LOOP_PARTICLES(i, pa) {
-			if(particle_is_selected(psys, pa)) {
-				pa->flag |= PARS_HIDE;
-				pa->flag |= PARS_EDIT_RECALC;
+		LOOP_SELECTED_POINTS {
+			point->flag |= PEP_HIDE;
+			point->flag |= PEP_EDIT_RECALC;
 
-				LOOP_KEYS(k, key)
-					key->flag &= ~PEK_SELECT;
-			}
+			LOOP_KEYS
+				key->flag &= ~PEK_SELECT;
 		}
 	}
 
@@ -1577,21 +1582,15 @@ static int reveal_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
 	Scene *scene= CTX_data_scene(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit;
-	ParticleEditKey *key;
-	ParticleData *pa;
-	int i, k, totpart;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	POINT_P; KEY_K;
 
-	edit= psys->edit;
-	totpart= psys->totpart;
+	LOOP_POINTS {
+		if(point->flag & PEP_HIDE) {
+			point->flag &= ~PEP_HIDE;
+			point->flag |= PEP_EDIT_RECALC;
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) {
-			pa->flag &= ~PARS_HIDE;
-			pa->flag |= PARS_EDIT_RECALC;
-
-			LOOP_KEYS(k, key)
+			LOOP_KEYS
 				key->flag |= PEK_SELECT;
 		}
 	}
@@ -1618,34 +1617,30 @@ void PARTICLE_OT_reveal(wmOperatorType *ot)
 
 /************************ select less operator ************************/
 
-static void select_less_keys(PEData *data, int pa_index)
+static void select_less_keys(PEData *data, int point_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleEdit *edit= psys->edit;
-	ParticleData *pa= &psys->particles[pa_index];
-	ParticleEditKey *key;
-	int k;
-
-	for(k=0,key=edit->keys[pa_index]; k<pa->totkey; k++,key++) {
-		if((key->flag & PEK_SELECT)==0) continue;
+	PTCacheEdit *edit= data->edit;
+	PTCacheEditPoint *point = edit->points + point_index;
+	KEY_K;
 
+	LOOP_SELECTED_KEYS {
 		if(k==0) {
 			if(((key+1)->flag&PEK_SELECT)==0)
-				key->flag |= PEK_TO_SELECT;
+				key->flag |= PEK_TAG;
 		}
-		else if(k==pa->totkey-1) {
+		else if(k==point->totkey-1) {
 			if(((key-1)->flag&PEK_SELECT)==0)
-				key->flag |= PEK_TO_SELECT;
+				key->flag |= PEK_TAG;
 		}
 		else {
 			if((((key-1)->flag & (key+1)->flag) & PEK_SELECT)==0)
-				key->flag |= PEK_TO_SELECT;
+				key->flag |= PEK_TAG;
 		}
 	}
 
-	for(k=0,key=edit->keys[pa_index]; k<pa->totkey; k++,key++) {
-		if(key->flag&PEK_TO_SELECT)
-			key->flag &= ~(PEK_TO_SELECT|PEK_SELECT);
+	LOOP_KEYS {
+		if(key->flag&PEK_TAG)
+			key->flag &= ~(PEK_TAG|PEK_SELECT);
 	}
 }
 
@@ -1654,7 +1649,7 @@ static int select_less_exec(bContext *C, wmOperator *op)
 	PEData data;
 
 	PE_set_data(C, &data);
-	PE_foreach_particle(&data, select_less_keys);
+	foreach_point(&data, select_less_keys);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1676,34 +1671,32 @@ void PARTICLE_OT_select_less(wmOperatorType *ot)
 
 /************************ select more operator ************************/
 
-static void select_more_keys(PEData *data, int pa_index)
+static void select_more_keys(PEData *data, int point_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleEdit *edit= psys->edit;
-	ParticleData *pa= &psys->particles[pa_index];
-	ParticleEditKey *key;
-	int k;
+	PTCacheEdit *edit= data->edit;
+	PTCacheEditPoint *point = edit->points + point_index;
+	KEY_K;
 
-	for(k=0,key=edit->keys[pa_index]; k<pa->totkey; k++,key++) {
+	LOOP_KEYS {
 		if(key->flag & PEK_SELECT) continue;
 
 		if(k==0) {
 			if((key+1)->flag&PEK_SELECT)
-				key->flag |= PEK_TO_SELECT;
+				key->flag |= PEK_TAG;
 		}
-		else if(k==pa->totkey-1) {
+		else if(k==point->totkey-1) {
 			if((key-1)->flag&PEK_SELECT)
-				key->flag |= PEK_TO_SELECT;
+				key->flag |= PEK_TAG;
 		}
 		else {
 			if(((key-1)->flag | (key+1)->flag) & PEK_SELECT)
-				key->flag |= PEK_TO_SELECT;
+				key->flag |= PEK_TAG;
 		}
 	}
 
-	for(k=0,key=edit->keys[pa_index]; k<pa->totkey; k++,key++) {
-		if(key->flag&PEK_TO_SELECT) {
-			key->flag &= ~PEK_TO_SELECT;
+	LOOP_KEYS {
+		if(key->flag&PEK_TAG) {
+			key->flag &= ~PEK_TAG;
 			key->flag |= PEK_SELECT;
 		}
 	}
@@ -1714,7 +1707,7 @@ static int select_more_exec(bContext *C, wmOperator *op)
 	PEData data;
 
 	PE_set_data(C, &data);
-	PE_foreach_particle(&data, select_more_keys);
+	foreach_point(&data, select_more_keys);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
@@ -1738,12 +1731,13 @@ void PARTICLE_OT_select_more(wmOperatorType *ot)
 
 static void rekey_particle(PEData *data, int pa_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= &psys->particles[pa_index];
-	ParticleEdit *edit= psys->edit;
+	PTCacheEdit *edit= data->edit;
+	ParticleSystem *psys= edit->psys;
+	ParticleData *pa= psys->particles + pa_index;
+	PTCacheEditPoint *point = edit->points + pa_index;
 	ParticleKey state;
 	HairKey *key, *new_keys;
-	ParticleEditKey *ekey;
+	PTCacheEditKey *ekey;
 	float dval, sta, end;
 	int k;
 
@@ -1772,19 +1766,21 @@ static void rekey_particle(PEData *data, int pa_index)
 		MEM_freeN(pa->hair);
 	pa->hair= new_keys;
 
-	pa->totkey=data->totrekey;
+	point->totkey=pa->totkey=data->totrekey;
 
-	if(edit->keys[pa_index])
-		MEM_freeN(edit->keys[pa_index]);
-	ekey= edit->keys[pa_index]= MEM_callocN(pa->totkey * sizeof(ParticleEditKey),"Hair re-key edit keys");
+
+	if(point->keys)
+		MEM_freeN(point->keys);
+	ekey= point->keys= MEM_callocN(pa->totkey * sizeof(PTCacheEditKey),"Hair re-key edit keys");
 		
 	for(k=0, key=pa->hair; k<pa->totkey; k++, key++, ekey++) {
 		ekey->co= key->co;
 		ekey->time= &key->time;
+		ekey->flag |= PEK_USE_WCO;
 	}
 
 	pa->flag &= ~PARS_REKEY;
-	pa->flag |= PARS_EDIT_RECALC;
+	point->flag |= PEP_EDIT_RECALC;
 }
 
 static int rekey_exec(bContext *C, wmOperator *op)
@@ -1796,11 +1792,9 @@ static int rekey_exec(bContext *C, wmOperator *op)
 	data.dval= 1.0f / (float)(data.totrekey-1);
 	data.totrekey= RNA_int_get(op->ptr, "keys");
 
-	foreach_selected_particle(&data, rekey_particle);
-	
-	data.psys->edit->totkeys= psys_count_keys(data.psys);
-	recalc_lengths(data.psys);
+	foreach_selected_point(&data, rekey_particle);
 	
+	recalc_lengths(data.edit);
 	PE_update_object(data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, data.ob);
 
@@ -1827,19 +1821,19 @@ void PARTICLE_OT_rekey(wmOperatorType *ot)
 
 static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float path_time)
 {
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit=0;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	ParticleSystem *psys;
 	ParticleData *pa;
 	ParticleKey state;
 	HairKey *new_keys, *key;
-	ParticleEditKey *ekey;
+	PTCacheEditKey *ekey;
 	int k;
 
-	if(psys==0) return;
+	if(!edit || !edit->psys) return;
 
-	edit= psys->edit;
+	psys = edit->psys;
 
-	pa= &psys->particles[pa_index];
+	pa= psys->particles + pa_index;
 
 	pa->flag |= PARS_REKEY;
 
@@ -1858,7 +1852,7 @@ static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float
 	pa->hair= new_keys;
 
 	/* update edit pointers */
-	for(k=0, key=pa->hair, ekey=edit->keys[pa_index]; k<pa->totkey; k++, key++, ekey++) {
+	for(k=0, key=pa->hair, ekey=edit->points[pa_index].keys; k<pa->totkey; k++, key++, ekey++) {
 		ekey->co= key->co;
 		ekey->time= &key->time;
 	}
@@ -1870,10 +1864,11 @@ static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float
 
 static int remove_tagged_particles(Scene *scene, Object *ob, ParticleSystem *psys)
 {
-	ParticleEdit *edit= psys->edit;
+	PTCacheEdit *edit = psys->edit;
 	ParticleEditSettings *pset= PE_settings(scene);
 	ParticleData *pa, *npa=0, *new_pars=0;
-	ParticleEditKey **key, **nkey=0, **new_keys=0;
+	POINT_P;
+	PTCacheEditPoint *npoint=0, *new_points=0;
 	ParticleSystemModifierData *psmd;
 	int i, totpart, new_totpart= psys->totpart, removed= 0;
 
@@ -1882,55 +1877,51 @@ static int remove_tagged_particles(Scene *scene, Object *ob, ParticleSystem *psy
 		psmd= psys_get_modifier(ob, psys);
 		totpart= psys->totpart;
 
-		LOOP_PARTICLES(i, pa)
-			if(pa->flag & PARS_TAG)
-				PE_mirror_particle(ob, psmd->dm, psys, pa, NULL);
+		LOOP_TAGGED_POINTS {
+			PE_mirror_particle(ob, psmd->dm, psys, psys->particles + p, NULL);
+		}
 	}
 
-	for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++) {
-		if(pa->flag & PARS_TAG) {
-			new_totpart--;
-			removed++;
-		}
+	LOOP_TAGGED_POINTS {
+		new_totpart--;
+		removed++;
 	}
 
 	if(new_totpart != psys->totpart) {
 		if(new_totpart) {
 			npa= new_pars= MEM_callocN(new_totpart * sizeof(ParticleData), "ParticleData array");
-			nkey= new_keys= MEM_callocN(new_totpart * sizeof(ParticleEditKey *), "ParticleEditKey array");
+			npoint= new_points= MEM_callocN(new_totpart * sizeof(PTCacheEditPoint), "PTCacheEditKey array");
 		}
 
 		pa= psys->particles;
-		key= edit->keys;
-		for(i=0; i<psys->totpart; i++, pa++, key++) {
-			if(pa->flag & PARS_TAG) {
-				if(*key)
-					MEM_freeN(*key);
+		point= edit->points;
+		for(i=0; i<psys->totpart; i++, pa++, point++) {
+			if(point->flag & PEP_TAG) {
+				if(point->keys)
+					MEM_freeN(point->keys);
 				if(pa->hair)
 					MEM_freeN(pa->hair);
 			}
 			else {
 				memcpy(npa, pa, sizeof(ParticleData));
-				memcpy(nkey, key, sizeof(ParticleEditKey*));
+				memcpy(npoint, point, sizeof(PTCacheEditPoint));
 				npa++;
-				nkey++;
+				npoint++;
 			}
 		}
 
 		if(psys->particles) MEM_freeN(psys->particles);
 		psys->particles= new_pars;
 
-		if(edit->keys) MEM_freeN(edit->keys);
-		edit->keys= new_keys;
+		if(edit->points) MEM_freeN(edit->points);
+		edit->points= new_points;
 
 		if(edit->mirror_cache) {
 			MEM_freeN(edit->mirror_cache);
 			edit->mirror_cache= NULL;
 		}
 
-		psys->totpart= new_totpart;
-
-		edit->totkeys= psys_count_keys(psys);
+		edit->totpoint= psys->totpart= new_totpart;
 	}
 
 	return removed;
@@ -1938,84 +1929,82 @@ static int remove_tagged_particles(Scene *scene, Object *ob, ParticleSystem *psy
 
 static void remove_tagged_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 {
-	ParticleEdit *edit= psys->edit;
+	PTCacheEdit *edit= psys->edit;
 	ParticleEditSettings *pset= PE_settings(scene);
 	ParticleData *pa;
-	HairKey *key, *nkey, *new_keys=0;
-	ParticleEditKey *ekey;
+	HairKey *hkey, *nhkey, *new_hkeys=0;
+	POINT_P; KEY_K;
 	ParticleSystemModifierData *psmd;
-	int i, k, totpart= psys->totpart;
 	short new_totkey;
 
 	if(pset->flag & PE_X_MIRROR) {
 		/* mirror key tags */
 		psmd= psys_get_modifier(ob, psys);
 
-		LOOP_PARTICLES(i, pa) {
-			LOOP_KEYS(k,ekey) {
-				if(ekey->flag & PEK_TAG) {
-					PE_mirror_particle(ob, psmd->dm, psys, pa, NULL);
-					break;
-				}
+		LOOP_POINTS {
+			LOOP_TAGGED_KEYS {
+				PE_mirror_particle(ob, psmd->dm, psys, psys->particles + p, NULL);
+				break;
 			}
 		}
 	}
 
-	LOOP_PARTICLES(i, pa) {
-		new_totkey= pa->totkey;
-		LOOP_KEYS(k,ekey) {
-			if(ekey->flag & PEK_TAG)
-				new_totkey--;
+	LOOP_POINTS {
+		new_totkey= point->totkey;
+		LOOP_TAGGED_KEYS {
+			new_totkey--;
 		}
 		/* we can't have elements with less than two keys*/
 		if(new_totkey < 2)
-			pa->flag |= PARS_TAG;
+			point->flag |= PEP_TAG;
 	}
 	remove_tagged_particles(scene, ob, psys);
 
-	totpart= psys->totpart;
-
-	LOOP_PARTICLES(i, pa) {
+	LOOP_POINTS {
+		pa = psys->particles + p;
 		new_totkey= pa->totkey;
-		LOOP_KEYS(k,ekey) {
-			if(ekey->flag & PEK_TAG)
-				new_totkey--;
+
+		LOOP_TAGGED_KEYS {
+			new_totkey--;
 		}
+
 		if(new_totkey != pa->totkey) {
-			key= pa->hair;
-			nkey= new_keys= MEM_callocN(new_totkey*sizeof(HairKey), "HairKeys");
+			hkey= pa->hair;
+			nhkey= new_hkeys= MEM_callocN(new_totkey*sizeof(HairKey), "HairKeys");
 
-			for(k=0, ekey=edit->keys[i]; k<new_totkey; k++, key++, nkey++, ekey++) {
-				while(ekey->flag & PEK_TAG && key < pa->hair + pa->totkey) {
+			LOOP_KEYS {
+				while(key->flag & PEK_TAG && hkey < pa->hair + pa->totkey) {
 					key++;
-					ekey++;
+					hkey++;
 				}
 
-				if(key < pa->hair + pa->totkey) {
-					VECCOPY(nkey->co, key->co);
-					nkey->time= key->time;
-					nkey->weight= key->weight;
+				if(hkey < pa->hair + pa->totkey) {
+					VECCOPY(nhkey->co, hkey->co);
+					nhkey->time= hkey->time;
+					nhkey->weight= hkey->weight;
 				}
+				hkey++;
+				nhkey++;
 			}
 			if(pa->hair)
 				MEM_freeN(pa->hair);
 			
-			pa->hair= new_keys;
+			pa->hair= new_hkeys;
 
-			pa->totkey=new_totkey;
+			point->totkey= pa->totkey= new_totkey;
 
-			if(edit->keys[i])
-				MEM_freeN(edit->keys[i]);
-			ekey= edit->keys[i]= MEM_callocN(new_totkey*sizeof(ParticleEditKey), "particle edit keys");
+			if(point->keys)
+				MEM_freeN(point->keys);
+			key= point->keys= MEM_callocN(new_totkey*sizeof(PTCacheEditKey), "particle edit keys");
 
-			for(k=0, key=pa->hair; k<pa->totkey; k++, key++, ekey++) {
-				ekey->co= key->co;
-				ekey->time= &key->time;
+			hkey = pa->hair;
+			LOOP_KEYS {
+				key->co= hkey->co;
+				key->time= &hkey->time;
+				hkey++;
 			}
 		}
 	}
-
-	edit->totkeys= psys_count_keys(psys);
 }
 
 /************************ subdivide opertor *********************/
@@ -2023,19 +2012,19 @@ static void remove_tagged_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 /* works like normal edit mode subdivide, inserts keys between neighbouring selected keys */
 static void subdivide_particle(PEData *data, int pa_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleEdit *edit= psys->edit;
-	ParticleData *pa= &psys->particles[pa_index];
-	
+	PTCacheEdit *edit= data->edit;
+	ParticleSystem *psys= edit->psys;
+	ParticleData *pa= psys->particles + pa_index;
+	PTCacheEditPoint *point = edit->points + pa_index;
 	ParticleKey state;
 	HairKey *key, *nkey, *new_keys;
-	ParticleEditKey *ekey, *nekey, *new_ekeys;
+	PTCacheEditKey *ekey, *nekey, *new_ekeys;
 
 	int k;
 	short totnewkey=0;
 	float endtime;
 
-	for(k=0, ekey=edit->keys[pa_index]; k<pa->totkey-1; k++,ekey++) {
+	for(k=0, ekey=point->keys; k<pa->totkey-1; k++,ekey++) {
 		if(ekey->flag&PEK_SELECT && (ekey+1)->flag&PEK_SELECT)
 			totnewkey++;
 	}
@@ -2045,13 +2034,13 @@ static void subdivide_particle(PEData *data, int pa_index)
 	pa->flag |= PARS_REKEY;
 
 	nkey= new_keys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(HairKey)),"Hair subdivide keys");
-	nekey= new_ekeys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(ParticleEditKey)),"Hair subdivide edit keys");
+	nekey= new_ekeys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(PTCacheEditKey)),"Hair subdivide edit keys");
 	endtime= pa->hair[pa->totkey-1].time;
 
-	for(k=0, key=pa->hair, ekey=edit->keys[pa_index]; k<pa->totkey-1; k++, key++, ekey++) {
+	for(k=0, key=pa->hair, ekey=point->keys; k<pa->totkey-1; k++, key++, ekey++) {
 
 		memcpy(nkey,key,sizeof(HairKey));
-		memcpy(nekey,ekey,sizeof(ParticleEditKey));
+		memcpy(nekey,ekey,sizeof(PTCacheEditKey));
 
 		nekey->co= nkey->co;
 		nekey->time= &nkey->time;
@@ -2067,7 +2056,7 @@ static void subdivide_particle(PEData *data, int pa_index)
 
 			nekey->co= nkey->co;
 			nekey->time= &nkey->time;
-			nekey->flag |= PEK_SELECT;
+			nekey->flag |= (PEK_SELECT|PEK_USE_WCO);
 
 			nekey++;
 			nkey++;
@@ -2075,7 +2064,7 @@ static void subdivide_particle(PEData *data, int pa_index)
 	}
 	/*tip still not copied*/
 	memcpy(nkey,key,sizeof(HairKey));
-	memcpy(nekey,ekey,sizeof(ParticleEditKey));
+	memcpy(nekey,ekey,sizeof(PTCacheEditKey));
 
 	nekey->co= nkey->co;
 	nekey->time= &nkey->time;
@@ -2084,13 +2073,12 @@ static void subdivide_particle(PEData *data, int pa_index)
 		MEM_freeN(pa->hair);
 	pa->hair= new_keys;
 
-	if(edit->keys[pa_index])
-		MEM_freeN(edit->keys[pa_index]);
+	if(point->keys)
+		MEM_freeN(point->keys);
+	point->keys= new_ekeys;
 
-	edit->keys[pa_index]= new_ekeys;
-
-	pa->totkey += totnewkey;
-	pa->flag |= PARS_EDIT_RECALC;
+	point->totkey = pa->totkey = pa->totkey + totnewkey;
+	point->flag |= PEP_EDIT_RECALC;
 	pa->flag &= ~PARS_REKEY;
 }
 
@@ -2099,13 +2087,9 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 	PEData data;
 
 	PE_set_data(C, &data);
-	PE_foreach_particle(&data, subdivide_particle);
+	foreach_point(&data, subdivide_particle);
 	
-	data.psys->edit->totkeys= psys_count_keys(data.psys);
-	
-	recalc_lengths(data.psys);
-	psys_update_world_cos(data.ob, data.psys);
-
+	recalc_lengths(data.edit);
 	PE_update_object(data.scene, data.ob, 1);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, data.ob);
 
@@ -2132,15 +2116,15 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
 	ParticleEditSettings *pset=PE_settings(scene);
-	ParticleData *pa;
-	ParticleEdit *edit;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	ParticleSystem *psys = edit->psys;
 	ParticleSystemModifierData *psmd;
 	KDTree *tree;
 	KDTreeNearest nearest[10];
+	POINT_P;
 	float mat[4][4], co[3], threshold= RNA_float_get(op->ptr, "threshold");
-	int i, n, totn, removed, totpart, flag, totremoved;
+	int n, totn, removed, flag, totremoved;
 
 	edit= psys->edit;
 	psmd= psys_get_modifier(ob, psys);
@@ -2149,37 +2133,32 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 	do {
 		removed= 0;
 
-		totpart= psys->totpart;
-		tree=BLI_kdtree_new(totpart);
+		tree=BLI_kdtree_new(psys->totpart);
 			
 		/* insert particles into kd tree */
-		LOOP_PARTICLES(i, pa) {
-			if(particle_is_selected(psys, pa)) {
-				psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, pa, mat);
-				VECCOPY(co, pa->hair[0].co);
-				Mat4MulVecfl(mat, co);
-				BLI_kdtree_insert(tree, i, co, NULL);
-			}
+		LOOP_SELECTED_POINTS {
+			psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, psys->particles+p, mat);
+			VECCOPY(co, point->keys->co);
+			Mat4MulVecfl(mat, co);
+			BLI_kdtree_insert(tree, p, co, NULL);
 		}
 
 		BLI_kdtree_balance(tree);
 
 		/* tag particles to be removed */
-		LOOP_PARTICLES(i, pa) {
-			if(particle_is_selected(psys, pa)) {
-				psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, pa, mat);
-				VECCOPY(co, pa->hair[0].co);
-				Mat4MulVecfl(mat, co);
+		LOOP_SELECTED_POINTS {
+			psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, psys->particles+p, mat);
+			VECCOPY(co, point->keys->co);
+			Mat4MulVecfl(mat, co);
 
-				totn= BLI_kdtree_find_n_nearest(tree,10,co,NULL,nearest);
+			totn= BLI_kdtree_find_n_nearest(tree,10,co,NULL,nearest);
 
-				for(n=0; n<totn; n++) {
-					/* this needs a custom threshold still */
-					if(nearest[n].index > i && nearest[n].dist < threshold) {
-						if(!(pa->flag & PARS_TAG)) {
-							pa->flag |= PARS_TAG;
-							removed++;
-						}
+			for(n=0; n<totn; n++) {
+				/* this needs a custom threshold still */
+				if(nearest[n].index > p && nearest[n].dist < threshold) {
+					if(!(point->flag & PEP_TAG)) {
+						point->flag |= PEP_TAG;
+						removed++;
 					}
 				}
 			}
@@ -2200,7 +2179,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 
 	BKE_reportf(op->reports, RPT_INFO, "Remove %d double particles.", totremoved);
 
-	psys_update_world_cos(ob, psys);
+	PE_update_object(scene, ob, 0);
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
 
@@ -2347,16 +2326,16 @@ static EnumPropertyItem delete_type_items[]= {
 
 static void set_delete_particle(PEData *data, int pa_index)
 {
-	ParticleSystem *psys= data->psys;
+	PTCacheEdit *edit= data->edit;
 
-	psys->particles[pa_index].flag |= PARS_TAG;
+	edit->points[pa_index].flag |= PEP_TAG;
 }
 
 static void set_delete_particle_key(PEData *data, int pa_index, int key_index)
 {
-	ParticleSystem *psys= data->psys;
+	PTCacheEdit *edit= data->edit;
 
-	psys->edit->keys[pa_index][key_index].flag |= PEK_TAG;
+	edit->points[pa_index].keys[key_index].flag |= PEK_TAG;
 }
 
 static int delete_exec(bContext *C, wmOperator *op)
@@ -2368,15 +2347,17 @@ static int delete_exec(bContext *C, wmOperator *op)
 
 	if(type == DEL_KEY) {
 		foreach_selected_key(&data, set_delete_particle_key);
-		remove_tagged_keys(data.scene, data.ob, data.psys);
-		recalc_lengths(data.psys);
+		remove_tagged_keys(data.scene, data.ob, data.edit->psys);
+		recalc_lengths(data.edit);
 	}
 	else if(type == DEL_PARTICLE) {
-		foreach_selected_particle(&data, set_delete_particle);
-		remove_tagged_particles(data.scene, data.ob, data.psys);
-		recalc_lengths(data.psys);
+		foreach_selected_point(&data, set_delete_particle);
+		remove_tagged_particles(data.scene, data.ob, data.edit->psys);
+		recalc_lengths(data.edit);
 	}
 
+	PE_update_object(data.scene, data.ob, 0);
+
 	DAG_object_flush_update(data.scene, data.ob, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, data.ob);
 
@@ -2407,15 +2388,15 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 {
 	Mesh *me= (Mesh*)(ob->data);
 	ParticleSystemModifierData *psmd;
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	ParticleSystem *psys = edit->psys;
 	ParticleData *pa, *newpa, *new_pars;
-	ParticleEditKey *ekey, **newkey, **key, **new_keys;
+	PTCacheEditPoint *newpoint, *new_points;
+	POINT_P; KEY_K;
 	HairKey *hkey;
 	int *mirrorfaces;
-	int i, k, rotation, totpart, newtotpart;
+	int rotation, totpart, newtotpart;
 
-	edit= psys->edit;
 	psmd= psys_get_modifier(ob, psys);
 
 	mirrorfaces= mesh_get_x_mirror_faces(ob, NULL);
@@ -2425,29 +2406,28 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 
 	totpart= psys->totpart;
 	newtotpart= psys->totpart;
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
-
+	LOOP_VISIBLE_POINTS {
+		pa = psys->particles + p;
 		if(!tagged) {
-			if(particle_is_selected(psys, pa)) {
-				if(edit->mirror_cache[i] != -1) {
+			if(point_is_selected(point)) {
+				if(edit->mirror_cache[p] != -1) {
 					/* already has a mirror, don't need to duplicate */
 					PE_mirror_particle(ob, psmd->dm, psys, pa, NULL);
 					continue;
 				}
 				else
-					pa->flag |= PARS_TAG;
+					point->flag |= PEP_TAG;
 			}
 		}
 
-		if((pa->flag & PARS_TAG) && mirrorfaces[pa->num*2] != -1)
+		if((point->flag & PEP_TAG) && mirrorfaces[pa->num*2] != -1)
 			newtotpart++;
 	}
 
 	if(newtotpart != psys->totpart) {
 		/* allocate new arrays and copy existing */
 		new_pars= MEM_callocN(newtotpart*sizeof(ParticleData), "ParticleData new");
-		new_keys= MEM_callocN(newtotpart*sizeof(ParticleEditKey*), "ParticleEditKey new");
+		new_points= MEM_callocN(newtotpart*sizeof(PTCacheEditPoint), "PTCacheEditPoint new");
 
 		if(psys->particles) {
 			memcpy(new_pars, psys->particles, totpart*sizeof(ParticleData));
@@ -2455,36 +2435,35 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 		}
 		psys->particles= new_pars;
 
-		if(edit->keys) {
-			memcpy(new_keys, edit->keys, totpart*sizeof(ParticleEditKey*));
-			MEM_freeN(edit->keys);
+		if(edit->points) {
+			memcpy(new_points, edit->points, totpart*sizeof(PTCacheEditPoint));
+			MEM_freeN(edit->points);
 		}
-		edit->keys= new_keys;
+		edit->points= new_points;
 
 		if(edit->mirror_cache) {
 			MEM_freeN(edit->mirror_cache);
 			edit->mirror_cache= NULL;
 		}
 
-		psys->totpart= newtotpart;
+		edit->totpoint= psys->totpart= newtotpart;
 			
 		/* create new elements */
-		pa= psys->particles;
 		newpa= psys->particles + totpart;
-		key= edit->keys;
-		newkey= edit->keys + totpart;
+		newpoint= edit->points + totpart;
 
-		for(i=0; i<totpart; i++, pa++, key++) {
-			if(pa->flag & PARS_HIDE) continue;
+		LOOP_VISIBLE_POINTS {
+			pa = psys->particles + p;
 
-			if(!(pa->flag & PARS_TAG) || mirrorfaces[pa->num*2] == -1)
+			if(!(point->flag & PEP_TAG) || mirrorfaces[pa->num*2] == -1)
 				continue;
 
 			/* duplicate */
 			*newpa= *pa;
+			*newpoint= *point;
 			if(pa->hair) newpa->hair= MEM_dupallocN(pa->hair);
 			if(pa->keys) newpa->keys= MEM_dupallocN(pa->keys);
-			if(*key) *newkey= MEM_dupallocN(*key);
+			if(point->keys) newpoint->keys= MEM_dupallocN(point->keys);
 
 			/* rotate weights according to vertex index rotation */
 			rotation= mirrorfaces[pa->num*2+1];
@@ -2503,24 +2482,23 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 			newpa->num_dmcache= psys_particle_dm_face_lookup(ob,psmd->dm,newpa->num,newpa->fuv, NULL);
 
 			/* update edit key pointers */
-			ekey= *newkey;
-			for(k=0, hkey=newpa->hair; k<newpa->totkey; k++, hkey++, ekey++) {
-				ekey->co= hkey->co;
-				ekey->time= &hkey->time;
+			key= newpoint->keys;
+			for(k=0, hkey=newpa->hair; k<newpa->totkey; k++, hkey++, key++) {
+				key->co= hkey->co;
+				key->time= &hkey->time;
 			}
 
 			/* map key positions as mirror over x axis */
 			PE_mirror_particle(ob, psmd->dm, psys, pa, newpa);
 
 			newpa++;
-			newkey++;
+			newpoint++;
 		}
-
-		edit->totkeys= psys_count_keys(psys);
 	}
 
-	for(pa=psys->particles, i=0; i<psys->totpart; i++, pa++)
-		pa->flag &= ~PARS_TAG;
+	LOOP_POINTS {
+		point->flag &= ~PEP_TAG;
+	}
 
 	MEM_freeN(mirrorfaces);
 }
@@ -2529,11 +2507,11 @@ static int mirror_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 	
 	PE_mirror_x(scene, ob, 0);
 
-	psys_update_world_cos(ob, psys);
+	update_world_cos(ob, edit);
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 
@@ -2560,7 +2538,6 @@ static EnumPropertyItem brush_type_items[]= {
 	{PE_BRUSH_NONE, "NONE", 0, "None", ""},
 	{PE_BRUSH_COMB, "COMB", 0, "Comb", ""},
 	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", ""},
-	{PE_BRUSH_WEIGHT, "WEIGHT", 0, "Weight", ""},
 	{PE_BRUSH_ADD, "ADD", 0, "Add", ""},
 	{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", ""},
 	{PE_BRUSH_PUFF, "PUFF", 0, "Puff", ""},
@@ -2593,14 +2570,46 @@ void PARTICLE_OT_brush_set(wmOperatorType *ot)
 	RNA_def_enum(ot->srna, "type", brush_type_items, PE_BRUSH_NONE, "Type", "Brush type to select for editing.");
 }
 
+
+/*********************** set mode operator **********************/
+
+static EnumPropertyItem edit_type_items[]= {
+	{PE_TYPE_PARTICLES, "PARTICLES", 0, "Particles", ""},
+	{PE_TYPE_SOFTBODY, "SOFTBODY", 0, "Soft body", ""},
+	{PE_TYPE_CLOTH, "CLOTH", 0, "Cloth", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int set_edit_mode_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	ParticleEditSettings *pset= PE_settings(scene);
+
+	pset->edittype= RNA_enum_get(op->ptr, "type");
+
+	return OPERATOR_FINISHED;
+}
+
+void PARTICLE_OT_edit_type_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Set Brush";
+	ot->idname= "PARTICLE_OT_edit_type_set";
+	
+	/* api callbacks */
+	ot->exec= set_brush_exec;
+	ot->invoke= WM_menu_invoke;
+	ot->poll= PE_poll;
+
+	/* properties */
+	RNA_def_enum(ot->srna, "type", edit_type_items, PE_TYPE_PARTICLES, "Type", "Edit type to select for editing.");
+}
+
 /************************* brush edit callbacks ********************/
 
-static void brush_comb(PEData *data, float mat[][4], float imat[][4], int pa_index, int key_index)
+static void brush_comb(PEData *data, float mat[][4], float imat[][4], int point_index, int key_index, PTCacheEditKey *key)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= &psys->particles[pa_index];
 	ParticleEditSettings *pset= PE_settings(data->scene);
-	HairKey *key= pa->hair + key_index;
 	float cvec[3], fac;
 
 	if(pset->flag & PE_LOCK_FIRST && key_index == 0) return;
@@ -2612,19 +2621,21 @@ static void brush_comb(PEData *data, float mat[][4], float imat[][4], int pa_ind
 	VecMulf(cvec, fac);
 	VECADD(key->co, key->co, cvec);
 
-	pa->flag |= PARS_EDIT_RECALC;
+	(data->edit->points + point_index)->flag |= PEP_EDIT_RECALC;
 }
 
 static void brush_cut(PEData *data, int pa_index)
 {
-	ParticleSystem *psys= data->psys;
+	PTCacheEdit *edit = data->edit;
+	ParticleSystem *psys= edit->psys;
 	ARegion *ar= data->vc.ar;
 	Object *ob= data->ob;
+	ParticleEditSettings *pset= PE_settings(data->scene);
 	ParticleData *pa= &psys->particles[pa_index];
-	ParticleCacheKey *key= psys->pathcache[pa_index];
+	ParticleCacheKey *key= edit->pathcache[pa_index];
 	float rad2, cut_time= 1.0;
 	float x0, x1, v0, v1, o0, o1, xo0, xo1, d, dv;
-	int k, cut, keys= (int)pow(2.0, (double)psys->part->draw_step);
+	int k, cut, keys= (int)pow(2.0, (double)pset->draw_step);
 	short vertco[2];
 
 	/* blunt scissors */
@@ -2699,93 +2710,97 @@ static void brush_cut(PEData *data, int pa_index)
 
 	if(cut) {
 		if(cut_time < 0.0f) {
-			pa->flag |= PARS_TAG;
+			edit->points[pa_index].flag |= PEP_TAG;
 		}
 		else {
 			rekey_particle_to_time(data->scene, ob, pa_index, cut_time);
-			pa->flag |= PARS_EDIT_RECALC;
+			edit->points[pa_index].flag |= PEP_EDIT_RECALC;
 		}
 	}
 }
 
-static void brush_length(PEData *data, int pa_index)
+static void brush_length(PEData *data, int point_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= &psys->particles[pa_index];
-	HairKey *key;
+	PTCacheEdit *edit= data->edit;
+	PTCacheEditPoint *point = edit->points + point_index;
+	KEY_K;
 	float dvec[3],pvec[3];
-	int k;
 
-	key= pa->hair;
-	VECCOPY(pvec,key->co);
-
-	for(k=1, key++; k<pa->totkey; k++,key++) {
-		VECSUB(dvec,key->co,pvec);
-		VECCOPY(pvec,key->co);
-		VecMulf(dvec,data->growfac);
-		VECADD(key->co,(key-1)->co,dvec);
+	LOOP_KEYS {
+		if(k==0) {
+			VECCOPY(pvec,key->co);
+		}
+		else {
+			VECSUB(dvec,key->co,pvec);
+			VECCOPY(pvec,key->co);
+			VecMulf(dvec,data->growfac);
+			VECADD(key->co,(key-1)->co,dvec);
+		}
 	}
 
-	pa->flag |= PARS_EDIT_RECALC;
+	point->flag |= PEP_EDIT_RECALC;
 }
 
-static void brush_puff(PEData *data, int pa_index)
+static void brush_puff(PEData *data, int point_index)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= &psys->particles[pa_index];
-	ParticleEdit *edit= psys->edit;
-	HairKey *key;
+	PTCacheEdit *edit = data->edit;
+	ParticleSystem *psys = edit->psys;
+	PTCacheEditPoint *point = edit->points + point_index;
+	KEY_K;
 	float mat[4][4], imat[4][4];
 	float lastco[3], rootco[3], co[3], nor[3], kco[3], dco[3], fac, length;
-	int k;
 
-	psys_mat_hair_to_global(data->ob, data->dm, psys->part->from, pa, mat);
-	Mat4Invert(imat,mat);
-
-	/* find root coordinate and normal on emitter */
-	key= pa->hair;
-	VECCOPY(co, key->co);
-	Mat4MulVecfl(mat, co);
-
-	pa_index= BLI_kdtree_find_nearest(edit->emitter_field, co, NULL, NULL);
-	if(pa_index == -1) return;
-
-	VECCOPY(rootco, co);
-	VecCopyf(nor, &psys->edit->emitter_cosnos[pa_index*6+3]);
-	Normalize(nor);
-	length= 0.0f;
-
-	fac= (float)pow((double)(1.0f - data->dist / data->rad), (double)data->pufffac);
-	fac *= 0.025f;
-	if(data->invert)
-		fac= -fac;
-
-	for(k=1, key++; k<pa->totkey; k++, key++) {
-		/* compute position as if hair was standing up straight */
-		VECCOPY(lastco, co);
-		VECCOPY(co, key->co);
-		Mat4MulVecfl(mat, co);
-		length += VecLenf(lastco, co);
-
-		VECADDFAC(kco, rootco, nor, length);
-
-		/* blend between the current and straight position */
-		VECSUB(dco, kco, co);
-		VECADDFAC(co, co, dco, fac);
-
-		VECCOPY(key->co, co);
-		Mat4MulVecfl(imat, key->co);
+	if(psys) {
+		psys_mat_hair_to_global(data->ob, data->dm, psys->part->from, psys->particles + point_index, mat);
+		Mat4Invert(imat,mat);
+	}
+	else {
+		Mat4One(mat);
+		Mat4One(imat);
 	}
 
-	pa->flag |= PARS_EDIT_RECALC;
+	LOOP_KEYS {
+		if(k==0) {
+			/* find root coordinate and normal on emitter */
+			VECCOPY(co, key->co);
+			Mat4MulVecfl(mat, co);
+
+			point_index= BLI_kdtree_find_nearest(edit->emitter_field, co, NULL, NULL);
+			if(point_index == -1) return;
+
+			VECCOPY(rootco, co);
+			VecCopyf(nor, &edit->emitter_cosnos[point_index*6+3]);
+			Normalize(nor);
+			length= 0.0f;
+
+			fac= (float)pow((double)(1.0f - data->dist / data->rad), (double)data->pufffac);
+			fac *= 0.025f;
+			if(data->invert)
+				fac= -fac;
+		}
+		else {
+			/* compute position as if hair was standing up straight */
+			VECCOPY(lastco, co);
+			VECCOPY(co, key->co);
+			Mat4MulVecfl(mat, co);
+			length += VecLenf(lastco, co);
+
+			VECADDFAC(kco, rootco, nor, length);
+
+			/* blend between the current and straight position */
+			VECSUB(dco, kco, co);
+			VECADDFAC(co, co, dco, fac);
+
+			VECCOPY(key->co, co);
+			Mat4MulVecfl(imat, key->co);
+		}
+	}
+
+	point->flag |= PEP_EDIT_RECALC;
 }
 
-static void brush_smooth_get(PEData *data, float mat[][4], float imat[][4], int pa_index, int key_index)
-{
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= &psys->particles[pa_index];
-	HairKey *key= pa->hair + key_index;
-	
+static void brush_smooth_get(PEData *data, float mat[][4], float imat[][4], int point_index, int key_index, PTCacheEditKey *key)
+{	
 	if(key_index) {
 		float dvec[3];
 
@@ -2796,11 +2811,8 @@ static void brush_smooth_get(PEData *data, float mat[][4], float imat[][4], int
 	}
 }
 
-static void brush_smooth_do(PEData *data, float mat[][4], float imat[][4], int pa_index, int key_index)
+static void brush_smooth_do(PEData *data, float mat[][4], float imat[][4], int point_index, int key_index, PTCacheEditKey *key)
 {
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa= &psys->particles[pa_index];
-	HairKey *key= pa->hair + key_index;
 	float vec[3], dvec[3];
 	
 	if(key_index) {
@@ -2815,18 +2827,18 @@ static void brush_smooth_do(PEData *data, float mat[][4], float imat[][4], int p
 		VECADD(key->co,key->co,dvec);
 	}
 
-	pa->flag |= PARS_EDIT_RECALC;
+	(data->edit->points + point_index)->flag |= PEP_EDIT_RECALC;
 }
 
 static void brush_add(PEData *data, short number)
 {
 	Scene *scene= data->scene;
 	Object *ob= data->ob;
-	ParticleSystem *psys= data->psys;
+	PTCacheEdit *edit = data->edit;
+	ParticleSystem *psys= edit->psys;
 	ParticleData *add_pars= MEM_callocN(number*sizeof(ParticleData),"ParticleData add");
 	ParticleSystemModifierData *psmd= psys_get_modifier(ob,psys);
 	ParticleEditSettings *pset= PE_settings(scene);
-	ParticleEdit *edit= psys->edit;
 	int i, k, n= 0, totpart= psys->totpart;
 	short mco[2];
 	short dmx= 0, dmy= 0;
@@ -2873,19 +2885,20 @@ static void brush_add(PEData *data, short number)
 		float hairmat[4][4], cur_co[3];
 		KDTree *tree=0;
 		ParticleData *pa, *new_pars= MEM_callocN(newtotpart*sizeof(ParticleData),"ParticleData new");
-		ParticleEditKey *ekey, **key, **new_keys= MEM_callocN(newtotpart*sizeof(ParticleEditKey *),"ParticleEditKey array new");
+		PTCacheEditPoint *point, *new_points= MEM_callocN(newtotpart*sizeof(PTCacheEditPoint),"PTCacheEditPoint array new");
+		PTCacheEditKey *key;
 		HairKey *hkey;
 
 		/* save existing elements */
 		memcpy(new_pars, psys->particles, totpart * sizeof(ParticleData));
-		memcpy(new_keys, edit->keys, totpart * sizeof(ParticleEditKey*));
+		memcpy(new_points, edit->points, totpart * sizeof(PTCacheEditPoint));
 
 		/* change old arrays to new ones */
 		if(psys->particles) MEM_freeN(psys->particles);
 		psys->particles= new_pars;
 
-		if(edit->keys) MEM_freeN(edit->keys);
-		edit->keys= new_keys;
+		if(edit->points) MEM_freeN(edit->points);
+		edit->points= new_points;
 
 		if(edit->mirror_cache) {
 			MEM_freeN(edit->mirror_cache);
@@ -2904,29 +2917,29 @@ static void brush_add(PEData *data, short number)
 			BLI_kdtree_balance(tree);
 		}
 
-		psys->totpart= newtotpart;
+		edit->totpoint= psys->totpart= newtotpart;
 
 		/* create new elements */
 		pa= psys->particles + totpart;
-		key= edit->keys + totpart;
+		point= edit->points + totpart;
 
-		for(i=totpart; i<newtotpart; i++, pa++, key++) {
+		for(i=totpart; i<newtotpart; i++, pa++, point++) {
 			memcpy(pa, add_pars + i - totpart, sizeof(ParticleData));
 			pa->hair= MEM_callocN(pset->totaddkey * sizeof(HairKey), "BakeKey key add");
-			ekey= *key= MEM_callocN(pset->totaddkey * sizeof(ParticleEditKey), "ParticleEditKey add");
-			pa->totkey= pset->totaddkey;
+			key= point->keys= MEM_callocN(pset->totaddkey * sizeof(PTCacheEditKey), "PTCacheEditKey add");
+			point->totkey= pa->totkey= pset->totaddkey;
 
-			for(k=0, hkey=pa->hair; k<pa->totkey; k++, hkey++, ekey++) {
-				ekey->co= hkey->co;
-				ekey->time= &hkey->time;
+			for(k=0, hkey=pa->hair; k<pa->totkey; k++, hkey++, key++) {
+				key->co= hkey->co;
+				key->time= &hkey->time;
 			}
 			
 			pa->size= 1.0f;
 			initialize_particle(pa,i,ob,psys,psmd);
 			reset_particle(scene, pa,psys,psmd,ob,0.0,1.0,0,0,0);
-			pa->flag |= PARS_EDIT_RECALC;
+			point->flag |= PEP_EDIT_RECALC;
 			if(pset->flag & PE_X_MIRROR)
-				pa->flag |= PARS_TAG; /* signal for duplicate */
+				point->flag |= PEP_TAG; /* signal for duplicate */
 			
 			framestep= pa->lifetime/(float)(pset->totaddkey-1);
 
@@ -2997,7 +3010,6 @@ static void brush_add(PEData *data, short number)
 				Mat4MulVecfl(imat, hkey->co);
 			}
 		}
-		edit->totkeys= psys_count_keys(psys);
 
 		if(tree)
 			BLI_kdtree_free(tree);
@@ -3009,25 +3021,12 @@ static void brush_add(PEData *data, short number)
 		dm->release(dm);
 }
 
-static void brush_weight(PEData *data, float mat[][4], float imat[][4], int pa_index, int key_index)
-{
-	ParticleSystem *psys= data->psys;
-	ParticleData *pa;
-
-	/* roots have full weight allways */
-	if(key_index) {
-		pa= &psys->particles[pa_index];
-		pa->hair[key_index].weight= data->weightfac;
-		pa->flag |= PARS_EDIT_RECALC;
-	}
-}
-
 /************************* brush edit operator ********************/
 
 typedef struct BrushEdit {
 	Scene *scene;
 	Object *ob;
-	ParticleSystem *psys;
+	PTCacheEdit *edit;
 
 	int first;
 	int lastmouse[2];
@@ -3037,8 +3036,8 @@ static int brush_edit_init(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
 	ParticleEditSettings *pset= PE_settings(scene);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 	ARegion *ar= CTX_wm_region(C);
 	BrushEdit *bedit;
 
@@ -3053,7 +3052,7 @@ static int brush_edit_init(bContext *C, wmOperator *op)
 
 	bedit->scene= scene;
 	bedit->ob= ob;
-	bedit->psys= psys;
+	bedit->edit= edit;
 
 	return 1;
 }
@@ -3063,15 +3062,18 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 	BrushEdit *bedit= op->customdata;
 	Scene *scene= bedit->scene;
 	Object *ob= bedit->ob;
-	ParticleSystem *psys= bedit->psys;
+	PTCacheEdit *edit= bedit->edit;
 	ParticleEditSettings *pset= PE_settings(scene);
-	ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
+	ParticleSystemModifierData *psmd= edit->psys ? psys_get_modifier(ob, edit->psys) : NULL;
 	ParticleBrushData *brush= &pset->brush[pset->brushtype];
 	ARegion *ar= CTX_wm_region(C);
-	float vec1[3], vec2[3], mousef[2];
+	float vec[3], mousef[2];
 	short mval[2], mvalo[2];
 	int flip, mouse[2], dx, dy, removed= 0, selected= 0;
 
+	if(!PE_start_edit(edit))
+		return;
+
 	RNA_float_get_array(itemptr, "mouse", mousef);
 	mouse[0] = mousef[0];
 	mouse[1] = mousef[1];
@@ -3096,7 +3098,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 		|| bedit->first) {
 
 		view3d_operator_needs_opengl(C);
-		selected= (short)count_selected_keys(scene, psys);
+		selected= (short)count_selected_keys(scene, edit);
 
 		switch(pset->brushtype) {
 			case PE_BRUSH_COMB:
@@ -3115,10 +3117,8 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 
 				Mat4Invert(ob->imat, ob->obmat);
 
-				window_to_3d(ar, vec1, mvalo[0], mvalo[1]);
-				window_to_3d(ar, vec2, mval[0], mval[1]);
-				VECSUB(vec1, vec2, vec1);
-				data.dvec= vec1;
+				window_to_3d_delta(ar, vec, dx, dy);
+				data.dvec= vec;
 
 				foreach_mouse_hit_key(&data, brush_comb, selected);
 				break;
@@ -3126,20 +3126,22 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 			case PE_BRUSH_CUT:
 			{
 				PEData data;
+				
+				if(edit->psys && edit->pathcache) {
+					PE_set_view3d_data(C, &data);
+					data.mval= mval;
+					data.rad= (float)brush->size;
+					data.cutfac= (float)(brush->strength / 100.0f);
 
-				PE_set_view3d_data(C, &data);
-				data.mval= mval;
-				data.rad= (float)brush->size;
-				data.cutfac= (float)(brush->strength / 100.0f);
+					if(selected)
+						foreach_selected_point(&data, brush_cut);
+					else
+						foreach_point(&data, brush_cut);
 
-				if(selected)
-					foreach_selected_particle(&data, brush_cut);
-				else
-					PE_foreach_particle(&data, brush_cut);
-
-				removed= remove_tagged_particles(scene, ob, psys);
-				if(pset->flag & PE_KEEP_LENGTHS)
-					recalc_lengths(psys);
+					removed= remove_tagged_particles(scene, ob, edit->psys);
+					if(pset->flag & PE_KEEP_LENGTHS)
+						recalc_lengths(edit);
+				}
 				break;
 			}
 			case PE_BRUSH_LENGTH:
@@ -3157,61 +3159,50 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 				else
 					data.growfac= 1.0f + data.growfac;
 
-				foreach_mouse_hit_particle(&data, brush_length, selected);
+				foreach_mouse_hit_point(&data, brush_length, selected);
 
 				if(pset->flag & PE_KEEP_LENGTHS)
-					recalc_lengths(psys);
+					recalc_lengths(edit);
 				break;
 			}
 			case PE_BRUSH_PUFF:
 			{
 				PEData data;
 
-				PE_set_view3d_data(C, &data);
-				data.dm= psmd->dm;
-				data.mval= mval;
-				data.rad= (float)brush->size;
+				if(edit->psys) {
+					PE_set_view3d_data(C, &data);
+					data.dm= psmd->dm;
+					data.mval= mval;
+					data.rad= (float)brush->size;
 
-				data.pufffac= (float)(brush->strength - 50) / 50.0f;
-				if(data.pufffac < 0.0f)
-					data.pufffac= 1.0f - 9.0f * data.pufffac;
-				else
-					data.pufffac= 1.0f - data.pufffac;
+					data.pufffac= (float)(brush->strength - 50) / 50.0f;
+					if(data.pufffac < 0.0f)
+						data.pufffac= 1.0f - 9.0f * data.pufffac;
+					else
+						data.pufffac= 1.0f - data.pufffac;
 
-				data.invert= (brush->invert ^ flip);
-				Mat4Invert(ob->imat, ob->obmat);
+					data.invert= (brush->invert ^ flip);
+					Mat4Invert(ob->imat, ob->obmat);
 
-				foreach_mouse_hit_particle(&data, brush_puff, selected);
+					foreach_mouse_hit_point(&data, brush_puff, selected);
+				}
 				break;
 			}
 			case PE_BRUSH_ADD:
 			{
 				PEData data;
 
-				if(psys->part->from==PART_FROM_FACE) {
+				if(edit->psys && edit->psys->part->from==PART_FROM_FACE) {
 					PE_set_view3d_data(C, &data);
 					data.mval= mval;
 
 					brush_add(&data, brush->strength);
 
 					if(pset->flag & PE_KEEP_LENGTHS)
-						recalc_lengths(psys);
+						recalc_lengths(edit);
 				}
 				break;
 			}
-			case PE_BRUSH_WEIGHT:
-			{
-				PEData data;
-
-				PE_set_view3d_data(C, &data);
-				data.mval= mval;
-				data.rad= (float)brush->size;
-
-				data.weightfac= (float)(brush->strength / 100.0f);
-
-				foreach_mouse_hit_key(&data, brush_weight, selected);
-				break;
-			}
 			case PE_BRUSH_SMOOTH:
 			{
 				PEData data;
@@ -3238,14 +3229,14 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 			}
 		}
 		if((pset->flag & PE_KEEP_LENGTHS)==0)
-			recalc_lengths(psys);
+			recalc_lengths(edit);
 
 		if(pset->brushtype == PE_BRUSH_ADD || removed) {
 			if(pset->brushtype == PE_BRUSH_ADD && (pset->flag & PE_X_MIRROR))
 				PE_mirror_x(scene, ob, 1);
 
-			psys_update_world_cos(ob,psys);
-			psys_free_path_cache(psys);
+			update_world_cos(ob,edit);
+			psys_free_path_cache(NULL, edit);
 			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 		}
 		else
@@ -3357,104 +3348,157 @@ void PARTICLE_OT_brush_edit(wmOperatorType *ot)
 
 /*********************** undo ***************************/
 
-static void free_ParticleUndo(ParticleUndo *undo)
+static void free_PTCacheUndo(PTCacheUndo *undo)
 {
-	ParticleData *pa;
+	PTCacheEditPoint *point;
 	int i;
 
-	for(i=0, pa=undo->particles; i<undo->totpart; i++, pa++) {
-		if(pa->hair)
-			MEM_freeN(pa->hair);
-		if(undo->keys[i])
-			MEM_freeN(undo->keys[i]);
+	for(i=0, point=undo->points; i<undo->totpoint; i++, point++) {
+		if(undo->particles && (undo->particles + i)->hair)
+			MEM_freeN((undo->particles + i)->hair);
+		if(point->keys)
+			MEM_freeN(point->keys);
 	}
-	if(undo->keys)
-		MEM_freeN(undo->keys);
+	if(undo->points)
+		MEM_freeN(undo->points);
 
 	if(undo->particles)
 		MEM_freeN(undo->particles);
 
-	//if(undo->emitter_cosnos)
-	//	MEM_freeN(undo->emitter_cosnos);
+	BKE_ptcache_free_mem(&undo->mem_cache);
 }
 
-static void make_ParticleUndo(ParticleSystem *psys, ParticleUndo *undo)
+static void make_PTCacheUndo(PTCacheEdit *edit, PTCacheUndo *undo)
 {
-	ParticleData *pa,*upa;
+	PTCacheEditPoint *point;
 	int i;
 
-	undo->totpart= psys->totpart;
-	undo->totkeys= psys->edit->totkeys;
+	undo->totpoint= edit->totpoint;
 
-	upa= undo->particles= MEM_dupallocN(psys->particles);
-	undo->keys= MEM_dupallocN(psys->edit->keys);
-	
-	for(i=0, pa=psys->particles; i<undo->totpart; i++, pa++, upa++) {
-		upa->hair= MEM_dupallocN(pa->hair);
-		undo->keys[i]= MEM_dupallocN(psys->edit->keys[i]);
+	if(edit->psys) {
+		ParticleData *pa;
+
+		pa= undo->particles= MEM_dupallocN(edit->psys->particles);
+
+		for(i=0; i<edit->totpoint; i++, pa++)
+			pa->hair= MEM_dupallocN(pa->hair);
+	}
+	else {
+		PTCacheMem *pm;
+
+		BLI_duplicatelist(&undo->mem_cache, &edit->pid.cache->mem_cache);
+		pm = undo->mem_cache.first;
+
+		for(; pm; pm=pm->next) {
+			for(i=0; i<BPHYS_TOT_DATA; i++)
+				pm->data[i] = MEM_dupallocN(pm->data[i]);
+		}
+	}
+
+	point= undo->points = MEM_dupallocN(edit->points);
+	undo->totpoint = edit->totpoint;
+
+	for(i=0; i<edit->totpoint; i++, point++) {
+		point->keys= MEM_dupallocN(point->keys);
 		/* no need to update edit key->co & key->time pointers here */
 	}
 }
 
-static void get_ParticleUndo(ParticleSystem *psys, ParticleUndo *undo)
+static void get_PTCacheUndo(PTCacheEdit *edit, PTCacheUndo *undo)
 {
-	ParticleData *pa, *upa;
-	ParticleEditKey *key;
+	ParticleSystem *psys = edit->psys;
+	ParticleData *pa;
 	HairKey *hkey;
-	int i, k, totpart= psys->totpart;
+	POINT_P; KEY_K;
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->hair)
-			MEM_freeN(pa->hair);
+	LOOP_POINTS {
+		if(psys && psys->particles[p].hair)
+			MEM_freeN(psys->particles[p].hair);
 
-		if(psys->edit->keys[i])
-			MEM_freeN(psys->edit->keys[i]);
+		if(point->keys)
+			MEM_freeN(point->keys);
 	}
-	if(psys->particles)
+	if(psys && psys->particles)
 		MEM_freeN(psys->particles);
-	if(psys->edit->keys)
-		MEM_freeN(psys->edit->keys);
-	if(psys->edit->mirror_cache) {
-		MEM_freeN(psys->edit->mirror_cache);
-		psys->edit->mirror_cache= NULL;
+	if(edit->points)
+		MEM_freeN(edit->points);
+	if(edit->mirror_cache) {
+		MEM_freeN(edit->mirror_cache);
+		edit->mirror_cache= NULL;
 	}
 
-	pa= psys->particles= MEM_dupallocN(undo->particles);
-	psys->edit->keys= MEM_dupallocN(undo->keys);
+	edit->points= MEM_dupallocN(undo->points);
+	edit->totpoint = undo->totpoint;
 
-	for(i=0,upa=undo->particles; i<undo->totpart; i++, upa++, pa++) {
-		hkey= pa->hair= MEM_dupallocN(upa->hair);
-		key= psys->edit->keys[i]= MEM_dupallocN(undo->keys[i]);
-		for(k=0; k<pa->totkey; k++, hkey++, key++) {
-			key->co= hkey->co;
-			key->time= &hkey->time;
+	LOOP_POINTS {
+		point->keys= MEM_dupallocN(point->keys);
+	}
+
+	if(psys) {
+		psys->particles= MEM_dupallocN(undo->particles);
+
+		psys->totpart= undo->totpoint;
+
+		LOOP_POINTS {
+			pa = psys->particles + p;
+			hkey= pa->hair = MEM_dupallocN(pa->hair);
+
+			LOOP_KEYS {
+				key->co= hkey->co;
+				key->time= &hkey->time;
+				hkey++;
+			}
 		}
 	}
+	else {
+		PTCacheMem *pm;
+		int i;
 
-	psys->totpart= undo->totpart;
-	psys->edit->totkeys= undo->totkeys;
+		BKE_ptcache_free_mem(&edit->pid.cache->mem_cache);
+
+		BLI_duplicatelist(&edit->pid.cache->mem_cache, &undo->mem_cache);
+
+		pm = edit->pid.cache->mem_cache.first;
+
+		for(; pm; pm=pm->next) {
+			for(i=0; i<BPHYS_TOT_DATA; i++)
+				pm->data[i] = MEM_dupallocN(pm->data[i]);
+
+			BKE_ptcache_mem_init_pointers(pm);
+
+			LOOP_POINTS {
+				LOOP_KEYS {
+					if((int)key->ftime == pm->frame) {
+						key->co = pm->cur[BPHYS_DATA_LOCATION];
+						key->vel = pm->cur[BPHYS_DATA_VELOCITY];
+						key->rot = pm->cur[BPHYS_DATA_ROTATION];
+						key->time = &key->ftime;
+					}
+				}
+				BKE_ptcache_mem_incr_pointers(pm);
+			}
+		}
+	}
 }
 
 void PE_undo_push(Scene *scene, char *str)
 {
-	ParticleSystem *psys= PE_get_current(scene, OBACT);
-	ParticleEdit *edit= 0;
-	ParticleUndo *undo;
+	PTCacheEdit *edit= PE_get_current(scene, OBACT);
+	PTCacheUndo *undo;
 	int nr;
 
-	if(!PE_can_edit(psys)) return;
-	edit= psys->edit;
+	if(!edit) return;
 
 	/* remove all undos after (also when curundo==NULL) */
 	while(edit->undo.last != edit->curundo) {
 		undo= edit->undo.last;
 		BLI_remlink(&edit->undo, undo);
-		free_ParticleUndo(undo);
+		free_PTCacheUndo(undo);
 		MEM_freeN(undo);
 	}
 
 	/* make new */
-	edit->curundo= undo= MEM_callocN(sizeof(ParticleUndo), "particle undo file");
+	edit->curundo= undo= MEM_callocN(sizeof(PTCacheUndo), "particle undo file");
 	strncpy(undo->name, str, 64-1);
 	BLI_addtail(&edit->undo, undo);
 	
@@ -3468,27 +3512,25 @@ void PE_undo_push(Scene *scene, char *str)
 	}
 	if(undo) {
 		while(edit->undo.first!=undo) {
-			ParticleUndo *first= edit->undo.first;
+			PTCacheUndo *first= edit->undo.first;
 			BLI_remlink(&edit->undo, first);
-			free_ParticleUndo(first);
+			free_PTCacheUndo(first);
 			MEM_freeN(first);
 		}
 	}
 
 	/* copy  */
-	make_ParticleUndo(psys,edit->curundo);
+	make_PTCacheUndo(edit,edit->curundo);
 }
 
 void PE_undo_step(Scene *scene, int step)
 {	
-	ParticleSystem *psys= PE_get_current(scene, OBACT);
-	ParticleEdit *edit= 0;
+	PTCacheEdit *edit= PE_get_current(scene, OBACT);
 
-	if(!PE_can_edit(psys)) return;
-	edit= psys->edit;
+	if(!edit) return;
 
 	if(step==0) {
-		get_ParticleUndo(psys,edit->curundo);
+		get_PTCacheUndo(edit,edit->curundo);
 	}
 	else if(step==1) {
 		
@@ -3496,7 +3538,7 @@ void PE_undo_step(Scene *scene, int step)
 		else {
 			if(G.f & G_DEBUG) printf("undo %s\n", edit->curundo->name);
 			edit->curundo= edit->curundo->prev;
-			get_ParticleUndo(psys, edit->curundo);
+			get_PTCacheUndo(edit, edit->curundo);
 		}
 	}
 	else {
@@ -3504,18 +3546,19 @@ void PE_undo_step(Scene *scene, int step)
 		
 		if(edit->curundo==NULL || edit->curundo->next==NULL);
 		else {
-			get_ParticleUndo(psys, edit->curundo->next);
+			get_PTCacheUndo(edit, edit->curundo->next);
 			edit->curundo= edit->curundo->next;
 			if(G.f & G_DEBUG) printf("redo %s\n", edit->curundo->name);
 		}
 	}
 
+	PE_update_object(scene, OBACT, 0);
 	DAG_object_flush_update(scene, OBACT, OB_RECALC_DATA);
 }
 
-static void ParticleUndo_number(Scene *scene, ParticleEdit *edit, int nr)
+static void PTCacheUndo_number(Scene *scene, PTCacheEdit *edit, int nr)
 {
-	ParticleUndo *undo;
+	PTCacheUndo *undo;
 	int a=1;
 	
 	for(undo= edit->undo.first; undo; undo= undo->next, a++) {
@@ -3525,20 +3568,15 @@ static void ParticleUndo_number(Scene *scene, ParticleEdit *edit, int nr)
 	PE_undo_step(scene, 0);
 }
 
-static void ParticleUndo_clear(ParticleSystem *psys)
+static void PTCacheUndo_clear(PTCacheEdit *edit)
 {
-	ParticleUndo *undo;
-	ParticleEdit *edit;
-
-	if(psys==0) return;
-
-	edit= psys->edit;
+	PTCacheUndo *undo;
 
 	if(edit==0) return;
 	
 	undo= edit->undo.first;
 	while(undo) {
-		free_ParticleUndo(undo);
+		free_PTCacheUndo(undo);
 		undo= undo->next;
 	}
 	BLI_freelistN(&edit->undo);
@@ -3557,15 +3595,13 @@ void PE_redo(Scene *scene)
 
 void PE_undo_menu(Scene *scene, Object *ob)
 {
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleEdit *edit= 0;
-	ParticleUndo *undo;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	PTCacheUndo *undo;
 	DynStr *ds;
 	short event=0;
 	char *menu;
 
-	if(!PE_can_edit(psys)) return;
-	edit= psys->edit;
+	if(!edit) return;
 	
 	ds= BLI_dynstr_new();
 
@@ -3582,7 +3618,7 @@ void PE_undo_menu(Scene *scene, Object *ob)
 // XXX	event= pupmenu_col(menu, 20);
 	MEM_freeN(menu);
 	
-	if(event>0) ParticleUndo_number(scene, edit,event);
+	if(event>0) PTCacheUndo_number(scene, edit, event);
 }
 
 /************************ utilities ******************************/
@@ -3590,30 +3626,29 @@ void PE_undo_menu(Scene *scene, Object *ob)
 int PE_minmax(Scene *scene, float *min, float *max)
 {
 	Object *ob= OBACT;
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	ParticleSystemModifierData *psmd;
-	ParticleData *pa;
-	ParticleEditKey *key;
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	ParticleSystem *psys = edit->psys;
+	ParticleSystemModifierData *psmd = NULL;
+	POINT_P; KEY_K;
 	float co[3], mat[4][4];
-	int i, k, totpart, ok= 0;
+	int ok= 0;
 
-	if(!PE_can_edit(psys)) return ok;
+	if(!edit) return ok;
 	
-	psmd= psys_get_modifier(ob, psys);
-	totpart= psys->totpart;
+	if(psys)
+		psmd= psys_get_modifier(ob, psys);
+	else
+		Mat4One(mat);
 
-	LOOP_PARTICLES(i, pa) {
-		if(pa->flag & PARS_HIDE) continue;
+	LOOP_VISIBLE_POINTS {
+		if(psys)
+			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles+p, mat);
 
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, mat);
-
-		LOOP_KEYS(k, key) {
-			if(key->flag & PEK_SELECT) {
-				VECCOPY(co, key->co);
-				Mat4MulVecfl(mat, co);
-				DO_MINMAX(co, min, max);		
-				ok= 1;
-			}
+		LOOP_SELECTED_KEYS {
+			VECCOPY(co, key->co);
+			Mat4MulVecfl(mat, co);
+			DO_MINMAX(co, min, max);		
+			ok= 1;
 		}
 	}
 
@@ -3628,56 +3663,106 @@ int PE_minmax(Scene *scene, float *min, float *max)
 /************************ particle edit toggle operator ************************/
 
 /* initialize needed data for bake edit */
-static void PE_create_particle_edit(Scene *scene, Object *ob, ParticleSystem *psys)
+static void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, ParticleSystem *psys)
 {
-	ParticleEdit *edit= psys->edit;
-	ParticleData *pa;
-	ParticleEditKey *key;
+	PTCacheEdit *edit= psys ? psys->edit : cache->edit;
+	POINT_P; KEY_K;
+	ParticleData *pa = NULL;
 	HairKey *hkey;
-	int i, k, totpart= psys->totpart, alloc=1;
+	int totpoint;
 
-	if((psys->flag & PSYS_EDITED)==0)
+	if(!psys && !cache)
 		return;
 
-	if(edit) {
-		int newtotkeys= psys_count_keys(psys);
+	if(cache && cache->flag & PTCACHE_DISK_CACHE)
+		return;
 
-		if(newtotkeys == edit->totkeys)
-			alloc=0;
-	}
+	if(!edit) {
+		totpoint = psys ? psys->totpart : ((PTCacheMem*)cache->mem_cache.first)->totpoint;
 
-	if(alloc) {
-		if(edit) {
-			printf("ParticleEdit exists already! Poke jahka!");
-			PE_free_particle_edit(psys);
-		}
+		edit= MEM_callocN(sizeof(PTCacheEdit), "PE_create_particle_edit");
+		edit->points=MEM_callocN(totpoint*sizeof(PTCacheEditPoint),"PTCacheEditPoints");
+		edit->totpoint = totpoint;
 
-		edit= psys->edit=MEM_callocN(sizeof(ParticleEdit), "PE_create_particle_edit");
-		psys->free_edit= PE_free_particle_edit;
+		if(psys && !cache) {
+			psys->edit= edit;
+			edit->psys = psys;
 
-		edit->keys=MEM_callocN(totpart*sizeof(ParticleEditKey*),"ParticleEditKey array");
+			psys->free_edit= PE_free_ptcache_edit;
 
-		LOOP_PARTICLES(i, pa) {
-			key= edit->keys[i]= MEM_callocN(pa->totkey*sizeof(ParticleEditKey),"ParticleEditKeys");
-			for(k=0, hkey=pa->hair; k<pa->totkey; k++, hkey++, key++) {
-				key->co= hkey->co;
-				key->time= &hkey->time;
-				key->flag= hkey->editflag;
+			edit->pathcache = NULL;
+			edit->pathcachebufs.first = edit->pathcachebufs.last = NULL;
+
+			pa = psys->particles;
+			LOOP_POINTS {
+				point->totkey = pa->totkey;
+				point->keys= MEM_callocN(point->totkey*sizeof(PTCacheEditKey),"ParticleEditKeys");
+				point->flag |= PEP_EDIT_RECALC;
+
+				hkey = pa->hair;
+				LOOP_KEYS {
+					key->co= hkey->co;
+					key->time= &hkey->time;
+					key->flag= hkey->editflag;
+					key->flag |= PEK_USE_WCO;
+					hkey++;
+				}
+				pa++;
 			}
 		}
+		else {
+			PTCacheMem *pm;
+			int totframe=0;
 
-		edit->totkeys= psys_count_keys(psys);
+			cache->edit= edit;
+			cache->free_edit= PE_free_ptcache_edit;
+			edit->psys = NULL;
+
+			for(pm=cache->mem_cache.first; pm; pm=pm->next)
+				totframe++;
+
+			for(pm=cache->mem_cache.first; pm; pm=pm->next) {
+				BKE_ptcache_mem_init_pointers(pm);
+
+				LOOP_POINTS {
+					if(psys) {
+						pa = psys->particles + p;
+						if((pm->next && pm->next->frame < pa->time)
+							|| (pm->prev && pm->prev->frame >= pa->dietime)) {
+								BKE_ptcache_mem_incr_pointers(pm);
+								continue;
+							}
+					}
+
+					if(!point->totkey) {
+						key = point->keys = MEM_callocN(totframe*sizeof(PTCacheEditKey),"ParticleEditKeys");
+						point->flag |= PEP_EDIT_RECALC;
+					}
+					else
+						key = point->keys + point->totkey;
+
+					key->co = pm->cur[BPHYS_DATA_LOCATION];
+					key->vel = pm->cur[BPHYS_DATA_VELOCITY];
+					key->rot = pm->cur[BPHYS_DATA_ROTATION];
+					key->ftime = (float)pm->frame;
+					key->time = &key->ftime;
+					BKE_ptcache_mem_incr_pointers(pm);
+
+					point->totkey++;
+				}
+			}
+			psys = NULL;
+		}
 
 		UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
 		UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
-	}
 
-	recalc_lengths(psys);
-	recalc_emitter_field(ob, psys);
-	psys_update_world_cos(ob, psys);
+		recalc_lengths(edit);
+		if(psys && !cache)
+			recalc_emitter_field(ob, psys);
+		PE_update_object(scene, ob, 1);
 
-	if(alloc) {
-		ParticleUndo_clear(psys);
+		PTCacheUndo_clear(edit);
 		PE_undo_push(scene, "Original");
 	}
 }
@@ -3690,30 +3775,16 @@ static int particle_edit_toggle_poll(bContext *C)
 	if(!scene || !ob || ob->id.lib)
 		return 0;
 	
-	return (ob->particlesystem.first != NULL);
+	return (ob->particlesystem.first || modifiers_findByType(ob, eModifierType_Cloth) || modifiers_findByType(ob, eModifierType_Softbody));
 }
 
 static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
-	
-	if(psys==NULL) {
-		psys= ob->particlesystem.first;
-		psys->flag |= PSYS_CURRENT;
-	}
+	PTCacheEdit *edit= PE_get_current(scene, ob, PE_settings(scene)->edittype);
 
 	if(!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
-		if(psys && psys->part->type == PART_HAIR && psys->flag & PSYS_EDITED) {
-			if(psys_check_enabled(ob, psys)) {
-				if(psys->edit==NULL)
-					PE_create_particle_edit(scene, ob, psys);
-
-				psys_update_world_cos(ob, psys);
-			}
-		}
-
 		ob->mode |= OB_MODE_PARTICLE_EDIT;
 		toggle_particle_cursor(C, 1);
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_PARTICLE, NULL);
@@ -3746,112 +3817,65 @@ void PARTICLE_OT_particle_edit_toggle(wmOperatorType *ot)
 
 /************************ set editable operator ************************/
 
-static int set_editable_exec(bContext *C, wmOperator *op)
+static int clear_edited_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	ParticleSystem *psys= PE_get_current(scene, ob);
+	ParticleSystem *psys = psys_get_current(ob);
 	
-	if(psys->flag & PSYS_EDITED) {
-		if(1) { // XXX okee("Lose changes done in particle mode?")) {
-			if(psys->edit)
-				PE_free_particle_edit(psys);
+	if(psys->edit) {
+		if(psys->edit->edited || 1) { // XXX okee("Lose changes done in particle mode?")) 
+			PE_free_ptcache_edit(psys->edit);
+
+			psys->edit = NULL;
+			psys->free_edit = NULL;
 
-			psys->flag &= ~PSYS_EDITED;
 			psys->recalc |= PSYS_RECALC_RESET;
 
+			psys_reset(psys, PSYS_RESET_DEPSGRAPH);
 			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 		}
 	}
-	else {
-		if(psys_check_enabled(ob, psys)) {
-			psys->flag |= PSYS_EDITED;
-
-			if(ob->mode & OB_MODE_PARTICLE_EDIT)
-				PE_create_particle_edit(scene, ob, psys);
-		}
-		else
-			BKE_report(op->reports, RPT_ERROR, "Particle system not enabled, skipping set editable");
-	}
 
 	return OPERATOR_FINISHED;
 }
 
-void PARTICLE_OT_editable_set(wmOperatorType *ot)
+void PARTICLE_OT_edited_clear(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Set Editable";
-	ot->idname= "PARTICLE_OT_editable_set";
+	ot->name= "Clear Edited";
+	ot->idname= "PARTICLE_OT_edited_clear";
 	
 	/* api callbacks */
-	ot->exec= set_editable_exec;
+	ot->exec= clear_edited_exec;
 	ot->poll= particle_edit_toggle_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-/*********************** change active **************************/
-
-void PE_change_act(void *ob_v, void *act_v)
-{
-	Scene *scene= NULL; // XXX
-	Object *ob= ob_v;
-	ParticleSystem *psys;
-	short act= *((short*)act_v) - 1;
-
-	if((psys=psys_get_current(ob)))
-		psys->flag &= ~PSYS_CURRENT;
-
-	if(act>=0) {
-		if((psys=BLI_findlink(&ob->particlesystem,act))) {
-			psys->flag |= PSYS_CURRENT;
-
-			if(psys_check_enabled(ob, psys)) {
-				if(ob->mode & OB_MODE_PARTICLE_EDIT && !psys->edit)
-					PE_create_particle_edit(scene, ob, psys);
-				psys_update_world_cos(ob, psys);
-			}
-		}
-	}
-}
-
-void PE_change_act_psys(Scene *scene, Object *ob, ParticleSystem *psys)
-{
-	ParticleSystem *p;
-	
-	if((p=psys_get_current(ob)))
-		p->flag &= ~PSYS_CURRENT;
-	
-	psys->flag |= PSYS_CURRENT;
-	
-	if(psys_check_enabled(ob, psys)) {
-		if(ob->mode & OB_MODE_PARTICLE_EDIT && !psys->edit)
-			PE_create_particle_edit(scene, ob, psys);
-
-		psys_update_world_cos(ob, psys);
-	}
-}
-
 /*********************** specials menu **************************/
 
 static int specials_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	Scene *scene= CTX_data_scene(C);
 	ParticleEditSettings *pset=PE_settings(scene);
+	PTCacheEdit *edit = PE_get_current(scene, CTX_data_active_object(C));
 	uiPopupMenu *pup;
 	uiLayout *layout;
 
 	pup= uiPupMenuBegin(C, "Specials", 0);
 	layout= uiPupMenuLayout(pup);
 
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_rekey");
-	if(pset->selectmode & SCE_SELECT_POINT) {
-		uiItemO(layout, NULL, 0, "PARTICLE_OT_subdivide");
-		uiItemO(layout, NULL, 0, "PARTICLE_OT_select_first");
-		uiItemO(layout, NULL, 0, "PARTICLE_OT_select_last");
+	if(edit->psys) {
+		uiItemO(layout, NULL, 0, "PARTICLE_OT_rekey");
+		if(pset->selectmode & SCE_SELECT_POINT) {
+			uiItemO(layout, NULL, 0, "PARTICLE_OT_subdivide");
+			uiItemO(layout, NULL, 0, "PARTICLE_OT_select_first");
+			uiItemO(layout, NULL, 0, "PARTICLE_OT_select_last");
+		}
+		uiItemO(layout, NULL, 0, "PARTICLE_OT_remove_doubles");
 	}
-	uiItemO(layout, NULL, 0, "PARTICLE_OT_remove_doubles");
 
 	uiPupMenuEnd(C, pup);
 
@@ -3896,7 +3920,7 @@ void ED_operatortypes_particle(void)
 	WM_operatortype_append(PARTICLE_OT_specials_menu);
 
 	WM_operatortype_append(PARTICLE_OT_particle_edit_toggle);
-	WM_operatortype_append(PARTICLE_OT_editable_set);
+	WM_operatortype_append(PARTICLE_OT_edited_clear);
 }
 
 void ED_keymap_particle(wmWindowManager *wm)
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index fca5b0cc59a..e6cd9c0e448 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -2120,9 +2120,7 @@ static int tree_element_active_psys(bContext *C, Scene *scene, TreeElement *te,
 {
 	if(set) {
 		Object *ob= (Object *)tselem->id;
-		ParticleSystem *psys= te->directdata;
 		
-		PE_change_act_psys(scene, ob, psys);
 		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 		
 // XXX		extern_set_butspace(F7KEY, 0);
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 6cf229ead31..e49616fc740 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -89,6 +89,7 @@
 #include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 #include "BKE_property.h"
 #include "BKE_smoke.h"
 #include "BKE_unit.h"
@@ -3138,6 +3139,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 {
 	Object *ob=base->object;
 	ParticleSystemModifierData *psmd;
+	ParticleEditSettings *pset = PE_settings(scene);
 	ParticleSettings *part;
 	ParticleData *pars, *pa;
 	ParticleKey state, *states=0;
@@ -3166,9 +3168,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
 	if(pars==0) return;
 
-	// XXX what logic is this?
-	if(!scene->obedit && psys_in_edit_mode(scene, psys)
-		&& psys->flag & PSYS_HAIR_DONE && part->draw_as==PART_DRAW_PATH)
+	/* don't draw normal paths in edit mode */
+	if(psys_in_edit_mode(scene, psys) && (pset->flag & PE_DRAW_PART)==0)
 		return;
 		
 	if(part->draw_as==PART_DRAW_NOT) return;
@@ -3709,33 +3710,27 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		wmLoadMatrix(rv3d->viewmat);
 }
 
-static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, ParticleSystem *psys, int dt)
+static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, PTCacheEdit *edit, int dt)
 {
-	ParticleEdit *edit = psys->edit;
-	ParticleData *pa;
-	ParticleCacheKey **path;
-	ParticleEditKey *key;
+	ParticleCacheKey **cache, *path, *pkey;
+	PTCacheEditPoint *point;
+	PTCacheEditKey *key;
 	ParticleEditSettings *pset = PE_settings(scene);
-	int i, k, totpart = psys->totpart, totchild=0, timed = pset->draw_timed;
+	int i, k, totpoint = edit->totpoint, timed = pset->flag & PE_FADE_TIME ? pset->fade_frames : 0;
+	int steps;
 	char nosel[4], sel[4];
 	float sel_col[3];
 	float nosel_col[3];
-	char val[32];
+	float *pathcol = NULL, *pcol;
 
 	/* create path and child path cache if it doesn't exist already */
-	if(psys->pathcache==0){
-		PE_hide_keys_time(scene, psys,CFRA);
-		psys_cache_paths(scene, ob, psys, CFRA,0);
-	}
-	if(psys->pathcache==0)
+	if(edit->pathcache==0)
+		psys_cache_edit_paths(scene, ob, edit, CFRA);
+
+	if(edit->pathcache==0)
 		return;
 
-	if(pset->flag & PE_SHOW_CHILD && psys->part->draw_as == PART_DRAW_PATH) {
-		if(psys->childcache==0)
-			psys_cache_child_paths(scene, ob, psys, CFRA, 0);
-	}
-	else if(!(pset->flag & PE_SHOW_CHILD) && psys->childcache)
-		free_child_path_cache(psys);
+	PE_hide_keys_time(scene, edit, CFRA);
 
 	/* opengl setup */
 	if((v3d->flag & V3D_ZBUF_SELECT)==0)
@@ -3751,65 +3746,50 @@ static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ob
 	nosel_col[1]=(float)nosel[1]/255.0f;
 	nosel_col[2]=(float)nosel[2]/255.0f;
 
-	if(psys->childcache)
-		totchild = psys->totchildcache;
 
 	/* draw paths */
-	if(timed)
+	if(timed) {
 		glEnable(GL_BLEND);
+		steps = (*edit->pathcache)->steps + 1;
+		pathcol = MEM_callocN(steps*4*sizeof(float), "particle path color data");
+	}
 
 	glEnableClientState(GL_VERTEX_ARRAY);
 
-	if(dt > OB_WIRE) {
-		/* solid shaded with lighting */
-		glEnableClientState(GL_NORMAL_ARRAY);
-		glEnableClientState(GL_COLOR_ARRAY);
+	/* solid shaded with lighting */
+	glEnableClientState(GL_NORMAL_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
 
-		glEnable(GL_COLOR_MATERIAL);
-		glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
-	}
-	else {
-		/* flat wire color */
-		glDisableClientState(GL_NORMAL_ARRAY);
-		glDisable(GL_LIGHTING);
-		UI_ThemeColor(TH_WIRE);
-	}
+	glEnable(GL_COLOR_MATERIAL);
+	glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 
 	/* only draw child paths with lighting */
 	if(dt > OB_WIRE)
 		glEnable(GL_LIGHTING);
 
-	if(psys->part->draw_as == PART_DRAW_PATH) {
-		for(i=0, path=psys->childcache; i<totchild; i++,path++){
-			glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->co);
-			if(dt > OB_WIRE) {
-				glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), (*path)->vel);
-				glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->col);
+	/* draw paths without lighting */
+	cache=edit->pathcache;
+	for(i=0; i<totpoint; i++){
+		path = cache[i];
+		glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
+		glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
+
+		if(timed) {
+			for(k=0, pcol=pathcol, pkey=path; k<steps; k++, pkey++, pcol+=4){
+				VECCOPY(pcol, pkey->col);
+				pcol[3] = 1.0f - fabs((float)CFRA - pkey->time)/(float)pset->fade_frames;
 			}
 
-			glDrawArrays(GL_LINE_STRIP, 0, (int)(*path)->steps + 1);
+			glColorPointer(4, GL_FLOAT, 4*sizeof(float), pathcol);
 		}
+		else
+			glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
+
+		glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1);
 	}
 
-	if(dt > OB_WIRE)
-		glDisable(GL_LIGHTING);
+	if(pathcol) { MEM_freeN(pathcol); pathcol = pcol = NULL; }
 
-	if(pset->brushtype == PE_BRUSH_WEIGHT) {
-		glLineWidth(2.0f);
-		glEnableClientState(GL_COLOR_ARRAY);
-		glDisable(GL_LIGHTING);
-	}
-
-	/* draw parents last without lighting */
-	for(i=0, pa=psys->particles, path = psys->pathcache; i<totpart; i++, pa++, path++){
-		glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->co);
-		if(dt > OB_WIRE)
-			glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), (*path)->vel);
-		if(dt > OB_WIRE || pset->brushtype == PE_BRUSH_WEIGHT)
-			glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->col);
-
-		glDrawArrays(GL_LINE_STRIP, 0, (int)(*path)->steps + 1);
-	}
 
 	/* draw edit vertices */
 	if(pset->selectmode!=SCE_SELECT_PATH){
@@ -3819,61 +3799,74 @@ static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ob
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 
 		if(pset->selectmode==SCE_SELECT_POINT){
+			float *pd=0,*pdata=0;
 			float *cd=0,*cdata=0;
-			cd=cdata=MEM_callocN(edit->totkeys*(timed?4:3)*sizeof(float), "particle edit color data");
+			int totkeys = 0;
+
+			for (i=0, point=edit->points; i<totpoint; i++, point++)
+				if(!(point->flag & PEP_HIDE))
+					totkeys += point->totkey;
+
+			if(!edit->psys)
+				pd=pdata=MEM_callocN(totkeys*3*sizeof(float), "particle edit point data");
+			cd=cdata=MEM_callocN(totkeys*(timed?4:3)*sizeof(float), "particle edit color data");
+
+			for(i=0, point=edit->points; i<totpoint; i++, point++){
+				if(point->flag & PEP_HIDE)
+					continue;
+
+				for(k=0, key=point->keys; k<point->totkey; k++, key++){
+					if(pd) {
+						VECCOPY(pd, key->co);
+						pd += 3;
+					}
 
-			for(i=0, pa=psys->particles; i<totpart; i++, pa++){
-				for(k=0, key=edit->keys[i]; k<pa->totkey; k++, key++){
 					if(key->flag&PEK_SELECT){
 						VECCOPY(cd,sel_col);
 					}
 					else{
 						VECCOPY(cd,nosel_col);
 					}
+
 					if(timed)
-						*(cd+3) = (key->flag&PEK_HIDE)?0.0f:1.0f;
+						*(cd+3) = 1.0f - fabs((float)CFRA - *key->time)/(float)pset->fade_frames;
+
 					cd += (timed?4:3);
 				}
 			}
 			cd=cdata;
-			for(i=0, pa=psys->particles; i<totpart; i++, pa++){
-				if((pa->flag & PARS_HIDE)==0){
-					glVertexPointer(3, GL_FLOAT, sizeof(ParticleEditKey), edit->keys[i]->world_co);
-					glColorPointer((timed?4:3), GL_FLOAT, (timed?4:3)*sizeof(float), cd);
-					glDrawArrays(GL_POINTS, 0, pa->totkey);
-				}
-				cd += (timed?4:3) * pa->totkey;
+			pd=pdata;
+			for(i=0, point=edit->points; i<totpoint; i++, point++){
+				if(point->flag & PEP_HIDE)
+					continue;
 
-				if((pset->flag&PE_SHOW_TIME) && (pa->flag&PARS_HIDE)==0 && !(G.f & G_RENDER_SHADOW)){
-					for(k=0, key=edit->keys[i]+k; k<pa->totkey; k++, key++){
-						if(key->flag & PEK_HIDE) continue;
+				if(edit->psys)
+					glVertexPointer(3, GL_FLOAT, sizeof(PTCacheEditKey), point->keys->world_co);
+				else
+					glVertexPointer(3, GL_FLOAT, 3*sizeof(float), pd);
 
-						sprintf(val," %.1f",*key->time);
-						view3d_particle_text_draw_add(key->world_co[0], key->world_co[1], key->world_co[2], val, 0);
-					}
-				}
+				glColorPointer((timed?4:3), GL_FLOAT, (timed?4:3)*sizeof(float), cd);
+
+				glDrawArrays(GL_POINTS, 0, point->totkey);
+
+				pd += pd ? 3 * point->totkey : 0;
+				cd += (timed?4:3) * point->totkey;
 			}
-			if(cdata)
-				MEM_freeN(cdata);
-			cd=cdata=0;
+			if(pdata) { MEM_freeN(pdata); pd=pdata=0; }
+			if(cdata) { MEM_freeN(cdata); cd=cdata=0; }
 		}
 		else if(pset->selectmode == SCE_SELECT_END){
-			for(i=0, pa=psys->particles; i<totpart; i++, pa++){
-				if((pa->flag & PARS_HIDE)==0){
-					key = edit->keys[i] + pa->totkey - 1;
+			for(i=0, point=edit->points; i<totpoint; i++, point++){
+				if((point->flag & PEP_HIDE)==0){
+					key = point->keys + point->totkey - 1;
 					if(key->flag & PEK_SELECT)
 						glColor3fv(sel_col);
 					else
 						glColor3fv(nosel_col);
 					/* has to be like this.. otherwise selection won't work, have try glArrayElement later..*/
 					glBegin(GL_POINTS);
-					glVertex3fv(key->world_co);
+					glVertex3fv(key->flag & PEK_USE_WCO ? key->world_co : key->co);
 					glEnd();
-
-					if((pset->flag & PE_SHOW_TIME) && !(G.f & G_RENDER_SHADOW)){
-						sprintf(val," %.1f",*key->time);
-						view3d_particle_text_draw_add(key->world_co[0], key->world_co[1], key->world_co[2], val, 0);
-					}
 				}
 			}
 		}
@@ -5298,11 +5291,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		for(psys=ob->particlesystem.first; psys; psys=psys->next)
 			draw_new_particle_system(scene, v3d, rv3d, base, psys, dt);
 		
-		if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) {
-			psys= PE_get_current(scene, ob);
-			if(psys && !scene->obedit && psys_in_edit_mode(scene, psys))
-				draw_particle_edit(scene, v3d, rv3d, ob, psys, dt);
-		}
 		view3d_particle_text_draw(v3d, ar);
 
 		wmMultMatrix(ob->obmat);
@@ -5310,6 +5298,21 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		//glDepthMask(GL_TRUE);
 		if(col) cpack(col);
 	}
+	
+	if(		(warning_recursive==0) &&
+			(flag & DRAW_PICKING)==0 &&
+			(!scene->obedit)	
+	  ) {
+
+		if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) {
+			PTCacheEdit *edit = PE_get_current(scene, ob);
+			if(edit) {
+				wmLoadMatrix(rv3d->viewmat);
+				draw_ptcache_edit(scene, v3d, rv3d, ob, edit, dt);
+				wmMultMatrix(ob->obmat);
+			}
+		}
+	}
 
 	/* draw code for smoke */
 	{
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index eee85f21798..305b6956037 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -1571,7 +1571,7 @@ static char *view3d_modeselect_pup(Scene *scene)
 		str += sprintf(str, formatstr, "Pose Mode", OB_MODE_POSE, ICON_POSE_HLT);
 	}
 
-	if (ob->particlesystem.first) {
+	if (ob->particlesystem.first || modifiers_findByType(ob, eModifierType_Cloth) || modifiers_findByType(ob, eModifierType_Softbody)) {
 		str += sprintf(str, formatstr, "Particle Mode", OB_MODE_PARTICLE_EDIT, ICON_PARTICLEMODE);
 	}
 
@@ -1661,6 +1661,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 	ScrArea *sa= CTX_wm_area(C);
 	View3D *v3d= sa->spacedata.first;
 	Object *obedit = CTX_data_edit_object(C);
+	Object *ob = CTX_data_active_object(C);
 	EditMesh *em= NULL;
 	int bit, ctrl= win->eventstate->ctrl, shift= win->eventstate->shift;
 	PointerRNA props_ptr;
@@ -1759,14 +1760,17 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 
 	case B_SEL_PATH:
 		ts->particle.selectmode= SCE_SELECT_PATH;
+		WM_event_add_notifier(C, NC_OBJECT, ob);
 		ED_undo_push(C, "Selectmode Set: Path");
 		break;
 	case B_SEL_POINT:
 		ts->particle.selectmode = SCE_SELECT_POINT;
+		WM_event_add_notifier(C, NC_OBJECT, ob);
 		ED_undo_push(C, "Selectmode Set: Point");
 		break;
 	case B_SEL_END:
 		ts->particle.selectmode = SCE_SELECT_END;
+		WM_event_add_notifier(C, NC_OBJECT, ob);
 		ED_undo_push(C, "Selectmode Set: End point");
 		break;	
 	
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 5c5b7281f20..aaede541b76 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1617,31 +1617,32 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 	TransDataExtension *tx;
 	Base *base = CTX_data_active_base(C);
 	Object *ob = CTX_data_active_object(C);
-	ParticleSystem *psys = PE_get_current(t->scene, ob);
-	ParticleSystemModifierData *psmd = NULL;
 	ParticleEditSettings *pset = PE_settings(t->scene);
-	ParticleData *pa = NULL;
-	ParticleEdit *edit;
-	ParticleEditKey *key;
+	PTCacheEdit *edit = PE_get_current(t->scene, ob);
+	ParticleSystem *psys = NULL;
+	ParticleSystemModifierData *psmd = NULL;
+	PTCacheEditPoint *point;
+	PTCacheEditKey *key;
 	float mat[4][4];
-	int i,k, totpart, transformparticle;
+	int i,k, transformparticle;
 	int count = 0, hasselected = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 
-	if(psys==NULL || t->settings->particle.selectmode==SCE_SELECT_PATH) return;
+	if(edit==NULL || t->settings->particle.selectmode==SCE_SELECT_PATH) return;
 
-	psmd = psys_get_modifier(ob,psys);
+	psys = edit->psys;
+
+	if(psys)
+		psmd = psys_get_modifier(ob,psys);
 
-	edit = psys->edit;
-	totpart = psys->totpart;
 	base->flag |= BA_HAS_RECALC_DATA;
 
-	for(i=0, pa=psys->particles; i<totpart; i++, pa++) {
-		pa->flag &= ~PARS_TRANSFORM;
+	for(i=0, point=edit->points; i<edit->totpoint; i++, point++) {
+		point->flag &= ~PEP_TRANSFORM;
 		transformparticle= 0;
 
-		if((pa->flag & PARS_HIDE)==0) {
-			for(k=0, key=edit->keys[i]; k<pa->totkey; k++, key++) {
+		if((point->flag & PEP_HIDE)==0) {
+			for(k=0, key=point->keys; k<point->totkey; k++, key++) {
 				if((key->flag&PEK_HIDE)==0) {
 					if(key->flag&PEK_SELECT) {
 						hasselected= 1;
@@ -1654,8 +1655,8 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 		}
 
 		if(transformparticle) {
-			count += pa->totkey;
-			pa->flag |= PARS_TRANSFORM;
+			count += point->totkey;
+			point->flag |= PEP_TRANSFORM;
 		}
 	}
 
@@ -1674,18 +1675,23 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 
 	Mat4Invert(ob->imat,ob->obmat);
 
-	for(i=0, pa=psys->particles; i<totpart; i++, pa++) {
+	for(i=0, point=edit->points; i<edit->totpoint; i++, point++) {
 		TransData *head, *tail;
 		head = tail = td;
 
-		if(!(pa->flag & PARS_TRANSFORM)) continue;
+		if(!(point->flag & PEP_TRANSFORM)) continue;
 
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, mat);
+		if(psys)
+			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + i, mat);
 
-		for(k=0, key=edit->keys[i]; k<pa->totkey; k++, key++) {
-			VECCOPY(key->world_co, key->co);
-			Mat4MulVecfl(mat, key->world_co);
-			td->loc = key->world_co;
+		for(k=0, key=point->keys; k<point->totkey; k++, key++) {
+			if(psys) {
+				VECCOPY(key->world_co, key->co);
+				Mat4MulVecfl(mat, key->world_co);
+				td->loc = key->world_co;
+			}
+			else
+				td->loc = key->co;
 
 			VECCOPY(td->iloc, td->loc);
 			VECCOPY(td->center, td->loc);
@@ -1713,7 +1719,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 				if(k==0) tx->size = 0;
 				else tx->size = (key - 1)->time;
 
-				if(k == pa->totkey - 1) tx->quat = 0;
+				if(k == point->totkey - 1) tx->quat = 0;
 				else tx->quat = (key + 1)->time;
 			}
 
@@ -1731,35 +1737,42 @@ void flushTransParticles(TransInfo *t)
 {
 	Scene *scene = t->scene;
 	Object *ob = OBACT;
-	ParticleSystem *psys = PE_get_current(scene, ob);
+	PTCacheEdit *edit = PE_get_current(scene, ob);
+	ParticleSystem *psys = edit->psys;
 	ParticleSystemModifierData *psmd;
-	ParticleData *pa;
-	ParticleEditKey *key;
+	PTCacheEditPoint *point;
+	PTCacheEditKey *key;
 	TransData *td;
 	float mat[4][4], imat[4][4], co[3];
 	int i, k, propmode = t->flag & T_PROP_EDIT;
 
-	psmd = psys_get_modifier(ob, psys);
+	if(psys)
+		psmd = psys_get_modifier(ob, psys);
 
 	/* we do transform in world space, so flush world space position
-	 * back to particle local space */
+	 * back to particle local space (only for hair particles) */
 	td= t->data;
-	for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++, td++) {
-		if(!(pa->flag & PARS_TRANSFORM)) continue;
+	for(i=0, point=edit->points; i<edit->totpoint; i++, point++, td++) {
+		if(!(point->flag & PEP_TRANSFORM)) continue;
 
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, mat);
-		Mat4Invert(imat,mat);
+		if(psys) {
+			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + i, mat);
+			Mat4Invert(imat,mat);
 
-		for(k=0, key=psys->edit->keys[i]; k<pa->totkey; k++, key++) {
-			VECCOPY(co, key->world_co);
-			Mat4MulVecfl(imat, co);
+			for(k=0, key=point->keys; k<point->totkey; k++, key++) {
+				VECCOPY(co, key->world_co);
+				Mat4MulVecfl(imat, co);
 
-			/* optimization for proportional edit */
-			if(!propmode || !FloatCompare(key->co, co, 0.0001f)) {
-				VECCOPY(key->co, co);
-				pa->flag |= PARS_EDIT_RECALC;
+
+				/* optimization for proportional edit */
+				if(!propmode || !FloatCompare(key->co, co, 0.0001f)) {
+					VECCOPY(key->co, co);
+					point->flag |= PEP_EDIT_RECALC;
+				}
 			}
 		}
+		else
+			point->flag |= PEP_EDIT_RECALC;
 	}
 
 	PE_update_object(scene, OBACT, 1);
@@ -5256,7 +5269,8 @@ void createTransData(bContext *C, TransInfo *t)
 		}
 		CTX_DATA_END;
 	}
-	else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT) && PE_can_edit(PE_get_current(scene, ob))) {
+	else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT) 
+		&& PE_start_edit(PE_get_current(scene, ob))) {
 		createTransParticleVerts(C, t);
 
 		if(t->data && t->flag & T_PROP_EDIT) {
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 37fd79e38e1..e4ec43a8f38 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -62,6 +62,7 @@
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 #include "BKE_utildefines.h"
 
 #include "BLI_arithb.h"
@@ -362,18 +363,19 @@ int calc_manipulator_stats(const bContext *C)
 		;
 	}
 	else if(ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
-		ParticleSystem *psys= PE_get_current(scene, ob);
-		ParticleData *pa = psys->particles;
-		ParticleEditKey *ek;
+		PTCacheEdit *edit= PE_get_current(scene, ob);
+		PTCacheEditPoint *point;
+		PTCacheEditKey *ek;
 		int k;
 
-		if(psys->edit) {
-			for(a=0; a<psys->totpart; a++,pa++) {
-				if(pa->flag & PARS_HIDE) continue;
+		if(edit) {
+			point = edit->points;
+			for(a=0; a<edit->totpoint; a++,point++) {
+				if(point->flag & PEP_HIDE) continue;
 
-				for(k=0, ek=psys->edit->keys[a]; k<pa->totkey; k++, ek++) {
+				for(k=0, ek=point->keys; k<point->totkey; k++, ek++) {
 					if(ek->flag & PEK_SELECT) {
-						calc_tw_center(scene, ek->world_co);
+						calc_tw_center(scene, ek->flag & PEK_USE_WCO ? ek->world_co : ek->co);
 						totsel++;
 					}
 				}
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index 625864c4888..5696f82ab0d 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -95,7 +95,7 @@ typedef struct PartDeflect {
 typedef struct PTCacheMem {
 	struct PTCacheMem *next, *prev;
 	int frame, totpoint;
-	unsigned int data_types, rt;
+	unsigned int data_types, flag;
 	int *index_array; /* quick access to stored points with index */
 
 	void *data[8]; /* BPHYS_TOT_DATA */
@@ -121,6 +121,9 @@ typedef struct PointCache {
 	char info[64];
 	char path[240]; /* file path */
 	struct ListBase mem_cache;
+
+	struct PTCacheEdit *edit;
+	void (*free_edit)(struct PTCacheEdit *edit);	/* free callback */
 } PointCache;
 
 typedef struct SBVertex {
@@ -300,8 +303,8 @@ typedef struct SoftBody {
 #define PTCACHE_OUTDATED			2
 #define PTCACHE_SIMULATION_VALID	4
 #define PTCACHE_BAKING				8
-#define PTCACHE_BAKE_EDIT			16
-#define PTCACHE_BAKE_EDIT_ACTIVE	32
+//#define PTCACHE_BAKE_EDIT			16
+//#define PTCACHE_BAKE_EDIT_ACTIVE	32
 #define PTCACHE_DISK_CACHE			64
 #define PTCACHE_QUICK_CACHE			128
 #define PTCACHE_FRAMES_SKIPPED		256
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 925fd31328d..12c253a7cb8 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -194,8 +194,8 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 	ParticleData *particles;				/* (parent) particles */
 	ChildParticle *child;					/* child particles */
 
-	struct ParticleEdit *edit;						/* particle editmode (runtime) */
-	void (*free_edit)(struct ParticleSystem *sys);	/* free callback */
+	struct PTCacheEdit *edit;						/* particle editmode (runtime) */
+	void (*free_edit)(struct PTCacheEdit *edit);	/* free callback */
 
 	struct ParticleCacheKey **pathcache;	/* path cache (runtime) */
 	struct ParticleCacheKey **childcache;	/* child cache (runtime) */
@@ -419,7 +419,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PSYS_DELETE			256	/* remove particlesystem as soon as possible */
 #define PSYS_HAIR_DONE		512
 #define PSYS_KEYED			1024
-#define PSYS_EDITED			2048
+//#define PSYS_EDITED			2048
 //#define PSYS_PROTECT_CACHE	4096
 #define PSYS_DISABLED		8192
 
@@ -427,11 +427,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PARS_UNEXIST		1
 #define PARS_NO_DISP		2
 #define PARS_STICKY			4
-#define PARS_TRANSFORM		8
-#define PARS_HIDE			16
-#define PARS_TAG			32
-#define PARS_REKEY			64
-#define PARS_EDIT_RECALC	128
+#define PARS_REKEY			8
 
 /* pars->alive */
 #define PARS_KILLED			0
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 20429120812..73afc3d1a53 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -488,10 +488,15 @@ typedef struct ParticleEditSettings {
 	ParticleBrushData brush[7]; /* 7 = PE_TOT_BRUSH */
 	void *paintcursor;			/* runtime */
 
-	float emitterdist;
-	int draw_timed;
+	float emitterdist, rt;
 
-	int selectmode, pad;
+	int selectmode;
+	int edittype;
+
+	int draw_step, fade_frames;
+
+	struct Scene *scene;
+	struct Object *object;
 } ParticleEditSettings;
 
 typedef struct TransformOrientation {
@@ -1042,9 +1047,10 @@ typedef enum SculptFlags {
 #define PE_LOCK_FIRST			2
 #define PE_DEFLECT_EMITTER		4
 #define PE_INTERPOLATE_ADDED	8
-#define PE_SHOW_CHILD			16
-#define PE_SHOW_TIME			32
+#define PE_DRAW_PART			16
 #define PE_X_MIRROR				64
+#define PE_FADE_TIME			128
+#define PE_AUTO_VELOCITY		256
 
 /* toolsetting->particle brushtype */
 #define PE_BRUSH_NONE		-1
@@ -1053,11 +1059,15 @@ typedef enum SculptFlags {
 #define PE_BRUSH_LENGTH		2
 #define PE_BRUSH_PUFF		3
 #define PE_BRUSH_ADD		4
-#define PE_BRUSH_WEIGHT		5
-#define PE_BRUSH_SMOOTH		6
+#define PE_BRUSH_SMOOTH		5
 
 /* this must equal ParticleEditSettings.brush array size */
-#define PE_TOT_BRUSH		7  
+#define PE_TOT_BRUSH		6
+
+/* tooksettings->particle edittype */
+#define PE_TYPE_PARTICLES	0
+#define PE_TYPE_SOFTBODY	1
+#define PE_TYPE_CLOTH		2
 
 /* toolsettings->retopo_mode */
 #define RETOPO 1
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index e0dbc232e06..a1f35eca3c2 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -98,6 +98,7 @@ EnumPropertyItem part_hair_ren_as_items[] = {
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 
 #include "BLI_arithb.h"
 
@@ -436,7 +437,30 @@ static void rna_ParticleTarget_name_get(PointerRNA *ptr, char *str)
 	else
 		strcpy(str, "Invalid target!");
 }
+static int rna_ParticleSystem_multiple_caches_get(PointerRNA *ptr)
+{
+	ParticleSystem *psys= (ParticleSystem*)ptr->data;
 
+	return (psys->ptcaches.first != psys->ptcaches.last);
+}
+static int rna_ParticleSystem_editable_get(PointerRNA *ptr)
+{
+	ParticleSystem *psys= (ParticleSystem*)ptr->data;
+
+	if(psys->part && psys->part->type==PART_HAIR)
+		return (psys->flag & PSYS_HAIR_DONE);
+	else
+		return (psys->pointcache->flag & PTCACHE_BAKED);
+}
+static int rna_ParticleSystem_edited_get(PointerRNA *ptr)
+{
+	ParticleSystem *psys= (ParticleSystem*)ptr->data;
+
+	if(psys->part && psys->part->type==PART_HAIR)
+		return (psys->edit && psys->edit->edited);
+	else
+		return (psys->pointcache->edit && psys->pointcache->edit->edited);
+}
 EnumPropertyItem from_items[] = {
 	{PART_FROM_VERT, "VERT", 0, "Vertexes", ""},
 	{PART_FROM_FACE, "FACE", 0, "Faces", ""},
@@ -725,27 +749,10 @@ static void rna_def_particle(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_STICKY);
 	RNA_def_property_ui_text(prop, "sticky", "");
 
-	prop= RNA_def_property(srna, "transform", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_TRANSFORM);
-	RNA_def_property_ui_text(prop, "transform", "");
-
-	prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_HIDE);
-	RNA_def_property_ui_text(prop, "hide", "");
-
-	prop= RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_TAG);
-	RNA_def_property_ui_text(prop, "tag", "");
-
 	prop= RNA_def_property(srna, "rekey", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_REKEY);
 	RNA_def_property_ui_text(prop, "rekey", "");
 
-	prop= RNA_def_property(srna, "edit_recalc", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_EDIT_RECALC);
-	RNA_def_property_ui_text(prop, "edit_recalc", "");
-
-
 	prop= RNA_def_property(srna, "alive_state", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "alive");
 	RNA_def_property_enum_items(prop, alive_items);
@@ -1907,11 +1914,6 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "softflag", OB_SB_ENABLE);
 	RNA_def_property_ui_text(prop, "Use Soft Body", "Enable use of soft body for hair physics simulation.");
 
-	prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_EDITED);
-	RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* various checks needed */
-	RNA_def_property_ui_text(prop, "Editable", "For hair particle systems, finalize the hair to enable editing.");
-
 	/* reactor */
 	prop= RNA_def_property(srna, "reactor_target_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "target_ob");
@@ -2089,12 +2091,28 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "PointCache");
 	RNA_def_property_ui_text(prop, "Point Cache", "");
 
+	prop= RNA_def_property(srna, "multiple_caches", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_ParticleSystem_multiple_caches_get", NULL);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Multiple Caches", "Particle system has multiple point caches");
+
 	/* offset ob */
 	prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "parent");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Parent", "Use this object's coordinate system instead of global coordinate system.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+
+	/* hair or cache editing */
+	prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_ParticleSystem_editable_get", NULL);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Editable", "Particle system can be edited in particle mode");
+
+	prop= RNA_def_property(srna, "edited", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_ParticleSystem_edited_get", NULL);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Edited", "Particle system has been edited in particle mode");
 }
 
 void RNA_def_particle(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index c2c906e38f2..fabe0b647ea 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -33,8 +33,34 @@
 
 #include "BKE_paint.h"
 
+#include "WM_types.h"
+
+static EnumPropertyItem particle_edit_hair_brush_items[] = {
+	{PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush."},
+	{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb hairs."},
+	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth hairs."},
+	{PE_BRUSH_ADD, "ADD", 0, "Add", "Add hairs."},
+	{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make hairs longer or shorter."},
+	{PE_BRUSH_PUFF, "PUFF", 0, "Puff", "Make hairs stand up."},
+	{PE_BRUSH_CUT, "CUT", 0, "Cut", "Cut hairs."},
+	{0, NULL, 0, NULL, NULL}};
+
+static EnumPropertyItem particle_edit_cache_brush_items[] = {
+	{PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush."},
+	{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb paths."},
+	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth paths."},
+	{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make paths longer or shorter."},
+	{0, NULL, 0, NULL, NULL}};
+
 #ifdef RNA_RUNTIME
 
+#include "BKE_context.h"
+#include "BKE_pointcache.h"
+#include "BKE_particle.h"
+#include "BKE_depsgraph.h"
+
+#include "ED_particle.h"
+
 static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr)
 {
 	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
@@ -46,6 +72,7 @@ static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr)
 	return rna_pointer_inherit_refine(ptr, &RNA_ParticleBrush, brush);
 }
 
+
 static PointerRNA rna_ParticleBrush_curve_get(PointerRNA *ptr)
 {
 	return rna_pointer_inherit_refine(ptr, &RNA_CurveMapping, NULL);
@@ -74,6 +101,65 @@ static void rna_Paint_active_brush_set(PointerRNA *ptr, PointerRNA value)
 	paint_brush_set(ptr->data, value.data);
 }
 
+static void rna_ParticleEdit_redo(bContext *C, PointerRNA *ptr)
+{
+	PTCacheEdit *edit = PE_get_current(CTX_data_scene(C), CTX_data_active_object(C));
+
+	if(!edit)
+		return;
+
+	psys_free_path_cache(NULL, edit);
+}
+
+static void rna_ParticleEdit_update(bContext *C, PointerRNA *ptr)
+{
+	Scene *scene = CTX_data_scene(C);
+	Object *ob = CTX_data_active_object(C);
+
+	if(ob)
+		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+}
+
+static EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *ptr, int *free)
+{
+	Scene *scene= CTX_data_scene(C);
+	PTCacheEdit *edit;
+
+	if(C==NULL) {
+		EnumPropertyItem *item= NULL;
+		int totitem= 0;
+		
+		/* needed for doc generation */
+		RNA_enum_items_add(&item, &totitem, particle_edit_hair_brush_items);
+		RNA_enum_item_end(&item, &totitem);
+		
+		*free= 1;
+		
+		return item;
+	}
+
+	edit = PE_get_current(scene, CTX_data_active_object(C));
+	
+	if(edit && edit->psys)
+		return particle_edit_hair_brush_items;
+
+	return particle_edit_cache_brush_items;
+}
+
+static int rna_ParticleEdit_editable_get(PointerRNA *ptr)
+{
+	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
+
+	return (pset->object && PE_get_current(pset->scene, pset->object));
+}
+static int rna_ParticleEdit_hair_get(PointerRNA *ptr)
+{
+	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
+
+	PTCacheEdit *edit = PE_get_current(pset->scene, pset->object);
+
+	return (edit && edit->psys);
+}
 #else
 
 static void rna_def_paint(BlenderRNA *brna)
@@ -266,17 +352,6 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	static EnumPropertyItem tool_items[] = {
-		{PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush."},
-		{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb hairs."},
-		{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth hairs."},
-		{PE_BRUSH_WEIGHT, "WEIGHT", 0, "Weight", "Assign weight to hairs."},
-		{PE_BRUSH_ADD, "ADD", 0, "Add", "Add hairs."},
-		{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make hairs longer or shorter."},
-		{PE_BRUSH_PUFF, "PUFF", 0, "Puff", "Make hairs stand up."},
-		{PE_BRUSH_CUT, "CUT", 0, "Cut", "Cut hairs."},
-		{0, NULL, 0, NULL, NULL}};
-
 	static EnumPropertyItem select_mode_items[] = {
 		{SCE_SELECT_PATH, "PATH", ICON_EDGESEL, "Path", ""}, // XXX icon
 		{SCE_SELECT_POINT, "POINT", ICON_VERTEXSEL, "Point", ""}, // XXX icon
@@ -293,6 +368,14 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 		{1, "SHRINK", 0, "Shrink", "Make hairs shorter."},
 		{0, NULL, 0, NULL, NULL}};
 
+	static EnumPropertyItem edit_type_items[]= {
+		{PE_TYPE_PARTICLES, "PARTICLES", 0, "Particles", ""},
+		{PE_TYPE_SOFTBODY, "SOFT_BODY", 0, "Soft body", ""},
+		{PE_TYPE_CLOTH, "CLOTH", 0, "Cloth", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+
 	/* edit */
 
 	srna= RNA_def_struct(brna, "ParticleEdit", NULL);
@@ -301,13 +384,15 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "tool", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "brushtype");
-	RNA_def_property_enum_items(prop, tool_items);
+	RNA_def_property_enum_items(prop, particle_edit_hair_brush_items);
+	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_ParticleEdit_tool_itemf");
 	RNA_def_property_ui_text(prop, "Tool", "");
 
 	prop= RNA_def_property(srna, "selection_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "selectmode");
 	RNA_def_property_enum_items(prop, select_mode_items);
 	RNA_def_property_ui_text(prop, "Selection Mode", "Particle select and display mode.");
+	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_update");
 
 	prop= RNA_def_property(srna, "keep_lengths", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_KEEP_LENGTHS);
@@ -326,13 +411,19 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 10, 3);
 	RNA_def_property_ui_text(prop, "Emitter Distance", "Distance to keep particles away from the emitter.");
 
-	prop= RNA_def_property(srna, "show_time", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_SHOW_TIME);
-	RNA_def_property_ui_text(prop, "Show Time", "Show time values of the baked keys.");
+	prop= RNA_def_property(srna, "fade_time", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_FADE_TIME);
+	RNA_def_property_ui_text(prop, "Fade Time", "Fade paths and keys further away from current frame.");
+	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_update");
 
-	prop= RNA_def_property(srna, "show_children", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_SHOW_CHILD);
-	RNA_def_property_ui_text(prop, "Show Children", "Show child particles.");
+	prop= RNA_def_property(srna, "auto_velocity", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_AUTO_VELOCITY);
+	RNA_def_property_ui_text(prop, "Auto Velocity", "Calculate point velocities automatically.");
+
+	prop= RNA_def_property(srna, "draw_particles", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_DRAW_PART);
+	RNA_def_property_ui_text(prop, "Draw Particles", "Draw actual particles.");
+	RNA_def_property_update(prop, NC_OBJECT, NULL);
 
 	prop= RNA_def_property(srna, "mirror_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_X_MIRROR);
@@ -353,6 +444,37 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 	RNA_def_property_pointer_funcs(prop, "rna_ParticleEdit_brush_get", NULL, NULL);
 	RNA_def_property_ui_text(prop, "Brush", "");
 
+	prop= RNA_def_property(srna, "draw_step", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 2, 10);
+	RNA_def_property_ui_text(prop, "Steps", "How many steps to draw the path with.");
+	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_redo");
+
+	prop= RNA_def_property(srna, "fade_frames", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 2, 100);
+	RNA_def_property_ui_text(prop, "Frames", "How many frames to fade.");
+	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_update");
+
+	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "edittype");
+	RNA_def_property_enum_items(prop, edit_type_items);
+	RNA_def_property_ui_text(prop, "Type", "");
+	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_redo");
+
+	prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_ParticleEdit_editable_get", NULL);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Editable", "A valid edit mode exists");
+
+	prop= RNA_def_property(srna, "hair", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_ParticleEdit_hair_get", NULL);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Hair", "Editing hair");
+
+	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Object", "The edited object");
+
+
 	/* brush */
 
 	srna= RNA_def_struct(brna, "ParticleBrush", NULL);

From c9041b61c5a9d98cb0880301ded867f495145366 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 29 Aug 2009 15:46:38 +0000
Subject: [PATCH 330/577] fix for problem building

---
 source/blender/editors/physics/editparticle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index dbb11f72890..c0b600edf36 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -3782,7 +3782,7 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	PTCacheEdit *edit= PE_get_current(scene, ob, PE_settings(scene)->edittype);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
 
 	if(!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 		ob->mode |= OB_MODE_PARTICLE_EDIT;

From e6f2f4db285be1ccdc9c9871171afb1f9e2a4f6c Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 29 Aug 2009 17:13:06 +0000
Subject: [PATCH 331/577] default length for shape key list, so it looks good
 when empty

---
 release/ui/buttons_data_mesh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index f91d706ead7..42b637e1f9d 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -102,7 +102,7 @@ class DATA_PT_shape_keys(DataButtonsPanel):
 		kb = ob.active_shape_key
 
 		row = layout.row()
-		row.template_list(key, "keys", ob, "active_shape_key_index")
+		row.template_list(key, "keys", ob, "active_shape_key_index", rows=2)
 
 		col = row.column()
 

From afee963155a2776066d377ed590e755217948d0f Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 29 Aug 2009 17:25:22 +0000
Subject: [PATCH 332/577] First commit draft for network rendering.

Docs are here: http://wiki.blender.org/index.php/User:Theeth/netrender

Should be easy to test if people want too, just follow the instructions on wiki

Code is still very much in flux, so I'd like if people would refrain from making changes (send patches directly to me if you must).

The UI side is very crap, it's basically there just to get things testable. See wiki for known bugs.
---
 release/io/netrender/__init__.py  |   9 +
 release/io/netrender/client.py    |  87 +++++
 release/io/netrender/master.py    | 546 ++++++++++++++++++++++++++++++
 release/io/netrender/model.py     | 150 ++++++++
 release/io/netrender/operators.py | 238 +++++++++++++
 release/io/netrender/slave.py     | 147 ++++++++
 release/io/netrender/ui.py        | 290 ++++++++++++++++
 release/io/netrender/utils.py     |  80 +++++
 8 files changed, 1547 insertions(+)
 create mode 100644 release/io/netrender/__init__.py
 create mode 100644 release/io/netrender/client.py
 create mode 100644 release/io/netrender/master.py
 create mode 100644 release/io/netrender/model.py
 create mode 100644 release/io/netrender/operators.py
 create mode 100644 release/io/netrender/slave.py
 create mode 100644 release/io/netrender/ui.py
 create mode 100644 release/io/netrender/utils.py

diff --git a/release/io/netrender/__init__.py b/release/io/netrender/__init__.py
new file mode 100644
index 00000000000..e0de2726a55
--- /dev/null
+++ b/release/io/netrender/__init__.py
@@ -0,0 +1,9 @@
+# This directory is a Python package.
+
+import model
+import operators
+import client
+import slave
+import master
+import utils
+import ui
diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
new file mode 100644
index 00000000000..90039a3273a
--- /dev/null
+++ b/release/io/netrender/client.py
@@ -0,0 +1,87 @@
+import bpy
+import sys, os
+import http, http.client, http.server, urllib
+import subprocess, shutil, time, hashlib
+
+import netrender.slave as slave
+import netrender.master as master
+from netrender.utils import *
+
+class NetworkRenderEngine(bpy.types.RenderEngine):
+	__idname__ = 'NET_RENDER'
+	__label__ = "Network Render"
+	def render(self, scene):
+		if scene.network_render.mode == "RENDER_CLIENT":
+			self.render_client(scene)
+		elif scene.network_render.mode == "RENDER_SLAVE":
+			self.render_slave(scene)
+		elif scene.network_render.mode == "RENDER_MASTER":
+			self.render_master(scene)
+		else:
+			print("UNKNOWN OPERATION MODE")
+	
+	def render_master(self, scene):
+		server_address = (scene.network_render.server_address, scene.network_render.server_port)
+		httpd = master.RenderMasterServer(server_address, master.RenderHandler)
+		httpd.timeout = 1
+		httpd.stats = self.update_stats
+		while not self.test_break():
+			httpd.handle_request()
+
+	def render_slave(self, scene):
+		slave.render_slave(self, scene)
+	
+	def render_client(self, scene):
+		self.update_stats("", "Network render client initiation")
+		
+		conn = clientConnection(scene)
+		
+		if conn:
+			# Sending file
+			
+			self.update_stats("", "Network render exporting")
+			
+			job_id = scene.network_render.job_id
+			
+			# reading back result
+			
+			self.update_stats("", "Network render waiting for results")
+			
+			clientRequestResult(conn, scene, job_id)
+			response = conn.getresponse()
+			
+			if response.status == http.client.NO_CONTENT:
+				scene.network_render.job_id = clientSendJob(conn, scene)
+				clientRequestResult(conn, scene, job_id)
+			
+			while response.status == http.client.PROCESSING and not self.test_break():
+				print("waiting")
+				time.sleep(1)
+				clientRequestResult(conn, scene, job_id)
+				response = conn.getresponse()
+	
+			if response.status != http.client.OK:
+				conn.close()
+				return
+			
+			r = scene.render_data
+			x= int(r.resolution_x*r.resolution_percentage*0.01)
+			y= int(r.resolution_y*r.resolution_percentage*0.01)
+			
+			f = open(PATH_PREFIX + "output.exr", "wb")
+			buf = response.read(1024)
+			
+			while buf:
+				f.write(buf)
+				buf = response.read(1024)
+			
+			f.close()
+			
+			result = self.begin_result(0, 0, x, y)
+			result.load_from_file(PATH_PREFIX + "output.exr", 0, 0)
+			self.end_result(result)
+			
+			conn.close()
+
+bpy.types.register(NetworkRenderEngine)
+
diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
new file mode 100644
index 00000000000..5a62ef1a8bf
--- /dev/null
+++ b/release/io/netrender/master.py
@@ -0,0 +1,546 @@
+import sys, os
+import http, http.client, http.server, urllib
+import subprocess, shutil, time, hashlib
+
+from netrender.utils import *
+import netrender.model
+
+		
+class MRenderSlave(netrender.model.RenderSlave):
+	def __init__(self, name, adress, stats):
+		super().__init__()
+		self.id = hashlib.md5(bytes(repr(name) + repr(adress), encoding='utf8')).hexdigest()
+		self.name = name
+		self.adress = adress
+		self.stats = stats
+		self.last_seen = time.time()
+		
+		self.job = None
+		self.frame = None
+		
+		netrender.model.RenderSlave._slave_map[self.id] = self
+
+	def seen(self):
+		self.last_seen = time.time()
+
+# sorting key for jobs
+def groupKey(job):
+	return (job.framesLeft() > 0, job.priority, job.credits)
+
+class MRenderJob(netrender.model.RenderJob):
+	def __init__(self, job_id, name, path, chunks = 1, priority = 1, credits = 100.0, blacklist = []):
+		super().__init__()
+		self.id = job_id
+		self.name = name
+		self.path = path
+		self.frames = []
+		self.chunks = chunks
+		self.priority = priority
+		self.credits = credits
+		self.blacklist = blacklist
+		self.last_dispatched = time.time()
+	
+	def update(self):
+		self.credits -= 5 # cost of one frame
+		self.credits += (time.time() - self.last_dispatched) / 60
+		self.last_dispatched = time.time()
+	
+	def addFrame(self, frame_number):
+		frame = MRenderFrame(frame_number)
+		self.frames.append(frame)
+		return frame
+	
+	def framesLeft(self):
+		total = 0
+		for j in self.frames:
+			if j.status == QUEUED:
+				total += 1
+		
+		return total
+		
+	def reset(self, all):
+		for f in self.frames:
+			f.reset(all)
+	
+	def getFrames(self):
+		frames = []
+		for f in self.frames:
+			if f.status == QUEUED:
+				self.update()
+				frames.append(f)
+				if len(frames) == self.chunks:
+					break
+		
+		return frames
+
+class MRenderFrame(netrender.model.RenderFrame):
+	def __init__(self, frame):
+		super().__init__()
+		self.number = frame
+		self.slave = None
+		self.time = 0
+		self.status = QUEUED
+		
+	def reset(self, all):
+		if all or self.status == ERROR:
+			self.slave = None
+			self.time = 0
+			self.status = QUEUED
+
+
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+class RenderHandler(http.server.BaseHTTPRequestHandler):
+	def send_head(self, code = http.client.OK, headers = {}):
+		self.send_response(code)
+		self.send_header("Content-type", "application/octet-stream")
+		
+		for key, value in headers.items():
+			self.send_header(key, value)
+		
+		self.end_headers()
+
+	def do_HEAD(self):
+		print(self.path)
+	
+		if self.path == "status":
+			job_id = self.headers.get('job-id', "")
+			job_frame = int(self.headers.get('job-frame', -1))
+			
+			if job_id:
+				print("status:", job_id, "\n")
+				
+				job = self.server.getJobByID(job_id)
+				if job:
+					if job_frame != -1:
+						frame = job[frame]
+						
+						if not frame:
+							# no such frame
+							self.send_heat(http.client.NOT_FOUND)
+							return
+				else:
+					# no such job id
+					self.send_head(http.client.NOT_FOUND)
+					return
+			
+			self.send_head()
+	
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	
+	def do_GET(self):
+		print(self.path)
+		
+		if self.path == "version":
+			self.send_head()
+			self.server.stats("", "New client connection")
+			self.wfile.write(VERSION)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "render":
+			job_id = self.headers['job-id']
+			job_frame = int(self.headers['job-frame'])
+			print("render:", job_id, job_frame)
+			
+			job = self.server.getJobByID(job_id)
+			
+			if job:
+				frame = job[job_frame]
+				
+				if frame:
+					if frame.status in (QUEUED, DISPATCHED):
+						self.send_head(http.client.PROCESSING)
+					elif frame.status == DONE:
+						self.server.stats("", "Sending result back to client")
+						f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".exr", 'rb')
+						
+						self.send_head()
+						
+						shutil.copyfileobj(f, self.wfile)
+						
+						f.close()
+					elif frame.status == ERROR:
+						self.send_head(http.client.NO_CONTENT)
+				else:
+					# no such frame
+					self.send_head(http.client.NOT_FOUND)
+			else:
+				# no such job id
+				self.send_head(http.client.NOT_FOUND)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "log":
+			job_id = self.headers['job-id']
+			job_frame = int(self.headers['job-frame'])
+			print("log:", job_id, job_frame)
+			
+			job = self.server.getJobByID(job_id)
+			
+			if job:
+				frame = job[job_frame]
+				
+				if frame:
+					if frame.status in (QUEUED, DISPATCHED):
+						self.send_head(http.client.PROCESSING)
+					elif frame.status == DONE:
+						self.server.stats("", "Sending log back to client")
+						f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".log", 'rb')
+						
+						self.send_head()
+						
+						shutil.copyfileobj(f, self.wfile)
+						
+						f.close()
+					elif frame.status == ERROR:
+						self.send_head(http.client.NO_CONTENT)
+				else:
+					# no such frame
+					self.send_head(http.client.NOT_FOUND)
+			else:
+				# no such job id
+				self.send_head(http.client.NOT_FOUND)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "status":
+			job_id = self.headers.get('job-id', "")
+			job_frame = int(self.headers.get('job-frame', -1))
+			
+			if job_id:
+				print("status:", job_id, "\n")
+				
+				job = self.server.getJobByID(job_id)
+				if job:
+					if job_frame != -1:
+						frame = job[frame]
+						
+						if frame:
+							message = frame.serialize()
+						else:
+							# no such frame
+							self.send_heat(http.client.NOT_FOUND)
+							return
+					else:
+						message = job.serialize()
+				else:
+					# no such job id
+					self.send_head(http.client.NOT_FOUND)
+					return
+			else: # status of all jobs
+				message = []
+				
+				for job in self.server:
+					results = job.status()
+					
+					message.append(job.serialize())
+			
+			self.send_head()
+			self.wfile.write(bytes(repr(message), encoding='utf8'))
+			
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "job":
+			self.server.update()
+			
+			slave_id = self.headers['slave-id']
+			
+			print("slave-id", slave_id)
+			
+			self.server.getSlave(slave_id)
+			
+			slave = self.server.updateSlave(slave_id)
+			
+			if slave: # only if slave id is valid
+				job, frames = self.server.getNewJob(slave_id)
+				
+				if job and frames:
+					for f in frames:
+						f.status = DISPATCHED
+						f.slave = slave
+					
+					self.send_head(headers={"job-id": job.id})
+					
+					message = job.serialize(frames)
+					
+					self.wfile.write(bytes(repr(message), encoding='utf8'))
+					
+					self.server.stats("", "Sending job frame to render node")
+				else:
+					# no job available, return error code
+					self.send_head(http.client.NO_CONTENT)
+			else: # invalid slave id
+				self.send_head(http.client.NOT_FOUND)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "file":
+			job_id = self.headers['job-id']
+			print("file:", job_id, "\n")
+			
+			job = self.server.getJobByID(job_id)
+			
+			if job:
+				self.send_head(headers={"job-id": job.id})
+				
+				self.server.stats("", "Sending file to render node")
+				f = open(PATH_PREFIX + job.id + ".blend", 'rb')
+				
+				shutil.copyfileobj(f, self.wfile)
+				
+				f.close()
+			else:
+				# no such job id
+				self.send_head(http.client.NOT_FOUND)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "slave":
+			message = []
+			
+			for slave in self.server.slaves:
+				message.append(slave.serialize())
+			
+			self.send_head()
+			
+			self.wfile.write(bytes(repr(message), encoding='utf8'))
+			
+
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	def do_POST(self):
+		print(self.path)
+	
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		if self.path == "job":
+			print("posting job info")
+			self.server.stats("", "Receiving job")
+			
+			length = int(self.headers['content-length'])
+			job_frame_string = self.headers['job-frame']
+			job_name = self.headers.get('job-name', "")
+			job_chunks = int(self.headers.get('job-chunks', "1"))
+			blacklist = self.headers.get('slave-blacklist', '').split()
+			
+			print("blacklist", blacklist)
+			
+			job_path = str(self.rfile.read(length), encoding='utf8')
+			
+			if os.path.exists(job_path):
+				f = open(job_path, "rb")
+				buf = f.read()
+				f.close()
+				
+				job_id = hashlib.md5(buf).hexdigest()
+				
+				del buf
+				
+				job = self.server.getJobByID(job_id)
+				
+				if job == None:
+					job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
+					self.server.addJob(job)
+					
+				if ":" in job_frame_string:
+					frame_start, frame_end = [int(x) for x in job_frame_string.split(":")]
+					
+					for job_frame in range(frame_start, frame_end + 1):
+						frame = job.addFrame(job_frame)
+				else:
+					job_frame = int(job_frame_string)
+					frame = job.addFrame(job_frame)
+		
+				self.send_head(headers={"job-id": job_id})
+			else:
+				self.send_head(http.client.NOT_FOUND)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "cancel":
+			job_id = self.headers.get('job-id', "")
+			if job_id:
+				print("cancel:", job_id, "\n")
+				self.server.removeJob(job_id)
+			else: # cancel all jobs
+				self.server.clear()
+				
+			self.send_head()
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "reset":
+			job_id = self.headers.get('job-id', "")
+			job_frame = int(self.headers.get('job-frame', "-1"))
+			all = bool(self.headers.get('reset-all', "False"))
+			
+			job = self.server.getJobByID(job_id)
+			
+			if job:
+				if job_frame != -1:
+					job[job_frame].reset(all)
+				else:
+					job.reset(all)
+					
+				self.send_head()
+			else: # job not found
+				self.send_head(http.client.NOT_FOUND)
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "slave":
+			length = int(self.headers['content-length'])
+			job_frame_string = self.headers['job-frame']
+			
+			name, stats = eval(str(self.rfile.read(length), encoding='utf8'))
+			
+			slave_id = self.server.addSlave(name, self.client_address, stats)
+			
+			self.send_head(headers = {"slave-id": slave_id})
+	
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+	def do_PUT(self):
+		print(self.path)
+		
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		if self.path == "file":
+			print("writing blend file")
+			self.server.stats("", "Receiving job")
+			
+			length = int(self.headers['content-length'])
+			job_frame_string = self.headers['job-frame']
+			job_name = self.headers.get('job-name', "")
+			job_chunks = int(self.headers.get('job-chunks', "1"))
+			blacklist = self.headers.get('slave-blacklist', '').split()
+			
+			buf = self.rfile.read(length)
+			
+			job_id = hashlib.md5(buf).hexdigest()
+			
+			job_path = job_id + ".blend"
+			
+			f = open(PATH_PREFIX + job_path, "wb")
+			f.write(buf)
+			f.close()
+			
+			del buf
+			
+			job = self.server.getJobByID(job_id)
+			
+			if job == None:
+				job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
+				self.server.addJob(job)
+				
+			if ":" in job_frame_string:
+				frame_start, frame_end = [int(x) for x in job_frame_string.split(":")]
+				
+				for job_frame in range(frame_start, frame_end + 1):
+					frame = job.addFrame(job_frame)
+			else:
+				job_frame = int(job_frame_string)
+				frame = job.addFrame(job_frame)
+	
+			self.send_head(headers={"job-id": job_id})
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "render":
+			print("writing result file")
+			self.server.stats("", "Receiving render result")
+			
+			job_id = self.headers['job-id']
+			job_frame = int(self.headers['job-frame'])
+			job_result = int(self.headers['job-result'])
+			job_time = float(self.headers['job-time'])
+			
+			if job_result == DONE:
+				length = int(self.headers['content-length'])
+				buf = self.rfile.read(length)
+				f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".exr", 'wb')
+				f.write(buf)
+				f.close()
+				
+				del buf
+				
+			job = self.server.getJobByID(job_id)
+			frame = job[job_frame]
+			frame.status = job_result
+			frame.time = job_time
+	
+			self.server.updateSlave(self.headers['slave-id'])
+			
+			self.send_head()
+		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+		elif self.path == "log":
+			print("writing log file")
+			self.server.stats("", "Receiving log file")
+			
+			length = int(self.headers['content-length'])
+			job_id = self.headers['job-id']
+			job_frame = int(self.headers['job-frame'])
+			
+			print("log length:", length)
+			
+			buf = self.rfile.read(length)
+			f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".log", 'wb')
+			f.write(buf)
+			f.close()
+				
+			del buf
+			
+			self.server.updateSlave(self.headers['slave-id'])
+			
+			self.send_head()
+
+
+class RenderMasterServer(http.server.HTTPServer):
+	def __init__(self, address, handler_class):
+		super().__init__(address, handler_class)
+		self.jobs = []
+		self.jobs_map = {}
+		self.slaves = []
+		self.slaves_map = {}
+	
+	def addSlave(self, name, adress, stats):
+		slave = MRenderSlave(name, adress, stats)
+		self.slaves.append(slave)
+		self.slaves_map[slave.id] = slave
+		
+		return slave.id
+	
+	def getSlave(self, slave_id):
+		return self.slaves_map.get(slave_id, None)
+	
+	def updateSlave(self, slave_id):
+		slave = self.getSlave(slave_id)
+		if slave:
+			slave.seen()
+			
+		return slave
+	
+	def clear(self):
+		self.jobs_map = {}
+		self.jobs = []
+	
+	def update(self):
+		self.jobs.sort(key = groupKey)
+		
+	def removeJob(self, id):
+		job = self.jobs_map.pop(id)
+
+		if job:
+			self.jobs.remove(job)
+	
+	def addJob(self, job):
+		self.jobs.append(job)
+		self.jobs_map[job.id] = job
+	
+	def getJobByID(self, id):
+		return self.jobs_map.get(id, None)
+	
+	def __iter__(self):
+		for job in self.jobs:
+			yield job
+	
+	def getNewJob(self, slave_id):
+		if self.jobs:
+			for job in reversed(self.jobs):
+				if job.framesLeft() > 0 and slave_id not in job.blacklist:
+					return job, job.getFrames()
+		
+		return None, None
diff --git a/release/io/netrender/model.py b/release/io/netrender/model.py
new file mode 100644
index 00000000000..6e68929d340
--- /dev/null
+++ b/release/io/netrender/model.py
@@ -0,0 +1,150 @@
+import sys, os
+import http, http.client, http.server, urllib
+import subprocess, shutil, time, hashlib
+
+from netrender.utils import *
+
+class RenderSlave:
+	_slave_map = {}
+	
+	def __init__(self):
+		self.id = ""
+		self.name = ""
+		self.adress = (0,0)
+		self.stats = ""
+		self.total_done = 0
+		self.total_error = 0
+		self.last_seen = 0.0
+		
+	def serialize(self):
+		return 	{
+							"id": self.id,
+							"name": self.name,
+							"adress": self.adress,
+							"stats": self.stats,
+							"total_done": self.total_done,
+							"total_error": self.total_error,
+							"last_seen": self.last_seen
+						}
+	
+	@staticmethod
+	def materialize(data):
+		if not data:
+			return None
+		
+		slave_id = data["id"]
+		
+		if slave_id in RenderSlave._slave_map:
+			return RenderSlave._slave_map[slave_id]
+		else:
+			slave = RenderSlave()
+			slave.id = slave_id
+			slave.name = data["name"]
+			slave.adress = data["adress"]
+			slave.stats = data["stats"]
+			slave.total_done = data["total_done"]
+			slave.total_error = data["total_error"]
+			slave.last_seen = data["last_seen"]
+			
+			RenderSlave._slave_map[slave_id] = slave
+			
+			return slave
+
+class RenderJob:
+	def __init__(self):
+		self.id = ""
+		self.name = ""
+		self.path = ""
+		self.frames = []
+		self.chunks = 0
+		self.priority = 0
+		self.credits = 0
+		self.blacklist = []
+		self.last_dispatched = 0.0
+	
+	def __len__(self):
+		return len(self.frames)
+	
+	def status(self):
+		results = {
+								QUEUED: 0,
+								DISPATCHED: 0,
+								DONE: 0,
+								ERROR: 0
+							}
+		
+		for frame in self.frames:
+			results[frame.status] += 1
+			
+		return results
+	
+	def __contains__(self, frame_number):
+		for f in self.frames:
+			if f.number == frame_number:
+				return True
+		else:
+			return False
+	
+	def __getitem__(self, frame_number):
+		for f in self.frames:
+			if f.number == frame_number:
+				return f
+		else:
+			return None
+		
+	def serialize(self, frames = None):
+		return 	{
+							"id": self.id,
+							"name": self.name,
+							"path": self.path,
+							"frames": [f.serialize() for f in self.frames if not frames or f in frames],
+							"priority": self.priority,
+							"credits": self.credits,
+							"blacklist": self.blacklist,
+							"last_dispatched": self.last_dispatched
+						}
+
+	@staticmethod
+	def materialize(data):
+		if not data:
+			return None
+		
+		job = RenderJob()
+		job.id = data["id"]
+		job.name = data["name"]
+		job.path = data["path"]
+		job.frames = [RenderFrame.materialize(f) for f in data["frames"]]
+		job.priority = data["priority"]
+		job.credits = data["credits"]
+		job.blacklist = data["blacklist"]
+		job.last_dispatched = data["last_dispatched"]
+
+		return job
+
+class RenderFrame:
+	def __init__(self):
+		self.number = 0
+		self.time = 0
+		self.status = QUEUED
+		self.slave = None
+
+	def serialize(self):
+		return 	{
+							"number": self.number,
+							"time": self.time,
+							"status": self.status,
+							"slave": None if not self.slave else self.slave.serialize()
+						}
+						
+	@staticmethod
+	def materialize(data):
+		if not data:
+			return None
+		
+		frame = RenderFrame()
+		frame.number = data["number"]
+		frame.time = data["time"]
+		frame.status = data["status"]
+		frame.slave = RenderSlave.materialize(data["slave"])
+
+		return frame
diff --git a/release/io/netrender/operators.py b/release/io/netrender/operators.py
new file mode 100644
index 00000000000..3355c3d1a0b
--- /dev/null
+++ b/release/io/netrender/operators.py
@@ -0,0 +1,238 @@
+import bpy
+import sys, os
+import http, http.client, http.server, urllib
+
+from netrender.utils import *
+import netrender.model
+
+class RENDER_OT_netclientsend(bpy.types.Operator):
+	'''
+	Operator documentation text, will be used for the operator tooltip and python docs.
+	'''
+	__idname__ = "render.netclientsend"
+	__label__ = "Net Render Client Send"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		return True
+	
+	def execute(self, context):
+		scene = context.scene
+		
+		conn = clientConnection(scene)
+		
+		if conn:
+			# Sending file
+			scene.network_render.job_id = clientSendJob(conn, scene, True)
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
+
+class RENDER_OT_netclientstatus(bpy.types.Operator):
+	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
+	__idname__ = "render.netclientstatus"
+	__label__ = "Net Render Client Status"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		return True
+	
+	def execute(self, context):
+		netprops = context.scene.network_render
+		conn = clientConnection(context.scene)
+
+		if conn:
+			conn.request("GET", "status")
+			
+			response = conn.getresponse()
+			print( response.status, response.reason )
+			
+			jobs = (netrender.model.RenderJob.materialize(j) for j in eval(str(response.read(), encoding='utf8')))
+			
+			while(len(netprops.jobs) > 0):
+				netprops.jobs.remove(0)
+				
+			for j in jobs:
+				netprops.jobs.add()
+				job = netprops.jobs[-1]
+				
+				job_results = j.status()
+				
+				job.id = j.id
+				job.name = j.name
+				job.length = len(j)
+				job.done = job_results[DONE]
+				job.error = job_results[ERROR]
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
+
+class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
+	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
+	__idname__ = "render.netclientblacklistslave"
+	__label__ = "Net Render Client Blacklist Slave"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		return True
+	
+	def execute(self, context):
+		netprops = context.scene.network_render
+		
+		if netprops.active_slave_index >= 0:
+			
+			slave = netrender.slaves[netprops.active_slave_index]
+			
+			netprops.slaves_blacklist.add()
+			
+			netprops.slaves_blacklist[-1].id = slave.id
+			netprops.slaves_blacklist[-1].name = slave.name
+			netprops.slaves_blacklist[-1].adress = slave.adress
+			netprops.slaves_blacklist[-1].last_seen = slave.last_seen
+			netprops.slaves_blacklist[-1].stats = slave.stats
+			
+			netprops.slaves.remove(netprops.active_slave_index)
+			netprops.active_slave_index = -1
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
+
+class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
+	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
+	__idname__ = "render.netclientwhitelistslave"
+	__label__ = "Net Render Client Whitelist Slave"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		return True
+	
+	def execute(self, context):
+		netprops = context.scene.network_render
+		
+		if netprops.active_blacklisted_slave_index >= 0:
+			
+			slave = netprops.slaves_blacklist[netprops.active_blacklisted_slave_index]
+			
+			netprops.slaves.add()
+			
+			netprops.slaves[-1].id = slave.id
+			netprops.slaves[-1].name = slave.name
+			netprops.slaves[-1].adress = slave.adress
+			netprops.slaves[-1].last_seen = slave.last_seen
+			netprops.slaves[-1].stats = slave.stats
+			
+			netprops.slaves_blacklist.remove(netprops.active_blacklisted_slave_index)
+			netprops.active_blacklisted_slave_index = -1
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
+
+
+class RENDER_OT_netclientslaves(bpy.types.Operator):
+	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
+	__idname__ = "render.netclientslaves"
+	__label__ = "Net Render Client Slaves"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		return True
+	
+	def execute(self, context):
+		netprops = context.scene.network_render
+		conn = clientConnection(context.scene)
+		
+		if conn:
+			conn.request("GET", "slave")
+			
+			response = conn.getresponse()
+			print( response.status, response.reason )
+			
+			slaves = (netrender.model.RenderSlave.materialize(s) for s in eval(str(response.read(), encoding='utf8')))
+			
+			while(len(netprops.slaves) > 0):
+				netprops.slaves.remove(0)
+			
+			for s in slaves:
+				for slave in netprops.slaves_blacklist:
+					if slave.id == s.id:
+						break
+					
+				netprops.slaves.add()
+				slave = netprops.slaves[-1]
+				
+				slave.id = s.id
+				slave.name = s.name
+				slave.stats = s.stats
+				slave.adress = s.adress[0]
+				slave.last_seen = time.ctime(s.last_seen)
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
+
+class RENDER_OT_netclientcancel(bpy.types.Operator):
+	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
+	__idname__ = "render.netclientcancel"
+	__label__ = "Net Render Client Cancel"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		netrender = scene.network_render
+		return netrender.active_job_index >= 0 and len(netrender.jobs) > 0
+		
+	def execute(self, context):
+		netprops = context.scene.network_render
+		conn = clientConnection(context.scene)
+		
+		if conn:
+			job = netprops.jobs[netrender.active_job_index]
+			
+			conn.request("POST", "cancel", headers={"job-id":job.id})
+			
+			response = conn.getresponse()
+			print( response.status, response.reason )
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
+	
+bpy.ops.add(RENDER_OT_netclientsend)
+bpy.ops.add(RENDER_OT_netclientstatus)
+bpy.ops.add(RENDER_OT_netclientslaves)
+bpy.ops.add(RENDER_OT_netclientblacklistslave)
+bpy.ops.add(RENDER_OT_netclientwhitelistslave)
+bpy.ops.add(RENDER_OT_netclientcancel)
\ No newline at end of file
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
new file mode 100644
index 00000000000..03c6803955e
--- /dev/null
+++ b/release/io/netrender/slave.py
@@ -0,0 +1,147 @@
+import sys, os
+import http, http.client, http.server, urllib
+import subprocess, time
+
+from netrender.utils import *
+import netrender.model
+
+CANCEL_POLL_SPEED = 2
+MAX_TIMEOUT = 10
+INCREMENT_TIMEOUT = 1
+
+def slave_Info():
+	sysname, nodename, release, version, machine = os.uname()
+	return (nodename, sysname + " " + release + " " + machine)
+
+def testCancel(conn, job_id):
+		conn.request("HEAD", "status", headers={"job-id":job_id})
+		response = conn.getresponse()
+		
+		# cancelled if job isn't found anymore
+		if response.status == http.client.NOT_FOUND:
+			return True
+		else:
+			return False
+
+def render_slave(engine, scene):
+	NODE_PREFIX = PATH_PREFIX + "node" + os.sep
+	timeout = 1
+	
+	if not os.path.exists(NODE_PREFIX):
+		os.mkdir(NODE_PREFIX)
+	
+	engine.update_stats("", "Network render node initiation")
+	
+	conn = clientConnection(scene)
+	
+	if conn:
+		conn.request("POST", "slave", repr(slave_Info()))
+		response = conn.getresponse()
+		
+		slave_id = response.getheader("slave-id")
+		
+		while not engine.test_break():
+			
+			conn.request("GET", "job", headers={"slave-id":slave_id})
+			response = conn.getresponse()
+			
+			if response.status == http.client.OK:
+				timeout = 1 # reset timeout on new job
+				
+				job = netrender.model.RenderJob.materialize(eval(str(response.read(), encoding='utf8')))
+				
+				print("File:", job.path)
+				engine.update_stats("", "Render File", job.path, "for job", job.id)
+				
+				if os.path.isabs(job.path):
+					# if an absolute path, make sure path exists, if it doesn't, use relative local path
+					job_full_path = job.path
+					if not os.path.exists(job_full_path):
+						job_full_path = NODE_PREFIX + job.id + ".blend"
+				else:
+					job_full_path = NODE_PREFIX + job.path
+				
+				if not os.path.exists(job_full_path):
+					conn.request("GET", "file", headers={"job-id": job.id, "slave-id":slave_id})
+					response = conn.getresponse()
+					
+					if response.status != http.client.OK:
+						break # file for job not returned by server, need to return an error code to server
+					
+					f = open(job_full_path, "wb")
+					buf = response.read(1024)
+					
+					while buf:
+						f.write(buf)
+						buf = response.read(1024)
+					
+					f.close()
+				
+				frame_args = []
+				
+				for frame in job.frames:
+					frame_args += ["-f", str(frame.number)]
+					
+				start_t = time.time()
+				
+				process = subprocess.Popen([sys.argv[0], "-b", job_full_path, "-o", NODE_PREFIX + job.id, "-E", "BLENDER_RENDER", "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)	
+				
+				cancelled = False
+				stdout = bytes()
+				run_t = time.time()
+				while process.poll() == None and not cancelled:
+					stdout += process.stdout.read(32)
+					current_t = time.time()
+					cancelled = engine.test_break()
+					if current_t - run_t > CANCEL_POLL_SPEED:
+						if testCancel(conn, job.id):
+							cancelled = True
+						else:
+							run_t = current_t
+				
+				if cancelled:
+					continue # to next frame
+				
+				total_t = time.time() - start_t
+				
+				avg_t = total_t / len(job.frames)
+				
+				status = process.returncode
+				
+				print("status", status)
+				
+				headers = {"job-id":job.id, "slave-id":slave_id, "job-time":str(avg_t)}
+				
+				if status == 0: # non zero status is error
+					headers["job-result"] = str(DONE)
+					for frame in job.frames:
+						headers["job-frame"] = str(frame.number)
+						# send result back to server
+						f = open(NODE_PREFIX + job.id + "%04d" % frame.number + ".exr", 'rb')
+						conn.request("PUT", "render", f, headers=headers)
+						f.close()
+						response = conn.getresponse()
+				else:
+					headers["job-result"] = str(ERROR)
+					for frame in job.frames:
+						headers["job-frame"] = str(frame.number)
+						# send error result back to server
+						conn.request("PUT", "render", headers=headers)
+						response = conn.getresponse()
+				
+				for frame in job.frames:
+					headers["job-frame"] = str(frame.number)
+					# send log in any case
+					conn.request("PUT", "log", stdout, headers=headers)
+					response = conn.getresponse()
+			else:
+				if timeout < MAX_TIMEOUT:
+					timeout += INCREMENT_TIMEOUT
+				
+				for i in range(timeout):
+					time.sleep(1)
+					if engine.test_break():
+						conn.close()
+						return
+			
+		conn.close()
diff --git a/release/io/netrender/ui.py b/release/io/netrender/ui.py
new file mode 100644
index 00000000000..2fd2b9a317f
--- /dev/null
+++ b/release/io/netrender/ui.py
@@ -0,0 +1,290 @@
+import bpy
+import sys, os
+import http, http.client, http.server, urllib
+import subprocess, shutil, time, hashlib
+
+import netrender.slave as slave
+import netrender.master as master
+
+VERSION = b"0.3"
+
+PATH_PREFIX = "/tmp/"
+
+QUEUED = 0
+DISPATCHED = 1
+DONE = 2
+ERROR = 3
+
+class RenderButtonsPanel(bpy.types.Panel):
+	__space_type__ = "PROPERTIES"
+	__region_type__ = "WINDOW"
+	__context__ = "scene"
+	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
+	
+	def poll(self, context):
+		rd = context.scene.render_data
+		return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
+
+# Setting panel, use in the scene for now.
+class SCENE_PT_network_settings(RenderButtonsPanel):
+	__label__ = "Network Settings"
+	COMPAT_ENGINES = set(['NET_RENDER'])
+
+	def draw_header(self, context):
+		layout = self.layout
+		scene = context.scene
+
+	def draw(self, context):
+		layout = self.layout
+		scene = context.scene
+		rd = scene.render_data
+		
+		layout.active = True
+		
+		split = layout.split()
+		
+		col = split.column()
+		
+		col.itemR(scene.network_render, "mode")
+		col.itemR(scene.network_render, "server_address")
+		col.itemR(scene.network_render, "server_port")
+		
+		if scene.network_render.mode == "RENDER_CLIENT":
+			col.itemR(scene.network_render, "chunks")
+			col.itemR(scene.network_render, "job_name")
+			col.itemO("render.netclientsend", text="send job to server")
+bpy.types.register(SCENE_PT_network_settings)
+
+class SCENE_PT_network_slaves(RenderButtonsPanel):
+	__label__ = "Slaves Status"
+	COMPAT_ENGINES = set(['NET_RENDER'])
+	
+	def poll(self, context):
+		scene = context.scene
+		return super().poll(context) and scene.network_render.mode == "RENDER_CLIENT"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		scene = context.scene
+		netrender = scene.network_render
+
+		row = layout.row()
+		row.template_list(netrender, "slaves", netrender, "active_slave_index", rows=2)
+
+		col = row.column()
+
+		subcol = col.column(align=True)
+		subcol.itemO("render.netclientslaves", icon="ICON_FILE_REFRESH", text="")
+		subcol.itemO("render.netclientblacklistslave", icon="ICON_ZOOMOUT", text="")
+		
+		if netrender.active_slave_index >= 0 and len(netrender.slaves) > 0:
+			layout.itemS()
+			
+			slave = netrender.slaves[netrender.active_slave_index]
+
+			layout.itemL(text="Name: " + slave.name)
+			layout.itemL(text="Adress: " + slave.adress)
+			layout.itemL(text="Seen: " + slave.last_seen)
+			layout.itemL(text="Stats: " + slave.stats)
+
+bpy.types.register(SCENE_PT_network_slaves)
+
+class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel):
+	__label__ = "Slaves Blacklist"
+	COMPAT_ENGINES = set(['NET_RENDER'])
+	
+	def poll(self, context):
+		scene = context.scene
+		return super().poll(context) and scene.network_render.mode == "RENDER_CLIENT"
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		scene = context.scene
+		netrender = scene.network_render
+
+		row = layout.row()
+		row.template_list(netrender, "slaves_blacklist", netrender, "active_blacklisted_slave_index", rows=2)
+
+		col = row.column()
+
+		subcol = col.column(align=True)
+		subcol.itemO("render.netclientwhitelistslave", icon="ICON_ZOOMOUT", text="")
+
+		
+		if netrender.active_blacklisted_slave_index >= 0 and len(netrender.slaves_blacklist) > 0:
+			layout.itemS()
+			
+			slave = netrender.slaves_blacklist[netrender.active_blacklisted_slave_index]
+
+			layout.itemL(text="Name: " + slave.name)
+			layout.itemL(text="Adress: " + slave.adress)
+			layout.itemL(text="Seen: " + slave.last_seen)
+			layout.itemL(text="Stats: " + slave.stats)
+			
+bpy.types.register(SCENE_PT_network_slaves_blacklist)
+
+class SCENE_PT_network_jobs(RenderButtonsPanel):
+	__label__ = "Jobs"
+	COMPAT_ENGINES = set(['NET_RENDER'])
+	
+	def poll(self, context):
+		scene = context.scene
+		return super().poll(context) and scene.network_render.mode == "RENDER_CLIENT"
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		scene = context.scene
+		netrender = scene.network_render
+
+		row = layout.row()
+		row.template_list(netrender, "jobs", netrender, "active_job_index", rows=2)
+
+		col = row.column()
+
+		subcol = col.column(align=True)
+		subcol.itemO("render.netclientstatus", icon="ICON_FILE_REFRESH", text="")
+		subcol.itemO("render.netclientcancel", icon="ICON_ZOOMOUT", text="")
+
+		
+		if netrender.active_job_index >= 0 and len(netrender.jobs) > 0:
+			layout.itemS()
+			
+			job = netrender.jobs[netrender.active_job_index]
+
+			layout.itemL(text="Name: %s" % job.name)
+			layout.itemL(text="Length: %04i" % job.length)
+			layout.itemL(text="Done: %04i" % job.done)
+			layout.itemL(text="Error: %04i" % job.error)
+			
+bpy.types.register(SCENE_PT_network_jobs)
+
+class NetRenderSettings(bpy.types.IDPropertyGroup):
+	pass
+
+class NetRenderSlave(bpy.types.IDPropertyGroup):
+	pass
+
+class NetRenderJob(bpy.types.IDPropertyGroup):
+	pass
+
+bpy.types.register(NetRenderSettings)
+bpy.types.register(NetRenderSlave)
+bpy.types.register(NetRenderJob)
+
+bpy.types.Scene.PointerProperty(attr="network_render", type=NetRenderSettings, name="Network Render", description="Network Render Settings")
+
+NetRenderSettings.StringProperty( attr="server_address",
+				name="Server address",
+				description="IP or name of the master render server",
+				maxlen = 128,
+				default = "127.0.0.1")
+
+NetRenderSettings.IntProperty( attr="server_port",
+				name="Server port",
+				description="port of the master render server",
+				default = 8000,
+				min=1,
+				max=65535)
+
+NetRenderSettings.StringProperty( attr="job_name",
+				name="Job name",
+				description="Name of the job",
+				maxlen = 128,
+				default = "[default]")
+
+NetRenderSettings.IntProperty( attr="chunks",
+				name="Chunks",
+				description="Number of frame to dispatch to each slave in one chunk",
+				default = 5,
+				min=1,
+				max=65535)
+
+NetRenderSettings.StringProperty( attr="job_id",
+				name="Network job id",
+				description="id of the last sent render job",
+				maxlen = 64,
+				default = "")
+
+NetRenderSettings.IntProperty( attr="active_slave_index",
+				name="Index of the active slave",
+				description="",
+				default = -1,
+				min= -1,
+				max=65535)
+
+NetRenderSettings.IntProperty( attr="active_blacklisted_slave_index",
+				name="Index of the active slave",
+				description="",
+				default = -1,
+				min= -1,
+				max=65535)
+
+NetRenderSettings.IntProperty( attr="active_job_index",
+				name="Index of the active job",
+				description="",
+				default = -1,
+				min= -1,
+				max=65535)
+
+NetRenderSettings.EnumProperty(attr="mode",
+						items=(
+										("RENDER_CLIENT", "Client", "Act as render client"),
+										("RENDER_MASTER", "Master", "Act as render master"),
+										("RENDER_SLAVE", "Slave", "Act as render slave"),
+									),
+						name="network mode",
+						description="mode of operation of this instance",
+						default="RENDER_CLIENT")
+
+NetRenderSettings.CollectionProperty(attr="slaves", type=NetRenderSlave, name="Slaves", description="")
+NetRenderSettings.CollectionProperty(attr="slaves_blacklist", type=NetRenderSlave, name="Slaves Blacklist", description="")
+NetRenderSettings.CollectionProperty(attr="jobs", type=NetRenderJob, name="Job List", description="")
+
+NetRenderSlave.StringProperty( attr="name",
+				name="Name of the slave",
+				description="",
+				maxlen = 64,
+				default = "")
+
+NetRenderSlave.StringProperty( attr="adress",
+				name="Adress of the slave",
+				description="",
+				maxlen = 64,
+				default = "")
+
+NetRenderJob.StringProperty( attr="id",
+				name="ID of the job",
+				description="",
+				maxlen = 64,
+				default = "")
+
+
+NetRenderJob.StringProperty( attr="name",
+				name="Name of the job",
+				description="",
+				maxlen = 128,
+				default = "")
+
+NetRenderJob.IntProperty( attr="length",
+				name="Number of frames",
+				description="",
+				default = 0,
+				min= 0,
+				max=65535)
+
+NetRenderJob.IntProperty( attr="done",
+				name="Number of frames rendered",
+				description="",
+				default = 0,
+				min= 0,
+				max=65535)
+
+NetRenderJob.IntProperty( attr="error",
+				name="Number of frames in error",
+				description="",
+				default = 0,
+				min= 0,
+				max=65535)
diff --git a/release/io/netrender/utils.py b/release/io/netrender/utils.py
new file mode 100644
index 00000000000..c158ff115fa
--- /dev/null
+++ b/release/io/netrender/utils.py
@@ -0,0 +1,80 @@
+import bpy
+import sys, os
+import http, http.client, http.server, urllib
+import subprocess, shutil, time, hashlib
+
+VERSION = b"0.3"
+
+PATH_PREFIX = "/tmp/"
+
+QUEUED = 0
+DISPATCHED = 1
+DONE = 2
+ERROR = 3
+
+def clientConnection(scene):
+		netrender = scene.network_render
+		
+		conn = http.client.HTTPConnection(netrender.server_address, netrender.server_port)
+		
+		if clientVerifyVersion(conn):
+			return conn
+		else:
+			conn.close()
+			return None
+
+def clientVerifyVersion(conn):
+	conn.request("GET", "version")
+	response = conn.getresponse()
+	
+	if response.status != http.client.OK:
+		conn.close()
+		return False
+	
+	server_version = response.read()
+	
+	if server_version != VERSION:
+		print("Incorrect server version!")
+		print("expected", VERSION, "received", server_version)
+		return False
+	
+	return True
+
+def clientSendJob(conn, scene, anim = False, chunks = 5):
+	
+	if anim:
+		job_frame = "%i:%i" % (scene.start_frame, scene.end_frame)
+	else:
+		job_frame = "%i" % (scene.current_frame, )
+		
+	blacklist = []
+	
+	filename = bpy.data.filename
+	
+	name = scene.network_render.job_name
+	
+	if name == "[default]":
+		path, name = os.path.split(filename)
+	
+	for slave in scene.network_render.slaves_blacklist:
+		blacklist.append(slave.id)
+		
+	blacklist = " ".join(blacklist)
+	
+	headers = {"job-frame":job_frame, "job-name":name, "job-chunks": str(chunks), "slave-blacklist": blacklist}
+	
+	# try to send path first
+	conn.request("POST", "job", filename, headers=headers)
+	response = conn.getresponse()
+	
+	# if not found, send whole file
+	if response.status == http.client.NOT_FOUND:
+		f = open(bpy.data.filename, "rb")
+		conn.request("PUT", "file", f, headers=headers)
+		f.close()
+		response = conn.getresponse()
+	
+	return response.getheader("job-id")
+
+def clientRequestResult(conn, scene, job_id):
+	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(scene.current_frame)})

From 47190b2009f528df4050ac8ac0216990d5e12a53 Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Sat, 29 Aug 2009 17:25:26 +0000
Subject: [PATCH 333/577] Missing null check in particle edit code caused a
 crash when using search boxes.

---
 source/blender/editors/physics/editparticle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index c0b600edf36..220928cb79c 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -199,7 +199,7 @@ PTCacheEdit *PE_get_current(Scene *scene, Object *ob)
 	BKE_ptcache_ids_from_object(&pidlist, ob);
 
 	/* in the case of only one editable thing, set pset->edittype accordingly */
-	if(pidlist.first == pidlist.last) {
+	if(pidlist.first && pidlist.first == pidlist.last) {
 		pid = pidlist.first;
 		switch(pid->type) {
 			case PTCACHE_TYPE_PARTICLES:

From a261330d5c5622701a46d0ce2da95929ece89406 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Sat, 29 Aug 2009 18:02:37 +0000
Subject: [PATCH 334/577] 2.5: Bugfix: Preview-Render didn't update when
 changing material/texture id block/slot.

---
 source/blender/makesrna/intern/rna_material.c | 2 ++
 source/blender/makesrna/intern/rna_object.c   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index db573f0a666..9d51c687d09 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1658,11 +1658,13 @@ void rna_def_mtex_common(StructRNA *srna, const char *begin, const char *activeg
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_pointer_funcs(prop, activeget, activeset, NULL);
 	RNA_def_property_ui_text(prop, "Active Texture", "Active texture slot being displayed.");
+	RNA_def_property_update(prop, NC_TEXTURE|ND_SHADING_DRAW, NULL);
 
 	prop= RNA_def_property(srna, "active_texture_index", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "texact");
 	RNA_def_property_range(prop, 0, MAX_MTEX-1);
 	RNA_def_property_ui_text(prop, "Active Texture Index", "Index of active texture slot.");
+	RNA_def_property_update(prop, NC_TEXTURE|ND_SHADING_DRAW, NULL);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index cae96b0af4b..0535ae131bc 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1141,7 +1141,8 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "actcol");
 	RNA_def_property_int_funcs(prop, "rna_Object_active_material_index_get", "rna_Object_active_material_index_set", "rna_Object_active_material_index_range");
 	RNA_def_property_ui_text(prop, "Active Material Index", "Index of active material slot.");
-
+	RNA_def_property_update(prop, NC_OBJECT|ND_SHADING, NULL);
+	
 	/* transform */
 
 	prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);

From 5ab556e0668ef7811e2ac69121813e16bce10146 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 29 Aug 2009 20:29:29 +0000
Subject: [PATCH 335/577] bugfix: on windows, it wouldn't correctly recognize
 directories and import python modules on load.

BLI_exist vs BLI_exists (fun times were had by all)
---
 source/blender/python/intern/bpy_interface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 43db337c6db..ac8acc2c07c 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -618,7 +618,7 @@ void BPY_run_ui_scripts(bContext *C, int reload)
 				}
 			}
 #ifndef __linux__
-			else if( BLI_join_dirfile(path, dirname, de->d_name), S_ISDIR(BLI_exists(path))) {
+			else if( BLI_join_dirfile(path, dirname, de->d_name), S_ISDIR(BLI_exist(path))) {
 #else
 			else if(de->d_type==DT_DIR) {
 				BLI_join_dirfile(path, dirname, de->d_name);

From 7a562283434ea143cd6ec26b529dd3ea33047aa4 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Sat, 29 Aug 2009 21:51:58 +0000
Subject: [PATCH 336/577] 2.5 Paint:

* Don't do shared vertex colors for every vpaint dot. Profiling on a large mesh showed vpaint spent about 65% of the time in this function, but most of the time no difference will be apparent in the result. (Could make an operator so the user can force this operation after doing some painting.)

TODO:
Profiling now shows most time spent in drawing the mesh. (This is done twice for vpaint, the first time for finding backbuf sampling.)
---
 source/blender/editors/sculpt_paint/paint_vertex.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 581d10ee883..f66a9fbc1ed 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1733,8 +1733,6 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 						
 	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
-	do_shared_vertexcol(me);
-			
 	ED_region_tag_redraw(vc->ar);
 			
 	DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);

From c6ccf5fd2e9ff8a0bfe045c85e4675b3a8940255 Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Sat, 29 Aug 2009 21:52:57 +0000
Subject: [PATCH 337/577] Cloth didn't update properly in particle mode. Don't
 understand why the particle mode check was there to begin with, but if
 removing it causes trouble later on some other solution can be figured out.

---
 source/blender/blenkernel/intern/DerivedMesh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 84cccd8b939..43b9a63a2c1 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2077,7 +2077,7 @@ static void clear_mesh_caches(Object *ob)
 static void mesh_build_data(Scene *scene, Object *ob, CustomDataMask dataMask)
 {
 	Object *obact = scene->basact?scene->basact->object:NULL;
-	int editing = paint_facesel_test(ob)|(ob && ob->mode & OB_MODE_PARTICLE_EDIT);
+	int editing = paint_facesel_test(ob);
 	int needMapping = editing && (ob==obact);
 	float min[3], max[3];
 	

From 530deb73a988a2adfc8add73b842507b68254812 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 29 Aug 2009 23:05:46 +0000
Subject: [PATCH 338/577] Workarounds for 2 rna bugs. - mesh face properties
 that have no data are tested for length. - the rawtype of MFace.verts is not
 set, defaulting to CHAR, meaning only verts with 256 verts could be added
 from python. temp workaround by making PROP_RAW_INT the first in the enum.
 For some reason makesrna.c doesn't set the raw type MFace.verts at all.

---
 source/blender/makesrna/RNA_types.h       | 8 ++++----
 source/blender/makesrna/intern/rna_mesh.c | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 1acbfb21385..b57cbc3aa2c 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -176,11 +176,11 @@ typedef struct CollectionPointerLink {
 } CollectionPointerLink;
 
 typedef enum RawPropertyType {
-	PROP_RAW_CHAR,
+	PROP_RAW_INT, // XXX - abused for types that are not set, eg. MFace.verts, needs fixing.
 	PROP_RAW_SHORT,
-	PROP_RAW_INT,
-	PROP_RAW_FLOAT,
-	PROP_RAW_DOUBLE
+	PROP_RAW_CHAR,
+	PROP_RAW_DOUBLE,
+	PROP_RAW_FLOAT
 } RawPropertyType;
 
 typedef struct RawArray {
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 4d53986be4f..edecfc8cdb0 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -708,7 +708,10 @@ static void rna_TextureFace_image_set(PointerRNA *ptr, PointerRNA value)
 static int rna_MeshFace_verts_get_length(PointerRNA *ptr)
 {
 	MFace *face= (MFace*)ptr->data;
-	return face->v4 ? 4 : 3;
+	if(face)
+		return face->v4 ? 4 : 3;
+	else
+		return 4; // XXX rna_raw_access wants the length of a dummy face. this needs fixing. - Campbell
 }
 
 static int rna_MeshFace_verts_set_length(PointerRNA *ptr, int length)

From 371c3bcf7a34c980c99829f2507b56f76d1b481a Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sat, 29 Aug 2009 23:13:27 +0000
Subject: [PATCH 339/577] 2.5 Sound: Bugfixes.

---
 source/blender/blenloader/intern/readfile.c       | 6 +++---
 source/blender/editors/space_logic/logic_window.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 070c873686c..64fabc825bc 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5070,9 +5070,6 @@ static void direct_link_sound(FileData *fd, bSound *sound)
 
 	sound->packedfile = direct_link_packedfile(fd, sound->packedfile);
 	sound->newpackedfile = direct_link_packedfile(fd, sound->newpackedfile);
-
-	if(sound->cache)
-		sound_cache(sound, 1);
 }
 
 static void lib_link_sound(FileData *fd, Main *main)
@@ -5086,6 +5083,9 @@ static void lib_link_sound(FileData *fd, Main *main)
 			sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system
 			
 			sound_load(main, sound);
+
+			if(sound->cache)
+				sound_cache(sound, 1);
 		}
 		sound= sound->id.next;
 	}
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index d4475527058..118bcaa0cf4 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <float.h>
 
 #include "DNA_actuator_types.h"
 #include "DNA_controller_types.h"
@@ -2016,8 +2017,8 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 					{
 						uiDefButF(block, NUM, 0, "Minimum Gain: ", xco+10, yco-110, wval, 19, &sa->sound3D.min_gain, 0.0, 1.0, 0.0, 0.0, "The minimum gain of the sound, no matter how far it is away.");
 						uiDefButF(block, NUM, 0, "Maximum Gain: ", xco+10, yco-132, wval, 19, &sa->sound3D.max_gain, 0.0, 1.0, 0.0, 0.0, "The maximum gain of the sound, no matter how near it is..");
-						uiDefButF(block, NUM, 0, "Reference Distance: ", xco+10, yco-154, wval, 19, &sa->sound3D.reference_distance, 0.0, 1000.0, 0.0, 0.0, "The reference distance is the distance where the sound has a gain of 1.0.");
-						uiDefButF(block, NUM, 0, "Maximum Distance: ", xco+10, yco-176, wval, 19, &sa->sound3D.max_distance, 0.0, 1000.0, 0.0, 0.0, "The maximum distance at which you can hear the sound.");
+						uiDefButF(block, NUM, 0, "Reference Distance: ", xco+10, yco-154, wval, 19, &sa->sound3D.reference_distance, 0.0, FLT_MAX, 0.0, 0.0, "The reference distance is the distance where the sound has a gain of 1.0.");
+						uiDefButF(block, NUM, 0, "Maximum Distance: ", xco+10, yco-176, wval, 19, &sa->sound3D.max_distance, 0.0, FLT_MAX, 0.0, 0.0, "The maximum distance at which you can hear the sound.");
 						uiDefButF(block, NUM, 0, "Rolloff: ", xco+wval+10, yco-110, wval, 19, &sa->sound3D.rolloff_factor, 0.0, 5.0, 0.0, 0.0, "The rolloff factor defines the influence factor on volume depending on distance.");
 						uiDefButF(block, NUM, 0, "Cone Outer Gain: ", xco+wval+10, yco-132, wval, 19, &sa->sound3D.cone_outer_gain, 0.0, 1.0, 0.0, 0.0, "The gain outside the outer cone. The gain in the outer cone will be interpolated between this value und the normal gain in the inner cone.");
 						uiDefButF(block, NUM, 0, "Cone Outer Angle: ", xco+wval+10, yco-154, wval, 19, &sa->sound3D.cone_outer_angle, 0.0, 360.0, 0.0, 0.0, "The angle of the outer cone.");

From c2696ae63182da338d69a5127f03b1ad8b88f6c9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 29 Aug 2009 23:35:13 +0000
Subject: [PATCH 340/577] quiet warnings

---
 source/blender/editors/include/ED_particle.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index dcac51928a3..28807caa255 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -37,6 +37,7 @@ struct ParticleSystem;
 struct RadialControl;
 struct rcti;
 struct wmWindowManager;
+struct PTCacheEdit;
 
 /* particle edit mode */
 void PE_free_ptcache_edit(struct PTCacheEdit *edit);

From 2cb6078900c0083a6b64b5644af50d44a7fbeb8f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 30 Aug 2009 02:09:57 +0000
Subject: [PATCH 341/577] was crashing when joining in-link to in-link for the
 logic buttons.

---
 source/blender/editors/interface/interface_handlers.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index b69e8319956..79c707f5535 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -678,7 +678,11 @@ static void ui_add_link(uiBut *from, uiBut *to)
 		return;
 	}
 
-	if (from->type==LINK && to->type==INLINK) {
+	if (from->type==INLINK && to->type==INLINK) {
+		printf("cannot link\n");
+		return;
+	}
+	else if (from->type==LINK && to->type==INLINK) {
 		if( from->link->tocode != (int)to->hardmin ) {
 			printf("cannot link\n");
 			return;

From c9d2a1b71bd8a2155b94f9c00631e526a7be8778 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 30 Aug 2009 02:40:42 +0000
Subject: [PATCH 342/577] bug fixes and small changes

---
 release/io/netrender/master.py    | 57 +++++++++++++++----------------
 release/io/netrender/model.py     |  2 +-
 release/io/netrender/operators.py |  8 ++---
 release/io/netrender/slave.py     |  7 ++--
 release/io/netrender/ui.py        | 12 +++++++
 5 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
index 5a62ef1a8bf..daca3bcf653 100644
--- a/release/io/netrender/master.py
+++ b/release/io/netrender/master.py
@@ -5,7 +5,10 @@ import subprocess, shutil, time, hashlib
 from netrender.utils import *
 import netrender.model
 
-		
+JOB_WAITING = 0 # before all data has been entered
+JOB_PAUSED = 1 # paused by user
+JOB_QUEUED = 2 # ready to be dispatched
+
 class MRenderSlave(netrender.model.RenderSlave):
 	def __init__(self, name, adress, stats):
 		super().__init__()
@@ -25,7 +28,7 @@ class MRenderSlave(netrender.model.RenderSlave):
 
 # sorting key for jobs
 def groupKey(job):
-	return (job.framesLeft() > 0, job.priority, job.credits)
+	return (job.status, job.framesLeft() > 0, job.priority, job.credits)
 
 class MRenderJob(netrender.model.RenderJob):
 	def __init__(self, job_id, name, path, chunks = 1, priority = 1, credits = 100.0, blacklist = []):
@@ -33,6 +36,7 @@ class MRenderJob(netrender.model.RenderJob):
 		self.id = job_id
 		self.name = name
 		self.path = path
+		self.status = JOB_WAITING
 		self.frames = []
 		self.chunks = chunks
 		self.priority = priority
@@ -40,6 +44,9 @@ class MRenderJob(netrender.model.RenderJob):
 		self.blacklist = blacklist
 		self.last_dispatched = time.time()
 	
+	def start(self):
+		self.status = JOB_QUEUED
+	
 	def update(self):
 		self.credits -= 5 # cost of one frame
 		self.credits += (time.time() - self.last_dispatched) / 60
@@ -233,8 +240,6 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				message = []
 				
 				for job in self.server:
-					results = job.status()
-					
 					message.append(job.serialize())
 			
 			self.send_head()
@@ -322,25 +327,14 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			job_chunks = int(self.headers.get('job-chunks', "1"))
 			blacklist = self.headers.get('slave-blacklist', '').split()
 			
-			print("blacklist", blacklist)
-			
 			job_path = str(self.rfile.read(length), encoding='utf8')
 			
 			if os.path.exists(job_path):
-				f = open(job_path, "rb")
-				buf = f.read()
-				f.close()
+				job_id = self.server.nextJobID()
 				
-				job_id = hashlib.md5(buf).hexdigest()
+				job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
+				self.server.addJob(job)
 				
-				del buf
-				
-				job = self.server.getJobByID(job_id)
-				
-				if job == None:
-					job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
-					self.server.addJob(job)
-					
 				if ":" in job_frame_string:
 					frame_start, frame_end = [int(x) for x in job_frame_string.split(":")]
 					
@@ -349,6 +343,8 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				else:
 					job_frame = int(job_frame_string)
 					frame = job.addFrame(job_frame)
+					
+				job.start()
 		
 				self.send_head(headers={"job-id": job_id})
 			else:
@@ -385,9 +381,9 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			length = int(self.headers['content-length'])
 			job_frame_string = self.headers['job-frame']
 			
-			name, stats = eval(str(self.rfile.read(length), encoding='utf8'))
+			slave_info = netrender.model.RenderSlave.materialize(eval(str(self.rfile.read(length), encoding='utf8')))
 			
-			slave_id = self.server.addSlave(name, self.client_address, stats)
+			slave_id = self.server.addSlave(slave_info.name, self.client_address, slave_info.stats)
 			
 			self.send_head(headers = {"slave-id": slave_id})
 	
@@ -410,23 +406,19 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			job_chunks = int(self.headers.get('job-chunks', "1"))
 			blacklist = self.headers.get('slave-blacklist', '').split()
 			
-			buf = self.rfile.read(length)
+			job_id = self.server.nextJobID()
 			
-			job_id = hashlib.md5(buf).hexdigest()
+			buf = self.rfile.read(length)
 			
 			job_path = job_id + ".blend"
 			
 			f = open(PATH_PREFIX + job_path, "wb")
 			f.write(buf)
 			f.close()
-			
 			del buf
 			
-			job = self.server.getJobByID(job_id)
-			
-			if job == None:
-				job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
-				self.server.addJob(job)
+			job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
+			self.server.addJob(job)
 				
 			if ":" in job_frame_string:
 				frame_start, frame_end = [int(x) for x in job_frame_string.split(":")]
@@ -437,6 +429,8 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				job_frame = int(job_frame_string)
 				frame = job.addFrame(job_frame)
 	
+			job.start()
+			
 			self.send_head(headers={"job-id": job_id})
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "render":
@@ -495,6 +489,11 @@ class RenderMasterServer(http.server.HTTPServer):
 		self.jobs_map = {}
 		self.slaves = []
 		self.slaves_map = {}
+		self.job_id = 0
+	
+	def nextJobID(self):
+		self.job_id += 1
+		return str(self.job_id)
 	
 	def addSlave(self, name, adress, stats):
 		slave = MRenderSlave(name, adress, stats)
@@ -540,7 +539,7 @@ class RenderMasterServer(http.server.HTTPServer):
 	def getNewJob(self, slave_id):
 		if self.jobs:
 			for job in reversed(self.jobs):
-				if job.framesLeft() > 0 and slave_id not in job.blacklist:
+				if job.status == JOB_QUEUED and job.framesLeft() > 0 and slave_id not in job.blacklist:
 					return job, job.getFrames()
 		
 		return None, None
diff --git a/release/io/netrender/model.py b/release/io/netrender/model.py
index 6e68929d340..98866ff1dfc 100644
--- a/release/io/netrender/model.py
+++ b/release/io/netrender/model.py
@@ -65,7 +65,7 @@ class RenderJob:
 	def __len__(self):
 		return len(self.frames)
 	
-	def status(self):
+	def framesStatus(self):
 		results = {
 								QUEUED: 0,
 								DISPATCHED: 0,
diff --git a/release/io/netrender/operators.py b/release/io/netrender/operators.py
index 3355c3d1a0b..8df662b6b52 100644
--- a/release/io/netrender/operators.py
+++ b/release/io/netrender/operators.py
@@ -66,7 +66,7 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
 				netprops.jobs.add()
 				job = netprops.jobs[-1]
 				
-				job_results = j.status()
+				job_results = j.framesStatus()
 				
 				job.id = j.id
 				job.name = j.name
@@ -210,15 +210,15 @@ class RENDER_OT_netclientcancel(bpy.types.Operator):
 	__props__ = []
 	
 	def poll(self, context):
-		netrender = scene.network_render
-		return netrender.active_job_index >= 0 and len(netrender.jobs) > 0
+		netprops = context.scene.network_render
+		return netprops.active_job_index >= 0 and len(netprops.jobs) > 0
 		
 	def execute(self, context):
 		netprops = context.scene.network_render
 		conn = clientConnection(context.scene)
 		
 		if conn:
-			job = netprops.jobs[netrender.active_job_index]
+			job = netprops.jobs[netprops.active_job_index]
 			
 			conn.request("POST", "cancel", headers={"job-id":job.id})
 			
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
index 03c6803955e..59c474293b3 100644
--- a/release/io/netrender/slave.py
+++ b/release/io/netrender/slave.py
@@ -11,7 +11,10 @@ INCREMENT_TIMEOUT = 1
 
 def slave_Info():
 	sysname, nodename, release, version, machine = os.uname()
-	return (nodename, sysname + " " + release + " " + machine)
+	slave = netrender.model.RenderSlave()
+	slave.name = nodename
+	slave.stats = sysname + " " + release + " " + machine
+	return slave
 
 def testCancel(conn, job_id):
 		conn.request("HEAD", "status", headers={"job-id":job_id})
@@ -35,7 +38,7 @@ def render_slave(engine, scene):
 	conn = clientConnection(scene)
 	
 	if conn:
-		conn.request("POST", "slave", repr(slave_Info()))
+		conn.request("POST", "slave", repr(slave_Info().serialize()))
 		response = conn.getresponse()
 		
 		slave_id = response.getheader("slave-id")
diff --git a/release/io/netrender/ui.py b/release/io/netrender/ui.py
index 2fd2b9a317f..71b013c5a63 100644
--- a/release/io/netrender/ui.py
+++ b/release/io/netrender/ui.py
@@ -255,6 +255,18 @@ NetRenderSlave.StringProperty( attr="adress",
 				maxlen = 64,
 				default = "")
 
+NetRenderSlave.StringProperty( attr="last_seen",
+				name="Last time slave was seen by server",
+				description="",
+				maxlen = 64,
+				default = "")
+
+NetRenderSlave.StringProperty( attr="stats",
+				name="Hardware stats of the slave",
+				description="",
+				maxlen = 128,
+				default = "")
+
 NetRenderJob.StringProperty( attr="id",
 				name="ID of the job",
 				description="",

From 4b206c675c21322cf98700dddfc0d0485b3d6ffc Mon Sep 17 00:00:00 2001
From: Tom Musgrove <LetterRip@gmail.com>
Date: Sun, 30 Aug 2009 03:10:03 +0000
Subject: [PATCH 343/577] just some comment fixes

---
 source/blender/blenkernel/BKE_shrinkwrap.h    | 4 ++--
 source/blender/blenkernel/intern/shrinkwrap.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index eb0e3c4ef00..5b413ae4e44 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -115,9 +115,9 @@ typedef struct ShrinkwrapCalcData
 	int vgroup;						//Vertex group num
 
 	struct DerivedMesh *target;		//mesh we are shrinking to	
-	SpaceTransform local2target;	//transform to move bettwem local and target space
+	SpaceTransform local2target;	//transform to move between local and target space
 
-	float keepDist;					//Distance to kept from target (units are in local space)
+	float keepDist;					//Distance to keep above target surface (units are in local space)
 
 } ShrinkwrapCalcData;
 
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 27357d92aae..efb7db04029 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -574,7 +574,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Scene *scene, Object
 				}
 			}
 
-			//Just to make sure we are not letting any memory behind
+			//Just to make sure we are not leaving any memory behind
 			assert(ssmd.emCache == NULL);
 			assert(ssmd.mCache == NULL);
 		}

From e104b429295766f9276ea854e02f085cf65e623f Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 30 Aug 2009 04:48:34 +0000
Subject: [PATCH 344/577] Grease Pencil: Drawing Improvements

* Smooth strokes can now be drawn again, with normal (i.e. reasonably speedy feedback again).
Previously slow drawing was caused by a bad notifier being used - the full screen was redrawn each time instead of just the relevant region. Now, only the relevant region is redrawn while drawing, and a proper flush is done for the rest of the screen at the end.

* Made drawing straight lines a proper drawing 'mode' for Grease Pencil now. Use the Ctrl-D-LMB hotkey to draw straight lines in this way. The (buffer) line drawn now will accurately represent the final straight line instead of drawing the freehand path taken as before.
---
 source/blender/editors/gpencil/gpencil_edit.c |   4 +-
 .../blender/editors/gpencil/gpencil_intern.h  |   7 +
 source/blender/editors/gpencil/gpencil_ops.c  |   5 +-
 .../blender/editors/gpencil/gpencil_paint.c   | 153 +++++++++++-------
 4 files changed, 105 insertions(+), 64 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 2faf3ccbbda..b2228134750 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -169,7 +169,7 @@ static int gp_data_add_exec (bContext *C, wmOperator *op)
 	}
 	
 	/* notifiers */
-	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX need a nicer one that will work	
 	
 	return OPERATOR_FINISHED;
 }
@@ -216,7 +216,7 @@ static int gp_data_unlink_exec (bContext *C, wmOperator *op)
 	}
 	
 	/* notifiers */
-	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX need a nicer one that will work	
 	
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index cc98d491f7a..2c7bf9156c3 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -40,6 +40,13 @@ struct wmOperatorType;
 
 void GPENCIL_OT_draw(struct wmOperatorType *ot);
 
+/* Paint Modes for operator*/
+typedef enum eGPencil_PaintModes {
+	GP_PAINTMODE_DRAW = 0,
+	GP_PAINTMODE_ERASER,
+	GP_PAINTMODE_DRAW_STRAIGHT,
+} eGPencil_PaintModes;
+
 /* buttons editing --- */
 
 void GPENCIL_OT_data_add(struct wmOperatorType *ot);
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 364b27b61b0..2d23a331211 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -56,9 +56,12 @@ void gpencil_common_keymap(wmWindowManager *wm, ListBase *keymap)
 	/* Draw */
 		/* draw */
 	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, 0, DKEY);
+		/* draw - straight lines */
+	kmi=WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, KM_CTRL, DKEY);
+		RNA_enum_set(kmi->ptr, "mode", GP_PAINTMODE_DRAW_STRAIGHT);
 		/* erase */
 	kmi=WM_keymap_add_item(keymap, "GPENCIL_OT_draw", RIGHTMOUSE, KM_PRESS, 0, DKEY);
-		RNA_enum_set(kmi->ptr, "mode", 1); // XXX need to make the defines for this public (this is GP_PAINTMODE_ERASER)
+		RNA_enum_set(kmi->ptr, "mode", GP_PAINTMODE_ERASER);
 }
 
 /* ****************************************** */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 82dc76a2152..9cf6f3d751f 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -68,16 +68,6 @@
 
 #include "gpencil_intern.h"
 
-/* ******************************************* */
-/* Context Wrangling... */
-
-/* check if context is suitable for drawing */
-static int gpencil_draw_poll (bContext *C)
-{
-	// TODO: must check context for Grease Pencil data...
-	return 1;
-}
-
 /* ******************************************* */
 /* 'Globals' and Defines */
 
@@ -121,12 +111,6 @@ enum {
 	GP_STATUS_DONE			/* painting done */
 };
 
-/* values for tGPsdata->paintmode */
-enum {
-	GP_PAINTMODE_DRAW = 0,
-	GP_PAINTMODE_ERASER
-};
-
 /* Return flags for adding points to stroke buffer */
 enum {
 	GP_STROKEADD_INVALID	= -2,		/* error occurred - insufficient info to do so */
@@ -138,7 +122,6 @@ enum {
 /* Runtime flags */
 enum {
 	GP_PAINTFLAG_FIRSTRUN		= (1<<0),	/* operator just started */
-	GP_PAINTFLAG_STRAIGHTLINES	= (1<<1),	/* only take the endpoints of a stroke */
 };
 
 /* ------ */
@@ -152,16 +135,21 @@ enum {
 	/* minimum length of new segment before new point can be added */
 #define MIN_EUCLIDEAN_PX	(U.gp_euclideandist)
 
-/* macro to test if only converting endpoints - only for use when converting!  */	
-// XXX for now, don't test for editpaint too...
-//#define GP_BUFFER2STROKE_ENDPOINTS ((gpd->flag & GP_DATA_EDITPAINT) && (p->flags & GP_PAINTFLAG_STRAIGHTLINES))
-#define GP_BUFFER2STROKE_ENDPOINTS ((p->flags & GP_PAINTFLAG_STRAIGHTLINES))
-
 /* ------ */
 /* Forward defines for some functions... */
 
 static void gp_session_validatebuffer(tGPsdata *p);
 
+/* ******************************************* */
+/* Context Wrangling... */
+
+/* check if context is suitable for drawing */
+static int gpencil_draw_poll (bContext *C)
+{
+	/* check if current context can support GPencil data */
+	return (gpencil_data_get_pointers(C, NULL) != NULL);
+}
+
 /* ******************************************* */
 /* Calculations/Conversions */
 
@@ -258,26 +246,68 @@ static short gp_stroke_addpoint (tGPsdata *p, int mval[2], float pressure)
 	bGPdata *gpd= p->gpd;
 	tGPspoint *pt;
 	
-	/* check if still room in buffer */
-	if (gpd->sbuffer_size >= GP_STROKE_BUFFER_MAX)
-		return GP_STROKEADD_OVERFLOW;
-	
-	/* get pointer to destination point */
-	pt= ((tGPspoint *)(gpd->sbuffer) + gpd->sbuffer_size);
-	
-	/* store settings */
-	pt->x= mval[0];
-	pt->y= mval[1];
-	pt->pressure= pressure;
-	
-	/* increment counters */
-	gpd->sbuffer_size++;
-	
-	/* check if another operation can still occur */
-	if (gpd->sbuffer_size == GP_STROKE_BUFFER_MAX)
-		return GP_STROKEADD_FULL;
-	else
+	/* check painting mode */
+	if (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT) {
+		/* straight lines only - i.e. only store start and end point in buffer */
+		if (gpd->sbuffer_size == 0) {
+			/* first point in buffer (start point) */
+			pt= (tGPspoint *)(gpd->sbuffer);
+			
+			/* store settings */
+			pt->x= mval[0];
+			pt->y= mval[1];
+			pt->pressure= pressure;
+			
+			/* increment buffer size */
+			gpd->sbuffer_size++;
+		}
+		else {
+			/* normally, we just reset the endpoint to the latest value 
+			 *	- assume that pointers for this are always valid...
+			 */
+			pt= ((tGPspoint *)(gpd->sbuffer) + 1);
+			
+			/* store settings */
+			pt->x= mval[0];
+			pt->y= mval[1];
+			pt->pressure= pressure;
+			
+			/* if this is just the second point we've added, increment the buffer size
+			 * so that it will be drawn properly...
+			 * otherwise, just leave it alone, otherwise we get problems
+			 */
+			if (gpd->sbuffer_size != 2)
+				gpd->sbuffer_size= 2;
+		}
+		
+		/* can keep carrying on this way :) */
 		return GP_STROKEADD_NORMAL;
+	}
+	else if (p->paintmode == GP_PAINTMODE_DRAW) { /* normal drawing */
+		/* check if still room in buffer */
+		if (gpd->sbuffer_size >= GP_STROKE_BUFFER_MAX)
+			return GP_STROKEADD_OVERFLOW;
+		
+		/* get pointer to destination point */
+		pt= ((tGPspoint *)(gpd->sbuffer) + gpd->sbuffer_size);
+		
+		/* store settings */
+		pt->x= mval[0];
+		pt->y= mval[1];
+		pt->pressure= pressure;
+		
+		/* increment counters */
+		gpd->sbuffer_size++;
+		
+		/* check if another operation can still occur */
+		if (gpd->sbuffer_size == GP_STROKE_BUFFER_MAX)
+			return GP_STROKEADD_FULL;
+		else
+			return GP_STROKEADD_NORMAL;
+	}
+	
+	/* just say it's normal for now, since we don't have another state... */
+	return GP_STROKEADD_NORMAL;
 }
 
 /* smooth a stroke (in buffer) before storing it */
@@ -287,7 +317,7 @@ static void gp_stroke_smooth (tGPsdata *p)
 	int i=0, cmx=gpd->sbuffer_size;
 	
 	/* only smooth if smoothing is enabled, and we're not doing a straight line */
-	if (!(U.gp_settings & GP_PAINT_DOSMOOTH) || GP_BUFFER2STROKE_ENDPOINTS)
+	if (!(U.gp_settings & GP_PAINT_DOSMOOTH) || (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT))
 		return;
 	
 	/* don't try if less than 2 points in buffer */
@@ -320,7 +350,7 @@ static void gp_stroke_simplify (tGPsdata *p)
 	short i, j;
 	
 	/* only simplify if simlification is enabled, and we're not doing a straight line */
-	if (!(U.gp_settings & GP_PAINT_DOSIMPLIFY) || GP_BUFFER2STROKE_ENDPOINTS)
+	if (!(U.gp_settings & GP_PAINT_DOSIMPLIFY) || (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT))
 		return;
 	
 	/* don't simplify if less than 4 points in buffer */
@@ -388,11 +418,10 @@ static void gp_stroke_newfrombuffer (tGPsdata *p)
 	tGPspoint *ptc;
 	int i, totelem;
 	
-	/* get total number of points to allocate space for:
-	 *	- in 'Draw Mode', holding the Ctrl-Modifier will only take endpoints
-	 *	- otherwise, do whole stroke
+	/* get total number of points to allocate space for 
+	 *	- drawing straight-lines only requires the endpoints
 	 */
-	if (GP_BUFFER2STROKE_ENDPOINTS)
+	if (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT)
 		totelem = (gpd->sbuffer_size >= 2) ? 2: gpd->sbuffer_size;
 	else
 		totelem = gpd->sbuffer_size;
@@ -416,8 +445,8 @@ static void gp_stroke_newfrombuffer (tGPsdata *p)
 	gps->flag= gpd->sbuffer_sflag;
 	
 	/* copy points from the buffer to the stroke */
-	if (GP_BUFFER2STROKE_ENDPOINTS) {
-		/* 'Draw Mode' + Ctrl-Modifier - only endpoints */
+	if (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT) {
+		/* straight lines only -> only endpoints */
 		{
 			/* first point */
 			ptc= gpd->sbuffer;
@@ -1013,7 +1042,6 @@ static int gpencil_draw_init (bContext *C, wmOperator *op)
 {
 	tGPsdata *p;
 	int paintmode= RNA_enum_get(op->ptr, "mode");
-	int straightLines= RNA_boolean_get(op->ptr, "straight_lines");
 	
 	/* check context */
 	p= op->customdata= gp_session_initpaint(C);
@@ -1033,10 +1061,6 @@ static int gpencil_draw_init (bContext *C, wmOperator *op)
 	/* radius for eraser circle is defined in userprefs now */
 	p->radius= U.gp_eraser;
 	
-	/* set line-drawing settings (straight or freehand lines) */
-	if (straightLines)
-		p->flags |= GP_PAINTFLAG_STRAIGHTLINES;
-	
 	/* everything is now setup ok */
 	return 1;
 }
@@ -1126,8 +1150,8 @@ static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *even
 {
 	tGPsdata *p= op->customdata;
 	ARegion *ar= p->ar;
-	PointerRNA itemptr;
-	float mousef[2];
+	//PointerRNA itemptr;
+	//float mousef[2];
 	int tablet=0;
 
 	/* convert from window-space to area-space mouse coordintes */
@@ -1162,6 +1186,7 @@ static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *even
 			return;
 	}
 	
+#if 0 // NOTE: disabled for now, since creating this data is currently useless anyways (and slows things down)
 	/* fill in stroke data (not actually used directly by gpencil_draw_apply) */
 	RNA_collection_add(op->ptr, "stroke", &itemptr);
 
@@ -1169,12 +1194,13 @@ static void gpencil_draw_apply_event (bContext *C, wmOperator *op, wmEvent *even
 	mousef[1]= p->mval[1];
 	RNA_float_set_array(&itemptr, "mouse", mousef);
 	RNA_float_set(&itemptr, "pressure", p->pressure);
+#endif 
 	
 	/* apply the current latest drawing point */
 	gpencil_draw_apply(C, op, p);
 	
 	/* force refresh */
-	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	ED_region_tag_redraw(p->ar); /* just active area for now, since doing whole screen is too slow */
 }
 
 /* ------------------------------- */
@@ -1232,7 +1258,7 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op)
 	gpencil_draw_exit(C, op);
 	
 	/* refreshes */
-	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX need a nicer one that will work	
 	
 	/* done */
 	return OPERATOR_FINISHED;
@@ -1311,6 +1337,10 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 				/* basically, this should be mouse-button up */
 				printf("\t\tGP - end of stroke \n");
 				gpencil_draw_exit(C, op);
+				
+				/* one last flush before we're done */
+				WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX need a nicer one that will work	
+				
 				return OPERATOR_FINISHED;
 			}
 			else {
@@ -1340,6 +1370,7 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 		/* scrolling mouse-wheel increases radius of eraser 
 		 * 	- though this is quite a difficult action to perform
 		 */
+		// XXX this stuff doesn't work
 		case WHEELUPMOUSE:
 			p->radius += 1.5f;
 			break;
@@ -1358,7 +1389,8 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 /* ------------------------------- */
 
 static EnumPropertyItem prop_gpencil_drawmodes[] = {
-	{GP_PAINTMODE_DRAW, "DRAW", 0, "Draw", ""},
+	{GP_PAINTMODE_DRAW, "DRAW", 0, "Draw Freehand", ""},
+	{GP_PAINTMODE_DRAW_STRAIGHT, "DRAW_STRAIGHT", 0, "Draw Straight Lines", ""},
 	{GP_PAINTMODE_ERASER, "ERASER", 0, "Eraser", ""},
 	{0, NULL, 0, NULL, NULL}
 };
@@ -1382,7 +1414,6 @@ void GPENCIL_OT_draw (wmOperatorType *ot)
 	
 	/* settings for drawing */
 	RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to intepret mouse movements.");
-	RNA_def_boolean(ot->srna, "straight_lines", 0, "Straight Lines", "Only take the endpoints of the strokes, so that straight lines can be drawn.");
-	
+		// xxx the stuff below is used only for redo operator, but is not really working
 	RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }

From 05ebac71ca72966efd2d5d8692f5959c33a9d621 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 30 Aug 2009 05:54:27 +0000
Subject: [PATCH 345/577] Grease Pencil: Bugfix (Dots) + RNA Wrapping

* Making single dots should be possible again.

* Wrapped the debug option, 'Show Points', for layers, which makes all the points on the layer get drawn with dots indicating positions of stroke points.
---
 source/blender/editors/gpencil/gpencil_buttons.c | 14 +++++++-------
 source/blender/editors/gpencil/gpencil_paint.c   |  6 +++++-
 source/blender/makesrna/intern/rna_gpencil.c     |  4 ++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 954f6c7e61e..f29d37311fb 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -203,13 +203,6 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		subcol= uiLayoutColumn(col, 1);
 			uiItemR(subcol, NULL, 0, &ptr, "line_thickness", UI_ITEM_R_SLIDER);
 		
-		/* debugging options */
-		if (G.f & G_DEBUG) {
-			// XXX this option hasn't been wrapped yet... since it's just debug
-			//subcol= uiLayoutColumn(col, 1);
-			//	uiItemR(subrow, NULL, 0, &ptr, "show_points", 0);
-		}
-		
 		/* right column ................... */
 		col= uiLayoutColumn(split, 0);
 		
@@ -218,6 +211,13 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 			uiItemR(subcol, "Onion Skinning", 0, &ptr, "use_onion_skinning", 0);
 			uiItemR(subcol, "GStep", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep)
 		
+		/* debugging options */
+		// XXX re-enable the debug-only checks later
+		//if (G.f & G_DEBUG) {
+			subcol= uiLayoutColumn(col, 1);
+				uiItemR(subcol, NULL, 0, &ptr, "show_points", 0);
+		//}
+		
 		/* additional options... */
 		// None at the moment...
 	}
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 9cf6f3d751f..c18a807f9d4 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -161,8 +161,12 @@ static short gp_stroke_filtermval (tGPsdata *p, int mval[2], int pmval[2])
 	int dx= abs(mval[0] - pmval[0]);
 	int dy= abs(mval[1] - pmval[1]);
 	
+	/* if buffer is empty, just let this go through (i.e. so that dots will work) */
+	if (p->gpd->sbuffer_size == 0)
+		return 1;
+	
 	/* check if mouse moved at least certain distance on both axes (best case) */
-	if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX))
+	else if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX))
 		return 1;
 	
 	/* check if the distance since the last point is significant enough */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 340ba1a0f31..e025aca010c 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -208,6 +208,10 @@ void rna_def_gpencil_layer(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_SELECT);
 	RNA_def_property_ui_text(prop, "Selected", "Layer is selected for editing in the DopeSheet.");
 	
+	prop= RNA_def_property(srna, "show_points", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_DRAWDEBUG);
+	RNA_def_property_ui_text(prop, "Show Points", "Draw the points which make up the strokes (for debugging purposes).");
+	
 }
 
 void rna_def_gpencil_data(BlenderRNA *brna)

From 46ba8b6edb242b5cf7605cf04c79c85159eb222c Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 30 Aug 2009 06:10:38 +0000
Subject: [PATCH 346/577] Grease Pencil: Hacky fix for "broken strokes" bug
 (pun intended) ;)

For the strokes drawn using OpenGL lines, moderately-sized changes in the pressure between two points could result in the stroke being disjointed, since a new GL_LINE_STRIP would need to be created with the new line thickness due to the new pressure value.

(In reference to the summary of this commit, this bug was noticed by Matt Ebb (broken). This bug is also in 2.4x, but was suprisingly not really noticed.)
---
 source/blender/editors/gpencil/drawgpencil.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 4a48e9a4e3b..a89a038d760 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -122,11 +122,21 @@ static void gp_draw_stroke_buffer (tGPspoint *points, int totpoints, short thick
 		
 		glBegin(GL_LINE_STRIP);
 		for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
+			/* if there was a significant pressure change, stop the curve, change the thickness of the stroke,
+			 * and continue drawing again (since line-width cannot change in middle of GL_LINE_STRIP)
+			 */
 			if (fabs(pt->pressure - oldpressure) > 0.2f) {
 				glEnd();
 				glLineWidth(pt->pressure * thickness);
 				glBegin(GL_LINE_STRIP);
 				
+				/* need to roll-back one point to ensure that there are no gaps in the stroke */
+				if (i != 0) {
+					pt--;
+					glVertex2f(pt->x, pt->y);
+					pt++;
+				}
+				/* now the point we want... */
 				glVertex2f(pt->x, pt->y);
 				
 				oldpressure = pt->pressure;
@@ -206,11 +216,21 @@ static void gp_draw_stroke_3d (bGPDspoint *points, int totpoints, short thicknes
 	/* draw stroke curve */
 	glBegin(GL_LINE_STRIP);
 	for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
+		/* if there was a significant pressure change, stop the curve, change the thickness of the stroke,
+		 * and continue drawing again (since line-width cannot change in middle of GL_LINE_STRIP)
+		 */
 		if (fabs(pt->pressure - oldpressure) > 0.2f) {
 			glEnd();
 			glLineWidth(pt->pressure * thickness);
 			glBegin(GL_LINE_STRIP);
 			
+			/* need to roll-back one point to ensure that there are no gaps in the stroke */
+			if (i != 0) {
+				pt--;
+				glVertex3f(pt->x, pt->y, pt->z);
+				pt++;
+			}
+			/* now the point we want... */
 			glVertex3f(pt->x, pt->y, pt->z);
 			
 			oldpressure = pt->pressure;

From 466d59461d060b291dc1df8bd8b26fcd8d59ca1d Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 30 Aug 2009 06:42:53 +0000
Subject: [PATCH 347/577] * Limit available texture coordinate types when using
 volume materials

---
 source/blender/makesrna/intern/rna_material.c | 68 ++++++++++++++-----
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 9d51c687d09..651aeae217e 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -35,6 +35,20 @@
 
 #include "WM_types.h"
 
+static EnumPropertyItem prop_texture_coordinates_items[] = {
+{TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates."},
+{TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates."},
+{TEXCO_UV, "UV", 0, "UV", "Uses UV coordinates for texture coordinates."},
+{TEXCO_ORCO, "ORCO", 0, "Generated", "Uses the original undeformed coordinates of the object."},
+{TEXCO_STRAND, "STRAND", 0, "Strand", "Uses normalized strand texture coordinate (1D)."},
+{TEXCO_STICKY, "STICKY", 0, "Sticky", "Uses mesh's sticky coordinates for the texture coordinates."},
+{TEXCO_WINDOW, "WINDOW", 0, "Window", "Uses screen coordinates as texture coordinates."},
+{TEXCO_NORM, "NORMAL", 0, "Normal", "Uses normal vector as texture coordinates."},
+{TEXCO_REFL, "REFLECTION", 0, "Reflection", "Uses reflection vector as texture coordinates."},
+{TEXCO_STRESS, "STRESS", 0, "Stress", "Uses the difference of edge lengths compared to original coordinates of the mesh."},
+{TEXCO_TANGENT, "TANGENT", 0, "Tangent", "Uses the optional tangent vector as texture coordinates."},
+{0, NULL, 0, NULL, NULL}};
+
 #ifdef RNA_RUNTIME
 
 #include "MEM_guardedalloc.h"
@@ -207,6 +221,42 @@ void rna_Material_use_nodes_set(PointerRNA *ptr, int value)
 		ED_node_shader_default(ma);
 }
 
+static EnumPropertyItem *rna_Material_texture_coordinates_itemf(bContext *C, PointerRNA *ptr, int *free)
+{
+	Material *ma= (Material*)ptr->id.data;
+	EnumPropertyItem *item= NULL;
+	int totitem= 0;
+	
+	if(C==NULL) {
+		return prop_texture_coordinates_items;
+	}
+	
+	RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_GLOB);
+	RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_OBJECT);
+	RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_ORCO);
+	
+	if(ma->material_type == MA_TYPE_VOLUME) {
+		
+	}
+	else if (ELEM3(ma->material_type, MA_TYPE_SURFACE, MA_TYPE_HALO, MA_TYPE_WIRE)) {
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_UV);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_STRAND);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_STICKY);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_WINDOW);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_NORM);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_REFL);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_STRESS);
+		RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_TANGENT);
+	}
+	
+	RNA_enum_item_end(&item, &totitem);
+	
+	*free= 1;
+	
+	return item;
+}
+
+
 #else
 
 static void rna_def_material_mtex(BlenderRNA *brna)
@@ -214,21 +264,6 @@ static void rna_def_material_mtex(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	static EnumPropertyItem prop_texture_coordinates_items[] = {
-		{TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates."},
-		{TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates."},
-		{TEXCO_UV, "UV", 0, "UV", "Uses UV coordinates for texture coordinates."},
-		{TEXCO_ORCO, "ORCO", 0, "Generated", "Uses the original undeformed coordinates of the object."},
-		{TEXCO_STRAND, "STRAND", 0, "Strand", "Uses normalized strand texture coordinate (1D)."},
-		{TEXCO_STICKY, "STICKY", 0, "Sticky", "Uses mesh's sticky coordinates for the texture coordinates."},
-		{TEXCO_WINDOW, "WINDOW", 0, "Window", "Uses screen coordinates as texture coordinates."},
-		{TEXCO_NORM, "NORMAL", 0, "Normal", "Uses normal vector as texture coordinates."},
-		{TEXCO_REFL, "REFLECTION", 0, "Reflection", "Uses reflection vector as texture coordinates."},
-		{TEXCO_STRESS, "STRESS", 0, "Stress", "Uses the difference of edge lengths compared to original coordinates of the mesh."},
-		{TEXCO_TANGENT, "TANGENT", 0, "Tangent", "Uses the optional tangent vector as texture coordinates."},
-
-		{0, NULL, 0, NULL, NULL}};
-
 	static EnumPropertyItem prop_mapping_items[] = {
 		{MTEX_FLAT, "FLAT", 0, "Flat", "Maps X and Y coordinates directly."},
 		{MTEX_CUBE, "CUBE", 0, "Cube", "Maps using the normal vector."},
@@ -271,9 +306,10 @@ static void rna_def_material_mtex(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "texco");
 	RNA_def_property_enum_items(prop, prop_texture_coordinates_items);
+	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Material_texture_coordinates_itemf");
 	RNA_def_property_ui_text(prop, "Texture Coordinates", "");
 	RNA_def_property_update(prop, NC_TEXTURE, NULL);
-
+	
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "object");
 	RNA_def_property_struct_type(prop, "Object");

From 970c9214b543c95921dbb51a681457b5d6597133 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 30 Aug 2009 07:07:02 +0000
Subject: [PATCH 348/577] * Fixes for shading objects inside volumes

---
 source/blender/render/intern/include/render_types.h  |  1 +
 source/blender/render/intern/source/convertblender.c |  1 +
 source/blender/render/intern/source/volumetric.c     | 12 +++++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index c4910f7733d..e50e498228d 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -419,6 +419,7 @@ typedef struct VolumeOb
 typedef struct MatInside {
 	struct MatInside *next, *prev;
 	struct Material *ma;
+	struct ObjectInstanceRen *obi;
 } MatInside;
 
 typedef struct VolPrecachePart
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index e486daf2585..cf6246e3641 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -2999,6 +2999,7 @@ static void init_camera_inside_volumes(Render *re)
 					
 					mi = MEM_mallocN(sizeof(MatInside), "camera inside material");
 					mi->ma = vo->ma;
+					mi->obi = obi;
 					
 					BLI_addtail(&(re->render_volumes_inside), mi);
 				}
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 046a145e9da..4fa31674bbe 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -674,15 +674,25 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 {
 	MatInside *m;
 	Material *mat_backup;
+	ObjectInstanceRen *obi_backup;
+	float prev_alpha = shr->alpha;
 	
 	//if (BLI_countlist(&R.render_volumes_inside) == 0) return;
 	
 	/* XXX: extend to multiple volumes perhaps later */
 	mat_backup = shi->mat;
+	obi_backup = shi->obi;
+	
 	m = R.render_volumes_inside.first;
 	shi->mat = m->ma;
+	shi->obi = m->obi;
+	shi->obr = m->obi->obr;
 	
 	volume_trace(shi, shr, VOL_SHADE_INSIDE);
-
+	shr->alpha += prev_alpha;
+	CLAMP(shr->alpha, 0.f, 1.f);
+	
 	shi->mat = mat_backup;
+	shi->obi = obi_backup;
+	shi->obr = obi_backup->obr;
 }
\ No newline at end of file

From c34d49cc5b2d3bdd72f44b77b85c12e7b1717c17 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sun, 30 Aug 2009 09:10:31 +0000
Subject: [PATCH 349/577] Fix for libsndfile in mingw scons config.

---
 config/win32-mingw-config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 26fa0835255..e3834c41a81 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -35,7 +35,7 @@ BF_JACK_LIBPATH = '${BF_JACK}/lib'
 WITH_BF_SNDFILE = False
 BF_SNDFILE = LIBDIR + '/sndfile'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'libsndfile'
+BF_SNDFILE_LIB = 'libsndfile-1'
 BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
 
 WITH_BF_SDL = True

From b9b30e2032a7f5ebcf87a22ad4ab8d66194d6125 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sun, 30 Aug 2009 09:11:24 +0000
Subject: [PATCH 350/577] Same fix for libsndfile in cmake.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1e18723f5d..a92099698c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,7 +259,7 @@ IF(WIN32)
   IF(WITH_SNDFILE)
 	SET(SNDFILE ${LIBDIR}/sndfile)
 	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIB sndfile-1)
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
   ENDIF(WITH_SNDFILE)
 

From d4d520c9a2312e1b03872f92b1e9be1150d167d5 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 30 Aug 2009 11:37:29 +0000
Subject: [PATCH 351/577] Grease Pencil: Various Drawing Fixes

* Restored option to have strokes aligned to screen space. By default, this is not enabled (the setting for view-space is the default instead).

* Fixed bugs related to drawing/erasing in screen space.
---
 source/blender/blenkernel/intern/gpencil.c    |  5 ++++
 source/blender/editors/gpencil/drawgpencil.c  |  2 +-
 .../blender/editors/gpencil/gpencil_buttons.c | 20 +++++++------
 .../blender/editors/gpencil/gpencil_paint.c   | 28 +++++++++----------
 source/blender/makesrna/intern/rna_gpencil.c  |  6 ++++
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index dd8f44c71d5..b02128c3c68 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -214,6 +214,11 @@ bGPdata *gpencil_data_addnew (char name[])
 	/* initial settings */
 	gpd->flag = (GP_DATA_DISPINFO|GP_DATA_EXPAND);
 	
+	/* for now, stick to view is also enabled by default
+	 * since this is more useful...
+	 */
+	gpd->flag |= GP_DATA_VIEWALIGN;
+	
 	return gpd;
 }
 
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index a89a038d760..d6678b50d7b 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -773,7 +773,7 @@ void draw_gpencil_oglrender (bContext *C)
 	
 	/* pass 2: draw 2d-strokes ------------ > */
 		/* adjust view matrices */
-	wmOrtho2(-0.375f, (float)(ar->winx)-0.375f, -0.375f, (float)(ar->winy)-0.375f);
+	wmOrtho2(-0.375f, (float)(ar->winx)-0.375f, -0.375f, (float)(ar->winy)-0.375f); // XXX may not be correct anymore
 	glLoadIdentity();
 	
 		/* draw it! */
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index f29d37311fb..774f7b7162b 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -226,9 +226,13 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 /* Draw the contents for a grease-pencil panel*/
 static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, PointerRNA *ctx_ptr)
 {
+	PointerRNA gpd_ptr;
 	bGPDlayer *gpl;
 	uiLayout *col;
 	
+	/* make new PointerRNA for Grease Pencil block */
+	RNA_id_pointer_create((ID *)gpd, &gpd_ptr);
+	
 	/* draw gpd settings first ------------------------------------- */
 	col= uiLayoutColumn(layout, 0);
 		/* current Grease Pencil block */
@@ -238,19 +242,19 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
 		/* add new layer button */
 		uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add");
 	
-	/* 'view align' button (naming depends on context) */
-#if 0 // XXX for now, this is enabled by default anyways
-	if (sa->spacetype == SPACE_VIEW3D)
-		uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Sketch in 3D", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added in 3D-space");
-	else
-		uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Stick to View", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added on 2d-canvas");
-#endif
-	
 	/* draw each layer --------------------------------------------- */
 	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
 		col= uiLayoutColumn(layout, 1);
 			gp_drawui_layer(col, gpd, gpl);
 	}
+	
+	/* draw gpd drawing settings first ------------------------------------- */
+	col= uiLayoutColumn(layout, 0);
+		/* label */
+		uiItemL(col, "Drawing Settings:", 0);
+		
+		/* 'stick to view' option */
+		uiItemR(col, NULL, 0, &gpd_ptr, "view_space_draw", 0);
 }	
 
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index c18a807f9d4..b5d25ce651f 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -239,8 +239,8 @@ static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
 	
 	/* 2d - relative to screen (viewport area) */
 	else {
-		out[0] = (float)(mval[0]) / (float)(p->sa->winx) * 100;
-		out[1] = (float)(mval[1]) / (float)(p->sa->winy) * 100;
+		out[0] = (float)(mval[0]) / (float)(p->ar->winx) * 100;
+		out[1] = (float)(mval[1]) / (float)(p->ar->winy) * 100;
 	}
 }
 
@@ -310,8 +310,8 @@ static short gp_stroke_addpoint (tGPsdata *p, int mval[2], float pressure)
 			return GP_STROKEADD_NORMAL;
 	}
 	
-	/* just say it's normal for now, since we don't have another state... */
-	return GP_STROKEADD_NORMAL;
+	/* return invalid state for now... */
+	return GP_STROKEADD_INVALID;
 }
 
 /* smooth a stroke (in buffer) before storing it */
@@ -614,8 +614,8 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, int mval[], int mvalo[], sho
 		}
 #endif
 		else {
-			x0= (int)(gps->points->x / 100 * p->sa->winx);
-			y0= (int)(gps->points->y / 100 * p->sa->winy);
+			x0= (int)(gps->points->x / 100 * p->ar->winx);
+			y0= (int)(gps->points->y / 100 * p->ar->winy);
 		}
 		
 		/* do boundbox check first */
@@ -671,10 +671,10 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, int mval[], int mvalo[], sho
 			}
 #endif
 			else {
-				x0= (int)(pt1->x / 100 * p->sa->winx);
-				y0= (int)(pt1->y / 100 * p->sa->winy);
-				x1= (int)(pt2->x / 100 * p->sa->winx);
-				y1= (int)(pt2->y / 100 * p->sa->winy);
+				x0= (int)(pt1->x / 100 * p->ar->winx);
+				y0= (int)(pt1->y / 100 * p->ar->winy);
+				x1= (int)(pt2->x / 100 * p->ar->winx);
+				y1= (int)(pt2->y / 100 * p->ar->winy);
 			}
 			
 			/* check that point segment of the boundbox of the eraser stroke */
@@ -944,15 +944,15 @@ static void gp_paint_initstroke (tGPsdata *p, short paintmode)
 		p->gpd->sbuffer_sflag |= GP_STROKE_ERASER;
 	
 	/* check if points will need to be made in view-aligned space */
-	// XXX this should be the default? this is something that needs review
-	/*if (p->gpd->flag & GP_DATA_VIEWALIGN)*/ {
+	if (p->gpd->flag & GP_DATA_VIEWALIGN) {
 		switch (p->sa->spacetype) {
 			case SPACE_VIEW3D:
 			{
 				View3D *v3d= (View3D *)p->sa->spacedata.first;
 				RegionView3D *rv3d= p->ar->regiondata;
 				
-				// TODO: this should only happen for scene... otherwise apply correction for object center!
+				// TODO 1: when using objects, make the data stick to the object centers?
+				// TODO 2: what happens when cursor is behind view-camera plane?
 				float *fp= give_cursor(p->scene, v3d);
 				initgrabz(rv3d, fp[0], fp[1], fp[2]);
 				
@@ -1139,7 +1139,7 @@ static void gpencil_draw_apply (bContext *C, wmOperator *op, tGPsdata *p)
 			
 			if (G.f & G_DEBUG) 
 				printf("Error: Grease-Pencil Paint - Add Point Invalid \n");
-			// XXX break!
+			return;
 		}
 		
 		/* store used values */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index e025aca010c..df0e5ae6703 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -208,6 +208,7 @@ void rna_def_gpencil_layer(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_SELECT);
 	RNA_def_property_ui_text(prop, "Selected", "Layer is selected for editing in the DopeSheet.");
 	
+		// XXX keep this option?
 	prop= RNA_def_property(srna, "show_points", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_DRAWDEBUG);
 	RNA_def_property_ui_text(prop, "Show Points", "Draw the points which make up the strokes (for debugging purposes).");
@@ -229,6 +230,11 @@ void rna_def_gpencil_data(BlenderRNA *brna)
 	RNA_def_property_collection_sdna(prop, NULL, "layers", NULL);
 	RNA_def_property_struct_type(prop, "GPencilLayer");
 	RNA_def_property_ui_text(prop, "Layers", "Similar to layers in Photoshop.");
+	
+	/* Flags */
+	prop= RNA_def_property(srna, "view_space_draw", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_VIEWALIGN);
+	RNA_def_property_ui_text(prop, "Stick to View", "Newly drawn strokes get added in view space (i.e. sketches stick to data when view is manipulated).");
 }
 
 /* --- */

From 7df39b5ea2bd8bfd0c5a2a08aa2c52d051aa5fd5 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 30 Aug 2009 13:32:08 +0000
Subject: [PATCH 352/577] Grease Pencil: Basic Support for Image Editor Again

* Grease Pencil works again from Image Editor now. For now, the GPencil datablock is linked to the Image Editor space, but this can be changed if need be.

* Made Grease Pencil hotkeys into a separate Grease Pencil keymap, which can get included automagically like for frames/ui/v2d/etc. by supplying ED_KEYMAP_GPENCIL as part of st->keymapflag

* Temporarily restored the nasty hack to make View2D-aligned sketches in Image Editor to use OpenGL lines only. I still dunno why this doesn't work normally.
(Probably related is that strokes are not visible when there's no image visible atm).
---
 source/blender/editors/gpencil/drawgpencil.c  | 17 +++++---
 source/blender/editors/gpencil/gpencil_edit.c | 11 ++++++
 source/blender/editors/gpencil/gpencil_ops.c  |  7 +---
 .../blender/editors/gpencil/gpencil_paint.c   | 15 +++----
 source/blender/editors/include/ED_gpencil.h   |  3 +-
 source/blender/editors/include/ED_screen.h    |  2 +-
 source/blender/editors/screen/area.c          |  4 ++
 source/blender/editors/space_api/spacetypes.c |  3 +-
 .../editors/space_image/image_buttons.c       |  7 ++++
 .../blender/editors/space_image/image_draw.c  | 39 ++++++++++---------
 .../editors/space_image/image_intern.h        |  1 +
 .../blender/editors/space_image/space_image.c | 16 +++++---
 .../editors/space_view3d/space_view3d.c       |  2 +-
 .../blender/editors/space_view3d/view3d_ops.c |  4 --
 14 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index d6678b50d7b..81ee2378717 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -83,6 +83,7 @@ enum {
 	GP_DRAWDATA_ONLY3D		= (1<<1),	/* only draw 3d-strokes */
 	GP_DRAWDATA_ONLYV2D		= (1<<2),	/* only draw 'canvas' strokes */
 	GP_DRAWDATA_ONLYI2D		= (1<<3),	/* only draw 'image' strokes */
+	GP_DRAWDATA_IEDITHACK	= (1<<4),	/* special hack for drawing strokes in Image Editor (weird coordinates) */
 };
 
 /* thickness above which we should use special drawing */
@@ -254,14 +255,12 @@ static void gp_draw_stroke_3d (bGPDspoint *points, int totpoints, short thicknes
 /* draw a given stroke in 2d */
 static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag, 
 							short debug, int offsx, int offsy, int winx, int winy)
-{	
-	int spacetype= 0; // XXX make local gpencil state var? 
-	
+{
 	/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, 'smooth' opengl lines look better
 	 * 	- 'smooth' opengl lines are also required if Image Editor 'image-based' stroke
 	 */
 	if ( (thickness < GP_DRAWTHICKNESS_SPECIAL) || 
-		 ((spacetype==SPACE_IMAGE) && (dflag & GP_DRAWDATA_ONLYV2D)) ) 
+		 ((dflag & GP_DRAWDATA_IEDITHACK) && (dflag & GP_DRAWDATA_ONLYV2D)) ) 
 	{
 		bGPDspoint *pt;
 		int i;
@@ -519,6 +518,9 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy
 {
 	bGPDlayer *gpl, *actlay=NULL;
 	
+	/* reset line drawing style (in case previous user didn't reset) */
+	setlinestyle(0);
+	
 	/* turn on smooth lines (i.e. anti-aliasing) */
 	glEnable(GL_LINE_SMOOTH);
 	
@@ -669,7 +671,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf)
 			
 			wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, ar->v2d.cur.ymin, ar->v2d.cur.ymax);
 			
-			dflag |= GP_DRAWDATA_ONLYV2D;
+			dflag |= GP_DRAWDATA_ONLYV2D|GP_DRAWDATA_IEDITHACK;
 		}
 			break;
 			
@@ -729,6 +731,11 @@ void draw_gpencil_2dview (bContext *C, short onlyv2d)
 	gpd= gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 	
+	/* special hack for Image Editor */
+	// FIXME: the opengl poly-strokes don't draw at right thickness when done this way, so disabled
+	if (sa->spacetype == SPACE_IMAGE)
+		dflag |= GP_DRAWDATA_IEDITHACK;
+	
 	/* draw it! */
 	if (onlyv2d) dflag |= (GP_DRAWDATA_ONLYV2D|GP_DRAWDATA_NOSTATUS);
 	gp_draw_data(gpd, 0, 0, ar->winx, ar->winy, CFRA, dflag);
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index b2228134750..74fbe250d37 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -125,6 +125,17 @@ bGPdata **gpencil_data_get_pointers (bContext *C, PointerRNA *ptr)
 			}
 				break;
 				
+			case SPACE_IMAGE: /* Image/UV Editor */
+			{
+				SpaceImage *sima= (SpaceImage *)CTX_wm_space_data(C);
+				
+				/* for now, Grease Pencil data is associated with the space... */
+				// XXX our convention for everything else is to link to data though...
+				if (ptr) RNA_pointer_create((ID *)CTX_wm_screen(C), &RNA_SpaceImageEditor, sima, ptr);
+				return &sima->gpd;
+			}
+				break;
+				
 			default: /* unsupported space */
 				return NULL;
 		}
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 2d23a331211..3acbded0bf8 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -45,14 +45,11 @@
 /* ****************************************** */
 /* Generic Editing Keymap */
 
-void gpencil_common_keymap(wmWindowManager *wm, ListBase *keymap)
+void ED_keymap_gpencil(wmWindowManager *wm)
 {
+	ListBase *keymap= WM_keymap_listbase(wm, "Grease Pencil", 0, 0);
 	wmKeymapItem *kmi;
 	
-	/* if no keymap provided, use default */
-	if (keymap == NULL)
-		keymap= WM_keymap_listbase(wm, "Grease Pencil Generic", 0, 0);
-	
 	/* Draw */
 		/* draw */
 	WM_keymap_add_item(keymap, "GPENCIL_OT_draw", LEFTMOUSE, KM_PRESS, 0, DKEY);
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index b5d25ce651f..67bf2951bf8 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -828,6 +828,7 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 			}
 		}
 			break;	
+#endif
 		case SPACE_IMAGE:
 		{
 			SpaceImage *sima= curarea->spacedata.first;
@@ -836,18 +837,20 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 			p->sa= curarea;
 			p->ar= ar;
 			p->v2d= &ar->v2d;
-			p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
+			//p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
 			
+#if 0 // XXX disabled for now
 			/* check that gpencil data is allowed to be drawn */
 			if ((sima->flag & SI_DISPGP)==0) {
 				p->status= GP_STATUS_ERROR;
 				if (G.f & G_DEBUG)
 					printf("Error: In active view, Grease Pencil not shown \n");
-				return;
+				return p;
 			}
+#endif
 		}
 			break;
-#endif
+
 		/* unsupported views */
 		default:
 		{
@@ -998,14 +1001,12 @@ static void gp_paint_initstroke (tGPsdata *p, short paintmode)
 				p->im2d_settings.offsy= (int)((p->sa->winy-p->im2d_settings.sizey)/2 + sseq->yof);
 			}
 				break;
+#endif
 			case SPACE_IMAGE:
 			{
-				/* check if any ibuf available */
-				if (p->ibuf)
-					p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
+				p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
 			}
 				break;
-#endif
 		}
 	}
 }
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index ba60211ef3f..388da9a2acc 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -62,8 +62,7 @@ struct bGPdata *gpencil_data_get_active(struct bContext *C);
 
 /* ----------- Grease Pencil Operators ----------------- */
 
-void gpencil_common_keymap(struct wmWindowManager *wm, ListBase *keymap);
-
+void ED_keymap_gpencil(struct wmWindowManager *wm);
 void ED_operatortypes_gpencil(void);
 
 /* ------------ Grease-Pencil Drawing API ------------------ */
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 22a3e737277..0153b3c9bdb 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -150,7 +150,7 @@ int		ED_operator_posemode(struct bContext *C);
 #define ED_KEYMAP_MARKERS	4
 #define ED_KEYMAP_ANIMATION	8
 #define ED_KEYMAP_FRAMES	16
-
+#define ED_KEYMAP_GPENCIL	32
 
 #endif /* ED_SCREEN_H */
 
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index f714a291bd7..8c55cccd6b0 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -797,6 +797,10 @@ static void ed_default_handlers(wmWindowManager *wm, ListBase *handlers, int fla
 		ListBase *keymap= WM_keymap_listbase(wm, "Frames", 0, 0);
 		WM_event_add_keymap_handler(handlers, keymap);
 	}
+	if(flag & ED_KEYMAP_GPENCIL) {
+		ListBase *keymap= WM_keymap_listbase(wm, "Grease Pencil", 0, 0);
+		WM_event_add_keymap_handler(handlers, keymap);
+	}
 }
 
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 0d702144959..edd5da44526 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -86,6 +86,7 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_screen();
 	ED_operatortypes_anim();
 	ED_operatortypes_animchannels();
+	ED_operatortypes_gpencil();
 	ED_operatortypes_object();
 	ED_operatortypes_mesh();
 	ED_operatortypes_sculpt();
@@ -99,7 +100,6 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_fluid();
 	ED_operatortypes_metaball();
 	ED_operatortypes_boids();
-	ED_operatortypes_gpencil();
 	ED_operatortypes_sound();
 	
 	ui_view2d_operatortypes();
@@ -121,6 +121,7 @@ void ED_spacetypes_keymap(wmWindowManager *wm)
 	ED_keymap_screen(wm);
 	ED_keymap_anim(wm);
 	ED_keymap_animchannels(wm);
+	ED_keymap_gpencil(wm);
 	ED_keymap_object(wm);
 	ED_keymap_mesh(wm);
 	ED_keymap_uvedit(wm);
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index ac0a5c7f53a..2eb070e0e6d 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -67,6 +67,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "ED_gpencil.h"
 #include "ED_image.h"
 #include "ED_mesh.h"
 #include "ED_space_api.h"
@@ -1438,6 +1439,12 @@ void image_buttons_register(ARegionType *art)
 	strcpy(pt->label, "Curves");
 	pt->draw= image_panel_curves;
 	BLI_addtail(&art->paneltypes, pt);
+	
+	pt= MEM_callocN(sizeof(PanelType), "spacetype image panel gpencil");
+	strcpy(pt->idname, "IMAGE_PT_gpencil");
+	strcpy(pt->label, "Grease Pencil");
+	pt->draw= gpencil_panel_standard;
+	BLI_addtail(&art->paneltypes, pt);
 }
 
 static int image_properties(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 2f5fc805367..cf9bac1ebee 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -44,6 +44,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "BKE_context.h"
 #include "BKE_colortools.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -53,6 +54,7 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "ED_gpencil.h"
 #include "ED_image.h"
 #include "ED_screen.h"
 
@@ -525,22 +527,26 @@ static void draw_image_buffer_repeated(SpaceImage *sima, ARegion *ar, Scene *sce
 /* draw uv edit */
 
 /* draw grease pencil */
-
-static void draw_image_grease_pencil(SpaceImage *sima, ImBuf *ibuf)
+void draw_image_grease_pencil(bContext *C, short onlyv2d)
 {
-	/* XXX bring back */
-	/* draw grease-pencil ('image' strokes) */
-	if (sima->flag & SI_DISPGP)
-		; // XXX draw_gpencil_2dimage(sa, ibuf);
-
-#if 0
-	mywinset(sa->win);	/* restore scissor after gla call... */
-	wmOrtho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
-#endif
-	
-	/* draw grease-pencil (screen strokes) */
-	if (sima->flag & SI_DISPGP)
-		; // XXX draw_gpencil_2dview(sa, NULL);
+	/* draw in View2D space? */
+	if (onlyv2d) {
+		/* assume that UI_view2d_ortho(C) has been called... */
+		SpaceImage *sima= (SpaceImage *)CTX_wm_space_data(C);
+		ImBuf *ibuf= ED_space_image_buffer(sima);
+		
+		/* draw grease-pencil ('image' strokes) */
+		//if (sima->flag & SI_DISPGP)
+			draw_gpencil_2dimage(C, ibuf);
+	}
+	else {
+		/* assume that UI_view2d_restore(C) has been called... */
+		SpaceImage *sima= (SpaceImage *)CTX_wm_space_data(C);
+		
+		/* draw grease-pencil ('screen' strokes) */
+		//if (sima->flag & SI_DISPGP)
+			draw_gpencil_2dview(C, 0);
+	}
 }
 
 /* XXX becomes WM paint cursor */
@@ -689,9 +695,6 @@ void draw_image_main(SpaceImage *sima, ARegion *ar, Scene *scene)
 	else
 		draw_image_buffer(sima, ar, scene, ima, ibuf, 0.0f, 0.0f, zoomx, zoomy);
 
-	/* grease pencil */
-	draw_image_grease_pencil(sima, ibuf);
-
 	/* paint helpers */
 	draw_image_paint_helpers(sima, ar, scene, zoomx, zoomy);
 
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index aa97e339c68..a33475c1213 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -53,6 +53,7 @@ void IMAGE_OT_toolbox(struct wmOperatorType *ot);
 /* image_draw.c */
 void draw_image_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene);
 void draw_image_info(struct ARegion *ar, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf);
+void draw_image_grease_pencil(struct bContext *C, short onlyv2d);
 
 /* image_ops.c */
 int space_image_main_area_poll(struct bContext *C);
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 1506df89c45..bb647e68917 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -54,6 +54,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "ED_gpencil.h"
 #include "ED_image.h"
 #include "ED_mesh.h"
 #include "ED_space_api.h"
@@ -430,16 +431,22 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
 	
 	/* we set view2d from own zoom and offset each time */
 	image_main_area_set_view2d(sima, ar, scene);
-		
+	
 	/* we draw image in pixelspace */
 	draw_image_main(sima, ar, scene);
 
 	/* and uvs in 0.0-1.0 space */
 	UI_view2d_view_ortho(C, v2d);
-	draw_uvedit_main(sima, ar, scene, obedit);
-	ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST);
+		draw_uvedit_main(sima, ar, scene, obedit);
+		ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST);
+		
+		/* Grease Pencil too (in addition to UV's) */
+		draw_image_grease_pencil((bContext *)C, 1); 
 	UI_view2d_view_restore(C);
 	
+	/* draw Grease Pencil - screen space only */
+	draw_image_grease_pencil((bContext *)C, 0);
+	
 	/* scrollers? */
 	/*scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_UNIT_VALUES, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
@@ -558,11 +565,10 @@ void ED_spacetype_image(void)
 	/* regions: main window */
 	art= MEM_callocN(sizeof(ARegionType), "spacetype image region");
 	art->regionid = RGN_TYPE_WINDOW;
-	art->keymapflag= ED_KEYMAP_FRAMES;
+	art->keymapflag= ED_KEYMAP_FRAMES|ED_KEYMAP_GPENCIL;
 	art->init= image_main_area_init;
 	art->draw= image_main_area_draw;
 	art->listener= image_main_area_listener;
-	art->keymapflag= 0;
 
 	BLI_addhead(&st->regiontypes, art);
 	
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 3dd65a6f796..97c5549e1ea 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -871,7 +871,7 @@ void ED_spacetype_view3d(void)
 	/* regions: main window */
 	art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
 	art->regionid = RGN_TYPE_WINDOW;
-	art->keymapflag= ED_KEYMAP_FRAMES;
+	art->keymapflag= ED_KEYMAP_FRAMES|ED_KEYMAP_GPENCIL;
 	art->draw= view3d_main_area_draw;
 	art->init= view3d_main_area_init;
 	art->free= view3d_main_area_free;
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index f4e1e008099..7da2e591b10 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -52,7 +52,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_gpencil.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 
@@ -133,9 +132,6 @@ void view3d_keymap(wmWindowManager *wm)
 	km = WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, KM_CTRL, 0);
 	RNA_boolean_set(km->ptr, "snap", 1);
 	
-	/* grease pencil */
-	gpencil_common_keymap(wm, keymap);
-	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, 0, 0); /* manipulator always on left mouse, not on action mouse*/
 	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_PRESS, 0, 0);

From 257ad93e6deb3e69198bd7c52fa9b44e4093746e Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sun, 30 Aug 2009 15:00:42 +0000
Subject: [PATCH 353/577] Removing old datatoc C source code; use the python
 version now!

---
 release/datafiles/datatoc.c | 102 ------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 release/datafiles/datatoc.c

diff --git a/release/datafiles/datatoc.c b/release/datafiles/datatoc.c
deleted file mode 100644
index 46b935c7fd6..00000000000
--- a/release/datafiles/datatoc.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-int main(int argc, char**argv) {
-	FILE *fpin,  *fpout;
-	char cname[256];
-	char sizest[256];
-	size_t size;
-	int i;
-	
-	if (argc<1) {
-			printf ("Usage: datatoc <data_file>\n");
-			exit(1);
-	}
-	
-	fpin= fopen(argv[1], "rb");
-	if (!fpin) {
-			printf ("Unable to open input <%s>\n", argv[1]);
-			exit(1);
-	}
-	
-	fseek (fpin, 0L,  SEEK_END);
-	size= ftell(fpin);
-	fseek (fpin, 0L,  SEEK_SET);
-
-	if (argv[1][0]=='.') argv[1]++;
-
-	sprintf(cname, "%s.c", argv[1]);
-	printf ("Making C file <%s>\n", cname);
-
-	for (i=0; i < (int)strlen(argv[1]); i++)
-		if (argv[1][i]=='.') argv[1][i]='_';
-
-	sprintf(sizest, "%d", (int)size);
-	printf ("Input filesize is %ld, Output size should be %ld\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
-	
-	fpout= fopen(cname, "w");
-	if (!fpout) {
-			printf ("Unable to open output <%s>\n", cname);
-			exit(1);
-	}
-	
-	fprintf (fpout, "/* DataToC output of file <%s> */\n\n",argv[1]);
-	fprintf (fpout, "int datatoc_%s_size= %s;\n", argv[1], sizest);
-	/*
-	fprintf (fpout, "char datatoc_%s[]= {\"", argv[1]);
-
-	while (size--) {
-		if(size%256==0)
-			fprintf(fpout, "\" \\\n\"");
-			
-		fprintf (fpout, "\\x%02x", getc(fpin));
-	}
-
-	fprintf (fpout, "\"};\n");
-	*/
-	
-	fprintf (fpout, "char datatoc_%s[]= {\n", argv[1]);
-	while (size--) {
-		if(size%32==31)
-			fprintf(fpout, "\n");
-			
-		/* fprintf (fpout, "\\x%02x", getc(fpin)); */
-		fprintf (fpout, "%3d,", getc(fpin));
-	}
-	/* null terminate for the case it is a string */
-	fprintf (fpout, "\n  0};\n\n");
-	
-	fclose(fpin);
-	fclose(fpout);
-	return 0;
-}

From 557cf2906befb77eae15a96a385b0d92d563c31e Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sun, 30 Aug 2009 16:18:05 +0000
Subject: [PATCH 354/577] 2.5 Sound:

* Updated UserDef RNA so that only compiled in audio drivers are displayed. (Missing definitions in Makefiles, someone fix please!)
* Fixed libsndfile and ffmpeg building with CMake with msvc.
---
 CMakeLists.txt                                |  4 ++--
 source/blender/makesrna/intern/CMakeLists.txt | 12 ++++++++++++
 source/blender/makesrna/intern/SConscript     |  9 +++++++++
 source/blender/makesrna/intern/rna_userdef.c  |  6 ++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a92099698c6..1921ef65017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,7 +259,7 @@ IF(WIN32)
   IF(WITH_SNDFILE)
 	SET(SNDFILE ${LIBDIR}/sndfile)
 	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB sndfile-1)
+	SET(SNDFILE_LIB libsndfile-1)
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
   ENDIF(WITH_SNDFILE)
 
@@ -329,7 +329,7 @@ IF(WIN32)
   SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
 
   SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${FFMPEG}/include)
+  SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
   SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 152f4031b91..a1f42fbccb3 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -75,6 +75,18 @@ IF(WITH_FFTW3)
   ADD_DEFINITIONS(-DFFTW3=1)
 ENDIF(WITH_FFTW3)
 
+IF(WITH_SDL)
+  ADD_DEFINITIONS(-DWITH_SDL)
+ENDIF(WITH_SDL)
+
+IF(WITH_OPENAL)
+  ADD_DEFINITIONS(-DWITH_OPENAL)
+ENDIF(WITH_OPENAL)
+
+IF(WITH_JACK)
+  ADD_DEFINITIONS(-DWITH_JACK)
+ENDIF(WITH_JACK)
+
 # Build makesrna executable
 ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
 TARGET_LINK_LIBRARIES(makesrna bf_dna)
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 1a3687af51e..a24c25b8b95 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -62,6 +62,15 @@ if env['WITH_BF_GAMEENGINE']:
 if env['WITH_BF_FFTW3']:
     defs.append('FFTW3=1')
 
+if env['WITH_BF_SDL']:
+    defs.append('WITH_SDL')
+
+if env['WITH_BF_OPENAL']:
+    defs.append('WITH_OPENAL')
+
+if env['WITH_BF_JACK']:
+    defs.append('WITH_JACK')
+
 makesrna_tool.Append(CPPDEFINES=defs)
 
 makesrna_tool.Append (CPPPATH = Split(incs))
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index ba980d4caf4..a0716cc7dc7 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2021,9 +2021,15 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 
 	static EnumPropertyItem audio_device_items[] = {
 		{0, "AUDIO_DEVICE_NULL", 0, "No Audio", "Null device - there will be no audio output."},
+#ifdef WITH_SDL
 		{1, "AUDIO_DEVICE_SDL", 0, "SDL", "SDL device - simple direct media layer, recommended for sequencer usage."},
+#endif
+#ifdef WITH_OPENAL
 		{2, "AUDIO_DEVICE_OPENAL", 0, "OpenAL", "OpenAL device - supports 3D audio, recommended for game engine usage."},
+#endif
+#ifdef WITH_JACK
 		{3, "AUDIO_DEVICE_JACK", 0, "Jack", "Jack device - open source pro audio, recommended for pro audio users."},
+#endif
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem audio_rate_items[] = {

From fee715f8a99c38df08942f39769e7bc520d848da Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Sun, 30 Aug 2009 17:34:04 +0000
Subject: [PATCH 355/577] Make file directly executable.

---
 release/datafiles/datatoc.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 release/datafiles/datatoc.py

diff --git a/release/datafiles/datatoc.py b/release/datafiles/datatoc.py
old mode 100644
new mode 100755

From fa68f7ff76cea0fa8b818d332da3ec2213623b35 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 30 Aug 2009 19:02:48 +0000
Subject: [PATCH 356/577] made python 2.x and 3.x compatible.

---
 release/datafiles/datatoc.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/release/datafiles/datatoc.py b/release/datafiles/datatoc.py
index 805d7205651..ea72870f2a0 100755
--- a/release/datafiles/datatoc.py
+++ b/release/datafiles/datatoc.py
@@ -1,5 +1,6 @@
-#!/usr/bin/python3
-#
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -23,10 +24,10 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-import sys
+import sys, os
 
 if len(sys.argv) < 2:
-	print("Usage: datatoc <data_file>")
+	sys.stdout.write("Usage: datatoc <data_file>\n")
 	sys.exit(1)
 
 filename = sys.argv[1]
@@ -34,37 +35,38 @@ filename = sys.argv[1]
 try:
 	fpin = open(filename, "rb");
 except:
-	print("Unable to open input <{0}>".format(sys.argv[1]))
+	sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
 	sys.exit(1)
 
-size = fpin.seek(0, 2)
+fpin.seek(0, os.SEEK_END)
+size = fpin.tell()
 fpin.seek(0)
 
 if filename[0] == ".":
 	filename = filename[1:]
 
 cname = filename + ".c"
-print("Making C file <{0}>".format(cname))
+sys.stdout.write("Making C file <%s>\n" % cname)
 
 filename = filename.replace(".", "_")
-
+sys.stdout.write(str(size))
 try:
 	fpout = open(cname, "w")
 except:
-	print("Unable to open output <{0}>".format(cname))
+	sys.stdout.write("Unable to open output %s\n" % cname)
 	sys.exit(1)
 
-fpout.write("/* DataToC output of file <{0}> */\n\n".format(filename))
-fpout.write("int datatoc_{0}_size= {1};\n".format(filename, size))
+fpout.write("/* DataToC output of file <%s> */\n\n" % filename)
+fpout.write("int datatoc_%s_size= %d;\n" % (filename, size))
 
-fpout.write("char datatoc_{0}[]= {{\n".format(filename))
+fpout.write("char datatoc_%s[]= {\n" % filename)
 
 while size > 0:
 	size -= 1
 	if size % 32 == 31:
 		fpout.write("\n")
 	
-	fpout.write("{0:3d},".format(ord(fpin.read(1))))
+	fpout.write("%.2d," % ord(fpin.read(1)))
 
 fpout.write("\n  0};\n\n")
 

From 9abfb508de3c62e72473871b80878a280cbb282a Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Sun, 30 Aug 2009 19:26:18 +0000
Subject: [PATCH 357/577] 2.5 Mist/Camera:

Changing Mist values didn't update the mist camera drawing in 3D View, when enabled.
Bug reported by Julian|H. Thanks!
---
 source/blender/makesrna/intern/rna_world.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c
index 525a4446932..0ed5016ccd2 100644
--- a/source/blender/makesrna/intern/rna_world.c
+++ b/source/blender/makesrna/intern/rna_world.c
@@ -324,12 +324,14 @@ static void rna_def_world_mist(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 10000, 10, 2);
 	RNA_def_property_ui_text(prop, "Start", "Starting distance of the mist, measured from the camera");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 
 	prop= RNA_def_property(srna, "depth", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "mistdist");
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 10000, 10, 2);
 	RNA_def_property_ui_text(prop, "Depth", "The distance over which the mist effect fades in");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 
 	prop= RNA_def_property(srna, "height", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "misthi");

From ca96a75af49910340540960e7dbc797be9b01caf Mon Sep 17 00:00:00 2001
From: Peter Schlaile <peter@schlaile.de>
Date: Sun, 30 Aug 2009 19:38:22 +0000
Subject: [PATCH 358/577] == Sequencer ==

Fixed hddaudio for sample formats other than 16 bit (8 bit e.g.)
---
 source/blender/src/hddaudio.c | 66 +++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/source/blender/src/hddaudio.c b/source/blender/src/hddaudio.c
index 2aa434e4ac7..be5e07929bf 100644
--- a/source/blender/src/hddaudio.c
+++ b/source/blender/src/hddaudio.c
@@ -68,14 +68,15 @@ struct hdaudio {
 	int frame_alloc_duration;
 	int decode_pos;
 	int frame_size;
-	short * decode_cache;
-	short * decode_cache_zero;
+	unsigned char * decode_cache;
+	unsigned char * decode_cache_zero;
 	short * resample_cache;
 	int decode_cache_size;
 	int target_channels;
 	int target_rate;
 	int resample_samples_written;
 	int resample_samples_in;
+	int decode_sample_format_size;
 	ReSampleContext *resampler;
 #else
 	
@@ -178,9 +179,13 @@ struct hdaudio * sound_open_hdaudio(char * filename)
 		(long long) rval->sample_rate * rval->channels
 		* rval->frame_alloc_duration / AV_TIME_BASE
 		* 2;
+	rval->decode_sample_format_size
+		= av_get_bits_per_sample_format(rval->pCodecCtx->sample_fmt)
+		/ 8;
 
-	rval->decode_cache = (short*) MEM_mallocN(
-		rval->decode_cache_size * sizeof(short)
+	rval->decode_cache = (unsigned char*) MEM_mallocN(
+		rval->decode_cache_size 
+		* rval->decode_sample_format_size
 		+ AVCODEC_MAX_AUDIO_FRAME_SIZE, 
 		"hdaudio decode cache");
 	rval->decode_cache_zero = rval->decode_cache;
@@ -191,6 +196,7 @@ struct hdaudio * sound_open_hdaudio(char * filename)
 	rval->resample_cache = 0;
 	rval->resample_samples_written = 0;
 	rval->resample_samples_in = 0;
+
 	return rval;
 #else
 	return 0;
@@ -260,7 +266,8 @@ static void sound_hdaudio_run_resampler_continue(
 		= audio_resample(
 			hdaudio->resampler,
 			hdaudio->resample_cache + reuse_tgt,
-			hdaudio->decode_cache_zero + reuse_src, 
+			hdaudio->decode_cache_zero 
+			+ reuse_src * hdaudio->decode_sample_format_size, 
 			next_samples_in)
 		+ reuse_tgt / target_channels;
 
@@ -285,7 +292,7 @@ static void sound_hdaudio_init_resampler(
 		hdaudio->resampler = av_audio_resample_init(
 			target_channels, hdaudio->channels,
 			target_rate, hdaudio->sample_rate,
-			SAMPLE_FMT_S16, SAMPLE_FMT_S16,
+			SAMPLE_FMT_S16, hdaudio->pCodecCtx->sample_fmt,
 			16, 10, 0, 0.8);
 		hdaudio->target_rate = target_rate;
 		hdaudio->target_channels = target_channels;
@@ -327,7 +334,8 @@ static void sound_hdaudio_extract_small_block(
 		* hdaudio->frame_duration / AV_TIME_BASE;
 	rate_conversion = 
 		(target_rate != hdaudio->sample_rate) 
-		|| (target_channels != hdaudio->channels);
+		|| (target_channels != hdaudio->channels)
+		|| (hdaudio->pCodecCtx->sample_fmt != SAMPLE_FMT_S16);
 	sample_ofs = target_channels * (sample_position % frame_size);
 
 	frame_position = sample_position / frame_size; 
@@ -346,15 +354,20 @@ static void sound_hdaudio_extract_small_block(
 		hdaudio->frame_position = frame_position;
 
 		memmove(hdaudio->decode_cache,
-			hdaudio->decode_cache + bl_size,
-			(decode_pos - bl_size) * sizeof(short));
+			hdaudio->decode_cache + bl_size
+			* hdaudio->decode_sample_format_size,
+			(decode_pos - bl_size) 
+			* hdaudio->decode_sample_format_size);
 		
 		decode_pos -= bl_size;
 
 		if (decode_pos < hdaudio->decode_cache_size) {
-			memset(hdaudio->decode_cache + decode_pos, 0,
+			memset(hdaudio->decode_cache 
+			       + decode_pos
+			       * hdaudio->decode_sample_format_size,
+			       0,
 			       (hdaudio->decode_cache_size - decode_pos) 
-			       * sizeof(short));
+			       * hdaudio->decode_sample_format_size);
 
 			while(av_read_frame(
 				      hdaudio->pFormatCtx, &packet) >= 0) {
@@ -377,7 +390,8 @@ static void sound_hdaudio_extract_small_block(
 					len = avcodec_decode_audio2(
 						hdaudio->pCodecCtx, 
 						hdaudio->decode_cache 
-						+ decode_pos, 
+						+ decode_pos 
+						* hdaudio->decode_sample_format_size, 
 						&data_size, 
 						audio_pkt_data, 
 						audio_pkt_size);
@@ -393,16 +407,17 @@ static void sound_hdaudio_extract_small_block(
 						continue;
 					}
 					
-					decode_pos += data_size / sizeof(short);
+					decode_pos += data_size 
+						/ hdaudio->decode_sample_format_size;
 					if (decode_pos + data_size
-					    / sizeof(short)
+					    / hdaudio->decode_sample_format_size
 					    > hdaudio->decode_cache_size) {
 						break;
 					}
 				}
 				av_free_packet(&packet);
 				
-				if (decode_pos + data_size / sizeof(short)
+				if (decode_pos + data_size / hdaudio->decode_sample_format_size
 				    > hdaudio->decode_cache_size) {
 					break;
 				}
@@ -455,7 +470,8 @@ static void sound_hdaudio_extract_small_block(
 		avcodec_flush_buffers(hdaudio->pCodecCtx);
 
 		memset(hdaudio->decode_cache, 0,
-		       hdaudio->decode_cache_size * sizeof(short));
+		       hdaudio->decode_cache_size 
+		       * hdaudio->decode_sample_format_size);
 
 		hdaudio->decode_cache_zero = hdaudio->decode_cache;
 
@@ -512,7 +528,9 @@ static void sound_hdaudio_extract_small_block(
 				}
 
 				hdaudio->decode_cache_zero
-					= hdaudio->decode_cache + diff;
+					= hdaudio->decode_cache 
+					+ diff 
+					* hdaudio->decode_sample_format_size;
 				decode_cache_zero_init = 1;
 			}
 
@@ -521,7 +539,8 @@ static void sound_hdaudio_extract_small_block(
 				len = avcodec_decode_audio2(
 					hdaudio->pCodecCtx, 
 					hdaudio->decode_cache 
-					+ decode_pos, 
+					+ decode_pos 
+					* hdaudio->decode_sample_format_size, 
 					&data_size, 
 					audio_pkt_data, 
 					audio_pkt_size);
@@ -537,9 +556,10 @@ static void sound_hdaudio_extract_small_block(
 					continue;
 				}
 				
-				decode_pos += data_size / sizeof(short);
+				decode_pos += data_size 
+					/ hdaudio->decode_sample_format_size;
 				if (decode_pos + data_size
-				    / sizeof(short)
+				    / hdaudio->decode_sample_format_size
 				    > hdaudio->decode_cache_size) {
 					break;
 				}
@@ -547,7 +567,8 @@ static void sound_hdaudio_extract_small_block(
 	
 			av_free_packet(&packet);
 
-			if (decode_pos + data_size / sizeof(short)
+			if (decode_pos + data_size 
+			    / hdaudio->decode_sample_format_size
 			    > hdaudio->decode_cache_size) {
 				break;
 			}
@@ -561,7 +582,8 @@ static void sound_hdaudio_extract_small_block(
 
 	memcpy(target_buffer, (rate_conversion 
 			       ? hdaudio->resample_cache 
-			       : hdaudio->decode_cache_zero) + sample_ofs, 
+			       : (short*) 
+			       hdaudio->decode_cache_zero) + sample_ofs, 
 	       nb_samples * target_channels * sizeof(short));
 
 }

From 6422d335cab87242aa2bf34290817ca96d11e464 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 30 Aug 2009 20:03:47 +0000
Subject: [PATCH 359/577] bugfix of the bugfix

---
 release/datafiles/datatoc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/datafiles/datatoc.py b/release/datafiles/datatoc.py
index ea72870f2a0..362d4ddc126 100755
--- a/release/datafiles/datatoc.py
+++ b/release/datafiles/datatoc.py
@@ -50,6 +50,7 @@ sys.stdout.write("Making C file <%s>\n" % cname)
 
 filename = filename.replace(".", "_")
 sys.stdout.write(str(size))
+sys.stdout.write("\n")
 try:
 	fpout = open(cname, "w")
 except:
@@ -66,7 +67,7 @@ while size > 0:
 	if size % 32 == 31:
 		fpout.write("\n")
 	
-	fpout.write("%.2d," % ord(fpin.read(1)))
+	fpout.write("%3d," % ord(fpin.read(1)))
 
 fpout.write("\n  0};\n\n")
 

From a7689e9b60ef6dbe720a13abddb47f5137fc222d Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Sun, 30 Aug 2009 21:00:26 +0000
Subject: [PATCH 360/577] 2.5 Physic Buttons: * Some Panels missed the "md"
 context declaration for the new cloth_panel_enabled(md) check. * Code
 Cleanup.

---
 release/ui/buttons_physics_cloth.py    |  23 ++--
 release/ui/buttons_physics_fluid.py    |  20 +---
 release/ui/buttons_physics_softbody.py | 153 ++++++++++++-------------
 3 files changed, 93 insertions(+), 103 deletions(-)

diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index 9399d557a51..a1978f44c18 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -43,11 +43,11 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel):
 
 		if md:
 			cloth = md.settings
+			
+			layout.active = cloth_panel_enabled(md)
 
 			split = layout.split()
 			
-			split.active = cloth_panel_enabled(md)
-			
 			col = split.column()
 			col.itemL(text="Quality:")
 			col.itemR(cloth, "quality", text="Steps",slider=True)
@@ -89,7 +89,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
 	__default_closed__ = True
 
 	def poll(self, context):
-		return (context.cloth != None)
+		return (context.cloth)
 
 	def draw(self, context):
 		md = context.cloth
@@ -100,7 +100,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 	__default_closed__ = True
 
 	def poll(self, context):
-		return (context.cloth != None)
+		return (context.cloth)
 	
 	def draw_header(self, context):
 		layout = self.layout
@@ -111,11 +111,14 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		cloth = context.cloth.collision_settings
-		split = layout.split()
+		md = context.cloth
 		
 		layout.active = cloth.enable_collision and cloth_panel_enabled(md)
 		
+		split = layout.split()
+		
 		col = split.column()
 		col.itemR(cloth, "collision_quality", slider=True, text="Quality")
 		col.itemR(cloth, "min_distance", slider=True, text="Distance")
@@ -123,10 +126,10 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 		
 		col = split.column()
 		col.itemR(cloth, "enable_self_collision", text="Self Collision")
-		col = col.column()
-		col.active = cloth.enable_self_collision
-		col.itemR(cloth, "self_collision_quality", slider=True, text="Quality")
-		col.itemR(cloth, "self_min_distance", slider=True, text="Distance")
+		sub = col.column()
+		sub.active = cloth.enable_self_collision
+		sub.itemR(cloth, "self_collision_quality", slider=True, text="Quality")
+		sub.itemR(cloth, "self_min_distance", slider=True, text="Distance")
 
 class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
 	__label__ = "Cloth Stiffness Scaling"
@@ -144,6 +147,8 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
+		md = context.cloth
 		ob = context.object
 		cloth = context.cloth.settings
 		
diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py
index 5af63bdc3ba..fe15e22f0b9 100644
--- a/release/ui/buttons_physics_fluid.py
+++ b/release/ui/buttons_physics_fluid.py
@@ -175,11 +175,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel):
 	def poll(self, context):
 		md = context.fluid
 		if md:
-			settings = md.settings
-			if settings:
-				return (settings.type == 'DOMAIN')
-		
-		return False
+			return (md.settings.type == 'DOMAIN')
 
 	def draw(self, context):
 		layout = self.layout
@@ -218,11 +214,7 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel):
 	def poll(self, context):
 		md = context.fluid
 		if md:
-			settings = md.settings
-			if settings:
-				return (settings.type == 'DOMAIN')
-		
-		return False
+			return (md.settings.type == 'DOMAIN')
 
 	def draw(self, context):
 		layout = self.layout
@@ -251,12 +243,8 @@ class PHYSICS_PT_domain_particles(PhysicButtonsPanel):
 	def poll(self, context):
 		md = context.fluid
 		if md:
-			settings = md.settings
-			if settings:
-				return (settings.type == 'DOMAIN')
-		
-		return False
-
+			return (md.settings.type == 'DOMAIN')
+			
 	def draw(self, context):
 		layout = self.layout
 		
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 3d3c3c23faf..73eb15d2212 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -71,6 +71,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
 			
 class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
 	__label__ = "Soft Body Goal"
+	__default_closed__ = True
 	
 	def poll(self, context):
 		return (context.soft_body)
@@ -87,39 +88,39 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
 		layout = self.layout
 		
 		md = context.soft_body
+		softbody = md.settings
 		ob = context.object
+		
+		layout.active = softbody.use_goal and softbody_panel_enabled(md)
 
 		split = layout.split()
-			
-		if md:
-			softbody = md.settings
-			layout.active = softbody.use_goal and softbody_panel_enabled(md)
 
-			# Goal 
-			split = layout.split()
+		# Goal 
+		split = layout.split()
 
-			col = split.column()
-			col.itemL(text="Goal Strengths:")
-			col.itemR(softbody, "goal_default", text="Default")
-			sub = col.column(align=True)
-			sub.itemR(softbody, "goal_min", text="Minimum")
-			sub.itemR(softbody, "goal_max", text="Maximum")
+		col = split.column()
+		col.itemL(text="Goal Strengths:")
+		col.itemR(softbody, "goal_default", text="Default")
+		sub = col.column(align=True)
+		sub.itemR(softbody, "goal_min", text="Minimum")
+		sub.itemR(softbody, "goal_max", text="Maximum")
 			
-			col = split.column()
-			col.itemL(text="Goal Settings:")
-			col.itemR(softbody, "goal_spring", text="Stiffness")
-			col.itemR(softbody, "goal_friction", text="Damping")
+		col = split.column()
+		col.itemL(text="Goal Settings:")
+		col.itemR(softbody, "goal_spring", text="Stiffness")
+		col.itemR(softbody, "goal_friction", text="Damping")
 			
-			layout.item_pointerR(softbody, "goal_vertex_group", ob, "vertex_groups", text="Vertex Group")
+		layout.item_pointerR(softbody, "goal_vertex_group", ob, "vertex_groups", text="Vertex Group")
 
 class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
 	__label__ = "Soft Body Edges"
+	__default_closed__ = True
 	
 	def poll(self, context):
 		return (context.soft_body)
 		
 	def draw_header(self, context):
-		layout = self.layout
+		#layout = self.layout
 		
 		softbody = context.soft_body.settings
 	
@@ -130,41 +131,40 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
 		layout = self.layout
 		
 		md = context.soft_body
+		softbody = md.settings
 		ob = context.object
-			
-		if md:
-			softbody = md.settings
-			
-			layout.active = softbody.use_edges and softbody_panel_enabled(md)
-			
-			split = layout.split()
-			
-			col = split.column()
-			col.itemL(text="Springs:")
-			col.itemR(softbody, "pull")
-			col.itemR(softbody, "push")
-			col.itemR(softbody, "damp")
-			col.itemR(softbody, "plastic")
-			col.itemR(softbody, "bending")
-			col.itemR(softbody, "spring_length", text="Length")
-			
-			col = split.column()
-			col.itemR(softbody, "stiff_quads")
-			sub = col.column()
-			sub.active = softbody.stiff_quads
-			sub.itemR(softbody, "shear")
-			
-			col.itemR(softbody, "new_aero", text="Aero")
-			sub = col.column()
-			sub.enabled = softbody.new_aero
-			sub.itemR(softbody, "aero", text="Factor")
 
-			col.itemL(text="Collision:")
-			col.itemR(softbody, "edge_collision", text="Edge")
-			col.itemR(softbody, "face_collision", text="Face")
+		layout.active = softbody.use_edges and softbody_panel_enabled(md)
+			
+		split = layout.split()
+			
+		col = split.column()
+		col.itemL(text="Springs:")
+		col.itemR(softbody, "pull")
+		col.itemR(softbody, "push")
+		col.itemR(softbody, "damp")
+		col.itemR(softbody, "plastic")
+		col.itemR(softbody, "bending")
+		col.itemR(softbody, "spring_length", text="Length")
+			
+		col = split.column()
+		col.itemR(softbody, "stiff_quads")
+		sub = col.column()
+		sub.active = softbody.stiff_quads
+		sub.itemR(softbody, "shear")
+			
+		col.itemR(softbody, "new_aero", text="Aero")
+		sub = col.column()
+		sub.enabled = softbody.new_aero
+		sub.itemR(softbody, "aero", text="Factor")
+
+		col.itemL(text="Collision:")
+		col.itemR(softbody, "edge_collision", text="Edge")
+		col.itemR(softbody, "face_collision", text="Face")
 			
 class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
 	__label__ = "Soft Body Collision"
+	__default_closed__ = True
 	
 	def poll(self, context):
 		return (context.soft_body)
@@ -181,24 +181,23 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
 		layout = self.layout
 		
 		md = context.soft_body
+		softbody = md.settings
 		ob = context.object
-			
-		if md:
-			softbody = md.settings
 
-			layout.active = softbody.self_collision and softbody_panel_enabled(md)
+		layout.active = softbody.self_collision and softbody_panel_enabled(md)
 			
-			layout.itemL(text="Collision Type:")
-			layout.itemR(softbody, "collision_type", expand=True)
+		layout.itemL(text="Collision Type:")
+		layout.itemR(softbody, "collision_type", expand=True)
 			
-			col = layout.column(align=True)
-			col.itemL(text="Ball:")
-			col.itemR(softbody, "ball_size", text="Size")
-			col.itemR(softbody, "ball_stiff", text="Stiffness")
-			col.itemR(softbody, "ball_damp", text="Dampening")
+		col = layout.column(align=True)
+		col.itemL(text="Ball:")
+		col.itemR(softbody, "ball_size", text="Size")
+		col.itemR(softbody, "ball_stiff", text="Stiffness")
+		col.itemR(softbody, "ball_damp", text="Dampening")
 
 class PHYSICS_PT_softbody_solver(PhysicButtonsPanel):
 	__label__ = "Soft Body Solver"
+	__default_closed__ = True
 	
 	def poll(self, context):
 		return (context.soft_body)
@@ -207,30 +206,28 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel):
 		layout = self.layout
 		
 		md = context.soft_body
+		softbody = md.settings
 		ob = context.object
-		
-		if md:
-			softbody = md.settings
-			
-			layout.active = softbody_panel_enabled(md)
 
-			# Solver
-			split = layout.split()
+		layout.active = softbody_panel_enabled(md)
+
+		# Solver
+		split = layout.split()
 			
-			col = split.column(align=True)
-			col.itemL(text="Step Size:")
-			col.itemR(softbody, "minstep")
-			col.itemR(softbody, "maxstep")
-			col.itemR(softbody, "auto_step", text="Auto-Step")
+		col = split.column(align=True)
+		col.itemL(text="Step Size:")
+		col.itemR(softbody, "minstep")
+		col.itemR(softbody, "maxstep")
+		col.itemR(softbody, "auto_step", text="Auto-Step")
 			
-			col = split.column()
-			col.itemR(softbody, "error_limit")
-			col.itemL(text="Helpers:")
-			col.itemR(softbody, "choke")
-			col.itemR(softbody, "fuzzy")
+		col = split.column()
+		col.itemR(softbody, "error_limit")
+		col.itemL(text="Helpers:")
+		col.itemR(softbody, "choke")
+		col.itemR(softbody, "fuzzy")
 			
-			layout.itemL(text="Diagnostics:")
-			layout.itemR(softbody, "diagnose")
+		layout.itemL(text="Diagnostics:")
+		layout.itemR(softbody, "diagnose")
 	
 bpy.types.register(PHYSICS_PT_softbody)
 bpy.types.register(PHYSICS_PT_softbody_cache)

From 1a968f64dcb706b90a877a1196d0b70a3c57fcff Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 30 Aug 2009 21:57:10 +0000
Subject: [PATCH 361/577] Fix crash reported by DingTo with camera transform in
 camera view.

---
 source/blender/editors/transform/transform_conversions.c | 2 +-
 source/blender/editors/transform/transform_generics.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index aaede541b76..86d3af31c85 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -5289,7 +5289,7 @@ void createTransData(bContext *C, TransInfo *t)
 		if (t->ar->regiontype == RGN_TYPE_WINDOW)
 		{
 			View3D *v3d = t->view;
-			RegionView3D *rv3d = t->ar->regiondata;
+			RegionView3D *rv3d = CTX_wm_region_view3d(C);
 			if((t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp==V3D_CAMOB)
 			{
 				t->flag |= T_CAMERA;
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index edcbd858e37..0f715f1d35a 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1323,7 +1323,7 @@ void calculateCenter(TransInfo *t)
 	/* voor panning from cameraview */
 	if(t->flag & T_OBJECT)
 	{
-		if(t->spacetype==SPACE_VIEW3D)
+		if(t->spacetype==SPACE_VIEW3D && t->ar->regiontype == RGN_TYPE_WINDOW)
 		{
 			View3D *v3d = t->view;
 			Scene *scene = t->scene;

From 3fa51df744ea5c4585e4cb53a207a0f106ec2032 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Mon, 31 Aug 2009 01:58:11 +0000
Subject: [PATCH 362/577] Grease Pencil: Restored some editing operators
 (convert and delete active frame)

* Convert operator - can currently be used to convert active Grease Pencil layer to curves. I had a look at making this part of a special "curve sketching" macro, though it seems that we cannot have modal operators coming first in a macro (and also cannot specify operator calling modes)

* Delete Active Frame operator - does what its name say it does. It deletes the active frame for the active layer of Grease Pencil sketches.
---
 source/blender/blenkernel/intern/gpencil.c    |   2 +-
 .../blender/editors/gpencil/gpencil_buttons.c |  20 +-
 source/blender/editors/gpencil/gpencil_edit.c | 304 ++++++++++++++++++
 .../blender/editors/gpencil/gpencil_intern.h  |   4 +
 source/blender/editors/gpencil/gpencil_ops.c  |   4 +
 5 files changed, 324 insertions(+), 10 deletions(-)

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index b02128c3c68..43c4137e73e 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -313,7 +313,7 @@ bGPdata *gpencil_data_duplicate (bGPdata *src)
 void gpencil_frame_delete_laststroke (bGPDlayer *gpl, bGPDframe *gpf)
 {
 	bGPDstroke *gps= (gpf) ? gpf->strokes.last : NULL;
-	int cfra = 1; // XXX FIXME!!!
+	int cfra = (gpf) ? gpf->framenum : 0; /* assume that the current frame was not locked */
 	
 	/* error checking */
 	if (ELEM(NULL, gpf, gps))
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 774f7b7162b..c3f779b59b8 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -203,6 +203,12 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		subcol= uiLayoutColumn(col, 1);
 			uiItemR(subcol, NULL, 0, &ptr, "line_thickness", UI_ITEM_R_SLIDER);
 		
+		/* debugging options */
+		if (G.f & G_DEBUG) {
+			subcol= uiLayoutColumn(col, 1);
+				uiItemR(subcol, NULL, 0, &ptr, "show_points", 0);
+		}
+		
 		/* right column ................... */
 		col= uiLayoutColumn(split, 0);
 		
@@ -211,15 +217,10 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 			uiItemR(subcol, "Onion Skinning", 0, &ptr, "use_onion_skinning", 0);
 			uiItemR(subcol, "GStep", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep)
 		
-		/* debugging options */
-		// XXX re-enable the debug-only checks later
-		//if (G.f & G_DEBUG) {
-			subcol= uiLayoutColumn(col, 1);
-				uiItemR(subcol, NULL, 0, &ptr, "show_points", 0);
-		//}
-		
 		/* additional options... */
-		// None at the moment...
+		subcol= uiLayoutColumn(col, 1);
+			uiItemO(subcol, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete");
+			uiItemO(subcol, "Convert...", 0, "GPENCIL_OT_convert");
 	}
 } 
 
@@ -237,7 +238,8 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
 	col= uiLayoutColumn(layout, 0);
 		/* current Grease Pencil block */
 		// TODO: show some info about who owns this?
-		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_new", "GPENCIL_OT_data_unlink");
+		//uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_new", "GPENCIL_OT_data_unlink"); // XXX not working
+		uiItemR(col, NULL, 0, ctx_ptr, "grease_pencil", 0); // XXX this will have to do for now...
 		
 		/* add new layer button */
 		uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add");
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 74fbe250d37..8cf1affa8c6 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -60,6 +60,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
+#include "BKE_object.h"
 #include "BKE_report.h"
 #include "BKE_utildefines.h"
 
@@ -70,6 +71,7 @@
 #include "WM_types.h"
 
 #include "RNA_access.h"
+#include "RNA_define.h"
 
 #include "UI_view2d.h"
 
@@ -280,4 +282,306 @@ void GPENCIL_OT_layer_add (wmOperatorType *ot)
 	ot->poll= gp_add_poll;
 }
 
+/* ******************* Delete Active Frame ************************ */
+
+static int gp_actframe_delete_poll (bContext *C)
+{
+	bGPdata *gpd= gpencil_data_get_active(C);
+	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
+	
+	/* only if there's an active layer with an active frame */
+	return (gpl && gpl->actframe);
+}
+
+/* delete active frame - wrapper around API calls */
+static int gp_actframe_delete_exec (bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	bGPdata *gpd= gpencil_data_get_active(C);
+	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
+	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
+	
+	/* if there's no existing Grease-Pencil data there, add some */
+	if (gpd == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No Grease Pencil data");
+		return OPERATOR_CANCELLED;
+	}
+	if ELEM(NULL, gpl, gpf) {
+		BKE_report(op->reports, RPT_ERROR, "No active frame to delete");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* delete it... */
+	gpencil_layer_delframe(gpl, gpf);
+	
+	/* notifiers */
+	WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX please work!
+	
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_active_frame_delete (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Delete Active Frame";
+	ot->idname= "GPENCIL_OT_active_frame_delete";
+	ot->description= "Delete the active frame for the active Grease Pencil datablock.";
+	
+	/* callbacks */
+	ot->exec= gp_actframe_delete_exec;
+	ot->poll= gp_actframe_delete_poll;
+}
+
+/* ************************************************ */
+/* Grease Pencil to Data Operator */
+
+/* defines for possible modes */
+enum {
+	GP_STROKECONVERT_PATH = 1,
+	GP_STROKECONVERT_CURVE,
+};
+
+/* RNA enum define */
+static EnumPropertyItem prop_gpencil_convertmodes[] = {
+	{GP_STROKECONVERT_PATH, "PATH", 0, "Path", ""},
+	{GP_STROKECONVERT_CURVE, "CURVE", 0, "Bezier Curve", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+/* --- */
+
+/* convert the coordinates from the given stroke point into 3d-coordinates 
+ *	- assumes that the active space is the 3D-View
+ */
+static void gp_strokepoint_convertcoords (bContext *C, bGPDstroke *gps, bGPDspoint *pt, float p3d[3])
+{
+	Scene *scene= CTX_data_scene(C);
+	View3D *v3d= CTX_wm_view3d(C);
+	ARegion *ar= CTX_wm_region(C);
+	
+	if (gps->flag & GP_STROKE_3DSPACE) {
+		/* directly use 3d-coordinates */
+		VecCopyf(p3d, &pt->x);
+	}
+	else {
+		float *fp= give_cursor(scene, v3d);
+		float dvec[3];
+		short mval[2];
+		int mx, my;
+		
+		/* get screen coordinate */
+		if (gps->flag & GP_STROKE_2DSPACE) {
+			View2D *v2d= &ar->v2d;
+			UI_view2d_view_to_region(v2d, pt->x, pt->y, &mx, &my);
+		}
+		else {
+			mx= (int)(pt->x / 100 * ar->winx);
+			my= (int)(pt->y / 100 * ar->winy);
+		}
+		mval[0]= (short)mx;
+		mval[1]= (short)my;
+		
+		/* convert screen coordinate to 3d coordinates 
+		 *	- method taken from editview.c - mouse_cursor() 
+		 */
+		project_short_noclip(ar, fp, mval);
+		window_to_3d(ar, dvec, mval[0]-mx, mval[1]-my);
+		VecSubf(p3d, fp, dvec);
+	}
+}
+
+/* --- */
+
+/* convert stroke to 3d path */
+static void gp_stroke_to_path (bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Curve *cu)
+{
+	bGPDspoint *pt;
+	Nurb *nu;
+	BPoint *bp;
+	int i;
+	
+	/* create new 'nurb' within the curve */
+	nu = (Nurb *)MEM_callocN(sizeof(Nurb), "gpstroke_to_path(nurb)");
+	
+	nu->pntsu= gps->totpoints;
+	nu->pntsv= 1;
+	nu->orderu= gps->totpoints;
+	nu->flagu= 2;	/* endpoint */
+	nu->resolu= 32;
+	
+	nu->bp= (BPoint *)MEM_callocN(sizeof(BPoint)*gps->totpoints, "bpoints");
+	
+	/* add points */
+	for (i=0, pt=gps->points, bp=nu->bp; i < gps->totpoints; i++, pt++, bp++) {
+		float p3d[3];
+		
+		/* get coordinates to add at */
+		gp_strokepoint_convertcoords(C, gps, pt, p3d);
+		VecCopyf(bp->vec, p3d);
+		
+		/* set settings */
+		bp->f1= SELECT;
+		bp->radius = bp->weight = pt->pressure * gpl->thickness;
+	}
+	
+	/* add nurb to curve */
+	BLI_addtail(&cu->nurb, nu);
+}
+
+/* convert stroke to 3d bezier */
+static void gp_stroke_to_bezier (bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Curve *cu)
+{
+	bGPDspoint *pt;
+	Nurb *nu;
+	BezTriple *bezt;
+	int i;
+	
+	/* create new 'nurb' within the curve */
+	nu = (Nurb *)MEM_callocN(sizeof(Nurb), "gpstroke_to_bezier(nurb)");
+	
+	nu->pntsu= gps->totpoints;
+	nu->resolu= 12;
+	nu->resolv= 12;
+	nu->type= CU_BEZIER;
+	nu->bezt = (BezTriple *)MEM_callocN(gps->totpoints*sizeof(BezTriple), "bezts");
+	
+	/* add points */
+	for (i=0, pt=gps->points, bezt=nu->bezt; i < gps->totpoints; i++, pt++, bezt++) {
+		float p3d[3];
+		
+		/* get coordinates to add at */
+		gp_strokepoint_convertcoords(C, gps, pt, p3d);
+		
+		/* TODO: maybe in future the handles shouldn't be in same place */
+		VecCopyf(bezt->vec[0], p3d);
+		VecCopyf(bezt->vec[1], p3d);
+		VecCopyf(bezt->vec[2], p3d);
+		
+		/* set settings */
+		bezt->h1= bezt->h2= HD_FREE;
+		bezt->f1= bezt->f2= bezt->f3= SELECT;
+		bezt->radius = bezt->weight = pt->pressure * gpl->thickness * 0.1f;
+	}
+	
+	/* must calculate handles or else we crash */
+	calchandlesNurb(nu);
+	
+	/* add nurb to curve */
+	BLI_addtail(&cu->nurb, nu);
+}
+
+/* convert a given grease-pencil layer to a 3d-curve representation (using current view if appropriate) */
+static void gp_layer_to_curve (bContext *C, bGPdata *gpd, bGPDlayer *gpl, short mode)
+{
+	Scene *scene= CTX_data_scene(C);
+	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
+	bGPDstroke *gps;
+	Base *base= BASACT;
+	Object *ob;
+	Curve *cu;
+	
+	/* error checking */
+	if (ELEM3(NULL, gpd, gpl, gpf))
+		return;
+		
+	/* only convert if there are any strokes on this layer's frame to convert */
+	if (gpf->strokes.first == NULL)
+		return;
+	
+	/* init the curve object (remove rotation and get curve data from it)
+	 *	- must clear transforms set on object, as those skew our results
+	 */
+	ob= add_object(scene, OB_CURVE);
+	ob->loc[0]= ob->loc[1]= ob->loc[2]= 0;
+	ob->rot[0]= ob->rot[1]= ob->rot[2]= 0;
+	cu= ob->data;
+	cu->flag |= CU_3D;
+	
+	/* rename object and curve to layer name */
+	rename_id((ID *)ob, gpl->info);
+	rename_id((ID *)cu, gpl->info);
+	
+	/* add points to curve */
+	for (gps= gpf->strokes.first; gps; gps= gps->next) {
+		switch (mode) {
+			case GP_STROKECONVERT_PATH: 
+				gp_stroke_to_path(C, gpl, gps, cu);
+				break;
+			case GP_STROKECONVERT_CURVE:
+				gp_stroke_to_bezier(C, gpl, gps, cu);
+				break;
+		}
+	}
+	
+	/* restore old active object */
+	BASACT= base;
+}
+
+/* --- */
+
+static int gp_convert_poll (bContext *C)
+{
+	bGPdata *gpd= gpencil_data_get_active(C);
+	ScrArea *sa= CTX_wm_area(C);
+	
+	/* only if there's valid data, and the current view is 3D View */
+	return ((sa->spacetype == SPACE_VIEW3D) && gpencil_layer_getactive(gpd));
+}
+
+static int gp_convert_layer_exec (bContext *C, wmOperator *op)
+{
+	bGPdata *gpd= gpencil_data_get_active(C);
+	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
+	Scene *scene= CTX_data_scene(C);
+	View3D *v3d= CTX_wm_view3d(C);
+	float *fp= give_cursor(scene, v3d);
+	int mode= RNA_enum_get(op->ptr, "type");
+	
+	/* check if there's data to work with */
+	if (gpd == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No Grease Pencil data to work on.");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* initialise 3d-cursor correction globals */
+	initgrabz(CTX_wm_region_view3d(C), fp[0], fp[1], fp[2]);
+	
+	/* handle conversion modes */
+	switch (mode) {
+		case GP_STROKECONVERT_PATH:
+		case GP_STROKECONVERT_CURVE:
+			gp_layer_to_curve(C, gpd, gpl, mode);
+			break;
+			
+		default: /* unsupoorted */
+			BKE_report(op->reports, RPT_ERROR, "Unknown conversion option.");
+			return OPERATOR_CANCELLED;
+	}
+		
+	/* notifiers */
+	WM_event_add_notifier(C, NC_OBJECT|NA_ADDED, NULL);
+	
+	/* done */
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_convert (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Convert Grease Pencil";
+	ot->idname= "GPENCIL_OT_convert";
+	ot->description= "Convert the active Grease Pencil layer to a new Object.";
+	
+	/* callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= gp_convert_layer_exec;
+	ot->poll= gp_convert_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_enum(ot->srna, "type", prop_gpencil_convertmodes, 0, "Type", "");
+}
+
 /* ************************************************ */
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 2c7bf9156c3..57e8c882d20 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -54,6 +54,10 @@ void GPENCIL_OT_data_unlink(struct wmOperatorType *ot);
 
 void GPENCIL_OT_layer_add(struct wmOperatorType *ot);
 
+void GPENCIL_OT_active_frame_delete(struct wmOperatorType *ot);
+
+void GPENCIL_OT_convert(struct wmOperatorType *ot);
+
 
 /******************************************************* */
 /* FILTERED ACTION DATA - TYPES  ---> XXX DEPRECEATED OLD ANIM SYSTEM CODE! */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 3acbded0bf8..d33ad16dfb1 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -76,6 +76,10 @@ void ED_operatortypes_gpencil (void)
 	
 	WM_operatortype_append(GPENCIL_OT_layer_add);
 	
+	WM_operatortype_append(GPENCIL_OT_active_frame_delete);
+	
+	WM_operatortype_append(GPENCIL_OT_convert);
+	
 	/* Editing (Time) --------------- */
 }
 

From 6b3351c327771c6572ddfb3677db087b15bf06d1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 31 Aug 2009 03:36:02 +0000
Subject: [PATCH 363/577] bugfix [#19254] KX_PolyProxy returns improper
 VertexIndex with triangles, using .getVertexIndex() and .v1, .v2, etc.

Surprising this wasn't noticed before. Any mix of quads/tris caused the face verts of either quads/tries (whichever comes last).

Tested by exporting the KX_MeshProxy and re-importing as an OBJ.

This fix assumes there are only 2 m_darray's per face array which is currently true, but wont be if edge support is added back.
---
 source/gameengine/Ketsji/KX_PolyProxy.cpp         | 10 +++++-----
 source/gameengine/Rasterizer/RAS_MaterialBucket.h |  3 +++
 source/gameengine/Rasterizer/RAS_Polygon.cpp      | 15 +++++++++++++++
 source/gameengine/Rasterizer/RAS_Polygon.h        |  1 +
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp
index b56b5500c39..66457f46deb 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.cpp
+++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp
@@ -140,19 +140,19 @@ PyObject* KX_PolyProxy::py_getattro(PyObject *attr)
 	}
 	if (!strcmp(attr_str, "v1"))
 	{
-		return PyInt_FromLong(m_polygon->GetVertexOffset(0));
+		return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, 0));
 	}
 	if (!strcmp(attr_str, "v2"))
 	{
-		return PyInt_FromLong(m_polygon->GetVertexOffset(1));
+		return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, 1));
 	}
 	if (!strcmp(attr_str, "v3"))
 	{
-		return PyInt_FromLong(m_polygon->GetVertexOffset(2));
+		return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, 2));
 	}
 	if (!strcmp(attr_str, "v4"))
 	{
-		return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffset(3):0));
+		return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffsetAbs(m_mesh, 3):0));
 	}
 	if (!strcmp(attr_str, "visible"))
 	{
@@ -255,7 +255,7 @@ KX_PYMETHODDEF_DOC(KX_PolyProxy, getVertexIndex,
 	}
 	if (index < m_polygon->VertexCount())
 	{
-		return PyInt_FromLong(m_polygon->GetVertexOffset(index));
+		return PyInt_FromLong(m_polygon->GetVertexOffsetAbs(m_mesh, index));
 	}
 	return PyInt_FromLong(0);
 }
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 8db75b8b735..49837652483 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -79,8 +79,11 @@ class RAS_DisplayArray
 public:
 	vector<RAS_TexVert> m_vertex;
 	vector<unsigned short> m_index;
+	/* LINE currently isnt used */
 	enum { LINE = 2, TRIANGLE = 3, QUAD = 4 } m_type;
 	//RAS_MeshSlot *m_origSlot;
+	
+	/* Number of RAS_MeshSlot using this array */
 	int m_users;
 
 	enum { BUCKET_MAX_INDEX = 65535 };
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp
index eacc1285166..87c5118c5fb 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.cpp
+++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include "RAS_Polygon.h"
+#include "RAS_MeshObject.h" /* only for GetVertexOffsetAbs */
 
 RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket, RAS_DisplayArray *darray, int numvert)
 {
@@ -63,6 +64,20 @@ int RAS_Polygon::GetVertexOffset(int i)
 	return m_offset[i];
 }
 
+int RAS_Polygon::GetVertexOffsetAbs(RAS_MeshObject *mesh, int i)
+{
+	/* hack that only works because there can only ever be 2 different
+	 * GetDisplayArray's per mesh. if this uses a different display array to the first
+	 * then its incices are offset.
+	 * if support for edges is added back this would need to be changed. */
+	RAS_DisplayArray* darray= mesh->GetPolygon(0)->GetDisplayArray();
+	
+	if(m_darray != darray)
+		return m_offset[i] + darray->m_vertex.size();
+	
+	return m_offset[i];
+}
+
 /*
 int RAS_Polygon::GetEdgeCode()
 {
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h
index 41eaa6bdd4a..188390f1c6b 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.h
+++ b/source/gameengine/Rasterizer/RAS_Polygon.h
@@ -68,6 +68,7 @@ public:
 
 	void				SetVertexOffset(int i, unsigned short offset);
 	int					GetVertexOffset(int i);
+	int					GetVertexOffsetAbs(RAS_MeshObject *mesh, int i); /* accounts for quad and tri arrays, slower, for python */
 	
 	// each bit is for a visible edge, starting with bit 1 for the first edge, bit 2 for second etc.
 	// - Not used yet!

From 7ad4386653ad916a97f3054cab46350ea90fcc54 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Mon, 31 Aug 2009 04:24:28 +0000
Subject: [PATCH 364/577] Grease Pencil: Cleanup Work + Bugfixes

* Disabled temporary debugging prints, since event handling now seems stable

* Modified the initgrabz() code so that when the cursor is behind the viewplane, the z-factor is calculated as if the cursor was on the other side of the view plane. This seems to work well, and doesn't seem to have any negative side-effects (yet).
---
 .../blender/editors/gpencil/gpencil_paint.c   | 84 +++++++++++--------
 .../editors/space_view3d/view3d_view.c        |  5 +-
 2 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 67bf2951bf8..99b85d62026 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -86,6 +86,7 @@ typedef struct tGPsdata {
 	} im2d_settings;	/* needed for GP_STROKE_2DIMAGE */
 #endif
 	
+	PointerRNA ownerPtr;/* pointer to owner of gp-datablock */
 	bGPdata *gpd;		/* gp-datablock layer comes from */
 	bGPDlayer *gpl;		/* layer we're working on */
 	bGPDframe *gpf;		/* frame we're working on */
@@ -153,6 +154,29 @@ static int gpencil_draw_poll (bContext *C)
 /* ******************************************* */
 /* Calculations/Conversions */
 
+/* Utilities --------------------------------- */
+
+/* get the reference point for stroke-point conversions */
+static void gp_get_3d_reference (tGPsdata *p, float *vec)
+{
+	View3D *v3d= p->sa->spacedata.first;
+	float *fp= give_cursor(p->scene, v3d);
+	
+	/* the reference point used depends on the owner... */
+	if (p->ownerPtr.type == &RNA_Object) {
+		Object *ob= (Object *)p->ownerPtr.data;
+		
+		/* active Object 
+		 * 	- use relative distance of 3D-cursor from object center 
+		 */
+		VecSubf(vec, fp, ob->loc);
+	}
+	else {
+		/* use 3D-cursor */
+		VecCopyf(vec, fp);
+	}
+}
+
 /* Stroke Editing ---------------------------- */
 
 /* check if the current mouse position is suitable for adding a new point */
@@ -187,10 +211,8 @@ static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
 	
 	/* in 3d-space - pt->x/y/z are 3 side-by-side floats */
 	if (gpd->sbuffer_sflag & GP_STROKE_3DSPACE) {
-		View3D *v3d= p->sa->spacedata.first;
 		const short mx=mval[0], my=mval[1];
-		float *fp= give_cursor(p->scene, v3d);
-		float dvec[3];
+		float rvec[3], dvec[3];
 		
 		/* Current method just converts each point in screen-coordinates to 
 		 * 3D-coordinates using the 3D-cursor as reference. In general, this 
@@ -201,11 +223,12 @@ static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
 		 *	  reference point instead or as offset, for easier stroke matching
 		 *	- investigate projection onto geometry (ala retopo)
 		 */
+		gp_get_3d_reference(p, rvec);
 		
 		/* method taken from editview.c - mouse_cursor() */
-		project_short_noclip(p->ar, fp, mval);
+		project_short_noclip(p->ar, rvec, mval);
 		window_to_3d_delta(p->ar, dvec, mval[0]-mx, mval[1]-my);
-		VecSubf(out, fp, dvec);
+		VecSubf(out, rvec, dvec);
 	}
 	
 	/* 2d - on 'canvas' (assume that p->v2d is set) */
@@ -831,7 +854,7 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 #endif
 		case SPACE_IMAGE:
 		{
-			SpaceImage *sima= curarea->spacedata.first;
+			//SpaceImage *sima= curarea->spacedata.first;
 			
 			/* set the current area */
 			p->sa= curarea;
@@ -863,7 +886,7 @@ static tGPsdata *gp_session_initpaint (bContext *C)
 	}
 	
 	/* get gp-data */
-	gpd_ptr= gpencil_data_get_pointers(C, NULL);
+	gpd_ptr= gpencil_data_get_pointers(C, &p->ownerPtr);
 	if (gpd_ptr == NULL) {
 		p->status= GP_STATUS_ERROR;
 		if (G.f & G_DEBUG)
@@ -951,13 +974,11 @@ static void gp_paint_initstroke (tGPsdata *p, short paintmode)
 		switch (p->sa->spacetype) {
 			case SPACE_VIEW3D:
 			{
-				View3D *v3d= (View3D *)p->sa->spacedata.first;
 				RegionView3D *rv3d= p->ar->regiondata;
+				float rvec[3];
 				
-				// TODO 1: when using objects, make the data stick to the object centers?
-				// TODO 2: what happens when cursor is behind view-camera plane?
-				float *fp= give_cursor(p->scene, v3d);
-				initgrabz(rv3d, fp[0], fp[1], fp[2]);
+				gp_get_3d_reference(p, rvec);
+				initgrabz(rv3d, rvec[0], rvec[1], rvec[2]);
 				
 				p->gpd->sbuffer_sflag |= GP_STROKE_3DSPACE;
 			}
@@ -1215,18 +1236,18 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op)
 {
 	tGPsdata *p = NULL;
 	
-	printf("GPencil - Starting Re-Drawing \n");
+	//printf("GPencil - Starting Re-Drawing \n");
 	
 	/* try to initialise context data needed while drawing */
 	if (!gpencil_draw_init(C, op)) {
 		if (op->customdata) MEM_freeN(op->customdata);
-		printf("\tGP - no valid data \n");
+		//printf("\tGP - no valid data \n");
 		return OPERATOR_CANCELLED;
 	}
 	else
 		p= op->customdata;
 	
-	printf("\tGP - Start redrawing stroke \n");
+	//printf("\tGP - Start redrawing stroke \n");
 	
 	/* loop over the stroke RNA elements recorded (i.e. progress of mouse movement),
 	 * setting the relevant values in context at each step, then applying
@@ -1235,7 +1256,7 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op)
 	{
 		float mousef[2];
 		
-		printf("\t\tGP - stroke elem \n");
+		//printf("\t\tGP - stroke elem \n");
 		
 		/* get relevant data for this point from stroke */
 		RNA_float_get_array(&itemptr, "mouse", mousef);
@@ -1257,7 +1278,7 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op)
 	}
 	RNA_END;
 	
-	printf("\tGP - done \n");
+	//printf("\tGP - done \n");
 	
 	/* cleanup */
 	gpencil_draw_exit(C, op);
@@ -1277,7 +1298,7 @@ static int gpencil_draw_invoke (bContext *C, wmOperator *op, wmEvent *event)
 	tGPsdata *p = NULL;
 	wmWindow *win= CTX_wm_window(C);
 	
-	printf("GPencil - Starting Drawing \n");
+	//printf("GPencil - Starting Drawing \n");
 	
 	/* try to initialise context data needed while drawing */
 	if (!gpencil_draw_init(C, op)) {
@@ -1308,7 +1329,7 @@ static int gpencil_draw_invoke (bContext *C, wmOperator *op, wmEvent *event)
 	 */
 	if (event->type) {
 		/* hotkey invoked - start drawing */
-		printf("\tGP - set first spot\n");
+		//printf("\tGP - set first spot\n");
 		p->status= GP_STATUS_PAINTING;
 		
 		/* handle the initial drawing - i.e. for just doing a simple dot */
@@ -1316,7 +1337,7 @@ static int gpencil_draw_invoke (bContext *C, wmOperator *op, wmEvent *event)
 	}
 	else {
 		/* toolbar invoked - don't start drawing yet... */
-		printf("\tGP - hotkey invoked... waiting for click-drag\n");
+		//printf("\tGP - hotkey invoked... waiting for click-drag\n");
 	}
 	
 	/* add a modal handler for this operator, so that we can then draw continuous strokes */
@@ -1329,7 +1350,7 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 {
 	tGPsdata *p= op->customdata;
 	
-	printf("\tGP - handle modal event...\n");
+	//printf("\tGP - handle modal event...\n");
 	
 	switch (event->type) {
 		/* end of stroke -> ONLY when a mouse-button release occurs 
@@ -1340,7 +1361,7 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 			/* if painting, end stroke */
 			if (p->status == GP_STATUS_PAINTING) {
 				/* basically, this should be mouse-button up */
-				printf("\t\tGP - end of stroke \n");
+				//printf("\t\tGP - end of stroke \n");
 				gpencil_draw_exit(C, op);
 				
 				/* one last flush before we're done */
@@ -1350,7 +1371,7 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 			}
 			else {
 				/* not painting, so start stroke (this should be mouse-button down) */
-				printf("\t\tGP - start stroke \n");
+				//printf("\t\tGP - start stroke \n");
 				p->status= GP_STATUS_PAINTING;
 				/* no break now, since we should immediately start painting */
 			}
@@ -1360,31 +1381,20 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 			/* check if we're currently painting */
 			if (p->status == GP_STATUS_PAINTING) {
 				/* handle drawing event */
-				printf("\t\tGP - add point\n");
+				//printf("\t\tGP - add point\n");
 				gpencil_draw_apply_event(C, op, event);
 				
 				/* finish painting operation if anything went wrong just now */
 				if (p->status == GP_STATUS_ERROR) {
-					printf("\t\t\tGP - error done! \n");
+					//printf("\t\t\tGP - error done! \n");
 					gpencil_draw_exit(C, op);
 					return OPERATOR_CANCELLED;
 				}
 			}
 			break;
 		
-		/* scrolling mouse-wheel increases radius of eraser 
-		 * 	- though this is quite a difficult action to perform
-		 */
-		// XXX this stuff doesn't work
-		case WHEELUPMOUSE:
-			p->radius += 1.5f;
-			break;
-		case WHEELDOWNMOUSE:
-			p->radius -= 1.5f;
-			break;
-		
 		default:
-			printf("\t\tGP unknown event - %d \n", event->type);
+			//printf("\t\tGP unknown event - %d \n", event->type);
 			break;
 	}
 	
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 771c02e95b6..c61b2f0f31d 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -482,7 +482,10 @@ void initgrabz(RegionView3D *rv3d, float x, float y, float z)
 	/* Negative zfac means x, y, z was behind the camera (in perspective).
 		* This gives flipped directions, so revert back to ok default case.
 	*/
-	if (rv3d->zfac < 0.0f) rv3d->zfac = 1.0f;
+	// NOTE: I've changed this to flip zfac to be positive again for now so that GPencil draws ok
+	// 	-- Aligorith, 2009Aug31
+	//if (rv3d->zfac < 0.0f) rv3d->zfac = 1.0f;
+	if (rv3d->zfac < 0.0f) rv3d->zfac= -rv3d->zfac;
 }
 
 /* always call initgrabz */

From 07abbaa9d722115ec7899cef22862232c37f66d2 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Mon, 31 Aug 2009 04:39:08 +0000
Subject: [PATCH 365/577] 2.5 - Datatype defines for MotionPaths and
 Visualisation Settings

---
 source/blender/makesdna/DNA_action_types.h | 50 +++++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 6f097ea3882..c9d75d5c262 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -40,6 +40,54 @@
 struct SpaceLink;
 struct Object;
 
+/* ************************************************ */
+/* Visualisation */
+
+/* Motion Paths ------------------------------------ */
+/* (used for Pose Channels and Objects) */
+
+/* Data point for motion path */
+typedef struct bMotionPathVert {
+	float co[3];				/* coordinates of point in 3D-space */
+	int flag;					/* quick settings */
+} bMotionPathVert;
+
+/* Motion Path data cache - for elements providing transforms (i.e. Objects or PoseChannels) */
+typedef struct bMotionPath {
+	bMotionPathVert *points;	/* path samples */
+	int	length;					/* the number of cached verts */
+	
+	int start_frame;			/* for drawing paths, the start frame number */
+	int	end_frame;				/* for drawing paths, the end frame number */
+	
+	int flag;					/* extra settings */
+} bMotionPath;
+
+
+
+/* Animation Visualisation Settings - for Objects or Armatures (not PoseChannels) */
+typedef struct bAnimVizSettings {
+	int pad;
+	int pathflag;				/* eMotionPath_Settings */
+	
+	int pathsf, pathef;			/* start and end frames of path-calculation range */
+	int	pathbc, pathac;			/* number of frames before/after current frame of path-calculation */
+} bAnimVizSettings;
+
+/* bMotionPathSettings->flag */
+typedef enum eMotionPath_Settings {
+		/* show frames on path */
+	MOTIONPATH_FLAG_FNUMS		= (1<<0),
+		/* show keyframes on path */
+	MOTIONPATH_FLAG_KFRAS		= (1<<1),
+		/* for bones - calculate head-points for curves instead of tips */
+	MOTIONPATH_FLAG_HEADS		= (1<<2),
+		/* show path around current frame */
+	MOTIONPATH_FLAG_ACFRA		= (1<<3),
+		/* show keyframe/frame numbers */
+	MOTIONPATH_FLAG_KFNOS		= (1<<4)
+} eMotionPath_Settings;
+
 /* ************************************************ */
 /* Poses */
 
@@ -438,5 +486,3 @@ typedef enum ACHAN_FLAG {
 
 
 #endif
-
-

From 043641de72d7c9b6d27d92ccc3c64dc784450b11 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 31 Aug 2009 13:03:38 +0000
Subject: [PATCH 366/577] corrections to epydocs

---
 source/blender/python/api2_2x/doc/Particle.py | 16 ++++++++--------
 source/blender/python/api2_2x/doc/Texture.py  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/blender/python/api2_2x/doc/Particle.py b/source/blender/python/api2_2x/doc/Particle.py
index 15481c9dd63..b8e263f948f 100644
--- a/source/blender/python/api2_2x/doc/Particle.py
+++ b/source/blender/python/api2_2x/doc/Particle.py
@@ -70,7 +70,7 @@ This module provides access to the B{Particle} in Blender.
 		- SPIN: Spin particle angular velocity
 		- RANDOM: Random particle angular velocity
 @type VERTEXGROUPS: readonly dictionary
-@var VERTEXGROUPS: Constant dict used for with L{Particle.VERTEXGROUP}
+@var VERTEXGROUPS: Constant dict used for with L{Particle.getVertGroup} and L{Particle.setVertGroup}
 		- DENSITY: VertexGroup affect to particles density
 		- VELOCITY: VertexGroup affect to particles velocity
 		- LENGHT: VertexGroup affect to particles lenght
@@ -106,7 +106,7 @@ def New(object):
 	"""
 	Create a new particle system applied to L{object}
 	@type object: string or L{Blender.Object.Object}
-	@param name: The name of an existing object.
+	@param object: The existing object to add the particle system to.
 	@rtype: L{Particle}
 	@return: a new Particle system.
 	"""
@@ -287,12 +287,12 @@ class Particle:
 	@type childKinkAmp: float
 	@ivar childBranch: Branch child paths from eachother
 	@type childBranch: int
-	@ivar childBranch: Animate branching
-	@type childBranch: int
-	@ivar childBranch: Start and end points are the same
-	@type childBranch: int
-	@ivar childBranch: Threshold of branching
-	@type childBranch: float
+	@ivar childBranchAnim: Animate branching
+	@type childBranchAnim: int
+	@ivar childBranchSymm: Start and end points are the same
+	@type childBranchSymm: int
+	@ivar childBranchThre: Threshold of branching
+	@type childBranchThre: float
 	"""
 	def getName():
 		"""
diff --git a/source/blender/python/api2_2x/doc/Texture.py b/source/blender/python/api2_2x/doc/Texture.py
index 3431dceb6cd..b9a65d3017a 100644
--- a/source/blender/python/api2_2x/doc/Texture.py
+++ b/source/blender/python/api2_2x/doc/Texture.py
@@ -394,7 +394,7 @@ class Texture:
 	The colorband can have between 1 and 31 colors.
 	@type colorband:  list
 	@ivar useColorband: Use colorband for this texture.
-	@type colorband: int
+	@type useColorband: int
 	@ivar autoRefresh: Refresh image on frame changes enabled.
 	@type autoRefresh:  boolean
 	"""

From bd5bab6b86163ddcd44bababee421b9dd4bf1b1e Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Mon, 31 Aug 2009 13:56:21 +0000
Subject: [PATCH 367/577] Win64: We need manifest if openmp is enabled

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1921ef65017..529d65b0dfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -377,7 +377,7 @@ IF(WIN32)
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
-    SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+    SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
     SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)

From dfef0746e49844c217d515f487886805e2ef4684 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Mon, 31 Aug 2009 14:25:39 +0000
Subject: [PATCH 368/577] Update MSVC project files.

---
 .../blender/BPY_python/BPY_python.vcproj            |  9 +++++----
 projectfiles_vc9/blender/blender.vcproj             | 10 +++++-----
 .../blender/blenkernel/BKE_blenkernel.vcproj        | 13 +++++++------
 projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj      | 12 ++++++------
 projectfiles_vc9/blender/loader/BLO_loader.vcproj   |  9 +++++----
 projectfiles_vc9/blender/nodes/nodes.vcproj         |  8 ++++----
 projectfiles_vc9/blender/src/BL_src.vcproj          |  4 ++--
 .../gameengine/blenderhook/KX_blenderhook.vcproj    |  4 ++--
 .../gameengine/converter/KX_converter.vcproj        | 13 +++++++------
 .../gameengine/expression/EXP_expressions.vcproj    | 12 ++++++------
 .../gameengine/gamelogic/SCA_GameLogic.vcproj       | 12 ++++++------
 .../gameengine/gameplayer/common/GP_common.vcproj   |  9 +++++----
 .../gameengine/gameplayer/ghost/GP_ghost.vcproj     |  4 ++--
 projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj | 13 +++++++------
 .../gameengine/ketsji/network/KX_network.vcproj     | 12 ++++++------
 .../PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj        | 12 ++++++------
 .../gameengine/rasterizer/RAS_rasterizer.vcproj     | 12 ++++++------
 .../gameengine/videotexture/TEX_Video.vcproj        |  4 ++--
 projectfiles_vc9/kernel/system/SYS_system.vcproj    |  5 +++--
 19 files changed, 92 insertions(+), 85 deletions(-)

diff --git a/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
index 55ef074178b..306bf4fecfd 100644
--- a/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
+++ b/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="BPY_python"
 	ProjectGUID="{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}"
+	RootNamespace="BPY_python"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -196,7 +197,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -273,7 +274,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/blender.vcproj b/projectfiles_vc9/blender/blender.vcproj
index df7e4ff8d06..80f39be2a59 100644
--- a/projectfiles_vc9/blender/blender.vcproj
+++ b/projectfiles_vc9/blender/blender.vcproj
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python25.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python25.lib pthreadVSE2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\blender.exe"
 				LinkIncremental="1"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.lib ..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.exp ..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\lib25_vs2008\python25.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVC2.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\bin\.blender\scripts /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\bin /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.lib ..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.exp ..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\lib25_vs2008\python25.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\bin\.blender\scripts /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\bin /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -168,12 +168,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;"
-				AdditionalDependencies="SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python25_d.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python26_d.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\debug\blender.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib\lib25_vs2008;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\ffmpeg\lib;..\..\..\build\msvc_9\libs\intern\debug;..\..\..\build\msvc_9\libs\extern\debug"
+				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib\lib26_vs2008;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\ffmpeg\lib;..\..\..\build\msvc_9\libs\intern\debug;..\..\..\build\msvc_9\libs\extern\debug"
 				IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, odbc32.lib, odbccp32.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\..\build\msvc_9\libs\debug\blender.pdb"
@@ -201,7 +201,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.lib ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.exp ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.ilk ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\lib25_vs2008\python25_d.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\debug\.blender\scripts MKDIR ..\..\bin\debug\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\bin\debug\.blender\scripts /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\bin\debug /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.lib ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.exp ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.ilk ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\lib26_vs2008\python26_d.dll ..\..\bin\debug&#x0D;&#x0A;COPY /Y ..\..\..\lib\windows\release\python26.zip ..\..\bin\debug\python26_d.zip&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVC2.dll ..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin\debug&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\debug\.blender\scripts MKDIR ..\..\bin\debug\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\bin\debug\.blender\scripts /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\bin\debug /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
index 3cc89a17f1e..197f4050d6f 100644
--- a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="BKE_blenkernel"
 	ProjectGUID="{CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}"
+	RootNamespace="BKE_blenkernel"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -192,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -267,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -342,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -417,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj b/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
index ed57fca060a..ec0b1dc4ec1 100644
--- a/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
+++ b/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -192,7 +192,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -267,7 +267,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -342,7 +342,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -417,7 +417,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/loader/BLO_loader.vcproj b/projectfiles_vc9/blender/loader/BLO_loader.vcproj
index 2b82599b643..acf2f047e25 100644
--- a/projectfiles_vc9/blender/loader/BLO_loader.vcproj
+++ b/projectfiles_vc9/blender/loader/BLO_loader.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="BLO_loader"
 	ProjectGUID="{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}"
+	RootNamespace="BLO_loader"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -117,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -192,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -342,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -417,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/nodes/nodes.vcproj b/projectfiles_vc9/blender/nodes/nodes.vcproj
index bdbc59a5b38..810c272cbda 100644
--- a/projectfiles_vc9/blender/nodes/nodes.vcproj
+++ b/projectfiles_vc9/blender/nodes/nodes.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -112,7 +112,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
@@ -182,7 +182,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_OPENEXR"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -252,7 +252,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2, WITH_OPENEXR"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/src/BL_src.vcproj b/projectfiles_vc9/blender/src/BL_src.vcproj
index 094fa805db2..ad8ccc4a94b 100644
--- a/projectfiles_vc9/blender/src/BL_src.vcproj
+++ b/projectfiles_vc9/blender/src/BL_src.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj b/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
index 8e027fd1854..6dda11b4dd4 100644
--- a/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
+++ b/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT;WITH_FFMPEG"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
diff --git a/projectfiles_vc9/gameengine/converter/KX_converter.vcproj b/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
index 4f5b34485cf..2de894a9518 100644
--- a/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
+++ b/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="KX_converter"
 	ProjectGUID="{F90BD995-FFA4-4B18-81E8-FA4322C939E8}"
+	RootNamespace="KX_converter"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -193,7 +194,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -268,7 +269,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -344,7 +345,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -419,7 +420,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj b/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
index a8b94c3f4a0..3f3476477eb 100644
--- a/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
+++ b/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
 				PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\SceneGraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj b/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
index e4d41824fb1..90706035649 100644
--- a/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
+++ b/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj b/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
index 69845ef8069..b28e1b42daf 100644
--- a/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
+++ b/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="GP_common"
 	ProjectGUID="{D8ABD6A5-1B36-4D62-934E-B5C6801130B0}"
+	RootNamespace="GP_common"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -117,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -191,7 +192,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -265,7 +266,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\Converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\GamePlayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\soundsystem\snd_dummy;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\Physics\Sumo;..\..\..\..\source\gameengine\Physics\common;..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 1a1d539af00..e6c559b0c56 100644
--- a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\blender\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\readblenfile;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Physics;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\Physics\Ode;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\gameplayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\gameplayer\common\windows;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\blender\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\readblenfile;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Physics;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\Physics\Ode;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\gameplayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\gameplayer\common\windows;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="WIN32,_CONSOLE,dSINGLE, _DEBUG;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -137,7 +137,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\blender\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\readblenfile;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Physics;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\Physics\Ode;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\gameplayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\gameplayer\common\windows;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\openal\include;..\..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\..\build\msvc_9\intern\iksolver\include;..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\blender\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\blenkernel;..\..\..\..\source\blender\makesdna;..\..\..\..\source\blender\blenloader;..\..\..\..\source\blender\readblenfile;..\..\..\..\source\blender\render\extern\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Physics;..\..\..\..\source\gameengine\network;..\..\..\..\source\gameengine\rasterizer;..\..\..\..\source\gameengine\converter;..\..\..\..\source\gameengine\gamelogic;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\scenegraph;..\..\..\..\source\gameengine\Physics\Ode;..\..\..\..\source\gameengine\soundsystem;..\..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\..\source\gameengine\gameplayer\common;..\..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\..\source\gameengine\gameplayer\common\windows;..\..\..\..\source\sumo\include;..\..\..\..\source\sumo\fuzzics\include;..\..\..\..\source\blender\gpu;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE;WITH_FFMPEG"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
index fb812c02f44..71dec8910d9 100644
--- a/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="KX_ketsji"
 	ProjectGUID="{E645CC32-4823-463E-82F0-46ADDE664018}"
+	RootNamespace="KX_ketsji"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -118,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -193,7 +194,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -269,7 +270,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -345,7 +346,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -421,7 +422,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj b/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
index fc197d0d1f4..c6edae137b7 100644
--- a/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
+++ b/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\ketsji;..\..\..\..\source\gameengine\Network;..\..\..\..\source\gameengine\expressions;..\..\..\..\source\gameengine\GameLogic;..\..\..\..\source\gameengine\Scenegraph"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj b/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
index 9f16283e1cd..a954b011994 100644
--- a/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
+++ b/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -110,7 +110,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -176,7 +176,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -243,7 +243,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -312,7 +312,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -380,7 +380,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\..\..\build\msvc_9\intern\SoundSystem\include;..\..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\gameengine\Ketsji;..\..\..\..\..\source\gameengine\Expressions;..\..\..\..\..\source\gameengine\GameLogic;..\..\..\..\..\source\gameengine\SceneGraph;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna;..\..\..\..\..\source\blender\blenkernel;..\..\..\..\..\source\blender\blenlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj b/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
index dde8714507a..52293b49519 100644
--- a/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
+++ b/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender\makesdna"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender\makesdna"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender\makesdna"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender\makesdna"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender\makesdna"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\SceneGraph;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\source\blender\makesdna"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj b/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
index a248e20481a..5a097668f62 100644
--- a/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
+++ b/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
 				StringPooling="false"
 				BasicRuntimeChecks="3"
@@ -113,7 +113,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/kernel/system/SYS_system.vcproj b/projectfiles_vc9/kernel/system/SYS_system.vcproj
index a666f1f0737..0366b1e403a 100644
--- a/projectfiles_vc9/kernel/system/SYS_system.vcproj
+++ b/projectfiles_vc9/kernel/system/SYS_system.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="SYS_system"
 	ProjectGUID="{BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}"
+	RootNamespace="SYS_system"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -117,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

From 0795d8237d95d1846b09f293d321af58ecb9dd4c Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Mon, 31 Aug 2009 15:28:43 +0000
Subject: [PATCH 369/577] BGE bug #18963: obj.sendMessage() with 4 arguments
 crashes Blender.

---
 source/gameengine/Ketsji/KX_GameObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index ba8905973d5..bfafce1dd40 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -2793,7 +2793,7 @@ KX_PYMETHODDEF_DOC_VARARGS(KX_GameObject, sendMessage,
 	char* to = (char *)"";
 	const STR_String& from = GetName();
 
-	if (!PyArg_ParseTuple(args, "s|sss:sendMessage", &subject, &body, &to))
+	if (!PyArg_ParseTuple(args, "s|ss:sendMessage", &subject, &body, &to))
 		return NULL;
 	
 	scene->GetNetworkScene()->SendMessage(to, from, subject, body);

From 0b968bcbd99b140c2d9d6fd231edb68172d4dfc8 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Mon, 31 Aug 2009 15:54:56 +0000
Subject: [PATCH 370/577] BGE bug #19020: The GE Torque actuator x -& y-axis do
 not work in 2.49a (winxp)

---
 source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 20e830c9dc3..7f84b06cc3c 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1073,7 +1073,7 @@ void		CcdPhysicsController::ApplyTorque(float torqueX,float torqueY,float torque
 				//workaround for incompatibility between 'DYNAMIC' game object, and angular factor
 				//a DYNAMIC object has some inconsistency: it has no angular effect due to collisions, but still has torque
 				const btVector3& angFac = body->getAngularFactor();
-				btVector3 tmpFac(0,0,1);
+				btVector3 tmpFac(1,1,1);
 				body->setAngularFactor(tmpFac);
 				body->applyTorque(torque);
 				body->setAngularFactor(angFac);

From 8b18843b98b300a14558f5b04c8bf995f8973da0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 31 Aug 2009 16:36:02 +0000
Subject: [PATCH 371/577] remove "_amount" from rna names, its not helpful.

---
 release/ui/buttons_physics_fluid.py           | 4 ++--
 release/ui/buttons_texture.py                 | 2 +-
 source/blender/makesrna/intern/rna_fluidsim.c | 2 +-
 source/blender/makesrna/intern/rna_texture.c  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py
index fe15e22f0b9..6f7a97ff793 100644
--- a/release/ui/buttons_physics_fluid.py
+++ b/release/ui/buttons_physics_fluid.py
@@ -94,7 +94,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel):
 				col.itemL(text="Slip Type:")
 				col.itemR(fluid, "slip_type", text="")
 				if fluid.slip_type == 'PARTIALSLIP':
-					col.itemR(fluid, "partial_slip_amount", slider=True, text="Amount")
+					col.itemR(fluid, "partial_slip_factor", slider=True, text="Amount")
 					
 				col.itemL(text="Impact:")
 				col.itemR(fluid, "impact_factor", text="Factor")
@@ -228,7 +228,7 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel):
 		sub = col.column(align=True)
 		sub.itemR(fluid, "slip_type", text="")
 		if fluid.slip_type == 'PARTIALSLIP':
-			sub.itemR(fluid, "partial_slip_amount", slider=True, text="Amount")
+			sub.itemR(fluid, "partial_slip_factor", slider=True, text="Amount")
 
 		col = split.column()
 		col.itemL(text="Surface:")
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index ad0542d787a..ee3f85e15ef 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -609,7 +609,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel):
 		layout.itemR(tex, "noise_basis", text="Basis")
 		
 		flow = layout.column_flow()
-		flow.itemR(tex, "distortion_amount", text="Distortion")
+		flow.itemR(tex, "distortion", text="Distortion")
 		flow.itemR(tex, "noise_size", text="Size")
 		flow.itemR(tex, "nabla")	
 		
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
index 936e1700ed7..dda21f63528 100644
--- a/source/blender/makesrna/intern/rna_fluidsim.c
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -162,7 +162,7 @@ static void rna_def_fluidsim_slip(StructRNA *srna)
 	RNA_def_property_enum_items(prop, slip_items);
 	RNA_def_property_ui_text(prop, "Slip Type", "");
 
-	prop= RNA_def_property(srna, "partial_slip_amount", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "partial_slip_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "partSlipValue");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Partial Slip Amount", "Amount of mixing between no- and free-slip, 0 is no slip and 1 is free slip.");
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index f899d52543e..6de0be9b19c 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -1293,7 +1293,7 @@ static void rna_def_texture_distorted_noise(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Distorted Noise", "Procedural distorted noise texture.");
 	RNA_def_struct_sdna(srna, "Tex");
 
-	prop= RNA_def_property(srna, "distortion_amount", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "distortion", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "dist_amount");
 	RNA_def_property_range(prop, 0, 10);
 	RNA_def_property_ui_text(prop, "Distortion Amount", "");

From 7fccc53fc671aaa3e1e7b7d7e923f197792dc563 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Mon, 31 Aug 2009 17:00:03 +0000
Subject: [PATCH 372/577] More MSVC project file update (don't propagate those
 changes to 2.5).

---
 projectfiles_vc9/blender/blender.vcproj              |  6 +++---
 .../gameengine/gameplayer/ghost/GP_ghost.vcproj      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/projectfiles_vc9/blender/blender.vcproj b/projectfiles_vc9/blender/blender.vcproj
index 80f39be2a59..0ffbcd9aa67 100644
--- a/projectfiles_vc9/blender/blender.vcproj
+++ b/projectfiles_vc9/blender/blender.vcproj
@@ -73,12 +73,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python25.lib pthreadVSE2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python26.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\blender.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib\lib25_vs2008;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_9\libs\intern;..\..\..\build\msvc_9\libs\extern;..\..\..\lib\windows\ffmpeg\lib"
+				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib\lib26_vs2008;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_9\libs\intern;..\..\..\build\msvc_9\libs\extern;..\..\..\lib\windows\ffmpeg\lib"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="msvcprt.lib;glut32.lib;libc.lib;libcd.lib;libcpd.lib;libcp.lib;libcmtd.lib;odbc32.lib;odbccp32.lib"
 				GenerateDebugInformation="true"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.lib ..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.exp ..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\lib25_vs2008\python25.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\bin\.blender\scripts /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\bin /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.lib ..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\bin\blender.exp ..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\lib26_vs2008\python26.dll ..\..\bin&#x0D;&#x0A;COPY /Y ..\..\..\lib\windows\release\python26.zip ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\bin\.blender\scripts /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\bin /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
diff --git a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
index e6c559b0c56..6d4ad962bfe 100644
--- a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -72,12 +72,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;"
-				AdditionalDependencies="odelib.lib fmodvc.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVC2.lib Half_d.lib Iex_d.lib IlmImf_d.lib IlmThread_d.lib Imath_d.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+				AdditionalDependencies="odelib.lib fmodvc.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python26_d.lib pthreadVC2.lib Half_d.lib Iex_d.lib IlmImf_d.lib IlmThread_d.lib Imath_d.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
 				ShowProgress="0"
 				OutputFile="..\..\..\..\bin\debug\blenderplayer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\..\..\lib\windows\python\lib\lib25_vs2008;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
+				AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\..\..\lib\windows\python\lib\lib26_vs2008;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;msvcrtd.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\..\..\..\build\msvc_9\libs\debug\blenderplayer.pdb"
@@ -105,7 +105,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\debug\blenderplayer.lib ..\..\..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\debug\blenderplayer.exp ..\..\..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\debug\blenderplayer.ilk ..\..\..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\lib25_vs2003\python25_d.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\..\bin\debug&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\debug\blenderplayer.lib ..\..\..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\debug\blenderplayer.exp ..\..\..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\debug\blenderplayer.ilk ..\..\..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\lib26_vs2008\python26_d.dll ..\..\..\..\bin\debug&#x0D;&#x0A;COPY /Y ..\..\..\..\..\lib\windows\release\python26.zip ..\..\..\..\bin\debug\python26_d.zip&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\..\bin\debug&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\..\bin\debug&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -166,11 +166,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odelib.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python25.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+				AdditionalDependencies="odelib.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python26.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
 				OutputFile="..\..\..\..\bin\blenderplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\..\..\lib\windows\python\lib\lib25_vs2008;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
+				AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\..\..\lib\windows\python\lib\lib26_vs2008;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
 				IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\..\..\..\build\msvc_9\libs\blenderplayer.pdb"
@@ -198,7 +198,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\blenderplayer.lib ..\..\..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\blenderplayer.exp ..\..\..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\lib25_vs2003\python25.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\..\bin&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\blenderplayer.lib ..\..\..\..\..\build\msvc_9\libs&#x0D;&#x0A;MOVE /Y ..\..\..\..\bin\blenderplayer.exp ..\..\..\..\..\build\msvc_9\libs&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\lib26_vs2008\python26.dll ..\..\..\..\bin&#x0D;&#x0A;COPY /Y ..\..\..\..\..\lib\windows\release\python26.zip ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin&#x0D;&#x0A;XCOPY /Y ..\..\..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\..\bin&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>

From 15f81f4b03692691cee123e9094c92378658d8bb Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Mon, 31 Aug 2009 18:16:18 +0000
Subject: [PATCH 373/577] Part 1 of the 2.49b commit

---
 release/VERSION              |   2 +-
 release/datafiles/splash.jpg | Bin 197158 -> 197165 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/VERSION b/release/VERSION
index 3046e7afa7d..1ec4cde4e46 100644
--- a/release/VERSION
+++ b/release/VERSION
@@ -1 +1 @@
-2.49a
+2.49b
diff --git a/release/datafiles/splash.jpg b/release/datafiles/splash.jpg
index 1c34cf36f75901d09ac606101f999812254cdf48..e35a26a2c2360539cccc052fa07e00363e7dce74 100644
GIT binary patch
delta 190714
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

delta 190686
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
GLSTYx{Ck@K


From 959757c2d7bdfe7955e2c645a511ac450a607c47 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Mon, 31 Aug 2009 18:17:06 +0000
Subject: [PATCH 374/577] Part 2 of the 2.49b commit. We now should freeze and
 tag!

---
 source/blender/src/splash.jpg.c | 12322 +++++++++++++++---------------
 1 file changed, 6161 insertions(+), 6161 deletions(-)

diff --git a/source/blender/src/splash.jpg.c b/source/blender/src/splash.jpg.c
index 547b23b40db..58dba6b1c4c 100644
--- a/source/blender/src/splash.jpg.c
+++ b/source/blender/src/splash.jpg.c
@@ -1,6167 +1,6167 @@
 /* DataToC output of file <splash_jpg> */
 
-int datatoc_splash_jpg_size= 197158;
+int datatoc_splash_jpg_size= 197165;
 char datatoc_splash_jpg[]= {
-137, 80, 78, 71, 13, 10,
- 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,  0,  0,  1,245,  0,  0,  1, 26,  8,  2,  0,  0,  0,135, 56, 89, 17,  0,  0,  0,  9,112,
- 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  4,103, 65, 77, 65,  0,  0,174,211,164,123,114, 68,
-  0,  0,  0, 32, 99, 72, 82, 77,  0,  0,110, 39,  0,  0,115,175,  0,  0,246,112,  0,  0,129,232,  0,  0,107,215,  0,  0,226,170,
-  0,  0, 48,131,  0,  0, 21, 42,251,118,133,113,  0,  3,  1,156, 73, 68, 65, 84,120,218, 98,252,255,255, 63,195, 40, 24,  5,163,
- 96, 20,140,130, 97,  7,  0,  2,136,133,138,102,253,249,249,253,223,203,235,127, 63, 63, 99,150, 50,102, 19,148, 28, 13,220, 81,
- 48, 10, 70,193, 40, 24, 64,  0, 16, 64,140,212,106,191,255,249,241,237,247,230,124,150,143, 55,128,236,255, 12,204,127, 52, 35,
-217,204, 18, 89, 88,217, 70,131,120, 20,140,130, 81, 48, 10,  6,  4,  0,  4, 16, 19,181, 12,250,255,242, 26,164,112,  7, 85, 26,
- 12,127, 89,174, 45,249,190,171,121, 52,124, 71,193, 40, 24,  5,163, 96,160,  0, 64,  0, 81,173,124,255, 39,168,248,155,153,  7,
-216, 25,  0, 35, 16,193,246,116,255,151,205,165,127,190,127, 30, 13,229, 81, 48, 10, 70,193, 40,160, 63,  0,  8, 32, 70, 42,206,
-175,254,120,126,243,239,193, 54,150, 79,119, 17,141,122,  6,134,191,156,162, 76,206,237,156, 82, 26,163, 97, 61, 10, 70,193, 40,
- 24,  5,244,  4,  0,  1,196, 72,245,245, 51,159,143,205, 99,189, 50,159,225,255, 63, 68,211,158,145,229,183,106, 16,183, 69, 50,
- 11, 39,207,104,136,143,130, 81, 48, 10, 70,  1,125,  0, 64,  0, 49,210, 98,125,228,143, 59,135,255,238,111, 96,250,247,  3,218,
-134,  7,227, 63,156, 18, 44,110,237,156,146,234,163,129, 62, 10, 70,193, 40, 24,  5,116,  0,  0,  1,196, 72,163,245,239,223, 95,
-221,251,191,187,138,225,243, 35,132,208,127,134,191, 76,236, 76, 86, 37,220,186,222,163,225, 62, 10, 70,193, 40, 24,  5,180,  6,
-  0,  1, 68, 84,249,254,237,195,235, 63,119, 14,253,120,126,249,255,159, 95,196, 27,205,252,235, 51,215,251,179,176, 38, 60,130,
-248, 99, 90,194,111, 18, 60, 26,244,163, 96, 20,140,130, 81,  0,  7,255,254,253,251,254,253,251, 71, 48,  0, 50, 88, 88, 88,254,
-252,249,195,205,205, 45, 36, 36,244,245,235, 87, 70, 70,198, 31, 63,126,124,251,246, 13, 82, 98, 75, 72, 72,  8, 11, 11,179,179,
-179,227, 55, 19, 32,128,  8,151,239, 31, 46,237, 96, 58,209,195,252,247, 27, 68, 61,156, 96, 64,110,153, 99, 99,162,  9, 33,217,
-243,255,175, 94, 18,191, 77,218,104,140,142,130, 81, 48, 10, 70,  1, 16,  0,203,244,135, 15, 31,242,241,241,241,242,242,242,240,
-240,176,177,177,  1, 11,244,143, 31, 63, 29, 63,126, 76, 89, 89, 89, 76, 76,140,131,131,131,133,133, 21, 40,200,196,196,248,239,
-223,255, 47, 95,190, 60,124,248,  0, 88,244, 75, 73, 73,  1,  5,113, 25, 11, 16, 64,  4,202,247, 95, 63,127,124, 91,224,203,242,
-247, 43,  3, 35,169, 14,254,143, 89,214,255, 71,106,201,255,145, 48,231,245,106, 97,225,228, 29,141, 90,234,  2,120,132,226,137,
-245,145,224,134, 81, 48, 10,134, 74,179,253,237,219,183, 79,158, 60, 49, 48, 48,  0,230, 23, 96,217,253,251,207,223,175,223,126,
-222,185,255,114,223,190,189, 26,106, 10,110, 46,118,236,108,172, 64,193,191,255,254,255,252,249,231,219,143, 95, 63,126,254,225,
-229, 98, 23, 18,228,190,127,239,174,176,176, 16,176, 33,143,203,112,128,  0, 98, 33, 42,183, 34, 10,107,244,236,202,136,209,110,
-255,143,213,  0,140,246, 60,243,243, 19,159,151,199, 50, 59,212,240, 41,153,140,198, 49,229,229, 41, 16,124,248,250,227,194,131,
-215,144,178, 85, 79, 78, 88,128,155,131,  9, 88,215,195,  0, 29,138,111,136, 51, 46, 60,120,245,225,235, 79, 32,131,166,110, 24,
-  5,163, 96, 24,128, 63,127,254, 60,120,240,128,149,149, 85, 87, 87, 23,152, 65,158,191,250,120,227,206,139,  7,143,223, 60,124,
-244,252,209,131, 91, 92, 60,  2,191,152,127, 10,  8, 63,248,249,235,239,171,183,159,190,125,255,245,251,247,223, 63,192, 98,254,
-255,127, 54, 86, 22, 89, 25, 17,  1,142,239,114,114,114,120,204,  7,  8, 32,194,227, 51,223, 30, 95,250,115,105,197,175,175, 31,
-153, 88, 89,177, 20,240,159,158,177,124,125,140,117,180,230, 55,155,240,127,  1, 57, 14,126,201,127,191, 62,253,120,243,148,237,
-219, 35,198,255,127,224,101, 61,220,214,127,186, 73,130,246,233,104,166, 94,186,241, 96,235,249,187, 14,186,138,198,106,178,108,
-108,172, 67, 40,182,110, 61,120,190,243,226,125, 75, 85,105, 11, 61,101,186,213,255,139, 14, 93,155,186,235,226,165, 71,111,145,
-197,229,132,121, 34,173,212,178, 93,245,132,120, 57,153,153,153,169, 82,194, 66,138,239,210,165, 71, 58, 35,173,244,229, 69,153,
-192,  0, 34, 14,172, 93, 74,150, 28,222,124,238,222,199,111,191,144,221,144,238,172,147,235,174, 15,116,  0, 92,241, 40, 24,  5,
-163,  0,152,101,222,189,123,247,250,245,107,110,110,110, 89, 89, 89, 96,153,125,226,236,189,157,  7, 46,189,127,243,250,243,231,
-215, 92,220,252, 95, 62,127,144, 85,212,178, 50, 86, 97, 98,102,190,126,251, 57,166,  9,192,220,244,246,213, 51, 39, 71, 43, 27,
- 19,  5, 22, 22,236, 57, 11, 32,128, 40, 90, 63,243,238,236, 70,166, 83,253, 76,255,126, 34, 23,237,255, 25,152,126, 75,219,115,
- 24,132,115,202,232, 48,179, 32,250,  7,127,190,127,249,126,125,231,239,115, 11,152,127,188,130,171,133,216,253, 95, 59, 86,208,
- 41, 23,217,228,221, 71, 47,120, 78,218,  1, 84, 35,192,198,116,170, 45, 86, 73,142,192,105,101,249,147, 86,223,253,  8,114,134,
-151,158, 98,150,191,245,128, 68,216,179, 23,175,108,107,150, 62,253,250, 27, 88,  7,206,138,177,143,243, 50,167,138,177,223,190,
-255,216,126,241,  1,144, 33,203,207, 97,166,169,112,238,230, 35, 35,117, 68,141,253,254,203,119,183,182,245,151, 30,189,193,165,
-157,143,147,109, 83,145,151,145,146, 56, 11, 48,  9,128,155,210,148, 56,230,222,203, 15, 22,181, 43,128, 37,248,166, 34, 79,123,
- 45, 89,160,153,192,130, 27, 40, 14, 44,244,221,219,215, 35,151,236,200, 64, 71, 70,104,115,177,183,  8, 63, 55,196, 13,163,121,
-123, 20,140,240,146,253, 45, 24,176,177,177,  1, 73,126,126,254, 63,127,254,157,188,240,224,232,241,211,156,236,156,255, 25, 25,
-248,248,132,128,170, 24,153, 89,228, 36,249,213,212,213, 46, 93,127,241,247,239, 95,244,130, 27, 12, 94,191,122, 42, 38, 38,157,
- 20, 97,205,195,141,125,162, 21, 32,128,200, 60, 63,242,231,151, 15, 95,143,204, 96,190,179,  1,109, 64,230, 55,135,  4,139,117,
-177,136,166, 45, 22,155, 56,121,120,141,130,255,104,186,127, 62, 56,137,241,246,  6,148,246,254,149,197,159,132,228,248, 12,252,
- 81,  4,193,133,255,135, 95,127,127,252, 36,188,104,231,196,205,167,103, 94,129,102,128, 21,  5,  7,108, 64,255,223,191,255, 79,
-128,133, 59,246, 33, 42,242,  1, 23, 39,135, 36,203, 95, 96, 92, 78,221,124,156,155,153,177,107,193,246, 21,237, 25,240,132, 18,
- 58, 97, 43,114,225,174, 41,201,207,199,201,250,233,251,239,235,207, 63, 66,251, 87,223,127,249,245,109,219, 80,224,110,162, 34,
-  5, 47,142,201,  3,192,186, 36,124,226, 86, 72, 33,254,235, 23,176,171,248, 27, 98,218,131,215, 31,145, 11,119, 62, 14, 86, 77,
- 41,126, 32,227,228, 61,168,195,174, 60,121,231,211,179,229, 96, 77,  0, 40, 25,140, 22,241,195, 11,124,249,250,243,238,253,215,
-112,174,178,162, 40,176,172,217,181,239,218,177, 83,119,173,204,148,221,156,180, 72, 50,141, 72,141,104,150, 74,136,241,137,139,
-241,145,231,254,187, 15, 94, 47, 94,113,162,161,194, 23,191, 93,250, 58, 50,212, 10,177,  7, 15, 30,  0,179,143,146,146, 18, 48,
- 47,112,115,113,223,186,125,107,253,150,163, 60,252, 18,146,114, 26,192,252,241,255, 31,168,248,224,229,227, 84,146,224,224,224,
-226,218,176,105,167,172,130, 38, 19, 19, 51,184, 76,135,244,128,255,255,254,253,243,199,143,111,111, 95, 61, 23, 17,147,150,145,
- 20,192, 85,184,  3,  1, 64,  0,145, 83,190,127,123,245,240,235,166, 34,182, 31, 79,209,196,127,113,201,243,  4, 77,229, 20, 16,
-129,150,245,191,127,239, 61,121,109,203,165,251,130,220,156,206, 26,210,214, 70,234,172,172,172,192, 82, 94,208,163,234,237,215,
-183,204,207, 14, 51, 32,141,204,255, 62, 54,225,151,134, 43, 27,  7,215, 80,175,155, 25, 24,168, 63,202,204,195,195, 13, 36,181,
-100,132, 22,108, 59,166, 41,129,168,192,128,  5,235,225, 27,207, 32,108,115, 37,145,206, 96, 35, 57, 17, 94,200, 80, 12,176,180,
-109,220,120,110,205,153,135,144, 34,190,115,243,185, 37, 89,194,224,201,119, 50,155,240,255,254,253, 75,153,181,  7, 62,  4,244,
-231,207, 95,160,  8,100,192,189,100,201, 97,120,225,158,235,172,145,239,162,  9, 25,141,  1, 86, 51,115, 15,221,156,176,251, 26,
- 80,252,234,211,247,109, 27,207,212,  4,154,193,135,227, 71, 75,198,225,  1,128,101, 95, 67,199, 38, 68, 90,229,102, 47,201,117,
-255,242,237,231,197, 43,143,245, 72, 47, 19,137,212,  8,177, 84, 95, 71, 22,194, 37,163, 34, 65,216,248,  5,100, 35,166,248,186,
- 45,231, 47, 93,121,  2, 44,247, 33,118,173, 95,146, 69,149,150,251,163, 71,160, 45, 65,106,106,106,192, 44,240,225,195,167,109,
-219,182,187,123,122, 91,218,114, 94,185,245, 76,132,159, 75, 84,136, 71, 94, 86, 68, 86, 74, 72, 12,152,145,153,152,158, 60,121,
-250,248,169,230,227,167,207,249,248,133,254,254,253,  3, 90,237,242,229,211,175, 95, 63,216, 56, 56,129, 36,232,156, 94, 22, 38,
-125, 29,124,227,239,  0,  1, 68,114,249,254,233,206,201,159,123, 27, 89,126,189,133,159, 63,  0,201,169,255,152, 56,184,220, 26,
-224,133,251,142,227,151,171,150, 29,188,250,250, 43,164,204,235,220,126, 65, 73,248, 64, 95,180,189,151,149, 46, 80,132,223,179,
-238,203,202,184,255,159,159,195, 87,212, 48,254,254,242,253,226,  6, 54,243, 40,244,226, 18, 44,255,236,229,155, 77, 39,110, 60,
-124,253,241,195,247, 63,192, 48,146, 17,226,246, 48, 86, 53,209, 84, 64, 81,248,255, 63, 90,211,249,205,187,143,107, 14, 94,220,
-113,249,193,213,  7,175,222,126,251,197,201,194,172, 32,193,239,162,167,152,236,106, 44, 39, 41,130,203,131,251,207, 92,223,116,
-234,214,201,187,207, 56,216,217, 12, 20, 36,  2,205, 84,109, 13,212,208,212,220,188,247,116,221,137,235, 79,222,125,251,241,239,
-191, 32, 59,179,162,164,160,135,129, 18, 59, 11, 19,  3,194,  9,  8,135,188,251,240,105,241,222, 11,155,207,220,186,251,242,227,
-151, 95,127,217,153,153,100,132,185,237,117,149, 18,157, 13, 52,228,196,177,186,225,240,133, 91,221, 27,142,223,124,242,  6, 24,
-201,103,102, 22,114,115,178,255,255,255, 79, 78,148,159,143,157, 77,150,159,  3,174, 76, 78,152,247,112, 93,144,119,247, 22, 55,
-109,169,238, 48, 19, 96,115,  0, 84,131,130, 27,200, 92, 92,255,166,196,219,157,184,183,238,201, 59, 80, 20,236,188,242,244,205,
-199, 47,146,172,172,204, 96, 64, 70,186, 44, 89,114,104,203,185,251,136,226,254, 63,180,112,191,255,234, 35, 92, 60,200, 72,182,
-192, 85,139,157,157, 29,216,241,  4,218,194,195,195, 80,233,111,242,236,227,143, 85,167,238,  1,101,231, 28,188, 81,234,  5, 29,
-136, 31, 45,223,135, 31,104,168,240,155, 62,239,192,203, 87,159,128, 45, 98,204, 38, 57,164,105, 31,232, 99,120,236,228, 93, 96,
- 33, 14, 26,235,187,255, 26,216, 52,118,115,212,178, 50, 87,  6,106, 89,191,249, 60,144,251,229,235, 15,252, 26,149, 21, 68,129,
-138, 25,161, 54,250,162, 41,  6,214, 46,174,142, 90,192,230,252,209, 83,119,131,124, 12, 33,226,192,166, 61, 68,  4,200,  5, 22,
-217, 64,110,102,146, 61,208,174, 93,251,175,  1,185,112, 19, 22,175, 60,  1,233, 19,  0,107, 23,160, 94,160,212,139, 87, 31,129,
-165, 60, 15, 23,123,108,132, 37, 80,252,226,149, 39,187,247, 95,  3,106,132, 84, 39, 64,147,129,238,129,248,  2,232, 60, 98, 26,
-248,207,159, 63,255,251,247,175,162,162, 34, 48,253,191,123,247,121,203,230,205, 22,150,182, 92,156, 60, 62, 46,122,198,186,114,
-194, 66, 60,156,236,108,192, 60,138,200,224,114, 50,  1, 30, 44,187, 15,177,158, 61,127,233,223,191,191,156,156,188, 28,220,220,
-188,  2,194,156, 92, 60,204,204, 44, 64, 67,190,125,122, 46,196,139,175, 12,  7,  8, 32,210,202,247,183, 71, 23, 49,156,155,197,
-252,255,247,127,120,201,206,  8, 45,201,254,233,196,112,203,104, 66,148,205,219,124, 36,119,217,209, 63,255, 81,230, 82,239,189,
-249, 18, 48,113,107,223,235, 15, 57,254,182, 44, 92,252, 76,214,229,127,182,231, 35,183,123,127,156, 91,204,143, 92,190,195,116,
- 55,175, 60,184,229,234,211,111,127,144,202,205,255, 12,245, 27, 78,133,153, 40,205,206, 13,224,225,230,100,192, 54, 38,178,225,
-224,185,180, 57,187,223,124,255,  3, 23,249,240,231,207,139,  7,111, 79, 60,120,219,189,229,108,178,163,118,103,130, 59, 23, 39,
-199,149, 91,143,138,151,236,131, 40,200,182,215,156,184,227,252,193,  7,239,224, 21,215,161, 59, 47, 39,237,185, 20,107,174, 50,
- 51, 55,  0, 50,205,251,237,251,143,210,153,155,231,159,184,251,231, 63, 74, 83,189,112,233,225, 72,  3, 89, 72,117,196,136,228,
-156, 61,167,174,166,204,218,249,252, 11,210, 16,211,159,127,175,159,125, 60,255,236,252,148, 93,231,107,253, 76, 43, 34,157,129,
- 98,215,110, 63,154,180,227, 60, 68,222, 68,134,175,120,245,201,239,127, 65, 70,136,177,130,134, 50,148,229, 65,211, 15, 42, 10,
-210,152, 99,112,  6, 10, 98,155,138, 60, 37,249,216, 57, 57,217,129, 37, 59,164, 96,133, 53,177,255,120,235,203,207,220,127, 13,
-194,189,244,232,141,168,  0, 47, 43, 43, 43, 25,133,251,194,131, 87,167,238,186,132, 85,118,211, 89,196,113,114,121,206,154, 64,
-  7,112,112,112,192,157,  1, 76,205, 21,126,198,144,242, 29,216,156,223,114,254, 65,144,185,218,232, 16,205,240,108,200, 63,120,
-253,245, 43,168,224,134, 20,193,240, 66,115,221,230,115,144,193, 19, 96, 51, 25, 88,250,  3, 75, 67,228,246, 50,144, 61, 67, 49,
-166,161,125, 19, 80, 28, 88,142,127,249,250,147, 24,141,174, 14, 90,144,  2, 23,194,  5,202, 46, 94,121, 60, 54,220, 18, 88,224,
-  2,219,218,  5,153, 46,139, 87, 28,135,148,239,192, 66, 31,210, 27,  0,137,248, 26,  1,171, 19, 96, 37,  4,113,225,221,251,175,
-130,124,140,128, 12,136,177,144,202,  6,200,  0, 42,  0,150,233,112, 23,  2,221, 48,189, 99,147,181,153, 50,208,100, 96, 65, 15,
-148,  2,218,  5, 49, 25, 88,  1,196,133, 91, 94,188,250,  4,168,101, 70, 95, 12,254,240,249,241,227,199,151, 47, 95,128, 45,119,
- 96,201,241,225,227,247,189,123,246,106,104,104,  9,139,138,  3,115,  3,  7, 59,171,162,156, 40,214,172,247,239,239, 95, 29, 85,
- 33,  6, 70,147, 55, 31,190,113,114,112,178,179, 51,179,179,177,240,114,177, 11, 10,112,241,242,112,178,177,168, 61,125,250,148,
-143,143, 23, 87,163, 13, 32,128,136, 45,223,255,124,255,252,102,107, 51,235,179,  3,200, 99, 16,240,214,234, 95,102, 94, 94,195,
- 16,136,202,107,119, 30, 23, 44, 63,250,251,223,127,140,129, 11, 16, 40, 91,126,196,217, 80, 77, 83, 78,156, 79,205,234,205,  9,
-117,198,247, 55,225,  6,177,252,124,253,245,209,101,110, 57, 93, 84, 61,255, 87, 93,124,140,106,  6, 20,172, 58,115,239, 85,219,
-242,189,173, 73,152,174,221,114,248, 66,228,212,237, 63, 65,110, 96,100,103, 98,140,183, 86, 51, 82,149,254,246,227,215,154, 99,
- 55,142, 61,120,  3, 20,159,182,247,202,155, 79,223,151,151, 71,124,250,246,115,207,181,167, 16,255,156,186,253,252,211,159,127,
-140, 12,140, 98,236,192, 70, 38,227,115,104,221,240,127,241,201,219,156,140,235,166, 21,133,  3, 57,153, 19,214, 46, 59, 15, 63,
-116,225, 63,114, 51,116,249,  5,136, 56, 35,220,153,199, 47,221,  9,155,180,245,235,239,127,224, 81,105,230, 76,  7, 29, 69, 25,
-145,175,223,126,110, 63,123,103,207,205,231,127,192,181,148,  0, 47, 87,134,143,229,235,119, 31,230, 31,185,  6,209,184,140,137,
-241,199,223,127, 88,189,140, 89,190,  3,227,213, 88, 89, 18, 88,140, 66,216,144,214, 49, 92, 86,128,135,  3,121,122,  0, 14,136,
-111, 62, 67, 22,204,164,207,217,135, 75,246,  8,108,128, 72, 90,144, 75, 78,132,151, 13, 12,128,181,  8,196, 25, 64, 82, 69, 82,
- 72, 86,152,231,241,219, 47,160,  0,185,253,194,207, 88,  9,232, 90,200, 32,210,104,153, 56,156,  0,176,  0,133, 23,244, 72,205,
-234,171, 64,210,218, 92,  5, 52,226,177,249,220,209,147,119, 32,131, 42,153, 73, 14,192,102,123, 73,237,106, 96,209, 12,108, 89,
-  3,203, 86,160,154,146, 92, 55, 96,123, 25, 98, 14, 46,141,192, 18, 22, 88, 58,127,248,248,109,247,129,107,235,183,156,135, 91,
-228,230,164, 13, 25,162, 57,118,242,206,213,235,207,176,186, 48, 54,220,  2,100,242,126, 80,187, 27,168, 12, 88, 31,  0,221,192,
-205,205, 14, 52, 31, 50,200,115,233,234, 19, 72, 19, 30,168,  0, 84, 43, 92, 97,  0, 86, 18,144, 90,  4,232, 72, 96,245,  3,169,
- 51, 94,190,254,  4,233, 88,  0, 45,133,152,  0,113, 45,126,112,251,246,109, 89, 89, 89, 72, 69,178,103,239, 30,126,126,126, 57,
-  5,101,118, 86,102, 46, 46,156, 77,174, 47,159, 63,127,253,250, 85, 94, 94, 86, 67,147,247,193,227,183,192, 86,211,207, 95,127,
-190,127,251,253,233,235,143, 79,159,127,188,125,247, 21,216,  8, 20,230,251,251,236,217, 51, 25, 25, 25,172, 25, 10, 32,128,136,
- 42,223,191, 62,190,250,121, 71, 45,203,183, 39,240,102, 59,122,225, 45,166,195,193, 39,  8, 97, 47,216,119,  1, 81, 60,161, 15,
-180, 48,  0, 91,254, 51,183,159,158,144,238,  3, 50, 71,222,238,255,187, 27, 40, 85,220,211,139,176,242,253, 63,242,102,168, 24,
- 51,165, 66, 31,115,  5, 41,225,223,127,254,158,190,253,172,124,201,129,171, 47, 63,128,198, 82,110, 62, 91,115,232, 66,136,157,
-  1, 82, 89,248,255,231,207, 95,213, 75, 15,252,132, 86, 48,255,235,253,140, 43, 98, 60, 32,230,231,248, 89, 59, 87,205, 59,124,
-239, 21,208, 11,171, 78,223, 73, 63,123,131, 13, 82,239,129,213,126,250,253,207, 65, 73,164, 38,204,206,214, 64, 21,216,198,220,
-118,236,138, 95,255, 38,136,236,146, 83,247,250,126,252, 60,113,245,254,178,243, 15,161,243, 72,  2, 92,221, 49,246,198,106,210,
-188,220, 92, 79, 94,189,159,186,227,236,172,131,215, 81,154,238, 12, 12,213, 75,246,126,249, 13,154,248,102,101,100, 92, 91,224,
-103,103,  8, 61, 91, 45,199,223, 38,162, 99,197,186,243,160, 97,141,170, 21,135,162, 29,244, 25,144, 22,149,255,248,251, 63, 88,
- 95,182, 60,208, 90, 78, 82,  8,127, 33,  8, 31, 79,135, 47,127, 68, 83, 15, 41, 85,225,229, 47,164,112, 39, 41,211,222,127,  5,
-154, 59,133,176, 53, 37,249,225,211,182,240,242,253,195, 55,104,131, 75, 70,128,139, 25,  6,224,117, 12,144,  1,228,202,193,202,
-247,171,207, 62,  0, 11,119, 82,235,152, 81, 48, 36,192,250, 37, 89,187,246, 93,  3,182,100,129,  5, 52,100, 64,  3, 82,150, 65,
-134,203,129, 36,124,184, 28,210, 40,230,225,102,151, 16,227,  7,150,239, 16, 17, 37, 69,148,  6, 44, 46,141,192,194, 93, 95, 71,
-  6, 82,230,194,199,103, 26, 58, 54,115,195,230, 24,121,184, 57,136, 26,118,255,250, 19,121, 74,246,216,201,187,221,147,119,  2,
- 27,248,129, 62,134,144,230, 57,150,105, 48,152,201,220,220,236,164,  6, 14, 36,217,115,113,113,253,248,249,231,204,153,179,191,
-127,124, 55,178,119,  2,230, 90, 62, 62, 14, 60, 90, 94,189,126,253,235,247,111, 97, 97,225,119, 31,190, 61,120,242,246,227,167,
-239,127,254,252, 67,148, 48,224,130,248, 31,  3,247,159,219,247, 69, 68, 68, 56, 57, 57, 49, 13,  1,  8, 32,194,229,251,155, 83,
-235,254,158,232,103,254,247,  3,169,112, 71,202,153, 96, 38,139,  0, 98, 40,252,244,189, 23,200,187,157, 48,139,147,211,183,161,
-237, 95, 86, 65,201, 95,168, 42,152, 62,191,196,104,241, 51,184,169, 75,204, 45, 10,101,129, 45,181,244, 18, 17,210,146, 23, 87,
-207,159,  9,110, 22, 51,172, 58,122, 29, 84,190,255, 71,140,123, 95,189,251,228,242,107, 68,185,166, 34, 33,188,251, 20,162, 22,
-209,148, 20,  4,150,239, 16,181,235, 78,221,138,176,212,132,219,228,168, 34,177,165, 33,134,131,  3, 26,226, 94, 86, 58,102,107,
- 14,157,122,252, 30, 52, 44,243,247, 63, 48,184, 87, 31,191,254, 31,230,249,133,121,190,230, 58,208, 21,238,154,188, 60, 83,178,
-101,223,126,249,177,230,236, 61,120,208,220,121,248,244,200,  3,232,108,164,180,  0,199,207, 63, 12,187, 79,223,132, 59, 67, 70,
-136,  7,226,243, 47,191,254,110, 63,115, 75,156, 19, 62, 94,241, 63, 88, 79,110,113,121, 36, 11, 11, 81, 85, 47,254,185,202, 35,
- 55,159, 35, 26,215,194, 60,164,238, 51, 66, 94, 48,  3, 44,220, 23,167, 88,155, 52,111,195,172,185, 49,235, 27,116, 23,194, 18,
-204,147,247,223,128,193,  8,153,152, 29, 45, 16,135, 25,  0,150,185,144,150, 59,242,114, 14, 96,155, 23, 88, 70, 67,134,197,129,
- 69, 57,176,129, 12, 31,129, 65,148,155,224,193, 16, 96, 19, 24, 88,118,195,  7,196,137,209,136, 92, 91,  0, 53,  2, 27,215,224,
-181, 46,175,228,100,132,224, 53,  4,242,128, 62,154, 22,160,107,129, 85,  5,100, 76,233,197,235, 79, 64, 27,129, 13,124,100, 91,
-144,245,  2, 29,  9, 52, 25, 40, 11,116, 18,100, 16, 31, 94, 51, 17,  3,126,252,248,241,230,205,155,237,219,119,  8,139, 72,190,
-121,245, 74,223,192, 24,152, 79,248,120,241, 21,238, 79, 30, 63,  6,146, 26, 26, 26, 95,191,253, 58,124,242, 22,176,193,142,200,
- 52,192, 28,197,  8,109, 52,255,254,245,235,238,203,247,198, 70,191,177,150,239,  0,  1,132,175, 16,249,253,243,199,139,173, 93,
- 28,143, 54, 51,161,103,103,216, 40, 51, 60,123, 35,229,104, 14,118, 86,164,145, 27, 44,128, 29,118, 41,235,223, 63,127,208,178,
- 57,211,223,175,152, 99,  0, 33,150, 26,104,133,157,130,148,168,145,172,208,201,135,160,129,242,235, 15,208, 87,254,159,190,255,
-  2,153, 27, 54,125, 39,142,162,145,225,202,227, 87, 12,150,154,  8,149,150,234,240,194, 29,  2,  4,249,121, 24,192,229, 59, 52,
-  5, 63,120,  1,174,143, 24, 85,  5,216,225,133, 59, 28, 68,217,106,  3,203,119,248,224,213,211,183,  8,191, 60,120,255,221,187,
-123, 45,174,112,190,247,236,181,184,146, 56, 60,104, 35, 28,244,137, 44,220,  9,228,183,135,175, 31,189,133, 94,158,229,170, 41,
-  9,105, 74, 19, 95,184, 35, 47,152,225,227,100,237, 10, 53, 17,230,197,183,186,233,201,135,111,184,164, 62,126,135, 78, 63, 60,
-125,255, 13, 62, 70, 52, 90, 32, 14, 51,  0, 95, 69,  3, 25,  7,135,176, 51,147, 29,186, 39,237, 60,122,242, 14, 16, 65,138,126,
-101, 69, 49,140,118, 49, 59,164, 52, 71, 94,135, 67,140, 70, 56,  0,150,236,245, 29,155, 50,138,150,124,  5, 13,226,139,133,  5,
-154,236, 63,124,163,164,118, 53,104,236,  1, 71,173, 16,228, 99,  4,236,106,  0, 75,106, 96,169, 13,238, 34,200,172,223,124, 14,
- 50, 94,  4,239, 40,  0, 59, 34,192,158,  1,100,248,222,205, 73,235,216,169,187,153, 69, 75, 32,141,247,204, 36,251,233,243, 14,
- 18, 31, 56,175, 95,191, 22, 19, 19, 99,102,102, 83, 82, 82,253,249,243,199,215,175,159,248,248, 20,129, 29, 93, 92,195,158,111,
-223,190,101,102, 97, 17,229,227,  7,230,217,107,183,158,  2, 11,119,112, 83,  9, 60,223,249, 15,178,156,  4,218,120,250,246,237,
- 51, 80,246,225,211, 79,130,  2, 88, 86,136,  2,  4, 16,206,114,228,199,135,215,239,183,212,176,189, 62,251, 15, 92, 91, 32,236,
-102, 98,255, 39,105,206,252,244, 16,114,193,254,255,251, 59,184,  2, 11, 21,169, 61,144,241,175,255, 88,134,144,129, 28,  7, 45,
-104,111,235,239,183, 79,255, 81,135,111,254, 51, 48, 97,182, 12,181,101,177, 44, 50,225,231,  1,150, 53,160,162,231,215,159,191,
- 48,197, 80,245,159,191,126, 39,106,  9,250,127, 96,220,127,135,116, 49, 32,190,208,149,151, 64,175,  2,152, 64,251,191,224,103,
-170,253,248,  5, 29,145, 23,192, 86,241, 42,139,242, 51,192,215,240,252,255,127,239,237,199,255,255,255,163,173,150,100,196,114,
- 42, 15,195,183,159,191,145,122, 58,255, 85,196,248, 41,207,108, 64,171,167,236,188,  8,231, 38,216,168, 64, 22,191, 19, 57,177,
-  9,212,158, 58,107, 15,124, 97,204,210, 84, 91, 61, 57, 97,172,115,179,214,234,146, 71,110, 61,135,148,221,192,234, 68,131,139,
- 11,173,236,254,240,245,199,229,199,111,145,171,141,209,194,125, 56,  1, 96,209,220, 80,225,135,204,  5,150,197,192, 82, 18, 88,
- 62, 66,150,165,207,232,139,  1,182,148,191,124,249,  9, 41, 70,129,236,192, 47,134,202,224,209,152,216,  8, 11,  8,219,202, 92,
- 25, 50,228,  2,212,242,226,213, 39,130, 26,209, 44,133, 40,  6,154,192,195,195, 14,180, 23, 40, 50, 29,168,247,254,107,160, 57,
-192,154,  6,216,244,  6, 22,202,112,245, 64, 75,129, 34, 64, 45,202, 74,162, 64,195, 33, 85, 11, 80, 87, 79,115, 40,196,106,136,
- 22,136,153, 64, 17,160,  2,136,153,160,181,146, 96,247, 64,150,202, 64,204,193,116, 12, 38,248,254,253,251,159, 63,127,128, 45,
-241,159, 63,255,255,254,253, 91, 86, 70,230,253,187,215,192,182, 22, 46,245,159, 63,129,  0, 48,183, 10, 10, 10, 60,  3,173, 71,
-122,133,104,174,  3, 75, 20, 38,164, 65,239,255,255,158, 63,125, 32, 35,171,242,230, 45,246,107, 80,  1,  2,  8,123,249,254,241,
-246,201, 47, 59,235,153,127,189,249, 15, 29,144,129,102,200,191,108,130, 60,158,237,204, 76,140, 95,159, 30, 68, 46,131,127, 61,
- 60,129,168,120, 61, 77,167,238,190,240,254,251,111,172,253,120,  1, 14,150,100, 55,232,129, 51,191, 31,159,102, 70,205,235,127,
-153,185, 49,138,247,255,143,223,127,177,192,112,225,171,119,208,129, 96, 78, 54, 52, 47,252, 23,224, 67,220, 18, 37,207,195, 86,
- 21,110,135, 43, 28,133,161, 29, 73,232, 82, 24,110, 14, 22, 28, 21,  1,116,149, 16, 23,176,107,  2,118,239,171, 79, 88, 58,125,
-159, 80,123,130,178, 66,252,112, 95,152, 43,137, 39, 56,232,224,114,134,142,172,232,207, 47, 95,225,  5, 60, 55, 39, 27,229,185,
-238,194,131, 87, 75,143, 66,135,131,130,140,228, 20, 68,249, 32,115,158,196,180,223, 33, 11,102,150, 28,129, 14,106,117,134, 24,
-235,201,137,128,143,175, 99,193, 28, 29,242, 49, 84,232,  4, 79, 79,  1, 65,211,198, 11,139, 50,156,129,157, 74,228,115, 11, 38,
- 35, 85, 51,163, 96,248,  1, 96,105,142,185, 52, 80, 28,117,195, 17,164,124,196,207,134, 27, 66,140, 70,172,150, 34,139,192, 21,
-136, 99,200,194,205,129, 51,160, 42, 97,110, 22,199,240,  5,166, 94,100, 54, 86,199,160,140,115,190,127, 47, 36, 36,196,204,204,
-242,231,239,143, 79, 95,126,126,  2,118, 98, 25, 89,190,126,253,202,195,195,131,150,239,128,213,192,215,175, 95, 62,188,  7, 77,
- 46, 42, 40, 40,124,254,242,243,224,177,155,127,129, 77,162,127,240, 28,  7,106,191, 67, 51, 49, 35,195,199,247,239,132,132,196,
- 57, 56, 57,180,213,165,176, 90, 13, 16, 64, 88, 74,180, 87,135, 23,253, 57, 61,141,  9,180,  8,146,145, 17,105, 44,230, 47,191,
-170,128,127, 47,183,136,212,231,151, 15,209,199, 85,126,189,255,116,105, 27,159,158, 23,144, 45, 38, 34,184,182, 40, 48,160,123,
-237, 39,112,107, 23, 89, 37, 15, 27,243,226, 12, 15,105,113,208,105,103, 31,159,220,100,124,126, 10,237, 88,178,255, 60, 98,152,
-237,247, 89, 59, 79,135, 58, 24, 32, 91,183,255,204,181, 11,207, 63, 65,218,201, 38, 42, 82,240,186, 12, 58,140,174, 33,  3,103,
-191,252,250,203,215, 84, 93, 66, 84,  8, 89,175,190,138,140, 16,172, 47,115,236,194,109, 44,189, 12,228,233,  3, 72,147, 28, 28,
-162,182, 26,114,199,238,131,246,100, 62,252,240,125,243,145,139,190, 54,250,200,106, 39,111, 61,  9,107,236,131,128,129,130, 24,
- 59, 19,  3,100,154,247,237,199, 47, 41,158, 40,149,212,241, 75,183,101,197,132,100, 36,160,  7,191, 29, 60,113,  9,201,  9,148,
- 54,111,129,109,228,180,217,123, 32,108, 62, 14,214, 60, 23, 77,200,186,120, 98,198,103,128, 94, 56,112,237, 49,124,193, 76,181,
-143,110,184,185, 18, 59, 24, 96,234,  5,138,232,203,139,234,200,  8, 93,121,  2,234,192,237,186,250, 44,119,209,145,246,  8, 75,
- 49,  1,232,130,173,201, 59, 47,180,111, 60,  3, 87, 15,116,204,104,129, 56, 10, 70, 26,120,249,242,165,190,190,254,171, 55, 95,
-158, 62,127, 15,204, 66,204,204,108,175, 63,126,253,248,241, 35, 48,143,252,255,247,239,215,239,223, 31, 63,126,248,252,249, 51,
- 48,223,127,255,241,  3,152, 79, 37, 36, 36,126,124,252,248,237,219,247,139,160,147,  9,254,193,198, 18, 16, 99, 50,224,113,  0,
-208,208,194,143, 31, 95, 36,164, 20,197,132,121,132,133,184,177, 90, 13, 16, 64,232,189,245,151,135, 22,252, 57, 57,145,225, 31,
-100,133, 59,164,120,  3,141,150,254,149,115, 19,139,158,  3, 44,220,129,162,188,226,242,191, 56,164,254,195,198, 68, 32,232,235,
-145, 73,127,190, 66,219,212,182,  6,170,167, 58, 18, 61,181,100,224,181,  7, 59, 19,163,151,182,212,177,166, 24, 79,107, 80,153,
-248,231,247,175,175,251,251, 24,254,255,133, 89,  0, 41,158,255,115,202, 24, 98,182,157,247,222,122,145,216,179,242,210,205,135,
-111,222,190,127,240,248,249,170,221,167,226, 39,109,  2,251, 21,228,198, 72, 91,109,244, 14,163,130,180, 55,172, 58,253,241,239,
-127, 80,199,202,243,183, 64,139, 94, 62,127,254,178,124,215, 73,191,238,117,170,217, 83,235, 23,238,120,242,226, 45,162, 98,248,
-255,159, 64,169, 10, 14,218,104,103,163,255, 48,197,  9,211,183,205,221,118,226,201,179,151,175,223,188,187,118,251, 81,214,164,
-181, 43,193, 75,107, 96,  6,253, 23, 17, 22,136,180, 80,131, 24,124,231,205,151,212,  9,107,222,125,  0, 13,237,125,255,241,115,
-237,190, 51,190,157,107,244,139,102,181, 47,219,  3,228,194, 45,248,255,159,129,242,161, 11,160, 11, 39,237, 56, 15,223,104, 26,
-111,173,172, 40,198,207,198,198, 70,204,170,115,200,106,200,240,137,208, 73,212, 96, 99,185, 20, 59,117, 72,225,206, 10,222, 27,
-133,169,  5, 40, 56, 53,  1,209, 67, 90,125,250,190, 81,205, 26,143,142,141,110,109,235,185, 19,166, 85, 44, 63,134,172, 88, 67,
-146,111,116,243,234, 40,160, 22,  0,175,136,127,130, 44,  2,228,226,153,134,197,  4,164,170, 39, 15, 72, 74, 73,253,250,253,247,
-197,139, 15,144,116, 15,204,134,108,236,188,215,174,223,184,116,233,226,181,235,215, 95,189,122,  5, 44,180,  5,  4,  4, 21, 20,
- 21,245,244,244,116,116,116,128, 69,191,136,136,200,250,205,187,158, 60,127,135,220,108,135,150, 44,160, 85,241,160,124,247,224,
-238, 53,126, 65, 81, 96, 13,161,173, 38,197,198,138,125,236,  1, 32,128, 80, 68,191,191,123,241,251,244, 12, 70,212,145, 98,208,
- 57, 55,166, 89, 98, 86, 49,200,135,133,177,235, 71,254, 61,209,131, 58,200,244,250,213,186, 98,225,192, 62,118, 30, 80,211, 88,
- 89, 86,124, 83, 99,194,155,119, 31, 30, 61,127, 11, 44, 24,164,197,  5,132,  4,  5, 16, 29,150,125, 83, 24, 95,157,249,143,122,
- 49,200, 31, 14,  9, 14, 73, 21,228,178,  6,194, 96,101,100, 88,120,236, 38, 16, 97,186, 62,220, 72,222,217, 76,  7,101,244, 29,
- 76,205,202, 13,180,175,154,127, 27,178,230,250,254,107,163,138,133,138,188,108,239,190,255,249,  4, 90, 93,196,240,245,247,191,
-230,141,167, 36,249, 57, 51,  2,236, 49,122, 11, 56,134,103,192, 64, 75, 65,162,208, 85,191,127,247, 69,160,216,135, 31,127,210,
-231,238, 70, 87,139, 90,112,245,166,120, 93,126,244,250, 12,120,244,121,254,145,235,203,142,221,144,228,102,125,251,253,207,103,
-160, 51,192,214,117,109, 62,229,160,171, 96,169,171,194,192,192,192, 64,165, 81,233,251,175, 62,182,109, 56, 13, 97,107, 74,242,
- 23,184,106, 65, 22,164, 19,211,120,255,240,245,  7,176,225, 15, 89, 48, 99,174, 36,218, 29,102, 10,212, 11,223,143,138,235,144,
- 35, 35, 37,137, 73,177,214, 53,107, 78,125,  2, 15,202,125,250,254,235,216,237, 23, 88,205,215,146, 20, 24, 61,159, 96, 20, 80,
- 11, 96,158, 28,  0,228, 54, 84,248, 17,127, 86, 12,169,234,201,  3, 76,140, 76,175,223,124,254,  7, 89,120,248,159,225,247,239,
- 95, 15,239,223,150,150, 18, 51, 52, 52, 70, 62, 28, 23, 88,  0,  0,123,222,191,255,252, 21, 19,151,254,248,225, 29, 23,183,216,
-211,151, 47,  4,133,196, 64,197, 57,120, 44,133,145,137,  9, 88,154,255,249,243,235,215,207, 31, 31, 63,189, 19, 16, 18,227,230,
-226, 85, 83,  6,205,115,224,178, 26, 32,128, 80,202,247,191,239, 30, 50,252,251,245, 31,105,133,251, 95, 78,  9,110,231,106, 97,
- 77,244, 19, 25,  5,205,130, 95, 94, 88,204,244,253, 37,114,177,198,248,234,252,235,249, 65,188, 78,149,252,218,206, 16,113, 17,
- 33,  1, 32, 66,214,248,227,211,251, 55, 59,218,153, 31,237,193, 44, 68, 89,212, 60, 89, 88,177, 12, 61, 79, 12,183,108,217,118,
-254, 25, 98,200, 27, 90, 14, 38,152, 41, 77,206, 11, 65,  8,254, 71,108,112,149, 20, 21, 60,209,157, 86, 50,119,235,242, 99, 55,
-127,128, 71, 72,238,127,250,  9,113, 37, 27, 35,163,171,150, 84, 85,160,149,149,145, 22,102,  9,142,165,108, 71, 93, 10,212,150,
-228,  9, 36,167,236,185,248,251, 63,202,106, 37,113, 46,214,106,111,131,188,213,167,145,117,243,241,114,239,106,138,175, 91,178,
-123,222,129,171,223,254,252,253,249,247,255,131, 79,136,198,130,189,146, 72, 71,162,187,169,150, 50,102, 71,129,194,145, 25,248,
-105, 48,157, 33, 70,144, 13, 71,196, 52,222,129,122,193,167,149,189,133, 84, 12,211, 99,205,129,101, 58,164, 98,  0,181, 24,254,
-253, 67, 41,223,193, 34, 64,  0,153,179,141,179,211,178, 82, 17,239,220,114, 30,216,126, 71, 54, 51,200,  8,116, 56,198,186,115,
-208, 21,177,102, 74, 34,163,231, 19,140,  2,208,102, 84,240, 73,  3,144,197, 42,144,165,138, 60, 92,236,152,130, 12,224,243, 97,
-128,229, 47,176,149,253,242,245, 39,136, 44, 68, 25,114, 27, 28,162, 29,249,  8, 26,200,225,  1, 18,162,124,144,153, 91, 30, 30,
-118, 72, 75,223,205, 81,139,135,155, 29,190,148, 19,222, 15,216,  5,222,230, 13,180,  8,104, 50, 80, 22, 50,233, 10,153,230,133,
-203,194,151,222,195,101, 95,192, 14, 99,  0, 74, 65, 38,150,177,250,247,205,155, 55, 12,204,252,144, 82,132,137,153,249,225,195,
-123,160,205, 63, 74, 26,255,254, 51,126,255,241,251,251,247,223, 64,167,126,251,254,243,231,239,191, 63,190,253,254,245,251, 15,
- 80,150,149,233,139,140,  4,251,155,247,140, 31,222,191, 17, 18, 22,  7,230,182,159,192, 50,253,195,155,111, 95,190,112,112,113,
-241,240,242,139,139,203,  0,115,167,144,  0,151,158,  6,190,202,  9, 32,128, 80,206,  7,254,249,249,253,235,153,110, 12,255,255,
- 66,138,236, 63,130, 58,162,161, 19,184,248,133,176,234,124,125,112,214,239,211, 51,177,155,170, 21, 41,230,154,207,130,177,220,
-226,243,227, 27, 31, 54,149, 48,127,199,178,187,236, 63, 35, 43,127,252,  6, 30, 17, 73, 88, 10,120,123,233, 22,180, 80, 48,  1,
-175, 68,108, 89,178,107,231,185,187,215, 62,252, 16,101,103, 54,144, 17,204,243, 54,247,118, 64, 92, 12,114,236,204,149,175,224,
- 69,120,146, 98, 66, 58,234, 10,112,241,143,159, 62,175,218,127, 97,243,201,107,111, 62,126,101,103,101, 81,147, 22,206,244, 50,
- 55,208, 70,244, 18,222,127,248,116,230,202, 29,152, 69, 42,104,107,140, 46,221,184,255,242,205,  7,  8,219,193, 92,  7,190,128,
-228,212,149,187,141, 75,119, 95,120,244,238,203,239,127,178, 60,108,182, 90,210, 13,241, 30,252,188, 60,135,207, 64, 15,  3, 80,
- 83,144,146,151, 65, 44,251,121,250,252,213,188, 61,231,143, 94,190,243,225,243, 79,110, 78, 22, 85, 41,145,120, 39,  3, 75, 68,
-  5,195,240,250,237,251, 11,215, 31, 64, 42, 18, 75, 67, 13, 30,110,114,206, 89,  3, 70,229,196,237,231,202,151, 29,133,112,115,
-157, 53,138, 61,116, 57,193,  0,190,161, 20,143,222,148,153,187,225,115,170,144,115, 40,129,237, 14, 70, 80, 81,204,  4, 61,136,
-226,255,255,163,183, 94,192, 21,  8,112,179,235,203,137,118, 69,219, 64,198,109,254,128,218, 21,160, 67, 37, 15,223,124,246, 15,
- 60,104,104,161, 44, 10,108,209,219,118,108,131,180,235,165,  5,184, 14, 87,122,114,115,115,115,113,113,  1,187, 80,135,111, 60,
-189,244, 16, 52,153, 33, 39,194,231,103,162, 36,192,197, 62, 90,240,141, 16,  0, 44,124, 23,175, 60,190,120,102,114,207,228, 93,
- 64,110, 73,174, 91,108,250,220,216,112, 75,172,130,211,231, 29,232,105,  9,  5,150,170,235, 55,159,131,200,114,115,179,103, 38,
-217, 67, 74,118,200, 41, 99,192,178,117,221,230,115,153, 73, 14, 64,197,192,246,248,250, 45,231,191,124,253,  1, 20,223,181,239,
- 42,196,  4, 96,201, 27,232,107,  4, 52,193,202, 92,197, 10,124,210,128,155,147, 54,216, 37, 87, 75,115,221,129, 10,128,138, 33,
-219, 80,103,244,197,100, 20, 45,129, 44,199,132,156, 51,  3, 89,103,  9, 84,  0,180,  2,168,184,123,242, 78,136,172,156,140,208,
-230, 29, 23,225,230,224,233,  7,156, 60,121,138,131, 71,252,255, 63,102, 96, 38,  2,150,223,103, 78, 31,211, 55, 48, 17, 23, 23,
-254,250,245,199,179,151,159,254, 35, 95,117,  7,107, 89,243,240,114, 11,243,253,126,250,236,229,249,203,143, 88, 88,216,127,253,
-  2, 54, 83,255,243, 11,  8,241,242,  9, 49, 51, 49,  3,219, 85,192, 12,205,193,198,106,102,168, 32, 37, 33,128, 39,168,  1,  2,
-  8,165,253,206,206, 43,200,233, 88,245,249,240, 52,166,191, 63, 25,229, 44,197, 61, 42, 57,120,113,106, 22, 48,  9,123,113, 97,
- 25,211,175, 79,152,227, 18, 12,215,150, 61,191,187,155, 85,209,134, 77, 82,155,131, 87,240,231,215, 79,191,222, 61,253,253,236,
- 34,195,171,139, 76,224,254,  1,150,242, 69,217,  3, 94,184,131,107,111, 97, 87, 49,148, 75,167,122,115, 66,122,113,123,195,202,
-  4,251,234, 20,126, 62,222, 84,127, 91, 32,194,165, 17, 88,160,187,218, 24,225,146,213,211, 80,196, 42,110,166,163,188,181, 29,
-203,245, 29,174, 54,134, 88,213, 75, 75,138,213,198,186, 51, 48,184,227,178, 72, 84, 88,208,213, 70,144,138, 35, 51,210,130, 92,
- 73, 54,170,196, 55,222,129,101, 55,188,112,  7,  2,180,125,170,152,  0,174,  0, 88,166,179,179,179, 67, 90,250, 64, 91,128,164,
-139,158, 34,124, 17,228,212,253,231, 63,193, 86, 82,  5, 25,129,206,139,135, 56,102,243,217,187,169,179, 16,163, 91,165, 75,216,
-103,167,187,248, 25, 43,143,150,125, 35,  1,  0,203,193,233,243,126,  2, 91,226, 23,175, 60,  6,182,142, 33,187,138,112,  9,130,
- 26,242,247, 94, 67,142,241, 58,118, 18,116,228,139,155, 35,202,148, 27,100, 23, 43, 72, 22,124,102,  0,228, 60, 25, 96, 89, 15,
-217,130,  4, 17, 44,201,117,135, 20,190,151,192,103,132,  1, 11,101, 72, 13,  1, 44,151, 95,188,  6,149, 96,174,142,144,  3,109,
- 30, 67,142, 33,131, 28,159,  0, 49, 13,216, 84,  7, 22,250,144,134,252, 49, 36, 89, 96, 77,131,108, 14, 30,255,138,138,138, 92,
-188,114, 75, 72, 88,130,139,147,231,194,133, 83,162,226, 18,130,130,252,192,236,242,242,205,103,196, 18,106, 70,164,189, 68,255,
- 25,190,124,254,250,255, 31, 43, 47, 23,187,187,179,249,133,235,207,129,237, 95, 38, 38, 22,200,250,119,  1,126, 14, 73, 49,126,
-113, 81, 62,208,237,104,132, 22, 44,  0,  4, 16,250,168,188,176,113, 32, 16, 17, 19, 73,172,220,192,162,177,254,243,214, 98,228,
-193,107,120, 57,207,244,227,245,223,235,235,191,  3, 17,246,161,105,148, 65,143,191,220,178,146, 30,165,163,233, 30, 94,212,146,
- 49,124,129, 62, 50, 19,108, 36,204,199,133,124, 20, 12, 65, 75,201,115, 42,100, 63, 42,164,212,134,108,161,130,239, 96,186,240,
-224, 85,207,118,232,169,100,124, 28,172, 73,182,106,240,227, 45,237, 53,165,107,131,204,237, 52, 65, 39,166, 77,222,113,113,211,
-217,187, 37, 75, 14,143,150,239, 35,  4, 64,214, 29,238,218,127, 13,114,240,192,186, 45,231, 33, 34, 88,  5,129,220,151,175, 65,
-133,126,108,  4,232, 36, 47,208, 81,236,185, 50, 88,205,132, 12,236, 64,134,110, 32,  5, 49,  3,120,113, 58,218,241,191,192, 98,
- 26,237, 44,  4, 32,128, 28,101, 35, 33,198, 15, 89,210, 14, 63,129,  0,178,250, 30,186,110, 18,188, 75, 22, 46,139,213, 28,172,
- 64, 86, 86,246,215, 95,142,107, 87,111,188,250,247,252,231,207, 31, 10,242, 74,162,194, 60, 87,111, 62,  7, 31, 54,128,122,224,
-236,127,232, 58, 25, 38, 38,198,103,207, 94,  8,242,115,152,154, 42,254,250,195,114,247,193, 43, 46,110, 54, 89, 73, 33, 89, 41,
- 65, 33,  1,110, 38, 38, 98,203,  7,128,  0,162,104,159, 36,191,150,227,143,183,  5,191,143, 79,192, 82,102,227, 40,202, 49,193,
- 95, 14, 49,225,160,137,172,156, 60,163,233,254,204,189,151,247, 94,126,  8, 49, 87,101, 32,241,102,106,200,154, 25,248, 89,240,
-  9, 86,202,214,106, 18,240,121, 81, 34,141,250, 56, 39,237,199,143, 31,192,246, 56,124,156, 29, 77, 35,176, 28, 87, 44, 91,  3,
- 97, 47, 76,180,  4, 90,  1, 52, 31,121, 48, 29,114, 18, 14,196, 61,239,191,124,143,158,134,104,161,231, 56,171, 11,241,114,194,
-167,121,229, 69,249,106,130,204, 63,124,251,121,233,225,235, 92, 15,125, 96,249,254,240,245, 39, 32,  2,138,143, 38,131,145,209,
-132,151,133,140,168, 48,128,142,138, 60,110,  5, 62, 71, 12,171, 32,176,188,158, 62,239,  0,176,165,108,109,  6, 58,143, 12, 82,
-232, 67,  6,220, 81,134, 82,193,103,  6, 64,  6,247,129, 36,252,192, 94, 96,147, 31,179, 38,128, 31,102,192,  0, 59, 29,161, 36,
-215,141,135,155, 29,249,218, 16,200, 64,191,  4,244,  0,203, 39, 64,211,224, 86, 64,  0,228,160,  2,184, 57,248,154,194,172,172,
- 98, 34,252,127, 53,181,128,  5,186,128,160,200,239, 95, 95,159,191, 98,251,246,253, 23,142,188, 12,218, 86,249,250,245,139,159,
- 63,191, 11,  8,136, 92,187,245, 66, 79, 75, 90, 77, 73,140,155, 11,216, 17, 39,249,100,111,128,  0,162,116, 31,188,184,109,220,
- 59, 46,190, 47,251,218, 24,255,255, 38, 67,251, 95, 81, 19, 17,207, 42, 30,  9,197, 97,214,  0,199, 47,  8, 44,224, 48,213,  0,
- 69,238, 60,127,127,239,213, 71,200,254, 32,200, 34, 19,136, 50, 72,  1,138,118,171, 53,114,225,139, 54, 50,147, 15, 94, 51,131,
-171,112, 71, 62, 33,  0,126, 34, 13,208, 70, 96,203,154,  3,216,223, 99,101,  5,150,227,184,186,  8,112, 54, 19, 51, 19,252, 40,
- 96,160, 70,204,139,182, 83,103,239,125,244,  6,186,167, 78, 83,146, 47,217, 86, 13,222,153,  0, 42,190,248,240, 53,176,193,126,
-232, 58,202,226,182,135,111, 70,203,247,145,  2, 32,173,108,200, 24,  8,228,192, 94, 92,130,144, 98, 90, 95, 91,  6, 82,178, 67,
- 78, 41, 88,188,226,132, 30,120, 46, 20,200,206, 40, 90,194,  0, 62,135, 32, 51,201,126,215,190,171, 64, 53,192,150, 62,100, 92,
-254,238,253, 87,200,103,147, 65,128,155,147, 86, 67,251, 38, 96, 85,  1, 41,151, 33,102,102, 22, 45,  1,146,144, 94,  2, 68,217,
-209, 83,119, 33,247,123,  0,171,150,158,201, 59, 33,253,131,216,  8, 11,248, 80,140,171,163, 22, 80, 28,110, 14,126, 32, 36,200,
-205,207,199,249,225,227,119, 65,126,174,123,247,110,191,123,250,151,153,153, 21,114, 85, 19,228, 48, 25,208,242, 71, 38,208,170,
- 69, 96, 86,252,248,225,237,159, 95,191,100,101,149,255,255,255, 39, 45,201,207,206,198,194,206, 70,102, 65, 13, 16, 64,140, 84,
-217, 44,254,229,201,181,247, 59,154,254,191,189, 73, 66, 33,200, 46,200,101, 91, 36,106,236, 51,252, 70, 87,210,103,239,113,210,
-150, 13, 49, 87, 89,115,242,206,222,171,143,167, 37, 58,172, 61,117,103,246,190,171,130,220,236, 41,142, 90, 64, 41,175,206, 77,
- 10,162,188,247, 95,127,154,154,232,176,238,212,221,189, 87,159, 40,137,241,  1,217,158,157, 27, 13,229, 69,155, 67, 65, 11, 87,
-122,182,158,223,119,229,177,162, 24, 95, 75,152,165, 16, 15,135,103,199, 70, 32, 27, 88,250,  7,155,169,164, 58,233, 64,  6, 67,
- 32,165, 42,176,216,117,107, 91,  7,111,188, 79,139, 54,243, 54, 84,224,226,226,130,236, 56,197, 44,121, 75,151, 28,158,178,235,
- 34, 63, 23, 91, 91,152, 69,172,173, 38,252, 94, 86,200, 34, 25, 60,233,225,207,159, 63,252, 41,179, 32,236,165,169,182, 78,186,
-242,156,156,156,104, 77,120,  6,140,169, 90, 62, 14,214, 37,169, 54,134,138,226, 16, 39,  1,189,246,241,251, 47,245,130,  5,192,
-198, 59,176, 52,143,179,213,  4, 50, 38,239,184,  0, 84,185,187, 58,200, 78, 83,102,180,236, 27,  9,  0,249,210, 59,200,138, 20,
-120,243, 25, 77, 16,153, 13,105,182,195,219,239,220, 64,145,251,175,121,120,216, 33,199, 12, 64, 22,198,192, 15, 72,120,241,234,
- 19,228,184,  2,100, 65,248, 18, 29,200,193,  3,160,147,  9, 96, 38,  3, 13,129, 44,152,129,168,  7, 86, 24,240,133, 58, 16, 89,
- 52, 43, 32,109,252, 23,224,238,  2,176, 58,233,105,  9, 69, 94,213,131,  7,188,125,255,117,253,166,125,252,252,194,188,252,  2,
-136, 49,119,208,176, 59,104,180,243,253,219, 55, 63,127,254,144,146,150,103,102,102,210, 84,149,144,149,166,104, 90, 14, 32,128,
- 24,169,117, 24,200,159,223,191,223,238,155,246,243,210, 82,134,127,132, 27,242,127, 37,172,197,124,235,184,133,196,134, 95,194,
-  5,134,231,204,221, 23,187, 54,159,189,210, 25,169, 83,190,188,200,203, 64, 81,148, 47,102,218,238,137,177, 54, 15, 94,127,234,
-223,113,233, 82,123,152, 92,254,226,  4, 59,141, 36, 59,141, 15,223, 64,151,163,110, 42,  2,237,251,117,210,150,201, 91,116,248,
-254,171, 79,155,138,189, 38,236,184, 52,239,224,245, 73,113,182,235, 78,223,125,240,230,243,150, 18, 31,238,164,153,133, 30,250,
- 10, 34, 60,249, 75,142, 30,174, 11, 50, 83,145,132,156,196,139,182,102, 70, 67,130,175,198, 71, 15, 62,173, 10, 90,253,130, 52,
-241,  1, 44,211,183,156,127,128,188,161,116,125,129,187,147,142, 60,174,189, 75,152,229, 59,119,194, 52,  8,123, 89,186,157,179,
- 46,168, 22,  1,234, 69, 43,220, 39,110, 59, 87,190,252, 40, 92,164, 35,216, 48,210, 82, 21, 88, 19, 64, 58,  7,192,202,  0, 88,
-154,151, 44, 57,  4, 44,220, 79,181, 70, 66,150,205,176,199, 76, 26, 45,223, 71,193,208,  2,192,130, 30,216,201,144, 16,227,  7,
-246, 18,172,204, 85, 32, 19,173, 68, 22, 17,192, 92,125,224,208, 73, 96,131,138,  9,116, 13, 19, 19,184, 16,254,247,251,247,175,
-159, 63,126,138,136,136,137,136, 74,  2, 91, 90,154,106, 18,242, 50, 66, 20,174, 36,  6,  8, 32, 22,106,249,150,133,149, 85,220,
- 61,255,135,101,220,143,123, 71,191,221, 62,240,227,233,101,230,159, 47, 81,124,197,196,241,151, 71,134, 83,222,140, 75,221,133,
- 87, 94,143,153,133,101,184, 70,124,178,163,118,229,202, 99, 61, 91,206,189,255,250, 51,214, 74,101,226,206,203, 64,193,121,  7,
- 65, 75, 39,129,109,213, 51,119, 65,193,226,103, 32,167, 39, 43,  4, 44,236, 10, 61,245,129,197,122,130,157,186,189,134,164,188,
-  8, 15,100,124,  6,216,234,  7,138,216,169, 75,  0,139,212,192,137, 59,127,255,  6, 85,153,118,234,226,118,234,146,192,242,253,
-237,167,111, 64,113,160, 94,200,245,120,240,145, 25, 32,184,241,226, 83,204,156, 35,184, 28,102,173, 42,129, 86,153, 31,186,254,
-212, 86, 93,138, 90,107,210,129,238, 41, 94,124, 16,249,166, 39, 96,225, 30,110,174, 12,217,  1, 11, 95,198,243, 17,124,184, 32,
-176,100,135, 20,238, 15, 95,127, 26, 45, 44, 70,193,144,  3,192,126,  6,100,170,  0,126,168, 25,177,109,106, 70, 70, 21, 69,209,
-159,191,140, 31, 63,123,251, 23,233,170, 12, 38,208, 40, 41,168,197,  6,204, 37,106, 42, 18, 10,178,194,148, 59, 18, 32,128,168,
- 92,200,114,240,  9,114, 24,248,  8, 24,128, 70, 93,190,125,250,240,251,243,123,134, 63, 63, 24,152, 89, 25, 88,216,216,249,132,
- 57,184,184, 71, 66,196,  3,227,175,216,203,160,118,245,201,186,  0, 99, 96, 97, 13,108, 53, 11,112,177,245, 70, 88,240,114,176,
-124,250,254, 91, 65, 20,116, 65, 54,228,196, 32,160,202, 36,123,205, 56,107, 85,195,154, 53,250,178, 66,208, 43,100,255,255, 87,
- 16,225, 61,255,224, 13,176, 14, 63,255,240, 13,144, 13,153,240,252,  7,187, 18,235, 63,248,238, 83,160, 44, 48, 57, 32,175,153,
- 33,220,109,250,247, 87, 22,245,156, 10, 41,126, 14,106, 29,232,  8, 52, 36,180,127,203,102,164, 59, 90, 33,133, 59,176,217,142,
- 92,184,131, 42, 42,240,178,153,139, 15, 95,167,206,218, 45, 47,194,183,232,240,117,136,248,131,215,159,237, 52, 71,203,141, 81,
- 48,148,138,120,178,245,170, 43,139, 51, 51, 49, 62,126,241,158,225, 31, 98,136,  6,216,206,226,226, 96,147,147, 22,194,179, 37,
-149, 36,  0, 16, 64, 52,108, 68,115,241,  9, 48,240,  9,140,180, 40,135,204, 85,166, 56,234,204, 61,112, 45,209, 78,  3,216, 52,
- 78,118,208,122,240,230,179, 73,  3,232, 22,164,250, 64,227,  2,119, 61, 32,131, 25,180,146,144,249,209,187,175,182,205,235, 63,
-124,253,233,160, 41,165, 47, 39,114,241, 49,232,184,  9,160,246,166, 16,179,184, 25,123,  5, 51,230,  3, 11,247,249,105,142,144,
-150, 53,100,245, 33,216, 10,104, 65,121,224,218, 99,248,176, 59,113,101, 48, 67,173,175,193,213,167, 31,174, 61,  3,109,218, 10,
- 50,146, 11, 51, 83, 34,175,217,206, 12, 59, 33, 18, 25, 84,250,155,  0, 59,  4, 31,191,255,210,146,226,135,156, 58,  9,105,185,
-163,205,244,218,105,202,228,122, 24, 76,222,113, 97,209, 33, 80,201,174, 47, 47,106,111,167,  9,100, 79,217,121, 33,110,180,128,
- 31,  5, 35,  3,  0, 27, 60, 26,170, 18, 64, 68, 83, 91,  0,  2,136,113,244, 48,110,170,  3,200,170,240, 63,127,254,192, 79,202,
-  5,138,252,254,253, 27,216, 82, 70,190,225,  8, 50, 42,  2, 57, 20, 20,210, 66,135, 47,155,129,207,118, 66,180, 96, 30,216,  2,
-212, 11, 57,173, 23,168,247,231,207,159,191,126,253,  2, 50,  8, 23,202, 96,  0, 52,234,200,205,231, 60,236, 44,218,210,  2,104,
-215, 97, 19,104,254,255,253, 11,244,197,247,239,223, 33,254,130,107,132, 47,239,  1,138,159,185,243,236,205,199,175,102,138,194,
- 64, 65,248, 93,172, 88,151,241,128, 22, 68,190,249,196,207,197, 14, 44,223,193, 35, 69, 79,128,109,249,209,245, 51,163, 96, 20,
- 80, 17,  0,  4,208,104,249, 78, 19,  0, 41,154, 33, 59,149,208,150,166,192, 11,107,172, 82,152,226,200, 37, 62,242, 74,115, 72,
-243,249, 47, 12,224, 90,212,136,220,177,128,235,130,219,  8,217, 80, 74,228, 26,121,120,189,  5,169,117, 48, 47, 12,129,184,  4,
- 88,  7,128,199, 16,153,224, 10, 70, 79,155, 25,  5,163, 96, 64,  0, 64,  0,141,150,239, 52,108,197,163,113,177, 46, 96,199, 37,
-142, 44,133,245,224,117,100, 53, 68, 70, 34,178, 46,228,122,130,248,242, 23, 82,235, 32, 87, 24,104,139,103,224, 10,144,171,147,
- 81, 48, 10, 70,193,128,  0,128,  0, 26, 45,223, 71,193, 40, 24,  5,163, 96,120,  2,128,  0, 26,109, 94,141,130, 81, 48, 10, 70,
-193,240,  4,  0,  1, 52, 90,190,143,130, 81, 48, 10, 70,193,240,  4,  0,  1, 52, 90,190,143,130, 81, 48, 10, 70,193,240,  4,  0,
-  1, 52, 90,190,143,130, 81, 48, 10, 70,193,240,  4,  0,  1, 88,187,186,220,168,129, 24,108,143,103,  9,213,  2,106,133,212,138,
- 71,144,122,135, 62,115,128, 94,184, 18, 47, 28,163,  7,  0,196,  3, 85,219,221,109,230,207,248, 39, 19,178, 93, 81, 85,208,149,
-118,146,108, 38, 30,219,177,163,149,242,217, 31, 30, 65,220, 65,145,241,197, 36,246,134, 39,214,167, 30, 35, 58,119,224,116,102,
-160, 85, 46, 69, 91,213, 51, 58,200, 34, 76, 99,  8,145,172, 66, 55,200,168,184, 58, 36,227, 14, 10,104, 40, 15,230, 98, 28,124,
- 92,149,188,180, 25, 63,236,196,123,226,205,121, 20,  6,194, 20,128, 85,  8,160,  8, 32,221,129,128, 17,  8,168, 49, 98, 36,149,
-165,136, 61, 50, 78, 62,153,160,179, 64, 54,170, 15, 30,116, 85,110, 85,230,213,211,119,167,155,116,127,183,221,184,101,222, 44,
-162, 91, 75,184,111, 53, 67,251,120,246,233,250,219,181, 40, 93,148, 80,177, 52,209, 89, 36,121,209, 41,116,176,139, 28,162, 19,
-118,169,129,221,  6,101, 69,143, 49,124, 56,167,187,109,218,140,188, 73,109,151,107,170, 45, 23,181, 87, 76, 36,230,147,245,219,
-203,207, 23, 95,174,190,238, 26,140,169,222, 62,236, 30, 98,205,204, 57,226,155,245, 16,197, 94,241, 56,139,102, 20,181, 18,138,
-229,218, 82, 43, 23, 22, 51,197,112,241,140, 56, 66,157,107,236, 76,  0,180,205, 41,165, 54,254,252, 37,247,164,100,  3, 91,234,
-151,101, 48, 92,102, 51, 58, 94,167,153, 89,190,142,255,179,207, 11,250,219, 71,239,235,  7, 26, 26,151,220,234,211, 97, 35,107,
- 28,209,235,204,185,246,153,252,220,120,155,117,128,227,225,248,102,188, 57,  4,  3,253, 27,132, 64,107,208, 32,164,150, 95,209,
-234,100,253,254,199,237,247,176, 88,180,175,130,216,205,239, 49,192,139,130, 68,168,207,208, 31,247,108,193, 71,251, 78,252, 32,
- 33,252, 52, 71, 48,204,249,176, 47, 30,193,195,154, 15,156,134,243, 98,142,130, 10,150,176,136,222,132, 28, 15,111,208,242,255,
-160,101,165, 95,104, 28, 95,115, 46,  3, 91,253, 29,226, 18,239,235, 27,159, 51, 37, 53, 25,122, 86,134,168,165, 28,180,210, 49,
-174, 26,131, 28,228,146,139,  2,113,115,146,112, 44,121, 76,185,180, 84,107,209, 98,145,166,233,111, 41, 53,251, 91,212,226,133,
-106,254, 99,141, 52,140,117,180,123,227, 73,215,244, 25,224,209, 60,185,171,245, 60, 70, 61,235, 79, 41,110, 54, 97,122,190,116,
-218,207, 41,212,101,109,252, 75,156,255,207,135,247,163, 20, 95, 78,248,111,  1, 88, 59,183,165,  6, 97, 32, 12,103, 19, 40,142,
- 85, 59,125,  1,223,255,201,156, 81,199,241,194,169,165, 57,173,255, 46,  9,165,165,104,103, 44, 23, 20,  8,228,176,252,251,237,
- 94,208,132,254, 67,118,158,244,106, 52, 54,169,161,201,212, 87, 90,225, 46,164,208, 82, 71, 85,  1, 21,238, 70,177,174, 43, 68,
-  0,180, 78,254, 15, 35,224,  5,136,149,248,196, 40, 12, 33,128,214, 49, 10,123,240,138,114,138,168, 15,106, 64, 41,101,149, 24,
-240,103,132, 90,104,  4, 92, 19,150, 77,248,222, 74,219,109,171,218,213,235, 82,239,128, 56, 13,  6, 40,112,134,100, 10,  0, 42,
-243,247,142,  8, 75, 89,158,197,175,220,159, 47, 89, 94,230,245,164, 34,147,200,  9,138,245, 33,160, 34,232, 49, 11, 34,129, 86,
-116, 58,113,145,197,233,138,174, 52,217, 59,141, 81,206,108,159,233,245,179,223,121,246, 57, 31, 32,245,204,192,119, 14, 24, 39,
-120, 33,211, 18,108,182,143, 47,239, 31,232, 49,117,246,190,115,155,117,183, 93,183, 79, 15,238,174, 67,136, 48, 62,144,239,109,
- 47,164, 22, 27, 55, 78,  2, 85, 74,  1,  3, 96,244, 39, 75, 68,129,138,123,184, 80, 26, 62,129,167,125,244,253,219, 87,191,247,
- 81, 98, 73, 98,229,187,126, 37,207, 53,164,161,105, 24, 55,209, 49,184, 93,224,251, 25,209,120, 70,225, 63, 41, 79, 87,115,153,
-150, 33, 78,183,224,251,220,211, 70,132,184,227, 98, 59,180, 60, 16, 30, 13,194, 11, 70, 56,133, 59, 45,242,215, 56,186, 98, 16,
- 73,252,107,122, 27, 78, 27,186, 64,246, 66,195,234,177,240,144, 97, 13, 98,171,103,120,173,206, 46,187,188, 53, 21,234, 18, 13,
-108,113, 97,245, 31,146,116,199,142,185, 91,161,  1, 29,  9,160,233, 21,  6,211, 32,123,115,173, 96, 29, 76,215,109,133,  3,215,
-172,  4,252,221,202, 31,246,  1, 46,148,162,  7,219, 65,247,228,133,248,184,  0, 93, 66,156,146, 45, 77, 71, 90,114,179, 26,101,
-101, 39,115,121,112, 42,249, 20, 13,124,231,225, 56,107,114, 56,170, 23,222,218, 82,187, 59,124,147,248,132,218, 65, 23, 85,170,
-126,122,142,248, 95, 82,153, 37,137,218, 89,152,156,107,146,111,148,148,156,109, 63,  2,208,118,118,187,109,195, 48, 20,150,104,
-217, 10,150,166,104, 46,138,162,215,125,255, 39, 91,209, 98, 75,139,194,113, 36,245, 28, 82,114,188, 37, 46, 54, 12,  3,114, 97,
-  4,209,143, 77,242,240,147, 17,137,255,138,237, 48,213, 38,196,247,233,253,138,184,183,147,141,169,177, 86,254,219,190,161, 41,
-248,105,155, 53,121,152,120,160, 91,152,184, 67,216,131,116,161,135,  7, 12,116,  6,  2, 61,127,210, 65,211,233, 68, 46,107, 22,
- 13, 32,249, 78, 83, 70,177,108,235,234,127,173, 69,150,186,178, 68,174,236, 92, 67,116,185,  8, 98, 41,146,203,195,221,227,243,
-207,239,169, 18,152,113,186,173, 32,114, 18, 58, 62,188,213, 36,158, 91,120,172, 23, 46, 25,154,241, 50,159,  0, 38,230,170,115,
- 35,117, 80, 91,157,222,179,241,175, 78,246, 76,251, 53,196, 43,191,179, 12, 23,197, 99,242,161,184,219,161, 76,222,189,  8,251,
-193,232, 57,133, 97, 40,183, 60, 99, 23, 13, 79,247, 79,123, 60, 52,100,142, 62,186,221,183,208, 15, 93, 12,204, 93,232,127,139,
- 73,238, 48,175, 30, 61,142,163,127,251, 40,167, 99,250, 24,  5,243,  2,165,116, 89,  7,241, 18,153, 53, 83, 62,129,153,221,136,
-124, 20, 52,229,  9,159,177,230,178, 68,170, 57, 43,130, 21,150,241,229,186,227,249,185, 18,185, 95,240,200,126,179, 63,140,  7,
-172, 29,190,246,162, 40,155, 41,143, 51, 28, 93,101,243,175,197,125, 54,233,174,191, 57,168, 55,194, 58, 39,205, 70,127,245,178,
- 18,242,146,126,101,110,191, 62, 98, 91,152,174,189,247, 52,  6,228,245, 93,220,191,142,175,229, 15,196,221, 47, 70, 91, 19,247,
- 53,190,163,225,106,171,172,225,208,249,235,216, 62,111,147,211, 21,118,211,251,102, 89,185,144,152, 26, 69, 85,167, 69,183,175,
-217,198, 59,213,121,177,202, 46,174,210,156,208,143,237,142,164, 38,185,138,240,206, 86,231,122,208,  6,120, 46,244,208,214,126,
- 24,250, 13,183, 57,199,136,107,120,240,118,123,115,120,251, 49,  5,  8,251,145,237,178, 41, 46, 17,137,157,  5, 22,117,247, 37,
- 47,151, 40,179,192,115,238,234, 70,136,101, 68,101, 98,176,229,  6,239, 21,203, 41, 73,224,253,108, 83,203,220, 61,142,240,210,
-111, 98,136,104,125, 76, 71, 87,170,168,144,132,172,246,176,182,107,125,148,115,118, 92, 87,118,185,  0,243,223,220,169,252, 31,
-102, 95,142,242, 41,  0,105, 87,215,219, 32, 12,  3, 99,135, 16,232,180, 73,235,255,255,131,211, 94,214,170, 27,133, 66,178,179,
- 29, 88, 87, 86, 52,109,111,124,  4,  2,137,115,190, 59, 41,201,127,241, 29, 67,247,253, 50,206,189, 95,246, 97, 46,253,106,216,
- 46,191, 41,211, 92, 74,127,147,102, 91, 93, 67,197,168, 61,240,132,115, 49,102, 42,157, 64, 47,232, 46,235, 81,  1,111,  2, 94,
- 20, 67,131,231,198, 52, 14, 93,  7,212, 83, 26, 60,130,133,226,173,160,152,162,204, 40, 89, 46,201,234,176,240, 29, 74,165,  0,
-159,215,119,243, 12,183,232,200, 67,119,156,100,237, 47,195,226,180, 76, 24, 77,150,185,146,246,179,149,102,183,139,187,243,216,
- 41,203,157,117, 52,235,202, 97,242,152,174,221,175,145,144,253, 44,157, 53,232, 69, 32,178,237,169, 75,197,221, 33, 75, 98,230,
- 22,225,199,166,215,254,227,101, 28, 78, 41,131,225, 52,109,243,212,  4,164,137, 64,244,208,186, 32, 30, 11,141, 98,247, 36,105,
- 41, 79,117,237,235, 40,252,105,  2, 49, 23,181, 32,190,140, 84,147, 24,100, 28,167, 53,209,  5,199, 67, 62, 15,147,215,252, 55,
- 73,141,162, 22,106,246,146,159, 64,117, 80,186,142, 57,247,162, 81, 22, 69,205,137,149,243,144,126,177, 54, 32, 90,120,226, 66,
- 67,190, 98,178,252,220, 85,136,218,209,225,252,182, 70,237,200,113,144,109,120,175, 54,118, 79,231,141, 40,199,149,157,111,187,
-169, 91,242,199, 90, 25, 44, 85, 28, 47,167, 27, 46,188,126, 97,244,205, 48,245,235, 68,149,140,  4,255,150,212, 91,194,219, 98,
-241, 52,251, 90,  0,247,245,103,111,128,251, 92,152,188,227,181,216,219,200,124,222,184,105, 33,224,247, 61,153, 98,194, 20, 33,
- 98,206,140, 86,156,221,204,147, 10, 85,191, 98,161,166, 82, 73,124, 62, 42,186, 92,149,184,138,108,219,135,157, 52,165,176, 13,
-  5, 87, 80,126,153,131,237,213,139, 20,239,181,226, 32,190,140,175, 67, 21,154, 10,216,222,196,166, 13,177,133,222,125,222,239,
-251,190,  7,189,119, 22,197,184,132,240, 68,196, 87,178,106,170, 56,190,164, 70,139, 32,180,168,119,167,102,175,129,124,105,  2,
-113, 86, 83,  6,128, 92,  0, 20,148,116,202, 29,207,126,139,124, 15, 46,145,179, 41,225,156, 13,199,125,  2,156,136, 99,147,165,
-164,221,211,  1,204,133,144,217, 78,169,217,125,135,120, 27, 11,249, 39,100,207,247, 53,208, 99,124,  4,239,161, 77, 91,230,111,
-136,127, 19,136,159,  2,144,118,109, 59,106,195, 80,208,231,216,216,161, 41, 44,171,221,125,104, 87,253,157, 85,255,255,  1,  9,
-245, 15, 42, 30,118,165,  0,  1,199,113,207,197,129,208, 80,161,182,  8,129,100,  7, 80,236, 57,227,153,177, 18,104, 20,241,127,
- 86,137,194,209,131, 46,214,  5,210, 26,205, 61, 48,248, 57,153, 46, 98, 15, 57,  0,135, 60,196,104,175,192, 66, 98,114,177,109,
+137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73,
+ 72, 68, 82,  0,  0,  1,245,  0,  0,  1, 26,  8,  2,  0,  0,  0,135, 56, 89, 17,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,
+  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  4,103, 65, 77, 65,  0,  0,174,211,164,123,114, 68,  0,  0,  0, 32, 99, 72, 82,
+ 77,  0,  0,110, 39,  0,  0,115,175,  0,  0,246,112,  0,  0,129,232,  0,  0,107,215,  0,  0,226,170,  0,  0, 48,131,  0,  0, 21,
+ 42,251,118,133,113,  0,  3,  1,163, 73, 68, 65, 84,120,218, 98,252,255,255, 63,195, 40, 24,  5,163, 96, 20,140,130, 97,  7,  0,
+  2,136,133,138,102,253,249,249,253,223,203,235,127, 63, 63, 99,150, 50,102, 19,148, 28, 13,220, 81, 48, 10, 70,193, 40, 24, 64,
+  0, 16, 64,140,212,106,191,255,249,241,237,247,230,124,150,143, 55,128,236,255, 12,204,127, 52, 35,217,204, 18, 89, 88,217, 70,
+131,120, 20,140,130, 81, 48, 10,  6,  4,  0,  4, 16, 19,181, 12,250,255,242, 26,164,112,  7, 85, 26, 12,127, 89,174, 45,249,190,
+171,121, 52,124, 71,193, 40, 24,  5,163, 96,160,  0, 64,  0, 81,173,124,255, 39,168,248,155,153,  7,216, 25,  0, 35, 16,193,246,
+116,255,151,205,165,127,190,127, 30, 13,229, 81, 48, 10, 70,193, 40,160, 63,  0,  8, 32, 70, 42,206,175,254,120,126,243,239,193,
+ 54,150, 79,119, 17,141,122,  6,134,191,156,162, 76,206,237,156, 82, 26,163, 97, 61, 10, 70,193, 40, 24,  5,244,  4,  0,  1,196,
+ 72,245,245, 51,159,143,205, 99,189, 50,159,225,255, 63, 68,211,158,145,229,183,106, 16,183, 69, 50, 11, 39,207,104,136,143,130,
+ 81, 48, 10, 70,  1,125,  0, 64,  0, 49,210, 98,125,228,143, 59,135,255,238,111, 96,250,247,  3,218,134,  7,227, 63,156, 18, 44,
+110,237,156,146,234,163,129, 62, 10, 70,193, 40, 24,  5,116,  0,  0,  1,196, 72,163,245,239,223, 95,221,251,191,187,138,225,243,
+ 35,132,208,127,134,191, 76,236, 76, 86, 37,220,186,222,163,225, 62, 10, 70,193, 40, 24,  5,180,  6,  0,  1, 68, 84,249,254,237,
+195,235, 63,119, 14,253,120,126,249,255,159, 95,196, 27,205,252,235, 51,215,251,179,176, 38, 60,130,248, 99, 90,194,111, 18, 60,
+ 26,244,163, 96, 20,140,130, 81,  0,  7,255,254,253,251,254,253,251, 71, 48,  0, 50, 88, 88, 88,254,252,249,195,205,205, 45, 36,
+ 36,244,245,235, 87, 70, 70,198, 31, 63,126,124,251,246, 13, 82, 98, 75, 72, 72,  8, 11, 11,179,179,179,227, 55, 19, 32,128,  8,
+151,239, 31, 46,237, 96, 58,209,195,252,247, 27, 68, 61,156, 96, 64,110,153, 99, 99,162,  9, 33,217,243,255,175, 94, 18,191, 77,
+218,104,140,142,130, 81, 48, 10, 70,  1, 16,  0,203,244,135, 15, 31,242,241,241,241,242,242,242,240,240,176,177,177,  1, 11,244,
+143, 31, 63, 29, 63,126, 76, 89, 89, 89, 76, 76,140,131,131,131,133,133, 21, 40,200,196,196,248,239,223,255, 47, 95,190, 60,124,
+248,  0, 88,244, 75, 73, 73,  1,  5,113, 25, 11, 16, 64,  4,202,247, 95, 63,127,124, 91,224,203,242,247, 43,  3, 35,169, 14,254,
+143, 89,214,255, 71,106,201,255,145, 48,231,245,106, 97,225,228, 29,141, 90,234,  2,120,132,226,137,245,145,224,134, 81, 48, 10,
+134, 74,179,253,237,219,183, 79,158, 60, 49, 48, 48,  0,230, 23, 96,217,253,251,207,223,175,223,126,222,185,255,114,223,190,189,
+ 26,106, 10,110, 46,118,236,108,172, 64,193,191,255,254,255,252,249,231,219,143, 95, 63,126,254,225,229, 98, 23, 18,228,190,127,
+239,174,176,176, 16,176, 33,143,203,112,128,  0, 98, 33, 42,183, 34, 10,107,244,236,202,136,209,110,255,143,213,  0,140,246, 60,
+243,243, 19,159,151,199, 50, 59,212,240, 41,153,140,198, 49,229,229, 41, 16,124,248,250,227,194,131,215,144,178, 85, 79, 78, 88,
+128,155,131,  9, 88,215,195,  0, 29,138,111,136, 51, 46, 60,120,245,225,235, 79, 32,131,166,110, 24,  5,163, 96, 24,128, 63,127,
+254, 60,120,240,128,149,149, 85, 87, 87, 23,152, 65,158,191,250,120,227,206,139,  7,143,223, 60,124,244,252,209,131, 91, 92, 60,
+  2,191,152,127, 10,  8, 63,248,249,235,239,171,183,159,190,125,255,245,251,247,223, 63,192, 98,254,255,127, 54, 86, 22, 89, 25,
+ 17,  1,142,239,114,114,114,120,204,  7,  8, 32,194,227, 51,223, 30, 95,250,115,105,197,175,175, 31,153, 88, 89,177, 20,240,159,
+158,177,124,125,140,117,180,230, 55,155,240,127,  1, 57, 14,126,201,127,191, 62,253,120,243,148,237,219, 35,198,255,127,224,101,
+ 61,220,214,127,186, 73,130,246,233,104,166, 94,186,241, 96,235,249,187, 14,186,138,198,106,178,108,108,172, 67, 40,182,110, 61,
+120,190,243,226,125, 75, 85,105, 11, 61,101,186,213,255,139, 14, 93,155,186,235,226,165, 71,111,145,197,229,132,121, 34,173,212,
+178, 93,245,132,120, 57,153,153,153,169, 82,194, 66,138,239,210,165, 71, 58, 35,173,244,229, 69,153,192,  0, 34, 14,172, 93, 74,
+150, 28,222,124,238,222,199,111,191,144,221,144,238,172,147,235,174, 15,116,  0, 92,241, 40, 24,  5,163,  0,152,101,222,189,123,
+247,250,245,107,110,110,110, 89, 89, 89, 96,153,125,226,236,189,157,  7, 46,189,127,243,250,243,231,215, 92,220,252, 95, 62,127,
+144, 85,212,178, 50, 86, 97, 98,102,190,126,251, 57,166,  9,192,220,244,246,213, 51, 39, 71, 43, 27, 19,  5, 22, 22,236, 57, 11,
+ 32,128, 40, 90, 63,243,238,236, 70,166, 83,253, 76,255,126, 34, 23,237,255, 25,152,126, 75,219,115, 24,132,115,202,232, 48,179,
+ 32,250,  7,127,190,127,249,126,125,231,239,115, 11,152,127,188,130,171,133,216,253, 95, 59, 86,208, 41, 23,217,228,221, 71, 47,
+120, 78,218,  1, 84, 35,192,198,116,170, 45, 86, 73,142,192,105,101,249,147, 86,223,253,  8,114,134,151,158, 98,150,191,245,128,
+ 68,216,179, 23,175,108,107,150, 62,253,250, 27, 88,  7,206,138,177,143,243, 50,167,138,177,223,190,255,216,126,241,  1,144, 33,
+203,207, 97,166,169,112,238,230, 35, 35,117, 68,141,253,254,203,119,183,182,245,151, 30,189,193,165,157,143,147,109, 83,145,151,
+145,146, 56, 11, 48,  9,128,155,210,148, 56,230,222,203, 15, 22,181, 43,128, 37,248,166, 34, 79,123, 45, 89,160,153,192,130, 27,
+ 40, 14, 44,244,221,219,215, 35,151,236,200, 64, 71, 70,104,115,177,183,  8, 63, 55,196, 13,163,121,123, 20,140,240,146,253, 45,
+ 24,176,177,177,  1, 73,126,126,254, 63,127,254,157,188,240,224,232,241,211,156,236,156,255, 25, 25,248,248,132,128,170, 24,153,
+ 89,228, 36,249,213,212,213, 46, 93,127,241,247,239, 95,244,130, 27, 12, 94,191,122, 42, 38, 38,157, 20, 97,205,195,141,125,162,
+ 21, 32,128,200, 60, 63,242,231,151, 15, 95,143,204, 96,190,179,  1,109, 64,230, 55,135,  4,139,117,177,136,166, 45, 22,155, 56,
+121,120,141,130,255,104,186,127, 62, 56,137,241,246,  6,148,246,254,149,197,159,132,228,248, 12,252, 81,  4,193,133,255,135, 95,
+127,127,252, 36,188,104,231,196,205,167,103, 94,129,102,128, 21,  5,  7,108, 64,255,223,191,255, 79,128,133, 59,246, 33, 42,242,
+  1, 23, 39,135, 36,203, 95, 96, 92, 78,221,124,156,155,153,177,107,193,246, 21,237, 25,240,132, 18, 58, 97, 43,114,225,174, 41,
+201,207,199,201,250,233,251,239,235,207, 63, 66,251, 87,223,127,249,245,109,219, 80,224,110,162, 34,  5, 47,142,201,  3,192,186,
+ 36,124,226, 86, 72, 33,254,235, 23,176,171,248, 27, 98,218,131,215, 31,145, 11,119, 62, 14, 86, 77, 41,126, 32,227,228, 61,168,
+195,174, 60,121,231,211,179,229, 96, 77,  0, 40, 25,140, 22,241,195, 11,124,249,250,243,238,253,215,112,174,178,162, 40,176,172,
+217,181,239,218,177, 83,119,173,204,148,221,156,180, 72, 50,141, 72,141,104,150, 74,136,241,137,139,241,145,231,254,187, 15, 94,
+ 47, 94,113,162,161,194, 23,191, 93,250, 58, 50,212, 10,177,  7, 15, 30,  0,179,143,146,146, 18, 48, 47,112,115,113,223,186,125,
+107,253,150,163, 60,252, 18,146,114, 26,192,252,241,255, 31,168,248,224,229,227, 84,146,224,224,224,226,218,176,105,167,172,130,
+ 38, 19, 19, 51,184, 76,135,244,128,255,255,254,253,243,199,143,111,111, 95, 61, 23, 17,147,150,145, 20,192, 85,184,  3,  1, 64,
+  0,145, 83,190,127,123,245,240,235,166, 34,182, 31, 79,209,196,127,113,201,243,  4, 77,229, 20, 16,129,150,245,191,127,239, 61,
+121,109,203,165,251,130,220,156,206, 26,210,214, 70,234,172,172,172,192, 82, 94,208,163,234,237,215,183,204,207, 14, 51, 32,141,
+204,255, 62, 54,225,151,134, 43, 27,  7,215, 80,175,155, 25, 24,168, 63,202,204,195,195, 13, 36,181,100,132, 22,108, 59,166, 41,
+129,168,192,128,  5,235,225, 27,207, 32,108,115, 37,145,206, 96, 35, 57, 17, 94,200, 80, 12,176,180,109,220,120,110,205,153,135,
+144, 34,190,115,243,185, 37, 89,194,224,201,119, 50,155,240,255,254,253, 75,153,181,  7, 62,  4,244,231,207, 95,160,  8,100,192,
+189,100,201, 97,120,225,158,235,172,145,239,162,  9, 25,141,  1, 86, 51,115, 15,221,156,176,251, 26, 80,252,234,211,247,109, 27,
+207,212,  4,154,193,135,227, 71, 75,198,225,  1,128,101, 95, 67,199, 38, 68, 90,229,102, 47,201,117,255,242,237,231,197, 43,143,
+245, 72, 47, 19,137,212,  8,177, 84, 95, 71, 22,194, 37,163, 34, 65,216,248,  5,100, 35,166,248,186, 45,231, 47, 93,121,  2, 44,
+247, 33,118,173, 95,146, 69,149,150,251,163, 71,160, 45, 65,106,106,106,192, 44,240,225,195,167,109,219,182,187,123,122, 91,218,
+114, 94,185,245, 76,132,159, 75, 84,136, 71, 94, 86, 68, 86, 74, 72, 12,152,145,153,152,158, 60,121,250,248,169,230,227,167,207,
+249,248,133,254,254,253,  3, 90,237,242,229,211,175, 95, 63,216, 56, 56,129, 36,232,156, 94, 22, 38,125, 29,124,227,239,  0,  1,
+ 68,114,249,254,233,206,201,159,123, 27, 89,126,189,133,159, 63,  0,201,169,255,152, 56,184,220, 26,224,133,251,142,227,151,171,
+150, 29,188,250,250, 43,164,204,235,220,126, 65, 73,248, 64, 95,180,189,151,149, 46, 80,132,223,179,238,203,202,184,255,159,159,
+195, 87,212, 48,254,254,242,253,226,  6, 54,243, 40,244,226, 18, 44,255,236,229,155, 77, 39,110, 60,124,253,241,195,247, 63,192,
+ 48,146, 17,226,246, 48, 86, 53,209, 84, 64, 81,248,255, 63, 90,211,249,205,187,143,107, 14, 94,220,113,249,193,213,  7,175,222,
+126,251,197,201,194,172, 32,193,239,162,167,152,236,106, 44, 39, 41,130,203,131,251,207, 92,223,116,234,214,201,187,207, 56,216,
+217, 12, 20, 36,  2,205, 84,109, 13,212,208,212,220,188,247,116,221,137,235, 79,222,125,251,241,239,191, 32, 59,179,162,164,160,
+135,129, 18, 59, 11, 19,  3,194,  9,  8,135,188,251,240,105,241,222, 11,155,207,220,186,251,242,227,151, 95,127,217,153,153,100,
+132,185,237,117,149, 18,157, 13, 52,228,196,177,186,225,240,133, 91,221, 27,142,223,124,242,  6, 24,201,103,102, 22,114,115,178,
+255,255,255, 79, 78,148,159,143,157, 77,150,159,  3,174, 76, 78,152,247,112, 93,144,119,247, 22, 55,109,169,238, 48, 19, 96,115,
+  0, 84,131,130, 27,200, 92, 92,255,166,196,219,157,184,183,238,201, 59, 80, 20,236,188,242,244,205,199, 47,146,172,172,204, 96,
+ 64, 70,186, 44, 89,114,104,203,185,251,136,226,254, 63,180,112,191,255,234, 35, 92, 60,200, 72,182,192, 85,139,157,157, 29,216,
+241,  4,218,194,195,195, 80,233,111,242,236,227,143, 85,167,238,  1,101,231, 28,188, 81,234,  5, 29,136, 31, 45,223,135, 31,104,
+168,240,155, 62,239,192,203, 87,159,128, 45, 98,204, 38, 57,164,105, 31,232, 99,120,236,228, 93, 96, 33, 14, 26,235,187,255, 26,
+216, 52,118,115,212,178, 50, 87,  6,106, 89,191,249, 60,144,251,229,235, 15,252, 26,149, 21, 68,129,138, 25,161, 54,250,162, 41,
+  6,214, 46,174,142, 90,192,230,252,209, 83,119,131,124, 12, 33,226,192,166, 61, 68,  4,200,  5, 22,217, 64,110,102,146, 61,208,
+174, 93,251,175,  1,185,112, 19, 22,175, 60,  1,233, 19,  0,107, 23,160, 94,160,212,139, 87, 31,129,165, 60, 15, 23,123,108,132,
+ 37, 80,252,226,149, 39,187,247, 95,  3,106,132, 84, 39, 64,147,129,238,129,248,  2,232, 60, 98, 26,248,207,159, 63,255,251,247,
+175,162,162, 34, 48,253,191,123,247,121,203,230,205, 22,150,182, 92,156, 60, 62, 46,122,198,186,114,194, 66, 60,156,236,108,192,
+ 60,138,200,224,114, 50,  1, 30, 44,187, 15,177,158, 61,127,233,223,191,191,156,156,188, 28,220,220,188,  2,194,156, 92, 60,204,
+204, 44, 64, 67,190,125,122, 46,196,139,175, 12,  7,  8, 32,210,202,247,183, 71, 23, 49,156,155,197,252,255,247,127,120,201,206,
+  8, 45,201,254,233,196,112,203,104, 66,148,205,219,124, 36,119,217,209, 63,255, 81,230, 82,239,189,249, 18, 48,113,107,223,235,
+ 15, 57,254,182, 44, 92,252, 76,214,229,127,182,231, 35,183,123,127,156, 91,204,143, 92,190,195,116, 55,175, 60,184,229,234,211,
+111,127,144,202,205,255, 12,245, 27, 78,133,153, 40,205,206, 13,224,225,230,100,192, 54, 38,178,225,224,185,180, 57,187,223,124,
+255,  3, 23,249,240,231,207,139,  7,111, 79, 60,120,219,189,229,108,178,163,118,103,130, 59, 23, 39,199,149, 91,143,138,151,236,
+131, 40,200,182,215,156,184,227,252,193,  7,239,224, 21,215,161, 59, 47, 39,237,185, 20,107,174, 50, 51, 55,  0, 50,205,251,237,
+251,143,210,153,155,231,159,184,251,231, 63, 74, 83,189,112,233,225, 72,  3, 89, 72,117,196,136,228,156, 61,167,174,166,204,218,
+249,252, 11,210, 16,211,159,127,175,159,125, 60,255,236,252,148, 93,231,107,253, 76, 43, 34,157,129, 98,215,110, 63,154,180,227,
+ 60, 68,222, 68,134,175,120,245,201,239,127, 65, 70,136,177,130,134, 50,148,229, 65,211, 15, 42, 10,210,152, 99,112,  6, 10, 98,
+155,138, 60, 37,249,216, 57, 57,217,129, 37, 59,164, 96,133, 53,177,255,120,235,203,207,220,127, 13,194,189,244,232,141,168,  0,
+ 47, 43, 43, 43, 25,133,251,194,131, 87,167,238,186,132, 85,118,211, 89,196,113,114,121,206,154, 64,  7,112,112,112,192,157,  1,
+ 76,205, 21,126,198,144,242, 29,216,156,223,114,254, 65,144,185,218,232, 16,205,240,108,200, 63,120,253,245, 43,168,224,134, 20,
+193,240, 66,115,221,230,115,144,193, 19, 96, 51, 25, 88,250,  3, 75, 67,228,246, 50,144, 61, 67, 49,166,161,125, 19, 80, 28, 88,
+142,127,249,250,147, 24,141,174, 14, 90,144,  2, 23,194,  5,202, 46, 94,121, 60, 54,220, 18, 88,224,  2,219,218,  5,153, 46,139,
+ 87, 28,135,148,239,192, 66, 31,210, 27,  0,137,248, 26,  1,171, 19, 96, 37,  4,113,225,221,251,175,130,124,140,128, 12,136,177,
+144,202,  6,200,  0, 42,  0,150,233,112, 23,  2,221, 48,189, 99,147,181,153, 50,208,100, 96, 65, 15,148,  2,218,  5, 49, 25, 88,
+  1,196,133, 91, 94,188,250,  4,168,101, 70, 95, 12,254,240,249,241,227,199,151, 47, 95,128, 45,119, 96,201,241,225,227,247,189,
+123,246,106,104,104,  9,139,138,  3,115,  3,  7, 59,171,162,156, 40,214,172,247,239,239, 95, 29, 85, 33,  6, 70,147, 55, 31,190,
+113,114,112,178,179, 51,179,179,177,240,114,177, 11, 10,112,241,242,112,178,177,168, 61,125,250,148,143,143, 23, 87,163, 13, 32,
+128,136, 45,223,255,124,255,252,102,107, 51,235,179,  3,200, 99, 16,240,214,234, 95,102, 94, 94,195, 16,136,202,107,119, 30, 23,
+ 44, 63,250,251,223,127,140,129, 11, 16, 40, 91,126,196,217, 80, 77, 83, 78,156, 79,205,234,205,  9,117,198,247, 55,225,  6,177,
+252,124,253,245,209,101,110, 57, 93, 84, 61,255, 87, 93,124,140,106,  6, 20,172, 58,115,239, 85,219,242,189,173, 73,152,174,221,
+114,248, 66,228,212,237, 63, 65,110, 96,100,103, 98,140,183, 86, 51, 82,149,254,246,227,215,154, 99, 55,142, 61,120,  3, 20,159,
+182,247,202,155, 79,223,151,151, 71,124,250,246,115,207,181,167, 16,255,156,186,253,252,211,159,127,140, 12,140, 98,236,192, 70,
+ 38,227,115,104,221,240,127,241,201,219,156,140,235,166, 21,133,  3, 57,153, 19,214, 46, 59, 15, 63,116,225, 63,114, 51,116,249,
+  5,136, 56, 35,220,153,199, 47,221,  9,155,180,245,235,239,127,224, 81,105,230, 76,  7, 29, 69, 25,145,175,223,126,110, 63,123,
+103,207,205,231,127,192,181,148,  0, 47, 87,134,143,229,235,119, 31,230, 31,185,  6,209,184,140,137,241,199,223,127, 88,189,140,
+ 89,190,  3,227,213, 88, 89, 18, 88,140, 66,216,144,214, 49, 92, 86,128,135,  3,121,122,  0, 14,136,111, 62, 67, 22,204,164,207,
+217,135, 75,246,  8,108,128, 72, 90,144, 75, 78,132,151, 13, 12,128,181,  8,196, 25, 64, 82, 69, 82, 72, 86,152,231,241,219, 47,
+160,  0,185,253,194,207, 88,  9,232, 90,200, 32,210,104,153, 56,156,  0,176,  0,133, 23,244, 72,205,234,171, 64,210,218, 92,  5,
+ 52,226,177,249,220,209,147,119, 32,131, 42,153, 73, 14,192,102,123, 73,237,106, 96,209, 12,108, 89,  3,203, 86,160,154,146, 92,
+ 55, 96,123, 25, 98, 14, 46,141,192, 18, 22, 88, 58,127,248,248,109,247,129,107,235,183,156,135, 91,228,230,164, 13, 25,162, 57,
+118,242,206,213,235,207,176,186, 48, 54,220,  2,100,242,126, 80,187, 27,168, 12, 88, 31,  0,221,192,205,205, 14, 52, 31, 50,200,
+115,233,234, 19, 72, 19, 30,168,  0, 84, 43, 92, 97,  0, 86, 18,144, 90,  4,232, 72, 96,245,  3,169, 51, 94,190,254,  4,233, 88,
+  0, 45,133,152,  0,113, 45,126,112,251,246,109, 89, 89, 89, 72, 69,178,103,239, 30,126,126,126, 57,  5,101,118, 86,102, 46, 46,
+156, 77,174, 47,159, 63,127,253,250, 85, 94, 94, 86, 67,147,247,193,227,183,192, 86,211,207, 95,127,190,127,251,253,233,235,143,
+ 79,159,127,188,125,247, 21,216,  8, 20,230,251,251,236,217, 51, 25, 25, 25,172, 25, 10, 32,128,136, 42,223,191, 62,190,250,121,
+ 71, 45,203,183, 39,240,102, 59,122,225, 45,166,195,193, 39,  8, 97, 47,216,119,  1, 81, 60,161, 15,180, 48,  0, 91,254, 51,183,
+159,158,144,238,  3, 50, 71,222,238,255,187, 27, 40, 85,220,211,139,176,242,253, 63,242,102,168, 24, 51,165, 66, 31,115,  5, 41,
+225,223,127,254,158,190,253,172,124,201,129,171, 47, 63,128,198, 82,110, 62, 91,115,232, 66,136,157,  1, 82, 89,248,255,231,207,
+ 95,213, 75, 15,252,132, 86, 48,255,235,253,140, 43, 98, 60, 32,230,231,248, 89, 59, 87,205, 59,124,239, 21,208, 11,171, 78,223,
+ 73, 63,123,131, 13, 82,239,129,213,126,250,253,207, 65, 73,164, 38,204,206,214, 64, 21,216,198,220,118,236,138, 95,255, 38,136,
+236,146, 83,247,250,126,252, 60,113,245,254,178,243, 15,161,243, 72,  2, 92,221, 49,246,198,106,210,188,220, 92, 79, 94,189,159,
+186,227,236,172,131,215, 81,154,238, 12, 12,213, 75,246,126,249, 13,154,248,102,101,100, 92, 91,224,103,103,  8, 61, 91, 45,199,
+223, 38,162, 99,197,186,243,160, 97,141,170, 21,135,162, 29,244, 25,144, 22,149,255,248,251, 63, 88, 95,182, 60,208, 90, 78, 82,
+  8,127, 33,  8, 31, 79,135, 47,127, 68, 83, 15, 41, 85,225,229, 47,164,112, 39, 41,211,222,127,  5,154, 59,133,176, 53, 37,249,
+225,211,182,240,242,253,195, 55,104,131, 75, 70,128,139, 25,  6,224,117, 12,144,  1,228,202,193,202,247,171,207, 62,  0, 11,119,
+ 82,235,152, 81, 48, 36,192,250, 37, 89,187,246, 93,  3,182,100,129,  5, 52,100, 64,  3, 82,150, 65,134,203,129, 36,124,184, 28,
+210, 40,230,225,102,151, 16,227,  7,150,239, 16, 17, 37, 69,148,  6, 44, 46,141,192,194, 93, 95, 71,  6, 82,230,194,199,103, 26,
+ 58, 54,115,195,230, 24,121,184, 57,136, 26,118,255,250, 19,121, 74,246,216,201,187,221,147,119,  2, 27,248,129, 62,134,144,230,
+ 57,150,105, 48,152,201,220,220,236,164,  6, 14, 36,217,115,113,113,253,248,249,231,204,153,179,191,127,124, 55,178,119,  2,230,
+ 90, 62, 62, 14, 60, 90, 94,189,126,253,235,247,111, 97, 97,225,119, 31,190, 61,120,242,246,227,167,239,127,254,252, 67,148, 48,
+224,130,248, 31,  3,247,159,219,247, 69, 68, 68, 56, 57, 57, 49, 13,  1,  8, 32,194,229,251,155, 83,235,254,158,232,103,254,247,
+  3,169,112, 71,202,153, 96, 38,139,  0, 98, 40,252,244,189, 23,200,187,157, 48,139,147,211,183,161,237, 95, 86, 65,201, 95,168,
+ 42,152, 62,191,196,104,241, 51,184,169, 75,204, 45, 10,101,129, 45,181,244, 18, 17,210,146, 23, 87,207,159,  9,110, 22, 51,172,
+ 58,122, 29, 84,190,255, 71,140,123, 95,189,251,228,242,107, 68,185,166, 34, 33,188,251, 20,162, 22,209,148, 20,  4,150,239, 16,
+181,235, 78,221,138,176,212,132,219,228,168, 34,177,165, 33,134,131,  3, 26,226, 94, 86, 58,102,107, 14,157,122,252, 30, 52, 44,
+243,247, 63, 48,184, 87, 31,191,254, 31,230,249,133,121,190,230, 58,208, 21,238,154,188, 60, 83,178,101,223,126,249,177,230,236,
+ 61,120,208,220,121,248,244,200,  3,232,108,164,180,  0,199,207, 63, 12,187, 79,223,132, 59, 67, 70,136,  7,226,243, 47,191,254,
+110, 63,115, 75,156, 19, 62, 94,241, 63, 88, 79,110,113,121, 36, 11, 11, 81, 85, 47,254,185,202, 35, 55,159, 35, 26,215,194, 60,
+164,238, 51, 66, 94, 48,  3, 44,220, 23,167, 88,155, 52,111,195,172,185, 49,235, 27,116, 23,194, 18,204,147,247,223,128,193,  8,
+153,152, 29, 45, 16,135, 25,  0,150,185,144,150, 59,242,114, 14, 96,155, 23, 88, 70, 67,134,197,129, 69, 57,176,129, 12, 31,129,
+ 65,148,155,224,193, 16, 96, 19, 24, 88,118,195,  7,196,137,209,136, 92, 91,  0, 53,  2, 27,215,224,181, 46,175,228,100,132,224,
+ 53,  4,242,128, 62,154, 22,160,107,129, 85,  5,100, 76,233,197,235, 79, 64, 27,129, 13,124,100, 91,144,245,  2, 29,  9, 52, 25,
+ 40, 11,116, 18,100, 16, 31, 94, 51, 17,  3,126,252,248,241,230,205,155,237,219,119,  8,139, 72,190,121,245, 74,223,192, 24,152,
+ 79,248,120,241, 21,238, 79, 30, 63,  6,146, 26, 26, 26, 95,191,253, 58,124,242, 22,176,193,142,200, 52,192, 28,197,  8,109, 52,
+255,254,245,235,238,203,247,198, 70,191,177,150,239,  0,  1,132,175, 16,249,253,243,199,139,173, 93, 28,143, 54, 51,161,103,103,
+216, 40, 51, 60,123, 35,229,104, 14,118, 86,164,145, 27, 44,128, 29,118, 41,235,223, 63,127,208,178, 57,211,223,175,152, 99,  0,
+ 33,150, 26,104,133,157,130,148,168,145,172,208,201,135,160,129,242,235, 15,208, 87,254,159,190,255,  2,153, 27, 54,125, 39,142,
+162,145,225,202,227, 87, 12,150,154,  8,149,150,234,240,194, 29,  2,  4,249,121, 24,192,229, 59, 52,  5, 63,120,  1,174,143, 24,
+ 85,  5,216,225,133, 59, 28, 68,217,106,  3,203,119,248,224,213,211,183,  8,191, 60,120,255,221,187,123, 45,174,112,190,247,236,
+181,184,146, 56, 60,104, 35, 28,244,137, 44,220,  9,228,183,135,175, 31,189,133, 94,158,229,170, 41,  9,105, 74, 19, 95,184, 35,
+ 47,152,225,227,100,237, 10, 53, 17,230,197,183,186,233,201,135,111,184,164, 62,126,135, 78, 63, 60,125,255, 13, 62, 70, 52, 90,
+ 32, 14, 51,  0, 95, 69,  3, 25,  7,135,176, 51,147, 29,186, 39,237, 60,122,242, 14, 16, 65,138,126,101, 69, 49,140,118, 49, 59,
+164, 52, 71, 94,135, 67,140, 70, 56,  0,150,236,245, 29,155, 50,138,150,124,  5, 13,226,139,133,  5,154,236, 63,124,163,164,118,
+ 53,104,236,  1, 71,173, 16,228, 99,  4,236,106,  0, 75,106, 96,169, 13,238, 34,200,172,223,124, 14, 50, 94,  4,239, 40,  0, 59,
+ 34,192,158,  1,100,248,222,205, 73,235,216,169,187,153, 69, 75, 32,141,247,204, 36,251,233,243, 14, 18, 31, 56,175, 95,191, 22,
+ 19, 19, 99,102,102, 83, 82, 82,253,249,243,199,215,175,159,248,248, 20,129, 29, 93, 92,195,158,111,223,190,101,102, 97, 17,229,
+227,  7,230,217,107,183,158,  2, 11,119,112, 83,  9, 60,223,249, 15,178,156,  4,218,120,250,246,237, 51, 80,246,225,211, 79,130,
+  2, 88, 86,136,  2,  4, 16,206,114,228,199,135,215,239,183,212,176,189, 62,251, 15, 92, 91, 32,236,102, 98,255, 39,105,206,252,
+244, 16,114,193,254,255,251, 59,184,  2, 11, 21,169, 61,144,241,175,255, 88,134,144,129, 28,  7, 45,104,111,235,239,183, 79,255,
+ 81,135,111,254, 51, 48, 97,182, 12,181,101,177, 44, 50,225,231,  1,150, 53,160,162,231,215,159,191, 48,197, 80,245,159,191,126,
+ 39,106,  9,250,127, 96,220,127,135,116, 49, 32,190,208,149,151, 64,175,  2,152, 64,251,191,224,103,170,253,248,  5, 29,145, 23,
+192, 86,241, 42,139,242, 51,192,215,240,252,255,127,239,237,199,255,255,255,163,173,150,100,196,114, 42, 15,195,183,159,191,145,
+122, 58,255, 85,196,248, 41,207,108, 64,171,167,236,188,  8,231, 38,216,168, 64, 22,191, 19, 57,177,  9,212,158, 58,107, 15,124,
+ 97,204,210, 84, 91, 61, 57, 97,172,115,179,214,234,146, 71,110, 61,135,148,221,192,234, 68,131,139, 11,173,236,254,240,245,199,
+229,199,111,145,171,141,209,194,125, 56,  1, 96,209,220, 80,225,135,204,  5,150,197,192, 82, 18, 88, 62, 66,150,165,207,232,139,
+  1,182,148,191,124,249,  9, 41, 70,129,236,192, 47,134,202,224,209,152,216,  8, 11,  8,219,202, 92, 25, 50,228,  2,212,242,226,
+213, 39,130, 26,209, 44,133, 40,  6,154,192,195,195, 14,180, 23, 40, 50, 29,168,247,254,107,160, 57,192,154,  6,216,244,  6, 22,
+202,112,245, 64, 75,129, 34, 64, 45,202, 74,162, 64,195, 33, 85, 11, 80, 87, 79,115, 40,196,106,136, 22,136,153, 64, 17,160,  2,
+136,153,160,181,146, 96,247, 64,150,202, 64,204,193,116, 12, 38,248,254,253,251,159, 63,127,128, 45,241,159, 63,255,255,254,253,
+ 91, 86, 70,230,253,187,215,192,182, 22, 46,245,159, 63,129,  0, 48,183, 10, 10, 10, 60,  3,173, 71,122,133,104,174,  3, 75, 20,
+ 38,164, 65,239,255,255,158, 63,125, 32, 35,171,242,230, 45,246,107, 80,  1,  2,  8,123,249,254,241,246,201, 47, 59,235,153,127,
+189,249, 15, 29,144,129,102,200,191,108,130, 60,158,237,204, 76,140, 95,159, 30, 68, 46,131,127, 61, 60,129,168,120, 61, 77,167,
+238,190,240,254,251,111,172,253,120,  1, 14,150,100, 55,232,129, 51,191, 31,159,102, 70,205,235,127,153,185, 49,138,247,255,143,
+223,127,177,192,112,225,171,119,208,129, 96, 78, 54, 52, 47,252, 23,224, 67,220, 18, 37,207,195, 86, 21,110,135, 43, 28,133,161,
+ 29, 73,232, 82, 24,110, 14, 22, 28, 21,  1,116,149, 16, 23,176,107,  2,118,239,171, 79, 88, 58,125,159, 80,123,130,178, 66,252,
+112, 95,152, 43,137, 39, 56,232,224,114,134,142,172,232,207, 47, 95,225,  5, 60, 55, 39, 27,229,185,238,194,131, 87, 75,143, 66,
+135,131,130,140,228, 20, 68,249, 32,115,158,196,180,223, 33, 11,102,150, 28,129, 14,106,117,134, 24,235,201,137,128,143,175, 99,
+193, 28, 29,242, 49, 84,232,  4, 79, 79,  1, 65,211,198, 11,139, 50,156,129,157, 74,228,115, 11, 38, 35, 85, 51,163, 96,248,  1,
+ 96,105,142,185, 52, 80, 28,117,195, 17,164,124,196,207,134, 27, 66,140, 70,172,150, 34,139,192, 21,136, 99,200,194,205,129, 51,
+160, 42, 97,110, 22,199,240,  5,166, 94,100, 54, 86,199,160,140,115,190,127, 47, 36, 36,196,204,204,242,231,239,143, 79, 95,126,
+126,  2,118, 98, 25, 89,190,126,253,202,195,195,131,150,239,128,213,192,215,175, 95, 62,188,  7, 77, 46, 42, 40, 40,124,254,242,
+243,224,177,155,127,129, 77,162,127,240, 28,  7,106,191, 67, 51, 49, 35,195,199,247,239,132,132,196, 57, 56, 57,180,213,165,176,
+ 90, 13, 16, 64, 88, 74,180, 87,135, 23,253, 57, 61,141,  9,180,  8,146,145, 17,105, 44,230, 47,191,170,128,127, 47,183,136,212,
+231,151, 15,209,199, 85,126,189,255,116,105, 27,159,158, 23,144, 45, 38, 34,184,182, 40, 48,160,123,237, 39,112,107, 23, 89, 37,
+ 15, 27,243,226, 12, 15,105,113,208,105,103, 31,159,220,100,124,126, 10,237, 88,178,255, 60, 98,152,237,247, 89, 59, 79,135, 58,
+ 24, 32, 91,183,255,204,181, 11,207, 63, 65,218,201, 38, 42, 82,240,186, 12, 58,140,174, 33,  3,103,191,252,250,203,215, 84, 93,
+ 66, 84,  8, 89,175,190,138,140, 16,172, 47,115,236,194,109, 44,189, 12,228,233,  3, 72,147, 28, 28,162,182, 26,114,199,238,131,
+246,100, 62,252,240,125,243,145,139,190, 54,250,200,106, 39,111, 61,  9,107,236,131,128,129,130, 24, 59, 19,  3,100,154,247,237,
+199, 47, 41,158, 40,149,212,241, 75,183,101,197,132,100, 36,160,  7,191, 29, 60,113,  9,201,  9,148, 54,111,129,109,228,180,217,
+123, 32,108, 62, 14,214, 60, 23, 77,200,186,120, 98,198,103,128, 94, 56,112,237, 49,124,193, 76,181,143,110,184,185, 18, 59, 24,
+ 96,234,  5,138,232,203,139,234,200,  8, 93,121,  2,234,192,237,186,250, 44,119,209,145,246,  8, 75, 49,  1,232,130,173,201, 59,
+ 47,180,111, 60,  3, 87, 15,116, 12,172, 81,255,243,224,141,251, 70,138, 98,138,212,232,172,140,130, 81, 48,152,193,203,151, 47,
+245,245,245, 95,189,249,242,244,249,123, 96, 22, 98,102,102,123,253,241,235,199,143, 31,129,121,228,255,191,127,191,126,255,254,
+248,241,195,231,207,159,129,249,254,251,143, 31,192,124, 42, 33, 33,241,227,227,199,111,223,190, 95,  4,157, 76,240, 15, 54,150,
+128, 24,147,  1,143,  3,128,134, 22,126,252,248, 34, 33,165, 40, 38,204, 35, 44,196,141,213,106,128,  0, 66,239,173,191, 60,180,
+224,207,201,137, 12,255, 32, 43,220, 33,197, 27,104,180,244,175,156,155, 88,244, 28, 96,225, 14, 20,229, 21,151,255,197, 33,245,
+ 31, 54, 38,  2, 65, 95,143, 76,250,243, 21,218,166,182, 53, 80, 61,213,145,232,169, 37,  3,175, 61,216,153, 24,189,180,165,142,
+ 53,197,120, 90,131,202,196, 63,191,127,125,221,223,199,240,255, 47,204,  2, 72,241,252,159, 83,198, 16,179,237,188,247,214,139,
+196,158,149,151,110, 62,124,243,246,253,131,199,207, 87,237, 62, 21, 63,105, 19,216,175, 32, 55, 70,218,106,163,119, 24, 21,164,
+189, 97,213,233,143,127,255,131, 58, 86,158,191,  5, 90,244,242,249,243,151,229,187, 78,250,117,175, 83,205,158, 90,191,112,199,
+147, 23,111, 17, 21,195,255,255,  4, 74, 85,112,208, 70, 59, 27,253,135, 41, 78,152,190,109,238,182, 19, 79,158,189,124,253,230,
+221,181,219,143,178, 38,173, 93,  9, 94, 90,  3, 51,232,191,136,176, 64,164,133, 26,196,224, 59,111,190,164, 78, 88,243,238,  3,
+104,104,239,251,143,159,107,247,157,241,237, 92,163, 95, 52,171,125,217, 30, 32, 23,110,193,255,255, 12,148, 15, 93,  0, 93, 56,
+105,199,121,248, 70,211,120,107,101, 96, 25,202,198,198, 70,204,170,115,200,106,200,240,137,208, 73,212, 96, 99,185, 20, 59,117,
+ 72,225,206, 10,222, 27,133,169,  5, 40, 56, 53,  1,209, 67, 90,125,250,190, 81,205, 26,143,142,141,110,109,235,185, 19,166, 85,
+ 44, 63,134,172, 88, 67,146, 15, 50,193, 43,157, 61, 55,106,242,246,251,164,204, 80,141,130, 81,128,  6,192, 43,226,159, 32,139,
+  0,185,120,166, 97, 49,  1,169,234,201,  3,146, 82, 82,191,126,255,125,241,226,  3,164,125,  4,204,134,108,236,188,215,174,223,
+184,116,233,226,181,235,215, 95,189,122,  5, 44,180,  5,  4,  4, 21, 20, 21,245,244,244,116,116,116,128, 69,191,136,136,200,250,
+205,187,158, 60,127,135,220,108,135,150, 44,160, 85,241,160,124,247,224,238, 53,126, 65, 81, 96, 13,161,173, 38,197,198,138,125,
+236,  1, 32,128, 80, 68,191,191,123,241,251,244, 12, 70,212,145, 98,208, 57, 55,166, 89, 98, 86, 49,200,135,133,177,235, 71,254,
+ 61,209,131, 58,200,244,250,213,186, 98,225,192, 62,118, 30, 80,211, 88, 89, 86,124, 83, 99,194,155,119, 31, 30, 61,127, 11, 44,
+ 24,164,197,  5,132,  4,  5, 16, 29,150,125, 83, 24, 95,157,249,143,122, 49,200, 31, 14,  9, 14, 73, 21,228,178,  6,194, 96,101,
+100, 88,120,236, 38, 16, 97,186, 62,220, 72,222,217, 76,  7,101,244, 29, 76,205,202, 13,180,175,154,127, 27,178,230,250,254,107,
+163,138,133,138,188,108,239,190,255,249,  4, 90, 93,196,240,245,247,191,230,141,167, 36,249, 57, 51,  2,236, 49,122, 11, 56,134,
+103,192, 64, 75, 65,162,208, 85,191,127,247, 69,160,216,135, 31,127,210,231,238, 70, 87,139,218,192,237, 77,241,186,252,232,245,
+ 25,240,232,243,252, 35,215,151, 29,187, 33,201,205,250,246,251,159,207, 64,103,128,173,235,218,124,202, 65, 87,193, 82, 87,133,
+129,129,129,129, 74,163,210,247, 95,125,108,219,112, 26,194,214,148,228, 47,112,213,130, 44, 72, 39,166,241,254,225,235, 15, 96,
+195, 31,178, 96,198, 92, 73,180, 59,204, 20,168, 23,190, 31, 21,215, 33, 71, 70, 74, 18,147, 98,173,107,214,156,250,  4, 30,148,
+251,244,253,215,177,219, 47,176,154,175, 37, 41, 48,186,121,117, 20, 80, 11, 96,158, 28,  0,228, 54, 84,248, 17,127, 86, 12,169,
+234,201,  3, 76,140, 76,175,223,124,254,  7, 89,120,248,159,225,247,239, 95, 15,239,223,150,150, 18, 51, 52, 52, 70, 62, 28, 23,
+ 88,  0,  0,123,222,191,255,252, 21, 19,151,254,248,225, 29, 23,183,216,211,151, 47,  4,133,196, 64,197, 57,120, 44,133,145,137,
+  9, 88,154,255,249,243,235,215,207, 31, 31, 63,189, 19, 16, 18,227,230,226, 85, 83,  6,205,115,224,178, 26, 32,128, 80,202,247,
+191,239, 30, 50,252,251,245, 31,105,133,251, 95, 78,  9,110,231,106, 97, 77,244, 19, 25,  5,205,130, 95, 94, 88,204,244,253, 37,
+114,177,198,248,234,252,235,249, 65,188, 78,149,252,218,206, 16,113, 17, 33,  1, 32, 66,214,248,227,211,251, 55, 59,218,153, 31,
+237,193, 44, 68, 89,212, 60, 89, 88,177, 12, 61, 79, 12,183,108,217,118,254, 25, 98,200, 27, 90, 14, 38,152, 41, 77,206, 11, 65,
+  8,254, 71,108,112,149, 20, 21, 60,209,157, 86, 50,119,235,242, 99, 55,127,128, 71, 72,238,127,250,  9,113, 37, 27, 35,163,171,
+150, 84, 85,160,149,149,145, 22,102,  9,142,165,108, 71, 93, 10,212,150,228,  9, 36,167,236,185,248,251, 63,202,106, 37,113, 46,
+214,106,111,131,188,213,167,145,117,243,241,114,239,106,138,175, 91,178,123,222,129,171,223,254,252,253,249,247,255,131, 79,136,
+198,130,189,146, 72, 71,162,187,169,150, 50,102, 71,129,194,145, 25,248,105, 48,157, 33, 70,144, 13, 71,196, 52,222,129,122,193,
+167,149,189,133, 84, 12,211, 99,205,129,101, 58,164, 98,  0,181, 24,254,253, 67, 41,223,193, 34, 64,  0,153,179,141,179,211,178,
+ 82, 17,239,220,114, 30,216,126, 71, 54, 51,200,  8,116, 56,198,186,115,208, 21,177,102, 74, 34, 16, 51, 71,203,166, 17, 61, 94,
+241,234, 19,228,164,  1,200, 98, 21,200, 82, 69, 30, 46,118, 76, 65,  6,240,249, 48,192,242, 23,216,202,126,249,250, 19, 68, 22,
+162, 12,185, 13, 14,209,142,124,  4, 13,228,240,  0,  9, 81, 62,200,204, 45, 15, 15, 59,164,165,239,230,168,197,195,205, 14, 95,
+202,  9,239,  7,236,  2,111,243,  6, 90,  4, 52, 25, 40, 11,153,116,133, 76,243,194,101,225, 75,239,225,178, 47, 96,135, 49,  0,
+165, 32, 19,203, 88,253,251,230,205, 27,  6,102,126, 72, 41,194,196,204,252,240,225, 61,208,230, 31, 37,141,127,255, 25,191,255,
+248,253,253,251,111,160, 83,191,125,255,249,243,247,223, 31,223,126,255,250,253,  7, 40,203,202,244, 69, 70,130,253,205,123,198,
+ 15,239,223,  8,  9,139,  3,115,219, 79, 96,153,254,225,205,183, 47, 95, 56,184,184,120,120,249,197,197,101,128, 57, 73, 72,128,
+ 75, 79,  3, 95,229,  4, 16, 64, 40,231,  3,255,252,252,254,245, 76, 55,134,255,127, 33, 69,246, 31, 65, 29,209,208,  9, 92,252,
+ 66, 88,117,190, 62, 56,235,247,233,153,216, 77,213,138, 20,115,205,103,193,200,198,159, 31,223,248,176,169,132,249, 59,150,221,
+101,255, 25, 89,249,227, 55,240,136, 72,194, 82,192,219, 75,183,160,133,130,  9,120, 37, 98,203,146, 93, 59,207,221,189,246,225,
+135, 40, 59,179,129,140, 96,158,183,185,183,  3,226, 98,144, 99,103,174,124,  5, 47,194,147, 20, 19,210, 81, 87,128,139,127,252,
+244,121,213,254, 11,155, 79, 94,123,243,241, 43, 59, 43,139,154,180,112,166,151,185,129, 54,162,151,240,254,195,167, 51, 87,238,
+192, 44, 82, 65, 91, 99,116,233,198,253,151,111, 62, 64,216, 14,230, 58,240,130,233,212,149,187,141, 75,119, 95,120,244,238,203,
+239,127,178, 60,108,182, 90,210, 13,241, 30,252,188, 60,135,207, 64, 15,  3, 80, 83,144,146,151, 65, 44,251,121,250,252,213,188,
+ 61,231,143, 94,190,243,225,243, 79,110, 78, 22, 85, 41,145,120, 39,  3, 75, 68,  5,195,240,250,237,251, 11,215, 31, 64, 42, 18,
+ 75, 67, 13, 30,110,114,206, 89,  3, 70,229,196,237,231,202,151, 29,133,112,115,157, 53,138, 61,116, 57,193,  0,190,161, 20,143,
+222,148,153,187,225,115,170,144,115, 40,129,237, 14, 70, 80,107,155,  9,122, 16,197,255,255, 71,111,189,128, 43, 16,224,102,215,
+151, 19,237,138,182,129,140,219,252,  1,181, 43, 64,135, 74, 30,190,249,236, 31,120,208,208, 66, 89, 20,216,162,183,237,216,  6,
+105,215, 75, 11,112, 29,174,244,228,230,230, 22, 16, 16, 96,143,153,  4, 20,153,154,228,244,  1,220, 59, 86, 20,227,115,210,145,
+ 19, 36,125,219,200, 40, 24,138,  0, 88,248, 46, 94,121,124,241,204,228,158,201,187,128,220,146, 92,183,216,244,185,177,225,150,
+ 88,  5,167,207, 59,208,211, 18, 10, 44, 85,215,111, 62,  7,145,229,230,102,207, 76,178,135,148,236,144, 83,198,128,101,235,186,
+205,231, 50,147, 28,128,138,129,237,241,245, 91,206,127,249,250,  3, 40,190,107,223, 85,136,  9,192,146, 55,208,215,  8,104,130,
+149,185,138, 21,248,164,  1, 55, 39,109,176, 75,174,150,230,186,  3, 21,  0, 21, 67,182,161,206,232,139,201, 40, 90,  2, 89,142,
+  9, 57,103,  6,178,206, 18,168,  0,104,  5, 80,113,247,228,157, 16, 89, 57, 25,161,205, 59, 46,194,205,193,211, 15, 56,121,242,
+ 20,  7,143,248,255,127,204,192, 76,  4, 44,191,207,156, 62,166,111, 96, 34, 46, 46,252,245,235,143,103, 47, 63,253, 71,190,234,
+ 14,214,178,230,225,229, 22,230,251,253,244,217,203,243,151, 31,177,176,176,255,250,  5,108,166,254,231, 23, 16,226,229, 19, 98,
+102, 98,  6,182,171,128, 25,154,131,141,213,204, 80, 65, 74, 66,  0, 79, 80,  3,  4, 16, 74,251,157,157, 87,144,211,177,234,243,
+225,105, 76,127,127, 50,202, 89,138,123, 84,114,240,226,212, 44, 96, 18,246,226,194, 50,166, 95,159, 48,199, 37, 24,174, 45,123,
+126,119, 55,171,162, 13,155,164, 54,  7,175,224,207,175,159,126,189,123,250,251,217, 69,134, 87, 23,153,192,253,  3, 44,229,139,
+178,  7,188,112,  7,215,222,194,174, 98, 40,151, 78,245,230,132,244,226,246,134,149,  9,246,213, 41,252,124,188,169,254,182, 64,
+132, 75, 35,176, 64,119,181, 49,194, 37,171,167,161,136, 85,220, 76, 71,121,107, 59,150,235, 59, 92,109, 12,177,170,151,150, 20,
+171,141,117,103, 96,112,199,101,145,168,176,160,171,141, 32, 21, 71,102,164,  5,185,146,108, 84,137,111,188,  3,203,110,120,225,
+ 14,  4,104,251, 84, 49,  1, 92,  1,176, 76,103,103,103,135,180,202,129,182,  0, 73, 23, 61, 69,248, 34,200,169,251,207,127,130,
+173,164, 10, 50,  2,157, 23,143,188,  8, 39,123, 30,226,216,  3, 96,225,190,173, 34,208,  8,247, 26,231, 81, 48,108,  0,176, 28,
+156, 62,239, 39,176, 37,126,241,202, 99, 96,235, 24,178,171,  8,151, 32,168, 33,127,239, 53,228, 24,175, 99, 39, 65, 71,190,184,
+ 57,162, 76,185, 65,118,177,130,100,193,103,  6, 64,206,147,  1,150,245,144, 45, 72, 16,193,146, 92,119, 72,225,123,  9,124, 70,
+ 24,176, 80,134,212, 16,192,114,249,197,107, 80,  9,230,234,  8, 57,208,230, 49,228, 24, 50,200,241,  9, 16,211,128, 77,117, 96,
+161, 15,105,200, 31, 67,146,  5,214, 52,200,230,224,241,175,168,168,200,197, 43,183,132,132, 37,184, 56,121, 46, 92, 56, 37, 42,
+ 46, 33, 40,200, 15,204, 46, 47,223,124, 70, 44,161,102, 68,218, 75,244,159,225,203,231,175,255,255,177,242,114,177,187, 59,155,
+ 95,184,254, 28,216,254,101, 98, 98,129,172,127, 23,224,231,144, 20,227, 23, 23,229,  3,221,142,198, 65,160, 43, 12, 16, 64,232,
+163,242,194,198,129, 64, 68, 76, 36,177,114,  3,139,198,250,207, 91,139,145,  7,175,225,229, 60,211,143,215,127,175,175,255, 14,
+ 68,216,135,166, 81,  6, 61,254,114,203, 74,122,148,142,166,123,120, 81, 75,198,  8, 53,250,200, 76,176,145, 48, 31, 23,242, 81,
+ 48,  4, 45, 37,207,169,144,253,168,144, 42,  4,178,133, 10,190,131,233,194,131, 87, 61,219,161,167,146,241,113,176, 38,217,170,
+ 65,150,241,192,181,  7,155,171,166, 56,234,188,255,250, 99,206,254, 43,251,174, 60,246,234, 88,127,189, 47, 97,180, 21, 63,236,
+  1,100,221,225,174,253,215, 32,  7, 15,172,219,114, 30, 34,130, 85, 16,200,125,249, 26, 84,232,199, 70,128, 78,242,  2, 29,197,
+158, 43,131,213, 76,200,192, 14,100,232,  6, 82, 16, 51,128, 23,167,163, 29,255, 11, 44,166,209,206, 66,  0,  2,200, 81, 54, 18,
+ 98,252,144, 37,237,240, 19,  8, 32,171,239,161,235, 38,193,187,100,225,178, 88,205,193, 10,100,101,101,127,253,229,184,118,245,
+198,171,127,207,127,254,252,161, 32,175, 36, 42,204,115,245,230,115,240, 97,  3,168,  7,206,254,135,174,147, 97, 98, 98,124,246,
+236,133, 32, 63,135,169,169,226,175, 63, 44,119, 31,188,226,226,102,147,149, 20,146,149, 18, 20, 18,224,102, 98, 34,182,124,  0,
+  8, 32,138,246, 73,242,107, 57,254,120, 91,240,251,248,  4, 44,101, 54,142,162, 28, 19,252,229, 16, 19, 14,154,200,202,201, 51,
+154,238,207,220,123,121,239,229,135, 16,115, 85,  6, 18,111,166,134,172,153,129,159,  5,159, 96,165,108,173, 38,  1,159, 23, 37,
+210,168,143,115,210,126,252,248,  1,108,143,195,199,217,209, 52,  2,203,113,197,178, 53, 16,246,194, 68, 75,160, 21, 64,243,145,
+231, 75, 33, 39,225, 64,220,243,254,203,247,232,105,136,249,231, 28,103,117, 33, 94, 78,180, 69, 56,192,194,221,  9,156,153,129,
+  5,189, 70,209, 66, 96,255, 99,238,190, 43, 37,190,198,163, 41, 97,  4, 52,225,101, 33, 35, 42, 12,160,163, 34,143, 91,129,207,
+ 17,195, 42,  8, 44,175,167,207, 59,  0,108, 41, 91,155,129,206, 35,131, 20,250,144,  1,119,148,161, 84,240,153,  1,144,193,125,
+ 32,  9, 63,176, 23,216,228,199,172,  9,224,135, 25, 48,192, 78, 71, 40,201,117,227,225,102, 71,190, 54,  4, 50,208, 47,  1, 61,
+192,242,  9,208, 52,184, 21, 16,  0, 57,168,  0,110, 14,190,166, 48, 43,171,152,  8,255, 95, 77, 45, 96,129, 46, 32, 40,242,251,
+215,215,231,175,216,190,125,255,133, 35, 47,131,182, 85,190,126,253,226,231,207,239,  2,  2, 34,215,110,189,208,211,146, 86, 83,
+ 18,227,230,  2,118,196, 73, 62,217, 27, 32,128, 40,221,  7, 47,110, 27,247,142,139,239,203,190, 54,198,255,191,201,208,254, 87,
+212, 68,196,179,138, 71, 66,113,152, 53,192,241, 11,  2,203, 65, 76, 53, 64,145, 59,207,223,223,123,245, 17,178, 63,  8,178, 52,
+  5,162, 12, 82,128,162,221,106,141, 92,248,162,141,204,228,131,215,204,224, 42,220,145, 79,  8,128,159, 72,  3,180, 17,216,178,
+230,  0,246,247, 88, 89,129,229, 56,174, 46,  2,156,205,196,204,  4, 63, 10, 24,168, 17,243,162,237,212,217,123, 31,189,129,238,
+169,211,148,228, 75,182, 85,195,223,153,  0,150,245,213, 43,143,238,189,250,104,180,124, 31,  9,  0,210,202,134,140,129, 64, 14,
+236,197, 37,  8, 41,166,245,181,101, 32, 37, 59,228,148,130,197, 43, 78,232,129,231, 66,129,236,140,162, 37, 12,224,115,  8, 50,
+147,236,119,237,187, 10, 84,  3,108,233, 67,198,229,239,222,127,133,124, 54, 25,  4,184, 57,105, 53,180,111,  2, 86, 21,144,114,
+ 25, 98,102,102,209, 18, 32,  9,233, 37, 64,148, 29, 61,117, 23,114,191,  7,176,106,233,153,188, 19,210, 63,136,141,176,128, 15,
+197,184, 58,106,  1,197,225,230,224,  7, 66,130,220,252,124,156, 31, 62,126, 23,228,231,186,119,239,246,187,167,127,153,153, 89,
+ 33, 87, 53, 65, 14,147,  1, 45,127,100,  2,173, 90,  4,102,197,143, 31,222,254,249,245, 75, 86, 86,249,255,255,127,210,146,252,
+236,108, 44,236,108,100, 22,212,  0,  1,196, 72,149,205,226, 95,158, 92,123,191,163,233,255,219,155, 36, 20,130,236,130, 92,182,
+ 69,162,198, 62,195,111,116, 37,125,246, 30, 39,109,217, 16,115,149, 53, 39,239,236,189,250,120, 90,162,195,218, 83,119,102,239,
+187, 42,200,205,158,226,168,  5,148,242,234,220,164, 32,202,123,255,245,167,169,137, 14,235, 78,221,221,123,245,137,146, 24, 31,
+144,237,217,185,209, 80, 94,180, 57, 20,180,112,165,103,235,249,125, 87, 30, 43,138,241,181,132, 89, 10,241,112,120,118,108,  4,
+178,129,165,127,176,153, 74,170,147, 14,100, 48,  4, 82,170,  2,139, 93,183,182,117,240,198,251,180,104, 51,111, 67,  5, 46, 46,
+ 46,200,142, 83,204,146,183,116,201,225, 41,187, 46,242,115,177,181,133, 89,196,218,106,194,239,101,133, 44,146,193,147, 30,254,
+252,249,195,159, 50, 11,194, 94,154,106,235,164, 43,207,201,201,137,214,132,103,192,152,170,229,227, 96, 93,146,106, 99,168, 40,
+ 14,113, 18,164,202,129,204,175,110,175,  8,116,130,101,191,158,205,103,129,229, 59,144, 11, 20, 28, 45,254,134, 61, 64,190,244,
+ 14,178, 34,  5,222,124, 70, 19, 68,102, 67,154,237,240,246, 59, 55, 80,228,254,107, 30, 30,118,200, 49,  3,144,133, 49,240,  3,
+ 18, 94,188,250,  4, 57,174,  0, 89, 16,190, 68,  7,114,240,  0,232,100,  2,152,201, 64, 67, 32, 11,102, 32,234,129, 21,  6,124,
+161, 14, 68, 22,205, 10, 72, 27,255,  5,184,187,  0,172, 78,122, 90, 66,145, 87,245,224,  1,111,223,127, 93,191,105, 31, 63,191,
+ 48, 47,191,  0, 98,204, 29, 52,236, 14, 26,237,124,255,246,205,207,159, 63,164,164,229,153,153,153, 52, 85, 37,100,165, 41,154,
+150,  3,  8, 32, 22,170,196, 22,143,140, 22, 71,252,226,183,251,166,253,188,180,148,225, 31,225,134,252, 95,  9,107, 49,223, 58,
+110,161,225, 57,153,102,164, 32, 90,181,226,168,159,161, 28,144, 44,242, 50,216,117,241, 65,230,220,253, 19, 99,109, 30,188,254,
+ 20, 57,121,231,165,246, 48, 96,161,159, 96,167,209, 16,104,114,251,217,187,234, 85,199, 55, 21,129,246,253,254,254,253, 91, 65,
+132,247,220,253, 87,192, 56,238,221,122,126,222,193,235,147,226,108,215,157,190, 27, 57,121,251,150, 18, 31,160,150, 66, 89,125,
+127, 67,249,236,249,  7,244,100,133,204, 84, 64,115,209,144,193,110,228,145, 25, 13,  9, 62, 62, 78,182,147,247,222, 64,155,213,
+ 76,140,200,103,  7,  1,203,244, 45,231, 31,  0, 11,119,208,104,204,183, 95,217, 11, 14, 73,  9,112, 58,233,200,195, 87,199, 19,
+127,181, 19,104,101, 13,120,180, 29,179,112,159,184,237, 28,242, 84,109,149,183,142,190,188, 40,100,135, 20,158,197,239,247, 95,
+131, 38,108,149, 70,183,179,142, 12,128,188,167, 31,206,192, 42,200, 64,196,209,  2,152, 42,145, 15, 72, 64, 17, 68,149,197,122,
+240,  0, 68, 16,232, 24,113,212,222,  6,154,105,192,130, 30,216,201,144, 16,227,  7,246, 18,128,109,124, 34, 11,119, 80, 91, 94,
+128,203,193,206,226,192,161,147, 31, 62,188, 97,  2, 93,195,196,  4,110, 84,253,251,253,251,215,207, 31, 63, 69, 68,196,100,100,
+ 65, 43, 20,212,148,197,100,164,  4, 40, 12,103,128,  0, 98,161, 86,132,177,176,178,138,187,231,255,176,140,251,113,239,232,183,
+219,  7,126, 60,189,204,252,243, 37, 74,203,145,137,227, 47,143, 12,167,188, 25,151,186, 11,175,188, 30, 51, 11,203,112, 77,187,
+201,142,218,149, 43,143,245,108, 57,247,254,235,207, 88, 43,149,137, 59, 47,  3,  5,231, 29,  4, 45,157,252,240,237,231,153,187,
+160, 96,241, 51,144,  3, 22,211,192,242,174,208, 83, 63,111,209,225,  4, 59,117,123, 13, 73,121, 17, 30,200,248, 12,184,  2, 80,
+183, 83,151,  0, 54,153,  3, 39,238,  4, 22,253, 64, 45,118,234,226,118,234,146,249, 75,142,190,253,244, 13, 40, 14,212, 11,185,
+ 30, 15, 62, 50,  3,  4, 55, 94,124,138,153,115,  4,151,195,172, 85, 37,208, 26,231,135,174, 63,181, 85,151,162,214,157,121, 64,
+247, 20, 47, 62,136,124,211, 83, 71,176, 97,184,185, 50,100,  7, 44,158,101, 60,192,128, 90,123, 18,116, 80,132,161,194,232,250,
+153, 81, 48, 52,  0,176,160,135, 76, 21,192, 15, 53, 35,182,109,196,200,168,162, 40,250,243,151,241,227,103,111,255, 34, 93,149,
+  1,105, 50,  1, 51, 17, 48,151,168,169, 72, 40,200, 10, 83,238, 72,128,  0,162,114, 33,203,193, 39,200, 97,224, 35, 96,  0, 26,
+117,249,246,233,195,239,207,239, 25,254,252, 96, 96,102,101, 96, 97, 99,231, 19,230,224,226, 30,  9, 17, 15,140,191, 98, 47,131,
+218,213, 39,235,  2,140,129,133, 53,176,213, 44,192,197,214, 27, 97,193,203,193,242,233,251,111,  5, 81,208,  5,217,144, 19,131,
+128, 42,147,236, 53,227,172, 85, 13,107,214,232,203, 10, 65,175,144,253,255, 31,216,144, 63,255,224, 13,176, 14, 63,255,240, 13,
+144, 13,153,240,252,  7,187, 18,235, 63,248,238, 83,160, 44, 48, 57, 32,175,153, 33,220,109,250,247, 87, 22,245,156, 10, 41,126,
+ 14,106, 29,232,  8, 52, 36,180,127,203,102,164, 59, 90, 33,133, 59,  7,  7,  7,174,194,189,122,229,209,224,251,170,239,191,253,
+152,187,239, 10,176,136,119,210,145, 77,113,210, 25, 45, 56, 70,193, 16, 42,226,201,214,171,174, 44,206,204,196,248,248,197,123,
+134,127,136, 33, 26, 96, 59,139,139,131, 77, 78, 90,  8,207,150, 84,146,  0, 64,  0,209,176, 17,205,197, 39,192,192, 39, 48,210,
+162, 28, 50, 87,153,226,168, 51,247,192,181, 68, 59, 13, 96,211, 56,217, 65,235,193,155,207, 38, 13,160, 91,144,234,  3,141, 11,
+220,245, 64, 67, 43,160,177, 13,230, 71,239,190,218, 54,175,255,240,245,167,131,166,148,190,156,200,197,199,160,227, 38,128,218,
+155, 66,204,226,102,236, 21,204,152, 15, 44,220,231,167, 57, 66, 90,214,144,241, 16,176, 21,208,130,242,192,181,199,240,145, 25,
+226,202, 96,134, 90, 95,131,171, 79, 63, 92,123,  6,218,180, 21,100, 36, 23,102,166, 68, 94,179,157, 25,118, 66, 36, 50,168,244,
+ 55,  1,118,  8, 62,126,255,165, 37,197, 15, 57,117, 18,210,114,199, 58,211,171, 40,198, 15,236,124,  0,139,120,  8, 23, 88,178,
+183,132, 91,143, 22, 25,163, 96,132,  0, 96,131, 71, 67, 85,  2,136,104,106, 11, 64,  0, 49,142, 30,198, 77,117,  0, 89, 21,254,
+231,207, 31,248, 73,185, 64,145,223,191,127,  3, 91,202,200, 55, 28, 65, 70, 69, 32,135,130, 66, 90,232,240,101, 51,240,217, 78,
+136, 22,204, 75,151,128,122, 33, 11,201,129,122,127,254,252,249,235,215, 47, 32,131,112,161, 12,  6, 64,163,142,220,124,206,195,
+206,162, 45, 45,128,118, 29, 54,129,230,255,223,191, 64, 95,124,255,254, 29,226, 47,184, 70,248,242, 30,160,248,153, 59,207,222,
+124,252,106,166, 40, 12, 20,132,223,197,138, 89,184,239,187,242,216, 80, 81, 76,144,155,125, 31,120,109, 50,132, 61,154,114, 70,
+193, 40,160, 46,  0,  8,160,209,242,157, 38,  0, 82, 52, 67,118, 42,161, 45, 77,129, 23,214, 88,165, 48,197,145, 75,124,228,149,
+230,144,230,243, 95, 24,192,181,168, 17,185, 99,  1,215,  5,183, 17,178,161,148,200, 53,242,240,122, 11, 82,235, 96, 94, 24,  2,
+113,  9,176, 14,  0,143, 33, 50,193, 21,140, 30, 40, 54, 10, 70,193,128,  0,128,  0, 26, 45,223,105,216,138, 71,227, 98, 93,192,
+142, 75, 28, 89, 10,235,193,235,200,106,136,140, 68,100, 93,200,245,  4,241,229, 47,164,214, 65,174, 48,208, 22,207,192, 21, 32,
+ 87, 39,163, 96, 20,140,130,  1,  1,  0,  1, 52, 90,190,143,130, 81, 48, 10, 70,193,240,  4,  0,  1, 52,218,188, 26,  5,163, 96,
+ 20,140,130,225,  9,  0,  2,104,180,124, 31,  5,163, 96, 20,140,130,225,  9,  0,  2,104,180,124, 31,  5,163, 96, 20,140,130,225,
+  9,  0,  2,104,180,124, 31,  5,163, 96, 20,140,130,225,  9,  0,  2,176,118,117,185, 81,  3, 49,216, 30,207, 18,170,  5,212, 10,
+169, 21,143, 32,245, 14,125,230,  0,189,112, 37, 94, 56, 70, 15,  0,136,  7,170,182,187,219,204,159,241, 79, 38,100,187,162,170,
+160, 43,237, 36,217, 76, 60,182, 99, 71, 43,229,179, 63, 60,130,184,131, 34,227,139, 73,236, 13, 79,172, 79, 61, 70,116,238,192,
+233,204, 64,171, 92,138,182,170,103,116,144, 69,152,198, 16, 34, 89,133,110,144, 81,113,117, 72,198, 29, 20,208, 80, 30,204,197,
+ 56,248,184, 42,121,105, 51,126,216,137,247,196,155,243, 40, 12,132, 41,  0,171, 16, 64, 17, 64,186,  3,  1, 35, 16, 80, 99,196,
+ 72, 42, 75, 17,123,100,156,124, 50, 65,103,129,108, 84, 31, 60,232,170,220,170,204,171,167,239, 78, 55,233,254,110,187,113,203,
+188, 89, 68,183,150,112,223,106,134,246,241,236,211,245,183,107, 81,186, 40,161, 98,105,162,179, 72,242,162, 83,232, 96, 23, 57,
+ 68, 39,236, 82,  3,187, 13,202,138, 30, 99,248,112, 78,119,219,180, 25,121,147,218, 46,215, 84, 91, 46,106,175,152, 72,204, 39,
+235,183,151,159, 47,190, 92,125,221, 53, 24, 83,189,125,216, 61,196,154,153,115,196, 55,235, 33,138,189,226,113, 22,205, 40,106,
+ 37, 20,203,181,165, 86, 46, 44,102,138,225,226, 25,113,132, 58,215,216,153,  0,104,155, 83, 74,109,252,249, 75,238, 73,201,  6,
+182,212, 47,203, 96,184,204,102,116,188, 78, 51,179,124, 29,255,103,159, 23,244,183,143,222,215, 15, 52, 52, 46,185,213,167,195,
+ 70,214, 56,162,215,153,115,237, 51,249,185,241, 54,235,  0,199,195,241,205,120,115,  8,  6,250, 55,  8,129,214,160, 65, 72, 45,
+191,162,213,201,250,253,143,219,239, 97,177,104, 95,  5,177,155,223, 99,128, 23,  5,137, 80,159,161, 63,238,217,130,143,246,157,
+248, 65, 66,248,105,142, 96,152,243, 97, 95, 60,130,135, 53, 31, 56, 13,231,197, 28,  5, 21, 44, 97, 17,189,  9, 57, 30,222,160,
+229,255, 65,203, 74,191,208, 56,190,230, 92,  6,182,250, 59,196, 37,222,215, 55, 62,103, 74,106, 50,244,172, 12, 81, 75, 57,104,
+165, 99, 92, 53,  6, 57,200, 37, 23,  5,226,230, 36,225, 88,242,152,114,105,169,214,162,197, 34, 77,211,223, 82,106,246,183,168,
+197, 11,213,252,199, 26,105, 24,235,104,247,198,147,174,233, 51,192,163,121,114, 87,235,121,140,122,214,159, 82,220,108,194,244,
+124,233,180,159, 83,168,203,218,248,151, 56,255,159, 15,239, 71, 41,190,156,240,223,  2,176,118,110, 75, 13,194, 64, 24,206, 38,
+ 80, 28,171,118,250,  2,190,255,147, 57,163,142,227,133, 83, 75,115, 90,255, 93, 18, 74, 75,209,206, 88, 46, 40, 16,200, 97,249,
+247,219,189,160,  9,253,135,236, 60,233,213,104,108, 82, 67,147,169,175,180,194, 93, 72,161,165,142,170,  2, 42,220,141, 98, 93,
+ 87,136,  0,104,157,252, 31, 70,192, 11, 16, 43,241,137, 81, 24, 66,  0,173, 99, 20,246,224, 21,229, 20, 81, 31,212,128, 82,202,
+ 42, 49,224,207,  8,181,208,  8,184, 38, 44,155,240,189,149,182,219, 86,181,171,215,165,222,  1,113, 26, 12, 80,224, 12,201, 20,
+  0, 84,230,239, 29, 17,150,178, 60,139, 95,185, 63, 95,178,188,204,235, 73, 69, 38,145, 19, 20,235, 67, 64, 69,208, 99, 22, 68,
+  2,173,232,116,226, 34,139,211, 21, 93,105,178,119, 26,163,156,217, 62,211,235,103,191,243,236,115, 62, 64,234,153,129,239, 28,
+ 48, 78,240, 66,166, 37,216,108, 31, 95,222, 63,208, 99,234,236,125,231, 54,235,110,187,110,159, 30,220, 93,135, 16, 97,124, 32,
+223,219, 94, 72, 45, 54,110,156,  4,170,148,  2,  6,192,232, 79,150,136,  2, 21,247,112,161, 52,124,  2, 79,251,232,251,183,175,
+126,239,163,196,146,196,202,119,253, 74,158,107, 72, 67,211, 48,110,162, 99,112,187,192,247, 51,162,241,140,194,127, 82,158,174,
+230, 50, 45, 67,156,110,193,247,185,167,141,  8,113,199,197,118,104,121, 32, 60, 26,132, 23,140,112, 10,119, 90,228,175,113,116,
+197, 32,146,248,215,244, 54,156, 54,116,129,236,133,134,213, 99,225, 33,195, 26,196, 86,207,240, 90,157, 93,118,121,107, 42,212,
+ 37, 26,216,226,194,234, 63, 36,233,142, 29,115,183, 66,  3, 58, 18, 64,211, 43, 12,166, 65,246,230, 90,193, 58,152,174,219, 10,
+  7,174, 89,  9,248,187,149, 63,236,  3, 92, 40, 69, 15,182,131,238,201, 11,241,113,  1,186,132, 56, 37, 91,154,142,180,228,102,
+ 53,202,202, 78,230,242,224, 84,242, 41, 26,248,206,195,113,214,228,112, 84, 47,188,181,165,118,119,248, 38,241,  9,181,131, 46,
+170, 84,253,244, 28,241,191,164, 50, 75, 18,181,179, 48, 57,215, 36,223, 40, 41, 57,219,126,  4,160,237,220,118, 26,134, 97, 48,
+156,184,105, 83,177,131,232,  5, 66, 92,243,254, 79,  6, 98,130,110,154,122, 72,130,255, 56,233, 10,107, 39, 16, 66,218,197, 84,
+ 45,135,214,246,239,207,213,146,252, 21,219,217, 84,181,177,167,225,180, 32,238,121,103, 99,104,172, 28,255, 45, 87, 96, 10,124,
+242, 98, 77,108, 38,110,224, 22, 34,238, 44,236,134, 10, 83,178,  7, 84,112,  6,  0, 61,126, 82,176,166,195,137,148,143, 89,212,
+ 48,201, 23, 49,101,  4,201,182, 42,253,215,154,104,174, 43,115,228,242, 74,101, 68,167,171, 32,166, 64, 62, 60,222, 63,189,126,
+188,184, 68, 96,194,233, 82, 65,120, 71,112,124,246, 86,145,120, 44,225,145, 94, 80, 50,100,227,121, 60,  1,158,152, 74,206,205,
+169,  3,218,170,226, 61, 11,255,198,201, 94,104, 63,133,120,226,119, 28,195,  5,241, 24,180,  9,106, 95,133, 65,171, 55, 66, 63,
+ 60,186,119,166,170,194, 30,123,236,114,195,241,225,185,225,135,198,153,163,180,106,119,103,202,170,176,  6,185,139,251,223,240,
+ 36,119, 60,175,146,123,236, 58,125, 60,135,177,119,231,142,120, 94, 76, 41,133,143,131,104,178,200,154,206,143,204,204,170,227,
+124,100, 98,202, 35, 60,227,152,203, 28,168,230,162,  8,114,176,140, 14,203,142,167,167,147,200,245,140, 71,154,186,105,187,150,
+107,135,219, 94,100,169, 30,124, 55,193,209, 34,155,223, 22,247,201,164,187,114,219, 70,111,100,235,140, 49, 27,253,234,101, 37,
+203,139,251,202,220,122,125,196, 92,152,174,189,247, 20,  6,196,247,123,219, 28,186, 67,248,129,184,235,217,104,107,226,190,198,
+119, 48, 92,106,229, 99, 56, 20,122, 25,219,167,101,114,177,194,206,122,159, 45, 75, 87, 18,147,162, 40,233, 52,197,229,107,178,
+240, 46,234, 60,201,201, 46, 42,209, 28,193,143,229,142, 40, 37,185,132,240, 74,170,115,217,120,212,144, 41, 89, 91,203,170, 42,
+107, 44,115,198, 14,163, 21,123,240,102,179,109,143,239,131, 97, 97,239,209,206,139,226,  2,145,208,153,193,161,238, 58,248,121,
+137, 50,  9, 60,230, 30,221,136, 99,153,163,210, 33,216,124,134,247,132,229,144, 36,230,125, 47, 83,243, 88, 61,206,225, 21,175,
+ 88, 99,185,117,239,122, 21,146,168,128,132,228,236,225,216, 46,247, 17, 46,217,113, 93,217,233, 10,204,191,185, 83,248, 31,102,
+159,143,242, 41,  0,105, 87,215,219, 32, 12,  3, 99,135, 16,232,180, 73,235,255,255,131,211, 94,214,170, 27,133, 66,178,179, 29,
+ 88, 87, 86, 52,109,111,124,  4,  2,137,115,190, 59, 41,201,127,241, 29, 67,247,253, 50,206,189, 95,246, 97, 46,253,106,216, 46,
+191, 41,211, 92, 74,127,147,102, 91, 93, 67,197,168, 61,240,132,115, 49,102, 42,157, 64, 47,232, 46,235, 81,  1,111,  2, 94, 20,
+ 67,131,231,198, 52, 14, 93,  7,212, 83, 26, 60,130,133,226,173,160,152,162,204, 40, 89, 46,201,234,176,240, 29, 74,165,  0,159,
+215,119,243, 12,183,232,200, 67,119,156,100,237, 47,195,226,180, 76, 24, 77,150,185,146,246,179,149,102,183,139,187,243,216, 41,
+203,157,117, 52,235,202, 97,242,152,174,221,175,145,144,253, 44,157, 53,232, 69, 32,178,237,169, 75,197,221, 33, 75, 98,230, 22,
+225,199,166,215,254,227,101, 28, 78, 41,131,225, 52,109,243,212,  4,164,137, 64,244,208,186, 32, 30, 11,141, 98,247, 36,105, 41,
+ 79,117,237,235, 40,252,105,  2, 49, 23,181, 32,190,140, 84,147, 24,100, 28,167, 53,209,  5,199, 67, 62, 15,147,215,252, 55, 73,
+141,162, 22,106,246,146,159, 64,117, 80,186,142, 57,247,162, 81, 22, 69,205,137,149,243,144,126,177, 54, 32, 90,120,226, 66, 67,
+190, 98,178,252,220, 85,136,218,209,225,252,182, 70,237,200,113,144,109,120,175, 54,118, 79,231,141, 40,199,149,157,111,187,169,
+ 91,242,199, 90, 25, 44, 85, 28, 47,167, 27, 46,188,126, 97,244,205, 48,245,235, 68,149,140,  4,255,150,212, 91,194,219, 98,241,
+ 52,251, 90,  0,247,245,103,111,128,251, 92,152,188,227,181,216,219,200,124,222,184,105, 33,224,247, 61,153, 98,194, 20, 33, 98,
+206,140, 86,156,221,204,147, 10, 85,191, 98,161,166, 82, 73,124, 62, 42,186, 92,149,184,138,108,219,135,157, 52,165,176, 13,  5,
+ 87, 80,126,153,131,237,213,139, 20,239,181,226, 32,190,140,175, 67, 21,154, 10,216,222,196,166, 13,177,133,222,125,222,239,251,
+190,  7,189,119, 22,197,184,132,240, 68,196, 87,178,106,170, 56,190,164, 70,139, 32,180,168,119,167,102,175,129,124,105,  2,113,
+ 86, 83,  6,128, 92,  0, 20,148,116,202, 29,207,126,139,124, 15, 46,145,179, 41,225,156, 13,199,125,  2,156,136, 99,147,165,164,
+221,211,  1,204,133,144,217, 78,169,217,125,135,120, 27, 11,249, 39,100,207,247, 53,208, 99,124,  4,239,161, 77, 91,230,111,136,
+127, 19,136,159,  2,144,118,109, 59,106,195, 80,208,231,216,216,161, 41, 44,171,221,125,104, 87,253,157, 85,255,255,  1,  9,245,
+ 15, 42, 30,118,165,  0,  1,199,113,207,197,129,208, 80,161,182, 40,  2,100,  7,161,196,115,198, 51, 99, 37,161,179,136,255, 51,
+ 75, 20,142, 30,116,177, 78,144, 86,111, 15,110, 48,248, 57,153, 46, 98, 15,217,  1,135, 60,196,104,175,192, 66, 98,114,177,109,
  18,199,204,248,126, 37,190,170,124,240,161,154, 17,111,229,188, 88,174,168,141,200, 61, 43,211, 22,245,156,213,134,205,  8, 39,
-224,101,190, 52,  3,210, 76, 89, 84,  4,104,  8,104, 69,126,156,175,182, 84, 32, 94, 46,191,148,120,  8,100, 30,137, 55,163,168,
-  5,179,170,151,192,180,216,  9, 64, 53,185,147,243, 84,181,142,138,161, 78,230, 28,  7,  4,  8,251, 64,153,111,182, 40,210,205,
- 69,193,156,175, 54, 70,126,215,218,231,197,203, 33,238,131,115,252,180, 44,161,222,227, 97, 27,119, 63,154,237,166,253,248,217,
-146,212,166, 46, 26, 62, 95,161,  3,130, 94,194, 67,155,154, 93,223, 52,121,215,230, 83,  4,217,131, 64,194,109, 60, 82, 87,238,
+224,101,188, 52,  3,210, 76, 89, 84,  4,104,  8,104, 69,126,156,175,182, 84, 32, 94, 46,191,148,120,  8,100, 28,137, 55,163,168,
+  5,179,170,151,192,180,216,  9, 64, 53,185,147,227, 84,181,142,138,161, 78,198, 28,  7,  4,  8,251, 64, 25,111,182, 40,210,205,
+ 69,193,156,175, 54, 70,254,215,218,231,197,203, 33,238,131,115,188, 89,150, 80,239,241,176,141,187, 31,205,118,211,126,252,108,
+ 73,106, 83, 23,157, 62, 95,161,  3,130, 94,194, 67,155,154, 93,223, 52,121,215,230, 83,  4, 89,131, 64,194,109, 60, 82, 87,238,
  34,166,196,233, 58, 39, 73,157, 61, 29, 33, 70, 72,137,149, 82,  8,102,181,192,199, 21,124,174,241,233,193, 61, 62,216,101, 13,
- 21,169,119,167,251, 30,198,123, 87,  5,110,217,127,236,105, 48, 82,241,178, 26,183,159,105, 33,155,137, 92,157,208, 77,121,255,
-178,252,218, 12,240,189,193,124,188,246,229,187,121,244,248,136, 40, 14, 96,204,137, 52,230,180, 78,116, 57, 77, 35,236, 79, 88,
- 81,123,207,245,255, 71, 81,242, 15,213,  2,163,112,198, 12,132, 88,219, 58,177,203,130,177, 13,155,178, 42,140, 42, 31, 39,238,
-113,164,214, 97,116,240, 85,  8, 14,131,114,186,118,124, 25,110, 77, 10,220, 62,145, 51,185, 51,230,237,165, 11,207, 58, 88, 13,
-174, 50,123,  9, 86,108, 73, 44,133, 15, 97,248, 91, 25,208,186,226,167,113,178,207,131, 86,233, 91,234, 79, 98,154, 66,250, 42,
- 93, 36, 13,149,143,136, 65,119, 84,234,150,184,221, 83,165, 83,205, 59,122,181,129,164,205,235,235,183,183,183,239,155,245,250,
-120, 60,152,225, 62,169, 89, 19, 89,170,113, 22, 93,189,236,198,177, 26,226,101,134,190,138,227, 85,137,241,213,244,147, 58,180,
- 86,229, 35,151, 50, 23,164,238,172, 41, 27, 40,142,113,238,234, 96, 61,169, 70, 77, 28,132,199,137,224, 59, 73,126, 46, 50,  2,
- 46, 22,187, 31,227, 31,202, 58,250,251,180,226, 61,190, 84,207,215,115,242,159,224, 90,230,155, 91,224,209, 22,242,193,109,215,
-254, 45,185,211,227,151,  0,164, 93, 77, 79,219, 64, 16,245,172,189, 14, 95, 38,141, 34, 46, 52,151,246, 80,245, 31, 20,  1,226,
-183, 32,113,172,196, 95,224, 71,246,  4, 71, 80, 15, 85,148, 22,  9,133,160,205,218,203,188,153, 93,219, 68,  4,130,154, 68,209,
- 42,182, 44,239,238,236,155, 55,239, 69,235,255,194,119, 21,100, 90,218, 46,237, 96, 84,141, 81,155,  6,211, 19, 36, 82, 21,205,
-129,144,144,187, 37,126, 36,  8,248, 43, 47,185, 80, 51,150,212, 88,149,233, 41,203,173,106,111,127, 88,125,218, 30,236,158,159,
- 95,220,220, 92,207, 31, 31, 73,183,213, 77,240,163,  3, 47,106,124, 29,  3, 93,102, 48,143,187,119, 21,219,118,143, 75,173, 60,
- 25, 59,  9,220,131, 34, 62, 37, 93, 80, 75,104,189,201,228,215, 54, 12, 40,203,122,217,210, 82,204,138, 60, 64, 43,180,142, 46,
-100,255,160,181, 60, 40,170,193,252,195,250, 17,146, 19,100, 32, 32,252, 41,190, 75,207,225,120, 26, 14,106,178,198, 28, 12,198,
-191,231,211,153, 91,220, 46,254,254,154,255,185,243, 15,179,108,241,100,195,206,112,235,112, 92, 29,142,118,135,  3,203,185, 49,
- 23,179, 84,222,146, 55, 24,212,114, 51,176, 92,220,112,199,137, 65,252,137,177,222,145,115, 92,113,114,225,138,129, 53, 16,220,
-169,180, 96,250, 73, 36, 37, 91,  6,190, 22,  7,115,  0, 93,225, 40, 54,206,161,130,229,217,225,234, 43,151,228,229,188,207,162,
-137, 37,175, 90,108,171,206,236, 36, 69,204,144, 25,234,106, 30,234, 19,106,145,216, 10, 62,141,193,253, 93, 55,233,221,163,  6,
- 76,223,250, 94, 37,190, 34,205, 43,184,127, 25,127,189, 95,252,235, 31,242,193, 55, 27, 43,254, 89,180, 46, 55,  5,119,122, 41,
- 89, 44,  1,238,217, 10,236, 70,232,237, 89, 83,235,148,156, 20, 96,175, 10,238, 43, 75,140,214, 11,248, 68, 29, 34,173,235, 72,
- 31,220,251,186, 48,165,172,210,221,185, 73, 25, 64,101, 85, 44,141, 16, 55,178, 48,210,  6, 47, 83, 14, 39,191,198,  6,165,  6,
-  2,175, 48, 45,119,146,162, 26,200, 30,148,195,241, 42, 96, 80, 22,209,221,130,199, 85, 59,213,104,116,240,121, 50,249,113,116,
-244,243,234,242,251,241,183,211,147,179,251,233,  3,159,198,248,225,156,  7,236,214,117,218,135,  3,196, 26,213, 39, 47,113,  2,
- 86, 48,172, 27,136,247,120,118,187,248,181, 86, 76,167,  2, 12,  8,230, 93, 19,123, 76,237,158, 28,  8,223,101,195,215,245,226,
-179,225, 56,103, 41, 89,203,212,161,109,202,179, 60,143,  5,238,100,149,226,232,200, 88, 99,235,208,188,229, 85,116,159, 94, 90,
-142,238,112,167, 22,191,237, 84,121,252,171,164,249, 40,184,243,235, 89,  0,202,174,102,199,105, 24,  8,123,236,216, 38,217,203,
-118,247,194,162, 10, 33, 14,188,  2, 44,111,  3,119, 94,139, 27,112,131,231, 64,236,133, 27, 72, 92,144, 88, 85,148,230,255,199,
- 59, 63,118, 27,186,109,  5,109, 21, 69, 74,212,196,246,204, 55,223,204, 55, 74,142,226, 59,156,250, 69,155,131,200,235,  4,211,
-133,221, 38, 98,206,206, 78,128,141, 75,171, 76,178,  0, 90, 92,193, 32, 18, 57,131,145, 66, 48, 68, 78, 64,169, 23,  5, 96,138,
-  0,210, 75, 99,158,191,120,249,250,205,171,143, 31, 62,225, 74,140,152,116,225, 90,171,180,210,137, 97, 10,200, 68,107,138,178,
- 45,101,153,206,100,200,199, 77,170,243,135, 88, 40,100,230, 33,193, 29, 84,110,243,229,229,114, 93,175,101,210,165,230,206, 22,
- 16,101,244,232, 99, 26,230,243,100,168,151, 69, 63, 90, 92, 85, 77,117,253,236,250,219,175,239, 19, 91,202,227,139,101, 73,101,
- 21,234,141,  9, 81,248,161,193, 33,160, 35, 86, 55,211,240,123, 36,146,254,181,252,121,211,252,184,213,155,210, 14,202,234, 51,
-239,115,239, 11,231,115, 36,236, 20,234,  8,214, 45,186,  3,231,162,214,106, 71, 58,148,118,214, 60,200,120, 95,131,227, 30,152,
-220, 89,159, 41,103, 69,138,  6,159, 25,188, 94,219,171,178, 10,235, 50,180, 29,244, 67,232,123,133,212,126, 83, 77,117,173,171,
-122,106,234,208, 52,208,182, 35, 14,111, 24, 85,211, 78, 53, 63,122, 18,239,184, 65,254, 63,144,136, 37,178,106,136,143, 32,155,
- 56, 76,  7,188,212,121,113, 81,117,165, 20,223,112, 94,144,112,209, 73,169,143, 33,196,158, 10, 73,156,255,227,131, 52,124, 12,
-127, 85, 69,158, 92, 62, 93, 49,100,143,241, 13,149, 72,147,139,132,164,251,246,137,224,158,132,235, 93,164,249,199, 27,240,198,
-115,120, 62,144, 79,236, 21, 64,238,147,247,148,188,  2, 28,240,160,136,185,206,228,152, 43, 36,223,134,131,202,252,125,154,191,
-109,149,217,186,216,  9,151,156,245,201,192, 17,248,159,169,169,187,126,  7,149,216, 12,215,100, 16,180,183,242, 24,163, 29,164,
- 33,232, 16, 41,187, 48,250, 29,136,179, 91,101,178,207,164, 74, 83,131,154, 22,158,196, 95,165,211, 81,218,  6,  9,  6,210, 56,
-193,  5, 88,147, 57,  4,120, 98,240,222,163,189,131,174,202,170,176,103, 80,171,247,111,223,221,124,249,188, 90,221,254, 41, 55,
- 93, 91, 15,212,212, 53,136,220, 47,165, 93, 97,130,154, 55,148,  5, 24,214,104, 51,116, 17,227,241, 31,109, 78,148, 37,192,195,
-197,213,186,222,128,146,182,137,153,128, 15, 97, 81,156,119,125,199,192, 17, 44, 50, 76,227,250,177, 99, 76,144, 10, 85,152, 83,
-120,244, 54, 54,145,105, 15, 72,121,226, 96, 94,129,220,195,244,211, 80, 12, 51,  9, 71, 31,207,192, 82, 60, 56,101,213,199, 14,
-221,  9,192,218,181,237,180, 13,  4,209,181,215, 38, 38, 80,  8,173, 42, 85, 34,130,143, 64,  8, 85,234,255,191,240,128, 80, 21,
-149, 87, 30,122, 81, 73,161,133,196,187,107,123,119,153, 51, 99,147,139,176,197, 67, 35, 69,137,180,137,175,179,103,207,156, 57,
- 26,191,226,159, 73,182, 86,160,161,141,138,212,254, 18,136, 45,125,110,  9,123, 39,236,169, 54,113, 99, 78, 32,208, 47,141,113,
-117,219, 15,151,105,188,172,252,154,208, 43,195,125, 34, 24,219,161, 95, 94,124,254, 66, 67,223,102, 51, 34,178,214, 26, 83,150,
-166, 42,125, 93,163,139, 33,241,107,206,115,216,221,196,234, 79, 71, 46,248,152, 96,194, 84,128, 72,160, 94,198,131,153,144, 17,
-225, 26,178,115,150,222, 52, 52, 69,173,226,128,121, 35,248,149, 42, 42, 42, 39, 32,165,  6, 59, 80,211,163,233, 94,177, 59,251,
-126, 67, 39,196, 82,148,232,142, 80,162,156,119,127, 27,123,239,203,185,114, 77, 26,170,224,137,216, 28, 32,  4, 83, 34,167, 68,
- 50,154,192, 24, 25,184,140,  3,218,163,153,219,100,180, 56, 73, 52,179,194, 20,  9,187,139, 29,250,  3,157,111,115,252,233, 35,
- 69,252,221,159,251, 81, 54, 42, 29, 93,  7,  2,241,184,168, 66,202, 89,170,  6,209,135,127,128, 83, 96, 92, 10, 90,  9,248,113,
- 34,209,213, 97,105,234,192,  8, 14, 29,159, 11,112, 62, 38, 85,132, 39,135, 70,242, 96,231, 63, 23,180,142, 86,168,187,114, 83,
- 74,238,131, 73,111, 58,176,201,254,251,223,143,191, 34, 44, 25,210,205, 88, 67, 28,229, 34,214,166,251, 37, 14,187, 11,246, 71,
-  7, 75,247,212, 39,209,208, 70,248, 54,165,235,117,206,208,239, 63,145,209,179,211,243,171,219,203, 55, 58, 19,214,220,  1,154,
-229, 26,236,232,112,247,232,159,121, 40,242,194,214,118, 43, 12, 10,141, 80, 52,222,166,155, 64, 60,160,188,119, 14,203,220,  7,
-183, 30, 86, 47,190,154,216,  3,238, 82, 77, 21,206,180,101,150, 28, 56,159,248,186,  5,105, 53,127,183,172, 50,155,130,251,202,
-227,187,146,213,145,124,138,127, 54,109,157,  2, 73,135, 89, 73,139,230,252, 93,103,252, 33, 19,153, 37,122,217,133,176, 44, 14,
-224,216,242,255, 68, 68, 27, 84,217,152,102, 19, 48,103,163, 28,109,166,137,222,208,  7,113,155,124, 50,249, 48, 61,153, 94,127,
-189,174,240,172, 58, 99,172, 89,150,  4,241,206, 53,174,198,172,175, 16,142,  9, 46, 14,191, 52, 19, 65, 56,111,104,182,195, 18,
- 28, 99, 49, 30,191, 27, 31,222,205,127, 44, 76, 73,196,223, 82,162, 26,144,139, 99,129, 80,158, 59,167,122, 49,191,214, 68,112,
-112,173,145,237,181,254, 26,197, 62, 57,134,108, 41,156,116, 20,  7,115, 74, 49,200,134, 13, 47,141,250, 47,157, 81,251, 60, 57,
-241,205,233,111,223, 97, 60, 11,192,217,181,237, 54, 17,  3, 81,123,214,217, 77, 90, 42, 65,185, 60, 32,158,203,191, 35, 30,248,
- 17,126,  0,165,188,161, 86,  8,181,106,146,110,178, 27,219,195, 25,143,157,221, 92, 74,129,215, 72,118,178,235,241,153,153,115,
-142, 99,247,119,198,220,147,179, 12,125, 71,182,217,230, 36,159, 99, 71,180,113,106,106, 43, 66, 10,218, 31, 18,220, 65,151, 21,
-188,145,110, 75,147,176, 75, 43,165,156,  9, 23,176, 55,202, 13, 68,239,166,231,243,249,183,197,253, 29, 70, 97, 66, 44,209, 89,
- 61,235,250, 77,200,178,198, 78,222,200,197, 80,150,118, 14,203,157,252, 25,233,186,144,125,249,226,213, 67,123,207,153, 47, 35,
-189, 60, 67,201,253, 16, 89, 13,188, 57,124,135,119, 10,176,206, 85,  0, 37,189, 40, 89,204,217,137,177, 62,172,250, 37, 30,138,
-146, 40,220, 24, 84,205,225, 33,108, 86,161,255, 25, 86, 43,183,237, 45,207,206, 38, 51,170,109, 32,249,231,116, 54,181,181,141,
-  5, 56,218,118,157,200,155,100,180,158, 74,212,227,125,137,199,113, 54,113,129,226,212, 85,205, 68, 93,234,149, 17,245, 39, 96,
- 91,116,221,246,195,251, 55, 31,175,174, 62,125,254,  2,220,197, 43, 14, 98,122,140,216, 66,120, 28,167, 44, 16, 91,113,100,250,
-126, 98,209, 32, 48,170,117,252,182, 40, 55,129, 97, 23,208, 90,156,154,188,245,114,255, 83,116,146, 10,132,221,228,  8,168,115,
- 77,205,104, 90,243,121,  0, 41,101,148, 50, 20, 34, 34,250,101,187,220,117,185,156,110,131,202,170,219,126,164, 98,171, 33, 57,
-208,211, 74,229, 99,183,248,  3,127, 82, 80, 97, 47,144,233, 57, 86,231,107,  2,119, 58, 84,168,212, 39,241,228,216,113,223,  0,
-112, 47,238,231,195,173, 11, 80, 64,135, 67, 35, 74, 42,229, 54, 79,207,113,155, 65,238, 34,206,116,150, 57,162, 68, 78,234,177,
-169, 90,172,244, 75,101,160, 84,214,172,209,201,214,158, 26,201,166,172, 17,159, 40,  4,205, 88, 80,117,131,163, 99, 15,220,  7,
-215,163,186, 26,185,144, 49,106,116, 43,200, 94, 12,205, 10,252, 90,204, 25, 21,207, 18,128,139,  7,173,216,227,180, 43, 72,188,
-119,186,188, 93,242,150,213,163, 38, 84, 44,243, 41, 49,196,116, 96, 32, 17,236, 38, 86,221,186,253,126, 61, 71,  1,135,240, 21,
-251,174,247,169,141,140, 73,  8,146, 78,241,162, 57,127,236, 90,173,  5, 17,222, 78,  5, 59,185,215,183,186,188,120,123,183,248,
-117,249,250,221,205,237, 15, 12,168,235,186,223, 50,146,137,151,234,  4,104,132,152, 15, 40,156,250,126,131,185, 48,125,145, 76,
-  7, 53, 91,  1,226, 40, 94,104,103,123, 99, 51,230,120,254,167,160, 62,198,241, 17,121,196,138,104, 97,127,146,157,134,143, 69,
-193,166,179,255,226, 60,254, 45,  0,101, 87,176, 27, 53, 12, 68,109, 39, 78,154, 84,187, 61,160, 86, 72, 84, 85,191,128,  3, 23,
- 16,136, 79,129, 35, 18,135,254, 19, 20,248, 27, 78, 85, 47, 69,170, 68,165, 10, 36,164,165, 91,218, 77,154, 56,246,116,102,236,
-120,183,219, 77, 36,118,175,217,200, 78,236, 55,111,222,188, 89, 15,145,119, 57,240, 99, 25, 89,193,170,241,177,111,109, 96, 93,
- 68,232, 34,205, 83,145,102, 50, 11,124,  2,168,  2,162,  5,190,132,  4,159, 47, 49, 83, 33, 42, 87, 45, 92,133, 57, 17,225, 27,
- 35,106,176, 87,122, 58,216,117, 32, 52,110,182,235,127, 87,136, 44,  8, 86,123,211,167,191,103,151,136,114,157, 49,108, 11,113,
-129, 10,201,104,204,164,  4, 46,100, 86, 58, 81,176, 50, 96,213, 71, 92, 78, 27, 48, 33,188,169,149, 47,189,120,101,155,190,132,
-113,176,187,179,187, 83, 76,127,254,185, 88,119,186, 57,231, 99,137,227, 96,196,115,226,196,129, 45, 95, 55,205,237, 45,166,129,
-210,206,237,226, 87, 59,175,210,174, 77,187, 98, 74,190,151, 39,248, 16,172,230, 27,128,177,164, 45, 41,202,  7, 37, 14, 16,233,
- 49,  0,139,218,  4,165, 50,215, 42,203,147,  2,193,189, 80,185, 38,176, 37,207,188,147, 77,  3,228, 97,166,130, 33,188,126,254,
-226,236,199,249,197,229,236,253,187,183,167, 39,103,223, 79, 78,203,188,160,200,147,192, 36,211,142,196, 45,242,194, 28,238, 63,
- 91,212,213,236,234,250,232,227,  7,164, 63,159,190, 28,103, 91, 10,227, 12, 18,149,132, 52, 43, 71, 70, 73,107,239,112, 64, 13,
-205, 11,  3, 23,238,149,132, 92,240,248,146, 52,238, 45,239,  9,  5, 31, 61,105,197,209,134,108,186,154,197,247, 65,196,236, 47,
- 87,246,161, 81,114,147,232, 60,186,250,  1,236,163,232, 32, 55, 17,243,100,192,165,  6,203,252, 82,140, 91,217, 74, 93,214,166,
-242,195,199,187, 53,180, 32,113,249,232,214,154, 56,169, 14, 58, 16, 75,145,190, 55,196,170,135,100,  7,209, 51, 53,176,241,112,
-121, 41,  5,192,168, 56,174, 86, 28,232,225, 15,150,251,124, 14, 23,199,100,107, 50,175,255,174,116, 30,172,223,128, 53, 50,136,
- 40, 31,249,160, 18,177,179, 80, 70,207,190,234,221, 80,177,154,154,242,187,246,  6, 20,217,115,243, 77,200,238,121, 92, 26, 88,
-188,  8, 64,239,189,146,193, 49,217,195, 58,243,117,240, 13,128, 50, 54, 55,177,145, 46,229,168, 64,193,128,160, 27,159, 46,178,
- 25,211,146,  3,152, 42,161, 29,230,231,200,216,219,198,208,169, 53,134, 15,202,161, 92,210,215,250, 19, 50,135, 49,233, 97, 99,
- 52,201,191, 73, 86,230,219,101,185,141, 87,188,124,245,102,255,224,224,219,215,207,  8,252,116,102, 78,223,128,227,243, 96, 96,
-247, 28,207,146,229, 22,185, 14,229, 94, 99,196,  8,100,216, 14,109,255,167, 55, 98,173,212, 49, 78,187,131,202,205, 76,  8,150,
-  5, 27, 31, 96,104,165,185,  1,  4,135, 71,134,177,241,207,189,  0,172, 93,203,110, 19, 49, 20,245,245, 60,243, 40,  1, 65, 75,
-131,202, 18,254,  2, 22,192,138,175, 66, 17, 95,128,202, 31, 32,193, 55,240, 88, 34,216,178, 66,160, 82, 42,218, 72, 93, 16, 74,
- 90,230,145,241,216,230,222,107,155,132, 52, 21,173,196,172,178,136,228, 25,207,125, 28,159,123,142, 38, 62, 87,113,247,226,145,
- 69, 36,229,124,113, 16,172,110,254, 28,151, 11, 66,159, 26, 95,144,104,107, 59,115,194, 35,178,173,106, 34, 28, 16,135,198, 42,
- 74,100,146,198, 89, 55,238,174,119,174, 25,208, 19,117,244,171, 45, 37,201,153, 18,159,148,152,222,244, 42, 68, 85, 22, 73,154,
- 81, 51, 23,102, 60,217,227,207, 28,181,204,154,145,136, 17,152,135,119,140,153, 87,176, 72,121,123,120,107,247,112,199, 73, 48,
-157,236, 92, 88, 31,121,158,234,  2, 91,171, 38,149,169,178,196,190, 13,122,151,143,171, 19, 31,245, 26,209,193,165, 47,135,187,
- 60, 34,146,139, 10, 85,139,201, 11, 45, 25,173, 44,163,120,230,220,172,147,232, 64, 52,209,211, 49,124,175, 69,219, 68,186, 63,
-200,  7, 73,214,203,251,189, 78, 42,120,224,239, 38,190, 86,243,172, 83,104, 82,131, 74,145, 33,118,214,116,243,137,251,112, 18,
-199, 61,139,108, 48,234,201,108, 27,133,169,  2, 30, 87,134, 91,195,106,166,191, 29,236,111,172,223,180,162,243,234,205,235,162,
- 50,247, 31, 60,252,240,113,239,199, 20, 59, 85,164, 12, 57,119, 89,129, 44,174, 94, 25, 60, 26,141,118,119,190, 62,121,186,125,
-231,238, 61,132,153,207,158,191, 64,252, 73,116, 54,107, 54,179, 52,174,105,131, 33,227,180,166,245,129,122,175,182, 80, 26,189,
-214, 77,142, 78, 76, 18,101,184,219,210,106, 61, 15, 44, 19,166,255,127,125, 73,196,  4, 38,193,  4, 34, 94, 17,104,245, 98, 81,
- 45,254,195, 69,250,200,180, 87, 52,133, 60,165, 47, 12,220,247, 10,203,107, 39,202, 43, 93,195,191, 32, 85,201,197, 29, 60,  5,
- 23, 68, 80,164, 47, 84,171,156, 77,110,158,140,157, 82,211, 73,137,243,243, 15,234, 49, 96,206,110, 93,  0, 75,190,182, 83, 44,
-191,157,  7,156,175, 18,180,227,100,229,177,211,234,167, 61,251, 17,194, 49, 22,124,149,231,187,196, 29,171, 84,197, 67, 42, 71,
-172,207,197,237,193,246,237, 51,130,114,103, 94,220,101, 20,124,172,129,142,151,115,104, 79,148, 30,184, 94,192, 53, 54, 90, 54,
-175, 46, 92,210,149,120,167, 54,112,162,  7,112, 58,131,152, 85, 55,188, 26,235, 99, 48,169, 65,209, 79,172,242, 24, 69,141, 34,
- 38,134, 61, 77,216,100,149,109,219,235,107,155,227,201,190,155,186,225, 33, 82,184, 42,109, 89, 71,131,207,141, 77,  0,255,105,
-178, 60,239,143,182, 31,191,123,251,126,227,229,102, 81, 28,227,242, 55,250, 91,159, 15, 62,225,106, 70, 33,190,106,112, 71, 27,
- 86,209,231,105,183,158,149, 54,164, 55,  5,106,  8, 86,158,150,165,170, 41,207,163,146,133, 11, 64,246, 21,228, 98, 14, 89, 77,
-203,234, 69, 58,126, 65,176,189, 20, 45,182, 53, 23,206,167,223,  2,176,118,237,186, 77,  4, 81,116, 94,158,245,174,147,181,113,
-131, 40, 81,226,130, 18, 33,209,162,252,101, 42, 36,126,  0, 41, 74, 73, 65,133, 27, 26, 36, 10, 20, 18,137,  2,137, 42, 56, 33,
-224,172,247, 53,195,125,204,190,156, 88,128,132, 27,219,251, 28,237,206,222, 61,247,158,115,102,  6,252,170,188, 27,220, 27,187,
-177,238,122, 82,112, 42,112,101, 70, 99,210,135,183, 57,146,128, 36, 99,237,117,225,242, 10, 16,143,168,136,182, 18, 42,120, 75,
-241, 57, 96,226,209,241, 61, 65, 35, 26,100,184,230,209,228, 97,106,211,181,207, 96,123,213,184,154, 49, 30,146,165,129,228,175,
- 56,179, 29,124,161,224,210, 68,155, 98,237, 89,123,232,194, 40,  5, 45,196,128, 37,215,191, 86,212,251,176,164, 30, 20,153, 70,
-  6,134, 39,112,176, 42, 47,115,216, 25, 41, 26, 47, 11,114, 48, 55,242,124,113,149,253, 80,140, 95,216, 31,215,210,184,222,135,
- 89, 79,169,112,  1,255, 35,107,241,138,139,250,194,125,187,140, 87,241,196,236, 69, 49, 92,  4, 11,221, 67,152,186,134,252, 93,
- 59,108, 48,164, 44, 58, 26,153, 73,162,246, 19,148, 42, 38,214, 24,  4, 46, 42, 47, 92, 89, 74, 88,121,117,157, 81,185, 27,  0,
-  3, 44,148, 27, 52,250,168,178,226, 98,150,252,153,229,207,159, 62,123,178, 56,120,255,225,227,131,217,124,113,184,120,243,118,
-121,248,248, 32, 77,167,145,141,206, 47, 62, 71,227, 81, 28,137,201,216, 64,  6,192, 29,246,232,197, 17, 36,247,175, 79, 78,207,
-206, 62, 45,151,239,206,191,124,245, 78,195,  1, 21, 14, 63,128,141, 55, 90, 89, 43,103,177,153,166,122,111,162, 99, 27,138,189,
- 21,146,170, 46,167,230, 16,155,133, 55,160,181,  8,180, 41,228,214, 16,  5, 35,109, 21,170, 42,235, 33,167,244, 63,231,108,154,
- 39,243, 28,210,106, 14, 94,131,176,232,119, 74, 45,253, 95,121,200,239,165,173,106,  2,236,  4,127, 66,245, 73,111, 57,125, 24,
-246,162, 25,202,169, 94, 99,228,159, 78,117,135, 29,237,234,  3,196,134,136,206, 33,200,210,242,198, 88,178, 99, 14,150, 46,116,
-203,208,200,224, 48, 65, 96, 72, 85,112, 61,120, 69,169, 62, 96, 83,162,167,125, 20,236, 45, 85, 12,219,169,  8, 73,250,  8, 25,
- 84, 50,244, 27,171,237,196,184,242,  8, 23,130,105, 51,211,215,207, 16, 54,106, 87, 49, 21,138, 59,208,217,227, 81, 34, 26, 73,
- 43,114,163,180,141,119, 65,241,204,227, 98, 20,101,134, 94,213,138,194, 60,253,184,185, 93, 97,104,195, 96,206,108, 29, 19,108,
- 72, 54,225,254, 24,132, 20,196,147,205, 38,219,151,233,171,227,151,168, 54,241,162, 40,242,239, 55,151, 53, 57,222, 49,128,160,
-202,217, 83,122, 84, 79,227,217,109,190,238,112,115,128,149,225,137,175, 32,135,195, 11,224,188,148, 61, 74, 67,222,247,118,222,
-166,186,225, 48, 99, 36,213,235, 93,130, 39, 49, 20,122,121,236, 63,126, 75, 70,133, 93, 11,130,147,239,251,195,133, 97,  7,217,
- 63,126,126, 11, 64,217,213,244, 54, 13,  4, 81,207,174,237,236, 58,105, 82, 26, 72,133,138, 80,251, 11,128, 11,  7, 78,253, 27,
- 72, 28,248,171,  5,132,132,224,128,  4, 72,168,151,138, 67, 69, 19,218, 40,105,172, 56,254,102,102,118, 29,187, 14, 70, 16,229,
-148, 83,188,158,121, 51,243,230,205,236,159,241, 29,234,230, 81,211, 62,106,249,140,228, 13, 46,130, 91,116, 70, 51,163,132,198,
-147,203,202,196, 44,134,104, 48,183, 86,162,235,242, 65,129,233, 97,112,166,154,155,212,162,112,134,106,255,190, 26, 47,146,101,
- 73,  4,139,224,169,  3,160, 78,  8,191,140,170,195, 87, 96,148,222, 36, 28,117,205,245,114, 22,220,183,236, 33, 25,203, 72,143,
-184, 83, 90, 52, 92,131,228, 59,102, 63,141,  1,122,171,230, 97, 22, 21, 31, 66,186, 54, 92, 25, 37,151,242, 20, 97,173,132,129,
-222,195, 31,134,122,116,114,120,124,125,123, 83,201,233,201,105, 48,233, 62, 57, 56,254,186,184,184, 16, 51,232, 23, 67, 95,251,
- 64, 82,127,229,187,218,119, 77,102,212,243,188,128,184, 65,215, 88,176,239,122,129, 30,253,154,133, 73, 38, 16,184,139, 12,242,
-212,121, 56,153,188,126,245,178, 31,168,233,244,102,181, 90,227,169,184, 76,184, 35,254,210, 25, 56, 50, 38,138,166,236, 73,249,
-236,201,211, 15, 31, 63, 33,232,158,190,120,254,229,219,231,123,195, 32,205,163, 71, 71,135,241,122,177, 92, 94,247,148,139,118,
-178,142,203, 40,202,166,243,240,237,217,251,179, 55,239,230,171,245,213,108,254,227,242, 10, 95, 19,134,140, 56, 43, 34,202,135,
-242, 36,227, 14, 43,134, 32, 32, 57,231, 38, 46,241, 27, 39,104,214, 24,117, 11,223, 21,225, 18,243, 62,200,183,183,  6, 86, 43,
- 57,140,114,116,119,255, 12, 77,141, 91,167,109,241,195,  0, 59, 43,  7,186,168, 67,163,144,233, 50, 83, 76,222,161,115,116,182,
-157, 35,181,228,137,237,110,204,191, 33,190, 73,138, 93,225,149,101,185, 51,118, 68,180,192, 65, 48, 94,167,161,216,137,100,176,
-211, 52,  3,  7,254,  2, 10,119,135, 84,109,235,  1,192,113, 58,135, 99,133,168,165, 59, 78, 83,198,179,141,127, 21,112, 55,131,
-173,104,  4, 25, 75,187,195, 86,118,102,166, 50,106,184,167, 34, 18,179, 31, 97,197,109,194,106,222,152, 71,149,194,150,183, 18,
-120,130,194, 80, 52,204,189,152,190, 43,203,100,141,188,133,156,142,228, 50,142,240,165,223, 87,253,201,222,131, 52, 79, 31,143,
-143,176,130,143,179,141,168, 31,150,200, 85, 74,114,208,205,227,152,111,129, 76, 18,170,215,121,192,154,144,128,231, 87, 33,175,
-134,228, 75, 15, 93,133, 10,119,201,139, 77,168, 77,161,148, 62, 63,255,254,115,122,137,169,  0, 70,133, 77, 28,241, 50, 19, 90,
-211, 97, 22,110,216, 13,  5,224, 12,244, 48,140,110,225, 46,190, 23,150,122,  7,133,238, 44, 37,201,163,  1,170,247,  8,205, 56,
-218,213, 55, 98,116,160, 97,124, 86,238,130,104, 78,170,119, 27,155,246,  6,105,145,180,140, 68,139, 32, 99,119, 48,200,142,127,
- 93,123,154, 43,227,255,251,252, 22,128,178,171,107,109, 34,136,162,221,217,217,236,102,179, 77,104, 49,248,160, 16,161,148, 66,
-  5,171,130,244,165, 66, 31, 90,255,175, 63,162,250,160,111, 45, 82, 10, 62, 41,212, 34,178,105,154,237,126,206,140,247, 99,102,
-179,109, 99, 84, 72, 32,217,144,100,179, 51,115,230,220,123,207,185, 89,133,239,182,  4,222,154,215, 58, 53,213,245,120,  4, 99,
- 32,108,247, 47,217,247, 96,203,194, 75,105, 92, 33,162, 35,251,247, 90,131, 59,219,223,148,173,199, 91,  7,  4, 87, 56, 55,163,
-141,113,252,232, 71,126, 69,223, 73,208,206, 12,158, 17, 30, 71, 95,187, 30, 18,246,  1,  1,140,118,118, 38, 59, 83, 97, 92, 97,
- 39,224, 46, 99,112,112,231,201,206,236,246,154, 20, 50,108,222,104, 85,186, 46, 80,240, 52,213,126, 91,153,151,152,140,159,165,
- 89,234,211, 14, 14, 63, 42, 43,111,211,155, 95,198, 18, 40, 36,239,163,254,176, 39,123,239, 47, 79,190,153,105, 36, 48,189, 94,
- 85,216,242,165,204, 77,133,105, 16, 44,234,199,125, 25,  5,  1,144,119, 20,240,248, 16, 30,170,189,221,237,163,195,131,139,175,
-103,195, 68, 14, 32, 48, 11, 97,255, 88, 43,234,249,108,150,190,124,181,123,124,248,118, 16,247,210,233, 79,224, 32, 33, 42,136,
-200,202,138,125, 58,124,137,227,211,236,191,217, 59,191,248, 82,213,217,235, 23,207, 47,175,190,231, 69,182,189, 53, 57,249,240,
-241,221,209,241,167,207,167,117,165, 40,142,198,107, 25, 72, 89,212,117,217, 52, 73, 63,164,  6, 31,232, 79,237,209, 26,  0, 90,
- 19,160,101, 80, 12,128, 99, 68,184, 58, 97,182, 23,133, 46, 43, 84, 23,107,110,123,  6,139, 27,157, 73, 13,174, 53, 99, 87, 22,
-227,251, 61, 39,170,233,168,128,187,204,221,216,134, 79,248,122,228,199,218,113,225,213, 81,235, 10,112, 95,138,215,255, 30,  6,
-143,147,199,154,178,183,247,206,255, 79, 89, 82,209,201, 70,146,184,169,229,197, 11,162,  3, 39, 83, 96, 98,  7, 14,202,135,190,
- 22,183,145,152,167,163,201, 53,246, 59,195,103, 81, 16,115, 50,231,225,217, 82,191, 23,227, 10,194, 84, 45,242,196,178,216, 98,
-201,191, 29, 46, 60, 22,119,199,194,101, 77, 23, 67,227,121,173, 20,210,182,240,112, 66,175,133, 43,144,153, 59,242, 54,235, 18,
- 17,164,144, 97,200,102,197, 10, 78, 51,201, 26,104,227,154, 56,  9,209,138, 38, 89,250,236,183,111, 97,118, 79,215,  7,104,245,
-188,184,  1, 24,207,242,121,222, 20, 62,187,142, 48,156, 39,119, 34, 53,180,  3, 20,169, 53,166, 97,233,134,104,175,200,171, 77,
-190,117, 86,181,216,179,222, 72, 54,169,197,147,226,169, 65,186,122,191,168, 74,160,128,  0,  2, 73,184, 62,157,167,180, 79,240,
-231, 32,132,192,236, 86,120, 55,101,157, 27,215,104,204,176,223,188,227, 79,  5, 24,133,184,129, 11,218,157,237,217,235,244,218,
-178,162,112,227, 80,142,145,157, 95, 34, 69, 44, 50,128, 36, 76, 74, 85,255,141, 85,224,134,163,141,186,139,239,128,164, 85,199,
-236, 58, 44, 21,208,179,122,237,255, 29,173,191,  5, 96,237,122,126,147,  8,162,240,204,236, 44, 12, 11, 68,  8,120,106, 15,246,
-100,107, 77,154, 26, 15, 38, 30, 60,217,164,241, 63, 53,241,234,255,160, 94, 26, 53,169,246, 82, 26,127,245, 96,164, 33,192, 44,
- 11, 51,248,190, 55,179, 43, 16,154,104,226,158, 96, 67,178,187,240,222,247,126,125,223, 99, 11,190, 87,127,225,156,108,130,123,
-160,189,195,118,220,130,231,162,252,240,153,202,148, 71,173,161, 56,217,119,101,255, 72,135,182,135,136,201, 66,153, 63,248,104,
-143,  4,186, 60,109,  7,132,161, 53,175,238,102,189,209, 98,106, 41, 39,146,137,227, 29,141,232,234, 44, 93,196,116,142,239,176,
-133,184,133, 49,182,171,152,184, 91, 41,152,160,153, 34, 92, 36,252,109,155, 59, 51,151, 83,248,207,231, 57,236, 79, 48,143,119,
-169,162, 69, 34, 42,234,195,221,131,225,120,168,130,158,159,231,102,116,133,145, 29,134,132,196,121,215,111,245,181,214,118, 62,
- 11,141,102,193, 69, 41,153,223,251,233, 96, 36,139, 76,153,208,220,247,172,166, 35,184, 52, 90, 19,188, 66,138,  7,113, 30, 42,
-133,176, 58,141,204,235,225,193,225,243,147,147, 15,103,111,109, 62,165,104,131, 89,171,199,179,255,184,254,249,230,221,217,224,
-234,235,163,163,163, 23,167,167,189, 94,239,203,213,247,225,104,170,181,104,103,105, 43,147,141, 58, 65,112,254,248,248,120,112,
-121,249,107,120,179,119,111,207,249,244,252,243,224,233,147,103, 47, 95,189,222,223,127,208,239,116, 63,158, 95,104, 92,143,110,
- 45,144, 44,224, 96,208,140,165,146, 98, 73, 90, 19, 13, 35, 90, 70, 53, 51,217, 54,  9,133, 22,122,222,177,  5, 61,129,252,216,
-164,244, 49,193,126,139, 47,212, 82,105,155,219, 25,146, 37,193,229,114, 57,240, 91, 95, 66,232, 87, 40,  0,235, 68, 35,252, 48,
- 77,141,148,132, 43,208,249,191,118, 37,255,227,145,138,148,170,114, 91, 76, 28, 56,112,232,219, 25, 72, 91, 23, 89,218,168,167,
-141,  2,124,231, 45, 73,125,215,116,103, 43, 90,193,106,147, 76,249, 86,149, 72, 26, 53, 17,183,173, 40, 72,101,109,130, 38,239,
-130,119, 22, 81,192, 44,  8,226,  9, 59, 42, 95, 88,  1,119, 95, 17,210,  4, 15, 27,120,236,182,113,111,145, 58, 16, 57,123, 81,
- 70,136,206,135, 73,140,  7,235, 41, 74,244,101,149,186, 71,116, 47, 79,138,128,236,242, 79,201, 27, 21, 76, 48,210, 68, 68, 81,
-119,212,175, 36,225,  5,232,182, 82,  4, 98,123, 18, 84,122,124,146, 61, 23,169, 93, 37,121,137,236,120,100,250, 28,  3,130,186,
- 85,198, 26,  0,171, 52,106,188,122,132,204, 77,225,173, 10, 99,222,221,222,142, 45,108, 88,179, 74, 41,221, 28, 78, 63,143, 61,
- 21,224,242, 34,184,124,128,  0, 89,237,181,  1, 11,203,118,154, 29,170,  3,200,193, 59, 89,167, 86,111,140, 39, 55,132,236, 90,
-213,238,239, 28, 92,124,251,196,180, 72,135,120,193, 18, 88,136,103, 48, 16,243,220,199,141,179,144,150,105,242, 37,150,213,254,
-129, 13,246,247,173,115, 75,169, 57, 96,207,228,138,196,172, 93,111, 85,162,117, 80,212, 92,225,183, 20,181,107, 69, 44, 68,145,
- 43,181,239, 70,137, 23,220,142,192, 93,254,133, 48,112,235,241, 91,  0,206,174,166,183,105, 32,136,122,119,227,245, 71, 62, 74,
- 19, 74, 17,170, 90,  5, 10,244,128, 64, 28,225,192,129,  3, 18, 55, 36, 46,252, 91, 46, 72,220,138, 42,132, 16,208, 86, 10, 80,
- 53, 16,210,212,137,235,196,137,237,101,102,118,215, 73,160,  5, 68, 14,150,229, 72,107,217, 94,207,206,188,121,239,249, 79,241,
-157,255,162,131, 64,219, 32,221, 55, 39,195, 47,218, 74, 22,192, 91,148, 19, 59,156,230, 49, 61, 96,220,138,178, 82,180, 42, 81,
-150, 57, 38,205,230,166,112, 65,136, 15, 10, 55,137, 12, 86, 89,147,193,101,127,245, 75,124, 68, 39,194,  8,143,172,109,109,  9,
- 65, 25,187,137, 41, 74,179,113,137,  6,107, 18, 18,237, 47, 68,180, 92,  2,252, 96, 46, 76,166, 19,152, 89,176,132, 78,179,244,
-230,250,246,105, 50,228,165, 86,154,105,163,187,162, 31, 15,144, 52, 75,186, 90, 24,105,115,109, 43, 73,207,132,197,111,224, 82,
-147, 89, 66, 43,185,186,127,253,222,143,168,135,128,148, 18,189, 98,216,147,163,102, 24, 54,170, 94,232, 85,234,129,223, 92,113,
-155,117,185, 90,247, 27, 97,  5,242,226,208,199, 96, 43,189,138, 47, 93,218, 81, 82, 20,119,239,220,114, 24,118,134, 15, 14, 58,
- 14,247, 54,174,110,118,190,126, 83,232, 77,227,194,204,143, 70,209,251, 15,239, 14, 59,251,219,237,173,167, 79, 30,111, 92, 91,
-239, 30,119,123,131, 97, 28,163, 47, 88,255,116,178,115,123,231, 36, 26,125, 62, 58,190,212, 88,185,209,110,191,124,245,250,209,
-195,  7, 31,247, 63,237,238,189,125,241,252,217,238,155,189,110,247,123,158, 59,213,208, 79,211, 12, 86, 28,100,172,209,194,136,
- 93,142, 28, 15, 40, 14, 37, 45, 11,  3, 71,184, 72, 26,131, 91,232, 10, 86,149,162, 22,242,  0, 86, 17,201,124, 15,202, 50,238,
- 74,  6,201,  3,148,182,196, 22,206,202,248, 94,218,165,150,220, 69,152,226,158,235,101, 75, 57, 41,254,213, 10,175, 64,124,156,
-169, 44, 16, 65, 70,234, 30,126,177,185,227,127,199,119,233,200,156,188,136,216, 95,116,176,170,130, 64,173,171,  8, 18,165,150,
- 15,214, 38, 68,220, 58, 31,189,209, 66,240,  5,168,199, 80,108,225,114,200, 91,171,176,111, 35, 35,240,189,208,214,163, 11,160,
- 78,249,234, 22,133, 21,  7,232,113,242, 98,182,220, 60, 96,220,102,238,205,176, 53,153,141,169, 93,137,196, 83,221,168, 21,206,
- 57, 12, 81,216, 86,189, 26, 61, 16,194, 10,  9, 60, 43, 84,153, 74,114,182, 44, 73, 81, 86, 57,191, 16,217,109,112, 87,  6,153,
-177,  9,254, 92,193,164, 73, 42, 21, 45,227, 64,182,172, 96,198,106, 70, 24, 17, 56,210, 45, 17,177,209,150, 82, 20,226, 29,163,
- 86, 44,173, 11, 48,123,131, 90,148,147,210,  2, 71,160,125, 81, 46,  6,112,206, 56,141,117,219, 48,215, 22, 96,216,248,209,182,
-  4,112, 19, 72,205, 88, 24,185, 58,132, 65, 75, 81, 84,250,187,237,227,105,  2,193, 29,107, 78,206,171,178, 22, 37,131, 86,109,
-109,116, 22,157,196,253,113,154, 80,233, 79, 21,129,197,223,169,105,103,104,  0,122, 30,167,179,180, 88,206,223,157,185,147, 18,
-215, 86,207,150,160,199,200,124,201, 28,128, 97,  8, 84,113,202, 16, 71, 98,151,169, 86,228, 89,201,177,113,187, 42,230,235,  5,
-251,157,174,179, 92,251, 58,206,130,237,232,191,171,190, 47,250,253, 20,128,180,107,105,109, 34,138,194,247,220,185, 51,147,116,
- 82,234, 19,171,213,180, 32, 10, 10, 46,170, 46,164, 80, 23,130,238,138, 43,187,115,161, 43,197,255, 39,184,180, 96,125, 81, 53,
-  8, 69, 20,139, 15, 84, 12,149, 54,113, 38, 51,153,201,204,245,158,115,238, 76,166, 82,171, 96,146, 85, 18,134,  9,185,247, 60,
-190,239, 59,223,253,123,124, 31,255,102, 75,248,  0,207,166, 81,191,  6,129,211, 26,145, 52,132,224,120,139,123, 56,214,142,  6,
-192,142, 93, 73,130, 59,120, 68,159, 85, 83, 68,190, 75,107, 91,225, 41,183,233, 54, 38, 92,127,210,159,252, 62,248, 49,202,135,
- 12,149,229, 58, 47,255, 89, 59,112, 64, 49,159,215,129,144,  5,151, 30, 22,104,151,246, 37,120, 94,186,225,122,243,237,249,141,
-205,247,102, 73,245,162,109,193, 44, 15,173, 93,199, 58,191, 43,170,176, 29, 42, 58,144,223, 55,205, 29, 32,199,203,170, 49,210,
-201, 72,224, 64,217,139,250, 67,157, 81, 77,  3, 95, 27,221, 86,160, 14,152, 14, 48, 80, 65, 67,237,159, 82, 19, 77,197,222, 26,
- 26,229, 14,114,148, 33, 11,145,164,168, 62, 65,161,116, 14, 89, 10, 11,151, 22,159,175,117,206,156, 58,183,246,242,205,209, 35,
- 51,183,111,222,186,255, 96, 37, 74,244,144,224,239, 36,209,113, 92,124,249,182,249,248,105,231,197,171,245, 99,211,199,151,150,
-174,207,206,204,126,252,220,221,250, 25,154, 28,115,178,125,162,213,244,223,190,251, 96,186,215, 11,231, 47, 62,124,244,100,174,
- 61,231,122,141,149,213,103,158,231,223,187,115,247,242,194,226,242,141,229,171, 87,174,117, 94,175,111,124,234,198, 72,115,235,
-193,176,  8,  7,163,126,156,135, 81,214,139,178, 56,214,209, 64,152,196, 71,195,222,133, 66,245,142,192,250, 93,177,252, 66,166,
- 41,122, 73,166,195,180,223, 79,152,243,200, 11,224,248,110,250, 18,211, 18,113, 12, 18,214, 90, 19,247, 34, 47, 60, 79,250,128,
- 41, 23, 87, 44, 38, 69,106, 81, 71,214, 52,  6,246,192,184,119,117, 11,128,127,240, 48, 48, 13,146,175, 80,104, 90,252, 65,198,
- 38,109, 73,181,207,196,235,242, 59, 21, 39,100,247,149, 35,148,222, 57,124,168, 76,250,115,124, 78,  3, 78, 13,174,212,140,213,
-212,130, 59, 51, 81,167,167,207,134, 73, 72,170,100,248, 93,107,179,103,223,162,  5, 11,151,236,205,164, 25,138,205,120,130,131,
-189, 10, 97,199,133,228, 24, 71,  7,145,161,168,166,168,200, 94,141, 35,103,210,212, 18,  4,153,214,  7,107,199, 24,125,233,159,
- 96,  7,145, 68, 25,220, 53,219,184,142,139,119,230, 72, 89, 54, 67,254, 46,244,169,164,100, 67, 85,145,182, 46, 74,146,119,158,
- 77,127,170,218,121, 92,194,147, 83,  5,159,225, 64,136, 13,153,  8,160, 42,216,113,129, 15,118,176,222,147,108,255,104,163, 95,
-101,141,129,153,145,180, 91,100,241, 75,207,220,250,196, 86,132,116, 73, 27,160,227, 99,150,108,135, 91,166, 56,207,112,218, 53,
-137,147,216, 92,131,207, 49, 32,157,  0, 30,127, 96, 79,115, 16,197, 88,185, 75,244, 16,  0,212, 20,135,182,240, 68, 60,130,  2,
- 14,128, 20,181, 28, 95,212,103,193,240, 13,167,178,  4, 98,157,255,161,224,112,156,197,146,225,232, 18,203, 49, 61,243, 84,112,
-112,144,134,117,159, 11,189,219,100, 31,212,  6,157,254, 63,184,155,199, 47,  1, 24,187,154,214,182,129, 32,186,210,234,203, 73,
-145, 27,219, 13,105,192,  7, 67,211, 30,  2,133, 66,207,201,239,235, 31,233,181,244,152, 67,161,237, 31,104, 15,166,105, 74,105,
-112,161,216,212,137, 99,203,118, 34, 75,187,154,238,204,172,100,153,226, 16, 48,  6, 99, 35,100,118,244,102,118,230,189,183,222,
-195,233,201, 80,243,251, 37,242,147,201,225,190,  7,178,160, 13,160,164,186,195, 68,131, 98,103, 45,  1, 10,117, 52,142,103,112,
-216,186,107,218,168,173, 44, 76,217,197, 51, 51, 47,110,183, 23, 38,  1, 22,157, 40,190,204, 19, 84,151,101, 43,218, 22,107,238,
-206, 17,151,  3, 47,107, 74,114, 95,202,228,118,  6,188, 58, 46,115,174,241, 77, 21,108, 45,160, 76, 60,165, 69,250,245,247, 23,
- 50, 73,244, 41, 40, 75,255, 25, 76,215, 68,  9, 43, 27,241, 30, 11,170, 77,105,142,165, 40, 71,188,219,  8,221,222,147,222,249,
-240, 66,160, 16,212,203,117,142,210, 90, 71, 14,228, 72,161, 45,175,143,169,  0,141,244, 32, 87, 78, 88,181,240, 37, 54, 46, 19,
-  3,171,202,252, 53,103,169,116, 16,160,  5,166,193,140, 56,110,245,251, 63,143,158, 29,191, 56, 58, 62,251,244,121, 48,120, 51,
-153, 47, 27, 65, 96,110, 55,144, 94,216,  8, 59,237,199,251,157,118,183,219, 61, 60,124,218,106,239, 53,227,189,211,147,158, 73,
- 21,111,223,189, 79, 22,233,143, 95,127, 94,191,122,153,220,102,233,229, 48, 75,179,131, 78,167,127,254,237,121,175, 23,133,193,
-217,135,143,  6, 18,174, 38,215,227,241,228, 38,153,253,189,158,174,104, 60, 26, 40, 29,250, 62,243,125,232, 73, 70,175, 30,178,
-164, 71,248,114,136,200,126,151,225,174,149, 79, 55, 48, 32,152,229,197, 42,215,145,217,146,  9,174,162,112,162, 65, 58, 50, 64,
-197,176,158,214, 35,  4,214,194, 82,145,217,201,143,243,191,180,186,176,  3,246,173,  4,112, 42,126, 93,125, 47,151, 50, 14,227,
-249,166,228, 53,215,169, 73,162,174,216, 16,185,193,134, 80,  8, 63,206, 87,211,234,113,170, 44, 21, 13,208,104, 50, 32, 67,189,
- 49, 90,200,173,205, 47,145,143,173, 51,185,118, 92,168,136, 49,214, 45,182,228,  4,219, 38,236,197,232,187,192, 42,222,173,137,
-105,161,  6,206,  5,125,235, 25,188,168,192, 28,172, 73,157, 45,199,203, 38, 15, 48,216,133,126,164, 85,206,167,  5,212,208, 29,
-202,  3, 68,236,149, 93,123,135,182,217,200, 64, 78,199, 24,108,223, 17,185, 53,105, 19,107, 63, 80, 66,110,231,186,124,176,  7,
-111,173,203,172,  0, 22,130,209,197,  5,128,127,192,  5, 59,233, 17,133,205, 67, 64,211, 77, 97,135,174, 22,220, 93,182, 30,177,
- 12, 28,233,121,108,207,135,245, 82, 57,201,164, 73, 26, 93, 83, 10, 81,121, 98, 32,166,187,  2, 79, 46,144,230, 73,118,168, 75,
-  3,150, 38,183,214, 71,144,108,  3, 53,127, 10,203,196,253,214, 65,228,239, 12,174,  6,139,124, 73,220,101,104,238,182,198,179,
- 17,119,116, 89,143,136,202, 37, 75,122,135, 50,128,177,  5,  0,101,198,167, 52, 67,138, 56,  1, 59,225,163,184,209, 28,221, 12,
- 65,108, 88, 95, 75,100,255, 84,139, 75, 22, 83,181,  2, 31,185,103, 58, 37,127, 75,187, 12,187,232, 19, 57,205,116,122,183, 88,
- 57,150, 77,178,149, 62, 95,151,107, 20, 15,  6,247,251,133, 78,255,  4,160,236, 90,122,155,  6,130,176,119,237,120, 19,215, 10,
-162, 84,161,129,166,  7,144,106,169, 84, 92, 56,113, 64,192,129, 43, 66,156,185,112,224,  7,113, 68,252, 20, 46,168,160,138, 22,
- 81,169, 17, 72,125,241,136,  8,105, 21,104, 20,226,168,241,123,217,153,221,181,157,166, 66,224, 75, 14,113,226, 56,222,121,236,
- 55,223,124,243,143,250,192,124,182,155, 67,172, 13, 96,159, 64, 64,198,  7,  6,125,240, 38, 16, 96, 16, 74,193,126, 63,194,149,
- 51,151,136, 59,205,139,111,100,138,112,  4,227, 47, 66, 16,  9,227,176,161, 35, 85,225, 37,151, 23, 90,  7,189,189, 20, 54, 65,
-169,132,222, 21,133, 22,154,236, 39, 81, 66, 16, 78, 53, 36, 39, 82, 87,254,193,151,123,139,222,110,111,119,117,121,229,176,119,
- 32, 41, 49, 69,217, 76,  5, 24,243,250,226,181,238, 73,151,114,153,206, 64,248, 49,181,178,130,183,228, 29, 13,142,253, 96, 20,
-165,233,254,209, 33,108, 75, 77,132,251,169, 97, 19,115,144,140,125, 55,166, 17, 19,190,225, 84,220,225, 36,101,160,115,154, 37,
-140, 34,197, 11,110,222,177, 45,241,250,236,233, 19,167,230, 62,127,241, 50, 20,238,223,160,243, 23,234,226,253,147,225,112,115,
-243,195,131,123,119, 95,189, 94,111, 52,175, 92, 92,104,188,223,110, 95,170,187,247,239,220,126,252,232,225,234,205,181,126,191,
-255,110,227,237, 78,187,253,249,107,103, 52,246, 39, 65, 28,194, 64, 35, 94,173, 88,189,227,174, 91,187,213,152,119, 87, 60,175,
-213,186,218,108, 94,222,249,248,169,243,189, 51,231, 50, 70,233,250,198,155, 56, 78,196, 82,141, 50,226,176, 74, 77, 50, 25,208,
-200,170, 34, 29,181,192, 22, 19,240,134,  4,201,  4,233,169,248, 85,156,  8,151, 45, 44, 72,228,239,226,100,102, 19,219, 52,156,
- 10,169,215, 88,154, 88,223,116, 42,133, 90,170,168,193,167,140,111,234, 16,151, 10,227, 64,230,113,252,108,243, 77,177,128, 25,
- 76,210,  9,104, 17,218,103, 23,104,241,217,115, 29,253, 40, 28,205,122, 42,146, 59,171, 66, 48,139,231,222,156, 23, 50,  0, 70,
-217, 33, 50, 64,171,161,211, 12,139,200,128,210, 88,212,134,109, 59, 48,122,121, 73,113,174, 64, 81,132,207,154,  3, 77,133,223,
- 88, 73,226, 58, 78,128,116,162,252,238, 28, 11, 34,170, 57,133,151, 38, 58,153,153,100,220,232, 54, 82, 90, 50, 73, 82,234, 63,
-146, 23, 78,147, 80,206, 55, 40, 39,239, 18, 32,214,120,139,162,121, 72, 44, 38,  7,110, 68,252, 37,249, 93,254,205, 19, 20,130,
- 98, 84,170,249, 42, 70,178,230,216, 80, 45,246, 46, 21,116,177, 39,144,230, 32, 50, 85,163,  0, 48,143, 87,173,221,170, 48,203,
- 13,165, 82,160, 88,146,134,170,181, 82,220, 49,235,202, 23,197,123, 73,193,110, 49, 41,203,228,102,159,160, 36,175, 56, 19,135,
-216, 64, 75, 95, 34,123,196,157, 74,245,198,210,218,214,151, 45, 85,  3,204, 52,136,193,101, 44,  5,248,246,199,175, 46, 69,238,
- 62, 46, 88,152,241, 52,240,127,170, 65, 96, 74, 97, 56,195, 11,234,198, 93,165,151,199,165,  0, 31, 87,172, 95,116, 39,  8,253,
- 70, 81, 52,204,134, 58, 54,168,193, 68,242,153,154,231,185, 92,205,106, 37,227,192,159, 98, 13, 36, 33, 81, 79,  9,254,201,108,
-202,  2, 10,147, 57,179,199,205,254, 51,115, 23, 75, 58, 45, 13, 62, 43, 31,127,  4,224,236,234, 86,155,  8,162,240,206,206,236,
-236, 38,187,217, 36,196,132,210, 90, 66,241,  5,188,243,  7,139, 88,181,224,155,136, 23,190,152,130, 47,160, 86,  8, 18,170,130,
-  5,175, 68, 47,138, 52, 87, 90, 77, 91, 55,217,236,236,116,157,115,102,102,119,155,  6,  5, 33, 55, 73,  8,204,110,118,206,153,
-115,190,159,179,236, 47, 70,106, 62,115,110,137,208, 91,144,213, 38,118, 36,119, 32, 15, 53, 98,109,141,  1,115,224, 74, 50,102,
- 79,201,  6, 92, 46, 92, 35,255,119, 76,254,198, 42,198,213, 90, 36,149,224, 57,229, 30,229, 13,198,219, 60,140,253,  6,103, 92,
- 56, 98,114,118, 52,253,125,  2,152, 24,146,  4,119,175, 63,250, 50,249, 12, 40, 37,230, 93,236, 27,200,192, 15, 49,199, 72, 35,
-150, 70, 61,155,198,  1,225,184, 45,212, 25,119,129, 98, 57,128, 73,241,156, 80, 48,108,172,171,213,156,130,206, 30,222, 82,195,
-234, 37,215,  6, 91,105,150,170, 63,115,154,252,210, 54, 67, 84,115,108,105,109,192, 84,225,188, 91, 28,249,140,171, 12,158,195,
-164, 28, 85,188,184,  1,119,213,  7,170,246,108,  6,196, 99,240,192, 10,225,100,153,124,242,248,233,173,237,157,231,207, 94, 44,
-178, 76,229,186,173,225,230,230,213,141,189,209, 88, 45, 97,247,193,253,151,123,111,239,221,217, 94, 95,223,120, 61, 26,171,107,
-250,122,248,109,188,191,127,240,225,227,241,247, 31,113,220,234, 15,186, 30,  7, 39,131,217, 60, 97, 84, 70, 45, 96,188, 20, 50,
-127,184,115,247,246,141,155,107,253,181, 87,111, 70,239, 15, 62,165,153,152,165, 51,220,143,160,119,189,210,241,186, 29, 63, 14,
- 73,212,228,145, 15,144, 41,100,172,  2,220,199, 60, 36, 64,120,142,209,202,  2, 68, 12,155, 10,238,138,200,114,154, 23, 42, 31,
- 12, 88,163, 31,168,208, 78, 58, 14, 61,156,156, 30,159,205,181, 41,252,185, 22,155, 97, 85, 27,250, 33, 98,146,117,131, 34,176,
-247, 81, 55, 72,174,246, 20, 51,207,146,118,247,229,110,128,199,168, 98,165, 86,251,178,245, 45,249, 55, 99,157, 44, 49, 17,151,
-126, 23,249,177,148, 34, 10, 98,145, 11,189, 63,177,172,204,173,103,142, 90, 60,131,138, 19, 24, 62,210,128,254,166,103, 74, 72,
-197, 63,129, 21, 11,148,179, 94,148,109, 47,203, 17, 75, 54,176, 38,236,167, 32, 47, 34,151,201,234, 23, 42, 12, 82, 13,129,211,
-188,144,115,123, 89,180,174, 72, 34,213, 32, 24, 29,220,169,101, 46, 87,244,152,234, 69,254,250,114,172, 25, 12, 49, 12,  5,109,
- 32, 99, 92,218, 13, 24,165, 71,118, 96,153, 75,173,111,  1, 88, 79,187,214,128,213,152, 12,150, 45,123,235, 34,137,109,119,116,
- 11, 35,204,  4,119,  2,222,176, 84, 99,170, 46,154,168,226,222,234, 69,221,184,217, 74, 22, 73, 57, 57,170, 82, 51,104, 74,188,
-163, 79,136,249,207,228,  4,  3, 37,177,214,189, 22,193, 36, 78,101, 28,139, 90, 39, 61,160,169, 48,148, 47,120, 48,144,100, 45,
-135,189,225,116, 54,181,129, 92,215, 34, 54,170, 90, 27,217, 82, 17,169,167,248,169,184, 17,135,237, 76,136, 74, 25,233,144, 85,
-221,141, 50, 23,219, 26,139,144, 26,155, 88,150,210,145, 78,163,151,230,243,229, 89,  8,208, 12,148,182,231, 73,254, 15,142, 50,
-161,114,213, 87,127,  4,160,236, 90, 86,163,  8,162,104, 85, 63,167,199,113, 34, 38,  8,130,171,184, 15,113,103,240, 15, 92,184,
-208, 32,248, 77, 46,197,191, 48,130,139,136, 10, 42,146,133, 15,  4,191, 64,197,  4, 12,102,200, 76,102,210,239,169,135,247,222,
-170,234,238, 25,135,128,  3,153,197, 16,154,238,174,170,123,111,157,186,231,156,139,234,247,166,115, 57,137,250,200, 43,195,158,
- 25,243,124,232,241,166, 57,145,200,185,234,  5,189, 26,229,247,101,128,172,203,144,153, 78, 38,174, 98,205, 37,183, 14,111,164,
- 34,217, 24,149,105,114,123,241,125,119,126, 15, 99,112, 46,196, 80,177, 53,  4, 37, 67, 58, 62,241,123,113,127, 86,206,160,198,
-124,243,237,149,116,173,238, 38,183,225,  0, 16,184,166,152,229, 59, 80,192,194,180, 50,201, 78,225,  6,171, 26, 89,157,166,171,
- 53,240,195,135,119,238, 63, 59,216,179,144,171,103,142,125,232,196,137,166, 35,252,215,225,232, 16,141, 50,144,189, 97,183,216,
-232, 89,199,120, 14,227,193,233,208, 88,243, 99, 57, 85, 49,131, 90, 56, 78,  2,152,185,146, 98, 37, 10,235,248,150,200,139,168,
- 78,130,  9,173,200,216,147,167,143,175, 94,217, 72,179, 73, 24, 33,161,227,250,181,245,233,217,  4, 98,205,246,214,214,207, 95,
- 71, 89,145, 62,223,127,249,224,222,221, 65, 63,129,199,170,231,242,232,247,232,207,241,201,135,143,159,214,215, 46,223,220,188,
-177,179,115,123,119,247, 81, 58,157,190,123,255,250,237,193,103, 33,234,188,202,247, 94,236, 79,102, 41,148,246, 85, 53, 39,247,
- 19, 68,246,153,135,175, 29,222, 88,154,169,192, 83,144,143,162,144,104,101, 10,226, 41,228, 91, 40,177,145,252,129,  6, 41,154,
-197, 86,160,217, 27,134, 65, 31, 22,161,102,121, 84, 68,138,165, 98,254,227,100,156,  9,113, 86,148, 92,198,165,200, 48, 14, 10,
-179, 95, 54,101, 15,254,201,  5,226, 42, 29, 48, 34,208, 19,117, 17,240,127, 90,221, 27,224, 82,215,170,236,134,197, 37,249,108,
-125, 97, 63,251,170, 13,105,151, 94,205, 33,148, 23, 85,102,142,115, 27,170,145, 81, 49,115, 58,207, 36, 28,196,120, 18, 67, 76,
- 73, 57,133, 16,231, 82,210, 26,239,194, 32, 14,162, 97,138,168,142, 37, 59,120, 11,161,185,173,184, 23,246, 40,244,117, 41, 76,
- 74,130, 86,224,194,147,124,220,110,227,219, 50,205,235, 70,  4,186, 22,102,147,237,205, 91, 95,191,127,241,169,150,165,200,165,
- 58,188,  1,131,100, 64, 52,220, 24,167, 35, 31,125,189,  8,185,215,206, 19,210,196, 29, 82,  5, 88,189,128, 81, 38,215, 61,156,
- 43, 28, 29, 94,172, 29, 73,213,  5,107,235,214,106, 49, 26,191, 43, 28,168,173,209,129,  1, 56, 60,214, 58, 16,154,174, 22, 67,
-101,167, 61,177, 54,230,201,102,173,249,198,176,201, 44,186,118,208,160,130, 17,140,182,236,  4,180, 98, 96,198,115, 92,101,186,
- 37,240, 82,146,160, 82,200,188,213, 60,199, 90, 77,178, 70,  9, 82, 35, 89, 87, 17,174,104,154, 61,181, 39, 57,189,101, 82,237,
- 81,186,241,103, 54, 57, 12,126,136,  3,116,149, 25,  4,253, 82, 84, 66,214,218,154,112, 26,185, 29, 88,228,176,140,148, 57,100,
- 37,246, 33,246,188, 65,238,161,170,146, 55, 16,143,  3, 33,148,131, 37,218,148, 13,183, 61,128,169, 85,158,115,238,242,144,155,
-252,116, 23,106, 90,156,106,171,189,138,115, 47, 32,121,190,149, 34, 75, 75, 18, 52,255,229, 82,185,244,249, 43,  0, 99,215,247,
- 26, 53, 16,132, 47,155,236, 93,146,163, 45,180, 22, 65, 31, 44,138,130, 79, 22, 65,255,231, 82,241,185,248,238,155,  8,138, 15,
-214,135,226,111,148,114,245,106,239,146,236,109,178,235,124, 51,187,185, 84,165,250,124,129,228,102,119,103,103,190,153,249,190,
-127,227, 51,244, 41,166,109, 88,160,  2,114, 62, 50, 55,223,162, 18,  5,196,112,110,127,220, 40,110, 82,188, 88,117, 43,197,249,
- 60,121, 13, 76,177,122,225, 85,160,235, 26,198, 97,214,124,153,191, 16,126,138,152,200,121,105, 86,201, 88,243, 26,129,192,194,
- 86, 12,186,216,173,124,251,188,153,167, 48,112,167,177,173,125,164,106,193, 65,109, 16, 72,122,110,161,117,220,  4, 31,176,200,
- 80,112,141, 60, 73,180, 44,109,107,158, 60,127, 10,156,141,247, 13, 87,168,240, 88,161, 39,166, 53,120,119,172,245,210,178,129,
-111, 29,  6,237,182,203, 45,157, 77, 62,206, 62,241,233, 65,103,216,153, 94, 92, 27,231,101,174,167,185,206, 50,112, 49, 82, 98,
-160,179,145,214, 94,234, 83,194,251,135, 96, 87,233,151,175,143, 91,123,108,186, 36, 33,103,108,205,116,115,247,253,231,211,177,
-206, 31,237, 63, 60, 56, 60,228,217, 44,119,119,111,239,250,206, 70,219, 89, 58,  1,150,243, 66,138,180,239,221,191,243,248,193,
-254,102, 89, 60, 59, 58,122,251,238,228,235,183, 47,203,186, 86,172, 83,243,226,213, 27,107,219, 44, 77,139,137,134, 74,170,197,
-220,  7,153,162,162,171,148,199,229, 40,104, 42,114,120,  9,178,201,100,130, 48,205, 41,  7,246,224, 17,192,165,105, 73, 49,125,
-210, 53,160, 54,155, 45,205,247,179,249,210,218,139,202, 53,116,237,120, 19,244,207,224,170,171,160,171,192,192, 49,164, 48, 48,
- 39, 12,243,214,180, 52,131,122,163,156, 28,233, 91, 87,127,236,185,114,188,177, 88,253,228,174,131, 36,137, 34, 56,195, 73,253,
-161,142,135, 28,218, 20,115, 28,174, 15,240, 19,198, 82, 88,182,201, 95,177,165,195,149, 12,209,182,140,125,107, 44, 48,242,  5,
-239,124,107,108, 19, 14, 32,162, 72,189,162,196, 46, 34, 48, 62,206, 82,174,133,233,188,187, 96, 28,166,135,128,200, 47,180, 80,
- 47,247,129, 70, 38, 73,134,194,238, 17,200,192,  5, 86,217,154,219, 34,179,206,247,189, 24, 65,154,252,214,238,237, 15,167, 39,
-201,192, 35,  4,174, 12,156,120,103, 76,163,250, 62, 98, 50,233,101, 14,215,222,110,185, 46, 40,156, 76,179,224,126,163,103, 87,
-204,228,242,183,249,128,161,170,158,188, 76,242, 36, 21,137,195,124,164,124, 20,137,157, 72, 62,163,  2,243,  6,167,217, 12, 81,
- 11,237,159,156, 88, 63, 28,158,146, 11, 42, 94,  6,146,133, 72,  0,171,250, 89, 39, 81, 85, 14, 67, 81,  1,131, 86,169,175, 87,
- 21, 45, 54,204,  5, 14, 83, 32, 51, 50,191,158,178,139,167,232,130,158,  7,102,203,136, 14,192, 24, 32,169, 42,254, 77, 39, 18,
-125,208, 24,115,191,229,112,177,112, 42, 83,178, 10, 73,254,124, 49,227,166,254, 81,189,170, 71,131,165, 12,252,239,120,154, 55,
-185,139,145, 58,212, 58,153,139,132,139, 15,252,179, 68,150,108,180, 75, 13,174,241,133, 80, 83,112,235,142,193,100,157,169,246,
-233,102,  6,199,141, 41,114, 97, 54,228, 38, 28, 59, 12,110,122, 21,192,244, 74, 23,255,255,178,198,191,  4, 32,236,138,149,155,
-136,129,168,180,146,238,236, 11, 38,182, 19,146, 20,161,130,  6, 26, 10, 26, 10,126,129,142, 79,165,226, 15, 24, 10, 40, 24,140,
- 73,  1,  4, 38,133,141,157,140,115,246,157,101,233, 14,237,174,238,198, 14, 36,148, 25, 79,206,231,145,180,218,125,251,246, 61,
-125, 27, 82, 39,121,186,185,125, 81,130, 52, 57,188, 74, 46, 43, 41, 92, 91, 97,167,235,201,105,247, 20,205,143, 92,101,145,150,
- 15, 56, 82, 83,193, 58,196,122,146, 82,161, 54, 40, 86, 95,113,  7,240, 16, 41,230,239,216, 79,215, 66,167,160,187,152, 77,194,
- 34, 36,170,110, 25, 54,  3, 10,239,209,152, 43,181, 91,248,126,175,137, 42,172,144,144,199, 84,223,  8,163,197, 83, 70,241,136,
-155, 62,209,124,151, 55,226,126, 54, 48, 74, 47,109, 78, 50,103,200,180, 15, 15, 78, 64, 31,247,143,174,242,203,199, 39,143,190,
- 94,140, 13,232,167, 15,159,140,206, 71, 40,216,111, 76,168, 84,166,215,179, 40, 26, 73, 73,205,247,114, 34, 31,248,161, 73, 19,
- 45,162, 75, 13, 96, 67, 50, 60,115,109, 81,209, 34, 81,194,201,202,109,  4,170, 14,160,122,151,162,217,140,176,226, 54, 51,112,
- 52, 28,156,157,141, 95, 60,127,118,112,120,239,228, 56,123,253,234,165,119,240,101,252,201, 58,151, 11, 10,200,116,233,148,249,
-234,205,187,247,111, 63,126,  8,101,192,226,186,180,133,239,119, 59,189, 44,237,117,196, 96, 79,163,121,119,165,195,109,134, 24,
- 58,202,175,129, 13,129,199, 85,138, 86,198,160,252, 36, 46,193,  6,199,107,235,174,134,251, 29,147,105,133, 87,152,  7,239,212,
-197,100,177, 40,221,108, 89, 22,228, 80,140,181, 21,225,129,180, 41, 43,182,245,168,176, 34, 72,216,197, 24,175, 58,217, 30,  5,
- 33,119,161,143, 91, 68,142, 98,156,180,194,167,149,223,136, 58,109, 20,162,183,133, 13, 16,182,  6,236,198,223,176,231,230,153,
- 17,215,148,121,225,207,194,175,254,254,158,104,181, 67,231,141,141, 98,194, 66,172,108, 30, 94, 56, 51,189, 21,249,243,181, 34,
- 77,219,236,227,176, 61,200,113, 92,208,128,133,223,125,110, 88,193,148,208, 39, 78, 82,235, 80,246, 57,239,104,132, 85, 59,132,
-119,120,214,  2,143,101, 55,233, 28,244, 14,127,206,206,135,123,195,249,114, 78, 84, 81,131, 17, 73, 18,140,143, 26, 69,208,  6,
- 83, 38,126,253,152,126,131, 45,165,248, 86,  8,146,210, 19, 57,250,245, 25,120,190,187,174,254, 45,220, 38,229, 60,255, 13,209,
-187,152,121, 47,117, 36,177, 72,214, 97,128,255, 74,182, 17,155,221,132,116,135,178,102,252,141, 10,154,115,132,205, 76,150,233,
-150, 45, 21,141,187,107,130,236, 30,  5,121,192, 68,147, 51, 30, 26,151,244, 17, 11,191,138, 70, 51, 82,110, 11,209,196,129, 65,
- 77,112,188,102,202,188,108,129,139,240,207,137,167,121, 35,230,240,132, 99,190,159,246, 47,139,121,164,173, 73,236, 90, 35, 56,
- 72, 81, 24, 26,  7,212,104,125,215,100,199,138,248,219,254,134, 80, 11,215,102, 53,229,247,  4,165,150,155, 50,234,145, 83, 80,
- 81,100,185,141, 48, 29, 71,143, 10, 65,  8, 80, 73,190, 94,196,160,143,139, 26, 50,158,216,165, 15,231,  4,193, 73,183,193,  9,
- 82, 41,118, 49, 70,140,233,252, 62,133, 45,183, 17,184,  8,237,183,228,242,168,117, 19, 94, 14,145, 92,234,253,200,182,174,106,
- 62, 21,173,109,239,221, 33,222,128,225, 89,138,187,173,137,255,  8,192,215,149,244, 54, 13, 68, 97,207, 56,246, 56,206,158, 84,
- 74,171, 10,184,114,226,132,196,161, 55,254,  9, 23,126, 44, 18, 87,  4, 42, 84, 72, 20, 16, 75, 40,181,147,184,118,102, 50,204,
-247,222,120, 73,160, 72, 81, 14,145, 21,203,242,204,155,183,124, 11,250,239,150, 78,230,206, 68,168,145,207,105,246,134, 20, 29,
- 77,157,186, 83,201, 48,242, 80, 91,151,222, 84,139,100,206,121, 48,113,137,224,187,205, 13, 60, 62, 31,120,117,112,202, 14, 27,
-103,204, 98,161,244,174,100, 28, 71, 42,141,210, 65,148, 74,138,189, 95, 54,159,239, 76,225,118,108, 86,100,154,165, 65,131,218,
-183, 37,176,131,100,224, 34,152,173,149,237, 60,158,158,210,  6,166,194,  6,108, 82, 93,219, 66,162, 53,108, 32, 63,196,163,252,
-105, 58,  9, 97,182, 33,220,171,221, 22, 27,139,239,173,133,184,144,184,113, 39, 60, 26,244,246,116,118,166, 65,130, 53, 76,225,
-230,123,185,199,201,195,141,118, 49,209,132,112,163, 46,  3, 99,  2, 66,198,  0, 93, 94,149,200,113, 93, 52,143, 99,184,147, 40,
- 21, 70, 42, 80,177,132, 98, 65, 34, 93,128,126,246,244,201,155,119,111, 31,158,159, 47,151,167,147,209,116, 62, 63,153, 79, 96,
- 50,121,121,245, 17,204, 59,204,164, 65,229,194, 66,223,139,108, 13, 91,225, 65, 26, 71,253, 36,211,230,199,122,123,125,179, 89,
-229,229,186,218,233, 18,185,142, 36,209,117, 88,209,146,121, 21, 50, 44, 23,158,132,232,  7,114, 40,197, 44, 82,203, 56,237,237,
-100,158,217,252, 54,122,255,253,246,242,107,241, 97,245,251,215,182,202, 81,116,112,131,141,137,193,150, 16, 53,123,230,247, 97,
-148,109,  2, 56,163,  2, 78,230, 74,147,196,157,115, 26, 94,225, 94, 70,245,255,149, 34,222,142, 26,239,140,230,193,209,139,231,
- 47, 95, 95,189, 26,134, 35,109,171, 46, 66,192,214,225,230,232, 76, 24,170, 49,177,138,188, 72, 89, 36, 34,235, 71,244,226,144,
- 52,107, 85,216,  7,238,  5,166,143,238, 21, 69,194, 59,158,227,166,186, 81,251,162, 82,170,209,198, 96,101, 17, 18, 68, 34,199,
-230,127, 24,238, 72,183,195, 53,217, 49, 34,240,185,216, 19,246,  8,245,104,199,201,180,216,173,217, 42,215,101,117,253, 56,117,
-203,252,103,254,141, 64,141,119,188, 55,112,177,239,156, 11,234,174, 88, 91,215,232, 15,102,143, 92,205, 46, 15, 72,164,194,182,
-156,215, 22,126, 94, 23, 25, 45,253,187,245,169,111,194,174,119,222,  0,138,116,212, 31,185,  5,225,  5, 26,239, 17,187,105,  0,
-146, 33,205,169, 84, 47, 50,123, 77, 30,188,196,234,103,200, 23, 42, 63,172,253,152, 61,144, 41, 22,247,200, 64,134, 54,169,100,
- 73, 15,154, 86,  5, 94,116,  0,215, 32,238, 75,214,122, 10,188,105, 19,245,217,201,247,195, 91,206,132,  4,145, 36, 75, 62, 22,
-130,146, 33, 15,183,124,235,143,119,183,167,145,138,147,201, 60, 43,114, 26, 71, 16, 20,213, 75,182,225, 33,106,  1,185,189,111,
-189, 81, 25, 64,136, 22,140,200,204,161, 44,146,187,239, 98,184,216,148,107,247, 47, 23,143, 47, 62,173,174, 73,192,152,139,175,
-125, 67, 76, 13, 61,131, 19, 63, 67,234,201, 84,169, 74, 49,166,110,112, 58,146,  7,  1, 72, 43, 71,201,212, 69,255,218,152,184,
- 99,238, 25,136,229,228,108, 91,174, 91, 29,159,131,105,102,171, 27,212,164, 26, 44,  6,119,196,123, 18,199,230,127,226,111,166,
- 72,247,147,200,216,116, 76, 43,239,155, 90,253, 17,128,175, 43,219,109, 27,  6,130,162, 72,137,162,175,216, 70,144, 62, 52, 65,
-209,255,255,148,246, 19, 10,180, 64, 31,130,  4,177,128,196,178, 36,235, 32,187, 59, 43,  9, 82,147,246,217, 48, 45,209, 60,102,
-103,119,103,216,223,131,102,108,159, 29, 41, 44,197,158,137,231,169,177, 89,115,202,148,133,144, 78,  7,  5,156,174,216,108, 46,
- 64,127,198,100,247,235,123, 40,118,181,172,165, 31,112,246, 40,238,144,129, 13, 71,  0,153, 16, 65, 90, 11,107, 45,214, 86, 67,
- 16, 87,219, 93,182,221,103, 59,199,230,229,254,251,243,183, 62,234, 26,198,190, 45,247,161,128,205,  4, 19,220, 79,161,133, 28,
-220,147, 21,  1,132, 50,144,186,  9, 70,132,141,104,244,100,112,171,134, 46, 15,114, 59,116,139,208, 32,244,233,193,221,212, 77,
-201,105, 31, 10,215,227, 20, 18,163,154,215, 61, 10,155, 52,159,177,  1,228, 50, 55, 53,247,104,160,166,191,248,180,125,174,215,
- 77,172, 18,103, 76,221,  5,155,208, 87,  2, 16, 52,243, 36,146,104,200, 44,  1, 67,159,104,100,175,184, 61,151,181,143,104, 26,
- 30, 62,223, 61, 62,229,116, 13,212,157,151,140, 13, 65,100,163,141,115, 54, 47, 61, 65,254, 26, 71,233,149,213,191,212,107,213,
-208,156, 58,155, 90,107, 44,133,175,198,191,149,109, 93, 53,  4,219,185, 86, 81, 43,199,170, 40,126,  3,173,121,231,227, 93, 98,
-191,108,217,123,254,173, 13,165,239, 79, 85,115,174, 56,132,152, 28, 84, 99,184, 24,166,202, 93,186, 98,144,242,241, 52, 83,174,
-234, 74, 15,215,  3, 54, 26,100, 49,226,  8,  6,  8, 17,123, 80, 66,142, 24, 90,123,  1, 88, 71, 14, 29,238,118,218,218,155, 75,
-115, 94, 30,208,129,121, 97,138,166,253,224, 68,218, 70,189,102, 36,238,211,153, 12,145, 44, 40,163,109, 75,247,247,200,205, 76,
-171,235,225,248,245,119,254,107, 28,208,187,100, 83,183,151,127,213,206,251,143, 64, 13, 97,133,214, 95,163,209, 79,113,149,174,
-233, 85,235,174,148, 75,154,  2, 39,130,192,152,145,247, 85, 60, 65, 20,  2,194,232, 36,204,250,192,190,137, 39,251,217,104,112,
-  9,160,183, 70,221,189, 45,175,151,165,224,215,224,246, 37, 15,150,178, 45,148,111,  7, 86,103,150,195, 27, 31, 27, 43,109,241,
-251,116,153,187,212, 21,213,235, 84, 25, 57,223,119,178,218,193,108,134,209,158, 94,161,115,105, 97, 23,255,183, 75,247,180,109,
-199,234, 28, 65,215, 26,201, 84,233,  7, 84,122, 70,164,  8, 42,130,252, 60, 24,115,105, 50, 71, 41, 49, 10, 64,164,226, 12, 14,
-212, 67, 86, 98,176, 73,  8,232, 34,225, 19, 92,206,113,236, 56,165, 82,190, 44,164,103, 85,220,227,227, 65, 67,152, 43,151,252,
-221,254,147, 49,250,199,211, 79,176,154, 93,195, 40,131, 21, 65, 58,223, 31,118,199,151, 34,175,155,107, 23,196, 90,155,161, 71,
- 63,181,176,131,172,103, 86, 93,168,153, 56,204,149, 27,  2,103,197,244,202,110,242,203,233,184,190,165,120,174,168, 10,122, 27,
- 10,221,232, 70,164,167,200,207, 47,172, 37,207,110,150,134, 34,182, 17, 98,243, 88,116, 22, 49,129,  3,210, 74,170,199,104, 13,
- 31, 86,  7, 86, 45, 84, 44,169, 45,  1,148,159,229, 38,233, 89,204,187,191,120, 94,  3, 19,162,  5,162, 25,185,123,  9, 11,134,
-251, 38, 90,106,139, 74,234, 32,  6,223,168,102, 94, 34, 31,142,255,255,110,139, 63,  2,240,117, 45,187, 77,  3, 81,116, 60,182,
-199, 14,129, 86, 34,128, 64,233,  2,248, 17,126,130, 29, 95,216, 21, 63,193, 63, 32,177,132,118,209, 82, 81, 22,113,236,218, 51,
- 30,238, 57,119,156,216, 41,170, 20,101, 97, 37,118, 50,190,190,115, 95,231,156,228,223,103, 37, 59,187,180,149, 44, 91,154,218,
-161, 67,204, 66,  5,172,130,204,225,240,171,133, 41,222,173,182, 46, 43, 64,224, 16, 21,112,172,149, 92,210,155,192,107, 74, 22,
-140, 13, 92,182, 72,112,193,231,245,202,186,202, 33,120,  7,131,115, 81,221,117, 55, 63,238,191,139,113,180,192,164,120, 14,  7,
-166, 30,184,188,175,171, 23,237, 67, 67,144, 50, 91,248, 58, 12,144,240,168,150, 84, 32, 12,169,153,222,129,167,203, 22, 32,  2,
-123,243,241,234,246,151,203,179,237,203,139,191,205,189, 60, 88, 98,130, 23,155,237,186, 94, 93,223, 93,193,191,211,226,229,247,
-125,249,244,249,242,219,215, 68,140,  0,155, 19,119,138, 89,171,145, 69,154,177,236,111, 95,223,236,154, 92,146,129,169,238,104,
-148,217, 82,123,119,112,154,  5,180, 54, 12,212,248,144,220,186, 18, 40, 91,128,128,108,  9,104,  4,131,  8,185,220,186,198,122,
-185,210,122,111,127,239,123,201, 68,247,131,111,186, 97,215,246, 64,156,154, 80,178,186, 66,  9, 97, 88,110,219,245,100,152, 65,
-174,208,245, 99, 94,149, 76,228,229, 97, 24,100,183, 40,188, 57, 71, 61,223,189, 61, 63,115,220, 91,236, 88,180,161,  1, 69, 39,
- 71,195,216,197,135,200,  1,177,218, 98,142, 85, 23,154, 64,212,163, 55, 42, 94,108, 24,204,147,205,  3,119, 75, 99,171,200,129,
-171,132,137, 15,201, 75,  4,179, 16, 33, 74,131,224,207,235, 51, 89, 15,137,152,100,155,223, 15,205, 20, 73,132, 19, 84,222,161,
-180,114, 16, 62,204,141,243,102,224, 64,186,231,241,196,120, 46,247,238, 33,180, 75, 92,223,255, 51,208, 25,217, 81,174,103, 32,
-162,164, 22, 39,211, 66, 77, 80,255, 66, 60, 70, 44,167, 34, 57,137,218,250, 48, 32, 63,255,176,205,236,226,114,241,216, 60,120,
-106,216, 65, 69,127, 40,217,123,162,165,164, 61, 58, 87,148,226,197,178, 41,141,160,162,104, 78, 64, 79,124,196, 19, 57,137, 99,
-164, 40, 62,110,158,189,218,117,205, 24,147,114,200,130,249,108,233,214,167, 98,191, 86,217, 25,151,197,152,  4, 48, 41,180,145,
- 27,173,140, 27,198,215,169, 13,138, 96, 28,232,115,245,216,200,134, 77, 42,191, 43,249,132, 50,100,179, 17,154,150, 74, 25, 28,
- 57, 80, 23,121,  6,176,228,193,173,163, 28,202, 27, 10,124,211, 76,113, 59,163,144, 14, 94, 25,199,117,201, 92, 45,  6,224,105,
-133, 18, 29,202,201, 58,223, 13,163,135, 86,  1, 81,202,100, 10, 99, 97, 17, 90, 54,248, 46,103, 25,151,108,165, 90, 91, 96, 89,
- 53, 16,  6,233, 74, 39, 87,223,245,123,157,197,128,135,198,211,224, 45, 16, 45,189,  4,151, 32,157,198, 84,101, 96, 15,118,212,
-253, 91,142, 52,125,171,  1,246, 72,249, 86,  9, 54,181,195,145, 41,194,109,210,114,154, 89,224,163, 17,129, 84,155,209,148, 49,
-139,203,164, 53,206,104,247,226, 17, 54, 49,111,183,152,170,172, 90,194,  9,227,169,247, 79,254,253,253,230,195,245,159,159,225,
- 73,154,250,127,  2, 16,118,109, 59, 78,195, 64,212,174,237, 56,105,170,180, 32,202, 10, 16, 66, 60, 33,241,255, 63,194,242,130,
-128, 71,164,221,133,210,221, 54,105,220, 92, 28,239,204,216, 73,154,150, 10,245, 37, 82,147, 38,109,199,227,185,156, 57,103,162,
-207,199, 47,  4,189, 60,215,156,156, 10,151,  4, 41, 22, 22,166,144, 73, 82, 21,  3,121, 63,234,118, 19,191, 94,170, 85, 94,151,
-198, 54,  2, 29, 58, 26,132,151,125,  0,207, 53,115,100, 86,142,118,120,165, 33,210,209, 50, 73,163, 52,149,177, 96,221,151,237,
-173,105,242, 44, 93,110, 14,155,198, 86,216,117, 68, 25, 27,218, 59,  7,113, 26, 62, 14, 85,207, 66, 71,104,212,246,197,220,208,
-145,101,249, 66, 16,231,177,136, 16,203,  8, 54,  7, 47,170,224,135,224,  2,249,116,185,198, 32,158,202, 56,109,183, 72,230,135,
-170,132,119, 73,172,221,145,106, 79,187,154,191,220,150,143,144, 73,128,147,110,162,226, 94,237,143,152,155,144,196,  7,181,248,
-153,243,131,114,129, 23,147,178, 90,169, 53,143, 53,238, 61,200,203,216, 33,229, 58,124,207,  8, 37,196, 33,198,103, 11,141,237,
-155,166,226,251,131,200,177,232,131, 59,  9,184, 83, 83, 53,149,109, 43,107,231, 90,164, 26,233, 61, 32,133,  1, 51, 47, 13,234,
-139,193,229,240, 76,166,129,205,  2, 83,135, 22,  9,147, 61,  5, 54,228, 16,181,169,170, 34, 71,182,157, 84,105,184,118,165,147,
- 37,164, 70, 56,110,198,149,211,198, 22, 84,135, 65,216, 17,119, 18,178,  8,239,190, 61,145,155, 96,210,116,198,179, 54, 99,148,
-110,109,170,179,178, 46,224, 99,125,244,238, 60,190, 97,226,170,130,236,100,162, 18,162, 80, 15,118, 47, 66,179,116, 50, 95,237,
-174, 96,121, 41,240, 87, 62,205,100, 39,188, 40, 33, 48, 98,161,169,197,123, 85, 69, 92,126, 92,213,174, 98, 35,204, 27,159, 65,
-226,109, 85, 18,197,121,181, 63,163,153,188,166,122,218, 99, 90,102,108,196,128, 96,131,253,102,249,246, 97,119,151,197, 43,136,
-  6,190,223,125, 59,197, 34,123,122, 57, 37,117,211, 30,217, 80, 70, 57, 89, 25,252, 95,248,229,115, 82, 26,161,  8,120,218, 12,
-133, 89,223, 70,186,246, 19, 81,251,115,226,223, 49,191,116,164, 55,217,251,119,242,190, 51,162, 92,237,219,203,189,220,  7, 21,
- 80, 92,104,108,162,  2,  9, 85, 84,169,112,138,225, 24,  4, 34,196,191, 40, 57, 30, 83,176, 45, 40,157, 13, 50, 23, 30, 21, 41,
- 66, 77, 91,216,  0,101, 69,228, 10, 24,114,221, 30,  3, 44,177,235,229,250, 24,  5,239,195,  2,100,130,  4,244,  2, 68, 50, 12,
-195,178,224,235, 96,237,120, 62,106,138,205, 49,131,108, 41,120,111,104,229,225, 65,231,222,175, 63,252,188,255,  1,183,163,172,
-119,  6, 89, 46,182,146,209,136,113,103, 16,164,205,212, 19, 12,162,153, 46,226, 20,124, 58,220,238, 97,247,135, 35,242,213,174,
-211,181,233,142,187,242,105, 49,207,108, 93,195,147,230,102,255, 42, 91,111,138,223,159,222,124,254,250,235,214, 35,185, 41, 81,
-109,223,189,248,248,104,254,250, 81,252,109,249,212,147,177,187, 46, 72,123,143,168,251,179, 17, 36, 62,120,224,222, 12,224,124,
-200, 33,164,140, 48,166,228,  3, 87,245, 37, 60,120,252,235, 79,164,181,252,  8,  4, 27, 52,181,221,133,194,251,127, 49,242,254,
-180,103,  1,248,186,186,222,166,129, 32,104,159,125,113,156,164, 38, 69,162, 68,240, 80,120, 71,202,255,255, 17,133, 63,128, 16,
- 66,160,170,129,126,208,226,218,103,159,239,216,217,189, 75, 28, 19, 33, 85,121,105, 20,199,206,222,222,236,222,206,204, 36,191,
-167,255,212,122,233,100,130, 45,180, 68,163,153,181, 98, 80,202,251, 51,143, 60, 50,122,174,242,179, 77,177,161,188,211, 88,116,
-124,153,194, 58, 32,142,240,224, 40,145, 83,  0, 80, 18,166, 80, 40, 10, 13,215,104,141, 70,141,250,246,244,249,230,249,  6, 12,
-143,  4,178,111,200, 96,162,255,239,133, 88, 44, 49, 23,197, 84,185,133, 34,174,  1,  8, 37, 31,108,124,233,123,129,  0,157, 99,
-106, 81,242, 56,220, 76,149, 90,149,171, 55,213,235, 31,247,215,180, 11,109, 47,183,119,143,183,247,127,110, 81,130, 72, 33,138,
-195,167, 96,234,200, 84, 32, 80, 60, 59, 10, 55, 69,153,110, 85,247,181,112,113, 81, 80,229,174,173,234,199,153,193,125,131, 50,
-157, 74, 51,138,226,147, 22,133,220, 44,215,155,142,125, 59,216,196,  3,  2,102,153,164,167,129,221, 75,  9, 19,100,202,149, 69,
- 65, 43,175,133, 58,198, 48,131, 10, 15, 18,107,231,187,214, 58,186, 77,237,117, 59,164,176,144,244,137,177,157, 49,150, 62,162,
-200, 17,141,142,189,227,251,158, 96,142,167, 61,138, 30, 87,223,117,  4, 89, 58,139,191,166,177,191,155,190, 54, 24, 62,211,202,
- 87, 89,161,172,158,165,233,122, 14, 52, 35,165,137,101,117,112,110,202,176, 36,153, 19,213, 15,244,110,224,181,141,142, 26, 85,
-208, 92,197,138,  7,165, 15, 94,148, 46, 18,255,170,121, 85,155,122,143, 29,210, 41,229,122, 56,182, 33, 62, 13,113,  5,254, 45,
-195,192,226,120,243,240,204,252,246,235,197,249,187,139,247, 31,191, 94,209, 79,127,177,124,245,179,222,149,122,201,160, 38,100,
- 26,218, 30,  8, 31,212,124,166, 26,101, 73,255, 47,216, 55, 29, 61, 24,203,120,241, 17,253,254, 32,234,128,223,195,129, 45, 15,
-104,231,121, 78,193,137,131,154,196,211,165, 91,251,188, 44, 94,208,243, 30,159,140,142,148,129,125, 50,181,234,150, 81,118, 92,
-229, 37,143, 60,166,251, 53, 61,253,134, 42,168, 45,  5, 77, 63,117,240, 63,245,194, 97,136, 30, 26,225, 46,124,180,254,101,127,
- 61,153, 87,247,172, 18, 32, 22, 14, 89,166,217,149, 24,152, 58,135,124, 16,189,  2,247,100,180,235,228,130, 75,152,189,138, 33,
-201, 18,239, 21,123, 28,149,196, 10,128,214,138, 97, 31, 83,108,250,  3, 55,195,161,200,193, 77,116,172,143, 44,227, 73,  1, 57,
- 77,197,231,241,210,204,246, 44,167, 56, 73, 46, 41,211, 50,177,130,235, 54,129,231, 78,154, 51, 22,138, 95,  3,122,179, 56,223,
-132, 36, 36, 93,142,  0,206,135,203,237,167, 47, 87, 92, 21,137,130,129,223,172,223, 94,223,125, 23,114, 64,140, 64,148,163, 82,
-113, 84,229,250,201,212,221,208, 10,129,137,109, 85,157,214,  5, 97, 56,110, 53,130,195,221,195,150, 82, 28, 42,177,102,233,169,
-157,205, 43,  2, 10,187,135, 29,225,177,186,111,147, 48,225, 29, 49,206,209,239,235,198, 77,194,133, 94,152,193, 12,135, 48,144,
-229,130, 65,206, 64, 22, 30,  3, 29,127, 76, 56,147,238,103,168,107, 93, 18,185, 26,242,239,170, 60,127,104,126, 73,247, 47, 61,
-205,174, 58,209,177,145, 55,253, 21,128,176,107,217,109, 34,  8,130, 51,179,111, 59,107,227, 56, 78,148,228,150, 19, 23, 68,196,
-129,  3, 95,207,129, 63, 64,144, 27,  8,  4, 66, 65,198, 78,252, 90,143,247, 49,116,117,143,119, 45,108,137, 40,135, 40,209, 90,
-206,120,166,167,250, 81, 85, 93,124,215, 39,101,172,247,160, 36, 56,216,160,218, 59,163,225,135,144,217, 10, 98,178, 14, 70,131,
-227,113, 67, 67, 65, 37,186,205,110,179, 48, 45,189,  8,156, 52, 99,205, 94, 24, 58, 25,196, 73,233,162, 60, 77,123, 38,161, 29,
-243,105,246,176,114,139, 48,  8,231,235, 25,238,115, 10,241,  4,235,188,214,123, 51,204, 70,  5, 84,255,109,171, 85,205,172, 66,
-109,188,142,159, 84, 14,213,184,127, 94, 55,118,187, 43, 81,242,  3, 12, 49,160,151,250,150, 17,229, 93,200, 25, 67,214,119,166,
-213, 64,232, 55,241,155,187, 87,159,191, 63, 68, 38,124,247,242,237,251,143, 31,  0,222,121,152,243,254,238,245,183,223, 63,158,
-182, 11,168,139,112, 89,181,226,171, 91, 20, 44, 85, 80,149,163, 98,169,232,141,195, 32,187,172, 42, 90,130,  4,189,  8,216,177,
-  2, 89,163, 24,205, 57, 71,173,138,186,  9,124, 43, 90,179,157, 36,140,100,105, 85,110, 38, 23, 17,197, 91, 84,114, 32, 86, 83,
- 20,205,218,110,215,187, 29,237,210,188, 31, 77,242, 44,146,113,117,180,112,107,187,173,144, 71,243,175,214,150, 80, 72, 92,112,
- 31,148,  2, 62,189,154,181,150, 94,102, 67, 55, 18,  4, 31,161,243, 14,136,131,115,172,210,164, 49,177,219,172,213,124, 85, 85,
-182,201, 84, 48,  8,240,239,247, 76, 72, 23, 12,125,128, 27, 87,128, 37, 92,107,152,224,224,216,225,217, 26, 14,  9,248, 24, 36,
- 33,246, 21, 50,134,146,245,190,136,145,133,153,148, 47, 83, 78, 36, 91,181,247, 99,113,164,182,128,184,199,227, 74, 31,149, 13,
- 15,131, 32,  4,146, 53, 93,111,  5,159, 16, 63,155,145,198, 61,187,243,134, 68,251, 32,222, 82,138,252,182, 36,196,196,124,153,
-147, 52,111,105, 91,185, 28,148,241,101, 75,198, 20, 35,239, 28,244,212, 69, 28,166,121, 50,156,173,167, 29,185,175, 19, 81,192,
-245, 28,199,177, 24,206,180, 51,162,142, 25, 21,236,149,170, 15,135, 85,134,189, 23,207,197,147, 62,146, 25,233,132,142,165,142,
-208,130, 54,119,196, 74,119, 18, 89,221,120,112, 57, 95,254,209,135,241,157,151,250,106,112, 61, 93, 61,118, 28,  2,237,  9, 83,
-236,103, 35,  7, 83,115, 47,193,136,200,111,196,156,210, 40, 12, 35,238, 60, 81, 58, 24,195,149,212,247, 66, 83,  8, 81,235,145,
-137, 46,243,228,162, 31, 76,206,226, 44,  2,183,  3,224,200, 40,200, 25,237,234, 85, 81, 63,111,213,220,186,231, 66, 79, 45,134,
-106,185,157,206, 80,156,237,105, 27,241, 74, 83,222,164,201, 19, 89,157,145,152,208,142,187,  9, 94,166, 63,222,140,174,191, 60,
-126, 85, 92,231,196,174, 83, 28,223, 57,202, 75, 65,166,100, 29, 25, 91,239,232,219,155, 67,104,137,184,194, 74,197,242,157,101,
- 57,101, 69,115,192,228, 46, 19, 18,149,217, 70,180, 82,184,100, 14, 29, 90,140,157,241,  4,179, 86,251,168, 45,129,187,153, 12,
-174, 86,118,185,177, 27, 86,174, 69, 73, 21,251,173, 44,248, 89,233,150,243,196, 55, 83, 90,219, 34,138,211, 93,222,121,132,179,
- 93,135, 57,124,182, 40,144,252, 95, 71,  4,145,105,162,163, 65,112,225,188, 55,254,181,248,201, 85,181, 64,204,190,157,127,202,
-157,116,177,255,239,215, 95,  1, 24,187,154,222,166,129, 32,234,181,189,235,196,105,154,180,165, 34, 10,109,175, 61, 32, 33, 33,
-241, 19, 16,  7, 78,252,205, 30, 56,240, 39, 56,113, 65,170,  4,  7,132, 56,160,138,150, 32,112, 29, 39,177,119,237,101,222,140,
-183,233,135,144, 80, 47,109,213, 86,105,108,207,190,153,121, 31,125,125,127,216,198, 42,117, 31,230,132, 41, 77,220,115,149,250,
-129, 90, 34,197,158,153, 90,106, 58, 58, 88,173, 74,222,189,163,203,153,234,221,163,209, 28,166,172, 45,112,161, 97,142, 59, 29,
-140,131,  4,105,210, 17, 50, 49,116,101,175, 63, 46,206, 55,160, 57, 71,214, 55,147,157,131, 69,113,229,162, 70,  8, 78, 62,164,
-174,136,122, 34,238, 37, 33, 76,153, 98,226, 47,138, 55, 11, 16, 38,217,110,194,238, 22,224,115,211,177, 76, 53, 34, 65,135, 72,
-197, 66, 83,113,167,219,154, 62,225, 61,254, 36,223,157,237, 61,254,126,  9, 77,211,132,112,104, 83,209,177,148,153,193,186, 94,
-159, 30,157,254, 40,174,126, 45, 23,142, 53,217, 98, 26,205, 89,191,214, 98,139,132,145, 56,221, 88,179,233,188,172,139,206,212,
-101, 86,194,176,203,182,138,165, 10,141,197, 25, 76,101,118,152,197,153,166,202, 11,173,228, 10, 57,  5, 62,136,103,  9, 83,227,
-156, 27, 38,201,163,124,120,213, 53, 29, 91,245,121, 24,243,182, 21,189,148,  6, 69,150,106,251,124,154, 79,198, 73,170, 65, 96,
-183,206, 91, 36,  5,131,224,149,153,132, 30,165,198, 69,229,146,192,135,134,138,149,110,195,149,229,119, 28,220, 26,234,142,168,
- 58,215,206,215,120, 68, 34,109, 34,234, 19,172,133,  0,138,142,168, 77,221,137, 85, 22, 53, 86,206, 54,166, 77,119,210, 56, 79,
- 77,110,140, 28, 84,141,229,176,121, 54,225, 70,149,119, 24,200, 99,158,150,152,181, 68,222,120,153,156, 80,  5, 73,157,119, 15,
- 55,159,130, 69,238,102, 57,133,145, 98, 58,156, 77,143,191, 46, 62,211, 69, 28,233,113,101, 75,245, 79,251, 35, 21,132, 33,219,
-205, 16, 19, 96,224,194, 90,246,120, 95,221,171,155,108,245,140, 45,107,134,144, 22,188,253, 58,201,109,187,209,160,226, 57, 94,
- 93,246, 57,186, 55, 97, 70, 80,108, 36,250,201,254,201,183,159, 95, 66,204, 75,226,239,206, 52,251, 16, 59,129,182, 91,168, 20,
-223, 78,252,136,  2,241,151, 67,115, 25,179,  9, 92, 21, 81,129, 16,232,152, 97,153,233, 12,142, 61, 16,100,222,156,124,173, 10,
-222, 10,106,107,160,102,232,123,176,127,  8,143,216, 54,139, 67,162,211,120,144, 24,135, 45, 84,212,  7, 27, 97,  0,154,242,215,
-146,177,164,241,136,  0,173, 19, 78, 55, 88, 55, 17,246,130,122,143, 49,123,108,148,222,215,233,108,172, 79,166,249,241,161, 57,
-152,100,  8,113,230,177, 51,195,100, 40, 93,188,200,152,101, 76, 17,177, 23, 99, 27, 93, 47,221,197,159,238,178,208,139, 58, 90,
-212, 54,230,145,178,239, 67,  2,197,147, 56, 22,230,  5,107, 86,227, 48,184,216, 74,142,195,130, 78,208,127, 39,195,119,180,237,
-124,165,128,226,209, 95, 90, 42,253,185, 25,190,124,254,234,236,253,153,247,194,122,  8,101,  1,155,216,195,162, 42, 28,156,120,
-149, 80,163,100,101, 73, 63,178, 55,222,255, 93, 21, 72,127, 99,186, 24,253,226,208,140,186,214,174,152, 33,218,219,140,243,255,
- 40, 83, 23,134, 18,160,193, 83, 47, 77,231,222,198,210, 99, 93,247,163,155, 48,158,244,210, 54,121, 69,127,106,221,172,  6,233,
-160,106,150,183,147, 15,  8,235,108, 44,174,172,209,  3, 58,213,170, 62,231,175,227, 15,246, 91, 84,234,254,116,197,119,175, 95,
-188,121,247,225, 45,245, 84, 46,114, 79,231,207, 62, 93,156,135, 56,239,109, 60, 89,191,116, 69, 25,102, 77,238,255, 85,249,191,
-  2,208,117, 45,203, 73,  4, 81,180,231, 61,204, 16, 36, 60, 12, 65, 99, 54,198,111, 72,249,225, 86,185,114,161, 11,183,254,128,
- 86,202,128,  4, 34, 33,192,192, 60,122,166,189,231,118,143, 76,208,164, 42, 83, 44, 72,120,116,207,125,156, 62,247,156,255,196,
-119,235, 25,111,109,167, 57, 58,136, 30,205,137,130,150,107,187,155,221, 26,157,157, 18,124,182,231,131, 36, 35,128, 35,116,227,
- 46, 76, 14,149,104,123,237,113, 60,166, 43, 85,124,190,237,107, 59, 37,122,151,203,244,254, 87,114,255,152, 62,224,126,224, 49,
-113,179,180, 16, 13,231, 86, 75,135, 11,165, 77,216,235,217,107,206,210,157, 86,  7,116, 37,248,126,241,102,174,212,184, 63, 78,
-246,155, 28,130,250, 40,168,152,233,  5, 33,120, 14,235, 80, 51,134, 14,175,227,250,240,203, 67, 57,175,105,185, 20, 44,  4,244,
-231, 64, 73,172,248,175, 36,163,130,  5,164, 93,165, 70, 39,138,170,120, 51,184,184, 58,191,250,240,237,163,235,121, 37, 78,122,
-219, 89,153,166, 50,167,125,219,234,200,120, 72, 91, 38,203,115,181,195,185,178, 74,169,172,149, 10, 64, 38,196,  0,  4,100,175,
- 97,118,234,122,244,176,210,248, 38,171,247,  8,251,211, 98,234,250, 62, 64, 78,174,117, 50, 89, 20, 96, 31,149,113,232,157,117,
-163, 86,232,176, 33, 22,107, 86, 11, 25,120,118, 59, 10,109, 20,212,249,104, 52,186,126,127, 61,236,247, 62,127,249, 74,153,232,
-251,205,207,201,237,173,235,249,236,155, 93,166,153, 76,246, 50,231,122, 39,  8,172,  0,100, 77,106,207,149,231,  9,106, 15, 50,
- 41,182,137,216,236, 42, 45,110,179,167,140, 66,159,182,144,177,235,132, 20, 14, 88,120, 13,148, 82,250,133, 16,183, 98, 80,158,
- 79,166,204,  4,185, 48,162,205, 13, 10, 23,147, 35, 79,178,124, 71, 29,  4,  5,141,113,119,116,179,252, 97, 31, 23,233, 70, 59,
-196, 50,  7,179,205,112,166,142, 88, 98,161, 23,165,197,142, 94,162, 19,210, 66,211, 46, 42,105,231, 12, 78,  6,147,199,137, 14,
- 21,212,123, 81, 59,172,229,201, 84, 61,  0,113, 26,245,182,251, 21,103, 29,214,221,109, 30, 59,170,227, 66, 94, 99, 47,244,159,
- 41,232,229, 90,185,247,232, 52, 85,136, 90, 11,204,152, 52,214, 44,141,102,100,175,201, 27, 22,243,227,169,196,137,250, 20,121,
-127,111,230,134,255, 12,144,171,188, 28,188,157, 61, 78, 51,185,167, 64,113,222,125, 53, 91, 78,109, 30,123,160,180, 25,123,241,
- 58, 93, 61, 85, 15,212, 35,166,214, 97,232, 74,212, 34, 47,  6,159, 81,168,197,117,190, 81, 44,236,197,101,187, 62, 44,165, 54,
- 15,  1, 29,165, 57,117, 66, 84,170,195,227,133, 74, 43, 40, 85, 88,116,165, 93,232,209,173, 58, 10,252,215, 47,226,119,103,225,
-197, 48, 14,  2, 71,  3,  9, 88, 33, 13,248,224,194, 19,166,156,171, 24,247,192,169, 20, 93,169, 44,  0,150, 34, 43,125,157,175,
-197,221,202,157, 37,238,170,168,114, 89,154,169, 81, 80,126,209, 64,170,167,210,  8,127, 23,220,240,157,193,138,212,233,  3, 38,
-156,146,  5,125,  1,207, 50, 68, 72, 15,227,  8,140,219,197,122, 94,177,149, 27, 27, 82, 27,167, 61,131,209,152,142, 16,111,218,
-228,100,134, 81,244,189,204, 42,114,120,206,105,171,191, 74, 31, 10,170,146, 44,227, 99,195,  1,187,172,145,247, 67,214,  6, 39,
- 19,141, 15, 14, 14,168,224,211,238,101,165,  6,213,240,210,156, 62, 12,203, 18, 22,131,204, 37, 62,140,119,196, 65,156,164,  9,
-127, 79,104,112,217,126,173,210,110, 83,148, 98,169, 63, 16,199,208, 61, 16,170, 94,251,229, 98,123,231, 90,154, 55,161, 63, 17,
-194, 45, 27,132, 55,201,253, 21,173, 36, 20, 49,255, 97, 46, 60,247,243, 71,  0,186,174,118,181,137, 32,138,238,236,247,110,178,
-177,177, 73,105, 10,165, 21,170,224,143,130, 84, 65,240, 13,196,135, 16,244,101,212, 39,210,103, 80,139,136, 63,  4, 21,173,162,
- 41, 38, 45,113,235,102,191,103,188,247,204,238,166, 68,154,127, 33, 63,118,118, 51,123,231,220,123,207, 61, 71,243,103,140, 75,
- 70, 89,226, 74,129, 49,213,158, 24,130, 69,219,  9, 34,197, 25,139,170,211,253,223,191,245,224,237,151,215, 22,236,119, 27, 27,
- 23,101,134,174, 95,115,247,195,132, 36,155,  9, 16,237,176, 94, 23, 14,109, 46,109,104, 93, 50,232,202, 48, 88, 20,186, 38,163,
- 26,193,119,217, 48,136, 34,127, 16,231,177, 45, 86,117,127,126,255,109,111,216, 31,158, 46,166, 30,187,114,107, 98, 45, 23, 15,
-209, 44,226,201,139, 59,251,135,159,167,159,108,197, 48,126,224, 69,163,104,115,107, 48,250, 49, 63,161, 77,227,192,185,209,129,
-240,251,181, 96,192, 98,241,152,204,212, 90,115,144, 51, 83, 93, 65,144,241,187,170,233,114, 55,119, 14,142,191,189,103, 51, 38,
- 52,238, 37, 15, 13,138, 73,180,243,245,236,  4, 42,  5, 20,176,165, 77, 97,212, 46,135,155,130,107, 68,138,123, 74,113, 44,138,
-210,170, 10,147,144, 61,225, 58,  2,205,227,254,228, 87, 50, 45, 25, 90, 90, 51,107, 97,  6,174,118,118,103, 41, 77,138,201, 70,
-157,148,116, 57,107,123, 35,194,216, 17,102, 79,108,139, 18,212,144,  9,245,188,159,238,221, 61,122,252,228,233,222,237, 67, 66,
-129,179,239, 31,199,147,221,139,249,236,197,179,231,111,222,125,168, 42, 43,  7,250,206,153,157, 87, 51,131, 21,181, 43,186, 37,
-122,244, 97,207,  8, 61, 58,220, 84,186, 52,210, 76, 36, 25,203, 75, 20,218,105, 85,  1,245, 23,180, 64, 66, 56,101,104,112,183,
-156,190, 86,156,185, 72,102,193, 55, 32,  8, 53,249, 70, 10,  4,213, 51,163, 83,203,230, 62,117,  5,153,117,199,246,179, 42, 53,
-175,156,176, 91,119,154,166,135,124, 61, 28,157, 47,231,173, 70, 57,255,155,190, 19, 84, 85,222,243, 35,204,250, 11,185,114,216,
- 64,207,159, 19,193,160,157,102,106,162,  6,165,134,116,232,238,141,111,156,255,153, 17,188, 18, 45, 65,160, 91,135,239,248, 73,
-153,232,197,123,182,  7, 29,202,252,127,247, 37, 93,104, 53, 47, 85, 53,105,  1,174,235,177,108, 45,143,165,116,210, 90,188, 20,
-130,255, 21, 76, 60,154,246, 25, 88,219, 24,219,213,244, 69,110,123,134, 94,148,149,  9,197, 78,215,113,105,123,107,207, 25, 46,
-249, 97,116,187,172,203,203,109,225,182,  1, 96,174,113,111,186,248,206, 45, 83,200,110,210,  3,167, 91,150,117,129, 54,166,112,
- 48,245,206,190, 46, 22,247,156,251,126,100,170,148,118,172, 11,173, 94, 78,153, 77,123,199,119,119, 55,130,131,173,222,254,118,
-223,113, 91,  1, 62,126, 75,160,207,167,133,185,185, 31,229, 56,126,224,  6,125,179,215,183,109, 95,216,158,130, 37, 41,119,233,
- 41, 75, 45,242, 34, 91, 38,113,156,254, 93,164,201, 69,150,167,241,133,250,121,230,253, 94,  6,211,172,176,  0, 86, 25,203, 27,
- 22,142, 45,161,203,208, 58,198,180,249, 25,216,142, 40,  4,104,182,123,169,221,150,101,157,195,142,131, 47,196, 41,152,  4,175,
- 70, 65,140,186,227,207,192, 91, 22, 30,241,162,105,236, 55,255,111,221, 78,234,210,111,219, 27,147,233,226,148, 19, 14, 12, 60,
-176, 92,153, 38,209,104, 90,165, 46,181,180,141, 81, 29, 85,101,187, 93,192,204,215,236, 96,133,  1,230,170, 66,164, 38,216, 78,
-137, 23, 24, 62,205,100,178,212,144, 92,182, 20, 75,240, 53,233, 46, 30, 30, 61,122,117,252,178,161, 91,  1,113, 11,185,146,134,
- 88, 27, 61,107,  7,182, 68,215,129, 85,221, 41,216,141,115,173, 94, 22,185,238,168,115,245,231,159,  0,140, 93,203, 78,220, 48,
- 20,181, 29, 59,113,156,100,  2, 12, 47,  1, 66,106, 65, 21, 21,234,170, 31,192, 15,148,191,232,162, 82,255,148,101,145,250,  5,
-244, 65, 41, 12,204,123, 38,177,211,123,175,237,233,136,178,232, 46, 11,132, 50,227, 59,215,247,113, 30, 65, 95, 44,  9, 74, 74,
- 33,200,252,228, 46, 89, 19,234,243, 10, 74, 89, 90, 88,219, 32, 85, 21,190,122,106, 48,189,  7,250,205,253, 13,186,159, 19,177,
-121,101, 50,131, 30,205,254, 58,141, 74,143, 56, 30,134,211, 98, 86,103, 25, 57,110, 59, 58, 47,235, 37,159, 16,220,225,161,137,
-212,122,249,106,198,232, 98,218,206,188,189,117,196,188,  7,235,212,147,189,211, 95,195,159,185, 42, 32,229, 17, 51,205,251,123,
-  4, 43,153,251,209, 29,252,122, 20,173,239,225, 64, 23,243,233,254,230,238,116, 62,133,170,  0, 26, 11, 17,153,180,232,223,197,
- 90, 82,226,  8,195, 59,223,135,186,224,207,192, 40,169, 89,232,185,190, 61,254,240,132, 65, 17,171,204, 58,175,111,135,183,116,
-156,110,110,219,201,194,142,103,237,112,204,187,105, 53, 24,240,135, 65,119, 55,224,138,239,253, 30,141,151,150, 52,161,164, 90,
-218,249,176,121,132, 23,128,242,159, 59,161,170,101, 94, 17,119, 36, 65,109, 54,194,145,177, 84, 66,115,151,244,140,210,248,246,
- 82,103,210,228, 41, 71, 88,125,183,179,213,187,188,252,240,241,211,103,104, 39,220,252, 59,103,139,167,135,219,175,215, 87,199,
- 39,167,189, 66, 95,127,185,170,123,186, 44, 36,250,124, 43,218, 58, 19, 55,203,181,190,152,146,172,147,200,207,106, 92, 42,187,
-178,128, 46,  4,125,166, 74,109,222,159,191, 77, 92,247,240, 52, 18, 76, 65,107,106, 12, 52,167, 75,133, 24,141,196,155,162,101,
-  8,255,193,200,134,103,200, 26,112,244,129,245, 72,133,118,131,176,141, 96,192,226, 35,143, 54, 46, 44, 87,166,117,110,141,109,
-131,114,169, 43,133, 50,190,  6,109,244, 17,211, 34, 87,123,133, 98,196,139,  6,  2,102,209, 44, 68,180,164,128,144, 36,169,188,
-150,210, 61,220, 98,173, 95,124,194,231, 48, 16,  6,110, 25, 44,  6, 33,  7,183, 51,137, 13,155,116,168, 89, 13, 79,146,192,252,
- 40, 19,214,203, 55,160, 57,161,178,  2, 99,239,217,164, 61,200,145, 48,151,169,212, 51,104, 14,183,143,209,171, 19, 23,154, 24,
- 11, 98, 45,185,123,201,189,158,169, 59,114,160, 21, 44,250, 60,118,236,236,240,124,  4,213, 15,114, 89,177, 14, 32, 52, 32,150,
-181, 40,209, 46, 72,165, 48, 16, 19,162, 74,231, 90,157, 11, 89, 24,233,148,130,121, 60, 76,247, 87,104,  0, 51,187, 74, 82, 98,
-237, 34,  9, 83,146,  3,178,196,117, 23, 86,232,154,188,195,140,228, 38, 85,149,130,102, 57,209, 10,158, 69,153,164,  7,133,121,
-183, 83, 95,188,234, 95,156,245,223, 28,150, 91, 53,166,118,248,109, 40,232,104,179, 52, 77,113, 86,147,224,  2, 13,190,202,170,
-216, 59, 42,247, 95,235,221, 35, 81,244,109, 82,206,108, 50,111,216, 24,154,194,165, 67,171, 94, 43, 27,161,121, 86,101, 27, 59,
- 69,255,160,218, 62, 50,213,150,214,108, 35,159,212,106,150, 58,221,118, 26,  7,241,194, 15,187,  2,180, 38, 90,114,174,216, 92,
-248,  7,219,101,127, 74,250, 98, 43, 85,181, 54, 56,233,185, 56,160, 96,177, 57,163,217, 16, 11,132, 12, 23,175, 87,254,162,144,
- 17,101,235,241,108,226,109,130, 56,143,183,181,175,157, 57,135, 24, 38,136,101,199, 86,222,226,193, 23, 37, 12,213,144,201,134,
- 46,164,155, 56, 87,192,169,189,243, 14, 32,148,214, 26,207, 73,166, 85,170, 37,120, 81, 80, 94,164,149, 96,208,198,128,226,178,
- 69,241,226,240,239,130,185,  7,127, 65,106, 41,210,164,248,191, 32,153,240,186,207,137, 78,221,255, 43,145,253, 17,128,174,115,
-233,109, 26,  8,226,184,189,118,214,113,146,186,  4,218, 34,218,170, 45, 80, 82, 64,156, 80,203,153, 15,194,  1,238,136,  3,  7,
- 36,248, 52, 72,240, 81,144,184, 34, 40,162,168,226, 37,181, 73, 43, 26, 82,242,178,227, 93,239, 50, 15, 59,113, 42,113, 76,164,
- 88,138,189,158,199,127,102,126,227, 59, 51,200, 39,158, 51,158,224,194, 36,201,157, 86, 83,205, 52,  9,208,248,223,152,121,145,
-255,  4, 79,105, 33,174,161,104, 71, 45, 37,140,161,208,232,201, 52,102,184, 88,151,134,224,149,170,253,198,109, 70, 75,195,241,
- 16, 37, 51, 75, 29,134,180,160,153, 17,254, 25, 59,208,249, 21,223,110,209,  1,102,139,110, 48,120,188, 96, 38,190,159, 28, 70,
- 97, 19,194,159,132, 76,128, 51,227,249,208,123, 70,189,183, 46,227,104,172,217, 94,107,253, 56,253,  9,241, 96,213,151,216,222,
- 72, 35,181,197,138,119,148, 11,203,107, 66, 77, 49,105,201,208, 27,120,156,173,213,157,147, 94,167, 26, 52,192,163, 48,239, 19,
-158,253,210,242,106,162,179, 65,220,131, 11,172, 47,174, 55,130,232,160,179,191, 18, 93,237,141,112,221, 59,152,101,  8,178,186,
-163, 14, 78,126, 99,248, 28, 66, 98, 91,245, 66, 72,163, 53, 70,247, 30,133,240,110,189,238,234, 64,192, 31, 79, 38, 36, 41,146,
-189,  9, 36, 26,104, 42, 79,161, 39, 83, 42,131, 67,116,175,181,253,232,201,227,187,123, 15, 29, 71,170, 81,231,243,135,143,155,
-215,183,222,188,126, 27, 86,131,243, 94,188,187,251, 32,106,212, 48,210,137, 29,130, 71, 98, 40, 35, 20,247,171,139,156,177, 13,
-183, 59,213, 91,155, 27,119, 90,107, 25, 46, 48,178,  7,135,223, 50, 43,159, 63,125,  6, 15,253,197,171,151,221,126, 31,163,157,
- 44,141, 26, 98,240, 39, 17,113, 69,138,104, 96,255,210,174,227,  9,121, 79, 56,  1, 90, 86,106,169,138,249, 30, 17, 63, 29, 45,
-123,232,215, 99, 61,114, 75,143,  1,236,107,234,148,123,126,193,183, 35, 90,125,106,242, 43, 66,104,147,115,138, 98, 29,135,124,
-217,153,116,131, 74,168, 38,127,128,205, 42,200, 34,142, 33,116, 44, 96, 97,130,224,218,125,100,211, 99, 59,157,102,195,236, 81,
-187, 27,166,231, 62,231,208,166, 22, 46, 12,226,190,193,138,186, 79,105,138, 42,191, 91, 60,128, 93,102, 82, 26, 71,213,228,  2,
-250,126,212,  9, 69,187,123,124, 81,144,177,188,118, 24,133, 27,200, 70, 39,184, 94,206,136,124, 74,223, 74, 95,194,231,118,247,
-  8,220,161, 71, 43,169,121,233,  0,169, 85, 52,143, 79,141, 73,188, 69, 50,113, 98,194,127,137, 18,104, 10,  5,104, 26, 27,190,
-136,109, 23, 57,196,199,184,204, 99,167, 81,113,143,  0, 74,  1,110,189,115, 67, 31, 28, 54,248,  6,132,185,162, 46,  9, 89,145,
- 12, 55, 22,195,219, 43, 11, 55,174,213, 49,209, 37, 61, 36,205,140, 20,184,  8, 30,205, 58,214,164, 40,170,131, 76, 59,  8, 43,
-205, 85,175,118, 73, 57, 98,156,232,164, 63,156, 76,224, 92, 40,159, 40,  0, 88,162,204,243, 90,139, 38,130,151, 54,129,135,128,
- 75,  4,151, 27,107,205,112,105,220, 56, 63,141,126, 31,175,180,213,209,121,212, 78, 82,120,209,152,234,202,179,  0,198,206,153,
- 40,184, 17,103,163, 51, 46,232,161,240, 65, 21,139, 48,168,238, 44,111,126,250,181, 79,  6,126, 74, 98,180,249,140,250, 28, 60,
-154,251,  8,139, 88,129, 43,159,197, 52,154, 71, 97, 37,216,135,238,184, 71,  6,151, 97,192,180,160,195,152,113, 50,180,110, 49,
-  5,235,206,198, 26, 24,205,233, 17,229, 94,185, 42, 85,  9,118,180, 89,155, 43, 86,  8,136, 10,182,174,220, 60, 56,254, 34,253,
-202,253, 91,123,239,191,190,163,239, 13,175, 96,204,101, 39,107,193, 67,103, 25,210, 73,225,230, 40,157,149,209,217,246,127,131,
-224,184, 36, 57,160,108,242, 34, 67,136, 44,109,198,178,142, 20, 21, 26,210,206,230,125,193,127, 67,248,127,  2, 48,118, 53,189,
- 77,  3, 65,212,107,123,237, 56,205,  7, 85,147,166, 45, 18,  5,209, 11, 39,196,133, 11, 31, 23, 36,144, 80, 41,170, 56,194,165,
- 18,252, 16, 16,167, 30, 57,128,248, 45,  8,  9, 10,173,  4, 72,112, 65, 66, 69, 72,136,168, 77, 73,218,144,218, 77,253,177,235,
-120,153,217, 93,187, 41,112,224,220,216, 73,181,179, 59,111,103,222,188,103, 23,149,123,201,131, 70,230,221,200, 72,149, 30,172,
- 33,142, 13,216,218,148, 70, 92,171,212, 75,137,144,204, 60, 74,152, 34, 47, 25,170, 27, 79, 38, 36,191, 77,213,208, 49, 58, 50,
-162,134, 58,225, 99, 93,191,  3, 40, 44,197,111, 25, 21,228, 82,213, 58, 27, 55, 28, 87, 25, 15, 47,224,210, 72, 41,211, 83,232,
-136,120, 32, 36,167,234,173,148, 39,232,249,160,205, 43,132,162,212, 25, 99,218, 85,154,141, 37,171,138,205, 90, 99,215,239, 33,
-119,192, 48, 35, 22,203, 38,167, 37,  5, 21,180,193,223,108,125,118,123,208, 49,244,212,134, 72, 53, 51, 16, 11,105,117,183,190,
- 27,236, 81,219,241,163,253,249,214,217,158,223,  5,200,116,239,238,253, 75, 75,215,158, 60, 90,221,120,255, 18, 82,250,118,127,
-219,163,131,153,218,201, 83,141,211, 91,251,175, 97,115,193,182,  7,152, 32, 19, 30,166, 46,156,153,174,205,180,247,183,  8,225,
-112,170,160,255, 39, 27, 14,  6,217, 46,231,120,117, 49, 72,204,  0,171, 50,204,100,200, 76,147,243,163,132,205,181,154,221,189,
- 48,137,147,  7, 43, 43,183,150,239, 56,181, 22,252,119, 59,223, 63,183,191,109, 78,207,181, 96,251,181,219,221,135,143, 87,223,
-174,189,162,116,170,223, 31,  1, 18, 27,198,  7, 16,124, 14,  4,130,237,216, 28, 61, 94, 57,195, 54,116,217, 41,253, 10,124,198,
-140,197,235, 55, 23,111, 47,  5,131,  1,172,224,179,231, 79, 63,124,252,212,235,117,174,220, 88,190,120,225,252,139, 55,235,176,
- 97, 57,150,109,204, 74,149,  4, 60,132,107, 51,188, 77,170,231,142, 36, 52,182,120, 22,219,196, 45,204,216,177,220,147,  9, 38,
- 82,215,  1, 16, 73, 66,118, 88,196,221, 65, 50, 28,143, 62,215,114, 50, 77,236, 37,133, 21,154,137,109, 64,170,212,119, 73,118,
-196, 73,151,219,217,130, 44, 94,176,119, 83, 45, 95, 90, 24,164,137, 67, 60,220, 21,242, 25, 81,203,101,249,249,145,240, 16, 30,
-230,114, 62,  0,254, 10, 43, 50, 57, 49,185,254,101, 77,153, 60,160,112,244,216, 57,131,148,167, 81,150,195, 62,217,192, 23,228,
-242,185,171,239,190,110,  8,110,152,228, 88,145,  4, 86,  7, 11,172,236, 80,169, 40,154, 40,119,101,225,158, 20,218, 44, 90,206,
-103, 81, 74,120,200, 66, 19,229,164, 16,163, 87,221,154, 31,251,176, 28,112,106, 19, 44,208, 53,127,  6, 59,200, 74,  2,180, 97,
-185,145,145,144,140,140,205,161,234,154, 73,150,123, 99, 41, 42,141,124,153,212, 73,148, 32,  8,229, 78,177,  9, 97,187,182,233,
-  2,114, 71,159, 76,234, 89, 40,137,  1,192,  0, 86,226, 76,165,188,208,152, 88,152,173,158,168, 80,164, 27,194,157, 37, 54,100,
- 33, 17, 49,126,201,177, 61,116,143,196,186,142, 46, 13,212,155, 20,246, 20,113,194,152,197, 33,147,109,126,  1, 31,163, 37,183,
-228,202, 25, 17,116,119,192, 68,202, 18, 22, 50, 30,134, 44,226,105,156, 36,145,136,145,134,  3,167,  3,165,246,212,124,163, 58,
-237,213,219,229, 31,125,103,167,212, 70, 35, 35,169,223,157, 42, 93, 72,229,233,161,133,119,244,112, 52, 81,242, 23, 90, 21,142,
-113,182,217,217, 20,249,248, 40, 57,154, 14,250,163,131,130,139,166,156,208,243,137,100,  1,104,192,115,189,  0,205,218, 20,225,
- 25,147,104,173, 84, 29, 66, 28, 10,197,110,149,142,158,150,148,199, 82, 77,240,124, 24,162, 82,170, 65,158,  9, 66, 31,158,245,
- 28, 15,249, 57, 44,195,196,  9,143, 71, 67,249,  3,113, 39,195,253, 91, 94,254,164,158,136, 50, 95,149,173, 32,136,  1, 75, 90,
- 65,195,218, 76, 56,101,248,133,177,136,144,158,240, 87, 45,  6,194,  0,222,144,171,  1,140,241,125,254, 49, 56, 33,198,205, 77,
- 85, 44, 41,  6,154,249,223,142, 78,191,  5,160,236, 90, 86,163,  8,162,104, 87,119,245,187,123,222,154,193, 36,154,  4,130, 70,
-  5,  7, 55,110, 92,136, 43,113,233, 66,252, 10,247,174,  4,245, 11, 92,185,240, 43,116,163,  1, 81,  4, 81, 17,  3, 42,130,142,
- 16,117, 34, 62,152, 36,164,147,121,244,187,189,247, 86,101,166,  3,110, 36,139, 64, 32, 73,247,116,215,169,123,110,157,123,142,
-244,159,105,185,135,200, 76,  3,110, 32,206,169,181, 84,179,155,150,110,  0,207,157, 20, 16, 80, 28, 52,136, 79, 49, 86, 62, 88,
- 43,203,125,166,  3,213, 82,198, 60, 29,110,167, 18, 93, 28, 91, 51,  5,138, 65, 44, 75,179,116,223,170, 25,191,219,134,203, 80,
- 66,158,238,235, 20,  4,173,195,167,224, 59, 85,162, 87,197,145,218,124,140,218, 16, 92, 63, 81, 58,166, 65, 71, 68,228,154,219,
-200, 41, 89, 69,198, 90,208,194, 20,163, 76, 42,222, 75,165,215,223,200,179, 12,223,103,166,121,192,230,  1,179,208,  5, 10,171,
-124,177, 99, 53,253,214,246, 96,  7,174,198,181,221, 68,132,123, 17, 35, 17,185, 22,195,112, 24, 68,195, 40,142,146, 20, 64, 21,
-170,200,162,115,250,236, 66,103,101,237,197,171,222,198, 87,172,253, 25, 80,138,104,103,180,219,219,234, 17,162,  1, 77,118,108,
-195, 27,132,  3,192,192,166, 63,179,185,135, 10,214, 81, 60, 64,249,121,145,140,105, 56, 51, 86,146, 17,203, 19, 58, 71, 14, 83,
-145, 42,140, 79, 58,134,191,151,113,248, 79,183,110,222,134,210,206,180,172,235, 55,238,236,110,247,187,239,223,182,143, 46,125,
-120,253,188,125,108,105,241,228, 57,175,222, 90,125,248, 96, 97,113,121,179,191, 61, 59,191,144,196,217,149,171,215,186,159,214,
- 53,102,247, 55,  3,219,178,195, 16, 94,178, 34,142,243,163,115,243,157, 51,157,119, 31,187, 73,146,158, 58,177,252,232,241,147,
-187,247,238,175, 62,125,246,249,203,143,173, 96, 84,179,253,243, 23, 47,107,217,120,237,205,203,122,197, 85,177,148, 80,224,170,
- 96,145,196, 97,138, 41,155,138,104,157, 73, 91, 57,138,172, 44,228,177, 27, 86, 19,  8, 69, 97, 50,130,125, 14,224, 37, 47,166,
- 67, 73,130,101,155,154, 41,247,224,124,210,139, 16,111,  3,234, 70, 84, 85,167,105, 76, 18,174,149,130,144, 44,221,204,243,164,
- 60, 73, 77,137,198,  9, 59, 96, 66,169,202,227, 78, 50,114, 21,111, 42,160,158, 24,148,109,120,141, 40, 13,127,  7,191, 54,250,
-223,  8, 83, 56,245, 33,139,162,152, 58,165,203, 14, 18,245,244,180,253,236,135,239,127,214,163, 34, 33,221, 56,181,157,  5,238,
-107,162,199,138, 48, 65, 90, 67,244,122, 67,242, 74,243, 67,162,237, 10,  4, 55, 70,184, 87, 72,238,173,136, 79, 75, 24,107,103,
-121,102, 25, 22, 92,240, 94, 24, 48,  1,227, 12,176,152,227, 61,170,236,128, 93,140, 24, 34,162,193, 83,241, 35, 49, 41,142,164,
-147, 56,157,142,238, 78,176,141,112, 11, 88,161,174,185, 38,118, 99, 60,203,228,154, 93, 53,216,146,239, 93, 58, 62,115, 97,229,
-240, 92,203,130,181, 28, 66,213,128, 29,134,130,196,145,170,197, 53, 76,128,177,116,196,110,110,136,112, 37,189, 57,167,213,103,
-211, 76, 29,143,194,241, 16,222, 17,160,104,186,231, 89, 85,223,182,171, 14,247, 29,213,179, 85,215,  6,210,202, 61,199,172,121,
- 30,108,152, 64, 96, 43,182,  1,181, 43,186,107, 96, 36,182,248, 66,245,128,211,244,234,158,203,119,148,  1, 15,168, 29, 37,238,
-175, 96,147, 60, 91,196,109, 83, 55,155,126,  3, 71, 31,232,227,203, 41, 81,171,144,180,153,181,129, 73,168,108, 24,141,101,191,
-116, 34,224, 17,152, 50, 73,213, 42,225, 15, 71,250, 98,133,232, 13, 46,107, 80, 32,124,138,140,133,192, 99,103, 88,245, 89,145,
-106,168,122,224,132, 27, 76,149, 22, 52,204, 49,108,156, 89, 69, 90, 15,171, 47, 77, 72, 29,111,104,186,161, 91, 81, 18, 74, 35,
- 20,218, 96,131, 17,122, 71,207, 84,218,221,159, 93, 81,214, 59,134, 75,  9,  7, 18,139,227, 12,224, 33,145,101,175, 72,242, 46,
-121, 18,192, 67, 43, 79,156,194,239,114,110,160,119, 49,101,183,178,127,105,134,203,186,163,172,248,191,168,190,191,  2,240,117,
-109, 61, 77,  4, 81,120,102,119,246,210,118,235, 22,196, 10,197, 18, 52, 88, 20, 10,104,228, 47, 24, 12, 33, 49, 49,250, 67,245,
-193, 72,188,189, 27,162, 49, 81, 98, 20,125,192, 11,198, 64, 40,176,165,123, 31,207,101,183,133,196,152, 52,125,105, 31,166,157,
-157, 57,223,156,249, 46,197,254,158,211, 49,164, 12,191,134,167,211,114,108,183,106,123, 39,131, 64, 24,236,149, 36,163, 60, 34,
- 29,138,148, 82,254,147, 93, 47,135,237, 13,201,241,216, 20,230, 36,203, 42, 37, 69,153,145,141,157, 43, 91,185,196,219, 32,219,
-  2, 38, 30, 81, 35,190, 76, 11, 51, 88,217, 97, 74,107,110,114,238, 79,239, 55,251, 97,193, 96, 96,245, 98,181, 36, 82,175, 81,
-144,208,196,204,197,153, 94,191, 71, 70,102, 69,120, 36,251,213, 17,157, 64, 66, 89, 26, 68,167, 72,126,167, 60,248, 49,175,  1,
- 43, 45,166,  0, 16,147,233,105, 34, 59, 12,122,100, 29, 99, 55, 27,151,131, 65, 63, 66,250,  9, 37,243,106,180,192,165,149, 44,
-218,151,174,  4, 73, 24, 38,232,186,181,253,249,227,235,199, 79, 63,237,108,135, 81, 80,252, 72,205, 93,124, 19, 48,255,114,123,
-121, 63,216, 63, 30, 28,205,183, 58, 63, 15,247,  0, 83,107,140,  3, 30, 48,189, 18,190,  8,143,142,239, 52, 18, 51, 54,171,121,
-  5,158,116, 83, 21,106, 35,116,157,196,107,243, 26,192, 43, 33, 30, 61,124,  0,187,125,119,121,161, 98, 38, 47,159, 61,137,195,
-190, 50, 68,119,101,117,124,234, 26, 12,252,203,251, 55,155,155,207,183,182,182,150,186, 93,248,165,107, 27,247,167,231, 22,155,
-126,101,118,182,  5,245,104,125,125, 13,198, 84,173,168,197,249, 25,219,201,219,237,171,111,223,125,136,242,108,117,229,214,183,
-221,221,237,157,175,105,146, 57,182, 85,  7, 32,167,242,245,141,187,190, 87,125,245,226, 41,192,207, 48, 33,197, 83,204,153,139,
-104,191, 70,144,155, 71,174,203, 36, 50,132,175, 24, 38,135,119, 77, 60, 97, 70,  9,204,243, 51,213,223, 24, 66, 36, 71,185,  9,
-121,230, 13,183,120,110, 46,103,212,  6, 97,137,133, 49,202, 76, 48, 81,217, 40, 50,  0, 86,176, 63,178,167, 35,165, 37,160,215,
- 77, 86,250, 16,140, 90,114, 35, 98,165,  1,147,107, 81,164,162,166,232,  2, 56,207, 34,187, 19,131, 89, 50,118,186, 69, 12,171,
- 20, 28,210,136, 50,160, 45,148,162,229,178,100,105, 81,  4, 52,142,186, 89,111,194,209,201,228, 14, 94, 25,177,196, 82, 68,234,
- 84, 43, 98,116,240,177,148,185, 51,250,246,236,157, 78,171,243,227,224, 59, 35, 20, 34,176, 23, 14,188,136,  0, 41, 79,184,  8,
-210, 32,104, 68, 87,  8,134, 60,231, 88, 53,178,174, 50,138,151, 38,230,130, 34,255,106, 66, 40,134,116, 77,147,  0,187,233,217,
-118,221,181,107,174,242,108,167,229,170,141, 27,147,247,150,166,198, 60,213,143,  1,  1, 37,164,183,200,137,102,134,244, 54,199,
- 82, 48,227,104,233,135,234,109,164,191,227, 18, 25,159, 22,141,150, 72,242,232, 52,138, 66,108, 46,163, 91, 72,205,129,119,168,
-168,152, 33,160, 72, 39, 96, 83,125,115,149,112,109, 81,117,197,132,103, 54, 27,181,201,177,  9,191,230, 43, 43,134,135, 59, 74,
- 57,  9,  6,139, 56, 28, 15,124,191,166,250,250,196, 60, 78,217,128,184, 20,158,143,174,  5, 51,100,104,165, 41,212,153,148,194,
- 86,175, 79,117,246,131,  3,116,251,202,243,163, 62,  6,  6,243,174,206, 78, 80,186,188,173, 96,218,180,214,229, 69,141, 46,112,
-  1,172,202, 83,228, 35, 22,158,246, 60, 49, 44, 26,130, 25,135,138, 69,219, 40,254,225,112,214, 36, 59,185,136, 26, 92, 70,189,
-114,  1,138, 46, 59,132,139, 17,161, 83, 16,176, 59, 33,174, 21,123,147, 23, 34, 98,248, 51,240,124, 70, 69,250,230,244,194,175,
-195,189,242,  3,118,215, 44,148, 25,178, 96, 49, 14,245,103,184,119,197,105,120,198,245, 22, 80, 20, 89, 88, 97,226,180,148,231,
-179,183,228,168,247, 34,207,182, 61,245,121,218,130,254,175,156,239,175,  0,140, 93,201,110,211, 80, 20,245,248, 18, 59,118,156,
-193,233, 64, 43, 64, 45,131,  0,169,106, 10,  8,  9,186,168, 90,186,228, 15, 16,226, 95,216,176,227, 39,128,111,232,166, 11, 36,
- 86, 72, 44,168,132, 68, 37, 88,160,210,162,182,193,113, 28,215, 99,108,115,239,125,118, 27,132,144,144,178, 74, 34,103,240,123,
-231,157, 59,157, 83,213, 87,185, 11,102, 89,219,194,108, 96,148,  4,126,232, 81,142, 14,245,175, 69,174,229, 94,221,160,243, 50,
- 73,241,183,107,142, 80,186,214,218,230, 44,108, 15, 88,160,216, 96, 64,  5, 55,174, 80, 84, 22,211,176,183, 52, 23,203,156,204,
-121,120, 82, 94,150,138,120,212,179, 40,192,157,118, 39,213,108,129,169,153, 97, 18,  1, 31,132,  5,193,235, 54, 84,184, 21,221,
-179, 97, 75,179,128, 92, 75, 92,136,134, 18,235,212,  4,169,204,181,231, 78,220,227,181,165, 62, 64,150,161, 97, 94,213, 79,252,
- 52, 70,213,117,174,173,  4, 31,  8,  7,  0, 80,  9, 55,244,250,203,125,199,119,142,221, 83, 86,211, 44,195,242,130, 49,217,152,
- 80,212,159,165,163,112,100, 27, 51,227,112, 12,200,  7, 91,  1,226, 65,216,123,  1, 74, 85,240, 17, 91, 62,  4,  4,135,132,106,
-104,  6,  4,  0,240,146,213,232,232,106,253,230,226,237,159,163, 35,248,185,247,150,239, 59,103,110,152,  6,176,216,  6,129,211,
-108,234,114,115,162, 49,153,167,101, 17,216, 43, 75, 42, 93, 81,234, 76, 62,248,190,127,120,184,191,214, 95,125,243,250,173,221,
-187,180,190,177,253,233,227,135, 27,253, 71,116,148, 71,175, 94,190, 24,  7,190, 84,164,207,158, 63,125,183,187,179,186,118, 55,
-141, 71,186,166, 38,201,216, 25, 28,109,109, 63,190,126,109,185,213,106,110,110,110,237,237,237,205,218,115, 95,246, 63,  3,174,
-245, 87,238,  4,254, 40,142, 71, 51,109,211,106,170,122, 93,142,130,248,225,131,117,251,202,173,247,187, 59,142,231,118, 44,  3,
-192, 65, 17, 80, 77,190,161, 75, 65,152,194,230, 98,162, 70,165, 81, 60,189,177,247, 75,109,224,234, 76, 19, 85,209,138,202,109,
-167,154,222, 40, 11,105, 85, 97, 16, 97, 58,175,196, 29,187,122, 47,158,196,121, 41,207, 61,109,  6,205, 27, 16,120,195,175,196,
-112,  6,153,  1, 29,182,141, 30,156,142,231,221,244,200,170, 20,134, 68,185, 10, 14,184,104,140, 74, 79,210,142, 19,179, 12,135,
-234,100, 76,238,103,216, 38, 11, 33, 69, 54,  1,194,202,109,164,132,202,232,147, 28,246,100,173,166,203, 34, 35,169, 72, 30,111,
- 10,220,180,136,186,102, 35,184,155, 76,174,243,236, 46, 60,141,221, 41,112, 53,236,222, 65, 79, 44,178,141, 36, 28,166,239,  1,
- 59,229,151, 63,248,118,242,181,210, 38,156,206,159, 22,127,228, 75, 17, 11,184, 20,228,185, 39,218,244,163, 16, 47,140,153, 74,
-179,162, 92,196,  1,105,198,106, 36, 87,  9, 72, 13,135, 24,107, 48,217,212,128,137,171,109,133,109, 44, 46, 60, 89,233, 46,205,
-155, 62,220,188,100, 66, 99,209, 57,183,154, 64,230,142,105, 25,212,189, 65,152,  3,114,129,231, 29,213,167,172,158,208,187,140,
- 17, 37,  4,167, 17, 34, 49,146, 73,248,179, 84,  5,  3,150, 32, 18,156,177, 48,112,131, 35,207, 57, 24,185,135,158,247,195,207,
-156, 64,139, 98, 52,236,209, 84,193,214,133,133, 14,155,239,216,245,154, 41,136,152,216,153,228,229, 70,151,228,122,203,210,196,
-196, 27,230, 97,158, 75, 23, 70, 73, 85,214,148,204, 18, 32,196,190,108, 95, 29, 18, 57, 27,250,195,172, 44, 79, 20,220,198,144,
-219,210,182, 77,251, 44,242,121,114, 47, 47, 23, 27,149,204,  8,244, 49,124,215, 77, 98,127, 69,163,102, 88, 70, 51, 66,148, 47,
-120, 66,131,143,184,235, 53, 29, 32,126, 28,122, 18,217,130, 67,208, 25,103,  9, 80,  7, 96,234,212, 54, 36,195,101,103,155,243,
-  0, 44,140,161,255, 45,149, 55,228, 58, 42,214,165, 93,163, 27,145,251,121,133, 94, 82,165,158,139,221,246,167,227, 19,248, 26,
- 52,235,  7, 52, 66,202,121, 30,178,200, 43,213,160, 11,171, 87, 20,158, 83,107, 41,188, 13,226,203, 34, 23,196, 41,161, 21, 81,
- 44,254,229,127, 38, 76,185, 65, 77,185, 81,138,255, 39,  1,255, 91,  0,198,206,164,183,105, 40,136,227,246,179,227, 37,117,235,
-132, 44, 77, 55, 90, 84,169, 21,235,  1, 33,129,202,  9, 14, 32,132, 42, 56,241,213,144,224, 67,112,129, 11, 66,226,140,212,  3,
- 42, 65, 52, 85,213,210,146,116, 73,147,198, 89,237,231, 56, 54, 51,243,236,164, 66, 61,112,141,100, 71,137,236,121,255,153,249,
-207,111,198,254, 25,229, 18,163, 64,142, 81,190,180,119, 13, 43,209,114,248,207, 36,158,170,196,184,106, 73,150,175,162, 62,225,
- 93,  6,195,  1,202, 94, 28, 45, 82, 99, 84,241,216,255,195, 88,  2,205,145,199,168,225,  9,238, 46,  2, 49, 17,136, 30, 90, 50,
-206, 36, 61, 90,123,124,210,172,121,129, 23,137,249, 28,  9,233, 19,228,114,197, 75, 44, 99,138, 64, 48, 88,218, 86, 89, 66, 62,
- 35,222,  5,100, 94, 46,119, 59,125,103, 54,  3,114,172,239, 15, 57,162,210,201,102,  3,239, 63,220,  4,164, 58,220,214, 50,172,
-243, 78, 19,210,183,163, 70, 13,233, 22, 81,224,113,200, 59,197, 18, 35,  1,174,139,110, 47,223,173,212, 42,161, 28,143, 80,246,
-120,183,135,213, 42,101,172, 90,196, 79,152,207,149, 64, 58,129,120, 15, 81,140,  7,231,221,198,169,115, 28,146,109,238,164,115,
- 54, 99,102,114,211,249,141,245,135,191, 78,118,153, 49,226,136,249, 84, 48,213,193,213, 75,146,161, 43,166,198, 32,176, 90, 70,
- 74, 55,244,118,187,123, 90,239, 28,236, 31, 86,246,246,  7,  3,126, 81,175,183,157,214,253,141, 39,194,211,246,229,211,  7,167,
-221, 43, 20,231, 95,110,190,126,247,246,253,139,205, 87, 67,223,203, 46,172, 76,167,205,175,159, 63,110,255, 40,247,123,254,159,
-218, 25, 72,205,218,241, 94,105, 46, 83,171, 30,104,134,116,107,237, 70,179,229,212, 27, 77, 72,240, 57,247,175, 47, 46,204,151,
- 74,154,102,174,222,188,247,123,247,167,211,108, 61,127,246,116,107,171,140,190, 15, 72,162,117,197,227,240,192, 75,126,196,  9,
-202,131,199, 34, 57,213,  2,194,233, 97, 48, 37,129, 17, 87,213,229,100,147, 45, 99, 41, 56,170,204,148,  9,239,210,114,110, 21,
-153,113,  4, 75,114, 19, 88, 13,  2,172,105,208,225, 18,195, 35, 90,204, 94,199,214, 29,217, 81,  4,151, 70, 44,180,156,108, 40,
- 69, 91,220, 40,138,167,230, 89,178, 57, 36, 42, 76, 23, 33,185, 84,153, 54, 99,218, 28, 43,164,194, 27, 30,101,204, 92,159,247,
-  9, 24, 33, 17,124, 34,156, 49,179, 62,106,139, 72,140, 44, 65, 20,164,122, 40, 62,151,240,160, 46,229, 86, 58,184,200,141,116,
- 50, 33, 37, 44,221,178,244, 41, 50, 23,  4, 98,113, 40,161,182, 34, 60, 48, 70, 65, 60, 53, 42, 69,134,154,134,131, 12,146,  6,
-248, 92, 24, 39,199, 82, 85, 68,119,154, 71,101, 73, 81, 33, 97, 77,210,208,158, 52, 17,240, 44,246, 82, 48,150,204, 45,210,229,
-140,184, 31, 68,229, 83, 48,190,227, 67, 98,233,170,165,107,102, 74,205,107,250,155, 59, 75,155, 15, 74, 16,114, 61, 78,150, 66,
- 58,194, 68,135,  0,137, 76,170,162, 67,  6,131,226,157,120,191, 12,155,162,232, 63,208,116,  9, 18,193, 84, 90,242, 64, 26,  5,
- 56,117, 10,233,155,134,219,245,224,111, 30, 52, 47,142, 42,213,157,250,232,187,155, 63, 84,230,170,172,112,172,228,106,145,189,
-231,234,229,179,112,123,199, 41,127,171,246, 42,141,130,235,171,203, 25,105,189,104, 44,229,138, 18, 11, 58,156, 15,195, 40, 22,
-176,178,153, 49, 13,207,109,117,112,221,128, 28, 51,139, 40,217,139,231,145, 48,146, 59,189,139,164,135, 42,254, 39,225, 97, 35,
-219, 52, 98,102, 66, 62,130, 76,  4,215,  7,219,166,237,250,131,104, 82,177,144,243, 86,126,224,247,177, 53, 68, 77, 44, 92, 12,
-130, 85,111,252,242,140,149,245,136, 90, 67,149, 45, 28,120, 20,182, 76, 65,172,162,205, 45,  6,154,  0,113,199, 58,170, 51,184,
-143,157,182, 61,180, 63, 98,176,154, 49,236, 46,239,225,254, 28,164,186, 71,217,169,107, 40,180, 19,220, 35,109,130, 83, 33,182,
-136,224, 48,107,207,181, 93,  7, 46,193, 78, 18,102,  1,104,213,215, 21,209, 11,141, 53, 56,186, 27, 48,123, 64,100, 83, 64, 46,
-196,164,240, 78,238,160,113,  0,148,175,216, 70,153,176,239, 89, 74,209,169,152, 41,255,167,132,255, 43,  0, 93,215,210,155, 68,
- 20,133,231,201, 12, 51, 64,  7,164,148, 86,173,173, 15,108,163,137,141,233,162,169,198,196,212,141, 59,211, 95,225,210,196,255,
-224,175, 48,241,145,184, 53, 26, 95, 91,163,155,218,196,104,173, 93,105, 42,165, 47,154, 82,160,148,121,  0,243,240, 60, 40,165,
- 54, 18, 22, 64, 96,  2,151,123,239,249,238, 57,223,249, 62,233,196,243, 99,111,134,144, 15,235,176,187, 49,247,189, 13,150,132,
- 78,  8, 78,252,159,171, 95,183,231, 84,244,131,182,237, 58, 17,121,160, 70, 98, 64,191,132,130, 52,114,117, 82,172, 36,193, 73,
-183,160, 75,141, 12,123, 34,150,166,110,226,177,154, 24,215,139,191, 23, 88, 87,216,208,226,152,239,142,196, 76,252,148,124,120,
-  4,114, 90,142,139,213, 60,177,123, 26,161,115, 45, 15, 15,128,  2,184,248,160, 53, 84,220, 89, 59,  0, 36, 72, 76, 74, 31,233,
-119,161,161,155, 15,238,222, 87,208, 57, 85, 54,245,  4,124,237,137,211,133,164,145, 32,  6, 81,232, 97, 45, 59,100,170,126, 64,
- 59,196, 82,113, 57,107,229, 24,183, 90,102, 26,130, 54, 96,251,148,150, 76, 25, 41,  6,158,176,130,  0, 72,110, 84,182,202,245,
- 77, 64,169,  1, 37,238, 73,161,135,232,166,232, 82,171, 86,155,149,134,211,120,185,248, 26,214,122,203,139,154, 54,210,  0, 89,
-147, 68,228, 44, 21,137, 51,144,225,  6,185, 19,132,114,177, 84,134, 63, 98,173,180,250,230,221, 43,215,110,210, 24,119,  4, 42,
-131,195,131,233,235, 87,139,171,191,170,213,157,150,103,195,254,211,216, 94,219, 44,150,182, 43,  7,223,151, 86,222,127,120,251,
-233,243,199,199, 79,159,249, 62,236,203, 26,106,153, 42,200,160, 87,100,169,237,133,182, 19, 56, 94, 56, 59,115, 99,126,254,222,
-202,207, 69, 24,165,203,147,163,215,166,198,231,238,220, 86, 20,173,213, 10,235, 13,127,125,219, 13, 40,115,162,138,  0,248, 20,
- 77,137,241,185, 55, 38,233, 61,207,160,120, 44,193,122,181,114, 87,198, 22, 59,196,136,247,  2,251,134, 11, 35,179,103, 87,236,
-214, 65, 31, 33, 10,179,111, 99,185,243, 50, 61,142,161,205, 11, 54,199,195,211,173,218,186,231, 55,169,148, 34, 81, 79,  3,146,
-160,146,241,116,207,127,148,142, 14,  6,202,131, 10, 18,172,174,222,244, 43,239,239,240, 22,188,239, 86,249,224,140,100,115, 69,
-247, 58, 54,173,109,245,194,240,132,143,150,131, 66,195,171, 41,120, 54, 50,176,120, 67, 99, 78,204,125,204,151,103, 18,131,165,
-202, 31,248, 41,  3,134,149, 77, 12, 89, 70,  6,253,158,  2,175,102,215,186, 96, 36,146,184,248,  0, 23,130, 41, 39,247,120,108,
-146,232,249,142, 79, 74,162,128,226,217, 92,250,200,163,154, 12, 32,224, 21,216,250, 21,204,  8, 70, 49, 69,206,152, 25,142, 64,
-221, 18, 33, 75, 29,144,102, 11, 92, 36,109,100, 44,195, 50, 84,236,188,199,175, 70, 77,124,228, 39,140, 84,224, 68,220,210, 20,
- 53,174,106,178, 20,203,203,218,195,155,147,115,211,163, 29, 68,235,184,125,211,189,167,251, 27,193,200,170,128,202,145, 46,137,
-227,204,221, 65,  1,123,190, 38,  7,  4, 51,133,231, 43, 33, 84,185,159, 85,145,201,134, 44,172,151,119,191, 46,111,252,240,207,
-250,227, 51,198,224,152, 28, 51,209, 54, 70, 80,117, 89,131,128,151,206,230,206, 92, 44, 12, 95,153,170, 14,140,191, 88,112,159,
- 63,250, 82,124,242, 13, 32,128,112,235,210,185,217,194,104, 30, 89,109,228,118,135,124,149,124, 33, 55, 18,215, 67, 10,184, 40,
- 91,175, 91,128,136,201, 79,132, 85, 59,216,232,155,  8, 20, 76, 60, 15,176,201,145,188,235,152,116, 36,118,200,227, 12,167, 83,
-219, 59, 12,132,252,241,104,207,221,165, 74, 42,  6, 39, 36, 75,160,100, 66,135,173,178, 53,228,253,115,133, 28,161,190,221,110,
-142,164,243,221, 26, 12, 85,110,147,122,146,164,114,144,102, 74, 42, 14, 81,245, 96, 15, 46,145, 49,178,  2,170,128,236,179,200,
- 22,123,205,214,109, 20, 25,148,250,234, 67,  0, 92,  0,194,146,113,138,146, 79,159,133,127, 86,215,205,128,168, 92,148,156,246,
-221,118,171,207,160,229,136,231,232, 96,125,254,232,102,234, 41, 69, 82,254, 37, 76,242,196,225, 76,148,192,173, 66, 56,249,219,
- 39,218, 53,  4,225,184, 72,244,241,216,240, 87,  0,178,174,228, 53,141, 40,140,207,162,227,140, 70,141, 53,141,137, 86,163,198,
-132,210,157,210, 82, 40,129,  4, 90, 10, 33,135, 94,122,232,161,127, 77,255,157,210, 67,105,146, 83,104, 74, 67,160,189,180,144,
-165,144,224, 37, 80,  4, 99,181, 46, 51,206,230,204,235,247,125,239, 25, 19,130, 50, 23, 69,103,121,239,125,203,251, 45, 87,243,
-119,121,226, 52, 41,140, 75,194,209,180,129,198, 11,236, 98,119,100,252,198,158,137,176,200,146,175,123,250,200, 99,183, 60,241,
- 57, 71,119,134, 68,203,146,132,155,170, 55,114, 99,154,158,138,103,  2,241, 83,114,113,166,  4,211,134,231, 86,240,242,124,143,
- 48, 54,138, 58, 81,211, 71,174, 41,246, 74, 89,  0, 15, 44, 20,  2,150, 60, 32, 35,156,129,103,253,170, 50, 54, 47, 64,254,  8,
- 74,176,191,126,182,209,234,181, 28, 50, 66, 35,165, 35,105, 38,153, 77,233,137,237, 95, 59,212, 23,129,105,169,245,135,131,223,
-141,211,119,171,111, 15,206, 14,124, 18,214, 37, 29, 46,177,237, 67,247,120,100,185,118, 62,147,239, 88,109, 93, 51,218,102,  7,
-241, 24,254,208,246,108,184,158, 82,182,104,186, 38,228,112, 40,136,192,148,245, 39,175,234,141, 58,156, 65, 24,202, 58,121,  1,
-194, 29, 91,156,171,253,233, 54,112,220, 35,147, 21,149,  9,156,104,128,243, 78,133,204,157, 25,186,130,251,190, 24, 39, 20, 67,
- 67,141,191,137, 33, 71,200,213, 25,195,133,114,225,254,237,165,159,251, 59, 78,255,124,111,111, 23,  6,211,218,234,243,135,143,
- 30,231,114,179,229,234,226,247,111, 95, 62,125,252,176,181,185,105, 15, 77, 67,143,226,218, 37, 69, 44,199,143, 27,233,106,165,
-182,255,227, 96, 48,148,138,249, 37,219,147, 15, 79,234,228, 20, 18,190, 88, 91,153, 47, 20,190,238,238,190,220,120,  3, 85,249,
-241,225,113,181,186,252,121,107, 27, 81,228,126,104,251, 35, 40, 42, 97,226,187,142,203, 41,131, 16,149, 29,207,154, 77,231,135,
-152, 23, 99,218,129,186, 54,132,131, 32,141, 17, 46,116,133, 15, 94, 83, 53,238, 29,140,201, 97, 24, 36,180, 41, 42,227, 68,244,
-239,152,109, 56,166,180, 36, 58,240, 49,118,169,  7, 13, 11,247, 20,172,170, 23,185,  9,214,203,151, 90,130, 83,122,210,242, 48,
- 90,140, 56,234, 70,226,174,208,116, 84,196, 54,  0, 82,220, 24,155,207,150,168,186,194, 62,111,207,250,103,104,  6, 85,120,168,
- 59, 68,200,174, 64, 88,145, 41,220, 18, 73,177, 93,139, 35,216,161,158,139,107,241,142,213, 34,192, 67,140,176,164, 18,212,248,
- 70, 12, 53, 73, 74,217,  5,211,238, 94,182,122,224,103,197, 41,239, 36,186, 25,142,249,186, 98,228, 32,111, 32,158,244,125,168,
-  8,177,195, 11, 53,177,139,142, 66, 72,237,142, 69, 99,  2,178, 73,112, 45,126, 69,112,111, 29, 15, 69, 95,164,177,172,129, 66,
- 17, 79, 37,201,235,168, 26, 38, 96,125,215,212,164, 36,191,127,179, 82, 94,127, 32,153,110,  4, 45,183,  8,232, 72,233,187, 68,
-234, 44, 10,174,202,  8,154,140, 35,  8,  6,241,101,136, 95, 64,144, 32,  4,191,136,148, 43, 74,201, 12,249, 37,135,  4,182, 39,
- 53,199, 32,176,122,189,147,122,163,159,188,151,175, 44, 15, 45,207,243,177,165,  0,213,158, 74,233, 61,196,220, 80,142, 56, 30,
-170,195,148, 42,165, 66, 49, 55,117, 35,115,212,244,142,118, 78, 43, 42,211,158,222, 50,210,137, 68,223,181,134, 14,105,235, 49,
- 21,242, 85, 95,110,118, 60,126,195,225,194,113,228, 48,193,232,226, 29,117,206, 50, 89,202,215, 98, 81,189, 99,118,239,150,238,
-184, 35,223,166, 98,125,236,205,194, 72,243, 78,228,230,194,241, 85, 22, 46,202, 66,193, 94, 52, 30,  4,226, 30,183,187,232, 99,
-152, 66,181,185, 69,  8, 24,205,238,185,224,166, 42,145,116, 34,221, 30, 52,209,163, 65,184,165,203,240,215,229,217,242, 95,179,
-133,144,124,174,177,133, 36,187,248,205,212,220,192,235,139,209, 71,221, 35,142,236, 25,255,157,164,107,137, 70,231, 12,226,254,
-208, 49,209, 30,  0, 30, 40,234,131,146, 24,133,204,216,196, 67, 94,172,171, 73, 35, 77,186,184,  1, 95, 99,145, 77, 66, 85,  5,
-155,176,123, 25,124,135, 64,101,220, 63,164, 48, 29,207, 32,163, 28,  3,140,116,209, 51,185, 42,  7, 41,179,107,126, 32,112,248,
- 47,  0, 85,215,177,219, 68, 20, 69,167,188, 41,111,154,187,211,228, 20, 22,192, 34,  8, 80,  0,  9, 33,144, 88,129,196, 47,240,
- 79, 17, 31, 66, 22, 72,240,  7, 72,148, 77,136, 16, 82, 18,146, 40, 74, 66,138, 33,138,199,246, 84,123,204,189,247, 61, 59,206,
- 42, 11,199,214, 88,190,229,220,118,206, 84,124,151, 37,176,108,137,142,198, 60, 94,177, 28,  8, 72,154, 54,120, 94,131, 54,105,
-209,166, 77,143, 84, 29,  6,234, 77, 70,236,177, 54,252, 13,141, 18,117, 50, 64, 71, 38,128,129,207,  3,108, 95, 12,242,140,100,
- 24,197, 91,179, 28, 23,110,133, 84,176,236, 63, 78, 95, 68,200, 79,197,152,238,219,149, 18, 15,226, 65,164, 93,255,162, 74,171,
-186,  8, 16,  9, 50,  4,129, 29, 69,112,153,137,114,106,251,120,167,159, 70, 79,111, 63,250, 19,182, 53,170,202,163, 44, 10,227,
- 30,182,103,153, 14,104,189, 18, 84,227, 44,169,184,149,157,211,  3,176,224, 94, 26, 97,229, 94,228,220,116,163, 44, 22,164, 66,
-200,174, 49, 26,118,163,238,210,204,114, 39,234,180,106,139,144, 78, 83,100, 61,195,132,211,137,123, 67,154,101,141,242,162,222,
-108,213,131,230,214,254, 22, 20,187,120, 91,111,216,115,213,  5, 72, 48,150,105,173, 46,174,238,253,221, 35, 98,213, 33, 56,139,
-226, 22,182, 65, 96, 11, 69, 30, 84,206, 21,238, 64,172, 87,109,166,187,142, 26,184,154,239,168, 16,247,137, 98,167,176,172,145,
-161, 15,118,183,127,110,108,124,216,220,220,132,  4,228,123,154,109,107, 15,158,189, 89,185,179,182,179,245,237,221,250,250,225,
-241, 41,248,134, 97, 34,193, 89,150, 22, 73, 50,236,246,210,114,165,244,240,222,253,207, 95,190,130,193,207,207, 54,203,229,224,
- 96,127,191, 90,230, 22, 67, 13, 69, 29,101, 88,210, 39,207, 95,159, 29,254,250,244,241,125,251,226,252,228,228,196, 50, 69,107,
- 25, 80,144,222,108, 84,123,189, 56,203, 48,114,  1,250,112,205,210, 69,183, 93, 16,201,204,245, 81,130, 60, 27, 44,  0,206, 15,
-105,220,130, 93, 56,186,228, 17, 56, 22,237,117, 50,191, 25,111,139, 32, 43,  8,158, 65, 13,166,183,120, 71,196,  0,209,  8,102,
-194, 56,212,212, 27, 99, 57,139, 33,151, 25, 33,154,169,177,228,136,116, 76,201,159,176, 86, 34,241,116,176,174,171,254,101,154,
-246,225, 17, 25, 51, 36, 69, 38,145,149, 17,181,137,100,206, 41,243,138,205,156, 44, 23, 29, 27,141,184, 34,112,119,220,212, 89,
-134,205, 89, 44,252, 39,219, 19, 73,134, 27,159, 61,242,255,170, 91,131, 39,209,198,148,  5,  3,114, 63, 97,245,166, 97, 58,150,
-  7,240,  5, 10,130,146, 87,129, 58, 93, 56, 17,157, 71, 73, 69,120,145,  2,179,  2,143, 65,133,109,207, 85, 22, 24, 51,  1, 75,
-137,107,187,185,242,124,156,198,210,182,233, 15, 29, 35, 51,219, 64, 25, 38,207,178,116,221,121,181,178,244,242,237, 11, 37,112,
-148,186,171,132,125,150, 15, 10,161,  3, 70,164,112, 66,106,213,102,204,133,188,100,155,168,177,158, 35,  3,  6, 49,131,170, 28,
-170,214,214, 45,197,247, 48, 98,228,200,154,148,227,107, 16, 86,147,163,131,227, 43, 99,101,249,238, 90,146,  0,174,231,220,230,
-196, 69,137,235,  8,196,245,129,149, 28,238,222,104,140,251,190, 19,148, 44,238,207,206,212,152, 31,124,255,113,198,127,159, 85,
- 31,207, 91,117, 15, 66,124,183,159,224, 90,189,162,  6, 53,214, 63, 74, 46,243, 76,151,250,210, 98, 21,125,228,154,220,179,189,
-  8,225,145,210, 40, 55,118, 79,247, 28, 30,128, 99, 94,116,218,200, 78, 74, 67, 87,169,142, 61,158,153, 59,182,143,146,181,130,
- 46,163,144,225, 97, 60,201,152,240, 75,139,112, 38,210, 61,166,250, 90, 80,  3, 64,150,102,169, 24,  2, 33, 15,168,198, 28,203,
- 69, 24, 65,244,192,240,143,240,213,195,184,  3, 32,  0,188, 49,224,165,  8, 27, 65,104,145,255,194,243,225,120, 53, 11,  2,149,
-107,187,  0,199,134,242,166,143,150,192,200,176, 73, 83, 16,219, 63, 56,177,195,187, 57, 60, 57,  1,243,  7,224, 88,226,229, 56,
-239, 79, 36,136,177,178, 47,134,144,  9,228,208, 72,232,181, 76, 29,147,210, 10, 74, 46,217, 16,112,207,184, 19, 38, 29,186, 34,
- 20,  2,175,163,107,106,232,155, 33,126,210, 69,215,198, 13,156,255,  2, 80,117, 45, 61, 77, 68, 81,120, 94,157, 14,211,161, 51,
- 29,166, 60,154,130, 13,  2, 38,  4, 23, 24, 23,254,  8, 13, 63,207, 45, 59, 23,238,220, 24, 18, 18, 37, 81,211,152, 24, 69, 13,
-186, 48,172,160,133, 54,165,143,233,188, 95,158,115,238,157,162, 59, 10,233, 45,153,158,123,158,223,247,157,210,191,203, 18,255,
- 21,141,152,114,132, 34,231, 78,173,137,210,222, 52,238,175, 86, 80, 75, 65,226,203, 99,114, 54, 19,101,156, 32,200,  7,170,178,
- 70,251, 72,243,197,138, 88,118, 43,153, 58,155,248, 79,255,148,253, 13,158,201,147,237,103, 35,119,144,145,116, 52, 35,172,102,
-  8,170,169, 48,217,126,169, 44,123,139,114,135, 33,161,212,216, 10,107,129,140, 56, 33, 12, 99, 86,174,204,198,119, 64,196, 14,
-162,185,109,216,224,148, 19, 52, 38, 74,225, 69,113,103, 99,  7,202, 43,120, 57,241,221,148,184,139,237,149, 86,203,218, 24,123,
-119, 40,236,130,169,122, 62,114,239,252, 36,130, 28, 13, 78,235,143,251,164,127,148,153, 53,107,197,116,252,  8,105, 53,105,193,
- 24,204,152, 68,192,105, 65, 24, 52,106,182, 85,107, 64, 84,128,160,194, 58, 75,144, 20,128,125,232,186,121,252,229,245,166,186,
-117,250,254,109,203, 90, 31,249, 99, 36,139,  4,115,248,247,163, 52,190,188,185,132,195, 15,218,  7, 61,247,198,174, 54,  2,213,
- 71,  6,109,  6,198, 32,197, 81, 49,243,178,152, 72, 65,138, 88,137,147, 34, 77,149, 32, 68,209, 37, 28, 83, 43,185,166, 22,211,
-153,119,213, 27,160, 47,193,105,172, 50,115,179,159,231,191,150,228,236,209,254,222,171,227,151,215,189, 30, 92, 63, 47, 72, 61,
- 47,245, 33,250,225,110, 88, 28, 86,218,150,177,187,179,253,233,115, 23,108,126,217, 48, 58,157,205,139,139, 11, 73, 86,133, 66,
-190,190, 25,126, 59,255,254,226,249, 81,103,239,113,247,236,164,219,253,216, 31,222,249,126, 22,135,121,152,176,237, 78,121,211,
- 90,134, 16, 53, 24,142,209,157,229, 50, 34,214,147, 64, 16, 74,114, 57,223, 83, 92, 84,229, 42, 60, 31, 42, 33, 69, 85, 89,130,
-152,193,208,193, 82, 57,114, 95,176,213,196,210, 55, 83,230, 66, 82, 89,121, 78, 87,171, 82, 80,243, 13,156, 35, 78,195,248, 34,
-198,123,217,108,214, 92,150, 22, 61,107,178, 49, 68,250, 43, 10,  4, 23,200, 20,249,104,178, 64, 13,242,195,206,211,137, 63,134,
-139,141,108, 85, 74,165, 37,198,233,160,238,246,138,225,192,169,144,115, 33, 17, 73,128, 60, 23,238, 97, 35,205, 99, 36, 82,197,
- 62, 38,143,164, 81,195,171, 79, 82,162,226,224, 91,145, 87,202,  5,159, 21, 18, 84, 20,157,136, 99, 27, 14,100, 12, 33,194, 80,
-210, 76, 72,161, 32,152,  7, 51, 12,  3,100,161,  4,140, 42,235, 95,248, 34, 52, 51,198,245,184,188,135,239,134, 51,194,252,240,
-137,171,135, 43,223,242,114, 38,201,156, 59, 87,146,129, 50, 75, 87,225, 71,225,104,183,253, 64, 40,134, 95,167,170, 82,151, 91,
-138, 48,245, 37,184, 22,216, 94,196, 72, 43,227, 86, 94,105,  9, 66, 77, 77,175,168, 50, 56,255,  0, 61, 28,238,236, 69,255, 94,
- 85,229,173,135, 66, 77, 67,155,142,146, 34,140,162, 36,142,130,200,157, 78,  7,179, 74,173,185,255,238,195,233,201,217,155,243,
- 31,159,  6,183,125,203,112,108,219, 97,200, 21,108,225,224,234, 28, 72,140,144,254,106, 53, 77,236,114, 40, 90,173,110,218, 78,
-227,207,173,159,253,190,106, 30,174,169,203,186, 50, 14,230, 81, 12, 15,172,162,169,226, 60,191, 28,185,124, 88, 65,243, 42,188,
- 74, 80, 35, 98, 59, 38,101,116,135, 48,142, 32,119, 78,200,119,171,106,181,105,174, 87, 85,213,  3,207, 40,146, 52, 21,162,150,
- 83, 40,223, 83,234, 54, 66, 96, 70,165, 54, 18,106,133,  0, 80,215,234,200, 48, 72, 83, 83,183, 16, 68, 75,245, 59, 91, 97,  8,
-207,144, 42,134, 98,205, 92,243, 98, 15, 18,175, 57,124,233, 89,  2, 65, 29, 62,182,174,155, 34,117, 35, 36,154,216,194, 13,133,
- 67,  2,130,238,172, 90,171,179,208,109, 59,155,182,222,152,248, 83,198,244, 68,  9, 62,244,123,  5, 19,144,208, 53,131,218,111,
- 60, 20,149,176,125,174,234,175, 98,241,151,192,135,114, 55,197,242, 83, 50, 95,211,176,253,112, 86,220,247, 63,184,160,191, 84,
-202,  7, 72, 92, 14,169,100,  1,163, 80,176,217,178, 90, 99,127, 34, 46,118,247,114,183, 94,252, 79,  8,189,119,250,127,  5,160,
-235,234, 90,155,  6,163,112,146, 53, 73,211, 52,237,218,178, 58,252,152,236,  3,101, 42, 50,189, 28,234,127,240, 70,216, 31, 16,
-188,244,239,  8, 94,  8,187, 16, 84,  6, 42,138,119, 34,130, 58, 81, 68,111, 68,102,157, 48,221,218,181,179,109,154,143, 38, 75,
-235,115,206,105, 90, 21,100,151, 13,109,150,188,239, 57,207,121,207,115,158,103, 20,223,153, 50, 60,114, 90, 45, 59,101, 59,227,
-232,170,209,139,220,146, 83,  9,185, 33,150, 40, 99,109, 40,222, 59, 36, 65,167,135, 84, 89,196,216, 15,120,166, 61,190, 87,246,
- 42, 36, 13,175,132,135,213,139,185,146, 73, 72,200, 32,135,226, 84,251, 78, 82, 20,192,172,232, 67,201, 46, 63,117,244, 12,246,
- 97,215,239,  8,149, 50,245,153,165,227,111, 84,190,216,255,196, 72, 37, 90,113,134, 39,108, 99,201, 46,211, 68,112,238, 75, 77,
-205, 67,219,131, 74,190, 10,244,196,102,170, 44, 95,167,202, 57, 15,173,122,210,225, 75, 14, 89, 25,123,216, 13,220,253,222,  1,
-175, 12,148, 66, 78,217,169,116,124,220,255,208, 13,122,109,191, 43,230,118,248, 20,144,191,225, 54, 81, 81, 38,169, 10, 58,143,
-218,170,121, 43,223, 79,162,182,223,166, 59, 97, 50,237,220,204,201, 70,187,137,149, 26,162, 44,112,221, 76,221,184,183,177, 94,
-111,238, 90,166,133, 82,160, 90,156,105,123, 29,238,149, 17, 18, 75,212, 33, 18,242,133,133,149, 90,125, 43,178,176,210,105,239,
-225,139,145, 67,188,144,  4,182,113,141,141, 74, 88,215,178, 68,117, 80,  1,217,144, 91,189,  0,245,189,202, 74, 48,138,  8,124,
-227,135,251, 97,191, 90,157,189,126,227,230,179,199, 79,214,239, 62,192, 83,  7,176, 35,124,195,170, 70, 60,207,130,208,128,202,
-192, 92, 93,189,188,245,117,135,189,113,244,133,249,165,215,111,223,163, 14,203, 89,122, 54,163,160,116,191,182,182,230,148,103,
- 31,221,191,221,216,111, 33, 50,116,123, 73,183, 23, 70, 17, 21,249, 22,130, 71,222, 88, 92,152,255,240,233, 51,112, 64,194,174,
- 80,150, 89, 20,235, 86,153, 36,207,154, 54,118,  5, 96, 98,217,153,161, 38,  7, 53,168,227, 73,181, 57,233,249,255,229, 19, 41,
- 56,100, 32, 38, 46, 10, 13,130,179, 42,183,216,  5,169, 98, 72, 45,  4, 88,178,234,165,115,140,196, 78,137, 85,227,118, 43, 77,
- 80,170,153,132, 22,152, 66,186,111, 52,177,161,176, 83,133, 65, 66,164,124,152,203,173,176, 92,116, 24, 24, 70, 14,152,202, 64,
- 77, 66,163, 88,  1,  2,129, 54,106,182,209,239, 16,124,165,217,209,  4,185, 65,130,175,154,154, 36,171,130, 54, 82,105, 89,236,
- 23,199,204,115,107,142,240, 96,201,174,224,186, 32, 14,125,252,177, 40, 21,183,118, 75,204,145, 31,233, 67, 13,184,198, 24,243,
- 70,241, 37,209,160,159,254, 35, 44,234,198,210, 76,127, 24,119, 78,196, 74,166, 70,  7, 79,196,243,211,169, 11,162,103,117, 29,
-217,244,234,233,227,166, 57,253, 42,156,251, 94,143, 23, 47,218, 74,167,163,133,132,209,145,254, 85,166, 23, 91,186,225,216,150,
-157, 55, 73,167, 58,138, 67,132, 52,242,193, 35, 64,131,135,144, 61, 54,175, 20, 44,186,155, 48, 74,188,176, 23,246,125,207,111,
-181,218, 47, 63,110,223,121,120,235,233,230,243,189,221, 90,237, 71,109,243,203,187, 23,111, 54, 14,189,120,121,233,188, 97,232,
-196,109,193, 93,200,112,201, 84,166, 92, 41,169,136,  6,212,151,193,109, 25,197, 66,113,123,207, 53,190,253,156, 94, 57, 98,105,
- 83, 81,211,  3,198,192,165,150,161, 53,118,251,  1,123, 22,138,254,199,200,226, 99, 16,139,241, 99, 16,251, 41,151,122, 40,103,
-238,110, 64,220, 68,108, 49, 89,237,162,159,114,233,220,149,157,214, 14, 22,  6,  5, 31,130,203,  3,233,177, 47,159, 56,219, 34,
- 25, 50,138, 24,220, 68, 37,242, 52,242, 61,106, 89,141, 84,187,135,128,170,109,175, 13,208, 22,240,  9,240, 24, 53, 32,171, 33,
-110,224, 77, 97,169, 32, 67, 88,166, 77, 39,108,204,199, 79, 72,232, 34,  6,  2, 16, 23,117,141,181,214,228,112, 95, 56,227,248,
- 90, 92,204, 42, 81,244,  2, 11, 86,  1, 72, 78,180,235,228, 37,227, 33, 75,183,120,236,186, 58,177, 99, 69, 76,227,236,174, 77,
-240,203, 80,253,151, 75,165, 49,209,106,180,102, 80,219,253,242, 15, 82,163,246, 33,183, 52, 84,146,199, 25, 12,254,215, 95,253,
- 45,  0, 91,215,178,211, 68, 20,134,207, 76,219,105, 75,111,216, 78,161, 84, 48,186, 48, 49, 49, 17, 47,137,241,  9,136,134,141,
-137,225,  5, 76,186,144,119, 33, 62,128,110,124, 12, 93,187,193,133, 27,118, 32, 81, 20,  2,  8, 21, 74,103, 58, 51,103,152,142,
-255,247,157,105, 33,198, 46,155, 52,211,158,211,243,159,255,242, 93, 12,254, 93,153,  6,191,249,222,242, 31,157,107,116, 64,215,
- 28,253,  9, 48,208, 32, 19, 40,243,163,202,198,185, 82, 31, 45,180,150,238, 47, 45,239,159,238,201,189,234, 99,201,240,164, 60,
-175, 80,248, 51,113,198, 51,140,134,212,233, 45, 68,242, 87,206,  8,126, 89,107,222,168, 57,155,179, 44,191,174,239,157,122,193,
-192,154,168,229, 25, 38,140,100, 85,247, 22, 31, 92,140,206,225,219, 66,109,104,227,209,  8, 89, 84, 40, 29, 88, 22, 37,202,167,
- 64, 73,115,198,194, 48,160, 80,176,233,203,243, 34, 77,104,137,113,  5, 80,176, 13, 43,177, 62, 83,239, 54,187,251,253,131,  1,
- 92,125, 19, 26,202,208,124,212,200, 27,209, 97,221, 24,253, 38,134,153, 67,252,109,215, 93, 58, 30, 28,117,111, 44,202, 69,120,
-120,126, 12,194, 23,215, 80,202, 40,121, 88,171,218,246,227,225,183,221,237,195,147,  3,137,251, 26,210,213, 81,  2,175, 63, 73,
-203,199,121,  9, 82, 16, 70,141,229, 77, 29, 75,126,237,231,170,182, 28,185, 32,196,193,139,233,194, 42,143, 44,231, 10,118, 98,
-  7, 33,228, 64, 57,124,178,128,196,  4,233, 41, 37, 95, 73,210,153,148,182,150,  8,253,189, 94, 79, 54,112, 99,227,237,147,229,
- 71,191,143, 14,201,  0,130,203,153, 20,129,177,134, 72,164, 68,105, 41,111,215,223,172,175, 60, 95, 89,123,245,114,117,245,197,
-101,228,111,126,217, 44, 21,161,206, 51, 10,244, 66,123,126,237,117, 79, 37,241,135,119,239, 79,135, 17, 85, 79, 18,199,130, 24,
-153,241,139,174,151,202,161,175,191, 31, 28, 23,114, 69,148,240,105, 18, 74,112,164,143, 95, 14,116,  4, 77,214,122, 42,  1, 81,
-174,121,123, 10,250, 82,214,191,147,159,204,228,224,202, 31,198,192,113, 51,128, 57, 73,105,166,151,106,  3,162, 78,169, 25,179,
-137,  6, 27, 55, 54,140,132, 12, 43, 60,197,212,160, 41,202,130,156,220, 78,142,  1, 82, 66, 52, 50, 16, 13,246, 78,226,  8,249,
- 35,220, 77,148,249, 85, 30, 17, 36, 90, 21,140,197, 40,201,207, 44,204, 48,230, 32,182,147,217,174, 90,116,161,201,163, 17,127,
-169,221,198, 28,218,244,224, 76,200,218, 70, 68,118,167,161, 14,169,152,143,  4,144, 13, 93,204, 10, 37,127,143,129,180, 67, 98,
-212,153, 93, 64, 32, 32,  5,111,210,116,204,148,148,166,120, 72, 18,169, 82,183,214,146,  7, 73,224,148,115, 84, 42,204, 84, 74,
- 85,246, 63,199,236, 26, 35,121,  7,210, 81,174, 43,201,175,108,251,161,235,198,243, 79,207, 84,209,243,245,173,162,237,180, 19,
-213,247,168, 47,135,122, 82,118,183, 38,159,111, 53, 85,165,146,  4,129, 47,233,177,134,205, 41,192,147,168,  8,243,141,206, 45,
-244,118,242,240, 31, 72, 36,181,241, 61,111, 56,218,218,222,253,248,249,211, 88,123,119,171,234, 78, 69,117,203,170,229, 40, 73,
-112,190,238,108, 73,110,255,120,249,153, 83,130,164,129, 83,148, 98,187,224, 20, 11,205, 78,211, 98,  3,128,195, 76, 48,167,235,
-179,245, 95,251,231,183, 93, 75,221,172, 58,253, 81, 16,201, 37,170, 74,229,220,143,157,179,129, 84,207,144, 44,118,100,131,185,
-224,  0,202, 38,202,116,255,233, 34, 73,198, 56,213, 18,128, 54,208,252, 41,182, 17, 49,  0,222, 48,255,243,100, 15, 23, 48, 61,
-161,212,181,204,225,228,236,136,132, 60,182,118,105, 53,104,131, 13, 27,101,211, 32,139,218, 88, 84, 43, 54, 81, 72,130,146,172,
- 13, 74,135, 52,113,  0, 69,206, 55, 43,238, 69,116, 17, 73,196,179,149, 91,107,123,145,135, 54,163,201,200, 51, 88,223,148,170,
-111,160,125,120,181,171,109,169,251,107,165, 26, 88,108,146,140,150, 27,218, 56,184, 18, 17,163, 97,173, 48,213, 80,176,174,187,
-125,  1,128, 48,137,230,178,255, 82, 34,132,144,  0, 73, 51, 31, 44,149,  9,215,167,147,238,228,  4,212, 56,149,202,176, 56,135,
-111,  5,122,100,228,122,254, 27,226,255, 10,192,214,213,244, 38, 17, 69,209,199, 99,152, 25,102,166,237,240, 85, 10, 72,211,104,
-109, 34,213,  6, 77, 12, 11, 87,238, 93,152,184,241, 71,152, 24,127,143, 27, 87,254, 19, 93, 24,173,105, 45, 77, 26,235, 23, 77,
-106,169, 22, 10, 76,203,192,192,140,231,222, 55,208, 46,220, 17,  8,240,  6,222,220,123,206,125,247,158, 19,207, 55, 33,207,112,
-250, 96,115,250,132,252,227,181,251,195,158, 58,135,140,213, 63, 52,147,115,140,106, 91,166,196,  5, 18,250,243,244, 80, 29, 80,
-171,240, 58,101,117, 79, 41, 84, 75, 12, 21, 55,168,201, 86,211, 61, 53,176, 39,174,154, 60,227,143,157,147, 79,174,162, 72,169,
-252, 51,137,187,221, 91,171,255,237,181,241,201,167,131,147,113,232, 43, 29,253,220, 98, 97,189,184,129,  8, 18,198,197,211,  4,
- 31,223,113,247,177,144,197,133,101, 80,102,134, 99,177, 53,176,178,159, 76,198,254,145,241,148,138,154, 84,164,128, 64, 71,233,
- 58, 82,250,152,109, 70,241, 63, 24,134,149,100, 26,192,163,138, 20,154,149,230,  6, 16, 19,126,229,  9, 55,182,112,  8, 64,132,
-  5,  3, 31,113,121,135,156, 28, 26,183, 31,238, 29,237,227,211,203,185, 74,110, 49,215,241,186,212, 24, 46,249,240,134, 97,105,
-192,210, 87, 92, 22,  8,129, 35,106,229,187,157, 33, 21,109, 82, 66,115,114,164,252,103,235, 41,215,214,236,180,102,232,132,139,
- 10,142,225,166, 53, 51,157,  0,118,214,212, 16,165, 70, 23,162,235,  9,220,250,166, 46, 12,242,167, 18,195,203, 73,227, 65,227,
-233,179,231, 88,210,239,214,225,171,151, 47, 62,125,120,223,233,246, 16, 16, 72,124, 36, 68,124,167,190,206,  0,228, 59, 24,127,
-255,214,220,254,248,238,243,246,135,253,189,221,157,221,157,211,179, 19, 16,237, 96, 18, 13, 46,253,251,245,173, 71,143,159,180,
-190, 54, 95,191,121, 43,166, 64,232, 92,225,  4,145, 31, 81, 36,  0, 17, 95,118,237,131, 31,199,158,231,211, 57, 24, 85,  6,217,
-127,155,147,244,205,149,141,206,224,204, 49, 23,167, 12,171,231,243,214,242,154, 81,217,204,215,151,182,103,198,  2,229, 26,202,
-196, 92, 73,140,138,205, 69,183,132,219,  3,248, 32, 98, 87, 78,229,141,200,123, 41,153,152, 43, 51,177, 62, 23, 16, 58,169,181,
-196, 30, 61,  4,106, 73, 48,148, 70, 58,117, 45, 73,  7,161,105,178,213,166, 18, 52,187,204,197, 58,  7,116,187, 77, 65,150, 53,
- 94, 54,189, 19,168,141, 68,160,121, 55,  7,108,  9,135,213,108,173,214,219,231,237,153, 73,232, 12,107,241,210, 65,215, 44, 61,
-141,  8, 73, 83,199, 92,111, 85,206,156, 82, 41,103, 51,135,198,119,229,173,172, 31, 12,101,220,225,174, 84,241,  4,113, 14,164,
-243,  9, 77,201,129,164, 98,169, 97, 24,196,253, 93,156,236,150, 28, 55,  8, 64,133,101, 37, 87,233,121, 61, 32,  6, 42, 60, 74,
-234,208,224,163, 93,130,126, 43,153,138,239, 95,232,196, 75, 36,246,  0, 53, 70,138,177,105,151,138, 27, 13, 37, 85,116,116,212,
-189,117,199, 17,157, 46,217, 60, 78,148,195,184,182, 84,200,139,181,117, 97,101,162, 62, 88,101,159,218, 32,  3,206, 99,  4, 88,
-228,114,161, 44,220,  5,108, 38, 92,222,228,220,235,116,189, 78,175,255,165,185, 47,123,199, 85, 83, 20,117,225, 36, 69, 54, 41,
- 50, 41,225,104,212,173,213,108, 29,172,230,171,155,155,117,252,228,166, 97, 24,184, 24, 51,149, 47,231,  1, 52, 72,133, 38, 69,
-146,196,120,160,102,191, 47, 90,199,217,218,162,230,135, 65,159,240,141,233,164,100, 91,254,234,247,163,248,223,157,112,189,133,
-198,197, 71,220, 18,139, 39,107,213, 77,188,234, 13, 47, 74,217,146, 31,248,216,101,213,236, 13,203,196,117,232, 35,242, 80,141,
-240, 24,223, 80, 91,173,245, 46,187,  4, 53,176, 89,147,164,114, 95,114,203,  0, 28, 58, 18,135, 72, 84,178, 85,106, 90,227,193,
-220,180,158,118,237,204,130,237, 34, 91, 91,186, 99, 27, 22,194,183,242, 97, 99, 87, 18, 26,168, 12,249,228, 31,132, 30,193, 61,
-226,141,133,149,120, 99,143, 89, 91, 34,140,253,249,226, 99, 33,133, 51, 98, 13,101, 46,193, 96,157,120, 29,247, 87,126,169, 48,
- 24,158,143,198, 35,197,240,184,120, 19,205, 20, 76,163,217,140,147,140,174,244,165,229,117, 46, 27,132,129, 18, 98,153,113, 87,
-122, 15, 13, 62,178,110,249,245,182,201,185,124,  0,151,233,137,113,206, 10, 50,255,  9,241,255,  4, 96,235, 90,122,155,184,162,
-240,153,183, 61,143,248,145,132,152,150,132,128, 64,162,139, 10,241, 43, 42, 36, 22,253,  3,253,109,221,116, 83,169, 59,118,168,
-170, 20,117,209,150, 69, 11, 34,230, 41, 82,176,101,130,237, 56,241,140, 61, 30,103,158,156,239, 92,187,166, 85,189,178,172,235,
-177, 53,247,206,121,126,231,251,214,252, 98,218, 74, 60, 62,205,151, 45,127,219, 47,125,180,182,208,208, 80, 37,148, 10,220,226,
- 50,107,135, 38,184, 56, 84, 94, 41, 62, 91,203,133,251,102,  3,164, 65, 14,160,127,117,237,235,215,167, 47, 16,122,  8,191,154,
-177,118,128, 13,175, 29, 45, 38, 21, 41,198,171,255,145,112,187,218,190, 54, 56,239,191, 27,157,240,207,240, 86, 13,206,122,120,
-114, 96, 28,203,113, 52,154, 45, 34,133, 33, 53,244,141, 19,147, 70,165, 51,156, 13, 17,224,136, 65, 80, 14, 87, 40,176, 57,237,
-202,116,  3,255,186,144,144, 64,244,187, 56,170,130, 68,134, 95, 11,112,140, 80,222, 38, 17, 93,  2, 56, 45, 92,134,142,225, 34,
- 24, 44, 69,196,136, 13,122,134,154,187, 40,217,149,157,230, 23,163,240, 99, 14, 74,180, 84,117,210, 56,118, 59,122,126,132,129,
- 26,195,232,157,245,250,147,190, 48,103,150, 55,246, 14,199,209, 25, 31,181, 74, 95,211, 76, 20,165, 93,119,111,236,221,124,125,
-250, 82,147,146, 42, 95, 62,240, 12,243,146, 68,169, 68,  7,245,245, 82,207, 80,106, 16, 29, 87,228,227,160,  8,215, 68, 51,  4,
-236,175, 96,165,162,178, 48,160,212,148, 19,199,223,247, 31, 60,160, 45,239,233,207, 15, 79, 94, 29,255,248,195,247, 81,120,110,
-  3,208,130,  0,159,192,112, 84, 74,178,194, 54, 76,123,252,184,155,229, 32, 92,229,200,143, 31, 75,203, 66, 63,210, 52,203, 86,
-160,221,187,123,155, 40,239,254,245, 71,221, 46,154, 13, 11,221,164, 74,155, 67,162, 16,105,104,163,110,245,250,227,225, 89,200,
-187,205, 15,132, 99,250,109, 63, 56, 61, 31,168,253, 58, 25,190,212, 81,115, 95,174, 25, 11, 96, 37,159,245,158, 40,203,206,105,
- 92, 94,165,174,229,  9, 93, 48, 76,121,203,223, 13, 69,106,135,189,139,239, 52,166,  9,208,171,192,210, 96,212,133,143, 74,173,
-200,147,253,246, 65, 80,247,187,131,174,  2,183,215,141, 58, 27, 77,  9,  7,140,120, 57,175, 86,165,124, 67,249,240, 18,168,249,
-235,156, 81,225, 24,152,142,107,187,188,184,225,181, 72,106,169,  2,112,230, 36, 58,187,221,185,243,118,248, 70,  0,136, 74, 19,
-186,248,178,121,208,159,188,247,164,250,135,185,243,100,122, 17, 79, 68,  2,253, 51,  4,130,156, 47,148, 33,202, 34, 78,102,174,
-227,214, 44,182,242,139,255,232, 79,241,157,228,235,164, 89,202, 79,169,  9,254, 32,170,100,172, 87,104,167,116,161, 72, 84,122,
- 76, 58,116,110,104, 69,202,  7,234,205, 44,117,157,122, 14,241, 24,164, 17,152,230,204, 82, 83,215, 55, 96, 58,  9,204, 76,205,
- 78,146,153,174,138,178, 82,219,  5,205,181, 94,117,246,239, 81,174,255,246,251,163, 95,255,124,244,247, 96,112,119,251,187, 43,
-157, 70,117, 49,229, 45,183, 73, 11,124,143,110,221,161,189,171, 20, 46,200,241, 96, 85, 75, 33,  8,147,243, 89, 85,201,108, 26,
-  6,241, 21, 10, 28, 32,234, 13, 61, 77,243,139,249,101,153, 68,135, 46,141, 82,234,198, 20,151,212,177,232,192,161, 67,116,103,
-105,113, 78,191, 28,253,116,255,155,111,125, 15,134,220, 48, 76,155,  3, 95,223, 50, 50,225,  1, 70,106,101,207, 38,209,114, 30,
-183,118,154,227,161, 77,227, 57, 53,157,173,173, 90, 25,177,187, 37,203, 45,149,228,119,170, 88,126,149,199, 22,182, 78, 69,120,
-213,237, 31,  3,183, 74, 36,243,234, 48,118, 31, 46, 62,168,145,105,222,130,253,221,235,156,  3,157,140,223, 61,123,127, 28,184,
-190, 18, 85,226,251, 80,233, 43,249,  4,126,241, 13, 76,210,152, 67,177, 93,111, 39,185, 68,173,140,111,126,219,223,  6,174,151,
-170,105, 28, 42, 41, 50, 53,175,146,175, 52,227, 53, 33, 20,194,229,148, 18,200, 74,230, 64,202, 65, 90,241,143,106, 55,222,112,
-140,143,193,207,203,197, 26, 61,130, 66,193, 86,176, 51,137, 70,242, 21, 54,167,197,110, 99,239,227,244,116, 61, 19,162, 72,136,
-181,122,205, 91,136,106, 24,175,106,123, 45,213,249,251, 76,113, 67, 83, 56,185,127, 11, 33,168, 15,149,177, 84,195, 37,213, 58,
- 36, 80,227, 20, 24,127,  5,102,118, 67, 19,191, 89,163, 94,159,  4,160,234, 90,122,154,136,162,240,237, 76,231,209, 41,109,105,
- 74,107, 65,229, 97, 68,141,  4, 99, 98,226,  3,  3, 11,227,  6,137,137,137, 75,127,154, 91, 23,186, 48,  1, 99,112,103,162, 63,
-194,133,137, 65,147, 22, 44, 76,233,116,218, 78,103, 58, 47,207,119,238,180,  8, 27, 22,148, 73,239,220,123,207,249,206,235,251,
- 50,252, 78,176, 93, 14,127,211,250,200, 19,250,177,143,230,110,230,158,167,207, 26,104,200,167, 72,105,194,164,111,201,227,219,
- 91,  4, 34, 48,198, 57, 43,248, 94,200, 17,100, 25,118, 66,223,  9, 84,173, 85,182, 47, 76, 91,194,242, 71,  1, 93,212,156,178,
- 90,191, 49, 10,134,146,106, 40,155,231,133, 30, 16, 92,174,235, 57,244, 48, 30,100,167, 99,233,192,  2, 22, 42, 32, 60,136, 88,
- 64, 81,234, 36,193,149, 34, 70,155, 50,131,228,150, 23, 86,200,212,210,247, 96,111,  6, 11,144,231,191,114,165, 27,217, 37,  3,
-100, 38, 82,249, 25, 70,103,235,214,163, 32,153, 52,231,155,246,160, 23,160, 15, 16,166,149,110, 90,199, 57, 77,153,196,124,128,
-121, 57,209,172, 54,251, 35, 55, 68,150, 64,177, 10,112,  6,244,114, 26,213, 38, 61,170, 86,170, 51,215,138, 32, 88,199, 35,172,
-170,152, 82,178,208,187,122,189,251,230,220,182,187,131,110,200,106, 33,153, 18,  1,194,207,  4,132,230, 35, 71, 58,105,144,198,
-165,232, 83,177,242,202, 92, 33, 87,182,212,154,165, 47, 20,180, 18, 69,190, 41, 65,112, 12,216,168,240, 52,105, 48,193,237, 25,
-251,160,113,244,104,123,124,  8,165, 18,110, 91,106,212,191,125, 62,124,255,225, 99,223,241,143,126,183, 66,127,162,147, 49,200,
- 35, 10, 34,148,153,196, 41,173, 13, 97,153,174, 21, 12,  3,225,148,150,183, 12, 77,103,189, 77,203, 80, 44, 83, 41, 22,180,251,
-155,247,170,229,226,167,131,253,191, 39,103,113,146, 27,143,195,209,  8,216, 17, 12,180,116,  6,130,228,248,212,  5, 91,  3,146,
-217,113,192,149,207,116, 38,139,192,105, 81,110, 10, 39, 11, 85,166,168,147,252, 95, 86,153,100,117, 14, 58,130,139,243,139,174,
-215, 39,180, 71, 43,237, 14,207,184,236,141,127, 65, 14,132,209, 77, 38, 16,  4,168,130,152,221,241,122,184, 48,220,  2,175, 43,
-122,146, 37,214,125, 54,163,115, 96,240,144,188,248,104,229, 50, 36, 86, 30,195,238,139,122,165, 49,244,  7, 49,243, 40,140,193,
-240,149, 99, 90, 18,141, 94,252,205,107,119,219,246,159,114,  1, 80, 78,206, 25, 81,204,225,  7, 94,173,212,112,189,158,204,198,
-128, 70, 98, 54, 80,152,165, 80,176,167, 58,122, 69,244,136, 37,160,125,104,182,229,166, 51, 39,211,116,186,130,246, 19, 68, 54,
-105,202,242, 76,224,248,157,196, 81, 78, 92,232, 91,200,144, 37,143, 78,127, 69,  2, 57, 40,190, 32, 60, 34,136,128,134, 28, 93,
-213, 70,193, 32,149,220, 73,233,180,109,128,175, 50, 65,126, 19, 84, 16,161, 76,202,233, 80,193,142,150, 42, 75,207,158,190,218,
-255,242,246,240,235, 59,225,245,162, 73,188,110, 36,235, 79, 54,195,147, 30,189, 78,180,217,172,174,137,245, 59,130, 27, 15, 82,
-119,208,183, 59,  4,236,113,212,163,204,208,155,197, 74,165, 60, 47,202,166,208,243,138, 51, 62,181,123,173,174,227,157, 28,133,
- 99,247,192, 22,223,135,226,103, 32,218, 62,240,251, 50,133,140,170,240, 83,209,234,217,207,183,247,174, 92, 93, 68,125,195,212,
-138,229,185,124,211, 18, 90, 78,152,  8, 97, 98,119,228,245,  6,180,141,186,  6,242,134,138,223, 81,139,134, 58,142,100,134,217,
- 63, 15,127, 28,119,185,217,151,171,103,204, 54, 70, 33, 81, 44, 36, 64, 69,159, 12,178,139,216, 88, 28,158, 90,169, 74,223,183,
- 81,110, 68, 44,229, 68,183, 79, 87, 13,242,217, 47, 30,236,182,237,118, 16,  6, 38,129, 78,110, 45,245,  2,207,204,235, 43,245,
- 53,119,232,188,124,184,215,168, 52,126,117,142,232, 41, 59, 27,219, 69,  3,253,111,116,138,182, 55,118, 90,231,199,180, 35,215,
- 23, 86,233,242, 96, 82, 50,139,160, 16, 71,200, 44, 12,109,118,213,170,134,172,254, 42,164,223,225, 44, 95,214,148,137,217,139,
-  2,185,240,  8,245,219, 12,177, 66, 14, 51,242,232, 23,104,106,  0,240, 85,200, 15, 12,186, 88, 14,127,130,211,110,152,165, 98,
-197, 46,156, 40, 83, 55,104, 45,134,102,114,253, 38, 17,211, 68,165,108, 22,160,141,142, 80, 44, 20,178,145,132, 29,141, 52,240,
-233, 37, 20, 63,203,131, 92,110, 76, 23,255, 37,131,232,231,159,  0, 92, 93, 89, 79, 19, 81, 24,189,157,153,118, 58, 91, 59,180,
- 69, 54, 13,  9,196, 37, 16,183,132, 24,141,137,154,232, 79,244,151,248,194,139,137,190,251, 98, 12,196,  0, 69,192,165,180, 80,
-232, 50,211,118,246,241,124,223, 29,132,248,212,151,166,203,189,243,237,231, 59,231,202,191,107, 85,216,216,106,107, 13,254,183,
-204, 36,139,220,206, 15, 37, 49, 47,172, 40, 76,166, 78,197, 65, 21,217,170, 45, 28,119,219,231, 94,159,178,173, 92,240, 76, 95,
-143,210, 98, 82, 36, 65,163,  5, 18,185,164,192,171,200,200,194,156, 54,106,221,116, 81, 31,193, 90, 46,198,231, 87,197, 43, 25,
- 49,203,167, 81,122,141,212, 50,229,102,191,236,183,193,162, 86,154, 52, 47,150, 91,103,168,182, 36, 85,211,250,226, 61,  4, 64,
-201,235, 33,101,122,134, 62,222, 35, 92,226,107, 38,145, 57,187,106, 61,187,251,226,232,252,135,100,236,207,105,213,165, 44,137,
-155,121,179, 33,179, 13,203, 11, 38, 62, 21,101,190,107,207, 85,136,251,174,234,  5,211, 40, 67,246,  4,243,169,112,121,152,122,
-179,  9,173,170,243,225,227, 86,166, 72, 13,242,204,159,142,240,107,253,112,  2,107, 68,249, 12,195, 70, 34,147,114, 86,132, 63,
-100, 27, 52,142,255,186,247, 37,  8, 67, 98, 19, 75,115,124,151,212,178,102,126, 81, 82,185, 51,116,130,106,241, 19,162,168,153,
-237,143,130, 44, 80,179,137,154, 76,212, 60, 82, 45,197,116,205,106,203, 49, 92,211,152,183,107, 78,217,212, 51,205, 86,213,154,
- 80,107,154,102,106, 42, 62, 83, 45,104, 29,196,225, 65,251,251,254, 30,254,163, 91,211,203,196,228,152,149,137,105, 43,139,225,
- 14,241,203, 34, 82, 41,102,188, 68, 49,214, 64, 16,173,106,112,196,138, 67, 70, 77,145,195,247,146,221,157,131,207, 31, 63,237,
-183,143,240, 92, 33,132, 48,191, 78,174, 43,121,211,212, 42,229,236, 87, 55,154,193,171,167, 44, 58, 94,  8, 86,146,159,194,249,
-192,237, 82,  3,  7,101, 18,107,136, 80,181,199,119,162, 22, 59,220,130, 56,224, 74, 57, 13,202,132, 48,170,136, 44,196,163,196,
-249,114,  9,238,149,248, 50,185,218,125,188,250,164, 55,234, 20, 59,229,255,120,155, 81,178,113, 76,185,229, 46,195,181,193, 32,
- 41,204,227,196,137,  8,143,  0,115, 18,152, 75,232,143, 40,176,141, 26, 78,120,117,126,173, 59,232,144,110, 23,140, 36,142,173,
-138,133,175, 35, 86,169, 44,237,141, 78,241,116,109,222,126,212, 27,116,184,129, 71,235,199, 72,198,135,147,129,132, 21, 80, 95,
- 91,211,241,153,142,110,195,252,175,155, 75, 10,171, 63,167,180,234,188,212, 88,246,  3, 95, 33,233, 12,130, 63, 74,250, 35,198,
- 99,210, 68,  7,167, 65,194,  6, 44, 79,129,108,131, 33,204, 33,183,248,133, 82, 76, 35,148, 43, 86,115,193,171,176,196,186, 17,
- 51, 36,159,205, 36,171,104, 58,  7, 74, 10,236, 26,245,237,200,168, 73,203,155, 26, 26, 49,109, 42, 33,101,230, 37, 38, 60,  4,
-175, 54, 95, 39,105,240, 97,251,253,134, 45, 30,184,162, 89, 22, 90, 52,219,122,251, 50,235,245,225, 84,108,199, 18, 79,183, 68,
-189, 78, 28,  3,211, 36,243,252, 97,255, 52, 40,240,145, 82, 87, 61, 43,149,141, 70,173,161,154,134,168,155,196,186,121, 54, 58,
-236,245,199, 23,221,163,254,112,123, 44, 36,250,218,227,154,253,161, 37, 44, 85, 76, 51,209,241,196,155,231,239,214, 55,238,163,
- 54,212,225,162, 22,234, 98,142,123,  0,227, 40,185, 28, 39, 81, 72,224, 10,106,195, 83,  4,170, 14, 79, 52,199, 32,224, 47,110,
- 28,153,245, 32,252,118,220, 87,120, 11,137,  1,  0,178,213, 94, 72, 40, 73,253,106,137, 84,194,233,161,  4,165, 27,135,239,142,
-  9, 40,169,112,166,184,212, 92,232,123, 23, 97, 24, 12,166,  3, 83,183,150, 26, 75, 81, 20, 54,237,230, 74,243, 14, 30, 66,127,
-230, 91,186,121,124,118,178,220, 92,254,115,254, 19,151,181,223,105, 95,248,253,197,250,194,165, 63,216,253,189,131,144,128, 20,
-196,181,221,  9,117,123, 74, 50, 54,200, 68,197, 50,236,132, 17,180,179,100,134,  0, 40, 73,102,184,113, 75,190,145,100,102,217,
- 91, 33,105,136,210, 88, 41,238, 83, 58,102, 38, 24, 82, 72,123, 50,205,227,149,198,237,131,238, 30,197, 95, 81,172, 31,203,209,
-122, 76, 83,220,  2, 71, 24, 16,110,135,217, 21,210, 92,118,241,243, 27, 35,213,150,211,154,240, 72,175,116,205,110,159,219,122,
-141,  1, 96,133, 90,138,114, 53,138,189,  1,145, 44,253,231,226,229,203, 95,  1,152,186,146,222,182,141, 48, 58, 28,145, 34, 69,
- 73,150,183, 36,181,108, 56, 73,235,  0, 69,155, 30,122,110,255,115, 15,237, 33,183,244,210, 91,129,102,113, 27, 35,  8,144, 52,
-150, 45, 57,182, 37, 75,162,196,109, 56,236,123,223,136, 70,111,130,109, 88,228,172,223,242, 22,255,222, 29,  6, 75,244,223,233,
- 39, 54, 78,119, 15,175,238, 46,164,166,194,168, 28, 33,115, 90, 82, 86, 44, 41, 86,216,185,123,253,221,130, 26,121,149,183,145,
-223, 51,186,165, 15,182, 14,191, 44, 39,172,203,184,116, 66,109, 40,235, 30,221,151,104, 88,140,207,113,212, 69,254,139,189,189,
-211,221,191,169, 39,149,232,235, 75,130, 19, 96,110, 10, 98, 66, 17,209,229,174,142,217, 64,127,212,247,199, 63,142,254,250,173,
- 22,250,213,178, 22,151, 28,107, 63, 76,222, 75, 30, 98,181, 72,  2,187,161,198, 51, 93,207, 39,178,122,188, 69,186,248,253,239,
-151, 72,157, 42, 10, 66, 80, 39,100, 69, 80, 60,  9,216,157, 40,194,125,254,234,211, 91,105,198, 40, 76, 54,222,232,244,243, 59,
-217,111, 92,100,156,123,199,175, 85,206, 68,178,133,207,200, 54, 10, 49, 71,167, 17, 90, 16, 74,185,134,245,156,162,174,188, 42,
-143, 91, 49, 62,159, 12,159,141,167, 19,156, 77,248,159,233, 44,237,197,125,250, 91,181, 60, 28,212, 73,126,193, 92,208, 86,157,
-118,247,122,113,245,108,248,205, 44,153,183, 21, 98,234,248,167,111,127,126,241,234,215,101,166, 22, 89,201,177,104,145,227,152,
-124,190, 57,218, 57, 89,155, 91,227, 77,135,251,241,195,237,184, 31,245, 25, 67, 82, 80, 92, 27, 67, 74,148,248,  2, 33, 27,173,
-214,189,160, 50, 56,254, 12,226,110,155, 83,190,110, 69,156, 27,226, 73, 47,167,195,158, 71, 85,100,202,184,213,129,182, 33, 30,
-200,110, 68,102,241, 83, 54,202, 34,109,108,138,156,173,139, 16, 72,216, 31,149, 37, 33,192,171,116, 47,168,223,143,210,146,165,
-161,128,130,107, 84, 13,176,120,193,188,202,145,  1, 96,215, 37,212,155,163,237, 60,121,138,  2, 10,230,  3, 18,  2,108, 28, 95,
- 81, 38,200,115,218,166,171,108, 37,138, 61,  4, 95, 25,178,251,210,163,221,195,241,221, 37,198,249,108,116, 42,185,138,252,161,
-246,113, 64, 19,123,174,105,187,252,252,233, 15,167, 31, 95,183,233, 68,165,165,217,197, 97,199,201,128,179,165,168,112,  7, 91,
- 95,104,138,113,216,195, 97,122,118,254,198,121,102,224, 16, 92,107, 27,132,237,176, 14,211, 60, 21, 22,  2,139,149,255,140,222,
- 96, 52,152,228,121,222, 86, 56,200,202, 85, 24,  4,248,206,146, 22, 72,190,132,210, 89,106,138,189,173,131,105,130, 16,196,123,
-188,127,140, 36,140,200, 72,202,196, 75, 13, 93, 25,191,102, 29,127, 43,218, 94,102,139,134,171,193,146, 11,169,243,165, 21, 85,
-  3, 43,220,189, 18,239, 18, 82,  3, 69,115,203,208,117,128,104, 83,182,254, 52,194,133, 30,174, 37,135, 16,195,  3, 15,186, 59,
-201,122,145, 23,105, 99, 83,225,  9, 11,181, 46,234, 76, 17,126, 34,246,100, 90,164, 10, 36,252,193, 65,125,244,224,248,143, 63,
-127, 57,110,177,  5, 58,175, 84,132,247, 40, 19, 69,209,  8,221,193,168, 15,135,234,224,145, 42,156,218, 55,219,179,174, 10,114,
-239, 59, 74, 88, 68,178,152,206,150, 95,221,116,212, 94,172,118,251, 59,131, 24, 65,140,241, 59, 51,171,141,178,129, 16,193,113,
-196,206, 69, 13,188,235,171, 46, 46, 24,114,218,173,223,143,124,228,143,237,128, 18, 52,120,137,235, 84,153, 82,208, 21,156, 51,
- 42, 52, 98, 85, 44, 91,200,170,112,172,171, 40,196, 21,209, 46, 75,172,180,237, 40, 90,152,116,163,  7, 86,253, 79,145, 80, 36,
-197,197,188,116,141, 95, 98,181, 99, 34, 16, 59,102,  6,249, 40,150,131,254,250,209,201,229,108, 60,186, 62,247, 85,128,200, 44,
-208, 65, 86,172,199,179,201,147,  7, 79, 61,178,198,219, 87,243,  9, 29,  5,130,240,203,108, 60, 79,238, 30,110, 99,  6,167,131,
-206,224,249,147,239, 46,110, 47, 17,228,176, 93,111,171, 85,182, 60, 27, 77, 49,230,123,253,253,236,110, 93,107,103, 96, 67,156,
-140, 83,  8,108,104,210,174, 47, 40, 66,231, 72,179,136,  6,118, 21,104,223, 39,216,103,211,  2,181,247,204, 37, 98,187,233, 85,
-112,121,123,142,  0, 92, 82,246,194, 85,250, 58, 65,188, 34,202,220, 33,110,154,118,176,251,150,166, 66,173,155,170,140,150, 93,
-237,188,126, 55, 80, 94,185, 37,210,124,105, 93,203, 82, 10, 53,181,128,106,170, 13,243, 67, 53,248, 72,175,110,140, 43,238,153,
- 82,255,  9,192,213,181,236, 54, 13, 68,209, 25,219,177,199,118,211,216,105, 30, 45, 45,173,  2,168,106, 23, 32,  4,136, 10,137,
- 71, 43, 86,240,  7,176, 97,  1, 72,124, 26, 95,193,130, 13, 66,168,162, 69, 32, 80, 21,104, 69,219, 52,105,146,230, 81,219,117,
- 98,199,230,222, 59,166, 84,172,179,137, 61, 51,215,231,220, 57,247, 28,137,223, 19,129,182,  6,140,108,234, 82, 50, 59, 36, 65,
- 18,187, 48,138, 66,  5, 85,232,226,240,228, 16,155, 62, 92,254,165, 68, 33,163,165, 65,128,115, 40, 42,203, 68,250, 26, 87,209,
-157,  3,157, 16,227, 98,190,232, 97,235, 80, 93,172,212,  6,193,  9,177, 96,207,214,167,224, 49,150,231, 87,209,157,  7,243, 25,
-162,236,166, 42, 83,137, 82,179, 73, 65, 41, 94,253,104,135, 76,198, 51,134, 98,225, 85, 85,132,185,149, 82, 30,207,101,  3, 79,
-177,117,115,161, 84, 91,191,190,222,234,183,147, 73, 36, 12, 43, 70, 31, 31,245,188,149, 85,154,174,  4, 33, 48,235,164, 90,168,
-158,134, 94,150,243,196,161,112,  7,205,193,241, 36, 51,173,207,156,232,101,242, 58,206, 55, 77,226,194,148,211,247,251,240, 59,
- 16, 23,140,118,131,195,163,219,152, 64,141,178, 45, 92,175, 91, 87,110, 11, 67,248,161, 55,235, 94, 66,  9,144,170, 30,118, 15,
-224,201, 37,104,  5, 32, 25,132, 62,249,130, 26,240,164, 64,226, 96, 31,220,185,186,182,211,252, 81, 48,221,238,217,201, 94,123,
- 47, 78,198,183,107,119,201,255,168,111,229,140,162,229,194,235,191, 86,173, 89,194,106,244,246,161,102,124,233,215, 63,214,119,
- 63,212,247,182,127, 31,236, 52,143,182,142,154, 63, 59,157,250,113,155,161, 12, 30, 96, 72,194, 13,107, 28, 33,208, 40,  8, 99,
-198,178, 22,167,167,203,192,  0, 76, 81,177,196,172,101, 94,118,236,146,101, 20,128,205,106,128, 50, 82,224, 72,176,204, 80,169,
-130, 16,209,125,140,205, 12,142,206,177, 42, 23, 34, 45, 76,165,121, 19,  0, 84,202,199,172,209,  8, 14,186,  1, 74,128,128, 14,
- 72,  3, 39, 12, 42, 17,142,233,222, 91,126,208, 26, 30, 83,170,  6, 55, 48, 56,  8,248, 58, 42,204,132,102,234,134, 25,199,145,
-146, 89, 68,100, 83,158,138,212,165,  2,199, 50, 29, 77, 81, 80,139,166,106,116, 25,133,213, 80,  0, 71,209, 40, 57, 80,198, 45,
-164, 50, 64, 30,129,252,147,181,167,219,245, 45,132,173,210, 48, 68,242,119,248,119,201,  8, 77,190,209,114, 75,  0, 22,132,115,
-235, 78,205,  0, 74,130,117,133, 37,155,115, 47,119,134, 45,168,170, 47, 30,191,250,252,107, 19,165,218, 36, 92,159, 45, 46,148,
-243,101, 47,240,201,154, 10, 83, 76,201,199, 52,148,151,104, 99, 12,212,197,171, 88,160,113,168,201, 73, 83,192,248, 40,234,192,
-182, 17,198,155,204, 57,243, 80,119,112,252,  2,239,181, 34,158,254,157,166,145, 54,146,132, 76,128,230, 78,178,192,102, 84, 34,
-186,246,140, 15,251,159,168,245,195,213,141, 32,196, 56,116,248,150, 88, 57, 75,106,  1, 97, 63,220, 88,186,185, 79,190,  8,179,
-206,  2,214,  5,169, 30, 73,  1, 13,152,110,190,  4,251,  7,205,242, 80, 74,133,167, 21,133,145, 60,209, 57,127,180,114,239,211,
-230,219, 57, 45,122,239,177,119,125,214, 28,177,121, 53,221,120,184,150, 14, 60,213,208,249,173,155,172, 84, 70,240,126, 54,102,
-240,141, 30,156,246,218,141, 48,194, 68,221, 88,134, 36,209,110,215,109,199,210,114, 57,219,128,253, 13,252,180,121,216,110, 14,
-189, 97,183,253,221,147,221,105,116,217, 93,214,217,125,151,  9,133,181, 70,172, 23,178,231,207, 94, 58, 43, 53,  6,165,220, 52,
-228,140, 22,250,202, 27, 80,120, 21, 60,151, 26, 78, 20, 41,182,  8,142, 26, 90,111, 55, 87, 41, 49, 91,199,209,242,201, 36,232,
-120,187,251,167,222,  4, 35,222, 51,143,132, 36,141, 57,221,183, 82, 45,115,109,199, 31,157, 17,156,242,  1, 36,189,126,242,  6,
-222, 67,103,208,133,165,104,245,154,176,154,139,213,165, 83,168, 78,105,188, 80, 90,204,155,121,  0,248,237, 65,203, 15,209, 16,
-184, 63,236,214, 42,181,185, 98, 85,211, 69,111,208,  1,140, 12, 31,  6, 91,183,190,254,254,  6, 44, 92,182, 89,228, 29, 15, 89,
-144, 34,201,132,195,  8,199,124, 38, 95, 70,217,251, 56, 76, 50, 40, 47, 91, 53, 36, 73, 33,209,220,136,122,  6, 23, 47, 47,149,
-127,137,234, 50,172,  0, 13, 62,131,216, 39,175,211, 40,205,230,150,101,131,135,  3,230, 82,168,255,192,206,189,145,201,172,132,
-114,125, 21,118,161,178, 75,213,172, 28,187, 85,169,115, 66,166, 73,156,166, 55,210,127, 22,123,231,142,117, 23,144,250,127,205,
-153,243,159,255,  8,192,213,181,180, 54, 17, 69,225, 59,115,103, 38,147, 73, 38, 77,155,180, 53,161, 85,172, 21, 31, 85, 68, 65,
- 16,193,149, 27,193,189, 11, 93,248, 19,220,  8,254, 45, 65,252,  1,226, 66,161,180, 82,138, 45,138, 36,109,146, 54,109,146,102,
- 30,201,100, 50,153,151,231,156, 59, 81,113,215,210, 69,195,220,155, 51,223, 57,231,123,100,243,153,130,106, 66, 67,132,240, 10,
-211,236, 98, 97,149, 41,205, 95, 80, 98,214,  3, 87, 98,227,210, 13, 63,152,  8, 26, 89, 49,103,112,142, 17,104, 70, 46,143,242,
- 63,241,104, 24,198,218, 38,164,224,162,193,142, 54, 13,200, 79, 74, 74,201,  5,144,211, 71, 79, 81,  6, 39,241,158,211,229,169,
- 60,103, 50,207,243, 59,232,157,137, 61,157,162, 39, 25, 47, 88, 22,246,  6,197,188,137,201,135, 12,  0, 65,142,156,166,255,104,
-155,208, 33,104,224,244, 26,103, 13, 56, 39,184,174,183,234,183,186,118, 87,180,183, 34,192, 30,157,  3,104, 71,226,248,163, 36,
- 27,  0,226,170,117,158,  5,137, 71, 66,251,244,152,220,232,177, 37, 71,  3, 67, 13, 10,247,  8,199,127,178,  4,197, 87, 81,160,
- 37,213, 28,207,169, 87,214,205, 66,121,132,146,  7,118, 58, 60,233,187,  3,180, 73,242,156,139,241,  5, 46, 84,147, 20,176, 60,
- 42, 53,200, 22, 59, 68,177,114, 44,252,109, 48,121, 59,138, 26,131,  6,124,164, 90,185,238,250, 14,  2, 94, 18,122,244,  0,201,
-166,233,213,213, 77,119, 58,130, 94,175, 53,108,182,172,134,156,170, 27,181,245, 68,179,224,171,  3,255, 27,218, 17, 55,  9,220,
-153,119,238, 89, 77,123,184,123,218,249,212,104,236,180,218, 65,196,172, 89,120, 58,154,254,178,172,207, 71,157,253,238,217,135,
-195,230,215,102,103,187, 55,248,230,218,251, 67,203, 10,166,143,215,107,245,165,210,162,174, 47,231,243, 38,207, 25,146,106, 72,
-202,162,170, 20,101, 94,214,184,  1,125,134,170,192,119, 88,215,152,174,240,145, 29, 29, 54,236,142,237,139,117, 92, 44,  2,237,
-105, 76,142,235, 95,153, 31,116,246,208,198,139,238, 17,102, 46,162,199, 41,190,240,176,240,  9,126,250, 60, 81,145,252, 84,196,
- 24, 13, 41,107, 24,118,136, 18, 77,148,198,196, 44, 89, 49,151,225, 88,252,153, 23, 39,161,208,  4,102, 42,229,108,190, 45,237,
-254,220, 33, 58,138, 12,224,174,190,184,102, 67, 47, 72, 60, 74,209,216, 98,114, 12, 14, 79, 19,168,146,208,170, 19,184, 97,208,
- 95,235, 90,  1, 10,129,202,181,239, 71,251, 80,136, 85,232, 85,  8, 65, 89,227,225,221, 43,119,131, 40, 64, 77,147,196,171,197,
- 42,224,113,210,197,204,  4,193, 92, 68, 62,160,130, 31,  3, 45,112, 73,130,162, 45,218, 20, 93, 91,221, 60,185,104, 11,129, 85,
-  6,230,228,108,251,144,215, 13,130, 35, 72,244, 68, 54, 78,154,148, 40,137, 16,211,180,  2,143,148, 48, 88, 92,218, 23, 45, 51,
- 87,240,195, 41,224, 83,232,146,123,  0, 57, 49,216, 44, 57,119,187, 18,  6,224,112, 64, 66, 81,  6, 34,201,138, 35, 10,253, 96,
-140, 30,190,232,231,194,137, 25, 38, 43, 72,214,150, 75,154,246,232,250,131,230,222,199,169,196,222,219,108,152,178,179,152,221,
- 54,249,243,103, 79,216,112, 44,175, 84,216,131,251,248,212,189,144, 77,124, 54,  9,103,174,227,246,219, 33,113, 91,133,159,167,
- 80,108, 41,186,161,104,133, 18, 28,100,181,200, 76, 67,237,187,205,190, 19,185,125,107, 60,233,147,241,208, 37,206,158, 47,178,
-173, 34,194,244,230,152,229, 75,213,215,111,222,177,229,  5, 44,232,240, 86,128,174,  1,126,200,113, 28,193,115, 92, 47,100,230,
- 79,138,100,111,127, 41,234, 51,190, 86, 97, 57,149,168, 30,177,119,108,255,232, 56, 19,228, 17, 49, 50,  1, 67,164,170,202, 74,
- 25,122, 23,108, 92, 72,210, 69,109, 95,189, 82,235,219,253,175,  7, 95, 90,131, 86,217, 92,184,115,249,102,173,178,  2,135,178,
- 82,172,246,144, 86,199,  1, 35, 98,178,  2,149,187, 87, 79, 95,250,161,223, 30,156, 12, 39,184, 75,187,119,231, 97,247,180, 13,
-183, 14, 30,242,234,210,234,185,221,123,247,226,237,205,181,173,227,222,209, 36,244,  1, 89,  6,209, 20,110,186, 23,192, 75,151,
-195, 97, 77,102, 30, 57,188,139,100, 23, 86, 54,150, 34,180, 98,143,  5,191, 29, 58,108, 54,207,100, 22,244,113,150,254,111,  0,
-  6,191,151, 75,213, 32,240,209,112, 70, 34,211,168,108, 65,147,  9, 77,179, 33, 27, 19,228, 89, 66, 61,  8,166, 21,168, 52, 26,
-154, 71,168,100,178, 61,119, 31,158, 19,183, 36, 10, 94, 35,183, 55, 57, 77, 98,246,215,150, 78,146,255, 41,203,255, 44,105,255,
-248,244,253,253,195,111,  1,184,186,150,222,166,177, 40,124,253,186,182,155,212,  9, 41, 41,180,208,150,  1,169,170, 40, 98,  1,
- 93, 32,182,108, 88,  0,107,164,153,221,252, 71,196, 14,137,  5,  8, 86,136,  5, 26,164, 78, 59,130,180, 73,154, 87,237,216,142,
- 29,199, 54,231, 59,215, 46,210, 72,221,181, 77,147,250,220,123, 94,223,163,186,223,153,  6, 70,205,124,  2, 73, 85, 16,180,157,
-188,150, 10,209, 43,111,109, 92,224,211, 16, 34, 59, 26,215,197, 43,142, 17,199,180,125, 42, 90,117,136,141,108, 95,219,  9,147,
-192,145,107,149,141,  3,221, 92,106,177,200,250,195,244,103, 61,215,227,186,  6, 47,213,110,118, 18, 96,149, 84,  6,  3,196,248,
-134,183, 21, 38, 62,128, 50, 80,129, 87,174,123,122,109,233,141,212,  6,251,233, 34, 99,171,245, 92,109,172,202, 10,116,  8,  0,
- 15, 34,159, 89,  9,244,204,206,103,231, 53,253, 69,165, 41,109,187,179, 29, 81, 12,149, 42,141,227,135,119,186,123,195, 96, 64,
-133,182,180, 36,150,151,140,110,239, 52,174,251, 88, 30,  2,249,174,160,214,138, 89,174,176,112, 60,185,162, 54, 80,167, 75,124,
-  6,223, 47,165,238,141,149,  3,189,103, 58,207,149,243,142, 40, 93,185, 22, 47, 99,166,152, 98,  9,238,185,237,136,171,248, 44,
-163,  6,190, 92,163,239,166,201,206,198,238, 69,112,209,144, 13,  6,240,161, 20, 48,117,155,222,249,193,237,  7,223,206,190,222,
-233,238,  7, 73,208,148,157,225,124, 56,142, 23,203,172,176,216, 15,213,150,194,146,176, 75, 86,126,155, 82,152,174, 97,  5,154,
-248,114,252,223,201,176,255,243, 98,236,227,148, 20,185,101, 59,158,103, 83, 78,  0,197, 70, 27,132,139,143,199,103,147,176, 60,
- 29,173,250,  1,203,125,165, 69,184,  2, 64, 38,165, 30, 60, 55, 50, 16, 64,202, 36, 41,253,203, 98,116,145,159,244,210, 97, 16,
-177,114,139,178,110, 64,177,107,234, 20,136,121,211,245, 40, 85,115, 69,105,176,200, 70,169,118,146,182,229,218,216,119,173,116,
- 69,133,214, 43,  3,  6, 54,200,194,120,193,212,192, 81,162,180,103, 96,252,178, 84,150, 14, 57, 79,150,213, 63, 77, 26, 78,229,
- 29, 82, 55,142, 74,175,149, 94, 66,234, 14,157,225, 73, 56,186,138, 99, 77,201, 17,176,203, 54,176,204,114,141,167,171, 13,165,
-230, 31,196,190,174,244,126,  5, 70, 70,  2, 87,240, 58, 53, 76,113,186,232, 79,123, 11, 42, 18,161,140,190, 74,243,213, 50, 77,
- 33, 39,171,213,210,142, 56,124, 57,  6, 78,101,237, 37, 12,230,176,148,134, 69, 13,  1,147,233,240,153,154,204,231,186,146,203,
-110,187,173,104, 17,138,223, 26, 82,152, 22, 98,250,169, 91,135,123, 15,199,254,200,115,240, 44, 74, 22, 41,212,117,115,153, 37,
-211, 96,164,240,157, 90,181,108,192, 66,130,  5,103,216, 11,138,167,172,183, 55,118, 98, 40,226,105,138,188,  1,225, 48,129, 25,
- 29,252, 61, 74,241,240,214,254,229,233,123,234,136, 63,197,162,193,130,115,143, 91,222,139,103, 79,180,249, 92,220, 63, 16,119,
-239,138, 36, 19,139, 20,245,123,146, 37,179,145, 63, 25,100,106, 83, 89,172, 42, 73, 63, 96, 30, 76,171,209,150,101, 97, 83, 98,
-191,217,110,  9,109,220,155,142,163,240,145,225,123,162,120,188,174,253,121,179,124,218,194,103,234, 45,196,247,137,120,249,252,
-245,225,223,127,  9,232,106, 72,212,  2,166, 86,125,169,226, 93, 71,193, 41, 28,163,152, 77,198, 31,222, 93,223,223, 18,221, 54,
- 18,  0, 75,194, 70, 39,211,247,199,231, 70,237,112, 93,178,154,222, 10,138, 23, 49,147,117, 42,192, 52, 29,240, 52,203, 54, 91,
-155,116,183,186,146, 74, 14,115, 30,207,255, 29,156, 70, 73, 76,213,247, 56,154,189, 58,122,217,159,246,215,157,230,102,123,235,
- 50,156,132,241, 98, 48, 57,167,180, 77,177,103, 11,217, 59,251, 33,184,144,178,165,123,111,235, 15,122,112,111, 62,191,253,222,
-251,103,204,115,182,189,238,238, 52,156, 58,172,121, 78, 45, 66,156,198, 71,247,142, 40, 90, 50, 80, 38, 17, 57, 32,255, 50,190,
- 86,209,160,121,166, 85,220,234,236, 94, 70, 51, 85, 47,182, 26,215, 82, 40,100, 80, 35,203,156, 80,248,179, 80,209, 29, 66, 60,
- 18, 78,105,248,213,117,135, 50,166, 14,214, 78,205,237,110, 57,157, 20, 52,230,154,243, 33,196, 70,179, 11, 99, 43,116,192,162,
-168,128, 51,229,255,188, 53, 40,  2, 93,179,  1,210, 75,101, 99,121,197,249,168, 54, 57,218,239, 37,235, 21,120, 70, 65,143,213,
-148, 91,252, 18,128,173,107,233,109, 26,139,194,247,166,118,252,138,157,184,105, 83, 53, 64,105, 21,205, 84,  8, 10,165, 48, 84,
-  3,236, 24,254,  0, 27,118,136,223,128,208,252,142, 89,240,111, 16,136,213,108, 25,141,  6, 88,192,204,208,210, 14,105,226,198,
-118,252,182, 99,123,206, 57, 55,225, 37,164,170,139, 72,173, 31, 57,207,123,190,239, 59,130,191, 90, 27,138,217,111,247,109, 99,
- 25,194, 22, 18,190,185,  4,241, 93,140, 38,145,132, 76,146,176,170,140,194,141, 13,244, 40,133,104,123,  8, 13, 33, 60, 12, 39,
- 40,122, 49, 77, 61,129, 11,174,  4, 32,130,162,252,185,149, 77, 63,158,128, 77,195,159, 67, 45, 44,214, 16, 67, 13,180,214, 89,
-  7,135, 39,114, 44,210, 65, 33,252, 33, 80, 31, 59,  3,174, 54,181, 27,131,155, 31, 78, 15, 62,157,109,126, 18, 96,227,115, 58,
- 50, 26,136,132,106,203,124, 89,183, 85,197, 88,177, 86, 17,144, 67, 42,125,155,171,131, 24, 69,101,249,154,189, 30,162,215, 97,
-109, 14,206, 79,196,208,185,140, 83, 75,183,252,208,219,221,218,131,155, 63,211,221, 24,186, 31, 69, 52,191,188,117,245,253,232,
-111,120,174,157,243, 87, 62,226,135, 69, 27,101, 70,178, 26,207, 51, 10, 47,154, 72,146,108,234, 86, 10,169,162, 98,150, 97,151,
-228, 47,219,103, 47,185, 52,116, 21,249,189, 99,118,135,254, 49,201,173,212, 98,229,138,174,234,121, 89,128,193, 65,209,241,211,
-224,198,195,187, 15,158,253,249, 12,190,  8,  8,179, 96, 10, 89,153, 83, 49, 66,192,123, 73,238, 89,107, 89, 89, 52, 27, 77,168,
- 64,211, 25, 34,186, 78,162, 56,137, 43, 63, 46,131,136,133, 97, 29, 69,117,154, 67,232,173,147, 12,121,219,141,154, 59,211, 16,
- 92,161,183,172,217,109,195,130,126, 74, 85, 33, 48, 26,170, 44,163,188, 14, 54, 89,154,140, 90, 24, 27, 22, 92, 43,134,212,146,
-196,178, 27, 20, 78, 48,117,220,120, 56,137,142,198,254,209, 56, 56, 26, 77, 15, 71,254,193, 56, 56,158,248, 97,154, 67,153,131,
-104, 61, 92, 46,197, 69,154,166, 58,126, 70,164, 30,156, 40,146,  2, 45, 47, 27,115,133,114,184,207, 21,163,135, 74, 76,104, 97,
- 75, 96,238, 89,153,217, 70, 55, 39,178,177, 56,104, 70, 72,126, 89,252,122,239,241,171,247,175,107,154,168,227,198, 55,146, 87,
-133, 26,106, 86,101,221, 86, 79,150, 36,104,207,161, 92,104, 54, 21, 40,117,193, 15,117,165,149,206,226,182,218,  1, 39,132, 10,
-182,165,154, 25,  2,111, 24,137,223, 98,139,143,164,237,196,173,197, 68,133, 45, 73, 40,158,165, 64,169, 11,191,123,118,191,163,
-119,112,133,192,172, 72,139,196,110,117,224,114,152,  6, 80, 88,177,  9,126, 14,  6,188, 98,174, 34, 65,175,174, 84, 73, 39, 44,
- 92,181,179,113,237,116, 58, 86,112,135,157,  6,161, 89, 83, 52, 63,114,119, 54,175, 66,235,166,171,184,103,124, 46,152, 35, 30,
- 29, 81, 97, 41,251, 82,183,157,207, 81,  6,240,206,156,192, 33,224, 52,228,255,156,  0,163,156,126,112,122, 10,207, 69, 51,158,
- 82, 80,210, 33,235,236,110,236,121,225, 68,148,138, 68,155, 74,224,219, 21,138,146, 84, 19, 83,219, 75,234,214,208,165,220,190,
-176, 31,252,243, 28,226,223,239,152, 89, 48,190,223, 31,244,111,253,124,137, 21, 57,187,118,133, 89, 54, 30,206, 68, 57,139, 51,
-  6,175,111,244, 95,232,141,102, 52, 40, 38,129,135,133, 30,125, 85, 42,134,197,151,224, 86, 16,187,202,206,116,251,105,241,118,
- 24,200,153,123,183,149, 93,110,213, 23, 45,156,158,255,155,214,127, 57,172,221,238, 61,250,237,  9, 27,172, 99,124,111,200,223,
-209,162,149, 72, 64, 80,145, 39, 79, 95,168,217, 88,191,184,201,108, 13, 63,164,173,190,241,155,209, 31, 71, 30,237, 28, 71,229,
-252,  5, 19, 84,140, 56,185, 80,238,162,131,  8,102,106,173,211,216, 75,178, 56, 47, 10,200,235, 96,  6,120, 58,215,212, 58,166,
-237,120, 14,116,161, 40,206, 82,205, 78,220, 19,134,  7, 86,208, 59,240,177,239,252,178,119,231,229,187,151,219,103,127,220,223,
-222, 63, 28,125,176,116,115,120,122,226,134, 30,252,135,235, 63, 92,135,250, 29, 46,177,190,124, 14, 26,110,108, 22,107, 22, 36,
- 83,120, 33,120,154,138,253, 57, 35,  2, 93, 13,205,132,161, 91, 21, 70, 54,132, 84,161,252, 53,175, 53,  4, 95,132,243,  5, 28,
-245,124,147,  1, 20,178,186,106,153, 40,152, 19,193, 35,224,136,133, 68,162,192, 40,210, 44,105, 32,171, 93, 76,122, 48,  8,164,
- 72,171,230, 95,108,190,131,114, 42, 69,225,154,197, 26, 66, 48,  6,154,249,149,223,192, 97,138, 10,183,180, 44, 22,194,240,197,
- 66,108,254, 85,136,255,172,208, 52,135,118,241,133,  4,205,255,  2,208,117, 45,187,109, 27, 81,116, 40,206, 80, 18,101,138,182,
- 30,136, 20, 59,178, 93,195, 85,144, 54, 73, 19,  7,136,211, 46,130, 34,  8,144, 44,188,200, 42,139,254, 74,209,125,255,160,191,
- 80,160, 63,208, 93, 23,221,116,215, 38, 14,210,  2,181, 27,203,174,100,209,178,100, 61, 76, 82,124,230,158, 25,202, 13, 16,244,
-  3,108,105, 70,119,238,156,123,231,220,115,178,249, 85,134,186, 59,162, 88,172, 89, 53, 41, 45,206,101,155, 27,109,234,162, 40,
- 65,198, 75,211,175, 87, 90, 83,202,224, 82,  3, 68,232, 98,185, 84,129,229,152,160, 51, 80,144, 10,218,186,105,148,148,146,178,
-208, 33, 52,253,242,241, 55,251, 71,175,232,252, 16,188,122,248,233,163,238,224, 36,235,228,235, 20,  0,133,243,153, 19, 64, 25,
- 23,255, 33, 82,  3, 41, 57,189, 92,180, 61,120, 40,207,193,127, 79, 23, 66,  5, 90, 38,184,172,120,169, 20,161,123,143, 94,244,
-135, 61,169, 17,175,209,198,209, 47, 33, 11,219,104,181,178, 38,132,209, 25,188, 83,157, 77,217,248, 78, 50, 72, 38,169, 31,153,
- 41, 59, 76, 57, 92,250,160,238,168,231, 71,243,195,254,225,103,173,219,206,164, 31,196,241,240,114, 84, 70,146,180,157,177, 67,
- 81,101,230, 45,219,180, 47, 32, 15,155,214,202, 13,169, 19,153,206, 99, 47,149,198,204,141,229,166, 23,186, 62,158, 54, 35,130,
-165,224,198,196,208, 47,245,231, 46,  1,119,203, 92,206,131,139,237,211,229,188, 90,105, 16, 24,113, 70,125, 90,227,147,187, 79,
-127,252,245,167,178, 89,222,172,111,210, 81,165, 84, 78,193,212,170,110,160,117, 35, 29, 29, 59,131,  3, 47,240, 39,254,136,238,
- 45,218, 10,171,104,  5,220, 71,181,164,167,130, 99, 97, 33,196,119,210, 32,132,241, 30,213,185,148,190,133,224,117,171,100, 24,
-194, 52,140, 21,194, 60,  5,221, 40,242,178, 52,216, 44,  9,141,146, 59, 28,127,120,174,160,  9, 12,228, 83, 89,138, 22, 65,217,
-151,  2,144,208,  6, 72,165,254, 66,162,138, 75, 74, 40, 34,196,156, 99,114,127,243,171,206,217,209, 21, 97, 88, 48, 81, 54, 87,
-148,255,153,218, 76,138, 13,202, 23, 69, 65, 16, 27,102,117, 50,208, 19,218, 52,229,238, 45,135, 66,233,146, 75,120,142,111, 55,
-111, 17,120,167, 11, 30,179,199, 76,252,213,125,203,113, 44, 21,197,149,209, 77,  6,171,  0, 76,108,  7, 65, 56,191,211,186, 55,
-113, 39,170, 61, 74,223,137,138, 42,170, 24,230,145, 43, 79, 96,156,231,  5, 24, 50,196, 49, 91,196,  4, 90,127,137,154, 40,193,
- 58,224, 72,147,134,237,213,118,119,120,226,122,147,177,127,209,168,172,230,128,149, 48,185, 73, 43,161, 26,220, 20,166, 23,121,
-161,236,179,211, 61, 68,139,191,179,190, 67, 23,  3, 33,104,250,  2,253,241, 41,100, 26,133, 65,105,135,192,157,139, 81,198,184,
- 63,234,129, 24,131,103, 52, 28, 13,216,140,164,  0, 61, 75,104,185, 64,104,140, 67,154, 87,207,104,108, 25,205, 82,151, 54, 99,
-224,215, 23,242, 69,202,249,166,177,148, 61, 68,107, 84,161,250, 85,171,174,170, 88,217,116, 74,157,233,169,244, 36,145, 47, 75,
- 80,234,101, 28,200, 29,189,172, 21,179, 26,196, 30,231,204,160, 35,105,216,113,228,127,253,249,151,163,222,235,182, 54,253, 39,
-226,199,  1, 43,176,244,187,221,246,218,118,139, 45,153,236,254, 14,146,  0,129,119, 36,119, 66,241,151,147,127, 15, 93,247,146,
- 45,172,116, 64,133, 72,149,222, 48, 90,210,162,100,231,146,164, 72, 27,218,180,141,134,109, 13,252,223,135,243,233,197,184,192,
-216,225,101,242,247, 44,218, 63, 35,188,106,126,251,253, 15,230,222, 19,217,203,230,255, 51, 15,143,159, 52,252,227, 77,247,151,
-159,111,220,251,132,109,214,152,105,224,212, 71,  0, 72,231,191, 29,239, 15,102, 58,210,187,244,153, 75,149,159, 75,230,189, 71,
- 91,189,126,109, 99,134, 51,155, 98,142, 44,205,230,219,149,181,179,224,249,173,230, 86,239,252,148,246,102,247,139,199,185, 56,
-126,123,242,103,213,174,231,228, 16,211,133, 59,162,163,212, 57, 59,166, 63, 63, 29, 59,  7,221,131,218, 74,253,120,208,161, 88,
-213,225, 32,110, 52,110,172,131, 66, 39,237, 20,  9,191, 43,225, 35, 10,248,231, 15,158,117,156, 35, 53,105, 68,159,187,221,188,
- 57,241,166,195,217, 64, 66,230,248,230,218,237,193,216, 73, 37, 65, 94,  1,103, 16,226,101, 99, 67,234,229,193,207, 14, 20,  3,
- 40,215,224,129, 48, 89, 52,101,212,235, 75, 40,221, 37, 53, 41, 34,148, 53, 44,217,194, 87, 80, 81,184,254, 51,216,  5,159,  8,
- 19,234, 31,232, 15, 47, 28,130,241,218,100,153, 22, 76,  3,175,104,145, 87,216, 93,145,178, 22,131, 84, 31,101,121,237,189,  0,
-124, 93,219, 78, 26, 81, 20,157,155,140, 48, 80,174,138,130, 10,216, 24, 77,107,171,166,233, 83,147,190, 52,105,210,183, 62,250,
-  5,253,137,254, 68, 95,251,  5,237, 87,244, 23,154,104,236,139, 87, 82,111, 48, 32, 50, 48,204,192, 92, 78,247,218,  7,232, 75,
-211, 55, 35,193,113,102,206,217,123,237,125,246, 90,107,198, 95,197, 80,193,152,128, 26, 45,110, 40,217,134,115,241,144, 88,122,
- 31, 91, 11,105, 90,116,158,239,210,114,165,  7, 10, 17,125, 66,144, 20,218, 68,136,112, 16,249, 76, 33,231,188,204, 14, 59,180,
- 57, 79,154,199,244,  3, 79, 98, 41,118,255, 14,131,243, 59,111, 59,131, 86, 44,217,254,236,235,196, 34, 12, 19, 30,116,  3,185,
-192, 52, 48,152,200,231,162,234, 94,253,160,235,118, 21, 49, 55,190, 65,185, 77,137, 97, 57, 87,253,213, 60, 26,142,134,134,206,
- 10, 24,124,225,181, 66,109,132, 14,123,252,234,233,235,148,145,236,129,222, 70, 41,198, 96,254,177,144,178,110,202, 76,144, 52,
- 22, 76,181,101,251,189,144,103,180,232,165,250,193,100, 37, 87,233, 14, 59, 56, 57,141,198,142,231,208, 95,160,128,110,247,219,
- 82,197, 12,193, 75,210, 28,152,158,155, 79, 23,237, 65,155,222,226,179,141,221,253,250,254,233,253,233,251,131, 15,231,183,103,
-132, 88,185, 16, 17,235,197, 42, 86,158,219,163,183, 66,181,161, 51, 26,108, 85,112,158,124,210, 60,114,188, 62,219,216, 26, 93,
-167, 77,153,166,144, 46,150,243,101,186, 23,123, 96, 47,101, 43, 24,191, 33,236,160,197,148, 47,253,136, 98,144, 43, 12, 17,224,
-116, 83, 13, 89,249,158,161,179, 66, 33, 30, 20, 79,140,212,243,147, 84, 12,140,150,  8, 61, 73,128, 38,101,104,166,158,  0, 69,
- 91, 24, 60, 68, 77, 32,121, 65, 19,102,100,249,  2, 93,163, 32,138, 60,223, 99, 30, 59,224, 99,222,170, 82,141,133,186, 20,109,
-169, 48,101,192, 83,152, 62,251,221,185,138,226,233, 48, 20, 45, 35,180,216, 35,246, 87, 97,238, 69,122,241,137,199, 70, 57, 82,
-160, 13,225, 62,145,202, 89,185,161,215,135,107, 37, 26,220, 82,125,  2,180,100,186,211,164,105,161, 57,163,234,148,189,  8,  2,
-163,189, 51, 99, 16,233, 51, 67, 58,214,237, 10, 30,220,142, 23,184, 89,171, 32, 71, 33,105, 11,241,222,192,167,249, 84,142, 82,
- 50,253,158,160,  7, 93,165,154, 91,163,250,  0, 68,237,116,137,  0,148, 14,239, 61,170, 53,  3, 80,121, 34,216,111, 38, 88, 35,
-158,246,121, 42,145, 66,129,175,225,  0,192,133, 49, 11,232, 23,244, 47, 45, 64, 18, 29,242,212,132,241,109,231,158, 71,241,208,
-231,166,219,132,238,  2, 38,145,  1,128,234,229,205,250,114,195,118,108, 86, 71, 16, 84,194, 98,122,138,219,  8, 84,198, 61, 14,
-187, 58, 14,249, 45,202,250, 44,124, 63,133, 38, 66,157,219, 99,171,114,236, 24,103,185, 49,212, 49, 49,241, 22,133,132, 36,122,
-195,110, 66,151,  2,162, 82, 57, 67,155, 14, 68, 67, 23, 91,147, 29,163,132,110,122,147, 65, 33,179, 36,130,  0, 30,147, 90,168,
-138,201, 94,125,103,109,185, 60,190,252,249,166,164, 21, 13,237,133, 22,127, 58,124,167, 36,211, 74,109, 69,217,218, 70, 91,102,
- 20,240,225,234, 68,244,122,253,219, 75, 60, 17,110,188, 51,120, 23,154, 36,236,227, 77,  6,139, 86,198, 72, 36, 19,113,108, 24,
-186,178, 94, 42,173,230,115, 78,112,220,143,154,237,199,150, 23,157, 57, 97,163,241,242,243,151,175,217,195,143,156,185,245,255,
-185,  6, 93,223,156,126,251, 94,105,228,204,253,  6,198,114, 76, 93,170,107, 42,254,248,250, 71,243,220,245, 52, 54,243,101,249,
- 15,236, 73, 20,151,102, 42, 36,240,203, 70, 31, 17,219,102,203,248,128,230,  8,243,252, 27,229,198,205,195,221,102,185,118,217,
-106,210,151, 78, 46,142,111, 58,183,207,107,187,244, 45,122, 68, 84,247,108, 44,213,250,238,195,  0,103,236,121,136, 17,137,152,
- 96, 56,165, 82,104,100, 65,135, 89, 45, 81,149,236,142, 46, 90,231,178,251,186,181,186, 77,105, 59,155,204, 94,180,174, 64, 64,
-229,203, 24,134, 73,145,221,101, 50, 26,197, 20, 42,239,168,128, 24,  7, 35,200,239,207, 92,152, 88, 51, 21,152, 81, 58,207,201,
-172, 44,203, 33,169,219, 50,111,140,139,185,238,169,208,132, 50,247,209,198, 98,207,152, 25,130,103,210,122,138,150,  1, 27,234,
-154,233,197,180, 23,248,255,118,232,136,149, 49, 11,180,104,127,161,253, 92,  1, 68,204,162,188, 58, 83,113,157,118,121, 36,243,
-226,143,  0,116, 93, 75,107,212, 80, 24,205,123,146,105, 50,201, 56,118, 30,125, 76, 75,165,138,197, 10, 22, 92,  8,  5, 65, 11,
-186,171, 11, 69, 55, 46,221,184,112,225, 47,114,225,218, 63, 32,184,243, 15,136, 20, 65,173, 20,235,224,212, 62, 38,147, 52,147,
-100,242,240, 59,223, 77,109, 55,194,108,135,188,238,253,238,249, 30,231,156, 42,190, 19, 44,224, 86,164, 82, 86, 28, 89,108, 39,
-208, 97, 20, 93,168,118,208,162, 10,147,128,121,186, 37, 55, 12, 41,184, 76,103, 44,135, 29,108, 75,  2,170, 66,  4, 78, 85,141,
- 54,225, 92, 22, 23,172, 67, 17,187,160,176, 85,131, 79, 55, 24,151, 65, 52, 10, 98, 95,147, 49,220,170, 67,128,206,192,160, 27,
-165,210,220, 97, 48,107,117,250, 99,158, 87, 90, 47, 67,127, 40,132, 55,207, 77,165,164,210,212,105, 25,154, 56, 66,140, 26,133,
- 89,  3, 82,203,  5,235, 95,106,  4,199,226, 36, 62,244,135,132,202,255,153,154,168,112,222,202, 77,179,158, 36,137,152,202, 97,
-252, 94,232,186,185,117,115,139,194, 40,229,104,244,188, 20,170, 34, 10, 40,150, 77,  7, 50,161, 63,215,110,158, 68, 20,223,245,
-203, 94,119, 99,229,118, 38,101,112, 17,226,119, 72,169, 70,191,189, 76,185,203, 40,162,181,  8, 97,113, 74,122,104,209,252, 30,
- 13,119,135,223,114,204,154,103, 42,189, 52, 57,163,213,230, 57, 45,194,161, 78,205, 78,203,233, 92,115,126,112,178, 47,196, 46,
- 88,230,  1, 68, 89,102, 63,129, 11, 59, 28, 15,101, 69, 59,157, 96, 10,147,194,144,109, 57, 86,205, 58,142, 14,184, 89,157, 19,
- 96,101,243,109,142, 67,133, 80, 53, 18,198,148, 66, 78,218,104, 57,152,108,131,142, 60,171, 53,164,185, 50, 74,202,105, 34, 39,
-116, 97,136,102,  9,113,227,228,146, 68,183,237,107, 18, 52,237, 42,143, 31,230, 52, 50, 62,149,166,194,223, 27, 42,219,152, 58,
-151, 43, 77, 44, 88,224,  2, 47,103,153,138,  1,251, 92,150,171,150,145,161, 26,144,138, 84, 96, 72, 38,180,243, 10,158, 42,161,
-116,141, 80,194,172,219,133, 27,131,196,213,111, 89,157,117,219,227,  9,129, 44,  5,  2, 29,232,163, 20,103, 78,236, 24,193, 42,
-170,166, 98,201,130,145,104,123,210, 74, 64, 17, 70,168, 12, 87,131,107,248,120,108, 20,128,174, 56,106,189, 69, 30,103, 17,221,
- 70,198,202, 61,204,168, 42,233,186, 43,221, 85, 33, 53,213,241,122,132,124, 99,150,125,190,214, 95,255,117,184,215,107, 46,208,
-255,231, 91, 11,126, 56,178, 96,190, 67, 56, 37,231,141,170,210,163, 17, 74, 90,106, 47, 31,  7,199, 42,  6,192, 12, 65,209,160,
-253,229,212, 27,  1, 96,221,145,112, 40,196,  9, 11,249,148,172,144,139,134,229,249,225, 81,194, 45,101, 12, 90, 64,205,194,164,
-207,  7,229, 19,133, 14,188,153,174, 75, 73, 94,216,107,206, 99,  9, 49,133, 85,229,202,236,105, 18,205,152,245,205,181,205,175,
-131,239, 66,220,128, 34, 47,219,196,227,112,106, 55, 58, 17, 59,127,170, 60, 76,105,215,108, 77, 85,226, 52, 84, 68,218, 15,183,
- 15,213,211,236,167,143,159,191,255,240,174,175,197,183, 60,125,206, 80,174,110, 63,196, 40,203,245, 43, 82,171, 67,167,162,148,
-164,248, 69,113,186,191, 27,142,254,160, 54,147,229, 66,219, 85, 45,217,224, 12,149, 34,180,175, 96, 46,232,184,116, 45,147,  9,
-123,210, 98,179,211,241,186,153, 54, 72, 37,221,110,191,120,242,106,251,229,107,125,109, 85,202, 38, 18,232,165,181,255,  6,247,
-221,189, 47,111,222,182,156,188,121,119, 93, 90,242, 36,219, 96, 15,223, 76, 34,232, 57, 60, 24,124,140,246,146,128,128, 46,115,
- 21, 97,222, 66,200, 58,206, 83,209, 15,144, 49,221,212,227,112,140,157, 75, 49,253, 36,244,209,114,208,106,254,233,248,193,198,
- 61, 74,190, 32, 20,200,100,195,197,214,130,219,239,169,  5, 68,108, 54,111,220,249,244,227, 51,136,205,121,249,232,254,179, 69,
-175,179,243,115, 39,136,198,163,137, 79,239, 45, 76, 67, 90, 50, 33,108,118, 84, 10,160,168,191,  7, 71,104,131,151, 41, 65, 46,
- 56, 91,  8,202, 61,114,140, 76,168, 16, 54,234,222,132, 89,108, 83,238,144, 87,122,  3,149,155, 77,233, 88,205,  9,  4, 54, 36,
-250, 16,148,146, 78,167, 25,184, 75,152,134,148, 47,216,149,158,219, 16,139,149, 75,177, 20, 35,124,132,234, 64,149, 71, 63,203,
- 53, 93,  7,149,198, 56, 69,101, 50, 19,149,106,174,204, 21, 23, 13, 87,133, 41,240, 69, 71, 99,249,220,227, 81, 62,147, 50,170,
- 60,125,105,235, 85,112,190,172,204, 98,255, 10, 64,213,245,253, 38, 13, 70,209, 22, 90,104,161,116, 10, 12,152,147,196,172, 35,
- 44, 51,209,105,226,140, 15,250,104,226,163, 62,152,204,127,207,196,127,192, 23, 19,223,124, 52,234,156,209, 23,151,109,137,211,
-169,211,209, 82, 40, 45,237, 87,234, 61,247, 43,184,237,185, 11,133,246,187,247,220, 31,231,156, 60,190,179,225,228, 98,155, 51,
-183, 74,165,  7,144,160,114,103,  6, 23,151, 83,213, 82,165, 92,170,114, 29, 13,252, 78, 25,146,142, 43,160, 16,216,249, 26, 70,
-100,154, 17, 74,143, 11,102,156,214, 76, 43,156, 70, 20,170,232,122, 41,219,164,162,186, 52,  8,121,209, 79, 63, 12,128,178,209,
- 96, 73,169, 28,131, 12,136, 16,226, 90,199,241,121,159, 76, 71,125,170, 54,237, 14, 86,227, 97,213,134, 59,160,  3, 70, 79, 14,
-113,132, 11,  8,198,238,232,157, 65,211,  7, 93, 37, 74, 67, 37, 86,191, 78,206,235,130, 81,146,108, 82,124,153,120,115,153,125,
-164,168,253,159,251,116,104,165, 79, 12,108,134,216,224,107, 28, 79, 40,190,255, 30,158, 90,104,135,165,167,222,175,195,211,131,
- 49,229,124,153, 28, 88,143,226,254,245,  7,239,246,223,234, 26,239, 26,113, 43, 17,252,172, 52,109, 45,181,235,118,211, 11, 60,
-250, 34,  4, 73,  8, 51, 18,232,142,227, 92, 32,158,222, 95, 86, 22, 84, 55,187, 55,220,224,108,187,183,237,141,135, 59,247,119,
-190, 15, 78,160,213,197,218, 89,116,219,183,123,119, 70,129, 31,196,163,141,238,230, 15,247,248,182,115,247,123,248,181,140,101,
- 83,  1, 57, 86, 93,146,118,185, 83, 40,139, 90,202,234,197,172, 89, 51,235,181,242,165, 90,201,208, 41, 22, 20,133, 90,140,102,
-153, 92, 72,164, 75, 52,132,101, 42,182,146,167,143,159, 29, 30, 30, 37, 49, 60, 39,145, 87,  4, 52,150, 85, 86,237,107, 88, 45,
- 58, 33,151, 43, 77,200, 42, 97,185, 33,149,154, 21,237,165, 43,163,200,111, 84, 26, 65, 18,106,232,138,228,179, 16,137, 79, 11,
- 28, 22, 51,101, 49, 74,165,136,102,201, 31, 57,  4,137,159,  0,178, 41,113, 26,193, 34, 28,155, 40, 34, 84, 62,157, 78,232, 37,
-180, 13, 91, 10,180,214,209,163,  8,121, 49, 33,119,178,131,193, 13, 47, 26,208,127, 90,229,154,228, 36,207,201, 65,179,220,243,
-  8,156, 34, 41,184,152, 73,229, 41, 13, 34, 15,  8, 91,163,201, 40,134, 49, 34,246,  0,131,208, 47,194,173, 55,254,246,231, 72,
-210,251, 77,195,116, 71,131,181,182, 99,148, 76,170, 71, 69,154,107,132, 73, 50, 97, 34,166,216, 11,226,217,175,148, 12, 76,249,
-243,224,  4,157,138, 75, 80,132,174, 83, 24,176, 43,168, 93, 88,199,134,234,160,168,160,204,221,146,120,155,104,198,219, 33,154,
- 92,  6, 67,175, 55, 97,161,177, 76,135, 87,101, 41,138, 41,111,165,171,141, 85, 89, 92,250,227,161,101, 84,153, 53,163,174, 54,
-186,  3, 31, 11, 66,203,118,187, 97, 47, 19, 56,224,153,182,144,  6, 41,224,121,209,103, 65,159, 11, 13,208, 51,247,228,222,214,
- 93,231,230,246,203,215,175,188, 73,218,176,235,235, 79, 30,226, 39,234,247,149,138,133,181, 25,128,119,161, 12,254, 76,142, 15,
-232,  6, 42,205,213,140, 50,107, 50,101, 87,208, 76,227,204, 91,212, 88,234, 99,150,130,217,108,217, 58,157,122, 58, 16,150, 73,
- 33,190,209,109,245, 53,211,143,162,227,179,191,250,116,118, 57, 46, 20,166,116,210, 20, 80, 85,117,109, 65,155,201,255,194,177,
-255,250,205,222,139,231,173,150,222,126,116, 75,217,104, 43, 37, 99,110,198,156, 18,100, 80, 62, 29,124,120, 63, 26,204, 66,172,
- 34,164,169,211,219,234, 44,119,161,134, 10, 86, 55, 87,128, 10, 61,172, 64,240,161,166,  7,231, 49,119,157, 21,208,209, 73,217,
- 61,220,115, 86,214,126,184,191, 64, 12,196,100,197,216, 94,191,245,241,235,174,231,187,244,106,249,147,241, 70,183, 79,117, 54,
- 21,208,159,143,190,196,169,112,218,107,220,  0, 44, 82,173,108,155,182,211,113,220,192, 29,134,163, 37,163, 70, 96,208, 13, 60,
-171, 12,205,140,205,171,215,185,100, 20,240,246, 82, 21,103,165, 71, 53, 52,211, 51, 11,232, 43,168,105,169,160, 17, 78,197,124,
- 37,239, 18, 35, 10,136, 89,204,179, 87, 30,242,171,153,105, 84,232,205, 19,121,168,252,223, 96, 89,116, 78, 84,166, 55,134, 32,
-139,240,176,156,135, 20,244,130,197,224,131, 39,114, 61, 82, 74,210,131, 41,153,137,115,172,212,  5,188,157,219,214, 94, 80, 41,
-187,160,252,174,230, 42, 77,153,188,162, 90,182,  9,247,252, 19,128,170,107, 91,106, 26,138,162, 39,151, 38,105,146,150,  6, 40,
- 45,133,222,184, 15,131,162,142, 51,242,232,163,175,254,143,126,142, 15,126,132,175,206,160,  3,204,  0, 62,136, 92, 68,  6, 42,
-104,105,154,166,105,154, 75,227,222,251, 36,  3,242, 88,232, 76, 90,206,217,151,181,215, 94, 43,157,175,170,170, 65,178, 77,  9,
- 49,181,101, 46,162,  3, 85,249,  4,189,231,101,126,202, 75,186,  5,141, 45,221, 91, 54, 83,156,221,168,109,117,  7,127,122, 72,
-105, 16,147,204,170, 13,154,110, 66, 60, 82, 78,157, 31,  6, 16,205, 33,196, 19, 43,130, 28,115,104, 45,118, 66,155,238, 11,179,
-245,158,123, 15,223, 41, 68, 25, 20,221,142,124,200, 63,112,  7,188,145, 75, 53,154, 64, 54,202, 49,129, 15, 16,184,101, 26,104,
-224,116, 75, 65, 49,250,  8, 55,215, 89, 76,227,236,113, 74, 85,163, 85, 38, 83, 43,172,215, 54,161, 63,128,184, 44,144,116,233,
-192,183, 33,120,197,156,152, 65,231,  5,158,182,168, 79,241,189, 42,153,200, 29,104, 19, 52,129, 64, 89,222,217,124,133,164,142,
- 40, 32,199,202, 92,132,106, 39, 34,183,227, 34, 56,100, 98,230,139, 56, 52,131,120,141, 60, 63, 92, 61,129,124, 14,117,248,180,
- 57,115,217,253,217,152, 89,182,189, 46, 28,216, 28, 77, 87, 40, 76,  8,188,222,212, 84,220,222,132,166,210,241,  7, 55,247,157,
- 81,228, 75,146,  4, 41,164, 62,215,116, 61,167, 98,213,170,214,  2,  4, 23,232, 12, 66, 33, 90,156, 89,104,204, 46, 13,195,193,
- 32,188, 22, 69,197,113,131, 49, 41,243,  6,120, 61,210,233, 53,  5, 52, 84,152,180, 76, 93, 35,109, 50, 77, 19, 13, 36,171,137,
-130, 34, 20, 13, 73, 87,224, 22, 35,210, 26, 96,175, 17, 31,238,237, 17, 67, 60,135, 68, 41, 44,230, 16, 97,132, 32,  2,231, 12,
-174, 13,138,198,163,195,159,160,228,116,196,205,137,177,138,190,198, 73,130, 11, 26,116, 34, 11,198, 20,177,197,  5, 77,214, 84,
- 37, 47,164, 36,  1,220, 48, 39,210,135, 72, 86,236, 28,207, 97,229,169,121,204, 25,166,133,108,153, 73, 82, 41, 85,116, 85,119,
- 32,255, 77, 66, 46, 86, 19,227,106,179,224,141, 28,120, 61,224,202,192,  9,231, 81, 74, 98,230, 90, 73, 37,115,194,221,112,200,
- 89, 27,143, 89,201,180,160,159,165, 41, 22,129,212,162,108,228, 13, 20,171, 82,161,145,209, 71,193,240,105,243,185,161,234,148,
-116,171,228,228,142, 39, 19,130,153,133, 82, 83, 97,165, 52,119,121,119, 78,224,143, 48,109, 78,243,101, 84, 14,222,135, 56,160,
-120,248, 73, 72,205,168, 85, 94,129,199,134,192, 42,203,232,209, 12,229, 11,109,177,138, 60,223,103,157,114,138,185, 35, 38, 25,
- 71,216,180,200,136, 51,228,208, 76, 57, 78, 29, 12,176, 99,138,182, 26, 79,182,219,207, 92,207,117, 70, 54,220,  5, 44,  2, 16,
-110,194,143,107,187, 61,190, 22,230,249, 14,178,140,226,177,150, 83,161,146,230,250,184,227,208, 75,200, 49,184,100,148, 17,197,
- 78, 38,253,206,205,155,119,239,219,229,149,131,227,179,205,213,122,237,245, 54,211,100,214,106, 49, 89, 65,228,125, 20,179,193,
-144, 93,124,247,237,110, 34,229,244,242,226,120,216,143,224,254,146,112,160,196,253, 15,113,219, 10,106,254, 24, 81, 26, 21,250,
-141,  2, 23,146, 69,122, 12, 84, 13,173,242,102,117, 78,  9,252,111, 39, 71, 95,246,191,254,254,113,166,216, 67,189, 31, 72,142,
-207,238,  6,172,219,103,118, 63,186,186,178, 63,127, 57,254,240,177,115,180,187,241, 98,169,252,246, 37,107,215,224,128,100, 78,
-112, 68,198,116, 29,246,233,116,247,210, 11,177,172, 96,245, 82,189,247,183,115,126,117, 98, 15,123, 70,222,132,236,  5, 21, 12,
-132, 20,168,178, 57,180,204,165,  1,139,186, 53, 10,135, 88, 17,170,198,250,194, 26, 36,216, 95,119,151,203,181, 53, 56, 99,144,
- 50,175,161, 81,119,123,205,106,243,188,115,209,110,172,206, 87, 26,  5, 53,127,120,113,104, 21,167,225,183, 16, 46,122,110,247,
-214,190,133,127,  7,252,217,206,198,206,254,233,  1, 28,120,232, 95, 85, 69,131, 34,  6,  7, 99,140, 65, 37,  7,133,149,129, 81,
-  5,151,182,225, 45, 18,147,114,138, 58, 14,112,141, 95, 87, 77,207,247,176, 73,205, 64,151,152, 10,127, 90,197,225, 42, 64, 40,
- 50, 59, 14, 67,120,126,138, 66, 73,  6,146, 60, 90, 46,165,207,  3, 61,125,170,152,155,249,169, 18, 73, 36, 78, 50, 77, 96,202,
-184, 18,201, 20,  7,255, 59,226, 61,112,100,146,  7, 65,130, 84,225, 56,147,218,226,203, 83,236,145, 16, 55,227,195,234,127,  2,
- 48,117,101, 61, 77,132, 81,116,182, 78,167, 29,134, 78,103,170, 84, 44, 66, 93, 16,121,112, 11, 18,226,155, 47, 62, 26, 19, 19,
-125, 48,254, 80,159, 93,131,146,248,162,  9, 81, 43, 46,128,  5,161,204, 66,103,159,122,207,253,  6,241, 21, 18, 38,204,124,223,
-185,219,185,231, 84,250,239, 37,243, 43, 39,220,158, 43,202,170, 69,159, 11,117,108, 86, 61,165, 99, 74,111,132, 32,204,177, 58,
-244,190, 34,138,153,209,136, 46,124, 82,164,103,172, 25,194,253, 58,107,190,243,124, 21, 79, 94,158,187,217,115,251, 20, 33,177,
- 35,143,120,112,246,194,204,194,193,104,159,253, 84,148,214,148, 19,198, 71, 65, 28,208,237, 53,116,  3, 10,232,138, 58, 78,177,
-249,237,143, 61,246,230, 17,145,  8, 13,119,104, 85,230, 17,111, 27, 97,246,197,170,192, 25,179,224, 77, 58, 25,  4,163, 20, 93,
-  5,193, 80,228,156, 81, 18, 13,253,161, 15,170, 37, 22,255, 96,243,132,158,154, 82,237,204, 11, 55, 76, 76,227, 84,166, 19,100,
-244, 61,177, 49, 44, 43,  5, 62, 85,188,249,107,115,207, 27,210,215,162,138, 73, 48,156,132, 15,115,183,221,187,117,105,117,232,
-237,252,  9, 14, 93,211, 45,132, 74,178,  4,195, 38,161, 50, 74, 64,137,181, 53,185,212, 52, 52, 40, 40,126, 16, 10,180, 76,251,
-193,218,195,193,239, 65,152,120,192, 62, 69,165,103, 81, 22, 78,135,140,170, 31,148,252,101,222,172,155,245,122,  3, 66, 25, 25,
-248,191, 16, 78, 81, 48,128,162, 87,241,105,248, 94,146, 53,219, 50,100, 37,  3,255, 19,136, 83, 80,242,  4,174,164,204,222,111,
-136,155,229,172,109, 73,152,215,201,208,196, 46,149,184,144, 48,  1, 40,149, 44,153,  4,227, 44,103,112, 39, 96,108, 72,186,170,
-213,112,197,208,  1, 69,170,233, 90,103,254,120,251,231,157, 57,186, 72, 89,154,222,190,180,182, 51,218,166,204,133,251, 90,213,
-184, 72, 40,218,169,156, 27,208,123,166, 35,222,162,212,187, 72,162,108, 12,249,176, 34,235,119, 23,109,179, 29,199, 49, 11,180,
-202, 76, 29,211,  5,245, 91, 97, 14,229, 82,111, 57,140, 60,138,229,112,194,226,142,182,176, 90,102,225,150,  9, 21,115,142,233,
-  6,148,221, 16,130,215,160,144, 88,176, 72, 39, 68, 69,171,224, 88,157,115,180,137,184, 57, 35,216, 80,211,141, 22, 93,  6,170,
- 42,166, 26, 54, 36,233,117, 42, 19, 99, 48,103, 20, 93,215, 52, 66,112, 58, 54, 80,155,226,166, 10,132,240, 64,191,145,207,217,
-221,237,131, 95,220, 76,197, 31,143, 88,130, 74,158,156,234,138,157, 40,194,115,117, 36,149, 70,173, 65, 39, 51,157,164,244,242,
-  9,139,155,122,179,215,185,224, 69,135,178,208, 21,228,243, 33,164,198,121,238, 42,  9,123, 79,238, 75,169,236,100, 93, 67, 98,
-161, 96,119, 75,229,235,189,239, 15,193,229,144, 74,138, 79,113, 26, 11,211, 53,181,242,153,171,244,145,193,164,204,177,244, 72,
-191,245,209, 66,  4,253,136, 16,208, 64,232, 77,203, 50,210, 20,185,174,235,126, 48,186,109,117,123,207, 30,223, 93, 92,155,189,
-222,145, 26,153, 52,101, 64, 80,172,102, 80, 41,138,245,209,239, 95, 39,187,223,  9,128,232, 36, 39,222, 97, 30,135, 98,213, 70,
- 80, 50,161, 59, 13,116,135,  1, 49,197, 11,185, 72, 40,131,210, 27, 83,146,176,192, 54, 84,232, 22,204, 58,157,171,115,203, 87,
- 22,250, 29,171, 76,194,157,237, 47,159, 63,110, 12, 54,222,109,190,121,245,115, 99,253,199,235, 23, 91,111, 95, 30,239,125,235,
- 95,155, 89,122,180,214,184,127, 83,178, 28,  9, 91,174,202, 73, 39, 32,151,168, 94,220,218, 28, 61,247,215,143, 66,157,203, 79,
- 47, 14, 34,244,175, 40, 35, 49, 40,184, 30,  6, 71,  4, 53, 97, 60, 62, 33, 66, 87,171,253,170,166,197,108,118, 72, 21,143, 59,
-237, 14,189,223,199,105, 84, 87,245, 32, 10, 41,127,114, 44,187,109, 58,244,127,121,199,254,222,209,126, 28,141,159,222,123,210,
-235,244,118, 15,160, 51,232, 88,238,157,203, 43,243,221,  5,199,116,  6,195,193,234,226,202,198,215, 15, 55, 46, 94,223, 29,237,
- 82,128,111, 91,109, 42,208, 49, 61,146,145, 64, 96, 82, 87,171, 55,107,205, 32, 14, 39,172, 70,199,208, 91,176,213, 85,121,170,
-173,197, 67, 38,  6, 78,241,147,178,202,231,153,  3, 13,171, 18, 64, 12,230, 19, 21,196, 87, 90, 70, 18, 85, 99,182, 73,104,224,
-255, 51,227,146,254,209,220, 43,157,  1,174, 76,241,208, 92,158, 40, 39,230,  8,255,103,241,242, 41, 51,166, 82, 10, 86, 41,167,
-201,203,100,190,211, 39, 40,158, 54, 90, 41,187,213,139,102, 13,161,162,109,185, 81, 50,254, 43,  0, 87, 87,211,219,182, 21,  4,
-159,248, 37,138,148,104, 90,178, 28, 69,178,227,196,150,213, 26, 72,130, 32, 78,155,246, 84,244, 28, 20,232,169,127,177, 64,127,
- 65,211, 99, 47, 45,  2,228,208, 91, 99, 35, 40,106,197, 78, 12,249,155,166,196, 47,145,157,217, 39, 25, 65,  1,223,100, 80, 34,
- 31,223,238,236,190,157,153, 69,124, 39,163,188,202,132,107,163,187, 52,170,110,186,130,240, 74,223,243,165, 41,198,168,143,251,
-111,185,  1,181, 76, 85,153, 34, 50,214,172,188,204,182,123,187,  0,161, 36,205, 48, 55, 44,164, 51, 39,215,167,215,241, 37, 48,
- 47,137, 39, 85, 14,192,117, 60, 25,203,221,112, 75,144,163, 37,237,108,135, 24,217,205,242,140,178, 83,228,178, 87, 90, 49,172,
- 18,158,174,215,240,241, 21,200,165,213,242,  8,110,249,212,176, 85,108,215,146,249,185, 18, 27,207,  0,102,  7, 14,193, 98,111,
-117, 31, 32,128, 86, 68,181,166, 12,107, 34,100,167,150,233,104,195,159,185,152, 76,154, 34, 63, 93,178,231, 37,149,181,201, 94,
-170,158,110, 67,188,188,215,238, 19,101,115,244,155,235,172, 22, 46,183,234, 42,190, 24,159, 29,101, 98,195, 38, 67, 59, 73,179,
- 65, 22, 53, 86,  5,155,119,181,217,  6,214,230,240, 76, 49,171, 83,174, 39,225,117, 77, 19,175,200,187,241,223,253,246, 96,183,
-255,229,199,203,147, 21, 47,160, 84,105, 61,160, 44,190,141,215,119,134,136,121,155, 69, 97,179,141,208, 54,137,206, 95,142,190,
-  9, 90,193,197, 20,225,163,218, 88,223,152,213, 62,184,142,213,  9,235,165,153, 81,191, 92,196,121, 68,  4, 83,149,213, 66,217,
-124,150,148,247,  2,207,114,172,  6, 13, 93,137,221,115, 36,137,178, 18, 58,127,141,193, 93, 12,127, 29, 75, 53, 42,207,170, 57,
- 41,253, 78,101, 28,205,176,166, 73, 28,103, 81, 52,139, 72, 14,170, 56,249, 19,167, 83, 92,100,165,177,154, 20,169, 46, 92,238,
-175, 14,166, 66, 63,193, 74,181, 91, 93, 60,183,105, 22,  3,188,183,220, 80, 36,241,212, 85,116,113, 25,159, 55,189,144,225,213,
-118,189,122, 43,203,103, 40,254, 80, 23,127, 49,216, 59, 62,251,247,226,102, 18,250,107,248, 25, 90,204, 94, 31, 18,152,166,141,
-252,228, 59, 13,172,  8,243, 40, 45,146,145,144,109, 14, 59, 21, 44, 32,  7,157, 77,241,231, 99, 95,202, 18,239,231, 52,  7, 34,
- 45,155,245,128, 13, 49,146,170, 82,154,214,137, 22, 56,246,100,224,175, 32,226,239,220, 31,253,115,122,176, 22,172, 35,119,216,
-156,202,245,113, 77,158, 92,168,106,173,217, 29,109,238, 89,134,115, 27, 71,226,127, 65,193, 34, 44, 95,191,189, 49, 37, 57,101,
-186,217,217, 66, 57,207,211,126, 93,200,178,142,224, 79,214,212, 92,219, 48, 57,181,105,219,231, 55,103,115, 17,150, 98, 23,165,
-217,185,161,111,129, 18,190,180,248,125, 26, 86, 83,135,200,178,212,141, 31,147,162, 81, 78, 41,227,155, 60,142,178, 40, 90, 27,
- 37,184, 53, 99,179,187,245, 98,103,255,104,114,100,104, 58,149,170, 33,205,  3,208,219,164,148,  6,216,128,190,227,225,106,  8,
-100,168, 27, 82,122, 27,165,162, 42,138,119,139,114,  0,136,227, 39,135,135,251,225,186,181,214, 81,205,177, 50, 10,148, 54,202,
- 71, 30,247,216,159, 25,143,213,209,161, 74,102, 60,150,231, 51,205,131,222, 67,182, 10,242, 84, 58,239, 74, 15,107, 50,190,115,
- 12,158, 33,222,  0,222,242,188,154, 47,162,240,148,229,179,148,103,169,176,161, 30,132,238,168,223,123,190,243,232,249,112,247,
-201,195,225,211,193,246,227,193,214,179,141, 71,223, 14,183, 95,237, 15,126,124,233,125,245, 84,117,123, 10, 16,130,189,135,106,
-217,127,166,157,151, 58, 30,171,223, 15,254,248, 75, 93,169,212,183, 60,154, 75,  9,149, 20,183, 70, 37,159,134, 95,210,248, 48,
- 85,139,145,150, 82, 51, 12,139, 90,153,229,121, 37,100,178,121,141, 74, 80, 89,177, 96,164,183,188,  0,127,192,133,173, 32,124,
-127,250,126,167, 55,196, 59, 14, 48,244,235,219,215,199,103, 31,247,247,190, 62,248,112,  0,164,127,157,196,111,222,253, 25, 77,
-111,127,120,245,211, 47,191,253, 60, 26, 12, 79,206, 63,137,237,237, 28,245, 98,148, 78, 83,250, 47,210,123, 93,143,193,124,247,
-248,251,211, 43,252, 67,134, 20, 62,231,  1,161,131,199, 82, 72,173,169,229,113, 76,170,  3, 21,255,159, 81, 95,234,244, 98, 77,
-215,131,222,165,200, 25, 25,159,217,148,225, 99, 84,177,145,200,127,222,185,119, 85, 36,  3,133, 58,236,220,105,208,125,102,100,
-186,240,110, 82,119, 33,125,169,207,107, 46, 38,112,137,180, 92,195, 77, 10,164,202, 27,253, 81, 69,127, 61,205, 94, 37,158,168,
- 91, 54,162,211,127,  2,112,117, 37,187, 77,  4, 81,176,199, 61,251,120, 73,108,131,226,108,  4, 20, 41, 72, 64,196,118,224,200,
-  5,129,196, 71,115,130,  3,119, 14, 44, 74, 32,193, 68,206, 98, 71,241,140, 61,227,217,168,122,109,  3, 66,242,193,  7, 59,206,
-244,188,121,175, 94,191,234,170, 85,126, 87, 13,128,184,173,238,157,132,181, 49, 23,213, 61, 79,152, 51, 21,137,116,249, 76, 36,
-131, 40,209, 37,123,214, 37,201, 15, 85,229,161,145,201, 83, 52, 53, 64,132,166,201, 50,205,133,177, 21,171,164,148,161,233,  0,
-214, 11,156,136, 46, 72, 50, 53,175, 87,206,108, 66,143,179, 60, 27, 25,193,155,102, 55,127,212,248, 68,127,161, 16,133,191, 22,
-138, 30, 77,118, 12,173,114,121,192, 85, 84, 99, 43, 74, 70,136, 90,139, 47,155, 21,165,137,139,131, 77, 64,197, 56,149,177,137,
-181,210,237,163, 57,131,101,227,215,118,123,123,147,217,132, 36,  1, 75,137,138, 55,133,224, 75, 97,218, 25,146, 12, 30, 66,228,
- 50, 50,229, 85,253,250,233,235,190,136,185, 55,148,109,228,188,128,118, 53, 85, 29,  1,107,250,179, 60,193,178, 20,244,113, 77,
-128,121,146, 92,216, 53,210,161, 33, 51,182,131,245,100, 17,251, 66, 31, 18,231,144,234,232,226,  8, 23, 12,180,  2, 80,207,237,
-  8, 10,158,144, 39,183, 63, 56, 64, 74, 26,142, 79,145,229, 17, 85,168,115,103,215, 67,132,111,169,138,209, 12, 40, 47, 71, 66,
-  9, 92,103,194, 35, 78,108, 19, 22, 21,105,239,233,  2,232,184, 90,  0, 85,210,118,183, 28, 32,179,121, 78, 20,104,223, 83,116,
-237,224,161,144,170, 25,232, 78,212,192,211,234, 59, 86,232, 42,223, 87,141,204, 77,242,152,105,167,178,178, 50,147, 77,199, 66,
- 43,215,112, 66, 16,193, 40,132,156, 22, 52,172, 84,152,160,156, 58,138,190, 18,214, 83,104,211,220,110,106,133,107, 40,207, 77,
-183, 57, 69, 42,164, 53, 18,249,217,154, 99,149, 64,116,105, 60, 20,179,181,104, 13,183, 27,145,135,194,207,148,166,157,132,130,
-218,181, 88, 74,217,190, 77, 23, 61,143, 36,171,185, 88,253,229,102,110,185,228,137,113,248, 92, 71, 97,187,139,228,171,234,140,
- 34, 51, 66,226,108,168,151, 15, 94,205,178,120, 58,187, 14,253,136,189,147,162,143, 16,131,157,171, 92,118,194,110,156,221, 92,
- 78,175, 88,147,122,219, 72,169,123,131,253,179,241,137,205,233,  8,174,185, 70, 61, 94,143,214, 63,126,126, 15,228,139,178,167,
-151,222,169, 53, 25, 44,182,189, 57,216,126,243,240,149,239,186, 39,151,167, 79,239, 62, 79, 50,142,133, 68, 78,167, 54,221,140,
-184,209,233,192,139,226,249, 84,172, 54,235,157,254,238, 85,124, 41,103,244,168, 63,133, 15,136,150, 53, 15, 63,122, 20,182, 68,
- 42, 55, 38,159, 11, 99, 37, 97, 60,223,165,163, 79, 35,158,144,226,185,135,227,243, 99,145,214,177, 54, 58, 27, 21,165, 16, 19,
- 81,169, 85, 18,208, 37,190,139,213,  6,196,161,250,  7,139,153,177, 50,224, 47,105, 71,251,174,149,214,243,243,163,111,247,219,
- 29,231, 64, 30, 56,228, 98, 96,152,121,166,126,158,168,147, 99, 53,157, 34, 98, 24, 35, 69,142,  2, 18,246, 55,203, 52, 41,209,
- 87, 73,195,107, 91,130,220,241,215, 28,238,202,186, 26,152,160,208,101,170, 61, 95, 53,219,168,111,203,151, 43,130, 32,174,195,
-202,209,109,171,193, 45,181, 51,104,236,237,232,221,109,107,176,165, 58, 61,165, 91,130,217,245,106,103, 88,220, 77,248,202,213,
-104,168,190,124, 42, 63, 44,222,157,161, 73, 42,218,228, 92,205,113, 41,121, 94,  4,126,136,  4, 20,103, 73, 59,104,  2,110,227,
- 65,107,134,205, 94,171,143, 55, 27,221,173, 89, 58,163,103,167,197,125,212,200,141,112,103, 81,194, 17, 45,104,136,199,241, 24,
-139, 15,176, 21,182, 58,248,255,198,215, 23,111, 95,188,229,249,137,186,140,231,201,225,254,227, 31,163,239, 89,177,104,  2,152,
- 46,230,168,148,163,225,176,215,185,253,232,238,225,175,241, 16, 17,131,152,199,199, 80, 30,162, 32,196,155,181,168,203,164,111,
-213, 95,127,125,193, 77, 65,195,199, 70, 16, 88, 68,187,244,191,149,178, 19,  5,132,101,232,228,204, 17,107,101,253, 47,227,101,
-142,127, 94, 39,147, 39,247,158,141,111,198,106, 53,222, 20, 30,181,146, 77, 48,203,168,164, 27,147, 33,163,240, 44,204, 27,155,
-251,160,255, 56,169, 46,197,121,172,122,133,244,113,215, 61,102, 39,227,247,241,143,210, 36,207,208, 53,150,230, 70,226,215,246,
-183,168,176,233, 41, 56, 31,250, 45,  0, 89,215,178,219, 52, 16, 69,199,175,216, 78,226,150, 52, 37,109, 90, 74, 42,181,129, 22,
-129, 42,177, 96,129,  4, 11, 88,  3, 66, 98,197,159, 32,190,  7,246, 44,144, 16, 63,192,130, 34, 64, 72, 44, 16,143,242,104, 27,
-154,151, 19,199,175,113,236,112,238,181, 83,144,144,178, 72,164,214,137, 61, 51,231,158, 59,115,239, 57,  5,190,131,236,208,106,
- 28,119,  0,208, 42,167, 12,100, 68,105,150,145, 56,247,198,191,137, 77,147, 55, 78,  2, 12,153,  9,154,166, 28,214,178, 51,213,
- 58, 82,215,194,154,149,109, 58,178,124,127, 84,136,181,122, 43,163,186, 46, 35,162, 35, 99,133, 85, 91,147,138,233, 88,164,148,
- 18,177,244,229,108,177,122,  6,243,206, 39,125,184,105,204,  2, 76,133,206, 98, 30,142,184, 63, 59,101,161, 78,117,158,165,207,
-184, 97, 20,137,219,220,213, 25, 83,137,253,184,115, 13, 43, 85,249,213,255,137,159,180, 96, 46,112,211, 63,  2,128,206,158,235,
- 34,162,234,242,212, 54, 45,208,240,140,170, 12, 51,245,212, 60,135,142, 97,201,165, 15, 68,117, 28,186,121,122,216, 92,218,120,
-255,245,109,103,212,  5,147, 13,147, 32, 23, 33,  1, 30,153,166, 69,109,168,105, 76,144, 68, 34,183,179,189,221,171,143, 30, 62,
-126,246,234, 25,160,159, 28,232,185,111, 19, 28, 52,175,179,196, 79,141,211,105,144,132,200, 99, 72,252,207,176,183, 87,218,199,
-227, 99,204, 63, 76,220, 97,224, 14,  2,215, 13,250, 24, 67, 64,207,245, 75, 55,239,221,122,240,238,243,155, 85, 80,230, 20, 49,
- 21, 97, 70,242,237,170,131,113, 52,137,178, 88,178,198, 29, 31, 64,197,128, 31,228, 80,  9,153, 77,213,202,101,252,153, 81, 66,
-224, 81,184,  4, 80, 11, 83,164,153, 10,213, 59, 34, 47,147, 41,130,  1, 65, 96,168,211,150, 20,167,159,120,148,119,174,221, 63,
-232,124, 35,116,162, 75,106,101,171,204,102,226,126, 17,124, 69, 33,149, 65,226,171,  6,181, 11,173, 45,157, 15,177, 26, 43, 53,
-215,239,227,153,128,224,204, 10,135, 97, 58,215,  4,136,128, 47,  3,197,194,200,239, 79,250,105,154, 44, 57, 13,201,140,126, 99,
-169, 69,165,149, 92, 61, 86, 49,171,151, 91,123,248,136, 75, 97, 65,182,155,187,185, 76,216,245,157, 27,199,195, 78,126,132,131,
-111,111, 56,141, 31,189,131, 40, 10, 73, 32, 77,136,197,106, 13, 43,188, 59, 58,241, 98,111,107,109,167,235,158,144,239, 37,149,
-198,159,157, 38,  9, 30,215,102, 99,243,242,230, 94,207, 61,153,178, 62,229,208,235,130,101,119,134,135, 69,206,203,  3,237, 71,
-222, 81,255, 16,  1,102,189,126, 94,202,  8,228,128,133,127, 85,140,212, 86,227,194, 86,123,251,233,203, 39,135,189, 95, 24,165,
-178,105, 15,125, 82,161,  2,154,147,223, 17, 50, 95, 10,117, 25,130, 31,240, 23, 40, 91, 41,145,101,199,112, 50, 96,157,  3,245,
-172,179,194, 97,190, 90,210,180,220,175,  7,255, 91, 54,172, 69,167,  6, 44,139,231,106,148, 26,232,142,174, 43,124, 10,188, 94,
- 91,151,108, 22,154, 36, 81, 73,165, 86,117,214, 41, 21,245,234,242,149,214,149,145, 63, 74,167,210, 52,204,187,215,238,  2,119,
- 72,151,128, 56,217, 76,201, 69, 19,  8,147, 41,163,197,250, 50, 45,211,155, 70, 85,183,211,186,189, 77, 59,174,128,224, 84, 10,
-215, 21,221,174,240,  2, 17, 99,248,177,182,100,166, 25,186,237,196,227,190,244,186,185,190, 43, 27, 96,208,229, 12,141,106, 25,
-168,154,141,230,168,106,224,102,147,  0, 75, 87, 56, 14, 41,204, 32,239, 35, 23,130, 92,139, 80,227,215,233, 27,173,184,173, 98,
-223, 51,155, 35,123,254, 38, 17,195, 35,241,241,157,248,228,237,191, 54,212,202,106, 69,183,  6,147,158,174, 24,237,181,139, 39,
- 30, 89, 39,174,214,154,157,193,239, 17,213, 83, 32,139, 13,164,148,236,119,122, 46, 78,146,120, 26, 86,172,133,148,229,202,195,
- 56,194,141,111, 55,219,152,162,147,200,183, 13, 27, 75, 62,150,177,231,143, 12,234,145,140,119, 54,118,158,239,191,176, 12, 11,
-121,192,199,239, 31,  6,193,208, 52,192, 30,192,141,108, 47,158,248,210,239,123,189, 47,199, 95,232,216, 76,204,144, 95,130,175,
-172,212,155,203,206,242, 17,137,130, 80, 63, 60,119,202, 41, 44,254, 44,162, 68,166,133,  9, 10, 89,  3,230,251,230,  8,144,160,
-179,114, 94,252, 42,138,186,252, 83, 31, 46, 54,239, 83, 85, 76, 57,139,244,  7, 83,106, 47, 96,254,202,155,196,212, 27,193, 54,
-120,122,174, 21, 73,135,157, 84,130,137, 25, 88,116,146,254,107,144,109, 83, 89, 96,170, 83, 87, 60, 97, 73,197,102, 77,  5,173,
-100, 82,165, 64,114,170,100,240,215,208,248,255, 87,110,224, 42,148, 63,  2, 80,117, 45,189,141, 83, 97,244,198,118,236,196,143,
- 56, 15, 79,136,250, 24,202,  8, 49, 29,141,  4,  2,177, 65,176, 69, 72,108,249, 35,176, 65, 98,195, 47, 67,131,152,  1,137, 21,
- 12, 66,  5, 22, 21,243,162, 77,155,166,173, 19,199,174, 29,199, 54,231,124,119, 50, 12, 82, 23,145, 90,165,137,124,191,115,191,
-199,249,206, 33,190,203, 75, 75,147, 57,101,233, 78,203,151, 81,139,185,169,185, 65,235, 57, 46,139,101,221, 95, 86, 77,219,176,
- 17,219, 56,217, 25,219,121,172, 76, 45, 41,171,181,221,182, 72,108, 35,233, 72,168,233, 88,174,197,171,143,190, 20,111,239,222,
- 67,249,  3,160, 23,  9,111, 91,102, 32,109,113,178, 47,115, 25, 77,244,220,254,167,239,125,254,231,233,145,105,188,188,207, 28,
-209, 13,150, 45,171,214,150,197,196,  4, 48,232,  4,196, 32,250, 12,105,102, 93, 99,201,138,191,205,101, 19, 63, 10,199,227,112,
-188, 31,209,243,193,239,134,105,145,118, 44,  7,159,182,109, 57,113,118,141,136, 58,120,227, 96,142, 59, 86, 90,192,122, 31, 26,
- 23, 15,206,246,233,226,212,161,202, 11,157, 76,104,170, 39,172,147,  5,178, 84,132, 26, 62,173, 97, 68,189,201, 60,157,149,178,
-150, 69,139, 35, 42,222,217,201,114,245,232,241,195,178, 41, 43,131,238,160,100,170, 50,126,172,142,205, 44,149,124, 30,145, 35,
- 23,155,210,102, 85,166,243,228,  2,215,140,109, 57, 31, 29,126,242,245, 23, 95,254,248,215,207,200, 10,129,122,166,221, 94,230,
-203, 31,126,123, 48, 12,199, 81, 24, 93,165,115,211, 44,  0, 23,  0,247,190,111, 86, 98,218,129, 83, 67,205,182,170,  1,  6,118,
- 58,  6,146, 87,214,232,166,186, 61,234,181, 72, 97, 52, 54, 69,109, 74,232, 39, 21, 69, 28, 80,162,228,235,106,177, 44,243,124,
-131,199,137,242, 29,152, 66, 79, 72,202, 30,213,199,211, 99,218,217, 40,189,136,208,202, 40,177,105,104,169,103,124,214,144,221,
-237, 74,211, 48,163,254,248,112,247,254, 31,255, 28,225,183, 52,218,149,148,182, 33, 93,218,246,108,159, 51, 38, 54,145, 91, 78,
-219,213,219,  5,131,110,148,109,178,192,241, 20, 25, 53,238, 89,124,194, 89,142, 44, 46,  2, 76, 81, 74,207,226,115,139,195,210,
-234, 50, 57, 71, 58,143,100,237,197,252,153,232, 12,115,247, 21,223,244,134,229,160,227,  5,254, 55, 95,125,251,224,209,119,123,
-209,237,140,171,200, 52,210, 76, 86,177,177,229, 16,148,180, 68,103,114, 23,103,241,244,226,133,239,134,148,212,183, 28,  1, 46,
-163,239,141,122,204,188, 88,255,225,113, 32,102,145, 86, 35, 67,156, 45,207,241,175,251,110, 31,127,121,157, 92,118,109,231,228,
-234,228,201,243,227,161, 63, 34, 83,208,104, 47,210, 37, 96,189,145,113, 49,141,179,131,  8,160,140, 43,109,103,184,143,107,  9,
-199,140, 27,149,173, 86,224,134,210, 89, 66, 45,149, 73,135,156,147,111,129, 77, 67,251,182,227,194,195,151,181, 90,214,173,112,
- 92,  0,100,233, 69, 95,105, 25, 19,224, 84,199,212,236,236, 90, 40,167, 84,211,195,209, 90, 21,171,211,235,233,222, 96,103,145,
- 47,  7,221,193,147,217, 83,  0, 25,240,183,223, 29,176,230,227, 58,180, 54,172,111,104, 95,131, 50,220,164,134,195,189,176,183,
-255,217,161,146, 62,166,196,117, 91,197,  9,247, 87,139, 66,229,192,120,229,239,223,245, 38,111,118,130, 81,149,173,170,117, 42,
- 21, 23, 25,126, 22,251, 51, 36, 92, 18,217,219,114,253,224, 60, 33,103,202, 19,181,201,149,239, 41,183, 75,182,140,165,254,111,
- 50,247,122,135,226, 85,182,190,217,190,192,207,141, 58,255, 91, 29,253,174,210,164,250,101,242,253,201,101,150, 95, 33, 22,104,
-  1, 91,111,230,241, 37, 21,104,170, 58, 78, 23,195, 96,232,119,189,139,100,174,123,209, 53, 85, 82, 74, 60, 77,217,200,103,195,
- 70,167,125,111, 77,238,156, 93, 79,113, 83,205, 22,179,130, 73,131,147,228,  9,130,125, 24, 68,136,220,244, 38, 43,235,245, 59,
- 59,119,251,193,208,179, 93,139,  3, 24,  7,239,214, 35,129, 59, 91, 23,197,110,180,135, 55,161,204, 47, 64,105,179,246,188,225,
-135,239,127,252,211,175, 15,119,  6,147,148, 91,178,133,112,117,234,173, 10, 77,109, 41,243,221,131, 15,206,226,169, 94,228,235,
- 88, 46, 50,165,162, 44,180,238, 17,146,  6,139,198,170,210,  3, 85,173,173,160, 87, 45,  2,121,146,161,106, 67,108, 67, 79, 49,
- 58,136,110,156,132,178, 41,180, 46,168, 54, 14, 21,218,175, 90,203, 56,234,213, 10,170, 30, 59,142,122,183,214, 84,183,247,202,
- 42,119,108,215, 22,185,242,151, 34,210, 91, 35,199, 45,176,191,254, 44,244,104,241, 63,155, 39,252,226, 95,  1,152,186,150,221,
-166,129, 40, 58,158,216,206,251,209, 66, 31,160,166,144,166,  8, 74,161, 84,165, 84,128,144, 16, 18, 18, 98,193,215,192,158,111,
- 96,219, 37, 18,252,  6, 98,129,  0, 33,186,131,150,151,196, 43,144, 38,196,105, 18,191,234,177, 61,220, 51,227, 10, 22,149,170,
- 74,141, 29,251,206,157, 59,247,156,123,206, 81,127, 70,149,108, 10, 19,209,222,234,101,112,242, 18,176,178,  0,103,197, 98,236,
- 30, 72,157, 74, 17,197,162, 57,187, 52,156, 56,218, 75,158,101,237,150, 12,201,213, 96,163,158,  5,  0,201, 18,134, 57,244,100,
- 35,103,242,231, 82,107,131, 94, 82,163, 84,215,240,148,128,189, 78,  4, 29,  6,116, 75, 34,138,227,111,131,111,  2, 18,193, 74,
-245, 87,106, 25, 54, 68,162,118,151,162, 63,  0,173,146,  9, 21, 95,104,198,168,172,191,218, 92, 31,  7, 35,186, 86,165, 88,107,
- 78, 53,251,147, 30,157,146,246, 71,189,254,164,175,142,183,244,230,228,181,179, 55,122,195, 46, 69,140,197,243,148, 14,168, 70,
-147, 74,226,198,228,102,163,  6, 70, 32,157,220,105,111,207,155,246,196,159, 44,204,182,194,195, 16,251, 74,170,188, 87, 12,118,
-243,226,237,217,250,204,143,193,119, 74,250,116,243,  2,172, 24,  0, 42,166,109,135, 18,189,254,128, 10,244, 84,107, 73, 51,136,
- 55,176,212,178,204,233,210,148, 43,124, 63,  9,212, 40, 68,170,236,149, 57, 45, 34,202,187,181, 82,213,224,214,206,215, 55,148,
-124, 63,237,127,180, 11,249, 90,185,190,214, 90,163,231,121,230,212,217, 92,129,159,107,175, 72,102,246,157, 46,231,232, 75, 22,
-243,182, 51,241,  1, 41, 42,135, 74,197,125,151,154,  5, 79,193, 31, 28,138,230, 84, 77, 57, 74, 43,113,102,105,248, 34, 55,160,
- 31,136,208, 26, 22, 54,112,105,153,105, 41, 79,107, 13,214,122,237,153,115, 65,228,195,135, 58,213, 99,244, 72,250,154,  4, 75,
-139, 36,211,241, 87, 35, 96, 84,216,  1, 61,150, 73,115,166,181,243,249, 53, 50, 23,207, 21,236, 82, 12, 20,  8,170, 44,180, 20,
-195,228,240, 68,125,126,174,113,114,132, 73,174,148,110,  2,250,174,197, 26,165,236,205,165,173,189,206,238, 70,251,234,196,167,
-106, 52,206, 25, 48,107,164,189,109,101, 97,181, 51,128, 45,151,  9, 20,  4, 30,155,232,174, 67, 36, 15,117, 95,181,220, 64, 31,
-132,115, 42,220, 92,207,123,254,226, 25, 93,215,131, 56, 29,122,  8, 32,101,114, 67,131,151,182,105, 25, 74, 89,151,254,151,146,
- 35, 60,132, 37, 91,156, 89, 92, 93,188,208, 31,247, 48,234,141, 10,215, 70,186,194,196, 19, 45, 63,227,210,210,101, 47,244,195,
-200,227,202, 28, 58, 18,130,190,197,218,233,245,253,131, 95,148,229,168,200,105, 20,107,110,224,106,218,189, 82,111, 85,170,223,
-161, 79,149, 38,154,236,177,160,156, 24,198,129,169, 42, 39,250,204,233,114,157,118,116, 58,252, 81,213, 15,150, 48,167, 71,102,
- 22,193, 70,147,202,  7, 28, 87,161,120,160,223,143, 87,166, 87, 22,206, 15, 92,135,206,196,245, 66,173,154,175,140,129, 94, 36,
-186,105,147, 83, 75,137,194, 27, 35, 90,  6, 87, 98,124,128,254,128,117,231, 76,166,193, 55,109, 58, 33,229,213, 51,215, 21,207,
-199,166,109,218,  2, 33,158, 69,145,184, 82,169,178,229, 99, 72,  0, 96, 26, 21,153,227, 48, 55,160,228,158,134,161, 81, 40, 91,
-179, 77,192,130,176, 55,147,225,168,  7,104,  8,253,119, 12,201,  2,217, 64,239,  9,238,174,104,187, 91, 28,138, 96, 38, 45,123,
-143,121, 99, 36,235, 98,137, 81,244,252,175,106,149,101,147,244,191,154, 61, 57,  2, 84,  5,147,  3,246,101,151,125,250,192, 18,
-159,237,230,223,188,141,251,177, 79, 31, 15,141, 70,213,149, 85, 78, 26,217, 80,180, 23,249,180,213, 37, 90, 27, 26,132, 35,  8,
-180,101,216, 59, 71,221,163,197,  9, 14, 92,138,174,228,222,214,221,119, 63,222,183,230,218, 94,128, 57,149,237,135, 79, 59,191,
-191,190,218,123,233,139,112,228, 58,221,131,110,231,207,247,129,231,140,189, 49,135,147,132,216, 31,118,161,246,154,130,230, 65,
- 33,148,  3,207,170, 66, 57,225,198,173, 59,247,183, 31, 60,121,244,120,126,122,190, 51,248, 69, 95,236,242,242,230, 79,136,199,
-197, 74, 45, 24,245,202,208, 27, 10, 52, 90,235,244, 22, 34,133, 56,130,127,130, 54,157, 73,183, 63, 87,135, 39,129,208,186, 96,
- 70,214,103,159,170, 28, 59, 20,161,169,203,100, 40, 98,225, 36, 10,241, 97,184, 51,134, 22,248,126, 76, 67,  8, 50,205, 68, 35,
-245, 89, 74,121, 61,254,211,235, 85,163,154, 73,172,164, 82, 83, 41, 64,238,210, 13,160,244,200,187,248,  8,136,204, 20, 50,180,
-233, 47,207,136,203,149, 66, 85,141,  6,131,172,249, 87,  0,166,174,101,183,105, 32,138,142, 29,231,225,184, 73,156, 54,  9, 21,
- 40, 52, 17, 80,136,160,188,  4, 82, 17,170, 88,176,101,  1, 95,192, 15, 32, 62,131, 37, 31,193,146, 63, 96,  5, 59, 22,172, 64,
-168,  1,245, 69, 66,161, 78,168, 29,146, 56,142,199, 79,238,153, 73, 42,150, 81,163,218,153,153,123,230, 62,207, 57,195,119, 77,
-112, 82, 23,165, 32,159,148,139, 92,106, 80, 33,219, 31, 11, 97, 17, 76,112,136,107, 99,228,218,132,  0,203, 14,157,116,201, 85,
-137,191,209,225, 38,255,119,107,227, 54, 20, 91,  2,126,189,117,179, 81, 65,222,131,254,225,137,243, 43,  2,169,147,159,198,  8,
-121,144, 77, 43,154,232,151, 32,127, 57,  8, 22,165,134,255,154,251,171,197, 53, 32, 14,108,141,  0, 19, 68,196, 20, 91,133,232,
-117, 73,165,168,166,146,102, 78, 39, 22,237, 95, 85,176,190, 89, 99,139,236,220, 92,169,105, 11, 26, 31, 89,249, 70,170, 46, 76,
- 99,193,213, 23, 19,136,211,145, 50, 13,179,164,155, 51, 62, 41,229,202, 46,199,152,131,174, 21, 30, 92,123,184,111,237, 61,190,
-245,248,219,113,215, 67, 71, 96, 74,190,124,217,168,238,246,191,246,237, 94,197, 88,149,114,219,117,115,221,241, 29,224, 66,243,
-230,151,225,238, 32, 30, 57,170,231,169,115, 59,153, 56,161, 59,139, 60, 13,  6,153,246,157, 99, 29,137,112,168,187,145,137, 26,
-121,163,179,222,177, 92,139,214,155, 54,128,222,132, 39,225, 52,240,200, 55,124,182,253, 52, 82,194,189,225,145, 23,251,149,178,
-169, 23,140,238, 97,119,231,222,206,249,246,165, 94,255,251,170,153,230,114, 44, 84,253, 88, 17,221, 84,226,134,150, 50, 98, 97,
-156,  4, 60, 13,230, 97, 93, 47,145,255,149,207,130, 25, 61,147,128,122,204, 75, 34,180, 88,160, 36, 72,  6, 75,239, 64, 54,155,
- 76,108,242,225, 51,246,248,143, 23,204, 64,146,158, 45, 68, 81,172,193,219, 85, 86, 75,146,192,  7,213, 68,169,  4,134,  4, 23,
-200,253, 21, 90,153,193,248, 36,131,177,100, 77,214,198, 49,159,188, 24, 62,194, 62,145, 67,100,187, 67,220, 67,133, 21,218,136,
- 57,159,211,105,166, 61,221,190,182,189,219,251,218,172,183,134, 99, 11,227, 17,105,124,239,242,253,195,223,123,228, 44,147,113,
-134,162,167,184, 81, 89,199, 73, 99,104, 43,164,243, 94,210, 43,244,160,  5,107, 69, 28,147, 53,202,168, 13,140,240,228, 80, 75,
-230,107,224,161, 40,161, 96,  4, 47,127,229, 66, 39,138, 56,121, 21,175,158,191,254,126,220, 29,207,198,135, 39,135, 92, 72,232,
-145,  5, 18,250, 19,132,249, 28,158,215, 86,235, 78,127,216,  3, 15, 40, 65,185,146,217,218,184,209, 27, 30,132,  9,121, 47, 20,
-110,250,232,135,203, 25, 20, 66, 81, 92,184,148, 20,150,211, 35,216, 64,242,253, 41,168,162, 15, 77, 72,143,205, 64, 69, 32,100,
- 76,232,182,128, 16,143,176,  3, 25,196,  8,228, 74, 95, 60,121,121, 52,232,  7, 17,146, 93, 20,254,238,116, 30,217, 19,  7, 21,
-102,166,153, 43,149,159,118,111,  6, 82, 45, 73, 44,151,145, 98, 38,180,158,205,213,139, 30, 66,  1, 38,200,121,132,226,156,160,
-158, 84,165,134,167,162,108,212, 90, 19,239,175, 53,250, 61,  7, 21,  4,129, 59, 22, 35,175,101,167, 73,224, 30,216,157,205, 58,
-171, 27,  0,143, 57,103,163, 41,240,157,243,148,  7,140,162,195,242, 26,126, 23,208,221,227, 66, 99, 22, 52,174,170, 42,241, 61,
-135, 78, 26, 13, 73,246,172,186,204,185,171, 72,203,196,  1,115, 71,204,117,208,  3, 67,103, 57,151, 95,230,100,206,202,167, 18,
-229, 37,220,251, 44, 61,101,214, 62,219,237,178,129,133,158,106, 87,115,222,235, 31, 28,167, 32,238, 67,201,155, 46,244,198,229,
-117,133,161,124, 65, 54, 40,238, 47,193, 78, 47, 73, 94, 41,144,242, 56, 47, 22,138,180,212, 66,129, 15,182, 76,151,113,183,255,
-141,190, 64,184, 33,170, 59,211,183,239,222,252,176,126, 20, 33,155,172,110,158,223,244, 67,174,231,244, 86,163, 53,153, 79,174,
- 94,216,164, 61, 93, 51,106,110,224,  6, 96, 82,226, 12,227,102,250,216,251, 11,150, 45,103, 84,210,171,159, 63,126, 58, 62,237,
-209, 51,107, 43,141,163,225, 17,221, 43,173,115,237,118,173, 13,117, 61, 69,169, 26, 85,215,119, 35,201,107,178,108,121,161,151,
-187,221,190,235,205,103,127,166,  3,176, 33,  9, 47,252, 76, 47, 61,155,201,161,139, 47, 17,212,169,106,166, 92, 48, 35, 49,175,
- 32, 82, 46,197,139,141,141,177,  7,190, 88, 58, 34,157,230,117,182,240, 95, 83,122,144, 47, 84,237,196,104,137,100, 76,148,254,
-191, 68, 95, 89, 68,100, 11,202, 84, 38, 84,251, 82, 41,139,141, 79,245, 82, 13,178,  1, 75, 10,121, 76, 41,229, 81,184, 14,196,
-204,221, 63,  1,120, 58,151,222, 38,174, 40,142,207,120,222,143,140, 61,198, 15,220, 36, 78,  0,131, 40, 68, 74, 40,233, 38,176,
-  4, 85,173,212, 86, 85,213,  5, 59,250, 21,186,235, 87, 97,  5,203, 74,  5,193,162, 69,162, 32,  4, 98,209,138,240, 16,160,138,
-146, 56,224, 70,121,186, 78,108,103,198,177,227,121,244,127,206,117,216, 57, 94, 68,215,115,207, 61,247,252,207,156,243, 59,178,
- 69, 47, 15,241,  0, 53,132,180,182,230, 12,168,146,142,206,155,107,102, 67,106,218, 28, 13,198,214, 84,163, 90,168,133,131, 14,
-247,235, 71,169,232,168, 26, 97,240, 25,  2, 66,225,176, 44, 70,141,208,116,218,152,  2,111,108, 87,193, 43,117,123, 59,216,200,
- 49,211,135,213,246,162, 96,166,250,217,235,247,207,196,216, 99,238,122,133,106,118,250,132,184,201,  8,242,176, 60,  2,  9, 36,
-146,104, 90,225,216,210,210,168, 35,220, 49, 29, 92,233, 56, 30,204,153, 78, 29,221, 41,122, 69,  4,131,142,238,134, 81,120,110,
-250,243,149,141,101,124,  3, 79,180,180,249,142,239, 79,146, 75,162,251,134,171,131,224,178, 41,135, 67,129,231, 48,132,  5,240,
-241, 85,121,217, 99,176, 27, 28, 87,194, 10, 30,236,127, 90, 61,107, 27,238,171, 15, 47,225,142,109,221,222,227,120, 42,101,224,
- 55,254, 73, 57, 59, 49,225,143,183,204,222,195,165,199,  8, 73,217,227,136, 81,131,137, 52,  2,243, 81,174,156,202, 77,241, 44,
-201, 14, 76, 59,163,209, 27,200,193,192,200,168,167, 10,199,176,248, 97, 26,125, 51,251, 85,163,189,  6,  7,209,216,253,119,190,
-118,126,225,252,194,165,159,190, 16,251,244,219,181,223,183, 26,155,191,222,191,113,188,116,208,143,210, 87,141,102,187,215, 15,
-136, 63, 41,176,198,196, 18,160,202,130,  4,167,120,255,226,116,197,181, 13,248,129,193,  1,229,  4,178,174,181,210,239, 15,225,
-187,105, 22, 43, 37,220, 97,117,182,154,234,225,196,106,247,131, 68, 57, 55,218,192,169,226,137,229,245,183, 34,124,240, 76, 31,
-  7,227,117,227,165,152, 34,161,168, 90,193, 59,186, 27,108,199,113, 12,197,147,115,243,120,230,220,245,147, 32,216,255,126,225,
-135, 59,127,221,130,181, 16,  2,151, 83,249, 89,215, 31,247,171,111, 86, 95, 40,204,191, 82,101,213, 52,236, 78,184, 51,126,100,
-170,236,151, 94,212, 23, 33,251, 39, 75, 83,239,183,235, 80, 48,134,110,230,189,210, 17,215, 95,172, 63, 53, 53, 85, 36,129,152,
-251, 16,215, 42,167,151, 55,222,137,160,  6,207, 31,122,156, 56, 45, 81,255,187,133, 43,191, 60,186,254,229,252,183,143,223,220,
-135, 22,132, 94, 70, 76,100,168, 22, 67,110, 18,147, 91,154, 53, 69,155, 59, 54, 15,123,153, 61, 62,247,224,249, 31, 51,211, 51,
- 79,254,126, 66, 51,  8,228,184,228,149,119,130, 22, 60,187,165,185, 16, 46, 30,219, 54, 68, 12,226,110,162,  0,166, 82, 48,232,
- 50,202,144, 65, 60,212,104,150,112,226,149,156, 44, 33,163,211,  4,247, 68,135,185, 37,130, 33, 92,206,150,119,122,187,220,190,
- 20, 49, 76, 68,177, 85, 27,151, 14,252, 21,150,221,108,175,121, 86, 14, 46, 56, 71,  9,156, 24, 49,184,202,136,176,172, 69,204,
-181, 74,238,104,179,211,172, 22,170,141,102, 67, 85,148,176, 31,178,106, 39, 36, 53,214, 25, 30,236,205, 85,103,219,251, 93, 92,
- 84, 91,221,173,136, 32,204, 42,214,217,234,182,176, 58,242,199,  4, 67,198,237, 34,235,154,108,106,  4,206,119, 73,195,103, 46,
-158,253,186,216,252,243,194,207,151,165,162, 45,117,  2,105,179, 41, 53,219, 82,123, 47,234,  6,177, 57,102, 76,158, 97,  4,153,
- 28,172,254, 19,174,175, 40, 60, 96, 73, 33, 31,158,209, 84,162,255, 51,195, 93,163,248, 93,215,216,197,243, 55,172,151, 40,231,
-131, 63, 45, 71,202,251, 82, 33, 47,249, 57,250,156, 49, 15,251,155, 34, 41, 25, 72, 65, 71,250,175, 37,181,218, 84,183, 19, 69,
- 98, 12, 68,122,219,188,249,182, 59, 80,169, 96, 60, 30,245, 28, 70,124, 72,136,198,  5,211,201,218, 89,252,244,245, 54,105,235,
- 33, 95,144, 56,171,  8,216,161,182, 38, 11,213,181,214, 42, 12,213,177, 28, 60, 29, 28,226, 33, 77,231,  8,248, 62,137, 15, 89,
- 46,202,143,151,175,222, 93,188,231,123,121,216, 82,173,114,178,190, 81,231, 20, 66,172, 27, 54,118, 18,183,117,204,112,  8,102,
-126, 83,242,199,181,115,216, 35, 74, 69, 18,221, 54, 30,115, 33,220,183, 41,227,192,181,236,  2,154,132,231, 12,  1, 89,114, 43,
-187,253, 14,171, 82,241,142,137,204, 84, 64,178,169,121,141,232, 26,212,145, 68,232,  8,238, 14,129,  9, 67, 43,200,212, 44,217,
-203,200,135,153,249, 36,169,125,114,186,190,185,244,241,205, 41,205,215,225,153,124, 17,165,113,100,146, 10, 36, 91, 18,158, 47,
-148,240,  0,155,143,158,149,194,117, 67, 51, 82, 30,254, 71,181, 27,105,  4,247,165,103,104,162, 39,162, 49, 46,106, 23, 27, 32,
-216, 75, 92, 66, 44,170,144, 14,171, 75,254, 23,128,169,171,233,113,155,138,162,207,118,236, 73, 50,147,169, 67,154,143, 78, 51,
- 73,153,  1, 81, 80,171, 82,129, 16,234,134,  5,236,134, 13, 98,199, 95,232,239, 67, 66, 72, 84,106, 23,172, 16, 21, 51,162, 85,
-129,142,210,137,243, 49,137, 19,219,177,227,239,216,220,115,237, 65, 72,179,138, 38, 31,239,249,221,247,206,185,239,222,115, 74,
-252,206,130,192, 16,196, 33, 88,138, 72,203,119,  1,228,156, 82,230,167, 56,162,226, 44, 93,185, 11,162,141, 53,173,206,151, 12,
-255, 83,187, 87,160,154, 84,211,170,232, 17,151, 37, 22,239,149,245,253,230,131,193,163,153, 53,237, 53,143,232,108,128,215,101,
- 26,108,  1, 27,179,165, 53,227,154,210,178,157,165,148, 52,230, 19,252,191,194, 35, 26,102, 99, 79,167,233, 81,113, 86, 71, 68,
- 46,224,219, 39, 67, 52, 24,110, 80,172,169,122, 88,215,189,173,211,111, 15, 93,223,102, 81,242,124, 97, 95, 19, 18,167,184,245,
-160, 12, 87, 42,135,220,110,180, 63, 61,249,204,143,130,  4, 86,244, 96,205, 57,107,177,118,110,117, 30,159,126,113,121,253, 55,
-219,168,226,234,140, 34,159, 86, 17,  5, 11, 33,104,250, 49, 65, 26,194,112, 89, 72,133, 36, 50, 17,234, 12,202,245,114, 38, 11,
- 63,113, 70,249,165, 17, 27,135,245,250,126, 77,227,108,175,132,128,  0,209,102,165, 84, 73, 99,108, 69,155,109, 37, 87, 17, 54,
-177,148,250,187, 32,202, 19, 63,246,198,182, 49,182, 38,147,245,236,217,219, 95, 47,230,127, 93,174, 71,116,172, 94,217,198, 38,
-116,166,231,198,171, 23, 23,123, 52,238,141,250,106,244,231, 59,211, 80,115,249,195,110,117,234, 58,180,186,144,156, 86,216, 86,
-134, 45, 32,138, 42,114, 26,227,160, 81,239,213,106,132,239,181, 84,168,137, 80,133,100,135,169, 21,196,174, 31, 67,125,141,198,
- 22, 38,  7,185,114,237,109, 10,224,207, 88,105,103,109, 33, 91,127, 71,239,123,129, 67,255,178,112,103,123,184,185,130,243, 49,
- 55,106,163,211, 16,224,118, 23,219,222,154, 14, 39, 58,134,233, 17, 60, 28, 60,254,229,226,167,246, 65,175, 84,  5,128,  8, 16,
-130,  3,174,214,117,189,219, 60, 98, 21,  1,120,210, 19,164,154,172,141,249,122,138,185,145,101,218,238,251,239, 13,118,136,174,
-173,229, 66,157,113, 27,123, 68,136, 43, 10,244,233, 14,107, 77,122,197,246,215,180, 14, 32,225,128,242,  0, 46, 61,202,176, 63,
- 78, 87,227, 77,232, 62,188,247,136,160, 43,205,106, 91,239,210, 97, 71, 76,145, 88,209,247, 79,126,184, 90,142, 52, 78,143,152,
-206, 98,188,184,210, 20,184,249,152,206,202,245, 55, 79,207,158, 62, 63,127,190,163, 51, 22,125,155,210,105,239,116, 97, 79, 63,
- 25, 62,248,250,171,111,206, 95,255, 65,  1, 63,104, 15,233, 71, 10,248,226,222, 42, 68,144, 42, 44,143,122,210,125,159, 98, 91,
-223,111,133, 81,112,246,249,183, 10, 42, 95,163,219,  7, 45,244,196,101,  9,109,211,119,155,119, 29, 52, 61, 33,225,205,141, 42,
- 89, 16,194,181,150,120,  9,124,221,165,188, 81,109,  4, 73,116,220, 58,118,139, 42, 79,  5, 82, 75,117,173, 26,224,214,216,183,
-  3,155,102,251, 94,119,184,114, 77,133,137,186, 42, 85,  2,126, 92, 51,107, 62,181, 38, 26,179, 64,220,232,196, 33,173,106,232,
- 28, 68, 94,171,209, 78,160,196, 80,106,224, 43,220,162, 84,211, 26,114, 22,153,155,145,153, 68,119,222,184,205, 39, 67,132,188,
-181, 21, 27,159,240,123,130,247,251, 10,193,163,138, 26,175, 22,222,252, 31,214, 17,225, 26, 59,118,166,174, 48,219, 69,146,189,
- 16,112,215,248,175, 34,151,187, 60, 17, 64,108,244, 20,159,137,216,110,133,101,  9,115,  9,120,190,156,136,229, 84, 44, 12, 49,
- 55,196,248,157,152,205,133,227,138, 56, 42,197,199,104, 75,253, 89,251,241,220, 87,235,149,211,131,214,190,162,234,106,245,254,
-209,253,181,183, 78,185,107,145,150,223,160,221,167,145,110,184,129,238,198,129, 23,224,158,102,239,187, 47,207,126,123,251, 50,
-193, 77, 53,209,143,136,192,175,  5,109,247,168,236,146,206,196,199,199, 31, 93, 59, 75, 10,204,223, 47, 95, 46,157, 57, 65,123,
- 38,236, 40, 18, 33, 96, 10,117, 13, 41, 11,147,176,163,119,130,208, 39, 84,190,114,204,147,222,  7, 65,228, 15, 59, 67,211, 49,
-137, 25,208,148,210,119, 82,124,208,135,167,220,214,192,250, 31,196,122, 97, 35,234,  5,158, 75, 65, 17, 71,226,102,235,204, 10,
-227, 51,174,132,161,  7,135,173,185,176, 67,224,166,135,226,134,144,208, 92,209,229,  7, 90,  6,255, 82,192,110,199,183,224,132,
-161,224, 14,155,243,142,200,135,241,180,171, 85,181,138,108,  7,225,191, 66, 16, 58,191,241,219, 45, 43, 12,101, 38, 61,184,126,
-208,160,150,  1,156,122,164,247, 77,119, 73,171, 93,211,106, 49, 26,247,164,  2,115,148,178,195, 55,217,247, 34, 83, 68, 47,253,
- 43,  0, 77,215,210,218, 68, 24, 69,103,146, 73,102,166, 73,154, 52,237,180,241,217, 90, 31,104,209,138,182, 98,197,199, 82, 92,
-232, 78,244, 71,  8,254, 20, 23,254,  1, 17,220, 42, 72,193, 74, 65, 16,220,169, 84, 67, 45, 72,209,182, 65,211,152, 38, 77, 39,
-153,204, 43,243,136,231,222,111, 10,217,  4,194,132,153,185,223,125,158,123,206, 33,126,102, 40, 52,233,233,114,172, 66,226, 79,
- 21,166,230,167, 23, 26,157,186, 36,224, 59,169, 68,111,214,  9,237,132,228, 42,225,180,161,242,  5, 49, 47, 35,103,  7,177,207,
-101, 31, 87,129,129,215, 48,235, 98, 10,102, 58,  7,182,107,193,  5, 20,114,163, 48,127, 30, 42, 19,203,144,145,159,204,102,116,
- 46, 72, 99,209,218, 23, 45, 26,214, 90, 35,152, 57,142,193,189,171, 15,182, 16,253,184,247,  7, 83,198,125,162, 52, 30,146, 54,
- 47,114,127,255,220,209,243,219,205, 95,212,  5, 75,137,174,172,160,103, 34,222,109,102,  2, 34,109, 15,188,251, 70,103,215,246,
-122,130,148,158, 84,168, 50, 90, 24,  7, 77,179,209, 52, 73, 20, 70,180, 60,202,196,  3,236,150,115,134,237,117,253,192,117, 17,
-141,252,126,200, 11,210, 36,110, 17,  5, 94,236, 69,130,128,152,206,134,220,215,144,130, 51, 35,183, 88,102,227, 57, 65, 74,192,
-187,197,178,136, 24,170,146, 66, 16, 45,166, 49,240, 71,161, 61, 33,114,247,170,164,107,  4, 78,200,164,241, 19, 59,114, 90,254,
- 65,221,106,124,217,169, 46,175,189, 95, 94, 91,121,177,252,106,181,186, 82,221,169,186,129, 77,115,213,161, 95,239,218, 50,243,
-146, 43, 25, 28,  0,158,120,193, 35, 40, 44, 94, 30, 75, 89, 41,117,249,184, 49, 99, 20,141,113, 36,115,  8,239,202,184,138,240,
-136,171,135,163, 48,179,  1,109, 65,247, 41,181, 87, 35,102, 71,147, 19,152, 21, 44, 85,211, 24, 51,131,154, 70, 44, 55,139,252,
- 97,218,152,237,186,102, 24,210,210, 16, 28, 58, 92,127,165,120,180,109,183, 17, 71,247,237, 22, 35, 64, 82, 99,249, 49,155,200,
-220,229,  4, 24, 71, 88,251,176,160,229, 81,235,224,  1,226,  9,239,117,155, 52,123, 79,192, 78,212, 58,116,  6, 14,203,168,146,
- 21,227,180,215, 90, 59, 55,230,238,184,196,229,233, 60,188,245,240,219,214, 87, 45,147,227,148,153,  6, 54,188,136,143,226, 82,
- 42, 21,198, 81, 83,247, 29,107,163,182, 14,135,142,183,223,195,153,145, 83,186, 66, 37, 66,173,185, 61,136,  8,110,120,164,124,
-252,201,253,167, 11,119, 23,191,127,254, 54, 64, 74, 22,  6,112,184, 87,238, 47,238,254,220,245,  3,167, 88, 16,187, 48, 38,238,
-255,212,228,236,219,143,175,241, 66,166,167, 78, 35,116,225, 69, 95, 59,115,125,223,106,177,162,108, 78, 75,171,112,138,136, 52,
- 49,175,248,193, 26, 97, 39, 45, 22,171, 34, 63,194,189,146,146, 62,102,249, 93,121, 40, 11,153,179, 74,169,114,241,196, 60,114,
-154,158,211,211,179, 42, 27,  4,101,236,249,172,190,215,221,155, 49,102,104,249, 37,142, 74,185, 18,141,235, 89, 63,137,182,246,
-  6,110,219,218,231,205,172,145, 20, 75, 11,113, 29,169,223,186,112,179,113,208, 16,112, 64, 78,105, 67,252, 17,210,  2,158, 55,
-210, 70, 55,123,118, 70,219,137,102,102, 52, 80, 85,125, 60,111,248,177,183, 99,185, 75,161, 34,205, 77, 72, 29, 75,178,250,146,
- 71,228,  8,  3,207,117,205,150,211,110, 56,157, 58,  9,201,202, 98,194,119,168,114, 75,151, 99,  4,164,194,254,157, 62, 44,217,
- 65, 94, 62,147, 80,254, 50, 60,147,239,137,233,193, 80, 17,194,247,121,158,228,249, 52,194, 13,121, 19,121,200,236,182,105, 94,
-181,248, 84,144, 59, 23,163, 98,225,229,247,119,207,215, 63, 60,171,174,190,169,109,252,104,254, 62, 63, 90, 41,169, 57, 63, 70,
- 25, 26,247,136,195, 46,228,  5,147, 33,203, 65, 14, 43, 99, 71, 96, 60,184,235,127,230,158,217, 55,231, 78, 94, 66, 46, 76,211,
- 84, 86,239, 66,154, 72,174,144,207, 35,158, 85,121,164,140,212,194,243,188, 71,183, 31,255,109,255, 69, 44,135, 21, 45,157, 93,
-154, 42, 79,214, 90,127,136,112, 62, 12, 28,215, 62,102,156,216,220,221, 52,138, 19, 77,147, 58, 42,125,175, 15,123, 19, 92,140,
- 18,139,214, 32,240, 19,253,  3,117, 18, 34, 61,163,195,113,249,204, 29,116, 40,209,116,216, 44, 30,198, 66,164,134,248,113,105,
-210, 67,168,247,188,158,143,121,225,153,201,124,184,153, 38, 37,205, 12,122, 90, 52,124, 68, 66,152, 86,216,161,115, 71, 90, 81,
- 24, 76, 35,190,198, 44,126,144, 22,184, 22,142, 17,236, 80,185, 25,195, 21,237,136,170,  9,160, 29,179,151,208,108,181,231,246,
- 16, 28,131,200,247, 19,  4,179,128,242, 36,126, 29,199, 10,102,128,180, 73, 78, 49,224, 91,146,254, 11,192,211,181,244, 54,113,
- 70,209,177, 61,227,177, 61,227,137, 51,113, 66, 18, 59, 33,180, 38, 64, 27, 96,  1,  8,209, 69,133,120,108,187,105, 89,177,  9,
-191,134,127,208,127,208, 93, 85,169,221,244, 23, 84,168,106, 21, 85, 77, 91, 90,136, 16,113,130,157, 24,219,243,126,120, 30,158,
-222,115, 63,131,228, 85,236,248, 49,115,239,253,238,227,220,115,  4,126,166, 36,186, 63,  2, 44,136,147, 13,156, 12,179,137, 63,
-142, 65,180,141, 15,107,214, 76,242, 34, 10, 81, 87, 54,175,223,249,244,206,209,217, 43, 70,148,163, 26, 96, 33, 41, 44,155, 49,
- 75, 12,200,129,121,138, 34,173,183, 54, 88,191, 41, 96, 78, 36,132,221,132,181, 50,  4,147,113,  1,240, 89,195,139, 93, 25, 52,
-249,216,120,204, 88, 31,131,254, 61, 73,163, 26, 31,170,100,206,166,214, 62,157,190,173, 48,155, 94,190, 16,139, 78, 69,241,  3,
-  6, 78,186,133, 73, 44,139, 82,  4,113, 22, 53,150, 86,173,  3,255, 46,232,179,138,162, 81,215,233,  7,164,120,166,208,235,  6,
-253, 21,155,129,176,103,153,106, 97, 70, 43,161,147, 56,  3,174,142,234,131, 40,227,169,170,144, 45,226, 54, 44,174,109,199,220,
- 94,210, 90,222,204,226, 29,196, 82, 42, 23, 88,228,159, 87,120, 14, 73,133, 30,133, 54, 28,114, 20,139,139, 76, 48,224, 23,224,
-  4,228,101, 72,177,147,204,106, 86,101, 40,156,226,  6,151, 22, 51, 22,152,140,112, 52,212,192,144,109,200,149,249,188,156, 36,
-146, 19,  5, 86,224, 14, 93,251,141, 55,254,227,108, 52,240,  2, 59, 73,173,217,204, 73,178, 32,161,220,132, 30,168, 67,233,149,
-210,188,100,133,137, 27, 37,178,218,252,253, 36,248,119,234,244,125,255, 52,136,198, 81,220, 49,174, 13, 66,200,155,125,185,251,
-184, 82, 82, 71,225, 80, 41, 55,  4,210,  9,196,145,204,227, 50, 75,  3, 64, 31, 10,244,  1,200,145, 90,250, 10,  0, 12,209,148,
-215, 64,180, 52,203,206, 28,138, 53,160, 75,219, 93,191,138,192, 45,229, 77,181, 25,  1,131,161,136,210,135, 87, 48,208, 91,227,
-182,105, 72,247,244,230,206,173,219,189,187, 47,251,127,105, 53,  3, 29,253,178, 76,206,147, 64, 75,179, 74, 49,136,145, 26,234,
-155,243, 87,148,236,255,115,242, 39,165,243,148, 38,255,118,244, 43, 93,148, 85, 99,237,233,131,125,242,134,222,250, 46,160, 50,
-177,141,128, 91,173,187,129,189,255,213,126,255,236,152,206, 99,224, 70, 42, 42, 61,168,222,234, 46,119,111,239,222, 61,159,158,
-147,245, 83,128,126,241,247, 47, 86,127,162,200,178,217, 92,177,  3,251,193,253, 71, 63,124,247,189,174, 25,189,238,229, 43,155,
- 61,203,157,108,183, 47, 57,177, 59,152,244,233,135,127,243,197,147,145, 61, 26,217, 67,144,149, 94,186,177,183,179,247,242,221,
-127,126,226,197,204,192, 81, 85, 26,116,114,146,145,212,149, 26,172, 34,205,186, 43, 59,144,  3,193,249,132,145, 67,206,151,144,
-236,136,210,  5, 63, 10, 78,198,199,150, 55, 98, 30,214, 68, 90,180,101,  1,159,165,200,  2,195, 40, 50,178,240,182,209, 38,171,
-190,190,189, 71,102,252,248,198,163, 38,172, 17,117,207,179,135,207, 14,143, 15,123,107,159,116,204,141,177, 75, 87,190,240, 66,
-  7,172,218, 56,117,  0, 44,185,208,186,192,209,181,  2, 82,238, 60, 99, 33,160, 98,169,177, 76, 17,106,195,188, 24,165, 62,185,
-167, 12, 78,161, 40, 45, 23,242, 32,216,186,183, 37,249,  1,227, 35, 99,138,238, 32,148,  6,243, 91,194,162,193,112,148,178,160,
-235,  4,136,175, 36,218,255, 11,224,141,252, 97,196, 74,201,187,250,  1,255, 14,124,100,193, 47,224,150,140, 32,143, 40,125,100,
- 35, 95,104, 65, 73,156,104, 32,125, 57, 88,237, 31, 84,191, 61,252,249,235, 31,159, 31,188,127,235,132, 65, 91,169,191,143,166,
- 71,246,233, 79,195, 35,163,166,247,244, 54, 57, 87,204,189, 89,209,112, 23,196,174, 78,232,177,223,101, 97,  2, 64,157,229, 79,
-187,171,157,137,107, 69, 89,210,210, 12,202, 39, 38,254, 84,164,154,110,232,213, 85,232, 73, 80,248,123, 61,120,221, 80, 41, 77,
-196,200,135,  2, 55, 29,198,168,254,107,205,173,181, 29,214, 83,243,175,110, 94,163,119,160, 42,191,  4,114,148, 84,  8,249,210,
-183,133,  2, 33,184, 17,213,100,158,127,182,245,249,185, 51, 36,243,195,100,155,251, 10, 24, 56,169,106,202, 39,186, 16,167,  3,
-138,102, 14, 89,224,156,151, 11,153,141, 35,231, 62, 51, 93,157, 50,125,  7,208, 41, 86,170,166,102,154,250,114,138,245, 64,222,
-216,131,191, 51,228, 15,141, 46,232, 88,154,186, 73,102,176,210,108, 23,210, 98, 61, 91, 96, 44,121,120, 83,112,177, 43,233,170,
-214,168,130,147,191,179,188, 65,111, 64,213, 94,133, 43, 54,186, 99,138,172, 24,245, 37, 58,135,218, 75,235, 64, 76, 22, 41,152,
-218, 20, 64, 39, 85, 69,141,243,136,155,210,115, 49,129,253, 95,  0,166,174,165,183,141, 42,140,122,124,231,101,143, 61,227,177,
- 29,187,149,157, 72,233, 67,  8, 68, 35, 36,132,196,  6, 33,177, 64,149,186,175,138, 64,252,  1,246, 72,176,231, 31,240, 71,186,
-100,195,170, 45,168, 42, 72,  8,137,166,109,  2, 21, 73,112,130,243,168, 61,158,151,237,241,112,206,119,109,137, 77,148, 44,236,
-220,185,247,206,247, 60,223, 57, 27,126,  2, 13,209,151, 69,175, 91,186,228, 90, 90, 15,188,210, 10, 44, 83,161, 12, 89,141,163,
- 81,148, 70,179, 60, 98, 76,186, 66,136,232,192, 22,207,151,169, 36,254,172,  7,213,145,146,153, 38,110, 19,162,194, 57,156,140,
- 65, 62,124, 67, 42,110, 48,112, 28,108, 33, 50,103,209,160,141, 72,179, 69, 12,  3, 87, 72,137,243,122, 56,208,164, 66,184,217,
- 53,219,131,155,245,107,254,201,229,209,114,195, 89,136,199, 39, 95,246, 34,213,157, 92, 24, 92,169,255, 22,125,191,135,188,140,
- 51,171,202,218,221,218,197,  3,167,121,140,163,138,178,217,205,254,173,176,222,198,145,227, 17, 91,245,246, 36,165,254,148, 83,
-117, 74, 82, 36, 22,210,143,174, 12, 66, 78, 45,138,186, 54, 11, 83,134,142,111, 55, 35,201,228, 78, 64, 38,101,187,199,151, 71,
-204,186,216,229, 53, 60, 95,  5, 29, 43,128, 39,177, 77,215, 85,174, 83, 69,200,226,218,100, 90,175,187,172,213,152,  2, 86, 86,
-178,108, 67,190, 79,216,190, 86,107,205, 92,163, 90,209,  2,222,133,  6, 45,233,  9, 57, 46, 71,113,234, 82,201,255, 81, 50,194,
- 98, 58,146,  1, 88, 50,179,168, 36, 59, 18, 45, 78,228,177,180,172,133, 65,133,111,188,193,167,113,242,250,252, 77,160, 66,219,
- 96,247,208, 67, 10,105, 84,242, 50,199,234,146, 69,226, 59,173,195,241, 33,252,  2,226,148,142,215, 93,224,125, 95,201, 53,144,
- 99, 47, 68, 43,252,157,225,157,209, 20,241, 93,217,109,118,113,220,184, 94,  8,183, 75,241,165,  8, 88, 62,251,232,203,195,179,
-131,243,232,188, 20,194, 44, 44,  6, 78,  2, 55,  4, 59,179, 34, 68,157, 72, 21, 98,135,200, 99,182,192,126,142, 46,142,216, 66,
- 20,101, 21,223, 11,194,102,123,203,239, 15,187, 59, 12,243, 17, 51, 45, 51,199,106,124,112,251,195, 36, 79,187,205,142,235,212,
-242,121, 70, 16,116, 62,251,121,255,209,241,248,111, 36,242,167, 87, 39,120, 35,  8,177, 16,238,160,103,251, 79,115,145, 77, 16,
-157,144, 66, 52,126,157,150,215, 61, 26,255,137, 47,220,237,221,188,255,201,131,192, 13,226,121,124, 37,132,142,142, 66, 30,163,
-166, 17,161,208,179,108,226,152,222,171,127, 94,126,251,197, 55,143,127,123,132,152,174,237,133,207,143,255, 64, 40,253,246,173,
-119,183,251, 59, 63, 61,127,114, 48, 58, 32,156, 70,169, 45,255, 58, 59,168,156,127, 46, 61,171,129, 23,  9,238, 39, 89,206,236,
- 42,213,159, 53, 65, 30, 76, 73, 80, 35,146, 74,233,204, 81,225,241, 21, 34,253,126, 56,192,142, 94,107,245,226, 52, 25,178, 50,
-195,126,154,204,142,146, 39,117, 16, 14,  9,240,152,142,211, 60,123, 53,122,137,157,204, 68,143,247, 98,122, 25,103, 49, 78,119,
-146, 76,122, 65,127, 26, 79,  4,241, 93,193,110,227, 14,239,116,118,206, 72, 92,204, 73,228, 65,123, 27, 70,173, 89,107, 18,230,
- 47,220,168, 41,231, 96,113,  9,178,162,200, 56,134,106,170, 56, 91,190,191, 55,168,152, 75,132,240,101,146,206,231,243,  5,217,
- 71,215, 93, 40, 17, 22,221,168, 70, 85, 52,150, 19, 23,142, 23, 84,195,181,105,205,181, 77,119, 76,145,223,147,114,141,210,253,
-236,234,255, 32,121,107,162, 59,249,201,226,113,165,134,207,122,149, 31,234, 47,158, 46,190,223,255,241,187, 95, 31,246,172,230,
-215,239,221,251,106,239,211,207,223,250,248,238,224,142, 85, 26,191, 95, 28,252,114,246,162,168, 90,123,173, 33, 13,149,105,167,
- 50,109, 46,185, 53,109,253,141,107, 55,224, 44, 11, 50, 97, 24,112,204,216, 70,130,167,233, 67, 12, 88,127,100,147,182, 34,245,
-180,196,182,158, 86,197,105,184,245,134,237, 33,126, 23, 81,102, 58,214,116,153,199,121, 52,158,252,139,191,122,205,222,235,241,
- 95,176, 51, 88,169, 95,247,225,  0,132, 85, 38,150,145, 55,188,153,132,111,193,167,156, 77, 78,169, 45, 32, 53,106, 13, 42,135,
-165, 14,235,161, 52,222,248,212,248, 29,151, 10,182,142,243,234, 90,156, 81,102,151,164, 61,206,220,130, 98,245, 85, 85,200,185,
-164, 57,135,179,130, 90,232,185, 53, 68, 54, 38,211,247, 82,  9,185,150,197,100,222, 66,146,221,246, 59,211, 52, 82,236, 49,218,
-122, 34,105,131,144,100, 30, 13,195,189,221,221, 62,125,115,114,133, 48, 47, 79, 45,137, 21,197,118,240, 24, 97, 24, 97, 60,147,
- 60,210,  5, 76, 25,255, 91,227, 35,215,130, 33, 27,254,247,255,  4, 32,234,106,122,154,136,162,232,124,182,157,105, 25, 75, 74,
-181, 45, 37, 49, 80, 32,196,  4,163, 49, 42, 42,  9,137, 27,127,129,113,165,254, 17, 99, 92,185,244, 31,248, 31, 92,155, 16, 55,
-186, 34, 16, 23,106, 92,152, 54,138,148, 22,134, 97, 58,175,211,249,232,180,158,123, 95,193, 93, 67,210, 50,243,222,187,247,157,
-251,117,206,229,124,211, 20,240,132, 85, 29,168, 57,137,  6, 49, 72, 30, 51,187,236,217,185, 80,187,164,139, 31, 24,205,212,114,
- 82,102, 90, 42, 46,225,176, 44,215, 90,103,193,105, 99,190,233,141,188, 52,163, 70,  2,169, 12, 43, 19, 73,175,222,188,254,180,
-187,171,177, 13,164,140,114,105,166,127,174,162,147,102, 27, 73,175,193,156,176,214, 49, 17,111,210,202,177,222,252,152,187, 27,
-169, 75,167, 88,152,195,243,  0, 50,145,148, 26,223,122,120,195, 32, 12,100, 88, 88,159,111, 54, 42,139,158,192,221, 48,246,132,
- 71,217, 55, 77,135,115, 89, 95,220, 16, 35,193,116, 46, 58,182,156,152,209,166,114, 12, 74,231,227, 62,145,  1, 14,254, 23,124,
- 16,162, 30,160,123,146,134,224,106,203,132,199,172, 56,160,161,125, 26,166, 66,145, 98,155, 76, 98, 88,169, 91, 90, 78,161,237,
-  2, 52, 85,103,127,134,179,140,163, 41,157,199, 81, 26, 37, 99,169,133, 70,200,141,117, 46,166,146, 13,111, 74,110,  3, 95,180,
-115,134,109, 25,150,109,206,  1,160,194, 97,228,141,130,101,218,128,130, 54, 93, 24, 84,253, 50,184, 82,105, 50,251, 19, 61,176,
-154,142, 85,196,214,184, 43,177,186,  9, 98,152, 12,230,173,101, 50,237,163, 25, 83, 77,199,249,235,  6,253, 35,225, 29,  5,193,
-209,192, 63,241,  7, 81, 28,157, 71,126, 50, 73,143,  7,221, 76, 73,136,144, 89, 83, 99,196, 42, 56,209,234,164, 81, 94,194,123,
-217,164,126,181,112,103,245,222,215,206, 62, 23,254, 73, 13, 21,241,126,194,236, 67,119, 87,238,247,252, 30, 78, 46,224, 48,238,
-218, 98,190,244,124,231,229, 65,123,223,164,  9, 74,131,185,189,114,210,119,  0, 46,225, 93,225,139,137,158,124,146,193,  8,231,
-  9,206, 15, 75,182,  3,216,235, 13,253,190,127, 44, 34, 30,250,229,229,192,254,118,122,191, 40,161,169, 27,216, 38,149, 28,119,
- 86, 43, 55,184,138,163, 61,190,249,228,119,191,189,185,124,187,127,126,140,179, 95,117,170, 81, 28, 94,175,181,198, 60,242, 86,
- 42, 56,  0,245,113, 18,250,163, 65,171,222, 10,163,200, 23,110,217, 42,227,181,168,102,206, 34, 12,176, 76,199, 40, 13,105, 12,
-114,122, 46,220, 51,225,226,195,193,207, 61,119,224,194,173,215, 43,141, 83,166,204,253,219,237, 28,246, 14,111, 44,109,226, 62,
-192,147,135, 81, 24,166, 68,186, 48, 81,169, 89, 62,161, 73,184, 20,251,131, 95,182,114,121, 74,100,115,171, 51,156,114,129, 10,
-254, 82, 35,147, 32,139, 70,212,243, 70,154,140, 72,100,220,204,115,157, 45,102, 14, 83,226,145,103,228, 24,211,108, 29, 86, 12,
-119,182, 73,119, 33,126, 41, 78, 19,203,204,227,217,176,139, 52,  5, 29,139, 81, 60,122,180,241, 16,215,143,136, 67,234,234, 97,
- 51,241,  2, 87,106,206,134,145,144,210,228,196, 83, 79,205,238,154, 83,112,184,126,150,135, 69,100, 68, 28, 68,147, 51, 91,107,
-215, 20,199, 80,220,129, 26,197, 70,165,142,219, 49, 37,118,226,255, 52,104, 26, 83,208, 72,162, 29,109,102,171, 76,176,175,177,
-128,170,105, 40,150,174, 88, 57,197, 50, 56, 21,200,137,120,153,126, 80, 24,191,207,132,161,217,254,164,178, 74, 81, 85,198,  5,
-229, 99, 57,232,214,222,183, 63,191,221,251,176,122,165,241,110,231,197,246,245, 77, 55, 14, 69,154, 32, 56,188, 85, 93, 89, 46,
- 86,191,244, 59, 63,206,218,216,172, 53,231, 42,172, 50, 33, 14, 39,202,115,225,249,225,127,251,131, 83, 73,198,201, 19,136,170,
- 63, 12,152,215, 65,221, 90,127,128, 19,211, 15, 78,224, 83,113, 24,224,205, 19,174,200,202,126, 42,160,  4, 41,116,  7,192,199,
-148, 33,204, 95,164,235,136,189,112,122,101, 98, 89, 82,189,192,216,177, 29,205,133, 38,224, 63,246, 90,162,218,153,147, 34,117,
-151, 84,146,202,169,172,213,199, 73,133,152,211, 98, 83,217,152, 79, 21, 86, 38, 82,151,163,241,154,122,225,231,201,186,179,103,
-219, 79,191,255,249, 38,167, 49,121,174,158,134, 28,225, 33, 76,102, 42,204,  3,246, 98,231, 17,194,235,170, 85, 40,205,217,165,
- 48,164, 62, 93,167, 88,166, 38, 87,117,198, 54, 42,123,114, 97,  5, 34, 17,196,227,196,125,189,179,114, 41,251,238,140, 51,123,
-188,104, 26,187, 21,110,115,100,108, 61,145,129,197, 69,113,212,206, 21,255,  9, 64,212,181,244, 54,113,133,209,153,241,188, 60,
-246,100,236,144,196,164, 65, 14, 46, 50,132,150,  5, 42, 74,211,254,  7,150,252, 17, 86, 93,117, 85,126, 13, 91,196,130, 21, 66,
-  2,117,219, 69, 82,216, 32,133, 68, 81, 98,226,120, 50, 99,143,231,229, 25,115,206,119, 29,144, 34,111, 98, 89,247,249,221,243,
-189,206, 89,217,119,122,232,139, 34,165,153, 91,189,206,170,118, 71, 19,109,  1,197,212,184,210, 21,103,  5, 36, 83,172, 98,196,
-197,246, 11,131,182,231,120,209,252, 26,139,107,139,176,  4, 95,185, 21,207,146, 89,150,249,135,119,239,201,157,194,246,  9, 30,
-116,140, 27,158,190, 80, 29,148, 34,211,195,175,165,228, 23, 51,180, 85, 54, 89, 31,244,134,211,244, 90,180, 71,168,234, 73,137,
- 40,245,196, 73,  0,148, 75, 79,225, 67,109,119,243,238,201,248, 11,217,130,216,  7, 91,171,126, 11,153,103, 61,142, 47, 99, 41,
-  1,138,179,184,101,147, 77, 80,161,209, 74, 20,144, 43, 50,250,227,158,144,  6,235,225,157, 95,175,102,151,128,255,105,206,251,
-  3,152,153, 20, 51,233,183,212,164, 89,180,192,124, 25, 11,214,151,107,110,215,192,105,239,224,102,178,123,136,198, 85,170, 15,
-165,178, 70,136,210,201, 10,205,109,100, 11,147,213,104,  1,223,226,246,219,100, 11,113,128, 33, 93,219, 35,222,135,113,183,252,
-182, 21,120,214, 90,139,134, 94, 25,119,147,230,220, 96,184, 30,183,193,178,220,166,217,246,204,166,203, 85,115, 76,162, 29, 83,
-234,150,225,181, 45, 43,172,176, 94, 43,202,116, 38, 30,168,193,172,  3,  8, 88,246, 82,181,236,139,222, 88, 82,102, 73, 89,204,
-230, 89,156,230, 81,150,133, 73, 18,211, 64, 84,216,120,211, 48,162, 52,218, 31,252,142,197,137,178,232, 60, 60,207,181,  2, 70,
-167, 92, 46, 60,215,127,184,243,203,233,228, 11,236,108,152, 76,112,208,  3, 39,152, 48, 25, 91, 97,152, 71, 39, 71,240,  3, 56,
- 68,195, 98,149,238,146,138, 80,152,156,239,182, 73,234,217,112, 50, 41,157, 84,202,142,212, 42, 99,206,144,181, 68, 42, 70,199,
- 54, 19,194, 94, 22,  2,219, 34,143,  7, 59,248,116,255,233,255,167,135, 42, 44, 73, 50,187,134,153, 23,249,101, 52, 26,199, 35,
-120,105, 73, 62, 31,108, 15,147,116,  6, 96,190,168, 84, 81,154,222,147,232, 31, 28, 97,156,237, 40,  9,241,187,247,122,247,186,
-190,127, 60, 58,198, 73,243,155,237,205,206,102, 56, 13, 31,221,127,212,239,247,207,207, 47, 26,178,184,179, 36,249,251,249, 63,
-111,222,190,102,193,101, 93,176, 80,157,105, 12, 11,179, 56,187, 58, 83, 66,151, 58, 53, 78,177, 69,182,244, 34, 47,200, 90,106,
-183,218,174, 31,120,157, 36,157,118, 73,209, 94, 99,120,130, 43,165,177, 78, 55, 91,142,199,165, 96, 82,154, 76,223, 77,211,158,
-165, 83,219,180,240,215,235,246,120, 74, 55,118,139, 69, 62,252,105,136, 85,  2,  4,105,176, 28, 89,131,205,218,191,255,228,240,
-248,136,154, 68,123,127,  0, 12,116,154,116,106,129, 55, 47,174, 47, 56,170,186,252,237,231,199,211,249, 44,240,218,212,144,173,
-181,117, 63,  0, 22,161, 66,  8, 19, 39, 94, 94,165,174,105, 19, 30,194, 63,144,210,154,157,205,189, 34,155,252,185,187,161,247,
- 28,237,234, 26, 19, 50,182,135,203, 50,207,162,177,160,118,222, 46,213,233,173,204,181, 33,124,181,186, 18,115, 82,248, 29,159,
-142,232,172,183, 93,114,193, 59,148,140, 18, 92,175,254,251, 61, 56, 76,231,113,213, 81,133,183,228,204,169, 95,181, 62,124,154,
-127,206,199,127,253,251,178,163,187, 47, 14,158,221, 14,182,194, 60,139,231,115,204,101,171,179, 17,151, 89,191,181,213,247,186,
-239, 71, 31,255,187, 58,221,187,117,119,221,242, 22, 26, 67,223, 15,118, 30, 76,179,100,146,132, 79,  6,143,199, 73,168, 16,128,
-240,163, 44,215,219,235,216,187,195,147, 35, 28, 84,  9, 88, 47,  6,189,193, 87, 42,243,  1,144,249,112, 89,130,230, 26,188,189,
- 94,192, 22, 98,197, 71,  2,152, 79, 59, 94,151,  7,195,  3,160, 64, 33,214, 32, 92, 83, 13,237, 77,145,234,  5,242,184, 97,197,
-248,193,174,174,171,128, 17,150,136,129,  6, 67,249,175,240,119, 41,144, 64,115,239,212,210, 30,212,208, 45,156,156,134,176,234,
-242,230, 73,122, 19, 95, 24, 77, 70, 64,  0,188,235,124, 46,196, 56,240,212,153,242,  9,228,110,109,223,218, 41,107, 88, 18, 27,
-155, 71, 49,122,114, 22, 25, 66,101,152,227,216,  4, 94,160,  8,183, 53,  9,163, 85,213,141, 87,175, 64,165,228, 82, 49,101,178,
-126,145, 74, 76,  1,116,237, 70,186, 79,213, 83,254, 16,255, 54,132, 13,236,155,  0, 60, 93,203,110, 27,101, 24,181,231,226,185,
-218,227,113,210, 88, 77,220,210,139, 90, 42, 72, 55,128, 20,177, 65,162,155, 46,186, 70,130, 61,240, 16, 44,216,240, 24, 60, 66,
- 95,129, 23, 96,129, 68,165,170, 18, 36, 21, 84, 69,113,236,248,146,177,231,226,185,247,156,111,198,108, 44,217, 25,219,147,223,
-255,255,125,231,187,157,211,218,119, 60,149,  9,157,122,127,  5,105,119,164,154, 72,218,251,186,157,220, 33,255, 12,150,207,119,
- 14,162,116, 35, 41, 99,121,167, 80, 76, 70,100, 89, 82, 27,237, 49,233,209,172, 96,214, 40,103,161, 26,136,190, 11,194,159,158,
-240,  5, 50,151,126,228,221, 14, 17, 87,114,147,105, 66,234, 85, 54,148,129,101,213,228,204,249, 10, 64, 77, 41,161, 16,252, 31,
- 59,243,186,245,126,104,139,158, 12,135, 83,164, 58,106, 32,161, 40,222, 44,162,101, 83,179,253,127,246,  2,247, 68, 58, 89,206,
-236,228, 61,218, 76, 61,151, 82,  6,126,227,106, 47,148,169,200,255,120,124, 48,169,229,160,222,196, 65,243,102,216, 74, 81, 28,
-132,  1,101,110,139,205, 42,244, 59, 44, 65,231,157, 84, 51,235, 74,215,163,184, 74,243, 58,217,149,187,180,146,108, 33,214, 71,
- 53, 12,160, 48,197,160, 40,186,210, 20, 85,  0,240, 13,162,117, 34,113,211, 64,248,210,117, 96,208, 97, 60,122,226,247,169, 19,
-212, 21,234, 46, 38,121,100,128, 16, 27,129,253,200,236, 74,169, 26,178,191,174,136, 89, 43,182,193,107,240,216,119, 53,215,213,
-134,  3,221,181,117,215,209, 44,184,  7, 83,241, 92,205, 48, 85, 11, 95,  1,235,  2,103, 66,249,109,178,243,232,134, 74,213, 62,
-216, 49,155,  3, 44,149, 10,252,158,  7,217, 54,200, 67,  0,132,191, 23,255,174, 83,233, 53, 82,107, 93,167,138,244,189,195,251,
-216,247,179,237,204,232, 89, 35,107,132,237,  8,107,206, 59,237,106,247,142, 30, 46,194,153,129,224, 82,248,182,112,171,  4,239,
-100, 53,194, 82,155, 48,178,192,158, 64,166,156,238,211,200, 43, 73, 94, 79,230,179,212,170,219,232,161, 75,121,174,165, 32, 82,
- 88,244,128, 47,233,185,128,225,255, 45, 47,129,227,109,211,109,114,223, 34,199,173,103, 34,118,  8, 75, 77, 26, 78,171, 15,115,
-207,140, 36, 63,160, 56,242,199,240,102,235,237,170, 18, 88,149,229,201,243,179, 23,239,102,239, 16,240, 94,223, 44,190,255,230,
-135,215,127,189,178, 40,216, 20,205, 22,243,197,226, 26,152,163,161, 11, 62,116, 15,159,124,242,233, 31,127,254,142,191,  2, 16,
-192, 82, 23, 66,150,121,236, 31,207, 54, 87, 88, 72,199,116,216, 53, 81, 87, 63,125,247,243, 63,151,231, 20,  6, 96, 61, 52,  7,
-112,198,142,197,149,158,227,  1,217,124,125,250, 85,156,238, 96,118,119, 89,170, 74,193,172, 35, 65,198,100, 52,241,156,  1,  2,
-240, 82,132,175,176, 43, 54, 73,112, 96, 15,167,171, 41, 34,158,233,250,234,236,209, 23,231,211, 11,133, 85, 46,198, 52, 23,211,
-183, 73,186,195, 58, 46,183, 43,192,180, 53,229, 33,217, 50, 40,167,189, 31,198,225, 60,152, 11, 31,122,225,112, 76, 55,108,169,
- 82,187,106,217, 41,238,248, 19,128,135, 91,222, 45,120,122, 93, 81,198,163,147,112,183, 76, 51,106,138,126,126,226, 27,119, 29,
-218,247, 52,133,247,143,215,179,124, 23, 43, 45,215,101, 75, 30,217,114, 85,182, 40,190,101, 54,164, 49,208,133, 54,242,163,131,
-206,157, 81,103, 96, 19,197,247,164,202,170,236,231,155,234, 61, 19, 45, 14,146,165, 16,233,191,241, 47, 94,166,175, 55,122,173,
-196, 63,254,246,235,229,118,249,203,217,183,143, 15, 39,215,113,136,239,203,178,204,239,251,215,193, 42,  2,182, 46,203,  7,222,
- 56, 76,118,231,219,247,239,147,248,217,237, 39, 64, 45, 81, 18,127,249,241,103,219, 36,154,223,204,129,201, 40,219, 73,138, 55,
- 41,229, 10, 31, 20, 96,248,120, 56,206,138, 66, 40, 59,171,171,213,229,208,133,  9, 74, 92,203,  5, 62, 96, 12,100, 90,  8,131,
-130,120,  3, 79,220,212,135,226, 60,134,189, 88,134,171, 56,143,196, 34,119,164,243,133, 89,242,211,187, 79,223, 94, 93,136,194,
- 65,221, 78,101, 74,178, 90, 82,165,213,241,232,100, 60, 60,202,139,162,111, 57,194, 63,216,  9,226,224,244,254,211,213,102,221,
-112,163,106, 36,173,227,124,108, 41, 44, 85, 66,158,207, 12, 44,176,145,239,248, 73, 78, 69, 64, 44,210,192, 30,226,104,176,184,
-202, 51,173,249,  3,191, 97,  6,179, 77, 59,175, 75,207, 27, 50, 77,157,241,128,224,174, 60,211, 29,245,125, 32, 12,236,229, 38,
-171, 32,109, 43,178,196, 34, 17,  5, 76,216,200, 71, 83, 10,187, 72,107,209,246,  2,  4,132, 15,108,  6,165,100, 24,168,101,174,
-217,243,152,241,247,250, 32,  0, 81,215,178,219,182, 17, 69, 71,124,191, 68,201, 15, 49,134,242,176,156, 54,  6,156, 86,155, 32,
- 64, 17, 32, 11,163,155, 22,  8, 16,160,219,126, 87,191,163,139,238,138, 46,218,117, 22,105, 80, 20,233,170, 73, 29,199, 85, 28,
- 75,178, 40, 81,148, 70, 18,197,158,115, 73, 55,240,202,  0, 77, 15,201, 59,247, 53,231,158,243,191,127,175,251, 53,234, 19,205,
- 77, 53,144,166,170,  2, 14,158,199,179,  5, 84, 68, 32,227,102, 93, 65, 70,  9,164, 65,230, 30, 86,114,227,176,182, 10, 58, 25,
-122, 28, 18, 11,220,  8, 81,212,227, 70,202,241,106, 66,188,116, 61, 71,122,216,137,110,253,123,125, 81,177,168, 22,212,150, 99,
-179,222,117,  2, 24, 14, 62,207, 97,114, 68, 22,102,  6, 69,193,180,172,114,114, 65,136,192,115,213,131,151,163,106,147,  3, 18,
-194,205, 11, 91, 95, 23,250,203,187,125, 92,149,147,171, 40,246, 41,173,169,229,216,218, 89,175,180, 44,222,205,121,204, 75, 20,
-109, 28,197,142,205,  3, 88, 85, 83, 93, 98, 83,141,144,165,194, 17,146, 39, 68, 40,198,150,122,190, 41,138,138,189, 19,238, 76,
- 85,120, 68,197, 59,226,233,218,113,100,134,248,165,108,162,  6,115, 76,159,222,220,108,250,150,235,163,156,181, 44, 81,225,116,
-237,  6,220, 52, 60,190,131,117,152, 50,193,194, 76, 95,232,204, 40,119,106, 20, 36, 28, 64, 21, 70,118,144,154,158,110, 91, 34,
-193,119, 73,137, 98, 89, 53, 31, 17,163,161,165,234,157, 87,200,228, 76,131,168, 18,220,223,240,108, 65, 46,211,128,100,154, 83,
- 74,230,138,204,153, 68,187, 38,175,193,218,130,208, 12, 35,  4,  0,150, 20,176, 51,105, 38,162, 16,177, 72,121,111, 72,166, 79,
-136, 17, 60, 71, 62, 93,100,227,108,246, 62, 29, 76,151,233,110,208,110,251, 49,178,206, 69,177,204, 86,243,110,124, 27,235, 24,
-164, 23,194,215,171, 28,199,197,  6, 56,104,119,239, 38,189,124,193, 17,158,141,212, 50,194, 99, 67, 81, 27,138,209,224, 81, 77,
- 43, 14,154,148, 84, 21,154,101, 34,207,216,118,152,213,131,103,162,166,  5, 35,193, 71,132,243,197,218,180,214,  8,145,120, 24,
- 17, 99, 50,201, 42,181,200, 28,219, 67,176,239,118,238, 32,101,219,109,182,241, 71,199,221, 99,252,119,234, 91,205,174, 42,194,
- 50,189, 89,127,243,228,219,151,127,189,124,216, 59, 89,174, 86,233,120,130, 91,141,102, 35,230,227,101,177,223,222,199,222, 70,
- 20,153, 47,103,147,252,250,247, 87, 47,226, 48,134,219, 69,185,237,187, 94,130, 52, 63,155, 92, 77, 47,159,127,245,221,249,240,
-124, 55,222, 75,179,  9,156,236, 79, 47,126,108,249,173,241,116,184, 23, 39,196, 86, 26,102,132,210,139,187,154, 42, 32,177, 23,
-191,249,248,247, 81,114,127,146,141, 45,182,236, 59,156,152,207, 83,248,  2, 84,165, 83, 36, 10, 20, 13, 79, 12,121, 51, 77,175,
-233, 57, 46,202,240,105, 62,129, 47, 59,104,223, 58,190,253,240,195,104, 16,133, 77,178, 23, 80,199,166, 92,173,116,119,247, 96,
-182,200, 34,152, 81,169,216, 70, 95,228, 21, 44,186,127,216, 63,187,250,  7,134,189, 21,221, 52,177, 13, 98,201, 16,138,200,241,
-199,234, 86, 35,172, 94, 79, 63,208, 48, 44,194,249,251,  7,251,205,207,  2, 53, 76,183, 90, 47,210,161,206,166, 50,215, 44,184,
-174,106,  6,255,  6, 84, 71,250, 16, 37, 63,156, 53, 23,204,251, 78,168,176,  6,195, 83,157,150, 74, 58, 42,138, 84,100,124,162,
-211, 42,148,170, 85,160, 77, 21, 89,188,236, 23,127,252,234,206,159,185,238,198,209, 15,127,252,252,219,197,235,239, 31,156, 62,
-191,255,248,114,145, 19,236,192, 83, 80,114, 18,248,142, 27,248,193, 12,  9, 17,158,104,167,247,235,251,215,151,249,224,100,175,
-119,250,249,227, 65, 58, 66, 77,255,118,112,134, 12,224,235, 71,167,203,165, 70,210,109,144,110,196,129,103, 39,252,167,208, 40,
-158,216,169, 51, 42, 36, 72,121,152,220, 27,206,174,  8, 72,223,108,119,130, 24,185,127,210, 74,240,113, 67,199,155, 47,115, 10,
-234,202,161,221,154,115,203,  5,  2, 54, 69,230, 37, 12,163,118,124,115,249, 86,221, 32,196,101,248,198, 45, 27, 85,202, 39, 39,
-101,196, 57, 56,  8,171,182,176, 71, 16,159,186,214, 79,251,167,231, 31,207,214,172,216, 56, 36,197, 81, 46, 42,178,154,244, 33,
-  6,  7,185,159, 61,122,246,110,120,206, 49, 37,214, 67,116, 94,251,113,178,212, 11, 27,207, 64, 70, 85,191,197,185,247,109, 24,
-134,129, 31,126,209, 59,233,221, 59, 66, 18, 59,154,140,109,242,117, 19,156,157,206,211, 27,234,120,130,171,152, 39, 21, 53,166,
-145, 71,187, 54,197,148, 35, 47,188,153,150, 96, 80,193,189,145,179, 34, 96, 16,148, 40,121, 96, 89,183,240,203,186, 11,223,104,
-252, 39,  0, 77, 87,211,219, 56, 21, 69,109,191,196,118, 29,199, 78,227, 38,109,153,182,204, 48, 29,205, 20, 10, 72, 51, 12, 18,
-130, 34,132, 16, 43, 70,108, 17,140, 96,193, 18,126,  2,127,130, 37, 63,128, 13, 11,118,136,245, 72,108, 16, 31,  3, 83,164, 50,
-180,106,160,153,180, 77,219, 73,210, 36,254,136,253,108,115,238,125,153, 93,148,200, 73,236,247,238,231, 59,247,156,185,190,  7,
- 35, 97,230,141, 27,230,  5,179,230, 74, 57,207,112,249,112,193,113, 30,171, 81,142,181,224,133, 48, 33,238,192,187, 55,222,194,
-182,235,143,122, 60,157, 72, 44, 46, 74, 39, 65, 50,119,  4, 11, 99, 82, 42,  7, 11,135,235,111,184, 77,236,117,155, 78, 95,171,
-140,132,201,149,174,167,154,105, 34,150,159, 12,142, 96,118,206,125, 82, 77,249,217, 44,153,207, 87,113,101,169, 38,173,168, 32,
- 98, 94, 26,124,207,214,149,109, 88, 38, 62,198,218, 99,211,101,212,246, 77, 73, 44,141,156,169, 96,  9, 39,185,181,246,106,111,
-208,229, 35,204,226,206,230,235,167,131, 83, 86, 74, 99,153, 24, 26,103,201,177,238,205,218, 82,221, 33, 99,131, 79, 81,106,229,
-108, 72, 85, 58,162,148,  4,139, 52,212,188,108,133, 79,210, 28,189, 98, 11,236, 31,179,170, 47,192,188, 42,186,101,226,125,252,
- 60, 85,208,179, 84,163,140, 55, 85,203, 68,218,100, 40, 66,114,210,  2, 45, 73,172, 86,178,102, 94, 81,102,153,158,102,153, 99,
-153,247,222,127,239,179,143, 62,217,121,227,205, 89, 90, 28, 28, 30,199, 49, 42,208, 10,211, 73,171,197,230,172,131, 65, 59, 12,
-188, 21,136, 40,248, 23, 52,180, 67, 21,141, 80,117, 28, 53, 11,115,141,135, 84,141,186, 45, 92,108,  7,139, 49,213,120, 15,129,
-137,200,225,  8,172,201, 88, 39,195,180,104, 30,157, 81,161,138,180,145,177,113,186,201, 28,129,162,176,244,204,208,206,211,209,
- 73,116,126,112,113,128, 80,183,230,175,225, 46,131,122,112,153,140,137,182, 41, 79,171,204,189,188,228,  7,117,211,199,198, 24,
- 70,  3, 24, 67,173, 90,115,109,239,254,187,159,254,121,248, 59, 12, 82, 16, 11, 51,235, 59,106,250, 76,198,184,124, 18,143, 81,
-231, 50, 69,174,128, 81, 81,  7,143,230, 66,169, 65,153,164, 48,234,168,238,120, 46,201,116, 80,163, 51, 39,143,224, 44,186,193,
- 70,123, 67, 74,217, 57,254, 71,176,185,194, 17,193, 77,195,239,243, 12, 55, 73, 34, 52,156,  6,150,182,211,237,196,179,233,209,
- 89, 39, 74, 38,255,157,116, 94,185,113,251,124,208,231,  3,116, 18, 29,243, 60,191,144,  5, 50, 68,131, 32,161, 11, 95,126,248,
-197,195,253, 95, 97, 84,171,139,207,181, 23,219,189,139, 99,164, 35,143,187,123, 40, 74, 38,225,152, 64, 95, 50, 22, 90,229,238,
-230, 29,148,116,184,164,110,211, 19, 69,146,136, 84, 49,112,  3,152, 43,162,176,193,147,244,185,204,153,205,180,164,214,188,161,
-175,  7, 27,184,133,132,100, 82, 52,226,221, 99,250, 26, 73, 99, 41, 22,252,209,214,149,155, 47,109,108, 63,121,218, 27, 69, 35,
-196,185, 52, 75,174,175,110, 50, 29, 66,241,193,107,247, 30,117, 30,  5,245,165,254,101, 63,165,180,209, 88,176, 29,220, 32,105,
- 89,240,126, 70, 40,178, 42,182,204,102,220, 87,169,172,120,237, 48,157,142,195,225, 36, 25, 75,162, 79,145,130,230, 39, 17,236,
-137, 74,240,118,219,243,110,249,240,239,132,251, 39,249,179,242, 25,150,174,228,108,189,156,167,237,138,153,143,117, 56,  4,159,
-185, 82, 79,102,152,126,251,205, 79, 15,127,216, 77,126,220,155, 62,216, 15,112,201,173,235,196,  5,159,243,208,123,206, 45, 10,
-179, 66, 26, 79,163, 88,251, 46,125,240, 75,249,199,229,209, 74,163,113,112,118,248,213,207,223,175, 46, 44,127,253,246,231,151,
- 50,137,114,233,219, 86,191,119, 81,141,244,108,162,153,169, 24,140, 46,146, 50, 11,252,197,165, 90,  3, 85,228,111,195,253,163,
- 40,250,248,197,157, 39,195, 19, 58, 59,181,136,144,252,223,179, 46,226, 43,171, 78, 80,195,139,180, 53, 52, 37, 15, 42, 34, 30,
-242, 84, 88, 29,215,114,175,181,175, 33,220,134, 89, 24,198, 33, 76,155,116, 87, 10,141,105,166,204, 22,124,253,116, 88,232,115,
-224,160, 87,243,223,217,222,249,187,251, 24,143,130, 41,251,241,247,171,140, 43, 39,156,234,178,215, 74,137,113, 79, 42,102, 24,
- 60,240, 48,158,224,245, 50, 81,  6,197,240,111, 73, 26,239, 29,253,133, 61, 41,120, 74,141,132,193, 40,102, 35, 77, 20, 52, 93,
-143,140,173,148,157,211, 67, 69,187, 59, 39,146,211,  5,146, 90,162, 65,181, 93,199,116,214, 91,207, 15,194,167,200, 72,182,214,
-111, 34, 73, 95,105,172, 52,151, 91, 47, 95,221,222,221,223, 21, 74,213, 78,157,174,170,182, 38,219,164,111, 53, 80,154,148, 74,
- 34,173, 44, 16, 84, 38,201, 20,123,172,224, 27, 80, 16, 32, 20,163, 72,164,154,110,107,146,142,169, 87,145, 23,198, 28,193, 74,
-188,170, 77,167,137,120,243,191,  0, 68, 93, 75,111, 27,101, 20,245,120,198,158,151,103,198,241, 43, 78,129, 58, 86, 92, 33, 64,
-180, 68,188, 68, 37, 88, 80, 40, 98,197,166,101,197, 14,169, 66,  2,169,155,138, 95,192,154,159,193,142, 13,107, 22, 84, 44, 10,
-  2, 33,136, 16,  2,210, 68,169, 99, 50,142, 31,241,216,227,121,207,216,156,123,199,106,178,139,100,203,154,249,238,119,239, 57,
-223,119,239, 57, 27,252, 46, 82, 31,247,165,235, 19, 34, 18,  4,  4,128, 37, 78,163, 75, 27, 64,118,242, 75,201,137,120,202, 42,
- 99,165,254,244,120,226,130, 63,146,227, 54,181,100, 82,240, 21, 11,185, 41,156, 80,228,163, 34, 82,101,194, 50,128,122,  3, 35,
- 99,159,211,148, 83,224,146,170,  3,171, 72,226,153, 85,154,154, 17,144, 11,232,200,133, 66,110,117,217,114,202, 38, 15,134,106,
-241,  5,101,150,207,238,242, 76, 51,181,  0, 99,109,198,124,235,141,231, 85, 21,157, 66, 84,216, 44, 30,254,176, 96,248,149, 69,
-232,130, 13,208,253, 37,121, 78, 75,231,243, 17,248, 26,157,111,139, 98,174,249,144,107,196,251,177,231,250, 78,198, 32, 61,203,
-205,183,240,128,212,204, 72,  3,  1,192,152,217, 58, 33, 40,205,197, 81,213,164,170, 85,  2,129,193,  2,151,203, 66, 69, 19,149,
- 18,235,172,242,156,119,153, 14, 36,214,248, 15,164, 45, 78,185, 15,139,140,176,217, 88,183, 40,233,114, 25, 80,218, 80,149, 74,
-133,228, 88,239,127,246,233, 59,111,189,250,232,231, 31,183, 76,249,147,187, 31, 55, 76,253,232,248,  8,  8, 12, 65,161,240,229,
-237,  6,100, 49, 29, 43,229,115, 17, 84, 56,114,161, 32, 30, 39,229,203,115, 58, 61, 65,246,151,153, 55, 72,200,  5,  4, 87,240,
- 89, 93,149, 44, 67, 50,117,145,124,156,196, 34,115, 18,230,231,148,160, 89, 51,176,132, 82, 46,211,177,142, 76,101, 10,239, 73,
-  4,145,193,130,169,200, 72, 82, 81, 19, 11, 58, 82,157,  7, 68, 63,152, 12,240,  2,119,235,221, 78,109, 87, 83,116,228,154,199,
-246,191,246,220,126,239,250,237, 69, 48,163, 54, 50, 81,156, 46, 39, 23,174,131,200,243, 67, 98,108,216, 54, 65, 20,  4,137,119,
-181,214, 33, 85, 53, 50,119, 84, 42,170, 25, 69,161, 76,  1, 19,119, 91,123,  4,117,185,239, 30,197,169,109, 93,145,117,217,247,
-188,118,237,153,185,239,196, 89,224,  6,206,104, 62, 68,150,143,211, 16,101,  8,155,202, 80, 13, 63,166,249,192,102,165,201, 61,
-154, 34,133, 34,221, 71,211,245, 38, 66, 28,216, 28,193,114,255,203,  7,206,204, 25, 15,135,  8,176,115,199,158,204,198,216, 27,
- 85,189,122,109,167,135,252,251,235,225, 47,  9, 17, 91,  1,108,250,200,126, 12, 66,128,132,139, 87, 14,114,137, 58,228,  5, 75,
-242,143, 42,172,251,211,211, 21, 91,209,146,119,157, 36,133,129,183, 99, 93,161,228, 88, 88,219, 23,131,155, 47,222, 60, 29,247,
-121, 65,214,117,171, 69,157, 12, 89,134,215,210,107,245,226, 44,121,243,249,215,158,216, 39,220, 18,135, 28,155,  6, 73,184,165,
- 85,203, 98,249,224,228, 96, 30, 44,194,216,223,239,238, 15,103,231,128,252,212,127, 25,121, 79, 70,131,134, 81, 95,250, 11, 26,
-254,101,115,194,109,179,165,148,228, 32,242,168,  1, 73,181,240, 73,112, 80,214,155, 37,181,158, 32, 14,106,218,150, 38,107,187,
-205,174, 27,204,121, 24, 66,108, 88,237, 36, 38,147,228,151,141, 74,237,149, 90, 97,234,  8,132,153, 88,165,104, 19,237,249,245,
- 97, 46,191,192,163, 26, 79,109, 40,176,139,228, 18,138,210, 55,223,253,209,247, 19,171,101,156, 37,241,201,217,100,167, 63, 53,
-159,171, 23,158,173,211,189,107,146, 50,108, 87,  8,182, 63,234, 31,125,251,219,106,214,251, 61,138, 64, 19, 27,197,242,215,  7,
-223, 31, 58,131,  7, 55,238, 52,117,211,118,166, 98, 92,232,136,221, 15,239,125,113,253,171,143,110,124,126,251,133,187,239,238,
-183,223,206,254, 94,252, 53,252,211, 73,150, 47, 85,187, 15,207,254,177,253,255, 26, 69,171, 46,107, 72,  5, 53,179,234,199,228,
-190, 77,136, 70, 40,110, 52, 16,217,139,  7, 17, 21, 68, 97,158,136,176, 16, 40,123, 51,111, 54, 93, 76,105,212,145,  4,170,196,
-124,154,149,233,  8, 89, 81,215, 64,149, 66,247,218,118,143, 84,243, 66,191,179,221,233,143, 78,187,237,189,241, 98,148, 11, 21,
- 26,106, 69, 43,145, 79,139,227, 94,168,248,117,210,157, 73,115,  1,  0,190,221,165,252,  3, 20,216, 52,119, 38,203, 17, 49,112,
-234,219, 46,231,105, 80,100,189, 32,210,170, 76,227, 45,114,152, 10,174,182,186, 62,137,219,208,248,210, 27,123,175,219, 51,155,
-143, 87,  9,155,145,179, 71,197, 84,100,197, 15,189,117,113,237,120, 11,124,253,116, 56,184,245,254,173,135, 63,253,176,112, 93,
- 93,171,208, 69, 11,213,140,220,167, 33,159,147,205,176,214,204,113, 87,168, 16,  6,203,153,160,204,148,201, 53,250,131,227,243,
-195, 92, 98,108, 25, 81, 97,243, 64,136,  5, 26,141, 70,106,101, 95,160, 85,  9,216, 63, 77,169, 71, 92, 16,254, 23,128,169,171,
-233,109,163,138,162, 51,227, 25,127,127, 55,198,205, 36, 49, 41,150, 34,144,144,160, 69, 72, 32, 85,145, 88, 33, 33,181, 32, 85,
- 66,  2, 22, 84, 44, 88,128,132,196,130, 21, 66, 98, 83, 86, 44,186, 65,226, 71,176, 41,252,  3, 16,180,  5, 81,  8, 80,167,180,
- 77, 93,130, 90,215,113,252, 17,143,237,241,204, 60,123, 56,231,190, 32,216, 38, 25,231,205,243,187, 31,231,190,123,207, 57,246,
-239, 74, 42,  4,255,159, 74, 69, 56,162,194,195,127, 21, 27, 83,199,  0,105,210,212, 12,102,250, 85,109, 56,119,100, 94,106,177,
-132, 17,228,146,128, 51,200,214, 41,123, 29,  8,231,  3,165,108,151, 36,226, 73, 89, 73, 37,  9,207, 74,113,101, 52, 27,196,162,
-144,128,189,131,195,245,213, 12, 79,105, 25, 89,225,122, 12,165,190, 71,124,  1,131, 17,218, 97,118,152,193,101, 57, 78, 10,222,
- 18,159, 10,220,196, 43, 86, 17,219,197,145, 85,138,247,189,248,166,115, 78, 86, 36,191, 57,  4, 65,245,168,197,194,113,210, 88,
- 38,  0,  7,220, 13,146,113,242,110, 47,244,152,177, 20,223, 98, 77, 79,121,220,153, 84,204, 20,240, 96, 42,153, 19,245, 22,130,
- 59,209,212, 14,205, 99,234,133,130, 50, 84, 62,155, 46,159,160, 25,102, 83,240,239,236, 97,112, 28,185, 89,229, 23,202, 38,118,
-199,193,242,168,254,152,118, 12,199,177,121,161,154,182,138,120, 56,235,228,179, 70, 41, 23,215, 42,137, 98,222, 40, 22,146, 31,
-126,240,254,231,151, 47,127,119,237,167, 27, 59,191,239,239,223,127,237,252, 43,181, 74,254,230,110, 75,111, 44, 35,245,146,  6,
-157,182,109, 64,  4, 38, 23, 42, 14,  2,195,135,255,  8,204, 89, 40,116,236,172,218, 24, 73, 96, 16,135, 23, 36, 41, 22,255,132,
-175, 53,182,148,178,224,196,252, 57,173,210,224, 80,139, 84,119,180, 30, 27,103,233, 18,188,  7, 78, 57,  5,  4, 88, 44, 44,147,
-200,164,157, 98,150,241, 32,159,195,154,245, 45,  2, 67,128,178,226,185, 21,204, 44,  5, 20, 76,238,198,216,216,235,239, 77, 66,
- 32,104,211,173,184,215,238,124,239,249, 19,150,209,163, 57,142,232,197,151,222,254,250,199, 43, 88,255,201,106, 67,234,108,172,
- 10, 30,249,195,  5,201,153, 51, 75,161, 90,100,242,107,153, 56,127,227,233, 81, 17,185,117,166, 52,241, 61, 30, 33,181, 60,247,
-250,185,206, 30,160,152,194, 79, 52,127, 45,142,201,  4, 86, 97, 51, 96, 35, 39, 96,131, 26,  9,230, 40,159, 22, 17, 62,231, 51,
-164,167, 15, 42,185,218,246,211,219,183, 31,222,178, 69, 86,237,207, 95, 90,215,119,174,158,217,122,190, 59,236, 52,221, 45,216,
-253,152, 26,141,211,238,176, 91,202,149,120,165,143,239, 23,  7, 92, 56,184, 61,146,241, 70,235, 43,143, 15, 61,226,229, 96, 25,
-212,114, 53,153, 99, 44,  5,  1,114, 70,188,230, 73, 21,145,234, 11,182,180, 88, 70, 72, 56,206, 62,121,118, 48,238,123, 51, 15,
-200,102,181,234,158,114,159,104,212, 27,253,225,  1,206,221,126,175,141, 88,  2, 36,129,  3,230, 80,219,210,130,121,191,185,125,
- 97,231,222, 31,216, 52, 78,  2, 38,136,207,240,250,171,213, 53,236,216,179,205, 51, 65, 24, 33, 86,193,128,181,134, 39,233,231,
- 98,179,239, 29, 78,  3,223, 74,  8,247,142, 10,240,223,221, 74,157,146,144, 72,167,156, 20, 54,208, 15,103,210, 38,192,116, 18,
-161,183,152, 46,227, 87,107,181,141,209,116,248, 76,185, 80, 61, 93, 49,122,163, 24, 88,146,140, 35, 11,105, 33,145,180, 88,192,
-169, 80, 13, 91,186, 80,115,204,  3,141,135,243,169, 86,171,123,229,215,125,192, 46,165, 34,132,163,167,214,203,141,122, 33,137,
- 51,132, 44, 42, 45,211,121, 11,219,248,225,239,221, 47,191,253,249,234,221,208,180,123, 97,195,139,252, 76, 34,209,155,120,159,
-221,248,102, 45,179,250,197,203,239,221,234,220, 75,206,138,111,124,114,201,253,244, 57,115,148,190,254,209,205,223, 62,190,221,
-254,234, 96,195, 61,181,249,206,233, 23, 42,175,246,255,106, 41,123, 30, 43, 99,103,120, 23,135,238,197,122, 19, 43, 27, 76,143,
- 76,173,235,168, 29,142,232,223, 46,164,160,164,133,180, 96,212, 54,199,154, 24,  6,240,119,110,117, 93, 72,144, 76,227,223, 78,
- 16, 77,109,178,148, 62,200,121, 16,172,158,112,219,  7,247, 97,194,135,227,193,104, 58,232,141,123, 82,  3,224,137,194, 54,206,
-163, 96, 60, 27, 25, 34,221,204,170, 50,245, 78,132,110,207, 48, 31, 43,212, 57,229, 78,102,236,177, 80, 66,114, 13,165, 76,153,
-126, 38,214, 51, 49,134,248, 40, 50,134,114,  8, 22,190,155,141,100, 36,180,120, 48,120,168,123,106, 86, 10,188, 87,247,  2,111,
- 50,159, 30, 77,198,176, 57, 96, 95, 96,148, 82,169,186,217,216,124,235,210,187,221,221,206,160,215,155, 71,225,204,159, 34, 61,
-218, 90,219,122,116,216, 97,145,129,165, 78,139, 44,211,194, 52,  0, 12,129,228,184, 89,111,118, 71,143,144,108,180, 15,218,164,
- 89,100,147,133, 16, 49,105,221, 95,195, 98,  2, 36,132,137,240,  4, 27,216,153,101,168,181,212,255, 17,128,170,235,249,109,155,
- 12,195,254, 18,219,113, 28,219,177,157, 31,237,166, 36, 48,212, 13,117,233, 86, 74, 39,164,110,244,  0,154, 54, 52,117,  8,109,
-  7,196, 14, 72,149,118,225, 47, 96,103, 46, 99, 39,196,133,  3, 92, 16,112, 67, 28, 24, 32, 14, 28,144,  2,  8, 52,  4,108, 29,
- 37,210,196, 58,154,210,161, 38, 77,210,216, 78,108,199,177,189,247,125,221, 78, 67,170,170, 42,178,170,124,142,243,124,207,243,
-126,239,251, 60,  9,190, 31,140,183, 62,225, 59,169,203,  5,  0,202,255, 87,228,163,199, 23, 60, 54, 44, 70, 23, 95, 94,234, 59,
-187,240,219, 71,163,148,  0,214,156, 21, 49,205,131,237,147, 76,236,217,135,187,172,169,218,202,217,139,119,239,221,  1,213,117,
-176,153, 96,181, 10, 52, 14, 69,112,164, 19, 53, 77,217,226,241,241,202,201,174,213, 33,108,157, 96,209, 31, 79, 47,  1,166,209,
-135,129, 75,162, 11, 67,180,235,196, 58, 26, 33,  8, 67, 47, 80, 13,187, 39, 73,127, 82, 40,  4, 96,115,  8,248,114,162,182,  0,
- 95, 57, 46,181,111, 42,143,168,141, 35,156,248,130,140, 25,187,  1, 25, 61, 80,124, 56, 23, 15,199,174,161,154,123,163,126,242,
-194,129, 93, 27,126, 53,114,162, 82, 54,167, 16, 89, 50,113, 94, 23, 39,212,105, 20,  6, 12,  0,119,100,115,131, 97, 60,116,162,
-129, 19, 58, 78, 52, 28, 69,174,139, 94,  4, 64,180, 99,156,118, 67,117, 41,138, 64,243, 99, 89, 18, 46,189,122,121,249,197,243,
-141,159,238,200,146,249,230,149,213, 15, 62,252, 56,136,132, 40, 22,239,111,108,111, 63,236, 94, 93,125,203,119,195,159,111,253,
-193,161, 46,  3,128,142,210, 17,141, 63,115, 88,102,161,222,128,148,134, 93,149, 44, 39, 49, 17,235,239, 44, 35,128, 84, 74,131,
-116,128,165,  4, 88,214, 79,177,144,209,113, 46, 47,225,164, 29, 21, 68,  0,245,113,106, 28,241, 90,206,166,241, 96, 86, 22,114,
- 50, 15,128, 14,114, 36,135,244, 29,229,  2,151,140,137, 69,200,133,147, 52,162, 56,196,233, 45,127,156, 10, 97,183, 96,177,195,
-252,206,176,147, 99,146,153, 43,218,129,149,227, 85,216,188, 41,203,  2,207,177, 97,181,151,206, 92,254,161,217, 40,105,229,122,
-181, 14,212, 24, 22,110,168, 37,248,136, 96,247, 29,147, 93, 40,242, 11,158, 31,250, 35,158,246,126,219,179, 46,156, 90, 25,  7,
-  0,112, 30, 60,202,235,183,215,139,218, 84,215,238,228,209, 48, 46,162, 72, 94,126,218,172,216, 78,143, 10,241,209,200,119,128,
- 61,  0,213,128,235, 83,228, 95,  4, 16,170,201,121, 80,243,235,173, 63, 61,223, 61, 59,127,254,229,231,150, 27,119, 27,167,235,
- 75,205, 86, 51,138,  2,216,215, 71,190,109, 40,230,213,115,171,107,255,172, 47,227,116,232, 54,176, 63, 74, 93, 64, 75, 34, 12,
-  6,241,236,246, 96,  7,158, 25, 32,197,150,103, 81,199, 33,166,130, 44, 28,153, 31,142, 71,189, 65, 47,136, 38,207, 76, 31,  1,
-166,143,190, 49, 59, 27,237, 65,119,171,219,154,210,203,240,255,187,131, 46, 31,177,221,126,123,224,237, 37, 50,119,233,217, 37,
-144, 26,165,124,145,230,110,108, 88,114,115,243,158,161,234, 56, 33, 18, 79,230,106,115,160,214,125,223,239,219,253, 11,167,206,
-173, 61, 88, 51, 21,  3,176,  6, 89,152,156,159, 96,231,190, 48, 91,153, 85,164,156,237, 90, 25,148, 94,130, 42, 41,  5,173,248,
-218, 11, 23,111,111,192,197, 58,112, 32,157,218,138, 78, 84,235, 15,123,255,149,180, 18,104, 26,216, 50,128,149,217, 78,135,227,
-179,117, 65, 40, 62, 95,224,122, 22, 27,251,216,210,157,228,  8, 50,202,113, 72,186,182, 41, 80,252,192,179,144, 70,245,104,214,
-242,102,227,190,158, 17, 22, 15,231,159, 46,104, 37, 37,107, 72,146,145,  3,170, 10,132, 93,228,188, 52,247, 99,235,183,247,190,
-251,252,139, 91,127, 15, 28, 81, 19,242, 98,158,177,163,138, 90, 92,156,158,185,254,235, 87,205,254,131,107,243, 87,210,176,185,
- 57,236,141, 79,222,225,102,185,239,143,254,242,238,251,215, 23,221,147,243,167,231, 38,125,255,237, 79,111,124,246,209,183,175,
-191,244,202,204,177, 51,131,205,191,132, 84,248,205,191,191,183, 92,107,165,178, 48, 10,104,242,145,138, 21,112, 19, 76, 85,183,
- 92, 27,222,165,174, 24, 79,149,170,112,223,224, 15,248, 92,  0, 13,108,207, 73,106,229,128, 39,158, 71,157, 57, 90,153,145, 83,
- 55,186, 31,114,152,104,136,241,170, 19,127,  7,123,108,176,144, 93,198,211, 17,137, 38,  6,112,221,138,164, 84,139, 53,184,225,
- 66, 42,153,120,199,220,203,162,106,  6,232, 70,133,146,  6, 54,206, 41,227, 16,136,170,140, 32,213, 10,181, 61,119, 79,226,129,
- 98,  9, 56,163,176,239,  7, 64, 14,  4, 44,  1, 89,126,223,165,  5,229,  3, 74,162,138, 89,133,165,120,120,192,139,177,163, 25,
- 49, 35,101,240, 71,  6,  2,197,139,  0, 32,157,221, 78, 33,206,127,125,243,203,225,112,132,163, 63, 84,240,105,247,219, 64,169,
- 75,106, 25,158, 34, 34,219,220,204,225, 99, 32,136,179,188, 12, 79,205, 86,103, 51, 38,239, 73,244,130, 77, 75,101,253, 16,232,
- 57,246,132,  9, 60, 29,125, 97,233,162,168,150,182,122, 45,154,174,194, 55,250, 72,  0,170,174,174,183,109, 50, 10,219, 78,147,
-216, 78, 98, 55,109,178,166, 13, 97,237,214,178, 45,157,134,128,176,105, 18,140,  1,210, 16,162,160,169,119, 92, 34,174,198,  5,
- 84,  8, 36,238, 16,183,252,  9,110,166,113,135,  4, 72,252,  0, 42,168, 80,165,106, 76,221,186,118, 75,187,245, 35, 29,142,243,
-225,196,241, 71,252,241,114,206,121,211, 33,174, 45, 37,214,107,251,156,231,156,243,156,231,193,248,206,215,154, 68,145,157, 88,
-226, 34,118,198, 85, 14, 64,159, 18,234,241,138,255,147,123, 30,117,136, 70,169,159,  9, 68, 26, 69,199, 15, 56,107,137, 73, 80,
-239,160,197, 48, 11,184,156,165,112, 98,184,  7, 37,240,230,246,223, 36,185, 46, 17, 79, 81, 34,114,126, 48, 51, 81,177,108,130,
-243,226,127,  5,  4,  4,119,236,243,177,145, 16, 38, 57,210,  1, 80,  9,166,180,178, 19,216,124, 65, 20,202,118,116, 74,146, 53,
-200, 16, 99, 82,146,118, 79,176,180,243,136,  1,173,171,227,254, 16, 37, 76, 26,237, 67,118, 50,120,124,126,227, 34,119,185, 35,
-183,216,116, 18,112,106,  2,125,118,  2,236,204, 12,220,193,220,212, 89, 44, 44,112,132,  2, 24, 92,165,113,177,  3,181,  2, 78,
- 23,112,204,202, 20, 85,182, 61, 40,198,165, 36,106,236, 73, 67,146,194,227, 19, 99, 28,178, 71,156,111,139,  7,203, 53,  0,185,
-101, 22, 96,145,107,111,188,185,242,205,247,231, 22, 95, 49,143,235, 90, 54,187,120,241,226, 15,183,239, 16,166, 16, 33,242, 61,
-170, 63,105,153,198,151, 95,124,190,179, 83,223,217,221,195, 81, 43,122, 99, 98,125,152, 83,164,172,154,208,179,146,154,150, 50,
-170, 72,139,195,212,202,162,237, 18,132,161,113,  2,206,207, 67, 59, 81,119, 56,244,  1,159, 12,  0,109,218,  1,128,119,136,251,
-142,203, 28,  7,141, 62, 80,250, 35, 70, 70, 96, 70,133,176, 40,170,138,168,202, 34,109,159, 82, 62, 68,201,120,162, 64, 83, 64,
-192,173,241,136, 13, 67,226, 98,146,220,  2, 74,187, 42, 98,164, 64, 32,237,159,155,168,190,125,233,218,221,253, 13,200,172,101,
-189,108,121, 86, 86,209,122,  3,231,176,181, 63,157, 47,175, 63, 94, 75,167, 32, 34, 51,122, 94,132, 69,208,124, 46,167,200, 50,
-110,253,197,209,116,190,226, 96, 63,145, 65, 64, 55, 44,163, 82,152,245, 67,215, 13,156, 86,239, 31,  9,149,123,253,235,151,222,
-178,250, 86,140,194, 71,166,158,157,128,192,  7,207, 11, 48, 47,  0, 55,163,211, 72,208,126,254, 24,154,160,203,190,239, 37,136,
-172,121,243,234, 71,107, 15,255, 52,187, 29,192,  1,  7,173,195, 16,221,168,169,148, 30,186,114, 82, 89,189,191, 90,173,156, 95,
-221, 90, 69,123,172, 48,210, 85,173, 54,127,229,168,125,212,119,173, 79, 63,188,181,177,253,215,187,175,222, 88, 88, 56,191, 83,
-223,132,  3,  9,224,255, 66,239,184,221,128, 24, 90,212, 38,219,125, 83,147,245, 71, 71, 15, 27,237, 70, 33, 87,168, 86, 94,170,
-205,215,234,141,199,  3,215,158,204,141, 39,144,124,213,  5,236,180, 84, 91, 50,186,207, 14,154,  7,182,107, 85, 95,188,  0,239,
- 12,142, 10, 73,155, 98,110,234, 12, 74,217,188,190,180,249,244,126,128,164, 82,177,148, 47,193,221, 50, 52,179,124,134,190, 26,
- 66,252,193,107,239,195, 63,250, 81,208,236, 26, 25, 57,  3,192, 16,158, 22, 68,127, 27, 71,223,237,123,123,119, 35, 98,197,122,
- 80,154,198, 65, 38,165,238,155, 79,199, 18,252,197, 38,123, 16, 49,158,155,169, 66, 28, 92, 84,132,226,213, 83, 66,183, 39,132,
- 67, 17, 73,105,225,115,191, 22, 44,146, 73, 84,129, 19,234,185, 39, 80,132, 20,126,201, 50,  3,167, 29,159,157,204,235,105, 72,
-253,114,110, 76,157,204, 77,104, 47,204,  8,133,130, 96, 56,127,220,254,253,206,111,235, 91,221,190,151,134, 58, 90, 82, 32,240,
-136, 90, 16,149,154, 78,183,101, 53,191, 93,255,165,144, 42,174, 84,223,235,244,226,143,127,250, 78,128, 76,119,157, 29,219, 79,
- 62,251,241, 86,249,171,105,101, 62, 85, 90, 46, 44,127,114,227,193,207,247,222,249,117,121,101,225,235,133,151,175,152, 71, 27,
-107,199,219, 45,207,188, 60, 85,205, 37, 83,112, 38,156, 62,235,134, 46, 84,111,124,173,156, 74, 46,  3,190,196,130, 94,236,185,
- 61,200,175,144,234,224,211,134, 40,111, 59,125,168,224,243,185,252,229, 11,181,  7,251, 91,200,  0,140,  2,184,164, 36,229,217,
- 83,167, 59,118, 39,226, 98,113, 44,234,251,240, 25, 12, 71,233, 12,181,148,253, 46, 18,106,137, 81,195,189,178,  4,134, 14, 89,
- 35,197, 78, 68,197, 54,185,  1,147,212, 92,224,249, 30,173,  2,  6, 39,206,188,188,157, 21,243,194,129,111,253,143,103,199, 81,
-200,  4, 27,160, 12,117, 23, 56,243,114,180,  2, 36,208,142, 35,106, 58, 97,151,153,177,211,229,217,180,172,236,238,237, 10, 68,
- 58, 15,  3,236,204,208,213,200,114,104,209, 82, 64,193, 25,211,106, 82,125,192,184,191, 38,218, 39,208,143,  2, 68,  0, 56, 82,
-210,103,236,192,230, 70, 79,240,230,228, 20,173, 82,156,107,246, 12, 36,233, 99,214, 73,168,104,120, 16,253, 43,  0, 81,215,243,
-219, 54, 25,134,227,216, 77,236,216,233,226, 52,212,  9,237,250, 51, 73, 87,180,193, 90, 13,181, 18,211,  0,  9,184,236, 48, 64,
-156, 55, 14, 28, 57, 84, 72,156,224, 80, 33,132,224,200,223, 48,  1, 23,142,  8, 49,168, 16,168,155,  0, 49,212,195,196,143,178,
- 54,144,174,105,179,252,182, 19, 59,113,220, 56, 60,239,235, 68,220, 29, 59,246,247,125,239,251,124,239,247,188,207, 51,174,191,
- 83,163,121,224, 46, 55, 18,232,197,142,155,100,246,250,157,168,164,156,249,212,254, 35,145,124, 74,224,144, 57, 36,169,108,182,
- 40, 11,196, 35,  3,137, 48,214, 54,161,178, 76,143, 72, 47,126, 64,185, 34,205,225,179,190, 79,134,236, 10, 17, 18,165,200, 92,
-106,161,238, 52,184,171,149,162,138,229,152,116, 96,202,174, 26,227, 67, 84,250,  3,236,134,229, 13,199,158,224, 65, 83, 89, 68,
-146,169,109, 21,187,233,228,108,217,122, 44, 50,207,140,109, 36,169,  3,126,200, 84,182, 41,205,192, 59,117,221,182, 47,248,225,
- 81,193,145, 61, 75,  4, 31,155, 18,143,141,132, 70,188, 87,202, 61,248,153,215,231,202, 23,117,129,177,232,166,101,155,182,219,
- 65,174,  2,164, 97, 54,183, 79,187,215,192, 31, 83, 28,138, 98, 40,243,164, 66, 38, 27,228, 73, 54, 68, 82,139, 70, 68,160,233,
-152, 18,  6, 52,166, 19, 87, 98,182,144, 45, 14,155, 91, 50,175,152, 44, 46,  9, 52, 25, 73,237,249,171,235,  3,215,250,252,179,
-219,139,243,243,186,158,248,118,103, 71, 85, 21, 53, 42,105,114, 68, 85, 34,133, 98, 65,153, 16, 95,191,113,125,247,238,143,248,
-109, 52, 42,113,136, 23, 88,226,141, 78,107, 17,175,123,110,168,109,251, 64,102,129, 14, 68,128,235,113, 49,130,250, 51,171, 79,
-125,242,225,  7,239,110,109,189,241,234,141, 43,107,235, 64, 13, 71,197, 99,199,233, 17,213, 28,201,154,106,183,146,166, 72,  9,
-172, 93,146,240, 18,144, 10,113,183,174, 27,194,252,247,104,114, 10,140, 49,199,254, 47, 44,245,  7,180, 44, 71,200,255,129,234,
-156, 68,131,230,126,102,209,251,183,126, 84, 56, 57, 64, 80,203,167, 87,123,  3,  7, 57,  6,  1,186, 88, 59,224,206, 58, 39,117,
- 46,101,118, 90,172,160, 66, 91, 77,224, 29, 36,126,210,119, 35, 81,137,254, 48,140,231,246,130,157, 23,144, 72,173, 93,109,118,
-170, 24,214,185,212,124,221,174,147,244, 82, 84, 41, 86,138,216, 72,229, 50, 23, 42, 86,153,123, 71,109, 22,137,237, 55, 59,245,
-  1,101, 51, 34,234, 44,165,115,221,158,131,168,221,238,118, 76,187, 85, 56, 57,196,216,173,231,215, 45,199, 90, 76, 47,166, 19,
-  6,182,171,236,180, 46, 36,227, 58,114,  6,230,135,233, 52,103,146, 51,237,110, 59, 63,179,178,119,120, 31, 49,  2,219,249,251,
-251,191,  0, 80,151, 42,165, 82,185, 68,140, 41, 62, 81,199, 76,195, 34, 41, 19,169,241, 89, 64,105, 35,149,206,157, 95,209, 36,
-185, 63,240, 74,181,163, 92, 38,187,127,188,143,248,187,253,214, 71, 63, 63,216, 93, 91,186,140,  5,121, 92,125,132,172,186,145,
-187,178,148,201,255,245,232,143, 73, 57,238,244, 28,108,150, 55,243, 27, 88,123,149, 86,229,225,233, 67,187, 71,129,  9, 55, 71,
-120,217, 88,217, 92, 54,178,166, 99,225,179, 96,136, 30, 55, 79,237,190,189, 58,147, 39, 78,180,235,144,248, 59, 23,127, 49,210,
-248,236,215, 46, 93,173,182,170,200,197,146, 64,238,193, 73, 45,169,107,  9, 46,221,186,212, 66, 73,254, 51, 79,212,154,135,115,
-153,167,215,212,116,236,162, 31,178, 58, 33,207, 19, 16, 63,184,214, 65,157,171, 76, 62, 37,238,  2,147,178, 70, 42,133, 12,122,
-136,132,236,198,100, 53,166, 77,170,138, 22, 79, 38,245,132,174,199, 85,185, 85,173,223,249,238,183, 59,191,254,249,119,211,242,
- 36,  9,105,196,101,107, 68, 57, 34,197,194, 10,226,123, 68, 20,126, 58,249,231,135,211,189,155,203, 47, 45, 74, 83,175,109,191,
-143,155, 87,111,153,234,150,124,254,203,121,251,251,198,206,246,167,223,124,117,187,240,245,238,165,206, 11, 47,126,124,173,244,
-197,241,155,247,222,121,239,185,183,179, 98,250, 65, 99,111,175,126, 48, 61, 57,123, 81,159,118,128, 44,168,228,225, 47, 27, 11,
- 38, 75,240,231, 51,203,140,109,196,204,212, 44, 66, 10,198, 23, 89,214,236, 90,212, 83, 74,205,117, 84,226, 75,159, 51,238,254,
-126,143,196, 61, 38, 34, 24,151,190,  7,136,224, 86,205, 26, 86,243, 43,151, 95, 46,213,203,186,170, 51,161,221, 15,143,107,235,
-184,115,214,200,226, 59,211,135, 24, 14, 16, 25, 47,204,174, 52, 58, 45, 60, 59, 16,119, 70, 48,153, 16,194,201,120, 10,176, 90,
-215,244,185,233,133,166,213, 24,121, 31,177, 12, 37,235, 67, 72,134,110, 32,187,111,102, 55, 75,205, 83,159,164, 17,252,192,218,
-  9,215,197,228, 56, 57,184,134,165,132, 70, 38,215,252, 18,129, 45, 31, 85, 30,168, 59, 41, 36,212,106, 21, 22,149,161,222, 30,
-170,160,113,147, 51,251,153,144,206, 38,181, 61,159, 13,104,169,249, 28, 95,249,198,255, 27,119,  8, 67,155,138, 66,140,146,249,
- 34, 76,158,154, 89,  9,  5,200,159, 95,146, 37, 10, 66,255,  9, 64,212,181,244,182, 81,133,209,241, 99,102,252,152,241,196, 37,
-113, 29,135,218, 74,  8, 14, 36, 21,164, 64,216, 20,168,154,150,170,170, 80,164, 22, 85, 44,186, 98,  1,252,  1, 54, 72,221,176,
- 70,176, 67,160,246, 15, 32, 33, 86, 72,168, 72, 44, 42, 89, 66,170,  2, 82, 90,129, 80,226,144, 98,108,167,118, 98,123,252,152,
-241,188,239,240,157, 59,137,144,178,115,252,184,119,238,247,188,231,156,239,196,191,199, 49,246, 87, 98, 39,218,146, 49,110,135,
- 62,151,144,  4,194,120, 38, 51, 75,137, 21,215, 83,  1,143, 75,224,192,126,198,201, 99,112,112, 49, 17, 25,174,231,112,  1, 99,
- 33,186,192, 17,254,247,160,140,235,149,211,217,144,150,139, 85, 58,229, 83, 27,140,  3,250,132, 87, 22,214, 59,195, 78,  2,187,
- 76,107,242,163,227, 23,240, 27,122,  8,224, 48,191,144,155,167,100, 28, 14,221,181,  5, 78,204,112, 92,211,180, 38,244,227, 71,
-214,136, 27, 97,130, 79, 28,225,115,203, 89,176, 84,172,234,211, 30, 21,245,208,227,143,100,122,195,  8, 20, 26, 33,134, 80, 52,
- 49,193, 87,229, 28,218,172, 16,243,163,162, 73, 21,133,100,192,131,228,169,194, 62,111, 27, 97,216, 94,152,146,210, 92, 78,  4,
- 55, 29,232,205, 37, 96,102, 73,150,149,164,132,229, 50, 74,138,205, 41,  5, 93,148,102,252, 98, 18,115, 44,165, 36,121,121, 65,
- 73, 39,146, 18,224,137,228,154,193, 30,196,136,  7,232,189, 60,109,182,127,173,213, 30, 60,248,233,247,157, 63,175,108, 94,214,
- 20,229, 97,237,161,150,149,101, 41,158, 74, 37, 84, 14,141,111, 55,159, 94,187,122,105,106,140,159,117,218, 20,215, 47,172,174,
-140,199, 35,242, 76,241, 16,108, 44, 50, 88,211,246, 13,139,162,104,232,121,161,227,241,203, 91, 62,193,253,140,154,187,247,205,
-215,163,145,113,239,254,253, 90,173, 70,155,250,254,214,123,119, 62,184,217,106,213, 13,163,175, 41, 41,144,187,229,184,132,137,
- 23,244,255, 81,229, 65,158, 61,180, 93,144, 40, 40, 98, 75,224, 80,199,114, 89, 42, 23,146,106,134, 74, 75,  0,243, 57,253,  0,
-120, 51, 31,153, 32,190, 46,112,153, 53,101,174, 31,234,150, 41, 81,197, 19, 12,  7,211,190,195,156,130, 82,180,124,183, 90,122,
-121, 72,233, 38,212,228, 97,  6,224, 98,112,174,176,152, 16,125, 15, 67,180, 41,114,159, 50,100, 80, 60, 41, 41,176,198, 67, 46,
-  9,174,155,131,226, 76,233,195,119, 63,254,183,219, 32,231, 69,133, 20, 57, 86,221,232,173,148, 86,245, 73,159,234,131,197,194,
- 11,244,112, 69, 62, 21,107,233,236,242, 65,103, 95, 83,242, 22, 40,139,126, 86,202,221,186,121, 91,239,235,173,227, 67, 19,218,
- 24, 78,185,112,174, 63, 58,122,123,237,157,158,126, 68, 81, 71, 77,101,185,178,154,160,202,234,139,229,234,246,222, 35,122,120,
-100,192,182,239,154,182,129, 64, 26,  3,203, 47,  4, 45,  5,140,167, 84, 82, 22,144, 66, 26,231, 43,231,159, 28, 60,198,208, 90,
-199,238, 13,143,201, 62, 65,169, 85,103,139,149,202,160,215,221,254,235,209,209,176,123,241,165,141,189,214,223, 20,209,181,140,
-150, 87,206,212, 15,119, 95, 91,186,112, 54, 95, 24,154, 67,242,  2,229,185,115,187,173,122, 18, 56,165,176, 60, 87,145,161, 73,
-208, 31, 27,163,253,195,221, 70,183,241,198,242,235,237, 94,147, 22,117, 99,227, 58,185, 18,203,177, 75,249,121,  9, 84,246,164,
-229,152,182,231,192,230,129,185,114,  0,  8, 99,236, 57,117,150,  2,128, 97, 27,185,180,170,102, 20,202,118,149,116,150, 22, 75,
-251,237,186,147,137,211,123, 94, 96,133, 13, 77,176,166,130,103, 11,152, 21,199, 56,125, 36, 34,102, 70,112,180, 56,239, 71, 10,
-145, 86,  9,109,139, 66,241,215, 91,136,251,  9, 89,200, 21,210,197,209,180,115,240, 79,231,183,253,230, 78,179,123,236, 56, 46,
- 20, 41,169, 36, 15, 44, 68,113, 92, 74, 41, 41,113, 94,153,125,115,249,246,100,220,251,242,241,207, 71,182,254,233,210,214,197,
-203,119,178,159, 20,238, 46,126,190, 94, 89,213,190,213,186, 63, 52,190,251,234, 11, 91,  9,210,170, 18,230, 98, 79,246,127,121,
- 53,190,185,245,209,141,187,223,127,214,254, 35,216,186,114,171,219,216,254,241,112, 39, 72,200,215,231, 87, 12, 15, 98,141, 65,
- 44, 92, 44,148, 59,  3,242,203, 51,150,109,210,186,144, 77, 91,147,180,152, 94, 43,175, 61,211, 59,192,248, 70,  8,111, 14,105,
-187,180,250,214,110,187, 46,138,128,149,229, 51,218,196, 53,231,120, 89, 79, 25, 64,253,176, 30,128, 85, 71,111, 71, 25,196, 25,
- 63, 96,159,210,145,211,178, 90,127,124, 44,162,101, 73,217, 73,181,222,222, 11,  4,159,242,177,171,235,155, 84,207,  1,201, 19,
-130,128, 77,167,118, 98,143,209, 75,240,121,234, 25, 48, 73,146,171, 37, 10,  6,  3,142, 18,  4, 56, 53,186,192, 71,163,143,159,
-105,170, 30, 24,212, 84,125,158, 39,129,164, 29,139, 18,248, 72,  8, 78,160,167, 95,198,196, 36,207, 38,163,  6, 20,199,227,127,
-148,116,  6,124,126, 23,218, 75,140,130,150,142,219,  8,118,170,203,119,210, 35,143, 11,241, 19,254, 82, 24, 49,120,240, 26,228,
- 70,  2,191,148, 95, 24, 65,176, 26,190,151, 15, 76,245,121, 71, 46,246,159,  0, 68, 93, 75,111, 27, 85, 24, 29,219,243,244, 99,
- 60,118, 28, 39,105,235,164,105,  2,132, 60,160,152, 68, 36, 36, 69, 52, 34,145,216,181, 18,236,144,248,  3,108, 64,130,101,196,
-178, 98,197,130, 13,187, 10, 36,144, 64,236,232,  2,164,174, 10,  2,  9, 36, 54,109, 48, 84,173, 99,  7, 59,126, 76, 38,142,237,
-120,158, 30,115,190,123, 19, 88,121, 54, 51,158,185,143,239,126,231,187,231,158,243,127,124, 15,152,223, 99,136,145,116,174,  0,
-198, 43,236, 84,108, 96, 92, 31,225, 66, 70, 72,184,240,233,162, 71,227, 87, 18,149,190,219,139,147, 55,  8,167,114,115,187,165,
-115, 36,128, 79, 32, 19,134,169,  5,179,219,110,116,234,200,130,137, 61, 25,178,201,108,211,113, 68, 77, 73,226,223, 73,195,132,
-241,131,144,161, 63, 51,185,160, 72, 42,224, 88, 16,184, 62,242, 84,198,180,193, 99, 53, 89,225,252,107,182,126, 18,212, 82,165,
-248,112,196,111, 68,203,106,167,103, 22, 89, 41, 50, 53,206, 64, 24,146,149,179,164,121,  8,208, 92,232,146, 31, 60,102,177,  6,
-119,225,133, 85,  5,216,194,183,221, 62,169,243,  8,172, 11, 89,145, 69,147,147, 36,192, 54,164,193,193, 77, 27,216,167, 80,245,
- 71,162, 98,142, 66, 28, 87,137,196,233, 85,137,118, 62, 73,177, 17,125,230,  8, 14, 98, 46,214, 41, 63,106, 59, 64,124,100,  2,
- 79,198, 52,177,  8,185,151,138, 17,153,184,174,209,141, 87, 54, 86, 95, 90,251,233,151,223, 95, 46, 22,103,174,206,127,243,221,
- 61, 63,140,133, 67, 49, 28,146, 25, 67, 48, 20,155,173, 78,241,197,162,174, 27, 15,126,254,117, 44,155,249,228,206,157,118,243,
-168, 82,173,196,227, 50,219,119,229,108,122, 18,161,193,133,134, 38,  0,122,192, 27,  8,195,245,181,235, 55, 54, 55,246,246, 62,
- 42,151, 75,182, 99, 85, 42,127,253,120,255,123,  4,244,183,110,191, 89, 42,253, 22, 87, 71, 89, 67, 82, 20,188, 51,219,219,103,
- 71, 69,201,180, 71,140,158, 43, 73,176,116,142,163, 13,102, 83, 16,  9, 25, 92, 64,118, 65, 42,129,148,118, 83, 25,138,232,152,
-204, 59,139,100,241, 36,113, 16,161,157,156,148,164,166, 36,221, 11,221,148,146, 44,155,143,105,223,151, 54,176,135, 76,138,150,
-136,170, 88,233,  0,137,182,175,223, 44, 55,171,140,154, 70, 71,234,209,182,151,178, 87,108,111,144, 84, 18,104,224,237, 23,118,
-240, 72,179,107,150,170,251,164,171, 69,110,150, 71,205, 78, 61,157, 52,204, 78,  3,235,132, 24,147, 79,186, 38,211,121, 38, 10,
- 17,  0,143,235,145,155, 74,167,127,252,236,229,133, 74,243,192, 58, 49, 35, 62,117, 25,102, 17, 38,106,223,177, 55,151,214,231,
- 46,205,233, 73,  3,  8,228,105,171,204, 60,  2, 71,173,147,  6,226,230,250,115, 27,200, 30,242,153, 92,181, 85, 81, 21,126, 66,
-  0,171,149, 80,200, 77, 99,  4,203, 49, 25, 15,105, 88,245,173,229, 45, 77, 82,254, 49,107,249,204, 68,111,208, 69,  3,220, 88,
-217,180, 78, 45,164, 29,245, 86, 61, 36,131, 61,225,181,165,173,102,167,129, 52, 60,167,143,249,158, 91, 51,235,152,171,142,231,
- 30, 52, 42,125,  7, 95, 71,192,165,107,159, 98, 44,208,129, 91,118, 86, 20,128,117,101,118, 25,216,108,113,122,241,207,195,125,
- 12,201,164,146,106,119, 90,  3,187,135,183, 42,140, 95, 57,104, 30,120, 46,109, 89,239,174,237,174,206,175, 62, 61,122,  2, 76,
-152,215,199,  0,225,185, 53, 51,134, 50, 66,127,143,114,127, 62,161,252,158,125, 76,199,218,226,227, 51,130, 55,245,234, 56,201,
-249,250,110,  4,195, 56, 18,158, 91,113,252,231,178,199,102,118,200, 78, 93, 80,135,162,139,172,185,253, 35,227,193, 97,187,212,
-246, 13, 63,226, 71,219, 21,171,215, 15,  2,155,204, 41, 17,211,113, 65, 26,152, 72, 39, 92,230, 65,152, 82,100,160,202,154, 25,
-109,245,172,207, 75, 63,172,167, 87,222,155,127,187,112,247,230,221, 55,190,253,234,241,151, 31,126,253,129, 48, 38,220,123,247,
- 83, 53,163, 21,244, 73, 45, 38, 27,162,222, 25,245, 74,143,238, 47,239,236,108,246,183,223,255,227,157,189,233,143,175, 26,217,
-207, 30,125, 97,133,225,173, 66,209, 29, 57, 76,198, 53,125, 54,232,219,158,155,142, 39,207, 92,  7,171, 35,176, 32,226, 53,121,
- 58, 50,231,  9, 78, 91,103,100,111,170,175, 30, 30,215, 60,  4, 46, 81,101, 38,221,153,116,220,168, 35,155, 38,109,  3,  2,206,
-207, 95, 94,244,  3,119,105,102,  9, 17,185, 56, 95,236,219,131,180,166,207, 77, 92, 35,136,233,217,164, 58,142,108,218, 31, 32,
-149,  4, 36,202, 27, 19, 15,171, 15, 89,181,134,204,153,153,241, 56,242, 51,113, 50, 61,133, 60,224,245, 91,187, 79, 74,127,103,
-211,185,250,113,205,245,108,180,153, 79,210,179, 68,141, 61, 99,132, 46, 46,226,133, 81,193,214, 99, 98,103, 25,137,236,132,145,
- 23, 70,140,231, 77, 36, 17,146, 43, 33,178,242,  8, 19,202,197,170,159, 75,229,128, 62, 73,171,142,196,133,  2, 22,187, 72,251,
-143, 68, 34,169,116, 17, 17,248,246, 50,247, 61, 26, 93,132, 95,198,129, 51, 18, 70, 38,145,117,  2,155,251, 66,159, 14, 58,124,
-229,158,205,207,  2,232, 80,122, 58, 26,106,114,226, 95,  1,168,186,150, 30,183,169, 40, 28,191,237, 56,177,227, 73, 38,175,105,
-103,162, 36,109,209,244,161, 14,163,182, 44,202,  2,209,194,  2, 85, 45,136,  5, 18,130, 10,132,202, 15, 96,129, 64, 98,  7, 93,
-177,103,  9,127,  0,216, 32,209,  5, 35,218, 25, 80,233,  6,177, 64,213,116, 74,105, 75,160, 73,243,118,252, 72, 98,199,  9,223,
-185,206,  2,164, 40,155, 56, 81,124,143,239, 57,223, 57,247,156,239,227,255,163,  4, 30,167,231, 76,250, 97,249, 48,208,125, 82,
-111, 72,226,127, 66,174, 49,242,130,223, 31,120,  3, 55, 28, 33,162, 99,169,131,104, 18, 67,247, 36,213, 97, 88, 14, 67,127,  8,
- 96, 60, 42,103,203,127,247,254, 66, 48, 19,168, 82, 76,117, 20,153, 26,  0,120, 82, 24, 73,240,254,212, 13,130,113,204,156,192,
- 10,214,194,126,243,238,208,235,199, 76, 57,172,204, 26, 31,113, 34,175,153,  2, 77, 11,130, 72, 29,147,132, 72, 18,126,232, 81,
-189,133, 84, 61, 41,222,  2,136,225,223,198,211,173, 36,252, 22,  6, 20,153, 24,105,126,196, 86,  6, 43,194, 40,252, 67,210,247,
-  8,124,199,183,  1,133, 42,133,163,140,112,156, 53,145,179, 97,170,128,209,112, 51, 81,  2, 58,123, 32,  4,203,210,100,226,198,
-154,133, 27,185, 10, 16, 28,144,174, 42,176,161, 83,145,  7,182, 37,150,164, 57, 77, 54, 49, 11, 45, 82, 26,151, 73,  9,166,129,
- 28, 95,200,232,184,140, 35, 90,126, 17,119, 23,181,155,173, 11, 47, 94,200, 91,230,238,238, 94,185,144, 63, 86, 41,233,248, 84,
- 97,225,157,138,113, 33, 86, 98,181, 80,226, 56,101, 48,244, 95,189,124, 37,119,184,122,233,149,215, 16, 74,166,126,  4,207, 12,
- 88,  7, 24,110,234, 98,126, 69, 41,231,213,114, 86, 62,132,247,162, 92, 92, 85, 74,133,180,109,119,224,149,107,149,242,199, 31,
-126,112,253,250,103,231,158, 61,117,235,199, 27, 88,236,173,147,199,  3,114,211, 92, 20,136,211, 41,117, 88, 34,192,135, 84, 97,
-103,240,159,  6,197, 56, 85,150,  0,202, 52, 69,164,102, 59,129, 87,197,  5,178, 10, 93, 21,140,164,104,165,196,140, 46,153, 41,
- 41,  5,144,172,203,102, 90,206,173, 40, 57, 75, 51,224,186,146, 74,164,205,135,115,219,159, 57,147,249,248,169,247,143,169,102,
-144, 30,105,178,198,113, 66,181, 80,195,151,  4,198,233, 10,123,181,250,109,198,177, 57, 79, 39,211, 73, 37, 41,203, 90,223,237,
-193, 82, 93,183,139,165,222,189,123,179, 61,108,107,138,238, 79, 61,160,230, 83, 27,155, 72,122, 17, 84, 21, 49,  9,231,126, 40,
-187, 65,253,191,164, 38, 17,169,162,186,125,228, 76,163,247,152, 14,220,124,219,210,179,219,181,109, 92,249,180,221,196, 79,193,
-147,194, 76,200,175,177,101,190,187,115, 35,148,136, 94,175,227,116, 11,153, 66,189, 80,129,125,129,194,116, 89,191,189,127,251,
-113,251,209,195,214, 35,142, 29, 79,241,188, 68,195,144,211, 49,130, 10, 18,  2,215,119, 44,221,128,215, 56,104,220,191,245,251,
- 94,173, 88, 71,134, 22,  4,158, 70, 99,194, 74, 49, 83,  0,188,242, 70,253, 21, 35,135,212,250,196,250, 49,  0, 47, 62,138,224,
-145,115,134,181,185, 94,175, 23,171,139,249,172,158,223,224, 23,209, 51,107, 71,158,244,155,185, 84, 22, 48,224,234,203,111, 87,
-139,235,237,  1,178, 88,239,183,251,191,218,126, 31, 16,222, 76, 26,212,140,187, 88,156, 57,126, 86, 97,179,154,  7,141,123, 69,
-115,117,173,180,126,118,235,249,131,198,254,215,123,223,192, 83,192,143, 20,173, 50,220, 83, 56,139,181, 13,248,146, 85, 92,203,
-173,189,116,250, 34, 41,231, 76,124,182,245,231,164,220,129,221, 41, 38, 24,199,175, 24, 83,199,136, 82, 66, 16, 99, 78,224, 37,
-  4,100,119, 77, 12,115,176,  7, 63, 91,252,209,117,127,110, 63,112,230,212,226, 51, 36,160,150,240,231, 64,235, 36, 15,131,236,
- 46, 88,176,200, 30,197, 10,145, 36, 72, 13,168,137,133,200,202,242, 78,243, 30,126,237, 82,254,116,237,218,235,209,157,196, 59,
- 59,111,188,123,254,253,196,249,196,206,229, 47, 37, 67,233,  5,147,143,126,249,234,205, 31, 62,127,239,230, 23, 13,199, 15,164,
-168,245,237, 79, 23, 63,121, 78, 78,100,175,125,255,105,238,232,185,138,150,159,250, 61,123, 22,170,188, 12,159,236, 76,156,225,
-100, 36, 73,194,136, 68,183,105,170, 60,107, 88,105, 69, 87,  4, 25, 15,204, 86,245, 36,205,242,113, 36,180,192,196, 50, 40,150,
-203,108, 88,186, 51,234,226,229, 77,189, 88,145,132, 81, 47,136,205,193,147,158, 59,128, 65,177, 97, 31,182, 30,132,164,131, 48,
-110, 13,137,247, 34,155, 92,169, 23,235,212, 35, 59,153,136,172,110,227,250,182,169, 26, 18,155,184, 94,246,165, 80, 65,134, 26,
- 37,105,200,227,207, 22,182, 73,223,233,225, 81,217, 60,124,226,234, 11,111,  1,148, 32,105, 24, 17,179, 35,143,231, 57, 37,167,
-225,213,219,195, 14, 86, 53,111,228,177, 96,125,167,139, 28,162,227,118,136,163,153,209, 14,215,242,245,142,221, 30,186,182,231,
- 59,240, 65,182, 75,  7, 69,192, 43,228,116,168,239, 99,102,105, 25, 25,240,113,  1, 16,166,148,204,210,210, 57,179, 88,158, 84,
- 52, 93, 51,168,189, 74, 49,102,164,107, 56,118,199, 35,137, 83,150,245, 18, 54, 94, 12, 27, 33,188,  5,100,174,121,140,132,255,
- 21,128,168,115,137,109,163,138,194,240,120,102, 60, 51,182,199,111,198,142, 83, 39,177, 13,184,233, 67,105, 19,161, 54,180, 85,
- 89,176, 97,209,125, 43, 36,  4, 75,246, 72,236, 80, 97,133, 16, 66,108,144, 64,236, 42,182,116,129, 64, 44, 64, 65,130,164, 16,
-  9,132,170,134, 87,139, 20, 72,147, 38,177, 61,113,198, 30, 63,199,158, 49,231, 63, 55,  9, 91, 43,138, 61,115,239, 61,231,220,
-243,248,254,147,248, 29,249, 56,178, 47, 25, 51, 43, 51,169, 74, 69,155, 45, 79,  1,160, 34,227,255, 95, 93,149,196,236, 33, 28,
-138, 21,207,211, 69, 88,131,166,104,224, 31,137,244, 65,127,149,167, 61,133, 34,171,194, 67,186, 90,163, 83,231, 66,160,224,128,
-  2, 34, 17,136,142,126,209,211, 47, 29,195, 20, 36, 48, 25,208, 17, 44,244,213,142,175, 11,104, 63, 82,194,185,212, 84,148, 15,
-191,112,222, 50,183, 58,197,116,115, 26,149, 58,151,177, 98,200,  4,176,138, 94,144,139, 79,129, 71,113,226,187,216,  1,122, 99,
-192, 51,227,209, 52, 19, 17, 16,243, 28,118,155,205,110,131,161,228, 82, 68, 53,170,197,121,122,107, 71, 40, 73,238, 47, 63,150,
- 58,132,227,129,116,184,223,115,  6, 54,121,254, 66, 62,134, 36,123, 24, 26,167,138, 76,151, 53, 89,128,  4, 56,150,226,177,166,
-137, 64,196, 76, 88, 62,  1,221, 47, 67,174,208,180,218,205,115,103,171,197,233,252,202,119,223, 94,122,110, 81, 11, 43, 15, 31,
- 61, 18,  3,171, 18, 24,212,163,133,115,243,183,110,222,252,242,139,187,253,174,123,251,157,219, 31,125,240,254,229,229,229,218,
-222,222,230,227,109, 21, 96,  0, 31, 86,111,226,105,106, 96,104,129,  6,129, 43,116,220,211, 89,142, 24,234,149,107,215,239,173,
-221, 51,140,200,171,175,189, 94,168, 44,207,156, 74,174,172,124,115,186,122,222, 48,204,181,245,251,126, 16, 30,141,  5,201, 85,
-230, 73, 88, 52,147, 49,240,  7,115,139, 60,  1,139, 60, 15,126,191, 63,241, 70,194, 10,156, 80, 99,209,122, 25,213, 21,114, 93,
- 98,122, 22,221, 59,225,144, 25,149,227,166,172,199, 67,180,103,129,166,151, 21,140,165, 76,252, 84, 36,211,245, 92, 10, 37, 48,
- 84,130,250,178,108,198, 18,118,251, 96, 76, 49,190,145, 52, 52,253,160, 85,215,128,228,209, 98,168,152, 37, 41,138,167, 69,135,
- 27, 13,133,210,241, 52,133,165,244,191,154,110, 83, 83,148,238,208,165, 35,173,201,250,112,220, 35,  7,  4,249,133, 65,103,206,
- 42,237, 29, 62,161,131,120, 42, 91,220,111,213,154, 29,135,246, 33, 35,188,163,100,178,200, 61, 84, 10,229,234,236,153,243,103,
- 23,103,175,156,249,113,117,149, 30,216,118,234,170, 26,110,182, 15, 83,102,114,199,222,245,198, 67, 58,135,182,107, 83,184, 64,
- 63,114, 46, 87,202,167,115,123,135,251,244,118,102,159,154,163, 79,104,177,208,173,129,130,249,104,204,202,215,134, 28,161,  0,
-112, 99,115,195, 74,100,182, 26,219,180, 81,233,235,158,153, 42,175,255,181,206,205, 27, 48,130,233, 72,154,204,183,149,200, 38,
- 99, 73,178, 56, 75,149,133,  6,148, 70, 90,165,153,106,127,212,255,249,207, 95,218,253,206,229,211,151,232, 90,227,116, 28,  5,
-164, 38,223,237,117,232,235, 10,169, 92,189,181,111, 59,141,165,242,  5,238,135, 25,215, 15,118,123,237,246,  8,186,193,170,  3,
- 62,244, 48, 99,166,154, 93,135, 30,159,243,230,126, 84, 55, 94,186,248,226,247,191,255, 64,207, 66,215, 14, 90,174,100, 36, 69,
- 49, 93, 53,170,231,175, 77, 73,253,190,228,121, 56, 16, 33,102, 70,138,145,247,224,136,206, 45,210,160, 62,199,239, 19, 95,217,
-111, 36,106,222,144,108,155,231,135,210,122, 34,162,217,143, 29,151,236,251,  0,184, 80, 16,  3,134,244, 22, 24,175, 37,230, 18,
-233, 47,162,134,108, 41, 51, 31,110,172, 30,122,238, 39, 23,222,200,190,183,248,242,210, 43,187,189,230,231,119,239,116, 62,253,
-109,115,235,254,103, 59,171,119,254,248,234,121,171,116, 99,246,162,239,247, 63,126,248,117, 33, 93, 76, 59,157,167,111,188, 16,
-255, 53,243,238,223,111,190,125,253,173,157, 39,255,172,217, 63, 45,230, 23,114, 58, 45,223, 68, 57,226,117,  9,197,139, 80, 50,
-158, 48,181, 72,207, 27,248,128,149,122,117,231, 64,216, 93, 81,137,189, 58,127,149, 94, 11, 93,119, 56,152,148,172,132, 69,139,
-130, 99,  8, 29, 45,137,174,251, 40,173, 15,122, 61,138,148, 19,217,128, 83,221,244,240, 67,192,195, 37,238,202, 11,158,205, 87,
- 40,144, 31, 51,  7,148,182, 34,172,  7,186, 15,  1,133,246,241, 97,136, 35,226, 18,  5, 13,245, 90, 45,101,162, 30,163,134,195,
- 20,194, 63,248,247,129,174, 27, 19, 48,207,135,130,193,  0,249, 17,145, 51,225,110,149,  1, 72, 18,  2, 10,128, 10, 92,  4,129,
- 80,116,171,190,  5,113, 40, 58, 35,156,147, 25, 12,250,160,164,  5,220, 65,131,180,155, 69,215, 86,216, 40,  9, 24, 21,161,134,
-196, 60,102, 85,197,204,221,  0,154,239, 12,139,166,168, 72, 76,210,186, 16,168,242,201,215, 77,103,139,110, 31,187,162,146, 43,
-207, 89,229, 93,123, 91, 69,207,139,255,159,  0, 92, 93, 75,111, 27, 85, 20,158, 25,199, 51, 30,103,252, 24,199,174,237,144, 52,
-161, 41,  1, 53, 41, 78, 19, 12, 45, 47,169,145, 88, 65, 75,149,240,144, 88,128,216,241, 11, 16, 27, 88, 68,  2,177, 66,108,216,
- 34, 30, 18, 20,  9, 36,246, 64, 68, 87,172, 72, 42,213,105,147, 10,147,166, 36,105, 82, 26, 63,198,206,204,120,230,142,205,249,
-206, 56,141,132,151,246,104, 60,154,123,239, 57,223,121,125,223, 49, 63,  1,211,164,  5, 54,228, 10,189, 48, 32, 96, 36, 47,254,
-215, 23,143, 17,  3, 20, 90,209,189,142,220,179,172,116,  2, 95, 58,134,246,204,238,197,114, 76,180, 41,  7, 85,157,238,  6,110,
-128,176,158,115, 20, 44,244,152, 26, 43,252, 80, 28,144, 49,114,244, 58, 98,170,238, 35, 93,133,178, 38,115,  2,247, 95,151,212,
-239,134, 21,150,107,177, 70, 40, 86, 42, 84, 32,  7, 72, 23,174, 17, 79, 90,118,163,159, 77,228,198,198,168, 18,229,170, 90,191,
- 84,219, 87, 39, 15,205, 21,134,191,209, 42,200, 50,231, 48,189, 20,220, 13, 49,113, 57,197,116,105, 61, 93,183,235,126, 23,244,
-197,160,153, 12,  4,217,202, 99,121, 25, 78, 87, 82,200, 70,187, 32,107, 26, 61, 84,204,209,142,226,  7, 82, 56,193,196,188,119,
-189,136, 20, 50,202, 65, 16,141, 44,182,237,118, 15, 15,  9, 94,  1,185,130,168, 36, 16,219,119,255,126,245,242, 43,169,164,118,
-107,227,250,115,207,206, 85, 55,174, 15, 68,187,244, 75, 33,151,121, 99,113,225,237,119,222, 93, 89, 89,185,122,245,135,215, 22,
-174, 60, 50, 50,182,180,244,113,177, 56, 60,123,238,220,175,191, 45,147,231, 84,186,242,220,204,204,216,  8,133,182, 67,166,145,
- 73, 39,211,169,244, 16, 25, 74, 85, 29,116,237,222,197,249,151,111,175, 87,215, 42, 27,186,166, 78, 78,140,110,254,117,103,249,
-151,223,203, 79,157,167, 96,227,218,181, 63,  6, 20,205,131,152, 37, 11,232, 69,250,226,218,132, 92,  5, 70,177,144, 79,167, 99,
-236,249,136,219, 21,176,248, 50, 21, 65, 84,137,199, 36, 67,135,202,143, 22, 37,251,174,128, 18, 28, 44, 12, 72,127,106,228,222,
-116, 89,143,225,237,210, 86,176,218, 78, 76,142,130,210, 79, 82, 90,157, 38,185, 63,193, 83,202, 40, 92, 48,159,115,222, 44, 96,
- 56, 80,142, 16, 38, 34, 83, 27,101, 38,  6,250,219,189,250, 94, 54, 85,160, 11,146,144, 25, 81,118,107, 56,165, 22,184,  3,  5,
-156,  8,235,199,147,161,247,124,159,118,151,105,152,167,242,167, 86,171,127,134, 19, 24,116,108, 36,112,236,  1,148,208,153, 36,
-132,219,114, 44, 58, 84, 19,197,199,111,110,173,217,162,115,101, 97,241, 96,235,193,173,234, 13,120,238,160, 75, 16,207, 34, 91,
- 41,220,100, 44,209, 68,206,  4,222,220, 21,182, 11,245,143, 58,173, 90, 66, 55, 48,117, 37,201,205,118, 99, 40,153,163,213, 36,
-124, 61,108, 22,204,184, 73, 16,175, 52, 93, 58,243,194,108,176,111,215, 90,117,250,178,104,230,125,225,154,208,225, 11,201,170,
-122,100, 26,138,233, 66, 49, 83,168,108, 85,200,136, 86,239,111, 90,110, 27, 82,112,116,147,116,161,237, 52, 71,179, 35,166,145,
-170,220,169,144, 99, 59,123,114,106,251,254,246,139,103,159, 47,141, 77,217,126,167,222,120,240,228,163,165,213,205, 85,109, 64,
-107,216, 22, 40,177,208,181,229,122, 61, 65, 80,157,182,168,166,197,201, 63,209,235, 31, 63, 49, 78, 75,176, 83,191,119,115,231,
-182,227, 30,146,191,108,161,169,151,108,181, 77, 72,100, 44, 18, 27,190,144,165,136, 87, 66,155,118,192, 44,190,253,158,  2,150,
-144, 12,  5,223, 37,142,222,144,114,145,125,245,159, 90,170, 73,  7,185,171, 76,142,206,136,246,110, 68, 61,216,181, 92,116,181,
-  6,221, 78,  0, 86, 20, 92,204,237,222, 62, 87, 33, 19,154,154,212,212,123,174,245,245,122,165,172,142,126,240,249,151,206,158,
-120,235,139,215,191, 90,248,126,250,210, 99,203,159,126,251,201,250, 79,107,181,205, 15,203,111,150,242,167, 83,131,137,103,242,
-147, 19,241,252,103, 55,126, 44,106,217,151,158, 88, 44, 63, 61,183,244,243, 71,239, 37,223, 79,100,229,111, 54,190, 59,147,159,
-158, 74,145,103, 18,202,195,166, 63, 60,104, 55, 54,160, 57, 62,132,229, 67,181,104,229,161,166, 50, 83, 11,236, 32, 85,226,106,
- 81,149, 80, 41,172, 60,186, 18, 29,136,167,113,103, 75,198,200,112,158,  0, 92,140,134,158, 40,159,158,181, 64,104,  8, 92, 23,
-150, 31,200, 46,253,219, 58, 32,104, 45,129, 61, 70,167,205,232,116,192, 95,203,124,100,130, 21,229,144,190,106,195,215,162,135,
- 65,141,170,180,  4,  1,235, 56,162,  5, 62,160,  7,243,122, 71,147,152, 97,  2, 91,102,223,  9, 14, 56, 25,148,139,185,196,137,
- 54, 43, 11,121, 20,218,121,157,249,210,124,117,191,170,160,136,  5,152,  6, 40, 69,182,253,104,146,214,233,216,  2,105,153,144,
-240, 44,100,115,236, 73,253,204, 48, 82,179,190,239, 13,234,137,241,220,248, 78,109, 91,230,233, 60,  8, 48,176,240, 29,178,127,
-140,220, 14,157,246,126,131, 51, 84,172, 59,241,159,  0, 84, 93, 75, 76, 27, 87, 20,157,241,119,108,143, 33,224,  4, 25,  2, 73,
-156, 15, 42,136,162,198,142, 13, 89,144,152, 46,250, 17, 69, 68, 73,182, 81,149,125,151,149, 74, 54,169, 88,118,213,  5,234,170,
- 89,147, 42,202, 34, 74,212, 42,171, 86, 40, 11, 20,201,136, 32,146,242,181, 45,138,  1,127,176, 61,129,241,252, 60, 51,238,189,
-247, 77, 34,199, 43, 75,150,173,241,155, 55,231,222,251,238,185,231, 56,254, 30,204,218,137,145, 23, 57,206, 25, 39,192,177, 39,
-142,227, 63,113, 76,167, 17, 50,122,134,  1, 25, 76,154,176,193,201,183, 54,244, 71, 13, 29,191,136, 86, 80,104,182,104, 57,126,
-130,237,252, 74,174, 61, 28,224,185,200,249, 72,172,114,130, 10,215,236, 67,122,211,150,121, 59,232,236,248,203,178,126,  5, 99,
- 62, 49,248,134,228,  8,254, 34,224, 99, 88,232,208, 49, 91,180,131,222,160, 24,232, 48, 12,149,241,245,105,209, 49, 41,104,209,
- 65,  1, 20,  1, 72,181,105,153,196,111, 65,169,  3,108, 70,147, 15, 92, 25,109,122,240, 84, 10,253,131,120,180, 10, 51,144,113,
-143, 34, 57, 16, 96,162,167,206,226,240,164,139,247,187, 67,126, 18,100,135,251, 14,121,174,  6,185,141,193,153, 38,175,104,216,
-  3,211,154,166,162, 90,186,134,247,191,161, 89,104,153, 10, 33,135,200,148, 36,187,224, 58, 40,214,182,183,243, 83,223,124,119,
-225,252,224,200,104, 34,191,179,155,205,239,193, 79,141, 12,141,140,143,141,191,120,254,124,225,143, 39,128,161,179, 15,102,159,
- 61, 93,200,230,183,234,213,202,244,204,244,230,191,239,228, 19,169, 83, 20,239,204, 76, 79,166,211,241,209,209, 84,106, 44,149,
- 74, 78, 76, 76,164,211, 95, 38,175, 37,110,220,156,140,246, 70,107,149,210,242,202,242,234,155,213,151,127,254,245,106,113,241,
-189, 44,223,190,117,251,168, 90,126,247,118, 45, 36,250,125, 30,100,194, 64,222,109,163,112, 95, 11, 37, 18,109, 64, 73,216,223,
- 44,  0,243,164,159, 67, 18, 63,228, 90, 73,242, 73, 60,169,190, 65,205,  8, 91,156, 11, 10,124, 56,200,  9, 66, 11, 50,247,206,
-176, 75,  0, 68,247, 33,132, 83,230,131, 26,155, 46, 11,155,208, 77,124,138,220,140, 79, 11,181,148,106, 42,210,113, 13, 42,101,
- 30, 73,253, 72,206,133, 72, 49,121,245,171,157,131, 45, 64,237,238,112,  4,214,185, 43,212,157, 43,229, 80, 74,222,227,135,245,
-199,206, 39, 41,126,232,166,122, 49,122, 25,194,176,224,243,194, 74, 14,246, 13,102, 15,178,201,228,248, 97, 97,223,230, 97, 67,
- 55,206, 70,  6,246,235,  5, 26,229,199, 84, 67, 55, 84, 49, 40, 86,234,149,225,161,225,245,141,181,163, 92,105, 99,103,237, 88,
-174,163,255,223,113, 53,253,121,186, 88, 47, 37,174, 92,157, 74,125,155,217, 90, 33,107,121,148,147, 51, 81,125, 90,247, 83, 75,
-211,166, 42,134,  4, 89,105,  3,243, 28,212,203,215,135,198,142,164,170,169, 24,153,215, 75,  0,175, 69,233,240,116, 71,183, 36,
-215,  1,253,206,245, 95,210, 27,120,110, 78,182, 54,103, 78,133, 58,214, 11, 27,  3,145, 62,184,126, 69, 83, 99, 61,  3, 53,  5,
-202, 11, 55,100,103, 62,  4, 44,237, 77,110, 21, 77, 14,188, 94,168,235,225,201,221, 45,237,254, 87,217, 43, 86, 15,227,151,227,
-213,247, 21, 21, 47,195, 75, 46,222, 30,  0,119, 64,183,216,153, 11,101,169, 12, 87, 24,242,  7, 12,114,182,170,201,117,  5, 21,
- 17,220,128,115, 16, 45,  6, 78,199,234,114,217, 67,250,  4, 46,206,114,107,218,208,205, 94,136, 14,136,239,200,118,177, 63, 48,
-118,217, 88,135, 99,237,140, 85, 26, 65, 24,103,136,171, 37,184,101, 56, 46, 84,150, 42,227, 61,209,162,190,123,212,128,184,130,
-167,159, 38, 89,211,178, 41,216, 38,125, 17,150, 38,232,241,118,  6,130, 93,130,235,159,124,241,167,216,189,248,252,215,223, 39,
-238,101,213,253,199,153, 71, 39,243,153,159,255,254, 45, 35,231, 30,198,239,134,  4,159,212, 60,  1,104, 83, 57,253, 11,  0, 38,
-169,182, 80, 88,186,239, 79,118,253,120,233,215, 95,126,151,100,207, 15,137,251,115,203,115,253,221, 87, 38, 35,231, 36,171,193,
-115, 31,133,206,240,140,  2, 42, 45,  8,237,168, 27, 67,174, 38, 22,181,136, 93, 45,206,225,119, 18, 31,  8,176, 24, 29,  2, 90,
- 40,166, 79,138,100,142,237, 18,228,191, 33,  1, 69,229,116,203,144, 21,185,183,171,103,125,111,147,228,180, 92,108, 30, 42,128,
-202,220,  1,114,112, 67,238, 53,211,129,104,199, 42,  0,135,207,250,  7, 81,252,142,119, 59, 41,175,109, 17,166, 97,173,192, 35,
-107,185, 83,113, 20,203,201, 41,130, 65,189,211,226,  0, 76,111,202, 90,131,177, 63, 16, 76,173,102,174,152,163,192,218, 34,239,
- 32, 14,118, 62, 49, 90,108, 38, 19,105, 51, 66,185,131,144,204,182,156, 20,249,108,  8,177,144,113,138,128, 46, 90, 83, 41,212,
-246,169,201,137,169,111, 24, 71,240, 52,219, 57, 81,199,195, 12, 40, 20, 20,181,129,146, 84,244,250, 95,  0,178,206, 45,198,137,
- 50,138,227,211,206,116, 58,211,105,103,182,180,179,237,238,178,247,134,203,118, 23,221,184,139,132,136,160, 98, 98, 98, 98, 98,
-130, 62,193,  3, 36,132, 23,158, 73,240,141, 24, 19, 19,195,  3,111, 10, 24,125,215,144, 37,236, 62,  0,137, 15, 96,150, 68,225,
-  5, 84, 86,151, 66,157,189,245,126,153,157, 94,102, 58, 23,207,249,190,182, 49,154,244,161,153,135,185,126,223,249,254,231,124,
-231,252, 78,159,255, 78, 91,161,122,253,224, 59,109,151,215,195,191,211, 44, 20,150, 34, 97, 93,198,241,122,182,222,235, 53,217,
-253,151, 69,118, 97,  8,162,233,103,104,214, 51,243,159,223,255,109,125,209, 40,146,154,  5,182, 15, 63, 67,124,  7, 43,146,147,
-208,237,  5,166, 47,195, 89,196, 58,139,150,107, 83,219,129, 81,  3, 66, 89, 99,104,223,  7,215, 30,218, 51, 90, 54, 10,232,225,
- 82,162,154,231,  5, 56,129,210, 78,226, 17, 85,149,147, 53,163,226, 58, 52, 33, 18, 70,140, 77,140, 63, 66,130, 38,  7,167, 73,
-250, 16, 12,104, 11, 89,  5, 20, 13,129,115,  8,243,155,224,211,130,115, 67,202, 33, 88,208,183, 97, 65, 84, 20,220,127,231,112,
-147,147, 85,194,136, 24, 19, 48, 37, 30,198, 37,162, 34, 21, 41, 16,149, 56, 37,204,201, 97, 78,137,  4,224,143, 24,192, 86, 47,
- 60,239, 23,  5,127,173, 94,126,252,228, 87,215,178, 36, 41, 82,171, 26,207,215,214,193,170,110,109,111, 60,252,249, 97, 38,147,
-129,103, 76, 77,143,207,165,103,111,220,252,118,104, 80,133,155,159,157, 57, 48, 50,172,254,241,252,105,179,109, 62, 88,125,244,
-195,173,165, 91, 75, 43,203,203,119,239,220,185,123,255,222,253,229,219, 75,173,134, 49, 54, 49,137, 45, 32,246,142, 45,188,177,
-152,218, 55, 99, 89, 78,181,102,140,143, 78,156, 57,123,254,250,215,223,253,246,103,182,186,219,105, 17,165,106,163,201,238, 49,
-125, 24, 18, 85,193,184,  8,  2, 24, 88, 68, 76,250,  9,207, 13,151,109,236,180, 20,244, 73,  2, 27, 18, 60, 57,226,151, 66,140,
- 36, 98, 47, 11,144,206,176, 78,240, 65,134,236, 73,248, 44, 11,253,122, 28,114,188,195,154,193,132, 52, 28, 10, 72,245,102, 25,
- 92, 75, 58,248,100,113,192,236,180,143, 30,125,107, 44, 53,170,101, 55,224,130,224,111,110, 21, 54,193,  2,137,  1, 73,111, 86,
- 64,191,111, 85, 52,  7,121,188,130, 31, 19, 12,204, 78,199,129, 11,193, 23, 28,129,153,111, 84, 75,122, 49,185,103,  8,190,241,
-139,220, 11,129, 21,230, 23,231,243, 90, 62, 38,199, 91,166,161,155, 58,213,242,176,114,165,199,211,185, 90,  1, 70,136, 24,  8,
-197,135, 85, 77,203,194,193,169,196,228,102, 65,107, 88,134, 44, 41, 37,189,  4,162,117,109,251,175,213,223, 87, 65,209, 95,248,
-224, 92,102,231,101,  7, 35, 86, 20, 72,138,210,  9,201,152, 88,146,206,189, 61,119,108,125,107, 61, 41, 39, 54,138, 27,207, 94,
- 61,179,  9,206,  9,236, 78,122, 98,230,239, 92, 22, 44,172,196,135,242,181,252,107,233,197,151,218,186,196, 11, 45,187, 13, 70,
- 92,  8, 74,170, 28,215, 74,155,224,209, 31, 62,184,240,254,235,199, 87,215,126,217, 27, 27, 43,212,243,224,200,130, 15, 26,226,
- 96, 34, 74,213,102, 29,204,  4, 92,  5,116,217,187, 39, 62, 42,230, 54,171,141, 42,234,  9, 31, 51,168,196,131, 28, 47,240,161,
-143,223,251,212, 51,173,242,110,197,104, 27,162, 32,165,134,167,178,  5,141,212, 95,227,108,133,119,  5, 38, 12,188,141, 58,  2,
-242, 56, 85, 73, 88,118,195,207,249, 84,134,219,255,206, 40,195, 97,118, 20,145,106,148, 21,136,154, 13,247,151,187, 32, 25,207,
- 38, 49,117,108,152,220,138,242,145, 35,160, 69,109,167,101, 57, 94,148,109, 21,172,109, 29,183,212, 61, 11, 57,189, 46,209,106,
-164,  6,  5,167, 12, 70,245,144,116,196,243, 97,129, 63, 20, 11,159, 62,247,121,112, 36,113,234,139, 83,223,188,121,115,126,118,
-238,251,171, 95, 94,203,174,124,118,248,147,168, 32,236, 98, 17,  9,237, 11,130,233, 55, 11,177,169, 31,179, 63, 69,235,225,227,
-151, 63,124,114,253,233,202,206,242,165, 19, 23,175, 60,250,106, 64, 30, 60, 25,159,172,217, 77, 90,142,137, 11, 43, 38,253, 96,
-155,198,122,187,129,247,225,103,122,157,158,186, 54,132,166, 82, 83, 24, 11,152, 14,158,231, 65, 16,195,219,136, 41,113,189,165,
-211,248,240,190,228,116, 38,151,193, 22,213, 62,111,187,188, 67,192,153,221, 19, 81,154,155,213,193, 76,155,228, 64, 18,180, 48,
-211,107, 96, 71, 74, 29, 29,212,118,142, 89,174,151,  7, 66, 81,240,142, 97,241,  8, 32, 52,137,202,109,111,215,212, 77,155,176,
-205,145, 34,201,208, 76,101,143, 38,197,147,187,131, 35,132, 70,215,233,149,130,118,155,171, 18,114,170, 27,100,131,  9, 57,  9,
- 14, 34, 46, 71,  4, 47, 79,131, 15,221,135,235, 23, 87, 50,221,251, 33,  5, 83,109,234,218,168,114,  2,247, 23, 17,130, 45,131,
- 31, 76,178,189,253,211,201, 84, 69, 47,185,216,208,205,162,137, 82,212,192,254, 35,  0, 89,215,210,219,196, 25, 69,103,198,243,
-242, 99, 98,143,  1,199,128, 18, 71,  8,147,130,148,178,224, 89,169,155, 46,168,132,144,248, 21,172, 88,241, 11,104, 37,216,118,
- 83,241, 18,168,170,170,110, 88,118,137, 42,177,168,130, 32,130,240,134,162,  4,168, 72,128,188, 60,118,252,152,204,196,246,120,
- 62,206,189,223,152,148,214,202,194,177,199,246,188,190,123,207,125,157,163,166,169, 16,147,232, 55, 41, 91,212,159, 91,110, 36,
-161,142,255,242,145, 48,  3, 15,211, 39, 95, 90,121, 85,249, 15, 98,255, 76, 39,243,191, 23,  5,205,214, 27,196,218, 19, 71, 91,
-249,125,149,201, 97,146, 79,197,204, 49, 34,249, 44, 57, 71, 60, 12,  0, 52,206, 40,194,  3,  3, 55,241, 13, 68, 94, 95, 48,221,
-189, 66,  2, 70, 89,203,180,136, 25, 92,229, 68,132, 80, 16,128,167, 20,109,212,221,217,242,215,153, 49,110,248, 53,236,135,178,
-150,163, 27,102,203,111,224, 37,156, 65,156,187,183,203,115,  9,  9,147,194,230, 15,161,183,229,  8,165,167, 83,197,217,192,253,
-125,236, 96, 89,183,180,129,208,194, 94, 44,197, 19,164,238, 76,208,143,104,176,154,233,177,177,153, 97, 10,182,131,228, 70,168,
-185,144,148, 58,128, 23, 52,146,125,236,119, 45,152, 73,221,128,217,165,225,111,234,173, 37,177, 36, 34,  1, 84,181, 29,133, 17,
-236,216,207, 87,174,122,158,  7, 40,247,242,217,139, 27,191,253, 26,132, 93,106, 89,165,161,  8, 34,212, 52,137,110, 12, 75,161,
-127,233,242,229,191, 95,190,154,254,235,142, 91,220, 54, 14, 75,191,119, 79,165, 82,209, 17,106,165, 51, 15,103,238,157,191,112,
- 17,171,229,251, 19,223, 29, 57,116,120,118,246,225,244,189,187, 41,226,241,192,122, 30,116, 35,209,167,  2, 15,214,146, 48,216,
-135,115,175, 46,129, 10, 74,178, 99,231,201,234, 19,138,147,250, 96,172,122, 13,232, 65,247, 80,164, 14,240, 36,236, 10,132, 41,
-  1,188, 58,119,152,227,240,202,113,126, 95,105,234,201,135, 71,248, 52,183,106,209,184, 25, 76,188,155,113,231, 62,190, 66, 96,
-131, 72, 11, 17, 37,139, 42,232, 92, 15, 76,186,155,220, 76,209,107,175,193,215,178,152,198, 38, 11,169, 11, 93, 49,199,118,140,
-175, 53, 87,176,206, 77,221, 60, 92, 61,242,104,126,118,188, 52,209,232,120,176,236, 68,176,159,178,195, 94, 72,249,116,183,220,
-232,212,178,182,147,179,115,245,118,125,106, 98, 10,231,109,126,105,142,146,114,164,147,162,150,183,151,219,237,118,221,247,138,
- 57,247,192,216,228,211,119,207,221,116, 62,236,245,154,155,141,141, 96, 67,176,238, 21,220,  0, 54,182, 82,166,147,118, 16,234,
-173, 52, 62,192,106,184, 89, 55, 37, 16,183,233,114,106,241,192,238,234,219,229,215, 92,231, 84,129,144, 38, 74, 21,195, 52,222,
-215, 22,  1,  2, 13,221,128, 87,184,253,228, 54,245, 50, 10, 92, 98, 10,223, 38,119,239,107,  5,205, 90,103, 29,219, 23,156,162,
- 99,229, 70, 50,206,204,252,125,156,235,180,157, 65,  0, 10, 27,132,163, 35, 18,127, 88,237,148,133,155,137,169,159,  8, 99,246,
-185, 31,  3,191,235,228,242,171,141,101, 30,149, 84, 71, 11,165, 77, 46,  2, 19, 49,145, 74,228, 51, 88, 41,142,157,141, 69,160,
- 27,218, 87,131,212,169,139,199, 21, 61, 80, 26, 77,165, 27,208,196,132,252,235, 15, 20, 34,115,  4,174,232,135,196,130, 55, 32,
-121, 83,160,153,166,251,216, 43, 91,233,130, 31, 52, 96,195, 38, 11,254,139,245,215,173,144, 26, 59,122,220, 63,195,186, 63, 48,
- 42, 36,139, 12, 51,141, 43,154, 79,155,149,252,136,155,201, 25, 74,116,116,255,233, 63, 31,  7,231,166,127, 18, 15,132,247,251,
-173,111,175,157, 25,117, 71,207,126,125, 34, 80,162, 78,224,235,178,233,139,218,205,244,  9,167,244,227,253, 63,222,173, 46, 45,
-204, 45,222,250, 97,230,228,205,111,196, 89, 49,246, 75, 53,179,173,120,253,208,233,197,176, 38, 89,109,113,188,182,157,238,248,
- 29,248, 18,211,178,125,191, 29,145,158, 53,183,136, 83,174,137, 88,176, 72,219,154, 64,155,106,155,217, 40, 34,130,129,186, 95,
-199, 46,239,221, 85,125,179,252, 15,163, 55,170,177,215, 58,181,227,213, 99, 43,173,149,133,181,247,178,164,204, 98, 83, 49,219,
- 98,141,175, 81, 47, 41, 12,254, 27, 59,139,184, 90,174, 46,120, 11,146,172, 16,239,  3,221,  3,173,227, 39,168,233, 80, 51, 55,
-200, 31,  8,230,147,144,253,120,  9, 56,166,124,192,128, 26,137,  1, 46,183, 59,178,217, 41,150, 68, 16,169,132,231, 39, 49,154,
-154, 38,251, 12,165,140,238,240, 27,152,253,149, 70,117, 88,138,  0,232,145, 52,165, 98, 26, 79,147,111, 69,146, 60, 56,102,117,
-231, 88,184,217,130,223,221, 32,205, 72,250, 95, 12, 67,147, 33, 91,131,166,125, 18,128,177,179,233,109,163,138,194,240,157, 79,
-207, 56, 83, 39,113,155, 56, 56,196,168, 13,109,196,135,132, 16, 44, 16, 82,  5, 98, 81,118,116,129,216,193, 15, 64, 72,176, 40,
- 66, 72,101,131,216, 33,254, 68,133,144, 42, 85, 44,186,128, 61,155,210, 64, 22, 96,154, 52,106, 72, 34,218, 20,236,120,236,177,
-199, 30,207,120,230,206, 29,206,123,239,184, 91,240,214,214,100,124,125,115,230, 61,247,156,243,188,102, 25, 68, 89, 57,164,250,
-127,130,251,147,119,243,146,163,206,180,185,202,214,231,111, 22,236, 63, 94,115,116, 33, 69,118,249,192,153, 99,232, 97,164, 11,
- 98,184,145,137, 68, 29, 22,145, 22,163,223,149,116,103, 73, 28, 99,186,  3,  2,109,172, 34,  2,230,212,225,240,137, 26, 58,250,
-242, 81,236, 44,148,237,225, 48, 26,168,108, 64, 57,223, 57,150,251,201,213,143,190,254,254, 27,202,145, 13, 12,151, 50, 89,190,
-200,231,220, 83, 49,141,  6, 76,166, 79,221,225,227, 94,216,149, 94,136, 42,  1,192, 39,161,106, 37,255, 18, 92,126,116,236, 88,
-191,237, 14,158,223, 92,209, 44, 10,197, 66,218,221,225,249, 12, 37, 88, 86,151, 53,145,241, 81,156,151,127,159,149, 60,100, 52,
-147, 40, 50, 36,206,247,237, 41,252,189, 57,134,155, 13, 33, 63,165,225,164, 32,  7,176,225,159,211, 96,101,121, 41,141,249,103,
-215, 62, 31,134, 99,196, 65,189,  0, 69,192, 32,245,100,200,161, 69, 73, 10, 34,149, 54,227,253, 94, 16,244,253, 95,119,182, 81,
-150,128, 47,184,112, 42,206, 83,107,141,245,141, 86,251,143,123, 85,219,186,180,217,188,254,229, 23,204,108,188,241,230,229,135,
- 31, 31,159,  6, 62,221, 66, 52,205,149, 53,176, 65, 97, 20,103,234,232,234,197,190,130,  1,167,129,210, 49, 60,224,138, 56,197,
- 92,107,197,102,174,  3, 63,147, 25,114,117,220, 42, 23,168, 33,147, 34,194,253,160,118,  2,153,146,240, 98,148, 71,251,157,223,
-233,199,171, 56,149, 56,201,159, 93,219, 58,238, 30, 69, 73, 68,129, 44,133,147, 28, 39,193,174,108, 11, 92,138,157,210,228, 33,
-156, 12,117,221, 28, 76,124,250,103, 33, 81, 60,138,  3, 90,126,199,  6,255,108,198,209,  5,136,250,191, 16, 31,188,245,254,237,
-187,183, 87,235,171, 71,189,131, 37, 24,144,178,179,222,185,238,176,243,238,235,239,125,247,211,183, 54,170,187,130,100,145, 14,
-219, 54,207,115,189, 61, 32, 10, 56,105,231,120, 54, 13,163,209, 52,137,159,107, 93,218, 57,152,156,248, 39, 36,232,234,181,122,
-251,209,189, 70,173,209, 11,251,158,189, 16,  3,107, 12, 86, 31, 73,236, 23, 91, 47,220,127,180,103,234,  6, 93,100,193,114, 40,
-238,147,226,166,212,141,196, 65, 14,168, 97,145,114,110, 90, 22,143,147,141, 70,171, 55,246, 73,176,175,215, 55,232,145, 99,154,
- 86,251,176,189,232,158, 73, 41,229, 47, 50, 90,132,115, 75,107,195, 40,240,  3,159,118,132,231, 46, 95, 88,125,122,231,176, 77,
-123,248,237, 87,175,132,201,248,238,238,118, 21,180, 53,240,121,178, 44, 51,165,189,139,231,156, 33,245,119,232, 31,231,209,200,
-171, 46,218,172, 24, 70,180, 36,113,179,190,238,143,251,156, 39,157,160, 35,251,117, 11, 73,109, 42,108,203, 73, 51,202, 78,234,
- 97,148,200, 35,  8, 89, 22,167,109,238,152, 20,115,228, 17,188,146,221, 12,204, 39,198,141, 92,130, 11,159,180, 30,104,250,140,
- 79, 70,131, 32, 21,250,249,  5,207,207, 78, 73,157,206,184, 58,147, 41,241, 46, 66,169,219,210, 60,153,182, 68, 17, 38,169,109,
-  1,127,255,243,254, 15,181, 42,187,245,242, 87,236, 21,118,227,195, 31,255,202,  6,215,182,174,246,211, 97,154,171, 62,159,121,
-207,182, 38,  6,124,244,206,198, 75,159,118,183,217, 29,113,229,242,107,236, 38, 99, 61,246, 76,117,115, 63,125, 24,  9, 73,247,
-147,156, 75, 56,188,175,157,223, 61,108, 83, 82,213, 58,219,220,139, 39, 74,184,107, 10,  3,171,  6,113,241,204,208,234,176,205,
-227,203,181,149,  7,221, 63,155,203,235, 39,131,199,199,157, 35,  6, 75, 60,147, 52, 63, 45, 59,173,255, 47,  7, 59, 10,155, 93,
-182,  0, 50,165,181,153, 99,161,207, 61, 75,102,106,212, 75, 70, 48,213,245,129,175,124,255,239,125,183,  2, 63,122, 64,144,228,
-252,232, 86,243,226,157,  7,125, 90,202, 69,135,182, 74, 44,202,222, 22, 57, 21, 34,175,206,193,130,136,233, 18,166,129,208,221,
- 11,123, 50,173,  4,  0, 18,140, 22,137, 75,171,227,196, 41,171,185, 30, 37, 25,121,150, 43,115,236,121,141, 19, 58, 84,181,167,
-171, 64,183,232,214,102, 89, 58,129,167,246,220,238, 91,113, 98, 52,181,  2, 69,128,186, 35,116,182,144,195,178, 42,178,146, 78,
- 37, 57,114, 58, 70,178,248,175,  0,132, 93,201,110,211, 80, 20,181,147, 56, 99, 83, 59,166, 77,210,132,161,  5, 85,180, 42, 66,
-101,  6,  9,104,133,144,  0,193,  2,137, 37,136, 61, 18, 31,192,150,223, 64, 44,216,178,101, 11,130, 14,  8,150,136,161, 42,106,
- 81, 11,129,130,154,198,129,212,177, 99, 63, 79,220,243,158, 91, 84, 88,144,172, 18, 69,242, 16,191,251,206, 61,247,222,115, 98,
-254, 61,220,201,157, 68, 59,164,  8,254,255,218,210,135,150,165,191,168,250,127, 94,219, 94,188,242,142, 76, 96,187,246, 26, 31,
- 81, 47,232, 61,102, 19,204,193, 76, 26, 64,  3,163,148, 92, 24, 42,161,198,205, 61, 18,163,152,152,199,161,124,174,247, 27,241,
- 62, 21,174,  4, 16,186,129, 27,223,177,120,159,194, 72,216,252,194, 75,104, 62,114, 15, 79,250,134, 34,160, 22, 87, 86, 19, 62,
-186,170,165,248, 46, 65,134, 66,138, 69,236, 68,137, 35,  1,155,196, 32,164, 69,237,236, 29, 24,193,156, 20,220,247,  2,215,246,
- 39,119, 15,168, 16, 98,  6, 10, 38,132,232,241,134, 77,250,227,184,146,105,130, 62, 50, 58, 21,134,160,201,160,129, 22, 49, 46,
-102, 47,182,228,228,150, 68, 47,116, 80,124,153,193, 60, 28, 68,  1,191, 77, 49, 48,152,158, 58,251,124,230,  5, 97, 38,184,215,
-242,132, 20,250,195, 78,224,185,161,  7, 53, 23,176,130,174,235, 53, 86, 86,141, 86,171,103, 89,197,190, 66,158,146,145, 98, 54,
-151, 77,210,154,239, 89,235,125,121, 41,147,199,233,239,175,215,250,251,146,175,230,102,230,230, 95, 59,110,228,123,176, 24,142,
-120,206, 65,215,153, 67, 95, 60, 88,142, 44,  4,109, 48,179,154, 81, 32,235, 72,135,240, 56,217,198,221, 38, 65,197,248, 62, 72,
- 93,151,  1,185, 67, 82, 16, 11,141, 43,209, 11,135, 72, 60,245,161, 18,160, 72,131,166,121,207,105,163, 69,140,206, 53, 40, 96,
- 30, 71, 37,228, 78,113,187, 82,170, 81, 84, 50,186, 77,173,176,203,216,108,166,211,153,138, 54,148, 77,101,221,128, 13,233,149,
-195,195,147, 63,218,223,185,175, 58,182,216,225,193, 17, 10,109,195,213,125, 31, 86,223,127,105,126,246, 96,196,163, 12,151, 71,
-218,102,115,114,255, 17, 10,223,179, 11,179,140, 57, 90, 65, 63, 58,122,242,214,133,155,239, 86,223,209, 46,249,173,245, 53,  8,
-  2,181, 79, 39, 24,149,150, 21,130, 57, 63, 77, 99,177,177,168, 23,117,199,181,  8, 56, 91, 14, 42,174, 87, 79, 94, 54, 58, 29,
-173,168,209,205, 82,243,253,  7,106,163,191, 76,200, 19,210,147, 48, 88, 44,159, 30, 59,245,195, 88,211, 74,131, 73, 69, 89,249,
-182, 20, 32,102,165,234,165,218,245,211, 87, 10,123,170,165, 40,243,101,163, 65,143, 19,236,244, 48,113,234,210,137, 53, 59,173,
- 51,227,167,166, 39,167, 58,129,223,220,248, 94,213,202,131,106,153, 64,232,212,237, 27,198,210,218,250,230, 70,  2,174, 61,142,
-101,155, 31, 27, 75,180,248,134,244, 58, 37,142,163, 67,  7, 44,215, 46, 23,  7, 40,170,182, 58,173,146,170,195, 83, 34,153,236,
-185,189, 74,169,138,102, 56, 69,161,236, 91, 43,150,218,102, 27, 22,199,129, 79,169,219,120,125,188,109, 26,188, 82, 77,121,100,
-  7,234,147,  9,121, 76,201,237,190, 88,131,219, 53, 34,187, 96, 50, 57,142, 17,224, 46, 12,147,113,113, 21,133, 75,194,227,178,
-151,238, 70,227, 25, 37, 87, 85,164, 98,170,181,108,174,109,246,208,142,237,137,198,  2,196,135,128,203,149,242,137, 22,161, 47,
- 46, 67,237, 43, 37,166, 58, 40,135,145, 37, 59,253,166,249,248,201,131,183,207,142, 85, 15,141,237,170,119, 24,119, 20,145,132,
-113, 55,252,  9,184, 82,135, 60,166,238,121,180,252,244,218,190,227,245, 75,  7,239, 63,188,127,183,114,239,229,175,217, 69,246,
-233,206,196, 52,101, 30,166,211,147,185,227,207,198,207,117,112,214,114,136,158, 43,148, 16, 34, 78, 51,133,116,201, 21,173, 74,
-113, 77, 56,  1,117,153,109, 58,166,209,109,211,111, 44,  6,217,  6, 17, 25,250, 11, 42,242, 63,192, 55,137,114,181, 92, 42, 99,
- 49, 59, 20,243, 27, 82,200, 69,252,  9,254,123, 92,219,174, 43,197, 87, 36, 24,100, 17,228,  1,174, 79,140, 66,190,130,227,106,
- 16, 89, 13, 99,173, 63,175, 18, 10, 65, 29, 94, 22,230,179, 80,206,175,234,117,211,234,136,240,119,110,226,252,231,230,138,208,
-192,220,106,110, 12,163,120, 32, 28,  7,112,225, 60,234, 89,172, 23,242, 22,146, 63, 64, 90,138,253,153,163,173,177, 76,122,219,
-158,141,190, 44, 72,150, 74,193,182,183,202, 14, 54,132,239,206, 65, 36,140,186,249, 90, 65, 43, 10,212,225,225, 61,161,252, 22,
-128,172,107,233,105,227, 10,163,243,240, 60, 60, 99,140, 31,137, 49,193, 38, 74, 42,161, 42, 69,149, 18, 54,109,164,168,149,218,
- 69, 23,149,154,110,194, 47,232,162, 93, 85, 73,254, 64,164,254,151,172,179,200, 31,168, 80, 90, 26, 22,125, 36,  4,136,192,194,
- 56,197,140,103,240,216, 51,158,183,125,251,125,223, 29, 83,148,176,  2,  3,134,153,123,231,220,243,189,206,201,241, 61, 19,254,
- 23,153, 97,151,232,187, 42,104,211,121,115, 36,251, 32, 63,243, 30,154,179,203,128,253,193,207, 94,204, 97,173, 45,223,178, 49,
-225, 46,136,239,191,141, 56, 15, 38,102,176,108,  5, 81, 73,178,100,150,167, 80, 16,193,231,137, 32,222,157,137, 44, 30,  2,243,
-  4, 75,216, 44, 23, 25,227,234, 50, 84, 26, 43,208,222, 67,192,101,228,152,142,119,109, 70, 98,234, 98, 74,211,101,168, 14,150,
- 77,195,200,159,205, 39,  7,216,165, 43,231,132, 37, 47, 61, 11,172, 92,172,197,104,  4, 35,233,154,233,248,  3, 69,194, 71,167,
-108,212,135,193,104,183,103, 15,189,212, 20, 10, 21, 85,185, 89, 45, 27,178, 82, 45,168,166, 68,114, 94,196,127, 82, 66,106,120,
-138,100,106,251, 50, 20, 25,101,191,240, 80, 39, 96,229,127, 12,130, 56, 52,252, 20, 84, 89, 84,200,173,163,  8,220,171, 40,  1,
-102,245, 58, 29,199, 57,167,137,  9,248,146, 37,209, 20,194,234, 48,201, 66,248,135,162,116, 18,199,158,159,165,217,244,204,114,
-123,167, 22, 28, 36, 64,255,163, 24, 14,  0, 68,127,145, 21,208,244,134,187,230,  6,209,206,246,139,231,207,159,109,239,108,107,
- 42, 43, 25, 36, 88, 64,223, 35, 93, 55, 70,210, 52,124,142,130, 41,138,204, 37,248,177, 13, 21,182,  1, 78,160, 97,155, 16,132,
- 38,  8,247, 92,113,126,134, 50, 75, 69, 21,189, 68,203, 26,106,100, 26,154, 84, 82,209,213,  4, 54, 85,232,163,108,220,106,253,
-  6, 80,239, 90,169, 41, 98,107, 93, 54, 10, 92,108,110,161, 37,138,210,  8, 66,233,113,128,122,235,147,208,103,100,118,227,134,
- 35, 67,209,173,161,101,251,206,181,202,242,  8, 13,136,101,136,204,206, 39, 67, 47,112,179, 41, 59, 30,116,238,223,253, 14,  7,
-208,103,204,241,172,143,154, 31,119,250,157,191,187,127, 37,179,184,128,162,152,234, 97,255,237,239,251,219, 73, 18, 55,171, 77,
-165,160,160,161,146,177,112,116,122,  8, 20,161, 93,191,254,227,253,159,182,254,249, 21,229, 71, 68, 73, 47, 20, 57, 39,220, 61,
-126,  3,159, 12,253,  1, 92,120,156,134,  3,183, 95, 47,227,220, 41,192,  0,240,241,206,233, 81, 24,  5,186,172,106,240, 43,178,
- 14, 44,161,125,101,  5,222,124,235,213,214,105,247, 24,216,189, 53,178,214, 90,107,155,247,190, 63,248,247,109, 99,177, 17, 37,
- 97,101,161,246,199,193,142,237, 88,214,160,183, 82,111,117,237,222,167,119, 62,239,159,189,211,237,108,239,221, 94, 66,204, 24,
-150,236,250,210, 42,128,227, 56,242,191, 90,255,226,117,119, 23,238,177,235,187,186,102,216, 99,187,177,120, 53,202,146, 40,141,
-151, 22,151, 32,228,183,198,103,240,250,230,183, 63,172,148,106, 47, 15,118,106, 11,245,199, 15, 30,253,246,234,  5,128, 58,185,
-205, 69, 11,232, 36,229,163,105, 11,  4, 92,146,240,153, 97, 86,190,105,230,153, 87,192,119,105, 94,174, 99,100,205, 65, 52, 73,
-164, 81,181,148,164,147,208,115, 62, 84,154,250,185,199,142,118,221, 19,123, 18,163, 76, 32, 25,111, 50, 74, 53,  8,185,164,176,
- 64,237,231,136,236, 36,133, 45,163,235, 36, 58,222,201, 10,138,114,235,153,146,110,180, 43,183,107,141, 44,213,134,113,114,165,
-114, 53,142, 35,116, 42, 39, 51,111,172,100,  9, 98, 85, 55,158,238,191,108,148,155, 95, 62,252,250,201, 47, 79, 54,107, 63,159,
- 76,247,183,130, 63, 31, 92,219,232,163,151,  3,117,115, 75,121, 18, 22,207, 34,210,122,169,150,170,139,102,197, 15,124,192, 41,
-224, 10,176,119,111, 46,223, 56,115, 29, 78, 90,205, 98, 73,215, 52, 63,158,112, 58,134,182,227,  9,214, 90, 97,197,225, 26,198,
-161,231,197,147, 86,189,101, 20,205, 32,  9,111,181, 62,193,137,185, 17,218,131,164, 44,195,249, 71,137, 59,155,210,230, 23,115,
-187,123,184, 43, 93,187,139, 58, 43,116,171, 40,135,131,221,122, 49,245,219, 80, 22,152, 11, 46, 78,201,211, 21, 94, 68, 99, 16,
-199, 27,134, 73, 72, 39, 25, 14,  8,182,235,109,110,104, 51,227,165, 69,146,114, 35,151, 91,129,123, 52,241, 15,137, 55, 21,210,
-202,148,180,146, 89, 52,225, 80,207, 93,175,243, 49,124,222, 83, 78,205, 63,146,116,129,197,162,144, 87,156,197,139,210, 37, 62,
-211,128, 33,234,250,234,186,227, 57,255,  9,192,214,149,244, 54, 13,  6, 81,219,177, 63,175,177,147, 38, 93, 40,208, 37,  8, 65,
- 11, 20, 84,202,165,136, 11, 66, 85,225,192, 25,113,225,128,132,132, 56,240, 27,250,  7,248, 41, 72,220,185, 85, 85,145, 56,128,
- 64,136,110,162,123,146,182,113,221, 44,118, 18,215,142,153, 25,219, 21, 21, 85, 43,245,146, 58,222,190, 55, 51,223,188, 55, 47,
-193,247, 48, 37, 65,158, 65, 28,169,105,185, 11,193,253, 66,136,135, 51, 27,210,  6,220, 83, 28,177, 38,  9, 50, 77, 37,251,135,
- 37,147,162, 57, 28, 14,240,113,192, 24,242,252, 86,124,217,255,101,250,105,164, 75,168,153,220,249,238,108,207,148, 45,159,114,
-109, 52,103, 73, 43, 42,244,233, 22, 25,118,138,226,123,164, 24,  5,  3, 13, 37, 70,250, 75,142,103, 39,140, 43, 20,108,226,204,
- 27,200, 28,209, 75,179,211, 64,162, 44,128, 23,209,252,179,170,233, 39, 13,116,254, 92, 11,129, 79,100,173, 52,100, 85, 32,193,
- 49,206,198,241,195, 46, 14,107,141,248,137,225,153,178,115, 84,110,184, 91, 71,206,239, 74,115,223,110,  4,  0, 19, 93, 56,199,
-208,100,170, 37, 10,151,116,101, 56,171,228, 69,169,136,174,139,  2,173, 42,142, 33,109,  3,190,191,151,193, 45, 23, 28,123,  0,
- 39,174, 50,136, 31,156,138,187,175, 17,110,124,  3,196, 75,194, 73,253, 56,150,177,201,  0,250, 74,148,213,112, 76,183, 46, 73,
- 89, 69,210,228,140,169,200, 56, 81, 82,103,150,206,250, 76,156, 45,163, 67, 97, 15,255, 27,139,110,105,122, 18, 73, 94, 57,116,
-209,149,201,168, 16,126,120, 17, 89,207,  1,117,216,  2, 84,131,136, 52,158,  3,160, 89, 81,120, 93,147, 24,185, 80, 97,173,135,
- 74, 75, 78, 86,  4, 93,133, 95,236,170,105,170, 96, 89, 66,222,144, 52, 61, 99,232,162,174, 98,152,232,161,118,191,231,119,184,
-118,187, 23,249, 92,208, 60,141,181,114, 94, 27,197,135,110,167,105,106, 57, 67,205,118,124, 87, 72, 88, 15,128, 14,106,213, 41,
-247,155,  3,  7,199,229,216, 54, 51,118, 13,131, 63,147, 35, 83, 76,144,118,237, 77,133, 41, 40,107,136,162,183, 79,223, 45,175,
- 44,121,167,174,198,180,141,189,117, 72,130,  0, 88, 35, 36,123, 84,225,152,128,119,163,197,146,221,172,121, 62,206,252,131,207,
-  0,128,  2, 74, 14, 23, 46,223, 29,191, 13, 75,189,225, 54,187, 65,183,234, 84, 62, 45,125,156,155,158,223, 58,220,154,189, 49,
-187, 93, 67, 79,  6, 83,193, 91,136,202, 38,114, 79,133, 24,163, 48,180, 10,184, 54, 56,254,230,233,235,149,157,213,233,235, 51,
-168,201, 96, 50, 20,226,240, 21,144, 41,247,155,  5,183, 83,135,115,131,195, 86,235, 21,120,217,246,237,242,222,225, 46,164,237,
-213,147,  3, 72,244,160,188,187, 95,186,  7,151,147, 51,172, 19,180,115,106,172,173,253,124,246, 96,110,121,245, 43,  4,232,137,
-145, 91, 99,197, 49,200, 58,247,236,138,135,218,153,128,137,162,227,214,115,122,126,180,120,165,152, 43,148,237, 50,156,179, 79,
- 76,176,150,219,108,  7, 29, 40,209, 96,197, 46,126,251, 12,161,  8,110, 95,171,211,250,254,231,  7, 10, 30,225,181, 12,130,201,
-145,155,187,181, 29,120,141,135,242, 87,187, 65, 29, 39,127, 24,  3,214,227, 34, 39,161, 48, 53,182, 92, 74, 55, 80,  9,226,169,
- 92,207, 16,134, 97, 50, 11,  1,155, 63, 93,117,182,126, 57,219, 27,142, 83,111,  7,  1, 70,  1,106,225,162,104,143,192,153, 56,
-233,240,242, 48, 68,118, 81, 99,146,193, 68, 67,150,117,198,208, 10,  0,138, 67,242, 39,160, 96, 18,182,184,154,192, 59, 83,197,
- 41,171,111,252,192,222, 70, 30, 44,174,180,120,112, 58, 63,168, 90, 75,219,107, 30,207,191,124,255, 98, 97,225,195, 67,253,121,
-157,223, 92,116,191,188, 42, 61,106,135, 45, 62, 29, 89, 76, 25,107, 47,103,228, 36,156, 21,138,114, 83,184,234,128, 10, 91,120,
-148,134, 98, 66,241, 80,107,213, 34,116, 85, 13,243,217, 62,120, 22, 62, 18,181, 41, 19,167,156, 16,214,235,177,123, 12,145, 47,
- 68, 10, 91,128, 29, 26,220,235,240,202, 39,251,181,102, 13,175, 13,189, 37,178, 94,183,157,216, 29,113,177,134,171, 71, 91, 36,
- 66,226, 88, 40,196,174, 40,200,218, 58,106, 30,242, 81, 38,222, 56, 72,186,213,116,103,195,152,212, 72,148,113,226,239, 97,251,
-138,156,176, 57,175,221, 34,  3,203,116,255, 57,158, 58,150, 12, 65,193,111, 41,104,125,216,218,229,207, 30, 15, 36,218, 33, 36,
-  0,  1, 45,132, 94, 58,154, 82, 99,  6,148, 64, 79,238,204,175, 87,214,104, 30,112,218,120,229, 18,123,166, 51,116, 71, 78, 36,
-178,242,253,125,123, 15,162,194, 95,  1,232,186,150,158, 38,162, 40, 60,247,222, 97,166,143, 97,250, 16, 16,144, 90,197, 16,208,
- 64, 66, 64,220,232,198,141,107,247,174, 92,153,248, 23,220,186,208,157,191,194,196,157,137, 27, 55, 26,216,104, 66, 92,160, 18,
-162, 64,128, 86, 69,104, 43,175,  9,125,204,148,185,158,239,220, 22, 95, 49, 97,217,208,219,121,220,123,206,249, 94,192, 87, 33,
-248,180, 76, 95,243,171,252, 63,249,115,239, 62,221,239,244,127,134, 51,250,159,177,140,248, 27,140, 61, 61,147,255, 48, 57,248,
-189,  9,144,191,225,174,242, 63,179,160,238, 34,165,236,  2,  6,178, 11,  0, 72,115,217, 48,  8,199, 15,118,109,218, 18, 17,146,
-171,184,108,215,124, 25, 88,187, 12,185,141,161,239, 97,118,169, 28, 47,153,173, 81,137,  4,182,126,147,  1,180, 95,122, 43,101,
- 78, 75, 41,115,112,173,  3, 90, 66, 47, 82, 91, 68,105, 59,145,114,211,105, 55, 77, 15, 37,109,216,142,114,135, 50,133,111,193,
-  6, 61,199,218,128, 28, 28,153, 64,207, 53, 85, 72,147,131, 87, 43,193,186,109, 71,249, 84, 10, 27,186,208,169,164,114,225, 57,
-140,178, 40,160,211,  0, 78,246,192,101, 34,234,224,  0,103,177, 83,  6,187,116, 59,204, 54, 87, 74,133,237,152,253, 75, 37,214,
-224,  0,235, 84, 72,151,101,160,133,107,158,216,106,155,213, 82,125,173,184,155,238, 56, 19, 73,173,108,201, 30,116,130,117,184,
-104, 99, 16, 13,200,243, 25,227,172, 13, 43,107,205,140, 95,205,201,215, 14,140,116,192,141,  4, 68,204, 68, 73, 54, 91,118, 57,
-143,153,185,186,241,113,221,170,115,230, 57, 27, 64,139,136,195,143, 29, 97, 57, 90,  7,123,170, 25, 91,251,152, 63,210, 57,228,
- 83,121, 30, 35,219,190,  1, 65, 50, 22,209,211, 62,105,  9,182, 10, 72, 56,238, 96,118,248,107,173, 84,232, 43, 86,131,154,197,
-100,204,132,219, 27,134,245,172,151,163, 51, 96, 63,168,156,241,251,169,  9,136, 57,140,184,  7,140,102, 53,146, 59,151,114, 83,
-229,106,169,109,233,115,185,225,245,237, 85, 90,195,232,208,120, 24, 53,168,  4,166, 15,123,137,116,189, 85, 47, 12, 92,220,218,
-133,172,127,170, 56, 21, 52,130,126,191,239,250,229,185,167,243,207,252,148,255,165, 90,166, 42,137, 94,104,186, 22,103,179,  3,
-212, 39, 69, 58, 62, 60,218, 67, 57,118, 18,209, 77,188,123,251,222,252,219,151, 74, 11,140,221,165,172, 28,236,230,146,153, 76,
-218,223,253,241,157,238,198,236,165,105,218,206, 60, 55,181,184,246,110,180,191,184,189,183,227, 39, 61,186,216,183,102,110,190,
- 89, 89,220,216,217,240,210,112, 22,227,216,101, 70,202, 80, 22,168,190, 76,159, 99,187,165,234,  6,221,181,185,177,233,149,210,
-106,216,166, 39,167, 39,231,101,242,153,129,229,210,135,153,209,217,247,165,143, 55,174, 92,123,181,180,192,121,114, 54, 85,215,
- 73,142,228,166,155,113,225,108,113,115,119,107, 98,100, 98,109,251,179, 45, 93, 86, 26, 65, 12,236, 33, 49, 46,118, 16,174, 39,
-243,126,246,160, 85,187,147,191,112,254,225,152,229,  9,248,207, 28, 55,172,136, 33,214, 70,  4, 39,185, 70,136,191,227,208,170,
- 71,113, 51,132,162,164,133, 32,154,231, 75,229, 74,  0,176,200,184, 12, 73, 46, 47,149,  0,225,146,179, 96, 56, 60, 23,246,130,
- 32, 26,  8,142, 14,  6,115,204, 68, 71,219,194, 24,129,  1, 13,130, 18,138, 90,199, 86, 94, 14,215,131,243,251,113, 59,193,105,
-196,112,219,131, 67,159, 24,239, 45, 60, 90,124,177, 89,139,151,154, 11,131, 98,236,254,200,195,186,251,233,241,246,147,215,183,
- 30,212, 26, 85,163, 99, 55,185, 53, 33, 67,249,204,206,196,219,224, 37,122,171, 65,213, 48,225,169,165, 99, 29, 33,102, 31,144,
- 10,129,243,118, 98, 90, 13, 38,163,232,216, 48, 14, 45,118,136,229,241, 55, 91, 55,114, 47,194,196,106,102, 88,199,186,131,141,
-117,  4, 83,173,168, 53, 89,156, 92, 46,175, 80,127, 96,144, 80,124,  7,254,137,149,113,253, 35, 36,105,168, 22, 52,146,172, 13,
-138,145,138,102,190,202,140, 83,248,132, 48, 99, 20,102,181,136,174, 97,173,109,113,186,104, 39, 71,197,184, 16,119, 74, 71, 45,
- 79, 67,248, 76,198, 22,143,244,  5,255, 52,214,232,243,190,230,  8,247,176,121, 64,101, 25, 32, 13,197,240, 30,215,182,116, 62,
- 29, 53, 64, 30, 75, 67,214,103,  1, 64, 50,195, 38,169,169,252, 11,163,230, 79,  1,216,186,150,157,166,162, 40,218,123, 79,239,
-243,180,189,  5,164,136,162,  1,140, 70,226, 35, 26,140, 26,  7,134,200,192, 31,112, 96,140, 81,  7, 78,253,  0,227, 68,127, 67,
- 63,  8, 13, 17, 38,198,  0, 21,131,202, 35,165, 64, 95,247,253,116,239,125, 14, 84, 19,146, 14, 58,104,111,155,123,207, 89,103,
-237,215, 90,146,191, 39,146, 41,159,  2,238,134,106, 96,105,177, 24,126,192,196,181,133,119,229,234,217, 57, 56, 66,149, 33, 88,
-255,247, 58,181, 36,171, 74,134, 14,172,217,204,255,175,221, 42,195, 19,162, 40,147,100,110,113, 90,153, 86,156, 83,101, 85,230,
-174, 79, 20,234,149,147,120, 70,100,190,168,130, 14,108,  2,194,186,  8,130,181, 92,198, 67, 98, 92, 87, 92, 25,150, 40,144, 47,
- 63,242,178, 60,134, 19, 18,  8,102, 16,249, 98, 62, 14,104,160, 16,203, 71, 69,  4,140,119, 52,199, 26, 65, 99, 63,165,244,246,
-201,187,230,206, 38, 73, 35,164,186,  6, 55, 71, 11,224, 10,192, 85,227,192,100, 53,224, 89, 98, 54, 75, 65,147, 83,184,136,  6,
- 60,185,227, 29, 28,185,221, 94, 16,236,118,221, 67, 47,109,187,236,119,103,240,171,235,109,180,188,221,158,246,167,219,119, 35,
- 64,198, 10,203,185,215, 15,181,172, 52,194,180,134,165,  3,188, 85,138, 18,  7,174, 29,167, 26,101,  1, 45,134,118,134,104, 84,
-174,146,173, 67,138,105, 81,192,187,106, 69,  1,226,143, 54,129,212, 44,134,242, 38,122, 78,201,244, 66,163,153, 16, 83,101,176,
- 69, 18,216,201, 17, 58, 18, 98,155, 56, 57,246,145, 11, 47, 22, 87,147,172,132,231, 18,170,249,203,222,170, 56, 37,157,153, 18,
-139, 16,202, 83,223, 47, 69, 94, 30, 70,121, 16,230, 97,136, 46,131, 88,196,198, 60, 24, 54,140,  2,178,192, 15,217,170, 50,201,
-141, 65, 55,235,  6,106, 63, 56,194,158,156, 20,157, 43, 80, 64,148,122,106, 85, 86, 46,104,152,  0,162,155,138, 85,195,145,141,
- 52,  9,147,216,177, 71, 15,  7,109,161,149,103,106, 28, 78, 97,199,174,145,118,  5,240,113,195,210,172,170,229, 88,166,141, 79,
- 42, 77,159, 45, 60,229, 58,255,178,177,124,127,238,  1, 96, 34, 28, 89,110,216, 55, 13, 27,246, 63,112, 49,122,154,217,243, 23,
- 47,191,174, 44,163, 75,  3,134, 75, 41,160,179,161,235,223,183,191, 45,173,125, 38,113,240, 16,246, 38,144, 78,136,225,252,208,
-197,226,103,255, 64, 43, 27,131,160,  7,207,113,166, 49, 29,198,225,214,206,143,137,234,248, 86,107, 11,162, 64, 13, 91, 84, 20,
-  8,255,227, 56,  0, 52, 49,116,  0, 44,  6,212, 30,147, 75, 10,155,158,184,  8, 31,  3, 22,230,  6,110, 19,190, 53, 50,177,223,
-111,199,121, 74,129,118,  5,246,  9, 64, 70,171,187,111, 24, 16,190,153,119,175,220, 89,223, 94,135,213,117,126,108,170,110, 59,
-135, 88, 79, 46,194, 36,  0,110,184,120,125, 97,115,175, 25, 70, 65,171,179,255,248,246, 34, 64, 57,122,149,152,252,230,244, 13,
-248,255,176,216,184,201, 97, 51,  3, 80,194,249,132, 74, 56,121, 10,119,105,166, 49,147, 36, 49,154, 38,178,178,195, 71,235,124,
- 60, 76,221,249, 51,243,252, 94, 86,114, 24,197,110,249,241,158, 44,228, 27, 17,211, 17,184, 41,164,100, 99,233,108,109,167,215,
- 11, 18, 89,125, 68, 94,129,235, 10,  3, 61,134,115, 27, 56, 54, 65, 14, 89,186,138,247,162,140, 10,193,104, 63,160, 51,114, 14,
-192, 30,174, 82, 89,145, 78, 74,148,226, 83, 19,165, 55,105, 55,120,245,178, 27,116, 24,105,172, 11, 35, 67,174, 27,205,206,222,
-207,182,247,230,253,235,143, 31, 62, 77,153,215, 10,173,191,228,175,188,186,244, 48,201, 61, 49,226, 34, 89,156,212,177, 34,145,
- 19, 20,138, 73,102,207,205,246,252,  1,205,150, 23,244,223, 17,135,184, 89,197,220, 58,193, 69, 42,114, 25,  2,116, 73,166, 80,
-  0, 56,185, 65,  8, 74,141,124,176,144, 25, 89,156, 98,167, 94,154, 66,136,144,215,237,250,163, 91, 11,171,155,171,138, 42,155,
-101,143,105,107,225, 69, 62,121, 13,145, 70,173,136,140,137,193,115,189, 18,147, 36,175,204,224,203, 42, 71,241, 47, 22,138,172,
-128,236,245, 64,155,160, 26, 94, 36,207,167,198, 46,120,241, 64, 80, 95,135, 59, 38, 51, 13,  3,187,  1, 17,184,237, 42, 22,  5,
-233,183, 50,108, 97,138,105,168, 74,149,103,132, 50, 12,198,196,140, 43,185,  6,162, 66, 34, 32, 21, 90,120,167,  9, 90,215,102,
-201, 95,  1,248,186,150,213, 38,162, 48, 60,247,204, 37,153,180,147, 72, 59,109,189,208, 88, 11,138,224,198,133,160,130,130, 11,
- 31, 65,151,174,117,229, 78,112,227, 83,184,240, 21, 92,248,  8,162,104, 81, 80, 20,169, 86,109,189,165,182,166, 77,167,185, 76,
-230,146,153, 51,254,223, 57, 73, 13,130,118,213, 66, 18,210,228,156,239,252,231,255,191,203, 65,255,157,201, 19,125,231,201,202,
- 61,195, 14, 97,147,245,120,198, 37,202,244, 67,224,254,159,142,205, 63,170,239,131,122,255, 96, 38, 60,217,184,151, 71, 67,  2,
- 60,138, 77,246,195,229,191, 26, 56, 66, 41, 54,158, 59, 23, 19,183,129,145, 80,149, 43, 32,192,  0,132,235, 50, 70,150,182, 81,
- 65, 40,183,196,120,120, 22,166, 61,150,102, 14,134, 49,125,172, 73, 30,211,195,  0,223,252, 93,129,250,194,114,186,167, 35,206,
-  9,236, 36, 44,  3,  2, 14, 25,168,154, 61, 89,125,220,139,193,250,162,149, 79, 79, 49, 53, 83,146, 52,  7,103, 67, 95, 83, 75,
-237,254, 14,173,255, 20,145,152, 80,193,193,252, 72,117,145,215,147, 70,183,174,223,121,249,246,185,141,111, 55,201,216,128, 49,
-157, 22,200,145,250,137,173,206,102,111, 56,252,213, 31,108,133,221, 66, 63,212, 28,236,181,210,172, 25,198, 63,187,  9,196,233,
-  4,121,146, 82,146,101,215, 80,235,166, 94,183, 74,117,179, 52, 69,191,219,165, 74, 73,153,114, 84,203, 40, 12,218,196,130, 28,
-193,253,  6, 50, 80,216,152,136,113, 40,113, 31, 52, 78, 49, 42,168,234,183, 45,197,113,232, 90, 42, 91,150, 98,232,146,165,171,
- 54,154, 66,136,244,171,152,138, 37, 20,165, 84, 96,243, 44,113, 80,129,248, 49, 25,209,193, 16,179, 36,205,251,  4, 99, 97,158,
-166,176,174,148,184,205,189,165, 41, 86, 73,166,178,189,108, 72, 71, 29,107,189,185,255, 37,232,197, 89,136,203,  8,207, 38, 84,
- 97, 27,128,238,161, 12,238, 16, 29,126,153,239,205,215,221,218, 78,176,205, 10,161, 70, 41, 16, 71,160, 80, 49, 50,165,242, 45,
- 48, 28, 70,170,106, 92,187,124,109,101,245,169,176, 33, 11,122, 59,220, 21, 86,166,143,116,101,109,133,243, 57,243,173, 96, 51,
- 73, 98, 42,183, 79, 29, 59,189,219,105,193,100, 56,220,  3,134,228, 57,129,187,107, 87,227,116,112,172,209,184,112,246,210,250,
-215, 79,180, 96, 42,102,149, 54,120,173,236, 65,100,148,192,185,  8,101, 47, 29, 30,244,200, 44,158,247,252,253,238, 46, 33, 17,
-225,  5,189, 14,221, 57, 90,221, 22,253,239, 75,115,141,153,105,127,121,126,233,219,246, 23, 93, 85, 47,158,188,112,216,155,249,
-240, 99,205,208, 84,191,234,151, 45,155, 78,110, 91,183,206,159,187,186,241,109, 53,197, 24, 92, 63, 90, 63,178,219,105,195,226,
- 49,234, 17,142,127,220, 90,243,167,231,250, 81,247,202,153, 75, 15,159, 61,162,  3,137, 10,255,160,191,135, 60,153, 40,164,226,
-189, 86,169,237,238,183, 61,215,251,177,211,164, 55, 25, 13,195,101,200,106, 54,  5, 40,181,123,129, 72, 64,147, 49,242,113,105,
-159,119,224,132,126,188,106, 87,185,175,242,190,166,169,174, 89,161,186, 50,207,163,120, 24, 88,186,195,122,219,139,151,103,165,
-186,129,109, 36,  8, 44, 92,231, 62, 82,223, 40,  2, 64,177, 98,180, 34, 39, 92, 46, 59,246,251,239,193, 94,156, 42,130,104,204,
-103,161, 58,214, 12,106, 28, 56, 67,195,  7, 74, 85,228,226, 32,  3, 72,225,105, 18,101, 77,243, 44,243,240,244, 20,183, 82, 47,
-116, 30, 80, 44,122,194,244, 69,184, 48,204,156, 15,144, 33,174, 21,104,182, 84,233,169,141,217,133,215,205,141, 55,237,205,219,
-119,111,222,191,247, 96,193, 60, 41,235,221, 23,233,187, 27,139,231,233,134, 55,110, 95, 40,226,150,207, 68,117, 44,177, 25,111,
-182, 19, 98,120,147,194, 14, 77,168,206,160,104,241, 61,159, 22,  6, 79,239,227, 96, 15, 35, 44,206, 31,102, 60,150,152,241, 81,
-155, 84,140,212,231,227,142, 55, 23,142, 22,130,235,177,188,176,220,131,174, 21,182,225, 97, 26,190,250,252,  6, 74, 28,196, 54,
-229,185,224,170,112,236,161,162,111,113,166,241, 51,104, 74,220,163,176, 24, 67,165,101, 56, 81,  6,238,188,235, 84, 19,110,252,
- 59,166,209,255,233, 77,112,215,241,113,  3,133,176,219,172,208,141,132, 94,173,213,161,141, 14, 27, 12,198,219, 96, 97, 18, 70,
- 80, 75, 65,152, 66,112,  1,146,187,196,201,222,133,236, 85,106, 81, 26,249,222, 92,151,118,193,159,  9,171, 44,236,126, 21,105,
-100,153,131,238, 59, 21,173, 40,243, 49, 18,160,191,127, 11, 64,216,181,244, 52, 17, 69,225,123,231,213, 78, 95, 67,167,229, 41,
- 40, 96,108, 98, 76, 52, 81,  2, 97,225,194,184, 52,110, 12, 46,140, 27,253,  1,238,220,155,248, 35,140,191,200, 24, 23, 18, 34,
-132,  4, 36, 66,132,  2,182,165,180, 50,239, 41,245, 59,231,182,162,209,232,174, 77, 38, 51,153,185,231,241,125,231,158,251,157,
-139,250,187,246,199,249,163,254,223,240,248,127,113,250,191,203,244,234,182,166,180,168,206,192, 60, 65,210,104, 43,224,  2,110,
-148, 30, 38, 38, 30,226,203,250,177,186,141, 47, 56,104,110,185,184,195,111,187,185,220, 11, 54,216,129,254,117,188, 20,155,  8,
-105, 24,224,253,  0,109, 60,154,200,172,196, 51,240,248, 76, 66,167,241,177,132,100, 46,249, 76,129, 84, 41,184, 30,162,150,130,
- 13, 37,130,233,144,196,152,198,163, 93,233,118, 36,179, 78,202, 60,131,126,123,  3,225,251,225,226,163,181,189, 85, 18, 33, 34,
-153,142,120,178, 60,221,236, 28,243, 30, 61,  8,102,148, 82, 10, 78,253,196, 79,146,228,253,250, 59, 56, 97,  2, 32,  2,251, 19,
- 44, 59,209,139,143,187,251,150, 94,140,123,161, 99, 87, 76,195, 58,241,143,168,198,135,128,174,185,254,185,151, 10,189, 19,247,
-190,197,113,195, 55,142, 67, 26,229,213,134, 11,203, 62,216, 99, 78, 51, 93, 51, 51, 90,200, 59,166, 89, 50,178,217,190, 81,144,
- 32,234, 38,126,216,186, 73, 70,153,202,148,166,247,200, 40,232, 81,199, 75, 66,111, 59, 16,163,227, 70,107, 66, 94, 86,159,181,
-221, 69, 33,139,208,143,160, 47, 73, 64,216, 32,163, 34, 85, 46, 22,106,202,153, 70,206,  2, 70, 35,141,154, 10,176, 71,222,116,
-138,134,155,183, 74,182, 81,176,145, 33,100, 86,147, 96, 27,142, 52, 63,237,181,118,219, 30, 11, 12,113, 15, 27,187,208,148, 59,
-227,100,203,176,221,197,218,242,206,241, 54, 62, 45, 28, 21, 17, 42,151,161, 73,123, 83,229,153,162, 77, 20, 10,107,  1,152, 60,
- 57, 50, 13,192,110, 25,182, 31,123,173,110, 11,142, 71,161, 95,104, 83,213, 75,  9,  9,241,171, 18,129, 94,201, 87,252,216,183,
-179,118,109,250,122,215,239, 32,140, 34,127,172,220,123, 92,181,171,251,173,125,138, 74,  6, 76, 60, 90,170, 45,175,109,174,110,
-110,111,  8,154, 67, 96,193,123, 29, 58,112, 24,146,146, 19,119, 18,227,134,160,180,112, 75, 93, 13,129, 35,158, 74,237, 49, 88,
-199, 92, 38,255,236,254, 83,207, 63,107,122,237,175,141,189,207,245,173,170, 51, 54, 51,126, 69,246,210,179,192,135, 45,141, 59,
- 99,  7,237,195,152, 69, 53,225,177,219, 59,235,120,202,157,107,183,247,155,  7, 65, 20,129, 29,193, 30,138,118,105,194, 29, 59,
-104, 29,157, 69,223,253, 48,108,158,157,176, 94, 96, 52, 63, 57,219,234,144,198,172, 31, 69, 32,170,174, 59,177,242,224,201,238,
-151,109,188,212,168, 83,165, 66,  1,225, 47, 27,215,243,  8, 26,129, 28, 54, 63, 62, 71,  5,232, 94, 58, 85,153,196,211,235,167,
-117,228, 54, 36,146, 83,191, 13,124,135,  7,  5, 44,149,  3, 19, 54, 45, 83, 15,253, 27,119, 47,139, 57,155,157,173, 47, 84,227,
-149,236, 15,230,247, 12,  0,160,  2,202, 18,224, 92, 88,230,135,245,195, 48, 61, 87,212, 77,137,192,240, 97, 55,146,140, 86, 85,
-133, 30,103,107,174, 78, 83,125,218,194, 39,149, 70, 33, 99,205, 84, 70,140,172,113, 18,146,214, 83,134,107, 48, 63, 69,163, 82,
- 17,232,158,221, 78,224,239, 26, 40,203,114,109, 97,175,113, 16,  4,254,206,105, 99,163,217,120,249,234,197,155,215,111,175, 22,
- 22,132,209,253,152,108, 61,159, 93,138,250, 30,247, 55,255, 12,161,130,155,250, 75,220,179, 46,  3, 82,140,225,115, 37,180,115,
- 68,242, 57, 97,156,130, 66, 69,  9, 89,183,194,236, 10,143,223,156,189, 85,111,215,129, 85,202,165, 81,164, 85,158,238,163, 36,
-201,197,224,168, 40,137, 80,141, 80, 48, 21,231,141, 78,147, 14,223,168,173, 73,169,151,139,101, 22,181,181,227, 56,  1,101, 39,
- 72,199,227, 53,224,206,141,110, 75, 92,244,175, 43, 41, 71, 96, 17, 18, 63,136, 82,240, 39, 43, 78, 67,197,146, 88,254,224,162,
-161,133,255,171,137, 10,244,233,129,208,177,172, 39, 94,203,205,187, 81, 28, 43,186,  1,196, 45,135,114, 79,170, 79,105,216, 91,
- 71,244,194,208, 76, 47, 14, 34,154,249,144, 14,234, 19,218,144,143,105, 98,120, 48, 72, 93,222,163,156,161,162,162, 20, 63,  4,
- 96,236,218,122,162,134,130,112,123,122, 78,111,219,101, 23,150,203,162, 18,162,129,152,152, 16,223,140, 60, 24, 30,124, 50,254,
-  5,253,111,196,  7,227, 31,192,240,164,137,  9,241,  1, 68,137,107, 36,220,228,190,184, 23,216,238,173,237,182,123,234,204,180,
-236,106,  2,137,240, 68,114, 18,218,133, 51,243,205,204, 55,223,199,  7, 56,253,166,205,210, 91,127, 84,149,255,253,138,111, 58,
-223, 35,175,150, 97,115, 31,227, 93, 52, 56,163,171,  8,108,225,  6,194, 83,  6,125, 47,192,172,254, 79,167, 94,189,149,126,121,
-157,150,136, 77, 19,167,155,183,177,197,109, 20,213,145, 73, 46,102, 16,178,187, 81,  7,  5, 37, 52,  1,225,183,199,250, 72,230,
- 75, 68, 42, 83,199,131,164,193, 66, 19,255, 24,251,248,232, 34,162,200,156, 51,218,104, 55, 98,106,158, 49, 84,240,244,225,175,
-254,246,211, 27, 56,  9, 53, 17, 57,214,250,  7,149,125, 20,192, 81,217,136,149,175,119,107, 40,190, 22,226,180, 68, 69,161, 21,
-169, 49, 40,241,116, 15,157,112, 73,155,142,218,228,174,143, 75, 88,101,247,156, 28, 92,113,225, 19,210,111, 55, 66,125, 34,  0,
-109,156, 22,142, 66,165,211,239,107,165,166,123,116,217,242, 37,246,224, 56,150,201,202,136,101,230, 76, 49,155,205, 78,103, 51,
-182,109, 27, 76,155, 48,140,122,208,131,187,101,197,220,128,135, 87, 80,232, 18, 66,118, 43,162,220,226, 73,168,255, 66, 17, 26,
- 38,215,  5, 62,  0, 71,147, 18, 20,237,176,109,178, 47,135,215,136, 88, 15,192, 67,136,220, 47, 63, 68,  6,  3,128,  1,168,202,
- 61,244,  6,163,143, 38,130,192,132,112, 18,158, 48,111,235, 83,142, 81,107,120,235,  7, 87, 80,223, 67,121, 48, 61, 54,179,125,
- 94, 34,132,132, 89,238,176,122,128,251, 71,161,247,227,248,251,157,177,123,245,102, 53, 70, 57, 86,120,120,221,151,126,189, 83,
- 53,152, 97,162,245,182,177, 48,243,104,251,228, 39,192,103,210,228,227, 87,205, 58, 45,175,121, 89, 43,  7,255,228, 16,253,209,
- 76,145, 46,231,126,101, 15, 45, 85, 59,205,202,213,111, 67, 88,168,193,107, 90,203,171,203, 15,138,115, 77,175,  9, 32, 23, 53,
-177,226,112,235,104, 75, 55, 76,146, 24,212,225,216,104,166, 32,  4,191,186,104,248, 97,240,250,249,171,195,243, 67,244,  9, 97,
-234,198,238,  6,220,234, 54, 90, 36,115, 71,100,187,136,  3,160,224,  8, 87, 54, 86, 91,109, 23, 18,207, 92,241,190,161,242, 66,
- 97,106,105, 97,233,107,105,237,164,126, 22,248,190,103,  6,  0, 96,159, 62,124, 18,244,123, 27, 59,155,142,229,232, 81,124, 92,
- 57, 53, 13, 59,177, 31,122,185,248, 98,229,243,251,189,139,195, 98,190,  8,183, 15, 18,188, 11,245, 25, 83,230,139,243,139,143,
-151,206, 62,188,131, 95, 87,112, 70,243,179, 83,141,179,203, 94,167,229,152, 25, 72, 63,229,122, 25, 34, 81,185, 86,206, 59, 89,
-157,241, 92, 38,235,133,189, 46, 57,132, 65,110, 40,228, 10,141, 22,  6,116,174, 48, 72, 96, 71,181, 35,194,133,172,227,183, 38,
-199,238, 78, 76, 77,255,218, 95,135, 26,179,195, 45,101,199, 85,158,141, 35, 72,239,235, 24,223, 53, 28,125, 32,163,134, 15, 92,
-218,168, 91, 32,208,187,160,245,173, 10,149,153,174,177,144, 66,188,140,211, 89, 29,163,149, 61, 85,202,248,239,139, 15, 48, 71,
- 83, 45, 33,144, 80, 43,180,227,142,219,172,123,128,123, 50, 56,177,193,111,193, 18, 64,164, 10, 17, 77, 10,211, 31,159,189, 60,
-221,133, 79,233, 99,105,141,  1,134, 50, 16, 73,154,138,141, 35, 80, 37,118,120,182,133,218,165, 38, 81,246, 73, 69, 21,105,  7,
-100, 77,134, 36, 98,110, 25,166,223, 15,  0, 16, 36, 46,  2, 50,101,127,168,100, 38, 76,251,180,105,224, 70,194, 50, 25,189,245,
-191,236,109, 10,206,161, 36,247,221,138, 76, 54,252, 83,216,174,164,158, 68,112, 24,201, 20,177, 36, 23,176,235, 81, 31,213,192,
-114,184,246,216, 14,154,196,140,148,113, 58,104, 37,147,185,129,179, 68, 98,108,136,  7,112, 10, 66,137,  4,121, 53,137,235,133,
- 58,232,134, 37,246,158, 41,103, 63,145,245, 75, 24, 66, 18, 96, 31, 73,184, 74, 84,117,228, 90,197,173,106,228,164,118,205,230,
- 75,138, 13,124,  1,183,235,226,204, 76,134, 67,138,100, 60,236,104,171,169,250,128,146,152, 99,  3, 16,129, 87,169,161,249,184,
-250, 71,  0,202,174,165,181,137, 40,140,206,220, 59, 51, 73,166, 77,155,198,166, 47, 40,182, 69, 20, 41, 45, 86,197,125, 65, 10,
-110,252,  3, 93,250, 59,  4,255,136,  8,234, 90, 16, 92,117, 33,  8,182,116,161,162,216,151, 85, 90,232, 51,105,210, 71, 94,243,
-200, 60,226,119,190, 59,169,173,136,232, 50,179,153,201,204,189,231,126,143,243,157, 99,156,147, 41,245,127, 67,246,191,211,219,
-255, 19,246, 47, 65,127, 71, 69, 18,232, 15,113,  2, 12,254,234,237, 63,116, 95,127,235,238, 94,100, 54,234,234,220, 76,244,116,
- 58,126, 84, 62,122,102, 33,152, 93,204, 11, 99,149,  5,224,143,219,246,240,222, 99, 65, 59, 39, 17, 89, 22, 74, 69, 63, 78, 91,
- 89,168, 20,176, 56, 92,135,171, 36, 78,170,229,233,137, 59,223,247,214, 41,188,130,124,165, 48,184,223,132,187, 56,129,203, 69,
-125,157, 82,129,166, 95,247,131, 86, 41, 56, 68,212, 35,  2,197,138, 66,  1, 83,147,240,196,198, 58,132,166, 31,146,142, 48,209,
-151,227, 46,168,174, 38,212,132, 30, 73,184,174, 70,104,  0, 72,124,126,201,114,214,109, 17,229,109,208, 85,107,173,152,110, 64,
-225,161, 19, 68,  4, 70,197, 88,251, 22, 86,212,105, 78, 72, 57, 53,152,163,135,215, 51, 22,129,171,  1,163,119,105,185, 96,168,
-217, 66,246,102, 82,215,179, 89,148,191, 53, 12, 56, 35,194, 38,220,129, 52,154, 17,186,113,213, 67,248,227,129,148, 36,130, 64,
-227, 85,205, 99,117, 44, 70,  5, 50, 89, 11, 77, 84, 83,189, 36, 93,235,183, 83, 61,166,229,250,241,210,218,209, 81,195,151, 50,
-109,155, 86,165, 94,220, 60,128, 64, 57,116,174,  1, 11,  2, 24,237, 57,182, 97, 55,252, 70, 29,190, 60, 33,157,124,116,100,214,
-188, 26, 12,117, 91, 94,166,203,110, 56, 85, 10,207,221,192,107,  6, 14,101,160, 41, 97,206,205,204, 45,111, 44,209, 21,101,178,
- 83,172, 30, 58,158,123,110,131,206, 81,188, 18, 31, 69, 96, 70,177,121,221,107,218, 86,247,252,236,252,147, 23,143, 39,175, 78,
- 18,100,247,103, 11, 20,254, 83,254, 34, 89, 94,166, 84, 45, 18,238, 31,211, 22,130, 44,157,246,116,225,153,196,208,131, 63, 90,
- 24,203,160, 94, 25, 58,190,211,215,149, 31,238, 27,222,220,223,192,234, 49,204,226, 89, 41, 99,164,  7,115, 67,  3, 61, 67,235,
-187, 43,187,229,157,175,155, 31, 70,114, 35,174,239,216,102,250,238,181,153,197,213,197,207, 91, 95, 70,251, 71,233, 39,140,112,
- 83,221,133,158, 43,180,254,106, 78,157,190,203,199,141, 79,150,105,165, 77, 43,214,194,253,242, 33,180,196,233,169, 53,153, 77,
-117,191,126,247,138, 94,187, 97,203,253,242,193,120,215,141,237,202,202,203, 55,207,239, 79,207, 26, 56,141,130,158, 76,246,168,
- 86, 49,205,212,195,123, 15,222,175, 45,123, 94, 53,103,247, 86,106,229,219, 19,183,118, 43,123,148,181, 80,252, 78,193, 94,119,
- 10,121,143,100, 36,225,  4,168, 85, 24, 24,226, 90,115,219, 51,187,182, 23,246,198, 31,221,212,  8, 76,163, 38,143,213,241,  2,
- 23, 28,194,163, 73, 15,195, 39,173,215, 68, 53,122,245,244,237,242, 14, 92, 19, 52,  5,125, 29, 22, 56, 55, 32, 47,214,107, 21,
- 87, 15,150,150, 82,228,179,182, 76,155,167,174, 19,226,236,151, 60,120,139,204,141,123,249,172,104,203, 62,238,174, 91,206,217,
- 83, 21,168, 13, 10,102,172,200,136,163,108,181,239,155, 90, 96,105,198,158,183, 19,177, 72,142, 96,167, 42,157,187,160,122, 28,
- 33,157,142,180,227,250, 49,109, 24,250,155,161, 16,227,249,177, 31,165, 45, 31,213,107,216,128,133, 24,225, 64, 17, 38, 86,170,
- 11, 24,239,132,203, 39,187, 73,130,179,223,142,227,115,148, 76,130,110,229,112, 68,223,  8,252, 61,202, 91, 12, 10,138,149,171,
- 55,183, 76, 53,204,117,133, 97, 35,170,227,  9,184,181,250,139,163,216, 78, 74, 58,237,196, 56, 45,177,245,166, 60,  0, 10,174,
- 32,248, 26,249,108, 63, 45, 27, 27, 35,114, 77, 53,219,101, 36,190, 75, 42, 55, 18,106, 44,134,153, 32,186,227, 53, 85, 81, 58,
- 82, 46,129,160, 84,176,121, 26, 71, 49,231,108,252,142,229, 18,159,182,151,133,  0,196,  5,189,155,196,208,186, 29,159, 53, 79,
-184,185,130, 75, 63,  5, 96,237, 90,118,155,134,130,232,181,175,157,216,206,195, 73, 31,105, 80,131,154, 86, 32,  1, 43, 22,172,
-248,  4, 36, 86,252,  0,159,198, 23,176, 64,  8,  9, 16, 91,132,218, 74, 81, 23,133,180,106,105,211,144, 71,243,110, 28,199,241,
-155,153,185, 78, 10,130, 13, 18, 63, 96, 39,215,115,207,156,121,157, 81,216,191,208,246,255, 10,241,191,189, 34,205, 81, 17,222,
-193,141,222, 50, 85,167, 67,150, 40,157,161,157,  8, 93,255,232,111, 16, 31, 51,101, 37,112,150,213,242,  0,149,168, 28,249, 43,
-149,167,227, 18, 45,240,120, 80,145, 80,184,136, 33,132, 15,195,112, 89,225, 70,227,132, 11,143,197,138, 16,117, 53,237,200, 18,
- 57,152,162,110,166, 84,189, 63,189,102,180,171,226,232,162,  6,112,179,179, 89,109, 14,154,194,105,210, 24,161,236,163, 33,168,
-240,182,201, 98, 76,141,126,162, 29, 83, 42,231,203,224, 30, 40,145,238,145,168,134, 68,173, 20, 76,252, 29,145, 90, 10,104, 88,
- 25,235,154,136,226,212,106, 12, 96,192,248, 94,225, 81,115,122,142,138,147, 44,224,  1,188,  2,119,122,147,144,122,164,208, 98,
-  6, 46,150,204,211,244, 61,231,162,190, 20,214,135, 99,157,187, 56,201, 73, 15, 70, 70, 35, 99, 15,  7,248, 55,136, 12,  0,251,
-239, 23,139,213,124,174,128,213,133,172, 41, 97,238,  5,184, 60,202,241,179, 96,230,120,150, 20,207,177,139, 40,160, 44, 17,205,
- 94,225,117,197,205,  3,161,  1,220,139,131,155,202,166, 56,240, 71,219,241,247,191,247,135, 22, 56, 79,135, 75, 41,207,179,103,
-254, 68, 87,115, 70, 42,215, 26, 93,193, 89,107,170, 54,119,157,192, 95,  0,192, 25, 90,  1, 44, 30,127, 18,118,172,240,201,108,
- 36, 43, 10,249, 98,184,155,108,183,188,119, 61,238, 30,158, 29,192,101,184, 83,168, 56,254,252, 99,237,253,220,155, 11,233,130,
-129,213,167, 50,154, 14,174,138,246,107,235, 54,106,146, 68,128,203,224,228, 12, 45,219,191,233,192, 39, 72,105,250,219,253, 55,
- 27,197,173, 77,179,132, 66, 28,161,159,104,177, 70,129,170, 26, 41, 73,129,248, 54,159, 89, 91,120,118, 74, 81,192,210, 30,222,
-125, 80,111,124,157,204,134, 94, 64,221,156, 44, 28, 90,  3, 96,217,102,166,104, 57,211,242, 90,165, 51,104, 64,232,109,187,211,
-211,246,137, 71,219,111,224,215,204, 92, 91,227,234, 78,185,218,232, 54, 56,231, 47,158, 62,127,253,249, 93, 49, 95,116, 93,183,
- 51,110,183,111,186,178,136,252, 36,185, 53,234,160,170,109,228,111,100,214,225,154,162,228,108,236,101,211,102,123,212,133, 88,
-161,144, 41,  0, 97,223, 45, 85, 43,114,241,  8, 69,221,248,151,179,131, 74,105,103,100,141, 33, 20,240,176,234,236, 52,122, 87,
- 99,123,  2,254, 24,224, 27,190,254,143, 65, 11,231,221, 89,132,132,131, 73,134,106, 80,151,119, 36,166,223,195,192,175,159, 30,
- 42, 16,234,225, 68, 72,175, 57,140,182, 95,125, 74,189,124,198,208,148, 38, 76, 33,188,224,148,217, 70, 34,  0,120,158, 97,181,
-238,197,135,243,163,122,111,232,184,192,  3,176,170, 65,122, 65,161, 47,224, 33,105,193, 90, 13, 30, 82,186, 19, 55,243, 85, 54,
-242, 11, 57,154, 90, 22,224, 42, 64,164,138,  0, 25, 11, 49, 54,209,166,  6,102,167,144, 85,166, 21, 47,154, 89, 88, 92,209,140,
-249,194,131,155,165,201,105,207, 11, 53, 29,119, 99, 77,216,108, 91,171,236,207, 61, 51,157, 15, 34, 23, 23,213, 98,224,155, 55,
-141,204, 73,231, 50,183, 94,158,143,250, 56, 68, 43, 56,123, 20, 97, 69,132,252,206,147,123,143,107,151,199,112,229,182,204,210,
-113,235, 27,201,193,209,190,164,128,  4,234,101, 22, 96, 54,143,248,124,156,164,115,197, 16,110,124,219,142,  1,161,155, 98,166,
-205,190,219,139,150,248,200,101,196, 16,148, 21,210,178, 16,  1, 12,103, 55,178, 20,175,100,105,111,153,181, 40,252,210,202,177,
-164,163,143,142, 11, 30,152, 73,227,144,115, 90,209,108,215, 17, 44, 19,248, 13, 88,160, 31,186,162, 60, 26, 75, 75,233,175,213,
- 80,167,196,198,214,152, 45, 55,160, 51, 49,251,200,150, 98,  5,  2,  4, 89,162, 72,243, 71,203, 73, 34,  7, 41, 37,195,255,232,
- 29, 40,114, 78,116, 24,127, 10,192,216,149,236, 54, 17,  4,209,158,221,179,197,139,108, 39, 81, 18,  5, 36,132, 64, 66, 66,226,
-  0,124,  2,119, 62,129, 11,  7,238,124,  4,191,192, 31, 32,113, 65,  8, 78,112, 68, 17, 10,203,129,147, 67,130,  9,177,177, 51,
- 30,143,103,245,108, 61, 84,117,143,147,  0, 18,226,226,147, 61, 35,207, 84,191,126,213,245,234,149,252, 15, 40,255,159,230, 85,
-156, 19,200, 84,231,255,127,254,254,247, 23,152,221, 32, 78,153,101, 41,  6, 68, 88, 86, 15,168, 37, 92,  9, 43,150, 23,132,152,
- 23,175,202, 44,201,170,213,201,187, 20,227, 76,194, 66, 60,187, 39, 31, 12, 91,137,188, 83,105,213, 14, 80,101, 40, 31,169, 84,
-217,100, 83,119,249,115,225,174, 97,104,136,178,219,189, 52,241,198,188,208,  1,241,234,198,128,215, 30,238, 19, 98, 37,227,148,
- 87,184,190,216,182, 58,144, 26, 83, 28,104,167, 82,108,239, 76,241, 61,139,133, 34, 41, 16,140,138,214,192, 74, 11,170, 22,133,
-177, 55, 34, 76, 74,203, 38,165,  0,234,  2,140,102,220,142,129, 59,160,178,212,183,  4, 18,177,196, 90, 36,106,209,105, 90, 27,
-183, 30,120, 78, 33,164,170,100,224,122,198, 51,198, 85,133, 68,252,109,251,230,  4, 11,123,230,177,148, 65,194,146,132,114, 90,
-179,174,242,194, 91, 68,202, 38,  4, 89,116, 12,219,123,  6,172,131,137,208,141,  6,112,240, 94,115,109,221, 48,182, 76,243,198,
-102,207, 54,180,158,161,  1,222, 51,179, 70, 33,197,181, 78,225,237,160,199,125, 65,  1,111,  7,163,224,240,196,119, 22,212,141,
-  2, 77,182,238,221,188,255,106,255, 25,192,159, 34, 26, 64,226, 32, 24,166,139, 73,201,206, 59,113,124, 54, 22,169, 84,  8,186,
- 28,235, 16,153, 36,194,227,202,253,216, 55,117, 59, 78, 22,186,102,  3, 93,157,199,174,143,233, 39,202,171,225,153, 76, 23, 35,
-156, 67, 96,182,104,161,181,205,182, 23,123,144, 74,  3,137, 14,146,133,199,186, 22, 27,170,201, 88, 42,214,209,  0,172, 41,237,
-192, 79,117,205,  4,208,220, 31,188,191,186,125,125,127,240, 65,150,181, 56,241, 37, 73,211,117, 99,137,201, 89, 21,101, 81,219,
-110,103,217, 82,194,119,132, 11,182,189,214,209, 26, 22,182,125, 66, 24,224,216,188,203,227,217,177,138, 61,  2, 74,150,103,195,
-201,183,142,221,156,  7, 46,236,187,170,165,154, 13, 28, 49, 97,169,141,187,215,238,188,253,244,230,116, 49,105, 27, 77,216,192,
-158,191,123, 57,243, 79, 45,228,221,101,183,217,  3,120,193,164,  1,101, 75, 82,202, 78, 81,202,130,246, 59,253,131,233,119, 67,
-213,156, 48,172, 42, 31,190,163,169,154,166,232, 39, 14,142,145, 98, 22, 81,152,177,165,105, 50,113,126,  0,154,227,144,101, 65,
- 60, 93, 56,128, 47,216, 97,202, 82, 22,184,160, 27,185, 16, 48,139,208,195,126, 70, 96, 18,177,135,119,201, 75,180,243,224,  1,
- 76, 10,219,232,123,201,228,246,198, 21, 55,220,123,244,248,197,195, 47, 71,183,158, 60, 32,100,131,136, 30, 49, 34,162,138,  4,
-246,231, 38, 35, 81,175,  7,123, 79,247,135, 65, 90, 66,230,161, 43, 73,176,156,204,253, 52,203, 53, 85,150,108, 11,197,245,244,
-188,138, 40,176,121,158,  0,226, 59,173,230,102,207, 74,242,116, 25, 23, 18,202,204,240,120, 94, 98, 13,242, 84,170,164,146,249,
- 68,113,175, 21,180,143, 22,229,170, 60, 25, 13, 41,149, 32,187, 74,210, 57, 44,114, 83, 54,188, 52,106,239,172, 65, 72,  6,196,
-237, 55,208,245,190,101,217, 93,187, 53,244, 66, 72, 84,225,239,207,162,185, 46, 43,157,238,166, 73,201,177, 59, 70,165, 12, 83,
- 61, 71,105,204,138,138,213,200,157, 70, 89,178,204,178,153,239,228,204,243, 11, 79,116,105,105, 26,214,238,250,238,199,163,207,
- 34,225,224, 94,159,227, 51,190,125, 54,252,141,174,116, 34,249, 52,156, 10,228,156,138,195, 39, 50, 57,  1, 21, 77, 73,221,198,
- 68,254,  4,119,254,123,190, 95, 16, 97,187,187,229,248, 14,132, 58,252,107,224,254, 95,127, 30, 66,108,178,  6,186,122,217,197,
-121,196,189,126,185,157, 31,183, 46,129, 61,177,224,210, 77,  6, 83, 72,161,  8, 63, 24, 67, 18, 42, 67,  4,150, 75,194,148,199,
- 53,200, 87, 85,237,255,200,180,151,186,162, 39, 69, 34,212, 98,148,149, 50,165,190, 35, 79, 17,106,128,252, 37,  0, 97,215,178,
-219, 52, 20, 68,239,245,243,218,113,156, 71,211, 54,141,170,162,130,  0,  9, 65,197,  2, 36, 36, 36,190,128, 37, 43, 22,124, 13,
- 43,182,236,248,  1, 96, 77,197,170,176, 42,130, 86, 64,161, 72,  5,148, 66, 95,132,208, 36, 77,155,167, 19, 59,182,153,153,235,
- 20,138,132,234,110,235,186,190, 55,153,123,102,230,204, 57,218, 41,213,147,211, 46, 29,107,229,209,127,136,140,167, 95,242,228,
- 17,186, 13,  1, 77,186,  0,134,236, 79,100,151, 87,128,  6,123,127,167, 11,199,146,238, 10,145,223,229,236,  0, 39, 83, 57,146,
-213, 59,249,100,203, 72,245,253,110, 98,103, 34,123,167,180,239,144,101, 39, 92, 81, 58,126, 53,236,233,117, 13,213,218,252, 85,
- 30, 43, 80,199, 74,210, 31,145,150, 38, 49,149,140,226,201,204,244,198,222,  6,209, 75, 61, 31, 66,223,184, 17,  2, 59, 51, 12,
- 81, 40,219, 27, 14,114,206, 68,123,208,142,227, 17,209, 21,185,180,155,  9,240,  7, 94, 38, 12, 56,121,139, 51,210, 42, 80,152,
-176,153, 78,211, 68,148,254,161,124,141,142, 14,221, 58,245, 17, 44,164, 37,132,130, 39,234,134,124, 52, 66,154, 35,202, 97,146,
-246,150, 92, 14, 85, 77,114, 20,148,135,151, 13, 40, 64,227, 36,209,203, 36, 97, 88, 46, 88,  4,187, 69,236,119,161, 70, 26,182,
-168,252, 48,110, 68, 65,163, 90,255, 28,132,232,197,  7,191,108,232,182, 45, 82,186,238, 10,211,113,236,172,208, 75,134,221,244,
-130, 86,111, 56, 12,  2, 26, 13,198,190,141,202, 76,120,100,111,208,124,182,242,152, 18, 11,184,187, 55,240,  3,200,  3, 12, 93,
-120, 72,195, 68,226, 90,103,208,134,127, 51,227,228, 33,200, 66,158,128, 77, 36, 92,215,168,235,  1, 50, 66,240, 53,244,  7,181,
-206,126,162,227, 70,118,222, 16, 73,  1,233,207,228,103, 43,  7, 63, 32,137, 22,166,232, 99,175, 59,112,237,172, 23, 12,108,145,
-129,133,149, 69,212,180, 72,123,104,204,139,204,234,142,119,  8,135,199,116,118,  6,112,116,237,168,106,153,118,193,157,220,174,
-109, 69,104,215,160,194,241, 25,196,193,185,226,249, 55, 95, 95, 21,243,165,102,171, 33,132,120,249,225, 69,222, 41,104,232, 44,
- 15,169,149,178,189,255, 45,109, 58,128, 16,133,106,112,156, 69, 84, 90,189,150,134, 75,140,  1,119,126,242,204,141, 11,215, 23,
- 87, 23,151,222, 47, 77,103, 10,185, 84,214,181,221, 90,171,  6,231, 22,108,195,181,133,155,147,169,236,242,250, 50,108, 86,187,
-210,129,187, 92, 52,247, 56, 64, 34, 34,142, 43,155, 25,203,129,151,130, 87,176, 12,177,127,180,143,181,133,144,188,179, 85,245,
-234,217,133,225,200,127, 91,126,167,113, 99,110, 98,246,211,238, 23,115, 20, 66,148,167, 33,122, 31, 43,116,244, 33, 71, 74, 99,
- 52, 66, 90, 48,  9, 43,162, 51, 37, 11, 51,182,155, 36, 67, 10, 10, 96,193,247, 32,109,185,  5, 43,227,140,182, 86, 90, 59,123,
-186,250,224,225,243, 59, 79, 95,223,190,127, 87,220,187,197, 88,137,105,  3, 20, 29, 99,189,224,209,234,242,147, 53, 56, 84, 13,
-161,123, 97, 88,175,181, 87,215,183,123,140, 77, 51,150, 99,204,184, 98,198,145,116,240, 76,198, 94,  1,109,216,154,118,169, 52,
- 97,  9,181,221, 71,223,  9, 19,141, 80,105, 98,137, 37, 66,189, 84, 10,  1, 56,128,176, 29, 33, 27,231,112,139, 57,162,  4, 90,
- 97,213,195, 42,102, 53,140,103, 29,183,225, 29, 21,231, 47, 51,236,200,118,115, 70,174, 30,212, 75,234, 69,141,113,159, 84, 35,
- 73, 75,139,101,221,124,115,119,179,118, 88, 15, 20, 78,114,  2, 81, 72,243,180, 40,238,193,248, 78, 99, 23,162, 58, 67,255,166,
- 56,159,206,195,199,  3,178,174,242,207, 50,236,212,218,247,143,136,220, 73, 52, 38,102, 73,201,125, 92,188, 77,  2, 78, 49, 87,
-130,189,195, 42, 60,  4,131,113, 56,156,114,167,106,221,134, 20, 39, 32,  2,190, 36,175, 68, 73,124, 79,116,119,144, 97,201,147,
-224,142,111, 92,105, 86, 66,137,151,153,252,  2, 34,208, 36,221,  2,137,169, 20,105,237,  9,171, 52, 87,152,219,171,239,106,154,
-  6, 57, 34,192,124,196,  1,244,103,121,242,252, 40, 30,203, 87,218,134,240,123,125,206,147, 20,255, 24,182, 31,171, 83,186,169,
-172,215,242,216,  9, 70,140,242, 15, 29, 81, 94,191,  5, 96,236, 90,118,155,  6,162,232,140,199, 99, 39, 77,157,244,  9, 10,109,
- 72,165,150,242,168,170,118,133, 64,128,212, 47, 64,236, 16, 27,182,252,  2, 44,187,224,  7, 96,201, 15,176, 64,192, 55, 32,181,
- 21, 84, 44,144,138,  4,148,135, 72,165, 16,151, 54,143,214, 77,236,216,227,225,222,107,167, 88, 80,  9,164,174,170, 72,150,103,
-146, 51,247,220, 57,247,156, 19,244,239,255, 15,238,232, 14,166,163, 19, 27, 53,252, 95,152,206,211, 37,192, 15,162,206, 36, 14,
- 51, 98,118,254,247,199,141, 63,193, 29, 22, 49, 78,156,100,120,234,200,147, 20, 28,212,130,231,233,133,  3, 67, 51,176,136, 80,
- 62, 15,248, 18, 81, 20,137,206, 88,208, 83,121, 66,113,227, 40,209,209, 52,238,156,140, 17,101, 77,234,  7,151,187,116, 39,138,
-167,162, 16,150,149,139,209,160, 35,164,155,216,248,216, 51,130,178,  9, 99, 64, 34,  4, 90,172, 98,144,127, 64,237,221,210,  0,
- 75,129, 39, 85,144, 99,145, 68,221,184, 70, 41,147,101,161,132,222,  6,110,160, 67,169, 35, 11,  7, 87,185,141,166,144,202, 84,
-202,  4,240,183, 12,155, 52,224, 86,206,132,202, 74, 22,242,214, 88, 73,150, 74, 98,196, 17,163, 37,233, 12,227,248,168,193,  4,
-176,102,  0, 50,165,  4,182, 49, 25,169, 55,113, 48,197,224,192, 51, 81,168, 76,234,100,148,189,113,146,231, 99, 94,  0, 60, 31,
- 42,117,248,179, 36, 62,  0,158,131,129, 76,166,  0,122,223, 99,170, 19,246,221,158,247,253,160,233,121,129,101, 90,120,162, 36,
-209,204,100, 73,146,100,181,161, 11, 13,118,249,101,159,162,159,177,167, 44,236,195, 46, 14, 92, 40,186,255,130, 77,232,  5,222,
-245,139, 43, 36, 75,199,178, 72,160,114, 90,164, 78,170, 90, 79, 56, 19, 80,255,226,116,174,204, 17,104,171,233,177, 42,172, 94,
-212, 71, 99, 91, 32,100,240, 14,176, 66, 29,175, 83, 30, 47,187,173, 31,152, 13,133,186,253, 68,195, 26, 47, 86, 23,127,182, 93,
- 88,240,133,202,210,254,225,254,217,211,213,237,250, 71, 88,137, 32,236,211,149, 56,  7,182,110,153, 54,252,180,234,205, 58,217,
-209,132,240,187, 18,134,188, 60,127, 21, 56,248,129,223, 17,192, 29, 21, 26,  2, 43,218,205,196, 44, 69, 81, 44,  9, 96, 49, 37,
- 68,114,103,104,120,102,114,102,253,195,  6,166,193, 72,121,228,119,225,104, 25, 41, 56,231,202,179,161,138,108, 83,110,188, 95,
-223,113,107,203,115,203, 95,220,111,192,181,225,197,209,248, 27, 77,232,112,160,209,243,189,202,248, 84,163,189, 11,236,  1,222,
- 40,111, 13,  9, 46,128, 25,  0, 42,193, 78,212,118,107, 23,166,206,215,118,119, 34,173, 90, 94,123,190, 60,215,104,187,125, 88,
-129, 24,155, 75,240,229,129,175,  8, 28, 60,213, 73,116, 49, 99,169, 11,109, 12,  7, 76, 28, 71,194, 52,155, 94, 19, 74,129, 75,
-103, 23,128,  3, 97, 14,  7,172, 96,239, 96,116,168,254,186,225, 66, 49,124,171, 27, 57,123,221,181,151,155,141,213,103,123,111,
-182, 42, 97,208,122,254,142, 61,253,180,246,106,187,103, 99,211, 60,196, 84, 85, 93,109,118,239,239,119,238, 48,118,147,177, 77,
-198,222, 74,227, 76,193,246,  9,183, 20,176, 55,160, 32,195,249,165,202,164, 50, 96, 71,250,210,228,142,105,230,164,137, 65,  2,
-100,141, 72,161,189,169, 42,153, 19, 96,  2,226, 91,166, 81,202,219, 54,179,106,123,133,  8, 77,107,204, 36,134,193,136,140, 71,
- 91, 47,110,175,220,189, 49,123,101,245,201,234,189,169,  7,143,221,135,213, 82,229, 90,241, 84, 27,205,132,121, 63, 68,211,132,
- 14, 94,119, 11, 63, 82,227,197, 81, 32, 85, 45,212,167,197, 73, 52, 88, 68,165, 58,206,115,192,118,234,104,122,162,242,185,241,
-149,200, 77,146, 84, 71,118, 37,177,206,160, 93,156,133, 18,248, 23,112,166,100, 74, 53, 51,180, 31, 31,  6, 71, 44, 53, 33, 75,
-134,  4,126, 79,224,232,129, 35,187, 30,116,122,116,154, 44,193, 83,169, 36, 31,152, 75,167, 70,108,199,226, 67, 62, 16,149,242,
-174,143,102,159,197, 66,209, 15,125, 84,194,164,142,109, 73,229,153,130,123, 34,210, 15,194,128,242,245,120,166,120,103,199,217,
- 91,176,251, 30, 53,238,105, 80,199, 48,178,163, 63,196, 15,178, 96,251, 75,  0,206,174,101, 55,137, 40, 12,159, 57,115,165,204,
- 48, 12, 32,180, 67,211,212, 40,144,168, 81, 55,198,244,  9,234,194,173, 11,223,192,173,111,226,198,173,235,190, 65, 19, 99,188,
- 36,221, 20,141,177,105,172,212,218,212, 88, 13,148, 22,152, 50,  3,204,133,153,241,255, 15, 67, 29, 19, 99,140, 27, 66,200,228,
-204, 97, 46,223,127,255, 62,225,255,220,246,191,224,120,218, 78,200,188, 18,132, 46,249, 61,187, 18,167,134, 84,255,229,164,233,
-185,214,121,143, 60,199, 68,130,184,170,177,114,220,251,202,165, 38, 97, 85, 69,  3, 68,  5, 28,193, 81, 99,180, 25, 51,118,207,
-120,226, 79, 18,132, 38,100, 65,202,250,168,176, 30, 94,116,227, 48,182, 32,180,177, 33, 83,240,194, 56, 96,222,117, 52,171,224,
- 37,235, 99,115, 18,117,189, 17, 56, 84, 57, 94, 84, 51, 57,111,120,  6,102, 10, 34,196,156,146,183,253,243, 89,170, 47, 35,169,
- 24, 94, 33, 37, 36,106,161,192,151,129, 16,198,156,196,104, 26, 49,208,102,140,242, 44,121,  2,107,  3,246,179,187, 41,240,216,
-132, 78,177,175,142,195, 30,  2,102,190, 51,178,160,100,  4,198,215,  2, 49, 29,132,195,177, 40, 19,145, 70,163, 49,  4,230, 49,
- 19,106,167,138,  4, 70,  0,183,  6,  0, 42,241,140, 70,117,202,158, 79,137, 17,255, 98,183,  3, 97,180,245,248,140,  4, 72,237,
-139,106, 71,178, 12,192,129,219,112, 93, 14,121,202, 88,165, 90,  4,219,130, 68,186,176, 19, 26, 96,202,140,165, 26,167, 76,218,
- 44, 64, 94, 11,166,125,129,253,  8,178,136, 61, 97,170,146,207,202, 26, 64,213, 82, 97, 21,204,231, 97,187,  5,255,125, 60,177,
- 99, 86,225, 96,137, 17,244, 33,182, 62,190,  6,239, 85, 66,234, 75,202,230, 26, 66,184, 39,224,161,123,161,215,106,127, 42,169,
- 37,128,188,190,115, 26, 49,106,184,190,115, 38,112,130, 53,177, 20, 65,  1,200, 91, 42, 46,  3,234, 85, 75, 70,235,251, 62, 90,
- 43, 81,138, 81,233, 16,130, 83,136, 30,236,183,  7, 77,128,251, 59,181,181,158,115,106,168, 70,167,223,  6,171,  5, 17,155, 63,
-182,192,174,  0, 76,148,115,149,238,240,  4,142, 84, 51, 11, 19,215,163,130, 16,  6, 65, 78,215, 94,237, 60,135,139,  0,126, 80,
-103,216, 17,147,153, 28, 46, 35,168,166,177,  8,239,225,192,233,151, 13, 83,161,226,153,221,  1, 43,102,141,206,155,  7,205,181,
-198,221,189,163, 93, 31,173, 46,191,190,118,111,227,197,  6,156,162, 81,173,235, 56,166, 52,184,106,214, 44,215, 46,235,165,147,
- 65, 23, 59,154, 73,124,227,242, 77,123,100, 45, 26,139,123,199,251,102,201,  4, 12,242,167, 62,141, 99,184, 20,171,149,149,129,
- 67, 43,122,165,168, 21,183, 63,111,191,220,125,  3,207,106, 73, 45,130,157, 61, 60, 57,  4,231,174,172, 27,148,138, 96,138,126,
- 88,109,215,245,134,209, 16,169,140, 48, 17, 10,246, 95, 41, 40,133,142,213,129,139,105,187, 78, 62,171,215,205,198,251, 47,239,
-242,154, 30,132, 28,236,164, 86,208, 58,129,133,210, 17,224, 44,139,242,125, 44,195,144,199,132, 60,217,220, 89,223,106, 61,186,
-213,184,189, 84, 55,151, 11,199,182,131,141,162, 24, 10,146, 77, 23, 37,236,193,121,127, 70,200, 83, 56,186, 61,184,166,103, 33,
- 14,244,167, 88, 51,188,110, 22,203,122,102,236,121, 18, 79, 12, 77, 86,100,158, 17, 23, 33,244,135, 33,135,140,193,209, 76, 31,
- 34,201, 99,227,227, 77,169, 34,136,133,236,130,139, 33, 47,242,148,193, 39,143, 69,222, 88, 36,162, 77, 38, 15,107, 15,200,  7,
-124,195, 12, 33, 31,120,195,  2, 54,222, 83,  8,103,235,213, 43,142, 55, 57,234,126,131, 21,123, 99,108, 75,239, 58, 61,207,  7,
-204,  7, 15,  2,171,246, 62,130,252,148, 41,189, 79, 97,  3, 37,237, 18, 74, 42, 38, 18, 26, 28, 19,151,140,231,234,163,105,122,
- 68,238, 98, 12,127, 46, 16,146,128, 82,152,252, 74,211,181,189, 40,230, 82,189, 29, 23,191,113,243,101,162,185,224, 93,196,198,
-175, 80, 55, 40,250,165, 68,148,102,221,154,101,213, 89,163, 28, 43, 86,247,135,125,  3, 11, 60, 54,211,  9,  9,231,251,156,213,
-  9, 18,249,167,138, 97,182,251,237, 56,201,200,179,204,123,  2,238,113,210, 10,153, 84, 16,102, 85,188,100, 20,246,143, 24,252,
- 83,  0,214,174,166,167,137, 40,138,206, 71,223,155,233, 76,235, 88,104,139,130, 20,  2, 41, 98, 52,129, 64, 72,140,137, 43,163,
-254,  3, 99, 98, 98,226,202,191,224,207,240, 71,184,214,  5, 27, 89,168, 44, 52, 36, 38,178, 49,209,  5, 31,242, 93, 10, 45,181,
- 67,203,204,155,143, 62,239,125,111,166, 34,186, 52,108,  8,105, 74,166, 51, 61,247,220,251,206, 57, 23,243,  9,224,229, 93, 37,
- 84,254, 43,184,203,223,169, 70,229,116,229, 66,230,123, 86,183, 88,236,241, 52,110, 62, 75,108, 85, 14,170,254,218,244,116,  1,
-217,229,225,178, 56,254, 79,  3, 75,147, 34,121, 62, 23, 77,150,102, 85,237,135, 21,167, 55, 58, 17, 40, 37,252,253,247,220,141,
- 64, 31,137,252, 29,161, 28, 64,216, 38,240, 52,119,164, 13, 36,221,  6,134, 49,228,106,255,108, 31,227,130,117, 49, 78, 80,203,
-206,200,161,187,107, 17, 11,104, 38,238,117,195,105,  9,202,169,165,149, 27,240, 50,180,161,197,150,128,157, 17,  4, 90, 77,189,
-213,194,186, 30,163,  2,221, 36,128,239, 40, 29,214, 51, 98,145,183,200,147, 71,177,  5,213,156, 60,112,118, 65, 20, 52, 30,137,
-200, 70,177, 31, 53, 14,165,133,  3,111,190,230,121,226, 97,137,162,  0,153, 65,  8, 77, 60,116,198,184,119, 24,111,  1, 74, 77,
-100, 31,  8,111, 28,192,231, 46, 44, 31,148, 34,193,135,247, 10, 98, 25,243, 12, 28, 86, 33,186,  2,127, 54, 13,124,101,140,  2,
-121, 14, 95,221,179, 70,116,153,228,124, 22, 15,231, 42, 65,236,237,159,236,141,151,171,199, 39,117,184, 95, 10,210, 40,244,215,
-217,120, 62,134,174,111, 47,196,  9, 21,209,141,128,121,162, 27, 74,154, 26, 77,168,  6,180,148, 29,  3,180, 29,181,235,102,198,
- 48,168,229,  7, 29,184,162,153,241, 89,104,153,129,140,231,178, 54, 26, 20,116,114, 10,160, 76,115, 29,168,166,170, 50,228,148,
-218, 93, 23, 96, 93, 16,106,185,145,134, 27,212, 24,204,193,215,123, 31,157,126, 60, 30, 30, 24, 61,114, 15,101,118, 28,124,136,
- 66, 37, 37,131,  1,228,214, 47,252,185, 55,123,127,113,229, 13, 69,137,184, 41, 98, 67,112,146,141,147,  6, 33,107,147,162,  5,
-185,144,  0,218,158, 75,102, 14,202,107,193,114,226,  8,104,122,  8,148,217, 34,134, 69, 76, 32,213,  7,205,  3,130, 13, 17,116,
- 84,154, 72,134,192,249,129,220, 49, 52, 86, 30,107,184,205,133,169,249, 72, 83,150,191,188,  7, 40,156,171, 46,140, 15,141,190,
- 93, 93, 42,228,  7,136, 74,214,107,107,112,  9, 69,167,236,250, 46, 99,190,136, 85, 84, 43,165,202, 94,  3,247,242,220,158,158,
-251,113,184,221, 60,109,193, 21, 64,  3,  1,  8,158,207,230,197, 65,136,127,227,218,212,215,237,239, 35, 80,129, 66,175,254,243,
-120,172, 92,129, 43,219,168,173,217,134, 21,246,152,158,136,191, 50,143,167,  7,151, 15, 62,125,222,111,212, 24,219,241,109,239,
-204,175, 41, 12,167, 55,126,116,167, 88,120,245,224, 73,219, 39, 35,197,173,111,205, 22,  0,124, 23,250,156, 40,126,189,229,126,
-108,251, 81,134,251,204,103,103,221, 40,100,207, 39,175,  0,213,176, 40,157,175, 20,117,138,137, 26,  5,155,230,105, 70, 90, 63,
- 68,254, 41, 60,111,106,200,161, 92,114, 15,131, 85,197,  9, 84, 98,121,213,  1,220,203, 78,222, 80,244,189,102,171, 86,191,190,
-203, 34,138, 57, 40, 40,  3,152, 48, 71, 31, 46,189,224,239,248,206, 98,115,242,229,204,135,185,149,187,171,149,167, 55, 31, 61,
-155,184,181,217,105, 20,115, 78,196,163, 86,199, 85, 48,241, 73,166, 20,160,125,181,228,148,215,235,219,248,239,224, 78, 96,170,
- 62,218, 74,  0, 54,  3, 20, 37, 51, 46,250, 12,220,224,142,103,170,194,254, 36, 37, 43, 80,135,120, 31,220, 37,150,196, 23, 44,
- 62, 92,225,253, 33,206,111, 44,239, 37,150, 40, 53,149, 42,246,100, 94,165, 96, 90, 60, 57,109,198,210,  0, 37,217, 99, 94,245,
-106,117,163,190, 41,166, 58,242,192,130, 11,245, 50, 90,181, 77, 98, 66, 69, 47,229, 75, 64,186, 89,232,159, 55,240,240,115, 51,
- 25,158,172,205,139,165, 72,179,151,134,175,136,109, 11,189,100,113,181,250,  7,140,202,206, 73, 52, 76, 82, 91,255, 15,170,252,
- 75,  0,210,174,156,183,137, 32, 10,123, 79,239,250,218,245,149, 40,241, 38,  8,145, 68, 65, 38,  8,129, 16,  5,135, 20, 34,148,
- 34, 63,  3,137,146,130,142, 46,127,128,154,158,154, 38,226, 71, 80,128,148,138,  2, 69, 20, 78, 72,156,216,137,143,189,103,175,
-225,189, 25, 95,208, 34,165,112, 20,219, 89,123,230,189,121,239,237,119,204,231, 51,255,153,220,255,153,170,240,212,188,160, 64,
-176, 56,120,161,  9,157,132, 22,255, 61, 65,190, 89,188,  8,114,167, 51,144,110,142,163, 71, 57,235, 14,189, 47, 32, 66, 24, 40,
- 84, 96, 19, 30,137,235,218,149, 53, 35, 97,139, 50, 81, 18, 91, 52,123,101,149,105,189,188,228, 67,247, 55, 99,247, 78, 25, 20,
-240,208,208, 77,254, 39,126,158,151, 52,195,157,144,196,184,226,134,168, 72,200,189,226,220, 95,120,205,253,219, 15,221,192,206,
- 43,  5,248, 63,176, 97,189,200, 65,190, 28, 26,101,224,226, 97,233, 34,114,179, 22, 42, 22, 21, 27, 98, 38,202, 16,183, 77,153,
- 68, 42,142, 32, 37,164,119, 75,178,174, 41, 69,200, 22,178,204, 36, 61, 36,  4,201,163,139,  1, 62,  1,182, 73, 20,198, 77,163,
- 82,200,171,246,216, 97, 30,221, 90,  6,241,135,247,180, 36,180,250, 99, 82,190,172, 85,148,117, 89,170,154,121, 67,167,138,152,
- 30,188,124,241,254,221,219, 87,207,159,246,122, 87,221,254, 80, 65,244,136,192, 38,154, 40, 87,131,168,115,252, 56,136,  6,103,
-201,150,162,111,132,132, 53, 59, 78,133,100,252,129,182,154,239, 58,120, 50,137, 51, 47,164,196,131,224, 84,226,148,220, 56, 55,
-182,103, 67,  0,105, 82,161,111,247, 56,137, 88, 87,208,223,220,137, 60, 18, 65, 51,157,114,101, 42, 85,206,227,167,160, 81, 54,
-151, 64,194,114,131,205,132,160,250, 83, 16,179,  8,  7, 42,134, 37,156, 13, 37, 88,253,238,240,226,205,254,235,111, 39,223,211,
- 44,137, 82,210, 44, 47,147, 24,201, 98,240,146,136,132,112,213,144,238,239,172,108, 13,156, 62,101,249, 29,243,106, 78, 26,249,
-131, 28, 19,101,224,246, 17, 16,131,123, 15,246,127, 15, 78, 55, 87,183,123,163,139,138, 94,133, 69,209, 20, 29, 85,159, 24,220,
-175,168, 22,221,208,151, 36, 57,136,124,230,226, 43, 48,209,157, 52,206, 18, 21, 37, 71,144,165,  9,173, 24, 28, 36,144, 40, 21,
- 89,113,252,177,200, 60, 77,242,170, 58,246,  6, 30,241, 29,223, 30,184,  3, 88,221,157,245, 54,100,127, 55,116,217,240,149, 66,
-171,106, 53,172, 74,  1, 54,143,  7, 13,199,217,245,121,231,178, 99,213,215,116, 93,235,217,215,199,191,142,225,204,131,239,186,
-172, 85,158, 61,222, 51,107,203, 39,167, 63,225,208,106,175,181, 55, 90, 27,171,181, 86,189, 82,133, 47,115,169,218,128,205,118,
- 57,236, 71,232, 77, 97,194, 91,  5, 49,129,190,  4,109, 35,147,168, 59,186,130,210,117,232,141, 93,196, 17,208,161, 55, 26,162,
-221,  4, 58,139, 65,195, 32,178,155,119, 26, 85,118,183,114,199,151,231,231, 78,224,199,241,118, 97,197, 50,205,166,166,149,100,
-  1, 78,  5, 69,212,119,215,219, 25, 13,134, 89,207,142, 99, 77,146,145,213,142, 96, 35,209,144,245, 38, 52,134, 36,116,  9,148,
-245,217, 78,189,244,168,213,188,219, 50,203,  5,209, 50, 85,171, 90,168,149,212,162, 46,162,240,156, 44, 48, 71, 51, 30,174, 34,
- 35,162,115, 41,109, 28, 63,195, 74,168,130, 92, 43,106,107,117,227, 71,167,239,103, 36,159,214,186, 33, 83,184,197,186, 76,118,
-  3,242,229,236,235,225,199,195, 79, 31,142,186, 29,123,179,214, 58, 26,125, 62,176,158,200, 66, 18,160,161, 93,128,126,167, 40,
-222,139, 23, 70,178, 40, 78,211, 48,141,161, 47, 65,  3, 99, 40, 97,104, 18,162,187, 77,100, 84,234,118,224,196, 40,115, 73, 25,
- 25,146,194,209, 83,212,208,175, 14, 22,228,222,173, 54,108, 87, 12,113, 94,217,207,241,  6,139, 52, 26,220,172,185,108, 38, 42,
-240,215,109,202, 85,115,197, 70, 31,115, 58, 85,247,157,235, 37,208, 41,158, 40, 67,173,167, 88, 83,242, 14,241,195,136,176,156,
-148, 88,181, 53, 23, 77,134,217,240, 30, 97,  0,184,207, 57,154, 83,149,212, 70,185,225, 48,123,116, 94,219, 79, 51, 59,157, 64,
- 34,179,201,192,158,161, 56, 83,166,157,144, 78, 46,143,185,100,230,152, 30,191, 48,225,116,114, 76,253, 76, 12, 81,156, 41,220,
-207, 82,223, 31,  1, 88,187,114,222, 38,130, 40,188,179,183,119,189,137,131, 19,146,128, 19,142, 24, 17,  2,  2, 20, 34, 26, 16,
- 66, 28, 66, 52,252,  3, 10,132, 16,  8, 36,132,132,232,104, 41,105,248, 15,208,240, 19,104, 41,104,136, 16,132, 16, 33, 14, 67,
- 78,199, 78,178,182,247,240,236,201,123,207,187,193, 18, 45,157, 37,219,205,211,204,187,230, 59,254, 79,126,255, 55,215, 75,125,
- 92, 83, 49,151,100,220, 53,  3, 97, 25,195,153,245, 25,242,253,117,230,203,183, 45, 44,255,175,184,251, 85,254,108, 77, 27, 63,
-104,142, 85, 19, 90, 96,145, 60, 24, 33, 26,210, 95,118, 89,127,189,193,224, 81,145,239, 51, 10, 39,176,168,165, 23,187, 81, 64,
-252,180,  4, 50,  8,109,240,147, 46,250,151,167, 61, 31,200,172,150,231,164,183,  4, 33,177,241,250,206, 10, 92,108, 47,114, 85,
- 89,245,208,198, 37, 38,206,  2,185, 15,136,153, 66, 39,100,156,202,222, 97,102, 18,  5, 87,150, 36,150,225, 40, 33,183, 22, 13,
-197, 42,224,214, 27, 65, 42,112, 47,227, 20,237,147,209,164,  5,107, 54,138,237,137, 12,154,243, 27,215, 47,191,126,245,242,246,
-157,123, 51,213,234,194,194,151,141,  6,170, 11,225, 82, 69, 79,160, 69,130, 27,205,185,  8,253,162,174, 74,134, 33,115, 30, 59,
- 78,124,247,214,221,135, 15,158,236,236,116, 70, 71,199, 32,184,139, 75, 95,116, 53,181,160,132,104,130, 89, 80,112,163,143,104,
-  7,129,  7, 33, 20, 24,175, 11, 53,135, 13, 15, 21, 93,199,197, 37, 78, 42,133,248,120,140,142,225, 65,128, 90,127, 48, 76,147,
-196,134,160, 68,154, 33,233, 66, 36,106,146, 65,110, 27,126, 27, 13,172,113, 75,163,203,150,219,117,224, 84,181, 60,  4, 12, 16,
- 25,152,141, 88, 99, 14,239,  4, 84,194,201,138, 25,167, 17, 67, 53, 85, 85, 71,234, 16, 46,124,  3, 68, 34, 33, 50, 93,204, 64,
-197, 66,172, 48,249, 99,237, 83, 24,241, 98, 97,224, 88,229, 56,252,102,187,211,180, 61,155,135, 30,244,233, 60,116, 33,195,  4,
-100,109, 60, 96, 88,221,192,131,243,110, 42,134,174, 24,  3,186, 69,230,218, 62, 36, 80,200,191,245,118,189,227,182,182,218,155,
-112,242, 35, 84, 66, 76,160, 18,107, 10,105, 77, 39,136,134, 34,165,226,224,226,201,171,136,232, 71, 61, 55,244, 21, 52,212,162,
-165, 89, 62,162,200, 35, 36,213, 11,233,185,153, 11,123,138, 37, 30,  5, 72,221,101,108,223,208, 62,215,247,  6,205,193,179,213,
- 51,227,165,177,179, 71,230,126, 53,151, 75, 70,113,203,181, 77,221,156, 26, 61,220,236,108, 79, 12,239,111,116, 26,231,103, 47,
- 45,253, 94, 20,101, 41, 65, 34, 50, 90,180,107,178,234, 67,142, 34, 62,203,186,189,254,181,182,184,178, 94,131,134, 26, 46,238,
-233,195,167,230,127,124,248,177,241,253,103,189,102,123,173,205, 22, 84, 47,182,229,108, 83,235,200,102,171,179,171,219,107,211,
- 19, 71, 57, 15, 52,136, 30,106,163, 35,146, 86,200,149,105,119,101, 77, 42,229,131,189, 55, 91, 93, 96,215, 78, 20, 62,172,110,
-214,125,223, 14,184, 41,153, 80,205, 97,248,244,163,168,205,187,203,142,123,121, 66, 88,234,124,123,191,182,241,166,182, 12,127,
- 24,179, 44, 89, 76,187, 49,251,102,243, 38,247, 86,218,157,118,200,203,162,120,127,174, 58, 61,110, 76,150,213,201, 61,133,242,
-128,  6,129,134, 81, 37,243,119,237,249,138,244,166, 97,252,128, 74,  6,138, 44,193, 81, 52, 53,217, 82,148,189,165,194,244,161,
-145,182,195, 63,175, 54,177,215,143,138,107, 62, 52,239,201,232,224,184,156,136, 11,205,229,249,198,206,211,103,143,159, 63,122,
- 49,103, 94,217,146,107,111,221,119, 55,167, 46, 76,237,175,172, 52, 54, 18,194,176,147,190,  6, 17,174, 19,116,169,134,132, 24,
-166,  9,196,217,  9, 92,212,224,139,131,145,210,120,195,110,194, 76,131, 23,146,176, 50, 49, 57,163,226,164, 69,  2,153,117,  4,
-161,155, 97, 28,103, 76,221,204,118,148,245,203,167, 83,239,153, 26, 10, 10, 76, 66,106, 24, 50,134, 16,159,157,231,119,135, 59,
-112,174, 38,135, 39,219,112,102,  8,202, 65,  6,160, 73,254,104,151, 77,144, 80,177,160, 43, 71,227, 95,145, 28,104, 34, 68,208,
- 67,187, 32,102,162,  6,189, 77,130, 72,171, 24, 18,230, 11,221, 36,205,120, 86,121,102,239, 77,  2,140,229, 15,218,164,  9,132,
- 29, 89,165,124,192,118, 91, 36,233, 30,247, 28,117,122,137, 48,217,  5,143,167,100,152,158, 17,248,255,213, 31, 72,255,  8,192,
-217,181,180, 54, 17, 69,225,153,201,244,206,100, 38,175, 54, 73,155, 62,172,210, 46, 68,164,136, 40, 86, 91, 16,235,171,116,171,
-155,138,  5, 21,252,  1,226,198, 86, 10, 82,172,160, 86,220,248, 27,220, 11, 86, 20,  4,139,219, 34,138, 82,211,151,109,218,216,
- 87,250,176, 73,218,100,222, 19,207,185,119,210,135,232,198, 77,  8,116,146, 78,102,230,158,251,157,243,157,243,125,255, 25,223,
-249,127, 56,239,  9,123, 34,251,222,106,212, 95,177,190, 39,215,190, 59, 43,189,251,215,242, 54, 32,240,229, 16,143, 52, 61,199,
-108,105,  4,193,155,208, 96,196,132,195,166,126, 89,  9,131,130, 24, 68,207,180, 47,194, 41,255, 39,129,178,166,251,115, 12,108,
-148, 52,118,206,162,172, 69,204,197,  2,113, 34,202, 58, 34,184, 29,  3, 17,220, 66,227,161,154, 34, 64, 63, 74, 36,  1,178, 67,
- 80,142,217,150,187,171, 91, 15, 96, 86,244,151,112, 14,  3,235,140,126, 73,210,121, 72,120,241, 38, 19, 34,134, 20, 18,196,230,
-112, 81,146, 81,170,  9,246, 96,  3,141,210, 56, 17, 69,180,  5, 63, 28, 16, 32, 17, 85,174, 10, 34, 74,106,168,142, 12,244,223,
- 31, 30,126,253,246,205,240,249,142,142,174,206,206,201,201,241,133,165, 21,  1,123,251,124, 84,234, 13, 35, 53,173,227,251,116,
-195,222,202, 27, 55,186,187,123,186,175, 61,126,254,244,209,208,208,135,145,145,169, 31,211,182,165,117,180,181,222,234,185,198,
-217,230,207,116, 58, 18,  9, 61, 25, 24,236,186,120,105,108,236, 91, 65,211,164, 10,241,225,189,187, 15,250,122, 57,199, 72, 78,
- 36, 67, 42,241,188,  8, 75, 28, 65,214, 12,246, 24,188,173,176,158, 81,227, 69,179, 32, 38, 66,120,210, 45,131, 10,231,243,140,
-151,134, 69, 24, 11,196,242, 58,132,123,116,224, 43, 26,133,198,104,211, 90, 46,  3,231,  5, 24,156, 47,211, 22,138, 28,160,182,
-233, 16,158,173,171,237,221,233, 76, 10,155,172,233,252, 20,128,146, 88,184, 26, 94,233,253,226,240, 61,199,165, 50,179, 91,219,
-185, 10,145, 68,  3,113, 42,186,109, 50,201,126,248,126,148,196,227,113, 38,  5, 30,  1, 52,176,183,117,205, 49, 32,  4,155,182,
- 85, 27,169, 93,207,175,162, 90,128, 63, 44, 19, 63, 44, 78,139,142,167,  1,212,132,227, 67,106, 68,183,182, 96, 37,147, 10,  9,
-226,254,244,226, 56,108,  3,186,165,159,104, 62,181,176, 49,  7, 33,163,104, 98,251,150, 76,148, 11,199,206, 37,231,191,103, 11,
-155,139,107,105,147, 85,122, 57, 62,167,109, 82,114, 30, 18,154,226,252,234,124,162,178,246,203,236, 87,120, 78,178,133, 44,124,
-231,218,246, 90,193,208,224,226,152,142,253,105, 98,244, 64,188, 17,178,  4, 88,146,137, 72,117, 75,235,217,185,212,148, 97, 25,
- 76, 75, 69, 33, 74,208, 31,146,136,  2,207, 85,219,145,211, 99,115,201,165,236, 50,205,123,152,156, 56,118,175, 67,176,160, 63,
- 86,155,207,164,117,219, 90,220, 88,130,220, 37,172, 70, 26,226,141, 40,108, 75, 47,100, 93, 52,  1, 25,131, 95,194,193,108,212,
- 97, 54,114,  2,103, 43,129,202, 88,201, 62,217, 94,189,178,188,158,213,140, 77,200, 28, 93, 94,179,177, 91,182,232,152,155,122,
- 81,179,220,203,245,137, 90, 85,106, 73,168, 65,128,  7, 14, 87,163,194,201,248, 98,138,242,126, 38, 51,147,203, 42,190,210,205,
-195, 13,207, 58,143,158,105,130,156, 66,174, 10,201,168,255, 12, 64,  6,213,129,217,172, 39,239,185, 53, 83,106,145,  9,204, 65,
- 54,  8, 73,100, 64, 34, 97, 69,172,  9, 41,245,135,162,156, 74, 62,142,206,234,148,191,241,185, 34, 17, 14,174,195,213,182,173,
-  0,239,127,151,250, 28,115,155,111,247, 95, 31,236,123,113,167,185,247, 85,246,229,172, 61,119, 37,113, 60, 83,252,149,215, 10,
- 46, 85,130,100,244, 41,188,162, 69, 53,186,166, 56,176, 86,240,242,226,142,237, 26,244,128,130,169, 37,170,234,242,216,133,226,
-  6,229, 32, 85,185, 40,178,201, 91, 22, 51, 72,  5,129,207,209, 58,134, 87,142,103,182,209, 46,245,231,115,153,215, 52, 50, 82,
-  6, 45, 94,194,175,144,116,175,126,226,201,199, 64,220,205,  1, 18,199,134, 26, 44,139,215, 71,235,225,131,134,101,122,229,120,
- 10, 95, 28, 44, 97,122,166,121, 20, 42, 32,  1,230,141,222,  9, 30,127,139,131, 87,216,  1,196, 10, 12,229,160, 78, 43, 60,212,
-118,133, 41,101,120, 69, 33,183, 76,223, 66,106,178,165,229,177,167,205, 41,253, 97,121, 90, 78, 53,184,168, 26, 21,125,196,116,
-116, 70, 42,236,139,238, 52,167,249, 45,  0,105,215,242,211, 68, 28,132,187,175,110,183,187,219,165,143, 32,149,130, 16,208, 72,
- 12, 42, 33, 18,245, 34, 32, 70,241,113, 50,122,225,100, 60,249,  8, 68,188,105, 60,152,104, 34,122,241,194,159,224,149,120, 48,
- 38, 30, 37,162, 72, 66,124,159,136, 81, 81, 35,150,176,180,108,187,191,118,183,219,117,102,182, 69,144,163,215, 77,147,118,183,
- 59, 51,223,252,230,155,239,251,223,252, 30, 36,119,  5,138, 55, 82, 89, 42,155, 85,192,184,205, 25,253, 95,132, 78, 35, 12, 94,
- 14, 41, 17, 94, 47,227, 42, 41,191,126, 61, 84,199,236,245,210, 20,152,244,  2, 50, 14,254, 61,158, 56, 24,124, 82, 75, 65,223,
- 26, 72, 40,173,215,  9, 63, 20,156,186,113, 94,221,180,132, 11,109,221,210,173,229,110,110, 75,  1,  2, 12,192, 92, 91, 37,129,
-233,186, 61,174,223,104,164,179,249, 95,129,112, 82,109, 99,130,216, 58,104,245,199,  9,244, 49,156,190, 16,119,203, 23,112,251,
-199,143,235,178,162,225,192,148,167, 61, 84,145,134,221, 72, 56, 65,177, 57,158, 28,156, 81,123,  0,229,218,101, 30,176, 15,128,
-122, 69,174,170, 74,200, 41, 21,134,143, 15, 52,103,210,247, 38, 30,204,205,191,155,121, 53,123,168,239,224,224,145,254,143,159,
-222, 88,107,102, 88,146,170, 85,161, 66,179, 30, 40, 54,142,235, 47,175, 20,206,157, 57, 53, 54, 58,126,119,226,254,212,147,103,
-208, 81, 71, 20, 81, 18,253, 84, 66, 29,189,114,121, 96,240, 68,123,199,206,169,199, 79,251,122,251, 46, 93,187,222,190,171,107,
-105,241,219,235,249,183,137,134,228,248,216,104, 75, 91,107, 92,147,167,167,159,151,113, 41, 16, 33,138, 16,152,156, 19, 29, 19,
-210, 14,114,112, 28,223,119,185,136,168, 58,110,153,136, 70, 53,250, 47, 46, 14, 34,129,193,133, 20, 67,146, 70,104,213,228, 97,
- 28, 66,152,121, 81, 57,134,218,156,142, 29,204, 88, 92,244, 29,193, 46,229, 75,246, 51,115,138, 56,120,230, 67,186, 28, 67,  7,
- 90, 49,108, 57, 22, 32, 47,192,206,165,114, 17,174,192,  3,147,194, 18, 29,220,121,221, 59,246,114,156,176,198,114,212, 71,121,
- 36,165,128, 99, 12, 37, 28, 65,195, 82, 98, 74,192,251,221,160,198, 85, 89, 63,127,113,100,238,229, 44,148, 76,228,158,186,142,
- 22,213,237, 50,148,191,114, 58,217,156, 47,172,  0,242,221, 22,111,206,219,104,220,129, 13, 10,249, 88,194,215,193,239, 73,234,
- 88, 87, 82,177, 70,  8, 91, 40, 15,191,204,159, 56,  6,193,150,139, 30,  7,134,174,215,209,212, 97,163,136, 96,216, 33, 14, 79,
-111,231, 62, 69,138,124, 55,127,144,239, 46,110, 31, 66, 55,153,212,227, 69,167,  4,245, 38,207,114,112,227, 75,185,236,194,194,
-251, 98,137, 65,246,129,231,131, 38,200,118, 14,146, 53,244, 49, 78,213,205,230,150,  1,158,227, 90,130, 20,214, 85,  3, 85,230,
-229,232,106,209,130,103, 11, 21,162,232, 22,144, 49,197, 11,201, 88, 98,141, 21,172, 18,160,251, 44,137,195,  8,109, 77,237, 75,
-230,111,  0,155,128, 31, 49,120,189,146, 72,227,248,168,210,176,163, 90,233, 58,214,108,152,  5,168, 46,174,235, 21, 42,206,226,
- 90, 97,209,178, 76,219, 94, 97,120,112, 49,178,187,101,127, 90, 75,104, 34, 99, 94, 90,143,115,130,200, 92,167, 65, 84, 62,254,
- 48, 47,244,100, 30,158,238, 62,123,184, 45,189, 93,147, 99, 34, 30, 29, 18,199, 70,172,233,241,109, 32,147,  5,  1, 41, 32,103,
-  0,128,130, 42,  3,114,151, 12, 53,156,130,122,208,146, 12,181,166, 62,188, 88,248,178,108,  1,218,135, 52, 13,193,104,218,  6,
-243,188,161,158,129,182,120,230,206,204,163,225,254,147,195,  7,134,110, 79, 78,222,234,188,122,243,235,141,164, 22,235, 51, 50,
- 89, 27,217,253, 14, 49,179, 16,191, 35, 57,160,130, 30, 35, 94, 37, 44,171,144, 97,161,224,185, 53,137,118, 31,250,102, 72,245,
-171, 44, 31,140, 31,109,136, 25, 86,164, 12, 30, 80,200, 81,137,132, 58, 36, 66, 35, 53,130,164,175,202,170, 22,137,176, 82, 73,
-226,197, 61,153, 61, 57,203,164, 93,214,154, 64, 47, 36,247, 32,231, 24, 81,131,149,109, 67, 49,112, 30,190,126,219,104,196, 87,
-101, 21, 22,236, 52,209, 98,  9,130,106,200, 56,  9, 53, 85, 44, 91,180,148, 80,221,232,199,244,215, 72,  2,194, 72, 20,143,118,
- 15, 65, 13, 13,104,240,117,106, 62,  2,156, 42,157, 16,214, 53,203,124, 61, 98,144,155,185, 75,188,143,128, 14, 90, 35,231,111,
-112,203,224,  2, 60,  0, 97,  5,239,213,250,122,110,136,175,111,  3,213,147,253, 31,  1, 72,187,158,159,166,225, 40,222,118,221,
-218,110, 93,  7, 99,  3,  7,168, 35,  1, 61, 24,163, 96, 60,112, 83, 19, 61,120, 81, 76,188,121, 86, 99, 36,222, 77,140,241, 47,
-144,139,  7,163, 71, 98,162,241,230, 69, 61, 24, 19, 18,  2,152,120, 81,  8,200,175,  0,  3, 54,112,172,108, 93,215,118,237,183,
-190,247,190,131, 96,226,205, 11,151,166, 25,109,250,125,239,243,222,251,188,207, 71,254,255,177, 42,201,126, 50, 55,244,196,127,
-169,183,139,255,238,223,224,125,100, 29,214,148,132,136, 33,118,184,  2, 46,230, 29, 49,214, 16, 15, 57, 49,137,104,210, 70,219,
- 16,190,205, 68,242,225,168, 27,227,193,179,152,214,158,200,165,211, 48,157, 74, 36,123, 26,240,109,130, 16,151, 60,249, 98, 20,
-  3,196,  7, 87,136,124,253,151, 51, 96,120,100,166, 34, 30,200, 78,162,109,  8,122,198,187,180,  6,134,241, 13,  2, 90,201, 44,
-228, 59,251,215,118, 87, 67,242,107,245, 57, 41,  8, 59, 18,126,200,142, 40, 18, 75,129,196,163, 35, 41,100, 39, 84, 56, 30, 33,
-149, 79,200,209,246, 14,228,162,209,205,142, 80, 15,170, 56,201,188, 85,133,116, 63,128,242,183,111,142,192,197,203, 87, 46,189,
- 25, 31,135,  7,235,201,101, 45,107,247,249,216,179,209,135,247, 31, 61,184,243,226,229,171,205,173,114, 40, 40,136, 75, 68,185,
- 14,176,173, 90, 59,119,230,236,147,199, 79,223,189,127,251,249,203,215,118, 35, 30,141,224,108,212,107, 50,148,231,142, 39,165,
-152,114,172,179,219,208, 53,145,121, 77,171, 34,163,156,124,  0,181,130,174,  6,229,210,122, 79,111,166,110,253, 78, 37,177,194,
-128,127, 12,238,162, 70, 23,186,176,210,  9,  9,229,152, 16, 85,133,170, 21,216, 94,149, 43,241,225,204, 62,  8, 91,219,196, 98,
-232,186, 13, 17,149, 49, 80,137, 23,146,110,189, 81,203,182,231, 74,149, 77,203,173,122,126,204,136,183,153,246, 30, 30, 88,252,
-170,177,192,199, 49,  6, 42,136,161,130,163, 43, 57,  2,138,246,217, 90, 52,225,250, 13, 37, 18, 59, 92,130, 71,221, 20,198,178,
- 70,219, 74,113,137,183, 35,  3, 34, 27,196,225,168,135, 68, 13,151, 88, 20, 48,191,172,192, 25, 27,204, 15,253, 92,255,177, 82,
-252,181, 52, 54, 15,111, 19,210, 76, 66, 51,  6, 79, 95,152, 90,152,132,252,122,190,239,226,236,198, 44,224, 98, 72,178,  0,136,
-180,168,230,133, 46, 45, 91, 69, 80,105,144,161,189,215,190, 85,129, 74,  8,155,233,204,255,182, 56,  5, 40,158, 83,229,250,115,
-  3, 59,102, 17,242,141,174,104, 52, 58, 11,211,201, 14,199,109, 44,151, 86, 11,229,109,172, 81,136,  2,197,181, 77,160,204, 41,
-154,174,235, 57,149,208,116,124, 63, 66, 86,218,105,221,216,183, 45, 27,144,169,  8,225,190,228,120, 46, 60, 87, 91, 34,  5, 81,
-222,180,171, 97, 68, 66, 55, 71,230,236,163,100,141, 32, 57, 82, 54,149, 85,100,117,163, 92,240,253,166, 97,164,  0, 53,171, 49,
- 93,139,153, 39,114,125,197,221,109, 72, 27,112,248, 23, 10,243,183,134, 71, 22,183,150,230, 54,230, 18, 74, 92,143, 27,158,103,
-225,251,141,168,125, 70, 32,244,180,119, 13,157,188,209,155, 28, 92, 75,127, 47,236, 76,174,149, 38, 54,253,229, 74, 75,244,117,
-187,102,159,234,200, 47, 20,119,218, 81,146, 16,208, 61,228,193, 32,147,145, 95,223, 27, 78,247, 27,200,112,193,158, 21,195,191,
- 62, 58,156,161,182,  1,162,137, 64, 66,225, 53, 40, 30,169,145,142,118, 29, 98,139,120, 32,241,166,124, 68,210, 84, 33,103,  8,
-221,153,181, 79,115, 51, 11, 91,138,170,194, 87,228,161, 37,135,237,251,141,122,179,241, 97,230,227,128,158, 55,133,202,232,213,
-187,194,132,160, 11,153,206,148,188,227,172, 92, 63,126, 13, 78,145,195,184,  9, 31, 25,146, 96,194,100, 70,220,128, 32,110,122,
-251, 77, 76,135, 62,149,187,248, 85, 16, 83,140,117,165,115,155,149, 45,194,251, 76,100,173,110,110, 92, 81,242,153,252,108, 97,
-150, 52,142, 15,212,106, 14,120, 28, 62,223,254,134,194, 61,240, 86,118, 87,155, 45, 46, 59,141,214, 25,141,255, 69,142,221, 68,
- 53,170,229,210, 61,181,109,139, 70, 50,  2, 13,143,  5,139,246,245,196, 86, 31,133,219,193, 98, 85, 86,169,149,201, 30,190,229,
-249,160,107, 41,  8,247,212,206, 33, 47,  9,137,155, 36,251,211,139,211,156,204, 77,216,  8, 95, 93,192, 91,248,232, 63,101,192,
-215, 85,119,170,240,187,166, 93, 38,142,  6, 22, 31,212,147,105,105,221, 28,238, 24,113,131, 86,106, 58, 64, 76, 67, 87,  6,244,
-159,226,215,217, 17,123, 38,186,243,143,  0,156, 93,219,107,211,112, 20, 78,154,164,205,173, 77, 91,186, 91,101, 43, 78,145,213,
- 61,120,163, 40, 34, 27,226,188,224,196,127,194, 63,100, 47,162,  8, 42, 40, 40,190,249,162,224,133,233, 94, 28,226,152, 47, 62,
-137, 56,134,224,132,137, 91, 59,183, 98,183,118, 77,219,180, 77,155,180,241,156,147,164, 19,246,230, 75,161, 16,146, 38,205,239,
-252,190,115,206,119,190,239,127,240, 59,187, 79,177,221,217,163,207,239,171,240,251,223,124,143, 86,206,  7,233, 52, 44,205,  8,
- 26, 27,107,195,173, 49, 77,234, 61,246, 84, 52,123, 72, 63, 64, 18,  4, 33,142,145,  5, 70, 20, 80, 87, 69, 86,  5, 45,  4, 25,
- 33,206, 82,211, 92, 27,  2, 45,100,124,243, 68,211, 96,123,181,122,183,199, 75,236, 26, 34,175,  8,182,231,121,184, 55,  0, 27,
-150, 53, 52,249, 35,175,122,111,138,138,142,128,213,238, 16,133, 69,224,120, 11,123,242,108,165, 94,166,135, 27, 96,124, 45, 62,
-108,109,  3, 34,101, 93,114, 33,235,139,163, 16, 86,103,152,152, 38, 75,146, 64,234,149, 88, 49,162,233, 63,135,166, 52,145,125,
-168, 72,108, 88,229, 21,137, 83, 69,116,182,163,  9, 79,136,239,194,149, 11,151,175, 78, 95, 91,254,186,244,236,197,107,164,129,
-144, 53, 73,126,167,242,115, 53,123,126,242,226,225,131,233,149, 31,171,186,174,135,130,128,218,172,174,109, 77,156,201,220,191,
-125,115,113,113,225,222,163,199,  8,169,120,  1,155, 50, 29,167,101,117, 43,134,153, 74, 14,167,199,198,231,231,223,189, 95,248,
-216,172, 55, 70, 83,131, 27,185, 95,115,115,111,224,106,  1,206, 54, 42,250,238, 78,225,213,236,236,250,198,182,101,115,173, 22,
- 90,117,  3,100,178,108,200, 33,  0, 74, 59,144,222,227,124,178,217, 65, 54, 63,122, 31,119, 92,224, 65,  8,222,115,156,233,146,
- 89,172, 87,152,164,182, 80,221,172,187,253,126,216, 41,169,114,210,130, 40, 79,  7,119,130, 60,198, 77, 27, 13,117, 81,164,129,
- 92,195, 24,148,120,179, 77, 77,142,163,137,146,133,188, 96,215, 29, 13,226, 30, 60,173,146, 94,  4,196, 61,220,151,210, 27, 58,
- 44,120,139, 36,151,109,172,179, 90, 17, 41,170, 73,145,114,189, 12, 40, 24,128, 12, 18,144, 56, 78, 10, 41,  2, 36,  4,205,106,
-185,182,139,226,218,172, 19, 87, 19,219,149, 60, 97,  7, 14, 48, 93,211, 52, 68, 81,137, 40, 17,145, 23,189,177, 17,248,111, 56,
- 30,192, 50,121,221, 53,176,245, 29,148,162, 74,220, 68,181, 12, 22,221,141,109, 43, 38, 71,221,146,238, 86,121,203, 34, 78, 78,
- 88, 14, 91, 22,252, 66, 38,213,119,144,135,109,208,233,106,138, 86,208,113,128,126, 40,145,204,140,101,178,127, 54, 84, 81,134,
-203,  2, 24,207,109,163, 71,235,120, 42,189, 94,200,186, 12, 43, 41,168, 84,205, 90,127,100,  0, 93, 35,  2,206,161,228,145,146,
- 81,134,  0,  4,155,  4,132, 25,  3,133,122,112, 93, 67,240,202,239,230, 91,182, 85,107, 84,225,133,135,128,114,244, 64,122,179,
-148,223,169,149, 54, 75, 91,154,170,169, 18,228, 85, 77,155,100,126, 97, 21,159,148,248,196,244,  8,106, 70,198,130, 90, 50, 50,
- 54, 20,205, 36,212,201, 99,167,238, 62,125, 50,115,253,236,183,207,203, 95,114,197, 27, 19,167,203,213,182,137,141,150, 54, 60,
-142, 19,163, 67,233, 75,105, 41, 29,103, 20,142,  9,161,188, 31, 42,  9,243,110,131, 44,224, 17,160,112,242,  8,189, 89, 56, 28,
-219,192,128, 30, 20,224, 81,195,171, 43,132, 68,129, 87, 69, 86,147,152, 84,130, 73,245, 23, 62,124,127,185,176,226,208,120,  5,
-102,171, 88,123,178, 98,252, 72,169,141,  1,  0, 18,238,183,107,159, 30,222,122,176,244, 60,187,182,250,123,106,112,234, 78,110,
-230,220,192,113, 53,192, 26,216,162, 64, 62, 25,124,138, 33,153, 74,112, 40,156,105,218,109, 49, 40,193,182,106,180,234, 54, 89,
-121, 96,175, 10, 64, 27,238,214,  6, 41,176,203, 49, 37, 10,233, 78,135, 56, 14,  5,200,114, 28,223,231,211, 21,  1, 38, 61,  1,
-154, 51,183, 90, 88, 96,196,184,130, 19, 27,254,112,235,158,224,172,103,145,138,  6,138,197, 90,145,241,116,194,240, 29,137, 72,
-154,141,132,225,142,219, 79,234, 73,128,209, 75,220,237, 21,191, 59,100,225, 68,140,199,128, 87, 80, 32, 68,228, 96, 97,199,244,
-  9,239, 84,177,241,  8, 58, 24,242, 97,141,144,162,120, 39, 10,183,105, 26,112, 18, 76,151,233,114,190,115, 72,175,  1, 28,248,
-167,195,232,  1,203,174, 55,200,229,247,  5, 60, 34, 61,158,255,175,  0,148, 93,203,107, 19, 65, 24,159,221,205,206,100, 51,102,
-179,105,154,182,150, 90,170,130, 10, 85, 65, 65,188, 41,234,217,139,130, 21,  4, 81,161,244, 15,208, 83, 47, 94,196,179, 55, 79,
- 30, 68,252, 11,172,130,224, 77,188,212, 23,130,158,108,141,212,119, 95, 73, 54,187,217,157,221,201,174,223, 55,155, 71,149, 34,
-  8, 33,228,144, 77, 54,155,157,153,239,247,205,239,241,127,252, 72, 78,185,162,150, 39,127,133,172, 26,100, 11,229,112,187,201,
-189,247, 90,223,210, 35,234, 86,249,  6,140, 58,212,172,234,221, 93,120,178,181,161,141,  6,230,153, 38, 44,147,170,102,125, 24,
-170,153,  5,152,229, 25,210,215,154,114,179, 37, 93, 45,235, 95,170, 36, 81,100, 41,169,107,154,100,206,253,136, 18,176,249, 14,
-227, 25, 89,240,218,192, 91, 24,109, 66,243, 37, 79, 52,179,139, 88, 46, 12,213,219,155,138,249, 66, 80,209,131,253,129,200, 32,
- 57, 12,237,213,254,165,198, 85, 10,218,180, 43,230, 35,186, 73, 13,184,  3,166, 70, 43,188,196,189, 40, 74,115, 68, 17,  7,160,
- 16, 67,171,244, 60,211,113,151, 80, 89,206, 40, 72,130, 40, 69, 68,169,140, 83, 17, 68, 38, 51,170,206,208,218,198,166, 16,210,
- 48, 77,197,230, 68,144, 22, 75,113,236,200,129,185,217, 57,198,172,133,133,167, 47, 94,191,161,  6, 61,115,250,212,204,249,243,
-139, 47, 23,111,222,186, 29,202,152, 82, 83,185, 63,198, 57,244,251, 79,124, 95, 88,140,237,157,156,168,125,253,134,109, 16,211,
-112,138,220, 48, 18, 41,  5,165, 84, 68,157, 32,  4,  4,172,  5,161, 76,240,236, 50, 86, 32, 34, 33,169,220,181,177,120,128,251,
-214, 76, 98, 47, 14, 93,101,133, 45, 59, 73, 95,169,221,231,162,162,216,154, 97, 29,156,116,254,216,139, 81,188, 14,135, 87,220,
-112, 19,254,  9, 10, 64,197,  4,144,128, 18, 51, 24,165,217,134,103,182, 27, 93,182,202,110, 80,135,226,221,230, 14,207,243,149,
-245, 21,180,165,213,153,129, 84, 31,230,161, 90,149,156, 56,120,230,249,251,103,197,130,221, 10,176,125, 49, 98,143,192,145,117,
-127,  3, 64,116, 61,168,219,121,  7,144, 28,148,177,  1, 64,  1,106,185,200,155,150,147,163,187, 97,150, 10,164,175,230, 74,173,
- 98, 87, 83,140,200,176,106, 63, 63,193,  7,195, 82,177,230,174, 14, 23,171,240,206,118,232, 41,211,177, 68, 79,117,228,164, 26,
-180,128, 94, 49, 18, 78,137,211, 29,109,225,193, 42,197,114,152, 98,229, 20, 74, 20, 87,208,  8,138, 95,101, 92,172,181,195, 32,
-111,154, 65, 20,194,225, 83,163, 83, 75, 63, 62,162, 98, 86,203,149,237,138,219,118, 67,108, 88,117, 42,246, 48,103,214,151,245,
-239,251,199,247,173, 53, 87,225,132, 97, 38, 26,117,198,154, 42,108,182,238, 53,213, 64, 36,147,149,137, 80, 10, 76,214,182,203,
- 81, 36,224, 47,203,226,182,212,221,  8, 95,129, 19, 36, 38,202, 14,239,218,104,173, 21, 25,255,222,248,165,  8,  5, 68, 17, 91,
- 17, 14,134, 29,121,173, 90,157,190,115,156, 52, 91, 68,248, 68,198,164, 17, 18,215, 39, 95, 55,200,236, 13, 50, 50,253,224,202,
-165,203,247, 31, 79,151,121,153,210, 49,110, 13,197,226,250,185, 11,251, 46, 30, 37,162, 70,178, 93, 91, 25,  1,252,193, 71,140,
-124, 74,124,192,130, 31, 41, 97,115,156,116, 83, 27,244,222,208, 52,149,196, 35,111, 16,187, 64,118, 58,240,188,252,240,213,189,
- 39,239, 12,150, 43,193, 15,134,107,134,196, 92,184,163,224,240, 61,203, 13, 86, 54,249,226,234,231, 71, 43, 31,226,165,245,249,
-147,119,247,179, 67, 86,169, 49,243,246,236,252,225,171,  2, 80, 28,218,131,171, 30,117,154, 20, 57,247,  3,159, 50,  6,232, 80,
-166,178,104,149, 90,194, 11, 35,152,239, 84, 46, 70,182,  1,139,145,197, 26,114,156, 66, 15,170, 52,228, 43,147, 78,211,111, 64,
-  5,  6, 75,117,128,205,150,190, 16,105,187, 73, 73,207, 98,171,  7, 42,168, 44,251, 71, 51,250,138,161,158, 33,153,146, 83,193,
-202,  4, 21, 70,208,  9, 49, 77,138,200,204,155, 62,233,217,201, 15,120, 53, 90, 58, 86,218,169,212,  9,105,223,231,182,155, 61,
-217,255,162,  4,150, 63, 88, 29, 45,192,112,217,231,119, 20, 18,130,197,205, 52,204, 49,103,188,182,190,172, 39,  0,169, 11,126,
-164, 18,101,211,191, 90,235,106, 27,164, 27, 27, 58, 32,252,104,  3, 21,171,214, 11,207, 32,191,  5,160,236,106,122,154,136,162,
-232,155, 78,167, 51,237, 76,237,148, 82,138, 16, 52,  6,197,165, 26,191,162,198,133, 11,221,224, 82,113,239, 15,208,149, 27, 99,
-226,206,165, 27,227,210, 16, 19,130, 97,161, 38,184, 55,193,152, 72, 52,113, 65, 98, 74,  0, 45, 33, 64,161, 80,166, 31,211,233,
-124,143,247,222,215, 22, 48, 38,198,132,174, 40, 83,242,122,223,189,231,221,119,238, 57,255,151,223,117,  5, 22,186,201,243,187,
-240, 39, 51,242,159,201,157, 31, 96,176, 91, 18, 68, 61,187,215,168,215, 26, 23, 89,236,128,158, 48,158, 58, 36,148, 46, 97, 97,
- 71,155,158, 58, 81,212,124, 39,  3,106,140,175,132, 40,231,149,188,156, 16, 43,237, 77,178, 49,100,212,207, 66,  2, 17,108, 66,
-159,243, 86,121,138,199,137,106,156,143,143,132,253,166, 76,216,241, 45,161, 91,145, 40, 28, 56, 50, 88,105,108,198,208, 77,139,
-127,217, 17, 59,124,175,241, 87,137, 30,236, 14,193, 73, 34,112,137, 25,137,220,204,209,194,216,234,222,207,211, 67,185,225,163,
-250,142,  5, 56,137,137,113,  8, 68,128,237,130,170, 98, 71,215, 48,253, 54, 10, 35,138,  0,130,208,172, 74,194, 67,162,135,238,
-105,  0,101,  1,193,161,151,120, 66,194,154, 37,137,164, 85,  0, 27, 88,198, 98,211,223, 55, 48,113,231,238,245,171, 55, 72,142,
- 44,130, 44,240,126,118,118,122,230, 29,228,  2, 77, 69, 52,234,121,161,105, 57,212,191, 12,249, 34,194,195, 69,186,117, 70, 70,
- 27,164, 96,228, 67, 98,101,133,189,226,194, 27,209, 98, 76, 16, 37, 12, 32,248, 43, 84, 36, 38,157,108,  8,  9,128, 74,142,135,
-123, 40,176,156,168, 77,194, 34,216, 41,100,  8,161, 16,214,113,114, 13,242, 10, 52, 73,115,176,217,139, 33,  4,169, 16,254, 55,
-  7,105, 69,184,188,253, 90,206,104,213, 97,227, 13,103,143,  3, 12,183,156,  6,252, 86, 22,225, 52, 47,183, 61,147, 68,171,209,
-  4,110, 95,224,148,114,  7,234, 82, 73, 10, 50, 19, 92, 62,132, 29,144,188,119,128,164,118,234,155, 15,102, 10, 53,106,163, 43,
- 36,221, 60,210,127,252,220,216,153,111,197,239, 91,245,245,184, 24,111, 57,173, 39, 19, 79,167,230,166, 74, 91, 37,188,100,243,
-160,242, 37, 56,234,191, 56,118,121,161,180, 64, 30, 32,168,255,142, 83, 39,177, 48,167, 14,192, 39, 86,205,157,219, 23,198,171,
- 53, 99,169,188,168,167,178,199,242, 35,139,107,197,209,194,137,181,202,234, 96, 95, 97, 99,103, 93,142,163,155,226,217,209,243,
-203,107, 63,224, 57, 95,138,159,179,233, 62,203,177,168, 11, 32,168, 74,202,245,189,177,161, 83,155, 70,217,180, 91, 50, 30, 92,
- 92, 45,165,193, 34, 25,102, 45,151,214, 93,156, 18, 80,171,102,213,178, 45,212, 83,171,111,  3, 82,133,122,102,187,166,139,197,
-209,215, 85,125,215,172,202,177,120, 38,173,251,190,103, 90,200,177, 67,251, 59, 65,208,147, 58,  0,216, 82,101,  5, 22, 31,135,
-  3, 18,138, 26, 79,214,237, 58,178, 89,176,116,229,154,237, 93, 69,140, 65,  5,184, 21,215,110,190,188,198, 60,147,193,210,193,
- 55,101,217,172,217, 14,139, 43,243, 75,236,237,122,253,249,167,175,  7,163, 55,207, 88,197,217,102,  9,131,205, 79, 50, 49,129,
- 26,100,112,136,131,228,110,187,204,241,240,199,134, 92,143,184,151, 91,192,247,114, 11,102,118,136, 99, 25, 39,238, 88, 86,  5,
-216,206,170,173,185, 23, 31, 95,207, 21,149,148, 12, 85, 90,146,196, 40,140, 53, 60,191,108,186,203,181,230,162,209,130,  8,130,
-122,233,  4,238,196,240,253,153, 15,175,238, 93,122, 60,121,229,217,131, 95, 15,223,212,166, 31,157, 28, 47,219,123,252,198,146,
-252, 37, 67,174,247, 11,197,219,116,224, 25, 72,241, 13,136,164, 70, 19,172,232,183,227,147,250, 16, 66,142,174, 79, 19, 64,207,
-148,146, 46, 27,101, 44,136,252, 52, 73,183,164, 20,165,225,  1, 13,166, 14, 89,183, 75,253,232, 56,163,194, 91,149,132, 34,139,
-201,166, 83,239,136, 10,116,211, 59, 32,131,141,189, 45,220, 26,  2,119,  1,100, 92,  6, 63,136, 56,163,166, 35, 42,201,122,183,
-115,221,100,152, 73,101,146, 82,114,187,  1,101,152, 16, 62,137,167,116,  7,116,104,136, 70,224,  2,136, 29,179, 61,222,136, 39,
-129, 25,120,146,168,201, 42, 32,128,110,146,140, 14,245,195,187, 89,139, 26,200,135,140,143,216,254,212, 15,190,126, 11,192,217,
-181,180, 54, 17, 69,225, 59,175, 36, 51,147, 71, 77, 72,155,151,182,180,181,136, 80,  5,119,174,220, 20, 92,136,123, 65,252,  9,
- 46,220,232,202,157, 27, 65,253, 25, 22,244, 23,  8,174, 20, 20, 69,169, 84, 93,105, 91,219,218,230,157,102, 50, 73,230,102,102,
- 50,227, 57,231, 78,108,213, 34,232, 46,144, 48,147,185,115,239,121,124,231,156,239,251,159,249,166, 99,131,247,240,144, 66,224,
- 79,227,142,191,194,  6, 85,106,101,201,153,249,102,191, 38,253,202,  5, 25, 34,206,110, 14,125, 71, 10, 35,166,  8,141,233,212,
-237,137,129, 69,192, 38,202,170,148,246,136,230, 72,  5,191, 81,116, 69, 79, 39, 50,121, 61,215,116,170,237, 81,155, 81,183, 55,
- 82, 81,250, 67, 74,243,253,137, 15, 15,  5,190,255,179,193, 62,192,206, 69,  8, 49, 98, 96,116,  8,225,157, 12, 49, 75,242, 63,
-209, 95, 82,255,139,194,125,135,106, 80,248, 88, 56,243,162, 72,149,108,102,121,161,208,224,156,123,216,212, 26, 83, 21,161,183,
- 24, 79,224,174,131,131,131,140,197, 72,210, 24,198, 49,184,149, 57, 15, 69,155,  8,198,194, 72, 75, 19,249, 98,132,194,145,242,
- 20,199,157, 32,202, 76, 38,148,202,201, 82, 97,186, 56,242,188,173,173,221,189,106, 35, 80,112, 50, 20,118, 31,202, 84,  6,224,
- 39,112,178, 63,169,203, 38,216, 24, 77,  4,  6, 76, 64, 72, 40, 51,140,125,139,130, 72, 91,242,105,115,146,140,  3, 46, 40,134,
-237,112,192, 93, 76, 56, 61, 44,134,226,123,208, 98,140, 31,112, 23,135,170, 16, 39, 54, 19, 25,172,121,  8,115, 28,  9, 68, 68,
-224,166, 36,171, 36,  4, 43,  5,145,166, 37, 35, 79,137,144,142,170, 65,204, 59, 54, 98,166,130, 28, 76, 14,158,159, 64,210, 19,
- 70,159, 91, 56, 75,140, 44,111,178,194,162,108,152, 46,171,248, 99,183,146,175,236,183,246,117, 20,203,246, 52, 89, 93, 44,158,
-174, 29, 84,185,203, 33,  7, 23,181, 44,200,189,178,169,108,189, 91,133,149,135,172, 22,110,167,131,221, 83, 20,107, 96, 33,158,
- 99,183,251,238,208,136, 25,144, 47, 35, 37, 14, 31,192,177,  4,247,  3,239, 87,160, 67,196,214,137, 71,189,148, 41, 15,220,190,
-237,244,242,169,105,172,  7,140,  6,217,228,  9, 85, 86, 91,221,198,169,153,138,101, 91, 55, 46, 93,127,252,114,181,148, 41,192,
-114, 45,205,157,125,179,254, 34, 17, 55,102,210,249,134, 85,203,165,242,125,199,134,184,123,177,184,176, 89,221,128, 85,130,152,
- 67, 85, 85,176, 62,197, 92,113,202, 72,127,218,254,236, 33,107,174,152,185,  9,231, 11,243, 95,246, 55, 97,123,204,230,102, 55,
-234, 27,229, 92,105,175,  3,207,104,122,196, 15,  7,246,107, 74, 79,117,135, 61, 13,103,221,176, 53, 16,252,147, 25, 55,224,191,
- 65, 40, 63,112,236,165,210,210,247,214, 46, 60, 20,164, 41,117,171, 86,206,150,155,118, 29, 59,148,226, 49,124,189,114, 80, 26,
- 73,183, 30,172,176,156,203,236, 30, 36,113,204,225,172,207,217,118,227,222,234,235,187, 31,170,191,237,221,219, 23, 47,220,127,
-245, 30, 63,109, 63, 98,221, 62,150,171,124, 82,103,  5, 43, 15, 27,116, 36, 34,119,212, 64,139,252, 47, 73, 62,146,252,163,138,
-198,221,208, 89, 33,195,210,201,206,211,181,203,119,158,188,227, 56, 40,171, 17, 61,128, 31,252,109, 44,253, 90,246,102,167,171,
- 61,187,250,240,252,243,149,177, 94,191, 82, 92,182,252,225,185,185, 51,111,191,174,  9, 74, 37,138,174,144, 31,212,245, 70,142,
-195,167,103, 43,245,111, 59, 16,236, 80,171, 10, 78, 45,197,180,120,199,110, 11, 74, 93,  2, 97,200, 55, 72,146, 75, 26,117, 82,
- 68, 28, 45,  8,198,177,140,  6,107, 56, 64, 46,101, 37, 42,119, 70,108,238, 68, 82, 35, 71,245, 66,210,134,160,130,  2,218, 26,
- 26, 15,161,126, 13,200,186,214,119, 62, 34, 71, 44, 41,217,141, 73,114, 37,  8, 35,236, 71,  0, 40,224,233, 91,189,230, 17,142,
-128,  8, 48, 39,  0, 62, 20,245,232,  9,211, 25, 11, 15,253,  1,201, 80, 17,113,141,132, 42, 46,190,168,154,134, 82, 56, 17,174,
-154, 76, 66, 29,129,207, 35,240, 58,234, 40,153,180,230, 31,199,  8,  3,247,248, 33,  0,101,215,178,219, 52, 16, 69, 61,169,227,
- 87,156,164, 33, 73,213,138, 86,148, 34,209,  5,176, 67, 98,129,212, 74,116, 13,191,192, 15,240, 51,172,216,243,  1,252,  1, 44,
- 88,118, 11,  8, 16,106,213, 71,154,180, 77,154, 38,245, 43, 25,199, 30,238, 99,156,242, 18,  8, 41, 82,148, 40,158,204,216,115,
-239,156,185,115,239, 57,255, 23,127, 23,127,146,207, 46, 21,117,255,127,113,238,  5,133, 47,206,241, 88,134, 63,119, 72,183, 10,
-131,132,181, 89, 48, 67, 15, 34,119,116,108, 38, 93, 75, 21,150,138,235, 17,  4,113, 66,102,186,108, 21,143,200, 36,198,182,243,
-182,187, 12,118, 21,165, 33,107,158,  8,241, 11,237, 78,190, 64, 45,207, 67, 10,152,124, 50, 35,162, 74, 22, 20, 43, 66,255,191,
- 33,245, 66,197, 91, 19, 17,253, 88, 56, 69,170,  2,164,157,134,202, 57, 44,  1,164, 88,194, 26, 60,142, 84,178, 84, 54,173, 73,
-138,105, 69, 11,120, 24,  8, 40, 30,128, 57, 38,150,163, 34,169,129,106, 80, 40, 92,137, 43,  3,172, 19,128, 32,  8,100, 43, 84,
-191,155,162,179,103, 25, 49, 74,159,226, 61, 28,137,233,244,135,225,151,189,206,254, 65,119, 20, 74,240,157, 14,138,154,102,148,
- 99, 71,138,193,120,123, 48, 90, 10, 95, 72,104, 39,133, 61, 45,  2,115, 42,136,194,  9,149, 81,158, 12,248,122, 19,249, 12, 74,
- 22, 50,210,224,132,180, 22, 68,153, 35, 76,168,168, 37,240,112, 88, 41, 19, 64,116, 36, 73,237,207,130,193, 53,253, 38,192,240,
-154,131,213,170,122,154, 10,146,218, 18,112,185,141,207,131, 43,150,169,196, 12,190, 97,180, 82,119, 26,  6,114,242, 36, 44,151,
-  6,127, 98,219,158,111, 87,199, 81,  0,216, 51,150, 19, 54, 19,226,112,102, 90, 13,124,127,250,240,217,167,227,207,142,101,101,
- 89,234,216,149,222,101, 55,145,  9, 27,  3,116,183,226,214,162, 73,  8,174,156, 45,129,161, 61, 60, 13,128,243,112,241, 85,124,
-201, 18, 72,148,225,158,243,209,122,195,111,221, 94,186, 51,  8,206,215,155,235,163,104,196, 50,197,101,203, 89,116,145, 18,  4,
-182,  2,139,126,125,189,189, 49,  8,  6, 83, 57,169,186,181,105, 58,217,126,176,125,120,118,116, 60, 56,129,177, 67,107,176, 80,
-118, 78,143,224, 94,194,114, 62,197,147, 82,133,225, 29,132,240, 42,140,163, 18, 49, 78,123,174,231, 58,200, 38,214, 15,134,157,
-126,215,115,253, 25, 49,254, 83,118,116, 62,142,175, 50, 26, 66, 63,232,111,222,188,123,120,222,105, 85,155, 65, 60,246,108,151,
-  8,110,115,219,242, 80, 57, 38,199,236,148,138,227, 95,132, 67,192,251,146, 84,231,192,234,107,149, 69,179, 84,  6,215,  6,187,
-165,118,189,125, 17, 12,224, 55,211, 52,134,181,215,130,254,123,205,147,112,248,216,176,236,157,101, 84,211,102, 77, 27,112,111,
-117,119,107, 99,105,181,118,175, 59, 10,122,193,216,130,141, 56,202, 23,171,163, 78,239,197,253,229,210,106,205,200,122,134,144,
-232,205, 85,174, 73, 87,216, 26, 48,255, 81,160, 55,119,193,155, 91, 70, 21, 94,182,209,240,140, 27,190,177,214, 50, 54, 87, 12,
-105,188,124,254,250,201,171,119,221, 89, 62,151,235,201,255, 69, 57,242, 49,217,221, 83,187,111, 14,222,127, 72,222,214, 77,123,
-205,109,197, 89,114, 56,232,224,105, 22,  2, 14, 51, 85,210, 54,221,181,230, 45,152, 87, 65, 28, 60,218,217,218,255,250, 13, 48,
-  0,226, 31,170,101, 73,228, 36, 19, 60,  5,117,166, 35, 41,  2,169, 86,117, 41,154, 94,229, 44,236,103,232,116, 67,248,176,210,
- 88, 25,134, 35,109,252, 90,206, 73, 11,111, 87,172, 42,152,223,140,248,  5,132, 46,122, 98, 75,194,240, 36,220,231,211,241, 25,
-135,178,241, 96,220,111, 80,176, 84, 82,251,121, 94,248, 98,228,174, 17,215,  5,177,154,253, 80, 92,  7,154,153,195,114,110, 50,
-106,206, 87, 73,201,155,224, 37,224,241,193, 36,212, 25,241,220, 11, 62, 19, 96, 90,130, 95,  4,243,114,237,224, 11,233, 11, 67,
- 15,170, 96, 28,155,  3,254,239,  2,144,118,237,186, 81, 67, 65,244,250,113,109,239,203,187, 49,217,144,132, 37, 68,162, 64, 10,
- 66, 10,162,163, 68, 32, 90,106,248, 17, 42, 10,254,131, 26, 33, 26, 58,126,  2, 65, 17, 68,151, 68,  9, 81, 72,236, 60,216, 93,
- 59, 94,175, 95,204,153,107,111, 18,146,  6,177,173, 31,242,250, 94,207,156,153, 57,115,230,223,240,187,118, 29,138,159,101, 87,
- 56,145,162, 95, 57,185,202,204, 24,151,111,112, 65,217,231,175,147,  9,211, 90, 44, 31,150,213,242,183, 74,103,161,150, 34,192,
-142,195,220, 33, 83,152,142, 38, 75, 97,180, 12,155, 98,231,142,213,241,154,222,209, 36,216,139,246,208, 34,203,133,127,238,122,
-200,234, 60, 90,161, 22,143,126,110,163, 55,138, 79,217, 43, 93,171,125, 89,218,210, 70, 95, 95,158,213,117, 12,205,177, 26,113,
- 18, 41, 67,159, 99, 48,134,198,196,218,226,193,202,195,141,221,111,232,202, 38,123,109, 19,112, 75, 13,221, 64, 83,170,174,119,
- 28,107,185,223, 51, 28, 11,225, 55, 90,153,  9,215, 16, 42, 98,237, 12, 81, 54,154, 86,167,101, 66, 74, 29,  9, 37,248, 54,213,
-126, 75, 27,136,176, 57,109, 96,189,146,182,224,119,170, 17,222,215, 98,178,180, 88,127,205,132,234,  0,220,131, 45, 53,213, 36,
-148, 36,  5,135,249,168,165, 27, 34,183,145, 27,197, 33, 71,106,182,196,112,135, 36,193, 63,157, 80,128,159,235,  0, 33,162,112,
- 44, 52,155,131, 92,156,  0,249, 75, 93,183,108,116, 85,167, 60,  0,237,108,138,179,218, 13,121, 24, 12,163,  4, 68, 33,164,103,
- 17, 39,151, 74,161,159, 11,164, 23, 87,180, 44,138,243, 56,145, 63, 33,118,137,172,  3,174,234,222,220,139, 95,245, 13,211, 81,
-211, 48, 91,178, 73,183,155, 64,157,  6, 74,106,147, 52, 18, 24,247,220,228,198,116,178,185, 13,168,155,228, 24,153,203,196,107,
- 93, 73,  2, 41,238,130,  3,131, 91, 48,153, 38,183, 76,153,178,224, 42, 43, 20,162, 52, 74,139,101,154, 22,178, 25, 38, 36,207,
- 20, 11,128,174,238, 52,221, 48, 26,151, 74, 70, 66,148,203,189,129, 63,220,167, 77,229,182,186,210,208, 70,209,152,124,225,218,
-202,125,  2,227,203,222,210,142,191, 99,131,245, 35, 25,228,  9,242, 73,244, 90,201,244, 47,205,245,105, 15,254,248,249,125,174,
-133,178,240,157,249,213,109,127,155, 30,213,107,121,228,114, 40, 80, 88,156, 91,  8, 70,199,243, 40,237, 30, 12,110,172,108,249,
-155, 11,189,155, 39,225,137, 98, 63,208, 29, 32,115,102,200, 48, 30,153, 60, 21,146,  2, 17,186,208, 37,167, 21,135,228, 15, 64,
-177,101,138,249,192, 27,  4, 67,159,219,231, 10,242, 79,152,238, 91,150,171,139,119, 41,138,154,230,152,173,149,165, 83,112,  0,
-116,225, 72,163,221,112,143, 66,255,105,247,214,139,183,235, 98,189, 43,252, 99, 49, 26,139,233, 20,160,187,204,126,125, 58,125,
-254,238,243, 70,176,127,117,187,127,121,249,228,209,155,103, 98, 18, 11,131, 43,236,180, 91,167, 41, 96,123,174,248, 26, 58, 15,
-126,  2, 54, 17,182, 37,188, 38, 96,251,110,248,225,245,199, 87,239,191,230,255, 61,  1,226,158,123,251,113,127, 45,202, 98, 90,
- 92,138,156,188,102,111, 51,216,154,205,216, 22, 44,246,230,152,178,221,118, 15,126,  7,130,  9, 51,220,219,  9, 46, 77,109,223,
-233,209,156,104, 50, 70,223,134,202,186,114,246, 67,229,174,153, 28,163,230, 14, 26, 85, 71, 88,133,128, 75,122, 99, 82,151, 13,
-105, 19,106,  1,124,230, 29, 66,159, 36,249,209,163,161,207,  3, 33,200,103,244, 15, 67, 12,127, 71, 88,141,132, 64,218,118,186,
-103,147, 48, 41, 50, 37,153, 89,212, 86,123, 38,130,192,100,233,138, 68, 58,203, 23, 92,196,236, 74,177,184,146, 37, 20, 74,199,
-141, 77,116,165, 77, 89,115,102,202,234,146, 90,244, 70, 87,130,  4,181, 85, 85, 10,126,231, 37,215, 75,201,100, 38,128,253, 17,
-128,180,107,215,141, 26,136,162,126,172,215,175,141,157, 23, 73, 72, 32,209, 70, 68, 17, 17, 13, 73, 77, 69,197, 79,240,  1, 72,
- 72,124,  7, 21, 13,  8, 36, 26, 90, 74, 42,132,160,164,130,150,130, 20,  8, 82, 36, 33,171, 40,251,178,119,237,241,120,184,231,
-206, 44,187, 10, 52,  8,105, 27,239, 67,178,175,118,102,206,189,247,220,115,254, 25,191, 91,127, 20,103,208,147,176,156,208,141,
-217, 64,245, 18,138,119, 77,154, 48,227,  8, 50,  3,147,103,207, 36,211,110, 69,114,110,121,236, 77,129, 18,138,152,156, 67,142,
-225,191,187, 46,190, 64,127,127,126, 49, 55,215,195,244,156,167,251,200, 75,241, 21,161,196, 72,228,174,129,241,  6,193, 43,211,
- 76, 81, 60,173, 84,131, 52,106,169, 75, 93,211,217,206, 47,179, 68,166,109, 19,148,182,241, 19,220,234, 74,186,158,151,153,  7,
-229,119,  0,  8, 90,192,122, 75,  3,147,  4,137,191,163,197,150,  8,134, 86, 74,246, 71,227,229,208,107, 95,155,243, 60,  2, 64,
-141,200,131,187,105,218,106, 38, 45, 55,246,161,120,206,  2,165,182,199,233, 11, 10, 41,178, 70,161,102, 12,207,175, 74,212,190,
-227,134, 32,202, 99,166,116, 60, 42,179, 81, 69,161, 14, 60, 39,246,189,216,  3,174, 98,157, 39,184,219,  4,174,138,  2,130, 86,
-110, 74,199,157,139, 71,107,178,100, 31,123,116, 57, 90,238,216,150,108, 95,102,201, 70,195,105,  5, 20, 55,102, 23,163,  5,168,
- 34,122,199,199, 32,162, 35,161, 14, 56, 31, 82,166,  1,143,156,254, 96, 60, 24, 10,109,205, 51, 89,112,186, 48, 99,155,240,240,
- 53,179,142,167,195, 13,136,  7, 24, 55, 42,137, 22,139,106,148,132, 11, 76,119,148, 90, 19,137, 66, 23, 54,131,170,170,208,213,
-100,153,248, 86,144,212, 76,126,208, 13,244, 38, 90,115, 13, 33,170,246,218,118,203,143, 25, 92,  7,  2,131,202,  6, 92,194,163,
- 18,211, 85, 96,178, 46,196,  4,169, 64,147,167,208,101, 69, 78,171, 38,231,137, 24,197, 79, 71,216, 31,188,102, 45,181,  7,127,
-234,116, 84,230, 13,156,191,158,  2, 87, 78, 97, 76,145,253,148, 65,215, 81, 96, 52, 18,120,239,244, 59,148,216,109, 44,173, 99,
- 96, 19, 76, 53, 61,  6, 97,173, 38,171,205,166,127,218, 61, 62,235,158, 83, 14,118,176,189,255,163,115,148, 23,217,193,206,254,
-225,241, 97,228, 69, 89, 57, 44,235,146,242,155,139,188, 95,138,113, 33,138, 48,108,165, 81,178,185,220,190,200,128,196, 41, 14,
-173, 48,165,141,126,119, 99,183,151,247,246, 54,247, 78,186, 63, 33, 29, 46,198,124,170, 73,122, 28,186, 37,205,144,174, 42,217,
-205,187, 82, 49,156,183,161,154,199, 58, 19, 96,115,150, 85, 65,187,210,141,181,157,206,224,148,157,240, 26,244,105, 94, 12,111,
-111, 29,124, 62,249,250,224,241,139,187,178,185,178,117,213, 90, 72,129,151,190,103,249,187,111,119,158,188,254, 50,232,253,117,
- 93, 63,127,120,207,110, 19,138, 23,140,214, 21,116,136,  2,122,249,214,156,  7,223,116,194,236, 73,104,205,211,182,158, 88,215,
- 41, 51,168,223, 63,122,115,235,254,203, 15, 71,254,167,183, 31,159,190,122,246,159,251, 59,109,232, 55, 23,183,122,197, 48,142,
-230,206,123,103,112,178, 36,156, 94,171, 41, 88,112,108,202, 66,135,227,140, 48, 36, 33,244,222,104,  0, 22,167,100, 46,188,226,
- 12,  5,132,102,161,171,177,181, 86, 17,182,141,241, 81, 61,153, 90,101,216, 44,185,116,206, 46,174,188,248,203,162,204,171, 28,
-106, 95, 82,166,209, 92, 41, 74, 94,233, 85, 14,105, 60, 91,178, 96,217, 16, 30,  3,178, 54,181, 20,108,190,148,113, 86,154,177,
-206,194, 78,202,158,114, 92,112,133, 27,170,229,196, 69,149, 25,152, 90,158,163,158,209,174, 49,153, 69,173,117,199,204,244,142,
- 41,221,176,235, 20,179, 98,108, 93,141, 55,  5,240,217,202, 58,183,  7, 39, 14, 79,245,239,  1, 81,101, 84,198,185,150, 64,171,
-230,151,  0,156, 93,203,110,211, 80, 16,245,181,125,175,237, 36,110, 66,154, 56,105, 17,108,138, 88, 84,106,197,  7, 84,170, 64,
-234, 79,177,229, 15, 88,243, 21,136, 13, 11, 64,149,186,164,  2,  9, 85, 72, 21,221, 20, 74,223, 37,177,147,216,142,147,152, 57,
-115,109,210,168, 43,170, 86,173,186,168,228, 56,206,204,153, 59,231,113, 79,252,190,  8,222,121, 80, 48,204,146,  1, 89,124,  6,
-111,113, 34, 23,202,119, 25,  7, 35,110,251,253, 90,172,186, 38, 12,203,249, 30,197,249,148, 70,238,146,179,197, 74,217, 42, 85,
- 43, 91, 47,165,149, 80, 10, 90, 34,219,  1, 89, 75, 41, 75, 42, 83, 58, 56,228, 85, 71,209,129,114,100,148, 32, 60, 19,167,210,
-156, 12,172, 27,  0,149, 53, 42, 68, 85,199, 39, 40,164,201,168,119,138,123,185, 34, 89, 80,213,150,233,181,229,245,139,194,217,
-102,126, 28,165, 67, 95, 17, 21,143,104, 24,147,208, 58,225,120,201, 74,219, 78,195,219,218,236,180,154,222,112, 60, 73,198, 70,
- 24,103,244, 51,138,167,233, 76,164,208,202,240,202, 10, 40, 44, 87, 18, 55,147,166,113,170, 13,212, 40, 36,234,191,192,210,149,
-186, 86, 54,165,114, 14, 61,161, 77, 31,  0,122, 10,241,130, 76, 62, 47,100, 94, 45, 26,140, 99,  9,216, 98, 27, 56,120,193,125,
-227,  9,155,240,187,109,  9, 42,134,244, 55, 56,247, 56, 37,200,134,227,108,148,106,144, 35,198, 19, 24, 68,166,250, 27,190,124,
-216, 34,229,115,211, 58,141,183, 33,113, 10,147,158,224,216,  3, 61,187,248, 80,130,196, 19,164,164,221,118, 97, 45,222, 89,253,
- 88,243, 47, 12, 61,193,210, 42, 93, 45,181, 67,141,197,181, 65,159,153,107,219, 12, 11,110,251, 26,155, 20,145, 43, 38,103,215,
-  3,177,208, 44,213,173,175,252,188, 57, 46,  5,177,128, 97,158, 83,179, 77, 59,130,143, 60,219,249,178,104,176, 66,205, 96, 10,
-133,109,219,111, 93, 70, 23,154,183, 48, 43,104,178,133,224,161,234,214,134,201,208,100,162,132,163, 28,223,  5,235, 38,155,192,
- 25,216, 18,114,194, 65,113, 82,202,205, 71,155, 55,209,159, 40,238,209,197, 38, 48,192,  1, 59,106,173,251,228,199,217,161, 52,
-237,192, 15, 58,205,224,240,228,144,110,237, 32, 30,112, 98,187,170, 85, 42, 73, 58,166,214, 65, 29,197, 81, 30,  1,127,101,187,
-167,215,191, 30,182, 30, 35,155,151, 77, 95,  7, 73, 68,115,198,243,141, 23, 95,142,246,175,  7,224,255,140, 16,123,  0,236,209,
-240, 26,253,164,199, 89,193, 80, 87,208, 72,234, 42,119,107, 99, 43,171,138,221, 79,239,233,146,248,154, 69,123, 41, 56, 11,207,
-151, 28,122, 21,132,244,179,237,245,237,253,163,207,116,235, 58,141,110,156,246,236, 60,125,253,245, 67, 63, 75,255, 47, 67,109,
-239,149,241,212, 55, 70,  3,206, 98, 49,176,104,141, 50,227, 38,  1, 45,185,234,  2,176,215, 61,195,168, 24,151,253,221,151,239,
-118,222,124,212,197,226,129,215, 60,120,187,183,186,179,126,239,202,174, 12,187, 41,107,207,150,215, 28, 41,105,106, 88,174, 52,
- 17,195, 82,173, 95,133, 87, 88, 97, 21,231, 68,232,229, 12, 47,102,144,103,228,211,166,223, 58,239,157,210, 51,216,174,  7, 97,
- 28,246,227,176,216,176, 17,188,171,211,192,116,209,  1,131,229,183,  6,120,255,142,176,129, 72,196,172,237,  7,221,198,202,247,
-147,111,204,183, 97,145, 96,169,111,202,203,178,101,137, 57,175,134,255, 75, 43, 75,217, 75, 70,235, 48,244,  2, 75,103, 70, 21,
-100,244,114,118, 53, 96,155, 65,143, 60, 53,123,192,187, 97, 79,136,185,  5,177, 35,193,234,230,252, 22,189,177,158,186,210,  5,
- 25, 34,211,188, 15,157, 49,133, 47,191,210, 24,101,131,  9,250, 77,129,222, 23, 11,175, 57,215,  9, 21,  9, 78,119,222,211, 28,
-214,224,127,  5,224,236,220,117,155,136,130, 48,124,246,230,245,122,189,190, 96,156,152, 68,  8,  9, 36, 26,138, 20, 64, 65, 17,
- 10, 90,122, 16, 60,  3, 13,143,192, 11,240, 24,116, 72,116,180,145, 66,137, 72,138,  8, 36,138,196,  9, 36,142,157,196, 27,249,
-146,141,119,189,103,153,127,102, 29,115, 17, 66,161,179, 92, 29,175,207,206,204,153,243,207,247, 95, 34,190,255,217,156,  1, 39,
- 75, 57,177, 62,191,152, 86,101,  4, 88,129,113, 46, 22, 95, 25,253, 98,187, 52,199,168, 43,134, 23,226,144, 53,253,173, 75, 99,
- 40, 59,225,197,152,185, 16, 94,140, 35, 51, 27,235, 20,155,112,155,245, 51,108, 47,160,108,207,118, 81,206,155, 78,201, 65, 28,
- 51, 12,183,225,215,218,163,157,126,212,163,231, 15, 67, 13,248, 14,225,141, 69,249,163,114,252,155,133, 86,177, 29,243,248,242,
-197,211,151,234, 48,  3,233,191,213, 27,116, 76,101,254,155, 88, 60, 87,162,242, 21,188,227, 37,105, 84, 46,214,198,201,152,193,
-141, 10,115,170,150, 16,207,204,  7,183, 23,105,129, 17,  5, 81,180,190,169, 18,115,130,160,104, 50, 85,  1, 66, 55, 80, 38,212,
- 36,129,200, 19,112,165,120,234,160, 12,215, 22, 83, 23,224,228, 13,224,161,129, 70, 46,247, 58, 74,150,229, 83, 80,193,241,  5,
-231, 23, 76, 51,185, 24,235,213, 19,125, 58,161,116,  0, 57,177,107,155,113,166, 41,  3, 78,210, 20,198,128,153,209,170,  7,235,
- 91,187, 83,200, 36,161,250,202,205,225,181,140,253,113, 52, 79, 69,193, 37,192,188, 84,170, 20,116,106,116, 22, 20,235,244,250,
- 97, 21,185,223, 45,187, 38,202,155,163, 24,180,  0,  2,204,112, 54,224,102, 74,134, 20,137,130,220, 36,184,208,137, 51, 25, 57,
-239,117, 74,  2,202,152,232, 96,112, 58, 82,126, 33,128,204,  6,130, 31,155,221,204,232,253, 42, 20,221, 34, 85,226,205,202, 98,
-146,196, 71, 35,168,  3,105,121,208, 50,107,208,135,132,247,125,247,230,189, 79,237,143,180,180,107,181, 86,127,116,114,198, 66,
-114, 14,241,115, 99,199,140, 61,211,175,  4,141,211, 81,  8,155,111, 12,222,195, 57,147,242,242, 82,125,105,247,104,231,197,211,
-151,239,215,222,125,239,239,219,220,111,164,205, 92, 46,250,103, 73,228, 57,176, 88,161, 13, 69, 95,174,220, 88,217,220,222, 92,
-189,243,112,231,112,155, 74,164, 86,163,121, 24,246,  6,227,129,235, 20,170,165,234,222,113,187,228,248,244,135, 80,193, 30,120,
-149, 24,252,247,168, 86,170,140, 99,248, 20,  6, 94, 21,189,183,132, 18,134, 85,246,168, 96,140,104,207,132,103, 33,  6, 43, 44,
-179, 84,224,171, 84,101, 80,140,131,147,209,240,148, 78,  9,180,137, 10,224, 84,242,  4, 52,253,253,166,144, 72,  1,132,160,180,
-196,150, 70,169,197, 94,192,215,107,139,111,191,172,109,132,223, 46, 27,103,223, 60,190,255,236,245,115, 21, 24, 80,221,156, 12,
- 85,120,174,122, 19,245,181,175,  6,147,141,118,103,235, 96,176,208,170,238, 31,143, 94,125,248,188,167,230,103,116, 87,185, 39,
-235,219,229,213,229,255,142,239, 79,110, 61,162, 68,181, 80,111,118,  7,221, 78,191,203,231, 57,237,187, 30,253,198,113,  4,107,
- 89,105, 43,171,153, 91, 93,202, 19, 39,144,206, 24,122, 10, 56, 13,182, 85,179,210,164,143, 32, 55,112,177, 54,133,206,213, 16,
- 27,169,108, 54, 64, 36,215, 58, 18, 62,225, 51,147, 38,128,134,178,111,210,108,138, 29,  5,246,114, 99,249, 32,236,228, 29,144,
- 92, 58, 32, 55,180, 90, 10,157, 41,183, 84, 68, 33, 76,203,104,  4, 13, 58,138,165,220,162,241, 93, 31, 74,220,124,210, 41,147,
-110,164, 49,131,147, 49, 84, 59, 71,138,101,185,110, 30,178,190,171, 65,171, 59,236,228,167, 97, 45,205,119, 97, 21,104, 49,  2,
-204,235, 71,253,151,169,162,159, 84,139, 38,119,151,102,185, 32,215,171,255, 16,128,179,107,217,109, 26,136,162,158, 25, 63,242,
-170,211, 54, 81,157,150,130, 74, 10, 66,145,144,120, 75,172,216,240,  1,124,  1, 95,196,103,240,  3,108, 89,179,232, 10, 80, 87,
-136, 86,  2,162,136, 52, 52, 38,143, 38, 78,108, 39, 30,115,239,157,177,155, 20, 22,168,202, 67, 81, 54,137,147,153, 51,247,113,
-238, 57,255,139,239,127,131,123,154, 49,103,152,134, 93,165, 55, 64, 77, 60, 42,148, 74, 99,213, 75, 41,199, 68,192,  2, 81,192,
- 90,116,177, 32, 42,112,153,163,101, 79,234, 22, 29,177,136, 12, 22, 25, 11,161,105,234,168,158,158,106,241, 25,161, 36,218,225,
- 68,177,232,120,128, 69,238,112,184, 91, 38,160, 28,250,130, 98,149,198, 17,118,181,224,250, 97,191, 51,251, 14,167, 37,  4, 68,
- 18,217, 84, 72,142, 12, 84, 95, 55,213,157, 20, 60, 72,210, 40, 95, 62,121,240, 14, 91, 90,146,180,244,170,  2,244,191,216,239,
-153,208, 25,189,230, 26,198, 56, 25, 11, 83,205,138,  6,203,224, 58, 81, 13,219, 82, 46, 80,120,167,173, 72, 26,217, 36,168,163,
-103,143,101,222, 14, 70, 37, 22,210,117,196, 82, 56,185,250,145, 85,135, 96, 14, 26,105,226, 68,120,173, 88, 50,172,229,121, 48,
-159,202,120, 24, 69,144,244,  4, 81, 50, 10,162,139,105,104,104,197,198,149,242, 89,217,121,241,228,113, 56, 25,110,152,124,183,
-134,126, 63, 71,199,200,163, 72,176,235,151,208,184,  8, 49, 34,209,246, 73,245,157,180,211, 60,101,178, 89,161,202, 96,213,242,
-246,239, 73, 95,169,106,100,131,191,105,110,222, 38,117,183,  8, 87, 57,122,149,161,195,136,185, 36,135, 29,116,248,162,188,184,
-185,115,  8, 65, 24,192, 31, 67, 95, 67, 81,119,189,254,184, 87, 45,111,141,130,129,154, 14, 35, 59, 46,124, 60, 61,124,246,249,
-219, 71, 83,213,160,177, 77,197, 93,199,157,196,  0,250, 24,170,147,105,138,166, 95, 41,190,172, 45,236, 80,249,126,232,146, 27,
-110,200,187,123,247, 78,187, 39, 36,235,125,185,  7, 72, 38, 68, 66,208, 20, 37,113,195,221,157, 97,234,141,135, 40,100,  3,240,
-243,254, 26,247, 60,183,113,179,126,235,184,253,  9, 62,164,117,163,117, 54,252,137, 46, 74, 36, 66,105, 98,223,101,  9,207,  7,
- 94,115, 26,160, 61,239,217,  8,149,199, 61,183,  6, 95,243,254,126,235, 75,247,171, 63,246, 85, 78,  7,239,108,149, 54,  7,193,
-240,246,206,193,143,243, 54, 64, 63,170, 26, 16,105,181, 92,132,101,111, 64, 78, 64,196,161, 20, 86, 47,192, 13,113,242,210, 74,
- 97,  3, 37, 83,184, 88,162,132, 63,220, 18,170,173,113,117,185,  0,100,131,139,225,126,125, 15,101,238, 57, 55, 45, 65,176,145,
-164,122,212, 12,254,252,197,219,147, 15,215,131,218,151,110,229,205,171,231,143, 30, 52,141,  5, 51,186,112,252,205, 94,191, 63,
-122,215,247,175,204,170,151,108,200, 78,116,137,187,106,215, 70,145, 15, 11, 83, 26,241,245, 62,244,225,246, 29,175, 80,157,203,
- 24, 14, 39,136,207, 18,136, 66,184,174,146,195, 90,  2,180,109,247,219, 28, 19,208, 34,108,225,121,172, 24,113, 58,112,198, 95,
-126,179,209,241, 59, 82,149,104,116, 79, 19, 57, 92, 73, 22,164,208,191,159,147, 42,180,177, 53,231,138,193,145, 42,157, 89,114,
- 63, 83,138, 95,210,182,156,104, 17,115,182,174,103,206, 46,185, 50, 18,253, 26, 36, 69,216,137,146,131, 87,253, 90,128, 99, 91,
-148,144, 22,156,179,209,211,149, 81,210,156, 99,198, 50,199, 38, 93,161,129,235, 21,228, 57,193, 51,100,167, 26, 14,203,171, 32,
-138,230,103, 71,113,184,234,114,177,102,174,205,214,224,245, 74, 51,241,143,  0,148, 93,203,110,211, 64, 20,245,140,103,108, 39,
-105,156,132,180,165, 60,186, 64,170, 16, 72,221,161,126,  1,159,  1,124,  7, 11, 22,124, 34, 98,129,  4,155,194,142, 71, 32,194,
-137, 29,219, 99,123,134,251, 24, 91,105, 41,  2,164,202,139, 42,113, 38,206,204,157,115,239,156,123,206, 63,197,247, 27,229,  5,
- 60,161,109,112, 15,241,127,222,172, 36,248,205,  5,150, 47,216,223, 21,224,172,229,234,113,170,142, 74,151,149, 93,206, 41, 42,
- 17, 99,144, 96, 42,252, 38,225,195,186, 38,192, 46,201, 42, 24,175, 68,244,128,121,160,165,142, 49,  0, 42,120, 77, 18,198,137,
-198, 42,205, 36, 62,200, 76,118,153,125,224,254, 55, 60, 20,116,116,202,234,122, 77, 31, 50, 44, 23,156,244,249,244, 71,244,167,
-255, 88, 73,176,222, 84,229,138, 87,137, 12,174,113,107, 28,203,224,180,174,193, 92, 64,162,202,143,244, 34,  7, 36, 15, 76,155,
-157, 66,240,142,216,150,228, 76,232, 13,248, 15,233, 72, 63,158,235, 23,210,195,127,185,215, 82, 49,208,172,156,167,247, 32,199,
- 70, 97,213, 66,226, 38, 29,141,162,213,174, 96, 73, 23,184,212,  6, 59,243, 60,143, 64, 50,205, 23, 62, 83, 77, 81,182, 81, 63,
-189,120, 82,149,133,104,118,182,203,179,181,249,188, 70, 94, 14,  9,244,  5,228,196,212, 27, 22,116,130,200, 73,142,  9,142, 54,
- 96,205, 58,158,191, 93,172,199, 40,167,181, 91, 99, 28, 70,159, 19, 49,132,248,129,108, 11,119, 98,  5,  2,180,214, 66,151, 62,
-116, 96,139,112,191,164,250,152,179, 76,  0,162,197,101,181,210, 29,105,  3,208,147,196,132, 10,  6,  1,169,119, 93, 23, 85, 11,
- 79, 50,140,117,220, 52,245,124,188,220,214,153, 24,152,103, 65, 95,193,241,205, 35, 34, 86,201,113,122,184,202, 86,117, 91, 15,
-142,148, 44,214, 13,113, 92,135,186,168,115,223,133, 72,197,107,248, 98,179,233, 60,223,229,233, 40,133, 17,194,108, 41, 77,169,
- 81,202, 61,201,107,116,104, 81, 74,157,159,158,191,189,124,115,119,126,250,163, 88,245,100, 80, 71, 20, 41, 57, 63, 88,196, 48,
-242,182,131,219,158, 44,238,124, 93,127,  9, 81, 45,206,141, 34,  0, 16,  5,121,248, 74,254, 17,225, 62,  6, 25, 17, 34, 29,205,
-115, 52,107,196,159, 49, 77, 14, 96,107,105,219,  6,  6,134,134,148,  2,123,101,201,171,164,232,229, 72,236,225,116,105,172,  1,
- 68, 82,153,146,  8,209,193,189,197,125,216,  5,209,137, 11, 55,  3,  3,137, 11,158,231,239,157,222,177, 17, 11,236,253,239,190,
-191, 79,148,130, 39,148,163, 65,128,205,155,186,234,154,109, 99,118,228,143, 97,237,223, 45,124,206,162,164, 13,237,170, 50,  5,
-189, 54, 86,104,239,133,245,103,148,217,193,133, 99, 76,203, 40,113, 44,210,194,102, 15,111, 63,126,246,226,249,235,151,175,196,
-177,248,223,248,190,140,166, 23, 71,143, 16,207, 57, 57, 27, 77, 55,213,150,136, 94, 33,246,169, 32,210,210,212, 42, 12,107,  5,
-109,218,106,212,192,  8,184, 72,194,229, 17, 24, 82, 67, 36,114,152,111,144,250,  0,124, 14,168,129,  3,150,251,131,147,179, 79,
-223, 62,178,125, 27, 67, 22, 64, 18,232,227, 88,253,148,126,133, 56,127,208,218,247,157,223, 68, 49,116, 67,139, 19,227,118,206,
- 24,110,165, 75,  0,105,128,244, 81, 14,133,211, 95,193,138, 84, 66,252, 33,114,134,216, 32,157,108,202,141, 87,148,239,173, 92,
-221,128,217,251, 69, 55,141,103,133,217,176,144, 14,155, 66,141,162, 73,222, 22, 19, 53, 46,174, 58,100,244, 22, 37,215,135,109,
-247, 74, 58,191,  4,224,236, 90,118,155,  6,162,168,199,227,216, 73, 28,229,213,208, 80, 16, 66, 66, 66, 98,139, 84, 22,124, 60,
- 72,136, 47, 96,193,174,136,  8, 40, 37, 36, 77,136,227,183,199, 30,238,185, 99,187,142,218, 13, 72,221, 85,137,237,241,228, 62,
-206,156,123,142,243, 79,176, 76, 23,121,215,141,231,134,213, 81, 20,192, 65,182,116,205,152,227,131,133, 47,175,163,107,238, 41,
-181,212,136,135,214,244,201,132, 84, 91, 74, 11,115,163,178,185,132,236, 40, 71,114, 28,150, 40,141,249, 15,138, 84,224, 31,130,
-106, 72,223,152,177,207,167,104,160,183,182,125,233,170,255,220,167,242,151,166,189,208,218,122,232, 61,181,159,116,192,162,165,
- 82, 46,111, 83,  0,178, 58,108, 76,184, 98, 96,116, 26,140, 24,  4, 58,118, 71, 54,110, 95,150,237,209, 47,  7,232, 70, 69,109,
-168, 80,236, 54,105,219,141, 64,134,161,134,212,  1,126,226, 45, 14,217,150, 23,148, 91,  2,100,121,  0, 56,149,131,143, 10,135,
-194,  4,101,  7, 47,164, 98, 67,137, 93,148, 83,201, 34,  7,162, 44, 89,220,197,238, 77,198, 30,212,105,139,114,234, 15,166,190,
- 95,168,236, 98,121,190,249,177, 10,246,234,215, 14, 92,122, 85,128, 37,161, 89,210,  5, 92,202,186, 55, 68,222,227, 39, 48,214,
- 49, 44,112, 43,152,112, 36, 36,  5, 35, 10, 55,245, 11,178,165,174,202,142, 90, 54,183,209,182,227, 58,189,180, 76, 12,208, 77,
-181,204,194, 95,110,195,117, 65,249, 15,121,141,193, 18,221, 64, 89, 66, 40,120,  9, 10,109,170, 83,148, 45, 72,127,127,194,173,
-105,111, 92,199,165,232,140, 35, 74,149, 24,181,119,115,186, 53,116,168,185, 86,204, 63,170, 55, 97,156,135,223,182,241,168, 63,
-234, 58, 55, 48,193,185,234, 99,  8,153, 27,112,141,230,142,246, 73,174,114, 28, 28,128, 41,193, 60, 55,152,125,239,206,198,203,
-221,113,227,247,125,145,  0,124, 85,133, 10,162, 80,233,114, 27,173,217,200,  5,158,160,203,217,147, 40, 13,169,140,154, 14,199,
-171,205, 87,  7, 86, 45,242,152,  4,158,219, 75, 97, 37,104, 69,105,162, 97,196,136,200,195, 45,  3,174, 69,139,226, 97,  4,247,
- 96, 90, 33,102,248, 21, 73, 22,211,190, 85, 54, 88,179, 51,127,118,136,246,103,227,  5, 69,180, 36, 75,158,206,159,209,243, 70,
- 89, 92,162,185,194,217, 33,173,198,227,233,249,207,253, 53,122,142,188, 80, 50,159, 13,166, 81, 26,163, 31,108, 16, 27,174, 39,
-141,239, 52, 93,110,112,155, 30,251, 56,139,178,125, 33, 39,125, 15,225,222,194, 17, 45,108, 69,  5,189,151,220,233,249,175, 94,
- 60,255,240,249, 83,146, 38, 18,148, 98,232,217, 30, 85,145,194,233, 69, 95,229,233,137,193, 27, 70,142,149,129, 22, 80, 13,168,
-187,113,161, 88,  7,193,234,176, 57,220,190,251,248,254,237,235, 55,255, 81,191,103,149, 26, 13,253, 52,130,109, 58,237, 46, 99,
- 93, 13,153, 66,214,143, 59, 38,140,245,105,106,124,138,146,241, 16,102,140, 72, 85,101,230,126,120,242,137,145, 19, 65,219, 32,
- 51,113,179,103,203, 71,243,139, 47, 55, 87,244, 63, 46,213,245,229,203,203,155,253,250,122,247,189,198, 12,153,  9,209,  6,116,
-155,195, 50,211,225,106,146,119,213, 29,  3, 53,  7,114,134,163, 44,140, 72,184,254, 29,172,185,108,183,235,  6, 87,212,102,172,
-214,  9, 79,253,132, 93, 77, 11,151,232,180,210, 13,  8,108, 30, 85, 48, 53, 65,212,136,143,249,142,176,  8, 40,169, 79,134,115,
-150,168, 67,196,143, 88, 82, 24,148,144,234,142,247,221, 70,164,242, 94,196,239, 26, 87,253, 21,128,179, 43,217,109, 26,138,162,
-126,207,142, 29, 39,206,156,166, 32, 90, 90,129, 84, 36, 36, 86,236, 89,194,138,191,224,227,248,  4,118, 44,145,250,  1, 72,116,
-133, 82,134,210,212,153,236, 56,158,205, 61,247,121, 72, 89, 85,100,153, 73,201,243,245, 29,207, 61,199,248, 15,121, 38,113,111,
-103, 85,145,247, 22,149,164,170, 81, 98,225,121,236, 93, 52, 99,138,166, 69,196,  8,111,128,100, 76,198,201,128,220,178,121, 93,
- 24,  0,243,136,186,203,160,151,221,118, 69, 14,204,141, 93,164, 81,104,184, 75,166, 44,  5,219, 11, 68,140,209,122,103,180,140,
- 48, 53, 61, 42,118, 18,172, 64, 21, 75, 68,229,221,107,165, 46, 89, 99,143,170,228, 61,123,128, 32,120, 69,224,163,246,105,217,
-226, 81,205,150,140, 88,252,243,200,  3,243,178, 62, 82, 94,202, 59, 10,163,101,145, 29, 82, 69, 75,190, 44, 13, 67,150,167,148,
-172,173,205,138, 96, 89, 86, 31, 76, 37,101, 12,151,190, 72,254,148,145,153, 35,  1,125, 42,229, 62, 49, 14, 65,151,148,167, 82,
- 89, 66, 57, 47,221,  0,155,253, 62, 73,149, 86,148,180, 90,200,182,218,166,121, 52,104, 71,  1,157, 97,114, 58, 61,190, 56,127,
-220, 31, 58,102,203,  8,109,251,187,231, 50,128, 12,112,  0,172,123,169, 44,151, 87, 67, 40, 69,146,220,147,  1,151,  3,255, 23,
- 86, 83, 83, 84,121,  5, 24,203, 48, 47, 41,213,172,232,195,142, 61, 96,230,128,162,225,  3,197, 55,165,162,198,147,106,210,110,
-219,210, 23,149,137,151, 11,  3,150,217,181,117, 11,139,121,226,223, 10,143,215,252, 48, 17, 24, 59, 83,242,122,144,204, 53,200,
-169,237,135,189,177, 23,120, 26, 35,147,168, 40,161,194,227,116,116,246, 99,121, 77, 46,111,214, 63,158, 67,160, 81,163,108,186,
-228,219, 46, 45,  7,179,153,148,135, 94,234,230, 45,233,176, 52,  6,231, 72, 83,104, 65,144,236,216,144,116,  6,175,138,136, 28,
-132, 16, 23,179, 23,223,126,127,165,232,242,236,232,249, 54,218,110,253, 53,218,109, 20,174,210,184,215, 25,108,130, 13, 88, 98,
-210, 66, 55,129,113,116,253, 59,141, 91,  0, 74,175,142, 14, 99,208, 25,144, 69, 46,214,139,118,155,106,106,236,  1,100,153,207,
-213, 23, 40, 43,116,230,228, 25, 57,227,165,239, 38,  9, 40,226,188,112, 67,207,108,130,173,  0,195, 32,232,207, 82,228,199, 49,
-253,226, 56, 15,135,206,196, 11, 86, 63, 87,191,232,210,196, 73, 36,233,210,199, 69,127, 50, 60,153,158,204,111,175,193,190,194,
-132,173,148,217,244, 76, 42,173, 86,100, 23, 79,156, 71, 87,203, 27,214,114,145, 42,193,129,150, 10,244,  2,121, 27, 80, 10,138,
-142,175,158,158,125,120,255,238,229,249,236,227,167,207, 19,211, 54,208,244,  3,160, 23, 43,120,236,120,226, 44,119,147, 56, 76,
-211, 47,139,155, 24,187, 29, 90,  3,215, 19,135,120, 98,163, 63, 26,144,125,116,133,253,246,245,155,131, 44,234,161, 15, 63,221,
-123,209,110,214,155,144, 37,135, 57, 64, 74,170, 59, 97, 74,157,206,132,243, 62, 53,  1,130,165,182, 76,203,177,250,183,254, 45,
-147,189,227, 70, 33,115, 29, 58, 99,170,219,130,112, 71, 69,172, 10,115, 20, 41,231,119,115,186, 61,122,237,238, 62, 10,233,109,
-151, 87,151, 12,255,208, 11,113,160,205,161, 18, 39,158,200,140, 58,163,245,206, 21,  8,207,247,244,170,181,106,114,169,250,150,
- 37,237, 12,187,147,170,144, 40,212,119,228, 53,144, 81,171,157,138,104,242,105,141,183,196, 48, 62,227,254, 96,227,217, 21,199,
- 65,165,191,170, 24,100,  0, 29,202, 93,223, 85, 10,171,138,189,148, 14, 38,206, 34,181, 32,217,144,136,149,126,163,217,110,205,
-235,136, 82,117,135,254, 10,192,216,181,244, 54, 17,  3, 97,239,203,187,117, 18, 30,109, 41,165,165,173,160, 74, 91, 14,220,144,
-144,248,183,252, 11, 78,156, 81,185,241, 16, 15,169, 52,106, 90,  9, 74,178, 73,154,100,211,236,174,109,230,225,236,166,  8,164,
- 74, 57, 68, 81,228,172, 29,123,102, 60,243,205,247,133,183, 49,235,226, 95,108,  4,139,154, 42, 39,199, 61,199, 14, 70, 56, 65,
- 12,231,109,224, 45,227,101, 28, 23,  0,166, 39, 16,175,140, 45, 53, 24,130,149,122,110,107,120,  3, 47, 76, 64,222, 85, 56,121,
-166,154,255, 29, 89,119,177,  5,135,196, 68, 49, 61,205,146, 25,150,168, 78, 40,198, 37,189, 66, 36, 63, 24, 35,177, 20,198,112,
-173,184, 53,200, 82, 81,211, 80, 44,209, 77,220,112,176,203,117,  2, 62, 11,246,127, 62,143,242,213,186,158, 88,189,208,248,202,
-137, 37,220,181,107, 81, 79,154, 21,132,100,247,104, 82,134, 21,254,108, 18,169, 18,155, 86, 52, 39,181,204,242,190, 98,136, 55,
-210,118, 80, 55,174, 71,106,127, 96,233, 53, 73, 22, 97,113, 56,204,230,229,215,225,  4,174,222, 94, 20,123,216, 87,  4,187, 57,
-184,171,164, 68,102,  6,175,225,135, 74, 69, 66,202,231,  7, 79, 35,169,227,192,  7,163, 63, 31, 93, 79,103, 37,222, 60, 92,194,
- 22,172,177,149, 86, 53,131,102,232, 39,  9,217,  1,159, 10, 92, 87,229, 32,205,251,196,163, 18,104,199,211,131,156,126, 84, 44,
-176,142,132, 89,211,149,148,242,155,180,255, 80,186,214,242, 63,207, 96, 93,171,187,189,206, 74,184,130,121,103,207, 86, 80,171,
-235, 60, 43, 60,132,226,135,156,240,112,183, 85, 74,105,209,252,247, 55,246,187,189, 51, 24,112, 58,155,160, 89,180, 84, 73,195,
-226,128,175,226, 70, 73,236, 82,231,253, 14,140, 56,203, 39,195, 44,226, 77,182,179,190, 11, 22,159, 58,  6,145, 84, 18,140, 53,
- 12,199,114,104, 44,116,131,204,225, 30,220,234, 48,151, 50,198,108,  9, 22,102,225,199, 11, 91,142,178, 33,124,105,154, 79, 96,
- 89,206,  7,231,176,235, 58,189, 78, 64,201, 28, 48, 46,202,151,115,115, 13, 33,219,131,230, 26, 60,237,225,246,225,241,247,119,
-176,135,  7,227, 20,158,229,101,251,197,241,201,123,240,  7, 84,210, 40,145,191, 72,  4,237,199,109, 37,213,233,229, 41,132,228,
- 79, 54, 14,190, 92,124, 54, 84, 74,201,209,129, 22,  5, 74, 24,218,149, 72,129, 93,  6, 23,130,202,148,216, 19, 31, 17, 67,225,
- 21, 27, 16, 44, 43, 51,254, 65, 32,157,  4,248,140,205,123, 15,127,141, 80,136,252,132,  8, 53, 81, 59,204,115, 92,165,196,161,
- 88, 82,129,222, 68,129, 92,141,239,156, 77,251, 16,194, 27,214,180,168,161,  0,120, 38, 97, 29,126, 92, 94,124,235,116, 63, 93,
-254,252, 48,248,189, 41, 27,177,143,138, 96, 42,138,154,161,108, 37, 50, 14,240, 42,188,  5,239, 67,217, 43,242,143, 61,164,207,
-244,168, 13, 71,219, 27, 50,118, 82,196,162, 41,118,182,183, 76,168,197, 81,  2,159,188,125,253,230, 81,123,247,217,171,163,219,
-155,120,  3, 43, 95,102, 37,241,118,193, 82, 20,212,160,159,163,104, 78, 21,158, 17,106, 69,160,180, 20, 65,101, 48,148, 34,202,
- 95,132,191,130,219, 43,117,161,133, 94, 42,246,113, 85,148, 96, 96,  6,183,149, 13, 22,120, 56,193, 46,128,  2,  1, 35, 22,168,
- 66,131, 25, 51,171,  3,215, 27, 90, 33,229, 42,117,110,235,  8, 42,249,236, 18,255, 29,216, 96,149, 40,120,128,140,246, 24, 12,
-118,191,177,150,142,241,206,189,214, 90, 79,167,169,173,200,  8,248, 18,224,210, 25,102, 65,238,104, 88, 87, 96,225, 18,248,100,
- 85, 72, 13,127,111,117,239, 44, 61,117,173, 80, 92, 30, 96, 43,102,106, 93,210,133, 68,201, 95, 86,154, 51,252,110, 22,127,  4,
-160,236, 74,122,148,  8,194,104,117, 55, 13,205, 54,192, 32,203, 56,204,104, 60,248,123,253, 47,158,188, 27, 19, 15, 30,212,152,
- 49, 49,144, 89, 18,134,129,129,102,105,104,122,171,242, 91,170, 88, 34,154,  8, 55, 72,122,171,174,111,125,223,123,185,127,155,
-245,191, 25,119,195,242,200,236,200, 36, 88,164,  5,106, 73,231, 82,232,214,133,109, 10,239,216, 53,112,248,209, 96, 36, 75,163,
-170, 60,138,206,232, 78,219, 44,129, 67, 23,141,  4,238,182, 33, 36,179, 52,150,134, 71, 67, 24,176, 65, 39,194,252, 20,118,128,
-179, 70,158,104, 81,116,145,252,  4,182,194, 44, 94, 38, 18,147, 53,204,133,147,144, 43, 16,  7, 64,191,211,  1,134, 50,158, 80,
- 25, 29, 47,221, 46,166,161, 28, 56,148,117, 34, 15, 58,234, 54, 27,148,134,230,180, 97,101, 93,102,118,102,178, 82, 45,189, 34,
-109, 30,106, 96,121,201, 67, 32,169, 38,121,150, 34, 19, 90,216, 91, 34,230,175,184, 77,  2,  7,252,162,147,229,133, 39,101, 12,
-113,224, 83, 28, 85,107,197,235, 74, 13,130, 97,240,123,176, 43, 54, 81,226, 74, 71, 69,118,185, 96, 85,243, 56,246,133,162, 25,
- 56,127,151, 21,171,213,237, 42,254,214,127,132, 39,150,226, 39, 70, 56, 86,230,149,212,153,107,229, 80,166, 68, 46,  3,216,  5,
- 16,149, 34, 50,189,220,241,122, 23,197,203, 95,193,207, 40, 11,193,216,161,245,176,144,221, 63,219, 61,122, 11, 76,103,232,240,
- 53,146, 63,175,151,207,225,247,121, 48, 37,170,235,  2, 77,  5, 83,161, 29,156,110,150,149,220, 42,118,115,137,174, 29,190, 16,
-133,  5,161,143, 98,217,185, 28, 21, 76, 84,171,218,158,111, 22, 44, 99,115, 59, 25, 48,203,147,133,136, 32, 79,133,184,115,214,
-209, 10, 78,214,169,181, 71,254, 35,164, 71, 30,162, 96,237, 48, 89, 47,195,  5,118, 91,149,122,120,190, 51,124,122, 72, 86,110,
-241,240,160,165,185,151, 25,190, 11,171, 81,204,151,192,154, 95,158,247,102,235, 41, 34, 35,147, 77,194, 19,237, 74,119,210,130,
- 45, 98,207,131,112,197, 47,  4,166, 75, 68,202,  3,119,  9,145, 59, 44,200,167,155,143, 68,147,130,122,187,105,148, 14,231, 99,
- 92, 97, 34, 12,225,169, 55,199,113,225,249,222, 60,124,201, 57,232,156,186,141,118,170,146,193,104, 32,205,102,164, 82,137, 32,
-186, 30, 30, 40,176,225, 54,123,141,235,219,231, 62,242,236, 88,170, 91,127,233, 47,167,112,180, 49, 77, 54,213, 75,205,229,102,
- 62,244,135,229, 66, 57,198,206,  4, 78, 53,216,182,126, 63,109, 65, 67,103,106, 11, 57,  4,146,156,101,233,219,230, 21,216,247,
- 20,217,105,181,  6, 52,201,134,226, 29, 38,168,155,154,125,157, 12,222,189,255,240,249,254,  7,218,104, 88, 91,  8,222,113,168,
-194, 41,216,110, 35,242, 94, 84, 32, 54,200, 19,  0, 69,189,170,212,190, 79, 70,166,209,119, 28,187,195,121, 69, 12,111,199,235,
-171,107, 77, 61, 44,172, 32, 88,189,233, 94,252, 87,137,102,186,242, 59,103,205,221,240, 96, 62,231,182,106,173,254, 83, 31,197,
-235,227,109,130, 53, 46,193,250,105,146, 25,144, 48,207,197,233,188,130,227,165, 89, 56,223, 46,148,201,158,143,180, 47,176,112,
- 23,238,229,220,132, 78,183,181,  9, 76,181,219, 35,178, 26,177,  8,125, 66, 71, 72,166, 88, 63,  4,206, 33,214, 14,108,140, 52,
- 42,110, 24,113,235, 62,134, 46, 31,113,119, 70,234,158, 40,252, 49, 94, 78,132,250,  3, 91,205,158,132,162,111, 29,207,217, 16,
-144,213,252,245,108,231, 50,229, 94,155, 91,221,207,238, 36, 21,128, 12, 95,150, 98, 80,166,117, 58,240, 52, 71, 80,123,132, 60,
-175,213,111,  1, 40,187,186,214,166,161, 48,156,156,124,158, 52, 93,167, 93, 55,  5,189, 80,135,130,168, 56, 17,241, 70,255,133,
-255,192, 75,127,151, 55,130,224, 47,112, 12, 20, 68,  4,175,100,140, 93,140,185, 41,155,149,174,105,147, 38,105,147,227,251,188,
-111, 50,170,187, 18, 66, 97,109,215,143,211,243,126, 63,231,121,212,127, 17, 18,180,214,109,206,157, 59,221,186,140,102,  1,140,
-193, 10, 59, 42,142, 85, 55, 82,221,142,211,141, 28,237,131, 86,203,245, 12,237, 23,159,254,244,128,117,241, 92,186, 81, 30,116,
-120,109,233,199,128, 78,247,156, 78,129,174,128, 50, 79, 76,125, 93,  3,119,239, 72,101,192,132, 51,192,161, 48,253, 46,163, 74,
- 28, 24, 54,159,243, 71, 58,221, 72,183, 24, 27,157,107,238,226,245, 87,214,133, 11,174,129,193, 90,194,252,127,113,109, 80,245,
- 47, 47, 19,101,253,190, 19,202, 42,185,224, 50,116, 47,180,226, 47, 94,141, 90,235, 90, 60, 88,134,160,154,166,128, 99,230,119,
- 52, 84,109,249, 48,105,145, 66, 21, 68, 34, 59,207,231,155, 75,148,  3,248, 46, 25, 77,164,101, 34,240, 91,  3,204,123, 41,219,
- 43,116,221, 65,164,181,227,155,185, 59,207,157,122,230,155, 50, 72,210, 58, 70, 13, 27,240, 30,178, 41,234,157,156, 14, 33, 39,
- 59, 74,118, 62,124, 54,140, 40, 39,111,126,255,218,163,171,209,102,183,234, 21,243, 98, 92, 36,179,138,234,128,140,  2,225,172,
-154,229,139, 44, 43,167,227, 98, 20, 40,255,118,239, 14, 18,108,200, 79, 43,218,136, 18,178,123,225,138, 66,111, 77,218,233, 88,
- 90, 46,114,173,113, 54, 34,143,105,184,251,230,129,132,145,235, 12, 11, 58, 38, 32,214, 40,161,157,201, 28, 27,248,110, 89, 49,
- 97,193,109,104,107,112, 82,164,126,165,195,154,169,162,  4, 72,202,169, 60, 86, 44,159, 23,148,132,157,140,143,121, 64,106, 40,
-117,125,112,227, 33,243,180,148,244, 10,171,157,190, 76, 89, 90,205, 93,133,204,142, 66, 93,153,  9, 15, 22,228,  6,193, 13,  0,
-244, 14,  3, 52,225, 62,158,221,125, 94,128,186, 82, 77,138, 73,201,115,206, 86,183,184, 81, 48, 14,124, 48,181, 61,222,124, 18,
-  6,154,226,241, 36,159, 96, 70,199,182,163, 32, 11,230, 14,122, 27,244, 35, 92,138,215, 60,207, 63,252,125,136,162,204,182,103,
-249, 84,123,218,  6,187,108, 78,233,255,198,234, 21,223,163, 45,164,182,191,109,239,253,216,147, 57, 59,  5,170,200,215,229,162,
-160,112,200,178, 12, 24,129, 80,184, 13, 92,189,123,188, 75, 91,142,108,131, 62,249, 89,122, 22,133, 49,251,111, 59,214,241,156,
-115,115,178,175, 56,136,201,104, 98,221,145,105,  4, 79,121, 80,  5, 27,196, 12, 83,178,151,165, 72, 31,248,157,235,157, 62,216,
-195,129, 63,198,150,  2, 61,  2,115, 63,131,211,221, 54,244, 30,  9, 72, 28, 40,  1,183, 10,  3, 70,135,108, 81,156, 21,249, 48,
- 79,143,210,228,231, 52, 97,145,116, 83, 44, 22,235, 94,184, 18,117, 68,242, 89,253,229, 73, 56,  5,181,230,  7, 95,246,135,211,
-209,247,211,227,163,175,  7,244,216,251,143, 59,175,223,189,165,135,182,182,158,134,122,181,197, 97,252,147, 58,186,145, 30,220,
-186,121,239,229,139, 87, 59,111, 62,245,245,101,  7,195,109,159, 27,151, 56, 49,130,189,  1,167,128, 49, 12,115, 93,227, 16, 94,
-  9, 13, 61,244,229, 41, 88, 86,236,235, 51, 64,117, 25, 43, 89,155, 22,144,222, 30,  8,109,245, 52,205,178,101, 53,137,176, 32,
-226,219,210,160, 18,195,106, 44, 78,134, 12,205,177,169,246,255, 61,  5, 16,109, 37,160, 97,  6, 72,214,208,249,210, 13,118,165,
- 81, 22,182,134,147,211,186,109, 43,183, 76,  4,102,233,221,107,102, 27, 65,100,170,  4, 69, 98,192,118, 41,113,183,110,248,125,
-228, 60,150, 48,127, 52, 20,145,109,104, 18, 46,131,165, 52,148,193,162, 75, 95,154,239,177,106,115, 78,232,204, 79,254, 35,  0,
- 95,215,210,218, 68, 20,133,231,206, 35,243, 72,211, 73, 76,169, 77, 83, 75,105,  5, 45, 46, 44,186, 22,193,181, 75, 87,234,162,
-136,184, 18,127,162, 75, 95,136, 40, 21,164, 18, 41,181, 32, 36, 41,109,211,121,221,121,220,185,158,115,238,204, 52, 85, 49, 12,
-100, 51, 33,115,239,156,115,238,121,124,231,124,250,255, 45, 59, 57,176,170,189,104,222,184, 27,236, 34, 57,131, 12,215,224,229,
-185,204, 51, 53, 11, 34,157,160,  8,130, 98,134,152,132,210, 29,122,107,125,183,111,226,204,115,203,179, 61,100, 15,  5, 71, 65,
-218, 45, 13, 65,141, 38, 78, 65, 36,208, 31,166, 32, 12,197, 88, 88,179, 56, 89, 42,151,100, 82, 54,159, 50, 22, 42, 42,192,176,
-148,170,140, 90,149,202, 38,167,194,160, 41,228,240,168,169,136,195,252, 84, 16,162, 96, 18,254, 42, 74, 53, 76,188,238, 25, 83,
- 36,135,151, 42, 16, 20,105,154,206,252,210, 81,243, 41,113,  4,135, 19, 23,121,148, 39,108,222,107,249,183,125,151,196,205, 46,
-198,225, 84,252,137,163,172,135,239,211,168, 10,196,202, 10,166, 53, 36, 46,229,165, 11, 75, 96,245, 71,145,207,148,178, 78,110,
- 35, 25,152, 80,118, 22,188, 74,158,139, 40,198, 43,137, 33,116,149, 57,135,136,148,117, 28,208,127,211,177, 53,216,107,183,  5,
- 86, 69, 11,206, 38,223,190,142,162, 56, 53, 88,213,167,241,113,255,203,201,241, 44, 42, 56, 50,153,148,160,202,130,  4, 16,191,
-114, 77,164, 34,229,  5,172, 63,232, 89,189, 69,179, 71, 79,205, 56,150,  4,209, 39,206,178,148,232,  4,212, 36,103,166,160, 64,
-142, 97,227,104,123,124, 57,224,236,151, 25, 22,202, 52,226,168,106,129,235,143, 99,144,117,194, 66, 17, 89,138, 78, 80, 98,250,
-185,126,165,189, 68,  0, 65, 93,117,216,234,106,124,100, 29,  3,193, 14,224, 96, 31,157,217,134,109,235,246, 85,127,  0,174,241,
-135,239,239, 36, 97, 74,121, 22,130, 87,251,151,208,234, 75,157,190,161, 53,  8, 55,217,245,186,219,195,237,237,225, 77, 73, 72,
-158, 92,164, 63,198, 35,240,215,176,158, 75, 34,224,210,216,156,198, 50,192, 50, 61,203,131,195,230,112,122,144,166, 73,157,142,
- 66, 46, 26,234,  6, 40,121,154, 77,102, 99,208,210,159,199,135,109,167, 77, 61,  0,186,215,106,131, 64, 70, 89, 72, 19,148, 81,
- 53, 64,230,179, 60, 67,254, 39, 16,126,211,116, 44,  7,100,  9, 14,245,245,165,245, 69,215,223, 90,217,244,189, 69,158, 39, 29,
-223,127,244,240,201,116, 54, 69, 63, 17,222,105,138,  7, 94,150,167,231,124,134,  8, 93,166,135,113, 20, 37,193,160,191,  2, 97,
-218, 36, 64, 78,243,128, 39, 92, 80,129,145,114,182, 11,118, 27,179, 67,148, 18, 43,201,129,140,139,236, 90,119, 85, 96, 38, 90,
- 86,194,143,164,166, 76,157, 81, 52,251, 25,124,219, 76,217,234,  2,137, 60,132,160, 12, 15, 28, 99,113,202,199, 97, 52,  1,113,
-145, 96, 79,241,246, 59,253,101,234,101,107,184,238,101, 51,110,106,224, 14, 54,238, 94,223, 25,110,221,222,188,177,182,179,177,
-236,173, 62,184,127,111,247,229, 46,108,200,167,247,111, 95, 61,126, 81,223,137, 12,111,252,156,127,126,189,183,214,185, 21, 29,
- 68, 81, 60, 25,189,217,123,254,244,217,209,254, 17,196,100,240, 38, 64,197,176, 50,164,149, 60,231,103, 88,122,113, 78,162, 83,
-108, 28,101, 10,117,142,129,160,239,246,156,150, 35, 36, 25,125,202,110, 40,170,210,234, 12, 80,  6,180,177,203,149, 14,177, 11,
-253,172,202,154, 13,  2,184,186,167,129, 62, 10, 20, 54, 11,115,250,110, 79,181,229, 41,128, 27, 28, 36,  9,132,184,132,142,196,
-122, 46,185,100,158,211,174, 49,151,180,195,130,254,130,169,127,199,205,204,101, 65,120, 88,217, 92,213,243,168,100,189, 84, 29,
-170,196, 81, 73,150,189,113, 27,225,237, 44, 56, 29,165,  4,216, 36, 36,217,124,135, 14,173,163,154, 28,175, 88, 97,155,171,172,
-167,154,149,115,182,255,183,  0,132, 93,203,110,211, 64, 20,245,140,147, 58, 73,235, 80,212, 22,181, 85,186,233,  6,181,176, 97,
-193,227, 15, 88, 32,241, 53,176,228,123, 16, 27,118,252,  0, 18, 18,160, 74, 93,176,  0,  9, 81, 41, 33, 73,227,198,169,155,120,
-108,199,175, 49,247, 97, 59, 45, 15,145, 69, 36,203,146,101,143, 61,247,125,206,249,127,253,189,221,176, 20, 66,236, 42, 94,145,
-178, 38, 83,  6,212, 68,138, 40,187,166,141,  2,205, 34,169, 90, 12, 16,123, 38,110,234,154,161, 56,222, 62, 50,108,227,204, 63,
- 83,137,178, 36, 70, 70,185,196,105, 69,236, 40,195, 39,141, 92,200, 57,226,230, 11,238, 38,240, 28, 56, 24, 50,109, 33, 11, 77,
-205,  2, 79, 30,128,251,139, 52,178,202, 25,120,132,192,250,  6,241, 32,173,109, 52,219,176,136,125,117,150, 19,119,168,166, 65,
- 24,  8, 47,117,206, 34, 40, 90,148,171, 80, 38, 47,162,214,243, 32, 45, 93,227,183, 86, 48,181, 14, 33,158,202,210,236, 79, 42,
-180,127, 20,120, 74,135, 46,145,136, 79,139,107,156,107,152,222, 23,200,107,  1, 15,145,162,231, 16, 37,192,161,242,177,178,170,
-213,233,170, 83, 80,  9,196,176, 85,198,101,110, 72,184, 50,206,180,192,195,111,117, 91,  4,158, 38,129,195, 38,146,253,118, 52,
-108, 96,179, 99,129,133, 77, 45,115,109,127,111,215, 95,132,219,182,173, 46,166,  3,199, 73,225, 44,198,100, 56, 43,218,149,183,
-177,185,132, 50, 76,102,202,112,104, 66, 85, 83, 17, 93, 35,  1, 58,188,190, 28,165, 47,123,118,239,171,231, 34,159, 51, 33,114,
-137, 76, 38,167, 80,153,132,180,  5,231,171,162,179,190,145,248,  9,223,117, 65,185, 14, 87,229,145,109, 33,203, 89,178, 83,144,
-182,  9,  1, 29,120,102,  8,147, 96, 63,154, 35,145, 92, 81,201, 40, 74,142, 39,164,161,117, 13,  9,198, 66,252, 82,193,225, 84,
- 77,236,150, 29, 70,138, 24, 25, 52,121,223,154, 44, 97,245,131, 52,226,250,208,216, 60,154,123,161,135, 89,  8, 82, 64,103, 73,
-172,195,116,218, 16, 66, 84, 45,114,180,107, 16, 65,175, 89, 45,179,189,136, 17, 92,234, 42, 23, 46, 16, 36, 17,111, 21, 73, 38,
-  3,251,186, 69,218,105,172, 47,145,135, 93,146,160,128,118,253, 41,135, 62,142,239, 48, 90, 23, 22,170, 73, 53,162,177, 55,134,
- 19,150,176,112,200, 93,  8, 21,242,109, 47,251, 23,  3,136,129, 38,222, 68, 45,  3, 88,246, 43,239,242,237,187,215,132,131, 48,
- 14,119, 15, 79,127,156, 50,133, 38, 15,239,181,173, 22, 35,147, 71,179,177, 73, 80,222, 56,139,239, 29, 28,143,103,163, 40,  9,
- 25,192,131,242, 32, 20,232,101, 84,128,134, 27,133,135, 61,218,189,219,159, 59,253,197, 68,211,112, 84,110,172,  0,238, 76, 21,
-117, 25,135, 21,212, 28, 95,138,198, 22,145, 36,160,191,240,147,120,162, 22, 12,179,  8,179,108,143,148,108,145, 28,159,112, 85,
- 44,105, 12,129, 67,158,230,152, 64, 27,198,119,103,208, 92,111, 25,161, 17,132,193,167,147,147,157,222, 62,124,197,206,183, 33,
-239,187, 39,247, 31,125,252,242,225,217,195,167,167,111, 62,159,159, 95,189,122,249, 98,116, 53, 82,239,131,173,238,230,227,231,
- 15,126, 14, 33,251, 49,238,108,236, 92,168, 41,236, 88,240, 54, 16,164,131,101, 71, 22, 96, 10, 31,240, 34, 40,227,131,114, 46,
- 81,180, 36,144,156,193, 84,187,186,226,100,212, 43,193,162,178,193, 88,150,219,152,136,171,184,209,246,173, 43, 52, 55, 48,149,
-213,193,173,206,230,185, 23,204,130, 25,141,115,153, 55, 10,176,  5,227, 34,113,210, 57,208,241, 20,133, 92,114,174,160,144, 31,
- 64,197,199, 20, 25,164,152,249, 92,244,182, 14,134,238,160,248,123, 27, 79,212,230, 90,214,213,121, 81,218,  2,248, 35,153, 10,
- 60,132,108, 15, 94,116,182, 66,134,179,133, 40,171,244,245,131,107, 99,213, 97,212,171, 41, 24,244,255,191,  4,160,235,218,118,
-155,  6,130,168,215,123,177, 19, 59,206,165,137, 41, 72,129, 22,209, 86,226, 82,169, 72, 72,252,  0,223,193,115, 95,248,  6, 36,
- 62,  2,  1,253,  7, 94,248,  0, 30,144,144,144, 80, 37, 30, 64,  8, 21,149,182, 20,209,166,165,181, 19,219,185,216,203,206,236,
-198, 73,139,136,242,150,200,241,122, 99,207,153,153, 51,231,216,255,171,198,204,122,220,227,196,158, 35,236, 19, 67, 85, 52, 51,
- 77,192,144,181, 61, 79,  4,129,240,125, 86, 19,196,197,186, 10,224,250,  5,214, 12,189,144,131,242, 87,112, 63,220,184,217, 88,
- 81, 87,  7,212,124,168, 83,  1,239,151,138, 67,132, 32,142,144, 66,221,  6, 42,113,166, 80,189, 97, 54, 88,215, 49, 44,236,168,
-252, 81,184,196,229, 68, 48, 32,188,131,102,170,186,173,  0,137,  0, 77,  5,196,103, 80,197,139, 84,152,240, 84, 78,109,147,221,
-120,103, 92,100,208, 56,132,148, 20,186,151,197, 68, 79,141, 21, 40,162,175, 81,188,197, 84,182,193, 43,179, 74,190,233, 21,203,
-127, 76, 59,172,236,  2,114,159, 53, 98,103,238, 45,151, 63,149, 56,160,236,217,243,114,254,198, 57,  0, 52,188,  0, 50,207, 49,
-232, 75,107,247, 98,174,225, 91, 38,116,101, 45, 17, 68,  8,138,153,129, 44, 40,161, 19, 89,243, 88, 43,176,175,182, 89,187,201,
- 59, 77,218,172,211, 70,128,155, 94,216,119,215,214,174,180, 59,205, 90,157,244,211,189,159,  7,100, 24,209,225,159, 73,122, 58,
- 72, 78,162,228,244,112,244,173, 71,190,166,116,199,117,247,124,183, 39, 88,106,  3,181,131,169, 31,225, 24,182,  1,213,163,129,
- 61,  7,205, 72,163,153,109,172,205,137,197,128,187,230,  9,206, 75,255,224,104,112,106,193,156,130, 61, 29, 73, 53, 54,126, 30,
-247,169,150, 76,  6, 17,  5, 10, 24,214,162, 18, 89,240,  0,245,129, 29, 74,253,170,135,157,116, 20,132,197, 45,241,157, 26,103,
-206,229,176,  9,129, 68, 70, 89,156,227,184,192,234,181, 85, 50,189, 86, 56, 37,144, 19,227,194,163, 53, 94,117, 14,132, 26,203,
-104,127, 11,195, 18, 24,109,253,106,128, 49, 19,228,  4, 58,181, 14,  4, 12, 32,161,203,245,238,122,148,157, 33,115, 14,158,135,
- 97, 61, 92,240, 91,184,146,226,193,234, 67,117, 22,130, 59, 75,225,173, 59,221,117,  5,237,113,124,166, 80,160, 92,251, 34,163,
-  4,172, 94,115,174, 14,219, 93, 88,170,185,  1, 38,253,178, 21,180, 45,115, 57,128,196,168, 22,156,140,210, 28,  8, 30, 63,112,
- 66,199, 18,142,195, 57, 95,108, 45,170,239,124,252,190,173, 85, 31,140, 34, 56,145,113, 26, 39,105,210,207, 84, 90,128,122, 58,
-136,245, 62, 31,124, 81, 65,139,115,209,242, 27, 48, 43,142, 86,144, 14,227,129,  2,242, 92,168,189, 59, 78,250,111,119,183,119,
-146,227,216, 26, 69, 50,139, 45,245, 44, 31,166,214, 40,195,247,208, 82, 11,102,241,  0, 82,159, 17,234,176, 26,113, 92,221,177,
-132,146, 78,126,158,101,189,193, 32, 27,143, 85,152, 23,148, 46,249,117,105,166, 41,209, 12, 13, 77,205,136,205,195,  0, 42, 48,
-189,253,163,252,  4, 38,213,  7,214,121, 64,157,246,  4, 26,197,242, 56,246,169,120,182,249,244,253,167,119,203,141,181, 55, 31,
- 94,223,126,116, 79,172,240, 62,235, 63,127,245,114,243,241,147, 27, 27, 93,117,222, 47,182,182,234, 85,239,119,255,200,116,176,
- 12, 88, 37,184, 13,  5, 12, 99,195,223,165,168, 56, 85, 68,173, 68,115,100, 11, 67,107,209, 35,159,185,174,170,228,210, 80,193,
-116,138, 50,  5,239,134,244,162,199,248,180, 12,248, 69, 28, 47,141,210,  0, 90, 68,252, 58, 59, 84,167,113,189,179, 76,136,117,
-  1,118,227,216,176,195,170, 10,149,143, 39,168,134,143,118,128, 82,215,229, 33,201,206,107,149,  6,148, 51, 11, 67, 36,221,239,
-237,202, 18,188, 23,211, 99,153,119, 65,244, 29, 15,222,111,198, 78,212,184,150, 35,160,203, 49,138,170, 87,156, 69,216, 57,159,
-181, 12, 75,205,167,146,126, 62,153, 62,220,229, 28, 75, 77, 78,  5, 96,254, 10, 64,216,185,245, 52, 17, 68,113,124,103,187,219,
-217, 75,233,133,109,161,128, 33, 24,  1,225, 65, 69, 19,149, 68, 31,252,  0,198,248,137,124, 49,126,  6,159,253,  2, 62,249,102,
-252,  2,146, 64, 64,193,128,165,133,162,216,218, 45,183,109,187,221,219,140,115,102,118, 75, 11,137,164,111,125,106,103,207,158,
-219,156,243,255,221,112,191, 42,143,234,  0,163, 24,123, 45, 37, 99,145, 50,150,245, 18, 46, 78,103,102, 60, 18,116, 65, 36, 83,
-214, 72,218,144, 53, 83,205, 26,204,224,128,237, 29, 34, 20,104, 40, 61, 99, 78,143,227,226,193,249, 79,135,246,212,  8,152, 22,
- 68,134, 61,180,128, 15,235,177,195, 85, 96,107, 84, 78,234, 24,168,214,129, 77, 14,138,210, 32,144, 14, 20, 10,216,142, 17, 44,
- 62,  8,  0, 33, 40,208,166, 13,149,133, 10,181, 27,116,107,157, 35, 63,236, 83, 78,113,138, 72, 96,229,203,127, 78,127, 67, 75,
- 67,204,103, 72,177,106,155,128,201,  5, 65,128,110,158,135,252,207, 36, 17,205,107,227,110,224,250, 81,255,186,139,119,184, 70,
-241, 32, 26,168, 41,204, 75,182, 72,166,116, 88, 56,243, 42,230, 80,196, 99, 30,155,153, 31,217, 57,218,140,175,213, 99,253, 10,
- 34, 18, 97, 41, 22,174,148, 35,102,107,  0,149,133, 30, 14, 59, 23, 16,125, 68, 48, 88, 20,  6, 44,138,234,219, 59, 63, 88,141,
-215,180, 91,223,107, 77,204, 51, 11,143, 80,150, 99,247,227, 85, 38,169,  3,  7, 75, 20,169,175,227,126,222,132,254, 74,232,103,
- 72, 84, 80,144,134, 88,184, 69, 26,139,169, 93,210,135, 74, 12,  0,136,116, 32,172, 74, 96,189,192,161, 60, 35,134, 27, 69, 94,
-188, 11, 34, 55, 95,194, 19,246,202,147, 50,167,161,200,170,200,166, 12,172, 49, 87, 53, 63,181, 88,105,236,113,116, 43,236,  7,
- 48, 95,201,188, 60, 16, 79, 40,177, 50, 48, 36,231, 71,158,227,158, 74, 98,221, 73,220, 88, 39, 39, 69, 57,236,155,242,218,104,
-239,120,119, 96,244,115,197, 57,187,123,210, 77, 72,  8, 40, 57,195, 98,110,162,125,222, 18,196, 84,167,231, 68, 81,128,  6, 37,
- 18,149, 92,226,246,206, 92, 19,155, 42, 64, 39,220,181,234, 90, 58,165, 90,217,146,101,150,182,234,235,130,100, 45, 46, 48,107,
-141, 42, 59,124,215,235,217, 23, 45,  4,215,248,  6,236,184, 99,204, 82,242,114,161,108, 59, 54,212, 40,220, 94,217, 31,233,  5,
-110,165,185,203,  2,249,234,226,234,254,113,229,151,125, 40,226,202, 45,107,182,113,222,240,189,126,138, 75, 66, 83,206,176,101,
- 79,124,229,246,189,141,131,173,147, 78, 91, 72,173,101,245, 28,123,165,173,177,226,  5,123,177,225,230, 25, 25,186, 49,149,157,
-100,143,245,176, 89, 23,228,222,156,153,191,232, 57, 88,209,125,152, 88,247,244,148, 50, 57, 86,250, 92,251,186,214,174, 92,179,
-213,212,208, 96, 23,138,251, 49,146,224,  5,197, 27,167,193,232,  8,  6,159,101,136, 20,137,180,221,142,166, 40, 22,136, 68,163,
-  7,133, 98, 29,116,152, 17,151,130,  8, 89, 44,193, 74,154,197,254,217,217,153,250,102,245,209,202,125, 63, 37,187,127,237,187,
-185,133,249,133, 59, 62,150,202, 82,105,125,111,123,107,227,219,199,245, 79,111,222,191,101,238,207, 66, 19, 99,216, 90, 90, 94,
-126,242,252,241,210,195,197, 87,175, 95,190,120,250, 76,202, 72,205,205,230,151,119, 31, 42,103,  7, 10, 31,100,135,174, 11,124,
- 66,222,124,138,124,232,118, 65, 60,117, 89,217,197,123,155, 56,109,244,196,182, 26,141, 21,195, 97, 10,150,  7, 41, 51,109,250,
- 33, 32,238,146,212, 74,128,181,227, 38,134,192,146, 20,244,130,221,105,211,161,188, 42,238,  4, 74,137,182, 55,183,242,106,115,
- 31, 10, 77, 52,186,154,206,126,  8,176,114, 73,188, 52,194,227,182,134,181,174,215, 33,252,229,180, 59, 45,222, 49,139, 17,174,
- 34,147, 79,132,204, 57,224, 80,112,232, 46,137,128,  8,230,128, 70,156,140,144,243,144,  7,170, 88,220, 84,120, 27, 98,184,189,
- 32,198,128, 46,203,145, 43,144,170,129,180, 23,124,253, 79,  0,186,174,100,183,105, 32, 12,207,120, 79,236, 56,141, 67,105, 27,
- 53,168, 66,138, 84, 33, 42, 78,112,224,  1,122,231,204,137,247,224,194, 43,240, 22,220,184,192, 17,  9,169,112, 64, 72,112,105,
- 43, 33, 84, 82, 90,209, 84,105,130,155,216,177, 29, 47,195,252,255,216,142,211,208, 91,148, 40,113,188,204,252,219,183, 44,248,
-171,255,237,196, 47, 27,239, 65,109, 39,231,147, 85, 84,128,  1,107,236,134, 93,115, 44,181, 57,139,125, 47,118,249, 46,175, 17,
- 89,151,116, 67,209, 85,  5,146,116, 71,183, 52,205,192,236,155,134, 73,166,  0, 16,120, 62,156, 13,231, 89,112, 61,231,229,112,
- 44, 21,211,121,184,189, 36, 45,180,192,196, 56, 65,172, 49,168,244,192,189,  1, 60,200,116, 13,144,239,138,198,119,120,120, 63,
- 29,207, 39,243,116, 70,208, 90,  2, 25,148, 34,  7,137, 83,148,192, 45,200,243,108,181,233,206,150,176,146,116,  5,107,148,159,
-125,117, 70,145, 45,208, 50, 66,233,129,221, 18, 36,228,197,196,117,113, 32, 73, 90,  9, 25,180, 34,191,198, 72,178,115,167,215,
- 31,157, 20,135,195, 60, 23,100, 89,176, 21,  6, 83,108, 80,153,209, 97, 58, 77, 55, 58, 14,200,254,202, 84, 85,129,254,165, 40,
-116, 30,131, 65,145,201,148,200, 79,236,154, 86,203,210,  6,203,222,126, 61, 86, 10, 28, 85,138,255, 63,174, 16,181,228,202,139,
-  4,219, 29,186, 74, 76,149, 56, 90,219,150,183,187,230,174, 47, 69,191,220, 35, 47,116,145,106,150, 21,181,  8,102, 35,128,  4,
-130,164,200, 54, 29, 94, 66,250,225, 12,117,113,  4, 85,  9, 90,201,155,173,173,179,209,111, 65,187,167,185,100, 19,172,203,186,
-209,104,153,173, 32,242,175,131,  9,255,108,115,109,235,210,189,192,141, 11,246, 71, 67, 49, 64,  3,178,100, 69,231, 16, 38, 88,
-252,150,110,133, 73,136,152,198,210,179,  6,211, 49,138,109,187,156, 39, 69,240,130, 65,140,209, 20,  3,132,186,160,117,139,  1,
-  5,105,201,237,186,227,130,  5, 35,146, 51, 42,246,109,194,192,139,159,161,109, 53,199,211,145,208, 12, 42,101,107, 48,114,178,
-194, 56, 29,178, 28,219,108, 78,130,137, 44,218,113, 84,218, 89,191,223, 31,158,200,  8, 26,227,153, 53,191,  4, 29,167, 59,158,
- 94,249, 81, 14,241,228,135,217,127,180,127,112,124,192,127,141,127,215,157,140,227, 52,126,216,221, 59, 60, 63,148, 80,189, 18,
-159, 36,214,219,232,157,143,206, 96,176,156,132,173,250, 26,143,136, 25, 21,100,106,160,237,160,139, 34,132, 85,129, 39,229,133,
-137, 46, 41, 87,147,191,239,  7,223,138,167, 46, 37,139, 87, 43, 80, 11,184,211, 26, 96,127,153, 84,180,124, 83,188,243,113,153,
- 32, 86,225,235, 38,145,214,116,163,107, 53,119,157,245,143,195,139, 51,111,154,128, 77, 49, 91,145,233, 96,238,233,240,233,131,
-199, 71,126,255,243,155,119, 31, 62,125,121,249,250,213,205,  5, 49, 35, 63,190,255, 60,253,115,202, 31, 97, 99, 80,115,  7,110,
-114, 55,118, 58,237, 39,219,123, 47,158, 63,187, 98, 30, 47, 79,163, 56,106,168,246,229,116,128, 30,172,177, 44,235, 81,  6,246,
- 12,  8,138,207,176, 27,153,116,218,247,206,  1, 59, 75, 74, 78, 17,203, 81, 39,  2,126,205, 36, 74, 87,233,139,164,220,116,137,
- 32,158, 80, 86,194,105,150, 25,246,101,223,142, 84,  4, 19,151,101,101, 51,171,222,244,  2, 15, 13,165,  0,135, 47,248,229, 98,
-183, 18, 74,197,  2,175,116,195,116,163,  0,164,195,  2, 50, 84,147,  1, 95, 41,188, 37,169,132, 88,211,168, 89, 65, 20,128, 32,
-102, 49, 47,204,114,248, 79, 42,128,120, 89, 30,153, 22,201,123,129,160, 41,217,154, 16,  1,255,  9,192,215,181,244, 52, 17,133,
-209,219,185, 51,183, 51,125, 17,  4, 75,136,  9,109,116, 67,194,142,173, 91, 98, 98,252, 19, 44,140, 11,119,110,140,127,193,133,
-104, 26,140,137,143,224, 74, 97,171,127, 66,183,136,184, 33, 85,144, 20,104, 59,165,244, 53,109,231,229,247,125,119,230, 50, 20,
-100,215, 69,155,102,230,206,156,239,121,206,185, 14,223, 19,183, 73,233,250,114, 57,237,228, 56,209,212, 76,200,245,136,107, 46,
- 49,148,132,162, 33, 43,212, 77,205,204, 25, 25, 72, 49,242, 70, 46, 45, 44, 75, 55, 77,221,194, 62,126,224,121,216, 15,247,161,
-242,202,234,  6,252,164, 53,234, 56, 94, 23, 98,131,227, 57,  3,183, 71,246,230,100,164,129,100,181,  8, 81,177, 80,  8,137, 21,
-207,208,126,113, 97,174,116, 64,204,227, 20,229,125,  4, 53,148,  9, 10,225,224,100,207,165,242,204,163,102, 34, 83,224,158,140,
-112,225,  5,181,158,255,225,123,106,194, 43,252,210,226,252, 53,140,168, 40, 48,240,  9,139,214,232,175, 89,164,153,200,148,181,
- 34,  2,150, 41,178,144, 78,182,122,245, 88,181, 24,129, 61, 96,158, 68, 46, 64,117,142,195, 58,158, 22, 40, 60, 80,152,205,251,
- 92, 55,160,126, 65,233, 29, 72,182, 53,199,115, 29,215,207,  5,122, 14,105,221,126,105, 42,251,125,239,224,219,159,147, 76,220,
-161,243,227, 37, 78,249,222, 27,244,102, 75,  8,163,151,158, 41,251,212, 44,199,185,118, 65,160, 76,108,232,139, 52, 79,251, 76,
- 27, 32,205, 37,178, 56,137,237, 17,144, 65,134,193,131,172,226,105, 48,140,143,184,224, 22,156,166,244, 38, 40, 21,239, 28,159,
-214,176,118,161,218, 56,150,221,150,131, 84,110, 25, 98,136, 74,135,225,121,174,164,105,116,242, 42,159,144, 13, 16,100,132, 45,
- 20,203,251,245,223,144,254,226,151, 34, 26, 95, 42,149, 48,210,140, 59,234, 72,242,227, 90,180,194, 43, 12,  1, 25,247,217,160,
-205,137, 85,102,144,253,136,210,133,150, 38,112,195,241,  0, 42,195,209,120,132,122,244,102, 86,154,104, 23, 11,115,141,110, 61,
-150, 98,101, 58, 23, 83,217,130,221,179,105, 99, 63,138, 37,114,171,  7, 82, 13, 40, 83, 80,110,158, 58,212,202,165, 13, 66, 87,
-163,115, 82,190, 89,254,219, 60,  4, 52,135,179,  3, 56,192,117, 50,120,242,209,245,109, 22,  2, 64, 24,250, 28, 93,174,104,204,
- 18, 70, 23, 14,215, 55, 63, 61,127,100,215, 72,163, 74, 42, 58,104, 51,249,105,187,111,235, 76,202, 29,226,244, 73,195,234,205,
-173,186,157,245,103,111,107,131,102,181, 86,189,127,119,229,195,151,141,202,167,151,  9,172,222, 96,139,171,172,121,200,154, 80,
-241,236, 51,  6, 57,254, 14, 99,191, 24, 59,102,172,151, 64,183, 52,129,190,203, 18,242, 97,231, 54,126, 86,  1,110,232,153,235,
-142, 70,253,215, 79,158, 63, 94,123,202, 26,142, 99,183,225,106,237,214,169, 27,  4,159, 55,183, 94,172, 87,118,127,108, 63, 92,
-125,116,100, 55, 55,223,191,187,183,242,160,242,106,109,113,121,233,246,242, 82,208,238,107,183,242,242, 60,107, 63,107, 59,123,
-187,253,225,112,176,221,133,248, 36, 58,238,199,175,111,198, 80,204,120,168,175,  9,183,  0, 55,166,176,223,225, 81, 77, 31,107,
-  3, 72,165, 35,185,189,136,213,164,172, 35, 99, 53,141,104,232, 40, 29,152,162, 15, 60,193,  0, 10,175,216, 37,148,154, 75,151,
-244, 90, 66, 45, 22, 35, 11,175,170,227,229,154, 77,188,228, 24, 89,  3, 50,149,182, 43,100,151, 44,164, 32,161,211, 18,198,139,
-186, 55, 50, 51, 72,106, 11,189,148, 84,124,189, 96,187,167,246,184,112, 44, 79,157,153, 64,  6, 44, 41,152,166, 84, 13, 84,168,
-  8,148,102,252, 36,115, 53, 69, 28, 29,246, 79,  0,194,174, 29,182,137, 32,136,238,222,207,118,236, 32, 39,113,164, 40, 63,133,
- 52, 40, 18, 13, 40, 66, 52, 17, 10, 66,136,  2, 81, 81, 35,122,  4,164,164,160,160,161,162,  0, 41,  5,  5, 61,  5,  5, 20,208,
- 19, 20, 66,151, 10, 68, 67, 67, 76,226,252,176,227,207,217,190,187,245,238, 50, 59,187,123,118, 12, 18,246, 73,150, 44,203,247,
-217,187,153, 55, 51,111,222,120,255,101, 70, 74, 59,145,218,180,162, 96,138,198,162, 78, 21,157,219,185,119,210,181,  6, 66,141,
-129, 19,137, 47,124,136, 31,123, 76, 53,226,199, 92,116, 57,135,200, 46, 75,131,196, 77,192,249,197,138, 15,199,193, 19,128,237,
-159,202, 77,194,217, 53, 88,164, 24,205,172, 30,241, 40,166, 29,236,148,119, 77,175,130,237, 65,117,125,126, 80,219, 67, 70,170,
-242, 96, 28,125, 39,147, 74,  7, 60, 78, 18, 97, 84, 34,184, 48,158, 93,232,188,232, 64,192, 34,254,174, 50,208, 62, 18, 79,161,
-173, 35, 45,  1,127,  8,236, 83, 98,221,142, 49,137,255, 44,158, 72,103, 72, 97, 50,  5,130,132,204, 20,231,142,154,251, 58,253,
-170,136,  5, 65, 14, 46, 87,134,  6, 81,210,142,149,  2,154,193,244,170,101, 41, 87,104,130, 97,178, 10, 66, 88,162,196, 28,141,
-148,190,154,243,231, 49,148, 59,  2,187,207,152,236, 70,162, 19,241,209, 17,103, 34,155, 25,203,101,191, 84, 42, 74, 16, 27,227,
-112,119, 64,153, 33, 77,210, 37,182,189, 77, 34,126,227,182,210,155, 69,207,229,217, 74,156,112,146, 46, 77, 50,174, 51,161,172,
- 62,137,185, 27,208, 32,236,210, 24,201, 90,190,171, 82, 52, 68,177,126, 76,  7,151, 82,143, 51, 53,112,176,251, 78,173, 89,237,
-113,166,169,180,  0,108,225,150,  5,195,148, 13,212, 92, 39,156,175,237, 82, 67, 81, 79,217,255,210, 25, 32, 50,251,110,  0,123,
-197, 70,127,121, 80,175, 96, 98, 42,157,159,216,199, 73,122,162, 44,183,107, 52, 51, 54, 29,198,237, 48, 14,225,239,206,140, 20,
-213, 84, 13, 91,225, 80,196,252, 84, 89,  3, 87, 19,108,110, 12, 71,136,178,101, 61,222,107,118, 26,205,168,  5, 33,120,204, 34,
-  8, 40,139,249, 98, 39,  9,153,226, 25,178, 70,187, 14,159,227,163,227, 77,  8,201,213, 33, 41,206,214, 66,105,161, 92, 43,195,
- 29,168,102, 39,226,140, 19,227,200,  5,169,156,236,251,158,251,187, 85, 75,  0,124, 96,177, 78, 79,134, 17,  0,220, 36, 61,170,
- 31, 98,165, 26, 41,206,234, 14,119, 32,118,241,125,191, 19,181,225,196, 14, 27,135,165,226,100,193,203,237,158, 84,116, 25, 24,
-194,  5,116,163,154,211, 65,116,231, 72, 36,249,205, 75,183, 86,214,174, 74,213, 18, 68, 30,173,147, 55, 47, 94, 47,158, 93, 95,
-123,122, 31, 61,120, 76, 46,223, 37,175,  8,201,204, 18, 54, 75, 26,132,212,208,194,255,196,173, 12,219, 14,169,126, 37,114,139,
-136,103,136,248,115,196,212, 98, 81,121,198,245, 98,149, 42,129, 69, 79,192, 47,234,203,254,237,199,119, 82,105,236,237,252,154,
- 89, 90, 32,197,194, 52,153,130, 47,111, 84, 87,120, 24,110,111,126, 90, 93, 94, 30,159, 44, 46, 94, 60,127,251,193,157, 11, 87,
-150, 51, 94,230,229,147,231, 91,155,219,247, 30, 63, 44, 87,118,151,230,207,205, 79,207, 93, 95,189, 70, 90,100,131,125,126,251,
-254,221,199,141, 15,115, 99,165, 30,235,101,188,108, 35,106,233,241,166, 92,191, 41,210,204,169,126,198, 52, 28, 50,157, 53,136,
-216,133,150,181,112, 81,242,212,146, 71, 76,239,157,153,174, 33, 77,229,210, 25,120,176, 69,202,104,163,131,214,112,192, 42,246,
-205,228, 41,205,174, 52,178,193, 74, 80, 10, 25,105, 62,200,  3,172, 68, 17,114, 43,245,142,252,124,218, 87,106,239,155, 30,248,
-201,113, 88,213,200,128,158,230,174, 59, 92,207, 48,213,109, 13, 18,158,145, 66, 80,170,181,143, 19,193,134, 98,126, 21,106, 34,
-194,128,  5, 27,205,230,155, 74,177,117,184, 64,152,190,254,  8,192,216,181,235, 56, 13, 68,209,241,216,142, 95,  9,155, 21, 65,
- 74,  4,226, 81, 32, 88, 10, 42, 10, 68, 69, 15,162,129,150,138, 79,160,164,  4, 33, 42,168,144,248,  6,126,  1,  9, 81, 65,177,
- 43, 10,164,149, 22,216, 37,130,108, 36,164, 93, 32, 15,109, 28, 39, 99, 15,247,220,241,100, 13, 10,143, 20, 86,138, 56,137,157,
-155,153,115, 31,231,156, 63,226,119,183,194, 20, 88,152,114, 24,194,162,203,167, 56,240,124, 14, 52,219,238,114,143, 75,153, 39,
- 62, 43, 10,  4, 50,136,253, 56,244,104, 21,138,235, 94,  2,233, 21, 12,194, 65, 78,  0, 14,118, 82, 68, 30, 58,116,147, 60, 43,
-208, 45,116, 14,102,233, 28,122,200,176,  8,165,192,165,133,126,172,198,  5,247, 68,141,163, 57,215,100,121,  2, 21, 87,167,176,
- 57,176,189,  3,172,233,116,  9, 37,153, 50,204,254,183,165, 34,179, 46, 14,141,188,139,191, 80,184,116,133,218, 43,150,173,236,
-116, 92,141,142,130,  7,241,203, 41,191,147,165,164, 88, 42,198, 92,110,222,132,212,148,163,172, 21,139, 25,126, 98,  9,154,  2,
- 71,140, 40, 56,101,219, 72,114,227,223,101,228,202, 22,126, 16,118, 15, 60, 13, 53, 74,151,226,219, 95, 59,219, 46,226, 40,163,
-187,133,145,108, 61, 87,122,146, 21,147, 84,117,146, 96,173,222,120,241,233,243,120,174, 78,120, 65,191,191, 11,213, 67,198, 66,
-116, 91,211, 74,161,198,100,230,139,210,172,172,148,107, 98, 83,184,117,216, 63, 89,138, 49, 35,129,186, 15,221,155,154, 43,147,
- 64, 30,107,200,154,215,217,236, 13, 10,171,200,154,179,197,  7, 74, 99,166,116,200,146, 30, 20,235,  4, 87, 67, 63, 84,180,198,
- 19,106,150,172,  0,236, 56,148, 96,240,212, 78,110,186, 34,142, 29,129, 41, 12,142,213,165,190, 39,255,131,160, 60,193,157, 24,
-165,173,175,165,100, 62, 47,189, 46,170, 37,245,176,145,205,210,209,116,100,140, 46, 91,141,214, 30,108, 48,173,151, 60,  4,241,
- 33,200,101,185,177,  8, 36,147,201,139, 82,183, 85,235,101,110, 98,204, 96, 66,197,213,119,131, 56,136,211,108, 58, 87, 83, 32,
- 10,237,212,188,144, 71,245, 41, 53, 57,213,251,214, 51, 13, 18,171, 24,110,102, 71, 17,125,148, 89,213, 67,108,207, 14, 44, 36,
-115,163, 96, 69, 31,140,166,168,235,179,204, 36, 79, 71,129, 15,  5, 89,  0,152, 53,242, 48, 26,104,100, 28, 33, 81,152,208,213,
-166,115,246,245,  5, 41,172,  1,146,151,116,173, 79, 40,  0,255,185,211, 23, 94,246,223,173,239,108, 84,163,237,203,171,238,201,
-171,103,248,233, 17,113,109, 40,158, 90,164,190,194,187,183,131,202, 11,126,239,125, 33, 40,156,105,113,120, 46,196,147,187, 66,
- 60,  6,243, 68,155, 26, 30, 30,161,244, 40,251,222, 79, 39,  1,101,219, 81,156, 82,252,100,  7,119,110,220,190,255,236,209,248,
-199, 48,159, 21,205, 90,  4,126,111, 28, 53, 87,155,223,187,187, 23, 47, 95,121,179,254,250,120,187,163, 92, 49, 87,138,224,254,
- 72,101, 15,239, 61,216,122,251,241,214,245,155,155, 31,182,222,119,183,183,191,238,244,247,186, 11, 96,116,169,125,126, 37,105,
- 76,178,180, 25,172, 12, 38, 67,218,146,145,224, 11,101, 18, 65, 90, 14, 86,147,214, 96, 58, 50, 42, 19, 96,218,224,232, 86,144,
-152,102,207, 24,101, 29,250,138, 74, 63, 85,148, 54,212, 86,  1,111,177, 64, 35,194, 88,222,192, 10, 75,230,149,153,150,255,208,
-202,183,111,173,173, 39, 28,127,  9,109,180,  2, 13,202,174, 14,234,252,171,159, 87, 81,214, 53, 33,105,141, 63,  3, 55,202, 25,
-185, 90,133, 59, 51,219,122,232,238,  7, 47, 67,233,129, 30, 81,169,  2, 47,144,168,169,207,252, 20,128,175,171,215,109, 34,  8,
-194,187,123,183,190, 59, 59,142, 67,108, 67, 10, 66,148,136,164,161, 64,188,  0,143,192, 11,240, 22,148, 20, 20, 20,148,212, 52,
- 52, 20, 60,  0, 84, 80, 33, 65, 79, 17, 33, 37, 10, 34,  9, 17, 86,112,126,128,216, 57,123,111,111,111,153,153,221,117, 44,217,
-138,101, 89,246,234,206,119,167,217,157,153,157,249,230,155,152, 93, 23,118,159, 56,239,254,211,117,131, 10, 16,154, 40,212, 74,
-217,144,177,117, 10,143,176, 86,132, 21,225, 37,200,164, 84,162, 16, 85, 84, 19,200,227,138, 45,227,104, 42,151, 70,101,181,122,
-198, 83,228, 49, 68,102,  6,112,232,244,101, 49,204, 11,164, 15, 28,153, 17,174, 34, 18, 26,108,227,186,245,118, 34,107,  3, 61,
-168,225,223,192,241, 22,171,247, 49,148,239, 26,145, 27,235, 41,248,173, 15, 29, 48,207,152, 53,181,110,249,245,137,212,104,134,
- 92, 51,104,118,214, 74, 91, 23,227,127, 65,185, 79,186, 80,177,104,198, 90,206, 43, 46,179, 19,255,180,100, 37,220,171,140,147,
-245,155,155,187,189,237, 80, 78,224,220, 55, 35, 38,180, 15,204,222,238,172,255, 58,251, 33,137, 50, 23,156,202,200, 86,157, 68,
-140, 64,156,134, 55, 98,145, 38, 38, 46, 47, 65, 15, 15, 20,236,103, 75, 95, 58,141, 80,110,190,154, 53,190,236,247,246,207,135,
-224,194, 39, 77,254, 96, 99,177, 80,216,105, 15,153, 38,181, 81,154,172, 98, 89,141,180,205, 13,230, 90,243, 16,124,215,129,141,
-  8,190,255,165,136,141, 68, 50,122,180,228, 77,201, 64, 60,170,196,250,190, 68,162,155,126,116,110,215,187,199, 27, 93,249, 29,
-155,237, 32,162,134,246,169,200, 85, 47, 92,173,  8,197, 95,  4,197,226,137, 11,144,114,241,150,165, 50,  3,103, 86,161,194,197,
- 88,181, 20,241,106,103,245,240,244,  0, 78,110, 55,150, 79,135, 39,160, 79,101, 20, 99, 35, 74,202,119,193, 65,237, 70,251,247,
-176,207,201,  4, 58,153, 84, 46, 29,195,108, 62,198,217,178, 84, 95,202,100,134, 52,100,  8, 56, 25, 58, 62, 97,183,138,155,105,
- 75, 97,239,145, 64, 53,201, 28,185,171, 93,235,172, 33,118,141,134,107, 34,166,240,110, 53,205, 54,225,249, 52,184, 24, 87,133,
-206, 11, 39,169,110,235, 86, 67, 54, 14, 79, 14,168,135, 56,219,239, 31, 10,170,248,119,213, 44, 20,165, 55,174,212,  5,129,140,
- 90, 41, 93, 56,160,168,240,237,216,240,122, 35,149,231, 84,206,158,197,217,221,149,205,111, 63,183, 23,147, 58, 50, 49,  8, 10,
-230, 50,222, 93, 88,134,135,186,211, 89,219, 59,222,131,217,  1,115, 47, 73,146, 63,131, 51,227, 97,211, 54,160, 39,162, 81,165,
-106,150,237, 30,237,120,102,220,112,239, 31,190,126,124,254,228,197,179,151, 79, 25,235,178, 54, 99, 77, 18,243,  5, 99,155, 36,
- 87, 19,126,246,200,146,131, 33,216,130,147, 86, 60,227,  0,215, 20,165,193,215,184, 42, 83, 24, 17, 17,149,143,144,225, 17,241,
-235,119,111,224, 45,105,194, 60,126,248,168,217, 90,120,245,254,237, 34, 75, 96, 49, 94,216,124,235,254,189, 98, 30, 19,237,231,
-157, 79,179,131, 32,232,246,194, 13,216,105,105,173,251, 69, 31,185,170, 81,197,152,122, 84, 87, 48, 85, 13,184,125, 18, 91, 53,
-  9,106, 56, 18, 81, 19,152, 56, 70,139, 47, 66, 61, 59,102,219, 65,243,104,244,238,132, 38,120,191, 33,112, 53,207,210, 52, 87,
-  3,206, 38,219,114, 59,191, 83,155,243, 34, 60, 28,197,  4,155,192,175,163,160,242, 89,168, 64, 19,198,188,135,226,  3,228,  1,
-235,200,167,  1, 65, 87,196,142,115,148,  4, 65,247,132,211,174,240,  4, 17, 93, 31, 73, 52, 43, 53, 29,195,183,158, 13,219, 49,
-202,147, 11,143,219, 65,195,175,152, 92, 29,184,209,231, 87,105,193,153,255,  2,240,117, 53,189, 77,  3, 65,116,119,189,235, 56,
-113, 74, 62, 26, 65,219, 11, 82,  1,  9,206, 28, 56,243,243,144, 16,127,129, 27,127,168, 23, 40, 18, 31, 85,211,202,137, 83,183,
-177,157,216,177,119,151,153,217,216,109, 34, 90, 41,183, 68,142,188, 31,111,223,204,190,121, 35,159,  0,247,182,107,182,216, 62,
-154, 18,129,204, 37, 12,208, 13, 70, 52,  7,177,187,201, 20,174, 53, 45, 98,  4, 38,  6, 56,154, 57,139,218,  2,182,168, 74,215,
-146, 99, 63,184, 14, 87, 48,166,119,171,  5,108, 72, 29, 12,200, 28, 85,146,151,140,116,122,117, 18,231,107, 13, 40,  0,123,129,
-  1, 21,224, 67,222, 61,  9,143, 39,253,241, 52,187,158,175,103,138, 75,236,198,105, 96, 62, 75,109, 60,202,237,218,193,193, 36,
- 45,150,212,255,204,180,221,  7,237,206,196,218,189,102, 35,251,158,154,255,155, 84,223, 11, 56, 30, 60,155,  7,246,161,156,237,
- 36,214,158, 56, 51, 90, 83,225,251,171,239,103,221,113,178,142,191, 95,157,181,238, 11, 15, 34, 36,214,212,145,217, 56,185,132,
-201, 89,193,209,104,109,159,102,228,119,134,213,137, 93, 97,147,181,145, 94, 29,229,241,199, 15,199, 54,196, 78, 79,204,211, 36,
-159, 23,188, 20, 23,139,228, 44,158,  5, 82,  5, 74,172,138, 18,139, 22, 13,223,160,170, 29,251,104,247, 20, 64,  8, 74,  5,138,
-138,109, 42, 93,104,188, 15, 41, 53, 91, 35,101,194,140,141,223, 84,112,  5, 13,157, 23,180,244, 36,  9,111,106,205,209, 19, 14,
-155,113,242, 60, 99,175, 94,112,169,194,159, 81,129,192, 78, 29, 60, 48,  8,240, 59, 61,127,144,100, 49,173, 58,132,121,224,238,
-200,111,209, 35,194,137,255,244,168, 55, 56, 26,158,252,138,206,225,255, 47,226,191,110,172,136,250, 19, 45, 96,117, 59, 27,240,
-131,104, 25, 49,215,251,111, 27, 83,243,131,238,  8, 48, 29,104,251, 44, 69,220, 95,228,139, 64,118,169, 12, 80,224,  5,172,107,
-109,195,209,160, 24, 16, 19,224,217,247, 58, 97, 16,222,230,137, 83,236,143,123,147,139,248,143,181,174, 12, 29,  8, 18,119, 23,
- 72,173,123,199,214,  9,132,146, 39,206,149,145, 78, 96,115,125, 27,145, 49, 36,198, 15,192, 50,164, 84,101,185, 86, 42, 40,171,
-181,161,125, 23,248, 93,120, 67, 64,118, 18,237, 49,222, 48, 70, 20,161, 11,138, 75,  4, 79,203,220,163,103,231, 69,126,126,245,
-  3, 56, 62,121,  8,147,208,158,194,137,121,118,  3,124,112,154, 92, 34,179,193,106,166, 20, 77,101,129,130,111,210,109,177,110,
-211, 88, 18,198,252,229,112,114, 50, 24, 47,231,153, 47, 85,141, 85,151,104, 79,117, 53,157,158,158,190,113,133,216,  0,188,248,
- 25, 51,246,174,185, 51,218, 16,226,195,103, 65,115,236, 17,220, 55, 89,144, 61,239, 14,120,211,215,135,207,103,119,137, 59,192,
-128, 99,105,163,134, 29, 31,182,237,242, 38,249,252,229,211,209,251,183, 95,249,183,254,104,104,224, 11,219,169,106,237, 91,159,
-236, 84,201, 42, 65,215,143,249, 56,161, 86, 85,246, 22,233, 77, 90,172,250,157, 48,202,110, 11,106,153, 93,234, 10, 54,120, 97,
-170, 18,109, 71, 49,102, 15,213,179, 97, 56,130, 21,141,171, 68,250,  2, 25,158,228,216,251,157, 52, 85,166,230, 90, 89,114,233,
-  6,114,129, 75,176, 22,189,  0,157, 75,248, 70,108,157, 39,184, 59,100,205,110,190,196,237,123, 99, 27,158, 15,163,119,120,112,
- 24,223,205,133, 16,108, 39,159,243,144,125,155, 54, 13,239, 50,101, 14,217,141,171,145,218,138, 94, 88, 35, 15,225,251, 74, 10,
-187,195, 33,154, 74, 17,183,192,141, 67,121, 56, 77, 41, 70,123, 76,187,113, 79, 42, 27,197, 60,  5,226, 24,238, 99,248,168, 91,
-125, 14,  1,253, 63,  1,248, 58,183,221,166,129, 32, 12,251,136, 93,187,164,117,105, 67, 43, 36, 42, 46,144, 16, 55, 84,189,  2,
-137,151, 65,125, 30,174,184,229,105,184, 45, 15,128,  4,  8, 21,165, 74, 75, 91, 39, 78,136,215,235,236,129,153, 89,175, 15, 13,
- 16, 89,185,201, 65,150,189,158,157,253,119,230,251,131,127,  7,247,110,115,181,101,187, 27,241,157,228, 84, 66, 32,145,  0, 78,
-242, 46,206, 21,173,174,175,140,131,148, 54,172, 71,220, 15,140,224,157, 44, 48,203,186,204,171,188,228, 72,106, 46,234,  5, 85,
-190,163,119, 56, 85,136,192,212, 28,166, 15, 82, 88,191,103,241,  8, 27,130,  2,200, 94, 30,238, 39, 89, 18,198,107,165,198,241,
-227,216, 75,174,216, 20, 30,162,144,156, 63, 32,197,132,185, 29,198,117,142,  9,142, 41,141, 50,128,181,205,120,237,221,115, 10,
-236,135,117, 11, 97,234,255,202,  8,193,184, 56,226, 24, 53,250,255,230,185,131,223,246, 63,235,255,121, 83, 41, 31,208,242, 93,
- 18,136,102,201,102,132,115,104,245, 95,213, 82, 68, 58,216, 27,202,220,213,146,162, 78, 98,215,214,  1, 93,231, 64, 97,120,133,
-209,155,186,242,234,226,251,209,254,225,193,163,189, 91, 94, 75,161, 18,207,255,116,113,249,245, 46, 79,  2, 63,245,181, 91,253,
-102,176, 42,162,166, 20,114, 35, 86,  1,109,224, 68, 40,248,232, 16, 46, 93, 20, 86,144, 33, 72,103,197,229, 54, 54,163,171,165,
-162,155,103,250,173,236,  1,185,119, 73, 72,249, 45,204,159,144, 42,150, 66,200, 38, 50,106,197,213,211,140,255,248, 37, 20, 21,
-151,248, 68, 90,149,162, 46,228, 77, 87,255, 66,145, 50,242,225,201,175, 73, 91,112,210,104,167, 96,115,134,253, 53,174,173,118,
-192,161,141,125,100,164,230, 75, 41,108, 17,132, 99,116, 21,109, 83,  7,114,125, 81,197,106,110, 40,222, 16,115, 95, 63,127,115,
-254,237, 92,202,182,  7, 77, 91,140, 19,220,181,154, 64,102, 46, 36,131,117, 89, 27, 59,  1,120,104,114,118,107,160,146,186,249,
-166, 28, 84, 58,120,222,222, 86, 22, 71,241,228,110, 98,111,175, 74,163,148,218,214, 33,153,231, 84,164, 37, 97,160, 18,150, 49,
-220, 73,119,167,121, 73,  6, 17,166,215,  6,207,147,252, 16,145, 89,100, 73,117,176, 22,117, 70,233,168, 40, 11,236,192, 68, 50,
-  1,178,145,217,154, 35, 95,197, 35,222,  3, 86,142,153, 86,112, 13,179,241,138, 33,102, 89, 53,235,101,131, 93,106,104, 77,190,
-149,110, 33,204,193, 73,190, 61,126,249,229,230, 39,162,247,252,166, 43,245,236,236,221,135,247, 31,141,196,226,108,147, 14, 15,
- 99,104, 66,178, 12,156, 77,235,182,244,130, 86,106, 48,147, 51,199,250, 40,123,253, 62,144, 56, 12, 78,143,158,204, 42,180, 40,
- 92,235,174,233, 78,144, 12,  2,139,209, 93,234, 84,227,  6,230,229, 32,216, 72, 25,163, 47,114, 31, 37,111,250,255,189,102,124,
-241,249,122,241,183, 79,154,218, 77,215,143, 33,  9,153,215,115, 56, 14,178, 87,135,227,147,181,204,165,184,246,201,168,208, 15,
- 35,136,105,232,217, 39,152,192,165,146,167,201,154, 67,106, 81, 66, 66,166, 24,206,  1,202,194,184,104,135,195,163,208,116, 79,
- 48, 81, 86,196,193,161, 32,132,217, 51,183, 38, 74,142, 53,215, 83,125, 22, 97, 19,171,141, 35,171,106, 30, 97, 56,142,199,207,
-166,249,101, 45,185,171,221,225,246,158,163,135,121,251,128, 45,217,213, 70, 54, 72,250,141, 16,239, 54, 33, 74,110,204, 11,221,
- 78, 58, 66,192,176, 60, 65,202,222, 70,162,251, 71,  0,194,174,101,183,105, 32,138,206,195,246, 56,205, 67,128,132, 88,  0, 10,
-170,132,232, 14,177,169,248, 13,216,241, 29,124, 69,249,  6,254,132, 21,251,178, 64, 98,  3,164, 72,105, 43, 65, 28,218, 82,227,
-196,246,100, 60,195,220,123, 29,103,210, 32,200, 34,203,200, 73,198,215,231,158,123,238, 57, 17,219,192,198,173, 89, 51,223, 10,
-184,104,163,147, 17,188,183, 37,222,215, 16,141,200,125, 45,182,119,120,147,  3,111,227, 65,158,111, 63,251,178,223, 79,246,148,
-236,245, 35, 37, 32, 12,207, 63,207,139, 92,255,  6,  7, 65,223,  3, 90,160,162,181,135, 59, 43,248, 88,180,241,146, 74,198, 35,
-217, 19,201, 80, 65,168,121, 47,137, 19,143, 43, 35,153,104,107,177, 63,147,189,120,248, 68,141,178,122, 54, 95,204, 98, 22, 59,
- 65,  6,249, 30, 34, 10,215, 78, 48,204,206, 87, 97, 97,101,119, 91,142,248,124,205, 65,217,  0, 79,111,132,166,104,  2, 69,174,
-179, 60,232,206,194,145,233,223, 20,143,161,182,157,188,160, 48,144, 75,116,202,152,205,  4,155,119, 62,156,172,157, 94,216,210,
-217,148,  1, 87,174,  9, 90, 81, 51,139,205,244,157,152,221, 30,196,163, 84, 14,192, 28,221, 28,127,152,156,251,206, 52,138,174,
-181, 94,  0, 79,  3, 88,205, 65,148, 43,228, 70, 25, 37, 93,  4,155, 18,181,245,109,147, 72, 37, 43,160,145,133, 74, 13, 62,156,
-144,164,  8,190,224,154,201, 85,227,171,189, 76,208,137,186,  4,133,147,173,160, 79,100,123,  2,160,189,194,  7,154,241,141, 20,
-238,151,233,  6, 40,248, 97, 34,141, 71, 76, 13,191,119, 43,250,113,109, 99,170,210,156,173,208,  5,198, 74, 52, 44,160,153,134,
-100,160,192,193,196,  6, 96, 45,116, 69,174,220,219, 35,105, 87, 80,186, 86,183, 65,230,130, 31, 16, 41,121,  9, 34, 35,178,211,
-164,179, 15,248,122, 50,155,144, 78,128,  5,109,172,104,119,172,  4,170,225,160,213, 29,168, 65,109,106, 68,247,187, 41, 92, 78,
- 69, 10, 90, 52,186,149,173,187, 92, 92,142,123,227,224,137,141,131,  3,  0,224,218,241,118, 54, 91,154,178,130,157,117,247, 29,
-247, 84, 45, 54,232,139,154,254, 46,174,141,233,110, 33,211,106, 93, 45,114,235,118,144,142,242,229,175, 52, 86,144,227,108,180,
-182, 70, 52,162,145, 60,  1,255, 78,244,233,236,216, 86, 82, 65, 99, 96, 34, 17, 18,162, 11,132,167,240,  7,206, 78, 47,178,215,
- 47, 95, 77,231,231,239,166,159,232,106, 15,247,159,222, 63,120,116,244,246,  8,155,177,  4, 14, 13,193,135, 37,190, 63, 91,127,
-171, 51,198, 50, 36,103,192,131,134,181,  7, 13,236, 37, 54,199,121,148,164,159,127,102,121, 85,170, 88, 25,204, 40,  2,124,  8,
-114, 45,137, 26, 39,155, 62,222,159,190, 63, 38, 87, 39,114,161,199, 72,250,  6,180, 47,214,164, 50,170,254, 87,226,255,253,122,
-112,247,160, 40,178,139,  2,146, 84,231, 87, 31,251,227, 23, 15,159,191,169,243, 47, 98,113,  2, 75,144,254, 40,206,207, 76,149,
-187,252,132,149, 95, 33,176,198, 95, 21,  4,175, 53,130,182,157,200,225,144,217,142, 49,185, 41,150,105,133, 33,118,109,211,200,
-175,150,232, 86,  6,131, 48,219,202,216,131,106,192,185,235, 88,188, 78,146,231, 58,207, 71,230, 78,179,111,150,250, 66,190,197,
- 12,220, 48,238,177,129,246, 46,192,131,107, 33, 76, 88,226, 69,192, 65,216, 29, 86,103,251,161,209,128, 15,121, 71, 72,181,213,
-251,143,  0,148, 93,191,139, 19, 65, 20,158,153,157,157,205,230,199, 37,103, 17,229, 56,173,188,127,192, 66,  4,209,194, 66, 56,
-176,177,187, 70,193,255,192,194,202,198,206, 82, 44,172,173,180,184, 78, 14,177,176, 23, 27, 57,131, 34,  8,130,228, 68, 65,115,
-254, 72,118, 55,183,217,205,206,140,243,222,204, 38,187,145, 43,108, 66,216,133, 13, 76,118,190,247,190,121,223,251, 30,175,246,
- 49,173,128,123, 21,217, 43,197, 85, 28,135, 12,128,  3, 17, 67, 17, 23, 34, 13,107,231,132, 11,194, 13, 80,132, 44,  4, 49,128,
-199, 53,101, 57, 88, 90,105,157,  3,  9, 13, 25,215,  8, 91,185,243, 34, 52,185, 19,179, 37,251, 57,  1,163, 65, 64,107,110, 80,
-213,100,251,254, 26,209, 61,248, 73,223, 92, 52,105,152, 79,189, 38, 21, 13, 95, 29,169,226, 84,184,209,100,225, 48, 57,240, 21,
-  7,  8,147,216,155, 79,114, 84, 81, 50, 85, 95,  9, 90,211, 59, 58, 31,249,210, 86, 44, 64, 99, 72,123, 14, 81,242, 26, 70, 23,
- 59,136, 45, 44, 59,255,213,171,147, 99,168,103, 29,225,129,224,163, 85,134, 87,119,245,  1,169,169, 91, 55, 59, 79, 21,190,135,
- 12, 42,119,102,123,140,235,207, 22,192,176,105,191, 73,214, 91,188, 19,240, 66,179, 44, 83,227, 92, 69,153,  9,153, 50, 53,224,
-132,  1, 64, 99, 12,232, 10, 47, 20,134,  9, 65, 50,  6,147, 94,225,180, 82,181,209, 36, 41, 80,122, 38, 73, 92, 64,148, 22,158,
-110,121, 38,211, 87,  1,116,235,171, 89,  1,183,124,170, 27,146,  8,170,103,115,  0, 52,159, 88,221, 40,172,171,249,236,162, 73,
-150,240, 88,219, 32, 34,230, 66, 73, 74, 78,119,197, 40,202,  8, 52, 43,121,118,251, 27, 86, 30,240, 86,156,199, 56, 85,150, 34,
-240,197,118,205, 59,141, 78,191,119,242,219,175,175, 74, 21,245, 26,  5,165, 43,246,205,213,110, 13, 76,179, 12,201,195,134,100,
- 32, 37, 78,129, 70,  1,139, 81,154,178,154, 46, 45,118, 24, 84,165,148,156,102, 83,147, 56,195,155, 71,193,220, 35,158,197,216,
- 47,193,172, 22,130, 35,190,187, 14, 50, 68,225,225,207,225,146, 99, 81, 61,153, 77,136, 43,250, 86, 12,114,209, 64, 92, 90, 73,
-157, 46, 79,248,137, 94, 22,234,244,114, 88,132,185,243, 59, 25,155, 43,135,209,  8,114, 16,179, 68, 66, 96, 59,143,186,118,238,
-234,171,143,175,231, 96, 31,  1,143, 17, 76, 88,179, 44,106,223, 73,102,183, 61,179,210, 10,133,116,208,100, 75, 39,194, 94,146,
- 37,135,105,252,248,197,222,147,187,247,245,102,111,247,217,243,237, 27,215,183, 46, 93,216, 62,127,  5,194, 10,109, 64, 88, 44,
- 48,194, 72, 60, 47,159,150,209,230, 51, 33, 63,240, 93, 97,165,118, 10,242,252,133, 64,142, 90,161, 42,144, 11, 41,185, 97, 42,
-196,227, 74, 54, 61, 80,106,194, 36,123, 47, 40,228,188, 31,174,147, 54,127, 63,120,235, 76,  0, 80, 35,205,192,205,198,  9,214,
-206,246,186, 95,162,116,231,242,206,102,255,204,238,155,189, 15,159,246,255, 23,223, 15,190, 15, 30,221,121,122,251,193, 45, 28,
-158, 67,134,131,135, 91, 55,239,173,109,244,139,232, 34,201,226, 34, 75,130,228, 15,105, 53,149,151,167,239, 94,202,209,208, 22,
-103,212,209, 84,195,228,202, 84, 78, 35, 53, 25, 21,121, 44, 77, 22,131,200, 44,181,166,213,201, 61,238,207,164,139,157,239,  6,
-184, 81,185,172, 85, 86,206,104,172,223,178,174,251, 28,184,126,163,242, 52,134,209, 99, 78,110, 93, 67, 21, 78,235, 94, 22,115,
-237, 85, 91, 38,176,178,142, 58,196, 91,231, 14, 86, 58,144,213,242,146,154,223, 97,101, 62, 82, 77, 20,250, 87,  0,202,174, 93,
-183,137, 32,138,206,204,206, 62,252, 72, 44, 39,136, 40,  6, 98, 68,135,160,  8, 82, 10,132,  4,174, 40,248, 24,126,130,130,191,
- 65,136,135, 82,240, 40,104,137,144, 18,  9,138, 20,177,100,160,192, 73, 76,236,245, 99,189,235,121, 48,247,206,142,189,113, 34,
- 16,165, 37,123, 37,239,206,222, 57,115,238,185,231,240, 37, 78,167,  8,111, 93, 72, 30,155,187,  1, 35,163,138, 99,171, 52,180,
- 67,180, 17,184,196,  0,168,226,224, 39,101, 80, 35, 36,109,  4,168, 47, 76,149,  8, 52, 18, 74,152,231,225, 83, 58, 49,197,148,
-234,208,163, 17,171,128,177, 31,210, 86,156,120,214, 57,192,131, 34,  2, 98, 74, 40,125,138, 14,101,198,102,190, 41,103, 67, 64,
- 67, 44,132,214, 10, 43, 49,131,124,188,177,200, 54,171, 27,230, 39,157, 97,155, 83, 30,152, 51,137,103,118,111,206, 96,107,192,
-220, 33,186, 24,230, 47, 84, 92,183, 81,217,180, 22,165,202,126,101,164, 98, 43,154, 94,124, 95,233, 66, 85,167,243, 13,150,157,
-211, 87,208,191,180,108,233, 37, 99,192,204, 97,  0,141,158,139,112, 79, 61,231,165,108,221,210,124,169, 98,161,198, 78,185, 56,
-127, 60,117, 66,174, 24,216,110,110,153,169,196,166, 86,102,224,136,104,254,100, 50,163, 97, 68, 54,148,151,162,184,196,192, 99,
-207, 35,181, 16, 98,131, 65,182,136,107,  7, 34,132,113, 99, 30,207,108, 71,139, 78,  4, 56,201,184, 65,  6,  3,168,225,113,  6,
-104,181, 92,166,  0,213, 45, 95, 33,128,145,167, 83,224, 51,105,  9, 19, 42, 51, 73,202, 33, 45,161, 66,179, 22, 81,  3,146, 60,
- 48,138,100,245, 26, 59, 60,102,137,176, 19, 40, 10,105, 40, 54, 21,  9,115, 55, 30, 89, 17,107, 88, 68,198,211,209,247,227, 73,
- 65,240,126,177,  7, 50, 23,247,146, 66,216, 30, 32,177,  4,188, 34, 64,194,194,205,126, 14, 40,146,160, 31,143, 35,146,244,178,
- 22,181,  8,117,132, 18,163,233,200,154, 77,197,201,217,181,181, 27,221, 65, 23,229, 23,186,121,245, 86,251,228,200,174,106,199,
-190,177, 69,131, 93,219,227, 55,  6, 37,229, 10, 55,247,106, 40, 55,211,192,242,121,245,156,162,212,203,127, 74,218,218, 96, 74,
- 54,178,240,104, 79,164,147,108,186,181,222,236,156,116,222,239,127,  0,127, 27, 16, 10,193,117,  3,238,103,208, 19,118,166,164,
-202,242,237,208, 71,241,  2,223, 20, 86,136, 42,227, 60, 78,227, 74, 84, 53, 23,111,247,123, 79,159, 61,223,217,190,221,120,112,
-231,221,238,238,195, 71,173, 46,201,106,193,250, 64,140,  0, 57,217,250,110,158,107,  3, 23,147,125,221,215, 16,188,167,144,160,
-230,232,144, 94, 46,119,  6,218, 10,166,163, 34, 22,174,132, 33,182, 31,224,168,110,192, 56,158, 30,112,  4,131, 49,243, 70,214,
- 74, 32,105,127,249,230,109, 25, 42,128, 93,198,112, 72,225, 32,252,162, 82,146,214,214, 93,189,210, 60,234,253,232,205,250, 95,
- 63,125,217,255,118,112,239,241,246,255,150,248,189,195,189,214,206,147,143,159, 95,225,167,126, 60,254,121,243,254,117,115,125,
-241,123, 85,  7,171,213,122, 35, 77,193,126, 33,218, 36,201,235, 23,242,236, 84, 12, 78,211,179, 95,114,216,203, 38,177, 52,  7,
- 44,228, 23,236, 97,  8,188, 79,152,159,202, 68,234, 60, 89, 25,214, 43,130,119, 39, 31,183, 90, 21, 97,  5,168, 26, 15, 95,104,
-234,120,206,223,230, 66, 89,255,183,118,195,202, 91,130,160,146, 66, 98, 37, 93,106,250, 97,208, 88,  5, 98, 18,180, 44,160,120,
-106,161, 21,135, 49,170,124,151, 41, 24,187, 43,103, 96,174, 23, 83,172,151,229,205,253, 17,128,178,107,217,109, 26,136,162,115,
- 39,227, 56,105, 18,218,208,240, 16, 45,138,132,216,  0, 18, 59,254,130,175, 64, 66,221,246, 83,216, 35,129,  4,124,  1, 18, 75,
- 88,177,160, 11, 84,177,161,136, 74, 77,121,180,170,168,154,164,117,226,196, 30,199,102,206,157,177,227, 68,101, 65, 86,177,228,
- 88, 73,102,124,125,230,204,185,231, 44,249, 19,148,146,136,221, 38,172,162, 57, 51,199,253,115,  2,137,201,136, 79, 98,123, 51,
-118,127, 20, 92,172, 80,160, 49,250, 86,189,198, 70,105, 58,179,205, 30,  4, 19,113,233, 34, 85, 11, 69,170,226,248,  8, 43,188,
-241,216,182, 91,216, 40,105,169,120,186,171, 42,239,116, 92,171,174,128,186, 81,  6, 24,226,153, 81, 55,245, 60,131, 84,121,213,
-111,175,198, 87,135, 81, 31,158,173,160,157,144,206,107,112,164,118,190,111, 84,180,234, 82,209,122,205, 24,173,233,183,146, 68,
-143,211, 16,  9, 68,214, 35,156,172,185, 82,230,  8,183, 18, 79,159,111, 72, 72,186,132, 62,155,231, 28, 46, 62, 55,203,241, 94,
-197,234,206,254,221,184,126,171,217,158, 78,  7, 21,178,135,179, 36,155,173,171,138, 25,204,126,174, 67,135,173, 27, 99,170,  6,
-137,117, 31, 38,187, 28, 74,153, 14, 19,208,180, 54,222, 80, 66,113,  1, 95,102,179,138,106, 72,212,119, 85,201,124,225,188, 26,
-235,158,181, 22, 55,147, 90,172, 41,165,243,224, 29,240, 48,  4,  5,171,253, 13, 13, 79,132,137,192,242, 72, 66,230,104,206, 74,
- 82,105,128,121,187,110,238, 90, 25, 96,109, 99, 32, 27,252,203, 90, 62, 70,221, 12, 81,195,175, 84,125, 17, 39, 24,175,102, 77,
-174,120, 85, 79,197,241, 76,122,196,211,145, 72,179,167,155,205,142, 95,128,228,172,116, 79, 11, 86, 29,114,126,151,151,189,224,
- 30, 43, 85,221,175,  7,147, 11, 40,157, 83,219, 21, 43,109,137,103,195,110,121,187,211,253,117,250, 67,228, 88, 43,101,216, 72,
- 84,118,131,114, 57, 36, 37,161, 49,149,154,141,233,168,127,108, 48,244,205,181,141, 88,235,131, 63, 61, 34, 71,232,165, 57, 40,
- 42, 74,252,245,214,141, 65,116,161,227,200,222, 90,190,103, 30,112, 42,136, 70,178,124, 19,229,121, 58, 36,255,177,115,207, 63,
-119,179,211, 29,  4,103, 97, 52,225,  4, 20,208,138, 63,207, 14,217, 82, 73, 72,154,227,182, 32, 30, 97, 89,225,114,202,138, 20,
- 33,124,200,172,126,206,199,195, 24,177, 48,230,  1, 71,211,112, 84, 53, 51,163,230,103,169,247,101,239,240,243,238,247, 32, 25,
- 63,218,120,216,238,116, 69,173,253,122,231, 37, 72,247, 61, 33,122, 66,108,114,125, 47,218,237,174,  8,241,128,201,119,139,235,
-181,227,103, 96,116,159, 99, 33,243,197, 60, 54,154,199, 59,105, 27,126,157, 99, 43, 92, 45,147,240,222,221, 59,230,188,227,253,
- 94,163,230, 67,131, 91,145,200, 24,195,238, 38,135, 69,  9,250, 54, 12,223,239,190,114,151,187,133,176,165,231,207, 94, 60,221,
-126,242, 95,245,253,237,135, 55, 91,143,183,243,250, 46, 78,247,222,221,239,110, 33, 17,101, 96, 14,134,122,255, 60, 59, 57,145,
- 71,191,167, 59, 31,131,175,159,226, 36,156,161,137, 91,155,233,  7, 70,184,214,156, 68,163, 44,143, 60, 98, 95,191,204,229,236,
-217,216,120,235, 64,149, 35, 10, 87,242,157,179, 31,254, 28, 70,207, 89, 65,160,147, 19,205, 23,242,138, 98,106,177,154, 69, 94,
-154,192,106, 47, 46,121,101,161, 51,  7,148,203,  1,203,128,230, 81,194,209,125, 14,245,216,137, 58, 99, 87, 92,145,148,176,119,
-169,219,148,114, 85,203,210,182,192,242,235,175,  0,148, 93, 75,143,211, 48, 16, 30, 59,206,171,105, 75,150, 45, 15,237, 97,  1,
-113, 64, 28,184,112, 88,137, 43, 71,126,  9,191,137, 59,191,132,223,128,184,237,242, 16, 90,218,125,182,105,218,188,108,227, 25,
-219,105, 90, 78,244, 80,169,138,210, 72,150, 51, 51,158,249, 30, 98,200,206,133,195,230,187,243,203,118, 14, 74, 88,227,216, 19,
-122,162, 73, 96,205,148,222, 88,117, 88, 14, 18, 15,188,232,177, 41,236,113,212,217, 96,242, 65, 83, 84,178,110,182, 98,135,218,
- 11,168,104,159,124, 80,212, 87, 16,137, 93,147, 43, 19,138,139,153,228,193,131, 52,136,243,120, 68, 22, 77, 40, 65, 94, 52,109,
- 22,134,153,121, 52,218,200,176, 45,162,169,244,201,248,180,168,151,102,245, 58, 45, 20,166, 58,213, 40, 28, 12,144, 61,135,222,
-  9, 49,128,195, 27, 36,108, 50, 13,166, 38, 40,197, 73,180, 86,229, 98,251,187, 37, 75, 57, 23,123,152, 18,  0,  3,107, 64, 71,
-109,165, 68, 33,165, 19, 84, 99,251, 16, 74,118, 56,218,222, 45,182, 30,246,247, 25,248,217,  5,131,174, 94,198,228,211,186,238,
-154, 22,225, 93,240,148,124, 48, 82,143,104, 48,159, 25,135,113,196,183,146,149,192, 71, 36,113,132,112, 24,134,176, 69,242,119,
-181,134,118,176,238,  0,251,182,100,140, 18,227,234, 17, 70,158,163, 84,219,116, 20,230, 35,196, 12,175,106,244,242,100, 86, 40,
- 70,152, 76,169, 27,165, 43,218,237, 38, 13,228,204,108, 47, 85,118, 56,231, 51,123, 44,137, 88, 45,149,  9,211,230, 89, 73,100,
- 34, 59,203, 66,222,144, 53, 22,102,123, 97,214,142,155, 91,179, 84,  4,228,135,155, 63,128,204,220,210,  2,  9,139,155,236,138,
-157, 40, 79, 47, 29, 42, 66,168, 56, 28,163,199,216,192,226,249,152, 52,106,122,242,157,205,138,166,214, 46,235,210,108,245, 60,
-203,111,139,219, 93,199,133,182,189,201,  7, 63, 23, 23,180,178,193, 30,135,117, 88,163,208, 31,205,198,143,110,202, 27,171,255,
-106,143,108,218, 69,124,  2,170, 48, 62, 95,254, 65,126, 40,217,171,152,107,105,156,109,154,242,197,236,229,143,235, 11, 15,233,
-129,171,226, 74,121,253, 18,108,187,183, 91, 42,  8,117,175,197, 72, 72, 80,139,145,212,100, 95,106,181, 85,249, 30, 44,142, 60,
-230,190,207,207,177,244, 37,185,130, 36, 74,147, 32, 41,171,194, 73,161,225,183, 36,183,  3,138, 64,220, 28,112,211,163,113,142,
-178,148,244,146,147, 95, 37,130,  8,208,182,201,225,231,156,242, 27, 78,188,132,152, 76,143,214,205, 38, 19, 79,  4,139, 58, 22,
-164, 97, 50, 73, 30, 70,176, 57,254,242,241,246,236,195, 50,123,222,158,188,129,215, 12, 94,  1,188,  5, 48,145,249, 20,224,153,
-163,176, 81, 81,223, 90,190,180,196, 89,175,  0, 85,  5,181, 46,234,251, 21,  2,176,136,190,139, 77, 66,238,157,212,216, 22,154,
-247,103,239,204,109, 95,127,157, 23, 80, 22, 85, 25, 34,132, 81,108,229, 70,246,241,164,218, 32, 43, 91, 36, 45,114,217,170, 89,
-248,248, 90, 46,254, 55,190,223,149,215,147, 81,214,255,172, 22,223,196, 29, 52,151,178,250,244,185,185,186,212,171,251,182,188,
-107, 55,203,117, 49,175, 24, 66,195, 20, 35,  3,102,  9, 85,215,144, 69,176,114,104,105,171,179, 46,109, 45,143, 72, 86,233, 32,
- 89,253, 59, 78,196, 84, 38,123,133, 23,175,180,222, 87,199,222,  9,219,199, 70,229,182,178,173,238,213, 40,154,172,171,146,239,
- 53, 29,121, 31,129, 56, 19,230,216,141,163,116,255,192,158,174,204, 28,218,134,237,164,150, 92,203,210,247, 38, 15, 97, 63,157,
-246, 52, 40,  6, 67,183, 62,248,183,132,255, 43,  0,101, 87,206,219, 68, 16,133,103,246,240, 58, 62,194,122, 77,228, 68,138,114,
- 72,225,  8,  5,162,  2,126,  2, 29, 13, 21, 53, 18,145, 40, 64, 66,226, 23, 64,  1, 61, 69, 36, 26,122,154,136,134,  2,132, 68,
-149, 50, 29, 33,  2,161, 16, 18,156,196,142,177,119,215,246, 94, 51,188,247,102,214,177, 81,132, 68,231, 98,189,247,206, 59,190,
-239,125,159,117,150,114, 36,159,164,205, 48, 18,121, 39,124, 22,229,215,173,  2,183, 96, 73,181,181,225,181, 73,136, 51,162,106,
- 52,170,163,166,138, 24,105, 21,144, 32, 45,214, 56,152,235, 33, 41,158,235,174,162,154,113,183,104,184, 67,161,196,169, 50,211,
-160,109,224,202,171,216,190,231,126, 18, 35, 81,  1,142,147, 98,163, 51, 72,211,105,244,218,176, 42,248, 33, 20,  6, 73,  2, 39,
-211,168, 44, 31,248, 95, 33,131,136,145, 24,130, 45, 95,140, 52,244,248,198, 16,  5, 78,222,209, 70, 40,  7,131,116, 88, 76, 11,
-142, 81,242, 10,238,114,245,226,247,222, 14, 10,  6,229, 19, 49,114,204,120,111, 68,107,161,186,212,241,170,245, 86,239,144,159,
-129,167,202, 51,167, 21, 70, 24,142,169,201,118, 74,133, 17, 81, 77,  8,137,  3,116,231, 67, 34, 55,188,188, 75,174, 85, 55,172,
-163, 76,204,  8,194, 98, 57,175,218, 12,  2,103,130, 67, 47,216,149,131,236, 49,206, 88,152,226,237, 46,144,109, 82,130,107, 13,
-110,237,153, 52,178,148, 49,  7,249,167, 18,237,172, 76,195, 45,218,110,197, 30, 70, 98,103,191,127,220,141, 59,201, 41,232, 12,
-  5, 65,173, 98, 45,214,167, 22, 27, 83,126, 38,187,  1,153,246,162, 72, 11,122,146, 38,232,178,  5, 43,172,225, 19,193,175,132,
- 85,149, 17,  9,218,173,  1, 97,128,135,130,187,  4, 23,167, 92,150,139, 70, 42,120,194,165, 91,230,200,218, 20,152,185, 23,157,
- 18, 68,145, 65, 20,162,  7,163, 82,107,209,227,  8,240, 38,196, 72, 93,167,167, 98,163,255,156,108,118,247,103,166,103,187, 65,
- 59,206,129,171,124,210,  2, 75,176,142,127, 98,232, 86, 24,161,100, 80,239, 73,229,226, 55,106, 37,234, 90,144, 50, 34,253,133,
-112, 83,143,169,183,125, 88,220,179,115,229, 90, 15,221,248, 84,254, 61, 49,205,164, 75,114, 74,225,188, 74,227, 36,108,193, 62,
-246,218, 63,104,133, 53, 72, 78, 11,235,119,111,202, 59, 65,139, 71,126,234,158,156, 41, 24,146,234, 81,  4, 87, 88, 70,122, 53,
-182,101, 46,212,150,154, 65,115, 48, 12,181, 18, 79, 62,251,125,121,126,245,243,254, 54, 33,111,216,215,233, 71,195,  8,217,  9,
- 16,173,145, 24, 42,201, 37,133,220,103, 17,222,154,171,205,199,105,212,242, 91,216,243,226,248,148, 77,166,108, 26,117, 76, 83,
-244,126,178, 65, 81, 30,  2, 44,236,247,168,252,165, 25, 67,120,  5, 68,124, 99,225,234,251,157, 15,237,225, 58,227,235,165,161,
- 51,247,107,222, 61, 94,  9,223,186, 34,187, 38,140,155,129,221,232,212, 27, 98,209, 99, 87, 24,219,132, 93,110, 33,156,102,162,
- 97, 48,153,157,137,246,246, 55,227,210,236,196,171,126,216,219, 59, 56,232,  5, 62, 92,241,239, 44,120,253,124,253, 33,119,234,
-188,242,241,211, 59,248,235,227,187,107, 91,187, 95,158,174, 61,185,126,231, 22,220,222, 42,179,158,221,127, 84,182,138, 38, 36,
-120,180, 80,180,211, 99,216,199,131,219,247, 94,110,188,250,175, 37,126,245,194,202,232,183,115,180,219,125,241, 38,106,254,236,
-108,109, 74,147,100, 98,147, 40,142,250, 73, 28,210, 28,125,134, 90,241,153,194,  4,  5,217, 49,168, 27,164,101, 32,115,210, 75,
-110,186, 51,154,113, 33,183, 73,149, 56,241, 73, 93, 41, 49,166,202, 59,  6, 79, 74,241,247,146,202, 33, 90, 43,102,157, 60, 85,
-178,193,100,226,124,185,222, 10,142, 84,122,167,  9,149, 84,233,169,208,174, 13,169,198, 14,103,141, 58,197,234, 44,115,162,189,
-170, 69,149,254,204,120,242, 46,255,137,  6,254, 17,128,177,107,231,109, 26,138,194,190,215,143,184,137,221, 52,105, 43,167, 74,
-  4, 42,229, 81, 84,216,248, 13,252,  4, 70, 38,  6,216, 89, 96,228,223, 32,132,196, 14, 44,136,133,  1, 49, 48,208,161, 84, 13,
-165,208, 71, 30, 36,182,227,231,245,229,156,115, 99,167, 18, 20,177, 69,201, 18,251,218,231,245,157,239,251,140, 11,192, 65, 86,
- 25, 42,169,246,145,188, 23, 16,224,183,141, 58, 87,102, 13,115, 50, 25, 47, 84,147,140,173, 61,122,  5,240,243,125, 42, 22,238,
-166,165,155, 16,166,107,220, 52,185, 13, 41,118,146,  4,  2,101,197,224,220, 81,  6, 12,199, 49, 40, 89,195, 99,242, 70,128,234,
-179,166, 35,165,194,101, 70,202,164,205, 49,192,195, 21, 54,184, 65, 84, 70,220,246,139, 10,  9,241, 14,178, 88, 82, 36,174,229,
-224,156,135, 25, 70, 65,254,111,  5,177, 27,231,222, 39, 74, 71, 28, 94, 26,136,149,112,214, 17,125, 70,253,210,164,192,  5,136,
-142,182,222,117, 46,245,131,125, 86,178,219,168, 92, 18, 21,254, 33,203, 36, 12, 87, 54, 68,181,144,185,128, 81,213,254,147,  5,
- 26,251, 43, 33, 77, 45,100,145,188, 21,237,138, 34,251, 71, 51,  9, 86, 77,211, 36,150,184,153,214,173,179,205,181,  6,180, 65,
-126,144, 56, 75, 40,246,170,148,  9,  8,133,198,205,244,188, 60, 52, 28,191,208, 79, 57,101,109, 65,230,180,  8,208, 25,  8,  6,
-145,235, 42,230,209,164,224, 94,173,182,234, 24,253, 65,120, 48, 74,252, 76,  6,212,123,103,231,197, 19,252,252,179,239,111, 30,
-250,183, 47,215,175,245, 92, 40,121,194, 40,254, 21,138, 52,199,123,183,100,105,245, 28, 58,169, 98, 28,107,179,140,242,147,197,
-212,220,106,173,206, 66,129, 19,124,219, 68, 50, 62, 35, 20,225,116,154,111,117,204,195,  1, 58,136, 27,120, 46, 81,154, 87, 23,
-161,214,186,185,218, 65, 65,  9,123,195,240, 90, 27, 71,131, 67,165, 26,228, 45,119, 79,166, 63,169, 76, 41,103,223,154, 92,180,
-184,188, 98,132, 48,185,240,232,197, 39,187,116,168, 85, 34, 81,146,145,247, 99,187,177, 50,141,124, 21,232, 85, 89,142,117, 90,
- 46,220,154, 51,133, 74, 25,129,124,182,222, 36,130, 43, 29,146,183,178, 17,165,161, 31,  5,142,237, 98, 97, 78,194, 34,185,204,
-106,102, 13, 27,  5,145,171,253,  9,244,210, 44, 27, 51,220,233, 50,204,  8,  2, 74,142, 75, 34, 16, 16, 91, 78,123, 48, 25,232,
-196,115,129, 27,184,127,182,135,214,113, 28,138, 93,150,137,197, 50,202,238,209,151, 57,107, 82, 96,170, 71, 51,  3,221,146,130,
-152, 95,178,216,242,110, 28,156,237,145, 17,  7,226, 30,253, 65,159,225,180, 77,119,109,183, 64, 72, 60,146,243,213,116,174,210,
-157, 50, 69, 80,110,101,205,250,114, 46,224,223,100, 92,249, 57, 18,102, 32,178,248,217,189, 71,175,239,190,122,240,228,241,199,
-239,123,199,193, 48,138,229,183,241,  7, 26,202, 60,215,236, 70,199,237,222,146,142,247,163, 59,222, 77,  5,227,161,151,126,245,
-123, 22, 52,109, 58,190,175,144,200,219,219,215, 45, 45,135,122,171,203, 58, 55,175,108,237,236,108,247,122, 94,251,206, 85,125,
-181,  9,165,192,106,171,181,230,117, 58,205,238,134,211,134, 12,154,103, 25, 60, 38, 38,116, 29,204,130,252,112,252,254,211,201,
-100,214, 16,122,219,114, 82,106, 93,109,211,138,130,217,187,151,111,239, 63,125, 72,241,253,127,109,184, 91,141, 86, 60, 26, 45,
- 26,190, 60, 57,125,243, 34,  8, 38,153, 22, 35,189, 17,110, 96, 33,112,164,  8,239,126, 50, 67,236, 72,166, 90, 65,164, 15, 82,
- 41, 36,164,154,  2, 98,233,234,164,205, 53,169,170,183,152, 28,248,184,177,100,187, 83,114, 14,128, 35, 14,179,240, 66,  7, 60,
-237,207, 77,150, 69, 73, 92,  6,247, 57,188, 68,114, 26, 98, 20, 14,209,251,178,164,166,206, 37,114,164, 90,124, 85, 69,  7, 43,
- 42, 59, 10, 66,249, 89,165, 19, 69,196, 50,248,162, 97, 59, 16, 66,199,179,225, 57, 56,191,212,204,146,242, 31,171, 30,191,  5,
- 96,236,220, 90,155,  8,162, 56, 62,183,221, 77,179,109,218, 36, 53,241,210, 22,131, 98,209, 42, 34, 85, 31,124,240,193,175,224,
-103,240,195,249,224,171, 15, 94, 80,144,162, 47, 34,130,208, 34, 18,173,109, 68, 98, 75,154, 38,217,203,236,206,140,115,206,236,
-166, 13,125, 41, 44,228,  6,217,100, 47, 51,103,206,249,159,255, 15,252,  9, 40,116,173, 41,122, 70, 13,137, 47, 57,178,117,184,
-  7, 30,133,240,164, 33, 26,104,186, 45, 28,222,155, 57,217,  1, 36, 86,237,116,170,156,200, 95, 35,153,  4,137, 16, 96, 20,141,
-246,201,144,109,183, 91, 43,108,217, 25, 98,127,244,219,  6,236, 30,168,241,153,143,139, 86,252,187, 60,  4,227,111,  1,214,  5,
-220,  7,174, 40, 97,  1,199,120,151,177,208,131,136,222, 94,140, 21,193, 35,176, 46,161,169,202,142,210, 72, 48,113,152,236,253,
-141,250,169, 74, 18,149, 72,157,100,174, 33,214, 20,161, 25, 30,  0,158,  3,180, 55, 71, 45,138,253, 94,129,191,159,135, 44,188,
- 88,109,119,199, 59,133,203,205,137,165, 59,210,150, 28, 37,174,108,239,154, 86, 36, 92,245, 26,144, 61,154, 36,106, 50, 99, 18,
- 52,227, 22,132,237,154,121, 98,255, 61,100,201, 17, 50,235, 51,154,164,177,157,159,154,132,220, 88,246,175, 93, 90, 24, 68,170,
- 63,204, 38, 82,123,220,216,205,158,234, 49,212,251, 97, 64, 71,172,156, 35,187, 64, 80, 34,128,181,130,197, 47,156,225,236,168,
-230, 99,120,235,161,250, 90,129, 38,152, 52,171, 65,167,238,245, 14,226,159, 71, 73,132,213,181,  8,245,205, 73, 25,191,187, 27,
-203,199,146,219, 60, 33,151, 23,249,253,235, 75, 43,237,208, 70, 65,253, 35, 57,156, 40,208,200, 64,245,143,198,216, 79,169, 96,
-167,104, 96,201,104,189, 10,168,103,251, 34, 55,224,212,220,168,242,192,158, 66,193,171,  1,253,184, 19,255, 27, 67,  8, 37, 21,
- 76, 75,153,  2,  3,254, 86,109,181, 55,216, 43,108, 81, 81, 38,164, 93, 87, 42, 10,215,156,171, 35, 65, 29,203,172, 85, 91, 65,
- 44,183,227,172,171,169,150, 89,110,205,202, 60, 98,169, 43,133,143, 26,243,205, 68,142, 37,240,255, 32,114,  7, 94,106,217, 75,
- 98, 10, 71, 61,220, 47,117,151,165, 59,209,110,233, 91,172,208,209,159,206,108,172,222,234,246,187,247, 58, 15,182,119,191, 78,
-228,164,  0, 15, 81, 90,245,231,143,227,129,179, 82,112, 28, 83,160, 92,228,106,109,185,211, 27,236, 99, 18,160,144,211, 27, 28,
-184,237,163, 71,  5, 68,143, 58,115,247,185, 42, 59,197,174, 52, 87,123,  7,187,149, 74, 40,101, 66,241,142,192,226,186,  1,211,
- 14,232,211,134, 67, 95,175,212, 83, 35,179, 44,117,166,149, 69, 20,229,120,136,184,134,  6,129, 26,120, 14,113,  7,149,244, 33,
- 35,206,124,  4, 86,182, 23, 91,135,209, 16,186, 96,153,104, 55, 91,154,138,227, 40, 75,153,157,146,234, 27,181,155,207,238, 62,
- 37, 75,228,195,214,151,231,159, 95,190,238,111,253,136,190,195,117,153, 31,216, 47,173,  5,115, 74,231, 30,149,128, 89, 64, 23,
-204, 80, 47,248, 62,220,124, 40,108,  3,213,  3,207,149,111,215,145, 18, 38, 66,152,124, 42,190,  8,188, 40,142, 71,163,161,141,
-153,189,192, 19,130, 13, 39,195, 49,166,242,231, 72,240,184,221, 25,169,244, 16,186, 16, 32,204,250, 53,248,243,233,197, 27,118,
-181,254,112,115, 19, 83, 64,231,146, 78,222, 94,217,104, 47, 92,120,187,253, 30, 29,128,107,235,107,119, 36,138, 48, 41, 34, 21,
- 40,146,147,114,153, 60, 89,127,244,234,219, 59, 88, 11,  1,239,  1,105, 78,170,228,129,231,174,128,170,205,233,206,196, 19,117,
-163,113,173,252, 12,157,136,220,165,133,230,192,116,234, 52,224,128,204,211, 78, 84,122, 42,133,123,118, 68,117,110,169,166,208,
- 53, 20,224,200,147, 86, 36, 61, 69,133,144,146,208,102, 74,251, 73, 83,162,191,137,153,173,231,153, 66,246,195,176,203,157,234,
-115, 13,238,197,123,255,  5,160,236, 90,114,163,  6,130,104,219,237,111,198, 73,156, 47,201, 16,  5,144, 16, 74,  4, 75, 36,110,
-144,  5, 18, 43,118,220,129, 53,119, 96,205, 29,184,  3,123,144, 16, 18,  2, 33, 36, 68, 80, 64, 40, 65,129, 76,102, 50,227,177,
-221,110,127,154,170,234,246,196,  9,217, 48,139, 89, 89,182,218,174,238,250,189,122, 15,207,119, 90, 97,221,242, 97,154,251,159,
- 43,104, 91, 40,233,227,144,146,181,203,131,136,245, 42, 28, 67,229,196,152, 97, 11,  4,115, 52,164,163,138,175,201,224,144,144,
- 90, 68,117, 72,200, 52, 47, 22, 70, 85, 43,193,146, 13, 39,114,118, 74,196,120,184, 21, 93,226,194,195,220,144,129, 57, 57,120,
- 87,  8,225,109, 47, 66,147,113, 21,150,240,124,184, 18, 44,216,113,120,173, 12,114,168,166, 34,208,168, 16,162, 42,100,147, 29,
-166,223,202, 90,138,186,192,201,102,156,192,175,244, 76, 25, 21, 81, 49,  0,175, 16,130, 89, 17, 32, 20,158,225,114, 34,201,  9,
-172, 96, 99,110,227,168, 56,148, 85,170,176, 45, 84,119,  1,175,151,121, 33,206,  9,222, 88, 39,211,103,236,202,161, 99,173, 61,
-100,107, 69, 42, 36,154,193,202,184,231,135,220,155, 78, 78, 66,219,186,187, 25,110,175,247,166,162, 62, 30,201,145,  0, 55,167,
- 34, 27,139,127, 96,150, 73,219,192,135, 96, 31, 25, 53,  9,  4,208,104, 82, 92, 42,187,187,182, 46,215, 98, 54,144, 85,232,101,
-165,178, 28,174,150, 61,190,187, 58, 55, 74,228,247, 97, 54, 65,241, 99,100,143,129,197,143, 21,194, 35,244,177,174,217, 34, 67,
- 50, 14,135,202, 53,155,177,189,123, 35,222,185, 21, 15,198, 69,154,229, 73, 94, 79, 10, 52,165, 84, 42, 65,166, 20, 82,230,  6,
-193,109, 28,240,158,143,159, 39,111, 44,209,128, 55,226,107,145, 13,135, 62,216,136,172,212,155, 47,133,144,  8, 62, 40, 80, 34,
-147,149,200, 21,165,109,214,240,222,195,223, 66,176,152,203,156,166, 10, 44,126,145, 98,233,210, 64,154, 25, 71, 50,216,228,127,
- 24, 84,153,225, 27, 38,148, 14,182,112, 72, 71,132, 20,125,219, 17,109,172,111, 90, 84, 13, 33,184,189, 22, 87, 83,157,150,  9,
- 92,228,186,224,233,185,172,203,126,220, 31,166,131, 52, 75, 80,  0,196,178,100, 41, 72, 82,197,184,  7,184,121,232,247, 38,233,
-168, 86, 90,168, 14, 86, 84,185,142, 87,150,101, 59,129,165,137,135,148,207,125,  8,165, 97,113,113, 24, 83, 86,110,177,182, 27,
-  1, 15,246,137,189, 50, 10, 22,132, 76,117, 66,108, 99,211,137,228,196,181,215, 67, 16,148, 75,229, 78,157, 59,107, 70, 16,174,
-233, 28,112, 84, 16,  3, 46,184,  2, 82, 97,112,172, 28, 92,194,131,219,247, 63,254,248,164,249,183,112,138, 21,183,158, 67,123,
-207,  5,147,129, 87, 80, 90, 16,220, 56, 57, 54, 62, 87, 30,109,237, 61,190,179,231,111,218,172, 96,227, 15,205,207, 45,251,245,
-111,246,238,215,225,254,112,127, 40,  6,220,143,220,181,123,121, 19,156, 14,191,202,233,113,149, 79, 84, 50,184,193,231, 31, 46,
-250,235,243, 78,146,177,131, 60,121, 59,126, 85,177,113, 38, 79,242,242,172,193, 56,164, 49,157, 57,139,175,122,219,152,118,216,
-243,215,120, 63,112,214,206,228,251,229,165,163, 97, 33, 51,171,153, 10,113, 64,141,150,151,207, 95, 60,121,246,212,131,184,167,
-188,154,171,178,251,153, 33,172,222, 89,189,249,249,207, 62,182,132,221,168, 31, 95, 87,142,219, 38,131,166,137,142,252,240,149,
- 64, 78, 90, 26,159,166,147,189, 50,146, 62, 38,100,175,205,118,234,128,162,148,154,129,217, 88,109,  6,120,148,186, 32, 41,131,
-165,248,106,134,106,236,156,239, 93,142,151, 75, 49,157,197,102, 85, 20,  2,164,112, 91, 67, 77, 52, 97, 70,155,137,178,115,129,
- 17,173,126,174,169,  5,140,254, 67,203,107, 53, 43, 25, 95, 28, 56,253,175,195, 29,126,127,  5,160,235, 90,122,162,134,162,240,
-185,125, 13,237, 76,103, 24,134, 71,  0, 19, 55,  6, 68,194,130,173,137,174,253, 11,254,  7,215,186,214,191,224,194,189, 11, 19,
- 55,252, 15, 55,248, 72, 52, 38,188, 66, 98,120,  9,  2, 45,109,153,222,222,214,251,157,219,130,  3,152, 89, 53, 51,233,180,183,
-189,231,124,231,245,125,181,125,191,185,125,106, 66,  2,132,212, 40,224,176, 76,182,190,236,174, 24,183, 25,134,107,252,160,208,
-183,  0, 97, 95,112,254,  9, 22,141, 64,154, 23,174,162, 96, 85, 29, 54, 66, 44, 82,  3,156,  2, 87,209,246,218,158, 53,150,200,
- 11, 36, 82,109,115,102, 13, 16,176,  8, 45, 80, 96,163,173,190,163,113,186,  3,176, 27,  8,207,247, 90,  2, 82, 30,122,219, 90,
- 46,  3, 23,188, 73, 70,166,153,157,184,118, 36,  7,105, 52, 44,139,221,243, 31,146,100, 86, 36, 89,161, 77,205,144, 89,136,139,
- 74, 92,201,157,192,202,228, 36, 57, 14,  2,133,189, 75, 46,215,139,220, 73,127,230, 92, 29, 39, 69,204,149, 23,230,125, 19,215,
-186,227, 55, 44,251,255,155, 34, 71, 83,240,205,159, 98,251,242, 35, 69,188,192,148,249,142,146, 94, 89, 46,207,  6,253,158,159,
-100,114, 63,202, 53,224,213,183, 27,194,179,209, 73, 94,230,224, 99,132,139, 86, 28,106,162, 43,168, 38,  0,175,165, 10, 48, 38,
- 46,160,123,162, 15, 19,197, 10,143, 36,186,142,152,240,172,241,150,221,113,188,245,163, 36,  1,103,  3, 50, 77,147,129, 53, 21,
-184, 81, 82,110,167,210,116, 60,  7, 60,177, 24, 32,150, 32, 29, 84,107,172, 21,186, 52,219,243, 86, 23,122, 51, 83,225,175,223,
- 26,239,229,167,105,145,230,168, 57,166, 60, 94,174,157,161,203, 38, 94,191,  1, 93, 95,187, 89,145, 42, 35,130,132,130,120, 11,
-192, 81, 76,133, 86,148,169,207, 27,242, 18,162, 45, 64,241,185, 68, 42,137,137,129, 12, 57,145,201, 62,226, 51,232, 76, 30,199,
- 39,246,104,223,204,200,140, 32,221, 90,206,106,164,147,216, 40,136,153,141,132,125, 36, 76, 18,172, 70, 76,250,199,131,238, 32,
- 78,163,249,254,252, 14, 20, 54, 56,203, 14, 78, 62, 63,205,181, 99, 42,170, 70,162,141,203, 66,152,137,129,194,148,176,199, 92,
-175,237,119,143,163, 67,139,223, 88, 85, 72,212,155,  0,  1,209, 38,  7,  9, 42,175, 61,  8,251, 27,135,155,216,185,170,110,225,
-188, 26,156,227, 44,186,109, 53,179, 47, 26,157, 44,206, 45,125,219,253,210,239, 76,100, 82,102, 50,117,174, 61,  1, 82,210,184,
-114,163, 42,205,183, 96, 82,182,136,  1,248,107,108, 64,163, 55,222, 28, 57,220,108,224,176,190,141, 11,176,133, 73,175, 78,203,
-151,170,240,108,104,159,241,234, 90, 70,202, 19, 92,163,  8, 91,133,190,230, 56,151,165,176,115, 97, 15,201,150,149,123, 63, 92,
- 88, 26, 44, 62,246, 87, 87, 94, 77,211, 10, 95,211, 17,  8,131, 55,247,104,251,140,214,247,105,253,130, 34,165,209, 22, 61,152,
-163,135,211,244,180, 79,203, 19,244,103,155,214,190,210,251,159,180,151, 82, 28, 75,153,159, 85,  5,152,217,203, 98, 40,100,105,
-229, 39,190, 19,248, 82,106,244, 96,171, 44, 59,255,158, 29,188,123,243,236,201,199, 79,107, 59,167,  7,123,116,249,250,249,139,
-151, 31,222, 62,234,222,219,138, 15, 93,215,203,193, 36,168,110,209,111, 85,198, 50,114,159, 38,  2,187,208, 25,211, 11, 11,165,
- 32,207,135,187,178,140, 26, 66, 77,193,101,168,193,160,  0,162, 12, 77,117,201,234, 17,172,  5,162, 12, 21, 85, 77, 28, 76, 85,
- 85,221,162, 30, 65,226,171,233,142, 25,153,184, 96,115, 43, 76, 35, 71,205, 39, 83,209, 63,167, 16, 84,149,119,241,182,155,  7,
-107,210,218,104, 59, 66,221,220,  2,155, 66, 77, 16,212, 40, 41,179,152, 84,101,  4,189,185, 76,203,184, 82,137, 70,167,217,111,
-  5,217,104, 39,229, 85, 51,222,245, 52,236, 29,198,253, 14,146,149,191,  2,208,117, 37,187, 81,  3, 65,180,187,221,118,123,236,
- 25,156,132,132, 75, 16, 72,  4,144,136,  0,113, 64,130,  3,  7, 46,112,201, 95, 32,241, 53,220, 56,241,  1,156,248,  2,206,  8,
-174,108, 18, 72, 17, 72, 64, 16,  4, 80, 50,100,108,143,215,105, 55, 85,213, 61, 75, 22,164, 57,204,209,234,165,186,234,213,171,
-247,228, 73,146, 41, 83,252,157, 78, 63,197, 37,  4,251, 20, 15,108, 41,109,179, 33, 27,  8,  3,207, 81,187, 38,132,162,114, 50,
- 69,243,167, 94, 98, 40,112,194, 32, 91,243, 20,247, 67,137, 94, 78,121, 59, 68,168,  7,170, 82,124,112,177,199, 68,156, 75, 11,
- 40, 11,235,101, 38, 89, 64, 34, 72,232, 96, 19, 32,  5,135, 43, 43,157, 41,156,166,127,163, 59,159,194, 60, 84, 12,131, 64,201,
-  9,214, 24, 28,203, 97,178, 88,232,132,107,151, 31,162,185, 64,133, 17, 76, 40,101, 32,214, 17,134, 29, 73, 95,137,210,134,211,
-121,120, 71, 93,194,220,159,152, 96, 22,  8,152,169,141,147,244,184, 57,241,233,238,152, 19,172,135, 21, 16,172,175,150,198,232,
-247,134,224, 20,167,169, 95, 90, 39,214,247,229,165, 85,213,143,189, 81, 86,167,181,134, 60, 55,144, 60,242,189, 88, 26,200,184,
-123, 74, 42,164,144,243, 18, 59,175,148,128, 81, 96, 68,231,107,186,181, 13,157, 91,109,211,  9,195, 26,114,207, 20,136,254,242,
-172, 33,232,166,110,172,219,125,205, 80,219, 19, 54,108, 99,189,199,117,160,183, 15, 10, 52, 14, 69, 88, 38, 98,114, 61, 12,140,
-175,191, 20,117,169,113,173,199, 85,251,125,183, 24,196, 97, 18,203,220,180,170,230,181, 48, 49,148, 57,  8,130, 33, 23,126, 76,
- 26,159,202, 99,  7,117,183,194, 69,213, 64,177,236,102,240, 52,245,126,139,170, 27,132,222,181, 13,254,230, 51,  4,118, 36,116,
-118,182,105, 64,179,151, 29,233, 76,118,142,  6,216, 33, 34,121, 84, 93,143,219, 89,187,238, 48,184, 57,179,116,159,169,128, 82,
-229,187, 64,140, 50,118, 92,205,193, 45,112, 80, 79,247,151,135,249, 94, 81,229,145,138,118,134, 59,168,203, 65, 73, 21,124,103,
-213, 20,198,121, 77,205,199,  5,113,223, 32, 96,146, 77,  7,242,178,234,124,117,176, 54,204,135,244, 60,123,119, 54,111,191,248,
-240,146, 26,156,136, 68,142,171, 17, 60, 15,144,134,247,194,126,  6,251,171,157,187,150, 13,238,130, 40,100,142,152,204, 77,221,
- 54,239,191,189,131,237, 72,139, 17, 60,210, 82,240, 25,255, 88, 88, 77, 41,171, 17, 19, 38,227, 42,101,142,138,231,185, 46,132,
-237, 72,184, 63,179,142,220,220,209,193,222, 85,184, 50, 80, 12, 89, 33, 82,242,156,193, 27,  4, 71, 34,137,146, 20, 91,220, 16,
- 61,116, 20,242,162,107,225,203,224, 48,196,152,250,171,180,253,249,122,191,185,123,246,214,211, 63,108,119,159,141,  2,166,206,
-176,115,  9,187,121,157,221,227,236,254,108,245,245, 33,  7,131,149, 43,236,193, 22,219,220,102,239, 63,177,189,191,126, 90,172,
-101, 37, 75, 26,182, 60, 97, 89, 10,165,244,249,116,140, 54,128,240,235,213, 90,132,113, 89,189,189, 26,110, 61,124,245,104,251,
-227,243, 11, 27, 23,253, 27,151,159, 61,126,242, 53,251,177,212, 75, 90,114,139,176, 52, 38,107,196,  4,239, 92,228, 99, 99, 76,
- 33,125, 14, 75, 20,136,216, 40, 71, 72,112,132, 10,162, 83,189,228,215,232, 55, 22, 85, 11, 99, 17, 46, 75, 39, 99,  8, 82,128,
-177, 70,120,211,164,120, 10,198,177,249,160,233,188, 39, 89,180, 37, 81,111,245,145,254, 25, 58,195,248, 97, 32,101, 86,229,226,
- 63,137,186, 57, 54, 11, 43,156,136,141,103,220,251, 36,132,113,101, 13,209, 14,185,243, 76,192,144,170,148, 23, 18,  3,  5,174,
- 63, 38, 66,149, 41,105, 53,224,128,208,220, 45,227,165, 29,132, 94,212,172,153, 50,121,244,  2,242,104,216, 49, 38,253,177,100,
-243,159,  0,124,157,203,138, 19, 65, 20,134,171,170,171, 47, 73, 67, 50, 56,227,  5,  7, 28,193, 69, 64,131, 10, 46,196,149,111,
-224,194,  7,112,229, 59,248,  0,190,133,111,227,194,149,162,120,193,157, 73, 64, 68,103, 24, 52, 49,157,164,187,171,171,202,250,
- 79, 85,103,210, 50,186,155, 33, 36, 36,157,212,233,115,249,207,247,203,238, 98,230,174, 44, 50,112,222,195,128,149,241, 92,244,
- 27,235, 81,128,129,214,  0,208,151, 21, 13,244, 39,212, 21, 34,209,125,100, 36,109,134,251,201, 38,120,131,254,151,170, 44, 81,
-  6,232,128,234,214, 96,182,225,152,175,122,170, 57,156, 42, 16,175, 64,  5,112,127,186, 51, 93, 69, 24,250,149, 48,129,108,100,
- 36,123, 90,247,177,216,141, 87,207,132,168,208,135, 33,221, 33, 69,117,113,  6,201,225,222,238,193,108, 55,156,  8, 95, 76,109,
-153,140, 80, 90,158, 39,  5,241,190,187,211,128,  9,206, 59,116,208, 97,126,160,234, 77,165, 55,237,156,  4, 99, 82,201,125,219,
-143,241,191, 23,104,188,235, 64,123, 13, 93,117,108, 53, 60,143, 60,101, 55,228, 99, 20,226, 25,223,203,101,154,138,239,115,213,
-167, 40,213, 75,196,126,159, 19,161,135, 95,196,204,210,210,230,139,117,159,180, 82,182,108, 40,201,209, 64,251,186,  7,170,150,
-187,133,  5, 59, 99, 55, 36,187,133,  2,199,128,235,170, 49,  3,230,191, 26,235,  1,128,158,109, 96, 10, 45, 38,197,237,163,225,
-248, 48,159, 79,245,130,233,156, 69, 87,226,228,250,165,116,246,123, 93,211, 12, 30,216,153,181, 29, 46,235,227,147, 85,158, 67,
-117,227,222, 89, 46, 80, 64,148,202,100, 17,174,154, 38,  2,107, 67,221,138, 90, 24,220,212,221,183,160, 33,236,145,134, 37,177,
- 11,157, 56, 86,195, 30,191,119, 35,121, 59,169, 85, 35,124,130,138, 26, 33,104,144,192,  1,117,255, 40,226, 99,248, 75, 72,249,
- 65, 74,188,142, 51, 61,105,212, 69, 59,153, 80, 74,154,118,  8,210, 49,214, 33,201, 30,190,144,200,134,228, 29,  7, 91,192,179,
-205,212, 27, 65, 11,  0,136,189, 26,203, 26,174,206,148,194,106,107,119,247,249,194,134,  6,133,137, 10,190,198,124, 77, 79,244,
- 15,159, 46,127, 26,132,102,218,116, 37, 83,239, 74,149,185, 11,238,155,185,148,  9, 42,248, 48, 34,179,100, 75,222,153, 96,181,
-210, 75, 49, 62,186,243,126,246, 46,200,224,183,119,168, 22, 75,  1,103,193, 72,240,109,187, 54,124,160, 80,157,  8,242, 46,161,
-170,210, 71,120, 78,125,101,200, 61, 48,158,163, 50,122,208,239,187,252,189, 40, 87,212,137,116,209, 48,155,151, 11,122,174, 59,
- 80,122, 63, 31,156, 46, 23,169,132, 89,113,105,244,229, 94,242,109, 83, 63,146, 15, 71, 98,239,106,205, 94, 78,217,231, 30,171,
-110,178,105,198,190, 16, 45,184,166,246, 29, 88, 53, 17,170,189, 49,131,196,198, 43,119, 93,110,126,127,196, 30,140,232,240,108,
- 47,162, 33,190, 77, 65, 57,197,138,140, 67, 78,162,201,135, 91, 95,223, 60,158, 29,255,248,244,236,197,181,187, 50, 91,170,231,
- 79,158,190,250,248,250, 48, 27, 42,208,193, 85,140,172, 49, 78, 56,246, 92, 82,224,218, 92,145, 30, 43, 79, 39,164,198,158,196,
-162,145, 70, 89, 99, 69, 81, 46,139,178,240,227, 64, 15,  2,163,155,180,239,144, 19, 12, 92, 83,243,205, 67,130,184,207,235,121,
-107,217, 22,124, 52,232,110,176, 53, 46, 53,  1, 71,113, 94, 57,158,  3,197, 92,252, 19, 58,184,179, 44,105, 58, 91, 47,225,247,
- 73,125, 25,238,213,228, 84, 89, 74,228, 39, 92, 14,178, 11,123,233, 65, 34,226,178,174,138,102, 93, 53, 42,134,142,164,233, 69,
-106,173, 87,149, 94,121,170, 57, 25,157, 91,182,141,145,188,243, 54,248, 57,105,187,253, 15,220,248,143,  0,124, 93, 93,111,211,
- 48, 20,117,226,196, 77,214,177,129, 52,109,226,  1, 77,108, 19,111,136, 23,126,  2,255,147, 63,128,120,229, 63,240,196,135,  4,
- 67,211,180,  7,208,144,  6,235,218, 46,109,147,216,177,185,231, 94,123, 42, 99, 76,170, 86,173,138,218, 40,177,111,142,143,207,
- 61,167,184, 75, 57, 35,187,243, 98,  2,140,179,164, 15,232, 30, 56, 70, 66, 70, 99, 98,211, 69, 52,249,136,159,  0,  4,235, 52,
-100, 61,126,112,185,131,210,  2, 16,215,243,217,121,195,122, 74, 31, 99,204,178, 68, 78, 97, 13, 57,112,228, 88,193,107, 79, 54,
-134,135,  1,161,  5,238, 65,249,166,194,109,  0,154,  6,232, 70, 57,204,169,  2,122, 54,243,190,227,220,159,210,  6, 95,193,217,
-149,192,101, 70,139,184, 34,211, 78,190, 58,228,241,103,130, 74,237, 84, 46,245,237, 57, 46,194,101,224, 18,159,113, 47,248,108,
-152,250,192, 46,175, 73, 54, 67,175,235,197, 68,113, 36,116,242, 17,194,  4, 79,182, 98,225,150,195,123,106,161,186,105,112,147,
- 53,154, 15,114, 42,252,108, 47, 68, 28, 73, 35, 58, 15, 87,141,221, 38, 20,149, 67,126,177,243,160,220,218, 40, 45,108,153,194,
-114,128,145, 67,  7,191, 77,220,195, 81,129, 10, 65,151,120, 97,217,249, 63,120, 60, 43,121,163,103,133,176,148,232,102, 37,112,
-110,225,248,175,149,205,162,200,117, 56,182,128,253, 49,119,199,159, 47,247,170,188, 46, 51,  3,254, 50, 52,218,189,191,104, 39,
-173,159, 37, 11,120, 42,244,213,181,175, 39,118, 95,  3, 84, 16, 24,130, 44, 31,168, 74, 53, 61,218, 19,107,118,246,106,  3, 97,
- 82,125, 62, 64, 63,243,104,164, 30,110,132,153, 85,139,158,254,213, 21,213, 14,208,238, 97, 92,231,207, 15,138,143,167,136, 64,
- 15, 26, 23,129,217, 80,108,177, 12,  1,196,116, 89,104,132,223, 70,186, 57, 43,139,178,231, 12,182, 91,172,102, 88,107, 13, 12,
-127,201,119,243,152, 40,154,173, 73,188,132, 45,226,  9, 59, 91,205,139,120,140,207,226,138,  1,220, 51,186,223,100,116, 10,116,
- 22,207,125, 28,163,107, 51, 90,181, 43, 21,251, 84, 51,  2,143, 30,142, 15,248,234,227,239,223, 16,152, 42, 59,178,160, 10,101,
- 23, 14,225,120,101, 14,197,150,232, 63, 77,102,164, 63,110, 77,139, 31,195,153,233,211, 79,103, 31,114, 81, 90,137,233, 30, 21,
- 78, 31, 27,207, 53,147, 53, 90, 58,156,100,234,177,190, 51, 82, 79,124, 76,  5,139,202, 54,154,177,241, 16, 61,220, 59,152, 54,
-151, 75,136,176,132, 96, 14,150,227, 92,229,225, 65,235,  6,157,228,190, 52,202,123,219,141,203,162,115, 29, 12,100,244,104, 58,
-111, 54,199,249,139,221,125,154, 19,211,215,234,229,161, 58,175,213,245, 23,213, 31,169,230,153,234,198, 49,239,229, 34,121,150,
-156, 40,245, 38, 37, 59, 10,110, 16, 55,105,241,195,216,132, 77,188, 58,220, 82,175,182, 56,218,247,167,250,117,162, 78,207,212,
-238,111, 53, 50,171,183, 87,239,134,211,165,254,218,  5,215,244,253,226,233,147, 35,235, 44,161, 60,199,119,130,174,228,134, 25,
- 95,181,115, 78,205,246,157,100,243,164, 40, 38, 47, 65, 72, 40,196, 24,135,177, 16, 51,177, 97, 76,133,224,251, 72,153,  8,128,
-247,  9,201,199,183,104,200, 46,212, 96, 44,235,126,173, 57,229,158,142,211,108,182,156, 12,116,142,255,245,154, 85,255,246,252,
- 39, 77, 10,111, 88,202,131, 23,197,189, 16,154,122,219,236,236,214,143,105,176, 35,128,206,182,160, 63,135, 30, 13,171, 42,226,
- 55,154,106,  6,251,154,237,160,108,218,216,203,125,138,140,190,209, 13,223,225,116,172,194,253,182,245,127,  4, 32,236, 90, 91,
-155,  8,162,232,204,236, 78,118, 19, 93, 83,124,180,241,139, 34, 42,  8,130,159,252, 46,254,118, 17,196, 63,224, 19, 65,164,172,
-134, 66,140, 49,251,152,199,142,247, 53, 49, 69,138, 80, 74, 33,133,116,155,185,119,206,189,247,156,123, 32,105,152,203,219,196,
-  8,  8,107,177,207, 22, 77,147,129,244,218, 24,214,175, 34, 95, 17, 71, 59,180,126, 29, 94,  2, 92, 48,171,225,171,172,  0,139,
- 33,161,157, 37,110, 52, 55,230,200, 44,116,182,163,147, 90, 27, 31,136,229,182,240, 22,216, 85,228,247,213,218, 67, 77,128,227,
- 32, 28,124,215, 84,163, 97,150,197,161, 19, 90, 77, 98,111, 19,215, 86, 26, 75,235, 56,160,158,129, 67,237, 38, 15, 17,216,238,
-191,251, 68,222, 32,152,241,197,191, 41,223,222,135,253,105,178,130,108,134, 41,222,  0,130,128, 66,105, 31,127, 41, 41,178, 15,
-130, 85,190,124,115,159,138, 56, 17, 58, 95,210, 82,209,104,157,101,186,250, 56, 22,153, 23,200, 63, 48,225, 29, 25,197, 44, 68,
- 73,234,100,174,  1, 14, 47, 74, 61,183,133,173,237,181, 69,  9,224,235,124, 51,158,111,250,118,235,215, 59,239,  6, 63, 58,136,
-128, 56,194, 83,121,188,188,230,  6,242,163,174,140,106,102, 26, 32,127,133, 13, 19,228,127,193,179,243, 10, 95, 77, 45,151,142,
-162,110, 71, 41,165,204,201,189,207,248,  2, 94, 93,135,212, 78,  9,176,232, 58,166, 54,196, 54, 32,111,210,101,132, 82,146,117,
- 76, 99,141,213,105,187,143,189,159, 28,249,224,250,144, 48,107, 79,178,181,162,214,105, 94,164,170, 32,201, 43,234,161,212,173,
- 26,211,209,  0, 88, 57,170,166,134,207, 72,117, 46,141,147, 94,157,152,139,109, 68,213,189,214,182,184,206, 22,126,116,156,224,
-128,216,229,226, 38,113,254,240, 95,229, 41, 69, 74,118,251,171,184, 32, 22, 74,129,160,115, 18,111, 63,  3, 21,186,247,  3, 65,
- 98, 33,236, 42,246,114,196,243,195, 88, 21, 49,110,145,152,128,200,178, 35, 69,238,119,104,112,122,182, 92, 33,  6, 20,162, 35,
- 85, 84,134, 44, 31, 83,112,112,175,202,208,  5, 63,105, 56,105,148,196,249,131,199, 63,168,178,117,  0,244, 98,224,114,170,198,
- 48,208, 70,123, 28,228,113,211, 28, 93, 68,202,138,251,115, 71,207, 32,223, 78,151,171,193,119, 60,138,129,155, 67, 17,170, 48,
- 25,130, 24,202,241, 40, 43, 97, 11, 89,195, 45,120,195, 81,195,113, 52, 43,102, 36, 88, 85, 70, 22,107, 40, 23,198, 30, 50,190,
- 18, 53,  0,156,  8, 23, 66, 65,157,201, 66, 31,153, 83, 81, 90,220,245,187,128, 34, 97, 67, 75,101, 48,233,184,104,182,126,124,
-254,242,217,141,199,106,243, 65,217,119,234,238,103,101,222,171,211,175,234,206, 79,245,227, 66, 13, 22, 19,125,175, 17,145, 31,
- 76,104, 75, 58,105,117, 38, 95, 29, 56,124,240, 59,155,111,170,125,171, 62,190,158,202, 79,254, 97,103,158, 46,244,147,141,122,
-113,255,209,171, 47,111,116,225, 12, 84,244,117,  5,101, 96,180, 54, 26,148, 65, 69,114,102,135, 51,182,168,155,110,232,120,179,
-189,244,218, 18,167, 54, 81,  2, 78, 83,238,179,  8, 17, 14, 67, 27,128, 10,238,221,156,100,233,122, 98,229,121,158, 88, 38,177,
-164,151,246,141, 44,  9,253,223, 22,129,203,219,216,137,186, 52, 93, 53,188,204,220, 10,125,105, 73, 23,145, 34,249, 28,162,  8,
-191,196,126, 11,102,190,219,243,179,123,205,131,170,180, 67,112,123,223,255, 14,  3,178, 63,208,225, 14,162,220, 65,168, 57,156,
- 85,185, 40, 27, 70, 10,150,205,106,113,230, 70,146, 85,101,231,145,246,250,252,211,109,191,138,199,115,176,237, 81,127,  4, 96,
-235,218,121,155,  8,130,240,238,222,249, 30, 62, 91,128,133,132,132,162,132, 10,201, 29,162,165,231, 55,240, 99,248, 81, 72, 20,
- 72, 52, 20, 52, 32,129,160,129,130, 84, 20,128,148,  0,  9,246,197,247,216,221, 57,230,177,123,190, 40,110, 83,228, 44,159,119,
-246,155,153,239,113,200,159, 64,143, 68,159, 16,151,153,224,245,194, 58, 35,109, 40, 47,141,196,168, 32, 65, 64, 67,226, 89,250,
-196,219,158, 14,160, 84, 51, 48,206,224,237,  4,157,132, 20, 89,162, 19, 76,101,234, 66, 79,231, 73,171,180,121, 52,166, 31, 82,
- 78,112,200, 85,226,200,124, 48,164, 25, 34, 72,199,135,101, 52, 30, 53,142,102, 42, 46,211,249, 42, 47, 27,246, 46,167,190,158,
- 53,153,151, 29, 86, 33, 55,165, 47, 78, 59, 18, 19,214,107, 49, 18,136,134, 13,192,148,158,140,138, 59,205,143, 32, 10, 92,163,
- 93,160, 30,151,171,225,123,  8,152,125,255, 74,135,225,186,115,217,168,103,228, 97,172, 24,187,114,125, 31, 84, 81, 84,  0,112,
- 43,107,150,233,176,154,153, 69, 69, 38,107, 23,141,109, 26,191,237,220,214, 14, 41,107, 85, 16,212,209, 25, 50,170,177, 52, 88,
- 39, 88,141, 63,231, 12,107,186,233, 41, 35,141, 73, 27, 92,152,114, 46,128,  0,129, 29,223,196, 16, 62,  9,102,234,246,203,225,
- 16, 33, 56,254,  8,236, 13, 14,175,143,  7, 21,129, 81,221,248, 63, 26,191, 88,252,244,252, 10,248, 41, 88,199,243, 20,145, 42,
-137, 27,182, 94,223, 46, 13, 62,253, 14, 37,126,168,186,  5,196,245,228, 44,143, 37,190,247,155,  6, 11, 28, 45,205,157,211,121,
-153, 60, 89,155,183, 95, 58, 34,193,170,142, 52,108, 41,121,146,144,213,149,239,234,182, 23,119, 26, 90,128,192, 62,199, 94, 79,
-187, 72, 74,110,176, 62,106,182,241,195,212,221, 70,120, 19,139,124,222,180, 59,185,100,197, 25, 67,130,173, 53,111, 32,215, 71,
- 15,191,253, 60, 29, 13,  6, 16,125,  0,157, 39,199,106,213, 73,151, 69,118,246,158, 11,110,146, 33, 48,207,230,255,176,105, 99,
-174, 62, 93, 57,172, 46, 38,134,146, 73,251,193,150,121, 73, 38,239,224,218,222,153,144,208,148,112, 67,199, 51,100,128,142,124,
-131, 37, 84, 86,134, 43, 32, 28, 56,188, 36, 47, 54,231, 82,114,103,132,254,169, 33,199,218,148,176,140, 77,226, 90, 89, 51, 40,
-198,242,100,162,167, 24,219, 74,207, 48,207,138,166,239, 16,128, 39,102,156,151,146,225, 88,107, 91, 82,185,177,103,170, 54, 97,
-252, 37,196, 77,230, 27,153, 56,110,212,162,169,209,194,206,160,197, 20, 94,150, 62, 55,217,167,205,199,151,175,214, 79,159, 63,
- 62,126,166,142,191, 43,245, 90,189,120,163, 62,191,227,130,142,255,112,169,138,133,218,174, 84,117,164,202, 19, 53,127,160,182,
- 11,108,198,213, 37,113,116, 84, 13, 49,228,225,183,114,103,244,  6,253,169,239,206,161,180,253,153, 69, 68,162, 30,221,243,191,
-190,102,239,127,124, 40, 22,197,  5,158, 76, 60,168, 80,247,118,103,177,144,121, 70,240,131,  4,240,169,191, 49,225, 86,143,129,
- 29, 49,  7,107,  8,128, 59, 76, 87,116,236, 53,  7,218, 78, 93,  9,155, 89,200,237,210, 37,197, 32,242, 24, 82, 26, 56,  9,135,
-113,174, 62,108, 22,181,183, 78, 23,163,108, 61,209, 55, 77, 39, 57, 21,167,134,249, 16,252, 36,100, 72, 22, 88,211,125,111,120,
-109,201,247,185,214,203,236,238,253,234, 36,211,  9,162,207,153,209, 85,146,144,194,111,240, 68,230,118, 59, 75,140, 15,218, 80,
- 66, 92,154,230,204,102,  0,250,123,120, 30, 37,255, 89,128, 64,139,191,102,187,119, 99, 37, 16,147,225, 38,190,  5,255,  5,224,
-235, 90, 86,156,  8,162,232,173,234,238, 60,122, 18,144,204,198,133,130,  4,193,197,224, 70, 65,220,234, 94,152,127, 17,252, 14,
-119,126,131, 11, 23,254,130, 75,113, 20, 65, 97, 80, 70,  6, 97, 28,145,153, 73, 38,147,126,164, 83, 93,229, 61,183,170, 59,137,
- 70,201, 46,105,146, 78,119,245,173, 83,183,206, 35,166,191, 93,210,155, 22, 77,  3,186, 93, 26, 13,187, 49,131, 14,  6, 83,203,
-162, 46,197,255,200,200,192,  1,104, 40,109,175,167,227, 94,156, 38,120,210,133, 13,136,188,142,218, 66, 69, 90, 25,207, 37,111,
- 44,188, 49, 66,240,181, 81,226,  1,176,164, 30, 11,193,159, 98,184, 47, 71, 93, 10,230, 36, 18, 84,198,232,207, 74,135,196,122,
-170, 27,191,242,202,248, 22,102,  4,241, 43,186,158,147, 69,230, 54,205,251,125,198, 94,173,214,148,  0,  1,  5,168, 70,142,134,
-203,234, 86,214, 58,237,237, 14,  2,166,166, 67, 21, 70, 94, 83,217,131,165,148,218,140,231, 94,171, 78,174,141,247,211, 33, 14,
- 14, 98,206,221, 30, 93, 79,  9,  4,231,  4,148,228, 73,102,166,133, 49,181,203,192,220, 80, 48,232,211, 56,155,203, 37,218, 47,
- 89,141,154,149, 51,250,229,127, 87,171, 42,170,241,142, 86,253,136,209, 46, 72,147,252, 49, 79,247,115, 73,228,168,164,136,123,
- 19,192,214,  5, 86, 55,254, 10,186,177,  8,252,207, 34, 78, 55, 96,255, 44,135,141,140,197, 46, 28, 87,109, 73,110, 39,149,  9,
-189,177,146, 53, 14, 95,234,105,225,134, 29,189,211, 81,131, 24,241, 45,217,210,117,156, 29,116,181, 88,159, 33, 72,132,239, 13,
- 15,198,188,176,163,145,126,124, 55,121,251,117, 56, 43,231,125,225,120, 44, 84, 45,100,  1, 37,102,191,178, 38,146,134,130, 76,
- 38,130,177,108,112,140,177,255, 60, 85, 40,236,138,170,224,113,151,118, 83,  7,162,125,165,125,164,181, 14,185, 10, 71,167, 71,
-218,107, 61,229,161, 52, 72,114, 68,215, 54,152, 20,160,119,235,100,212, 65,159,209, 73,  0,165,231,197, 85,206,103,167,188,120,
- 28,119, 62,214,137, 17,196,132,246, 81,101,166,243, 11,191, 16,148,164, 72,132,  5,138,152,  8,125, 67,158,108,224,125,182, 40,
-219,168, 48, 64, 56, 30,203, 36,178, 51,172, 30,208,156,226,131,211, 36,157,139, 33, 65, 36,156, 28, 97, 36, 97,153,168,209,165,
-140, 37,138,146,248, 66,241,105,150,139, 66, 54,226,212,104,176,251,243,242, 84, 41,106, 76,224,189,160, 78,249,205,100,217, 18,
-208,146,137,162,107, 37,154, 47, 45,182,152,145,109,118, 44,162, 77,115,108,159,100,204,243,218, 98, 28,221,126, 50,190,247,225,
- 13,125,124,109,110,237,197,119, 30,208,254, 67,218, 79,168,252, 70,  7,239,233,213, 33, 29, 28,211,143, 79,120, 72,246,174,209,
-211,251,244,104, 76,135,223,233,249,103,250, 82,208,172,192,245,236,197,212, 79,104,236,104,160, 41,203, 34, 83,218, 19,115,126,
- 76,179,151,147,119,153, 57,121, 49,126,118, 69,191, 46,204,153,227, 90,  1, 99,120,232,193, 80,212,141,241,180,101,116,165, 64,
- 65,242, 26, 31, 87,251,226,110, 55, 28,211,197, 90, 77,114,115,125,204, 89,107,232, 40,104, 29,100, 25, 79,115,241,234, 83,111,
-243, 64, 33,196, 45,  8,152,212,118, 61,146, 91,181,204,183,229, 58,217,149, 99,151,106, 81,208,218,129, 34, 85, 13,254,119, 42,
-  4, 46,181,253, 25,111,229,130,165,117, 39,234,223,220,185,129,192, 57, 91, 79, 75,174, 91, 80,231,100,139, 44, 55,121,238, 10,
- 33, 46,152, 37,180,231, 66,161,  8,191,204,136,174,195,223,105,169,157, 60,148,253, 51,242,211,109,146, 71, 60,183,195,110, 53,
- 55,252, 45,  0, 95,231,146,219, 68, 16,132,225,234,199, 76,252,148,101,130,132,226, 72, 94,192, 22,  4,217,103,137,114,  4, 86,
- 92,134,179,112,  0,118, 92,  1, 22,236, 88,176,204,138, 40,130,216,137, 31, 99,143,103,166,167,233,191,170,103,236, 24,132, 87,
- 30,203,146,109,185,167,186,186,234,175,239,183, 71, 63,207, 71, 52, 90,155,234, 32,121, 31,216, 65,216,120,243,114,  1,105, 57,
- 48, 27,117,107,156,105,248,120, 88,106,179,171,138,212,118,134, 73,207, 96, 76, 41,  9,217,120,120,101,227,193, 29, 66, 71,  8,
- 84,104, 22,  8,162, 33, 39,179,219, 53,202, 78,142,149,145, 94, 85,141,155, 74,146, 96,241, 87,174,  8,203,247,  4,166, 67,186,
-163,108,184, 15, 19, 99,251,166, 27,222,182,227, 33,210, 62, 56, 89,102,227,114,  2,254,208,153,104,194,232, 91,224, 87,131,203,
-111,170, 51,109,215, 57,114, 27, 26,204,153,218, 11,217,155,251, 59,158,179, 77,140, 63,113,144,166, 73,160,188,214,  7,234,247,
-122, 79, 46,219,127, 14,107, 70, 90, 99,128,113,151,158,117,117,199,232, 69,238,110,102,171,144, 55,174, 10,212,178, 75,209,164,
- 43,186, 47,217, 38,137,239,200, 16, 85, 55, 62,174, 41,136,136, 42, 58,133, 48, 21, 60,128, 45,111,169, 80,179,192,181, 38, 82,
- 65,164, 48,154, 55,127,159, 36, 29,169,240, 68,154, 75,245,223,248, 46, 35,209, 25, 43,  9,104,  7,242,251,210, 80, 71, 99,215,
-233, 89,175,156, 94,131,230, 22, 46,125,138,110, 17,109, 11, 28,177, 84,  2, 57, 77,  5, 91, 87, 93,186,144,117,232, 36,129, 22,
-104,  9,191, 10,212,212,126, 45,234,233, 19,243,250,121,246,229,135,115,245, 14,186,251, 16, 93, 25,157, 88,201,152,158,178, 33,
- 81, 48, 90,108,139, 84,170, 77,191, 55,156,111, 30,184,108,254, 15,141,164,150,218,132, 97, 51, 17, 79,224,200, 67, 60,142,238,
-181,230,163,165, 22, 12, 70,164,126, 55,246, 99,142,131,187,143,113,145,129,214,120, 22, 62,119,212, 27,205, 86,115,  9,184,164,
-246, 66, 99,244,129,234,104, 49, 17,238,201,253, 72,149,215, 39,108, 30,  4,121,  3, 31, 10,207,199,103,243,213, 61,138, 71, 81,
- 72, 43,217,187,151,110, 83,212, 51, 71, 93,187,103, 56,137,146, 88, 21,171,123, 70,139,213,154,139,128,  3,202,118,219,144,179,
-135,213,142, 42,163,247,191,151,183,162,176, 85, 58, 30,166,149,111,109, 10,100,127,196, 16, 92,154, 26,152, 89, 26,150,125, 73,
- 17,211, 71,206,181,111,199,235,165, 33,138,189,  0,245,209,183,250,138,102,116,241,138,108,101,127,222,249,207,107,160,151,244,
-  5, 77,222, 81,239,138,222,111,233, 67,202, 76,201, 59, 26, 78,136, 94,176, 29,200, 55,186,252, 72,167, 55,244, 80, 80,153, 35,
- 36, 91, 75, 83, 69,231,  3,178, 57, 77,234,228,205,120, 58,122, 74, 52,122, 25,150,227,247,235,219, 79,215, 95,179, 44,  3, 78,
-168,230,137, 20, 87,150,200,182, 49,127, 36, 96,123, 68, 98,102, 79, 71,128,107,140,209,141,114, 93, 78,192,218, 14, 59,195, 25,
-250, 97,237,100,144,244, 53,112,209, 77,251,121,201, 34,222, 56, 43, 20,133,125,190,229,254,213,135, 74, 19,181,239,133,186,  8,
-103,105,211,224, 67,194,139,  8,243,212, 95,147, 77,109, 49, 70, 61, 18,206,196,175,202, 39, 49, 47,101,109,110,219,155,179,222,
-180,107,187,185, 43,138, 98,147, 87,235,109,145,101,229,  6, 51,152, 97, 89,161,231,  5,171, 50,201,  3, 90, 48, 23,107,163, 43,
-127, 80,134,240,143, 74,253,199,210,123,137,120,234, 72, 68,121,240,248, 35,  0, 93,231,178,219, 68, 16, 68,209,234,121,216,158,
-241, 35,  9,196, 73, 88,  0, 17, 98,  3, 10, 31,193,255,177,231,127, 96,201,138,  5, 66, 66,138, 16, 34, 68,150,  2,241,120,108,
-247,188,186,167,232,170,238,121, 56,  3, 81,150,177, 21,121,218,213,221,183,110,221, 19, 12, 14,239, 94,211,194,114, 61,253, 56,
-152, 22, 74,238,171, 61, 79, 83, 90,126, 45, 79,220, 56,194, 17, 67,175, 53,  5,  1, 82, 99,142,176,176, 35,235,118,207, 73,149,
-117,202, 26,185, 11,188,150, 70,142, 77, 51,147,222, 81, 83,176,175,121, 19, 58, 47,133,140,208, 38, 44,186,176,177,101,212, 56,
-154,  5,164, 59,  7,  4,156, 84, 71,227,216, 92,140,205,106,217, 85,245, 34, 52, 95,138, 96,234,121, 63,170,212,154, 93, 69, 51,
-208,142,131, 52, 71,236,170,153,223,195, 25,246,104, 27, 77,113, 71, 43,125,130,227,160,137,214, 45,234,  6,191,156, 65,146, 47,
-225,194,229, 57, 91,158,123, 43,208, 67,151,153, 18,143,240,217, 66, 76, 60,248,147,228, 55, 91,149,113,240,185,165,164, 77,248,
-  5,155,230,252, 79, 70,148,166, 94,171,134,147,103,202, 81,198,248,112,159, 82,127,237,  7,194,102, 32,254,203,178,249,231,245,
-161,234,146,247, 30,182, 24,132,251, 63,248, 81,141,198, 90,240,238, 18,  1, 36, 26, 30,213, 24, 33,175, 62,129, 19, 64,105,238,
- 25,218,147,140,127, 50, 85,126, 20,212,177, 22, 82, 96, 37,188,199, 17,173,208, 66,195,220, 39,171,138,141,133, 48, 87,180, 92,
-193,237,  6, 79,102,222,219, 55,163,143, 95, 84,161,131,128,164,113,254,173,105,110,121,121,252,100,117,127, 59,157, 28,165, 89,
-194,110,242,122,155,167,180, 47,114,160,150,195, 21,187,117, 79, 61,126, 55,130,128, 22,220,205,183, 96,119, 25,246,220,108,167,
-176, 57,135,100, 84, 55,  7,  5, 31,152,  5,203,186, 85,155,148,135, 76, 51,231, 48, 41, 92,239,214,190,232,228,234, 38,110,136,
-182,139,120, 20,203, 66,154,131, 75, 20,206,164, 57,165,  8,103, 73,204,171,194,226, 48, 60,182,162,167,251, 77, 20,142,101,185,
-243,221,142, 36, 58, 12, 88,237, 82,161,173, 95,207,111,146,  5, 68,219, 28,182,173,  3,171,  1, 90,181,133, 45, 55,230,100,195,
- 87, 83,122,110,243,201,172,160, 12,246, 10, 90, 65, 31,  6,174,104,194,  6, 61,191,249,253,179,205,238,235,172, 28,221,115,103,
-122, 42,178,238,128, 20, 54,247,226,229,133,252,  5, 95,223,235,232,210, 95, 94, 42,121, 28,222,  7,112,183,130, 15,159,  9,186,
- 11,175,204,170,  3,125, 14,245, 25, 25, 99,174,114, 90,  9,103, 87,112,241, 14, 94,155,154,180,135, 83,  9,170, 36,154,237,108,
- 13,227,  5, 92, 38,240,244,132,156, 51,184,130,235,111,240,233, 59,158,167,243,165,127,122,231, 93,151,149, 57, 17,170,138, 56,
-  5,154,109, 19, 84,215,231,241,194,124,146, 50,219, 90,143,170,179, 51,218, 22,169,211,226,221,144, 39,237, 12, 89,210, 80, 82,
- 29,128,150,211,242,232,  9,234,106, 91,215,181,227,109, 56, 20, 42, 98,191, 47, 57, 56,246,214, 46, 45,177, 59,254,160,120, 72,
- 90, 82,221,119,231, 96,108, 21,224,127, 49, 47,158,235, 31, 33,139, 52,172,173, 77,195,197, 60,152,234,186,148, 69,154,100,233,
-190,218, 81,101,199,162, 36, 31,156,230,178,174,173,234,208,203,131,  4,238, 56,176,238, 77,245, 64, 33,252,  3, 72,210,155, 23,
- 65,113, 72, 76, 24,230,208,252, 21,128,178,107,233,109, 26,  8,194,251,242, 35, 78,221,180, 21, 41,149, 42,161, 10,  9,169, 82,
- 43, 14,220,144, 64,226,206, 25,113,226, 15,240,  7,249,  3, 21,226, 12, 10, 39,132,132, 74,120, 84,180,228,213, 36,235,120,119,
-217,153,241,250,  1,185, 16,229, 18, 71,137,237,181, 53,158,249,102,190,239,171,248, 77, 45, 19, 15, 78,216,165, 79,180,  1, 76,
- 98, 42,151, 57, 72,110, 58,131,123,  3, 77,159,218,240, 40, 84, 37,  2,199, 63,  1,199,236,171, 52, 18, 73, 36,208,159, 12, 18,
-116, 91,216,114,229, 54,132,110,163, 25, 49,179, 85, 27,144,  8, 29,  8,136, 56,232,251,144,206, 61,114,243,176, 59, 33, 68, 95,
-166, 42,138,123, 34,246,233,205, 32,206, 82,149,237, 37,253,  8,237,230,111, 13, 16,149, 11, 87,104,107, 63,220,188, 47,204,122,
- 89,222,234, 82,175,  0,153, 55,144, 86, 34, 58,103,  2,205,173,117,117, 36,103,141, 72, 68,117,214, 33,184, 55,189,190,144,182,
- 11, 66, 89, 29,239,120,124,252,205,203, 40, 89, 77,108,174, 22, 29,  6, 45,252,179,232,225, 29,238, 15,241,219,111, 61, 54, 96,
-151, 75,  9,117,138, 63,200,241,227,154, 85, 26,221,181,160,112,132,  9,120,129, 95,213,116, 83,213, 66, 90, 92,144,148,137,112,
-227, 52,232,  0,186,182,129,215,255,188,232,234, 36,181,231, 42,190,115, 95,131,227,201,204,144,190, 29,225,186,244, 36, 31,166,
- 50,  6, 90, 14, 14,  7, 72, 31, 10, 65,131, 56,142,212, 78,204,178,158,152,104,174,173, 75, 99, 95,243, 73,205, 92, 22,241,187,
-  3,185,210,246,237,200, 87,100,160, 66,105,161, 26,128,157,228,217,193,213,244, 39,225,150,120, 75,216, 88, 38,  2,169, 84,126,
-229, 23,122,134,245, 83, 71,211,148, 28,203,176,131,170, 80,207,142,147, 27, 42,167,224, 46, 73,140,139,159, 29,159,143, 46, 63,
-162, 98,  0, 36,136,  0,121,155,194,146, 94,  5, 22, 95, 36, 92, 97,183,  8, 59,  7, 89, 18,206, 78,143, 79, 71,151, 35,137, 67,
-241,  4,236, 82, 23,  7,203,  8, 74,191, 57, 65,219,232,106, 70, 86,112, 45,179, 95,244,172,107, 28,127, 88,139,201,170,176,  5,
- 21, 44, 94,169,121, 32, 43, 13, 62,108,178, 10,138,251,142, 55,246,  3, 21, 62, 67, 81,  4,236, 22,170,126,  3,202,248, 75,152,
-146,136, 21, 24, 79, 71,161, 21,129,143, 28,212,234,195,192,230, 35,235,209,193,209,247,155, 95, 82,166, 43,107,158,236, 63,125,
-245,252,181,251,204, 46,222,177,235,229,156,239,138,249, 94,210,123,172, 62,221, 99,203, 67, 54,190,207,174,177, 59, 34,115,  8,
- 69,114,  7,219,127, 37,219,160,169, 75, 89,130, 16,133,209,240,176,200,190,192,159, 31, 94,176,225,143,133, 92, 78, 30, 13,216,
-179,221,225,208, 36,241, 21,139,246,217,139, 55, 47, 65,143,200, 44,180,  1,143,247,141, 89,131, 41,171,  5, 37,  9, 31,240,  9,
- 37, 67,241, 18, 10,238,150,162,105, 69,223,175,  6, 71, 92, 67,248,108, 88,141,238,100,120, 50,158,124, 21, 78,173, 54,203,192,
- 99,114, 33,198, 59,190, 77, 34, 70,116,  3,180,170,103, 10,107,223, 54,195, 90,252,  2, 22, 84,189,254, 21, 36,104, 10,120,214,
-153,106,133, 50, 18,102,102,240, 38,125,176,123,214,147,241, 84,207,166,235,201,180,152,195,116, 56,172, 28, 42,119, 96,100, 55,
- 44,136,206, 55, 14, 80,162, 70,128,125, 49,108, 27, 96,213,117,113,224,250, 32, 93, 55,103,223, 66,103,253, 35,  0, 95, 87,176,
-219, 52, 16, 68,103,215,142, 93,167, 77,169, 21,135, 20, 80,149, 83, 17,112,225,196, 55,240,183,112,226,198, 13,196,  1, 14, 21,
-202,161, 21, 42, 32,164, 52, 41, 77,169,147,208,216, 74,156,236,178, 51,179,187, 78,105,213,168,167,180,117,172,205,238,120,102,
-222,155,247,106,254, 12, 71, 58,238,185,135,228, 63,193,228, 25,107, 10,110,233, 40,106,211, 68,109, 83,180,138,144, 46,179, 53,
- 27, 52,118,231,122,222, 84, 49,161,234, 63,237,224, 21, 33,132,188, 70, 75,138,117, 33, 35, 65,206,244, 59,180,235, 69, 19,231,
-152,127,145,105,169, 68,247,178,  4, 61,163,163,144,158, 28, 38,215,155,175,150, 91, 33,234, 25,148,235,242,252,122,168,184,207,
-167,205, 15,238,147, 53, 79,197,107,223, 93, 81, 27,208,157,244,152,136, 77,166,172,176,155,176, 16,184,251,206,164, 29, 42,  9,
- 92,105,204,164,102,247,107, 78,184, 44,139, 42,224,176, 46,157,222,152,249,228, 56,208,175, 58, 98, 90, 84,167, 87,139,145, 70,
-191,189, 45, 96, 59, 76,209,134,160, 13,225, 62,132, 49,  4, 68,131,209,129,163, 17, 43, 79, 93,119, 91,142,109, 24,184,160,100,
-130,218,194, 57, 84,202,155,  1, 93,222,219,135,185,255,165, 28,250,234,165,  2, 52,216, 66,145,116,234,233, 96,155,236, 94,154,
-237, 73, 24,175, 52,185,149,  9,229,212,190, 87,176, 29,225, 90, 87, 90,180, 34, 73, 65, 28,235,237,164,129,146,147,121,169,155,
- 81,112,248, 56, 24,140, 77,129,142,122,210,152,173, 35,217,124, 78,203, 37, 56, 81,226,  1, 16,115, 12,144,160,178, 94, 48,161,
- 84,187, 89,113,106,168,155, 11,198,113,152, 40,212,243,225,206,181,228,225,  9, 14,238,146,220,102, 91,201,131,243,124, 68,253,
-104,193,225,213, 92, 55,221,222,123,126,240,194,148, 11, 36, 48,170, 54, 75,245,219,128, 60,171, 26,140,  9, 23, 69,156,204, 73,
- 36, 52,204, 14,140, 19,  4,137, 36,251, 96,240,  0,139,211,236,182,169,129,240,104, 59, 55,141, 89, 67,202,182,112, 36, 75, 93,
-129,253,103, 54, 89,145, 76,181,178, 85,  8,210,105,124,200,224, 99, 40,253, 96, 10, 61,161,236, 31,144,195,  9,217,174,226, 68,
- 43,251, 91,210,170,216,158,144,174, 19, 21,  4, 57,180,106,239,118,166,197,108, 55,105, 85,171,245,183,242, 71,255,244,164,247,
-168,247,242,245,222,179, 44, 62, 25,142,222,124,125,127,212,239,158,125,108, 22, 31,160,251, 25, 14,143,224,233,119,232, 14,160,
- 56,134,230,  0,228, 37, 60,201, 33,155,194,254, 12,228, 16,210, 28,218, 51,200,254,192,195, 51,104,149,208,253, 53,203,254, 14,
-210,101,209, 42,163,106,  2, 89,183,217,255,164,222, 30,191,251,  9, 95,204, 87, 89,225, 16, 75,165,212,194,228,240,  7,157,222,
-100,126,101, 83,113,176, 41, 59, 41,162,113, 91, 94,123,185, 68,237, 50,110, 59,192,196,201, 59,238, 44,108, 82, 79,138,124,185,
- 50, 71,126,105, 35, 59,189,175,107,110,184,118,101,180,226,131, 41,106,165,110,155, 45, 43, 15,173,121, 98,196,205,224,238,188,
-157, 68,109,206,100, 47, 79,247, 46,100,221, 37, 19,172,227, 34,157,155, 36,236, 68,233, 78, 35,253, 61,191,188, 40,199,197,234,
- 26, 39,234, 49,172,163, 40, 34, 11,229,174,111,129,189,158,130,231,106,205,224,174,135,212,127,170,150,155, 55,126,247,217,255,
- 39,  0,105,215,178, 26, 69, 16, 69,171,186,186,166,123, 30, 61,142, 49, 19,178, 24, 33,154,149,136, 27, 63, 64,197, 95,115,239,
- 23,  8, 34,238, 93,186,114,109,192,133,139,  8,234, 66, 80,130,198,134, 73,130, 78,232,103, 85, 87, 89,247,214,163,123,  2,186,
- 49,129,132, 12, 51, 19, 58,233,190,125,238,185,231,158,179,133,223, 35,103,107,  9,227,209,  8,241,251,136,166,145,221, 47, 71,
-113,146,118, 29,140, 14,148, 86,136,  1, 25, 25,252, 30, 27,228, 14, 99, 88, 48,122,196,173, 17,208,  1,193,162,140, 68,  7, 24,
-136,222,  5,140,101, 23,143, 96,107,159,113,188,133, 88, 67,206,208,101,131,221, 13,131,144, 26,131,226, 57,136, 33,249, 78, 50,
-203,120, 58, 51,159,241,184,233, 64, 70, 52, 97,113, 33, 65, 50,251,117,115,242,179,248,209,144,170, 16,149, 85,149, 34,120,239,
- 44,126, 87,161,165, 25, 88,195,  6,203, 48, 91,209, 93, 70,149,213, 50, 88,213, 16, 37,195,125, 19, 22, 28,121,182,187, 52,234,
-205,171,124,119,101, 61,100,157,232,251,222,117,125, 89,182,223, 74, 48,163, 19,136,193,111,192, 87, 54,161,124,202,216, 50,225,
-217,136,225, 38, 42,169, 68,183, 46,235, 83, 85,175, 17,140, 75, 79,156, 41,175,128,212, 65,197,232, 79, 77,203,221, 39, 94, 10,
- 25,248,250,255,255,176, 16,126,230,205,163, 37, 62,146,250, 65,174,198, 12,216, 57, 76,126,105, 10,178, 24,164,233,147, 40, 75,
-227, 66, 27, 20,207,204,127, 72,226,216, 29,184, 51, 74,175,141,233, 70,  0,242,221,203, 56, 39,234,232,163, 44, 90,142, 91,185,
-216,136,194, 61, 67, 47, 38,187,235,223, 57,154,244,224, 61,191,159,106,192, 95,127, 49,221, 61, 47,206, 24, 86, 99,120, 87,141,
-133,156,134,218, 26, 49, 71,158, 69, 62,  1,152, 88,248,107,  5, 44, 18,  7,113,230,100, 48, 53,176,105, 43, 76, 41,112, 48,241,
- 31,161, 91, 22,221,107,159,229,224, 20,200, 17, 26, 85,  6,211,  0,255,139, 66,108,  8,118, 11,168,172,236,173,  9,  7, 58, 43,
-124,185,249,249, 46,120,  5,127, 98,254, 16,230,105, 86,180, 37,179,199,130, 92, 83,236,168,243, 64,  9,134, 48, 53,208, 84, 91,
-119, 84, 68,253,  4,219, 92,224,114, 98,140, 69, 77, 32,245, 27, 88,157, 36, 30,153,170, 90, 54, 21,144, 24,170, 19,246,180,132,
-231,196,  6, 75, 40,115,197, 49, 62,231, 75,193,179,157,197,193,195,213,131,251,183,111,141, 47, 41, 89,145,207, 57,121,125, 68,
-222,124, 39,239,214,228,188,129,145,201,163,125,242,226, 49,217, 63, 36,199,199,228,233, 23,146, 11,216,129, 74,113,110,100,240,
-123,181,145, 52,142,243,211,103, 93,253,158, 74,105,122,212, 92,159,220, 36,171,231,135, 47, 95,137, 39, 31,200,219, 78, 54,141,
-170,164,170,219, 78, 72, 92, 20,151,144,179, 65, 61,141,110,215,244,157, 24,198, 87,246,  1,114, 87, 22,  0, 64,  5, 71,127, 79,
-189,205,194, 99,101, 87,116,160,161, 84,131,185,234, 21,123, 71,119,221,135,155,186, 85,253, 14,178,120,244,128,229,240,189,196,
- 80,186, 67,  8, 76,245, 65, 46, 85, 71, 61,195, 27, 81, 95,223,205,247,229,116,239,162,184, 56,200,238, 84, 77,253,171, 61, 19,
-210, 84,118,129,176, 29,  8, 25,137,145, 90,180,119, 58,235,101, 57,180,119, 27,183,179, 22, 80,162, 93, 97, 11,  2,132,239,122,
-193,232,223, 84,240, 46,116,246,143,  0,164, 93, 61,143,211, 64, 16,221, 93,175,147, 56,137, 34, 43,225,164, 35, 28, 18,232,160,
- 57,157,160, 65,162,228,127,208, 82,241,127,248, 11,212,208, 81,210, 82, 81,  1,210, 73, 64,115, 10, 81,114,119,185, 64,176,207,
-246,122,119,241,204,236, 58,107,233, 58,154, 52,150,236,141, 63,102,103,222,188,121, 79,  6,232,189,123,233,133, 91, 52, 98, 83,
- 70,160, 58,130,155,137, 14, 34,187, 65, 36,139, 38,128,232,163,138, 64, 19,195,130,153, 82, 12,224, 17,152,221, 26, 44, 67, 92,
-197,100,140,244, 47,108,237, 71,111,177,245, 90, 99,139, 47,130, 70,129,129,214, 93,179,254,230, 51,214, 90, 11,116, 54,238,113,
-148,152,176, 38,175, 84,243,106, 54, 85,124, 81,171, 36,  2,199,190,178,174, 47,202, 53,228, 91,218,201, 57,180, 35,238,109, 56,
- 23, 84,137,  7,162,179,220,209, 28, 24,120,176, 55,103,171,110,240, 99,185, 37,184,139,125, 78, 22,234,134,219,253,147,160, 91,
- 88,239, 69,227,133,144, 73,146,206,163,149, 84,245,143, 92, 93, 32,192, 66,153,251,144,197,105, 36,167,177, 28,245,123,163, 88,
-222, 25,247,134, 61, 57, 25, 66,105,210,108,125, 63, 87,219, 15,139,229,159, 46,  6, 68,105,123,236,151,173,125,150, 29,226, 57,
- 54,232,163,178,255, 72,225, 67,187, 87,229, 65,121,186, 74,133,151, 24, 80,121, 81,179, 27,180,162,  3, 76,183, 41,177,141,200,
-149,109,182,168,126,143,165,125,160, 65, 38,131, 88,128,  5, 51,155,142, 64, 21,224,104,194,183,153,217, 21,230, 94, 26,189,120,
-194, 63,157,169,171,157, 68,206, 55, 38,199,202,140,  7,163,205, 14,179, 57,164,147, 90,186,173, 40,134, 14, 72, 84,145,113, 24,
- 64,195, 98,143,145,127,238, 62,184, 11, 31,220,169,159,121,122,116,114,190, 89,208,240, 97,216, 16,  3,126,173,174, 34,100,194,
- 90,118,155, 37,101,183,152, 49,172,213, 56, 10, 36,165, 44, 82,123,144,243,206,253, 26, 72, 66,149,100,165, 52, 78, 56, 69, 52,
- 93,234,100,114, 90, 90, 27,250, 29,192,175,254,186,248,198,189,247, 51,168, 53,151,153,116, 12, 25, 39,240,231,  5,196,189, 98,
-143, 15, 79,130, 88,149,180,189,128, 82,166,104,179,209,227,131,135,191,174,151,212,131, 44,170, 34, 47,115,106, 52, 55,231,159,
- 79,239, 42,163,179, 34,223,230,187,154,163,176,133,176,135,233,172,200, 84, 44,212,239,106,253,126,253,241, 93,121, 54,152, 60,
-234,157, 60,126,250,154,189,100,236, 85,243, 32, 22,172, 56,103,213,134,205, 31,224,  0,107,243,244,223,176,241,138, 21, 75, 86,
- 22, 44, 83,176, 55, 39,208,226,144,135,  9, 43,185,152,142,198,243,209,193,241,240,254,243,217, 51, 33,213,151,236,237,247,235,
-207, 53,128,239, 77, 88, 87, 26,247, 89,  0, 37,106,147,142,103, 23,127, 47,105,102,152, 72,235,198, 77,162, 82,  6, 73,  7,184,
-155,212,  4, 60,143, 34,120,139,210, 80,223,142, 52,127,129, 58, 67,182,177,156,196, 73,187,246,199,182, 51,226,233,109,249, 88,
- 71,  9,210,  4,161,175, 11,187, 59,  3, 13,189,247,245,176, 57, 50,103, 24, 42, 68,242,253,148, 65, 43,145,193,174,118,151,227,
-126,154,240,120,167, 47, 65,136, 11, 73, 50,218, 49,247, 91, 66,178, 13, 29,160,130, 77,  5,196,218, 36,194,146,222,119,213,134,
-255,134,116,180, 72,183,194,  6,213,123, 87,187,184,227, 25,248, 79,  0,214,206,101,183,105, 32, 10,195,115,177, 61,142,157,196,
- 45, 20, 74, 17, 66,125,  6, 22, 93,240, 50,188, 22, 75,222,136, 69,145, 64, 72, 84,130,148,  5,174,162,144,230,210,196,246,216,
-156,219, 56,  9, 41, 59,162, 74,105,147, 72, 81,237,196,243,159,115,254,249,126,212,239, 29,111,234, 17,185, 74, 92, 34,105,190,
- 27,167,  7, 45, 81,170, 61,245, 16,120, 94, 74,107,145,233, 13,242,248, 50, 21,167,212,121,199,220, 62,144,222,157,174, 65, 68,
-227,196,149,  4,132,226,147, 65, 60, 33,141,251, 51, 13,243, 88,100,191, 30, 45, 53, 90,240, 89, 17,246, 86,109,106,156,197,221,
-155, 14,132,188, 53,160, 53,242,177,203, 65, 42, 92,228,197,200,101, 85, 75,166,208, 78,207,170,249,245,244, 26,254, 90, 55,171,
- 13,242, 35, 97,  5,128,199, 41,217, 21, 15,187,103,194,217, 81, 56,161, 22, 79, 29,214, 16,166,237,187,240,127, 93,220,  3,230,
- 73,237, 22,234,174,151,119, 59,100,115,168, 29,185,112,171,125,247, 60,173, 95, 71,254,227,239,122, 66, 79,231, 74,157, 96,230,
-101, 52, 84,118,152, 36,167, 14, 33,226,163, 52,126,146,185, 19,103,179, 20,170,158, 40,113,113,238,220,167, 31,229,251,207,223,
-110, 67, 67,188,217,113, 69, 15,144,161,126,239,247, 86,253,231,155,  9,133, 66, 31, 79,232,195,199, 37, 15, 19,221, 51,234, 44,
-192, 97, 34,222, 27,122, 87,243,196, 22,169, 69,192,127, 26,189, 56,141,135,121,146,103, 80,109,233,186,229,121,151,191,157, 99,
-  5,253,108,100, 19,211,125,191,219,126,153,168,135, 10, 59, 10,240,221, 77,162,124,185, 89,192,217,244,173,196,110,117, 34, 87,
-131, 19, 36,180, 13, 13,211,184, 12,239,188, 35, 90,164,214,193, 13,105,104, 75, 84,220, 96, 82,118, 48,132, 83,196, 76,248,105,
- 24,180, 77,236, 81, 29, 74, 46,243,216, 52, 66, 54,223,237,139, 34,120,121, 54,192,188, 55,138,170,165,222, 16, 35,  2, 57, 84,
-196,  4,211, 53,172,  0,158,  6, 64, 82, 64,244,228, 99,246,197, 19,130, 12,133, 60, 39, 71,241, 58,193,174,105,102,149, 40,254,
-191, 12, 67,133,  4,131, 76,221, 28, 33,134, 51,138,  3, 43,102,220, 12,163,237,121,113, 62, 93,148, 49,  5,170,199,216,167,137,
-  4, 23, 69,227, 10,208, 69, 24,160, 16,197,171,237,186,242, 76, 45,194,160, 27, 88, 29,178,120,100,211, 66, 15,198, 23,103,151,
-211, 65, 97,135,151,203,119,111,186, 43, 60,251, 25,249,101,249,208,240, 64,249, 45, 45,249, 47,149,186,167,116,191,113, 40,236,
-182, 55, 74,151,234,235,135,153, 93,252, 44, 23,147,233,114,178, 90,253, 42,151, 55,213,102,254, 80,223,107,116, 70, 98,183,173,
- 65,110, 30,190, 63,136, 57,107,109,  5, 18, 94,156,140,  7,178,189, 13, 56,127,145,224,173,160, 36,  2,243,145,243,112, 25, 19,
-194,119,221,254, 20,148, 39, 96,199,159,231,  3,141, 44, 74, 94,155,127,238, 74,237,250,226,139, 47,238,143,226, 34,123,207,180,
-230, 16, 83, 60, 41, 72, 35,128,235,248, 83,247, 42, 82,110,182,190,171,208,118,208,144,147, 94,224,181,210, 10, 57,176,123,  8,
- 81,210,  8,190,130,107,116,234,189, 97,150,134,228,255, 29,155, 35, 61, 95, 84,247, 40,199,199, 41,172,112,251, 35,  0,105,231,
-179, 27, 69, 12,131,241,216,153, 63, 45,173,160, 42, 72,  8, 36,184,112, 65,130,247,224, 69,121, 31, 84,245,136, 56,  0,  7, 68,
- 69,183, 18, 67,119,102,118,146,152,216,142,179,179, 98,225, 66,143, 43,117,119,181, 73, 60, 95,236,207, 63, 55,107,184, 37, 88,
- 61,185, 36, 13,217,171,222,141, 46, 36,251,127, 42,106,221, 27,217,201,201, 56,175,124,174,187,190,201,146,186,109,152,118,229,
-151,124,174,101, 54,252,162,105,131,  2,180,151, 67,150,196,193, 93,190,166,118,168,129, 57, 92,100,125,153,178,227, 98,150,240,
-  9, 34, 70,228,217, 65, 69,179,156,179,237,146,134,101,110,145, 95,235, 61, 12,236,111, 99,143,141,148,103,  8, 86,207,174,114,
- 71,150,134, 48,114,  5,154,140,251,222, 45, 58,245,125,116,236,203,245, 88, 11,170,102,180,208,105, 20,222,213, 70, 68,176,170,
-  3, 88,147, 22,172, 17,110,160,179,121, 57, 43,116,222,210,171, 19,186,186, 93,190, 28,102,183, 83,193, 74,129, 26, 45,117,133,
-162,248,100,167,196,232,203,252, 43,191,126,254,228,221,102,120,255,253,102,249,251, 60,129,248,239, 57,  3,255,253,167,  5,  0,
- 52, 21, 79,182,231,180,145, 74, 90, 48,184,251, 98,148,102,172,224, 21,127, 70,119, 51, 27,205, 47, 31,240, 46, 26,126,186, 97,
-  8,  9, 71, 94,110,112,125,231,159, 62,244,103,190,219, 57,156,  2,116, 29, 62,123,220,131,159,191,110,166,124, 21,152,230,184,
- 44, 83,219, 49, 27,112, 12, 89,101,179,253, 49,173, 64, 73, 88,129, 25, 98,249, 83,243, 52, 15, 98, 99,206, 15,152, 74, 21, 97,
-194, 45, 81, 60,130, 55,  7,129, 55, 47,222, 94,127,190, 62,114,210,181,197,161,128,232,143,  6,119,161,159, 56, 87,159, 50, 26,
-108, 16, 20, 85,227, 53,178,139,127,198,148,180,  0, 54, 34,131, 29, 60, 40,192,204,215,114,107,117, 85, 41, 12,137,155,129, 30,
-157, 92,108,203, 13,  3, 43, 60, 68,119,144, 52,229,138,  4,179, 73,158,  8,229,233,  1,234,  4,149,186,145,186,119,116,222,206,
- 52,223,171, 26,107, 80,177, 39, 82,190, 69,175,214,223,  4, 56,135, 37,236,238,149, 51, 74,114,201, 72, 44,201,220, 64,219, 54,
- 97,147,154, 31,241,110,199,233,208,109,190,160,181, 18,220, 47,100,149,131,101,  8,243, 78,248, 32, 53,161, 58,174, 53, 89,157,
-102,126,233,126,221,184,203,240,177,161, 79,113,249, 70,211,109,154, 55,103,158,207, 63, 67,242,185,154, 50, 50,183, 34, 50,168,
- 39,241,237, 33, 71,250, 32,180, 71, 41,171,238, 71, 43, 69, 49,248,168, 44, 47,244, 24,170,225,207,  2,110, 82,  3, 37,152,224,
- 55, 58,250, 58,204,253,185,159,221, 62,255, 94,220,162, 98, 48, 63,242,108,167,125,204, 37, 99,240,214, 55, 77,100,238,231,202,
-124, 33, 51,218, 41,172, 95,110, 23, 57, 54,157, 78, 60,218, 59, 74,246, 34,153,244,166,106,128, 89, 37,  7,177,182, 71,162,193,
- 39, 68,242, 22,255,187, 73,126, 52, 31,127, 25,233,103,244,236, 67, 20,240,225,128,104,253,224,223,  2,176,118, 53, 61, 78,196,
- 48, 52, 31,211,204,116, 74,187,156, 22, 46,192, 34, 14,252,  6,126, 58,191,  3, 33,237,101, 57,176,172, 16,  5,164, 45,171,118,
- 62, 18,219, 36,118, 50, 51,101,185, 32,113,232,181,157,180,169,253,108,191,247, 92, 61,202,108, 18,110,141,168,122, 35, 32, 26,
-209, 98,218, 12,139, 50, 69, 20,146, 38,227,149,100,180, 91,169,120, 51,234,218, 56, 89,186,205,116,120,144,228, 28, 18,129, 32,
-161, 38,118, 95, 74,137, 87,151,  5, 61, 17,221,115, 47, 21,179, 57, 50, 80,134,199, 90, 75,141, 22,195,195, 42, 13,226, 76,  4,
-133,235,170,113,220,210,119, 54, 62,  9, 30,124,215, 84,110,235, 86, 29,132,175,167, 61,167,142,212,225,225,219, 67,103, 20,  6,
- 33,189,243,210, 12,171,244, 12,215,120, 48, 53,178, 76, 81,130,187,154, 73,238,204,101,152, 24, 79,243,164,235,108,173,118,153,
-171, 64,193,  6,140,248, 72, 59, 11,111, 91,186,187,247,159,104,110,103, 51,251, 69,167,209, 40,210,137,130,245, 28, 96,226,113,
-124, 72,230, 74,171, 85,235,210,180,198,115,147,233,221,203,103,239,191,237,239,202,207, 67,255,142,190,241, 63, 69,121, 95,212,
-231,211,117,116,124,215,186,242, 63,143,231,170, 97,  6,168, 15,125,170,235,234,  1,186,228,112,  0,  3, 51,225, 70,165,159, 88,
-115,  3,120,  4,186,216,185,171, 23,187,234,114,227,146, 91,  0,253,234,225,199,125, 15,105,239,122,207, 40, 31,217,215,188, 25,
-135, 45, 46,132,132,114, 43,145, 85,205, 98,171,251,234,242,234,246,251,103, 45, 78, 21,182, 10,224,207,157,228,211,235,195,237,
- 71,154, 22,220,211, 92,126, 75,129, 78,150,227,  7,106,165,254,148,142, 48, 27,153,118,155,167,167,177,243, 97, 88, 22,248,201,
-243,196,136, 38,137, 87,207,242,124, 87,232,251, 17,212,167, 30, 35, 79,246, 89,217,158, 63, 39,171,114, 64,154,233, 25,101, 34,
- 77, 82,148,105,146,173,120,209,149,128, 71,195,130, 64, 18,143, 73, 18,228, 30, 63,145,138, 89,181,212, 48, 42,115,226,215, 77,
-219,135,158, 13,141,149, 76,152,211,  3,138,237,108,238,103,224,118,125, 17, 47,250,254,240, 51, 94,176,166,110, 31,250, 94,242,
-144, 15, 71,  3,214,251,181,209,155,214,134,174,201,222,  3, 83,  4,167, 66,220,114, 37,223,135, 34,147,150, 51, 28, 42,229, 35,
-190, 83, 61, 37,129,249,  0,116,140,239, 25,171, 28, 15,199,  1,  7,196,152,193,253,155,231,175,175,191, 92, 75,116, 70, 81,242,
-112, 47, 29, 10,164,227,249,170,200,182,164,203, 42,130, 29,157,213,168,106, 17,220,  5, 38,194, 76,170,153,128, 54,254, 61,153,
-207,177,175, 72,158, 38, 93,146, 94,134,248, 50,177,164,105,181, 41, 46,172,  8,104,177, 75,153,178,134,209,100, 23,225,162,120,
- 40,117, 70, 60, 26,240,126,185,164, 19,146,157, 91,158,123,212,144, 27, 30,106,225, 71,143,165,223,162,202, 16,143, 10,141, 28,
- 75, 84, 54, 69,210,203, 14, 28,179,114,126,225,125,254, 40, 75, 77,223,198,111,  1,120,187,178, 21, 39,162, 32,218,251,205,196,
-238,100, 70,153,121, 19,212, 39,241, 93,152,255,255,  5, 17, 70, 65, 68,  4,133,152,201,144,142,189,222,165,188, 85,117,171, 23,
-193, 87,243, 20,210,157,164, 55,234,158, 58, 85,231,148,204,215,158,155,177,196,  5,141,  0,172,255,164,202,158, 53,186,165, 41,
-145, 76,250,112,  6,129,113, 80, 77,193, 61,219,228,168, 71,  3, 28,150,229,159, 29,141,204, 59,171,137, 45, 71,120, 54, 69, 35,
- 31,109, 28, 57, 36,240,218,138,207, 35,175,136, 25,254,127, 78,174, 11,232, 25,162,144, 31,247,201, 65,238, 35, 66, 66, 60,146,
-255,181, 34, 65,213,147,255,206,161,125, 28, 81, 31,107,200, 85, 51, 56,131, 46,132,168,100,234, 24,217,137,119,115,233, 60, 70,
-124,209,  2,196, 61, 73,  2, 18,169,119, 53,148,208, 22,193,125,182, 46,140, 22,134,116,139,203, 11, 40, 55,133,183,149,133,  1,
- 62, 24, 55,113, 26,185, 92,115, 29,145, 81,  3,113, 46, 62,227,232,208, 58,217, 52,163,118,160,246, 70, 93,169, 66,229, 73,159,
- 66,181,219,190,201,175,142,186,211,235,251,244,223, 94,201, 44,134,153, 15,  0,132, 23, 98, 46,126,148,247,220,216,163,104,235,
-147,137, 60, 74,220,246,232,106,213,113,109, 39,137,238, 95, 85,175,171,221,151,239,245,195,169,249,124, 28, 62, 30,127,189,127,
-217,221,191,123,161,114,117, 91, 58,221,155,199,139, 25, 70,232,125, 26,143,218,137,168, 84,205,245,198,135,133,189,157, 33,  9,
-222,166,187,234,174,110,209,202,209, 67,220,111,135,175,164, 15,196,134,150,178, 40,159,186,147,244,  6, 67,165,202, 86,119, 84,
-227, 68,144,111,157,147, 18, 39,  4, 91,246,128,186, 82,172,219,101,244,144, 58,145,192, 83,192,197, 14,156,237,243,223,221,121,
-208,122,210, 89,197,161, 28,207, 18,170,152, 53,167, 41, 70,247,148,114,233,148,  1, 22, 13, 13, 66, 75, 94,220,213,227,146,188,
-168,187,115, 44, 43, 76,236,130,178,249,210, 93, 82,170,247, 56, 38,200, 19,153,239,192,154, 88, 30, 30, 68,236,127,200, 18,169,
-103,  4,  9,247, 52,140,  1,161,177, 17, 89,208,167,160, 85, 66, 32,121, 84, 86,248,195,210,214,176, 49,203, 77,121,125, 56,163,
-209,241,185,189,120, 16,141,  3, 73,204,224,195,199,237,238,230,103,125, 66, 23, 40,212,217,250,221,235,184, 47,204,102, 15,251,
-112,151,157,148,235,167,210, 61,200,162,238,100,171,147, 58, 16,106,217,243,198,233, 97, 72,252, 58,221,235,184, 55,208,140, 88,
- 83, 29, 81,135,111,221,195,143, 79,150,202,213,228,  2,230,129, 41,202, 77,173,180,198, 64,152, 91, 40, 45,142, 17,231,111, 49,
-172,195, 43,129,116, 39,200,125, 21,220,225,111,129,105, 12,139,134, 72, 88,184,144,174,  9,249,176,220,139, 59, 21, 76,220, 53,
- 91,  9,185,127, 76,119,136,201,206,136, 44,209, 66,181, 55, 88, 22,115,110,129,231,131,131,147, 77,  8,196,116,114,228, 10,153,
- 82,136,135, 85,177, 52, 73, 22,245,  0, 81, 29, 49,120,143, 23,158, 49, 65, 89, 73,169, 92,194, 12,249, 84, 81,148,181,  7,  4,
-119,174,130,198, 31,  1, 72,187,150, 93, 39, 98, 24,154,215, 60,218, 10,170,123, 97,129,196,243, 19, 16, 44, 88,242,227,252,  4,
-232,238, 17, 98,  9,151,150, 62,102,154, 38, 25, 19,219, 73, 38,  3, 98,129,216,116,211, 86,154,167,125,108, 31,159, 99,106,212,
- 35, 19,126, 79,180, 66, 69,251,  5,141, 94,109,219,  7,  3, 70, 28, 15, 89,215, 20, 89, 46,218,180, 42, 86,219,125,139, 90, 99,
-138, 30, 77, 36,204,  0, 37,103,143,245, 23,222, 97, 15, 92, 74,132, 36,164,202, 81,191, 26,104,192,108,150,140,101, 37,  2,110,
- 84, 41,107,123,179,106,117,103,116, 12,124, 45, 90,214,144,154, 88,188,195, 78, 56,239,166, 78,244,187,203,142,183,224, 98, 82,
-193, 55, 89,134, 37,223, 31,235,131, 32,231,105,134,170,231,212, 76,132,200, 93,169,156,210, 48, 49,235, 34,121,146,124, 88,150,
-190, 77, 66,214,195,106,186, 98, 19, 41, 80, 78, 47, 55,174,  7,121,119,188,158,150,137,148, 25,238, 29,109, 33,155, 88, 80, 35,
-147, 32,214, 34, 38,158,198,217,234,221,217,118,141, 89,119,230,166,239,111, 55,246,249,118,253,244,225, 90,220,143,101,200,249,
-175,184,251,255,145,251,159, 15, 53,135,251, 43,125,118,  4,234,141,152, 21, 33, 44, 29, 42,211,231, 15,180, 81, 52, 82, 98,123,
- 52,137,119, 47, 30, 15,123,169, 39,221, 75,109, 32,124, 19,226,195,215,147, 10,254,253,155,103, 79,182,189, 14,206, 89,255,249,
- 30,187,179,158, 96,207,136,139,145, 99,211,160,181, 20, 84, 52,220,239, 71,156,200, 17,106, 38,148,138, 24,121,186,216,193, 94,
- 25, 83,211, 78, 98,  8,146, 36, 33, 65, 38, 54, 47,224, 96, 96, 67,187,163, 39, 72, 20,150,244, 98, 18, 58,214,248, 71, 67, 70,
-246,180,146, 52, 17, 97,252, 56, 28,251,110,229,124,152,210,146, 54, 80, 91,156, 89,139,188,110,165, 76,131,142, 55,220,254,111,
-176,109, 24, 98,172, 31, 47, 35,131,251, 64,190,160,167,209, 18,173,  0, 50,245, 93, 38, 19,112,194, 56,164,112, 19,144, 63,144,
-215, 84,216, 79, 18,213,242, 89, 18,152, 13, 35, 41,253,188,125,245,250,227,151, 79,140, 51, 88,210,140,221,193,226,133,216, 15,
-123,106, 87, 98,187,134,108,203,240,152,136, 10, 34,209,241,131, 25, 64,164,234, 71,159,176, 59,255,  8,131,194, 29, 97,204, 70,
- 78,  1,249,175, 41,112,210,202,110,110,188,248, 42,187,135,106,212, 95,190, 10, 69, 78,210,136, 65, 28,226,101,187,186,159,222,
- 31,192, 71,  8,127, 65, 54,228,132,211, 69,122, 43,233,132,242, 40, 53,153,161,254, 22,220, 37,164,190,204,108,161,151,240, 41,
-112,235, 83,134,188,143,154, 88,215,117, 23, 69, 46,122, 51,201,150,186,200,198,150,106,169,130,240,149,131, 93,233,201,228, 72,
-176,  4,239, 51,197,165, 18, 98, 15, 69, 38, 39, 31,  6,143,224,240,151, 99, 56,172,213,141,102, 83, 40,194, 75,172,196,  1,243,
- 52, 11,202, 42, 92,217,125,103,235, 33,138, 72, 97,233,139,192,199,138,150,168, 52,149,193, 32,172, 18,107, 83,102,233,202,191,
-170, 72,254, 18,128,182,107,217,109, 27,  6,130, 92, 74, 10, 77, 59, 78, 91, 24,237,161, 64, 62,160,151,254, 63,208,143, 40,252,
-  5, 65,  2, 36, 65,147,131, 83, 36,122,152,226,163,220,  7,101, 41, 70,209, 83,125,178, 13,195,150, 96,114, 57,187, 59, 59, 51,
-213,103,116, 58, 13,255,208,242, 66, 22,191,204,136, 52,250, 98,107,234,188,127,  8,197, 71,154,158,192,100, 26,144,205, 82,123,
-108, 93,249,134, 38,  3,105, 16, 17, 23,174,135,192,  7, 88,145, 67,129,197,152,176,152, 13,198,169, 97, 72, 91,  5,117,  0, 27,
-149, 97,187,185,172,236,166, 54,182, 89,229,159,174,  1,149,203,134,228,107,224, 40, 30,243,109,134,209,117,161, 39,193,231, 64,
-248,166, 16,244,229,216,208,172,201, 78,126,245, 90,205, 20, 77, 64,168,239,124,234, 44,229,  7, 64,195, 52,177, 48,169, 73, 72,
-207, 93,195,137,177,  2, 37, 79,146,244,241,  2,210,215,205,104, 80,152, 34,222,156,157,246, 90,136, 74,168,226,210,163,122, 37,
-166,168, 70,141,237,168,200, 43, 84, 91,164,123, 86, 79,117,123,213, 84,207,135, 28, 89,188,249,151,119,217,255,126,132,153,130,
- 77,152,225,181,170, 68,121, 40,251, 92,151, 75,237,104, 59,241,253, 14,244, 50, 63,191,127,232,238, 30,221,205,107,247, 75,141,
-109,129,252, 63, 30,134,205,250,249,251,183,207,198,152, 47, 91,119,123,112, 43, 64,187, 87, 71,107,162,243,234, 42,189,110,109,
-142,203,198,249,161,162,177, 64, 36,114,165, 50, 15, 10,172,235,144,225,108,149,115, 32,154, 69,103,130,141,186,222, 93,239,239,
-246, 84, 58, 99,212, 30,223,250, 28,217, 99,142,116, 94,192, 97,250,184,254,116,232, 95,242,  2,198,230,187,112,226,  2,185,176,
- 72, 49,103, 12,206,245, 71,170,208, 11, 21,146, 85,227,200, 66,171, 70, 59,120,148,245,133,181, 93, 71, 42, 69, 90,107,243, 23,
-229,224,142,176, 78, 76,239,229,211, 49,166,  9, 80,241,200, 59,123,112,106,214, 83, 97, 25, 61,153,165, 79, 90, 38,245, 57,132,
-177,156,130,172,231,159,183,123, 93,122,237,197,  2,142,252,179,148,150,117, 43, 89,125,204,120,136,106,223,249, 34,194,227,239,
- 39, 34, 26,224,125,230, 32,222, 30,251,196, 14,143,192,131,138,129,120,103, 36, 24, 17,199,252, 95,132, 25, 54, 79, 51,228, 59,
-241,172,195,242,205, 48,  5,125,141,226, 37, 62, 30,131,114, 21, 50, 12, 48,171, 38,176, 23, 56,175,150,218, 12,117,224,130,112,
- 73, 99,137,232, 73,148, 73,168, 27,119,134,220,  9, 74, 67,148,150,249,201,159, 67,130, 90,124, 31,220, 23,116,153,185,114,250,
- 28,194, 47, 66,124, 90, 52, 96,207, 58,180,239,230, 69,185, 68,163,138,  9,182, 46,133,121, 62,177, 50,158,132,214,183, 31, 86,
-187,202,153, 17, 37, 72, 88, 93,135,157, 38,167,163, 28, 10,139, 47,138, 39, 27, 69,152,138,232, 99,203, 36, 67, 82,200,203,102,
-103, 97, 75,171, 11,173,137,222,194,203, 64,  6, 16, 48,141, 31,253,229,241, 71,  0,214,206,101,183,109, 24,136,162,164, 30,180,
- 37, 71,129,209,  6,249,134,108,251,255,251,162,203,246,  3,218, 77,186, 73, 22,173,109,200,122, 81, 36,203, 59, 67, 74,148,211,
-  2,  5,218,172,156, 69,  0,191, 66,206,220,185,115,110,145,108,  4, 72,185,136, 16, 33,195, 82,206,114, 62,136,189,118, 70,201,
- 98, 87,150, 54, 74, 68,124,221,149, 20, 73,209, 67,130, 67,206,  0, 66,231,121, 77,144, 32, 12, 70,204, 40,173, 76, 78,154,251,
-170, 86, 27, 42,120,151,131, 56,227, 21, 70,178,185,230, 88,195, 83,224,176,150, 59,127,212, 35,146, 58,167,164, 52,103,125, 71,
- 61,103, 54,102,222,226, 25,118,186,133,200,  5,179,  2, 52, 47,222,108,222,138,110,146,171,153, 13,122, 45,122, 52,221,154,154,
-205,254,247,  0,142,143,156,250, 69,199,161,166,130, 75,120,231, 54, 18, 55, 13,197,234,114, 84, 86,251, 70,215,223, 67,223,199,
-121,250,  3,172, 83,135,178,215,209, 80,218, 92, 45,167, 10,101, 59, 49, 95,140,172,197, 12,  2,129,144,223, 46,125,  1,121,247,
-255,152,217,255,253,148, 55, 91,194,129, 76, 60, 60,115,114,129,185,132,151,176, 72,159, 39, 33, 62, 62,255,108,123,247, 34,208,
-211,244,188,218, 79, 15, 62,125,189,124,120,122,120,215,168,174, 83,119, 10,153,133,221,132,191,186, 82, 31,112, 30,196,251,195,
- 84,169,199,215,235, 24,129,251, 81,178,  4, 63, 11, 39,226,190,170,253,215,239,236, 11, 70, 23,208,152,254, 27,249,249,249, 11,
-  1,  6,150,222, 25,142, 70, 80, 45, 11,165, 39, 22, 24,229,160, 59,127,172, 53,213,177,215,253, 96,135,186,172, 15,251,230,220,
-157,136,144, 30,208,178,113,148, 38, 57,135, 27,197, 54,138,253,224, 42,160, 13,211, 92, 27,125,223, 28, 47,167, 31,213,225,174,
-239,  7,231,174,228,114,  9, 99,158,  0, 54,164,209,129, 11, 26, 13,211, 60, 88,227, 35,133,157,137,183, 72,253,201,248, 87,127,
- 34,150, 89, 30,165,138,240,146,201,  4,202,105,134,246, 22,255,154,108,188, 24, 74,251, 43,242,157, 54,173,163,244, 21,186,188,
- 28,229,146,132,173,127, 34,  1, 24,194, 21,102, 14,214,103, 36, 31,161,111, 18, 19,222,181, 78,100, 71, 52, 94,118,  3,164, 74,
- 76,199,111,142,126, 60,246, 45, 23,  6,231,  8,242,242, 53,251,  8,112, 44, 22, 25,225,  8,148,  4, 18,112,108,186, 35,166,242,
-178,145,186,106,214, 33,196,137, 53,119,123, 51, 50, 36, 61, 27,209,159,113,156,104,227,220,194, 46,136,129,191, 30, 82,201,180,
- 24,119,191,249, 63,181,183, 27,161,226, 13,117, 50,204,102,243,181,102,181,209, 48, 17, 62, 53,127, 89,190, 78, 47,181,186,183,
-211,168, 93,  8, 58, 94,173,150,193,171,194, 71, 80,190,104,238,164, 63,251,151,169, 69,130,161, 96,  7,109,153, 87, 77,241,216,
-250, 27, 20,236, 10,168,127,165, 47,  8,133,106,177, 45, 99,156, 72,199,189,183, 63,191,  4, 32,238,106, 86,219,  6,130,240,174,
- 37,217, 22,177,155,  6, 66, 66, 79,125,129,210,119,104, 79,125,140, 92,250,186,121,134, 64, 33, 52,144, 56,137,229, 88,218,255,
-238,124,179, 90,109,144, 33,199, 10, 29,180,146, 48, 88,178,103,103,103,190,159,197,124,166,202,214, 97, 21,245, 57, 53,234, 93,
-210,  8,107,104,118, 34, 39,188,248, 29, 52,189, 72,115,176,186,247,166, 33, 45,245,  5,152, 58,210,251,  4, 70,101,236, 26,145,
- 41,168,145,146,138,158, 48,255,134,113,122, 66,182,161,121, 36,128,200,149,146,100, 90,235,117,187,104,183,171,179, 77, 67,150,
- 52,168, 55,145,221,235,146,204,132,  5, 99,104,  3, 57,141,213,189,125,213, 88,  3, 66,244,198,242,172,226,115, 41, 77,134, 28,
-159,229,164,163,192, 41,121,200, 26,238,156,197, 51, 76,141,194,110,146,130,202, 76, 68,230,124,  5,212, 92,  1,151,168, 70,124,
- 17,187,112,145,185,239,206, 13,199, 64, 11, 99,169,156,188,183,238,100,163, 82,143,109, 73,133,196,182,195,219, 37, 89, 96,244,
-243,148,112,123, 65, 82,123,127,131,185,179,131,243,102, 93,168,131,253,247,173, 76,220,108,177,151, 87,253,251, 97,222,110,  7,
-245, 38,205, 61,140,129, 44,126,175, 45,118, 82,199,180,102,219,214, 95, 62,175, 63,173, 23,175,154, 84,125, 24,151,169, 64,242,
-250,243,188,123,238, 30,170, 66, 86,122,194,135,225,255, 29, 35,242,211, 97,199, 46,234,105,  1, 39,211, 53,100,141,153, 41, 67,
-169,211, 96,226,227, 15,117, 67,  6, 82,189, 81,223,190,126,239,205, 49, 30,144,150,122,112,187,238, 49,198,250,196,163,134, 41,
-150, 44,168, 46, 19, 50,181,170, 47,183, 87,172,186,206, 88, 21,109,245,143,159,191,110,110,126,147, 60, 55,180,206, 70,241,122,
-207,206,111, 20, 94,169, 30,159,124, 65, 49, 28, 61,229,200,171,  0, 83, 14, 69, 61, 11,111,175, 11,238, 36,143,113, 57,184,162,
-244, 12,184,131,204,220,142,192,106, 97, 35, 75, 51, 13,131,223, 15,157,113,126, 89, 45,235,166,137, 31,109, 81,238, 70,205,212,
-115, 46, 31,111,189,222, 94,129, 25, 78,231,207, 36,117,133,145, 38, 13,254, 33, 45,188,202, 38,170,127, 31,223, 67,113, 62, 37,
-251,  7,  1,  5, 49,237, 98,132,136,207,129,192,108,  4,141,  6,103, 69,128, 97,232,144,208,161, 55, 49, 73, 64,240,242, 62, 39,
-239,101,117, 60,132, 73,198,177, 40, 68,251, 19,181, 68,249, 81, 51,105,118,191,156,171,164,203,145,167, 90,  4,247, 48,231,191,
-225,249, 87, 51,186, 68, 82, 42, 29, 81,210,116,168,204, 65,217,110, 83,157, 55, 98,213,  0,135, 82,161,165,  8,223, 21,214, 82,
-100, 46,  7,226, 27,209,200, 26,184, 89,154,162,206,145, 93, 43, 40, 53,222,196,220,218, 41, 21,142,131,232,223,194,113, 31, 94,
-180, 80, 43,209, 74,145,197,106, 79,219,145,252, 19,128,186, 43,107,113, 34,  8,194,213,221,115,244,132,136, 32, 46, 44,174,136,
- 15,174,178,255,255,111,232,155,248, 38, 98, 64,214, 69, 86,204, 53, 87,166,187,237,170,234,154,195, 77,126,128, 97, 30,  2,147,
-132, 48, 83,211, 85, 93,245, 29,179,254,140, 18,142,108, 82,211,197, 35, 22,212, 45,116,207,245, 58, 73, 54,227,234,150,199,120,
- 42,113,188, 51, 37, 78,190, 19, 93, 64,209,221,194,152, 12,167,233, 96, 85,142,145, 77,223,113, 28,175, 62,149,195, 84,179,103,
- 34,  3, 68,122, 26, 70, 87,198,218, 44, 30,149, 53, 69,188, 72,241,  9, 90, 23,101,102, 84,139, 52,  1, 53,102,252,248, 97,155,
-233,111,191, 55,168,163, 60, 36, 82,155, 99, 77,  0,234,244, 41,207,219,223,160, 22, 67,151,  5, 73,113,164,141,176,203,  2, 83,
-140,101,176,174,103, 92,161, 52,112,101,243, 68, 80,178, 25,162, 30, 79,221,238, 27,  7, 57,106,166,168, 19,  1,104, 30,207,  1,
-201,221,140, 43,148,205, 60,189,134,244,132,  4, 22,109, 23,239, 61,108,145,185,153, 36,228,127,253,218,  5,120,  6,225, 53,192,
-131,200,218,172, 41,225,197,235,112,168,221,203, 43, 19,171,240,187,235,106,127, 28,154,254, 84,251, 52,185, 69,255, 32, 15, 47,
-194, 73,163,243, 32,140, 93,141, 17,168, 70, 96, 20, 20,241, 23,  7,122,218,240, 10,164, 77,141, 90,208,169, 85,135,111,170,194,
-190,191,185,251,244,245, 99,124,255,101,243,217, 75,226,119, 88,182, 19,159,138,135,177, 19, 70, 98,233, 34,  0, 84,247,146,120,
- 48, 67,179,200,156, 82,221,190,187,125,251,230, 38,102, 14,213,182,140,193,247, 41,169, 16,  6, 48, 41, 33, 38, 50, 33,181,221,
-185,227, 16,202,220,174,202, 88,196,148,219,250, 17, 51,129, 27, 30,182,191,140, 73, 14,131,169, 83, 33,136, 17,226,111, 42,152,
-118, 49, 76,221,196,176,229,113, 99, 22, 82,181,206, 85,250,182,219, 35,241,  4, 60, 18,140, 52,244,200, 96,213,228,179,128,245,
-240,253,246, 62,137,238, 57,183, 27, 26, 29, 44,158,113,157,255,225,224,131,113, 43, 18,206,148,  5,113, 28,177,122,201,220, 66,
- 98,167, 83,127, 32,252,140,245, 77,237, 93, 31,152,199,132, 24, 34, 36,191,197, 69,157,188, 34,240,129,178,121,222,244,199,144,
-110,141,228,206, 52,206,188, 20,227,106,137,230, 62, 67,193,215,151,182,185, 10, 46,149,245,158,132,  0,  1,254,213, 19,159,180,
-129,101, 12, 32,224,197, 73,105,221,204, 23,221, 39,168,121, 53,234, 34,144, 89,233,193,237,122,221, 85,102,237,124,222,162,131,
- 71, 71,191,134, 75,188,230, 14,  8,205,246,  8, 87, 19,151,205, 78,193, 34,199,  5,193,142,199,232,109,252,193,135,254,213,234,
-122,115,252,126,196,254, 37,198,203,  0, 67,  1,250,220, 63, 89,204,145,255, 10,192,220,213,244, 54, 13,  4,209,157,253,176,221,
- 56,193,161,149, 42,209,194, 33, 18,247,170, 23,254,255, 29,238,237,161,145, 56,128,  4, 20,148,202, 10,113,253,177,187,236,204,
-236, 58, 73, 99,169, 87,172, 61, 56,137, 98, 89,142, 51,126,243,230,205, 27, 57, 85, 36, 30,205, 46, 60,205,116,222,113,234, 36,
-163, 51, 43,183,179, 34, 42, 25,123,123,216,180, 32,  3,148, 57,107,208,185,162, 13, 84,142,236,121,198, 45, 33, 90,202, 66,103,
-103, 38, 47, 77, 94,200, 76,  5,224,160,168,103, 37,100,207, 40,149, 41,138,240, 57,240, 87, 53,134,119, 29, 64,186, 99,221,110,
-135, 82,122, 44,169, 21,218, 44,178,236,110,115, 95,247, 53, 97, 34, 75, 35,250, 28,136, 84,  9,247,123,253, 59,241,167,105,145,
-178, 51,226,110, 17, 57, 75,148, 71,122, 44, 78,209,255,138,185,119,  5,204,207,211,107, 26,151, 43, 33, 25, 70, 74,127, 32, 29,
-117,253,147,229,209,121,225,201, 43,123,139,245,170,126, 10,249, 66,138,245, 25,237,228,180,211,166,171,223, 81, 56,107,146,178,
-120,137,115,101, 93,251,154,105,251,255,191,141,119,222,119, 42,234,124, 42,244, 77,105,110,230,102, 53,215,111, 13,153,134,247,
-126,251, 28, 50, 31,121, 94, 21,  1,200,191, 49,146,177,198,216,160,219,225,208, 12,153,134,107,129, 56,162, 72,221,204,204, 46,
- 22, 23, 54, 85,233,152,101,230, 53, 68,116,130, 64, 24,  7, 92, 98,159,157,173,159,183,159,215, 95,176, 54,133,169,152, 82,228,
- 75, 70, 61, 25,192,141, 50, 87,203, 43, 15,163,170,250,  8,185, 71, 28,  9,254, 79,253, 88,149, 75,102, 92,195,145,119,109,243,
-238,253,245,221,253, 90, 43, 67,181, 77,203,121,  3,159,149,143,112,253,160,152, 24, 91, 98,241,142,108,135,118,179,221,252,218,
-254, 28, 28,  3,118,226,112,173,224,129, 68, 46,242, 42,222, 69,234, 58, 74, 47,246,121, 73,156, 25,107,185,104, 57, 68, 67, 14,
-182, 31, 68, 32,101,201, 32,221, 74,119,187,186, 37,207,125,108,252,195,166, 20,150, 76,198,135, 32,237,  5,148, 68, 38,143,238,
-113, 51,172,227, 48,128, 62, 45,155,224,252,232,123,186, 87, 73,134, 72,243, 32,196,143,111,168,162,104, 81,215, 14,200,149,198,
-138, 24,  0, 57, 85,162,229,148,109, 80, 15,126,120, 73, 15,100, 36,172, 25, 61,177,136,152, 12,252,147,225,236,229,187, 48, 13,
-222, 95, 54,163, 76,128,253,232,168,124,125,254, 65,236, 67,167,132, 19,174,245, 52,184, 39,215,  4, 38,217,121, 72,103, 72, 13,
-155,218,254,222,249, 39,  5, 33, 79,154, 87,178, 90,136, 42, 71,219,252, 51,156, 28, 35, 84, 47,186, 78, 52, 78, 14, 26,251, 21,
-192,139, 99,125,119,122,154,135, 19,251,250,247,161, 44,202,213,226,227,165,188,156,161,239, 95,248,  9,186, 86,116,246,181, 32,
-241, 79,  0,234,206,109,183,105, 32,  8,195,123,116, 99, 27, 18, 85, 45, 23, 84,168,125,  0,120,123,110, 16,239,129,122,131, 72,
-165, 30, 36,160, 32, 66, 19, 31,210, 61,176, 51,227, 89,219, 81,196,125,111,146,171, 72,182, 99,143,103,103,255,255,251,129, 47,
-  6, 14,120,173,243,220, 29, 49,143, 40,220, 98,219, 96,250,187, 74, 93, 77,231,113, 16,175,131, 57, 82,145, 82,116, 80,188,138,
- 42, 70,229, 64,142,160, 37,187,198,113,188,168, 23,208,239, 23,150, 60, 26, 48,188,  1,215, 17,225,144, 10, 80, 64,130,194, 50,
- 53, 65, 11, 11, 45,124,101,139,218,218, 62, 45, 51,141, 70, 10, 41, 60, 19,233, 18,148,186,232,195,238,118,183,110,124,131,247,
-171,243, 48, 53,114, 56,221, 11,188,150,205,153, 47, 74,204,160,251,156, 88, 66,242, 97, 60,185,  1, 50, 43, 73,126,196,188, 89,
- 46,238, 67, 10, 31,187,212,196, 68, 14,169, 33,218, 98,251, 61,184,116, 81, 86,232,181, 95, 26,249,215,249,135,153,180,102,240,
-127, 90,254,180,172, 34,207,100,171,220,164, 91, 86,218, 92, 24,253,228,253,227, 49,148,243,203, 42,238,138,105, 57, 10, 77,143,
-157, 11,151, 75,243,225,170,126, 93,153,189,243,181,150,239, 47,207, 34, 56, 53, 69,101,245,207, 63,251,190,117, 77,106, 37,184,
-190,167, 31,190,213,126,181,124, 71,233,231,248, 63, 18,133,151,226, 46, 98,234, 73,155,126, 39, 14, 61,196,244,140,141,189, 27,
-137,202,207, 94,157,167,239,211,250,180,217,111,229, 96,112,202,195, 30,146,159,139, 77,247,228, 67,224,241,129,228, 10, 17,137,
- 51, 10,211, 25,154,203, 96, 52,168, 66,207,172, 81,246,102,253,237,211,231,143,198,154, 14,244,242,192,242,117,152,134, 78, 19,
- 10,  2, 20, 77,140,176, 50,107,105, 80,193,128,243,125,142,125,226,221,255,204,137, 36, 71,215, 56, 90, 36, 70,178,228,253,161,
-193, 94,157,129,130,195,198, 97,196, 48,118, 26,197, 64,150,199,237,175, 59,138,157, 78,135, 95,158,212,173,235, 35,109,211, 18,
-223,  1, 80,173, 39,202, 20,182, 92,250,234, 66,233, 55,230, 10, 44,139,110,178,209,154,139,187,231,142,158, 74,228,243,189,112,
- 95,132, 95, 95,171,205,215,231,205,111,209,108,  3,204, 42, 91, 76, 72,115,204, 11, 33,178, 67,156, 48, 24,163,156, 88,  3,197,
-160,132, 57,200, 39,154,246,239,114, 14, 64,159,241, 13, 15,233,189,114,148, 72,234,255, 44, 13,142,229, 34,120,134, 14,181,253,
- 22,161, 44,211,248,189,163, 78,168, 40,197,  1,185, 68,142,183, 94,204, 71, 18,176, 22,239,186,216,182,144,103,220,123,200, 89,
-109,  9,  1, 79,155,195,104,242,159,213,117, 57,127,241,164,119,230, 99,247,195,168,114, 85,164, 55,196, 34, 85, 84, 92,  7,200,
- 48,110,136, 28, 63,215,127,  2, 80,119,109, 59,109,  3, 65,116,111,118,154,208, 16,120,160, 85, 37,196, 51,255,255, 19,253,134,
-138,138, 39, 20, 17, 72, 64, 65, 77,109,108,239,110,247,204,204,198,155, 80, 36, 94,121,140,148, 68, 78,236,157,157, 61,115, 46,
-238, 13,148, 37,206, 42, 70, 56, 61, 96,159,244,177,125,241,219, 83,187,160,206, 32,144,129,160,175,180,128, 62, 54, 26,180,244,
-232,146, 32, 28,153,218,180, 53, 65,223,  8, 70, 35, 76, 75,208,201,211,183,225,158,155,170,230,129,250, 68,213, 76,103, 78, 47,
- 42,112, 33, 82,149,159,164,245, 83,187, 42,104, 11,121,180,115,  3, 73, 54, 28, 84,236,125, 31,155,135,230, 41, 93, 73, 15,222,
- 21, 19,222,  7,202,206, 38,232, 85,198,210, 18,171, 77, 79,190,240, 18,116, 78,241,224, 35,188,225, 97,174,218,175,169,194, 16,
-248, 64,118,204, 22,145, 70,240,248, 66, 33, 22, 41,135,246,185,111,184,106, 59,208,249, 99,234,223,239,195,113, 22, 76,225, 44,
- 33, 99,150,147,140,213,232, 92,254,108,230,155,123,  0,211,200,180,125, 65, 94,210, 39, 46,238,123,190,188, 43, 78,181, 59,165,
-126,110,186, 95,155,110,102, 17,244,122,253,109,126,118, 90,239,134,110, 49,119,149,117, 87, 23,211,229,186,213, 56,114, 70,198,
-232,177, 62, 13,184,217,150,145, 49,214,  7,141,231, 51, 61,178,127, 67,252, 47,201,147,173,  0, 88,212,188,249,243,104,180, 59,
-115,245,172,254,218,244,187,192,106, 12, 38, 83,107,225,110,164,247,205, 38,211,116,199,255,182,187, 98, 81,200, 19,129, 41,146,
-199,  6,221,246,173,113,150, 60,217,253,151,249,236, 97,189, 74,197,180,123,125,253,126,254,227,118,249,219,211,240,210,135, 12,
- 56,179, 83,138,246,194, 20,203, 30,199,120,240,113,109,164,104, 78, 31,177, 86,194, 71,163, 52,113, 65,179, 24, 27,143, 54,217,
-109,198,116,210,244,152, 83,209, 36,149,230,177,150, 90, 31, 75,251, 25, 23,250, 94, 12, 88, 96,181,206,237,127,254,171, 96,197,
- 58,248,208,182,157, 22,101,168,101,147,239,  8,  6, 35,168,169,112,193,218, 62,153,229,179, 90,159, 15,151,227, 41, 74, 21,204,
-200, 82, 62,141, 90,127,163,194,106,169,182, 43,213,180,169, 19, 69,164,104,250, 45, 67,246, 85, 99, 28,138,119,210,176,119, 91,
- 19,183,238, 24, 70, 96, 61,126, 32,133, 38,195, 49, 58, 91,175, 68,147,151,146,223, 99,227, 69,141,119,239,247,254,161, 48, 73,
-125,251,  6, 10, 92, 17,113, 89,113, 73, 90, 31, 68,244,241, 68, 84,135, 35,202, 78,142, 71, 26,229, 84,  7,238, 70,177,224,224,
-155, 67, 90,206,232,113,171,199,205,195,100,227,  1,116,171,169,145,189,107,110,136, 71, 15,175,238,  1,205,187, 32, 40,161,  8,
-123, 56,234, 11,255,  9, 64,221,181,245, 52,  8, 67, 97, 90, 96,192,166,211, 68, 19, 19,159,124,247,255,255, 29,223,124, 80, 71,
- 22,  7, 78, 24,180,181,231, 86, 10, 91,246,238,235, 50,146,149,193,215,211,115,190, 75,118,214, 69, 34,241, 54,187,116, 90,234,
-253, 41,191,227,120,204,105,182,233, 54,133, 15, 13, 30,169,168,238,128,123, 13,158,189,192,114,  1,243, 11,244,206,240, 80,157,
-146,123,  1, 21, 75,189,223, 15,146,188, 34,190, 34, 71, 85,186,206,217, 28, 76,  6,  1,151, 75, 72,194,204, 42, 52, 56, 56, 89,
- 91,164,217, 77, 94,140,254,188,167,237, 73,251,210,168,133, 80, 99,  8, 17,  1,255,125,191,212,  1, 40,152,142, 75, 47, 53, 17,
- 90,  0, 40, 45,223, 70,182, 82,118,129, 19,201, 29,116,205,169, 96,188, 51,  7,  9,154, 24,126, 42,146, 27, 79,224,174, 35, 95,
- 78,141,246,196,  6,  4,230, 57,226,181,255,197, 72,222, 88,186,241, 43, 65,183, 82,194,230, 11,105, 46, 99,172, 32, 60,  2,107,
- 33,185,119,248,133, 39,165, 63,177,120,255,215,224, 30,191, 54, 43,  1,250, 82,164,188,149,209,207,219,242,245,229,225,208,  3,
-215,182,237,108,145,167,155, 77,241,120, 87,117,189,205,218,225,152, 88,106, 97,221, 87,235,195,240, 75, 71, 46,151,136,  5,191,
-158,153,120,186,137, 73, 49,179, 98, 10,208,143,  8, 15,151,123,188,171,155,186,200, 86,110, 36, 37,169,194, 44, 59, 44, 54,248,
- 77,132,228, 63,217,251,163,229, 96, 33,140,154, 80, 40,178,192,208,202,168, 17,124, 84,138,159,166,201, 87,185, 25,204,126,168,
-119,135, 26,148, 45,214, 67, 28, 12,252,145, 25,137,166,183, 16,200, 35,141,115, 45,177, 64,138,  7, 58,  2,241,168,240,118, 65,
-140,167, 92,228,148, 75,179, 39,131,228, 99, 69,228,  7,104, 14,105,246,210, 81, 98, 74,173, 89,248, 62,249,118, 33, 83,217, 95,
-199, 88, 47,  1,119,196, 18,194,  1,  6,  6, 82, 24,171,199, 17, 82,184,154,125, 82,239,220, 59,224,251, 24,181, 50,212,124,220,
-106,131,159,221, 91,159,124,125,232,227,183,237, 79,208,105, 24,205,109,146,181,176, 26,195,135, 40,203, 60, 70,106, 75, 45, 42,
-219, 96,  6, 96,121,188,121,101,226,228,  2,159,196, 92, 22,107,171,248,255,159,185,  0,206,219, 50, 81, 84,225,149,103,215, 45,
- 52, 80,103,141, 26,181, 24,247,134, 83,133,147,120,168,101,181,145, 68,167,172,  8,148,131,128, 58,230,142, 19, 11, 86,  2,148,
- 98,178,146,198,198, 99,239,102,110,198,156, 92,120,113, 65,127,  2, 48,119, 45,201, 77,  3, 65,116, 62,146,108,227, 56, 78, 88,
-192, 34, 85, 57,  2,247,191, 10, 39,128,  4, 87, 17, 27,108,  9,105,102, 26,189,238,233,201,200, 20, 84,150,120, 47,149, 74,178,
-158,250,243, 62,  5,223,147,130, 97, 38,229,168,155, 79,100,162, 56,226, 55,  6,100, 47,199, 59,127,187,161, 22, 84,197,104, 36,
-153, 90,246,152, 29,212,117, 44,223,214,174,143,243, 32,249, 70,192,150,212, 75, 38,161,211,184, 83,178,126,231,221,150, 99, 93,
-187,166,217, 52,107,216,127, 59,186,184, 33,117,128,132,193,143, 56,113,227,226, 57,192,205, 27,243,212, 20,213,105, 19,181,  5,
-132, 32,148,141,  8, 72,199, 85,160,186,112, 59,152, 88,227, 40,208,236,138,  6, 53,231,104,231,  4, 75,230,  8, 25, 87,109,213,
-157,145,198, 69,183,108,172,  4, 39,103, 95,123, 28,154,191, 72,167,208,199,162, 86,  0, 49,219, 94,185, 53,123,229,138,136,188,
-155, 35,226,120,191,234,180,231,205,254, 34,153, 18, 53,159,103,107,237,252,181,248,130,162,236, 13,181,204,255,253,115, 58, 73,
- 95,105, 62,201, 59, 80,239, 16, 82,184,223,174, 62, 61,190,191,187,191,249,124,248,190,  1,159, 37, 53, 13,117, 93,123,127,211,
-245, 63,167, 25, 37,218, 24,215,214, 62,236,218,113,181,239, 71, 79, 89,234,140,122, 53, 43, 87, 56,180, 61,147, 21,153,115,159,
- 21,196,105,129, 15, 60,117,227,198, 13, 32, 10, 44,  7, 33,114,234,  1,167, 24,235, 71,141,140, 16,241, 36,143,  8,172, 53,246,
-143, 36,102, 82,123, 60, 16,218,121, 70, 46,239,115,  0, 91,236, 87, 24,  3, 12,248,  8,  9, 69,240,230,  0, 43, 38,240, 24, 54,
- 48,128,191, 70,  0, 45,210,128,149,249, 44, 65,151, 78, 93, 51,115,253, 78,106,212,129,191, 50, 91,251,  9, 66, 38,246,219, 39,
- 94, 80, 75,246, 31,125,220,127,120, 58, 30,124,246,170, 22,255,  3,161, 33,130,177, 12,222,187, 13,146,193, 32,146,209, 66,254,
- 21,167, 49,203, 57, 23, 77, 52,126,140,205,229,236, 79, 47,116,136,193,248,146, 97, 20,171, 66, 62,213,136, 63, 95,214,215,111,
-230,229,217,156,143,102,232,109,152, 76,  8, 63,166, 75, 10, 33, 47,152,229, 62,137, 45,137,205,147,175,252,160, 84, 99,175,133,
-110,161,189, 47,136, 43,105, 49, 75,191,222,175,254,131,244, 77, 75,182,143,173, 29, 90,232,175,243,253,186, 70,128,200,193,185,
-105, 26,205,155, 95,198,165, 27,204,213, 65, 84,187,  1, 23,135,250,202,186,157, 90,219,174,186, 53, 66,228,249,238,138,137,111,
- 37,118,149,245, 97, 82,164, 47,114,170, 84,134, 92,183,235,221,124,236,113, 56,213, 87,245, 91,  0,230,174,102, 55,109, 32,  8,
-207,216, 94,131,237, 72, 41, 36,170, 84,169, 15,208,103,168,250,246, 81, 31, 33,135,230,212, 75, 42,161,166,150, 82,129, 13,172,
-189, 27,207, 31,182, 41,228, 92, 78, 62, 96, 64, 88, 59,251,237,204,247,147,205,127,156,112,125,162, 56, 26, 69,245,112,233,101,
-  3, 74,145,168,136,117,172,171,180, 42,161, 98,125,182,248,234, 16,192,234,213, 70, 63, 99,150, 63,228,236,117,154,202,224, 50,
- 74,226, 37, 53,223,135, 82,233,144,162, 83,129,108,  6, 92,154,102,148,238,  6,135,215,190, 14, 11, 50,112,201,217,248,189, 44,
-110,138,170, 92,221,173,158, 30, 31,201, 36,156, 76, 10,131, 76,204, 88,229,220,139, 21,165,185,134,169, 97, 56, 70,115,150,224,
-152,159,  9, 79,198,188, 59,140, 32,164,209, 28,201, 73,180, 54,238,157,167, 28, 31,110, 42,  9, 52, 82,176,159,208,241,152, 70,
-195,127,232,140, 79,232,219,145, 40,139, 60,239, 11,156,129,214,133, 33,247,130,233, 56, 44, 67,166,172,229,148,166, 46,244,233,
- 13, 95,123,230,171, 57,126,231,199,  4, 54,125,104,223, 97,  5,252,247,176, 61,254,179,108, 58, 62,226,  0,253, 33,248,193,101,
-183, 85,254,249,254,102,189,174,126,189, 54,219,198,123,143, 89,135,153,235,139,133,251,180, 94,116,219,163,247, 80, 98, 92,149,
-174,129,252,231, 62, 79, 88,210,162,186,146,128, 39,113,198,  0, 23,190,126,249,246,253,199,  3,152, 18, 58,206, 18,230, 45,  5,
- 40,170,152,  4, 53,153,205,104,121,106,182,  1, 98, 70,168,188,  9,121,248,225,226,122,230,242, 78,220,139,  1,216,164,234,205,
- 16,250, 97,  9, 28, 59,145,101,  6,146,107,114,159, 91, 46,152, 90, 30,130,170,123, 64,246, 38,161,121,171,143, 62, 26,207, 70,
-120,104,195, 91, 51,177, 26,198, 41,118,179,134,134,176, 24, 24,200,160,118,179,101,136,208,250, 67,136,221,136, 60,163,105,166,
-134, 83,182, 40,190,197,143,144,138,131, 23,110, 15,232,112,  1, 43,183,100,222, 59, 81,206,232,158,227, 14,254,190,224,239,163,
-135, 34, 26, 67, 38,204, 57,145, 99,127, 99,  3,248,242, 12,187, 58, 57,236,186,253, 14,134,103, 57,156,168, 67,212,156,171, 56,
- 33, 28,  6, 21,189,155,169, 64, 82, 44,151,109,187,149, 52,186, 32,225,234, 48,109,201, 95,158,166,226,245,242,121,165,218, 78,
- 17,241,165,240,186, 75,183, 40,167, 93,114,255,240,140,156, 27, 39,187,206,251,204,204,120,230,217, 91,184,178,241, 91, 28,247,
-173,217, 90,161, 28,174, 36,181,226,110, 66, 93,115,110,157,104,254,199,141, 79,153, 82,246, 93,100, 21,213,181,134, 25,198,215,
-155,  0,188, 93,201,110,219, 48, 16,229,144, 20, 45,185,182, 83, 56,135,162,189,164,183, 34, 64,190, 36,200,175,  5,  5,250, 79,
-237,189,183, 30,138,  0, 65,210,  5,133, 99, 52, 86, 36, 75,150, 56,172,103, 72, 90, 75,146, 91,208,163, 15, 50,180,206, 12, 31,
-223,162,123,189,141, 70, 94, 25, 32, 26, 95, 61, 67,202,168, 23,124,147, 77, 24, 63,163,188,201, 75,216, 78, 84,182,144, 51,205,
-202,237, 16,140,  2,222,177, 78, 25,246,201,176,206,231, 49,  9,173,217,183, 90, 42, 50,121, 39,216, 67,177,114,121,183,170,239,
- 11,100,186,173,150,251,  9, 46,181,217, 92, 47,142,142,151, 31, 78, 79,207, 47,206, 79,206, 78,174,190, 94,125,186,252,184,250,
-243,139,130,153,  4, 90,194,133,226,203,195,142, 84,146,233, 78,145,193,228, 23,183,210,  5, 58,205,192,215, 55, 90,173,198,237,
-211, 67,154,199, 96,251,116,244,140,194, 33,190, 49,184,176,148,167, 53,205,134,203,247,140,111,112,105,133,113,110,162, 33,235,
-193,205,138,171, 63,176, 51,124,202,209,131,146,245,240, 10,200,186,194,208,119, 64,229,126,255,193, 25,110,156,  9,192,173, 21,
- 15,164,113,253,223, 64,138,123,161,191,146,157,195,104, 71,202,245,123,200,192,148,255,172,197,153,195, 45,218,155,191,155,245,
-174,109,144,194,156,108,219, 22, 21, 76, 83,125, 60,159,148,139,221,155,105, 98, 84,114, 93,232,159, 27,222,118,100,187,245,249,
-228, 53, 33,248,117,249,246,232,221,143,245, 13, 48,131,248,243,183, 47, 36,123,150, 46,248,250,197,175,206,245,153,111,135, 53,
-115,180,240,237, 77,210, 81, 50,121,224,182,116,129,175,189, 44, 24,209,137, 41,209, 79,163,138,104,143,232,109,237,180,114, 17,
-105,103, 76, 70,120, 31,211, 32, 41,138,230, 55,190, 97,171, 16,230,196, 45,196, 99,223, 32, 14, 43, 15,144, 16,165, 59, 24,252,
-125,145,166,184, 32,236, 87, 97,174,199,  8,175,112,134, 12,181,189, 85,126,199,115,136, 72,148,105,108,144,104, 97,240, 73,163,
- 95,211,244,213,195,182, 96,117, 57,171,132,  8,186,215,196, 72, 80,146,174,134, 77,245,161,169,150,119,249,172,170,151, 80, 84,
-239,219,239,113,247, 40,233, 25,209, 52, 67, 21,171,250, 45, 76,190,222, 86,247,162, 46,113, 87,179,201, 57,249,177,  6,130, 40,
-118, 66,215,  8,188, 96, 64,147, 97,191,192,105,209, 35, 95, 46,226,218,110,  4, 47, 64,140,138,243,135, 63,201,116, 31,251,201,
- 12,171,244,  8, 13, 26,189,231, 56,114,255,151,148,100,208,179,105,241,244,171,  1,219,146,206, 54, 51,233,254,236, 27,182, 76,
-127,166, 73,140, 34, 82,195,178,205,131,116, 30, 51, 54, 82, 53, 68,145,131, 94,248, 30,153,  3,192, 83,117,200,117,133,222,142,
-208, 33, 16,131,188,170,186,109,221,163,219,244, 79,  0,222,206,152,183,109, 24,136,194, 34, 69, 82, 86,156, 32, 54,138,  2, 93,
-147, 37,104,182,110,221,251,231, 59, 20,237,223, 72,236,216,112, 91, 91,162,104,137, 87,222,241,200, 80, 77, 80, 20, 29,234, 65,
- 35, 33, 89, 18,121, 58,126,239, 61,206,231, 83, 84,238,230, 14,117,146, 79,229,115,245,177,  6,135,  2, 72,114,225,198,134,119,
- 19,108, 20, 64,161,112,187,146,170, 54,206,123, 35, 52, 26, 24, 72,133,213,189,212,  8,231, 16,167, 98,225,252, 52,236, 55,253,
-118,227,182, 59,187,237,167, 19,102, 12,202,152, 38, 79,245,194, 52,246,182,239,186,227,251,251,251,219,143, 55,111,154,245,169,
-179,135,239,135,193,145,133,244, 24,126,142, 62,127,145,120,227, 66, 44,189,197, 62,109,138, 38, 71, 30, 44, 91,128,189,121,  4,
- 65, 47, 57,142,153, 81, 25, 37,162,113, 71,180,244,136, 29,247, 58, 73,155, 56,  3, 57, 27,245, 17, 55,  9,225, 90,142,231,211,
-102,180, 45,  5,168, 26, 90, 47, 44,238, 69, 32,137,188,195, 62, 42, 55,154,175, 73,186,160,233, 51,199, 24,121,161,165,166,172,
- 29,202,167,166,176, 80,236, 13,251, 86,  9, 13,114, 63,249,167,255,232, 73, 32,210,218, 94,182, 45,103,177,  0,255, 52,191, 87,
-  5, 54,147,199,247,207,108, 40,160, 39,104,141,194,234,227,224,240,195,189,198,244, 57,173,196,114,161, 46, 23,250,170, 22,  3,
- 52,159, 31,228,214, 74,222,210,194,255,181,110,212,197,201, 30, 67,105,252,211,254, 16, 73, 25, 71,247, 24,215,  0,173,154,240,
- 72,196, 29,148,252,180, 67, 66, 36,184,121,151, 13,247, 50,103, 19,129,199,228, 95,200,152,185,103,  2,122,189, 92, 89,231,138,
-240,237, 52, 43,248,204,219, 68,209, 80, 84,242,144,190, 13,143, 17, 74,164,224, 95,198,134,139, 20,136,228, 22,149,151, 35,246,
-132, 77, 27,252,172,157,206,177, 33, 85,162,183,  4,167,139,177, 91, 53, 27, 41,224, 97,181, 92,133,145, 29,198, 35,123, 74, 62,
-168, 50,159, 55, 33, 49,143,167, 99, 48,  1,188, 35, 47,  6,110, 12,133,151,209,168,230,178,189,114,161,106,146,106, 33,234, 15,
-114,125,171,222, 65,101,204,249,220,189,189,123,252,212, 66,146,230,101,161,178, 44,228, 78,120, 49, 95, 43,245,237,139,181,187,
-170,223,251,254,224,135, 30,156,133,209, 17, 31, 73,139,130,231, 25, 99,222, 90,161, 68,136,137,205,  7,161,156,227,210,163,228,
-203,100,209,194, 47, 11,196,115, 83,102, 62, 44,252,185, 72,249,109,102,135, 23,192, 77,100,145,242, 18, 35,210, 22,254, 76, 41,
- 12,213,117,187,114, 24, 55, 56,138, 89,148,219, 43, 35, 71,  2, 53,199,  4, 34,116, 68, 22,188, 34,161, 94, 83, 73,216,252,197,
-235,149,118,144, 69, 25, 69,242,162,213,243,202, 80,191,  4,224,237, 74,118, 26,134,129,168,151, 56, 93, 40, 32, 56,241, 17,252,
- 60, 32, 85,124,  3,127,192,137,  3,162,  7,150, 54, 52,221,210,196, 30, 60, 51,182,147,148, 10,193,133,123,218, 52,174,227, 89,
-222, 50, 89, 47,236,  0,189,115,169,122,196,136,226,128, 93,203,249,239, 34,196,  6, 15, 39,204,157, 49,187,168,154,122,111, 11,
- 58, 61,177,195,174, 53, 54,  6, 87, 77,142, 34, 90,165,136,167,133, 59,163,114,181,197,182,161, 83, 76,155, 36,208,146,116, 79,
-254,138,218,135,244,204, 17,117,210,223,177,129,217,236,249,238,230,246,126, 58,253,248,152,175,215,203,114, 83,146,127, 52,189,
- 21, 62,136, 88,134,218,210,192, 36, 65,174, 15, 16,189, 27, 72, 94,208,161, 85,169,196, 33, 96,178,153,162, 49, 17,146,169,238,
-192,164, 87,  5,161,174,113,242, 80,158,150,220,199,168,106,240,143,167, 22,232,184, 45, 40, 91,151,  6,225,108,174,176,224,220,
- 63, 62, 82,195, 90, 55,130,177, 86,147,  1,218, 97,249,  2,102,100,160, 33,171,192, 17,154,152, 59,237, 19,117,  3,198,154,177,
-133,199,170,121,255,223, 46, 10, 68,190,230, 46,138,176, 76,199, 65,204,246,123, 68,191,  7,  3,184,112,209, 29,151,130,109, 88,
-168,112,174,150, 62, 62,175,213,196, 53, 89, 78,125,185, 90,141,140, 67,207,  6,233, 78,  7,217,195,139,126,154,147,252, 26, 55,
-  6,194,245,180, 13, 93,185, 41,104,240,139,108,241, 49, 25,100,155,128, 70,142,166, 66,121,170, 98, 88,156, 57, 27,162,203, 70,
-128,232, 41, 71, 44,219,  6,101,122, 41, 47,143, 92,242,190,220,197,152,161, 82, 75,  1,201,141, 67,196,249, 29,112,146,157,249,
- 96,131,194,  9,210,168, 65,236,  4, 81,206,106,233,171,108, 28, 63, 20, 71,135,137,128, 67,201, 40,153,161,196, 89,131,107,227,
-199,113, 65, 74,248,148, 14,162, 58,118, 28,195,126, 60,123,144,193,124,181, 72, 37,166, 75,191, 50, 12,198,224, 58, 66, 20,235,
-  2,130,225, 41,123, 15,227, 66,161, 37,252,182,212,122,232,175,186,206,175, 46,178,201,235,166,216,229, 53,212,106,191, 42, 27,
-113,233,183,  2,228, 61,  9,107, 59,239,138,237,110,223,150,149,253,148,126,229,235,202, 17,221, 33,206,106, 99, 98, 18, 25,142,
-200, 35, 84, 21,150,255,164,246, 49,167,241,157,156, 61,158,137,136, 28,132,110, 16,180, 61, 11, 56,146,189,195,239, 79,246,227,
-181,186, 99,159,199, 30,  5,243, 27, 62, 43,196,114, 91, 68,122,221, 33,188, 43, 90,194, 76,104,157,245,156, 19,105,203, 14,117,
-190,181, 21,221,238,175,253,215, 67,236,180, 11, 20,255,196,142, 20,226, 75,  0,222,174,100,167, 97, 24,136,122, 73,210,166, 20,
-196,133, 35,226,255,191,132, 95, 64,  8,  9, 36,  4, 82,  1,161, 86,165,212,141, 99, 27,207, 98,199,  9,  8, 16,  7,122,171,170,
-110, 25,103,214, 55,239, 85, 57,123, 75, 10, 83, 33,209, 19, 75, 30, 71, 56,236, 92, 18, 45, 41, 53,203,160,193, 14,103, 83,195,
-224,209, 19, 84,  8, 48, 97,202,  3, 25,183,144, 86, 26,184, 53,123,210,204, 28, 52, 83,144, 72,  2, 22,146,  8,164,136, 42,197,
- 26,209,243,218,185,  6,240,  1, 42,196,210,173,109,218,235,219,171,195,187,129, 13, 85,  7,234, 29,189,235,172,141, 21, 76,  7,
-130, 48,129,214, 62, 66,169,109, 20, 24, 18,204,216, 35, 95,164,147, 36,116, 70, 73, 58,126,163, 98,146, 85, 18,184, 76, 84,192,
-100, 46, 94, 80,151,195,212,155,195,131,103,104, 91,140,108,207,190, 35,209,131, 58,218, 76,  5, 11, 74,105, 96,177, 19, 13,138,
- 33, 54,205, 84, 23,149,156, 53, 32,116,116, 52, 35,253,103,113,210, 64,242,110,192,  9,200,249, 92,180, 33,220, 63,153,155,253,
-255, 57,247,236, 62,234,244, 35,151,233,169, 78,192,243, 67, 33,250,170, 11, 30,177,223,132,141,252,198, 62, 77, 32,150,  9,169,
-214,147,122,184,245, 94,247,209, 95, 45,145, 82,173,149,125,163, 85, 52,175,233,236,229,195,238,238, 53,212, 53, 83, 92,228, 28,
-133, 82,  1,199,164, 70,163, 67, 14,114, 31,152,183,150,104,201,162,192, 31,116,229, 21,203, 64,200,172,237, 33, 50,136, 32,165,
-237,197,240, 37,172,214, 43,149,239,100, 63, 26,160,181,179,197,198,108, 96, 37, 36,201, 63,208, 98, 11,179,219, 16, 86, 23,229,
-158,179,140,108,136,181,121,168, 82, 57, 77,199, 78, 78,192, 23, 42, 67, 49, 19, 87,110,242,244,146, 88, 45, 99,222,  5,113, 23,
-232, 30, 53, 28, 84,133,171, 83,130,169,160,216,149,208, 52, 25, 95,169,170,198,216,131,202,163,189,  4, 87, 33,216, 37,212,174,
-160,124,227,207,235,227,179,250,244,241,237,165,195,223, 96,118,214,238,214,189,184, 80,110,216, 89,157,116,189, 29,114,  2,201,
-237, 86,185,189,112,  6, 25,108,122,146, 69,161,182, 85,198,254,112,163, 88,142,252, 84,  6,144, 88,100, 97,100,218, 56,134,192,
-227,190, 59, 54,169,146,  1,229, 96,207,144,131,  5,163,110, 10, 57,236,239, 31, 35,207,142, 77,106, 63, 57,189, 24,199,191,220,
- 78, 37,178, 70, 33, 63,129,224,253,244,243,133, 99,138,180,210, 29,231,162, 32,232,186,137,151,235,111,140, 35,197,133,  8,101,
-145,237,127,250,239, 31,  2,144,118, 62,189,  9,195, 48, 20,175,147,  0,101, 69, 59, 76,187,177,227,190,255,215,217,101,211,110,
-108,210,164,178, 13, 74, 75,219, 36,171,237,164, 73, 90,246, 71, 26,226,128,144, 64,136, 10,243,108,191,252,158,138, 95, 15,158,
-111,207,215, 71,  4,104,176,117, 52, 83,143,228,226,145, 10,159, 74,  0,199,138,  7, 38, 95,243, 51, 52,  9,167,244, 25, 43,162,
-160, 17,186, 48,152,168,237,230, 64,114,232,  2, 52,233, 89,252,188,104,219, 69, 47,185, 82,229,254, 77,210,250, 22, 25,116,  6,
- 79, 32,226,112, 70,247,134,234,187, 75,206,246, 97,134,222,215, 25, 74,188,244, 74,193,245,193, 48,  6,155, 57,132, 55,128,203,
- 88,  3, 27,  2, 86, 93, 25,144,236, 62, 22,209,172,139,186, 26, 34,252,213,180,158,222, 96,125,199, 14,186, 50,132,171,183,136,
- 86,202,115, 85,180, 80,145,102, 91,146,222, 92, 43,200,135, 78, 24,129,105,156,  6,  1,  8,179,207,196, 26,236,161,108, 30,118,
-167,103,109,154, 75,110, 72, 21,133,243,253,255,166,252,251, 72, 63, 42,145,254,190,164,178,219,210,182,160,160,162, 60,206, 85,
-154, 31,117, 65, 22,177,198, 76, 42, 60, 69, 20, 46, 56,130,133,181,191, 40,173,238,101,167,142,162,199,234,220,192, 25,244,237,
-240, 69,214,125, 89,101,184,129,199, 29, 40,163,132,146, 10, 40,201,253, 62, 87,186, 74,168, 98, 85,236,117,203, 73,  2,224,225,
- 85, 48,209, 56,238,145, 25,254, 92,  5,140,235,173, 32,219, 83, 97, 40,  0, 18, 63, 69,  8, 69,179,217,235,251,206, 98,147, 73,
-219, 94,195,121,161,134, 57, 98, 44,  3, 50, 50,  0, 67,208, 86,174,253,141,143,201,120,200, 88, 52, 12, 99,116, 48,121,194,242,
-197, 74, 72, 57, 52,198,180, 16, 38,204, 17,233, 18,146,225, 68,102,160,136,101,114, 38,143,179, 11,103, 31,114,123, 65,128,235,
-171, 77,189,175, 52,136,  9,113,207, 53, 22, 25,112, 49,190, 47,182,239, 93, 85,214,159, 56, 56,236, 13, 52,205,137, 74,  2,146,
- 70, 52,255, 44,211, 85, 32,163,108,  7, 45,240,113,192,115, 26, 67,101,239, 58, 10,226,212,208, 35, 52,150,176,  8, 38,173,110,
-169,121,207,184,197,234,221,205,118,181,204,159, 94, 30,249,112,140, 39, 36,135,178,158, 64,135,204,152,103, 17, 34, 56,236,239,
-179,153,233, 63,140,159, 85, 92,184,173, 22,235,115,215,204, 37, 60,119, 16, 52,160,119,164,247, 89,151,  0,190,169,212,209,215,
-101, 39, 11,250, 99,234,108, 49,223,159,176,157,235,244,249,170,217,252,205, 69,253, 37,  0,105,231,182,147, 48, 16,132,225,206,
-178, 20,202, 33, 65,111,188,243,253, 31, 73,111,213, 24, 49,  4, 35,104,169, 61,236,216, 57, 45, 45,173, 49, 70, 30,128,208,102,
-153,221,157,249,255,239,247,231,247,103,177, 38, 40,248, 11, 91, 25,120, 30, 67,  4,185, 48,115,226, 82,156, 61, 10,141,213,  5,
- 73, 53,228, 12, 51, 13,176,150, 61,248,130,145,192,101, 57, 72,130,134,163,120, 39,231, 93, 80, 27, 22,179,208, 28,212,249,129,
-155,226, 19, 25, 27, 19,168,168, 38, 86, 53,153, 71, 80,105, 73,236, 66, 48,181,140, 10, 49,241, 98,155, 53,155,146,153, 86,209,
-242, 25,192,145, 78, 95,112,173,110,114,174,239, 18,179, 64,  7,164, 58,178,156,204, 50, 72, 79,210, 86,233,143, 42, 95,179,220,
-133,  1,211, 16,103,137, 12,215,128, 91,159, 30,235, 47,207, 21,237, 80,  6,151,250, 44, 77,230, 51,191,206,166,155,165, 95,164,
-190, 41,195,118,119,186,127, 56,222, 21,213,110,172,101,230,109,163,117, 29,244,238,255,207,236,181,161,111,166,220, 48, 33, 97,
- 15, 37,120,210,193,100,237,208, 19, 15,142, 44,105,159, 37,215,125,126,248,212,124,234,222, 92,139,195,121,108, 55,254,102, 50,
- 88,151, 96, 59,135, 52,172,218,141,100, 14, 56,229, 11,122,213, 64, 81,135, 50,161, 84,148, 67,  1,126, 14, 55, 27,255,178,163,
-145, 68,195,165,  7,122, 82, 93,229,161,219,203, 54,126,  6,119,187, 37, 67,131,156,117, 65,  4, 95,244, 79,140, 39, 90,236, 29,
-114,116,145,244, 69,114,248,235,165,216,208, 99,200,114, 30, 16,181, 65, 80, 46,185,178,189, 18,229,103,157,145, 42, 96,238, 89,
- 48,231, 11, 67,100, 34, 10,170,179, 80, 45, 11,251,106,121, 93,135,170, 40, 10,199, 81,  8,164,143, 52, 47, 45,131,117,157,208,
-196, 39,252,119,229,120,206,168, 26,151,197, 75,  5,102,149,173, 14,249,251,243,126,107, 67, 57,215,243,131, 42,128,189,189,109,
- 55,237,193, 99,230,230,111,249,107,213,222,143,177,164,134, 81,145,151,139, 84, 31, 92,250, 48, 94,199,130,242, 69,140,167,229,
- 59,193, 49, 15, 77, 69,205, 25, 36,122,  8,187, 27,137,222, 45,  3, 94,148,136,114,189,215,  4,161,229,216, 49, 87,243, 84,158,
-246,143, 90, 81, 20,233,142, 99, 45, 20, 84,  9, 41,106, 22,182, 29,222, 67, 23, 35,156,252, 48,131,197,177,110, 76,211,215, 49,
-199,207,169, 58,185, 97,123, 76,  6,244,128, 89,186, 34,123,132,198, 57, 71,142, 44,152,242,138, 12, 48, 16,165,186, 35, 53, 26,
-134,194, 30, 28, 11,119,191,252,  1,  3,222,120,248,139, 63,230, 91,  0,210,174,100,167, 97, 24,136,218, 78,186, 35, 65, 17,119,
-132,196,255,127, 18, 92, 16,170,  4, 69, 41,197,105,227,216, 30, 60,139, 83,119, 65,  2,209, 67, 15, 61,116,137, 58,206,204,155,
-183, 20,252, 72, 49, 69,  6,115,154, 98, 33,109, 92,192,191, 87,142,138,164,176,  5,186,190, 38, 53,224,233,127,101,  6, 58, 57,
-137, 47,180,224,150, 70, 21, 90,239,161,215,168,128,210,173,188,174, 42,196,241, 13, 43, 53,200,120, 19,173,128,243, 10, 84,214,
- 65, 74, 12,240,208,226, 44, 50, 39, 63,200, 12,203,196, 77,131, 98, 39,137,229, 56,248, 50, 19,144, 87, 73,148, 44, 99,238,124,
-184, 83,168,154,180,239,210,194, 35,196,130, 74,143, 64, 44,103, 80,181, 76,200, 66,182, 20,170,110,250,136,137,107,111, 72,104,
- 26,101,233, 37,227, 89,  7,241,221,249,199,217,164,217,246,107,234,123, 58, 80,141,117,115,  8, 83,  5,187,157,223,173,245,106,
-235, 94, 54,221,107,230, 36,152, 34, 23,233, 28, 49, 28,101, 88,227,159, 93,124,149, 77,111,248,206,113,171,212,117,205, 22,136,
-122, 62,194,245,241, 30,210,156, 97, 22,228,246,230,131,234, 61,236,251,176,117, 48,216,220,237,133,224, 40, 64, 13, 28,221,169,
-143,202,166, 46,248, 21,124,123,136,217, 54,242,138,206,122, 75, 54,136,181,199, 37,196, 24, 51,  3,234, 49,170, 35, 96,211,134,
-229,162, 55,156,213, 61,128,133,121, 66, 56,248, 10, 29,237, 59, 53,133,210,113, 56, 24,241, 17,217, 57, 72,224, 23,230,203,168,
- 83,236,229, 98,151, 84, 74,166,224,135,200,109,140, 14,211, 49, 79,136, 65,146,110,132,123,147,179, 58, 65,252,109,233, 86, 36,
-226,111, 93, 86, 56,148,184, 46, 43,171,135, 61,107,122,222,216,198,176, 97,182, 62,128,165,185, 54, 13,131, 62,186,196,159,128,
-175,188, 40,254,217,201,172,249,106,132, 26,156,253,201,179, 78,139, 12,148, 42,161,108,166,183, 91, 84,179,214,187,143,189,237,
- 67,111,157,117,126,181,244, 51,111, 81,190, 11,115, 46,102,217, 18, 70, 80, 89,106, 66, 86,177, 81,121,251,  9,193,141, 83, 37,
-  6,109,177,252,240, 53,177, 34,  8,146,192,193, 35,251,253,221,195,243,219,211,180,158,180,233,124,100,125, 21, 85,100,197,254,
- 63, 74,182,220,170,112,242, 58, 76, 93,113,160, 10,130, 62,111,222,143,219,137,223,151,201,121,167,162, 47,137,162,160,152, 35,
-112,233, 82,156,134,211,209,184,235, 59,254,206,233,135,164, 70,174,237,183,229,225,142,217,241,145,119,152,167, 64, 38, 20, 54,
-150,229, 41, 95,112,122, 46,172, 94,255,122,178,243,227, 91,  0,210,174,100,167, 97, 24,136,198, 75,  8,165, 11, 66,  2,241,  5,
- 92,248,255,239,224,192,  7, 32,  4,226,214, 10,148,180,205,230,  5,207,120,198,113,170, 74,  8,144,122,232,161,106,149, 38,126,
- 30,207,188, 69,207,174,214,179, 83, 61,255,128,156, 65,115, 46,155, 66,143,109, 26,132,192, 23, 24,212,213,  1, 30, 89, 20,228,
-197, 14,189,244,140,239, 54,181, 76, 36, 84, 25, 96, 61,128, 99,141, 36,232, 80,241,217, 55,206, 98,242, 24, 48,231,227, 36,128,
-156,148, 92, 18,229,193,189,182,222,103,235, 16,104,244,208,228,156,198, 34,248,228,232,168,248,139,229, 17,181,218,  1,221, 33,
- 87,  3, 94, 26,219,158,212,143,247,104,148, 16,182, 15, 25,101,129,  0, 25,177, 85, 21,151,161,  4,106,156, 88, 45,111,198,195,
- 78, 99,222,102,143,127, 77,  0,226, 65, 20,247,112, 59,205,232, 47, 30, 23,171,167,182,142,150, 97, 97, 55,122,217,219,113,223,
- 14, 28,114,164,241,243,130, 59, 48, 42,175, 72, 51, 33, 71,210,149,196, 79,142,255,168,220,147,251, 77,120,127, 43,196,117,233,
-123, 33,199, 66, 84, 74, 44, 74, 89,234,112, 35,101,165,125, 87,200,149, 22, 11,136, 99,118,119, 90, 31, 59,183, 61,152,175, 22,
-198,227, 29, 43,111,139,159,116,228,105, 68, 21,169, 23,138, 77,225, 21,199,248,193,196, 21, 26,187,190,  9,101,186,212, 75,232,
- 45,131,243,102, 89,218, 99, 37,202, 74,116, 93,101,109, 36,165, 75,194,118,155, 98,176, 85, 78, 39,136,203,  0, 28, 10,217,  5,
-154, 86, 14,249,154,250, 60, 30,236, 60,184, 19,242, 98,152, 53,247,152,208, 17,131, 79, 11,137,182,129,  1,161, 73,252,100, 25,
-211, 19,247,198,209, 88,205, 39,238,197,180, 34, 85, 50,196,247, 83,241, 78,251,164, 87, 51,160,225, 60,200,100,170,131,147, 47,
-210,184, 66,154,177,114, 28,  8,196,250,124,114, 77,117,130,216,254, 19,177,  4, 11,127, 57,133, 87, 80,230,  5, 52,112,128,156,
- 99,193,204, 64,194,179, 14, 59,177, 31,141,115,173, 25,142,159, 31,235,182, 54, 53,184,186, 23, 27, 56,232,137,148, 84,132, 87,
-165, 85,209,135,155, 22,206, 98,205,246,225,114,243,188,123, 31,135, 26, 25,163,152, 20, 98,209,222, 44,209, 76,241, 52,252,182,
-125,133,234,216,116, 36,101,197, 46, 82,134,164,152,159,133, 14,239, 19,200, 48,152,241,233,139,185, 51,180,101,159, 20,239,194,
-255,114, 81,156,116, 20,207,215,205, 51,186,165, 56, 97,223, 35,184,211,121,  4,134,203, 99,227,178, 28, 37, 76, 35, 60,123,246,
-246,149,186,234,108,139,206,145,238,100,124,149,163,249,178, 90, 31,250, 38,231,182,253, 77, 19,243, 45,  0,103, 87,178,211, 48,
- 12, 68,189, 80,210,210, 66,165,  8,245, 31,248,255,255,224,  3,144,184,114, 97, 19,  5,154,132,120,108, 60,155,235, 54, 69,  8,
-110,189, 53, 78,236, 25,207,204, 91,206,234, 85,241, 91,131,106, 72, 12, 71,131,132,170,205,111,247,194,105,114,228,162,248,220,
- 88,167,100,236,124,173,151,162,154,139,107,199,154, 31, 20, 81,233,170, 22,133,164, 68, 91,  1,215,140,224,  0, 52,223,246,  0,
- 50, 13,227,209, 10, 85,194,156,231, 69,252,181,136, 95,179, 52,164,207,119,238, 61,107,152, 14,170, 73,166,242, 80,165, 22,141,
-165,139,188, 33, 58,129,160, 37,115, 34,161, 51,104, 73,223,  3,167,183,108,230,144,162,  4, 40,178,211,213, 22,191, 95, 92,183,
-225,109,139,253, 87,119,110,177,253,  8,196,172,204, 73,  3,192, 62,247,195, 77,187,238,195,242,126,220, 81, 89,137, 60,166, 94,
- 49,130, 77,165,211,228,170, 64, 57, 83,101, 62,175, 49,108,166,183,224,255,181,104, 10, 90,145,  7,158, 13,245,100,150,206,109,
- 26, 27,156,107,145, 91,102,182,144,235,106, 19,144,146,146,134,100,219, 57,194,230,208, 35,162,153,173, 22,126,125,  1,120, 99,
- 75, 99,142,199, 86,229,139,253,164,188, 61,250,199,178, 29,125,245,131,245,  9, 64,  7,176, 51,250, 48, 99,180,195,200, 45, 87,
- 67, 38, 68,230, 99, 59,172,175, 98,215,249,203,197,102,247,245, 14,199, 74,250,238, 20,237, 69,166, 68,130, 50,206,223, 51,152,
-244,155,103,153,180,  4,232,  8,242,224, 44,105,141,102,120,211,  6,195,218, 48, 82,127,178,154,140,122,223,104,191,196,136,211,
- 92,241,171,152,  4, 25, 43, 38,108, 54, 85,130, 57, 74, 46,146, 61,153,184, 13,138, 27,113,218,101,213,181, 72,226, 82,174, 39,
-235,113, 56,  6,  2, 36,205, 44,  7,150,211,  7,200, 16,145, 51,227, 52, 71,154,180, 17, 73, 42, 22,  3,250,128,248,183, 24,122,
- 66, 31, 51, 21, 42,245,159,241,  1,175, 39, 54, 71,249, 57, 10, 69, 33,125,214,201,235, 14,163,129, 23, 19,159,114,136,127,188,
-125,189,131,177, 67,173, 16, 44,172, 25,113, 15,236,147, 42, 15, 20,147, 19,114,140, 43,154,145, 21,151, 80, 86,165,210,246, 21,
-199, 41,150,  2,177,166,239,199,164, 46, 22,211,217,230,159, 78,135, 63, 13, 51, 23,250,220, 20, 58,147, 78,247,238,236,190,120,
-170, 18, 64, 65,166,215,207, 89, 96, 32, 61,236, 42,  8,205,143, 79,222,161,  0, 74,142,242,171, 49,228,114, 58,252,155,240,248,
- 45,  0,101,215,182,147, 48, 16, 68,119,182, 69,138,  4,163,  6,131, 47,242,  9,254,255,191,248,194,139, 26, 37, 26,229,106,235,
- 94,236,220,150, 45,162, 34, 73, 19,194,  3, 45,203,118, 58,115,102,206, 57, 29,254, 42,152,253,142,252,161,167, 27, 72, 63,167,
-203, 16, 83,104, 45, 48,  7, 80,209,107,118,170,229,158, 14,178, 46,168,205, 73, 67,  6, 44,185,206, 34, 74,  1,209,118,146, 59,
- 69, 77,111, 71,174, 59,132,216,105, 26, 69, 61, 14, 38,187,217,192,159,202, 65,  4, 13,241,171,223, 43,189, 68, 58, 38,170, 22,
-159,186,118, 88,177,107,  2,  2,130, 76, 41,110, 89, 40, 19,214,158,127, 80, 86,219,102, 27,196,228,129,122, 88,193, 39, 50, 10,
- 26,  8, 14,175,123,203, 39,234,185,226,209,238,175,145,165,164,198,192,135,243,119,139,245,237,120,100,231,230,217, 53,168,140,
-106,194, 50,211, 68,220,208,155, 74, 35, 38,227, 24, 28,238,171,172,  4, 75, 51, 39,246,255, 21, 89,218,103,125,106,153,242,120,
-226,168,236,157,151,208, 39, 44,213,123,255,222,192,107, 27,218,105,161,122,133,233, 91,216, 52,  5,205,161, 23, 23, 67, 92,159,
-209,176,127, 67,182,186, 69,216,218, 58,222,107,181,225, 85,234,210,127,203,121, 82, 99,211,239,132,159,228,121,224,148,  9,201,
-224,126,237,218,103, 94,172,192, 87,193, 44, 29, 70, 80, 98, 18,152,222,192, 77, 46,235,135,249, 27,138,147, 82,178, 24,147,185,
-  5,116,116,101,114,160, 51,118, 25, 44, 60, 32,169, 82,233,251,235, 71,120, 27,143,102,235,238,236,214, 79,  2,181, 71,121,114,
-160, 10,  6,192,116, 60,157,189,204, 64,  0,201,148, 72,170,132, 72, 72,100,123,200,207,163,154, 24,137,120,165,211,145, 28,206,
-147,144, 53, 21, 28, 54,118, 46,129,178,  6, 10,199, 44,  6,137,116,108, 28,194, 50,  2,252,  0, 13,210,196, 68,249,244, 73,182,
-107, 55, 78,194, 77, 98,233,168,101,248, 47, 50,  2,209,170,182, 60, 89,185,245, 39,249,142,212, 36, 30,204, 63,197,111, 87,241,
- 17, 55,168, 95,153, 80,161,119, 79,251,183,177, 14, 32,113, 96, 77,177, 49, 97,110,160, 89, 89, 28,124,104,111, 14,204, 95,137,
-  6,192,237,102, 47,102,231, 42,223, 38,177, 36,166, 22, 89,200,220, 66, 66,220, 57,217,196, 92,151,121,103,119, 45, 11,236, 19,
- 50,147,153,163,154, 35,130, 59,252, 49,144,162,175,171,179,201,124,241,148,161,222,240,251, 40,142, 94, 97,220, 87,140,212,224,
-238,178,175,144,123,188, 56,173,253,230,167, 90, 33, 31,143,225, 93,141,162,249,241,176,207,207,145,145,225, 75,  0,202,174,100,
- 55, 97, 24,136,218, 38, 64,145,104, 65,133,  3, 82,213, 75,213, 99,255,255, 99,122,224,210, 30,168, 18,  9,164, 36, 52, 78,188,
- 52, 51, 99, 59,118,  9, 93, 56, 67, 20, 32, 30,143,223,188, 37,240,103, 40,143,148, 71,141,249, 15,184,127,156,128, 48, 28,100,
-  3,233,132, 15,  1,135, 54, 36,157,249, 97,  4,244,194, 96,147, 72,214,222,228,210, 72,103, 46,139, 13,149,  6, 42,189, 75,181,
- 87,156,199, 41,132,100,246,228, 83, 72, 92,201, 54,158,232,115,137,166,121,124, 51,108,  0,104,253, 56,129,100, 40, 64,149,  0,
-135,207,156,188, 10,230,173, 40, 78,  4, 23,119,132,254,  9,111, 36,204, 83, 60,239,158,246, 31,175,148,107, 60,155,173,186, 73,
-  1,155,129,  1,144,183,195,227, 38, 39,179, 17, 33, 78, 77,187, 47, 63, 95,118,235,195,177,206,207, 77,101,245,138,153,150, 25,
-233,108, 67,220,157, 18, 62,211, 70,118,146, 34, 66,180, 67,207,222,253,147,129,206, 34, 73,  6,209,120,238,  0,  9, 20,155,153,
-200, 50,216, 34,219,206,212, 74,183, 56, 34,171, 72,151,136,153,135,247, 82,109,167,236, 44,245, 82,216, 82,131,173,203,118,189,
-  0,249, 81,103,143,178,153,226,111, 44, 35,133,250,181,177,149, 25, 97,143,185, 47,136,154, 56, 54,199, 39,231,  6, 15,122,125,
-253, 94, 96,207, 87, 54,128,194,207, 57, 91,221,170, 34,107, 27,149, 81,210,180,178,108,179,220,156,170, 19, 77, 23,163, 34, 21,
-246,115,107,198, 78,215,225,153,  4,221,166,137,215, 52,  9, 57, 92,148, 15,247,183,105,198,214,153,211, 64, 89,147, 87,185, 67,
- 60,  6, 74, 70,194,109,196,178, 37,162,245,192,157,236,194, 65, 73, 19,175,160,230, 72,228,199,243,170,240,147, 33,150,144,105,
-188, 85,149,197,104, 12,144,118,244, 23,127,220, 62,188, 21,239,152, 70,208, 47, 29,225,127,109,107, 19,140,200, 49,223, 67,175,
- 46,124, 18,165, 95,173,168,226,193,204, 32,  4,189,117,  3, 31,233,251,119,210,100, 25, 66,157,140,172,117, 14,161, 98, 56, 16,
-  7, 66, 27,140, 57, 50,167,194,  4,  7,168,146,241,162,148,245, 65,183, 74,107,105,192, 16, 89,163,253,190, 66, 22, 17, 35,171,
-122, 30,249, 52, 71,206,230,  1,210,143,  8, 57, 60,197,152, 71,138,187,203,207,160,196,209,168,222,253,146,224,196,147,209,230,
-112, 61,195,  4,191,224, 85,246,197, 61,197,100,236, 24,155, 62,252, 75,196, 30, 28,108,100,190,209,102, 46,239, 12,226,219,146,
-226, 30,191,127, 56,111,242,  4,170,183,246,250,  6,245,151,215,151,  0,148, 93, 77, 79,195, 48, 12,181,147,142,109, 32, 62, 37,
- 38, 33, 78, 92,198,145, 35,255,159,191,129,196, 17,161,137,  9,237,131,118, 75,210,154, 36,118,210,140, 49,  4,189, 79,237,154,
-218,137,159,253,222, 99,254, 42, 19,154, 17,123,117, 62, 60,252,202, 14,221,177, 60,  4,225,119,101, 32, 94,178,116, 10,235,164,
-231,218,253,180,129,177,183, 89,203,128, 15, 43,136, 37,198,202, 46,144,154,112,202, 60, 78,156,149,178,129, 71, 13, 72,164,  5,
-132, 26,136, 42,202,225,196,  6, 86,164,170,106, 97,168, 42,177,135, 66, 41, 36,243,234,168, 36, 68,230, 67,192, 26,227,139, 90,
- 29, 21, 36, 93, 91, 15, 32,184, 96, 71,229, 72,108,136,101, 49, 99,244,  2,205,141, 59,169,212,253,245, 89, 24,248,115, 97, 24,
-212,223, 96, 20,234,  3, 25, 60,135,  2,132,201,122, 36,153,249,137, 69, 91, 53, 15, 81,225,  1,111,129,253,107,144,222,249, 37,
-192,  4,212,213,160, 58, 27,235,145,166,181,131,218,118,111,166,125, 33,120,143,237,129,161, 52,  3, 84,  3,180,  0,152,181,176,
-178, 84,217,208,195,190, 61,173, 38, 23,199, 90,235,247,133,125,251,220,186,162,183,211,254,115,155,129, 68,167, 26, 37, 92,158,
- 39, 47,143, 66,229, 68, 71,138,137,196,  9,155,246, 53,196, 88,125,172, 42,118, 85,233, 98, 95,196,  6,238, 31,246,192, 38,100,
-195,140,172,250,223,215,195, 28, 40,148,  5,225, 74,156,  6, 69,148, 32, 53,108,251,189,  1,233, 27, 70,143, 25, 47,241,143, 96,
-172, 67,164, 50, 93, 21, 65, 34,240,159,226,224, 73, 14, 50,226,226, 43,242, 24,197,113,  4,164,  3, 20,233,169, 26, 11,179,236,
-164,249,158,124,129,123,181,248,240,104, 91,103,167,183,211,249,114, 30,244,243,178,207,148, 80,171,178,245,199, 78,206,202, 57,
-213,255,205,243,227,139, 46,232,  2, 56, 16,170, 56,135, 22, 13, 66, 35, 70, 45, 55,171, 64, 82,242,223,184,173,135, 55, 15,246,
-238, 17,214, 13,109,116,176, 21,218,  4, 44,222,159,229,125,237,169,106, 48, 75,112,139,186,155,189,182,207, 79,214, 54, 93, 83,
- 59,215,128,241,191, 54, 44, 27,201, 35,240,152, 52, 31, 10,148, 60, 97,185, 72, 59,174,135, 88,156,193,177, 24,163,254,249,212,
- 92,146, 88,255, 64,251,148,182,171, 18,185,111,204,107,129,189,164,197, 94,234,248,  3,143, 79,170, 37,218, 77,238,165,232,193,
- 33,115, 18, 93,168,134,133,104,213,213,184, 26,219,206,112,166, 26,234, 81, 75,142,126, 47, 52,254,115,125,  9, 64,217,153,236,
- 52, 12,  3, 97,216,158,164, 75, 90, 16,251, 34, 33, 16, 39, 36,182,  3, 18,226,253,159,128,135, 64,244, 64,217, 10,148,144,197,
-206, 96,143,215,  4,138, 74, 15, 61, 68, 85, 85, 53,246,239,120,252,207,247, 91,125,247, 22,225,134, 45, 90, 49,186,210,207, 23,
- 31, 74,252,166,242,145,149,142,199, 53,252,184,188,229,  1,120,100, 52, 51,115,177, 49,130, 15,254,244,168, 53, 30,204,157,130,
-214,124,128,224,  7, 51,166,120, 63,139,192,101,119,160, 41,190, 43,129, 79, 77, 14, 61, 79,110, 78,174, 39,207, 19,160,208,134,
-198,150,248,173,107, 84, 93,172, 69,101,168,100,200,169,109, 23, 37,200,188,166,237,101,138, 68, 98, 38,112, 24,161,254, 64,189,
-207,190,234, 82,202,211,157,181,195,141,113,150, 38,234,150,169, 73,217, 67,194,170,145,214,147,211,156, 39,238,184,181, 31,193,
- 61, 58, 29, 37,240,159,135,119,112,167,154, 35,198,182,148,196, 39, 73,111,  0,195, 20,222,106, 53,  7,229,189,144, 15,132, 85,
- 56,207,  6,151,155,131,227,245,236,104,181,127,182, 49,188, 88,205,174,198,217,150,132,169,168, 39, 66, 61,187,201, 17,192,241,
-254,104,115, 37,251,154, 21, 79,111,213,148, 54, 31, 16,145,249,150,119, 41,248, 97, 42,162, 50,142,182,219,115,109,221,209,101,
- 49,221, 58,161, 83,190,164, 14,234, 98,107,227,244,241, 61,181, 57, 27, 12,116,125,216, 25,120,177, 21,153,233,156,187,104,129,
-233, 58,159,183,173, 29,248, 83,223,165,113,232,132,176, 77,196,214,252,100,109,250, 32,178,120,204, 53,172, 11,174,178, 91, 73,
-  8,226, 17,100, 34,112, 46,130,184, 27,208,151,158,113,196,197,166,132, 61,238,152, 24, 33, 53, 50,198,220,234,139,149,172,212,
- 31,240,242,249,194, 44, 40,213,246,128,217,190, 89,134, 46, 48,202, 60, 31, 53,166,244,196,125,  1,  1,213, 78,191, 16,212,158,
- 66, 30, 27, 91,249, 39, 27, 61,238,245,183, 63,170, 60,151, 69, 41,107, 41,138,108,247,178, 60, 56,229,249, 92, 51,159,212,127,
-175, 22,255, 82, 31,178,243,156,179, 28,139,247,215,102, 62,227,211, 59,121,119, 43,170,188,169,231, 88, 22, 58,140, 89, 19, 86,
-  4,242, 40,248, 54,238, 60, 10,112, 72, 83,109, 15,  3, 22,221, 30,159,117,  8,238,173,135,119, 95, 21, 96,177,231,253,111, 42,
-  1,183,196, 65,240,172, 17,174, 25, 42,137, 91,159,187, 18,191,156,178,  7,124,  2, 46,104, 46, 93, 40,136,109, 27,149,127,  9,
- 10,180, 48, 31, 22, 40,226,160,143, 97,111, 68,139,120, 19,127,237,120,176,162,198,195,146,191,251, 91,  0,202,206,103,181,109,
- 32,  8,227,187,179,146, 45, 69,142,131, 75,  3, 14, 61, 22, 31,122,239, 11, 20,250,254,135, 66, 31,160,180, 77, 28,136, 77,155,
-198,146,119,165,157,169,246,175, 86, 82, 19, 82,227,131, 49, 24, 86, 94,239, 88, 51,243,205,239, 19,214, 26,219,185, 56, 14,183,
-138,255, 92,112,  8,253,192, 95, 60,203,124,222,128, 78,154,207, 16, 44,117, 25, 79,232,248,144,142, 30,187,210,104,212,135,225,
-168,209,203, 35, 19, 18, 18,119, 14,107,219,225, 78, 26,196,  6,124,156,114,  2,  7,121,119,138, 44,239,218,196,172, 16,158,  9,
-127, 56, 73,223, 30,238, 76,163, 86,  8,141,  8, 65, 17,233,106,247,233,222, 44,179, 92,235,254,239,161,203,241, 17, 45,111, 64,
- 18, 74, 91, 77,106, 25,151,150,235,148, 25,125,  1,237,165,250,126, 60,181, 29,110, 87,229,187,171,213,118, 85, 92, 45, 22, 21,
-100, 43,130,140,160, 48,133,124,158, 71,219, 85,123, 87,219, 37, 94, 31, 81,113,168,103,228,188,231,110,147, 89,146,  7,188, 53,
-241, 93,108,138,188, 90,230, 79, 45,237, 27,245,128,120,199,216,199, 98,249,233,253, 70, 84, 92,103,253,106,177,214, 84, 91, 77,
-146,200, 97,119,189,254,252,102,243,229,240,251, 39,177,203,142,118,219,245,205,166,220,223,159,190, 29,207,143, 54, 95,199,153,
- 68,242,127, 14,134,215,  2,137,144,193, 24,109,143, 53, 51, 93,  8,232,159,203,220,120, 57,246, 25, 79,145,139,227, 73,152, 82,
-153,143,  4, 78, 26, 50, 46,192,167,254,215, 46,156, 88,164, 73,192,159,242,164,190,146,198,119,154, 12, 73, 57,207, 85,228,124,
-106,139, 54,187, 76,156,166,236, 78,221, 62,  8,138,210,112,207,189, 85,187,215, 62,198,224,206,201,199,114,128, 32,235, 98,177,
-253, 31,108,153,134,154, 39, 70, 80,141,117, 76,240,126,100,253,245, 20,139, 82,219, 64,144,152,255,185, 23,122, 92, 67, 48,111,
- 95,150,235,218, 80,145, 45, 68,158,249,193, 80,230,201,149,188, 65,117,145,149,253,119,166, 58,101,176, 89, 40,171,235, 15,237,
-205,142, 53, 79,172,213,164,206,198,122,168,105, 80,158, 65, 74, 89,255,234,234,  3,171,255,232,135, 31,250,254, 43,170,254,211,
-103, 84, 70,255, 78, 90, 89, 88,102, 23, 23,197,130, 17, 46,122, 48,  3, 13, 45, 85, 22,183,148, 66,178, 20,230,191, 96,  4,179,
-165, 49,151,244,133,226,140,158, 38,184,224,237,  2,  2,117,138, 59,156, 32,  4,184, 69,152,121, 79,149,238,248,124,221, 61,128,
-113,112,172,173,156,208,140,135,159, 87, 37, 46, 90,106,231, 71,117,114,122, 40,100,155, 52, 99,200,152, 77, 23,102,130,127,146,
-175,100,144,117,142,143,253,138,199, 95,  1, 56,187,154,221,182, 97, 24, 44, 74,142, 98,180,193,134,  2,197, 78,219, 83, 12, 24,
-176,199,232,179,246, 65, 58, 96,247,222, 10, 12, 40,154, 37, 93,147,198,150, 69,150,164, 36, 71,118,186,162,104,144,131, 79,134,
-109, 17, 20, 73,125, 63, 77,253,120, 53,105,208,190,170,143,172,170, 52,152,103,141,167,137,158, 74,243, 90,142,169,178,103, 70,
- 34,231,165,101, 44,170,249,170,115, 39,202,169,162,216, 97, 84, 97, 18, 21,168,146,  5,133,139,220,154, 73,220, 64, 55,222, 24,
-147, 20,248, 64,133, 72, 69, 88, 76,148, 39, 88,139,124,252,149,132,187,203,133,205,217, 64,237,111,116, 70, 40,176,226,  6,146,
- 14,141,203,228, 11, 13,  3,103,155,117,183,246,226, 32,184,146,154, 71, 60,112, 82,198, 64,  4, 15, 50, 75,144,119, 88,170,162,
-205, 94, 66, 91,152,242, 54,  9,105,105,186,255, 71,241,215,102,123,179,217,122, 99, 47,151,203,139, 70, 48,232,173,151, 45,245,
-121, 64,136,161, 83,200, 16, 77,225,234,105, 98,163, 36,112, 19,166,192, 88, 91, 54,  0,156,  6,125,157,250, 99, 65,173,180,156,
- 55, 23,174, 35, 90,119,113, 75,200,149,251,119,239,175,126,126,251,253,240, 55,  6, 35, 78,153, 34, 93, 41,239,207, 27,218,227,
-129,219,235,253,234,211,234,135, 63,191,238,119,161,195,214,185,231,206,254,121, 12,187, 10,234,245, 97,227,145,166,122,181,182,
-180,220,252,247,234, 33,192,171,114,  8,226, 61,252,217,155, 51,207, 23, 92,199, 52, 89, 17,169, 50,188,166,209,240, 13,138,109,
- 83,233,234, 72,193, 88, 73,154, 72, 71,236,169,230,201,162,128,211,167,207, 44, 36, 78,238,103,237,121, 24,130,120,215,208, 76,
-172, 10,102, 85,216, 52,186,170,111, 63, 66,100,202, 22,  2,199,206,225,104,  9,116,180,123,172,134,  0, 71, 58, 60,166,179,100,
- 61,216,133,140, 24,182, 74,229,133, 26, 35,237,242,176, 70,225,144,137, 55, 59, 73,238,177, 70,219,143,188, 51,183,160, 36, 28,
- 79,  5,168, 32,245,156, 37,212,211,110,176,183,187,187,175,254,203,210,249,206,245,  3, 56,174,202,105,179, 70,236,193, 31,184,
- 20, 49, 11,111, 29,  7, 46,  4, 75,189,  0, 41,159,144,195,118,123,207,105,125,224,174, 34,  4, 33, 30,114,224,199,212, 72, 24,
- 26,185, 74,134, 98, 85,143,205,102,  1, 66, 74,204, 31,218,166, 83,185, 52,  1,131,  2,235,196,255,160,  6,224,181, 82,135, 42,
-218, 11,204,161, 50,185,125,194,136,126,209, 14, 40,157, 16, 20,169,253,113, 65, 11, 58, 96,228, 43,157,150, 83,  8,115, 56, 13,
-213,179,157,250,145,249,142, 79,113, 47,  5,141,181,  3,162,125,107,219,120,171, 23,233, 67,127, 90, 71, 31,  4,155,247,222,223,
-139,  0,180, 93, 75, 78,  2, 65, 16,237,238,249,  0, 26, 48,134, 27,152,152,184,240, 12,238,117,229, 33,188,165,137,137, 43,143,
-224,194, 11,160,160, 32,195,175,153,233,110,187,170,250, 55, 12,113, 99, 92,178,  1, 38,208, 85,175, 94,191,122, 47,111,239, 31,
-198, 22,162,143,205,254, 38, 94,159, 50, 50,166,233,182,  0,225,234,190,241,183,181, 78, 42,233,126,111, 82, 79, 58, 47,  0,207,
-152,210, 16,162,120, 82,229, 41, 20,155,211,134, 20, 10, 10, 88,230, 15,132,161, 38,224,136, 84, 18, 69, 56,132,  7,127,100,161,
-125, 45,128,247,202,130,152, 33,113, 95, 18,148, 78,137, 11,199,232, 45, 36, 50,231, 29,  8, 90,104,228,124,245,203,251,235,188,
-222, 94,142,216,245,249,197, 90, 14,137, 37,175, 27,137, 22, 11, 57, 36,250,160,231,253,158,105, 59,197, 74,128,237,134,240,248,
- 55,234,178, 75, 76,234,176,149, 99, 13, 15,171,166,178,182,128, 89,146, 94,222,107,225,201,149, 37,221,113, 48,201,203,116,135,
-136,119,120,131, 84, 19, 30,192, 11, 85,246, 51,184, 86,229, 61,145, 13,138,188,218, 53,187,  6, 28,224,236,199, 61,220, 92, 77,
-120,133, 30,104, 64, 84,  8, 28,161,106, 16,189,105,123,128, 55,210,188,205,150,243,  6, 64,199,184, 44,202,188,183, 88, 55,213,
- 78,135, 93,255,191,120, 23,107,127,252,104, 76, 25,146,111,  1,249,165,122, 79,187, 28, 90,169, 56, 41, 66,242, 38,  6,184,184,
- 42, 38,188,254,143, 37,  6, 50,222, 96,144,123,184,232,  9, 27,199, 95,112,157, 52,  0, 84, 66, 57,135, 16,146,135,243,149, 92,
-185, 53,156,196,233, 48, 61,110,162, 35,123,228, 44, 86, 45,222,189,117,243,160, 39,114, 43, 65, 14,  0, 42, 25,113, 24,159, 76,
-245,216,249, 23,208,162,159,119, 75,231,174,202,187,  4, 16, 58,  3, 88,216, 55,245,202,181,180,200,  4, 43,191,229,212, 30,255,
-141,153, 45, 63, 98,138, 91, 12,181,134,197, 36,163,234, 44,231, 59,214, 76,213, 98, 92,158, 74,251, 71,182,  5, 93, 73, 83,125,
- 89,240, 97,202,141,206, 75,244,136,234, 83,140,154,210,123, 86, 35, 27, 83,125, 42, 11,216,247, 53,216,255, 40, 72,  8, 71,221,
- 38,169,120, 76,216,195,234,114,229,233,253,120, 26,120,148,  9,174,194,238, 23,106,134, 68,170,225,248, 85,171,232, 39, 29,125,
-164,145, 80, 46,  6,126,151,126,127,116,123,119,255,252,244, 56, 95, 76,136,140, 71,224,119,128,190,117,248,221, 33,168,205, 52,
-  7,101,153,183,237,136, 76, 11, 57, 68,240, 94,102,  5,131,  4, 71,186,200, 70, 66,178, 24,108,237, 20,197,248,209,199,248,191,
- 48,159, 31,  1, 88,187,154,158,132,129, 32,186, 31, 96,193,  0,234,193,196,191,224,111,240, 98, 60,248,255,175,198,187, 38, 96,
- 64,160,133, 66,187, 51,238,206,236,108,151,143, 72, 76, 36, 27, 66,202,161,165, 41,179, 51,111,222,188,103,206,157,  3, 79,150,
-244,182, 78, 18,198,195,197,209,220,145,197, 82, 55,252,149,164,232,121,103,119, 89,103, 76,228,183, 29,166,166,153,203,186, 70,
-193,199, 67,154,103,114, 80, 37,173,123,  4,232,138, 65, 76, 64, 93,244,  1,161, 22,126, 76,  0, 49,218,207,179, 21,  3,191,  3,
- 70,185,110,226,153,  5, 83,  6, 94, 64, 87,179,105, 54,139,160, 74,168,222, 87,170, 63,152,186,128, 68, 50,233,147,246, 48,180,
-156,111,248, 45,174, 71, 76,155,  1,113,250, 84, 55,212,131, 59,138,236, 58,196, 50,125, 67, 62, 57, 78, 10, 76, 36,245,224, 49,
- 25, 54,177,  2, 87, 34, 68,178,105,253,254, 87, 56,207,100,121, 10,156,128,197, 38, 14,172,218,241, 85, 32,247,239, 29, 33,168,
- 74, 61, 13,175,239,238,251, 31,139,106,179,  3,206, 19,235,  6,119,196,155,240,165,181, 79,198,160,117,179,245,246,205, 23,236,
- 74, 61, 62, 76, 70,195, 98,185,170,155,186,105,255,227, 17,196, 44, 93,189,202,166,189, 90,178,234,245,183,205,177,116, 39,  6,
- 21, 19,112, 86,119,141, 26, 45,234,219,192,158, 75, 52,209, 28,  9, 31,254,115, 75,194,233, 16,231,223, 84,148, 93,231,135, 72,
- 96,191,136, 80, 67,130,116, 82,170,206,234,187,242,188,  5,231, 69, 76, 11, 29,101,165, 73,102,242,104, 22, 41,195,100,165, 59,
-103,108,174,180, 44,136,186,128, 75,166,163,179,131, 76,148, 82,113, 42, 58,137,173,235,120,159,236,223, 23,181,235, 19,253, 49,
-236, 74, 78,247,109, 49, 25,222,242, 81,217,245,180,142,123, 20,230, 94,122, 65,146,213,240,223, 15,200,205,132,188,  3,  3,227,
- 55,148,111,141,  2, 82, 54,110,190,221,246,179, 45,173,233,107,219,  3, 87, 67, 57, 87,213,194, 84, 43, 91, 46, 77,185,106,171,
- 89,189,157, 54,213, 28,203, 57,172,191,252,183,184,157,  7,183, 85, 22,235,246,217, 17,147, 35,147,182, 88,188,  3,128,135,158,
- 26, 38,246,198,180,104, 37, 24,  1,164,105,  6,  0,141, 78,206,121,250, 36, 60,101, 73,231, 81,194, 75,191,253, 50,112,104,173,
-125,126,121, 29,141,199,199, 58,117, 93,230,158,115, 55, 12,205, 48,234,163, 56,120, 54,184, 99,  7, 35,203,185, 76,193,219,126,
- 27,167,116,212,176, 24, 37,130,141,175,135, 80, 93,134,254,207,132,224,191,191,126,  4,160,237, 90,114, 26,134,129,104,198,113,
-170,148,150,130,144, 88,177, 64,226, 18, 44, 56, 19,  7, 64,226,176,192, 54,162, 63,154,230,227,218,131, 61, 99, 59, 78,105, 37,
- 36, 68,151, 85, 85,165,141, 51,126, 51,126, 31,121,114, 27,129,211,155, 38,252,166, 73, 23,225,103, 80, 62, 65,148, 54, 64,202,
-175,207, 60, 74,129, 16,192,228,227, 40,227, 76, 11,194, 77,119,243, 39,160,248,225,232,  6, 65, 45, 48,137,250,  2,193, 32,156,
-146,129,111,239,194,165, 50, 61,135, 20,128,210,179,242, 93, 69, 96,254,179, 91,145,188,103,107,111,219,199,222,130, 12,159,166,
-114,250, 52,191,221,214,213,  7,102,179, 12,106,233,242,135,229, 64,137,179,171, 49,183,235, 90,138,172, 81, 38,167, 73, 83, 48,
-  5, 67, 62, 35,157,  4,143, 70, 17,254, 52,242,126,129, 89,158, 47, 74,105, 75,106,213,171, 70, 15, 54, 94,234,204,102, 14,199,
-171,121, 96,151, 67, 82,208, 35,179,133,237,195, 90, 74, 64,164,146,103,155,103,119,199,238,111, 46,222, 62,183, 93,167,156,114,
-140, 69, 92, 20,246,  0, 46,114,  8,237, 71,119, 10,223, 27, 85,101,217,163,144, 15,119,215, 22,122,172,150,173,235,194,147,212,
- 14,243,135,250, 14, 73,176,184,167,132,146,192,109, 65,103,142,179,  2, 72,254,239,250, 34,165,115, 49,246, 12, 96,229, 61,115,
-225, 77,  8,221, 66, 76, 41, 85, 30,140,113, 16, 92,170,223, 96,155,162,171,242,178,238,234,144,204, 16,153,214,225,187,217,167,
-118,116,222, 15,  3, 51,135, 38,244, 62,182,213,143, 13, 13,131,106,244, 19,185,180,232,192, 56, 18, 44,234,111, 41, 63,  7,  7,
-129,181, 97, 78, 45, 61,  5,192,109,136, 56,144,166, 84, 32,219, 25,198, 89,166, 27, 71,121,238,135,237, 30, 59,213,245, 22,101,
-123, 61, 45, 99, 23, 31,114,165,131, 51,207,104,168,  0,  3, 93, 31,  7,141,151,  5,229,206, 82,128,198,  8,121, 45,117,175,117,
-153, 79, 10, 40,116, 87,211, 94,160, 15, 34,235,165, 65, 41, 15, 28, 71,101,145,187, 33,147,247,253,214, 56, 91,224, 30,221,200,
-158,  5,  5, 22,151,105,131,105, 50, 81, 58,109,254,145,174, 74, 46, 65,188,197,114,110,142,112, 25,112, 34, 66,120,206, 36,135,
-179,132, 64,147,148,163,136,220,237, 85,178, 70, 32,161,197,  4,155,229,118,255,245,250,242,188,217,172, 89, 49, 51, 62,210, 57,
-190, 66, 11, 37, 90,173,225,124,251,128,199,111,141,158,218,134, 26,172,244,181,220, 85,113,227,159, 23,243,181, 94, 37,199,232,
-248,127, 16,254, 91,  0,210,206,166, 41, 97, 24,  8,195,187,105,164, 69, 20,245,230,232,140,122,242,175,248,255,143, 30,213,131,
-  7, 29,133,161, 64, 63,146,172,201,110, 66, 91, 42,142,163,192,133,143, 67, 25,218,101, 63,222,125, 31,253,109, 64, 63, 64,201,
-250,213, 49,184, 68,194,253, 85,148,151, 19,182,175,169, 79,230, 81,206,199,245,136,103,176, 82,193, 71, 50,  2,243,226,105, 52,
-129, 65,134,204, 35,238,171,196, 36, 28, 90, 94,176, 10,173, 48,246, 15,179, 93,173,138, 28,231,217,158,138,196,173,131,243,122,
-192,211,179,155,243,139,219,235,122,243,182,242, 63,118,161,209,118, 73,156,179, 13,111, 41,241,193,171,138,201, 56, 98,177, 43,
-208,237, 15, 22, 32,  2, 11, 69, 32, 98,181,105, 14,234,106,150,171,137,122, 47,155,167,182,221, 14,253, 87,241,176,166, 74,165,
-143,225,104,232,212, 79,231, 39,233,173,130, 27, 32,167, 58, 43, 50, 61,195,152,174, 44,170,250,241,229,115, 93, 53,219,154,182,
- 97, 95, 17,142,132,218,108, 72, 19,110,106,251,218,218, 39,128, 59,128,135,251,203,233,201,148,154,106,181, 90, 47,201,150, 73,
-178,249, 79,234,247,174,197,100,248,  8,253, 35, 71, 60, 86,225,225,239,211, 76,149,190,212,112, 56, 15,187,203, 24,154,198, 41,
- 27,149,201,160,  4, 68, 38, 80,167,142,179,  4, 71, 55,196, 44, 65,199, 69,138,248, 32, 22, 61,136, 13, 58, 37, 80, 66, 92,154,
- 22,216, 66, 76, 10, 36, 44,246, 43,232, 48,183,167,110,155, 42, 57,240,237, 58,237, 72,123,147,170,196,223,  0, 24, 83,220,162,
- 49, 43,198,150,145,236, 88,197,149,212,164,  1,  8, 72, 14,127, 26, 26,197, 81, 30,146,250, 37,218,103, 72, 41,194, 35,218,221,
- 52,170,131,151,237,130,187,165, 52,  7, 32,  1, 19, 59,193, 91,227,224,143,143,159,152, 80,137,  6,223,165, 76,129,105,117, 97,
-230,147, 90,149, 80, 62,131,210,254, 53,151,229, 96, 56,  7, 16,253,165,109,157,217,250,176, 14,213,194,180, 85,240, 56, 48,161,
-238,139, 22,154,221,  2,174,219,155, 69,143, 45, 27,211,213,167,242, 34,223, 84, 27,105,185,  7,203, 89,180,244,221,181,224,160,
-231,114, 60,212,161,227, 96,209, 63, 53,106,133,199,200, 98,124, 25,169,250,111,185, 46,151, 90,199,  2,170,183,123, 47, 42,185,
-177, 56,138,126,104,151,255,160, 95,196,225, 96, 64, 13, 58,175,188,212, 98, 27, 29,253, 80, 35,158, 48, 37, 79, 68,135, 19,187,
- 63,100, 84,254,246, 37,  0,105,231,214,147, 48, 16, 68,225,157,109, 45,197,219,147, 81,140,250,143,252,249, 62,251, 98,  8, 49,
-209, 24, 81,161,116,219, 93, 59,183,221,173,162, 96,124, 36,133,  0, 73, 51,221,153, 57,231, 59, 57, 31, 56,216,237,  1, 81,187,
-123,137,241,123,194, 31,170,188, 18,237,184, 63,146, 77,135,225, 60, 59, 67,117, 61,200, 70,211, 66, 72,188,226,148,140, 24, 25,
-111, 88,164,  9,106, 48,170,235,202,111, 22, 95, 40, 57,187,129, 99,138,217, 98, 71, 90, 73,126,  1, 99, 26, 95,135,147,104, 84,
- 60,116,232, 20,233, 16,124, 19, 40,111, 94,158,183, 37,243, 79,142, 75,  3,173,101,133,201,134, 46,149,202,104,108,117,214, 60,
-252, 54,103,224,234,168,174, 38,246,254,117,245, 64, 88,224, 94, 33, 98,253, 30, 14, 38, 24,183,105,249, 98,190,211, 41,252, 84,
- 61, 83, 75, 18,191, 91,223,159, 86,211,139,250, 96,222,192,220,132,187,231,183,235,110, 61, 28,111,214, 67, 53,199, 94, 36,180,
- 40, 63,196,  7,233,178, 53, 11,122, 32,157, 27,115,123,115, 57,155,157, 12,101,115,241,248,254,250,210,172,200,115,235,254, 93,
-220, 77,150,235, 36,173,  6,198,240,218,154, 52, 51,135,214, 56, 15,165,133,179, 73,217, 58, 10, 84,228, 60, 55, 47,157, 60, 19,
-  9,149,140, 78,227,245,144,  4, 49, 92,167,163, 87,137, 89, 49, 73,244, 98,162,213,200,235,221,152, 14,239, 94,145,143,194,111,
-207,  4, 18,228, 93,142, 44, 85, 73,218,  6,157,123,131, 74, 62,252, 54, 51,123, 48,169,210, 71,139,131,100,109, 11, 33, 71, 54,
-124,236,124,194,243,185, 21,192, 36,  7, 47, 33, 24,136,170, 60,200,163,136,195,194,169, 63, 20, 85,142,132, 70,198,200,  2,136,
-  3, 76,208, 97,187,103, 90, 49, 72,134, 96, 18,146,163, 74,193,210,215,210,130,223,225,191,194,  5, 88,213,187, 15,223, 60, 97,
-112, 95, 81,247,136,104, 26,238, 17,160, 49, 18,133,203, 14,125,  3,230,211,173,240,132, 19, 40,147,  8,  5, 30,212, 21,139, 65,
-213, 87,182,114,157,139, 30,246,252,222,  1, 58,170,216,116, 33,108,218,141,205,214, 29, 63,202,179,199,118,160,108,240,237,225,
-171,204,143,143,240,178,174,165,251,162, 47,120,252,195,154,109, 47, 40,171, 12,247,246, 13, 42,186,131,140, 93,196,233, 19,108,
- 89,246,134, 92, 20,142,123,113,192,192,172, 70,231,239,141, 91,199,179, 89,161,168,  3, 97,173,103, 80,123,179, 71,225,253,101,
-221,197, 31,252, 20,128,180,179,201,105, 24,  6,162,240,216, 77, 83, 40, 85,133,216,128,196,158, 67,112,  7,110,205, 21,216,118,
-  7,170,186,169,248, 41, 16, 39,246,224,249,115,146,182, 82, 43, 33,117, 87, 41,149,210,228,121,230,205,243,231,106,172, 32,216,
-187, 98,103,168, 60,158, 80,121,151,206,116,108, 84,229,157, 43,187,207,237, 28, 96,157,166, 91, 35,220,255, 84,226,155,172,184,
- 71, 69,249, 37,216, 75, 59,243, 55, 29, 47,228,244, 82,249, 88, 88,122, 34, 22, 60,189,139, 46, 85, 26,160,242,242, 56,216,185,
-246, 54, 79,163,235,250,137,185,127,118,250, 59,153,104,191, 58,209,133,138,137, 18,215,224,126,248, 12,213,153, 33,  7,  2,125,
-232, 62,220,215,245,205,213,244,121,243,241, 54,184,109,237, 25,157,145, 31, 27,145,105, 16, 21,152, 14,241,175,134,175,233, 44,
-131,184,107,225, 46,255,238,226,114,251, 25,214,241,123,  5,176,125,239,114, 63,177,228,247,169, 97,139, 97,199,173, 70,195,215,
-124,116,245,211,195,109,189,188,184,170,225,183,105, 86,175,187,117, 67, 16,227,214, 90,132,255, 72,188,183,224,166,236,240,154,
-131,191,240,176,156,230,178,189,202,234,249,149,  5,169,131,121,237, 23,115,255,178,113,  6,237, 19,191,141, 97,117, 32,167, 86,
-160, 56,108,138, 64,212, 20, 13,255,133,195,170,201, 33, 30,  9,224, 75,102, 70, 23,117,173,226,  5,134,  5,234,189,187, 49,134,
- 16, 75,149, 80,178, 94,252,224,165, 74,206,184, 86,169, 47, 17, 63,181, 27,176,140, 94,123,229,239,250,188, 55,225,204,148,254,
-107,116, 92,139, 11,187,126, 15,143,184, 54,162,242,140,228,152,240,149, 69,226,185,211, 76,208, 83,242,205,153,113,160,120, 47,
- 97,218, 50, 71,219,148, 93,  6,206, 38,101,194,221,160,237,189, 81,104,101,158, 66, 82,109,202,173,109, 75,232, 25, 10,241, 86,
- 77,126,234, 35, 83, 66,232,126, 19,153,187, 77, 41, 96, 12, 24,118,194, 36,200, 69, 63,155,102, 81,241,106, 60,243,106, 83, 56,
- 92,245,156, 69,244,198, 79,133,152, 51,238, 88,140, 99,191, 58, 78,  7,242,133,165, 85, 27, 15,192, 35,136,163,139,104,108,102,
-250,115,163, 47, 75,  2, 98,105,101, 68,136, 98,234, 75,111,196,211,165,113, 60, 54,179,  4,167, 59, 54,225, 50, 47,141, 64, 88,
-243,  9,209, 79, 28, 25, 91,109,152,236,167,123,112, 70,121,158,220, 73,  7,232,189,154,164,112,139,131,114,254,252, 62,185,242,
- 85, 72, 42, 45,127,  2,144,118,237, 58, 13,195, 80,212,118,156,166, 52, 45, 45, 15,129, 84,193, 15,176, 32,177,244,199,249,  6,
-118,  6, 70, 88,  0,137,231, 80, 41, 37,117,147,216,216,247, 94, 39, 78, 72,165, 72,180, 91,171, 14,174,227,227,251, 58,231,116,
-235, 51, 67, 80,158, 13,141,229, 61, 95, 41,104,198,214, 40,143,204,181, 54,202,211,128, 77, 19,200,123,243, 87, 82,158, 67, 61,
- 60, 30,152, 88,178,112,142,130,155, 62, 33, 57,252,149,243, 67, 64, 16, 16,154, 60,230, 73,154,207,190,101,133,130,148,166, 36,
-137, 16, 34,204,249,249, 45, 55, 76,233,218,225, 32, 22,108,162,218,142, 25,164,192, 37, 32,159,132,248,119,141, 70,183,  4, 97,
- 36,253,104, 79, 92,202,228, 50, 77,238,191,127,222,152,185,100,124, 53,153,223, 92,156,174,115,117,251,252,242,176,255, 79, 13,
- 36,222,  8, 31,171, 96,207, 76,251,243,145,239, 88, 26,114, 80, 50, 69, 81,170,109,113,190,152, 92,157, 29,142, 62,205, 93,153,
-191, 91,136,103,236, 85,183,246,210, 70,253, 43, 46,174,143,231,203,147, 89, 58,139,182, 54,156,207,244,211,199,230,241,107,179,
-134,137,160, 49, 44,237, 63,245, 65, 78,118, 87,  4,238, 83, 38,142,132,152, 39,241, 34,137, 15, 98, 23, 30,218,172,217,  6,129,
-  0, 21, 60, 87, 49, 36,175,188,110, 90,113,116, 53,  5,248,  8,192,221, 53, 11, 73,213,145,155,254,202, 40,111, 39, 64, 32,147,
-145, 38,211, 76,101,168,135,209,  1,247, 46,255,211,235,  6, 58, 21,116,  3,243, 20, 38, 34,161,111, 97,176,126, 12,135, 81,248,
- 58, 18,134, 32,120,121, 32,206,227, 68, 77,200, 79,  1, 78, 52, 76,108,145,151,142,241,158,170,160,236,216, 80,186, 49,231,128,
-197,114,233,115, 89,195,125, 97,136,251, 10, 20,247,143, 35,116,156,177, 59,  5, 44,221,160,150,213,120, 16, 54, 28, 66, 22,145,
-215,131,251, 26, 56,147, 54, 30, 23, 44, 42,149, 22,153,221, 49,163,119,218,201,222,184,190,  4, 92,174,206,125,161,178,231,192,
-194,119,169, 44,202, 59, 66,147,123,186, 49,224,161,219,205,249, 16,247,197,157,184,105,154,234, 33,251,130,  0, 83,181, 61,129,
-131, 57,231, 30,110,217,159,224,189,169,210,160,152, 57,233,  9,195, 50,117, 32, 69,215,158,224,116,205,151,195,241, 66, 21,249,
-174,218, 14, 87, 43,235,212,242,164, 24, 89,172,  6,175, 18,166, 64,175, 92,114,  9, 12, 77,116,184,195, 75,181, 86,163,128,154,
-109, 81, 96, 13,128,211, 90,112,  4,131,  6, 82,106, 21, 22, 61,232,202,105,178,135, 26,220,237,235, 87,  0,210,174,174,167,109,
- 24,138,250,171,105, 74, 33,168,108,171, 54,132,196,222,224,157,255,192,191,231, 47,236,  5,169,211, 52,  9,150,174,105,155,196,
-246,157,125,237,235, 56,140, 48,164,229,169,170,170, 42, 77,210,235,235,115,206, 61,103,192,103,212, 75,239,249,201, 42,255,126,
- 62, 45,127, 57,214,255,249,182, 44,239,229,121,102, 96,105,147,127, 55, 12, 26,171,244, 63,230,177,107,183, 36,107, 23,100, 53,
-  6, 83, 62,161,192, 82, 60, 56, 71,  4, 23, 45,  3,193,206,229, 12, 76, 95,235,205,170,100,243, 98,185, 63, 92,120, 13, 91,212,
-185,164,171, 17, 74,138,160,216,141,168,100,112,103, 94, 42,249,179, 51,167, 50,122, 52,182,113,123,  5,123,170,101,120, 63,185,
- 91,157, 63, 23,242,168,251, 71,211,175, 25,191, 59, 61,191,189,250,176, 92,205, 69, 39,239,229,101,249,248,227,193,232,169,107,
- 40,147,123,119,134,207,244, 25,184,166,136,177,228,212, 32,135, 15, 55,204,238, 52, 60, 29,250,147,162, 95,159,151,235,101,113,
-179,109,191,213,187, 77,219, 54, 62, 97, 13,206, 24, 95,201,217, 69, 81,124,169, 22,159,170,194, 42, 63,245, 94,239,187,162, 84,
-155,103,253,244,220,212, 90, 55, 36,233, 49,236,191,142, 32,126, 63, 65,168,106,193,228,215,170,188,174, 22, 87, 31, 43, 37,196,
-247,250,184,237, 52,104,243,203,232,101,201, 90,171,182,  7, 36,222, 57, 75,  3,154,233,246, 89, 54, 20,119,163,195,134, 47,133,
-248,188,161,165, 27,170,131,251, 33,191,251, 38,230,100,199,225, 78, 75,226, 19,128,191,240, 48, 30,107,181, 31,  0, 68, 79, 36,
- 95, 55,130,216,  3,200,219, 40,102, 62, 68, 76, 30,178,200, 51,150, 97, 20, 99, 30, 15, 45,213,209,248, 34, 22,230,208,125,200,
- 49, 89, 71,172,148,240,163,185,194,213,  9,145,204,187,227,163,150,156,208,121, 76,209, 72,152, 76, 76, 53,195,206, 52,240,210,
-144,130,134, 80,111, 26, 54, 63, 97,219, 16, 18,169, 36,215,174,201,181,252,  8,157,  0,217,185, 55,208, 34,200, 79,108, 35, 92,
-102,113, 29, 12,110,145, 45, 78,148,245,184,107,182,196,100,240, 23,195, 28, 57, 92, 21, 10, 24, 36,  6,132, 27,138, 70,252,167,
-140, 36,222,101, 24,131, 51, 48, 81,220,137,130, 49, 48,180,148,156,216,143,209,196,114, 64,126,195,183,238,218, 45,  3,251,234,
-217,216,  9,224, 58,159, 40,196, 53, 85,227,  2,143, 99, 73,120,127, 92, 31,237,214, 67,116,161, 72, 35,205,131,175, 23,117,105,
-150,152,124,223,207, 40, 62, 51, 30,245,114,207,153, 18,100,197,145,153,114,195,123,146, 50,243,227,143,  0,164, 93,203, 78,195,
- 48, 16,204,230,161,182,162,  1,218,130, 16, 23,224,  6, 31,192,255,255,  6,  8,241,  3, 21,130, 22, 72,147, 54,137,189,120,237,
- 93,199,105,194,169,183, 86,141, 34,185,137,199,246,236,236, 76,234,223,101, 53,232,134,135, 99,219,204, 83,212,113,157,188,  9,
-130,155,107,235, 76,199, 62,213,178,145,  7, 91, 70,227,222, 67,153,196,244, 10,106,204,136,145,100,190, 21,181, 51,212, 19,111,
-180, 99, 51, 57, 63, 73, 92,218,171,103,126, 93,142, 27,165,193,237,234,242,117, 71,142,113,179, 34,122, 90,149, 87,115,245, 93,
- 44, 41, 93,202,167,108,163,152, 87,240,114,234,182, 40,172,194,155,232,160, 75, 30,162,204, 30,224,107, 89, 41,189,251, 35,  5,
-242,197,241, 91,185, 55,159,111, 33, 51,  3,126,255,218,190,124, 98,213,144, 50,125,145,164, 55,170, 93,255,255,168,112,160, 30,
-192,128,177, 81,129,130, 42, 13,200,156,134,234,  1,170,168,218, 77, 70, 49,182, 25,164,121, 62,125,190,152, 30, 40,206,214, 28,
-179,241, 44,163,252,166,  6,205,106,143, 31,123,131, 31,102, 37, 32,235,126,243, 79,237,126,155,245, 79, 93, 71, 84, 36, 56,156,
- 12,238,206,128, 33, 35,124,135,187,217,236,241, 58,191, 95,206,231,233,228, 97,149,147,169,108, 83,108,203,109,101,205,  1, 23,
-211,108, 83,  0,109, 26, 19,135,229, 94, 71,235,233,  5, 62, 79,163,115, 32, 13, 12, 78,134,198,  9,113,119,218,239,204, 90,233,
-  6,173,200,114,  1,  5,135,  3, 43, 44,  1, 34,231,103,141, 30,229, 65, 10,219,174, 97,202,193, 19,198, 46,152, 72,138,174, 74,
- 32,153,121, 27,232,171,209,161,147, 86,162,223,239,200, 22,222, 49, 42,  4,188,113,239, 65,179,126,134, 26,130,168, 19,141, 72,
-121,118,183, 18,223,  4, 91,119,102, 75, 87,123,204,229,196, 12,106,107,234,182,237, 28,132,100,  6,151,164,137,134,214, 78, 52,
- 54,201, 57, 79, 46, 19,171, 40, 51,235,214,158, 98, 12, 42,208, 54, 48,214,198,110,162,226, 14, 97, 36, 61,184,185,170,198,134,
-148, 51,246,  7, 91,150, 98,224, 81, 60, 70, 31,136,173,  3,  9, 19,116,168, 26,  1, 31,199,198,218,177, 17,  7, 50,115,125,172,
-151,128, 97, 97, 19, 71,186, 50, 49, 12, 72,234,  7,130, 56,162, 74,123,123,119, 39,161,234,183,134, 33,244, 97,208, 23,134, 67,
-202, 84, 72,  8, 22,200,198, 82, 47,141,172, 73, 98,106, 59,228,233, 75,156,138, 25, 89, 28, 46,226,174,165,173,147,133,219, 16,
-120, 81,132,120,209,  9,138, 54,223, 49,120,168,199, 84,118,163,208,255, 39,  0,109, 87,179,147, 48, 16,132,103,183, 11,133,136,
- 74,122, 50,241,228,193,151,240,253, 31,193, 39, 48,145, 72,  8, 65, 12,208, 82,186,179,238,204,236, 79, 41,226,197,200,133, 75,
- 19,104,187,157,206,126,243,253, 12,249,145,182,231, 30,254, 15,133,126, 72,229,150,  7, 41, 86,121, 21,115, 95, 85,148,174,102,
- 64,221,133,  4,108, 12,102, 96,116, 69,196,190,  3, 92,182,137, 86, 63,201,193,172,228,246,201,243,102,152,139, 65,166,228, 78,
-191, 29, 54,114, 92, 13,240,186,134,151,201, 87,161,238,142, 86,142, 69, 70, 75, 57,102, 48, 80,251, 67,114, 39,113,250, 56,  0,
- 88,128,117,196, 92, 97, 59,200,249,218,178,177,154,128, 54,180, 83,115, 11,139, 55,244,163,184,170,143,216,184,  3,118, 59,196,
-134,132, 33, 68,154,148, 63, 92,244,200,148,182,  7,206, 92, 67,198, 84,207, 35, 62,177, 15, 77, 92,229, 91,232, 84,  7,229,190,
-168,237,241,126, 68,  4, 32,195,171,137, 99,196,220,186,197,154,134,107, 84, 84,182, 29, 76,199,186,245, 39,110,116,219,158, 62,
- 62,155,213,169,219,178, 62,203,254, 13,118,159, 50,193,223, 23,247, 74,153,231,249,236,105, 62, 45, 17, 22,203,189,133,195,251,
-154,180, 69,123,219,249,247,156,175, 88, 51,  3,183, 19,127, 23,180, 88, 46, 39, 55, 68, 23,243, 93, 92,138,  4, 66, 81, 32, 14,
-138,251, 64,222, 34,105, 69,189, 69, 16,198,143,156, 13,  3,177,121, 15,118, 99,217,188, 47,117,133, 42,242,111, 66,243, 17,251,
-242, 80,227, 57, 89, 94,112, 36,129,157,197,207, 58,116,214,204,155,231,245,108,147,147,140, 74, 60,235, 24,148, 70, 70,243, 38,
-181,240, 18,108, 68,136, 31,106,117,193, 54, 86, 17,221,214, 65,239,213,239,100,149,203,172,156,248,141,105,252, 10, 17,106, 20,
-225,135,128,196, 40,246, 51,244,202, 40, 97, 92,156,236,158,135,126,190, 15,168,166, 85, 61, 46,118, 20, 85,203, 99,135,112,121,
-165,198,251,235,197, 42, 17, 39,200,140, 13, 19, 99, 39,211,230,152,195,132,125,213,239, 57,108,166, 88,173, 46, 39,147, 97,116,
-200,239,  3, 21, 29,132,127,225,167, 92,208,102,220, 21, 18,165,206,118, 53,131, 97,  0,158,111,172,134, 83, 93,119,105,198,127,
-101,111, 65,149, 68,151, 35, 85, 52,182, 45, 98,101,247,157,129,113,162,145,114, 15,213,227,122,179,212,161,190, 27,149,188,244,
-201,150, 99,212, 28, 27,201,182,102, 50, 27,211,  6, 53, 25,200, 33, 19,137,104, 58,  2,156, 88,153,189,148,208, 70, 93, 46,230,
- 25,225,213,207,183,  0,164,157,205, 78,195, 48, 16,132,189,150, 19,104, 90,126, 36, 36,206,  8, 46,188,255,  3,193,165, 18,  7,
-138, 34, 90,112, 27,199,246,226,245,218,137,  3,105, 85,  9,181,135,168, 61, 52,117, 35,119,119, 51,243, 77,226,207,244,211,102,
-  7,127,197, 24,255,169, 40,225,140, 91,187,112,242,  5,152, 59,134,209,213, 13,165,137,  4, 51,169, 35,194,100,210,131,237, 16,
- 40, 74,115,194,  9, 55, 64,246, 88, 37, 25,142,212,110,255, 78, 19,136,241,202,184, 23,254,122,185,248, 54, 99, 39,151,140,181,
- 30,135, 20,169, 52, 51,138,227,252, 90,104, 71,214,108, 66,236, 70,217,159,236,104, 67,  7,150,186, 99, 74, 31,149, 13,233,208,
-253,139,119,113,126, 18,118, 85,219, 58,187,241,126, 75,249,196,162,150,100,128,218,228, 49, 75, 21, 71,213,254,200,165, 61,243,
-149,242,  2, 86, 83,  4,199, 48, 37,112, 57,238, 56,156,164, 54,222, 56,223,153,190, 53, 94,247,182,183,132,253,166, 68,113,  8,
- 37,153,248,114,206, 56,177,219,155,245,206,188,  9, 90, 26,243,143,225, 12,135,  2, 54,145,132,243,188,104,158,110, 86,173,182,
-235, 86,127,106, 99,173, 59, 80, 10,160, 57,244,246, 67,155,112,220,121,119,219,200,122, 81,191,182,138,221, 63,209, 13,153, 76,
-112,254, 87,241,158,194, 61,  5,140, 96,210,249,139, 13,166, 88,164,177,106,202,118,161,162, 65,158,148,108,232, 75,  5,204, 96,
-163,199, 81,232, 56,196,186,179,246, 92, 22,101, 69,230, 52,225, 16,121, 90,120,170, 10,124,  1,187,170, 51,100, 38,  7, 25, 99,
-166,162, 74, 28,186,197,169,244,174,120,114, 95,201,  3,112, 70, 95, 37,143, 23, 20,160,122,166,114, 59,206, 76,130,196, 81, 41,
-  2,226, 34,230,168, 38,241, 35,218,131,235, 28,241,220,113,  9,170, 67, 67,218, 71,154,198,216,104,247,234,137, 51, 99, 13,109,
-238, 68,188,118, 20,219,  4,252, 81,158, 93,132, 69,135, 94,118, 46,144, 19, 63,211,210, 96,185,236, 88,202,131,161,248, 63, 24,
- 12,183, 32,102,252,101,120,206, 77,193, 51,222,194, 57,157,200, 41,237,140,156,108,238,200,105,184, 52, 76,136, 64, 80,  9,170,
- 34,237,145, 82,149,170,136, 80, 91,153,174, 83, 82,133,215,227,255,105,188, 91,157,230,169,212,170,133, 22, 54,148,246,225,135,
-111, 46, 87, 97,217, 21, 19,110,145,211, 73,225,162,106, 32, 69, 17,224, 80,254, 62,220, 61,110,247, 45,111,142, 87,213, 85,228,
- 77, 30, 61,225, 31,  1, 24,187,142,165,134, 97, 32,170,234, 16, 19,202,112,224,200, 39,240,255, 23,254,133,129, 11, 12,101,128,
- 16,136,139, 86,104,139,100,197,  3, 36,158,220,237,216,210,106,203, 43,110,111,207,254,143,190,205,127, 66,193,  7,102,241,102,
- 78, 19,136, 21, 35,129, 13,116,162,158,204,148,233, 95, 34, 22,222, 48, 72,129, 41, 78,210,157,141,145,231, 41,251,138,134,204,
- 88, 65,126, 62,171,196, 76,215, 85,219, 60,246, 62, 45, 94, 71, 96,235,108,198,137,234, 68,144,251, 51,154,157,183, 36,147, 51,
-167, 86, 63,245,146,122,  3,234,207,136,  0,100,157,197,123,163, 58, 52,165, 67,160,225, 67,213, 13,243,100,114,221,166, 67,188,
- 71,178, 73,172,104, 80,182,122, 51,225,183,208,  9,179, 73, 83,  5,141,103, 13, 94, 66,172,199, 53,230,224,195,102,192,254,237,
-210,165,227, 36,158,145, 24,239, 38,  0,201,123,161,219,170,183,168, 19, 48,104, 56,247,102,211,245,235,174,223,144,115,115,200,
-110, 83,123,107,192, 95,131,251,146,126,151,202, 92,159,158,124,  3,220, 60,191,166,231,185, 80,118, 12, 38,  4,135,228,120,210,
-218, 90,208, 32,233,216,171,179,133,191,127,115,221,168,210, 10,  7,202, 15, 41, 86,177, 85,118, 44,184, 38,238,187,234,162, 81,
-149,211,177,154,124,103,230,159,189,132, 18,110,197,228,  4, 83,103, 41,186, 88,250, 38, 50,254, 43, 65, 54, 76, 53,121,101,197,
- 83,146,125,157,203, 70, 16, 47, 39,109, 76,156,240,221,145, 21,232, 72, 29,172, 88,  8, 74,108,207,133,  0,173,102, 44, 68,153,
-168,100, 35, 55,  0,180, 52,245, 77,156,111,222, 88, 81,151, 69,  6, 89,192,238, 32,222, 23,187,248, 34,140,236, 34,118, 22,119,
-219, 32, 70, 96,151, 38,244,122,187,178, 43,213,125,245, 56,154, 24,186,254, 99, 28,155,246,104,241,174,183,192,195, 85,226,188,
-210,215,160, 61,  8,196, 37,214,108,199,  6,188,159,138,155, 26, 76,211,105,144,182,135,154,168,169,197, 35,187, 82, 15,150,178,
-  9,114,  6, 22, 97, 58,146,243, 80,182, 78,231,119, 96,172,  7, 35, 63,244,255, 52,165, 67,130,187,174,210,118, 37,227, 67, 77,
-192, 24,  4, 65,226,208,221, 56,111, 44, 42, 85,162,230,  2, 38,163, 77,179, 48, 96,143, 92,211,186,182,181,173,183, 13,194,  2,
-152, 67,165,144, 33,214,141, 91,156,136,162,188, 79, 58, 59, 81,105, 63,216,180, 18, 92,170,245,129,244,103, 60,114,227,229, 40,
- 79, 55,191,123,185,197,187,209,171,248, 28,214,122,151, 25, 51,187,126,  4, 96,236, 90,118, 26,134,129,160,215, 78, 83,104, 11,
-170, 56,130, 16, 71, 78,252,255, 55,112,231, 31, 56,241, 16, 42, 77, 19, 63, 22,239,174,237, 56,164, 45,156,171, 70, 81, 90, 79,
-118,103,118,103,154,249,187, 14,142,129,227, 28,229,195,233,  4,144,255, 11,208,179,167, 94, 32, 30, 96,108,147, 48, 41,243,217,
-237, 84,139, 77, 24,228,108, 46, 93,204,152,181,202,185,172,161,222,149, 43, 75,167,133,244,138,101,114,179,120, 10,151,235, 96,
-173,194,  3,226,182, 93,188,251,235,207,222,113,120,172,198,178,115,160,146, 10, 86, 48,148,130,159,148, 22,  3, 63,195,  5, 56,
-209,238, 33, 81,225,236,120, 51,242, 36,  3,119,157, 13,227,165,103,183,153, 38,155,161,175, 77,  4,247,230,126,179,124,251,136,
-199, 42, 73,178,109, 54, 23,131,211,196, 72,152,182, 89,237, 52, 27, 79,190,216,229,185,154,129,212, 84,154,115,191, 10,216, 54,
-122, 96,169, 48, 62,184, 29,239, 29,182,100,117, 24, 91, 71, 88,106,  8,206,247,214,117,206,147, 54,155,241, 29, 43,190, 46,252,
-227,  0,201,205,172,216,  3,231,193,152,199,237,230,101,223, 63,119,135,144, 62,242, 20, 32,225,136,182,234,185,209,105, 21,182,
-  0, 27, 99, 60,224,235,142,126, 99,207, 68,178, 56, 75, 72,165, 94, 91,195, 96, 80, 56,179, 71,146, 23,253,175,225,209,217,155,
- 29, 36,236, 56, 77, 89,170, 90, 78,195,217, 41, 14,117, 87, 32,245,  3,105,170, 90,193,164,173, 31,249,229,  2,244,213, 18, 85,
-252,203,165, 69, 58,204,105,216, 96,138, 56,200, 82,146,188, 22,216, 79,203,199,203,179,241,157,164,116, 67, 90,207, 57, 54,138,
- 50,189,185, 82,222,162,112,241,169,108,167, 44, 99,201, 73,  3,133,211, 22,135, 19,160, 10,101,229,212, 62,118,179, 26,175,150,
-107,176,148,115,211, 68,200,215, 97,231,190, 61, 72,149,131,217,130,216,103,131, 25, 79, 60, 31,207, 29,166,198, 24,106, 94,184,
-120, 65,148,121,211,128,170,230,169, 96,220, 46,202,224,238, 43,187,250, 92,188,143,115,144,117, 90, 19,158,  0,119,252,187,164,
- 60, 15, 71,231, 57,153, 26,220,147,207,191,204, 78,113,234,103,195,206,254, 82,179,115, 40, 28,241, 54,139,213,226,226,110,117,
-187,109,111,180,214,131,179, 61,109,197,198,246,149, 20, 84,195, 12,215,165,185,184, 89,109, 35,244,199, 11,117,155,225, 16,186,
-222,245, 95,246,171,179,253,183,219, 91,127,176, 20,141,203, 46,140,217, 60, 14,210,198,178,230,131,233,100,  2,103,244,187,158,
-222,244,143,  0,148, 93, 93, 79,227, 48, 16,180,215,113,154, 22,161, 10,113,119,226,245,196, 11,255,255,153,255,129,196, 47,  0,
- 33,116, 39, 33, 53,132,218,235,219, 15,111, 29, 82, 40, 92, 31, 83,169, 82,154,120, 61,158,157,157,233, 78,255, 13,254,168,202,
-135,165,  2,210,127,135,103,255, 38, 29,239,170,211,153, 55, 58,  5, 76, 22,111, 16,190, 78, 92,103,218, 30, 45, 20, 19, 61,214,
-209,  5,206,223,244,144, 62, 74, 78, 57, 36,103,214, 25, 12, 96,201,194,159,254,140,222,149, 31,145,190, 10,143,180,184, 38,122,
- 74,217, 55,102,176,102,  6,233,225, 23,172, 31,207, 83, 39,  2,140,222,228,202,224,107, 19,178,179,172, 81,181,226,210, 68,105,
-241, 90,193, 11,215,137,192,134, 63,189,148,191,  1,220, 54,194,213,121,252,189,137,247, 79,187, 94, 10, 98,154,205, 43, 77,182,
- 51,229,175, 21, 81,245,184, 16,108,217,107,107,119,108, 81, 33,101,164, 59,166, 27, 78,101, 15, 33,  6,214,116,174,144,  7,  3,
-214,220,181, 22, 57,136, 75,187,132,227, 91,254,235,178,102,198,238,222,187,158,157,134,240,222,148,154, 74,203,208,189,220,196,
-225,250, 98,125,251,252,114, 39,234, 32, 61, 42,189,200, 94, 76, 91,206,192, 34,187, 66,160,101,237,202,166,248, 75,  7, 15, 83,
-255,154, 25,243, 72,241,  0,105,169,112,121, 82,120,120, 32,103,230,149,202,207,130,231, 45, 73,233,227,183,174, 14,205, 41,119,
-130,206,189,239,172, 30,203,180,221,146, 26, 22,192,205, 59, 99, 93, 87,138, 49,218, 28, 83,147,122, 89,138,118,157,246,241, 85,
-112,  5,154,162, 83, 66,245,201,115, 26,255,165, 22,145,152, 51, 97, 62,121,145,169,186,107, 16, 29, 20,143,159,105, 67,102, 21,
-179,117,167, 26,251,174,176,221,124,146,209, 53, 85,127, 89,246,189, 88,144, 41,225,221,110, 76,227,  4, 19,  1, 23,246, 72,103,
- 63, 23,212, 60, 39,253,139,100, 10, 84,171,188, 56,253,  8,144, 71,165,229,237,215,173, 27, 44,218,131, 10,213,209, 28, 68,252,
-130, 11,177,114,143, 85,229, 83, 74,139,163,106,110,239,166, 14,154, 25,123, 90,107,249, 20,193,242,255, 64,179,124, 21,158,115,
-156, 32,196, 87,162,108,215,244, 68,135,126, 64, 68,166,101, 36,  1,  8,124,247,107,184,252,185,185, 90,193,138, 30,244, 72, 71,
-232,156,247,108, 93, 89, 14,153,146,123, 36,224,149,164,125,135, 84,250, 99,  8, 66,179, 65,135,113, 11,219,117, 55,249, 28, 75,
- 88,141,233,117,244, 28, 23,154, 92, 18,120,164,224,199,206,106, 46,168,220,  4, 44,  9,118,177, 66,255,  9,192,216,181,237,182,
- 13,195, 80, 81, 78, 29, 39, 43,234,118,216,211,222,  7, 12,216,190,123,255,213, 14,123, 40, 90, 20,201, 46,137, 44, 75,226, 68,
- 82,183,214,109,210, 32, 15,129,145,216,130, 29, 81,212,225,225, 57,175,227,239, 39,246, 54,248, 18,145,135,119, 67,240,240,158,
-175, 65,  3, 52, 66,193, 38, 23, 23,203,123,232,106,188, 42, 49,119,221,175,227, 50,  9,  0, 13,232, 89,223, 40,219, 93,144, 84,
-159,126,100, 64,239, 60, 24,241,152,140, 15, 74,103,218,  3,168,106,243,153,167, 84,154, 81,108, 59, 25, 31,213,160,237, 58,196,
- 21, 89,246,209, 20,194, 36,239, 62,102,152,165,207,132,214,173,238, 98,194,126,159, 51, 47,202,250, 81,141, 29,140,208,253,218,
-217,159,222,247, 28,247, 47, 73, 17,158,134,110, 50, 31,166,123,142,213,188, 85, 98,109,197, 35,229,181,205, 49,119,197,103,222,
-  8,187, 22,195, 62, 40,195, 93, 49, 27,238,174,235,180,196, 71,176, 14, 31,103,255,164,220, 31,110,127,157,242, 34,209,202,197,
-168,215, 36,170, 11, 73,102, 96, 64,166,103, 95,145,239,253,240,229,227,135, 31, 15, 79,183,188, 61,239,154,191,157,232, 19, 76,
- 10,127,243, 28,118,212, 28,128,159,175,135, 59,179,241, 34,  3,135, 82,255, 67, 46, 99,251, 84, 47, 44,168, 71,110, 67, 66,213,
- 98,200,181, 73,  6,159,235,128,135, 66,  8,148,254,166,202, 51, 89,222, 85, 72,138,147,112, 34, 31,132, 66, 91, 76,107,  3,234,
-134,150,171,219,112, 83,196,194, 11, 82,159, 10,176,161,248, 88,230, 96,  1,201,134,140,174,173,235, 60, 43,190, 79,141,152,109,
- 51,118, 57, 92,108, 47, 42, 73,198,167, 76,168,202,126,156,  1,162,169, 69,143,  3,178, 39,160,208, 57,174,106, 39, 96,157, 79,
- 72,155,157,192,210,170, 12,238,139, 72, 31,134,134,112,153, 32, 39,121, 94,170, 34,241,184,100,245, 65,161,133,168,100,114,142,
- 89, 25,158,201,150,170,154, 82, 97,181, 69, 44,193,221,171,183,189, 53,194,185, 80,223,212, 14, 49,156, 13, 76,139,224,174,114,
-206,222, 17,142, 72, 61,190, 49, 85,143,161,121,220,220,132,217, 93, 16,123, 67,143,195,213,183,241,235,205,250,211, 63,107,246,
- 36,121, 52, 89,111,231, 48, 31, 98,234, 78,164, 16, 25,165,103,249,231, 36,191, 19,239,230,193, 91,235,103,235,166, 57,196,204,
-253,120,244,230,175, 59, 24, 55,237,113,103,212,129, 72,125, 68,187, 92,101,190,124,167, 26, 27,153,101, 15, 83,249,252, 95,  0,
-206,174,101,167, 97, 24,  8,174,157, 71, 31,128, 56, 84,149, 64,226,140,196, 63,243, 73,252,  2,  7,196,137,  3,  2, 81,148, 54,
- 73, 99,227, 89,175,157, 77, 91, 16, 32, 85, 61,229,208,196,174, 51, 59, 59, 59, 83,254, 67,244,162, 81,188,159,196, 10,255,140,
-205,127,203,215, 43,  8, 47, 21,172, 77,254, 27, 82,213, 70, 23,118, 49,213, 48, 98, 99,195, 21,247,250,242,250,169,125, 28,212,
-192,179,190,121,235, 84, 63, 22,  9,217, 16,127,149, 81, 90,195,185, 75,252, 54,133,120,182,176,131,115, 88, 60,107,147,123, 60,
- 73,161, 59, 68, 26,136, 93,104,248, 15,138,249,201, 93,154,166,171, 24,249,118,156,242,193,  3,174, 46,212, 86,225, 21,114, 91,
-207,235,174,125, 64,155, 19,  7, 40, 34,167, 91,247,220,130,184, 56,195,249,104,150,248,148, 27,218,119,200,172,151,148,143,236,
-202,235,191,193,206, 58, 22,160, 77,115,179, 46, 14,214,166, 14,103,197, 35,237,225,225, 45,200, 46,249,233,  6,204,190, 67,119,
-215,118,172,169,168,201,127, 58,122,167,253, 22, 89,108, 18, 42, 66,202,107, 62,207, 33,231, 18,193, 43,133,126,173,186,169,231,
- 68,119,243,229,234,162,186,127,121,221, 40, 90,176, 87, 37, 96,147, 94, 60,251,148, 17,216,216,121, 51, 32,210,200,187, 76,194,
- 74,248,173,216,196,104,219,148,163,134,192, 49,132,215,120,210,144, 75,230, 91,222,103, 30, 24,104,116,156, 31, 29,249, 39, 67,
- 39, 71, 19,143,133, 19,194, 98, 35, 38, 53,101, 85, 48, 92,159,202, 55, 18,  5,193,163, 70,177,208,196,241, 30, 81,188,140,122,
-112,184, 54,108,144, 92,  0,207,236, 78, 29,211, 89, 99,198,170,112, 99, 94, 43,226,105, 34,145, 83,172, 35, 66,172,134,145,222,
-159,248,172,153,113, 41,157, 30,180,225, 43,123,246,246, 50,121,229,193,177,251,104, 12, 98, 76, 50,119,195, 72, 25, 73,  7, 55,
-194,118,177,250, 75,220,134, 31,233,148,131,147, 93, 91,208, 36,185, 42,187,252,229, 56, 39, 81,210,171,195,221,100, 65, 78,146,
-193, 28, 32,119,255, 55, 12,174,183,140,167,223, 54, 15, 79, 28,238, 22,117,102, 17, 51,161, 10, 91,133,239,221,182,  9,152,221,
-216,242,106,113,179, 94,172, 62,250,221,166,125, 99,195,100,106,120,101,227,190, 46,216,151, 48, 41, 98,113,195,192,228, 97,221,
- 13,156,219,194, 85, 85,  1,122,184,167,161, 67,146,162,169,108, 93,187, 89,231,187,129,250,158,250,176,105,102, 84,151, 16, 80,
- 34,  7,151, 17, 70, 97, 68, 81,227,104,250, 88,226,207,254, 18,128,178,107,233, 73, 32,  6,194,211,238, 11, 65, 30, 27, 19, 19,
- 36, 94,188, 17,163,255,217, 31,231,193, 11,106, 34,226,190, 58,210,153,206,108, 23,  1,245,194,149,165,192,244,235,215,239,209,
-227,247, 63,  8, 96,142,139, 94,224, 55, 57,205,121, 20,127,234, 93, 34, 71,  0,183,115,170,165,195,246,137,107,214,105,168, 20,
- 71,240,189,110, 55,230,192,218, 26,253,166,226, 31,123, 18, 50, 91,195,105,157, 60,146, 56, 27,185,229,188, 94,149,245,114,222,
- 45, 22, 30,232,110,119, 22, 76,175,131,224,141,225,106,122,221, 52,141,117,159, 85,211,  2, 91, 69,232,143, 88,203,245, 38,134,
- 81, 27,136,  0,218, 57,204, 93, 49, 90,103, 69,213,182,111,148, 97,192, 72,118,  1,176,132,244,214,100, 55,105,182,127,168,212,
-251,  2,123,195, 12,246,181,141,231, 98, 66, 19,153,191,181,100,156,153, 72, 49,169, 76,122, 27,132,222,248, 69,146,139, 10,221,
-206,171, 38,252,181, 78,  5,221, 22,112, 35,148,142, 22,127, 39,194, 82, 41,251,148, 10,107,164,168,252,130, 62,236,140,144,251,
-227,120,178, 42,243,167,151,247,143, 40,216,242, 32,252,210,201, 42,213,244,168, 15,227,236, 25,167, 45, 95,147,107,204,180,106,
- 31,195,  4,225,111, 48,160,235,232,212,114,  4,194, 71,182, 38, 68,173,107,160, 74, 95,132,152,  3,136,205, 68,161,244,  3, 15,
-183, 81, 28,240,154,118,208,152,101,142,128,122,217,113, 84,223,  3, 86, 19,  7,  6,199,222, 30,197,171, 89,149, 78,152, 22, 85,
-137, 76,123,  2,234,178,196, 80,125,112, 19,104,100, 22, 58,148, 80, 73,136,250, 44,251,101, 87, 87,100,204,129,200,117, 40,175,
-149, 67,166, 12, 66, 63,109,120,117, 68,155,249,136, 97,177, 20,243,137, 66,244,169, 76,227,196,101,124, 56,156,194, 76,200, 27,
- 85,184,163, 92, 86,128,184,200, 36, 17, 70,239, 71, 56, 78, 62, 30,238,186, 48,208, 13, 50, 12,240, 64, 98,112,234,206,223,252,
- 91, 16,242,115,184,115,245,155,151,185,164, 38,219,227,247, 61,102,207,124,152, 19, 92,230,211,117,121, 95, 22,115,154,223, 48,
- 41,198, 69,146,102,150, 25, 28,207,108,101,164,105,167,246, 68,103,101,154,176,246,198,121, 13,155,201,165,226,164,193, 46,152,
-111, 61, 90, 79,118,190, 32, 17,153,238,239, 72, 49,153, 67,238,  9,106,194,193,234, 12,141,242,195,141,146,152,223,  2, 48,118,
- 53, 61,  9,  3, 65,116,167, 31, 43,  8, 42,  9,225,134,137,158,253, 27,254, 67,127,159,  7, 79,106,  2,137, 81,160,197,118,118,
-220,153,221,217, 22, 10,234,149,164, 41,109,183,179,175,111,222,155,247,183,126,  6, 78,225,113, 26,144, 54,166,119,247,135,  3,
-151,206,161,248,127,132,139,170,146,  1, 66,189, 16,159,116, 84, 63,  7,250, 67,222,130, 76,125,124, 17,155, 17,100,112,194, 56,
-145,246, 13, 33,177, 56,186, 40,247, 55,206, 58,196,155, 49,221,206,154,134,218,106,135,239, 91,243,213,154,137,109,150, 11,115,
- 51, 42,158, 95, 17,212,157, 16,190, 67, 87,159,111,254,208,107,112, 50,167,131,113,225, 78,242, 61,  2, 52, 26, 75,129,254,142,
-111, 40,171,156, 61,178,174,233,187,222,227, 44,183,143,179,249,196,218,157,195, 85,181, 71,164,105,  9, 83, 91,248, 43,250,172,
-247,213,110,255, 33, 34,156, 86, 61, 29,141,174,203,223,239, 82, 26, 61,159,247, 50,198,242,158,216,198,  9, 37, 82, 27,248, 50,
-110,100,224, 90,126,110,181,159, 21,236,196, 86,202,116, 43,252, 82,217,155, 24,147, 56, 34,167,103, 65,169,233,133, 98,249,137,
-214,247,135,241,228,126, 49,122,122, 89,111,180, 15,225,206,116,101,211,229,248,147,214,229,101,133,156,181,157, 76,238, 49, 60,
- 58,146,185,  9,136, 75, 28,203,209,202, 57,134,240,169,241, 40,164,110,170, 92, 24,205,147,166,155, 61, 73,135,101,232,104, 20,
- 45,116,181,169,111,157, 58,148, 19,233, 71, 98,162, 65,210,131,194, 48,132,140,185,155,204,245,124, 48,221,236, 13, 65,241,134,
- 95, 82,202, 29,132,  4, 39, 94,188, 33,132, 73,251,  0,240,155,186, 67, 85,237,226, 45,  5,205,167,232, 20,  9,166,203,135,137,
- 60,184, 51,208,183, 21,165, 63, 60,112,207, 57, 74, 91, 72,232,118,118, 44, 82,148, 96,106, 54,134, 59,  8, 27, 63,133,217, 41,
-226,244,168,197, 59,240, 31,  5,178, 34, 53, 84, 13, 82, 34,122,122,197, 29, 99,177,139, 71,181,157,130, 40,109,124,103, 87,154,
- 25, 60, 58, 24,200,190,233,239,226, 78,226, 93,226, 46,138, 20,119, 78,110, 46, 88,211,110, 51,150, 90,208,237,213,114, 57,189,
-187,128,108,211,122,204, 87,215, 18, 72,235,235,108,145,151,182, 44,243,166,222, 82,229,152,209,149, 57,150, 20,108, 51,113, 51,
- 67,199, 11, 53,231, 14,140,216, 37,  4, 13,162,218,147,125, 41, 95,192,124, 77,235,214, 96, 41,121,107,193,192, 80,154,139,113,
-230,203,200,  6,120,216, 14, 99, 48,212,136, 18,229,112,248, 52, 63,  2,112,118,109,173,  9,195, 96,180, 95,162,173,171, 55, 38,
-142,237, 97,131, 33,178,151,189,236, 23,239,207, 13,198, 16,209, 33, 86,147,182, 73,150,219,151,166,213,141, 50,159, 68, 68, 45,
-109,191, 28, 79,206,229, 47,252,222, 27,185,247, 18,200, 67, 15, 34,190,109, 28,104, 21,159,130, 87,193, 55,188, 16,222, 96,161,
-228,  0,111, 35, 18, 94,247,106, 43,213,138,233,199,197,193,154,  8,244,200,200,179,250,126, 94, 79,210,170,100, 66, 79, 38, 19,
-132, 34,146, 67, 45, 79,165,100, 60,121, 88, 82, 81,209, 35,119, 46,110, 63,124, 76, 96,  5, 85, 55,  9,231, 85,194, 76,204,146,
-241,139,214,134,121, 80, 34, 98,171,105, 36,231,200,236, 85,114, 84,114,195,216,103,193, 38,131,193,235,221,116,189,156, 45, 38,
-122,196, 37,187,130,127,159,248, 94,214,133,109, 87, 42, 45,137, 17,178,  1,122,154,140,104,100,113, 74,162,248,154, 80, 77,144,
-162,251, 78,224, 28,183, 16, 64, 89,179,171,249, 82, 71,253,199,104, 93,226, 19,138,224, 61,  0,240, 12, 35,  7,198,118, 67,245,
-113, 56,122,123,154,191,127,108,191,164,225,226,225, 23,203, 73,231,177,  2, 56, 15,111,125,239, 33,  1,159,172, 98,213,124, 38,
-207,202,172,219,194,166, 11,133,152, 63,247,201, 77, 64, 81,167,238, 14, 71,140,196, 69,221,115, 11,246,196,139,208,240,215, 25,
-238, 77, 15, 88,196,  0,168,164, 95,183,130,106,208, 61,180,185, 80,229,212, 93, 16,109, 30,121, 50,208, 92,223,190,  6,155, 56,
-251, 29,174, 42,128,138, 79, 66,174,150,237, 66,104,145, 53,182,152,160, 68,108,156,159,113,201, 44,234,122,189,121, 20, 90, 12,
-173,186,162,  3, 82, 46,231, 32,194,203, 16, 68,243, 49, 61,162,218,139, 76, 71,188,225,233,117,107, 82,181,187,179,173,200,100,
- 21, 74,113,149,108,224, 57,120, 75,113,  7,185,131,112,125, 91, 23,204,131,138,182, 19,255, 97,193,187,172,206, 32, 23, 35,  8,
-255, 20, 26,145, 59,177, 19, 73,143,117,170, 97, 59,161, 67,162, 97,123, 58, 48,231, 72,173,231, 47,171,217,179, 62,218,253,105,
-183, 57,110,182,167,237,129, 31,206,101,193,196,153,215,140,137,146,  0, 25,209, 76,255,252,179,172,109, 68, 40,238, 18,251, 61,
-  6, 83,210, 41,124,127,141,139,106,147,149,  6,241,216, 45, 67,  9, 25, 37,121,101,149, 16,122,220,231, 48,158, 12,166,139,116,
-150,147, 92,191,159,171, 18, 43,243, 26,215, 11,162,  9,248, 17,128,181,171,233, 73, 24,  8,162,187, 45,109,193, 30,138,146,200,
-193,131, 55,227,221,255, 31,239,254, 11, 15, 68, 37,193, 16,144, 82,186, 95,238,236,204,108, 63, 48,193, 24,111, 28,104,105,182,
-203,236,155, 55,243,222,252,133,127, 31,161,248,228,167,174, 27,199, 67,248,206, 71, 89,254,134,136, 39,163,130,142, 31,164,217,
-140,134,166, 89, 58,215,171,209, 72,114, 88, 74, 80, 47,152, 24,150,143, 16,123,137,163,159, 44, 76,211, 78, 28,146, 98,216,102,
- 55,159,185,  5, 44,145,109, 26, 32,160, 81, 46,233, 79,222,214,136, 90,133,184, 38,245,234,179,189, 95,230,111, 91,155,102, 20,
- 46,131, 47,132,191, 75,123, 80,226,  8,170, 37,216,251, 13,106,191, 25,116,231, 61,244,141, 75,124,  8, 36,120, 38,204, 86,164,
-141, 56,189,239,212,203,110, 59,  7,117,171,191, 22,209, 39, 60, 84,139,202,247, 80,174,172,135,235,124,209, 64,216, 50,109,130,
-179, 91,163, 84, 42,102,166,138, 90,169,224, 97,142,193,130, 70,  7,166,168, 13, 61,157,  1,227,195,239, 90, 14,253,121,207,212,
- 87, 51, 81, 51,227,188,207, 49,138,247,  9,193, 82, 76,158,238,170,231,205,238, 85,187,156,183,132,190,100, 60,233,175, 45,167,
-229,222,248, 29, 76,212,173,  9,135,184, 63,114,246,106, 83,235,227,162, 40, 13,152,114,178,158,117, 56, 97,121,212,216,195,237,
-178, 76,221, 98, 93, 80,146,  1, 87,200,130,165, 27,119, 94,139,104, 72,192, 36,183, 29,160, 91, 27,  3,165, 27, 41, 92,236, 48,
- 40, 36, 72,195, 81, 47,145,235,193,121, 77,185,181, 32,238, 36,136, 66,193,104, 64, 82, 78, 72,142, 82, 82, 50,102,193,201,113,
-218, 98, 14,138,254,253,  1,239, 89,164,195,  7,197,  5, 84,125, 70,110,132,249, 36, 77,180, 13, 75,249,221, 88, 21, 55,250,195,
- 98, 26,192,230,125,182,243,200,103, 11,179,174, 73,129,168,162, 17,  3, 46,123,101, 85,199,152, 29,  1,187,236,163,117, 97,105,
- 81, 59,160,214,205, 68,103,209,114, 23,220,205,185,245, 74,132,237,246, 63,108,171,227, 82, 68,159,237,248,150, 29, 36,229, 73,
-104,126,146, 76,203, 32,108,135,248,158,192,100,133,244, 97,254,120, 59,189, 81,230,180,218,125,172,235,245,151,170, 29, 24,200,
-184, 76,230,133,  3, 51,146, 73, 98,148,105,253,247,139,116,118, 53,201,253,103,144,222,115,107, 16,206, 21, 11,201,166, 38, 31,
- 81,168, 19, 65,232,215,192, 83,160, 47,132, 77, 69,122, 35,171, 70,168, 76, 22,101, 81, 93, 23, 85, 57,153,130,220,172,246,177,
-171,209, 66,133, 38,109, 92, 19,139,181, 29,124, 89,223,  2,144,118, 62, 59,109,196, 64, 24,247,216,251, 47,  1,132, 82, 81,169,
-226,202,  1,  9,222,255, 37,120,  6, 14, 61, 21, 65, 43, 82, 68, 67,214, 89,219,211,157,177,199,235,221, 72, 20,212, 91, 14, 81,
- 86,177,189,159, 71,223,204,252,166,250,255,165,241, 69,133,156, 58,170,165,195,130,206,243, 25,137,199,163,219, 69,226, 15, 86,
-121, 62,114,122, 58, 89, 98, 78, 38,126, 44, 83,160,200, 47, 35, 91, 39,108,221,254, 91,171, 78, 76,187,181,164, 36, 14,160, 49,
-227,173, 75,109,147,207,175,212, 25, 92,177, 77,246, 76,140,119,  2,189,143,155, 73, 68,114, 36, 72,135,183,238,226, 84, 95,126,
-241,143,191, 85,109, 18, 18,103,240,254,188,117, 63,246, 99,180, 11,107,214, 74,224,218,246, 92, 35,216,139, 65, 17,175,  4,155,
-156,113,100, 22, 60,161, 61, 28,131, 22,182,244,121,148,123,215,114, 37, 73,  4,218,237, 37,148,206, 13,  7,248,153,141,  8, 69,
-  1,184, 22,129, 94, 21, 12,247, 21,239,200,129, 30, 68,217,224, 54,157,102,158,173,192, 66,191,227,239,  7,225, 95, 70,193,107,
-197,223,143,170, 29,165, 63, 22,204,108,148,185,186, 88,217, 14,239,190,191,113, 58,119, 54,183,228,157, 55,240,218, 40,171, 79,
-  2,143,223, 20,183,152,196,253,165,127,184,183,244,111,234,195,174, 89,175, 53, 84,115,183, 97,209,190,136, 83,110, 20,197,  8,
- 78, 87,120,193,222,146, 89,119,165,178,163, 52,  9,197,  9,190,101, 47,107,254, 81, 92, 86, 70, 47,162,200, 73, 50,117, 20,133,
- 88, 69, 98,100,252, 94,194, 40,  9,118, 70, 37,147,149,110, 98,140,220, 95,206,108,194,212, 20,175, 51,126, 24,229, 76,164, 93,
-128,194,226,159,229, 42, 75,194, 26, 63, 63,148,202, 62,119, 71,151, 67, 36, 66,226,231,138,140,179, 39, 22,225, 99, 71, 76, 43,
- 88, 90,255, 83,226, 84,  0, 80, 65,189,163,236,229, 98,102,101,207,163,125,242,180, 92, 76,197,145, 30,114, 35,171, 40,251, 24,
- 59, 67,224,130,158,127, 25, 44, 52, 53,211,116,189,239, 63,104,187,195,188,112,128,223, 62,157,135, 68, 82,111,170,166,130,153,
- 10,234, 90,215, 21,245, 33,193,205,230,118,211,156, 31,130,255,249,250,235,105,247,240, 50,252, 25,148, 77, 94, 50, 66,  3, 45,
-196,110, 25,196,222, 29, 44,169,124,219,128,217,171, 56, 18,148,247, 66,168, 65,  9,138,206, 65,122, 26, 35, 10,  9,236, 28,208,
- 57, 94,138, 14,234,211,230,108,211,125,237,170,174, 54,218, 14,126,112,142,211,173, 30,151,  9,137,132,233,250, 43,  0,101, 87,
-211,147, 48, 16, 68,103,233, 82,208,164, 96, 15, 24, 19, 79,198,120,240,226,255,255, 13,254, 15, 14, 26, 67,160, 86,186,173,237,
-142, 59, 59,251, 85, 44, 26,184,  2,129,126,189,157,125,243,230, 61,121, 17,148,139,243, 82,152, 20,232, 97, 60,113,147,106,108,
-254,198,117,140,156, 12, 21,197,242, 52,240, 24,163, 51,147,243,248,141, 60,108,204, 54,242,149,133,  5,122, 80,  3, 73, 86,182,
- 45,188, 20,196,125,153,211, 87, 74,188, 93,232, 67,213, 31,  7,171, 60, 66, 88, 72,194,181,198,154,198,206,169,115, 65,155,168,
-206,118,169,235, 14,190, 58,253,124,191,217,238,222,100,198,191,107,106,118, 61,124,235,154, 34, 39,221, 56, 99,155,140,251,178,
- 86, 68, 89, 76,204, 60,179,129, 78, 23, 72, 19, 61, 33, 33, 83, 17,197, 49,228,177,200, 37, 44, 96,167,223,254,242, 84,188,147,
- 68, 39, 57,230,109,  2, 11, 57,112,118, 18,196,104,192,156, 37,146,128, 87,190,108,233,147, 43,213, 36,177, 80,215,246,143,133,
-180, 88,179,219, 40, 40,113, 80,222,109,138,215,170, 42,103, 54,252,214,174, 16,169,106,115, 82,194, 95,  2,172,151,229,142,204,
-196,180,107,220,216, 71,191,109,247, 12,238, 79,166,186,151,179, 86,100,152,108,168,197,212,241, 58, 15, 85,107,244, 29,217,118,
-215, 54, 15,108,195,104, 90, 50, 48,226,236, 37, 25,108, 14, 48,189, 19, 53,  8,136,222, 70,255,178,151,236,  7, 50,243,126,193,
- 12, 92, 97,143,143,232,114, 75,156, 45,152,224,197,198,198,210,216, 65,143,224, 96,230, 88,106, 79, 70,226,175,153, 75,156,150,
-244,132,101,128,137,166, 19,100, 23,167, 62, 93,254,188,185, 34,217,151,147,144,246, 39,226,232,193,196, 65,135,213, 81,  7, 88,
-135,  1, 68, 34,120, 79, 26, 24, 56,170,187, 81, 36,200,238,167, 93, 48, 44, 39,190,217, 11,169, 51,140,247,195, 28,112, 34, 30,
-111,250,213, 97,123,174,149,120, 78,185,151,176,243,110, 47,120,179, 92, 53,170,177,106, 25,105,202,100,  6,119,  3,247, 15,171,
-199, 85, 94,152, 15,212,234,240,126,252,168,  8,220, 21, 71, 79, 51,124,153,175,204, 37, 45,  6, 54,236,153,228,143,104,158, 57,
- 82, 74, 11, 50,126, 16,206,163,136, 37,121, 44,244,234,237, 96,  4,207,169, 57, 47, 31,212,222,165,163,175,177, 83,170,169,219,
-125,145,175, 77,233,217,233,230,216,127,154,183, 22, 98,217, 96, 99,171,180, 12,252, 48, 49,223,120, 63,  2,144,118, 45, 59, 13,
-195, 64,208,107, 59, 15,210,180, 32, 33,149, 59,156,249,  5,254,255, 11,248,  5,  4, 18,162, 45, 41, 37, 36,177,241,174,189, 78,
-210, 52, 21,143,107, 14,137,228, 36,179,163,157,157, 89,253, 31,230, 14,243, 40,211,141,213,234, 83, 16, 63, 13,253, 81,114,192,
- 65, 60, 13, 98,193, 86,194,200, 22, 49,105, 29,114,190, 51,111,234,233,105, 70, 38,146, 75,129, 75,129, 94, 62,240,180,220,155,
-129,182,121,252,180,190,  5, 81, 16,  0,109,219, 94, 66,204, 58,  7,100, 86, 41,156, 79,207, 53,148, 18, 72, 56,221,181,164,121,
-248,148, 15, 45,131,153,204, 67,243,158, 39,223, 59, 70,195,132,219,220, 12, 93,120,165,101,254, 75, 67,223, 72,153, 51,254, 33,
-188,179,169,230,137,195, 88, 18,254, 16,255, 98,  7,174, 31,201,147,233, 30,103,243, 32,172,195,123, 96,223,104,196,165,146,131,
-223,182, 14,121, 26,238,209, 80, 11, 83, 11,168,232, 72,243,176, 49, 60, 52,229,253, 23,148,209, 83, 86,184, 55, 92, 94, 93,232,
-108,  5,251,237,215, 77, 41,171,218, 85, 68,147,216,161,243,232,180,173,238, 62, 79, 95,109,142,192,167, 56,115,  9,203,166, 88,
-  8,251,160,224, 58, 77, 43, 80, 79, 80,146,150,110, 58,238,108, 31,121,158,173, 29,202,131, 71, 19,238, 28,198,210,115,246,  0,
- 73,161,123,192,156,120,212, 29,142, 41, 49,221,143, 44,187,103, 80,158,151, 52,197,105, 31,114,192,200,216, 89, 12,163,146,220,
- 62,140,190, 39,223,125,247,219, 94,163,227, 36, 50, 92,  1,179,193, 68,131,125, 82, 33, 96,198, 76, 85,  2,123, 22,220, 25, 88,
- 97,  2,235, 48,  6, 65, 70,118, 98, 66,132,240, 67, 31,213, 72, 62,141,249,127,208,151,159, 16,125,111, 24,217,205, 40,196, 48,
-166,205,216,227, 92,160,153,157, 66,179,163,144,198,194,239, 29,151, 81,  7, 33, 68, 18, 53,238,113, 67, 77, 53,  1,157, 74,237,
-248,187,146,234,110,121,187, 94,172,107,199,159, 69,251,124,120,219, 54,187,  3, 50,119,195, 44,196,239,233, 82,153, 46, 50,108,
-236, 26,104,101, 99,155,  6,215,154, 87,121, 82,116, 74, 53,109, 19,227,173, 99, 76, 63,101, 73, 96,  0, 10,165,224, 89, 19,162,
-152, 12,249,160, 48,241,199,253,152,123,123,216,212, 27,170,152,238,214,120,224,133, 40,151, 42,173,186, 13,201,150,202,203, 72,
-254, 24,191,  5, 32,237,218,118, 19,134, 97,104,156,164,148, 10, 52,  6, 47,155,180,111,216,255,127,214,152, 16,183,146,203,108,
- 39, 78,211,174, 12,105, 60, 34,129, 84,154,228,216,177,143,207,177,207, 96,250,163,100,124,148,200,207,102,241,149,150, 63,192,
- 84, 73, 53, 29,128, 44, 23,115,231,164,129,174,122,220,177, 74, 55,140,232,197, 19,225, 26,  8,193,248,230,  3,171,232,246, 62,
-238, 43,186, 69, 24, 47, 44,137,177, 32,114, 97,184,212,152, 92,145,242,195, 82,235, 64, 51,252,224,179,175,179,114,153, 15,169,
-148,184,105,167, 63,117,169,140, 82, 45,127, 52, 34, 53, 99,100,168, 53, 97,119,207,155,123,193,143,109,164,230,206,139,  1,204,
-157,167,159,244, 18,114,250,255,140,228,141, 22,226, 34,  1,  6,223,201, 41, 51,220, 73,251,181,104,246,120, 42, 52, 41,238, 16,
- 36, 64,215, 92, 76, 78, 98,186, 84,163,239, 68, 52,173,100,229, 24,  6, 22,140,239,155,181, 93,190, 52, 31,187, 37, 21,255,130,
-191,122,178,109,246, 82,222, 81,115, 90,166,159,  6,142,205, 22,191,136,113,148,166,254,117,102,201, 97,240, 61, 97,110,210,116,
-123, 12, 60,209,178,241, 91,  8, 85,198, 58,203,124, 29,198, 97,146,220,100, 77,146, 73,226,190,133,192,151,204, 93, 96,226,144,
- 26,213,184, 38, 35,245,231,135, 51,235,127,161,124,  5,241,226,200,  1, 73,253, 52, 20, 21, 73,102,208,224,145, 54, 89, 61,193,
- 12,228,236,  8, 37, 38,137,238,240,164,124, 52,211,180, 42,103, 33,252, 46,197,204,236, 16, 40, 19, 88,197,234,111, 84,194, 10,
-131, 76,227, 72,237, 67, 21,100, 47, 97,114,140,236,249, 32,186,116, 29,137, 85,247,207,199, 56, 72, 14,148,241, 37, 97,126,210,
- 68,219,164,224, 30,239,128,251,147, 51,171,241,  1,217, 35,102,245, 88,242, 98,241,164, 26,  6,214,168,198,234, 22,119,245, 91,
-247,254,218,238,156, 15, 11, 99,190,206,135,254,118,  2, 74,143,232,117,185, 65, 11, 29, 23,208, 24,109, 17,226,153, 76,105,157,
-187, 30,195,249,130,151,254,254,220, 54, 93, 50, 21, 48,114,245, 84,236,135,209,146, 27, 34, 91,107, 74,205, 57,228, 22,  8,177,
-169, 33,119, 86, 18,118,  3,107,220, 83, 30,232,226,109, 13, 43,176,155,131,251,230,118,160,225, 39, 39,158,235,143,  0,164,157,
-209,110,194, 48, 12, 69,227,144, 82, 84,152,152,216,195,164,241,  7,251,255, 31,154,144,246,138, 38, 86, 85, 91, 27,103,177, 19,
- 39, 33,172,168, 18,125,167, 15,180,189,113,156,235,115,205,131,101,251,253,191,201,213, 80,195,122, 24,170,168, 68,106,171,164,
-150,153,142,251,143, 65, 94,  2,235, 74,255,  2,211, 53, 33,145,254, 10,244,182,223,189, 95,102,130, 76, 83,105, 73, 75,  2,211,
-194, 58, 10,238, 83,198,152,143,243,175,150,118, 33,153, 79,144, 80,186, 91, 78,227, 75, 55,255, 17, 69, 86,210,182, 78,185,216,
-201,122,104, 11,255,162,102,191,141, 97,113, 15,147,174, 46,206,130, 66,203,207, 85,240,  6, 17,255,187,220, 39,144,178, 62,198,
- 98,  3,209,210,109,189, 28,  3, 51, 51,129,  3,149,160,216,100,184,158,135,188,154,108,182, 81,111,164,236, 56,208,172,169, 11,
-241,205, 77,236,224,211,167,216,178,102,245,254,135,180, 97, 89, 31,246, 29,142, 72, 44, 53,  7, 23,231, 58,171,190,110,  8,101,
-225,122,215,234,176, 59,124,162,175,131,144,166,199,116, 38,124,  5,100,249,224,154,240,198, 39,138,216,220,108,151,176,117,227,
-  9, 44,138,  5, 18,139,178, 61,226, 83,184,159,236,114, 44,179,168, 57,206,157, 84,231,121,153,229, 85,188,174,250,218, 74,186,
- 75,209, 53,147, 75,120,149,  8, 99, 33,182,  8, 86,170,148,120, 33, 12, 95, 35, 21,211,201,110, 21, 64,  8,215,  1,142,184, 36,
-  5,130, 62,198, 73,197,  8,  3,  8,125,172,122,175,147, 34,179, 49, 47,116,144,143,165,255, 81,246,108, 59, 18, 62,189, 43,118,
-222,149,184,231,110,123, 50,224,223,138,187,154,169,220, 31,188, 52,232,227,243,241,116, 62,205, 72,156, 14,132, 25, 30,101, 50,
-212,147,209,190,120,167, 48,201, 93,179,127,217,188, 14,104,159, 12, 13,228,197,116, 61, 66,136,154,112, 96,144,231, 47,192, 87,
-251,190, 56,108, 90,227,133, 94,247, 99,223, 79,131,197,105,208, 19, 37,168, 19, 86,118,178, 57, 97, 19,164,125, 70,  0, 20,180,
- 43,206,140, 11,111, 50,209, 84,195,201,180,229,101,128,181,145,189, 59, 76,106, 97,216,197,184,214,155,173,113,131,253,230, 40,
-199, 21,251, 83,240, 79,  0,214,206,101,167, 97, 32,134,162,227,153,116,134,208, 22,  1, 18, 44,202,130,255,255, 39,214,  8, 33,
-  1, 27,164,150,100, 30,196,246, 56,153, 60,  8, 32,232,186,149,146,168,113,236,235,220,115,171,255,186, 94,235,120, 50, 53, 43,
-241,191, 37, 80,166,181,177, 12,138, 85,219,  4, 47, 63, 27, 46,211,200, 46, 63,255,120, 17,172,183, 72,137,129,155,218,237,157,
-123,120,122, 67,238, 34, 51, 65,  8, 62,242, 18,171, 67, 21, 30,125,243, 46,122,212,164,101,246,194,236,229, 22,254, 36, 71,102,
- 37,166, 78, 73, 92,106, 51, 84,228,174,236, 98,227,188,203,  8, 33, 44,172, 86,170,144,255,193,139,240,186,208,223,217, 89,186,
-165,243, 39,120,  0,166, 13,216,204,150,194,209,129, 70,132,116,142,190,103,174, 49,186,143, 47,136,196, 77,219,196,112, 84,166,
- 85,241, 82,214,241,158, 78,  4,114,204, 51, 22,102, 36, 95,123,100,132,221, 93,215, 77,211, 34,161,236, 35,188,158, 16, 47,  3,
-178,107, 45,143,249, 94,169,219,250,226, 57,109, 43,202,173, 46, 28,164,189,145,105,168,231, 69,100, 79, 20, 89, 67,151, 42,  1,
-100,167, 77,200,239,253,178, 61, 34, 59,214,164,106, 68,177,  8, 73,146,209,224,138,249,154, 94,  2, 69,255,  1,211, 85,177, 94,
- 89, 32,149, 70,168,108,123, 78, 57,129, 38,101, 95, 83,159,  9,207, 49,171,228,214,  6,  9, 11, 13,156, 39,169, 10,210,232,183,
- 55,197,218,215, 96,185,121, 31, 43, 51, 81,114,183,199, 43,138, 52,200, 47,179,167,234,100,246,153, 20,247, 28,228,145,219,187,
- 56,238,220, 97,188, 74, 29,107, 50, 11,178,204, 34,107,239, 79,244, 90,138, 41, 89, 44,238, 42, 15,181,154, 37,108,252,139, 34,
-232, 84, 27,176, 70,119,247,132,189,114,  7,103, 92,119,125, 44,152, 54,122, 74, 55,  1, 99, 42,135, 72,153, 54, 18, 20, 31,250,
-167, 31,254, 28,223, 93,112,230,108,131, 38,154,110,244,247,164,210,168,189,221,243,142, 21,114, 43,216,251,117, 19,167, 77,160,
- 54,132,206,167, 72, 77, 18,103, 99,  5,222, 54, 83,227,207, 11,240,108, 34, 12, 40,237,180,221, 17,214,102,119,244, 71,195,160,
- 59,  5,159,  2,144,118,101, 59, 13,195, 64,208,187,235, 92, 84,  5, 85,  2,196,  3,255,255,111,240, 80,169, 28,109,115,216, 38,
-187, 62,226, 64,210, 10,168,250, 80, 85,173,242, 16,123, 60,217,157,157,209,127,131,242,171,101, 25, 88,255,114, 41,239, 10, 46,
-244, 58,212,117,163, 56,151, 41,218,212, 20, 13,146,106,209,217,  4,186,232,253,175,152,237,180, 81,235, 93, 34,222,111,170,110,
-160,151,247,174, 41, 10, 27,100,100,124,129,189, 29,111,184,222, 26,123,116,131,  7,178,243, 15,205, 89,234, 82,154, 88,169,167,
-232, 11,159,102, 92, 75, 33,239, 82,118,103,190, 32,194, 74,172,249,234, 35,152, 14,173, 74,182,148,215, 89,100,130,245, 74,222,
- 91, 41,184, 83, 40,  4,225,201,103, 17,196, 56,145, 27,206,225,133,130,103, 46,112, 68,231, 94,186,127,103, 49,168,109, 52,183,
-154,181,194, 70, 83, 59,152,218,130, 80,  9, 94,110, 31,108,183,224,197, 51,100,228,153, 99, 92,179,189,115,135,207,254,246,161,
-220,109,202,215,125, 71,100, 26,226,166,182,206,162,  4,253,235, 81,169,231,102,123, 40,238,128,141, 38, 32,151, 83,101,211,152,
-168,220, 76,122, 30,213, 20,179, 74,126, 72,149,136, 42, 11,246, 92,145, 24, 28, 23, 12, 87,  2,106,152,248,215,144, 81,103,191,
- 41,237, 46, 69,198, 71,100, 79,150, 52,176, 72, 47, 96,246, 41, 58, 14,196,147, 50, 36, 51,216,137,194,131,210, 46,154,232,196,
-136, 56, 20, 35,  0, 29,114,101,157,242, 34,105,192,204,103,195,174, 33, 55,224, 26,223, 89,139,238,228, 89,177,  9,220, 65,228,
-152,110,178,206, 78,134,142,242,187,  5, 16,255,117, 66,105, 98,114, 94, 23,104, 39, 46,230,199,151, 12,100,  6,104,110,190,169,
- 23,159,159, 52, 82,103,255, 21, 44,  6, 43, 59,200,197,219,167,133,227, 35,151,221,185,161, 90,112, 64,  7,236,154, 39,  2, 26,
-161,180, 30,  9, 61,211,108,111,105, 69, 53, 86,133,170, 13, 90, 53,188,157, 85, 39,236,199,250, 32,111, 49,154,229, 70,151,207,
- 35, 55,194,193, 79,174,173,134,146,104, 60, 33,122, 49,150,113,113,143,243,137,  1,222,150,142,211,179,180, 88,160,251,  1, 56,
-132,172,255, 98,195,162,176, 41,217,130,201,162, 53,  5,150,142,160, 55, 71,239,106,254, 37,  0,105, 87,178,211, 48, 12, 68,227,
- 37,105, 73,211, 74,244,128,184,113,232,255,255,  1,159,194,149, 30,128, 82,164, 22,234, 44,182,153,197,142,211,116, 65, 64,143,
- 81,101, 69,206,120, 60,203,123,111,254, 24,191,255,216,143, 62,203,125,205, 82,173,230, 82,153, 39, 89, 96,175,168,224,175,121,
-246,209,226,254,216, 11, 36,196,102,127,  6,118,240,145,104,135,246,151, 95, 94,179,  8,162, 86,119,213,116,117, 95, 61, 62,125,
- 40,198, 68,248,212,153,134,213, 94,157,124,200, 85,219,216, 77, 28,117,116,118,  7,248, 11,212,177, 30,205, 50,100, 12, 49,100,
-  6, 19, 53, 84, 17, 43,167, 41,148,158,101,114, 81, 96, 38,232, 80, 16,186,221,211,203, 28,174,106, 73, 14,143, 19, 83, 73, 23,
-153, 88,160, 11, 81,198,163, 76, 35, 59,122,176,164,165, 18,168, 98, 39,213,156,218,  9,141,132,219,  5, 21, 49, 32, 83,153, 41,
-100, 72,131, 41,149, 74,108,105,150,100, 33,188,173,101,109,186, 46,130, 32,192,237,195,197, 64,162, 58, 24,251, 99, 18, 32, 69,
-215,185,183,237,161,168, 84,153,107, 10,118,176, 62,242, 25, 89, 84,252,131, 52, 98,  5,201, 80,181,220,138, 57, 24,163, 70,177,
- 93,141,213, 25,140, 16,137, 11,233,109,194,201,  4,128, 69, 24,162,196,205,213,177,210, 99,136,247,201, 19,217, 48,108,111,200,
-154, 15,206, 61, 42, 29,244, 84,154, 33, 90, 92,248,163, 85,  3,248, 59, 75, 10,211,126,128, 18, 16,151,187,217, 35,176, 34,225,
- 99,152,185, 36, 36, 75, 70,147,112, 24,139,225, 57,126, 58,232, 61,113,  8,239, 33, 80, 64,117,  2,217,167,  1,246,202, 16,  0,
-186, 51,240,175,178,159, 87,156,204,192, 31,159,155, 81, 73,212,133,  0, 39,114,140, 92,172,204,196,129, 39, 81,208,209,157,212,
- 94,126,219,  4,242,105, 44, 98,144,254,117,125,205,125,192, 77, 61,  5, 98,142,250,192, 39, 73,246,255,156, 59,  4,224,173,173,
-207,229,  4,204, 73,  8,194,122,132,121, 71, 78, 19,241, 84,117,169,110,167,186,116,116,239, 78,144,183,142,223, 25, 92,127,153,
-231, 38, 43, 32, 38, 95,200,217, 84,223,172,205,186,205, 12,236,113,227,218, 46,115, 19,176,115,239,159,191, 94, 54,230,125,103,
- 15,  4,160,  4, 87, 96, 27,103,224,192, 89,196, 78,117,112, 30, 73, 47, 84,208,100, 44,223,235,127,176, 68, 82,145,229,144, 43,
-183, 56, 69,  2,252,  3, 31,135, 32,166, 42,144,  0,237,136,  6,205, 90,148,136, 47, 42,212, 68, 73, 81, 91, 83,200,226, 91,  0,
-210,174,100, 55, 97, 24,136,218, 78,156,  5, 82,150,  3,234,169,135,138,255,255,158,222,122,163, 85,165,170,  5, 90,182,196,246,
-212, 51,118,140, 19,150,110, 17, 39, 14,200, 24, 60,158,229, 45,255,234,207,252,  4,196,126, 54,196, 71, 18, 34,225,215,237,228,
- 82,170, 47,241,220, 47,  3,205, 25, 73, 75, 30, 69,121,222,107,254,235, 54,189,253, 96,226, 14,247, 14,255, 31,117,171,  4,208,
-123, 72,202,145, 77,115, 57,159, 85,139,149,121,120,222,230, 82,104, 39,168,215, 30,  5,142,113, 19, 30, 77,122, 47,129, 55,205,
-147,151,232,188,216, 86, 10, 26, 91,166,205,226,155, 22, 39, 78,152, 72, 68,233,164, 24, 55, 69,149,224,176,126, 80,  8,  3,106,
- 85,171, 61,131, 95, 25,107,220,208,107,156,242, 81, 38, 53,136, 66,  3,162, 33, 65,172,200,178,183,146, 72,217,205, 19,168, 73,
-101,108,146,162, 42,190, 20, 54, 73, 65, 87, 49,138, 53,124, 39,108,105,130,132,142, 50,  1,155,140, 15, 82,190,174,147,181,210,
- 27,131,224,150,224, 54,153,146,116,187,221,192,141,134,197,219, 97, 88, 37, 53,168, 12, 39,179, 88,251,187,203,172, 36,132,210,
-173, 93, 82, 49,130,124,252,142,193,159, 73, 78,138,237,110,  0, 46, 64, 24, 97, 58,146,141,134, 69,  6, 90,218, 83, 51, 79,231,
-156, 38,208, 53, 91, 61,119,  8, 78,170,208, 54,220, 91,200, 95,128, 81,  7,100,222,177, 12,  8, 28,227, 48,159,143, 64, 20,158,
-209,202,174, 10,155,196,249, 31, 68,130,138,168, 61, 71, 66, 71,224,141,231,224,180, 69,195,157,215,  3, 53,124,157, 27,  6,247,
- 46,  6,112, 53,253,196, 47,161,233, 62,114,195,105,211,133, 46,134, 80,222,191,132,120,156, 38,119,228,120, 33, 96, 16,161, 55,
-155,  5,246,167,252,253,  4,219,195,163, 38,140, 97, 71,166, 37, 59,165, 47,177,203,201,251,249,121,221,119, 15, 85,156,254,128,
- 30,244,225,114, 70,239,147,119,244,235,112,108, 85,228, 52,225, 27,211, 98,134,125, 16, 80, 58,229,123,174,101,234, 49, 66,104,
-235,129,245, 54,242,140, 38,217,168, 76,230,235,102,185, 83,187,161, 44,171, 36,203, 81,122,100,249,250,249,178,213,136,142,119,
- 45,  0,100, 62, 66, 83,104,108,217,107, 77,186,153,104, 35,132,253, 24, 25, 66, 22,216,162, 89,187,125,161,197,231,132,252,240,
-237,120, 26,215,208, 58, 61,187, 28, 39,242,246,116, 41,251,225, 74,229, 50, 19,  8,242,131, 47,  1, 88,187,150,222,182, 97, 24,
-108, 82,150,156,174,201,218, 98, 75,215,245,178,251,246,255,129,253,145, 29,119,111, 47, 69,209,184,141, 31,178, 56,146,146, 18,
-187,246,130, 12,216, 49,135,196,  9, 34, 81,159,200,239,241, 31,244, 77,255,  4,228,231,222,241, 99,106, 84,180, 92,162,172, 39,
- 92, 76, 13,159, 27,197,189, 19, 82, 77,196, 80,163,176,133,195,189,239,161,128, 59,112, 63, 10,218,145,103,232, 93,143, 38,159,
- 81,239,243,169, 40,238, 93,245,253,238,  6,172,251,249, 75,105,239,154,139,169,115,107,204,252, 48,249, 88,126,227,239, 96,191,
-149,197,173,239, 25,207, 62,159, 49,217, 31, 70,118, 49,229,145, 82, 73,122, 98, 83,108,217, 95, 25,220,126,168,154,174,247, 25,
-227,159, 67,193, 54,185,223,205,175, 54,149,187, 93, 91, 36,190, 57, 66,223,209, 83, 75,107,229,138,181,  0,107, 71,215,150,107,
-177,132,108,240,178,226,101,186,177,178,166,157,193,171,170,188,180, 42,209, 67,  6, 29, 12,  1, 68, 76,242,184,107,234,183,166,
-110,253, 83,231,187, 65, 22,208, 10,112, 39, 36,162,  3, 79, 88, 66,106,235, 23,207,128,197,246,225, 99,192,173,129,141,167,149,
-129,237,202, 52,102,179, 51,151,123, 81,243,104, 36,130,110,115,136,225, 13, 74,152, 33, 76, 41,114, 89,117, 15,195,177,133, 75,
- 89,112,191,208,103,200,158, 90,169,237, 78, 71, 11,174,216,188,201,212,179,169,189, 73, 44, 52, 97, 90, 55, 96,108,219, 53, 89,
-189, 11, 93,  2,252, 43, 85, 41,140, 74, 15,230, 84, 26, 97,  9,197,200,177, 67, 14,188,148,111,173,242,202,129,  3,117,204,160,
-144, 34, 35,162, 21,151, 63,245, 95, 99, 34, 79, 38, 27,119,  2,156,126,  9,130,145,240,105, 54, 58,206, 55,228,144,131,253,142,
-116,163, 89,113, 39,154,237, 94, 56, 53,107,155, 52,208,166,  7, 74, 62,110, 40,167,108, 39, 82,211,100,131,191, 11, 62, 93,  4,
-239, 14,173,  4, 30, 45,135,179,156,216,119,195, 57,144, 52, 67, 11,  6,212, 12,170,133, 19,105, 36, 15,181,248,124,113, 47,233,
- 51,161,  3, 44,187,224, 93, 97, 92, 16,251,200,146, 33,144, 49,168, 49,  5, 77,223,180,190, 69,116, 55,213,245,215,139, 47,252,
-251,158, 95, 31,222,250,215,189,248,207,212, 94, 24,124, 62,106,230, 52, 51,121,104,169,147, 39, 37,230, 32,132,  1, 53,200, 77,
- 26, 59, 54,186, 26,165,217, 82,186,255,148, 69,169,112, 80,  3, 63, 82,147,163, 52,122,207, 72, 22,111,217,130,139, 15, 13, 62,
-153, 90,218,255, 17,128,181,171,233,105, 35,  6,162,182,199,206,238, 38,219, 18,  1, 61, 20,  9,245,196,145,127,222,255,210,115,
- 15, 21, 18, 72,244,128, 16,129, 18, 54,201,218, 51,245,216, 94,199,155,  4,104, 37,142,137,162,100,181, 89, 63,143,103,222,199,
-199,204, 87,255,171,144,207,162, 36, 89,122, 15, 36,158,131, 19,187,214, 37,180, 19,136,126,208,253,134,198, 66,170, 60,188,197,
-108,174, 55, 80,107,194,157,165,107,162,169, 84, 23,166, 62, 39,229,255,173,  5,250, 50,217,227,172,155,177,247,150,254,210, 54,
-151,223,230, 87, 93,255,253,199,111,143,117,  0, 60,179,115,168, 98, 44, 96,241,212,179,213,141,255,182, 95,168, 79, 65,124,117,
-220,109, 94,139, 20,247,241, 46, 28,187,145, 38,133,219, 29,129, 49, 66, 75,  7,159,172,107,141,158, 55,149,234, 58, 26,136, 52,
-254, 51,199, 66,156,115, 77, 33, 59,222,107,196,189,192, 27, 65, 47,137,117,147,238, 42, 55,130,  0,206, 90,125, 58,159, 26, 96,
- 21,243,195,210, 35,171,245, 71,182,154, 69, 91,196,249, 50,192, 46, 14,134, 73, 64,202,195,186,209,234,164,153,180, 19,121, 50,
- 99, 83,107, 14,132,212,166,169,180,169,140,  1,120, 92,116,143,127, 86, 87,247,207,243,101,247,208,173, 87,142, 52,135,254,240,
- 10, 51, 64,179,  9,156,125,134,163,102, 82,129,156,214, 76, 14,126,105,235,159, 79,114,229,212,157,173,110,109, 32,119,250, 31,
-141,198,  3,145,145, 27,165, 60,254,140,106,101,142, 81,194,130,161, 24,229, 64,219,222,202,152, 46,130,197, 56,  6,179,125,225,
-144, 68,145, 18,221,112, 24,230, 97, 46,  8, 74,242,  6,101,224, 56,160, 22, 26,197, 12, 28,232, 80, 56, 49, 42, 82, 74, 19,142,
-194,186,  0, 83,159,133, 82,180,187,139, 70, 98,177,132,103,242,173, 30,120,147, 36,182,153,125, 52,140,140,246, 55, 17, 85,208,
-186,163, 97,143, 30,196, 65,228,228,187,148,132,  2,159, 25,217,115,200,117,206,162,221,  1,119,218,222,163,177, 81,122,106, 32,
-189,177,238,101,106, 12,203,237,178,149,135,104,187,184,119,121, 84,180, 80,154,181,235,112, 92,176,199,151, 17,220,247, 39,225,
-255,120,184,160, 87,183,166,120,194,240,181,186, 12,197,187,228,181,192,207,171,168,161,109,116,235,220,198, 98, 40,185,  1,131,
- 96,148,181,145,126, 19,208,214,215, 67, 30,226, 85, 47,108, 79,254,234, 86,207,253,  2, 25,203,112,195,166,190, 12,107, 61,219,
-249,166, 92,178, 56, 23, 13,111, 90, 54,131, 36,110,237, 67,120, 30, 40,101,  5,132, 64,149,208, 29, 50, 66,111,130,130, 57,236,
-253, 42,116, 89, 77, 62,191,138, 36, 18, 10, 82, 78, 14,  5, 76, 37, 99,244,167,172, 84,253, 87,  0,214,206,109,167,109, 32,  8,
-195,179,  7,175,109,154,164,196,149,138, 16, 69, 61, 75, 60,  1, 79,205, 61, 15,193, 93,239, 43, 85, 69,173, 26, 32, 96,  5,145,
-216,241,102,167,158, 61, 56,107, 19,  4,149,250,  2,145,172,140,102,103,255,249,247,251,255,155,127,230,159,206,  0, 19,181, 99,
-140,130,120, 30,157,219,187,111,109, 59, 11,143,245,206,127,183,127,216, 74,123,204,205, 83,193,252, 36,  8,232,184,249, 70, 47,
- 91,249,231, 60,121, 43,210, 66,138, 84,  8, 37, 25, 79,146, 18,244,217,143,219,249,114,173,200,215,  4, 30, 75,109, 45,151, 33,
-254, 15,183, 42, 17, 17,156,217, 31,224, 99,150,126, 65, 61,  3,189, 12,225, 71,171,231,138,204, 68,130, 41,247,166, 11, 51,135,
- 58, 95,155,114,177,154,230,202,109,131,167,132, 17, 22,167,211,226,228,120,255, 98,118,125, 62, 43,231,182,227, 79,  0, 62,  2,
- 47, 64,126,135,230,222,159,240,208,142, 13,239,149,156,188, 74,223, 29,140,243,118,246,168,116,145,233,117,157, 52, 68,184, 48,
-141,230, 85, 59,170,115,154, 30,115, 50,245,194, 72, 74, 37,249, 40,149, 89,202, 95,103, 42,203, 85, 99,232,125,221,229,109,117,
-245,243,250,242,102, 81, 46,235, 55, 35,117,124, 80,124, 61, 58,188,186, 91,174,234,166, 45,231, 84,182,149,141,163,  4,239,106,
- 92, 32,215, 40,126,223,235, 95, 15, 88, 82, 61, 19, 27,137,130,152, 54,132, 81, 36, 17, 26,132,165,108,177,128, 20, 18,206,113,
-215,125, 59,  6,217,221, 11, 40, 93, 95,232,232,192,189,  4, 11,239,216, 11, 34,178,195, 15,192, 83,195, 59, 11, 70,120,216,186,
- 53,192, 68,205,100,216,222,241, 89,115,116,220, 44,123, 83,191, 69, 16,179,136,186,211, 49,103, 34, 42, 47,115,204, 45, 35,208,
-113,225,185,143,111,103,172,147,209,177,167,169,176,248,130,225,192, 99,246, 35, 53,  5,195, 57, 17,190,191,239,217, 61,251, 58,
-240,  0,108, 99,243, 66,115,199, 97,115,119,  9,168,102,248, 19, 60, 72,230, 62, 47,110,151,  4,139, 79,174, 88, 89,255,225,210,
-112,120, 31, 28,179,149,109,238, 47, 17,106,186,238,159,139,236, 97, 83,189,220,186, 13,143,146,106,152,  7, 52, 58, 12, 57, 79,
-236, 95,146,138,201,135,241,167, 21, 61, 71, 34,193,173, 49, 88,235,106, 79, 40,186,231, 58,172,166,141,195, 38,191,128,161,133,
-184,161, 61, 42,197, 45,217,143,213,218,122, 28, 67,124,167,231, 85, 88,  3, 12,218, 59,176, 53,169,182,151, 86, 10, 18, 96,206,
-  1, 32,109,249,216, 76, 15, 52, 17,  5, 79,135,181,188,203,230,113, 16, 82,247,218,156,116,121, 90,196, 36,130, 17, 51,135,246,
-190, 68,153,100,127,  5,160,237, 90,114,219,134,129, 40, 73, 81,150,140, 70, 77,224, 24, 48,208, 58, 40,178,233,166,232,  5,178,
-207,  5,114,190, 94,162,219,228,  4, 89,101, 93,160, 72,186, 40,208,124,225, 56,136,109, 72,161,134, 25,206,144, 50,105, 59,159,
- 77,189,242, 66,254,209,212,112,222,204,155,247,244,255,  8,223,111, 94,179, 82,165,177,221,148,115,178,250,155, 81,155,125,129,
- 44, 37, 18,245,202, 46,145,183, 41,213,109,217,137,205, 28, 93,201,224, 70,190, 88, 52,191,249, 48, 96, 23, 54,252,163,  0,178,
- 76, 99, 22, 76,198,  7,190,214, 25,110,124,163, 60,116,178, 81,231,205,125,193,169,128, 71,169,247,156, 47,139,249, 75,189, 14,
- 29,198, 89,197,250,108,248,166,148,176,161,200,119, 79, 35, 77,242, 94,140, 91, 49, 46,202, 89,189, 40,132, 29,170,178,206,196,
-241,159,171,211,135,135,187,112,241, 45, 93,124, 88,228, 71,101,117, 50,157,204,  5, 20, 66,238,200, 60, 47,123,251,159,119, 15,
-190,142, 38, 55,139,169,168,235,166, 86, 37,232, 22,182, 20,158,106, 98,160,112,103,102,185, 82, 79, 68, 80,252,136,251,183,175,
-203, 18,  1,169,184,156,214,231, 23,183,215,147,199, 27,204,217,155, 22,119,115,213, 47,190,143,182,191,141,  7, 63,127,253,251,
-113,118,126, 37, 28,221,119,232,166, 79,243,221,157,193,157,249, 48,135,220,201,  1,184,186, 61, 34,132,182,199,205, 81,124,102,
-217,105, 90,197,116,111, 34,  1,208,200, 53,139,122, 73, 43,211, 50,  2, 79,236, 69,213, 18,176, 81,150,205, 47,130, 16,134,227,
- 10,242,114, 94, 70,120,177,220,144, 32,218,200,208, 57,148,125,108,204,211,128,117, 57,235,181,124,227,221,148,140,224,167,100,
- 92, 69, 86, 70,240, 20, 44,183, 93,172, 23, 66,229,138,156,244,133, 26, 21,140, 76,130,144,142,220,156, 98, 42,209,177, 70, 21,
-207,182, 51,123,  6,  2, 36,102,105,176,224,106,157,190,137, 93, 46,116,167, 26,214, 29, 36,177, 67, 94,199, 63,106, 83,136, 12,
-221,136, 73, 18,226,229,170,  2, 94,164,235, 32,151, 43, 12, 54,105,250, 66,154,232, 36, 84,200,119,202,  9,240, 35, 87,185,163,
-157,184,193,186,122,197, 40,120,180,245,233,122,118,153,106,213,188, 22,159, 66,126,141, 89,157,170,122,149, 49, 24,127,179,189,
-234, 75,137, 16,158, 44,197,230,160,102,  6,115,164,198,210, 39,  2, 97,101,141,177,  2, 52,121,125,200,150,112, 17, 89, 20,  2,
- 83,104,232,160,236,130,187,151,116, 39,188, 14,116, 32,200, 76, 56, 98,158,113, 33, 94,182, 94,189,221,211,150, 24,103,105, 86,
-224,244, 85, 55,246,128,107,  3,129,132,219,248,248, 11, 57,208, 35,128,112,243,137,238,174,  3,215, 22,120, 22,128,180,107,107,
- 73, 32,  8,163, 51,187,234,238,154, 21,164,221, 40,  9,242,193, 30,138,138,192,168,254,113,127, 34,232,177,199,232, 37,130,162,
-204, 36,211, 50, 75,215,205,157,253,154,251,206,152, 69,145, 44, 34,226,138,224, 55, 51,231,187,156,115,126,210,  7,206,231,243,
-181, 90,173, 94,175,255,103,228, 72, 63,170,213,106, 24,210, 83,112, 52,246, 90,103,195,229,114,121,105,121,169,211,105,127,233,
- 76,194,228,113,133,239,127,  3, 88, 75, 68,179,141,229,138,221, 63, 58,220,220,221,110,212,239, 56, 69,152, 49, 83, 57,193, 76,
- 62,179, 78,163, 43,236,202, 28, 17,161,124,247, 18,101, 92,172, 42,  0,104,239, 96,127, 99,103,171,121,223,136,233,151, 64,106,
- 59,240,204,192,187, 91,100,176, 90,230,178,218,226,142,252,174, 81, 33,244,  9,250,  8,162,143,100,193,243,135, 36,121,  5, 66,
-175,135, 65,120, 21, 13,219, 95,240, 81, 68,226, 18, 56, 31,132,129,130, 21, 39,187, 94, 12,118, 43,165,181,153,169,110,123,120,
-251, 52,232,209,251, 49, 42,228,104,128,186,121, 63, 67,113,250,180,151, 97,117,155, 28, 14, 60,119, 54,112,131, 44,238, 13,162,
-235, 70,247,236,242,241,228,178,117,209,234, 62,244,195,155, 56,234, 64,236, 51, 18, 19, 58,127,121, 59,190,105,158,190, 15, 66,
-  4, 69,132, 42,222,212,114, 97, 21,251,243,221,164,192,148, 31, 29,148, 17, 69,117,169,116,202,132, 58,137,132,212,216,192,146,
-  2,233, 40, 77, 20,144,154,159,114, 56, 93, 34, 88, 85, 98,  1,  0, 75,200,209, 96,191,152, 35,116,120, 92,204, 93,107,134, 40,
-139, 32,221, 69, 52,188, 49, 82, 64,148,128,  9,221,172,235,247,209, 14, 19, 45,107,164,100,120,106,188, 32, 60, 98,112, 26,144,
-216, 86,220,144,241,137,127, 94, 80, 32,141, 64,148,152,123, 42,207,155,164,200, 39, 29,251,193, 86,122,148, 38, 75,200,224, 49,
- 73,201, 70,211,254, 52, 49,106,232,137, 65, 90, 86, 64,  9, 59, 86,101, 10,198,167,223, 45, 40,110,217,163,219,159,154,208, 30,
-248,235, 88, 76, 98, 52,137, 77,192,158,229,202,250,225,168,175,114,150,201,127, 42,182,138, 51, 72,208,222, 89,113,134, 99, 56,
-186, 51, 46,  6,171, 37,127,142,190, 19,141,132,239, 14,248,174,224,198,195,136,  8, 21, 33,186,209,199, 52,223,165, 27, 52, 33,
-204,124,131, 99, 20,193, 75, 66,138, 25,166,189, 13, 24,193,144,159,211,142, 74, 98, 88,110,235, 34,172, 93, 65,185,116,187,244,
-255,136,145,112,251, 17, 46,181,250,152, 50, 93,  9, 44,149, 77,126, 59,159,184, 87,147,132,159,  2, 80,118, 62, 63, 77,  4, 81,
- 28,159,217,182,233, 15,106, 77, 17, 12,138,198, 11,145,  4,  8,176, 23,  8, 49, 49,254, 13,198,164,234, 65,210,163,246,223,211,
-171,103, 19, 15, 74,194,209,  8,129,132, 96, 33,128,110,177,203,238,206, 60,231,189,249,177,211,101,149,184,153, 52,123,216, 54,
-147,217,238,219, 55, 51,239,251,249,254, 43, 73, 81,  1,183,223,239, 23, 34,126,175,215,187,126,126,227, 17,134,225,187,193, 64,
-119,103, 61, 12,223, 14,  6,126,117,179, 62,125,241,178,183,176,248,184,  0,101,246,133,233, 55,  6,119, 31,123, 80, 40,189,113,
-240,210,205, 39, 91,175,250,111, 86,194,117,107, 34,193, 28,237,203, 64,111,  8, 66,134,159,232,181,  0, 66, 43, 35,169,  6, 21,
-140,151, 60, 11,183, 54,159,111,191, 94, 90, 91,149,148, 42, 57, 68, 59, 55,170, 81,248,129,139,227,213,121, 86, 91, 96,193, 12,
-225,209, 59, 84,147, 83,179,230, 74,165,135,214, 58, 37,230, 68,158,178,228, 40, 30,223,175, 55,239,176,218,  5, 19,223,153, 56,
- 41,251,214, 25,131, 47,201,229, 24,141, 59,106, 15,167,219,203,247,110,159,159,167, 31,119,135,159, 15, 84,250,158,168,192,222,
-170, 98, 25, 71,163,202,218,117,149, 43,242, 20,120,119,138,119,154, 60,205,196,183,227,232,253,206,209,135,175,135,159,246, 78,
-134,163,232, 64,140,135, 12, 25,244,179, 65,208,101,108,  4,217,126, 18,255, 20,233, 92,181,249,108,234,238,211,233,149,197,217,
-141, 86,123,141,215,231,126, 67,147,198, 71, 18, 79, 13, 41, 14, 25,137,179,213,112,161, 38,143, 48, 75,153,182,110,176,110, 64,
-210,240,197,193, 49,198,201,151,194, 88, 92,105,219,107,193, 93, 48,178, 97,159, 89, 48,138, 21,220,219, 34,113,145,111, 15,230,
-187,118,148,188,219,188, 29,174, 45, 20,216,224,110, 20,222,110, 57, 94,119,217,107, 96, 23, 19, 56,252, 37,238,219,126,114,207,
-227, 87, 22,100, 26,153, 87,142,227,108,137,192, 81,188, 56,152,170, 83, 13, 12, 52,165, 17, 78,177,203,161,216,152, 53, 58,114,
-154,126, 13,159,202,175, 17,166,  6,209,252, 20,247, 90,224, 46,115,219, 26,134,138, 60, 17,220,221,154,190,118,125,225,212,220,
- 63,159, 25,105, 27, 88,187, 14,207, 22,150,231,193, 93, 78,218,134,240,124,168, 39, 30,121,240, 54, 84,254, 43,184,107,137,226,
-131,238,163, 22, 26,215,151,152,233,102, 70,252,140, 93,104,  4,245,178, 27, 87,190,200,131,242,142, 74,227, 86,163, 67, 21,168,
- 65,  5, 25,144, 16,227,132, 30,179, 24, 53, 86,227, 76, 92,166, 87,163,248, 87,148, 92, 68, 87, 81,156,198, 82, 79,250, 89,133,
-144, 20,  1, 38,242,170, 33,122,131,131,161,248,107, 66, 40,102,226,210, 56,143, 11, 59,182,  6,162, 46,201,193, 28,101, 74, 32,
- 80,  3,  5,234,125,146, 17, 90, 26,163, 11, 61,104, 32, 29,235,148,130, 62, 89,244,232,123,228, 76,207,232,197,  3, 34, 33,148,
-188,154, 97,252, 17,128,177,107,235,109, 26,134,194,177,211,180, 73, 53, 96, 33,169,132, 88, 25, 66, 43,237,107, 95,120,226, 97,
- 18,208, 31, 59,  9,129,144,248, 31, 45, 55, 65,138, 64,226, 58, 36,210, 78,108, 74,154, 56,137,141,125,124,105,154, 70,130, 60,
-197,169,123,108, 89,206,201,241,231,207,223,249, 55, 62, 19,134, 97, 16,  4, 81, 20, 73, 55, 61,155,205, 22,139,197,106,181,226,
- 49,184,185,247, 60,143,199,227,188, 94,204, 11,113, 44,189, 63,255,151,137,253,167,211,233, 98, 62, 79,211,180,113, 31,132,225,
-  0,170,201,162,185,134,119,134,110,191,255, 17, 26,229,166,110,  6, 65,  2,246,121, 55,  2,232, 80,164,127,226, 31, 33,211,104,
-253, 26, 77, 38, 89,186,233,131, 17,131,201,248,225,224,244,201,163, 55,243,197,243,179,167,252,225,201,100,124, 17,175,253, 48,
-248, 28, 45,121,241,104, 56,228,245, 63, 45,151, 90, 20, 18,157,140, 70,155, 52,251,249,237,135,122, 67,225,203,120, 56,240, 31,
- 62, 62,125,247,234,245,203,179,103,124, 72,239,141,239,175,227, 88, 24,249,176,212,204,100, 81,245,210, 98,188, 28,226,206, 17,
-104,188,254,134, 37,149, 81, 94,204,106,251,171,141,120,164,  4,193, 50, 56,119, 74,215, 52,239,229,116,236,121,135, 37,126, 91,
-112,231,219,178,206,146, 31,167, 91,118,119,226, 31, 36,118,249,226,253,249,245,174,243,224,110,232,247, 61, 23, 35,238,211,133,
-210,189, 43,114, 54,254, 33, 20, 59,120, 83,208,175,151,213,175,171,138, 18, 98, 51,114,124,195,113,110,123,209, 58, 59,191,178,
-143, 15,122,174, 16,202, 32, 93, 65,254, 44, 51,138,  9,238,244,186,126,137,  6,  5,115,115,193,183, 97,132,  7,232, 37,111,241,
-154, 72, 21, 73,147, 78,153, 80,107,  3,  2, 89, 74,208, 73, 98,136, 50, 95,173,150, 20, 21,179, 23,192,196, 29,180,128, 33,164,
-168, 47, 72,121,125,164,  1, 71,195, 82,167,160,250,175,197, 88, 24,128,200, 10, 32,109,136,185, 43,148, 15, 81,166,115, 13, 41,
-218,140, 38,211, 86,245, 40,216, 50,120, 79,107, 42, 78, 19,227, 87,187,200, 47,210,106,119,172,109,237,101,152,150, 91, 15,173,
-179,129,107,  1, 88,  5,208,195,  3,153,125, 12,215, 19,115, 72,254, 61, 70,109, 26,  3,250,228, 84,205, 85, 34,180, 31,  2,179,
-157,240,166,169,196,199,182,104, 56,133,227,169,180,225,220,181,228, 67,147,248,134,244,206,129, 86, 65,  1,111, 86,115,241,251,
-114,202, 58, 31,142,162,189, 91,109,129,188, 89,238,252,191,115, 55,125,250,126,241,197,106,203, 63,209,104, 32,163, 77, 54,164,
-231,184,121,145,237,153,197, 74,  8,158,150,164, 34, 24, 72,229,210,219, 50,214, 73, 74, 98, 83, 33,197, 46, 68,132, 24,127, 11,
-138,156,228,204, 74,186,216,225, 35,217, 17, 42,132, 72,242, 88,248,146,182,162, 24,180,133,177,173,194, 27,216,130,170,161,126,
- 84,197,227,216, 86, 28, 16,138,213,233,113, 86,110, 19,119,241,161, 46, 37, 63, 88, 37,124, 22, 42,  5, 88, 51,180, 37,167,150,
- 22,218,  8, 51, 42,125, 48,  7, 10,152,122,127,  5,160,236,106, 94,155,  8,162,248,204,236,210,213, 82, 37, 32, 88, 73,147,155,
- 39, 61, 22,141,110,143,246, 38,  4, 47,226, 81,  3, 85, 80, 16, 41, 53,208, 96,109, 73, 41, 37,144, 66,175,189,197,139,224, 57,
-249, 27, 90,132,254,  3,126, 43, 38,149,210,143, 88, 53,105, 62,118,119,198, 55,243,118,246, 35,161, 21,151, 37, 76,150,100, 50,
- 73,102,127,243,230,253,222,251,189,127,227,123,169, 84,130, 71,128,224, 98,177,104,219, 54,180,243,249,124,181, 90,  5,124,143,
-182,241, 41, 28, 91,155,155,149, 74,229,214,244,116, 54,155,125, 56, 51,131, 40,108, 79, 77,173,149,203,  3,237,  7,185, 28,180,
-177,243,213, 98, 49, 48,216,239,231,114, 55,245,245,245,114,121, 34,157,  6,123, 31,222,  8, 87,  0,199,  1,223,241, 83,106,181,
-218,203,197, 69,188, 94,152,159, 71,136,199, 91,249,197,210, 18,224,190,122,253,225,234,242,114, 71, 46, 30,242,198,201,216, 25,
-232, 13,206, 70,189,241,249,253,199, 39,207,103, 59,199,146,  4, 93, 41, 44,220,185,119,247,154,125,  3,218, 59,245,198,198,218,
- 58,244,242,120,110, 54,153, 78,193,149,237,173,183,111, 94,189, 86,247,150,220,161, 77,102,174, 39, 83, 19,112,254,248,190,243,
-229,195,167, 71,115, 79,177,147, 82, 97,  1, 22,  3,164,214,168, 74, 82,132, 99,151, 11, 24,214,101,195,188, 66,172,175,158,  3,
-102,248,177,154,235, 99,218, 78, 55, 20,214, 19, 13,253,209,156,207,132,154,244,  7,220, 61,232,180, 83, 35,214,237,115,137,189,
-158, 83,119, 97, 98,122,109,206, 45,198, 18, 66,156, 17,116,140, 26, 46,163,223, 68,127,187,185,127,200,197, 69, 66,158, 93,189,
- 52,153,188,176,251,167,187,215,118,127,123,228,221, 81,175,213,147,140,255,175,174, 39,  9, 29, 69,207, 48,233,116,146, 36,132,
- 36,144,127, 50,193, 71, 45,211,  0,128,  5,168,230,108,180,231,151, 25, 50, 93,110,185, 60,209,247, 88,215,107, 41, 19, 20,  5,
-186,132,116,252,201,  4, 88,243,172, 53,206, 68,183,213,223,135,229,  2,195,216,185,230, 55,181, 28,135,239,143,229,148,210,129,
- 58,141,194,247,123, 41,205,126,206,197,128,241,142,229,203, 98, 50,238, 58,234, 67,139, 36,198,196, 82,136, 23, 68,159,115, 17,
- 45, 49, 26,238,  3,194,160, 24, 26, 12,111, 56,  8,143, 13, 37,178, 70,113, 95,  9, 68, 27,244, 52, 93,131, 72, 76,151, 95,152,
- 61,132,120, 21, 20,175,215,  0,141,242, 58, 65, 29, 99,225, 60, 47, 66,  0,224,255, 21,232,213, 68,192, 40, 22, 87, 26, 87,170,
- 57,209,205, 35,124,  7,174,192, 52, 89, 95,144,158,135, 57, 71, 65,206, 87,196, 33, 64,152,118,233, 80,130, 69,181,104,144,154,
-203,196, 64, 42, 95, 84,222, 93,136,144, 89,141,  9, 66,136,161, 28,168,255,139,165,143,239,167, 24,150, 37,144, 51,210,116, 60,
-231,116, 31,151, 74,251,231,228,228,108, 53,192,244,190,211,183,204, 17,  9,218, 96, 99,181,155,169,243, 41,139,145,102,231,  8,
-126, 48,248,190,142,220, 59,114, 85, 97, 76, 70,169,187, 88,118, 28,235,225, 73,157, 48,102,200,221, 63, 53,116,189, 16,195, 31,
-182,161,138,145, 17,165, 65,134,224, 75,209,204,247,217, 20,157,152, 74, 53,117,193,  2,169, 50, 69,225,168,184, 26, 46, 66, 90,
- 49, 36,171, 13,148,192,241,131,224,229,244,128,129,193,150,227,175,  0,140, 93, 65,107, 19, 65, 20,222,153, 77,210,184,233,161,
- 69,193, 67,171,160,146,174,135, 66, 91,132, 98,205,143,240, 34,226, 73, 60,120, 16,133, 34,158,114, 11,197,171,  7, 47, 27,  3,
- 34,226,177, 30,155, 66, 40,105, 61,120,242,228,189,177,189,180, 24, 65,193,160, 33,164,187,217,157,241,205,123,179,179,155, 53,
- 68,115,154, 12,155,217,205, 50,251,205, 55,111,223,247,189,127,227,123,181, 90,  5,122, 94,171,213,  0,193,  1,202,  1,208, 31,
- 34,106,195, 87,211,134, 70,187,221,126,191,189, 77,113,152,157,102,243, 96,127, 31, 72, 58,141,  0, 32, 14,224, 75,140,219,180,
-161,177,186,182,246,124,107, 11, 64, 28,134, 50,171, 55,245, 55, 60, 15, 46, 29,128,254,102,165,114,122,114,  2, 32,254,116,115,
-115,201,117, 97,112,128,114, 56, 30,214,  6, 56,  5,244,215, 61,207,156,136, 62,112, 24,128,251, 51,117,252,245, 71, 79, 30, 15,
-227,157,  1,220,184,214,206,110,217,117,143, 14, 59,212,128,206, 55, 94,227,248,176,179, 94,217, 88, 94, 93,121, 91,111,192, 13,
-186,247,224,254,141, 91, 27, 11,151, 22,225,  2,234, 47, 94, 46, 92, 94,188,125,247,206,199,131, 15,223, 78,187, 52,239,247,154,
-173,171, 75,229,227,206,151,118,179,117,205, 45, 67,207,187, 87,175, 97,144,196, 54,195, 74,120, 60, 37,164, 31, 69,225,119,203,
-159,177,236, 43,202,  9, 70,252, 80,134,140,178,103,201, 62, 34,120,  9, 33, 62, 22, 28,235,125, 62,229,197,251,232, 36, 12,139,
- 65, 15,232,130, 84,  5,212, 87, 28, 39,143,165,  2, 97,246,157, 69,209, 94,255, 87, 87, 70,105,242,179, 60,239,124, 29,200, 79,
-159,187,253, 80, 14, 66,216, 87,242,188,218, 48, 42,183, 82, 11,117, 26,168, 12,102,232, 50,135,133, 24,148, 56, 93,209,146, 97,
- 36,244, 44,194,210,120,202, 89, 41, 87,178,217, 92, 16,  6,204,242,185, 12, 41,132,128,211, 16,149,150, 66,248,114,248, 91,248,
-179,  5,231, 92,254, 98,127,  4,107,153,175,253,188,208, 40, 44,225,118,152, 33,194,180,104, 71, 51, 24,237,223,192,  8,220, 35,
-138,216,136, 24,106,  8,226, 69,172,107,210, 48,111, 37,242,178,191, 45,127, 19, 42,202,146,180, 72, 19,198, 23,227,228, 93,253,
-133,248,197,238,196, 93,212,244,160, 45,252,220, 78, 87,251,153,154,103,144,134,120,110,197,152, 28, 19,121,141,242, 36,168,224,
-  9, 87, 78,138,222,177,140,  5, 61, 22,187,226,134,224,243,241, 55, 83, 44, 35,  1,203,104,155, 98,111,228, 56,149, 72, 98,186,
-181,137,201, 36,133,209,178,  9,111,105,145, 56, 45, 81, 76,243, 77,125,  5,209, 88, 38,131, 76, 45,167,198, 86,200,196,111,228,
-255, 72,103,114,220,158,168, 83, 45,168, 23,146,163,140,216,149, 79, 13,219,230, 44,202, 80,215,167, 27, 69,129, 24,207,187, 75,
-165,196,161,111, 23,211, 37, 89,124,  1,220, 37, 56,239, 92,152, 43, 20,207,236,194, 32, 26,  2,184,  3,151, 87, 58, 99, 84, 85,
-  7, 10,222,113, 56, 38, 48, 42,  2,207, 14,101, 79, 82,218, 12,249,250, 74, 99,215, 28,226, 62, 30,205, 72,114,182, 46,166, 74,
- 94,138, 90,198,140,  8,174,156,197,  8, 64, 48,208,196,152,206,131,156, 44,227,199,135,130,147,181, 73,137, 59,179, 51,243,197,
-124, 81, 68,163,159,126,239,143,  0,148, 93,203, 74,195, 64, 20,157,153, 38,213, 84, 69,180,130,130, 32,168,223,225,194,  7, 46,
- 68,221,246, 59, 92,248, 21,214,159, 18,116,235,214, 23,130,214,199,166, 69,138,210,154,182, 51,227,125,204, 76, 30,181,136, 89,
- 72,168,100,154,152,120,115,238,189,231,158,243,119,124,111,143,149, 62,126,221,250,125,196,176,215, 20,106,177,126,210,110,135,
-146, 11,160,254,203,171,171,210, 62, 87,111,158, 91, 45, 56,117, 14,253,124,219, 23,234,117,248,185,189,183,199,248, 61, 44,  2,
- 59, 28,169,225,124,224, 88,216,129, 99,207,207,206, 14,143,143, 27,141, 70,179,217,100,252, 14,183,249,165,133,219,201,233,105,
- 45,169,221,209,202,121,130,188, 40,170,217,220,223, 98, 81,101,161,142,221,208,173,221, 29,194,239, 45,248, 34,248, 36,169, 37,
-251, 71,  7,112, 28, 32,125,199, 83,102,169,144,156,202, 49, 47,117,119,123,147,235,255, 59,178,154,115,100,203,146, 38,219, 21,
-186, 99,123,171, 42, 90,143, 18, 72,225,158,204, 32, 17,134,121,141,108,170, 23,166, 91,131,165,181,240, 37,251, 24,249, 83,136,
- 99, 59,163,193,116, 69, 37, 21, 53,180, 88,245,254, 40, 63,250,226, 35, 85, 23,239, 95, 40, 85, 22,161,200,  1,230,140, 56,244,
-204,202,171,238, 31,193, 83,149, 36,143, 64,230,216,166, 50,244,250,140,154,171,138,217,116,212,131, 92, 21, 45, 12, 53,242,195,
- 98,180,141,131,228, 20, 18, 88, 65,118,148, 50,181,195,239, 81,127,166, 58, 51, 31, 45,119,134,175, 26,126,201,120, 77, 58,238,
-138, 51,186,205,154,128,186, 80, 73,176,236,156,231,131, 59, 65,116, 54, 77, 29,177, 57,134,155,219,144, 99,186,228, 69, 49,119,
-105, 66, 43,149,201,143,129, 22, 41, 69,222,176,194,120,142,154, 20,101,189, 54, 59,  9,131,255, 49,181, 90,156,126,252,157, 48,
- 70, 33, 62,144, 38,149,147, 19, 67, 44,156,161,124,230, 87,134,241, 83,223,131, 43,  1,115,186,101,194, 75, 85,227,248,175,156,
-204,122,151, 36,135,224,184, 24,129, 37,233, 94, 34, 86,152,188, 84,128,  9,154,236,  1,137,231,255, 36,210, 99,118, 21,108,230,
- 61, 25,116,156,189, 86,202,171,188, 12,142, 21, 19,223,151,255,216,136, 75, 46,162,226,114,  8,225,173, 29,  7,239,138, 94, 18,
- 33,184,179,155, 38, 37,202,114,109,105,243,177,253, 80,116,115,197,235,170, 96,141, 37, 70, 55, 84, 25,117,  7,157,165,169,149,
-215,207,183,217,197, 13, 88, 43, 86,106, 96,236, 20,  9, 61, 99,233, 70,107, 38,131,193,101,166, 84, 33, 39, 29, 36, 77,142, 75,
- 44,177, 97,121, 18,194,100, 29, 17,126,246, 56,100,147,169, 13,245,107,181,111, 70,216,204, 88,152,200,150,244,196, 50,227,118,
- 72, 33, 94,121, 75,128,240,222,213,190, 55, 83,149,149, 90, 60,  7,153,125, 47,237,246,245, 55,156,205,143,  0,156, 93, 77,111,
-218, 64, 20,220, 93,203,124, 88,145, 74,  3,167, 40,185,181,106,110, 37,215,252,  8,254, 29,127,132,228, 70, 34,164, 86, 54, 85,
- 20,169, 85,111,189,181,193,199,128, 26, 34, 57,216, 94,239,102,223,123,222, 93,187, 77,168, 84, 14,200, 32,100,175,204, 50, 59,
-204,190, 55,243, 63,245,145,134,164, 59,216,117,199,134, 50, 27, 90, 61, 30,143,  9,151,225,229,233,233,213,124,126,130,143,233,
-116, 74,159,113,199,  6,133, 39,147,  9,209,249,225,104,180,140, 99, 58, 33, 73,246,203, 36,161,247,147, 56, 38,229,231, 69,158,
-213,143,162,203,217, 12,116,158,243,115,195,226,205, 21, 23,243,185, 27, 91,186,186,187,156, 93,152,131,143,103,103,230,249,251,
-215,111,234,175, 31,  1, 98,132, 72, 87,169, 57,190, 73,190,108,238,215,135,163,225,109,178, 60, 58, 57, 54, 39,255,124,189,128,
-165, 43,219,165,119,169, 97,244,239, 62,188,255,116,181, 96, 53, 79,196, 40, 87,154, 55,237, 38,199,166,125, 85, 96, 39, 95,198,
-194,183,156, 29, 64,181,  9,104,202,199,135,253, 65,222,219,100,187,123,179,204, 50,208, 62,120,131,  4,  5, 54,230,180,135,253,
- 83,230, 75,122, 64, 99,226, 30,218,233, 70,129,232,118,130, 65, 20, 14,251,221,248,199,239,159,141, 27,114, 36,184,196,244, 69,
- 51, 73, 75, 67, 28, 20,231,126,182,184,226, 49,202, 66, 33,172,247,126, 43,184, 23,164,145,161, 43, 46, 14, 66, 21,109,139,237,
- 83,241, 36,153,130, 74, 82,228,249,  5,238,222,228, 74,134, 80, 67,102,240, 61, 16,224, 99,195, 74, 85,200,240, 77, 55, 24, 60,
-154, 63, 42,220,109, 18,106, 15,227,120,122,225, 37, 87,236, 32, 69,124,169, 24,101, 46,161,246,206,236,238, 43,247, 97, 66,186,
-237,236,255, 10,178, 59,192,242,108,180,225, 83,235,212,129, 86, 55,140,218,215, 12,180,135, 15,106,225,215,223, 38,184,243,125,
- 53,193, 80,175, 94,167, 59,169,150, 97, 82,237, 69, 70,235,162,112,163,172,112,237,117, 67,111, 68, 10,121,127, 77, 40,154,102,
- 86, 78, 17,236,133,238, 33,109,163,156,124,121,127,189,234, 54,179,173,181,203, 47,108, 53,  7,252, 81, 25, 67,233,199,202,195,
-184,211,154, 90, 85,148, 46,152, 68,187,160, 20,237, 59, 24, 96,207,163,118,189,251,135, 56,179,199,100,134, 91,135, 22,253,186,
-170,102,223,108,251,134, 64, 54,103, 39,151,185,185,244,106,243,171,217, 56,101,203, 93,120,169,193, 23,  0,218,254, 96,128,149,
-100,229,227,110,187,206,134, 81,167,187, 99, 25,246, 50,  9, 69,230, 70, 72,141, 48,208, 25,124,128,112,222, 74, 85,223,224, 74,
-214,232,204, 44,172, 11,  2,119,  1,102,  3, 26,245, 25,216,149, 13,172, 65,139,110, 71,235, 85, 62,208,151, 98,133, 20,217,144,
- 97,180,167, 32, 88, 64,238, 79,105,171, 10,189, 11,228, 67,177, 93,231,165,  4,179,  4, 80, 17,159,  5,224,236,106,122,154,  8,
-194,240,204,108,105,187,  5,138,  4,185,146, 24,117,241, 39,168,191,193, 61,120, 16, 19, 46,198,147,137,253, 23, 28,252, 27, 61,
-155,120, 33,122, 48, 33, 49,225,208, 26, 18,146, 70, 60, 53,241, 15,128,144,136,  1,180,116,222, 29,159,153,121,103, 63,202,130,
-209, 61,109,218,221,110,187,157,125,230,153,247,227,121,254, 13,223,199,110,235,245,122,224,233,128,233,124,223,135,107,128,245,
-  0,229,126,191, 15,132,  5,112,167,105, 10,124,  7,242,226, 48, 79,174,203,251, 56, 11,239,130,122,119, 58, 29,236,  3,199,241,
-122,226, 66, 64, 73,146,108,132,215,  7,131,193,117, 79,158, 47,224,193, 28,128, 41, 97, 56, 28,226,234, 79,210,244,211,206, 78,
- 94,252,131, 13, 31,248,102,107,235,225,227, 71,184, 75,192,247, 58, 73, 51,251,168, 28,140, 70,247,146,228,233,243,103,224,236,
- 95, 71, 95,246,  6,159, 63,190,255,176,185,242,226,229,235, 87, 56, 98,251,237,187,111,227,241,221,245,  4,116,126, 23,248, 30,
- 28, 34, 66, 65, 68, 33,111, 59,251,108,  7,134,230, 51,130, 39, 86,146,204, 78,  6, 36,244,222,241,121, 83,137,174,148,107,173,
-118,151,244,161,158,158, 90, 10,207,249,200,166, 51,217,152,216,240, 78, 20, 91, 42,109, 71,  5,184,195,173,150,237, 46, 93,136,
-163,  7,171,113,220,105,239,127,191,192, 96, 93,203,232,216,117,184,117, 69,212,142, 90,191, 50, 91, 99,110, 19, 49,202,214,183,
- 27, 79,224,133, 12,225, 84, 47, 74,152,183,125,249,149,134,114,207, 40, 57,201, 95,156,160, 90, 96,238,244, 27,196, 92, 91,141,
- 36,155,142,119,171, 78, 98,218, 43,157,147,135,150,164,180, 71, 32,202,162, 51,115,186, 58,127, 91,202, 57,109,173,159, 76,232,
- 70,102,171, 50,229, 28,105,104,118, 81,201, 21, 37, 65, 65,192,187,146,113,200, 61,239, 71, 45, 57,166,  6,178, 89,139,236, 69,
-171,106,  8,254,154,146, 96,225,127, 21,247,214, 86, 40, 70, 53,224,110,110, 20, 13, 14,161,  0,227,123, 77,165, 44,164, 37,243,
-128,140, 97, 31, 31, 46, 62,244,243,110,225, 42, 14,106, 47, 69, 85,117, 64, 85, 90,177,242,116, 66,221,  8, 23, 85, 19,212, 89,
-111,107, 81,200,246, 94,215, 28, 16,236,142, 57,110, 17,214,169,165,111, 30, 38,166, 34,118,111,174,232,  0,123,199,172,134,205,
- 64, 10,170,239,186, 45,123,159,254,229,127,163,170,242,189,169,159, 36,166,229,187, 64, 38, 91,110, 47, 78,206, 38,110,208, 78,
-175,248,191, 23, 49, 86, 95,205,162, 84,227,199,229,201,124,115,233,232,252,240,126,124, 71,131,202, 16, 87,102,133, 74, 38,146,
-156, 68,117,209, 47,155,216, 36,239,204,165, 66, 67,172,187,138,201, 88, 72,192,174,222, 26,156,162,231,176,187, 14,101,148,196,
-110, 30,188,254,207, 11,174, 50,215,  9, 85,237, 20,227,159,111, 74,234,155, 36, 46, 47,178,159,  4,186,197, 44,196,252, 17,128,
-183,107,201,105, 24,  6,162, 30,199, 73,212, 66, 81,145, 42,144, 16, 44, 89,113, 21,212,115, 32,216,210,  3,148,  5,199, 97, 81,
- 46,195,  1,144, 88, 32,177,  8, 45,109,113,226,224, 25,127,226,196, 65,252, 36,178,104,187,168, 26, 37,241, 76,223, 60,207,123,
-  3,  3,116,157,130, 85,207,160,139, 31,108,103, 95,207,102, 58,113,223, 47, 22,236,223, 15,136,250,142,245,113, 62,157, 26, 72,
-126,113,117,121, 59,191, 49,159,161, 33,227,146,186,199,177,178,137, 82, 79, 94,240,  0,248,120,144, 27, 11, 30,193,238, 89,245,
- 64,  9,143,156,131, 87,176, 98, 41,122,216,250,237, 48, 17,167,  2, 10, 41,159, 74,181,164,167,149, 19, 41, 95,144, 63,220, 24,
- 69,105, 92, 47,180, 73,150, 76,134,217,193, 40, 61, 59,218,121,220,168,187,135,151,231,183,119,236,196,210, 24,154, 54,126,149,
-105,191, 64,209, 18,138,171, 77, 87, 58,152,140,199,129,181,123,189,237, 56, 20,110, 50,138,  5, 23, 40,188, 81, 60,231, 35,168,
-242,149,124,221,234,122,183, 42,201, 16,163, 44,221, 72, 54,  3,243, 13,253,154,216,107, 65, 21,133, 72,210,241, 96,191,100,171,
-165, 44,168,209, 66,  5, 55,207,174,215, 14, 10,166, 16,117,176,157,  8,123,231,241,107,154,  7,163, 33, 15, 10, 92,113, 16, 72,
-156,  2,204, 30,147,191,161,166,169,227, 54,254, 37, 51, 16,167, 75,238,136,157,246,119,224, 55, 43,214, 49, 97,188, 75, 12,  5,
-162,185,198, 20, 18,250,108, 57,  0,194,105,161, 53,251,204,237,184, 14,  8,151, 56,179,123, 78,166,106, 81, 50,145, 95,167,189,
-177, 54, 64,204,185,221,249,121,221,169,204,  2,189,113,159,201,187, 33,141,160,  1,248,140,125, 83,119,250,119, 25,166,255,241,
-156,107, 48,180, 13,  3,131,219, 70, 23,192,242,148,137, 76,164, 41,100, 25, 78, 85, 18,195,100,239,120,247,100, 43,215,172,218,
-172,229,134, 16,143,196, 30,196,218,224, 30, 70,254, 84, 72, 48, 74, 29, 44,232,  9,108,179,179,112,140,144,207, 48,138,100, 77,
-110,  3, 64,213, 22,167, 43,151,181, 91,253,225, 30,135, 85,110,140, 23, 55,244,105,147,115,176, 20, 72,137,175, 34, 22,  8,221,
-178, 52, 38,163,191, 16,254, 33,  0,115, 87,207,211, 48, 12, 68,115,118,146, 34, 49,128,196, 74,197,  0,252,255,133, 13,196, 31,
-224, 79, 48,192,130,152, 90,145,164,181,125, 71,252,113,246, 57,165, 66,  2,  6,170,110,169, 84,201,114,158,207,239,222,123,215,
-254, 33,188,254,147,207, 92,215, 95,174,215, 51,196,143,195,240,120,255,240,226,  9,159, 42,  3, 54,220, 92, 22, 87, 90, 97, 29,
-207,145,  9,228, 41, 96,197,111, 32,  3,  1, 30, 36,131,208,145,  6, 93,137, 54,203,189, 83,136, 58,  9, 15,186,109,100,250,230,
-167,111, 14,223,109,115,187,234,111, 90,220,236,221,132, 46,252, 88,157,  6,146,241,172, 85, 93,231, 67,112,174,207,187,171,139,
- 19, 88,245,119,207, 31, 79,175, 27, 31, 90,170,253, 69,207, 98,148,193, 38, 20,208, 84, 52, 12, 74, 30,107, 69, 12, 17, 71,124,
-  4,179,156,203, 53, 32, 66,202,116, 68,227, 96,178,219, 29,142,214,185,125,179, 67, 30,143,133,204,208,199,175, 14, 99,192,216,
-127, 15,243,238,158,246, 67,223,181, 20, 18,112, 65, 22,130,144,163,155, 43,124,199,148,208, 91, 56, 25, 34, 22,116,167, 70, 31,
- 38,133, 54, 84,220,113, 54,208,215, 83,155,115,186,  1, 44,242, 10,240,  8,253,114, 76,  4, 77, 95, 33,187,170,159,124, 91,182,
-215,245,175,172, 16,149,196, 94, 39,160, 26, 14,188, 65,149,178,  3,202,160, 31, 85,124, 91, 92,218, 67, 17, 79, 46,137,109,177,
- 80,114,182,117, 94, 97, 89,104,243, 31,167, 21,167,210,153, 81, 25,107,168,225,140,254,212, 55,198,133,213, 28,133,143,140,106,
- 15, 14,167,222,255,100,246,225,239,128,106,121,  0,142, 66, 55,153,153, 68,240,177,238,193,248,217,173,172, 49, 74,251,105,147,
- 10,245,  8, 91, 75,166,211,253,224,118,254, 62,237,226, 52,241,116,104, 25,178,202, 43,107, 48, 22,112,243,241, 96,155,168, 47,
-104, 12, 39,114, 72,  2,205,178, 48, 55,120, 92,163,  3, 35,210, 50,114,195, 96,  8,142, 79,125, 44,100,179,100,216, 51, 46, 28,
- 18, 81, 92,159,166, 32,176,137,199,132,148,  5,178,205,124, 59,209,159,  2, 16,119,  5, 57, 13,195, 64,208, 94,219, 73,219,208,
-114, 67,220,144,144,248,255, 27,248, 10,  7, 14,192,161, 20,137,146,196,177,137,215, 94,199,155, 40, 82, 17, 72, 60,160, 81, 21,
-199,235,153,245,204,236,111,241,251,191,215,119,201, 93, 15,158, 91, 42,202,198,232,218, 96, 41,200, 96,125,194, 32, 62, 79,244,
-206, 55, 75, 63,235,209, 22,112,134,163,120, 25,105,129, 36,233,178,162, 53, 27,183,200, 78,195, 67,173,239, 13,188,156,237,219,
- 48, 52, 10,174,181,220,111,225,170, 54, 55,135, 74, 86,230,185,117,143, 79,167,241, 12,208, 10, 16, 59,  4,173, 85,238, 80, 71,
-237,  8,249,223,165, 66, 95, 41,200,156,238, 35,153,253, 43, 21, 12,164,144, 65, 91,131, 62, 93,172, 99,198, 30,142,253,177,243,
- 45,178,206,222,166, 78, 75, 34, 36,136,217,149, 72, 70, 59, 21,249, 16,150,123,221,152,109, 83,239,222,187,215, 24,252, 91,140,
- 51,154,163, 80, 10,150,241,148,  1, 25,255,191,115,101,222,128, 35,201, 12,109,205,201,120,239,153,206,218,229, 65, 28, 84,217,
- 75, 32, 25,117,147,156, 10,208,240,162, 11, 86, 17,248,183,113,113,101, 23,107,249,233,203,159,207, 24,129,228,137,243,192, 89,
- 35,117,228, 65, 20, 37,159, 78, 32,177,140,123,244,108, 62,245,196,108,216, 85,106,209,147, 41, 94,145, 19, 60, 23, 36, 26, 47,
-179,143,166,220, 35,121,109, 75,169, 76,134, 77,195, 98,170, 42,163, 86,235,135,238, 95,149,151,125,125,248,104, 79, 73,131,  0,
-117,135,149,125,166,146,146,169,249, 22,190,104,236,168, 40, 45,180, 86,186,  2, 83,137,141,  9, 49, 77,155,219,250,174,181,103,
- 63,180,118,232,191,198, 66, 31, 48,251,200,113,253,231,136,218,241, 90, 14,247,130,119,168,112,181, 73,228,238, 32,105,216,163,
-146,108,240, 83, 86, 65,232,209,219,201, 74, 70,119,194, 66, 59,186,151,206, 99,211,105,114, 83, 98,183,244,204, 48,  5,192,  5,
-192, 10,212,138,116, 72, 26,180, 21,221,248,156,111,  1, 88, 59,191,214,  6, 97, 40,138,231, 36,138,179,202, 30,199,158, 10,123,
- 89,191,255,231,232, 23,217, 63, 24,180,107,161,218,220,204,228, 38, 26,163,182,165, 91, 31,164, 80,168, 65,244,103,238, 73,238,
- 57,127,226,251,221, 87,223,220,246,183, 55,218, 78, 99,162,207,204,242,253,178, 97,116,191, 36, 61, 53, 54, 72, 40, 47, 46,197,
-229,248,223,163,247,  1, 34,166, 74,197,190,224, 65,217, 64,132,126,  9,222, 18, 40, 87, 10,155,149,122,173,139,151, 58,203,114,
-245,213,154,143, 86,191,157,104,251,254, 35, 29,175,237,106, 39, 55,214,186,163, 47,235,172,191,  9,114, 41,158, 30,101, 85,226,
-212,154,221,209,124, 31,164,245,146, 87,190, 33, 72, 16,104,184, 26,224,148,  9,247,160, 42, 47,225, 89,213, 62, 23, 77,190,167,
-131,203, 19,224,224, 71,238,231,228,232,  3,184,162, 79,245,  1,149,241,151, 42,171, 59,196,239,232, 51, 20,236,110,104,114, 84,
-232, 35,137,198, 14,221,152,  9,220,181,  9,206,224, 60,118, 26,192, 67, 99,207,222,113,196,210,160, 36, 80,114,150, 68,234,153,
-107,122,156,187, 31, 36,238, 33,123, 58,253,190,118,171, 47,224, 30,169, 19,205,132,245,125, 12,244,132,242,161, 11, 41, 42,225,
- 76, 26,191, 23, 73, 40, 34,133,251, 25, 11, 15,156,153, 80, 94,204,231,158,143,164,176, 89,184,139,107,169,217, 88,136,174,250,
-175, 79,230, 88, 63,230, 59,156, 69,140, 69,188, 66,  7,247,  7,101,167, 51, 69, 97, 83,206,196,115,181, 46, 81, 30,155, 61,233,
-166,227,187,182,226,140,245,128,212, 90,115, 35,240,217,205, 37, 66, 32, 35,245,237,205,142,242, 66, 15,106, 12, 23,151,134, 35,
- 85,225, 11,154,120, 82,130,104,113,134,119,200,240, 59,192,239,150, 13, 57,154,253,244, 13,193,181,130,194,248,109,143,235,175,
-  0,172, 93, 91,110,  2, 49, 12,204,132, 68,104,171, 34, 85, 85,239,127,177, 94,128, 27, 64,187, 73,220,152,196, 33, 47,162, 86,
- 69,124,  0, 31, 88,139, 49, 19,175,237, 25, 51,190,243,173,202, 82,111,250,137,248,254,255, 37,185,248, 11,190, 15, 53,205,223,
-216, 71,  7,241,237, 19, 48, 59,132, 70, 45, 66,221,126, 78,  8,105,201,122,206,223,123,136,215, 73, 69, 18, 49,164, 44,212,145,
- 41,209, 42,137, 37, 20,109,161,212,157, 79,224, 30,168, 44, 95,143,177, 72, 71,195,115, 96,241, 47,253, 98,240,182, 29, 62, 94,
-109,180,244,121,166,221, 21,189, 64,116,126,146,111,154,103,182,110,145, 99,188,195, 53, 92,118, 17, 26,240, 85,242,158, 55, 14,
- 55,176, 14,  1,125,179,197,199,  1, 59, 93,132,225, 20, 72,245, 94,184,207, 11,102, 94,249,  4,220,131,104,214, 18, 53,139,220,
- 84,159,152,214,249,226, 67, 96,109, 53,103,106, 69,210, 85,237, 93,207,165, 96,176,168,206,119,239,104,104, 54, 12, 19,223,120,
- 28,204, 88, 99,125, 19,156,183,243, 26, 19, 51,212, 94, 64,241,186, 90,130,123,  7,202,243, 43, 68,213,138, 64,123,118,215,220,
- 37,181,  4,119, 53, 96, 55, 61, 41,137,228, 56,214,214,179,  4,216,234,116,208,204, 35,  8,149,174, 73,226,160, 82,122,193,228,
- 35, 29, 35,154,247,107,243,237,179,182,155, 61,157,204,251,183,187, 58,247,229,253, 30,210,192, 59, 15,170,177, 30,  0,171,  8,
-228,238, 17,213,110,151, 61, 43,121,157, 94,184,187,151, 10, 11, 76,126, 73, 72,103, 85, 87,138,155,185, 32, 83, 75,116,160,167,
- 60, 64,106, 53,217,108,202,232,127,  4, 24,  0, 58, 21,119, 57, 95, 10,227, 13,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
+ 21,169,119,167,235, 30,198,123, 87,  5,110,217,127,236,233,100,164,226,101, 53,110, 63,211, 66, 54, 19,185, 58,161,155,242,249,
+101,249,181, 25,224,123,131,249,120,238,203,119,243,232,241, 30, 81, 28,192,152, 19,233,156,211, 60,209,229, 52,141,176, 63, 97,
+ 69,237, 61,215,255, 31, 69,201, 63, 84, 11,140,194, 25, 51, 16, 98,109,235,196, 46, 11,198, 54,108,202,170, 48,170,124,156,184,
+199,145, 90,135,209,206, 87, 33, 56, 12,202,233,218,241,101,184, 53, 40,112,251, 64,206,228,206,152,183,151, 46, 60,235, 96, 53,
+184,202,236, 37, 88,177, 37,177, 20, 62,132,225,177, 50,160,117,197,155,113,178,206,131, 86,233, 91,234, 79, 98,154, 66,250, 42,
+ 93, 36, 13,149,159,136, 65,119, 84,234,150,184,221, 83,165, 83,205, 59,122,183,129,164,205,235,235,183,183,183,239,155,245,250,
+120, 60,152,225, 62,169, 89, 19, 89,170,113, 22, 93,189,172,198,177, 26,146, 71, 22, 16,138,233,139,196,248,106,250, 73, 29, 90,
+171,242,145, 75,153, 11, 82, 87,214,148, 13, 20,199, 56,119,117,176,158, 84,163, 38, 14,194,227, 68,240,157, 36, 63, 23, 25,  1,
+ 23,139,221,143,241, 15,101, 30,253,125, 88,241, 30, 95,170,231,235, 57,249, 79,112, 45,243,205, 45,240,104, 11,249,224,182,107,
+255,150,220,233,245, 75,  0,210,174,166,167,109, 32,136,122,214, 94,135, 47,147, 70, 17, 23,154, 75,123,168,250, 15,138,  0,241,
+ 91,144, 56, 86,226, 47,240, 35,123,130, 35,168,135, 42, 74,139,132, 66,208,102,237,101,222,204,174,109, 34,  2, 65, 77,162,104,
+ 21, 91,150,119,119,246,205,155,247,162,245,127,225,187, 10, 50, 45,109,151,118, 48,170,198,168, 77,131,233,  9, 18,169,138,230,
+ 64, 72,200,221, 18, 63, 18,  4,252,149,151, 92,168, 25, 75,106,172,202,244,148,229, 86,181,183, 63,172, 62,109, 15,118,207,207,
+ 47,110,110,174,231,143,143,164,219,234, 38,248,209,129, 23, 53,190,142,129, 46, 51,152,199,221,187,138,109,187,199,165, 86,158,
+140,157,  4,238, 65, 17,159,146, 46,168, 37,180,222,100,242,107, 27,  6,148,101,189,108,105, 41,102, 69, 30,160, 21, 90, 71, 23,
+178,127,208, 90, 30, 20,213, 96,254, 97,253,  8,201,  9, 50, 16, 16,254, 20,223,165,231,112, 60, 13,  7, 53, 89, 99, 14,  6,227,
+223,243,233,204, 45,110, 23,127,127,205,255,220,249,135, 89,182,120,178, 97,103,184,117, 56,174, 14, 71,187,195,129,229,220,152,
+139, 89, 42,111,201, 27, 12,106,185, 25, 88, 46,110,184,227,196, 32,254,196, 88,239,200, 57,174, 56,185,112,197,192, 26,  8,238,
+ 84, 90, 48,253, 36,146,146, 45,  3, 95,139,131, 57,128,174,112, 20, 27,231, 80,193,242,236,112,245,149, 75,242,114,222,103,209,
+196,146, 87, 45,182, 85,103,118,146, 34,102,200, 12,117, 53, 15,245,  9,181, 72,108,  5,159,198,224,254,174,155,244,238, 81,  3,
+166,111,125,175, 18, 95,145,230, 21,220,191,140,191,222, 47,254,245, 15,249,224,155,141, 21,255, 44, 90,151,155,130, 59,189,148,
+ 44,150,  0,247,108,  5,118, 35,244,246,172,169,117, 74, 78, 10,176, 87,  5,247,149, 37, 70,235,  5,124,162, 14,145,214,117,164,
+ 15,238,125, 93,152, 82, 86,233,238,220,164, 12,160,178, 42,150, 70,136, 27, 89, 24,105,131,151, 41,135,147, 95, 99,131, 82,  3,
+129, 87,152,150, 59, 73, 81, 13,100, 15,202,225,120, 21, 48, 40,139,232,110,193,227,170,157,106, 52, 58,248, 60,153,252, 56, 58,
+250,121,117,249,253,248,219,233,201,217,253,244,129, 79, 99,252,112,206,  3,118,235, 58,237,195,  1, 98,141,234,147,151, 56,  1,
+ 43, 24,214, 13,196,123, 60,187, 93,252, 90, 43,166, 83,  1,  6,  4,243,174,137, 61,166,118, 79, 14,132,239,178,225,235,122,241,
+217,112,156,179,148,172,101,234,208, 54,229, 89,158,199,  2,119,178, 74,113,116,100,172,177,117,104,222,242, 42,186, 79, 47, 45,
+ 71,119,184, 83,139,223,118,170, 60,254, 85,210,124, 20,220,249,245, 44,  0,101, 87,179,227, 52, 12,132, 61,118,108,147,236,101,
+187,123, 97, 81,133, 16,  7, 94,  1,150,183,129, 59,175,197, 13,184,193,115, 32,246,194, 13, 36, 46, 72,172, 42, 74,243,255,227,
+157, 31,187, 13,221,182,130,182,138, 34, 37,106, 98,123,230,155,111,230, 27, 37, 71,241, 29, 78,253,162,205, 65,228,117,130,233,
+194,110, 19, 49,103,103, 39,192,198,165, 85, 38, 89,  0, 45,174, 96, 16,137,156,193, 72, 33, 24, 34, 39,160,212,139,  2, 48, 69,
+  0,233,165, 49,207, 95,188,124,253,230,213,199, 15,159,112, 37, 70, 76,186,112,173, 85, 90,233,196, 48,  5,100,162, 53, 69,217,
+150,178, 76,103, 50,228,227, 38,213,249, 67, 44, 20, 50,243,144,224, 14, 42,183,249,242,114,185,174,215, 50,233, 82,115,103, 11,
+136, 50,122,244, 49, 13,243,121, 50,212,203,162, 31, 45,174,170,166,186,126,118,253,237,215,247,137, 45,229,241,197,178,164,178,
+ 10,245,198,132, 40,252,208,224, 16,208, 17,171,155,105,248, 61, 18, 73,255, 90,254,188,105,126,220,234, 77,105,  7,101,245,153,
+247,185,247,133,243, 57, 18,118, 10,117,  4,235, 22,221,129,115, 81,107,181, 35, 29, 74, 59,107, 30,100,188,175,193,113, 15, 76,
+238,172,207,148,179, 34, 69,131,207, 12, 94,175,237, 85, 89,133,117, 25,218, 14,250, 33,244,189, 66,106,191,169,166,186,214, 85,
+ 61, 53,117,104, 26,104,219, 17,135, 55,140,170,105,167,154, 31, 61,137,119,220, 32,255, 31, 72,196, 18, 89, 53,196, 71,144, 77,
+ 28,166,  3, 94,234,188,184,168,186, 82,138,111, 56, 47, 72,184,232,164,212,199, 16, 98, 79,133, 36,206,255,241, 65, 26, 62,134,
+191,170, 34, 79, 46,159,174, 24,178,199,248,134, 74,164,201, 69, 66,210,125,251, 68,112, 79,194,245, 46,210,252,227, 13,120,227,
+ 57, 60, 31,200, 39,246, 10, 32,247,201,123, 74, 94,  1, 14,120, 80,196, 92,103,114,204, 21,146,111,195, 65,101,254, 62,205,223,
+182,202,108, 93,236,132, 75,206,250,100,224,  8,252,207,212,212, 93,191,131, 74,108,134,107, 50,  8,218, 91,121,140,209, 14,210,
+ 16,116,136,148, 93, 24,253, 14,196,217,173, 50,217,103, 82,165,169, 65, 77, 11, 79,226,175,210,233, 40,109,131,  4,  3,105,156,
+224,  2,172,201, 28,  2, 60, 49,120,239,209,222, 65, 87,101, 85,216, 51,168,213,251,183,239,110,190,124, 94,173,110,255,148,155,
+174,173,  7,106,234, 26, 68,238,151,210,174, 48, 65,205, 27,202,  2, 12,107,180, 25,186,136,241,248,143, 54, 39,202, 18,224,225,
+226,106, 93,111, 64, 73,219,196, 76,192,135,176, 40,206,187,190, 99,224,  8, 22, 25,166,113,253,216, 49, 38, 72,133, 42,204, 41,
+ 60,122, 27,155,200,180,  7,164, 60,113, 48,175, 64,238, 97,250,105, 40,134,153,132,163,143,103, 96, 41, 30,156,178,234, 99,135,
+238,  4, 96,237,218,118,218,  6,130,232,218,107, 19, 19, 40,132, 86,149, 42, 17,193, 71, 32,132, 42,245,255, 95,120, 64,168,138,
+202, 43, 15,189,168,164,208, 66,226,221,181,189,187,204,153,177,201, 69,216,226,161,145,162, 68,218,196,215,217,179,103,206, 28,
+141, 95,241,207, 36, 91, 43,208,208, 70, 69,106,127,  9,196,150, 62,183,132,189, 19,246, 84,155,184, 49, 39, 16,232,151,198,184,
+186,237,135,203, 52, 94, 86,126, 77,232,149,225, 62, 17,140,237,208, 47, 47, 62,127,161,161,111,179, 25, 17, 89,107,141, 41, 75,
+ 83,149,190,174,209,197,144,248, 53,231, 57,236,110, 98,245,167, 35, 23,124, 76, 48, 97, 42, 64, 36, 80, 47,227,193, 76,200,136,
+112, 13,217, 57, 75,111, 26,154,162, 86,113,192,188, 17,252, 74, 21, 21,149, 19,144, 82,131, 29,168,233,209,116,175,216,157,125,
+191,161, 19, 98, 41, 74,116, 71, 40, 81,206,187,191,141,189,247,229, 92,185, 38, 13, 85,240, 68,108, 14, 16,130, 41,145, 83, 34,
+ 25, 77, 96,140, 12, 92,198,  1,237,209,204,109, 50, 90,156, 36,154, 89, 97,138,132,221,197, 14,253,129,206,183, 57,254,244,145,
+ 34,254,238,207,253, 40, 27,149,142,174,  3,129,120, 92, 84, 33,229, 44, 85,131,232,195, 63,192, 41, 48, 46,  5,173,  4,252, 56,
+145,232,234,176, 52,117, 96,  4,135,142,207,  5, 56, 31,147, 42,194,147, 67, 35,121,176,243,159, 11, 90, 71, 43,212, 93,185, 41,
+ 37,247,193,164, 55, 29,216,100,255,253,239,199, 95, 17,150, 12,233,102,172, 33,142,114, 17,107,211,253, 18,135,221,  5,251,163,
+131,165,123,234,147,104,104, 35,124,155,210,245, 58,103,232,247,159,200,232,217,233,249,213,237,229, 27,157,  9,107,238,  0,205,
+114, 13,118,116,184,123,244,207, 60, 20,121, 97,107,187, 21,  6,133, 70, 40, 26,111,211, 77, 32, 30, 80,222, 59,135,101,238,131,
+ 91, 15,171, 23, 95, 77,236,  1,119,169,166, 10,103,218, 50, 75, 14,156, 79,124,221,130,180,154,191, 91, 86,153, 77,193,125,229,
+241, 93,201,234, 72, 62,197, 63,155,182, 78,129,164,195,172,164, 69,115,254,174, 51,254,144,137,204, 18,189,236, 66, 88, 22,  7,
+112,108,249,127, 34,162, 13,170,108, 76,179,  9,152,179, 81,142, 54,211, 68,111,232,131,184, 77, 62,153,124,152,158, 76,175,191,
+ 94, 87,120, 86,157, 49,214, 44, 75,130,120,231, 26, 87, 99,214, 87,  8,199,  4, 23,135, 95,154,137, 32,156, 55, 52,219, 97,  9,
+142,177, 24,143,223,141, 15,239,230, 63, 22,166, 36,226,111, 41, 81, 13,200,197,177, 64, 40,207,157, 83,189,152, 95,107, 34, 56,
+184,214,200,246, 90,127,141, 98,159, 28, 67,182, 20, 78, 58,138,131, 57,165, 24,100,195,134,151, 70,253,151,206,168,125,158,156,
+248,230,244,183,239, 48,158,  5,224,236,218,118,155,136,129,168, 61,235,236, 38, 45,149,160, 92, 30, 16,207,229,223, 17, 15,252,
+  8, 63,128, 82,222, 80, 43,132, 90, 53, 73, 55,217,141,237,225,140,199,206,110, 46,165,192,107, 36, 59,217,245,248,204,204, 57,
+199,177,251, 59, 99,238,201, 89,134,190, 35,219,108,115,146,207,177, 35,218, 56, 53,181, 21, 33,  5,237, 15,  9,238,160,203, 10,
+222, 72,183,165, 73,216,165,149, 82,206,132, 11,216, 27,229,  6,162,119,211,243,249,252,219,226,254, 14,163, 48, 33,150,232,172,
+158,117,253, 38,100, 89, 99, 39,111,228, 98, 40, 75, 59,135,229, 78,254,140,116, 93,200,190,124,241,234,161,189,231,204,151,145,
+ 94,158,161,228,126,136,172,  6,222, 28,190,195, 59,  5, 88,231, 42,128,146, 94,148, 44,230,236,196, 88, 31, 86,253, 18, 15, 69,
+ 73, 20,110, 12,170,230,240, 16, 54,171,208,255, 12,171,149,219,246,150,103,103,147, 25,213, 54,144,252,115, 58,155,218,218,198,
+  2, 28,109,187, 78,228, 77, 50, 90, 79, 37,234,241,190,196,227, 56,155,184, 64,113,234,170,102,162, 46,245,202,136,250, 19,176,
+ 45,186,110,251,225,253,155,143, 87, 87,159, 62,127,  1,238,226, 21,  7, 49, 61, 70,108, 33, 60,142, 83, 22,136,173, 56, 50,125,
+ 63,177,104, 16, 24,213, 58,126, 91,148,155,192,176, 11,104, 45, 78, 77,222,122,185,255, 41, 58, 73,  5,194,110,114,  4,212,185,
+166,102, 52,173,249, 60,128,148, 50, 74, 25, 10, 17, 17,253,178, 93,238,186, 92, 78,183, 65,101,213,109, 63, 82,177,213,144, 28,
+232,105,165,242,177, 91,252,129, 63, 41,168,176, 23,200,244, 28,171,243, 53,129, 59, 29, 42, 84,234,147,120,114,236,184,111,  0,
+184, 23,247,243,225,214,  5, 40,160,195,161, 17, 37,149,114,155,167,231,184,205, 32,119, 17,103, 58,203, 28, 81, 34, 39,245,216,
+ 84, 45, 86,250,165, 50, 80, 42,107,214,232,100,107, 79,141,100, 83,214,136, 79, 20,130,102, 44,168,186,193,209,177,  7,238,131,
+235, 81, 93,141, 92,200, 24, 53,186, 21,100, 47,134,102,  5,126, 45,230,140,138,103,  9,192,197,131, 86,236,113,218, 21, 36,222,
+ 59, 93,222, 46,121,203,234, 81, 19, 42,150,249,148, 24, 98, 58, 48,144,  8,118, 19,171,110,221,126,191,158,163,128, 67,248,138,
+125,215,251,212, 70,198, 36,  4, 73,167,120,209,156, 63,118,173,214,130,  8,111,167,130,157, 92,237, 91, 93, 94,188,189, 91,252,
+186,124,253,238,230,246,  7,  6,212,117,221,111, 25,201,196, 75,117,  2, 52, 66,204,  7, 20, 78,125,191,193, 92,152,190, 72,166,
+131,154,173,  0,113, 20, 47,180,179,189,177, 25,115, 60,255, 83, 80, 31,227,248,136, 60, 98, 69,180,176, 63,201, 78,195,199,162,
+ 96,211,217,127,113, 30,255, 22,128,178, 43,216,141, 26,  6,162,182, 19, 39, 77,170,221, 30, 80, 43, 36,170,170, 95,192,129, 11,
+  8,196,167,192, 17,137, 67,255,  9, 10,252, 13,167,170,151, 34, 85,162, 82,  5, 18,210,210, 45,237, 38, 77, 28,123, 58, 51,118,
+188,219,237, 38, 18,187,215,108,100, 39,246,155, 55,111,222,172,135,200,187, 28,248,177,140,172, 96,213,248,216,183, 54,176, 46,
+ 34,116,145,230,169, 72, 51,153,  5, 62,  1, 84,  1,209,  2, 95, 66,130,207,151,152,169, 16,149,171, 22,174,194,156,136,240,141,
+ 17, 53,216, 43, 61, 29,236, 58, 16, 26, 55,219,245,191, 43, 68, 22,  4,171,189,233,211,223,179, 75, 68,185,206, 24,182,133,184,
+ 64,133,100, 52,102, 82,  2, 23, 50, 43,157, 40, 88, 25,176,234, 35, 46,167, 13,152, 16,222,212,202,151, 94,188,178, 77, 95,194,
+ 56,216,221,217,221, 41,166, 63,255, 92,172, 59,221,156,243,177,196,113, 48,226, 57,113,226,192,150,175,155,230,246, 22,211, 64,
+105,231,118,241,171,157, 87,105,215,166, 93, 49, 37,223,203, 19,124,  8, 86,243, 13,192, 88,210,150, 20,229,131, 18,  7,136,244,
+ 24,128, 69,109,130, 82,153,107,149,229, 73,129,224, 94,168, 92, 19,216,146,103,222,201,166,  1,242, 48, 83,193, 16, 94, 63,127,
+113,246,227,252,226,114,246,254,221,219,211,147,179,239, 39,167,101, 94, 80,228, 73, 96,146,105, 71,226, 22,121, 97, 14,247,159,
+ 45,234,106,118,117,125,244,241,  3,210,159, 79, 95,142,179, 45,133,113,  6,137, 74, 66,154,149, 35,163,164,181,119, 56,160,134,
+230,133,129, 11,247, 74, 66, 46,120,124, 73, 26,247,150,247,132,130,143,158,180,226,104, 67, 54, 93,205,226,251, 32, 98,246,151,
+ 43,251,208, 40,185, 73,116, 30, 93,253,  0,246, 81,116,144,155,136,121, 50,224, 82,131,101,126, 41,198,173,108,165, 46,107, 83,
+249,225,227,221, 26, 90,144,184,124,116,107, 77,156, 84,  7, 29,136,165, 72,223, 27, 98,213, 67,178,131,232,153, 26,216,120,184,
+188,148,  2, 96, 84, 28, 87, 43, 14,244,240,  7,203,125, 62,135,139, 99,178, 53,153,215,127, 87, 58, 15,214,111,192, 26, 25, 68,
+148,143,124, 80,137,216, 89, 40,163,103, 95,245,110,168, 88, 77, 77,249, 93,123,  3,138,236,185,249, 38,100,247, 60, 46, 13, 44,
+ 94,  4,160,247, 94,201,224,152,236, 97,157,249, 58,248,  6, 64, 25,155,155,216, 72,151,114, 84,160, 96, 64,208,141, 79, 23,217,
+140,105,201,  1, 76,149,208, 14,243,115,100,236,109, 99,232,212, 26,195,  7,229, 80, 46,233,107,253,  9,153,195,152,244,176, 49,
+154,228,223, 36, 43,243,237,178,220,198, 43, 94,190,122,179,127,112,240,237,235,103,  4,126, 58, 51,167,111,192,241,121, 48,176,
+123,142,103,201,114,139, 92,135,114,175, 49, 98,  4, 50,108,135,182,255,211, 27,177, 86,234, 24,167,221, 65,229,102, 38,  4,203,
+130,141, 15, 48,180,210,220,  0,130,195, 35,195,216,248,231, 94,  0,214,174,101,183,137, 24,138,250,122,158,121,148,128,160,165,
+ 65,101,  9,127,  1, 11, 96,197, 87,161,136, 47, 64,229, 15,144,224, 27,120, 44, 17,108, 89, 33, 80, 41, 21,109,164, 46,  8, 37,
+ 45,243,200,120,108,115,239,181, 77, 66,154,138, 86, 98, 86, 89, 68,242,140,231, 62,142,207, 61, 71, 19,159,171,184,123,241,200,
+ 34,146,114,190, 56,  8, 86, 55,127,142,203,  5,161, 79,141, 47, 72,180,181,157, 57,225, 17,217, 86, 53, 17, 14,136, 67, 99, 21,
+ 37, 50, 73,227,172, 27,119,215, 59,215, 12,232,137, 58,250,213,150,146,228, 76,137, 79, 74, 76,111,122, 21,162, 42,139, 36,205,
+168,153, 11, 51,158,236,241,103,142, 90,102,205, 72,196,  8,204,195, 59,198,204, 43, 88,164,188, 61,188,181,123,184,227, 36,152,
+ 78,118, 46,172,143, 60, 79,117,129,173, 85,147,202, 84, 89, 98,223,  6,189,203,199,213,137,143,122,141,232,224,210,151,195, 93,
+ 30, 17,201, 69,133,170,197,228,133,150,140, 86,150, 81, 60,115,110,214, 73,116, 32,154,232,233, 24,190,215,162,109, 34,221, 31,
+228,131, 36,235,229,253, 94, 39, 21, 60,240,119, 19, 95,171,121,214, 41, 52,169, 65,165,200, 16, 59,107,186,249,196,125, 56,137,
+227,158, 69, 54, 24,245,100,182,141,194, 84,  1,143, 43,195,173, 97, 53,211,223, 14,246, 55,214,111, 90,209,121,245,230,117, 81,
+153,251, 15, 30,126,248,184,247, 99,138,157, 42, 82,134,156,187,172, 64, 22, 87,175, 12, 30,141, 70,187, 59, 95,159, 60,221,190,
+115,247, 30,194,204,103,207, 95, 32,254, 36, 58,155, 53,155, 89, 26,215,180,193,144,113, 90,211,250, 64,189, 87, 91, 40,141, 94,
+235, 38, 71, 39, 38,137, 50,220,109,105,181,158,  7,150,  9,211,255,191,190, 36, 98,  2,147, 96,  2, 17,175,  8,180,122,177,168,
+ 22,255,225, 34,125,100,218, 43,154, 66,158,210, 23,  6,238,123,133,229,181, 19,229,149,174,225, 95,144,170,228,226, 14,158,130,
+ 11, 34, 40,210, 23,170, 85,206, 38, 55, 79,198, 78,169,233,164,196,249,249,  7,245, 24, 48,103,183, 46,128, 37, 95,219, 41,150,
+223,206,  3,206, 87,  9,218,113,178,242,216,105,245,211,158,253,  8,225, 24, 11,190,202,243, 93,226,142, 85,170,226, 33,149, 35,
+214,231,226,246, 96,251,246, 25, 65,185, 51, 47,238, 50, 10, 62,214, 64,199,203, 57,180, 39, 74, 15, 92, 47,224, 26, 27, 45,155,
+ 87, 23, 46,233, 74,188, 83, 27, 56,209,  3, 56,157, 65,204,170, 27, 94,141,245, 49,152,212,160,232, 39, 86,121,140,162, 70, 17,
+ 19,195,158, 38,108,178,202,182,237,245,181,205,241,100,223, 77,221,240, 16, 41, 92,149,182,172,163,193,231,198, 38,128,255, 52,
+ 89,158,247, 71,219,143,223,189,125,191,241,114,179, 40,142,113,249, 27,253,173,207,  7,159,112, 53,163, 16, 95, 53,184,163, 13,
+171,232,243,180, 91,207, 74, 27,210,155,  2, 53,  4, 43, 79,203, 82,213,148,231, 81,201,194,  5, 32,251, 10,114, 49,135,172,166,
+101,245, 34, 29,191, 32,216, 94,138, 22,219,154, 11,231,211,111,  1, 88,187,118,221, 38,130, 40, 58, 47,207,122,215,201,218,184,
+ 65,148, 40,113, 65,137,144,104, 81,254, 50, 21, 18, 63,128, 20,165,164,160,194, 13, 13, 18,  5, 10,137, 68,129, 68, 21,156, 16,
+112,214,251,154,225, 62,102, 95, 78, 44, 64,194,141,237,125,142,118,103,239,158,123,207, 57, 51,  3,126, 85,222, 13,238,141,221,
+ 88,119, 61, 41, 56, 21,184, 50,163, 49,233,195,219, 28, 73, 64,146,177,246,186,112,121,  5,136, 71, 84, 68, 91,  9, 21,188,165,
+248, 28, 48,241,232,248,158,160, 17, 13, 50, 92,243,104,242, 48,181,233,218,103,176,189,106, 92,205, 24, 15,201,210, 64,242, 87,
+156,217, 14,190, 80,112,105,162, 77,177,246,172, 61,116, 97,148,130, 22, 98,192,146,235, 95, 43,234,125, 88, 82, 15,138, 76, 35,
+  3,195, 19, 56, 88,149,151, 57,236,140, 20,141,151,  5, 57,152, 27,121,190,184,202,126, 40,198, 47,236,143,107,105, 92,239,195,
+172,167, 84,184,128,255,145,181,120,197, 69,125,225,190, 93,198,171,120, 98,246,162, 24, 46,130,133,238, 33, 76, 93, 67,254,174,
+ 29, 54, 24, 82, 22, 29,141,204, 36, 81,251,  9, 74, 21, 19,107, 12,  2, 23,149, 23,174, 44, 37,172,188,186,206,168,220, 13,128,
+  1, 22,202, 13, 26,125, 84, 89,113, 49, 75,254,204,242,231, 79,159, 61, 89, 28,188,255,240,241,193,108,190, 56, 92,188,121,187,
+ 60,124,124,144,166,211,200, 70,231, 23,159,163,241, 40,142,196,100,108, 32,  3,224, 14,123,244,226,  8,146,251,215, 39,167,103,
+103,159,150,203,119,231, 95,190,122,167,225,128, 10,135, 31,192,198, 27,173,172,149,179,216, 76, 83,189, 55,209,177, 13,197,222,
+ 10, 73, 85,151, 83,115,136,205,194, 27,208, 90,  4,218, 20,114,107,136,130,145,182, 10, 85,149,245,144, 83,250,159,115, 54,205,
+147,121, 14,105, 53,  7,175, 65, 88,244, 59,165,150,254,175, 60,228,247,210, 86, 53,  1,118,130, 63,161,250,164,183,156, 62, 12,
+123,209, 12,229, 84,175, 49,242, 79,167,186,195,142,118,245,  1, 98, 67, 68,231, 16,100,105,121, 99, 44,217, 49,  7, 75, 23,186,
+101,104,100,112,152, 32, 48,164, 42,184, 30,188,162, 84, 31,176, 41,209,211, 62, 10,246,150, 42,134,237, 84,132, 36,125,132, 12,
+ 42, 25,250,141,213,118, 98, 92,121,132, 11,193,180,153,233,235,103,  8, 27,181,171,152, 10,197, 29,232,236,241, 40, 17,141,164,
+ 21,185, 81,218,198,187,160,120,230,113, 49,138, 50, 67,175,106, 69, 97,158,126,220,220,174, 48,180, 97, 48,103,182,142,  9, 54,
+ 36,155,112,127, 12, 66, 10,226,201,102,147,237,203,244,213,241, 75, 84,155,120, 81, 20,249,247,155,203,154, 28,239, 24, 64, 80,
+229,236, 41, 61,170,167,241,236, 54, 95,119,184, 57,192,202,240,196, 87,144,195,225,  5,112, 94,202, 30,165, 33,239,123, 59,111,
+ 83,221,112,152, 49,146,234,245, 46,193,147, 24, 10,189, 60,246, 31,191, 37,163,194,174,  5,193,201,247,253,225,194,176,131,236,
+ 31, 63,191,  5,160,236,106,122,155,  6,130,168,103,215,118,118,157, 52, 41, 13,164, 66, 69,168,253,  5,192,133,  3,167,254, 13,
+ 36, 14,252,213,  2, 66, 66,112, 64,  2, 36,212, 75,197,161,162,  9,109,148, 52, 86, 28,127, 51, 51,187,142, 93,  7, 35,136,114,
+202, 41, 94,207,188,153,121,243,102,246,207,248, 14,117,243,168,105, 31,181,124, 70,242,  6, 23,193, 45, 58,163,153, 81, 66,227,
+201,101,101, 98, 22, 67, 52,152, 91, 43,209,117,249,160,192,244, 48, 56, 83,205, 77,106, 81, 56, 67,181,127, 95,141, 23,201,178,
+ 36,130, 69,240,212,  1, 80, 39,132, 95, 70,213,225, 43, 48, 74,111, 18,142,186,230,122, 57, 11,238, 91,246,144,140,101,164, 71,
+220, 41, 45, 26,174, 65,242, 29,179,159,198,  0,189, 85,243, 48,139,138, 15, 33, 93, 27,174,140,146, 75,121,138,176, 86,194, 64,
+239,225, 15, 67, 61, 58, 57, 60,190,190,189,169,228,244,228, 52,152,116,159, 28, 28,127, 93, 92, 92,136, 25,244,139,161,175,125,
+ 32,169,191,242, 93,237,187, 38, 51,234,121, 94, 64,220,160,107, 44,216,119,189, 64,143,126,205,194, 36, 19,  8,220, 69,  6,121,
+234, 60,156, 76, 94,191,122,217, 15,212,116,122,179, 90,173,241, 84, 92, 38,220, 17,127,233, 12, 28, 25, 19, 69, 83,246,164,124,
+246,228,233,135,143,159, 16,116, 79, 95, 60,255,242,237,243,189, 97,144,230,209,163,163,195,120,189, 88, 46,175,123,202, 69, 59,
+ 89,199,101, 20,101,211,121,248,246,236,253,217,155,119,243,213,250,106, 54,255,113,121,133,175,  9, 67, 70,156, 21, 17,229, 67,
+121,146,113,135, 21, 67, 16,144,156,115, 19,151,248,141, 19, 52,107,140,186,133,239,138,112,137,121, 31,228,219, 91,  3,171,149,
+ 28, 70, 57,186,187,127,134,166,198,173,211,182,248, 97,128,157,149,  3, 93,212,161, 81,200,116,153, 41, 38,239,208, 57, 58,219,
+206,145, 90,242,196,118, 55,230,223, 16,223, 36,197,174,240,202,178,220, 25, 59, 34, 90,224, 32, 24,175,211, 80,236, 68, 50,216,
+105,154,129,  3,127,  1,133,187, 67,170,182,245,  0,224, 56,157,195,177, 66,212,210, 29,167, 41,227,217,198,191, 10,184,155,193,
+ 86, 52,130,140,165,221, 97, 43, 59, 51, 83, 25, 53,220, 83, 17,137,217,143,176,226, 54, 97, 53,111,204,163, 74, 97,203, 91,  9,
+ 60, 65, 97, 40, 26,230, 94, 76,223,149,101,178, 70,222, 66, 78, 71,114, 25, 71,248,210,239,171,254,100,239, 65,154,167,143,199,
+ 71, 88,193,199,217, 70,212, 15, 75,228, 42, 37, 57,232,230,113,204,183, 64, 38,  9,213,235, 60, 96, 77, 72,192,243,171,144, 87,
+ 67,242,165,135,174, 66,133,187,228,197, 38,212,166, 80, 74,159,159,127,255, 57,189,196, 84,  0,163,194, 38,142,120,153,  9,173,
+233, 48, 11, 55,236,134,  2,112,  6,122, 24, 70,183,112, 23,223, 11, 75,189,131, 66,119,150,146,228,209,  0,213,123,132,102, 28,
+237,234, 27, 49, 58,208, 48, 62, 43,119, 65, 52, 39,213,187,141, 77,123,131,180, 72, 90, 70,162, 69,144,177, 59, 24,100,199,191,
+174, 61,205,149,241,255,125,126, 11, 64,217,213,181, 54, 17, 68,209,238,236,108,118,179,217, 38,180, 24,124, 80,136, 80, 74,161,
+130, 85, 65,250, 82,161, 15,173,255,215, 31, 81,125,208,183, 22, 41,  5,159, 20,106, 17,217, 52,205,118, 63,103,198,251, 49,179,
+217,182, 49, 42, 36,144,108, 72,178,217,153, 57,115,238,189,231,220,172,194,119, 91,  2,111,205,107,157,154,234,122, 60,130, 49,
+ 16,182,251,151,236,123,176,101,225,165, 52,174, 16,209,145,253,123,173,193,157,237,111,202,214,227,173,  3,130, 43,156,155,209,
+198, 56,126,244, 35,191,162,239, 36,104,103,  6,207,  8,143,163,175, 93, 15,  9,251,128,  0, 70, 59, 59,147,157,169, 48,174,176,
+ 19,112,151, 49, 56,184,243,100,103,118,123, 77, 10, 25, 54,111,180, 42, 93, 23, 40,120,154,106,191,173,204, 75, 76,198,207,210,
+ 44,245,105,  7,135, 31,149,149,183,233,205, 47, 99,  9, 20,146,247, 81,127,216,147,189,247,151, 39,223,204, 52, 18,152, 94,175,
+ 42,108,249, 82,230,166,194, 52,  8, 22,245,227,190,140,130,  0,200, 59, 10,120,124,  8, 15,213,222,238,246,209,225,193,197,215,
+179, 97, 34,  7, 16,152,133,176,127,172, 21,245,124, 54, 75, 95,190,218, 61, 62,124, 59,136,123,233,244, 39,112,144, 16, 21, 68,
+100,101,197, 62, 29,190,196,241,105,246,223,236,157, 95,124,169,234,236,245,139,231,151, 87,223,243, 34,219,222,154,156,124,248,
+248,238,232,248,211,231,211,186, 82, 20, 71,227,181, 12,164, 44,234,186,108,154,164, 31, 82,131, 15,244,167,246,104, 13,  0,173,
+  9,208, 50, 40,  6,192, 49, 34, 92,157, 48,219,139, 66,151, 21,170,139, 53,183, 61,131,197,141,206,164,  6,215,154,177, 43,139,
+241,253,158, 19,213,116, 84,192, 93,230,110,108,195, 39,124, 61,242, 99,237,184,240,234,168,117,  5,184, 47,197,235,127, 15,131,
+199,201, 99, 77,217,219,123,231,255,167, 44,169,232,100, 35, 73,220,212,242,226,  5,209,129,147, 41, 48,177,  3,  7,229, 67, 95,
+139,219, 72,204,211,209,228, 26,251,157,225,179, 40,136, 57,153,243,240,108,169,223,139,113,  5, 97,170, 22,121, 98, 89,108,177,
+228,223, 14, 23, 30,139,187, 99,225,178,166,139,161,241,188, 86, 10,105, 91,120, 56,161,215,194, 21,200,204, 29,121,155,117,137,
+  8, 82,200, 48,100,179, 98,  5,167,153,100, 13,180,113, 77,156,132,104, 69,147, 44,125,246,219,183, 48,187,167,235,  3,180,122,
+ 94,220,  0,140,103,249, 60,111, 10,159, 93, 71, 24,206,147, 59,145, 26,218,  1,138,212, 26,211,176,116, 67,180, 87,228,213, 38,
+223, 58,171, 90,236, 89,111, 36,155,212,226, 73,241,212, 32, 93,189, 95, 84, 37, 80, 64,  0,129, 36, 92,159,206, 83,218, 39,248,
+115, 16, 66, 96,118, 43,188,155,178,206,141,107, 52,102,216,111,222,241,167,  2,140, 66,220,192,  5,237,206,246,236,117,122,109,
+ 89, 81,184,113, 40,199,200,206, 47,145, 34, 22, 25, 64, 18, 38,165,170,255,198, 42,112,195,209, 70,221,197,119, 64,210,170, 99,
+118, 29,150, 10,232, 89,189,246,255,142,214,223,  2,176,118, 61,191, 73,  4, 81,120,102,118, 22,134,  5, 34,  4, 60,181,  7,123,
+178,181, 38, 77,141,  7, 19, 15,158,108,210,248,159,154,120,245,127, 80, 47,141,154, 84,123, 41,141,191,122, 48,210, 16, 96,150,
+133, 25,124,223,155,217, 21,  8, 77, 52,113, 79,176, 33,217, 93,120,239,123,191,190,239,177,  5,223,171,191,112, 78, 54,193, 61,
+208,222, 97, 59,110,193,115, 81,126,248, 76,101,202,163,214, 80,156,236,187,178,127,164, 67,219, 67,196,100,161,204, 31,124,180,
+ 71,  2, 93,158,182,  3,194,208,154, 87,119,179,222,104, 49,181,148, 19,201,196,241,142, 70,116,117,150, 46, 98, 58,199,119,216,
+ 66,220,194, 24,219, 85, 76,220,173, 20, 76,208, 76, 17, 46, 18,254,182,205,157,153,203, 41,252,231,243, 28,246, 39,152,199,187,
+ 84,209, 34, 17, 21,245,225,238,193,112, 60, 84, 65,207,207,115, 51,186,194,200, 14, 67, 66,226,188,235,183,250, 90,107, 59,159,
+133, 70,179,224,162,148,204,239,253,116, 48,146, 69,166, 76,104,238,123, 86,211, 17, 92, 26,173,  9, 94, 33,197,131, 56, 15,149,
+ 66, 88,157, 70,230,245,240,224,240,249,201,201,135,179,183, 54,159, 82,180,193,172,213,227,217,127, 92,255,124,243,238,108,112,
+245,245,209,209,209,139,211,211, 94,175,247,229,234,251,112, 52,213, 90,180,179,180,149,201, 70,157, 32, 56,127,124,124, 60,184,
+188,252, 53,188,217,187,183,231,124,122,254,121,240,244,201,179,151,175, 94,239,239, 63,232,119,186, 31,207, 47, 52,174, 71,183,
+ 22, 72, 22,112, 48,104,198, 82, 73,177, 36,173,137,134, 17, 45,163,154,153,108,155,132, 66, 11, 61,239,216,130,158, 64,126,108,
+ 82,250,152, 96,191,197, 23,106,169,180,205,237, 12,201,146,224,114,185, 28,248,173, 47, 33,244, 43, 20,128,117,162, 17,126,152,
+166, 70, 74,194, 21,232,252, 95,187,146,255,241, 72, 69, 74, 85,185, 45, 38, 14, 28, 56,244,237, 12,164,173,139, 44,109,212,211,
+ 70,  1,190,243,150,164,190,107,186,179, 21,173, 96,181, 73,166,124,171, 74, 36,141,154,136,219, 86, 20,164,178, 54, 65,147,119,
+193, 59,139, 40, 96, 22,  4,241,132, 29,149, 47,172,128,187,175,  8,105,130,135, 13, 60,118,219,184,183, 72, 29,136,156,189, 40,
+ 35, 68,231,195, 36,198,131,245, 20, 37,250,178, 74,221, 35,186,151, 39, 69, 64,118,249,167,228,141, 10, 38, 24,105, 34,162,168,
+ 59,234, 87,146,240,  2,116, 91, 41,  2,177, 61,  9, 42, 61, 62,201,158,139,212,174,146,188, 68,118, 60, 50,125,142,  1, 65,221,
+ 42, 99, 13,128, 85, 26, 53, 94, 61, 66,230,166,240, 86,133, 49,239,110,111,199, 22, 54,172, 89,165,148,110, 14,167,159,199,158,
+ 10,112,121, 17, 92, 62, 64,128,172,246,218,128,133,101, 59,205, 14,213,  1,228,224,157,172, 83,171, 55,198,147, 27, 66,118,173,
+106,247,119, 14, 46,190,125, 98, 90,164, 67,188, 96,  9, 44,196, 51, 24,136,121,238,227,198, 89, 72,203, 52,249, 18,203,106,255,
+192,  6,251,251,214,185,165,212, 28,176,103,114, 69, 98,214,174,183, 42,209, 58, 40,106,174,240, 91,138,218,181, 34, 22,162,200,
+149,218,119,163,196, 11,110, 71,224, 46,255, 66, 24,184,245,248, 45,  0,103, 87,211,219, 52, 16, 68,189,187,241,250, 35, 31,165,
+  9,165,  8, 85,173,  2,  5,122, 64, 32,142,112,224,192,  1,137, 27, 18, 23,254, 45, 23, 36,110, 69, 21, 66,  8,104, 43,  5,168,
+ 26,  8,105,234,196,117,226,196,246, 50, 51,187,235, 36,208,  2, 34,  7,203,114,164,181,108,175,103,103,222,188,247,252,167,248,
+206,127,209, 65,160,109,144,238,155,147,225, 23,109, 37, 11,224, 45,202,137, 29, 78,243,152, 30, 48,110, 69, 89, 41, 90,149, 40,
+203, 28,147,102,115, 83,184, 32,196,  7,133,155, 68,  6,171,172,201,224,178,191,250, 37, 62,162, 19, 97,132, 71,214,182,182,132,
+160,140,221,196, 20,165,217,184, 68,131, 53,  9,137,246, 23, 34, 90, 46,  1,126, 48, 23, 38,211,  9,204, 44, 88, 66,167, 89,122,
+115,125,251, 52, 25,242, 82, 43,205,180,209, 93,209,143,  7, 72,154, 37, 93, 45,140,180,185,182,149,164,103,194,226, 55,112,169,
+201, 44,161,149, 92,221,191,126,239, 71,212, 67, 64, 74,137, 94, 49,236,201, 81, 51, 12, 27, 85, 47,244, 42,245,192,111,174,184,
+205,186, 92,173,251,141,176,  2,121,113,232, 99,176,149, 94,197,151, 46,237, 40, 41,138,187,119,110, 57, 12, 59,195,  7,  7, 29,
+135,123, 27, 87, 55, 59, 95,191, 41,244,166,113, 97,230, 71,163,232,253,135,119,135,157,253,237,246,214,211, 39,143, 55,174,173,
+119,143,187,189,193, 48,142,209, 23,172,127, 58,217,185,189,115, 18,141, 62, 31, 29, 95,106,172,220,104,183, 95,190,122,253,232,
+225,131,143,251,159,118,247,222,190,120,254,108,247,205, 94,183,251, 61,207,157,106,232,167,105,  6, 43, 14, 50,214,104, 97,196,
+ 46, 71,142,  7, 20,135,146,150,133,129, 35, 92, 36,141,193, 45,116,  5,171, 74, 81, 11,121,  0,171,136,100,190,  7,101, 25,119,
+ 37,131,228,  1, 74, 91, 98, 11,103,101,124, 47,237, 82, 75,238, 34, 76,113,207,245,178,165,156, 20,255,106,133, 87, 32, 62,206,
+ 84, 22,136, 32, 35,117, 15,191,216,220,241,191,227,187,116,100, 78, 94, 68,236, 47, 58, 88, 85, 65,160,214, 85,  4,137, 82,203,
+  7,107, 19, 34,110,157,143,222,104, 33,248,  2,212, 99, 40,182,112, 57,228,173, 85,216,183,145, 17,248, 94,104,235,209,  5, 80,
+167,124,117,139,194,138,  3,244, 56,121, 49, 91,110, 30, 48,110, 51,247,102,216,154,204,198,212,174, 68,226,169,110,212, 10,231,
+ 28,134, 40,108,171, 94,141, 30,  8, 97,133,  4,158, 21,170, 76, 37, 57, 91,150,164, 40,171,156, 95,136,236, 54,184, 43,131,204,
+216,  4,127,174, 96,210, 36,149,138,150,113, 32, 91, 86, 48, 99, 53, 35,140,  8, 28,233,150,136,216,104, 75, 41, 10,241,142, 81,
+ 43,150,214,  5,152,189, 65, 45,202, 73,105,129, 35,208,190, 40, 23,  3, 56,103,156,198,186,109,152,107, 11, 48,108,252,104, 91,
+  2,184,  9,164,102, 44,140, 92, 29,194,160,165, 40, 42,253,221,246,241, 52,129,224,142, 53, 39,231, 85, 89,139,146, 65,171,182,
+ 54, 58,139, 78,226,254, 56, 77,168,244,167,138,192,226,239,212,180, 51, 52,  0, 61,143,211, 89, 90, 44,231,239,206,220, 73,137,
+107,171,103, 75,208, 99,100,190,100, 14,192, 48,  4,170, 56,101,136, 35,177,203, 84, 43,242,172,228,216,184, 93, 21,243,245,130,
+253, 78,215, 89,174,125, 29,103,193,118,244,223, 85,223, 23,253,126, 10, 64,218,181,180, 54, 17, 69,225,123,238,220,153, 73, 58,
+ 41,245,137,213,106, 90, 16,  5,  5, 23, 85, 23, 82,168, 11, 65,119,197,149,221,185,208,149,226,255, 19, 92, 90,176,190,168, 26,
+132, 34,138,197,  7, 42,134, 74,155, 56,147,153,204,100,230,122,207, 57,119, 38, 83,169, 85, 48,201, 42,  9,195,132,220,123, 30,
+223,247,157,239,254, 61,190,143,127,179, 37,124,128,103,211,168, 95,131,192,105,141, 72, 26, 66,112,188,197, 61, 28,107, 71,  3,
+ 96,199,174, 36,193, 29, 60,162,207,170, 41, 34,223,165,181,173,240,148,219,116, 27, 19,174, 63,233, 79,126, 31,252, 24,229, 67,
+134,202,114,157,151,255,172, 29, 56,160,152,207,235, 64,200,130, 75, 15, 11,180, 75,251, 18, 60, 47,221,112,189,249,246,252,198,
+230,123,179,164,122,209,182, 96,150,135,214,174, 99,157,223, 21, 85,216, 14, 21, 29,200,239,155,230, 14,144,227,101,213, 24,233,
+100, 36,112,160,236, 69,253,161,206,168,166,129,175,141,110, 43, 80,  7, 76,  7, 24,168,160,161,246, 79,169,137,166, 98,111, 13,
+141,114,  7, 57,202,144,133, 72, 82, 84,159,160, 80, 58,135, 44,133,133, 75,139,207,215, 58,103, 78,157, 91,123,249,230,232,145,
+153,219, 55,111,221,127,176, 18, 37,122, 72,240,119,146,232, 56, 46,190,124,219,124,252,180,243,226,213,250,177,233,227, 75, 75,
+215,103,103,102, 63,126,238,110,253, 12, 77,142, 57,217, 62,209,106,250,111,223,125, 48,221,235,133,243, 23, 31, 62,122, 50,215,
+158,115,189,198,202,234, 51,207,243,239,221,185,123,121, 97,113,249,198,242,213, 43,215, 58,175,215, 55, 62,117, 99,164,185,245,
+ 96, 88,132,131, 81, 63,206,195, 40,235, 69, 89, 28,235,104, 32, 76,226,163, 97,239, 66,161,122, 71, 96,253,174, 88,126, 33,211,
+ 20,189, 36,211, 97,218,239, 39,204,121,228,  5,112,124, 55,125,137,105,137, 56,  6,  9,107,173,137,123,145, 23,158, 39,125,192,
+148,139, 43, 22,147, 34,181,168, 35,107, 26,  3,123, 96,220,187,186,  5,192, 63,120, 24,152,  6,201, 87, 40, 52, 45,254, 32, 99,
+147,182,164,218,103,226,117,249,157,138, 19,178,251,202, 17, 74,239, 28, 62, 84, 38,253, 57, 62,167,  1,167,  6, 87,106,198,106,
+106,193,157,153,168,211,211,103,195, 36, 36, 85, 50,252,174,181,217,179,111,209,130,133, 75,246,102,210, 12,197,102, 60,193,193,
+ 94,133,176,227, 66,114,140,163,131,200, 80, 84, 83, 84,100,175,198,145, 51,105,106,  9,130, 76,235,131,181, 99,140,190,244, 79,
+176,131, 72,162, 12,238,154,109, 92,199,197, 59,115,164, 44,155, 33,127, 23,250, 84, 82,178,161,170, 72, 91, 23, 37,201, 59,207,
+166, 63, 85,237, 60, 46,225,201,169,130,207,112, 32,196,134, 76,  4, 80, 21,236,184,192,  7, 59, 88,239, 73,182,127,180,209,175,
+178,198,192,204, 72,218, 45,178,248,165,103,110,125, 98, 43, 66,186,164, 13,208,241, 49, 75,182,195, 45, 83,156,103, 56,237,154,
+196, 73,108,174,193,231, 24,144, 78,  0,143, 63,176,167, 57,136, 98,172,220, 37,122,  8,  0,106,138, 67, 91,120, 34, 30, 65,  1,
+  7, 64,138, 90,142, 47,234,179, 96,248,134, 83, 89,  2,177,206,255, 80,112, 56,206, 98,201,112,116,137,229,152,158,121, 42, 56,
+ 56, 72,195,186,207,133,222,109,178, 15,106,131, 78,255, 31,220,205,227,151,  0,140, 93, 77,107,219, 64, 16, 93,105,245,229,164,
+200,141,237,134, 52,224,131,161,105, 15,129, 66,161,231,228,247,245,143,244, 90,122,204,161,208,246, 15,180,  7,211, 52,165, 52,
+184, 80,108,234,196,177,101, 59,145,165, 93, 77,119,102, 86,178, 76,113,  8, 24,131,177, 17, 50, 59,122, 51, 59,243,222, 91,239,
+225,244,100,168,249,253, 18,249,201,228,112,223,  3, 89,208,  6, 80, 82,221, 97,162, 65,177,179,150,  0,133, 58, 26,199, 51, 56,
+108,221, 53,109,212, 86, 22,166,236,226,153,153, 23,183,219, 11,147,  0,139, 78, 20, 95,230,  9,170,203,178, 21,109,139, 53,119,
+231,136,203,129,151, 53, 37,185, 47,101,114, 59,  3, 94, 29,151, 57,215,248,166, 10,182, 22, 80, 38,158,210, 34,253,250,251, 11,
+153, 36,250, 20,148,165,255, 12,166,107,162,132,149,141,120,143,  5,213,166, 52,199, 82,148, 35,222,109,132,110,239, 73,239,124,
+120, 33, 80,  8,234,229, 58, 71,105,173, 35,  7,114,164,208,150,215,199, 84,128, 70,122,144, 43, 39,172, 90,248, 18, 27,151,137,
+129, 85,101,254,154,179, 84, 58,  8,208,  2,211, 96, 70, 28,183,250,253,159, 71,207,142, 95, 28, 29,159,125,250, 60, 24,188,153,
+204,151,141, 32, 48,183, 27, 72, 47,108,132,157,246,227,253, 78,187,219,237, 30, 30, 62,109,181,247,154,241,222,233, 73,207,164,
+138,183,239,222, 39,139,244,199,175, 63,175, 95,189, 76,110,179,244,114,152,165,217, 65,167,211, 63,255,246,188,215,139,194,224,
+236,195, 71,  3,  9, 87,147,235,241,120,114,147,204,254, 94, 79, 87, 52, 30, 13,148, 14,125,159,249, 62,244, 36,163, 87, 15, 89,
+210, 35,124, 57, 68,100,191,203,112,215,202,167, 27, 24, 16,204,242, 98,149,235,200,108,201,  4, 87, 81, 56,209, 32, 29, 25,160,
+ 98, 88, 79,235, 17,  2,107, 97,169,200,236,228,199,249, 95, 90, 93,216,  1,251, 86,  2, 56, 21,191,174,190,151, 75, 25,135,241,
+124, 83,242,154,235,212, 36, 81, 87,108,136,220, 96, 67, 40,132, 31,231,171,105,245, 56, 85,150,138,  6,104, 52, 25,144,161,222,
+ 24, 45,228,214,230,151,200,199,214,153, 92, 59, 46, 84,196, 24,235, 22, 91,114,130,109, 19,246, 98,244, 93, 96, 21,239,214,196,
+180, 80,  3,231,130,190,245, 12, 94, 84, 96, 14,214,164,206,150,227,101,147,  7, 24,236, 66, 63,210, 42,231,211,  2,106,232, 14,
+229,  1, 34,246,202,174,189, 67,219,108,100, 32,167, 99, 12,182,239,136,220,154,180,137,181, 31, 40, 33,183,115, 93, 62,216,131,
+183,214,101, 86,  0, 11,193,232,226,  2,192, 63,224,130,157,244,136,194,230, 33,160,233,166,176, 67, 87, 11,238, 46, 91,143, 88,
+  6,142,244, 60,182,231,195,122,169,156,100,210, 36,141,174, 41,133,168, 60, 49, 16,211, 93,129, 39, 23, 72,243, 36, 59,212,165,
+  1, 75,147, 91,235, 35, 72,182,129,154, 63,133,101,226,126,235, 32,242,119,  6, 87,131, 69,190, 36,238, 50, 52,119, 91,227,217,
+136, 59,186,172, 71, 68,229,146, 37,189, 67, 25,192,216,  2,128, 50,227, 83,154, 33, 69,156,128,157,240, 81,220,104,142,110,134,
+ 32, 54,172,175, 37,178,127,170,197, 37,139,169, 90,129,143,220, 51,157,146,191,165, 93,134, 93,244,137,156,102, 58,189, 91,172,
+ 28,203, 38,217, 74,159,175,203, 53,138,  7,131,251,253, 66,167,127,  2, 80,118, 45,189, 77,  3, 65,216,187,118,188,137,107,  5,
+ 81,170,208, 64,211,  3, 72,181, 84, 42, 46,156, 56, 32,224,192, 21, 33,206, 92, 56,240,131, 56, 34,126, 10, 23, 84, 80, 69,139,
+168,212,  8,164,190,120, 68,132,180, 10, 52, 10,113,212,248,189,236,204,238,218, 78, 83, 33,240, 37,135, 56,113, 28,239, 60,246,
+155,111,190,249, 71,125, 96, 62,219,205, 33,214,  6,176, 79, 32, 32,227,  3,131, 62,120, 19,  8, 48,  8,165, 96,191, 31,225,202,
+153, 75,196,157,230,197, 55, 50, 69, 56,130,241, 23, 33,136,132,113,216,208,145,170,240,146,203, 11,173,131,222, 94, 10,155,160,
+ 84, 66,239,138, 66, 11, 77,246,147, 40, 33,  8,167, 26,146, 19,169, 43,255,224,203,189, 69,111,183,183,187,186,188,114,216, 59,
+144,148,152,162,108,166,  2,140,121,125,241, 90,247,164, 75,185, 76,103, 32,252,152, 90, 89,193, 91,242,142,  6,199,126, 48,138,
+210,116,255,232, 16,182,165, 38,194,253,212,176,137, 57, 72,198,190, 27,211,136,  9,223,112, 42,238,112,146, 50,208, 57,205, 18,
+ 70,145,226,  5, 55,239,216,150,120,125,246,244,137, 83,115,159,191,120, 25, 10,247,111,208,249, 11,117,241,254,201,112,184,185,
+249,225,193,189,187,175, 94,175, 55,154, 87, 46, 46, 52,222,111,183, 47,213,221,251,119,110, 63,126,244,112,245,230, 90,191,223,
+127,183,241,118,167,221,254,252,181, 51, 26,251,147, 32, 14, 97,160, 17,175, 86,172,222,113,215,173,221,106,204,187, 43,158,215,
+106, 93,109, 54, 47,239,124,252,212,249,222,153,115, 25,163,116,125,227, 77, 28, 39, 98,169, 70, 25,113, 88,165, 38,153, 12,104,
+100, 85,145,142, 90, 96,139,  9,120, 67,130,100,130,244, 84,252, 42, 78,132,203, 22, 22, 36,242,119,113, 50,179,137,109, 26, 78,
+133,212,107, 44, 77,172,111, 58,149, 66, 45, 85,212,224, 83,198, 55,117,136, 75,133,113, 32,243, 56,126,182,249,166, 88,192, 12,
+ 38,233,  4,180,  8,237,179, 11,180,248,236,185,142,126, 20,142,102, 61, 21,201,157, 85, 33,152,197,115,111,206, 11, 25,  0,163,
+236, 16, 25,160,213,208,105,134, 69,100, 64,105, 44,106,195,182, 29, 24,189,188,164, 56, 87,160, 40,194,103,205,129,166,194,111,
+172, 36,113, 29, 39, 64, 58, 81,126,119,142,  5, 17,213,156,194, 75, 19,157,204, 76, 50,110,116, 27, 41, 45,153, 36, 41,245, 31,
+201, 11,167, 73, 40,231, 27,148,147,119,  9, 16,107,188, 69,209, 60, 36, 22,147,  3, 55, 34,254,146,252, 46,255,230,  9, 10, 65,
+ 49, 42,213,124, 21, 35, 89,115,108,168, 22,123,151, 10,186,216, 19, 72,115, 16,153,170, 81,  0,152,199,171,214,110, 85,152,229,
+134, 82, 41, 80, 44, 73, 67,213, 90, 41,238,152,117,229,139,226,189,164, 96,183,152,148,101,114,179, 79, 80,146, 87,156,137, 67,
+108,160,165, 47,145, 61,226, 78,165,122, 99,105,109,235,203,150,170,  1,102, 26,196,224, 50,150,  2,124,251,227, 87,151, 34,119,
+ 31, 23, 44,204,120, 26,248, 63,213, 32, 48,165, 48,156,225,  5,117,227,174,210,203,227, 82,128,143, 43,214, 47,186, 19,132,126,
+163, 40, 26,102, 67, 29, 27,212, 96, 34,249, 76,205,243, 92,174,102,181,146,113,224, 79,177,  6,146,144,168,167,  4,255,100, 54,
+101,  1,133,201,156,217,227,102,255,153,185,139, 37,157,150,  6,159,149,143, 63,  2,112,118,117,171, 77,  4, 81,120,103,103,118,
+118,147,221,108, 18, 98, 66,105, 45,161,248,  2,222,249,131, 69,172, 90,240, 77,196, 11, 95, 76,193, 23, 80, 43,  4,  9, 85,193,
+130, 87,162, 23, 69,154, 43,173,166,173,155,108,118,118,186,206, 57, 51,179,187, 77,131,130,144,155, 36,  4,102, 55, 59,231,204,
+ 57,223,207, 89,246, 23, 35, 53,159, 57,183, 68,232, 45,200,106, 19, 59,146, 59,144,135, 26,177,182,198,128, 57,112, 37, 25,179,
+167,100,  3, 46, 23,174,145,255, 59, 38,127, 99, 21,227,106, 45,146, 74,240,156,114,143,242,  6,227,109, 30,198,126,131, 51, 46,
+ 28, 49, 57, 59,154,254, 62,  1, 76, 12, 73,130,187,215, 31,125,153,124,  6,148, 18,243, 46,246, 13,100,224,135,152, 99,164, 17,
+ 75,163,158, 77,227,128,112,220, 22,234,140,187, 64,177, 28,192,164,120, 78, 40, 24, 54,214,213,106, 78, 65,103, 15,111,169, 97,
+245,146,107,131,173, 52, 75,213,159, 57, 77,126,105,155, 33,170, 57,182,180, 54, 96,170,112,222, 45,142,124,198, 85,  6,207, 97,
+ 82,142, 42, 94,220,128,187,234,  3, 85,123, 54,  3,226, 49,120, 96,133,112,178, 76, 62,121,252,244,214,246,206,243,103, 47, 22,
+ 89,166,114,221,214,112,115,243,234,198,222,104,172,150,176,251,224,254,203,189,183,247,238,108,175,175,111,188, 30,141,213, 53,
+125, 61,252, 54,222,223, 63,248,240,241,248,251,143, 56,110,245,  7, 93,143,131,147,193,108,158, 48, 42,163, 22, 48, 94, 10,153,
+ 63,220,185,123,251,198,205,181,254,218,171, 55,163,247,  7,159,210, 76,204,210, 25,238, 71,208,187, 94,233,120,221,142, 31,135,
+ 36,106,242,200,  7,200, 20, 50, 86,  1,238, 99, 30, 18, 32, 60,199,104,101,  1, 34,134, 77,  5,119, 69,100, 57,205, 11,149, 15,
+  6,172,209, 15, 84,104, 39, 29,135, 30, 78, 78,143,207,230,218, 20,254, 92,139,205,176,170, 13,253, 16, 49,201,186, 65, 17,216,
+251,168, 27, 36, 87,123,138,153,103, 73,187,251,114, 55,192, 99, 84,177, 82,171,125,217,250,150,252,155,177, 78,150,152,136, 75,
+191,139,252, 88, 74, 17,  5,177,200,133,222,159, 88, 86,230,214, 51, 71, 45,158, 65,197,  9, 12, 31,105, 64,127,211, 51, 37,164,
+226,159,192,138,  5,202, 89, 47,202,182,151,229,136, 37, 27, 88, 19,246, 83,144, 23,145,203,100,245, 11, 21,  6,169,134,192,105,
+ 94,200,185,189, 44, 90, 87, 36,145,106, 16,140, 14,238,212, 50,151, 43,122, 76,245, 34,127,125, 57,214, 12,134, 24,134,130, 54,
+144, 49, 46,237,  6,140,210, 35, 59,176,204,165,214,183,  0,172,167, 93,107,192,106, 76,  6,203,150,189,117,145,196,182, 59,186,
+133, 17,102,130, 59,  1,111, 88,170, 49, 85, 23, 77, 84,113,111,245,162,110,220,108, 37,139,164,156, 28, 85,169, 25, 52, 37,222,
+209, 39,196,252,103,114,130,129,146, 88,235, 94,139, 96, 18,167, 50,142, 69,173,147, 30,208, 84, 24,202, 23, 60, 24, 72,178,150,
+195,222,112, 58,155,218, 64,174,107, 17, 27, 85,173,141,108,169,136,212, 83,252, 84,220,136,195,118, 38, 68,165,140,116,200,170,
+238, 70,153,139,109,141, 69, 72,141, 77, 44, 75,233, 72,167,209, 75,243,249,242, 44,  4,104,  6, 74,219,243, 36,255,  7, 71,153,
+ 80,185,234,171, 63,  2, 80,118, 45,171, 81,  4, 81,180,170,159,211,227, 56, 17, 19,  4,193, 85,220,135,184, 51,248,  7, 46, 92,
+104, 16,252, 38,151,226, 95, 24,193, 69, 68,  5, 21,201,194,  7,130, 95,160, 98,  2,  6, 51,100, 38, 51,233,247,212,195,123,111,
+ 85,117,247,140, 67,192,129,204, 98,  8, 77,119, 87,213,189,183, 78,221,115,206, 69,245,123,211,185,156, 68,125,228,149, 97,207,
+140,121, 62,244,120,211,156, 72,228, 92,245,130, 94,141,242,251, 50, 64,214,101,200, 76, 39, 19, 87,177,230,146, 91,135, 55, 82,
+145,108,140,202, 52,185,189,248,190, 59,191,135, 49, 56, 23, 98,168,216, 26,130,146, 33, 29,159,248,189,184, 63, 43,103, 80, 99,
+190,249,246, 74,186, 86,119,147,219,112,  0,  8, 92, 83,204,242, 29, 40, 96, 97, 90,153,100,167,112,131, 85,141,172, 78,211,213,
+ 26,248,225,195, 59,247,159, 29,236, 89,200,213, 51,199, 62,116,226, 68,211, 17,254,235,112,116,136, 70, 25,200,222,176, 91,108,
+244,172, 99, 60,135,241,224,116,104,172,249,177,156,170,152, 65, 45, 28, 39,  1,204, 92, 73,177, 18,133,117,124, 75,228, 69, 84,
+ 39,193,132, 86,100,236,201,211,199, 87,175,108,164,217, 36,140,144,208,113,253,218,250,244,108,  2,177,102,123,107,235,231,175,
+163,172, 72,159,239,191,124,112,239,238,160,159,192, 99,213,115,121,244,123,244,231,248,228,195,199, 79,235,107,151,111,110,222,
+216,217,185,189,187,251, 40,157, 78,223,189,127,253,246,224,179, 16,117, 94,229,123, 47,246, 39,179, 20, 74,251,170,154,147,251,
+  9, 34,251,204,195,215, 14,111, 44,205, 84,224, 41,200, 71, 81, 72,180, 50,  5,241, 20,242, 45,148,216, 72,254, 64,131, 20,205,
+ 98, 43,208,236, 13,195,160, 15,139, 80,179, 60, 42, 34,197, 82, 49,255,113, 50,206,132, 56, 43, 74, 46,227, 82,100, 24,  7,133,
+217, 47,155,178,  7,255,228,  2,113,149, 14, 24, 17,232,137,186,  8,248, 63,173,238, 13,112,169,107, 85,118,195,226,146,124,182,
+190,176,159,125,213,134,180, 75,175,230, 16,202,139, 42, 51,199,185, 13,213,200,168,152, 57,157,103, 18, 14, 98, 60,137, 33,166,
+164,156, 66,136,115, 41,105,141,119, 97, 16,  7,209, 48, 69, 84,199,146, 29,188,133,208,220, 86,220, 11,123, 20,250,186, 20, 38,
+ 37, 65, 43,112,225, 73, 62,110,183,241,109,153,230,117, 35,  2, 93, 11,179,201,246,230,173,175,223,191,248, 84,203, 82,228, 82,
+ 29,222,128, 65, 50, 32, 26,110,140,211,145,143,190, 94,132,220,107,231,  9,105,226, 14,169,  2,172, 94,192, 40,147,235, 30,206,
+ 21,142, 14, 47,214,142,164,234,130,181,117,107,181, 24,141,223, 21, 14,212,214,232,192,  0, 28, 30,107, 29,  8, 77, 87,139,161,
+178,211,158, 88, 27,243,100,179,214,124, 99,216,100, 22, 93, 59,104, 80,193,  8, 70, 91,118,  2, 90, 49, 48,227, 57,174, 50,221,
+ 18,120, 41, 73, 80, 41,100,222,106,158, 99,173, 38, 89,163,  4,169,145,172,171,  8, 87, 52,205,158,218,147,156,222, 50,169,246,
+ 40,221,248, 51,155, 28,  6, 63,196,  1,186,202, 12,130,126, 41, 42, 33,107,109, 77, 56,141,220, 14, 44,114, 88, 70,202, 28,178,
+ 18,251, 16,123,222, 32,247, 80, 85,201, 27,136,199,129, 16,202,193, 18,109,202,134,219, 30,192,212, 42,207, 57,119,121,200, 77,
+126,186, 11, 53, 45, 78,181,213, 94,197,185, 23,144, 60,223, 74,145,165, 37,  9,154,255,114,169, 92,250,252, 21,128,177,235,123,
+141, 26,  8,194,151, 77,246, 46,201,209, 22, 90,139,160, 15, 22, 69,193, 39,139,160,255,115,169,248, 92,124,247, 77,  4,197,  7,
+235, 67,241, 55, 74,185,122,181,119, 73,246, 54,217,117,190,153,221, 92,170, 82,125,190, 64,114,179,187,179, 51,223,204,124,223,
+191,241, 25,250, 20,211, 54, 44, 80,  1, 57, 31,153,155,111, 81,137,  2, 98, 56,183, 63,110, 20, 55, 41, 94,172,186,149,226,124,
+158,188,  6,166, 88,189,240, 42,208,117, 13,227, 48,107,190,204, 95,  8, 63, 69, 76,228,188, 52,171,100,172,121,141, 64, 96, 97,
+ 43,  6, 93,236, 86,190,125,222,204, 83, 24,184,211,216,214, 62, 82,181,224,160, 54,  8, 36, 61,183,208, 58,110,130, 15, 88,100,
+ 40,184, 70,158, 36, 90,150,182, 53, 79,158, 63,  5,206,198,251,134, 43, 84,120,172,208, 19,211, 26,188, 59,214,122,105,217,192,
+183, 14,131,118,219,229,150,206, 38, 31,103,159,248,244,160, 51,236, 76, 47,174,141,243, 50,215,211, 92,103, 25,184, 24, 41, 49,
+208,217, 72,107, 47,245, 41,225,253, 67,176,171,244,203,215,199,173, 61, 54, 93,146,144, 51,182,102,186,185,251,254,243,233, 88,
+231,143,246, 31, 30, 28, 30,242,108,150,187,187,183,119,125,103,163,237, 44,157,  0,203,121, 33, 69,218,247,238,223,121,252, 96,
+127,179, 44,158, 29, 29,189,125,119,242,245,219,151,101, 93, 43,214,169,121,241,234,141,181,109,150,166,197, 68, 67, 37,213, 98,
+238,131, 76, 81,209, 85,202,227,114, 20, 52, 21, 57,188,  4,217,100, 50, 65,152,230,148,  3,123,240,  8,224,210,180,164,152, 62,
+233, 26, 80,155,205,150,230,251,217,124,105,237, 69,229, 26,186,118,188,  9,250,103,112,213, 85,208, 85, 96,224, 24, 82, 24,152,
+ 19,134,121,107, 90,154, 65,189, 81, 78,142,244,173,171, 63,246, 92, 57,222, 88,172,126,114,215, 65,146, 68, 17,156,225,164,254,
+ 80,199, 67, 14,109,138, 57, 14,215,  7,248,  9, 99, 41, 44,219,228,175,216,210,225, 74,134,104, 91,198,190, 53, 22, 24,249,130,
+119,190, 53,182,  9,  7, 16, 81,164, 94, 81, 98, 23, 17, 24, 31,103, 41,215,194,116,222, 93, 48, 14,211, 67, 64,228, 23, 90,168,
+151,251, 64, 35,147, 36, 67, 97,247,  8,100,224,  2,171,108,205,109,145, 89,231,251, 94,140, 32, 77,126,107,247,246,135,211,147,
+100,224, 17,  2, 87,  6, 78,188, 51,166, 81,125, 31, 49,153,244, 50,135,107,111,183, 92, 23, 20, 78,166, 89,112,191,209,179, 43,
+102,114,249,219,124,192, 80, 85, 79, 94, 38,121,146,138,196, 97, 62, 82, 62,138,196, 78, 36,159, 81,129,121,131,211,108,134,168,
+133,246, 79, 78,172, 31, 14, 79,201,  5, 21, 47,  3,201, 66, 36,128, 85,253,172,147,168, 42,135,161,168,128, 65,171,212,215,171,
+138, 22, 27,230,  2,135, 41,144, 25,153, 95, 79,217,197, 83,116, 65,207,  3,179,101, 68,  7, 96, 12,144, 84, 21,255,166, 19,137,
+ 62,104,140,185,223,114,184, 88, 56,149, 41, 89,133, 36,127,190,152,113, 83,255,168, 94,213,163,193, 82,  6,254,119, 60,205,155,
+220,197, 72, 29,106,157,204, 69,194,197,  7,254, 89, 34, 75, 54,218,165,  6,215,248, 66,168, 41,184,117,199, 96,178,206, 84,251,
+116, 51,131,227,198, 20,185, 48, 27,114, 19,142, 29,  6, 55,189, 10, 96,122,165,139,255,127, 89,227, 95,  2, 16,118,197,202, 77,
+196, 64, 84, 90, 73,119,246,  5, 19,219,  9, 73,138, 80, 65,  3, 13,  5, 13,  5,191, 64,199,167, 82,241,  7, 12,  5, 20, 12,198,
+164,  0,  2,147,194,198, 78,198, 57,251,206,178,116,135,118, 87,119, 99,  7, 18,202,140, 39,231,243, 72, 90,237,190,125,251,158,
+190, 13,169,147, 60,221,220,190, 40, 65,154, 28, 94, 37,151,149, 20,174,173,176,211,245,228,180,123,138,230, 71,174,178, 72,203,
+  7, 28,169,169, 96, 29, 98, 61, 73,169, 80, 27, 20,171,175,184,  3,120,136, 20,243,119,236,167,107,161, 83,208, 93,204, 38, 97,
+ 17, 18, 85,183, 12,155,  1,133,247,104,204,149,218, 45,124,191,215, 68, 21, 86, 72,200, 99,170,111,132,209,226, 41,163,120,196,
+ 77,159,104,190,203, 27,113, 63, 27, 24,165,151, 54, 39,153, 51,100,218,135,  7, 39,160,143,251, 71, 87,249,229,227,147, 71, 95,
+ 47,198,  6,244,211,135, 79, 70,231, 35, 20,236, 55, 38, 84, 42,211,235, 89, 20,141,164,164,230,123, 57,145, 15,252,208,164,137,
+ 22,209,165,  6,176, 33, 25,158,185,182,168,104,145, 40,225,100,229, 54,  2, 85,  7, 80,189, 75,209,108, 70, 88,113,155, 25, 56,
+ 26, 14,206,206,198, 47,158, 63, 59, 56,188,119,114,156,189,126,245,210, 59,248, 50,254,100,157,203,  5,  5,100,186,116,202,124,
+245,230,221,251,183, 31, 63,132, 50, 96,113, 93,218,194,247,187,157, 94,150,246, 58, 98,176,167,209,188,187,210,225, 54, 67, 12,
+ 29,229,215,192,134,192,227, 42, 69, 43, 99, 80,126, 18,151, 96,131,227,181,117, 87,195,253,142,201,180,194, 43,204,131,119,234,
+ 98,178, 88,148,110,182, 44, 11,114, 40,198,218,138,240, 64,218,148, 21,219,122, 84, 88, 17, 36,236, 98,140, 87,157,108,143,130,
+144,187,208,199, 45, 34, 71, 49, 78, 90,225,211,202,111, 68,157, 54, 10,209,219,194,  6,  8, 91,  3,118,227,111,216,115,243,204,
+136,107,202,188,240,103,225, 87,127,127, 79,180,218,161,243,198, 70, 49, 97, 33, 86, 54, 15, 47,156,153,222,138,252,249, 90,145,
+166,109,246,113,216, 30,228, 56, 46,104,192,194,239, 62, 55,172, 96, 74,232, 19, 39,169,117, 40,251,156,119, 52,194,170, 29,194,
+ 59, 60,107,129,199,178,155,116, 14,122,135, 63,103,231,195,189,225,124, 57, 39,170,168,193,136, 36,  9,198, 71,141, 34,104,131,
+ 41, 19,191,126, 76,191,193,150, 82,124, 43,  4, 73,233,137, 28,253,250, 12, 60,223, 93, 87,255, 22,110,147,114,158,255,134,232,
+ 93,204,188,151, 58,146, 88, 36,235, 48,192,127, 37,219,136,205,110, 66,186, 67, 89, 51,254, 70,  5,205, 57,194,102, 38,203,116,
+203,150,138,198,221, 53, 65,118,143,130, 60, 96,162,201, 25, 15,141, 75,250,136,133, 95, 69,163, 25, 41,183,133,104,226,192,160,
+ 38, 56, 94, 51,101, 94,182,192, 69,248,231,196,211,188, 17,115,120,194, 49,223, 79,251,151,197, 60,210,214, 36,118,173, 17, 28,
+164, 40, 12,141,  3,106,180,190,107,178, 99, 69,252,109,127, 67,168,133,107,179,154,242,123,130, 82,203, 77, 25,245,200, 41,168,
+ 40,178,220, 70,152,142,163, 71,133, 32,  4,168, 36, 95, 47, 98,208,199, 69, 13, 25, 79,236,210,135,115,130,224,164,219,224,  4,
+169, 20,187, 24, 35,198,116,126,159,194,150,219,  8, 92,132,246, 91,114,121,212,186,  9, 47,135, 72, 46,245,126,100, 91, 87, 53,
+159,138,214,182,247,238, 16,111,192,240, 44,197,221,214,196,127,  4,224,235, 74,122,155,  6,162,176,103, 28,123, 28,103, 79, 42,
+165, 85,  5, 92, 57,113, 66,226,208, 27,255,132, 11, 63, 22,137, 43,  2, 21, 42, 36, 10,136, 37,148,218, 73, 92, 59, 51, 25,230,
+123,111,188, 36, 80,164, 40,135,200,138,101,121,230,205, 91,190,  5,253,119, 75, 39,115,103, 34,212,200,231, 52,123, 67,138,142,
+166, 78,221,169,100, 24,121,168,173, 75,111,170, 69, 50,231, 60,152,184, 68,240,221,230,  6, 30,159, 15,188, 58, 56,101,135,141,
+ 51,102,177, 80,122, 87, 50,142, 35,149, 70,233, 32, 74, 37,197,222, 47,155,207,119,166,112, 59, 54, 43, 50,205,210,160, 65,237,
+219, 18,216, 65, 50,112, 17,204,214,202,118, 30, 79, 79,105,  3, 83, 97,  3, 54,169,174,109, 33,209, 26, 54,144, 31,226, 81,254,
+ 52,157,132, 48,219, 16,238,213,110,139,141,197,247,214, 66, 92, 72,220,184, 19, 30, 13,122,123, 58, 59,211, 32,193, 26,166,112,
+243,189,220,227,228,225, 70,187,152,104, 66,184, 81,151,129, 49,  1, 33, 99,128, 46,175, 74,228,184, 46,154,199, 49,220, 73,148,
+ 10, 35, 21,168, 88, 66,177, 32,145, 46, 64, 63,123,250,228,205,187,183, 15,207,207,151,203,211,201,104, 58,159,159,204, 39, 48,
+153,188,188,250,  8,230, 29,102,210,160,114, 97,161,239, 69,182,134,173,240, 32,141,163,126,146,105,243, 99,189,189,190,217,172,
+242,114, 93,237,116,137, 92, 71,146,232, 58,172,104,201,188, 10, 25,150, 11, 79, 66,244,  3, 57,148, 98, 22,169,101,156,246,118,
+ 50,207,108,126, 27,189,255,126,123,249,181,248,176,250,253,107, 91,229, 40, 58,184,193,198,196, 96, 75,136,154, 61,243,251, 48,
+202, 54,  1,156, 81,  1, 39,115,165, 73,226,206, 57, 13,175,112, 47,163,250,255, 74, 17,111, 71,141,119, 70,243,224,232,197,243,
+151,175,175, 94, 13,195,145,182, 85, 23, 33, 96,235,112,115,116, 38, 12,213,152, 88, 69, 94,164, 44, 18,145,245, 35,122,113, 72,
+154,181, 42,236,  3,247,  2,211, 71,247,138, 34,225, 29,207,113, 83,221,168,125, 81, 41,213,104, 99,176,178,  8,  9, 34,145, 99,
+243, 63, 12,119,164,219,225,154,236, 24, 17,248, 92,236,  9,123,132,122,180,227,100, 90,236,214,108,149,235,178,186,126,156,186,
+101,254, 51,255, 70,160,198, 59,222, 27,184,216,119,206,  5,117, 87,172,173,107,244,  7,179, 71,174,102,151,  7, 36, 82, 97, 91,
+206,107, 11, 63,175,139,140,150,254,221,250,212, 55, 97,215, 59,111,  0, 69, 58,234,143,220,130,240,  2,141,247,136,221, 52,  0,
+201,144,230, 84,170, 23,153,189, 38, 15, 94, 98,245, 51,228, 11,149, 31,214,126,204, 30,200, 20,139,123,100, 32, 67,155, 84,178,
+164,  7, 77,171,  2, 47, 58,128,107, 16,247, 37,107, 61,  5,222,180,137,250,236,228,251,225, 45,103, 66,130, 72,146, 37, 31, 11,
+ 65,201,144,135, 91,190,245,199,187,219,211, 72,197,201,100,158, 21, 57,141, 35,  8,138,234, 37,219,240, 16,181,128,220,222,183,
+222,168, 12, 32, 68, 11, 70,100,230, 80, 22,201,221,119, 49, 92,108,202,181,251,151,139,199, 23,159, 86,215, 36, 96,204,197,215,
+190, 33,166,134,158,193,137,159, 33,245,100,170, 84,165, 24, 83, 55, 56, 29,201,131,  0,164,149,163,100,234,162,127,109, 76,220,
+ 49,247, 12,196,114,114,182, 45,215,173,142,207,193, 52,179,213, 13,106, 82, 13, 22,131, 59,226, 61,137, 99,243, 63,241, 55, 83,
+164,251, 73,100,108, 58,166,149,247, 77,173,254,  8,192,215,149,237,182, 13,  3, 65, 81,164, 68,209, 87,108, 35, 72, 31,154,160,
+232,255,127, 74,251,  9,  5, 90,160, 15, 65,130, 88, 64, 98, 89,146,117,144,221,157,149,  4,169, 73,251,108,152,150,104, 30,179,
+179,187, 51,236,239, 65, 51,182,207,142, 20,150, 98,207,196,243,212,216,172, 57,101,202, 66, 72,167,131,  2, 78, 87,108, 54, 23,
+160, 63, 99,178,251,245, 61, 20,187, 90,214,210, 15, 56,123, 20,119,200,192,134, 35,128, 76,136, 32,173,133,181, 22,107,171, 33,
+136,171,237, 46,219,238,179,157, 99,243,114,255,253,249, 91, 31,117, 13, 99,223,150,251, 80,192,102,130,  9,238,167,208, 66, 14,
+238,201,138,  0, 66, 25, 72,221,  4, 35,194, 70, 52,122, 50,184, 85, 67,151,  7,185, 29,186, 69,104, 16,250,244,224,110,234,166,
+228,180, 15,133,235,113, 10,137, 81,205,235, 30,133, 77,154,207,216,  0,114,153,155,154,123, 52, 80,211, 95,124,218, 62,215,235,
+ 38, 86,137, 51,166,238,130, 77,232, 43,  1,  8,154,121, 18, 73, 52,100,150,128,161, 79, 52,178, 87,220,158,203,218, 71, 52, 13,
+ 15,159,239, 30,159,114,186,  6,234,206, 75,198,134, 32,178,209,198, 57,155,151,158, 32,127,141,163,244,202,234, 95,234,181,106,
+104, 78,157, 77,173, 53,150,194, 87,227,223,202,182,174, 26,130,237, 92,171,168,149, 99, 85, 20,191,129,214,188,243,241, 46,177,
+ 95,182,236, 61,255,214,134,210,247,167,170, 57, 87, 28, 66, 76, 14,170, 49, 92, 12, 83,229, 46, 93, 49, 72,249,120,154, 41, 87,
+117,165,135,235,  1, 27, 13,178, 24,113,  4,  3,132,136, 61, 40, 33, 71, 12,173,189,  0,172, 35,135, 14,119, 59,109,237,205,165,
+ 57, 47, 15,232,192,188, 48, 69,211,126,112, 34,109,163, 94, 51, 18,247,233, 76,134, 72, 22,148,209,182,165,251,123,228,102,166,
+213,245,112,252,250, 59,255, 53, 14,232, 93,178,169,219,203,191,106,231,253, 71,160,134,176, 66,235,175,209,232,167,184, 74,215,
+244,170,117, 87,202, 37, 77,129, 19, 65, 96,204,200,251, 42,158, 32, 10,  1, 97,116, 18,102,125, 96,223,196,147,253,108, 52,184,
+  4,208, 91,163,238,222,150,215,203, 82,240,107,112,251,146,  7, 75,217, 22,202,183,  3,171, 51,203,225,141,143,141,149,182,248,
+125,186,204, 93,234,138,234,117,170,140,156,239, 59, 89,237, 96, 54,195,104, 79,175,208,185,180,176,139,255,219,165,123,218,182,
+ 99,117,142,160,107,141,100,170,244,  3, 42, 61, 35, 82,  4, 21, 65,126, 30,140,185, 52,153,163,148, 24,  5, 32, 82,113,  6,  7,
+234, 33, 43, 49,216, 36,  4,116,145,240,  9, 46,231, 56,118,156, 82, 41, 95, 22,210,179, 42,238,241,241,160, 33,204,149, 75,254,
+110,255,201, 24,253,227,233, 39, 88,205,174, 97,148,193,138, 32,157,239, 15,187,227, 75,145,215,205,181, 11, 98,173,205,208,163,
+159, 90,216, 65,214, 51,171, 46,212, 76, 28,230,202, 13,129,179, 98,122,101, 55,249,229,116, 92,223, 82, 60, 87, 84,  5,189, 13,
+133,110,116, 35,210, 83,228,231, 23,214,146,103, 55, 75, 67, 17,219,  8,177,121, 44, 58,139,152,192,  1,105, 37,213, 99,180,134,
+ 15,171,  3,171, 22, 42,150,212,150,  0,202,207,114,147,244, 44,230,221, 95, 60,175,129,  9,209,  2,209,140,220,189,132,  5,195,
+125, 19, 45,181, 69, 37,117, 16,131,111, 84, 51, 47,145, 15,199,255,127,183,197, 31,  1,248,186,150,221,166,129, 40, 58, 30,219,
+ 99,135, 64, 43, 17, 64,160,116,  1,252,  8, 63,193,142, 47,236,138,159,224, 31,144, 88, 66,187,104,169, 40,139, 56,118,237, 25,
+ 15,247,156, 59, 78,236, 20, 85,138,178,176, 18, 59, 25, 95,223,185,175,115, 78,242,239,179,146,157, 93,218, 74,150, 45, 77,237,
+208, 33,102,161,  2, 86, 65,230,112,248,213,194, 20,239, 86, 91,151, 21, 32,112,136, 10, 56,214, 74, 46,233, 77,224, 53, 37, 11,
+198,  6, 46, 91, 36,184,224,243,122,101, 93,229, 16,188,131,193,185,168,238,186,155, 31,247,223,197, 56, 90, 96, 82, 60,135,  3,
+ 83, 15, 92,222,215,213,139,246,161, 33, 72,153, 45,124, 29,  6, 72,120, 84, 75, 42, 16,134,212, 76,239,192,211,101, 11, 16,129,
+189,249,120,117,251,203,229,217,246,229,197,223,230, 94, 30, 44, 49,193,139,205,118, 93,175,174,239,174,224,223,105,241,242,251,
+190,124,250,124,249,237,107, 34, 70,128,205,137, 59,197,172,213,200, 34,205, 88,246,183,175,111,118, 77, 46,201,192, 84,119, 52,
+202,108,169,189, 59, 56,205,  2, 90, 27,  6,106,124, 72,110, 93,  9,148, 45, 64, 64,182,  4, 52,130, 65,132, 92,110, 93, 99,189,
+ 92,105,189,183,191,247,189,100,162,251,193, 55,221,176,107,123, 32, 78, 77, 40, 89, 93,161,132, 48, 44,183,237,122, 50,204, 32,
+ 87,232,250, 49,175, 74, 38,242,242, 48, 12,178, 91, 20,222,156,163,158,239,222,158,159, 57,238, 45,118, 44,218,208,128,162,147,
+163, 97,236,226, 67,228,128, 88,109, 49,199,170, 11, 77, 32,234,209, 27, 21, 47, 54, 12,230,201,230,129,187,165,177, 85,228,192,
+ 85,194,196,135,228, 37,130, 89,136, 16,165, 65,240,231,245,153,172,135, 68, 76,178,205,239,135,102,138, 36,194,  9, 42,239, 80,
+ 90, 57,  8, 31,230,198,121, 51,112, 32,221,243,120, 98, 60,151,123,247, 16,218, 37,174,239,255, 25,232,140,236, 40,215, 51, 16,
+ 81, 82,139,147,105,161, 38,168,127, 33, 30, 35,150, 83,145,156, 68,109,125, 24,144,159,127,216,102,118,113,185,120,108, 30, 60,
+ 53,236,160,162, 63,148,236, 61,209, 82,210, 30,157, 43, 74,241, 98,217,148, 70, 80, 81, 52, 39,160, 39, 62,226,137,156,196, 49,
+ 82, 20, 31, 55,207, 94,237,186,102,140, 73, 57,100,193,124,182,116,235, 83,177, 95,171,236,140,203, 98, 76,  2,152, 20,218,200,
+141, 86,198, 13,227,235,212,  6, 69, 48, 14,244,185,122,108,100,195, 38,149,223,149,124, 66, 25,178,217,  8, 77, 75,165, 12,142,
+ 28,168,139, 60,  3, 88,242,224,214, 81, 14,229, 13,  5,190,105,166,184,157, 81, 72,  7,175,140,227,186,100,174, 22,  3,240,180,
+ 66,137, 14,229,100,157,239,134,209, 67,171,128, 40,101, 50,133,177,176,  8, 45, 27,124,151,179,140, 75,182, 82,173, 45,176,172,
+ 26,  8,131,116,165,147,171,239,250,189,206, 98,192, 67,227,105,240, 22,136,150, 94,130, 75,144, 78, 99,170, 50,176,  7, 59,234,
+254, 45, 71,154,190,213,  0,123,164,124,171,  4,155,218,225,200, 20,225, 54,105, 57,205, 44,240,209,136, 64,170,205,104,202,152,
+197,101,210, 26,103,180,123,241,  8,155,152,183, 91, 76, 85, 86, 45,225,132,241,212,251, 39,255,254,126,243,225,250,207,207,240,
+ 36, 77,253, 63,  1,  8,187,182, 29,167, 97, 32,106,215,118,156, 52, 85, 90, 16,101,  5,  8, 33,158,144,248,255, 31, 97,121, 65,
+192, 35,210,238, 66,233,110,155, 52,110, 46,142,119,102,236, 36, 77, 75,133,250, 18,169, 73,147,182,227,241, 92,206,156, 51,209,
+231,227, 23,130, 94,158,107, 78, 78,133, 75,130, 20, 11, 11, 83,200, 36,169,138,129,188, 31,117,187,137, 95, 47,213, 42,175, 75,
+ 99, 27,129, 14, 29, 13,194,203, 62,128,231,154, 57, 50, 43, 71, 59,188,210, 16,233,104,153,164, 81,154,202, 88,176,238,203,246,
+214, 52,121,150, 46, 55,135, 77, 99, 43,236, 58,162,140, 13,237,157,131, 56, 13, 31,135,170,103,161, 35, 52,106,251, 98,110,232,
+200,178,124, 33,136,243, 88, 68,136,101,  4,155,131, 23, 85,240, 67,112,129,124,186, 92, 99, 16, 79,101,156,182, 91, 36,243, 67,
+ 85,194,187, 36,214,238, 72,181,167, 93,205, 95,110,203, 71,200, 36,192, 73, 55, 81,113,175,246, 71,204, 77, 72,226,131, 90,252,
+204,249, 65,185,192,139, 73, 89,173,212,154,199, 26,247, 30,228,101,236,144,114, 29,190,103,132, 18,226, 16,227,179,133,198,246,
+ 77, 83,241,253, 65,228, 88,244,193,157,  4,220,169,169,154,202,182,149,181,115, 45, 82,141,244, 30,144,194,128,153,151,  6,245,
+197,224,114,120, 38,211,192,102,129,169, 67,139,132,201,158,  2, 27,114,136,218, 84, 85,145, 35,219, 78,170, 52, 92,187,210,201,
+ 18, 82, 35, 28, 55,227,202,105, 99, 11,170,195, 32,236,136, 59,  9, 89,132,119,223,158,200, 77, 48,105, 58,227, 89,155, 49, 74,
+183, 54,213, 89, 89, 23,240,177, 62,122,119, 30,223, 48,113, 85, 65,118, 50, 81,  9, 81,168,  7,187, 23,161, 89, 58,153,175,118,
+ 87,176,188, 20,248, 43,159,102,178, 19, 94,148, 16, 24,177,208,212,226,189,170, 34, 46, 63,174,106, 87,177, 17,230,141,207, 32,
+241,182, 42,137,226,188,218,159,209, 76, 94, 83, 61,237, 49, 45, 51, 54, 98, 64,176,193,126,179,124,251,176,187,203,226, 21, 68,
+  3,223,239,190,157, 98,145, 61,189,156,146,186,105,143,108, 40,163,156,172, 12,254, 47,252,242, 57, 41,141, 80,  4, 60,109,134,
+194,172,111, 35, 93,251,137,168,253, 57,241,239,152, 95, 58,210,155,236,253, 59,121,223, 25, 81,174,246,237,229, 94,238,131, 10,
+ 40, 46, 52, 54, 81,129,132, 42,170, 84, 56,197,112, 12,  2, 17,226, 95,148, 28,143, 41,216, 22,148,206,  6,153, 11,143,138, 20,
+161,166, 45,108,128,178, 34,114,  5, 12,185,110,143,  1,150,216,245,114,125,140,130,247, 97,  1, 50, 65,  2,122,  1, 34, 25,134,
+ 97, 89,240,117,176,118, 60, 31, 53,197,230,152, 65,182, 20,188, 55,180,242,240,160,115,239,215, 31,126,222,255,128,219, 81,214,
+ 59,131, 44, 23, 91,201,104,196,184, 51,  8,210,102,234,  9,  6,209, 76, 23,113, 10, 62, 29,110,247,176,251,195, 17,249,106,215,
+233,218,116,199, 93,249,180,152,103,182,174,225, 73,115,179,127,149,173, 55,197,239, 79,111, 62,127,253,117,235,145,220,148,168,
+182,239, 94,124,124, 52,127,253, 40,254,182,124,234,201,216, 93, 23,164,189, 71,212,253,217,  8, 18, 31, 60,112,111,  6,112, 62,
+228, 16, 82, 70, 24, 83,242,129,171,250, 18, 30, 60,254,245, 39,210, 90,126,  4,130, 13,154,218,238, 66,225,253,191, 24,121,127,
+218,179,  0,124, 93, 93,111,211, 64, 16,180,207,190, 56, 78, 82,147, 34, 81, 34,120, 40,188, 35,229,255,255,136,194, 31, 64,  8,
+ 33, 80,213, 64, 63,104,113,237,179,207,119,236,236,222, 37,142,137,144,170,188, 52,138, 99,103,111,111,118,111,103,102,146,223,
+211,127,106,189,116, 50,193, 22, 90,162,209,204, 90, 49, 40,229,253,153, 71, 30, 25, 61, 87,249,217,166,216, 80,222,105, 44, 58,
+190, 76, 97, 29, 16, 71,120,112,148,200, 41,  0, 40,  9, 83, 40, 20,133,134,107,180, 70,163, 70,125,123,250,124,243,124,  3,134,
+ 71,  2,217, 55,100, 48,209,255,247, 66, 44,150,152,139, 98,170,220, 66, 17,215,  0,132,146, 15, 54,190,244,189, 64,128,206, 49,
+181, 40,121, 28,110,166, 74,173,202,213,155,234,245,143,251,107,218,133,182,151,219,187,199,219,251, 63,183, 40, 65,164, 16,197,
+225, 83, 48,117,100, 42, 16, 40,158, 29,133,155,162, 76,183,170,251, 90,184,184, 40,168,114,215, 86,245,227,204,224,190, 65,153,
+ 78,165, 25, 69,241, 73,139, 66,110,150,235, 77,199,190, 29,108,226,  1,  1,179, 76,210,211,192,238,165,132,  9, 50,229,202,162,
+160,149,215, 66, 29, 99,152, 65,133,  7,137,181,243, 93,107, 29,221,166,246,186, 29, 82, 88, 72,250,196,216,206, 24, 75, 31, 81,
+228,136, 70,199,222,241,125, 79, 48,199,211, 30, 69,143,171,239, 58,130, 44,157,197, 95,211,216,223, 77, 95, 27, 12,159,105,229,
+171,172, 80, 86,207,210,116, 61,  7,154,145,210,196,178, 58, 56, 55,101, 88,146,204,137,234,  7,122, 55,240,218, 70, 71,141, 42,
+104,174, 98,197,131,210,  7, 47, 74, 23,137,127,213,188,170, 77,189,199, 14,233,148,114, 61, 28,219, 16,159,134,184,  2,255,150,
+ 97, 96,113,188,121,120,102,126,251,245,226,252,221,197,251,143, 95,175,232,167,191, 88,190,250, 89,239, 74,189,100, 80, 19, 50,
+ 13,109, 15,132, 15,106, 62, 83,141,178,164,255, 23,236,155,142, 30,140,101,188,248,136,126,127, 16,117,192,239,225,192,150,  7,
+180,243, 60,167,224,196, 65, 77,226,233,210,173,125, 94, 22, 47,232,121,143, 79, 70, 71,202,192, 62,153, 90,117,203, 40, 59,174,
+242,146, 71, 30,211,253,154,158,126, 67, 21,212,150,130,166,159, 58,248,159,122,225, 48, 68, 15,141,112, 23, 62, 90,255,178,191,
+158,204,171,123, 86,  9, 16, 11,135, 44,211,236, 74, 12, 76,157, 67, 62,136, 94,129,123, 50,218,117,114,193, 37,204, 94,197,144,
+100,137,247,138, 61,142, 74, 98,  5, 64,107,197,176,143, 41, 54,253,129,155,225, 80,228,224, 38, 58,214, 71,150,241,164,128,156,
+166,226,243,120,105,102,123,150, 83,156, 36,151,148,105,153, 88,193,117,155,192,115, 39,205, 25, 11,197,175,  1,189, 89,156,111,
+ 66, 18,146, 46, 71,  0,231,195,229,246,211,151, 43,174,138, 68,193,192,111,214,111,175,239,190, 11, 57, 32, 70, 32,202, 81,169,
+ 56,170,114,253,100,234,110,104,133,192,196,182,170, 78,235,130, 48, 28,183, 26,193,225,238, 97, 75, 41, 14,149, 88,179,244,212,
+206,230, 21,  1,133,221,195,142,240, 88,221,183, 73,152,240,142, 24,231,232,247,117,227, 38,225, 66, 47,204, 96,134, 67, 24,200,
+114,193, 32,103, 32, 11,143,129,142, 63, 38,156, 73,247, 51,212,181, 46,137, 92, 13,249,119, 85,158, 63, 52,191,164,251,151,158,
+102, 87,157,232,216,200,155,254, 10, 64,216,181,236, 54, 17,  4,193,153,217,183,157,181,113, 28, 39, 74,114,203,137, 11, 34,226,
+192,129,175,231,192, 31, 32,200, 13,  4,  2,161, 32, 99, 39,126,173,199,251, 24,186,186,199,187, 22,182, 68,148, 67,148,104, 45,
+103, 60,211, 83,253,168,170, 46,190,235,147, 50,214,123, 80, 18, 28,108, 80,237,157,209,240, 67,200,108,  5, 49, 89,  7,163,193,
+241,184,161,161,160, 18,221,102,183, 89,152,150, 94,  4, 78,154,177,102, 47, 12,157, 12,226,164,116, 81,158,166, 61,147,208,142,
+249, 52,123, 88,185, 69, 24,132,243,245, 12,247, 57,133,120,130,117, 94,235,189, 25,102,163,  2,170,255,182,213,170,102, 86,161,
+ 54, 94,199, 79, 42,135,106,220, 63,175, 27,187,221,149, 40,249,  1,134, 24,208, 75,125,203,136,242, 46,228,140, 33,235, 59,211,
+106, 32,244,155,248,205,221,171,207,223, 31, 34, 19,190,123,249,246,253,199, 15,  0,239, 60,204,121,127,247,250,219,239, 31, 79,
+219,  5,212, 69,184,172, 90,241,213, 45, 10,150, 42,168,202, 81,177, 84,244,198, 97,144, 93, 86, 21, 45, 65,130, 94,  4,236, 88,
+129,172, 81,140,230,156,163, 86, 69,221,  4,190, 21,173,217, 78, 18, 70,178,180, 42, 55,147,139,136,226, 45, 42, 57, 16,171, 41,
+138,102,109,183,235,221,142,118,105,222,143, 38,121, 22,201,184, 58, 90,184,181,221, 86,200,163,249, 87,107, 75, 40, 36, 46,184,
+ 15, 74,  1,159, 94,205, 90, 75, 47,179,161, 27,  9,130,143,208,121,  7,196,193, 57, 86,105,210,152,216,109,214,106,190,170, 42,
+219,100, 42, 24,  4,248,247,123, 38,164, 11,134, 62,192,141, 43,192, 18,174, 53, 76,112,112,236,240,108, 13,135,  4,124, 12,146,
+ 16,251, 10, 25, 67,201,122, 95,196,200,194, 76,202,151, 41, 39,146,173,218,251,177, 56, 82, 91, 64,220,227,113,165,143,202,134,
+135, 65, 16,  2,201,154,174,183,130, 79,136,159,205, 72,227,158,221,121, 67,162,125, 16,111, 41, 69,126, 91, 18, 98, 98,190,204,
+ 73,154,183,180,173, 92, 14,202,248,178, 37, 99,138,145,119, 14,122,234, 34, 14,211, 60, 25,206,214,211,142,220,215,137, 40,224,
+122,142,227, 88, 12,103,218, 25, 81,199,140, 10,246, 74,213,135,195, 42,195,222,139,231,226, 73, 31,201,140,116, 66,199, 82, 71,
+104, 65,155, 59, 98,165, 59,137,172,110, 60,184,156, 47,255,232,195,248,206, 75,125, 53,184,158,174, 30, 59, 14,129,246,132, 41,
+246,179,145,131,169,185,151, 96, 68,228, 55, 98, 78,105, 20,134, 17,119,158, 40, 29,140,225, 74,234,123,161, 41,132,168,245,200,
+ 68,151,121,114,209, 15, 38,103,113, 22,129,219,  1,112,100, 20,228,140,118,245,170,168,159,183,106,110,221,115,161,167, 22, 67,
+181,220, 78,103, 40,206,246,180,141,120,165, 41,111,210,228,137,172,206, 72, 76,104,199,221,  4, 47,211, 31,111, 70,215, 95, 30,
+191, 42,174,115, 98,215, 41,142,239, 28,229,165, 32, 83,178,142,140,173,119,244,237,205, 33,180, 68, 92, 97,165, 98,249,206,178,
+156,178,162, 57, 96,114,151,  9,137,202,108, 35, 90, 41, 92, 50,135, 14, 45,198,206,120,130, 89,171,125,212,150,192,221, 76,  6,
+ 87, 43,187,220,216, 13, 43,215,162,164,138,253, 86, 22,252,172,116,203,121,226,155, 41,173,109, 17,197,233, 46,239, 60,194,217,
+174,195, 28, 62, 91, 20, 72,254,175, 35,130,200, 52,209,209, 32,184,112,222, 27,255, 90,252,228,170, 90, 32,102,223,206, 63,229,
+ 78,186,216,255,247,235,175,  0,140, 93, 77,111,211, 64, 16,245,218,222,117,226, 52, 77,218, 82, 17,133,182,215, 30,144,144,144,
+248,  9,136,  3, 39,254,102, 15, 28,248, 19,156,184, 32, 85,130,  3, 66, 28, 80, 69, 75, 16,184,142,147,216,187,246, 50,111,198,
+219,244, 67, 72,168,151,182,106,171, 52,182,103,223,204,188,143,190,190, 63,108, 99,149,186, 15,115,194,148, 38,238,185, 74,253,
+ 64, 45,145, 98,207, 76, 45, 53, 29, 29,172, 86, 37,239,222,209,229, 76,245,238,209,104, 14, 83,214, 22,184,208, 48,199,157, 14,
+198, 65,130, 52,233,  8,153, 24,186,178,215, 31, 23,231, 27,208,156, 35,235,155,201,206,193,162,184,114, 81, 35,  4, 39, 31, 82,
+ 87, 68, 61, 17,247,146, 16,166, 76, 49,241, 23,197,155,  5,  8,147,108, 55, 97,119, 11,240,185,233, 88,166, 26,145,160, 67,164,
+ 98,161,169,184,211,109, 77,159,240, 30,127,146,239,206,246, 30,127,191,132,166,105, 66, 56,180,169,232, 88,202,204, 96, 93,175,
+ 79,143, 78,127, 20, 87,191,150, 11,199,154,108, 49,141,230,172, 95,107,177, 69,194, 72,156,110,172,217,116, 94,214, 69,103,234,
+ 50, 43, 97,216,101, 91,197, 82,133,198,226, 12,166, 50, 59,204,226, 76, 83,229,133, 86,114,133,156,  2, 31,196,179,132,169,113,
+206, 13,147,228, 81, 62,188,234,154,142,173,250, 60,140,121,219,138, 94, 74,131, 34, 75,181,125, 62,205, 39,227, 36,213, 32,176,
+ 91,231, 45,146,130, 65,240,202, 76, 66,143, 82,227,162,114, 73,224, 67, 67,197, 74,183,225,202,242, 59, 14,110, 13,117, 71, 84,
+157,107,231,107, 60, 34,145, 54, 17,245,  9,214, 66,  0, 69, 71,212,166,238,196, 42,139, 26, 43,103, 27,211,166, 59,105,156,167,
+ 38, 55, 70, 14,170,198,114,216, 60,155,112,163,202, 59, 12,228, 49, 79, 75,204, 90, 34,111,188, 76, 78,168,130,164,206,187,135,
+155, 79,193, 34,119,179,156,194, 72, 49, 29,206,166,199, 95, 23,159,233, 34,142,244,184,178,165,250,167,253,145, 10,194,144,237,
+102,136,  9, 48,112, 97, 45,123,188,175,238,213, 77,182,122,198,150, 53, 67, 72, 11,222,126,157,228,182,221,104, 80,241, 28,175,
+ 46,251, 28,221,155, 48, 35, 40, 54, 18,253,100,255,228,219,207, 47, 33,230, 37,241,119,103,154,125,136,157, 64,219, 45, 84,138,
+111, 39,126, 68,129,248,203,161,185,140,217,  4,174,138,168, 64,  8,116,204,176,204,116,  6,199, 30,  8, 50,111, 78,190, 86,  5,
+111,  5,181, 53, 80, 51,244, 61,216, 63,132, 71,108,155,197, 33,209,105, 60, 72,140,195, 22, 42,234,131,141, 48,  0, 77,249,107,
+201, 88,210,120, 68,128,214,  9,167, 27,172,155,  8,123, 65,189,199,152, 61, 54, 74,239,235,116, 54,214, 39,211,252,248,208, 28,
+ 76, 50,132, 56,243,216,153, 97, 50,148, 46, 94,100,204, 50,166,136,216,139,177,141,174,151,238,226, 79,119, 89,232, 69, 29, 45,
+106, 27,243, 72,217,247, 33,129,226, 73, 28, 11,243,130, 53,171,113, 24, 92,108, 37,199, 97, 65, 39,232,191,147,225, 59,218,118,
+190, 82, 64,241,232, 47, 45,149,254,220, 12, 95, 62,127,117,246,254,204,123, 97, 61,132,178,128, 77,236, 97, 81, 21, 14, 78,188,
+ 74,168, 81,178,178,164, 31,217, 27,239,255,174, 10,164,191, 49, 93,140,126,113,104, 70, 93,107, 87,204, 16,237,109,198,249,127,
+148,169, 11, 67,  9,208,224,169,151,166,115,111, 99,233,177,174,251,209, 77, 24, 79,122,105,155,188,162, 63,181,110, 86,131,116,
+ 80, 53,203,219,201,  7,132,117, 54, 22, 87,214,232,  1,157,106, 85,159,243,215,241,  7,251, 45, 42,117,127,186,226,187,215, 47,
+222,188,251,240,150,122, 42, 23,185,167,243,103,159, 46,206, 67,156,247, 54,158,172, 95,186,162, 12,179, 38,247,255,170,252, 95,
+  1,232,186,150,229, 36,130, 40,218,243, 30,102,  8, 18, 30,134,160, 49, 27,227, 55,164,252,112,171, 92,185,208,133, 91,127, 64,
+ 43,101, 64,  2,145, 16, 96, 96, 30, 61,211,222,115,187, 71, 38,104, 82,149, 41, 22, 36, 60,186,231, 62, 78,159,123,206,127,226,
+187,245,140,183,182,211, 28, 29, 68,143,230, 68, 65,203,181,221,205,110,141,206, 78,  9, 62,219,243, 65,146, 17,192, 17,186,113,
+ 23, 38,135, 74,180,189,246, 56, 30,211,149, 42, 62,223,246,181,157, 18,189,203,101,122,255, 43,185,127, 76, 31,112, 63,240,152,
+184, 89, 90,136,134,115,171,165,195,133,210, 38,236,245,236, 53,103,233, 78,171,  3,186, 18,124,191,120, 51, 87,106,220, 31, 39,
+251, 77, 14, 65,125, 20, 84,204,244,130, 16, 60,135,117,168, 25, 67,135,215,113,125,248,229,161,156,215,180, 92, 10, 22,  2,250,
+115,160, 36, 86,252, 87,146, 81,193,  2,210,174, 82,163, 19, 69, 85,188, 25, 92, 92,157, 95,125,248,246,209,245,188, 18, 39,189,
+237,172, 76, 83,153,211,190,109,117,100, 60,164, 45,147,229,185,218,225, 92, 89,165, 84,214, 74,  5, 32, 19, 98,  0,  2,178,215,
+ 48, 59,117, 61,122, 88,105,124,147,213,123,132,253,105, 49,117,125, 31, 32, 39,215, 58,153, 44, 10,176,143,202, 56,244,206,186,
+ 81, 43,116,216, 16,139, 53,171,133, 12, 60,187, 29,133, 54, 10,234,124, 52, 26, 93,191,191, 30,246,123,159,191,124,165, 76,244,
+253,230,231,228,246,214,245,124,246,205, 46,211, 76, 38,123,153,115,189, 19,  4, 86,  0,178, 38,181,231,202,243,  4,181,  7,153,
+ 20,219, 68,108,118,149, 22,183,217, 83, 70,161, 79, 91,200,216,117, 66, 10,  7, 44,188,  6, 74, 41,253, 66,136, 91, 49, 40,207,
+ 39, 83,102,130, 92, 24,209,230,  6,133,139,201,145, 39, 89,190,163, 14,130,130,198,184, 59,186, 89,254,176,143,139,116,163, 29,
+ 98,153,131,217,102, 56, 83, 71, 44,177,208,139,210, 98, 71, 47,209,  9,105,161,105, 23,149,180,115,  6, 39,131,201,227, 68,135,
+ 10,234,189,168, 29,214,242,100,170, 30,128, 56,141,122,219,253,138,179, 14,235,238, 54,143, 29,213,113, 33,175,177, 23,250,207,
+ 20,244,114,173,220,123,116,154, 42, 68,173,  5,102, 76, 26,107,150, 70, 51,178,215,228, 13,139,249,241, 84,226, 68,125,138,188,
+191, 55,115,195,127,  6,200, 85, 94, 14,222,206, 30,167,153,220, 83,160, 56,239,190,154, 45,167, 54,143, 61, 80,218,140,189,120,
+157,174,158,170,  7,234, 17, 83,235, 48,116, 37,106,145, 23,131,207, 40,212,226, 58,223, 40, 22,246,226,178, 93, 31,150, 82,155,
+135,128,142,210,156, 58, 33, 42,213,225,241, 66,165, 21,148, 42, 44,186,210, 46,244,232, 86, 29,  5,254,235, 23,241,187,179,240,
+ 98, 24,  7,129,163,129,  4,172,144,  6,124,112,225,  9, 83,206, 85,140,123,224, 84,138,174, 84, 22,  0, 75,145,149,190,206,215,
+226,110,229,206, 18,119, 85, 84,185, 44,205,212, 40, 40,191,104, 32,213, 83,105,132,191, 11,110,248,206, 96, 69,234,244,  1, 19,
+ 78,201,130,190,128,103, 25, 34,164,135,113,  4,198,237, 98, 61,175,216,202,141, 13,169,141,211,158,193,104, 76, 71,136, 55,109,
+114, 50,195, 40,250, 94,102, 21, 57, 60,231,180,213, 95,165, 15,  5, 85, 73,150,241,177,225,128, 93,214,200,251, 33,107,131,147,
+137,198,  7,  7,  7, 84,240,105,247,178, 82,131,106,120,105, 78, 31,134,101,  9,139, 65,230, 18, 31,198, 59,226, 32, 78,210,132,
+191, 39, 52,184,108,191, 86,105,183, 41, 74,177,212, 31,136, 99,232, 30,  8, 85,175,253,114,177,189,115, 45,205,155,208,159,  8,
+225,150, 13,194,155,228,254,138, 86, 18,138,152,255, 48, 23,158,251,249, 35,  0, 93, 87,187,218, 68, 16, 69,119,246,123, 55,217,
+216,216,164, 52,133,210, 10, 85,240, 71, 65,170, 32,248,  6,226, 67,  8,250, 50,234, 19,233, 51,168, 69,196, 31,130,138, 86,209,
+ 20,147,150,184,117,179,223, 51,222,123,102,119, 83, 34,205,191,144, 31, 59,187,153,189,115,238,189,231,158,163,249, 51,198, 37,
+163, 44,113,165,192,152,106, 79, 12,193,162,237,  4,145,226,140, 69,213,233,254,239,223,122,240,246,203,107, 11,246,187,141,141,
+139, 50, 67,215,175,185,251, 97, 66,146,205,  4,136,118, 88,175, 11,135, 54,151, 54,180, 46, 25,116,101, 24, 44, 10, 93,147, 81,
+141,224,187,108, 24, 68,145, 63,136,243,216, 22,171,186, 63,191,255,182, 55,236, 15, 79, 23, 83,143, 93,185, 53,177,150,139,135,
+104, 22,241,228,197,157,253,195,207,211, 79,182, 98, 24, 63,240,162, 81,180,185, 53, 24,253,152,159,208,166,113,224,220,232, 64,
+248,253, 90, 48, 96,177,120, 76,102,106,173, 57,200,153,169,174, 32,200,248, 93,213,116,185,155, 59,  7,199,223,222,179, 25, 19,
+ 26,247,146,135,  6,197, 36,218,249,122,118,  2,149,  2, 10,216,210,166, 48,106,151,195, 77,193, 53, 34,197, 61,165, 56, 22, 69,
+105, 85,133, 73,200,158,112, 29,129,230,113,127,242, 43,153,150, 12, 45,173,153,181, 48,  3, 87, 59,187,179,148, 38,197,100,163,
+ 78, 74,186,156,181,189, 17, 97,236,  8,179, 39,182, 69,  9,106,200,132,122,222, 79,247,238, 30, 61,126,242,116,239,246, 33,161,
+192,217,247,143,227,201,238,197,124,246,226,217,243, 55,239, 62, 84,149,149,  3,125,231,204,206,171,153,193,138,218, 21,221, 18,
+ 61,250,176,103,132, 30, 29,110, 42, 93, 26,105, 38,146,140,229, 37, 10,237,180,170,128,250, 11, 90, 32, 33,156, 50, 52,184, 91,
+ 78, 95, 43,206, 92, 36,179,224, 27, 16,132,154,124, 35,  5,130,234,153,209,169,101,115,159,186,130,204,186, 99,251, 89,149,154,
+ 87, 78,216,173, 59, 77,211, 67,190, 30,142,206,151,243, 86,163,156,255, 77,223,  9,170, 42,239,249, 17,102,253,133, 92, 57,108,
+160,231,207,137, 96,208, 78, 51, 53, 81,131, 82, 67, 58,116,247,198, 55,206,255,204,  8, 94,137,150, 32,208,173,195,119,252,164,
+ 76,244,226, 61,219,131, 14,101,254,191,251,146, 46,180,154,151,170,154,180,  0,215,245, 88,182,150,199, 82, 58,105, 45, 94, 10,
+193,255, 10, 38, 30, 77,251, 12,172,109,140,237,106,250, 34,183, 61, 67, 47,202,202,132, 98,167,235,184,180,189,181,231, 12,151,
+252, 48,186, 93,214,229,229,182,112,219,  0, 48,215,184, 55, 93,124,231,150, 41,100, 55,233,129,211, 45,203,186, 64, 27, 83, 56,
+152,122,103, 95, 23,139,123,206,125, 63, 50, 85, 74, 59,214,133, 86, 47,167,204,166,189,227,187,187, 27,193,193, 86,111,127,187,
+239,184,173,  0, 31,191, 37,208,231,211,194,220,220,143,114, 28, 63,112,131,190,217,235,219,182, 47,108, 79,193,146,148,187,244,
+148,165, 22,121,145, 45,147, 56, 78,255, 46,210,228, 34,203,211,248, 66,253, 60,243,126, 47,131,105, 86, 88,  0,171,140,229, 13,
+ 11,199,150,208,101,104, 29, 99,218,252, 12,108, 71, 20,  2, 52,219,189,212,110,203,178,206, 97,199,193, 23,226, 20, 76,130, 87,
+163, 32, 70,221,241,103,224, 45, 11,143,120,209, 52,246,155,255,183,110, 39,117,233,183,237,141,201,116,113,202,  9,  7,  6, 30,
+ 88,174, 76,147,104, 52,173, 82,151, 90,218,198,168,142,170,178,221, 46, 96,230,107,118,176,194,  0,115, 85, 33, 82, 19,108,167,
+196, 11, 12,159,102, 50, 89,106, 72, 46, 91,138, 37,248,154,116, 23, 15,143, 30,189, 58,126,217,208,173,128,184,133, 92, 73, 67,
+172,141,158,181,  3, 91,162,235,192,170,238, 20,236,198,185, 86, 47,139, 92,119,212,185,250,243, 79,  0,198,174,101, 39,110, 24,
+138,218,142,157, 56, 78, 50,  1,134,151,  0, 33,181,160,138, 10,117,213, 15,224,  7,202, 95,116, 81,169,127,202,178, 72,253,  2,
+250,160, 20,  6,230, 61,147,216,233,189,215,246,116, 68, 89,116,151,  5, 66,153,241,157,235,251, 56,143,160, 47,150,  4, 37,165,
+ 16,100,126,114,151,172,  9,245,121,  5,165, 44, 45,172,109,144,170, 10, 95, 61, 53,152,222,  3,253,230,254,  6,221,207,137,216,
+188, 50,153, 65,143,102,127,157, 70,165, 71, 28, 15,195,105, 49,171,179,140, 28,183, 29,157,151,245,146, 79,  8,238,240,208, 68,
+106,189,124, 53, 99,116, 49,109,103,222,222, 58, 98,222,131,117,234,201,222,233,175,225,207, 92, 21,144,242,136,153,230,253, 61,
+130,149,204,253,232, 14,126, 61,138,214,247,112,160,139,249,116,127,115,119, 58,159, 66, 85,  0,141,133,136, 76, 90,244,239, 98,
+ 45, 41,113,132,225,157,239, 67, 93,240,103, 96,148,212, 44,244, 92,223, 30,127,120,194,160,136, 85,102,157,215,183,195, 91, 58,
+ 78, 55,183,237,100, 97,199,179,118, 56,230,221,180, 26, 12,248,195,160,187, 27,112,197,247,126,143,198, 75, 75,154, 80, 82, 45,
+237,124,216, 60,194, 11, 64,249,207,157, 80,213, 50,175,136, 59,146,160, 54, 27,225,200, 88, 42,161,185, 75,122, 70,105,124,123,
+169, 51,105,242,148, 35,172,190,219,217,234, 93, 94,126,248,248,233, 51,180, 19,110,254,157,179,197,211,195,237,215,235,171,227,
+147,211, 94,161,175,191, 92,213, 61, 93, 22, 18,125,190, 21,109,157,137,155,229, 90, 95, 76, 73,214, 73,228,103, 53, 46,149, 93,
+ 89, 64, 23,130, 62, 83,165, 54,239,207,223, 38,174,123,120, 26,  9,166,160, 53, 53,  6,154,211,165, 66,140, 70,226, 77,209, 50,
+132,255, 96,100,195, 51,100, 13, 56,250,192,122,164, 66,187, 65,216, 70, 48, 96,241,145, 71, 27, 23,150, 43,211, 58,183,198,182,
+ 65,185,212,149, 66, 25, 95,131, 54,250,136,105,145,171,189, 66, 49,226, 69,  3,  1,179,104, 22, 34, 90, 82, 64, 72,146, 84, 94,
+ 75,233, 30,110,177,214, 47, 62,225,115, 24,  8,  3,183, 12, 22,131,144,131,219,153,196,134, 77, 58,212,172,134, 39, 73, 96,126,
+148,  9,235,229, 27,208,156, 80, 89,129,177,247,108,210, 30,228, 72,152,203, 84,234, 25, 52,135,219,199,232,213,137, 11, 77,140,
+  5,177,150,220,189,228, 94,207,212, 29, 57,208, 10, 22,125, 30, 59,118,118,120, 62,130,234,  7,185,172, 88,  7, 16, 26, 16,203,
+ 90,148,104, 23,164, 82, 24,136,  9, 81,165,115,173,206,133, 44,140,116, 74,193, 60, 30,166,251, 43, 52,128,153, 93, 37, 41,177,
+118,145,132, 41,201,  1, 89,226,186, 11, 43,116, 77,222, 97, 70,114,147,170, 74, 65,179,156,104,  5,207,162, 76,210,131,194,188,
+219,169, 47, 94,245, 47,206,250,111, 14,203,173, 26, 83, 59,252, 54, 20,116,180, 89,154,166, 56,171, 73,112,129,  6, 95,101, 85,
+236, 29,149,251,175,245,238,145, 40,250, 54, 41,103, 54,153, 55,108, 12, 77,225,210,161, 85,175,149,141,208, 60,171,178,141,157,
+162,127, 80,109, 31,153,106, 75,107,182,145, 79,106, 53, 75,157,110, 59,141,131,120,225,135, 93,  1, 90, 19, 45, 57, 87,108, 46,
+252,131,237,178, 63, 37,125,177,149,170, 90, 27,156,244, 92, 28, 80,176,216,156,209,108,136,  5, 66,134,139,215, 43,127, 81,200,
+136,178,245,120, 54,241, 54, 65,156,199,219,218,215,206,156, 67, 12, 19,196,178, 99, 43,111,241,224,139, 18,134,106,200,100, 67,
+ 23,210, 77,156, 43,224,212,222,121,  7, 16, 74,107,141,231, 36,211, 42,213, 18,188, 40, 40, 47,210, 74, 48,104, 99, 64,113,217,
+162,120,113,248,119,193,220,131,191, 32,181, 20,105, 82,252, 95,144, 76,120,221,231, 68,167,238,255,149,200,254,  8, 64,215,185,
+244, 54, 13,  4,113,220, 94, 59,235, 56, 73, 93,  2,109, 17,109,213, 22, 40, 41, 32, 78,168,229,204,  7,225,  0,119,196,129,  3,
+ 18,124, 26, 36,248, 40, 72, 92, 17, 20, 81, 84,241,146,218,164, 21, 13, 41,121,217,241,174,119,153,135,157, 56,149, 56, 38, 82,
+ 44,197, 94,207,227, 63, 51,191,241,157, 25,228, 19,207, 25, 79,112, 97,146,228, 78,171,169,102,154,  4,104,252,111,204,188,200,
+127,130,167,180, 16,215, 80,180,163,150, 18,198, 80,104,244,100, 26, 51, 92,172, 75, 67,240, 74,213,126,227, 54,163,165,225,120,
+136,146,153,165, 14, 67, 90,208,204,  8,255,140, 29,232,252,138,111,183,232,  0,179, 69, 55, 24, 60, 94, 48, 19,223, 79, 14,163,
+176,  9,225, 79, 66, 38,192,153,241,124,232, 61,163,222, 91,151,113, 52,214,108,175,181,126,156,254,132,120,176,234, 75,108,111,
+164,145,218, 98,197, 59,202,133,229, 53,161,166,152,180,100,232, 13, 60,206,214,234,206, 73,175, 83, 13, 26,224, 81,152,247,  9,
+207,126,105,121, 53,209,217, 32,238,193,  5,214, 23,215, 27, 65,116,208,217, 95,137,174,246, 70,184,238, 29,204, 50,  4, 89,221,
+ 81,  7, 39,191, 49,124, 14, 33,177,173,122, 33,164,209, 26,163,123,143, 66,120,183, 94,119,117, 32,224,143, 39, 19,146, 20,201,
+222,  4, 18, 13, 52,149,167,208,147, 41,149,193, 33,186,215,218,126,244,228,241,221,189,135,142, 35,213,168,243,249,195,199,205,
+235, 91,111, 94,191, 13,171,193,121, 47,222,221,125, 16, 53,106, 24,233,196, 14,193, 35, 49,148, 17,138,251,213, 69,206,216,134,
+219,157,234,173,205,141, 59,173,181, 12, 23, 24,217,131,195,111,153,149,207,159, 62,131,135,254,226,213,203,110,191,143,209, 78,
+150, 70, 13, 49,248,147,136,184, 34, 69, 52,176,127,105,215,241,132,188, 39,156,  0, 45, 43,181, 84,197,124,143,136,159,142,150,
+ 61,244,235,177, 30,185,165,199,  0,246, 53,117,202, 61,191,224,219, 17,173, 62, 53,249, 21, 33,180,201, 57, 69,177,142, 67,190,
+236, 76,186, 65, 37, 84,147, 63,192,102, 21,100, 17,199, 16, 58, 22,176, 48, 65,112,237, 62,178,233,177,157, 78,179, 97,246,168,
+221, 13,211,115,159,115,104, 83, 11, 23,  6,113,223, 96, 69,221,167, 52, 69,149,223, 45, 30,192, 46, 51, 41,141,163,106,114,  1,
+125, 63,234,132,162,221, 61,190, 40,200, 88, 94, 59,140,194, 13,100,163, 19, 92, 47,103, 68, 62,165,111,165, 47,225,115,187,123,
+  4,238,208,163,149,212,188,116,128,212, 42,154,199,167,198, 36,222, 34,153, 56, 49,225,191, 68,  9, 52,133,  2, 52,141, 13, 95,
+196,182,139, 28,226, 99, 92,230,177,211,168,184, 71,  0,165,  0,183,222,185,161, 15, 14, 27,124,  3,194, 92, 81,151,132,172, 72,
+134, 27,139,225,237,149,133, 27,215,234,152,232,146, 30,146,102, 70, 10, 92,  4,143,102, 29,107, 82, 20,213, 65,166, 29,132,149,
+230,170, 87,187,164, 28, 49, 78,116,210, 31, 78, 38,112, 46,148, 79, 20,  0, 44, 81,230,121,173, 69, 19,193, 75,155,192, 67,192,
+ 37,130,203,141,181,102,184, 52,110,156,159, 70,191,143, 87,218,234,232, 60,106, 39, 41,188,104, 76,117,229, 89,  0, 99,231, 76,
+ 20,220,136,179,209, 25, 23,244, 80,248,160,138, 69, 24, 84,119,150, 55, 63,253,218, 39,  3, 63, 37, 49,218,124, 70,125, 14, 30,
+205,125,132, 69,172,192,149,207, 98, 26,205,163,176, 18,236, 67,119,220, 35,131,203, 48, 96, 90,208, 97,204, 56, 25, 90,183,152,
+130,117,103, 99, 13,140,230,244,136,114,175, 92,149,170,  4, 59,218,172,205, 21, 43,  4, 68,  5, 91, 87,110, 30, 28,127,145,126,
+229,254,173,189,247, 95,223,209,247,134, 87, 48,230,178,147,181,224,161,179, 12,233,164,112,115,148,206,202,232,108,251,191, 65,
+112, 92,146, 28, 80, 54,121,145, 33, 68,150, 54, 99, 89, 71,138, 10, 13,105,103,243,190,224,191, 33,252, 63,  1, 24,187,154,222,
+166,129, 32,234,181,189,118,156,230,131,170, 73,211, 22,137,130,232,133, 19,226,194,133,143, 11, 18, 72,168, 20, 85, 28,225, 82,
+  9,126,  8,136, 83,143, 28, 64,252, 22,132,  4,133, 86,  2, 36,184, 32,161, 34, 36, 68,212,166, 36,109, 72,237,166,254,216,117,
+188,204,236,174,221, 20, 56,112,110,236,164,218,217,157,183, 51,111,222,179,139,202,189,228, 65, 35,243,110,100,164, 74, 15,214,
+ 16,199,  6,108,109, 74, 35,174, 85,234,165, 68, 72,102, 30, 37, 76,145,151, 12,213,141, 39, 19,146,223,166,106,232, 24, 29, 25,
+ 81, 67,157,240,177,174,223,  1, 20,150,226,183,140, 10,114,169,106,157,141, 27,142,171,140,135, 23,112,105,164,148,233, 41,116,
+ 68, 60, 16,146, 83,245, 86,202, 19,244,124,208,230, 21, 66, 81,234,140, 49,237, 42,205,198,146, 85,197,102,173,177,235,247,144,
+ 59, 96,152, 17,139,101,147,211,146,130, 10,218,224,111,182, 62,187, 61,232, 24,122,106, 67,164,154, 25,136,133,180,186, 91,223,
+ 13,246,168,237,248,209,254,124,235,108,207,239,  2,100,186,119,247,254,165,165,107, 79, 30,173,110,188,127,  9, 41,125,187,191,
+237,209,193, 76,237,228,169,198,233,173,253,215,176,185, 96,219,  3, 76,144,  9, 15, 83, 23,206, 76,215,102,218,251, 91,132,112,
+ 56, 85,208,255,147, 13,  7,131,108,151,115,188,186, 24, 36,102,128, 85, 25,102, 50,100,166,201,249, 81,194,230, 90,205,238, 94,
+152,196,201,131,149,149, 91,203,119,156, 90, 11,254,187,157,239,159,219,223, 54,167,231, 90,176,253,218,237,238,195,199,171,111,
+215, 94, 81, 58,213,239,143,  0,137, 13,227,  3,  8, 62,  7,  2,193,118,108,142, 30,175,156, 97, 27,186,236,148,126,  5, 62, 99,
+198,226,245,155,139,183,151,130,193,  0, 86,240,217,243,167, 31, 62,126,234,245, 58, 87,110, 44, 95,188,112,254,197,155,117,216,
+176, 28,203, 54,102,165, 74,  2, 30,194,181, 25,222, 38,213,115, 71, 18, 26, 91, 60,139,109,226, 22,102,236, 88,238,201,  4, 19,
+169,235,  0,136, 36, 33, 59, 44,226,238, 32, 25,142, 71,159,107, 57,153, 38,246,146,194, 10,205,196, 54, 32, 85,234,187, 36, 59,
+226,164,203,237,108, 65, 22, 47,216,187,169,150, 47, 45, 12,210,196, 33, 30,238, 10,249,140,168,229,178,252,252, 72,120,  8, 15,
+115, 57, 31,  0,127,133, 21,153,156,152, 92,255,178,166, 76, 30, 80, 56,122,236,156, 65,202,211, 40,203, 97,159,108,224, 11,114,
+249,220,213,119, 95, 55,  4, 55, 76,114,172, 72,  2,171,131,  5, 86,118,168, 84, 20, 77,148,187,178,112, 79, 10,109, 22, 45,231,
+179, 40, 37, 60,100,161,137,114, 82,136,209,171,110,205,143,125, 88, 14, 56,181,  9, 22,232,154, 63,131, 29,100, 37,  1,218,176,
+220,200, 72, 72, 70,198,230, 80,117,205, 36,203,189,177, 20,149, 70,190, 76,234, 36, 74, 16,132,114,167,216,132,176, 93,219,116,
+  1,185,163, 79, 38,245, 44,148,196,  0, 96,  0, 43,113,166, 82, 94,104, 76, 44,204, 86, 79, 84, 40,210, 13,225,206, 18, 27,178,
+144,136, 24,191,228,216, 30,186, 71, 98, 93, 71,151,  6,234, 77, 10,123,138, 56, 97,204,226,144,201, 54,191,128,143,209,146, 91,
+114,229,140,  8,186, 59, 96, 34,101,  9, 11, 25, 15, 67, 22,241, 52, 78,146, 72,196, 72,195,129,211,129, 82,123,106,190, 81,157,
+246,234,237,242,143,190,179, 83,106,163,145,145,212,239, 78,149, 46,164,242,244,208,194, 59,122, 56,154, 40,249, 11,173, 10,199,
+ 56,219,236,108,138,124,124,148, 28, 77,  7,253,209, 65,193, 69, 83, 78,232,249, 68,178,  0, 52,224,185, 94,128,102,109,138,240,
+140, 73,180, 86,170, 14, 33, 14,133, 98,183, 74, 71, 79, 75,202, 99,169, 38,120, 62, 12, 81, 41,213, 32,207,  4,161, 15,207,122,
+142,135,252, 28,150, 97,226,132,199,163,161,252,129,184,147,225,254, 45, 47,127, 82, 79, 68,153,175,202, 86, 16,196,128, 37,173,
+160, 97,109, 38,156, 50,252,194, 88, 68, 72, 79,248,171, 22,  3, 97,  0,111,200,213,  0,198,248, 62,255, 24,156, 16,227,230,166,
+ 42,150, 20,  3,205,252,111, 71,167,223,  2, 80,118, 45,171, 81,  4, 81,180,171,187,250,221, 61,111,205, 96, 18, 77,  2, 65,163,
+130,131, 27, 55, 46,196,149,184,116, 33,126,133,123, 87,130,250,  5,174, 92,248, 21,186,209,128, 40,130,168,136,  1, 21, 65, 71,
+136, 58, 17, 31, 76, 18,210,201, 60,250,221,222,123,171, 50,211,  1, 55,146, 69, 32,144,164,123,186,235,212, 61,183,206, 61, 71,
+250,207,180,220, 67,100,166,  1, 55, 16,231,212, 90,170,217, 77, 75, 55,128,231, 78, 10,  8, 40, 14, 26,196,167, 24, 43, 31,172,
+149,229, 62,211,129,106, 41, 99,158, 14,183, 83,137, 46,142,173,153,  2,197, 32,150,165, 89,186,111,213,140,223,109,195,101, 40,
+ 33, 79,247,117, 10,130,214,225, 83,240,157, 42,209,171,226, 72,109, 62, 70,109,  8,174,159, 40, 29,211,160, 35, 34,114,205,109,
+228,148,172, 34, 99, 45,104, 97,138, 81, 38, 21,239,165,210,235,111,228, 89,134,239, 51,211, 60, 96,243,128, 89,232,  2,133, 85,
+190,216,177,154,126,107,123,176,  3, 87,227,218,110, 34,194,189,136,145,136, 92,139, 97, 56, 12,162, 97, 20, 71, 73, 10,160, 10,
+ 85,100,209, 57,125,118,161,179,178,246,226, 85,111,227, 43,214,254, 12, 40, 69,180, 51,218,237,109,245,  8,209,128, 38, 59,182,
+225, 13,194,  1, 96, 96,211,159,217,220, 67,  5,235, 40, 30,160,252,188, 72,198, 52,156, 25, 43,201,136,229,  9,157, 35,135,169,
+ 72, 21,198, 39, 29,195,223,203, 56,252,167, 91, 55,111, 67,105,103, 90,214,245, 27,119,118,183,251,221,247,111,219, 71,151, 62,
+188,126,222, 62,182,180,120,242,156, 87,111,173, 62,124,176,176,184,188,217,223,158,157, 95, 72,226,236,202,213,107,221, 79,235,
+ 26,179,251,155,129,109,217, 97,  8, 47, 89, 17,199,249,209,185,249,206,153,206,187,143,221, 36, 73, 79,157, 88,126,244,248,201,
+221,123,247, 87,159, 62,251,252,229,199, 86, 48,170,217,254,249,139,151,181,108,188,246,230,101,189,226,170, 88, 74, 40,112, 85,
+176, 72,226, 48,197,148, 77, 69,180,206,164,173, 28, 69, 86, 22,242,216, 13,171,  9,132,162, 48, 25,193, 62,  7,240,146, 23,211,
+161, 36,193,178, 77,205,148,123,112, 62,233, 69,136,183,  1,117, 35,170,170,211, 52, 38,  9,215, 74, 65, 72,150,110,230,121, 82,
+158,164,166, 68,227,132, 29, 48,161, 84,229,113, 39, 25,185,138, 55, 21, 80, 79, 12,202, 54,188, 70,148,134,191,131, 95, 27,253,
+111,132, 41,156,250,144, 69, 81, 76,157,210,101,  7,137,122,122,218,126,246,195,247, 63,235, 81,145,144,110,156,218,206,  2,247,
+ 53,209, 99, 69,152, 32,173, 33,122,189, 33,121,165,249, 33,209,118,  5,130, 27, 35,220, 43, 36,247, 86,196,167, 37,140,181,179,
+ 60,179, 12, 11, 46,120, 47, 12,152,128,113,  6, 88,204,241, 30, 85,118,192, 46, 70, 12, 17,209,224,169,248,145,152, 20, 71,210,
+ 73,156, 78, 71,119, 39,216, 70,184,  5,172, 80,215, 92, 19,187, 49,158,101,114,205,174, 26,108,201,247, 46, 29,159,185,176,114,
+120,174,101,193, 90, 14,161,106,192, 14, 67, 65,226, 72,213,226, 26, 38,192, 88, 58, 98, 55, 55, 68,184,146,222,156,211,234,179,
+105,166,142, 71,225,120,  8,239,  8, 80, 52,221,243,172,170,111,219, 85,135,251,142,234,217,170,107,  3,105,229,158, 99,214, 60,
+ 15, 54, 76, 32,176, 21,219,128,218, 21,221, 53, 48, 18, 91,124,161,122,192,105,122,117,207,229, 59,202,128,  7,212,142, 18,247,
+ 87,176, 73,158, 45,226,182,169,155, 77,191,129,163, 15,244,241,229,148,168, 85, 72,218,204,218,192, 36, 84, 54,140,198,178, 95,
+ 58, 17,240,  8, 76,153,164,106,149,240,135, 35,125,177, 66,244,  6,151, 53, 40, 16, 62, 69,198, 66,224,177, 51,172,250,172, 72,
+ 53, 84, 61,112,194, 13,166, 74, 11, 26,230, 24, 54,206,172, 34,173,135,213,151, 38,164,142, 55, 52,221,208,173, 40,  9,165, 17,
+ 10,109,176,193,  8,189,163,103, 42,237,238,207,174, 40,235, 29,195,165,132,  3,137,197,113,  6,240,144,200,178, 87, 36,121,151,
+ 60,  9,224,161,149, 39, 78,225,119, 57, 55,208,187,152,178, 91,217,191, 52,195,101,221, 81, 86,252, 95, 84,223, 95,  1,248,186,
+182,158, 38,130, 40, 60,179, 59,123,105,187,117, 11, 98,133, 98,  9, 26, 44, 10,  5, 52,242, 23, 12,134,144,152, 24,253,161,250,
+ 96, 36,222,222, 13,209,152, 40, 49,138, 62,224,  5, 99, 32, 20,216,210,189,143,231,178,219, 66, 98, 76,154,190,180, 15,211,206,
+206,156,111,206,124,151, 98,127,207,233, 24, 82,134, 95,195,211,105, 57,182, 91,181,189,147, 65, 32, 12,246, 74,146, 81, 30,145,
+ 14, 69, 74, 41,255,201,174,151,195,246,134,228,120,108, 10,115,146,101,149,146,162,204,200,198,206,149,173, 92,226,109,144,109,
+  1, 19,143,168, 17, 95,166,133, 25,172,236, 48,165, 53, 55, 57,247,167,247,155,253,176, 96, 48,176,122,177, 90, 18,169,215, 40,
+ 72,104, 98,230,226, 76,175,223, 35, 35,179, 34, 60,146,253,234,136, 78, 32,161, 44, 13,162, 83, 36,191, 83, 30,252,152,215,128,
+149, 22, 83,  0,136,201,244, 52,145, 29,  6, 61,178,142,177,155,141,203,193,160, 31, 33,253,132,146,121, 53, 90,224,210, 74, 22,
+237, 75, 87,130, 36, 12, 19,116,221,218,254,252,241,245,227,167,159,118,182,195, 40, 40,126,164,230, 46,190,  9,152,127,185,189,
+188, 31,236, 31, 15,142,230, 91,157,159,135,123,128,169, 53,198,  1, 15,152, 94,  9, 95,132, 71,199,119, 26,137, 25,155,213,188,
+  2, 79,186,169, 10,181, 17,186, 78,226,181,121, 13,224,149, 16,143, 30, 62,128,221,190,187,188, 80, 49,147,151,207,158,196, 97,
+ 95, 25,162,187,178, 58, 62,117, 13,  6,254,229,253,155,205,205,231, 91, 91, 91, 75,221, 46,252,210,181,141,251,211,115,139, 77,
+191, 50, 59,219,130,122,180,190,190,  6, 99,170, 86,212,226,252,140,237,228,237,246,213,183,239, 62, 68,121,182,186,114,235,219,
+238,238,246,206,215, 52,201, 28,219,170,  3,144, 83,249,250,198, 93,223,171,190,122,241, 20,224,103,152,144,226, 41,230,204, 69,
+180, 95, 35,200,205, 35,215,101, 18, 25,194, 87, 12,147,195,187, 38,158, 48,163,  4,230,249,153,234,111, 12, 33,146,163,220,132,
+ 60,243,134, 91, 60, 55,151, 51,106,131,176,196,194, 24,101, 38,152,168,108, 20, 25,  0, 43,216, 31,217,211,145,210, 18,208,235,
+ 38, 43,125,  8, 70, 45,185, 17,177,210,128,201,181, 40, 82, 81, 83,116,  1,156,103,145,221,137,193, 44, 25, 59,221, 34,134, 85,
+ 10, 14,105, 68, 25,208, 22, 74,209,114, 89,178,180, 40,  2, 26, 71,221,172, 55,225,232,100,114,  7,175,140, 88, 98, 41, 34,117,
+170, 21, 49, 58,248, 88,202,220, 25,125,123,246, 78,167,213,249,113,240,157, 17, 10, 17,216, 11,  7, 94, 68,128,148, 39, 92,  4,
+105, 16, 52,162, 43,  4, 67,158,115,172, 26, 89, 87, 25,197, 75, 19,115, 65,145,127, 53, 33, 20, 67,186,166, 73,128,221,244,108,
+187,238,218, 53, 87,121,182,211,114,213,198,141,201,123, 75, 83, 99,158,234,199,128,128, 18,210, 91,228, 68, 51, 67,122,155, 99,
+ 41,152,113,180,244, 67,245, 54,210,223,113,137,140, 79,139, 70, 75, 36,121,116, 26, 69, 33, 54,151,209, 45,164,230,192, 59, 84,
+ 84,204, 16, 80,164, 19,176,169,190,185, 74,184,182,168,186, 98,194, 51,155,141,218,228,216,132, 95,243,149, 21,195,195, 29,165,
+156,  4,131, 69, 28,142,  7,190, 95, 83,125,125, 98, 30,167,108, 64, 92, 10,207, 71,215,130, 25, 50,180,210, 20,234, 76, 74, 97,
+171,215,167, 58,251,193,  1,186,125,229,249, 81, 31,  3,131,121, 87,103, 39, 40, 93,222, 86, 48,109, 90,235,242,162, 70, 23,184,
+  0, 86,229, 41,242, 17, 11, 79,123,158, 24, 22, 13,193,140, 67,197,162,109, 20,255,112, 56,107,146,157, 92, 68, 13, 46,163, 94,
+185,  0, 69,151, 29,194,197,136,208, 41,  8,216,157, 16,215,138,189,201, 11, 17, 49,252, 25,120, 62,163, 34,125,115,122,225,215,
+225, 94,249,  1,187,107, 22,202, 12, 89,176, 24,135,250, 51,220,187,226, 52, 60,227,122, 11, 40,138, 44,172, 48,113, 90,202,243,
+217, 91,114,212,123,145,103,219,158,250, 60,109, 65,255, 87,206,247, 87,  0,198,174,100,183,105, 40,138,122,124,137, 29, 59,206,
+224,116,160, 21,160,150, 65,128, 84, 53,  5,132,  4, 93, 84, 45, 93,242,  7,  8,241, 47,108,216,241, 19,192, 55,116,211,  5, 18,
+ 43, 36, 22, 84, 66,162, 18, 44, 80,105, 81,219,224, 56,142,235, 49,182,185,247, 62,187, 13, 66, 72, 72, 89, 37,145, 51,248,189,
+243,206,157,206,169,234,171,220,  5,179,172,109, 97, 54, 48, 74,  2, 63,244, 40, 71,135,250,215, 34,215,114,175,110,208,121,153,
+164,248,219, 53, 71, 40, 93,107,109,115, 22,182,  7, 44, 80,108, 48,160,130, 27, 87, 40, 42,139,105,216, 91,154,139,101, 78,230,
+ 60, 60, 41, 47, 75, 69, 60,234, 89, 20,224, 78,187,147,106,182,192,212,204, 48,137,128, 15,194,130,224,117, 27, 42,220,138,238,
+217,176,165, 89, 64,174, 37, 46, 68, 67,137,117,106,130, 84,230,218,115, 39,238,241,218, 82, 31, 32,203,208, 48,175,234, 39,126,
+ 26,163,234, 58,215, 86,130, 15,132,  3,  0,168,132, 27,122,253,229,190,227, 59,199,238, 41,171,105,150, 97,121,193,152,108, 76,
+ 40,234,207,210, 81, 56,178,141,153,113, 56,  6,228,131,173,  0,241, 32,236,189,  0,165, 42,248,136, 45, 31,  2,130, 67, 66, 53,
+ 52,  3,  2,  0,120,201,106,116,116,181,126,115,241,246,207,209, 17,252,220,123,203,247,157, 51, 55, 76,  3, 88,108,131,192,105,
+ 54,117,185, 57,209,152,204,211,178,  8,236,149, 37,149,174, 40,117, 38, 31,124,223, 63, 60,220, 95,235,175,190,121,253,214,238,
+ 93, 90,223,216,254,244,241,195,141,254, 35, 58,202,163, 87, 47, 95,140,  3, 95, 42,210,103,207,159,190,219,221, 89, 93,187,155,
+198, 35, 93, 83,147,100,236, 12,142,182,182, 31, 95,191,182,220,106, 53, 55, 55,183,246,246,246,102,237,185, 47,251,159,  1,215,
+250, 43,119,  2,127, 20,199,163,153,182,105, 53, 85,189, 46, 71, 65,252,240,193,186,125,229,214,251,221, 29,199,115, 59,150,  1,
+224,160,  8,168, 38,223,208,165, 32, 76, 97,115, 49, 81,163,210, 40,158,222,216,251,165, 54,112,117,166,137,170,104, 69,229,182,
+ 83, 77,111,148,133,180,170, 48,136, 48,157, 87,226,142, 93,189, 23, 79,226,188,148,231,158, 54,131,230, 13,  8,188,225, 87, 98,
+ 56,131,204,128, 14,219, 70, 15, 78,199,243,110,122,100, 85, 10, 67,162, 92,  5,  7, 92, 52, 70,165, 39,105,199,137, 89,134, 67,
+117, 50, 38,247, 51,108,147,133,144, 34,155,  0, 97,229, 54, 82, 66,101,244, 73, 14,123,178, 86,211,101,145,145, 84, 36,143, 55,
+  5,110, 90, 68, 93,179, 17,220, 77, 38,215,121,118, 23,158,198,238, 20,184, 26,118,239,160, 39, 22,217, 70, 18, 14,211,247,128,
+157,242,203, 31,124, 59,249, 90,105, 19, 78,231, 79,139, 63,242,165,136,  5, 92, 10,242,220, 19,109,250, 81,136, 23,198, 76,165,
+ 89, 81, 46,226,128, 52, 99, 53,146,171,  4,164,134, 67,140, 53,152,108,106,192,196,213,182,194, 54, 22, 23,158,172,116,151,230,
+ 77, 31,110, 94, 50,161,177,232,156, 91, 77, 32,115,199,180, 12,234,222, 32,204,  1,185,192,243,142,234, 83, 86, 79,232, 93,198,
+136, 18,130,211,  8,145, 24,201, 36,252, 89,170,130,  1, 75, 16,  9,206, 88, 24,184,193,145,231, 28,140,220, 67,207,251,225,103,
+ 78,160, 69, 49, 26,246,104,170, 96,235,194, 66,135,205,119,236,122,205, 20, 68, 76,236, 76,242,114,163, 75,114,189,101,105, 98,
+226, 13,243, 48,207,165, 11,163,164, 42,107, 74,102,  9, 16, 98, 95,182,175, 14,137,156, 13,253, 97, 86,150, 39, 10,110, 99,200,
+109,105,219,166,125, 22,249, 60,185,151,151,139,141, 74,102,  4,250, 24,190,235, 38,177,191,162, 81, 51, 44,163, 25, 33,202, 23,
+ 60,161,193, 71,220,245,154, 14, 16, 63, 14, 61,137,108,193, 33,232,140,179,  4,168,  3, 48,117,106, 27,146,225,178,179,205,121,
+  0, 22,198,208,255,150,202, 27,114, 29, 21,235,210,174,209,141,200,253,188, 66, 47,169, 82,207,197,110,251,211,241,  9,124, 13,
+154,245,  3, 26, 33,229, 60, 15, 89,228,149,106,208,133,213, 43, 10,207,169,181, 20,222,  6,241,101,145, 11,226,148,208,138, 40,
+ 22,255,242, 63, 19,166,220,160,166,220, 40,197,255,147,128,255, 45,  0, 99,103,210,219, 52, 20,196,113,251,217,241,146,186,117,
+ 66,150,166, 27, 45,170,212,138,245,128,144, 64,229,  4,  7, 16, 66, 21,156,248,106, 72,240, 33,184,192,  5, 33,113, 70,234,  1,
+149, 32,154,170,106,105, 73,186,164, 73,227,172,246,115, 28,155,153,121,118, 82,161, 30,184, 70,178,163, 68,246,188,255,204,252,
+231, 55, 99,255,140,114,137, 81, 32,199, 40, 95,218,187,134,149,104, 57,252,103, 18, 79, 85, 98, 92,181, 36,203, 87, 81,159,240,
+ 46,131,225,  0,101, 47,142, 22,169, 49,170,120,236,255, 97, 44,129,230,200, 99,212,240,  4,119, 23,129,152,  8, 68, 15, 45, 25,
+103,146, 30,173, 61, 62,105,214,188,192,139,196,124,142,132,244,  9,114,185,226, 37,150, 49, 69, 32, 24, 44,109,171, 44, 33,159,
+ 17,239,  2, 50, 47,151,187,157,190, 51,155,  1, 57,214,247,135, 28, 81,233,100,179,129,247, 31,110,  2, 82, 29,110,107, 25,214,
+121,167,  9,233,219, 81,163,134,116,139, 40,240, 56,228,157, 98,137,145,  0,215, 69,183,151,239, 86,106,149, 80,142, 71, 40,123,
+188,219,195,106,149, 50, 86, 45,226, 39,204,231, 74, 32,157, 64,188,135, 40,198,131,243,110,227,212, 57, 14,201, 54,119,210, 57,
+155, 49, 51,185,233,252,198,250,195, 95, 39,187,204, 24,113,196,124, 42,152,234,224,234, 37,201,208, 21, 83, 99, 16, 88, 45, 35,
+165, 27,122,187,221, 61,173,119, 14,246, 15, 43,123,251,131,  1,191,168,215,219, 78,235,254,198, 19,225,105,251,242,233,131,211,
+238, 21,138,243, 47, 55, 95,191,123,251,254,197,230,171,161,239,101, 23, 86,166,211,230,215,207, 31,183,127,148,251, 61,255, 79,
+237, 12,164,102,237,120,175, 52,151,169, 85, 15, 52, 67,186,181,118,163,217,114,234,141, 38, 36,248,156,251,215, 23, 23,230, 75,
+ 37, 77, 51, 87,111,222,251,189,251,211,105,182,158, 63,123,186,181, 85, 70,223,  7, 36,209,186,226,113,120,224, 37, 63,226,  4,
+229,193, 99,145,156,106,  1,225,244, 48,152,146,192,136,171,234,114,178,201,150,177, 20, 28, 85,102,202,132,119,105, 57,183,138,
+204, 56,130, 37,185,  9,172,  6,  1,214, 52,232,112,137,225, 17, 45,102,175, 99,235,142,236, 40,130, 75, 35, 22, 90, 78, 54,148,
+162, 45,110, 20,197, 83,243, 44,217, 28, 18, 21,166,139,144, 92,170, 76,155, 49,109,142, 21, 82,225, 13,143, 50,102,174,207,251,
+  4,140,144,  8, 62, 17,206,152, 89, 31,181, 69, 36, 70,150, 32, 10, 82, 61, 20,159, 75,120, 80,151,114, 43, 29, 92,228, 70, 58,
+153,144, 18,150,110, 89,250, 20,153, 11,  2,177, 56,148, 80, 91, 17, 30, 24,163, 32,158, 26,149, 34, 67, 77,195, 65,  6, 73,  3,
+124, 46,140,147, 99,169, 42,162, 59,205,163,178,164,168,144,176, 38,105,104, 79,154,  8,120, 22,123, 41, 24, 75,230, 22,233,114,
+ 70,220, 15,162,242, 41, 24,223,241, 33,177,116,213,210, 53, 51,165,230, 53,253,205,157,165,205,  7, 37,  8,185, 30, 39, 75, 33,
+ 29, 97,162, 67,128, 68, 38, 85,209, 33,131, 65,241, 78,188, 95,134, 77, 81,244, 31,104,186,  4,137, 96, 42, 45,121, 32,141,  2,
+156, 58,133,244, 77,195,237,122,240, 55, 15,154, 23, 71,149,234, 78,125,244,221,205, 31, 42,115, 85, 86, 56, 86,114,181,200,222,
+115,245,242, 89,184,189,227,148,191, 85,123,149, 70,193,245,213,229,140,180, 94, 52,150,114, 69,137,  5, 29,206,135, 97, 20, 11,
+ 88,217,204,152,134,231,182, 58,184,110, 64,142,153, 69,148,236,197,243, 72, 24,201,157,222, 69,210, 67, 21,255,147,240,176,145,
+109, 26, 49, 51, 33, 31, 65, 38,130,235,131,109,211,118,253, 65, 52,169, 88,200,121, 43, 63,240,251,216, 26,162, 38, 22, 46,  6,
+193,170, 55,126,121,198,202,122, 68,173,161,202, 22, 14, 60, 10, 91,166, 32, 86,209,230, 22,  3, 77,128,184, 99, 29,213, 25,220,
+199, 78,219, 30,218, 31, 49, 88,205, 24,118,151,247,112,127, 14, 82,221,163,236,212, 53, 20,218,  9,238,145, 54,193,169, 16, 91,
+ 68,112,152,181,231,218,174,  3,151, 96, 39,  9,179,  0,180,234,235,138,232,133,198, 26, 28,221, 13,152, 61, 32,178, 41, 32, 23,
+ 98, 82,120, 39,119,208, 56,  0,202, 87,108,163, 76,216,247, 44,165,232, 84,204,148,255, 83,194,255, 21,128,174,107,233, 77, 34,
+138,194,243,100,134, 25,160,  3, 82, 74,171,214,214,  7,182,209,196,198,116,209, 84, 99, 98,234,198,157,233,175,112,105,226,127,
+240, 87,152,248, 72,220, 26,141,175,173,209, 77,109, 98,180,214,174, 52,149,210, 23, 77, 41, 80,202, 60,128,121,120, 30,148, 82,
+ 27,  9, 11, 32, 48,129,203,189,247,124,247,156,239,124,159,116,226,249,177, 55, 67,200,135,117,216,221,152,251,222,  6, 75, 66,
+ 39,  4, 39,254,207,213,175,219,115, 42,250, 65,219,118,157,136, 60, 80, 35, 49,160, 95, 66, 65, 26,185, 58, 41, 86,146,224,164,
+ 91,208,165, 70,134, 61, 17, 75, 83, 55,241, 88, 77,140,235,197,223, 11,172, 43,108,104,113,204,119, 71, 98, 38,126, 74, 62, 60,
+  2, 57, 45,199,197,106,158,216, 61,141,208,185,150,135,  7, 64,  1, 92,124,208, 26, 42,238,172, 29,  0, 18, 36, 38,165,143,244,
+187,208,208,205,  7,119,239, 43,232,156, 42,155,122,  2,190,246,196,233, 66,210, 72, 16,131, 40,244,176,150, 29, 50, 85, 63,160,
+ 29, 98,169,184,156,181,114,140, 91, 45, 51, 13, 65, 27,176,125, 74, 75,166,140, 20,  3, 79, 88, 65,  0, 36, 55, 42, 91,229,250,
+ 38,160,212,128, 18,247,164,208, 67,116, 83,116,169, 85,171,205, 74,195,105,188, 92,124, 13,107,189,229, 69, 77, 27,105,128,172,
+ 73, 34,114,150,138,196, 25,200,112,131,220,  9, 66,185, 88, 42,195, 31,177, 86, 90,125,243,238,149,107, 55,105,140, 59,  2,149,
+193,225,193,244,245,171,197,213, 95,213,234, 78,203,179, 97,255,105,108,175,109, 22, 75,219,149,131,239, 75, 43,239, 63,188,253,
+244,249,227,227,167,207,124, 31,246,101, 13,181, 76, 21,100,208, 43,178,212,246, 66,219,  9, 28, 47,156,157,185, 49, 63,127,111,
+229,231, 34,140,210,229,201,209,107, 83,227,115,119,110, 43,138,214,106,133,245,134,191,190,237,  6,148, 57, 81, 69,  0,124,138,
+166,196,248,220, 27,147,244,158,103, 80, 60,150, 96,189, 90,185, 43, 99,139, 29, 98,196,123,129,125,195,133,145,217,179, 43,118,
+235,160,143, 16,133,217,183,177,220,121,153, 30,199,208,230,  5,155,227,225,233, 86,109,221,243,155, 84, 74,145,168,167,  1, 73,
+ 80,201,120,186,231, 63, 74, 71,  7,  3,229, 65,  5,  9, 86, 87,111,250,149,247,119,120, 11,222,119,171,124,112, 70,178,185,162,
+123, 29,155,214,182,122, 97,120,194, 71,203, 65,161,225,213, 20, 60, 27, 25, 88,188,161, 49, 39,230, 62,230,203, 51,137,193, 82,
+229, 15,252,148,  1,195,202, 38,134, 44, 35,131,126, 79,129, 87,179,107, 93, 48, 18, 73, 92,124,128, 11,193,148,147,123, 60, 54,
+ 73,244,124,199, 39, 37, 81, 64,241,108, 46,125,228, 81, 77,  6, 16,240, 10,108,253, 10,102,  4,163,152, 34,103,204, 12, 71,160,
+110,137,144,165, 14, 72,179,  5, 46,146, 54, 50,150, 97, 25, 42,118,222,227, 87,163, 38, 62,242, 19, 70, 42,112, 34,110,105,138,
+ 26, 87, 53, 89,138,229,101,237,225,205,201,185,233,209, 14,162,117,220,190,233,222,211,253,141, 96,100, 85, 64,229, 72,151,196,
+113,230,238,160,128, 61, 95,147,  3,130,153,194,243,149, 16,170,220,207,170,200,100, 67, 22,214,203,187, 95,151, 55,126,248,103,
+253,241, 25, 99,112, 76,142,153,104, 27, 35,168,186,172, 65,192, 75,103,115,103, 46, 22,134,175, 76, 85,  7,198, 95, 44,184,207,
+ 31,125, 41, 62,249,  6, 16, 64,184,117,233,220,108, 97, 52,143,172, 54,114,187, 67,190, 74,190,144, 27,137,235, 33,  5, 92,148,
+173,215, 45, 64,196,228, 39,194,170, 29,108,244, 77,  4, 10, 38,158,  7,216,228, 72,222,117, 76, 58, 18, 59,228,113,134,211,169,
+237, 29,  6, 66,254,120,180,231,238, 82, 37, 21,131, 19,146, 37, 80, 50,161,195, 86,217, 26,242,254,185, 66,142, 80,223,110, 55,
+ 71,210,249,110, 13,134, 42,183, 73, 61, 73, 82, 57, 72, 51, 37, 21,135,168,122,176,  7,151,200, 24, 89,  1, 85, 64,246, 89,100,
+139,189,102,235, 54,138, 12, 74,125,245, 33,  0, 46,  0, 97,201, 56, 69,201,167,207,194, 63,171,235,102, 64, 84, 46, 74, 78,251,
+110,187,213,103,208,114,196,115,116,176, 62,127,116, 51,245,148, 34, 41,255, 18, 38,121,226,112, 38, 74,224, 86, 33,156,252,237,
+ 19,237, 26,130,112, 92, 36,250,120,108,248, 43,  0, 89, 87,242,154, 70, 20,198,103,209,113, 70,163,198,154,198, 68,171, 81, 99,
+ 66,233, 78,105, 41,148, 64,  2, 45,133,144, 67, 47, 61,244,208,191,166,255, 78,233,161, 52,201, 41, 52,165, 33,208, 94, 90,200,
+ 82, 72,240, 18, 40,130,177, 90,151, 25,103,115,230,245,251,190,247,140,  9, 65,153,139,162,179,188,247,190,229,253,150,171,249,
+187, 60,113,154, 20,198, 37,225,104,218, 64,227,  5,118,177, 59, 50,126, 99,207, 68, 88,100,201,215, 61,125,228,177, 91,158,248,
+156,163, 59, 67,162,101, 73,194, 77,213, 27,185, 49, 77, 79,197, 51,129,248, 41,185, 56, 83,130,105,195,115, 43,120,121,190, 71,
+ 24, 27, 69,157,168,233, 35,215, 20,123,165, 44,128,  7, 22, 10,  1, 75, 30,144, 17,206,192,179,126, 85, 25,155, 23, 32,127,  4,
+ 37,216, 95, 63,219,104,245, 90, 14, 25,161,145,210,145, 52,147,204,166,244,196,246,175, 29,234,139,192,180,212,250,195,193,239,
+198,233,187,213,183,  7,103,  7, 62,  9,235,146, 14,151,216,246,161,123, 60,178, 92, 59,159,201,119,172,182,174, 25,109,179,131,
+120, 12,127,104,123, 54, 92, 79, 41, 91, 52, 93, 19,114, 56, 20, 68, 96,202,250,147, 87,245, 70, 29,206, 32, 12,101,157,188,  0,
+225,142, 45,206,213,254,116, 27, 56,238,145,201,138,202,  4, 78, 52,192,121,167, 66,230,206, 12, 93,193,125, 95,140, 19,138,161,
+161,198,223,196,144, 35,228,234,140,225, 66,185,112,255,246,210,207,253, 29,167,127,190,183,183, 11,131,105,109,245,249,195, 71,
+143,115,185,217,114,117,241,251,183, 47,159, 62,126,216,218,220,180,135,166,161, 71,113,237,146, 34,150,227,199,141,116,181, 82,
+219,255,113, 48, 24, 74,197,252,146,237,201,135, 39,117,114, 10,  9, 95,172,173,204, 23, 10, 95,119,119, 95,110,188,129,170,252,
+248,240,184, 90, 93,254,188,181,141, 40,114, 63,180,253, 17, 20,149, 48,241, 93,199,229,148, 65,136,202,142,103,205,166,243, 67,
+204,139, 49,237, 64, 93, 27,194, 65,144,198,  8, 23,186,194,  7,175,169, 26,247, 14,198,228, 48, 12, 18,218, 20,149,113, 34,250,
+119,204, 54, 28, 83, 90, 18, 29,248, 24,187,212,131,134,133,123, 10, 86,213,139,220,  4,235,229, 75, 45,193, 41, 61,105,121, 24,
+ 45, 70, 28,117, 35,113, 87,104, 58, 42, 98, 27,  0, 41,110,140,205,103, 75, 84, 93, 97,159,183,103,253, 51, 52,131, 42, 60,212,
+ 29, 34,100, 87, 32,172,200, 20,110,137,164,216,174,197, 17,236, 80,207,197,181,120,199,106, 17,224, 33, 70, 88, 82,  9,106,124,
+ 35,134,154, 36,165,236,130,105,119, 47, 91, 61,240,179,226,148,119, 18,221, 12,199,124, 93, 49,114,144, 55, 16, 79,250, 62, 84,
+132,216,225,133,154,216, 69, 71, 33,164,118,199,162, 49,  1,217, 36,184, 22,191, 34,184,183,142,135,162, 47,210, 88,214, 64,161,
+136,167,146,228,117, 84, 13, 19,176,190,107,106, 82,146,223,191, 89, 41,175, 63,144, 76, 55,130,150, 91,  4,116,164,244, 93, 34,
+117, 22,  5, 87,101,  4, 77,198, 17,  4,131,248, 50,196, 47, 32, 72, 16,130, 95, 68,202, 21,165,100,134,252,146, 67,  2,219,147,
+154, 99, 16, 88,189,222, 73,189,209, 79,222,203, 87,150,135,150,231,249,216, 82,128,106, 79,165,244, 30, 98,110, 40, 71, 28, 15,
+213, 97, 74,149, 82,161,152,155,186,145, 57,106,122, 71, 59,167, 21,149,105, 79,111, 25,233, 68,162,239, 90, 67,135,180,245,152,
+ 10,249,170, 47, 55, 59, 30,191,225,112,225, 56,114,152, 96,116,241,142, 58,103,153, 44,229,107,177,168,222, 49,187,119, 75,119,
+220,145,111, 83,177, 62,246,102, 97,164,121, 39,114,115,225,248, 42, 11, 23,101,161, 96, 47, 26, 15,  2,113,143,219, 93,244, 49,
+ 76,161,218,220, 34,  4,140,102,247, 92,112, 83,149, 72, 58,145,110, 15,154,232,209, 32,220,210,101,248,235,242,108,249,175,217,
+ 66, 72, 62,215,216, 66,146, 93,252,102,106,110,224,245,197,232,163,238, 17, 71,246,140,255, 78,210,181, 68,163,115,  6,113,127,
+232,152,104, 15,  0, 15, 20,245, 65, 73,140, 66,102,108,226, 33, 47,214,213,164,145, 38, 93,220,128,175,177,200, 38,161,170,130,
+ 77,216,189, 12,190, 67,160, 50,238, 31, 82,152,142,103,144, 81,142,  1, 70,186,232,153, 92,149,131,148,217, 53, 63, 16, 56,252,
+ 23,128,170,235,216,109, 34,138,162, 83,222,148, 55,205,221,105,114, 10, 11, 96, 17,  4, 40,128,132, 16, 72,172, 64,226, 23,248,
+167,136, 15, 33, 11, 36,248,  3, 36,202, 38, 68,  8, 41,  9, 73, 20, 37, 33,197, 16,197, 99,123,170, 61,230,222,251,158, 29,103,
+149,133, 99,107, 44,223,114,110, 59,103, 42,190,203, 18, 88,182, 68, 71, 99, 30,175, 88, 14,  4, 36, 77, 27, 60,175, 65,155,180,
+104,211,166, 71,170, 14,  3,245, 38, 35,246, 88, 27,254,134, 70,137, 58, 25,160, 35, 19,192,192,231,  1,182, 47,  6,121, 70, 50,
+140,226,173, 89,142, 11,183, 66, 42, 88,246, 31,167, 47, 34,228,167, 98, 76,247,237, 74,137,  7,241, 32,210,174,127, 81,165, 85,
+ 93,  4,136,  4, 25,130,192,142, 34,184,204, 68, 57,181,125,188,211, 79,163,167,183, 31,253,  9,219, 26, 85,229, 81, 22,133,113,
+ 15,219,179, 76,  7,180, 94,  9,170,113,150, 84,220,202,206,233,  1, 88,112, 47,141,176,114, 47,114,110,186, 81, 22, 11, 82, 33,
+100,215, 24, 13,187, 81,119,105,102,185, 19,117, 90,181, 69, 72,167, 41,178,158, 97,194,233,196,189, 33,205,178, 70,121, 81,111,
+182,234, 65,115,107,127, 11,138, 93,188,173, 55,236,185,234,  2, 36, 24,203,180, 86, 23, 87,247,254,238, 17,177,234, 16,156, 69,
+113, 11,219, 32,176,133, 34, 15, 42,231, 10,119, 32,214,171, 54,211, 93, 71, 13, 92,205,119, 84,136,251, 68,177, 83, 88,214,200,
+208,  7,187,219, 63, 55, 54, 62,108,110,110, 66,  2,242, 61,205,182,181,  7,207,222,172,220, 89,219,217,250,246,110,125,253,240,
+248, 20,124,195, 48,145,224, 44, 75,139, 36, 25,118,123,105,185, 82,122,120,239,254,231, 47, 95,193,224,231,103,155,229,114,112,
+176,191, 95, 45,115,139,161,134,162,142, 50, 44,233,147,231,175,207, 14,127,125,250,248,190,125,113,126,114,114, 98,153,162,181,
+ 12, 40, 72,111, 54,170,189, 94,156,101, 24,185,  0,125,184,102,233,162,219, 46,136,100,230,250, 40, 65,158, 13, 22,  0,231,135,
+ 52,110,193, 46, 28, 93,242,  8, 28,139,246, 58,153,223,140,183, 69,144, 21,  4,207,160,  6,211, 91,188, 35, 98,128,104,  4, 51,
+ 97, 28,106,234,141,177,156,197,144,203,140, 16,205,212, 88,114, 68, 58,166,228, 79, 88, 43,145,120, 58, 88,215, 85,255, 50, 77,
+251,240,136,140, 25,146, 34,147,200,202,136,218, 68, 50,231,148,121,197,102, 78,150,139,142,141, 70, 92, 17,184, 59,110,234, 44,
+195,230, 44, 22,254,147,237,137, 36,195,141,207, 30,249,127,213,173,193,147,104, 99,202,130,  1,185,159,176,122,211, 48, 29,203,
+  3,248,  2,  5, 65,201,171, 64,157, 46,156,136,206,163,164, 34,188, 72,129, 89,129,199,160,194,182,231, 42, 11,140,153,128,165,
+196,181,221, 92,121, 62, 78, 99,105,219,244,135,142,145,153,109,160, 12,147,103, 89,186,238,188, 90, 89,122,249,246,133, 18, 56,
+ 74,221, 85,194, 62,203,  7,133,208,  1, 35, 82, 56, 33,181,106, 51,230, 66, 94,178, 77,212, 88,207,145,  1,131,152, 65, 85, 14,
+ 85,107,235,150,226,123, 24, 49,114,100, 77,202,241, 53,  8,171,201,209,193,241,149,177,178,124,119, 45, 73,  0,215,115,110,115,
+226,162,196,117,  4,226,250,192, 74, 14,119,111, 52,198,125,223,  9, 74, 22,247,103,103,106,204, 15,190,255, 56,227,191,207,170,
+143,231,173,186,  7, 33,190,219, 79,112,173, 94, 81,131, 26,235, 31, 37,151,121,166, 75,125,105,177,138, 62,114, 77,238,217, 94,
+132,240, 72,105,148, 27,187,167,123, 14, 15,192, 49, 47, 58,109,100, 39,165,161,171, 84,199, 30,207,204, 29,219, 71,201, 90, 65,
+151, 81,200,240, 48,158,100, 76,248,165, 69, 56, 19,233, 30, 83,125, 45,168,  1, 32, 75,179, 84, 12,129,144,  7, 84, 99,142,229,
+ 34,140, 32,122, 96,248, 71,248,234, 97,220,  1, 16,  0,222, 24,240, 82,132,141, 32,180,200,127,225,249,112,188,154,  5,129,202,
+181, 93,128, 99, 67,121,211, 71, 75, 96,100,216,164, 41,136,237, 31,156,216,225,221, 28,158,156,128,249,  3,112, 44,241,114,156,
+247, 39, 18,196, 88,217, 23, 67,200,  4,114,104, 36,244, 90,166,142, 73,105,  5, 37,151,108,  8,184,103,220,  9,147, 14, 93, 17,
+ 10,129,215,209, 53, 53,244,205, 16, 63,233,162,107,227,  6,206,127,  1,168,186,150,158, 38,162, 40, 60,175, 78,135,233,208,153,
+ 14, 83, 30, 77,193,  6,  1, 19,130, 11,140, 11,127,132,134,159,231,150,157, 11,119,110, 12,  9,137,146,168,105, 76,140,162,  6,
+ 93, 24, 86,208, 66,155,210,199,116,222, 47,207, 57,247, 78,209, 29,133,244,150, 76,207, 61,207,239,251, 78,233,223,101,137,255,
+138, 70, 76, 57, 66,145,115,167,214, 68,105,111, 26,247, 87, 43,168,165, 32,241,229, 49, 57,155,137, 50, 78, 16,228,  3, 85, 89,
+163,125,164,249, 98, 69, 44,187,149, 76,157, 77,252,167,127,202,254,  6,207,228,201,246,179,145, 59,200, 72, 58,154, 17, 86, 51,
+  4,213, 84,152,108,191, 84,150,189, 69,185,195,144, 80,106,108,133,181, 64, 70,156, 16,134, 49, 43, 87,102,227, 59, 32, 98,  7,
+209,220, 54,108,112,202,  9, 26, 19,165,240,162,184,179,177,  3,229, 21,188,156,248,110, 74,220,197,246, 74,171,101,109,140,189,
+ 59, 20,118,193, 84, 61, 31,185,119,126, 18, 65,142,  6,167,245,199,125,210, 63,202,204,154,181, 98, 58,126,132,180,154,180, 96,
+ 12,102, 76, 34,224,180, 32, 12, 26, 53,219,170, 53, 32, 42, 64, 80, 97,157, 37, 72, 10,192, 62,116,221, 60,254,242,122, 83,221,
+ 58,125,255,182,101,173,143,252, 49,146, 69,130, 57,252,251, 81, 26, 95,222, 92,194,225,  7,237,131,158,123, 99, 87, 27,129,234,
+ 35,131, 54,  3, 99,144,226,168,152,121, 89, 76,164, 32, 69,172,196, 73,145,166, 74, 16,162,232, 18,142,169,149, 92, 83,139,233,
+204,187,234, 13,208,151,224, 52, 86,153,185,217,207,243, 95, 75,114,246,104,127,239,213,241,203,235, 94, 15,174,159, 23,164,158,
+151,250, 16,253,112, 55, 44, 14, 43,109,203,216,221,217,254,244,185, 11, 54,191,108, 24,157,206,230,197,197,133, 36,171, 66, 33,
+ 95,223, 12,191,157,127,127,241,252,168,179,247,184,123,118,210,237,126,236, 15,239,124, 63,139,195, 60, 76,216,118,167,188,105,
+ 45, 67,136, 26, 12,199,232,206,114, 25, 17,235, 73, 32,  8, 37,185,156,239, 41, 46,170,114, 21,158, 15,149,144,162,170, 44, 65,
+204, 96,232, 96,169, 28,185, 47,216,106, 98,233,155, 41,115, 33,169,172, 60,167,171, 85, 41,168,249,  6,206, 17,167, 97,124, 17,
+227,189,108, 54,107, 46, 75,139,158, 53,217, 24, 34,253, 21,  5,130, 11,100,138,124, 52, 89,160,  6,249, 97,231,233,196, 31,195,
+197, 70,182, 42,165,210, 18,227,116, 80,119,123,197,112,224, 84,200,185,144,136, 36, 64,158, 11,247,176,145,230, 49, 18,169, 98,
+ 31,147, 71,210,168,225,213, 39, 41, 81,113,240,173,200, 43,229,130,207, 10,  9, 42,138, 78,196,177, 13,  7, 50,134, 16, 97, 40,
+105, 38,164, 80, 16,204,131, 25,134,  1,178, 80,  2, 70,149,245, 47,124, 17,154, 25,227,122, 92,222,195,119,195, 25, 97,126,248,
+196,213,195,149,111,121, 57,147,100,206,157, 43,201, 64,153,165,171,240,163,112,180,219,126, 32, 20,195,175, 83, 85,169,203, 45,
+ 69,152,250, 18, 92, 11,108, 47, 98,164,149,113, 43,175,180,  4,161,166,166, 87, 84, 25,156,127,128, 30, 14,119,246,162,127,175,
+170,242,214, 67,161,166,161, 77, 71, 73, 17, 70, 81, 18, 71, 65,228, 78,167,131, 89,165,214,220,127,247,225,244,228,236,205,249,
+143, 79,131,219,190,101, 56,182,237, 48,228, 10,182,112,112,117, 14, 36, 70, 72,127,181,154, 38,118, 57, 20,173, 86, 55,109,167,
+241,231,214,207,126, 95, 53, 15,215,212,101, 93, 25,  7,243, 40,134,  7, 86,209, 84,113,158, 95,142, 92, 62,172,160,121, 21, 94,
+ 37,168, 17,177, 29,147, 50,186, 67, 24, 71,144, 59, 39,228,187, 85,181,218, 52,215,171,170,234,129,103, 20, 73,154, 10, 81,203,
+ 41,148,239, 41,117, 27, 33, 48,163, 82, 27,  9,181, 66,  0,168,107,117,100, 24,164,169,169, 91,  8,162,165,250,157,173, 48,132,
+103, 72, 21, 67,177,102,174,121,177,  7,137,215, 28,190,244, 44,129,160, 14, 31, 91,215, 77,145,186, 17, 18, 77,108,225,134,194,
+ 33,  1, 65,119, 86,173,213, 89,232,182,157, 77, 91,111, 76,252, 41, 99,122,162,  4, 31,250,189,130,  9, 72,232,154, 65,237, 55,
+ 30,138, 74,216, 62, 87,245, 87,177,248, 75,224, 67,185,155, 98,249, 41,153,175,105,216,126, 56, 43,238,251, 31, 92,208, 95, 42,
+229,  3, 36, 46,135, 84,178,128, 81, 40,216,108, 89,173,177, 63, 17, 23,187,123,185, 91, 47,254, 39,132,222, 59,253,191,  2,208,
+117,117,173, 77,131, 81, 56,201,154,164,105,154,118,109, 89, 29,126, 76,246,129, 50, 21,153, 94, 14,245, 63,120, 35,236, 15,  8,
+ 94,250,119,  4, 47,132, 93,  8, 42,  3, 21,197, 59, 17, 65,157, 40,162, 55, 34,179, 78,152,110,237,218,217, 54,205, 71,147,165,
+245, 57,231, 52,173, 10,178,203,134, 54, 75,222,247,156,231,188,231, 57,207, 51,138,239, 76, 25, 30, 57,173,150,157,178,157,113,
+116,213,232, 69,110,201,169,132,220, 16, 75,148,177, 54, 20,239, 29,146,160,211, 67,170, 44, 98,236,  7, 60,211, 30,223, 43,123,
+ 21,146,134, 87,194,195,234,197, 92,201, 36, 36,100,144, 67,113,170,125, 39, 41, 10, 96, 86,244,161,100,151,159, 58,122,  6,251,
+176,235,119,132, 74,153,250,204,210,241, 55, 42, 95,236,127, 98,164, 18,173, 56,195, 19,182,177,100,151,105, 34, 56,247,165,166,
+230,161,237, 65, 37, 95,  5,122, 98, 51, 85,150,175, 83,229,156,135, 86, 61,233,240, 37,135,172,140, 61,236,  6,238,126,239,128,
+ 87,  6, 74, 33,167,236, 84, 58, 62,238,127,232,  6,189,182,223, 21,115, 59,124, 10,200,223,112,155,168, 40,147, 84,  5,157, 71,
+109,213,188,149,239, 39, 81,219,111,211,157, 48,153,118,110,230,100,163,221,196, 74, 13, 81, 22,184,110,166,110,220,219, 88,175,
+ 55,119, 45,211, 66, 41, 80, 45,206,180,189, 14,247,202,  8,137, 37,234, 16,  9,249,194,194, 74,173,190, 21, 89, 88,233,180,247,
+240,197,200, 33, 94, 72,  2,219,184,198, 70, 37,172,107, 89,162, 58,168,128,108,200,173, 94,128,250, 94,101, 37, 24, 69,  4,190,
+241,195,253,176, 95,173,206, 94,191,113,243,217,227, 39,235,119, 31,224,169,  3,216, 17,190, 97, 85, 35,158,103, 65,104, 64,101,
+ 96,174,174, 94,222,250,186,195,222, 56,250,194,252,210,235,183,239, 81,135,229, 44, 61,155, 81, 80,186, 95, 91, 91,115,202,179,
+143,238,223,110,236,183, 16, 25,186,189,164,219, 11,163,136,138,124, 11,193, 35,111, 44, 46,204,127,248,244, 25, 56, 32, 97, 87,
+ 40,203, 44,138,117,171, 76,146,103, 77, 27,187,  2, 48,177,236,204, 80,147,131, 26,212,241,164,218,156,244,252,255,242,137, 20,
+ 28, 50, 16, 19, 23,133,  6,193, 89,149, 91,236,130, 84, 49,164, 22,  2, 44, 89,245,210, 57, 70, 98,167,196,170,113,187,149, 38,
+ 40,213, 76, 66, 11, 76, 33,221, 55,154,216, 80,216,169,194, 32, 33, 82, 62,204,229, 86, 88, 46, 58, 12, 12, 35,  7, 76,101,160,
+ 38,161, 81,172,  0,129, 64, 27, 53,219,232,119,  8,190,210,236,104,130,220, 32,193, 87, 77, 77,146, 85, 65, 27,169,180, 44,246,
+139, 99,230,185, 53, 71,120,176,100, 87,112, 93, 16,135, 62,254, 88,148,138, 91,187, 37,230,200,143,244,161,  6, 92, 99,140,121,
+163,248,146,104,208, 79,255, 17, 22,117, 99,105,166, 63,140, 59, 39, 98, 37, 83,163,131, 39,226,249,233,212,  5,209,179,186,142,
+108,122,245,244,113,211,156,126, 21,206,125,175,199,139, 23,109,165,211,209, 66,194,232, 72,255, 42,211,139, 45,221,112,108,203,
+206,155,164, 83, 29,197, 33, 66, 26,249,224, 17,160,193, 67,200, 30,155, 87, 10, 22,221, 77, 24, 37, 94,216, 11,251,190,231,183,
+ 90,237,151, 31,183,239, 60,188,245,116,243,249,222,110,173,246,163,182,249,229,221,139, 55, 27,135, 94,188,188,116,222, 48,116,
+226,182,224, 46,100,184,100, 42, 83,174,148, 84, 68,  3,234,203,224,182,140, 98,161,184,189,231, 26,223,126, 78,175, 28,177,180,
+169,168,233,  1, 99,224, 82,203,208, 26,187,253,128, 61, 11, 69,255, 99,100,241, 49,136,197,248, 49,136,253,148, 75, 61,148, 51,
+119, 55, 32,110, 34,182,152,172,118,209, 79,185,116,238,202, 78,107,  7, 11,131,130, 15,193,229,129,244,216,151, 79,156,109,145,
+ 12, 25, 69, 12,110,162, 18,121, 26,249, 30,181,172, 70,170,221, 67, 64,213,182,215,  6,104, 11,248,  4,120,140, 26,144,213, 16,
+ 55,240,166,176, 84,144, 33, 44,211,166, 19, 54,230,227, 39, 36,116, 17,  3,  1,136,139,186,198, 90,107,114,184, 47,156,113,124,
+ 45, 46,102,149, 40,122,129,  5,171,  0, 36, 39,218,117,242,146,241,144,165, 91, 60,118, 93,157,216,177, 34,166,113,118,215, 38,
+248,101,168,254,203,165,210,152,104, 53, 90, 51,168,237,126,249,  7,169, 81,251,144, 91, 26, 42,201,227, 12,  6,255,235,175,254,
+ 22,128,173,107,217,105, 34, 10,195,103,166,237,180,165, 55,108,167, 80, 42, 24, 93,152,152,152,136,151,196,248,  4, 68,195,198,
+196,240,  2, 38, 93,200,187, 16, 31, 64, 55, 62,134,174,221,224,194, 13, 59,144, 40, 10,  1,132, 10,165, 51,157,153, 51, 76,199,
+255,251,206,180, 16, 99,151, 77,154,105,207,233,249,207,127,249, 46,  6,255,174, 76,131,223,124,111,249,143,206, 53, 58,160,107,
+142,254,  4, 24,104,144,  9,148,249, 81,101,227, 92,169,143, 22, 90, 75,247,151,150,247, 79,247,228, 94,245,177,100,120, 82,158,
+ 87, 40,252,153, 56,227, 25, 70, 67,234,244, 22, 34,249, 43,103,  4,191,172, 53,111,212,156,205, 89,150, 95,215,247, 78,189, 96,
+ 96, 77,212,242, 12, 19, 70,178,170,123,139, 15, 46, 70,231,240,109,161, 54,180,241,104,132, 44, 42,148, 14, 44,139, 18,229, 83,
+160,164, 57, 99, 97, 24, 80, 40,216,244,229,121,145, 38,180,196,184,  2, 40,216,134,149, 88,159,169,119,155,221,253,254,193,  0,
+174,190,  9, 13,101,104, 62,106,228,141,232,176,110,140,126, 19,195,204, 33,254,182,235, 46, 29, 15,142,186, 55, 22,229, 34, 60,
+ 60, 63,  6,225,139,107, 40,101,148, 60,172, 85,109,251,241,240,219,238,246,225,201,129,196,125, 13,233,234, 40,129,215,159,164,
+229,227,188,  4, 41,  8,163,198,242,166,142, 37,191,246,115, 85, 91,142, 92, 16,226,224,197,116, 97,149, 71,150,115,  5, 59,177,
+131, 16,114,160, 28, 62, 89, 64, 98,130,244,148,146,175, 36,233, 76, 74, 91, 75,132,254, 94,175, 39, 27,184,177,241,246,201,242,
+163,223, 71,135,100,  0,193,229, 76,138,192, 88, 67, 36, 82,162,180,148,183,235,111,214, 87,158,175,172,189,122,185,186,250,226,
+ 50,242, 55,191,108,150,138, 80,231, 25,  5,122,161, 61,191,246,186,167,146,248,195,187,247,167,195,136,170, 39,137, 99, 65,140,
+204,248, 69,215, 75,229,208,215,223, 15,142, 11,185, 34, 74,248, 52,  9, 37, 56,210,199, 47,  7, 58,130, 38,107, 61,149,128, 40,
+215,188, 61,  5,125, 41,235,223,201, 79,102,114,112,229, 15, 99,224,184, 25,192,156,164, 52,211, 75,181,  1, 81,167,212,140,217,
+ 68,131,141, 27, 27, 70, 66,134, 21,158, 98,106,208, 20,101, 65, 78,110, 39,199,  0, 41, 33, 26, 25,136,  6,123, 39,113,132,252,
+ 17,238, 38,202,252, 42,143,  8, 18,173, 10,198, 98,148,228,103, 22,102, 24,115, 16,219,201,108, 87, 45,186,208,228,209,136,191,
+212,110, 99, 14,109,122,112, 38,100,109, 35, 34,187,211, 80,135, 84,204, 71,  2,200,134, 46,102,133,146,191,199, 64,218, 33, 49,
+234,204, 46, 32, 16,144,130, 55,105, 58,102, 74, 74, 83, 60, 36,137, 84,169, 91,107,201,131, 36,112,202, 57, 42, 21,102, 42,165,
+ 42,251,159, 99,118,141,145,188,  3,233, 40,215,149,228, 87,182,253,208,117,227,249,167,103,170,232,249,250, 86,209,118,218,137,
+234,123,212,151, 67, 61, 41,187, 91,147,207,183,154,170, 82, 73,130,192,151,244, 88,195,230, 20,224, 73, 84,132,249, 70,231, 22,
+122, 59,121,248, 15, 36,146,218,248,158, 55, 28,109,109,239,126,252,252,105,172,189,187, 85,117,167,162,186,101,213,114,148, 36,
+ 56, 95,119,182, 36,183,127,188,252,204, 41, 65,210,192, 41, 74,177, 93,112,138,133,102,167,105,177,  1,192, 97, 38,152,211,245,
+217,250,175,253,243,219,174,165,110, 86,157,254, 40,136,228, 18, 85,165,114,238,199,206,217, 64,170,103, 72, 22, 59,178,193, 92,
+112,  0,101, 19,101,186,255,116,145, 36, 99,156,106,  9, 64, 27,104,254, 20,219,136, 24,  0,111,152,255,121,178,135, 11,152,158,
+ 80,234, 90,230,112,114,118, 68, 66, 30, 91,187,180, 26,180,193,134,141,178,105,144, 69,109, 44,170, 21,155, 40, 36, 65, 73,214,
+  6,165, 67,154, 56,128, 34,231,155, 21,247, 34,186,136, 36,226,217,202,173,181,189,200, 67,155,209,100,228, 25,172,111, 74,213,
+ 55,208, 62,188,218,213,182,212,253,181, 82, 13, 44, 54, 73, 70,203, 13,109, 28, 92,137,136,209,176, 86,152,106, 40, 88,215,221,
+190,  0, 64,152, 68,115,217,127, 41, 17, 66, 72,128,164,153, 15,150,202,132,235,211, 73,119,114,  2,106,156, 74,101, 88,156,195,
+183,  2, 61, 50,114, 61,255, 13,241,127,  5, 96,235,106,122,147,136,162,232,227, 49,204, 12, 51,211,118,248, 42,  5,164,105,180,
+ 54,145,106,131, 38,134,133, 43,247, 46, 76,220,248, 35, 76,140,191,199,141, 43,255,137, 46,140,214,180,150, 38,141,245,139, 38,
+181, 84, 11,  5,166,101, 96, 96,198,115,239, 27,104, 23,238,  8,  4,120,  3,111,238, 61,231,190,123,207,137,231,155,144,103, 56,
+125,176, 57,125, 66,254,241,218,253, 97, 79,157, 67,198,234, 31,154,201, 57, 70,181, 45, 83,226,  2,  9,253,121,122,168, 14,168,
+ 85,120,157,178,186,167, 20,170, 37,134,138, 27,212,100,171,233,158, 26,216, 19, 87, 77,158,241,199,206,201, 39, 87, 81,164, 84,
+254,153,196,221,238,173,213,255,246,218,248,228,211,193,201, 56,244,149,142,126,110,177,176, 94,220, 64,  4,  9,227,226,105,130,
+143,239,184,251, 88,200,226,194, 50, 40, 51,195,177,216, 26, 88,217, 79, 38, 99,255,200,120, 74, 69, 77, 42, 82, 64,160,163,116,
+ 29, 41,125,204, 54,163,248, 31, 12,195, 74, 50, 13,224, 81, 69, 10,205, 74,115,  3,136,  9,191,242,132, 27, 91, 56,  4, 32,194,
+130,129,143,184,188, 67, 78, 14,141,219, 15,247,142,246,241,233,229, 92, 37,183,152,235,120, 93,106, 12,151,124,120,195,176, 52,
+ 96,233, 43, 46, 11,132,192, 17,181,242,221,206,144,138, 54, 41,161, 57, 57, 82,254,179,245,148,107,107,118, 90, 51,116,194, 69,
+  5,199,112,211,154,153, 78,  0, 59,107,106,136, 82,163, 11,209,245,  4,110,125, 83, 23,  6,249, 83,137,225,229,164,241,160,241,
+244,217,115, 44,233,119,235,240,213,203, 23,159, 62,188,239,116,123,  8,  8, 36, 62, 18, 34,190, 83, 95,103,  0,242, 29,140,191,
+127,107,110,127,124,247,121,251,195,254,222,238,206,238,206,233,217,  9,136,118, 48,137,  6,151,254,253,250,214,163,199, 79, 90,
+ 95,155,175,223,188, 21, 83, 32,116,174,112,130,200,143, 40, 18,128,136, 47,187,246,193,143, 99,207,243,233, 28,140, 42,131,236,
+191,205, 73,250,230,202, 70,103,112,230,152,139, 83,134,213,243,121,107,121,205,168,108,230,235, 75,219, 51, 99,129,114, 13,101,
+ 98,174, 36, 70,197,230,162, 91,194,237,  1,124, 16,177, 43,167,242, 70,228,189,148, 76,204,149,153, 88,159, 11,  8,157,212, 90,
+ 98,143, 30,  2,181, 36, 24, 74, 35,157,186,150,164,131,208, 52,217,106, 83,  9,154, 93,230, 98,157,  3,186,221,166, 32,203, 26,
+ 47,155,222,  9,212, 70, 34,208,188,155,  3,182,132,195,106,182, 86,235,237,243,246,204, 36,116,134,181,120,233,160,107,150,158,
+ 70,132,164,169, 99,174,183, 42,103, 78,169,148,179,153, 67,227,187,242, 86,214, 15,134, 50,238,112, 87,170,120,130, 56,  7,210,
+249,132,166,228, 64, 82,177,212, 48, 12,226,254, 46, 78,118, 75,142, 27,  4,160,194,178,146,171,244,188, 30, 16,  3, 21, 30, 37,
+117,104,240,209, 46, 65,191,149, 76,197,247, 47,116,226, 37, 18,123,128, 26, 35,197,216,180, 75,197,141,134,146, 42, 58, 58,234,
+222,186,227,136, 78,151,108, 30, 39,202, 97, 92, 91, 42,228,197,218,186,176, 50, 81, 31,172,178, 79,109,144,  1,231, 49,  2, 44,
+114,185, 80, 22,238,  2, 54, 19, 46,111,114,238,117,186, 94,167,215,255,210,220,151,189,227,170, 41,138,186,112,146, 34,155, 20,
+153,148,112, 52,234,214,106,182, 14, 86,243,213,205,205, 58,126,114,211, 48, 12, 92,140,153,202,151,243,  0, 26,164, 66,147, 34,
+ 73, 98, 60, 80,179,223, 23,173,227,108,109, 81,243,195,160, 79,248,198,116, 82,178, 45,127,245,251, 81,252,239, 78,184,222, 66,
+227,226, 35,110,137,197,147,181,234, 38, 94,245,134, 23,165,108,201, 15,124,236,178,106,246,134,101,226, 58,244, 17,121,168, 70,
+120,140,111,168,173,214,122,151, 93,130, 26,216,172, 73, 82,185, 47,185,101,  0, 14, 29,137, 67, 36, 42,217, 42, 53,173,241, 96,
+110, 90, 79,187,118,102,193,118,145,173, 45,221,177, 13, 11,225, 91,249,176,177, 43,  9, 13, 84,134,124,242, 15, 66,143,224, 30,
+241,198,194, 74,188,177,199,172, 45, 17,198,254,124,241,177,144,194, 25,177,134, 50,151, 96,176, 78,188,142,251, 43,191, 84, 24,
+ 12,207, 71,227,145, 98,120, 92,188,137,102, 10,166,209,108,198, 73, 70, 87,250,210,242, 58,151, 13,194, 64,  9,177,204,184, 43,
+189,135,  6, 31, 89,183,252,122,219,228, 92, 62,128,203,244,196, 56,103,  5,153,255,132,248,127,  2,176,117, 45,189, 77, 92, 81,
+248,204,219,158, 71,252, 72, 66, 76, 75, 66, 64, 32,209, 69,133,248, 21, 21, 18,139,254,129,254,182,110,186,169,212, 29, 59, 84,
+ 85,138,186,104,203,162,  5, 17,243, 20, 41,216, 50,193,118,156,120,198, 30,143, 51, 79,206,119,174, 93,211,170, 94, 89,214,245,
+216,154,123,231, 60,191,243,125,107,126, 49,109, 37, 30,159,230,203,150,191,237,151, 62, 90, 91,104,104,168, 18, 74,  5,110,113,
+153,181, 67, 19, 92, 28, 42,175, 20,159,173,229,194,125,179,  1,210, 32,  7,208,191,186,246,245,235,211, 23,  8, 61,132, 95,205,
+ 88, 59,192,134,215,142, 22,147,138, 20,227,213,255, 72,184, 93,109, 95, 27,156,247,223,141, 78,248,103,120,171,  6,103, 61, 60,
+ 57, 48,142,229, 56, 26,205, 22,145,194,144, 26,250,198,137, 73,163,210, 25,206,134,  8,112,196, 32, 40,135, 43, 20,216,156,118,
+101,186,129,127, 93, 72, 72, 32,250, 93, 28, 85, 65, 34,195,175,  5, 56, 70, 40,111,147,136, 46,  1,156, 22, 46, 67,199,112, 17,
+ 12,150, 34, 98,196,  6, 61, 67,205, 93,148,236,202, 78,243,139, 81,248, 49,  7, 37, 90,170, 58,105, 28,187, 29, 61, 63,194, 64,
+141, 97,244,206,122,253, 73, 95,152, 51,203, 27,123,135,227,232,140,143, 90,165,175,105, 38,138,210,174,187, 55,246,110,190, 62,
+125,169, 73, 73,149, 47, 31,120,134,121, 73,162, 84,162,131,250,122,169,103, 40, 53,136,142, 43,242,113, 80,132,107,162, 25,  2,
+246, 87,176, 82, 81, 89, 24, 80,106,202,137,227,239,251, 15, 30,208,150,247,244,231,135, 39,175,142,127,252,225,251, 40, 60,183,
+  1,104, 65,128, 79, 96, 56, 42, 37, 89, 97, 27,166, 61,126,220,205,114, 16,174,114,228,199,143,165,101,161, 31,105,154,101, 43,
+208,238,221,189, 77,148,119,255,250,163,110, 23,205,134,133,110, 82,165,205, 33, 81,136, 52,180, 81,183,122,253,241,240, 44,228,
+221,230,  7,194, 49,253,182, 31,156,158, 15,212,126,157, 12, 95,234,168,185, 47,215,140,  5,176,146,207,122, 79,148,101,231, 52,
+ 46,175, 82,215,242,132, 46, 24,166,188,229,239,134, 34,181,195,222,197,119, 26,211,  4,232, 85, 96,105, 48,234,194, 71,165, 86,
+228,201,126,251, 32,168,251,221, 65, 87,129,219,235, 70,157,141,166,132,  3, 70,188,156, 87,171, 82,190,161,124,120,  9,212,252,
+117,206,168,112, 12, 76,199,181, 93, 94,220,240, 90, 36,181, 84,  1, 56,115, 18,157,221,238,220,121, 59,124, 35,  0, 68,165,  9,
+ 93,124,217, 60,232, 79,222,123, 82,253,195,220,121, 50,189,136, 39, 34,129,254, 25,  2, 65,206, 23,202, 16,101, 17, 39, 51,215,
+113,107, 22, 91,249,197,127,244,167,248, 78,242,117,210, 44,229,167,212,  4,127, 16, 85, 50,214, 43,180, 83,186, 80, 36, 42, 61,
+ 38, 29, 58, 55,180, 34,229,  3,245,102,150,186, 78, 61,135,120, 12,210,  8, 76,115,102,169,169,235, 27, 48,157,  4,102,166,102,
+ 39,201, 76, 87, 69, 89,169,237,130,230, 90,175, 58,251,247, 40,215,127,251,253,209,175,127, 62,250,123, 48,184,187,253,221,149,
+ 78,163,186,152,242,150,219,164,  5,190, 71,183,238,208,222, 85, 10, 23,228,120,176,170,165, 16,132,201,249,172,170,100, 54, 13,
+131,248, 10,  5, 14, 16,245,134,158,166,249,197,252,178, 76,162, 67,151, 70, 41,117, 99,138, 75,234, 88,116,224,208, 33,186,179,
+180, 56,167, 95,142,126,186,255,205,183,190,  7, 67,110, 24,166,205,129,175,111, 25,153,240,  0, 35,181,178,103,147,104, 57,143,
+ 91, 59,205,241,208,166,241,156,154,206,214, 86,173,140,216,221,146,229,150, 74,242, 59, 85, 44,191,202, 99, 11, 91,167, 34,188,
+234,246,143,129, 91, 37,146,121,117, 24,187, 15, 23, 31,212,200, 52,111,193,254,238,117,206,129, 78,198,239,158,189, 63, 14, 92,
+ 95,137, 42,241,125,168,244,149,124,  2,191,248,  6, 38,105,204,161,216,174,183,147, 92,162, 86,198, 55,191,237,111,  3,215, 75,
+213, 52, 14,149, 20,153,154, 87,201, 87,154,241,154, 16, 10,225,114, 74,  9,100, 37,115, 32,229, 32,173,248, 71,181, 27,111, 56,
+198,199,224,231,229, 98,141, 30, 65,161, 96, 43,216,153, 68, 35,249, 10,155,211, 98,183,177,247,113,122,186,158,  9, 81, 36,196,
+ 90,189,230, 45, 68, 53,140, 87,181,189,150,234,252,125,166,184,161, 41,156,220,191,133, 16,212,135,202, 88,170,225,146,106, 29,
+ 18,168,113, 10,140,191,  2, 51,187,161,137,223,172, 81,175, 79,  2, 80,117, 45, 61, 77, 68, 81,248,118,166,243,232,148,182, 52,
+165,181,160,242, 48,162, 70,130, 49, 49,241,129,129,133,113,131,196,196,196,165, 63,205,173, 11, 93,152,128, 49,184, 51,209, 31,
+225,194,196,160, 73, 11, 22,166,116, 58,109,167, 51,157,151,231, 59,119, 90,132, 13, 11,202,164,119,238,189,231,124,231,245,125,
+ 25,126, 39,216, 46,135,191,105,125,228,  9,253,216, 71,115, 55,115,207,211,103, 13, 52,228, 83,164, 52, 97,210,183,228,241,237,
+ 45,  2, 17, 24,227,156, 21,124, 47,228,  8,178, 12, 59,161,239,  4,170,214, 42,219, 23,166, 45, 97,249,163,128, 46,106, 78, 89,
+173,223, 24,  5, 67, 73, 53,148,205,243, 66, 15,  8, 46,215,245, 28,122, 24, 15,178,211,177,116, 96,  1, 11, 21, 16, 30, 68, 44,
+160, 40,117,146,224, 74, 17,163, 77,153, 65,114,203, 11, 43,100,106,233,123,176, 55,131,  5,200,243, 95,185,210,141,236,146,  1,
+ 50, 19,169,252, 12,163,179,117,235, 81,144, 76,154,243, 77,123,208, 11,208,  7,  8,211, 74, 55,173,227,156,166, 76, 98, 62,192,
+188,156,104, 86,155,253,145, 27, 34, 75,160, 88,  5, 56,  3,122, 57,141,106,147, 30, 85, 43,213,153,107, 69, 16,172,227, 17, 86,
+ 85, 76, 41, 89,232, 93,189,222,125,115,110,219,221, 65, 55,100,181,144, 76,137,  0,225,103,  2, 66,243,145, 35,157, 52, 72,227,
+ 82,244,169, 88,121,101,174,144, 43, 91,106,205,210, 23, 10, 90,137, 34,223,148, 32, 56,  6,108, 84,120,154, 52,152,224,246,140,
+125,208, 56,122,180, 61, 62,132, 82,  9,183, 45, 53,234,223, 62, 31,190,255,240,177,239,248, 71,191, 91,161, 63,209,201, 24,228,
+ 17,  5, 17,202, 76,226,148,214,134,176, 76,215, 10,134,129,112, 74,203, 91,134,166,179,222,166,101, 40,150,169, 20, 11,218,253,
+205,123,213,114,241,211,193,254,223,147,179, 56,201,141,199,225,104,  4,236,  8,  6, 90, 58,  3, 65,114,124,234,130,173,  1,201,
+236, 56,224,202,103, 58,147, 69,224,180, 40, 55,133,147,133, 42, 83,212, 73,254, 47,171, 76,178, 58,  7, 29,193,197,249, 69,215,
+235, 19,218,163,149,118,135,103, 92,246,198,191, 32,  7,194,232, 38, 19,  8,  2, 84, 65,204,238,120, 61, 92, 24,110,129,215, 21,
+ 61,201, 18,235, 62,155,209, 57, 48,120, 72, 94,124,180,114, 25, 18, 43,143, 97,247, 69,189,210, 24,250,131,152,121, 20,198, 96,
+248,202, 49, 45,137, 70, 47,254,230,181,187,109,251, 79,185,  0, 40, 39,231,140, 40,230,240,  3,175, 86,106,184, 94, 79,102, 99,
+ 64, 35, 49, 27, 40,204, 82, 40,216, 83, 29,189, 34,122,196, 18,208, 62, 52,219,114,211,153,147,105, 58, 93, 65,251,  9, 34,155,
+ 52,101,121, 38,112,252, 78,226, 40, 39, 46,244, 45,100,200,146, 71,167,191, 34,129, 28, 20, 95, 16, 30, 17, 68, 64, 67,142,174,
+106,163, 96,144, 74,238,164,116,218, 54,192, 87,153, 32,191,  9, 42,136, 80, 38,229,116,168, 96, 71, 75,149,165,103, 79, 95,237,
+127,121,123,248,245,157,240,122,209, 36, 94, 55,146,245, 39,155,225, 73,143, 94, 39,218,108, 86,215,196,250, 29,193,141,  7,169,
+ 59,232,219, 29,  2,246, 56,234, 81,102,232,205, 98,165, 82,158, 23,101, 83,232,121,197, 25,159,218,189, 86,215,241, 78,142,194,
+177,123, 96,139,239, 67,241, 51, 16,109, 31,248,125,153, 66, 70, 85,248,169,104,245,236,231,219,123, 87,174, 46,162,190, 97,106,
+197,242, 92,190,105,  9, 45, 39, 76,132, 48,177, 59,242,122,  3,218, 70, 93,  3,121, 67,197,239,168, 69, 67, 29, 71, 50,195,236,
+159,135, 63,142,187,220,236,203,213, 51,102, 27,163,144, 40, 22, 18,160,162, 79,  6,217, 69,108, 44, 14, 79,173, 84,165,239,219,
+ 40, 55, 34,150,114,162,219,167,171,  6,249,236, 23, 15,118,219,118, 59,  8,  3,147, 64, 39,183,150,122,129,103,230,245,149,250,
+154, 59,116, 94, 62,220,107, 84, 26,191, 58, 71,244,148,157,141,237,162,129,254, 55, 58, 69,219, 27, 59,173,243, 99,218,145,235,
+ 11,171,116,121, 48, 41,153, 69, 80,136, 35,100, 22,134, 54,187,106, 85, 67, 86,127, 21,210,239,112,150, 47,107,202,196,236, 69,
+129, 92,120,132,250,109,134, 88, 33,135, 25,121,244, 11, 52, 53,  0,248, 42,228,  7,  6, 93, 44,135, 63,193,105, 55,204, 82,177,
+ 98, 23, 78,148,169, 27,180, 22, 67, 51,185,126,147,136,105,162, 82, 54, 11,208, 70, 71, 40, 22, 10,217, 72,194,142, 70, 26,248,
+244, 18,138,159,229, 65, 46, 55,166,139,255,146, 65,244,243, 79,  0,174,174,172,167,137, 40,140,222,206, 76, 59,157,173, 29,218,
+ 34,155,134,  4,226, 18,136, 91, 66,140,198, 68, 77,244, 39,250, 75,124,225,197, 68,223,125, 49,  6, 98,128, 34,224, 82, 90, 40,
+116,153,105, 59,251,120,190,239, 14, 66,124,234, 75,211,229,222,249,246,243,157,115,229,223,181, 42,108,108,181,181,  6,255, 91,
+102,146, 69,110,231,135,146,152, 23, 86, 20, 38, 83,167,226,160,138,108,213, 22,142,187,237,115,175, 79,217, 86, 46,120,166,175,
+ 71,105, 49, 41,146,160,209,  2,137, 92, 82,224, 85,100,100, 97, 78, 27,181,110,186,168,143, 96, 45, 23,227,243,171,226,149,140,
+152,229,211, 40,189, 70,106,153,114,179, 95,246,219, 96, 81, 43, 77,154, 23,203,173, 51, 84, 91,146,170,105,125,241, 30,  2,160,
+228,245,144, 50, 61, 67, 31,239, 17, 46,241, 53,147,200,156, 93,181,158,221,125,113,116,254, 67, 50,246,231,180,234, 82,150,196,
+205,188,217,144,217,134,229,  5, 19,159,138, 50,223,181,231, 42,196,125, 87,245,130,105,148, 33,123,130,249, 84,184, 60, 76,189,
+217,132, 86,213,249,240,113, 43, 83,164,  6,121,230, 79, 71,248,181,126, 56,129, 53,162,124,134, 97, 35,145, 73, 57, 43,194, 31,
+178, 13, 26,199,127,221,251, 18,132, 33,177,137,165, 57,190, 75,106, 89, 51,191, 40,169,220, 25, 58, 65,181,248,  9, 81,212,204,
+246, 71, 65, 22,168,217, 68, 77, 38,106, 30,169,150, 98,186,102,181,229, 24,174,105,204,219, 53,167,108,234,153,102,171,106, 77,
+168, 53, 77, 51, 53, 21,159,169, 22,180, 14,226,240,160,253,125,127, 15,255,209,173,233,101, 98,114,204,202,196,180,149,197,112,
+135,248,101, 17,169, 20, 51, 94,162, 24,107, 32,136, 86, 53, 56, 98,197, 33,163,166,200,225,123,201,238,206,193,231,143,159,246,
+219, 71,120,174, 16, 66,152, 95, 39,215,149,188,105,106,149,114,246,171, 27,205,224,213, 83, 22, 29, 47,  4, 43,201, 79,225,124,
+224,118,169,129,131, 50,137, 53, 68,168,218,227, 59, 81,139, 29,110, 65, 28,112,165,156,  6,101, 66, 24, 85, 68, 22,226, 81,226,
+124,185,  4,247, 74,124,153, 92,237, 62, 94,125,210, 27,117,138,157,242,127,188,205, 40,217, 56,166,220,114,151,225,218, 96,144,
+ 20,230,113,226, 68,132, 71,128, 57,  9,204, 37,244, 71, 20,216, 70, 13, 39,188, 58,191,214, 29,116, 72,183, 11, 70, 18,199, 86,
+197,194,215, 17,171, 84,150,246, 70,167,120,186, 54,111, 63,234, 13, 58,220,192,163,245, 99, 36,227,195,201, 64,194, 10,168,175,
+173,233,248, 76, 71,183, 97,254,215,205, 37,133,213,159, 83, 90,117, 94,106, 44,251,129,175,144,116,  6,193, 31, 37,253, 17,227,
+ 49,105,162,131,211, 32, 97,  3,150,167, 64,182,193, 16,230,144, 91,252, 66, 41,166, 17,202, 21,171,185,224, 85, 88, 98,221,136,
+ 25,146,207,102,146, 85, 52,157,  3, 37,  5,118,141,250,118,100,212,164,229, 77, 13,141,152, 54,149,144, 50,243, 18, 19, 30,130,
+ 87,155,175,147, 52,248,176,253,126,195, 22, 15, 92,209, 44, 11, 45,154,109,189,125,153,245,250,112, 42,182, 99,137,167, 91,162,
+ 94, 39,142,129,105,146,121,254,176,127, 26, 20,248, 72,169,171,158,149,202, 70,163,214, 80, 77, 67,212, 77, 98,221, 60, 27, 29,
+246,250,227,139,238, 81,127,184, 61, 22, 18,125,237,113,205,254,208, 18,150, 42,166,153,232,120,226,205,243,119,235, 27,247, 81,
+ 27,234,112, 81, 11,117, 49,199, 61,128,113,148, 92,142,147, 40, 36,112,  5,181,225, 41,  2, 85,135, 39,154, 99, 16,240, 23, 55,
+142,204,122, 16,126, 59,238, 43,188,133,196,  0,  0,217,106, 47, 36,148,164,126,181, 68, 42,225,244, 80,130,210,141,195,119,199,
+  4,148, 84, 56, 83, 92,106, 46,244,189,139, 48, 12,  6,211,129,169, 91, 75,141,165, 40, 10,155,118,115,165,121,  7, 15,161, 63,
+243, 45,221, 60, 62, 59, 89,110, 46,255, 57,255,137,203,218,239,180, 47,252,254, 98,125,225,210, 31,236,254,222, 65, 72, 64, 10,
+226,218,238,132,186, 61, 37, 25, 27,100,162, 98, 25,118,194,  8,218, 89, 50, 67,  0,148, 36, 51,220,184, 37,223, 72, 50,179,236,
+173,144, 52, 68,105,172, 20,247, 41, 29, 51, 19, 12, 41,164, 61,153,230,241, 74,227,246, 65,119,143,226,175, 40,214,143,229,104,
+ 61,166, 41,110,129, 35, 12,  8,183,195,236, 10,105, 46,187,248,249,141,145,106,203,105, 77,120,164, 87,186,102,183,207,109,189,
+198,  0,176, 66, 45, 69,185, 26,197,222,128, 72,150,254,115,241,242,229,175,  0, 76, 93, 73,111,219, 70, 24, 29,142, 72,145,162,
+ 36,203, 91,146, 90, 54,156,164,117,128,162, 77, 15, 61,183,255,185,135,246,144, 91,122,233,173, 64,179,184,141, 17,  4, 72, 26,
+203,150, 28,219,146, 37, 81,226, 54, 28,246,189,111, 68,163, 55,193, 54, 44,114,214,111,121,139,127,239, 14,131, 37,250,239,244,
+ 19, 27,167,187,135, 87,119, 23, 82, 83, 97, 84,142,144, 57, 45, 41, 43,150, 20, 43,236,220,189,254,110, 65,141,188,202,219,200,
+239, 25,221,210,  7, 91,135, 95,150, 19,214,101, 92, 58,161, 54,148,117,143,238, 75, 52, 44,198,231, 56,234, 34,255,197,222,222,
+233,238,223,212,147, 74,244,245, 37,193,  9, 48, 55,  5, 49,161,136,232,114, 87,199,108,160, 63,234,251,227, 31, 71,127,253, 86,
+ 11,253,106, 89,139, 75,142,181, 31, 38,239, 37, 15,177, 90, 36,129,221, 80,227,153,174,231, 19, 89, 61,222, 34, 93,252,254,247,
+ 75,164, 78, 21,  5, 33,168, 19,178, 34, 40,158,  4,236, 78, 20,225, 62,127,245,233,173, 52, 99, 20, 38, 27,111,116,250,249,157,
+236, 55, 46, 50,206,189,227,215, 42,103, 34,217,194,103,100, 27,133,152,163,211,  8, 45,  8,165, 92,195,122, 78, 81, 87, 94,149,
+199,173, 24,159, 79,134,207,198,211,  9,206, 38,252,207,116,150,246,226, 62,253,173, 90, 30, 14,234, 36,191, 96, 46,104,171, 78,
+187,123,189,184,122, 54,252,102,150,204,219, 10, 49,117,252,211,183, 63,191,120,245,235, 50, 83,139,172,228, 88,180,200,113, 76,
+ 62,223, 28,237,156,172,205,173,241,166,195,253,248,225,118,220,143,250,140, 33, 41, 40,174,141, 33, 37, 74,124,129,144,141, 86,
+235, 94, 80, 25, 28,127,  6,113,183,205, 41, 95,183, 34,206, 13,241,164,151,211, 97,207,163, 42, 50,101,220,234, 64,219, 16, 15,
+100, 55, 34,179,248, 41, 27,101,145, 54, 54, 69,206,214, 69,  8, 36,236,143,202,146, 16,224, 85,186, 23,212,239, 71,105,201,210,
+ 80, 64,193, 53,170,  6, 88,188, 96, 94,229,200,  0,176,235, 18,234,205,209,118,158, 60, 69,  1,  5,243,  1,  9,  1, 54,142,175,
+ 40, 19,228, 57,109,211, 85,182, 18,197, 30,130,175, 12,217,125,233,209,238,225,248,238, 18,227,124, 54, 58,149, 92, 69,254, 80,
+251, 56,160,137, 61,215,180, 93,126,254,244,135,211,143,175,219,116,162,210,210,236,226,176,227,100,192,217, 82, 84,184,131,173,
+ 47, 52,197, 56,236,225, 48, 61, 59,127,227, 60, 51,112,  8,174,181, 13,194,118, 88,135,105,158, 10, 11,129,197,202,127, 70,111,
+ 48, 26, 76,242, 60,111, 43, 28,100,229, 42, 12,  2,124,103, 73, 11, 36, 95, 66,233, 44, 53,197,222,214,193, 52, 65,  8,226, 61,
+222, 63, 70, 18, 70,100, 36,101,226,165,134,174,140, 95,179,142,191, 21,109, 47,179, 69,195,213, 96,201,133,212,249,210,138,170,
+129, 21,238, 94,137,119,  9,169,129,162,185,101,232, 58, 64,180, 41, 91,127, 26,225, 66, 15,215,146, 67,136,225,129,  7,221,157,
+100,189,200,139,180,177,169,240,132,133, 90, 23,117,166,  8, 63, 17,123, 50, 45, 82,  5, 18,254,224,160, 62,122,112,252,199,159,
+191, 28,183,216,  2,157, 87, 42,194,123,148,137,162,104,132,238, 96,212,135, 67,117,240, 72, 21, 78,237,155,237, 89, 87,  5,185,
+247, 29, 37, 44, 34, 89, 76,103,203,175,110, 58,106, 47, 86,187,253,157, 65,140, 32,198,248,157,153,213, 70,217, 64,136,224, 56,
+ 98,231,162,  6,222,245, 85, 23, 23, 12, 57,237,214,239, 71, 62,242,199,118, 64,  9, 26,188,196,117,170, 76, 41,232, 10,206, 25,
+ 21, 26,177, 42,150, 45,100, 85, 56,214, 85, 20,226,138,104,151, 37, 86,218,118, 20, 45, 76,186,209,  3,171,254,167, 72, 40,146,
+226, 98, 94,186,198, 47,177,218, 49, 17,136, 29, 51,131,124, 20,203, 65,127,253,232,228,114, 54, 30, 93,159,251, 42, 64,100, 22,
+232, 32, 43,214,227,217,228,201,131,167, 30, 89,227,237,171,249,132,142,  2, 65,248,101, 54,158, 39,119, 15,183, 49,131,211, 65,
+103,240,252,201,119, 23,183,151,  8,114,216,174,183,213, 42, 91,158,141,166, 24,243,189,254,126,118,183,174,181, 51,176, 33, 78,
+198, 41,  4, 54, 52,105,215, 23, 20,161,115,164, 89, 68,  3,187, 10,180,239, 19,236,179,105,129,218,123,230, 18,177,221,244, 42,
+184,188, 61, 71,  0, 46, 41,123,225, 42,125,157, 32, 94, 17,101,238, 16, 55, 77, 59,216,125, 75, 83,161,214, 77, 85, 70,203,174,
+118, 94,191, 27, 40,175,220, 18,105,190,180,174,101, 41,133,154, 90, 64, 53,213,134,249,161, 26,124,164, 87, 55,198, 21,247, 76,
+169,255,  4,224,234, 90,118,155,  6,162,232,140,237,216, 99,187,105,236, 52,143,150,150, 86,  1, 84,181, 11, 16,  2, 68,133,196,
+163, 21, 43,248,  3,216,176,  0, 36, 62,141,175, 96,193,  6, 33, 84,209, 34, 16,168, 10,180,162,109,154, 52, 73,243,168,237, 58,
+177, 99,115,239, 29, 83, 42,214,217,196,158,153,235,115,238,156,123,142,196,239,137, 64, 91,  3, 70, 54,117, 41,153, 29,146, 32,
+137, 93, 24, 69,161,130, 42,116,113,120,114,136, 77, 31, 46,255, 82,162,144,209,210, 32,192, 57, 20,149,101, 34,125,141,171,232,
+206,129, 78,136,113, 49, 95,244,176,117,168, 46, 86,106,131,224,132, 88,176,103,235, 83,240, 24,203,243,171,232,206,131,249, 12,
+ 81,118, 83,149,169, 68,169,217,164,160, 20,175,126,180, 67, 38,227, 25, 67,177,240,170, 42,194,220, 74, 41,143,231,178,129,167,
+216,186,185, 80,170,173, 95, 95,111,245,219,201, 36, 18,134, 21,163,143,143,122,222,202, 42, 77, 87,130, 16,152,117, 82, 45, 84,
+ 79, 67, 47,203,121,226, 80,184,131,230,224,120,146,153,214,103, 78,244, 50,121, 29,231,155, 38,113, 97,202,233,251,125,248, 29,
+136, 11, 70,187,193,225,209,109, 76,160, 70,217, 22,174,215,173, 43,183,133, 33,252,208,155,117, 47,161,  4, 72, 85, 15,187,  7,
+240,228, 18,180,  2,144, 12, 66,159,124, 65, 13,120, 82, 32,113,176, 15,238, 92, 93,219,105,254, 40,152,110,247,236,100,175,189,
+ 23, 39,227,219,181,187,228,127,212,183,114, 70,209,114,225,245, 95,171,214, 44, 97, 53,122,251, 80, 51,190,244,235, 31,235,187,
+ 31,234,123,219,191, 15,118,154, 71, 91, 71,205,159,157, 78,253,184,205, 80,  6, 15, 48, 36,225,134, 53,142, 16,104, 20,132, 49,
+ 99, 89,139,211,211,101, 96,  0,166,168, 88, 98,214, 50, 47, 59,118,201, 50, 10,192,102, 53, 64, 25, 41,112, 36, 88,102,168, 84,
+ 65,136,232, 62,198,102,  6, 71,231, 88,149, 11,145, 22,166,210,188,  9,  0, 42,229, 99,214,104,  4,  7,221,  0, 37, 64, 64,  7,
+164,129, 19,  6,149,  8,199,116,239, 45, 63,104, 13,143, 41, 85,131, 27, 24, 28,  4,124, 29, 21,102, 66, 51,117,195,140,227, 72,
+201, 44, 34,178, 41, 79, 69,234, 82,129, 99,153,142,166, 40,168, 69, 83, 53,186,140,194,106, 40,128,163,104,148, 28, 40,227, 22,
+ 82, 25, 32,143, 64,254,201,218,211,237,250, 22,194, 86,105, 24, 34,249, 59,252,187,100,132, 38,223,104,185, 37,  0, 11,194,185,
+117,167,102,  0, 37,193,186,194,146,205,185,151, 59,195, 22, 84,213, 23,143, 95,125,254,181,137, 82,109, 18,174,207, 22, 23,202,
+249,178, 23,248,100, 77,133, 41,166,228, 99, 26,202, 75,180, 49,  6,234,226, 85, 44,208, 56,212,228,164, 41, 96,124, 20,117, 96,
+219,  8,227, 77,230,156,121,168, 59, 56,126,129,247, 90, 17, 79,255, 78,211, 72, 27, 73, 66, 38, 64,115, 39, 89, 96, 51, 42, 17,
+ 93,123,198,135,253, 79,212,250,225,234, 70, 16, 98, 28, 58,124, 75,172,156, 37,181,128,176, 31,110, 44,221,220, 39, 95,132, 89,
+103,  1,235,130, 84,143,164,128,  6, 76, 55, 95,130,253,131,102,121, 40,165,194,211,138,194, 72,158,232,156, 63, 90,185,247,105,
+243,237,156, 22,189,247,216,187, 62,107,142,216,188,154,110, 60, 92, 75,  7,158,106,232,252,214, 77, 86, 42, 35,120, 63, 27, 51,
+248, 70, 15, 78,123,237, 70, 24, 97,162,110, 44, 67,146,104,183,235,182, 99,105,185,156,109,192,254,  6,126,218, 60,108, 55,135,
+222,176,219,254,238,201,238, 52,186,236, 46,235,236,190,203,132,194, 90, 35,214, 11,217,243,103, 47,157,149, 26,131, 82,110, 26,
+114, 70, 11,125,229, 13, 40,188, 10,158, 75, 13, 39,138, 20, 91,  4, 71, 13,173,183,155,171,148,152,173,227,104,249,100, 18,116,
+188,221,253, 83,111,130, 17,239,153, 71, 66,146,198,156,238, 91,169,150,185,182,227,143,206,  8, 78,249,  0,146, 94, 63,121,  3,
+239,161, 51,232,194, 82,180,122, 77, 88,205,197,234,210, 41, 84,167, 52, 94, 40, 45,230,205, 60,  0,252,246,160,229,135,104,  8,
+220, 31,118,107,149,218, 92,177,170,233,162, 55,232,  0, 70,134, 15,131,173, 91, 95,127,127,  3, 22, 46,219, 44,242,142,135, 44,
+ 72,145,100,194, 97,132, 99, 62,147, 47,163,236,125, 28, 38, 25,148,151,173, 26,146,164,144,104,110, 68, 61,131,139,151,151,202,
+191, 68,117, 25, 86,128,  6,159, 65,236,147,215,105,148,102,115,203,178,193,195,  1,115, 41,212,127, 96,231,222,200,100, 86, 66,
+185,190, 10,187, 80,217,165,106, 86,142,221,170,212, 57, 33,211, 36, 78,211, 27,233, 63,139,189,115,199,186, 11, 72,253,191,230,
+204,249,207,127,  4,224,234, 90, 90,155,136,162,240,157,185, 51,147,201, 36,147,166, 77,218,154,208, 42,214,138,143, 42,162, 32,
+136,224,202,141,224,222,133, 46,252,  9,110,  4,255,150, 32,254,  0,113,161, 80, 90, 41,197, 22, 69,146, 54, 73,155, 54, 73, 51,
+143,100, 50,153,204,203,115,206,157,168,184,107,233,162, 97,238,205,153,239,156,243, 61,178,249, 76, 65, 53,161, 33, 66,120,133,
+105,118,177,176,202,148,230, 47, 40, 49,235,129, 43,177,113,233,134, 31, 76,  4,141,172,152, 51, 56,199,  8, 52, 35,151, 71,249,
+159,120, 52, 12, 99,109, 19, 82,112,209, 96, 71,155,  6,228, 39, 37,165,228,  2,200,233,163,167, 40,131,147,120,207,233,242, 84,
+158, 51,153,231,249, 29,244,206,196,158, 78,209,147,140, 23, 44, 11,123,131, 98,222,196,228, 67,  6,128, 32, 71, 78,211,127,180,
+ 77,232, 16, 52,112,122,141,179,  6,156, 19, 92,215, 91,245, 91, 93,187, 43,218, 91, 17, 96,143,206,  1,180, 35,113,252, 81,146,
+ 13,  0,113,213, 58,207,130,196, 35,161,125,122, 76,110,244,216,146,163,129,161,  6,133,123,132,227, 63, 89,130,226,171, 40,208,
+146,106,142,231,212, 43,235,102,161, 60, 66,201,  3, 59, 29,158,244,221,  1,218, 36,121,206,197,248,  2, 23,170, 73, 10, 88, 30,
+149, 26,100,139, 29,162, 88, 57, 22,254, 54,152,188, 29, 69,141, 65,  3, 62, 82,173, 92,119,125,  7,  1, 47,  9, 61,122,128,100,
+211,244,234,234,166, 59, 29, 65,175,215, 26, 54, 91, 86, 67, 78,213,141,218,122,162, 89,240,213,129,255, 13,237,136,155,  4,238,
+204, 59,247,172,166, 61,220, 61,237,124,106, 52,118, 90,237, 32, 98,214, 44, 60, 29, 77,127, 89,214,231,163,206,126,247,236,195,
+ 97,243,107,179,179,221, 27,124,115,237,253,161,101,  5,211,199,235,181,250, 82,105, 81,215,151,243,121,147,231, 12, 73, 53, 36,
+101, 81, 85,138, 50, 47,107,220,128, 62, 67, 85,224, 59,172,107, 76, 87,248,200,142, 14, 27,118,199,246,197, 58, 46, 22,129,246,
+ 52, 38,199,245,175,204, 15, 58,123,104,227, 69,247,  8, 51, 23,209,227, 20, 95,120, 88,248,  4, 63,125,158,168, 72,126, 42, 98,
+140,134,148, 53, 12, 59, 68,137, 38, 74, 99, 98,150,172,152,203,112, 44,254,204,139,147, 80,104,  2, 51,149,114, 54,223,150,118,
+127,238, 16, 29, 69,  6,112, 87, 95, 92,179,161, 23, 36, 30,165,104,108, 49, 57,  6,135,167,  9, 84, 73,104,213,  9,220, 48,232,
+175,117,173,  0,133, 64,229,218,247,163,125, 40,196, 42,244, 42,132,160,172,241,240,238,149,187, 65, 20,160,166, 73,226,213, 98,
+ 21,240, 56,233, 98,102,130, 96, 46, 34, 31, 80,193,143,129, 22,184, 36, 65,209, 22,109,138,174,173,110,158, 92,180,133,192, 42,
+  3,115,114,182,125,200,235,  6,193, 17, 36,122, 34, 27, 39, 77, 74,148, 68,136,105, 90,129, 71, 74, 24, 44, 46,237,139,150,153,
+ 43,248,225, 20,240, 41,116,201, 61,128,156, 24,108,150,156,187, 93,  9,  3,112, 56, 32,161, 40,  3,145,100,197, 17,133,126, 48,
+ 70, 15, 95,244,115,225,196, 12,147, 21, 36,107,203, 37, 77,123,116,253, 65,115,239,227, 84, 98,239,109, 54, 76,217, 89,204,110,
+155,252,249,179, 39,108, 56,150, 87, 42,236,193,125,124,234, 94,200, 38, 62,155,132, 51,215,113,251,237,144,184,173,194,207, 83,
+ 40,182, 20,221, 80,180, 66,  9, 14,178, 90,100,166,161,246,221,102,223,137,220,190, 53,158,244,201,120,232, 18,103,207, 23,217,
+ 86, 17, 97,122,115,204,242,165,234,235, 55,239,216,242,  2, 22,116,120, 43, 64,215,  0, 63,228, 56,142,224, 57,174, 23, 50,243,
+ 39, 69,178,183,191, 20,245, 25, 95,171,176,156, 74, 84,143,216, 59,182,127,116,156,  9,242,136, 24,153,128, 33, 82, 85,101,165,
+ 12,189, 11, 54, 46, 36,233,162,182,175, 94,169,245,237,254,215,131, 47,173, 65,171,108, 46,220,185,124,179, 86, 89,129, 67, 89,
+ 41, 86,123, 72,171,227,128, 17, 49, 89,129,202,221,171,167, 47,253,208,111, 15, 78,134, 19,220,165,221,187,243,176,123,218,134,
+ 91,  7, 15,121,117,105,245,220,238,189,123,241,246,230,218,214,113,239,104, 18,250,128, 44,131,104, 10, 55,221, 11,224,165,203,
+225,176, 38, 51,143, 28,222, 69,178, 11, 43, 27, 75, 17, 90,177,199,130,223, 14, 29, 54,155,103, 50, 11,250, 56, 75,255, 55,  0,
+131,223,203,165,106, 16,248,104, 56, 35,145,105, 84,182,160,201,132,166,217,144,141,  9,242, 44,161, 30,  4,211, 10, 84, 26, 13,
+205, 35, 84, 50,217,158,187, 15,207,137, 91, 18,  5,175,145,219,155,156, 38, 49,251,107, 75, 39,201,255,148,229,127,150,180,127,
+124,250,254,254,225,183,  0, 92, 93, 75,111,211, 88, 20,190,126, 93,219, 77,234,132,148, 20, 90,104,203,128, 84, 85, 20,177,128,
+ 46, 16, 91, 54, 44,128, 53,210,204,110,254, 35, 98,135,196,  2,  4, 43,196,  2, 13, 82,167, 29, 65,218, 36,205,171,118,108,199,
+142, 99,155,243,157,107, 23,105,164,238,218,166, 73,125,238, 61,175,239, 81,221,239, 76,  3,163,102, 62,129,164, 42,  8,218, 78,
+ 94, 75,133,232,149,183, 54, 46,240,105,  8,145, 29,141,235,226, 21,199,136, 99,218, 62, 21,173, 58,196, 70,182,175,237,132, 73,
+224,200,181,202,198,129,110, 46,181, 88,100,253, 97,250,179,158,235,113, 93,131,151,106, 55, 59,  9,176, 74, 42,131,  1, 98,124,
+195,219, 10, 19, 31, 64, 25,168,192, 43,215, 61,189,182,244, 70,106,131,253,116,145,177,213,122,174, 54, 86,101,  5, 58,  4,128,
+  7,145,207,172,  4,122,102,231,179,243,154,254,162,210,148,182,221,217,142, 40,134, 74,149,198,241,195, 59,221,189, 97, 48,160,
+ 66, 91, 90, 18,203, 75, 70,183,119, 26,215,125, 44, 15,129,124, 87, 80,107,197, 44, 87, 88, 56,158, 92, 81, 27,168,211, 37, 62,
+131,239,151, 82,247,198,202,129,222, 51,157,231,202,121, 71,148,174, 92,139,151, 49, 83, 76,177,  4,247,220,118,196, 85,124,150,
+ 81,  3, 95,174,209,119,211,100,103, 99,247, 34,184,104,200,  6,  3,248, 80, 10,152,186, 77,239,252,224,246,131,111,103, 95,239,
+116,247,131, 36,104,202,206,112, 62, 28,199,139,101, 86, 88,236,135,106, 75, 97, 73,216, 37, 43,191, 77, 41, 76,215,176,  2, 77,
+124, 57,254,239,100,216,255,121, 49,246,113, 74,138,220,178, 29,207,179, 41, 39,128, 98,163, 13,194,197,199,227,179, 73, 88,158,
+142, 86,253,128,229,190,210, 34, 92,  1, 32,147, 82, 15,158, 27, 25,  8, 32,101,146,148,254,101, 49,186,200, 79,122,233, 48,136,
+ 88,185, 69, 89, 55,160,216, 53,117, 10,196,188,233,122,148,170,185,162, 52, 88,100,163, 84, 59, 73,219,114,109,236,187, 86,186,
+162, 66,235,149,  1,  3, 27,100, 97,188, 96,106,224, 40, 81,218, 51, 48,126, 89, 42, 75,135,156, 39,203,234,159, 38, 13,167,242,
+ 14,169, 27, 71,165,215, 74, 47, 33,117,135,206,240, 36, 28, 93,197,177,166,228,  8,216,101, 27, 88,102,185,198,211,213,134, 82,
+243, 15, 98, 95, 87,122,191,  2, 35, 35,129, 43,120,157, 26,166, 56, 93,244,167,189,  5, 21,137, 80, 70, 95,165,249,106,153,166,
+144,147,213,106,105, 71, 28,190, 28,  3,167,178,246, 18,  6,115, 88, 74,195,162,134,128,201,116,248, 76, 77,230,115, 93,201,101,
+183,221, 86,180,  8,197,111, 13, 41, 76, 11, 49,253,212,173,195,189,135, 99,127,228, 57,120, 22, 37,139, 20,234,186,185,204,146,
+105, 48, 82,248, 78,173, 90, 54, 96, 33,193,130, 51,236,  5,197, 83,214,219, 27, 59, 49, 20,241, 52, 69,222,128,112,152,192,140,
+ 14,254, 30,165,120,120,107,255,242,244, 61,117,196,159, 98,209, 96,193,185,199, 45,239,197,179, 39,218,124, 46,238, 31,136,187,
+119, 69,146,137, 69,138,250, 61,201,146,217,200,159, 12, 50,181,169, 44, 86,149,164, 31, 48, 15,166,213,104,203,178,176, 41,177,
+223,108,183,132, 54,238, 77,199, 81,248,200,240, 61, 81, 60, 94,215,254,188, 89, 62,109,225, 51,245, 22,226,251, 68,188,124,254,
+250,240,239,191,  4,116, 53, 36,106,  1, 83,171,190, 84,241,174,163,224, 20,142, 81,204, 38,227, 15,239,174,239,111,137,110, 27,
+  9,128, 37, 97,163,147,233,251,227,115,163,118,184, 46, 89, 77,111,  5,197,139,152,201, 58, 21, 96,154, 14,120,154,101,155,173,
+ 77,186, 91, 93, 73, 37,135, 57,143,231,255, 14, 78,163, 36,166,234,123, 28,205, 94, 29,189,236, 79,251,235, 78,115,179,189,117,
+ 25, 78,194,120, 49,152,156, 83,218,166,216,179,133,236,157,253, 16, 92, 72,217,210,189,183,245,  7, 61,184, 55,159,223,126,239,
+253, 51,230, 57,219, 94,119,119, 26, 78, 29,214, 60,167, 22, 33, 78,227,163,123, 71, 20, 45, 25, 40,147,136, 28,144,127, 25, 95,
+171,104,208, 60,211, 42,110,117,118, 47,163,153,170, 23, 91,141,107, 41, 20, 50,168,145,101, 78, 40,252, 89,168,232, 14, 33, 30,
+  9,167, 52,252,234,186, 67, 25, 83,  7,107,167,230,118,183,156, 78, 10, 26,115,205,249, 16, 98,163,217,133,177, 21, 58, 96, 81,
+ 84,192,153,242,127,222, 26, 20,129,174,217,  0,233,165,178,177,188,226,124, 84,155, 28,237,247,146,245, 10, 60,163,160,199,106,
+202, 45,126,  9,192,214,181,244, 54,141, 69,225,123, 83, 59,126,197, 78,220,180,169, 26,160,180,138,102, 42,  4,133, 82, 24,170,
+  1,118, 12,127,128, 13, 59,196,111, 64,104,126,199, 44,248, 55,  8,196,106,182,140, 70,  3, 44, 96,102,104,105,135, 52,113, 99,
+ 59,126,219,177, 61,231,156,155,240, 18, 82,213, 69,164,214,143,156,231, 61,223,247, 29,193, 95,173, 13,197,236,183,251,182,177,
+ 12, 97, 11,  9,223, 92,130,248, 46, 70,147, 72, 66, 38, 73, 88, 85, 70,225,198,  6,122,148, 66,180, 61,132,134, 16, 30,134, 19,
+ 20,189,152,166,158,192,  5, 87,  2, 16, 65, 81,254,220,202,166, 31, 79,192,166,225,207,161, 22, 22,107,136,161,  6, 90,235,172,
+131,195, 19, 57, 22,233,160, 16,254, 16,168,143,157,  1, 87,155,218,141,193,205, 15,167,  7,159,206, 54, 63,  9,176,241, 57, 29,
+ 25, 13, 68, 66,181,101,190,172,219,170, 98,172, 88,171,  8,200, 33,149,190,205,213, 65,140,162,178,124,205, 94, 15,209,235,176,
+ 54,  7,231, 39, 98,232, 92,198,169,165, 91,126,232,237,110,237,193,205,159,233,110, 12,221,143, 34,154, 95,222,186,250,126,244,
+ 55, 60,215,206,249, 43, 31,241,195,162,141, 50, 35, 89,141,231, 25,133, 23, 77, 36, 73, 54,117, 43,133, 84, 81, 49,203,176, 75,
+242,151,237,179,151, 92, 26,186,138,252,222, 49,187, 67,255,152,228, 86,106,177,114, 69, 87,245,188, 44,192,224,160,232,248,105,
+112,227,225,221,  7,207,254,124,  6, 95,  4,132, 89, 48,133,172,204,169, 24, 33,224,189, 36,247,172,181,172, 44,154,141, 38, 84,
+160,233, 12, 17, 93, 39, 81,156,196,149, 31,151, 65,196,194,176,142,162, 58,205, 33,244,214, 73,134,188,237, 70,205,157,105,  8,
+174,208, 91,214,236,182, 97, 65, 63,165,170, 16, 24, 13, 85,150, 81, 94,  7,155, 44, 77, 70, 45,140, 13, 11,174, 21, 67,106, 73,
+ 98,217, 13, 10, 39,152, 58,110, 60,156, 68, 71, 99,255,104, 28, 28,141,166,135, 35,255, 96, 28, 28, 79,252, 48,205,161,204, 65,
+180, 30, 46,151,226, 34, 77, 83, 29, 63, 35, 82, 15, 78, 20, 73,129,150,151,141,185, 66, 57,220,231,138,209, 67, 37, 38,180,176,
+ 37, 48,247,172,204,108,163,155, 19,217, 88, 28, 52, 35, 36,191, 44,126,189,247,248,213,251,215, 53, 77,212,113,227, 27,201,171,
+ 66, 13, 53,171,178,110,171, 39, 75, 18,180,231, 80, 46, 52,155, 10,148,186,224,135,186,210, 74,103,113, 91,237,128, 19, 66,  5,
+219, 82,205, 12,129, 55,140,196,111,177,197, 71,210,118,226,214, 98,162,194,150, 36, 20,207, 82,160,212,133,223, 61,187,223,209,
+ 59,184, 66, 96, 86,164, 69, 98,183, 58,112, 57, 76,  3, 40,172,216,  4, 63,  7,  3, 94, 49, 87,145,160, 87, 87,170,164, 19, 22,
+174,218,217,184,118, 58, 29, 43,184,195, 78,131,208,172, 41,154, 31,185, 59,155, 87,161,117,211, 85,220, 51, 62, 23,204, 17,143,
+142,168,176,148,125,169,219,206,231, 40,  3,120,103, 78,224, 16,112, 26,242,127, 78,128, 81, 78, 63, 56, 61,133,231,162, 25, 79,
+ 41, 40,233,144,117,118, 55,246,188,112, 34, 74, 69,162, 77, 37,240,237, 10, 69, 73,170,137,169,237, 37,117,107,232, 82,110, 95,
+216, 15,254,121, 14,241,239,119,204, 44, 24,223,239, 15,250,183,126,190,196,138,156, 93,187,194, 44, 27, 15,103,162,156,197, 25,
+131,215, 55,250, 47,244, 70, 51, 26, 20,147,192,195, 66,143,190, 42, 21,195,226, 75,112, 43,136, 93,101,103,186,253,180,120, 59,
+ 12,228,204,189,219,202, 46,183,234,139, 22, 78,207,255, 77,235,191, 28,214,110,247, 30,253,246,132, 13,214, 49,190, 55,228,239,
+104,209, 74, 36, 32,168,200,147,167, 47,212,108,172, 95,220,100,182,134, 31,210, 86,223,248,205,232,143, 35,143,118,142,163,114,
+254,130,  9, 42, 70,156, 92, 40,119,209, 65,  4, 51,181,214,105,236, 37, 89,156, 23,  5,228,117, 48,  3, 60,157,107,106, 29,211,
+118, 60,  7,186, 80, 20,103,169,102, 39,238,  9,195,  3, 43,232, 29,248,216,119,126,217,187,243,242,221,203,237,179, 63,238,111,
+239, 31,142, 62, 88,186, 57, 60, 61,113, 67, 15,254,195,245, 31,174, 67,253, 14,151, 88, 95, 62,  7, 13, 55, 54,139, 53, 11,146,
+ 41,188, 16, 60, 77,197,254,156, 17,129,174,134,102,194,208,173, 10, 35, 27, 66,170, 80,254,154,215, 26,130, 47,194,249,  2,142,
+122,190,201,  0, 10, 89, 93,181, 76, 20,204,137,224, 17,112,196, 66, 34, 81, 96, 20,105,150, 52,144,213, 46, 38, 61, 24,  4, 82,
+164, 85,243, 47, 54,223, 65, 57,149,162,112,205, 98, 13, 33, 24,  3,205,252,202,111,224, 48, 69,133, 91, 90, 22, 11, 97,248, 98,
+ 33, 54,255, 42,196,127, 86,104,154, 67,187,248, 66,130,230,127,  1,232,186,150,221,182,141, 40, 58, 20,103, 40,137, 50, 69, 91,
+ 15, 68,138, 29,217,174,225, 42, 72,155,164,137,  3,196,105, 23, 65, 17,  4, 72, 22, 94,100,149, 69,127,165,232,190,127,208, 95,
+ 40,208, 31,232,174,139,110,186,107, 19,  7,105,129,218,141,101, 87,178,104, 89,178, 30, 38, 41, 62,115,207, 12,229,  6,  8,250,
+  1,182, 52,163, 59,119,206,189,115,238, 57,217,252, 42, 67,221, 29, 81, 44,214,172,154,148, 22,231,178,205,141, 54,117, 81,148,
+ 32,227,165,233,215, 43,173, 41,101,112,169,  1, 34,116,177, 92,170,192,114, 76,208, 25, 40, 72,  5,109,221, 52, 74, 74, 73, 89,
+232, 16,154,126,249,248,155,253,163, 87,116,126,  8, 94, 61,252,244, 81,119,112,146,117,242,117, 10,128,194,249,204,  9,160,140,
+139,255, 16,169,129,148,156, 94, 46,218, 30, 60,148,231,224,191,167, 11,161,  2, 45, 19, 92, 86,188, 84,138,208,189, 71, 47,250,
+195,158,212,136,215,104,227,232,151,144,133,109,180, 90, 89, 19,194,232, 12,222,169,206,166,108,124, 39, 25, 36,147,212,143,204,
+148, 29,166, 28, 46,125, 80,119,212,243,163,249, 97,255,240,179,214,109,103,210, 15,226,120,120, 57, 42, 35, 73,218,206,216,161,
+168, 50,243,150,109,218, 23,144,135, 77,107,229,134,212,137, 76,231,177,151, 74, 99,230,198,114,211, 11, 93, 31, 79,155, 17,193,
+ 82,112, 99, 98,232,151,250,115,151,128,187,101, 46,231,193,197,246,233,114, 94,173, 52,  8,140, 56,163, 62,173,241,201,221,167,
+ 63,254,250, 83,217, 44,111,214, 55,233,168, 82, 42,167, 96,106, 85, 55,208,186,145,142,142,157,193,129, 23,248, 19,127, 68,247,
+ 22,109,133, 85,180,  2,238,163, 90,210, 83,193,177,176, 16,226, 59,105, 16,194,120,143,234, 92, 74,223, 66,240,186, 85, 50, 12,
+ 97, 26,198, 10, 97,158,130,110, 20,121, 89, 26,108,150,132, 70,201, 29,142, 63, 60, 87,208,  4,  6,242,169, 44, 69,139,160,236,
+ 75,  1, 72,104,  3,164, 82,127, 33, 81,197, 37, 37, 20, 17, 98,206, 49,185,191,249, 85,231,236,232,138, 48, 44,152, 40,155, 43,
+202,255, 76,109, 38,197,  6,229,139,162, 32,136, 13,179, 58, 25,232,  9,109,154,114,247,150, 67,161,116,201, 37, 60,199,183,155,
+183,  8,188,211,  5,143,217, 99, 38,254,234,190,229, 56,150,138,226,202,232, 38,131, 85,  0, 38,182,131, 32,156,223,105,221,155,
+184, 19,213, 30,165,239, 68, 69, 21, 85, 12,243,200,149, 39, 48,206,243,  2, 12, 25,226,152, 45, 98,  2,173,191, 68, 77,148, 96,
+ 29,112,164, 73,195,246,106,187, 59, 60,113,189,201,216,191,104, 84, 86,115,192, 74,152,220,164,149, 80, 13,110, 10,211,139,188,
+ 80,246,217,233, 30,162,197,223, 89,223,161,139,129, 16, 52,125,129,254,248, 20, 50,141,194,160,180, 67,224,206,197, 40, 99,220,
+ 31,245, 64,140,193, 51, 26,142,  6,108, 70, 82,128,158, 37,180, 92, 32, 52,198, 33,205,171,103, 52,182,140,102,169, 75,155, 49,
+240,235, 11,249, 34,229,124,211, 88,202, 30,162, 53,170, 80,253,170, 85, 87, 85,172,108, 58,165,206,244, 84,122,146,200,151, 37,
+ 40,245, 50, 14,228,142, 94,214,138, 89, 13, 98,143,115,102,208,145, 52,236, 56,242,191,254,252,203, 81,239,117, 91,155,254, 19,
+241,227,128, 21, 88,250,221,110,123,109,187,197,150, 76,118,127,  7, 73,128,192, 59,146, 59,161,248,203,201,191,135,174,123,201,
+ 22, 86, 58,160, 66,164, 74,111, 24, 45,105, 81,178,115, 73, 82,164, 13,109,218, 70,195,182,  6,254,239,195,249,244, 98, 92, 96,
+236,240, 50,249,123, 22,237,159, 17, 94, 53,191,253,254,  7,115,239,137,236,101,243,255,153,135,199, 79, 26,254,241,166,251,203,
+207, 55,238,125,194, 54,107,204, 52,112,234, 35,  0,164,243,223,142,247,  7, 51, 29,233, 93,250,204,165,202,207, 37,243,222,163,
+173, 94,191,182, 49,195,153, 77, 49, 71,150,102,243,237,202,218, 89,240,252, 86,115,171,119,126, 74,123,179,251,197,227, 92, 28,
+191, 61,249,179,106,215,115,114,136,233,194, 29,209, 81,234,156, 29,211,159,159,142,157,131,238, 65,109,165,126, 60,232, 80,172,
+234,112, 16, 55, 26, 55,214, 65,161,147,118,138,132,223,149,240, 17,  5,252,243,  7,207, 58,206,145,154, 52,162,207,221,110,222,
+156,120,211,225,108, 32, 33,115,124,115,237,246, 96,236,164,146, 32,175,128, 51,  8,241,178,177, 33,245,242,224,103,  7,138,  1,
+148,107,240, 64,152, 44,154, 50,234,245, 37,148,238,146,154, 20, 17,202, 26,150,108,225, 43,168, 40, 92,255, 25,236,130, 79,132,
+  9,245, 15,244,135, 23, 14,193,120,109,178, 76, 11,166,129, 87,180,200, 43,236,174, 72, 89,139, 65,170,143,178,188,246, 94,  0,
+190,174,109, 39,141, 40,138,206, 77, 70, 24, 40, 87, 69, 65,  5,108,140,166,181, 85,211,244,169, 73, 95,154, 52,233, 91, 31,253,
+130,254, 68,127,162,175,253,130,246, 43,250, 11, 77, 52,246,197, 43,169, 55, 24, 16, 25, 24,102, 96, 46,167,123,237,  3,244,165,
+233,155,145,224, 56, 51,231,236,189,246, 62,123,173, 53,227,175, 98,168, 96, 76, 64,141, 22, 55,148,108,195,185,120, 72, 44,189,
+143,173,133, 52, 45, 58,207,119,105,185,210,  3,133,136, 62, 33, 72, 10,109, 34, 68, 56,136,124,166,144,115, 94,102,135, 29,218,
+156, 39,205, 99,250,129, 39,177, 20,187,127,135,193,249,157,183,157, 65, 43,150,108,127,246,117, 98, 17,134,  9, 15,186,129, 92,
+ 96, 26, 24, 76,228,115, 81,117,175,126,208,117,187,138,152, 27,223,160,220,166,196,176,156,171,254,106, 30, 13, 71, 67, 67,103,
+  5, 12,190,240, 90,161, 54, 66,135, 61,126,245,244,117,202, 72,246, 64,111,163, 20, 99, 48,255, 88, 72, 89, 55,101, 38, 72, 26,
+ 11,166,218,178,253, 94,200, 51, 90,244, 82,253, 96,178,146,171,116,135, 29,156,156, 70, 99,199,115,232, 47, 80, 64,183,251,109,
+169, 98,134,224, 37,105, 14, 76,207,205,167,139,246,160, 77,111,241,217,198,238,126,125,255,244,254,244,253,193,135,243,219, 51,
+ 66,172, 92,136,136,245, 98, 21, 43,207,237,209, 91,161,218,208, 25, 13,182, 42, 56, 79, 62,105, 30, 57, 94,159,109,108,141,174,
+211,166, 76, 83, 72, 23,203,249, 50,221,139, 61,176,151,178, 21,140,223, 16,118,208, 98,202,151,126, 68, 49,200, 21,134,  8,112,
+186,169,134,172,124,207,208, 89,161, 16, 15,138, 39, 70,234,249, 73, 42,  6, 70, 75,132,158, 36, 64,147, 50, 52, 83, 79,128,162,
+ 45, 12, 30,162, 38,144,188,160,  9, 51,178,124,129,174, 81, 16, 69,158,239, 49,143, 29,240, 49,111, 85,169,198, 66, 93,138,182,
+ 84,152, 50,224, 41, 76,159,253,238, 92, 69,241,116, 24,138,150, 17, 90,236, 17,251,171, 48,247, 34,189,248,196, 99,163, 28, 41,
+208,134,112,159, 72,229,172,220,208,235,195,181, 18, 13,110,169, 62,  1, 90, 50,221,105,210,180,208,156, 81,117,202, 94,  4,129,
+209,222,153, 49,136,244,153, 33, 29,235,118,  5, 15,110,199, 11,220,172, 85,144,163,144,180,133,120,111,224,211,124, 42, 71, 41,
+153,126, 79,208,131,174, 82,205,173, 81,125,  0,162,118,186, 68,  0, 74,135,247, 30,213,154,  1,168, 60, 17,236, 55, 19,172, 17,
+ 79,251, 60,149, 72,161,192,215,112,  0,224,194,152,  5,244, 11,250,151, 22, 32,137, 14,121,106,194,248,182,115,207,163,120,232,
+115,211,109, 66,119,  1,147,200,  0, 64,245,242,102,125,185, 97, 59, 54,171, 35,  8, 42, 97, 49, 61,197,109,  4, 42,227, 30,135,
+ 93, 29,135,252, 22,101,125, 22,190,159, 66, 19,161,206,237,177, 85, 57,118,140,179,220, 24,234,152,152,120,139, 66, 66, 18,189,
+ 97, 55,161, 75,  1, 81,169,156,161, 77,  7,162,161,139,173,201,142, 81, 66, 55,189,201,160,144, 89, 18, 65,  0,143, 73, 45, 84,
+197,100,175,190,179,182, 92, 30, 95,254,124, 83,210,138,134,246, 66,139, 63, 29,190, 83,146,105,165,182,162,108,109,163, 45, 51,
+ 10,248,112,117, 34,122,189,254,237, 37,158,  8, 55,222, 25,188, 11, 77, 18,246,241, 38,131, 69, 43, 99, 36,146,137, 56, 54, 12,
+ 93, 89, 47,149, 86,243, 57, 39, 56,238, 71,205,246, 99,203,139,206,156,176,209,120,249,249,203,215,236,225, 71,206,220,250,255,
+ 92,131,174,111, 78,191,125,175, 52,114,230,126,  3, 99, 57,166, 46,213, 53, 21,127,124,253,163,121,238,122, 26,155,249,178,252,
+  7,246, 36,138, 75, 51, 21, 18,248,101,163,143,136,109,179,101,124, 64,115,132,121,254,141,114,227,230,225,110,179, 92,187,108,
+ 53,233, 75, 39, 23,199, 55,157,219,231,181, 93,250, 22, 61, 34,170,123, 54,150,106,125,247, 97,128, 51,246, 60,196,136, 68, 76,
+ 48,156, 82, 41, 52,178,160,195,172,150,168, 74,118, 71, 23,173,115,217,125,221, 90,221,166,180,157, 77,102, 47, 90, 87, 32,160,
+242,101, 12,195,164,200,238, 50, 25,141, 98, 10,149,119, 84, 64,140,131, 17,228,247,103, 46, 76,172,153, 10,204, 40,157,231,100,
+ 86,150,229,144,212,109,153, 55,198,197, 92,247, 84,104, 66,153,251,104, 99,177,103,204, 12,193, 51,105, 61, 69,203,128, 13,117,
+205,244, 98,218, 11,252,127, 59,116,196,202,152,  5, 90,180,191,208,126,174,  0, 34,102, 81, 94,157,169,184, 78,187, 60,146,121,
+241, 71,  0,186,174,165, 53,106, 40,140,230, 61,201, 52,153,100, 28, 59,143, 62,166,165, 82,197, 98,  5, 11, 46,132,130,160,  5,
+221,213,133,162, 27,151,110, 92,184,240, 23,185,112,237, 31, 16,220,249,  7, 68,138,160, 86,138,117,112,106, 31,147, 73,154, 73,
+ 50,121,248,157,239,166,182, 27, 97,182, 67, 94,247,126,247,124,143,115, 78, 21,223,  9, 22,112, 43, 82, 41, 43,142, 44,182, 19,
+232, 48,138, 46, 84, 59,104, 81,133, 73,192, 60,221,146, 27,134, 20, 92,166, 51,150,195, 14,182, 37,  1, 85, 33,  2,167,170, 70,
+155,112, 46,139, 11,214,161,136, 93, 80,216,170,193,167, 27,140,203, 32, 26,  5,177,175,201, 24,110,213, 33, 64,103, 96,208,141,
+ 82,105,238, 48,152,181, 58,253, 49,207, 43,173,151,161, 63, 20,194,155,231,166, 82, 82,105,234,180, 12, 77, 28, 33, 70,141,194,
+172,  1,169,229,130,245, 47, 53,130, 99,113, 18, 31,250, 67, 66,229,255, 76, 77, 84, 56,111,229,166, 89, 79,146, 68, 76,229, 48,
+126, 47,116,221,220,186,185, 69, 97,148,114, 52,122, 94, 10, 85, 17,  5, 20,203,166,  3,153,208,159,107, 55, 79, 34,138,239,250,
+101,175,187,177,114, 59,147, 50,184,  8,241, 59,164, 84,163,223, 94,166,220,101, 20,209, 90,132,176, 56, 37, 61,180,104,126,143,
+134,187,195,111, 57,102,205, 51,149, 94,154,156,209,106,243,156, 22,225, 80,167,102,167,229,116,174, 57, 63, 56,217, 23, 98, 23,
+ 44,243,  0,162, 44,179,159,192,133, 29,142,135,178,162,157, 78, 48,133, 73, 97,200,182, 28,171,102, 29, 71,  7,220,172,206,  9,
+176,178,249, 54,199,161, 66,168, 26,  9, 99, 74, 33, 39,109,180, 28, 76,182, 65, 71,158,213, 26,210, 92, 25, 37,229, 52,145, 19,
+186, 48, 68,179,132,184,113,114, 73,162,219,246, 53,  9,154,118,149,199, 15,115, 26, 25,159, 74, 83,225,239, 13,149,109, 76,157,
+203,149, 38, 22, 44,112,129,151,179, 76,197,128,125, 46,203, 85,203,200, 80, 13, 72, 69, 42, 48, 36, 19,218,121,  5, 79,149, 80,
+186, 70, 40, 97,214,237,194,141, 65,226,234,183,172,206,186,237,241,132, 64,150,  2,129, 14,244, 81,138, 51, 39,118,140, 96, 21,
+ 85, 83,177,100,193, 72,180, 61,105, 37,160,  8, 35, 84,134,171,193, 53,124, 60, 54, 10, 64, 87, 28,181,222, 34,143,179,136,110,
+ 35, 99,229, 30,102, 84,149,116,221,149,238,170,144,154,234,120, 61, 66,190, 49,203, 62, 95,235,175,255, 58,220,235, 53, 23,232,
+255,243,173,  5, 63, 28, 89, 48,223, 33,156,146,243, 70, 85,233,209,  8, 37, 45,181,151,143,131, 99, 21,  3, 96,134,160,104,208,
+254,114,234,141,  0,176,238, 72, 56, 20,226,132,133,124, 74, 86,200, 69,195,242,252,240, 40,225,150, 50,  6, 45,160,102, 97,210,
+231,131,242,137, 66,  7,222, 76,215,165, 36, 47,236, 53,231,177,132,152,194,170,114,101,246, 52,137,102,204,250,230,218,230,215,
+193,119, 33,110, 64,145,151,109,226,113, 56,181, 27,157,136,157, 63, 85, 30,166,180,107,182,166, 42,113, 26, 42, 34,237,135,219,
+135,234,105,246,211,199,207,223,127,120,215,215,226, 91,158, 62,103, 40, 87,183, 31, 98,148,229,250, 21,169,213,161, 83, 81, 74,
+ 82,252,162, 56,221,223, 13, 71,127, 80,155,201,114,161,237,170,150,108,112,134, 74, 17,218, 87, 48, 23,116, 92,186,150,201,132,
+ 61,105,177,217,233,120,221, 76, 27,164,146,110,183, 95, 60,121,181,253,242,181,190,182, 42,101, 19,  9,244,210,218,127,131,251,
+238,222,151, 55,111, 91, 78,222,188,187, 46, 45,121,146,109,176,135,111, 38, 17,244, 28, 30, 12, 62, 70,123, 73, 64, 64,151,185,
+138, 48,111, 33,100, 29,231,169,232,  7,200,152,110,234,113, 56,198,206,165,152,126, 18,250,104, 57,104, 53,255,116,252, 96,227,
+ 30, 37, 95, 16, 10,100,178,225, 98,107,193,237,247,212,  2, 34, 54,155, 55,238,124,250,241, 25,196,230,188,124,116,255,217,162,
+215,217,249,185, 19, 68,227,209,196,167,247, 22,166, 33, 45,153, 16, 54, 59, 42,  5, 80,212,223,131, 35,180,193,203,148, 32, 23,
+156, 45,  4,229, 30, 57, 70, 38, 84,  8, 27,117,111,194, 44,182, 41,119,200, 43,189,129,202,205,166,116,172,230,  4,  2, 27, 18,
+125,  8, 74, 73,167,211, 12,220, 37, 76, 67,202, 23,236, 74,207,109,136,197,202,165, 88,138, 17, 62, 66,117,160,202,163,159,229,
+154,174,131, 74, 99,156,162, 50,153,137, 74, 53, 87,230,138,139,134,171,194, 20,248,162,163,177,124,238,241, 40,159, 73, 25, 85,
+158,190,180,245, 42, 56, 95, 86,102,177,127,  5,160,234,250,126,147,  6,163,104, 11, 45,180, 80, 58,  5,  6,204, 73, 98,214, 17,
+150,153,232, 52,113,198,  7,125, 52,241, 81, 31, 76,230,191,103,226, 63,224,139,137,111, 62, 26,117,206,232,139,203,182,196,233,
+212,233,104, 41,148,150,246, 43,245,158,251, 21,220,246,220,133, 66,251,221,123,238,143,115, 78, 30,223,217,112,114,177,205,153,
+ 91,165,210,  3, 72, 80,185, 51,131,139,203,169,106,169, 82, 46, 85,185,142,  6,126,167, 12, 73,199, 21, 80,  8,236,124, 13, 35,
+ 50,205,  8,165,199,  5, 51, 78,107,166, 21, 78, 35, 10, 85,116,189,148,109, 82, 81, 93, 26,132,188,232,167, 31,  6, 64,217,104,
+176,164, 84,142, 65,  6, 68,  8,113,173,227,248,188, 79,166,163, 62, 85,155,118,  7,171,241,176,106,195, 29,208,  1,163, 39,135,
+ 56,194,  5,  4, 99,119,244,206,160,233,131,174, 18,165,161, 18,171, 95, 39,231,117,193, 40, 73, 54, 41,190, 76,188,185,204, 62,
+ 82,212,254,207,125, 58,180,210, 39,  6, 54, 67,108,240, 53,142, 39, 20,223,127, 15, 79, 45,180,195,210, 83,239,215,225,233,193,
+152,114,190, 76, 14,172, 71,113,255,250,131,119,251,111,117,141,119,141,184,149,  8,126, 86,154,182,150,218,117,187,233,  5, 30,
+125, 17,130, 36,132, 25,  9,116,199,113, 46, 16, 79,239, 47, 43, 11,170,155,221, 27,110,112,182,221,219,246,198,195,157,251, 59,
+223,  7, 39,208,234, 98,237, 44,186,237,219,189, 59,163,192, 15,226,209, 70,119,243,135,123,124,219,185,251, 61,252, 90,198,178,
+169,128, 28,171, 46, 73,187,220, 41,148, 69, 45,101,245, 98,214,172,153,245, 90,249, 82,173,100,232, 20, 11,138, 66, 45, 70,179,
+ 76, 46, 36,210, 37, 26,194, 50, 21, 91,201,211,199,207, 14, 15,143,146, 24,158,147,200, 43,  2, 26,203, 42,171,246, 53,172, 22,
+157,144,203,149, 38,100,149,176,220,144, 74,205,138,246,210,149, 81,228, 55, 42,141, 32,  9, 53,116, 69,242, 89,136,196,167,  5,
+ 14,139,153,178, 24,165, 82, 68,179,228,143, 28,130,196, 79,  0,217,148, 56,141, 96, 17,142, 77, 20, 17, 42,159, 78, 39,244, 18,
+218,134, 45,  5, 90,235,232, 81,132,188,152,144, 59,217,193,224,134, 23, 13,232, 63,173,114, 77,114,146,231,228,160, 89,238,121,
+  4, 78,145, 20, 92,204,164,242,148,  6,145,  7,132,173,209,100, 20,195, 24, 17,123,128, 65,232, 23,225,214, 27,127,251,115, 36,
+233,253,166, 97,186,163,193, 90,219, 49, 74, 38,213,163, 34,205, 53,194, 36,153, 48, 17, 83,236,  5,241,236, 87, 74,  6,166,252,
+121,112,130, 78,197, 37, 40, 66,215, 41, 12,216, 21,212, 46,172, 99, 67,117, 80, 84, 80,230,110, 73,188, 77, 52,227,237, 16, 77,
+ 46,131,161,215,155,176,208, 88,166,195,171,178, 20,197,148,183,210,213,198,170, 44, 46,253,241,208, 50,170,204,154, 81, 87, 27,
+221,129,143,  5,161,101,187,221,176,151,  9, 28,240, 76, 91, 72,131, 20,240,188,232,179,160,207,133,  6,232,153,123,114,111,235,
+174,115,115,251,229,235, 87,222, 36,109,216,245,245, 39, 15,241, 19,245,251, 74,197,194,218, 12,192,187, 80,  6,127, 38,199,  7,
+116,  3,149,230,106, 70,153, 53,153,178, 43,104,166,113,230, 45,106, 44,245, 49, 75,193,108,182,108,157, 78, 61, 29,  8,203,164,
+ 16,223,232,182,250,154,233, 71,209,241,217, 95,125, 58,187, 28, 23, 10, 83, 58,105, 10,168,170,186,182,160,205,228,127,225,216,
+127,253,102,239,197,243, 86, 75,111, 63,186,165,108,180,149,146, 49, 55, 99, 78,  9, 50, 40,159, 14, 62,188, 31, 13,102, 33, 86,
+ 17,210,212,233,109,117,150,187, 80, 67,  5,171,155, 43, 64,133, 30, 86, 32,248, 80,211,131,243,152,187,206, 10,232,232,164,236,
+ 30,238, 57, 43,107, 63,220, 95, 32,  6, 98,178, 98,108,175,223,250,248,117,215,243, 93,122,181,252,201,120,163,219,167, 58,155,
+ 10,232,207, 71, 95,226, 84, 56,237, 53,110,  0, 22,169, 86,182, 77,219,233, 56,110,224, 14,195,209,146, 81, 35, 48,232,  6,158,
+ 85,134,102,198,230,213,235, 92, 50, 10,120,123,169,138,179,210,163, 26,154,233,153,  5,244, 21,212,180, 84,208,  8,167, 98,190,
+146,119,137, 17,  5,196, 44,230,217, 43, 15,249,213,204, 52, 42,244,230,137, 60, 84,254,111,176, 44, 58, 39, 42,211, 27, 67,144,
+ 69,120, 88,206, 67, 10,122,193, 98,240,193, 19,185, 30, 41, 37,233,193,148,204,196, 57, 86,234,  2,222,206,109,107, 47,168,148,
+ 93, 80,126, 87,115,149,166, 76, 94, 81, 45,219,132,123,254,  9, 64,213,181, 45, 53, 13, 69,209,147, 75,147, 52, 73, 75,  3,148,
+150, 66,111,220,135, 65, 81,199, 25,121,244,209, 87,255, 71, 63,199,  7, 63,194, 87,103,208,  1,102,  0, 31, 68, 46, 34,  3, 21,
+180, 52, 77,211, 52,205,165,113,239,125,146,  1,121, 44,116, 38, 45,231,236,203,218,107,175,149,206, 87, 85,213, 32,217,166,132,
+152,218, 50, 23,209,129,170,124,130,222,243, 50, 63,229, 37,221,130,198,150,238, 45,155, 41,206,110,212,182,186,131, 63, 61,164,
+ 52,136, 73,102,213,  6, 77, 55, 33, 30, 41,167,206, 15,  3,136,230, 16,226,137, 21, 65,142, 57,180, 22, 59,161, 77,247,133,217,
+122,207,189,135,239, 20,162, 12,138,110, 71, 62,228, 31,184,  3,222,200,165, 26, 77, 32, 27,229,152,192,  7,  8,220, 50, 13, 52,
+112,186,165,160, 24,125,132,155,235, 44,166,113,246, 56,165,170,209, 42,147,169, 21,214,107,155,208, 31, 64, 92, 22, 72,186,116,
+224,219, 16,188, 98, 78,204,160,243,  2, 79, 91,212,167,248, 94,149, 76,228, 14,180,  9,154, 64,160, 44,239,108,190, 66, 82, 71,
+ 20,144, 99,101, 46, 66,181, 19,145,219,113, 17, 28, 50, 49,243, 69, 28,154, 65,188, 70,158, 31,174,158, 64, 62,135, 58,124,218,
+156,185,236,254,108,204, 44,219, 94, 23, 14,108,142,166, 43, 20, 38,  4, 94,111,106, 42,110,111, 66, 83,233,248,131,155,251,206,
+ 40,242, 37, 73,130, 20, 82,159,107,186,158, 83,177,106, 85,107,  1,130, 11,116,  6,161, 16, 45,206, 44, 52,102,151,134,225, 96,
+ 16, 94,139,162,226,184,193,152,148,121,  3,188, 30,233,244,154,  2, 26, 42, 76, 90,166,174,145, 54,153,166,137,  6,146,213, 68,
+ 65, 17,138,134,164, 43,112,139, 17,105, 13,176,215,136, 15,247,246,136, 33,158, 67,162, 20, 22,115,136, 48, 66, 16,129,115,  6,
+215,  6, 69,227,209,225, 79, 80,114, 58,226,230,196, 88, 69, 95,227, 36,193,  5, 13, 58,145,  5, 99,138,216,226,130, 38,107,170,
+146, 23, 82,146,  0,110,152, 19,233, 67, 36, 43,118,142,231,176,242,212, 60,230, 12,211, 66,182,204, 36,169,148, 42,186,170, 59,
+144,255, 38, 33, 23,171,137,113,181, 89,240, 70, 14,188, 30,112,101,224,132,243, 40, 37, 49,115,173,164,146, 57,225,110, 56,228,
+172,141,199,172,100, 90,208,207,210, 20,139, 64,106, 81, 54,242,  6,138, 85,169,208,200,232,163, 96,248,180,249,220, 80,117, 74,
+186, 85,114,114,199,147,  9,193,204, 66,169,169,176, 82,154,187,188, 59, 39,240, 71,152, 54,167,249, 50, 42,  7,239, 67, 28, 80,
+ 60,252, 36,164,102,212, 42,175,192, 99, 67, 96,149,101,244,104,134,242,133,182, 88, 69,158,239,179, 78, 57,197,220, 17,147,140,
+ 35,108, 90,100,196, 25,114,104,166, 28,167, 14,  6,216, 49, 69, 91,141, 39,219,237,103,174,231, 58, 35, 27,238,  2, 22,  1,  8,
+ 55,225,199,181,221, 30, 95, 11,243,124,  7, 89, 70,241, 88,203,169, 80, 73,115,125,220,113,232, 37,228, 24, 92, 50,202,136, 98,
+ 39,147,126,231,230,205,187,247,237,242,202,193,241,217,230,106,189,246,122,155,105, 50,107,181,152,172, 32,242, 62,138,217, 96,
+200, 46,190,251,118, 55,145,114,122,121,113, 60,236, 71,112,127, 73, 56, 80,226,254,135,184,109,  5, 53,127,140, 40,141, 10,253,
+ 70,129, 11,201, 34, 61,  6,170,134, 86,121,179, 58,167,  4,254,183,147,163, 47,251, 95,127,255, 56, 83,236,161,222, 15, 36,199,
+103,119,  3,214,237, 51,187, 31, 93, 93,217,159,191, 28,127,248,216, 57,218,221,120,177, 84,126,251,146,181,107,112, 64, 50, 39,
+ 56, 34, 99,186, 14,251,116,186,123,233,133, 88, 86,176,122,169,222,251,219, 57,191, 58,177,135, 61, 35,111, 66,246,130, 10,  6,
+ 66, 10, 84,217, 28, 90,230,210,128, 69,221, 26,133, 67,172,  8, 85, 99,125, 97, 13, 18,236,175,187,203,229,218, 26,156, 49, 72,
+153,215,208,168,187,189,102,181,121,222,185,104, 55, 86,231, 43,141,130,154, 63,188, 56,180,138,211,240, 91,  8, 23, 61,183,123,
+107,223,194,191,  3,254,108,103, 99,103,255,244,  0, 14, 60,244,175,170,162, 65, 17,131,131, 49,198,160,146,131,194,202,192,168,
+130, 75,219,240, 22,137, 73, 57, 69, 29,  7,184,198,175,171,166,231,123,216,164,102,160, 75, 76,133, 63,173,226,112, 21, 32, 20,
+153, 29,135, 33, 60, 63, 69,161, 36,  3, 73, 30, 45,151,210,231,129,158, 62, 85,204,205,252, 84,137, 36, 18, 39,153, 38, 48,101,
+ 92,137,100,138,131,255, 29,241, 30, 56, 50,201,131, 32, 65,170,112,156, 73,109,241,229, 41,246, 72,136,155,241, 97,245, 63,  1,
+152,186,178,158, 38,194, 40, 58, 91,167,211, 14, 67,167, 51, 85, 42, 22,161, 46,136, 60,184,  5,  9,241,205, 23, 31,141,137,137,
+ 62, 24,127,168,207,174, 65, 73,124,209,132,168, 21, 23,192,130, 80,102,161,179, 79,189,231,126,131,248, 10,  9, 19,102,190,239,
+220,237,220,115, 42,253,247,146,249,149, 19,110,207, 21,101,213,162,207,133, 58, 54,171,158,210, 49,165, 55, 66, 16,230, 88, 29,
+122, 95, 17,197,204,104, 68, 23, 62, 41,210, 51,214, 12,225,126,157, 53,223,121,190,138, 39, 47,207,221,236,185,125,138,144,216,
+145, 71, 60, 56,123, 97,102,225, 96,180,207,126, 42, 74,107,202,  9,227,163, 32, 14,232,246, 26,186,  1,  5,116, 69, 29,167,216,
+252,246,199, 30,123,243,136, 72,132,134, 59,180, 42,243,136,183,141, 48,251, 98, 85,224,140, 89,240, 38,157, 12,130, 81,138,174,
+130, 96, 40,114,206, 40,137,134,254,208,  7,213, 18,139,127,176,121, 66, 79, 77,169,118,230,133, 27, 38,166,113, 42,211,  9, 50,
+250,158,216, 24,150,149,  2,159, 42,222,252,181,185,231, 13,233,107, 81,197, 36, 24, 78,194,135,185,219,238,221,186,180, 58,244,
+118,254,  4,135,174,233, 22, 66, 37, 89,130, 97,147, 80, 25, 37,160,196,218,154, 92,106, 26, 26, 20, 20, 63,  8,  5, 90,166,253,
+ 96,237,225,224,247, 32, 76, 60, 96,159,162,210,179, 40, 11,167, 67, 70,213, 15, 74,254, 50,111,214,205,122,189,  1,161,140, 12,
+252, 95,  8,167, 40, 24, 64,209,171,248, 52,124, 47,201,154,109, 25,178,146,129,255,  9,196, 41, 40,121,  2, 87, 82,102,239, 55,
+196,205,114,214,182, 36,204,235,100,104, 98,151, 74, 92, 72,152,  0,148, 74,150, 76,130,113,150, 51,184, 19, 48, 54, 36, 93,213,
+106,184, 98,232,128, 34,213,116,173, 51,127,188,253,243,206, 28, 93,164, 44, 77,111, 95, 90,219, 25,109, 83,230,194,125,173,106,
+ 92, 36, 20,237, 84,206, 13,232, 61,211, 17,111, 81,234, 93, 36, 81, 54,134,124, 88,145,245,187,139,182,217,142,227,152,  5, 90,
+101,166,142,233,130,250,173, 48,135,114,169,183, 28, 70, 30,197,114, 56, 97,113, 71, 91, 88, 45,179,112,203,132,138, 57,199,116,
+  3,202,110,  8,193,107, 80, 72, 44, 88,164, 19,162,162, 85,112,172,206, 57,218, 68,220,156, 17,108,168,233, 70,139, 46,  3, 85,
+ 21, 83, 13, 27,146,244, 58,149,137, 49,152, 51,138,174,107, 26, 33, 56, 29, 27,168, 77,113, 83,  5, 66,120,160,223,200,231,236,
+238,246,193, 47,110,166,226,143, 71, 44, 65, 37, 79, 78,117,197, 78, 20,225,185, 58,146, 74,163,214,160,147,153, 78, 82,122,249,
+132,197, 77,189,217,235, 92,240,162, 67, 89,232, 10,242,249, 16, 82,227, 60,119,149,132,189, 39,247,165, 84,118,178,174, 33,177,
+ 80,176,187,165,242,245,222,247,135,224,114, 72, 37,197,167, 56,141,133,233,154, 90,249,204, 85,250,200, 96, 82,230, 88,122,164,
+223,250,104, 33,130,126, 68,  8,104, 32,244,166,101, 25,105,138, 92,215,117, 63, 24,221,182,186,189,103,143,239, 46,174,205, 94,
+239, 72,141, 76,154, 50, 32, 40, 86, 51,168, 20,197,250,232,247,175,147,221,239,  4, 64,116,146, 19,239, 48,143, 67,177,106, 35,
+ 40,153,208,157,  6,186,195,128,152,226,133, 92, 36,148, 65,233,141, 41, 73, 88, 96, 27, 42,116, 11,102,157,206,213,185,229, 43,
+ 11,253,142, 85, 38,225,206,246,151,207, 31, 55,  6, 27,239, 54,223,188,250,185,177,254,227,245,139,173,183, 47,143,247,190,245,
+175,205, 44, 61, 90,107,220,191, 41, 89,142,132, 45, 87,229,164, 19,144, 75, 84, 47,110,109,142,158,251,235, 71,161,206,229,167,
+ 23,  7, 17,250, 87,148,145, 24, 20, 92, 15,131, 35,130,154, 48, 30,159, 16,161,171,213,126, 85,211, 98, 54, 59,164,138,199,157,
+118,135,222,239,227, 52,170,171,122, 16,133,148, 63, 57,150,221, 54, 29,250,191,188, 99,127,239,104, 63,142,198, 79,239, 61,233,
+117,122,187,  7,208, 25,116, 44,247,206,229,149,249,238,130, 99, 58,131,225, 96,117,113,101,227,235,135, 27, 23,175,239,142,118,
+ 41,192,183,173, 54, 21,232,152, 30,201, 72, 32, 48,169,171,213,155,181,102, 16,135, 19, 86,163, 99,232, 45,216,234,170, 60,213,
+214,226, 33, 19,  3,167,248, 73, 89,229,243,204,129,134, 85,  9, 32,  6,243,137, 10,226, 43, 45, 35,137,170, 49,219, 36, 52,240,
+255,153,113, 73,255,104,238,149,206,  0, 87,166,120,104, 46, 79,148, 19,115,132,255,179,120,249,148, 25, 83, 41,  5,171,148,211,
+228,101, 50,223,233, 19, 20, 79, 27,173,148,221,234, 69,179,134, 80,209,182,220, 40, 25,255, 21,128,171,171,233,109,219, 10,130,
+ 79,252, 18, 69, 74, 52, 45, 89,142, 34,217,113, 98,203,106, 13, 36, 65, 16,167, 77,123, 42,122, 14, 10,244,212,191, 88,160,191,
+160,233,177,151, 22,  1,114,232,173,177, 17, 20,181, 98, 39,134,252, 77, 83,226,151,200,206,236,147,140,160,128,111, 50, 40,145,
+143,111,119,118,223,206,204, 34,190,147, 81, 94,101,194,181,209, 93, 26, 85, 55, 93, 65,120,165,239,249,210, 20, 99,212,199,253,
+183,220,128, 90,166,170, 76, 17, 25,107, 86, 94,102,219,189, 93,128, 80,146,102,152, 27, 22,210,153,147,235,211,235,248, 18,152,
+151,196,147, 42,  7,224, 58,158,140,229,110,184, 37,200,209,146,118,182, 67,140,236,102,121, 70,217, 41,114,217, 43,173, 24, 86,
+  9, 79,215,107,248,248, 10,228,210,106,121,  4,183,124,106,216, 42,182,107,201,252, 92,137,141,103,  0,179,  3,135, 96,177,183,
+186, 15, 16, 64, 43,162, 90, 83,134, 53, 17,178, 83,203,116,180,225,207, 92, 76, 38, 77,145,159, 46,217,243,146,202,218,100, 47,
+ 85, 79,183, 33, 94,222,107,247,137,178, 57,250,205,117, 86, 11,151, 91,117, 21, 95,140,207,142, 50,177, 97,147,161,157,164,217,
+ 32,139, 26,171,130,205,187,218,108,  3,107,115,120,166,152,213, 41,215,147,240,186,166,137, 87,228,221,248,239,126,123,176,219,
+255,242,227,229,201,138, 23, 80,170,180, 30, 80, 22,223,198,235, 59, 67,196,188,205,162,176,217, 70,104,155, 68,231, 47, 71,223,
+  4,173,224, 98,138,240, 81,109,172,111,204,106, 31, 92,199,234,132,245,210,204,168, 95, 46,226, 60, 34,130,169,202,106,161,108,
+ 62, 75,202,123,129,103, 57, 86,131,134,174,196,238, 57,146, 68, 89,  9,157,191,198,224, 46,134,191,142,165, 26,149,103,213,156,
+148,126,167, 50,142,102, 88,211, 36,142,179, 40,154, 69, 36,  7, 85,156,252,137,211, 41, 46,178,210, 88, 77,138, 84, 23, 46,247,
+ 87,  7, 83,161,159, 96,165,218,173, 46,158,219, 52,139,  1,222, 91,110, 40,146,120,234, 42,186,184,140,207,155, 94,200,240,106,
+187, 94,189,149,229, 51, 20,127,168,139,191, 24,236, 29,159,253,123,113, 51,  9,253, 53,252, 12, 45,102,175, 15,  9, 76,211, 70,
+126,242,157,  6, 86,132,121,148, 22,201, 72,200, 54,135,157, 10, 22,144,131,206,166,248,243,177, 47,101,137,247,115,154,  3,145,
+150,205,122,192,134, 24, 73, 85, 41, 77,235, 68, 11, 28,123, 50,240, 87, 16,241,119,238,143,254, 57, 61, 88, 11,214,145, 59,108,
+ 78,229,250,184, 38, 79, 46, 84,181,214,236,142, 54,247, 44,195,185,141, 35,241,191,160, 96, 17,150,175,223,222,152,146,156, 50,
+221,236,108,161,156,231,105,191, 46,100, 89, 71,240, 39,107,106,174,109,152,156,218,180,237,243,155,179,185,  8, 75,177,139,210,
+236,220,208,183, 64,  9, 95, 90,252, 62, 13,171,169, 67,100, 89,234,198,143, 73,209, 40,167,148,241, 77, 30, 71, 89, 20,173,141,
+ 18,220,154,177,217,221,122,177,179,127, 52, 57, 50, 52,157, 74,213,144,230,  1,232,109, 82, 74,  3,108, 64,223,241,112, 53,  4,
+ 50,212, 13, 41,189,141, 82, 81, 21,197,187, 69, 57,  0,196,241,147,195,195,253,112,221, 90,235,168,230, 88, 25,  5, 74, 27,229,
+ 35,143,123,236,207,140,199,234,232, 80, 37, 51, 30,203,243,153,230, 65,239, 33, 91,  5,121, 42,157,119,165,135, 53, 25,223, 57,
+  6,207, 16,111,  0,111,121, 94,205, 23, 81,120,202,242, 89,202,179, 84,216, 80, 15, 66,119,212,239, 61,223,121,244,124,184,251,
+228,225,240,233, 96,251,241, 96,235,217,198,163,111,135,219,175,246,  7, 63,190,244,190,122,170,186, 61,  5,  8,193,222, 67,181,
+236, 63,211,206, 75, 29,143,213,239,  7,127,252,165,174, 84,234, 91, 30,205,165,132, 74,138, 91,163,146, 79,195, 47,105,124,152,
+170,197, 72, 75,169, 25,134, 69,173,204,242,188, 18, 50,217,188, 70, 37,168,172, 88, 48,210, 91, 94,128, 63,224,194, 86, 16,190,
+ 63,125,191,211, 27,226, 29,  7, 24,250,245,237,235,227,179,143,251,123, 95, 31,124, 56,  0,210,191, 78,226, 55,239,254,140,166,
+183, 63,188,250,233,151,223,126, 30, 13,134, 39,231,159,196,246,118,142,122, 49, 74,167, 41,253, 23,233,189,174,199, 96,190,123,
+252,253,233, 21,254, 33, 67, 10,159,243,128,208,193, 99, 41,164,214,212,242, 56, 38,213,129,138,255,207,168, 47,117,122,177,166,
+235, 65,239, 82,228,140,140,207,108,202,240, 49,170,216, 72,228, 63,239,220,187, 42,146,129, 66, 29,118,238, 52,232, 62, 51, 50,
+ 93,120, 55,169,187,144,190,212,231, 53, 23, 19,184, 68, 90,174,225, 38,  5, 82,229,141,254,168,162,191,158,102,175, 18, 79,212,
+ 45, 27,209,233, 63,  1,184,186,146,221, 38,130, 40,216,227,158,125,188, 36,182, 65,113, 54,  2,138, 20, 36, 32, 98, 59,112,228,
+130, 64,226,163, 57,193,129, 59,  7, 22, 37,144, 96, 34,103,177,163,120,198,158,241,108, 84,189,182,  1, 33,249,224,131, 29,103,
+122,222,188, 87,175, 95,117,213, 42,191,171,  6, 64,220, 86,247, 78,194,218,152,139,234,158, 39,204,153,138, 68,186,124, 38,146,
+ 65,148,232,146, 61,235,146,228,135,170,242,208,200,228, 41,154, 26, 32, 66,211,100,153,230,194,216,138, 85, 82,202,208,116,  0,
+235,  5, 78, 68, 23, 36,153,154,215, 43,103, 54,161,199, 89,158,141,140,224, 77,179,155, 63,106,124,162,191, 80,136,194, 95, 11,
+ 69,143, 38, 59,134, 86,185, 60,224, 42,170,177, 21, 37, 35, 68,173,197,151,205,138,210,196,197,193, 38,160, 98,156,202,216,196,
+ 90,233,246,209,156,193,178,241,107,187,189,189,201,108, 66,146,128,165, 68,197,155, 66,240,165, 48,237, 12, 73,  6, 15, 33,114,
+ 25,153,242,170,126,253,244,117, 95,196,220, 27,202, 54,114, 94, 64,187,154,170,142,128, 53,253, 89,158, 96, 89, 10,250,184, 38,
+192, 60, 73, 46,236, 26,233,208,144, 25,219,193,122,178,136,125,161, 15,137,115, 72,117,116,113,132, 11,  6, 90,  1,168,231,118,
+  4,  5, 79,200,147,219, 31, 28, 32, 37, 13,199,167,200,242,136, 42,212,185,179,235, 33,194,183, 84,197,104,  6,148,151, 35,161,
+  4,174, 51,225, 17, 39,182,  9,139,138,180,247,116,  1,116, 92, 45,128, 42,105,187, 91, 14,144,217, 60, 39, 10,180,239, 41,186,
+118,240, 80, 72,213, 12,116, 39,106,224,105,245, 29, 43,116,149,239,171, 70,230, 38,121,204,180, 83, 89, 89,153,201,166, 99,161,
+149,107, 56, 33,136, 96, 20, 66, 78, 11, 26, 86, 42, 76, 80, 78, 29, 69, 95,  9,235, 41,180,105,110, 55,181,194, 53,148,231,166,
+219,156, 34, 21,210, 26,137,252,108,205,177, 74, 32,186, 52, 30,138,217, 90,180,134,219,141,200, 67,225,103, 74,211, 78, 66, 65,
+237, 90, 44,165,108,223,166,139,158, 71,146,213, 92,172,254,114, 51,183, 92,242,196, 56,124,174,163,176,221, 69,242, 85,117, 70,
+145, 25, 33,113, 54,212,203,  7,175,102, 89, 60,157, 93,135,126,196,222, 73,209, 71,136,193,206, 85, 46, 59, 97, 55,206,110, 46,
+167, 87,172, 73,189,109,164,212,189,193,254,217,248,196,230,116,  4,215, 92,163, 30,175, 71,235, 31, 63,191,  7,242, 69,217,211,
+ 75,239,212,154, 12, 22,219,222, 28,108,191,121,248,202,119,221,147,203,211,167,119,159, 39, 25,199, 66, 34,167, 83,155,110, 70,
+220,232,116,224, 69,241,124, 42, 86,155,245, 78,127,247, 42,190,148, 51,122,212,159,194,  7, 68,203,154,135, 31, 61, 10, 91, 34,
+149, 27,147,207,133,177,146, 48,158,239,210,209,167, 17, 79, 72,241,220,195,241,249,177, 72,235, 88, 27,157,141,138, 82,136,137,
+168,212, 42,  9,232, 18,223,197,106,  3,226, 80,253,131,197,204, 88, 25,240,151,180,163,125,215, 74,235,249,249,209,183,251,237,
+142,115, 32, 15, 28,114, 49, 48,204, 60, 83, 63, 79,212,201,177,154, 78, 17, 49,140,145, 34, 71,  1,  9,251,155,101,154,148,232,
+171,164,225,181, 45, 65,238,248,107, 14,119,101, 93, 13, 76, 80,232, 50,213,158,175,154,109,212,183,229,203, 21, 65, 16,215, 97,
+229,232,182,213,224,150,218, 25, 52,246,118,244,238,182, 53,216, 82,157,158,210, 45,193,236,122,181, 51, 44,238, 38,124,229,106,
+ 52, 84, 95, 62,149, 31, 22,239,206,208, 36, 21,109,114,174,230,184,148, 60, 47,  2, 63, 68,  2,138,179,164, 29, 52,  1,183,241,
+160, 53,195,102,175,213,199,155,141,238,214, 44,157,209,179,211,226, 62,106,228, 70,184,179, 40,225,136, 22, 52,196,227,120,140,
+197,  7,216, 10, 91, 29,252,127,227,235,139,183, 47,222,242,252, 68, 93,198,243,228,112,255,241,143,209,247,172, 88, 52,  1, 76,
+ 23,115, 84,202,209,112,216,235,220,126,116,247,240,215,120,136,136, 65,204,227, 99, 40, 15, 81, 16,226,205, 90,212,101,210,183,
+234,175,191,190,224,166,160,225, 99, 35,  8, 44,162, 93,250,223, 74,217,137,  2,194, 50,116,114,230,136,181,178,254,151,241, 50,
+199, 63,175,147,201,147,123,207,198, 55, 99,181, 26,111, 10,143, 90,201, 38,152,101, 84,210,141,201,144, 81,120, 22,230,141,205,
+125,208,127,156, 84,151,226, 60, 86,189, 66,250,184,235, 30,179,147,241,251,248, 71,105,146,103,232, 26, 75,115, 35,241,107,251,
+ 91, 84,216,244, 20,156, 15,253, 22,128,172,107,217,109, 26,136,162,227, 87,108, 39,113, 75,154,146, 54, 45, 37,149,218, 64,139,
+ 64,149, 88,176, 64,130,  5,172,  1, 33,177,226, 79, 16,223,  3,123, 22, 72,136, 31, 96, 65, 17, 32, 36, 22,136, 71,121,180, 13,
+205,203,137,227,215, 56,118, 56,247,218, 41, 72, 72, 89, 36, 82,235,196,158,153,115,207,157,185,247,156,  2,223, 65,118,104, 53,
+142, 59,  0,104,149, 83,  6, 50,162, 52,203, 72,156,123,227,223,196,166,201, 27, 39,  1,134,204,  4, 77, 83, 14,107,217,153,106,
+ 29,169,107, 97,205,202, 54, 29, 89,190, 63, 42,196, 90,189,149, 81, 93,151, 17,209,145,177,194,170,173, 73,197,116, 44, 82, 74,
+137, 88,250,114,182, 88, 61,131,121,231,147, 62,220, 52,102,  1,166, 66,103, 49, 15, 71,220,159,157,178, 80,167, 58,207,210,103,
+220, 48,138,196,109,238,234,140,169,196,126,220,185,134,149,170,252,234,255,196, 79, 90, 48, 23,184,233, 31,  1, 64,103,207,117,
+ 17, 81,117,121,106,155, 22,104,120, 70, 85,134,153,122,106,158, 67,199,176,228,210,  7,162, 58, 14,221, 60, 61,108, 46,109,188,
+255,250,182, 51,234,130,201,134, 73,144,139,144,  0,143, 76,211,162, 54,212, 52, 38, 72, 34,145,219,217,222,238,213, 71, 15, 31,
+ 63,123,245, 12,208, 79, 14,244,220,183,  9, 14,154,215, 89,226,167,198,233, 52, 72, 66,228, 49, 36,254,103,216,219, 43,237,227,
+241, 49,230, 31, 38,238, 48,112,  7,129,235,  6,125,140, 33,160,231,250,165,155,247,110, 61,120,247,249,205, 42, 40,115,138,152,
+138, 48, 35,249,118,213,193, 56,154, 68, 89, 44, 89,227,142, 15,160, 98,192, 15,114,168,132,204,166,106,229, 50,254,204, 40, 33,
+240, 40, 92,  2,168,133, 41,210, 76,133,234, 29,145,151,201, 20,193,128, 32, 48,212,105, 75,138,211, 79, 60,202, 59,215,238, 31,
+116,190, 17, 58,209, 37,181,178, 85,102, 51,113,191,  8,190,162,144,202, 32,241, 85,131,218,133,214,150,206,135, 88,141,149,154,
+235,247,241, 76, 64,112,102,133,195, 48,157,107,  2, 68,192,151,129, 98, 97,228,247, 39,253, 52, 77,150,156,134,100, 70,191,177,
+212,162,210, 74,174, 30,171,152,213,203,173, 61,124,196,165,176, 32,219,205,221, 92, 38,236,250,206,141,227, 97, 39, 63,194,193,
+183, 55,156,198,143,222, 65, 20,133, 36,144, 38,196, 98,181,134, 21,222, 29,157,120,177,183,181,182,211,117, 79,200,247,146, 74,
+227,207, 78,147,  4,143,107,179,177,121,121,115,175,231,158, 76, 89,159,114,232,117,193,178, 59,195,195, 34,231,229,129,246, 35,
+239,168,127,136,  0,179, 94, 63, 47,101,  4,114,192,194,191, 42, 70,106,171,113, 97,171,189,253,244,229,147,195,222, 47,140, 82,
+217,180,135, 62,169, 80,  1,205,201,239,  8,153, 47,133,186, 12,193, 15,248, 11,148,173,148,200,178, 99, 56, 25,176,206,129,122,
+214, 89,225, 48, 95, 45,105, 90,238,215,131,255, 45, 27,214,162, 83,  3,150,197,115, 53, 74, 13,116, 71,215, 21, 62,  5, 94,175,
+173, 75, 54, 11, 77,146,168,164, 82,171, 58,235,148,138,122,117,249, 74,235,202,200, 31,165, 83,105, 26,230,221,107,119,129, 59,
+164, 75, 64,156,108,166,228,162,  9,132,201,148,209, 98,125,153,150,233, 77,163,170,219,105,221,222,166, 29, 87, 64,112, 42,133,
+235,138,110, 87,120,129,136, 49,252, 88, 91, 50,211, 12,221,118,226,113, 95,122,221, 92,223,149, 13, 48,232,114,134, 70,181, 12,
+ 84,205, 70,115, 84, 53,112,179, 73,128,165, 43, 28,135, 20,102,144,247,145, 11, 65,174, 69,168,241,235,244,141, 86,220, 86,177,
+239,153,205,145, 61,127,147,136,225,145,248,248, 78,124,242,246, 95, 27,106,101,181,162, 91,131, 73, 79, 87,140,246,218,197, 19,
+143,172, 19, 87,107,205,206,224,247,136,234, 41,144,197,  6, 82, 74,246, 59, 61, 23, 39, 73, 60, 13, 43,214, 66,202,114,229, 97,
+ 28,225,198,183,155,109, 76,209, 73,228,219,134,141, 37, 31,203,216,243, 71,  6,245, 72,198, 59, 27, 59,207,247, 95, 88,134,133,
+ 60,224,227,247, 15,131, 96,104, 26, 96, 15,224, 70,182, 23, 79,124,233,247,189,222,151,227, 47,116,108, 38,102,200, 47,193, 87,
+ 86,234,205,101,103,249,136, 68, 65,168, 31,158, 59,229, 20, 22,127, 22, 81, 34,211,194,  4,133,172,  1,243,125,115,  4, 72,208,
+ 89, 57, 47,126, 21, 69, 93,254,169, 15, 23,155,247,169, 42,166,156, 69,250,131, 41,181, 23, 48,127,229, 77, 98,234,141, 96, 27,
+ 60, 61,215,138,164,195, 78, 42,193,196, 12, 44, 58, 73,255, 53,200,182,169, 44, 48,213,169, 43,158,176,164, 98,179,166,130, 86,
+ 50,169, 82, 32, 57, 85, 50,248,107,104,252,255, 43, 55,112, 21,202, 31,  1,168,186,150,222,198,169, 48,122, 99, 59,118,226, 71,
+156,135, 39, 68,125, 12,101,132,152,142, 70,  2,129,216, 32,216, 34, 36,182,252, 17,216, 32,177,225,151,161, 65,204,128,196, 10,
+  6,161,  2,139,138,121,209,166, 77,211,214,137, 99,215,142, 99,155,115,190, 59, 25,  6,169,139, 72,173,210, 68,190,223,185,223,
+227,124,231, 16,223,229,165,165,201,156,178,116,167,229,203,168,197,220,212,220,160,245, 28,151,197,178,238, 47,171,166,109,216,
+136,109,156,236,140,237, 60, 86,166,150,148,213,218,110, 91, 36,182,145,116, 36,212,116, 44,215,226,213, 71, 95,138,183,119,239,
+161,252,  1,208,139,132,183, 45, 51,144,182, 56,217,151,185,140, 38,122,110,255,211,247, 62,255,243,244,200, 52, 94,222,103,142,
+232,  6,203,150, 85,107,203, 98, 98,  2, 24,116,  2, 98, 16,125,134, 52,179,174,177,100,197,223,230,178,137, 31,133,227,113, 56,
+222,143,232,249,224,119,195,180, 72, 59,150,131, 79,219,182,156, 56,187, 70, 68, 29,188,113, 48,199, 29, 43, 45, 96,189, 15,141,
+139,  7,103,251,116,113,234, 80,229,133, 78, 38, 52,213, 19,214,201,  2, 89, 42, 66, 13,159,214, 48,162,222,100,158,206, 74, 89,
+203,162,197, 17, 21,239,236,100,185,122,244,248, 97,217,148,149, 65,119, 80, 50, 85, 25, 63, 86,199,102,150, 74, 62,143,200,145,
+139, 77,105,179, 42,211,121,114,129,107,198,182,156,143, 14, 63,249,250,139, 47,127,252,235,103,100,133, 64, 61,211,110, 47,243,
+229, 15,191, 61, 24,134,227, 40,140,174,210,185,105, 22,128, 11,128,123,223, 55, 43, 49,237,192,169,161,102, 91,213,  0,  3, 59,
+ 29,  3,201, 43,107,116, 83,221, 30,245, 90,164, 48, 26,155,162, 54, 37,244,147,138, 34, 14, 40, 81,242,117,181, 88,150,121,190,
+193,227, 68,249, 14, 76,161, 39, 36,101,143,234,227,233, 49,237,108,148, 94, 68,104,101,148,216, 52,180,212, 51, 62,107,200,238,
+118,165,105,152, 81,127,124,184,123,255,143,127,142,240, 91, 26,237, 74, 74,219,144, 46,109,123,182,207, 25, 19,155,200, 45,167,
+237,234,237,130, 65, 55,202, 54, 89,224,120,138,140, 26,247, 44, 62,225, 44, 71, 22, 23,  1,166, 40,165,103,241,185,197, 97,105,
+117,153,156, 35,157, 71,178,246, 98,254, 76,116,134,185,251,138,111,122,195,114,208,241,  2,255,155,175,190,125,240,232,187,189,
+232,118,198, 85,100, 26,105, 38,171,216,216,114,  8, 74, 90,162, 51,185,139,179,120,122,241,194,119, 67, 74,234, 91,142,  0,151,
+209,247, 70, 61,102, 94,172,255,240, 56, 16,179, 72,171,145, 33,206,150,231,248,215,125,183,143,191,188, 78, 46,187,182,115,114,
+117,242,228,249,241,208, 31,145, 41,104,180, 23,233, 18,176,222,200,184,152,198,217, 65,  4, 80,198,149,182, 51,220,199,181,132,
+ 99,198,141,202, 86, 43,112, 67,233, 44,161,150,202,164, 67,206,201,183,192,166,161,125,219,113,225,225,203, 90, 45,235, 86, 56,
+ 46,  0,178,244,162,175,180,140,  9,112,170, 99,106,118,118, 45,148, 83,170,233,225,104,173,138,213,233,245,116,111,176,179,200,
+151,131,238,224,201,236, 41,128, 12,248,219,239, 14, 88,243,113, 29, 90, 27,214, 55,180,175, 65, 25,110, 82,195,225, 94,216,219,
+255,236, 80, 73, 31, 83,226,186,173,226,132,251,171, 69,161,114, 96,188,242,247,239,122,147, 55, 59,193,168,202, 86,213, 58,149,
+138,139, 12, 63,139,253, 25, 18, 46,137,236,109,185,126,112,158,144, 51,229,137,218,228,202,247,148,219, 37, 91,198, 82,255, 55,
+153,123,189, 67,241, 42, 91,223,108, 95,224,231, 70,157,255,173,142,126, 87,105, 82,253, 50,249,254,228, 50,203,175, 16, 11,180,
+128,173, 55,243,248,146, 10, 52, 85, 29,167,139, 97, 48,244,187,222, 69, 50,215,189,232,154, 42, 41, 37,158,166,108,228,179, 97,
+163,211,190,183, 38,119,206,174,167,184,169,102,139, 89,193,164,193, 73,242,  4,193, 62, 12, 34, 68,110,122,147,149,245,250,157,
+157,187,253, 96,232,217,174,197,  1,140,131,119,235,145,192,157,173,139, 98, 55,218,195,155, 80,230, 23,160,180, 89,123,222,240,
+195,247, 63,254,233,215,135, 59,131, 73,202, 45,217, 66,184, 58,245, 86,133,166,182,148,249,238,193,  7,103,241, 84, 47,242,117,
+ 44, 23,153, 82, 81, 22, 90,247,  8, 73,131, 69, 99, 85,233,129,170,214, 86,208,171, 22,129, 60,201, 80,181, 33,182,161,167, 24,
+ 29, 68, 55, 78, 66,217, 20, 90, 23, 84, 27,135, 10,237, 87,173,101, 28,245,106,  5, 85,143, 29, 71,189, 91,107,170,219,123,101,
+149, 59,182,107,139, 92,249, 75, 17,233,173,145,227, 22,216, 95,127, 22,122,180,248,159,205, 19,126,241,175,  0, 76, 93,203,110,
+211, 64, 20, 29, 79,108,231,253,104,161, 15, 80, 83, 72, 83,  4,165, 80,170, 82, 42, 64, 72,  8,  9,  9,177,224,107, 96,207, 55,
+176,237, 18,  9,126,  3,177, 64,128, 16,221, 65,203, 75,226, 21, 72, 19,226, 52,137, 95,245,216, 30,238,153,113,  5,139, 74, 85,
+165,198,142,125,231,206,157,123,206, 61,231,168, 63,163, 74, 54,133,137,104,111,245, 50, 56,121,  9, 88, 89,128,179, 98, 49,118,
+ 15,164, 78,165,136, 98,209,156, 93, 26, 78, 28,237, 37,207,178,118, 75,134,228,106,176, 81,207,  2,128,100,  9,195, 28,122,178,
+145, 51,249,115,169,181, 65, 47,169, 81,170,107,120, 74,192, 94, 39,130, 14,  3,186, 37, 17,197,241,183,193, 55,  1,137, 96,165,
+250, 43,181, 12, 27, 34, 81,187, 75,209, 31,128, 86,201,132,138, 47, 52, 99, 84,214, 95,109,174,143,131, 17, 93,171, 82,172, 53,
+167,154,253, 73,143, 78, 73,251,163, 94,127,210, 87,199, 91,122,115,242,218,217, 27,189, 97,151, 34,198,226,121, 74,  7, 84,163,
+ 73, 37,113, 99,114,179, 81,  3, 35,144, 78,238,180,183,231, 77,123,226, 79, 22,102, 91,225, 97,136,125, 37, 85,222, 43,  6,187,
+121,241,246,108,125,230,199,224, 59, 37,125,186,121,  1, 86, 12,  0, 21,211,182, 67,137, 94,127, 64,  5,122,170,181,164, 25,196,
+ 27, 88,106, 89,230,116,105,202, 21,190,159,  4,106, 20, 34, 85,246,202,156, 22, 17,229,221, 90,169,106,112,107,231,235, 27, 74,
+190,159,246, 63,218,133,124,173, 92, 95,107,173,209,243, 60,115,234,108,174,192,207,181, 87, 36, 51,251, 78,151,115,244, 37,139,
+121,219,153,248,128, 20,149, 67,165,226,190, 75,205,130,167,224, 15, 14, 69,115,170,166, 28,165,149, 56,179, 52,124,145, 27,208,
+ 15, 68,104, 13, 11, 27,184,180,204,180,148,167,181,  6,107,189,246,204,185, 32,242,225, 67,157,234, 49,122, 36,125, 77,130,165,
+ 69,146,233,248,171, 17, 48, 42,236,128, 30,203,164, 57,211,218,249,252, 26,153,139,231, 10,118, 41,  6, 10,  4, 85, 22, 90,138,
+ 97,114,120,162, 62, 63,215, 56, 57,194, 36, 87, 74, 55,  1,125,215, 98,141, 82,246,230,210,214, 94,103,119,163,125,117,226, 83,
+ 53, 26,231, 12,152, 53,210,222,182,178,176,218, 25,192,150,203,  4, 10,  2,143, 77,116,215, 33,146,135,186,175, 90,110,160, 15,
+194, 57, 21,110,174,231, 61,127,241,140,174,235, 65,156, 14, 61,  4,144, 50,185,161,193, 75,219,180, 12,165,172, 75,255, 75,201,
+ 17, 30,194,146, 45,206, 44,174, 46, 94,232,143,123, 24,245, 70,133,107, 35, 93, 97,226,137,150,159,113,105,233,178, 23,250, 97,
+228,113,101, 14, 29,  9, 65,223, 98,237,244,250,254,193, 47,202,114, 84,228, 52,138, 53, 55,112, 53,237, 94,169,183, 42,213,239,
+208,167, 74, 19, 77,246, 88, 80, 78, 12,227,192, 84,149, 19,125,230,116,185, 78, 59, 58, 29,254,168,234,  7, 75,152,211, 35, 51,
+139, 96,163, 73,229,  3,142,171, 80, 60,208,239,199, 43,211, 43, 11,231,  7,174, 67,103,226,122,161, 86,205, 87,198, 64, 47, 18,
+221,180,201,169,165, 68,225,141, 17, 45,131, 43, 49, 62, 64,127,192,186,115, 38,211,224,155, 54,157,144,242,234,153,235,138,231,
+ 99,211, 54,109,129, 16,207,162, 72, 92,169, 84,217,242, 49, 36,  0, 48,141,138,204,113,152, 27, 80,114, 79,195,208, 40,148,173,
+217, 38, 96, 65,216,155,201,112,212,  3, 52,132,254, 59,134,100,129,108,160,247,  4,119, 87,180,221, 45, 14, 69, 48,147,150,189,
+199,188, 49,146,117,177,196, 40,122,254, 87,181,202,178, 73,250, 95,205,158, 28,  1,170,130,201,  1,251,178,203, 62,125, 96,137,
+207,118,243,111,222,198,253,216,167,143,135, 70,163,234,202, 42, 39,141,108, 40,218,139,124,218,234, 18,173, 13, 13,194, 17,  4,
+218, 50,236,157,163,238,209,226,  4,  7, 46, 69, 87,114,111,235,238,187, 31,239, 91,115,109, 47,192,156,202,246,195,167,157,223,
+ 95, 95,237,189,244, 69, 56,114,157,238, 65,183,243,231,251,192,115,198,222,152,195, 73, 66,236, 15,187, 80,123, 77, 65,243,160,
+ 16,202,129,103, 85,161,156,112,227,214,157,251,219, 15,158, 60,122, 60, 63, 61,223, 25,252,162, 47,118,121,121,243, 39,196,227,
+ 98,165, 22,140,122,101,232, 13,  5, 26,173,117,122, 11,145, 66, 28,193, 63, 65,155,206,164,219,159,171,195,147, 64,104, 93, 48,
+ 35,235,179, 79, 85,142, 29,138,208,212,101, 50, 20,177,112, 18,133,248, 48,220, 25, 67, 11,124, 63,166, 33,  4,153,102,162,145,
+250, 44,165,188, 30,255,233,245,170, 81,205, 36, 86, 82,169,169, 20, 32,119,233,  6, 80,122,228, 93,124,  4, 68,102, 10, 25,218,
+244,151,103,196,229, 74,161,170, 70,131, 65,214,252, 43,  0, 83,215,178,219, 52, 16, 69,199,142,243,112,220, 36, 78,155,132, 10,
+ 20,154,  8, 40, 68, 80, 94,  2,169,  8, 85, 44,216,178,128, 47,224,  7, 16,159,193,146,143, 96,201, 31,176,130, 29, 11, 86, 32,
+212,128,250, 34,161, 80, 39,212, 14, 73, 28,199,227, 39,247,204, 36, 21,203,168, 81,237,204,204, 61,115,159,231,156,225,187, 38,
+ 56,169,139, 82,144, 79,202, 69, 46, 53,168,144,237,143,133,176,  8, 38, 56,196,181, 49,114,109, 66,128,101,135, 78,186,228,170,
+196,223,232,112,147,255,187,181,113, 27,138, 45,  1,191,222,186,217,168, 32,239, 65,255,240,196,249, 21,129,212,201, 79, 99,132,
+ 60,200,166, 21, 77,244, 75,144,191, 28,  4,139, 82,195,127,205,253,213,226, 26, 16,  7,182, 70,128,  9, 34, 98,138,173, 66,244,
+186,164, 82, 84, 83, 73, 51,167, 19,139,246,175, 42, 88,223,172,177, 69,118,110,174,212,180,  5,141,143,172,124, 35, 85, 23,166,
+177,224,234,139,  9,196,233, 72,153,134, 89,210,205, 25,159,148,114,101,151, 99,204, 65,215, 10, 15,174, 61,220,183,246, 30,223,
+122,252,237,184,235,161, 35, 48, 37, 95,190,108, 84,119,251, 95,251,118,175, 98,172, 74,185,237,186,185,238,248, 14,112,161,121,
+243,203,112,119, 16,143, 28,213,243,212,185,157, 76,156,208,157, 69,158,  6,131, 76,251,206,177,142, 68, 56,212,221,200, 68,141,
+188,209, 89,239, 88,174, 69,235, 77, 27, 64,111,194,147,112, 26,120,228, 27, 62,219,126, 26, 41,225,222,240,200,139,253, 74,217,
+212, 11, 70,247,176,187,115,111,231,124,251, 82,175,255,125,213, 76,115, 57, 22,170,126,172,136,110, 42,113, 67, 75, 25,177, 48,
+ 78,  2,158,  6,243,176,174,151,200,255,202,103,193,140,158, 73, 64, 61,230, 37, 17, 90, 44, 80, 18, 36,131,165,119, 32,155, 77,
+ 38, 54,249,240, 25,123,252,199, 11,102, 32, 73,207, 22,162, 40,214,224,237, 42,171, 37, 73,224,131,106,162, 84,  2, 67,130, 11,
+228,254, 10,173,204, 96,124,146,193, 88,178, 38,107,227,152, 79, 94, 12, 31, 97,159,200, 33,178,221, 33,238,161,194, 10,109,196,
+156,207,233, 52,211,158,110, 95,219,222,237,125,109,214, 91,195,177,133,241,136, 52,190,119,249,254,225,239, 61,114,150,201, 56,
+ 67,209, 83,220,168,172,227,164, 49,180, 21,210,121, 47,233, 21,122,208,130,181, 34,142,201, 26,101,212,  6, 70,120,114,168, 37,
+243, 53,240, 80,148, 80, 48,130,151,191,114,161, 19, 69,156,188,138, 87,207, 95,127, 63,238,142,103,227,195,147, 67, 46, 36,244,
+200,  2,  9,253,  9,194,124, 14,207,107,171,117,167, 63,236,129,  7,148,160, 92,201,108,109,220,232, 13, 15,194,132,188, 23, 10,
+ 55,125,244,195,229, 12, 10,161, 40, 46, 92, 74, 10,203,233, 17,108, 32,249,254, 20, 84,209,135, 38,164,199,102,160, 34, 16, 50,
+ 38,116, 91, 64,136, 71,216,129, 12, 98,  4,114,165, 47,158,188, 60, 26,244,131,  8,201, 46, 10,127,119, 58,143,236,137,131, 10,
+ 51,211,204,149,202, 79,187, 55,  3,169,150, 36,150,203, 72, 49, 19, 90,207,230,234, 69, 15,161,  0, 19,228, 60, 66,113, 78, 80,
+ 79,170, 82,195, 83, 81, 54,106,173,137,247,215, 26,253,158,131, 10,130,192, 29,139,145,215,178,211, 36,112, 15,236,206,102,157,
+213, 13,128,199,156,179,209, 20,248,206,121,202,  3, 70,209, 97,121, 13,191, 11,232,238,113,161, 49, 11, 26, 87, 85,149,248,158,
+ 67, 39,141,134, 36,123, 86, 93,230,220, 85,164,101,226,128,185, 35,230, 58,232,129,161,179,156,203, 47,115, 50,103,229, 83,137,
+242, 18,238,125,150,158, 50,107,159,237,118,217,192, 66, 79,181,171, 57,239,245, 15,142, 83, 16,247,161,228, 77, 23,122,227,242,
+186,194, 80,190, 32, 27, 20,247,151, 96,167,151, 36,175, 20, 72,121,156, 23, 11, 69, 90,106,161,192,  7, 91,166,203,184,219,255,
+ 70, 95, 32,220, 16,213,157,233,219,119,111,126, 88, 63,138,144, 77, 86, 55,207,111,250, 33,215,115,122,171,209,154,204, 39, 87,
+ 47,108,210,158,174, 25, 53, 55,112,  3, 48, 41,113,134,113, 51,125,236,253,  5,203,150, 51, 42,233,213,207, 31, 63, 29,159,246,
+232,153,181,149,198,209,240,136,238,149,214,185,118,187,214,134,186,158,162, 84,141,170,235,187,145,228, 53, 89,182,188,208,203,
+221,110,223,245,230,179, 63,211,  1,216,144,132, 23,126,166,151,158,205,228,208,197,151,  8,234, 84, 53, 83, 46,152,145,152, 87,
+ 16, 41,151,226,197,198,198,216,  3, 95, 44, 29,145, 78,243, 58, 91,248,175, 41, 61,200, 23,170,118, 98,180, 68, 50, 38, 74,255,
+ 95,162,175, 44, 34,178,  5,101, 42, 19,170,125,169,148,197,198,167,122,169,  6,217,128, 37,133, 60,166,148,242, 40, 92,  7, 98,
+230,238,159,  0, 60,157, 75,111, 19, 87, 20,199,103, 60,239, 71,198, 30,227,  7,110, 18, 39,128, 65, 20, 34, 37,148,116, 19, 88,
+130,170, 86,106,171,170,234,130, 29,253, 10,221,245,171,176,130,101,165,130, 96,209, 34, 81, 16,  2,177,104, 69,120,  8, 80, 69,
+ 73, 28,112,163, 60, 93, 39,182, 51,227,216,241, 60,250, 63,231, 58,236, 28, 47,162,235,185,231,158,123,254,103,206,249, 29,217,
+162,151,135,120,128, 26, 66, 90, 91,115,  6, 84, 73, 71,231,205, 53,179, 33, 53,109,142,  6, 99,107,170, 81, 45,212,194, 65,135,
+251,245,163, 84,116, 84,141, 48,248, 12,  1,161,112, 88, 22,163, 70,104, 58,109, 76,129, 55,182,171,224,149,186,189, 29,108,228,
+152,233,195,106,123, 81, 48, 83,253,236,245,251,103, 98,236, 49,119,189, 66, 53, 59,125, 66,220,100,  4,121, 88, 30,129,  4, 18,
+ 73, 52,173,112,108,105,105,212, 17,238,152, 14,174,116, 28, 15,230, 76,167,142,238, 20,189, 34,130, 65, 71,119,195, 40, 60, 55,
+253,249,202,198, 50,190,129, 39, 90,218,124,199,247, 39,201, 37,209,125,195,213, 65,112,217,148,195,161,192,115, 24,194,  2,248,
+248,170,188,236, 49,216, 13,142, 43, 97,  5, 15,246, 63,173,158,181, 13,247,213,135,151,112,199,182,110,239,113, 60,149, 50,240,
+ 27,255,164,156,157,152,240,199, 91,102,239,225,210, 99,132,164,236,113,196,168,193, 68, 26,129,249, 40, 87, 78,229,166,120,150,
+100,  7,166,157,209,232, 13,228, 96, 96,100,212, 83,133, 99, 88,252, 48,141,190,153,253,170,209, 94,131,131,104,236,254, 59, 95,
+ 59,191,112,126,225,210, 79, 95,136,125,250,237,218,239, 91,141,205, 95,239,223, 56, 94, 58,232, 71,233,171, 70,179,221,235,  7,
+196,159, 20, 88, 99, 98,  9, 80,101, 65,130, 83,188,127,113,186,226,218,  6,252,192,224,128,114,  2, 89,215, 90,233,247,135,240,
+221, 52,139,149, 18,238,176, 58, 91, 77,245,112, 98,181,251, 65,162,156, 27,109,224, 84,241,196,242,250, 91, 17, 62,120,166,143,
+131,241,186,241, 82, 76,145, 80, 84,173,224, 29,221, 13,182,227, 56,134,226,201,185,121, 60,115,238,250, 73, 16,236,127,191,240,
+195,157,191,110,193, 90,  8,129,203,169,252,172,235,143,251,213, 55,171, 47, 20,230, 95,169,178,106, 26,118, 39,220, 25, 63, 50,
+ 85,246, 75, 47,234,139,144,253,147,165,169,247,219,117, 40, 24, 67, 55,243, 94,233,136,235, 47,214,159,154,154, 42,146, 64,204,
+125,136,107,149,211,203, 27,239, 68, 80,131,231, 15, 61, 78,156,150,168,255,221,194,149, 95, 30, 93,255,114,254,219,199,111,238,
+ 67, 11, 66, 47, 35, 38, 50, 84,139, 33, 55,137,201, 45,205,154,162,205, 29,155,135,189,204, 30,159,123,240,252,143,153,233,153,
+ 39,127, 63,161, 25,  4,114, 92,242,202, 59, 65, 11,158,221,210, 92,  8, 23,143,109, 27, 34,  6,113, 55, 81,  0, 83, 41, 24,116,
+ 25,101,200, 32, 30,106, 52, 75, 56,241, 74, 78,150,144,209,105,130,123,162,195,220, 18,193, 16, 46,103,203, 59,189, 93,110, 95,
+138, 24, 38,162,216,170,141, 75,  7,254, 10,203,110,182,215, 60, 43,  7, 23,156,163,  4, 78,140, 24, 92,101, 68, 88,214, 34,230,
+ 90, 37,119,180,217,105, 86, 11,213, 70,179,161, 42, 74,216, 15, 89,181, 19,146, 26,235, 12, 15,246,230,170,179,237,253, 46, 46,
+170,173,238, 86, 68, 16,102, 21,235,108,117, 91, 88, 29,249, 99,130, 33,227,118,145,117, 77, 54, 53,  2,231,187,164,225, 51, 23,
+207,126, 93,108,254,121,225,231,203, 82,209,150, 58,129,180,217,148,154,109,169,189, 23,117,131,216, 28, 51, 38,207, 48,130, 76,
+ 14, 86,255,  9,215, 87, 20, 30,176,164,144, 15,207,104, 42,209,255,153,225,174, 81,252,174,107,236,226,249, 27,214, 75,148,243,
+193,159,150, 35,229,125,169,144,151,252, 28,125,206,152,135,253, 77,145,148, 12,164,160, 35,253,215,146, 90,109,170,219,137, 34,
+ 49,  6, 34,189,109,222,124,219, 29,168, 84, 48, 30,143,122, 14, 35, 62, 36, 68,227,130,233,100,237, 44,126,250,122,155,180,245,
+144, 47, 72,156, 85,  4,236, 80, 91,147,133,234, 90,107, 21,134,234, 88, 14,158, 14, 14,241,144,166,115,  4,124,159,196,135, 44,
+ 23,229,199,203, 87,239, 46,222,243,189, 60,108,169, 86, 57, 89,223,168,115, 10, 33,214, 13, 27, 59,137,219, 58,102, 56,  4, 51,
+191, 41,249,227,218, 57,236, 17,165, 34,137,110, 27,143,185, 16,238,219,148,113,224, 90,118,  1, 77,194,115,134,128, 44,185,149,
+221,126,135, 85,169,120,199, 68,102, 42, 32,217,212,188, 70,116, 13,234, 72, 34,116,  4,119,135,192,132,161, 21,100,106,150,236,
+101,228,195,204,124,146,212, 62, 57, 93,223, 92,250,248,230,148,230,235,240, 76,190,136,210, 56, 50, 73,  5,146, 45,  9,207, 23,
+ 74,120,128,205, 71,207, 74,225,186,161, 25, 41, 15,255,163,218,141, 52,130,251,210, 51, 52,209, 19,209, 24, 23,181,139, 13, 16,
+236, 37, 46, 33, 22, 85, 72,135,213, 37,255, 11,192,212,213,244,184, 77, 69,209,103, 59,246, 36,153,201,212, 33,205, 71,167,153,
+164,204,128, 40,168, 85,169, 64,  8,117,195,  2,118,195,  6,177,227, 47,244,247, 33, 33, 36, 42,181, 11, 86,136,138, 25,209,170,
+ 64, 71,233,196,249,152,196,137,237,216,241,119,108,238,185,246, 32,164, 89, 69,147,143,247,252,238,123,231,220,119,239, 57, 37,
+126,103, 65, 96,  8,226, 16, 44, 69,164,229,187,  0,114, 78, 41,243, 83, 28, 81,113,150,174,220,  5,209,198,154, 86,231, 75,134,
+255,169,221, 43, 80, 77,170,105, 85,244,136,203, 18,139,247,202,250,126,243,193,224,209,204,154,246,154, 71,116, 54,192,235, 50,
+ 13,182,128,141,217,210,154,113, 77,105,217,206, 82, 74, 26,243,  9,254, 95,225, 17, 13,179,177,167,211,244,168, 56,171, 35, 34,
+ 23,240,237,147, 33, 26, 12, 55, 40,214, 84, 61,172,235,222,214,233,183,135,174,111,179, 40,121,190,176,175,  9,137, 83,220,122,
+ 80,134, 43,149, 67,110, 55,218,159,158,124,230, 71, 65,  2, 43,122,176,230,156,181, 88, 59,183, 58,143, 79,191,184,188,254,155,
+109, 84,113,117, 70,145, 79,171,136,130,133, 16, 52,253,152, 32, 13, 97,184, 44,164, 66, 18,153,  8,117,  6,229,122, 57,147,133,
+159, 56,163,252,210,136,141,195,122,125,191,166,113,182, 87, 66, 64,128,104,179, 82,170,164, 49,182,162,205,182,146,171,  8,155,
+ 88, 74,253, 93, 16,229,137, 31,123, 99,219, 24, 91,147,201,122,246,236,237,175, 23,243,191, 46,215, 35, 58, 86,175,108, 99, 19,
+ 58,211,115,227,213,139,139, 61, 26,247, 70,125, 53,250,243,157,105,168,185,252, 97,183, 58,117, 29, 90, 93, 72, 78, 43,108, 43,
+195, 22, 16, 69, 21, 57,141,113,208,168,247,106, 53,194,247, 90, 42,212, 68,168, 66,178,195,212, 10, 98,215,143,161,190, 70, 99,
+ 11,147,131, 92,185,246, 54,  5,240,103,172,180,179,182,144,173,191,163,247,189,192,161,127, 89,184,179, 61,220, 92,193,249,152,
+ 27,181,209,105,  8,112,187,139,109,111, 77,135, 19, 29,195,244,  8, 30, 14, 30,255,114,241, 83,251,160, 87,170,  2, 64,  4,  8,
+193,  1, 87,235,186,222,109, 30,177,138,  0, 60,233,  9, 82, 77,214,198,124, 61,197,220,200, 50,109,247,253,247,  6, 59, 68,215,
+214,114,161,206,184,141, 61, 34,196, 21,  5,250,116,135,181, 38,189, 98,251,107, 90,  7,144,112, 64,121,  0,151, 30,101,216, 31,
+167,171,241, 38,116, 31,222,123, 68,208,149,102,181,173,119,233,176, 35,166, 72,172,232,251, 39, 63, 92, 45, 71, 26,167, 71, 76,
+103, 49, 94, 92,105, 10,220,124, 76,103,229,250,155,167,103, 79,159,159, 63,223,209, 25,139,190, 77,233,180,119,186,176,167,159,
+ 12, 31,124,253,213, 55,231,175,255,160,128, 31,180,135,244, 35,  5,124,113,111, 21, 34, 72, 21,150, 71, 61,233,190, 79,177,173,
+239,183,194, 40, 56,251,252, 91,  5,149,175,209,237,131, 22,122,226,178,132,182,233,187,205,187, 14,154,158,144,240,230, 70,149,
+ 44,  8,225, 90, 75,188,  4,190,238, 82,222,168, 54,130, 36, 58,110, 29,187, 69,149,167,  2,169,165,186, 86, 13,112,107,236,219,
+129, 77,179,125,175, 59, 92,185,166,194, 68, 93,149, 42,  1, 63,174,153, 53,159, 90, 19,141, 89, 32,110,116,226,144, 86, 53,116,
+ 14, 34,175,213,104, 39, 80, 98, 40, 53,240, 21,110, 81,170,105, 13, 57,139,204,205,200, 76,162, 59,111,220,230,147, 33, 66,222,
+218,138,141, 79,248, 61,193,251,125,133,224, 81, 69,141, 87, 11,111,254, 15,235,136,112,141, 29, 59, 83, 87,152,237, 34,201, 94,
+  8,184,107,252, 87,145,203, 93,158,  8, 32, 54,122,138,207, 68,108,183,194,178,132,185,  4, 60, 95, 78,196,114, 42, 22,134,152,
+ 27, 98,252, 78,204,230,194,113, 69, 28,149,226, 99,180,165,254,172,253,120,238,171,245,202,233, 65,107, 95, 81,117,181,122,255,
+232,254,218, 91,167,220,181, 72,203,111,208,238,211, 72, 55,220, 64,119,227,192, 11,112, 79,179,247,221,151,103,191,189,125,153,
+224,166,154,232, 71, 68,224,215,130,182,123, 84,118, 73,103,226,227,227,143,174,157, 37,  5,230,239,151, 47,151,206,156,160, 61,
+ 19,118, 20,137, 16, 48,133,186,134,148,133, 73,216,209, 59, 65,232, 19, 42, 95, 57,230, 73,239,131, 32,242,135,157,161,233,152,
+196, 12,104, 74,233, 59, 41, 62,232,195, 83,110,107, 96,253, 15, 98,189,176, 17,245,  2,207,165,160,136, 35,113,179,117,102,133,
+241, 25, 87,194,208,131,195,214, 92,216, 33,112,211, 67,113, 67, 72,104,174,232,242,  3, 45,131,127, 41, 96,183,227, 91,112,194,
+ 80,112,135,205,121, 71,228,195,120,218,213,170, 90, 69,182,131,240, 95, 33,  8,157,223,248,237,150, 21,134, 50,147, 30, 92, 63,
+104, 80,203,  0, 78, 61,210,251,166,187,164,213,174,105,181, 24,141,123, 82,129, 57, 74,217,225,155,236,123,145, 41,162,151,254,
+ 21,128,166,107,105,109, 34,140,162, 51,201, 36, 51,211, 36, 77,154,118,218,248,108,173, 15,180,104, 69, 91,177,226, 99, 41, 46,
+116, 39,250, 35,  4,127,138, 11,255,128,  8,110, 21,164, 96,165, 32,  8,238, 84,170,161, 22,164,104,219,160,105, 76,147,166,147,
+ 76,230,149,121,196,115,239, 55,133,108,  2, 97,194,204,220,239, 62,207, 61,231, 16, 63, 51, 20,154,244,116, 57, 86, 33,241,167,
+ 10, 83,243,211, 11,141, 78, 93, 18,240,157, 84,162, 55,235,132,118, 66,114,149,112,218, 80,249,130,152,151,145,179,131,216,231,
+178,143,171,192,192,107,152,117, 49,  5, 51,157,  3,219,181,224,  2, 10,185, 81,152, 63, 15,149,137,101,200,200, 79,102, 51, 58,
+ 23,164,177,104,237,139, 22, 13,107,173, 17,204, 28,199,224,222,213,  7, 91,136,126,220,251,131, 41,227, 62, 81, 26, 15, 73,155,
+ 23,185,191,127,238,232,249,237,230, 47,234,130,165, 68, 87, 86,208, 51, 17,239, 54, 51,  1,145,182,  7,222,125,163,179,107,123,
+ 61, 65, 74, 79, 42, 84, 25, 45,140,131,166,217,104,154, 36, 10, 35, 90, 30,101,226,  1,118,203, 57,195,246,186,126,224,186,136,
+ 70,126, 63,228,  5,105, 18,183,136,  2, 47,246, 34, 65, 64, 76,103, 67,238,107, 72,193,153,145, 91, 44,179,241,156, 32, 37,224,
+221, 98, 89, 68, 12, 85, 73, 33,136, 22,211, 24,248,163,208,158, 16,185,123, 85,210, 53,  2, 39,100,210,248,137, 29, 57, 45,255,
+160,110, 53,190,236, 84,151,215,222, 47,175,173,188, 88,126,181, 90, 93,169,238, 84,221,192,166,185,234,208,175,119,109,153,121,
+201,149, 12, 14,  0, 79,188,224, 17, 20, 22, 47,143,165,172,148,186,124,220,152, 49,138,198, 56,146, 57,132,119,101, 92, 69,120,
+196,213,195, 81,152,217,128,182,160,251,148,218,171, 17,179,163,201,  9,204, 10,150,170,105,140,153, 65, 77, 35,150,155, 69,254,
+ 48,109,204,118, 93, 51, 12,105,105,  8, 14, 29,174,191, 82, 60,218,182,219,136,163,251,118,139, 17, 32,169,177,252,152, 77,100,
+238,114,  2,140, 35,172,125, 88,208,242,168,117,240,  0,241,132,247,186, 77,154,189, 39, 96, 39,106, 29, 58,  3,135,101, 84,201,
+138,113,218,107,173,157, 27,115,119, 92,226,242,116, 30,222,122,248,109,235,171,150,201,113,202, 76,  3, 27, 94,196, 71,113, 41,
+149, 10,227,168,169,251,142,181, 81, 91,135, 67,199,219,239,225,204,200, 41, 93,161, 18,161,214,220, 30, 68,  4, 55, 60, 82, 62,
+254,228,254,211,133,187,139,223, 63,127, 27, 32, 37, 11,  3, 56,220, 43,247, 23,119,127,238,250,129, 83, 44,136, 93, 24, 19,247,
+127,106,114,246,237,199,215,120, 33,211, 83,167, 17,186,240,162,175,157,185,190,111,181, 88, 81, 54,167,165, 85, 56, 69, 68,154,
+152, 87,252, 96,141,176,147, 22,139, 85,145, 31,225, 94, 73, 73, 31,179,252,174, 60,148,133,204, 89,165, 84,185,120, 98, 30, 57,
+ 77,207,233,233, 89,149, 13,130, 50,246,124, 86,223,235,238,205, 24, 51,180,252, 18, 71,165, 92,137,198,245,172,159, 68, 91,123,
+  3,183,109,237,243,102,214, 72,138,165,133,184,142,212,111, 93,184,217, 56,104,  8, 56, 32,167,180, 33,254,  8,105,  1,207, 27,
+105,163,155, 61, 59,163,237, 68, 51, 51, 26,168,170, 62,158, 55,252,216,219,177,220,165, 80,145,230, 38,164,142, 37, 89,125,201,
+ 35,114,132,129,231,186,102,203,105, 55,156, 78,157,132,100,101, 49,225, 59, 84,185,165,203, 49,  2, 82, 97,255, 78, 31,150,236,
+ 32, 47,159, 73, 40,127, 25,158,201,247,196,244, 96,168,  8,225,251, 60, 79,242,124, 26,225,134,188,137, 60,100,118,219, 52,175,
+ 90,124, 42,200,157,139, 81,177,240,242,251,187,231,235, 31,158, 85, 87,223,212, 54,126, 52,127,159, 31,173,148,212,156, 31,163,
+ 12,141,123,196, 97, 23,242,130,201,144,229, 32,135,149,177, 35, 48, 30,220,245, 63,115,207,236,155,115, 39, 47, 33, 23,166,105,
+ 42,171,119, 33, 77, 36, 87,200,231, 17,207,170, 60, 82, 70,106,225,121,222,163,219,143,255,182,255, 34,150,195,138,150,206, 46,
+ 77,149, 39,107,173, 63, 68, 56, 31,  6,142,107, 31, 51, 78,108,238,110, 26,197,137,166, 73, 29,149,190,215,135,189,  9, 46, 70,
+137, 69,107, 16,248,137,254,129, 58,  9,145,158,209,225,184,124,230, 14, 58,148,104, 58,108, 22, 15, 99, 33, 82, 67,252,184, 52,
+233, 33,212,123, 94,207,199,188,240,204,100, 62,220, 76,147,146,102,  6, 61, 45, 26, 62, 34, 33, 76, 43,236,208,185, 35,173, 40,
+ 12,166, 17, 95, 99, 22, 63, 72, 11, 92, 11,199,  8,118,168,220,140,225,138,118, 68,213,  4,208,142,217, 75,104,182,218,115,123,
+  8,142, 65,228,251,  9,130, 89, 64,121, 18,191,142, 99,  5, 51, 64,218, 36,167, 24,240, 45, 73,255,  5,224,233, 90,122,155, 56,
+163,232,216,158,241,216,158,241,196,153, 56, 33,137,157, 16, 90, 19,160, 13,176,  0,132,232,162, 66, 60,182,221,180,172,216,132,
+ 95,195, 63,232, 63,232,174,170,212,110,250, 11, 42, 84,181,138,170,166, 45, 45, 68,136, 56,193, 78,140,237,121, 63, 60, 15, 79,
+239,185,159, 65,242, 42,118,252,152,185,247,126,247,113,238, 57,  2, 63, 83, 18,221, 31,  1, 22,196,201,  6, 78,134,217,196, 31,
+199, 32,218,198,135, 53,107, 38,121, 17,133,168, 43,155,215,239,124,122,231,232,236, 21, 35,202, 81, 13,176,144, 20,150,205,152,
+ 37,  6,228,192, 60, 69,145,214, 91, 27,172,223, 20, 48, 39, 18,194,110,194, 90, 25,130,201,184,  0,248,172,225,197,174, 12,154,
+124,108, 60,102,172,143, 65,255,158,164, 81,141, 15, 85, 50,103, 83,107,159, 78,223, 86,152, 77, 47, 95,136, 69,167,162,248,  1,
+  3, 39,221,194, 36,150, 69, 41,130, 56,139, 26, 75,171,214,129,127, 23,244, 89, 69,209,168,235,244,  3, 82, 60, 83,232,117,131,
+254,138,205, 64,216,179, 76,181, 48,163,149,208, 73,156,  1, 87, 71,245, 65,148,241, 84, 85,200, 22,113, 27, 22,215,182, 99,110,
+ 47,105, 45,111,102,241, 14, 98, 41,149, 11, 44,242,207, 43, 60,135,164, 66,143, 66, 27, 14, 57,138,197, 69, 38, 24,240, 11,112,
+  2,242, 50,164,216, 73,102, 53,171, 50, 20, 78,113,131, 75,139, 25, 11, 76, 70, 56, 26,106, 96,200, 54,228,202,124, 94, 78, 18,
+201,137,  2, 43,112,135,174,253,198, 27,255,113, 54, 26,120,129,157,164,214,108,230, 36, 89,144, 80,110, 66, 15,212,161,244, 74,
+105, 94,178,194,196,141, 18, 89,109,254,126, 18,252, 59,117,250,190,127, 26, 68,227, 40,238, 24,215,  6, 33,228,205,190,220,125,
+ 92, 41,169,163,112,168,148, 27,  2,233,  4,226, 72,230,113,153,165,  1,160, 15,  5,250,  0,228, 72, 45,125,  5,  0,134,104,202,
+107, 32, 90,154,101,103, 14,197, 26,208,165,237,174, 95, 69,224,150,242,166,218,140,128,193, 80, 68,233,195, 43, 24,232,173,113,
+219, 52,164,123,122,115,231,214,237,222,221,151,253,191,180,154,129,142,126, 89, 38,231, 73,160,165, 89,165, 24,196, 72, 13,245,
+205,249, 43, 74,246,255, 57,249,147,210,121, 74,147,127, 59,250,149, 46,202,170,177,246,244,193, 62,121, 67,111,125, 23, 80,153,
+216, 70,192,173,214,221,192,222,255,106,191,127,118, 76,231, 49,112, 35, 21,149, 30, 84,111,117,151,187,183,119,239,158, 79,207,
+201,250, 41, 64,191,248,251, 23,171, 63, 81,100,217,108,174,216,129,253,224,254,163, 31,190,251, 94,215,140, 94,247,242,149,205,
+158,229, 78,182,219,151,156,216, 29, 76,250,244,195,191,249,226,201,200, 30,141,236, 33,200, 74, 47,221,216,219,217,123,249,238,
+ 63, 63,241, 98,102,224,168, 42, 13, 58, 57,201, 72,234, 74, 13, 86,145,102,221,149, 29,200,129,224,124,194,200, 33,231, 75, 72,
+118, 68,233,130, 31,  5, 39,227, 99,203, 27, 49, 15,107, 34, 45,218,178,128,207, 82,100,129, 97, 20, 25, 89,120,219,104,147, 85,
+ 95,223,222, 35, 51,126,124,227, 81, 19,214,136,186,231,217,195,103,135,199,135,189,181, 79, 58,230,198,216,165, 43, 95,120,161,
+  3, 86,109,156, 58,  0,150, 92,104, 93,224,232, 90,  1, 41,119,158,177, 16, 80,177,212, 88,166,  8,181, 97, 94,140, 82,159,220,
+ 83,  6,167, 80,148,150, 11,121, 16,108,221,219,146,252,128,241,145, 49, 69,119, 16, 74,131,249, 45, 97,209, 96, 56, 74, 89,208,
+117,  2,196, 87, 18,237,255,  5,240, 70,254, 48, 98,165,228, 93,253,128,127,  7, 62,178,224, 23,112, 75, 70,144, 71,148, 62,178,
+145, 47,180,160, 36, 78, 52,144,190, 28,172,246, 15,170,223, 30,254,252,245,143,207, 15,222,191,117,194,160,173,212,223, 71,211,
+ 35,251,244,167,225,145, 81,211,123,122,155,156, 43,230,222,172,104,184, 11, 98, 87, 39,244,216,239,178, 48,  1,160,206,242,167,
+221,213,206,196,181,162, 44,105,105,  6,229, 19, 19,127, 42, 82, 77, 55,244,234, 42,244, 36, 40,252,189, 30,188,110,168,148, 38,
+ 98,228, 67,129,155, 14, 99, 84,255,181,230,214,218, 14,235,169,249, 87, 55,175,209, 59, 80,149, 95,  2, 57, 74, 42,132,124,233,
+219, 66,129, 16,220,136,106, 50,207, 63,219,250,252,220, 25,146,249, 97,178,205,125,  5, 12,156, 84, 53,229, 19, 93,136,211,  1,
+ 69, 51,135, 44,112,206,203,133,204,198,145,115,159,153,174, 78,153,190,  3,232, 20, 43, 85, 83, 51, 77,125, 57,197,122, 32,111,
+236,193,223, 25,242,135, 70, 23,116, 44, 77,221, 36, 51, 88,105,182, 11,105,177,158, 45, 48,150, 60,188, 41,184,216,149,116, 85,
+107, 84,193,201,223, 89,222,160, 55,160,106,175,194, 21, 27,221, 49, 69, 86,140,250, 18,157, 67,237,165,117, 32, 38,139, 20, 76,
+109, 10,160,147,170,162,198,121,196, 77,233,185,152,192,254, 47,  0, 83,215,210,219, 70, 21, 70, 61,190,243,178,199,158,241,216,
+142,221,202, 78,164,244, 33,  4,162, 17, 18, 66, 98,131,144, 88,160, 74,221, 87, 69, 32,254,  0,123, 36,216,243, 15,248, 35, 93,
+178, 97,213, 22, 84, 21, 36,132, 68,211, 54,129,138, 36, 56,193,121,212, 30,207,203,246,120, 56,231,187,182,196, 38, 74, 22,118,
+238,220,123,231,123,158,239,156, 13, 63,129,134,232,203,162,215, 45, 93,114, 45,173,  7, 94,105,  5,150,169, 80,134,172,198,209,
+ 40, 74,163, 89, 30, 49, 38, 93, 33, 68,116, 96,139,231,203, 84, 18,127,214,131,234, 72,201, 76, 19,183,  9, 81,225, 28, 78,198,
+ 32, 31,190, 33, 21, 55, 24, 56, 14,182, 16,153,179,104,208, 70,164,217, 34,134,129, 43,164,196,121, 61, 28,104, 82, 33,220,236,
+154,237,193,205,250, 53,255,228,242,104,185,225, 44,196,227,147, 47,123,145,234, 78, 46, 12,174,212,127,139,190,223, 67, 94,198,
+153, 85,101,237,110,237,226,129,211, 60,198, 81, 69,217,236,102,255, 86, 88,111,227,200,241,136,173,122,123,146, 82,127,202,169,
+ 58, 37, 41, 18, 11,233, 71, 87,  6, 33,167, 22, 69, 93,155,133, 41, 67,199,183,155,145,100,114, 39, 32,147,178,221,227,203, 35,
+102, 93,236,242, 26,158,175,130,142, 21,192,147,216,166,235, 42,215,169, 34,100,113,109, 50,173,215, 93,214,106, 76,  1, 43, 43,
+ 89,182, 33,223, 39,108, 95,171,181,102,174, 81,173,104,  1,239, 66,131,150,244,132, 28,151,163, 56,117,169,228,255, 40, 25, 97,
+ 49, 29,201,  0, 44,153, 89, 84,146, 29,137, 22, 39,242, 88, 90,214,194,160,194, 55,222,224,211, 56,121,125,254, 38, 80,161,109,
+176,123,232, 33,133, 52, 42,121,153, 99,117,201, 34,241,157,214,225,248, 16,126,  1,113, 74,199,235, 46,240,190,175,228, 26,200,
+177, 23,162, 21,254,206,240,206,104,138,248,174,236, 54,187, 56,110, 92, 47,132,219,165,248, 82,  4, 44,159,125,244,229,225,217,
+193,121,116, 94, 10, 97, 22, 22,  3, 39,129, 27,130,157, 89, 17,162, 78,164, 10,177, 67,228, 49, 91, 96, 63, 71, 23, 71,108, 33,
+138,178,138,239,  5, 97,179,189,229,247,135,221, 29,134,249,136,153,150,153, 99, 53, 62,184,253, 97,146,167,221,102,199,117,106,
+249, 60, 35,  8, 58,159,253,188,255,232,120,252, 55, 18,249,211,171, 19,188, 17,132, 88,  8,119,208,179,253,167,185,200, 38,136,
+ 78, 72, 33, 26,191, 78,203,235, 30,141,255,196, 23,238,246,110,222,255,228, 65,224,  6,241, 60,190, 18, 66, 71, 71, 33,143, 81,
+211,136, 80,232, 89, 54,113, 76,239,213, 63, 47,191,253,226,155,199,191, 61, 66, 76,215,246,194,231,199,127, 32,148,126,251,214,
+187,219,253,157,159,158, 63, 57, 24, 29, 16, 78,163,212,150,127,157, 29, 84,206, 63,151,158,213,192,139,  4,247,147, 44,103,118,
+149,234,207,154, 32, 15,166, 36,168, 17, 73,165,116,230,168,240,248, 10,145,126, 63, 28, 96, 71,175,181,122,113,154, 12, 89,153,
+ 97, 63, 77,102, 71,201,147, 58,  8,135,  4,120, 76,199,105,158,189, 26,189,196, 78,102,162,199,123, 49,189,140,179, 24,167, 59,
+ 73, 38,189,160, 63,141, 39,130,248,174, 96,183,113,135,119, 58, 59,103, 36, 46,230, 36,242,160,189, 13,163,214,172, 53,  9,243,
+ 23,110,212,148,115,176,184,  4, 89, 81,100, 28, 67, 53, 85,156, 45,223,223, 27, 84,204, 37, 66,248, 50, 73,231,243,249,130,236,
+163,235, 46,148,  8,139,110, 84,163, 42, 26,203,137, 11,199, 11,170,225,218,180,230,218,166, 59,166,200,239, 73,185, 70,233,126,
+118,245,127,144,188, 53,209,157,252,100,241,184, 82,195,103,189,202, 15,245, 23, 79, 23,223,239,255,248,221,175, 15,123, 86,243,
+235,247,238,125,181,247,233,231,111,125,124,119,112,199, 42,141,223, 47, 14,126, 57,123, 81, 84,173,189,214,144,134,202,180, 83,
+153, 54,151,220,154,182,254,198,181, 27,112,150,  5,153, 48, 12, 56,102,108, 35,193,211,244, 33,  6,172, 63,178, 73, 91,145,122,
+ 90, 98, 91, 79,171,226, 52,220,122,195,246, 16,191,139, 40, 51, 29,107,186,204,227, 60, 26, 79,254,197, 95,189,102,239,245,248,
+ 47,216, 25,172,212,175,251,112,  0,194, 42, 19,203,200, 27,222, 76,194,183,224, 83,206, 38,167,212, 22,144, 26,181,  6,149,195,
+ 82,135,245, 80, 26,111,124,106,252,142, 75,  5, 91,199,121,117, 45,206, 40,179, 75,210, 30,103,110, 65,177,250,170, 42,228, 92,
+210,156,195, 89, 65, 45,244,220, 26, 34, 27,147,233,123,169,132, 92,203, 98, 50,111, 33,201,110,251,157,105, 26, 41,246, 24,109,
+ 61,145,180, 65, 72, 50,143,134,225,222,238,110,159,190, 57,185, 66,152,151,167,150,196,138, 98, 59,120,140, 48,140, 48,158, 73,
+ 30,233,  2,166,140,255,173,241,145,107,193,144, 13,255,251,127,  2, 16,117, 53, 61, 77, 68, 81,116, 62,219,206,180,140, 37,165,
+218,150,146, 24, 40, 16, 98,130,209, 24, 21,149,132,196,141,191,192,184, 82,255,136, 49,174, 92,250, 15,252, 15,174, 77,136, 27,
+ 93, 17,136, 11, 53, 46, 76, 27, 69, 74, 11,195, 48,157,215,233,124,116, 90,207,189,175,224,174, 33,105,153,121,239,221,251,206,
+253, 58,231,114,190,105, 10,120,194,170, 14,212,156, 68,131, 24, 36,143,153, 93,246,236, 92,168, 93,210,197, 15,140,102,106, 57,
+ 41, 51, 45, 21,151,112, 88,150,107,173,179,224,180, 49,223,244, 70, 94,154, 81, 35,129, 84,134,149,137,164, 87,111, 94,127,218,
+221,213,216,  6, 82, 70,185, 52,211, 63, 87,209, 73,179,141,164,215, 96, 78, 88,235,152,136, 55,105,229, 88,111,126,204,221,141,
+212,165, 83, 44,204,225,121,  0,153, 72, 74,141,111, 61,188, 97, 16,  6, 50, 44,172,207, 55, 27,149, 69, 79,224,110, 24,123,194,
+163,236,155,166,195,185,172, 47,110,136,145, 96, 58, 23, 29, 91, 78,204,104, 83, 57,  6,165,243,113,159,200,  0,  7,255, 11, 62,
+  8, 81, 15,208, 61, 73, 67,112,181,101,194, 99, 86, 28,208,208, 62, 13, 83,161, 72,177, 77, 38, 49,172,212, 45, 45,167,208,118,
+  1,154,170,179, 63,195, 89,198,209,148,206,227, 40,141,146,177,212, 66, 35,228,198, 58, 23, 83,201,134, 55, 37,183,129, 47,218,
+ 57,195,182, 12,203, 54,231,  0, 80,225, 48,242, 70,193, 50,109, 64, 65,155, 46, 12,170,126, 25, 92,169, 52,153,253,137, 30, 88,
+ 77,199, 42, 98,107,220,149, 88,221,  4, 49, 76,  6,243,214, 50,153,246,209,140,169,166,227,252,117,131,254,145,240,142,130,224,
+104,224,159,248,131, 40,142,206, 35, 63,153,164,199,131,110,166, 36, 68,200,172,169, 49, 98, 21,156,104,117,210, 40, 47,225,189,
+108, 82,191, 90,184,179,122,239,107,103,159, 11,255,164,134,138,120, 63, 97,246,161,187, 43,247,123,126, 15, 39, 23,112, 24,119,
+109, 49, 95,122,190,243,242,160,189,111,210,  4,165,193,220, 94, 57,233, 59,  0,151,240,174,240,197, 68, 79, 62,201, 96,132,243,
+  4,231,135, 37,219,  1,236,245,134,126,223, 63, 22, 17, 15,253,242,114, 96,127, 59,189, 95,148,208,212, 13,108,147, 74,142, 59,
+171,149, 27, 92,197,209, 30,223,124,242,187,223,222, 92,190,221, 63, 63,198,217,175, 58,213, 40, 14,175,215, 90, 99, 30,121, 43,
+ 21, 28,128,250, 56,  9,253,209,160, 85,111,133, 81,228, 11,183,108,149,241, 90, 84, 51,103, 17,  6, 88,166, 99,148,134, 52,  6,
+ 57, 61, 23,238,153,112,241,225,224,231,158, 59,112,225,214,235,149,198, 41, 83,230,254,237,118, 14,123,135, 55,150, 54,113, 31,
+224,201,195, 40, 12, 83, 34, 93,152,168,212, 44,159,208, 36, 92,138,253,193, 47, 91,185, 60, 37,178,185,213, 25, 78,185, 64,  5,
+127,169,145, 73,144, 69, 35,234,121, 35, 77, 70, 36, 50,110,230,185,206, 22, 51,135, 41,241,200, 51,114,140,105,182, 14, 43,134,
+ 59,219,164,187, 16,191, 20,167,137,101,230,241,108,216, 69,154,130,142,197, 40, 30, 61,218,120,136,235, 71,196, 33,117,245,176,
+153,120,129, 43, 53,103,195, 72, 72,105,114,226,169,167,102,119,205, 41, 56, 92, 63,203,195, 34, 50, 34, 14,162,201,153,173,181,
+107,138, 99, 40,238, 64,141, 98,163, 82,199,237,152, 18, 59,241,127, 26, 52,141, 41,104, 36,209,142, 54,179, 85, 38,216,215, 88,
+ 64,213, 52, 20, 75, 87,172,156, 98, 25,156, 10,228, 68,188, 76, 63, 40,140,223,103,194,208,108,127, 82, 89,165,168, 42,227,130,
+242,177, 28,116,107,239,219,159,223,238,125, 88,189,210,120,183,243, 98,251,250,166, 27,135, 34, 77, 16, 28,222,170,174, 44, 23,
+171, 95,250,157, 31,103,109,108,214,154,115, 21, 86,153, 16,135, 19,229,185,240,252,240,191,253,193,169, 36,227,228,  9, 68,213,
+ 31,  6,204,235,160,110,173, 63,192,137,233,  7, 39,240,169, 56, 12,240,230,  9, 87,100,101, 63, 21, 80,130, 20,186,  3,224, 99,
+202, 16,230, 47,210,117,196, 94, 56,189, 50,177, 44,169, 94, 96,236,216,142,230, 66, 19,240, 31,123, 45, 81,237,204, 73,145,186,
+ 75, 42, 73,229, 84,214,234,227,164, 66,204,105,177,169,108,204,167, 10, 43, 19,169,203,209,120, 77,189,240,243,100,221,217,179,
+237,167,223,255,124,147,211,152, 60, 87, 79, 67,142,240, 16, 38, 51, 21,230,  1,123,177,243,  8,225,117,213, 42,148,230,236, 82,
+ 24, 82,159,174, 83, 44, 83,147,171, 58, 99, 27,149, 61,185,176,  2,145,  8,226,113,226,190,222, 89,185,148,125,119,198,153, 61,
+ 94, 52,141,221, 10,183, 57, 50,182,158,200,192,226,162, 56,106,231,138,255,  4, 32,234, 90,122,155,184,194,232,204,120, 94, 30,
+123, 50,118, 72, 98,210, 32,  7, 23, 25, 66,203,  2, 21,165,105,255,  3, 75,254,  8,171,174,186, 42,191,134, 45, 98,193, 10, 33,
+129,186,237, 34, 41,108,144, 66,162, 40, 49,113, 60,153,177,199,243,242,140, 57,231,187, 14, 72,145, 55,177,172,251,252,238,249,
+ 94,231,172,236, 59, 61,244, 69,145,210,204,173, 94,103, 85,187,163,137,182,128, 98,106, 92,233,138,179,  2,146, 41, 86, 49,226,
+ 98,251,133, 65,219,115,188,104,126,141,197,181, 69, 88,130,175,220,138,103,201, 44,203,252,195,187,247,228, 78, 97,251,  4, 15,
+ 58,198, 13, 79, 95,168, 14, 74,145,233,225,215, 82,242,139, 25,218, 42,155,172, 15,122,195,105,122, 45,218, 35, 84,245,164, 68,
+148,122,226, 36,  0,202,165,167,240,161,182,187,121,247,100,252,133,108, 65,236,131,173, 85,191,133,204,179, 30,199,151,177,148,
+  0,197, 89,220,178,201, 38,168,208,104, 37, 10,200, 21, 25,253,113, 79, 72,131,245,240,206,175, 87,179, 75,192,255, 52,231,253,
+  1,204, 76,138,153,244, 91,106,210, 44, 90, 96,190,140,  5,235,203, 53,183,107,224,180,119,112, 51,217, 61, 68,227, 42,213,135,
+ 82, 89, 35, 68,233,100,133,230, 54,178,133,201,106,180,128,111,113,251,109,178,133, 56,192,144,174,237, 17,239,195,184, 91,126,
+219, 10, 60,107,173, 69, 67,175,140,187, 73,115,110, 48, 92,143,219, 96, 89,110,211,108,123,102,211,229,170, 57, 38,209,142, 41,
+117,203,240,218,150, 21, 86, 88,175, 21,101, 58, 19, 15,212, 96,214,  1,  4, 44,123,169, 90,246, 69,111, 44, 41,179,164, 44,102,
+243, 44, 78,243, 40,203,194, 36,137,105, 32, 42,108,188,105, 24, 81, 26,237, 15,126,199,226, 68, 89,116, 30,158,231, 90,  1,163,
+ 83, 46, 23,158,235, 63,220,249,229,116,242,  5,118, 54, 76, 38, 56,232,129, 19, 76,152,140,173, 48,204,163,147, 35,248,  1, 28,
+162, 97,177, 74,119, 73, 69, 40, 76,206,119,219, 36,245,108, 56,153,148, 78, 42,101, 71,106,149, 49,103,200, 90, 34, 21,163, 99,
+155,  9, 97, 47, 11,129,109,145,199,131, 29,124,186,255,244,255,211, 67, 21,150, 36,153, 93,195,204,139,252, 50, 26,141,227, 17,
+188,180, 36,159, 15,182,135, 73, 58,  3, 48, 95, 84,170, 40, 77,239, 73,244, 15,142, 48,206,118,148,132,248,221,123,189,123, 93,
+223, 63, 30, 29,227,164,249,205,246,102,103, 51,156,134,143,238, 63,234,247,251,231,231, 23, 13, 89,220, 89,146,252,253,252,159,
+ 55,111, 95,179,224,178, 46, 88,168,206, 52,134,133, 89,156, 93,157, 41,161, 75,157, 26,167,216, 34, 91,122,145, 23,100, 45,181,
+ 91,109,215, 15,188, 78,146, 78,187,164,104,175, 49, 60,193,149,210, 88,167,155, 45,199,227, 82, 48, 41, 77,166,239,166,105,207,
+210,169,109, 90,248,235,117,123, 60,165, 27,187,197, 34, 31,254, 52,196, 42,  1,130, 52, 88,142,172,193,102,237,223,127,114,120,
+124, 68, 77,162,189, 63,  0,  6, 58, 77, 58,181,192,155, 23,215, 23, 28, 85, 93,254,246,243,227,233,124, 22,120,109,106,200,214,
+218,186, 31,  0,139, 80, 33,132,137, 19, 47,175, 82,215,180,  9, 15,225, 31, 72,105,205,206,230, 94,145, 77,254,220,221,208,123,
+142,118,117,141,  9, 25,219,195,101,153,103,209, 88, 80, 59,111,151,234,244, 86,230,218, 16,190, 90, 93,137, 57, 41,252,142, 79,
+ 71,116,214,219, 46,185,224, 29, 74, 70,  9,174, 87,255,253, 30, 28,166,243,184,234,168,194, 91,114,230,212,175, 90, 31, 62,205,
+ 63,231,227,191,254,125,217,209,221, 23,  7,207,110,  7, 91, 97,158,197,243, 57,230,178,213,217,136,203,172,223,218,234,123,221,
+247,163,143,255, 93,157,238,221,186,187,110,121, 11,141,161,239,  7, 59, 15,166, 89, 50, 73,194, 39,131,199,227, 36, 84,  8, 64,
+248, 81,150,235,237,117,236,221,225,201, 17, 14,170,  4,172, 23,131,222,224, 43,149,249,  0,200,124,184, 44, 65,115, 13,222, 94,
+ 47, 96, 11,177,226, 35,  1,204,167, 29,175,203,131,225,  1, 80,160, 16,107, 16,174,169,134,246,166, 72,245,  2,121,220,176, 98,
+252, 96, 87,215, 85,192,  8, 75,196, 64,131,161,252, 87,248,187, 20, 72,160,185,119,106,105, 15,106,232, 22, 78, 78, 67, 88,117,
+121,243, 36,189,137, 47,140, 38, 35, 32,  0,222,117, 62, 23, 98, 28,120,234, 76,249,  4,114,183,182,111,237,148, 53, 44,137,141,
+205,163, 24, 61, 57,139, 12,161, 50,204,113,108,  2, 47, 80,132,219,154,132,209,170,234,198,171, 87,160, 82,114,169,152, 50, 89,
+191, 72, 37,166,  0,186,118, 35,221,167,234, 41,127,136,127, 27,194,  6,246, 77,  0,158,174,101,183,141, 50,140,218,115,241, 92,
+237,241, 56,105,172, 38,110,233, 69, 45, 21,164, 27, 64,138,216, 32,209, 77, 23, 93, 35,193, 30,120,  8, 22,108,120, 12, 30,161,
+175,192, 11,176, 64,162, 82, 85,  9,146, 10,170,162, 56,118,124,201,216,115,241,220,123,206, 55, 99, 54,150,236,140,237,201,239,
+255,255,190,243,221,206,105,237, 59,158,202,132, 78,189,191,130,180, 59, 82, 77, 36,237,125,221, 78,238,144,127,  6,203,231, 59,
+  7, 81,186,145,148,177,188, 83, 40, 38, 35,178, 44,169,141,246,152,244,104, 86, 48,107,148,179, 80, 13, 68,223,  5,225, 79, 79,
+248,  2,153, 75, 63,242,110,135,136, 43,185,201, 52, 33,245, 42, 27,202,192,178,106,114,230,124,  5,160,166,148, 80,  8,254,143,
+157,121,221,122, 63,180, 69, 79,134,195, 41, 82, 29, 53,144, 80, 20,111, 22,209,178,169,217,254, 63,123,129,123, 34,157, 44,103,
+118,242, 30,109,166,158, 75, 41,  3,191,113,181, 23,202, 84,228,127, 60, 62,152,212,114, 80,111,226,160,121, 51,108,165, 40, 14,
+194,128, 50,183,197,102, 21,250, 29,150,160,243, 78,170,153,117,165,235, 81, 92,165,121,157,236,202, 93, 90, 73,182, 16,235,163,
+ 26,  6, 80,152, 98, 80, 20, 93,105,138, 42,  0,248,  6,209, 58,145,184,105, 32,124,233, 58, 48,232, 48, 30, 61,241,251,212,  9,
+234, 10,117, 23,147, 60, 50, 64,136,141,192,126,100,118,165, 84, 13,217, 95, 87,196,172, 21,219,224, 53,120,236,187,154,235,106,
+195,129,238,218,186,235,104, 22,220,131,169,120,174,102,152,170,133,175,128,117,129, 51,161,252, 54,217,121,116, 67,165,106, 31,
+236,152,205,  1,150, 74,  5,126,207,131,108, 27,228, 33,  0,194,223,139,127,215,169,244, 26,169,181,174, 83, 69,250,222,225,125,
+236,251,217,118,102,244,172,145, 53,194,118,132, 53,231,157,118,181,123, 71, 15, 23,225,204, 64,112, 41,124, 91,184, 85,130,119,
+178, 26, 97,169, 77, 24, 89, 96, 79, 32, 83, 78,247,105,228,149, 36,175, 39,243, 89,106,213,109,244,208,165, 60,215, 82, 16, 41,
+ 44,122,192,151,244, 92,192,240,255,150,151,192,241,182,233, 54,185,111,145,227,214, 51, 17, 59,132,165, 38, 13,167,213,135,185,
+103, 70,146, 31, 80, 28,249, 99,120,179,245,118, 85,  9,172,202,242,228,249,217,139,119,179,119,  8,120,175,111, 22,223,127,243,
+195,235,191, 94, 89, 20,108,138,102,139,249, 98,113, 13,204,209,208,  5, 31,186,135, 79, 62,249,244,143, 63,127,199, 95,  1,  8,
+ 96,169, 11, 33,203, 60,246,143,103,155, 43, 44,164, 99, 58,236,154,168,171,159,190,251,249,159,203,115, 10,  3,176, 30,154,  3,
+ 56, 99,199,226, 74,207,241,128,108,190, 62,253, 42, 78,119, 48,187,187, 44, 85,165, 96,214,145, 32, 99, 50,154,120,206,  0,  1,
+120, 41,194, 87,216, 21,155, 36, 56,176,135,211,213, 20, 17,207,116,125,117,246,232,139,243,233,133,194, 42, 23, 99,154,139,233,
+219, 36,221, 97, 29,151,219, 21, 96,218,154,242,144,108, 25,148,211,222, 15,227,112, 30,204,133, 15,189,112, 56,166, 27,182, 84,
+169, 93,181,236, 20,119,252,  9,192,195, 45,239, 22, 60,189,174, 40,227,209, 73,184, 91,166, 25, 53, 69, 63, 63,241,141,187, 14,
+237,123,154,194,251,199,235, 89,190,139,149,150,235,178, 37,143,108,185, 42, 91, 20,223, 50, 27,210, 24,232, 66, 27,249,209, 65,
+231,206,168, 51,176,137,226,123, 82,101, 85,246,243, 77,245,158,137, 22,  7,201, 82,136,244,223,248, 23, 47,211,215, 27,189, 86,
+226, 31,127,251,245,114,187,252,229,236,219,199,135,147,235, 56,196,247,101, 89,230,247,253,235, 96, 21,  1, 91,151,229,  3,111,
+ 28, 38,187,243,237,251,247, 73,252,236,246, 19,160,150, 40,137,191,252,248,179,109, 18,205,111,230,192,100,148,237, 36,197,155,
+148,114,133, 15, 10, 48,124, 60, 28,103, 69, 33,148,157,213,213,234,114,232,194,  4, 37,174,229,  2, 31, 48,  6, 50, 45,132, 65,
+ 65,188,129, 39,110,234, 67,113, 30,195, 94, 44,195, 85,156, 71, 98,145, 59,210,249,194, 44,249,233,221,167,111,175, 46, 68,225,
+160,110,167, 50, 37, 89, 45,169,210,234,120,116, 50, 30, 30,229, 69,209,183, 28,225, 31,236,  4,113,112,122,255,233,106,179,110,
+184, 81, 53,146,214,113, 62,182, 20,150, 42, 33,207,103,  6, 22,216,200,119,252, 36,167, 34, 32, 22,105, 96, 15,113, 52, 88, 92,
+229,153,214,252,129,223, 48,131,217,166,157,215,165,231, 13,153,166,206,120, 64,112, 87,158,233,142,250, 62, 16,  6,246,114,147,
+ 85,144,182, 21, 89, 98,145,136,  2, 38,108,228,163, 41,133, 93,164,181,104,123,  1,  2,194,  7, 54,131, 82, 50, 12,212, 50,215,
+236,121,204,248,123,125, 16,128,168,107,217,109,219,136,162, 35,190, 95,162,228,135, 24, 67,121, 88, 78, 27,  3, 78,171, 77, 16,
+160,  8,144,133,209, 77, 11,  4,  8,208,109,191,171,223,209, 69,119, 69, 23,237, 58,139, 52, 40,138,116,213,164,142,227, 42,142,
+ 37, 89,148, 40, 74, 35,137, 98,207,185,164, 27,120,101,128,166,135,228,157,251,154,115,207,249,223,191,215,253, 26,245,137,230,
+166, 26, 72, 83, 85,  1,  7,207,227,217,  2, 42, 34,144,113,179,174, 32,163,  4,210, 32,115, 15, 43,185,113, 88, 91,  5,157, 12,
+ 61, 14,137,  5,110,132, 40,234,113, 35,229,120, 53, 33, 94,186,158, 35, 61,236, 68,183,254,189,190,168, 88, 84, 11,106,203,177,
+ 89,239, 58,  1, 12,  7,159,231, 48, 57, 34, 11, 51,131,162, 96, 90, 86, 57,185, 32, 68,224,185,234,193,203, 81,181,201,  1,  9,
+225,230,133,173,175, 11,253,229,221, 62,174,202,201, 85, 20,251,148,214,212,114,108,237,172, 87, 90, 22,239,230, 60,230, 37,138,
+ 54,142, 98,199,230,  1,172,170,169, 46,177,169, 70,200, 82,225,  8,201, 19, 34, 20, 99, 75, 61,223, 20, 69,197,222,  9,119,166,
+ 42, 60,162,226, 29,241,116,237, 56, 50, 67,252, 82, 54, 81,131, 57,166, 79,111,110, 54,125,203,245, 81,206, 90,150,168,112,186,
+118,  3,110, 26, 30,223,193, 58, 76,153, 96, 97,166, 47,116,102,148, 59, 53, 10, 18, 14,160, 10, 35, 59, 72, 77, 79,183, 45,145,
+224,187,164, 68,177,172,154,143,136,209,208, 82,245,206, 43,100,114,166, 65, 84,  9,238,111,120,182, 32,151,105, 64, 50,205, 41,
+ 37,115, 69,230, 76,162, 93,147,215, 96,109, 65,104,134, 17,  2,  0, 75, 10,216,153, 52, 19, 81,136, 88,164,188, 55, 36,211, 39,
+196,  8,158, 35,159, 46,178,113, 54,123,159, 14,166,203,116, 55,104,183,253, 24, 89,231,162, 88,102,171,121, 55,190,141,117, 12,
+210, 11,225,235, 85,142,227, 98,  3, 28,180,187,119,147, 94,190,224,  8,207, 70,106, 25,225,177,161,168, 13,197,104,240,168,166,
+ 21,  7, 77, 74,170, 10,205, 50,145,103,108, 59,204,234,193, 51, 81,211,130,145,224, 35,194,249, 98,109, 90,107,132, 72, 60,140,
+136, 49,153,100,149, 90,100,142,237, 33,216,119, 59,119,144,178,237, 54,219,248,163,227,238, 49,254, 59,245,173,102, 87, 21, 97,
+153,222,172,191,121,242,237,203,191, 94, 62,236,157, 44, 87,171,116, 60,193,173, 70,179, 17,243,241,178,216,111,239, 99,111, 35,
+138,204,151,179, 73,126,253,251,171, 23,113, 24,195,237,162,220,246, 93, 47, 65,154,159, 77,174,166,151,207,191,250,238,124,120,
+190, 27,239,165,217,  4, 78,246,167, 23, 63,182,252,214,120, 58,220,139, 19, 98, 43, 13, 51, 66,233,197, 93, 77, 21,144,216,139,
+223,124,252,251, 40,185, 63,201,198, 22, 91,246, 29, 78,204,231, 41,124,  1,170,210, 41, 18,  5,138,134, 39,134,188,153,166,215,
+244, 28, 23,101,248, 52,159,192,151, 29,180,111, 29,223,126,248, 97, 52,136,194, 38,217, 11,168, 99, 83,174, 86,186,187,123, 48,
+ 91,100, 17,204,168, 84,108,163, 47,242, 10, 22,221, 63,236,159, 93,253,  3,195,222,138,110,154,216,  6,177,100,  8, 69,228,248,
+ 99,117,171, 17, 86,175,167, 31,104, 24, 22,225,252,253,131,253,230,103,129, 26,166, 91,173, 23,233, 80,103, 83,153,107, 22, 92,
+ 87, 53,131,127,  3,170, 35,125,136,146, 31,206,154, 11,230,125, 39, 84, 88,131,225,169, 78, 75, 37, 29, 21, 69, 42, 50, 62,209,
+105, 21, 74,213, 42,208,166,138, 44, 94,246,139, 63,126,117,231,207, 92,119,227,232,135, 63,126,254,237,226,245,247, 15, 78,159,
+223,127,124,185,200,  9,118,224, 41, 40, 57,  9,124,199, 13,252, 96,134,132,  8, 79,180,211,251,245,253,235,203,124,112,178,215,
+ 59,253,252,241, 32, 29,161,166,127, 59, 56, 67,  6,240,245,163,211,229, 82, 35,233, 54, 72, 55,226,192,179, 19,254, 83,104, 20,
+ 79,236,212, 25, 21, 18,164, 60, 76,238, 13,103, 87,  4,164,111,182, 59, 65,140,220, 63,105, 37,248,184,161,227,205,151, 57,  5,
+117,229,208,110,205,185,229,  2,  1,155, 34,243, 18,134, 81, 59,190,185,124,171,110, 16,226, 50,124,227,150,141, 42,229,147,147,
+ 50,226, 28, 28,132, 85, 91,216, 35,136, 79, 93,235,167,253,211,243,143,103,107, 86,108, 28,146,226, 40, 23, 21, 89, 77,250, 16,
+131,131,220,207, 30, 61,123, 55, 60,231,152, 18,235, 33, 58,175,253, 56, 89,234,133,141,103, 32,163,170,223,226,220,251, 54, 12,
+195,192, 15,191,232,157,244,238, 29, 33,137, 29, 77,198, 54,249,186,  9,206, 78,231,233, 13,117, 60,193, 85,204,147,138, 26,211,
+200,163, 93,155, 98,202,145, 23,222, 76, 75, 48,168,224,222,200, 89, 17, 48,  8, 74,148, 60,176,172, 91,248,101,221,133,111, 52,
+254, 19,128,166,171,233,109,156,138,162,182, 95, 98,187,142, 99,167,113,147,182, 76, 91,102,152,142,102, 10,  5,164, 25,  6,  9,
+ 65, 17, 66,136, 21, 35,182,  8, 70,176, 96,  9, 63,129, 63,193,146, 31,192,134,  5, 59,196,122, 36, 54,136,143,129, 41, 82, 25,
+ 90, 53,208, 76,218,166,237, 36,105, 18,127,196,126,182, 57,247,190,204, 46, 74,228, 36,246,123,247,243,157,123,206, 92,223,131,
+145, 48,243,198, 13,243,130, 89,115,165,156,103,184,124,184,224, 56,143,213, 40,199, 90,240, 66,152, 16,119,224,221, 27,111, 97,
+219,245, 71, 61,158, 78, 36, 22, 23,165,147, 32,153, 59,130,133, 49, 41,149,131,133,195,245, 55,220, 38,246,186, 77,167,175, 85,
+ 70,194,228, 74,215, 83,205, 52, 17,203, 79,  6, 71, 48, 59,231, 62,169,166,252,108,150,204,231,171,184,178, 84,147, 86, 84, 16,
+ 49, 47, 13,190,103,235,202, 54, 44, 19, 31, 99,237,177,233, 50,106,251,166, 36,150, 70,206, 84,176,132,147,220, 90,123,181, 55,
+232,242, 17,102,113,103,243,245,211,193, 41, 43,165,177, 76, 12,141,179,228, 88,247,102,109,169,238,144,177,193,167, 40,181,114,
+ 54,164, 42, 29, 81, 74,130, 69, 26,106, 94,182,194, 39,105,142, 94,177,  5,246,143, 89,213, 23, 96, 94, 21,221, 50,241, 62,126,
+158, 42,232, 89,170, 81,198,155,170,101, 34,109, 50, 20, 33, 57,105,129,150, 36, 86, 43, 89, 51,175, 40,179, 76, 79,179,204,177,
+204,123,239,191,247,217, 71,159,236,188,241,230, 44, 45, 14, 14,143,227, 24, 21,104,133,233,164,213, 98,115,214,193,160, 29,  6,
+222, 10, 68, 20,252, 11, 26,218,161,138, 70,168, 58,142,154,133,185,198, 67,170, 70,221, 22, 46,182,131,197,152,106,188,135,192,
+ 68,228,112,  4,214,100,172,147, 97, 90, 52,143,206,168, 80, 69,218,200,216, 56,221,100,142, 64, 81, 88,122,102,104,231,233,232,
+ 36, 58, 63,184, 56, 64,168, 91,243,215,112,151, 65, 61,184, 76,198, 68,219,148,167, 85,230, 94, 94,242,131,186,233, 99, 99, 12,
+163,  1,140,161, 86,173,185,182,119,255,221, 79,255, 60,252, 29,  6, 41,136,133,153,245, 29, 53,125, 38, 99, 92, 62,137,199,168,
+115,153, 34, 87,192,168,168,131, 71,115,161,212,160, 76, 82, 24,117, 84,119, 60,151,100, 58,168,209,153,147, 71,112, 22,221, 96,
+163,189, 33,165,236, 28,255, 35,216, 92,225,136,224,166,225,247,121,134,155, 36, 17, 26, 78,  3, 75,219,233,118,226,217,244,232,
+172, 19, 37,147,255, 78, 58,175,220,184,125, 62,232,243,  1, 58,137,142,121,158, 95,200,  2, 25,162, 65,144,208,133, 47, 63,252,
+226,225,254,175, 48,170,213,197,231,218,139,237,222,197, 49,210,145,199,221, 61, 20, 37,147,112, 76,160, 47, 25, 11,173,114,119,
+243, 14, 74, 58, 92, 82,183,233,137, 34, 73, 68,170, 24,184,  1,204, 21, 81,216,224, 73,250, 92,230,204,102, 90, 82,107,222,208,
+215,131, 13,220, 66, 66, 50, 41, 26,241,238, 49,125,141,164,177, 20, 11,254,104,235,202,205,151, 54,182,159, 60,237,141,162, 17,
+226, 92,154, 37,215, 87, 55,153, 14,161,248,224,181,123,143, 58,143,130,250, 82,255,178,159, 82,218,104, 44,216, 14,110,144,180,
+ 44,120, 63, 35, 20, 89, 21, 91,102, 51,238,171, 84, 86,188,118,152, 78,199,225,112,146,140, 37,209,167, 72, 65,243,147,  8,246,
+ 68, 37,120,187,237,121,183,124,248,119,194,253,147,252, 89,249, 12, 75, 87,114,182, 94,206,211,118,197,204,199, 58, 28,130,207,
+ 92,169, 39, 51, 76,191,253,230,167,135, 63,236, 38, 63,238, 77, 31,236,  7,184,228,214,117,226,130,207,121,232, 61,231, 22,133,
+ 89, 33,141,167, 81,172,125,151, 62,248,165,252,227,242,104,165,209, 56, 56, 59,252,234,231,239, 87, 23,150,191,126,251,243, 75,
+153, 68,185,244,109,171,223,187,168, 70,122, 54,209,204, 84, 12, 70, 23, 73,153,  5,254,226, 82,173,129, 42,242,183,225,254, 81,
+ 20,125,252,226,206,147,225,  9,157,157, 90, 68, 72,254,239, 89, 23,241,149, 85, 39,168,225, 69,218, 26,154,146,  7, 21, 17, 15,
+121, 42,172,142,107,185,215,218,215, 16,110,195, 44, 12,227, 16,166, 77,186, 43,133,198, 52, 83,102, 11,190,126, 58, 44,244, 57,
+112,208,171,249,239,108,239,252,221,125,140, 71,193,148,253,248,251, 85,198,149, 19, 78,117,217,107,165,196,184, 39, 21, 51, 12,
+ 30,120, 24, 79,240,122,153, 40,131, 98,248,183, 36,141,247,142,254,194,158, 20, 60,165, 70,194, 96, 20,179,145, 38, 10,154,174,
+ 71,198, 86,202,206,233,161,162,221,157, 19,201,233,  2, 73, 45,209,160,218,174, 99, 58,235,173,231,  7,225, 83,100, 36, 91,235,
+ 55,145,164,175, 52, 86,154,203,173,151,175,110,239,238,239, 10,165,106,167, 78, 87, 85, 91,147,109,210,183, 26, 40, 77, 74, 37,
+145, 86, 22,  8, 42,147,100,138, 61, 86,240, 13, 40,  8, 16,138, 81, 36, 82, 77,183, 53, 73,199,212,171,200, 11, 99,142, 96, 37,
+ 94,213,166,211, 68,188,249, 95,  0,162,174,165,183,141, 50,138,122, 60, 99,207,203, 51,227,248, 21,167, 64, 29, 43,174, 16, 32,
+ 90, 34, 94,162, 18, 44, 40, 20,177, 98,211,178, 98,135, 84, 33,129,212, 77,197, 47, 96,205,207, 96,199,134, 53, 11, 42, 22,  5,
+129, 16, 68,  8,  1,105,162,212, 49, 25,199,143,120,236,241,188,103,108,206,189, 99, 53,217, 69,178,101,205,124,247,187,247,156,
+239,187,247,156, 13,126, 23,169,143,251,210,245,  9, 17,  9,  2,  2,192, 18,167,209,165, 13, 32, 59,249,165,228, 68, 60,101,149,
+177, 82,127,122, 60,113,193, 31,201,113,155, 90, 50, 41,248,138,133,220, 20, 78, 40,242, 81, 17,169, 50, 97, 25, 64,189,129,145,
+177,207,105,202, 41,112, 73,213,129, 85, 36,241,204, 42, 77,205,  8,200,  5,116,228, 66, 33,183,186,108, 57,101,147,  7, 67,181,
+248,130, 50,203,103,119,121,166,153, 90,128,177, 54, 99,190,245,198,243,170,138, 78, 33, 42,108, 22, 15,127, 88, 48,252,202, 34,
+116,193,  6,232,254,146, 60,167,165,243,249,  8,124,141,206,183, 69, 49,215,124,200, 53,226,253,216,115,125, 39, 99,144,158,229,
+230, 91,120, 64,106,102,164,129,  0, 96,204,108,157, 16,148,230,226,168,106, 82,213, 42,129,192, 96,129,203,101,161,162,137, 74,
+137,117, 86,121,206,187, 76,  7, 18,107,252,  7,210, 22,167,220,135, 69, 70,216,108,172, 91,148,116,185, 12, 40,109,168, 74,165,
+ 66,114,172,247, 63,251,244,157,183, 94,125,244,243,143, 91,166,252,201,221,143, 27,166,126,116,124,  4,  4,134,160, 80,248,242,
+118,  3,178,152,142,149,242,185,  8, 42, 28,185, 80, 16,143,147,242,229, 57,157,158, 32,251,203,204, 27, 36,228,  2,130, 43,248,
+172,174, 74,150, 33,153,186, 72, 62, 78, 98,145, 57,  9,243,115, 74,208,172, 25, 88, 66, 41,151,233, 88, 71,166, 50,133,247, 36,
+130,200, 96,193, 84,100, 36,169,168,137,  5, 29,169,206,  3,162, 31, 76,  6,120,129,187,245,110,167,182,171, 41, 58,114,205, 99,
+251, 95,123,110,191,119,253,246, 34,152, 81, 27,153, 40, 78,151,147, 11,215, 65,228,249, 33, 49, 54,108,155, 32, 10,130,196,187,
+ 90,235,144,170, 26,153, 59, 42, 21,213,140,162, 80,166,128,137,187,173, 61,130,186,220,119,143,226,212,182,174,200,186,236,123,
+ 94,187,246,204,220,119,226, 44,112,  3,103, 52, 31, 34,203,199,105,136, 50,132, 77,101,168,134, 31,211,124, 96,179,210,228, 30,
+ 77,145, 66,145,238,163,233,122, 19, 33, 14,108,142, 96,185,255,229,  3,103,230,140,135, 67,  4,216,185, 99, 79,102, 99,236,141,
+170, 94,189,182,211, 67,254,253,245,240,151,132,136,173,  0, 54,125,100, 63,  6, 33, 64,194,197, 43,  7,185, 68, 29,242,130, 37,
+249, 71, 21,214,253,233,233,138,173,104,201,187, 78,146,194,192,219,177,174, 80,114, 44,172,237,139,193,205, 23,111,158,142,251,
+188, 32,235,186,213,162, 78,134, 44,195,107,233,181,122,113,150,188,249,252,107, 79,236, 19,110,137, 67,142, 77,131, 36,220,210,
+170,101,177,124,112,114, 48, 15, 22, 97,236,239,119,247,135,179,115, 64,126,234,191,140,188, 39,163, 65,195,168, 47,253,  5, 13,
+255,178, 57,225,182,217, 82, 74,114, 16,121,212,128,164, 90,248, 36, 56, 40,235,205,146, 90, 79, 16,  7, 53,109, 75,147,181,221,
+102,215, 13,230, 60, 12, 33, 54,172,118, 18,147, 73,242,203, 70,165,246, 74,173, 48,117,  4,194, 76,172, 82,180,137,246,252,250,
+ 48,151, 95,224, 81,141,167, 54, 20,216, 69,114,  9, 69,233,155,239,254,232,251,137,213, 50,206,146,248,228,108,178,211,159,154,
+207,213, 11,207,214,233,222, 53, 73, 25,182, 43,  4,219, 31,245,143,190,253,109, 53,235,253, 30, 69,160,137,141, 98,249,235,131,
+239, 15,157,193,131, 27,119,154,186,105, 59, 83, 49, 46,116,196,238,135,247,190,184,254,213, 71, 55, 62,191,253,194,221,119,247,
+219,111,103,127, 47,254, 26,254,233, 36,203,151,170,221,135,103,255,216,254,127,141,162, 85,151, 53,164,130,154, 89,245, 99,114,
+223, 38, 68, 35, 20, 55, 26,136,236,197,131,136, 10,162, 48, 79, 68, 88,  8,148,189,153, 55,155, 46,166, 52,234, 72,  2, 85, 98,
+ 62,205,202,116,132,172,168,107,160, 74,161,123,109,187, 71,170,121,161,223,217,238,244, 71,167,221,246,222,120, 49,202,133, 10,
+ 13,181,162,149,200,167,197,113, 47, 84,252, 58,233,206,164,185,  0,  0,223,238, 82,254,  1, 10,108,154, 59,147,229,136, 24, 56,
+245,109,151,243, 52, 40,178, 94, 16,105, 85,166,241, 22, 57, 76,  5, 87, 91, 93,159,196,109,104,124,233,141,189,215,237,153,205,
+199,171,132,205,200,217,163, 98, 42,178,226,135,222,186,184,118,188,  5,190,126, 58, 28,220,122,255,214,195,159,126, 88,184,174,
+174, 85,232,162,133,106, 70,238,211,144,207,201,102, 88,107,230,184, 43, 84,  8,131,229, 76, 80,102,202,228, 26,253,193,241,249,
+ 97, 46, 49,182,140,168,176,121, 32,196,  2,141, 70, 35,181,178, 47,208,170,  4,236,159,166,212, 35, 46,  8,255, 11,192,212,213,
+244,182, 81, 69,209,153,241,140,191,191, 27,227,102,146,152, 20, 75, 17, 72, 72,208, 34, 36,144,170, 72,172,144,144, 90,144, 42,
+ 33,  1, 11, 42, 22, 44, 64, 66, 98,193, 10, 33,177, 41, 43, 22,221, 32,241, 35,216, 20,254,  1,  8,218,130, 40,  4,168, 83,218,
+166, 46, 65,173,235, 56,254,136,199,246,120,102,158, 61,156,115, 95, 16,108,147,140,243,230,249,221,143,115,223,189,231, 28,251,
+119, 37, 21,130,255, 79,165, 34, 28, 81,225,225,191,138,141,169, 99,128, 52,105,106,  6, 51,253,170, 54,156, 59, 50, 47,181, 88,
+194,  8,114, 73,192, 25,100,235,148,189, 14,132,243,129, 82,182, 75, 18,241,164,172,164,146,132,103,165,184, 50,154, 13, 98, 81,
+ 72,192,222,193,225,250,106,134,167,180,140,172,112, 61,134, 82,223, 35,190,128,193,  8,237, 48, 59,204,224,178, 28, 39,  5,111,
+137, 79,  5,110,226, 21,171,136,237,226,200, 42,197,251, 94,124,211, 57, 39, 43,146,223, 28,130,160,122,212, 98,225, 56,105, 44,
+ 19,128,  3,238,  6,201, 56,121,183, 23,122,204, 88,138,111,177,166,167, 60,238, 76, 42,102, 10,120, 48,149,204,137,122, 11,193,
+157,104,106,135,230, 49,245, 66, 65, 25, 42,159, 77,151, 79,208, 12,179, 41,248,119,246, 48, 56,142,220,172,242, 11,101, 19,187,
+227, 96,121, 84,127, 76, 59,134,227,216,188, 80, 77, 91, 69, 60,156,117,242, 89,163,148,139,107,149, 68, 49,111, 20, 11,201, 15,
+ 63,120,255,243,203,151,191,187,246,211,141,157,223,247,247,239,191,118,254,149, 90, 37,127,115,183,165, 55,150,145,122, 73,131,
+ 78,219, 54, 32,  2,147, 11, 21,  7,129,225,195,127,  4,230, 44, 20, 58,118, 86,109,140, 36, 48,136,195, 11,146, 20,139,127,194,
+215, 26, 91, 74, 89,112, 98,254,156, 86,105,112,168, 69,170, 59, 90,143,141,179,116,  9,222,  3,167,156,  2,  2, 44, 22,150, 73,
+100,210, 78, 49,203,120,144,207, 97,205,250, 22,129, 33, 64, 89,241,220, 10,102,150,  2, 10, 38,119, 99,108,236,245,247, 38, 33,
+ 16,180,233, 86,220,107,119,190,247,252,  9,203,232,209, 28, 71,244,226, 75,111,127,253,227, 21,172,255,100,181, 33,117, 54, 86,
+  5,143,252,225,130,228,204,153,165, 80, 45, 50,249,181, 76,156,191,241,244,168,136,220, 58, 83,154,248, 30,143,144, 90,158,123,
+253, 92,103, 15, 80, 76,225, 39,154,191, 22,199,100,  2,171,176, 25,176,145, 19,176, 65,141,  4,115,148, 79,139,  8,159,243, 25,
+210,211,  7,149, 92,109,251,233,237,219, 15,111,217, 34,171,246,231, 47,173,235, 59, 87,207,108, 61,223, 29,118,154,238, 22,236,
+126, 76,141,198,105,119,216, 45,229, 74,188,210,199,247,139,  3, 46, 28,220, 30,201,120,163,245,149,199,135, 30,241,114,176, 12,
+106,185,154,204, 49,150,130,  0, 57, 35, 94,243,164,138, 72,245,  5, 91, 90, 44, 35, 36, 28,103,159, 60, 59, 24,247,189,153,  7,
+100,179, 90,117, 79,185, 79, 52,234,141,254,240,  0,231,110,191,215, 70, 44,  1,146,192,  1,115,168,109,105,193,188,223,220,190,
+176,115,239, 15,108, 26, 39,  1, 19,196,103,120,253,213,234, 26,118,236,217,230,153, 32,140, 16,171, 96,192, 90,195,147,244,115,
+177,217,247, 14,167,129,111, 37,132,123, 71,  5,248,239,110,165, 78, 73, 72,164, 83, 78, 10, 27,232,135, 51,105, 19, 96, 58,137,
+208, 91, 76,151,241,171,181,218,198,104, 58,124,166, 92,168,158,174, 24,189, 81, 12, 44, 73,198,145,133,180,144, 72, 90, 44,224,
+ 84,168,134, 45, 93,168, 57,230,129,198,195,249, 84,171,213,189,242,235, 62, 96,151, 82, 17,194,209, 83,235,229, 70,189,144,196,
+ 25, 66, 22,149,150,233,188,133,109,252,240,247,238,151,223,254,124,245,110,104,218,189,176,225, 69,126, 38,145,232, 77,188,207,
+110,124,179,150, 89,253,226,229,247,110,117,238, 37,103,197, 55, 62,185,228,126,250,156, 57, 74, 95,255,232,230,111, 31,223,110,
+127,117,176,225,158,218,124,231,244, 11,149, 87,251,127,181,148, 61,143,149,177, 51,188,139, 67,247, 98,189,137,149, 13,166, 71,
+166,214,117,212, 14, 71,244,111, 23, 82, 80,210, 66, 90, 48,106,155, 99, 77, 12,  3,248, 59,183,186, 46, 36, 72,166,241,111, 39,
+136,166, 54, 89, 74, 31,228, 60,  8, 86, 79,184,237,131,251, 48,225,195,241, 96, 52, 29,244,198, 61,169,  1,240, 68, 97, 27,231,
+ 81, 48,158,141, 12,145,110,102, 85,153,122, 39, 66,183,103,152,143, 21,234,156,114, 39, 51,246, 88, 40, 33,185,134, 82,166, 76,
+ 63, 19,235,153, 24, 67,124, 20, 25, 67, 57,  4, 11,223,205, 70, 50, 18, 90, 60, 24, 60,212, 61, 53, 43,  5,222,171,123,129, 55,
+153, 79,143, 38, 99,216, 28,176, 47, 48, 74,169, 84,221,108,108,190,117,233,221,238,110,103,208,235,205,163,112,230, 79,145, 30,
+109,173,109, 61, 58,236,176,200,192, 82,167, 69,150,105, 97, 26,  0,134, 64,114,220,172, 55,187,163, 71, 72, 54,218,  7,109,210,
+ 44,178,201, 66,136,152,180,238,175, 97, 49,  1, 18,194, 68,120,130, 13,236,204, 50,212, 90,234,255,  8, 64,213,245,252,182, 77,
+134, 97,127,137,237, 56,142,237,216,206,143,118, 83, 18, 24,234,134,186,116, 43,165, 19, 82, 55,122,  0, 77, 27,154, 58,132,182,
+  3, 98,  7,164, 74,187,240, 23,176, 51,151,177, 19,226,194,  1, 46,  8,184, 33, 14, 12, 16,  7, 14, 72,  1,  4, 26,  2,182,142,
+ 18,105, 98, 29, 77,233, 80,147, 38,105,108, 39,182,227,216,222,251,190,110,167, 33, 85, 85, 21, 89, 85, 62,199,121,190,231,121,
+191,247,125,158,  4,223, 15,198, 91,159,240,157,212,229,  2,  0,229,255, 43,242,209,227, 11, 30, 27, 22,163,139, 47, 47,245,157,
+ 93,248,237,163, 81, 74,  0,107,206,138,152,230,193,246, 73, 38,246,236,195, 93,214, 84,109,229,236,197,187,247,238,128,234, 58,
+216, 76,176, 90,  5, 26,135, 34, 56,210,137,154,166,108,241,248,120,229,100,215,234, 16,182, 78,176,232,143,167,151,  0,211,232,
+195,192, 37,209,133, 33,218,117, 98, 29,141, 16,132,161, 23,168,134,221,147,164, 63, 41, 20,  2,176, 57,  4,124, 57, 81, 91,128,
+175, 28,151,218, 55,149, 71,212,198, 17, 78,124, 65,198,140,221,128,140, 30, 40, 62,156,139,135, 99,215, 80,205,189, 81, 63,121,
+225,192,174, 13,191, 26, 57, 81, 41,155, 83,136, 44,153, 56,175,139, 19,234, 52, 10,  3,  6,128, 59,178,185,193, 48, 30, 58,209,
+192,  9, 29, 39, 26,142, 34,215, 69, 47,  2, 32,218, 49, 78,187,161,186, 20, 69,160,249,177, 44,  9,151, 94,189,188,252,226,249,
+198, 79,119,100,201,124,243,202,234,  7, 31,126, 28, 68, 66, 20,139,247, 55,182,183, 31,118,175,174,190,229,187,225,207,183,254,
+224, 80,151,  1, 64, 71,233,136,198,159, 57, 44,179, 80,111, 64, 74,195,174, 74,150,147,152,136,245,119,150, 17, 64, 42,165, 65,
+ 58,192, 82,  2, 44,235,167, 88,200,232, 56,151,151,112,210,142, 10, 34,128,250, 56, 53,142,120, 45,103,211,120, 48, 43, 11, 57,
+153,  7, 64,  7, 57,146, 67,250,142,114,129, 75,198,196, 34,228,194, 73, 26, 81, 28,226,244,150, 63, 78,133,176, 91,176,216, 97,
+126,103,216,201, 49,201,204, 21,237,192,202,241, 42,108,222,148,101,129,231,216,176,218, 75,103, 46,255,208,108,148,180,114,189,
+ 90,  7,106, 12, 11, 55,212, 18,124, 68,176,251,142,201, 46, 20,249,  5,207, 15,253, 17, 79,123,191,237, 89, 23, 78,173,140,  3,
+  0, 56, 15, 30,229,245,219,235, 69,109,170,107,119,242,104, 24, 23, 81, 36, 47, 63,109, 86,108,167, 71,133,248,104,228, 59,192,
+ 30,128,106,192,245, 41,242, 47,  2,  8,213,228, 60,168,249,245,214,159,158,239,158,157, 63,255,242,115,203,141,187,141,211,245,
+165,102,171, 25, 69,  1,236,235, 35,223, 54, 20,243,234,185,213,181,127,214,151,113, 58,116, 27,216, 31,165, 46,160, 37, 17,  6,
+131,120,118,123,176,  3,207, 12,144, 98,203,179,168,227, 16, 83, 65, 22,142,204, 15,199,163,222,160, 23, 68,147,103,166,143,  0,
+211, 71,223,152,157,141,246,160,187,213,109, 77,233,101,248,255,221, 65,151,143,216,110,191, 61,240,246, 18,153,187,244,236, 18,
+ 72,141, 82,190, 72,115, 55, 54, 44,185,185,121,207, 80,117,156, 16,137, 39,115,181, 57, 80,235,190,239,247,237,254,133, 83,231,
+214, 30,172,153,138,  1, 88,131, 44, 76,206, 79,176,115, 95,152,173,204, 42, 82,206,118,173, 12, 74, 47, 65,149,148,130, 86,124,
+237,133,139,183, 55,224, 98, 29, 56,144, 78,109, 69, 39,170,245,135,189,255, 74, 90,  9, 52, 13,108, 25,192,202,108,167,195,241,
+217,186, 32, 20,159, 47,112, 61,139,141,125,108,233, 78,114,  4, 25,229, 56, 36, 93,219, 20, 40,126,224, 89, 72,163,122, 52,107,
+121,179,113, 95,207,  8,139,135,243, 79, 23,180,146,146, 53, 36,201,200,  1, 85,  5,194, 46,114, 94,154,251,177,245,219,123,223,
+125,254,197,173,191,  7,142,168,  9,121, 49,207,216, 81, 69, 45, 46, 78,207, 92,255,245,171,102,255,193,181,249, 43,105,216,220,
+ 28,246,198, 39,239,112,179,220,247, 71,127,121,247,253,235,139,238,201,249,211,115,147,190,255,246,167, 55, 62,251,232,219,215,
+ 95,122,101,230,216,153,193,230, 95, 66, 42,252,230,223,223, 91,174,181, 82, 89, 24,  5, 52,249, 72,197, 10,184,  9,166,170, 91,
+174, 13,239, 82, 87,140,167, 74, 85,184,111,240,  7,124, 46,128,  6,182,231, 36,181,114,192, 19,207,163,206, 28,173,204,200,169,
+ 27,221, 15, 57, 76, 52,196,120,213,137,191,131, 61, 54, 88,200, 46,227,233,136, 68, 19,  3,184,110, 69, 82,170,197, 26,220,112,
+ 33,149, 76,188, 99,238,101, 81, 53,  3,116,163, 66, 73,  3, 27,231,148,113,  8, 68, 85, 70,144,106,133,218,158,187, 39,241, 64,
+177,  4,156, 81,216,247,  3, 32,  7,  2,150,128, 44,191,239,210,130,242,  1, 37, 81,197,172,194, 82, 60, 60,224,197,216,209,140,
+152,145, 50,248, 35,  3,129,226, 69,  0,144,206,110,167, 16,231,191,190,249,229,112, 56,194,209, 31, 42,248,180,251,109,160,212,
+ 37,181, 12, 79, 17,145,109,110,230,240, 49, 16,196, 89, 94,134,167,102,171,179, 25,147,247, 36,122,193,166,165,178,126,  8,244,
+ 28,123,194,  4,158,142,190,176,116, 81, 84, 75, 91,189, 22, 77, 87,225, 27,125, 36,  0, 85, 87,215,219, 54, 25,133,109,167, 73,
+108, 39,177,155, 54, 89,211,134,176,118,107,217,150, 78, 67, 64,216, 52,  9,198,  0,105,  8, 81,208,212, 59, 46, 17, 87,227,  2,
+ 42,  4, 18,119,136, 91,254,  4, 55,211,184, 67,  2, 36,126,  0, 21, 84,168, 82, 53,166,110, 93,187,165,221,250,145, 14,199,249,
+112,226,248, 35,254,120, 57,231,188,233, 16,215,150, 18,235,181,125,206,115,206,121,206,243, 96,124,231,107, 77,162,200, 78, 44,
+113, 17, 59,227, 42,  7,160, 79,  9,245,120,197,255,201, 61,143, 58, 68,163,212,207,  4, 34,141,162,227,  7,156,181,196, 36,168,
+119,208, 98,152,  5, 92,206, 82, 56, 49,220,131, 18,120,115,251,111,146, 92,151,136,167, 40, 17, 57, 63,152,153,168, 88, 54,193,
+121,241,191,  2,  2,130, 59,246,249,216, 72,  8,147, 28,233,  0,168,  4, 83, 90,217,  9,108,190, 32, 10,101, 59, 58, 37,201, 26,
+100,136, 49, 41, 73,187, 39, 88,218,121,196,128,214,213,113,127,136, 18, 38,141,246, 33, 59, 25, 60, 62,191,113,145,187,220,145,
+ 91,108, 58,  9, 56, 53,129, 62, 59,  1,118,102,  6,238, 96,110,234, 44, 22, 22, 56, 66,  1, 12,174,210,184,216,129, 90,  1,167,
+ 11, 56,102,101,138, 42,219, 30, 20,227, 82, 18, 53,246,164, 33, 73,225,241,137, 49, 14,217, 35,206,183,197,131,229, 26,128,220,
+ 50, 11,176,200,181, 55,222, 92,249,230,251,115,139,175,152,199,117, 45,155, 93,188,120,241,135,219,119,  8, 83,136, 16,249, 30,
+213,159,180, 76,227,203, 47, 62,223,217,169,239,236,238,225,168, 21,189, 49,177, 62,204, 41, 82, 86, 77,232, 89, 73, 77, 75, 25,
+ 85,164,197, 97,106,101,209,118,  9,194,208, 56,  1,231,231,161,157,168, 59, 28,250,128, 79,  6,128, 54,237,  0,192, 59,196,125,
+199,101,142,131, 70, 31, 40,253, 17, 35, 35, 48,163, 66, 88, 20, 85, 69, 84,101,145,182, 79, 41, 31,162,100, 60, 81,160, 41, 32,
+224,214,120,196,134, 33,113, 49, 73,110,  1,165, 93, 21, 49, 82, 32,144,246,207, 77, 84,223,190,116,237,238,254,  6,100,214,178,
+ 94,182, 60, 43,171,104,189,129,115,216,218,159,206,151,215, 31,175,165, 83, 16,145, 25, 61, 47,194, 34,104, 62,151, 83,100, 25,
+183,254,226,104, 58, 95,113,176,159,200, 32,160, 27,150, 81, 41,204,250,161,235,  6, 78,171,247,143,132,202,189,254,245, 75,111,
+ 89,125, 43, 70,225, 35, 83,207, 78, 64,224,131,231,  5,152, 23,128,155,209,105, 36,104, 63,127, 12, 77,208,101,223,247, 18, 68,
+214,188,121,245,163,181,135,127,154,221, 14,224,128,131,214, 97,136,110,212, 84, 74, 15, 93, 57,169,172,222, 95,173, 86,206,175,
+110,173,162, 61, 86, 24,233,170, 86,155,191,114,212, 62,234,187,214,167, 31,222,218,216,254,235,221, 87,111, 44, 44,156,223,169,
+111,194,129,  4,240,127,161,119,220,110, 64, 12, 45,106,147,237,190,169,201,250,163,163,135,141,118,163,144, 43, 84, 43, 47,213,
+230,107,245,198,227,129,107, 79,230,198, 19, 72,190,234,  2,118, 90,170, 45, 25,221,103,  7,205,  3,219,181,170, 47, 94,128,119,
+  6, 71,133,164, 77, 49, 55,117,  6,165,108, 94, 95,218,124,122, 63, 64, 82,169, 88,202,151,224,110, 25,154, 89, 62, 67, 95, 13,
+ 33,254,224,181,247,225, 31,253, 40,104,118,141,140,156,  1, 96,  8, 79, 11,162,191,141,163,239,246,189,189,187, 17,177, 98, 61,
+ 40, 77,227, 32,147, 82,247,205,167, 99,  9,254, 98,147, 61,136, 24,207,205, 84, 33, 14, 46, 42, 66,241,234, 41,161,219, 19,194,
+161,136,164,180,240,185, 95, 11, 22,201, 36,170,192,  9,245,220, 19, 40, 66, 10,191,100,153,129,211,142,207, 78,230,245, 52,164,
+126, 57, 55,166, 78,230, 38,180, 23,102,132, 66, 65, 48,156, 63,110,255,126,231,183,245,173,110,223, 75, 67, 29, 45, 41, 16,120,
+ 68, 45,136, 74, 77,167,219,178,154,223,174,255, 82, 72, 21, 87,170,239,117,122,241,199, 63,125, 39, 64,166,187,206,142,237, 39,
+159,253,120,171,252,213,180, 50,159, 42, 45, 23,150, 63,185,241,224,231,123,239,252,186,188,178,240,245,194,203, 87,204,163,141,
+181,227,237,150,103, 94,158,170,230,146, 41, 56, 19, 78,159,117, 67, 23,170, 55,190, 86, 78, 37,151,  1, 95, 98, 65, 47,246,220,
+ 30,228, 87, 72,117,240,105, 67,148,183,157, 62, 84,240,249, 92,254,242,133,218,131,253, 45,100,  0, 70,  1, 92, 82,146,242,236,
+169,211, 29,187, 19,113,177, 56, 22,245,125,248, 12,134,163,116,134, 90,202,126, 23,  9,181,196,168,225, 94, 89,  2, 67,135,172,
+145, 98, 39,162, 98,155,220,128, 73,106, 46,240,124,143, 86,  1,131, 19,103, 94,222,206,138,121,225,192,183,254,199,179,227, 40,
+100,130, 13, 80,134,186, 11,156,121, 57, 90,  1, 18,104,199, 17, 53,157,176,203,204,216,233,242,108, 90, 86,118,247,118,  5, 34,
+157,135,  1,118,102,232,106,100, 57,180,104, 41,160,224,140,105, 53,169, 62, 96,220, 95, 19,237, 19,232, 71,  1, 34,  0, 28, 41,
+233, 51,118, 96,115,163, 39,120,115,114,138, 86, 41,206, 53,123,  6,146,244, 49,235, 36, 84, 52, 60,136,254, 21,128,168,235,249,
+109,155, 12,195,113,236, 38,118,236,116,113, 26,234,132,118,253,153,164, 43,218, 96,173,134, 90,137,105,128,  4, 92,118, 24, 32,
+206, 27,  7,142, 28, 42, 36, 78,112,168, 16, 66,112,228,111,152,128, 11, 71,132, 24, 84,  8,212, 77,128, 24,234, 97,226, 71, 89,
+ 27, 72,215,180, 89,126,219,137,157, 56,110, 28,158,247,117, 34,238,142, 29,251,251,190,247,125,190,247,123,222,231, 25,215,223,
+169,209, 60,112,151, 27,  9,244, 98,199, 77, 50,123,253, 78, 84, 82,206,124,106,255,145, 72, 62, 37,112,200, 28,146, 84, 54, 91,
+148,  5,226,145,129, 68, 24,107,155, 80, 89,166, 71,164, 23, 63,160, 92,145,230,240, 89,223, 39, 67,118,133,  8,137, 82,100, 46,
+181, 80,119, 26,220,213, 74, 81,197,114, 76, 58, 48,101, 87,141,241, 33, 42,253,  1,118,195,242,134, 99, 79,240,160,169, 44, 34,
+201,212,182,138,221,116,114,182,108, 61, 22,153,103,198, 54,146,212,  1, 63,100, 42,219,148,102,224,157,186,110,219, 23,252,240,
+168,224,200,158, 37,130,143, 77,137,199, 70, 66, 35,222, 43,229, 30,252,204,235,115,229,139,186,192, 88,116,211,178, 77,219,237,
+ 32, 87,  1,210, 48,155,219,167,221,107,224,143, 41, 14, 69, 49,148,121, 82, 33,147, 13,242, 36, 27, 34,169, 69, 35, 34,208,116,
+ 76,  9,  3, 26,211,137, 43, 49, 91,200, 22,135,205, 45,153, 87, 76, 22,151,  4,154,140,164,246,252,213,245,129,107,125,254,217,
+237,197,249,121, 93, 79,124,187,179,163,170,138, 26,149, 52, 57,162, 42,145, 66,177,160, 76,136,175,223,184,190,123,247, 71,252,
+ 54, 26,149, 56,196, 11, 44,241, 70,167,181,136,215, 61, 55,212,182,125, 32,179, 64,  7, 34,192,245,184, 24, 65,253,153,213,167,
+ 62,249,240,131,119,183,182,222,120,245,198,149,181,117,160,134,163,226,177,227,244,136,106,142,100, 77,181, 91, 73, 83,164,  4,
+214, 46, 73,120,  9, 72,133,184, 91,215, 13, 97,254,123, 52, 57,  5,198,152, 99,255, 23,150,250,  3, 90,150, 35,228,255, 64,117,
+ 78,162, 65,115, 63,179,232,253, 91, 63, 42,156, 28, 32,168,229,211,171,189,129,131, 28,131,  0, 93,172, 29,112,103,157,147, 58,
+151, 50, 59, 45, 86, 80,161,173, 38,240, 14, 18, 63,233,187,145,168, 68,127, 24,198,115,123,193,206, 11, 72,164,214,174, 54, 59,
+ 85, 12,235, 92,106,190,110,215, 73,122, 41,170, 20, 43, 69,108,164,114,153, 11, 21,171,204,189,163, 54,139,196,246,155,157,250,
+128,178, 25, 17,117,150,210,185,110,207, 65,212,110,119, 59,166,221, 42,156, 28, 98,236,214,243,235,150, 99, 45,166, 23,211,  9,
+  3,219, 85,118, 90, 23,146,113, 29, 57,  3,243,195,116,154, 51,201,153,118,183,157,159, 89,217, 59,188,143, 24,129,237,252,253,
+253, 95,  0,168, 75,149, 82,169, 92, 34,198, 20,159,168, 99,166, 97,145,148,137,212,248, 44,160,180,145, 74,231,206,175,104,146,
+220, 31,120,165,218, 81, 46,147,221, 63,222, 71,252,221,126,235,163,159, 31,236,174, 45, 93,198,130, 60,174, 62, 66, 86,221,200,
+ 93, 89,202,228,255,122,244,199,164, 28,119,122, 14, 54,203,155,249, 13,172,189, 74,171,242,240,244,161,221,163,192,132,155, 35,
+188,108,172,108, 46, 27, 89,211,177,240, 89, 48, 68,143,155,167,118,223, 94,157,201, 19, 39,218,117, 72,252,157,139,191, 24,105,
+124,246,107,151,174, 86, 91, 85,228, 98, 73, 32,247,224,164,150,212,181,  4,151,110, 93,106,161, 36,255,153, 39,106,205,195,185,
+204,211,107,106, 58,118,209, 15, 89,157,144,231,  9,136, 31, 92,235,160,206, 85, 38,159, 18,119,129, 73, 89, 35,149, 66,  6, 61,
+ 68, 66,118, 99,178, 26,211, 38, 85, 69,139, 39,147,122, 66,215,227,170,220,170,214,239,124,247,219,157, 95,255,252,187,105,121,
+146,132, 52,226,178, 53,162, 28,145, 98, 97,  5,241, 61, 34, 10, 63,157,252,243,195,233,222,205,229,151, 22,165,169,215,182,223,
+199,205,171,183, 76,117, 75, 62,255,229,188,253,125, 99,103,251,211,111,190,186, 93,248,122,247, 82,231,133, 23, 63,190, 86,250,
+226,248,205,123,239,188,247,220,219, 89, 49,253,160,177,183, 87, 63,152,158,156,189,168, 79, 59, 64, 22, 84,242,240,151,141,  5,
+147, 37,248,243,153,101,198, 54, 98,102,106, 22, 33,  5,227,139, 44,107,118, 45,234, 41,165,230, 58, 42,241,165,207, 25,119,127,
+191, 71,226, 30, 19, 17,140, 75,223,  3, 68,112,171,102, 13,171,249,149,203, 47,151,234,101, 93,213,153,208,238,135,199,181,117,
+220, 57,107,100,241,157,233, 67, 12,  7,136,140, 23,102, 87, 26,157, 22,158, 29,136, 59, 35,152, 76,  8,225,100, 60,  5, 88,173,
+107,250,220,244, 66,211,106,140,188,143, 88,134,146,245, 33, 36, 67, 55,144,221, 55,179,155,165,230,169, 79,210,  8,126, 96,237,
+132,235, 98,114,156, 28, 92,195, 82, 66, 35,147,107,126,137,192,150,143, 42, 15,212,157, 20, 18,106,181, 10,139,202, 80,111, 15,
+ 85,208,184,201,153,253, 76, 72,103,147,218,158,207,  6,180,212,124,142,175,124,227,255,141, 59,132,161, 77, 69, 33, 70,201,124,
+ 17, 38, 79,205,172,132,  2,228,207, 47,201, 18,  5,161,255,  4, 32,234, 90,122,219,168,194,232,248, 49, 51,126,204,120,226,146,
+184,142, 67,109, 37,  4,  7,146, 10, 82, 32,108, 10, 84, 77, 75, 85, 85, 40, 82,139, 42, 22, 93,177,  0,254,  0, 27,164,110, 88,
+ 35,216, 33, 80,251,  7,144, 16, 43, 36, 84, 36, 22,149, 44, 33, 85,  1, 41,173, 64, 40,113, 72, 49,182, 83, 59,177, 61,126,204,
+120,222,119,248,206,157, 68, 72,217, 57,126,220, 59,247,123,222,115,206,119,226,223,227, 24,251, 43,177, 19,109,201, 24,183, 67,
+159, 75, 72,  2, 97, 60,147,153,165,196,138,235,169,128,199, 37,112, 96, 63,227,228, 49, 56,184,152,136, 12,215,115,184,128,177,
+ 16, 93,224,  8,255,123, 80,198,245,202,233,108, 72,203,197, 42,157,242,169, 13,198,  1,125,194, 43, 11,235,157, 97, 39,129, 93,
+166, 53,249,209,241, 11,248, 13, 61,  4,112,152, 95,200,205, 83, 50, 14,135,238,218,  2, 39,102, 56,174,105, 90, 19,250,241, 35,
+107,196,141, 48,193, 39,142,240,185,229, 44, 88, 42, 86,245,105,143,138,122,232,241, 71, 50,189, 97,  4, 10,141, 16, 67, 40,154,
+152,224,171,114, 14,109, 86,136,249, 81,209,164,138, 66, 50,224, 65,242, 84, 97,159,183,141, 48,108, 47, 76, 73,105, 46, 39,130,
+155, 14,244,230, 18, 48,179, 36,203, 74, 82,194,114, 25, 37,197,230,148,130, 46, 74, 51,126, 49,137, 57,150, 82,146,188,188,160,
+164, 19, 73,  9,240, 68,114,205, 96, 15, 98,196,  3,244, 94,158, 54,219,191,214,106, 15, 30,252,244,251,206,159, 87, 54, 47,107,
+138,242,176,246, 80,203,202,178, 20, 79,165, 18, 42,135,198,183,155, 79,175, 93,189, 52, 53,198,207, 58,109,138,235, 23, 86, 87,
+198,227, 17,121,166,120,  8, 54, 22, 25,172,105,251,134, 69, 81, 52,244,188,208,241,248,229, 45,159,224,126, 70,205,221,251,230,
+235,209,200,184,119,255,126,173, 86,163, 77,125,127,235,189, 59, 31,220,108,181,234,134,209,215,148, 20,200,221,114, 92,194,196,
+ 11,250,255,168,242, 32,207, 30,218, 46, 72, 20, 20,177, 37,112,168, 99,185, 44,149, 11, 73, 53, 67,165, 37,128,249,156,126,  0,
+188,153,143, 76, 16, 95, 23,184,204,154, 50,215, 15,117,203,148,168,226,  9,134,131,105,223, 97, 78, 65, 41, 90,190, 91, 45,189,
+ 60,164,116, 19,106,242, 48,  3,112, 49, 56, 87, 88, 76,136,190,135, 33,218, 20,185, 79, 25, 50, 40,158,148, 20, 88,227, 33,151,
+  4,215,205, 65,113,166,244,225,187, 31,255,219,109,144,243,162, 66,138, 28,171,110,244, 86, 74,171,250,164, 79,245,193, 98,225,
+  5,122,184, 34,159,138,181,116,118,249,160,179,175, 41,121, 11,148, 69, 63, 43,229,110,221,188,173,247,245,214,241,161,  9,109,
+ 12,167, 92, 56,215, 31, 29,189,189,246, 78, 79, 63,162,168,163,166,178, 92, 89, 77, 80,101,245,197,114,117,123,239, 17, 61, 60,
+ 50, 96,219,119, 77,219, 64, 32,141,129,229, 23,130,150,  2,198, 83, 42, 41, 11, 72, 33,141,243,149,243, 79, 14, 30, 99,104,173,
+ 99,247,134,199,100,159,160,212,170,179,197, 74,101,208,235,110,255,245,232,104,216,189,248,210,198, 94,235,111,138,232, 90, 70,
+203, 43,103,234,135,187,175, 45, 93, 56,155, 47, 12,205, 33,121,129,242,220,185,221, 86, 61,  9,156, 82, 88,158,171,200,208, 36,
+232,143,141,209,254,225,110,163,219,120, 99,249,245,118,175, 73,139,186,177,113,157, 92,137,229,216,165,252,188,  4, 42,123,210,
+114, 76,219,115, 96,243,192, 92, 57,  0,132, 49,246,156, 58, 75,  1,192,176,141, 92, 90, 85, 51, 10,101,187, 74, 58, 75,139,165,
+253,118,221,201,196,233, 61, 47,176,194,134, 38, 88, 83,193,179,  5,204,138, 99,156, 62, 18, 17, 51, 35, 56, 90,156,247, 35,133,
+ 72,171,132,182, 69,161,248,235, 45,196,253,132, 44,228, 10,233,226,104,218, 57,248,167,243,219,126,115,167,217, 61,118, 28, 23,
+138,148, 84,146,  7, 22,162, 56, 46,165,148,148, 56,175,204,190,185,124,123, 50,238,125,249,248,231, 35, 91,255,116,105,235,226,
+229, 59,217, 79, 10,119, 23, 63, 95,175,172,106,223,106,221, 31, 26,223,125,245,133,173,  4,105, 85,  9,115,177, 39,251,191,188,
+ 26,223,220,250,232,198,221,239, 63,107,255, 17,108, 93,185,213,109,108,255,120,184, 19, 36,228,235,243, 43,134,  7,177,198, 32,
+ 22, 46, 22,202,157,  1,249,229, 25,203, 54,105, 93,200,166,173, 73, 90, 76,175,149,215,158,233, 29, 96,124, 35,132, 55,135,180,
+ 93, 90,125,107,183, 93, 23, 69,192,202,242, 25,109,226,154,115,188,172,167, 12,160,126, 88, 15,192,170,163,183,163, 12,226,140,
+ 31,176, 79,233,200,105, 89,173, 63, 62, 22,209,178,164,236,164, 90,111,239,  5,130, 79,249,216,213,245, 77,170,231,128,228,  9,
+ 65,192,166, 83, 59,177,199,232, 37,248, 60,245, 12,152, 36,201,213, 18,  5,131,  1, 71,  9,  2,156, 26, 93,224,163,209,199,207,
+ 52, 85, 15, 12,106,170, 62,207,147, 64,210,142, 69,  9,124, 36,  4, 39,208,211, 47, 99, 98,146,103,147, 81,  3,138,227,241, 63,
+ 74, 58,  3, 62,191, 11,237, 37, 70, 65, 75,199,109,  4, 59,213,229, 59,233,145,199,133,248,  9,127, 41,140, 24, 60,120, 13,114,
+ 35,129, 95,202, 47,140, 32, 88, 13,223,203,  7,166,250,188, 35, 23,251, 79,  0,162,174,165,183,141, 42,140,142,237,121,250, 49,
+ 30, 59,142,147,180,117,210, 52,  1, 66, 30, 80, 76, 34, 18,146, 34, 26,145, 72,236, 90,  9,118, 72,252,  1, 54, 32,193, 50, 98,
+ 89,177, 98,193,134, 93,  5, 18, 72, 32,118,116,  1, 82, 87,  5,129,  4, 18,155, 54, 24,170,214,177,131, 29, 63, 38, 19,199,118,
+ 60, 79,143, 57,223,189,  9,172, 60,155, 25,207,220,199,119,191,243,221,115,207,249, 63,190,  7,204,239, 49,196, 72, 58, 87,  0,
+227, 21,118, 42, 54, 48,174,143,112, 33, 35, 36, 92,248,116,209,163,241, 43,137, 74,223,237,197,201, 27,132, 83,185,185,221,210,
+ 57, 18,192, 39,144,  9,195,212,130,217,109, 55, 58,117,100,193,196,158, 12,217,100,182,233, 56,162,166, 36,241,239,164, 97,194,
+248, 65,200,208,159,153, 92, 80, 36, 21,112, 44,  8, 92, 31,121, 42, 99,218,224,177,154,172,112,254, 53, 91, 63,  9,106,169, 82,
+124, 56,226, 55,162,101,181,211, 51,139,172, 20,153, 26,103, 32, 12,201,202, 89,210, 60,  4,104, 46,116,201, 15, 30,179, 88,131,
+187,240,194,170,  2,108,225,219,110,159,212,121,  4,214,133,172,200,162,201, 73, 18, 96, 27,210,224,224,166, 13,236, 83,168,250,
+ 35, 81, 49, 71, 33,142,171, 68,226,244,170, 68, 59,159,164,216,136, 62,115,  4,  7, 49, 23,235,148, 31,181, 29, 32, 62, 50,129,
+ 39, 99,154, 88,132,220, 75,197,136, 76, 92,215,232,198, 43, 27,171, 47,173,253,244,203,239, 47, 23,139, 51, 87,231,191,249,238,
+158, 31,198,194,161, 24, 14,201,140, 33, 24,138,205, 86,167,248, 98, 81,215,141,  7, 63,255, 58,150,205,124,114,231, 78,187,121,
+ 84,169, 86,226,113,153,237,187,114, 54, 61,137,208,224, 66, 67, 19,  0, 61,224, 13,132,225,250,218,245, 27,155, 27,123,123, 31,
+149,203, 37,219,177, 42,149,191,126,188,255, 61,  2,250, 91,183,223, 44,149,126,139,171,163,172, 33, 41, 10,222,153,237,237,179,
+163,162,100,218, 35, 70,207,149, 36, 88, 58,199,209,  6,179, 41,136,132, 12, 46, 32,187, 32,149, 64, 74,187,169, 12, 69,116, 76,
+230,157, 69,178,120,146, 56,136,208, 78, 78, 74, 82, 83,146,238,133,110, 74, 73,150,205,199,180,239, 75, 27,216, 67, 38, 69, 75,
+ 68, 85,172,116,128, 68,219,215,111,150,155, 85, 70, 77,163, 35,245,104,219, 75,217, 43,182, 55, 72, 42,  9, 52,240,246, 11, 59,
+120,164,217, 53, 75,213,125,210,213, 34, 55,203,163,102,167,158, 78, 26,102,167,129,117, 66,140,201, 39, 93,147,233, 60, 19,133,
+  8,128,199,245,200, 77,165,211, 63,126,246,242, 66,165,121, 96,157,152, 17,159,186, 12,179,  8, 19,181,239,216,155, 75,235,115,
+151,230,244,164,  1,  4,242,180, 85,102, 30,129,163,214, 73,  3,113,115,253,185, 13,100, 15,249, 76,174,218,170,168, 10, 63, 33,
+128,213, 74, 40,228,166, 49,130,229,152,140,135, 52,172,250,214,242,150, 38, 41,255,152,181,124,102,162, 55,232,162,  1,110,172,
+108, 90,167, 22,210,142,122,171, 30,146,193,158,240,218,210, 86,179,211, 64, 26,158,211,199,124,207,173,153,117,204, 85,199,115,
+ 15, 26,149,190,131,175, 35,224,210,181, 79, 49, 22,232,192, 45, 59, 43, 10,192,186, 50,187, 12,108,182, 56,189,248,231,225, 62,
+134,100, 82, 73,181, 59,173,129,221,195, 91, 21,198,175, 28, 52, 15, 60,151,182,172,119,215,118, 87,231, 87,159, 30, 61,  1, 38,
+204,235, 99,128,240,220,154, 25, 67, 25,161,191, 71,185, 63,159, 80,126,207, 62,166, 99,109,241,241, 25,193,155,122,117,156,228,
+124,125, 55,130, 97, 28,  9,207,173, 56,254,115,217, 99, 51, 59,100,167, 46,168, 67,209, 69,214,220,254,145,241,224,176, 93,106,
+251,134, 31,241,163,237,138,213,235,  7,129, 77,230,148,136,233,184, 32, 13, 76,164, 19, 46,243, 32, 76, 41, 50, 80,101,205,140,
+182,122,214,231,165, 31,214,211, 43,239,205,191, 93,184,123,243,238, 27,223,126,245,248,203, 15,191,254, 64, 24, 19,238,189,251,
+169,154,209, 10,250,164, 22,147, 13, 81,239,140,122,165, 71,247,151,119,118, 54,251,219,239,255,241,206,222,244,199, 87,141,236,
+103,143,190,176,194,240, 86,161,232,142, 28, 38,227,154, 62, 27,244,109,207, 77,199,147,103,174,131,213, 17, 88, 16,241,154, 60,
+ 29,153,243,  4,167,173, 51,178, 55,213, 87, 15,143,107, 30,  2,151,168, 50,147,238, 76, 58,110,212,145, 77,147,182,  1,  1,231,
+231, 47, 47,250,129,187, 52,179,132,136, 92,156, 47,246,237, 65, 90,211,231, 38,174, 17,196,244,108, 82, 29, 71, 54,237, 15,144,
+ 74,  2, 18,229,141,137,135,213,135,172, 90, 67,230,204,204,120, 28,249,153, 56,153,158, 66, 30,240,250,173,221, 39,165,191,179,
+233, 92,253,184,230,122, 54,218,204, 39,233, 89,162,198,158, 49, 66, 23, 23,241,194,168, 96,235, 49,177,179,140, 68,118,194,200,
+ 11, 35,198,243, 38,146,  8,201,149, 16, 89,121,132,  9,229, 98,213,207,165,114, 64,159,164, 85, 71,226, 66,  1,139, 93,164,253,
+ 71, 34,145, 84,186,136,  8,124,123,153,251, 30,141, 46,194, 47,227,192, 25,  9, 35,147,200, 58,129,205,125,161, 79,  7, 29,190,
+114,207,230,103,  1,116, 40, 61, 29, 13, 53, 57,241,175,  0, 84, 93, 75,143,219, 84, 20,142,223,118,156,216,241, 36,147,215,180,
+ 51, 81,146,182,104,250, 80,135, 81, 91, 22,101,129,104, 97,129,170, 22,196,  2,  9, 65,  5, 66,229,  7,176, 64, 32,177,131,174,
+216,179,132, 63,  0,108,144,232,130, 17,237, 12,168,116,131, 88,160,106, 58,165,180, 37,208,164,121, 59,126, 36,177,227,132,239,
+ 92,103,  1, 82,148, 77,156, 40,190,199,247,156,239,156,123,206,247,241,255, 81,  2,143,211,115, 38,253,176,124, 24,232, 62,169,
+ 55, 36,241, 63, 33,215, 24,121,193,239, 15,188,129, 27,142, 16,209,177,212, 65, 52,137,161,123,146,234, 48, 44,135,161, 63,  4,
+ 48, 30,149,179,229,191,123,127, 33,152,  9, 84, 41,166, 58,138, 76, 13,  0, 60, 41,140, 36,120,127,234,  6,193, 56,102, 78, 96,
+  5,107, 97,191,121,119,232,245, 99,166, 28, 86,102,141,143, 56,145,215, 76,129,166,  5, 65,164,142, 73, 66, 36,  9, 63,244,168,
+222, 66,170,158, 20,111,  1,196,240,111,227,233, 86, 18,126, 11,  3,138, 76,140, 52, 63, 98, 43,131, 21, 97, 20,254, 33,233,123,
+  4,190,227,219,128, 66,149,194, 81, 70, 56,206,154,200,217, 48, 85,192,104,184,153, 40,  1,157, 61, 16,130,101,105, 50,113, 99,
+205,194,141, 92,  5,  8, 14, 72, 87, 21,216,208,169,200,  3,219, 18, 75,210,156, 38,155,152,133, 22, 41,141,203,164,  4,211, 64,
+142, 47,100,116, 92,198, 17, 45,191,136,187,139,218,205,214,133, 23, 47,228, 45,115,119,119,175, 92,200, 31,171,148,116,124,170,
+176,240, 78,197,184, 16, 43,177, 90, 40,113,156, 50, 24,250,175, 94,190,146, 59, 92,189,244,202,107,  8, 37, 83, 63,130,103,  6,
+172,  3, 12, 55,117, 49,191,162,148,243,106, 57, 43, 31,194,123, 81, 46,174, 42,165, 66,218,182, 59,240,202,181, 74,249,227, 15,
+ 63,184,126,253,179,115,207,158,186,245,227, 13, 44,246,214,201,227,  1,185,105, 46, 10,196,233,148, 58, 44, 17,224, 67,170,176,
+ 51,248, 79,131, 98,156, 42, 75,  0,101,154, 34, 82,179,157,192,171,226,  2, 89,133,174, 10, 70, 82,180, 82, 98, 70,151,204,148,
+148,  2, 72,214,101, 51, 45,231, 86,148,156,165, 25,112, 93, 73, 37,210,230,195,185,237,207,156,201,124,252,212,251,199, 84, 51,
+ 72,143, 52, 89,227, 56,161, 90,168,225, 75,  2,227,116,133,189, 90,253, 54,227,216,156,167,147,233,164,146,148,101,173,239,246,
+ 96,169,174,219,197, 82,239,222,189,217, 30,182, 53, 69,247,167, 30, 80,243,169,141, 77, 36,189,  8,170,138,152,132,115, 63,148,
+221,160,254, 95, 82,147,136, 84, 81,221, 62,114,166,209,123, 76,  7,110,190,109,233,217,237,218, 54,174,124,218,110,226,167,224,
+ 73, 97, 38,228,215,216, 50,223,221,185, 17, 74, 68,175,215,113,186,133, 76,161, 94,168,192,190, 64, 97,186,172,223,222,191,253,
+184,253,232, 97,235, 17,199,142,167,120, 94,162, 97,200,233, 24, 65,  5,  9,129,235, 59,150,110,192,107, 28, 52,238,223,250,125,
+175, 86,172, 35, 67, 11,  2, 79,163, 49, 97,165,152, 41,  0, 94,121,163,254,138,145, 67,106,125, 98,253, 24,128, 23, 31, 69,240,
+200, 57,195,218, 92,175,215,139,213,197,124, 86,207,111,240,139,232,153,181, 35, 79,250,205, 92, 42, 11, 24,112,245,229,183,171,
+197,245,246,  0, 89,172,247,219,253, 95,109,191, 15,  8,111, 38, 13,106,198, 93, 44,206, 28, 63,171,176, 89,205,131,198,189,162,
+185,186, 86, 90, 63,187,245,252, 65, 99,255,235,189,111,224, 41,224, 71,138, 86, 25,238, 41,156,197,218,  6,124,201, 42,174,229,
+214, 94, 58,125,145,148,115, 38, 62,219,250,115, 82,238,192,238, 20, 19,140,227, 87,140,169, 99, 68, 41, 33,136, 49, 39,240, 18,
+  2,178,187, 38,134, 57,216,131,159, 45,254,232,186, 63,183, 31, 56,115,106,241, 25, 18, 80, 75,248,115,160,117,146,135, 65,118,
+ 23, 44, 88,100,143, 98,133, 72, 18,164,  6,212,196, 66,100,101,121,167,121, 15,191,118, 41,127,186,118,237,245,232, 78,226,157,
+157, 55,222, 61,255,126,226,124, 98,231,242,151,146,161,244,130,201, 71,191,124,245,230, 15,159,191,119,243,139,134,227,  7, 82,
+212,250,246,167,139,159, 60, 39, 39,178,215,190,255, 52,119,244, 92, 69,203, 79,253,158, 61, 11, 85, 94,134, 79,118, 38,206,112,
+ 50,146, 36, 97, 68,162,219, 52, 85,158, 53,172,180,162, 43,130,140,  7,102,171,122,146,102,249, 56, 18, 90, 96, 98, 25, 20,203,
+101, 54, 44,221, 25,117,241,242,166, 94,172, 72,194,168, 23,196,230,224, 73,207, 29,192,160,216,176, 15, 91, 15, 66,210, 65, 24,
+183,134,196,123,145, 77,174,212,139,117,234,145,157, 76, 68, 86,183,113,125,219, 84, 13,137, 77, 92, 47,251, 82,168, 32, 67,141,
+146, 52,228,241,103, 11,219,164,239,244,240,168,108, 30, 62,113,245,133,183,  0, 74,144, 52,140,136,217,145,199,243,156,146,211,
+240,234,237, 97,  7,171,154, 55,242, 88,176,190,211, 69, 14,209,113, 59,196,209,204,104,135,107,249,122,199,110, 15, 93,219,243,
+ 29,248, 32,219,165,131, 34,224, 21,114, 58,212,247, 49,179,180,140, 12,248,184,  0,  8, 83, 74,102,105,233,156, 89, 44, 79, 42,
+154,174, 25,212, 94,165, 24, 51,210, 53, 28,187,227,145,196, 41,203,122,  9, 27, 47,134,141, 16,222,  2, 50,215, 60, 70,194,255,
+ 10, 64,212,185,196,182, 81, 69, 97,120, 60, 51,158, 25,219,227, 55, 99,199,169,147,216,  6,220,244,161,180,137, 80, 27,218,170,
+ 44,216,176,232,190, 21, 18,130, 37,123, 36,118,168,176, 66,  8, 33, 54, 72, 32,118, 21, 91,186, 64, 32, 22,160, 32, 65, 82,136,
+  4, 66, 85,195,171, 69, 10,164, 73,147,216,158, 56, 99,143,159, 99,207,152,243,159,155,132,173, 21,197,158,185,247,158,115,238,
+121,124,255, 73,252,142,124, 28,217,151,140,153,149,153, 84,165,162,205,150,167,  0, 80,145,241,255,175,174, 74, 98,246, 16, 14,
+197,138,231,233, 34,172, 65, 83, 52,240,143, 68,250,160,191,202,211,158, 66,145, 85,225, 33, 93,173,209,169,115, 33, 80,112, 64,
+  1,145,  8, 68, 71,191,232,233,151,142, 97, 10, 18,152, 12,232,  8, 22,250,106,199,215,  5,180, 31, 41,225, 92,106, 42,202,135,
+ 95, 56,111,153, 91,157, 98,186, 57,141, 74,157,203, 88, 49,100,  2, 88, 69, 47,200,197,167,192,163, 56,241, 93,236,  0,189, 49,
+224,153,241,104,154,137,  8,136,121, 14,187,205,102,183,193, 80,114, 41,162, 26,213,226, 60,189,181, 35,148, 36,247,151, 31, 75,
+ 29,194,241, 64, 58,220,239, 57,  3,155, 60,127, 33, 31, 67,146, 61, 12,141, 83, 69,166,203,154, 44, 64,  2, 28, 75,241, 88,211,
+ 68, 32, 98, 38, 44,159,128,238,151, 33, 87,104, 90,237,230,185,179,213,226,116,126,229,187,111, 47, 61,183,168,133,149,135,143,
+ 30,137,129, 85,  9, 12,234,209,194,185,249, 91, 55,111,126,249,197,221,126,215,189,253,206,237,143, 62,120,255,242,242,114,109,
+111,111,243,241,182, 10, 48,128, 15,171, 55,241, 52, 53, 48,180, 64,131,192, 21, 58,238,233, 44, 71, 12,245,202,181,235,247,214,
+238, 25, 70,228,213,215, 94, 47, 84,150,103, 78, 37, 87, 86,190, 57, 93, 61,111, 24,230,218,250,125, 63,  8,143,198,130,228, 42,
+243, 36, 44,154,201, 24,248,131,185, 69,158,128, 69,158,  7,191,223,159,120, 35, 97,  5, 78,168,177,104,189,140,234, 10,185, 46,
+ 49, 61,139,238,157,112,200,140,202,113, 83,214,227, 33,218,179, 64,211,203, 10,198, 82, 38,126, 42,146,233,122, 46,133, 18, 24,
+ 42, 65,125, 89, 54, 99,  9,187,125, 48,166, 24,223, 72, 26,154,126,208,170,107, 64,242,104, 49, 84,204,146, 20,197,211,162,195,
+141,134, 66,233,120,154,194, 82,250, 95, 77,183,169, 41, 74,119,232,210,145,214,100,125, 56,238,145,  3,130,252,194,160, 51,103,
+149,246, 14,159,208, 65, 60,149, 45,238,183,106,205,142, 67,251,144, 17,222, 81, 50, 89,228, 30, 42,133,114,117,246,204,249,179,
+139,179, 87,206,252,184,186, 74, 15,108, 59,117, 85, 13, 55,219,135, 41, 51,185, 99,239,122,227, 33,157, 67,219,181, 41, 92,160,
+ 31, 57,151, 43,229,211,185,189,195,125,122, 59,179, 79,205,209, 39,180, 88,232,214, 64,193,124, 52,102,229,107, 67,142, 80,  0,
+184,177,185, 97, 37, 50, 91,141,109,218,168,244,117,207, 76,149,215,255, 90,231,230, 13, 24,193,116, 36, 77,230,219, 74,100,147,
+177, 36, 89,156,165,202, 66,  3, 74, 35,173,210, 76,181, 63,234,255,252,231, 47,237,126,231,242,233, 75,116,173,113, 58,142,  2,
+ 82,147,239,246, 58,244,117,133, 84,174,222,218,183,157,198, 82,249,  2,247,195,140,235,  7,187,189,118,123,  4,221, 96,213,  1,
+ 31,122,152, 49, 83,205,174, 67,143,207,121,115, 63,170, 27, 47, 93,124,241,251,223,127,160,103,161,107,  7, 45, 87, 50,146,162,
+152,174, 26,213,243,215,166,164,126, 95,242, 60, 28,136, 16, 51, 35,197,200,123,112, 68,231, 22,105, 80,159,227,247,137,175,236,
+ 55, 18, 53,111, 72,182,205,243, 67,105, 61, 17,209,236,199,142, 75,246,125,  0, 92, 40,136,  1, 67,122, 11,140,215, 18,115,137,
+244, 23, 81, 67,182,148,153, 15, 55, 86, 15, 61,247,147, 11,111,100,223, 91,124,121,233,149,221, 94,243,243,187,119, 58,159,254,
+182,185,117,255,179,157,213, 59,127,124,245,188, 85,186, 49,123,209,247,251, 31, 63,252,186,144, 46,166,157,206,211, 55, 94,136,
+255,154,121,247,239, 55,223,190,254,214,206,147,127,214,236,159, 22,243, 11, 57,157,150,111,162, 28,241,186,132,226, 69, 40, 25,
+ 79,152, 90,164,231, 13,124,192, 74,189,186,115, 32,236,174,168,196, 94,157,191, 74,175,133,174, 59, 28, 76, 74, 86,194,162, 69,
+193, 49,132,142,150, 68,215,125,148,214,  7,189, 30, 69,202,137,108,192,169,110,122,248, 33,224,225, 18,119,229,  5,207,230, 43,
+ 20,200,143,153,  3, 74, 91, 17,214,  3,221,135,128, 66,251,248, 48,196, 17,113,137,130,134,122,173,150, 50, 81,143, 81,195, 97,
+ 10,225, 31,252,251, 64,215,141,  9,152,231, 67,193, 96,128,252,136,200,153,112,183,202,  0, 36,  9,  1,  5, 64,  5, 46,130, 64,
+ 40,186, 85,223,130, 56, 20,157, 17,206,201, 12,  6,125, 80,210,  2,238,160, 65,218,205,162,107, 43,108,148,  4,140,138, 80, 67,
+ 98, 30,179,170, 98,230,110,  0,205,119,134, 69, 83, 84, 36, 38,105, 93,  8, 84,249,228,235,166,179, 69,183,143, 93, 81,201,149,
+231,172,242,174,189,173,162,231,197,255, 79,  0,174,174,165,183,141, 42, 10,207,140,227, 25,143, 51,126,140, 99,215,118, 72,154,
+208,148,128,154, 20,167,  9,134,150,151,212, 72,172,160,165, 74,120, 72, 44, 64,236,248,  5,136, 13, 44, 34,129, 88, 33, 54,108,
+ 17, 15,  9,138,  4, 18,123, 32,162, 43, 86, 36,149,234,180, 73,133, 73, 83,146, 52, 41,141, 31, 99,103,102, 60,115,199,230,124,
+103,156, 70,194, 75,123, 52, 30,205,189,247,156,239,188,190,239,152,159,128,105,210,  2, 27,114,133, 94, 24, 16, 48,146, 23,255,
+235,139,199,136,  1, 10,173,232, 94, 71,238, 89, 86, 58,129, 47, 29, 67,123,102,247, 98, 57, 38,218,148,131,170, 78,119,  3, 55,
+ 64, 88,207, 57, 10, 22,122, 76,141, 21,126, 40, 14,200, 24, 57,122, 29, 49, 85,247,145,174, 66, 89,147, 57,129,251,175, 75,234,
+119,195, 10,203,181, 88, 35, 20, 43, 21, 42,144,  3,164, 11,215,136, 39, 45,187,209,207, 38,114, 99, 99, 84,137,114, 85,173, 95,
+170,237,171,147,135,230, 10,195,223,104, 21,100,153,115,152, 94, 10,238,134,152,184,156, 98,186,180,158,174,219,117,191, 11,250,
+ 98,208, 76,  6,130,108,229,177,188, 12,167, 43, 41,100,163, 93,144, 53,141, 30, 42,230,104, 71,241,  3, 41,156, 96, 98,222,187,
+ 94, 68, 10, 25,229, 32,136, 70, 22,219,118,187,135,135,  4,175,128, 92, 65, 84, 18,136,237,187,127,191,122,249,149, 84, 82,187,
+181,113,253,185,103,231,170, 27,215,  7,162, 93,250,165,144,203,188,177,184,240,246, 59,239,174,172,172, 92,189,250,195,107, 11,
+ 87, 30, 25, 25, 91, 90,250,184, 88, 28,158, 61,119,238,215,223,150,201,115, 42, 93,121,110,102,102,108,132, 66,219, 33,211,200,
+164,147,233, 84,122,136, 12,165,170, 14,186,118,239,226,252,203,183,215,171,107,149, 13, 93, 83, 39, 39, 70, 55,255,186,179,252,
+203,239,229,167,206, 83,176,113,237,218, 31,  3,138,230, 65,204,146,  5,244, 34,125,113,109, 66,174,  2,163, 88,200,167,211, 49,
+246,124,196,237, 10, 88,124,153,138, 32,170,196, 99,146,161, 67,229, 71,139,146,125, 87, 64,  9, 14, 22,  6,164, 63, 53,114,111,
+186,172,199,240,118,105, 43, 88,109, 39, 38, 71, 65,233, 39, 41,173, 78,147,220,159,224, 41,101, 20, 46,152,207, 57,111, 22, 48,
+ 28, 40, 71,  8, 19,145,169,141, 50, 19,  3,253,237, 94,125, 47,155, 42,208,  5, 73,200,140, 40,187, 53,156, 82, 11,220,129,  2,
+ 78,132,245,227,201,208,123,190, 79,187,203, 52,204, 83,249, 83,171,213, 63,195,  9, 12, 58, 54, 18, 56,246,  0, 74,232, 76, 18,
+194,109, 57, 22, 29,170,137,226,227, 55,183,214,108,209,185,178,176,120,176,245,224, 86,245,  6, 60,119,208, 37,136,103,145,173,
+ 20,110, 50,150,104, 34,103,  2,111,238, 10,219,133,250, 71,157, 86, 45,161, 27,152,186,146,228,102,187, 49,148,204,209,106, 18,
+190, 30, 54, 11,102,220, 36,136, 87,154, 46,157,121, 97, 54,216,183,107,173, 58,125, 89, 52,243,190,112, 77,232,240,133,100, 85,
+ 61, 50, 13,197,116,161,152, 41, 84,182, 42,100, 68,171,247, 55, 45,183, 13, 41, 56,186, 73,186,208,118,154,163,217, 17,211, 72,
+ 85,238, 84,200,177,157, 61, 57,181,125,127,251,197,179,207,151,198,166,108,191, 83,111, 60,120,242,209,210,234,230,170, 54,160,
+ 53,108, 11,148, 88,232,218,114,189,158, 32,168, 78, 91, 84,211,226,228,159,232,245,143,159, 24,167, 37,216,169,223,187,185,115,
+219,113, 15,201, 95,182,208,212, 75,182,218, 38, 36, 50, 22,137, 13, 95,200, 82,196, 43,161, 77, 59, 96, 22,223,126, 79,  1, 75,
+ 72,134,130,239, 18, 71,111, 72,185,200,190,250, 79, 45,213,164,131,220, 85, 38, 71,103, 68,123, 55,162, 30,236, 90, 46,186, 90,
+131,110, 39,  0, 43, 10, 46,230,118,111,159,171,144,  9, 77, 77,106,234, 61,215,250,122,189, 82, 86, 71, 63,248,252, 75,103, 79,
+188,245,197,235, 95, 45,124, 63,125,233,177,229, 79,191,253,100,253,167,181,218,230,135,229, 55, 75,249,211,169,193,196, 51,249,
+201,137,120,254,179, 27, 63, 22,181,236, 75, 79, 44,150,159,158, 91,250,249,163,247,146,239, 39,178,242, 55, 27,223,157,201, 79,
+ 79,165,200, 51,  9,229, 97,211, 31, 30,180, 27, 27,208, 28, 31,194,242,161, 90,180,242, 80, 83,153,169,  5,118,144, 42,113,181,
+168, 74,168, 20, 86, 30, 93,137, 14,196,211,184,179, 37, 99,100, 56, 79,  0, 46, 70, 67, 79,148, 79,207, 90, 32, 52,  4,174, 11,
+203, 15,100,151,254,109, 29, 16,180,150,192, 30,163,211,102,116, 58,224,175,101, 62, 50,193,138,114, 72, 95,181,225,107,209,195,
+160, 70, 85, 90,130,128,117, 28,209,  2, 31,208,131,121,189,163, 73,204, 48,129, 45,179,239,  4,  7,156, 12,202,197, 92,226, 68,
+155,149,133, 60, 10,237,188,206,124,105,190,186, 95, 85, 80,196,  2, 76,  3,148, 34,219,126, 52, 73,235,116,108,129,180, 76, 72,
+120, 22,178, 57,246,164,126,102, 24,169, 89,223,247,  6,245,196,120,110,124,167,182, 45,243,116, 30,  4, 24, 88,248, 14,217, 63,
+ 70,110,135, 78,123,191,193, 25, 42,214,157,248, 79,  0,170,174, 37,166,141, 43,138,206,248, 59,182,199, 16,112,130, 12,129, 36,
+206,  7, 21, 68, 81, 99,199,134, 44, 72, 76, 23,253,136, 34,162, 36,219,168,202,190,203, 74, 37,155, 84, 44,187,234,  2,117,213,
+172, 73, 21,101, 17, 37,106,149, 85, 43,148,  5,138,100, 68, 16, 73,249,218, 22,197,128, 63,216,158,192,120,126,158, 25,247,222,
+251, 38,145,227,149, 37,203,214,248,205,155,115,239,125,247,220,115, 28,127, 15,102,237,196,200,139, 28,231,140, 19,224,216, 19,
+199,241,159, 56,166,211,  8, 25, 61,195,128, 12, 38, 77,216,224,228, 91, 27,250,163,134,142, 95, 68, 43, 40, 52, 91,180, 28, 63,
+193,118,126, 37,215, 30, 14,240, 92,228,124, 36, 86, 57, 65,133,107,246, 33,189,105,203,188, 29,116,118,252,101, 89,191,130, 49,
+159, 24,124, 67,114,  4,127, 17,240, 49, 44,116,232,152, 45,218, 65,111, 80, 12,116, 24,134,202,248,250,180,232,152, 20,180,232,
+160,  0,138,  0,164,218,180, 76,226,183,160,212,  1, 54,163,201,  7,174,140, 54, 61,120, 42,133,254, 65, 60, 90,133, 25,200,184,
+ 71,145, 28,  8, 48,209, 83,103,113,120,210,197,251,221, 33, 63,  9,178,195,125,135, 60, 87,131,220,198,224, 76,147, 87, 52,236,
+129,105, 77, 83, 81, 45, 93,195,251,223,208, 44,180, 76,133,144, 67,100, 74,146, 93,112, 29, 20,107,219,219,249,169,111,190,187,
+112,126,112,100, 52,145,223,217,205,230,247,224,167, 70,134, 70,198,199,198, 95, 60,127,190,240,199, 19,192,208,217,  7,179,207,
+158, 46,100,243, 91,245,106,101,122,102,122,243,223,119,242,137,212, 41,138,119,102,166, 39,211,233,248,232,104, 42, 53,150, 74,
+ 37, 39, 38, 38,210,233, 47,147,215, 18, 55,110, 78, 70,123,163,181, 74,105,121,101,121,245,205,234,203, 63,255,122,181,184,248,
+ 94,150,111,223,186,125, 84, 45,191,123,187, 22, 18,253, 62, 15, 50, 97, 32,239,182, 81,184,175,133, 18,137, 54,160, 36,236,111,
+ 22,128,121,210,207, 33,137, 31,114,173, 36,249, 36,158, 84,223,160,102,132, 45,206,  5,  5, 62, 28,228,  4,161,  5,153,123,103,
+216, 37,  0,162,251, 16,194, 41,243, 65,141, 77,151,133, 77,232, 38, 62, 69,110,198,167,133, 90, 74, 53, 21,233,184,  6,149, 50,
+143,164,126, 36,231, 66,164,152,188,250,213,206,193, 22,160,118,119, 56,  2,235,220, 21,234,206,149,114, 40, 37,239,241,195,250,
+ 99,231,147, 20, 63,116, 83,189, 24,189, 12, 97, 88,240,121, 97, 37,  7,251,  6,179,  7,217,100,114,252,176,176,111,243,176,161,
+ 27,103, 35,  3,251,245,  2,141,242, 99,170,161, 27,170, 24, 20, 43,245,202,240,208,240,250,198,218, 81,174,180,177,179,118, 44,
+215,209,255,239,184,154,254, 60, 93,172,151, 18, 87,174, 78,165,190,205,108,173,144,181, 60,202,201,153,168, 62,173,251,169,165,
+105, 83, 21, 67,130,172,180,129,121, 14,234,229,235, 67, 99, 71, 82,213, 84,140,204,235, 37,128,215,162,116,120,186,163, 91,146,
+235,128,126,231,250, 47,233, 13, 60, 55, 39, 91,155, 51,167, 66, 29,235,133,141,129, 72, 31, 92,191,162,169,177,158,129,154,  2,
+229,133, 27,178, 51, 31,  2,150,246, 38,183,138, 38,  7, 94, 47,212,245,240,228,238,150,118,255,171,236, 21,171,135,241,203,241,
+234,251,138,138,151,225, 37, 23,111, 15,128, 59,160, 91,236,204,133,178, 84,134, 43, 12,249,  3,  6, 57, 91,213,228,186,130,138,
+  8,110,192, 57,136, 22,  3,167, 99,117,185,236, 33,125,  2, 23,103,185, 53,109,232,102, 47, 68,  7,196,119,100,187,216, 31, 24,
+187,108,172,195,177,118,198, 42,141, 32,140, 51,196,213, 18,220, 50, 28, 23, 42, 75,149,241,158,104, 81,223, 61,106, 64, 92,193,
+211, 79,147,172,105,217, 20,108,147,190,  8, 75, 19,244,120, 59,  3,193, 46,193,245, 79,190,248, 83,236, 94,124,254,235,239, 19,
+247,178,234,254,227,204,163,147,249,204,207,127,255,150,145,115, 15,227,119, 67,130, 79,106,158,  0,180,169,156,254,  5,  0,147,
+ 84, 91, 40, 44,221,247, 39,187,126,188,244,235, 47,191, 75,178,231,135,196,253,185,229,185,254,238, 43,147,145,115,146,213,224,
+185,143, 66,103,120, 70,  1,149, 22,132,118,212,141, 33, 87, 19,139, 90,196,174, 22,231,240, 59,137, 15,  4, 88,140, 14,  1, 45,
+ 20,211, 39, 69, 50,199,118,  9,242,223,144,128,162,114,186,101,200,138,220,219,213,179,190,183, 73,114, 90, 46, 54, 15, 21, 64,
+101,238,  0, 57,184, 33,247,154,233, 64,180, 99, 21,128,195,103,253,131, 40,126,199,187,157,148,215,182,  8,211,176, 86,224,145,
+181,220,169, 56,138,229,228, 20,193,160,222,105,113,  0,166, 55,101,173,193,216, 31,  8,166, 86, 51, 87,204, 81, 96,109,145,119,
+ 16,  7, 59,159, 24, 45, 54,147,137,180, 25,161,220, 65, 72,102, 91, 78,138,124, 54,132, 88,200, 56, 69, 64, 23,173,169, 20,106,
+251,212,228,196,212, 55,140, 35,120,154,237,156,168,227, 97,  6, 20, 10,138,218, 64, 73, 42,122,253, 47,  0, 89,231, 22,227, 68,
+ 25,197,241,105,103, 58,157,233,180, 51, 91,218,217,118,119,217,123,195,101,187,139,110,220, 69, 66, 68, 80, 49, 49, 49, 49, 49,
+ 65,159,224,  1, 18,194, 11,207, 36,248, 70,140,137,137,225,129, 55,  5,140,190,107,200, 18,118, 31,128,196,  7, 48, 75,162,240,
+  2, 42,171, 75,161,206,222,122,191,204, 78, 47, 51,157,139,231,124, 95,219, 24, 77,250,208,204,195, 92,191,239,124,255,115,190,
+115,126,167,207,127,167,173, 80,189,126,240,157,182,203,235,225,223,105, 22, 10, 75,145,176, 46,227,120, 61, 91,239,245,154,236,
+254,203, 34,187, 48,  4,209,244, 51, 52,235,153,249,207,239,255,182,190,104, 20, 73,205,  2,219,135,159, 33,190,131, 21,201, 73,
+232,246,  2,211,151,225, 44, 98,157, 69,203,181,169,237,192,168,  1,161,172, 49,180,239,131,107, 15,237, 25, 45, 27,  5,244,112,
+ 41, 81,205,243,  2,156, 64,105, 39,241,136,170,202,201,154, 81,113, 29,154, 16,  9, 35,198, 38,198, 31, 33, 65,147,131,211, 36,
+125,  8,  6,180,133,172,  2,138,134,192, 57,132,249, 77,240,105,193,185, 33,229, 16, 44,232,219,176, 32, 42, 10,238,191,115,184,
+201,201, 42, 97, 68,140,  9,152, 18, 15,227, 18, 81,145,138, 20,136, 74,156, 18,230,228, 48,167, 68,  2,240, 71, 12, 96,171, 23,
+158,247,139,130,191, 86, 47, 63,126,242,171,107, 89,146, 20,169, 85,141,231,107,235, 96, 85,183,182, 55, 30,254,252, 48,147,201,
+192, 51,166,166,199,231,210,179, 55,110,126, 59, 52,168,194,205,207,206, 28, 24, 25, 86,255,120,254,180,217, 54, 31,172, 62,250,
+225,214,210,173,165,149,229,229,187,119,238,220,189,127,239,254,242,237,165, 86,195, 24,155,152,196, 22, 16,123,199, 22,222, 88,
+ 76,237,155,177, 44,167, 90, 51,198, 71, 39,206,156, 61,127,253,235,239,126,251, 51, 91,221,237,180,136, 82,181,209,100,247,152,
+ 62, 12,137,170, 96, 92,  4,  1, 12, 44, 34, 38,253,132,231,134,203, 54,118, 90, 10,250, 36,129, 13,  9,158, 28,241, 75, 33, 70,
+ 18,177,151,  5, 72,103, 88, 39,248, 32, 67,246, 36,124,150,133,126, 61, 14, 57,222, 97,205, 96, 66, 26, 14,  5,164,122,179, 12,
+174, 37, 29,124,178, 56, 96,118,218, 71,143,190, 53,150, 26,213,178, 27,112, 65,240, 55,183, 10,155, 96,129,196,128,164, 55, 43,
+160,223,183, 42,154,131, 60, 94,193,143,  9,  6,102,167,227,192,133,224, 11,142,192,204, 55,170, 37,189,152,220, 51,  4,223,248,
+ 69,238,133,192, 10,243,139,243,121, 45, 31,147,227, 45,211,208, 77,157,106,121, 88,185,210,227,233, 92,173,  0, 35, 68, 12,132,
+226,195,170,166,101,225,224, 84, 98,114,179,160, 53, 44, 67,150,148,146, 94,  2,209,186,182,253,215,234,239,171,160,232, 47,124,
+112, 46,179,243,178,131, 17, 43, 10, 36, 69,233,132,100, 76, 44, 73,231,222,158, 59,182,190,181,158,148, 19, 27,197,141,103,175,
+158,217,  4,231,  4,118, 39, 61, 49,243,119, 46, 11, 22, 86,226, 67,249, 90,254,181,244,226, 75,109, 93,226,133,150,221,  6, 35,
+ 46,  4, 37, 85,142,107,165, 77,240,232, 15, 31, 92,120,255,245,227,171,107,191,236,141,141, 21,234,121,112,100,193,  7, 13,113,
+ 48, 17,165,106,179, 14,102,  2,174,  2,186,236,221, 19, 31, 21,115,155,213, 70, 21,245,132,143, 25, 84,226, 65,142, 23,248,208,
+199,239,125,234,153, 86,121,183, 98,180, 13, 81,144, 82,195, 83,217,130, 70,234,175,113,182,194,187,  2, 19,  6,222, 70, 29,  1,
+121,156,170, 36, 44,187,225,231,124, 42,195,237,127,103,148,225, 48, 59,138, 72, 53,202, 10, 68,205,134,251,203, 93,144,140,103,
+147,152, 58, 54, 76,110, 69,249,200, 17,208,162,182,211,178, 28, 47,202,182, 10,214,182,142, 91,234,158,133,156, 94,151,104, 53,
+ 82,131,130, 83,  6,163,122, 72, 58,226,249,176,192, 31,138,133, 79,159,251, 60, 56,146, 56,245,197,169,111,222,188, 57, 63, 59,
+247,253,213, 47,175,101, 87, 62, 59,252, 73, 84, 16,118,177,136,132,246,  5,193,244,155,133,216,212,143,217,159,162,245,240,241,
+203, 31, 62,185,254,116,101,103,249,210,137,139, 87, 30,125, 53, 32, 15,158,140, 79,214,236, 38, 45,199,196,133, 21,147,126,176,
+ 77, 99,189,221,192,251,240, 51,189, 78, 79, 93, 27, 66, 83,169, 41,140,  5, 76,  7,207,243, 32,136,225,109,196,148,184,222,210,
+105,124,120, 95,114, 58,147,203, 96,139,106,159,183, 93,222, 33,224,204,238,137, 40,205,205,234, 96,166, 77,114, 32,  9, 90,152,
+233, 53,176, 35,165,142, 14,106, 59,199, 44,215,203,  3,161, 40,120,199,176,120,  4, 16,154, 68,229,182,183,107,234,166, 77,216,
+230, 72,145,100,104,166,178, 71,147,226,201,221,193, 17, 66,163,235,244, 74, 65,187,205, 85,  9, 57,213, 13,178,193,132,156,  4,
+  7, 17,151, 35,130,151,167,193,135,238,195,245,139, 43,153,238,253,144,130,169, 54,117,109, 84, 57,129,251,139,  8,193,150,193,
+ 15, 38,217,222,254,233,100,170,162,151, 92,108,232,102,209, 68, 41,106, 96,255, 17,128,172,107,233,109,226,140,162, 51,227,121,
+249, 49,177,199,128, 99, 64,137, 35,132, 73, 65, 74, 89,240,172,212, 77, 23, 84, 66, 72,252, 10, 86,172,248,  5,180, 18,108,187,
+169,120,  9, 84, 85, 85, 55, 44,187, 68,149, 88, 84, 65, 16, 65,120, 67, 81,  2, 84, 36, 64, 94, 30, 59,126, 76,102, 98,123, 60,
+ 31,231,222,111, 76, 74,107,101,225,216, 99,123, 94,223,189,231,190,206, 81,211, 84,136, 73,244,155,148, 45,234,207, 45, 55,146,
+ 80,199,127,249, 72,152,129,135,233,147, 47,173,188,170,252,  7,177,127,166,147,249,223,139,130,102,235, 13, 98,237,137,163,173,
+252,190,202,228, 48,201,167, 98,230, 24,145,124,150,156, 35, 30,  6,  0, 26,103, 20,225,129,129,155,248,  6, 34,175, 47,152,238,
+ 94, 33,  1,163,172,101, 90,196, 12,174,114, 34, 66, 40,  8,192, 83,138, 54,234,238,108,249,235,204, 24, 55,252, 26,246, 67, 89,
+203,209, 13,179,229, 55,240, 18,206, 32,206,221,219,229,185,132,132, 73, 97,243,135,208,219,114,132,210,211,169,226,108,224,254,
+ 62,118,176,172, 91,218, 64,104, 97, 47,150,226,  9, 82,119, 38,232, 71, 52, 88,205,244,216,216,204, 48,  5,219, 65,114, 35,212,
+ 92, 72, 74, 29,192, 11, 26,201, 62,246,187, 22,204,164,110,192,236,210,240, 55,245,214,146, 88, 18,145,  0,170,218,142,194,  8,
+118,236,231, 43, 87, 61,207,  3,148,123,249,236,197,141,223,126, 13,194, 46,181,172,210, 80,  4, 17,106,154, 68, 55,134,165,208,
+191,116,249,242,223, 47, 95, 77,255,117,199, 45,110, 27,135,165,223,187,167, 82,169,232,  8,181,210,153,135, 51,247,206, 95,184,
+136,213,242,253,137,239,142, 28, 58, 60, 59,251,112,250,222,221, 20,241,120, 96, 61, 15,186,145,232, 83,129,  7,107, 73, 24,236,
+195,185, 87,151, 64,  5, 37,217,177,243,100,245,  9,197, 73,125, 48, 86,189,  6,244,160,123, 40, 82,  7,120, 18,118,  5,194,148,
+  0, 94,157, 59,204,113,120,229, 56,191,175, 52,245,228,195, 35,124,154, 91,181,104,220, 12, 38,222,205,184,115, 31, 95, 33,176,
+ 65,164,133,136,146, 69, 21,116,174,  7, 38,221, 77,110,166,232,181,215,224,107, 89, 76, 99,147,133,212,133,174,152, 99, 59,198,
+215,154, 43, 88,231,166,110, 30,174, 30,121, 52, 63, 59, 94,154,104,116, 60, 88,118, 34,216, 79,217, 97, 47,164,124,186, 91,110,
+116,106, 89,219,201,217,185,122,187, 62, 53, 49,133,243, 54,191, 52, 71, 73, 57,210, 73, 81,203,219,203,237,118,187,238,123,197,
+156,123, 96,108,242,233,187,231,110, 58, 31,246,122,205,205,198, 70,176, 33, 88,247, 10,110,  0, 27, 91, 41,211, 73, 59,  8,245,
+ 86, 26, 31, 96, 53,220,172,155, 18,136,219,116, 57,181,120, 96,119,245,237,242,107,174,115,170, 64, 72, 19,165,138, 97, 26,239,
+107,139,  0,129,134,110,192, 43,220,126,114,155,122, 25,  5, 46, 49,133,111,147,187,247,181,130,102,173,179,142,237, 11, 78,209,
+177,114, 35, 25,103,102,254, 62,206,117,218,206, 32,  0,133, 13,194,209, 17,137, 63,172,118,202,194,205,196,212, 79,132, 49,251,
+220,143,129,223,117,114,249,213,198, 50,143, 74,170,163,133,210, 38, 23,129,137,152, 72, 37,242, 25,172, 20,199,206,198, 34,208,
+ 13,237,171, 65,234,212,197,227,138, 30, 40,141,166,210, 13,104, 98, 66,254,245,  7, 10,145, 57,  2, 87,244, 67, 98,193, 27,144,
+188, 41,208, 76,211,125,236,149,173,116,193, 15, 26,176, 97,147,  5,255,197,250,235, 86, 72,141, 29, 61,238,159, 97,221, 31, 24,
+ 21,146, 69,134,153,198, 21,205,167,205, 74,126,196,205,228, 12, 37, 58,186,255,244,159,143,131,115,211, 63,137,  7,194,251,253,
+214,183,215,206,140,186,163,103,191, 62, 17, 40, 81, 39,240,117,217,244, 69,237,102,250,132, 83,250,241,254, 31,239, 86,151, 22,
+230, 22,111,253, 48,115,242,230, 55,226,172, 24,251,165,154,217, 86,188,126,232,244, 98, 88,147,172,182, 56, 94,219, 78,119,252,
+ 14,124,137,105,217,190,223,142, 72,207,154, 91,196, 41,215, 68, 44, 88,164,109, 77,160, 77,181,205,108, 20, 17,193, 64,221,175,
+ 99,151,247,238,170,190, 89,254,135,209, 27,213,216,107,157,218,241,234,177,149,214,202,194,218,123, 89, 82,102,177,169,152,109,
+177,198,215,168,151, 20,  6,255,141,157, 69, 92, 45, 87, 23,188,  5, 73, 86,136,247,129,238,129,214,241, 19,212,116,168,153, 27,
+228, 15,  4,243, 73,200,126,188,  4, 28, 83, 62, 96, 64,141,196,  0,151,219, 29,217,236, 20, 75, 34,136, 84,194,243,147, 24, 77,
+ 77,147,125,134, 82, 70,119,248, 13,204,254, 74,163, 58, 44, 69,  0,244, 72,154, 82, 49,141,167,201,183, 34, 73, 30, 28,179,186,
+115, 44,220,108,193,239,110,144,102, 36,253, 47,134,161,201,144,173, 65,211, 62,  9,192,216,217,244,182, 81, 69, 97,248,206,167,
+103,156,169,147,184, 77, 28, 28, 98,212,134, 54,226, 67, 66,  8, 22,  8,169,  2,177, 40, 59,186, 64,236,224,  7, 32, 36, 88, 20,
+ 33,164,178, 65,236, 16,127,162, 66, 72,149, 42, 22, 93,192,158, 77,105, 32, 11, 48, 77, 26, 53, 36, 17,109, 10,118, 60,246,216,
+ 99,143,103, 60,115,231, 14,231,189,119,220, 45,120,107,107, 50,190,190, 57,243,158,123,206,121, 94,179, 12,162,172, 28, 82,253,
+ 63,193,253,201,187,121,201, 81,103,218, 92,101,235,243, 55, 11,246, 31,175, 57,186,144, 34,187,124,224,204, 49,244, 48,210,  5,
+ 49,220,200, 68,162, 14,139, 72,139,209,239, 74,186,179, 36,142, 49,221,  1,129, 54, 86, 17,  1,115,234,112,248, 68, 13, 29,125,
+249, 40,118, 22,202,246,112, 24, 13, 84, 54,160,156,239, 28,203,253,228,234, 71, 95,127,255, 13,229,200,  6,134, 75,153, 44, 95,
+228,115,238,169,152, 70,  3, 38,211,167,238,240,113, 47,236, 74, 47, 68,149,  0,224,147, 80,181,146,127,  9, 46, 63, 58,118,172,
+223,118,  7,207,111,174,104, 22,133, 98, 33,237,238,240,124,134, 18, 44,171,203,154,200,248, 40,206,203,191,207, 74, 30, 50,154,
+ 73, 20, 25, 18,231,251,246, 20,254,222, 28,195,205,134,144,159,210,112, 82,144,  3,216,240,207,105,176,178,188,148,198,252,179,
+107,159, 15,195, 49,226,160, 94,128, 34, 96,144,122, 50,228,208,162, 36,  5,145, 74,155,241,126, 47,  8,250,254,175, 59,219, 40,
+ 75,192, 23, 92, 56, 21,231,169,181,198,250, 70,171,253,199,189,170,109, 93,218,108, 94,255,242, 11,102, 54,222,120,243,242,195,
+143,143, 79,  3,159,110, 33,154,230,202, 26,216,160, 48,138, 51,117,116,245, 98, 95,193,128,211, 64,233, 24, 30,112, 69,156, 98,
+174,181, 98, 51,215,129,159,201, 12,185, 58,110,149, 11,212,144, 73, 17,225,126, 80, 59,129, 76, 73,120, 49,202,163,253,206,239,
+244,227, 85,156, 74,156,228,207,174,109, 29,119,143,162, 36,162, 64,150,194, 73,142,147, 96, 87,182,  5, 46,197, 78,105,242, 16,
+ 78,134,186,110, 14, 38, 62,253,179,144, 40, 30,197,  1, 45,191, 99,131,127, 54,227,232,  2, 68,253, 95,136, 15,222,122,255,246,
+221,219,171,245,213,163,222,193, 18, 12, 72,217, 89,239, 92,119,216,121,247,245,247,190,251,233, 91, 27,213, 93, 65,178, 72,135,
+109,155,231,185,222, 30, 16,  5,156,180,115, 60,155,134,209,104,154,196,207,181, 46,237, 28, 76, 78,252, 19, 18,116,245, 90,189,
+253,232, 94,163,214,232,133,125,207, 94,136,129, 53,  6,171,143, 36,246,139,173, 23,238, 63,218, 51,117,131, 46,178, 96, 57, 20,
+247, 73,113, 83,234, 70,226, 32,  7,212,176, 72, 57, 55, 45,139,199,201, 70,163,213, 27,251, 36,216,215,235, 27,244,200, 49, 77,
+171,125,216, 94,116,207,164,148,242, 23, 25, 45,194,185,165,181, 97, 20,248,129, 79, 59,194,115,151, 47,172, 62,189,115,216,166,
+ 61,252,246,171, 87,194,100,124,119,119,187, 10,218, 26,248, 60, 89,150,153,210,222,197,115,206,144,250, 59,244,143,243,104,228,
+ 85, 23,109, 86, 12, 35, 90,146,184, 89, 95,247,199,125,206,147, 78,208,145,253,186,133,164, 54, 21,182,229,164, 25,101, 39,245,
+ 48, 74,228, 17,132, 44,139,211, 54,119, 76,138, 57,242,  8, 94,201,110,  6,230, 19,227, 70, 46,193,133, 79, 90, 15, 52,125,198,
+ 39,163, 65,144, 10,253,252,130,231,103,167,164, 78,103, 92,157,201,148,120, 23,161,212,109,105,158, 76, 91,162,  8,147,212,182,
+128,191,255,121,255,135, 90,149,221,122,249, 43,246, 10,187,241,225,143,127,101,131,107, 91, 87,251,233, 48,205, 85,159,207,188,
+103, 91, 19,  3, 62,122,103,227,165, 79,187,219,236,142,184,114,249, 53,118,147,177, 30,123,166,186,185,159, 62,140,132,164,251,
+ 73,206, 37, 28,222,215,206,239, 30,182, 41,169,106,157,109,238,197, 19, 37,220, 53,133,129, 85,131,184,120,102,104,117,216,230,
+241,229,218,202,131,238,159,205,229,245,147,193,227,227,206, 17,131, 37,158, 73,154,159,150,157,214,255,151,131, 29,133,205, 46,
+ 91,  0,153,210,218,204,177,208,231,158, 37, 51, 53,234, 37, 35,152,234,250,192, 87,190,255,247,190, 91,129, 31, 61, 32, 72,114,
+126,116,171,121,241,206,131, 62, 45,229,162, 67, 91, 37, 22,101,111,139,156, 10,145, 87,231, 96, 65,196,116,  9,211, 64,232,238,
+133, 61,153, 86,  2,  0,  9, 70,139,196,165,213,113,226,148,213, 92,143,146,140, 60,203,149, 57,246,188,198,  9, 29,170,218,211,
+ 85,160, 91,116,107,179, 44,157,192, 83,123,110,247,173, 56, 49,154, 90,129, 34, 64,221, 17, 58, 91,200, 97, 89, 21, 89, 73,167,
+146, 28, 57, 29, 35, 89,252, 87,  0,194,174,100,183,105, 40,138,218, 73,156,177,169, 29,211, 38,105,194,208,130, 42, 90, 21,161,
+ 50,131,  4,180, 66, 72,128, 96,129,196, 18,196, 30,137, 15, 96,203,111, 32, 22,108,217,178,  5, 65,  7,  4, 75,196, 80, 21,181,
+168,133, 64, 65, 77,227, 64,234,216,177,159, 39,238,121,207, 45, 42, 44, 72, 86,137, 34,121,136,223,125,231,158,123,239, 57, 49,
+255, 30,238,228, 78,162, 29, 82,  4,255,127,109,233, 67,203,210, 95, 84,253, 63,175,109, 47, 94,121, 71, 38,176, 93,123,141,143,
+168, 23,244, 30,179,  9,230, 96, 38, 13,160,129, 81, 74, 46, 12,149, 80,227,230, 30,137, 81, 76,204,227, 80, 62,215,251,141,120,
+159, 10, 87,  2,  8,221,192,141,239, 88,188, 79, 97, 36,108,126,225, 37, 52, 31,185,135, 39,125, 67, 17, 80,139, 43,171,  9, 31,
+ 93,213, 82,124,151, 32, 67, 33,197, 34,118,162,196,145,128, 77, 98, 16,210,162,118,246, 14,140, 96, 78, 10,238,123,129,107,251,
+147,187,  7, 84,  8, 49,  3,  5, 19, 66,244,120,195, 38,253,113, 92,201, 52, 65, 31, 25,157, 10, 67,208,100,208, 64,139, 24, 23,
+179, 23, 91,114,114, 75,162, 23, 58, 40,190,204, 96, 30, 14,162,128,223,166, 24, 24, 76, 79,157,125, 62,243,130, 48, 19,220,107,
+121, 66, 10,253, 97, 39,240,220,208,131,154, 11, 88, 65,215,245, 26, 43,171, 70,171,213,179,172, 98, 95, 33, 79,201, 72, 49,155,
+203, 38,105,205,247,172,245,190,188,148,201,227,244,247,215,107,253,125,201, 87,115, 51,115,243,175, 29, 55,242, 61, 88, 12, 71,
+ 60,231,160,235,204,161, 47, 30, 44, 71, 22,130, 54,152, 89,205, 40,144,117,164, 67,120,156,108,227,110,147,160, 98,124, 31,164,
+174,203,128,220, 33, 41,136,133,198,149,232,133, 67, 36,158,250, 80,  9, 80,164, 65,211,188,231,180,209, 34, 70,231, 26, 20, 48,
+143,163, 18,114,167,184, 93, 41,213, 40, 42, 25,221,166, 86,216,101,108, 54,211,233, 76, 69, 27,202,166,178,110,192,134,244,202,
+225,225,201, 31,237,239,220, 87, 29, 91,236,240,224,  8,133,182,225,234,190, 15,171,239,191, 52, 63,123, 48,226, 81,134,203, 35,
+109,179, 57,185,255,  8,133,239,217,133, 89,198, 28,173,160, 31, 29, 61,121,235,194,205,119,171,239,104,151,252,214,250, 26,  4,
+129,218,167, 19,140, 74,203, 10,193,156,159,166,177,216, 88,212,139,186,227, 90,  4,156, 45,  7, 21,215,171, 39, 47, 27,157,142,
+ 86,212,232,102,169,249,254,  3,181,209, 95, 38,228,  9,233, 73, 24, 44,150, 79,143,157,250, 97,172,105,165,193,164,162,172,124,
+ 91, 10, 16,179, 82,245, 82,237,250,233, 43,133, 61,213, 82,148,249,178,209,160,199,  9,118,122,152, 56,117,233,196,154,157,214,
+153,241, 83,211,147, 83,157,192,111,110,124,175,106,229, 65,181, 76, 32,116,234,246, 13, 99,105,109,125,115, 35,  1,215, 30,199,
+178,205,143,141, 37, 90,124, 67,122,157, 18,199,209,161,  3,150,107,151,139,  3, 20, 85, 91,157, 86, 73,213,225, 41,145, 76,246,
+220, 94,165, 84, 69, 51,156,162, 80,246,173, 21, 75,109,179, 13,139,227,192,167,212,109,188, 62,222, 54, 13, 94,169,166, 60,178,
+  3,245,201,132, 60,166,228,118, 95,172,193,237, 26,145, 93, 48,153, 28,199,  8,112, 23,134,201,184,184,138,194, 37,225,113,217,
+ 75,119,163,241,140,146,171, 42, 82, 49,213, 90, 54,215, 54,123,104,199,246, 68, 99,  1,226, 67,192,229, 74,249, 68,139,208, 23,
+151,161,246,149, 18, 83, 29,148,195,200,146,157,126,211,124,252,228,193,219,103,199,170,135,198,118,213, 59,140, 59,138, 72,194,
+184, 27,254,  4, 92,169, 67, 30, 83,247, 60, 90,126,122,109,223,241,250,165,131,247, 31,222,191, 91,185,247,242,215,236, 34,251,
+116,103, 98,154, 50, 15,211,233,201,220,241,103,227,231, 58, 56,107, 57, 68,207, 21, 74,  8, 17,167,153, 66,186,228,138, 86,165,
+184, 38,156,128,186,204, 54, 29,211,232,182,233, 55, 22,131,108,131,136, 12,253,  5, 21,249, 31,224,155, 68,185, 90, 46,149,177,
+152, 29,138,249, 13, 41,228, 34,254,  4,255, 61,174,109,215,149,226, 43, 18, 12,178,  8,242,  0,215, 39, 70, 33, 95,193,113, 53,
+136,172,134,177,214,159, 87,  9,133,160, 14, 47, 11,243, 89, 40,231, 87,245,186,105,117, 68,248, 59, 55,113,254,115,115, 69,104,
+ 96,110, 53, 55,134, 81, 60, 16,142,  3,184,112, 30,245, 44,214, 11,121, 11,201, 31, 32, 45,197,254,204,209,214, 88, 38,189,109,
+207, 70, 95, 22, 36, 75,165, 96,219, 91,101,  7, 27,194,119,231, 32, 18, 70,221,124,173,160, 21,  5,234,240,240,158, 80,126, 11,
+ 64,214,181,244,180,113,133,209,121,120, 30,158, 49,198,143,196,152, 96, 19, 37,149, 80,149,162, 74,  9,155, 54, 82,212, 74,237,
+162,139, 74, 77, 55,225, 23,116,209,174,170, 36,127, 32, 82,255, 75,214, 89,228, 15, 84, 40, 45, 13,139, 62, 18,  2, 68, 96, 97,
+156, 98,198, 51,120,236, 25,207,219,190,253,190,239,142, 41, 74, 88,129,  1,195,204,189,115,238,249, 94,231,228,248,158,  9,255,
+139,204,176, 75,244, 93, 21,180,233,188, 57,146,125,144,159,121, 15,205,217,101,192,254,224,103, 47,230,176,214,150,111,217,152,
+112, 23,196,247,223, 70,156,  7, 19, 51, 88,182,130,168, 36, 89, 50,203, 83, 40,136,224,243, 68, 16,239,206, 68, 22, 15,129,121,
+130, 37,108,150,139,140,113,117, 25, 42,141, 21,104,239, 33,224, 50,114, 76,199,187, 54, 35, 49,117, 49,165,233, 50, 84,  7,203,
+166, 97,228,207,230,147,  3,236,210,149,115,194,146,151,158,  5, 86, 46,214, 98, 52,130,145,116,205,116,252,129, 34,225,163, 83,
+ 54,234,195, 96,180,219,179,135, 94,106, 10,133,138,170,220,172,150, 13, 89,169, 22, 84, 83, 34, 57, 47,226, 63, 41, 33, 53, 60,
+ 69, 50,181,125, 25,138,140,178, 95,120,168, 19,176,242, 63,  6, 65, 28, 26,126, 10,170, 44, 42,228,214, 81,  4,238, 85,148,  0,
+179,122,157,142,227,156,211,196,  4,124,201,146,104, 10, 97,117,152,100, 33,252, 67, 81, 58,137, 99,207,207,210,108,122,102,185,
+189, 83, 11, 14, 18,160,255, 81, 12,  7,  0,162,191,200, 10,104,122,195, 93,115,131,104,103,251,197,243,231,207,182,119,182, 53,
+149,149, 12, 18, 44,160,239,145,174, 27, 35,105, 26, 62, 71,193, 20, 69,230, 18,252,216,134, 10,219,  0, 39,208,176, 77,  8, 66,
+ 19,132,123,174, 56, 63, 67,153,165,162,138, 94,162,101, 13, 53, 50, 13, 77, 42,169,232,106,  2,155, 42,244, 81, 54,110,181,126,
+  3,168,119,173,212, 20,177,181, 46, 27,  5, 46, 54,183,208, 18, 69,105,  4,161,244, 56, 64,189,245, 73,232, 51, 50,187,113,195,
+145,161,232,214,208,178,125,231, 90,101,121,132,  6,196, 50, 68,102,231,147,161, 23,184,217,148, 29, 15, 58,247,239,126,135,  3,
+232, 51,230,120,214, 71,205,143, 59,253,206,223,221,191,146, 89, 92, 64, 81, 76,245,176,255,246,247,253,237, 36,137,155,213,166,
+ 82, 80,208, 80,201, 88, 56, 58, 61,  4,138,208,174, 95,255,241,254, 79, 91,255,252,138,242, 35,162,164, 23,138,156, 19,238, 30,
+191,129, 79,134,254,  0, 46, 60, 78,195,129,219,175,151,113,238, 20, 96,  0,248,120,231,244, 40,140,  2, 93, 86, 53,248, 21, 89,
+  7,150,208,190,178,  2,111,190,245,106,235,180,123, 12,236,222, 26, 89,107,173,181,205,123,223, 31,252,251,182,177,216,136,146,
+176,178, 80,251,227, 96,199,118, 44,107,208, 91,169,183,186,118,239,211, 59,159,247,207,222,233,118,182,247,110, 47, 33,102, 12,
+ 75,118,125,105, 21,192,113, 28,249, 95,173,127,241,186,187, 11,247,216,245, 93, 93, 51,236,177,221, 88,188, 26,101, 73,148,198,
+ 75,139, 75, 16,242, 91,227, 51,120,125,243,219, 31, 86, 74,181,151,  7, 59,181,133,250,227,  7,143,126,123,245,  2, 64,157,220,
+230,162,  5,116,146,242,209,180,  5,  2, 46, 73,248,204, 48, 43,223, 52,243,204, 43,224,187, 52, 47,215, 49,178,230, 32,154, 36,
+210,168, 90, 74,210, 73,232, 57, 31, 42, 77,253,220, 99, 71,187,238,137, 61,137, 81, 38,144,140, 55, 25,165, 26,132, 92, 82, 88,
+160,246,115, 68,118,146,194,150,209,117, 18, 29,239,100,  5, 69,185,245, 76, 73, 55,218,149,219,181, 70,150,106,195, 56,185, 82,
+185, 26,199, 17, 58,149,147,153, 55, 86,178,  4,177,170, 27, 79,247, 95, 54,202,205, 47, 31,126,253,228,151, 39,155,181,159, 79,
+166,251, 91,193,159, 15,174,109,244,209,203,129,186,185,165, 60,  9,139,103, 17,105,189, 84, 75,213, 69,179,226,  7, 62,224, 20,
+112,  5,216,187, 55,151,111,156,185, 14, 39,173,102,177,164,107,154, 31, 79, 56, 29, 67,219,241,  4,107,173,176,226,112, 13,227,
+208,243,226, 73,171,222, 50,138,102,144,132,183, 90,159,224,196,220,  8,237, 65, 82,150,225,252,163,196,157, 77,105,243,139,185,
+221, 61,220,149,174,221, 69,157, 21,186, 85,148,195,193,110,189,152,250,109, 40, 11,204,  5, 23,167,228,233, 10, 47,162, 49,136,
+227, 13,195, 36,164,147, 12,  7,  4,219,245, 54, 55,180,153,241,210, 34, 73,185,145,203,173,192, 61,154,248,135,196,155, 10,105,
+101, 74, 90,201, 44,154,112,168,231,174,215,249, 24, 62,239, 41,167,230, 31, 73,186,192, 98, 81,200, 43,206,226, 69,233, 18,159,
+105,192, 16,117,125,117,221,241,156,255,  4, 96,235, 74,122,155,  6,131,168,237,216,159,215,216, 73,147, 46, 20,232, 18,132,160,
+  5, 10, 42,229, 82,196,  5,161,170,112,224,140,184,112, 64, 66, 66, 28,248, 13,253,  3,252, 20, 36,238,220,170,170, 72, 28, 64,
+ 32, 68, 55,209, 61, 73,219,184,110, 22, 59,137,107,199,204,140,237,138,138,170,149,122, 73, 29,111,223,155,153,111,222,155,151,
+224,123,152,146, 32,207, 32,142,212,180,220,133,224,126, 33,196,195,153, 13,105,  3,238, 41,142, 88,147,  4,153,166,146,253,195,
+146, 73,209, 28, 14,  7,248, 56, 96, 12,121,126, 43,190,236,255, 50,253, 52,210, 37,212, 76,238,124,119,182,103,202,150, 79,185,
+ 54,154,179,164, 21, 21,250,116,139, 12, 59, 69,241, 61, 82,140,130,129,134, 18, 35,253, 37,199,179, 19,198, 21, 10, 54,113,230,
+ 13,100,142,232,165,217,105, 32, 81, 22,192,139,104,254, 89,213,244,147,  6, 58,127,174,133,192, 39,178, 86, 26,178, 42,144,224,
+ 24,103,227,248, 97, 23,135,181, 70,252,196,240, 76,217, 57, 42, 55,220,173, 35,231,119,165,185,111, 55,  2,128,137, 46,156, 99,
+104, 50,213, 18,133, 75,186, 50,156, 85,242,162, 84, 68,215, 69,129, 86, 21,199,144,182,  1,223,223,203,224,150, 11,142, 61,128,
+ 19, 87, 25,196, 15, 78,197,221,215,  8, 55,190,  1,226, 37,225,164,126, 28,203,216,100,  0,125, 37,202,106, 56,166, 91,151,164,
+172, 34,105,114,198, 84,100,156, 40,169, 51, 75,103,125, 38,206,150,209,161,176,135,255,141, 69,183, 52, 61,137, 36,175, 28,186,
+232,202,100, 84,  8, 63,188,136,172,231,128, 58,108,  1,170, 65, 68, 26,207,  1,208,172, 40,188,174, 73,140, 92,168,176,214, 67,
+165, 37, 39, 43,130,174,194, 47,118,213, 52, 85,176, 44, 33,111, 72,154,158, 49,116, 81, 87, 49, 76,244, 80,187,223,243, 59, 92,
+187,221,139,124, 46,104,158,198, 90, 57,175,141,226, 67,183,211, 52,181,156,161,102, 59,190, 43, 36,172,  7, 64,  7,181,234,148,
+251,205,129,131,227,114,108,155, 25,187,134,193,159,201,145, 41, 38, 72,187,246,166,194, 20,148, 53, 68,209,219,167,239,150, 87,
+150,188, 83, 87, 99,218,198,222, 58, 36, 65,  0,172, 17,146, 61,170,112, 76,192,187,209, 98,201,110,214, 60, 31,103,254,193,103,
+  0, 64,  1, 37,135, 11,151,239,142,223,134,165,222,112,155,221,160, 91,117, 42,159,150, 62,206, 77,207,111, 29,110,205,222,152,
+221,174,161, 39,131,169,224, 45, 68,101, 19,185,167, 66,140, 81, 24, 90,  5, 92, 27, 28,127,243,244,245,202,206,234,244,245, 25,
+212,100, 48, 25, 10,113,248, 10,200,148,251,205,130,219,169,195,185,193, 97,171,245, 10,188,108,251,118,121,239,112, 23,210,246,
+234,201,  1, 36,122, 80,222,221, 47,221,131,203,201, 25,214,  9,218, 57, 53,214,214,126, 62,123, 48,183,188,250, 21,  2,244,196,
+200,173,177,226, 24,100,157,123,118,197, 67,237, 76,192, 68,209,113,235, 57, 61, 63, 90,188, 82,204, 21,202,118, 25,206,217, 39,
+ 38, 88,203,109,182,131, 14,148,104,176, 98, 23,191,125,134, 80,  4,183,175,213,105,125,255,243,  3,  5,143,240, 90,  6,193,228,
+200,205,221,218, 14,188,198, 67,249,171,221,160,142,147, 63,140,  1,235,113,145,147, 80,152, 26, 91, 46,165, 27,168,  4,241, 84,
+174,103,  8,195, 48,153,133,128,205,159,174, 58, 91,191,156,237, 13,199,169,183,131,  0,163,  0,181,112, 81,180, 71,224, 76,156,
+116,120,121, 24, 34,187,168, 49,201, 96,162, 33,203, 58, 99,104,  5,  0,197, 33,249, 19, 80, 48,  9, 91, 92, 77,224,157,169,226,
+148,213, 55,126, 96,111, 35, 15, 22, 87, 90, 60, 56,157, 31, 84,173,165,237, 53,143,231, 95,190,127,177,176,240,225,161,254,188,
+206,111, 46,186, 95, 94,149, 30,181,195, 22,159,142, 44,166,140,181,151, 51,114, 18,206, 10, 69,185, 41, 92,117, 64,133, 45, 60,
+ 74, 67, 49,161,120,168,181,106, 17,186,170,134,249,108, 31, 60, 11, 31,137,218,148,137, 83, 78,  8,235,245,216, 61,134,200, 23,
+ 34,133, 45,192, 14, 13,238,117,120,229,147,253, 90,179,134,215,134,222, 18, 89,175,219, 78,236,142,184, 88,195,213,163, 45, 18,
+ 33,113, 44, 20, 98, 87, 20,100,109, 29, 53, 15,249, 40, 19,111, 28, 36,221,106,186,179, 97, 76,106, 36,202, 56,241,247,176,125,
+ 69, 78,216,156,215,110,145,129,101,186,255, 28, 79, 29, 75,134,160,224,183, 20,180, 62,108,237,242,103,143,  7, 18,237, 16, 18,
+128,128, 22, 66, 47, 29, 77,169, 49,  3, 74,160, 39,119,230,215, 43,107, 52, 15, 56,109,188,114,137, 61,211, 25,186, 35, 39, 18,
+ 89,249,254,190,189,  7, 81,225,175,  0,116, 93, 75, 79, 19, 81, 20,158,123,239, 48,211,199, 48,125,  8,  8, 72,173, 98,  8,104,
+ 32, 33, 32,110,116,227,198,181,123, 87,174, 76,252, 11,110, 93,232,206, 95, 97,226,206,196,141, 27, 13,108, 52, 33, 46, 80,  9,
+ 81, 32, 64,171, 34,180,149,215,132, 62,102,202, 92,207,119,110,139,175,152,176,108,232,237, 60,238, 61,231,124, 47,224,171, 16,
+124, 90,166,175,249, 85,254,159,252,185,119,159,238,119,250, 63,195, 25,253,207, 88, 70,252, 13,198,158,158,201,127,152, 28,252,
+222,  4,200,223,112, 87,249,159, 89, 80,119,145, 82,118,  1,  3,217,  5,  0,164,185,108, 24,132,227,  7,187, 54,109,137,  8,201,
+ 85, 92,182,107,190, 12,172, 93,134,220,198,208,247, 48,187, 84,142,151,204,214,168, 68,  2, 91,191,201,  0,218, 47,189,149, 50,
+167,165,148, 57,184,214,  1, 45,161, 23,169, 45,162,180,157, 72,185,233,180,155,166,135,146, 54,108, 71,185, 67,153,194,183, 96,
+131,158, 99,109, 64, 14,142, 76,160,231,154, 42,164,201,193,171,149, 96,221,182,163,124, 42,133, 13, 93,232, 84, 82,185,240, 28,
+ 70, 89, 20,208,105,  0, 39,123,224, 50, 17,117,112,128,179,216, 41,131, 93,186, 29,102,155, 43,165,194,118,204,254,165, 18,107,
+112,128,117, 42,164,203, 50,208,194, 53, 79,108,181,205,106,169,190, 86,220, 77,119,156,137,164, 86,182,100, 15, 58,193, 58, 92,
+180, 49,136,  6,228,249,140,113,214,134,149,181,102,198,175,230,228,107,  7, 70, 58,224, 70,  2, 34,102,162, 36,155, 45,187,156,
+199,204, 92,221,248,184,110,213, 57,243,156, 13,160, 69,196,225,199,142,176, 28,173,131, 61,213,140,173,125,204, 31,233, 28,242,
+169, 60,143,145,109,223,128, 32, 25,139,232,105,159,180,  4, 91,  5, 36, 28,119, 48, 59,252,181, 86, 42,244, 21,171, 65,205, 98,
+ 50,102,194,237, 13,195,122,214,203,209, 25,176, 31, 84,206,248,253,212,  4,196, 28, 70,220,  3, 70,179, 26,201,157, 75,185,169,
+114,181,212,182,244,185,220,240,250,246, 42,173, 97,116,104, 60,140, 26, 84,  2,211,135,189, 68,186,222,170, 23,  6, 46,110,237,
+ 66,214, 63, 85,156, 10, 26, 65,191,223,119,253,242,220,211,249,103,126,202,255, 82, 45, 83,149, 68, 47, 52, 93,139,179,217,  1,
+234,147, 34, 29, 31, 30,237,161, 28, 59,137,232, 38,222,189,125,111,254,237, 75,165,  5,198,238, 82, 86, 14,118,115,201, 76, 38,
+237,239,254,248, 78,119, 99,246,210, 52,109,103,158,155, 90, 92,123, 55,218, 95,220,222,219,241,147, 30, 93,236, 91, 51, 55,223,
+172, 44,110,236,108,120,105, 56,139,113,236, 50, 35,101, 40, 11, 84, 95,166,207,177,221, 82,117,131,238,218,220,216,244, 74,105,
+ 53,108,211,147,211,147,243, 50,249,204,192,114,233,195,204,232,236,251,210,199, 27, 87,174,189, 90, 90,224, 60, 57,155,170,235,
+ 36, 71,114,211,205,184,112,182,184,185,187, 53, 49, 50,177,182,253,217,150, 46, 43,141, 32,  6,246,144, 24, 23, 59,  8,215,147,
+121, 63,123,208,170,221,201, 95, 56,255,112,204,242,  4,252,103,142, 27, 86,196, 16,107, 35,130,147, 92, 35,196,223,113,104,213,
+163,184, 25, 66, 81,210, 66, 16,205,243,165,114, 37,  0, 88,100, 92,134, 36,151,151, 74,128,112,201, 89, 48, 28,158, 11,123, 65,
+ 16, 13,  4, 71,  7,131, 57,102,162,163,109, 97,140,192,128,  6, 65,  9, 69,173, 99, 43, 47,135,235,193,249,253,184,157,224, 52,
+ 98,184,237,193,161, 79,140,247, 22, 30, 45,190,216,172,197, 75,205,133, 65, 49,118,127,228, 97,221,253,244,120,251,201,235, 91,
+ 15,106,141,170,209,177,155,220,154,144,161,124,102,103,226,109,240, 18,189,213,160,106,152,240,212,210,177,142, 16,179, 15, 72,
+133,192,121, 59, 49,173,  6,147, 81,116,108, 24,135, 22, 59,196,242,248,155,173, 27,185, 23, 97, 98, 53, 51,172, 99,221,193,198,
+ 58,130,169, 86,212,154, 44, 78, 46,151, 87,168, 63, 48, 72, 40,190,  3,255,196,202,184,254, 17,146, 52, 84, 11, 26, 73,214,  6,
+197, 72, 69, 51, 95,101,198, 41,124, 66,152, 49, 10,179, 90, 68,215,176,214,182, 56, 93,180,147,163, 98, 92,136, 59,165,163,150,
+167, 33,124, 38, 99,139, 71,250,130,127, 26,107,244,121, 95,115,132,123,216, 60,160,178, 12,144,134, 98,120,143,107, 91, 58,159,
+142, 26, 32,143,165, 33,235,179,  0, 32,153, 97,147,212, 84,254,133, 81,243,167,  0,108, 93,203, 78, 83, 81, 20,237,189,167,247,
+121,218,222,  2, 82, 68,209,  0, 70, 35,241, 17, 13, 70,141,  3, 67,100,224, 15, 56, 48,198,168,  3,167,126,128,113,162,191,161,
+ 31,132,134,  8, 19, 99,128,138, 65,229,145, 82,160,175,251,126,186,247, 62,  7,170,  9, 73,  7, 29,180,183,205,189,231,172,179,
+246,107, 45,201,223, 19,201,148, 79,  1,119, 67, 53,176,180, 88, 12, 63, 96,226,218,194,187,114,245,236, 28, 28,161,202, 16,172,
+255,123,157, 90,146, 85, 37, 67,  7,214,108,230,255,215,110,149,225,  9, 81,148, 73, 50,183, 56,173, 76, 43,206,169,178, 42,115,
+215, 39, 10,245,202, 73, 60, 35, 50, 95, 84, 65,  7, 54,  1, 97, 93,  4,193, 90, 46,227, 33, 49,174, 43,174, 12, 75, 20,200,151,
+ 31,121, 89, 30,195,  9,  9,  4, 51,136,124, 49, 31,  7, 52, 80,136,229,163, 34,  2,198, 59,154, 99,141,160,177,159, 82,122,251,
+228, 93,115,103,147,164, 17, 82, 93,131,155,163,  5,112,  5,224,170,113, 96,178, 26,240, 44, 49,155,165,160,201, 41, 92, 68,  3,
+158,220,241, 14,142,220,110, 47,  8,118,187,238,161,151,182, 93,246,187, 51,248,213,245, 54, 90,222,110, 79,251,211,237,187, 17,
+ 32, 99,133,229,220,235,135, 90, 86, 26, 97, 90,195,210,  1,222, 42, 69,137,  3,215,142, 83,141,178,128, 22, 67, 59, 67, 52, 42,
+ 87,201,214, 33,197,180, 40,224, 93,181,162,  0,241, 71,155, 64,106, 22, 67,121, 19, 61,167,100,122,161,209, 76,136,169, 50,216,
+ 34,  9,236,228,  8, 29,  9,177, 77,156, 28,251,200,133, 23,139,171, 73, 86,194,115,  9,213,252,101,111, 85,156,146,206, 76,137,
+ 69,  8,229,169,239,151, 34, 47, 15,163, 60,  8,243, 48, 68,151, 65, 44, 98, 99, 30, 12, 27, 70,  1, 89,224,135,108, 85,153,228,
+198,160,155,117,  3,181, 31, 28, 97, 79, 78,138,206, 21, 40, 32, 74, 61,181, 42, 43, 23, 52, 76,  0,209, 77,197,170,225,200, 70,
+154,132, 73,236,216,163,135,131,182,208,202, 51, 53, 14,167,176, 99,215, 72,187,  2,248,184, 97,105, 86,213,114, 44,211,198, 39,
+149,166,207, 22,158,114,157,127,217, 88,190, 63,247,  0, 48, 17,142, 44, 55,236,155,134, 13,251, 31,184, 24, 61,205,236,249,139,
+151, 95, 87,150,209,165,  1,195,165, 20,208,217,208,245,239,219,223,150,214, 62,147, 56,120,  8,123, 19, 72, 39,196,112,126,232,
+ 98,241,179,127,160,149,141, 65,208,131,231, 56,211,152, 14,227,112,107,231,199, 68,117,124,171,181,  5, 81,160,134, 45, 42, 10,
+132,255,113, 28,  0,154, 24, 58,  0, 22,  3,106,143,201, 37,133, 77, 79, 92,132,143,  1, 11,115,  3,183,  9,223, 26,153,216,239,
+183,227, 60,165, 64,187,  2,251,  4, 32,163,213,221, 55, 12,  8,223,204,187, 87,238,172,111,175,195,234, 58, 63, 54, 85,183,157,
+ 67,172, 39, 23, 97, 18,  0, 55, 92,188,190,176,185,215, 12,163,160,213,217,127,124,123, 17,160, 28,189, 74, 76,126,115,250,  6,
+252,127, 88,108,220,228,176,153,  1, 40,225,124, 66, 37,156, 60,133,187, 52,211,152, 73,146, 24, 77, 19, 89,217,225,163,117, 62,
+ 30,166,238,252,153,121,126, 47, 43, 57,140, 98,183,252,120, 79, 22,242,141,136,233,  8,220, 20, 82,178,177,116,182,182,211,235,
+  5,137,172, 62, 34,175,192,117,133,129, 30,195,185, 13, 28,155, 32,135, 44, 93,197,123, 81, 70,133, 96,180, 31,208, 25, 57,  7,
+ 96, 15, 87,169,172, 72, 39, 37, 74,241,169,137,210,155,180, 27,188,122,217, 13, 58,140, 52,214,133,145, 33,215,141,102,103,239,
+103,219,123,243,254,245,199, 15,159,166,204,107,133,214, 95,242, 87, 94, 93,122,152,228,158, 24,113,145, 44, 78,234, 88,145,200,
+  9, 10,197, 36,179,231,102,123,254,128,102,203, 11,250,239,136, 67,220,172, 98,110,157,224, 34, 21,185, 12,  1,186, 36, 83, 40,
+  0,156,220, 32,  4,165, 70, 62, 88,200,140, 44, 78,177, 83, 47, 77, 33, 68,200,235,118,253,209,173,133,213,205, 85, 69,149,205,
+178,199,180,181,240, 34,159,188,134, 72,163, 86, 68,198,196,224,185, 94,137, 73,146, 87,102,240,101,149,163,248, 23, 11, 69, 86,
+ 64,246,122,160, 77, 80, 13, 47,146,231, 83, 99, 23,188,120, 32,168,175,195, 29,147,153,134,129,221,128,  8,220,118, 21,139,130,
+244, 91, 25,182, 48,197, 52, 84,165,202, 51, 66, 25,  6, 99, 98,198,149, 92,  3, 81, 33, 17,144, 10, 45,188,211,  4,173,107,179,
+228,175,  0,124, 93,203,106, 19, 81, 24,158,123,230,146, 76,218, 73,164,157,182, 94,104,172,  5, 69,112,227, 66, 80, 65,193,133,
+143,160, 75,215,186,114, 39,184,241, 41, 92,248, 10, 46,124,  4, 81,180, 40, 40,138, 84,171,182,222, 82, 91,211,166,211, 92, 38,
+115,201,204, 25,255,239,156,164,  6, 65,187,106, 33,  9,105,114,206,119,254,243,255,223,229,160,255,206,228,137,190,243,100,229,
+158, 97,135,176,201,122, 60,227, 18,101,250, 33,112,255, 79,199,230, 31,213,247, 65,189,127, 48, 19,158,108,220,203,163, 33,  1,
+ 30,197, 38,251,225,242, 95, 13, 28,161, 20, 27,207,157,139,137,219,192, 72,168,202, 21, 16, 96,  0,194,117, 25, 35, 75,219,168,
+ 32,148, 91, 98, 60, 60, 11,211, 30, 75, 51,  7,195,152, 62,214, 36,143,233, 97,128,111,254,174, 64,125, 97, 57,221,211, 17,231,
+  4,118, 18,150,  1,  1,135, 12, 84,205,158,172, 62,238,197, 96,125,209,202,167,167,152,154, 41, 73,154,131,179,161,175,169,165,
+118,127,135,214,127,138, 72, 76,168,224, 96,126,164,186,200,235, 73,163, 91,215,239,188,124,251,220,198,183,155,100,108,192,152,
+ 78, 11,228, 72,253,196, 86,103,179, 55, 28,254,234, 15,182,194,110,161, 31,106, 14,246, 90,105,214, 12,227,159,221,  4,226,116,
+130, 60, 73, 41,201,178,107,168,117, 83,175, 91,165,186, 89,154,162,223,237, 82,165,164, 76, 57,170,101, 20,  6,109, 98, 65,142,
+224,126,  3, 25, 40,108, 76,196, 56,148,184, 15, 26,167, 24, 21, 84,245,219,150,226, 56,116, 45,149, 45, 75, 49,116,201,210, 85,
+ 27, 77, 33, 68,250, 85, 76,197, 18,138, 82, 42,176,121,150, 56,168, 64,252,152,140,232, 96,136, 89,146,230,125,130,177, 48, 79,
+ 83, 88, 87, 74,220,230,222,210, 20,171, 36, 83,217, 94, 54,164,163,142,181,222,220,255, 18,244,226, 44,196,101,132,103, 19,170,
+176, 13, 64,247, 80,  6,119,136, 14,191,204,247,230,235,110,109, 39,216,102,133, 80,163, 20,136, 35, 80,168, 24,153, 82,249, 22,
+ 24, 14, 35, 85, 53,174, 93,190,182,178,250, 84,216,144,  5,189, 29,238, 10, 43,211, 71,186,178,182,194,249,156,249, 86,176,153,
+ 36, 49,149,219,167,142,157,222,237,180, 96, 50, 28,238,  1, 67,242,156,192,221,181,171,113, 58, 56,214,104, 92, 56,123,105,253,
+235, 39, 90, 48, 21,179, 74, 27,188, 86,246, 32, 50, 74,224, 92,132,178,151, 14, 15,122,100, 22,207,123,254,126,119,151,144,136,
+240,130, 94,135,238, 28,173,110,139,254,247,165,185,198,204,180,191, 60,191,244,109,251,139,174,170, 23, 79, 94, 56,236,205,124,
+248,177,102,104,170, 95,245,203,150, 77, 39,183,173, 91,231,207, 93,221,248,182,154, 98, 12,174, 31,173, 31,217,237,180, 97,241,
+ 24,245,  8,199, 63,110,173,249,211,115,253,168,123,229,204,165,135,207, 30,209,129, 68,133,127,208,223, 67,158, 76, 20, 82,241,
+ 94,171,212,118,247,219,158,235,253,216,105,210,155,140,134,225, 50,100, 53,155,  2,148,218,189, 64, 36,160,201, 24,249,184,180,
+207, 59,112, 66, 63, 94,181,171,220, 87,121, 95,211, 84,215,172, 80, 93,153,231, 81, 60, 12, 44,221, 97,189,237,197,203,179, 82,
+221,192, 54, 18,  4, 22,174,115, 31,169,111, 20,  1,160, 88, 49, 90,145, 19, 46,151, 29,251,253,247, 96, 47, 78, 21, 65, 52,230,
+179, 80, 29,107,  6, 53, 14,156,161,225,  3,165, 42,114,113,144,  1,164,240, 52,137,178,166,121,150,121,120,122,138, 91,169, 23,
+ 58, 15, 40, 22, 61, 97,250, 34, 92, 24,102,206,  7,200, 16,215, 10, 52, 91,170,244,212,198,236,194,235,230,198,155,246,230,237,
+187, 55,239,223,123,176, 96,158,148,245,238,139,244,221,141,197,243,116,195, 27,183, 47, 20,113,203,103,162, 58,150,216,140, 55,
+219,  9, 49,188, 73, 97,135, 38, 84,103, 80,180,248,158, 79, 11,131,167,247,113,176,135, 17, 22,231, 15, 51, 30, 75,204,248,168,
+ 77, 42, 70,234,243,113,199,155, 11, 71, 11,193,245, 88, 94, 88,238, 65,215, 10,219,240, 48, 13, 95,125,126,  3, 37, 14, 98,155,
+242, 92,112, 85, 56,246, 80,209,183, 56,211,248, 25, 52, 37,238, 81, 88,140,161,210, 50,156, 40,  3,119,222,117,170,  9, 55,254,
+ 29,211,232,255,244, 38,184,235,248,184,129, 66,216,109, 86,232, 70, 66,175,214,234,208, 70,135, 13,  6,227,109,176, 48,  9, 35,
+168,165, 32, 76, 33,184,  0,201, 93,226,100,239, 66,246, 42,181, 40,141,124,111,174, 75,187,224,207,132, 85, 22,118,191,138, 52,
+178,204, 65,247,157,138, 86,148,249, 24,  9,208,223,191,  5, 32,236, 90,122,154,136,162,240,189,243,106,167,175,161,211,242, 20,
+ 20, 48, 54, 49, 38,154, 40,129,176,112, 97, 92, 26, 55,  6, 23,198,141,254,  0,119,238, 77,252, 17,198, 95,100,140, 11,  9, 17,
+ 66,  2, 18, 33, 66,  1,219, 82, 90,153,247,148,250,157,115, 91,209,104,116,215, 38,147,153,204,220,243,248,190,115,207,253,206,
+ 69,253, 93,251,227,252, 81,255,111,120,252,191, 56,253,223,101,122,117, 91, 83, 90, 84,103, 96,158, 32,105,180, 21,112,  1, 55,
+ 74, 15, 19, 19, 15,241,101,253, 88,221,198, 23, 28, 52,183, 92,220,225,183,221, 92,238,  5, 27,236, 64,255, 58, 94,138, 77,132,
+ 52, 12,240,126,128, 54, 30, 77,100, 86,226, 25,120,124, 38,161,211,248, 88, 66, 50,151,124,166, 64,170, 20, 92, 15, 81, 75,193,
+134, 18,193,116, 72, 98, 76,227,209,174,116, 59,146, 89, 39,101,158, 65,191,189,129,240,253,112,241,209,218,222, 42,137, 16,145,
+ 76, 71, 60, 89,158,110,118,142,121,143, 30,  4, 51, 74, 41,  5,167,126,226, 39, 73,242,126,253, 29,156, 48,  1, 16,129,253,  9,
+150,157,232,197,199,221,125, 75, 47,198,189,208,177, 43,166, 97,157,248, 71, 84,227, 67, 64,215, 92,255,220, 75,133,222,137,123,
+223,226,184,225, 27,199, 33,141,242,106,195,133,101, 31,236, 49,167,153,174,153, 25, 45,228, 29,211, 44, 25,217,108,223, 40, 72,
+ 16,117, 19, 63,108,221, 36,163, 76,101, 74,211,123,100, 20,244,168,227, 37,161,183, 29,136,209,113,163, 53, 33, 47,171,207,218,
+238,162,144, 69,232, 71,208,151, 36, 32,108,144, 81,145, 42, 23, 11, 53,229, 76, 35,103,  1,163,145, 70, 77,  5,216, 35,111, 58,
+ 69,195,205, 91, 37,219, 40,216,200, 16, 50,171, 73,176, 13, 71,154,159,246, 90,187,109,143,  5,134,184,135,141, 93,104,202,157,
+113,178,101,216,238, 98,109,121,231,120, 27,159, 22,142,138,  8,149,203,208,164,189,169,242, 76,209, 38, 10,133,181,  0, 76,158,
+ 28,153,  6, 96,183, 12,219,143,189, 86,183,  5,199,163,208, 47,180,169,234,165,132,132,248, 85,137, 64,175,228, 43,126,236,219,
+ 89,187, 54,125,189,235,119, 16, 70,145, 63, 86,238, 61,174,218,213,253,214, 62, 69, 37,  3, 38, 30, 45,213,150,215, 54, 87, 55,
+183, 55,  4,205, 33,176,224,189, 14, 29, 56, 12, 73,201,137, 59,137,113, 67, 80, 90,184,165,174,134,192, 17, 79,165,246, 24,172,
+ 99, 46,147,127,118,255,169,231,159, 53,189,246,215,198,222,231,250, 86,213, 25,155, 25,191, 34,123,233, 89,224,195,150,198,157,
+177,131,246, 97,204,162,154,240,216,237,157,117, 60,229,206,181,219,251,205,131, 32,138,192,142, 96, 15, 69,187, 52,225,142, 29,
+180,142,206,162,239,126, 24, 54,207, 78, 88, 47, 48,154,159,156,109,117, 72, 99,214,143, 34, 16, 85,215,157, 88,121,240,100,247,
+203, 54, 94,106,212,169, 82,161,128,240,151,141,235,121,  4,141, 64, 14,155, 31,159,163,  2,116, 47,157,170, 76,226,233,245,211,
+ 58,114, 27, 18,201,169,223,  6,190,195,131,  2,150,202,129,  9,155,150,169,135,254,141,187,151,197,156,205,206,214, 23,170,241,
+ 74,246,  7,243,123,  6,  0, 80,  1,101,  9,112, 46, 44,243,195,250, 97,152,158, 43,234,166, 68, 96,248,176, 27, 73, 70,171,170,
+ 66,143,179, 53, 87,167,169, 62,109,225,147, 74,163,144,177,102, 42, 35, 70,214, 56,  9, 73,235, 41,195, 53,152,159,162, 81,169,
+  8,116,207,110, 39,240,119, 13,148,101,185,182,176,215, 56,  8,  2,127,231,180,177,209,108,188,124,245,226,205,235,183, 87, 11,
+ 11,194,232,126, 76,182,158,207, 46, 69,125,143,251,155,127,134, 80,193, 77,253, 37,238, 89,151,  1, 41,198,240,185, 18,218, 57,
+ 34,249,156, 48, 78, 65,161,162,132,172, 91, 97,118,133,199,111,206,222,170,183,235,192, 42,229,210, 40,210, 42, 79,247, 81,146,
+228, 98,112, 84,148, 68,168, 70, 40,152,138,243, 70,167, 73,135,111,212,214,164,212,203,197, 50,139,218,218,113,156,128,178, 19,
+164,227,241, 26,112,231, 70,183, 37, 46,250,215,149,148, 35,176,  8,137, 31, 68, 41,248,147, 21,167,161, 98, 73, 44,127,112,209,
+208,194,255,213, 68,  5,250,244, 64,232, 88,214, 19,175,229,230,221, 40,142, 21,221,  0,226,150, 67,185, 39,213,167, 52,236,173,
+ 35,122, 97,104,166, 23,  7, 17,205,124, 72,  7,245,  9,109,200,199, 52, 49, 60, 24,164, 46,239, 81,206, 80, 81, 81,138, 31,  2,
+ 48,118,109, 61, 81, 67, 65,184, 61, 61,167,183,237,178, 11,203,101, 81,  9,209, 64, 76, 76,136,111, 70, 30, 12, 15, 62, 25,255,
+130,254, 55,226,131,241, 15, 96,120,210,196,132,248,  0,162,196, 53, 18,110,114, 95,220, 11,108,247,214,118,219, 61,117,102, 90,
+118, 53,129, 68,120, 34, 57,  9,237,194,153,249,102,230,155,239,227,  3,156,126,211,102,233,173, 63,170,202,255,126,197, 55,157,
+239,145, 87,203,176,185,143,241, 46, 26,156,209, 85,  4,182,112,  3,225, 41,131,190, 23, 96, 86,255,167, 83,175,222, 74,191,188,
+ 78, 75,196,166,137,211,205,219,216,226, 54,138,234,200, 36, 23, 51,  8,217,221,168,131,130, 18,154,128,240,219, 99,125, 36,243,
+ 37, 34,149,169,227, 65,210, 96,161,137,127,140,125,124,116, 17, 81,100,206, 25,109,180, 27, 49, 53,207, 24, 42,120,250,240, 87,
+127,251,233, 13,156,132,154,136, 28,107,253,131,202, 62, 10,224,168,108,196,202,215,187, 53, 20, 95, 11,113, 90,162,162,208,138,
+212, 24,148,120,186,135, 78,184,164, 77, 71,109,114,215,199, 37,172,178,123, 78, 14,174,184,240,  9,233,183, 27,161, 62, 17,128,
+ 54, 78, 11, 71,161,210,233,247,181, 82,211, 61,186,108,249, 18,123,112, 28,203,100,101,196, 50,115,166,152,205,102,167,179, 25,
+219,182, 13,166, 77, 24, 70, 61,232,193,221,178, 98,110,192,195, 43, 40,116,  9, 33,187, 21, 81,110,241, 36,212,127,161,  8, 13,
+147,235,  2, 31,128,163, 73,  9,138,118,216, 54,217,151,195,107, 68,172,  7,224, 33, 68,238,151, 31, 34,131,  1,192,  0, 84,229,
+ 30,122,131,209, 71, 19, 65, 96, 66, 56,  9, 79,152,183,245, 41,199,168, 53,188,245,131, 43,168,239,161, 60,152, 30,155,217, 62,
+ 47, 17, 66,194, 44,119, 88, 61,192,253,163,208,251,113,252,253,206,216,189,122,179, 26,163, 28, 43, 60,188,238, 75,191,222,169,
+ 26,204, 48,209,122,219, 88,152,121,180,125,242, 19,224, 51,105,242,241,171,102,157,150,215,188,172,149,131,127,114,136,254,104,
+166, 72,151,115,191,178,135,150,170,157,102,229,234,183, 33, 44,212,224, 53,173,229,213,229,  7,197,185,166,215,  4,144,139,154,
+ 88,113,184,117,180,165, 27, 38, 73, 12,234,112,108, 52, 83, 16,130, 95, 93, 52,252, 48,120,253,252,213,225,249, 33,250,132, 48,
+117, 99,119,  3,110,117, 27, 45,146,185, 35,178, 93,196,  1, 80,112,132, 43, 27,171,173,182, 11,137,103,174,120,223, 80,121,161,
+ 48,181,180,176,244,181,180,118, 82, 63, 11,124,223, 51,  3,  0,176, 79, 31, 62,  9,250,189,141,157, 77,199,114,244, 40, 62,174,
+156,154,134,157,216, 15,189, 92,124,177,242,249,253,222,197, 97, 49, 95,132,219,  7,  9,222,133,250,140, 41,243,197,249,197,199,
+ 75,103, 31,222,193,175, 43, 56,163,249,217,169,198,217,101,175,211,114,204, 12,164,159,114,189, 12,145,168, 92, 43,231,157,172,
+206,120, 46,147,245,194, 94,151, 28,194, 32, 55, 20,114,133, 70, 11,  3, 58, 87, 24, 36,176,163,218, 17,225, 66,214,241, 91,147,
+ 99,119, 39,166,166,127,237,175, 67,141,217,225,150,178,227, 42,207,198, 17,164,247,117,140,239, 26,142, 62,144, 81,195,  7, 46,
+109,212, 45, 16,232, 93,208,250, 86,133,202, 76,215, 88, 72, 33, 94,198,233,172,142,209,202,158, 42,101,252,247,197,  7,152,163,
+169,150, 16, 72,168, 21,218,113,199,109,214, 61,192, 61, 25,156,216,224,183, 96,  9, 32, 82,133,136, 38,133,233,143,207, 94,158,
+238,194,167,244,177,180,198,  0, 67, 25,136, 36, 77,197,198, 17,168, 18, 59, 60,219, 66,237, 82,147, 40,251,164,162,138,180,  3,
+178, 38, 67, 18, 49,183, 12,211,239,  7,  0,  8, 18, 23,  1,153,178, 63, 84, 50, 19,166,125,218, 52,112, 35, 97,153,140,222,250,
+ 95,246, 54,  5,231, 80,146,251,110, 69, 38, 27,254, 41,108, 87, 82, 79, 34, 56,140,100,138, 88,146, 11,216,245,168,143,106, 96,
+ 57, 92,123,108,  7, 77, 98, 70,202, 56, 29,180,146,201,220,192, 89, 34, 49, 54,196,  3, 56,  5,161, 68,130,188,154,196,245, 66,
+ 29,116,195, 18,123,207,148,179,159,200,250, 37, 12, 33,  9,176,143, 36, 92, 37,170, 58,114,173,226, 86, 53,114, 82,187,102,243,
+ 37,197,  6,190,128,219,117,113,102, 38,195, 33, 69, 50, 30,118,180,213, 84,125, 64, 73,204,177,  1,136,192,171,212,208,124, 92,
+253, 35,  0,101,215,210,218, 68, 20, 70,103,238,157,153, 36,211,166, 77, 99,211, 23, 20,219, 34,138,148, 22,171,226,190, 32,  5,
+ 55,254,129, 46,253, 29,130,127, 68,  4,117, 45,  8,174,186, 16,  4, 91,186, 80, 81,236,203, 42, 45,244,153, 52,233, 35,175,121,
+100, 30,241, 59,223,157,212, 86, 68,116,153,217,204,100,230,222,115,191,199,249,206, 49,206,201,148,250,191, 33,251,223,233,237,
+255,  9,251,151,160,191,163, 34,  9,244,135, 56,  1,  6,127,245,246, 31,186,175,191,117,119, 47, 50, 27,117,117,110, 38,122, 58,
+ 29, 63, 42, 31, 61,179, 16,204, 46,230,133,177,202,  2,240,199,109,123,120,239,177,160,157,147,136, 44, 11,165,162, 31,167,173,
+ 44, 84, 10, 88, 28,174,195, 85, 18, 39,213,242,244,196,157,239,123,235, 20, 94, 65,190, 82, 24,220,111,194, 93,156,192,229,162,
+190, 78,169, 64,211,175,251, 65,171, 20, 28, 34,234, 17,129, 98, 69,161,128,169, 73,120, 98, 99, 29, 66,211, 15, 73, 71,152,232,
+203,113, 23, 84, 87, 19,106, 66,143, 36, 92, 87, 35, 52,  0, 36, 62,191,100, 57,235,182,136,242, 54,232,170,181, 86, 76, 55,160,
+240,208,  9, 34,  2,163, 98,172,125, 11, 43,234, 52, 39,164,156, 26,204,209,195,235, 25,139,192,213,128,209,187,180, 92, 48,212,
+108, 33,123, 51,169,235,217, 44,202,223, 26,  6,156, 17, 97, 19,238, 64, 26,205,  8,221,184,234, 33,252,241, 64, 74, 18, 65,160,
+241,170,230,177, 58, 22,163,  2,153,172,133, 38,170,169, 94,146,174,245,219,169, 30,211,114,253,120,105,237,232,168,225, 75,153,
+182, 77,171, 82, 47,110, 30, 64,160, 28, 58,215,128,  5,  1,140,246, 28,219,176, 27,126,163, 14, 95,158,144, 78, 62, 58, 50,107,
+ 94, 13,134,186, 45, 47,211,101, 55,156, 42,133,231,110,224, 53,  3,135, 50,208,148, 48,231,102,230,150, 55,150,232,138, 50,217,
+ 41, 86, 15, 29,207, 61,183, 65,231, 40, 94,137,143, 34, 48,163,216,188,238, 53,109,171,123,126,118,254,201,139,199,147, 87, 39,
+  9,178,251,179,  5, 10,255, 41,127,145, 44, 47, 83,170, 22,  9,247,143,105, 11, 65,150, 78,123,186,240, 76, 98,232,193, 31, 45,
+140,101, 80,175, 12, 29,223,233,235,202, 15,247, 13,111,238,111, 96,245, 24,102,241,172,148, 49,210,131,185,161,129,158,161,245,
+221,149,221,242,206,215,205, 15, 35,185, 17,215,119,108, 51,125,247,218,204,226,234,226,231,173, 47,163,253,163,244, 19, 70,184,
+169,238, 66,207, 21, 90,127, 53,167, 78,223,229,227,198, 39,203,180,210,166, 21,107,225,126,249, 16, 90,226,244,212,154,204,166,
+186, 95,191,123, 69,175,221,176,229,126,249, 96,188,235,198,118,101,229,229,155,231,247,167,103, 13,156, 70, 65, 79, 38,123, 84,
+171,152,102,234,225,189,  7,239,215,150, 61,175,154,179,123, 43,181,242,237,137, 91,187,149, 61,202, 90, 40,126,167, 96,175, 59,
+133,188, 71, 50,146,112,  2,212, 42, 12, 12,113,173,185,237,153, 93,219, 11,123,227,143,110,106,  4,166, 81,147,199,234,120,129,
+ 11, 14,225,209,164,135,225,147,214,107,162, 26,189,122,250,118,121,  7,174,  9,154,130,190, 14, 11,156, 27,144, 23,235,181,138,
+171,  7, 75, 75, 41,242, 89, 91,166,205, 83,215,  9,113,246, 75, 30,188, 69,230,198,189,124, 86,180,101, 31,119,215, 45,231,236,
+169, 10,212,  6,  5, 51, 86,100,196, 81,182,218,247, 77, 45,176, 52, 99,207,219,137, 88, 36, 71,176, 83,149,206, 93, 80, 61,142,
+144, 78, 71,218,113,253,152, 54, 12,253,205, 80,136,241,252,216,143,210,150,143,234, 53,108,192, 66,140,112,160,  8, 19, 43,213,
+  5,140,119,194,229,147,221, 36,193,217,111,199,241, 57, 74, 38, 65,183,114, 56,162,111,  4,254, 30,229, 45,  6,  5,197,202,213,
+155, 91,166, 26,230,186,194,176, 17,213,241,  4,220, 90,253,197, 81,108, 39, 37,157,118, 98,156,150,216,122, 83, 30,  0,  5, 87,
+ 16,124,141,124,182,159,150,141,141, 17,185,166,154,237, 50, 18,223, 37,149, 27,  9, 53, 22,195, 76, 16,221,241,154,170, 40, 29,
+ 41,151, 64, 80, 42,216, 60,141,163,152,115, 54,126,199,114,137, 79,219,203, 66,  0,226,130,222, 77, 98,104,221,142,207,154, 39,
+220, 92,193,165,159,  2,176,118, 45,187, 77, 67, 65,244,218,215, 78,108,231,225,164,143, 52,168, 65, 77, 43,144,128, 21, 11, 86,
+124,  2, 18, 43,126,128, 79,227, 11, 88, 32,132,  4,136, 45, 66,109,165,168,139, 66, 90,181,180,105,200,163,121, 55,142,227,248,
+205,204, 92, 39,  5,193,  6,137, 31,176,147,235,185,103,206,188,206, 40,236, 95,104,251,127,133,248,223, 94,145,230,168,  8,239,
+224, 70,111,153,170,211, 33, 75,148,206,208, 78,132,174,127,244, 55,136,143,153,178, 18, 56,203,106,121,128, 74, 84,142,252,149,
+202,211,113,137, 22,120, 60,168, 72, 40, 92,196, 16,194,135, 97,184,172,112,163,113,194,133,199, 98, 69,136,186,154,118,100,137,
+ 28, 76, 81, 55, 83,170,222,159, 94, 51,218, 85,113,116, 81,  3,184,217,217,172, 54,  7, 77,225, 52,105,140, 80,246,209, 16, 84,
+120,219,100, 49,166, 70, 63,209,142, 41,149,243,101,112, 15,148, 72,247, 72, 84, 67,162, 86, 10, 38,254,142, 72, 45,  5, 52,172,
+140,117, 77, 68,113,106, 53,  6, 48, 96,124,175,240,168, 57, 61, 71,197, 73, 22,240,  0, 94,129, 59,189, 73, 72, 61, 82,104, 49,
+  3, 23, 75,230,105,250,158,115, 81, 95, 10,235,195,177,206, 93,156,228,164,  7, 35,163,145,177,135,  3,252, 27, 68,  6,128,253,
+247,139,197,106, 62, 87,192,234, 66,214,148, 48,247,  2, 92, 30,229,248, 89, 48,115, 60, 75,138,231,216, 69, 20, 80,150,136,102,
+175,240,186,226,230,129,208,  0,238,197,193, 77,101, 83, 28,248,163,237,248,251,223,251, 67, 11,156,167,195,165,148,231,217, 51,
+127,162,171, 57, 35,149,107,141,174,224,172, 53, 85,155,187, 78,224, 47,  0,224, 12,173,  0, 22,143, 63,  9, 59, 86,248,100, 54,
+146, 21,133,124, 49,220, 77,182, 91,222,187, 30,119, 15,207, 14,224, 50,220, 41, 84, 28,127,254,177,246,126,238,205,133,116,193,
+192,234, 83, 25, 77,  7, 87, 69,251,181,117, 27, 53, 73, 34,192,101,112,114,134,150,237,223,116,224, 19,164, 52,253,237,254,155,
+141,226,214,166, 89, 66, 33,142,208, 79,180, 88,163, 64, 85,141,148,164, 64,124,155,207,172, 45, 60, 59,165, 40, 96,105, 15,239,
+ 62,168, 55,190, 78,102, 67, 47,160,110, 78, 22, 14,173,  1,176,108, 51, 83,180,156,105,121,173,210, 25, 52, 32,244,182,221,233,
+105,251,196,163,237, 55,240,107,102,174,173,113,117,167, 92,109,116, 27,156,243, 23, 79,159,191,254,252,174,152, 47,186,174,219,
+ 25,183,219, 55, 93, 89, 68,126,146,220, 26,117, 80,213, 54,242, 55, 50,235,112, 77, 81,114, 54,246,178,105,179, 61,234, 66,172,
+ 80,200, 20,128,176,239,150,170, 21,185,120,132,162,110,252,203,217, 65,165,180, 51,178,198, 16, 10,120, 88,117,118, 26,189,171,
+177, 61,  1,127, 12,240, 13, 95,255,199,160,133,243,238, 44, 66,194,193, 36, 67, 53,168,203, 59, 18,211,239, 97,224,215, 79, 15,
+ 21,  8,245,112, 34,164,215, 28, 70,219,175, 62,165, 94, 62, 99,104, 74, 19,166, 16, 94,112,202,108, 35, 17,  0, 60,207,176, 90,
+247,226,195,249, 81,189, 55,116, 92,224,  1, 88,213, 32,189,160,208, 23,240,144,180, 96,173,  6, 15, 41,221,137,155,249, 42, 27,
+249,133, 28, 77, 45, 11,112, 21, 32, 82, 69,128,140,133, 24,155,104, 83,  3,179, 83,200, 42,211,138, 23,205, 44, 44,174,104,198,
+124,225,193,205,210,228,180,231,133,154,142,187,177, 38,108,182,173, 85,246,231,158,153,206,  7,145,139,139,106, 49,240,205,155,
+ 70,230,164,115,153, 91, 47,207, 71,125, 28,162, 21,156, 61,138,176, 34, 66,126,231,201,189,199,181,203, 99,184,114, 91,102,233,
+184,245,141,228,224,104, 95, 82, 64,  2,245, 50, 11, 48,155, 71,124, 62, 78,210,185, 98,  8, 55,190,109,199,128,208, 77, 49,211,
+102,223,237, 69, 75,124,228, 50, 98,  8,202, 10,105, 89,136,  0,134,179, 27, 89,138, 87,178,180,183,204, 90, 20,126,105,229, 88,
+210,209, 71,199,  5, 15,204,164,113,200, 57,173,104,182,235,  8,150,  9,252,  6, 44,208, 15, 93, 81, 30,141,165,165,244,215,106,
+168, 83, 98, 99,107,204,150, 27,208,153,152,125,100, 75,177,  2,  1,130, 44, 81,164,249,163,229, 36,145,131,148,146,225,127,244,
+ 14, 20, 57, 39, 58,140, 63,  5, 96,236, 74,118,155,  8,130,104,207,238,217,226, 69,182,147, 40,137,  2, 18, 66, 32, 33, 33,113,
+  0, 62,129, 59,159,192,133,  3,119, 62,130, 95,224, 15,144,184, 32,  4, 39, 56,162,  8,133,229,192,201, 33,193,132,216,216, 25,
+143,199,179,122,182, 30,170,186,199, 73,  0,  9,113,241,201,158,145,103,170, 95,191,234,122,245, 74,254,  7,148,255, 79,243, 42,
+206,  9,100,170,243,255, 63,127,255,251, 11,204,110, 16,167,204,178, 20,  3, 34, 44,171,  7,212, 18,174,132, 21,203, 11, 66,204,
+139, 87,101,150,100,213,234,228, 93,138,113, 38, 97, 33,158,221,147, 15,134,173, 68,222,169,180,106,  7,168, 50,148,143, 84,170,
+108,178,169,187,252,185,112,215, 48, 52, 68,217,237, 94,154,120, 99, 94,232,128,120,117, 99,192,107, 15,247,  9,177,146,113,202,
+ 43, 92, 95,108, 91, 29, 72,141, 41, 14,180, 83, 41,182,119,166,248,158,197, 66,145, 20,  8, 70, 69,107, 96,165,  5, 85,139,194,
+216, 27, 17, 38,165,101,147, 82,  0,117,  1, 70, 51,110,199,192, 29, 80, 89,234, 91,  2,137, 88, 98, 45, 18,181,232, 52,173,141,
+ 91, 15, 60,167, 16, 82, 85, 50,112, 61,227, 25,227,170, 66, 34,254,182,125,115,130,133, 61,243, 88,202, 32, 97, 73, 66, 57,173,
+ 89, 87,121,225, 45, 34,101, 19,130, 44, 58,134,237, 61,  3,214,193, 68,232, 70,  3, 56,120,175,185,182,110, 24, 91,166,121, 99,
+179,103, 27, 90,207,208,  0,239,153, 89,163,144,226, 90,167,240,118,208,227,190,160,128,183,131, 81,112,120,226, 59, 11,234, 70,
+129, 38, 91,247,110,222,127,181,255, 12,224, 79, 17, 13, 32,113, 16, 12,211,197,164,100,231,157, 56, 62, 27,139, 84, 42,  4, 93,
+142,117,136, 76, 18,225,113,229,126,236,155,186, 29, 39, 11, 93,179,129,174,206, 99,215,199,244, 19,229,213,240, 76,166,139, 17,
+206, 33, 48, 91,180,208,218,102,219,139, 61, 72,165,129, 68,  7,201,194, 99, 93,139, 13,213,100, 44, 21,235,104,  0,214,148,118,
+224,167,186,102,  2,104,238, 15,222, 95,221,190,190, 63,248, 32,203, 90,156,248,146,164,233,186,177,196,228,172,138,178,168,109,
+183,179,108, 41,225, 59,194,  5,219, 94,235,104, 13, 11,219, 62, 33, 12,112,108,222,229,241,236, 88,197, 30,  1, 37,203,179,225,
+228, 91,199,110,206,  3, 23,246, 93,213, 82,205,  6,142,152,176,212,198,221,107,119,222,126,122,115,186,152,180,141, 38,108, 96,
+207,223,189,156,249,167, 22,242,238,178,219,236,  1,188, 96,210,128,178, 37, 41,101,167, 40,101, 65,251,157,254,193,244,187,161,
+106, 78, 24, 86,149, 15,223,209, 84, 77, 83,244, 19,  7,199, 72, 49,139, 40,204,216,210, 52,153, 56, 63,  0,205,113,200,178, 32,
+158, 46, 28,192, 23,236, 48,101, 41, 11, 92,208,141, 92,  8,152, 69,232, 97, 63, 35, 48,137,216,195,187,228, 37,218,121,240,  0,
+ 38,133,109,244,189,100,114,123,227,138, 27,238, 61,122,252,226,225,151,163, 91, 79, 30, 16,178, 65, 68,143, 24, 17, 81, 69,  2,
+251,115,147,145,168,215,131,189,167,251,195, 32, 45, 33,243,208,149, 36, 88, 78,230,126,154,229,154, 42, 75,182,133,226,122,122,
+ 94, 69, 20,216, 60, 79,  0,241,157, 86,115,179,103, 37,121,186,140, 11,  9,101,102,120, 60, 47,177,  6,121, 42, 85, 82,201,124,
+162,184,215, 10,218, 71,139,114, 85,158,140,134,148, 74,144, 93, 37,233, 28, 22,185, 41, 27, 94, 26,181,119,214, 32, 36,  3,226,
+246, 27,232,122,223,178,236,174,221, 26,122, 33, 36,170,240,247,103,209, 92,151,149, 78,119,211,164,228,216, 29,163, 82,134,169,
+158,163, 52,102, 69,197,106,228, 78,163, 44, 89,102,217,204,119,114,230,249,133, 39,186,180, 52, 13,107,119,125,247,227,209,103,
+145,112,112,175,207,241, 25,223, 62, 27,254, 70, 87, 58,145,124, 26, 78,  5,114, 78,197,225, 19,153,156,128,138,166,164,110, 99,
+ 34,127,130, 59,255, 61,223, 47,136,176,221,221,114,124,  7, 66, 29,254, 53,112,255,175, 63, 15, 33, 54, 89,  3, 93,189,236,226,
+ 60,226, 94,191,220,206,143, 91,151,192,158, 88,112,233, 38,131, 41,164, 80,132, 31,140, 33,  9,149, 33,  2,203, 37, 97,202,227,
+ 26,228,171,170,246,127,100,218, 75, 93,209,147, 34, 17,106, 49,202, 74,153, 82,223,145,167,  8, 53, 64,254, 18,128,176,107,217,
+109, 26, 10,162,247,250,121,237, 56,206,163,105,155, 70, 85, 81, 65,128,132,160, 98,  1, 18, 18, 18, 95,192,146, 21, 11,190,134,
+ 21, 91,118,252,  0,176,166, 98, 85, 88, 21, 65, 43,160, 80,164,  2, 74,161, 47, 66,104,146,166,205,211,137, 29,219,204,204,117,
+ 10, 69, 66,117,183,117, 93,223,155,204, 61, 51,115,230, 28,237,148,234,201,105,151,142,181,242,232, 63, 68,198,211, 47,121,242,
+  8,221,134,128, 38, 93,  0, 67,246, 39,178,203, 43, 64,131,189,191,211,133, 99, 73,119,133,200,239,114,118,128,147,169, 28,201,
+234,157,124,178,101,164,250,126, 55,177, 51,145,189, 83,218,119,200,178, 19,174, 40, 29,191, 26,246,244,186,134,106,109,254, 42,
+143, 21,168, 99, 37,233,143, 72, 75,147,152, 74, 70,241,100,102,122, 99,111,131,232,165,158, 15,161,111,220,  8,129,157, 25,134,
+ 40,148,237, 13,  7, 57,103,162, 61,104,199,241,136,232,138, 92,218,205,  4,248,  3, 47, 19,  6,156,188,197, 25,105, 21, 40, 76,
+216, 76,167,105, 34, 74,255, 80,190, 70, 71,135,110,157,250,  8, 22,210, 18, 66,193, 19,117, 67, 62, 26, 33,205, 17,229, 48, 73,
+123, 75, 46,135,170, 38, 57, 10,202,195,203,  6, 20,160,113,146,232,101,146, 48, 44, 23, 44,130,221, 34,246,187, 80, 35, 13, 91,
+ 84,126, 24, 55,162,160, 81,173,127, 14, 66,244,226,131, 95, 54,116,219, 22, 41, 93,119,133,233, 56,118, 86,232, 37,195,110,122,
+ 65,171, 55, 28,  6,  1,141,  6, 99,223, 70,101, 38, 60,178, 55,104, 62, 91,121, 76,137,  5,220,221, 27,248,  1,228,  1,134, 46,
+ 60,164, 97, 34,113,173, 51,104,195,191,153,113,242, 16,100, 33, 79,192, 38, 18,174,107,212,245,  0, 25, 33,248, 26,250,131, 90,
+103, 63,209,113, 35, 59,111,136,164,128,244,103,242,179,149,131, 31,144, 68, 11, 83,244,177,215, 29,184,118,214, 11,  6,182,200,
+192,194,202, 34,106, 90,164, 61, 52,230, 69,102,117,199, 59,132,195, 99, 58, 59,  3, 56,186,118, 84,181, 76,187,224, 78,110,215,
+182, 34,180,107, 80,225,248, 12,226,224, 92,241,252,155,175,175,138,249, 82,179,213, 16, 66,188,252,240, 34,239, 20, 52,116,150,
+135,212, 74,217,222,255,150, 54, 29, 64,136, 66, 53, 56,206, 34, 42,173, 94, 75,195, 37,198,128, 59, 63,121,230,198,133,235,139,
+171,139, 75,239,151,166, 51,133, 92, 42,235,218,110,173, 85,131,115, 11,182,225,218,194,205,201, 84,118,121,125, 25, 54,171, 93,
+233,192, 93, 46,154,123, 28, 32, 17, 17,199,149,205,140,229,192, 75,193, 43, 88,134,216, 63,218,199,218, 66, 72,222,217,170,122,
+245,236,194,112,228,191, 45,191,211,184, 49, 55, 49,251,105,247,139, 57, 10, 33,202,211, 16,189,143, 21, 58,250,144, 35,165, 49,
+ 26, 33, 45,152,132, 21,209,153,146,133, 25,219, 77,146, 33,  5,  5,176,224,123,144,182,220,130,149,113, 70, 91, 43,173,157, 61,
+ 93,125,240,240,249,157,167,175,111,223,191, 43,238,221, 98,172,196,180,  1,138,142,177, 94,240,104,117,249,201, 26, 28,170,134,
+208,189, 48,172,215,218,171,235,219, 61,198,166, 25,203, 49,102, 92, 49,227, 72, 58,120, 38, 99,175,128, 54,108, 77,187, 84,154,
+176,132,218,238,163,239,132,137, 70,168, 52,177,196, 18,161, 94, 42,133,  0, 28, 64,216,142,144,141,115,184,197, 28, 81,  2,173,
+176,234, 97, 21,179, 26,198,179,142,219,240,142,138,243,151, 25,118,100,187, 57, 35, 87, 15,234, 37,245,162,198,184, 79,170,145,
+164,165,197,178,110,190,185,187, 89, 59,172,  7, 10, 39, 57,129, 40,164,121, 90, 20,247, 96,124,167,177, 11, 81,157,161,127, 83,
+156, 79,231,225,227,  1, 89, 87,249,103, 25,118,106,237,251, 71, 68,238, 36, 26, 19,179,164,228, 62, 46,222, 38,  1,167,152, 43,
+193,222, 97, 21, 30,130,193, 56, 28, 78,185, 83,181,110, 67,138, 19, 16,  1, 95,146, 87,162, 36,190, 39,186, 59,200,176,228, 73,
+112,199, 55,174, 52, 43,161,196,203, 76,126,  1, 17,104,146,110,129,196, 84,138,180,246,132, 85,154, 43,204,237,213,119, 53, 77,
+131, 28, 17, 96, 62,226,  0,250,179, 60,121,126, 20,143,229, 43,109, 67,248,189, 62,231, 73,138,127, 12,219,143,213, 41,221, 84,
+214,107,121,236,  4, 35, 70,249,135,142, 40,175,223,  2, 48,118, 45,187, 77,  3, 81,116,198,227,177,147,166, 78,250,  4,133, 54,
+164, 82, 75,121, 84, 85,187, 66, 32, 64,234, 23, 32,118,136, 13, 91,126,  1,150, 93,240,  3,176,228,  7, 88, 32,224, 27,144,218,
+ 10, 42, 22, 72, 69,  2,202, 67,164, 82,136, 75,155, 71,235, 38,118,236,241,112,239,181, 83, 44,168,  4, 82, 87, 85, 36,203, 51,
+201,153,123,238,156,123,206,  9,250,247,255,  7,119,116,  7,211,209,137,141, 26,254, 47, 76,231,233, 18,224,  7, 81,103, 18,135,
+ 25, 49, 59,255,251,227,198,159,224, 14,139, 24, 39, 78, 50, 60,117,228, 73, 10, 14,106,193,243,244,194,129,161, 25, 88, 68, 40,
+159,  7,124,137, 40,138, 68,103, 44,232,169, 60,161,184,113,148,232,104, 26,119, 78,198,136,178, 38,245,131,203, 93,186, 19,197,
+ 83, 81,  8,203,202,197,104,208, 17,210, 77,108,124,236, 25, 65,217,132, 49, 32, 17,  2, 45, 86, 49,200, 63,160,246,110,105,128,
+165,192,147, 42,200,177, 72,162,110, 92,163,148,201,178, 80, 66,111,  3, 55,208,161,212,145,133,131,171,220, 70, 83, 72,101, 42,
+101,  2,248, 91,134, 77, 26,112, 43,103, 66,101, 37, 11,121,107,172, 36, 75, 37, 49,226,136,209,146,116,134,113,124,212, 96,  2,
+ 88, 51,  0,153, 82,  2,219,152,140,212,155, 56,152, 98,112,224,153, 40, 84, 38,117, 50,202,222, 56,201,243, 49, 47,  0,158, 15,
+149, 58,252, 89, 18, 31,  0,207,193, 64, 38, 83,  0,189,239, 49,213,  9,251,110,207,251,126,208,244,188,192, 50, 45, 60, 81,146,
+104,102,178, 36, 73,178,218,208,133,  6,187,252,178, 79,209,207,216, 83, 22,246, 97, 23,  7, 46, 20,221,127,193, 38,244,  2,239,
+250,197, 21,146,165, 99, 89, 36, 80, 57, 45, 82, 39, 85,173, 39,156,  9,168,127,113, 58, 87,230,  8,180,213,244, 88, 21, 86, 47,
+234,163,177, 45, 16, 50,120,  7, 88,161,142,215, 41,143,151,221,214, 15,204,134, 66,221,126,162, 97,141, 23,171,139, 63,219, 46,
+ 44,248, 66,101,105,255,112,255,236,233,234,118,253, 35,172, 68, 16,246,233, 74,156,  3, 91,183, 76, 27,126, 90,245,102,157,236,
+104, 66,248, 93,  9, 67, 94,158,191, 10, 28,252,192,239,  8,224,142, 10, 13,129, 21,237,102, 98,150,162, 40,150,  4,176,152, 18,
+ 34,185, 51, 52, 60, 51, 57,179,254, 97,  3,211, 96,164, 60,242,187,112,180,140, 20,156,115,229,217, 80, 69,182, 41, 55,222,175,
+239,184,181,229,185,229, 47,238, 55,224,218,240,226,104,252,141, 38,116, 56,208,232,249, 94,101,124,170,209,222,  5,246,  0,111,
+148,183,134,  4, 23,192, 12,  0,149, 96, 39,106,187,181, 11, 83,231,107,187, 59,145, 86, 45,175, 61, 95,158,107,180,221, 62,172,
+ 64,140,205, 37,248,242,192, 87,  4, 14,158,234, 36,186,152,177,212,133, 54,134,  3, 38,142, 35, 97,154, 77,175,  9,165,192,165,
+179, 11,192,129, 48,135,  3, 86,176,119, 48, 58, 84,127,221,112,161, 24,190,213,141,156,189,238,218,203,205,198,234,179,189, 55,
+ 91,149, 48,104, 61,127,199,158,126, 90,123,181,221,179,177,105, 30, 98,170,170,174, 54,187,247,247, 59,119, 24,187,201,216, 38,
+ 99,111,165,113,166, 96,251,132, 91, 10,216, 27, 80,144,225,252, 82,101, 82, 25,176, 35,125,105,114,199, 52,115,210,196, 32,  1,
+178, 70,164,208,222, 84,149,204,  9, 48,  1,241, 45,211, 40,229,109,155, 89,181,189, 66,132,166, 53,102, 18,195, 96, 68,198,163,
+173, 23,183, 87,238,222,152,189,178,250,100,245,222,212,131,199,238,195,106,169,114,173,120,170,141,102,194,188, 31,162,105, 66,
+  7,175,187,133, 31,169,241,226, 40,144,170, 22,234,211,226, 36, 26, 44,162, 82, 29,231, 57, 96, 59,117, 52, 61, 81,249,220,248,
+ 74,228, 38, 73,170, 35,187,146, 88,103,208, 46,206, 66,  9,252, 11, 56, 83, 50,165,154, 25,218,143, 15,131, 35,150,154,144, 37,
+ 67,  2,191, 39,112,244,192,145, 93, 15, 58, 61, 58, 77,150,224,169, 84,146, 15,204,165, 83, 35,182, 99,241, 33, 31,136, 74,121,
+215, 71,179,207, 98,161,232,135, 62, 42, 97, 82,199,182,164,242, 76,193, 61, 17,233,  7, 97, 64,249,122, 60, 83,188,179,227,236,
+ 45,216,125,143, 26,247, 52,168, 99, 24,217,209, 31,226,  7, 89,176,253, 37,  0,103,215,178,155, 68, 20,134,207,156,185, 82,102,
+ 24,  6, 16,218,161,105,106, 20, 72,212,168, 27, 99,250,  4,117,225,214,133,111,224,214, 55,113,227,214,117,223,160,137, 49, 94,
+146,110,138,198,216, 52, 86,106,109,106,172,  6, 74, 11, 76,153,  1,230,194,204,248,255,135,161,142,137, 49,198, 13, 33,100,114,
+230, 48,151,239,191,127,159,240,127,110,251, 95,112, 60,109, 39,100, 94,  9, 66,151,252,158, 93,137, 83, 67,170,255,114,210,244,
+ 92,235,188, 71,158, 99, 34, 65, 92,213, 88, 57,238,125,229, 82,147,176,170,162,  1,162,  2,142,224,168, 49,218,140, 25,187,103,
+ 60,241, 39,  9, 66, 19,178, 32,101,125, 84, 88, 15, 47,186,113, 24, 91, 16,218,216,144, 41,120, 97, 28, 48,239, 58,154, 85,240,
+146,245,177, 57,137,186,222,  8, 28,170, 28, 47,170,153,156, 55, 60,  3, 51,  5, 17, 98, 78,201,219,254,249, 44,213,151,145, 84,
+ 12,175,144, 18, 18,181, 80,224,203, 64,  8, 99, 78, 98, 52,141, 24,104, 51, 70,121,150, 60,129,181,  1,251,217,221, 20,120,108,
+ 66,167,216, 87,199, 97, 15,  1, 51,223, 25, 89, 80, 50,  2,227,107,129,152, 14,194,225, 88,148,137, 72,163,209, 24,  2,243,152,
+  9,181, 83, 69,  2, 35,128, 91,  3,  0,149,120, 70,163, 58,101,207,167,196,136,127,177,219,129, 48,218,122,124, 70,  2,164,246,
+ 69,181, 35, 89,  6,224,192,109,184, 46,135, 60,101,172, 82, 45,130,109, 65, 34, 93,216,  9, 13, 48,101,198, 82,141, 83, 38,109,
+ 22, 32,175,  5,211,190,192,126,  4, 89,196,158, 48, 85,201,103,101, 13,160,106,169,176, 10,230,243,176,221,130,255, 62,158,216,
+ 49,171,112,176,196,  8,250, 16, 91, 31, 95,131,247, 42, 33,245, 37,101,115, 13, 33,220, 19,240,208,189,208,107,181, 63,149,212,
+ 18, 64, 94,223, 57,141, 24, 53, 92,223, 57, 19, 56,193,154, 88,138,160,  0,228, 45, 21,151,  1,245,170, 37,163,245,125, 31,173,
+149, 40,197,168,116,  8,193, 41, 68, 15,246,219,131, 38,192,253,157,218, 90,207, 57, 53, 84,163,211,111,131,213,130,136,205, 31,
+ 91, 96, 87,  0, 38,202,185, 74,119,120,  2, 71,170,153,133,137,235, 81, 65,  8,131, 32,167,107,175,118,158,195, 69,  0, 63,168,
+ 51,236,136,201, 76, 14,151, 17, 84,211, 88,132,247,112,224,244,203,134,169, 80,241,204,238,128, 21,179, 70,231,205,131,230, 90,
+227,238,222,209,174,143, 86,151, 95, 95,187,183,241, 98,  3, 78,209,168,214,117, 28, 83, 26, 92, 53,107,150,107,151,245,210,201,
+160,139, 29,205, 36,190,113,249,166, 61,178, 22,141,197,189,227,125,179,100,  2,  6,249, 83,159,198, 49, 92,138,213,202,202,192,
+161, 21,189, 82,212,138,219,159,183, 95,238,190,129,103,181,164, 22,193,206, 30,158, 28,130,115, 87,214, 13, 74, 69, 48, 69, 63,
+172,182,235,122,195,104,136, 84, 70,152,  8,  5,251,175, 20,148, 66,199,234,192,197,180, 93, 39,159,213,235,102,227,253,151,119,
+121, 77, 15, 66, 14,118, 82, 43,104,157,192, 66,233,  8,112,150, 69,249, 62,150, 97,200, 99, 66,158,108,238,172,111,181, 30,221,
+106,220, 94,170,155,203,133, 99,219,193, 70, 81, 12,  5,201,166,139, 18,246,224,188, 63, 35,228, 41, 28,221, 30, 92,211,179, 16,
+  7,250, 83,172, 25, 94, 55,139,101, 61, 51,246, 60,137, 39,134, 38, 43, 50,207,136,139, 16,250,195,144, 67,198,224,104,166, 15,
+145,228,177,241,241,166, 84, 17,196, 66,118,193,197,144, 23,121,202,224,147,199, 34,111, 44, 18,209, 38,147,135,181,  7,228,  3,
+190, 97,134,144, 15,188, 97,  1, 27,239, 41,132,179,245,234, 21,199,155, 28,117,191,193,138,189, 49,182,165,119,157,158,231,  3,
+230,131,  7,129, 85,123, 31, 65,126,202,148,222,167,176,129,146,118,  9, 37, 21, 19,  9, 13,142,137, 75,198,115,245,209, 52, 61,
+ 34,119, 49,134, 63, 23,  8, 73, 64, 41, 76,126,165,233,218, 94, 20,115,169,222,142,139,223,184,249, 50,209, 92,240, 46, 98,227,
+ 87,168, 27, 20,253, 82, 34, 74,179,110,205,178,234,172, 81,142, 21,171,251,195,190,129,  5, 30,155,233,132,132,243,125,206,234,
+  4,137,252, 83,197, 48,219,253,118,156,100,228, 89,230, 61,  1,247, 56,105,133, 76, 42,  8,179, 42, 94, 50, 10,251, 71, 12,254,
+ 41,  0,107, 87,211,211, 68, 20, 69,231,163,239,205,116,166,117, 44,180, 69, 65, 10,129, 20, 49,154, 64, 32, 36,198,196,149, 81,
+255,129, 49, 49, 49,113,229, 95,240,103,248, 35, 92,235,130,141, 44, 84, 22, 26, 18, 19,217,152,232,130, 15,249, 46,133,150,218,
+161,101,230,205, 71,159,247,190, 55, 83, 17, 93, 26, 54,132, 52, 37,211,153,158,123,238,125,231,156,139,249,  4,240,242,174, 18,
+ 42,255, 21,220,229,239, 84,163,114,186,114, 33,243, 61,171, 91, 44,246,120, 26, 55,159, 37,182, 42,  7, 85,127,109,122,186,128,
+236,242,112, 89, 28,255,167,129,165, 73,145, 60,159,139, 38, 75,179,170,246,195,138,211, 27,157,  8,148, 18,254,254,123,238, 70,
+160,143, 68,254,142, 80, 14, 32,108, 19,120,154, 59,210,  6,146,110,  3,195, 24,114,181,127,182,143,113,193,186, 24, 39,168,101,
+103,228,208,221,181,136,  5, 52, 19,247,186,225,180,  4,229,212,210,202, 13,120, 25,218,208, 98, 75,192,206,  8,  2,173,166,222,
+106, 97, 93,143, 81,129,110, 18,192,119,148, 14,235, 25,177,200, 91,228,201,163,216,130,106, 78, 30, 56,187, 32, 10, 26,143, 68,
+100,163,216,143, 26,135,210,194,129, 55, 95,243, 60,241,176, 68, 81,128,204, 32,132, 38, 30, 58, 99,220, 59,140,183,  0,165, 38,
+178, 15,132, 55, 14,224,115, 23,150, 15, 74,145,224,195,123,  5,177,140,121,  6, 14,171, 16, 93,129, 63,155,  6,190, 50, 70,129,
+ 60,135,175,238, 89, 35,186, 76,114, 62,139,135,115,149, 32,246,246, 79,246,198,203,213,227,147, 58,220, 47,  5,105, 20,250,235,
+108, 60, 31, 67,215,183, 23,226,132,138,232, 70,192, 60,209, 13, 37, 77,141, 38, 84,  3, 90,202,142,  1,218,142,218,117, 51, 99,
+ 24,212,242,131, 14, 92,209,204,248, 44,180,204, 64,198,115, 89, 27, 13, 10, 58, 57,  5, 80,166,185, 14, 84, 83, 85, 25,114, 74,
+237,174, 11,176, 46,  8,181,220, 72,195, 13,106, 12,230,224,235,189,143, 78, 63, 30, 15, 15,140, 30,185,135, 50, 59, 14, 62, 68,
+161,146,146,193,  0,114,235, 23,254,220,155,189,191,184,242,134,162, 68,220, 20,177, 33, 56,201,198, 73,131,144,181, 73,209,130,
+ 92, 72,  0,109,207, 37, 51,  7,229,181, 96, 57,113,  4, 52, 61,  4,202,108, 17,195, 34, 38,144,234,131,230,  1,193,134,  8, 58,
+ 42, 77, 36, 67,224,252, 64,238, 24, 26, 43,143, 53,220,230,194,212,124,164, 41,203, 95,222,  3, 20,206, 85, 23,198,135, 70,223,
+174, 46, 21,242,  3, 68, 37,235,181, 53,184,132,162, 83,118,125,151, 49, 95,196, 42,170,149, 82,101,175,129,123,121,110, 79,207,
+253, 56,220,110,158,182,224, 10,160,129,  0,  4,207,103,243,226, 32,196,191,113,109,234,235,246,247, 17,168, 64,161, 87,255,121,
+ 60, 86,174,192,149,109,212,214,108,195, 10,123, 76, 79,196, 95,153,199,211,131,203,  7,159, 62,239, 55,106,140,237,248,182,119,
+230,215, 20,134,211, 27, 63,186, 83, 44,188,122,240,164,237,147,145,226,214,183,102, 11,  0,190, 11,125, 78, 20,191,222,114, 63,
+182,253, 40,195,125,230,179,179,110, 20,178,231,147, 87,128,106, 88,148,206, 87,138, 58,197, 68,141,130, 77,243, 52, 35,173, 31,
+ 34,255, 20,158, 55, 53,228, 80, 46,185,135,193,170,226,  4, 42,177,188,234,  0,238,101, 39,111, 40,250, 94,179, 85,171, 95,223,
+101, 17,197, 28, 20,148,  1, 76,152,163, 15,151, 94,240,119,124,103,177, 57,249,114,230,195,220,202,221,213,202,211,155,143,158,
+ 77,220,218,236, 52,138, 57, 39,226, 81,171,227, 42,152,248, 36, 83, 10,208,190, 90,114,202,235,245,109,252,119,112, 39, 48, 85,
+ 31,109, 37,  0,155,  1,138,146, 25, 23,125,  6,110,112,199, 51, 85, 97,127,146,146, 21,168, 67,188, 15,238, 18, 75,226, 11, 22,
+ 31,174,240,254, 16,231, 55,150,247, 18, 75,148,154, 74, 21,123, 50,175, 82, 48, 45,158,156, 54, 99,105,128,146,236, 49,175,122,
+181,186, 81,223, 20, 83, 29,121, 96,193,133,122, 25,173,218, 38, 49,161,162,151,242, 37, 32,221, 44,244,207, 27,120,248,185,153,
+ 12, 79,214,230,197, 82,164,217, 75,195, 87,196,182,133, 94,178,184, 90,253,  3, 70,101,231, 36, 26, 38,169,173,255,  7, 85,254,
+ 37,  0,105, 87,206,219, 68, 16,133,189,167,119,125,237,250, 74,148,120, 19,132, 72,162, 32, 19,132, 64,136,130, 67, 10, 17, 74,
+145,159,129, 68, 73, 65, 71,151, 63, 64, 77, 79, 77, 19,241, 35, 40, 64, 74, 69,129, 34, 10, 39, 36, 78,236,196,199,222,179,215,
+240,222,140, 47,104,145, 82, 56,138,237,172, 61,243,222,188,247,246, 59,230,243,153,255, 76,238,255, 76, 85,120,106, 94, 80, 32,
+ 88, 28,188,208,132, 78, 66,139,255,158, 32,223, 44, 94,  4,185,211, 25, 72, 55,199,209,163,156,117,135,222, 23, 16, 33, 12, 20,
+ 42,176,  9,143,196,117,237,202,154,145,176, 69,153, 40,137, 45,154,189,178,202,180, 94, 94,242,161,251,155,177,123,167, 12, 10,
+120,104,232, 38,255, 19, 63,207, 75,154,225, 78, 72, 98, 92,113, 67, 84, 36,228, 94,113,238, 47,188,230,254,237,135,110, 96,231,
+149,  2,252, 31,216,176, 94,228, 32, 95, 14,141, 50,112,241,176,116, 17,185, 89, 11, 21,139,138, 13, 49, 19,101,136,219,166, 76,
+ 34, 21, 71,144, 18,210,187, 37, 89,215,148, 34,100, 11, 89,102,146, 30, 18,130,228,209,197,  0,159,  0,219, 36, 10,227,166, 81,
+ 41,228, 85,123,236, 48,143,110, 45,131,248,195,123, 90, 18, 90,253, 49, 41, 95,214, 42,202,186, 44, 85,205,188,161, 83, 69, 76,
+ 15, 94,190,120,255,238,237,171,231, 79,123,189,171,110,127,168, 32,122, 68, 96, 19, 77,148,171, 65,212, 57,126, 28, 68,131,179,
+100, 75,209, 55, 66,194,154, 29,167, 66, 50,254, 64, 91,205,119, 29, 60,153,196,153, 23, 82,226, 65,112, 42,113, 74,110,156, 27,
+219,179, 33,128, 52,169,208,183,123,156, 68,172, 43,232,111,238, 68, 30,137,160,153, 78,185, 50,149, 42,231,241, 83,208, 40,155,
+ 75, 32, 97,185,193,102, 66, 80,253, 41,136, 89,132,  3, 21,195, 18,206,134, 18,172,126,119,120,241,102,255,245,183,147,239,105,
+150, 68, 41,105,150,151, 73,140,100, 49,120, 73, 68, 66,184,106, 72,247,119, 86,182,  6, 78,159,178,252,142,121, 53, 39,141,252,
+ 65,142,137, 50,112,251,  8,136,193,189,  7,251,191,  7,167,155,171,219,189,209, 69, 69,175,194,162,104,138,142,170, 79, 12,238,
+ 87, 84,139,110,232, 75,146, 28, 68, 62,115,241, 21,152,232, 78, 26,103,137,138,146, 35,200,210,132, 86, 12, 14, 18, 72,148,138,
+172, 56,254, 88,100,158, 38,121, 85, 29,123,  3,143,248,142,111, 15,220,  1,172,238,206,122, 27,178,191, 27,186,108,248, 74,161,
+ 85,181, 26, 86,165,  0,155,199,131,134,227,236,250,188,115,217,177,234,107,186,174,245,236,235,227, 95,199,112,230,193,119, 93,
+214, 42,207, 30,239,153,181,229,147,211,159,112,104,181,215,218, 27,173,141,213, 90,171, 94,169,194,151,185, 84,109,192,102,187,
+ 28,246, 35,244,166, 48,225,173,130,152, 64, 95,130,182,145, 73,212, 29, 93, 65,233, 58,244,198, 46,226,  8,232,208, 27, 13,209,
+110,  2,157,197,160, 97, 16,217,205, 59,141, 42,187, 91,185,227,203,243,115, 39,240,227,120,187,176, 98,153,102, 83,211, 74,178,
+  0,167,130, 34,234,187,235,237,140,  6,195,172,103,199,177, 38,201,200,106, 71,176,145,104,200,122, 19, 26, 67, 18,186,  4,202,
+250,108,167, 94,122,212,106,222,109,153,229,130,104,153,170, 85, 45,212, 74,106, 81, 23, 81,120, 78, 22,152,163, 25, 15, 87,145,
+ 17,209,185,148, 54,142,159, 97, 37, 84, 65,174, 21,181,181,186,241,163,211,247, 51,146, 79,107,221,144, 41,220, 98, 93, 38,187,
+  1,249,114,246,245,240,227,225,167, 15, 71,221,142,189, 89,107, 29,141, 62, 31, 88, 79,100, 33,  9,208,208, 46, 64,191, 83, 20,
+239,197, 11, 35, 89, 20,167,105,152,198,208,151,160,129, 49,148, 48, 52,  9,209,221, 38, 50, 42,117, 59,112, 98,148,185,164,140,
+ 12, 73,225,232, 41,106,232, 87,  7, 11,114,239, 86, 27,182, 43,134, 56,175,236,231,120,131, 69, 26, 13,110,214, 92, 54, 19, 21,
+248,235, 54,229,170,185, 98,163,143, 57,157,170,251,206,245, 18,232, 20, 79,148,161,214, 83,172, 41,121,135,248, 97, 68, 88, 78,
+ 74,172,218,154,139, 38,195,108,120,143, 48,  0,220,231, 28,205,169, 74,106,163,220,112,152, 61, 58,175,237,167,153,157, 78, 32,
+145,217,100, 96,207, 80,156, 41,211, 78, 72, 39,151,199, 92, 50,115, 76,143, 95,152,112, 58, 57,166,126, 38,134, 40,206, 20,238,
+103,169,239,143,  0,172, 93, 57,111, 19, 65, 20,222,217,219,187,222,196,193,  9, 73,192,  9, 71,140,  8,  1,  1, 10, 17, 13,  8,
+ 33, 14, 33, 26,254,  1,  5, 66,  8,  4, 18, 66, 66,116,180,148, 52,252,  7,104,248,  9,180, 20, 52, 68,  8, 66,136, 16,135, 33,
+167, 99, 39, 89,219,123,120,246,228,189,231,221, 96,137,150,206,146,237,230,105,230, 93,243, 29,255, 39,191,255,155,235,165, 62,
+174,169,152, 75, 50,238,154,129,176,140,225,204,250, 12,249,254, 58,243,229,219, 22,150,255, 87,220,253, 42,127,182,166,141, 31,
+ 52,199,170,  9, 45,176, 72, 30,140, 16, 13,233, 47,187,172,191,222, 96,240,168,200,247, 25,133, 19, 88,212,210,139,221, 40, 32,
+126, 90,  2, 25,132, 54,248, 73, 23,253,203,211,158, 15,100, 86,203,115,210, 91,130,144,216,120,125,103,  5, 46,182, 23,185,170,
+172,122,104,227, 18, 19,103,129,220,  7,196, 76,161, 19, 50, 78,101,239, 48, 51,137,130, 43, 75, 18,203,112,148,144, 91,139,134,
+ 98, 21,112,235,141, 32, 21,184,151,113,138,246,201,104,210,130, 53, 27,197,246, 68,  6,205,249,141,235,151, 95,191,122,121,251,
+206,189,153,106,117, 97,225,203, 70,  3,213,133,112,169,162, 39,208, 34,193,141,230, 92,132,126, 81, 87, 37,195,144, 57,143, 29,
+ 39,190,123,235,238,195,  7, 79,118,118, 58,163,163, 99, 16,220,197,165, 47,186,154, 90, 80, 66, 52,193, 44, 40,184,209, 71,180,
+131,192,131, 16, 10,140,215,133,154,195,134,135,138,174,227,226, 18, 39,149, 66,124, 60, 70,199,240, 32, 64,173, 63, 24,166, 73,
+ 98, 67, 80, 34,205,144,116, 33, 18, 53,201, 32,183, 13,191,141,  6,214,184,165,209,101,203,237, 58,112,170, 90, 30,  2,  6,136,
+ 12,204, 70,172, 49,135,119,  2, 42,225,100,197,140,211,136,161,154,170,170, 35,117,  8, 23,190,  1, 34,145, 16,153, 46,102,160,
+ 98, 33, 86,152,252,177,246, 41,140,120,177, 48,112,172,114, 28,126,179,221,105,218,158,205, 67, 15,250,116, 30,186,144, 97,  2,
+178, 54, 30, 48,172,110,224,193,121, 55, 21, 67, 87,140,  1,221, 34,115,109, 31, 18, 40,228,223,122,187,222,113, 91, 91,237, 77,
+ 56,249, 17, 42, 33, 38, 80,137, 53,133,180,166, 19, 68, 67,145, 82,113,112,241,228, 85, 68,244,163,158, 27,250, 10, 26,106,209,
+210, 44, 31, 81,228, 17,146,234,133,244,220,204,133, 61,197, 18,143,  2,164,238, 50,182,111,104,159,235,123,131,230,224,217,234,
+153,241,210,216,217, 35,115,191,154,203, 37,163,184,229,218,166,110, 78,141, 30,110,118,182, 39,134,247, 55, 58,141,243,179,151,
+150,126, 47,138,178,148, 32, 17, 25, 45,218, 53, 89,245, 33, 71, 17,159,101,221, 94,255, 90, 91, 92, 89,175, 65, 67, 13, 23,247,
+244,225, 83,243, 63, 62,252,216,248,254,179, 94,179,189,214,102, 11,170, 23,219,114,182,169,117,100,179,213,217,213,237,181,233,
+137,163,156,  7, 26, 68, 15,181,209, 17, 73, 43,228,202,180,187,178, 38,149,242,193,222,155,173, 46,176,107, 39, 10, 31, 86, 55,
+235,190,111,  7,220,148, 76,168,230, 48,124,250, 81,212,230,221,101,199,189, 60, 33, 44,117,190,189, 95,219,120, 83, 91,134, 63,
+140, 89,150, 44,166,221,152,125,179,121,147,123, 43,237, 78, 59,228,101, 81,188, 63, 87,157, 30, 55, 38,203,234,228,158, 66,121,
+ 64,131, 64,195,168,146,249,187,246,124, 69,122,211, 48,126, 64, 37,  3, 69,150,224, 40,154,154,108, 41,202,222, 82, 97,250,208,
+ 72,219,225,159, 87,155,216,235, 71,197, 53, 31,154,247,100,116,112, 92, 78,196,133,230,242,124, 99,231,233,179,199,207, 31,189,
+152, 51,175,108,201,181,183,238,187,155, 83, 23,166,246, 87, 86, 26, 27,  9, 97,216, 73, 95,131,  8,215,  9,186, 84, 67, 66, 12,
+211,  4,226,236,  4, 46,106,240,197,193, 72,105,188, 97, 55, 97,166,193, 11, 73, 88,153,152,156, 81,113,210, 34,129,204, 58,130,
+208,205, 48,142, 51,166,110,102, 59,202,250,229,211,169,247, 76, 13,  5,  5, 38, 33, 53, 12, 25, 67,136,207,206,243,187,195, 29,
+ 56, 87,147,195,147,109, 56, 51,  4,229, 32,  3,208, 36,127,180,203, 38, 72,168, 88,208,149,163,241,175, 72, 14, 52, 17, 34,232,
+161, 93, 16, 51, 81,131,222, 38, 65,164, 85, 12,  9,243,133,110,146,102, 60,171, 60,179,247, 38,  1,198,242,  7,109,210,  4,194,
+142,172, 82, 62, 96,187, 45,146,116,143,123,142, 58,189, 68,152,236,130,199, 83, 50, 76,207,  8,252,255,234, 15,164,127,  4,224,
+236, 90, 90,155,136,162,240,204,100,122,103, 50,147, 87,155,164, 77, 31, 86,105, 23, 34, 82, 68, 20,171, 45,136,245, 85,186,213,
+ 77,197,130, 10,254,  0,113, 99, 43,  5, 41, 86, 80, 43,110,252, 13,238,  5, 43, 10,130,197,109, 17, 69,169,233,203, 54,109,236,
+ 43,125,216, 36,109, 50,239,137,231,220, 59,233, 67,116,227, 38,  4, 58, 73, 39, 51,115,207,253,206,249,206,249,190,255,140,239,
+252, 63,156,247,132, 61,145,125,111, 53,234,175, 88,223,147,107,223,157,149,222,253,107,121, 27, 16,248,114,136, 71,154,158, 99,
+182, 52,130,224, 77,104, 48, 98,194, 97, 83,191,172,132, 65, 65, 12,162,103,218, 23,225,148,255,147, 64, 89,211,253, 57,  6, 54,
+ 74, 26, 59,103, 81,214, 34,230, 98,129, 56, 17,101, 29, 17,220,142,129,  8,110,161,241, 80, 77, 17,160, 31, 37,146,  0,217, 33,
+ 40,199,108,203,221,213,173,  7, 48, 43,250, 75, 56,135,129,117, 70,191, 36,233, 60, 36,188,120,147,  9, 17, 67, 10,  9, 98,115,
+184, 40,201, 40,213,  4,123,176,129, 70,105,156,136, 34,218,130, 31, 14,  8,144,136, 42, 87,  5, 17, 37, 53, 84, 71,  6,250,239,
+ 15, 15,191,126,251,102,248,124, 71, 71, 87,103,231,228,228,248,194,210,138,128,189,125, 62, 42,245,134,145,154,214,241,125,186,
+ 97,111,229,141, 27,221,221, 61,221,215, 30, 63,127,250,104,104,232,195,200,200,212,143,105,219,210, 58,218, 90,111,245, 92,227,
+108,243,103, 58, 29,137,132,158, 12, 12,118, 93,188, 52, 54,246,173,160,105, 82,133,248,240,222,221,  7,125,189,156, 99, 36, 39,
+146, 33,149,120, 94,132, 37,142, 32,107,  6,123, 12,222, 86, 88,207,168,241,162, 89, 16, 19, 33, 60,233,150, 65,133,243,121,198,
+ 75,195, 34,140,  5, 98,121, 29,194, 61, 58,240, 21,141, 66, 99,180,105, 45,151,129,243,  2, 12,206,151,105, 11, 69, 14, 80,219,
+116,  8,207,214,213,246,238,116, 38,133, 77,214,116,126, 10, 64, 73, 44, 92, 13,175,244,126,113,248,158,227, 82,153,217,173,237,
+ 92,133, 72,162,129, 56, 21,221, 54,153,100, 63,124, 63, 74,226,241, 56,147,  2,143,  0, 26,216,219,186,230, 24, 16,130, 77,219,
+170,141,212,174,231, 87, 81, 45,192, 31,150,137, 31, 22,167, 69,199,211,  0,106,194,241, 33, 53,162, 91, 91,176,146, 73,133,  4,
+113,127,122,113, 28,182,  1,221,210, 79, 52,159, 90,216,152,131,144, 81, 52,177,125, 75, 38,202,133, 99,231,146,243,223,179,133,
+205,197,181,180,201, 42,189, 28,159,211, 54, 41, 57, 15,  9, 77,113,126,117, 62, 81, 89,251,101,246, 43, 60, 39,217, 66, 22,190,
+115,109,123,173, 96,104,112,113, 76,199,254, 52, 49,122, 32,222,  8, 89,  2, 44,201, 68,164,186,165,245,236, 92,106,202,176, 12,
+166,165,162, 16, 37,232, 15, 73, 68,129,231,170,237,200,233,177,185,228, 82,118,153,230, 61, 76, 78, 28,187,215, 33, 88,208, 31,
+171,205,103,210,186,109, 45,110, 44, 65,238, 18, 86, 35, 13,241, 70, 20,182,165, 23,178, 46,154,128,140,193, 47,225, 96, 54,234,
+ 48, 27, 57,129,179,149, 64,101,172,100,159,108,175, 94, 89, 94,207,106,198, 38,100,142, 46,175,217,216, 45, 91,116,204, 77,189,
+168, 89,238,229,250, 68,173, 42,181, 36,212, 32,192,  3,135,171, 81,225,100,124, 49, 69,121, 63,147,153,201,101, 21, 95,233,230,
+225,134,103,157, 71,207, 52, 65, 78, 33, 87,133,100,212,127,  6, 32,131,234,192,108,214,147,247,220,154, 41,181,200,  4,230, 32,
+ 27,132, 36, 50, 32,145,176, 34,214,132,148,250, 67, 81, 78, 37, 31, 71,103,117,202,223,248, 92,145,  8,  7,215,225,106,219, 86,
+128,247,191, 75,125,142,185,205,183,251,175, 15,246,189,184,211,220,251, 42,251,114,214,158,187,146, 56,158, 41,254,202,107,  5,
+151, 42, 65, 50,250, 20, 94,209,162, 26, 93, 83, 28, 88, 43,120,121,113,199,118, 13,122, 64,193,212, 18, 85,117,121,236, 66,113,
+131,114,144,170, 92, 20,217,228, 45,139, 25,164,130,192,231,104, 29,195, 43,199, 51,219,104,151,250,243,185,204,107, 26, 25, 41,
+131, 22, 47,225, 87, 72,186, 87, 63,241,228, 99, 32,238,230,  0,137, 99, 67, 13,150,197,235,163,245,240, 65,195, 50,189,114, 60,
+133, 47, 14,150, 48, 61,211, 60, 10, 21,144,  0,243, 70,239,  4,143,191,197,193, 43,236,  0, 98,  5,134,114, 80,167, 21, 30,106,
+187,194,148, 50,188,162,144, 91,166,111, 33, 53,217,210,242,216,211,230,148,254,176, 60, 45,167, 26, 92, 84,141,138, 62, 98, 58,
+ 58, 35, 21,246, 69,119,154,211,252, 22,128,180,107,249,105, 34, 14,194,221, 87,183,219,221,237,210, 71,144, 74, 65,  8,104, 36,
+  6,149, 16,137,122, 17, 16,163,248, 56, 25,189,112, 50,158,124,  4, 34,222, 52, 30, 76, 52, 17,189,120,225, 79,240, 74, 60, 24,
+ 19,143, 18, 81, 36, 33,190, 79,196,168,168, 17, 75, 88, 90,182,221, 95,187,219,237, 58, 51,219, 34,200,209,235,166, 73,187,219,
+157,153,111,126,243,205,247,253,111,126, 15,146,187,  2,197, 27,169, 44,149,205, 42, 96,220,230,140,254, 47, 66,167, 17,  6, 47,
+135,148,  8,175,151,113,149,148, 95,191, 30,170, 99,246,122,105, 10, 76,122,  1, 25,  7,255, 30, 79, 28, 12, 62,169,165,160,111,
+ 13, 36,148,214,235,132, 31, 10, 78,221, 56,175,110, 90,194,133,182,110,233,214,114, 55,183,165,  0,  1,  6, 96,174,173,146,192,
+116,221, 30,215,111, 52,210,217,252,175, 64, 56,169,182, 49, 65,108, 29,180,250,227,  4,250, 24, 78, 95,136,187,229, 11,184,253,
+227,199,117, 89,209,112, 96,202,211, 30,170, 72,195,110, 36,156,160,216, 28, 79, 14,206,168, 61,128,114,237, 50, 15,216,  7, 64,
+189, 34, 87, 85, 37,228,148, 10,195,199,  7,154, 51,233,123, 19, 15,230,230,223,205,188,154, 61,212,119,112,240, 72,255,199, 79,
+111,172, 53, 51, 44, 73,213,170, 80,161, 89, 15, 20, 27,199,245,151, 87, 10,231,206,156, 26, 27, 29,191, 59,113,127,234,201, 51,
+232,168, 35,138, 40,137,126, 42,161,142, 94,185, 60, 48,120,162,189, 99,231,212,227,167,125,189,125,151,174, 93,111,223,213,181,
+180,248,237,245,252,219, 68, 67,114,124,108,180,165,173, 53,174,201,211,211,207,203,184, 20,136, 16, 69,  8, 76,206,137,142,  9,
+105,  7, 57, 56,142,239,187, 92, 68, 84, 29,183, 76, 68,163, 26,253, 23, 23,  7,145,192,224, 66,138, 33, 73, 35,180,106,242, 48,
+ 14, 33,204,188,168, 28, 67,109, 78,199, 14,102, 44, 46,250,142, 96,151,242, 37,251,153, 57, 69, 28, 60,243, 33, 93,142,161,  3,
+173, 24,182, 28, 11,144, 23, 96,231, 82,185,  8, 87,224,129, 73, 97,137, 14,238,188,238, 29,123, 57, 78, 88, 99, 57,234,163, 60,
+146, 82,192, 49,134, 18,142,160, 97, 41, 49, 37,224,253,110, 80,227,170,172,159,191, 56, 50,247,114, 22, 74, 38,114, 79, 93, 71,
+139,234,118, 25,202, 95, 57,157,108,206, 23, 86,  0,249,110,139, 55,231,109, 52,238,192,  6,133,124, 44,225,235,224,247, 36,117,
+172, 43,169, 88, 35,132, 45,148,135, 95,230, 79, 28,131, 96,203, 69,143,  3, 67,215,235,104,234,176, 81, 68, 48,236, 16,135,167,
+183,115,159, 34, 69,190,155, 63,200,119, 23,183, 15,161,155, 76,234,241,162, 83,130,122,147,103, 57,184,241,165, 92,118, 97,225,
+125,177,196, 32,251,192,243, 65, 19,100, 59,  7,201, 26,250, 24,167,234,102,115,203,  0,207,113, 45, 65, 10,235,170,129, 42,243,
+114,116,181,104,193,179,133, 10, 81,116, 11,200,152,226,133,100, 44,177,198, 10, 86,  9,208,125,150,196, 97,132,182,166,246, 37,
+243, 55,128, 77,192,143, 24,188, 94, 73,164,113,124, 84,105,216, 81,173,116, 29,107, 54,204,  2, 84, 23,215,245, 10, 21,103,113,
+173,176,104, 89,166,109,175, 48, 60,184, 24,217,221,178, 63,173, 37, 52,145, 49, 47,173,199, 57, 65,100,174,211, 32, 42, 31,127,
+152, 23,122, 50, 15, 79,119,159, 61,220,150,222,174,201, 49, 17,143, 14,137, 99, 35,214,244,248, 54,144,201,130,128, 20,144, 51,
+  0, 64, 65,149,  1,185, 75,134, 26, 78, 65, 61,104, 73,134, 90, 83, 31, 94, 44,124, 89,182,  0,237, 67,154,134, 96, 52,109,131,
+121,222, 80,207, 64, 91, 60,115,103,230,209,112,255,201,225,  3, 67,183, 39, 39,111,117, 94,189,249,245, 70, 82,139,245, 25,153,
+172,141,236,126,135,152, 89,136,223,145, 28, 80, 65,143, 17,175, 18,150, 85,200,176, 80,240,220,154, 68,187, 15,125, 51,164,250,
+ 85,150, 15,198,143, 54,196, 12, 43, 82,  6, 15, 40,228,168, 68, 66, 29, 18,161,145, 26, 65,210, 87,101, 85,139, 68, 88,169, 36,
+241,226,158,204,158,156,101,210, 46,107, 77,160, 23,146,123,144,115,140,168,193,202,182,161, 24, 56, 15, 95,191,109, 52,226,171,
+178, 10, 11,118,154,104,177,  4, 65, 53,100,156,132,154, 42,150, 45, 90, 74,168,110,244, 99,250,107, 36,  1, 97, 36,138, 71,187,
+135,160,134,  6, 52,248, 58, 53, 31,  1, 78,149, 78,  8,235,154,101,190, 30, 49,200,205,220, 37,222, 71, 64,  7,173,145,243, 55,
+184,101,112,  1, 30,128,176,130,247,106,125, 61, 55,196,215,183,129,234,201,254,143,  0,164, 93,207, 79,211,112, 20,111,187,110,
+109,183,174,131,177,129,  3,212,145,128, 30,140, 81, 48, 30,184,169,137, 30,188, 40, 38,222, 60,171, 49, 18,239, 38,198,248, 23,
+200,197,131,209, 35, 49,209,120,243,162, 30,140,  9,  9,  1, 76,188, 40,  4,228, 87,128,  1, 27, 56, 86,182,174,107,187,246, 91,
+223,123,223, 65, 48,241,230,133, 75,211,140, 54,253,190,247,121,239,125,222,231, 35,255,255, 88,149,100, 63,153, 27,122,226,191,
+212,219,197,127,247,111,240, 62,178, 14,107, 74, 66,196, 16, 59, 92,  1, 23,243,142, 24,107,136,135,156,152, 68, 52,105,163,109,
+  8,223,102, 34,249,112,212,141,241,224, 89, 76,107, 79,228,210,105,152, 78, 37,146, 61, 13,248, 54, 65,136, 75,158,124, 49,138,
+  1,226,131, 43, 68,190,254,203, 25, 48, 60, 50, 83, 17, 15,100, 39,209, 54,  4, 61,227, 93, 90,  3,195,248,  6,  1,173,100, 22,
+242,157,253,107,187,171, 33,249,181,250,156, 20,132, 29,  9, 63,100, 71, 20,137,165, 64,226,209,145, 20,178, 19, 42, 28,143,144,
+202, 39,228,104,123,  7,114,209,232,102, 71,168,  7, 85,156,100,222,170, 66,186, 31, 64,249,219, 55, 71,224,226,229, 43,151,222,
+140,143,195,131,245,228,178,150,181,251,124,236,217,232,195,251,143, 30,220,121,241,242,213,230, 86, 57, 20, 20,196, 37,162, 92,
+  7,216, 86,173,157, 59,115,246,201,227,167,239,222,191,253,252,229,107,187, 17,143, 70,112, 54,234, 53, 25,202,115,199,147, 82,
+ 76, 57,214,217,109,232,154,200,188,166, 85,145, 81, 78, 62,128, 90, 65, 87,131,114,105,189,167, 55, 83,183,126,167,146, 88, 97,
+192, 63,  6,119, 81,163, 11, 93, 88,233,132,132,114, 76,136,170, 66,213, 10,108,175,202,149,248,112,102, 31,132,173,109, 98, 49,
+116,221,134,136,202, 24,168,196, 11, 73,183,222,168,101,219,115,165,202,166,229, 86, 61, 63,102,196,219, 76,123, 15, 15, 44,126,
+213, 88,224,227, 24,  3, 21,196, 80,193,209,149, 28,  1, 69,251,108, 45,154,112,253,134, 18,137, 29, 46,193,163,110, 10, 99, 89,
+163,109,165,184,196,219,145,  1,145, 13,226,112,212, 67,162,134, 75, 44, 10,152, 95, 86,224,140, 13,230,135,126,174,255, 88, 41,
+254, 90, 26,155,135,183,  9,105, 38,161, 25,131,167, 47, 76, 45, 76, 66,126, 61,223,119,113,118, 99, 22,112, 49, 36, 89,  0, 68,
+ 90, 84,243, 66,151,150,173, 34,168, 52,200,208,222,107,223,170, 64, 37,132,205,116,230,127, 91,156,  2, 20,207,169,114,253,185,
+129, 29,179,  8,249, 70, 87, 52, 26,157,133,233,100,135,227, 54,150, 75,171,133,242, 54,214, 40, 68,129,226,218, 38, 80,230, 20,
+ 77,215,245,156, 74,104, 58,190, 31, 33, 43,237,180,110,236,219,150, 13,200, 84,132,112, 95,114, 60, 23,158,171, 45,145,130, 40,
+111,218,213, 48, 34,161,155, 35,115,246, 81,178, 70,144, 28, 41,155,202, 42,178,186, 81, 46,248,126,211, 48, 82,128,154,213,152,
+174,197,204, 19,185,190,226,238, 54,164, 13, 56,252, 11,133,249, 91,195, 35,139, 91, 75,115, 27,115,  9, 37,174,199, 13,207,179,
+240,253, 70,212, 62, 35, 16,122,218,187,134, 78,222,232, 77, 14,174,165,191, 23,118, 38,215, 74, 19,155,254,114,165, 37,250,186,
+ 93,179, 79,117,228, 23,138, 59,237, 40, 73,  8,232, 30,242, 96,144,201,200,175,239, 13,167,251, 13,100,184, 96,207,138,225, 95,
+ 31, 29,206, 80,219,  0,209, 68, 32,161,240, 26, 20,143,212, 72, 71,187, 14,177, 69, 60,144,120, 83, 62, 34,105,170,144, 51,132,
+238,204,218,167,185,153,133, 45, 69, 85,225, 43,242,208,146,195,246,253, 70,189,217,248, 48,243,113, 64,207,155, 66,101,244,234,
+ 93, 97, 66,208,133, 76,103, 74,222,113, 86,174, 31,191,  6,167,200, 97,220,132,143, 12, 73, 48, 97, 50, 35,110, 64, 16, 55,189,
+253, 38,166, 67,159,202, 93,252, 42,136, 41,198,186,210,185,205,202, 22,225,125, 38,178, 86, 55, 55,174, 40,249, 76,126,182, 48,
+ 75, 26,199,  7,106, 53,  7, 60, 14,159,111,127, 67,225, 30,120, 43,187,171,205, 22,151,157, 70,235,140,198,255, 34,199,110,162,
+ 26,213,114,233,158,218,182, 69, 35, 25,129,134,199,130, 69,251,122, 98,171,143,194,237, 96,177, 42,171,212,202,100, 15,223,242,
+124,208,181, 20,132,123,106,231,144,151,132,196, 77,146,253,233,197,105, 78,230, 38,108,132,175, 46,224, 45,124,244,159, 50,224,
+235,170, 59, 85,248, 93,211, 46, 19, 71,  3,139, 15,234,201,180,180,110, 14,119,140,184, 65, 43, 53, 29, 32,166,161, 43,  3,250,
+ 79,241,235,236,136, 61, 19,221,249, 71,  0,206,174,237,181,105, 56, 10, 39, 77,210,230,214,166, 45,221,173,178, 21,167,200,234,
+ 30,188, 81, 20,145, 13,113, 94,112,226, 63,225, 31,178, 23, 81,  4, 21, 20, 20,223,124, 81,240,194,116, 47, 14,113,204, 23,159,
+ 68, 28, 67,112,194,196,173,157, 91,177, 91,187,166,109,218,166, 77,218,120,206, 73,210,  9,123,243,165, 80,  8, 73,147,230,119,
+126,223, 57,231, 59,223,247, 63,248,157,221,167,216,238,236,209,231,247, 85,248,253,111,190, 71, 43,231,131,116, 26,150,102,  4,
+141,141,181,225,214,152, 38,245, 30,123, 42,154, 61,164, 31, 32,  9,130, 16,199,200,  2, 35, 10,168,171, 34,171,130, 22,130,140,
+ 16,103,169,105,174, 13,129, 22, 50,190,121,162,105,176,189, 90,189,219,227, 37,118, 13,145, 87,  4,219,243, 60,220, 27,128, 13,
+203, 26,154,252,145, 87,189, 55, 69, 69, 71,192,106,119,136,194, 34,112,188,133, 61,121,182, 82, 47,211,195, 13, 48,190, 22, 31,
+182,182,  1,145,178, 46,185,144,245,197, 81,  8,171, 51, 76, 76,147, 37, 73, 32,245, 74,172, 24,209,244,159, 67, 83,154,200, 62,
+ 84, 36, 54,172,242,138,196,169, 34, 58,219,209,132, 39,196,119,225,202,133,203, 87,167,175, 45,127, 93,122,246,226, 53,210, 64,
+200,154, 36,191, 83,249,185,154, 61, 63,121,241,240,193,244,202,143, 85, 93,215, 67, 65, 64,109, 86,215,182, 38,206,100,238,223,
+190,185,184,184,112,239,209, 99,132, 84,188,128, 77,153,142,211,178,186, 21,195, 76, 37,135,211, 99,227,243,243,239,222, 47,124,
+108,214, 27,163,169,193,141,220,175,185,185, 55,112,181,  0,103, 27, 21,125,119,167,240,106,118,118,125, 99,219,178,185, 86, 11,
+173,186,  1, 50, 89, 54,228, 16,  0,165, 29, 72,239,113, 62,217,236, 32,155, 31,189,143, 59, 46,240, 32,  4,239, 57,206,116,201,
+ 44,214, 43, 76, 82, 91,168,110,214,221,126, 63,236,148, 84, 57,105, 65,148,167,131, 59, 65, 30,227,166,141,134,186, 40,210, 64,
+174, 97, 12, 74,188,217,166, 38,199,209, 68,201, 66, 94,176,235,142,  6,113, 15,158, 86, 73, 47,  2,226, 30,238, 75,233, 13, 29,
+ 22,188, 69,146,203, 54,214, 89,173,136, 20,213,164, 72,185, 94,  6, 20, 12, 64,  6,  9, 72, 28, 39,133, 20,  1, 18,130,102,181,
+ 92,219, 69,113,109,214,137,171,137,237, 74,158,176,  3,  7,152,174,105, 26,162,168, 68,148,136,200,139,222,216,  8,252, 55, 28,
+ 15, 96,153,188,238, 26,216,250, 14, 74, 81, 37,110,162, 90,  6,139,238,198,182, 21,147,163,110, 73,119,171,188,101, 17, 39, 39,
+ 44,135, 45, 11,126, 33,147,234, 59,200,195, 54,232,116, 53, 69, 43,232, 56, 64, 63,148, 72,102,198, 50,217, 63, 27,170, 40,195,
+101,  1,140,231,182,209,163,117, 60,149, 94, 47,100, 93,134,149, 20, 84,170,102,173, 63, 50,128,174, 17,  1,231, 80,242, 72,201,
+ 40, 67,  0,130, 77,  2,194,140,129, 66, 61,184,174, 33,120,229,119,243, 45,219,170, 53,170,240,194, 67, 64, 57,122, 32,189, 89,
+202,239,212, 74,155,165, 45, 77,213, 84,  9,242,170,166, 77, 50,191,176,138, 79, 74,124, 98,122,  4, 53, 35, 99, 65, 45, 25, 25,
+ 27,138,102, 18,234,228,177, 83,119,159, 62,153,185,126,246,219,231,229, 47,185,226,141,137,211,229,106,219,196, 70, 75, 27, 30,
+199,137,209,161,244,165,180,148,142, 51, 10,199,132, 80,222, 15,149,132,121,183, 65, 22,240,  8, 80, 56,121,132,222, 44, 28,142,
+109, 96, 64, 15, 10,240,168,225,213, 21, 66,162,192,171, 34,171, 73, 76, 42,193,164,250, 11, 31,190,191, 92, 88,113,104,188,  2,
+179, 85,172, 61, 89, 49,126,164,212,198,  0,  0,  9,247,219,181, 79, 15,111, 61, 88,122,158, 93, 91,253, 61, 53, 56,117, 39, 55,
+115,110,224,184, 26, 96, 13,108, 81, 32,159, 12, 62,197,144, 76, 37, 56, 20,206, 52,237,182, 24,148, 96, 91, 53, 90,117,155,172,
+ 60,176, 87,  5,160, 13,119,107,131, 20,216,229,152, 18,133,116,167, 67, 28,135,  2,100, 57,142,239,243,233,138,  0,147,158,  0,
+205,153, 91, 45, 44, 48, 98, 92,193,137, 13,127,184,117, 79,112,214,179, 72, 69,  3,197, 98,173,200,120, 58, 97,248,142, 68, 36,
+205, 70,194,112,199,237, 39,245, 36,192,232, 37,238,246,138,223, 29,178,112, 34,198, 99,192, 43, 40, 16, 34,114,176,176, 99,250,
+132,119,170,216,120,  4, 29, 12,249,176, 70, 72, 81,188, 19,133,219, 52, 13, 56,  9,166,203,116, 57,223, 57,164,215,  0, 14,252,
+211, 97,244,128,101,215, 27,228,242,251,  2, 30,145, 30,207,255, 87,  0,202,174,229,181,137, 32,140,207,238,102,103,178, 25,179,
+217, 52, 77, 91, 75, 45, 85, 65,133,170,160, 32,222, 20,245,236, 69,193, 10,130,168, 80,250,  7,232,169, 23, 47,226,217,155, 39,
+ 15, 34,254,  5, 86, 65,240, 38, 94,234, 11, 65, 79,182, 70,234,187,175, 36,155,221,236,206,238,100,215,239,155,205,163, 74, 17,
+132, 16,114,200, 38,155,205,206,204,247,251,230,247,248, 63,126, 36,167, 92, 81,203,147,191, 66, 86, 13,178,133,114,184,221,228,
+222,123,173,111,233, 17,117,171,124,  3, 70, 29,106, 86,245,238, 46, 60,217,218,208, 70,  3,243, 76, 19,150, 73, 85,179, 62, 12,
+213,204,  2,204,242, 12,233,107, 77,185,217,146,174,150,245, 47, 85,146, 40,178,148,212, 53, 77, 50,231,126, 68,  9,216,124,135,
+241,140, 44,120,109,224, 45,140, 54,161,249,146, 39,154,217, 69, 44, 23,134,234,237, 77,197,124, 33,168,232,193,254, 64,100,144,
+ 28,134,246,106,255, 82,227, 42,  5,109,218, 21,243, 17,221,164,  6,220,  1, 83,163, 21, 94,226, 94, 20,165, 57,162,136,  3, 80,
+136,161, 85,122,158,233,184, 75,168, 44,103, 20, 36, 65,148, 34,162, 84,198,169,  8, 34,147, 25, 85,103,104,109, 99, 83,  8,105,
+152,166, 98,115, 34, 72,139,165, 56,118,228,192,220,236, 28, 99,214,194,194,211, 23,175,223, 80,131,158, 57,125,106,230,252,249,
+197,151,139, 55,111,221, 14,101, 76,169,169,220, 31,227, 28,250,253, 39,190, 47, 44,198,246, 78, 78,212,190,126,195, 54,136,105,
+ 56, 69,110, 24,137,148,130, 82, 42,162, 78, 16,  2,  2,214,130, 80, 38,120,118, 25, 43, 16,145,144, 84,238,218, 88, 60,192,125,
+107, 38,177, 23,135,174,178,194,150,157,164,175,212,238,115, 81, 81,108,205,176, 14, 78, 58,127,236,197, 40, 94,135,195, 43,110,
+184,  9,255,  4,  5,160, 98,  2, 72, 64,137, 25,140,210,108,195, 51,219,141, 46, 91,101, 55,168, 67,241,110,115,135,231,249,202,
+250, 10,218,210,234,204, 64,170, 15,243, 80,173, 74, 78, 28, 60,243,252,253,179, 98,193,110,  5,216,190, 24,177, 71,224,200,186,
+191,  1, 32,186, 30,212,237,188,  3, 72, 14,202,216,  0,160,  0,181, 92,228, 77,203,201,209,221, 48, 75,  5,210, 87,115,165, 86,
+177,171, 41, 70,100, 88,181,159,159,224,131, 97,169, 88,115, 87,135,139, 85,120,103, 59,244,148,233, 88,162,167, 58,114, 82, 13,
+ 90, 64,175, 24,  9,167,196,233,142,182,240, 96,149, 98, 57, 76,177,114, 10, 37,138, 43,104,  4,197,175, 50, 46,214,218, 97,144,
+ 55,205, 32, 10,225,240,169,209,169,165, 31, 31, 81, 49,171,229,202,118,197,109,187, 33, 54,172, 58, 21,123,152, 51,235,203,250,
+247,253,227,251,214,154,171,112,194, 48, 19,141, 58, 99, 77, 21, 54, 91,247,154,106, 32,146,201,202, 68, 40,  5, 38,107,219,229,
+ 40, 18,240,151,101,113, 91,234,110,132,175,192,  9, 18, 19,101,135,119,109,180,214,138,140,127,111,252, 82,132,  2,162,136,173,
+  8,  7,195,142,188, 86,173, 78,223, 57, 78,154, 45, 34,124, 34, 99,210,  8,137,235,147,175, 27,100,246,  6, 25,153,126,112,229,
+210,229,251,143,167,203,188, 76,233, 24,183,134, 98,113,253,220,133,125, 23,143, 18, 81, 35,217,174,173,140,  0,254,224, 35, 70,
+ 62, 37, 62, 96,193,143,148,176, 57, 78,186,169, 13,122,111,104,154, 74,226,145, 55,136, 93, 32, 59, 29,120, 94,126,248,234,222,
+147,119,  6,203,149,224,  7,195, 53, 67, 98, 46,220, 81,112,248,158,229,  6, 43,155,124,113,245,243,163,149, 15,241,210,250,252,
+201,187,251,217, 33,171,212,152,121,123,118,254,240, 85,  1, 40, 14,237,193, 85,143, 58, 77,138,156,251,129, 79, 25,  3,116, 40,
+ 83, 89,180, 74, 45,225,133, 17,204,119, 42, 23, 35,219,128,197,200, 98, 13, 57, 78,161,  7, 85, 26,242,149, 73,167,233, 55,160,
+  2,131,165, 58,192,102, 75, 95,136,180,221,164,164,103,177,213,  3, 21, 84,150,253,163, 25,125,197, 80,207,144, 76,201,169, 96,
+101,130, 10, 35,232,132,152, 38, 69,100,230, 77,159,244,236,228,  7,188, 26, 45, 29, 43,237, 84,234,132,180,239,115,219,205,158,
+236,127, 81,  2,203, 31,172,142, 22, 96,184,236,243, 59, 10,  9,193,226,102, 26,230,152, 51, 94, 91, 95,214, 19,128,212,  5, 63,
+ 82,137,178,233, 95,173,117,181, 13,210,141, 13, 29, 16,126,180,129,138, 85,235,133,103,144,223,  2, 80,118, 53, 61, 77, 68, 81,
+244, 77,167,211,153,118,166,118, 74, 41, 69,  8, 26,131,226, 82,141, 95, 81,227,194,133,110,112,169,184,247,  7,232,202,141, 49,
+113,231,210,141,113,105,136,  9,193,176, 80, 19,220,155, 96, 76, 36,154,184, 32, 49, 37,128,150, 16,160, 80, 40,211,143,233,116,
+190,199,123,239,107, 11, 24, 19, 99, 66, 87,148, 41,121,189,239,222,243,238, 59,247,156,255,203,239,186,  2, 11,221,228,249, 93,
+248,147, 25,249,207,228,206, 15, 48,216, 45,  9,162,158,221,107,212,107,141,139, 44,118, 64, 79, 24, 79, 29, 18, 74,151,176,176,
+163, 77, 79,157, 40,106,190,147,  1, 53,198, 87, 66,148,243, 74, 94, 78,136,149,246, 38,217, 24, 50,234,103, 33,129,  8, 54,161,
+207,121,171, 60,197,227, 68, 53,206,199, 71,194,126, 83, 38,236,248,150,208,173, 72, 20, 14, 28, 25,172, 52, 54, 99,232,166,197,
+191,236,136, 29,190,215,248,171, 68, 15,118,135,224, 36, 17,184,196,140, 68,110,230,104, 97,108,117,239,231,233,161,220,240, 81,
+125,199,  2,156,196,196, 56,  4, 34,192,118, 65, 85,177,163,107,152,126, 27,133, 17, 69,  0, 65,104, 86, 37,225, 33,209, 67,247,
+ 52,128,178,128,224,208, 75, 60, 33, 97,205,146, 68,210, 42,128, 13, 44, 99,177,233,239, 27,152,184,115,247,250,213, 27, 36, 71,
+ 22, 65, 22,120, 63, 59, 59, 61,243, 14,114,129,166, 34, 26,245,188,208,180, 28,234, 95,134,124, 17,225,225, 34,221, 58, 35,163,
+ 13, 82, 48,242, 33,177,178,194, 94,113,225,141,104, 49, 38,136, 18,  6, 16,252, 21, 42, 18,147, 78, 54,132,  4, 64, 37,199,195,
+ 61, 20, 88, 78,212, 38, 97, 17,236, 20, 50,132, 80,  8,235, 56,185,  6,121,  5,154,164, 57,216,236,197, 16,130, 84,  8,255,155,
+131,180, 34, 92,222,126, 45,103,180,234,176,241,134,179,199,  1,134, 91, 78,  3,126, 43,139,112,154,151,219,158, 73,162,213,104,
+  2,183, 47,112, 74,185,  3,117,169, 36,  5,153,  9, 46, 31,194, 14, 72,222, 59, 64, 82, 59,245,205,  7, 51,133, 26,181,209, 21,
+146,110, 30,233, 63,126,110,236,204,183,226,247,173,250,122, 92,140,183,156,214,147,137,167, 83,115, 83,165,173, 18, 94,178,121,
+ 80,249, 18, 28,245, 95, 28,187,188, 80, 90, 32, 15, 16,212,127,199,169,147, 88,152, 83,  7,224, 19,171,230,206,237, 11,227,213,
+154,177, 84, 94,212, 83,217, 99,249,145,197,181,226,104,225,196, 90,101,117,176,175,176,177,179, 46,199,209, 77,241,236,232,249,
+229,181, 31,240,156, 47,197,207,217,116,159,229, 88,212,  5, 16, 84, 37,229,250,222,216,208,169, 77,163,108,218, 45, 25, 15, 46,
+174,150,210, 96,145, 12,179,150, 75,235, 46, 78,  9,168, 85,179,106,217, 22,234,169,213,183,  1,169, 66, 61,179, 93,211,197,226,
+232,235,170,190,107, 86,229, 88, 60,147,214,125,223, 51, 45,228,216,161,253,157, 32,232, 73, 29,  0,108,169,178,  2,139,143,195,
+  1,  9, 69,141, 39,235,118, 29,217, 44, 88,186,114,205,246,174, 34,198,160,  2,220,138,107, 55, 95, 94, 99,158,201, 96,233,224,
+155,178,108,214,108,135,197,149,249, 37,246,118,189,254,252,211,215,131,209,155,103,172,226,108,179,132,193,230, 39,153,152, 64,
+ 13, 50, 56,196, 65,114,183, 93,230,120,248, 99, 67,174, 71,220,203, 45,224,123,185,  5, 51, 59,196,177,140, 19,119, 44,171,  2,
+108,103,213,214,220,139,143,175,231,138, 74, 74,134, 42, 45, 73, 98, 20,198, 26,158, 95, 54,221,229, 90,115,209,104, 65,  4, 65,
+189,116,  2,119, 98,248,254,204,135, 87,247, 46, 61,158,188,242,236,193,175,135,111,106,211,143, 78,142,151,237, 61,126, 99, 73,
+254,146, 33,215,251,133,226,109, 58,240, 12,164,248,  6, 68, 82,163,  9, 86,244,219,241, 73,125,  8, 33, 71,215,167,  9,160,103,
+ 74, 73,151,141, 50, 22, 68,126,154,164, 91, 82,138,210,240,128,  6, 83,135,172,219,165,126,116,156, 81,225,173, 74, 66,145,197,
+100,211,169,119, 68,  5,186,233, 29,144,193,198,222, 22,110, 13,129,187,  0, 50, 46,131, 31, 68,156, 81,211, 17,149,100,189,219,
+185,110, 50,204,164, 50, 73, 41,185,221,128, 50, 76,  8,159,196, 83,186,  3, 58, 52, 68, 35,112,  1,196,142,217, 30,111,196,147,
+192, 12, 60, 73,212,100, 21, 16, 64, 55, 73, 70,135,250,225,221,172, 69, 13,228, 67,198, 71,108,127,234,  7, 95,191,  5,224,236,
+ 90, 90,155,136,162,240,157, 87,146,153,201,163, 38,164,205, 75, 91,218, 90, 68,168,130, 59, 87,110, 10, 46,196,189, 32,254,  4,
+ 23,110,116,229,206,141,160,254, 12, 11,250, 11,  4, 87, 10,138,162, 84,170,174,180,173,109,109,243, 78, 51,153, 36,115, 51, 51,
+153,241,156,115, 39,182,106, 17,116, 23, 72,152,201,220,185,247, 60,190,115,206,247,253,207,124,211,177,193,123,120, 72, 33,240,
+167,113,199, 95, 97,131, 42,181,178,228,204,124,179, 95,147,126,229,130, 12, 17,103, 55,135,190, 35,133, 17, 83,132,198,116,234,
+246,196,192, 34, 96, 19,101, 85, 74,123, 68,115,164,130,223, 40,186,162,167, 19,153,188,158,107, 58,213,246,168,205,168,219, 27,
+169, 40,253, 33,165,249,254,196,135,135,  2,223,255,217, 96, 31, 96,231, 34,132, 24, 49, 48, 58,132,240, 78,134,152, 37,249,159,
+232, 47,169,255, 69,225,190, 67, 53, 40,124, 44,156,121, 81,164, 74, 54,179,188, 80,104,112,206, 61,108,106,141,169,138,208, 91,
+140, 39,112,215,193,193, 65,198, 98, 36,105, 12,227, 24,220,202,156,135,162, 77,  4, 99, 97,164,165,137,124, 49, 66,225, 72,121,
+138,227, 78, 16,101, 38, 19, 74,229,100,169, 48, 93, 28,121,222,214,214,238, 94,181, 17, 40, 56, 25, 10,187, 15,101, 42,  3,240,
+ 19, 56,217,159,212,101, 19,108,140, 38,  2,  3, 38, 32, 36,148, 25,198,190, 69, 65,164, 45,249,180, 57, 73,198,  1, 23, 20,195,
+118, 56,224, 46, 38,156, 30, 22, 67,241, 61,104, 49,198, 15,184,139, 67, 85,136, 19,155,137, 12,214, 60,132, 57,142,  4, 34, 34,
+112, 83,146, 85, 18,130,149,130, 72,211,146,145,167, 68, 72, 71,213, 32,230, 29, 27, 49, 83, 65, 14, 38,  7,207, 79, 32,233,  9,
+163,207, 45,156, 37, 70,150, 55, 89, 97, 81, 54, 76,151, 85,252,177, 91,201, 87,246, 91,251, 58,138,101,123,154,172, 46, 22, 79,
+215, 14,170,220,229,144,131,139, 90, 22,228, 94,217, 84,182,222,173,194,202, 67, 86, 11,183,211,193,238, 41,138, 53,176, 16,207,
+177,219,125,119,104,196, 12,200,151,145, 18,135, 15,224, 88,130,251,129,247, 43,208, 33, 98,235,196,163, 94,202,148,  7,110,223,
+118,122,249,212, 52,214,  3, 70,131,108,242,132, 42,171,173,110,227,212, 76,197,178,173, 27,151,174, 63,126,185, 90,202, 20, 96,
+185,150,230,206,190, 89,127,145,136, 27, 51,233,124,195,170,229, 82,249,190, 99, 67,220,189, 88, 92,216,172,110,192, 42, 65,204,
+161,170, 42, 88,159, 98,174, 56,101,164, 63,109,127,246,144, 53, 87,204,220,132,243,133,249, 47,251,155,176, 61,102,115,179, 27,
+245,141,114,174,180,215,129,103, 52, 61,226,135,  3,251, 53,165,167,186,195,158,134,179,110,216, 26,  8,254,201,140, 27,240,223,
+ 32,148, 31, 56,246, 82,105,233,123,107, 23, 30, 10,210,148,186, 85, 43,103,203, 77,187,142, 29, 74,241, 24,190, 94, 57, 40,141,
+164, 91, 15, 86, 88,206,101,118, 15,146, 56,230,112,214,231,108,187,113,111,245,245,221, 15,213,223,246,238,237,139, 23,238,191,
+122,143,159,182, 31,177,110, 31,203, 85, 62,169,179,130,149,135, 13, 58, 18,145, 59,106,160, 69,254,151, 36, 31, 73,254, 81, 69,
+227,110,232,172,144, 97,233,100,231,233,218,229, 59, 79,222,113, 28,148,213,136, 30,192, 15,254, 54,150,126, 45,123,179,211,213,
+158, 93,125,120,254,249,202, 88,175, 95, 41, 46, 91,254,240,220,220,153,183, 95,215,  4,165, 18, 69, 87,200, 15,234,122, 35,199,
+225,211,179,149,250,183, 29,  8,118,168, 85,  5,167,150, 98, 90,188, 99,183,  5,165, 46,129, 48,228, 27, 36,201, 37,141, 58, 41,
+ 34,142, 22,  4,227, 88, 70,131, 53, 28, 32,151,178, 18,149, 59, 35, 54,119, 34,169,145,163,122, 33,105, 67, 80, 65,  1,109, 13,
+141,135, 80,191,  6,100, 93,235, 59, 31,145, 35,150,148,236,198, 36,185, 18,132, 17,246, 35,  0, 20,240,244,173, 94,243,  8, 71,
+ 64,  4,152, 19,  0, 31,138,122,244,132,233,140,133,135,254,128,100,168,136,184, 70, 66, 21, 23, 95, 84, 77, 67, 41,156,  8, 87,
+ 77, 38,161,142,192,231, 17,120, 29,117,148, 76, 90,243,143, 99,132,129,123,252, 16,128,178,107,217,109, 26,136,162,158,212,241,
+ 43, 78,210,144,164,106, 69, 43, 74,145,232,  2,216, 33,177, 64,106, 37,186,134, 95,224,  7,248, 25, 86,236,249,  0,254,  0, 22,
+ 44,187,  5,  4,  8,181,234, 35, 77,218, 38, 77,147,250,149,140, 99, 15,247, 49, 78,121,  9,132, 20, 41, 74, 20, 79,102,236,185,
+119,206,220,185,247,156,255,139,191,139, 63,201,103,151,138,186,255,191, 56,247,130,194, 23,231,120, 44,195,159, 59,164, 91,133,
+ 65,194,218, 44,152,161,  7,145, 59, 58, 54,147,174,165, 10, 75,197,245,  8,130, 56, 33, 51, 93,182,138, 71,100, 18, 99,219,121,
+219, 93,  6,187,138,210,144, 53, 79,132,248,133,118, 39, 95,160,150,231, 33,  5, 76, 62,153, 17, 81, 37, 11,138, 21,161,255,223,
+144,122,161,226,173,137,136,126, 44,156, 34, 85,  1,210, 78, 67,229, 28,150,  0, 82, 44, 97, 13, 30, 71, 42, 89, 42,155,214, 36,
+197,180,162,  5, 60, 12,  4, 20, 15,192, 28, 19,203, 81,145,212, 64, 53, 40, 20,174,196,149,  1,214,  9, 64, 16,  4,178, 21,170,
+223, 77,209,217,179,140, 24,165, 79,241, 30,142,196,116,250,195,240,203, 94,103,255,160, 59, 10, 37,248, 78,  7, 69, 77, 51,202,
+177, 35,197, 96,188, 61, 24, 45,133, 47, 36,180,147,194,158, 22,129, 57, 21, 68,225,132,202, 40, 79,  6,124,189,137,124,  6, 37,
+ 11, 25,105,112, 66, 90, 11,162,204, 17, 38, 84,212, 18,120, 56,172,148,  9, 32, 58,146,164,246,103,193,224,154,126, 19, 96,120,
+205,193,106, 85, 61, 77,  5, 73,109,  9,184,220,198,231,193, 21,203, 84, 98,  6,223, 48, 90,169, 59, 13,  3, 57,121, 18,150, 75,
+131, 63,177,109,207,183,171,227, 40,  0,236, 25,203,  9,155,  9,113, 56, 51,173,  6,190, 63,125,248,236,211,241,103,199,178,178,
+ 44,117,236, 74,239,178,155,200,132,141,  1,186, 91,113,107,209, 36,  4, 87,206,150,192,208, 30,158,  6,192,121,184,248, 42,190,
+100,  9, 36,202,112,207,249,104,189,225,183,110, 47,221, 25,  4,231,235,205,245, 81, 52, 98,153,226,178,229, 44,186, 72,  9,  2,
+ 91,129, 69,191,190,222,222, 24,  4,131,169,156, 84,221,218, 52,157,108, 63,216, 62, 60, 59, 58, 30,156,192,216,161, 53, 88, 40,
+ 59,167, 71,112, 47, 97, 57,159,226, 73,169,194,240, 14, 66,120, 21,198, 81,137, 24,167, 61,215,115, 29,100, 19,235,  7,195, 78,
+191,235,185,254,140, 24,255, 41, 59, 58, 31,199, 87, 25, 13,161, 31,244, 55,111,222, 61, 60,239,180,170,205, 32, 30,123,182, 75,
+  4,183,185,109,121,168, 28,147, 99,118, 74,197,241, 47,194, 33,224,125, 73,170,115, 96,245,181,202,162, 89, 42,131,107,131,221,
+ 82,187,222,190,  8,  6,240,155,105, 26,195,218,107, 65,255,189,230, 73, 56,124,108, 88,246,206, 50,170,105,179,166, 13,184,183,
+186,187,181,177,180, 90,187,215, 29,  5,189, 96,108,193, 70, 28,229,139,213, 81,167,247,226,254,114,105,181,102,100, 61, 67, 72,
+244,230, 42,215,164, 43,108, 13,152,255, 40,208,155,187,224,205, 45,163, 10, 47,219,104,120,198, 13,223, 88,107, 25,155, 43,134,
+ 52, 94, 62,127,253,228,213,187,238, 44,159,203,245,228,255,162, 28,249,152,236,238,169,221, 55,  7,239, 63, 36,111,235,166,189,
+230,182,226, 44, 57, 28,116,240, 52, 11,  1,135,153, 42,105,155,238, 90,243, 22,204,171, 32, 14, 30,237,108,237,127,253,  6, 24,
+  0,241, 15,213,178, 36,114,146,  9,158,130, 58,211,145, 20,129, 84,171,186, 20, 77,175,114, 22,246, 51,116,186, 33,124, 88,105,
+172, 12,195,145, 54,126, 45,231,164,133,183, 43, 86, 21,204,111, 70,252,  2, 66, 23, 61,177, 37, 97,120, 18,238,243,233,248,140,
+ 67,217,120, 48,238, 55, 40, 88, 42,169,253, 60, 47,124, 49,114,215,136,235,130, 88,205,126, 40,174,  3,205,204, 97, 57, 55, 25,
+ 53,231,171,164,228, 77,240, 18,240,248, 96, 18,234,140,120,238,  5,159,  9, 48, 45,193, 47,130,121,185,118,240,133,244,133,161,
+  7, 85, 48,142,205,  1,255,119,  1, 72,187,118,221,168,161, 32,122,253,184,182,247,229,221,152,108, 72,194, 18, 34, 81, 32,  5,
+ 33,  5,209, 81, 34, 16, 45, 53,252,  8, 21,  5,255, 65,141, 16, 13, 29, 63,129,160,  8,162, 75,162,132, 40, 36,118, 30,236,174,
+ 29,175,215, 47,230,204,181, 55,  9, 73,131,216,214, 15,121,125,175,103,206,204,156, 57,243,111,248, 93,187, 14,197,207,178, 43,
+156, 72,209,175,156, 92,101,102,140,203, 55,184,160,236,243,215,201,132,105, 45,150, 15,203,106,249, 91,165,179, 80, 75, 17, 96,
+199, 97,238,144, 41, 76, 71,147,165, 48, 90,134, 77,177,115,199,234,120, 77,239,104, 18,236, 69,123,104,145,229,194, 63,119, 61,
+100,117, 30,173, 80,139, 71, 63,183,209, 27,197,167,236,149,174,213,190, 44,109,105,163,175, 47,207,234, 58,134,230, 88,141, 56,
+137,148,161,207, 49, 24, 67, 99, 98,109,241, 96,229,225,198,238, 55,116,101,147,189,182,  9,184,165,134,110,160, 41, 85,215, 59,
+142,181,220,239, 25,142,133,240, 27,173,204,132,107,  8, 21,177,118,134, 40, 27, 77,171,211, 50, 33,165,142,132, 18,124,155,106,
+191,165, 13, 68,216,156, 54,176, 94, 73, 91,240, 59,213,  8,239,107, 49, 89, 90,172,191,102, 66,117,  0,238,193,150,154,106, 18,
+ 74,146,130,195,124,212,210, 13,145,219,200,141,226,144, 35, 53, 91, 98,184, 67,146,224,159, 78, 40,192,207,117,128, 16, 81, 56,
+ 22,154,205, 65, 46, 78,128,252,165,174, 91, 54,186,170, 83, 30,128,118, 54,197, 89,237,134, 60, 12,134, 81,  2,162, 16,210,179,
+136,147, 75,165,208,207,  5,210,139, 43, 90, 22,197,121,156,200,159, 16,187, 68,214,  1, 87,117,111,238,197,175,250,134,233,168,
+105,152, 45,217,164,219, 77,160, 78,  3, 37,181, 73, 26,  9,140,123,110,114, 99, 58,217,220,  6,212, 77,114,140,204,101,226,181,
+174, 36,129, 20,119,193,129,193, 45,152, 76,147, 91,166, 76, 89,112,149, 21, 10, 81, 26,165,197, 50, 77, 11,217, 12, 19,146,103,
+138,  5, 64, 87,119,154,110, 24,141, 75, 37, 35, 33,202,229,222,192, 31,238,211,166,114, 91, 93,105,104,163,104, 76,190,112,109,
+229, 62,129,241,101,111,105,199,223,177,193,250,145, 12,242,  4,249, 36,122,173,100,250,151,230,250,180,  7,127,252,252, 62,215,
+ 66, 89,248,206,252,234,182,191, 77,143,234,181, 60,114, 57, 20, 40, 44,206, 45,  4,163,227,121,148,118, 15,  6, 55, 86,182,252,
+205,133,222,205,147,240, 68,177, 31,232, 14,144, 57, 51,100, 24,143, 76,158, 10, 73,129,  8, 93,232,146,211,138, 67,242,  7,160,
+216, 50,197,124,224, 13,130,161,207,237,115,  5,249, 39, 76,247, 45,203,213,197,187, 20, 69, 77,115,204,214,202,210, 41, 56,  0,
+186,112,164,209,110,184, 71,161,255,180,123,235,197,219,117,177,222, 21,254,177, 24,141,197,116, 10,208, 93,102,191, 62,157, 62,
+127,247,121, 35,216,191,186,221,191,188,124,242,232,205, 51, 49,137,133,193, 21,118,218,173,211, 20,176, 61, 87,124, 13,157,  7,
+ 63,  1,155,  8,219, 18, 94, 19,176,125, 55,252,240,250,227,171,247, 95,243,255,158,  0,113,207,189,253,184,191, 22,101, 49, 45,
+ 46, 69, 78, 94,179,183, 25,108,205,102,108, 11, 22,123,115, 76,217,110,187,  7,191,  3,193,132, 25,238,237,  4,151,166,182,239,
+244,104, 78, 52, 25,163,111, 67,101, 93, 57,251,161,114,215, 76,142, 81,115,  7,141,170, 35,172, 66,192, 37,189, 49,169,203,134,
+180,  9,181,  0, 62,243, 14,161, 79,146,252,232,209,208,231,129, 16,228, 51,250,135, 33,134,191, 35,172, 70, 66, 32,109, 59,221,
+179, 73,152, 20,153,146,204, 44,106,171, 61, 19, 65, 96,178,116, 69, 34,157,229, 11, 46, 98,118,165, 88, 92,201, 18, 10,165,227,
+198, 38,186,210,166,172, 57, 51,101,117, 73, 45,122,163, 43, 65,130,218,170, 42,  5,191,243,146,235,165,100, 50, 19,192,254,  8,
+ 64,218,181,235, 70, 13, 68, 81, 63,214,235,215,198,206,139, 36, 36,144,104, 35,162,136,136,134,164,166,162,226, 39,248,  0, 36,
+ 36,190,131,138,  6,  4, 18, 13, 45, 37, 21, 66, 80, 82, 65, 75, 65, 10,  4, 41,146,144, 85,148,125,217,187,246,120, 60,220,115,
+103,150, 93,  5, 26,132,180,141,247, 33,217, 87, 59, 51,231,222,123,238, 57,255,140,223,173, 63,138, 51,232, 73, 88, 78,232,198,
+108,160,122,  9,197,187, 38, 77,152,113,  4,153,129,201,179,103,146,105,183, 34, 57,183, 60,246,166, 64,  9, 69, 76,206, 33,199,
+240,223, 93, 23, 95,160,191, 63,191,152,155,235, 97,122,206,211,125,228,165,248,138, 80, 98, 36,114,215,192,120,131,224,149,105,
+166, 40,158, 86,170, 65, 26,181,212,165,174,233,108,231,151, 89, 34,211,182,  9, 74,219,248,  9,110,117, 37, 93,207,203,204,131,
+242, 59,  0,  4, 45, 96,189,165,129, 73,130,196,223,209, 98, 75,  4, 67, 43, 37,251,163,241,114,232,181,175,205,121, 30,  1,160,
+ 70,228,193,221, 52,109, 53,147,150, 27,251, 80, 60,103,129, 82,219,227,244,  5,133, 20, 89,163, 80, 51,134,231, 87, 37,106,223,
+113, 67, 16,229, 49, 83, 58, 30,149,217,168,162, 80,  7,158, 19,251, 94,236,  1, 87,177,206, 19,220,109,  2, 87, 69,  1, 65, 43,
+ 55,165,227,206,197,163, 53, 89,178,143, 61,186, 28, 45,119,108, 75,182, 47,179,100,163,225,180,  2,138, 27,179,139,209,  2, 84,
+ 17,189,227, 99, 16,209,145, 80,  7,156, 15, 41,211,128, 71, 78,127, 48, 30, 12,133,182,230,153, 44, 56, 93,152,177, 77,120,248,
+154, 89,199,211,225,  6,196,  3,140, 27,149, 68,139, 69, 53, 74,194,  5,166, 59, 74,173,137, 68,161, 11,155, 65, 85, 85,232,106,
+178, 76,124, 43, 72,106, 38, 63,232,  6,122, 19,173,185,134, 16, 85,123,109,187,229,199, 12,174,  3,129, 65,101,  3, 46,225, 81,
+137,233, 42, 48, 89, 23, 98,130, 84,160,201, 83,232,178, 34,167, 85,147,243, 68,140,226,167, 35,236, 15, 94,179,150,218,131, 63,
+117, 58, 42,243,  6,206, 95, 79,129, 43,167, 48,166,200,126,202,160,235, 40, 48, 26,  9,188,119,250, 29, 74,236, 54,150,214, 49,
+176,  9,166,154, 30,131,176, 86,147,213,102,211, 63,237, 30,159,117,207, 41,  7, 59,216,222,255,209, 57,202,139,236, 96,103,255,
+240,248, 48,242,162,172, 28,150,117, 73,249,205, 69,222, 47,197,184, 16, 69, 24,182,210, 40,217, 92,110, 95,100, 64,226, 20,135,
+ 86,152,210, 70,191,187,177,219,203,123,123,155,123, 39,221,159,144, 14, 23, 99, 62,213, 36, 61, 14,221,146,102, 72, 87,149,236,
+230, 93,169, 24,206,219, 80,205, 99,157,  9,176, 57,203,170,160, 93,233,198,218, 78,103,112,202, 78,120, 13,250, 52, 47,134,183,
+183, 14, 62,159,124,125,240,248,197, 93,217, 92,217,186,106, 45,164,192, 75,223,179,252,221,183, 59, 79, 94,127, 25,244,254,186,
+174,159, 63,188,103,183,  9,197, 11, 70,235, 10, 58, 68,  1,189,124,107,206,131,111, 58, 97,246, 36,180,230,105, 91, 79,172,235,
+148, 25,212,239, 31,189,185,117,255,229,135, 35,255,211,219,143, 79, 95, 61,251,207,253,157, 54,244,155,139, 91,189, 98, 24, 71,
+115,231,189, 51, 56, 89, 18, 78,175,213, 20, 44, 56, 54,101,161,195,113, 70, 24,146, 16,122,111, 52,  0,139, 83, 50, 23, 94,113,
+134,  2, 66,179,208,213,216, 90,171,  8,219,198,248,168,158, 76,173, 50,108,150, 92, 58,103, 23, 87, 94,252,101, 81,230, 85, 14,
+181, 47, 41,211,104,174, 20, 37,175,244, 42,135, 52,158, 45, 89,176,108,  8,143,  1, 89,155, 90, 10, 54, 95,202, 56, 43,205, 88,
+103, 97, 39,101, 79, 57, 46,184,194, 13,213,114,226,162,202, 12, 76, 45,207, 81,207,104,215,152,204,162,214,186, 99,102,122,199,
+148,110,216,117,138, 89, 49,182,174,198,155,  2,248,108,101,157,219,131, 19,135,167,250,247,128,168, 50, 42,227, 92, 75,160, 85,
+243, 75,  0,206,174,101,183,105, 40,136,250,218,190,215,118, 18, 55, 33, 77,156,180,  8, 54, 69, 44, 42,181,226,  3, 42, 85, 32,
+245,167,216,242,  7,172,249, 10,196,134,  5,160, 74, 93, 82,129,132, 42,164,138,110, 10,165,239,146,216, 73,108,199, 73,204,156,
+185, 54,105,212, 21, 85,171, 86, 93, 84,114, 28,103,230,204,157,243,184, 39,126, 95,  4,239, 60, 40, 24,102,201,128, 44, 62,131,
+183, 56,145, 11,229,187,140,131, 17,183,253,126, 45, 86, 93, 19,134,229,124,143,226,124, 74, 35,119,201,217, 98,165,108,149,170,
+149,173,151,210, 74, 40,  5, 45,145,237,128,172,165,148, 37,149, 41, 29, 28,242,170,163,232, 64, 57, 50, 74, 16,158,137, 83,105,
+ 78,  6,214, 13,128,202, 26, 21,162,170,227, 19, 20,210,100,212, 59,197,189, 92,145, 44,168,106,203,244,218,242,250, 69,225,108,
+ 51, 63,142,210,161,175,136,138, 71, 52,140, 73,104,157,112,188,100,165,109,167,225,109,109,118, 90, 77,111, 56,158, 36, 99, 35,
+140, 51,250, 25,197,211,116, 38, 82,104,101,120,101,  5, 20,150, 43,137,155, 73,211, 56,213,  6,106, 20, 18,245, 95, 96,233, 74,
+ 93, 43,155, 82, 57,135,158,208,166, 15,  0, 61,133,120, 65, 38,159, 23, 50,175, 22, 13,198,177,  4,108,177, 13, 28,188,224,190,
+241,132, 77,248,221,182,  4, 21, 67,250, 27,156,123,156, 18,100,195,113, 54, 74, 53,200, 17,227,  9, 12, 34, 83,253, 13, 95, 62,
+108,145,242,185,105,157,198,219,144, 56,133, 73, 79,112,236,129,158, 93,124, 40, 65,226,  9, 82,210,110,187,176, 22,239,172,126,
+172,249, 23,134,158, 96,105,149,174,150,218,161,198,226,218,160,207,204,181,109,134,  5,183,125,141, 77,138,200, 21,147,179,235,
+129, 88,104,150,234,214, 87,126,222, 28,151,130, 88,192, 48,207,169,217,166, 29,193, 71,158,237,124, 89, 52, 88,161,102, 48,133,
+194,182,237,183, 46,163, 11,205, 91,152, 21, 52,217, 66,240, 80,117,107,195,100,104, 50, 81,194, 81,142,239,130,117,147, 77,224,
+ 12,108,  9, 57,225,160, 56, 41,229,230,163,205,155,232, 79, 20,247,232, 98, 19, 24,224,128, 29,181,214,125,242,227,236, 80,154,
+118,224,  7,157,102,112,120,114, 72,183,118, 16, 15, 56,177, 93,213, 42,149, 36, 29, 83,235,160,142,226, 40,143,128,191,178,221,
+211,235, 95, 15, 91,143,145,205,203,166,175,131, 36,162, 57,227,249,198,139, 47, 71,251,215,  3,240,127, 70,136, 61,  0,246,104,
+120,141,126,210,227,172, 96,168, 43,104, 36,117,149,187,181,177,149, 85,197,238,167,247,116, 73,124,205,162,189, 20,156,133,231,
+ 75, 14,189, 10, 66,250,217,246,250,246,254,209,103,186,117,157, 70, 55, 78,123,118,158,190,254,250,161,159,165,255,151,161,182,
+247,202,120,234, 27,163,  1,103,177, 24, 88,180, 70,153,113,147,128,150, 92,117,  1,216,235,158, 97, 84,140,203,254,238,203,119,
+ 59,111, 62,234, 98,241,192,107, 30,188,221, 91,221, 89,191,119,101, 87,134,221,148,181,103,203,107,142,148, 52, 53, 44, 87,154,
+136, 97,169,214,175,194, 43,172,176,138,115, 34,244,114,134, 23, 51,200, 51,242,105,211,111,157,247, 78,233, 25,108,215,131, 48,
+ 14,251,113, 88,108,216,  8,222,213,105, 96,186,232,128,193,242, 91,  3,188,127, 71,216, 64, 36, 98,214,246,131,110, 99,229,251,
+201, 55,230,219,176, 72,176,212, 55,229,101,217,178,196,156, 87,195,255,165,149,165,236, 37,163,117, 24,122,129,165, 51,163, 10,
+ 50,122, 57,187, 26,176,205,160, 71,158,154, 61,224,221,176, 39,196,220,130,216,145, 96,117,115,126,139,222, 88, 79, 93,233,130,
+ 12,145,105,222,135,206,152,194,151, 95,105,140,178,193,  4,253,166, 64,239,139,133,215,156,235,132,138,  4,167, 59,239,105, 14,
+107,240,191,  2,112,118,238,186, 77, 68, 65, 24, 62,123,243,122,189, 94, 95, 48, 78, 76, 34,132,  4, 18, 13, 69, 10,160,160,  8,
+  5, 45, 61,  8,158,129,134, 71,224,  5,120, 12, 58, 36, 58,218, 72,161, 68, 36, 69,  4, 18, 69,226,  4, 18,199, 78,226,141,124,
+201,198,187,222,179,204, 63,179,142,185,  8,161,208, 89,174,142,215,103,103,230,204,249,231,251, 47, 17,223,255,108,206,128,147,
+165,156, 88,159, 95, 76,171, 50,  2,172,192, 56, 23,139,175,140,126,177, 93,154, 99,212, 21,195, 11,113,200,154,254,214,165, 49,
+148,157,240, 98,204, 92,  8, 47,198,145,153,141,117,138, 77,184,205,250, 25,182, 23, 80,182,103,187, 40,231, 77,167,228, 32,142,
+ 25,134,219,240,107,237,209, 78, 63,234,209,243,135,161,  6,124,135,240,198,162,252, 81, 57,254,205, 66,171,216,142,121,124,249,
+226,233, 75,117,152,129,244,223,234, 13, 58,166, 50,255, 77, 44,158, 43, 81,249, 10,222,241,146, 52, 42, 23,107,227,100,204,224,
+ 70,133, 57, 85, 75,136,103,230,131,219,139,180,192,136,130, 40, 90,223, 84,137, 57, 65, 80, 52,153,170,  0,161, 27, 40, 19,106,
+146, 64,228,  9,184, 82, 60,117, 80,134,107,139,169, 11,112,242,  6,240,208, 64, 35,151,123, 29, 37,203,242, 41,168,224,248,130,
+243, 11,166,153, 92,140,245,234,137, 62,157, 80, 58,128,156,216,181,205, 56,211,148,  1, 39,105, 10, 99,192,204,104,213,131,245,
+173,221, 41,100,146, 80,125,229,230,240, 90,198,254, 56,154,167,162,224, 18, 96, 94, 42, 85, 10, 58, 53, 58, 11,138,117,122,253,
+176,138,220,239,150, 93, 19,229,205, 81, 12, 90,  0,  1,102, 56, 27,112, 51, 37, 67,138, 68, 65,110, 18, 92,232,196,153,140,156,
+247, 58, 37,  1,101, 76,116, 48, 56, 29, 41,191, 16, 64,102,  3,193,143,205,110,102,244,126, 21,138,110,145, 42,241,102,101, 49,
+ 73,226,163, 17,212,129,180, 60,104,153, 53,232, 67,194,251,190,123,243,222,167,246, 71, 90,218,181, 90,171, 63, 58, 57, 99, 33,
+ 57,135,248,185,177, 99,198,158,233, 87,130,198,233, 40,132,205, 55,  6,239,225,156, 73,121,121,169,190,180,123,180,243,226,233,
+203,247,107,239,190,247,247,109,238, 55,210,102, 46, 23,253,179, 36,242, 28, 88,172,208,134,162, 47, 87,110,172,108,110,111,174,
+222,121,184,115,184, 77, 37, 82,171,209, 60, 12,123,131,241,192,117, 10,213, 82,117,239,184, 93,114,124,250, 67,168, 96, 15,188,
+ 74, 12,254,123, 84, 43, 85,198, 49,124, 10,  3,175,138,222, 91, 66,  9,195, 42,123, 84, 48, 70,180,103,194,179, 16,131, 21,150,
+ 89, 42,240, 85,170, 50, 40,198,193,201,104,120, 74,167,  4,218, 68,  5,112, 42,121,  2,154,254,126, 83, 72,164,  0, 66, 80, 90,
+ 98, 75,163,212, 98, 47,224,235,181,197,183, 95,214, 54,194,111,151,141,179,111, 30,223,127,246,250,185, 10, 12,168,110, 78,134,
+ 42, 60, 87,189,137,250,218, 87,131,201, 70,187,179,117, 48, 88,104, 85,247,143, 71,175, 62,124,222, 83,243, 51,186,171,220,147,
+245,237,242,234,242,127,199,247, 39,183, 30, 81,162, 90,168, 55,187,131,110,167,223,229,243,156,246, 93,143,126,227, 56,130,181,
+172,180,149,213,204,173, 46,229,137, 19, 72,103, 12, 61,  5,156,  6,219,170, 89,105,210, 71,144, 27,184, 88,155, 66,231,106,136,
+141, 84, 54, 27, 32,146,107, 29,  9,159,240,153, 73, 19, 64, 67,217, 55,105, 54,197,142,  2,123,185,177,124, 16,118,242, 14, 72,
+ 46, 29,144, 27, 90, 45,133,206,148, 91, 42,162, 16,166,101, 52,130,  6, 29,197, 82,110,209,248,174, 15, 37,110, 62,233,148, 73,
+ 55,210,152,193,201, 24,170,157, 35,197,178, 92, 55, 15, 89,223,213,160,213, 29,118,242,211,176,150,230,187,176, 10,180, 24,  1,
+230,245,163,254,203, 84,209, 79,170, 69,147,187, 75,179, 92,144,235,213,127,  8,192,217,181,236, 54, 13, 68, 81,207,140, 31,121,
+213,105,155,168, 78, 75, 65, 37,  5,161, 72, 72,188, 37, 86,108,248,  0,190,128, 47,226, 51,248,  1,182,172, 89,116,  5,168, 43,
+ 68, 43,  1, 81, 68, 26, 26,147, 71, 19, 39,182, 19,143,185,247,206,216, 77, 10, 11, 84,229,161, 40,155,196,201,204,153,251, 56,
+247,156,255,197,247,191,193, 61,205,152, 51, 76,195,174,210, 27,160, 38, 30, 21, 74,165,177,234,165,148, 99, 34, 96,129, 40, 96,
+ 45,186, 88, 16, 21,184,204,209,178, 39,117,139,142, 88, 68,  6,139,140,133,208, 52,117, 84, 79, 79,181,248,140, 80, 18,237,112,
+162, 88,116, 60,192, 34,119, 56,220, 45, 19, 80, 14,125, 65,177, 74,227,  8,187, 90,112,253,176,223,153,125,135,211, 18,  2, 34,
+137,108, 42, 36, 71,  6,170,175,155,234, 78, 10, 30, 36,105,148, 47,159, 60,120,135, 45, 45, 73, 90,122, 85,  1,250, 95,236,247,
+ 76,232,140, 94,115, 13, 99,156,140,133,169,102, 69,131,101,112,157,168,134,109, 41, 23, 40,188,211, 86, 36,141,108, 18,212,209,
+179,199, 50,111,  7,163, 18, 11,233, 58, 98, 41,156, 92,253,200,170, 67, 48,  7,141, 52,113, 34,188, 86, 44, 25,214,242, 60,152,
+ 79,101, 60,140, 34, 72,122,130, 40, 25,  5,209,197, 52, 52,180, 98,227, 74,249,172,236,188,120,242, 56,156, 12, 55, 76,190, 91,
+ 67,191,159,163, 99,228, 81, 36,216,245, 75,104, 92,132, 24,145,104,251,164,250, 78,218,105,158, 50,217,172, 80,101,176,106,121,
+251,247,164,175, 84, 53,178,193,223, 52, 55,111,147,186, 91,132,171, 28,189,202,208, 97,196, 92,146,195, 14, 58,124, 81, 94,220,
+220, 57,132, 32, 12,224,143,161,175,161,168,187, 94,127,220,171,150,183, 70,193, 64, 77,135,145, 29, 23, 62,158, 30, 62,251,252,
+237,163,169,106,208,216,166,226,174,227, 78, 98,  0,125, 12,213,201, 52, 69,211,175, 20, 95,214, 22,118,168,124, 63,116,201, 13,
+ 55,228,221,189,123,167,221, 19,146,245,190,220,  3, 36, 19, 34, 33,104,138,146,184,225,238,206, 48,245,198, 67, 20,178,  1,248,
+121,127,141,123,158,219,184, 89,191,117,220,254,  4, 31,210,186,209, 58, 27,254, 68, 23, 37, 18,161, 52,177,239,178,132,231,  3,
+175, 57, 13,208,158,247,108,132,202,227,158, 91,131,175,121,127,191,245,165,251,213, 31,251, 42,167,131,119,182, 74,155,131, 96,
+120,123,231,224,199,121, 27,160, 31, 85, 13,136,180, 90, 46,194,178, 55, 32, 39, 32,226, 80, 10,171, 23,224,134, 56,121,105,165,
+176,129,146, 41, 92, 44, 81,194, 31,110,  9,213,214,184,186, 92,  0,178,193,197,112,191,190,135, 50,247,156,155,150, 32,216, 72,
+ 82, 61,106,  6,127,254,226,237,201,135,235, 65,237, 75,183,242,230,213,243, 71, 15,154,198,130, 25, 93, 56,254,102,175,223, 31,
+189,235,251, 87,102,213, 75, 54,100, 39,186,196, 93,181,107,163,200,135,133, 41,141,248,122, 31,250,112,251,142, 87,168,206,101,
+ 12,135, 19,196,103,  9, 68, 33, 92, 87,201, 97, 45,  1,218,182,251,109,142,  9,104, 17,182,240, 60, 86,140, 56, 29, 56,227, 47,
+191,217,232,248, 29,169, 74, 52,186,167,137, 28,174, 36, 11, 82,232,223,207, 73, 21,218,216,154,115,197,224, 72,149,206, 44,185,
+159, 41,197, 47,105, 91, 78,180,136, 57, 91,215, 51,103,151, 92, 25,137,126, 13,146, 34,236, 68,201,193,171,126, 45,192,177, 45,
+ 74, 72, 11,206,217,232,233,202, 40,105,206, 49, 99,153, 99,147,174,208,192,245, 10,242,156,224, 25,178, 83, 13,135,229, 85, 16,
+ 69,243,179,163, 56, 92,117,185, 88, 51,215,102,107,240,122,165,153,248, 71,  0,202,174,101,183,105, 32,138,122,198, 51,182,147,
+ 52, 78, 66,218, 82, 30, 93, 32, 85,  8,164,238, 80,191,128,207,  0,190,131,  5, 11, 62, 17,177, 64,130, 77, 97,199, 35, 16,225,
+196,142,237,177, 61,195,125,140,173,180, 20,  1, 82,229, 69,149, 56, 19,103,230,206,185,119,206, 61,231,159,226,251,141,242,  2,
+158,208, 54,184,135,248, 63,111, 86, 18,252,230,  2,203, 23,236,239, 10,112,214,114,245, 56, 85, 71,165,203,202, 46,231, 20,149,
+136, 49, 72, 48, 21,126,147,240, 97, 93, 19, 96,151,100, 21,140, 87, 34,122,192, 60,208, 82,199, 24,  0, 21,188, 38,  9,227, 68,
+ 99,149,102, 18, 31,100, 38,187,204, 62,112,255, 27, 30, 10, 58, 58,101,117,189,166, 15, 25,150, 11, 78,250,124,250, 35,250,211,
+127,172, 36, 88,111,170,114,197,171, 68,  6,215,184, 53,142,101,112, 90,215, 96, 46, 32, 81,229, 71,122,145,  3,146,  7,166,205,
+ 78, 33,120, 71,108, 75,114, 38,244,  6,252,135,116,164, 31,207,245, 11,233,225,191,220,107,169, 24,104, 86,206,211,123,144, 99,
+163,176,106, 33,113,147,142, 70,209,106, 87,176,164, 11, 92,106,131,157,121,158, 71, 32,153,230, 11,159,169,166, 40,219,168,159,
+ 94, 60,169,202, 66, 52, 59,219,229,217,218,124, 94, 35, 47,135,  4,250,  2,114, 98,234, 13, 11, 58, 65,228, 36,199,  4, 71, 27,
+176,102, 29,207,223, 46,214, 99,148,211,218,173, 49, 14,163,207,137, 24, 66,252, 64,182,133, 59,177,  2,  1, 90,107,161, 75, 31,
+ 58,176, 69,184, 95, 82,125,204, 89, 38,  0,209,226,178, 90,233,142,180,  1,232, 73, 98, 66,  5,131,128,212,187,174,139,170,133,
+ 39, 25,198, 58,110,154,122, 62, 94,110,235, 76, 12,204,179,160,175,224,248,230, 17, 17,171,228, 56, 61, 92,101,171,186,173,  7,
+ 71, 74, 22,235,134, 56,174, 67, 93,212,185,239, 66,164,226, 53,124,177,217,116,158,239,242,116,148,194,  8, 97,182,148,166,212,
+ 40,229,158,228, 53, 58,180, 40,165,206, 79,207,223, 94,190,185, 59, 63,253, 81,172,122, 50,168, 35,138,148,156, 31, 44, 98, 24,
+121,219,193,109, 79, 22,119,190,174,191,132,168, 22,231, 70, 17,  0,136,130, 60,124, 37,255,136,112, 31,131,140,  8,145,142,230,
+ 57,154, 53,226,207,152, 38,  7,176,181,180,109,  3,  3, 67, 67, 74,129,189,178,228, 85, 82,244,114, 36,246,112,186, 52,214,  0,
+ 34,169, 76, 73,132,232,224,222,226, 62,236,130,232,196,133,155,129,129,196,  5,207,243,247, 78,239,216,136,  5,246,254,119,223,
+223, 39, 74,193, 19,202,209, 32,192,230, 77, 93,117,205,182, 49, 59,242,199,176,246,239, 22, 62,103, 81,210,134,118, 85,153,130,
+ 94, 27, 43,180,247,194,250, 51,202,236,224,194, 49,166,101,148, 56, 22,105, 97,179,135,183, 31, 63,123,241,252,245,203, 87,226,
+ 88,252,111,124, 95, 70,211,139,163, 71,136,231,156,156,141,166,155,106, 75, 68,175, 16,251, 84, 16,105,105,106, 21,134,181,130,
+ 54,109, 53,106, 96,  4, 92, 36,225,242,  8, 12,169, 33, 18, 57,204, 55, 72,125,  0, 62,  7,212,192,  1,203,253,193,201,217,167,
+111, 31,217,190,141, 33, 11, 32,  9,244,113,172,126, 74,191, 66,156, 63,104,237,251,206,111,162, 24,186,161,197,137,113, 59,103,
+ 12,183,210, 37,128, 52, 64,250, 40,135,194,233,175, 96, 69, 42, 33,254, 16, 57, 67,108,144, 78, 54,229,198, 43,202,247, 86,174,
+110,192,236,253,162,155,198,179,194,108, 88, 72,135, 77,161, 70,209, 36,111,139,137, 26, 23, 87, 29, 50,122,139,146,235,195,182,
+123, 37,157, 95,  2,112,118, 45,187, 77,  3, 81,212,227,113,236, 36,142,242,106,104, 40,  8, 33, 33, 33,177, 69, 42, 11, 62, 30,
+ 36,196, 23,176, 96, 87, 68,  4,148, 18,146, 38,196,241,219, 99, 15,247,220,177, 93, 71,237,  6,164,238,170,196,246,120,114, 31,
+103,206, 61,199,249, 39, 88,166,139,188,235,198,115,195,234, 40, 10,224, 32, 91,186,102,204,241,193,194,151,215,209, 53,247,148,
+ 90,106,196, 67,107,250,100, 66,170, 45,165,133,185, 81,217, 92, 66,118,148, 35, 57, 14, 75,148,198,252,  7, 69, 42,240, 15, 65,
+ 53,164,111,204,216,231, 83, 52,208, 91,219,190,116,213,127,238, 83,249, 75,211, 94,104,109, 61,244,158,218, 79, 58, 96,209, 82,
+ 41,151,183, 41,  0, 89, 29, 54, 38, 92, 49, 48, 58, 13, 70, 12,  2, 29,187, 35, 27,183, 47,203,246,232,151,  3,116,163,162, 54,
+ 84, 40,118,155,180,237, 70, 32,195, 80, 67,234,  0, 63,241, 22,135,108,203, 11,202, 45,  1,178, 60,  0,156,202,193, 71,133, 67,
+ 97,130,178,131, 23, 82,177,161,196, 46,202,169,100,145,  3, 81,150, 44,238, 98,247, 38, 99, 15,234,180, 69, 57,245,  7, 83,223,
+ 47, 84,118,177, 60,223,252, 88,  5,123,245,107,  7, 46,189, 42,192,146,208, 44,233,  2, 46,101,221, 27, 34,239,241, 19, 24,235,
+ 24, 22,184, 21, 76, 56, 18,146,130, 17,133,155,250,  5,217, 82, 87,101, 71, 45,155,219,104,219,113,157, 94, 90, 38,  6,232,166,
+ 90,102,225, 47,183,225,186,160,252,135,188,198, 96,137,110,160, 44, 33, 20,188,  4,133, 54,213, 41,202, 22,164,191, 63,225,214,
+180, 55,174,227, 82,116,198, 17,165, 74,140,218,187, 57,221, 26, 58,212, 92, 43,230, 31,213,155, 48,206,195,111,219,120,212, 31,
+117,157, 27,152,224, 92,245, 49,132,204, 13,184, 70,115, 71,251, 36, 87, 57, 14, 14,192,148, 96,158, 27,204,190,119,103,227,229,
+238,184,241,251,190, 72,  0,190,170, 66,  5, 81,168,116,185,141,214,108,228,  2, 79,208,229,236, 73,148,134, 84, 70, 77,135,227,
+213,230,171,  3,171, 22,121, 76,  2,207,237,165,176, 18,180,162, 52,209, 48, 98, 68,228,225,150,  1,215,162, 69,241, 48,130,123,
+ 48,173, 16, 51,252,138, 36,139,105,223, 42, 27,172,217,153, 63, 59, 68,251,179,241,130, 34, 90,146, 37, 79,231,207,232,121,163,
+ 44, 46,209, 92,225,236,144, 86,227,241,244,252,231,254, 26, 61, 71, 94, 40,153,207,  6,211, 40,141,209, 15, 54,136, 13,215,147,
+198,119,154, 46, 55,184, 77,143,125,156, 69,217,190,144,147,190,135,112,111,225,136, 22,182,162,130,222, 75,238,244,252, 87, 47,
+158,127,248,252, 41, 73, 19,  9, 74, 49,244,108,143,170, 72,225,244,162,175,242,244,196,224, 13, 35,199,202, 64, 11,168,  6,212,
+221,184, 80,172,131, 96,117,216, 28,110,223,125,124,255,246,245,155,255,168,223,179, 74,141,134,126, 26,193, 54,157,118,151,177,
+174,134, 76, 33,235,199, 29, 19,198,250, 52, 53, 62, 69,201,120,  8, 51, 70,164,170, 50,115, 63, 60,249,196,200,137,160,109,144,
+153,184,217,179,229,163,249,197,151,155, 43,250, 31,151,234,250,242,229,229,205,126,125,189,251, 94, 99,134,204,132,104,  3,186,
+205, 97,153,233,112, 53,201,187,234,142,129,154,  3, 57,195, 81, 22, 70, 36, 92,255, 14,214, 92,182,219,117,131, 43,106, 51, 86,
+235,132,167,126,194,174,166,133, 75,116, 90,233,  6,  4, 54,143, 42,152,154, 32,106,196,199,124, 71, 88,  4,148,212, 39,195, 57,
+ 75,212, 33,226, 71, 44, 41, 12, 74, 72,117,199,251,110, 35, 82,121, 47,226,119,141,171,254, 10,192,217,149,236, 54, 13, 69, 81,
+191,103,199,142, 19,103, 78, 83, 16, 45,173, 64, 42, 18, 18, 43,246, 44, 97,197, 95,240,113,124,  2, 59,150, 72,253,  0, 36,186,
+ 66, 41, 67,105,234, 76,118, 28,207,230,158,251, 60,164,172, 42,178,204,164,228,249,250,142,231,158, 99,252,135, 60,147,184,183,
+179,170,200,123,139, 74, 82,213, 40,177,240, 60,246, 46,154, 49, 69,211, 34, 98,132, 55, 64, 50, 38,227,100, 64,110,217,188, 46,
+ 12,128,121, 68,221,101,208,203,110,187, 34,  7,230,198, 46,210, 40, 52,220, 37, 83,150,130,237,  5, 34,198,104,189, 51, 90, 70,
+152,154, 30, 21, 59,  9, 86,160,138, 37,162,242,238,181, 82,151,172,177, 71, 85,242,158, 61, 64, 16,188, 34,240, 81,251,180,108,
+241,168,102, 75, 70, 44,254,121,228,129,121, 89, 31, 41, 47,229, 29,133,209,178,200, 14,169,162, 37, 95,150,134, 33,203, 83, 74,
+214,214,102, 69,176, 44,171, 15,166,146, 50,134, 75, 95, 36,127,202,200,204,145,128, 62,149,114,159, 24,135,160, 75,202, 83,169,
+ 44,161,156,151,110,128,205,126,159,164, 74, 43, 74, 90, 45,100, 91,109,211, 60, 26,180,163,128,206, 48, 57,157, 30, 95,156, 63,
+238, 15, 29,179,101,132,182,253,221,115, 25, 64,  6, 56,  0,214,189, 84,150,203,171, 33,148, 34, 73,238,201,128,203,129,255, 11,
+171,169, 41,170,188,  2,140,101,152,151,148,106, 86,244, 97,199, 30, 48,115, 64,209,240,129,226,155, 82, 81,227, 73, 53,105,183,
+109,233,139,202,196,203,133,  1,203,236,218,186,133,197, 60,241,111,133,199,107,126,152,  8,140,157, 41,121, 61, 72,230, 26,228,
+212,246,195,222,216, 11, 60,141,145, 73, 84,148, 80,225,113, 58, 58,251,177,188, 38,151, 55,235, 31,207, 33,208,168, 81, 54, 93,
+242,109,151,150,131,217, 76,202, 67, 47,117,243,150,116, 88, 26,131,115,164, 41,180, 32, 72,118,108, 72, 58,131, 87, 69, 68, 14,
+ 66,136,139,217,139,111,191,191, 82,116,121,118,244,124, 27,109,183,254, 26,237, 54, 10, 87,105,220,235, 12, 54,193,  6, 44, 49,
+105,161,155,192, 56,186,254,157,198, 45,  0,165, 87, 71,135, 49,232, 12,200, 34, 23,235, 69,187, 77, 53, 53,246,  0,178,204,231,
+234, 11,148, 21, 58,115,242,140,156,241,210,119,147,  4, 20,113, 94,184,161,103, 54,193, 86,128, 97, 16,244,103, 41,242,227,152,
+126,113,156,135, 67,103,226,  5,171,159,171, 95,116,105,226, 36,146,116,233,227,162, 63, 25,158, 76, 79,230,183,215, 96, 95, 97,
+194, 86,202,108,122, 38,149, 86, 43,178,139, 39,206,163,171,229, 13,107,185, 72,149,224, 64, 75,  5,122,129,188, 13, 40,  5, 69,
+199, 87, 79,207, 62,188,127,247,242,124,246,241,211,231,137,105, 27,104,250,  1,208,139, 21, 60,118, 60,113,150,187, 73, 28,166,
+233,151,197, 77,140,221, 14,173,129,235,137, 67, 60,177,209, 31, 13,200, 62,186,194,126,251,250,205, 65, 22,245,208,135,159,238,
+189,104, 55,235, 77,200,146,195, 28, 32, 37,213,157, 48,165, 78,103,194,121,159,154,  0,193, 82, 91,166,229, 88,253, 91,255,150,
+201,222,113,163,144,185, 14,157, 49,213,109, 65,184,163, 34, 86,133, 57,138,148,243,187, 57,221, 30,189,118,119, 31,133,244,182,
+203,171, 75,134,127,232,133, 56,208,230, 80,137, 19, 79,100, 70,157,209,122,231, 10,132,231,123,122,213, 90, 53,185, 84,125,203,
+146,118,134,221, 73, 85, 72, 20,234, 59,242, 26,200,168,213, 78, 69, 52,249,180,198, 91, 98, 24,159,113,127,176,241,236,138,227,
+160,210, 95, 85, 12, 50,128, 14,229,174,239, 42,133, 85,197, 94, 74,  7, 19,103,145, 90,144,108, 72,196, 74,191,209,108,183,230,
+117, 68,169,186, 67,127,  5, 96,236, 90,122,155,136,129,176,247,229,221, 58,  9,143,182,148,210,210, 86, 80,165, 45,  7,110, 72,
+ 72,252, 91,254,  5, 39,206,168,220,120,136,135, 84, 26, 53,173,  4, 37,217, 36, 77,178,105,118,215, 54,243,112,118, 83,  4, 82,
+165, 28,162, 40,114,214,142, 61, 51,158,249,230,251,194,219,152,117,241, 47, 54,130, 69, 77,149,147,227,158, 99,  7, 35,156, 32,
+134,243, 54,240,150,241, 50,142, 11,  0,211, 19,136, 87,198,150, 26, 12,193, 74, 61,183, 53,188,129, 23, 38, 32,239, 42,156, 60,
+ 83,205,255,142,172,187,216,130, 67, 98,162,152,158,102,201, 12, 75, 84, 39, 20,227,146, 94, 33,146, 31,140,145, 88, 10, 99,184,
+ 86,220, 26,100,169,168,105, 40,150,232, 38,110, 56,216,229, 58,  1,159,  5,251, 63,159, 71,249,106, 93, 79,172, 94,104,124,229,
+196, 18,238,218,181,168, 39,205, 10, 66,178,123, 52, 41,195, 10,127, 54,137, 84,137, 77, 43,154,147, 90,102,121, 95, 49,196, 27,
+105, 59,168, 27,215, 35,181, 63,176,244,154, 36,139,176, 56, 28,102,243,242,235,112,  2, 87,111, 47,138, 61,236, 43,130,221, 28,
+220, 85, 82, 34, 51,131,215,240, 67,165, 34, 33,229,243,131,167,145,212,113,224,131,209,159,143,174,167,179, 18,111, 30, 46, 97,
+ 11,214,216, 74,171,154, 65, 51,244,147,132,236,128, 79,  5,174,171,114,144,230,125,226, 81,  9,180,227,233, 65, 78, 63, 42, 22,
+ 88, 71,194,172,233, 74, 74,249, 77,218,127, 40, 93,107,249,159,103,176,174,213,221, 94,103, 37, 92,193,188,179,103, 43,168,213,
+117,158, 21, 30, 66,241, 67, 78,120,184,219, 42,165,180,104,254,251, 27,251,221,222, 25, 12, 56,157, 77,208, 44, 90,170,164, 97,
+113,192, 87,113,163, 36,118,169,243,126,  7, 70,156,229,147, 97, 22,241, 38,219, 89,223,  5,139, 79, 29,131, 72, 42,  9,198, 26,
+134, 99, 57, 52, 22,186, 65,230,112, 15,110,117,152, 75, 25, 99,182,  4, 11,179,240,227,133, 45, 71,217, 16,190, 52,205, 39,176,
+ 44,231,131,115,216,117,157, 94, 39,160,100, 14, 24, 23,229,203,185,185,134,144,237, 65,115, 13,158,246,112,251,240,248,251, 59,
+216,195,131,113, 10,207,242,178,253,226,248,228, 61,248,  3, 42,105,148,200, 95, 36,130,246,227,182,146,234,244,242, 20, 66,242,
+ 39, 27,  7, 95, 46, 62, 27, 42,165,228,232, 64,139,  2, 37, 12,237, 74,164,192, 46,131, 11, 65,101, 74,236,137,143,136,161,240,
+138, 13,  8,150,149, 25,255, 32,144, 78,  2,124,198,230,189,135,191, 70, 40, 68,126, 66,132,154,168, 29,230, 57,174, 82,226, 80,
+ 44,169, 64,111,162, 64,174,198,119,206,166,125,  8,225, 13,107, 90,212, 80,  0, 60,147,176, 14, 63, 46, 47,190,117,186,159, 46,
+127,126, 24,252,222,148,141,216, 71, 69, 48, 21, 69,205, 80,182, 18, 25,  7,120, 21,222,130,247,161,236, 21,249,199, 30,210,103,
+122,212,134,163,237, 13, 25, 59, 41, 98,209, 20, 59,219, 91, 38,212,226, 40,129, 79,222,190,126,243,168,189,251,236,213,209,237,
+ 77,188,129,149, 47,179,146,120,187, 96, 41, 10,106,208,207, 81, 52,167, 10,207,  8,181, 34, 80, 90,138,160, 50, 24, 74, 17,229,
+ 47,194, 95,193,237,149,186,208, 66, 47, 21,251,184, 42, 74, 48, 48,131,219,202,  6, 11, 60,156, 96, 23, 64,129,128, 17, 11, 84,
+161,193,140,153,213,129,235, 13,173,144,114,149, 58,183,117,  4,149,124,118,137,255, 14,108,176, 74, 20, 60, 64, 70,123, 12,  6,
+187,223, 88, 75,199,120,231, 94,107,173,167,211,212, 86,100,  4,124,  9,112,233, 12,179, 32,119, 52,172, 43,176,112,  9,124,178,
+ 42,164,134,191,183,186,119,150,158,186, 86, 40, 46, 15,176, 21, 51,181, 46,233, 66,162,228, 47, 43,205, 25,126, 55,139, 63,  2,
+ 80,118, 37, 61, 74,  4, 97,180,186,155,134,102, 27, 96,144,101, 28,102, 52, 30,252,189,254, 23, 79,222,141,137,  7, 15,106,204,
+152, 24,200, 44,  9,195,192, 64,179, 52, 52,189, 85,249, 45, 85, 44, 17, 77,132, 27, 36,189, 85,215,183,190,239,189,220,191,205,
+250,223,140,187, 97,121,100,118,100, 18, 44,210,  2,181,164,115, 41,116,235,194, 54,133,119,236, 26, 56,252,104, 48,146,165, 81,
+ 85, 30, 69,103,116,167,109,150,192,161,139, 70,  2,119,219, 16,146, 89, 26, 75,195,163, 33, 12,216,160, 19, 97,126, 10, 59,192,
+ 89, 35, 79,180, 40,186, 72,126,  2, 91, 97, 22, 47, 19,137,201, 26,230,194, 73,200, 21,136,  3,160,223,233,  0, 67, 25, 79,168,
+140,142,151,110, 23,211, 80, 14, 28,202, 58,145,  7, 29,117,155, 13, 74, 67,115,218,176,178, 46, 51, 59, 51, 89,169,150, 94,145,
+ 54, 15, 53,176,188,228, 33,144, 84,147, 60, 75,145,  9, 45,236, 45, 17,243, 87,220, 38,129,  3,126,209,201,242,194,147, 50,134,
+ 56,240, 41,142,170,181,226,117,165,  6,193, 48,248, 61,216, 21,155, 40,113,165,163, 34,187, 92,176,170,121, 28,251, 66,209, 12,
+156,191,203,138,213,234,118, 21,127,235, 63,194, 19, 75,241, 19, 35, 28, 43,243, 74,234,204,181,114, 40, 83, 34,151,  1,236,  2,
+136, 74, 17,153, 94,238,120,189,139,226,229,175,224,103,148,133, 96,236,208,122, 88,200,238,159,237, 30,189,  5,166, 51,116,248,
+ 26,201,159,215,203,231,240,251, 60,152, 18,213,117,129,166,130,169,208, 14, 78, 55,203, 74,110, 21,187,185, 68,215, 14, 95,136,
+194,130,208, 71,177,236, 92,142, 10, 38,170, 85,109,207, 55, 11,150,177,185,157, 12,152,229,201, 66, 68,144,167, 66,220, 57,235,
+104,  5, 39,235,212,218, 35,255, 17,210, 35, 15, 81,176,118,152,172,151,225,  2,187,173, 74, 61, 60,223, 25, 62, 61, 36, 43,183,
+120,120,208,210,220,203, 12,223,133,213, 40,230, 75, 96,205, 47,207,123,179,245, 20,145,145,201, 38,225,137,118,165, 59,105,193,
+ 22,177,231, 65,184,226, 23,  2,211, 37, 34,229,129,187,132,200, 29, 22,228,211,205, 71,162, 73, 65,189,221, 52, 74,135,243, 49,
+174, 48, 17,134,240,212,155,227,184,240,124,111, 30,190,228, 28,116, 78,221, 70, 59, 85,201, 96, 52,144,102, 51, 82,169, 68, 16,
+ 93, 15, 15, 20,216,112,155,189,198,245,237,115, 31,121,118, 44,213,173,191,244,151, 83, 56,218,152, 38,155,234,165,230,114, 51,
+ 31,250,195,114,161, 28, 99,103,  2,167, 26,108, 91,191,159,182,160,161, 51,181,133, 28,  2, 73,206,178,244,109,243, 10,236,123,
+138,236,180, 90,  3,154,100, 67,241, 14, 19,212, 77,205,190, 78,  6,239,222,127,248,124,255,  3,109, 52,172, 45,  4,239, 56, 84,
+225, 20,108,183, 17,121, 47, 42, 16, 27,228,  9,128,162, 94, 85,106,223, 39, 35,211,232, 59,142,221,225,188, 34,134,183,227,245,
+213,181,166, 30, 22, 86, 16,172,222,116, 47,254,171, 68, 51, 93,249,157,179,230,110,120, 48,159,115, 91,181, 86,255,169,143,226,
+245,241, 54,193, 26,151, 96,253, 52,201, 12, 72,152,231,226,116, 94,193,241,210, 44,156,111, 23,202,100,207, 71,218, 23, 88,184,
+ 11,247,114,110, 66,167,219,218,  4,166,218,237, 17, 89,141, 88,132, 62,161, 35, 36, 83,172, 31,  2,231, 16,107,  7, 54, 70, 26,
+ 21, 55,140,184,117, 31, 67,151,143,184, 59, 35,117, 79, 20,254, 24, 47, 39, 66,253,129,173,102, 79, 66,209,183,142,231,108,  8,
+200,106,254,122,182,115,153,114,175,205,173,238,103,119,146, 10, 64,134, 47, 75, 49, 40,211, 58, 29,120,154, 35,168, 61, 66,158,
+215,234,183,  0,148, 93, 93,107,211, 80, 24, 78, 78, 62, 79,154,174,211,174,155,130, 94,168, 67, 65, 84,156,136,120,163,255,194,
+127,224,165,191,203, 27, 65,240, 23, 56,  6, 10, 34,130, 87, 50,198, 46,198,220,148,205, 74,215,180, 73,147,180,201,241,125,222,
+ 55, 25,213, 93,  9,161,176,182,235,199,233,121,191,159,243, 60,234,191,  8,  9, 90,235, 54,231,206,157,110, 93, 70,179,  0,198,
+ 96,133, 29, 21,199,170, 27,169,110,199,233, 70,142,246, 65,171,229,122,134,246,139, 79,127,122,192,186,120, 46,221, 40, 15, 58,
+188,182,244, 99, 64,167,123, 78,167, 64, 87, 64,153, 39,166,190,174,129,187,119,164, 50, 96,194, 25,224, 80,152,126,151, 81, 37,
+ 14, 12,155,207,249, 35,157,110,164, 91,140,141,206, 53,119,241,250, 43,235,194,  5,215,192, 96, 45, 97,254,191,184, 54,168,250,
+151,151,137,178,126,223,  9,101,149, 92,112, 25,186, 23, 90,241, 23,175, 70,173,117, 45, 30, 44, 67, 80, 77, 83,192, 49,243, 59,
+ 26,170,182,124,152,180, 72,161, 10, 34,145,157,231,243,205, 37,202,  1,124,151,140, 38,210, 50, 17,248,173,  1,230,189,148,237,
+ 21,186,238, 32,210,218,241,205,220,157,231, 78, 61,243, 77, 25, 36,105, 29,163,134, 13,120, 15,217, 20,245, 78, 78,135,144,147,
+ 29, 37, 59, 31, 62, 27, 70,148,147, 55,191,127,237,209,213,104,179, 91,245,138,121, 49, 46,146, 89, 69,117, 64, 70,129,112, 86,
+205,242, 69,150,149,211,113, 49, 10,148,127,187,119,  7,  9, 54,228,167, 21,109, 68,  9,217,189,112, 69,161,183, 38,237,116, 44,
+ 45, 23,185,214, 56, 27,145,199, 52,220,125,243, 64,194,200,117,134,  5, 29, 19, 16,107,148,208,206,100,142, 13,124,183,172,152,
+176,224, 54,180, 53, 56, 41, 82,191,210, 97,205, 84, 81,  2, 36,229, 84, 30, 43,150,207, 11, 74,194, 78,198,199, 60, 32, 53,148,
+186, 62,184,241,144,121, 90, 74,122,133,213, 78, 95,166, 44,173,230,174, 66,102, 71,161,174,204,132,  7, 11,114,131,224,  6,  0,
+122,135,  1,154,112, 31,207,238, 62, 47, 64, 93,169, 38,197,164,228, 57,103,171, 91,220, 40, 24,  7, 62,152,218, 30,111, 62,  9,
+  3, 77,241,120,146, 79, 48,163, 99,219, 81,144,  5,115,  7,189, 13,250, 17, 46,197,107,158,231, 31,254, 62, 68, 81,102,219,179,
+124,170, 61,109,131, 93, 54,167,244,127, 99,245,138,239,209, 22, 82,219,223,182,247,126,236,201,156,157,  2, 85,228,235,114, 81,
+ 80, 56,100, 89,  6,140, 64, 40,220,  6,174,222, 61,222,165, 45, 71,182, 65,159,252, 44, 61,139,194,152,253,183, 29,235,120,206,
+185, 57,217, 87, 28,196,100, 52,177,238,200, 52,130,167, 60,168,130, 13, 98,134, 41,217,203, 82,164, 15,252,206,245, 78, 31,236,
+225,192, 31, 99, 75,129, 30,129,185,159,193,233,110, 27,122,143,  4, 36, 14,148,128, 91,133,  1,163, 67,182, 40,206,138,124,152,
+167, 71,105,242,115,154,176, 72,186, 41, 22,139,117, 47, 92,137, 58, 34,249,172,254,242, 36,156,130, 90,243,131, 47,251,195,233,
+232,251,233,241,209,215,  3,122,236,253,199,157,215,239,222,210, 67, 91, 91, 79, 67,189,218,226, 48,254, 73, 29,221, 72, 15,110,
+221,188,247,242,197,171,157, 55,159,250,250,178,131,225,182,207,141, 75,156, 24,193,222,128, 83,192, 24,134,185,174,113,  8,175,
+132,134, 30,250,242, 20, 44, 43,246,245, 25,160,186,140,149,172, 77, 11, 72,111, 15,132,182,122,154,102,217,178,154, 68, 88, 16,
+241,109,105, 80,137, 97, 53, 22, 39, 67,134,230,216, 84,251,255,158,  2,136,182, 18,208, 48,  3, 36,107,232,124,233,  6,187,210,
+ 40, 11, 91,195,201,105,221,182,149, 91, 38,  2,179,244,238, 53,179,141, 32, 50, 85,130, 34, 49, 96,187,148,184, 91, 55,252, 62,
+114, 30, 75,152, 63, 26,138,200, 54, 52,  9,151,193, 82, 26,202, 96,209,165, 47,205,247, 88,181, 57, 39,116,230, 39,255, 17,128,
+175,107,105,109, 34,138,194,115,231,145,121,164,233, 36,166,212,166,169,165,180,130, 22, 23, 22, 93,139,224,218,165, 43,117, 81,
+ 68, 92,137, 63,209,165, 47, 68,148, 10, 82,137,148, 90, 16,146,148,182,233,188,238, 60,238, 92,207, 57,119,102,154,170, 24,  6,
+178,153,144,185,119,206, 57,247, 60,190,115, 62,253,255,150,157, 28, 88,213, 94, 52,111,220, 13,118,145,156, 65,134,107,240,242,
+ 92,230,153,154,  5,145, 78, 80,  4, 65, 49, 67, 76, 66,233, 14,189,181,190,219, 55,113,230,185,229,217, 30,178,135,130,163, 32,
+237,150,134,160, 70, 19,167, 32, 18,232, 15, 83, 16,134, 98, 44,172, 89,156, 44,149, 75, 50, 41,155, 79, 25, 11, 21, 21, 96, 88,
+ 74, 85, 70,173, 74,101,147, 83, 97,208, 20,114,120,212, 84,196, 97,126, 42,  8, 81, 48,  9,127, 21,165, 26, 38, 94,247,140, 41,
+146,195, 75, 21,  8,138, 52, 77,103,126,233,168,249,148, 56,130,195,137,139, 60,202, 19, 54,239,181,252,219,190, 75,226,102, 23,
+227,112, 42,254,196, 81,214,195,247,105, 84,  5, 98,101,  5,211, 26, 18,151,242,210,133, 37,176,250,163,200,103, 74, 89, 39,183,
+145, 12, 76, 40, 59, 11, 94, 37,207, 69, 20,227,149,196, 16,186,202,156, 67, 68,202, 58, 14,232,191,233,216, 26,236,181,219,  2,
+171,162,  5,103,147,111, 95, 71, 81,156, 26,172,234,211,248,184,255,229,228,120, 22, 21, 28,153, 76, 74, 80,101, 65,  2,136, 95,
+185, 38, 82,145,242,  2,214, 31,244,172,222,162,217,163,167,102, 28, 75,130,232, 19,103, 89, 74,116,  2,106,146, 51, 83, 80, 32,
+199,176,113,180, 61,190, 28,112,246,203, 12, 11,101, 26,113, 84,181,192,245,199, 49,200, 58, 97,161,136, 44, 69, 39, 40, 49,253,
+ 92,191,210, 94, 34,128,160,174, 58,108,117, 53, 62,178,142,129, 96,  7,112,176,143,206,108,195,182,117,251,170, 63,  0,215,248,
+195,247,119,146, 48,165, 60, 11,193,171,253, 75,104,245,165, 78,223,208, 26,132,155,236,122,221,237,225,246,246,240,166, 36, 36,
+ 79, 46,210, 31,227, 17,248,107, 88,207, 37, 17,112,105,108, 78, 99, 25, 96,153,158,229,193, 97,115, 56, 61, 72,211,164, 78, 71,
+ 33, 23, 13,117,  3,148, 60,205, 38,179, 49,104,233,207,227,195,182,211,166, 30,  0,221,107,181, 65, 32,163, 44,164,  9,202,168,
+ 26, 32,243, 89,158, 33,255, 19,  8,191,105, 58,150,  3,178,  4,135,250,250,210,250,162,235,111,173,108,250,222, 34,207,147,142,
+239, 63,122,248,100, 58,155,162,159,  8,239, 52,197,  3, 47,203,211,115, 62, 67,132, 46,211,195, 56,138,146, 96,208, 95,129, 48,
+109, 18, 32,167,121,192, 19, 46,168,192, 72, 57,219,  5,187,141,217, 33, 74,137,149,228, 64,198, 69,118,173,187, 42, 48, 19, 45,
+ 43,225, 71, 82, 83,166,206, 40,154,253, 12,190,109,166,108,117,129, 68, 30, 66, 80,134,  7,142,177, 56,229,227, 48,154,128,184,
+ 72,176,167,120,251,157,254, 50,245,178, 53, 92,247,178, 25, 55, 53,112,  7, 27,119,175,239, 12,183,110,111,222, 88,219,217, 88,
+246, 86, 31,220,191,183,251,114, 23, 54,228,211,251,183,175, 30,191,168,239, 68,134, 55,126,206, 63,191,222, 91,235,220,138, 14,
+162, 40,158,140,222,236, 61,127,250,236,104,255,  8, 98, 50,120, 19,160, 98, 88, 25,210, 74,158,243, 51, 44,189, 56, 39,209, 41,
+ 54,142, 50,133, 58,199, 64,208,119,123, 78,203, 17,146,140, 62,101, 55, 20, 85,105,117,  6, 40,  3,218,216,229, 74,135,216,133,
+126, 86,101,205,  6,  1, 92,221,211, 64, 31,  5, 10,155,133, 57,125,183,167,218,242, 20,192, 13, 14,146,  4, 66, 92, 66, 71, 98,
+ 61,151, 92, 50,207,105,215,152, 75,218, 97, 65,127,193,212,191,227,102,230,178, 32, 60,172,108,174,234,121, 84,178, 94,170, 14,
+ 85,226,168, 36,203,222,184,141,240,118, 22,156,142, 82,  2,108, 18,146,108,190, 67,135,214, 81, 77,142, 87,172,176,205, 85,214,
+ 83,205,202, 57,219,255, 91,  0,194,174,101,183,105, 32,138,122,198, 73,157,164,117, 40,106,139,218, 42,221,116,131, 90,216,176,
+224,241,  7, 44,144,248, 26, 88,242, 61,136, 13, 59,126,  0,  9,  9, 80,165, 46, 88,128,132,168,148,144,164,113,227,212, 77, 60,
+182,227,215,152,251,176,157,150,135,200, 34,146,101,201,178,199,158,251, 62,231,252,191,254,222,110, 88, 10, 33,118, 21,175, 72,
+ 89,147, 41,  3,106, 34, 69,148, 93,211, 70,129,102,145, 84, 45,  6,136, 61, 19, 55,117,205, 80, 28,111, 31, 25,182,113,230,159,
+169, 68, 89, 18, 35,163, 92,226,180, 34,118,148,225,147, 70, 46,228, 28,113,243,  5,119, 19,120, 14, 28, 12,153,182,144,133,166,
+102,129, 39, 15,192,253, 69, 26, 89,229, 12, 60, 66, 96,125,131,120,144,214, 54,154,109, 88,196,190, 58,203,137, 59, 84,211, 32,
+ 12,132,151, 58,103, 17, 20, 45,202, 85, 40,147, 23, 81,235,121,144,150,174,241, 91, 43,152, 90,135, 16, 79,101,105,246, 39, 21,
+218, 63, 10, 60,165, 67,151, 72,196,167,197, 53,206, 53, 76,239, 11,228,181,128,135, 72,209,115,136, 18,224, 80,249, 88, 89,213,
+234,116,213, 41,168,  4, 98,216, 42,227, 50, 55, 36, 92, 25,103, 90,224,225,183,186, 45,  2, 79,147,192, 97, 19,201,126, 59, 26,
+ 54,176,217,177,192,194,166,150,185,182,191,183,235, 47,194,109,219, 86, 23,211,129,227,164,112, 22, 99, 50,156, 21,237,202,219,
+216, 92, 66, 25, 38, 51,101, 56, 52,161,170,169,136,174,145,  0, 29, 94, 95,142,210,151, 61,187,247,213,115,145,207,153, 16,185,
+ 68, 38,147, 83,168, 76, 66,218,130,243, 85,209, 89,223, 72,252,132,239,186,160, 92,135,171,242,200,182,144,229, 44,217, 41, 72,
+219,132,128, 14, 60, 51,132, 73,176, 31,205,145, 72,174,168,100, 20, 37,199, 19,210,208,186,134,  4, 99, 33,126,169,224,112,170,
+ 38,118,203, 14, 35, 69,140, 12,154,188,111, 77,150,176,250, 65, 26,113,125,104,108, 30,205,189,208,195, 44,  4, 41,160,179, 36,
+214, 97, 58,109,  8, 33,170, 22, 57,218, 53,136,160,215,172,150,217, 94,196,  8, 46,117,149, 11, 23,  8,146,136,183,138, 36,147,
+129,125,221, 34,237, 52,214,151,200,195, 46, 73, 80, 64,187,254,148, 67, 31,199,119, 24,173, 11, 11,213,164, 26,209,216, 27,195,
+  9, 75, 88, 56,228, 46,132, 10,249,182,151,253,139,  1,196, 64, 19,111,162,150,  1, 44,251,149,119,249,246,221,107,194, 65, 24,
+135,187,135,167, 63, 78,153, 66,147,135,247,218, 86,139,145,201,163,217,216, 36, 40,111,156,197,247, 14,142,199,179, 81,148,132,
+ 12,224, 65,121, 16, 10,244, 50, 42, 64,195,141,194,195, 30,237,222,237,207,157,254, 98,162,105, 56, 42, 55, 86,  0,119,166,138,
+186,140,195, 10,106,142, 47, 69, 99,139, 72, 18,208, 95,248, 73, 60, 81, 11,134, 89,132, 89,182, 71, 74,182, 72,142, 79,184, 42,
+150, 52,134,192, 33, 79,115, 76,160, 13,227,187, 51,104,174,183,140,208,  8,194,224,211,201,201, 78,111, 31,190, 98,231,219,144,
+247,221,147,251,143, 62,126,249,240,236,225,211,211, 55,159,207,207,175, 94,189,124, 49,186, 26,169,247,193, 86,119,243,241,243,
+  7, 63,135,144,253, 24,119, 54,118, 46,212, 20,118, 44,120, 27,  8,210,193,178, 35, 11, 48,133, 15,120, 17,148,241, 65, 57,151,
+ 40, 90, 18, 72,206, 96,170, 93, 93,113, 50,234,149, 96, 81,217, 96, 44,203,109, 76,196, 85,220,104,251,214, 21,154, 27,152,202,
+234,224, 86,103,243,220, 11,102,193,140,198,185,204, 27,  5,216,130,113,145, 56,233, 28,232,120,138, 66, 46, 57, 87, 80,200, 15,
+160,226, 99,138, 12, 82,204,124, 46,122, 91,  7, 67,119, 80,252,189,141, 39,106,115, 45,235,234,188, 40,109,  1,252,145, 76,  5,
+ 30, 66,182,  7, 47, 58, 91, 33,195,217, 66,148, 85,250,250,193,181,177,234, 48,234,213, 20, 12,250,255, 95,  2,208,117,109,187,
+ 77,  3, 65,212,235,189,216,137, 29,231,210,196, 20,164, 64,139,104, 43,113,169, 84, 36, 36,126,128,239,224,185, 47,124,  3, 18,
+ 31,129,128,254,  3, 47,124,  0, 15, 72, 72, 72,168, 18, 15, 32,132,138, 74, 91,138,104,211,210,218,137,237, 92,236,101,103,118,
+227,164, 69, 68,121, 75,228,120,189,177,231,204,204,153,115,236,255, 85, 99,102, 61,238,113, 98,207, 17,246,137,161, 42,154,153,
+ 38, 96,200,218,158, 39,130, 64,248, 62,171,  9,226, 98, 93,  5,112,253,  2,107,134, 94,200, 65,249, 43,184, 31,110,220,108,172,
+168,171,  3,106, 62,212,169,128,247, 75,197, 33, 66, 16, 71, 72,161,110,  3,149, 56, 83,168,222, 48, 27,172,235, 24, 22,118, 84,
+254, 40, 92,226,114, 34, 24, 16,222, 65, 51, 85,221, 86,128, 68,128,166,  2,226, 51,168,226, 69, 42, 76,120, 42,167,182,201,110,
+188, 51, 46, 50,104, 28, 66, 74, 10,221,203, 98,162,167,198, 10, 20,209,215, 40,222, 98, 42,219,224,149, 89, 37,223,244,138,229,
+ 63,166, 29, 86,118,  1,185,207, 26,177, 51,247,150,203,159, 74, 28, 80,246,236,121, 57,127,227, 28,  0, 26, 94,  0,153,231, 24,
+244,165,181,123, 49,215,240, 45, 19,186,178,150,  8, 34,  4,197,204, 64, 22,148,208,137,172,121,172, 21,216, 87,219,172,221,228,
+157, 38,109,214,105, 35,192, 77, 47,236,187,107,107, 87,218,157,102,173, 78,250,233,222,207,  3, 50,140,232,240,207, 36, 61, 29,
+ 36, 39, 81,114,122, 56,250,214, 35, 95, 83,186,227,186,123,190,219, 19, 44,181,129,218,193,212,143,112, 12,219,128,234,209,192,
+158,131,102,164,209,204, 54,214,230,196, 98,192, 93,243,  4,231,165,127,112, 52, 56,181, 96, 78,193,158,142,164, 26, 27, 63,143,
+251, 84, 75, 38,131,136,  2,  5, 12,107, 81,137, 44,120,128,250,192, 14,165,126,213,195, 78, 58, 10,194,226,150,248, 78,141, 51,
+231,114,216,132, 64, 34,163, 44,206,113, 92, 96,245,218, 42,153, 94, 43,156, 18,200,137,113,225,209, 26,175, 58,  7, 66,141,101,
+180,191,133, 97,  9,140,182,126, 53,192,152,  9,114,  2,157, 90,  7,  2,  6,144,208,229,122,119, 61,202,206,144, 57,  7,207,195,
+176, 30, 46,248, 45, 92, 73,241, 96,245,161, 58, 11,193,157,165,240,214,157,238,186,130,246, 56, 62, 83, 40, 80,174,125,145, 81,
+  2, 86,175, 57, 87,135,237, 46, 44,213,220,  0,147,126,217, 10,218,150,185, 28, 64, 98, 84, 11, 78, 70,105, 14,  4,143, 31, 56,
+161, 99,  9,199,225,156, 47,182, 22,213,119, 62,126,223,214,170, 15, 70, 17,156,200, 56,141,147, 52,233,103, 42, 45, 64, 61, 29,
+196,122,159, 15,190,168,160,197,185,104,249, 13,152, 21, 71, 43, 72,135,241, 64,  1,121, 46,212,222, 29, 39,253,183,187,219, 59,
+201,113,108,141, 34,153,197,150,122,150, 15, 83,107,148,225,123,104,169,  5,179,120,  0,169,207,  8,117, 88,141, 56,174,238, 88,
+ 66, 73, 39, 63,207,178,222, 96,144,141,199, 42,204, 11, 74,151,252,186, 52,211,148,104,134,134,166,102,196,230, 97,  0, 21,152,
+222,254, 81,126,  2,147,234,  3,235, 60,160, 78,123,  2,141, 98,121, 28,251, 84, 60,219,124,250,254,211,187,229,198,218,155, 15,
+175,111, 63,186, 39, 86,120,159,245,159,191,122,185,249,248,201,141,141,174, 58,239, 23, 91, 91,245,170,247,187,127,100, 58, 88,
+  6,172, 18,220,134,  2,134,177,225,239, 82, 84,156, 42,162, 86,162, 57,178,133,161,181,232,145,207, 92, 87, 85,114,105,168, 96,
+ 58, 69,153,130,119, 67,122,209, 99,124, 90,  6,252, 34,142,151, 70,105,  0, 45, 34,126,157, 29,170,211,184,222, 89, 38,196,186,
+  0,187,113,108,216, 97, 85,133,202,199, 19, 84,195, 71, 59, 64,169,235,242,144,100,231,181, 74,  3,202,153,133, 33,146,238,247,
+118,101,  9,222,139,233,177,204,187, 32,250,142,  7,239, 55, 99, 39,106, 92,203, 17,208,229, 24, 69,213, 43,206, 34,236,156,207,
+ 90,134,165,230, 83, 73, 63,159, 76, 31,238,114,142,165, 38,167,  2, 48,127,  5, 32,236,220,122,154,  8,162, 56,190,179,221,237,
+236,165,244,194,182, 80,192, 16,140,128,240,160,162,137, 74,162, 15,126,  0, 99,252, 68,190, 24, 63,131,207,126,  1,159,124, 51,
+126,  1, 73, 32,160, 96,192,210, 66, 81,108,237,150,219,182,221,238,109,198, 57, 51,187,165,133, 68,210,183, 62,181,179,103,207,
+109,206,249,255,110,184, 95,149, 71,117,128, 81,140,189,150,146,177, 72, 25,203,122,  9, 23,167, 51, 51, 30,  9,186, 32,146, 41,
+107, 36,109,200,154,169,102, 13,102,112,192,246, 14, 17, 10, 52,148,158, 49,167,199,113,241,224,252,167, 67,123,106,  4, 76, 11,
+ 34,195, 30, 90,192,135,245,216,225, 42,176, 53, 42, 39,117, 12, 84,235,192, 38,  7, 69,105, 16, 72,  7, 10,  5,108,199,  8, 22,
+ 31,  4,128, 16, 20,104,211,134,202, 66,133,218, 13,186,181,206,145, 31,246, 41,167, 56, 69, 36,176,242,229, 63,167,191,161,165,
+ 33,230, 51,164, 88,181, 77,192,228,130, 32, 64, 55,207, 67,254,103,146,136,230,181,113, 55,112,253,168,127,221,197, 59, 92,163,
+120, 16, 13,212, 20,230, 37, 91, 36, 83, 58, 44,156,121, 21,115, 40,226, 49,143,205,204,143,236, 28,109,198,215,234,177,126,  5,
+ 17,137,176, 20, 11, 87,202, 17,179, 53,128,202, 66, 15,135,157, 11,136, 62, 34, 24, 44, 10,  3, 22, 69,245,237,157, 31,172,198,
+107,218,173,239,181, 38,230,153,133, 71, 40,203,177,251,241, 42,147,212,129,131, 37,138,212,215,113, 63,111, 66,127, 37,244, 51,
+ 36, 42, 40, 72, 67, 44,220, 34,141,197,212, 46,233, 67, 37,  6,  0, 68, 58, 16, 86, 37,176, 94,224, 80,158, 17,195,141, 34, 47,
+222,  5,145,155, 47,225,  9,123,229, 73,153,211, 80,100, 85,100, 83,  6,214,152,171,154,159, 90,172, 52,246, 56,186, 21,246,  3,
+152,175,100, 94, 30,136, 39,148, 88, 25, 24,146,243, 35,207,113, 79, 37,177,238, 36,110,172,147,147,162, 28,246, 77,121,109,180,
+119,188, 59, 48,250,185,226,156,221, 61,233, 38, 36,  4,148,156, 97, 49, 55,209, 62,111,  9, 98,170,211,115,162, 40, 64,131, 18,
+137, 74, 46,113,123,103,174,137, 77, 21,160, 19,238, 90,117, 45,157, 82,173,108,201, 50, 75, 91,245,117, 65,178, 22, 23,152,181,
+ 70,149, 29,190,235,245,236,139, 22,130,107,124,  3,118,220, 49,102, 41,121,185, 80,182, 29, 27,106, 20,110,175,236,143,244,  2,
+183,210,220,101,129,124,117,113,117,255,184,242,203, 62, 20,113,229,150, 53,219, 56,111,248, 94, 63,197, 37,161, 41,103,216,178,
+ 39,190,114,251,222,198,193,214, 73,167, 45,164,214,178,122,142,189,210,214, 88,241,130,189,216,112,243,140, 12,221,152,202, 78,
+178,199,122,216,172, 11,114,111,206,204, 95,244, 28,172,232, 62, 76,172,123,122, 74,153, 28, 43,125,174,125, 93,107, 87,174,217,
+106,106,104,176, 11,197,253, 24, 73,240,130,226,141,211, 96,116,  4,131,207, 50, 68,138, 68,218,110, 71, 83, 20, 11, 68,162,209,
+131, 66,177, 14, 58,204,136, 75, 65,132, 44,150, 96, 37,205, 98,255,236,236, 76,125,179,250,104,229,190,159,146,221,191,246,221,
+220,194,252,194, 29, 31, 75,101,169,180,190,183,189,181,241,237,227,250,167, 55,239,223, 50,247,103,161,137, 49,108, 45, 45, 47,
+ 63,121,254,120,233,225,226,171,215, 47, 95, 60,125, 38,101,164,230,102,243,203,187, 15,149,179,  3,133, 15,178, 67,215,  5, 62,
+ 33,111, 62, 69, 62,116,187, 32,158,186,172,236,226,189, 77,156, 54,122, 98, 91,141,198,138,225, 48,  5,203,131,148,153, 54,253,
+ 16, 16,119, 73,106, 37,192,218,113, 19, 67, 96, 73, 10,122,193,238,180,233, 80, 94, 21,119,  2,165, 68,219,155, 91,121,181,185,
+ 15,133, 38, 26, 93, 77,103, 63,  4, 88,185, 36, 94, 26,225,113, 91,195, 90,215,235, 16,254,114,218,157, 22,239,152,197,  8, 87,
+145,201, 39, 66,230, 28,112, 40, 56,116,151, 68, 64,  4,115, 64, 35, 78, 70,200,121,200,  3, 85, 44,110, 42,188, 13, 49,220, 94,
+ 16, 99, 64,151,229,200, 21, 72,213, 64,218, 11,190,254, 39,  0, 93, 87,178,219, 52, 16,134,103,188, 39,118,156,198,161,180,141,
+ 26, 84, 33, 69,170, 16, 21, 39, 56,240,  0,189,115,230,196,123,112,225, 21,120, 11,110, 92,224,136,132, 84, 56, 32, 36,184,180,
+149, 16, 42, 41,173,104,170, 52,193, 77,236,216,142,151, 97,254,127,108,199,105,232, 45, 74,148, 56, 94,102,254,237, 91, 22,252,
+213,255,118,226,151,141,247,160,182,147,243,201, 42, 42,192,128, 53,118,195,174, 57,150,218,156,197,190, 23,187,124,151,215,136,
+172, 75,186,161,232,170,  2, 73,186,163, 91,154,102, 96,246, 77,195, 36, 83,  0,  8, 60, 31,206,134,243, 44,184,158,243,114, 56,
+150,138,233, 60,220, 94,146, 22, 90, 96, 98,156, 32,214, 24, 84,122,224,222,  0, 30,100,186,  6,200,119, 69,227, 59, 60,188,159,
+142,231,147,121, 58, 35,104, 45,129, 12, 74,145,131,196, 41, 74,224, 22,228,121,182,218,116,103, 75, 88, 73,186,130, 53,202,207,
+190, 58,163,200, 22,104, 25,161,244,192,110,  9, 18,242, 98,226,186, 56,144, 36,173,132, 12, 90,145, 95, 99, 36,217,185,211,235,
+143, 78,138,195, 97,158, 11,178, 44,216, 10,131, 41, 54,168,204,232, 48,157,166, 27, 29,  7,100,127,101,170,170, 64,255, 82, 20,
+ 58,143,193,160,200,100, 74,228, 39,118, 77,171,101,105,131,101,111,191, 30, 43,  5,142, 42,197,255, 31, 87,136, 90,114,229, 69,
+130,237, 14, 93, 37,166, 74, 28,173,109,203,219, 93,115,215,151,162, 95,238,145, 23,186, 72, 53,203,138, 90,  4,179, 17, 64,  2,
+ 65, 82,100,155, 14, 47, 33,253,112,134,186, 56,130,170,  4,173,228,205,214,214,217,232,183,160,221,211, 92,178,  9,214,101,221,
+104,180,204, 86, 16,249,215,193,132,127,182,185,182,117,233, 94,224,198,  5,251,163,161, 24,160,  1, 89,178,162,115,  8, 19, 44,
+126, 75,183,194, 36, 68, 76, 99,233, 89,131,233, 24,197,182, 93,206,147, 34,120,193, 32,198,104,138,  1, 66, 93,208,186,197,128,
+130,180,228,118,221,113,193,130, 17,201, 25, 21,251, 54, 97,224,197,207,208,182,154,227,233, 72,104,  6,149,178, 53, 24, 57, 89,
+ 97,156, 14, 89,142,109, 54, 39,193, 68, 22,237, 56, 42,237,172,223,239, 15, 79,100,  4,141,241,204,154, 95,130,142,211, 29, 79,
+175,252, 40,135,120,242,195,236, 63,218, 63, 56, 62,224,191,198,191,235, 78,198,113, 26, 63,236,238, 29,158, 31, 74,168, 94,137,
+ 79, 18,235,109,244,206, 71,103, 48, 88, 78,194, 86,125,141, 71,196,140, 10, 50, 53,208,118,208, 69, 17,194,170,192,147,242,194,
+ 68,151,148,171,201,223,247,131,111,197, 83,151,146,197,171, 21,168,  5,220,105, 13,176,191, 76, 42, 90,190, 41,222,249,184, 76,
+ 16,171,240,117,147, 72,107,186,209,181,154,187,206,250,199,225,197,153, 55, 77,192,166,152,173,200,116, 48,247,116,248,244,193,
+227, 35,191,255,249,205,187, 15,159,190,188,124,253,234,230,130,152,145, 31,223,127,158,254, 57,229,143,176, 49,168,185,  3, 55,
+185, 27, 59,157,246,147,237,189, 23,207,159, 93, 49,143,151,167, 81, 28, 53, 84,251,114, 58, 64, 15,214, 88,150,245, 40,  3,123,
+  6,  4,197,103,216,141, 76, 58,237,123,231,128,157, 37, 37,167,136,229,168, 19,  1,191,102, 18,165,171,244, 69, 82,110,186, 68,
+ 16, 79, 40, 43,225, 52,203, 12,251,178,111, 71, 42,130,137,203,178,178,153, 85,111,122,129,135,134, 82,128,195, 23,252,114,177,
+ 91,  9,165, 98,129, 87,186, 97,186, 81,  0,210, 97,  1, 25,170,201,128,175, 20,222,146, 84, 66,172,105,212,172, 32, 10, 64, 16,
+179,152, 23,102, 57,252, 39, 21, 64,188, 44,143, 76,139,228,189, 64,208,148,108, 77,136,128,255,  4,224,235, 90,122,154,136,194,
+232,237,220,153,219,153,190,  8,130, 37,196,132, 54,186, 33, 97,199,214, 45, 49, 49,254,  9, 22,198,133, 59, 55,198,191,224, 66,
+ 52, 13,198,196, 71,112,165,176,213, 63,161, 91, 68,220,144, 42, 72, 10,180,157, 82,250,154,182,243,242,251,190, 59,115, 25, 10,
+178,235,162, 77, 51,115,103,206,247, 60,231, 92,135,239,137,219,164,116,125,185,156,118,114,156,104,106, 38,228,122,196, 53,151,
+ 24, 74, 66,209,144, 21,234,166,102,230,140, 12,164, 24,121, 35,151, 22,150,165,155,166,110, 97, 31, 63,240, 60,236,135,251, 80,
+121,101,117,  3,126,210, 26,117, 28,175, 11,177,193,241,156,129,219, 35,123,115, 50,210, 64,178, 90,132,168, 88, 40,132,196,138,
+103,104,191,184, 48, 87, 58, 32,230,113,138,242, 62,130, 26,202,  4,133,112,112,178,231, 82,121,230, 81, 51,145, 41,112, 79, 70,
+184,240,130, 90,207,255,240, 61, 53,225, 21,126,105,113,254, 26, 70, 84, 20, 24,248,132, 69,107,244,215, 44,210, 76,100,202, 90,
+ 17,  1,203, 20, 89, 72, 39, 91,189,122,172, 90,140,192, 30, 48, 79, 34, 23,160, 58,199, 97, 29, 79, 11, 20, 30, 40,204,230,125,
+174, 27, 80,191,160,244, 14, 36,219,154,227,185,142,235,231,  2, 61,135,180,110,191, 52,149,253,190,119,240,237,207, 73, 38,238,
+208,249,241, 18,167,124,239, 13,122,179, 37,132,209, 75,207,148,125,106,150,227, 92,187, 32, 80, 38, 54,244, 69,154,167,125,166,
+ 13,144,230, 18, 89,156,196,246,  8,200, 32,195,224, 65, 86,241, 52, 24,198, 71, 92,112, 11, 78, 83,122, 19,148,138,119,142, 79,
+107, 88,187, 80,109, 28,203,110,203, 65, 42,183, 12, 49, 68,165,195,240, 60, 87,210, 52, 58,121,149, 79,200,  6,  8, 50,194, 22,
+138,229,253,250,111, 72,127,241, 75, 17,141, 47,149, 74, 24,105,198, 29,117, 36,249,113, 45, 90,225, 21,134,128,140,251,108,208,
+230,196, 42, 51,200,126, 68,233, 66, 75, 19,184,225,120,  0,149,225,104, 60, 66, 61,122, 51, 43, 77,180,139,133,185, 70,183, 30,
+ 75,177, 50,157,139,169,108,193,238,217,180,177, 31,197, 18,185,213,  3,169,  6,148, 41, 40, 55, 79, 29,106,229,210,  6,161,171,
+209, 57, 41,223, 44,255,109, 30,  2,154,195,217,  1, 28,224, 58, 25, 60,249,232,250, 54, 11,  1, 32, 12,125,142, 46, 87, 52,102,
+  9,163, 11,135,235,155,159,158, 63,178,107,164, 81, 37, 21, 29,180,153,252,180,221,183,117, 38,229, 14,113,250,164, 97,245,230,
+ 86,221,206,250,179,183,181, 65,179, 90,171,222,191,187,242,225,203, 70,229,211,203,  4, 86,111,176,197, 85,214, 60,100, 77,168,
+120,246, 25,131, 28,127,135,177, 95,140, 29, 51,214, 75,160, 91,154, 64,223,101,  9,249,176,115, 27, 63,171,  0, 55,244,204,117,
+ 71,163,254,235, 39,207, 31,175, 61,101, 13,199,177,219,112,181,118,235,212, 13,130,207,155, 91, 47,214, 43,187, 63,182, 31,174,
+ 62, 58,178,155,155,239,223,221, 91,121, 80,121,181,182,184,188,116,123,121, 41,104,247,181, 91,121,121,158,181,159,181,157,189,
+221,254,112, 56,216,238, 66,124, 18, 29,247,227,215, 55, 99, 40,102, 60,212,215,132, 91,128, 27, 83,216,239,240,168,166,143,181,
+  1,164,210,145,220, 94,196,106, 82,214,145,177,154, 70, 52,116,148, 14, 76,209,  7,158, 96,  0,133, 87,236, 18, 74,205,165, 75,
+122, 45,161, 22,139,145,133, 87,213,241,114,205, 38, 94,114,140,172,  1,153, 74,219, 21,178, 75, 22, 82,144,208,105,  9,227, 69,
+221, 27,153, 25, 36,181,133, 94, 74, 42,190, 94,176,221, 83,123, 92, 56,150,167,206, 76, 32,  3,150, 20, 76, 83,170,  6, 42, 84,
+  4, 74, 51,126,146,185,154, 34,142, 14,251, 39,  0, 97,215, 14,219, 68, 16, 68,119,239,103, 59,118,144,147, 56, 82,148,159, 66,
+ 26, 20,137,  6, 20, 33,154,  8,  5, 33, 68,129,168,168, 17, 61,  2, 82, 82, 80,208, 80, 81,128,148,130,130,158,130,  2, 10,232,
+  9, 10,161, 75,  5,162,161, 33, 38,113,126,216,241,231,108,223,221,122,119,153,157,221, 61, 59,  6,  9,251, 36, 75,150,229,251,
+236,221,204,155,153, 55,111,188,255, 50, 35,165,157, 72,109, 90, 81, 48, 69, 99, 81,167,138,206,237,220, 59,233, 90,  3,161,198,
+192,137,196, 23, 62,196,143, 61,166, 26,241, 99, 46,186,156, 67,100,151,165, 65,226, 38,224,252, 98,197,135,227,224,  9,192,246,
+ 79,229, 38,225,236, 26, 44, 82,140,102, 86,143,120, 20,211, 14,118,202,187,166, 87,193,246,160,186, 62, 63,168,237, 33, 35, 85,
+121, 48,142,190,147, 73,165,  3, 30, 39,137, 48, 42, 17, 92, 24,207, 46,116, 94,116, 32, 96, 17,127, 87, 25,104, 31,137,167,208,
+214,145,150,128, 63,  4,246, 41,177,110,199,152,196,127, 22, 79,164, 51,164, 48,153,  2, 65, 66,102,138,115, 71,205,125,157,126,
+ 85,196,130, 32,  7,151, 43, 67,131, 40,105,199, 74,  1,205, 96,122,213,178,148, 43, 52,193, 48, 89,  5, 33, 44, 81, 98,142, 70,
+ 74, 95,205,249,243, 24,202, 29,129,221,103, 76,118, 35,209,137,248,232,136, 51,145,205,140,229,178, 95, 42, 21, 37,136,141,113,
+184, 59,160,204,144, 38,233, 18,219,222, 38, 17,191,113, 91,233,205,162,231,242,108, 37, 78, 56, 73,151, 38, 25,215,153, 80, 86,
+159,196,220, 13,104, 16,118,105,140,100, 45,223, 85, 41, 26,162, 88, 63,166,131, 75,169,199,153, 26, 56,216,125,167,214,172,246,
+ 56,211, 84, 90,  0,182,112,203,130, 97,202,  6,106,174, 19,206,215,118,169,161,168,167,236,127,233, 12, 16,153,125, 55,128,189,
+ 98,163,191, 60,168, 87, 48, 49,149,206, 79,236,227, 36, 61, 81,150,219, 53,154, 25,155, 14,227,118, 24,135,240,119,103, 70,138,
+106,170,134,173,112, 40, 98,126,170,172,129,171,  9, 54, 55,134, 35, 68,217,178, 30,239, 53, 59,141,102,212,130, 16, 60,102, 17,
+  4,148,197,124,177,147,132, 76,241, 12, 89,163, 93,135,207,241,209,241, 38,132,228,234,144, 20,103,107,161,180, 80,174,149,225,
+ 14, 84,179, 19,113,198,137,113,228,130, 84, 78,246,125,207,253,221,170, 37,  0, 62,176, 88,167, 39,195,  8,  0,110,146, 30,213,
+ 15,177, 82,141, 20,103,117,135, 59, 16,187,248,190,223,137,218,112, 98,135,141,195, 82,113,178,224,229,118, 79, 42,186, 12, 12,
+225,  2,186, 81,205,233, 32,186,115, 36,146,252,230,165, 91, 43,107, 87,165,106,  9, 34,143,214,201,155, 23,175, 23,207,174,175,
+ 61,189,143, 30, 60, 38,151,239,146, 87,132,100,102,  9,155, 37, 13, 66,106,104,225,127,226, 86,134,109,135, 84,191, 18,185, 69,
+196, 51, 68,252, 57, 98,106,177,168, 60,227,122,177, 74,149,192,162, 39,224, 23,245,101,255,246,227, 59,169, 52,246,118,126,205,
+ 44, 45,144, 98, 97,154, 76,193,151, 55,170, 43, 60, 12,183, 55, 63,173, 46, 47,143, 79, 22, 23, 47,158,191,253,224,206,133, 43,
+203, 25, 47,243,242,201,243,173,205,237,123,143, 31,150, 43,187, 75,243,231,230,167,231,174,175, 94, 35, 45,178,193, 62,191,125,
+255,238,227,198,135,185,177, 82,143,245, 50, 94,182, 17,181,244,120, 83,174,223, 20,105,230, 84, 63, 99, 26, 14,153,206, 26, 68,
+236, 66,203, 90,184, 40,121,106,201, 35,166,247,206, 76,215,144,166,114,233, 12, 60,216, 34,101,180,209, 65,107, 56, 96, 21,251,
+102,242,148,102, 87, 26,217, 96, 37, 40,133,140, 52, 31,228,  1, 86,162,  8,185,149,122, 71,126, 62,237, 43,181,247, 77, 15,252,
+228, 56,172,106,100, 64, 79,115,215, 29,174,103,152,234,182,  6,  9,207, 72, 33, 40,213,218,199,137, 96, 67, 49,191, 10, 53, 17,
+ 97,192,130,141,102,243, 77,165,216, 58, 92, 32, 76, 95,127,  4, 96,236,218,117,156,  6,162,232,120,108,199,175,132,205,138, 32,
+ 37,  2,241, 40, 16, 44,  5, 21,  5,162,162,  7,209, 64, 75,197, 39, 80, 82,130, 16, 21, 84, 72,124,  3,191,128,132,168,160,216,
+ 21,  5,210, 74, 11,236, 18, 65, 54, 18,210, 46,144,135, 54,142,147,177,135,123,238,120,178,  6,133, 71, 10, 43, 69,156,196,206,
+205,204,185,143,115,206, 31,241,187, 91, 97, 10, 44, 76, 57, 12, 97,209,229, 83, 28,120, 62,  7,154,109,119,185,199,165,204, 19,
+159, 21,  5,  2, 25,196,126, 28,122,180, 10,197,117, 47,129,244, 10,  6,225, 32, 39,  0,  7, 59, 41, 34, 15, 29,186, 73,158, 21,
+232, 22, 58,  7,179,116, 14, 61,100, 88,132, 82,224,210, 66, 63, 86,227,130,123,162,198,209,156,107,178, 60,129,138,171, 83,216,
+ 28,216,222,  1,214,116,186,132,146, 76, 25,102,255,219, 82,145, 89, 23,135, 70,222,197, 95, 40, 92,186, 66,237, 21,203, 86,118,
+ 58,174, 70, 71,193,131,248,229,148,223,201, 82, 82, 44, 21, 99, 46, 55,111, 66,106,202, 81,214,138,197, 12, 63,177,  4, 77,129,
+ 35, 70, 20,156,178,109, 36,185,241,239, 50,114,101, 11, 63,  8,187,  7,158,134, 26,165, 75,241,237,175,157,109, 23,113,148,209,
+221,194, 72,182,158, 43, 61,201,138, 73,170, 58, 73,176, 86,111,188,248,244,121, 60, 87, 39,188,160,223,223,133,234, 33, 99, 33,
+186,173,105,165, 80, 99, 50,243, 69,105, 86, 86,202, 53,177, 41,220, 58,236,159, 44,197,152,145, 64,221,135,238, 77,205,149, 73,
+ 32,143, 53,100,205,235,108,246,  6,133, 85,100,205,217,226,  3,165, 49, 83, 58,100, 73, 15,138,117,130,171,161, 31, 42, 90,227,
+  9, 53, 75, 86,  0,118, 28, 74, 48,120,106, 39, 55, 93, 17,199,142,192, 20,  6,199,234, 82,223,147,255, 65, 80,158,224, 78,140,
+210,214,215, 82, 50,159,151, 94, 23,213,146,122,216,200,102,233,104, 58, 50, 70,151,173, 70,107, 15, 54,152,214, 75, 30,130,248,
+ 16,228,178,220, 88,  4,146,201,228, 69,169,219,170,245, 50, 55, 49,102, 48,161,226,234,187, 65, 28,196,105, 54,157,171, 41, 16,
+133,118,106, 94,200,163,250,148,154,156,234,125,235,153,  6,137, 85, 12, 55,179,163,136, 62,202,172,234, 33,182,103,  7, 22,146,
+185, 81,176,162, 15, 70, 83,212,245, 89,102,146,167,163,192,135,130, 44,  0,204, 26,121, 24, 13, 52, 50,142,144, 40, 76,232,106,
+211, 57,251,250,130, 20,214,  0,201, 75,186,214, 39, 20,128,255,220,233, 11, 47,251,239,214,119, 54,170,209,246,229, 85,247,228,
+213, 51,252,244,136,184, 54, 20, 79, 45, 82, 95,225,221,219, 65,229,  5,191,247,190, 16, 20,206,180, 56, 60, 23,226,201, 93, 33,
+ 30,131,121,162, 77, 13, 15,143, 80,122,148,125,239,167,147,128,178,237, 40, 78, 41,126,178,131, 59, 55,110,223,127,246,104,252,
+ 99,152,207,138,102, 45,  2,191, 55,142,154,171,205,239,221,221,139,151,175,188, 89,127,125,188,221, 81,174,152, 43, 69,112,127,
+164,178,135,247, 30,108,189,253,120,235,250,205,205, 15, 91,239,187,219,219, 95,119,250,123,221,  5, 48,186,212, 62,191,146, 52,
+ 38, 89,218, 12, 86,  6,147, 33,109,201, 72,240,133, 50,137, 32, 45,  7,171, 73,107, 48, 29, 25,149,  9, 48,109,112,116, 43, 72,
+ 76,179,103,140,178, 14,125, 69,165,159, 42, 74, 27,106,171,128,183, 88,160, 17, 97, 44,111, 96,133, 37,243,202, 76,203,127,104,
+229,219,183,214,214, 19,142,191,132, 54, 90,129,  6,101, 87,  7,117,254,213,207,171, 40,235,154,144,180,198,159,129, 27,229,140,
+ 92,173,194,157,153,109, 61,116,247,131,151,161,244, 64,143,168, 84,129, 23, 72,212,212,103,126, 10,192,215,213,235, 54, 17,  4,
+225,221,189, 91,223,157, 29,199, 33,182, 33,  5, 33, 74, 68,210, 80, 32, 94,128, 71,224,  5,120, 11, 74, 10, 10, 10, 74,106, 26,
+ 26, 10, 30,  0, 42,168,144,160,167,136,144, 18,  5,145,132,  8, 43, 56, 63, 64,236,156,189,183,183,183,204,204,238, 58,150,108,
+197,178, 44,123,117,231,187,211,236,206,204,206,124,243, 77,204,174, 11,187, 79,156,119,255,233,186, 65,  5,  8, 77, 20,106,165,
+108,200,216, 58,133, 71, 88, 43,194,138,240, 18,100, 82, 42, 81,136, 42,170,  9,228,113,197,150,113, 52,149, 75,163,178, 90, 61,
+227, 41,242, 24, 34, 51,  3, 56,116,250,178, 24,230,  5,210,  7,142,204,  8, 87, 17,  9, 13,182,113,221,122, 59,145,181,129, 30,
+212,240,111,224,120,139,213,251, 24,202,119,141,200,141,245, 20,252,214,135, 14,152,103,204,154, 90,183,252,250, 68,106, 52, 67,
+174, 25, 52, 59,107,165,173,139,241,191,160,220, 39, 93,168, 88, 52, 99, 45,231, 21,151,217,137,127, 90,178, 18,238, 85,198,201,
+250,205,205,221,222,118, 40, 39,112,238,155, 17, 19,218,  7,102,111,119,214,127,157,253,144, 68,153, 11, 78,101,100,171, 78, 34,
+ 70, 32, 78,195, 27,177, 72, 19, 19,151,151,160,135,  7, 10,246,179,165, 47,157, 70, 40, 55, 95,205, 26, 95,246,123,251,231, 67,
+112,225,147, 38,127,176,177, 88, 40,236,180,135, 76,147,218, 40, 77, 86,177,172, 70,218,230,  6,115,173,121,  8,190,235,192, 70,
+  4,223,255, 82,196, 70, 34, 25, 61, 90,242,166,100, 32, 30, 85, 98,125, 95, 34,209, 77, 63, 58,183,235,221,227,141,174,252,142,
+205,118, 16, 81, 67,251, 84,228,170, 23,174, 86,132,226, 47,130, 98,241,196,  5, 72,185,120,203, 82,153,129, 51,171, 80,225, 98,
+172, 90,138,120,181,179,122,120,122,  0, 39,183, 27,203,167,195, 19,208,167, 50,138,177, 17, 37,229,187,224,160,118,163,253,123,
+216,231,100,  2,157, 76, 42,151,142, 97, 54, 31,227,108, 89,170, 47,101, 50, 67, 26, 50,  4,156, 12, 29,159,176, 91,197,205,180,
+165,176,247, 72,160,154,100,142,220,213,174,117,214, 16,187, 70,195, 53, 17, 83,120,183,154,102,155,240,124, 26, 92,140,171, 66,
+231,133,147, 84,183,117,171, 33, 27,135, 39,  7,212, 67,156,237,247, 15,  5, 85,252,187,106, 22,138,210, 27, 87,234,130, 64, 70,
+173,148, 46, 28, 80, 84,248,118,108,120,189,145,202,115, 42,103,207,226,236,238,202,230,183,159,219,139, 73, 29,153, 24,  4,  5,
+115, 25,239, 46, 44,195, 67,221,233,172,237, 29,239,193,236,128,185,151, 36,201,159,193,153,241,176,105, 27,208, 19,209,168, 82,
+ 53,203,118,143,118, 60, 51,110,184,247, 15, 95, 63, 62,127,242,226,217,203,167,140,117, 89,155,177, 38,137,249,130,177, 77,146,
+171,  9, 63,123,100,201,193, 16,108,193, 73, 43,158,113,128,107,138,210,224,107, 92,149, 41,140,136,136,202, 71,200,240,136,248,
+245,187, 55,240,150, 52, 97, 30, 63,124,212,108, 45,188,122,255,118,145, 37,176, 24, 47,108,190,117,255, 94, 49,143,137,246,243,
+206,167,217, 65, 16,116,123,225,  6,236,180,180,214,253,162,143, 92,213,168, 98, 76, 61,170, 43,152,170,  6,220, 62,137,173,154,
+  4, 53, 28,137,168,  9, 76, 28,163,197, 23,161,158, 29,179,237,160,121, 52,122,119, 66, 19,188,223, 16,184,154,103,105,154,171,
+  1,103,147,109,185,157,223,169,205,121, 17, 30,142, 98,130, 77,224,215, 81, 80,249, 44, 84,160,  9, 99,222, 67,241,  1,242,128,
+117,228,211,128,160, 43, 98,199, 57, 74,130,160,123,194,105, 87,120,130,136,174,143, 36,154,149,154,142,225, 91,207,134,237, 24,
+229,201,133,199,237,160,225, 87, 76,174, 14,220,232,243,171,180,224,204,127,  1,248,186,154,222,166,129, 32,186,187,222,117,156,
+ 56, 37, 31,141,160,237,  5,169,128,  4,103, 14,156,249,121, 72,136,191,192,141, 63,212, 11, 20,137,143,170,105,229,196,169,219,
+216, 78,236,216,187,203,204,108,236, 54, 17,173,148, 91, 34, 71,222,143,183,111,102,223,188,145, 79,128,123,219, 53, 91,108, 31,
+ 77,137, 64,230, 18,  6,232,  6, 35,154,131,216,221,100, 10,215,154, 22, 49,  2, 19,  3, 28,205,156, 69,109,  1, 91, 84,165,107,
+201,177, 31, 92,135, 43, 24,211,187,213,  2, 54,164, 14,  6,100,142, 42,201, 75, 70, 58,189, 58,137,243,181,  6, 20,128,189,192,
+128, 10,240, 33,239,158,132,199,147,254,120,154, 93,207,215, 51,197, 37,118,227, 52, 48,159,165, 54, 30,229,118,237,224, 96,146,
+ 22, 75,234,127,102,218,238,131,118,103, 98,237, 94,179,145,125, 79,205,255, 77,170,239,  5, 28, 15,158,205,  3,251, 80,206,118,
+ 18,107, 79,156, 25,173,169,240,253,213,247,179,238, 56, 89,199,223,175,206, 90,247,133,  7, 17, 18,107,234,200,108,156, 92,194,
+228,172,224,104,180,182, 79, 51,242, 59,195,234,196,174,176,201,218, 72,175,142,242,248,227,135, 99, 27, 98,167, 39,230,105,146,
+207, 11, 94,138,139, 69,114, 22,207,  2,169,  2, 37, 86, 69,137, 69,139,134,111, 80,213,142,125,180,123, 10, 32,  4,165,  2, 69,
+197, 54,149, 46, 52,222,135,148,154,173,145, 50, 97,198,198,111, 42,184,130,134,206, 11, 90,122,146,132, 55,181,230,232,  9,135,
+205, 56,121,158,177, 87, 47,184, 84,225,207,168, 64, 96,167, 14, 30, 24,  4,248,157,158, 63, 72,178,152, 86, 29,194, 60,112,119,
+228,183,232, 17,225,196,127,122,212, 27, 28, 13, 79,126, 69,231,240,255, 23,241, 95, 55, 86, 68,253,137, 22,176,186,157, 13,248,
+ 65,180,140,152,235,253,183,141,169,249, 65,119,  4,152, 14,180,125,150, 34,238, 47,242, 69, 32,187, 84,  6, 40,240,  2,214,181,
+182,225,104, 80, 12,136,  9,240,236,123,157, 48,  8,111,243,196, 41,246,199,189,201, 69,252,199, 90, 87,134, 14,  4,137,187, 11,
+164,214,189, 99,235,  4, 66,201, 19,231,202, 72, 39,176,185,190,141,200, 24, 18,227,  7, 96, 25, 82,170,178, 92, 43, 21,148,213,
+218,208,190, 11,252, 46,188, 33, 32, 59,137,246, 24,111, 24, 35,138,208,  5,197, 37,130,167,101,238,209,179,243, 34, 63,191,250,
+  1, 28,159, 60,132, 73,104, 79,225,196, 60,187,  1, 62, 56, 77, 46,145,217, 96, 53, 83,138,166,178, 64,193, 55,233,182, 88,183,
+105, 44,  9, 99,254,114, 56, 57, 25,140,151,243,204,151,170,198,170, 75,180,167,186,154, 78, 79, 79,223,184, 66,108,  0, 94,252,
+140, 25,123,215,220, 25,109,  8,241,225,179,160, 57,246,  8,238,155, 44,200,158,119,  7,188,233,235,195,231,179,187,196, 29, 96,
+192,177,180, 81,195,142, 15,219,118,121,147,124,254,242,233,232,253,219,175,252, 91,127, 52, 52,240,133,237, 84,181,246,173, 79,
+118,170,100,149,160,235,199,124,156, 80,171, 42,123,139,244, 38, 45, 86,253, 78, 24,101,183,  5,181,204, 46,117,  5, 27,188, 48,
+ 85,137,182,163, 24,179,135,234,217, 48, 28,193,138,198, 85, 34,125,129, 12, 79,114,236,253, 78,154, 42, 83,115,173, 44,185,116,
+  3,185,192, 37, 88,139, 94,128,206, 37,124, 35,182,206, 19,220, 29,178,102, 55, 95,226,246,189,177, 13,207,135,209, 59, 60, 56,
+140,239,230, 66,  8,182,147,207,121,200,190, 77,155,134,119,153, 50,135,236,198,213, 72,109, 69, 47,172,145,135,240,125, 37,133,
+221,225, 16, 77,165,136, 91,224,198,161, 60,156,166, 20,163, 61,166,221,184, 39,149,141, 98,158,  2,113, 12,247, 49,124,212,173,
+ 62,135,128,254,159,  0,124,157,219,110,211, 64, 16,134,125,196,174, 93,210,186,180,161, 21, 18, 21, 23, 72,136, 27,170, 94,129,
+196,203,160, 62, 15, 87,220,242, 52,220,150,  7, 64,  2,132,138, 82,165,165,173, 19, 39,196,235,117,246,192,204,172,215,135,  6,
+136,172,220,228, 32,203, 94,207,206,254, 59,243,253,193,191,131,123,183,185,218,178,221,141,248, 78,114, 42, 33,144, 72,  0, 39,
+121, 23,231,138, 86,215, 87,198, 65, 74, 27,214, 35,238,  7, 70,240, 78, 22,152,101, 93,230, 85, 94,114, 36, 53, 23,245,130, 42,
+223,209, 59,156, 42, 68, 96,106, 14,211,  7, 41,172,223,179,120,132, 13, 65,  1,100, 47, 15,247,147, 44,  9,227,181, 82,227,248,
+113,236, 37, 87,108, 10, 15, 81, 72,206, 31,144, 98,194,220, 14,227, 58,199,  4,199,148, 70, 25,192,218,102,188,246,238, 57,  5,
+246,195,186,133, 48,245,127,101,132, 96, 92, 28,113,140, 26,253,127,243,220,193,111,251,159,245,255,188,169,148, 15,104,249, 46,
+  9, 68,179,100, 51,194, 57,180,250,175,106, 41, 34, 29,236, 13,101,238,106, 73, 81, 39,177,107,235,128,174,115,160, 48,188,194,
+232, 77, 93,121,117,241,253,104,255,240,224,209,222, 45,175,165, 80,137,231,127,186,184,252,122,151, 39,129,159,250,218,173,126,
+ 51, 88, 21, 81, 83, 10,185, 17,171,128, 54,112, 34, 20,124,116,  8,151, 46, 10, 43,200, 16,164,179,226,114, 27,155,209,213, 82,
+209,205, 51,253, 86,246,128,220,187, 36,164,252, 22,230, 79, 72, 21, 75, 33,100, 19, 25,181,226,234,105,198,127,252, 18,138,138,
+ 75,124, 34,173, 74, 81, 23,242,166,171,127,161, 72, 25,249,240,228,215,164, 45, 56,105,180, 83,176, 57,195,254, 26,215, 86, 59,
+224,208,198, 62, 50, 82,243,165, 20,182,  8,194, 49,186,138,182,169,  3,185,190,168, 98, 53, 55, 20,111,136,185,175,159,191, 57,
+255,118, 46,101,219,131,166, 45,198,  9,238, 90, 77, 32, 51, 23,146,193,186,172,141,157,  0, 60, 52, 57,187, 53, 80, 73,221,124,
+ 83, 14, 42, 29, 60,111,111, 43,139,163,120,114, 55,177,183, 87,165, 81, 74,109,235,144,204,115, 42,210,146, 48, 80,  9,203, 24,
+238,164,187,211,188, 36,131,  8,211,107,131,231, 73,126,136,200, 44,178,164, 58, 88,139, 58,163,116, 84,148,  5,118, 96, 34,153,
+  0,217,200,108,205,145,175,226, 17,239,  1, 43,199, 76, 43,184,134,217,120,197, 16,179,172,154,245,178,193, 46, 53,180, 38,223,
+ 74,183, 16,230,224, 36,223, 30,191,252,114,243, 19,209,123,126,211,149,122,118,246,238,195,251,143, 70, 98,113,182, 73,135,135,
+ 49, 52, 33, 89,  6,206,166,117, 91,122, 65, 43, 53,152,201,153, 99,125,148,189,126, 31, 72, 28,  6,167, 71, 79,102, 21, 90, 20,
+174,117,215,116, 39, 72,  6,129,197,232, 46,117,170,113,  3,243,114, 16,108,164,140,209, 23,185,143,146, 55,253,255, 94, 51,190,
+248,124,189,248,219, 39, 77,237,166,235,199,144,132,204,235, 57, 28,  7,217,171,195,241,201, 90,230, 82, 92,251,100, 84,232,135,
+ 17,196, 52,244,236, 19, 76,224, 82,201,211,100,205, 33,181, 40, 33, 33, 83, 12,231,  0,101, 97, 92,180,195,225, 81,104,186, 39,
+152, 40, 43,226,224, 80, 16,194,236,153, 91, 19, 37,199,154,235,169, 62,139,176,137,213,198,145, 85, 53,143, 48, 28,199,227,103,
+211,252,178,150,220,213,238,112,123,207,209,195,188,125,192,150,236,106, 35, 27, 36,253, 70,136,119,155, 16, 37, 55,230,133,110,
+ 39, 29, 33, 96, 88,158, 32,101,111, 35,209,253, 35,  0, 97,215,178,219, 52, 16, 69,231, 97,123,156,230, 33, 64, 66, 44,  0,  5,
+ 85, 66,116,135,216, 84,252,  6,236,248, 14,190,162,124,  3,127,194,138,125, 89, 32,177,  1, 82,164,180,149, 32, 14,109,169,113,
+ 98,123, 50,158, 97,238,189,142, 51,105, 16,100,145,101,228, 36,227,235,115,207, 61,247,156,136,109, 96,227,214,172,153,111,  5,
+ 92,180,209,201,  8,222,219, 18,239,107,136, 70,228,190, 22,219, 59,188,201,129,183,241, 32,207,183,159,125,217,239, 39,123, 74,
+246,250,145, 18, 16,134,231,159,231, 69,174,127,131,131,160,239,  1, 45, 80,209,218,195,157, 21,124, 44,218,120, 73, 37,227,145,
+236,137,100,168, 32,212,188,151,196,137,199,149,145, 76,180,181,216,159,201, 94, 60,124,162, 70, 89, 61,155, 47,102, 49,139,157,
+ 32,131,124, 15, 17,133,107, 39, 24,102,231,171,176,176,178,187, 45, 71,124,190,230,160,108,128,167, 55, 66, 83, 52,129, 34,215,
+ 89, 30,116,103,225,200,244,111,138,199, 80,219, 78, 94, 80, 24,200, 37, 58,101,204,102,130,205, 59, 31, 78,214, 78, 47,108,233,
+108,202,128, 43,215,  4,173,168,153,197,102,250, 78,204,110, 15,226, 81, 42,  7, 96,142,110,142, 63, 76,206,125,103, 26, 69,215,
+ 90, 47,128,167,  1,172,230, 32,202, 21,114,163,140,146, 46,130, 77,137,218,250,182, 73,164,146, 21,208,200, 66,165,  6, 31, 78,
+ 72, 82,  4, 95,112,205,228,170,241,213, 94, 38,232, 68, 93,130,194,201, 86,208, 39,178, 61,  1,208, 94,225,  3,205,248, 70, 10,
+247,203,116,  3, 20,252, 48,145,198, 35,166,134,223,187, 21,253,184,182, 49, 85,105,206, 86,232,  2, 99, 37, 26, 22,208, 76, 67,
+ 50, 80,224, 96, 98,  3,176, 22,186, 34, 87,238,237,145,180, 43, 40, 93,171,219, 32,115,193, 15,136,148,188,  4,145, 17,217,105,
+210,217,  7,124, 61,153, 77, 72, 39,192,130, 54, 86,180, 59, 86,  2,213,112,208,234, 14,212,160, 54, 53,162,251,221, 20, 46,167,
+ 34,  5, 45, 26,221,202,214, 93, 46, 46,199,189,113,240,196,198,193,  1,  0,112,237,120, 59,155, 45, 77, 89,193,206,186,251,142,
+123,170, 22, 27,244, 69, 77,127, 23,215,198,116,183,144,105,181,174, 22,185,117, 59, 72, 71,249,242, 87, 26, 43,200,113, 54, 90,
+ 91, 35, 26,209, 72,158,128,127, 39,250,116,118,108, 43,169,160, 49, 48,145,  8,  9,209,  5,194, 83,248,  3,103,167, 23,217,235,
+151,175,166,243,243,119,211, 79,116,181,135,251, 79,239, 31, 60, 58,122,123,132,205, 88,  2,135,134,224,195, 18,223,159,173,191,
+213, 25, 99, 25,146, 51,224, 65,195,218,131,  6,246, 18,155,227, 60, 74,210,207, 63,179,188, 42, 85,172, 12,102, 20,  1, 62,  4,
+185,150, 68,141,147, 77, 31,239, 79,223, 31,147,171, 19,185,208, 99, 36,125,  3,218, 23,107, 82, 25, 85,255, 43,241,255,126, 61,
+184,123, 80, 20,217, 69,  1, 73,170,243,171,143,253,241,139,135,207,223,212,249, 23,177, 56,129, 37, 72,127, 20,231,103,166,202,
+ 93,126,194,202,175, 16, 88,227,175, 10,130,215, 26, 65,219, 78,228,112,200,108,199,152,220, 20,203,180,194, 16,187,182,105,228,
+ 87, 75,116, 43,131, 65,152,109,101,236, 65, 53,224,220,117, 44, 94, 39,201,115,157,231, 35,115,167,217, 55, 75,125, 33,223, 98,
+  6,110, 24,247,216, 64,123, 23,224,193,181, 16, 38, 44,241, 34,224, 32,236, 14,171,179,253,208,104,192,135,188, 35,164,218,234,
+253, 71,  0,202,174,223,197,137, 32, 10,207,204,206,206,102,243,227,146,179,136,114,156, 86,222, 63, 96, 33,130,104, 97, 33, 28,
+216,216, 93,163,224,127, 96, 97,101, 99,103, 41, 22,214, 86, 90, 92, 39,135, 88,216,139,141,156, 65, 17,  4, 65,114,162,160, 57,
+127, 36,187,155,219,236,102,103,198,121,111,102,147,221,200, 21, 54, 33,236,194,  6, 38, 59,223,123,223,188,239,125,143, 87,251,
+152, 86,192,189,138,236,149,226, 42,142, 67,  6,192,129,136,161,136, 11,145,134,181,115,194,  5,225,  6, 40, 66, 22,130, 24,192,
+227,154,178, 28, 44,173,180,206,129,132,134,140,107,132,173,220,121, 17,154,220,137,217,146,253,156,128,209, 32,160, 53, 55,168,
+106,178,125,127,141,232, 30,252,164,111, 46,154, 52,204,167, 94,147,138,134,175,142, 84,113, 42,220,104,178,112,152, 28,248,138,
+  3,132, 73,236,205, 39, 57,170, 40,153,170,175,  4,173,233, 29,157,143,124,105, 43, 22,160, 49,164, 61,135, 40,121, 13,163,139,
+ 29,196, 22,150,157,255,234,213,201, 49,212,179,142,240, 64,240,209, 42,195,171,187,250,128,212,212,173,155,157,167, 10,223, 67,
+  6,149, 59,179, 61,198,245,103, 11, 96,216,180,223, 36,235, 45,222,  9,120,161, 89,150,169,113,174,162,204,132, 76,153, 26,112,
+194,  0,160, 49,  6,116,133, 23, 10,195,132, 32, 25,131, 73,175,112, 90,169,218,104,146, 20, 40, 61,147, 36, 46, 32, 74, 11, 79,
+183, 60,147,233,171,  0,186,245,213,172,128, 91, 62,213, 13, 73,  4,213,179, 57,  0,154, 79,172,110, 20,214,213,124,118,209, 36,
+ 75,120,172,109, 16, 17,115,161, 36, 37,167,187, 98, 20,101,  4,154,149, 60,187,253, 13, 43, 15,120, 43,206, 99,156, 42, 75, 17,
+248, 98,187,230,157, 70,167,223, 59,249,237,215, 87,165,138,122,141,130,210, 21,251,230,106,183,  6,166, 89,134,228, 97, 67, 50,
+144, 18,167, 64,163,128,197, 40, 77, 89, 77,151, 22, 59, 12,170, 82, 74, 78,179,169, 73,156,225,205,163, 96,238, 17,207, 98,236,
+151, 96, 86, 11,193, 17,223, 93,  7, 25,162,240,240,231,112,201,177,168,158,204, 38,196, 21,125, 43,  6,185,104, 32, 46,173,164,
+ 78,151, 39,252, 68, 47, 11,117,122, 57, 44,194,220,249,157,140,205,149,195,104,  4, 57,136, 89, 34, 33,176,157, 71, 93, 59,119,
+245,213,199,215,115,176,143,128,199,  8, 38,172, 89, 22,181,239, 36,179,219,158, 89,105,133, 66, 58,104,178,165, 19, 97, 47,201,
+146,195, 52,126,252, 98,239,201,221,251,122,179,183,251,236,249,246,141,235, 91,151, 46,108,159,191,  2, 97,133, 54, 32, 44, 22,
+ 24, 97, 36,158,151, 79,203,104,243,153,144, 31,248,174,176, 82, 59,  5,121,254, 66, 32, 71,173, 80, 21,200,133,148,220, 48, 21,
+226,113, 37,155, 30, 40, 53, 97,146,189, 23, 20,114,222, 15,215, 73,155,191, 31,188,117, 38,  0,168,145,102,224,102,227,  4,107,
+103,123,221, 47, 81,186,115,121,103,179,127,102,247,205,222,135, 79,251,255,139,239,  7,223,  7,143,238, 60,189,253,224, 22, 14,
+207, 33,195,193,195,173,155,247,214, 54,250, 69,116,145,100,113,145, 37, 65,242,135,180,154,202,203,211,119, 47,229,104,104,139,
+ 51,234,104,170, 97,114,101, 42,167,145,154,140,138, 60,150, 38,139, 65,100,150, 90,211,234,228, 30,247,103,210,197,206,119,  3,
+220,168, 92,214, 42, 43,103, 52,214,111, 89,215,125, 14, 92,191, 81,121, 26,195,232, 49, 39,183,174,161, 10,167,117, 47,139,185,
+246,170, 45, 19, 88, 89, 71, 29,226,173,115,  7, 43, 29,200,106,121, 73,205,239,176, 50, 31,169, 38, 10,253, 43,  0,101,215,174,
+219, 68, 16, 69,103,102,103, 31,126, 36,150, 19, 68, 20,  3, 49,162, 67, 80,  4, 41,  5, 66,  2, 87, 20,124, 12, 63, 65,193,223,
+ 32,196, 67, 41,120, 20,180, 68, 72,137,  4, 69,138, 88, 50, 80,224, 36, 38,246,250,177,222,245, 60,152,123,103,199,222, 56, 17,
+136,210,146,189,146,119,103,239,156, 57,247,220,115,248, 18,167, 83,132,183, 46, 36,143,205,221,128,145, 81,197,177, 85, 26,218,
+ 33,218,  8, 92, 98,  0, 84,113,240,147, 50,168, 17,146, 54,  2,212, 23,166, 74,  4, 26,  9, 37,204,243,240, 41,157,152, 98, 74,
+117,232,209,136, 85,192,216, 15,105, 43, 78, 60,235, 28,224, 65, 17,  1, 49, 37,148, 62, 69,135, 50, 99, 51,223,148,179, 33,160,
+ 33, 22, 66,107,133,149,152, 65, 62,222, 88,100,155,213, 13,243,147,206,176,205, 41, 15,204,153,196, 51,187, 55,103,176, 53, 96,
+238, 16, 93, 12,243, 23, 42,174,219,168,108, 90,139, 82,101,191, 50, 82,177, 21, 77, 47,190,175,116,161,170,211,249,  6,203,206,
+233, 43,232, 95, 90,182,244,146, 49, 96,230, 48,128, 70,207, 69,184,167,158,243, 82,182,110,105,190, 84,177, 80, 99,167, 92,156,
+ 63,158, 58, 33, 87, 12,108, 55,183,204, 84, 98, 83, 43, 51,112, 68, 52,127, 50,153,209, 48, 34, 27,202, 75, 81, 92, 98,224,177,
+231,145, 90,  8,177,193, 32, 91,196,181,  3, 17,194,184, 49,143,103,182,163, 69, 39,  2,156,100,220, 32,131,  1,212,240, 56,  3,
+180, 90, 46, 83,128,234,150,175, 16,192,200,211, 41,240,153,180,132,  9,149,153, 36,229,144,150, 80,161, 89,139,168,  1, 73, 30,
+ 24, 69,178,122,141, 29, 30,179, 68,216,  9, 20,133, 52, 20,155,138,132,185, 27,143,172,136, 53, 44, 34,227,233,232,251,241,164,
+ 32,120,191,216,  3,153,139,123, 73, 33,108, 15,144, 88,  2, 94, 17, 32, 97,225,102, 63,  7, 20, 73,208,143,199, 17, 73,122, 89,
+139, 90,132, 58, 66,137,209,116,100,205,166,226,228,236,218,218,141,238,160,139,242, 11,221,188,122,171,125,114,100, 87,181, 99,
+223,216,162,193,174,237,241, 27,131,146,114,133,155,123, 53,148,155,105, 96,249,188,122, 78, 81,234,229, 63, 37,109,109, 48, 37,
+ 27, 89,120,180, 39,210, 73, 54,221, 90,111,118, 78, 58,239,247, 63,128,191, 13,  8,133,224,186,  1,247, 51,232,  9, 59, 83, 82,
+101,249,118,232,163,120,129,111, 10, 43, 68,149,113, 30,167,113, 37,170,154,139,183,251,189,167,207,158,239,108,223,110, 60,184,
+243,110,119,247,225,163, 86,151,100,181, 96,125, 32, 70,128,156,108,125, 55,207,181,129,139,201,190,238,107,  8,222, 83, 72, 80,
+115,116, 72, 47,151, 59,  3,109,  5,211, 81, 17, 11, 87,194, 16,219, 15,112, 84, 55, 96, 28, 79, 15, 56,130,193,152,121, 35,107,
+ 37,144,180,191,124,243,182, 12, 21,192, 46, 99, 56,164,112, 16,126, 81, 41, 73,107,235,174, 94,105, 30,245,126,244,102,253,175,
+159,190,236,127, 59,184,247,120,251,127, 75,252,222,225, 94,107,231,201,199,207,175,240, 83, 63, 30,255,188,121,255,186,185,190,
+248,189,170,131,213,106,189,145,166, 96,191, 16,109,146,228,245, 11,121,118, 42,  6,167,233,217, 47, 57,236,101,147, 88,154,  3,
+ 22,242, 11,246, 48,  4,222, 39,204, 79,101, 34,117,158,172, 12,235, 21,193,187,147,143, 91,173,138,176,  2, 84,141,135, 47, 52,
+117, 60,231,111,115,161,172,255, 91,187, 97,229, 45, 65, 80, 73, 33,177,146, 46, 53,253, 48,104,172,  2, 49,  9, 90, 22, 80, 60,
+181,208,138,195, 24, 85,190,203, 20,140,221,149, 51, 48,215,139, 41,214,203,242,230,254,  8, 64,217,181,236, 54, 13, 68,209,185,
+147,113,156, 52,  9,109,104,120,136, 22, 69, 66,108,  0,137, 29,127,193, 87, 32,161,110,251, 41,236,145, 64,  2,190,  0,137, 37,
+172, 88,208,  5,170,216, 80, 68,165,166, 60, 90, 85, 84, 77,210, 58,113, 98,143, 99, 51,231,206,216,113,162,178, 32,171, 88,114,
+172, 36, 51,190, 62,115,230,220,115,150,252,  9, 74, 73,196,110, 19, 86,209,156,153,227,254, 57,129,196,100,196, 39,177,189, 25,
+187, 63, 10, 46, 86, 40,208, 24,125,171, 94, 99,163, 52,157,217,102, 15,130,137,184,116,145,170,133, 34, 85,113,124,132, 21,222,
+120,108,219, 45,108,148,180, 84, 60,221, 85,149,119, 58,174, 85, 87, 64,221, 40,  3, 12,241,204,168,155,122,158, 65,170,188,234,
+183, 87,227,171,195,168, 15,207, 86,208, 78, 72,231, 53, 56, 82, 59,223, 55, 42, 90,117,169,104,189,102,140,214,244, 91, 73,162,
+199,105,136,  4, 34,235, 17, 78,214, 92, 41,115,132, 91,137,167,207, 55, 36, 36, 93, 66,159,205,115, 14, 23,159,155,229,120,175,
+ 98,117,103,255,110, 92,191,213,108, 79,167,131, 10,217,195, 89,146,205,214, 85,197, 12,102, 63,215,161,195,214,141, 49, 85,131,
+196,186, 15,147, 93, 14,165, 76,135,  9,104, 90, 27,111, 40,161,184,128, 47,179, 89, 69, 53, 36,234,187,170,100,190,112, 94,141,
+117,207, 90,139,155, 73, 45,214,148,210,121,240, 14,120, 24,130,130,213,254,134,134, 39,194, 68, 96,121, 36, 33,115, 52,103, 37,
+169, 52,192,188, 93, 55,119,173, 12,176,182, 49,144, 13,254,101, 45, 31,163,110,134,168,225, 87,170,190,136, 19,140, 87,179, 38,
+ 87,188,170,167,226,120, 38, 61,226,233, 72,164,217,211,205,102,199, 47, 64,114, 86,186,167,  5,171, 14, 57,191,203,203, 94,112,
+143,149,170,238,215,131,201,  5,148,206,169,237,138,149,182,196,179, 97,183,188,221,233,254, 58,253, 33,114,172,149, 50,108, 36,
+ 42,187, 65,185, 28,146,146,208,152, 74,205,198,116,212, 63, 54, 24,250,230,218, 70,172,245,193,159, 30,145, 35,244,210, 28, 20,
+ 21, 37,254,122,235,198, 32,186,208,113,100,111, 45,223, 51, 15, 56, 21, 68, 35, 89,190,137,242, 60, 29,146,255,216,185,231,159,
+187,217,233, 14,130,179, 48,154,112,  2, 10,104,197,159,103,135,108,169, 36, 36,205,113, 91, 16,143,176,172,112, 57,101, 69,138,
+ 16, 62,100, 86, 63,231,227, 97,140, 88, 24,243,128,163,105, 56,170,154,153, 81,243,179,212,251,178,119,248,121,247,123,144,140,
+ 31,109, 60,108,119,186,162,214,126,189,243, 18,164,251,158, 16, 61, 33, 54,185,190, 23,237,118, 87,132,120,192,228,187,197,245,
+218,241, 51, 48,186,207,177,144,249, 98, 30, 27,205,227,157,180, 13,191,206,177, 21,174,150, 73,120,239,238, 29,115,222,241,126,
+175, 81,243,161,193,173, 72,100,140, 97,119,147,195,162,  4,125, 27,134,239,119, 95,185,203,221, 66,216,210,243,103, 47,158,110,
+ 63,249,175,250,254,246,195,155,173,199,219,121,125, 23,167,123,239,238,119,183,144,136, 50, 48,  7, 67,189,127,158,157,156,200,
+163,223,211,157,143,193,215, 79,113, 18,206,208,196,173,205,244,  3, 35, 92,107, 78,162, 81,150, 71, 30,177,175, 95,230,114,246,
+108,108,188,117,160,202, 17,133, 43,249,206,217, 15,127, 14,163,231,172, 32,208,201,137,230, 11,121, 69, 49,181, 88,205, 34, 47,
+ 77, 96,181, 23,151,188,178,208,153,  3,202,229,128,101, 64,243, 40,225,232, 62,135,122,236, 68,157,177, 43,174, 72, 74,216,187,
+212,109, 74,185,170,101,105, 91, 96,249,245, 87,  0,202,174,165,199,105, 24,  8,143, 29,231,213,180, 37,203,150,135,246,176,128,
+ 56, 32, 14, 92, 56,172,196,149, 35,191,132,223,196,157, 95,194,111, 64,220,118,121,  8, 45,237, 62,219, 52,109, 94,182,241,140,
+237, 52, 45, 39,122,168, 84, 69,105, 36,203,153, 25,207,124, 15, 49,100,231,194, 97,243,221,249,101, 59,  7, 37,172,113,236,  9,
+ 61,209, 36,176,102, 74,111,172, 58, 44,  7,137,  7, 94,244,216, 20,246, 56,234,108, 48,249,160, 41, 42, 89, 55, 91,177, 67,237,
+  5, 84,180, 79, 62, 40,234, 43,136,196,174,201,149,  9,197,197, 76,242,224, 65, 26,196,121, 60, 34,139, 38,148, 32, 47,154, 54,
+ 11,195,204, 60, 26,109,100,216, 22,209, 84,250,100,124, 90,212, 75,179,122,157, 22, 10, 83,157,106, 20, 14,  6,200,158, 67,239,
+132, 24,192,225, 13, 18, 54,153,  6, 83, 19,148,226, 36, 90,171,114,177,253,221,146,165,156,139, 61, 76,  9,128,129, 53,160,163,
+182, 82,162,144,210,  9,170,177,125,  8, 37, 59, 28,109,239, 22, 91, 15,251,251, 12,252,236,130, 65, 87, 47, 99,242,105, 93,119,
+ 77,139,240, 46,120, 74, 62, 24,169, 71, 52,152,207,140,195, 56,226, 91,201, 74,224, 35,146, 56, 66, 56, 12, 67,216, 34,249,187,
+ 90, 67, 59, 88,119,128,125, 91, 50, 70,137,113,245,  8, 35,207, 81,170,109, 58, 10,243, 17, 98,134, 87, 53,122,121, 50, 43, 20,
+ 35, 76,166,212,141,210, 21,237,118,147,  6,114,102,182,151, 42, 59,156,243,153, 61,150, 68,172,150,202,132,105,243,172, 36, 50,
+145,157,101, 33,111,200, 26, 11,179,189, 48,107,199,205,173, 89, 42,  2,242,195,205, 31, 64,102,110,105,129,132,197, 77,118,197,
+ 78,148,167,151, 14, 21, 33, 84, 28,142,209, 99,108, 96,241,124, 76, 26, 53, 61,249,206,102, 69, 83,107,151,117,105,182,122,158,
+229,183,197,237,174,227, 66,219,222,228,131,159,139, 11, 90,217, 96,143,195, 58,172, 81,232,143,102,227, 71, 55,229,141,213,127,
+181, 71, 54,237, 34, 62,  1, 85, 24,159, 47,255, 32, 63,148,236, 85,204,181, 52,206, 54, 77,249, 98,246,242,199,245,133,135,244,
+192, 85,113,165,188,126,  9,182,221,219, 45, 21,132,186,215, 98, 36, 36,168,197, 72,106,178, 47,181,218,170,124, 15, 22, 71, 30,
+115,223,231,231, 88,250,146, 92, 65, 18,165, 73,144,148, 85,225,164,208,240, 91,146,219,  1, 69, 32,110, 14,184,233,209, 56, 71,
+ 89, 74,122,201,201,175, 18, 65,  4,104,219,228,240,115, 78,249, 13, 39, 94, 66, 76,166, 71,235,102,147,137, 39,130, 69, 29, 11,
+210, 48,153, 36, 15, 35,216, 28,127,249,120,123,246, 97,153, 61,111, 79,222,192,107,  6,175,  0,222,  2,152,200,124, 10,240,204,
+ 81,216,168,168,111, 45, 95, 90,226,172, 87,128,170,130, 90, 23,245,253, 10,  1, 88, 68,223,197, 38, 33,247, 78,106,108, 11,205,
+251,179,119,230,182,175,191,206, 11, 40,139,170, 12, 17,194, 40,182,114, 35,251,120, 82,109,144,149, 45,146, 22,185,108,213, 44,
+124,124, 45, 23,255, 27,223,239,202,235,201, 40,235,127, 86,139,111,226, 14,154, 75, 89,125,250,220, 92, 93,234,213,125, 91,222,
+181,155,229,186,152, 87, 12,161, 97,138,145,  1,179,132,170,107,200, 34, 88, 57,180,180,213, 89,151,182,150, 71, 36,171,116,144,
+172,254, 29, 39, 98, 42,147,189,194,139, 87, 90,239,171, 99,239,132,237, 99,163,114, 91,217, 86,247,106, 20, 77,214, 85,201,247,
+154,142,188,143, 64,156,  9,115,236,198, 81,186,127, 96, 79, 87,102, 14,109,195,118, 82, 75,174,101,233,123,147,135,176,159, 78,
+123, 26, 20,131,161, 91, 31,252, 91,194,255, 21,128,178, 43,231,109, 34,136,194, 51,123,120, 29, 31, 97,189, 38,114, 34, 69, 57,
+164,112,132,  2, 81,  1, 63,129,142,134,138, 26,137, 72, 20, 32, 33,241, 11,160,128,158, 34, 18, 13, 61, 77, 68, 67,  1, 66,162,
+ 74,153,142, 16,129, 80,  8,  9, 78, 98,199,216,187,107,123,175, 25,222,123, 51,235,216, 40, 66,162,115,177,222,123,231, 29,223,
+247,190,207, 58, 75, 57,146, 79,210,102, 24,137,188, 19, 62,139,242,235, 86,129, 91,176,164,218,218,240,218, 36,196, 25, 81, 53,
+ 26,213, 81, 83, 69,140,180, 10, 72,144, 22,107, 28,204,245,144, 20,207,117, 87, 81,205,184, 91, 52,220,161, 80,226, 84,153,105,
+208, 54,112,229, 85,108,223,115, 63,137,145,168,  0,199, 73,177,209, 25,164,233, 52,122,109, 88, 21,252, 16, 10,131, 36,129,147,
+105, 84,150, 15,252,175,144, 65,196, 72, 12,193,150, 47, 70, 26,122,124, 99,136,  2, 39,239,104, 35,148,131, 65, 58, 44,166,  5,
+199, 40,121,  5,119,185,122,241,123,111,  7,  5,131,242,137, 24, 57,102,188, 55,162,181, 80, 93,234,120,213,122,171,119,200,207,
+192, 83,229,153,211, 10, 35, 12,199,212,100, 59,165,194,136,168, 38,132,196,  1,186,243, 33,145, 27, 94,222, 37,215,170, 27,214,
+ 81, 38,102,  4, 97,177,156, 87,109,  6,129, 51,193,161, 23,236,202, 65,246, 24,103, 44, 76,241,118, 23,200, 54, 41,193,181,  6,
+183,246, 76, 26, 89,202,152,131,252, 83,137,118, 86,166,225, 22,109,183, 98, 15, 35,177,179,223, 63,238,198,157,228, 20,116,134,
+130,160, 86,177, 22,235, 83,139,141, 41, 63,147,221,128, 76,123, 81,164,  5, 61, 73, 19,116,217,130, 21,214,240,137,224, 87,194,
+170,202,136,  4,237,214,128, 48,192, 67,193, 93,130,139, 83, 46,203, 69, 35, 21, 60,225,210, 45,115,100,109, 10,204,220,139, 78,
+  9,162,200, 32, 10,209,131, 81,169,181,232,113,  4,120, 19, 98,164,174,211, 83,177,209,127, 78, 54,187,251, 51,211,179,221,160,
+ 29,231,192, 85, 62,105,129, 37, 88,199, 63, 49,116, 43,140, 80, 50,168,247,164,114,241, 27,181, 18,117, 45, 72, 25,145,254, 66,
+184,169,199,212,219, 62, 44,238,217,185,114,173,135,110,124, 42,255,158,152,102,210, 37, 57,165,112, 94,165,113, 18,182, 96, 31,
+123,237, 31,180,194, 26, 36,167,133,245,187, 55,229,157,160,197, 35, 63,117, 79,206, 20, 12, 73,245, 40,130, 43, 44, 35,189, 26,
+219, 50, 23,106, 75,205,160, 57, 24,134, 90,137, 39,159,253,190, 60,191,250,121,127,155,144, 55,236,235,244,163, 97,132,236,  4,
+136,214, 72, 12,149,228,146, 66,238,179,  8,111,205,213,230,227, 52,106,249, 45,236,121,113,124,202, 38, 83, 54,141, 58,166, 41,
+122, 63,217,160, 40, 15,  1, 22,246,123, 84,254,210,140, 33,188,  2, 34,190,177,112,245,253,206,135,246,112,157,241,245,210,208,
+153,251, 53,239, 30,175,132,111, 93,145, 93, 19,198,205,192,110,116,234, 13,177,232,177, 43,140,109,194, 46,183, 16, 78, 51,209,
+ 48,152,204,206, 68,123,251,155,113,105,118,226, 85, 63,236,237, 29, 28,244,  2, 31,174,248,119, 22,188,126,190,254,144, 59,117,
+ 94,249,248,233, 29,252,245,241,221,181,173,221, 47, 79,215,158, 92,191,115, 11,110,111,149, 89,207,238, 63, 42, 91, 69, 19, 18,
+ 60, 90, 40,218,233, 49,236,227,193,237,123, 47, 55, 94,253,215, 18,191,122, 97,101,244,219, 57,218,237,190,120, 19, 53,127,118,
+182, 54,165, 73, 50,177, 73, 20, 71,253, 36, 14,105,142, 62, 67,173,248, 76, 97,130,130,236, 24,212, 13,210, 50,144, 57,233, 37,
+ 55,221, 25,205,184,144,219,164, 74,156,248,164,174,148, 24, 83,229, 29,131, 39,165,248,123, 73,229, 16,173, 21,179, 78,158, 42,
+217, 96, 50,113,190, 92,111,  5, 71, 42,189,211,132, 74,170,244, 84,104,215,134, 84, 99,135,179, 70,157, 98,117,150, 57,209, 94,
+213,162, 74,127,102, 60,121,151,255, 68,  3,255,  8,192,216,181,243, 54, 13, 69, 97,223,235, 71,220,196,110,154,180,149, 83, 37,
+  2,149,242, 40, 42,108,252,  6,126,  2, 35, 19,  3,236, 44, 48,242,111, 16, 66, 98,  7, 22,196,194,128, 24, 24,232, 80,170,134,
+ 82,232, 35, 15, 18,219,241,243,250,114,206,185,177, 83,  9,138,216,162,100,137,125,237,243,250,206,247,125,198,  5,224, 32,171,
+ 12,149, 84,251, 72,222, 11,  8,240,219, 70,157, 43,179,134, 57,153,140, 23,170, 73,198,214, 30,189,  2,248,249, 62, 21, 11,119,
+211,210, 77,  8,211, 53,110,154,220,134, 20, 59, 73,  2,129,178, 98,112,238, 40,  3,134,227, 24,148,172,225, 49,121, 35, 64,245,
+ 89,211,145, 82,225, 50, 35,101,210,230, 24,224,225, 10, 27,220, 32, 42, 35,110,251, 69,133,132,120,  7, 89, 44, 41, 18,215,114,
+112,206,195, 12,163, 32,255,183,130,216,141,115,239, 19,165, 35, 14, 47, 13,196, 74, 56,235,136, 62,163,126,105, 82,224,  2, 68,
+ 71, 91,239, 58,151,250,193, 62, 43,217,109, 84, 46,137, 10,255,144,101, 18,134, 43, 27,162, 90,200, 92,192,168,106,255,201,  2,
+141,253,149,144,166, 22,178, 72,222,138,118, 69,145,253,163,153,  4,171,166,105, 18, 75,220, 76,235,214,217,230, 90,  3,218, 32,
+ 63, 72,156, 37, 20,123, 85,202,  4,132, 66,227,102,122, 94, 30, 26,142, 95,232,167,156,178,182, 32,115, 90,  4,232, 12,  4,131,
+200,117, 21,243,104, 82,112,175, 86, 91,117,140,254, 32, 60, 24, 37,126, 38,  3,234,189,179,243,226,  9,126,254,217,247, 55, 15,
+253,219,151,235,215,122, 46,148, 60, 97, 20,255, 10, 69,154,227,189, 91,178,180,122, 14,157, 84, 49,142,181, 89, 70,249,201, 98,
+106,110,181, 86,103,161,192,  9,190,109, 34, 25,159, 17,138,112, 58,205,183, 58,230,225,  0, 29,196, 13, 60,151, 40,205,171,139,
+ 80,107,221, 92,237,160,160,132,189, 97,120,173,141,163,193,161, 82, 13,242,150,187, 39,211,159, 84,166,148,179,111, 77, 46, 90,
+ 92, 94, 49, 66,152, 92,120,244,226,147, 93, 58,212, 42,145, 40,201,200,251,177,221, 88,153, 70,190, 10,244,170, 44,199, 58, 45,
+ 23,110,205,153, 66,165,140, 64, 62, 91,111, 18,193,149, 14,201, 91,217,136,210,208,143,  2,199,118,177, 48, 39, 97,145, 92,102,
+ 53,179,134,141,130,200,213,254,  4,122,105,150,141, 25,238,116, 25,102,  4,  1, 37,199, 37, 17,  8,136, 45,167, 61,152, 12,116,
+226,185,192, 13,220, 63,219, 67,235, 56, 14,197, 46,203,196, 98, 25,101,247,232,203,156, 53, 41, 48,213,163,153,129,110, 73, 65,
+204, 47, 89,108,121, 55, 14,206,246,200,136,  3,113,143,254,160,207,112,218,166,187,182, 91, 32, 36, 30,201,249,106, 58, 87,233,
+ 78,153, 34, 40,183,178,102,125, 57, 23,240,111, 50,174,252, 28,  9, 51, 16, 89,252,236,222,163,215,119, 95, 61,120,242,248,227,
+247,189,227, 96, 24,197,242,219,248,  3, 13,101,158,107,118,163,227,118,111, 73,199,251,209, 29,239,166,130,241,208, 75,191,250,
+ 61, 11,154, 54, 29,223, 87, 72,228,237,237,235,150,150, 67,189,213,101,157,155, 87,182,118,118,182,123, 61,175,125,231,170,190,
+218,132, 82, 96,181,213, 90,243, 58,157,102,119,195,105, 67,  6,205,179, 12, 30, 19, 19,186, 14,102, 65,126, 56,126,255,233,100,
+ 50,107,  8,189,109, 57, 41,181,174,182,105, 69,193,236,221,203,183,247,159, 62,164,248,254,191, 54,220,173, 70, 43, 30,141, 22,
+ 13, 95,158,156,190,121, 17,  4,147, 76,139,145,222,  8, 55,176, 16, 56, 82,132,119, 63,153, 33,118, 36, 83,173, 32,210,  7,169,
+ 20, 18, 82, 77,  1,177,116,117,210,230,154, 84,213, 91, 76, 14,124,220, 88,178,221, 41, 57,  7,192, 17,135, 89,120,161,  3,158,
+246,231, 38,203,162, 36, 46,131,251, 28, 94, 34, 57, 13, 49, 10,135,232,125, 89, 82, 83,231, 18, 57, 82, 45,190,170,162,131, 21,
+149, 29,  5,161,252,172,210,137, 34, 98, 25,124,209,176, 29,  8,161,227,217,240, 28,156, 95,106,102, 73,249,143, 85,143,223,  2,
+ 48,118,110,173, 77,  4, 81, 28,159,219,238,166,217, 54,109,146,154,120,105,139, 65,177,104, 21,145,170, 15, 62,248,224, 87,240,
+ 51,248,225,124,240,213,  7, 47, 40, 72,209, 23, 17, 65,104, 17,137,214, 54, 34,177, 37, 77,147,236,101,118,103,198, 57,103,118,
+211,134,190, 20, 22,114,131,108,178,151,153, 51,231,252,207,255,  7,254,  4, 20,186,214, 20, 61,163,134,196,151, 28,217, 58,220,
+  3,143, 66,120,210, 16, 13, 52,221, 22, 14,239,205,156,236,  0, 18,171,118, 58, 85, 78,228,175,145, 76,130, 68,  8, 48,138, 70,
+251,100,200,182,219,173, 21,182,236, 12,177, 63,250,109,  3,118, 15,212,248,204,199, 69, 43,254, 93, 30,130,241,183,  0,235,  2,
+238,  3, 87,148,176,128, 99,188,203, 88,232, 65, 68,111, 47,198,138,224, 17, 88,151,208, 84,101, 71,105, 36,152, 56, 76,246,254,
+ 70,253, 84, 37,137, 74,164, 78, 50,215, 16,107,138,208, 12, 15,  0,207,  1,218,155,163, 22,197,126,175,192,223,207, 67, 22, 94,
+172,182,187,227,157,194,229,230,196,210, 29,105, 75,142, 18, 87,182,119, 77, 43, 18,174,122, 13,200, 30, 77, 18, 53,153, 49,  9,
+154,113, 11,194,118,205, 60,177,255, 30,178,228,  8,153,245, 25, 77,210,216,206, 79, 77, 66,110, 44,251,215, 46, 45, 12, 34,213,
+ 31,102, 19,169, 61,110,236,102, 79,245, 24,234,253, 48,160, 35, 86,206,145, 93, 32, 40, 17,192, 90,193,226, 23,206,112,118, 84,
+243, 49,188,245, 80,125,173, 64, 19, 76,154,213,160, 83,247,122,  7,241,207,163, 36,194,234, 90,132,250,230,164,140,223,221,141,
+229, 99,201,109,158,144,203,139,252,254,245,165,149,118,104,163,160,254,145, 28, 78, 20,104,100,160,250, 71, 99,236,167, 84,176,
+ 83, 52,176,100,180, 94,  5,212,179,125,145, 27,112,106,110, 84,121, 96, 79,161,224,213,128,126,220,137,255,141, 33,132,146, 10,
+166,165, 76,129,  1,127,171,182,218, 27,236, 21,182,168, 40, 19,210,174, 43, 21,133,107,206,213,145,160,142,101,214,170,173, 32,
+150,219,113,214,213, 84,203, 44,183,102,101, 30,177,212,149,194, 71,141,249,102, 34,199, 18,248,127, 16,185,  3, 47,181,236, 37,
+ 49,133,163, 30,238,151,186,203,210,157,104,183,244, 45, 86,232,232, 79,103, 54, 86,111,117,251,221,123,157,  7,219,187, 95, 39,
+114, 82,128,135, 40,173,250,243,199,241,192, 89, 41, 56,142, 41, 80, 46,114,181,182,220,233, 13,246, 49,  9, 80,200,233, 13, 14,
+220,246,209,163,  2,162, 71,157,185,251, 92,149,157, 98, 87,154,171,189,131,221, 74, 37,148, 50,161,120, 71, 96,113,221,128,105,
+  7,244,105,195,161,175, 87,234,169,145, 89,150, 58,211,202, 34,138,114, 60, 68, 92, 67,131, 64, 13, 60,135,184,131, 74,250,144,
+ 17,103, 62,  2, 43,219,139,173,195,104,  8, 93,176, 76,180,155, 45, 77,197,113,148,165,204, 78, 73,245,141,218,205,103,119,159,
+146, 37,242, 97,235,203,243,207, 47, 95,247,183,126, 68,223,225,186,204, 15,236,151,214,130, 57,165,115,143, 74,192, 44,160, 11,
+102,168, 23,124, 31,110, 62, 20,182,129,234,129,231,202,183,235, 72,  9, 19, 33, 76, 62, 21, 95,  4, 94, 20,199,163,209,208,198,
+204, 94,224,  9,193,134,147,225, 24, 83,249,115, 36,120,220,238,140, 84,122,  8, 93,  8, 16,102,253, 26,252,249,244,226, 13,187,
+ 90,127,184,185,137, 41,160,115, 73, 39,111,175,108,180, 23, 46,188,221,126,143, 14,192,181,245,181, 59, 18, 69,152, 20,145, 10,
+ 20,201, 73,185, 76,158,172, 63,122,245,237, 29,172,133,128,247,128, 52, 39, 85,242,192,115, 87, 64,213,230,116,103,226,137,186,
+209,184, 86,126,134, 78, 68,238,210, 66,115, 96, 58,117, 26,112, 64,230,105, 39, 42, 61,149,194, 61, 59,162, 58,183, 84, 83,232,
+ 26, 10,112,228, 73, 43,146,158,162, 66, 72, 73,104, 51,165,253,164, 41,209,223,196,204,214,243, 76, 33,251, 97,216,229, 78,245,
+185,  6,247,226,189,255,  2, 80,118, 45,185, 81,  3, 65,180,237,246, 55,227, 36,206,151,100,136,  2, 72,  8, 37,130, 37, 18, 55,
+200,  2,137, 21, 59,238,192,154, 59,176,230, 14,220,129, 61, 72,  8,  9,129, 16, 18, 34, 40, 32,148,160, 64, 38, 51,153,241,216,
+110,183, 63, 77, 85,117,123,226,132,108,152,197,172, 44, 91,109, 87,119,253, 94,189,135,231, 59,173,176,110,249, 48,205,253,207,
+ 21,180, 45,148,244,113, 72,201,218,229, 65,196,122, 21,142,161,114, 98,204,176,  5,130, 57, 26,210, 81,197,215,100,112, 72, 72,
+ 45,162, 58, 36,100,154, 23, 11,163,170,149, 96,201,134, 19, 57, 59, 37, 98, 60,220,138, 46,113,225, 97,110,200,192,156, 28,188,
+ 43,132,240,182, 23,161,201,184, 10, 75,120, 62, 92,  9, 22,236, 56,188, 86,  6, 57, 84, 83, 17,104, 84,  8, 81, 21,178,201, 14,
+211,111,101, 45, 69, 93,224,100, 51, 78,224, 87,122,166,140,138,168, 24,128, 87,  8,193,172,  8, 16, 10,207,112, 57,145,228,  4,
+ 86,176, 49,183,113, 84, 28,202, 42, 85,216, 22,170,187,128,215,203,188, 16,231,  4,111,172,147,233, 51,118,229,208,177,214, 30,
+178,181, 34, 21, 18,205, 96,101,220,243, 67,238, 77, 39, 39,161,109,221,221, 12,183,215,123, 83, 81, 31,143,228, 72,128,155, 83,
+145,141,197, 63, 48,203,164,109,224, 67,176,143,140,154,  4,  2,104, 52, 41, 46,149,221, 93, 91,151,107, 49, 27,200, 42,244,178,
+ 82, 89, 14, 87,203, 30,223, 93,157, 27, 37,242,251, 48,155,160,248, 49,178,199,192,226,199, 10,225, 17,250, 88,215,108,145, 33,
+ 25,135, 67,229,154,205,216,222,189, 17,239,220,138,  7,227, 34,205,242, 36,175, 39,  5,154, 82, 42,149, 32, 83, 10, 41,115,131,
+224, 54, 14,120,207,199,207,147, 55,150,104,192, 27,241,181,200,134, 67, 31,108, 68, 86,234,205,151, 66, 72,  4, 31, 20, 40,145,
+201, 74,228,138,210, 54,107,120,239,225,111, 33, 88,204,101, 78, 83,  5, 22,191, 72,177,116,105, 32,205,140, 35, 25,108,242, 63,
+ 12,170,204,240, 13, 19, 74,  7, 91, 56,164, 35, 66,138,190,237,136, 54,214, 55, 45,170,134, 16,220, 94,139,171,169, 78,203,  4,
+ 46,114, 93,240,244, 92,214,101, 63,238, 15,211, 65,154, 37, 40,  0, 98, 89,178, 20, 36,169, 98,220,  3,220, 60,244,123,147,116,
+ 84, 43, 45, 84,  7, 43,170, 92,199, 43,203,178,157,192,210,196, 67,202,231, 62,132,210,176,184, 56,140, 41, 43,183, 88,219,141,
+128,  7,251,196, 94, 25,  5, 11, 66,166, 58, 33,182,177,233, 68,114,226,218,235, 33,  8,202,165,114,167,206,157, 53, 35,  8,215,
+116, 14, 56, 42,136,  1, 23, 92,  1,169, 48, 56, 86, 14, 46,225,193,237,251, 31,127,124,210,252, 91, 56,197,138, 91,207,161,189,
+231,130,201,192, 43, 40, 45,  8,110,156, 28, 27,159, 43,143,182,246, 30,223,217,243, 55,109, 86,176,241,135,230,231,150,253,250,
+ 55,123,247,235,112,127,184, 63, 20,  3,238, 71,238,218,189,188,  9, 78,135, 95,229,244,184,202, 39, 42, 25,220,224,243, 15, 23,
+253,245,121, 39,201,216, 65,158,188, 29,191,170,216, 56,147, 39,121,121,214, 96, 28,210,152,206,156,197, 87,189,109, 76, 59,236,
+249,107,188, 31, 56,107,103,242,253,242,210,209,176,144,153,213, 76,133, 56,160, 70,203,203,231, 47,158, 60,123,234, 65,220, 83,
+ 94,205, 85,217,253,204, 16, 86,239,172,222,252,252,103, 31, 91,194,110,212,143,175, 43,199,109,147, 65,211, 68, 71,126,248, 74,
+ 32, 39, 45,141, 79,211,201, 94, 25, 73, 31, 19,178,215,102, 59,117, 64, 81, 74,205,192,108,172, 54,  3, 60, 74, 93,144,148,193,
+ 82,124, 53, 67, 53,118,206,247, 46,199,203,165,152,206, 98,179, 42, 10,  1, 82,184,173,161, 38,154, 48,163,205, 68,217,185,192,
+136, 86, 63,215,212,  2, 70,255,161,229,181,154,149,140, 47, 14,156,254,215,225, 14,191,191,  2,208,117, 45, 61, 81, 67, 81,248,
+220,190,134,118,166, 51, 12,195, 35,128,137, 27,  3, 34, 97,193,214, 68,215,254,  5,255,131,107, 93,235, 95,112,225,222,133,137,
+ 27,254,135, 27,124, 36, 26, 19, 94, 33, 49,188,  4,129,150,182, 76,111,111,235,253,206,109,193,  1,204,172,154,153,116,218,219,
+222,115,190,243,250,190,218,190,223,220, 62, 53, 33,  1, 66,106, 20,112, 88, 38, 91, 95,118, 87,140,219, 12,195, 53,126, 80,232,
+ 91,128,176, 47, 56,255,  4,139, 70, 32,205, 11, 87, 81,176,170, 14, 27, 33, 22,169,  1, 78,129,171,104,123,109,207, 26, 75,228,
+  5, 18,169,182, 57,179,  6,  8, 88,132, 22, 40,176,209, 86,223,209, 56,221,  1,216, 13,132,231,123, 45,  1, 41, 15,189,109, 45,
+151,129, 11,222, 36, 35,211,204, 78, 92, 59,146,131, 52, 26,150,197,238,249, 15, 73, 50, 43,146,172,208,166,102,200, 44,196, 69,
+ 37,174,228, 78, 96,101,114,146, 28,  7,129,194,222, 37,151,235, 69,238,164, 63,115,174,142,147, 34,230,202, 11,243,190,137,107,
+221,241, 27,150,253,255, 77,145,163, 41,248,230, 79,177,125,249,145, 34, 94, 96,202,124, 71, 73,175, 44,151,103,131,126,207, 79,
+ 50,185, 31,229, 26,240,234,219, 13,225,217,232, 36, 47,115,240, 49,194, 69, 43, 14, 53,209, 21, 84, 19,128,215, 82,  5, 24, 19,
+ 23,208, 61,209,135,137, 98,133, 71, 18, 93, 71, 76,120,214,120,203,238, 56,222,250, 81,146,128,179,  1,153,166,201,192,154, 10,
+220, 40, 41,183, 83,105, 58,158,  3,158, 88, 12, 16, 75,144, 14,170, 53,214, 10, 93,154,237,121,171, 11,189,153,169,240,215,111,
+141,247,242,211,180, 72,115,212, 28, 83, 30, 47,215,206,208,101, 19,175,223,128,174,175,221,172, 72,149, 17, 65, 66, 65,188,  5,
+224, 40,166, 66, 43,202,212,231, 13,121,  9,209, 22,160,248, 92, 34,149,196,196, 64,134,156,200,100, 31,241, 25,116, 38,143,227,
+ 19,123,180,111,102,100, 70,144,110, 45,103, 53,210, 73,108, 20,196,204, 70,194, 62, 18, 38,  9, 86, 35, 38,253,227, 65,119, 16,
+167,209,124,127,126,  7, 10, 27,156,101,  7, 39,159,159,230,218, 49, 21, 85, 35,209,198,101, 33,204,196, 64, 97, 74,216, 99,174,
+215,246,187,199,209,161,197,111,172, 42, 36,234, 77,128,128,104,147,131,  4,149,215, 30,132,253,141,195, 77,236, 92, 85,183,112,
+ 94, 13,206,113, 22,221,182,154,217, 23,141, 78, 22,231,150,190,237,126,233,119, 38, 50, 41, 51,153, 58,215,158,  0, 41,105, 92,
+185, 81,149,230, 91, 48, 41, 91,196,  0,252, 53, 54,160,209, 27,111,142, 28,110, 54,112, 88,223,198,  5,216,194,164, 87,167,229,
+ 75, 85,120, 54,180,207,120,117, 45, 35,229,  9,174, 81,132,173, 66, 95,115,156,203, 82,216,185,176,135,100,203,202,189, 31, 46,
+ 44, 13, 22, 31,251,171, 43,175,166,105,133,175,233,  8,132,193,155,123,180,125, 70,235,251,180,126, 65,145,210,104,139, 30,204,
+209,195,105,122,218,167,229,  9,250,179, 77,107, 95,233,253, 79,218, 75, 41,142,165,204,207,170,  2,204,236,101, 49, 20,178,180,
+242, 19,223,  9,124, 41, 53,122,176, 85,150,157,127,207, 14,222,189,121,246,228,227,167,181,157,211,131, 61,186,124,253,252,197,
+203, 15,111, 31,117,239,109,197,135,174,235,229, 96, 18, 84,183,232,183, 42, 99, 25,185, 79, 19,129, 93,232,140,233,133,133, 82,
+144,231,195, 93, 89, 70, 13,161,166,224, 50,212, 96, 80,  0, 81,134,166,186,100,245,  8,214,  2, 81,134,138,170, 38, 14,166,170,
+170,110, 81,143, 32,241,213,116,199,140, 76, 92,176,185, 21,166,145,163,230,147,169,232,159, 83,  8,170,202,187,120,219,205,131,
+ 53,105,109,180, 29,161,110,110,129, 77,161, 38,  8,106,148,148, 89, 76,170, 50,130,222, 92,166,101, 92,169, 68,163,211,236,183,
+130,108,180,147,242,170, 25,239,122, 26,246, 14,227,126,  7,201,202, 95,  1,232,186,146,221,168,129, 32,218,221,110,187, 61,246,
+ 12, 78, 66,194, 37,  8, 36,  2, 72, 68,128, 56, 32,193,129,  3, 23,184,228, 47,144,248, 26,110,156,248,  0, 78,124,  1,103,  4,
+ 87, 54,  9,164,  8, 36, 32,  8,  2, 40, 25, 50,182,199,235,180,155,170,234,158, 37, 11,210, 28,230,104,245, 82, 93,245,234,213,
+123,242, 36,201,148, 41,254, 78,167,159,226, 18,130,125,138,  7,182,148,182,217,144, 13,132,129,231,168, 93, 19, 66, 81, 57,153,
+162,249, 83, 47, 49, 20, 56, 97,144,173,121,138,251,161, 68, 47,167,188, 29, 34,212,  3, 85, 41, 62,184,216, 99, 34,206,165,  5,
+148,133,245, 50,147, 44, 32, 17, 36,116,176,  9,144,130,195,149,149,206, 20, 78,211,191,209,157, 79, 97, 30, 42,134, 65,160,228,
+  4,107, 12,142,229, 48, 89, 44,116,194,181,203, 15,209, 92,160,194,  8, 38,148, 50, 16,235,  8,195,142,164,175, 68,105,195,233,
+ 60,188,163, 46, 97,238, 79, 76, 48, 11,  4,204,212,198, 73,122,220,156,248,116,119,204,  9,214,195, 10,  8,214, 87, 75, 99,244,
+123, 67,112,138,211,212, 47,173, 19,235,251,242,210,170,234,199,222, 40,171,211, 90, 67,158, 27, 72, 30,249, 94, 44, 13,100,220,
+ 61, 37, 21, 82,200,121,137,157, 87, 74,192, 40, 48,162,243, 53,221,218,134,206,173,182,233,132, 97, 13,185,103, 10, 68,127,121,
+214, 16,116, 83, 55,214,237,190,102,168,237,  9, 27,182,177,222,227, 58,208,219,  7,  5, 26,135, 34, 44, 19, 49,185, 30,  6,198,
+215, 95,138,186,212,184,214,227,170,253,190, 91, 12,226, 48,137,101,110, 90, 85,243, 90,152, 24,202, 28,  4,193,144, 11, 63, 38,
+141, 79,229,177,131,186, 91,225,162,106,160, 88,118, 51,120,154,122,191, 69,213, 13, 66,239,218,  6,127,243, 25,  2, 59, 18, 58,
+ 59,219, 52,160,217,203,142,116, 38, 59, 71,  3,236, 16,145, 60,170,174,199,237,172, 93,119, 24,220,156, 89,186,207, 84, 64,169,
+242, 93, 32, 70, 25, 59,174,230,224, 22, 56,168,167,251,203,195,124,175,168,242, 72, 69, 59,195, 29,212,229,160,164, 10,190,179,
+106, 10,227,188,166,230,227,130,184,111, 16, 48,201,166,  3,121, 89,117,190, 58, 88, 27,230, 67,122,158,189, 59,155,183, 95,124,
+120, 73, 13, 78, 68, 34,199,213,  8,158,  7, 72,195,123, 97, 63,131,253,213,206, 93,203,  6,119, 65, 20, 50, 71, 76,230,166,110,
+155,247,223,222,193,118,164,197,  8, 30,105, 41,248,140,127, 44,172,166,148,213,136,  9,147,113,149, 50, 71,197,243, 92, 23,194,
+118, 36,220,159, 89, 71,110,238,232, 96,239, 42, 92, 25, 40,134,172, 16, 41,121,206,224, 13,130, 35,145, 68, 73,138, 45,110,136,
+ 30, 58, 10,121,209,181,240,101,112, 24, 98, 76,253, 85,218,254,124,189,223,220, 61,123,235,233, 31,182,187,207, 70,  1, 83,103,
+216,185,132,221,188,206,238,113,118,127,182,250,250,144,131,193,202, 21,246, 96,139,109,110,179,247,159,216,222, 95, 63, 45,214,
+178,146, 37, 13, 91,158,176, 44,133, 82,250,124, 58, 70, 27, 64,248,245,106, 45,194,184,172,222, 94, 13,183, 30,190,122,180,253,
+241,249,133,141,139,254,141,203,207, 30, 63,249,154,253, 88,234, 37, 45,185, 69, 88, 26,147, 53, 98,130,119, 46,242,177, 49,166,
+144, 62,135, 37, 10, 68,108,148, 35, 36, 56, 66,  5,209,169, 94,242,107,244, 27,139,170,133,177,  8,151,165,147, 49,  4, 41,192,
+ 88, 35,188,105, 82, 60,  5,227,216,124,208,116,222,147, 44,218,146,168,183,250, 72,255, 12,157, 97,252, 48,144, 50,171,114,241,
+159, 68,221, 28,155,133, 21, 78,196,198, 51,238,125, 18,194,184,178,134,104,135,220,121, 38, 96, 72, 85,202, 11,137,129,  2,215,
+ 31, 19,161,202,148,180, 26,112, 64,104,238,150,241,210, 14, 66, 47,106,214, 76,153, 60,122,  1,121, 52,236, 24,147,254, 88,178,
+249, 79,  0,190,206,101,197,137, 32, 10,195, 85,213,213,151,164, 33, 25,156,241,130,  3,142,224, 34,160, 65,  5, 23,226,202, 55,
+112,225,  3,184,242, 29,124,  0,223,194,183,113,225, 74, 81,188,224,206, 36, 32,162, 51, 12,154,152, 78,210,221,213, 85,101,253,
+167,170, 51,105, 25,221,205, 16, 18,146, 78,234,244,185,252,231,251,101,119, 49,115, 87, 22, 25, 56,239, 97,192,202,120, 46,250,
+141,245, 40,192, 64,107,  0,232,203,138,  6,250, 19,234, 10,145,232, 62, 50,146, 54,195,253,100, 19,188, 65,255, 75, 85,150, 40,
+  3,116, 64,117,107, 48,219,112,204, 87, 61,213, 28, 78, 21,136, 87,160,  2,184, 63,221,153,174, 34, 12,253, 74,152, 64, 54, 50,
+146, 61,173,251, 88,236,198,171,103, 66, 84,232,195,144,238,144,162,186, 56,131,228,112,111,247, 96,182, 27, 78,132, 47,166,182,
+ 76, 70, 40, 45,207,147,130,120,223,221,105,192,  4,231, 29, 58,232, 48, 63, 80,245,166,210,155,118, 78,130, 49,169,228,190,237,
+199,248,223, 11, 52,222,117,160,189,134,174, 58,182, 26,158, 71,158,178, 27,242, 49, 10,241,140,239,229, 50, 77,197,247,185,234,
+ 83,148,234, 37, 98,191,207,137,208,195, 47, 98,102,105,105,243,197,186, 79, 90, 41, 91, 54,148,228,104,160,125,221,  3, 85,203,
+221,194,130,157,177, 27,146,221, 66,129, 99,192,117,213,152,  1,243, 95,141,245,  0, 64,207, 54, 48,133, 22,147,226,246,209,112,
+124,152,207,167,122,193,116,206,162, 43,113,114,253, 82, 58,251,189,174,105,  6, 15,236,204,218, 14,151,245,241,201, 42,207,161,
+186,113,239, 44, 23, 40, 32, 74,101,178,  8, 87, 77, 19,129,181,161,110, 69, 45, 12,110,234,238, 91,208, 16,246, 72,195,146,216,
+133, 78, 28,171, 97,143,223,187,145,188,157,212,170, 17, 62, 65, 69,141, 16, 52, 72,224,128,186,127, 20,241, 49,252, 37,164,252,
+ 32, 37, 94,199,153,158, 52,234,162,157, 76, 40, 37, 77, 59,  4,233, 24,235,144,100, 15, 95, 72,100, 67,242,142,131, 45,224,217,
+102,234,141,160,  5,  0,196, 94,141,101, 13, 87,103, 74, 97,181,181,187,251,124, 97, 67,131,194, 68,  5, 95, 99,190,166, 39,250,
+135, 79,151, 63, 13, 66, 51,109,186,146,169,119,165,202,220,  5,247,205, 92,202,  4, 21,124, 24,145, 89,178, 37,239, 76,176, 90,
+233,165, 24, 31,221,121, 63,123, 23,100,240,219, 59, 84,139,165,128,179, 96, 36,248,182, 93, 27, 62, 80,168, 78,  4,121,151, 80,
+ 85,233, 35, 60,167,190, 50,228, 30, 24,207, 81, 25, 61,232,247, 93,254, 94,148, 43,234, 68,186,104,152,205,203,  5, 61,215, 29,
+ 40,189,159, 15, 78,151,139, 84,194,172,184, 52,250,114, 47,249,182,169, 31,201,135, 35,177,119,181,102, 47,167,236,115,143, 85,
+ 55,217, 52, 99, 95,136, 22, 92, 83,251, 14,172,154,  8,213,222,152, 65, 98,227,149,187, 46, 55,191, 63, 98, 15, 70,116,120,182,
+ 23,209, 16,223,166,160,156, 98, 69,198, 33, 39,209,228,195,173,175,111, 30,207,142,127,124,122,246,226,218, 93,153, 45,213,243,
+ 39, 79, 95,125,124,125,152, 13, 21,232,224, 42, 70,214, 24, 39, 28,123, 46, 41,112,109,174, 72,143,149,167, 19, 82, 99, 79, 98,
+209, 72,163,172,177,162, 40,151, 69, 89,248,113,160,  7,129,209, 77,218,119,200,  9,  6,174,169,249,230, 33, 65,220,231,245,188,
+181,108, 11, 62, 26,116, 55,216, 26,151,154,128,163, 56,175, 28,207,129, 98, 46,254,  9, 29,220, 89,150, 52,157,173,151,240,251,
+164,190, 12,247,106,114,170, 44, 37,242, 19, 46,  7,217,133,189,244, 32, 17,113, 89, 87, 69,179,174, 26, 21, 67, 71,210,244, 34,
+181,214,171, 74,175, 60,213,156,140,206, 45,219,198, 72,222,121, 27,252,156,180,221,254,  7,110,252, 71,  0,190,174,174,183,105,
+ 24,138, 58,113,226, 38,235,216, 64,154, 54,241,128, 38,182,137, 55,196, 11, 63,129,255,201, 31, 64,188,242, 31,120,226, 67,130,
+161,105,218,  3,104, 72,131,117,109,151,182, 73,236,216,220,115,175, 61,149, 49, 38, 85,171, 86, 69,109,148,216, 55,199,199,231,
+158, 83,220,165,156,145,221,121, 49,  1,198, 89,210,  7,116, 15, 28, 35, 33,163, 49,177,233, 34,154,124,196, 79,  0,130,117, 26,
+178, 30, 63,184,220, 65,105,  1,136,235,249,236,188, 97, 61,165,143, 49,102, 89, 34,167,176,134, 28, 56,114,172,224,181, 39, 27,
+195,195,128,208,  2,247,160,124, 83,225, 54,  0, 77,  3,116,163, 28,230, 84,  1, 61,155,121,223,113,238, 79,105,131,175,224,236,
+ 74,224, 50,163, 69, 92,145,105, 39, 95, 29,242,248, 51, 65,165,118, 42,151,250,246, 28, 23,225, 50,112,137,207,184, 23,124, 54,
+ 76,125, 96,151,215, 36,155,161,215,245, 98,162, 56, 18, 58,249,  8, 97,130, 39, 91,177,112,203,225, 61,181, 80,221, 52,184,201,
+ 26,205,  7, 57, 21,126,182, 23, 34,142,164, 17,157,135,171,198,110, 19,138,202, 33,191,216,121, 80,110,109,148, 22,182, 76, 97,
+ 57,192,200,161,131,223, 38,238,225,168, 64,133,160, 75,188,176,236,252, 31, 60,158,149,188,209,179, 66, 88, 74,116,179, 18, 56,
+183,112,252,215,202,102, 81,228, 58, 28, 91,192,254,152,187,227,207,151,123, 85, 94,151,153,  1,127, 25, 26,237,222, 95,180,147,
+214,207,146,  5, 60, 21,250,234,218,215, 19,187,175,  1, 42,  8, 12, 65,150, 15, 84,165,154, 30,237,137, 53, 59,123,181,129, 48,
+169, 62, 31,160,159,121, 52, 82, 15, 55,194,204,170, 69, 79,255,234,138,106,  7,104,247, 48,174,243,231,  7,197,199, 83, 68,160,
+  7,141,139,192,108, 40,182, 88,134,  0, 98,186, 44, 52,194,111, 35,221,156,149, 69,217,115,  6,219, 45, 86, 51,172,181,  6,134,
+191,228,187,121, 76, 20,205,214, 36, 94,194, 22,241,132,157,173,230, 69, 60,198,103,113,197,  0,238, 25,221,111, 50, 58,  5, 58,
+139,231, 62,142,209,181, 25,173,218,149,138,125,170, 25,129, 71, 15,199,  7,124,245,241,247,111,  8, 76,149, 29, 89, 80,133,178,
+ 11,135,112,188, 50,135, 98, 75,244,159, 38, 51,210, 31,183,166,197,143,225,204,244,233,167,179, 15,185, 40,173,196,116,143, 10,
+167,143,141,231,154,201, 26, 45, 29, 78, 50,245, 88,223, 25,169, 39, 62,166,130, 69,101, 27,205,216,120,136, 30,238, 29, 76,155,
+203, 37, 68, 88, 66, 48,  7,203,113,174,242,240,160,117,131, 78,114, 95, 26,229,189,237,198,101,209,185, 14,  6, 50,122, 52,157,
+ 55,155,227,252,197,238, 62,205,137,233,107,245,242, 80,157,215,234,250,139,234,143, 84,243, 76,117,227,152,247,114,145, 60, 75,
+ 78,148,122,147,146, 29,  5, 55,136,155,180,248, 97,108,194, 38, 94, 29,110,169, 87, 91, 28,237,251, 83,253, 58, 81,167,103,106,
+247,183, 26,153,213,219,171,119,195,233, 82,127,237,130,107,250,126,241,244,201,145,117,150, 80,158,227, 59, 65, 87,114,195,140,
+175,218, 57,167,102,251, 78,178,121, 82, 20,147,151, 32, 36, 20, 98,140,195, 88,136,153,216, 48,166, 66,240,125,164, 76,  4,192,
+251,132,228,227, 91, 52,100, 23,106, 48,150,117,191,214,156,114, 79,199,105, 54, 91, 78,  6, 58,199,255,122,205,170,127,123,254,
+147, 38,133, 55, 44,229,193,139,226, 94,  8, 77,189,109,118,118,235,199, 52,216, 17, 64,103, 91,208,159, 67,143,134, 85, 21,241,
+ 27, 77, 53,131,125,205,118, 80, 54,109,236,229, 62, 69, 70,223,232,134,239,112, 58, 86,225,126,219,250, 63,  2, 16,118,173,173,
+ 77,  4, 81,116,102,118, 39,187,137,174, 41, 62,218,248, 69, 17, 21,  4,193, 79,126, 23,127,187,  8,226, 31,240,137, 32, 82, 86,
+ 67, 33,198,152,125,204, 99,199,251,154,152, 34, 69, 40,165,144, 66,186,205,220, 59,231,222,123,206, 61,144, 52,204,229,109, 98,
+  4,132,181,216,103,139,166,201, 64,122,109, 12,235, 87,145,175,136,163, 29, 90,191, 14, 47,  1, 46,152,213,240, 85, 86,128,197,
+144,208,206, 18, 55,154, 27,115,100, 22, 58,219,209, 73,173,141, 15,196,114, 91,120, 11,236, 42,242,251,106,237,161, 38,192,113,
+ 16, 14,190,107,170,209, 48,203,226,208,  9,173, 38,177,183,137,107, 43,141,165,117, 28, 80,207,192,161,118,147,135,  8,108,247,
+223,125, 34,111, 16,204,248,226,223,148,111,239,195,254, 52, 89, 65, 54,195, 20,111,  0, 65, 64,161,180,143,191,148, 20,217,  7,
+193, 42, 95,190,185, 79, 69,156,  8,157, 47,105,169,104,180,206, 50, 93,125, 28,139,204, 11,228, 31,152,240,142,140, 98, 22,162,
+ 36,117, 50,215,  0,135, 23,165,158,219,194,214,246,218,162,  4,240,117,190, 25,207, 55,125,187,245,235,157,119,131, 31, 29, 68,
+ 64, 28,225,169, 60, 94, 94,115,  3,249, 81, 87, 70, 53, 51, 13,144,191,194,134,  9,242,191,224,217,121,133,175,166,150, 75, 71,
+ 81,183,163,148, 82,230,228,222,103,124,  1,175,174, 67,106,167,  4, 88,116, 29, 83, 27, 98, 27,144, 55,233, 50, 66, 41,201, 58,
+166,177,198,234,180,221,199,222, 79,142,124,112,125, 72,152,181, 39,217, 90, 81,235, 52, 47, 82, 85,144,228, 21,245, 80,234, 86,
+141,233,104,  0,172, 28, 85, 83,195,103,164, 58,151,198, 73,175, 78,204,197, 54,162,234, 94,107, 91, 92,103, 11, 63, 58, 78,112,
+ 64,236,114,113,147, 56,127,248,175,242,148, 34, 37,187,253, 85, 92, 16, 11,165, 64,208, 57,137,183,159,129, 10,221,251,129, 32,
+177, 16,118, 21,123, 57,226,249, 97,172,138, 24,183, 72, 76, 64,100,217,145, 34,247, 59, 52, 56, 61, 91,174, 16,  3, 10,209,145,
+ 42, 42, 67,150,143, 41, 56,184, 87,101,232,130,159, 52,156, 52, 74,226,252,193,227, 31, 84,217, 58,  0,122, 49,112, 57, 85, 99,
+ 24,104,163, 61, 14,242,184,105,142, 46, 34,101,197,253,185,163,103,144,111,167,203,213,224, 59, 30,197,192,205,161,  8, 85,152,
+ 12, 65, 12,229,120,148,149,176,133,172,225, 22,188,225,168,225, 56,154, 21, 51, 18,172, 42, 35,139, 53,148, 11, 99, 15, 25, 95,
+137, 26,  0, 78,132, 11,161,160,206,100,161,143,204,169, 40, 45,238,250, 93, 64,145,176,161,165, 50,152,116, 92, 52, 91, 63, 62,
+127,249,236,198, 99,181,249,160,236, 59,117,247,179, 50,239,213,233, 87,117,231,167,250,113,161,  6,139,137,190,215,136,200, 15,
+ 38,180, 37,157,180, 58,147,175, 14, 28, 62,248,157,205, 55,213,190, 85, 31, 95, 79,229, 39,255,176, 51, 79, 23,250,201, 70,189,
+184,255,232,213,151, 55,186,112,  6, 42,250,186,130, 50, 48, 90, 27, 13,202,160, 34, 57,179,195, 25, 91,212, 77, 55,116,188,217,
+ 94,122,109,137, 83,155, 40,  1,167, 41,247, 89,132,  8,135,161, 13, 64,  5,247,110, 78,178,116, 61,177,242, 60, 79, 44,147, 88,
+210, 75,251, 70,150,132,254,111,139,192,229,109,236, 68, 93,154,174, 26, 94,102,110,133,190,180,164,139, 72,145,124, 14, 81,132,
+ 95, 98,191,  5, 51,223,237,249,217,189,230, 65, 85,218, 33,184,189,239,127,135,  1,217, 31,232,112,  7, 81,238, 32,212, 28,206,
+170, 92,148, 13, 35,  5,203,102,181, 56,115, 35,201,170,178,243, 72,123,125,254,233,182, 95,197,227, 57,216,246,168, 63,  2,176,
+117,237,188, 77,  4, 65,120,119,239,124, 15,159, 45,192, 66, 66, 66, 81, 66,133,228, 14,209,210,243, 27,248, 49,252, 40, 36, 10,
+ 36, 26, 10, 26,144, 64,208, 64, 65, 42, 10, 64, 74,128,  4,251,226,123,236,238, 28,243,216, 61, 95, 20,183, 41,114,150,207, 59,
+251,205,204,247, 56,228, 79,160, 71,162, 79,136,203, 76,240,122, 97,157,145, 54,148,151, 70, 98, 84,144, 32,160, 33,241, 44,125,
+226,109, 79,  7, 80,170, 25, 24,103,240,118,130, 78, 66,138, 44,209,  9,166, 50,117,161,167,243,164, 85,218, 60, 26,211, 15, 41,
+ 39, 56,228, 42,113,100, 62, 24,210, 12, 17,164,227,195, 50, 26,143, 26, 71, 51, 21,151,233,124,149,151, 13,123,151, 83, 95,207,
+154,204,203, 14,171,144,155,210, 23,167, 29,137,  9,235,181, 24,  9, 68,195,  6, 96, 74, 79, 70,197,157,230, 71, 16,  5,174,209,
+ 46, 80,143,203,213,240, 61,  4,204,190,127,165,195,112,221,185,108,212, 51,242, 48, 86,140, 93,185,190, 15,170, 40, 42,  0,184,
+149, 53,203,116, 88,205,204,162, 34,147,181,139,198, 54,141,223,118,110,107,135,148,181, 42,  8,234,232, 12, 25,213, 88, 26,172,
+ 19,172,198,159,115,134, 53,221,244,148,145,198,164, 13, 46, 76, 57, 23, 64,128,192,142,111, 98,  8,159,  4, 51,117,251,229,112,
+136, 16, 28,127,  4,246,  6,135,215,199,131,138,192,168,110,252, 31,141, 95, 44,126,122,126,  5,252, 20,172,227,121,138, 72,149,
+196, 13, 91,175,111,151,  6,159,126,135, 18, 63, 84,221,  2,226,122,114,150,199, 18,223,251, 77,131,  5,142,150,230,206,233,188,
+ 76,158,172,205,219, 47, 29,145, 96, 85, 71, 26,182,148, 60, 73,200,234,202,119,117,219,139, 59, 13, 45, 64, 96,159, 99,175,167,
+ 93, 36, 37, 55, 88, 31, 53,219,248, 97,234,110, 35,188,137, 69, 62,111,218,157, 92,178,226,140, 33,193,214,154, 55,144,235,163,
+135,223,126,158,142,  6,  3,136, 62,128,206,147, 99,181,234,164,203, 34, 59,123,207,  5, 55,201, 16,152,103,243,127,216,180, 49,
+ 87,159,174, 28, 86, 23, 19, 67,201,164,253, 96,203,188, 36,147,119,112,109,239, 76, 72,104, 74,184,161,227, 25, 50, 64, 71,190,
+193, 18, 42, 43,195, 21, 16, 14, 28, 94,146, 23,155,115, 41,185, 51, 66,255,212,144, 99,109, 74, 88,198, 38,113,173,172, 25, 20,
+ 99,121, 50,209, 83,140,109,165,103,152,103, 69,211,119,  8,192, 19, 51,206, 75,201,112,172,181, 45,169,220,216, 51, 85,155, 48,
+254, 18,226, 38,243,141, 76, 28, 55,106,209,212,104, 97,103,208, 98, 10, 47, 75,159,155,236,211,230,227,203, 87,235,167,207, 31,
+ 31, 63, 83,199,223,149,122,173, 94,188, 81,159,223,113, 65,199,127,184, 84,197, 66,109, 87,170, 58, 82,229,137,154, 63, 80,219,
+  5, 54,227,234,146, 56, 58,170,134, 24,242,240, 91,185, 51,122,131,254,212,119,231, 80,218,254,204, 34, 34, 81,143,238,249, 95,
+ 95,179,247, 63, 62, 20,139,226,  2, 79, 38, 30, 84,168,123,187,179, 88,200, 60, 35,248, 65,  2,248,212,223,152,112,171,199,192,
+142,152,131, 53,  4,192, 29,166, 43, 58,246,154,  3,109,167,174,132,205, 44,228,118,233,146, 98, 16,121, 12, 41, 13,156,132,195,
+ 56, 87, 31, 54,139,218, 91,167,139, 81,182,158,232,155,166,147,156,138, 83,195,124,  8,126, 18, 50, 36, 11,172,233,190, 55,188,
+182,228,251, 92,235,101,118,247,126,117,146,233,  4,209,231,204,232, 42, 73, 72,225, 55,120, 34,115,187,157, 37,198,  7,109, 40,
+ 33, 46, 77,115,102, 51,  0,253, 61, 60,143,146,255, 44, 64,160,197, 95,179,221,187,177, 18,136,201,112, 19,223,130,255,  2,240,
+117, 45, 43, 78,  4, 81,244, 86,117,119, 30, 61,  9, 72,102,227, 66, 65,130,224, 98,112,163, 32,110,117, 47,204,191,  8,126,135,
+ 59,191,193,133, 11,127,193,165, 56,138,160, 48, 40, 35,131, 48,142,200,204, 36,147, 73, 63,210,169,174,242,158, 91,213,157, 68,
+163,100,151, 52, 73,167,187,250,214,169, 91,231, 17,211,223, 46,233, 77,139,166,  1,221, 46,141,134,221,152, 65,  7,131,169,101,
+ 81,151,226,127,100,100,224,  0, 52,148,182,215,211,113, 47, 78, 19, 60,233,194,  6, 68, 94, 71,109,161, 34,173,140,231,146, 55,
+ 22,222, 24, 33,248,218, 40,241,  0, 88, 82,143,133,224, 79, 49,220,151,163, 46,  5,115, 18,  9, 42, 99,244,103,165, 67, 98, 61,
+213,141, 95,121,101,124, 11, 51,130,248, 21, 93,207,201, 34,115,155,230,253, 62, 99,175, 86,107, 74,128,128,  2, 84, 35, 71,195,
+101,117, 43,107,157,246,118,  7,  1, 83,211,161, 10, 35,175,169,236,193, 82, 74,109,198,115,175, 85, 39,215,198,251,233, 16,  7,
+  7, 49,231,110,143,174,167,  4,130,115,  2, 74,242, 36, 51,211,194,152,218,101, 96,110, 40, 24,244,105,156,205,229, 18,237,151,
+172, 70,205,202, 25,253,242,191,171, 85, 21,213,120, 71,171,126,196,104, 23,164, 73,254,152,167,251,185, 36,114, 84, 82,196,189,
+  9, 96,235,  2,171, 27,127,  5,221, 88,  4,254,103, 17,167, 27,176,127,150,195, 70,198, 98, 23,142,171,182, 36,183,147,202,132,
+222, 88,201, 26,135, 47,245,180,112,195,142,222,233,168, 65,140,248,150,108,233, 58,206, 14,186, 90,172,207, 16, 36,194,247,134,
+  7, 99, 94,216,209, 72, 63,190,155,188,253, 58,156,149,243,190,112, 60, 22,170, 22,178,128, 18,179, 95, 89, 19, 73, 67, 65, 38,
+ 19,193, 88, 54, 56,198,216,127,158, 42, 20,118, 69, 85,240,184, 75,187,169,  3,209,190,210, 62,210, 90,135, 92,133,163,211, 35,
+237,181,158,242, 80, 26, 36, 57,162,107, 27, 76, 10,208,187,117, 50,234,160,207,232, 36,128,210,243,226, 42,231,179, 83, 94, 60,
+142, 59, 31,235,196,  8, 98, 66,251,168, 50,211,249,133, 95,  8, 74, 82, 36,194,  2, 69, 76,132,190, 33, 79, 54,240, 62, 91,148,
+109, 84, 24, 32, 28,143,101, 18,217, 25, 86, 15,104, 78,241,193,105,146,206,197,144, 32, 18, 78,142, 48,146,176, 76,212,232, 82,
+198, 18, 69, 73,124,161,248, 52,203, 69, 33, 27,113,106, 52,216,253,121,121,170, 20, 53, 38,240, 94, 80,167,252,102,178,108,  9,
+104,201, 68,209,181, 18,205,151, 22, 91,204,200, 54, 59, 22,209,166, 57,182, 79, 50,230,121,109, 49,142,110, 63, 25,223,251,240,
+134, 62,190, 54,183,246,226, 59, 15,104,255, 33,237, 39, 84,126,163,131,247,244,234,144, 14,142,233,199, 39, 60, 36,123,215,232,
+233,125,122, 52,166,195,239,244,252, 51,125, 41,104, 86,224,122,246, 98,234, 39, 52,118, 52,208,148,101,145, 41,237,137, 57, 63,
+166,217,203,201,187,204,156,188, 24, 63,187,162, 95, 23,230,204,113,173,128, 49, 60,244, 96, 40,234,198,120,218, 50,186, 82,160,
+ 32,121,141,143,171,125,113,183, 27,142,233, 98,173, 38,185,185, 62,230,172, 53,116, 20,180, 14,178,140,167,185,120,245,169,183,
+121,160, 16,226, 22,  4, 76,106,187, 30,201,173, 90,230,219,114,157,236,202,177, 75,181, 40,104,237, 64,145,170,  6,255, 59, 21,
+  2,151,218,254,140,183,114,193,210,186, 19,245,111,238,220, 64,224,156,173,167, 37,215, 45,168,115,178, 69,150,155, 60,119,133,
+ 16, 23,204, 18,218,115,161, 80,132, 95,102, 68,215,225,239,180,212, 78, 30,202,254, 25,249,233, 54,201, 35,158,219, 97,183,154,
+ 27,254, 22,128,175,115,201,109, 34,  8,194,112,245, 99, 38,126,202, 50, 65, 66,113, 36, 47, 96, 11,130,236,179, 68, 57,  2, 43,
+ 46,195, 89, 56,  0, 59,174,  0, 11,118, 44, 88,102, 69, 20, 65,236,196,143,177,199, 51,211,211,244, 95,213, 51,118, 12,194, 43,
+143,101,201,182,220, 83, 93, 93,245,215,247,219,163,159,231, 35, 26,173, 77,117,144,188, 15,236, 32,108,188,121,185,128,180, 28,
+152,141,186, 53,206, 52,124, 60, 44,181,217, 85, 69,106, 59,195,164,103, 48,166,148,132,108, 60,188,178,241,224, 14,161, 35,  4,
+ 42, 52, 11,  4,209,144,147,217,237, 26,101, 39,199,202, 72,175,170,198, 77, 37, 73,176,248, 43, 87,132,229,123,  2,211, 33,221,
+ 81, 54,220,135,137,177,125,211, 13,111,219,241, 16,105, 31,156, 44,179,113, 57,  1,127,232, 76, 52, 97,244, 45,240,171,193,229,
+ 55,213,153,182,235, 28,185, 13, 13,230, 76,237,133,236,205,253, 29,207,217, 38,198,159, 56, 72,211, 36, 80, 94,235,  3,245,123,
+189, 39,151,237, 63,135, 53, 35,173, 49,192,184, 75,207,186,186, 99,244, 34,119, 55,179, 85,200, 27, 87,  5,106,217,165,104,210,
+ 21,221,151,108,147,196,119,100,136,170, 27, 31,215, 20, 68, 68, 21,157, 66,152, 10, 30,192,150,183, 84,168, 89,224, 90, 19,169,
+ 32, 82, 24,205,155,191, 79,146,142, 84,120, 34,205,165,250,111,124,151,145,232,140,149,  4,180,  3,249,125,105,168,163,177,235,
+244,172, 87, 78,175, 65,115, 11,151, 62, 69,183,136,182,  5,142, 88, 42,129,156,166,130,173,171, 46, 93,200, 58,116,146, 64, 11,
+180,132, 95,  5,106,106,191, 22,245,244,137,121,253, 60,251,242,195,185,122,  7,221,125,136,174,140, 78,172,100, 76, 79,217,144,
+ 40, 24, 45,182, 69, 42,213,166,223, 27,206, 55, 15, 92, 54,255,135, 70, 82, 75,109,194,176,153,136, 39,112,228, 33, 30, 71,247,
+ 90,243,209, 82, 11,  6, 35, 82,191, 27,251, 49,199,193,221,199,184,200, 64,107, 60, 11,159, 59,234,141,102,171,185,  4, 92, 82,
+123,161, 49,250, 64,117,180,152,  8,247,228,126,164,202,235, 19, 54, 15,130,188,129, 15,133,231,227,179,249,234, 30,197,163, 40,
+164,149,236,221, 75,183, 41,234,153,163,174,221, 51,156, 68, 73,172,138,213, 61,163,197,106,205, 69,192,  1,101,187,109,200,217,
+195,106, 71,149,209,251,223,203, 91, 81,216, 42, 29, 15,211,202,183, 54,  5,178, 63, 98,  8, 46, 77, 13,204, 44, 13,203,190,164,
+136,233, 35,231,218,183,227,245,210, 16,197, 94,128,250,232, 91,125, 69, 51,186,120, 69,182,178, 63,239,252,231, 53,208, 75,250,
+130, 38,239,168,119, 69,239,183,244, 33,101,166,228, 29, 13, 39, 68, 47,216, 14,228, 27, 93,126,164,211, 27,122, 40,168,204, 17,
+146,173,165,169,162,243,  1,217,156, 38,117,242,102, 60, 29, 61, 37, 26,189, 12,203,241,251,245,237,167,235,175, 89,150,  1, 39,
+ 84,243, 68,138, 43, 75,100,219,152, 63, 18,176, 61, 34, 49,179,167, 35,192, 53,198,232, 70,185, 46, 39, 96,109,135,157,225, 12,
+253,176,118, 50, 72,250, 26,184,232,166,253,188,100, 17,111,156, 21,138,194, 62,223,114,255,234, 67,165,137,218,247, 66, 93,132,
+179,180,105,240, 33,225, 69,132,121,234,175,201,166,182, 24,163, 30,  9,103,226, 87,229,147,152,151,178, 54,183,237,205, 89,111,
+218,181,221,220, 21, 69,177,201,171,245,182,200,178,114,131, 25,204,176,172,208,243,130, 85,153,228,  1, 45,152,139,181,209,149,
+ 63, 40, 67,248, 71,165,254, 99,233,189, 68, 60,117, 36,162, 60,120,252, 17,128,174,115,217,109, 34,  8,162,104,245, 60,108,207,
+248,145,  4,226, 36, 44,128,  8,177,  1,133,143,224,255,216,243, 63,176,100,197,  2, 33, 33, 69,  8, 17, 34, 75,129,120, 60,182,
+123, 94,221, 83,116, 85,247, 60,156,129, 40,203,216,138, 60,237,234,238, 91,183,238,  9,  6,135,119,175,105, 97,185,158,126, 28,
+ 76, 11, 37,247,213,158,167, 41, 45,191,150, 39,110, 28,225,136,161,215,154,130,  0,169, 49, 71, 88,216,145,117,187,231,164,202,
+ 58,101,141,220,  5, 94, 75, 35,199,166,153, 73,239,168, 41,216,215,188,  9,157,151, 66, 70,104, 19, 22, 93,216,216, 50,106, 28,
+205,  2,210,157,  3,  2, 78,170,163,113,108, 46,198,102,181,236,170,122, 17,154, 47, 69, 48,245,188, 31, 85,106,205,174,162, 25,
+104,199, 65,154, 35,118,213,204,239,225, 12,123,180,141,166,184,163,149, 62,193,113,208, 68,235, 22,117,131, 95,206, 32,201,151,
+112,225,242,156, 45,207,189, 21,232,161,203, 76,137, 71,248,108, 33, 38, 30,252, 73,242,155,173,202, 56,248,220, 82,210, 38,252,
+130, 77,115,254, 39, 35, 74, 83,175, 85,195,201, 51,229, 40, 99,124,184, 79,169,191,246,  3, 97, 51, 16,255,101,217,252,243,250,
+ 80,117,201,123, 15, 91, 12,194,253, 31,252,168, 70, 99, 45,120,119,137,  0, 18, 13,143,106,140,144, 87,159,192,  9,160, 52,247,
+ 12,237, 73,198, 63,153, 42, 63, 10,234, 88, 11, 41,176, 18,222,227,136, 86,104,161, 97,238,147, 85,197,198, 66,152, 43, 90,174,
+224,118,131, 39, 51,239,237,155,209,199, 47,170,208, 65, 64,210, 56,255,214, 52,183,188, 60,126,178,186,191,157, 78,142,210, 44,
+ 97, 55,121,189,205, 83,218, 23, 57, 80,203,225,138,221,186,167, 30,191, 27, 65, 64, 11,238,230, 91,176,187, 12,123,110,182, 83,
+216,156, 67, 50,170,155,131,130, 15,204,130,101,221,170, 77,202, 67,166,153,115,152, 20,174,119,107, 95,116,114,117, 19, 55, 68,
+219, 69, 60,138,101, 33,205,193, 37, 10,103,210,156, 82,132,179, 36,230, 85, 97,113, 24, 30, 91,209,211,253, 38, 10,199,178,220,
+249,110, 71, 18, 29,  6,172,118,169,208,214,175,231, 55,201,  2,162,109, 14,219,214,129,213,  0,173,218,194,150, 27,115,178,225,
+171, 41, 61,183,249,100, 86, 80,  6,123,  5,173,160, 15,  3, 87, 52, 97,131,158,223,252,254,217,102,247,117, 86,142,238,185, 51,
+ 61, 21, 89,119, 64, 10,155,123,241,242, 66,254,130,175,239,117,116,233, 47, 47,149, 60, 14,239,  3,184, 91,193,135,207,  4,221,
+133, 87,102,213,129, 62,135,250,140,140, 49, 87, 57,173,132,179, 43,184,120,  7,175, 77, 77,218,195,169,  4, 85, 18,205,118,182,
+134,241,  2, 46, 19,120,122, 66,206, 25, 92,193,245, 55,248,244, 29,207,211,249,210, 63,189,243,174,203,202,156,  8, 85, 69,156,
+  2,205,182,  9,170,235,243,120, 97, 62, 73,153,109,173, 71,213,217, 25,109,139,212,105,241,110,200,147,118,134, 44,105, 40,169,
+ 14, 64,203,105,121,244,  4,117,181,173,235,218,241, 54, 28, 10, 21,177,223,151, 28, 28,123,107,151,150,216, 29,127, 80, 60, 36,
+ 45,169,238,187,115, 48,182, 10,240,191,152, 23,207,245,143,144, 69, 26,214,214,166,225, 98, 30, 76,117, 93,202, 34, 77,178,116,
+ 95,237,168,178, 99, 81,146, 15, 78,115, 89,215, 86,117,232,229, 65,  2,119, 28, 88,247,166,122,160, 16,254,  1, 36,233,205,139,
+160, 56, 36, 38, 12,115,104,254, 10, 64,217,181,244, 54, 13,  4,225,125,249, 17,167,110,218,138,148, 74,149, 80,133,132, 84,169,
+ 21,  7,110, 72, 32,113,231,140, 56,241,  7,248,131,252,129, 10,113,  6,133, 19, 66, 66, 37, 60, 42, 90,242,106,146,117,188,187,
+236,204,120,253,128, 92,136,114,137,163,196,246,218, 26,207,124, 51,223,247, 85,252,166,150,137,  7, 39,236,210, 39,218,  0, 38,
+ 49,149,203, 28, 36, 55,157,193,189,129,166, 79,109,120, 20,170, 18,129,227,159,128, 99,246, 85, 26,137, 36, 18,232, 79,  6,  9,
+186, 45,108,185,114, 27, 66,183,209,140,152,217,170, 13, 72,132, 14,  4, 68, 28,244,125, 72,231, 30,185,121,216,157, 16,162, 47,
+ 83, 21,197, 61, 17,251,244,102, 16,103,169,202,246,146,126,132,118,243,183,  6,136,202,133, 43,180,181, 31,110,222, 23,102,189,
+ 44,111,117,169, 87,128,204, 27, 72, 43, 17,157, 51,129,230,214,186, 58,146,179, 70, 36,162, 58,235, 16,220,155, 94, 95, 72,219,
+  5,161,172,142,119, 60, 62,254,230,101,148,172, 38, 54, 87,139, 14,131, 22,254, 89,244,240, 14,247,135,248,237,183, 30, 27,176,
+203,165,132, 58,197, 31,228,248,113,205, 42,141,238, 90, 80, 56,194,  4,188,192,175,106,186,169,106, 33, 45, 46, 72,202, 68,184,
+113, 26,116,  0, 93,219,192,235,127, 94,116,117,146,218,115, 21,223,185,175,193,241,100,102, 72,223,142,112, 93,122,146, 15, 83,
+ 25,  3, 45,  7,135,  3,164, 15,133,160, 65, 28, 71,106, 39,102, 89, 79, 76, 52,215,214,165,177,175,249,164,102, 46,139,248,221,
+129, 92,105,251,118,228, 43, 50, 80,161,180, 80, 13,192, 78,242,236,224,106,250,147,112, 75,188, 37,108, 44, 19,129, 84, 42,191,
+242, 11, 61,195,250,169,163,105, 74,142,101,216, 65, 85,168,103,199,201, 13,149, 83,112,151, 36,198,197,207,142,207, 71,151, 31,
+ 81, 49,  0, 18, 68,128,188, 77, 97, 73,175,  2,139, 47, 18,174,176, 91,132,157,131, 44,  9,103,167,199,167,163,203,145,196,161,
+120,  2,118,169,139,131,101,  4,165,223,156,160,109,116, 53, 35, 43,184,150,217, 47,122,214, 53,142, 63,172,197,100, 85,216,130,
+ 10, 22,175,212, 60,144,149,  6, 31, 54, 89,  5,197,125,199, 27,251,129, 10,159,161, 40,  2,118, 11, 85,191,  1,101,252, 37, 76,
+ 73,196, 10,140,167,163,208,138,192, 71, 14,106,245, 97, 96,243,145,245,232,224,232,251,205, 47, 41,211,149, 53, 79,246,159,190,
+122,254,218,125,102, 23,239,216,245,114,206,119,197,124, 47,233, 61, 86,159,238,177,229, 33, 27,223,103,215,216, 29,145, 57,132,
+ 34,185,131,237,191,146,109,208,212,165, 44, 65,136,194,104,120, 88,100, 95,224,207, 15, 47,216,240,199, 66, 46, 39,143,  6,236,
+217,238,112,104,146,248,138, 69,251,236,197,155,151,160, 71,100, 22,218,128,199,251,198,172,193,148,213,130,146,132, 15,248,132,
+146,161,120,  9,  5,119, 75,209,180,162,239, 87,131, 35,174, 33,124, 54,172, 70,119, 50, 60, 25, 79,190, 10,167, 86,155,101,224,
+ 49,185, 16,227, 29,223, 38, 17, 35,186,  1, 90,213, 51,133,181,111,155, 97, 45,126,  1, 11,170, 94,255, 10, 18, 52,  5, 60,235,
+ 76,181, 66, 25,  9, 51, 51,120,147, 62,216, 61,235,201,120,170,103,211,245,100, 90,204, 97, 58, 28, 86, 14,149, 59, 48,178, 27,
+ 22, 68,231, 27,  7, 40, 81, 35,192,190, 24,182, 13,176,234,186, 56,112,125,144,174,155,179,111,161,179,254, 17,128,175, 43,216,
+109, 26,  8,162,179,107,199,174,211,166,212,138, 67, 10,168,202,169,  8,184,112,226, 27,248, 91, 56,113,227,  6,226,  0,135, 10,
+229,208, 10, 21, 16, 82,154,148,166,212, 73,104,108, 37, 78,118,217,153,217, 93,167,180,106,212, 83,218, 58,214,102,119, 60, 51,
+239,205,123, 53,127,134, 35, 29,247,220, 67,242,159, 96,242,140, 53,  5,183,116, 20,181,105,162,182, 41, 90, 69, 72,151,217,154,
+ 13, 26,187,115, 61,111,170,152, 80,245,159,118,240,138, 16, 66, 94,163, 37,197,186,144,145, 32,103,250, 29,218,245,162,137,115,
+204,191,200,180, 84,162,123, 89,130,158,209, 81, 72, 79, 14,147,235,205, 87,203,173, 16,245, 12,202,117,121,126, 61, 84,220,231,
+211,230,  7,247,201,154,167,226,181,239,174,168, 13,232, 78,122, 76,196, 38, 83, 86,216, 77, 88,  8,220,125,103,210, 14,149,  4,
+174, 52,102, 82,179,251, 53, 39, 92,150, 69, 21,112, 88,151, 78,111,204,124,114, 28,232, 87, 29, 49, 45,170,211,171,197, 72,163,
+223,222, 22,176, 29,166,104, 67,208,134,112, 31,194, 24,  2,162,193,232,192,209,136,149,167,174,187, 45,199, 54, 12, 92, 80, 50,
+ 65,109,225, 28, 42,229,205,128, 46,239,237,195,220,255, 82, 14,125,245, 82,  1, 26,108,161, 72, 58,245,116,176, 77,118, 47,205,
+246, 36,140, 87,154,220,202,132,114,106,223, 43,216,142,112,173, 43, 45, 90,145,164, 32,142,245,118,210, 64,201,201,188,212,205,
+ 40, 56,124, 28, 12,198,166, 64, 71, 61,105,204,214,145,108, 62,167,229, 18,156, 40,241,  0,136, 57,  6, 72, 80, 89, 47,152, 80,
+170,221,172, 56, 53,212,205,  5,227, 56, 76, 20,234,249,112,231, 90,242,240,  4,  7,119, 73,110,179,173,228,193,121, 62,162,126,
+180,224,240,106,174,155,110,239, 61, 63,120, 97,202,  5, 18, 24, 85,155,165,250,109, 64,158, 85, 13,198,132,139, 34, 78,230, 36,
+ 18, 26,102,  7,198,  9,130, 68,146,125, 48,120,128,197,105,118,219,212, 64,120,180,157,155,198,172, 33,101, 91, 56,146,165,174,
+192,254, 51,155,172, 72,166, 90,217, 42,  4,233, 52, 62,100,240, 49,148,126, 48,133,158, 80,246, 15,200,225,132,108, 87,113,162,
+149,253, 45,105, 85,108, 79, 72,215,137, 10,130, 28, 90,181,119, 59,211, 98,182,155,180,170,213,250, 91,249,163,127,122,210,123,
+212,123,249,122,239, 89, 22,159, 12, 71,111,190,190, 63,234,119,207, 62, 54,139, 15,208,253, 12,135, 71,240,244, 59,116,  7, 80,
+ 28, 67,115,  0,242, 18,158,228,144, 77, 97,127,  6,114,  8,105, 14,237, 25,100,127,224,225, 25,180, 74,232,254,154,101,127,  7,
+233,178,104,149, 81, 53,129,172,219,236,127, 82,111,143,223,253,132, 47,230,171,172,112,136,165, 82,106, 97,114,248,131, 78,111,
+ 50,191,178,169, 56,216,148,157, 20,209,184, 45,175,189, 92,162,118, 25,183, 29, 96,226,228, 29,119, 22, 54,169, 39, 69,190, 92,
+153, 35,191,180,145,157,222,215, 53, 55, 92,187, 50, 90,241,193, 20,181, 82,183,205,150,149,135,214, 60, 49,226,102,112,119,222,
+ 78,162, 54,103,178,151,167,123, 23,178,238,146,  9,214,113,145,206, 77, 18,118,162,116,167,145,254,158, 95, 94,148,227, 98,117,
+141, 19,245, 24,214, 81, 20,145,133,114,215,183,192, 94, 79,193,115,181,102,112,215, 67,234, 63, 85,203,205, 27,191,251,236,255,
+ 19,128,180,107, 89,141, 34,136,162, 85, 93, 93,211, 61,143, 30,199,152,  9, 89,140, 16,205, 74,196,141, 31,160,226,175,185,247,
+ 11,  4, 17,247, 46, 93,185, 54,224,194, 69,  4,117, 33, 40, 65, 99,195, 36, 65, 39,244,179,170,171,172,123,235,209, 61,  1,221,
+152, 64, 66,134,153,  9,157,116,223, 62,247,220,115,207,217,194,239,145,179,181,132,241,104,132,248,125, 68,211,200,238,151,163,
+ 56, 73,187, 14, 70,  7, 74, 43,196,128,140, 12,126,143, 13,114,135, 49, 44, 24, 61,226,214,  8,232,128, 96, 81, 70,162,  3, 12,
+ 68,239,  2,198,178,139, 71,176,181,207, 56,222, 66,172, 33,103,232,178,193,238,134, 65, 72,141, 65,241, 28,196,144,124, 39,153,
+101, 60,157,153,207,120,220,116, 32, 35,154,176,184,144, 32,153,253,186, 57,249, 89,252,104, 72, 85,136,202,170, 74, 17,188,119,
+ 22,191,171,208,210, 12,172, 97,131,101,152,173,232, 46,163,202,106, 25,172,106,136,146,225,190,  9, 11,142, 60,219, 93, 26,245,
+230, 85,190,187,178, 30,178, 78,244,125,239,186,190, 44,219,111, 37,152,209,  9,196,224, 55,224, 43,155, 80, 62,101,108,153,240,
+108,196,112, 19,149, 84,162, 91,151,245,169,170,215,  8,198,165, 39,206,148, 87, 64,234,160, 98,244,167,166,229,238, 19, 47,133,
+ 12,124,253,255,127, 88,  8, 63,243,230,209, 18, 31, 73,253, 32, 87, 99,  6,236, 28, 38,191, 52,  5, 89, 12,210,244, 73,148,165,
+113,161, 13,138,103,230, 63, 36,113,236, 14,220, 25,165,215,198,116, 35,  0,249,238,101,156, 19,117,244, 81, 22, 45,199,173, 92,
+108, 68,225,158,161, 23,147,221,245,239, 28, 77,122,240,158,223, 79, 53,224,175,191,152,238,158, 23,103, 12,171, 49,188,171,198,
+ 66, 78, 67,109,141,152, 35,207, 34,159,  0, 76, 44,252,181,  2, 22,137,131, 56,115, 50,152, 26,216,180, 21,166, 20, 56,152,248,
+143,208, 45,139,238,181,207,114,112, 10,228,  8,141, 42,131,105,128,255, 69, 33, 54,  4,187,  5, 84, 86,246,214,132,  3,157, 21,
+190,220,252,124, 23,188,130, 63, 49,127,  8,243, 52, 43,218,146,217, 99, 65,174, 41,118,212,121,160,  4, 67,152, 26,104,170,173,
+ 59, 42,162,126,130,109, 46,112, 57, 49,198,162, 38,144,250, 13,172, 78, 18,143, 76, 85, 45,155, 10, 72, 12,213,  9,123, 90,194,
+115, 98,131, 37,148,185,226, 24,159,243,165,224,217,206,226,224,225,234,193,253,219,183,198,151,148,172,200,231,156,188, 62, 34,
+111,190,147,119,107,114,222,192,200,228,209, 62,121,241,152,236, 31,146,227, 99,242,244, 11,201,  5,236, 64,165, 56, 55, 50,248,
+189,218, 72, 26,199,249,233,179,174,126, 79,165, 52, 61,106,174, 79,110,146,213,243,195,151,175,196,147, 15,228,109, 39,155, 70,
+ 85, 82,213,109, 39, 36, 46,138, 75,200,217,160,158, 70,183,107,250, 78, 12,227, 43,251,  0,185, 43, 11,  0,160,130,163,191,167,
+222,102,225,177,178, 43, 58,208, 80,170,193, 92,245,138,189,163,187,238,195, 77,221,170,126,  7, 89, 60,122,192,114,248, 94, 98,
+ 40,221, 33,  4,166,250, 32,151,170,163,158,225,141,168,175,239,230,251,114,186,119, 81, 92, 28,100,119,170,166,254,213,158,  9,
+105, 42,187, 64,216, 14,132,140,196, 72, 45,218, 59,157,245,178, 28,218,187,141,219, 89, 11, 40,209,174,176,  5,  1,194,119,189,
+ 96,244,111, 42,120, 23, 58,251, 71,  0,210,174,158,199,105, 32,136,238,174,215, 73,156, 68,145,149,112,210, 17, 14,  9,116,208,
+156, 78,208, 32, 81,242, 63,104,169,248, 63,252,  5,106,232, 40,105,169,168,  0,233, 36,160, 57,133, 40,185,187, 92, 32,216,103,
+123,189,187,120,102,118,157,181,116, 29, 77, 26, 75,246,198, 31,179, 51,111,222,188, 39,  3,244,222,189,244,194, 45, 26,177, 41,
+ 35, 80, 29,193,205, 68,  7,145,221, 32,146, 69, 19, 64,244, 81, 69,160,137, 97,193, 76, 41,  6,240,  8,204,110, 13,150, 33,174,
+ 98, 50, 70,250, 23,182,246,163,183,216,122,173,177,197, 23, 65,163,192, 64,235,174, 89,127,243, 25,107,173,  5, 58, 27,247, 56,
+ 74, 76, 88,147, 87,170,121, 53,155, 42,190,168, 85, 18,129, 99, 95, 89,215, 23,229, 26,242, 45,237,228, 28,218, 17,247, 54,156,
+ 11,170,196,  3,209, 89,238,104, 14, 12, 60,216,155,179, 85, 55,248,177,220, 18,220,197, 62, 39, 11,117,195,237,254, 73,208, 45,
+172,247,162,241, 66,200, 36, 73,231,209, 74,170,250, 71,174, 46, 16, 96,161,204,125,200,226, 52,146,211, 88,142,250,189, 81, 44,
+239,140,123,195,158,156, 12,161, 52,105,182,190,159,171,237,135,197,242, 79, 23,  3,162,180, 61,246,203,214, 62,203, 14,241, 28,
+ 27,244, 81,217,127,164,240,161,221,171,242,160, 60, 93,165,194, 75, 12,168,188,168,217, 13, 90,209,  1,166,219,148,216, 70,228,
+202, 54, 91, 84,191,199,210, 62,208, 32,147, 65, 44,192,130,153, 77, 71,160, 10,112, 52,225,219,204,236, 10,115, 47,141, 94, 60,
+225,159,206,212,213, 78, 34,231, 27,147, 99,101,198,131,209,102,135,217, 28,210, 73, 45,221, 86, 20, 67,  7, 36,170,200, 56, 12,
+160, 97,177,199,200, 63,119, 31,220,133, 15,238,212,207, 60, 61, 58, 57,223, 44,104,248, 48,108,136,  1,191, 86, 87, 17, 50, 97,
+ 45,187,205,146,178, 91,204, 24,214,106, 28,  5,146, 82, 22,169, 61,200,121,231,126, 13, 36,161, 74,178, 82, 26, 39,156, 34,154,
+ 46,117, 50, 57, 45,173, 13,253, 14,224, 87,127, 93,124,227,222,251, 25,212,154,203, 76, 58,134,140, 19,248,243,  2,226, 94,177,
+199,135, 39, 65,172, 74,218, 94, 64, 41, 83,180,217,232,241,193,195, 95,215, 75,234, 65, 22, 85,145,151, 57, 53,154,155,243,207,
+167,119,149,209, 89,145,111,243, 93,205, 81,216, 66,216,195,116, 86,100, 42, 22,234,119,181,126,191,254,248,174, 60, 27, 76, 30,
+245, 78, 30, 63,125,205, 94, 50,246,170,121, 16, 11, 86,156,179,106,195,230, 15,112,128,181,121,250,111,216,120,197,138, 37, 43,
+ 11,150, 41,216,155, 19,104,113,200,195,132,149, 92, 76, 71,227,249,232,224,120,120,255,249,236,153,144,234, 75,246,246,251,245,
+231, 26,192,247, 38,172, 43,141,251, 44,128, 18,181, 73,199,179,139,191,151, 52, 51, 76,164,117,227, 38, 81, 41,131,164,  3,220,
+ 77,106,  2,158, 71, 17,188, 69,105,168,111, 71,154,191, 64,157, 33,219, 88, 78,226,164, 93,251, 99,219, 25,241,244,182,124,172,
+163,  4,105,130,208,215,133,221,157,129,134,222,251,122,216, 28,153, 51, 12, 21, 34,249,126,202,160,149,200, 96, 87,187,203,113,
+ 63, 77,120,188,211,151, 32,196,133, 36, 25,237,152,251, 45, 33,217,134, 14, 80,193,166,  2, 98,109, 18, 97, 73,239,187,106,195,
+127, 67, 58, 90,164, 91, 97,131,234,189,171, 93,220,241, 12,252, 39,  0,107,231,178,219, 52, 16,133,225,185,216, 30,199, 78,226,
+ 22, 10,165,  8,161, 62,  3,139, 46,120, 25, 94,139, 37,111,196,162, 72, 32, 36, 42, 65,202,  2, 87, 81, 72,115,105, 98,123,108,
+206,109,156,132,148, 29, 81,165,180, 73,164,168,118,226,249,207, 57,255,124, 63,234,247,142, 55,245,136, 92, 37, 46,145, 52,223,
+141,211,131,150, 40,213,158,122,  8, 60, 47,165,181,200,244,  6,121,124,153,138, 83,234,188, 99,110, 31, 72,239, 78,215, 32,162,
+113,226, 74,  2, 66,241,201, 32,158,144,198,253,153,134,121, 44,178, 95,143,150, 26, 45,248,172,  8,123,171, 54, 53,206,226,238,
+ 77,  7, 66,222, 26,208, 26,249,216,229, 32, 21, 46,242, 98,228,178,170, 37, 83,104,167,103,213,252,122,122, 13,127,173,155,213,
+  6,249,145,176,  2,192,227,148,236,138,135,221, 51,225,236, 40,156, 80,139,167, 14,107,  8,211,246, 93,248,191, 46,238,  1,243,
+164,118, 11,117,215,203,187, 29,178, 57,212,142, 92,184,213,190,123,158,214,175, 35,255,241,119, 61,161,167,115,165, 78, 48,243,
+ 50, 26, 42, 59, 76,146, 83,135, 16,241, 81, 26, 63,201,220,137,179, 89, 10, 85, 79,148,184, 56,119,238,211,143,242,253,231,111,
+183,161, 33,222,236,184,162,  7,200, 80,191,247,123,171,254,243,205,132, 66,161,143, 39,244,225,227,146,135,137,238, 25,117, 22,
+224, 48, 17,239, 13,189,171,121, 98,139,212, 34,224, 63,141, 94,156,198,195, 60,201, 51,168,182,116,221,242,188,203,223,206,177,
+130,126, 54,178,137,233,190,223,109,191, 76,212, 67,133, 29,  5,248,238, 38, 81,190,220, 44,224,108,250, 86, 98,183, 58,145,171,
+193,  9, 18,218,134,134,105, 92,134,119,222, 17, 45, 82,235,224,134, 52,180, 37, 42,110, 48, 41, 59, 24,194, 41, 98, 38,252, 52,
+ 12,218, 38,246,168, 14, 37,151,121,108, 26, 33,155,239,246, 69, 17,188, 60, 27, 96,222, 27, 69,213, 82,111,136, 17,129, 28, 42,
+ 98,130,233, 26, 86,  0, 79,  3, 32, 41, 32,122,242, 49,251,226,  9, 65,134, 66,158,147,163,120,157, 96,215, 52,179, 74, 20,255,
+ 95,134,161, 66,130, 65,166,110,142, 16,195, 25,197,129, 21, 51,110,134,209,246,188, 56,159, 46,202,152,  2,213, 99,236,211, 68,
+130,139,162,113,  5,232, 34, 12, 80,136,226,213,118, 93,121,166, 22, 97,208, 13,172, 14, 89, 60,178,105,161,  7,227,139,179,203,
+233,160,176,195,203,229,187, 55,221, 21,158,253,140,252,178,124,104,120,160,252,150,150,252,151, 74,221, 83,186,223, 56, 20,118,
+219, 27,165, 75,245,245,195,204, 46,126,150,139,201,116, 57, 89,173,126,149,203,155,106, 51,127,168,239, 53, 58, 35,177,219,214,
+ 32, 55, 15,223, 31,196,156,181,182,  2,  9, 47, 78,198,  3,217,222,  6,156,191, 72,240, 86, 80, 18,129,249,200,121,184,140,  9,
+225,187,110,127, 10,202, 19,176,227,207,243,129, 70, 22, 37,175,205, 63,119,165,118,125,241,197, 23,247, 71,113,145,189,103, 90,
+115,136, 41,158, 20,164, 17,192,117,252,169,123, 21, 41, 55, 91,223, 85,104, 59,104,200, 73, 47,240, 90,105,133, 28,216, 61,132,
+ 40,105,  4, 95,193, 53, 58,245,222, 48, 75, 67,242,255,142,205,145,158, 47,170,123,148,227,227, 20, 86,184,253, 17,128,180,243,
+217,141, 34,134,193,120,236,204,159,150, 86, 80, 21, 36,  4, 18, 92,184, 32,193,123,240,162,188, 15,170,122, 68, 28,128,  3,162,
+162, 91,137,161, 59, 51, 59, 73, 76,108,199,217, 89,177,112,161,199,149,186,187,218, 36,158, 47,246,231,159,155, 53,220, 18,172,
+158, 92,146,134,236, 85,239, 70, 23,146,253, 63, 21,181,238,141,236,228,100,156, 87, 62,215, 93,223,100, 73,221, 54, 76,187,242,
+ 75, 62,215, 50, 27,126,209,180, 65,  1,218,203, 33, 75,226,224, 46, 95, 83, 59,212,192, 28, 46,178,190, 76,217,113, 49, 75,248,
+  4, 17, 35,242,236,160,162, 89,206,217,118, 73,195, 50,183,200,175,245, 30,  6,246,183,177,199, 70,202, 51,  4,171,103, 87,185,
+ 35, 75, 67, 24,185,  2, 77,198,125,239, 22,157,250, 62, 58,246,229,122,172,  5, 85, 51, 90,232, 52, 10,239,106, 35, 34, 88,213,
+  1,172, 73, 11,214,  8, 55,208,217,188,156, 21, 58,111,233,213,  9, 93,221, 46, 95, 14,179,219,169, 96,165, 64,141,150,186, 66,
+ 81,124,178, 83, 98,244,101,254,149, 95, 63,127,242,110, 51,188,255,126,179,252,125,158, 64,252,247,156,129,255,254,211,  2,  0,
+154,138, 39,219,115,218, 72, 37, 45, 24,220,125, 49, 74, 51, 86,240,138, 63,163,187,153,141,230,151, 15,120, 23, 13, 63,221, 48,
+132,132, 35, 47, 55,184,190,243, 79, 31,250, 51,223,237, 28, 78,  1,186, 14,159, 61,238,193,207, 95, 55, 83,190, 10, 76,115, 92,
+150,169,237,152, 13, 56,134,172,178,217,254,152, 86,160, 36,172,192, 12,177,252,169,121,154,  7,177, 49,231,  7, 76,165,138, 48,
+225,150, 40, 30,193,155,131,192,155, 23,111,175, 63, 95, 31, 57,233,218,226, 80, 64,244, 71,131,187,208, 79,156,171, 79, 25, 13,
+ 54,  8,138,170,241, 26,217,197, 63, 99, 74, 90,  0, 27,145,193, 14, 30, 20, 96,230,107,185,181,186,170, 20,134,196,205, 64,143,
+ 78, 46,182,229,134,129, 21, 30,162, 59, 72,154,114, 69,130,217, 36, 79,132,242,244,  0,117,130, 74,221, 72,221, 59, 58,111,103,
+154,239, 85,141, 53,168,216, 19, 41,223,162, 87,235,111,  2,156,195, 18,118,247,202, 25, 37,185,100, 36,150,100,110,160,109,155,
+176, 73,205,143,120,183,227,116,232, 54, 95,208, 90,  9,238, 23,178,202,193, 50,132,121, 39,124,144,154, 80, 29,215,154,172, 78,
+ 51,191,116,191,110,220,101,248,216,208,167,184,124,163,233, 54,205,155, 51,207,231,159, 33,249, 92, 77, 25,153, 91, 17, 25,212,
+147,248,246,144, 35,125, 16,218,163,148, 85,247,163,149,162, 24,124, 84,150, 23,122, 12,213,240,103,  1, 55,169,129, 18, 76,240,
+ 27, 29,125, 29,230,254,220,207,110,159,127, 47,110, 81, 49,152, 31,121,182,211, 62,230,146, 49,120,235,155, 38, 50,247,115,101,
+190,144, 25,237, 20,214, 47,183,139, 28,155, 78, 39, 30,237, 29, 37,123,145, 76,122, 83, 53,192,172,146,131, 88,219, 35,209,224,
+ 19, 34,121,139,255,221, 36, 63,154,143,191,140,244, 51,122,246, 33, 10,248,112, 64,180,126,240,111,  1, 88,187,154, 30, 39, 98,
+ 24,154,143,105,102, 58,165, 93, 78, 11, 23, 96, 17,  7,126,  3, 63,157,223,129,144,246,178, 28, 88, 86,136,  2,210,150, 85, 59,
+ 31,137,109, 18, 59,153,153,178, 92,144, 56,244,218, 78,218,212,126,182,223,123,174, 30,101, 54,  9,183, 70, 84,189, 17, 16,141,
+104, 49,109,134, 69,153, 34, 10, 73,147,241, 74, 50,218,173, 84,188, 25,117,109,156, 44,221,102, 58, 60, 72,114, 14,137, 64,144,
+ 80, 19,187, 47,165,196,171,203,130,158,136,238,185,151,138,217, 28, 25, 40,195, 99,173,165, 70,139,225, 97,149,  6,113, 38,130,
+194,117,213, 56,110,233, 59, 27,159,  4, 15,190,107, 42,183,117,171, 14,194,215,211,158, 83, 71,234,240,240,237,161, 51, 10,131,
+144,222,121,105,134, 85,122,134,107, 60,152, 26, 89,166, 40,193, 93,205, 36,119,230, 50, 76,140,167,121,210,117,182, 86,187,204,
+ 85,160, 96,  3, 70,124,164,157,133,183, 45,221,221,251, 79, 52,183,179,153,253,162,211,104, 20,233, 68,193,122, 14, 48,241, 56,
+ 62, 36,115,165,213,170,117,105, 90,227,185,201,244,238,229,179,247,223,246,119,229,231,161,127, 71,223,248,159,162,188, 47,234,
+243,233, 58, 58,190,107, 93,249,159,199,115,213, 48,  3,212,135, 62,213,117,245,  0, 93,114, 56,128,129,153,112,163,210, 79,172,
+185,  1, 60,  2, 93,236,220,213,139, 93,117,185,113,201, 45,128,126,245,240,227,190,135,180,119,189,103,148,143,236,107,222,140,
+195, 22, 23, 66, 66,185,149,200,170,102,177,213,125,117,121,117,251,253,179, 22,167, 10, 91,  5,240,231, 78,242,233,245,225,246,
+ 35, 77, 11,238,105, 46,191,165, 64, 39,203,241,  3,181, 82,127, 74, 71,152,141, 76,187,205,211,211,216,249, 48, 44, 11,252,228,
+121, 98, 68,147,196,171,103,121,190, 43,244,253,  8,234, 83,143,145, 39,251,172,108,207,159,147, 85, 57, 32,205,244,140, 50,145,
+ 38, 41,202, 52,201, 86,188,232, 74,192,163, 97, 65, 32,137,199, 36,  9,114,143,159, 72,197,172, 90,106, 24,149, 57,241,235,166,
+237, 67,207,134,198, 74, 38,204,233,  1,197,118, 54,247, 51,112,187,190,136, 23,125,127,248, 25, 47, 88, 83,183, 15,125, 47,121,
+200,135,163,  1,235,253,218,232, 77,107, 67,215,100,239,129, 41,130, 83, 33,110,185,146,239, 67,145, 73,203, 25, 14,149,242, 17,
+223,169,158,146,192,124,  0, 58,198,247,140, 85,142,135,227,128,  3, 98,204,224,254,205,243,215,215, 95,174, 37, 58,163, 40,121,
+184,151, 14,  5,210,241,124, 85,100, 91,210,101, 21,193,142,206,106, 84,181,  8,238,  2, 19, 97, 38,213, 76, 64, 27,255,158,204,
+231,216, 87, 36, 79,147, 46, 73, 47, 67,124,153, 88,210,180,218, 20, 23, 86,  4,180,216,165, 76, 89,195,104,178,139,112, 81, 60,
+148, 58, 35, 30, 13,120,191, 92,210,  9,201,206, 45,207, 61,106,200, 13, 15,181,240,163,199,210,111, 81,101,136, 71,133, 70,142,
+ 37, 42,155, 34,233,101,  7,142, 89, 57,191,240, 62,127,148,165,166,111,227,183,  0,188, 93,217,138, 19, 81, 16,237,253,102, 98,
+119, 50,163,204,188,  9,234,147,248, 46,204,255,255,130,  8,163, 32, 34,130, 66,204,100, 72,199, 94,239, 82,222,170,186,213,139,
+224,171,121, 10,233, 78,210, 27,117, 79,157,170,115, 74,230,107,207,205, 88,226,130, 70,  0,214,127, 82,101,207, 26,221,210,148,
+ 72, 38,125, 56,131,192, 56,168,166,224,158,109,114,212,163,  1, 14,203,242,207,142, 70,230,157,213,196,150, 35, 60,155,162,145,
+143, 54,142, 28, 18,120,109,197,231,145, 87,196, 12,255, 63, 39,215,  5,244, 12, 81,200,143,251,228, 32,247, 17, 33, 33, 30,201,
+255, 90,145,160,234,201,127,231,208, 62,142,168,143, 53,228,170, 25,156, 65, 23, 66, 84, 50,117,140,236,196,187,185,116, 30, 35,
+190,104,  1,226,158, 36,  1,137,212,187, 26, 74,104,139,224, 62, 91, 23, 70, 11, 67,186,197,229,  5,148,155,194,219,202,194,  0,
+ 31,140,155, 56,141, 92,174,185,142,200,168,129, 56, 23,159,113,116,104,157,108,154, 81, 59, 80,123,163,174, 84,161,242,164, 79,
+161,218,109,223,228, 87, 71,221,233,245,125,250,111,175,100, 22,195,204,  7,  0,194, 11, 49, 23, 63,202,123,110,236, 81,180,245,
+201, 68, 30, 37,110,123,116,181,234,184,182,147, 68,247,175,170,215,213,238,203,247,250,225,212,124, 62, 14, 31,143,191,222,191,
+236,238,223,189, 80,185,186, 45,157,238,205,227,197, 12, 35,244, 62,141, 71,237, 68, 84,170,230,122,227,195,194,222,206,144,  4,
+111,211, 93,117, 87,183,104,229,232, 33,238,183,195, 87,210,  7, 98, 67, 75, 89,148, 79,221, 73,122,131,161, 82,101,171, 59,170,
+113, 34,200,183,206, 73,137, 19,130, 45,123, 64, 93, 41,214,237, 50,122, 72,157, 72,224, 41,224, 98,  7,206,246,249,239,238, 60,
+104, 61,233,172,226, 80,142,103,  9, 85,204,154,211, 20,163,123, 74,185,116,202,  0,139,134,  6,161, 37, 47,238,234,113, 73, 94,
+212,221, 57,150, 21, 38,118, 65,217,124,233, 46, 41,213,123, 28, 19,228,137,204,119, 96, 77, 44, 15, 15, 34,246, 63,100,137,212,
+ 51,130,132,123, 26,198,128,208,216,136, 44,232, 83,208, 42, 33,144, 60, 42, 43,252, 97,105,107,216,152,229,166,188, 62,156,209,
+232,248,220, 94, 60,136,198,129, 36,102,240,225,227,118,119,243,179, 62,161, 11, 20,234,108,253,238,117,220, 23,102,179,135,125,
+184,203, 78,202,245, 83,233, 30,100, 81,119,178,213, 73, 29,  8,181,236,121,227,244, 48, 36,126,157,238,117,220, 27,104, 70,172,
+169,142,168,195,183,238,225,199, 39, 75,229,106,114,  1,243,192, 20,229,166, 86, 90, 99, 32,204, 45,148, 22,199,136,243,183, 24,
+214,225,149, 64,186, 19,228,190, 10,238,240,183,192, 52,134, 69, 67, 36, 44, 92, 72,215,132,124, 88,238,197,157, 10, 38,238,154,
+173,132,220, 63,166, 59,196,100,103, 68,150,104,161,218, 27, 44,139, 57,183,192,243,193,193,201, 38,  4, 98, 58, 57,114,133, 76,
+ 41,196,195,170, 88,154, 36,139,122,128,168,142, 24,188,199, 11,207,152,160,172,164, 84, 46, 97,134,124,170, 40,202,218,  3,130,
+ 59, 87, 65,227,143,  0,164, 93,203,174, 19, 49, 12,205,107, 30,109,  5,213,189,176, 64,226,249,  9,  8, 22, 44,249,113,126,  2,
+116,247,  8,177,132, 75, 75, 31, 51, 77,147,140,137,237, 36,147,  1,177, 64,108,186,105, 43,205,211, 62,182,143,207, 49, 53,234,
+145,  9,191, 39, 90,161,162,253,130, 70,175,182,237,131,  1, 35,142,135,172,107,138, 44, 23,109, 90, 21,171,237,190, 69,173, 49,
+ 69,143, 38, 18,102,128,146,179,199,250, 11,239,176,  7, 46, 37, 66, 18, 82,229,168, 95, 13, 52, 96, 54, 75,198,178, 18,  1, 55,
+170,148,181,189, 89,181,186, 51, 58,  6,190, 22, 45,107, 72, 77, 44,222, 97, 39,156,119, 83, 39,250,221,101,199, 91,112, 49,169,
+224,155, 44,195,146,239,143,245, 65,144,243, 52, 67,213,115,106, 38, 66,228,174, 84, 78,105,152,152,117,145, 60, 73, 62, 44, 75,
+223, 38, 33,235, 97, 53, 93,177,137, 20, 40,167,151, 27,215,131,188, 59, 94, 79,203, 68,202, 12,247,142,182,144, 77, 44,168,145,
+ 73, 16,107, 17, 19, 79,227,108,245,238,108,187,198,172, 59,115,211,247,183, 27,251,124,187,126,250,112, 45,238,199, 50,228,252,
+ 87,220,253,255,200,253,207,135,154,195,253,149, 62, 59,  2,245, 70,204,138, 16,150, 14,149,233,243,  7,218, 40, 26, 41,177, 61,
+154,196,187, 23,143,135,189,212,147,238,165, 54, 16,190,  9,241,225,235, 73,  5,255,254,205,179, 39,219, 94,  7,231,172,255,124,
+143,221, 89, 79,176,103,196,197,200,177,105,208, 90, 10, 42, 26,238,247, 35, 78,228,  8, 53, 19, 74, 69,140, 60, 93,236, 96,175,
+140,169,105, 39, 49,  4, 73,146,144, 32, 19,155, 23,112, 48,176,161,221,209, 19, 36, 10, 75,122, 49,  9, 29,107,252,163, 33, 35,
+123, 90, 73,154,136, 48,126, 28,142,125,183,114, 62, 76,105, 73, 27,168, 45,206,172, 69, 94,183, 82,166, 65,199, 27,110,255, 55,
+216, 54, 12, 49,214,143,151,145,193,125, 32, 95,208,211,104,137, 86,  0,153,250, 46,147,  9, 56, 97, 28, 82,184,  9,200, 31,200,
+107, 42,236, 39,137,106,249, 44,  9,204,134,145,148,126,222,190,122,253,241,203, 39,198, 25, 44,105,198,238, 96,241, 66,236,135,
+ 61,181, 43,177, 93, 67,182,101,120, 76, 68,  5,145,232,248,193, 12, 32, 82,245,163, 79,216,157,127,132, 65,225,142, 48,102, 35,
+167,128,252,215, 20, 56,105,101, 55, 55, 94,124,149,221, 67, 53,234, 47, 95,133, 34, 39,105,196, 32, 14,241,178, 93,221, 79,239,
+ 15,224, 35,132,191, 32, 27,114,194,233, 34,189,149,116, 66,121,148,154,204, 80,127, 11,238, 18, 82, 95,102,182,208, 75,248, 20,
+184,245, 41, 67,222, 71, 77,172,235,186,139, 34, 23,189,153,100, 75, 93,100, 99, 75,181, 84, 65,248,202,193,174,244,100,114, 36,
+ 88,130,247,153,226, 82,  9,177,135, 34,147,147, 15,131, 71,112,248,203, 49, 28,214,234, 70,179, 41, 20,225, 37, 86,226,128,121,
+154,  5,101, 21,174,236,190,179,245, 16, 69,164,176,244, 69,224, 99, 69, 75, 84,154,202, 96, 16, 86,137,181, 41,179,116,229, 95,
+ 85, 36,127,  9, 64,219,181,236,182, 13,  3, 65, 46, 37,133,166, 29,167, 45,140,246, 80, 32, 31,208, 75,255, 31,232, 71, 20,254,
+130, 32,  1,146,160,201,193, 41, 18, 61, 76,241, 81,238,131,178, 20,163,232,169, 62,217,134, 97, 75, 48,185,156,221,157,157,153,
+234, 51, 58,157,134,127,104,121, 33,139, 95,102, 68, 26,125,177, 53,117,222, 63,132,226, 35, 77, 79, 96, 50, 13,200,102,169, 61,
+182,174,124, 67,147,129, 52,136,136, 11,215, 67,224,  3,172,200,161,192, 98, 76, 88,204,  6,227,212, 48,164,173,130, 58,128,141,
+202,176,221, 92, 86,118, 83, 27,219,172,242, 79,215,128,202,101, 67,242, 53,112, 20,143,249, 54,195,232,186,208,147,224,115, 32,
+124, 83,  8,250,114,108,104,214,100, 39,191,122,173,102,138, 38, 32,212,119, 62,117,150,242,  3,160, 97,154, 88,152,212, 36,164,
+231,174,225,196, 88,129,146, 39, 73,250,120,  1,233,235,102, 52, 40, 76, 17,111,206, 78,123, 45, 68, 37, 84,113,233, 81,189, 18,
+ 83, 84,163,198,118, 84,228, 21,170, 45,210, 61,171,167,186,189,106,170,231, 67,142, 44,222,252,203,187,236,127, 63,194, 76,193,
+ 38,204,240, 90, 85,162, 60,148,125,174,203,165,118,180,157,248,126,  7,122,153,159,223, 63,116,119,143,238,230,181,251,165,198,
+182, 64,254, 31, 15,195,102,253,252,253,219,103, 99,204,151,173,187, 61,184, 21,160,221,171,163, 53,209,121,117,149, 94,183, 54,
+199,101,227,252, 80,209, 88, 32, 18,185, 82,153,  7,  5,214,117,200,112,182,202, 57, 16,205,162, 51,193, 70, 93,239,174,247,119,
+123, 42,157, 49,106,143,111,125,142,236, 49, 71, 58, 47,224, 48,125, 92,127, 58,244, 47,121,  1, 99,243, 93, 56,113,129, 92, 88,
+164,152, 51,  6,231,250, 35, 85,232,133, 10,201,170,113,100,161, 85,163, 29, 60,202,250,194,218,174, 35,149, 34,173,181,249,139,
+114,112, 71, 88, 39,166,247,242,233, 24,211,  4,168,120,228,157, 61, 56, 53,235,169,176,140,158,204,210, 39, 45,147,250, 28,194,
+ 88, 78, 65,214,243,207,219,189, 46,189,246, 98,  1, 71,254, 89, 74,203,186,149,172, 62,102, 60, 68,181,239,124, 17,225,241,247,
+ 19, 17, 13,240, 62,115, 16,111,143,125, 98,135, 71,224, 65,197, 64,188, 51, 18,140,136, 99,254, 47,194, 12,155,167, 25,242,157,
+120,214, 97,249,102,152,130,190, 70,241, 18, 31,143, 65,185, 10, 25,  6,152, 85, 19,216, 11,156, 87, 75,109,134, 58,112, 65,184,
+164,177, 68,244, 36,202, 36,212,141, 59, 67,238,  4,165, 33, 74,203,252,228,207, 33, 65, 45,190, 15,238, 11,186,204, 92, 57,125,
+ 14,225, 23, 33, 62, 45, 26,176,103, 29,218,119,243,162, 92,162, 81,197,  4, 91,151,194, 60,159, 88, 25, 79, 66,235,219, 15,171,
+ 93,229,204,136, 18, 36,172,174,195, 78,147,211, 81, 14,133,197, 23,197,147,141, 34, 76, 69,244,177,101,146, 33, 41,228,101,179,
+179,176,165,213,133,214, 68,111,225,101, 32,  3,  8,152,198,143,254,242,248, 35,  0,107,231,178,219, 54, 12, 68, 81, 82, 15,218,
+146,163,192,104,131,124, 67,182,253,255,125,209,101,251,  1,237, 38,221, 36,139,214, 54,100,189, 40,146,229,157, 33, 37,202,105,
+129,  2,109, 86,206, 34,128, 95, 33,103,238,220, 57,183, 72, 54,  2,164, 92, 68,136,144, 97, 41,103, 57, 31,196, 94, 59,163,100,
+177, 43, 75, 27, 37, 34,190,238, 74,138,164,232, 33,193, 33,103,  0,161,243,188, 38, 72, 16,  6, 35,102,148, 86, 38, 39,205,125,
+ 85,171, 13, 21,188,203, 65,156,241, 10, 35,217, 92,115,172,225, 41,112, 88,203,157, 63,234, 17, 73,157, 83, 82,154,179,190,163,
+158, 51, 27, 51,111,241, 12, 59,221, 66,228,130, 89,  1,154, 23,111, 54,111, 69, 55,201,213,204,  6,189, 22, 61,154,110, 77,205,
+102,255,123,  0,199, 71, 78,253,162,227, 80, 83,193, 37,188,115, 27,137,155,134, 98,117, 57, 42,171,125,163,235,239,161,239,227,
+ 60,253,  1,214,169, 67,217,235,104, 40,109,174,150, 83,133,178,157,152, 47, 70,214, 98,  6,129, 64,200,111,151,190,128,188,251,
+127,204,236,255,126,202,155, 45,225, 64, 38, 30,158, 57,185,192, 92,194, 75, 88,164,207,147, 16, 31,159,127,182,189,123, 17,232,
+105,122, 94,237,167,  7,159,190, 94, 62, 60, 61,188,107, 84,215,169, 59,133,204,194,110,194, 95, 93,169, 15, 56, 15,226,253, 97,
+170,212,227,235,117,140,192,253, 40, 89,130,159,133, 19,113, 95,213,254,235,119,246,  5,163, 11,104, 76,255,141,252,252,252,133,
+  0,  3, 75,239, 12, 71, 35,168,150,133,210, 19, 11,140,114,208,157, 63,214,154,234,216,235,126,176, 67, 93,214,135,125,115,238,
+ 78, 68, 72, 15,104,217, 56, 74,147,156,195,141, 98, 27,197,126,112, 21,208,134,105,174,141,190,111,142,151,211,143,234,112,215,
+247,131,115, 87,114,185,132, 49, 79,  0, 27,210,232,192,  5,141,134,105, 30,172,241,145,194,206,196, 91,164,254,100,252,171, 63,
+ 17,203, 44,143, 82, 69,120,201,100,  2,229, 52, 67,123,139,127, 77, 54, 94, 12,165,253, 21,249, 78,155,214, 81,250, 10, 93, 94,
+142,114, 73,194,214, 63,145,  0, 12,225, 10, 51,  7,235, 51,146,143,208, 55,137,  9,239, 90, 39,178, 35, 26, 47,187,  1, 82, 37,
+166,227, 55, 71, 63, 30,251,150, 11,131,115,  4,121,249,154,125,  4, 56, 22,139,140,112,  4, 74,  2,  9, 56, 54,221, 17, 83,121,
+217, 72, 93, 53,235, 16,226,196,154,187,189, 25, 25,146,158,141,232,207, 56, 78,180,113,110, 97, 23,196,192, 95, 15,169,100, 90,
+140,187,223,252,159,218,219,141, 80,241,134, 58, 25,102,179,249, 90,179,218,104,152,  8,159,154,191, 44, 95,167,151, 90,221,219,
+105,212, 46,  4, 29,175, 86,203,224, 85,225, 35, 40, 95, 52,119,210,159,253,203,212, 34,193, 80,176,131,182,204,171,166,120,108,
+253, 13, 10,118,  5,212,191,210, 23,132, 66,181,216,150, 49, 78,164,227,222,219,159, 95,  2, 16,119, 53,171,109,  3, 65,120,215,
+146,108,139,216, 77,  3, 33,161,167,190, 64,233, 59,180,167, 62, 70, 46,125,221, 60, 67,160, 16, 26, 72,156,196,114, 44,237,127,
+119,190, 89,173, 54,200,144, 99,133, 14, 90, 73, 24, 44,217,179,179, 51,223,207, 98, 62, 83,101,235,176,138,250,156, 26,245, 46,
+105,132, 53, 52, 59,145, 19, 94,252, 14,154, 94,164, 57, 88,221,123,211,144,150,250,  2, 76, 29,233,125,  2,163, 50,118,141,200,
+ 20,212, 72, 73, 69, 79,152,127,195, 56, 61, 33,219,208, 60, 18, 64,228, 74, 73, 50,173,245,186, 93,180,219,213,217,166, 33, 75,
+ 26,212,155,200,238,117, 73,102,194,130, 49,180,129,156,198,234,222,190,106,172,  1, 33,122, 99,121, 86,241,185,148, 38, 67,142,
+207,114,210, 81,224,148, 60,100, 13,119,206,226, 25,166, 70, 97, 55, 73, 65,101, 38, 34,115,190,  2,106,174,128, 75, 84, 35,190,
+136, 93,184,200,220,119,231,134, 99,160,133,177, 84, 78,222, 91,119,178, 81,169,199,182,164, 66, 98,219,225,237,146, 44, 48,250,
+121, 74,184,189, 32,169,189,191,193,220,217,193,121,179, 46,212,193,254,251, 86, 38,110,182,216,203,171,254,253, 48,111,183,131,
+122,147,230, 30,198, 64, 22,191,215, 22, 59,169, 99, 90,179,109,235, 47,159,215,159,214,139, 87, 77,170, 62,140,203, 84, 32,121,
+253,121,222, 61,119, 15, 85, 33, 43, 61,225,195,240,255,142, 17,249,233,176, 99, 23,245,180,128,147,233, 26,178,198,204,148,161,
+212,105, 48,241,241,135,186, 33,  3,169,222,168,111, 95,191,247,230, 24, 15, 72, 75, 61,184, 93,247, 24, 99,125,226, 81,195, 20,
+ 75, 22, 84,151,  9,153, 90,213,151,219, 43, 86, 93,103,172,138,182,250,199,207, 95, 55, 55,191, 73,158, 27, 90,103,163,120,189,
+103,231, 55, 10,175, 84,143, 79,190,160, 24,142,158,114,228, 85,128, 41,135,162,158,133,183,215,  5,119,146,199,184, 28, 92, 81,
+122,  6,220, 65,102,110, 71, 96,181,176,145,165,153,134,193,239,135,206, 56,191,172,150,117,211,196,143,182, 40,119,163,102,234,
+ 57,151,143,183, 94,111,175,192, 12,167,243,103,146,186,194, 72,147,  6,255,144, 22, 94,101, 19,213,191,143,239,161, 56,159,146,
+253,131,128,130,152,118, 49, 66,196,231, 64, 96, 54,130, 70,131,179, 34,192, 48,116, 72,232,208,155,152, 36, 32,120,121,159,147,
+247,178, 58, 30,194, 36,227, 88, 20,162,253,137, 90,162,252,168,153, 52,187, 95,206, 85,210,229,200, 83, 45,130,123,152,243,223,
+240,252,171, 25, 93, 34, 41,149,142, 40,105, 58, 84,230,160,108,183,169,206, 27,177,106,128, 67,169,208, 82,132,239, 10,107, 41,
+ 50,151,  3,241,141,104,100, 13,220, 44, 77, 81,231,200,174, 21,148, 26,111, 98,110,237,148, 10,199, 65,244,111,225,184, 15, 47,
+ 90,168,149,104,165,200, 98,181,167,237, 72,254,  9, 64,221,149,181, 56, 17,  4,225,234,238, 57,122, 66, 68, 16, 23, 22, 87,196,
+  7, 87,217,255,255, 55,244, 77,124, 19, 49, 32,235, 34, 43,230,154, 43,211,221,118, 85,117,205,225, 38, 63,192, 48, 15,129, 73,
+ 66,152,169,233,170,174,250,142, 89,127, 70,  9, 71, 54,169,233,226, 17, 11,234, 22,186,231,122,157, 36,155,113,117,203, 99, 60,
+149, 56,222,153, 18, 39,223,137, 46,160,232,110, 97, 76,134,211,116,176, 42,199,200,166,239, 56,142, 87,159,202, 97,170,217, 51,
+145,  1, 34, 61, 13,163, 43, 99,109, 22,143,202,154, 34, 94,164,248,  4,173,139, 50, 51,170, 69,154,128, 26, 51,126,252,176,205,
+244,183,223, 27,212, 81, 30, 18,169,205,177, 38,  0,117,250,148,231,237,111, 80,139,161,203,130,164, 56,210, 70,216,101,129, 41,
+198, 50, 88,215, 51,174, 80, 26,184,178,121, 34, 40,217, 12, 81,143,167,110,247,141,131, 28, 53, 83,212,137,  0, 52,143,231,128,
+228,110,198, 21,202,102,158, 94, 67,122, 66,  2,139,182,139,247, 30,182,200,220, 76, 18,242,191,126,237,  2, 60,131,240, 26,224,
+ 65,100,109,214,148,240,226,117, 56,212,238,229,149,137, 85,248,221,117,181, 63, 14, 77,127,170,125,154,220,162,127,144,135, 23,
+225,164,209,121, 16,198,174,198,  8, 84, 35, 48, 10,138,248,139,  3, 61,109,120,  5,210,166, 70, 45,232,212,170,195, 55, 85, 97,
+223,223,220,125,250,250, 49,190,255,178,249,236, 37,241, 59, 44,219,137, 79,197,195,216,  9, 35,177,116, 17,  0,170,123, 73, 60,
+152,161, 89,100, 78,169,110,223,221,190,125,115, 19, 51,135,106, 91,198,224,251,148, 84,  8,  3,152,148, 16, 19,153,144,218,238,
+220,113,  8,101,110, 87,101, 44, 98,202,109,253,136,153,192, 13, 15,219, 95,198, 36,135,193,212,169, 16,196,  8,241, 55, 21, 76,
+187, 24,166,110, 98,216,242,184, 49, 11,169, 90,231, 42,125,219,237,145,120,  2, 30,  9, 70, 26,122,100,176,106,242, 89,192,122,
+248,126,123,159, 68,247,156,219, 13,141, 14, 22,207,184,206,255,112,240,193,184, 21,  9,103,202,130, 56,142, 88,189,100,110, 33,
+177,211,169, 63, 16,126,198,250,166,246,174, 15,204, 99, 66, 12, 17,146,223,226,162, 78, 94, 17,248, 64,217, 60,111,250, 99, 72,
+183, 70,114,103, 26,103, 94,138,113,181, 68,115,159,161,224,235, 75,219, 92,  5,151,202,122, 79, 66,128,  0,255,234,137, 79,218,
+192, 50,  6, 16,240,226,164,180,110,230,139,238, 19,212,188, 26,117, 17,200,172,244,224,118,189,238, 42,179,118, 62,111,209,193,
+163,163, 95,195, 37, 94,115,  7,132,102,123,132,171,137,203,102,167, 96,145,227,130, 96,199, 99,244, 54,254,224, 67,255,106,117,
+189, 57,126, 63, 98,255, 18,227,101,128,161,  0,125,238,159, 44,230,200,127,  5, 96,238,106,122,155,  6,130,232,206,126,216,110,
+156,224,208, 74,149,104,225, 16,137,123,213, 11,255,255, 14,247,246,208, 72, 28, 64,  2, 10, 74,101,133,184,254,216, 93,118,102,
+118,157,164,177,212, 43,214, 30,156, 68,177, 44,199, 25,191,121,243,230,141,156, 42, 18,143,102, 23,158,102, 58,239, 56,117,146,
+209,153,149,219, 89, 17,149,140,189, 61,108, 90,144,  1,202,156, 53,232, 92,209,  6, 42, 71,246, 60,227,150, 16, 45,101,161,179,
+ 51,147,151, 38, 47,100,166,  2,112, 80,212,179, 18,178,103,148,202, 20, 69,248, 28,248,171, 26,195,187, 14, 32,221,177,110,183,
+ 67, 41, 61,150,212, 10,109, 22, 89,118,183,185,175,251,154, 48,145,165, 17,125, 14, 68,170,132,251,189,254,157,248,211,180, 72,
+217, 25,113,183,136,156, 37,202, 35, 61, 22,167,232,127,197,220,187,  2,230,231,233, 53,141,203,149,144, 12, 35,165, 63,144,142,
+186,254,201,242,232,188,240,228,149,189,197,122, 85, 63,133,124, 33,197,250,140,118,114,218,105,211,213,239, 40,156, 53, 73, 89,
+188,196,185,178,174,125,205,180,253,255,223,198, 59,239, 59, 21,117, 62, 21,250,166, 52, 55,115,179,154,235,183,134, 76,195,123,
+191,125, 14,153,143, 60,175,138,  0,228,223, 24,201, 88, 99,108,208,237,112,104,134, 76,195,181, 64, 28, 81,164,110,102,102, 23,
+139, 11,155,170,116,204, 50,243, 26, 34, 58, 65, 32,140,  3, 46,177,207,206,214,207,219,207,235, 47, 88,155,194, 84, 76, 41,242,
+ 37,163,158, 12,224, 70,153,171,229,149,135, 81, 85,125,132,220, 35,142,  4,255,167,126,172,202, 37, 51,174,225,200,187,182,121,
+247,254,250,238,126,173,149,161,218,166,229,188,129,207,202, 71,184,126, 80, 76,140, 45,177,120, 71,182, 67,187,217,110,126,109,
+127, 14,142,  1, 59,113,184, 86,240, 64, 34, 23,121, 21,239, 34,117, 29,165, 23,251,188, 36,206,140,181, 92,180, 28,162, 33,  7,
+219, 15, 34,144,178,100,144,110,165,187, 93,221,146,231, 62, 54,254, 97, 83, 10, 75, 38,227, 67,144,246,  2, 74, 34,147, 71,247,
+184, 25,214,113, 24, 64,159,150, 77,112,126,244, 61,221,171, 36, 67,164,121, 16,226,199, 55, 84, 81,180,168,107,  7,228, 74, 99,
+ 69, 12,128,156, 42,209,114,202, 54,168,  7, 63,188,164,  7, 50, 18,214,140,158, 88, 68, 76,  6,254,201,112,246,242, 93,152,  6,
+239, 47,155, 81, 38,192,126,116, 84,190, 62,255, 32,246,161, 83,194,  9,215,122, 26,220,147,107,  2,147,236, 60,164, 51,164,134,
+ 77,109,127,239,252,147,130,144, 39,205, 43, 89, 45, 68,149,163,109,254, 25, 78,142, 17,170, 23, 93, 39, 26, 39,  7,141,253, 10,
+224,197,177,190, 59, 61,205,195,137,125,253,251, 80, 22,229,106,241,241, 82, 94,206,208,247, 47,252,  4, 93, 43, 58,251, 90,144,
+248, 39,  0,117,231,182,219, 52, 16,132,225, 61,186,177, 13,137,170,150, 11, 42,212, 62,  0,188, 61, 55,136,247, 64,189, 65,164,
+ 82, 15, 18, 80, 16,161,137, 15,233, 30,216,153,241,172,237, 40,226,190, 55,201, 85, 36,219,177,199,179,179,255,255,253,192, 23,
+  3,  7,188,214,121,238,142,152, 71, 20,110,177,109, 48,253, 93,165,174,166,243, 56,136,215,193, 28,169, 72, 41, 58, 40, 94, 69,
+ 21,163,114, 32, 71,208,146, 93,227, 56, 94,212, 11,232,247, 11, 75, 30, 13, 24,222,128,235,136,112, 72,  5, 40, 32, 65, 97,153,
+154,160,133,133, 22,190,178, 69,109,109,159,150,153, 70, 35,133, 20,158,137,116,  9, 74, 93,244, 97,119,187, 91, 55,190,193,251,
+213,121,152, 26, 57,156,238,  5, 94,203,230,204, 23, 37,102,208,125, 78, 44, 33,249, 48,158,220,  0,153,149, 36, 63, 98,222, 44,
+ 23,247, 33,133,143, 93,106, 98, 34,135,212, 16,109,177,253, 30, 92,186, 40, 43,244,218, 47,141,252,235,252,195, 76, 90, 51,248,
+ 63, 45,127, 90, 86,145,103,178, 85,110,210, 45, 43,109, 46,140,126,242,254,241, 24,202,249,101, 21,119,197,180, 28,133,166,199,
+206,133,203,165,249,112, 85,191,174,204,222,249, 90,203,247,151,103, 17,156,154,162,178,250,231,159,125,223,186, 38,181, 18, 92,
+223,211, 15,223,106,191, 90,190,163,244,115,252, 31,137,194, 75,113, 23, 49,245,164, 77,191, 19,135, 30, 98,122,198,198,222,141,
+ 68,229,103,175,206,211,247,105,125,218,236,183,114, 48, 56,229, 97, 15,201,207,197,166,123,242, 33,240,248, 64,114,133,136,196,
+ 25,133,233, 12,205,101, 48, 26, 84,161,103,214, 40,123,179,254,246,233,243, 71, 99, 77,  7,122,121, 96,249, 58, 76, 67,167,  9,
+  5,  1,138, 38, 70, 88,153,181, 52,168, 96,192,249, 62,199, 62,241,238,127,230, 68,146,163,107, 28, 45, 18, 35, 89,242,254,208,
+ 96,175,206, 64,193, 97,227, 48, 98, 24, 59,141, 98, 32,203,227,246,215, 29,197, 78,167,195, 47, 79,234,214,245,145,182,105,137,
+239,  0,168,214, 19,101, 10, 91, 46,125,117,161,244, 27,115,  5,150, 69, 55,217,104,205,197,221,115, 71, 79, 37,242,249, 94,184,
+ 47,194,175,175,213,230,235,243,230,183,104,182,  1,102,149, 45, 38,164, 57,230,133, 16,217, 33, 78, 24,140, 81, 78,172,129, 98,
+ 80,194, 28,228, 19, 77,251,119, 57,  7,160,207,248,134,135,244, 94, 57, 74, 36,245,127,150,  6,199,114, 17, 60, 67,135,218,126,
+139, 80,150,105,252,222, 81, 39, 84,148,226,128, 92, 34,199, 91, 47,230, 35,  9, 88,139,119, 93,108, 91,200, 51,238, 61,228,172,
+182,132,128,167,205, 97, 52,249,207,234,186,156,191,120,210, 59,243,177,251, 97, 84,185, 42,210, 27, 98,145, 42, 42,174,  3,100,
+ 24, 55, 68,142,159,235, 63,  1,168,187,182,157,182,129, 32,186, 55, 59, 77,104,  8, 60,208,170, 18,226,153,255,255,137,126, 67,
+ 69,197, 19,138,  8, 36,160,160,166, 54,182,119,183,123,102,102,227, 77, 40, 18,175, 60, 70, 74, 34, 39,246,206,206,158, 57, 23,
+247,  6,202, 18,103, 21, 35,156, 30,176, 79,250,216,190,248,237,169, 93, 80,103, 16,200, 64,208, 87, 90, 64, 31, 27, 13, 90,122,
+116, 73, 16,142, 76,109,218,154,160,111,  4,163, 17,166, 37,232,228,233,219,112,207, 77, 85,243, 64,125,162,106,166, 51,167, 23,
+ 21,184, 16,169,202, 79,210,250,169, 93, 21,180,133, 60,218,185,129, 36, 27, 14, 42,246,190,143,205, 67,243,148,174,164,  7,239,
+138,  9,239,  3,101,103, 19,244, 42, 99,105,137,213,166, 39, 95,120,  9, 58,167,120,240, 17,222,240, 48, 87,237,215, 84, 97,  8,
+124, 32, 59,102,139, 72, 35,120,124,161, 16,139,148, 67,251,220, 55, 92,181, 29,232,252, 49,245,239,247,225, 56, 11,166,112,150,
+144, 49,203, 73,198,106,116, 46,127, 54,243,205, 61,128,105,100,218,190, 32, 47,233, 19, 23,247, 61, 95,222, 21,167,218,157, 82,
+ 63, 55,221,175, 77, 55,179,  8,122,189,254, 54, 63, 59,173,119, 67,183,152,187,202,186,171,139,233,114,221,106, 28, 57, 35, 99,
+244, 88,159,  6,220,108,203,200, 24,235,131,198,243,153, 30,217,191, 33,254,151,228,201, 86,  0, 44,106,222,252,121, 52,218,157,
+185,122, 86,127,109,250, 93, 96, 53,  6,147,169,181,112, 55,210,251,102,147,105,186,227,127,219, 93,177, 40,228,137,192, 20,201,
+ 99,131,110,251,214, 56, 75,158,236,254,203,124,246,176, 94,165, 98,218,189,190,126, 63,255,113,187,252,237,105,120,233, 67,  6,
+156,217, 41, 69,123, 97,138,101,143, 99, 60,248,184, 54, 82, 52,167,143, 88, 43,225,163, 81,154,184,160, 89,140,141, 71,155,236,
+ 54, 99, 58,105,122,204,169,104,146, 74,243, 88, 75,173,143,165,253,140, 11,125, 47,  6, 44,176, 90,231,246, 63,255, 85,176, 98,
+ 29,124,104,219, 78,139, 50,212,178,201,119,  4,131, 17,212, 84,184, 96,109,159,204,242, 89,173,207,135,203,241, 20,165, 10,102,
+100, 41,159, 70,173,191, 81, 97,181, 84,219,149,106,218,212,137, 34, 82, 52,253,150, 33,251,170, 49, 14,197, 59,105,216,187,173,
+137, 91,119, 12, 35,176, 30, 63,144, 66,147,225, 24,157,173, 87,162,201, 75,201,239,177,241,162,198,187,247,123,255, 80,152,164,
+190,125,  3,  5,174,136,184,172,184, 36,173, 15, 34,250,120, 34,170,195, 17,101, 39,199, 35,141,114,170,  3,119,163, 88,112,240,
+205, 33, 45,103,244,184,213,227,230, 97,178,241,  0,186,213,212,200,222, 53, 55,196,163,135, 87,247,128,230, 93, 16,148, 80,132,
+ 61, 28,245,133,255,  4,160,238,218,122, 26,132,161, 48, 45, 48, 96,211,105,162,137,137, 79,190,251,255,255,142,111, 62,168, 35,
+139,  3, 39, 12,218,218,115, 43,133, 45,123,247,117, 25,201,202,224,235,233, 57,223, 37, 59,235, 34,145,120,155, 93, 58, 45,245,
+254,148,223,113, 60,230, 52,219,116,155,194,135,  6,143, 84, 84,119,192,189,  6,207, 94, 96,185,128,249,  5,122,103,120,168, 78,
+201,189,128,138,165,222,239,  7, 73, 94, 17, 95,145,163, 42, 93,231,108, 14, 38,131,128,203, 37, 36, 97,102, 21, 26, 28,156,172,
+ 45,210,236, 38, 47, 70,127,222,211,246,164,125,105,212, 66,168, 49,132,136,128,255,190, 95,234,  0, 20, 76,199,165,151,154,  8,
+ 45,  0,148,150,111, 35, 91, 41,187,192,137,228, 14,186,230, 84, 48,222,153,131,  4, 77, 12, 63, 21,201,141, 39,112,215,145, 47,
+167, 70,123, 98,  3,  2,243, 28,241,218,255, 98, 36,111, 44,221,248,149,160, 91, 41, 97,243,133, 52,151, 49, 86, 16, 30,129,181,
+144,220, 59,252,194,147,210,159, 88,188,255,107,112,143, 95,155,149,  0,125, 41, 82,222,202,232,231,109,249,250,242,112,232,129,
+107,219,118,182,200,211,205,166,120,188,171,186,222,102,237,112, 76, 44,181,176,238,171,245, 97,248,165, 35,151, 75,196,130, 95,
+207, 76, 60,221,196,164,152, 89, 49,  5,232, 71,132,135,203, 61,222,213, 77, 93,100, 43, 55,146,146, 84, 97,150, 29, 22, 27,252,
+ 38, 66,242,159,236,253,209,114,176, 16, 70, 77, 40, 20, 89, 96,104,101,212,  8, 62, 42,197, 79,211,228,171,220, 12,102, 63,212,
+187, 67, 13,202, 22,235, 33, 14,  6,254,200,140, 68,211, 91,  8,228,145,198,185,150, 88, 32,197,  3, 29,129,120, 84,120,187, 32,
+198, 83, 46,114,202,165,217,147, 65,242,177, 34,242,  3, 52,135, 52,123,233, 40, 49,165,214, 44,124,159,124,187,144,169,236,175,
+ 99,172,151,128, 59, 98,  9,225,  0,  3,  3, 41,140,213,227,  8, 41, 92,205, 62,169,119,238, 29,240,125,140, 90, 25,106, 62,110,
+181,193,207,238,173, 79,190, 62,244,241,219,246, 39,232, 52,140,230, 54,201, 90, 88,141,225, 67,148,101, 30, 35,181,165, 22,149,
+109, 48,  3,176, 60,222,188, 50,113,114,129, 79, 98, 46,139,181, 85,252,255,207, 92,  0,231,109,153, 40,170,240,202,179,235, 22,
+ 26,168,179, 70,141, 90,140,123,195,169,194, 73, 60,212,178,218, 72,162, 83, 86,  4,202, 65, 64, 29,115,199,137,  5, 43,  1, 74,
+ 49, 89, 73, 99,227,177,119, 51, 55, 99, 78, 46,188,184,160, 63,  1,152,187,150,228,166,129, 32, 58, 31, 73,182,113, 28, 39, 44,
+ 96,145,170, 28,129,251, 95,133, 19, 64,130,171,136, 13,182,132, 52, 51,141, 94,247,244,100,100, 10, 42, 75,188,151, 74, 37, 89,
+ 79,253,121,159,130,239, 73,193, 48,147,114,212,205, 39, 50, 81, 28,241, 27,  3,178,151,227,157,191,221, 80, 11,170, 98, 52,146,
+ 76, 45,123,204, 14,234, 58,150,111,107,215,199,121,144,124, 35, 96, 75,234, 37,147,208,105,220, 41, 89,191,243,110,203,177,174,
+ 93,211,108,154, 53,236,191, 29, 93,220,144, 58, 64,194,224, 71,156,184,113,241, 28,224,230,141,121,106,138,234,180,137,218,  2,
+ 66, 16,202, 70,  4,164,227, 42, 80, 93,184, 29, 76,172,113, 20,104,118, 69,131,154,115,180,115,130, 37,115,132,140,171,182,234,
+206, 72,227,162, 91, 54, 86,130,147,179,175, 61, 14,205, 95,164, 83,232, 99, 81, 43,128,152,109,175,220,154,189,114, 69, 68,222,
+205, 17,113,188, 95,117,218,243,102,127,145, 76,137,154,207,179,181,118,254, 90,124, 65, 81,246,134, 90,230,255,254, 57,157,164,
+175, 52,159,228, 29,168,119,  8, 41,220,111, 87,159, 30,223,223,221,223,124, 62,124,223,128,207,146,154,134,186,174,189,191,233,
+250,159,211,140, 18,109,140,107,107, 31,118,237,184,218,247,163,167, 44,117, 70,189,154,149, 43, 28,218,158,201,138,204,185,207,
+ 10,226,180,192,  7,158,186,113,227,  6, 16,  5,150,131, 16, 57,245,128, 83,140,245,163, 70, 70,136,120,146, 71,  4,214, 26,251,
+ 71, 18, 51,169, 61, 30,  8,237, 60, 35,151,247, 57,128, 45,246, 43,140,  1,  6,124,132,132, 34,120,115,128, 21, 19,120, 12, 27,
+ 24,192, 95, 35,128, 22,105,192,202,124,150,160, 75,167,174,153,185,126, 39, 53,234,192, 95,153,173,253,  4, 33, 19,251,237, 19,
+ 47,168, 37,251,143, 62,238, 63, 60, 29, 15, 62,123, 85,139,255,129,208, 16,193, 88,  6,239,221,  6,201, 96, 16,201,104, 33,255,
+138,211,152,229,156,139, 38, 26, 63,198,230,114,246,167, 23, 58,196, 96,124,201, 48,138, 85, 33,159,106,196,159, 47,235,235, 55,
+243,242,108,206, 71, 51,244, 54, 76, 38,132, 31,211, 37,133,144, 23,204,114,159,196,150,196,230,201, 87,126, 80,170,177,215, 66,
+183,208,222, 23,196,149,180,152,165, 95,239, 87,255, 65,250,166, 37,219,199,214, 14, 45,244,215,249,126, 93, 35, 64,228,224,220,
+ 52,141,230,205, 47,227,210, 13,230,234, 32,170,221,128,139, 67,125,101,221, 78,173,109, 87,221, 26, 33,242,124,119,197,196,183,
+ 18,187,202,250, 48, 41,210, 23, 57, 85, 42, 67,174,219,245,110, 62,246, 56,156,234,171,250, 45,  0,115, 87,179,155, 54, 16,132,
+103,108,175,193,118,164, 20, 18, 85,170,212,  7,232, 51, 84,125,251,168,143,144, 67,115,234, 37,149, 80, 83, 75,169,192,  6,214,
+222,141,231, 15,219, 20,114, 46, 39, 31, 48, 32,172,157,253,118,230,251,201,230, 63, 78,184, 62, 81, 28,141,162,122,184,244,178,
+  1,165, 72, 84,196, 58,214, 85, 90,149, 80,177, 62, 91,124,117,  8, 96,245,106,163,159, 49,203, 31,114,246, 58, 77,101,112, 25,
+ 37,241,146,154,239, 67,169,116, 72,209,169, 64, 54,  3, 46, 77, 51, 74,119,131,195,107, 95,135,  5, 25,184,228,108,252, 94, 22,
+ 55, 69, 85,174,238, 86, 79,143,143,100, 18, 78, 38,133, 65, 38,102,172,114,238,197,138,210, 92,195,212, 48, 28,163, 57, 75,112,
+204,207,132, 39, 99,222, 29, 70, 16,210,104,142,228, 36, 90, 27,247,206, 83,142, 15, 55,149,  4, 26, 41,216, 79,232,120, 76,163,
+225, 63,116,198, 39,244,237, 72,148, 69,158,247,  5,206, 64,235,194,144,123,193,116, 28,150, 33, 83,214,114, 74, 83, 23,250,244,
+134,175, 61,243,213, 28,191,243, 99,  2,155, 62,180,239,176,  2,254,123,216, 30,255, 89, 54, 29, 31,113,128,254, 16,252,224,178,
+219, 42,255,124,127,179, 94, 87,191, 94,155,109,227,189,199,172,195,204,245,197,194,125, 90, 47,186,237,209,123, 40, 49,174, 74,
+215, 64,254,115,159, 39, 44,105, 81, 93, 73,192,147, 56, 99,128, 11, 95,191,124,251,254,227,  1, 76,  9, 29,103,  9,243,150,  2,
+ 20, 85, 76,130,154,204,102,180, 60, 53,219,  0, 49, 35, 84,222,132, 60,252,112,113, 61,115,121, 39,238,197,  0,108, 82,245,102,
+  8,253,176,  4,142,157,200, 50,  3,201, 53,185,207, 45, 23, 76, 45, 15, 65,213, 61, 32,123,147,208,188,213, 71, 31,141,103, 35,
+ 60,180,225,173,153, 88, 13,227, 20,187, 89, 67, 67, 88, 12, 12,100, 80,187,217, 50, 68,104,253, 33,196,110, 68,158,209, 52, 83,
+195, 41, 91, 20,223,226, 71, 72,197,193, 11,183,  7,116,184,128,149, 91, 50,239,157, 40,103,116,207,113,  7,127, 95,240,247,209,
+ 67, 17,141, 33, 19,230,156,200,177,191,177,  1,124,121,134, 93,157, 28,118,221,126,  7,195,179, 28, 78,212, 33,106,206, 85,156,
+ 16, 14,131,138,222,205, 84, 32, 41,150,203,182,221, 74, 26, 93,144,112,117,152,182,228, 47, 79, 83,241,122,249,188, 82,109,167,
+136,248, 82,120,221,165, 91,148,211, 46,185,127,120, 70,206,141,147, 93,231,125,102,102, 60,243,236, 45, 92,217,248, 45,142,251,
+214,108,173, 80, 14, 87,146, 90,113, 55,161,174, 57,183, 78, 52,255,227,198,167, 76, 41,251, 46,178,138,234, 90,195, 12,227,235,
+ 77,  0,222,174,100,183,109, 24,136,114, 72,138,150, 92,219, 41,156, 67,209, 94,210, 91, 17, 32, 95, 18,228,215,130,  2,253,167,
+246,222, 91, 15, 69,128, 32,233,130,194, 49, 26, 43,146, 37, 75, 28,214, 51, 36,173, 37,201, 45,232,209,  7, 25, 90,103,134,143,
+111,209,189,222, 70, 35,175, 12, 16,141,175,158, 33,101,212, 11,190,201, 38,140,159, 81,222,228, 37,108, 39, 42, 91,200,153,102,
+229,118,  8, 70,  1,239, 88,167, 12,251,100, 88,231,243,152,132,214,236, 91, 45, 21,153,188, 19,236,161, 88,185,188, 91,213,247,
+  5, 50,221, 86,203,253,  4,151,218,108,174, 23, 71,199,203, 15,167,167,231, 23,231, 39,103, 39, 87, 95,175, 62, 93,126, 92,253,
+249, 69,193, 76,  2, 45,225, 66,241,229, 97, 71, 42,201,116,167,200, 96,242,139, 91,233,  2,157,102,224,235, 27,173, 86,227,246,
+233, 33,205, 99,176,125, 58,122, 70,225, 16,223, 24, 92, 88,202,211,154,102,195,229,123,198, 55,184,180,194, 56, 55,209,144,245,
+224,102,197,213, 31,216, 25, 62,229,232, 65,201,122,120,  5,100, 93, 97,232, 59,160,114,191,255,224, 12, 55,206,  4,224,214,138,
+  7,210,184,254,111, 32,197,189,208, 95,201,206, 97,180, 35,229,250, 61,100, 96,202,127,214,226,204,225, 22,237,205,223,205,122,
+215, 54, 72, 97, 78,182,109,139, 10,166,169, 62,158, 79,202,197,238,205, 52, 49, 42,185, 46,244,207, 13,111, 59,178,221,250,124,
+242,154, 16,252,186,124,123,244,238,199,250,  6,152, 65,252,249,219, 23,146, 61, 75, 23,124,253,226, 87,231,250,204,183,195,154,
+ 57, 90,248,246, 38,233, 40,153, 60,112, 91,186,192,215, 94, 22,140,232,196,148,232,167, 81, 69,180, 71,244,182,118, 90,185,136,
+180, 51, 38, 35,188,143,105,144, 20, 69,243, 27,223,176, 85,  8,115,226, 22,226,177,111, 16,135,149,  7, 72,136,210, 29, 12,254,
+190, 72, 83, 92, 16,246,171, 48,215, 99,132, 87, 56, 67,134,218,222, 42,191,227, 57, 68, 36,202, 52, 54, 72,180, 48,248,164,209,
+175,105,250,234, 97, 91,176,186,156, 85, 66,  4,221,107, 98, 36, 40, 73, 87,195,166,250,208, 84,203,187,124, 86,213, 75, 40,170,
+247,237,247,184,123,148,244,140,104,154,161,138, 85,253, 22, 38, 95,111,171,123, 81,151,184,171,217,228,156,252, 88,  3, 65, 20,
+ 59,161,107,  4, 94, 48,160,201,176, 95,224,180,232,145, 47, 23,113,109, 55,130, 23, 32, 70,197,249,195,159,100,186,143,253,100,
+134, 85,122,132,  6,141,222,115, 28,185,255, 75, 74, 50,232,217,180,120,250,213,128,109, 73,103,155,153,116,127,246, 13, 91,166,
+ 63,211, 36, 70, 17,169, 97,217,230, 65, 58,143, 25, 27,169, 26,162,200, 65, 47,124,143,204,  1,224,169, 58,228,186, 66,111, 71,
+232, 16,136, 65, 94, 85,221,182,238,209,109,250, 39,  0,111,103,204,219, 54, 12, 68, 97,145, 34, 41, 43, 78, 16, 27, 69,129,174,
+201, 18, 52, 91,183,238,253,243, 29,138,246,111, 36,118,108,184,173, 45, 81,180,196, 43,239,120,100,168, 38, 40,138, 14,245,160,
+145,144, 44,137, 60, 29,191,247, 30,231,243, 41, 42,119,115,135, 58,201,167,242,185,250, 88,131, 67,  1, 36,185,112, 99,195,187,
+  9, 54, 10,160, 80,184, 93, 73, 85, 27,231,189, 17, 26, 13, 12,164,194,234, 94,106,132,115,136, 83,177,112,126, 26,246,155,126,
+187,113,219,157,221,246,211,  9, 51,  6,101, 76,147,167,122, 97, 26,123,219,119,221,241,253,253,253,237,199,155, 55,205,250,212,
+217,195,247,195,224,200, 66,122, 12, 63, 71,159,191, 72,188,113, 33,150,222, 98,159, 54, 69,147, 35, 15,150, 45,192,222, 60,130,
+160,151, 28,199,204,168,140, 18,209,184, 35, 90,122,196,142,123,157,164, 77,156,129,156,141,250,136,155,132,112, 45,199,243,105,
+ 51,218,150,  2, 84, 13,173, 23, 22,247, 34,144, 68,222, 97, 31,149, 27,205,215, 36, 93,208,244,153, 99,140,188,208, 82, 83,214,
+ 14,229, 83, 83, 88, 40,246,134,125,171,132,  6,185,159,252,211,127,244, 36, 16,105,109, 47,219,150,179, 88,128,127,154,223,171,
+  2,155,201,227,251,103, 54, 20,208, 19,180, 70, 97,245,113,112,248,225, 94, 99,250,156, 86, 98,185, 80,151, 11,125, 85,139,  1,
+154,207, 15,114,107, 37,111,105,225,255, 90, 55,234,226,100,143,161, 52,254,105,127,136,164,140,163,123,140,107,128, 86, 77,120,
+ 36,226, 14, 74,126,218, 33, 33, 18,220,188,203,134,123,153,179,137,192, 99,242, 47,100,204,220, 51,  1,189, 94,174,172,115, 69,
+248,118,154, 21,124,230,109,162,104, 40, 42,121, 72,223,134,199,  8, 37, 82,240, 47, 99,195, 69, 10, 68,114,139,202,203, 17,123,
+194,166, 13,126,214, 78,231,216,144, 42,209, 91,130,211,197,216,173,154,141, 20,240,176, 90,174,194,200, 14,227,145, 61, 37, 31,
+ 84,153,207,155,144,152,199,211, 49,152,  0,222,145, 23,  3, 55,134,194,203,104, 84,115,217, 94,185, 80, 53, 73,181, 16,245,  7,
+185,190, 85,239,160, 50,230,124,238,222,222, 61,126,106, 33, 73,243,178, 80, 89, 22,114, 39,188,152,175,149,250,246,197,218, 93,
+213,239,125,127,240, 67, 15,206,194,232,136,143,164, 69,193,243,140, 49,111,173, 80, 34,196,196,230,131, 80,206,113,233, 81,242,
+101,178,104,225,151,  5,226,185, 41, 51, 31, 22,254, 92,164,252, 54,179,195, 11,224, 38,178, 72,121,137, 17,105, 11,127,166, 20,
+134,234,186, 93, 57,140, 27, 28,197, 44,202,237,149,145, 35,129,154, 99,  2, 17, 58, 34, 11, 94,145, 80,175,169, 36,108,254,226,
+245, 74, 59,200,162,140, 34,121,209,234,121,101,168, 95,  2,240,118, 37, 59, 13,195, 64,212, 75,156, 46, 20, 16,156,248,  8,126,
+ 30,144, 42,190,129, 63,224,196,  1,209,  3, 75, 27,154,110,105, 98, 15,158, 25,219, 73, 74,133,224,194, 61,109, 26,215,241, 44,
+111,153,172, 23,118,128,222,185, 84, 61, 98, 68,113,192,174,229,252,119, 17, 98,131,135, 19,230,206,152, 93, 84, 77,189,183,  5,
+157,158,216, 97,215, 26, 27,131,171, 38, 71, 17,173, 82,196,211,194,157, 81,185,218, 98,219,208, 41,166, 77, 18,104, 73,186, 39,
+127, 69,237, 67,122,230,136, 58,233,239,216,192,108,246,124,119,115,123, 63,157,126,124,204,215,235,101,185, 41,201, 63,154,222,
+ 10, 31, 68, 44, 67,109,105, 96,146, 32,215,  7,136,222, 13, 36, 47,232,208,170, 84,226, 16, 48,217, 76,209,152,  8,201, 84,119,
+ 96,210,171,130, 80,215, 56,121, 40, 79, 75,238, 99, 84, 53,248,199, 83, 11,116,220, 22,148,173, 75,131,112, 54, 87, 88,112,238,
+ 31, 31,169, 97,173, 27,193, 88,171,201,  0,237,176,124,  1, 51, 50,208,144, 85,224,  8, 77,204,157,246,137,186,  1, 99,205,216,
+194, 99,213,188,255,111, 23,  5, 34, 95,115, 23, 69, 88,166,227, 32,102,251, 61,162,223,131,  1, 92,184,232,142, 75,193, 54, 44,
+ 84, 56, 87, 75, 31,159,215,106,226,154, 44,167,190, 92,173, 70,198,161,103,131,116,167,131,236,225, 69, 63,205, 73,126,141, 27,
+  3,225,122,218,134,174,220, 20, 52,248, 69,182,248,152, 12,178, 77, 64, 35, 71, 83,161, 60, 85, 49, 44,206,156, 13,209,101, 35,
+ 64,244,148, 35,150,109,131, 50,189,148,151, 71, 46,121, 95,238, 98,204, 80,169,165,128,228,198, 33,226,252, 14, 56,201,206,124,
+176, 65,225,  4,105,212, 32,118,130, 40,103,181,244, 85, 54,142, 31,138,163,195, 68,192,161,100,148,204, 80,226,172,193,181,241,
+227,184, 32, 37,124, 74,  7, 81, 29, 59,142, 97, 63,158, 61,200, 96,190, 90,164, 18,211,165, 95, 25,  6, 99,112, 29, 33,138,117,
+  1,193,240,148,189,135,113,161,208, 18,126, 91,106, 61,244, 87, 93,231, 87, 23,217,228,117, 83,236,242, 26,106,181, 95,149,141,
+184,244, 91,  1,242,158,132,181,157,119,197,118,183,111,203,202,126, 74,191,242,117,229,136,238, 16,103,181, 49, 49,137, 12, 71,
+228, 17,170, 10,203,127, 82,251,152,211,248, 78,206, 30,207, 68, 68, 14, 66, 55,  8,218,158,  5, 28,201,222,225,247, 39,251,241,
+ 90,221,177,207, 99,143,130,249, 13,159, 21, 98,185, 45, 34,189,238, 16,222, 21, 45, 97, 38,180,206,122,206,137,180,101,135, 58,
+223,218,138,110,247,215,254,235, 33,118,218,  5,138,127, 98, 71, 10,241, 37,  0,111, 87,178,211, 48, 12, 68,189, 36,105, 83, 10,
+226,194, 17,241,255, 95,194, 47, 32,132,  4, 18,  2,169,128, 80,171, 82,234,198,177,141,103,177,227,  4,  4,136,  3,189, 85, 85,
+183,140, 51,235,155,247,170,156,189, 37,133,169,144,232,137, 37,143, 35, 28,118, 46,137,150,148,154,101,208, 96,135,179,169, 97,
+240,232,  9, 42,  4,152, 48,229,129,140, 91, 72, 43, 13,220,154, 61,105,102, 14,154, 41, 72, 36,  1, 11, 73,  4, 82, 68,149, 98,
+141,232,121,237, 92,  3,248,  0, 21, 98,233,214, 54,237,245,237,213,225,221,192,134,170,  3,245,142,222,117,214,198, 10,166,  3,
+ 65,152, 64,107, 31,161,212, 54, 10, 12,  9,102,236,145, 47,210, 73, 18, 58,163, 36, 29,191, 81, 49,201, 42,  9, 92, 38, 42, 96,
+ 50, 23, 47,168,203, 97,234,205,225,193, 51,180, 45, 70,182,103,223,145,232, 65, 29,109,166,130,  5,165, 52,176,216,137,  6,197,
+ 16,155,102,170,139, 74,206, 26, 16, 58, 58,154,145,254,179, 56,105, 32,121, 55,224,  4,228,124, 46,218, 16,238,159,204,205,254,
+255,156,123,118, 31,117,250,145,203,244, 84, 39,224,249,161, 16,125,213,  5,143,216,111,194, 70,126, 99,159, 38, 16,203,132, 84,
+235, 73, 61,220,122,175,251,232,175,150, 72,169,214,202,190,209, 42,154,215,116,246,242, 97,119,247, 26,234,154, 41, 46,114,142,
+ 66,169,128, 99, 82,163,209, 33,  7,185, 15,204, 91, 75,180,100, 81,224, 15,186,242,138,101, 32,100,214,246, 16, 25, 68,144,210,
+246, 98,248, 18, 86,235,149,202,119,178, 31, 13,208,218,217, 98, 99, 54,176, 18,146,228, 31,104,177,133,217,109,  8,171,139,114,
+207, 89, 70, 54,196,218, 60, 84,169,156,166, 99, 39, 39,224, 11,149,161,152,137, 43, 55,121,122, 73,172,150, 49,239,130,184, 11,
+116,143, 26, 14,170,194,213, 41,193, 84, 80,236, 74,104,154,140,175, 84, 85, 99,236, 65,229,209, 94,130,171, 16,236, 18,106, 87,
+ 80,190,241,231,245,241, 89,125,250,248,246,210,225,111, 48, 59,107,119,235, 94, 92, 40, 55,236,172, 78,186,222, 14, 57,129,228,
+118,171,220, 94, 56,131, 12, 54, 61,201,162, 80,219, 42, 99,127,184, 81, 44, 71,126, 42,  3, 72, 44,178, 48, 50,109, 28, 67,224,
+113,223, 29,155, 84,201,128,114,176,103,200,193,130, 81, 55,133, 28,246,247,143,145,103,199, 38,181,159,156, 94,140,227, 95,110,
+167, 18, 89,163,144,159, 64,240,126,250,249,194, 49, 69, 90,233,142,115, 81, 16,116,221,196,203,245, 55,198,145,226, 66,132,178,
+200,246, 63,253,247, 15,  1, 72, 59,159,222,132, 97, 24,138,215, 73,128,178,162, 29,166,221,216,113,223,255,235,236,178,105, 55,
+ 54,105, 82,217,  6,165,165,109,146,213,118,210, 36, 45,251, 35, 13,113, 64, 72, 32, 68,133,121,182, 95,126, 79,197,175,  7,207,
+183,231,235, 35,  2, 52,216, 58,154,169, 71,114,241, 72,133, 79, 37,128, 99,197,  3,147,175,249, 25,154,132, 83,250,140, 21, 81,
+208,  8, 93, 24, 76,212,118,115, 32, 57,116,  1,154,244, 44,126, 94,180,237,162,151, 92,169,114,255, 38,105,125,139, 12, 58,131,
+ 39, 16,113, 56,163,123, 67,245,221, 37,103,251, 48, 67,239,235, 12, 37, 94,122,165,224,250, 96, 24,131,205, 28,194, 27,192,101,
+172,129, 13,  1,171,174, 12, 72,118, 31,139,104,214, 69, 93, 13, 17,254,106, 90, 79,111,176,190, 99,  7, 93, 25,194,213, 91, 68,
+ 43,229,185, 42, 90,168, 72,179, 45, 73,111,174, 21,228, 67, 39,140,192, 52, 78,131,  0,132,217,103, 98, 13,246, 80, 54, 15,187,
+211,179, 54,205, 37, 55,164,138,194,249,254,127, 83,254,125,164, 31,149, 72,127, 95, 82,217,109,105, 91, 80, 80, 81, 30,231, 42,
+205,143,186, 32,139, 88, 99, 38, 21,158, 34, 10, 23, 28,193,194,218, 95,148, 86,247,178, 83, 71,209, 99,117,110,224, 12,250,118,
+248, 34,235,190,172, 50,220,192,227, 14,148, 81, 66, 73,  5,148,228,126,159, 43, 93, 37, 84,177, 42,246,186,229, 36,  1,240,240,
+ 42,152,104, 28,247,200, 12,127,174,  2,198,245, 86,144,237,169, 48, 20,  0,137,159, 34,132,162,217,236,245,125,103,177,201,164,
+109,175,225,188, 80,195, 28, 49,150,  1, 25, 25,128, 33,104, 43,215,254,198,199,100, 60,100, 44, 26,134, 49, 58,152, 60, 97,249,
+ 98, 37,164, 28, 26, 99, 90,  8, 19,230,136,116,  9,201,112, 34, 51, 80,196, 50, 57,147,199,217,133,179, 15,185,189, 32,192,245,
+213,166,222, 87, 26,196,132,184,231, 26,139, 12,184, 24,223, 23,219,247,174, 42,235, 79, 28, 28,246,  6,154,230, 68, 37,  1, 73,
+ 35,154,127,150,233, 42,144, 81,182,131, 22,248, 56,224, 57,141,161,178,119, 29,  5,113,106,232, 17, 26, 75, 88,  4,147, 86,183,
+212,188,103,220, 98,245,238,102,187, 90,230, 79, 47,143,124, 56,198, 19,146, 67, 89, 79,160, 67,102,204,179,  8, 17, 28,246,247,
+217,204,244, 31,198,207, 42, 46,220, 86,139,245,185,107,230, 18,158, 59,  8, 26,208, 59,210,251,172, 75,  0,223, 84,234,232,235,
+178,147,  5,253, 49,117,182,152,239, 79,216,206,117,250,124,213,108,254,230,162,254, 18,128,180,115,219, 73, 24,  8,194,112,103,
+ 89, 10,229,144,160, 55,222,249,254,143,164,183,106,140, 24,130, 17,180,212, 30,118,236,156,150,150,214, 24, 35, 15, 64,104,179,
+204,238,206,252,255,247,251,243,251,179, 88, 19, 20,252,133,173, 12, 60,143, 33,130, 92,152, 57,113, 41,206, 30,133,198,234,130,
+164, 26,114,134,153,  6, 88,203, 30,124,193, 72,224,178, 28, 36, 65,195, 81,188,147,243, 46,168, 13,139, 89,104, 14,234,252,192,
+ 77,241,137,140,141,  9, 84, 84, 19,171,154,204, 35,168,180, 36,118, 33,152, 90, 70,133,152,120,177,205,154, 77,201, 76,171,104,
+249, 12,224, 72,167, 47,184, 86, 55, 57,215,119,137, 89,160,  3, 82, 29, 89, 78,102, 25,164, 39,105,171,244, 71,149,175, 89,238,
+194,128,105,136,179, 68,134,107,192,173, 79,143,245,151,231,138,118, 40,131, 75,125,150, 38,243,153, 95,103,211,205,210, 47, 82,
+223,148, 97,187, 59,221, 63, 28,239,138,106, 55,214, 50,243,182,209,186, 14,122,247,255,103,246,218,208, 55, 83,110,152,144,176,
+135, 18, 60,233, 96,178,118,232,137,  7, 71,150,180,207,146,235, 62, 63,124,106, 62,117,111,174,197,225, 60,182, 27,127, 51, 25,
+172, 75,176,157, 67, 26, 86,237, 70, 50,  7,156,242,  5,189,106,160,168, 67,153, 80, 42,202,161,  0, 63,135,155,141,127,217,209,
+ 72,162,225,210,  3, 61,169,174,242,208,237,101, 27, 63,131,187,221,146,161, 65,206,186, 32,130, 47,250, 39,198, 19, 45,246, 14,
+ 57,186, 72,250, 34, 57,252,245, 82,108,232, 49,100, 57, 15,136,218, 32, 40,151, 92,217, 94,137,242,179,206, 72, 21, 48,247, 44,
+152,243,133, 33, 50, 17,  5,213, 89,168,150,133,125,181,188,174, 67, 85, 20,133,227, 40,  4,210, 71,154,151,150,193,186, 78,104,
+226, 19,254,187,114, 60,103, 84,141,203,226,165,  2,179,202, 86,135,252,253,121,191,181,161,156,235,249, 65, 21,192,222,222,182,
+155,246,224, 49,115,243,183,252,181,106,239,199, 88, 82,195,168,200,203, 69,170, 15, 46,125, 24,175, 99, 65,249, 34,198,211,242,
+157,224,152,135,166,162,230, 12, 18, 61,132,221,141, 68,239,150,  1, 47, 74, 68,185,222,107,130,208,114,236,152,171,121, 42, 79,
+251, 71,173, 40,138,116,199,177, 22, 10,170,132, 20, 53, 11,219, 14,239,161,139, 17, 78,126,152,193,226, 88, 55,166,233,235,152,
+227,231, 84,157,220,176, 61, 38,  3,122,192, 44, 93,145, 61, 66,227,156, 35, 71, 22, 76,121, 69,  6, 24,136, 82,221,145, 26, 13,
+ 67, 97, 15,142,133,187, 95,254,128,  1,111, 60,252,197, 31,243, 45,  0,105, 87,178,211, 48, 12, 68,109, 39,221,145,160,136, 59,
+ 66,226,255, 63,  9, 46,  8, 85,130,162,148,226,180,113,108, 15,158,197,169,187, 32,129,232,161,135, 30,186, 68, 29,103,230,205,
+ 91, 10,126,164,152, 34,131, 57, 77,177,144, 54, 46,224,223, 43, 71, 69, 82,216,  2, 93, 95,147, 26,240,244,191, 50,  3,157,156,
+196, 23, 90,112, 75,163, 10,173,247,208,107, 84, 64,233, 86, 94, 87, 21,226,248,134,149, 26,100,188,137, 86,192,121,  5, 42,235,
+ 32, 37,  6,120,104,113, 22,153,147, 31,100,134,101,226,166, 65,177,147,196,114, 28,124,153,  9,200,171, 36, 74,150, 49,119, 62,
+220, 41, 84, 77,218,119,105,225, 17, 98, 65,165, 71, 32,150, 51,168, 90, 38,100, 33, 91, 10, 85, 55,125,196,196,181, 55, 36, 52,
+141,178,244,146,241,172,131,248,238,252,227,108,210,108,251, 53,245, 61, 29,168,198,186, 57,132,169,130,221,206,239,214,122,181,
+117, 47,155,238, 53,115, 18, 76,145,139,116,142, 24,142, 50,172,241,207, 46,190,202,166, 55,124,231,184, 85,234,186,102, 11, 68,
+ 61, 31,225,250,120, 15,105,206, 48, 11,114,123,243, 65,245, 30,246,125,216, 58, 24,108,238,246, 66,112, 20,160,  6,142,238,212,
+ 71,101, 83, 23,252, 10,190, 61,196,108, 27,121, 69,103,189, 37, 27,196,218,227, 18, 98,140,153,  1,245, 24,213, 17,176,105,195,
+114,209, 27,206,234, 30,192,194, 60, 33, 28,124,133,142,246,157,154, 66,233, 56, 28,140,248,136,236, 28, 36,240, 11,243,101,212,
+ 41,246,114,177, 75, 42, 37, 83,240, 67,228, 54, 70,135,233,152, 39,196, 32, 73, 55,194,189,201, 89,157, 32,254,182,116, 43, 18,
+241,183, 46, 43, 28, 74, 92,151,149,213,195,158, 53, 61,111,108, 99,216, 48, 91, 31,192,210, 92,155,134, 65, 31, 93,226, 79,192,
+ 87, 94, 20,255,236,100,214,124, 53, 66, 13,206,254,228, 89,167, 69,  6, 74,149, 80, 54,211,219, 45,170, 89,235,221,199,222,246,
+161,183,206, 58,191, 90,250,153,183, 40,223,133, 57, 23,179,108,  9, 35,168, 44, 53, 33,171,216,168,188,253,132,224,198,169, 18,
+131,182, 88,126,248,154, 88, 17,  4, 73,224,224,145,253,254,238,225,249,237,105, 90, 79,218,116, 62,178,190,138, 42,178, 98,255,
+ 31, 37, 91,110, 85, 56,121, 29,166,174, 56, 80,  5, 65,159, 55,239,199,237,196,239,203,228,188, 83,209,151, 68, 81, 80,204, 17,
+184,116, 41, 78,195,233,104,220,245, 29,127,231,244, 67, 82, 35,215,246,219,242,112,199,236,248,200, 59,204, 83, 32, 19, 10, 27,
+203,242,148, 47, 56, 61, 23, 86,175,127, 61,217,249,241, 45,  0,105, 87,178,211, 48, 12, 68,227, 37,132,210,  5, 33,129,248,  2,
+ 46,252,255,119,112,224,  3, 16,  2,113,107,  5, 74,218,102,243,130,103, 60,227, 56, 85, 37,  4, 72, 61,244, 80,181, 74, 19, 63,
+143,103,222,162,103, 87,235,217,169,158,127, 64,206,160, 57,151, 77,161,199, 54, 13, 66,224, 11, 12,234,234,  0,143, 44, 10,242,
+ 98,135, 94,122,198,119,155, 90, 38, 18,170, 12,176, 30,192,177, 70, 18,116,168,248,236, 27,103, 49,121, 12,152,243,113, 18, 64,
+ 78, 74, 46,137,242,224, 94, 91,239,179,117,  8, 52,122,104,114, 78, 99, 17,124,114,116, 84,252,197,242,136, 90,237,128,238,144,
+171,  1, 47,141,109, 79,234,199,123, 52, 74,  8,219,135,140,178, 64,128,140,216,170,138,203, 80,  2, 53, 78,172,150, 55,227, 97,
+167, 49,111,179,199,191, 38,  0,241, 32,138,123,184,157,102,244, 23,143,139,213, 83, 91, 71,203,176,176, 27,189,236,237,184,111,
+  7, 14, 57,210,248,121,193, 29, 24,149, 87,164,153,144, 35,233, 74,226, 39,199,127, 84,238,201,253, 38,188,191, 21,226,186,244,
+189,144, 99, 33, 42, 37, 22,165, 44,117,184,145,178,210,190, 43,228, 74,139,  5,196, 49,187, 59,173,143,157,219, 30,204, 87, 11,
+227,241,142,149,183,197, 79, 58,242, 52,162,138,212, 11,197,166,240,138, 99,252, 96,226, 10,141, 93,223,132, 50, 93,234, 37,244,
+150,193,121,179, 44,237,177, 18,101, 37,186,174,178, 54,146,210, 37, 97,187, 77, 49,216, 42,167, 19,196,101,  0, 14,133,236,  2,
+ 77, 43,135,124, 77,125, 30, 15,118, 30,220,  9,121, 49,204,154,123, 76,232,136,193,167,133, 68,219,192,128,208, 36,126,178,140,
+233,137,123,227,104,172,230, 19,247, 98, 90,145, 42, 25,226,251,169,120,167,125,210,171, 25,208,112, 30,100, 50,213,193,201, 23,
+105, 92, 33,205, 88, 57, 14,  4, 98,125, 62,185,166, 58, 65,108,255,137, 88,130,133,191,156,194, 43, 40,243,  2, 26, 56, 64,206,
+177, 96,102, 32,225, 89,135,157,216,143,198,185,214, 12,199,207,143,117, 91,155, 26, 92,221,139, 13, 28,244, 68, 74, 42,194,171,
+210,170,232,195, 77, 11,103,177,102,251,112,185,121,222,189,143, 67,141,140, 81, 76, 10,177,104,111,150,104,166,120, 26,126,219,
+190, 66,117,108, 58,146,178, 98, 23, 41, 67, 82,204,207, 66,135,247,  9,100, 24,204,248,244,197,220, 25,218,178, 79,138,119,225,
+127,185, 40, 78, 58,138,231,235,230, 25,221, 82,156,176,239, 17,220,233, 60,  2,195,229,177,113, 89,142, 18,166, 17,158, 61,123,
+251, 74, 93,117,182, 69,231, 72,119, 50,190,202,209,124, 89,173, 15,125,147,115,219,254,166,137,249, 22,128,179, 43,217,105, 24,
+  6,162, 94, 40,105,105,161, 82,132,250, 15,252,255,127,240,  1, 72, 92,185,176,137,  2, 77, 66, 60, 54,158,205,117,155, 34,  4,
+183,222, 26, 39,246,140,103,230, 45,103,245,170,248,173, 65, 53, 36,134,163, 65, 66,213,230,183,123,225, 52, 57,114, 81,124,110,
+172, 83, 50,118,190,214, 75, 81,205,197,181, 99,205, 15,138,168,116, 85,139, 66, 82,162,173,128,107, 70,112,  0,154,111,123,  0,
+153,134,241,104,133, 42, 97,206,243, 34,254, 90,196,175, 89, 26,210,231, 59,247,158, 53, 76,  7,213, 36, 83,121,168, 82,139,198,
+210, 69,222, 16,157, 64,208,146, 57,145,208, 25,180,164,239,129,211, 91, 54,115, 72, 81,  2, 20,217,233,106,139,223, 47,174,219,
+240,182,197,254,171, 59,183,216,126,  4, 98, 86,230,164,  1, 96,159,251,225,166, 93,247, 97,121, 63,238,168,172, 68, 30, 83,175,
+ 24,193,166,210,105,114, 85,160,156,169, 50,159,215, 24, 54,211, 91,240,255, 90, 52,  5,173,200,  3,207,134,122, 50, 75,231, 54,
+141, 13,206,181,200, 45, 51, 91,200,117,181,  9, 72, 73, 73, 67,178,237, 28, 97,115,232, 17,209,204, 86, 11,191,190,  0,188,177,
+165, 49,199, 99,171,242,197,126, 82,222, 30,253, 99,217,142,190,250,193,250,  4,160,  3,216, 25,125,152, 49,218, 97,228,150,171,
+ 33, 19, 34,243,177, 29,214, 87,177,235,252,229, 98,179,251,122,135, 99, 37,125,119,138,246, 34, 83, 34, 65, 25,231,239, 25, 76,
+250,205,179, 76, 90,  2,116,  4,121,112,150,180, 70, 51,188,105,131, 97,109, 24,169, 63, 89, 77, 70,189,111,180, 95, 98,196,105,
+174,248, 85, 76,130,140, 21, 19, 54,155, 42,193, 28, 37, 23,201,158, 76,220,  6,197,141, 56,237,178,234, 90, 36,113, 41,215,147,
+245, 56, 28,  3,  1,146,102,150,  3,203,233,  3,100,136,200,153,113,154, 35, 77,218,136, 36, 21,139,  1,125, 64,252, 91, 12, 61,
+161,143,153, 10,149,250,207,248,128,215, 19,155,163,252, 28,133,162,144, 62,235,228,117,135,209,192,139,137, 79, 57,196, 63,222,
+190,222,193,216,161, 86,  8, 22,214,140,184,  7,246, 73,149,  7,138,201,  9, 57,198, 21,205,200,138, 75, 40,171, 82,105,251,138,
+227, 20, 75,129, 88,211,247, 99, 82, 23,139,233,108,243, 79,167,195,159,134,153, 11,125,110, 10,157, 73,167,123,119,118, 95, 60,
+ 85,  9,160, 32,211,235,231, 44, 48,144, 30,118, 21,132,230,199, 39,239, 80,  0, 37, 71,249,213, 24,114, 57, 29,254, 77,120,252,
+ 22,128,178,107,219, 73, 24,  8,162, 59,219, 34, 69,130, 81,131,193, 23,249,  4,255,255, 95,124,225, 69,141, 18,141,114,181,117,
+ 47,118,110,203, 22, 81,145,164,  9,225,129,150,101, 59,157, 57, 51,231,156, 14,127, 21,204,126, 71,254,208,211, 13,164,159,211,
+101,136, 41,180, 22,152,  3,168,232, 53, 59,213,114, 79,  7, 89, 23,212,230,164, 33,  3,150, 92,103, 17,165,128,104, 59,201,157,
+162,166,183, 35,215, 29, 66,236, 52,141,162, 30,  7,147,221,108,224, 79,229, 32,130,134,248,213,239,149, 94, 34, 29, 19, 85,139,
+ 79, 93, 59,172,216, 53,  1,  1, 65,166, 20,183, 44,148,  9,107,207, 63, 40,171,109,179, 13, 98,242, 64, 61,172,224, 19, 25,  5,
+ 13,  4,135,215,189,229, 19,245, 92,241,104,247,215,200, 82, 82, 99,224,195,249,187,197,250,118, 60,178,115,243,236, 26, 84, 70,
+ 53, 97,153,105, 34,110,232, 77,165, 17,147,113, 12, 14,247, 85, 86,130,165,153, 19,251,255,138, 44,237,179, 62,181, 76,121, 60,
+113, 84,246,206, 75,232, 19,150,234,189,127,111,224,181, 13,237,180, 80,189,194,244, 45,108,154,130,230,208,139,139, 33,174,207,
+104,216,191, 33, 91,221, 34,108,109, 29,239,181,218,240, 42,117,233,191,229, 60,169,177,233,119,194, 79,242, 60,112,202,132,100,
+112,191,118,237, 51, 47, 86,224,171, 96,150, 14, 35, 40, 49,  9, 76,111,224, 38,151,245,195,252, 13,197, 73, 41, 89,140,201,220,
+  2, 58,186, 50, 57,208, 25,187, 12, 22, 30,144, 84,169,244,253,245, 35,188,141, 71,179,117,119,118,235, 39,129,218,163, 60, 57,
+ 80,  5,  3, 96, 58,158,206, 94,102, 32,128,100, 74, 36, 85, 66, 36, 36,178, 61,228,231, 81, 77,140, 68,188,210,233, 72, 14,231,
+ 73,200,154, 10, 14, 27, 59,151, 64, 89,  3,133, 99, 22,131, 68, 58, 54, 14, 97, 25,  1,126,128,  6,105, 98,162,124,250, 36,219,
+181, 27, 39,225, 38,177,116,212, 50,252, 23, 25,129,104, 85, 91,158,172,220,250,147,124, 71,106, 18, 15,230,159,226,183,171,248,
+136, 27,212,175, 76,168,208,187,167,253,219, 88,  7,144, 56,176,166,216,152, 48, 55,208,172, 44, 14, 62,180, 55,  7,230,175, 68,
+  3,224,118,179, 23,179,115,149,111,147, 88, 18, 83,139, 44,100,110, 33, 33,238,156,108, 98,174,203,188,179,187,150,  5,246,  9,
+153,201,204, 81,205, 17,193, 29,254, 24, 72,209,215,213,217,100,190,120,202, 80,111,248,125, 20, 71,175, 48,238, 43, 70,106,112,
+119,217, 87,200, 61, 94,156,214,126,243, 83,173,144,143,199,240,174, 70,209,252,120,216,231,231,200,200,240, 37,  0,101, 87,178,
+155, 48, 12, 68,109, 19,160, 72,180,160,194,  1,169,234,165,234,177,255,255, 49, 61,112,105, 15, 84,137,  4, 82, 18, 26, 39, 94,
+154,153,177, 29,187,132, 46,156, 33, 10, 16,143,199,111,222, 18,248, 51,148, 71,202,163,198,252,  7,220, 63, 78, 64, 24, 14,178,
+129,116,194,135,128, 67, 27,146,206,252, 48,  2,122, 97,176, 73, 36,107,111,114,105,164, 51,151,197,134, 74,  3,149,222,165,218,
+ 43,206,227, 20, 66, 50,123,242, 41, 36,174,100, 27, 79,244,185, 68,211, 60,190, 25, 54,  0,180,126,156, 64, 50, 20,160, 74,128,
+195,103, 78, 94,  5,243, 86, 20, 39,130,139, 59, 66,255,132, 55, 18,230, 41,158,119, 79,251,143, 87,202, 53,158,205, 86,221,164,
+128,205,192,  0,200,219,225,113,147,147,217,136, 16,167,166,221,151,159, 47,187,245,225, 88,231,231,166,178,122,197, 76,203,140,
+116,182, 33,238, 78,  9,159,105, 35, 59, 73, 17, 33,218,161,103,239,254,201, 64,103,145, 36,131,104, 60,119,128,  4,138,205, 76,
+100, 25,108,145,109,103,106,165, 91, 28,145, 85,164, 75,196,204,195,123,169,182, 83,118,150,122, 41,108,169,193,214,101,187, 94,
+128,252,168,179, 71,217, 76,241, 55,150,145, 66,253,218,216,202,140,176,199,220, 23, 68, 77, 28,155,227,147,115,131,  7,189,190,
+126, 47,176,231, 43, 27, 64,225,231,156,173,110, 85,145,181,141,202, 40,105, 90, 89,182, 89,110, 78,213,137,166,139, 81,145, 10,
+251,185, 53, 99,167,235,240, 76,130,110,211,196,107,154,132, 28, 46,202,135,251,219, 52, 99,235,204,105,160,172,201,171,220, 33,
+ 30,  3, 37, 35,225, 54, 98,217, 18,209,122,224, 78,118,225,160,164,137, 87, 80,115, 36,242,227,121, 85,248,201, 16, 75,200, 52,
+222,170,202, 98, 52,  6, 72, 59,250,139, 63,110, 31,222,138,119, 76, 35,232,151,142,240,191,182,181,  9, 70,228,152,239,161, 87,
+ 23, 62,137,210,175, 86, 84,241, 96,102, 16,130,222,186,129,143,244,253, 59,105,178, 12,161, 78, 70,214, 58,135, 80, 49, 28,136,
+  3,161, 13,198, 28,153, 83, 97,130,  3, 84,201,120, 81,202,250,160, 91,165,181, 52, 96,136,172,209,126, 95, 33,139,136,145, 85,
+ 61,143,124,154, 35,103,243,  0,233, 71,132, 28,158, 98,204, 35,197,221,229,103, 80,226,104, 84,239,126, 73,112,226,201,104,115,
+184,158, 97,130, 95,240, 42,251,226,158, 98, 50,118,140, 77, 31,254, 37, 98, 15, 14, 54, 50,223,104, 51,151,119,  6,241,109, 73,
+113,143,223, 63,156, 55,121,  2,213, 91,123,125,131,250,203,235, 75,  0,202,174,166,167, 97, 24,134,218, 73,199, 54, 16,159, 18,
+147, 16, 39, 46,227,200,145,255,207,223, 64,226,136,208,196,132,246, 65,187, 37,105, 77, 18, 59,105,198, 24,130,222,167,118, 77,
+237,196,207,126,239, 49,127,149,  9,205,136,189, 58, 31, 30,126,101,135,238, 88, 30,130,240,187, 50, 16, 47, 89, 58,133,117,210,
+115,237,126,218,192,216,219,172,101,192,135, 21,196, 18, 99,101, 23, 72, 77, 56,101, 30, 39,206, 74,217,192,163,  6, 36,210,  2,
+ 66, 13, 68, 21,229,112, 98,  3, 43, 82, 85,181, 48, 84,149,216, 67,161, 20,146,121,117, 84, 18, 34,243, 33, 96,141,241, 69,173,
+142, 10,146,174,173,  7, 16, 92,176,163,114, 36, 54,196,178,152, 49,122,129,230,198,157, 84,234,254,250, 44, 12,252,185, 48, 12,
+234,111, 48, 10,245,129, 12,158, 67,  1,194,100, 61,146,204,252,196,162,173,154,135,168,240,128,183,192,254, 53, 72,239,252, 18,
+ 96,  2,234,106, 80,157,141,245, 72,211,218, 65,109,187, 55,211,190, 16,188,199,246,192, 80,154,  1,170,  1, 90,  0,204, 90, 88,
+ 89,170,108,232, 97,223,158, 86,147,139, 99,173,245,251,194,190,125,110, 93,209,219,105,255,185,205, 64,162, 83,141, 18, 46,207,
+147,151, 71,161,114,162, 35,197, 68,226,132, 77,251, 26, 98,172, 62, 86, 21,187,170,116,177, 47, 98,  3,247, 15,123, 96, 19,178,
+ 97, 70, 86,253,239,235, 97, 14, 20,202,130,112, 37, 78,131, 34, 74,144, 26,182,253,222,128,244, 13,163,199,140,151,248, 71, 48,
+214, 33, 82,153,174,138, 32, 17,248, 79,113,240, 36,  7, 25,113,241, 21,121,140,226, 56,  2,210,  1,138,244, 84,141,133, 89,118,
+210,124, 79,190,192,189, 90,124,120,180,173,179,211,219,233,124, 57, 15,250,121,217,103, 74,168, 85,217,250, 99, 39,103,229,156,
+234,255,230,249,241, 69, 23,116,  1, 28,  8, 85,156, 67,139,  6,161, 17,163,150,155, 85, 32, 41,249,111,220,214,195,155,  7,123,
+247,  8,235,134, 54, 58,216, 10,109,  2, 22,239,207,242,190,246, 84, 53,152, 37,184, 69,221,205, 94,219,231, 39,107,155,174,169,
+157,107,192,248, 95, 27,150,141,228, 17,120, 76,154, 15,  5, 74,158,176, 92,164, 29,215, 67, 44,206,224, 88,140, 81,255,124,106,
+ 46, 73,172,127,160,125, 74,219, 85,137,220, 55,230,181,192, 94,210, 98, 47,117,252,129,199, 39,213, 18,237, 38,247, 82,244,224,
+144, 57,137, 46, 84,195, 66,180,234,106, 92,141,109,103, 56, 83, 13,245,168, 37, 71,191, 23, 26,255,185,190,  4,160,236, 76,118,
+ 26,134,129, 48,108, 79,210, 37, 45,136,125,145, 16,136, 19, 18,219,  1,  9,241,254, 79,192, 67, 32,122,160,108,  5, 74,200, 98,
+103,176,199,107,  2, 69,165,135, 30,162,170,170, 26,251,119, 60,254,231,251,173,190,123,139,112,195, 22,173, 24, 93,233,231,139,
+ 15, 37,126, 83,249,200, 74,199,227, 26,126, 92,222,242,  0, 60, 50,154,153,185,216, 24,193,  7,127,122,212, 26, 15,230, 78, 65,
+107, 62, 64,240,131, 25, 83,188,159, 69,224,178, 59,208, 20,223,149,192,167, 38,135,158, 39, 55, 39,215,147,231,  9, 80,104, 67,
+ 99, 75,252,214, 53,170, 46,214,162, 50, 84, 50,228,212,182,139, 18,100, 94,211,246, 50, 69, 34, 49, 19, 56,140, 80,127,160,222,
+103, 95,117, 41,229,233,206,218,225,198, 56, 75, 19,117,203,212,164,236, 33, 97,213, 72,235,201,105,206, 19,119,220,218,143,224,
+ 30,157,142, 18,248,207,195, 59,184, 83,205, 17, 99, 91, 74,226,147,164, 55,128, 97, 10,111,181,154,131,242, 94,200,  7,194, 42,
+156,103,131,203,205,193,241,122,118,180,218, 63,219, 24, 94,172,102, 87,227,108, 75,194, 84,212, 19,161,158,221,228,  8,224,120,
+127,180,185,146,125,205,138,167,183,106, 74,155, 15,136,200,124,203,187, 20,252, 48, 21, 81, 25, 71,219,237,185,182,238,232,178,
+152,110,157,208, 41, 95, 82,  7,117,177,181,113,250,248,158,218,156, 13,  6,186, 62,236, 12,188,216,138,204,116,206, 93,180,192,
+116,157,207,219,214, 14,252,169,239,210, 56,116, 66,216, 38, 98,107,126,178, 54,125, 16, 89, 60,230, 26,214,  5, 87,217,173, 36,
+  4,241,  8, 50, 17, 56, 23, 65,220, 13,232, 75,207, 56,226, 98, 83,194, 30,119, 76,140,144, 26, 25, 99,110,245,197, 74, 86,234,
+ 15,120,249,124, 97, 22,148,106,123,192,108,223, 44, 67, 23, 24,101,158,143, 26, 83,122,226,190,128,128,106,167, 95,  8,106, 79,
+ 33,143,141,173,252,147,141, 30,247,250,219, 31, 85,158,203,162,148,181, 20, 69,182,123, 89, 30,156,242,124,174,153, 79,234,191,
+ 87,139,127,169, 15,217,121,206, 89,142,197,251,107, 51,159,241,233,157,188,187, 21, 85,222,212,115, 44, 11, 29,198,172,  9, 43,
+  2,121, 20,124, 27,119, 30,  5, 56,164,169,182,135,  1,139,110,143,207, 58,  4,247,214,195,187,175, 10,176,216,243,254, 55,149,
+128, 91,226, 32,120,214,  8,215, 12,149,196,173,207, 93,137, 95, 78,217,  3, 62,  1, 23, 52,151, 46, 20,196,182,141,202,191,  4,
+  5, 90,152, 15, 11, 20,113,208,199,176, 55,162, 69,188,137,191,118, 60, 88, 81,227, 97,201,223,253, 45,  0,101,231,179,218, 54,
+ 16,132,241,221, 89,201,150, 34,199,193,165,  1,135, 30,139, 15,189,247,  5, 10,125,255, 67,161, 15, 80,218, 38, 14,196,166, 77,
+ 99,201,187,210,206, 84,251, 87, 43,169,  9,169,241,193, 24, 12, 43,175,119,172,153,249,230,247,  9,107,141,237, 92, 28,135, 91,
+197,127, 46, 56,132,126,224, 47,158,101, 62,111, 64, 39,205,103,  8,150,186,140, 39,116,124, 72, 71,143, 93,105, 52,234,195,112,
+212,232,229,145,  9,  9,137, 59,135,181,237,112, 39, 13, 98,  3, 62, 78, 57,129,131,188, 59, 69,150,119,109, 98, 86,  8,207,132,
+ 63,156,164,111, 15,119,166, 81, 43,132, 70,132,160,136,116,181,251,116,111,150, 89,174,117,255,247,208,229,248,136,150, 55, 32,
+  9,165,173, 38,181,140, 75,203,117,202,140,190,128,246, 82,125, 63,158,218, 14,183,171,242,221,213,106,187, 42,174, 22,139, 10,
+178, 21, 65, 70, 80,152, 66, 62,207,163,237,170,189,171,237, 18,175,143,168, 56,212, 51,114,222,115,183,201, 44,201,  3,222,154,
+248, 46, 54, 69, 94, 45,243,167,150,246,141,122, 64,188, 99,236, 99,177,252,244,126, 35, 42,174,179,126,181, 88,107,170,173, 38,
+ 73,228,176,187, 94,127,126,179,249,114,248,253,147,216,101, 71,187,237,250,102, 83,238,239, 79,223,142,231, 71,155,175,227, 76,
+ 34,249, 63,  7,195,107,129, 68,200, 96,140,182,199,154,153, 46,  4,244,207,101,110,188, 28,251,140,167,200,197,241, 36, 76,169,
+204, 71,  2, 39, 13, 25, 23,224, 83,255,107, 23, 78, 44,210, 36,224, 79,121, 82, 95, 73,227, 59, 77,134,164,156,231, 42,114, 62,
+181, 69,155, 93, 38, 78, 83,118,167,110, 31,  4, 69,105,184,231,222,170,221,107, 31, 99,112,231,228, 99, 57, 64,144,117,177,216,
+254, 15,182, 76, 67,205, 19, 35,168,198, 58, 38,120, 63,178,254,122,138, 69,169,109, 32, 72,204,255,220, 11, 61,174, 33,152,183,
+ 47,203,117,109,168,200, 22, 34,207,252, 96, 40,243,228, 74,222,160,186,200,202,254, 59, 83,157, 50,216, 44,148,213,245,135,246,
+102,199,154, 39,214,106, 82,103, 99, 61,212, 52, 40,207, 32,165,172,127,117,245,129,213,127,244,195, 15,125,255, 21, 85,255,233,
+ 51, 42,163,127, 39,173, 44, 44,179,139,139, 98,193,  8, 23, 61,152,129,134,150, 42,139, 91, 74, 33, 89, 10,243, 95, 48,130,217,
+210,152, 75,250, 66,113, 70, 79, 19, 92,240,118,  1,129, 58,197, 29, 78, 16,  2,220, 34,204,188,167, 74,119,124,190,238, 30,192,
+ 56, 56,214, 86, 78,104,198,195,207,171, 18, 23, 45,181,243,163, 58, 57, 61, 20,178, 77,154, 49,100,204,166, 11, 51,193, 63,201,
+ 87, 50,200, 58,199,199,126,197,227,175,  0,156, 93,205,110,219, 48, 12, 22, 37, 71, 49,218, 96, 67,129, 98,167,237, 41,  6, 12,
+216, 99,244, 89,251, 32, 29,176,123,111,  5,  6, 20,205,146,174, 73, 99,203, 34, 75, 82,146, 35, 59, 93, 81, 52,200,193, 39,195,
+182,  8,138,164,190,159,166,126,188,154, 52,104, 95,213, 71, 86, 85, 26,204,179,198,211, 68, 79,165,121, 45,199, 84,217, 51, 35,
+145,243,210, 50, 22,213,124,213,185, 19,229, 84, 81,236, 48,170, 48,137, 10, 84,201,130,194, 69,110,205, 36,110,160, 27,111,140,
+ 73, 10,124,160, 66,164, 34, 44, 38,202, 19,172, 69, 62,254, 74,194,221,229,194,230,108,160,246, 55, 58, 35, 20, 88,113,  3, 73,
+135,198,101,242,133,134,129,179,205,186, 91,123,113, 16, 92, 73,205, 35, 30, 56, 41, 99, 32,130,  7,153, 37,200, 59, 44, 85,209,
+102, 47,161, 45, 76,121,155,132,180, 52,221,255,163,248,107,179,189,217,108,189,177,151,203,229, 69, 35, 24,244,214,203,150,250,
+ 60, 32,196,208, 41,100,136,166,112,245, 52,177, 81, 18,184,  9, 83, 96,172, 45, 27,  0, 78,131,190, 78,253,177,160, 86, 90,206,
+155, 11,215, 17,173,187,184, 37,228,202,253,187,247, 87, 63,191,253,126,248, 27,131, 17,167, 76,145,174,148,247,231, 13,237,241,
+192,237,245,126,245,105,245,195,159, 95,247,187,208, 97,235,220,115,103,255, 60,134, 93,  5,245,250,176,241, 72, 83,189, 90, 91,
+ 90,110,254,123,245, 16,224, 85, 57,  4,241, 30,254,236,205,153,231, 11,174, 99,154,172,136, 84, 25, 94,211,104,248,  6,197,182,
+169,116,117,164, 96,172, 36, 77,164, 35,246, 84,243,100, 81,192,233,211,103, 22, 18, 39,247,179,246, 60, 12, 65,188,107,104, 38,
+ 86,  5,179, 42,108, 26, 93,213,183, 31, 33, 50,101, 11,129, 99,231,112,180,  4, 58,218, 61, 86, 67,128, 35, 29, 30,211, 89,178,
+ 30,236, 66, 70, 12, 91,165,242, 66,141,145,118,121, 88,163,112,200,196,155,157, 36,247, 88,163,237, 71,222,153, 91, 80, 18,142,
+167,  2, 84,144,122,206, 18,234,105, 55,216,219,221,221, 87,255,101,233,124,231,250,  1, 28, 87,229,180, 89, 35,246,224, 15, 92,
+138,152,133,183,142,  3, 23,130,165, 94,128,148, 79,200, 97,187,189,231,180, 62,112, 87, 17,130, 16, 15, 57,240, 99,106, 36, 12,
+141, 92, 37, 67,177,170,199,102,179,  0, 33, 37,230, 15,109,211,169, 92,154,128, 65,129,117,226,127, 80,  3,240, 90,169, 67, 21,
+237,  5,230, 80,153,220, 62, 97, 68,191,104,  7,148, 78,  8,138,212,254,184,160,  5, 29, 48,242,149, 78,203, 41,132, 57,156,134,
+234,217, 78,253,200,124,199,167,184,151,130,198,218,  1,209,190,181,109,188,213,139,244,161, 63,173,163, 15,130,205,123,239,239,
+ 69,  0,218,174, 37, 39,129, 32,136,118,247,124,  0, 13, 24,195, 13, 76, 76, 92,120,  6,247,186,242, 16,222,210,196,196,149, 71,
+112,225,  5, 80, 80,144,225,215,204,116,183, 93, 85,253, 27,134,184, 49, 46,217,  0, 19,232,170, 87,175, 95,189,151,183,247, 15,
+ 99, 11,209,199,102,127, 19,175, 79, 25, 25,211,116, 91,128,112,117,223,248,219, 90, 39,149,116,191, 55,169, 39,157, 23,128,103,
+ 76,105,  8, 81, 60,169,242, 20,138,205,105, 67, 10,  5,  5, 44,243,  7,194, 80, 19,112, 68, 42,137, 34, 28,194,131, 63,178,208,
+190, 22,192,123,101, 65,204,144,184, 47,  9, 74,167,196,133, 99,244, 22, 18,153,243, 14,  4, 45, 52,114,190,250,229,253,117, 94,
+111, 47, 71,236,250,252, 98, 45,135,196,146,215,141, 68,139,133, 28, 18,125,208,243,126,207,180,157, 98, 37,192,118, 67,120,252,
+ 27,117,217, 37, 38,117,216,202,177,134,135, 85, 83, 89, 91,192, 44, 73, 47,239,181,240,228,202,146,238, 56,152,228,101,186, 67,
+196, 59,188, 65,170,  9, 15,224,133, 42,251, 25, 92,171,242,158,200,  6, 69, 94,237,154, 93,  3, 14,112,246,227, 30,110,174, 38,
+188, 66, 15, 52, 32, 42,  4,142, 80, 53,136,222,180, 61,192, 27,105,222,102,203,121,  3,160, 99, 92, 22,101,222, 91,172,155,106,
+167,195,174,255, 95,188,139,181, 63,126, 52,166, 12,201,183,128,252, 82,189,167, 93, 14,173, 84,156, 20, 33,121, 19,  3, 92, 92,
+ 21, 19, 94,255,199, 18,  3, 25,111, 48,200, 61, 92,244,132,141,227, 47,184, 78, 26,  0, 42,161,156, 67,  8,201,195,249, 74,174,
+220, 26, 78,226,116,152, 30, 55,209,145, 61,114, 22,171, 22,239,222,186,121,208, 19,185,149, 32,  7,  0,149,140, 56,140, 79,166,
+122,236,252, 11,104,209,207,187,165,115, 87,229, 93,  2,  8,157,  1, 44,236,155,122,229, 90, 90,100,130,149,223,114,106,143,255,
+198,204,150, 31, 49,197, 45,134, 90,195, 98,146, 81,117,150,243, 29,107,166,106, 49, 46, 79,165,253, 35,219,130,174,164,169,190,
+ 44,248, 48,229, 70,231, 37,122, 68,245, 41, 70, 77,233, 61,171,145,141,169, 62,149,  5,236,251, 26,236,127, 20, 36,132,163,110,
+147, 84, 60, 38,236, 97,117,185,242,244,126, 60, 13, 60,202,  4, 87, 97,247, 11, 53, 67, 34,213,112,252,170, 85,244,147,142, 62,
+210, 72, 40, 23,  3,191, 75,191, 63,186,189,187,127,126,122,156, 47, 38, 68,198, 35,240, 59, 64,223, 58,252,238, 16,212,102,154,
+131,178,204,219,118, 68,166,133, 28, 34,120, 47,179,130, 65,130, 35, 93,100, 35, 33, 89, 12,182,118,138, 98,252,232, 99,252, 95,
+152,207,143,  0,172, 93, 77, 79,194, 64, 16,221, 15,176, 96,  0,245, 96,226, 95,240, 55,120, 49, 30,252,255, 87,227, 93, 19, 48,
+ 32,208, 66,161,221, 25,119,103,118,182,203, 71, 36, 38,146, 13, 33,229,208,210,148,217,153, 55,111,222, 51,231,206,129, 39, 75,
+122, 91, 39,  9,227,225,226,104,238,200, 98,169, 27,254, 74, 82,244,188,179,187,172, 51, 38,242,219, 14, 83,211,204,101, 93,163,
+224,227, 33,205, 51, 57,168,146,214, 61,  2,116,197, 32, 38,160, 46,250,128, 80, 11, 63, 38,128, 24,237,231,217,138,129,223,  1,
+163, 92, 55,241,204,130, 41,  3, 47,160,171,217, 52,155, 69, 80, 37, 84,239, 43,213, 31, 76, 93, 64, 34,153,244, 73,123, 24, 90,
+206, 55,252, 22,215, 35,166,205,128, 56,125,170, 27,234,193, 29, 69,118, 29, 98,153,190, 33,159, 28, 39,  5, 38,146,122,240,152,
+ 12,155, 88,129, 43, 17, 34,217,180,126,255, 43,156,103,178, 60,  5, 78,192, 98, 19,  7, 86,237,248, 42,144,251,247,142, 16, 84,
+165,158,134,215,119,247,253,143, 69,181,217,  1,231,137,117,131, 59,226, 77,248,210,218, 39, 99,208,186,217,122,251,230, 11,118,
+165, 30, 31, 38,163, 97,177, 92,213, 77,221,180,255,241,  8, 98,150,174, 94,101,211, 94, 45, 89,245,250,219,230, 88,186, 19,131,
+138,  9, 56,171,187, 70,141, 22,245,109, 96,207, 37,154,104,142,132, 15,255,185, 37,225,116,136,243,111, 42,202,174,243, 67, 36,
+176, 95, 68,168, 33, 65, 58, 41, 85,103,245, 93,121,222,130,243, 34,166,133,142,178,210, 36, 51,121, 52,139,148, 97,178,210,157,
+ 51, 54, 87, 90, 22, 68, 93,192, 37,211,209,217, 65, 38, 74,169, 56, 21,157,196,214,117,188, 79,246,239,139,218,245,137,254, 24,
+118, 37,167,251,182,152, 12,111,249,168,236,122, 90,199, 61, 10,115, 47,189, 32,201,106,248,239,  7,228,102, 66,222,129,129,241,
+ 27,202,183, 70,  1, 41, 27, 55,223,110,251,217,150,214,244,181,237,129,171,161,156,171,106, 97,170,149, 45,151,166, 92,181,213,
+172,222, 78,155,106,142,229, 28,214, 95,254, 91,220,206,131,219, 42,139,117,251,236,136,201,145, 73, 91, 44,222,  1,192, 67, 79,
+ 13, 19,123, 99, 90,180, 18,140,  0,210, 52,  3,128, 70, 39,231, 60,125, 18,158,178,164,243, 40,225,165,223,126, 25, 56,180,214,
+ 62,191,188,142,198,227, 99,157,186, 46,115,207,185, 27,134,102, 24,245, 81, 28, 60, 27,220,177,131,145,229, 92,166,224,109,191,
+141, 83, 58,106, 88,140, 18,193,198,215, 67,168, 46, 67,255,103, 66,240,223, 95, 63,  2,208,118, 45, 57, 13,195, 64, 52,227, 56,
+ 85, 74, 75, 65, 72,172, 88, 32,113,  9, 22,156,137,  3, 32,113, 88, 96, 27,209, 31, 77,243,113,237,193,158,177, 29,167,180, 18,
+ 18,162,203,170,170,210,198, 25,191, 25,191,143, 60,185,141,192,233, 77, 19,126,211,164,139,240, 51, 40,159, 32, 74, 27, 32,229,
+215,103, 30,165, 64,  8, 96,242,113,148,113,166,  5,225,166,187,249, 19, 80,252,112,116,131,160, 22,152, 68,125,129, 96, 16, 78,
+201,192,183,119,225, 82,153,158, 67, 10, 64,233, 89,249,174, 34, 48,255,217,173, 72,222,179,181,183,237, 99,111, 65,134, 79, 83,
+ 57,125,154,223,110,235,234,  3,179, 89,  6,181,116,249,195,114,160,196,217,213,152,219,117, 45, 69,214, 40,147,211,164, 41,152,
+130, 33,159,145, 78,130, 71,163,  8,127, 26,121,191,192, 44,207, 23,165,180, 37,181,234, 85,163,  7, 27, 47,117,102, 51,135,227,
+213, 60,176,203, 33, 41,232,145,217,194,246, 97, 45, 37, 32, 82,201,179,205,179,187, 99,247, 55, 23,111,159,219,174, 83, 78, 57,
+198, 34, 46, 10,123,  0, 23, 57,132,246,163, 59,133,239,141,170,178,236, 81,200,135,187,107, 11, 61, 86,203,214,117,225, 73,106,
+135,249, 67,125,135, 36, 88,220, 83, 66, 73,224,182,160, 51,199, 89,  1, 36,255,119,125,145,210,185, 24,123,  6,176,242,158,185,
+240, 38,132,110, 33,166,148, 42, 15,198, 56,  8, 46,213,111,176, 77,209, 85,121, 89,119,117, 72,102,136, 76,235,240,221,236, 83,
+ 59, 58,239,135,129,153, 67, 19,122, 31,219,234,199,134,134, 65, 53,250,137, 92, 90,116, 96, 28,  9, 22,245,183,148,159,131,131,
+192,218, 48,167,150,158,  2,224, 54, 68, 28, 72, 83, 42,144,237, 12,227, 44,211,141,163, 60,247,195,118,143,157,234,122,139,178,
+189,158,150,177,139, 15,185,210,193,153,103, 52, 84,128,129,174,143,131,198,203,130,114,103, 41, 64, 99,132,188,150,186,215,186,
+204, 39,  5, 20,186,171,105, 47,208,  7,145,245,210,160,148,  7,142,163,178,200,221,144,201,251,126,107,156, 45,112,143,110,100,
+207,130,  2,139,203,180,193, 52,153, 40,157, 54,255, 72, 87, 37,151, 32,222, 98, 57, 55, 71,184, 12, 56, 17, 33, 60,103,146,195,
+ 89, 66,160, 73,202, 81, 68,238,246, 42, 89, 35,144,208, 98,130,205,114,187,255,122,125,121,222,108,214,172,152, 25, 31,233, 28,
+ 95,161,133, 18,173,214,112,190,125,192,227,183, 70, 79,109, 67, 13, 86,250, 90,238,170,184,241,207,139,249, 90,175,146, 99,116,
+252, 63,  8,255, 45,  0,105,103,211,148, 48, 12,132,225,221, 52,210, 34,138,122,115,116, 70, 61,249, 87,252,255, 71,143,234,193,
+131,142,194, 80,160, 31, 73,214,100, 55,161, 45, 21,199, 81,224,194,199,161, 12,237,178, 31,239,190,143,254, 54,160, 31,160,100,
+253,234, 24, 92, 34,225,254, 42,202,203,  9,219,215,212, 39,243, 40,231,227,122,196, 51, 88,169,224, 35, 25,129,121,241, 52,154,
+192, 32, 67,230, 17,247, 85, 98, 18, 14, 45, 47, 88,133, 86, 24,251,135,217,174, 86, 69,142,243,108, 79, 69,226,214,193,121, 61,
+224,233,217,205,249,197,237,117,189,121, 91,249, 31,187,208,104,187, 36,206,217,134,183,148,248,224, 85,197,100, 28,177,216, 21,
+232,246,  7, 11, 16,129,133, 34, 16,177,218, 52,  7,117, 53,203,213, 68,189,151,205, 83,219,110,135,254,171,120, 88, 83,165,210,
+199,112, 52,116,234,167,243,147,244, 86,193, 13,144, 83,157, 21,153,158, 97, 76, 87, 22, 85,253,248,242,185,174,154,109, 77,219,
+176,175,  8, 71, 66,109, 54,164,  9, 55,181,125,109,237, 19,192, 29,192,195,253,229,244,100, 74, 77,181, 90,173,151,100,203, 36,
+217,252, 39,245,123,215, 98, 50,124,132,254,145, 35, 30,171,240,240,247,105,166, 74, 95,106, 56,156,135,221,101, 12, 77,227,148,
+141,202,100, 80,  2, 34, 19,168, 83,199, 89,130,163, 27, 98,150,160,227, 34, 69,124, 16,139, 30,196,  6,157, 18, 40, 33, 46, 77,
+ 11,108, 33, 38,  5, 18, 22,251, 21,116,152,219, 83,183, 77,149, 28,248,118,157,118,164,189, 73, 85,226,111,  0,140, 41,110,209,
+152, 21, 99,203, 72,118,172,226, 74,106,210,  0,  4, 36,135, 63, 13,141,226, 40, 15, 73,253, 18,237, 51,164, 20,225, 17,237,110,
+ 26,213,193,203,118,193,221, 82,154,  3,144,128,137,157,224,173,113,240,199,199, 79, 76,168, 68,131,239, 82,166,192,180,186, 48,
+243, 73,173, 74, 40,159, 65,105,255,154,203,114, 48,156,  3,136,254,210,182,206,108,125, 88,135,106, 97,218, 42,120, 28,152, 80,
+247, 69, 11,205,110,  1,215,237,205,162,199,150,141,233,234, 83,121,145,111,170,141,180,220,131,229, 44, 90,250,238, 90,112,208,
+115, 57, 30,234,208,113,176,232,159, 26,181,194, 99,100, 49,190,140, 84,253,183, 92,151, 75,173, 99,  1,213,219,189, 23,149,220,
+ 88, 28, 69, 63,180,203,127,208, 47,226,112, 48,160,  6,157, 87, 94,106,177,141,142,126,168, 17, 79,152,146, 39,162,195,137,221,
+ 31, 50, 42,127,251, 18,128,180,115,235, 73, 24,  8,162,240,206,182,150,226,237,201, 40, 70,253, 71,254,124,159,125, 49,132,152,
+104,140,168, 80,186,237,174,157,219,238, 86, 81, 48, 62,146, 66,128,164,153,238,204,156,243,157,156, 15, 28,236,246,128,168,221,
+189,196,248, 61,225, 15, 85, 94,137,118,220, 31,201,166,195,112,158,157,161,186, 30,100,163,105, 33, 36, 94,113, 74, 70,140,140,
+ 55, 44,210,  4, 53, 24,213,117,229, 55,139, 47,148,156,221,192, 49,197,108,177, 35,173, 36,191,128, 49,141,175,195, 73, 52, 42,
+ 30, 58,116,138,116,  8,190,  9,148, 55, 47,207,219,146,249, 39,199,165,129,214,178,194,100, 67,151, 74,101, 52,182, 58,107, 30,
+126,155, 51,112,117, 84, 87, 19,123,255,186,122, 32, 44,112,175, 16,177,126, 15,  7, 19,140,219,180,124, 49,223,233, 20,126,170,
+158,169, 37,137,223,173,239, 79,171,233, 69,125, 48,111, 96,110,194,221,243,219,117,183, 30,142, 55,235,161,154, 99, 47, 18, 90,
+148, 31,226,131,116,217,154,  5, 61,144,206,141,185,189,185,156,205, 78,134,178,185,120,124,127,125,105, 86,228,185,117,255, 46,
+238, 38,203,117,146, 86,  3, 99,120,109, 77,154,153, 67,107,156,135,210,194,217,164,108, 29,  5, 42,114,158,155,151, 78,158,137,
+132, 74, 70,167,241,122, 72,130, 24,174,211,209,171,196,172,152, 36,122, 49,209,106,228,245,110, 76,135,119,175,200, 71,225,183,
+103,  2,  9,242, 46, 71,150,170, 36,109,131,206,189, 65, 37, 31,126,155,153, 61,152, 84,233,163,197, 65,178,182,133,144, 35, 27,
+ 62,118, 62,225,249,220, 10, 96,146,131,151, 16, 12, 68, 85, 30,228, 81,196, 97,225,212, 31,138, 42, 71, 66, 35, 99,100,  1,196,
+  1, 38,232,176,221, 51,173, 24, 36, 67, 48,  9,201, 81,165, 96,233,107,105,193,239,240, 95,225,  2,172,234,221,135,111,158, 48,
+184,175,168,123, 68, 52, 13,247,  8,208, 24,137,194,101,135,190,  1,243,233, 86,120,194,  9,148, 73,132,  2, 15,234,138,197,160,
+234, 43, 91,185,206, 69, 15,123,126,239,  0, 29, 85,108,186, 16, 54,237,198,102,235,142, 31,229,217, 99, 59, 80, 54,248,246,240,
+ 85,230,199, 71,120, 89,215,210,125,209, 23, 60,254, 97,205,182, 23,148, 85,134,123,251,  6, 21,221, 65,198, 46,226,244,  9,182,
+ 44,123, 67, 46, 10,199,189, 56, 96, 96, 86,163,243,247,198,173,227,217,172, 80,212,129,176,214, 51,168,189,217,163,240,254,178,
+238,226, 15,126, 10, 64,218,217,228, 52, 12,  3, 81,120,236,166, 41,148,170, 66,108, 64, 98,207, 33,184,  3,183,230, 10,108,187,
+  3, 85,221, 84,252, 20,136, 19,123,240,252, 57, 73, 91,169,149,144,186,171,148, 74,105,242, 60,243,230,249,115, 53, 86, 16,236,
+ 93,177, 51, 84, 30, 79,168,188, 75,103, 58, 54,170,242,206,149,221,231,118, 14,176, 78,211,173, 17,238,127, 42,241, 77, 86,220,
+163,162,252, 18,236,165,157,249,155,142, 23,114,122,169,124, 44, 44, 61, 17, 11,158,222, 69,151, 42, 13, 80,121,121, 28,236, 92,
+123,155,167,209,117,253,196,220, 63, 59,253,157, 76,180, 95,157,232, 66,197, 68,137,107,112, 63,124,134,234,204,144,  3,129, 62,
+116, 31,238,235,250,230,106,250,188,249,120, 27,220,182,246,140,206,200,143,141,200, 52,136, 10, 76,135,248, 87,195,215,116,150,
+ 65,220,181,112,151,127,119,113,185,253, 12,235,248,189,  2,216,190,119,185,159, 88,242,251,212,176,197,176,227, 86,163,225,107,
+ 62,186,250,233,225,182, 94, 94, 92,213,240,219, 52,171,215,221,186, 33,136,113,107, 45,194,127, 36,222, 91,112, 83,118,120,205,
+193, 95,120, 88, 78,115,217, 94,101,245,252,202,130,212,193,188,246,139,185,127,217, 56,131,246,137,223,198,176, 58,144, 83, 43,
+ 80, 28, 54, 69, 32,106,138,134,255,194, 97,213,228, 16,143,  4,240, 37, 51,163,139,186, 86,241,  2,195,  2,245,222,221, 24, 67,
+136,165, 74, 40, 89, 47,126,240, 82, 37,103, 92,171,212,151,136,159,218, 13, 88, 70,175,189,242,119,125,222,155,112,102, 74,255,
+ 53, 58,174,197,133, 93,191,135, 71, 92, 27, 81,121, 70,114, 76,248,202, 34,241,220,105, 38,232, 41,249,230,204, 56, 80,188,151,
+ 48,109,153,163,109,202, 46,  3,103,147, 50,225,110,208,246,222, 40,180, 50, 79, 33,169, 54,229,214,182, 37,244, 12,133,120,171,
+ 38, 63,245,145, 41, 33,116,191,137,204,221,166, 20, 48,  6, 12, 59, 97, 18,228,162,159, 77,179,168,120, 53,158,121,181, 41, 28,
+174,122,206, 34,122,227,167, 66,204, 25,119, 44,198,177, 95, 29,167,  3,249,194,210,170,141,  7,224, 17,196,209, 69, 52, 54, 51,
+253,185,209,151, 37,  1,177,180, 50, 34, 68, 49,245,165, 55,226,233,210, 56, 30,155, 89,130,211, 29,155,112,153,151, 70, 32,172,
+249,132,232, 39,142,140,173, 54, 76,246,211, 61, 56,163, 60, 79,238,164,  3,244, 94, 77, 82,184,197, 65, 57,127,126,159, 92,249,
+ 42, 36,149,150, 63,  1, 72,187,118,157,134, 97, 40,106, 59, 78, 83,154,150,150,135, 64,170,224,  7, 88,144, 88,250,227,124,  3,
+ 59,  3, 35, 44,128,196,115,168,148,146,186, 73,108,236,123,175, 19, 39,164, 82, 36,218,173, 85,  7,215,241,241,125,157,115,186,
+245,153, 33, 40,207,134,198,242,158,175, 20, 52, 99,107,148, 71,230, 90, 27,229,105,192,166,  9,228,189,249, 43, 41,207,161, 30,
+ 30, 15, 76, 44, 89, 56, 71,193, 77,159,144, 28,254,202,249, 33, 32,  8,  8, 77, 30,243, 36,205,103,223,178, 66, 65, 74, 83,146,
+ 68,  8, 17,230,252,252,150, 27,166,116,237,112, 16, 11, 54, 81,109,199, 12, 82,224, 18,144, 79, 66,252,187, 70,163, 91,130, 48,
+146,126,180, 39, 46,101,114,153, 38,247,223, 63,111,204, 92, 50,190,154,204,111, 46, 78,215,185,186,125,126,121,216,255,167,  6,
+ 18,111,132,143, 85,176,103,166,253,249,200,119, 44, 13, 57, 40,153,162, 40,213,182, 56, 95, 76,174,206, 14, 71,159,230,174,204,
+223, 45,196, 51,246,170, 91,123,105,163,254, 21, 23,215,199,243,229,201, 44,157, 69, 91, 27,206,103,250,233, 99,243,248,181, 89,
+195, 68,208, 24,150,246,159,250, 32, 39,187, 43,  2,247, 41, 19, 71, 66,204,147,120,145,196,  7,177, 11, 15,109,214,108,131, 64,
+128, 10,158,171, 24,146, 87, 94, 55,173, 56,186,154,  2,124,  4,224,238,154,133,164,234,200, 77,127,101,148,183, 19, 32,144,201,
+ 72,147,105,166, 50,212,195,232,128,123,151,255,233,117,  3,157, 10,186,129,121, 10, 19,145,208,183, 48, 88, 63,134,195, 40,124,
+ 29,  9, 67, 16,188, 60, 16,231,113,162, 38,228,167,  0, 39, 26, 38,182,200, 75,199,120, 79, 85, 80,118,108, 40,221,152,115,192,
+ 98,185,244,185,172,225,190, 48,196,125,  5,138,251,199, 17, 58,206,216,157,  2,150,110, 80,203,106, 60,  8, 27, 14, 33,139,200,
+235,193,125, 13,156, 73, 27,143, 11, 22,149, 74,139,204,238,152,209, 59,237,100,111, 92, 95,  2, 46, 87,231,190, 80,217,115, 96,
+225,187, 84, 22,229, 29,161,201, 61,221, 24,240,208,237,230,124,136,251,226, 78,220, 52, 77,245,144,125, 65,128,169,218,158,192,
+193,156,115, 15,183,236, 79,240,222, 84,105, 80,204,156,244,132, 97,153, 58,144,162,107, 79,112,186,230,203,225,120,161,138,124,
+ 87,109,135,171,149,117,106,121, 82,140, 44, 86,131, 87,  9, 83,160, 87, 46,185,  4,134, 38, 58,220,225,165, 90,171, 81, 64,205,
+182, 40,176,  6,192,105, 45, 56,130, 65,  3, 41,181, 10,139, 30,116,229, 52,217, 67, 13,238,246,245, 43,  0,105, 87,215,211, 54,
+ 12, 69,253,213, 52,165, 16, 84,182, 85, 27, 66, 98,111,240,206,127,224,223,243, 23,246,130,212,105,154,  4, 75,215,180, 77, 98,
+251,206,190,246,117, 28, 70, 24,210,242, 84, 85, 85,149, 38,233,245,245, 57,231,158, 51,224, 51,234,165,247,252,100,149,127, 63,
+159,150,191, 28,235,255,124, 91,150,247,242, 60, 51,176,180,201,191, 27,  6,141, 85,250, 31,243,216,181, 91,146,181, 11,178, 26,
+131, 41,159, 80, 96, 41, 30,156, 35,130,139,150,129, 96,231,114,  6,166,175,245,102, 85,178,121,177,220, 31, 46,188,134, 45,234,
+ 92,210,213,  8, 37, 69, 80,236, 70, 84, 50,184, 51, 47,149,252,217,153, 83, 25, 61, 26,219,184,189,130, 61,213, 50,188,159,220,
+173,206,159, 11,121,212,253,163,233,215,140,223,157,158,223, 94,125, 88,174,230,162,147,247,242,178,124,252,241, 96,244,212, 53,
+148,201,189, 59,195,103,250, 12, 92, 83,196, 88,114,106,144,195,135, 27,102,119, 26,158, 14,253, 73,209,175,207,203,245,178,184,
+217,182,223,234,221,166,109, 27,159,176,  6,103,140,175,228,236,162, 40,190, 84,139, 79, 85, 97,149,159,122,175,247, 93, 81,170,
+205,179,126,122,110,106,173, 27,146,244, 24,246, 95, 71, 16,191,159, 32, 84,181, 96,242,107, 85, 94, 87,139,171,143,149, 18,226,
+123,125,220,118, 26,180,249,101,244,178,100,173, 85,219,  3, 18,239,156,165,  1,205,116,251, 44, 27,138,187,209, 97,195,151, 66,
+124,222,208,210, 13,213,193,253,144,223,125, 19,115,178,227,112,167, 37,241,  9,192, 95,120, 24,143,181,218, 15,  0,162, 39,146,
+175, 27, 65,236,  1,228,109, 20, 51, 31, 34, 38, 15, 89,228, 25,203, 48,138, 49,143,135,150,234,104,124, 17, 11,115,232, 62,228,
+152,172, 35, 86, 74,248,209, 92,225,234,132, 72,230,221,241, 81, 75, 78,232, 60,166,104, 36, 76, 38,166,154, 97,103, 26,120,105,
+ 72, 65, 67,168, 55, 13,155,159,176,109,  8,137, 84,146,107,215,228, 90,126,132, 78,128,236,220, 27,104, 17,228, 39,182, 17, 46,
+179,184, 14,  6,183,200, 22, 39,202,122,220, 53, 91, 98, 50,248,139, 97,142, 28,174, 10,  5, 12, 18,  3,194, 13, 69, 35,254, 83,
+ 70, 18,239, 50,140,193, 25,152, 40,238, 68,193, 24, 24, 90, 74, 78,236,199,104, 98, 57, 32,191,225, 91,119,237,150,129,125,245,
+108,236,  4,112,157, 79, 20,226,154,170,113,129,199,177, 36,188, 63,174,143,118,235, 33,186, 80,164,145,230,193,215,139,186, 52,
+ 75, 76,190,239,103, 20,159, 25,143,122,185,231, 76,  9,178,226,200, 76,185,225, 61, 73,153,249,241, 71,  0,210,174,101,167, 97,
+ 24,  8,102,243, 80, 91,209,  0,109, 65,136, 11,112,131, 15,224,255,127,  3,132,248,129, 10, 65, 11,164, 73,155,196, 94,188,246,
+174,227, 52,225,212, 91,171, 70,145,220,196, 99,123,118,118, 38,245,239,178, 26,116,195,195,177,109,230, 41,234,184, 78,222,  4,
+193,205,181,117,166, 99,159,106,217,200,131, 45,163,113,239,161, 76, 98,122,  5, 53,102,196, 72, 50,223,138,218, 25,234,137, 55,
+218,177,153,156,159, 36, 46,237,213, 51,191, 46,199,141,210,224,118,117,249,186, 35,199,184, 89, 17, 61,173,202,171,185,250, 46,
+150,148, 46,229, 83,182, 81,204, 43,120, 57,117, 91, 20, 86,225, 77,116,208, 37, 15, 81,102, 15,240,181,172,148,222,253,145,  2,
+249,226,248,173,220,155,207,183,144,153,  1,191,127,109, 95, 62,177,106, 72,153,190, 72,210, 27,213,174,255,127, 84, 56, 80, 15,
+ 96,192,216,168, 64, 65,149,  6,100, 78, 67,245,  0, 85, 84,237, 38,163, 24,219, 12,210, 60,159, 62, 95, 76, 15, 20,103,107,142,
+217,120,150, 81,126, 83,131,102,181,199,143,189,193, 15,179, 18,144,117,191,249,167,118,191,205,250,167,174, 35, 42, 18, 28, 78,
+  6,119,103,192,144, 17,190,195,221,108,246,120,157,223, 47,231,243,116,242,176,202,201, 84,182, 41,182,229,182,178,230,128,139,
+105,182, 41,128, 54,141,137,195,114,175,163,245,244,  2,159,167,209, 57,144,  6,  6, 39, 67,227,132,184, 59,237,119,102,173,116,
+131, 86,100,185,128,130,195,129, 21,150,  0,145,243,179, 70,143,242, 32,133,109,215, 48,229,224,  9, 99, 23, 76, 36, 69, 87, 37,
+144,204,188, 13,244,213,232,208, 73, 43,209,239,119,100, 11,239, 24, 21,  2,222,184,247,160, 89, 63, 67, 13, 65,212,137, 70,164,
+ 60,187, 91,137,111,130,173, 59,179,165,171, 61,230,114, 98,  6,181, 53,117,219,118, 14, 66, 50,131, 75,210, 68, 67,107, 39, 26,
+155,228,156, 39,151,137, 85,148,153,117,107, 79, 49,  6, 21,104, 27, 24,107, 99, 55, 81,113,135, 48,146, 30,220, 92, 85, 99, 67,
+202, 25,251,131, 45, 75, 49,240, 40, 30,163, 15,196,214,129,132,  9, 58, 84,141,128,143, 99, 99,237,216,136,  3,153,185, 62,214,
+ 75,192,176,176,137, 35, 93,153, 24,  6, 36,245,  3, 65, 28, 81,165,189,189,187,147, 80,245, 91,195, 16,250, 48,232, 11,195, 33,
+101, 42, 36,  4, 11,100, 99,169,151, 70,214, 36, 49,181, 29,242,244, 37, 78,197,140, 44, 14, 23,113,215,210,214,201,194,109,  8,
+188, 40, 66,188,232,  4, 69,155,239, 24, 60,212, 99, 42,187, 81,232,255, 19,128,182,171,217, 73, 24,  8,194,179,219,133, 66, 68,
+ 37, 61,153,120,242,224, 75,248,254,143,224, 19,152, 72, 36,132, 32,  6,104, 41,221, 89,119,102,246,167, 20,241, 98,228,194,165,
+  9,180,221, 78,103,191,249,126,134,252, 72,219,115, 15,255,135, 66, 63,164,114,203,131, 20,171,188,138,185,175, 42, 74, 87, 51,
+160,238, 66,  2, 54,  6, 51, 48,186, 34, 98,223,  1, 46,219, 68,171,159,228, 96, 86,114,251,228,121, 51,204,197, 32, 83,114,167,
+223, 14, 27, 57,174,  6,120, 93,195,203,228,171, 80,119, 71, 43,199, 34,163,165, 28, 51, 24,168,253, 33,185,147, 56,125, 28,  0,
+ 44,192, 58, 98,174,176, 29,228,124,109,217, 88, 77, 64, 27,218,169,185,133,197, 27,250, 81, 92,213, 71,108,220,  1,187, 29, 98,
+ 67,194, 16, 34, 77,202, 31, 46,122,100, 74,219,  3,103,174, 33, 99,170,231, 17,159,216,135, 38,174,242, 45,116,170,131,114, 95,
+212,246,120, 63, 34,  2,144,225,213,196, 49, 98,110,221, 98, 77,195, 53, 42, 42,219, 14,166, 99,221,250, 19, 55,186,109, 79, 31,
+159,205,234,212,109, 89,159,101,255,  6,187, 79,153,224,239,139,123,165,204,243,124,246, 52,159,150,  8,139,229,222,194,225,125,
+ 77,218,162,189,237,252,123,206, 87,172,153,129,219,137,191, 11, 90, 44,151,147, 27,162,139,249, 46, 46, 69,  2,161, 40, 16,  7,
+197,125, 32,111,145,180,162,222, 34,  8,227, 71,206,134,129,216,188,  7,187,177,108,222,151,186, 66, 21,249, 55,161,249,136,125,
+121,168,241,156, 44, 47, 56,146,192,206,226,103, 29, 58,107,230,205,243,122,182,201, 73, 70, 37,158,117, 12, 74, 35,163,121,147,
+ 90,120,  9, 54, 34,196, 15,181,186, 96, 27,171,136,110,235,160,247,234,119,178,202,101, 86, 78,252,198, 52,126,133,  8, 53,138,
+240, 67, 64, 98, 20,251, 25,122,101,148, 48, 46, 78,118,207, 67, 63,223,  7, 84,211,170, 30, 23, 59,138,170,229,177, 67,184,188,
+ 82,227,253,245, 98,149,136, 19,100,198,134,137,177,147,105,115,204, 97,194,190,234,247, 28, 54, 83,172, 86,151,147,201, 48, 58,
+228,247,129,138, 14,194,191,240, 83, 46,104, 51,238, 10,137, 82,103,187,154,193, 48,  0,207, 55, 86,195,169,174,187, 52,227,191,
+178,183,160, 74,162,203,145, 42, 26,219, 22,177,178,251,206,192, 56,209, 72,185,135,234,113,189, 89,234, 80,223,141, 74, 94,250,
+100,203, 49,106,142,141,100, 91, 51,153,141,105,131,154, 12,228,144,137, 68, 52, 29,  1, 78,172,204, 94, 74,104,163, 46, 23,243,
+140,240,234,231, 91,  0,210,206,102,167, 97, 24,  8,194, 94,203,  9, 52, 45, 63, 18, 18,103,  4, 23,222,255,129,224, 82,137,  3,
+ 69, 17, 45,184,141, 99,123,241,122,237,196,129,180,170,132,218, 67,212, 30,154,186,145,187,187,153,249, 38,241,103,250,105,179,
+131,191, 98,140,255, 84,148,112,198,173, 93, 56,249,  2,204, 29,195,232,234,134,210, 68,130,153,212, 17, 97, 50,233,193,118,  8,
+ 20,165, 57,225,132, 27, 32,123,172,146, 12, 71,106,183,127,167,  9,196,120,101,220, 11,127,189, 92,124,155,177,147, 75,198, 90,
+143, 67,138, 84,154, 25,197,113,126, 45,180, 35,107, 54, 33,118,163,236, 79,118,180,161,  3, 75,221, 49,165,143,202,134,116,232,
+254,197,187, 56, 63,  9,187,170,109,157,221,120,191,165,124, 98, 81, 75, 50, 64,109,242,152,165,138,163,106,127,228,210,158,249,
+ 74,121,  1,171, 41,130, 99,152, 18,184, 28,119, 28, 78, 82, 27,111,156,239, 76,223, 26,175,123,219, 91,194,126, 83,162, 56,132,
+146, 76,124, 57,103,156,216,237,205,122,103,222,  4, 45,141,249,199,112,134, 67,  1,155, 72,194,121, 94, 52, 79, 55,171, 86,219,
+117,171, 63,181,177,214, 29, 40,  5,208, 28,122,251,161, 77, 56,238,188,187,109,100,189,168, 95, 91,197,238,159,232,134, 76, 38,
+ 56,255,171,120, 79,225,158,  2, 70, 48,233,252,197,  6, 83, 44,210, 88, 53,101,187, 80,209, 32, 79, 74, 54,244,165,  2,102,176,
+209,227, 40,116, 28, 98,221, 89,123, 46,139,178, 34,115,154,112,136, 60, 45, 60, 85,  5,190,128, 93,213, 25, 50,147,131,140, 49,
+ 83, 81, 37, 14,221,226, 84,122, 87, 60,185,175,228,  1, 56,163,175,146,199, 11, 10, 80, 61, 83,185, 29,103, 38, 65,226,168, 20,
+  1,113, 17,115, 84,147,248, 17,237,193,117,142,120,238,184,  4,213,161, 33,237, 35, 77, 99,108,180,123,245,196,153,177,134, 54,
+119, 34, 94, 59,138,109,  2,254, 40,207, 46,194,162, 67, 47, 59, 23,200,137,159,105,105,176, 92,118, 44,229,193, 80,252, 31, 12,
+134, 91, 16, 51,254, 50, 60,231,166,224, 25,111,225,156, 78,228,148,118, 70, 78, 54,119,228, 52, 92, 26, 38, 68, 32,168,  4, 85,
+145,246, 72,169, 74, 85, 68,168,173, 76,215, 41,169,194,235,241,255, 52,222,173, 78,243, 84,106,213, 66, 11, 27, 74,251,240,195,
+ 55,151,171,176,236,138,  9,183,200,233,164,112, 81, 53,144,162,  8,112, 40,127, 31,238, 30,183,251,150, 55,199,171,234, 42,242,
+ 38,143,158,240,143,  0,140, 93,199, 82,195, 48, 16, 85,117,136,  9,101, 56,112,228, 19,248,255, 11,255,194,192,  5,134, 50, 64,
+  8,196, 69, 43,180, 69,178,226,  1, 18, 79,238,118,108,105,181,229, 21,183,183,103,255, 71,223,230, 63,161,224,  3,179,120, 51,
+167,  9,196,138,145,192,  6, 58, 81, 79,102,202,244, 47, 17, 11,111, 24,164,192, 20, 39,233,206,198,200,243,148,125, 69, 67,102,
+172, 32, 63,159, 85, 98,166,235,170,109, 30,123,159, 22,175, 35,176,117, 54,227, 68,117, 34,200,253, 25,205,206, 91,146,201,153,
+ 83,171,159,122, 73,189,  1,245,103, 68,  0,178,206,226,189, 81, 29,154,210, 33,208,240,161,234,134,121, 50,185,110,211, 33,222,
+ 35,217, 36, 86, 52, 40, 91,189,153,240, 91,232,132,217,164,169,130,198,179,  6, 47, 33,214,227, 26,115,240, 97, 51, 96,255,118,
+233,210,113, 18,207, 72,140,119, 19,128,228,189,208,109,213, 91,212,  9, 24, 52,156,123,179,233,250,117,215,111,200,185, 57,100,
+183,169,189, 53,224,175,193,125, 73,191, 75,101,174, 79, 79,190,  1,110,158, 95,211,243, 92, 40, 59,  6, 19,130, 67,114, 60,105,
+109, 45,104,144,116,236,213,217,194,223,191,185,110, 84,105,133,  3,229,135, 20,171,216, 42, 59, 22, 92, 19,247, 93,117,209,168,
+202,233, 88, 77,190, 51,243,207, 94, 66,  9,183, 98,114,130,169,179, 20, 93, 44,125, 19, 25,255,149, 32, 27,166,154,188,178,226,
+ 41,201,190,206,101, 35,136,151,147, 54, 38, 78,248,238,200, 10,116,164, 14, 86, 44,  4, 37,182,231, 66,128, 86, 51, 22,162, 76,
+ 84,178,145, 27,  0, 90,154,250, 38,206, 55,111,172,168,203, 34,131, 44, 96,119, 16,239,139, 93,124, 17, 70,118, 17, 59,139,187,
+109, 16, 35,176, 75, 19,122,189, 93,217,149,234,190,122, 28, 77, 12, 93,255, 49,142, 77,123,180,120,215, 91,224,225, 42,113, 94,
+233,107,208, 30,  4,226, 18,107,182, 99,  3,222, 79,197, 77, 13,166,233, 52, 72,219, 67, 77,212,212,226,145, 93,169,  7, 75,217,
+  4, 57,  3,139, 48, 29,201,121, 40, 91,167,243, 59, 48,214,131,145, 31,250,127,154,210, 33,193, 93, 87,105,187,146,241,161, 38,
+ 96, 12,130, 32,113,232,110,156, 55, 22,149, 42, 81,115,  1,147,209,166, 89, 24,176, 71,174,105, 93,219,218,214,219,  6, 97,  1,
+204,161, 82,200, 16,235,198, 45, 78, 68, 81,222, 39,157,157,168,180, 31,108, 90,  9, 46,213,250, 64,250, 51, 30,185,241,114,148,
+167,155,223,189,220,226,221,232, 85,124, 14,107,189,203,140,153, 93, 63,  2, 48,118, 45, 59, 13,195, 64,208,107,167, 41,180,  5,
+ 85, 28, 65,136, 35, 39,254,255, 27,184,243, 15,156,120,  8,149,166,137, 31,139,119,215,118, 28,210, 22,206, 85,163, 40,173, 39,
+187, 51,187, 51,205,252, 93,  7,199,192,113,142,242,225,116,  2,200,255,  5,232,217, 83, 47, 16, 15, 48,182, 73,152,148,249,236,
+118,170,197, 38, 12,114, 54,151, 46,102,204, 90,229, 92,214, 80,239,202,149,165,211, 66,122,197, 50,185, 89, 60,133,203,117,176,
+ 86,225,  1,113,219, 46,222,253,245,103,239, 56, 60, 86, 99,217, 57, 80, 73,  5, 43, 24, 74,193, 79, 74,139,129,159,225,  2,156,
+104,247,144,168,112,118,188, 25,121,146,129,187,206,134,241,210,179,219, 76,147,205,208,215, 38,130,123,115,191, 89,190,125,196,
+ 99,149, 36,217, 54,155,139,193,105, 98, 36, 76,219,172,118,154,141, 39, 95,236,242, 92,205, 64,106, 42,205,185, 95,  5,108, 27,
+ 61,176, 84, 24, 31,220,142,247, 14, 91,178, 58,140,173, 35, 44, 53,  4,231,123,235, 58,231, 73,155,205,248,142, 21, 95, 23,254,
+113,128,228,102, 86,236,129,243, 96,204,227,118,243,178,239,159,187, 67, 72, 31,121, 10,144,112, 68, 91,245,220,232,180, 10, 91,
+128,141, 49, 30,240,117, 71,191,177,103, 34, 89,156, 37,164, 82,175,173, 97, 48, 40,156,217, 35,201,139,254,215,240,232,236,205,
+ 14, 18,118,156,166, 44, 85, 45,167,225,236, 20,135,186, 43,144,250,129, 52, 85,173, 96,210,214,143,252,114,  1,250,106,137, 42,
+254,229,210, 34, 29,230, 52,108, 48, 69, 28,100, 41, 73, 94, 11,236,167,229,227,229,217,248, 78, 82,186, 33,173,231, 28, 27, 69,
+153,222, 92, 41,111, 81,184,248, 84,182, 83,150,177,228,164,129,194,105,139,195,  9, 80,133,178,114,106, 31,187, 89,141, 87,203,
+ 53, 88,202,185,105, 34,228,235,176,115,223, 30,164,202,193,108, 65,236,179,193,140, 39,158,143,231, 14, 83, 99, 12, 53, 47, 92,
+188, 32,202,188,105, 64, 85,243, 84, 48,110, 23,101,112,247,149, 93,125, 46,222,199, 57,200, 58,173,  9, 79,128, 59,254, 93, 82,
+158,135,163,243,156, 76, 13,238,201,231, 95,102,167, 56,245,179, 97,103,127,169,217, 57, 20,142,120,155,197,106,113,113,183,186,
+221,182, 55, 90,235,193,217,158,182, 98, 99,251, 74, 10,170, 97,134,235,210, 92,220,172,182, 17,250,227,133,186,205,112,  8, 93,
+239,250, 47,251,213,217,254,219,237,173, 63, 88,138,198,101, 23,198,108, 30,  7,105, 99, 89,243,193,116, 50,129, 51,250, 93, 79,
+111,250, 71,  0,202,174,174,167,113, 24,  8,218,235, 56, 77,139, 80,133,184, 59,241,122,226,133,255,255,204,255, 64,226, 23,128,
+ 16,186,147,144, 26, 66,237,245,237,135,183, 14, 41, 20,174,143,169, 84, 41, 77,188, 30,207,206,206,116,167,255,  6,127, 84,229,
+195, 82,  1,233,191,195,179,127,147,142,119,213,233,204, 27,157,  2, 38,139, 55,  8, 95, 39,174, 51,109,143, 22,138,137, 30,235,
+232,  2,231,111,122, 72, 31, 37,167, 28,146, 51,235, 12,  6,176,100,225, 79,127, 70,239,202,143, 72, 95,133, 71, 90, 92, 19, 61,
+165,236, 27, 51, 88, 51,131,244,240, 11,214,143,231,169, 19,  1, 70,111,114,101,240,181,  9,217, 89,214,168, 90,113,105,162,180,
+120,173,224,133,235, 68, 96,195,159, 94,202,223,  0,110, 27,225,234, 60,254,222,196,251,167, 93, 47,  5, 49,205,230,149, 38,219,
+153,242,215,138,168,122, 92,  8,182,236,181,181, 59,182,168,144, 50,210, 29,211, 13,167,178,135, 16,  3,107, 58, 87,200,131,  1,
+107,238, 90,139, 28,196,165, 93,194,241, 45,255,117, 89, 51, 99,119,239, 93,207, 78, 67,120,111, 74, 77,165,101,232, 94,110,226,
+112,125,177,190,125,126,185, 19,117,144, 30,149, 94,100, 47,166, 45,103, 96,145, 93, 33,208,178,118,101, 83,252,165,131,135,169,
+127,205,140,121,164,120,128,180, 84,184, 60, 41, 60, 60,144, 51,243, 74,229,103,193,243,150,164,244,241, 91, 87,135,230,148, 59,
+ 65,231,222,119, 86,143,101,218,110, 73, 13, 11,224,230,157,177,174, 43,197, 24,109,142,169, 73,189, 44, 69,187, 78,251,248, 42,
+184,  2, 77,209, 41,161,250,228, 57,141,255, 82,139, 72,204,153, 48,159,188,200, 84,221, 53,136, 14,138,199,207,180, 33,179,138,
+217,186, 83,141,125, 87,216,110, 62,201,232,154,170,191, 44,251, 94, 44,200,148,240,110, 55,166,113,130,137,128, 11,123,164,179,
+159, 11,106,158,147,254, 69, 50,  5,170, 85, 94,156,126,  4,200,163,210,242,246,235,214, 13, 22,237, 65,133,234,104, 14, 34,126,
+193,133, 88,185,199,170,242, 41,165,197, 81, 53,183,119, 83,  7,205,140, 61,173,181,124,138, 96,249,127,160, 89,190, 10,207, 57,
+ 78, 16,226, 43, 81,182,107,122,162, 67, 63, 32, 34,211, 50,146,  0,  4,190,251, 53, 92,254,220, 92,173, 96, 69, 15,122,164, 35,
+116,206,123,182,174, 44,135, 76,201, 61, 18,240, 74,210,190, 67, 42,253, 49,  4,161,217,160,195,184,133,237,186,155,124,142, 37,
+172,198,244, 58,122,142, 11, 77, 46,  9, 60, 82,240, 99,103, 53, 23, 84,110,  2,150,  4,187, 88,161,255,  4, 96,236,218,118,219,
+134, 97,168, 40,167,142,147, 21,117, 59,236,105,239,  3,  6,108,223,189,255,106,135, 61, 20, 45,138,100,151, 68,150, 37,113, 34,
+169, 91,235, 54,105,144,135,192, 72,108,193,142, 40,234,240,240,156,215,241,247, 19,123, 27,124,137,200,195,187, 33,120,120,207,
+215,160,  1, 26,161, 96,147,139,139,229, 61,116, 53, 94,149,152,187,238,215,113,153,  4,128,  6,244,172,111,148,237, 46, 72,170,
+ 79, 63, 50,160,119, 30,140,120, 76,198,  7,165, 51,237,  1, 84,181,249,204, 83, 42,205, 40,182,157,140,143,106,208,118, 29,226,
+138, 44,251,104, 10, 97,146,119, 31, 51,204,210,103, 66,235, 86,119, 49, 97,191,207,153, 23,101,253,168,198, 14, 70,232,126,237,
+236, 79,239,123,142,251,151,164,  8, 79, 67, 55,153, 15,211, 61,199,106,222, 42,177,182,226,145,242,218,230,152,187,226, 51,111,
+132, 93,139, 97, 31,148,225,174,152, 13,119,215,117, 90,226, 35, 88,135,143,179,127, 82,238, 15,183,191, 78,121,145,104,229, 98,
+212,107, 18,213,133, 36, 51, 48, 32,211,179,175,200,247,126,248,242,241,195,143,135,167, 91,222,158,119,205,223, 78,244,  9, 38,
+133,191,121, 14, 59,106, 14,192,207,215,195,157,217,120,145,129, 67,169,255, 33,151,177,125,170, 23, 22,212, 35,183, 33,161,106,
+ 49,228,218, 36,131,207,117,192, 67, 33,  4, 74,127, 83,229,153, 44,239, 42, 36,197, 73, 56,145, 15, 66,161, 45,166,181,  1,117,
+ 67,203,213,109,184, 41, 98,225,  5,169, 79,  5,216, 80,124, 44,115,176,128,100, 67, 70,215,214,117,158, 21,223,167, 70,204,182,
+ 25,187, 28, 46,182, 23,149, 36,227, 83, 38, 84,101, 63,206,  0,209,212,162,199,  1,217, 19, 80,232, 28, 87,181, 19,176,206, 39,
+164,205, 78, 96,105, 85,  6,247, 69,164, 15, 67, 67,184, 76,144,147, 60, 47, 85,145,120, 92,178,250,160,208, 66, 84, 50, 57,199,
+172, 12,207,100, 75, 85, 77,169,176,218, 34,150,224,238,213,219,222, 26,225, 92,168,111,106,135, 24,206,  6,166, 69,112, 87, 57,
+103,239,  8, 71,164, 30,223,152,170,199,208, 60,110,110,194,236, 46,136,189,161,199,225,234,219,248,245,102,253,233,159, 53,123,
+146, 60,154,172,183,115,152, 15, 49,117, 39, 82,136,140,210,179,252,115,146,223,137,119,243,224,173,245,179,117,211, 28, 98,230,
+126, 60,122,243,215, 29,140,155,246,184, 51,234, 64,164, 62,162, 93,174, 50, 95,190, 83,141,141,204,178,135,169,124,254, 47,  0,
+103,215,178,211, 48, 12,  4,215,206,163, 15, 64, 28,170, 74, 32,113, 70,226,159,249, 36,126,129,  3,226,196,  1,129, 40, 74,155,
+164,177,241,172,215,206,166, 45,  8,144,170,158,114,104, 98,215,153,157,157,157, 41,255, 33,122,209, 40,222, 79, 98,133,127,198,
+230,191,229,235, 21,132,151, 10,214, 38,255, 13,169,106,163, 11,187,152,106, 24,177,177,225,138,123,125,121,253,212, 62, 14,106,
+224, 89,223,188,117,170, 31,139,132,108,136,191,202, 40,173,225,220, 37,126,155, 66, 60, 91,216,193, 57, 44,158,181,201, 61,158,
+164,208, 29, 34, 13,196, 46, 52,252,  7,197,252,228, 46, 77,211, 85,140,124, 59, 78,249,224,  1, 87, 23,106,171,240, 10,185,173,
+231,117,215, 62,160,205,137,  3, 20,145,211,173,123,110, 65, 92,156,225,124, 52, 75,124,202, 13,237, 59,100,214, 75,202, 71,118,
+229,245,223, 96,103, 29, 11,208,166,185, 89, 23,  7,107, 83,135,179,226,145,246,240,240, 22,100,151,252,116,  3,102,223,161,187,
+107, 59,214, 84,212,228, 63, 29,189,211,126,139, 44, 54,  9, 21, 33,229, 53,159,231,144,115,137,224,149, 66,191, 86,221,212,115,
+162,187,249,114,117, 81,221,191,188,110, 20, 45,216,171, 18,176, 73, 47,158,125,202,  8,108,236,188, 25, 16,105,228, 93, 38, 97,
+ 37,252, 86,108, 98,180,109,202, 81, 67,224, 24,194,107, 60,105,200, 37,243, 45,239, 51, 15, 12, 52, 58,206,143,142,252,147,161,
+147,163,137,199,194,  9, 97,177, 17,147,154,178, 42, 24,174, 79,229, 27,137,130,224, 81,163, 88,104,226,120,143, 40, 94, 70, 61,
+ 56, 92, 27, 54, 72, 46,128,103,118,167,142,233,172, 49, 99, 85,184, 49,175, 21,241, 52,145,200, 41,214, 17, 33, 86,195, 72,239,
+ 79,124,214,204,184,148, 78, 15,218,240,149, 61,123,123,153,188,242,224,216,125, 52,  6, 49, 38,153,187, 97,164,140,164,131, 27,
+ 97,187, 88,253, 37,110,195,143,116,202,193,201,174, 45,104,146, 92,149, 93,254,114,156,147, 40,233,213,225,110,178, 32, 39,201,
+ 96, 14,144,187,255, 27,  6,215, 91,198,211,111,155,135, 39, 14,119,139, 58,179,136,153, 80,133,173,194,247,110,219,  4,204,110,
+108,121,181,184, 89, 47, 86, 31,253,110,211,190,177, 97, 50, 53,188,178,113, 95, 23,236, 75,152, 20,177,184, 97, 96,242,176,238,
+  6,206,109,225,170,170,  0, 61,220,211,208, 33, 73,209, 84,182,174,221,172,243,221, 64,125, 79,125,216, 52, 51,170, 75,  8, 40,
+145,131,203,  8,163, 48,162,168,113, 52,125, 44,241,103,127,  9, 64,217,181,244, 36, 16,  3,225,105,247,133, 32,143,141,137,  9,
+ 18, 47,222,136,209,255,236,143,243,224,  5, 53, 17,113, 95, 29,233, 76,103,182,139,128,122,225,202, 82, 96,250,245,235,247,232,
+241,251, 31,  4, 48,199, 69, 47,240,155,156,230, 60,138, 63,245, 46,145, 35,128,219, 57,213,210, 97,251,196, 53,235, 52, 84,138,
+ 35,248, 94,183, 27,115, 96,109,141,126, 83,241,143, 61,  9,153,173,225,180, 78, 30, 73,156,141,220,114, 94,175,202,122, 57,239,
+ 22, 11, 15,116,183, 59, 11,166,215, 65,240,198,112, 53,189,110,154,198,186,207,170,105,129,173, 34,244, 71,172,229,122, 19,195,
+168, 13, 68,  0,237, 28,230,174, 24,173,179,162,106,219, 55,202, 48, 96, 36,187,  0, 88, 66,122,107,178,155, 52,219, 63, 84,234,
+125,129,189, 97,  6,251,218,198,115, 49,161,137,204,223, 90, 50,206, 76,164,152, 84, 38,189, 13, 66,111,252, 34,201, 69,133,110,
+231, 85, 19,254, 90,167,130,110, 11,184, 17, 74, 71,139,191, 19, 97,169,148,125, 74,133, 53, 82, 84,126, 65, 31,118, 70,200,253,
+113, 60, 89,149,249,211,203,251, 71, 20,108,121, 16,126,233,100,149,106,122,212,135,113,246,140,211,150,175,201, 53,102, 90,181,
+143, 97,130,240, 55, 24,208,117,116,106, 57,  2,225, 35, 91, 19,162,214, 53, 80,165, 47, 66,204,  1,196,102,162, 80,250,129,135,
+219, 40, 14,120, 77, 59,104,204, 50, 71, 64,189,236, 56,170,239,  1,171,137,  3,131, 99,111,143,226,213,172, 74, 39, 76,139,170,
+ 68,166, 61,  1,117, 89, 98,168, 62,184,  9, 52, 50, 11, 29, 74,168, 36, 68,125,150,253,178,171, 43, 50,230, 64,228, 58,148,215,
+202, 33, 83,  6,161,159, 54,188, 58,162,205,124,196,176, 88,138,249, 68, 33,250, 84,166,113,226, 50, 62, 28, 78, 97, 38,228,141,
+ 42,220, 81, 46, 43, 64, 92,100,146,  8,163,247, 35, 28, 39, 31, 15,119, 93, 24,232,  6, 25,  6,120, 32, 49, 56,117,231,111,254,
+ 45,  8,249, 57,220,185,250,205,203, 92, 82,147,237,241,251, 30,179,103, 62,204,  9, 46,243,233,186,188, 47,139, 57,205,111,152,
+ 20,227, 34, 73, 51,203, 12,142,103,182, 50,210,180, 83,123,162,179, 50, 77, 88,123,227,188,134,205,228, 82,113,210, 96, 23,204,
+183, 30,173, 39, 59, 95,144,136, 76,247,119,164,152,204, 33,247,  4, 53,225, 96,117,134, 70,249,225, 70, 73,204,111,  1, 24,187,
+154,158,132,129, 32,186,211,143, 21,  4,149,132,112,195, 68,207,254, 13,255,161,191,207,131, 39, 53,129,196, 40,208, 98, 59, 59,
+238,204,238,108, 11,  5,245, 74,210,148,182,219,217,215, 55,239,205,251, 91, 63,  3,167,240, 56, 13, 72, 27,211,187,251,195,129,
+ 75,231, 80,252, 63,194, 69, 85,201,  0,161, 94,136, 79, 58,170,159,  3,253, 33,111, 65,166, 62,190,136,205,  8, 50, 56, 97,156,
+ 72,251,134,144, 88, 28, 93,148,251, 27,103, 29,226,205,152,110,103, 77, 67,109,181,195,247,173,249,106,205,196, 54,203,133,185,
+ 25, 21,207,175,  8,234, 78,  8,223,161,171,207, 55,127,232, 53, 56,153,211,193,184,112, 39,249, 30,  1, 26,141,165, 64,127,199,
+ 55,148, 85,206, 30, 89,215,244, 93,239,113,150,219,199,217,124, 98,237,206,225,170,218, 35,210,180,132,169, 45,252, 21,125,214,
+251,106,183,255, 16, 17, 78,171,158,142, 70,215,229,239,119, 41,141,158,207,123, 25, 99,121, 79,108,227,132, 18,169, 13,124, 25,
+ 55, 50,112, 45, 63,183,218,207, 10,118, 98, 43,101,186, 21,126,169,236, 77,140, 73, 28,145,211,179,160,212,244, 66,177,252, 68,
+235,251,195,120,114,191, 24, 61,189,172, 55,218,135,112,103,186,178,233,114,252, 73,235,242,178, 66,206,218, 78, 38,247, 24, 30,
+ 29,201,220,  4,196, 37,142,229,104,229, 28, 67,248,212,120, 20, 82, 55, 85, 46,140,230, 73,211,205,158,164,195, 50,116, 52,138,
+ 22,186,218,212,183, 78, 29,202,137,244, 35, 49,209, 32,233, 65, 97, 24, 66,198,220, 77,230,122, 62,152,110,246,134,160,120,195,
+ 47, 41,229, 14, 66,130, 19, 47,222, 16,194,164,125,  0,248, 77,221,161,170,118,241,150,130,230, 83,116,138,  4,211,229,195, 68,
+ 30,220, 25,232,219,138,210, 31, 30,184,231, 28,165, 45, 36,116, 59, 59, 22, 41, 74, 48, 53, 27,195, 29,132,141,159,194,236, 20,
+113,122,212,226, 29,248,143,  2, 89,145, 26,170,  6, 41, 17, 61,189,226,142,177,216,197,163,218, 78, 65,148, 54,190,179, 43,205,
+ 12, 30, 29, 12,100,223,244,119,113, 39,241, 46,113, 23, 69,138, 59, 39, 55, 23,172,105,183, 25, 75, 45,232,246,106,185,156,222,
+ 93, 64,182,105, 61,230,171,107,  9,164,245,117,182,200, 75, 91,150,121, 83,111,169,114,204,232,202, 28, 75, 10,182,153,184,153,
+161,227,133,154,115,  7, 70,236, 18,130,  6, 81,237,201,190,148, 47, 96,190,166,117,107,176,148,188,181, 96, 96, 40,205,197, 56,
+243,101,100,  3, 60,108,135, 49, 24,106, 68,137,114, 56,124,154, 31,  1, 56,187,182,214,132, 97, 48,218, 47,209,214,213, 27, 19,
+199,246,176,193, 16,217,203, 94,246,139,247,231,  6, 99,136,232, 16,171, 73,219, 36,203,237, 75,211,234, 70,153, 79, 34,162,150,
+182, 95,142, 39,231,242, 23,126,239,141,220,123,  9,228,161,  7, 17,223, 54, 14,180,138, 79,193,171,224, 27, 94,  8,111,176, 80,
+114,128,183, 17,  9,175,123,181,149,106,197,244,227,226, 96, 77,  4,122,100,228, 89,125, 63,175, 39,105, 85, 50,161, 39,147,  9,
+ 66, 17,201,161,150,167, 82, 50,158, 60, 44,169,168,232,145, 59, 23,183, 31, 62, 38,176,130,170,155,132,243, 42, 97, 38,102,201,
+248, 69,107,195, 60, 40, 17,177,213, 52,146,115,100,246, 42, 57, 42,185, 97,236,179, 96,147,193,224,245,110,186, 94,206, 22, 19,
+ 61,226,146, 93,193,191, 79,124, 47,235,194,182, 43,149,150,196,  8,217,  0, 61, 77, 70, 52,178, 56, 37, 81,124, 77,168, 38, 72,
+209,125, 39,112,142, 91,  8,160,172,217,213,124,169,163,254, 99,180, 46,241,  9, 69,240, 30,  0,120,134,145,  3, 99,187,161,250,
+ 56, 28,189, 61,205,223, 63,182, 95,210,112,241,240,139,229,164,243, 88,  1,156,135,183,190,247,144,128, 79, 86,177,106, 62,147,
+103,101,214,109, 97,211,133, 66,204,159,251,228, 38,160,168, 83,119,135, 35, 70,226,162,238,185,  5,123,226, 69,104,248,235, 12,
+247,166,  7, 44, 98,  0, 84,210,175, 91, 65, 53,232, 30,218, 92,168,114,234, 46,136, 54,143, 60, 25,104,174,111, 95,131, 77,156,
+253, 14, 87, 21, 64,197, 39, 33, 87,203,118, 33,180,200, 26, 91, 76, 80, 34, 54,206,207,184,100, 22,117,189,222, 60, 10, 45,134,
+ 86, 93,209,  1, 41,151,115, 16,225,101,  8,162,249,152, 30, 81,237, 69,166, 35,222,240,244,186, 53,169,218,221,217, 86,100,178,
+ 10,165,184, 74, 54,240, 28,188,165,184,131,220, 65,184,190,173, 11,230, 65, 69,219,137,255,176,224, 93, 86,103,144,139, 17,132,
+127, 10,141,200,157,216,137,164,199, 58,213,176,157,208, 33,209,176, 61, 29,152,115,164,214,243,151,213,236, 89, 31,237,254,180,
+219, 28, 55,219,211,246,192, 15,231,178, 96,226,204,107,198, 68, 73,128,140,104,166,127,254, 89,214, 54, 34, 20,119,137,253, 30,
+131, 41,233, 20,190,191,198, 69,181,201, 74,131,120,236,150,161,132,140,146,188,178, 74,  8, 61,238,115, 24, 79,  6,211, 69, 58,
+203, 73,174,223,207, 85,137,149,121,141,235,  5,209,  4,252,  8,192,218,213,244, 36, 12,  4,209,221,150,182, 96, 15, 69, 73,228,
+224,193,155,241,238,255,143,119,255,133,  7,162,146, 96,  8, 72, 41,221, 47,119,118,102,182, 31,152, 96,140, 55, 14,180, 52,219,
+101,246,205,155,121,111,254,194,191,143, 80,124,242, 83,215,141,227, 33,124,231,163, 44,127, 67,196,147, 81, 65,199, 15,210,108,
+ 70, 67,211, 44,157,235,213,104, 36, 57, 44, 37,168, 23, 76, 12,203, 71,136,189,196,209, 79, 22,166,105, 39, 14, 73, 49,108,179,
+155,207,220,  2,150,200, 54, 13, 16,208, 40,151,244, 39,111,107, 68,173, 66, 92,147,122,245,217,222, 47,243,183,173, 77, 51, 10,
+151,193, 23,194,223,165, 61, 40,113,  4,213, 18,236,253,  6,181,223, 12,186,243, 30,250,198, 37, 62,  4, 18, 60, 19,102, 43,210,
+ 70,156,222,119,234,101,183,157,131,186,213, 95,139,232, 19, 30,170, 69,229,123, 40, 87,214,195,117,190,104, 32,108,153, 54,193,
+217,173, 81, 42, 21, 51, 83, 69,173, 84,240, 48,199, 96, 65,163,  3, 83,212,134,158,206,128,241,225,119, 45,135,254,188,103,234,
+171,153,168,153,113,222,231, 24,197,251,132, 96, 41, 38, 79,119,213,243,102,247,170, 93,206, 91, 66, 95, 50,158,244,215,150,211,
+114,111,252, 14, 38,234,214,132, 67,220, 31, 57,123,181,169,245,113, 81,148,  6, 76, 57, 89,207, 58,156,176, 60,106,236,225,118,
+ 89,166,110,177, 46, 40,201,128, 43,100,193,210,141, 59,175, 69, 52, 36, 96,146,219, 14,208,173,141,129,210,141, 20, 46,118, 24,
+ 20, 18,164,225,168,151,200,245,224,188,166,220, 90, 16,119, 18, 68,161, 96, 52, 32, 41, 39, 36, 71, 41, 41, 25,179,224,228, 56,
+109, 49,  7, 69,255,254,128,247, 44,210,225,131,226,  2,170, 62, 35, 55,194,124,146, 38,218,134,165,252,110,172,138, 27,253, 97,
+ 49, 13, 96,243, 62,219,121,228,179,133, 89,215,164, 64, 84,209,136,  1,151,189,178,170, 99,204,142,128, 93,246,209,186,176,180,
+168, 29, 80,235,102,162,179,104,185, 11,238,230,220,122, 37,194,118,251, 31,182,213,113, 41,162,207,118,124,203, 14,146,242, 36,
+ 52, 63, 73,166,101, 16,182, 67,124, 79, 96,178, 66,250, 48,127,188,157,222, 40,115, 90,237, 62,214,245,250, 75,213, 14, 12,100,
+ 92, 38,243,194,129, 25,201, 36, 49,202,180,254,251, 69, 58,187,154,228,254, 51, 72,239,185, 53,  8,231,138,133,100, 83,147,143,
+ 40,212,137, 32,244,107,224, 41,208, 23,194,166, 34,189,145, 85, 35, 84, 38,139,178,168,174,139,170,156, 76, 65,110, 86,251,216,
+213,104,161, 66,147, 54,174,137,197,218, 14,190,172,111,  1, 72, 59,159,157, 54, 98, 32,140,123,236,253,151,  0, 66,169,168, 84,
+113,229,128,  4,239,255, 18, 60,  3,135,158,138,160, 21, 41,162, 33,235,172,237,233,206,216,227,245,110, 36, 10,234, 45,135, 40,
+171,216,222,207,163,111,102,126, 83,253,255,210,248,162, 66, 78, 29,213,210, 97, 65,231,249,140,196,227,209,237, 34,241,  7,171,
+ 60, 31, 57, 61,157, 44, 49, 39, 19, 63,150, 41, 80,228,151,145,173, 19,182,110,255,173, 85, 39,166,221, 90, 82, 18,  7,208,152,
+241,214,165,182,201,231, 87,234, 12,174,216, 38,123, 38,198, 59,129,222,199,205, 36, 34, 57, 18,164,195, 91,119,113,170, 47,191,
+248,199,223,170, 54,  9,137, 51,120,127,222,186, 31,251, 49,218,133, 53,107, 37,112,109,123,174, 17,236,197,160,136, 87,130, 77,
+206, 56, 50, 11,158,208, 30,142, 65, 11, 91,250, 60,202,189,107,185,146, 36,  2,237,246, 18, 74,231,134,  3,252,204, 70,132,162,
+  0, 92,139, 64,175, 10,134,251,138,119,228, 64, 15,162,108,112,155, 78, 51,207, 86, 96,161,223,241,247,131,240, 47,163,224,181,
+226,239, 71,213,142,210, 31, 11,102, 54,202, 92, 93,172,108,135,119,223,223, 56,157, 59,155, 91,242,206, 27,120,109,148,213, 39,
+129,199,111,138, 91, 76,226,254,210, 63,220, 91,250, 55,245, 97,215,172,215, 26,170,185,219,176,104, 95,196, 41, 55,138, 98,  4,
+167, 43,188, 96,111,201,172,187, 82,217, 81,154,132,226,  4,223,178,151, 53,255, 40, 46, 43,163, 23, 81,228, 36,153, 58,138, 66,
+172, 34, 49, 50,126, 47, 97,148,  4, 59,163,146,201, 74, 55, 49, 70,238, 47,103, 54, 97,106,138,215, 25, 63,140,114, 38,210, 46,
+ 64, 97,241,207,114,149, 37, 97,141,159, 31, 74,101,159,187,163,203, 33, 18, 33,241,115, 69,198,217, 19,139,240,177, 35,166, 21,
+ 44,173,255, 41,113, 42,  0,168,160,222, 81,246,114, 49,179,178,231,209, 62,121, 90, 46,166,226, 72, 15,185,145, 85,148,125,140,
+157, 33,112, 65,207,191, 12, 22,154,154,105,186,222,247, 31,180,221, 97, 94, 56,192,111,159,206, 67, 34,169, 55, 85, 83,193, 76,
+  5,117,173,235,138,250,144,224,102,115,187,105,206, 15,193,255,124,253,245,180,123,120, 25,254, 12,202, 38, 47, 25,161,129, 22,
+ 98,183, 12, 98,239, 14,150, 84,190,109,192,236, 85, 28,  9,202,123, 33,212,160,  4, 69,231, 32, 61,141, 17,133,  4,118, 14,232,
+ 28, 47, 69,  7,245,105,115,182,233,190,118, 85, 87, 27,109,  7, 63, 56,199,233, 86,143,203,132, 68,194,116,253, 21,128,178,171,
+233, 73, 24,  8,162,179,116, 41,104, 82,176,  7,140,137, 39, 99, 60,120,241,255,255,  6,255,  7,  7,141, 33, 80, 43,221,214,118,
+199,157,157,253, 42, 22, 13, 92,129, 64,191,222,206,190,121,243,158,188,  8,202,197,121, 41, 76, 10,244, 48,158,184, 73, 53, 54,
+127,227, 58, 70, 78,134,138, 98,121, 26,120,140,209,153,201,121,252, 70, 30, 54,102, 27,249,202,194,  2, 61,168,129, 36, 43,219,
+ 22, 94, 10,226,190,204,233, 43, 37,222, 46,244,161,234,143,131, 85, 30, 33, 44, 36,225, 90, 99, 77, 99,231,212,185,160, 77, 84,
+103,187,212,117,  7, 95,157,126,190,223,108,119,111, 50,227,223, 53, 53,187, 30,190,117, 77,145,147,110,156,177, 77,198,125, 89,
+ 43,162, 44, 38,102,158,217, 64,167, 11,164,137,158,144,144,169,136,226, 24,242, 88,228, 18, 22,176,211,111,127,121, 42,222, 73,
+162,147, 28,243, 54,129,133, 28, 56, 59,  9, 98, 52, 96,206, 18, 73,192, 43, 95,182,244,201,149,106,146, 88,168,107,251,199, 66,
+ 90,172,217,109, 20,148, 56, 40,239, 54,197,107, 85,149, 51, 27,126,107, 87,136, 84,181, 57, 41,225, 47,  1,214,203,114, 71,102,
+ 98,218, 53,110,236,163,223,182,123,  6,247, 39, 83,221,203, 89, 43, 50, 76, 54,212, 98,234,120,157,135,170, 53,250,142,108,187,
+107,155,  7,182, 97, 52, 45, 25, 24,113,246,146, 12, 54,  7,152,222,137, 26,  4, 68,111,163,127,217, 75,246,  3,153,121,191, 96,
+  6,174,176,199, 71,116,185, 37,206, 22, 76,240, 98, 99, 99,105,236,160, 71,112, 48,115, 44,181, 39, 35,241,215,204, 37, 78, 75,
+122,194, 50,192, 68,211,  9,178,139, 83,159, 46,127,222, 92,145,236,203, 73, 72,251, 19,113,244, 96,226,160,195,234,168,  3,172,
+195,  0, 34, 17,188, 39, 13, 12, 28,213,221, 40, 18,100,247,211, 46, 24,150, 19,223,236,133,212, 25,198,251, 97, 14, 56, 17,143,
+ 55,253,234,176, 61,215, 74, 60,167,220, 75,216,121,183, 23,188, 89,174, 26,213, 88,181,140, 52,101, 50,131,187,129,251,135,213,
+227, 42, 47,204,  7,106,117,120, 63,126, 84,  4,238,138,163,167, 25,190,204, 87,230,146, 22,  3, 27,246, 76,242, 71, 52,207, 28,
+ 41,165,  5, 25, 63,  8,231, 81,196,146, 60, 22,122,245,118, 48,130,231,212,156,151, 15,106,239,210,209,215,216, 41,213,212,237,
+190,200,215,166,244,236,116,115,236, 63,205, 91, 11,177,108,176,177, 85, 90,  6,126,152,152,111,188, 31,  1, 72,187,150,157,134,
+ 97, 32,232,181,157,  7,105, 90,144,144,202, 29,206,252,  2,255,255,  5,252,  2,  2,  9,209,150,148, 18,146,216,120,215, 94, 39,
+105,154,138,199, 53,135, 68,114,146,217,209,206,206,172,254, 15,115,135,121,148,233,198,106,245, 41,136,159,134,254, 40, 57,224,
+ 32,158,  6,177, 96, 43, 97,100,139,152,180, 14, 57,223,153, 55,245,244, 52, 35, 19,201,165,192,165, 64, 47, 31,120, 90,238,205,
+ 64,219, 60,126, 90,223,130, 40,  8,128,182,109, 47, 33,102,157,  3, 50,171, 20,206,167,231, 26, 74,  9, 36,156,238, 90,210, 60,
+124,202,135,150,193, 76,230,161,121,207,147,239, 29,163, 97,194,109,110,134, 46,188,210, 50,255,165,161,111,164,204, 25,255, 16,
+222,217, 84,243,196, 97, 44,  9,127,136,127,177,  3,215,143,228,201,116,143,179,121, 16,214,225, 61,176,111, 52,226, 82,201,193,
+111, 91,135, 60, 13,247,104,168,133,169,  5, 84,116,164,121,216, 24, 30,154,242,254, 11,202,232, 41, 43,220, 27, 46,175, 46,116,
+182,130,253,246,235,166,148, 85,237, 42,162, 73,236,208,121,116,218, 86,119,159,167,175, 54, 71,224, 83,156,185,132,101, 83, 44,
+132,125, 80,112,157,166, 21,168, 39, 40, 73, 75, 55, 29,119,182,143, 60,207,214, 14,229,193,163,  9,119, 14, 99,233, 57,123,128,
+164,208, 61, 96, 78, 60,234, 14,199,148,152,238, 71,150,221, 51, 40,207, 75,154,226,180, 15, 57, 96,100,236, 44,134, 81, 73,110,
+ 31, 70,223,147,239,190,251,109,175,209,113, 18, 25,174,128,217, 96,162,193, 62,169, 16, 48, 99,166, 42,129, 61, 11,238, 12,172,
+ 48,129,117, 24,131, 32, 35, 59, 49, 33, 66,248,161,143,106, 36,159,198,252, 63,232,203, 79,136,190, 55,140,236,102, 20, 98, 24,
+211,102,236,113, 46,208,204, 78,161,217, 81, 72, 99,225,247,142,203,168,131, 16, 34,137, 26,247,184,161,166,154,128, 78,165,118,
+252, 93, 73,117,183,188, 93, 47,214,181,227,207,162,125, 62,188,109,155,221,  1,153,187, 97, 22,226,247,116,169, 76, 23, 25, 54,
+118, 13,180,178,177, 77,131,107,205,171, 60, 41, 58,165,154,182,137,241,214, 49,166,159,178, 36, 48,  0,133, 82,240,172,  9, 81,
+ 76,134,124, 80,152,248,227,126,204,189, 61,108,234, 13, 85, 76,119,107, 60,240, 66,148, 75,149, 86,221,134,100, 75,229,101, 36,
+127,140,223,  2,144,118,109,187,  9,195, 48, 52, 78, 82, 74,  5, 26,131,151, 77,218, 55,236,255, 63,107, 76,136, 91,201,101,182,
+ 19,167,105, 87,134, 52, 30,145, 64, 42, 77,114,236,216,199,231,216,103, 48,253, 81, 50, 62, 74,228,103,179,248, 74,203, 31, 96,
+170,164,154, 14, 64,150,139,185,115,210, 64, 87, 61,238, 88,165, 27, 70,244,226,137,112, 13,132, 96,124,243,129, 85,116,123, 31,
+247, 21,221, 34,140, 23,150,196, 88, 16,185, 48, 92,106, 76,174, 72,249, 97,169,117,160, 25,126,240,217,215, 89,185,204,135, 84,
+ 74,220,180,211,159,186, 84, 70,169,150, 63, 26,145,154, 49, 50,212,154,176,187,231,205,189,224,199, 54, 82,115,231,197,  0,230,
+206,211, 79,122,  9, 57,253,127, 70,242, 70, 11,113,145,  0,131,239,228,148, 25,238,164,253, 90, 52,123, 60, 21,154, 20,119,  8,
+ 18,160,107, 46, 38, 39, 49, 93,170,209,119, 34,154, 86,178,114, 12,  3, 11,198,247,205,218, 46, 95,154,143,221,146,138,127,193,
+ 95, 61,217, 54,123, 41,239,168, 57, 45,211, 79,  3,199,102,139, 95,196, 56, 74, 83,255, 58,179,228, 48,248,158, 48, 55,105,186,
+ 61,  6,158,104,217,248, 45,132, 42, 99,157,101,190, 14,227, 48, 73,110,178, 38,201, 36,113,223, 66,224, 75,230, 46, 48,113, 72,
+141,106, 92,147,145,250,243,195,153,245,191, 80,190,130,120,113,228,128,164,126, 26,138,138, 36, 51,104,240, 72,155,172,158, 96,
+  6,114,118,132, 18,147, 68,119,120, 82, 62,154,105, 90,149,179, 16,126,151, 98,102,118,  8,148,  9,172, 98,245, 55, 42, 97,133,
+ 65,166,113,164,246,161, 10,178,151, 48, 57, 70,246,124, 16, 93,186,142,196,170,251,231, 99, 28, 36,  7,202,248,146, 48, 63,105,
+162,109, 82,112,143,119,192,253,201,153,213,248,128,236, 17,179,122, 44,121,177,120, 82, 13,  3,107, 84, 99,117,139,187,250,173,
+123,127,109,119,206,135,133, 49, 95,231, 67,127, 59,  1,165, 71,244,186,220,160,133,142, 11,104,140,182,  8,241, 76,166,180,206,
+ 93,143,225,124,193, 75,127,127,110,155, 46,153, 10, 24,185,122, 42,246,195,104,201, 13,145,173, 53,165,230, 28,114, 11,132,216,
+212,144, 59, 43,  9,187,129, 53,238, 41, 15,116,241,182,134, 21,216,205,193,125,115, 59,208,240,147, 19,207,245, 71,  0,210,206,
+104, 55, 97, 24,134,162,113, 72, 41, 42, 76, 76,236, 97,210,248,131,253,255, 15, 77, 72,123, 69, 19,171,170,173,141,179,216,137,
+147, 16, 86, 84,137,190,211,  7,218,222, 56,206,245,185,230,193,178,253,254,223,228,106,168, 97, 61, 12, 85, 84, 34,181, 85, 82,
+203, 76,199,253,199, 32, 47,129,117,165,127,129,233,154,144, 72,127,  5,122,219,239,222, 47, 51, 65,166,169,180,164, 37,129,105,
+ 97, 29,  5,247, 41, 99,204,199,249, 87, 75,187,144,204, 39, 72, 40,221, 45,167,241,165,155,255,136, 34, 43,105, 91,167, 92,236,
+100, 61,180,133,127, 81,179,223,198,176,184,135, 73, 87, 23,103, 65,161,229,231, 42,120,131,136,255, 93,238, 19, 72, 89, 31, 99,
+177,129,104,233,182, 94,142,129,153,153,192,129, 74, 80,108, 50, 92,207, 67, 94, 77, 54,219,168, 55, 82,118, 28,104,214,212,133,
+248,230, 38,118,240,233, 83,108, 89,179,122,255, 67,218,176,172, 15,251, 14, 71, 36,150,154,131,139,115,157, 85, 95, 55,132,178,
+112,189,107,117,216, 29, 62,209,215, 65, 72,211, 99, 58, 19,190,  2,178,124,112, 77,120,227, 19, 69,108,110,182, 75,216,186,241,
+  4, 22,197,  2,137, 69,217, 30,241, 41,220, 79,118, 57,150, 89,212, 28,231, 78,170,243,188,204,242, 42, 94, 87,125,109, 37,221,
+165,232,154,201, 37,188, 74,132,177, 16, 91,  4, 43, 85, 74,188, 16,134,175,145,138,233,100,183, 10, 32,132,235,  0, 71, 92,146,
+  2, 65, 31,227,164, 98,132,  1,132, 62, 86,189,215, 73,145,217,152, 23, 58,200,199,210,255, 40,123,182, 29,  9,159,222, 21, 59,
+239, 74,220,115,183, 61, 25,240,111,197, 93,205, 84,238, 15, 94, 26,244,241,249,120, 58,159,102, 36, 78,  7,194, 12,143, 50, 25,
+234,201,104, 95,188, 83,152,228,174,217,191,108, 94,  7,180, 79,134,  6,242, 98,186, 30, 33, 68, 77, 56, 48,200,243, 23,224,171,
+125, 95, 28, 54,173,241, 66,175,251,177,239,167,193,226, 52,232,137, 18,212,  9, 43, 59,217,156,176,  9,210, 62, 35,  0, 10,218,
+ 21,103,198,133, 55,153,104,170,225,100,218,242, 50,192,218,200,222, 29, 38,181, 48,236, 98, 92,235,205,214,184,193,126,115,148,
+227,138,253, 41,248, 39,  0,107,231,178,211, 48, 16, 67,209,241, 76, 58, 67,104,139,  0,  9, 22,101,193,255,255, 19,107,132,144,
+128, 13, 82, 75, 50, 15, 98,123,156, 76, 30,  4, 16,116,221, 74, 73,212, 56,246,117,238,185,213,127, 93,175,117, 60,153,154,149,
+248,223, 18, 40,211,218, 88,  6,197,170,109,130,151,159, 13,151,105,100,151,159,127,188,  8,214, 91,164,196,192, 77,237,246,206,
+ 61, 60,189, 33,119,145,153, 32,  4, 31,121,137,213,161, 10,143,190,121, 23, 61,106,210, 50,123, 97,246,114, 11,127,146, 35,179,
+ 18, 83,167, 36, 46,181, 25, 42,114, 87,118,177,113,222,101,132, 16, 22, 86, 43, 85,200,255,224, 69,120, 93,232,239,236, 44,221,
+210,249, 19, 60,  0,211,  6,108,102, 75,225,232, 64, 35, 66, 58, 71,223, 51,215, 24,221,199, 23, 68,226,166,109, 98, 56, 42,211,
+170,120, 41,235,120, 79, 39,  2, 57,230, 25, 11, 51,146,175, 61, 50,194,238,174,235,166,105,145, 80,246, 17, 94, 79,136,151,  1,
+217,181,150,199,124,175,212,109,125,241,156,182, 21,229, 86, 23, 14,210,222,200, 52,212,243, 34,178, 39,138,172,161, 75,149,  0,
+178,211, 38,228,247,126,217, 30,145, 29,107, 82, 53,162, 88,132, 36,201,104,112,197,124, 77, 47,129,162,255,128,233,170, 88,175,
+ 44,144, 74, 35, 84,182, 61,167,156, 64,147,178,175,169,207,132,231,152, 85,114,107,131,132,133,  6,206,147, 84,  5,105,244,219,
+155, 98,237,107,176,220,188,143,149,153, 40,185,219,227, 21, 69, 26,228,151,217, 83,117, 50,251, 76,138,123, 14,242,200,237, 93,
+ 28,119,238, 48, 94,165,142, 53,153,  5, 89,102,145,181,247, 39,122, 45,197,148, 44, 22,119,149,135, 90,205, 18, 54,254, 69, 17,
+116,170, 13, 88,163,187,123,194, 94,185,131, 51,174,187, 62, 22, 76, 27, 61,165,155,128, 49,149, 67,164, 76, 27,  9,138, 15,253,
+211, 15,127,142,239, 46, 56,115,182, 65, 19, 77, 55,250,123, 82,105,212,222,238,121,199, 10,185, 21,236,253,186,137,211, 38, 80,
+ 27, 66,231, 83,164, 38,137,179,177,  2,111,155,169,241,231,  5,120, 54, 17,  6,148,118,218,238,  8,107,179, 59,250,163, 97,208,
+157,130, 79,  1, 72,187,178,157,134, 97, 32,232,221,117, 46,170,130, 42,  1,226,129,255,255, 55,120,168, 84,142,182, 57,108,147,
+ 93, 31,113, 32,105,  5, 84,125,168,170, 86,121,136, 61,158,236,206,206,232,191, 65,249,213,178, 12,172,127,185,148,119,  5, 23,
+122, 29,234,186, 81,156,203, 20,109,106,138,  6, 73,181,232,108,  2, 93,244,254, 87,204,118,218,168,245, 46, 17,239, 55, 85, 55,
+208,203,123,215, 20,133, 13, 50, 50,190,192,222,142, 55, 92,111,141, 61,186,193,  3,217,249,135,230, 44,117, 41, 77,172,212, 83,
+244,133, 79, 51,174,165,144,119, 41,187, 51, 95, 16, 97, 37,214,124,245, 17, 76,135, 86, 37, 91,202,235, 44, 50,193,122, 37,239,
+173, 20,220, 41, 20,130,240,228,179,  8, 98,156,200, 13,231,240, 66,193, 51, 23, 56,162,115, 47,221,191,179, 24,212, 54,154, 91,
+205, 90, 97,163,169, 29, 76,109, 65,168,  4, 47,183, 15,182, 91,240,226, 25, 50,242,204, 49,174,217,222,185,195,103,127,251, 80,
+238, 54,229,235,190, 35, 50, 13,113, 83, 91,103, 81,130,254,245,168,212,115,179, 61, 20,119,192, 70, 19,144,203,169,178,105, 76,
+ 84,110, 38, 61,143,106,138, 89, 37, 63,164, 74, 68,149,  5,123,174, 72, 12,142, 11,134, 43,  1, 53, 76,252,107,200,168,179,223,
+148,118,151, 34,227, 35,178, 39, 75, 26, 88,164, 23, 48,251, 20, 29,  7,226, 73, 25,146, 25,236, 68,225, 65,105, 23, 77,116, 98,
+ 68, 28,138, 17,128, 14,185,178, 78,121,145, 52, 96,230,179, 97,215,144, 27,112,141,239,172, 69,119,242,172,216,  4,238, 32,114,
+ 76, 55, 89,103, 39, 67, 71,249,221,  2,136,255, 58,161, 52, 49, 57,175, 11,180, 19, 23,243,227, 75,  6, 50,  3, 52, 55,223,212,
+139,207, 79, 26,169,179,255, 10, 22,131,149, 29,228,226,237,211,194,241,145,203,238,220, 80, 45, 56,160,  3,118,205, 19,  1,141,
+ 80, 90,143,132,158,105,182,183,180,162, 26,171, 66,213,  6,173, 26,222,206,170, 19,246, 99,125,144,183, 24,205,114,163,203,231,
+145, 27,225,224, 39,215, 86, 67, 73, 52,158, 16,189, 24,203,184,184,199,249,196,  0,111, 75,199,233, 89, 90, 44,208,253,  0, 28,
+ 66,214,127,177, 97, 81,216,148,108,193,100,209,154,  2, 75, 71,208,155,163,119, 53,255, 18,128,180, 43,217,105, 24,  6,162,241,
+146,180,164,105, 37,122, 64,220, 56,244,255,255,128, 79,225, 74, 15, 64, 41, 82, 11,117, 22,219,204, 98,199,105,186, 32,160,199,
+168,178, 34,103, 60,158,229,189, 55,127,140,223,127,236, 71,159,229,190,102,169, 86,115,169,204,147, 44,176, 87, 84,240,215, 60,
+251,104,113,127,236,  5, 18, 98,179, 63,  3, 59,248, 72,180, 67,251,203, 47,175, 89,  4, 81,171,187,106,186,186,175, 30,159, 62,
+ 20, 99, 34,124,234, 76,195,106,175, 78, 62,228,170,109,236, 38,142, 58, 58,187,  3,252,  5,234, 88,143,102, 25, 50,134, 24, 50,
+131,137, 26,170,136,149,211, 20, 74,207, 50,185, 40, 48, 19,116, 40,  8,221,238,233,101, 14, 87,181, 36,135,199,137,169,164,139,
+ 76, 44,208,133, 40,227, 81,166,145, 29, 61, 88,210, 82,  9, 84,177,147,106, 78,237,132, 70,194,237,130,138, 24,144,169,204, 20,
+ 50,164,193,148, 74, 37,182, 52, 75,178, 16,222,214,178, 54, 93, 23, 65, 16,224,246,225, 98, 32, 81, 29,140,253, 49,  9,144,162,
+235,220,219,246, 80, 84,170,204, 53,  5, 59, 88, 31,249,140, 44, 42,254, 65, 26,177,130,100,168, 90,110,197, 28,140, 81,163,216,
+174,198,234, 12, 70,136,196,133,244, 54,225,100,  2,192, 34, 12, 81,226,230,234, 88,233, 49,196,251,228,137,108, 24,182, 55,100,
+205,  7,231, 30,149, 14,122, 42,205, 16, 45, 46,252,209,170,  1,252,157, 37,133,105, 63, 64,  9,136,203,221,236, 17, 88,145,240,
+ 49,204, 92, 18,146, 37,163, 73, 56,140,197,240, 28, 63, 29,244,158, 56,132,247, 16, 40,160, 58,129,236,211,  0,123,101,  8,  0,
+221, 25,248, 87,217,207, 43, 78,102,224,143,207,205,168, 36,234, 66,128, 19, 57, 70, 46, 86,102,226,192,147, 40,232,232, 78,106,
+ 47,191,109,  2,249, 52, 22, 49, 72,255,186,190,230, 62,224,166,158,  2, 49, 71,125,224,147, 36,251,127,206, 29,  2,240,214,214,
+231,114,  2,230, 36,  4, 97, 61,194,188, 35,167,137,120,170,186, 84,183, 83, 93, 58,186,119, 39,200, 91,199,239, 12,174,191,204,
+115,147, 21, 16,147, 47,228,108,170,111,214,102,221,102,  6,246,184,113,109,151,185,  9,216,185,247,207, 95, 47, 27,243,190,179,
+  7,  2, 80,130, 43,176,141, 51,112,224, 44, 98,167, 58, 56,143,164, 23, 42,104, 50,150,239,245, 63, 88, 34,169,200,114,200,149,
+ 91,156, 34,  1,254,129,143, 67, 16, 83, 21, 72,128,118, 68,131,102, 45, 74,196, 23, 21,106,162,164,168,173, 41,100,241, 45,  0,
+105, 87,178,155, 48, 12, 68,109, 39,206,  2, 41,203,  1,245,212, 67,197,255,127, 79,111,189,209,170, 82,213,  2, 45, 91, 98,123,
+234, 25, 59,198,  9, 75,183,136, 19,  7,100, 12, 30,207,242,150,127,245,103,126,  2, 98, 63, 27,226, 35,  9,145,240,235,118,114,
+ 41,213,151,120,238,151,129,230,140,164, 37,143,162, 60,239, 53,255,117,155,222,126, 48,113,135,123,135,255,143,186, 85,  2,232,
+ 61, 36,229,200,166,185,156,207,170,197,202, 60, 60,111,115, 41,180, 19,212,107,143,  2,199,184,  9,143, 38,189,151,192,155,230,
+201, 75,116, 94,108, 43,  5,141, 45,211,102,241, 77,139, 19, 39, 76, 36,162,116, 82,140,155,162, 74,112, 88, 63, 40,132,  1,181,
+170,213,158,193,175,140, 53,110,232, 53, 78,249, 40,147, 26, 68,161,  1,209,144, 32, 86,100,217, 91, 73,164,236,230,  9,212,164,
+ 50, 54, 73, 81, 21, 95, 10,155,164,160,171, 24,197, 26,190, 19,182, 52, 65, 66, 71,153,128, 77,198,  7, 41, 95,215,201, 90,233,
+141, 65,112, 75,112,155, 76, 73,186,221,110,224, 70,195,226,237, 48,172,146, 26, 84,134,147, 89,172,253,221,101, 86, 18, 66,233,
+214, 46,169, 24, 65, 62,126,199,224,207, 36, 39,197,118, 55,  0, 23, 32,140, 48, 29,201, 70,195, 34,  3, 45,237,169,153,167,115,
+ 78, 19,232,154,173,158, 59,  4, 39, 85,104, 27,238, 45,228, 47,192,168,  3, 50,239, 88,  6,  4,142,113,152,207, 71, 32, 10,207,
+104,101, 87,133, 77,226,252, 15, 34, 65, 69,212,158, 35,161, 35,240,198,115,112,218,162,225,206,235,129, 26,190,206, 13,131,123,
+ 23,  3,184,154,126,226,151,208,116, 31,185,225,180,233, 66, 23, 67, 40,239, 95, 66, 60, 78,147, 59,114,188, 16, 48,136,208,155,
+205,  2,251, 83,254,126,130,237,225, 81, 19,198,176, 35,211,146,157,210,151,216,229,228,253,252,188,238,187,135, 42, 78,127, 64,
+ 15,250,112, 57,163,247,201, 59,250,117, 56,182, 42,114,154,240,141,105, 49,195, 62,  8, 40,157,242, 61,215, 50,245, 24, 33,180,
+245,192,122, 27,121, 70,147,108, 84, 38,243,117,179,220,169,221, 80,150, 85,146,229, 40, 61,178,124,253,124,217,106, 68,199,187,
+ 22,  0, 50, 31,161, 41, 52,182,236,181, 38,221, 76,180, 17,194,126,140, 12, 33, 11,108,209,172,221,190,208,226,115, 66,126,248,
+118, 60,141,107,104,157,158, 93,142, 19,121,123,186,148,253,112,165,114,153,  9,  4,249,193,151,  0,172, 93, 75,111,219, 48, 12,
+ 54, 41, 75, 78,215,100,109,177,165,235,122,217,125,251,255,192,254,200,142,187,183,151,162,104,220,198, 15, 89, 28, 73, 73,137,
+ 93,123, 65,  6,236,152, 67,226,  4,145,168, 79,228,247,248, 15,250,166,127,  2,242,115,239,248, 49, 53, 42, 90, 46, 81,214, 19,
+ 46,166,134,207,141,226,222,  9,169, 38, 98,168, 81,216,194,225,222,247, 80,192, 29,184, 31,  5,237,200, 51,244,174, 71,147,207,
+168,247,249, 84, 20,247,174,250,126,119,  3,214,253,252,165,180,119,205,197,212,185, 53,102,126,152,124, 44,191,241,119,176,223,
+202,226,214,247,140,103,159,207,152,236, 15, 35,187,152,242, 72,169, 36, 61,177, 41,182,236,175, 12,110, 63, 84, 77,215,251,140,
+241,207,161, 96,155,220,239,230, 87,155,202,221,174, 45, 18,223, 28,161,239,232,169,165,181,114,197, 90,128,181,163,107,203,181,
+ 88, 66, 54,120, 89,241, 50,221, 88, 89,211,206,224, 85, 85, 94, 90,149,232, 33,131, 14,134,  0, 34, 38,121,220, 53,245, 91, 83,
+183,254,169,243,221, 32, 11,104,  5,184, 19, 18,209,129, 39, 44, 33,181,245,139,103,192, 98,251,240, 49,224,214,192,198,211,202,
+192,118,101, 26,179,217,153,203,189,168,121, 52, 18, 65,183, 57,196,240,  6, 37,204, 16,166, 20,185,172,186,135,225,216,194,165,
+ 44,184, 95,232, 51,100, 79,173,212,118,167,163,  5, 87,108,222,100,234,217,212,222, 36, 22,154, 48,173, 27, 48,182,237,154,172,
+222,133, 46,  1,254,149,170, 20, 70,165,  7,115, 42,141,176,132, 98,228,216, 33,  7, 94,202,183, 86,121,229,192,129, 58,102, 80,
+ 72,145, 17,209,138,203,159,250,175, 49,145, 39,147,141, 59,  1, 78,191,  4,193, 72,248, 52, 27, 29,231, 27,114,200,193,126, 71,
+186,209,172,184, 19,205,118, 47,156,154,181, 77, 26,104,211,  3, 37, 31, 55,148, 83,182, 19,169,105,178,193,223,  5,159, 46,130,
+119,135, 86,  2,143,150,195, 89, 78,236,187,225, 28, 72,154,161,  5,  3,106,  6,213,194,137, 52,146,135, 90,124,190,184,151,244,
+153,208,  1,150, 93,240,174, 48, 46,136,125,100,201, 16,200, 24,212,152,130,166,111, 90,223, 34,186,155,234,250,235,197, 23,254,
+125,207,175, 15,111,253,235, 94,252,103,106, 47, 12, 62, 31, 53,115,154,153, 60,180,212,201,147, 18,115, 16,194,128, 26,228, 38,
+141, 29, 27, 93,141,210,108, 41,221,127,202,162, 84, 56,168,129, 31,169,201, 81, 26,189,103, 36,139,183,108,193,197,135,  6,159,
+ 76, 45,237,255,  8,192,218,213,244,180, 17,  3, 81,219, 99,103,119,147,109,137,128, 30,138,132,122,226,200, 63,239,127,233,185,
+135, 10,  9, 36,122, 64,136, 64,  9,155,100,237,153,122,108,175,227, 77,  2,180, 18,199, 68, 81,178,218,172,159,199, 51,239,227,
+ 99,230,171,255, 85,200,103, 81,146, 44,189,  7, 18,207,193,137, 93,235, 18,218,  9, 68, 63,232,126, 67, 99, 33, 85, 30,222, 98,
+ 54,215, 27,168, 53,225,206,210, 53,209, 84,170, 11, 83,159,147,242,255,214,  2,125,153,236,113,214,205,216,123, 75,127,105,155,
+203,111,243,171,174,255,254,227,183,199, 58,  0,158,217, 57, 84, 49, 22,176,120,234,217,234,198,127,219, 47,212,167, 32,190, 58,
+238, 54,175, 69,138,251,120, 23,142,221, 72,147,194,237,142,192, 24,161,165,131, 79,214,181, 70,207,155, 74,117, 29, 13, 68, 26,
+255,153, 99, 33,206,185,166,144, 29,239, 53,226, 94,224,141,160,151,196,186, 73,119,149, 27, 65,  0,103,173, 62,157, 79, 13,176,
+138,249, 97,233,145,213,250, 35, 91,205,162, 45,226,124, 25, 96, 23,  7,195, 36, 32,229, 97,221,104,117,210, 76,218,137, 60,153,
+177,169, 53,  7, 66,106,211, 84,218, 84,198,  0, 60, 46,186,199, 63,171,171,251,231,249,178,123,232,214, 43, 71,154, 67,127,120,
+133, 25,160,217,  4,206, 62,195, 81, 51,169, 64, 78,107, 38,  7,191,180,245,207, 39,185,114,234,206, 86,183, 54,144, 59,253,143,
+ 70,227,129,200,200,141, 82, 30,127, 70,181, 50,199, 40, 97,193, 80,140,114,160,109,111,101, 76, 23,193, 98, 28,131,217,190,112,
+ 72,162, 72,137,110, 56, 12,243, 48, 23,  4, 37,121,131, 50,112, 28, 80, 11,141, 98,  6, 14,116, 40,156, 24, 21, 41,165,  9, 71,
+ 97, 93,128,169,207, 66, 41,218,221, 69, 35,177, 88,194, 51,249, 86, 15,188, 73, 18,219,204, 62, 26, 70, 70,251,155,136, 42,104,
+221,209,176, 71, 15,226, 32,114,242, 93, 74, 66,129,207,140,236, 57,228, 58,103,209,238,128, 59,109,239,209,216, 40, 61, 53,144,
+222, 88,247, 50, 53,134,229,118,217,202, 67,180, 93,220,187, 60, 42, 90, 40,205,218,117, 56, 46,216,227,203,  8,238,251,147,240,
+127, 60, 92,208,171, 91, 83, 60, 97,248, 90, 93,134,226, 93,242, 90,224,231, 85,212,208, 54,186,117,110, 99, 49,148,220,128, 65,
+ 48,202,218, 72,191,  9,104,235,235, 33, 15,241,170, 23,182, 39,127,117,171,231,126,129,140,101,184, 97, 83, 95,134,181,158,237,
+124, 83, 46, 89,156,139,134, 55, 45,155, 65, 18,183,246, 33, 60, 15,148,178,  2, 66,160, 74,232, 14, 25,161, 55, 65,193, 28,246,
+126, 21,186,172, 38,159, 95, 69, 18,  9,  5, 41, 39,135,  2,166,146, 49,250, 83, 86,170,254, 43,  0,107,231,182,211, 54, 16,132,
+225,217,131,215, 54, 77, 82,226, 74, 69,136,162,158, 37,158,128,167,230,158,135,224,174,247,149,170,162, 86, 13, 16,176,130, 72,
+236,120,179, 83,207, 30,156,181,  9,130, 74,125,129, 72, 86, 70,179,179,255,252,251,253,255,205, 63,243, 79,103,128,137,218, 49,
+ 70, 65, 60,143,206,237,221,183,182,157,133,199,122,231,191,219, 63,108,165, 61,230,230,169, 96,126, 18,  4,116,220,124,163,151,
+173,252,115,158,188, 21,105, 33, 69, 42,132,146,140, 39, 73,  9,250,236,199,237,124,185, 86,228,107,  2,143,165,182,150,203, 16,
+255,135, 91,149,136,  8,206,236, 15,240, 49, 75,191,160,158,129, 94,134,240,163,213,115, 69,102, 34,193,148,123,211,133,153, 67,
+157,175, 77,185, 88, 77,115,229,182,193, 83,194,  8,139,211,105,113,114,188,127, 49,187, 62,159,149,115,219,241, 39,  0, 31,129,
+ 23, 32,191, 67,115,239, 79,120,104,199,134,247, 74, 78, 94,165,239, 14,198,121, 59,123, 84,186,200,244,186, 78, 26, 34, 92,152,
+ 70,243,170, 29,213, 57, 77,143, 57,153,122, 97, 36,165,146,124,148,202, 44,229,175, 51,149,229,170, 49,244,190,238,242,182,186,
+250,121,125,121,179, 40,151,245,155,145, 58, 62, 40,190, 30, 29, 94,221, 45, 87,117,211,150,115, 42,219,202,198, 81,130,119, 53,
+ 46,144,107, 20,191,239,245,175,  7, 44,169,158,137,141, 68, 65, 76, 27,194, 40,146,  8, 13,194, 82,182, 88, 64, 10,  9,231,184,
+235,190, 29,131,236,238,  5,148,174, 47,116,116,224, 94,130,133,119,236,  5, 17,217,225,  7,224,169,225,157,  5, 35, 60,108,221,
+ 26, 96,162,102, 50,108,239,248,172, 57, 58,110,150,189,169,223, 34,136, 89, 68,221,233,152, 51, 17,149,151, 57,230,150, 17,232,
+184,240,220,199,183, 51,214,201,232,216,211, 84, 88,124,193,112,224, 49,251,145,154,130,225,156,  8,223,223,247,236,158,125, 29,
+120,  0,182,177,121,161,185,227,176,185,187,  4, 84, 51,252,  9, 30, 36,115,159, 23,183, 75,130,197, 39, 87,172,172,255,112,105,
+ 56,188, 15,142,217,202, 54,247,151,  8, 53, 93,247,207, 69,246,176,169, 94,110,221,134, 71, 73, 53,204,  3, 26, 29,134,156, 39,
+246, 47, 73,197,228,195,248,211,138,158, 35,145,224,214, 24,172,117,181, 39, 20,221,115, 29, 86,211,198, 97,147, 95,192,208, 66,
+220,208, 30,149,226,150,236,199,106,109, 61,142, 33,190,211,243, 42,172,  1,  6,237, 29,216,154, 84,219, 75, 43,  5,  9, 48,231,
+  0,144,182,124,108,166,  7,154,136,130,167,195, 90,222,101,243, 56,  8,169,123,109, 78,186, 60, 45, 98, 18,193,136,153, 67,123,
+ 95,162, 76,178,191,  2,208,118, 45,185,109,195, 64,148,164, 40, 75, 70,163, 38,112, 12, 24,104, 29, 20,217,116, 83,244,  2,217,
+231,  2, 57, 95, 47,209,109,114,130,172,178, 46, 80, 36, 93, 20,104,190,112, 28,196, 54,164, 80,195, 12,103, 72,153,180,157,207,
+166, 94,121, 33,255,104,106, 56,111,230,205,123,250,127,132,239, 55,175, 89,169,210,216,110,202, 57, 89,253,205,168,205,190, 64,
+150, 18,137,122,101,151,200,219,148,234,182,236,196,102,142,174,100,112, 35, 95, 44,154,223,124, 24,176, 11, 27,254, 81,  0, 89,
+166, 49, 11, 38,227,  3, 95,235, 12, 55,190, 81, 30, 58,217,168,243,230,190,224, 84,192,163,212,123,206,151,197,252,165, 94,135,
+ 14,227,172, 98,125, 54,124, 83, 74,216, 80,228,187,167,145, 38,121, 47,198,173, 24, 23,229,172, 94, 20,194, 14, 85, 89,103,226,
+248,207,213,233,195,195, 93,184,248,150, 46, 62, 44,242,163,178, 58,153, 78,230,  2, 10, 33,119,100,158,151,189,253,207,187,  7,
+ 95, 71,147,155,197, 84,212,117, 83,171, 18,116, 11, 91, 10, 79, 53, 49, 80,184, 51,179, 92,169, 39, 34, 40,126,196,253,219,215,
+101,137,128, 84, 92, 78,235,243,139,219,235,201,227, 13,230,236, 77,139,187,185,234, 23,223, 71,219,223,198,131,159,191,254,253,
+ 56, 59,191, 18,142,238, 59,116,211,167,249,238,206,224,206,124,152, 67,238,228,  0, 92,221, 30, 17, 66,219,227,230, 40, 62,179,
+236, 52,173, 98,186, 55,145,  0,104,228,154, 69,189,164,149,105, 25,129, 39,246,162,106,  9,216, 40,203,230, 23, 65,  8,195,113,
+  5,121, 57, 47, 35,188, 88,110, 72, 16,109,100,232, 28,202, 62, 54,230,105,192,186,156,245, 90,190,241,110, 74, 70,240, 83, 50,
+174, 34, 43, 35,120, 10,150,219, 46,214, 11,161,114, 69, 78,250, 66,141, 10, 70, 38, 65, 72, 71,110, 78, 49,149,232, 88,163,138,
+103,219,153, 61,  3,  1, 18,179, 52, 88,112,181, 78,223,196, 46, 23,186, 83, 13,235, 14,146,216, 33,175,227, 31,181, 41, 68,134,
+110,196, 36,  9,241,114, 85,  1, 47,210,117,144,203, 21,  6,155, 52,125, 33, 77,116, 18, 42,228, 59,229,  4,248,145,171,220,209,
+ 78,220, 96, 93,189, 98, 20, 60,218,250,116, 61,187, 76,181,106, 94,139, 79, 33,191,198,172, 78, 85,189,202, 24,140,191,217, 94,
+245,165, 68,  8, 79,150, 98,115, 80, 51,131, 57, 82, 99,233, 19,129,176,178,198, 88,  1,154,188, 62,100, 75,184,136, 44, 10,129,
+ 41, 52,116, 80,118,193,221, 75,186, 19, 94,  7, 58, 16,100, 38, 28, 49,207,184, 16, 47, 91,175,222,238,105, 75,140,179, 52, 43,
+112,250,170, 27,123,192,181,129, 64,194,109,124,252,133, 28,232, 17, 64,184,249, 68,119,215,129,107, 11, 60, 11, 64,218,181,181,
+ 36, 16,132,209,153, 93,117,119,205, 10,210,110,148,  4,249, 96, 15, 69, 69, 96, 84,255,184, 63, 17,244,216, 99,244, 18, 65, 81,
+102,146,105,153,165,235,230,206,126,205,125,103,204,162, 72, 22, 17,113, 69,240,155,153,243, 93,206, 57, 63,233,  3,231,243,249,
+ 90,173, 86,175,215,255, 51,114,164, 31,213,106, 53, 12,233, 41, 56, 26,123,173,179,225,114,185,188,180,188,212,233,180,191,116,
+ 38, 97,242,184,194,247,191,  1,172, 37,162,217,198,114,197,238, 31, 29,110,238,110, 55,234,119,156, 34,204,152,169,156, 96, 38,
+159, 89,167,209, 21,118,101,142,136, 80,190,123,137, 50, 46, 86, 21,  0,180,119,176,191,177,179,213,188,111,196,244, 75, 32,181,
+ 29,120,102,224,221, 45, 50, 88, 45,115, 89,109,113, 71,126,215,168, 16,250,  4,125,  4,209, 71,178,224,249, 67,146,188,  2,161,
+215,195, 32,188,138,134,237, 47,248, 40, 34,113,  9,156, 15,194, 64,193,138,147, 93, 47,  6,187,149,210,218,204, 84,183, 61,188,
+125, 26,244,232,253, 24, 21,114, 52, 64,221,188,159,161, 56,125,218,203,176,186, 77, 14,  7,158, 59, 27,184, 65, 22,247,  6,209,
+117,163,123,118,249,120,114,217,186,104,117, 31,250,225, 77, 28,117, 32,246, 25,137,  9,157,191,188, 29,223, 52, 79,223,  7, 33,
+130, 34, 66, 21,111,106,185,176,138,253,249,110, 82, 96,202,143, 14,202,136,162,186, 84, 58,101, 66,157, 68, 66,106,108, 96, 73,
+129,116,148, 38, 10, 72,205, 79, 57,156, 46, 17,172, 42,177,  0,128, 37,228,104,176, 95,204, 17, 58, 60, 46,230,174, 53, 67,148,
+ 69,144,238, 34, 26,222, 24, 41, 32, 74,192,132,110,214,245,251,104,135,137,150, 53, 82, 50, 60, 53, 94, 16, 30, 49, 56, 13, 72,
+108, 43,110,200,248,196, 63, 47, 40,144, 70, 32, 74,204, 61,149,231, 77, 82,228,147,142,253, 96, 43, 61, 74,147, 37,100,240,152,
+164,100,163,105,127,154, 24, 53,244,196, 32, 45, 43,160,132, 29,171, 50,  5,227,211,239, 22, 20,183,236,209,237, 79, 77,104, 15,
+252,117, 44, 38, 49,154,196, 38, 96,207,114,101,253,112,212, 87, 57,203,228, 63, 21, 91,197, 25, 36,104,239,172, 56,195, 49, 28,
+221, 25, 23,131,213,146, 63, 71,223,137, 70,194,119,  7,124, 87,112,227, 97, 68,132,138, 16,221,232, 99,154,239,210, 13,154, 16,
+102,190,193, 49,138,224, 37, 33,197, 12,211,222,  6,140, 96,200,207,105, 71, 37, 49, 44,183,117, 17,214,174,160, 92,186, 93,250,
+127,196, 72,184,253,  8,151, 90,125, 76,153,174,  4,150,202, 38,191,157, 79,220,171, 73,194, 79,  1, 40, 59,159,159, 38,130, 40,
+142,207,108,219,244,  7,181,166,  8,  6, 69,227,133, 72,  2,  4,216, 11,132,152, 24,255,  6, 99, 82,245, 32,233, 81,251,239,233,
+213,179,137,  7, 37,225,104,132, 64, 66,176, 16, 64,183,216,101,119,103,158,243,222,252,216,233,178, 74,220, 76,154, 61,108,155,
+201,108,247,237,155,153,247,253,124,255,149,164,168,128,219,239,247, 11, 17,191,215,235, 93, 63,191,241,  8,195,240,221, 96,160,
+187,179, 30,134,111,  7,  3,191,186, 89,159,190,120,217, 91, 88,124, 92,128, 50,251,194,244, 27,131,187,143, 61, 40,148,222, 56,
+120,233,230,147,173, 87,253, 55, 43,225,186, 53,145, 96,142,246,101,160, 55,  4, 33,195, 79,244, 90,  0,161,149,145, 84,131, 10,
+198, 75,158,133, 91,155,207,183, 95, 47,173,173, 74, 74,149, 28,162,157, 27,213, 40,252,192,197,241,234, 60,171, 45,176, 96,134,
+240,232, 29,170,201,169, 89,115,165,210, 67,107,157, 18,115, 34, 79, 89,114, 20,143,239,215,155,119, 88,237,130,137,239, 76,156,
+148,125,235,140,193,151,228,114,140,198, 29,181,135,211,237,229,123,183,207,207,211,143,187,195,207,  7, 42,125, 79, 84, 96,111,
+ 85,177,140,163, 81,101,237,186,202, 21,121, 10,188, 59,197, 59, 77,158,102,226,219,113,244,126,231,232,195,215,195, 79,123, 39,
+195, 81,116, 32,198, 67,134, 12,250,217, 32,232, 50, 54,130,108, 63,137,127,138,116,174,218,124, 54,117,247,233,244,202,226,236,
+ 70,171,189,198,235,115,191,161, 73,227, 35,137,167,134, 20,135,140,196,217,106,184, 80,147, 71,152,165, 76, 91, 55, 88, 55, 32,
+105,248,226,224, 24,227,228, 75, 97, 44,174,180,237,181,224, 46, 24,217,176,207, 44, 24,197, 10,238,109,145,184,200,183,  7,243,
+ 93, 59, 74,222,109,222, 14,215, 22, 10,108,112, 55, 10,111,183, 28,175,187,236, 53,176,139,  9, 28,254, 18,247,109, 63,185,231,
+241, 43, 11, 50,141,204, 43,199,113,182, 68,224, 40, 94, 28, 76,213,169,  6,  6,154,210,  8,167,216,229, 80,108,204, 26, 29, 57,
+ 77,191,134, 79,229,215,  8, 83,131,104,126,138,123, 45,112,151,185,109, 13, 67, 69,158,  8,238,110, 77, 95,187,190,112,106,238,
+159,207,140,180, 13,172, 93,135,103, 11,203,243,224, 46, 39,109, 67,120, 62,212, 19,143, 60,120, 27, 42,255, 21,220,181, 68,241,
+ 65,247, 81, 11,141,235, 75,204,116, 51, 35,126,198, 46, 52,130,122,217,141, 43, 95,228, 65,121, 71,165,113,171,209,161, 10,212,
+160,130, 12, 72,136,113, 66,143, 89,140, 26,171,113, 38, 46,211,171, 81,252, 43, 74, 46,162,171, 40, 78, 99,169, 39,253,172, 66,
+ 72,138,  0, 19,121,213, 16,189,193,193, 80,252, 53, 33, 20, 51,113,105,156,199,133, 29, 91,  3, 81,151,228, 96,142, 50, 37, 16,
+168,129,  2,245, 62,201,  8, 45,141,209,133, 30, 52,144,142,117, 74, 65,159, 44,122,244, 61,114,166,103,244,226,  1,145, 16, 74,
+ 94,205, 48,254,  8,192,216,181,245, 54, 13, 67,225,216,105,218,164, 26,176,144, 84, 66,172, 12,161,149,246,181, 47, 60,241, 48,
+  9,232,143,157,132, 64, 72,252,143,150,155, 32, 69, 32,113, 29, 18,105, 39, 54, 37, 77,156,196,198, 62,190, 52, 77, 35, 65,158,
+226,212, 61,182, 44,231,228,248,243,231,239,252, 27,159,  9,195, 48,  8,130, 40,138,164,155,158,205,102,139,197, 98,181, 90,241,
+ 24,220,220,123,158,199,227,113, 94, 47,230,133, 56,150,222,159,255,203,196,254,211,233,116, 49,159,167,105,218,184, 15,194,112,
+  0,213,100,209, 92,195, 59, 67,183,223,255,  8,141,114, 83, 55,131, 32,  1,251,188, 27,  1,116, 40,210, 63,241,143,144,105,180,
+126,141, 38,147, 44,221,244,193,136,193,100,252,112,112,250,228,209,155,249,226,249,217, 83,254,240,100, 50,190,136,215,126, 24,
+124,142,150,188,120, 52, 28,242,250,159,150, 75, 45, 10,137, 78, 70,163, 77,154,253,252,246, 67,189,161,240,101, 60, 28,248, 15,
+ 31,159,190,123,245,250,229,217, 51, 62,164,247,198,247,215,113, 44,140,124, 88,106,102,178,168,122,105, 49, 94, 14,113,231,  8,
+ 52, 94,127,195,146,202, 40, 47,102,181,253,213, 70, 60, 82,130, 96, 25,156, 59,165,107,154,247,114, 58,246,188,195, 18,191, 45,
+184,243,109, 89,103,201,143,211, 45,187, 59,241, 15, 18,187,124,241,254,252,122,215,121,112, 55,244,251,158,139, 17,247,233, 66,
+233,222, 21, 57, 27,255, 16,138, 29,188, 41,232,215,203,234,215, 85, 69,  9,177, 25, 57,190,225, 56,183,189,104,157,157, 95,217,
+199,  7, 61, 87,  8,101,144,174, 32,127,150, 25,197,  4,119,122, 93,191, 68,131,130,185,185,224,219, 48,194,  3,244,146,183,120,
+ 77,164,138,164, 73,167, 76,168,181,  1,129, 44, 37,232, 36, 49, 68,153,175, 86, 75,138,138,217, 11, 96,226, 14, 90,192, 16, 82,
+212, 23,164,188, 62,210,128,163, 97,169, 83, 80,253,215, 98, 44, 12, 64,100,  5,144, 54,196,220, 21,202,135, 40,211,185,134, 20,
+109, 70,147,105,171,122, 20,108, 25,188,167, 53, 21,167,137,241,171, 93,228, 23,105,181, 59,214,182,246, 50, 76,203,173,135,214,
+217,192,181,  0,172,  2,232,225,129,204, 62,134,235,137, 57, 36,255, 30,163, 54,141,  1,125,114,170,230, 42, 17,218, 15,129,217,
+ 78,120,211, 84,226, 99, 91, 52,156,194,241, 84,218,112,238, 90,242,161, 73,124, 67,122,231, 64,171,160,128, 55,171,185,248,125,
+ 57,101,157, 15, 71,209,222,173,182, 64,222, 44,119,254,223,185,155, 62,125,191,248, 98,181,229,159,104, 52,144,209, 38, 27,210,
+115,220,188,200,246,204, 98, 37,  4, 79, 75, 82, 17, 12,164,114,233,109, 25,235, 36, 37,177,169,144, 98, 23, 34, 66,140,191,  5,
+ 69, 78,114,102, 37, 93,236,240,145,236,  8, 21, 66, 36,121, 44,124, 73, 91, 81, 12,218,194,216, 86,225, 13,108, 65,213, 80, 63,
+170,226,113,108, 43, 14,  8,197,234,244, 56, 43,183,137,187,248, 80,151,146, 31,172, 18, 62, 11,149,  2,172, 25,218,146, 83, 75,
+ 11,109,132, 25,149, 62,152,  3,  5, 76,189,191,  2, 80,118, 53,175, 77,  4, 81,124,102,118,233,106,169, 18, 16,172,164,201,205,
+147, 30,139, 70,183, 71,123, 19,130, 23,241,168,129, 42, 40,136,148, 26,104,176,182,164,148, 18, 72,161,215,222,226, 69,240,156,
+252, 13, 45, 66,255,  1,191, 21,147, 74,233, 71,172,154, 52, 31,187, 59,227,155,121, 59,251,145,208,138,203, 18, 38, 75, 50,153,
+ 36,179,191,121,243,126,239,253,222,191,241,189, 84, 42,193, 35, 64,112,177, 88,180,109, 27,218,249,124,190, 90,173,  2,190, 71,
+219,248, 20,142,173,205,205, 74,165,114,107,122, 58,155,205, 62,156,153, 65, 20,182,167,166,214,202,229,129,246,131, 92, 14,218,
+216,249,106,177, 24, 24,236,247,115,185,155,250,250,122,185, 60,145, 78,131,189, 15,111,132, 43,128,227,128,239,248, 41,181, 90,
+237,229,226, 34, 94, 47,204,207, 35,196,227,173,252, 98,105,  9,112, 95,189,254,112,117,121,185, 35, 23, 15,121,227,100,236, 12,
+244,  6,103,163,222,248,252,254,227,147,231,179,157, 99, 73,130,174, 20, 22,238,220,187,123,205,190,  1,237,157,122, 99, 99,109,
+ 29,122,121, 60, 55,155, 76,167,224,202,246,214,219, 55,175, 94,171,123, 75,238,208, 38, 51,215,147,169,  9, 56,127,124,223,249,
+242,225,211,163,185,167,216, 73,169,176,  0,139,  1, 82,107, 84, 37, 41,194,177,203,  5, 12,235,178, 97, 94, 33,214, 87,207,  1,
+ 51,252, 88,205,245, 49,109,167, 27, 10,235,137,134,254,104,206,103, 66, 77,250,  3,238, 30,116,218,169, 17,235,246,185,196, 94,
+207,169,187, 48, 49,189, 54,231, 22, 99,  9, 33,206,  8, 58, 70, 13,151,209,111,162,191,221,220, 63,228,226, 34, 33,207,174, 94,
+154, 76, 94,216,253,211,221,107,187,191, 61,242,238,168,215,234, 73,198,255, 87,215,147,132,142,162,103,152,116, 58, 73, 18, 66,
+ 18,200, 63,153,224,163,150,105,  0,192,  2, 84,115, 54,218,243,203, 12,153, 46,183, 92,158,232,123,172,235,181,148,  9,138,  2,
+ 93, 66, 58,254,100,  2,172,121,214, 26,103,162,219,234,239,195,114,129, 97,236, 92,243,155, 90,142,195,247,199,114, 74,233, 64,
+157, 70,225,251,189,148,102, 63,231, 98,192,120,199,242,101, 49, 25,119, 29,245,161, 69, 18, 99, 98, 41,196, 11,162,207,185,136,
+150, 24, 13,247,  1, 97, 80, 12, 13,134, 55, 28,132,199,134, 18, 89,163,184,175,  4,162, 13,122,154,174, 65, 36,166,203, 47,204,
+ 30, 66,188, 10,138,215,107,128, 70,121,157,160,142,177,112,158, 23, 33,  0,240,255, 10,244,106, 34, 96, 20,139, 43,141, 43,213,
+156,232,230, 17,190,  3, 87, 96,154,172, 47, 72,207,195,156,163, 32,231, 43,226, 16, 32, 76,187,116, 40,193,162, 90, 52, 72,205,
+101, 98, 32,149, 47, 42,239, 46, 68,200,172,198,  4, 33,196, 80, 14,212,255,197,210,199,247, 83, 12,203, 18,200, 25,105, 58,158,
+115,186,143, 75,165,253,115,114,114,182, 26, 96,122,223,233, 91,230,136,  4,109,176,177,218,205,212,249,148,197, 72,179,115,  4,
+ 63, 24,124, 95, 71,238, 29,185,170, 48, 38,163,212, 93, 44, 59,142,245,240,164, 78, 24, 51,228,238,159, 26,186, 94,136,225, 15,
+219, 80,197,200,136,210, 32, 67,240,165,104,230,251,108,138, 78, 76,165,154,186, 96,129, 84,153,162,112, 84, 92, 13, 23, 33,173,
+ 24,146,213,  6, 74,224,248, 65,240,114,122,192,192, 96,203,241, 87,  0,198,174,160,181,137, 32, 10,239,204, 38,105,220,244,208,
+162,224,161, 85, 80, 73,215, 67,161, 45, 66,177,230, 71,120, 17,241, 36, 30, 60,136, 66, 17, 79,185,133,226,213,131,151,141,  1,
+ 17,241, 88,143, 77, 33,148,180, 30, 60,121,242,222,216, 94, 90,140,160, 96,208, 16,210,221,236,206,248,230,189,217,217,205, 26,
+162, 57, 77,134,205,236,102,153,253,230,155,183,239,251,222,191,241,189, 90,173,  2, 61,175,213,106,128,224,  0,229,  0,232, 15,
+ 17,181,225,171,105, 67,163,221,110,191,223,222,166, 56,204, 78,179,121,176,191, 15, 36,157, 70,  0, 16,  7,240, 37,198,109,218,
+208, 88, 93, 91,123,190,181,  5, 32, 14, 67,153,213,155,250, 27,158,  7,151, 14, 64,127,179, 82, 57, 61, 57,  1, 16,127,186,185,
+185,228,186, 48, 56, 64, 57, 28, 15,107,  3,156,  2,250,235,158,103, 78, 68, 31, 56, 12,192,253,153, 58,254,250,163, 39,143,135,
+241,206,  0,110, 92,107,103,183,236,186, 71,135, 29,106, 64,231, 27,175,113,124,216, 89,175,108, 44,175,174,188,173, 55,224,  6,
+221,123,112,255,198,173,141,133, 75,139,112,  1,245, 23, 47, 23, 46, 47,222,190,123,231,227,193,135,111,167, 93,154,247,123,205,
+214,213,165,242,113,231, 75,187,217,186,230,150,161,231,221,171,215, 48, 72, 98,155, 97, 37, 60,158, 18,210,143,162,240,187,229,
+207, 88,246, 21,229,  4, 35,126, 40, 67, 70,217,179,100, 31, 17,188,132, 16, 31, 11,142,245, 62,159,242,226,125,116, 18,134,197,
+160,  7,116, 65,170,  2,234, 43,142,147,199, 82,129, 48,251,206,162,104,175,255,171, 43,163, 52,249, 89,158,119,190, 14,228,167,
+207,221,126, 40,  7, 33,236, 43,121, 94,109, 24,149, 91,169,133, 58, 13, 84,  6, 51,116,153,195, 66, 12, 74,156,174,104,201, 48,
+ 18,122, 22, 97,105, 60,229,172,148, 43,217,108, 46,  8,  3,102,249, 92,134, 20, 66,192,105,136, 74, 75, 33,124, 57,252, 45,252,
+217,130,115, 46,127,177, 63,130,181,204,215,126, 94,104, 20,150,112, 59,204, 16, 97, 90,180,163, 25,140,246,111, 96,  4,238, 17,
+ 69,108, 68, 12, 53,  4,241, 34,214, 53,105,152,183, 18,121,217,223,150,191,  9, 21,101, 73, 90,164,  9,227,139,113,242,174,254,
+ 66,252, 98,119,226, 46,106,122,208, 22,126,110,167,171,253, 76,205, 51, 72, 67, 60,183, 98, 76,142,137,188, 70,121, 18, 84,240,
+132, 43, 39, 69,239, 88,198,130, 30,139, 93,113, 67,240,249,248,155, 41,150,145,128,101,180, 77,177, 55,114,156, 74, 36, 49,221,
+218,196,100,146,194,104,217,132,183,180, 72,156,150, 40,166,249,166,190,130,104, 44,147, 65,166,150, 83, 99, 43,100,226, 55,242,
+127,164, 51, 57,110, 79,212,169, 22,212, 11,201, 81, 70,236,202,167,134,109,115, 22,101,168,235,211,141,162, 64,140,231,221,165,
+ 82,226,208,183,139,233,146, 44,190,  0,238, 18,156,119, 46,204, 21,138,103,118, 97, 16, 13,  1,220,129,203, 43,157, 49,170,170,
+  3,  5,239, 56, 28, 19, 24, 21,129,103,135,178, 39, 41,109,134,124,125,165,177,107, 14,113, 31,143,102, 36, 57, 91, 23, 83, 37,
+ 47, 69, 45, 99, 70,  4, 87,206, 98,  4, 32, 24,104, 98, 76,231, 65, 78,150,241,227, 67,193,201,218,164,196,157,217,153,249, 98,
+190, 40,162,209, 79,191,247, 71,  0,202,174,101,165, 97, 32,138,206, 76,147,106,170, 34, 90, 65, 65, 16,212,239,112,225,  3, 23,
+162,110,251, 29, 46,252, 10,235, 79,  9,186,117,235, 11, 65,235, 99,211, 34, 69,105, 77,219,153,241, 62,102, 38,143, 90,196, 44,
+ 36, 84, 50, 77, 76,188, 57,247,222,115,207,249, 59,190,183,199, 74, 31,191,110,253, 62, 98,216,107, 10,181, 88, 63,105,183, 67,
+201,  5, 80,255,229,213, 85,105,159,171, 55,207,173, 22,156, 58,135,126,190,237, 11,245, 58,252,220,222,219, 99,252, 30, 22,129,
+ 29,142,212,112, 62,112, 44,236,192,177,231,103,103,135,199,199,141, 70,163,217,108, 50,126,135,219,252,210,194,237,228,244,180,
+150,212,238,104,229, 60, 65, 94, 20,213,108,238,111,177,168,178, 80,199,110,232,214,238, 14,225,247, 22,124, 17,124,146,212,146,
+253,163,  3, 56, 14,144,190,227, 41,179, 84, 72, 78,229,152,151,186,187,189,201,245,255, 29, 89,205, 57,178,101, 73,147,237, 10,
+221,177,189, 85, 21,173, 71,  9,164,112, 79,102,144,  8,195,188, 70, 54,213, 11,211,173,193,210, 90,248,146,125,140,252, 41,196,
+177,157,209, 96,186,162,146,138, 26, 90,172,122,127,148, 31,125,241,145,170,139,247, 47,148, 42,139, 80,228,  0,115, 70, 28,122,
+102,229, 85,247,143,224,169, 74,146, 71, 32,115,108, 83, 25,122,125, 70,205, 85,197,108, 58,234, 65,174,138, 22,134, 26,249, 97,
+ 49,218,198, 65,114, 10,  9,172, 32, 59, 74,153,218,225,247,168, 63, 83,157,153,143,150, 59,195, 87, 13,191,100,188, 38, 29,119,
+197, 25,221,102, 77, 64, 93,168, 36, 88,118,206,243,193,157, 32, 58,155,166,142,216, 28,195,205,109,200, 49, 93,242,162,152,187,
+ 52,161,149,202,228,199, 64,139,148, 34,111, 88, 97, 60, 71, 77,138,178, 94,155,157,132,193,255,152, 90, 45, 78, 63,254, 78, 24,
+163, 16, 31, 72,147,202,201,137, 33, 22,206, 80, 62,243, 43,195,248,169,239,193,149,128, 57,221, 50,225,165,170,113,252, 87, 78,
+102,189, 75,146, 67,112, 92,140,192,146,116, 47, 17, 43, 76, 94, 42,192,  4, 77,246,128,196,243,127, 18,233, 49,187, 10, 54,243,
+158, 12, 58,206, 94, 43,229, 85, 94,  6,199,138,137,239,203,127,108,196, 37, 23, 81,113, 57,132,240,214,142,131,119, 69, 47,137,
+ 16,220,217, 77,147, 18,101,185,182,180,249,216,126, 40,186,185,226,117, 85,176,198, 18,163, 27,170,140,186,131,206,210,212,202,
+235,231,219,236,226,  6,172, 21, 43, 53, 48,118,138,132,158,177,116,163, 53,147,193,224, 50, 83,170,144,147, 14,146, 38,199, 37,
+150,216,176, 60,  9, 97,178,142,  8, 63,123, 28,178,201,212,134,250,181,218, 55, 35,108,102, 44, 76,100, 75,122, 98,153,113, 59,
+164, 16,175,188, 37, 64,120,239,106,223,155,169,202, 74, 45,158,131,204,190,151,118,251,250, 27,206,230, 71,  0,206,174,166, 55,
+109, 32, 10,238,174,101, 62,172, 72,165,129, 83,148,220, 90, 53,183,146,107,126,  4,255,142, 63, 66,114, 35, 17, 82, 43,155, 42,
+138,212,170,183,222,218,224, 99, 64, 13,145, 28,108,175,119,179,239, 61,239,174,221, 38, 84, 42,  7,100, 16,178, 87,102,153, 29,
+102,223,155,249,159,250, 72, 67,210, 29,236,186, 99, 67,153, 13,173, 30,143,199,132,203,240,242,244,244,106, 62, 63,193,199,116,
+ 58,165,207,184, 99,131,194,147,201,132,232,252,112, 52, 90,198, 49,157,144, 36,251,101,146,208,251, 73, 28,147,242,243, 34,207,
+234, 71,209,229,108,  6, 58,207,249,185, 97,241,230,138,139,249,220,141, 45, 93,221, 93,206, 46,204,193,199,179, 51,243,252,253,
+235, 55,245,215,143,  0, 49, 66,164,171,212, 28,223, 36, 95, 54,247,235,195,209,240, 54, 89, 30,157, 28,155,147,127,190, 94,192,
+210,149,237,210,187,212, 48,250,119, 31,222,127,186, 90,176,154, 39, 98,148, 43,205,155,118,147, 99,211,190, 42,176,147, 47, 99,
+225, 91,206, 14,160,218,  4, 52,229,227,195,254, 32,239,109,178,221,189, 89,102, 25,104, 31,188, 65,130,  2, 27,115,218,195,254,
+ 41,243, 37, 61,160, 49,113, 15,237,116,163, 64,116, 59,193, 32, 10,135,253,110,252,227,247,207,198, 13, 57, 18, 92, 98,250,162,
+153,164,165, 33, 14,138,115, 63, 91, 92,241, 24,101,161, 16,214,123,191, 21,220, 11,210,200,208, 21, 23,  7,161,138,182,197,246,
+169,120,146, 76, 65, 37, 41,242,252,  2,119,111,114, 37, 67,168, 33, 51,248, 30,  8,240,177, 97,165, 42,100,248,166, 27, 12, 30,
+205, 31, 21,238, 54,  9,181,135,113, 60,189,240,146, 43,118,144, 34,190, 84,140, 50,151, 80,123,103,118,247,149,251, 48, 33,221,
+118,246,127,  5,217, 29, 96,121, 54,218,240,169,117,234, 64,171, 27, 70,237,107,  6,218,195,  7,181,240,235,111, 19,220,249,190,
+154, 96,168, 87,175,211,157, 84,203, 48,169,246, 34,163,117, 81,184, 81, 86,184,246,186,161, 55, 34,133,188,191, 38, 20, 77, 51,
+ 43,167,  8,246, 66,247,144,182, 81, 78,190,188,191, 94,117,155,217,214,218,229, 23,182,154,  3,254,168,140,161,244, 99,229, 97,
+220,105, 77,173, 42, 74, 23, 76,162, 93, 80,138,246, 29, 12,176,231, 81,187,222,253, 67,156,217, 99, 50,195,173, 67,139,126, 93,
+ 85,179,111,182,125, 67, 32,155,179,147,203,220, 92,122,181,249,213,108,156,178,229, 46,188,212,224, 11,  0,109,127, 48,192, 74,
+178,242,113,183, 93,103,195,168,211,221,177, 12,123,153,132, 34,115, 35,164, 70, 24,232, 12, 62, 64, 56,111,165,170,111,112, 37,
+107,116,102, 22,214,  5,129,187,  0,179,  1,141,250, 12,236,202,  6,214,160, 69,183,163,245, 42, 31,232, 75,177, 66,138,108,200,
+ 48,218, 83, 16, 44, 32,247,167,180, 85,133,222,  5,242,161,216,174,243, 82,130, 89,  2,168,136,207,  2,112,118, 53, 61, 77,  4,
+ 97,120,102,182,180,221,  2, 69,130, 92, 73,140,186,248, 19,212,223,224, 30, 60,136,  9, 23,227,201,196,254, 11, 14,254,141,158,
+ 77,188, 16, 61,152,144,152,112,104, 13,  9, 73, 35,158,154,248,  7, 64, 72,196,  0, 90, 58,239,142,207,204,188,179, 31,101,193,
+232,158, 54,237,110,183,221,206, 62,243,204,251,241, 60,255,134,239, 99,183,245,122, 61,240,116,192,116,190,239,195, 53,192,122,
+128,114,191,223,  7,194,  2,184,211, 52,  5,190,  3,121,113,152, 39,215,229,125,156,133,119, 65,189, 59,157, 14,246,129,227,120,
+ 61,113, 33,160, 36, 73, 54,194,235,131,193,224,186, 39,207, 23,240, 96, 14,192,148, 48, 28, 14,113,245, 39,105,250,105,103, 39,
+ 47,254,193,134, 15,124,179,181,245,240,241, 35,220, 37,224,123,157,164,153,125, 84, 14, 70,163,123, 73,242,244,249, 51,112,246,
+175,163, 47,123,131,207, 31,223,127,216, 92,121,241,242,245, 43, 28,177,253,246,221,183,241,248,238,122,  2, 58,191, 11,124, 15,
+ 14, 17,161, 32,162,144,183,157,125,182,  3, 67,243, 25,193, 19, 43, 73,102, 39,  3, 18,122,239,248,188,169, 68, 87,202,181, 86,
+187, 75,250, 80, 79, 79, 45,133,231,124,100,211,153,108, 76,108,120, 39,138, 45,149,182,163,  2,220,225, 86,203,118,151, 46,196,
+209,131,213, 56,238,180,247,191, 95, 96,176,174,101,116,236, 58,220,186, 34,106, 71,173, 95,153,173, 49,183,137, 24,101,235,219,
+141, 39,240, 66,134,112,170, 23, 37,204,219,190,252, 74, 67,185,103,148,156,228, 47, 78, 80, 45, 48,119,250, 13, 98,174,173, 70,
+146, 77,199,187, 85, 39, 49,237,149,206,201, 67, 75, 82,218, 35, 16,101,209,153, 57, 93,157,191, 45,229,156,182,214, 79, 38,116,
+ 35,179, 85,153,114,142, 52, 52,187,168,228,138,146,160, 32,224, 93,201, 56,228,158,247,163,150, 28, 83,  3,217,172, 69,246,162,
+ 85, 53,  4,127, 77, 73,176,240,191,138,123,107, 43, 20,163, 26,112, 55, 55,138,  6,135, 80,128,241,189,166, 82, 22,210,146,121,
+ 64,198,176,143, 15, 23, 31,250,121,183,112, 21,  7,181,151,162,170, 58,160, 42,173, 88,121, 58,161,110,132,139,170,  9,234,172,
+183,181, 40,100,123,175,107, 14,  8,118,199, 28,183,  8,235,212,210, 55, 15, 19, 83, 17,187, 55, 87,116,128,189, 99, 86,195,102,
+ 32,  5,213,119,221,150,189, 79,255,242,191, 81, 85,249,222,212, 79, 18,211,242, 93, 32,147, 45,183, 23, 39,103, 19, 55,104,167,
+ 87,252,223,139, 24,171,175,102, 81,170,241,227,242,100,190,185,116,116,126,120, 63,190,163, 65,101,136, 43,179, 66, 37, 19, 73,
+ 78,162,186,232,151, 77,108,146,119,230, 82,161, 33,214, 93,197,100, 44, 36, 96, 87,111, 13, 78,209,115,216, 93,135, 50, 74, 98,
+ 55, 15, 94,255,231,  5, 87,153,235,132,170,118,138,241,207, 55, 37,245, 77, 18,151, 23,217, 79,  2,221, 98, 22, 98,254,  8,192,
+219,181,228, 52, 12,  3, 81,143,227, 36,106,161,168, 72, 21, 72,  8,150,172,184, 10,234, 57, 16,108,233,  1,202,130,227,176, 40,
+151,225,  0, 72, 44,144, 88,132,150,182, 56,113,240,140, 63,113,226, 32,126, 18, 89,180, 93, 84,141,146,120,166,111,158,231,189,
+129,  1,186, 78,193,170,103,208,197, 15,182,179,175,103, 51,157,184,239, 23, 11,246,239,  7, 68,125,199,250, 56,159, 78, 13, 36,
+191,184,186,188,157,223,152,207,208,144,113, 73,221,227, 88,217, 68,169, 39, 47,120,  0,124, 60,200,141,  5,143, 96,247,172,122,
+160,132, 71,206,193, 43, 88,177, 20, 61,108,253,118,152,136, 83,  1,133,148, 79,165, 90,210,211,202,137,148, 47,200, 31,110,140,
+162, 52,174, 23,218, 36, 75, 38,195,236, 96,148,158, 29,237, 60,110,212,221,195,203,243,219, 59,118, 98,105, 12, 77, 27,191,202,
+180, 95,160,104,  9,197,213,166, 43, 29, 76,198,227,192,218,189,222,118, 28, 10, 55, 25,197,130, 11, 20,222, 40,158,243, 17, 84,
+249, 74,190,110,117,189, 91,149,100,136, 81,150,110, 36,155,129,249,134,126, 77,236,181,160,138, 66, 36,233,120,176, 95,178,213,
+ 82, 22,212,104,161,130,155,103,215,107,  7,  5, 83,136, 58,216, 78,132,189,243,248, 53,205,131,209,144,  7,  5,174, 56,  8, 36,
+ 78,  1,102,143,201,223, 80,211,212,113, 27,255,146, 25,136,211, 37,119,196, 78,251, 59,240,155, 21,235,152, 48,222, 37,134,  2,
+209, 92, 99, 10,  9,125,182, 28,  0,225,180,208,154,125,230,118, 92,  7,132, 75,156,217, 61, 39, 83,181, 40,153,200,175,211,222,
+ 88, 27, 32,230,220,238,252,188,238, 84,102,129,222,184,207,228,221,144, 70,208,  0,124,198,190,169, 59,253,187, 12,211,255,120,
+206, 53, 24,218,134,129,193,109,163, 11, 96,121,202, 68, 38,210, 20,178, 12,167, 42,137, 97,178,119,188,123,178,149,107, 86,109,
+214,114, 67,136, 71, 98, 15, 98,109,112, 15, 35,127, 42, 36, 24,165, 14, 22,244,  4,182,217, 89, 56, 70,200,103, 24, 69,178, 38,
+183,  1,160,106,139,211,149,203,218,173,254,112,143,195, 42, 55,198,139, 27,250,180,201, 57, 88, 10,164,196, 87, 17, 11,132,110,
+ 89, 26,147,209, 95,  8,255, 16,128,185,171,231,105, 24,  6,162, 57, 59, 73,145, 24, 64, 98,165, 98,  0,254,255,194,  6,226, 15,
+240, 39, 24, 96, 65, 76,173, 72,210,218,190, 35,254, 56,251,156, 82, 33,  1,  3, 85,183, 84,170,100, 57,207,231,119,239,189,107,
+255, 16, 94,255,201,103,174,235, 47,215,235, 25,226,199, 97,120,188,127,120,241,132, 79,149,  1, 27,110, 46,139, 43,173,176,142,
+231,200,  4,242, 20,176,226, 55,144,129,  0, 15,146, 65,232, 72,131,174, 68,155,229,222, 41, 68,157,132,  7,221, 54, 50,125,243,
+211, 55,135,239,182,185, 93,245, 55, 45,110,246,110, 66, 23,126,172, 78,  3,201,120,214,170,174,243, 33, 56,215,231,221,213,197,
+  9,172,250,187,231,143,167,215,141, 15, 45,213,254,162,103, 49,202, 96, 19, 10,104, 42, 26,  6, 37,143,181, 34,134,136, 35, 62,
+130, 89,206,229, 26, 16, 33,101, 58,162,113, 48,217,237, 14, 71,235,220,190,217, 33,143,199, 66,102,232,227, 87,135, 49, 96,236,
+191,135,121,119, 79,251,161,239, 90, 10,  9,184, 32, 11, 65,200,209,205, 21,190, 99, 74,232, 45,156, 12, 17, 11,186, 83,163, 15,
+147, 66, 27, 42,238, 56, 27,232,235,169,205, 57,221,  0, 22,121,  5,120,132,126, 57, 38,130,166,175,144, 93,213, 79,190, 45,219,
+235,250, 87, 86,136, 74, 98,175, 19, 80, 13,  7,222,160, 74,217,  1,101,208,143, 42,190, 45, 46,237,161,136, 39,151,196,182, 88,
+ 40, 57,219, 58,175,176, 44,180,249,143,211,138, 83,233,204,168,140, 53,212,112, 70,127,234, 27,227,194,106,142,194, 71, 70,181,
+  7,135, 83,239,127, 50,251,240,119, 64,181, 60,  0, 71,161,155,204, 76, 34,248, 88,247, 96,252,236, 86,214, 24,165,253,180, 73,
+133,122,132,173, 37,211,233,126,112, 59,127,159,118,113,154,120, 58,180, 12, 89,229,149, 53, 24, 11,184,249,120,176, 77,212, 23,
+ 52,134, 19, 57, 36,129,102, 89,152, 27, 60,174,209,129, 17,105, 25,185, 97, 48,  4,199,167, 62, 22,178, 89, 50,236, 25, 23, 14,
+137, 40,174, 79, 83, 16,216,196, 99, 66,202,  2,217,102,190,157,232, 79,  1,136,187,130,156,134, 97, 32,104,175,237,164,109,104,
+185, 33,110, 72, 72,252,255, 13,124,133,  3,  7,224, 80,138, 68, 73,226,216,196,107,175,227, 77, 20,169,  8, 36, 30,208,168,138,
+227,245,204,122,102,246,183,248,253,223,235,187,228,174,  7,207, 45, 21,101, 99,116,109,176, 20,100,176, 62, 97, 16,159, 39,122,
+231,155,165,159,245,104, 11, 56,195, 81,188,140,180, 64,146,116, 89,209,154,141, 91,100,167,225,161,214,247,  6, 94,206,246,109,
+ 24, 26,  5,215, 90,238,183,112, 85,155,155, 67, 37, 43,243,220,186,199,167,211,120,  6,104,  5,136, 29,130,214, 42,119,168,163,
+118,132,252,239, 82,161,175, 20,100, 78,247,145,204,254,149, 10,  6, 82,200,160,173, 65,159, 46,214, 49, 99, 15,199,254,216,249,
+ 22, 89,103,111, 83,167, 37, 17, 18,196,236, 74, 36,163,157,138,124,  8,203,189,110,204,182,169,119,239,221,107, 12,254, 45,198,
+ 25,205, 81, 40,  5,203,120,202,128,140,255,223,185, 50,111,192,145,100,134,182,230,100,188,247, 76,103,237,242, 32, 14,170,236,
+ 37,144,140,186, 73, 78,  5,104,120,209,  5,171,  8,252,219,184,184,178,139,181,252,244,229,207,103,140, 64,242,196,121,224,172,
+145, 58,242, 32,138,146, 79, 39,144, 88,198, 61,122, 54,159,122, 98, 54,236, 42,181,232,201, 20,175,200,  9,158, 11, 18,141,151,
+217, 71, 83,238,145,188,182,165, 84, 38,195,166, 97, 49, 85,149, 81,171,245, 67,247,175,202,203,190, 62,124,180,167,164, 65,128,
+186,195,202, 62, 83, 73,201,212,124, 11, 95, 52,118, 84,148, 22, 90, 43, 93,129,169,196,198,132,152,166,205,109,125,215,218,179,
+ 31, 90, 59,244, 95, 99,161, 15,152,125,228,184,254,115, 68,237,120, 45,135,123,193, 59, 84,184,218, 36,114,119,144, 52,236, 81,
+ 73, 54,248, 41,171, 32,244,232,237,100, 37,163, 59, 97,161, 29,221, 75,231,177,233, 52,185, 41,177, 91,122,102,152,  2,224,  2,
+ 96,  5,106, 69, 58, 36, 13,218,138,110,124,206,183,  0,172,157, 95,107,131, 48, 20,197,115, 18,197, 89,101,143, 99, 79,133,189,
+172,223,255,115,244,139,236, 31, 12,218,181, 80,109,110,102,114, 19,141, 81,219,210,173, 15, 82, 40,212, 32,250, 51,247, 36,247,
+156, 63,241,253,238,171,111,110,251,219, 27,109,167, 49,209,103,102,249,126,217, 48,186, 95,146,158, 26, 27, 36,148, 23,151,226,
+114,252,239,209,251,  0, 17, 83,165, 98, 95,240,160,108, 32, 66,191,  4,111,  9,148, 43,133,205, 74,189,214,197, 75,157,101,185,
+250,106,205, 71,171,223, 78,180,125,255,145,142,215,118,181,147, 27,107,221,209,151,117,214,223,  4,185, 20, 79,143,178, 42,113,
+106,205,238,104,190, 15,210,122,201, 43,223, 16, 36,  8, 52, 92, 13,112,202,132,123, 80,149,151,240,172,106,159,139, 38,223,211,
+193,229,  9,112,240, 35,247,115,114,244,  1, 92,209,167,250,128,202,248, 75,149,213, 29,226,119,244, 25, 10,118, 55, 52, 57, 42,
+244,145, 68, 99,135,110,204,  4,238,218,  4,103,112, 30, 59, 13,224,161,177,103,239, 56, 98,105, 80, 18, 40, 57, 75, 34,245,204,
+ 53, 61,206,221, 15, 18,247,144, 61,157,126, 95,187,213, 23,112,143,212,137,102,194,250, 62,  6,122, 66,249,208,133, 20,149,112,
+ 38,141,223,139, 36, 20,145,194,253,140,133,  7,206, 76, 40, 47,230,115,207, 71, 82,216, 44,220,197,181,212,108, 44, 68, 87,253,
+215, 39,115,172, 31,243, 29,206, 34,198, 34, 94,161,131,251,131,178,211,153,162,176, 41,103,226,185, 90,151, 40,143,205,158,116,
+211,241, 93, 91,113,198,122, 64,106,173,185, 17,248,236,230, 18, 33,144,145,250,246,102, 71,121,161,  7, 53,134,139, 75,195,145,
+170,240,  5, 77, 60, 41, 65,180, 56,195, 59,100,248, 29,224,119,203,134, 28,205,126,250,134,224, 90, 65, 97,252,182,199,245, 87,
+  0,214,174, 45, 55,129, 24,  6,102, 66, 34,180, 85,145,170,170,247,191, 88, 47,192, 13,160,221, 36,110, 76,226,144, 23, 81,171,
+ 34, 62,128, 15,172,197,152,137,215,246,140, 25,223,249, 86,101,169, 55,253, 68,124,255,255,146, 92,252,  5,223,135,154,230,111,
+236,163,131,248,246,  9,152, 29, 66,163, 22,161,110, 63, 39,132,180,100, 61,231,239, 61,196,235,164, 34,137, 24, 82, 22,234,200,
+148,104,149,196, 18,138,182, 80,234,206, 39,112, 15, 84,150,175,199, 88,164,163,225, 57,176,248,151,126, 49,120,219, 14, 31,175,
+ 54, 90,250, 60,211,238,138, 94, 32, 58, 63,201, 55,205, 51, 91,183,200, 49,222,225, 26, 46,187,  8, 13,248, 42,121,207, 27,135,
+ 27, 88,135,128,190,217,226,227,128,157, 46,194,112, 10,164,122, 47,220,231,  5, 51,175,124,  2,238, 65, 52,107,137,154, 69,110,
+170, 79, 76,235,124,241, 33,176,182,154, 51,181, 34,233,170,246,174,231, 82, 48, 88, 84,231,187,119, 52, 52, 27,134,137,111, 60,
+ 14,102,172,177,190,  9,206,219,121,141,137, 25,106, 47,160,120, 93, 45,193,189,  3,229,249, 21,162,106, 69,160, 61,187,107,238,
+146, 90,130,187, 26,176,155,158,148, 68,114, 28,107,235, 89,  2,108,117, 58,104,230, 17,132, 74,215, 36,113, 80, 41,189, 96,242,
+145,142, 17,205,251,181,249,246, 89,219,205,158, 78,230,253,219, 93,157,251,242,126, 15,105,224,157,  7,213, 88, 15,128, 85,  4,
+114,247,136,106,183,203,158,149,188, 78, 47,220,221, 75,133,  5, 38,191, 36,164,179,170, 43,197,205, 92,144,169, 37, 58,208, 83,
+ 30, 32,181,154,108, 54,101,244, 63,  2, 12,  0,210, 11, 96,129, 76, 18,236, 22,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
 };

From 87929332c7e0e371933a54ca8b86ad2099c34ac7 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Mon, 31 Aug 2009 18:18:10 +0000
Subject: [PATCH 375/577] Changed sync difference time of sound strips to 0.5
 seconds instead of 1 frame. Maybe this should be a user preference setting?

---
 source/blender/blenkernel/intern/sound.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 8159f2f8c4c..06ef8a23142 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -376,7 +376,7 @@ void sound_update_playing(struct bContext *C)
 						float diff = AUD_getPosition(handle->handle) * fps - cfra + handle->startframe;
 						if(diff < 0.0)
 							diff = -diff;
-						if(diff > 1.0f)
+						if(diff > FPS/2.0)
 						{
 							action = 2;
 						}

From 121f310fab0a3e1171293583df2e7a984112363b Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Mon, 31 Aug 2009 22:50:08 +0000
Subject: [PATCH 376/577] Add missing define to rna for sound system.

---
 source/blender/makesrna/intern/Makefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile
index c7cc6e7a4bf..4a4e41edd15 100644
--- a/source/blender/makesrna/intern/Makefile
+++ b/source/blender/makesrna/intern/Makefile
@@ -77,6 +77,18 @@ ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -DWITH_QUICKTIME
 endif
 
+ifeq ($(WITH_SDL),true)
+	CPPFLAGS += -DWITH_SDL
+endif
+
+ifeq ($(WITH_JACK),true)
+	CPPFLAGS += -DWITH_JACK
+endif
+
+ifeq ($(WITH_OPENAL),true)
+	CPPFLAGS += -DWITH_OPENAL
+endif
+
 ifeq ($(OS),windows)
     # Windows needs these extra libs because of winstuff... It is not 
     # _really_ needed, but it is the easiest fix for now. If you have 

From 04bbb6a0c7a7c8a6c55f1528e76132e7f5a38e6f Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Tue, 1 Sep 2009 00:33:39 +0000
Subject: [PATCH 377/577] 2.5: Layout Python Files: * Code cleanup. * Made some
 files match the code guidelines, should be all now. Please everybody use
 them: http://wiki.blender.org/index.php/Dev:Py/Blender2.5/Layouts/Guidelines
 * Made polls and header_draw functions as small as possible.

* Small fixes here and there.
---
 release/ui/buttons_data_armature.py    |   2 +-
 release/ui/buttons_data_bone.py        |   7 +-
 release/ui/buttons_data_camera.py      |   4 +-
 release/ui/buttons_data_curve.py       |  69 +++---
 release/ui/buttons_data_lamp.py        |  17 +-
 release/ui/buttons_data_lattice.py     |   2 +-
 release/ui/buttons_data_mesh.py        |   2 +-
 release/ui/buttons_data_modifier.py    |   1 +
 release/ui/buttons_data_text.py        |  40 ++--
 release/ui/buttons_game.py             |  30 +--
 release/ui/buttons_material.py         | 318 +++++++++++--------------
 release/ui/buttons_physics_cloth.py    |  10 +-
 release/ui/buttons_physics_field.py    |   2 +-
 release/ui/buttons_physics_smoke.py    | 144 +++++------
 release/ui/buttons_physics_softbody.py |  18 +-
 release/ui/buttons_scene.py            |   8 +-
 release/ui/buttons_world.py            |  43 ++--
 release/ui/space_image.py              |  56 +++--
 release/ui/space_info.py               |   2 +
 release/ui/space_node.py               |   3 +-
 release/ui/space_text.py               |  14 +-
 release/ui/space_view3d_toolbar.py     |  11 +-
 22 files changed, 362 insertions(+), 441 deletions(-)

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index f207b556a6d..ed350caa3bd 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -83,7 +83,7 @@ class DATA_PT_bone_groups(DataButtonsPanel):
 		layout = self.layout
 		
 		ob = context.object
-		pose= ob.pose
+		pose = ob.pose
 		
 		row = layout.row()
 		row.template_list(pose, "bone_groups", pose, "active_bone_group_index")
diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index cfdaabadf79..8098648886b 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -77,6 +77,7 @@ class BONE_PT_bone(BoneButtonsPanel):
 		ob = context.object
 		bone = context.bone
 		arm = context.armature
+		
 		if not bone:
 			bone = context.edit_bone
 		else:
@@ -192,18 +193,18 @@ class BONE_PT_deform(BoneButtonsPanel):
 	__default_closed__ = True
 
 	def draw_header(self, context):
-		layout = self.layout
-		
 		bone = context.bone
+		
 		if not bone:
 			bone = context.edit_bone
 			
-		layout.itemR(bone, "deform", text="")
+		self.layout.itemR(bone, "deform", text="")
 
 	def draw(self, context):
 		layout = self.layout
 		
 		bone = context.bone
+		
 		if not bone:
 			bone = context.edit_bone
 	
diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py
index 0480897d641..aa107d8dbdd 100644
--- a/release/ui/buttons_data_camera.py
+++ b/release/ui/buttons_data_camera.py
@@ -7,7 +7,7 @@ class DataButtonsPanel(bpy.types.Panel):
 	__context__ = "data"
 
 	def poll(self, context):
-		return (context.camera != None)
+		return (context.camera)
 		
 class DATA_PT_context_camera(DataButtonsPanel):
 	__show_header__ = False
@@ -49,7 +49,7 @@ class DATA_PT_camera(DataButtonsPanel):
 		elif cam.type == 'ORTHO':
 			row.itemR(cam, "ortho_scale")
 
-		layout.itemR(cam, "panorama");
+		layout.itemR(cam, "panorama")
 				
 		split = layout.split()
 			
diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 92e414ba2f3..ced3c6597e0 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -38,33 +38,34 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 		curve = context.curve
 		space = context.space_data
 
-		if curve:
-			layout.itemR(curve, "curve_2d")			
+		layout.itemR(curve, "curve_2d")			
 							
-			split = layout.split()
+		split = layout.split()
 		
-			col = split.column()
-			colsub = col.column()
-			colsub.active = curve.curve_2d
-			colsub.itemL(text="Caps:")
-			colsub.itemR(curve, "front")
-			colsub.itemR(curve, "back")
+		col = split.column()
+		sub = col.column()
+		sub.active = curve.curve_2d
+		sub.itemL(text="Caps:")
+		sub.itemR(curve, "front")
+		sub.itemR(curve, "back")
 			
-			col.itemL(text="Textures:")
-#			col.itemR(curve, "uv_orco")
-			col.itemR(curve, "auto_texspace")
+		col.itemL(text="Textures:")
+#		col.itemR(curve, "uv_orco")
+		col.itemR(curve, "auto_texspace")
 			
-			sub = split.column()	
-			sub.itemL(text="Resolution:")
-			sub.itemR(curve, "resolution_u", text="Preview U")
-			sub.itemR(curve, "resolution_v", text="Preview V")
-			sub.itemR(curve, "render_resolution_u", text="Render U")
-			sub.itemR(curve, "render_resolution_v", text="Render V")
+		col = split.column()	
+		col.itemL(text="Resolution:")
+		sub = col.column(align=True)
+		sub.itemR(curve, "resolution_u", text="Preview U")
+		sub.itemR(curve, "render_resolution_u", text="Render U")
+		sub = col.column(align=True)
+		sub.itemR(curve, "resolution_v", text="Preview V")
+		sub.itemR(curve, "render_resolution_v", text="Render V")
 
-#			sub.itemL(text="Display:")
-#			sub.itemL(text="HANDLES")
-#			sub.itemL(text="NORMALS")
-#			sub.itemR(curve, "vertex_normal_flip")
+#		col.itemL(text="Display:")
+#		col.itemL(text="HANDLES")
+#		col.itemL(text="NORMALS")
+#		col.itemR(curve, "vertex_normal_flip")
 
 class DATA_PT_geometry_curve(DataButtonsPanel):
 	__label__ = "Geometry "
@@ -76,27 +77,25 @@ class DATA_PT_geometry_curve(DataButtonsPanel):
 
 		split = layout.split()
 	
-		sub = split.column()
-		sub.itemL(text="Modification:")
-		sub.itemR(curve, "width")
-		sub.itemR(curve, "extrude")
-		sub.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
+		col = split.column()
+		col.itemL(text="Modification:")
+		col.itemR(curve, "width")
+		col.itemR(curve, "extrude")
+		col.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
 		
-		sub = split.column()
-		sub.itemL(text="Bevel:")
-		sub.itemR(curve, "bevel_depth", text="Depth")
-		sub.itemR(curve, "bevel_resolution", text="Resolution")
-		sub.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
+		col = split.column()
+		col.itemL(text="Bevel:")
+		col.itemR(curve, "bevel_depth", text="Depth")
+		col.itemR(curve, "bevel_resolution", text="Resolution")
+		col.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
 	
 class DATA_PT_pathanim(DataButtonsPanel):
 	__label__ = "Path Animation"
 	
 	def draw_header(self, context):
-		layout = self.layout
-		
 		curve = context.curve
 
-		layout.itemR(curve, "path", text="")
+		self.layout.itemR(curve, "path", text="")
 
 	def draw(self, context):
 		layout = self.layout
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index c1873d934c4..808a205b1b8 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -13,9 +13,7 @@ class DATA_PT_preview(DataButtonsPanel):
 	__label__ = "Preview"
 
 	def draw(self, context):
-		layout = self.layout
-
-		layout.template_preview(context.lamp)
+		self.layout.template_preview(context.lamp)
 	
 class DATA_PT_context_lamp(DataButtonsPanel):
 	__show_header__ = False
@@ -69,8 +67,7 @@ class DATA_PT_lamp(DataButtonsPanel):
 		if lamp.type == 'AREA':
 			col.itemR(lamp, "distance")
 			col.itemR(lamp, "gamma")
-
-			
+	
 		col = split.column()
 		col.itemR(lamp, "negative")
 		col.itemR(lamp, "layer", text="This Layer Only")
@@ -299,18 +296,12 @@ class DATA_PT_falloff_curve(DataButtonsPanel):
 	def poll(self, context):
 		lamp = context.lamp
 
-		if lamp and lamp.type in ('POINT', 'SPOT'):
-			if lamp.falloff_type == 'CUSTOM_CURVE':
-				return True
-
-		return False
+		return (lamp and lamp.type in ('POINT', 'SPOT') and lamp.falloff_type == 'CUSTOM_CURVE')
 
 	def draw(self, context):
-		layout = self.layout
-		
 		lamp = context.lamp
 
-		layout.template_curve_mapping(lamp.falloff_curve)
+		self.layout.template_curve_mapping(lamp.falloff_curve)
 
 bpy.types.register(DATA_PT_context_lamp)
 bpy.types.register(DATA_PT_preview)
diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py
index 5535f973b27..895c1a65bea 100644
--- a/release/ui/buttons_data_lattice.py
+++ b/release/ui/buttons_data_lattice.py
@@ -7,7 +7,7 @@ class DataButtonsPanel(bpy.types.Panel):
 	__context__ = "data"
 	
 	def poll(self, context):
-		return (context.lattice != None)
+		return (context.lattice)
 	
 class DATA_PT_context_lattice(DataButtonsPanel):
 	__show_header__ = False
diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index 42b637e1f9d..33b3960b381 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -7,7 +7,7 @@ class DataButtonsPanel(bpy.types.Panel):
 	__context__ = "data"
 	
 	def poll(self, context):
-		return (context.mesh != None)
+		return (context.mesh)
 
 class DATA_PT_context_mesh(DataButtonsPanel):
 	__show_header__ = False
diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index bc41b04d32c..66c8179f990 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -27,6 +27,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
 	# the mt.type enum is (ab)used for a lookup on function names
 	# ...to avoid lengthy if statements
 	# so each type must have a function here.
+
 	def ARMATURE(self, layout, ob, md):
 		layout.itemR(md, "object")
 		
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 1abc82cfaa3..aabf218122f 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -38,29 +38,29 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		curve = context.curve
 		space = context.space_data
 
-		if curve:
-			layout.itemR(curve, "curve_2d")			
+
+		layout.itemR(curve, "curve_2d")			
 							
-			split = layout.split()
+		split = layout.split()
 		
-			col = split.column()
-			col.itemL(text="Caps:")
-			col.itemR(curve, "front")
-			col.itemR(curve, "back")
-			col.itemL(text="Textures:")
-			col.itemR(curve, "uv_orco")
-			col.itemR(curve, "auto_texspace")
+		col = split.column()
+		col.itemL(text="Caps:")
+		col.itemR(curve, "front")
+		col.itemR(curve, "back")
+		col.itemL(text="Textures:")
+		col.itemR(curve, "uv_orco")
+		col.itemR(curve, "auto_texspace")
 			
-			col = split.column()	
-			col.itemL(text="Resolution:")
-			sub = col.column(align=True)
-			sub.itemR(curve, "resolution_u", text="Preview U")
-			sub.itemR(curve, "render_resolution_u", text="Render U")
-			sub = col.column(align=True)
-			sub.itemR(curve, "resolution_v", text="Preview V")
-			sub.itemR(curve, "render_resolution_v", text="Render V")
-			col.itemL(text="Display:")
-			col.itemR(curve, "fast")
+		col = split.column()	
+		col.itemL(text="Resolution:")
+		sub = col.column(align=True)
+		sub.itemR(curve, "resolution_u", text="Preview U")
+		sub.itemR(curve, "render_resolution_u", text="Render U")
+		sub = col.column(align=True)
+		sub.itemR(curve, "resolution_v", text="Preview V")
+		sub.itemR(curve, "render_resolution_v", text="Render V")
+		col.itemL(text="Display:")
+		col.itemR(curve, "fast")
 
 class DATA_PT_geometry_text(DataButtonsPanel):
 	__label__ = "Geometry"
diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py
index e28e3fda2c6..73ba566e23f 100644
--- a/release/ui/buttons_game.py
+++ b/release/ui/buttons_game.py
@@ -45,10 +45,9 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel):
 			
 			col = split.column()
 			col.itemL(text="Attributes:")
-			sub = col.column()
-			sub.itemR(game, "mass")
-			sub.itemR(game, "radius")
-			sub.itemR(game, "form_factor")
+			col.itemR(game, "mass")
+			col.itemR(game, "radius")
+			col.itemR(game, "form_factor")
 			
 			col = split.column()
 			sub = col.column()
@@ -108,8 +107,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel):
 			col.itemR(soft, "dynamic_friction", slider=True)
 			col.itemR(soft, "margin", slider=True)
 			col.itemR(soft, "bending_const", text="Bending Constraints")
-			
-			
+
 			col = split.column()
 			col.itemR(soft, "shape_match")
 			sub = col.column()
@@ -134,32 +132,26 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel):
 			
 		elif game.physics_type in ('SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'):
 			
-			col = layout.column()
-			col.itemR(ob, "restrict_render", text="Invisible")
+			layout.itemR(ob, "restrict_render", text="Invisible")
 			
 class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel):
 	__label__ = "Collision Bounds"
 
 	def poll(self, context):
-		ob = context.active_object
-		game = ob.game
+		game = context.object.game
 		rd = context.scene.render_data
 		return (game.physics_type in ('DYNAMIC', 'RIGID_BODY', 'SENSOR', 'SOFT_BODY', 'STATIC')) and (rd.engine == 'BLENDER_GAME')
 
 	def draw_header(self, context):
-		layout = self.layout
-		
-		ob = context.active_object
-		game = ob.game
+		game = context.active_object.game
 
-		layout.itemR(game, "use_collision_bounds", text="")
+		self.layout.itemR(game, "use_collision_bounds", text="")
 	
 	def draw(self, context):
 		layout = self.layout
 		
-		ob = context.scene.objects[0]
-		game = ob.game
-		
+		game = context.active_object.game
+
 		layout.active = game.use_collision_bounds
 		layout.itemR(game, "collision_bounds", text="Bounds")
 		
@@ -184,8 +176,6 @@ class SCENE_PT_game(SceneButtonsPanel):
 
 	def draw(self, context):
 		layout = self.layout
-		
-		rd = context.scene.render_data
 
 		row = layout.row()
 		row.itemO("view3d.game_start", text="Start")
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index e317d990c39..dc11731d7a9 100644
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -8,18 +8,16 @@ class MaterialButtonsPanel(bpy.types.Panel):
 	# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 
 	def poll(self, context):
-		return (context.material) and (context.scene.render_data.engine in self.COMPAT_ENGINES)
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (engine in self.COMPAT_ENGINES)
 
 class MATERIAL_PT_preview(MaterialButtonsPanel):
 	__label__ = "Preview"
 	COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME'])
 
 	def draw(self, context):
-		layout = self.layout
-		
-		mat = context.material
-		
-		layout.template_preview(mat)
+		self.layout.template_preview(context.material)
 		
 class MATERIAL_PT_context_material(MaterialButtonsPanel):
 	__show_header__ = False
@@ -83,32 +81,27 @@ class MATERIAL_PT_shading(MaterialButtonsPanel):
 		layout = self.layout
 		
 		mat = context.material
-		ob = context.object
-		slot = context.material_slot
-		space = context.space_data
 
-		if mat:
-
-			if mat.type in ('SURFACE', 'WIRE'):
-				split = layout.split()
+		if mat.type in ('SURFACE', 'WIRE'):
+			split = layout.split()
 	
-				col = split.column()
-				sub = col.column()
-				sub.active = not mat.shadeless
-				sub.itemR(mat, "emit")
-				sub.itemR(mat, "ambient")
-				sub = col.column()
-				sub.itemR(mat, "translucency")
+			col = split.column()
+			sub = col.column()
+			sub.active = not mat.shadeless
+			sub.itemR(mat, "emit")
+			sub.itemR(mat, "ambient")
+			sub = col.column()
+			sub.itemR(mat, "translucency")
 				
-				col = split.column()
-				col.itemR(mat, "shadeless")	
-				sub = col.column()
-				sub.active = not mat.shadeless
-				sub.itemR(mat, "tangent_shading")
-				sub.itemR(mat, "cubic")
+			col = split.column()
+			col.itemR(mat, "shadeless")	
+			sub = col.column()
+			sub.active = not mat.shadeless
+			sub.itemR(mat, "tangent_shading")
+			sub.itemR(mat, "cubic")
 				
-			elif mat.type == 'HALO':
-				layout.itemR(mat, "alpha")
+		elif mat.type == 'HALO':
+			layout.itemR(mat, "alpha")
 			
 class MATERIAL_PT_strand(MaterialButtonsPanel):
 	__label__ = "Strand"
@@ -158,8 +151,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel):
 	def draw(self, context):
 		layout = self.layout
 		
-		mat = context.material
-		phys = mat.physics
+		phys = context.material.physics
 		
 		split = layout.split()
 		
@@ -363,12 +355,11 @@ class MATERIAL_PT_sss(MaterialButtonsPanel):
 		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
 	def draw_header(self, context):
-		layout = self.layout
 		sss = context.material.subsurface_scattering
 		mat = context.material
 		
-		layout.active = (not mat.shadeless)
-		layout.itemR(sss, "enabled", text="")
+		self.layout.active = (not mat.shadeless)
+		self.layout.itemR(sss, "enabled", text="")
 	
 	def draw(self, context):
 		layout = self.layout
@@ -408,12 +399,10 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel):
 		engine = context.scene.render_data.engine
 		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 	
-	def draw_header(self, context):
-		layout = self.layout
-		
+	def draw_header(self, context):	
 		raym = context.material.raytrace_mirror
 
-		layout.itemR(raym, "enabled", text="")
+		self.layout.itemR(raym, "enabled", text="")
 	
 	def draw(self, context):
 		layout = self.layout
@@ -465,11 +454,9 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 		engine = context.scene.render_data.engine
 		return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
 
-	def draw_header(self, context):
-		layout = self.layout
-		
+	def draw_header(self, context):	
 		mat = context.material
-		layout.itemR(mat, "transparency", text="")
+		self.layout.itemR(mat, "transparency", text="")
 
 	def draw(self, context):
 		layout = self.layout
@@ -477,15 +464,14 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 		mat = context.material
 		rayt = context.material.raytrace_transparency
 		
-		row= layout.row()
-		row.itemR(mat, "transparency_method", expand=True)
+		row = layout.row()
 		row.active = mat.transparency and (not mat.shadeless)
+		row.itemR(mat, "transparency_method", expand=True)
 		
 		split = layout.split()
 		
 		col = split.column()
-		row = col.row()
-		row.itemR(mat, "alpha")
+		col.itemR(mat, "alpha")
 		row = col.row()
 		row.active = mat.transparency and (not mat.shadeless)
 		row.itemR(mat, "specular_alpha", text="Specular")
@@ -517,129 +503,6 @@ class MATERIAL_PT_transp(MaterialButtonsPanel):
 			sub.itemR(rayt, "gloss_threshold", text="Threshold")
 			sub.itemR(rayt, "gloss_samples", text="Samples")
 
-class MATERIAL_PT_volume_shading(MaterialButtonsPanel):
-	__label__ = "Shading"
-	__default_closed__ = False
-	COMPAT_ENGINES = set(['BLENDER_RENDER'])
-	
-	def poll(self, context):
-		mat = context.material
-		engine = context.scene.render_data.engine
-		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
-	
-	def draw(self, context):
-		layout = self.layout
-
-		mat = context.material
-		vol = context.material.volume
-		
-		split = layout.split()
-		
-		row = split.row()
-		row.itemR(vol, "density")
-		row.itemR(vol, "scattering")
-		
-		split = layout.split()
-		col = split.column()
-		col.itemR(vol, "absorption")
-		col.itemR(vol, "absorption_color", text="")
-
-		col = split.column()
-		col.itemR(vol, "emission")
-		col.itemR(vol, "emission_color", text="")
-
-class MATERIAL_PT_volume_scattering(MaterialButtonsPanel):
-	__label__ = "Scattering"
-	__default_closed__ = False
-	COMPAT_ENGINES = set(['BLENDER_RENDER'])
-	
-	def poll(self, context):
-		mat = context.material
-		engine = context.scene.render_data.engine
-		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
-	
-	def draw(self, context):
-		layout = self.layout
-		
-		mat = context.material
-		vol = context.material.volume
-		
-		split = layout.split()
-		
-		col = split.column()
-		col.itemR(vol, "scattering_mode", text="")
-		if vol.scattering_mode == 'SINGLE_SCATTERING':
-			col.itemR(vol, "light_cache")
-			sub = col.column()
-			sub.active = vol.light_cache
-			sub.itemR(vol, "cache_resolution")
-		elif vol.scattering_mode in ('MULTIPLE_SCATTERING', 'SINGLE_PLUS_MULTIPLE_SCATTERING'):
-			col.itemR(vol, "cache_resolution")
-			
-			col = col.column(align=True)
-			col.itemR(vol, "ms_diffusion")
-			col.itemR(vol, "ms_spread")
-			col.itemR(vol, "ms_intensity")
-		
-		col = split.column()
-		# col.itemL(text="Anisotropic Scattering:")
-		col.itemR(vol, "phase_function", text="")
-		if vol.phase_function in ('SCHLICK', 'HENYEY-GREENSTEIN'):
-			col.itemR(vol, "asymmetry")
-
-class MATERIAL_PT_volume_transp(MaterialButtonsPanel):
-	__label__= "Transparency"
-	COMPAT_ENGINES = set(['BLENDER_RENDER'])
-		
-	def poll(self, context):
-		mat = context.material
-		engine = context.scene.render_data.engine
-		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
-
-	def draw_header(self, context):
-		layout = self.layout
-
-	def draw(self, context):
-		layout = self.layout
-		
-		mat = context.material
-		rayt = context.material.raytrace_transparency
-		
-		row= layout.row()
-		row.itemR(mat, "transparency_method", expand=True)
-		row.active = mat.transparency and (not mat.shadeless)
-		
-class MATERIAL_PT_volume_integration(MaterialButtonsPanel):
-	__label__ = "Integration"
-	__default_closed__ = False
-	COMPAT_ENGINES = set(['BLENDER_RENDER'])
-	
-	def poll(self, context):
-		mat = context.material
-		engine = context.scene.render_data.engine
-		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
-	
-	def draw(self, context):
-		layout = self.layout
-		
-		mat = context.material
-		vol = context.material.volume
-		
-		split = layout.split()
-		
-		col = split.column()
-		col.itemL(text="Step Calculation:")
-		col.itemR(vol, "step_calculation", text="")
-		col = col.column(align=True)
-		col.itemR(vol, "step_size")
-		col.itemR(vol, "shading_step_size")
-		
-		col = split.column()
-		col.itemL()
-		col.itemR(vol, "depth_cutoff")
-		col.itemR(vol, "density_scale")
-		
-		
 class MATERIAL_PT_halo(MaterialButtonsPanel):
 	__label__= "Halo"
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
@@ -720,7 +583,7 @@ class MATERIAL_PT_flare(MaterialButtonsPanel):
 		col = split.column()
 		col.itemR(halo, "flares_sub", text="Subflares")
 		col.itemR(halo, "flare_subsize", text="Subsize")
-
+		
 bpy.types.register(MATERIAL_PT_context_material)
 bpy.types.register(MATERIAL_PT_preview)
 bpy.types.register(MATERIAL_PT_diffuse)
@@ -729,13 +592,122 @@ bpy.types.register(MATERIAL_PT_shading)
 bpy.types.register(MATERIAL_PT_transp)
 bpy.types.register(MATERIAL_PT_mirror)
 bpy.types.register(MATERIAL_PT_sss)
-bpy.types.register(MATERIAL_PT_volume_shading)
-bpy.types.register(MATERIAL_PT_volume_scattering)
-bpy.types.register(MATERIAL_PT_volume_transp)
-bpy.types.register(MATERIAL_PT_volume_integration)
 bpy.types.register(MATERIAL_PT_halo)
 bpy.types.register(MATERIAL_PT_flare)
 bpy.types.register(MATERIAL_PT_physics)
 bpy.types.register(MATERIAL_PT_strand)
 bpy.types.register(MATERIAL_PT_options)
 bpy.types.register(MATERIAL_PT_shadow)
+
+# Volumetrics
+class VolumeButtonsPanel(bpy.types.Panel):
+	__space_type__ = 'PROPERTIES'
+	__region_type__ = 'WINDOW'
+	__context__ = "material"
+
+	def poll(self, context):
+		mat = context.material
+		engine = context.scene.render_data.engine
+		return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES)
+		
+class MATERIAL_PT_volume_shading(VolumeButtonsPanel):
+	__label__ = "Shading"
+	__default_closed__ = False
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+
+	def draw(self, context):
+		layout = self.layout
+
+		mat = context.material
+		vol = context.material.volume
+		
+		row = layout.row()
+		row.itemR(vol, "density")
+		row.itemR(vol, "scattering")
+
+		split = layout.split()
+		
+		col = split.column()
+		col.itemR(vol, "absorption")
+		col.itemR(vol, "absorption_color", text="")
+
+		col = split.column()
+		col.itemR(vol, "emission")
+		col.itemR(vol, "emission_color", text="")
+
+class MATERIAL_PT_volume_scattering(VolumeButtonsPanel):
+	__label__ = "Scattering"
+	__default_closed__ = False
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+
+	def draw(self, context):
+		layout = self.layout
+		
+		vol = context.material.volume
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemR(vol, "scattering_mode", text="")
+		if vol.scattering_mode == 'SINGLE_SCATTERING':
+			col.itemR(vol, "light_cache")
+			sub = col.column()
+			sub.active = vol.light_cache
+			sub.itemR(vol, "cache_resolution")
+		elif vol.scattering_mode in ('MULTIPLE_SCATTERING', 'SINGLE_PLUS_MULTIPLE_SCATTERING'):
+			col.itemR(vol, "cache_resolution")
+			
+			col = col.column(align=True)
+			col.itemR(vol, "ms_diffusion")
+			col.itemR(vol, "ms_spread")
+			col.itemR(vol, "ms_intensity")
+		
+		col = split.column()
+		# col.itemL(text="Anisotropic Scattering:")
+		col.itemR(vol, "phase_function", text="")
+		if vol.phase_function in ('SCHLICK', 'HENYEY-GREENSTEIN'):
+			col.itemR(vol, "asymmetry")
+
+class MATERIAL_PT_volume_transp(VolumeButtonsPanel):
+	__label__= "Transparency"
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+
+	def draw(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		rayt = context.material.raytrace_transparency
+		
+		row= layout.row()
+		row.itemR(mat, "transparency_method", expand=True)
+		row.active = mat.transparency and (not mat.shadeless)
+		
+class MATERIAL_PT_volume_integration(VolumeButtonsPanel):
+	__label__ = "Integration"
+	__default_closed__ = False
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+
+	def draw(self, context):
+		layout = self.layout
+		
+		mat = context.material
+		vol = context.material.volume
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="Step Calculation:")
+		col.itemR(vol, "step_calculation", text="")
+		col = col.column(align=True)
+		col.itemR(vol, "step_size")
+		col.itemR(vol, "shading_step_size")
+		
+		col = split.column()
+		col.itemL()
+		col.itemR(vol, "depth_cutoff")
+		col.itemR(vol, "density_scale")
+
+bpy.types.register(MATERIAL_PT_volume_shading)
+bpy.types.register(MATERIAL_PT_volume_scattering)
+bpy.types.register(MATERIAL_PT_volume_transp)
+bpy.types.register(MATERIAL_PT_volume_integration)
diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index a1978f44c18..5cdca3c2c74 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -103,11 +103,10 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
 		return (context.cloth)
 	
 	def draw_header(self, context):
-		layout = self.layout
 		cloth = context.cloth.collision_settings
 		
-		layout.active = cloth_panel_enabled(context.cloth)
-		layout.itemR(cloth, "enable_collision", text="")
+		self.layout.active = cloth_panel_enabled(context.cloth)
+		self.layout.itemR(cloth, "enable_collision", text="")
 
 	def draw(self, context):
 		layout = self.layout
@@ -139,11 +138,10 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
 		return (context.cloth != None)
 	
 	def draw_header(self, context):
-		layout = self.layout
 		cloth = context.cloth.settings
 	
-		layout.active = cloth_panel_enabled(context.cloth)
-		layout.itemR(cloth, "stiffness_scaling", text="")
+		self.layout.active = cloth_panel_enabled(context.cloth)
+		self.layout.itemR(cloth, "stiffness_scaling", text="")
 
 	def draw(self, context):
 		layout = self.layout
diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py
index 3c68327ba79..58033d2c431 100644
--- a/release/ui/buttons_physics_field.py
+++ b/release/ui/buttons_physics_field.py
@@ -8,7 +8,7 @@ class PhysicButtonsPanel(bpy.types.Panel):
 
 	def poll(self, context):
 		rd = context.scene.render_data
-		return (context.object != None) and (not rd.use_game_engine)
+		return (context.object) and (not rd.use_game_engine)
 		
 class PHYSICS_PT_field(PhysicButtonsPanel):
 	__label__ = "Force Fields"
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index d7313632638..c87f71bff42 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -97,10 +97,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 	
 	def poll(self, context):
 		md = context.smoke
-		if md:
-				return (md.smoke_type == 'TYPE_DOMAIN')
-		
-		return False
+		return md and (md.smoke_type == 'TYPE_DOMAIN')
 
 	def draw(self, context):
 		layout = self.layout
@@ -126,22 +123,15 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 
 	def poll(self, context):
 		md = context.smoke
-		if md:
-			return (md.smoke_type == 'TYPE_DOMAIN')
-		
-		return False
+		return md and (md.smoke_type == 'TYPE_DOMAIN')
 
 	def draw(self, context):
 		layout = self.layout
 
-		md = context.smoke
-		
-		if md.smoke_type == 'TYPE_DOMAIN':
+		md = context.smoke.domain_settings
+		cache = md.point_cache
 			
-			domain = md.domain_settings
-			cache = domain.point_cache
-			
-			point_cache_ui(self, cache, cache.baked==False, 0, 1)
+		point_cache_ui(self, cache, cache.baked==False, 0, 1)
 					
 class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 	__label__ = "Smoke High Resolution"
@@ -149,95 +139,85 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 	
 	def poll(self, context):
 		md = context.smoke
-		if md:
-				return (md.smoke_type == 'TYPE_DOMAIN')
-		
-		return False
+		return md and (md.smoke_type == 'TYPE_DOMAIN')
 
-	def draw_header(self, context):
-		layout = self.layout
-		
+	def draw_header(self, context):	
 		high = context.smoke.domain_settings
 	
-		layout.itemR(high, "highres", text="")
+		self.layout.itemR(high, "highres", text="")
 		
 	def draw(self, context):
 		layout = self.layout
 		
 		md = context.smoke.domain_settings
-		
-		if md:
-		
-			split = layout.split()
+
+		split = layout.split()
 			
-			col = split.column()
-			col.itemL(text="Resolution:")
-			col.itemR(md, "amplify", text="Divisions")
+		col = split.column()
+		col.itemL(text="Resolution:")
+		col.itemR(md, "amplify", text="Divisions")
 			
-			sub = split.column()
-			sub.itemL(text="Noise Method:")
-			sub.row().itemR(md, "noise_type", text="")
-			sub.itemR(md, "strength")
-			sub.itemR(md, "show_highres")
+		col = split.column()
+		col.itemL(text="Noise Method:")
+		col.row().itemR(md, "noise_type", text="")
+		col.itemR(md, "strength")
+		col.itemR(md, "show_highres")
 		
 class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
 	__label__ = "Smoke Cache"
 	__default_closed__ = True
 
 	def poll(self, context):
-		return (context.smoke != None)
+		return (context.smoke)
 
 	def draw(self, context):
 		layout = self.layout
 
 		md = context.smoke
-		
-		if md:
-			
-			cache = md.point_cache
-			
-			layout.set_context_pointer("PointCache", cache)
-			
-			row = layout.row()
-			row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
-			col = row.column(align=True)
-			col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-			col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-			
-			row = layout.row()
-			row.itemR(cache, "name")
-			
-			row = layout.row()
-			row.itemR(cache, "start_frame")
-			row.itemR(cache, "end_frame")
-			
-			row = layout.row()
-			
-			if cache.baked == True:
-				row.itemO("ptcache.free_bake", text="Free Bake")
-			else:
-				row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-			
-			subrow = row.row()
-			subrow.enabled = cache.frames_skipped or cache.outdated
-			subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
-				
-			row = layout.row()
-			#row.enabled = smoke_panel_enabled(psys)
-			row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		
-			row = layout.row()
-			#row.enabled = smoke_panel_enabled(psys)
-			
-			layout.itemL(text=cache.info)
-			
-			layout.itemS()
-			
-			row = layout.row()
-			row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-			row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-			layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
 
+		cache = md.point_cache
+			
+		layout.set_context_pointer("PointCache", cache)
+			
+		row = layout.row()
+		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+		col = row.column(align=True)
+		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
+		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
+			
+		row = layout.row()
+		row.itemR(cache, "name")
+			
+		row = layout.row()
+		row.itemR(cache, "start_frame")
+		row.itemR(cache, "end_frame")
+			
+		row = layout.row()
+			
+		if cache.baked == True:
+			row.itemO("ptcache.free_bake", text="Free Bake")
+		else:
+			row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
+			
+		subrow = row.row()
+		subrow.enabled = cache.frames_skipped or cache.outdated
+		subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
+				
+		row = layout.row()
+		#row.enabled = smoke_panel_enabled(psys)
+		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
+		
+		row = layout.row()
+		#row.enabled = smoke_panel_enabled(psys)
+			
+		layout.itemL(text=cache.info)
+			
+		layout.itemS()
+			
+		row = layout.row()
+		row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
+		row.itemO("ptcache.free_bake_all", text="Free All Bakes")
+		layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
 
 bpy.types.register(PHYSICS_PT_smoke)
 bpy.types.register(PHYSICS_PT_smoke_cache)
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index 73eb15d2212..703977a056f 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -77,12 +77,10 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
 		return (context.soft_body)
 		
 	def draw_header(self, context):
-		layout = self.layout
-		
 		softbody = context.soft_body.settings
 	
-		layout.active = softbody_panel_enabled(context.soft_body)
-		layout.itemR(softbody, "use_goal", text="")
+		self.layout.active = softbody_panel_enabled(context.soft_body)
+		self.layout.itemR(softbody, "use_goal", text="")
 		
 	def draw(self, context):
 		layout = self.layout
@@ -120,12 +118,10 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
 		return (context.soft_body)
 		
 	def draw_header(self, context):
-		#layout = self.layout
-		
 		softbody = context.soft_body.settings
 	
-		layout.active = softbody_panel_enabled(context.soft_body)
-		layout.itemR(softbody, "use_edges", text="")
+		self.layout.active = softbody_panel_enabled(context.soft_body)
+		self.layout.itemR(softbody, "use_edges", text="")
 		
 	def draw(self, context):
 		layout = self.layout
@@ -170,12 +166,10 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
 		return (context.soft_body)
 		
 	def draw_header(self, context):
-		layout = self.layout
-		
 		softbody = context.soft_body.settings
 	
-		layout.active = softbody_panel_enabled(context.soft_body)
-		layout.itemR(softbody, "self_collision", text="")
+		self.layout.active = softbody_panel_enabled(context.soft_body)
+		self.layout.itemR(softbody, "self_collision", text="")
 		
 	def draw(self, context):
 		layout = self.layout
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index abd42e32e35..126afc4ef23 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -323,11 +323,9 @@ class SCENE_PT_antialiasing(RenderButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 
 	def draw_header(self, context):
-		layout = self.layout
-		
 		rd = context.scene.render_data
 
-		layout.itemR(rd, "antialiasing", text="")
+		self.layout.itemR(rd, "antialiasing", text="")
 
 	def draw(self, context):
 		layout = self.layout
@@ -391,11 +389,9 @@ class SCENE_PT_stamp(RenderButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 
 	def draw_header(self, context):
-		layout = self.layout
-		
 		rd = context.scene.render_data
 
-		layout.itemR(rd, "render_stamp", text="")
+		self.layout.itemR(rd, "render_stamp", text="")
 
 	def draw(self, context):
 		layout = self.layout
diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py
index 342adfaf4af..b02673d126f 100644
--- a/release/ui/buttons_world.py
+++ b/release/ui/buttons_world.py
@@ -9,17 +9,14 @@ class WorldButtonsPanel(bpy.types.Panel):
 	
 	def poll(self, context):
 		rd = context.scene.render_data
-		return (context.world != None) and (not rd.use_game_engine) and (rd.engine in self.COMPAT_ENGINES)
+		return (context.world) and (not rd.use_game_engine) and (rd.engine in self.COMPAT_ENGINES)
 
 class WORLD_PT_preview(WorldButtonsPanel):
 	__label__ = "Preview"
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 	
 	def draw(self, context):
-		layout = self.layout
-		world = context.world
-		
-		layout.template_preview(world)
+		self.layout.template_preview(context.world)
 	
 class WORLD_PT_context_world(WorldButtonsPanel):
 	__show_header__ = False
@@ -52,32 +49,30 @@ class WORLD_PT_world(WorldButtonsPanel):
 
 		world = context.world
 
-		if world:
-		
-			row = layout.row()
-			row.itemR(world, "paper_sky")
-			row.itemR(world, "blend_sky")
-			row.itemR(world, "real_sky")
+		row = layout.row()
+		row.itemR(world, "paper_sky")
+		row.itemR(world, "blend_sky")
+		row.itemR(world, "real_sky")
 			
-			row = layout.row()
-			row.column().itemR(world, "horizon_color")
-			col = row.column()
-			col.itemR(world, "zenith_color")
-			col.active = world.blend_sky
-			row.column().itemR(world, "ambient_color")
+		row = layout.row()
+		row.column().itemR(world, "horizon_color")
+		col = row.column()
+		col.itemR(world, "zenith_color")
+		col.active = world.blend_sky
+		row.column().itemR(world, "ambient_color")
 		
 class WORLD_PT_mist(WorldButtonsPanel):
 	__label__ = "Mist"
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 
 	def draw_header(self, context):
-		layout = self.layout
 		world = context.world
 
-		layout.itemR(world.mist, "enabled", text="")
+		self.layout.itemR(world.mist, "enabled", text="")
 
 	def draw(self, context):
 		layout = self.layout
+		
 		world = context.world
 
 		layout.active = world.mist.enabled
@@ -87,7 +82,6 @@ class WORLD_PT_mist(WorldButtonsPanel):
 		flow.itemR(world.mist, "start")
 		flow.itemR(world.mist, "depth")
 		flow.itemR(world.mist, "height")
-		
 
 		layout.itemR(world.mist, "falloff")
 		
@@ -96,13 +90,13 @@ class WORLD_PT_stars(WorldButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 
 	def draw_header(self, context):
-		layout = self.layout
 		world = context.world
 
-		layout.itemR(world.stars, "enabled", text="")
+		self.layout.itemR(world.stars, "enabled", text="")
 
 	def draw(self, context):
 		layout = self.layout
+		
 		world = context.world
 
 		layout.active = world.stars.enabled
@@ -118,13 +112,13 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel):
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])
 
 	def draw_header(self, context):
-		layout = self.layout
 		world = context.world
 
-		layout.itemR(world.ambient_occlusion, "enabled", text="")
+		self.layout.itemR(world.ambient_occlusion, "enabled", text="")
 
 	def draw(self, context):
 		layout = self.layout
+		
 		ao = context.world.ambient_occlusion
 		
 		layout.active = ao.enabled
@@ -186,4 +180,3 @@ bpy.types.register(WORLD_PT_world)
 bpy.types.register(WORLD_PT_ambient_occlusion)
 bpy.types.register(WORLD_PT_mist)
 bpy.types.register(WORLD_PT_stars)
-
diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index 8dc016f55b7..3f82727da47 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -7,6 +7,7 @@ class IMAGE_MT_view(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		sima = context.space_data
 		uv = sima.uv_editor
 		settings = context.tool_settings
@@ -69,6 +70,7 @@ class IMAGE_MT_image(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+
 		sima = context.space_data
 		ima = sima.image
 
@@ -148,13 +150,13 @@ class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
 		layout.itemO("uv.weld") # W, 1
 		layout.items_enumO("uv.align", "axis") # W, 2/3/4
 
-
 class IMAGE_MT_uvs(bpy.types.Menu):
 	__space_type__ = 'IMAGE_EDITOR'
 	__label__ = "UVs"
 
 	def draw(self, context):
 		layout = self.layout
+		
 		sima = context.space_data
 		uv = sima.uv_editor
 		settings = context.tool_settings
@@ -195,10 +197,11 @@ class IMAGE_HT_header(bpy.types.Header):
 	__space_type__ = 'IMAGE_EDITOR'
 
 	def draw(self, context):
+		layout = self.layout
+		
 		sima = context.space_data
 		ima = sima.image
 		iuser = sima.image_user
-		layout = self.layout
 		settings = context.tool_settings
 
 		show_render = sima.show_render
@@ -281,38 +284,34 @@ class IMAGE_PT_game_properties(bpy.types.Panel):
 		return (sima and sima.image) and (rd.engine == 'BLENDER_GAME')
 
 	def draw(self, context):
-		sima = context.space_data
 		layout = self.layout
-
+		
+		sima = context.space_data
 		ima = sima.image
 
-		if ima:
-			split = layout.split()
+		split = layout.split()
 
-			col = split.column()
+		col = split.column()
+		col.itemR(ima, "clamp_x")
+		col.itemR(ima, "clamp_y")
+		col.itemR(ima, "mapping", expand=True)
+		col.itemR(ima, "tiles")
 
-			subcol = col.column(align=True)
-			subcol.itemR(ima, "clamp_x")
-			subcol.itemR(ima, "clamp_y")
+		col = split.column()
 
-			col.itemR(ima, "mapping", expand=True)
-			col.itemR(ima, "tiles")
+		sub = col.column(align=True)
+		sub.itemR(ima, "animated")
 
-			col = split.column()
+		subsub = sub.column()
+		subsub.active = ima.animated
+		subsub.itemR(ima, "animation_start", text="Start")
+		subsub.itemR(ima, "animation_end", text="End")
+		subsub.itemR(ima, "animation_speed", text="Speed")
 
-			subcol = col.column(align=True)
-			subcol.itemR(ima, "animated")
-
-			subcol = subcol.column()
-			subcol.itemR(ima, "animation_start", text="Start")
-			subcol.itemR(ima, "animation_end", text="End")
-			subcol.itemR(ima, "animation_speed", text="Speed")
-			subcol.active = ima.animated
-
-			subrow = col.row(align=True)
-			subrow.itemR(ima, "tiles_x", text="X")
-			subrow.itemR(ima, "tiles_y", text="Y")
-			subrow.active = ima.tiles or ima.animated
+		sub = col.row(align=True)
+		sub.active = ima.tiles or ima.animated
+		sub.itemR(ima, "tiles_x", text="X")
+		sub.itemR(ima, "tiles_y", text="Y")
 
 class IMAGE_PT_view_properties(bpy.types.Panel):
 	__space_type__ = 'IMAGE_EDITOR'
@@ -324,9 +323,9 @@ class IMAGE_PT_view_properties(bpy.types.Panel):
 		return (sima and (sima.image or sima.show_uvedit))
 
 	def draw(self, context):
-		sima = context.space_data
 		layout = self.layout
-
+		
+		sima = context.space_data
 		ima = sima.image
 		show_uvedit = sima.show_uvedit
 		uvedit = sima.uv_editor
@@ -376,4 +375,3 @@ bpy.types.register(IMAGE_MT_uvs)
 bpy.types.register(IMAGE_HT_header)
 bpy.types.register(IMAGE_PT_game_properties)
 bpy.types.register(IMAGE_PT_view_properties)
-
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 4188209e393..79937816791 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -79,6 +79,8 @@ class INFO_MT_file_import(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+		
+		layout.itemL(text="Nothing yet")
 
 class INFO_MT_file_export(bpy.types.Menu):
 	__space_type__ = 'INFO'
diff --git a/release/ui/space_node.py b/release/ui/space_node.py
index 875aca7fd82..6ac1ac84f35 100644
--- a/release/ui/space_node.py
+++ b/release/ui/space_node.py
@@ -6,6 +6,7 @@ class NODE_HT_header(bpy.types.Header):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		snode = context.space_data
 
 		row = layout.row(align=True)
@@ -113,9 +114,7 @@ class NODE_MT_node(bpy.types.Menu):
 		# layout.itemS()
 		# layout.itemO("node.show_cyclic_dependencies")
 
-
 bpy.types.register(NODE_HT_header)
 bpy.types.register(NODE_MT_view)
 bpy.types.register(NODE_MT_select)
 bpy.types.register(NODE_MT_node)
-
diff --git a/release/ui/space_text.py b/release/ui/space_text.py
index 7b7ec176b72..117033c50a1 100644
--- a/release/ui/space_text.py
+++ b/release/ui/space_text.py
@@ -5,9 +5,10 @@ class TEXT_HT_header(bpy.types.Header):
 	__space_type__ = 'TEXT_EDITOR'
 
 	def draw(self, context):
+		layout = self.layout
+		
 		st = context.space_data
 		text = st.text
-		layout = self.layout
 
 		row = layout.row(align=True)
 		row.template_header()
@@ -50,8 +51,9 @@ class TEXT_PT_properties(bpy.types.Panel):
 	__label__ = "Properties"
 
 	def draw(self, context):
-		st = context.space_data
 		layout = self.layout
+		
+		st = context.space_data
 
 		flow = layout.column_flow()
 		flow.itemR(st, "line_numbers")
@@ -69,8 +71,9 @@ class TEXT_PT_find(bpy.types.Panel):
 	__label__ = "Find"
 
 	def draw(self, context):
-		st = context.space_data
 		layout = self.layout
+		
+		st = context.space_data
 
 		# find
 		col = layout.column(align=True)
@@ -100,6 +103,7 @@ class TEXT_MT_text(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		st = context.space_data
 		text = st.text
 
@@ -200,8 +204,7 @@ class TEXT_MT_edit(bpy.types.Menu):
 	__label__ = "Edit"
 
 	def poll(self, context):
-		st = context.space_data
-		return st.text != None
+		return (context.space_data.text)
 
 	def draw(self, context):
 		layout = self.layout
@@ -240,4 +243,3 @@ bpy.types.register(TEXT_MT_edit_view)
 bpy.types.register(TEXT_MT_edit_select)
 bpy.types.register(TEXT_MT_edit_markers)
 bpy.types.register(TEXT_MT_edit_to3d)
-
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 517571e1b09..0b7ccb15d6c 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -420,10 +420,11 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 							 context.texture_paint_object))
 
 	def draw(self, context):
+		layout = self.layout
+		
 		settings = self.paint_settings(context)
 		brush = settings.brush
 		texture_paint = context.texture_paint_object
-		layout = self.layout
 
 		if not texture_paint:
 			layout.itemR(brush, "smooth_stroke")
@@ -444,7 +445,6 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 		col.active = brush.airbrush
 		col.itemR(brush, "rate", slider=True)
 
-
 class VIEW3D_PT_tools_brush_curve(PaintPanel):
 	__label__ = "Curve"
 	__default_closed__ = True
@@ -454,9 +454,10 @@ class VIEW3D_PT_tools_brush_curve(PaintPanel):
 		return (settings and settings.brush and settings.brush.curve)
 
 	def draw(self, context):
+		layout = self.layout
+		
 		settings = self.paint_settings(context)
 		brush = settings.brush
-		layout = self.layout
 
 		layout.template_curve_mapping(brush.curve)
 		layout.item_menu_enumO("brush.curve_preset", property="shape")
@@ -469,6 +470,7 @@ class VIEW3D_PT_sculpt_options(PaintPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		sculpt = context.tool_settings.sculpt
 
 		col = layout.column()
@@ -497,6 +499,7 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		wpaint = context.tool_settings.weight_paint
 
 		col = layout.column()
@@ -524,6 +527,7 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel):
 
 	def draw(self, context):
 		layout = self.layout
+		
 		vpaint = context.tool_settings.vertex_paint
 
 		col = layout.column()
@@ -598,6 +602,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel):
 
 	def draw(self, context):
 		layout = self.layout
+
 		pe = context.tool_settings.particle_edit
 		ob = pe.object
 

From 47beb68a0fbeecf0135efd5a356b6ece03e24457 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 1 Sep 2009 00:52:03 +0000
Subject: [PATCH 378/577] Open recent list was arseabout, only adding files on
 save, rather then open.

This is problematic for a few reasons...
* I'd often save a blendfile only so it would appier in the open recent menu.
* Saving files (when you dont need to) makes access times less useful.
* binary diff's in SVN dont give any useful info. Sometimes I wasnt sure if I actually edited or saves for fast re-opening.
* Testing 2.4x files with animation data in 2.5 can loose info.
* Its not logical and other apps dont work this way.

Also made the recent file list in the file browser display the most recent item first (like the open recent menu).
---
 .../blender/editors/space_file/file_panels.c   | 18 +++++++++++-------
 source/blender/windowmanager/intern/wm_files.c |  6 +++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index c48b3529389..24c3f9b4ca1 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -63,7 +63,7 @@ static void file_panel_cb(bContext *C, void *arg_entry, void *arg_unused)
 	WM_operator_properties_free(&ptr);
 }
 
-static void file_panel_category(const bContext *C, Panel *pa, FSMenuCategory category, short *nr, int icon, int allow_delete)
+static void file_panel_category(const bContext *C, Panel *pa, FSMenuCategory category, short *nr, int icon, int allow_delete, int reverse)
 {
 	SpaceFile *sfile= CTX_wm_space_file(C);
 	uiBlock *block;
@@ -71,7 +71,7 @@ static void file_panel_category(const bContext *C, Panel *pa, FSMenuCategory cat
 	uiLayout *box, *col;
 	struct FSMenu* fsmenu = fsmenu_get();
 	char *curdir= (sfile->params)? sfile->params->dir: "";
-	int i, nentries = fsmenu_get_nentries(fsmenu, category);
+	int i, i_iter, nentries = fsmenu_get_nentries(fsmenu, category);
 
 	/* reset each time */
 	*nr= -1;
@@ -86,12 +86,16 @@ static void file_panel_category(const bContext *C, Panel *pa, FSMenuCategory cat
 	box= uiLayoutBox(pa->layout);
 	col= uiLayoutColumn(box, 1);
 
-	for (i=0; i< nentries;++i) {
+	for (i_iter=0; i_iter< nentries;++i_iter) {
 		char dir[FILE_MAX];
 		char temp[FILE_MAX];
 		uiLayout* layout = uiLayoutRow(col, 0);
-		char *entry = fsmenu_get_entry(fsmenu, category, i);
+		char *entry;
 
+		i= reverse ? nentries-(i_iter+1) : i_iter;
+		
+		entry = fsmenu_get_entry(fsmenu, category, i);
+		
 		/* set this list item as active if we have a match */
 		if(strcmp(curdir, entry) == 0)
 			*nr= i;
@@ -124,7 +128,7 @@ static void file_panel_system(const bContext *C, Panel *pa)
 	SpaceFile *sfile= CTX_wm_space_file(C);
 
 	if(sfile)
-		file_panel_category(C, pa, FS_CATEGORY_SYSTEM, &sfile->systemnr, ICON_DISK_DRIVE, 0);
+		file_panel_category(C, pa, FS_CATEGORY_SYSTEM, &sfile->systemnr, ICON_DISK_DRIVE, 0, 0);
 }
 
 static void file_panel_bookmarks(const bContext *C, Panel *pa)
@@ -137,7 +141,7 @@ static void file_panel_bookmarks(const bContext *C, Panel *pa)
 		uiItemO(row, "Add", ICON_ZOOMIN, "file.add_bookmark");
 		uiItemL(row, NULL, 0);
 
-		file_panel_category(C, pa, FS_CATEGORY_BOOKMARKS, &sfile->bookmarknr, ICON_BOOKMARKS, 1);
+		file_panel_category(C, pa, FS_CATEGORY_BOOKMARKS, &sfile->bookmarknr, ICON_BOOKMARKS, 1, 0);
 	}
 }
 
@@ -146,7 +150,7 @@ static void file_panel_recent(const bContext *C, Panel *pa)
 	SpaceFile *sfile= CTX_wm_space_file(C);
 
 	if(sfile)
-		file_panel_category(C, pa, FS_CATEGORY_RECENT, &sfile->recentnr, ICON_FILE_FOLDER, 0);
+		file_panel_category(C, pa, FS_CATEGORY_RECENT, &sfile->recentnr, ICON_FILE_FOLDER, 0, 1);
 }
 
 
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 9c30c99bbdd..b98717c8629 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -96,6 +96,7 @@
 #include "wm.h"
 #include "wm_window.h"
 
+static void writeBlog(void);
 
 /* To be able to read files without windows closing, opening, moving 
    we try to prepare for worst case:
@@ -256,7 +257,10 @@ void WM_read_file(bContext *C, char *name, ReportList *reports)
 
 		if(retval==2) wm_init_userdef();	// in case a userdef is read from regular .blend
 		
-		if (retval!=0) G.relbase_valid = 1;
+		if (retval!=0) {
+			G.relbase_valid = 1;
+			writeBlog();
+		}
 
 // XXX		undo_editmode_clear();
 		BKE_reset_undo();

From 285d665d99da1e4ab9406f66026fcca77195d761 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 1 Sep 2009 01:09:05 +0000
Subject: [PATCH 379/577] more use of data structures for communication.
 begining support for more than one file per fob (external dependencies, point
 cache, ...)

---
 release/io/netrender/client.py    |  13 ++--
 release/io/netrender/master.py    | 117 ++++++++++++++++--------------
 release/io/netrender/model.py     |  23 ++++--
 release/io/netrender/operators.py |  76 +++++++++----------
 release/io/netrender/slave.py     |  90 +++++++++++++++--------
 release/io/netrender/ui.py        |  23 +++++-
 release/io/netrender/utils.py     |  38 ++++++----
 7 files changed, 223 insertions(+), 157 deletions(-)

diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
index 90039a3273a..bc4d363c996 100644
--- a/release/io/netrender/client.py
+++ b/release/io/netrender/client.py
@@ -22,7 +22,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 	
 	def render_master(self, scene):
 		server_address = (scene.network_render.server_address, scene.network_render.server_port)
-		httpd = master.RenderMasterServer(server_address, master.RenderHandler)
+		httpd = master.RenderMasterServer(server_address, master.RenderHandler, scene.network_render.path)
 		httpd.timeout = 1
 		httpd.stats = self.update_stats
 		while not self.test_break():
@@ -32,6 +32,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 		slave.render_slave(self, scene)
 	
 	def render_client(self, scene):
+		netsettings = scene.network_render
 		self.update_stats("", "Network render client initiation")
 		
 		conn = clientConnection(scene)
@@ -41,7 +42,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			
 			self.update_stats("", "Network render exporting")
 			
-			job_id = scene.network_render.job_id
+			job_id = netsettings.job_id
 			
 			# reading back result
 			
@@ -51,10 +52,10 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			response = conn.getresponse()
 			
 			if response.status == http.client.NO_CONTENT:
-				scene.network_render.job_id = clientSendJob(conn, scene)
+				netsettings.job_id = clientSendJob(conn, scene)
 				clientRequestResult(conn, scene, job_id)
 			
-			while response.status == http.client.PROCESSING and not self.test_break():
+			while response.status == http.client.ACCEPTED and not self.test_break():
 				print("waiting")
 				time.sleep(1)
 				clientRequestResult(conn, scene, job_id)
@@ -68,7 +69,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			x= int(r.resolution_x*r.resolution_percentage*0.01)
 			y= int(r.resolution_y*r.resolution_percentage*0.01)
 			
-			f = open(PATH_PREFIX + "output.exr", "wb")
+			f = open(netsetting.path + "output.exr", "wb")
 			buf = response.read(1024)
 			
 			while buf:
@@ -78,7 +79,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			f.close()
 			
 			result = self.begin_result(0, 0, x, y)
-			result.load_from_file(PATH_PREFIX + "output.exr", 0, 0)
+			result.load_from_file(netsettings.path + "output.exr", 0, 0)
 			self.end_result(result)
 			
 			conn.close()
diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
index daca3bcf653..6f97685935d 100644
--- a/release/io/netrender/master.py
+++ b/release/io/netrender/master.py
@@ -9,12 +9,22 @@ JOB_WAITING = 0 # before all data has been entered
 JOB_PAUSED = 1 # paused by user
 JOB_QUEUED = 2 # ready to be dispatched
 
+class MRenderFile:
+	def __init__(self, filepath):
+		self.filepath = filepath
+		self.found = False
+	
+	def test(self):
+		self.found = os.path.exists(self.filepath)
+		return self.found
+
+
 class MRenderSlave(netrender.model.RenderSlave):
-	def __init__(self, name, adress, stats):
+	def __init__(self, name, address, stats):
 		super().__init__()
-		self.id = hashlib.md5(bytes(repr(name) + repr(adress), encoding='utf8')).hexdigest()
+		self.id = hashlib.md5(bytes(repr(name) + repr(address), encoding='utf8')).hexdigest()
 		self.name = name
-		self.adress = adress
+		self.address = address
 		self.stats = stats
 		self.last_seen = time.time()
 		
@@ -31,11 +41,12 @@ def groupKey(job):
 	return (job.status, job.framesLeft() > 0, job.priority, job.credits)
 
 class MRenderJob(netrender.model.RenderJob):
-	def __init__(self, job_id, name, path, chunks = 1, priority = 1, credits = 100.0, blacklist = []):
+	def __init__(self, job_id, name, files, chunks = 1, priority = 1, credits = 100.0, blacklist = []):
 		super().__init__()
 		self.id = job_id
 		self.name = name
-		self.path = path
+		self.files = files
+		self.render_files = [MRenderFile(path) for path in files]
 		self.status = JOB_WAITING
 		self.frames = []
 		self.chunks = chunks
@@ -44,6 +55,14 @@ class MRenderJob(netrender.model.RenderJob):
 		self.blacklist = blacklist
 		self.last_dispatched = time.time()
 	
+	def testStart(self):
+		for f in self.render_files:
+			if not f.test():
+				return False
+		
+		self.start()
+		return True
+	
 	def start(self):
 		self.status = JOB_QUEUED
 	
@@ -75,7 +94,7 @@ class MRenderJob(netrender.model.RenderJob):
 			if f.status == QUEUED:
 				self.update()
 				frames.append(f)
-				if len(frames) == self.chunks:
+				if len(frames) >= self.chunks:
 					break
 		
 		return frames
@@ -162,10 +181,10 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				
 				if frame:
 					if frame.status in (QUEUED, DISPATCHED):
-						self.send_head(http.client.PROCESSING)
+						self.send_head(http.client.ACCEPTED)
 					elif frame.status == DONE:
 						self.server.stats("", "Sending result back to client")
-						f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".exr", 'rb')
+						f = open(self.server.path + job_id + "%04d" % job_frame + ".exr", 'rb')
 						
 						self.send_head()
 						
@@ -173,13 +192,13 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 						
 						f.close()
 					elif frame.status == ERROR:
-						self.send_head(http.client.NO_CONTENT)
+						self.send_head(http.client.PARTIAL_CONTENT)
 				else:
 					# no such frame
-					self.send_head(http.client.NOT_FOUND)
+					self.send_head(http.client.NO_CONTENT)
 			else:
 				# no such job id
-				self.send_head(http.client.NOT_FOUND)
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "log":
 			job_id = self.headers['job-id']
@@ -194,23 +213,21 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				if frame:
 					if frame.status in (QUEUED, DISPATCHED):
 						self.send_head(http.client.PROCESSING)
-					elif frame.status == DONE:
+					else:
 						self.server.stats("", "Sending log back to client")
-						f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".log", 'rb')
+						f = open(self.server.path + job_id + "%04d" % job_frame + ".log", 'rb')
 						
 						self.send_head()
 						
 						shutil.copyfileobj(f, self.wfile)
 						
 						f.close()
-					elif frame.status == ERROR:
-						self.send_head(http.client.NO_CONTENT)
 				else:
 					# no such frame
-					self.send_head(http.client.NOT_FOUND)
+					self.send_head(http.client.NO_CONTENT)
 			else:
 				# no such job id
-				self.send_head(http.client.NOT_FOUND)
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "status":
 			job_id = self.headers.get('job-id', "")
@@ -228,13 +245,13 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 							message = frame.serialize()
 						else:
 							# no such frame
-							self.send_heat(http.client.NOT_FOUND)
+							self.send_heat(http.client.NO_CONTENT)
 							return
 					else:
 						message = job.serialize()
 				else:
 					# no such job id
-					self.send_head(http.client.NOT_FOUND)
+					self.send_head(http.client.NO_CONTENT)
 					return
 			else: # status of all jobs
 				message = []
@@ -262,6 +279,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				
 				if job and frames:
 					for f in frames:
+						print("dispatch", f.number)
 						f.status = DISPATCHED
 						f.slave = slave
 					
@@ -274,9 +292,9 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 					self.server.stats("", "Sending job frame to render node")
 				else:
 					# no job available, return error code
-					self.send_head(http.client.NO_CONTENT)
+					self.send_head(http.client.ACCEPTED)
 			else: # invalid slave id
-				self.send_head(http.client.NOT_FOUND)
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "file":
 			job_id = self.headers['job-id']
@@ -288,14 +306,14 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				self.send_head(headers={"job-id": job.id})
 				
 				self.server.stats("", "Sending file to render node")
-				f = open(PATH_PREFIX + job.id + ".blend", 'rb')
+				f = open(self.server.path + job.id + ".blend", 'rb')
 				
 				shutil.copyfileobj(f, self.wfile)
 				
 				f.close()
 			else:
 				# no such job id
-				self.send_head(http.client.NOT_FOUND)
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "slave":
 			message = []
@@ -322,33 +340,25 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			self.server.stats("", "Receiving job")
 			
 			length = int(self.headers['content-length'])
-			job_frame_string = self.headers['job-frame']
-			job_name = self.headers.get('job-name', "")
-			job_chunks = int(self.headers.get('job-chunks', "1"))
-			blacklist = self.headers.get('slave-blacklist', '').split()
 			
-			job_path = str(self.rfile.read(length), encoding='utf8')
+			job_info = netrender.model.RenderJob.materialize(eval(str(self.rfile.read(length), encoding='utf8')))
 			
-			if os.path.exists(job_path):
-				job_id = self.server.nextJobID()
+			job_id = self.server.nextJobID()
+			
+			print("chunks", job_info.chunks)
+			
+			job = MRenderJob(job_id, job_info.name, job_info.files, chunks = job_info.chunks, priority = job_info.priority, blacklist = job_info.blacklist)
+			self.server.addJob(job)
+			
+			for frame in job_info.frames:
+				frame = job.addFrame(frame.number)
 				
-				job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
-				self.server.addJob(job)
-				
-				if ":" in job_frame_string:
-					frame_start, frame_end = [int(x) for x in job_frame_string.split(":")]
-					
-					for job_frame in range(frame_start, frame_end + 1):
-						frame = job.addFrame(job_frame)
-				else:
-					job_frame = int(job_frame_string)
-					frame = job.addFrame(job_frame)
-					
-				job.start()
-		
-				self.send_head(headers={"job-id": job_id})
+			headers={"job-id": job_id}
+			
+			if job.testStart():
+				self.send_head(headers=headers)
 			else:
-				self.send_head(http.client.NOT_FOUND)
+				self.send_head(http.client.ACCEPTED, headers=headers)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "cancel":
 			job_id = self.headers.get('job-id', "")
@@ -375,7 +385,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 					
 				self.send_head()
 			else: # job not found
-				self.send_head(http.client.NOT_FOUND)
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "slave":
 			length = int(self.headers['content-length'])
@@ -412,7 +422,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			
 			job_path = job_id + ".blend"
 			
-			f = open(PATH_PREFIX + job_path, "wb")
+			f = open(self.server.path + job_path, "wb")
 			f.write(buf)
 			f.close()
 			del buf
@@ -445,7 +455,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			if job_result == DONE:
 				length = int(self.headers['content-length'])
 				buf = self.rfile.read(length)
-				f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".exr", 'wb')
+				f = open(self.server.path + job_id + "%04d" % job_frame + ".exr", 'wb')
 				f.write(buf)
 				f.close()
 				
@@ -471,7 +481,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			print("log length:", length)
 			
 			buf = self.rfile.read(length)
-			f = open(PATH_PREFIX + job_id + "%04d" % job_frame + ".log", 'wb')
+			f = open(self.server.path + job_id + "%04d" % job_frame + ".log", 'wb')
 			f.write(buf)
 			f.close()
 				
@@ -483,20 +493,21 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 
 
 class RenderMasterServer(http.server.HTTPServer):
-	def __init__(self, address, handler_class):
+	def __init__(self, address, handler_class, path):
 		super().__init__(address, handler_class)
 		self.jobs = []
 		self.jobs_map = {}
 		self.slaves = []
 		self.slaves_map = {}
 		self.job_id = 0
+		self.path = path
 	
 	def nextJobID(self):
 		self.job_id += 1
 		return str(self.job_id)
 	
-	def addSlave(self, name, adress, stats):
-		slave = MRenderSlave(name, adress, stats)
+	def addSlave(self, name, address, stats):
+		slave = MRenderSlave(name, address, stats)
 		self.slaves.append(slave)
 		self.slaves_map[slave.id] = slave
 		
diff --git a/release/io/netrender/model.py b/release/io/netrender/model.py
index 98866ff1dfc..8b919b1fa36 100644
--- a/release/io/netrender/model.py
+++ b/release/io/netrender/model.py
@@ -10,7 +10,7 @@ class RenderSlave:
 	def __init__(self):
 		self.id = ""
 		self.name = ""
-		self.adress = (0,0)
+		self.address = (0,0)
 		self.stats = ""
 		self.total_done = 0
 		self.total_error = 0
@@ -20,7 +20,7 @@ class RenderSlave:
 		return 	{
 							"id": self.id,
 							"name": self.name,
-							"adress": self.adress,
+							"address": self.address,
 							"stats": self.stats,
 							"total_done": self.total_done,
 							"total_error": self.total_error,
@@ -40,7 +40,7 @@ class RenderSlave:
 			slave = RenderSlave()
 			slave.id = slave_id
 			slave.name = data["name"]
-			slave.adress = data["adress"]
+			slave.address = data["address"]
 			slave.stats = data["stats"]
 			slave.total_done = data["total_done"]
 			slave.total_error = data["total_error"]
@@ -54,7 +54,7 @@ class RenderJob:
 	def __init__(self):
 		self.id = ""
 		self.name = ""
-		self.path = ""
+		self.files = []
 		self.frames = []
 		self.chunks = 0
 		self.priority = 0
@@ -62,6 +62,11 @@ class RenderJob:
 		self.blacklist = []
 		self.last_dispatched = 0.0
 	
+	def addFrame(self, frame_number):
+		frame = RenderFrame(frame_number)
+		self.frames.append(frame)
+		return frame
+	
 	def __len__(self):
 		return len(self.frames)
 	
@@ -96,8 +101,9 @@ class RenderJob:
 		return 	{
 							"id": self.id,
 							"name": self.name,
-							"path": self.path,
+							"files": self.files,
 							"frames": [f.serialize() for f in self.frames if not frames or f in frames],
+							"chunks": self.chunks,
 							"priority": self.priority,
 							"credits": self.credits,
 							"blacklist": self.blacklist,
@@ -112,8 +118,9 @@ class RenderJob:
 		job = RenderJob()
 		job.id = data["id"]
 		job.name = data["name"]
-		job.path = data["path"]
+		job.files = data["files"]
 		job.frames = [RenderFrame.materialize(f) for f in data["frames"]]
+		job.chunks = data["chunks"]
 		job.priority = data["priority"]
 		job.credits = data["credits"]
 		job.blacklist = data["blacklist"]
@@ -122,8 +129,8 @@ class RenderJob:
 		return job
 
 class RenderFrame:
-	def __init__(self):
-		self.number = 0
+	def __init__(self, number = 0):
+		self.number = number
 		self.time = 0
 		self.status = QUEUED
 		self.slave = None
diff --git a/release/io/netrender/operators.py b/release/io/netrender/operators.py
index 8df662b6b52..a1208aa1b46 100644
--- a/release/io/netrender/operators.py
+++ b/release/io/netrender/operators.py
@@ -48,7 +48,7 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
 		return True
 	
 	def execute(self, context):
-		netprops = context.scene.network_render
+		netsettings = context.scene.network_render
 		conn = clientConnection(context.scene)
 
 		if conn:
@@ -59,12 +59,12 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
 			
 			jobs = (netrender.model.RenderJob.materialize(j) for j in eval(str(response.read(), encoding='utf8')))
 			
-			while(len(netprops.jobs) > 0):
-				netprops.jobs.remove(0)
+			while(len(netsettings.jobs) > 0):
+				netsettings.jobs.remove(0)
 				
 			for j in jobs:
-				netprops.jobs.add()
-				job = netprops.jobs[-1]
+				netsettings.jobs.add()
+				job = netsettings.jobs[-1]
 				
 				job_results = j.framesStatus()
 				
@@ -93,22 +93,22 @@ class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
 		return True
 	
 	def execute(self, context):
-		netprops = context.scene.network_render
+		netsettings = context.scene.network_render
 		
-		if netprops.active_slave_index >= 0:
+		if netsettings.active_slave_index >= 0:
 			
-			slave = netrender.slaves[netprops.active_slave_index]
+			slave = netrender.slaves[netsettings.active_slave_index]
 			
-			netprops.slaves_blacklist.add()
+			netsettings.slaves_blacklist.add()
 			
-			netprops.slaves_blacklist[-1].id = slave.id
-			netprops.slaves_blacklist[-1].name = slave.name
-			netprops.slaves_blacklist[-1].adress = slave.adress
-			netprops.slaves_blacklist[-1].last_seen = slave.last_seen
-			netprops.slaves_blacklist[-1].stats = slave.stats
+			netsettings.slaves_blacklist[-1].id = slave.id
+			netsettings.slaves_blacklist[-1].name = slave.name
+			netsettings.slaves_blacklist[-1].address = slave.address
+			netsettings.slaves_blacklist[-1].last_seen = slave.last_seen
+			netsettings.slaves_blacklist[-1].stats = slave.stats
 			
-			netprops.slaves.remove(netprops.active_slave_index)
-			netprops.active_slave_index = -1
+			netsettings.slaves.remove(netsettings.active_slave_index)
+			netsettings.active_slave_index = -1
 		
 		return ('FINISHED',)
 	
@@ -129,22 +129,22 @@ class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
 		return True
 	
 	def execute(self, context):
-		netprops = context.scene.network_render
+		netsettings = context.scene.network_render
 		
-		if netprops.active_blacklisted_slave_index >= 0:
+		if netsettings.active_blacklisted_slave_index >= 0:
 			
-			slave = netprops.slaves_blacklist[netprops.active_blacklisted_slave_index]
+			slave = netsettings.slaves_blacklist[netsettings.active_blacklisted_slave_index]
 			
-			netprops.slaves.add()
+			netsettings.slaves.add()
 			
-			netprops.slaves[-1].id = slave.id
-			netprops.slaves[-1].name = slave.name
-			netprops.slaves[-1].adress = slave.adress
-			netprops.slaves[-1].last_seen = slave.last_seen
-			netprops.slaves[-1].stats = slave.stats
+			netsettings.slaves[-1].id = slave.id
+			netsettings.slaves[-1].name = slave.name
+			netsettings.slaves[-1].address = slave.address
+			netsettings.slaves[-1].last_seen = slave.last_seen
+			netsettings.slaves[-1].stats = slave.stats
 			
-			netprops.slaves_blacklist.remove(netprops.active_blacklisted_slave_index)
-			netprops.active_blacklisted_slave_index = -1
+			netsettings.slaves_blacklist.remove(netsettings.active_blacklisted_slave_index)
+			netsettings.active_blacklisted_slave_index = -1
 		
 		return ('FINISHED',)
 	
@@ -166,7 +166,7 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
 		return True
 	
 	def execute(self, context):
-		netprops = context.scene.network_render
+		netsettings = context.scene.network_render
 		conn = clientConnection(context.scene)
 		
 		if conn:
@@ -177,21 +177,21 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
 			
 			slaves = (netrender.model.RenderSlave.materialize(s) for s in eval(str(response.read(), encoding='utf8')))
 			
-			while(len(netprops.slaves) > 0):
-				netprops.slaves.remove(0)
+			while(len(netsettings.slaves) > 0):
+				netsettings.slaves.remove(0)
 			
 			for s in slaves:
-				for slave in netprops.slaves_blacklist:
+				for slave in netsettings.slaves_blacklist:
 					if slave.id == s.id:
 						break
 					
-				netprops.slaves.add()
-				slave = netprops.slaves[-1]
+				netsettings.slaves.add()
+				slave = netsettings.slaves[-1]
 				
 				slave.id = s.id
 				slave.name = s.name
 				slave.stats = s.stats
-				slave.adress = s.adress[0]
+				slave.address = s.address[0]
 				slave.last_seen = time.ctime(s.last_seen)
 		
 		return ('FINISHED',)
@@ -210,15 +210,15 @@ class RENDER_OT_netclientcancel(bpy.types.Operator):
 	__props__ = []
 	
 	def poll(self, context):
-		netprops = context.scene.network_render
-		return netprops.active_job_index >= 0 and len(netprops.jobs) > 0
+		netsettings = context.scene.network_render
+		return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
 		
 	def execute(self, context):
-		netprops = context.scene.network_render
+		netsettings = context.scene.network_render
 		conn = clientConnection(context.scene)
 		
 		if conn:
-			job = netprops.jobs[netprops.active_job_index]
+			job = netsettings.jobs[netsettings.active_job_index]
 			
 			conn.request("POST", "cancel", headers={"job-id":job.id})
 			
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
index 59c474293b3..64801743d70 100644
--- a/release/io/netrender/slave.py
+++ b/release/io/netrender/slave.py
@@ -21,17 +21,50 @@ def testCancel(conn, job_id):
 		response = conn.getresponse()
 		
 		# cancelled if job isn't found anymore
-		if response.status == http.client.NOT_FOUND:
+		if response.status == http.client.NO_CONTENT:
 			return True
 		else:
 			return False
 
-def render_slave(engine, scene):
-	NODE_PREFIX = PATH_PREFIX + "node" + os.sep
-	timeout = 1
+def testFile(conn, JOB_PREFIX, file_path, main_path = None):
+	if os.path.isabs(file_path):
+		# if an absolute path, make sure path exists, if it doesn't, use relative local path
+		job_full_path = file_path
+		if not os.path.exists(job_full_path):
+			p, n = os.path.split(job_full_path)
+			
+			if main_path and p.startswith(main_path):
+				directory = JOB_PREFIX + p[len(main_path):]
+				job_full_path = directory + n
+				if not os.path.exists(directory):
+					os.mkdir(directory)
+			else:
+				job_full_path = JOB_PREFIX + n
+	else:
+		job_full_path = JOB_PREFIX + file_path
 	
-	if not os.path.exists(NODE_PREFIX):
-		os.mkdir(NODE_PREFIX)
+	if not os.path.exists(job_full_path):
+		conn.request("GET", "file", headers={"job-id": job.id, "slave-id":slave_id})
+		response = conn.getresponse()
+		
+		if response.status != http.client.OK:
+			return None # file for job not returned by server, need to return an error code to server
+		
+		f = open(job_full_path, "wb")
+		buf = response.read(1024)
+		
+		while buf:
+			f.write(buf)
+			buf = response.read(1024)
+		
+		f.close()
+		
+	return job_full_path
+
+
+def render_slave(engine, scene):
+	netsettings = scene.network_render
+	timeout = 1
 	
 	engine.update_stats("", "Network render node initiation")
 	
@@ -43,6 +76,10 @@ def render_slave(engine, scene):
 		
 		slave_id = response.getheader("slave-id")
 		
+		NODE_PREFIX = netsettings.path + "node_" + slave_id + os.sep
+		if not os.path.exists(NODE_PREFIX):
+			os.mkdir(NODE_PREFIX)
+	
 		while not engine.test_break():
 			
 			conn.request("GET", "job", headers={"slave-id":slave_id})
@@ -53,41 +90,30 @@ def render_slave(engine, scene):
 				
 				job = netrender.model.RenderJob.materialize(eval(str(response.read(), encoding='utf8')))
 				
-				print("File:", job.path)
-				engine.update_stats("", "Render File", job.path, "for job", job.id)
+				JOB_PREFIX = NODE_PREFIX + "job_" + job.id + os.sep
+				if not os.path.exists(JOB_PREFIX):
+					os.mkdir(JOB_PREFIX)
 				
-				if os.path.isabs(job.path):
-					# if an absolute path, make sure path exists, if it doesn't, use relative local path
-					job_full_path = job.path
-					if not os.path.exists(job_full_path):
-						job_full_path = NODE_PREFIX + job.id + ".blend"
-				else:
-					job_full_path = NODE_PREFIX + job.path
+				job_path = job.files[0]
+				main_path, main_file = os.path.split(job_path)
 				
-				if not os.path.exists(job_full_path):
-					conn.request("GET", "file", headers={"job-id": job.id, "slave-id":slave_id})
-					response = conn.getresponse()
-					
-					if response.status != http.client.OK:
-						break # file for job not returned by server, need to return an error code to server
-					
-					f = open(job_full_path, "wb")
-					buf = response.read(1024)
-					
-					while buf:
-						f.write(buf)
-						buf = response.read(1024)
-					
-					f.close()
+				job_full_path = testFile(conn, JOB_PREFIX, job_path)
+				print("Fullpath", job_full_path)
+				print("File:", main_file, "and %i other files" % (len(job.files) - 1,))
+				engine.update_stats("", "Render File", main_file, "for job", job.id)
+				
+				for file_path in job.files[1:]:
+					testFile(conn, JOB_PREFIX, file_path, main_path)
 				
 				frame_args = []
 				
 				for frame in job.frames:
+					print("frame", frame.number)
 					frame_args += ["-f", str(frame.number)]
 					
 				start_t = time.time()
 				
-				process = subprocess.Popen([sys.argv[0], "-b", job_full_path, "-o", NODE_PREFIX + job.id, "-E", "BLENDER_RENDER", "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)	
+				process = subprocess.Popen([sys.argv[0], "-b", job_full_path, "-o", JOB_PREFIX + "######", "-E", "BLENDER_RENDER", "-F", "MULTILAYER"] + frame_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)	
 				
 				cancelled = False
 				stdout = bytes()
@@ -120,7 +146,7 @@ def render_slave(engine, scene):
 					for frame in job.frames:
 						headers["job-frame"] = str(frame.number)
 						# send result back to server
-						f = open(NODE_PREFIX + job.id + "%04d" % frame.number + ".exr", 'rb')
+						f = open(JOB_PREFIX + "%06d" % frame.number + ".exr", 'rb')
 						conn.request("PUT", "render", f, headers=headers)
 						f.close()
 						response = conn.getresponse()
diff --git a/release/io/netrender/ui.py b/release/io/netrender/ui.py
index 71b013c5a63..f8179fedbda 100644
--- a/release/io/netrender/ui.py
+++ b/release/io/netrender/ui.py
@@ -48,9 +48,11 @@ class SCENE_PT_network_settings(RenderButtonsPanel):
 		col.itemR(scene.network_render, "mode")
 		col.itemR(scene.network_render, "server_address")
 		col.itemR(scene.network_render, "server_port")
+		col.itemR(scene.network_render, "path")
 		
 		if scene.network_render.mode == "RENDER_CLIENT":
 			col.itemR(scene.network_render, "chunks")
+			col.itemR(scene.network_render, "priority")
 			col.itemR(scene.network_render, "job_name")
 			col.itemO("render.netclientsend", text="send job to server")
 bpy.types.register(SCENE_PT_network_settings)
@@ -84,7 +86,7 @@ class SCENE_PT_network_slaves(RenderButtonsPanel):
 			slave = netrender.slaves[netrender.active_slave_index]
 
 			layout.itemL(text="Name: " + slave.name)
-			layout.itemL(text="Adress: " + slave.adress)
+			layout.itemL(text="Address: " + slave.address)
 			layout.itemL(text="Seen: " + slave.last_seen)
 			layout.itemL(text="Stats: " + slave.stats)
 
@@ -119,7 +121,7 @@ class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel):
 			slave = netrender.slaves_blacklist[netrender.active_blacklisted_slave_index]
 
 			layout.itemL(text="Name: " + slave.name)
-			layout.itemL(text="Adress: " + slave.adress)
+			layout.itemL(text="Address: " + slave.address)
 			layout.itemL(text="Seen: " + slave.last_seen)
 			layout.itemL(text="Stats: " + slave.stats)
 			
@@ -189,6 +191,12 @@ NetRenderSettings.IntProperty( attr="server_port",
 				min=1,
 				max=65535)
 
+NetRenderSettings.StringProperty( attr="path",
+				name="Path",
+				description="Path for temporary files",
+				maxlen = 128,
+				default = "/tmp/")
+
 NetRenderSettings.StringProperty( attr="job_name",
 				name="Job name",
 				description="Name of the job",
@@ -202,6 +210,13 @@ NetRenderSettings.IntProperty( attr="chunks",
 				min=1,
 				max=65535)
 
+NetRenderSettings.IntProperty( attr="priority",
+				name="Priority",
+				description="Priority of the job",
+				default = 1,
+				min=1,
+				max=10)
+
 NetRenderSettings.StringProperty( attr="job_id",
 				name="Network job id",
 				description="id of the last sent render job",
@@ -249,8 +264,8 @@ NetRenderSlave.StringProperty( attr="name",
 				maxlen = 64,
 				default = "")
 
-NetRenderSlave.StringProperty( attr="adress",
-				name="Adress of the slave",
+NetRenderSlave.StringProperty( attr="address",
+				name="Address of the slave",
 				description="",
 				maxlen = 64,
 				default = "")
diff --git a/release/io/netrender/utils.py b/release/io/netrender/utils.py
index c158ff115fa..d64b6fcda1e 100644
--- a/release/io/netrender/utils.py
+++ b/release/io/netrender/utils.py
@@ -3,9 +3,9 @@ import sys, os
 import http, http.client, http.server, urllib
 import subprocess, shutil, time, hashlib
 
-VERSION = b"0.3"
+import netrender.model
 
-PATH_PREFIX = "/tmp/"
+VERSION = b"0.3"
 
 QUEUED = 0
 DISPATCHED = 1
@@ -41,40 +41,46 @@ def clientVerifyVersion(conn):
 	return True
 
 def clientSendJob(conn, scene, anim = False, chunks = 5):
+	netsettings = scene.network_render
+	job = netrender.model.RenderJob()
 	
 	if anim:
-		job_frame = "%i:%i" % (scene.start_frame, scene.end_frame)
+		for f in range(scene.start_frame, scene.end_frame + 1):
+			job.addFrame(f)
 	else:
-		job_frame = "%i" % (scene.current_frame, )
-		
-	blacklist = []
+		job.addFrame(scene.current_frame)
 	
 	filename = bpy.data.filename
+	job.files.append(filename)
 	
-	name = scene.network_render.job_name
-	
+	name = netsettings.job_name
 	if name == "[default]":
 		path, name = os.path.split(filename)
 	
-	for slave in scene.network_render.slaves_blacklist:
-		blacklist.append(slave.id)
-		
-	blacklist = " ".join(blacklist)
+	job.name = name
 	
-	headers = {"job-frame":job_frame, "job-name":name, "job-chunks": str(chunks), "slave-blacklist": blacklist}
+	for slave in scene.network_render.slaves_blacklist:
+		job.blacklist.append(slave.id)
+	
+	job.chunks = netsettings.chunks
+	job.priority = netsettings.priority
 	
 	# try to send path first
-	conn.request("POST", "job", filename, headers=headers)
+	conn.request("POST", "job", repr(job.serialize()))
 	response = conn.getresponse()
 	
+	job_id = response.getheader("job-id")
+	
 	# if not found, send whole file
 	if response.status == http.client.NOT_FOUND:
 		f = open(bpy.data.filename, "rb")
-		conn.request("PUT", "file", f, headers=headers)
+		conn.request("PUT", "file", f, headers={"job-id": job_id})
 		f.close()
 		response = conn.getresponse()
 	
-	return response.getheader("job-id")
+	# server will reply with NOT_FOUD until all files are found
+	
+	return job_id
 
 def clientRequestResult(conn, scene, job_id):
 	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(scene.current_frame)})

From d7a5cccb5bfc90c724d4771ec52bce9902a73b60 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 1 Sep 2009 06:48:40 +0000
Subject: [PATCH 380/577] 2.5 - Code shuffling in arithb.c

* Moved all the euler-rotation functions so that they were near each other in the file.

* Tagged all functions relevant to axis-angle rotations
---
 source/blender/blenlib/intern/arithb.c | 269 +++++++++++++------------
 1 file changed, 137 insertions(+), 132 deletions(-)

diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index ebead4bce9b..32bacc9472c 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -1610,7 +1610,7 @@ void VecUpMat3(float *vec, float mat[][3], short axis)
 }
 
 /* A & M Watt, Advanced animation and rendering techniques, 1992 ACM press */
-void QuatInterpolW(float *, float *, float *, float );
+void QuatInterpolW(float *, float *, float *, float ); // XXX why this?
 
 void QuatInterpolW(float *result, float *quat1, float *quat2, float t)
 {
@@ -2943,137 +2943,6 @@ void EulToQuat(float *eul, float *quat)
 	quat[3] = cj*cs - sj*sc;
 }
 
-void VecRotToMat3(float *vec, float phi, float mat[][3])
-{
-	/* rotation of phi radials around vec */
-	float vx, vx2, vy, vy2, vz, vz2, co, si;
-	
-	vx= vec[0];
-	vy= vec[1];
-	vz= vec[2];
-	vx2= vx*vx;
-	vy2= vy*vy;
-	vz2= vz*vz;
-	co= (float)cos(phi);
-	si= (float)sin(phi);
-	
-	mat[0][0]= vx2+co*(1.0f-vx2);
-	mat[0][1]= vx*vy*(1.0f-co)+vz*si;
-	mat[0][2]= vz*vx*(1.0f-co)-vy*si;
-	mat[1][0]= vx*vy*(1.0f-co)-vz*si;
-	mat[1][1]= vy2+co*(1.0f-vy2);
-	mat[1][2]= vy*vz*(1.0f-co)+vx*si;
-	mat[2][0]= vz*vx*(1.0f-co)+vy*si;
-	mat[2][1]= vy*vz*(1.0f-co)-vx*si;
-	mat[2][2]= vz2+co*(1.0f-vz2);
-	
-}
-
-void VecRotToMat4(float *vec, float phi, float mat[][4])
-{
-	float tmat[3][3];
-	
-	VecRotToMat3(vec, phi, tmat);
-	Mat4One(mat);
-	Mat4CpyMat3(mat, tmat);
-}
-
-void VecRotToQuat(float *vec, float phi, float *quat)
-{
-	/* rotation of phi radials around vec */
-	float si;
-
-	quat[1]= vec[0];
-	quat[2]= vec[1];
-	quat[3]= vec[2];
-	
-	if( Normalize(quat+1) == 0.0f) {
-		QuatOne(quat);
-	}
-	else {
-		quat[0]= (float)cos( phi/2.0 );
-		si= (float)sin( phi/2.0 );
-		quat[1] *= si;
-		quat[2] *= si;
-		quat[3] *= si;
-	}
-}
-
-/* Return the angle in degrees between vecs 1-2 and 2-3 in degrees
-   If v1 is a shoulder, v2 is the elbow and v3 is the hand,
-   this would return the angle at the elbow */
-float VecAngle3(float *v1, float *v2, float *v3)
-{
-	float vec1[3], vec2[3];
-
-	VecSubf(vec1, v2, v1);
-	VecSubf(vec2, v2, v3);
-	Normalize(vec1);
-	Normalize(vec2);
-
-	return NormalizedVecAngle2(vec1, vec2) * (float)(180.0/M_PI);
-}
-
-float VecAngle3_2D(float *v1, float *v2, float *v3)
-{
-	float vec1[2], vec2[2];
-
-	vec1[0] = v2[0]-v1[0];
-	vec1[1] = v2[1]-v1[1];
-	
-	vec2[0] = v2[0]-v3[0];
-	vec2[1] = v2[1]-v3[1];
-	
-	Normalize2(vec1);
-	Normalize2(vec2);
-
-	return NormalizedVecAngle2_2D(vec1, vec2) * (float)(180.0/M_PI);
-}
-
-/* Return the shortest angle in degrees between the 2 vectors */
-float VecAngle2(float *v1, float *v2)
-{
-	float vec1[3], vec2[3];
-
-	VecCopyf(vec1, v1);
-	VecCopyf(vec2, v2);
-	Normalize(vec1);
-	Normalize(vec2);
-
-	return NormalizedVecAngle2(vec1, vec2)* (float)(180.0/M_PI);
-}
-
-float NormalizedVecAngle2(float *v1, float *v2)
-{
-	/* this is the same as acos(Inpf(v1, v2)), but more accurate */
-	if (Inpf(v1, v2) < 0.0f) {
-		float vec[3];
-		
-		vec[0]= -v2[0];
-		vec[1]= -v2[1];
-		vec[2]= -v2[2];
-		
-		return (float)M_PI - 2.0f*(float)saasin(VecLenf(vec, v1)/2.0f);
-	}
-	else
-		return 2.0f*(float)saasin(VecLenf(v2, v1)/2.0f);
-}
-
-float NormalizedVecAngle2_2D(float *v1, float *v2)
-{
-	/* this is the same as acos(Inpf(v1, v2)), but more accurate */
-	if (Inp2f(v1, v2) < 0.0f) {
-		float vec[2];
-		
-		vec[0]= -v2[0];
-		vec[1]= -v2[1];
-		
-		return (float)M_PI - 2.0f*saasin(Vec2Lenf(vec, v1)/2.0f);
-	}
-	else
-		return 2.0f*(float)saasin(Vec2Lenf(v2, v1)/2.0f);
-}
-
 void euler_rot(float *beul, float ang, char axis)
 {
 	float eul[3], mat1[3][3], mat2[3][3], totmat[3][3];
@@ -3179,6 +3048,140 @@ void Mat3ToCompatibleEul(float mat[][3], float *eul, float *oldrot)
 	
 }
 
+/* axis angle to 3x3 matrix */
+void VecRotToMat3(float *vec, float phi, float mat[][3])
+{
+	/* rotation of phi radials around vec */
+	float vx, vx2, vy, vy2, vz, vz2, co, si;
+	
+	vx= vec[0];
+	vy= vec[1];
+	vz= vec[2];
+	vx2= vx*vx;
+	vy2= vy*vy;
+	vz2= vz*vz;
+	co= (float)cos(phi);
+	si= (float)sin(phi);
+	
+	mat[0][0]= vx2+co*(1.0f-vx2);
+	mat[0][1]= vx*vy*(1.0f-co)+vz*si;
+	mat[0][2]= vz*vx*(1.0f-co)-vy*si;
+	mat[1][0]= vx*vy*(1.0f-co)-vz*si;
+	mat[1][1]= vy2+co*(1.0f-vy2);
+	mat[1][2]= vy*vz*(1.0f-co)+vx*si;
+	mat[2][0]= vz*vx*(1.0f-co)+vy*si;
+	mat[2][1]= vy*vz*(1.0f-co)-vx*si;
+	mat[2][2]= vz2+co*(1.0f-vz2);
+	
+}
+
+/* axis angle to 4x4 matrix */
+void VecRotToMat4(float *vec, float phi, float mat[][4])
+{
+	float tmat[3][3];
+	
+	VecRotToMat3(vec, phi, tmat);
+	Mat4One(mat);
+	Mat4CpyMat3(mat, tmat);
+}
+
+/* axis angle to quaternion */
+void VecRotToQuat(float *vec, float phi, float *quat)
+{
+	/* rotation of phi radials around vec */
+	float si;
+
+	quat[1]= vec[0];
+	quat[2]= vec[1];
+	quat[3]= vec[2];
+	
+	if( Normalize(quat+1) == 0.0f) {
+		QuatOne(quat);
+	}
+	else {
+		quat[0]= (float)cos( phi/2.0 );
+		si= (float)sin( phi/2.0 );
+		quat[1] *= si;
+		quat[2] *= si;
+		quat[3] *= si;
+	}
+}
+
+/* Return the angle in degrees between vecs 1-2 and 2-3 in degrees
+   If v1 is a shoulder, v2 is the elbow and v3 is the hand,
+   this would return the angle at the elbow */
+float VecAngle3(float *v1, float *v2, float *v3)
+{
+	float vec1[3], vec2[3];
+
+	VecSubf(vec1, v2, v1);
+	VecSubf(vec2, v2, v3);
+	Normalize(vec1);
+	Normalize(vec2);
+
+	return NormalizedVecAngle2(vec1, vec2) * (float)(180.0/M_PI);
+}
+
+float VecAngle3_2D(float *v1, float *v2, float *v3)
+{
+	float vec1[2], vec2[2];
+
+	vec1[0] = v2[0]-v1[0];
+	vec1[1] = v2[1]-v1[1];
+	
+	vec2[0] = v2[0]-v3[0];
+	vec2[1] = v2[1]-v3[1];
+	
+	Normalize2(vec1);
+	Normalize2(vec2);
+
+	return NormalizedVecAngle2_2D(vec1, vec2) * (float)(180.0/M_PI);
+}
+
+/* Return the shortest angle in degrees between the 2 vectors */
+float VecAngle2(float *v1, float *v2)
+{
+	float vec1[3], vec2[3];
+
+	VecCopyf(vec1, v1);
+	VecCopyf(vec2, v2);
+	Normalize(vec1);
+	Normalize(vec2);
+
+	return NormalizedVecAngle2(vec1, vec2)* (float)(180.0/M_PI);
+}
+
+float NormalizedVecAngle2(float *v1, float *v2)
+{
+	/* this is the same as acos(Inpf(v1, v2)), but more accurate */
+	if (Inpf(v1, v2) < 0.0f) {
+		float vec[3];
+		
+		vec[0]= -v2[0];
+		vec[1]= -v2[1];
+		vec[2]= -v2[2];
+		
+		return (float)M_PI - 2.0f*(float)saasin(VecLenf(vec, v1)/2.0f);
+	}
+	else
+		return 2.0f*(float)saasin(VecLenf(v2, v1)/2.0f);
+}
+
+float NormalizedVecAngle2_2D(float *v1, float *v2)
+{
+	/* this is the same as acos(Inpf(v1, v2)), but more accurate */
+	if (Inp2f(v1, v2) < 0.0f) {
+		float vec[2];
+		
+		vec[0]= -v2[0];
+		vec[1]= -v2[1];
+		
+		return (float)M_PI - 2.0f*saasin(Vec2Lenf(vec, v1)/2.0f);
+	}
+	else
+		return 2.0f*(float)saasin(Vec2Lenf(v2, v1)/2.0f);
+}
+
 /* ******************************************** */
 
 void SizeToMat3( float *size, float mat[][3])
@@ -4745,6 +4748,8 @@ void LocQuatSizeToMat4(float mat[][4], float loc[3], float quat[4], float size[3
 	mat[3][2] = loc[2];
 }
 
+/********************************************************/
+
 /* Tangents */
 
 /* For normal map tangents we need to detect uv boundaries, and only average

From a44b9482603daaec9fa012714ddf4a1558c283fe Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 1 Sep 2009 12:18:17 +0000
Subject: [PATCH 381/577] 2.5 - Rotation Orders for Bones [Durian Rigging
 Request]

This commit is the start of an implementation of (euler) rotation orders for Bones (later to be extended to Objects too).

Technical details and references can be found at:
http://wiki.blender.org/index.php/User:Aligorith/EulerRotationOrder

In short, I've added a new set of Euler conversion functions (EulO... and ...EulO), coexisting with the old functions for now, which can handle different rotation orders.

Changes have only been made to the basic evaluation code. However, the following places will still need modifications:
* Transform code - needs to be made to use functions which take rotation order into account instead of using XYZ only
* Rotation constraints - same story
* Other rotation editing tools for armatures also need a check up, since there might have been some missing code when I ported eulers earlier
---
 source/blender/blenkernel/intern/armature.c  |   4 +-
 source/blender/blenlib/BLI_arithb.h          |  47 +++-
 source/blender/blenlib/intern/arithb.c       | 217 +++++++++++++++++--
 source/blender/editors/transform/transform.c |   2 +-
 source/blender/makesdna/DNA_action_types.h   |   9 +-
 source/blender/makesrna/intern/rna_pose.c    |   9 +-
 6 files changed, 254 insertions(+), 34 deletions(-)

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 7b894d79b45..631bc2cb88c 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1988,9 +1988,9 @@ void chan_calc_mat(bPoseChannel *chan)
 	SizeToMat3(chan->size, smat);
 	
 	/* rotations may either be quats or eulers (no rotation modes for now...) */
-	if (chan->rotmode) {
+	if (chan->rotmode > 0) {
 		/* euler rotations (will cause gimble lock... no rotation order to solve that yet) */
-		EulToMat3(chan->eul, rmat);
+		EulOToMat3(chan->eul, chan->rotmode, rmat);
 	}
 	else {
 		/* quats are normalised before use to eliminate scaling issues */
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 0a0749d3382..4156e3c52ec 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -174,7 +174,36 @@ void CalcNormShort(short *v1, short *v2, short *v3, float *n);
 float power_of_2(float val);
 
 /**
- * @section Euler conversion routines
+ * @section Euler conversion routines (With Custom Order)
+ */
+
+/* Defines for rotation orders 
+ * WARNING: must match the ePchan_RotMode in DNA_action_types.h
+ *		   order matters - types are saved to file!
+ */
+typedef enum eEulerRotationOrders {
+	EULER_ORDER_DEFAULT = 1,	/* Blender 'default' (classic) is basically XYZ */
+	EULER_ORDER_XYZ = 1,		/* Blender 'default' (classic) - must be as 1 to sync with PoseChannel rotmode */
+	EULER_ORDER_XZY,
+	EULER_ORDER_YXZ,
+	EULER_ORDER_YZX,
+	EULER_ORDER_ZXY,
+	EULER_ORDER_ZYX,
+	/* NOTE: there are about 6 more entries when including duplicated entries too */
+} eEulerRotationOrders;
+
+void EulOToQuat(float eul[3], short order, float quat[4]);
+
+void EulOToMat3(float eul[3], short order, float Mat[3][3]);
+void EulOToMat4(float eul[3], short order, float Mat[4][4]);
+ 
+void Mat3ToEulO(float Mat[3][3], float eul[3], short order);
+void Mat4ToEulO(float Mat[4][4], float eul[3], short order);
+
+void QuatToEulO(float quat[4], float eul[3], short order);
+ 
+/**
+ * @section Euler conversion routines (Blender XYZ)
  */
 
 void EulToMat3(float *eul, float mat[][3]);
@@ -185,11 +214,14 @@ void Mat4ToEul(float tmat[][4],float *eul);
 
 void EulToQuat(float *eul, float *quat);
 
-void compatible_eul(float *eul, float *oldrot);
-
 void Mat3ToCompatibleEul(float mat[][3], float *eul, float *oldrot);
 
 
+
+void compatible_eul(float *eul, float *oldrot);
+void euler_rot(float *beul, float ang, char axis);
+
+
 /**
  * @section Quaternion arithmetic routines
  */
@@ -216,6 +248,8 @@ void printquat(char *str, float q[4]);
 void QuatInterpol(float *result, float *quat1, float *quat2, float t);
 void QuatAdd(float *result, float *quat1, float *quat2, float t);
 
+void QuatToMat3(float *q, float m[][3]);
+void QuatToMat4(float *q, float m[][4]);
 
 /**
  * @section matrix multiplication and copying routines
@@ -349,8 +383,6 @@ float NormalizedVecAngle2(float *v1, float *v2);
 
 float VecAngle3_2D(float *v1, float *v2, float *v3);
 float NormalizedVecAngle2_2D(float *v1, float *v2);
-
-void euler_rot(float *beul, float ang, char axis);
 	
 void NormalShortToFloat(float *out, short *in);
 void NormalFloatToShort(short *out, float *in);
@@ -422,9 +454,6 @@ void VecStar(float mat[][3],float *vec);
 
 short EenheidsMat(float mat[][3]);
 
-void QuatToMat3(float *q, float m[][3]);
-void QuatToMat4(float *q, float m[][4]);
-
 void Mat3ToQuat_is_ok(float wmat[][3], float *q);
 
 void i_ortho(float left, float right, float bottom, float top, float nearClip, float farClip, float matrix[][4]);
@@ -435,8 +464,6 @@ void i_rotate(float angle, char axis, float mat[][4]);
 
 
 
-
-
 void MinMax3(float *min, float *max, float *vec);
 void SizeToMat3(float *size, float mat[][3]);
 void SizeToMat4(float *size, float mat[][4]);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 32bacc9472c..e0f17864d73 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -1408,22 +1408,6 @@ void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3])
 	AxisAngleToQuat(q, axis, angle);
 }
 
-void AxisAngleToQuat(float *q, float *axis, float angle)
-{
-	float nor[3];
-	float si;
-	
-	VecCopyf(nor, axis);
-	Normalize(nor);
-	
-	angle /= 2;
-	si = (float)sin(angle);
-	q[0] = (float)cos(angle);
-	q[1] = nor[0] * si;
-	q[2] = nor[1] * si;
-	q[3] = nor[2] * si;	
-}
-
 void vectoquat(float *vec, short axis, short upflag, float *q)
 {
 	float q2[4], nor[3], *fp, mat[3][3], angle, si, co, x2, y2, z2, len1;
@@ -2807,6 +2791,156 @@ void MeanValueWeights(float v[][3], int n, float *co, float *w)
 
 /* ************ EULER *************** */
 
+/* Euler Rotation Order Code:
+ * was adapted from  
+  		ANSI C code from the article
+		"Euler Angle Conversion"
+		by Ken Shoemake, shoemake@graphics.cis.upenn.edu
+		in "Graphics Gems IV", Academic Press, 1994
+ * for use in Blender
+ */
+
+/* Type for rotation order info - see wiki for derivation details */
+typedef struct RotOrderInfo {
+	short i;		/* first axis index */
+	short j;		/* second axis index */
+	short k;		/* third axis index */
+	short parity;	/* parity of axis permuation (even=0, odd=1) - 'n' in original code */
+} RotOrderInfo;
+
+/* Array of info for Rotation Order calculations 
+ * WARNING: must be kept in same order as eEulerRotationOrders
+ */
+static RotOrderInfo rotOrders[]= {
+	/* i, j, k, n */
+	{0, 1, 2, 0}, // XYZ
+	{0, 2, 1, 1}, // XZY
+	{1, 0, 2, 1}, // YXZ
+	{1, 2, 0, 0}, // YZX
+	{2, 0, 1, 0}, // ZXY
+	{2, 1, 0, 1}  // ZYZ
+};
+
+/* Get relevant pointer to rotation order set from the array 
+ * NOTE: since we start at 1 for the values, but arrays index from 0, 
+ *		 there is -1 factor involved in this process...
+ */
+#define GET_ROTATIONORDER_INFO(order) (&rotOrders[(order)-1])
+
+/* Construct quaternion from Euler angles (in radians). */
+void EulOToQuat(float e[3], short order, float q[4])
+{
+	RotOrderInfo *R= GET_ROTATIONORDER_INFO(order); 
+	short i=R->i,  j=R->j, 	k=R->k;
+	double ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
+	double a[3];
+	
+	if (R->parity) e[1] = -e[1];
+	
+	ti = e[0]/2; tj = e[1]/2; th = e[2]/2;
+	
+	ci = cos(ti);  cj = cos(tj);  ch = cos(th);
+	si = sin(ti);  sj = sin(tj);  sh = sin(th);
+	
+	cc = ci*ch; cs = ci*sh; 
+	sc = si*ch; ss = si*sh;
+	
+	a[i] = cj*sc - sj*cs;
+	a[j] = cj*ss + sj*cc;
+	a[k] = cj*cs - sj*sc;
+	
+	q[0] = cj*cc + sj*ss;
+	q[1] = a[0];
+	q[2] = a[1];
+	q[3] = a[2];
+	
+	if (R->parity) q[j] = -q[j];
+}
+
+/* Construct 3x3 matrix from Euler angles (in radians). */
+void EulOToMat3(float e[3], short order, float M[3][3])
+{
+	RotOrderInfo *R= GET_ROTATIONORDER_INFO(order); 
+	short i=R->i,  j=R->j, 	k=R->k;
+	double ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
+	
+	if (R->parity) {
+		e[0] = -e[0]; 
+		e[1] = -e[1]; 
+		e[2] = -e[2];
+	}
+	
+	ti = e[0];	  tj = e[1];	th = e[2];
+	
+	ci = cos(ti); cj = cos(tj); ch = cos(th);
+	si = sin(ti); sj = sin(tj); sh = sin(th);
+	
+	cc = ci*ch; cs = ci*sh; 
+	sc = si*ch; ss = si*sh;
+	
+	M[i][i] = cj*ch; M[j][i] = sj*sc-cs; M[k][i] = sj*cc+ss;
+	M[i][j] = cj*sh; M[j][j] = sj*ss+cc; M[k][j] = sj*cs-sc;
+	M[i][k] = -sj;	 M[j][k] = cj*si;	 M[k][k] = cj*ci;
+}
+
+/* Construct 4x4 matrix from Euler angles (in radians). */
+void EulOToMat4(float e[3], short order, float M[4][4])
+{
+	float m[3][3];
+	
+	/* for now, we'll just do this the slow way (i.e. copying matrices) */
+	Mat3Ortho(m);
+	EulOToMat3(e, order, m);
+	Mat4CpyMat3(M, m);
+}
+
+/* Convert 3x3 matrix to Euler angles (in radians). */
+void Mat3ToEulO(float M[3][3], float e[3], short order)
+{
+	RotOrderInfo *R= GET_ROTATIONORDER_INFO(order); 
+	short i=R->i,  j=R->j, 	k=R->k;
+	double cy = sqrt(M[i][i]*M[i][i] + M[j][i]*M[j][i]);
+	
+	if (cy > 16*FLT_EPSILON) {
+		e[0] = atan2(M[j][k], M[k][k]);
+		e[1] = atan2(-M[i][k], cy);
+		e[2] = atan2(M[i][j], M[i][i]);
+	} 
+	else {
+		e[0] = atan2(-M[k][j], M[j][j]);
+		e[1] = atan2(-M[i][k], cy);
+		e[2] = 0;
+	}
+	
+	if (R->parity) {
+		e[0] = -e[0]; 
+		e[1] = -e[1]; 
+		e[2] = -e[2];
+	}
+}
+
+/* Convert 4x4 matrix to Euler angles (in radians). */
+void Mat4ToEulO(float M[4][4], float e[3], short order)
+{
+	float m[3][3];
+	
+	/* for now, we'll just do this the slow way (i.e. copying matrices) */
+	Mat3CpyMat4(m, M);
+	Mat3ToEulO(m, e, order);
+}
+
+/* Convert quaternion to Euler angles (in radians). */
+void QuatToEulO(float q[4], float e[3], short order)
+{
+	float M[3][3];
+	
+	QuatToMat3(q, M);
+	Mat3ToEulO(M, e, order);
+}
+
+/* ************ EULER (old XYZ) *************** */
+
+/* XYZ order */
 void EulToMat3( float *eul, float mat[][3])
 {
 	double ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
@@ -2834,6 +2968,7 @@ void EulToMat3( float *eul, float mat[][3])
 
 }
 
+/* XYZ order */
 void EulToMat4( float *eul,float mat[][4])
 {
 	double ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
@@ -2865,6 +3000,7 @@ void EulToMat4( float *eul,float mat[][4])
 }
 
 /* returns two euler calculation methods, so we can pick the best */
+/* XYZ order */
 static void mat3_to_eul2(float tmat[][3], float *eul1, float *eul2)
 {
 	float cy, quat[4], mat[3][3];
@@ -2895,6 +3031,7 @@ static void mat3_to_eul2(float tmat[][3], float *eul1, float *eul2)
 	}
 }
 
+/* XYZ order */
 void Mat3ToEul(float tmat[][3], float *eul)
 {
 	float eul1[3], eul2[3];
@@ -2910,6 +3047,7 @@ void Mat3ToEul(float tmat[][3], float *eul)
 	}
 }
 
+/* XYZ order */
 void Mat4ToEul(float tmat[][4], float *eul)
 {
 	float tempMat[3][3];
@@ -2919,6 +3057,7 @@ void Mat4ToEul(float tmat[][4], float *eul)
 	Mat3ToEul(tempMat, eul);
 }
 
+/* XYZ order */
 void QuatToEul(float *quat, float *eul)
 {
 	float mat[3][3];
@@ -2927,7 +3066,7 @@ void QuatToEul(float *quat, float *eul)
 	Mat3ToEul(mat, eul);
 }
 
-
+/* XYZ order */
 void EulToQuat(float *eul, float *quat)
 {
     float ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
@@ -2943,6 +3082,7 @@ void EulToQuat(float *eul, float *quat)
 	quat[3] = cj*cs - sj*sc;
 }
 
+/* XYZ order */
 void euler_rot(float *beul, float ang, char axis)
 {
 	float eul[3], mat1[3][3], mat2[3][3], totmat[3][3];
@@ -2962,6 +3102,7 @@ void euler_rot(float *beul, float ang, char axis)
 }
 
 /* exported to transform.c */
+/* XYZ order */
 void compatible_eul(float *eul, float *oldrot)
 {
 	float dx, dy, dz;
@@ -3025,6 +3166,7 @@ void compatible_eul(float *eul, float *oldrot)
 }
 
 /* uses 2 methods to retrieve eulers, and picks the closest */
+/* XYZ order */
 void Mat3ToCompatibleEul(float mat[][3], float *eul, float *oldrot)
 {
 	float eul1[3], eul2[3];
@@ -3048,6 +3190,46 @@ void Mat3ToCompatibleEul(float mat[][3], float *eul, float *oldrot)
 	
 }
 
+/* ************ AXIS ANGLE *************** */
+
+/* Axis angle to Quaternions */
+void AxisAngleToQuat(float *q, float *axis, float angle)
+{
+	float nor[3];
+	float si;
+	
+	VecCopyf(nor, axis);
+	Normalize(nor);
+	
+	angle /= 2;
+	si = (float)sin(angle);
+	q[0] = (float)cos(angle);
+	q[1] = nor[0] * si;
+	q[2] = nor[1] * si;
+	q[3] = nor[2] * si;	
+}
+
+/* Quaternions to Axis Angle */
+void QuatToAxisAngle(float q[4], float axis[3], float *angle)
+{
+	float ha, si;
+	
+	/* calculate angle/2, and sin(angle/2) */
+	ha= (float)acos(q[0]);
+	si= (float)sin(ha);
+	
+	/* from half-angle to angle */
+	*angle= ha * 2;
+	
+	/* prevent division by zero for axis conversion */
+	if (fabs(si) < 0.0005)
+		si= 1.0f;
+	
+	axis[0]= q[1] / si;
+	axis[1]= q[2] / si;
+	axis[2]= q[3] / si;
+}
+
 /* axis angle to 3x3 matrix */
 void VecRotToMat3(float *vec, float phi, float mat[][3])
 {
@@ -4704,6 +4886,7 @@ float PdistVL3Dfl(float *v1, float *v2, float *v3)
 
 /* make a 4x4 matrix out of 3 transform components */
 /* matrices are made in the order: scale * rot * loc */
+// TODO: need to have a version that allows for rotation order...
 void LocEulSizeToMat4(float mat[][4], float loc[3], float eul[3], float size[3])
 {
 	float rmat[3][3], smat[3][3], tmat[3][3];
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index dd7cebdfe3f..4a376f35552 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2670,7 +2670,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				/* this function works on end result */
 				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
 			}
-			else {
+			else { // TODO: need some methods for the new euler types...
 				float eulmat[3][3];
 
 				Mat3MulMat3(totmat, mat, td->mtx);
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index c9d75d5c262..474d5a4217f 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -199,8 +199,13 @@ typedef enum ePchan_IkFlag {
 typedef enum ePchan_RotMode {
 		/* quaternion rotations (default, and for older Blender versions) */
 	PCHAN_ROT_QUAT	= 0,
-		/* euler rotations (xyz only) */
-	PCHAN_ROT_EUL,
+		/* euler rotations - keep in sync with enum in BLI_arithb.h */
+	PCHAN_ROT_XYZ = 1,		/* Blender 'default' (classic) - must be as 1 to sync with PoseChannel rotmode */
+	PCHAN_ROT_XZY,
+	PCHAN_ROT_YXZ,
+	PCHAN_ROT_YZX,
+	PCHAN_ROT_ZXY,
+	PCHAN_ROT_ZYX,
 } ePchan_RotMode;
 
 /* Pose ------------------------------------ */
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index bfebc5ee49f..727e3ff6a6d 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -124,7 +124,7 @@ static void rna_PoseChannel_euler_rotation_set(PointerRNA *ptr, const float *val
 {
 	bPoseChannel *pchan= ptr->data;
 
-	if(pchan->rotmode == PCHAN_ROT_QUAT)
+	if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers when using quats... */
 		EulToQuat((float*)value, pchan->quat);
 	else
 		VECCOPY(pchan->eul, value);
@@ -353,7 +353,12 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 {
 	static EnumPropertyItem prop_rotmode_items[] = {
 		{PCHAN_ROT_QUAT, "QUATERNION", 0, "Quaternion (WXYZ)", "No Gimbal Lock (default)"},
-		{PCHAN_ROT_EUL, "EULER", 0, "Euler (XYZ)", "Prone to Gimbal Lock"},
+		{PCHAN_ROT_XYZ, "XYZ", 0, "XYZ Euler", "XYZ Rotation Order. Prone to Gimbal Lock"},
+		{PCHAN_ROT_XZY, "XZY", 0, "XZY Euler", "XZY Rotation Order. Prone to Gimbal Lock"},
+		{PCHAN_ROT_YXZ, "YXZ", 0, "YXZ Euler", "YXZ Rotation Order. Prone to Gimbal Lock"},
+		{PCHAN_ROT_YZX, "YZX", 0, "YZX Euler", "YZX Rotation Order. Prone to Gimbal Lock"},
+		{PCHAN_ROT_ZXY, "ZXY", 0, "ZXY Euler", "ZXY Rotation Order. Prone to Gimbal Lock"},
+		{PCHAN_ROT_ZYX, "ZYX", 0, "ZYX Euler", "ZYX Rotation Order. Prone to Gimbal Lock"},
 		{0, NULL, 0, NULL, NULL}};
 	
 	StructRNA *srna;

From 9965e8915d9121fae88aaa98990f714b3c2670bf Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Tue, 1 Sep 2009 12:41:06 +0000
Subject: [PATCH 382/577] Added the old Edge settings to scene properties. This
 old feature is really quite terrible as it isn't even resolution independent
 - the edge width should be relative to the image dimensions.

Adjusted layout for sound in sequencer and a few other minor tweaks.
---
 release/ui/buttons_scene.py                | 32 ++++++++++++++--------
 release/ui/space_sequencer.py              | 25 +++++++++++------
 source/blender/makesrna/intern/rna_scene.c |  4 +--
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 126afc4ef23..d8b2b51751b 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -189,20 +189,28 @@ class SCENE_PT_post_processing(RenderButtonsPanel):
 		col = split.column()
 		col.itemR(rd, "use_compositing")
 		col.itemR(rd, "use_sequencer")
-
+		
 		col = split.column()
-		row = col.row()
-		row.itemR(rd, "fields", text="Fields")
-		sub = row.row()
-		sub.active = rd.fields
-		sub.itemR(rd, "fields_still", text="Still")
-		sub = col.row()
-		sub.active = rd.fields
-		sub.itemR(rd, "field_order", expand=True)
-
+		col.itemR(rd, "dither_intensity", text="Dither", slider=True)
+		
+		layout.itemS()
+				
 		split = layout.split()
-		split.itemL()
-		split.itemR(rd, "dither_intensity", text="Dither", slider=True)
+		
+		col = split.column()
+		col.itemR(rd, "fields", text="Fields")
+		sub = col.column()
+		sub.active = rd.fields
+		sub.row().itemR(rd, "field_order", expand=True)
+		sub.itemR(rd, "fields_still", text="Still")
+		
+		col = split.column()
+		
+		col.itemR(rd, "edge")
+		sub = col.column()
+		sub.active = rd.edge
+		sub.itemR(rd, "edge_threshold", text="Threshold", slider=True)
+		sub.itemR(rd, "edge_color", text="")
 		
 class SCENE_PT_output(RenderButtonsPanel):
 	__label__ = "Output"
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index 87111b2925f..bef48f5ebdb 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -303,6 +303,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel):
 		row.itemR(strip, "frame_locked", text="Frame Lock")
 		
 		col = layout.column()
+		col.enabled = not strip.lock	
 		col.itemR(strip, "channel")
 		col.itemR(strip, "start_frame")
 		col.itemR(strip, "length")
@@ -422,16 +423,21 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
 		
 		strip = act_strip(context)
 		
-		layout.itemR(strip, "directory", text="")
+		split = layout.split(percentage=0.2)
+		col = split.column()
+		col.itemL(text="Path:")
+		col = split.column()
+		col.itemR(strip, "directory", text="")
 		
 		# Current element for the filename
-		split = layout.split(percentage=0.3)
-		col = split.column()
-		col.itemL(text="File Name:")
-		col = split.column()
+		
 		
 		elem = strip.getStripElem(context.scene.current_frame)
 		if elem:
+			split = layout.split(percentage=0.2)
+			col = split.column()
+			col.itemL(text="File:")
+			col = split.column()
 			col.itemR(elem, "filename", text="") # strip.elements[0] could be a fallback
 		
 		if strip.type != 'SOUND':
@@ -477,14 +483,15 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
 		layout.template_ID(strip, "sound", new="sound.open")
 		
 		layout.itemS()
+		layout.itemR(strip.sound, "filename", text="")
 		
+		row = layout.row()
 		if strip.sound.packed_file:
-			layout.itemO("sound.unpack")
+			row.itemO("sound.unpack", icon='ICON_PACKAGE', text="Unpack")
 		else:
-			layout.itemO("sound.pack")
+			row.itemO("sound.pack", icon='ICON_UGLYPACKAGE', text="Pack")
 		
-		layout.itemR(strip.sound, "filename")
-		layout.itemR(strip.sound, "caching")
+		row.itemR(strip.sound, "caching")
 
 class SEQUENCER_PT_filter(SequencerButtonsPanel):
 	__label__ = "Filter"
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 02b891c6cd2..935bf8ccc3f 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1621,10 +1621,10 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Edge", "Create a toon outline around the edges of geometry");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
-	prop= RNA_def_property(srna, "edge_intensity", PROP_INT, PROP_NONE);
+	prop= RNA_def_property(srna, "edge_threshold", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "edgeint");
 	RNA_def_property_range(prop, 0, 255);
-	RNA_def_property_ui_text(prop, "Edge Intensity", "Threshold for drawing outlines on geometry edges");
+	RNA_def_property_ui_text(prop, "Edge Threshold", "Threshold for drawing outlines on geometry edges");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
 	prop= RNA_def_property(srna, "edge_color", PROP_FLOAT, PROP_COLOR);

From add244bca8259e171155be6917307136fcb8e2c8 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Tue, 1 Sep 2009 14:59:50 +0000
Subject: [PATCH 383/577] 2.5 Buttons:

* Fix for Point Density Texture panel. "System" label was there before the pointer button showed up. (For Source Type Particle System.)
---
 release/ui/buttons_scene.py   |  1 -
 release/ui/buttons_texture.py | 32 +++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index d8b2b51751b..3c321f11f6e 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -205,7 +205,6 @@ class SCENE_PT_post_processing(RenderButtonsPanel):
 		sub.itemR(rd, "fields_still", text="Still")
 		
 		col = split.column()
-		
 		col.itemR(rd, "edge")
 		sub = col.column()
 		sub.active = rd.edge
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index ee3f85e15ef..90ce40b4832 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -665,27 +665,21 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 		if pd.point_source == 'PARTICLE_SYSTEM':
 			col.itemL(text="Object:")
 			col.itemR(pd, "object", text="")
-			col = col.column()
-			col.enabled = pd.object
-			col.itemL(text="System:")
-			col.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
-			col.itemL(text="Cache:")
-			col.itemR(pd, "particle_cache", text="")
+			
+			sub = col.column()
+			sub.enabled = pd.object
+			if pd.object:
+				sub.itemL(text="System:")
+				sub.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
+			sub.itemL(text="Cache:")
+			sub.itemR(pd, "particle_cache", text="")
 		else:
 			col.itemL(text="Object:")
 			col.itemR(pd, "object", text="")
 			col.itemL(text="Cache:")
 			col.itemR(pd, "vertices_cache", text="")
 		
-		sub = split.column()
-		
-		sub.itemL()
-		sub.itemR(pd, "radius")
-		
-		sub.itemL(text="Falloff:")
-		sub.itemR(pd, "falloff", text="")
-		if pd.falloff == 'SOFT':
-			sub.itemR(pd, "falloff_softness")
+		col.itemS()
 		
 		col.itemL(text="Color Source:")	
 		col.itemR(pd, "color_source", text="")
@@ -694,6 +688,14 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
 		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_AGE'):
 			layout.template_color_ramp(pd.color_ramp, expand=True)
 
+		col = split.column()
+		col.itemL()
+		col.itemR(pd, "radius")
+		col.itemL(text="Falloff:")
+		col.itemR(pd, "falloff", text="")
+		if pd.falloff == 'SOFT':
+			col.itemR(pd, "falloff_softness")
+
 class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel):
 	__label__ = "Turbulence"
 	

From 6d5f824518cdbf8bf710096ab369624d12d23037 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 1 Sep 2009 16:37:23 +0000
Subject: [PATCH 384/577] - enum for convex hull and triangle mesh were swapped
 - python pedantry

---
 release/ui/space_time.py                    |  4 ++--
 release/ui/space_view3d.py                  | 22 ++++++++++-----------
 source/blender/makesrna/intern/rna_object.c |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index 81681e42d92..bb82eea3272 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -141,8 +141,8 @@ class TIME_MT_autokey(bpy.types.Menu):
 		
 		layout.active = tools.enable_auto_key
 		
-		layout.item_enumR(tools, "autokey_mode", "ADD_REPLACE_KEYS")
-		layout.item_enumR(tools, "autokey_mode", "REPLACE_KEYS")
+		layout.item_enumR(tools, "autokey_mode", 'ADD_REPLACE_KEYS')
+		layout.item_enumR(tools, "autokey_mode", 'REPLACE_KEYS')
 
 bpy.types.register(TIME_HT_header)
 bpy.types.register(TIME_MT_view)
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 5801f9e7941..c5c1abf1d40 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -42,7 +42,7 @@ class VIEW3D_HT_header(bpy.types.Header):
 # ********** Utilities **********
 
 class VIEW3D_MT_showhide(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Show/Hide"
 	_operator_name = ""
 
@@ -54,7 +54,7 @@ class VIEW3D_MT_showhide(bpy.types.Menu):
 		layout.item_booleanO("%s.hide" % self._operator_name, "unselected", True, text="Hide Unselected")
 
 class VIEW3D_MT_snap(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Snap"
 
 	def draw(self, context):
@@ -136,7 +136,7 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu):
 		layout.item_floatO("view3d.zoom", "delta", -1.0, text="Zoom Out")
 
 class VIEW3D_MT_view_align(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Align View"
 
 	def draw(self, context):
@@ -145,7 +145,7 @@ class VIEW3D_MT_view_align(bpy.types.Menu):
 		layout.itemO("view3d.view_center")
 		
 class VIEW3D_MT_view_cameras(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Cameras"
 
 	def draw(self, context):
@@ -580,7 +580,7 @@ class VIEW3D_MT_PARTICLE_showhide(VIEW3D_MT_showhide):
 # ********** Pose Menu **********
 
 class VIEW3D_MT_POSE(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Pose"
 
 	def draw(self, context):
@@ -638,7 +638,7 @@ class VIEW3D_MT_POSE(bpy.types.Menu):
 		layout.item_menu_enumO("pose.flags_set", 'mode', text="Bone Settings")
 
 class VIEW3D_MT_POSE_transform(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Clear Transform"
 
 	def draw(self, context):
@@ -653,7 +653,7 @@ class VIEW3D_MT_POSE_transform(bpy.types.Menu):
 		layout.itemL(text="Origin")
 		
 class VIEW3D_MT_POSE_pose(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Pose Library"
 
 	def draw(self, context):
@@ -668,7 +668,7 @@ class VIEW3D_MT_POSE_pose(bpy.types.Menu):
 		layout.itemO("poselib.pose_remove", text="Remove Pose...")
 
 class VIEW3D_MT_POSE_motion(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Motion Paths"
 
 	def draw(self, context):
@@ -678,7 +678,7 @@ class VIEW3D_MT_POSE_motion(bpy.types.Menu):
 		layout.itemO("pose.paths_clear", text="Clear")
 		
 class VIEW3D_MT_POSE_group(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Bone Groups"
 
 	def draw(self, context):
@@ -693,7 +693,7 @@ class VIEW3D_MT_POSE_group(bpy.types.Menu):
 		
 		
 class VIEW3D_MT_POSE_ik(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Inverse Kinematics"
 
 	def draw(self, context):
@@ -703,7 +703,7 @@ class VIEW3D_MT_POSE_ik(bpy.types.Menu):
 		layout.itemO("pose.ik_clear")
 		
 class VIEW3D_MT_POSE_constraints(bpy.types.Menu):
-	__space_type__ = "VIEW_3D"
+	__space_type__ = 'VIEW_3D'
 	__label__ = "Constraints"
 
 	def draw(self, context):
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 0535ae131bc..bbb10991564 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -774,8 +774,8 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
 		{OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", ""},
 		{OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", ""},
 		{OB_BOUND_CONE, "CONE", 0, "Cone", ""},
-		{OB_BOUND_POLYH, "CONVEX_HULL", 0, "Convex Hull", ""},
-		{OB_BOUND_POLYT, "TRIANGLE_MESH", 0, "Triangle Mesh", ""},
+		{OB_BOUND_POLYT, "CONVEX_HULL", 0, "Convex Hull", ""},
+		{OB_BOUND_POLYH, "TRIANGLE_MESH", 0, "Triangle Mesh", ""},
 		//{OB_DYN_MESH, "DYNAMIC_MESH", 0, "Dynamic Mesh", ""},
 		{0, NULL, 0, NULL, NULL}};
 

From 83e9144ff0e077c2d9ffd3c0e1b0c2327eb3e497 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Tue, 1 Sep 2009 17:10:56 +0000
Subject: [PATCH 385/577] 2.5

Background picture used bad scissor/viewport code, causing bad drawing
on tool region.
---
 source/blender/editors/space_view3d/view3d_draw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 4ca1f296f15..66113ec4941 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1421,7 +1421,8 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d)
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	
-	glaDefine2DArea(&ar->winrct);
+//	glaDefine2DArea(&ar->winrct);
+	ED_region_pixelspace(ar);
 	
 	glEnable(GL_BLEND);
 	

From 3bc5d87e5001453f05f9f14c0326dc87727982fa Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Tue, 1 Sep 2009 17:31:33 +0000
Subject: [PATCH 386/577] 2.5

Bugfix: new ALT+LMB pan in 2d windows hanged eternally; the modal keymaps
didnt support this yet. Is on todo; but fix is easy for now.

Also don't know if this is the right way to do it... systems with MMB can
also get it as macro (like action mouse, select mouse).
---
 source/blender/editors/interface/view2d_ops.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index 1e8cda68e6d..f3610769d17 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -235,6 +235,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
 		}
 			break;
 			
+		case LEFTMOUSE:
 		case MIDDLEMOUSE:
 			if (event->val==0) {
 				/* calculate overall delta mouse-movement for redo */
@@ -826,6 +827,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
 		}
 			break;
 			
+		case LEFTMOUSE:
 		case MIDDLEMOUSE:
 			if (event->val==0) {
 				/* for redo, store the overall deltas - need to respect zoom-locks here... */

From 3f5115064aea902b3f6886dc688e7a20d771a212 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 1 Sep 2009 23:32:34 +0000
Subject: [PATCH 387/577] == SCons ==

* Add BGE_CXXFLAGS so we can get rid of hard-coded BGE compiler settings. This was only done for windows, but now linuxers and osxers should be able to set BGE-specific optimisation too. See the windows default configs for example.
---
 config/win32-vc-config.py                            |  1 +
 config/win64-vc-config.py                            |  1 +
 source/gameengine/BlenderRoutines/SConscript         |  8 +-------
 source/gameengine/Converter/SConscript               |  2 +-
 source/gameengine/Expressions/SConscript             |  8 +-------
 source/gameengine/GameLogic/SConscript               |  6 +-----
 source/gameengine/GamePlayer/common/SConscript       |  8 +-------
 source/gameengine/GamePlayer/ghost/SConscript        | 12 +++---------
 source/gameengine/Ketsji/KXNetwork/SConscript        |  9 +--------
 source/gameengine/Ketsji/SConscript                  |  6 +-----
 source/gameengine/Physics/Bullet/SConscript          |  8 +-------
 source/gameengine/Physics/common/SConscript          |  8 +-------
 .../Rasterizer/RAS_OpenGLRasterizer/SConscript       |  8 +-------
 source/gameengine/Rasterizer/SConscript              |  8 +-------
 source/gameengine/SceneGraph/SConscript              |  8 +-------
 source/gameengine/VideoTexture/SConscript            |  7 +------
 tools/btools.py                                      |  2 ++
 17 files changed, 20 insertions(+), 90 deletions(-)

diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index c50f41b6d4b..5c4342d4f30 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -149,6 +149,7 @@ CXX = 'cl.exe'
 
 CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index ed08e578df8..abc90c84f33 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -163,6 +163,7 @@ CXX = 'cl.exe'
 CFLAGS = []
 CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index eb5f2a76e10..dc5a93a2e48 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -28,10 +28,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc','win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 45] , cxx_compileflags=cxxflags)
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 45] , cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 7d3185605d5..9164a9f6d78 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -23,4 +23,4 @@ incs += ' #source/blender/makesrna'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,50] )
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,50], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index 69f87ffbb90..dc9c184fd8a 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -6,10 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
 incs += ' ' + env['BF_PYTHON_INC']
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,120], cxx_compileflags=cxxflags)
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,120], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 837769e5e78..f259a338dc0 100644
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -17,12 +17,8 @@ if env['WITH_BF_SDL']:
 else:
 	defs.append('DISABLE_SDL')
 
-cxxflags = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG')
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 100], cxx_compileflags=cxxflags )
+env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 100], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 1942cde2531..3ac2576b46d 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -62,10 +62,4 @@ incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, cxx_compileflags=cxxflags)
+env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index 83bc61381c0..ce8b07b9393 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -42,14 +42,8 @@ incs = ['.',
 
 incs += Split(env['BF_PYTHON_INC'])
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-defs = ''
+defs = []
 if env['WITH_BF_FFMPEG']:
-    defs += ' WITH_FFMPEG'
+    defs.append('WITH_FFMPEG')
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = Split(defs), libtype='player',priority=5, cxx_compileflags=cxxflags)
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype='player',priority=5, cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index e6584b55ed2..ce4a29b9492 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -9,11 +9,4 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 145], cxx_compileflags=cxxflags )
+env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 145], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index d3b67cfdb11..ea9d32fa0bf 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -29,12 +29,8 @@ if  env['WITH_BF_SDL']:
 else:
 	defs.append('DISABLE_SDL')
 	
-cxxflags = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG') # for Python
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 60], cxx_compileflags = cxxflags )
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 60], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 44b75402630..0b797c2cb8b 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -21,10 +21,4 @@ incs += ' #intern/guardedalloc'
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_PYTHON_INC']
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,80], cxx_compileflags=cxxflags )
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,80], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index 447b0ec1bbb..8b373ec830c 100644
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -5,10 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp P
 
 incs = '. ../Dummy #intern/moto/include'
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags = cxxflags )
+env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index e206c90ea25..963c6616b64 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -8,10 +8,4 @@ incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
 incs += ' #intern/guardedalloc #source/blender/blenlib'
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 115], cxx_compileflags = cxxflags )
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 115], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 255131f9a44..c2af14e8ce5 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -7,10 +7,4 @@ sources = env.Glob('*.cpp')
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
 incs += ' ' + env['BF_PYTHON_INC']
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,115], cxx_compileflags = cxxflags )
+env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,115], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index b3db50117f1..8f433a21e49 100644
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -6,10 +6,4 @@ sources = env.Glob('*.cpp')
 
 incs = '. #intern/moto/include'
 
-cxxflags = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
-
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,125], cxx_compileflags = cxxflags )
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,125], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index d6b78f6d1a6..583ccf29dbd 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -15,15 +15,10 @@ incs += ' #source/blender/gpu #source/kernel/gen_system #intern/string #intern/m
 incs += ' #intern/guardedalloc #extern/glew/include'
 
 defs = [] 
-cxxflags = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	cxxflags.append ('/GR')
-	cxxflags.append ('/O2')
-	cxxflags.append ('/EHsc')
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG')
 
-
 incs += ' ' + env['BF_PYTHON_INC']
 #incs += ' ' + env['BF_OPENGL_INC']
 
@@ -32,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
     defs.append('__STDC_CONSTANT_MACROS')
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 72], cxx_compileflags = cxxflags )
+env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 72], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/tools/btools.py b/tools/btools.py
index 1ae952adbc7..580a457e3a0 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -77,6 +77,7 @@ def validate_arguments(args, bc):
 			'BF_OPENGL_LINKFLAGS',
 			'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
 			'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
+			'BGE_CXXFLAGS',
 			'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
 			'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
 			'C_WARN', 'CC_WARN', 'CXX_WARN',
@@ -333,6 +334,7 @@ def read_opts(cfg, args):
 		('CFLAGS', 'C only flags', ''),
 		('CCFLAGS', 'Generic C and C++ flags', ''),
 		('CXXFLAGS', 'C++ only flags', ''),
+		('BGE_CXXFLAGS', 'C++ only flags for BGE', ''),
 		('CPPFLAGS', 'Defines', ''),
 		('REL_CFLAGS', 'C only release flags', ''),
 		('REL_CCFLAGS', 'Generic C and C++ release flags', ''),

From d89e1eb437e7a78cc91cb71d25bfc30f93f272b3 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 1 Sep 2009 23:43:00 +0000
Subject: [PATCH 388/577] * BGE optimisation tweaks.

---
 config/win32-vc-config.py | 2 +-
 config/win64-vc-config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 5c4342d4f30..1e993565e98 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -149,7 +149,7 @@ CXX = 'cl.exe'
 
 CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index abc90c84f33..ce2fd8cd405 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -163,7 +163,7 @@ CXX = 'cl.exe'
 CFLAGS = []
 CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE2']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 

From f77fc5c3c9461dce9c694e35db736777214f8b2d Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 2 Sep 2009 00:07:55 +0000
Subject: [PATCH 389/577] support for multiple file: linked libraries

---
 release/io/netrender/client.py |   2 +-
 release/io/netrender/master.py | 207 ++++++++++++++++++++-------------
 release/io/netrender/slave.py  |  20 +---
 release/io/netrender/utils.py  |  52 +++++++--
 4 files changed, 172 insertions(+), 109 deletions(-)

diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
index bc4d363c996..59cb19c2075 100644
--- a/release/io/netrender/client.py
+++ b/release/io/netrender/client.py
@@ -69,7 +69,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			x= int(r.resolution_x*r.resolution_percentage*0.01)
 			y= int(r.resolution_y*r.resolution_percentage*0.01)
 			
-			f = open(netsetting.path + "output.exr", "wb")
+			f = open(netsettings.path + "output.exr", "wb")
 			buf = response.read(1024)
 			
 			while buf:
diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
index 6f97685935d..6f360a4e7a9 100644
--- a/release/io/netrender/master.py
+++ b/release/io/netrender/master.py
@@ -46,8 +46,6 @@ class MRenderJob(netrender.model.RenderJob):
 		self.id = job_id
 		self.name = name
 		self.files = files
-		self.render_files = [MRenderFile(path) for path in files]
-		self.status = JOB_WAITING
 		self.frames = []
 		self.chunks = chunks
 		self.priority = priority
@@ -55,8 +53,19 @@ class MRenderJob(netrender.model.RenderJob):
 		self.blacklist = blacklist
 		self.last_dispatched = time.time()
 	
+		# special server properties
+		self.save_path = ""
+		self.files_map = {path: MRenderFile(path) for path in files}
+		self.status = JOB_WAITING
+	
+	def save(self):
+		if self.save_path:
+			f = open(self.save_path + "job.txt", "w")
+			f.write(repr(self.serialize()))
+			f.close()
+	
 	def testStart(self):
-		for f in self.render_files:
+		for f in self.files_map.values():
 			if not f.test():
 				return False
 		
@@ -184,7 +193,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 						self.send_head(http.client.ACCEPTED)
 					elif frame.status == DONE:
 						self.server.stats("", "Sending result back to client")
-						f = open(self.server.path + job_id + "%04d" % job_frame + ".exr", 'rb')
+						f = open(job.save_path + "%04d" % job_frame + ".exr", 'rb')
 						
 						self.send_head()
 						
@@ -215,7 +224,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 						self.send_head(http.client.PROCESSING)
 					else:
 						self.server.stats("", "Sending log back to client")
-						f = open(self.server.path + job_id + "%04d" % job_frame + ".log", 'rb')
+						f = open(job.save_path + "%04d" % job_frame + ".log", 'rb')
 						
 						self.send_head()
 						
@@ -270,8 +279,6 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			
 			print("slave-id", slave_id)
 			
-			self.server.getSlave(slave_id)
-			
 			slave = self.server.updateSlave(slave_id)
 			
 			if slave: # only if slave id is valid
@@ -297,22 +304,35 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "file":
-			job_id = self.headers['job-id']
-			print("file:", job_id, "\n")
+			slave_id = self.headers['slave-id']
 			
-			job = self.server.getJobByID(job_id)
+			slave = self.server.updateSlave(slave_id)
 			
-			if job:
-				self.send_head(headers={"job-id": job.id})
+			if slave: # only if slave id is valid
+				job_id = self.headers['job-id']
+				job_file = self.headers['job-file']
+				print("job:", job_id, "\n")
+				print("file:", job_file, "\n")
 				
-				self.server.stats("", "Sending file to render node")
-				f = open(self.server.path + job.id + ".blend", 'rb')
+				job = self.server.getJobByID(job_id)
 				
-				shutil.copyfileobj(f, self.wfile)
-				
-				f.close()
-			else:
-				# no such job id
+				if job:
+					render_file = job.files_map.get(job_file, None)
+					
+					if render_file:
+						self.server.stats("", "Sending file to render node")
+						f = open(render_file.path, 'rb')
+						
+						shutil.copyfileobj(f, self.wfile)
+						
+						f.close()
+					else:
+						# no such file
+						self.send_head(http.client.NO_CONTENT)
+				else:
+					# no such job id
+					self.send_head(http.client.NO_CONTENT)
+			else: # invalid slave id
 				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "slave":
@@ -345,14 +365,15 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			
 			job_id = self.server.nextJobID()
 			
-			print("chunks", job_info.chunks)
+			print(job_info.files)
 			
 			job = MRenderJob(job_id, job_info.name, job_info.files, chunks = job_info.chunks, priority = job_info.priority, blacklist = job_info.blacklist)
-			self.server.addJob(job)
 			
 			for frame in job_info.frames:
 				frame = job.addFrame(frame.number)
-				
+			
+			self.server.addJob(job)
+			
 			headers={"job-id": job_id}
 			
 			if job.testStart():
@@ -411,86 +432,100 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			self.server.stats("", "Receiving job")
 			
 			length = int(self.headers['content-length'])
-			job_frame_string = self.headers['job-frame']
-			job_name = self.headers.get('job-name', "")
-			job_chunks = int(self.headers.get('job-chunks', "1"))
-			blacklist = self.headers.get('slave-blacklist', '').split()
+			job_id = self.headers['job-id']
+			job_file = self.headers['job-file']
 			
-			job_id = self.server.nextJobID()
+			job = self.server.getJobByID(job_id)
 			
-			buf = self.rfile.read(length)
-			
-			job_path = job_id + ".blend"
-			
-			f = open(self.server.path + job_path, "wb")
-			f.write(buf)
-			f.close()
-			del buf
-			
-			job = MRenderJob(job_id, job_name, job_path, chunks = job_chunks, blacklist = blacklist)
-			self.server.addJob(job)
+			if job:
 				
-			if ":" in job_frame_string:
-				frame_start, frame_end = [int(x) for x in job_frame_string.split(":")]
+				render_file = job.files_map.get(job_file, None)
 				
-				for job_frame in range(frame_start, frame_end + 1):
-					frame = job.addFrame(job_frame)
-			else:
-				job_frame = int(job_frame_string)
-				frame = job.addFrame(job_frame)
-	
-			job.start()
-			
-			self.send_head(headers={"job-id": job_id})
+				if render_file:
+					main_file = job.files[0]
+					
+					main_path, main_name = os.path.split(main_file)
+					
+					if job_file != main_file:
+						file_path = prefixPath(job.save_path, job_file, main_path)
+					else:
+						file_path = job.save_path + main_name
+					
+					buf = self.rfile.read(length)
+					
+					f = open(file_path, "wb")
+					f.write(buf)
+					f.close()
+					del buf
+					
+					render_file.path = file_path # set the new path
+					
+					if job.testStart():
+						self.send_head(headers=headers)
+					else:
+						self.send_head(http.client.ACCEPTED, headers=headers)
+				else: # invalid file
+					self.send_head(http.client.NO_CONTENT)
+			else: # job not found
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "render":
 			print("writing result file")
 			self.server.stats("", "Receiving render result")
 			
 			job_id = self.headers['job-id']
-			job_frame = int(self.headers['job-frame'])
-			job_result = int(self.headers['job-result'])
-			job_time = float(self.headers['job-time'])
 			
-			if job_result == DONE:
-				length = int(self.headers['content-length'])
-				buf = self.rfile.read(length)
-				f = open(self.server.path + job_id + "%04d" % job_frame + ".exr", 'wb')
-				f.write(buf)
-				f.close()
-				
-				del buf
-				
 			job = self.server.getJobByID(job_id)
-			frame = job[job_frame]
-			frame.status = job_result
-			frame.time = job_time
-	
-			self.server.updateSlave(self.headers['slave-id'])
 			
-			self.send_head()
+			if job:
+				job_frame = int(self.headers['job-frame'])
+				job_result = int(self.headers['job-result'])
+				job_time = float(self.headers['job-time'])
+				
+				if job_result == DONE:
+					length = int(self.headers['content-length'])
+					buf = self.rfile.read(length)
+					f = open(job.save_path + "%04d" % job_frame + ".exr", 'wb')
+					f.write(buf)
+					f.close()
+					
+					del buf
+					
+				job = self.server.getJobByID(job_id)
+				frame = job[job_frame]
+				frame.status = job_result
+				frame.time = job_time
+		
+				self.server.updateSlave(self.headers['slave-id'])
+				
+				self.send_head()
+			else: # job not found
+				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "log":
 			print("writing log file")
 			self.server.stats("", "Receiving log file")
 			
-			length = int(self.headers['content-length'])
 			job_id = self.headers['job-id']
-			job_frame = int(self.headers['job-frame'])
 			
-			print("log length:", length)
+			job = self.server.getJobByID(job_id)
 			
-			buf = self.rfile.read(length)
-			f = open(self.server.path + job_id + "%04d" % job_frame + ".log", 'wb')
-			f.write(buf)
-			f.close()
+			if job:
+				length = int(self.headers['content-length'])
+				job_frame = int(self.headers['job-frame'])
 				
-			del buf
-			
-			self.server.updateSlave(self.headers['slave-id'])
-			
-			self.send_head()
-
+				buf = self.rfile.read(length)
+				f = open(job.save_path + "%04d" % job_frame + ".log", 'wb')
+				f.write(buf)
+				f.close()
+					
+				del buf
+				
+				self.server.updateSlave(self.headers['slave-id'])
+				
+				self.send_head()
+			else: # job not found
+				self.send_head(http.client.NO_CONTENT)
 
 class RenderMasterServer(http.server.HTTPServer):
 	def __init__(self, address, handler_class, path):
@@ -500,7 +535,10 @@ class RenderMasterServer(http.server.HTTPServer):
 		self.slaves = []
 		self.slaves_map = {}
 		self.job_id = 0
-		self.path = path
+		self.path = path + "master_" + str(os.getpid()) + os.sep
+		
+		if not os.path.exists(self.path):
+			os.mkdir(self.path)
 	
 	def nextJobID(self):
 		self.job_id += 1
@@ -539,6 +577,13 @@ class RenderMasterServer(http.server.HTTPServer):
 	def addJob(self, job):
 		self.jobs.append(job)
 		self.jobs_map[job.id] = job
+		
+		# create job directory
+		job.save_path = self.path + "job_" + job.id + os.sep
+		if not os.path.exists(job.save_path):
+			os.mkdir(job.save_path)
+			
+		job.save()
 	
 	def getJobByID(self, id):
 		return self.jobs_map.get(id, None)
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
index 64801743d70..3d7153a0c54 100644
--- a/release/io/netrender/slave.py
+++ b/release/io/netrender/slave.py
@@ -27,24 +27,10 @@ def testCancel(conn, job_id):
 			return False
 
 def testFile(conn, JOB_PREFIX, file_path, main_path = None):
-	if os.path.isabs(file_path):
-		# if an absolute path, make sure path exists, if it doesn't, use relative local path
-		job_full_path = file_path
-		if not os.path.exists(job_full_path):
-			p, n = os.path.split(job_full_path)
-			
-			if main_path and p.startswith(main_path):
-				directory = JOB_PREFIX + p[len(main_path):]
-				job_full_path = directory + n
-				if not os.path.exists(directory):
-					os.mkdir(directory)
-			else:
-				job_full_path = JOB_PREFIX + n
-	else:
-		job_full_path = JOB_PREFIX + file_path
+	job_full_path = prefixPath(JOB_PREFIX, file_path, main_path)
 	
 	if not os.path.exists(job_full_path):
-		conn.request("GET", "file", headers={"job-id": job.id, "slave-id":slave_id})
+		conn.request("GET", "file", headers={"job-id": job.id, "slave-id":slave_id, "job-file":file_path})
 		response = conn.getresponse()
 		
 		if response.status != http.client.OK:
@@ -76,7 +62,7 @@ def render_slave(engine, scene):
 		
 		slave_id = response.getheader("slave-id")
 		
-		NODE_PREFIX = netsettings.path + "node_" + slave_id + os.sep
+		NODE_PREFIX = netsettings.path + "slave_" + slave_id + os.sep
 		if not os.path.exists(NODE_PREFIX):
 			os.mkdir(NODE_PREFIX)
 	
diff --git a/release/io/netrender/utils.py b/release/io/netrender/utils.py
index d64b6fcda1e..30d96b2f92f 100644
--- a/release/io/netrender/utils.py
+++ b/release/io/netrender/utils.py
@@ -53,11 +53,22 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 	filename = bpy.data.filename
 	job.files.append(filename)
 	
-	name = netsettings.job_name
-	if name == "[default]":
-		path, name = os.path.split(filename)
+	job_name = netsettings.job_name
+	path, name = os.path.split(filename)
+	if job_name == "[default]":
+		job_name = name
 	
-	job.name = name
+	for lib in bpy.data.libraries:
+		lib_path = lib.filename
+		
+		if lib_path.startswith("//"):
+			lib_path = path + os.sep + lib_path[2:]
+			
+		job.files.append(lib_path)
+	
+	print(job.files)
+	
+	job.name = job_name
 	
 	for slave in scene.network_render.slaves_blacklist:
 		job.blacklist.append(slave.id)
@@ -71,12 +82,13 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 	
 	job_id = response.getheader("job-id")
 	
-	# if not found, send whole file
-	if response.status == http.client.NOT_FOUND:
-		f = open(bpy.data.filename, "rb")
-		conn.request("PUT", "file", f, headers={"job-id": job_id})
-		f.close()
-		response = conn.getresponse()
+	# if not ACCEPTED (but not processed), send files
+	if response.status == http.client.ACCEPTED:
+		for filepath in job.files:
+			f = open(filepath, "rb")
+			conn.request("PUT", "file", f, headers={"job-id": job_id, "job-file": filepath})
+			f.close()
+			response = conn.getresponse()
 	
 	# server will reply with NOT_FOUD until all files are found
 	
@@ -84,3 +96,23 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 
 def clientRequestResult(conn, scene, job_id):
 	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(scene.current_frame)})
+
+
+def prefixPath(prefix_directory, file_path, prefix_path):
+	if os.path.isabs(file_path):
+		# if an absolute path, make sure path exists, if it doesn't, use relative local path
+		full_path = file_path
+		if not os.path.exists(full_path):
+			p, n = os.path.split(full_path)
+			
+			if main_path and p.startswith(main_path):
+				directory = prefix_directory + p[len(main_path):]
+				full_path = directory + n
+				if not os.path.exists(directory):
+					os.mkdir(directory)
+			else:
+				full_path = prefix_directory + n
+	else:
+		full_path = prefix_directory + file_path
+	
+	return full_path
\ No newline at end of file

From bd7d26993f32bda6f0c0ca81e1455fb9f55418e3 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Wed, 2 Sep 2009 00:42:12 +0000
Subject: [PATCH 390/577] 2.5 - Rotation Order Tweaks for Armature Bones

* All tools where rotation order matters for armature bones have now been adjusted to use the new code

* Transform now uses the new code for bones too. However, there are some jumping issues here that I'm not too sure how to solve yet. Help fixing this is welcome.
---
 source/blender/blenlib/BLI_arithb.h           |  3 +-
 source/blender/blenlib/intern/arithb.c        | 74 +++++++++++++++++--
 source/blender/editors/animation/keyframing.c |  2 +-
 source/blender/editors/armature/poseobject.c  | 20 +++--
 .../editors/space_view3d/view3d_buttons.c     |  4 +-
 source/blender/editors/transform/transform.c  | 16 ++--
 source/blender/editors/transform/transform.h  |  1 +
 .../editors/transform/transform_conversions.c | 31 +++++---
 8 files changed, 113 insertions(+), 38 deletions(-)

diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 4156e3c52ec..5f3622e8aa5 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -193,6 +193,7 @@ typedef enum eEulerRotationOrders {
 } eEulerRotationOrders;
 
 void EulOToQuat(float eul[3], short order, float quat[4]);
+void QuatToEulO(float quat[4], float eul[3], short order);
 
 void EulOToMat3(float eul[3], short order, float Mat[3][3]);
 void EulOToMat4(float eul[3], short order, float Mat[4][4]);
@@ -200,7 +201,7 @@ void EulOToMat4(float eul[3], short order, float Mat[4][4]);
 void Mat3ToEulO(float Mat[3][3], float eul[3], short order);
 void Mat4ToEulO(float Mat[4][4], float eul[3], short order);
 
-void QuatToEulO(float quat[4], float eul[3], short order);
+void Mat3ToCompatibleEulO(float mat[3][3], float eul[3], float oldrot[3], short order);
  
 /**
  * @section Euler conversion routines (Blender XYZ)
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index e0f17864d73..64fb7d78ef1 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2825,7 +2825,8 @@ static RotOrderInfo rotOrders[]= {
  * NOTE: since we start at 1 for the values, but arrays index from 0, 
  *		 there is -1 factor involved in this process...
  */
-#define GET_ROTATIONORDER_INFO(order) (&rotOrders[(order)-1])
+// FIXME: what happens when invalid order given
+#define GET_ROTATIONORDER_INFO(order) (((order)>=1) ? &rotOrders[(order)-1] : &rotOrders[0])
 
 /* Construct quaternion from Euler angles (in radians). */
 void EulOToQuat(float e[3], short order, float q[4])
@@ -2857,6 +2858,15 @@ void EulOToQuat(float e[3], short order, float q[4])
 	if (R->parity) q[j] = -q[j];
 }
 
+/* Convert quaternion to Euler angles (in radians). */
+void QuatToEulO(float q[4], float e[3], short order)
+{
+	float M[3][3];
+	
+	QuatToMat3(q, M);
+	Mat3ToEulO(M, e, order);
+}
+
 /* Construct 3x3 matrix from Euler angles (in radians). */
 void EulOToMat3(float e[3], short order, float M[3][3])
 {
@@ -2929,15 +2939,65 @@ void Mat4ToEulO(float M[4][4], float e[3], short order)
 	Mat3ToEulO(m, e, order);
 }
 
-/* Convert quaternion to Euler angles (in radians). */
-void QuatToEulO(float q[4], float e[3], short order)
+/* returns two euler calculation methods, so we can pick the best */
+static void mat3_to_eulo2(float M[3][3], float *e1, float *e2, short order)
 {
-	float M[3][3];
+	RotOrderInfo *R= GET_ROTATIONORDER_INFO(order); 
+	short i=R->i,  j=R->j, 	k=R->k;
+	double cy = sqrt(M[i][i]*M[i][i] + M[j][i]*M[j][i]);
 	
-	QuatToMat3(q, M);
-	Mat3ToEulO(M, e, order);
+	if (cy > 16*FLT_EPSILON) {
+		e1[0] = atan2(M[j][k], M[k][k]);
+		e1[1] = atan2(-M[i][k], cy);
+		e1[2] = atan2(M[i][j], M[i][i]);
+		
+		e2[0] = atan2(-M[j][k], -M[k][k]);
+		e2[1] = atan2(-M[i][k], -cy);
+		e2[2] = atan2(-M[i][j], -M[i][i]);
+	} 
+	else {
+		e1[0] = atan2(-M[k][j], M[j][j]);
+		e1[1] = atan2(-M[i][k], cy);
+		e1[2] = 0;
+		
+		VecCopyf(e2, e1);
+	}
+	
+	if (R->parity) {
+		e1[0] = -e1[0]; 
+		e1[1] = -e1[1]; 
+		e1[2] = -e1[2];
+		
+		e2[0] = -e2[0]; 
+		e2[1] = -e2[1]; 
+		e2[2] = -e2[2];
+	}
 }
 
+/* uses 2 methods to retrieve eulers, and picks the closest */
+// FIXME: this does not work well with the other rotation modes...
+void Mat3ToCompatibleEulO(float mat[3][3], float eul[3], float oldrot[3], short order)
+{
+	float eul1[3], eul2[3];
+	float d1, d2;
+	
+	mat3_to_eulo2(mat, eul1, eul2, order);
+	
+	compatible_eul(eul1, oldrot);
+	compatible_eul(eul2, oldrot);
+	
+	d1= (float)fabs(eul1[0]-oldrot[0]) + (float)fabs(eul1[1]-oldrot[1]) + (float)fabs(eul1[2]-oldrot[2]);
+	d2= (float)fabs(eul2[0]-oldrot[0]) + (float)fabs(eul2[1]-oldrot[1]) + (float)fabs(eul2[2]-oldrot[2]);
+	
+	/* return best, which is just the one with lowest difference */
+	if (d1 > d2)
+		VecCopyf(eul, eul2);
+	else
+		VecCopyf(eul, eul1);
+}
+
+
+
 /* ************ EULER (old XYZ) *************** */
 
 /* XYZ order */
@@ -3102,7 +3162,7 @@ void euler_rot(float *beul, float ang, char axis)
 }
 
 /* exported to transform.c */
-/* XYZ order */
+/* order independent! */
 void compatible_eul(float *eul, float *oldrot)
 {
 	float dx, dy, dz;
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index dc73011549c..5f444609baa 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -704,7 +704,7 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_
 			float eul[3];
 			
 			/* euler-rotation test before standard rotation, as standard rotation does quats */
-			Mat4ToEul(tmat, eul);
+			Mat4ToEulO(tmat, eul, pchan->rotmode);
 			return eul[array_index];
 		}
 		else if (strstr(identifier, "rotation")) {
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 5b378878f91..9a72fce2bcf 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -760,6 +760,7 @@ void pose_copy_menu(Scene *scene)
 						break;
 					case 2: /* Local Rotation */
 						QUATCOPY(pchan->quat, pchanact->quat);
+						VECCOPY(pchan->eul, pchanact->eul);
 						break;
 					case 3: /* Local Size */
 						VECCOPY(pchan->size, pchanact->size);
@@ -808,11 +809,14 @@ void pose_copy_menu(Scene *scene)
 						break;
 					case 10: /* Visual Rotation */
 					{
-						float delta_mat[4][4], quat[4];
+						float delta_mat[4][4];
 						
 						armature_mat_pose_to_bone(pchan, pchanact->pose_mat, delta_mat);
-						Mat4ToQuat(delta_mat, quat);
-						QUATCOPY(pchan->quat, quat);
+						
+						if (pchan->rotmode > 0) 
+							Mat4ToEulO(delta_mat, pchan->eul, pchan->rotmode);
+						else
+							Mat4ToQuat(delta_mat, pchan->quat);
 					}
 						break;
 					case 11: /* Visual Size */
@@ -990,20 +994,20 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 				/* check if rotation modes are compatible (i.e. do they need any conversions) */
 				if (pchan->rotmode == chan->rotmode) {
 					/* copy the type of rotation in use */
-					if (pchan->rotmode) {
+					if (pchan->rotmode > 0) {
 						VECCOPY(pchan->eul, chan->eul);
 					}
 					else {
 						QUATCOPY(pchan->quat, chan->quat);
 					}
 				}
-				else if (pchan->rotmode) {
+				else if (pchan->rotmode > 0) {
 					/* quat to euler */
-					QuatToEul(chan->quat, pchan->eul);
+					QuatToEulO(chan->quat, pchan->eul, pchan->rotmode);
 				}
 				else {
 					/* euler to quat */
-					EulToQuat(chan->eul, pchan->quat);
+					EulOToQuat(chan->eul, chan->rotmode, pchan->quat);
 				}
 				
 				/* paste flipped pose? */
@@ -1011,7 +1015,7 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 					pchan->loc[0]*= -1;
 					
 					/* has to be done as eulers... */
-					if (pchan->rotmode) {
+					if (pchan->rotmode > 0) {
 						pchan->eul[1] *= -1;
 						pchan->eul[2] *= -1;
 					}
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 2fbe7e5db79..7c305d59866 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -512,7 +512,7 @@ static void v3d_posearmature_buts(uiBlock *block, View3D *v3d, Object *ob, float
 	uiButSetFunc(but, validate_bonebutton_cb, bone, NULL);
 	uiButSetCompleteFunc(but, autocomplete_bone, (void *)ob);
 
-	QuatToEul(pchan->quat, tfp->ob_eul);
+	QuatToEulO(pchan->quat, tfp->ob_eul, pchan->rotmode); // XXX?
 	tfp->ob_eul[0]*= 180.0/M_PI;
 	tfp->ob_eul[1]*= 180.0/M_PI;
 	tfp->ob_eul[2]*= 180.0/M_PI;
@@ -841,7 +841,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 			eul[0]= M_PI*tfp->ob_eul[0]/180.0;
 			eul[1]= M_PI*tfp->ob_eul[1]/180.0;
 			eul[2]= M_PI*tfp->ob_eul[2]/180.0;
-			EulToQuat(eul, pchan->quat);
+			EulOToQuat(eul, pchan->rotmode, pchan->quat); // xxx?
 		}
 		/* no break, pass on */
 	case B_ARMATUREPANEL2:
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 4a376f35552..f0de28476f0 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2670,21 +2670,21 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				/* this function works on end result */
 				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
 			}
-			else { // TODO: need some methods for the new euler types...
+			else { 
 				float eulmat[3][3];
-
+				
 				Mat3MulMat3(totmat, mat, td->mtx);
 				Mat3MulMat3(smat, td->smtx, totmat);
-
+				
 				/* calculate the total rotatation in eulers */
 				VECCOPY(eul, td->ext->irot);
-				EulToMat3(eul, eulmat);
-
+				EulOToMat3(eul, td->rotOrder, eulmat);
+				
 				/* mat = transform, obmat = bone rotation */
 				Mat3MulMat3(fmat, smat, eulmat);
-
-				Mat3ToCompatibleEul(fmat, eul, td->ext->rot);
-
+				
+				Mat3ToCompatibleEulO(fmat, eul, td->ext->rot, td->rotOrder);
+				
 				/* and apply (to end result only) */
 				protectedRotateBits(td->protectflag, eul, td->ext->irot);
 				VECCOPY(td->ext->rot, eul);
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index efa60b15293..e5bd405c0cd 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -199,6 +199,7 @@ typedef struct TransData {
 	void  *extra;		 /* extra data (mirrored element pointer, in editmode mesh to EditVert) (editbone for roll fixing) (...) */
     short  flag;         /* Various flags */
 	short  protectflag;	 /* If set, copy of Object or PoseChannel protection */
+	int    rotOrder;	/* rotation order (for eulers), as defined in BLI_arithb.h */
 } TransData;
 
 typedef struct MouseInput {
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 86d3af31c85..e0dfd90a3d1 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -502,22 +502,29 @@ static short apply_targetless_ik(Object *ob)
 
 				/* apply and decompose, doesn't work for constraints or non-uniform scale well */
 				{
-					float rmat3[3][3], qmat[3][3], imat[3][3], smat[3][3];
+					float rmat3[3][3], qrmat[3][3], imat[3][3], smat[3][3];
 
 					Mat3CpyMat4(rmat3, rmat);
-
-					/* quaternion */
-					Mat3ToQuat(rmat3, parchan->quat);
-
+					
+					/* rotation */
+					if (parchan->rotmode > 0) 
+						Mat3ToEulO(rmat3, parchan->eul, parchan->rotmode);
+					else
+						Mat3ToQuat(rmat3, parchan->quat);
+					
 					/* for size, remove rotation */
 					/* causes problems with some constraints (so apply only if needed) */
 					if (data->flag & CONSTRAINT_IK_STRETCH) {
-						QuatToMat3(parchan->quat, qmat);
-						Mat3Inv(imat, qmat);
+						if (parchan->rotmode > 0)
+							EulOToMat3(parchan->eul, parchan->rotmode, qrmat);
+						else
+							QuatToMat3(parchan->quat, qrmat);
+						
+						Mat3Inv(imat, qrmat);
 						Mat3MulMat3(smat, rmat3, imat);
 						Mat3ToSize(smat, parchan->size);
 					}
-
+					
 					/* causes problems with some constraints (e.g. childof), so disable this */
 					/* as it is IK shouldn't affect location directly */
 					/* VECCOPY(parchan->loc, rmat[3]); */
@@ -568,18 +575,20 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 	td->ext->size= pchan->size;
 	VECCOPY(td->ext->isize, pchan->size);
 
-	if (pchan->rotmode) {
+	if (pchan->rotmode > 0) {
 		td->ext->rot= pchan->eul;
 		td->ext->quat= NULL;
-
+		
 		VECCOPY(td->ext->irot, pchan->eul);
+		td->rotOrder= pchan->rotmode;
 	}
 	else {
 		td->ext->rot= NULL;
 		td->ext->quat= pchan->quat;
-
+		
 		QUATCOPY(td->ext->iquat, pchan->quat);
 	}
+	
 
 	/* proper way to get parent transform + own transform + constraints transform */
 	Mat3CpyMat4(omat, ob->obmat);

From 32b2b1f544661f6dee4a81428b562fe7a3bc3f13 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 2 Sep 2009 01:39:46 +0000
Subject: [PATCH 391/577] Game options like enable physics visualisation,
 nomipmap, displaylists, ignore_deprecation_warnings etc work again.
 space_set_commmandline_options from space.c as game_set_commmandline_options

---
 .../editors/space_view3d/view3d_view.c        | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index c61b2f0f31d..de8166b372b 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -81,6 +81,10 @@
 
 #include "PIL_time.h" /* smoothview */
 
+#if GAMEBLENDER == 1
+#include "SYS_System.h"
+#endif
+
 #include "view3d_intern.h"	// own include
 
 /* use this call when executing an operator,
@@ -1442,6 +1446,56 @@ static void RestoreState(bContext *C)
 	glPopAttrib();
 }
 
+/* was space_set_commmandline_options in 2.4x */
+void game_set_commmandline_options(GameData *gm)
+{
+	SYS_SystemHandle syshandle;
+	int test;
+
+	if ( (syshandle = SYS_GetSystem()) ) {
+		/* User defined settings */
+		test= (U.gameflags & USER_DISABLE_SOUND);
+		/* if user already disabled audio at the command-line, don't re-enable it */
+		if (test)
+			SYS_WriteCommandLineInt(syshandle, "noaudio", test);
+
+		test= (U.gameflags & USER_DISABLE_MIPMAP);
+		GPU_set_mipmap(!test);
+		SYS_WriteCommandLineInt(syshandle, "nomipmap", test);
+
+		/* File specific settings: */
+		/* Only test the first one. These two are switched
+		 * simultaneously. */
+		test= (gm->flag & GAME_SHOW_FRAMERATE);
+		SYS_WriteCommandLineInt(syshandle, "show_framerate", test);
+		SYS_WriteCommandLineInt(syshandle, "show_profile", test);
+
+		test = (gm->flag & GAME_SHOW_FRAMERATE);
+		SYS_WriteCommandLineInt(syshandle, "show_properties", test);
+
+		test= (gm->flag & GAME_SHOW_PHYSICS);
+		SYS_WriteCommandLineInt(syshandle, "show_physics", test);
+
+		test= (gm->flag & GAME_ENABLE_ALL_FRAMES);
+		SYS_WriteCommandLineInt(syshandle, "fixedtime", test);
+
+//		a= (G.fileflags & G_FILE_GAME_TO_IPO);
+//		SYS_WriteCommandLineInt(syshandle, "game2ipo", a);
+
+		test= (gm->flag & GAME_IGNORE_DEPRECATION_WARNINGS);
+		SYS_WriteCommandLineInt(syshandle, "ignore_deprecation_warnings", test);
+
+		test= (gm->matmode == GAME_MAT_MULTITEX);
+		SYS_WriteCommandLineInt(syshandle, "blender_material", test);
+		test= (gm->matmode == GAME_MAT_GLSL);
+		SYS_WriteCommandLineInt(syshandle, "blender_glsl_material", test);
+		test= (gm->flag & GAME_DISPLAY_LISTS);
+		SYS_WriteCommandLineInt(syshandle, "displaylists", test);
+
+
+	}
+}
+
 /* maybe we need this defined somewhere else */
 extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar, int always_use_expand_framing);
 
@@ -1483,6 +1537,8 @@ static int game_engine_exec(bContext *C, wmOperator *unused)
 
 	view3d_operator_needs_opengl(C);
 	
+	game_set_commmandline_options(&startscene->gm);
+
 	SaveState(C);
 	StartKetsjiShell(C, ar, 1);
 	RestoreState(C);

From a0229b21cb5cfc6e263cc2396d5b1e8530d9d38d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 2 Sep 2009 03:14:38 +0000
Subject: [PATCH 392/577] text display (debug info) in the game engine working
 again & other minor changes.

---
 .../BlenderRoutines/KX_BlenderGL.cpp          | 34 ++++++-------------
 .../gameengine/BlenderRoutines/KX_BlenderGL.h |  4 +--
 .../BlenderRoutines/KX_BlenderRenderTools.cpp |  8 ++---
 .../gameengine/Expressions/PyObjectPlus.cpp   |  9 ++---
 4 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
index 5cf696fe146..dba6d1113c9 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
@@ -103,6 +103,8 @@ void BL_SwapBuffers(wmWindow *win)
 
 void DisableForText()
 {
+	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); /* needed for texture fonts otherwise they render as wireframe */
+
 	if(glIsEnabled(GL_BLEND)) glDisable(GL_BLEND);
 	if(glIsEnabled(GL_ALPHA_TEST)) glDisable(GL_ALPHA_TEST);
 
@@ -135,32 +137,25 @@ void DisableForText()
 	}
 }
 
-void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height)
+void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int height)
 {	
 	/* gl prepping */
 	DisableForText();
-	//glDisable(GL_TEXTURE_2D);
 
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadIdentity();
-	
-	glOrtho(0, width,
-			0, height, 0, 1);
-	
+
+	glOrtho(0, width, 0, height, -100, 100);
+
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadIdentity();
-	glMatrixMode(GL_TEXTURE);
-	glPushMatrix();
-	glLoadIdentity();
 
 	/* the actual drawing */
 	glColor3ub(255, 255, 255);
-	BLF_draw_default(xco, height-yco, 0.0f, text);
+	BLF_draw_default(xco, height-yco, 0.0f, (char *)text);
 
-	glMatrixMode(GL_TEXTURE);
-	glPopMatrix();
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
 	glMatrixMode(GL_MODELVIEW);
@@ -168,36 +163,29 @@ void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height
 	glEnable(GL_DEPTH_TEST);
 }
 
-void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int height)
+void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int width, int height)
 {
 	/* This is a rather important line :( The gl-mode hasn't been left
 	 * behind quite as neatly as we'd have wanted to. I don't know
 	 * what cause it, though :/ .*/
 	DisableForText();
-	//glDisable(GL_TEXTURE_2D);
 
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadIdentity();
 	
-	glOrtho(0, width,
-			0, height, 0, 1);
+	glOrtho(0, width, 0, height, -100, 100);
 	
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadIdentity();
-	glMatrixMode(GL_TEXTURE);
-	glPushMatrix();
-	glLoadIdentity();
 
 	/* draw in black first*/
 	glColor3ub(0, 0, 0);
-	BLF_draw_default(xco+1, height-yco-1, 0.0f, text);
+	BLF_draw_default(xco+2, height-yco-2, 0.0f, (char *)text);
 	glColor3ub(255, 255, 255);
-	BLF_draw_default(xco, height-yco, 0.0f, text);
+	BLF_draw_default(xco, height-yco, 0.0f, (char *)text);
 
-	glMatrixMode(GL_TEXTURE);
-	glPopMatrix();
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
 	glMatrixMode(GL_MODELVIEW);
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
index 1e65f29d87c..5c947ff630e 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
@@ -47,8 +47,8 @@ void	BL_HideMouse();
 void	BL_NormalMouse();
 void	BL_WaitMouse();
 
-void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height);
-void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int height);
+void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int height);
+void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int width, int height);
 
 
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index 8ed36e860b4..ee9dae14b9b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -284,12 +284,10 @@ void KX_BlenderRenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
 										 int width,
 										 int height)
 {
-	STR_String tmpstr(text);
-
 	if(mode == RAS_IRenderTools::RAS_TEXT_PADDED)
-		BL_print_gamedebug_line_padded(tmpstr.Ptr(), xco, yco, width, height);
+		BL_print_gamedebug_line_padded(text, xco, yco, width, height);
 	else
-		BL_print_gamedebug_line(tmpstr.Ptr(), xco, yco, width, height);
+		BL_print_gamedebug_line(text, xco, yco, width, height);
 }
 
 /* Render Text renders text into a (series of) polygon, using a texture font,
@@ -390,4 +388,4 @@ void KX_BlenderRenderTools::Update2DFilter(vector<STR_String>& propNames, void*
 void KX_BlenderRenderTools::Render2DFilters(RAS_ICanvas* canvas)
 {
 	m_filtermanager.RenderFilters(canvas);
-}
\ No newline at end of file
+}
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 99c943d4f24..1d1d9e6103b 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -751,16 +751,17 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt
 				STR_String *var = reinterpret_cast<STR_String*>(ptr);
 				if (PyUnicode_Check(value)) 
 				{
-					char *val = _PyUnicode_AsString(value);
+					Py_ssize_t val_len;
+					char *val = _PyUnicode_AsStringAndSize(value, &val_len);
 					if (attrdef->m_clamp)
 					{
-						if (strlen(val) < attrdef->m_imin)
+						if (val_len < attrdef->m_imin)
 						{
 							// can't increase the length of the string
 							PyErr_Format(PyExc_ValueError, "string length too short for attribute \"%s\"", attrdef->m_name);
 							goto FREE_AND_ERROR;
 						}
-						else if (strlen(val) > attrdef->m_imax)
+						else if (val_len > attrdef->m_imax)
 						{
 							// trim the string
 							char c = val[attrdef->m_imax];
@@ -769,7 +770,7 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt
 							val[attrdef->m_imax] = c;
 							break;
 						}
-					} else if (strlen(val) < attrdef->m_imin || strlen(val) > attrdef->m_imax)
+					} else if (val_len < attrdef->m_imin || val_len > attrdef->m_imax)
 					{
 						PyErr_Format(PyExc_ValueError, "string length out of range for attribute \"%s\"", attrdef->m_name);
 						goto FREE_AND_ERROR;

From 0763627e394bf4b634584a11f1b15dca33d94258 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Wed, 2 Sep 2009 04:55:33 +0000
Subject: [PATCH 393/577] * quick fix from Moguri to get things compiling
 again.

---
 source/blender/editors/space_view3d/SConscript | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index 4eb9f3f5ecb..057c98a1d49 100644
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -9,6 +9,7 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../render/extern/include #/intern/guardedalloc'
 incs += ' ../../gpu ../../makesrna ../../blenfont'
 incs += ' #/intern/smoke/extern'
+incs += ' #source/kernel/gen_system'
 
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')

From 01b4caa701c21b88b4447d7d4fd5570b05fa5979 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Wed, 2 Sep 2009 10:45:11 +0000
Subject: [PATCH 394/577] 2.5 - Rotation order is now taken into account for
 constraints

* Added a 'rotOrder' parameter for constraint evaluation objects and constraint targets, which describes the rotation mode used for the matrices there.

Todos:
* Constraint targets default to using XYZ only for now. This will need be be addressed eventually.
* Copy Rotation constraint currently cannot use the new rotation order code for the target matrix. What's surprising is that even though it's just using XYZ as the old code did, it doesn't work, and yet everything else works nicely. Silly constraint! (it is almost impossible to improve this constraint further without breaking a rig out there)
---
 source/blender/blenkernel/BKE_constraint.h    |  1 +
 source/blender/blenkernel/intern/constraint.c | 43 +++++++++------
 source/blender/blenlib/BLI_arithb.h           |  7 ++-
 source/blender/blenlib/intern/arithb.c        | 52 +++++++++++++++++--
 .../blender/makesdna/DNA_constraint_types.h   |  2 +-
 5 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 6e69906b71d..a0061173438 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -49,6 +49,7 @@ typedef struct bConstraintOb {
 	float startmat[4][4];		/* original matrix (before constraint solving) */
 	
 	short type;					/* type of owner  */
+	short rotOrder;				/* rotation order for constraint owner (as defined in eEulerRotationOrders in BLI_arithb.h) */
 } bConstraintOb;
 
 /* ---------------------------------------------------------------------------- */
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 88e73a00ba7..e6e65ebd614 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -121,6 +121,7 @@ bConstraintOb *constraints_make_evalob (Scene *scene, Object *ob, void *subdata,
 			if (ob) {
 				cob->ob = ob;
 				cob->type = datatype;
+				cob->rotOrder = EULER_ORDER_DEFAULT; // TODO: when objects have rotation order too, use that
 				Mat4CpyMat4(cob->matrix, ob->obmat);
 			}
 			else
@@ -137,6 +138,15 @@ bConstraintOb *constraints_make_evalob (Scene *scene, Object *ob, void *subdata,
 				cob->pchan = (bPoseChannel *)subdata;
 				cob->type = datatype;
 				
+				if (cob->pchan->rotmode > 0) {
+					/* should be some type of Euler order */
+					cob->rotOrder= cob->pchan->rotmode; 
+				}
+				else {
+					/* Quats, so eulers should just use default order */
+					cob->rotOrder= EULER_ORDER_DEFAULT;
+				}
+				
 				/* matrix in world-space */
 				Mat4MulMat4(cob->matrix, cob->pchan->pose_mat, ob->obmat);
 			}
@@ -664,6 +674,7 @@ static void default_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstrain
  * (Hopefully all compilers will be happy with the lines with just a space on them. Those are
  *  really just to help this code easier to read)
  */
+// TODO: cope with getting rotation order...
 #define SINGLETARGET_GET_TARS(con, datatar, datasubtarget, ct, list) \
 	{ \
 		ct= MEM_callocN(sizeof(bConstraintTarget), "tempConstraintTarget"); \
@@ -687,6 +698,7 @@ static void default_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstrain
  * (Hopefully all compilers will be happy with the lines with just a space on them. Those are
  *  really just to help this code easier to read)
  */
+// TODO: cope with getting rotation order...
 #define SINGLETARGETNS_GET_TARS(con, datatar, ct, list) \
 	{ \
 		ct= MEM_callocN(sizeof(bConstraintTarget), "tempConstraintTarget"); \
@@ -795,11 +807,11 @@ static void childof_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 		
 		/* extract components of both matrices */
 		VECCOPY(loc, ct->matrix[3]);
-		Mat4ToEul(ct->matrix, eul);
+		Mat4ToEulO(ct->matrix, eul, ct->rotOrder);
 		Mat4ToSize(ct->matrix, size);
 		
 		VECCOPY(loco, invmat[3]);
-		Mat4ToEul(invmat, eulo);
+		Mat4ToEulO(invmat, eulo, cob->rotOrder);
 		Mat4ToSize(invmat, sizo);
 		
 		/* disable channels not enabled */
@@ -814,8 +826,8 @@ static void childof_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 		if (!(data->flag & CHILDOF_SIZEZ)) size[2]= sizo[2]= 1.0f;
 		
 		/* make new target mat and offset mat */
-		LocEulSizeToMat4(ct->matrix, loc, eul, size);
-		LocEulSizeToMat4(invmat, loco, eulo, sizo);
+		LocEulOSizeToMat4(ct->matrix, loc, eul, size, ct->rotOrder);
+		LocEulOSizeToMat4(invmat, loco, eulo, sizo, cob->rotOrder);
 		
 		/* multiply target (parent matrix) by offset (parent inverse) to get 
 		 * the effect of the parent that will be exherted on the owner
@@ -1304,7 +1316,7 @@ static void rotlimit_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *t
 	VECCOPY(loc, cob->matrix[3]);
 	Mat4ToSize(cob->matrix, size);
 	
-	Mat4ToEul(cob->matrix, eul);
+	Mat4ToEulO(cob->matrix, eul, cob->rotOrder);
 	
 	/* eulers: radians to degrees! */
 	eul[0] = (float)(eul[0] / M_PI * 180);
@@ -1339,7 +1351,7 @@ static void rotlimit_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *t
 	eul[1] = (float)(eul[1] / 180 * M_PI);
 	eul[2] = (float)(eul[2] / 180 * M_PI);
 	
-	LocEulSizeToMat4(cob->matrix, loc, eul, size);
+	LocEulOSizeToMat4(cob->matrix, loc, eul, size, cob->rotOrder);
 }
 
 static bConstraintTypeInfo CTI_ROTLIMIT = {
@@ -1546,14 +1558,15 @@ static void rotlike_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 		VECCOPY(loc, cob->matrix[3]);
 		Mat4ToSize(cob->matrix, size);
 		
-		Mat4ToEul(ct->matrix, eul);
-		Mat4ToEul(cob->matrix, obeul);
+		//Mat4ToEulO(ct->matrix, eul, ct->rotOrder);
+		Mat4ToEul(ct->matrix, eul); // the version we should be using causes errors...
+		Mat4ToEulO(cob->matrix, obeul, cob->rotOrder);
 		
 		if ((data->flag & ROTLIKE_X)==0)
 			eul[0] = obeul[0];
 		else {
 			if (data->flag & ROTLIKE_OFFSET)
-				euler_rot(eul, obeul[0], 'x');
+				eulerO_rot(eul, obeul[0], 'x', cob->rotOrder);
 			
 			if (data->flag & ROTLIKE_X_INVERT)
 				eul[0] *= -1;
@@ -1563,7 +1576,7 @@ static void rotlike_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 			eul[1] = obeul[1];
 		else {
 			if (data->flag & ROTLIKE_OFFSET)
-				euler_rot(eul, obeul[1], 'y');
+				eulerO_rot(eul, obeul[1], 'y', cob->rotOrder);
 			
 			if (data->flag & ROTLIKE_Y_INVERT)
 				eul[1] *= -1;
@@ -1573,14 +1586,14 @@ static void rotlike_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 			eul[2] = obeul[2];
 		else {
 			if (data->flag & ROTLIKE_OFFSET)
-				euler_rot(eul, obeul[2], 'z');
+				eulerO_rot(eul, obeul[2], 'z', cob->rotOrder);
 			
 			if (data->flag & ROTLIKE_Z_INVERT)
 				eul[2] *= -1;
 		}
 		
 		compatible_eul(eul, obeul);
-		LocEulSizeToMat4(cob->matrix, loc, eul, size);
+		LocEulOSizeToMat4(cob->matrix, loc, eul, size, cob->rotOrder);
 	}
 }
 
@@ -3036,7 +3049,7 @@ static void transform_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
 				Mat4ToSize(ct->matrix, dvec);
 				break;
 			case 1: /* rotation (convert to degrees first) */
-				Mat4ToEul(ct->matrix, dvec);
+				Mat4ToEulO(ct->matrix, dvec, cob->rotOrder);
 				for (i=0; i<3; i++)
 					dvec[i] = (float)(dvec[i] / M_PI * 180);
 				break;
@@ -3047,7 +3060,7 @@ static void transform_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
 		
 		/* extract components of owner's matrix */
 		VECCOPY(loc, cob->matrix[3]);
-		Mat4ToEul(cob->matrix, eul);
+		Mat4ToEulO(cob->matrix, eul, cob->rotOrder);
 		Mat4ToSize(cob->matrix, size);	
 		
 		/* determine where in range current transforms lie */
@@ -3102,7 +3115,7 @@ static void transform_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
 		}
 		
 		/* apply to matrix */
-		LocEulSizeToMat4(cob->matrix, loc, eul, size);
+		LocEulOSizeToMat4(cob->matrix, loc, eul, size, cob->rotOrder);
 	}
 }
 
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 5f3622e8aa5..2ab60c6a8d0 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -202,6 +202,8 @@ void Mat3ToEulO(float Mat[3][3], float eul[3], short order);
 void Mat4ToEulO(float Mat[4][4], float eul[3], short order);
 
 void Mat3ToCompatibleEulO(float mat[3][3], float eul[3], float oldrot[3], short order);
+
+void eulerO_rot(float beul[3], float ang, char axis, short order);
  
 /**
  * @section Euler conversion routines (Blender XYZ)
@@ -484,8 +486,9 @@ void Mat4ToSize(float mat[][4], float *size);
 
 void triatoquat(float *v1, float *v2, float *v3, float *quat);
 
-void LocEulSizeToMat4(float mat[][4], float loc[3], float eul[3], float size[3]);
-void LocQuatSizeToMat4(float mat[][4], float loc[3], float quat[4], float size[3]);
+void LocEulSizeToMat4(float mat[4][4], float loc[3], float eul[3], float size[3]);
+void LocEulOSizeToMat4(float mat[4][4], float loc[3], float eul[3], float size[3], short rotOrder);
+void LocQuatSizeToMat4(float mat[4][4], float loc[3], float quat[4], float size[3]);
 
 void tubemap(float x, float y, float z, float *u, float *v);
 void spheremap(float x, float y, float z, float *u, float *v);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 64fb7d78ef1..9d67ac50108 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2825,7 +2825,6 @@ static RotOrderInfo rotOrders[]= {
  * NOTE: since we start at 1 for the values, but arrays index from 0, 
  *		 there is -1 factor involved in this process...
  */
-// FIXME: what happens when invalid order given
 #define GET_ROTATIONORDER_INFO(order) (((order)>=1) ? &rotOrders[(order)-1] : &rotOrders[0])
 
 /* Construct quaternion from Euler angles (in radians). */
@@ -2936,6 +2935,7 @@ void Mat4ToEulO(float M[4][4], float e[3], short order)
 	
 	/* for now, we'll just do this the slow way (i.e. copying matrices) */
 	Mat3CpyMat4(m, M);
+	Mat3Ortho(m);
 	Mat3ToEulO(m, e, order);
 }
 
@@ -2996,7 +2996,27 @@ void Mat3ToCompatibleEulO(float mat[3][3], float eul[3], float oldrot[3], short
 		VecCopyf(eul, eul1);
 }
 
-
+/* rotate the given euler by the given angle on the specified axis */
+// NOTE: is this safe to do with different axis orders?
+void eulerO_rot(float beul[3], float ang, char axis, short order)
+{
+	float eul[3], mat1[3][3], mat2[3][3], totmat[3][3];
+	
+	eul[0]= eul[1]= eul[2]= 0.0f;
+	if (axis=='x') 
+		eul[0]= ang;
+	else if (axis=='y') 
+		eul[1]= ang;
+	else 
+		eul[2]= ang;
+	
+	EulOToMat3(eul, order, mat1);
+	EulOToMat3(beul, order, mat2);
+	
+	Mat3MulMat3(totmat, mat2, mat1);
+	
+	Mat3ToEulO(totmat, beul, order);
+}
 
 /* ************ EULER (old XYZ) *************** */
 
@@ -4947,7 +4967,7 @@ float PdistVL3Dfl(float *v1, float *v2, float *v3)
 /* make a 4x4 matrix out of 3 transform components */
 /* matrices are made in the order: scale * rot * loc */
 // TODO: need to have a version that allows for rotation order...
-void LocEulSizeToMat4(float mat[][4], float loc[3], float eul[3], float size[3])
+void LocEulSizeToMat4(float mat[4][4], float loc[3], float eul[3], float size[3])
 {
 	float rmat[3][3], smat[3][3], tmat[3][3];
 	
@@ -4970,7 +4990,31 @@ void LocEulSizeToMat4(float mat[][4], float loc[3], float eul[3], float size[3])
 
 /* make a 4x4 matrix out of 3 transform components */
 /* matrices are made in the order: scale * rot * loc */
-void LocQuatSizeToMat4(float mat[][4], float loc[3], float quat[4], float size[3])
+void LocEulOSizeToMat4(float mat[4][4], float loc[3], float eul[3], float size[3], short rotOrder)
+{
+	float rmat[3][3], smat[3][3], tmat[3][3];
+	
+	/* initialise new matrix */
+	Mat4One(mat);
+	
+	/* make rotation + scaling part */
+	EulOToMat3(eul, rotOrder, rmat);
+	SizeToMat3(size, smat);
+	Mat3MulMat3(tmat, rmat, smat);
+	
+	/* copy rot/scale part to output matrix*/
+	Mat4CpyMat3(mat, tmat);
+	
+	/* copy location to matrix */
+	mat[3][0] = loc[0];
+	mat[3][1] = loc[1];
+	mat[3][2] = loc[2];
+}
+
+
+/* make a 4x4 matrix out of 3 transform components */
+/* matrices are made in the order: scale * rot * loc */
+void LocQuatSizeToMat4(float mat[4][4], float loc[3], float quat[4], float size[3])
 {
 	float rmat[3][3], smat[3][3], tmat[3][3];
 	
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 79f032d0d21..6fab633b192 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -85,7 +85,7 @@ typedef struct bConstraintTarget {
 	short space;			/* space that target should be evaluated in (overrides bConstraint->tarspace) */
 	short flag;				/* runtime settings (for editor, etc.) */
 	short type;				/* type of target (B_CONSTRAINT_OB_TYPE) */
-	short pad;
+	short rotOrder;			/* rotation order for target (as defined in BLI_arithb.h) */
 } bConstraintTarget;
 
 /* bConstraintTarget -> flag */

From 0415e3be054bd6ad742da786e01ec3edc81f9e78 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Wed, 2 Sep 2009 12:16:00 +0000
Subject: [PATCH 395/577] 2.5 - UI Bugfixes

* Modifiers for Lattices now get shown again
* Auto IK and X-Axis Mirror options are now visible again in Armatures UI. Their placement isn't ideal yet, and they also need some proper poll-based visibility adjustments
* F-Modifiers now correctly update the keyframes view after their settings are modified
---
 release/ui/buttons_data_armature.py           |  5 ++-
 .../editors/space_buttons/buttons_context.c   |  2 +-
 source/blender/makesrna/intern/rna_fcurve.c   | 38 ++++++++++++++++++-
 source/blender/makesrna/intern/rna_nla.c      | 25 ++++++++++++
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index ed350caa3bd..ff0cc531c67 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -45,6 +45,9 @@ class DATA_PT_skeleton(DataButtonsPanel):
 		col.template_layers(arm, "layer")
 		col.itemL(text="Protected Layers:")
 		col.template_layers(arm, "layer_protection")
+		col.itemL(text="Edit Options:")
+		col.itemR(arm, "x_axis_mirror")
+		col.itemR(arm, "auto_ik")
 		
 		col = split.column()
 		col.itemR(arm, "rest_position")
@@ -53,8 +56,6 @@ class DATA_PT_skeleton(DataButtonsPanel):
 		col.itemR(arm, "deform_envelope", text="Envelopes")
 		col.itemR(arm, "deform_quaternion", text="Quaternion")
 		col.itemR(arm, "deform_bbone_rest", text="B-Bones Rest")
-		#col.itemR(arm, "x_axis_mirror")
-		#col.itemR(arm, "auto_ik")
 		
 class DATA_PT_display(DataButtonsPanel):
 	__label__ = "Display"
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 8306487013a..635abd429f6 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -200,7 +200,7 @@ static int buttons_context_path_modifier(ButsContextPath *path)
 	if(buttons_context_path_object(path)) {
 		ob= path->ptr[path->len-1].data;
 
-		if(ob && ELEM4(ob->type, OB_MESH, OB_CURVE, OB_FONT, OB_SURF))
+		if(ob && ELEM5(ob->type, OB_MESH, OB_CURVE, OB_FONT, OB_SURF, OB_LATTICE))
 			return 1;
 	}
 
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index fa6eea5f8a9..bafe83f1812 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -34,6 +34,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "WM_types.h"
+
 EnumPropertyItem fmodifier_type_items[] = {
 	{FMODIFIER_TYPE_NULL, "NULL", 0, "Invalid", ""},
 	{FMODIFIER_TYPE_GENERATOR, "GENERATOR", 0, "Generator", ""},
@@ -168,17 +170,20 @@ static void rna_def_fmodifier_generator(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE);
 	RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 		// XXX this has a special validation func
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "Type of generator to use.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	
 	/* order of the polynomial */
 		// XXX this has a special validation func
 	prop= RNA_def_property(srna, "poly_order", PROP_INT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Polynomial Order", "The highest power of 'x' for this polynomial. (number of coefficients - 1)");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	/* coefficients array */
 		// FIXME: this is quite difficult to try to wrap
@@ -210,25 +215,31 @@ static void rna_def_fmodifier_function_generator(BlenderRNA *brna)
 	/* coefficients */
 	prop= RNA_def_property(srna, "amplitude", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Amplitude", "Scale factor determining the maximum/minimum values.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "phase_multiplier", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Phase Multiplier", "Scale factor determining the 'speed' of the function.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "phase_offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Phase Offset", "Constant factor to offset time by for function.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "value_offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Value Offset", "Constant factor to offset values by.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	/* flags */
 	prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE);
 	RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "function_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, prop_type_items);
 	RNA_def_property_ui_text(prop, "Type", "Type of built-in function to use.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 }
 
 /* --------- */
@@ -249,15 +260,18 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "minimum", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min");
 	RNA_def_property_ui_text(prop, "Minimum Value", "Lower bound of envelope at this control-point.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "maximum", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max");
 	RNA_def_property_ui_text(prop, "Maximum Value", "Upper bound of envelope at this control-point.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	/* Frame */
 	prop= RNA_def_property(srna, "frame", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_float_sdna(prop, NULL, "time");
 	RNA_def_property_ui_text(prop, "Frame", "Frame this control-point occurs on.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	// TODO:
 	//	- selection flags (not implemented in UI yet though)
@@ -282,14 +296,17 @@ static void rna_def_fmodifier_envelope(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "reference_value", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "midval");
 	RNA_def_property_ui_text(prop, "Reference Value", "Value that envelope's influence is centered around / based on.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "default_minimum", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min");
 	RNA_def_property_ui_text(prop, "Default Minimum", "Lower distance from Reference Value for 1:1 default influence.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "default_maximum", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max");
 	RNA_def_property_ui_text(prop, "Default Maximum", "Upper distance from Reference Value for 1:1 default influence.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 }
 
 /* --------- */
@@ -314,18 +331,21 @@ static void rna_def_fmodifier_cycles(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "before_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_type_items);
 	RNA_def_property_ui_text(prop, "Before Mode", "Cycling mode to use before first keyframe.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "before_cycles", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Before Cycles", "Maximum number of cycles to allow before first keyframe. (0 = infinite)");
-	
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	/* after */
 	prop= RNA_def_property(srna, "after_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_type_items);
 	RNA_def_property_ui_text(prop, "After Mode", "Cycling mode to use after last keyframe.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "after_cycles", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "After Cycles", "Maximum number of cycles to allow after last keyframe. (0 = infinite)");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 }
 
 /* --------- */
@@ -354,34 +374,42 @@ static void rna_def_fmodifier_limits(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "use_minimum_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_XMIN);
 	RNA_def_property_ui_text(prop, "Minimum X", "Use the minimum X value.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "use_minimum_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_YMIN);
 	RNA_def_property_ui_text(prop, "Minimum Y", "Use the minimum Y value.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "use_maximum_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_XMAX);
 	RNA_def_property_ui_text(prop, "Maximum X", "Use the maximum X value.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "use_maximum_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_LIMIT_YMAX);
 	RNA_def_property_ui_text(prop, "Maximum Y", "Use the maximum Y value.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "minimum_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rect.xmin");
 	RNA_def_property_ui_text(prop, "Minimum X", "Lowest X value to allow.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "minimum_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rect.ymin");
 	RNA_def_property_ui_text(prop, "Minimum Y", "Lowest Y value to allow.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "maximum_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rect.xmax");
 	RNA_def_property_ui_text(prop, "Maximum X", "Highest X value to allow.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "maximum_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rect.ymax");
 	RNA_def_property_ui_text(prop, "Maximum Y", "Highest Y value to allow.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 }
 
 /* --------- */
@@ -405,22 +433,27 @@ static void rna_def_fmodifier_noise(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "modification", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_modification_items);
 	RNA_def_property_ui_text(prop, "Modification", "Method of modifying the existing F-Curve.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "size");
 	RNA_def_property_ui_text(prop, "Size", "Scaling (in time) of the noise");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "strength");
 	RNA_def_property_ui_text(prop, "Strength", "Amplitude of the noise - the amount that it modifies the underlying curve");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "phase", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "phase");
 	RNA_def_property_ui_text(prop, "Phase", "A random seed for the noise effect");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 	
 	prop= RNA_def_property(srna, "depth", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "depth");
 	RNA_def_property_ui_text(prop, "Depth", "Amount of fine level detail present in the noise");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
 
 }
 
@@ -459,17 +492,20 @@ void rna_def_fmodifier(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FMODIFIER_FLAG_MUTED);
 	RNA_def_property_ui_text(prop, "Muted", "F-Curve Modifier will not be evaluated.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL);
 	
 		// XXX this is really an internal flag, but it may be useful for some tools to be able to access this...
 	prop= RNA_def_property(srna, "disabled", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FMODIFIER_FLAG_DISABLED);
 	RNA_def_property_ui_text(prop, "Disabled", "F-Curve Modifier has invalid settings and will not be evaluated.");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL);
 	
 		// TODO: setting this to true must ensure that all others in stack are turned off too...
 	prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FMODIFIER_FLAG_ACTIVE);
 	RNA_def_property_ui_text(prop, "Active", "F-Curve Modifier is the one being edited ");
+	RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL);
 }	
 
 /* *********************** */
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 98c72b7ee74..98fdf4a6878 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -61,6 +61,30 @@ void rna_NlaStrip_name_set(PointerRNA *ptr, const char *value)
 	}
 }
 
+static char *rna_NlaStrip_path(PointerRNA *ptr)
+{
+	NlaStrip *strip= (NlaStrip *)ptr->data;
+	AnimData *adt= BKE_animdata_from_id(ptr->id.data);
+	
+	/* if we're attached to AnimData, try to resolve path back to AnimData */
+	if (adt) {
+		NlaTrack *nlt;
+		NlaStrip *nls;
+		
+		for (nlt= adt->nla_tracks.first; nlt; nlt= nlt->next) {
+			for (nls = nlt->strips.first; nls; nls = nls->next) {
+				if (nls == strip) {
+					// XXX but if we animate like this, the control will never work...
+					return BLI_sprintfN("animation_data.nla_tracks[\"%s\"].strips[\"%s\"]", nlt->name, strip->name);
+				}
+			}
+		}
+	}
+	
+	/* no path */
+	return "";
+}
+
 
 static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value)
 {
@@ -271,6 +295,7 @@ void rna_def_nlastrip(BlenderRNA *brna)
 	/* struct definition */
 	srna= RNA_def_struct(brna, "NlaStrip", NULL);
 	RNA_def_struct_ui_text(srna, "NLA Strip", "A container referencing an existing Action.");
+	RNA_def_struct_path_func(srna, "rna_NlaStrip_path");
 	RNA_def_struct_ui_icon(srna, ICON_NLA); // XXX
 	
 	/* name property */

From 21af438ef8c7cbc19ec0050195c3898ef4d95c29 Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Wed, 2 Sep 2009 17:13:47 +0000
Subject: [PATCH 396/577] Blender 2.5 * recent files now just write content of
 G.recent_files, was adding untitled.blend! * removed unused and now
 superfluous code reading the .Bfs file (is done in fsmenu now)

---
 .../blender/windowmanager/intern/wm_files.c   | 54 +------------------
 .../windowmanager/intern/wm_operators.c       | 18 ++-----
 2 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index b98717c8629..3921da4f062 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -388,7 +388,7 @@ void WM_read_autosavefile(bContext *C)
 
 void read_Blog(void)
 {
-	char name[FILE_MAX], filename[FILE_MAX];
+	char name[FILE_MAX];
 	LinkNode *l, *lines;
 	struct RecentFile *recent;
 	char *line;
@@ -420,58 +420,6 @@ void read_Blog(void)
 	
 	BLI_free_file_lines(lines);
 
-#ifdef WIN32
-	/* Add the drive names to the listing */
-	{
-		__int64 tmp;
-		char folder[MAX_PATH];
-		char tmps[4];
-		int i;
-			
-		tmp= GetLogicalDrives();
-		
-		for (i=2; i < 26; i++) {
-			if ((tmp>>i) & 1) {
-				tmps[0]='a'+i;
-				tmps[1]=':';
-				tmps[2]='\\';
-				tmps[3]=0;
-				
-// XX				fsmenu_insert_entry(tmps, 0, 0);
-			}
-		}
-
-		/* Adding Desktop and My Documents */
-// XXX		fsmenu_append_separator();
-
-		SHGetSpecialFolderPath(0, folder, CSIDL_PERSONAL, 0);
-// XXX		fsmenu_insert_entry(folder, 0, 0);
-		SHGetSpecialFolderPath(0, folder, CSIDL_DESKTOPDIRECTORY, 0);
-// XXX		fsmenu_insert_entry(folder, 0, 0);
-
-// XXX		fsmenu_append_separator();
-	}
-#endif
-
-	BLI_make_file_string(G.sce, name, BLI_gethome(), ".Bfs");
-	lines= BLI_read_file_as_lines(name);
-
-	for (l= lines; l; l= l->next) {
-		char *line= l->link;
-			
-		if (!BLI_streq(line, "")) {
-// XXX			fsmenu_insert_entry(line, 0, 1);
-		}
-	}
-
-// XXX	fsmenu_append_separator();
-	
-	/* add last saved file */
-	BLI_split_dirfile(G.sce, name, filename); /* G.sce shouldn't be relative */
-	
-// XXX	fsmenu_insert_entry(name, 0, 0);
-	
-	BLI_free_file_lines(lines);
 }
 
 static void writeBlog(void)
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 5a385418e5d..b51fcfddc47 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -814,22 +814,12 @@ static EnumPropertyItem *open_recentfile_itemf(bContext *C, PointerRNA *ptr, int
 	struct RecentFile *recent;
 	int totitem= 0, i, ofs= 0;
 
-	if(G.sce[0]) {
-		tmp.value= 1;
-		tmp.identifier= G.sce;
-		tmp.name= G.sce;
-		RNA_enum_item_add(&item, &totitem, &tmp);
-		ofs = 1;
-	}
-
 	/* dynamically construct enum */
 	for(recent = G.recent_files.first, i=0; (i<U.recent_files) && (recent); recent = recent->next, i++) {
-		if(strcmp(recent->filename, G.sce)) {
-			tmp.value= i+ofs+1;
-			tmp.identifier= recent->filename;
-			tmp.name= recent->filename;
-			RNA_enum_item_add(&item, &totitem, &tmp);
-		}
+		tmp.value= i+ofs+1;
+		tmp.identifier= recent->filename;
+		tmp.name= recent->filename;
+		RNA_enum_item_add(&item, &totitem, &tmp);
 	}
 
 	RNA_enum_item_end(&item, &totitem);

From e80b37cd751260232678ebd550aa5a0f2226b693 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 2 Sep 2009 20:46:28 +0000
Subject: [PATCH 397/577] * KX_PythonSeq - comparisons work again. eg.
 act1.sensors == act2.sensors, had to copy Py_CmpToRich inline grr!, mailed
 python-dev about this. * Shift-Click on states in the logic UI works again. *
 New Logic Space has all the view options pressed.

---
 .../editors/space_logic/logic_window.c        | 27 ++-----------
 .../blender/editors/space_logic/space_logic.c |  7 ++++
 source/gameengine/Ketsji/KX_PythonInit.cpp    | 38 +++++++++++++++++++
 source/gameengine/Ketsji/KX_PythonSeq.cpp     | 20 ++++++++--
 4 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index 118bcaa0cf4..47ba197daa0 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -83,9 +83,6 @@ static int pupmenu() {return 1;}
 #define B_REDR		1
 #define B_IDNAME	2
 
-#define B_ADD_PROP		2701
-#define B_CHANGE_PROP		2702
-
 #define B_ADD_SENS		2703
 #define B_CHANGE_SENS		2704
 #define B_DEL_SENS		2705
@@ -364,7 +361,6 @@ static void sca_move_actuator(bContext *C, void *datav, void *data2_unused)
 
 void do_logic_buts(bContext *C, void *arg, int event)
 {
-	bProperty *prop;
 	bSensor *sens;
 	bController *cont;
 	bActuator *act;
@@ -386,25 +382,7 @@ void do_logic_buts(bContext *C, void *arg, int event)
 	case B_SETMAINACTOR:
 		ob->gameflag &= ~(OB_SECTOR|OB_PROP);
 		break;
-
-
-	case B_ADD_PROP:
-		prop= new_property(PROP_FLOAT);
-		make_unique_prop_names(C, prop->name);
-		BLI_addtail(&ob->prop, prop);
-		ED_undo_push(C, "Add property");
-		break;
-#if 0 // XXX Now done in python
-	case B_CHANGE_PROP:
-		prop= ob->prop.first;
-		while(prop) {
-			if(prop->type!=prop->otype) {
-				init_property(prop);
-			}
-			prop= prop->next;
-		}
-		break;
-#endif
+	
 	case B_ADD_SENS:
 		for(ob=G.main->object.first; ob; ob=ob->id.next) {
 			if(ob->scaflag & OB_ADDSENS) {
@@ -1666,7 +1644,8 @@ char *get_state_name(Object *ob, short bit)
 
 static void check_state_mask(bContext *C, void *arg1_but, void *arg2_mask)
 {
-	int shift= 0; // XXX
+	wmWindow *win= CTX_wm_window(C);
+	int shift= win->eventstate->shift;
 	unsigned int *cont_mask = arg2_mask;
 	uiBut *but = arg1_but;
 
diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c
index 703b408aae6..3c46522bba2 100644
--- a/source/blender/editors/space_logic/space_logic.c
+++ b/source/blender/editors/space_logic/space_logic.c
@@ -102,6 +102,13 @@ static SpaceLink *logic_new(const bContext *C)
 	slogic= MEM_callocN(sizeof(SpaceLogic), "initlogic");
 	slogic->spacetype= SPACE_LOGIC;
 	
+	/* default options */
+	slogic->scaflag =	(BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_SENS_LINK) 	|
+						(BUTS_CONT_SEL|BUTS_CONT_ACT|BUTS_CONT_LINK) 	|
+						(BUTS_ACT_SEL|BUTS_ACT_ACT|BUTS_ACT_LINK)		|
+						(BUTS_SENS_STATE|BUTS_ACT_STATE);
+	
+	
 	/* header */
 	ar= MEM_callocN(sizeof(ARegion), "header for logic");
 	
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 67ab67814b2..667b4cd5d89 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -2018,4 +2018,42 @@ void resetGamePythonPath()
 }
 
 
+/* Copied from pythons 3's Object.c
+ * also in blenders bpy_uitl.c, mailed the python-dev
+ * list about enabling something like this again for py3 */
+PyObject *
+Py_CmpToRich(int op, int cmp)
+{
+	PyObject *res;
+	int ok;
+
+	if (PyErr_Occurred())
+		return NULL;
+	switch (op) {
+	case Py_LT:
+		ok = cmp <  0;
+		break;
+	case Py_LE:
+		ok = cmp <= 0;
+		break;
+	case Py_EQ:
+		ok = cmp == 0;
+		break;
+	case Py_NE:
+		ok = cmp != 0;
+		break;
+	case Py_GT:
+		ok = cmp >  0;
+		break;
+	case Py_GE:
+		ok = cmp >= 0;
+		break;
+	default:
+		PyErr_BadArgument();
+		return NULL;
+	}
+	res = ok ? Py_True : Py_False;
+	Py_INCREF(res);
+	return res;
+}
 
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp
index 1098dc03b62..165a85e2c14 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.cpp
+++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp
@@ -345,6 +345,19 @@ static int KX_PythonSeq_compare( KX_PythonSeq * a, KX_PythonSeq * b ) /* TODO -
 	return ( a->type == b->type && a->base == b->base) ? 0 : -1;	
 }
 
+extern PyObject *Py_CmpToRich(int op, int cmp);
+
+static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op)
+{
+	int cmp_result= -1; /* assume false */
+	
+	if(BPy_KX_PythonSeq_Check(a) && BPy_KX_PythonSeq_Check(b)) {
+		cmp_result= KX_PythonSeq_compare((KX_PythonSeq *)a, (KX_PythonSeq *)b);
+	}
+	
+	return Py_CmpToRich(op, cmp_result);
+}
+
 /*
  * repr function
  * convert to a list and get its string value
@@ -374,8 +387,7 @@ PyTypeObject KX_PythonSeq_Type = {
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	/* TODO, richcmp */
-	NULL, /* ( cmpfunc ) KX_PythonSeq_compare, // cmpfunc tp_compare; */
+	NULL,						/* cmpfunc tp_compare; */
 	( reprfunc ) KX_PythonSeq_repr,   /* reprfunc tp_repr; */
 
 	/* Method suites for standard classes */
@@ -401,14 +413,14 @@ PyTypeObject KX_PythonSeq_Type = {
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
-	NULL,                       /* traverseproc tp_traverse; */
+	NULL,						/* traverseproc tp_traverse; */
 
 	/* delete references to contained objects */
 	NULL,                       /* inquiry tp_clear; */
 
   /***  Assigned meaning in release 2.1 ***/
   /*** rich comparisons ***/
-	NULL,                       /* richcmpfunc tp_richcompare; */
+	(richcmpfunc)KX_PythonSeq_richcmp,	/* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
 	0,                          /* long tp_weaklistoffset; */

From 375f36dfcf21f046b2cde0a24a0846999e87d57a Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Wed, 2 Sep 2009 20:54:33 +0000
Subject: [PATCH 398/577] * actually commit the sndfile dll copying (and not
 just claiming I did)

---
 SConstruct | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SConstruct b/SConstruct
index f2eb7146930..5a64cd7c117 100644
--- a/SConstruct
+++ b/SConstruct
@@ -575,6 +575,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
 	if env['WITH_BF_OPENAL']:
 		dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
 		dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+	if env['WITH_BF_SNDFILE']:
+		dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
 	if env['WITH_BF_FFMPEG']:
 		dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avformat-52.dll',

From 9004dc665cd303dc6bc84d1ea92716dc0c0020d3 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 2 Sep 2009 20:57:18 +0000
Subject: [PATCH 399/577] Fix thread hanging problem (mostly seen with material
 preview, but that sneaky f*er could strike any time).

Story time: Once upon a time, in the green valley of fileselect, BLI_end_threads would get called on an empty threadbase, depending on the result of a previous call to readdir(). The function would then gladly decrement thread_level to -1 which would cause all kinds of fun havoc. THE END.

Made sure thread_level is only incremented and decremented when needed. The caller should never have to make sure of that, especially since it already lets you call with a null threadbase.

Please report any further hang (and how to reproduce, if possible).
---
 source/blender/blenlib/intern/threads.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 2812f17d58f..ed3e07b7f7e 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -142,10 +142,10 @@ void BLI_init_threads(ListBase *threadbase, void *(*do_thread)(void *), int tot)
 			tslot->do_thread= do_thread;
 			tslot->avail= 1;
 		}
+		
+		MEM_set_lock_callback(BLI_lock_malloc_thread, BLI_unlock_malloc_thread);
+		thread_levels++;
 	}
-
-	MEM_set_lock_callback(BLI_lock_malloc_thread, BLI_unlock_malloc_thread);
-	thread_levels++;
 }
 
 /* amount of available threads */
@@ -235,18 +235,21 @@ void BLI_end_threads(ListBase *threadbase)
 {
 	ThreadSlot *tslot;
 	
-	if (threadbase) {
+	/* only needed if there's actually some stuff to end
+	 * this way we don't end up decrementing thread_levels on an empty threadbase 
+	 * */
+	if (threadbase && threadbase->first != NULL) {
 		for(tslot= threadbase->first; tslot; tslot= tslot->next) {
 			if(tslot->avail==0) {
 				pthread_join(tslot->pthread, NULL);
 			}
 		}
 		BLI_freelistN(threadbase);
+
+		thread_levels--;
+		if(thread_levels==0)
+			MEM_set_lock_callback(NULL, NULL);
 	}
-	
-	thread_levels--;
-	if(thread_levels==0)
-		MEM_set_lock_callback(NULL, NULL);
 }
 
 void BLI_lock_thread(int type)

From ac3f0695a2cf3d5706d8f49b1276579889997990 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 3 Sep 2009 01:52:10 +0000
Subject: [PATCH 400/577] remove Py_CmpToRich (copy of py3.0 function), instead
 only support == and != for PyRNA and KX_PySequence types.  mesh1 > mesh2 #
 will raise an error.

---
 source/blender/python/intern/bpy_rna.c     | 61 ++++++++++++++++++----
 source/blender/python/intern/bpy_util.c    | 38 --------------
 source/blender/python/intern/bpy_util.h    |  2 -
 source/gameengine/Ketsji/KX_PythonInit.cpp | 41 ---------------
 source/gameengine/Ketsji/KX_PythonSeq.cpp  | 32 +++++++++---
 5 files changed, 75 insertions(+), 99 deletions(-)

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 3902a9fd9b5..8ba3b5f8732 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -144,25 +144,64 @@ static int pyrna_prop_compare( BPy_PropertyRNA * a, BPy_PropertyRNA * b )
 	return (a->prop==b->prop && a->ptr.data==b->ptr.data ) ? 0 : -1;
 }
 
-/* For some reason python3 needs these :/ */
-static PyObject *pyrna_struct_richcmp(BPy_StructRNA * a, BPy_StructRNA * b, int op)
+static PyObject *pyrna_struct_richcmp(PyObject *a, PyObject *b, int op)
 {
-	int cmp_result= -1; /* assume false */
-	if (BPy_StructRNA_Check(a) && BPy_StructRNA_Check(b)) {
-		cmp_result= pyrna_struct_compare(a, b);
+	PyObject *res;
+	int ok= -1; /* zero is true */
+
+	if (BPy_StructRNA_Check(a) && BPy_StructRNA_Check(b))
+		ok= pyrna_struct_compare((BPy_StructRNA *)a, (BPy_StructRNA *)b);
+
+	switch (op) {
+	case Py_NE:
+		ok = !ok; /* pass through */
+	case Py_EQ:
+		res = ok ? Py_False : Py_True;
+		break;
+
+	case Py_LT:
+	case Py_LE:
+	case Py_GT:
+	case Py_GE:
+		res = Py_NotImplemented;
+		break;
+	default:
+		PyErr_BadArgument();
+		return NULL;
 	}
 
-	return Py_CmpToRich(op, cmp_result);
+	Py_INCREF(res);
+	return res;
 }
 
-static PyObject *pyrna_prop_richcmp(BPy_PropertyRNA * a, BPy_PropertyRNA * b, int op)
+static PyObject *pyrna_prop_richcmp(PyObject *a, PyObject *b, int op)
 {
-	int cmp_result= -1; /* assume false */
-	if (BPy_PropertyRNA_Check(a) && BPy_PropertyRNA_Check(b)) {
-		cmp_result= pyrna_prop_compare(a, b);
+	PyObject *res;
+	int ok= -1; /* zero is true */
+
+	if (BPy_PropertyRNA_Check(a) && BPy_PropertyRNA_Check(b))
+		ok= pyrna_prop_compare((BPy_PropertyRNA *)a, (BPy_PropertyRNA *)b);
+
+	switch (op) {
+	case Py_NE:
+		ok = !ok; /* pass through */
+	case Py_EQ:
+		res = ok ? Py_False : Py_True;
+		break;
+
+	case Py_LT:
+	case Py_LE:
+	case Py_GT:
+	case Py_GE:
+		res = Py_NotImplemented;
+		break;
+	default:
+		PyErr_BadArgument();
+		return NULL;
 	}
 
-	return Py_CmpToRich(op, cmp_result);
+	Py_INCREF(res);
+	return res;
 }
 
 /*----------------------repr--------------------------------------------*/
diff --git a/source/blender/python/intern/bpy_util.c b/source/blender/python/intern/bpy_util.c
index be343843acc..1766be62c83 100644
--- a/source/blender/python/intern/bpy_util.c
+++ b/source/blender/python/intern/bpy_util.c
@@ -122,44 +122,6 @@ int BPY_flag_from_seq(BPY_flag_def *flagdef, PyObject *seq, int *flag)
 	return 0; /* ok */
 }
 
-
-/* Copied from pythons 3's Object.c */
-PyObject *
-Py_CmpToRich(int op, int cmp)
-{
-	PyObject *res;
-	int ok;
-
-	if (PyErr_Occurred())
-		return NULL;
-	switch (op) {
-	case Py_LT:
-		ok = cmp <  0;
-		break;
-	case Py_LE:
-		ok = cmp <= 0;
-		break;
-	case Py_EQ:
-		ok = cmp == 0;
-		break;
-	case Py_NE:
-		ok = cmp != 0;
-		break;
-	case Py_GT:
-		ok = cmp >  0;
-		break;
-	case Py_GE:
-		ok = cmp >= 0;
-		break;
-	default:
-		PyErr_BadArgument();
-		return NULL;
-	}
-	res = ok ? Py_True : Py_False;
-	Py_INCREF(res);
-	return res;
-}
-
 /* for debugging */
 void PyObSpit(char *name, PyObject *var) {
 	fprintf(stderr, "<%s> : ", name);
diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_util.h
index 0400d595520..83fa7a5b7c4 100644
--- a/source/blender/python/intern/bpy_util.h
+++ b/source/blender/python/intern/bpy_util.h
@@ -50,8 +50,6 @@ void PyObSpit(char *name, PyObject *var);
 void PyLineSpit(void);
 void BPY_getFileAndNum(char **filename, int *lineno);
 
-PyObject *Py_CmpToRich(int op, int cmp);
-
 PyObject *BPY_exception_buffer(void);
 
 /* own python like utility function */
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 667b4cd5d89..9e81bcb3871 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -2016,44 +2016,3 @@ void resetGamePythonPath()
 {
 	gp_GamePythonPathOrig[0] = '\0';
 }
-
-
-/* Copied from pythons 3's Object.c
- * also in blenders bpy_uitl.c, mailed the python-dev
- * list about enabling something like this again for py3 */
-PyObject *
-Py_CmpToRich(int op, int cmp)
-{
-	PyObject *res;
-	int ok;
-
-	if (PyErr_Occurred())
-		return NULL;
-	switch (op) {
-	case Py_LT:
-		ok = cmp <  0;
-		break;
-	case Py_LE:
-		ok = cmp <= 0;
-		break;
-	case Py_EQ:
-		ok = cmp == 0;
-		break;
-	case Py_NE:
-		ok = cmp != 0;
-		break;
-	case Py_GT:
-		ok = cmp >  0;
-		break;
-	case Py_GE:
-		ok = cmp >= 0;
-		break;
-	default:
-		PyErr_BadArgument();
-		return NULL;
-	}
-	res = ok ? Py_True : Py_False;
-	Py_INCREF(res);
-	return res;
-}
-
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp
index 165a85e2c14..75a7c9b8aeb 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.cpp
+++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp
@@ -340,24 +340,42 @@ static PyObject *KX_PythonSeq_nextIter(KX_PythonSeq *self)
 }
 
 
-static int KX_PythonSeq_compare( KX_PythonSeq * a, KX_PythonSeq * b ) /* TODO - python3.x wants richcmp */
+static int KX_PythonSeq_compare( KX_PythonSeq * a, KX_PythonSeq * b )
 {
 	return ( a->type == b->type && a->base == b->base) ? 0 : -1;	
 }
 
-extern PyObject *Py_CmpToRich(int op, int cmp);
-
 static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op)
 {
-	int cmp_result= -1; /* assume false */
+	PyObject *res;
+	int ok= -1; /* zero is true */
+
+	if(BPy_KX_PythonSeq_Check(a) && BPy_KX_PythonSeq_Check(b))
+		ok= KX_PythonSeq_compare((KX_PythonSeq *)a, (KX_PythonSeq *)b);
 	
-	if(BPy_KX_PythonSeq_Check(a) && BPy_KX_PythonSeq_Check(b)) {
-		cmp_result= KX_PythonSeq_compare((KX_PythonSeq *)a, (KX_PythonSeq *)b);
+	switch (op) {
+	case Py_NE:
+		ok = !ok; /* pass through */
+	case Py_EQ:
+		res = ok ? Py_False : Py_True;
+		break;
+
+	case Py_LT:
+	case Py_LE:
+	case Py_GT:
+	case Py_GE:
+		res = Py_NotImplemented;
+		break;
+	default:
+		PyErr_BadArgument();
+		return NULL;
 	}
 	
-	return Py_CmpToRich(op, cmp_result);
+	Py_INCREF(res);
+	return res;
 }
 
+
 /*
  * repr function
  * convert to a list and get its string value

From 6239d18d50911959a8d5a40056ef87e7253cc70e Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Thu, 3 Sep 2009 02:55:23 +0000
Subject: [PATCH 401/577] BlenderPlayer linking again for cmake - 148 errors
 gone.

After talking with Ton and Campbell we agreed that it wouldn't hurt to have blenderplayer again (specially now since BGE is almost 100% working in 2.5).
However in order to make it link, I needed to bring back stubs, a lot of so-called bad calls.

I'm not sure how we should proceed from here, but it looks like people could start to take a look at source/blenderplayer/bad_level_calls_stubs/stubs.c and fix their own modules/functions

** NOTE: I removed the sound calls from BlenderPlayer. In order to fix it look at //XXX ADD SOUND in GPG_Application.cpp and GPC_Engine

*** tested in CMake+MSVC.
- Scons is not building !!! (why does the building systems have to be so different?)
And someone may like to fix make. (take a look at /trunk/source/blender/blenkernel/bad_level_call_stubs/Makefile )

**** it may work better inside /source/gameengine/GamePlayer
---
 blenderplayer/CMakeLists.txt                  |   4 +
 .../bad_level_call_stubs/CMakeLists.txt       |  40 ++++
 blenderplayer/bad_level_call_stubs/Makefile   |  45 +++++
 blenderplayer/bad_level_call_stubs/SConscript |  14 ++
 blenderplayer/bad_level_call_stubs/stubs.c    | 179 ++++++++++++++++++
 .../GamePlayer/common/GPC_Engine.cpp          |   6 +-
 .../GamePlayer/ghost/GPG_Application.cpp      |  18 +-
 7 files changed, 302 insertions(+), 4 deletions(-)
 create mode 100644 blenderplayer/bad_level_call_stubs/CMakeLists.txt
 create mode 100644 blenderplayer/bad_level_call_stubs/Makefile
 create mode 100644 blenderplayer/bad_level_call_stubs/SConscript
 create mode 100644 blenderplayer/bad_level_call_stubs/stubs.c

diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index 0407361b845..35d26662f2f 100644
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -130,4 +130,8 @@ ELSE(UNIX)
   TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
 ENDIF(UNIX)
 
+IF(WITH_PLAYER)
+  ADD_SUBDIRECTORY(bad_level_call_stubs)
+ENDIF(WITH_PLAYER)
+
 SETUP_LIBLINKS(blenderplayer)
diff --git a/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/blenderplayer/bad_level_call_stubs/CMakeLists.txt
new file mode 100644
index 00000000000..abb086b072a
--- /dev/null
+++ b/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -0,0 +1,40 @@
+# $Id$
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+FILE(GLOB SRC stubs.c)
+
+SET(INC 
+  .
+  .. 
+  ../../source/blender/makesdna
+  ../../source/blender/makesrna  
+)
+
+IF(WITH_INTERNATIONAL)
+  ADD_DEFINITIONS(-DWITH_FREETYPE2)
+ENDIF(WITH_INTERNATIONAL)
+
+BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}")
diff --git a/blenderplayer/bad_level_call_stubs/Makefile b/blenderplayer/bad_level_call_stubs/Makefile
new file mode 100644
index 00000000000..1d9f6a27327
--- /dev/null
+++ b/blenderplayer/bad_level_call_stubs/Makefile
@@ -0,0 +1,45 @@
+#
+# $Id$
+#
+# ***** 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.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = blenkernel_blc
+DIR = $(OCGDIR)/blenderplayer/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_2_C_WARNINGS)
+CFLAGS += $(FIX_STUBS_WARNINGS)
+
+CPPFLAGS += $(OGL_CPPFLAGS)
+CPPFLAGS += -I../../source/blender/makesdna
+CPPFLAGS += -I../../source/blender/makesrna
+
+# path to our own external headerfiles
+CPPFLAGS += -I..
+
diff --git a/blenderplayer/bad_level_call_stubs/SConscript b/blenderplayer/bad_level_call_stubs/SConscript
new file mode 100644
index 00000000000..bd3df38b557
--- /dev/null
+++ b/blenderplayer/bad_level_call_stubs/SConscript
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = 'stubs.c'
+
+incs = '. ..'
+incs += '../../source/blender/makesdna'
+incs += '../../source/blender/makesrna'
+
+defs = ''
+if env['WITH_BF_INTERNATIONAL']:
+    defs += 'WITH_FREETYPE2'
+
+env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player',priority=225 )
diff --git a/blenderplayer/bad_level_call_stubs/stubs.c b/blenderplayer/bad_level_call_stubs/stubs.c
new file mode 100644
index 00000000000..b3c18784ccd
--- /dev/null
+++ b/blenderplayer/bad_level_call_stubs/stubs.c
@@ -0,0 +1,179 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ * BKE_bad_level_calls function stubs
+ */
+
+#include <stdlib.h>
+#include "dna_listbase.h"
+#include "RNA_types.h"
+
+/*new render funcs */
+float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) {return NULL;}
+float RE_filter_value(int type, float x) {return 0.0f;}
+struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name) {return (struct RenderLayer *)NULL;}
+
+/* zbuf.c stub */
+void antialias_tagbuf(int xsize, int ysize, char *rectmove) {}
+void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize, float *newrect, float *imgrect, float *vecbufrect, float *zbufrect) {}
+
+/* imagetexture.c stub */
+void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float *result) {}
+
+/* texture.c */
+int multitex_thread(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres, short thread, short which_output) {return 0;}
+int multitex_ext(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres){return 0;}
+
+/* nodes */
+struct RenderResult *RE_GetResult(struct Render *re){return (struct RenderResult *) NULL;}
+struct Render *RE_GetRender(const char *name){return (struct Render *) NULL;}
+
+/* blenkernel */
+char* btempdir(){return NULL;}
+void RE_FreeRenderResult(struct RenderResult *res){}
+char* datatoc_bmonofont_ttf(){return NULL;}
+int datatoc_bmonofont_ttf_size(){return 0;}
+struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty){return (struct RenderResult *) NULL;}
+void RE_GetResultImage(struct Render *re, struct RenderResult *rr){}
+int RE_RenderInProgress(struct Render *re){return 0;}
+struct Scene *RE_GetScene(struct Render *re){return (struct Scene *) NULL;}
+void RE_Database_Free(struct Render *re){}
+void RE_FreeRender(struct Render *re){}
+void RE_shade_external(struct Render *re, struct ShadeInput *shi, struct ShadeResult *shr){}
+void RE_DataBase_GetView(struct Render *re, float mat[][4]){}
+int externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta){return 0;}
+float texture_value_blend(float tex, float out, float fact, float facg, int blendtype, int flip){return 0.0f;}
+void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype){}
+char stipple_quarttone[1]; //GLubyte stipple_quarttone[128]
+double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, char *retstr) {return 0.0f;}
+char bprogname[]="";
+
+/* rna */
+void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference){}
+void ED_armature_bone_rename(struct bArmature *arm, char *oldnamep, char *newnamep){}
+void object_test_constraints (struct Object *owner){}
+void ED_object_parent(struct Object *ob, struct Object *par, int type, const char *substr){}
+void ED_node_composit_default(struct Scene *sce){}
+
+struct EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, struct EditBone *ebo){return (struct EditBone *) NULL;}
+struct ListBase *get_active_constraints (struct Object *ob){return (struct ListBase *) NULL;}
+int ED_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan){return 0;}
+
+int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit){return 0;}
+int ED_space_image_show_render(struct SpaceImage *sima){return 0;}
+int ED_space_image_show_paint(struct SpaceImage *sima){return 0;}
+void ED_space_image_set(struct bContext *C, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){}
+struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;}
+
+struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob){return (struct PTCacheEdit *) NULL;}
+
+/* rna editors */
+char *ED_info_stats_string(struct Scene *scene){return NULL;}
+void ED_area_tag_redraw(struct ScrArea *sa){}
+void WM_event_add_fileselect(struct bContext *C, struct wmOperator *op){}
+void ED_node_texture_default(struct Tex *tx){}
+int text_file_modified(struct Text *text){return 0;}
+void ED_node_shader_default(struct Material *ma){}
+void ED_screen_animation_timer_update(struct bContext *C, int redraws){}
+int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md){return 0;}
+int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, int type){return 0;}
+int uiLayoutGetActive(struct uiLayout *layout){return 0;}
+int uiLayoutGetOperatorContext(struct uiLayout *layout){return 0;}
+int uiLayoutGetAlignment(struct uiLayout *layout){return 0;}
+int uiLayoutGetEnabled(struct uiLayout *layout){return 0;}
+float uiLayoutGetScaleX(struct uiLayout *layout){return 0.0f;}
+float uiLayoutGetScaleY(struct uiLayout *layout){return 0.0f;}
+void uiLayoutSetActive(struct uiLayout *layout, int active){}
+void uiLayoutSetOperatorContext(struct uiLayout *layout, int opcontext){}
+void uiLayoutSetEnabled(struct uiLayout *layout, int enabled){}
+void uiLayoutSetAlignment(struct uiLayout *layout, int alignment){}
+void uiLayoutSetScaleX(struct uiLayout *layout, float scale){}
+void uiLayoutSetScaleY(struct uiLayout *layout, float scale){}
+
+void uiItemR(struct uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int flag){}
+
+PointerRNA uiItemFullO(struct uiLayout *layout, char *name, int icon, char *idname, struct IDProperty *properties, int context, int flag){PointerRNA a; return a;}
+struct uiLayout *uiLayoutRow(struct uiLayout *layout, int align){return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutColumn(struct uiLayout *layout, int align){return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutColumnFlow(struct uiLayout *layout, int number, int align){return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutBox(struct uiLayout *layout){return (struct uiLayout *) NULL;}
+struct uiLayout *uiLayoutSplit(struct uiLayout *layout, float percentage){return (struct uiLayout *) NULL;}
+void uiItemsEnumR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
+void uiItemMenuEnumR(struct uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname){}
+void uiItemEnumR_string(struct uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, char *value){}
+void uiItemPointerR(struct uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, struct PointerRNA *searchptr, char *searchpropname){}
+void uiItemsEnumO(struct uiLayout *layout, char *opname, char *propname){}
+void uiItemEnumO_string(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value_str){}
+void uiItemMenuEnumO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname){}
+void uiItemBooleanO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value){}
+void uiItemIntO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value){}
+void uiItemFloatO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, float value){}
+void uiItemStringO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value){}
+void uiItemL(struct uiLayout *layout, char *name, int icon){}
+void uiItemM(struct uiLayout *layout, struct bContext *C, char *name, int icon, char *menuname){}
+void uiItemS(struct uiLayout *layout){}
+void uiLayoutSetContextPointer(struct uiLayout *layout, char *name, struct PointerRNA *ptr){}
+
+/* rna template */
+void uiTemplateHeader(struct uiLayout *layout, struct bContext *C, int menus){}
+void uiTemplateID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *newop, char *unlinkop){}
+struct uiLayout *uiTemplateModifier(struct uiLayout *layout, struct PointerRNA *ptr){return (struct uiLayout *) NULL;}
+struct uiLayout *uiTemplateConstraint(struct uiLayout *layout, struct PointerRNA *ptr){return (struct uiLayout *) NULL;}
+void uiTemplatePreview(struct uiLayout *layout, struct ID *id, struct ID *parent, struct MTex *slot){}
+void uiTemplateCurveMapping(struct uiLayout *layout, struct CurveMapping *cumap, int type, int compact){}
+void uiTemplateColorRamp(struct uiLayout *layout, struct ColorBand *coba, int expand){}
+void uiTemplateLayers(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
+void uiTemplateTriColorSet(struct uiLayout *layout, struct PointerRNA *ptr, char *propname){}
+void uiTemplateImageLayers(struct uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser){}
+ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activepropname, int rows, int listtype){struct ListBase b = {0,0}; return b;}
+void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C){}
+void uiTemplateOperatorSearch(struct uiLayout *layout){}
+void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C){}
+void uiTemplate_view3d_select_faceselmenu(struct uiLayout *layout, struct bContext *C){}
+void uiTemplateTextureImage(struct uiLayout *layout, struct bContext *C, struct Tex *tex){}
+
+/* rna render */
+struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;}
+void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result){}
+void RE_engine_end_result(struct RenderEngine *engine, struct RenderResult *result){}
+void RE_engine_update_stats(struct RenderEngine *engine, char *stats, char *info){}
+void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, char *filename){}
+void RE_result_load_from_file(struct RenderResult *result, struct ReportList *reports, char *filename){}
+int RE_engine_test_break(struct RenderEngine *engine){return 0;}
+
+/* python */
+struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet){return (struct wmOperatorType *) NULL;}
+struct wmOperatorType *WM_operatortype_first(){return (struct wmOperatorType *) NULL;}
+struct wmOperatorType *WM_operatortype_exists(const char *idname){return (struct wmOperatorType *) NULL;}
+int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *properties, struct ReportList *reports){return 0;}
+int WM_operatortype_remove(const char *idname){return 0;}
+void WM_operator_properties_free(struct PointerRNA *ptr){}
+void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){}
+void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata){}
+void WM_operator_bl_idname(char *to, const char *from){}
+short insert_keyframe (struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag){return 0;}
+
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
index a46f30c1209..9ccb55f37bc 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
@@ -58,7 +58,9 @@
 #include "NG_LoopBackNetworkDeviceInterface.h"
 
 #include "RAS_IRenderTools.h"
-#include "SND_DeviceManager.h"
+#if 0 //XXX - ADD SOUND
+	#include "SND_DeviceManager.h"
+#endif
 
 #include "GPC_Engine.h"
 #include "GPC_KeyboardDevice.h"
@@ -339,8 +341,10 @@ void GPC_Engine::Exit()
 
 	if (m_audiodevice)
 	{
+#if 0 //XXX - ADD SOUND
 		SND_DeviceManager::Unsubscribe();
 		m_audiodevice = 0;
+#endif
 	}
 
 	m_initialized = false;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index c9a2e81bdae..879c2264247 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -84,7 +84,10 @@ extern "C"
 
 #include "KX_BlenderSceneConverter.h"
 #include "NG_LoopBackNetworkDeviceInterface.h"
-#include "SND_DeviceManager.h"
+
+#if 0 //XXX - ADD SOUND
+	#include "SND_DeviceManager.h"
+#endif
 
 #include "GPC_MouseDevice.h"
 #include "GPC_RenderTools.h"
@@ -584,13 +587,16 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		if (!m_networkdevice)
 			goto initFailed;
 			
+#if 0 //XXX - ADD SOUND
 		// get an audiodevice
 		SND_DeviceManager::Subscribe();
 		m_audiodevice = SND_DeviceManager::Instance();
 		if (!m_audiodevice)
 			goto initFailed;
 		m_audiodevice->UseCD();
-		
+#endif
+
+
 		// create a ketsjisystem (only needed for timing and stuff)
 		m_kxsystem = new GPG_System (m_system);
 		if (!m_kxsystem)
@@ -607,7 +613,9 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		m_ketsjiengine->SetRenderTools(m_rendertools);
 		m_ketsjiengine->SetRasterizer(m_rasterizer);
 		m_ketsjiengine->SetNetworkDevice(m_networkdevice);
+#if 0 //XXX - ADD SOUND
 		m_ketsjiengine->SetAudioDevice(m_audiodevice);
+#endif
 		m_ketsjiengine->SetTimingDisplay(frameRate, false, false);
 
 		CValue::SetDeprecationWarnings(nodepwarnings);
@@ -621,7 +629,9 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 	return m_engineInitialized;
 initFailed:
 	delete m_kxsystem;
+#if 0 // XXX - ADD SOUND
 	delete m_audiodevice;
+#endif
 	delete m_networkdevice;
 	delete m_mouse;
 	delete m_keyboard;
@@ -680,7 +690,7 @@ bool GPG_Application::startEngine(void)
 		KX_Scene* startscene = new KX_Scene(m_keyboard,
 			m_mouse,
 			m_networkdevice,
-			m_audiodevice,
+//			m_audiodevice, // XXX ADD SOUND
 			startscenename,
 			m_startScene);
 		
@@ -783,8 +793,10 @@ void GPG_Application::exitEngine()
 	}
 	if (m_audiodevice)
 	{
+#if 0 //XXX - ADD SOUND
 		SND_DeviceManager::Unsubscribe();
 		m_audiodevice = 0;
+#endif
 	}
 	if (m_networkdevice)
 	{

From 8d407b7b28242fbccb6f314f02056bcab753a67a Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Thu, 3 Sep 2009 05:12:34 +0000
Subject: [PATCH 402/577] Grease Pencil: Datablock bugfixes

* Grease Pencil datablocks can now be properly browsed/added/unlinked from the UI panels

* Made Grease Pencil use the brush icon for now. A proper icon for this would be nice ;)
---
 source/blender/editors/gpencil/gpencil_buttons.c | 11 +++++++----
 source/blender/makesrna/intern/rna_ID.c          |  1 +
 source/blender/makesrna/intern/rna_gpencil.c     |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index c3f779b59b8..0d7cd263245 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -238,12 +238,15 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
 	col= uiLayoutColumn(layout, 0);
 		/* current Grease Pencil block */
 		// TODO: show some info about who owns this?
-		//uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_new", "GPENCIL_OT_data_unlink"); // XXX not working
-		uiItemR(col, NULL, 0, ctx_ptr, "grease_pencil", 0); // XXX this will have to do for now...
+		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", "GPENCIL_OT_data_unlink"); 
 		
-		/* add new layer button */
+		/* add new layer button - can be used even when no data, since it can add a new block too */
 		uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add");
 	
+	/* sanity checks... */
+	if (gpd == NULL)
+		return;
+	
 	/* draw each layer --------------------------------------------- */
 	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
 		col= uiLayoutColumn(layout, 1);
@@ -271,7 +274,7 @@ void gpencil_panel_standard(const bContext *C, Panel *pa)
 	/* get pointer to Grease Pencil Data */
 	gpd_ptr= gpencil_data_get_pointers((bContext *)C, &ptr);
 	
-	if (gpd_ptr && *gpd_ptr)
+	if (gpd_ptr)
 		draw_gpencil_panel((bContext *)C, pa->layout, *gpd_ptr, &ptr);
 }
 
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index dd26391b11e..f5c6063e892 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -65,6 +65,7 @@ short RNA_type_to_ID_code(StructRNA *type)
 	if(RNA_struct_is_a(type, &RNA_Brush)) return ID_BR;
 	if(RNA_struct_is_a(type, &RNA_Camera)) return ID_CA;
 	if(RNA_struct_is_a(type, &RNA_Curve)) return ID_CU;
+	if(RNA_struct_is_a(type, &RNA_GreasePencil)) return ID_GD;
 	if(RNA_struct_is_a(type, &RNA_Group)) return ID_GR;
 	if(RNA_struct_is_a(type, &RNA_Image)) return ID_IM;
 	if(RNA_struct_is_a(type, &RNA_Key)) return ID_KE;
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index df0e5ae6703..5caa868fd2e 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -223,7 +223,7 @@ void rna_def_gpencil_data(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "GreasePencil", "ID");
 	RNA_def_struct_sdna(srna, "bGPdata");
 	RNA_def_struct_ui_text(srna, "Grease Pencil", "Freehand annotation sketchbook.");
-	//RNA_def_struct_ui_icon(srna, ICON_GPENCIL);
+	RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); // XXX: ICON_GPENCIL!!!
 	
 	/* Layers */
 	prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);

From 99fbcbcf4d97c83e3c2d976244919889278a9366 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 3 Sep 2009 06:34:03 +0000
Subject: [PATCH 403/577] changes needed for building the blenderplayer with
 cmake on linux.

---
 SConstruct                                 |  3 ---
 blenderplayer/CMakeLists.txt               | 12 ++++++++---
 blenderplayer/bad_level_call_stubs/stubs.c | 25 ++++++++++++++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/SConstruct b/SConstruct
index 5a64cd7c117..ec302d90fce 100644
--- a/SConstruct
+++ b/SConstruct
@@ -402,9 +402,6 @@ dobj = B.buildinfo(env, "dynamic") + B.resources
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
-if env['WITH_BF_PLAYER']:
-	print("Warning: Game player may not build on 2.5")
-
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index 35d26662f2f..030d9dbbba0 100644
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -80,11 +80,11 @@ IF(UNIX)
     bf_oglrasterizer 
     bf_expressions 
     bf_scenegraph 
-	bf_IK
+    bf_IK
     bf_moto 
     bf_kernel 
     bf_nodes
-	bf_gpu
+    bf_gpu
     bf_imbuf
     bf_avi 
     kx_network 
@@ -93,15 +93,21 @@ IF(UNIX)
     extern_bullet 
     bf_guardedalloc 
     bf_memutil 
+    bf_python
+    bf_gen_python
     bf_blenlib 
     bf_cineon 
     bf_openexr 
     extern_libopenjpeg 
     bf_dds
     bf_readblenfile 
+    bf_dna
+    bf_rna
+    bf_blenfont
+    bf_audaspace
     blenkernel_blc
     extern_binreloc
-	extern_glew
+    extern_glew
   )
   
   IF(WITH_QUICKTIME)
diff --git a/blenderplayer/bad_level_call_stubs/stubs.c b/blenderplayer/bad_level_call_stubs/stubs.c
index b3c18784ccd..2db012ebcea 100644
--- a/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/blenderplayer/bad_level_call_stubs/stubs.c
@@ -29,7 +29,7 @@
  */
 
 #include <stdlib.h>
-#include "dna_listbase.h"
+#include "DNA_listBase.h"
 #include "RNA_types.h"
 
 /*new render funcs */
@@ -70,7 +70,6 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen
 void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype){}
 char stipple_quarttone[1]; //GLubyte stipple_quarttone[128]
 double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, char *retstr) {return 0.0f;}
-char bprogname[]="";
 
 /* rna */
 void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference){}
@@ -177,3 +176,25 @@ void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*), v
 void WM_operator_bl_idname(char *to, const char *from){}
 short insert_keyframe (struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag){return 0;}
 
+/* smoke */
+void lzo1x_1_compress(void) {return;};
+void LzmaCompress(void) {return;};
+void smoke_export(void) {return;};
+void lzo1x_decompress(void) {return;};
+void LzmaUncompress(void) {return;};
+void smoke_init(void) {return;};
+void smoke_turbulence_init(void) {return;};
+void smoke_turbulence_initBlenderRNA(void) {return;};
+void smoke_initBlenderRNA(void) {return;};
+void smoke_free(void) {return;};
+void smoke_turbulence_free(void) {return;};
+void smoke_turbulence_step(void) {return;};
+void smoke_dissolve(void) {return;};
+void smoke_get_density(void) {return;};
+void smoke_get_heat(void) {return;};
+void smoke_get_velocity_x(void) {return;};
+void smoke_get_velocity_y(void) {return;};
+void smoke_get_velocity_z(void) {return;};
+void smoke_get_obstacle(void) {return;};
+void smoke_get_index(void) {return;};
+void smoke_step(void) {return;};

From 070f12d0ddd186769b0c0760e5ccd2de08d1e493 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 3 Sep 2009 07:12:41 +0000
Subject: [PATCH 404/577] sound init/exit so at least the player opens

---
 source/gameengine/GamePlayer/common/GPC_Engine.cpp | 2 +-
 source/gameengine/GamePlayer/ghost/GPG_ghost.cpp   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
index 9ccb55f37bc..f131987095a 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
@@ -343,8 +343,8 @@ void GPC_Engine::Exit()
 	{
 #if 0 //XXX - ADD SOUND
 		SND_DeviceManager::Unsubscribe();
-		m_audiodevice = 0;
 #endif
+		m_audiodevice = 0;
 	}
 
 	m_initialized = false;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 2433c587179..d399d6b3443 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -59,6 +59,7 @@ extern "C"
 #include "BKE_icons.h"	
 #include "BKE_node.h"	
 #include "BKE_report.h"	
+#include "BKE_sound.h"	
 #include "BLI_blenlib.h"
 #include "DNA_scene_types.h"
 #include "BLO_readfile.h"
@@ -358,6 +359,8 @@ int main(int argc, char** argv)
 	quicktime_init();
 #endif
 
+	sound_init();
+
 	libtiff_init();
  
 	// Parse command line options
@@ -818,6 +821,8 @@ int main(int argc, char** argv)
 	}
 
 	free_nodesystem();
+	
+	sound_exit();
 
 	return error ? -1 : 0;
 }

From 40c89b5c6ee639539fdc74e669d92152e9e9fc06 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 3 Sep 2009 10:34:54 +0000
Subject: [PATCH 405/577] Missing header include for non-linux OS "BLI_exist()"

---
 source/blender/python/intern/bpy_interface.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index ac8acc2c07c..a935b517f77 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -55,6 +55,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_util.h"
+#include "BLI_storage.h"
 #include "BLI_fileops.h"
 #include "BLI_string.h"
 

From 78425fb6577e7d1a27e331daacf48c7c53422efd Mon Sep 17 00:00:00 2001
From: Michael Fox <mfoxdogg@gmail.com>
Date: Thu, 3 Sep 2009 10:42:53 +0000
Subject: [PATCH 406/577]  2.5 ***** first commit in a long time, and its great
 to be back!

commited Select Mirror operator for objects
eg. L.sword->R.sword

added to 3dview select menu aswel

the hotkey is shift-ctrl-m (hope its not taken)
---
 release/ui/space_view3d.py                    |   1 +
 source/blender/editors/object/object_edit.c   | 161 ++++++++++++++++++
 source/blender/editors/object/object_intern.h |   1 +
 source/blender/editors/object/object_ops.c    |   2 +
 4 files changed, 165 insertions(+)

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index c5c1abf1d40..8477e52acab 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -167,6 +167,7 @@ class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
 		layout.itemO("object.select_all_toggle", text="Select/Deselect All")
 		layout.itemO("object.select_inverse", text="Inverse")
 		layout.itemO("object.select_random", text="Random")
+		layout.itemO("object.select_mirror", text="Mirror")
 		layout.itemO("object.select_by_layer", text="Select All by Layer")
 		layout.item_enumO("object.select_by_type", "type", "", text="Select All by Type...")
 		layout.itemO("object.select_grouped", text="Select Grouped...")
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 04187c93196..33ecb144f13 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <math.h>
 #include <time.h>
+#include <float.h>
+#include <ctype.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -2189,6 +2191,165 @@ void OBJECT_OT_select_all_toggle(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 }
+/* ****** select mirror *******/
+/* finds the best possible flipped name. For renaming; check for unique names afterwards */
+/* if strip_number: removes number extensions */
+void object_flip_name (char *name)
+{
+	int     len;
+	char    prefix[128]={""};   /* The part before the facing */
+	char    suffix[128]={""};   /* The part after the facing */
+	char    replace[128]={""};  /* The replacement string */
+	char    number[128]={""};   /* The number extension string */
+	char    *index=NULL;
+
+	len= strlen(name);
+	if(len<3) return; // we don't do names like .R or .L
+
+	/* We first check the case with a .### extension, let's find the last period */
+	if(isdigit(name[len-1])) {
+		index= strrchr(name, '.'); // last occurrance
+		if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever!
+			strcpy(number, index);
+			*index= 0;
+			len= strlen(name);
+		}
+	}
+
+	strcpy (prefix, name);
+
+#define IS_SEPARATOR(a) ((a)=='.' || (a)==' ' || (a)=='-' || (a)=='_')
+
+	/* first case; separator . - _ with extensions r R l L  */
+	if( IS_SEPARATOR(name[len-2]) ) {
+		switch(name[len-1]) {
+			case 'l':
+				prefix[len-1]= 0;
+				strcpy(replace, "r");
+				break;
+			case 'r':
+				prefix[len-1]= 0;
+				strcpy(replace, "l");
+				break;
+			case 'L':
+				prefix[len-1]= 0;
+				strcpy(replace, "R");
+				break;
+			case 'R':
+				prefix[len-1]= 0;
+				strcpy(replace, "L");
+				break;
+		}
+	}
+	/* case; beginning with r R l L , with separator after it */
+	else if( IS_SEPARATOR(name[1]) ) {
+		switch(name[0]) {
+			case 'l':
+				strcpy(replace, "r");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+			case 'r':
+				strcpy(replace, "l");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+			case 'L':
+				strcpy(replace, "R");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+			case 'R':
+				strcpy(replace, "L");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+		}
+	}
+	else if(len > 5) {
+		/* hrms, why test for a separator? lets do the rule 'ultimate left or right' */
+		index = BLI_strcasestr(prefix, "right");
+		if (index==prefix || index==prefix+len-5) {
+			if(index[0]=='r') 
+				strcpy (replace, "left");
+			else {
+				if(index[1]=='I') 
+					strcpy (replace, "LEFT");
+				else
+					strcpy (replace, "Left");
+			}
+			*index= 0;
+			strcpy (suffix, index+5);
+		}
+		else {
+			index = BLI_strcasestr(prefix, "left");
+			if (index==prefix || index==prefix+len-4) {
+				if(index[0]=='l') 
+					strcpy (replace, "right");
+				else {
+					if(index[1]=='E') 
+						strcpy (replace, "RIGHT");
+					else
+						strcpy (replace, "Right");
+				}
+				*index= 0;
+				strcpy (suffix, index+4);
+			}
+		}
+	}
+
+#undef IS_SEPARATOR
+
+	sprintf (name, "%s%s%s%s", prefix, replace, suffix, number);
+}
+
+static int object_select_mirror_exec(bContext *C, wmOperator *op)
+{
+	char tmpname[32];
+	short seltype;
+	
+	seltype = RNA_enum_get(op->ptr, "seltype");
+	
+	CTX_DATA_BEGIN(C, Base*, primbase, selected_bases) {
+
+		strcpy(tmpname, primbase->object->id.name+2);
+		object_flip_name(tmpname);
+		
+		CTX_DATA_BEGIN(C, Base*, secbase, visible_bases) {
+			if(!strcmp(secbase->object->id.name+2, tmpname)) {
+				ED_base_object_select(secbase, BA_SELECT);
+			}
+		}
+		CTX_DATA_END;
+		
+		if (seltype == 0) ED_base_object_select(primbase, BA_DESELECT);
+		
+	}
+	CTX_DATA_END;
+	
+	/* undo? */
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_mirror(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Select Mirror";
+	ot->description = "Select the Mirror objects of the selected object eg. L.sword -> R.sword";
+	ot->idname= "OBJECT_OT_select_mirror";
+	
+	/* api callbacks */
+	ot->exec= object_select_mirror_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
+}
 /* ****** random selection *******/
 
 static int object_select_random_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 82bbb34f59a..27f80186bf9 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -54,6 +54,7 @@ void OBJECT_OT_select_by_type(struct wmOperatorType *ot);
 void OBJECT_OT_select_by_layer(struct wmOperatorType *ot);
 void OBJECT_OT_select_linked(struct wmOperatorType *ot);
 void OBJECT_OT_select_grouped(struct wmOperatorType *ot);
+void OBJECT_OT_select_mirror(struct wmOperatorType *ot);
 void OBJECT_OT_location_clear(struct wmOperatorType *ot);
 void OBJECT_OT_rotation_clear(struct wmOperatorType *ot);
 void OBJECT_OT_scale_clear(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 73dad7895a1..5e90ed85625 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -79,6 +79,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_select_by_layer);
 	WM_operatortype_append(OBJECT_OT_select_linked);
 	WM_operatortype_append(OBJECT_OT_select_grouped);
+	WM_operatortype_append(OBJECT_OT_select_mirror);
 	WM_operatortype_append(OBJECT_OT_location_clear);
 	WM_operatortype_append(OBJECT_OT_rotation_clear);
 	WM_operatortype_append(OBJECT_OT_scale_clear);
@@ -192,6 +193,7 @@ void ED_keymap_object(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "OBJECT_OT_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "OBJECT_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "OBJECT_OT_select_grouped", GKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "OBJECT_OT_select_mirror", MKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
 	
 	WM_keymap_verify_item(keymap, "OBJECT_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_verify_item(keymap, "OBJECT_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);

From 92395bb93cf862c5d19a40942ba3c8fbc94de962 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Thu, 3 Sep 2009 12:20:59 +0000
Subject: [PATCH 407/577] 2.5 - A few bugfixes...

* Autoside renaming tools in EditMode for armatures now works again. (Wrong property name)
* Action used by NLA Strips can now be chosen/changed to another action
---
 release/ui/buttons_data_bone.py                | 1 +
 release/ui/space_view3d.py                     | 6 +++---
 source/blender/editors/armature/editarmature.c | 4 ++--
 source/blender/editors/space_nla/nla_buttons.c | 3 ++-
 source/blender/makesrna/intern/rna_nla.c       | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 8098648886b..276ca066af5 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -80,6 +80,7 @@ class BONE_PT_bone(BoneButtonsPanel):
 		
 		if not bone:
 			bone = context.edit_bone
+			pchan = None
 		else:
 			pchan = ob.pose.pose_channels[context.bone.name]
 
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 8477e52acab..1d7ea280222 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -1069,9 +1069,9 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 		
 		layout.itemS()
 
-		layout.item_enumO("armature.autoside_names", "axis", 'XAXIS', text="AutoName Left/Right")
-		layout.item_enumO("armature.autoside_names", "axis", 'YAXIS', text="AutoName Front/Back")
-		layout.item_enumO("armature.autoside_names", "axis", 'ZAXIS', text="AutoName Top/Bottom")
+		layout.item_enumO("armature.autoside_names", "type", 'XAXIS', text="AutoName Left/Right")
+		layout.item_enumO("armature.autoside_names", "type", 'YAXIS', text="AutoName Front/Back")
+		layout.item_enumO("armature.autoside_names", "type", 'ZAXIS', text="AutoName Top/Bottom")
 		layout.itemO("armature.flip_names")
 
 		layout.itemS()
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 632f037679f..9f83733a640 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -5387,7 +5387,7 @@ static int armature_autoside_names_exec (bContext *C, wmOperator *op)
 	Object *ob= CTX_data_edit_object(C);
 	bArmature *arm;
 	char newname[32];
-	short axis= RNA_enum_get(op->ptr, "axis");
+	short axis= RNA_enum_get(op->ptr, "type");
 	
 	/* paranoia checks */
 	if (ELEM(NULL, ob, ob->pose)) 
@@ -5434,7 +5434,7 @@ void ARMATURE_OT_autoside_names (wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* settings */
-	RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Axis tag names with.");
+	RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with.");
 }
 
 
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index 2ffca5185f2..facea34510e 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -119,6 +119,7 @@ static int nla_panel_context(const bContext *C, PointerRNA *adt_ptr, PointerRNA
 	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 	
 	for (ale= anim_data.first; ale; ale= ale->next) {
+		// TODO: need some way to select active animdata too...
 		if (ale->type == ANIMTYPE_NLATRACK) {
 			NlaTrack *nlt= (NlaTrack *)ale->data;
 			AnimData *adt= ale->adt;
@@ -210,7 +211,7 @@ static void nla_panel_animdata (const bContext *C, Panel *pa)
 	/* Active Action Properties ------------------------------------- */
 	/* action */
 	row= uiLayoutRow(layout, 1);
-		uiItemR(row, NULL, 0, &adt_ptr, "action", 0);
+		uiTemplateID(row, C, &adt_ptr, "action", NULL, NULL/*"ACT_OT_new", "ACT_OT_unlink"*/); // XXX: need to make these operators
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 98fdf4a6878..690a198f12c 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -350,6 +350,7 @@ void rna_def_nlastrip(BlenderRNA *brna)
 	/* Action */
 	prop= RNA_def_property(srna, "action", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "act");
+	RNA_def_property_flag(prop, PROP_EDITABLE); 
 	RNA_def_property_ui_text(prop, "Action", "Action referenced by this strip.");
 	
 	/* Action extents */

From 9250ab0619387d80964c64738334e437a92c25cf Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Thu, 3 Sep 2009 17:45:04 +0000
Subject: [PATCH 408/577] 2.5/Multires:

* Added back multires delete higher levels (new operator + button)
---
 release/ui/buttons_data_modifier.py           |  6 +++-
 source/blender/editors/object/object_intern.h |  1 +
 .../blender/editors/object/object_modifier.c  | 28 +++++++++++++++++++
 source/blender/editors/object/object_ops.c    |  1 +
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index 66c8179f990..2835f55f71a 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -269,7 +269,11 @@ class DATA_PT_modifiers(DataButtonsPanel):
 		
 	def MULTIRES(self, layout, ob, md):
 		layout.itemR(md, "subdivision_type")
-		layout.itemO("object.multires_subdivide", text="Subdivide")
+		
+		row = layout.row()
+		row.itemO("object.multires_subdivide", text="Subdivide")
+		row.itemO("object.multires_higher_levels_delete", text="Delete Higher")
+
 		layout.itemR(md, "level")
 	
 	def PARTICLE_INSTANCE(self, layout, ob, md):
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 27f80186bf9..8eaa388cdf0 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -109,6 +109,7 @@ void OBJECT_OT_modifier_apply(struct wmOperatorType *ot);
 void OBJECT_OT_modifier_convert(struct wmOperatorType *ot);
 void OBJECT_OT_modifier_copy(struct wmOperatorType *ot);
 void OBJECT_OT_multires_subdivide(struct wmOperatorType *ot);
+void OBJECT_OT_multires_higher_levels_delete(struct wmOperatorType *ot);
 void OBJECT_OT_meshdeform_bind(struct wmOperatorType *ot);
 void OBJECT_OT_hook_reset(struct wmOperatorType *ot);
 void OBJECT_OT_hook_recenter(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 0b8fedd2eda..f9e2ac2f4de 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -676,6 +676,34 @@ void OBJECT_OT_modifier_copy(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
+/************* multires delete higher levels operator ****************/
+
+static int multires_higher_levels_delete_exec(bContext *C, wmOperator *op)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier);
+	Object *ob= ptr.id.data;
+	MultiresModifierData *mmd= ptr.data;
+
+	if(mmd) {
+		multiresModifier_del_levels(mmd, ob, 1);
+		WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+	}
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_multires_higher_levels_delete(wmOperatorType *ot)
+{
+	ot->name= "Delete Higher Levels";
+	ot->idname= "OBJECT_OT_multires_higher_levels_delete";
+	ot->poll= ED_operator_object_active;
+
+	ot->exec= multires_higher_levels_delete_exec;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
 /****************** multires subdivide operator *********************/
 
 static int multires_subdivide_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 5e90ed85625..09a27e9e613 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -119,6 +119,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_modifier_convert);
 	WM_operatortype_append(OBJECT_OT_modifier_copy);
 	WM_operatortype_append(OBJECT_OT_multires_subdivide);
+	WM_operatortype_append(OBJECT_OT_multires_higher_levels_delete);
 	WM_operatortype_append(OBJECT_OT_meshdeform_bind);
 	WM_operatortype_append(OBJECT_OT_hook_reset);
 	WM_operatortype_append(OBJECT_OT_hook_recenter);

From 579b8ef6e52255ff89ce62756709217fe68f596a Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 3 Sep 2009 18:38:52 +0000
Subject: [PATCH 409/577] 2.5: fix missing LIB_NEEDLINK check in windowmanager
 reading, would cause crash with linking/appending.

---
 source/blender/blenloader/intern/readfile.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 64fabc825bc..0231d841c2b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4355,11 +4355,14 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
 static void lib_link_windowmanager(FileData *fd, Main *main)
 {
 	wmWindowManager *wm;
+	wmWindow *win;
 	
 	for(wm= main->wm.first; wm; wm= wm->id.next) {
-		wmWindow *win;
-		for(win= wm->windows.first; win; win= win->next) {
-			win->screen= newlibadr(fd, NULL, win->screen);
+		if(wm->id.flag & LIB_NEEDLINK) {
+			for(win= wm->windows.first; win; win= win->next)
+				win->screen= newlibadr(fd, NULL, win->screen);
+
+			wm->id.flag -= LIB_NEEDLINK;
 		}
 	}
 }

From fc975a91484a1346049071fa9c6c8877820245cd Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 3 Sep 2009 19:08:16 +0000
Subject: [PATCH 410/577] Bugfix for usage of uninitialized variable on windows
 (props_ptr.data needs to be set to NULL before calling uiItemFullO() ) -
 please check if this also compiles on gcc

---
 source/blender/editors/object/object_edit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 33ecb144f13..a5e92096ef9 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2951,7 +2951,7 @@ static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 	else if (ob->id.lib) {
 		uiPopupMenu *pup= uiPupMenuBegin(C, "OK?", ICON_QUESTION);
 		uiLayout *layout= uiPupMenuLayout(pup);
-		PointerRNA props_ptr;
+		PointerRNA props_ptr = {0};
 		
 		/* create operator menu item with relevant properties filled in */
 		props_ptr= uiItemFullO(layout, op->type->name, 0, op->idname, props_ptr.data, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);

From 02f951c3a05f6586f12d129c70adffd8315ec3b7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 3 Sep 2009 22:37:09 +0000
Subject: [PATCH 411/577] allow execution mode to be given as an argument to
 operators from python (requested by algorith) example.
 bpy.ops.tfm.rotate('INVOKE_REGION_WIN', pivot=(0,1,2), ......)

bpy_array.c - was too strict with types, 0 should be allowed as well as 0.0 in a float array.
---
 blenderplayer/bad_level_call_stubs/stubs.c    |  2 +-
 release/ui/bpy_ops.py                         | 28 +++++++++-
 .../makesdna/DNA_windowmanager_types.h        |  4 ++
 source/blender/python/intern/bpy_array.c      |  6 +--
 source/blender/python/intern/bpy_operator.c   | 35 +++---------
 source/blender/windowmanager/WM_api.h         |  3 +-
 source/blender/windowmanager/intern/wm.c      |  2 +-
 .../windowmanager/intern/wm_event_system.c    | 54 ++++++++++++-------
 8 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/blenderplayer/bad_level_call_stubs/stubs.c b/blenderplayer/bad_level_call_stubs/stubs.c
index 2db012ebcea..5ddafca5340 100644
--- a/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/blenderplayer/bad_level_call_stubs/stubs.c
@@ -168,7 +168,7 @@ int RE_engine_test_break(struct RenderEngine *engine){return 0;}
 struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet){return (struct wmOperatorType *) NULL;}
 struct wmOperatorType *WM_operatortype_first(){return (struct wmOperatorType *) NULL;}
 struct wmOperatorType *WM_operatortype_exists(const char *idname){return (struct wmOperatorType *) NULL;}
-int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *properties, struct ReportList *reports){return 0;}
+int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports){return 0;}
 int WM_operatortype_remove(const char *idname){return 0;}
 void WM_operator_properties_free(struct PointerRNA *ptr){}
 void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){}
diff --git a/release/ui/bpy_ops.py b/release/ui/bpy_ops.py
index aa9bfb460f0..dff8125fca1 100644
--- a/release/ui/bpy_ops.py
+++ b/release/ui/bpy_ops.py
@@ -5,6 +5,18 @@ from bpy.__ops__ import dir		as op_dir
 from bpy.__ops__ import call		as op_call
 from bpy.__ops__ import get_rna	as op_get_rna
 
+# Keep in sync with WM_types.h
+context_dict = {
+	'INVOKE_DEFAULT':0,
+	'INVOKE_REGION_WIN':1,
+	'INVOKE_AREA':2,
+	'INVOKE_SCREEN':3,
+	'EXEC_DEFAULT':4,
+	'EXEC_REGION_WIN':5,
+	'EXEC_AREA':6,
+	'EXEC_SCREEN':7,
+}
+
 class bpy_ops(object):
 	'''
 	Fake module like class.
@@ -94,10 +106,22 @@ class bpy_ops_submodule_op(object):
 		# submod.foo -> SUBMOD_OT_foo
 		return self.module.upper() + '_OT_' + self.func
 	
-	def __call__(self, **kw):
+	def __call__(self, *args, **kw):
 		
 		# Get the operator from blender
-		return op_call(self.idname(), kw)
+		if len(args) > 1:
+			raise ValueError("only one argument for the execution context is supported ")
+		
+		if args:
+			try:
+				context = context_dict[args[0]]
+			except:
+				raise ValueError("Expected a single context argument in: " + str(list(context_dict.keys())))
+			
+			return op_call(self.idname(), kw, context)
+		
+		else:
+			return op_call(self.idname(), kw)
 	
 	def get_rna(self):
 		'''
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 7d03bbec1ee..10f83c8b9ec 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -285,6 +285,7 @@ typedef struct wmOperator {
 	
 	ListBase macro;				/* list of operators, can be a tree */
 	struct wmOperator *opm;		/* current running macro, not saved */
+	short flag, pad[3];
 	
 } wmOperator;
 
@@ -295,6 +296,9 @@ typedef struct wmOperator {
 /* add this flag if the event should pass through */
 #define OPERATOR_PASS_THROUGH	8
 
+/* wmOperator flag */
+#define OPERATOR_REPORT_FREE	1
+
 
 /* ************** wmEvent ************************ */
 /* for read-only rna access, dont save this */
diff --git a/source/blender/python/intern/bpy_array.c b/source/blender/python/intern/bpy_array.c
index d52bfda202d..669cccb7011 100644
--- a/source/blender/python/intern/bpy_array.c
+++ b/source/blender/python/intern/bpy_array.c
@@ -203,17 +203,17 @@ static void pyrna_py_to_boolean(PyObject *py, char *data)
 
 static int py_float_check(PyObject *py)
 {
-	return PyFloat_Check(py);
+	return PyFloat_Check(py) || (PyIndex_Check(py));
 }
 
 static int py_int_check(PyObject *py)
 {
-	return PyLong_Check(py);
+	return PyLong_Check(py) || (PyIndex_Check(py));
 }
 
 static int py_bool_check(PyObject *py)
 {
-	return PyBool_Check(py);
+	return PyBool_Check(py) || (PyIndex_Check(py));
 }
 
 int pyrna_py_to_float_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index e431f2a21e9..062db42e0e9 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -40,42 +40,23 @@
 #include "BKE_utildefines.h"
 
 
-/* 'self' stores the operator string */
 static PyObject *pyop_call( PyObject * self, PyObject * args)
 {
 	wmOperatorType *ot;
 	int error_val = 0;
 	PointerRNA ptr;
 	
-	char *opname;
-	PyObject *kw= NULL;
+	char		*opname;
+	PyObject	*kw= NULL; /* optional args */
+
+	/* note that context is an int, python does the conversion in this case */
+	int context= WM_OP_EXEC_DEFAULT;
 
 	// XXX Todo, work out a better solution for passing on context, could make a tuple from self and pack the name and Context into it...
 	bContext *C = BPy_GetContext();
 	
-
-	switch(PyTuple_Size(args)) {
-	case 2:
-		kw = PyTuple_GET_ITEM(args, 1);
-
-		if(!PyDict_Check(kw)) {
-			PyErr_SetString( PyExc_AttributeError, "bpy.__ops__.call: expected second arg to be a dict");
-			return NULL;
-		}
-		/* pass through */
-	case 1:
-		opname = _PyUnicode_AsString(PyTuple_GET_ITEM(args, 0));
-
-		if(opname==NULL) {
-			PyErr_SetString( PyExc_AttributeError, "bpy.__ops__.call: expected the first arg to be a string");
-			return NULL;
-		}
-		break;
-	default:
-		PyErr_SetString( PyExc_AttributeError, "bpy.__ops__.call: expected a string and optional dict");
+	if (!PyArg_ParseTuple(args, "s|O!i:bpy.__ops__.call", &opname, &PyDict_Type, &kw, &context))
 		return NULL;
-	}
-
 
 	ot= WM_operatortype_find(opname, TRUE);
 
@@ -88,7 +69,7 @@ static PyObject *pyop_call( PyObject * self, PyObject * args)
 		PyErr_SetString( PyExc_SystemError, "bpy.__ops__.call: operator poll() function failed, context is incorrect");
 		return NULL;
 	}
-	
+
 	/* WM_operator_properties_create(&ptr, opname); */
 	/* Save another lookup */
 	RNA_pointer_create(NULL, ot->srna, NULL, &ptr);
@@ -102,7 +83,7 @@ static PyObject *pyop_call( PyObject * self, PyObject * args)
 
 		BKE_reports_init(&reports, RPT_STORE);
 
-		WM_operator_call_py(C, ot, &ptr, &reports);
+		WM_operator_call_py(C, ot, context, &ptr, &reports);
 
 		if(BPy_reports_to_error(&reports))
 			error_val = -1;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 0f5558382c4..544804b26d6 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -165,7 +165,7 @@ wmOperatorTypeMacro *WM_operatortype_macro_define(wmOperatorType *ot, const char
 int			WM_operator_call		(struct bContext *C, struct wmOperator *op);
 int			WM_operator_repeat		(struct bContext *C, struct wmOperator *op);
 int         WM_operator_name_call	(struct bContext *C, const char *opstring, int context, struct PointerRNA *properties);
-int			WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *properties, struct ReportList *reports);
+int			WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports);
 
 void		WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring);
 void		WM_operator_properties_free(struct PointerRNA *ptr);
@@ -245,6 +245,5 @@ void		WM_jobs_stop_all(struct wmWindowManager *wm);
 char		*WM_clipboard_text_get(int selection);
 void		WM_clipboard_text_set(char *buf, int selection);
 
-
 #endif /* WM_API_H */
 
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 85f8a647826..fecd5c20a15 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -69,7 +69,7 @@ void WM_operator_free(wmOperator *op)
 		MEM_freeN(op->properties);
 	}
 
-	if(op->reports) {
+	if(op->reports && (op->flag & OPERATOR_REPORT_FREE)) {
 		BKE_reports_clear(op->reports);
 		MEM_freeN(op->reports);
 	}
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 6c34ed6f902..717c2d25261 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -345,11 +345,12 @@ static wmOperator *wm_operator_create(wmWindowManager *wm, wmOperatorType *ot, P
 
 	/* initialize error reports */
 	if (reports) {
-		op->reports= reports; /* must be initialized alredy */
+		op->reports= reports; /* must be initialized already */
 	}
 	else {
 		op->reports= MEM_mallocN(sizeof(ReportList), "wmOperatorReportList");
 		BKE_reports_init(op->reports, RPT_STORE);
+		op->flag |= OPERATOR_REPORT_FREE;
 	}
 	
 	/* recursive filling of operator macro list */
@@ -392,13 +393,13 @@ static void wm_region_mouse_co(bContext *C, wmEvent *event)
 	}
 }
 
-static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, PointerRNA *properties)
+static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, PointerRNA *properties, ReportList *reports)
 {
 	wmWindowManager *wm= CTX_wm_manager(C);
 	int retval= OPERATOR_PASS_THROUGH;
 
 	if(wm_operator_poll(C, ot)) {
-		wmOperator *op= wm_operator_create(wm, ot, properties, NULL);
+		wmOperator *op= wm_operator_create(wm, ot, properties, reports); /* if reports==NULL, theyll be initialized */
 		
 		if((G.f & G_DEBUG) && event && event->type!=MOUSEMOVE)
 			printf("handle evt %d win %d op %s\n", event?event->type:0, CTX_wm_screen(C)->subwinactive, ot->idname); 
@@ -442,10 +443,12 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, P
 	return retval;
 }
 
-/* invokes operator in context */
-int WM_operator_name_call(bContext *C, const char *opstring, int context, PointerRNA *properties)
+/* WM_operator_name_call is the main accessor function
+ * this is for python to access since its done the operator lookup
+ * 
+ * invokes operator in context */
+static int wm_operator_call_internal(bContext *C, wmOperatorType *ot, int context, PointerRNA *properties, ReportList *reports)
 {
-	wmOperatorType *ot= WM_operatortype_find(opstring, 0);
 	wmWindow *window= CTX_wm_window(C);
 	wmEvent *event;
 	
@@ -473,7 +476,7 @@ int WM_operator_name_call(bContext *C, const char *opstring, int context, Pointe
 						CTX_wm_region_set(C, ar1);
 				}
 				
-				retval= wm_operator_invoke(C, ot, event, properties);
+				retval= wm_operator_invoke(C, ot, event, properties, reports);
 				
 				/* set region back */
 				CTX_wm_region_set(C, ar);
@@ -488,7 +491,7 @@ int WM_operator_name_call(bContext *C, const char *opstring, int context, Pointe
 				ARegion *ar= CTX_wm_region(C);
 
 				CTX_wm_region_set(C, NULL);
-				retval= wm_operator_invoke(C, ot, event, properties);
+				retval= wm_operator_invoke(C, ot, event, properties, reports);
 				CTX_wm_region_set(C, ar);
 
 				return retval;
@@ -503,7 +506,7 @@ int WM_operator_name_call(bContext *C, const char *opstring, int context, Pointe
 
 				CTX_wm_region_set(C, NULL);
 				CTX_wm_area_set(C, NULL);
-				retval= wm_operator_invoke(C, ot, event, properties);
+				retval= wm_operator_invoke(C, ot, event, properties, reports);
 				CTX_wm_region_set(C, ar);
 				CTX_wm_area_set(C, area);
 
@@ -512,32 +515,45 @@ int WM_operator_name_call(bContext *C, const char *opstring, int context, Pointe
 			case WM_OP_EXEC_DEFAULT:
 				event= NULL;	/* pass on without break */
 			case WM_OP_INVOKE_DEFAULT:
-				return wm_operator_invoke(C, ot, event, properties);
+				return wm_operator_invoke(C, ot, event, properties, reports);
 		}
 	}
 	
 	return 0;
 }
 
+
+/* invokes operator in context */
+int WM_operator_name_call(bContext *C, const char *opstring, int context, PointerRNA *properties)
+{
+	wmOperatorType *ot= WM_operatortype_find(opstring, 0);
+	if(ot)
+		return wm_operator_call_internal(C, ot, context, properties, NULL);
+
+	return 0;
+}
+
 /* Similar to WM_operator_name_call called with WM_OP_EXEC_DEFAULT context.
    - wmOperatorType is used instead of operator name since python alredy has the operator type
    - poll() must be called by python before this runs.
    - reports can be passed to this function (so python can report them as exceptions)
 */
-int WM_operator_call_py(bContext *C, wmOperatorType *ot, PointerRNA *properties, ReportList *reports)
+int WM_operator_call_py(bContext *C, wmOperatorType *ot, int context, PointerRNA *properties, ReportList *reports)
 {
-	wmWindowManager *wm=	CTX_wm_manager(C);
-	wmOperator *op=			wm_operator_create(wm, ot, properties, reports);
 	int retval= OPERATOR_CANCELLED;
-	
+
+#if 0
+	wmOperator *op;
+	wmWindowManager *wm=	CTX_wm_manager(C);
+	op= wm_operator_create(wm, ot, properties, reports);
+
 	if (op->type->exec)
 		retval= op->type->exec(C, op);
 	else
 		printf("error \"%s\" operator has no exec function, python cannot call it\n", op->type->name);
-	
-	if (reports)
-		op->reports= NULL; /* dont let the operator free reports passed to this function */
-	WM_operator_free(op);
+#endif
+
+	retval= wm_operator_call_internal(C, ot, context, properties, reports);
 	
 	return retval;
 }
@@ -820,7 +836,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand
 		wmOperatorType *ot= WM_operatortype_find(event->keymap_idname, 0);
 
 		if(ot)
-			retval= wm_operator_invoke(C, ot, event, properties);
+			retval= wm_operator_invoke(C, ot, event, properties, NULL);
 	}
 
 	if(retval & OPERATOR_PASS_THROUGH)

From 993037d3cb52aa438096215e9d120e6f3d95205b Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 00:18:44 +0000
Subject: [PATCH 412/577] 2.5 - Bugfixes for Armature operators

AutoSide names now gets called correctly from menus.

However, the toggle bone settings operators aren't. I can't seem to get them to call the invoke again after making autoside call exec...
---
 release/ui/space_view3d.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 1d7ea280222..ae1edc0295b 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -622,6 +622,7 @@ class VIEW3D_MT_POSE(bpy.types.Menu):
 		
 		layout.itemS()
 		
+		layout.operator_context = "EXEC_AREA"
 		layout.item_enumO("pose.autoside_names", "axis", 'XAXIS', text="AutoName Left/Right")
 		layout.item_enumO("pose.autoside_names", "axis", 'YAXIS', text="AutoName Front/Back")
 		layout.item_enumO("pose.autoside_names", "axis", 'ZAXIS', text="AutoName Top/Bottom")
@@ -630,6 +631,7 @@ class VIEW3D_MT_POSE(bpy.types.Menu):
 		
 		layout.itemS()
 		
+		layout.operator_context = "INVOKE_AREA"
 		layout.itemO("pose.armature_layers", text="Change Armature Layers...")
 		layout.itemO("pose.bone_layers", text="Change Bone Layers...")
 		
@@ -1068,14 +1070,16 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 		layout.itemO("armature.subdivide_multi", text="Subdivide")
 		
 		layout.itemS()
-
+		
+		layout.operator_context = "EXEC_AREA"
 		layout.item_enumO("armature.autoside_names", "type", 'XAXIS', text="AutoName Left/Right")
 		layout.item_enumO("armature.autoside_names", "type", 'YAXIS', text="AutoName Front/Back")
 		layout.item_enumO("armature.autoside_names", "type", 'ZAXIS', text="AutoName Top/Bottom")
 		layout.itemO("armature.flip_names")
 
 		layout.itemS()
-
+		
+		layout.operator_context = "INVOKE_DEFAULT"
 		layout.itemO("armature.armature_layers")
 		layout.itemO("armature.bone_layers")
 
@@ -1084,7 +1088,7 @@ class VIEW3D_MT_edit_ARMATURE(bpy.types.Menu):
 		layout.itemM("VIEW3D_MT_edit_ARMATURE_parent")
 
 		layout.itemS()
-
+		
 		layout.item_menu_enumO("armature.flags_set", "mode", text="Bone Settings")
 
 class VIEW3D_MT_edit_ARMATURE_parent(bpy.types.Menu):

From 640e39206b25bcd433223d85298961a860fc5cd7 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 4 Sep 2009 01:33:22 +0000
Subject: [PATCH 413/577] add blendcache files to dependancies. next step, per
 frames deps.

---
 release/io/netrender/utils.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/release/io/netrender/utils.py b/release/io/netrender/utils.py
index 30d96b2f92f..62571011bc1 100644
--- a/release/io/netrender/utils.py
+++ b/release/io/netrender/utils.py
@@ -1,5 +1,6 @@
 import bpy
 import sys, os
+import re
 import http, http.client, http.server, urllib
 import subprocess, shutil, time, hashlib
 
@@ -66,7 +67,22 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 			
 		job.files.append(lib_path)
 	
-	print(job.files)
+	root, ext = os.path.splitext(name)
+	cache_path = path + os.sep + "blendcache_" + root + os.sep # need an API call for that
+	
+	print("cache:", cache_path)
+	
+	if os.path.exists(cache_path):
+		pattern = re.compile("[a-zA-Z0-9]+_([0-9]+)_[0-9]+\.bphys")
+		for cache_name in sorted(os.listdir(cache_path)):
+			match = pattern.match(cache_name)
+			
+			if match:
+				print("Frame:", int(match.groups()[0]), cache_name)
+			
+			job.files.append(cache_path + cache_name)
+		
+	#print(job.files)
 	
 	job.name = job_name
 	

From fa01703ac3caf08c42509e17be94559efd69bd2b Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 02:44:56 +0000
Subject: [PATCH 414/577] 2.5 - Keyframe Types for DopeSheet

It is now possible to tag certain keyframes as being 'breakdowns' in the DopeSheet. Breakdown keyframes are drawn as slightly smaller blue diamonds.

Simply select the relevant keyframes and use the RKEY hotkey (or from the menus, Key->Keyframe Type) to choose between tagging the keyframe as a 'proper' keyframe and a 'breakdown' keyframe.

Notes:
* Please note that this feature does not currently imply anything about breakdowns moving around keyframes or behaving any differently from any other type of keyframe
* In future, if there is any such need, more keyframe types could be added, though this is not really likely at all
---
 .../editors/animation/keyframes_draw.c        | 37 +++++++---
 .../editors/animation/keyframes_edit.c        | 31 +++++++-
 source/blender/editors/include/ED_anim_api.h  |  7 +-
 .../editors/include/ED_keyframes_draw.h       |  6 +-
 .../editors/include/ED_keyframes_edit.h       |  3 +-
 .../editors/space_action/action_edit.c        | 71 +++++++++++++++++++
 .../editors/space_action/action_header.c      | 18 +++--
 .../editors/space_action/action_intern.h      |  1 +
 .../blender/editors/space_action/action_ops.c |  2 +
 .../editors/space_graph/graph_header.c        | 10 +--
 .../blender/editors/space_nla/nla_buttons.c   |  2 +-
 source/blender/editors/space_nla/nla_draw.c   |  2 +-
 source/blender/makesdna/DNA_curve_types.h     | 17 +++--
 source/blender/makesrna/RNA_enum_types.h      |  1 +
 source/blender/makesrna/intern/rna_curve.c    | 19 ++++-
 15 files changed, 193 insertions(+), 34 deletions(-)

diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 2107e6e4252..abea38e129e 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -98,9 +98,7 @@ static ActKeyColumn *bezt_to_new_actkeycolumn(BezTriple *bezt)
 	/* store settings based on state of BezTriple */
 	ak->cfra= bezt->vec[1][0];
 	ak->sel= BEZSELECTED(bezt) ? SELECT : 0;
-	
-	// TODO: handle type = bezt->h1 or bezt->h2
-	ak->handle_type= 0; 
+	ak->key_type= BEZKEYTYPE(bezt); 
 	
 	/* set 'modified', since this is used to identify long keyframes */
 	ak->modified = 1;
@@ -134,6 +132,10 @@ static void add_bezt_to_keycolumns_list(DLRBT_Tree *keys, BezTriple *bezt)
 				if (BEZSELECTED(bezt)) ak->sel = SELECT;
 				ak->modified += 1;
 				
+				/* for keyframe type, 'proper' keyframes have priority over breakdowns (and other types for now) */
+				if (BEZKEYTYPE(bezt) == BEZT_KEYTYPE_KEYFRAME)
+					ak->key_type= BEZT_KEYTYPE_KEYFRAME;
+				
 				/* done... no need to insert */
 				return;
 			}
@@ -340,7 +342,7 @@ static const float _unit_diamond_shape[4][2] = {
 }; 
 
 /* draw a simple diamond shape with OpenGL */
-void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel, short mode)
+void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel, short key_type, short mode)
 {
 	static GLuint displist1=0;
 	static GLuint displist2=0;
@@ -371,6 +373,11 @@ void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel
 		glEndList();
 	}
 	
+	/* tweak size of keyframe shape according to type of keyframe 
+	 * 	- 'proper' keyframes have key_type=0, so get drawn at full size
+	 */
+	hsize -= 0.5f*key_type;
+	
 	/* adjust view transform before starting */
 	glTranslatef(x, y, 0.0f);
 	glScalef(1.0f/xscale*hsize, hsize, 1.0f);
@@ -381,8 +388,22 @@ void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel
 	/* draw! */
 	if ELEM(mode, KEYFRAME_SHAPE_INSIDE, KEYFRAME_SHAPE_BOTH) {
 		/* interior - hardcoded colors (for selected and unselected only) */
-		if (sel) UI_ThemeColorShade(TH_STRIP_SELECT, 50);
-		else glColor3ub(0xE9, 0xE9, 0xE9);
+		switch (key_type) {
+			case BEZT_KEYTYPE_BREAKDOWN: /* bluish frames for now */
+			{
+				if (sel) glColor3f(0.33f, 0.75f, 0.93f);
+				else glColor3f(0.70f, 0.86f, 0.91f);
+			}
+				break;
+				
+			case BEZT_KEYTYPE_KEYFRAME: /* traditional yellowish frames for now */
+			default:
+			{
+				if (sel) UI_ThemeColorShade(TH_STRIP_SELECT, 50);
+				else glColor3f(0.91f, 0.91f, 0.91f);
+			}
+				break;
+		}
 		
 		glCallList(displist2);
 	}
@@ -454,7 +475,7 @@ static void draw_keylist(View2D *v2d, DLRBT_Tree *keys, DLRBT_Tree *blocks, floa
 			/* draw using OpenGL - uglier but faster */
 			// NOTE1: a previous version of this didn't work nice for some intel cards
 			// NOTE2: if we wanted to go back to icons, these are  icon = (ak->sel & SELECT) ? ICON_SPACE2 : ICON_SPACE3;
-			draw_keyframe_shape(ak->cfra, ypos, xscale, 5.0f, (ak->sel & SELECT), KEYFRAME_SHAPE_BOTH);
+			draw_keyframe_shape(ak->cfra, ypos, xscale, 5.0f, (ak->sel & SELECT), ak->key_type, KEYFRAME_SHAPE_BOTH);
 		}	
 	}
 	
@@ -695,7 +716,7 @@ void gpl_to_keylist(bDopeSheet *ads, bGPDlayer *gpl, DLRBT_Tree *keys, DLRBT_Tre
 			
 			ak->cfra= (float)gpf->framenum;
 			ak->modified = 1;
-			ak->handle_type= 0; 
+			ak->key_type= 0; 
 			
 			if (gpf->flag & GP_FRAME_SELECT)
 				ak->sel = SELECT;
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 77826eca87a..ac04dc7d1a8 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -655,7 +655,7 @@ static short set_bezt_bezier(BeztEditData *bed, BezTriple *bezt)
 	return 0;
 }
 
-/* Set the interpolation type of the selected BezTriples in each IPO curve to the specified one */
+/* Set the interpolation type of the selected BezTriples in each F-Curve to the specified one */
 // ANIM_editkeyframes_ipocurve_ipotype() !
 BeztEditFunc ANIM_editkeyframes_ipo(short code)
 {
@@ -669,6 +669,35 @@ BeztEditFunc ANIM_editkeyframes_ipo(short code)
 	}
 }
 
+/* ------- */
+
+static short set_keytype_keyframe(BeztEditData *bed, BezTriple *bezt) 
+{
+	if (bezt->f2 & SELECT) 
+		BEZKEYTYPE(bezt)= BEZT_KEYTYPE_KEYFRAME;
+	return 0;
+}
+
+static short set_keytype_breakdown(BeztEditData *bed, BezTriple *bezt) 
+{
+	if (bezt->f2 & SELECT) 
+		BEZKEYTYPE(bezt)= BEZT_KEYTYPE_BREAKDOWN;
+	return 0;
+}
+
+/* Set the interpolation type of the selected BezTriples in each F-Curve to the specified one */
+BeztEditFunc ANIM_editkeyframes_keytype(short code)
+{
+	switch (code) {
+		case BEZT_KEYTYPE_BREAKDOWN: /* breakdown */
+			return set_keytype_breakdown;
+			
+		case BEZT_KEYTYPE_KEYFRAME: /* proper keyframe */	
+		default:
+			return set_keytype_keyframe;
+	}
+}
+
 /* ******************************************* */
 /* Selection */
 
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 179f362b13f..af37cd87254 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -434,7 +434,12 @@ void ED_nla_postop_refresh(bAnimContext *ac);
 /* ------------- Utility macros ----------------------- */
 
 /* checks if the given BezTriple is selected */
-#define BEZSELECTED(bezt) ((bezt->f2 & SELECT) || (bezt->f1 & SELECT) || (bezt->f3 & SELECT))
+#define BEZSELECTED(bezt) (((bezt)->f2 & SELECT) || ((bezt)->f1 & SELECT) || ((bezt)->f3 & SELECT))
+
+/* provide access to Keyframe Type info in BezTriple
+ * NOTE: this is so that we can change it from being stored in 'hide'
+ */
+#define BEZKEYTYPE(bezt) ((bezt)->hide)
 
 /* set/clear/toggle macro 
  *	- channel - channel with a 'flag' member that we're setting
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index e940aaed36e..259104f7263 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -56,8 +56,8 @@ typedef struct ActKeyColumn {
 	char tree_col;						/* DLRB_BLACK or DLRB_RED */
 	
 		/* keyframe info */
-	char sel;
-	short handle_type;
+	char key_type;						/* eBezTripe_KeyframeType */
+	short sel;
 	float cfra;
 	
 	/* only while drawing - used to determine if long-keyframe needs to be drawn */
@@ -99,7 +99,7 @@ typedef enum eKeyframeShapeDrawOpts {
 } eKeyframeShapeDrawOpts;
 
 /* draw simple diamond-shape keyframe (with OpenGL) */
-void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel, short mode);
+void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel, short key_type, short mode);
 
 /* ******************************* Methods ****************************** */
 
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index 77e95dc77de..390729eaec4 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -40,8 +40,6 @@ struct Scene;
 
 /* --------- BezTriple Selection ------------- */
 
-#define BEZSELECTED(bezt) ((bezt->f2 & SELECT) || (bezt->f1 & SELECT) || (bezt->f3 & SELECT))
-
 #define BEZ_SEL(bezt)		{ (bezt)->f1 |=  SELECT; (bezt)->f2 |=  SELECT; (bezt)->f3 |=  SELECT; }
 #define BEZ_DESEL(bezt)		{ (bezt)->f1 &= ~SELECT; (bezt)->f2 &= ~SELECT; (bezt)->f3 &= ~SELECT; }
 #define BEZ_INVSEL(bezt)	{ (bezt)->f1 ^=  SELECT; (bezt)->f2 ^=  SELECT; (bezt)->f3 ^=  SELECT; }
@@ -133,6 +131,7 @@ BeztEditFunc ANIM_editkeyframes_mirror(short mode);
 BeztEditFunc ANIM_editkeyframes_select(short mode);
 BeztEditFunc ANIM_editkeyframes_handles(short mode);
 BeztEditFunc ANIM_editkeyframes_ipo(short mode);
+BeztEditFunc ANIM_editkeyframes_keytype(short mode);
 
 /* ----------- BezTriple Callback (Assorted Utilities) ---------- */
 
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index d4709e94e5e..b087736a368 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -1038,6 +1038,77 @@ void ACT_OT_handle_type (wmOperatorType *ot)
 	RNA_def_enum(ot->srna, "type", beztriple_handle_type_items, 0, "Type", "");
 }
 
+/* ******************** Set Keyframe-Type Operator *********************** */
+
+/* this function is responsible for setting interpolation mode for keyframes */
+static void setkeytype_action_keys(bAnimContext *ac, short mode) 
+{
+	ListBase anim_data = {NULL, NULL};
+	bAnimListElem *ale;
+	int filter;
+	BeztEditFunc set_cb= ANIM_editkeyframes_keytype(mode);
+	
+	/* filter data */
+	filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+	
+	/* loop through setting BezTriple interpolation
+	 * Note: we do not supply BeztEditData to the looper yet. Currently that's not necessary here...
+	 */
+	for (ale= anim_data.first; ale; ale= ale->next)
+		ANIM_fcurve_keys_bezier_loop(NULL, ale->key_data, NULL, set_cb, NULL);
+	
+	/* cleanup */
+	BLI_freelistN(&anim_data);
+}
+
+/* ------------------- */
+
+static int actkeys_keytype_exec(bContext *C, wmOperator *op)
+{
+	bAnimContext ac;
+	short mode;
+	
+	/* get editor data */
+	if (ANIM_animdata_get_context(C, &ac) == 0)
+		return OPERATOR_CANCELLED;
+	if (ac.datatype == ANIMCONT_GPENCIL) 
+		return OPERATOR_PASS_THROUGH;
+		
+	/* get handle setting mode */
+	mode= RNA_enum_get(op->ptr, "type");
+	
+	/* set handle type */
+	setkeytype_action_keys(&ac, mode);
+	
+	/* validate keyframes after editing */
+	ANIM_editkeyframes_refresh(&ac);
+	
+	/* set notifier that keyframe properties have changed */
+	WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_PROP, NULL);
+	
+	return OPERATOR_FINISHED;
+}
+ 
+void ACT_OT_keyframe_type (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Set Keyframe Type";
+	ot->idname= "ACT_OT_keyframe_type";
+	ot->description= "Set type of keyframe for the seleced keyframes.";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= actkeys_keytype_exec;
+	ot->poll= ED_operator_action_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* id-props */
+	RNA_def_enum(ot->srna, "type", beztriple_keyframe_type_items, 0, "Type", "");
+}
+
 /* ************************************************************************** */
 /* TRANSFORM STUFF */
 
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index e2a725164c9..f18d31915f9 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -168,7 +168,7 @@ static void act_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unus
 
 static void act_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); 
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_snap", "type", ACTKEYS_SNAP_CFRA);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_snap", "type", ACTKEYS_SNAP_NEAREST_FRAME);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_snap", "type", ACTKEYS_SNAP_NEAREST_SECOND);
@@ -177,16 +177,23 @@ static void act_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void act_edit_mirrormenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_mirror", "type", ACTKEYS_MIRROR_CFRA);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_mirror", "type", ACTKEYS_MIRROR_YAXIS);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_mirror", "type", ACTKEYS_MIRROR_XAXIS);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_mirror", "type", ACTKEYS_MIRROR_MARKER);
 }
 
+static void act_edit_keytypesmenu(bContext *C, uiLayout *layout, void *arg_unused)
+{
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_keyframe_type", "type", BEZT_KEYTYPE_KEYFRAME);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_keyframe_type", "type", BEZT_KEYTYPE_BREAKDOWN);
+}
+
 static void act_edit_handlesmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type", "type", HD_FREE);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type", "type", HD_AUTO);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type", "type", HD_VECT);
@@ -196,7 +203,7 @@ static void act_edit_handlesmenu(bContext *C, uiLayout *layout, void *arg_unused
 
 static void act_edit_ipomenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_interpolation_type", "type", BEZT_IPO_CONST);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_interpolation_type", "type", BEZT_IPO_LIN);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_interpolation_type", "type", BEZT_IPO_BEZ);
@@ -204,7 +211,7 @@ static void act_edit_ipomenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void act_edit_expomenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_extrapolation_type", "type", FCURVE_EXTRAPOLATE_CONSTANT);
 	uiItemEnumO(layout, NULL, 0, "ACT_OT_extrapolation_type", "type", FCURVE_EXTRAPOLATE_LINEAR);
 }
@@ -226,6 +233,7 @@ static void act_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 	
 	uiItemS(layout);
 	
+	uiItemMenuF(layout, "Keyframe Type", 0, act_edit_keytypesmenu, NULL);
 	uiItemMenuF(layout, "Handle Type", 0, act_edit_handlesmenu, NULL);
 	uiItemMenuF(layout, "Interpolation Mode", 0, act_edit_ipomenu, NULL);
 	uiItemMenuF(layout, "Extrapolation Mode", 0, act_edit_expomenu, NULL);
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h
index 1aeeeff0c80..e5f0ab8994e 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -89,6 +89,7 @@ void ACT_OT_delete(struct wmOperatorType *ot);
 void ACT_OT_clean(struct wmOperatorType *ot);
 void ACT_OT_sample(struct wmOperatorType *ot);
 
+void ACT_OT_keyframe_type(struct wmOperatorType *ot);
 void ACT_OT_handle_type(struct wmOperatorType *ot);
 void ACT_OT_interpolation_type(struct wmOperatorType *ot);
 void ACT_OT_extrapolation_type(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c
index f18b6197eb3..42b033040b1 100644
--- a/source/blender/editors/space_action/action_ops.c
+++ b/source/blender/editors/space_action/action_ops.c
@@ -75,6 +75,7 @@ void action_operatortypes(void)
 	WM_operatortype_append(ACT_OT_handle_type);
 	WM_operatortype_append(ACT_OT_interpolation_type);
 	WM_operatortype_append(ACT_OT_extrapolation_type);
+	WM_operatortype_append(ACT_OT_keyframe_type);
 	WM_operatortype_append(ACT_OT_sample);
 	WM_operatortype_append(ACT_OT_clean);
 	WM_operatortype_append(ACT_OT_delete);
@@ -133,6 +134,7 @@ static void action_keymap_keyframes (wmWindowManager *wm, ListBase *keymap)
 	WM_keymap_add_item(keymap, "ACT_OT_handle_type", HKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "ACT_OT_interpolation_type", TKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "ACT_OT_extrapolation_type", EKEY, KM_PRESS, KM_SHIFT, 0); 
+	WM_keymap_add_item(keymap, "ACT_OT_keyframe_type", RKEY, KM_PRESS, 0, 0); 
 	
 		/* destructive */
 	WM_keymap_add_item(keymap, "ACT_OT_clean", OKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
index 06d48fe20f3..dd304cd8cf3 100644
--- a/source/blender/editors/space_graph/graph_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -160,7 +160,7 @@ static void graph_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_un
 
 static void graph_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_snap", "type", GRAPHKEYS_SNAP_CFRA);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_snap", "type", GRAPHKEYS_SNAP_NEAREST_FRAME);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_snap", "type", GRAPHKEYS_SNAP_NEAREST_SECOND);
@@ -169,7 +169,7 @@ static void graph_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void graph_edit_mirrormenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_mirror", "type", GRAPHKEYS_MIRROR_CFRA);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_mirror", "type", GRAPHKEYS_MIRROR_YAXIS);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_mirror", "type", GRAPHKEYS_MIRROR_XAXIS);
@@ -178,7 +178,7 @@ static void graph_edit_mirrormenu(bContext *C, uiLayout *layout, void *arg_unuse
 
 static void graph_edit_handlesmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_handle_type", "type", HD_FREE);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_handle_type", "type", HD_AUTO);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_handle_type", "type", HD_VECT);
@@ -188,7 +188,7 @@ static void graph_edit_handlesmenu(bContext *C, uiLayout *layout, void *arg_unus
 
 static void graph_edit_ipomenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_interpolation_type", "type", BEZT_IPO_CONST);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_interpolation_type", "type", BEZT_IPO_LIN);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_interpolation_type", "type", BEZT_IPO_BEZ);
@@ -196,7 +196,7 @@ static void graph_edit_ipomenu(bContext *C, uiLayout *layout, void *arg_unused)
 
 static void graph_edit_expomenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); // xxx?
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_extrapolation_type", "type", FCURVE_EXTRAPOLATE_CONSTANT);
 	uiItemEnumO(layout, NULL, 0, "GRAPH_OT_extrapolation_type", "type", FCURVE_EXTRAPOLATE_LINEAR);
 }
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index facea34510e..bbf1358a37c 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -211,7 +211,7 @@ static void nla_panel_animdata (const bContext *C, Panel *pa)
 	/* Active Action Properties ------------------------------------- */
 	/* action */
 	row= uiLayoutRow(layout, 1);
-		uiTemplateID(row, C, &adt_ptr, "action", NULL, NULL/*"ACT_OT_new", "ACT_OT_unlink"*/); // XXX: need to make these operators
+		uiTemplateID(row, (bContext *)C, &adt_ptr, "action", NULL, NULL/*"ACT_OT_new", "ACT_OT_unlink"*/); // XXX: need to make these operators
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index f30954292b4..b21f37ab678 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -167,7 +167,7 @@ static void nla_action_draw_keyframes (AnimData *adt, bAction *act, View2D *v2d,
 	 *	- size is 3.0f which is smaller than the editable keyframes, so that there is a distinction
 	 */
 	for (ak= keys.first; ak; ak= ak->next)
-		draw_keyframe_shape(ak->cfra, y, xscale, 3.0f, 0, KEYFRAME_SHAPE_FRAME);
+		draw_keyframe_shape(ak->cfra, y, xscale, 3.0f, 0, ak->key_type, KEYFRAME_SHAPE_FRAME);
 	
 	/* free icons */
 	BLI_dlrbTree_free(&keys);
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index b0f089d670f..3bac2c73bcb 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -75,25 +75,28 @@ typedef struct BevPoint {
 	short f1, f2;
 } BevPoint;
 
-/* Keyframes on IPO curves and Points on Bezier Curves/Paths are generally BezTriples */
+/* Keyframes on F-Curves (allows code reuse of Bezier eval code) and 
+ * Points on Bezier Curves/Paths are generally BezTriples 
+ */
 /* note: alfa location in struct is abused by Key system */
 /* vec in BezTriple looks like this:
 	vec[0][0]=x location of handle 1
 	vec[0][1]=y location of handle 1
-	vec[0][2]=z location of handle 1 (not used for IpoCurve Points(2d))
+	vec[0][2]=z location of handle 1 (not used for FCurve Points(2d))
 	vec[1][0]=x location of control point
 	vec[1][1]=y location of control point
 	vec[1][2]=z location of control point
 	vec[2][0]=x location of handle 2
 	vec[2][1]=y location of handle 2
-	vec[2][2]=z location of handle 2 (not used for IpoCurve Points(2d))
+	vec[2][2]=z location of handle 2 (not used for FCurve Points(2d))
 */
 typedef struct BezTriple {
 	float vec[3][3];
 	float alfa, weight, radius;	/* alfa: tilt in 3D View, weight: used for softbody goal weight, radius: for bevel tapering */
 	short ipo;					/* ipo: interpolation mode for segment from this BezTriple to the next */
 	char h1, h2; 				/* h1, h2: the handle type of the two handles */
-	char f1, f2, f3, hide;		/* f1, f2, f3: used for selection status,  hide: used to indicate whether BezTriple is hidden */
+	char f1, f2, f3;			/* f1, f2, f3: used for selection status */
+	char hide;					/* hide: used to indicate whether BezTriple is hidden (3D), type of keyframe (eBezTriple_KeyframeTypes) */
 } BezTriple;
 
 /* note; alfa location in struct is abused by Key system */
@@ -279,6 +282,12 @@ typedef enum eBezTriple_Interpolation {
 	BEZT_IPO_BEZ,		/* bezier interpolation */
 } eBezTriple_Interpolation;
 
+/* types of keyframe (used only for BezTriple->hide when BezTriple is used in F-Curves) */
+typedef enum eBezTriple_KeyframeType {
+	BEZT_KEYTYPE_KEYFRAME = 0,	/* default - 'proper' Keyframe */
+	BEZT_KEYTYPE_BREAKDOWN,		/* 'breakdown' keyframe */
+} eBezTriple_KeyframeType;
+
 /* *************** CHARINFO **************** */
 
 /* flag */
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 3bba474677f..a59fc8716ec 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -38,6 +38,7 @@ extern EnumPropertyItem modifier_type_items[];
 extern EnumPropertyItem constraint_type_items[];
 extern EnumPropertyItem boidrule_type_items[];
 
+extern EnumPropertyItem beztriple_keyframe_type_items[];
 extern EnumPropertyItem beztriple_handle_type_items[];
 extern EnumPropertyItem beztriple_interpolation_mode_items[];
 
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index bb094eef962..503ca031fb6 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -48,6 +48,11 @@ EnumPropertyItem beztriple_interpolation_mode_items[] = {
 		{BEZT_IPO_LIN, "LINEAR", 0, "Linear", ""},
 		{BEZT_IPO_BEZ, "BEZIER", 0, "Bezier", ""},
 		{0, NULL, 0, NULL, NULL}};
+		
+EnumPropertyItem beztriple_keyframe_type_items[] = {
+		{BEZT_KEYTYPE_KEYFRAME, "KEYFRAME", 0, "Keyframe", ""},
+		{BEZT_KEYTYPE_BREAKDOWN, "BREAKDOWN", 0, "Breakdown", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 #ifdef RNA_RUNTIME
 
@@ -155,7 +160,10 @@ static void rna_Curve_update_data(bContext *C, PointerRNA *ptr)
 	Scene *scene= CTX_data_scene(C);
 	Curve *cu= ptr->id.data;
 	Object *ob;
-
+	
+	if (cu == NULL)
+		return;
+	
 	for(ob=bmain->object.first; ob; ob= ob->id.next) {
 		if(ob->data == cu) {
 			/* XXX this will loop over all objects again (slow) */
@@ -259,10 +267,15 @@ static void rna_def_beztriple(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "interpolation", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "ipo");
-	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_enum_items(prop, beztriple_interpolation_mode_items);
 	RNA_def_property_ui_text(prop, "Interpolation", "(For F-Curves Only) Interpolation to use for segment of curve starting from current BezTriple.");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	//RNA_def_property_update(prop, 0, "rna_Curve_update_data"); // this should be an F-Curve update call instead...
+	
+	prop= RNA_def_property(srna, "keyframe_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "hide");
+	RNA_def_property_enum_items(prop, beztriple_keyframe_type_items);
+	RNA_def_property_ui_text(prop, "Keyframe Type", "(For F-Curves only) The type of keyframe this control point defines.");
+	//RNA_def_property_update(prop, 0, "rna_Curve_update_data"); // this should be an F-Curve update call instead...
 
 	/* Vector values */
 	prop= RNA_def_property(srna, "handle1", PROP_FLOAT, PROP_TRANSLATION);

From d577e0d986651ee28c6c1031df7db966430f218f Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 04:05:29 +0000
Subject: [PATCH 415/577] * clean commented-out parts

---
 SConstruct | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/SConstruct b/SConstruct
index ec302d90fce..a66587695f3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -207,7 +207,6 @@ if env['WITH_BF_OPENMP'] == 1:
 				env.Append(CCFLAGS=['-fopenmp']) 
 				env.Append(CPPFLAGS=['-fopenmp'])
 				env.Append(CXXFLAGS=['-fopenmp'])
-				# env.Append(LINKFLAGS=['-fprofile-generate'])
 
 #check for additional debug libnames
 
@@ -301,7 +300,6 @@ if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-min
 	env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
 
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
-#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
 B.root_build_dir = env['BF_BUILDDIR']
 B.doc_build_dir = env['BF_DOCDIR']
 if not B.root_build_dir[-1]==os.sep:
@@ -403,7 +401,6 @@ thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
-	#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
@@ -579,11 +576,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
 						'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-#						'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-#						'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-#						'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-#						'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
-#						'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
 						'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
 	if env['WITH_BF_JACK']:
 		dllsources += ['${LCGDIR}/jack/lib/libjack.dll']

From a819ef1bf2222b2e1132c0a3d9b6b133c8263348 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 04:27:06 +0000
Subject: [PATCH 416/577] 2.5 - Keyframing Bugfixes + Code Cleanups

* DopeSheet + Graph Editor - 'Sample Keyframes' option now tags newly created keyframes as being breakdowns. Also moved reduced the code duplication here by moving the core code for this to the animation module.

* Keyframing (Standard/Auto) - Added proper 'replace' option
Keyframes can now be rekeyed non-destructively when the INSERTKEY_REPLACE flag is provided to the keyframing API functions, since this option will make sure that only the values of the handles get altered.

For the Auto-Keyframing 'Replace/Edit Keys' option, this means that it truly works as it describes now, since it will now only replace the values of the keyframes on the current frame, and won't create new keyframes in the process or destroy the tangents already created for those keys.

For things like the sliders in animation editors, keyframes changing the value won't destroy existing tangents.
---
 .../editors/animation/anim_channels_defines.c |  6 ++
 .../editors/animation/keyframes_general.c     | 76 +++++++++++++++-
 source/blender/editors/animation/keyframing.c | 90 +++++++++++++------
 source/blender/editors/animation/keyingsets.c |  3 +-
 .../editors/include/ED_keyframes_draw.h       |  2 +-
 .../editors/include/ED_keyframes_edit.h       |  1 +
 .../blender/editors/include/ED_keyframing.h   |  5 +-
 .../editors/interface/interface_anim.c        |  2 +
 .../editors/space_action/action_edit.c        | 67 +-------------
 .../editors/space_action/action_header.c      |  2 +-
 .../blender/editors/space_graph/graph_edit.c  | 69 +-------------
 .../editors/transform/transform_conversions.c | 52 ++++++-----
 12 files changed, 186 insertions(+), 189 deletions(-)

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index b16420a7094..e3418fa194f 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2003,6 +2003,8 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi
 		flag |= INSERTKEY_NEEDED;
 	if (IS_AUTOKEY_FLAG(AUTOMATKEY))
 		flag |= INSERTKEY_MATRIX;
+	if (IS_AUTOKEY_MODE(scene, EDITKEYS))
+		flag |= INSERTKEY_REPLACE;
 	
 	
 	/* get RNA pointer, and resolve the path */
@@ -2010,6 +2012,10 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi
 	
 	/* try to resolve the path stored in the F-Curve */
 	if (RNA_path_resolve(&id_ptr, fcu->rna_path, &ptr, &prop)) {
+		/* set the special 'replace' flag if on a keyframe */
+		if (fcurve_frame_has_keyframe(fcu, cfra, 0))
+			flag |= INSERTKEY_REPLACE;
+		
 		/* insert a keyframe for this F-Curve */
 		done= insert_keyframe_direct(ptr, prop, fcu, cfra, flag);
 		
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index ced3c117700..f13d35c7d4a 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -357,6 +357,76 @@ void smooth_fcurve (FCurve *fcu)
 	calchandles_fcurve(fcu);
 }
 
+/* ---------------- */
+
+/* little cache for values... */
+typedef struct tempFrameValCache {
+	float frame, val;
+} tempFrameValCache;
+
+
+/* Evaluates the curves between each selected keyframe on each frame, and keys the value  */
+void sample_fcurve (FCurve *fcu)
+{
+	BezTriple *bezt, *start=NULL, *end=NULL;
+	tempFrameValCache *value_cache, *fp;
+	int sfra, range;
+	int i, n, nIndex;
+	
+	/* find selected keyframes... once pair has been found, add keyframes  */
+	for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
+		/* check if selected, and which end this is */
+		if (BEZSELECTED(bezt)) {
+			if (start) {
+				/* set end */
+				end= bezt;
+				
+				/* cache values then add keyframes using these values, as adding
+				 * keyframes while sampling will affect the outcome...
+				 *	- only start sampling+adding from index=1, so that we don't overwrite original keyframe
+				 */
+				range= (int)( ceil(end->vec[1][0] - start->vec[1][0]) );
+				sfra= (int)( floor(start->vec[1][0]) );
+				
+				if (range) {
+					value_cache= MEM_callocN(sizeof(tempFrameValCache)*range, "IcuFrameValCache");
+					
+					/* 	sample values 	*/
+					for (n=1, fp=value_cache; n<range && fp; n++, fp++) {
+						fp->frame= (float)(sfra + n);
+						fp->val= evaluate_fcurve(fcu, fp->frame);
+					}
+					
+					/* 	add keyframes with these, tagging as 'breakdowns' 	*/
+					for (n=1, fp=value_cache; n<range && fp; n++, fp++) {
+						nIndex= insert_vert_fcurve(fcu, fp->frame, fp->val, 1);
+						BEZKEYTYPE(fcu->bezt + nIndex)= BEZT_KEYTYPE_BREAKDOWN;
+					}
+					
+					/* free temp cache */
+					MEM_freeN(value_cache);
+					
+					/* as we added keyframes, we need to compensate so that bezt is at the right place */
+					bezt = fcu->bezt + i + range - 1;
+					i += (range - 1);
+				}
+				
+				/* bezt was selected, so it now marks the start of a whole new chain to search */
+				start= bezt;
+				end= NULL;
+			}
+			else {
+				/* just set start keyframe */
+				start= bezt;
+				end= NULL;
+			}
+		}
+	}
+	
+	/* recalculate channel's handles? */
+	calchandles_fcurve(fcu);
+}
+
 /* **************************************************** */
 /* Copy/Paste Tools */
 /* - The copy/paste buffer currently stores a set of temporary F-Curves containing only the keyframes 
@@ -529,8 +599,10 @@ short paste_animedit_keys (bAnimContext *ac, ListBase *anim_data)
 				bezt->vec[1][0] += offset;
 				bezt->vec[2][0] += offset;
 				
-				/* insert the keyframe */
-				insert_bezt_fcurve(fcu, bezt);
+				/* insert the keyframe
+				 * NOTE: no special flags here for now
+				 */
+				insert_bezt_fcurve(fcu, bezt, 0); 
 				
 				/* un-apply offset from src beztriple after copying */
 				bezt->vec[0][0] -= offset;
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 5f444609baa..d731ec6f148 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -262,9 +262,8 @@ static int binarysearch_bezt_index (BezTriple array[], float frame, int arraylen
  * NOTE: any recalculate of the F-Curve that needs to be done will need to 
  * 		be done by the caller.
  */
-int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt)
+int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt, short flag)
 {
-	BezTriple *newb;
 	int i= 0;
 	
 	if (fcu->bezt) {
@@ -273,13 +272,34 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt)
 		
 		if (replace) {			
 			/* sanity check: 'i' may in rare cases exceed arraylen */
-			// FIXME: do not overwrite handletype if just replacing...?
-			if ((i >= 0) && (i < fcu->totvert))
-				*(fcu->bezt + i) = *bezt;
+			if ((i >= 0) && (i < fcu->totvert)) {
+				/* take care with the handletypes and other info if the replacement flags are set */
+				if (flag & INSERTKEY_REPLACE) {
+					BezTriple *dst= (fcu->bezt + i);
+					float dy= bezt->vec[1][1] - dst->vec[1][1];
+					
+					/* just apply delta value change to the handle values */
+					dst->vec[0][1] += dy;
+					dst->vec[1][1] += dy;
+					dst->vec[2][1] += dy;
+					
+					// TODO: perform some other operations?
+				}
+				else {
+					/* just brutally replace the values */
+					*(fcu->bezt + i) = *bezt;
+				}
+			}
 		}
-		else {
-			/* add new */
-			newb= MEM_callocN((fcu->totvert+1)*sizeof(BezTriple), "beztriple");
+		else if ((flag & INSERTKEY_REPLACE) == 0) {
+			/* add new - if we're not restricted to replacing keyframes only */
+			BezTriple *newb;
+			
+			/* allocate a new array only if we have to */
+			if ((flag & INSERTKEY_FASTR) == 0)
+				newb= MEM_callocN((fcu->totvert+1)*sizeof(BezTriple), "beztriple");
+			else
+				newb= fcu->bezt;
 			
 			/* add the beztriples that should occur before the beztriple to be pasted (originally in ei->icu) */
 			if (i > 0)
@@ -292,9 +312,11 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt)
 			if (i < fcu->totvert) 
 				memcpy(newb+i+1, fcu->bezt+i, (fcu->totvert-i)*sizeof(BezTriple));
 			
-			/* replace (+ free) old with new */
-			MEM_freeN(fcu->bezt);
-			fcu->bezt= newb;
+			/* replace (+ free) old with new, only if necessary to do so */
+			if ((flag & INSERTKEY_FASTR) == 0) {
+				MEM_freeN(fcu->bezt);
+				fcu->bezt= newb;
+			}
 			
 			fcu->totvert++;
 		}
@@ -313,13 +335,11 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt)
 	return i;
 }
 
-/* This function is a wrapper for insert_bezt_icu, and should be used when
- * adding a new keyframe to a curve, when the keyframe doesn't exist anywhere
- * else yet. 
- * 
- * 'fast' - is only for the python API where importing BVH's would take an extreamly long time.
+/* This function is a wrapper for insert_bezt_fcurve_internal(), and should be used when
+ * adding a new keyframe to a curve, when the keyframe doesn't exist anywhere else yet. 
+ * It returns the index at which the keyframe was added.
  */
-void insert_vert_fcurve (FCurve *fcu, float x, float y, short fast)
+int insert_vert_fcurve (FCurve *fcu, float x, float y, short flag)
 {
 	BezTriple beztr;
 	int a;
@@ -337,21 +357,22 @@ void insert_vert_fcurve (FCurve *fcu, float x, float y, short fast)
 	beztr.h1= beztr.h2= HD_AUTO; // XXX what about when we replace an old one?
 	
 	/* add temp beztriple to keyframes */
-	a= insert_bezt_fcurve(fcu, &beztr);
+	a= insert_bezt_fcurve(fcu, &beztr, flag);
 	
 	/* what if 'a' is a negative index? 
 	 * for now, just exit to prevent any segfaults
 	 */
-	if (a < 0) return;
+	if (a < 0) return -1;
 	
 	/* don't recalculate handles if fast is set
 	 *	- this is a hack to make importers faster
-	 *	- we may calculate twice (see editipo_changed(), due to autohandle needing two calculations)
+	 *	- we may calculate twice (due to autohandle needing to be calculated twice)
 	 */
-	if (!fast) calchandles_fcurve(fcu);
+	if ((flag & INSERTKEY_FAST) == 0) 
+		calchandles_fcurve(fcu);
 	
 	/* set handletype and interpolation */
-	if (fcu->totvert > 2) {
+	if ((fcu->totvert > 2) && (flag & INSERTKEY_REPLACE)==0) {
 		BezTriple *bezt= (fcu->bezt + a);
 		char h1, h2;
 		
@@ -370,10 +391,14 @@ void insert_vert_fcurve (FCurve *fcu, float x, float y, short fast)
 			
 		/* don't recalculate handles if fast is set
 		 *	- this is a hack to make importers faster
-		 *	- we may calculate twice (see editipo_changed(), due to autohandle needing two calculations)
+		 *	- we may calculate twice (due to autohandle needing to be calculated twice)
 		 */
-		if (!fast) calchandles_fcurve(fcu);
+		if ((flag & INSERTKEY_FAST) == 0) 
+			calchandles_fcurve(fcu);
 	}
+	
+	/* return the index at which the keyframe was added */
+	return a;
 }
 
 /* -------------- 'Smarter' Keyframing Functions -------------------- */
@@ -812,7 +837,7 @@ short insert_keyframe_direct (PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, fl
 		
 		/* insert new keyframe at current frame */
 		if (insert_mode)
-			insert_vert_fcurve(fcu, cfra, curval, (flag & INSERTKEY_FAST));
+			insert_vert_fcurve(fcu, cfra, curval, flag);
 		
 		/* delete keyframe immediately before/after newly added */
 		switch (insert_mode) {
@@ -830,7 +855,7 @@ short insert_keyframe_direct (PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, fl
 	}
 	else {
 		/* just insert keyframe */
-		insert_vert_fcurve(fcu, cfra, curval, (flag & INSERTKEY_FAST));
+		insert_vert_fcurve(fcu, cfra, curval, flag);
 		
 		/* return success */
 		return 1;
@@ -1303,6 +1328,15 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
 	float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
 	short success= 0;
 	int a, index, length, all= RNA_boolean_get(op->ptr, "all");
+	short flag = 0;
+	
+	/* flags for inserting keyframes */
+	if (IS_AUTOKEY_FLAG(AUTOMATKEY))
+		flag |= INSERTKEY_MATRIX;
+	if (IS_AUTOKEY_FLAG(INSERTNEEDED))
+		flag |= INSERTKEY_NEEDED;
+	if (IS_AUTOKEY_MODE(scene, EDITKEYS))
+		flag |= INSERTKEY_REPLACE;
 	
 	/* try to insert keyframe using property retrieved from UI */
 	memset(&ptr, 0, sizeof(PointerRNA));
@@ -1322,14 +1356,14 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
 				length= 1;
 			
 			for (a=0; a<length; a++)
-				success+= insert_keyframe(ptr.id.data, NULL, NULL, path, index+a, cfra, 0);
+				success+= insert_keyframe(ptr.id.data, NULL, NULL, path, index+a, cfra, flag);
 			
 			MEM_freeN(path);
 		}
 		else if (ptr.type == &RNA_NlaStrip) {
 			/* handle special vars for NLA-strips */
 			NlaStrip *strip= (NlaStrip *)ptr.data;
-			FCurve *fcu= list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), 0);
+			FCurve *fcu= list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), flag);
 			
 			success+= insert_keyframe_direct(ptr, prop, fcu, cfra, 0);
 		}
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 21f969467aa..f81f57d526a 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -879,6 +879,7 @@ short modifykey_get_context_data (bContext *C, ListBase *dsources, KeyingSet *ks
  */
 int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *ks, short mode, float cfra)
 {
+	Scene *scene= CTX_data_scene(C);
 	KS_Path *ksp;
 	int kflag=0, success= 0;
 	char *groupname= NULL;
@@ -891,7 +892,7 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *
 		/* suppliment with info from the context */
 		if (IS_AUTOKEY_FLAG(AUTOMATKEY)) kflag |= INSERTKEY_MATRIX;
 		if (IS_AUTOKEY_FLAG(INSERTNEEDED)) kflag |= INSERTKEY_NEEDED;
-		// if (IS_AUTOKEY_MODE(EDITKEYS)) flag |= INSERTKEY_REPLACE;
+		if (IS_AUTOKEY_MODE(scene, EDITKEYS)) kflag |= INSERTKEY_REPLACE;
 	}
 	else if (mode == MODIFYKEY_MODE_DELETE)
 		kflag= 0;
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 259104f7263..0969398f1e2 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -99,7 +99,7 @@ typedef enum eKeyframeShapeDrawOpts {
 } eKeyframeShapeDrawOpts;
 
 /* draw simple diamond-shape keyframe (with OpenGL) */
-void draw_keyframe_shape (float x, float y, float xscale, float hsize, short sel, short key_type, short mode);
+void draw_keyframe_shape(float x, float y, float xscale, float hsize, short sel, short key_type, short mode);
 
 /* ******************************* Methods ****************************** */
 
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index 390729eaec4..b2bf05ea5ea 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -147,6 +147,7 @@ void duplicate_fcurve_keys(struct FCurve *fcu);
 
 void clean_fcurve(struct FCurve *fcu, float thresh);
 void smooth_fcurve(struct FCurve *fcu);
+void sample_fcurve(struct FCurve *fcu);
 
 /* ----------- */
 
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 4bc24a0adeb..c492143751c 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -65,13 +65,14 @@ struct FCurve *verify_fcurve(struct bAction *act, const char group[], const char
  *	Use this when validation of necessary animation data isn't necessary as it already
  * 	exists, and there is a beztriple that can be directly copied into the array.
  */
-int insert_bezt_fcurve(struct FCurve *fcu, struct BezTriple *bezt);
+int insert_bezt_fcurve(struct FCurve *fcu, struct BezTriple *bezt, short flag);
 
 /* Main Keyframing API call: 
  *	Use this when validation of necessary animation data isn't necessary as it
  *	already exists. It will insert a keyframe using the current value being keyframed.
+ * 	Returns the index at which a keyframe was added (or -1 if failed)
  */
-void insert_vert_fcurve(struct FCurve *fcu, float x, float y, short flag);
+int insert_vert_fcurve(struct FCurve *fcu, float x, float y, short flag);
 
 /* -------- */
 
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 784d820ea52..d7904a19bfe 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -152,6 +152,8 @@ void ui_but_anim_autokey(uiBut *but, Scene *scene, float cfra)
 				flag |= INSERTKEY_NEEDED;
 			if (IS_AUTOKEY_FLAG(AUTOMATKEY))
 				flag |= INSERTKEY_MATRIX;
+			if (IS_AUTOKEY_MODE(scene, EDITKEYS))
+				flag |= INSERTKEY_REPLACE;
 			
 			fcu->flag &= ~FCURVE_SELECTED;
 			insert_keyframe(id, action, ((fcu->grp)?(fcu->grp->name):(NULL)), fcu->rna_path, fcu->array_index, cfra, flag);
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index b087736a368..89633d0cdfe 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -397,7 +397,7 @@ static void insert_action_keys(bAnimContext *ac, short mode)
 	/* init keyframing flag */
 	if (IS_AUTOKEY_FLAG(AUTOMATKEY)) flag |= INSERTKEY_MATRIX;
 	if (IS_AUTOKEY_FLAG(INSERTNEEDED)) flag |= INSERTKEY_NEEDED;
-	// if (IS_AUTOKEY_MODE(EDITKEYS)) flag |= INSERTKEY_REPLACE;
+	if (IS_AUTOKEY_MODE(scene, EDITKEYS)) flag |= INSERTKEY_REPLACE;
 	
 	/* insert keyframes */
 	for (ale= anim_data.first; ale; ale= ale->next) {
@@ -679,11 +679,6 @@ void ACT_OT_clean (wmOperatorType *ot)
 
 /* ******************** Sample Keyframes Operator *********************** */
 
-/* little cache for values... */
-typedef struct tempFrameValCache {
-	float frame, val;
-} tempFrameValCache;
-
 /* Evaluates the curves between each selected keyframe on each frame, and keys the value  */
 static void sample_action_keys (bAnimContext *ac)
 {	
@@ -696,64 +691,8 @@ static void sample_action_keys (bAnimContext *ac)
 	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 	
 	/* loop through filtered data and add keys between selected keyframes on every frame  */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		FCurve *fcu= (FCurve *)ale->key_data;
-		BezTriple *bezt, *start=NULL, *end=NULL;
-		tempFrameValCache *value_cache, *fp;
-		int sfra, range;
-		int i, n;
-		
-		/* find selected keyframes... once pair has been found, add keyframes  */
-		for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
-			/* check if selected, and which end this is */
-			if (BEZSELECTED(bezt)) {
-				if (start) {
-					/* set end */
-					end= bezt;
-					
-					/* cache values then add keyframes using these values, as adding
-					 * keyframes while sampling will affect the outcome...
-					 */
-					range= (int)( ceil(end->vec[1][0] - start->vec[1][0]) );
-					sfra= (int)( floor(start->vec[1][0]) );
-					
-					if (range) {
-						value_cache= MEM_callocN(sizeof(tempFrameValCache)*range, "IcuFrameValCache");
-						
-						/* 	sample values 	*/
-						for (n=0, fp=value_cache; n<range && fp; n++, fp++) {
-							fp->frame= (float)(sfra + n);
-							fp->val= evaluate_fcurve(fcu, fp->frame);
-						}
-						
-						/* 	add keyframes with these 	*/
-						for (n=0, fp=value_cache; n<range && fp; n++, fp++) {
-							insert_vert_fcurve(fcu, fp->frame, fp->val, 1);
-						}
-						
-						/* free temp cache */
-						MEM_freeN(value_cache);
-						
-						/* as we added keyframes, we need to compensate so that bezt is at the right place */
-						bezt = fcu->bezt + i + range - 1;
-						i += (range - 1);
-					}
-					
-					/* bezt was selected, so it now marks the start of a whole new chain to search */
-					start= bezt;
-					end= NULL;
-				}
-				else {
-					/* just set start keyframe */
-					start= bezt;
-					end= NULL;
-				}
-			}
-		}
-		
-		/* recalculate channel's handles? */
-		calchandles_fcurve(fcu);
-	}
+	for (ale= anim_data.first; ale; ale= ale->next)
+		sample_fcurve((FCurve *)ale->key_data);
 	
 	/* admin and redraws */
 	BLI_freelistN(&anim_data);
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index f18d31915f9..8674f481a18 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -431,7 +431,7 @@ void action_header_buttons(const bContext *C, ARegion *ar)
 						"Auto-snapping mode for keyframes when transforming");
 			}
 			
-			xco += (70 + 8);
+			xco += (90 + 8);
 		}
 		
 		/* COPY PASTE */
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 37389b32b3a..d718ef28e99 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -430,7 +430,7 @@ static void insert_graph_keys(bAnimContext *ac, short mode)
 	/* init keyframing flag */
 	if (IS_AUTOKEY_FLAG(AUTOMATKEY)) flag |= INSERTKEY_MATRIX;
 	if (IS_AUTOKEY_FLAG(INSERTNEEDED)) flag |= INSERTKEY_NEEDED;
-	// if (IS_AUTOKEY_MODE(EDITKEYS)) flag |= INSERTKEY_REPLACE;
+	if (IS_AUTOKEY_MODE(scene, EDITKEYS)) flag |= INSERTKEY_REPLACE;
 	
 	/* insert keyframes */
 	for (ale= anim_data.first; ale; ale= ale->next) {
@@ -989,13 +989,6 @@ void GRAPH_OT_bake (wmOperatorType *ot)
  * of selected keyframes. It is useful for creating keyframes for tweaking overlap.
  */
 
-// XXX some of the common parts (with DopeSheet) should be unified in animation module...
-
-/* little cache for values... */
-typedef struct tempFrameValCache {
-	float frame, val;
-} tempFrameValCache;
-
 /* Evaluates the curves between each selected keyframe on each frame, and keys the value  */
 static void sample_graph_keys (bAnimContext *ac)
 {	
@@ -1008,64 +1001,8 @@ static void sample_graph_keys (bAnimContext *ac)
 	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 	
 	/* loop through filtered data and add keys between selected keyframes on every frame  */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		FCurve *fcu= (FCurve *)ale->key_data;
-		BezTriple *bezt, *start=NULL, *end=NULL;
-		tempFrameValCache *value_cache, *fp;
-		int sfra, range;
-		int i, n;
-		
-		/* find selected keyframes... once pair has been found, add keyframes  */
-		for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
-			/* check if selected, and which end this is */
-			if (BEZSELECTED(bezt)) {
-				if (start) {
-					/* set end */
-					end= bezt;
-					
-					/* cache values then add keyframes using these values, as adding
-					 * keyframes while sampling will affect the outcome...
-					 */
-					range= (int)( ceil(end->vec[1][0] - start->vec[1][0]) );
-					sfra= (int)( floor(start->vec[1][0]) );
-					
-					if (range) {
-						value_cache= MEM_callocN(sizeof(tempFrameValCache)*range, "IcuFrameValCache");
-						
-						/* 	sample values 	*/
-						for (n=0, fp=value_cache; n<range && fp; n++, fp++) {
-							fp->frame= (float)(sfra + n);
-							fp->val= evaluate_fcurve(fcu, fp->frame);
-						}
-						
-						/* 	add keyframes with these 	*/
-						for (n=0, fp=value_cache; n<range && fp; n++, fp++) {
-							insert_vert_fcurve(fcu, fp->frame, fp->val, 1);
-						}
-						
-						/* free temp cache */
-						MEM_freeN(value_cache);
-						
-						/* as we added keyframes, we need to compensate so that bezt is at the right place */
-						bezt = fcu->bezt + i + range - 1;
-						i += (range - 1);
-					}
-					
-					/* bezt was selected, so it now marks the start of a whole new chain to search */
-					start= bezt;
-					end= NULL;
-				}
-				else {
-					/* just set start keyframe */
-					start= bezt;
-					end= NULL;
-				}
-			}
-		}
-		
-		/* recalculate channel's handles? */
-		calchandles_fcurve(fcu);
-	}
+	for (ale= anim_data.first; ale; ale= ale->next)
+		sample_fcurve((FCurve *)ale->key_data);
 	
 	/* admin and redraws */
 	BLI_freelistN(&anim_data);
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index e0dfd90a3d1..302d9b675a0 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1748,7 +1748,7 @@ void flushTransParticles(TransInfo *t)
 	Object *ob = OBACT;
 	PTCacheEdit *edit = PE_get_current(scene, ob);
 	ParticleSystem *psys = edit->psys;
-	ParticleSystemModifierData *psmd;
+	ParticleSystemModifierData *psmd = NULL;
 	PTCacheEditPoint *point;
 	PTCacheEditKey *key;
 	TransData *td;
@@ -4348,12 +4348,14 @@ void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
 		AnimData *adt= ob->adt;
 		float cfra= (float)CFRA; // xxx this will do for now
 		short flag = 0;
-
+		
 		if (IS_AUTOKEY_FLAG(INSERTNEEDED))
 			flag |= INSERTKEY_NEEDED;
 		if (IS_AUTOKEY_FLAG(AUTOMATKEY))
 			flag |= INSERTKEY_MATRIX;
-
+		if (IS_AUTOKEY_MODE(scene, EDITKEYS))
+			flag |= INSERTKEY_REPLACE;
+			
 		if (IS_AUTOKEY_FLAG(INSERTAVAIL)) {
 			/* only key on available channels */
 			if (adt && adt->action) {
@@ -4365,7 +4367,7 @@ void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
 		}
 		else if (IS_AUTOKEY_FLAG(INSERTNEEDED)) {
 			short doLoc=0, doRot=0, doScale=0;
-
+			
 			/* filter the conditions when this happens (assume that curarea->spacetype==SPACE_VIE3D) */
 			if (tmode == TFM_TRANSLATION) {
 				doLoc = 1;
@@ -4377,7 +4379,7 @@ void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
 				}
 				else if (v3d->around == V3D_CURSOR)
 					doLoc = 1;
-
+				
 				if ((v3d->flag & V3D_ALIGN)==0)
 					doRot = 1;
 			}
@@ -4388,11 +4390,11 @@ void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
 				}
 				else if (v3d->around == V3D_CURSOR)
 					doLoc = 1;
-
+				
 				if ((v3d->flag & V3D_ALIGN)==0)
 					doScale = 1;
 			}
-
+			
 			// TODO: the group names here are temporary...
 			// TODO: should this be made to use the builtin KeyingSets instead?
 			if (doLoc) {
@@ -4417,16 +4419,16 @@ void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
 			insert_keyframe(id, NULL, "Object Transform", "location", 0, cfra, flag);
 			insert_keyframe(id, NULL, "Object Transform", "location", 1, cfra, flag);
 			insert_keyframe(id, NULL, "Object Transform", "location", 2, cfra, flag);
-
+			
 			insert_keyframe(id, NULL, "Object Transform", "rotation", 0, cfra, flag);
 			insert_keyframe(id, NULL, "Object Transform", "rotation", 1, cfra, flag);
 			insert_keyframe(id, NULL, "Object Transform", "rotation", 2, cfra, flag);
-
+			
 			insert_keyframe(id, NULL, "Object Transform", "scale", 0, cfra, flag);
 			insert_keyframe(id, NULL, "Object Transform", "scale", 1, cfra, flag);
 			insert_keyframe(id, NULL, "Object Transform", "scale", 2, cfra, flag);
 		}
-
+			
 		// XXX todo... find a way to send notifiers from here...
 	}
 }
@@ -4450,7 +4452,7 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 		float cfra= (float)CFRA;
 		short flag= 0;
 		char buf[512];
-
+		
 		/* flag is initialised from UserPref keyframing settings
 		 *	- special exception for targetless IK - INSERTKEY_MATRIX keyframes should get
 		 * 	  visual keyframes even if flag not set, as it's not that useful otherwise
@@ -4460,12 +4462,14 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 			flag |= INSERTKEY_MATRIX;
 		if (IS_AUTOKEY_FLAG(INSERTNEEDED))
 			flag |= INSERTKEY_NEEDED;
-
+		if (IS_AUTOKEY_MODE(scene, EDITKEYS))
+			flag |= INSERTKEY_REPLACE;
+		
 		for (pchan=pose->chanbase.first; pchan; pchan=pchan->next) {
 			if (pchan->bone->flag & BONE_TRANSFORM) {
 				/* clear any 'unkeyed' flag it may have */
 				pchan->bone->flag &= ~BONE_UNKEYED;
-
+				
 				/* only insert into available channels? */
 				if (IS_AUTOKEY_FLAG(INSERTAVAIL)) {
 					if (act) {
@@ -4476,7 +4480,7 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 				/* only insert keyframe if needed? */
 				else if (IS_AUTOKEY_FLAG(INSERTNEEDED)) {
 					short doLoc=0, doRot=0, doScale=0;
-
+					
 					/* filter the conditions when this happens (assume that curarea->spacetype==SPACE_VIE3D) */
 					if (tmode == TFM_TRANSLATION) {
 						if (targetless_ik)
@@ -4487,18 +4491,18 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 					else if (tmode == TFM_ROTATION) {
 						if (ELEM(v3d->around, V3D_CURSOR, V3D_ACTIVE))
 							doLoc = 1;
-
+							
 						if ((v3d->flag & V3D_ALIGN)==0)
 							doRot = 1;
 					}
 					else if (tmode == TFM_RESIZE) {
 						if (ELEM(v3d->around, V3D_CURSOR, V3D_ACTIVE))
 							doLoc = 1;
-
+							
 						if ((v3d->flag & V3D_ALIGN)==0)
 							doScale = 1;
 					}
-
+					
 					if (doLoc) {
 						sprintf(buf, "pose.pose_channels[\"%s\"].location", pchan->name);
 						insert_keyframe(id, NULL, pchan->name, buf, 0, cfra, flag);
@@ -4533,7 +4537,7 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 					insert_keyframe(id, NULL, pchan->name, buf, 0, cfra, flag);
 					insert_keyframe(id, NULL, pchan->name, buf, 1, cfra, flag);
 					insert_keyframe(id, NULL, pchan->name, buf, 2, cfra, flag);
-
+					
 					if (pchan->rotmode == PCHAN_ROT_QUAT) {
 						sprintf(buf, "pose.pose_channels[\"%s\"].rotation", pchan->name);
 						insert_keyframe(id, NULL, pchan->name, buf, 0, cfra, flag);
@@ -4547,7 +4551,7 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 						insert_keyframe(id, NULL, pchan->name, buf, 1, cfra, flag);
 						insert_keyframe(id, NULL, pchan->name, buf, 2, cfra, flag);
 					}
-
+					
 					sprintf(buf, "pose.pose_channels[\"%s\"].scale", pchan->name);
 					insert_keyframe(id, NULL, pchan->name, buf, 0, cfra, flag);
 					insert_keyframe(id, NULL, pchan->name, buf, 1, cfra, flag);
@@ -4555,14 +4559,14 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
 				}
 			}
 		}
-
+		
 		// XXX todo... figure out way to get appropriate notifiers sent
-
+		
 		/* do the bone paths */
-#if 0 // TRANSFORM_FIX_ME
+#if 0 // XXX TRANSFORM FIX ME
 		if (arm->pathflag & ARM_PATH_ACFRA) {
-			pose_clear_paths(ob);
-			pose_recalculate_paths(ob);
+			//pose_clear_paths(ob); // XXX for now, don't need to clear
+			ED_pose_recalculate_paths(C, scene, ob);
 		}
 #endif
 	}

From 6caff6b390b257f70abe3949463797898b8bd2fd Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 4 Sep 2009 04:29:54 +0000
Subject: [PATCH 417/577] - rna documentation layout now matches blenders
 internal layout, autogenerate packages for nested modules.  bpy.data,
 bpy.ops.object etc. - added basic docs for bpy.props - omit panel, menu and
 operator classes (took up too much space and not useful) - exec cant be used
 as an operator suffix eg- CONSOLE_OT_exec --> CONSOLE_OT_execute (same for
 file) - fixed some crashes when generating docs

Updated docs here
http://www.graphicall.org/ftp/ideasman42/html/
---
 release/ui/space_console.py                   |   2 +-
 .../blender/editors/object/object_modifier.c  |   4 +-
 source/blender/editors/screen/screen_ops.c    |   2 +-
 .../editors/space_console/console_report.c    |   2 +-
 .../editors/space_console/space_console.c     |   4 +-
 .../blender/editors/space_file/file_intern.h  |   2 +-
 source/blender/editors/space_file/file_ops.c  |   4 +-
 .../blender/editors/space_file/space_file.c   |   2 +-
 .../makesrna/intern/rna_sculpt_paint.c        |  17 +-
 source/blender/python/epy_doc_gen.py          | 212 +++++++++++++++---
 .../blender/python/intern/bpy_operator_wrap.c |   4 +-
 11 files changed, 203 insertions(+), 52 deletions(-)

diff --git a/release/ui/space_console.py b/release/ui/space_console.py
index f1038b5616a..dbf202f924c 100644
--- a/release/ui/space_console.py
+++ b/release/ui/space_console.py
@@ -110,7 +110,7 @@ class CONSOLE_OT_exec(bpy.types.Operator):
 	'''
 	Operator documentatuon text, will be used for the operator tooltip and python docs.
 	'''
-	__idname__ = "console.exec"
+	__idname__ = "console.execute"
 	__label__ = "Console Execute"
 	__register__ = False
 	
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index f9e2ac2f4de..96e485e5462 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -434,10 +434,8 @@ static EnumPropertyItem *modifier_add_itemf(bContext *C, PointerRNA *ptr, int *f
 	Object *ob;
 	int totitem= 0, a;
 	
-	if(!C) /* needed for docs */
+	if(!C || !(ob= CTX_data_active_object(C))) /* needed for docs */
 		return modifier_type_items;
-	
-	ob= CTX_data_active_object(C);
 
 	for(a=0; modifier_type_items[a].identifier; a++) {
 		md_item= &modifier_type_items[a];
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 799bb0741f3..cb874ec1447 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3336,7 +3336,7 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_verify_item(keymap, "SCRIPT_OT_python_run_ui_scripts", F8KEY, KM_PRESS, 0, 0);
 
 	/* files */
-	WM_keymap_add_item(keymap, "FILE_OT_exec", RETKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "FILE_OT_execute", RETKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "FILE_OT_cancel", ESCKEY, KM_PRESS, 0, 0);
 	
 	/* undo */
diff --git a/source/blender/editors/space_console/console_report.c b/source/blender/editors/space_console/console_report.c
index 08d003f0706..b6920d148fd 100644
--- a/source/blender/editors/space_console/console_report.c
+++ b/source/blender/editors/space_console/console_report.c
@@ -97,7 +97,7 @@ static int report_replay_exec(bContext *C, wmOperator *op)
 	for(report=reports->list.last; report; report=report->prev) {
 		if((report->type & report_mask) && (report->type & RPT_OPERATOR_ALL) && (report->flag & SELECT)) {
 			console_history_add_str(C, report->message, 0);
-			WM_operator_name_call(C, "CONSOLE_OT_exec", WM_OP_EXEC_DEFAULT, NULL);
+			WM_operator_name_call(C, "CONSOLE_OT_execute", WM_OP_EXEC_DEFAULT, NULL);
 
 			ED_area_tag_redraw(CTX_wm_area(C));
 		}
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index a763e7ce153..48890d6cac2 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -278,8 +278,8 @@ void console_keymap(struct wmWindowManager *wm)
 	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_delete", BACKSPACEKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_PREV_CHAR);
 
 #ifndef DISABLE_PYTHON
-	WM_keymap_add_item(keymap, "CONSOLE_OT_exec", RETKEY, KM_PRESS, 0, 0); /* python operator - space_text.py */
-	WM_keymap_add_item(keymap, "CONSOLE_OT_exec", PADENTER, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "CONSOLE_OT_execute", RETKEY, KM_PRESS, 0, 0); /* python operator - space_text.py */
+	WM_keymap_add_item(keymap, "CONSOLE_OT_execute", PADENTER, KM_PRESS, 0, 0);
 	
 	//WM_keymap_add_item(keymap, "CONSOLE_OT_autocomplete", TABKEY, KM_PRESS, 0, 0); /* python operator - space_text.py */
 	WM_keymap_add_item(keymap, "CONSOLE_OT_autocomplete", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* python operator - space_text.py */
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h
index 9f1e4ad0e25..a99594e9575 100644
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@ -59,7 +59,7 @@ void FILE_OT_add_bookmark(struct wmOperatorType *ot);
 void FILE_OT_delete_bookmark(struct wmOperatorType *ot);
 void FILE_OT_hidedot(struct wmOperatorType *ot);
 void FILE_OT_loadimages(struct wmOperatorType *ot);
-void FILE_OT_exec(struct wmOperatorType *ot);
+void FILE_OT_execute(struct wmOperatorType *ot);
 void FILE_OT_cancel(struct wmOperatorType *ot);
 void FILE_OT_parent(struct wmOperatorType *ot);
 void FILE_OT_directory_new(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 9c73956d375..a06c1663d8e 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -566,11 +566,11 @@ int file_exec(bContext *C, wmOperator *unused)
 	return OPERATOR_FINISHED;
 }
 
-void FILE_OT_exec(struct wmOperatorType *ot)
+void FILE_OT_execute(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Execute File Window";
-	ot->idname= "FILE_OT_exec";
+	ot->idname= "FILE_OT_execute";
 	
 	/* api callbacks */
 	ot->exec= file_exec;
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 22ad03f3523..793f7cf8815 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -330,7 +330,7 @@ void file_operatortypes(void)
 	WM_operatortype_append(FILE_OT_select_bookmark);
 	WM_operatortype_append(FILE_OT_loadimages);
 	WM_operatortype_append(FILE_OT_highlight);
-	WM_operatortype_append(FILE_OT_exec);
+	WM_operatortype_append(FILE_OT_execute);
 	WM_operatortype_append(FILE_OT_cancel);
 	WM_operatortype_append(FILE_OT_parent);
 	WM_operatortype_append(FILE_OT_previous);
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index fabe0b647ea..b00119efaf6 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -122,9 +122,6 @@ static void rna_ParticleEdit_update(bContext *C, PointerRNA *ptr)
 
 static EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *ptr, int *free)
 {
-	Scene *scene= CTX_data_scene(C);
-	PTCacheEdit *edit;
-
 	if(C==NULL) {
 		EnumPropertyItem *item= NULL;
 		int totitem= 0;
@@ -137,13 +134,15 @@ static EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *pt
 		
 		return item;
 	}
+	else {
+		Scene *scene= CTX_data_scene(C);
+		PTCacheEdit *edit = PE_get_current(scene, CTX_data_active_object(C));
+		
+		if(edit && edit->psys)
+			return particle_edit_hair_brush_items;
 
-	edit = PE_get_current(scene, CTX_data_active_object(C));
-	
-	if(edit && edit->psys)
-		return particle_edit_hair_brush_items;
-
-	return particle_edit_cache_brush_items;
+		return particle_edit_cache_brush_items;
+	}
 }
 
 static int rna_ParticleEdit_editable_get(PointerRNA *ptr)
diff --git a/source/blender/python/epy_doc_gen.py b/source/blender/python/epy_doc_gen.py
index 6a515648340..c2ef6bbc0d0 100644
--- a/source/blender/python/epy_doc_gen.py
+++ b/source/blender/python/epy_doc_gen.py
@@ -37,6 +37,94 @@ Generate html docs  by running...
 
 # if you dont have graphvis installed ommit the --graph arg.
 
+# GLOBALS['BASEDIR'] = './source/blender/python/doc'
+
+import os
+
+SUBMODULES = {}
+INIT_SUBMODULES = {}			# store initialized files
+
+INIT_SUBMODULES_IMPORTS = {}	# dont import the same module twice
+
+def append_package(package_path, mod_name):
+	
+	init_path =	os.path.join(os.path.dirname(package_path), "__init__.py")
+	
+	# avoid double ups
+	if mod_name:
+		imports = INIT_SUBMODULES_IMPORTS.setdefault(init_path, [])
+		if mod_name in imports:
+			return
+		imports.append(mod_name)
+		
+	try:
+		os.makedirs(os.path.dirname(init_path)) # make the dirs if they are not there
+	except:
+		pass
+	
+	# Open the new file for the first time, otherwise keep it open.
+	f = INIT_SUBMODULES.get(init_path)
+	if f == None:
+		f = INIT_SUBMODULES[init_path] = open(init_path, 'w')
+	
+	if mod_name:
+		f.write("import %s\n" % mod_name)
+		
+	return f
+
+def append_package_recursive(package_path, BASEPATH):
+	'''
+	assume the last item of package_path will be a file (not a dir thats created)
+	'''
+	
+	package_path = os.path.splitext(package_path)[0] # incase of .py
+	
+	try:
+		os.makedirs(os.path.join(BASEPATH, os.path.dirname(package_path))) # make the dirs if they are not there
+	except:
+		pass
+	
+	new_path = BASEPATH
+	
+	for mod_name in package_path.split(os.sep):
+		init_path =	os.path.join(new_path, "__init__.py")
+		new_path = os.path.join(new_path, mod_name)
+		append_package(init_path, mod_name)
+
+
+def open_submodule(subpath, BASEPATH):
+	'''
+	This is a utility function that lets us quickly add submodules
+	'''
+	
+	# create all the package paths leading up to this module
+	append_package_recursive(subpath, BASEPATH)
+	
+	module_name =		os.path.basename( os.path.splitext(subpath)[0] )
+	mod_path =	os.path.join(BASEPATH, subpath)
+	
+	# Open the new file for the first time, otherwise keep it open.
+	f = SUBMODULES.get(mod_path)
+	if f == None:
+		f = SUBMODULES[mod_path] = open(mod_path, 'w')
+
+	f = open(mod_path, 'w')
+	return f
+
+def close_all():
+	for files in (INIT_SUBMODULES.values(), SUBMODULES.values()):
+		for f in files:
+			if f.name.endswith('.py'):
+				f_name = f.name 
+				f.close()
+				
+				f = open(f_name, 'a')
+				f.write("\ndel __package__\n") # annoying, no need do show this
+			
+			
+			f.close()
+
+
 def range_str(val):
 	if val < -10000000:	return '-inf'
 	if val >  10000000:	return 'inf'
@@ -59,6 +147,19 @@ def full_rna_struct_path(rna_struct):
 	else:
 		return rna_struct.identifier
 
+def rna_id_ignore(rna_id):
+	if rna_id == "rna_type":
+		return True
+	
+	if "_OT_" in rna_id:
+		return True
+	if "_MT_" in rna_id:
+		return True
+	if "_PT_" in rna_id:
+		return True
+	
+	return False
+
 def write_func(rna, ident, out, func_type):
 	# Keyword attributes
 	kw_args = [] # "foo = 1", "bar=0.5", "spam='ENUM'"
@@ -68,7 +169,7 @@ def write_func(rna, ident, out, func_type):
 	
 	# Operators and functions work differently
 	if func_type=='OPERATOR':
-		rna_func_name = rna_struct.identifier
+		rna_func_name = rna_struct.identifier.split("_OT_")[-1]
 		rna_func_desc = rna_struct.description.strip()
 		items = rna_struct.properties.items()
 	else:
@@ -78,7 +179,7 @@ def write_func(rna, ident, out, func_type):
 	
 	
 	for rna_prop_identifier, rna_prop in items:
-		if rna_prop_identifier=='rna_type':
+		if rna_id_ignore(rna_prop_identifier):
 			continue
 		
 		# clear vars			
@@ -196,7 +297,7 @@ def write_func(rna, ident, out, func_type):
 	
 
 
-def rna2epy(target_path):
+def rna2epy(BASEPATH):
 	
 	# Use for faster lookups
 	# use rna_struct.identifier as the key for each dict
@@ -255,7 +356,7 @@ def rna2epy(target_path):
 		for rna_prop_identifier, rna_prop in rna_struct.properties.items():
 			
 			if rna_prop_identifier=='RNA':					continue
-			if rna_prop_identifier=='rna_type':				continue
+			if rna_id_ignore(rna_prop_identifier):			continue
 			if rna_prop_identifier in rna_base_prop_keys:	continue # does this prop exist in our parent class, if so skip
 			
 			rna_desc = rna_prop.description.strip()
@@ -320,7 +421,10 @@ def rna2epy(target_path):
 		for child in rna_children_dict[identifier]:
 			write_struct(child, ident + '\t')
 	
-	out = open(target_path, 'w')
+	
+	
+	# out = open(target_path, 'w')
+	out = open_submodule("types.py", BASEPATH) # bpy.types
 
 	def base_id(rna_struct):
 		try:		return rna_struct.base.identifier
@@ -343,21 +447,23 @@ def rna2epy(target_path):
 			#if not rna_type_name.startswith('__'):
 			
 			identifier = rna_struct.identifier
-			structs.append( (base_id(rna_struct), identifier, rna_struct) )	
 			
-			# Simple lookup
-			rna_struct_dict[identifier] = rna_struct
-			
-			# Store full rna path 'GameObjectSettings' -> 'Object.GameObjectSettings'
-			rna_full_path_dict[identifier] = full_rna_struct_path(rna_struct)
-			
-			# Store a list of functions, remove inherited later
-			rna_functions_dict[identifier]= list(rna_struct.functions)
-			
-			
-			# fill in these later
-			rna_children_dict[identifier]= []
-			rna_references_dict[identifier]= []
+			if not rna_id_ignore(identifier):
+				structs.append( (base_id(rna_struct), identifier, rna_struct) )	
+				
+				# Simple lookup
+				rna_struct_dict[identifier] = rna_struct
+				
+				# Store full rna path 'GameObjectSettings' -> 'Object.GameObjectSettings'
+				rna_full_path_dict[identifier] = full_rna_struct_path(rna_struct)
+				
+				# Store a list of functions, remove inherited later
+				rna_functions_dict[identifier]= list(rna_struct.functions)
+				
+				
+				# fill in these later
+				rna_children_dict[identifier]= []
+				rna_references_dict[identifier]= []
 			
 			
 		else:
@@ -417,7 +523,7 @@ def rna2epy(target_path):
 		for rna_prop_identifier, rna_prop in rna_struct.properties.items():
 			
 			if rna_prop_identifier=='RNA':					continue
-			if rna_prop_identifier=='rna_type':				continue
+			if rna_id_ignore(rna_prop_identifier):			continue
 			if rna_prop_identifier in rna_base_prop_keys:	continue
 			
 			try:		rna_prop_ptr = rna_prop.fixed_type
@@ -431,7 +537,7 @@ def rna2epy(target_path):
 			for rna_prop_identifier, rna_prop in rna_func.parameters.items():
 				
 				if rna_prop_identifier=='RNA':					continue
-				if rna_prop_identifier=='rna_type':				continue
+				if rna_id_ignore(rna_prop_identifier):			continue
 				if rna_prop_identifier in rna_base_func_keys:	continue
 					
 				
@@ -476,6 +582,7 @@ def rna2epy(target_path):
 	# # We could also just run....
 	# os.system('epydoc source/blender/python/doc/rna.py -o ./source/blender/python/doc/html -v')
 	
+	target_path = os.path.join(BASEPATH, "dump.py") # XXX - used for other funcs
 	
 	# Write graphviz
 	out= open(target_path.replace('.py', '.dot'), 'w')
@@ -546,8 +653,8 @@ def rna2epy(target_path):
 		out.write('%s\n' % w)
 	
 
-def op2epy(target_path):
-	out = open(target_path, 'w')
+def op2epy(BASEPATH):
+	# out = open(target_path, 'w')
 	
 	op_mods = dir(bpy.ops)
 	op_mods.remove('add')
@@ -556,26 +663,73 @@ def op2epy(target_path):
 	for op_mod_name in sorted(op_mods):
 		if op_mod_name.startswith('__'):
 			continue
+		
+		# open the submodule
+		mod_path = os.path.join("ops", op_mod_name + ".py")
+		out = open_submodule(mod_path, BASEPATH)
+
 
 		op_mod = getattr(bpy.ops, op_mod_name)
-		
 		operators = dir(op_mod)
 		for op in sorted(operators):
 			# rna = getattr(bpy.types, op).__rna__
 			rna = getattr(op_mod, op).get_rna()
 			write_func(rna, '', out, 'OPERATOR')
+		
+		out.write('\n')
+		out.close()
+
+def misc2epy(BASEPATH):
+	'''
+	Hard coded modules, try to avoid adding stuff here
+	'''
 	
-	out.write('\n')
-	out.close()
+	f = append_package(os.path.join(BASEPATH, ""), ""); # add a slash on the end of the base path
+	f.write('''
+"""
+@type data: L{bpy.types.Main}
+@var  data: blender data is accessed from here
+"""
+''')
+
+	f = open_submodule("props.py", BASEPATH)
+	f.write('''
+MAX_INT= 2**31
+MAX_FLOAT= 1e+37
+def BoolProperty(attr, name="", description="", default=False):
+	"""
+	return a new bool property
+	"""
+def IntProperty(attr, name="", description="", min=-MAX_INT, max=MAX_INT, soft_min=-MAX_INT, soft_max=MAX_INT, default=0):
+	"""
+	return a new int property
+	"""
+def FloatProperty(attr, name="", description="", min=-MAX_FLOAT, max=MAX_FLOAT, soft_min=-MAX_FLOAT, soft_max=MAX_FLOAT, default=0.0):
+	"""
+	return a new float property
+	"""
+def StringProperty(attr, name="", description="", maxlen=0, default=""):
+	"""
+	return a new string property
+	"""
+def EnumProperty(attr, items, name="", description="", default=""):
+	"""
+	return a new enum property
+	"""	
+''')
+
 
 if __name__ == '__main__':
 	if 'bpy' not in dir():
 		print("\nError, this script must run from inside blender2.5")
 		print(script_help_msg)
-		
 	else:
-		rna2epy('source/blender/python/doc/rna.py')
-		op2epy('source/blender/python/doc/bpyoperator.py')
+		misc2epy('source/blender/python/doc/bpy') # first to write in info in some of the modules.
+		rna2epy('source/blender/python/doc/bpy')
+		op2epy('source/blender/python/doc/bpy')
+	
+	
+	close_all()
 	
 	import sys
 	sys.exit()
diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c
index 9a74bf0aee8..0a487a8dbe8 100644
--- a/source/blender/python/intern/bpy_operator_wrap.c
+++ b/source/blender/python/intern/bpy_operator_wrap.c
@@ -228,7 +228,7 @@ static int PYTHON_OT_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	return PYTHON_OT_generic(PYOP_INVOKE, C, op, event);	
 }
 
-static int PYTHON_OT_exec(bContext *C, wmOperator *op)
+static int PYTHON_OT_execute(bContext *C, wmOperator *op)
 {
 	return PYTHON_OT_generic(PYOP_EXEC, C, op, NULL);
 }
@@ -268,7 +268,7 @@ void PYTHON_OT_wrapper(wmOperatorType *ot, void *userdata)
 	if (PyObject_HasAttrString(py_class, "invoke"))
 		ot->invoke= PYTHON_OT_invoke;
 	if (PyObject_HasAttrString(py_class, "execute"))
-		ot->exec= PYTHON_OT_exec;
+		ot->exec= PYTHON_OT_execute;
 	if (PyObject_HasAttrString(py_class, "poll"))
 		ot->poll= PYTHON_OT_poll;
 	

From 62dd488ad16911620137ac655ae2f5980374c2bc Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 4 Sep 2009 06:55:01 +0000
Subject: [PATCH 418/577] * New and improved voxel interpolation methods, from
 Alfredo.

Now there is (in order of speed):
* Nearest neighbour (very rough quality)
* Linear (medium quality)
* Quadratic (good quality)
* Cubic Catmull-rom (very good quality, crisp)
* Cubic B-spline (very good quality, smooth)

Thanks!
---
 source/blender/blenlib/BLI_voxel.h            |   3 +-
 source/blender/blenlib/intern/voxel.c         | 347 +++++++-----------
 source/blender/makesdna/DNA_texture_types.h   |   5 +-
 source/blender/makesrna/intern/rna_texture.c  |   8 +-
 .../blender/render/intern/source/voxeldata.c  |   8 +-
 5 files changed, 140 insertions(+), 231 deletions(-)

diff --git a/source/blender/blenlib/BLI_voxel.h b/source/blender/blenlib/BLI_voxel.h
index 9b815ccbf42..934bc820259 100644
--- a/source/blender/blenlib/BLI_voxel.h
+++ b/source/blender/blenlib/BLI_voxel.h
@@ -35,6 +35,7 @@
 /* all input coordinates must be in bounding box 0.0 - 1.0 */
 float voxel_sample_nearest(float *data, int *res, float *co);
 float voxel_sample_trilinear(float *data, int *res, float *co);
-float voxel_sample_tricubic(float *data, int *res, float *co);
+float voxel_sample_triquadratic(float *data, int *res, float *co);
+float voxel_sample_tricubic(float *data, int *res, float *co, int bspline);
 
 #endif /* BLI_VOXEL_H */
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c
index b5b2ae793f9..7dad854af3a 100644
--- a/source/blender/blenlib/intern/voxel.c
+++ b/source/blender/blenlib/intern/voxel.c
@@ -57,243 +57,142 @@ float voxel_sample_nearest(float *data, int *res, float *co)
 	return D(data, res, xi, yi, zi);
 }
 
-
-/* *** trilinear *** */
-/* input coordinates must be in bounding box 0.0 - 1.0 */
-
-static inline float lerp(float t, float v1, float v2) {
-	return (1.f - t) * v1 + t * v2;
+// returns highest integer <= x as integer (slightly faster than floor())
+inline int FLOORI(float x)
+{
+	const int r = (int)x;
+	return ((x >= 0.f) || (float)r == x) ? r : (r - 1);
+}
+
+// clamp function, cannot use the CLAMPIS macro, it sometimes returns unwanted results apparently related to gcc optimization flag -fstrict-overflow which is enabled at -O2
+// this causes the test (x + 2) < 0 with int x == 2147483647 to return false (x being an integer, x + 2 should wrap around to -2147483647 so the test < 0 should return true, which it doesn't)
+inline int _clamp(int a, int b, int c)
+{
+	return (a < b) ? b : ((a > c) ? c : a);
 }
 
-/* trilinear interpolation - taken partly from pbrt's implementation: http://www.pbrt.org */
 float voxel_sample_trilinear(float *data, int *res, float *co)
 {
-	float voxx, voxy, voxz;
-	int vx, vy, vz;
-	float dx, dy, dz;
-	float d00, d10, d01, d11, d0, d1, d_final;
+	if (data) {
 	
-	if (!data) return 0.f;
+		const float xf = co[0] * res[0] - 0.5f;
+		const float yf = co[1] * res[1] - 0.5f;
+		const float zf = co[2] * res[2] - 0.5f;
+		
+		const int x = FLOORI(xf), y = FLOORI(yf), z = FLOORI(zf);
 	
-	voxx = co[0] * res[0] - 0.5f;
-	voxy = co[1] * res[1] - 0.5f;
-	voxz = co[2] * res[2] - 0.5f;
+		const int xc[2] = {_clamp(x, 0, res[0] - 1), _clamp(x + 1, 0, res[0] - 1)};
+		const int yc[2] = {res[0] * _clamp(y, 0, res[1] - 1), res[0] * _clamp(y + 1, 0, res[1] - 1)};
+		const int zc[2] = {res[0] * res[1] * _clamp(z, 0, res[2] - 1), res[0] * res[1] * _clamp(z + 1, 0, res[2] - 1)};
 	
-	vx = (int)voxx; vy = (int)voxy; vz = (int)voxz;
+		const float dx = xf - (float)x;
+		const float dy = yf - (float)y;
+		const float dz = zf - (float)z;
+		
+		const float u[2] = {1.f - dx, dx};
+		const float v[2] = {1.f - dy, dy};
+		const float w[2] = {1.f - dz, dz};
 	
-	dx = voxx - vx; dy = voxy - vy; dz = voxz - vz;
+		return w[0] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[0]] + u[1] * data[xc[1] + yc[0] + zc[0]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] ) )
+		     + w[1] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] ) );
 	
-	d00 = lerp(dx, D(data, res, vx, vy, vz), 		D(data, res, vx+1, vy, vz));
-	d10 = lerp(dx, D(data, res, vx, vy+1, vz), 		D(data, res, vx+1, vy+1, vz));
-	d01 = lerp(dx, D(data, res, vx, vy, vz+1), 		D(data, res, vx+1, vy, vz+1));
-	d11 = lerp(dx, D(data, res, vx, vy+1, vz+1), 	D(data, res, vx+1, vy+1, vz+1));
-	d0 = lerp(dy, d00, d10);
-	d1 = lerp(dy, d01, d11);
-	d_final = lerp(dz, d0, d1);
-	
-	return d_final;
-}
-
-/* *** tricubic *** */
-
-int C[64][64] = {
-{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 9,-9,-9, 9, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{-6, 6, 6,-6, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{-6, 6, 6,-6, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 4,-4,-4, 4, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3,-6,-3, 0, 0, 0, 0, 6,-6, 3,-3, 0, 0, 0, 0, 4, 2, 2, 1, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 3, 3, 0, 0, 0, 0,-4, 4,-2, 2, 0, 0, 0, 0,-2,-2,-1,-1, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 4, 2, 0, 0, 0, 0,-3, 3,-3, 3, 0, 0, 0, 0,-2,-1,-2,-1, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2,-2,-2, 0, 0, 0, 0, 2,-2, 2,-2, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0},
-{-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 9,-9, 0, 0,-9, 9, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{-6, 6, 0, 0, 6,-6, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0, 0, 0,-1, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,-9, 0, 0,-9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3, 0, 0,-6,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,-6, 0, 0, 3,-3, 0, 0, 4, 2, 0, 0, 2, 1, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3,-3, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 4, 0, 0,-2, 2, 0, 0,-2,-2, 0, 0,-1,-1, 0, 0},
-{ 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,-9, 0,-9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 0,-6, 0,-3, 0, 6, 0,-6, 0, 3, 0,-3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2, 0, 2, 0, 1, 0},
-{-27,27,27,-27,27,-27,-27,27,-18,-9,18, 9,18, 9,-18,-9,-18,18,-9, 9,18,-18, 9,-9,-18,18,18,-18,-9, 9, 9,-9,-12,-6,-6,-3,12, 6, 6, 3,-12,-6,12, 6,-6,-3, 6, 3,-12,12,-6, 6,-6, 6,-3, 3,-8,-4,-4,-2,-4,-2,-2,-1},
-{18,-18,-18,18,-18,18,18,-18, 9, 9,-9,-9,-9,-9, 9, 9,12,-12, 6,-6,-12,12,-6, 6,12,-12,-12,12, 6,-6,-6, 6, 6, 6, 3, 3,-6,-6,-3,-3, 6, 6,-6,-6, 3, 3,-3,-3, 8,-8, 4,-4, 4,-4, 2,-2, 4, 4, 2, 2, 2, 2, 1, 1},
-{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 0,-3, 0, 3, 0, 3, 0,-4, 0, 4, 0,-2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-2, 0,-1, 0,-1, 0},
-{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6, 9,-9, 9,-9,-9, 9,-9, 9,12,-12,-12,12, 6,-6,-6, 6, 6, 3, 6, 3,-6,-3,-6,-3, 8, 4,-8,-4, 4, 2,-4,-2, 6,-6, 6,-6, 3,-3, 3,-3, 4, 2, 4, 2, 2, 1, 2, 1},
-{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-6, 6,-6, 6, 6,-6, 6,-6,-8, 8, 8,-8,-4, 4, 4,-4,-3,-3,-3,-3, 3, 3, 3, 3,-4,-4, 4, 4,-2,-2, 2, 2,-4, 4,-4, 4,-2, 2,-2, 2,-2,-2,-2,-2,-1,-1,-1,-1},
-{ 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{-6, 6, 0, 0, 6,-6, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 4,-4, 0, 0,-4, 4, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-6, 6, 0, 0, 6,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4,-2, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-3, 3, 0, 0,-3, 3, 0, 0,-2,-1, 0, 0,-2,-1, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,-4, 0, 0,-4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,-2, 0, 0, 2,-2, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0},
-{-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0,-6, 0, 6, 0, 6, 0,-6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,-4, 0,-2, 0, 4, 0, 2, 0,-3, 0, 3, 0,-3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2, 0,-1, 0,-2, 0,-1, 0},
-{18,-18,-18,18,-18,18,18,-18,12, 6,-12,-6,-12,-6,12, 6,12,-12, 6,-6,-12,12,-6, 6, 9,-9,-9, 9, 9,-9,-9, 9, 8, 4, 4, 2,-8,-4,-4,-2, 6, 3,-6,-3, 6, 3,-6,-3, 6,-6, 3,-3, 6,-6, 3,-3, 4, 2, 2, 1, 4, 2, 2, 1},
-{-12,12,12,-12,12,-12,-12,12,-6,-6, 6, 6, 6, 6,-6,-6,-8, 8,-4, 4, 8,-8, 4,-4,-6, 6, 6,-6,-6, 6, 6,-6,-4,-4,-2,-2, 4, 4, 2, 2,-3,-3, 3, 3,-3,-3, 3, 3,-4, 4,-2, 2,-4, 4,-2, 2,-2,-2,-1,-1,-2,-2,-1,-1},
-{ 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 0, 0, 0, 0, 0, 0, 0, 4, 0,-4, 0,-4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,-2, 0,-2, 0, 2, 0,-2, 0, 2, 0,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
-{-12,12,12,-12,12,-12,-12,12,-8,-4, 8, 4, 8, 4,-8,-4,-6, 6,-6, 6, 6,-6, 6,-6,-6, 6, 6,-6,-6, 6, 6,-6,-4,-2,-4,-2, 4, 2, 4, 2,-4,-2, 4, 2,-4,-2, 4, 2,-3, 3,-3, 3,-3, 3,-3, 3,-2,-1,-2,-1,-2,-1,-2,-1},
-{ 8,-8,-8, 8,-8, 8, 8,-8, 4, 4,-4,-4,-4,-4, 4, 4, 4,-4, 4,-4,-4, 4,-4, 4, 4,-4,-4, 4, 4,-4,-4, 4, 2, 2, 2, 2,-2,-2,-2,-2, 2, 2,-2,-2, 2, 2,-2,-2, 2,-2, 2,-2, 2,-2, 2,-2, 1, 1, 1, 1, 1, 1, 1, 1}};
-
-static int ijk2n(int i, int j, int k) {
-	return(i+4*j+16*k);
-}
-
-static void tricubic_get_coeff_stacked(float a[64], float x[64]) {
-	int i,j;
-	for (i=0;i<64;i++) {
-		a[i]=(float)(0.0);
-		for (j=0;j<64;j++) {
-			a[i]+=C[i][j]*x[j];
-		}
 	}
+	return 0.f;
 }
-
-
-
-
-static void tricubic_get_coeff(float a[64], float f[8], float dfdx[8], float dfdy[8], float dfdz[8], float d2fdxdy[8], float d2fdxdz[8], float d2fdydz[8], float d3fdxdydz[8]) {
-	int i;
-	float x[64];
-	for (i=0;i<8;i++) {
-		x[0+i]=f[i];
-		x[8+i]=dfdx[i];
-		x[16+i]=dfdy[i];
-		x[24+i]=dfdz[i];
-		x[32+i]=d2fdxdy[i];
-		x[40+i]=d2fdxdz[i];
-		x[48+i]=d2fdydz[i];
-		x[56+i]=d3fdxdydz[i];
-	}
-	tricubic_get_coeff_stacked(a,x);
-}
-
-static float tricubic_eval(float a[64], float x, float y, float z) {
-	int i,j,k;
-	float ret=(float)(0.0);
 	
-	for (i=0;i<4;i++) {
-		for (j=0;j<4;j++) {
-			for (k=0;k<4;k++) {
-				ret+=a[ijk2n(i,j,k)]*pow(x,i)*pow(y,j)*pow(z,k);
-			}
-		}
-	}
-	return(ret);
-}
 
-/* tricubic interpolation
- * from 'libtricubic': http://www.lekien.com/~francois/software/tricubic/ 
- * input coordinates must be in bounding box 0.0 - 1.0 */
-float voxel_sample_tricubic(float *data, int *res, float *co)
+float voxel_sample_triquadratic(float *data, int *res, float *co)
 {
-	float xx, yy, zz;
-	int xi,yi,zi;
-	int *n = res;
-	float dx,dy,dz;
-	float a[64];
-	
-	xx = co[0] * res[0] - 0.5f;
-	yy = co[1] * res[1] - 0.5f;
-	zz = co[2] * res[2] - 0.5f;
-	
-	xi = (int)xx; yi = (int)yy; zi = (int)zz;
-	
-	{
-		float fval[8]={data[V_I(xi,yi,zi,n)],data[V_I(xi+1,yi,zi,n)],data[V_I(xi,yi+1,zi,n)],data[V_I(xi+1,yi+1,zi,n)],data[V_I(xi,yi,zi+1,n)],data[V_I(xi+1,yi,zi+1,n)],data[V_I(xi,yi+1,zi+1,n)],data[V_I(xi+1,yi+1,zi+1,n)]}; 
-		
-		float dfdxval[8]={0.5f*(data[V_I(xi+1,yi,zi,n)]-data[V_I(xi-1,yi,zi,n)]),0.5f*(data[V_I(xi+2,yi,zi,n)]-data[V_I(xi,yi,zi,n)]),
-			0.5f*(data[V_I(xi+1,yi+1,zi,n)]-data[V_I(xi-1,yi+1,zi,n)]),0.5f*(data[V_I(xi+2,yi+1,zi,n)]-data[V_I(xi,yi+1,zi,n)]),
-			0.5f*(data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi-1,yi,zi+1,n)]),0.5f*(data[V_I(xi+2,yi,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]),
-			0.5f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]),
-			0.5f*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)])};						
-		
-		float dfdyval[8]={0.5f*(data[V_I(xi,yi+1,zi,n)]-data[V_I(xi,yi-1,zi,n)]),0.5f*(data[V_I(xi+1,yi+1,zi,n)]-data[V_I(xi+1,yi-1,zi,n)]),
-			0.5f*(data[V_I(xi,yi+2,zi,n)]-data[V_I(xi,yi,zi,n)]),0.5f*(data[V_I(xi+1,yi+2,zi,n)]-data[V_I(xi+1,yi,zi,n)]),
-			0.5f*(data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi,yi-1,zi+1,n)]),0.5f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]),
-			0.5f*(data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]),
-			0.5f*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)])};						 
-		
-		float dfdzval[8]={0.5f*(data[V_I(xi,yi,zi+1,n)]-data[V_I(xi,yi,zi-1,n)]),0.5f*(data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi+1,yi,zi-1,n)]),
-			0.5f*(data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi-1,n)]),0.5f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]),
-			0.5f*(data[V_I(xi,yi,zi+2,n)]-data[V_I(xi,yi,zi,n)]),0.5f*(data[V_I(xi+1,yi,zi+2,n)]-data[V_I(xi+1,yi,zi,n)]),
-			0.5f*(data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi,yi+1,zi,n)]),
-			0.5f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)])};						 
-		
-		float d2fdxdyval[8]={0.25*(data[V_I(xi+1,yi+1,zi,n)]-data[V_I(xi-1,yi+1,zi,n)]-data[V_I(xi+1,yi-1,zi,n)]+data[V_I(xi-1,yi-1,zi,n)]),
-			0.25*(data[V_I(xi+2,yi+1,zi,n)]-data[V_I(xi,yi+1,zi,n)]-data[V_I(xi+2,yi-1,zi,n)]+data[V_I(xi,yi-1,zi,n)]),
-			0.25*(data[V_I(xi+1,yi+2,zi,n)]-data[V_I(xi-1,yi+2,zi,n)]-data[V_I(xi+1,yi,zi,n)]+data[V_I(xi-1,yi,zi,n)]),
-			0.25*(data[V_I(xi+2,yi+2,zi,n)]-data[V_I(xi,yi+2,zi,n)]-data[V_I(xi+2,yi,zi,n)]+data[V_I(xi,yi,zi,n)]),
-			0.25*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]+data[V_I(xi-1,yi-1,zi+1,n)]),
-			0.25*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi+2,yi-1,zi+1,n)]+data[V_I(xi,yi-1,zi+1,n)]),
-			0.25*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi-1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)]+data[V_I(xi-1,yi,zi+1,n)]),
-			0.25*(data[V_I(xi+2,yi+2,zi+1,n)]-data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi+2,yi,zi+1,n)]+data[V_I(xi,yi,zi+1,n)])};						 
-		
-		float d2fdxdzval[8]={0.25f*(data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi-1,yi,zi+1,n)]-data[V_I(xi+1,yi,zi-1,n)]+data[V_I(xi-1,yi,zi-1,n)]),
-			0.25f*(data[V_I(xi+2,yi,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]-data[V_I(xi+2,yi,zi-1,n)]+data[V_I(xi,yi,zi-1,n)]),
-			0.25f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]+data[V_I(xi-1,yi+1,zi-1,n)]),
-			0.25f*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi+2,yi+1,zi-1,n)]+data[V_I(xi,yi+1,zi-1,n)]),
-			0.25f*(data[V_I(xi+1,yi,zi+2,n)]-data[V_I(xi-1,yi,zi+2,n)]-data[V_I(xi+1,yi,zi,n)]+data[V_I(xi-1,yi,zi,n)]),
-			0.25f*(data[V_I(xi+2,yi,zi+2,n)]-data[V_I(xi,yi,zi+2,n)]-data[V_I(xi+2,yi,zi,n)]+data[V_I(xi,yi,zi,n)]),
-			0.25f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi-1,yi+1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)]+data[V_I(xi-1,yi+1,zi,n)]),
-			0.25f*(data[V_I(xi+2,yi+1,zi+2,n)]-data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi+2,yi+1,zi,n)]+data[V_I(xi,yi+1,zi,n)])};
-		
-		
-		float d2fdydzval[8]={0.25f*(data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi,yi-1,zi+1,n)]-data[V_I(xi,yi+1,zi-1,n)]+data[V_I(xi,yi-1,zi-1,n)]),
-			0.25f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]+data[V_I(xi+1,yi-1,zi-1,n)]),
-			0.25f*(data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi,yi,zi+1,n)]-data[V_I(xi,yi+2,zi-1,n)]+data[V_I(xi,yi,zi-1,n)]),
-			0.25f*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)]-data[V_I(xi+1,yi+2,zi-1,n)]+data[V_I(xi+1,yi,zi-1,n)]),
-			0.25f*(data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi,yi-1,zi+2,n)]-data[V_I(xi,yi+1,zi,n)]+data[V_I(xi,yi-1,zi,n)]),
-			0.25f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi+1,yi-1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)]+data[V_I(xi+1,yi-1,zi,n)]),
-			0.25f*(data[V_I(xi,yi+2,zi+2,n)]-data[V_I(xi,yi,zi+2,n)]-data[V_I(xi,yi+2,zi,n)]+data[V_I(xi,yi,zi,n)]),
-			0.25f*(data[V_I(xi+1,yi+2,zi+2,n)]-data[V_I(xi+1,yi,zi+2,n)]-data[V_I(xi+1,yi+2,zi,n)]+data[V_I(xi+1,yi,zi,n)])};
-		
-		
-		float d3fdxdydzval[8]={0.125f*(data[V_I(xi+1,yi+1,zi+1,n)]-data[V_I(xi-1,yi+1,zi+1,n)]-data[V_I(xi+1,yi-1,zi+1,n)]+data[V_I(xi-1,yi-1,zi+1,n)]-data[V_I(xi+1,yi+1,zi-1,n)]+data[V_I(xi-1,yi+1,zi-1,n)]+data[V_I(xi+1,yi-1,zi-1,n)]-data[V_I(xi-1,yi-1,zi-1,n)]),
-			0.125f*(data[V_I(xi+2,yi+1,zi+1,n)]-data[V_I(xi,yi+1,zi+1,n)]-data[V_I(xi+2,yi-1,zi+1,n)]+data[V_I(xi,yi-1,zi+1,n)]-data[V_I(xi+2,yi+1,zi-1,n)]+data[V_I(xi,yi+1,zi-1,n)]+data[V_I(xi+2,yi-1,zi-1,n)]-data[V_I(xi,yi-1,zi-1,n)]),
-			0.125f*(data[V_I(xi+1,yi+2,zi+1,n)]-data[V_I(xi-1,yi+2,zi+1,n)]-data[V_I(xi+1,yi,zi+1,n)]+data[V_I(xi-1,yi,zi+1,n)]-data[V_I(xi+1,yi+2,zi-1,n)]+data[V_I(xi-1,yi+2,zi-1,n)]+data[V_I(xi+1,yi,zi-1,n)]-data[V_I(xi-1,yi,zi-1,n)]),
-			0.125f*(data[V_I(xi+2,yi+2,zi+1,n)]-data[V_I(xi,yi+2,zi+1,n)]-data[V_I(xi+2,yi,zi+1,n)]+data[V_I(xi,yi,zi+1,n)]-data[V_I(xi+2,yi+2,zi-1,n)]+data[V_I(xi,yi+2,zi-1,n)]+data[V_I(xi+2,yi,zi-1,n)]-data[V_I(xi,yi,zi-1,n)]),
-			0.125f*(data[V_I(xi+1,yi+1,zi+2,n)]-data[V_I(xi-1,yi+1,zi+2,n)]-data[V_I(xi+1,yi-1,zi+2,n)]+data[V_I(xi-1,yi-1,zi+2,n)]-data[V_I(xi+1,yi+1,zi,n)]+data[V_I(xi-1,yi+1,zi,n)]+data[V_I(xi+1,yi-1,zi,n)]-data[V_I(xi-1,yi-1,zi,n)]),
-			0.125f*(data[V_I(xi+2,yi+1,zi+2,n)]-data[V_I(xi,yi+1,zi+2,n)]-data[V_I(xi+2,yi-1,zi+2,n)]+data[V_I(xi,yi-1,zi+2,n)]-data[V_I(xi+2,yi+1,zi,n)]+data[V_I(xi,yi+1,zi,n)]+data[V_I(xi+2,yi-1,zi,n)]-data[V_I(xi,yi-1,zi,n)]),
-			0.125f*(data[V_I(xi+1,yi+2,zi+2,n)]-data[V_I(xi-1,yi+2,zi+2,n)]-data[V_I(xi+1,yi,zi+2,n)]+data[V_I(xi-1,yi,zi+2,n)]-data[V_I(xi+1,yi+2,zi,n)]+data[V_I(xi-1,yi+2,zi,n)]+data[V_I(xi+1,yi,zi,n)]-data[V_I(xi-1,yi,zi,n)]),
-			0.125f*(data[V_I(xi+2,yi+2,zi+2,n)]-data[V_I(xi,yi+2,zi+2,n)]-data[V_I(xi+2,yi,zi+2,n)]+data[V_I(xi,yi,zi+2,n)]-data[V_I(xi+2,yi+2,zi,n)]+data[V_I(xi,yi+2,zi,n)]+data[V_I(xi+2,yi,zi,n)]-data[V_I(xi,yi,zi,n)])};
-		
-		
-		tricubic_get_coeff(a,fval,dfdxval,dfdyval,dfdzval,d2fdxdyval,d2fdxdzval,d2fdydzval,d3fdxdydzval);
-	}
-	
-	dx = xx-xi;
-	dy = yy-yi;
-	dz = zz-zi;
-	
-	return tricubic_eval(a,dx,dy,dz);
-	
+	if (data) {
+
+		const float xf = co[0] * res[0], yf = co[1] * res[1], zf = co[2] * res[2];
+		const int x = FLOORI(xf), y = FLOORI(yf), z = FLOORI(zf);
+
+		const int xc[3] = {_clamp(x - 1, 0, res[0] - 1), _clamp(x, 0, res[0] - 1), _clamp(x + 1, 0, res[0] - 1)};
+		const int yc[3] = {res[0] * _clamp(y - 1, 0, res[1] - 1), res[0] * _clamp(y, 0, res[1] - 1), res[0] * _clamp(y + 1, 0, res[1] - 1)};
+		const int zc[3] = {res[0] * res[1] * _clamp(z - 1, 0, res[2] - 1), res[0] * res[1] * _clamp(z, 0, res[2] - 1), res[0] * res[1] * _clamp(z + 1, 0, res[2] - 1)};
+
+		const float dx = xf - (float)x, dy = yf - (float)y, dz = zf - (float)z;
+		const float u[3] = {dx*(0.5f*dx - 1.f) + 0.5f, dx*(1.f - dx) + 0.5f, 0.5f*dx*dx};
+		const float v[3] = {dy*(0.5f*dy - 1.f) + 0.5f, dy*(1.f - dy) + 0.5f, 0.5f*dy*dy};
+		const float w[3] = {dz*(0.5f*dz - 1.f) + 0.5f, dz*(1.f - dz) + 0.5f, 0.5f*dz*dz};
+
+		return w[0] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[0]] + u[1] * data[xc[1] + yc[0] + zc[0]] + u[2] * data[xc[2] + yc[0] + zc[0]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] + u[2] * data[xc[2] + yc[1] + zc[0]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[0]] + u[1] * data[xc[1] + yc[2] + zc[0]] + u[2] * data[xc[2] + yc[2] + zc[0]] ) )
+		     + w[1] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] + u[2] * data[xc[2] + yc[0] + zc[1]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] + u[2] * data[xc[2] + yc[1] + zc[1]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[1]] + u[1] * data[xc[1] + yc[2] + zc[1]] + u[2] * data[xc[2] + yc[2] + zc[1]] ) )
+		     + w[2] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[2]] + u[1] * data[xc[1] + yc[0] + zc[2]] + u[2] * data[xc[2] + yc[0] + zc[2]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[2]] + u[1] * data[xc[1] + yc[1] + zc[2]] + u[2] * data[xc[2] + yc[1] + zc[2]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[2]] + u[1] * data[xc[1] + yc[2] + zc[2]] + u[2] * data[xc[2] + yc[2] + zc[2]] ) );
+
+}
+	return 0.f;
 }
 
+float voxel_sample_tricubic(float *data, int *res, float *co, int bspline)
+{
+	if (data) {
+
+		const float xf = co[0] * res[0] - 0.5f, yf = co[1] * res[1] - 0.5f, zf = co[2] * res[2] - 0.5f;
+		const int x = FLOORI(xf), y = FLOORI(yf), z = FLOORI(zf);
+
+		const int xc[4] = {_clamp(x - 1, 0, res[0] - 1), _clamp(x, 0, res[0] - 1), _clamp(x + 1, 0, res[0] - 1), _clamp(x + 2, 0, res[0] - 1)};
+		const int yc[4] = {res[0] * _clamp(y - 1, 0, res[1] - 1), res[0] * _clamp(y, 0, res[1] - 1), res[0] * _clamp(y + 1, 0, res[1] - 1), res[0] * _clamp(y + 2, 0, res[1] - 1)};
+		const int zc[4] = {res[0] * res[1] * _clamp(z - 1, 0, res[2] - 1), res[0] * res[1] * _clamp(z, 0, res[2] - 1), res[0] * res[1] * _clamp(z + 1, 0, res[2] - 1), res[0] * res[1] * _clamp(z + 2, 0, res[2] - 1)};
+
+		const float dx = xf - (float)x, dy = yf - (float)y, dz = zf - (float)z;
+
+		float u[4], v[4], w[4];
+		if (bspline) {	// B-Spline
+			u[0] = (((-1.f/6.f)*dx + 0.5f)*dx - 0.5f)*dx + (1.f/6.f);
+			u[1] =  ((     0.5f*dx - 1.f )*dx       )*dx + (2.f/3.f);
+			u[2] =  ((    -0.5f*dx + 0.5f)*dx + 0.5f)*dx + (1.f/6.f);
+			u[3] =   ( 1.f/6.f)*dx*dx*dx;
+			v[0] = (((-1.f/6.f)*dy + 0.5f)*dy - 0.5f)*dy + (1.f/6.f);
+			v[1] =  ((     0.5f*dy - 1.f )*dy       )*dy + (2.f/3.f);
+			v[2] =  ((    -0.5f*dy + 0.5f)*dy + 0.5f)*dy + (1.f/6.f);
+			v[3] =  ( 1.f/6.f)*dy*dy*dy;
+			w[0] = (((-1.f/6.f)*dz + 0.5f)*dz - 0.5f)*dz + (1.f/6.f);
+			w[1] =  ((     0.5f*dz - 1.f )*dz       )*dz + (2.f/3.f);
+			w[2] =  ((    -0.5f*dz + 0.5f)*dz + 0.5f)*dz + (1.f/6.f);
+			w[3] =   ( 1.f/6.f)*dz*dz*dz;
+		}
+		else {	// Catmull-Rom
+			u[0] = ((-0.5f*dx + 1.0f)*dx - 0.5f)*dx;
+			u[1] = (( 1.5f*dx - 2.5f)*dx       )*dx + 1.0f;
+			u[2] = ((-1.5f*dx + 2.0f)*dx + 0.5f)*dx;
+			u[3] = (( 0.5f*dx - 0.5f)*dx       )*dx;
+			v[0] = ((-0.5f*dy + 1.0f)*dy - 0.5f)*dy;
+			v[1] = (( 1.5f*dy - 2.5f)*dy       )*dy + 1.0f;
+			v[2] = ((-1.5f*dy + 2.0f)*dy + 0.5f)*dy;
+			v[3] = (( 0.5f*dy - 0.5f)*dy       )*dy;
+			w[0] = ((-0.5f*dz + 1.0f)*dz - 0.5f)*dz;
+			w[1] = (( 1.5f*dz - 2.5f)*dz       )*dz + 1.0f;
+			w[2] = ((-1.5f*dz + 2.0f)*dz + 0.5f)*dz;
+			w[3] = (( 0.5f*dz - 0.5f)*dz       )*dz;
+		}
+
+		return w[0] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[0]] + u[1] * data[xc[1] + yc[0] + zc[0]] + u[2] * data[xc[2] + yc[0] + zc[0]] + u[3] * data[xc[3] + yc[0] + zc[0]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] + u[2] * data[xc[2] + yc[1] + zc[0]] + u[3] * data[xc[3] + yc[1] + zc[0]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[0]] + u[1] * data[xc[1] + yc[2] + zc[0]] + u[2] * data[xc[2] + yc[2] + zc[0]] + u[3] * data[xc[3] + yc[2] + zc[0]] )
+		                + v[3] * ( u[0] * data[xc[0] + yc[3] + zc[0]] + u[1] * data[xc[1] + yc[3] + zc[0]] + u[2] * data[xc[2] + yc[3] + zc[0]] + u[3] * data[xc[3] + yc[3] + zc[0]] ) )
+		     + w[1] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] + u[2] * data[xc[2] + yc[0] + zc[1]] + u[3] * data[xc[3] + yc[0] + zc[1]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] + u[2] * data[xc[2] + yc[1] + zc[1]] + u[3] * data[xc[3] + yc[1] + zc[1]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[1]] + u[1] * data[xc[1] + yc[2] + zc[1]] + u[2] * data[xc[2] + yc[2] + zc[1]] + u[3] * data[xc[3] + yc[2] + zc[1]] )
+		                + v[3] * ( u[0] * data[xc[0] + yc[3] + zc[1]] + u[1] * data[xc[1] + yc[3] + zc[1]] + u[2] * data[xc[2] + yc[3] + zc[1]] + u[3] * data[xc[3] + yc[3] + zc[1]] ) )
+		     + w[2] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[2]] + u[1] * data[xc[1] + yc[0] + zc[2]] + u[2] * data[xc[2] + yc[0] + zc[2]] + u[3] * data[xc[3] + yc[0] + zc[2]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[2]] + u[1] * data[xc[1] + yc[1] + zc[2]] + u[2] * data[xc[2] + yc[1] + zc[2]] + u[3] * data[xc[3] + yc[1] + zc[2]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[2]] + u[1] * data[xc[1] + yc[2] + zc[2]] + u[2] * data[xc[2] + yc[2] + zc[2]] + u[3] * data[xc[3] + yc[2] + zc[2]] )
+		                + v[3] * ( u[0] * data[xc[0] + yc[3] + zc[2]] + u[1] * data[xc[1] + yc[3] + zc[2]] + u[2] * data[xc[2] + yc[3] + zc[2]] + u[3] * data[xc[3] + yc[3] + zc[2]] ) )
+		     + w[3] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[3]] + u[1] * data[xc[1] + yc[0] + zc[3]] + u[2] * data[xc[2] + yc[0] + zc[3]] + u[3] * data[xc[3] + yc[0] + zc[3]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[3]] + u[1] * data[xc[1] + yc[1] + zc[3]] + u[2] * data[xc[2] + yc[1] + zc[3]] + u[3] * data[xc[3] + yc[1] + zc[3]] )
+		                + v[2] * ( u[0] * data[xc[0] + yc[2] + zc[3]] + u[1] * data[xc[1] + yc[2] + zc[3]] + u[2] * data[xc[2] + yc[2] + zc[3]] + u[3] * data[xc[3] + yc[2] + zc[3]] )
+		                + v[3] * ( u[0] * data[xc[0] + yc[3] + zc[3]] + u[1] * data[xc[1] + yc[3] + zc[3]] + u[2] * data[xc[2] + yc[3] + zc[3]] + u[3] * data[xc[3] + yc[3] + zc[3]] ) );
+
+	}
+	return 0.f;
+}
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 1b6ed1bc032..4df63ee9cd9 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -515,7 +515,10 @@ typedef struct TexMapping {
 /* interpolation */
 #define TEX_VD_NEARESTNEIGHBOR		0
 #define TEX_VD_LINEAR				1
-#define TEX_VD_TRICUBIC				2
+#define TEX_VD_QUADRATIC        2
+#define TEX_VD_TRICUBIC_CATROM  3
+#define TEX_VD_TRICUBIC_BSPLINE 4
+#define TEX_VD_TRICUBIC_SLOW    5
 
 /* file format */
 #define TEX_VD_BLENDERVOXEL		0
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 6de0be9b19c..b11e5c6c12f 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -1496,10 +1496,12 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
 	
 	static EnumPropertyItem interpolation_type_items[] = {
 		{TEX_VD_NEARESTNEIGHBOR, "NEREASTNEIGHBOR", 0, "Nearest Neighbor", "No interpolation, fast but blocky and low quality."},
-		{TEX_VD_LINEAR, "TRILINEAR", 0, "Trilinear", "Good smoothness and speed"},
-		{TEX_VD_TRICUBIC, "TRICUBIC", 0, "Tricubic", "High quality interpolation, but slow"},
+		{TEX_VD_LINEAR, "TRILINEAR", 0, "Linear", "Good smoothness and speed"},
+		{TEX_VD_QUADRATIC, "QUADRATIC", 0, "Quadratic", "Mid-range quality and speed"},
+		{TEX_VD_TRICUBIC_CATROM, "TRICUBIC_CATROM", 0, "Cubic Catmull-Rom", "High quality interpolation, but slower"},
+		{TEX_VD_TRICUBIC_BSPLINE, "TRICUBIC_BSPLINE", 0, "Cubic B-Spline", "Smoothed high quality interpolation, but slower"},
 		{0, NULL, 0, NULL, NULL}};
-	
+
 	static EnumPropertyItem file_format_items[] = {
 		{TEX_VD_BLENDERVOXEL, "BLENDER_VOXEL", 0, "Blender Voxel", "Default binary voxel file format"},
 		{TEX_VD_RAW_8BIT, "RAW_8BIT", 0, "8 bit RAW", "8 bit greyscale binary data"},
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 836faeb05b9..17858e55e3d 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -322,8 +322,12 @@ int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
 		case TEX_VD_LINEAR:
 			texres->tin = voxel_sample_trilinear(vd->dataset, vd->resol, co);
 			break;					
-		case TEX_VD_TRICUBIC:
-			texres->tin = voxel_sample_tricubic(vd->dataset, vd->resol, co);
+		case TEX_VD_QUADRATIC:
+			texres->tin = voxel_sample_triquadratic(vd->dataset, vd->resol, co);
+			break;
+		case TEX_VD_TRICUBIC_CATROM:
+		case TEX_VD_TRICUBIC_BSPLINE:
+			texres->tin = voxel_sample_tricubic(vd->dataset, vd->resol, co, (vd->interp_type == TEX_VD_TRICUBIC_BSPLINE));
 			break;
 	}
 	

From 15ef88b90239af30b08e798cc57cea317f1d56c9 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 07:26:32 +0000
Subject: [PATCH 419/577] Keying Sets: Added options to add/remove properties
 from the active Keying Set to the RMB menu (and also via KKEY and ALT-K
 respectively)

---
 source/blender/blenkernel/intern/anim_sys.c   |   2 +-
 .../blender/editors/animation/anim_intern.h   |  30 +++-
 source/blender/editors/animation/anim_ops.c   |   6 +-
 source/blender/editors/animation/drivers.c    |   4 +-
 source/blender/editors/animation/keyingsets.c | 165 ++++++++++++++++++
 .../blender/editors/include/ED_keyframing.h   |   6 +
 .../editors/interface/interface_anim.c        |  26 +++
 .../editors/interface/interface_handlers.c    |  19 +-
 .../editors/interface/interface_intern.h      |   2 +
 9 files changed, 249 insertions(+), 11 deletions(-)

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index df7004d3f6b..b7cc98063ed 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -239,7 +239,7 @@ KS_Path *BKE_keyingset_find_destination (KeyingSet *ks, ID *id, const char group
 		if ((ksp->rna_path==0) || strcmp(rna_path, ksp->rna_path))
 			eq_path= 0;
 			
-		/* index */
+		/* index - need to compare whole-array setting too... */
 		if (ksp->array_index != array_index)
 			eq_index= 0;
 			
diff --git a/source/blender/editors/animation/anim_intern.h b/source/blender/editors/animation/anim_intern.h
index e903007fbc0..462ef76ea8d 100644
--- a/source/blender/editors/animation/anim_intern.h
+++ b/source/blender/editors/animation/anim_intern.h
@@ -1,18 +1,42 @@
-/* Testing code for 2.5 animation system 
- * Copyright 2009, Joshua Leung
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2009, Blender Foundation, Joshua Leung
+ * This is a new part of Blender (with some old code)
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
  */
  
 #ifndef ANIM_INTERN_H
 #define ANIM_INTERN_H
 
-
 /* KeyingSets/Keyframing Interface ------------- */
 
 /* list of builtin KeyingSets (defined in keyingsets.c) */
 extern ListBase builtin_keyingsets;
 
+/* for builtin keyingsets - context poll */
 short keyingset_context_ok_poll(bContext *C, KeyingSet *ks);
 
+/* Main KeyingSet operations API call */
 short modifykey_get_context_data (bContext *C, ListBase *dsources, KeyingSet *ks);
 
 #endif // ANIM_INTERN_H
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index 3d45dcc92ca..fedbe12c0e6 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -381,13 +381,14 @@ void ANIM_OT_time_toggle(wmOperatorType *ot)
 
 void ED_operatortypes_anim(void)
 {
+	/* Animation Editors only -------------------------- */
 	WM_operatortype_append(ANIM_OT_change_frame);
 	WM_operatortype_append(ANIM_OT_time_toggle);
 	
 	WM_operatortype_append(ANIM_OT_previewrange_set);
 	WM_operatortype_append(ANIM_OT_previewrange_clear);
 	
-		// XXX this is used all over... maybe for screen instead?
+	/* Entire UI --------------------------------------- */
 	WM_operatortype_append(ANIM_OT_insert_keyframe);
 	WM_operatortype_append(ANIM_OT_delete_keyframe);
 	WM_operatortype_append(ANIM_OT_insert_keyframe_menu);
@@ -398,6 +399,9 @@ void ED_operatortypes_anim(void)
 	
 	WM_operatortype_append(ANIM_OT_add_driver_button);
 	WM_operatortype_append(ANIM_OT_remove_driver_button);
+	
+	WM_operatortype_append(ANIM_OT_add_keyingset_button);
+	WM_operatortype_append(ANIM_OT_remove_keyingset_button);
 }
 
 void ED_keymap_anim(wmWindowManager *wm)
diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c
index e7b7d785d7b..8349b7f9bde 100644
--- a/source/blender/editors/animation/drivers.c
+++ b/source/blender/editors/animation/drivers.c
@@ -281,7 +281,7 @@ void ANIM_OT_add_driver_button (wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_boolean(ot->srna, "all", 1, "All", "Insert a keyframe for all element of the array.");
+	RNA_def_boolean(ot->srna, "all", 1, "All", "Create drivers for all elements of the array.");
 }
 
 /* Remove Driver Button Operator ------------------------ */
@@ -344,7 +344,7 @@ void ANIM_OT_remove_driver_button (wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_boolean(ot->srna, "all", 1, "All", "Delete keyfames from all elements of the array.");
+	RNA_def_boolean(ot->srna, "all", 1, "All", "Delete drivers for all elements of the array.");
 }
 
 /* ************************************************** */
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index f81f57d526a..a91a9bfa911 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -77,6 +77,171 @@
 
 #include "anim_intern.h"
 
+/* ************************************************** */
+/* KEYING SETS - OPERATORS (for use in UI menus) */
+
+/* Add to KeyingSet Button Operator ------------------------ */
+
+static int add_keyingset_button_exec (bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	KeyingSet *ks = NULL;
+	PropertyRNA *prop= NULL;
+	PointerRNA ptr;
+	char *path = NULL;
+	short success= 0;
+	int index=0, pflag=0;
+	int all= RNA_boolean_get(op->ptr, "all");
+	
+	/* verify the Keying Set to use:
+	 *	- use the active one for now (more control over this can be added later)
+	 *	- add a new one if it doesn't exist 
+	 */
+	if (scene->active_keyingset == 0) {
+		short flag=0, keyingflag=0;
+		
+		/* validate flags 
+		 *	- absolute KeyingSets should be created by default
+		 */
+		flag |= KEYINGSET_ABSOLUTE;
+		
+		if (IS_AUTOKEY_FLAG(AUTOMATKEY)) 
+			keyingflag |= INSERTKEY_MATRIX;
+		if (IS_AUTOKEY_FLAG(INSERTNEEDED)) 
+			keyingflag |= INSERTKEY_NEEDED;
+			
+		/* call the API func, and set the active keyingset index */
+		ks= BKE_keyingset_add(&scene->keyingsets, "ButtonKeyingSet", flag, keyingflag);
+		
+		scene->active_keyingset= BLI_countlist(&scene->keyingsets);
+	}
+	else
+		ks= BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);
+	
+	/* try to add to keyingset using property retrieved from UI */
+	memset(&ptr, 0, sizeof(PointerRNA));
+	uiAnimContextProperty(C, &ptr, &prop, &index);
+	
+	/* check if property is able to be added */
+	if (ptr.data && prop && RNA_property_animateable(ptr.data, prop)) {
+		path= RNA_path_from_ID_to_property(&ptr, prop);
+		
+		if (path) {
+			/* set flags */
+			if (all) 
+				pflag |= KSP_FLAG_WHOLE_ARRAY;
+				
+			/* add path to this setting */
+			BKE_keyingset_add_destination(ks, ptr.id.data, NULL, path, index, pflag, KSP_GROUP_KSNAME);
+			
+			/* free the temp path created */
+			MEM_freeN(path);
+		}
+	}
+	
+	if (success) {
+		/* send updates */
+		ED_anim_dag_flush_update(C);	
+		
+		/* for now, only send ND_KEYS for KeyingSets */
+		WM_event_add_notifier(C, ND_KEYS, NULL);
+	}
+	
+	return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
+}
+
+void ANIM_OT_add_keyingset_button (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add to Keying Set";
+	ot->idname= "ANIM_OT_add_keyingset_button";
+	
+	/* callbacks */
+	ot->exec= add_keyingset_button_exec; 
+	//op->poll= ???
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "all", 1, "All", "Add all elements of the array to a Keying Set.");
+}
+
+/* Remove from KeyingSet Button Operator ------------------------ */
+
+static int remove_keyingset_button_exec (bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	KeyingSet *ks = NULL;
+	PropertyRNA *prop= NULL;
+	PointerRNA ptr;
+	char *path = NULL;
+	short success= 0;
+	int index=0;
+	
+	/* verify the Keying Set to use:
+	 *	- use the active one for now (more control over this can be added later)
+	 *	- return error if it doesn't exist
+	 */
+	if (scene->active_keyingset == 0) {
+		BKE_report(op->reports, RPT_ERROR, "No active Keying Set to remove property from");
+		return OPERATOR_CANCELLED;
+	}
+	else
+		ks= BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);
+	
+	/* try to add to keyingset using property retrieved from UI */
+	memset(&ptr, 0, sizeof(PointerRNA));
+	uiAnimContextProperty(C, &ptr, &prop, &index);
+
+	if (ptr.data && prop) {
+		path= RNA_path_from_ID_to_property(&ptr, prop);
+		
+		if (path) {
+			KS_Path *ksp;
+			
+			/* try to find a path matching this description */
+			ksp= BKE_keyingset_find_destination(ks, ptr.id.data, ks->name, path, index, KSP_GROUP_KSNAME);
+			
+			if (ksp) {
+				/* just free it... */
+				MEM_freeN(ksp->rna_path);
+				BLI_freelinkN(&ks->paths, ksp);
+				
+				success= 1;
+			}
+			
+			/* free temp path used */
+			MEM_freeN(path);
+		}
+	}
+	
+	
+	if (success) {
+		/* send updates */
+		ED_anim_dag_flush_update(C);	
+		
+		/* for now, only send ND_KEYS for KeyingSets */
+		WM_event_add_notifier(C, ND_KEYS, NULL);
+	}
+	
+	return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
+}
+
+void ANIM_OT_remove_keyingset_button (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Remove from Keying Set";
+	ot->idname= "ANIM_OT_remove_keyingset_button";
+	
+	/* callbacks */
+	ot->exec= remove_keyingset_button_exec; 
+	//op->poll= ???
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
 /* ************************************************** */
 /* KEYING SETS - EDITING API  */
 
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index c492143751c..20c2301d2ac 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -155,6 +155,12 @@ struct KeyingSet *ANIM_builtin_keyingset_get_named(struct KeyingSet *prevKS, cha
 /* Initialise builtin KeyingSets on startup */
 void init_builtin_keyingsets(void);
 
+/* -------- */
+
+/* KeyingSet managment operators for UI buttons. */
+void ANIM_OT_add_keyingset_button(struct wmOperatorType *ot);
+void ANIM_OT_remove_keyingset_button(struct wmOperatorType *ot);
+
 /* ************ Drivers ********************** */
 
 /* Main Driver Management API calls:
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index d7904a19bfe..8e15bbde201 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -209,6 +209,18 @@ void ui_but_anim_remove_driver(bContext *C)
 	WM_operator_name_call(C, "ANIM_OT_remove_driver_button", WM_OP_INVOKE_DEFAULT, NULL);
 }
 
+void ui_but_anim_add_keyingset(bContext *C)
+{
+	/* this operator calls uiAnimContextProperty above */
+	WM_operator_name_call(C, "ANIM_OT_add_keyingset_button", WM_OP_INVOKE_DEFAULT, NULL);
+}
+
+void ui_but_anim_remove_keyingset(bContext *C)
+{
+	/* this operator calls uiAnimContextProperty above */
+	WM_operator_name_call(C, "ANIM_OT_remove_keyingset_button", WM_OP_INVOKE_DEFAULT, NULL);
+}
+
 void ui_but_anim_menu(bContext *C, uiBut *but)
 {
 	uiPopupMenu *pup;
@@ -264,6 +276,20 @@ void ui_but_anim_menu(bContext *C, uiBut *but)
 			else
 				uiItemBooleanO(layout, "Add Driver", 0, "ANIM_OT_add_driver_button", "all", 0);
 		}
+		
+		if(RNA_property_animateable(&but->rnapoin, but->rnaprop)) {
+			uiItemS(layout);
+			
+			if(length) {
+				uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 1);
+				uiItemBooleanO(layout, "Add Single to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0);
+				uiItemBooleanO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button", "all", 0);
+			}
+			else {
+				uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0);
+				uiItemBooleanO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button", "all", 0);
+			}
+		}
 
 		uiPupMenuEnd(C, pup);
 	}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 79c707f5535..259ccba6b89 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3265,18 +3265,18 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
 			ui_but_copy_paste(C, but, data, (event->type == CKEY)? 'c': 'v');
 			return WM_UI_HANDLER_BREAK;
 		}
-		/* handle keyframeing */
+		/* handle keyframing */
 		else if(event->type == IKEY && event->val == KM_PRESS) {
 			if(event->alt)
 				ui_but_anim_delete_keyframe(C);
 			else
 				ui_but_anim_insert_keyframe(C);
-
+			
 			ED_region_tag_redraw(CTX_wm_region(C));
-
+			
 			return WM_UI_HANDLER_BREAK;
 		}
-		/* handle driver adding */
+		/* handle drivers */
 		else if(event->type == DKEY && event->val == KM_PRESS) {
 			if(event->alt)
 				ui_but_anim_remove_driver(C);
@@ -3287,6 +3287,17 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
 			
 			return WM_UI_HANDLER_BREAK;
 		}
+		/* handle keyingsets */
+		else if(event->type == KKEY && event->val == KM_PRESS) {
+			if(event->alt)
+				ui_but_anim_remove_keyingset(C);
+			else
+				ui_but_anim_remove_keyingset(C);
+				
+			ED_region_tag_redraw(CTX_wm_region(C));
+			
+			return WM_UI_HANDLER_BREAK;
+		}
 		/* handle menu */
 		else if(event->type == RIGHTMOUSE && event->val == KM_PRESS) {
 			/* RMB has two options now */
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 806b40b8646..2e623114fe9 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -467,6 +467,8 @@ void ui_but_anim_insert_keyframe(struct bContext *C);
 void ui_but_anim_delete_keyframe(struct bContext *C);
 void ui_but_anim_add_driver(struct bContext *C);
 void ui_but_anim_remove_driver(struct bContext *C);
+void ui_but_anim_add_keyingset(struct bContext *C);
+void ui_but_anim_remove_keyingset(struct bContext *C);
 void ui_but_anim_menu(struct bContext *C, uiBut *but);
 int ui_but_anim_expression_get(uiBut *but, char *str, int maxlen);
 int ui_but_anim_expression_set(uiBut *but, const char *str);

From 6ed49857a4408bf413f4bf626229aa00d6c8cad7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 4 Sep 2009 08:49:11 +0000
Subject: [PATCH 420/577] poll functions to stop crashing when running
 operators in an invalid context.

---
 .../blender/editors/object/editconstraint.c   | 32 ++++++++++++++++++-
 .../blender/editors/physics/ed_pointcache.c   | 16 +++++++---
 .../editors/space_buttons/buttons_ops.c       | 10 ++++++
 .../editors/space_console/console_ops.c       |  6 ++++
 source/blender/editors/space_text/text_ops.c  |  2 +-
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/source/blender/editors/object/editconstraint.c b/source/blender/editors/object/editconstraint.c
index 23b3caf8e26..dc0442a5af9 100644
--- a/source/blender/editors/object/editconstraint.c
+++ b/source/blender/editors/object/editconstraint.c
@@ -465,6 +465,12 @@ void object_test_constraints (Object *owner)
 /* ---------- Distance-Dependent Constraints ---------- */
 /* StretchTo, Limit Distance */
 
+static int stretchto_poll(bContext *C)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", &RNA_StretchToConstraint);
+	return (ptr.id.data && ptr.data);
+}
+
 static int stretchto_reset_exec (bContext *C, wmOperator *op)
 {
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", &RNA_StretchToConstraint);
@@ -484,6 +490,7 @@ void CONSTRAINT_OT_stretchto_reset (wmOperatorType *ot)
 	ot->description= "Reset original length of bone for Stretch To Constraint.";
 	
 	ot->exec= stretchto_reset_exec;
+	ot->poll= stretchto_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -501,6 +508,12 @@ static int limitdistance_reset_exec (bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
+static int limitdistance_poll(bContext *C)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", &RNA_LimitDistanceConstraint);
+	return (ptr.id.data && ptr.data);
+}
+
 void CONSTRAINT_OT_limitdistance_reset (wmOperatorType *ot)
 {
 	/* identifiers */
@@ -509,6 +522,7 @@ void CONSTRAINT_OT_limitdistance_reset (wmOperatorType *ot)
 	ot->description= "Reset limiting distance for Limit Distance Constraint.";
 	
 	ot->exec= limitdistance_reset_exec;
+	ot->poll= limitdistance_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -516,6 +530,12 @@ void CONSTRAINT_OT_limitdistance_reset (wmOperatorType *ot)
 
 /* ------------- Child-Of Constraint ------------------ */
 
+static int childof_poll(bContext *C)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", &RNA_ChildOfConstraint);
+	return (ptr.id.data && ptr.data);
+}
+
 /* ChildOf Constraint - set inverse callback */
 static int childof_set_inverse_exec (bContext *C, wmOperator *op)
 {
@@ -582,12 +602,12 @@ void CONSTRAINT_OT_childof_set_inverse (wmOperatorType *ot)
 	ot->description= "Set inverse correction for ChildOf constraint.";
 	
 	ot->exec= childof_set_inverse_exec;
+	ot->poll= childof_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-
 /* ChildOf Constraint - clear inverse callback */
 static int childof_clear_inverse_exec (bContext *C, wmOperator *op)
 {
@@ -612,6 +632,7 @@ void CONSTRAINT_OT_childof_clear_inverse (wmOperatorType *ot)
 	ot->description= "Clear inverse correction for ChildOf constraint.";
 	
 	ot->exec= childof_clear_inverse_exec;
+	ot->poll= childof_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -684,6 +705,12 @@ void ED_object_constraint_set_active(Object *ob, bConstraint *con)
 	}
 }
 
+static int constraint_poll(bContext *C)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", &RNA_Constraint);
+	return (ptr.id.data && ptr.data);
+}
+
 static int constraint_delete_exec (bContext *C, wmOperator *op)
 {
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", &RNA_Constraint);
@@ -711,6 +738,7 @@ void CONSTRAINT_OT_delete (wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec= constraint_delete_exec;
+	ot->poll= constraint_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; 
@@ -747,6 +775,7 @@ void CONSTRAINT_OT_move_down (wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec= constraint_move_down_exec;
+	ot->poll= constraint_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; 
@@ -784,6 +813,7 @@ void CONSTRAINT_OT_move_up (wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec= constraint_move_up_exec;
+	ot->poll= constraint_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; 
diff --git a/source/blender/editors/physics/ed_pointcache.c b/source/blender/editors/physics/ed_pointcache.c
index 68e0c28e9c1..22316290c7b 100644
--- a/source/blender/editors/physics/ed_pointcache.c
+++ b/source/blender/editors/physics/ed_pointcache.c
@@ -72,6 +72,12 @@ static int ptcache_bake_all_poll(bContext *C)
 	return 1;
 }
 
+static int ptcache_poll(bContext *C)
+{
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
+	return (ptr.data && ptr.id.data);
+}
+
 static int ptcache_bake_all_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
@@ -215,7 +221,7 @@ void PTCACHE_OT_bake(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= ptcache_bake_exec;
-	ot->poll= ptcache_bake_all_poll;
+	ot->poll= ptcache_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -230,7 +236,7 @@ void PTCACHE_OT_free_bake(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= ptcache_free_bake_exec;
-	ot->poll= ptcache_bake_all_poll;
+	ot->poll= ptcache_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -243,7 +249,7 @@ void PTCACHE_OT_bake_from_cache(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= ptcache_bake_from_cache_exec;
-	ot->poll= ptcache_bake_all_poll;
+	ot->poll= ptcache_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -308,7 +314,7 @@ void PTCACHE_OT_add_new(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= ptcache_add_new_exec;
-	ot->poll= ptcache_bake_all_poll;
+	ot->poll= ptcache_poll; // ptcache_bake_all_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -321,7 +327,7 @@ void PTCACHE_OT_remove(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= ptcache_remove_exec;
-	ot->poll= ptcache_bake_all_poll;
+	ot->poll= ptcache_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 057f35a2487..954a52c54aa 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -613,6 +613,12 @@ void OBJECT_OT_particle_system_remove(wmOperatorType *ot)
 
 /********************** new particle settings operator *********************/
 
+static int psys_poll(bContext *C)
+{
+	PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem);
+	return (ptr.data != NULL);
+}
+
 static int new_particle_settings_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
@@ -657,6 +663,7 @@ void PARTICLE_OT_new(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= new_particle_settings_exec;
+	ot->poll= psys_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -948,6 +955,9 @@ static int file_browse_exec(bContext *C, wmOperator *op)
 	FileBrowseOp *fbo= op->customdata;
 	char *str;
 	
+	if (RNA_property_is_set(op->ptr, "filename")==0 || fbo==NULL)
+		return OPERATOR_CANCELLED;
+	
 	str= RNA_string_get_alloc(op->ptr, "filename", 0, 0);
 	RNA_property_string_set(&fbo->ptr, fbo->prop, str);
 	RNA_property_update(C, &fbo->ptr, fbo->prop);
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index f8dbe0c3dd4..3d0d284b501 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -234,6 +234,11 @@ static int console_edit_poll(bContext *C)
 	return 1;
 }
 
+static int console_poll(bContext *C)
+{
+	return (CTX_wm_space_console(C) != NULL);
+}
+
 
 /* static funcs for text editing */
 
@@ -695,6 +700,7 @@ void CONSOLE_OT_zoom(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= zoom_exec;
+	ot->poll= console_poll;
 
 	/* flags */
 	/* ot->flag= OPTYPE_REGISTER; */ /* super annoying */
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 7e514ea723a..14b72e13856 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -1478,7 +1478,7 @@ static int move_cursor(bContext *C, int type, int select)
 	ARegion *ar= CTX_wm_region(C);
 
 	/* ensure we have the right region, it's optional */
-	if(ar->regiontype != RGN_TYPE_WINDOW)
+	if(ar && ar->regiontype != RGN_TYPE_WINDOW)
 		ar= NULL;
 
 	switch(type) {

From bade641408882919ef3f22b3d5223d533678120c Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 10:40:41 +0000
Subject: [PATCH 421/577] == SCons == * first working changes to get
 blenderplayer linking * blenderplayer/ moved into source/ (CMakeLists.txt
 changed for that too) * added externs for bprogname to gp_ghost, so that it
 links properly

---
 CMakeLists.txt                                             | 2 +-
 SConstruct                                                 | 3 ++-
 intern/guardedalloc/SConscript                             | 2 +-
 intern/memutil/SConscript                                  | 2 +-
 source/SConscript                                          | 5 ++++-
 source/blender/blenkernel/SConscript                       | 2 +-
 source/blender/blenlib/SConscript                          | 2 +-
 source/blender/blenlib/intern/util.c                       | 2 ++
 source/blender/blenloader/SConscript                       | 2 +-
 source/blender/blenpluginapi/SConscript                    | 2 +-
 source/blender/gpu/SConscript                              | 2 +-
 source/blender/imbuf/intern/cineon/SConscript              | 2 +-
 source/blender/imbuf/intern/dds/SConscript                 | 2 +-
 source/blender/makesdna/SConscript                         | 2 +-
 source/blender/python/SConscript                           | 4 ++--
 source/blender/readblenfile/SConscript                     | 2 +-
 {blenderplayer => source/blenderplayer}/CMakeLists.txt     | 0
 .../blenderplayer}/bad_level_call_stubs/CMakeLists.txt     | 0
 .../blenderplayer}/bad_level_call_stubs/Makefile           | 0
 .../blenderplayer}/bad_level_call_stubs/SConscript         | 7 +++----
 .../blenderplayer}/bad_level_call_stubs/stubs.c            | 0
 source/gameengine/BlenderRoutines/SConscript               | 2 +-
 source/gameengine/Converter/SConscript                     | 2 +-
 source/gameengine/Expressions/SConscript                   | 2 +-
 source/gameengine/GameLogic/SConscript                     | 2 +-
 source/gameengine/GamePlayer/common/SConscript             | 2 +-
 source/gameengine/GamePlayer/ghost/GPG_ghost.cpp           | 3 +++
 source/gameengine/GamePlayer/ghost/SConscript              | 2 +-
 source/gameengine/Ketsji/KXNetwork/SConscript              | 2 +-
 source/gameengine/Ketsji/SConscript                        | 2 +-
 source/gameengine/Network/LoopBackNetwork/SConscript       | 2 +-
 source/gameengine/Network/SConscript                       | 2 +-
 source/gameengine/Physics/Bullet/SConscript                | 2 +-
 source/gameengine/Physics/Dummy/SConscript                 | 2 +-
 source/gameengine/Physics/common/SConscript                | 2 +-
 .../gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript  | 2 +-
 source/gameengine/Rasterizer/SConscript                    | 2 +-
 source/gameengine/SceneGraph/SConscript                    | 2 +-
 source/gameengine/VideoTexture/SConscript                  | 2 +-
 source/kernel/SConscript                                   | 2 +-
 40 files changed, 46 insertions(+), 38 deletions(-)
 rename {blenderplayer => source/blenderplayer}/CMakeLists.txt (100%)
 rename {blenderplayer => source/blenderplayer}/bad_level_call_stubs/CMakeLists.txt (100%)
 rename {blenderplayer => source/blenderplayer}/bad_level_call_stubs/Makefile (100%)
 rename {blenderplayer => source/blenderplayer}/bad_level_call_stubs/SConscript (53%)
 rename {blenderplayer => source/blenderplayer}/bad_level_call_stubs/stubs.c (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 529d65b0dfe..5000ecfac5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -574,6 +574,6 @@ ADD_SUBDIRECTORY(source/creator)
 #-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(blenderplayer)
+  ADD_SUBDIRECTORY(source/blenderplayer)
 ENDIF(WITH_PLAYER)
 
diff --git a/SConstruct b/SConstruct
index a66587695f3..b3291c37e1a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -390,7 +390,7 @@ SConscript(B.root_build_dir+'/source/SConscript')
 # libraries to give as objects to linking phase
 mainlist = []
 for tp in B.possible_types:
-	if not tp == 'player' and not tp == 'player2':
+	if not tp == 'player':
 		mainlist += B.create_blender_liblist(env, tp)
 
 if B.arguments.get('BF_PRIORITYLIST', '0')=='1':
@@ -404,6 +404,7 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
+	playerlist = playerlist[0:2] + [playerlist[3]] + mainlist[2:] + [playerlist[29]]
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript
index 0184ddd9785..a93e12bebda 100644
--- a/intern/guardedalloc/SConscript
+++ b/intern/guardedalloc/SConscript
@@ -5,4 +5,4 @@ Import('env')
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 175] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 130] )
diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript
index 4528de814f3..3e15dde8855 100644
--- a/intern/memutil/SConscript
+++ b/intern/memutil/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = '. ..'
 
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 180] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 135] )
diff --git a/source/SConscript b/source/SConscript
index d3a9373b4d8..e4e89671653 100644
--- a/source/SConscript
+++ b/source/SConscript
@@ -6,6 +6,9 @@ SConscript(['blender/SConscript',
 			'creator/SConscript'])
 if env['WITH_BF_GAMEENGINE']:
 	SConscript (['gameengine/SConscript'])
-	
+
+if env['WITH_BF_PLAYER']:
+	SConscript (['blenderplayer/bad_level_call_stubs/SConscript'])
+
 if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw'):
 	SConscript (['icons/SConscript'])
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 0c7922de6ff..a5bb843cbef 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -65,4 +65,4 @@ if env['WITH_BF_LCMS']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [165] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [165,137] )
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 3d7d6b63e64..b6c549fd145 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -16,4 +16,4 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [180,120], compileflags =cflags )
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 3c441a81d6b..acf236d382b 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -54,6 +54,8 @@
 #include "BKE_utildefines.h"
 
 
+
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 19a89b7e604..1bc834ab9f4 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -11,4 +11,4 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 30] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 20] )
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index 776c188d73b..af69b4519b4 100644
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_QUICKTIME']:
 	defs.append('WITH_QUICKTIME')
 	incs += ' ' + env['BF_QUICKTIME_INC']
 
-env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [170, 35] )
+env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [170] )
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index 63f5fe53238..d40f3a97874 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -8,4 +8,4 @@ incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[160, 20] )
+env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[160, 35] )
diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
index ef9c44b85c8..371e4cff9eb 100644
--- a/source/blender/imbuf/intern/cineon/SConscript
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -14,4 +14,4 @@ incs = ['.',
 
 defs = []
 
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220, 75])
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core'], priority = [220])
diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index cec6023648b..6cabc3f7d79 100644
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/source/blender/imbuf/intern/dds/SConscript
@@ -16,4 +16,4 @@ incs = ['.',
 
 defs = ['WITH_DDS']
 
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230, 105])
+env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core'], priority = [230])
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript
index f91cf166f62..6d96811e1cb 100644
--- a/source/blender/makesdna/SConscript
+++ b/source/blender/makesdna/SConscript
@@ -8,4 +8,4 @@ objs += o
 
 incs = '#/intern/guardedalloc .'
 
-env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215, 215] )
+env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215, 140] )
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index d44cf762a0f..c681c5bdc39 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -13,9 +13,9 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
 	defs.append('_DEBUG')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [140,10])
 
 
 # generic
 sources = env.Glob('generic/*.c')
-env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,85]) # ketsji is 360
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index 59771aa0829..534ab0f7d4c 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c')
 
 incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
 
-env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 220] )
+env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 0] )
diff --git a/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
similarity index 100%
rename from blenderplayer/CMakeLists.txt
rename to source/blenderplayer/CMakeLists.txt
diff --git a/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
similarity index 100%
rename from blenderplayer/bad_level_call_stubs/CMakeLists.txt
rename to source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
diff --git a/blenderplayer/bad_level_call_stubs/Makefile b/source/blenderplayer/bad_level_call_stubs/Makefile
similarity index 100%
rename from blenderplayer/bad_level_call_stubs/Makefile
rename to source/blenderplayer/bad_level_call_stubs/Makefile
diff --git a/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
similarity index 53%
rename from blenderplayer/bad_level_call_stubs/SConscript
rename to source/blenderplayer/bad_level_call_stubs/SConscript
index bd3df38b557..ce502af57be 100644
--- a/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -3,12 +3,11 @@ Import ('env')
 
 sources = 'stubs.c'
 
-incs = '. ..'
-incs += '../../source/blender/makesdna'
-incs += '../../source/blender/makesrna'
+incs = '#/source/blender/makesdna'
+incs += ' #/source/blender/makesrna'
 
 defs = ''
 if env['WITH_BF_INTERNATIONAL']:
     defs += 'WITH_FREETYPE2'
 
-env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player',priority=225 )
+env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[145] )
diff --git a/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
similarity index 100%
rename from blenderplayer/bad_level_call_stubs/stubs.c
rename to source/blenderplayer/bad_level_call_stubs/stubs.c
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index dc5a93a2e48..831f898853b 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -28,4 +28,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 45] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 25] , cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 9164a9f6d78..2d126310475 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -23,4 +23,4 @@ incs += ' #source/blender/makesrna'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,50], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index dc9c184fd8a..51c3a0cc5af 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,120], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,75], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index f259a338dc0..442420a8876 100644
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -21,4 +21,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG')
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 100], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 50], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 3ac2576b46d..6f37c2f769e 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -62,4 +62,4 @@ incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
 
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype=['player'], priority=[15], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index d399d6b3443..b7677d29507 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -68,6 +68,9 @@ extern "C"
 	
 	int GHOST_HACK_getFirstFile(char buf[]);
 	
+extern char bprogname[];	/* holds a copy of argv[0], from creator.c */
+extern char btempdir[];		/* use this to store a valid temp directory */
+
 #ifdef __cplusplus
 }
 #endif // __cplusplus
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index ce8b07b9393..6c71eafa1dc 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -46,4 +46,4 @@ defs = []
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype='player',priority=5, cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index ce4a29b9492..f2283f0b28d 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -9,4 +9,4 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 145], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 100], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index ea9d32fa0bf..1f5df8dea00 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -33,4 +33,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG') # for Python
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 60], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 80], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index be6545b4fd6..62b0a65a514 100644
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 155] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 115] )
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 804851973af..297cfdb6748 100644
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_Netw
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core', 'player'], priority=[400, 150] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core', 'player'], priority=[400, 110] )
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 0b797c2cb8b..1489e4c46f6 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -21,4 +21,4 @@ incs += ' #intern/guardedalloc'
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,80], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index 93d6ac36446..cb4a09559be 100644
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -5,4 +5,4 @@ sources = 'DummyPhysicsEnvironment.cpp'
 
 incs = '. ../common'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,95] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,55] )
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index 8b373ec830c..bbf2d345a30 100644
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -5,4 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp P
 
 incs = '. ../Dummy #intern/moto/include'
 
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 963c6616b64..851ec0c47c3 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -8,4 +8,4 @@ incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
 incs += ' #intern/guardedalloc #source/blender/blenlib'
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 115], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 65], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index c2af14e8ce5..a1a1c7a4038 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -7,4 +7,4 @@ sources = env.Glob('*.cpp')
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,115], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,60], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index 8f433a21e49..b7d8de450ab 100644
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,125], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,45], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 583ccf29dbd..ada878b74f2 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -27,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
     defs.append('__STDC_CONSTANT_MACROS')
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 72], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 30], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 908e059ceab..88fc58755c0 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core', 'player'], priority = [400, 150] )
+env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core', 'player'], priority = [400, 95] )

From 1e6efcc96526a0d1ba16384c5500959ec9b5824d Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 10:41:02 +0000
Subject: [PATCH 422/577] 2.5 - KeyingSet fixes

* Fixed warnings in console about missing (removed) property
* Fixed update problems after creating a new keyingset
---
 source/blender/editors/animation/keyingsets.c     | 5 +++--
 source/blender/editors/interface/interface_anim.c | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index a91a9bfa911..15d47211615 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -133,6 +133,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op)
 				
 			/* add path to this setting */
 			BKE_keyingset_add_destination(ks, ptr.id.data, NULL, path, index, pflag, KSP_GROUP_KSNAME);
+			success= 1;
 			
 			/* free the temp path created */
 			MEM_freeN(path);
@@ -144,7 +145,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op)
 		ED_anim_dag_flush_update(C);	
 		
 		/* for now, only send ND_KEYS for KeyingSets */
-		WM_event_add_notifier(C, ND_KEYS, NULL);
+		WM_event_add_notifier(C, NC_SCENE|ND_KEYINGSET, NULL);
 	}
 	
 	return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
@@ -222,7 +223,7 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op)
 		ED_anim_dag_flush_update(C);	
 		
 		/* for now, only send ND_KEYS for KeyingSets */
-		WM_event_add_notifier(C, ND_KEYS, NULL);
+		WM_event_add_notifier(C, NC_SCENE|ND_KEYINGSET, NULL);
 	}
 	
 	return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 8e15bbde201..8c41726b81b 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -283,11 +283,11 @@ void ui_but_anim_menu(bContext *C, uiBut *but)
 			if(length) {
 				uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 1);
 				uiItemBooleanO(layout, "Add Single to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0);
-				uiItemBooleanO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button", "all", 0);
+				uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button");
 			}
 			else {
 				uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0);
-				uiItemBooleanO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button", "all", 0);
+				uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button");
 			}
 		}
 

From 0e40abf642b4360212b72791a01b4e7fe0cfacf5 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 11:19:12 +0000
Subject: [PATCH 423/577] 2.5 - Patches + Cleanups

* Some of the patches in patch #19034 - by Wolfgang W. (bender)
- outliner.patch - a small fix to make the outliner draw the last
line of the list, if the list is bigger than the window.
- scroll.patch - enables vertical scrolling in the buttons window in horizontal mode. Necessary if a panel is opened that
is higher than the buttons window.

* Also, fixed some messy comments in drivers code
---
 source/blender/editors/animation/drivers.c    | 28 +++++++++----------
 source/blender/editors/screen/area.c          |  9 ++++--
 .../blender/editors/space_outliner/outliner.c |  3 ++
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c
index 8349b7f9bde..8b9224511ba 100644
--- a/source/blender/editors/animation/drivers.c
+++ b/source/blender/editors/animation/drivers.c
@@ -151,33 +151,33 @@ short ANIM_add_driver (ID *id, const char rna_path[], int array_index, short fla
 	/* create F-Curve with Driver */
 	fcu= verify_driver_fcurve(id, rna_path, array_index, 1);
 
-	if(fcu && fcu->driver) {
+	if (fcu && fcu->driver) {
 		fcu->driver->type= type;
-
+		
 		/* fill in current value for python */
-		if(type == DRIVER_TYPE_PYTHON) {
+		if (type == DRIVER_TYPE_PYTHON) {
 			PropertyType proptype= RNA_property_type(prop);
 			int array= RNA_property_array_length(&ptr, prop);
 			char *expression= fcu->driver->expression;
 			int val, maxlen= sizeof(fcu->driver->expression);
 			float fval;
-
-			if(proptype == PROP_BOOLEAN) {
+			
+			if (proptype == PROP_BOOLEAN) {
 				if(!array) val= RNA_property_boolean_get(&ptr, prop);
 				else val= RNA_property_boolean_get_index(&ptr, prop, array_index);
-
+				
 				BLI_strncpy(expression, (val)? "True": "False", maxlen);
 			}
-			else if(proptype == PROP_INT) {
-				if(!array) val= RNA_property_int_get(&ptr, prop);
+			else if (proptype == PROP_INT) {
+				if (!array) val= RNA_property_int_get(&ptr, prop);
 				else val= RNA_property_int_get_index(&ptr, prop, array_index);
-
+				
 				BLI_snprintf(expression, maxlen, "%d", val);
 			}
-			else if(proptype == PROP_FLOAT) {
-				if(!array) fval= RNA_property_float_get(&ptr, prop);
+			else if (proptype == PROP_FLOAT) {
+				if (!array) fval= RNA_property_float_get(&ptr, prop);
 				else fval= RNA_property_float_get_index(&ptr, prop, array_index);
-
+				
 				BLI_snprintf(expression, maxlen, "%.3f", fval);
 			}
 
@@ -232,7 +232,7 @@ static int add_driver_button_exec (bContext *C, wmOperator *op)
 	short success= 0;
 	int a, index, length, all= RNA_boolean_get(op->ptr, "all");
 	
-	/* try to insert keyframe using property retrieved from UI */
+	/* try to create driver using property retrieved from UI */
 	memset(&ptr, 0, sizeof(PointerRNA));
 	uiAnimContextProperty(C, &ptr, &prop, &index);
 	
@@ -294,7 +294,7 @@ static int remove_driver_button_exec (bContext *C, wmOperator *op)
 	short success= 0;
 	int a, index, length, all= RNA_boolean_get(op->ptr, "all");
 	
-	/* try to insert keyframe using property retrieved from UI */
+	/* try to find driver using property retrieved from UI */
 	memset(&ptr, 0, sizeof(PointerRNA));
 	uiAnimContextProperty(C, &ptr, &prop, &index);
 
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 8c55cccd6b0..9a116bf95c0 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1248,6 +1248,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, char *contex
 
 	/* before setting the view */
 	if(vertical) {
+		/* only allow scrolling in vertical direction */
 		v2d->keepofs |= V2D_LOCKOFS_X|V2D_KEEPOFS_Y;
 		v2d->keepofs &= ~(V2D_LOCKOFS_Y|V2D_KEEPOFS_X);
 		
@@ -1258,8 +1259,12 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, char *contex
 			y= -y;
 	}
 	else {
-		v2d->keepofs |= V2D_LOCKOFS_Y|V2D_KEEPOFS_X;
-		v2d->keepofs &= ~(V2D_LOCKOFS_X|V2D_KEEPOFS_Y);
+		/* for now, allow scrolling in both directions (since layouts are optimised for vertical,
+		 * they often don't fit in horizontal layout)
+		 */
+		v2d->keepofs &= ~(V2D_LOCKOFS_X|V2D_LOCKOFS_Y|V2D_KEEPOFS_X|V2D_KEEPOFS_Y);
+		//v2d->keepofs |= V2D_LOCKOFS_Y|V2D_KEEPOFS_X;
+		//v2d->keepofs &= ~(V2D_LOCKOFS_X|V2D_KEEPOFS_Y);
 		
 		// don't jump back when panels close or hide
 		if(!newcontext)
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index e6cd9c0e448..a9a9a5dab5f 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -5288,6 +5288,9 @@ void draw_outliner(const bContext *C)
 			sizex += OL_TOGW*3;
 	}
 	
+	/* tweak to display last line (when list bigger than window) */
+	sizey += V2D_SCROLL_HEIGHT;
+	
 	/* update size of tot-rect (extents of data/viewable area) */
 	UI_view2d_totRect_set(v2d, sizex, sizey);
 

From 20f39ec7d81af22d30700b3dde28938facfb2588 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 12:56:30 +0000
Subject: [PATCH 424/577] == SCons == * further cleaning of 'player' stuff. Now
 only 3 libs are remaining, of which ideally the stubs lib will be fixed at
 some point, fading away into the dark history of not-so-nice code. The
 current blenderplayer part is still a little bit hackish, I'll see if I can
 find a better alternative, for now it works good enough.

---
 SConstruct                                                   | 2 +-
 extern/libredcode/SConscript                                 | 4 ++--
 intern/guardedalloc/SConscript                               | 2 +-
 intern/memutil/SConscript                                    | 2 +-
 source/blender/blenkernel/SConscript                         | 2 +-
 source/blender/blenlib/SConscript                            | 2 +-
 source/blender/blenloader/SConscript                         | 2 +-
 source/blender/gpu/SConscript                                | 2 +-
 source/blender/imbuf/intern/openexr/SConscript               | 2 +-
 source/blender/makesdna/SConscript                           | 2 +-
 source/blender/python/SConscript                             | 4 ++--
 source/blender/readblenfile/SConscript                       | 2 +-
 source/gameengine/BlenderRoutines/SConscript                 | 2 +-
 source/gameengine/Converter/SConscript                       | 2 +-
 source/gameengine/Expressions/SConscript                     | 2 +-
 source/gameengine/GameLogic/SConscript                       | 2 +-
 source/gameengine/Ketsji/KXNetwork/SConscript                | 2 +-
 source/gameengine/Ketsji/SConscript                          | 2 +-
 source/gameengine/Network/LoopBackNetwork/SConscript         | 2 +-
 source/gameengine/Network/SConscript                         | 2 +-
 source/gameengine/Physics/Bullet/SConscript                  | 2 +-
 source/gameengine/Physics/Dummy/SConscript                   | 2 +-
 source/gameengine/Physics/common/SConscript                  | 2 +-
 source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript | 2 +-
 source/gameengine/Rasterizer/SConscript                      | 2 +-
 source/gameengine/SceneGraph/SConscript                      | 2 +-
 source/gameengine/VideoTexture/SConscript                    | 2 +-
 source/icons/SConscript                                      | 2 +-
 source/kernel/SConscript                                     | 2 +-
 29 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/SConstruct b/SConstruct
index b3291c37e1a..3227e15aaa3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -404,7 +404,7 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
-	playerlist = playerlist[0:2] + [playerlist[3]] + mainlist[2:] + [playerlist[29]]
+	playerlist = [mainlist[0]] + playerlist[0:2] + mainlist[2:] + [playerlist[2]]
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets
diff --git a/extern/libredcode/SConscript b/extern/libredcode/SConscript
index 9fd25ad63c7..3fb78dbea0f 100644
--- a/extern/libredcode/SConscript
+++ b/extern/libredcode/SConscript
@@ -12,5 +12,5 @@ incs = '. ../libopenjpeg'
 env.BlenderLib ( libname='extern_redcode', 
                  sources=sources, includes=Split(incs),
                  defines=[],
-                 libtype=['core','intern','player'],
-                 priority=[5, 5, 200], compileflags = [])
+                 libtype=['core','intern'],
+                 priority=[5, 5], compileflags = [])
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript
index a93e12bebda..8927bef2efc 100644
--- a/intern/guardedalloc/SConscript
+++ b/intern/guardedalloc/SConscript
@@ -5,4 +5,4 @@ Import('env')
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 130] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern'], priority = [5] )
diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript
index 3e15dde8855..55c314d5211 100644
--- a/intern/memutil/SConscript
+++ b/intern/memutil/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = '. ..'
 
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 135] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern'], priority = [0] )
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index a5bb843cbef..0c7922de6ff 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -65,4 +65,4 @@ if env['WITH_BF_LCMS']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [165,137] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [165] )
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index b6c549fd145..3d7d6b63e64 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -16,4 +16,4 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [180,120], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 1bc834ab9f4..0a9b8d05747 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -11,4 +11,4 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 20] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [135] )
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index d40f3a97874..b45547e359c 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -8,4 +8,4 @@ incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[160, 35] )
+env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core'], priority=[160] )
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index 30757db1cef..729619c963b 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -15,4 +15,4 @@ incs += Split(env['BF_OPENEXR_INC'])
 
 defs = ['WITH_OPENEXR']
 
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225, 85])
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core'], priority = [225])
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript
index 6d96811e1cb..1cb61f59121 100644
--- a/source/blender/makesdna/SConscript
+++ b/source/blender/makesdna/SConscript
@@ -8,4 +8,4 @@ objs += o
 
 incs = '#/intern/guardedalloc .'
 
-env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215, 140] )
+env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core'], priority = [215] )
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index c681c5bdc39..d44cf762a0f 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -13,9 +13,9 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
 	defs.append('_DEBUG')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [140,10])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
 
 
 # generic
 sources = env.Glob('generic/*.c')
-env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,85]) # ketsji is 360
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index 534ab0f7d4c..c8189501d4b 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c')
 
 incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
 
-env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 0] )
+env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core'], priority = [0] )
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 831f898853b..cfb5b0ef525 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -28,4 +28,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 25] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core'], priority=[300] , cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 2d126310475..bf2dfa5e659 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -23,4 +23,4 @@ incs += ' #source/blender/makesrna'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core'], priority=[305], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index 51c3a0cc5af..cbf33f39568 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,75], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core'], priority = [360], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 442420a8876..f456f4125ab 100644
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -21,4 +21,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG')
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 50], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core'], priority=[330], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index f2283f0b28d..6429bd76a37 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -9,4 +9,4 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 100], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core'], priority=[400], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 1f5df8dea00..122b77e0173 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -33,4 +33,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG') # for Python
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 80], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core'], priority=[320], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index 62b0a65a514..2c27ee707f0 100644
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 115] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core'], priority=[400] )
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 297cfdb6748..f584503e109 100644
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_Netw
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core', 'player'], priority=[400, 110] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core'], priority=[400] )
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 1489e4c46f6..baba40bcdc7 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -21,4 +21,4 @@ incs += ' #intern/guardedalloc'
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core'], priority=[350], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index cb4a09559be..f4444cf6746 100644
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -5,4 +5,4 @@ sources = 'DummyPhysicsEnvironment.cpp'
 
 incs = '. ../common'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,55] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core'], priority=[350] )
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index bbf2d345a30..b9adbd7210a 100644
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -5,4 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp P
 
 incs = '. ../Dummy #intern/moto/include'
 
-env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core'], priority=[360], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 851ec0c47c3..b1e5289c14c 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -8,4 +8,4 @@ incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
 incs += ' #intern/guardedalloc #source/blender/blenlib'
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 65], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core'], priority=[350], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index a1a1c7a4038..064736bcc88 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -7,4 +7,4 @@ sources = env.Glob('*.cpp')
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,60], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core'], priority=[350], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index b7d8de450ab..79bf3033fa1 100644
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,45], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core'], priority=[325], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index ada878b74f2..0b35c019178 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -27,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
     defs.append('__STDC_CONSTANT_MACROS')
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 30], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core'], priority=[300], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/icons/SConscript b/source/icons/SConscript
index 1471a06c09d..c929729f05b 100644
--- a/source/icons/SConscript
+++ b/source/icons/SConscript
@@ -3,4 +3,4 @@ Import ('env')
 
 source = 'winblender.rcscons'
 
-env.BlenderRes('winresource', source, ['core', 'player'], priority=[95 , 100])
\ No newline at end of file
+env.BlenderRes('winresource', source, ['core'], priority=[95])
diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 88fc58755c0..746fb60d4ff 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core', 'player'], priority = [400, 95] )
+env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core'], priority = [400] )

From 461cb87e1df40b87709a568967da6d252715b1ee Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 15:54:06 +0000
Subject: [PATCH 425/577] == SCons == * apply a patch from b333rt. I modified
 to test for relative/absolute paths before doing mods by b333rt. Fixes
 troubles with using absolute paths in BF_BUILDDIR

---
 tools/Blender.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/Blender.py b/tools/Blender.py
index 421a79454df..d7cbe1076e7 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -101,7 +101,10 @@ def create_blender_liblist(lenv = None, libtype = None):
 		sortlist.sort()
 		for sk in sortlist:
 			v = curlib[sk]
-			target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+			if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+				target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+			else:
+				target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
 			lst.append(target)
 
 	return lst
@@ -465,7 +468,11 @@ class BlenderEnvironment(SConsEnvironment):
 		
 		print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
 		lenv = self.Clone()
-		res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
+		if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+			res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
+		else:
+			res = lenv.RES(root_build_dir+'lib/'+libname, source)
+
 		
 		SConsEnvironment.Default(self, res)
 		resources.append(res)

From b537da1837f8d41ad99a41def20f8bcdd41c64c3 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 16:13:43 +0000
Subject: [PATCH 426/577] * shuffle a bit with playerlist. Fixes some undefined
 references, but not all. 15 undefined references left for mingw. (msvc is
 fine)

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 3227e15aaa3..f322ae27e06 100644
--- a/SConstruct
+++ b/SConstruct
@@ -404,7 +404,7 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
-	playerlist = [mainlist[0]] + playerlist[0:2] + mainlist[2:] + [playerlist[2]]
+	playerlist = playerlist[0:2] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets

From 01f9b34abec653aa445cc00788a35f646849b07f Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 16:41:46 +0000
Subject: [PATCH 427/577] * remove mtio.h - no magnetic tape support has been
 coded. Helps compilation on osx10.6.

---
 source/blender/blenlib/intern/storage.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index e6e37c58805..7cbef85b938 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -70,9 +70,6 @@
 
 
 #include <fcntl.h>
-#if !defined(WIN32)
-#include <sys/mtio.h>			/* tape comando's */
-#endif
 #include <string.h>			/* strcpy etc.. */
 
 #ifndef WIN32

From d65a908ec10a1f58aff70abd831b33ae2d53439d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 4 Sep 2009 18:32:31 +0000
Subject: [PATCH 428/577] update relative paths for CMake

---
 source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index abb086b072a..fea19d90ed0 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -29,8 +29,8 @@ FILE(GLOB SRC stubs.c)
 SET(INC 
   .
   .. 
-  ../../source/blender/makesdna
-  ../../source/blender/makesrna  
+  ../../../source/blender/makesdna
+  ../../../source/blender/makesrna  
 )
 
 IF(WITH_INTERNATIONAL)

From 5bc0fa9a04fae41433ea296221b1f8837453d517 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 4 Sep 2009 19:09:05 +0000
Subject: [PATCH 429/577] fix for ffmpeg with cmake, still not linking yet

---
 source/blenderplayer/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 030d9dbbba0..01ec55f10c3 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -103,6 +103,7 @@ IF(UNIX)
     bf_readblenfile 
     bf_dna
     bf_rna
+    bf_videotex
     bf_blenfont
     bf_audaspace
     blenkernel_blc

From 9303254e4f137c2810c5bc99ef1783fab249bc16 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 4 Sep 2009 19:27:15 +0000
Subject: [PATCH 430/577] fix for ffmpeg with cmake, now linking

---
 source/blenderplayer/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 01ec55f10c3..30a1c08ebc9 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -66,6 +66,7 @@ IF(UNIX)
     gp_common 
     bf_string 
     bf_ghost 
+    bf_rna
     bf_blenkernel
     bf_blenloader 
     bf_blenpluginapi 
@@ -102,7 +103,6 @@ IF(UNIX)
     bf_dds
     bf_readblenfile 
     bf_dna
-    bf_rna
     bf_videotex
     bf_blenfont
     bf_audaspace

From 944d0e908728d07a5a8da809baf448592ba9e701 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 4 Sep 2009 20:03:27 +0000
Subject: [PATCH 431/577] Fixed sound stuff for gameplayer, no sound though as
 U.audiodevice is set to 0 (="No Audio").

---
 .../GamePlayer/common/GPC_Engine.cpp          | 15 +-------
 .../gameengine/GamePlayer/common/GPC_Engine.h |  3 --
 .../GamePlayer/ghost/GPG_Application.cpp      | 36 ++++---------------
 .../GamePlayer/ghost/GPG_Application.h        |  3 --
 .../gameengine/GamePlayer/ghost/GPG_ghost.cpp |  5 ---
 5 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
index f131987095a..85a362d042a 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
@@ -58,9 +58,6 @@
 #include "NG_LoopBackNetworkDeviceInterface.h"
 
 #include "RAS_IRenderTools.h"
-#if 0 //XXX - ADD SOUND
-	#include "SND_DeviceManager.h"
-#endif
 
 #include "GPC_Engine.h"
 #include "GPC_KeyboardDevice.h"
@@ -77,8 +74,7 @@ GPC_Engine::GPC_Engine(char *customLoadingAnimationURL,
 		m_system(NULL), m_keyboarddev(NULL),
 		m_mousedev(NULL), m_canvas(NULL), m_rendertools(NULL),
 		m_portal(NULL), m_sceneconverter(NULL), m_networkdev(NULL),
-		m_audiodevice(NULL), m_curarea(NULL),
-		m_customLoadingAnimationURL(NULL),
+		m_curarea(NULL), m_customLoadingAnimationURL(NULL),
 		m_foregroundColor(foregroundColor), m_backgroundColor(backgroundColor),
 		m_frameRate(frameRate),
 		m_BlenderLogo(0), m_Blender3DLogo(0)/*, m_NaNLogo(0)*/
@@ -203,7 +199,6 @@ bool GPC_Engine::StartKetsji(void)
 			m_keyboarddev,
 			m_mousedev,
 			m_networkdev,
-			m_audiodevice,
 			m_system);
 
 	m_system->SetMainLoop(m_portal->m_ketsjieng);
@@ -339,14 +334,6 @@ void GPC_Engine::Exit()
 		m_networkdev = 0;
 	}
 
-	if (m_audiodevice)
-	{
-#if 0 //XXX - ADD SOUND
-		SND_DeviceManager::Unsubscribe();
-#endif
-		m_audiodevice = 0;
-	}
-
 	m_initialized = false;
 }
 
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.h b/source/gameengine/GamePlayer/common/GPC_Engine.h
index b7121599c6e..42234bcbcd6 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.h
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.h
@@ -40,7 +40,6 @@ class RAS_IRenderTools;
 class KetsjiPortal;
 class KX_ISceneConverter;
 class NG_LoopBackNetworkDeviceInterface;
-class SND_IAudioDevice;
 class GPC_RawImage;
 
 
@@ -77,8 +76,6 @@ public:
 	KX_ISceneConverter* m_sceneconverter;
 	/** Network interface. */
 	NG_LoopBackNetworkDeviceInterface* m_networkdev;
-	/** Audiodevice interface */
-	SND_IAudioDevice* m_audiodevice;
 	
 	struct ScrArea *m_curarea;  // for future use, not used yet
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 879c2264247..8ec41968042 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -57,6 +57,7 @@ extern "C"
 #include "BLO_readfile.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_sound.h"
 #include "IMB_imbuf.h"
 #include "DNA_scene_types.h"
 #ifdef __cplusplus
@@ -85,10 +86,6 @@ extern "C"
 #include "KX_BlenderSceneConverter.h"
 #include "NG_LoopBackNetworkDeviceInterface.h"
 
-#if 0 //XXX - ADD SOUND
-	#include "SND_DeviceManager.h"
-#endif
-
 #include "GPC_MouseDevice.h"
 #include "GPC_RenderTools.h"
 #include "GPG_Canvas.h" 
@@ -128,8 +125,7 @@ GPG_Application::GPG_Application(GHOST_ISystem* system)
 	  m_rendertools(0), 
 	  m_rasterizer(0), 
 	  m_sceneconverter(0),
-	  m_networkdevice(0), 
-	  m_audiodevice(0),
+	  m_networkdevice(0),
 	  m_blendermat(0),
 	  m_blenderglslmat(0),
 	  m_pyGlobalDictString(0),
@@ -587,15 +583,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		if (!m_networkdevice)
 			goto initFailed;
 			
-#if 0 //XXX - ADD SOUND
-		// get an audiodevice
-		SND_DeviceManager::Subscribe();
-		m_audiodevice = SND_DeviceManager::Instance();
-		if (!m_audiodevice)
-			goto initFailed;
-		m_audiodevice->UseCD();
-#endif
-
+		sound_init();
 
 		// create a ketsjisystem (only needed for timing and stuff)
 		m_kxsystem = new GPG_System (m_system);
@@ -613,9 +601,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		m_ketsjiengine->SetRenderTools(m_rendertools);
 		m_ketsjiengine->SetRasterizer(m_rasterizer);
 		m_ketsjiengine->SetNetworkDevice(m_networkdevice);
-#if 0 //XXX - ADD SOUND
-		m_ketsjiengine->SetAudioDevice(m_audiodevice);
-#endif
+
 		m_ketsjiengine->SetTimingDisplay(frameRate, false, false);
 
 		CValue::SetDeprecationWarnings(nodepwarnings);
@@ -628,10 +614,8 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 
 	return m_engineInitialized;
 initFailed:
+	sound_exit();
 	delete m_kxsystem;
-#if 0 // XXX - ADD SOUND
-	delete m_audiodevice;
-#endif
 	delete m_networkdevice;
 	delete m_mouse;
 	delete m_keyboard;
@@ -644,7 +628,6 @@ initFailed:
 	m_keyboard = NULL;
 	m_mouse = NULL;
 	m_networkdevice = NULL;
-	m_audiodevice = NULL;
 	m_kxsystem = NULL;
 	return false;
 }
@@ -690,7 +673,6 @@ bool GPG_Application::startEngine(void)
 		KX_Scene* startscene = new KX_Scene(m_keyboard,
 			m_mouse,
 			m_networkdevice,
-//			m_audiodevice, // XXX ADD SOUND
 			startscenename,
 			m_startScene);
 		
@@ -780,6 +762,7 @@ void GPG_Application::stopEngine()
 
 void GPG_Application::exitEngine()
 {
+	sound_exit();
 	if (m_ketsjiengine)
 	{
 		stopEngine();
@@ -791,13 +774,6 @@ void GPG_Application::exitEngine()
 		delete m_kxsystem;
 		m_kxsystem = 0;
 	}
-	if (m_audiodevice)
-	{
-#if 0 //XXX - ADD SOUND
-		SND_DeviceManager::Unsubscribe();
-		m_audiodevice = 0;
-#endif
-	}
 	if (m_networkdevice)
 	{
 		delete m_networkdevice;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h
index 845686f5770..73430213078 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h
@@ -38,7 +38,6 @@
 class KX_KetsjiEngine;
 class KX_ISceneConverter;
 class NG_LoopBackNetworkDeviceInterface;
-class SND_IAudioDevice;
 class RAS_IRasterizer;
 class GHOST_IEvent;
 class GHOST_ISystem;
@@ -142,8 +141,6 @@ protected:
 	KX_ISceneConverter* m_sceneconverter;
 	/** Network interface. */
 	NG_LoopBackNetworkDeviceInterface* m_networkdevice;
-	/** Sound device. */
-	SND_IAudioDevice* m_audiodevice;
 
 	bool m_blendermat;
 	bool m_blenderglslmat;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index b7677d29507..edc32093eab 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -59,7 +59,6 @@ extern "C"
 #include "BKE_icons.h"	
 #include "BKE_node.h"	
 #include "BKE_report.h"	
-#include "BKE_sound.h"	
 #include "BLI_blenlib.h"
 #include "DNA_scene_types.h"
 #include "BLO_readfile.h"
@@ -362,8 +361,6 @@ int main(int argc, char** argv)
 	quicktime_init();
 #endif
 
-	sound_init();
-
 	libtiff_init();
  
 	// Parse command line options
@@ -824,8 +821,6 @@ int main(int argc, char** argv)
 	}
 
 	free_nodesystem();
-	
-	sound_exit();
 
 	return error ? -1 : 0;
 }

From 5342f7930fb26855b92f337ace45f2ee51153957 Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 4 Sep 2009 20:14:59 +0000
Subject: [PATCH 432/577] Added sound device default settings for the
 gameplayer.

---
 source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index edc32093eab..fb2e1c72a85 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -61,6 +61,7 @@ extern "C"
 #include "BKE_report.h"	
 #include "BLI_blenlib.h"
 #include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
 #include "BLO_readfile.h"
 #include "BLO_readblenfile.h"
 #include "IMB_imbuf.h"
@@ -390,6 +391,13 @@ int main(int argc, char** argv)
 		}
 	}
 #endif
+	// XXX add the ability to change this values to the command line parsing.
+	U.mixbufsize = 2048;
+	U.audiodevice = 2;
+	U.audiorate = 44100;
+	U.audioformat = 0x24;
+	U.audiochannels = 2;
+
 	for (i = 1; (i < argc) && !error 
 #ifdef WIN32
 		&& scr_saver_mode == SCREEN_SAVER_MODE_NONE

From 7df35db1b1364dcd81dd8247ad3707d40a78fd59 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 4 Sep 2009 20:51:09 +0000
Subject: [PATCH 433/577] 2.5

Notifiers
---------

Various fixes for wrong use of notifiers, and some new notifiers
to make things a bit more clear and consistent, with two notable
changes:

* Geometry changes are now done with NC_GEOM, rather than
  NC_OBJECT|ND_GEOM_, so an object does need to be available.
* Space data now use NC_SPACE|ND_SPACE_*, instead of data
  notifiers or even NC_WINDOW in some cases. Note that NC_SPACE
  should only be used for notifying about changes in space data,
  we don't want to go back to allqueue(REDRAW..).

Depsgraph
---------

The dependency graph now has a different flush call:

DAG_object_flush_update(scene, ob, flag)
is replaced by:
DAG_id_flush_update(id, flag)

It still works basically the same, one difference is that it now
also accepts object data (e.g. Mesh), again to avoid requiring an
Object to be available. Other ID types will simply do nothing at
the moment.

Docs
----

I made some guidelines for how/when to do which kinds of updates
and notifiers. I can't specify totally exact how to make these
decisions, but these are basically the guidelines I use. So, new
and updated docs are here:

http://wiki.blender.org/index.php/BlenderDev/Blender2.5/NotifiersUpdates
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataNotifiers
---
 source/blender/blenkernel/BKE_depsgraph.h     |   7 +-
 source/blender/blenkernel/intern/armature.c   |   1 -
 source/blender/blenkernel/intern/booleanops.c |   2 +-
 source/blender/blenkernel/intern/depsgraph.c  |  93 +++--
 source/blender/blenkernel/intern/mesh.c       |   4 +-
 source/blender/blenkernel/intern/multires.c   |   2 +-
 source/blender/blenkernel/intern/particle.c   |  13 +-
 source/blender/blenkernel/intern/pointcache.c |   2 +-
 .../blender/editors/armature/editarmature.c   |  25 +-
 source/blender/editors/armature/poselib.c     |   6 +-
 source/blender/editors/armature/poseobject.c  |  18 +-
 source/blender/editors/curve/editcurve.c      | 121 +++---
 source/blender/editors/curve/editfont.c       |  14 +-
 .../editors/interface/interface_templates.c   |  10 +-
 source/blender/editors/mesh/editmesh.c        |   8 +-
 source/blender/editors/mesh/editmesh_add.c    |  78 ++--
 source/blender/editors/mesh/editmesh_loop.c   |   7 +-
 source/blender/editors/mesh/editmesh_mods.c   | 121 +++---
 source/blender/editors/mesh/editmesh_tools.c  | 147 +++----
 source/blender/editors/mesh/mesh_layers.c     |  88 ++--
 source/blender/editors/mesh/meshtools.c       |   2 +-
 source/blender/editors/metaball/editmball.c   |  30 +-
 .../blender/editors/object/editconstraint.c   |  13 +-
 source/blender/editors/object/editkey.c       | 107 +----
 source/blender/editors/object/editlattice.c   |   9 +-
 source/blender/editors/object/object_edit.c   |  55 ++-
 .../blender/editors/object/object_modifier.c  |  52 +--
 source/blender/editors/object/object_vgroup.c |  80 ++--
 source/blender/editors/physics/editparticle.c |  62 ++-
 .../editors/sculpt_paint/paint_image.c        |   2 +-
 .../editors/sculpt_paint/paint_vertex.c       |  18 +-
 .../editors/space_action/space_action.c       |   4 +
 .../editors/space_buttons/buttons_ops.c       |  19 +-
 .../editors/space_buttons/space_buttons.c     |  17 +-
 .../editors/space_console/space_console.c     |   6 +-
 source/blender/editors/space_file/file_ops.c  |  30 +-
 .../blender/editors/space_file/space_file.c   |  16 +-
 .../blender/editors/space_graph/space_graph.c |   4 +
 .../blender/editors/space_image/space_image.c |  12 +-
 .../blender/editors/space_info/space_info.c   |   5 +-
 source/blender/editors/space_nla/space_nla.c  |   4 +
 .../blender/editors/space_node/space_node.c   |   9 +
 .../blender/editors/space_outliner/outliner.c |   6 +-
 .../editors/space_outliner/space_outliner.c   |   8 +
 .../editors/space_sequencer/space_sequencer.c |   9 +
 .../blender/editors/space_text/space_text.c   |   4 +
 source/blender/editors/space_text/text_ops.c  |   3 +-
 .../blender/editors/space_time/space_time.c   |  11 +
 .../editors/space_view3d/space_view3d.c       |  37 +-
 .../editors/space_view3d/view3d_buttons.c     |  16 +-
 .../editors/space_view3d/view3d_header.c      |   6 +-
 .../editors/space_view3d/view3d_select.c      |   4 +-
 .../editors/space_view3d/view3d_snap.c        |   8 +-
 source/blender/editors/transform/transform.c  |   2 +-
 .../editors/transform/transform_conversions.c |  14 +-
 .../editors/transform/transform_generics.c    |  14 +-
 source/blender/editors/util/editmode_undo.c   |   2 +-
 source/blender/editors/uvedit/uvedit_ops.c    |  50 +--
 .../editors/uvedit/uvedit_unwrap_ops.c        |  40 +-
 source/blender/makesrna/intern/rna_armature.c |  18 +-
 source/blender/makesrna/intern/rna_boid.c     | 103 ++---
 source/blender/makesrna/intern/rna_cloth.c    |  63 +--
 .../blender/makesrna/intern/rna_constraint.c  |   5 +-
 source/blender/makesrna/intern/rna_curve.c    |  17 +-
 source/blender/makesrna/intern/rna_define.c   |   3 +-
 source/blender/makesrna/intern/rna_fluidsim.c |  18 +-
 source/blender/makesrna/intern/rna_internal.h |   1 +
 source/blender/makesrna/intern/rna_key.c      |   5 +-
 source/blender/makesrna/intern/rna_lattice.c  |  14 +-
 source/blender/makesrna/intern/rna_mesh.c     | 110 ++++-
 source/blender/makesrna/intern/rna_mesh_api.c |  11 +-
 source/blender/makesrna/intern/rna_meta.c     |  12 +-
 source/blender/makesrna/intern/rna_modifier.c | 344 ++++++++--------
 source/blender/makesrna/intern/rna_object.c   |  19 +-
 .../makesrna/intern/rna_object_force.c        |  90 +++--
 source/blender/makesrna/intern/rna_particle.c | 356 ++++++++--------
 source/blender/makesrna/intern/rna_pose.c     |   2 +-
 .../makesrna/intern/rna_sculpt_paint.c        |  19 +-
 source/blender/makesrna/intern/rna_smoke.c    |   2 +-
 source/blender/makesrna/intern/rna_space.c    | 227 ++++++-----
 source/blender/makesrna/intern/rna_userdef.c  | 380 +++++++++---------
 source/blender/makesrna/intern/rna_wm.c       |   1 +
 source/blender/windowmanager/WM_types.h       |  51 ++-
 source/blender/windowmanager/intern/wm.c      |   2 +-
 .../windowmanager/intern/wm_event_system.c    |   4 +-
 85 files changed, 1746 insertions(+), 1688 deletions(-)

diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h
index 70b6c1d13f4..e242ead3b87 100644
--- a/source/blender/blenkernel/BKE_depsgraph.h
+++ b/source/blender/blenkernel/BKE_depsgraph.h
@@ -32,6 +32,8 @@
 #define DEPS_DEBUG
 */
 
+struct ID;
+struct Main;
 struct Scene;
 struct DagNodeQueue;
 struct DagForest;
@@ -103,8 +105,9 @@ void	DAG_object_update_flags(struct Scene *sce, struct Object *ob, unsigned int
 
 		/* flushes all recalc flags in objects down the dependency tree */
 void	DAG_scene_flush_update(struct Scene *sce, unsigned int lay, int time);
-		/* flushes all recalc flags for this object down the dependency tree */
-void	DAG_object_flush_update(struct Scene *sce, struct Object *ob, short flag);
+		/* flushes all recalc flags for this object down the dependency tree,
+		   but not the DAG only supports objects and object data currently */
+void	DAG_id_flush_update(struct ID *id, short flag);
 
 void	DAG_pose_sort(struct Object *ob);
 		
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 631bc2cb88c..e568f1b2c0e 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -130,7 +130,6 @@ void free_bones (bArmature *arm)
 void free_armature(bArmature *arm)
 {
 	if (arm) {
-		/*		unlink_armature(arm);*/
 		free_bones(arm);
 		
 		/* free editmode data */
diff --git a/source/blender/blenkernel/intern/booleanops.c b/source/blender/blenkernel/intern/booleanops.c
index eb3aefe7ee6..5f0697f06ce 100644
--- a/source/blender/blenkernel/intern/booleanops.c
+++ b/source/blender/blenkernel/intern/booleanops.c
@@ -589,7 +589,7 @@ int NewBooleanMesh(Scene *scene, Base *base, Base *base_select, int int_op_type)
 	MEM_freeN(mat);
 
 	/* update dag */
-	DAG_object_flush_update(scene, ob_new, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob_new->id, OB_RECALC_DATA);
 
 	return 1;
 }
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 6c765b02e5d..6a14762e0ed 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -61,6 +61,7 @@
 #include "DNA_space_types.h"
 #include "DNA_view2d_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "BLI_ghash.h"
 
@@ -2141,39 +2142,77 @@ void DAG_scene_update_flags(Scene *scene, unsigned int lay)
 	
 }
 
-
-/* flag this object and all its relations to recalc */
-/* if you need to do more objects, tag object yourself and
-   use DAG_scene_flush_update() in end */
-void DAG_object_flush_update(Scene *sce, Object *ob, short flag)
+void DAG_id_flush_update(ID *id, short flag)
 {
-	
-	if(ob==NULL || sce->theDag==NULL) return;
+	Main *bmain= G.main;
+	wmWindowManager *wm;
+	wmWindow *win;
+	Scene *sce;
+	Object *obt, *ob= NULL;
+	short idtype;
 
-	ob->recalc |= flag;
-	BKE_ptcache_object_reset(sce, ob, PTCACHE_RESET_DEPSGRAPH);
-	
-	/* all users of this ob->data should be checked */
-	/* BUT! displists for curves are still only on cu */
-	if(flag & OB_RECALC_DATA) {
-		if(ob->type!=OB_CURVE && ob->type!=OB_SURF) {
-			ID *id= ob->data;
-			if(id && id->us>1) {
-				/* except when there's a key and shapes are locked */
-				if(ob_get_key(ob) && (ob->shapeflag & (OB_SHAPE_LOCK|OB_SHAPE_TEMPLOCK)));
-				else {
-					Object *obt;
-					for (obt=G.main->object.first; obt; obt= obt->id.next) {
-						if (obt != ob && obt->data==ob->data) {
-							obt->recalc |= OB_RECALC_DATA;
-							BKE_ptcache_object_reset(sce, obt, PTCACHE_RESET_DEPSGRAPH);
-						}
-					}
+	/* only one scene supported currently, making more scenes work
+	   correctly requires changes beyond just the dependency graph */
+
+	if((wm= bmain->wm.first)) {
+		/* if we have a windowmanager, use sce from first window */
+		for(win=wm->windows.first; win; win=win->next) {
+			sce= (win->screen)? win->screen->scene: NULL;
+
+			if(sce)
+				break;
+		}
+	}
+	else
+		/* if not, use the first sce */
+		sce= bmain->scene.first;
+
+	if(!id || !sce || !sce->theDag)
+		return;
+
+	/* set flags & pointcache for object */
+	if(GS(id->name) == ID_OB) {
+		ob= (Object*)id;
+		ob->recalc |= flag;
+		BKE_ptcache_object_reset(sce, ob, PTCACHE_RESET_DEPSGRAPH);
+
+		if(flag & OB_RECALC_DATA) {
+			/* all users of this ob->data should be checked */
+			id= ob->data;
+
+			/* no point in trying in this cases */
+			if(!id || id->us <= 1)
+				id= NULL;
+			/* curves and surfaces only need to mark one object, since
+			   otherwise cu->displist would be computed multiple times */
+			else if(ob->type==OB_CURVE || ob->type==OB_SURF)
+				id= NULL;
+			/* also for locked shape keys we make an exception */
+			else if(ob_get_key(ob) && (ob->shapeflag & (OB_SHAPE_LOCK|OB_SHAPE_TEMPLOCK)))
+				id= NULL;
+		}
+	}
+
+	/* set flags & pointcache for object data */
+	if(id) {
+		idtype= GS(id->name);
+
+		if(ELEM7(idtype, ID_ME, ID_CU, ID_MB, ID_LA, ID_LT, ID_CA, ID_AR)) {
+			for(obt=bmain->object.first; obt; obt= obt->id.next) {
+				if(!(ob && obt == ob) && obt->data == id) {
+					obt->recalc |= OB_RECALC_DATA;
+					BKE_ptcache_object_reset(sce, obt, PTCACHE_RESET_DEPSGRAPH);
+
+					/* for these we only flag one object, otherwise cu->displist
+					   would be computed multiple times */
+					if(obt->type==OB_CURVE || obt->type==OB_SURF)
+						break;
 				}
 			}
 		}
 	}
-	
+
+	/* flush to other objects that depend on this one */
 // XXX	if(G.curscreen)
 //		DAG_scene_flush_update(sce, dag_screen_view3d_layers(), 0);
 //	else
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index c7454d3b832..c92eda6d169 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -977,7 +977,7 @@ void mesh_set_smooth_flag(Object *meshOb, int enableSmooth)
 		}
 	}
 
-// XXX do this in caller	DAG_object_flush_update(scene, meshOb, OB_RECALC_DATA);
+// XXX do this in caller	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 }
 
 void mesh_calc_normals(MVert *mverts, int numVerts, MFace *mfaces, int numFaces, float **faceNors_r) 
@@ -1265,7 +1265,7 @@ void mesh_pmv_revert(Object *ob, Mesh *me)
 		MEM_freeN(me->pv->vert_map);
 		me->pv->vert_map= NULL;
 
-// XXX do this in caller		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+// XXX do this in caller		DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 9ba5769843f..37e7e55050a 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -83,7 +83,7 @@ int multiresModifier_switch_level(Object *ob, const int distance)
 		mmd->lvl += distance;
 		if(mmd->lvl < 1) mmd->lvl = 1;
 		else if(mmd->lvl > mmd->totlvl) mmd->lvl = mmd->totlvl;
-		/* XXX: DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); 
+		/* XXX: DAG_id_flush_update(&ob->id, OB_RECALC_DATA); 
 		   object_handle_update(ob);*/
 		return 1;
 	}
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 18e3512967a..1ae3ec5dd50 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2631,7 +2631,7 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	ParticleInterpolationData pind;
 	
 	float birthtime = 0.0, dietime = 0.0;
-	float t, time = 0.0, keytime = 0.0, dfra = 1.0, frs_sec = scene->r.frs_sec;
+	float t, time = 0.0, dfra = 1.0, frs_sec = scene->r.frs_sec;
 	float col[4] = {0.5f, 0.5f, 0.5f, 1.0f};
 	float prev_tangent[3], hairmat[4][4];
 	float rotmat[3][3];
@@ -2853,14 +2853,13 @@ void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cf
 
 	ParticleSystem *psys = edit->psys;
 	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
-	ParticleSettings *part = psys ? psys->part : NULL;
 	ParticleData *pa = psys ? psys->particles : NULL;
 
 	ParticleInterpolationData pind;
 	ParticleKey result;
 	
 	float birthtime = 0.0, dietime = 0.0;
-	float t, time = 0.0, keytime = 0.0, dfra = 1.0, frs_sec;
+	float t, time = 0.0, keytime = 0.0, frs_sec;
 	float hairmat[4][4];
 	int k,i;
 	int steps = (int)pow(2.0, (double)pset->draw_step);
@@ -3161,7 +3160,7 @@ void object_add_particle_system(Scene *scene, Object *ob)
 	psys->cfra=bsystem_time(scene,ob,scene->r.cfra+1,0.0);
 
 	DAG_scene_sort(scene);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 }
 void object_remove_particle_system(Scene *scene, Object *ob)
 {
@@ -3184,7 +3183,7 @@ void object_remove_particle_system(Scene *scene, Object *ob)
 		((ParticleSystem *) ob->particlesystem.first)->flag |= PSYS_CURRENT;
 
 	DAG_scene_sort(scene);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 }
 static void default_particle_settings(ParticleSettings *part)
 {
@@ -3364,7 +3363,7 @@ void psys_flush_particle_settings(Scene *scene, ParticleSettings *part, int reca
 			}
 		}
 		if(flush)
-			DAG_object_flush_update(scene, base->object, OB_RECALC_DATA);
+			DAG_id_flush_update(&base->object->id, OB_RECALC_DATA);
 	}
 }
 
@@ -3396,7 +3395,7 @@ LinkNode *psys_using_settings(struct Scene *scene, ParticleSettings *part, int f
 		}
 
 		if(flush_update && found)
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 
 	return node;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index c0223d1690c..7a156f56d72 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1947,7 +1947,7 @@ void BKE_ptcache_set_continue_physics(Scene *scene, int enable)
 		if(CONTINUE_PHYSICS == 0) {
 			for(ob=G.main->object.first; ob; ob=ob->id.next)
 				if(BKE_ptcache_object_reset(scene, ob, PTCACHE_RESET_OUTDATED))
-					DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+					DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 }
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 9f83733a640..65051c384b3 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -340,7 +340,7 @@ void ED_armature_from_edit(Scene *scene, Object *obedit)
 			armature_rebuild_pose(obt, arm);
 	}
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 }
 
 
@@ -1054,8 +1054,8 @@ static int separate_armature_exec (bContext *C, wmOperator *op)
 	/* 4) fix links before depsgraph flushes */ // err... or after?
 	separated_armature_fix_links(oldob, newob);
 	
-	DAG_object_flush_update(scene, oldob, OB_RECALC_DATA);	/* this is the original one */
-	DAG_object_flush_update(scene, newob, OB_RECALC_DATA);	/* this is the separated one */
+	DAG_id_flush_update(&oldob->id, OB_RECALC_DATA);	/* this is the original one */
+	DAG_id_flush_update(&newob->id, OB_RECALC_DATA);	/* this is the separated one */
 	
 	
 	/* 5) restore original conditions */
@@ -1890,7 +1890,7 @@ void mouse_armature(bContext *C, short mval[2], int extend)
 			if(nearBone->flag & BONE_SELECTED) nearBone->flag |= BONE_ACTIVE;
 		}
 		
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit);
+		WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, vc.obedit);
 	}
 }
 
@@ -4335,7 +4335,7 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
 		if (ob->mode & OB_MODE_WEIGHT_PAINT) {
 			if (nearBone->flag & BONE_ACTIVE) {
 				vertexgroup_select_by_name(OBACT, nearBone->name);
-				DAG_object_flush_update(scene, OBACT, OB_RECALC_DATA);
+				DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 			}
 		}
 		
@@ -4765,7 +4765,6 @@ void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int mod
 
 static int pose_clear_scale_exec(bContext *C, wmOperator *op) 
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	
 	/* only clear those channels that are not locked */
@@ -4782,7 +4781,7 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
@@ -4807,7 +4806,6 @@ void POSE_OT_scale_clear(wmOperatorType *ot)
 
 static int pose_clear_loc_exec(bContext *C, wmOperator *op) 
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	
 	/* only clear those channels that are not locked */
@@ -4824,7 +4822,7 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
@@ -4849,7 +4847,6 @@ void POSE_OT_loc_clear(wmOperatorType *ot)
 
 static int pose_clear_rot_exec(bContext *C, wmOperator *op) 
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	
 	/* only clear those channels that are not locked */
@@ -4899,7 +4896,7 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
@@ -5337,7 +5334,6 @@ void ED_armature_bone_rename(bArmature *arm, char *oldnamep, char *newnamep)
 
 static int armature_flip_names_exec (bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_edit_object(C);
 	bArmature *arm;
 	char newname[32];
@@ -5357,7 +5353,7 @@ static int armature_flip_names_exec (bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* since we renamed stuff... */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
@@ -5383,7 +5379,6 @@ void ARMATURE_OT_flip_names (wmOperatorType *ot)
 
 static int armature_autoside_names_exec (bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_edit_object(C);
 	bArmature *arm;
 	char newname[32];
@@ -5404,7 +5399,7 @@ static int armature_autoside_names_exec (bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* since we renamed stuff... */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c
index 021bec05a3b..56d714fd058 100644
--- a/source/blender/editors/armature/poselib.c
+++ b/source/blender/editors/armature/poselib.c
@@ -843,7 +843,7 @@ static void poselib_preview_apply (bContext *C, wmOperator *op)
 		 */
 		// FIXME: shouldn't this use the builtin stuff?
 		if ((pld->arm->flag & ARM_DELAYDEFORM)==0)
-			DAG_object_flush_update(pld->scene, pld->ob, OB_RECALC_DATA);  /* sets recalc flags */
+			DAG_id_flush_update(&pld->ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 		else
 			where_is_pose(pld->scene, pld->ob);
 	}
@@ -1346,7 +1346,7 @@ static void poselib_preview_cleanup (bContext *C, wmOperator *op)
 		 *	- note: code copied from transform_generics.c -> recalcData()
 		 */
 		if ((arm->flag & ARM_DELAYDEFORM)==0)
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);  /* sets recalc flags */
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 		else
 			where_is_pose(scene, ob);
 		
@@ -1360,7 +1360,7 @@ static void poselib_preview_cleanup (bContext *C, wmOperator *op)
 		action_set_activemarker(act, marker, 0);
 		
 		/* Update event for pose and deformation children */
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		
 		/* updates */
 		if (IS_AUTOKEY_MODE(scene, NORMAL)) {
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 9a72fce2bcf..2673640b213 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -893,7 +893,7 @@ void pose_copy_menu(Scene *scene)
 			ob->pose->flag |= POSE_RECALC;
 	}
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);	// and all its relations
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);	// and all its relations
 	
 	BIF_undo_push("Copy Pose Attributes");
 	
@@ -1067,7 +1067,7 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 	}
 
 	/* Update event for pose and deformation children */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	
 	if (IS_AUTOKEY_ON(scene)) {
 // XXX		remake_action_ipos(ob->action);
@@ -1124,7 +1124,7 @@ void pose_adds_vgroups(Scene *scene, Object *meshobj, int heatweights)
 
 	
 	// and all its relations
-	DAG_object_flush_update(scene, meshobj, OB_RECALC_DATA);
+	DAG_id_flush_update(&meshobj->id, OB_RECALC_DATA);
 }
 
 /* ********************************************** */
@@ -1540,7 +1540,6 @@ void pose_select_grouped_menu (Scene *scene)
 
 static int pose_flip_names_exec (bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	bArmature *arm;
 	char newname[32];
@@ -1560,7 +1559,7 @@ static int pose_flip_names_exec (bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* since we renamed stuff... */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
@@ -1587,7 +1586,6 @@ void POSE_OT_flip_names (wmOperatorType *ot)
 
 static int pose_autoside_names_exec (bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	bArmature *arm;
 	char newname[32];
@@ -1608,7 +1606,7 @@ static int pose_autoside_names_exec (bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* since we renamed stuff... */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
@@ -1677,7 +1675,7 @@ void pose_activate_flipped_bone(Scene *scene)
 				/* in weightpaint we select the associated vertex group too */
 				if(ob->mode & OB_MODE_WEIGHT_PAINT) {
 					vertexgroup_select_by_name(OBACT, name);
-					DAG_object_flush_update(scene, OBACT, OB_RECALC_DATA);
+					DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 				}
 				
 				// XXX notifiers need to be sent to other editors to update
@@ -2116,7 +2114,7 @@ void pose_relax(Scene *scene)
 		pchan->bone->flag &= ~ BONE_TRANSFORM;
 	
 	/* do depsgraph flush */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	BIF_undo_push("Relax Pose");
 }
 
@@ -2211,7 +2209,7 @@ void pose_clear_user_transforms(Scene *scene, Object *ob)
 		rest_pose(ob->pose);
 	}
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	BIF_undo_push("Clear User Transform");
 }
 
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 28a9d3ac7c9..4246c889de0 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -409,10 +409,10 @@ static int separate_exec(bContext *C, wmOperator *op)
 	load_editNurb(newob);
 	free_editNurb(newob);
 
-	DAG_object_flush_update(scene, oldob, OB_RECALC_DATA);	/* this is the original one */
-	DAG_object_flush_update(scene, newob, OB_RECALC_DATA);	/* this is the separated one */
+	DAG_id_flush_update(&oldob->id, OB_RECALC_DATA);	/* this is the original one */
+	DAG_id_flush_update(&newob->id, OB_RECALC_DATA);	/* this is the separated one */
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, oldob);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, oldob->data);
 
 	WM_cursor_wait(0);
 
@@ -1005,8 +1005,8 @@ static int switch_direction_exec(bContext *C, wmOperator *op)
 		if(isNurbsel(nu))
 			switchdirectionNurb(nu);
 	
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1052,8 +1052,8 @@ static int set_weight_exec(bContext *C, wmOperator *op)
 		}
 	}	
 
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1103,8 +1103,8 @@ static int set_radius_exec(bContext *C, wmOperator *op)
 		}
 	}	
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -1178,8 +1178,8 @@ static int smooth_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -1343,8 +1343,8 @@ static int smooth_radius_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -1493,7 +1493,7 @@ static int de_select_first_exec(bContext *C, wmOperator *op)
 	Object *obedit= CTX_data_edit_object(C);
 
 	selectend_nurb(obedit, FIRST, 1, DESELECT);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1517,7 +1517,7 @@ static int de_select_last_exec(bContext *C, wmOperator *op)
 	Object *obedit= CTX_data_edit_object(C);
 
 	selectend_nurb(obedit, LAST, 1, DESELECT);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1585,7 +1585,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
 		select_adjacent_cp(editnurb, 1, 1, SELECT); /* cascade selection */
  	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1654,8 +1654,8 @@ static int hide_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;	
 }
@@ -1714,8 +1714,8 @@ static int reveal_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;	
 }
@@ -1770,7 +1770,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;	
 }
@@ -2166,8 +2166,8 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 		} /* End of 'if((nu->type & 7)==CU_NURBS)'  */
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;	
 }
@@ -2500,14 +2500,13 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot)
 
 static int set_handle_type_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	ListBase *editnurb= curve_get_editcurve(obedit);
 
 	sethandlesNurb(editnurb, RNA_enum_get(op->ptr, "type"));
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -2861,8 +2860,8 @@ static int merge_nurb(bContext *C, wmOperator *op)
 	
 	set_actNurb(obedit, NULL);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	
 	return OPERATOR_FINISHED;
 }
@@ -2870,7 +2869,6 @@ static int merge_nurb(bContext *C, wmOperator *op)
 static int make_segment_exec(bContext *C, wmOperator *op)
 {
 	/* joins 2 curves */
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu, *nu1=0, *nu2=0;
@@ -3015,8 +3013,8 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 		
 		set_actNurb(obedit, NULL);	/* for selected */
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);	
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
 
 		return OPERATOR_FINISHED;
 	}
@@ -3100,7 +3098,7 @@ void mouse_nurb(bContext *C, short mval[2], int extend)
 
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 	if(nu!=get_actNurb(obedit))
 		set_actNurb(obedit, nu);
@@ -3231,8 +3229,8 @@ static int spin_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -3255,7 +3253,6 @@ void CURVE_OT_spin(wmOperatorType *ot)
 
 static int addvert_Nurb(bContext *C, short mode, float location[3])
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
@@ -3367,8 +3364,8 @@ static int addvert_Nurb(bContext *C, short mode, float location[3])
 
 	test2DNurb(nu);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -3423,7 +3420,6 @@ void CURVE_OT_vertex_add(wmOperatorType *ot)
 
 static int extrude_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
@@ -3438,8 +3434,8 @@ static int extrude_exec(bContext *C, wmOperator *op)
 	}
 	else {
 		if(extrudeflagNurb(editnurb, 1)) { /* '1'= flag */
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-			DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+			WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+			DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 		}
 	}
 
@@ -3549,8 +3545,8 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -3641,7 +3637,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3733,7 +3729,7 @@ static int select_row_exec(bContext *C, wmOperator *op)
 		}
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -3760,7 +3756,7 @@ static int select_next_exec(bContext *C, wmOperator *op)
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	
 	select_adjacent_cp(editnurb, 1, 0, SELECT);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -3787,7 +3783,7 @@ static int select_previous_exec(bContext *C, wmOperator *op)
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	
 	select_adjacent_cp(editnurb, -1, 0, SELECT);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -3874,7 +3870,7 @@ static int select_more_exec(bContext *C, wmOperator *op)
 		select_adjacent_cp(editnurb, -1, 0, SELECT);
 	}
 		
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -4035,7 +4031,7 @@ static int select_less_exec(bContext *C, wmOperator *op)
 		}
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -4131,7 +4127,7 @@ static int select_random_exec(bContext *C, wmOperator *op)
 		
 	MEM_freeN(itemstobeselected);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -4165,7 +4161,7 @@ static int select_every_nth_exec(bContext *C, wmOperator *op)
 	select_adjacent_cp(editnurb, n, 1, SELECT);
 	select_adjacent_cp(editnurb, -n, 1, SELECT);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -4231,7 +4227,6 @@ void CURVE_OT_duplicate(wmOperatorType *ot)
 
 static int delete_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu, *next, *nu1;
@@ -4243,8 +4238,8 @@ static int delete_exec(bContext *C, wmOperator *op)
 		if(type==0) deleteflagNurb(C, op, 1);
 		else freeNurblist(editnurb);
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	
 		return OPERATOR_FINISHED;
 	}
@@ -4373,8 +4368,8 @@ static int delete_exec(bContext *C, wmOperator *op)
 								bezt2= bezt+(nu->pntsu-1);
 								if( (bezt2->f1 & SELECT) || (bezt2->f2 & SELECT) || (bezt2->f3 & SELECT) ) {
 									nu->flagu &= ~CU_CYCLIC;
-									WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-									DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+									WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+									DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 								}
 							}
 
@@ -4399,8 +4394,8 @@ static int delete_exec(bContext *C, wmOperator *op)
 								bp2= bp+(nu->pntsu-1);
 								if( bp2->f1 & SELECT ) {
 									nu->flagu &= ~CU_CYCLIC;
-									WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-									DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+									WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+									DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 								}
 							}
 
@@ -4497,8 +4492,8 @@ static int delete_exec(bContext *C, wmOperator *op)
 	else if(type==2)
 		freeNurblist(editnurb);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	
 	return OPERATOR_FINISHED;
 }
@@ -4569,8 +4564,8 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 		}
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -5119,8 +5114,8 @@ static int clear_tilt_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 46be95063ec..ae34f30a4f1 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -273,15 +273,14 @@ static void text_update_edited(bContext *C, Scene *scene, Object *obedit, int re
 	BKE_text_to_curve(scene, obedit, mode);
 
 	if(recalc)
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 }
 
 /********************** insert lorem operator *********************/
 
 static int insert_lorem_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	char *p, *p2;
 	int i;
@@ -308,8 +307,8 @@ static int insert_lorem_exec(bContext *C, wmOperator *op)
 	insert_into_textbuf(obedit, '\n');
 	insert_into_textbuf(obedit, '\n');	
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -614,7 +613,6 @@ static EnumPropertyItem style_items[]= {
 
 static int set_style(bContext *C, int style, int clear)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	Curve *cu= obedit->data;
 	EditFont *ef= cu->editfont;
@@ -630,8 +628,8 @@ static int set_style(bContext *C, int style, int clear)
 			ef->textbufinfo[i].flag |= style;
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 6aa5f5efc41..d253948e2e8 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -328,7 +328,6 @@ void uiTemplateID(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propname
 
 static void modifiers_setOnCage(bContext *C, void *ob_v, void *md_v)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob = ob_v;
 	ModifierData *md;
 	
@@ -343,12 +342,11 @@ static void modifiers_setOnCage(bContext *C, void *ob_v, void *md_v)
 	}
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 }
 
 static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob = ob_v;
 	ModifierData *md = md_v;
 	ModifierData *nmd = modifier_new(md->type);
@@ -361,7 +359,7 @@ static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v)
 	ob->partype = PAROBJECT;
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	ED_undo_push(C, "Modifier convert to real");
 }
@@ -597,8 +595,8 @@ void do_constraint_panels(bContext *C, void *arg, int event)
 	
 	if(ob->pose) update_pose_constraint_flags(ob->pose);
 	
-	if(ob->type==OB_ARMATURE) DAG_object_flush_update(scene, ob, OB_RECALC_DATA|OB_RECALC_OB);
-	else DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+	if(ob->type==OB_ARMATURE) DAG_id_flush_update(&ob->id, OB_RECALC_DATA|OB_RECALC_OB);
+	else DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 	
 	// XXX allqueue(REDRAWVIEW3D, 0);
 	// XXX allqueue(REDRAWBUTSOBJECT, 0);
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index c3f1637d3af..980d699dda5 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -1280,7 +1280,7 @@ void load_editMesh(Scene *scene, Object *ob)
 void remake_editMesh(Scene *scene, Object *ob)
 {
 	make_editMesh(scene, ob);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	BIF_undo_push("Undo all changes");
 }
 
@@ -1390,8 +1390,8 @@ static int mesh_separate_selected(Scene *scene, Base *editbase)
 	/* hashedges are invalid now, make new! */
 	editMesh_set_hash(em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);	
-	DAG_object_flush_update(scene, basenew->object, OB_RECALC_DATA);	
+	DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);	
+	DAG_id_flush_update(&basenew->object->id, OB_RECALC_DATA);	
 
 	BKE_mesh_end_editmesh(me, em);
 
@@ -1469,7 +1469,7 @@ static int mesh_separate_exec(bContext *C, wmOperator *op)
 		retval= mesh_separate_loose(scene, base);
 	   
 	if(retval) {
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, base->object);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, base->object->data);
 		return OPERATOR_FINISHED;
 	}
 	return OPERATOR_CANCELLED;
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 19078d2f6ff..4af5ddf56fa 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -217,8 +217,8 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event)
 	}
 	
 	//retopo_do_all();
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit); 
-	DAG_object_flush_update(vc.scene, vc.obedit, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, vc.obedit->data); 
+	DAG_id_flush_update(vc.obedit->data, OB_RECALC_DATA);
 	
 	return OPERATOR_FINISHED;
 }
@@ -343,9 +343,8 @@ static int make_fgon_exec(bContext *C, wmOperator *op)
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 
 	if( make_fgon(em, op, 1) ) {
-		DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);	
-	
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return OPERATOR_FINISHED;
@@ -376,9 +375,8 @@ static int clear_fgon_exec(bContext *C, wmOperator *op)
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	
 	if( make_fgon(em, op, 0) ) {
-		DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);	
-		
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 		
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return OPERATOR_FINISHED;
@@ -666,7 +664,7 @@ void addfaces_from_edgenet(EditMesh *em)
 
 	EM_select_flush(em);
 	
-// XXX	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+// XXX	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 }
 
 static void addedgeface_mesh(EditMesh *em, wmOperator *op)
@@ -695,7 +693,7 @@ static void addedgeface_mesh(EditMesh *em, wmOperator *op)
 		eed= addedgelist(em, neweve[0], neweve[1], NULL);
 		EM_select_edge(eed, 1);
 
-		// XXX		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);	
+		// XXX		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
 		return;
 	}
 	else if(amount > 4) {
@@ -792,9 +790,8 @@ static int addedgeface_mesh_exec(bContext *C, wmOperator *op)
 	
 	addedgeface_mesh(em, op);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
-	
-	DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);	
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1311,7 +1308,6 @@ static float new_primitive_matrix(bContext *C, float primmat[][4])
 
 static int add_primitive_plane_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1321,8 +1317,8 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op)
 	
 	make_prim(obedit, PRIM_PLANE, mat, 4, 0, 0, dia, 0.0f, 0, 1);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1344,7 +1340,6 @@ void MESH_OT_primitive_plane_add(wmOperatorType *ot)
 
 static int add_primitive_cube_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1354,8 +1349,8 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op)
 	
 	make_prim(obedit, PRIM_CUBE, mat, 4, 0, 0, dia, 1.0f, 1, 1);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1377,7 +1372,6 @@ void MESH_OT_primitive_cube_add(wmOperatorType *ot)
 
 static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1387,8 +1381,8 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_CIRCLE, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 0.0f, 0, 
 			  RNA_boolean_get(op->ptr, "fill"));
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1415,7 +1409,6 @@ void MESH_OT_primitive_circle_add(wmOperatorType *ot)
 
 static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1425,8 +1418,8 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 
 			  RNA_float_get(op->ptr, "depth"), 1, 1);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1453,7 +1446,6 @@ void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
 
 static int add_primitive_tube_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1463,8 +1455,8 @@ static int add_primitive_tube_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 
 			  RNA_float_get(op->ptr, "depth"), 1, 0);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1491,7 +1483,6 @@ void MESH_OT_primitive_tube_add(wmOperatorType *ot)
 
 static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1501,8 +1492,8 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 
 			  RNA_float_get(op->ptr, "depth"), 0, RNA_boolean_get(op->ptr, "cap_end"));
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1531,7 +1522,6 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot)
 
 static int add_primitive_grid_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1541,8 +1531,8 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_GRID, mat, RNA_int_get(op->ptr, "x_subdivisions"), 
 			  RNA_int_get(op->ptr, "y_subdivisions"), 0, dia, 0.0f, 0, 1);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1569,7 +1559,6 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot)
 
 static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float mat[4][4];
 	
@@ -1577,8 +1566,8 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
 	
 	make_prim(obedit, PRIM_MONKEY, mat, 0, 0, 2, 0.0f, 0.0f, 0, 0);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1600,7 +1589,6 @@ void MESH_OT_primitive_monkey_add(wmOperatorType *ot)
 
 static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1610,8 +1598,8 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_UVSPHERE, mat, RNA_int_get(op->ptr, "rings"), 
 			  RNA_int_get(op->ptr, "segments"), 0, dia, 0.0f, 0, 0);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1638,7 +1626,6 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
 
 static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	float dia, mat[4][4];
 	
@@ -1648,8 +1635,8 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
 	make_prim(obedit, PRIM_ICOSPHERE, mat, 0, 0, 
 			  RNA_int_get(op->ptr, "subdivisions"), dia, 0.0f, 0, 0);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -1677,7 +1664,6 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
 
 static int mesh_duplicate_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(ob->data);
 
@@ -1685,8 +1671,8 @@ static int mesh_duplicate_exec(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(ob->data, em);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	DAG_id_flush_update(ob->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c
index b46f745e8f5..4c3e76f2285 100644
--- a/source/blender/editors/mesh/editmesh_loop.c
+++ b/source/blender/editors/mesh/editmesh_loop.c
@@ -389,7 +389,7 @@ void CutEdgeloop(Object *obedit, wmOperator *op, EditMesh *em, int numcuts)
 		EM_selectmode_set(em);
 	}	
 	
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	return;
 }
 
@@ -624,7 +624,6 @@ static float seg_intersect(EditEdge *e, CutCurve *c, int len, char mode, struct
 
 static int knife_cut_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	ARegion *ar= CTX_wm_region(C);
@@ -705,8 +704,8 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
 	
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index f2c5b7fb727..667a889b5fc 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -127,7 +127,7 @@ void EM_automerge(int update)
 //		if (len) {
 //			em->totvert -= len; /* saves doing a countall */
 //			if (update) {
-//				DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//				DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 //			}
 //		}
 //	}
@@ -807,7 +807,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
 	if (selcount) {
 		/* here was an edge-mode only select flush case, has to be generalized */
 		EM_selectmode_flush(em);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 		BKE_mesh_end_editmesh(me, em);
 		return OPERATOR_FINISHED;
 	}
@@ -839,7 +839,7 @@ static EnumPropertyItem prop_simedge_types[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-static int similar_edge_select__internal(Scene *scene, EditMesh *em, int mode)
+static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mode)
 {
 	EditEdge *eed, *base_eed=NULL;
 	unsigned int selcount=0; /* count how many new edges we select*/
@@ -849,7 +849,7 @@ static int similar_edge_select__internal(Scene *scene, EditMesh *em, int mode)
 	unsigned int deselcount=0;
 	
 	short ok=0;
-	float thresh= scene->toolsettings->select_thresh;
+	float thresh= ts->select_thresh;
 	
 	for(eed= em->edges.first; eed; eed= eed->next) {
 		if (!eed->h) {
@@ -1039,17 +1039,17 @@ static int similar_edge_select__internal(Scene *scene, EditMesh *em, int mode)
 /* wrap the above function but do selection flushing edge to face */
 static int similar_edge_select_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *obedit= CTX_data_edit_object(C);
 	Mesh *me= obedit->data;
 	EditMesh *em= BKE_mesh_get_editmesh(me); 
 
-	int selcount = similar_edge_select__internal(scene, em, RNA_int_get(op->ptr, "type"));
+	int selcount = similar_edge_select__internal(ts, em, RNA_int_get(op->ptr, "type"));
 	
 	if (selcount) {
 		/* here was an edge-mode only select flush case, has to be generalized */
 		EM_selectmode_flush(em);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 		BKE_mesh_end_editmesh(me, em);
 		return OPERATOR_FINISHED;
 	}
@@ -1081,7 +1081,7 @@ static EnumPropertyItem prop_simvertex_types[] = {
 
 static int similar_vert_select_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *obedit= CTX_data_edit_object(C);
 	Mesh *me= obedit->data;
 	EditMesh *em= BKE_mesh_get_editmesh(me); 
@@ -1094,7 +1094,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
 	int mode= RNA_enum_get(op->ptr, "type");
 	
 	short ok=0;
-	float thresh= scene->toolsettings->select_thresh;
+	float thresh= ts->select_thresh;
 	
 	for(eve= em->verts.first; eve; eve= eve->next) {
 		if (!eve->h) {
@@ -1207,7 +1207,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
 	} /* end basevert loop */
 
 	if(selcount) {
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 		BKE_mesh_end_editmesh(me, em);
 		return OPERATOR_FINISHED;
 	}
@@ -1413,7 +1413,7 @@ void EM_mesh_copy_edge(EditMesh *em, short type)
 	}
 	
 	if (change) {
-//		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 		
 	}
 }
@@ -1541,7 +1541,7 @@ void EM_mesh_copy_face(EditMesh *em, wmOperator *op, short type)
 	}
 	
 	if (change) {
-//		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 		
 	}
 }
@@ -1671,7 +1671,7 @@ void EM_mesh_copy_face_layer(EditMesh *em, wmOperator *op, short type)
 	}
 
 	if (change) {
-//		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 		
 	}
 }
@@ -1991,7 +1991,7 @@ static int loop_multiselect(bContext *C, wmOperator *op)
 	MEM_freeN(edarray);
 //	if (EM_texFaceCheck())
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -2060,7 +2060,7 @@ static void mouse_mesh_loop(bContext *C, short mval[2], short extend, short ring
 		EM_selectmode_flush(em);
 //			if (EM_texFaceCheck())
 		
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
 	}
 }
 
@@ -2159,9 +2159,8 @@ static void mouse_mesh_shortest_path(bContext *C, short mval[2])
 				break;
 		}
 		
-		DAG_object_flush_update(vc.scene, vc.obedit, OB_RECALC_DATA);
-	
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit);
+		DAG_id_flush_update(vc.obedit->data, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
 	}
 }
 
@@ -2261,7 +2260,7 @@ void mouse_mesh(bContext *C, short mval[2], short extend)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
 	
 }
 
@@ -2405,12 +2404,12 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event
 	/* return warning! */
 	if(limit) {
 		int retval= select_linked_limited_invoke(&vc, 0, sel);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 		return retval;
 	}
 	
 	if( unified_findnearest(&vc, &eve, &eed, &efa)==0 ) {
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 		return OPERATOR_CANCELLED;
 	}
@@ -2464,7 +2463,7 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event
 	
 //	if (EM_texFaceCheck())
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	return OPERATOR_FINISHED;	
 }
 
@@ -2545,7 +2544,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
 	else
 		selectconnected_mesh_all(em);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -2671,7 +2670,7 @@ void EM_hide_mesh(EditMesh *em, int swap)
 	em->totedgesel= em->totfacesel= em->totvertsel= 0;
 //	if(EM_texFaceCheck())
 
-	//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);	
+	//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
 }
 
 static int hide_mesh_exec(bContext *C, wmOperator *op)
@@ -2681,7 +2680,7 @@ static int hide_mesh_exec(bContext *C, wmOperator *op)
 	
 	EM_hide_mesh(em, RNA_boolean_get(op->ptr, "unselected"));
 		
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -2738,7 +2737,7 @@ void EM_reveal_mesh(EditMesh *em)
 	EM_selectmode_flush(em);
 
 //	if (EM_texFaceCheck())
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);	
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);	
 }
 
 static int reveal_mesh_exec(bContext *C, wmOperator *op)
@@ -2748,7 +2747,7 @@ static int reveal_mesh_exec(bContext *C, wmOperator *op)
 	
 	EM_reveal_mesh(em);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -2798,7 +2797,7 @@ int select_by_number_vertices_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -2924,7 +2923,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op)
 
 //	if (EM_texFaceCheck())
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ?
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data); //TODO is this needed ?
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -3092,7 +3091,7 @@ static int select_linked_flat_faces_exec(bContext *C, wmOperator *op)
 	
 	select_linked_flat_faces(em, op, RNA_float_get(op->ptr, "sharpness"));
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -3193,7 +3192,7 @@ static int select_non_manifold_exec(bContext *C, wmOperator *op)
 	
 	select_non_manifold(em, op);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -3257,7 +3256,7 @@ static int select_inverse_mesh_exec(bContext *C, wmOperator *op)
 	
 	EM_select_swap(em);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -3295,7 +3294,7 @@ static int toggle_select_all_exec(bContext *C, wmOperator *op)
 	
 	EM_toggle_select_all(em);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);	
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);	
 	BKE_mesh_end_editmesh(obedit->data, em);
 
 	return OPERATOR_FINISHED;
@@ -3366,7 +3365,7 @@ static int select_more(bContext *C, wmOperator *op)
 
 //	if (EM_texFaceCheck(em))
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -3456,7 +3455,7 @@ static int select_less(bContext *C, wmOperator *op)
 	EM_select_less(em);
 
 //	if (EM_texFaceCheck(em))
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -3526,7 +3525,7 @@ static int mesh_select_random_exec(bContext *C, wmOperator *op)
 	
 	selectrandom_mesh(em, RNA_float_get(op->ptr,"percent"));
 		
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;	
@@ -3577,7 +3576,7 @@ void EM_deselect_by_material(EditMesh *em, int index)
 	EM_selectmode_flush(em);
 }
 
-static void mesh_selection_type(Scene *scene, EditMesh *em, int val)
+static void mesh_selection_type(ToolSettings *ts, EditMesh *em, int val)
 {
 	if(val>0) {
 		if(val==1) { 
@@ -3598,7 +3597,7 @@ static void mesh_selection_type(Scene *scene, EditMesh *em, int val)
 		
 		/* note, em stores selectmode to be able to pass it on everywhere without scene,
 		   this is only until all select modes and toolsettings are settled more */
-		scene->toolsettings->selectmode= em->selectmode;
+		ts->selectmode= em->selectmode;
 //		if (EM_texFaceCheck())
 	}
 }
@@ -3612,13 +3611,13 @@ static EnumPropertyItem prop_mesh_edit_types[] = {
 
 static int mesh_selection_type_exec(bContext *C, wmOperator *op)
 {		
-	
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 
-	mesh_selection_type(CTX_data_scene(C), em, RNA_enum_get(op->ptr,"type"));
+	mesh_selection_type(ts, em, RNA_enum_get(op->ptr,"type"));
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -3648,7 +3647,6 @@ void MESH_OT_selection_type(wmOperatorType *ot)
 
 static int editmesh_mark_seam(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	Mesh *me= ((Mesh *)obedit->data);
@@ -3681,8 +3679,8 @@ static int editmesh_mark_seam(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -3706,7 +3704,6 @@ void MESH_OT_mark_seam(wmOperatorType *ot)
 
 static int editmesh_mark_sharp(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	Mesh *me= ((Mesh *)obedit->data);
@@ -3734,8 +3731,8 @@ static int editmesh_mark_sharp(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -3965,7 +3962,7 @@ void righthandfaces(EditMesh *em, int select)	/* makes faces righthand turning *
 
 	recalc_editnormals(em);
 	
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	waitcursor(0);
 }
@@ -3973,7 +3970,6 @@ void righthandfaces(EditMesh *em, int select)	/* makes faces righthand turning *
 
 static int righthandfaces_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	
@@ -3984,8 +3980,8 @@ static int righthandfaces_exec(bContext *C, wmOperator *op)
 	
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ?
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data); //TODO is this needed ?
 
 	return OPERATOR_FINISHED;	
 }
@@ -4185,7 +4181,7 @@ void editmesh_align_view_to_selected(Object *obedit, EditMesh *em, wmOperator *o
 
 static int smooth_vertex(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	EditVert *eve, *eve_mir = NULL;
@@ -4273,7 +4269,7 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 		if(eve->f & SELECT) {
 			if(eve->f1) {
 				
-				if (scene->toolsettings->editbutflag & B_MESH_X_MIRROR) {
+				if (ts->editbutflag & B_MESH_X_MIRROR) {
 					eve_mir= editmesh_get_x_mirror_vert(obedit, em, eve->co);
 				}
 				
@@ -4315,8 +4311,8 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -4393,7 +4389,7 @@ void vertexnoise(Object *obedit, EditMesh *em)
 	}
 
 	recalc_editnormals(em);
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 }
 
@@ -4450,23 +4446,23 @@ static void vertices_to_sphere(Scene *scene, View3D *v3d, Object *obedit, EditMe
 	}
 	
 	recalc_editnormals(em);
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 }
 
 static int vertices_to_sphere_exec(bContext *C, wmOperator *op)
 {
+	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	Scene *scene = CTX_data_scene(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	
 	vertices_to_sphere(scene, v3d, obedit, em, RNA_float_get(op->ptr,"percent"));
 		
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
 	return OPERATOR_FINISHED;	
 }
@@ -4512,7 +4508,6 @@ void flipface(EditMesh *em, EditFace *efa)
 
 static int flip_normals(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	EditFace *efa;
@@ -4530,8 +4525,8 @@ static int flip_normals(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index ac65820bfea..5a4397256de 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -484,11 +484,11 @@ int removedoublesflag(EditMesh *em, short flag, short automerge, float limit)		/
 static int removedoublesflag_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
-	Scene *scene = CTX_data_scene(C);
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	char msg[100];
 
-	int cnt = removedoublesflag(em,1,0,scene->toolsettings->doublimit);
+	int cnt = removedoublesflag(em,1,0,ts->doublimit);
 
 	if(cnt)
 	{
@@ -496,8 +496,8 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_INFO, msg);
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -677,7 +677,7 @@ void extrude_mesh(Scene *scene, Object *obedit, EditMesh *em, wmOperator *op)
 			* This shouldn't be necessary, derived queries should be
 			* automatically building this data if invalid. Or something.
 			*/
-//		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 		object_handle_update(scene, obedit);
 
 		/* individual faces? */
@@ -711,8 +711,8 @@ static int mesh_extrude_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	RNA_enum_set(op->ptr, "proportional", 0);
 	RNA_boolean_set(op->ptr, "mirror", 0);
@@ -736,8 +736,8 @@ static int mesh_extrude_exec(bContext *C, wmOperator *op)
 
 	extrude_mesh(scene, obedit, em, op);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -762,7 +762,6 @@ void MESH_OT_extrude(wmOperatorType *ot)
 
 static int split_mesh(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -776,8 +775,8 @@ static int split_mesh(bContext *C, wmOperator *op)
 
 	WM_cursor_wait(0);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -801,7 +800,6 @@ void MESH_OT_split(wmOperatorType *ot)
 
 static int extrude_repeat_mesh(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -837,8 +835,8 @@ static int extrude_repeat_mesh(bContext *C, wmOperator *op)
 
 	EM_fgon_flags(em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -869,7 +867,7 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot)
 static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float degr, int dupli )
 {
 	Object *obedit= CTX_data_edit_object(C);
-	Scene *scene = CTX_data_scene(C);
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	EditVert *eve,*nextve;
 	float nor[3]= {0.0f, 0.0f, 0.0f};
@@ -891,7 +889,7 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 
 	phi= degr*M_PI/360.0;
 	phi/= steps;
-	if(scene->toolsettings->editbutflag & B_CLOCKWISE) phi= -phi;
+	if(ts->editbutflag & B_CLOCKWISE) phi= -phi;
 
 	RNA_float_get_array(op->ptr, "axis", n);
 	Normalize(n);
@@ -907,7 +905,7 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 	Mat3MulMat3(bmat,imat,tmat);
 
 	if(dupli==0)
-		if(scene->toolsettings->editbutflag & B_KEEPORIG)
+		if(ts->editbutflag & B_KEEPORIG)
 			adduplicateflag(em, 1);
 
 	for(a=0; a<steps; a++) {
@@ -941,7 +939,7 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 
 		EM_fgon_flags(em);
 
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 
 	BKE_mesh_end_editmesh(obedit->data, em);
@@ -950,7 +948,6 @@ static int spin_mesh(bContext *C, wmOperator *op, float *dvec, int steps, float
 
 static int spin_mesh_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	int ok;
 
@@ -960,8 +957,8 @@ static int spin_mesh_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1006,7 +1003,6 @@ void MESH_OT_spin(wmOperatorType *ot)
 
 static int screw_mesh_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	EditVert *eve,*v1=0,*v2=0;
@@ -1062,8 +1058,8 @@ static int screw_mesh_exec(bContext *C, wmOperator *op)
 	}
 
 	if(spin_mesh(C, op, dvec, turns*steps, 360.0f*turns, 0)) {
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return OPERATOR_FINISHED;
@@ -1308,14 +1304,13 @@ static EnumPropertyItem prop_mesh_delete_types[] = {
 
 static int delete_mesh_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
 	delete_mesh(obedit, em, op, RNA_enum_get(op->ptr, "type"));
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -2722,7 +2717,7 @@ void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float
 		}
 	}
 
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	// Now for each face in the mesh we need to figure out How many edges were cut
 	// and which filling method to use for that face
 	for(ef = em->faces.first;ef;ef = ef->next) {
@@ -3696,7 +3691,6 @@ static void edge_rotate(EditMesh *em, wmOperator *op, EditEdge *eed, int dir)
 /* only accepts 1 selected edge, or 2 selected faces */
 static int edge_rotate_selected(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	EditEdge *eed;
@@ -3760,8 +3754,8 @@ static int edge_rotate_selected(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -4611,7 +4605,7 @@ useless:
 		} else {
 			draw = 0;
 		}
-//		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 
 
@@ -4631,7 +4625,7 @@ useless:
 
 	if(!immediate)
 		EM_automerge(0);
-//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 //	scrarea_queue_winredraw(curarea);
 
 	//BLI_ghash_free(edgesgh, freeGHash, NULL);
@@ -4681,7 +4675,7 @@ int EdgeLoopDelete(EditMesh *em, wmOperator *op)
 	EM_select_more(em);
 	removedoublesflag(em, 1,0, 0.001);
 	EM_select_flush(em);
-	//	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	//	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	return 1;
 }
 
@@ -4793,7 +4787,6 @@ static void mesh_rip_setface(EditMesh *em, EditFace *sefa)
 /* based on mouse cursor position, it defines how is being ripped */
 static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Scene *scene= CTX_data_scene(C);
 	ARegion *ar= CTX_wm_region(C);
 	RegionView3D *rv3d= ar->regiondata;
 	Object *obedit= CTX_data_edit_object(C);
@@ -4989,8 +4982,8 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		}
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
@@ -5061,7 +5054,7 @@ void shape_propagate(Scene *scene, Object *obedit, EditMesh *em, wmOperator *op)
 		}
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	return;
 }
 
@@ -5106,7 +5099,7 @@ void shape_copy_from_lerp(EditMesh *em, KeyBlock* thisBlock, KeyBlock* fromBlock
 				}
 			}
 			sprintf(str,"Blending at %d%c  MMB to Copy at 100%c",(int)(perc*100),'%','%');
-//			DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+//			DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 //			headerprint(str);
 //			force_draw(0);
 
@@ -5764,7 +5757,6 @@ int merge_target(EditMesh *em, int target, int uvmerge)
 
 static int merge_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	int count= 0, uvs= RNA_boolean_get(op->ptr, "uvs");
@@ -5794,8 +5786,8 @@ static int merge_exec(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -6040,7 +6032,7 @@ int select_vertex_path_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	BKE_mesh_end_editmesh(obedit->data, em);
 
 	return OPERATOR_FINISHED;
@@ -6108,7 +6100,7 @@ static int region_to_loop(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -6284,7 +6276,7 @@ static int loop_to_region(bContext *C, wmOperator *op)
 	freecollections(&allcollections);
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -6311,7 +6303,6 @@ void MESH_OT_loop_to_region(wmOperatorType *ot)
 
 static int mesh_rotate_uvs(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -6378,15 +6369,14 @@ static int mesh_rotate_uvs(bContext *C, wmOperator *op)
 	if(!change)
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
 
 static int mesh_mirror_uvs(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -6468,15 +6458,14 @@ static int mesh_mirror_uvs(bContext *C, wmOperator *op)
 	if(!change)
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
 
 static int mesh_rotate_colors(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -6525,8 +6514,8 @@ static int mesh_rotate_colors(bContext *C, wmOperator *op)
 	if(!change)
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -6534,7 +6523,6 @@ static int mesh_rotate_colors(bContext *C, wmOperator *op)
 
 static int mesh_mirror_colors(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -6582,8 +6570,8 @@ static int mesh_mirror_colors(bContext *C, wmOperator *op)
 	if(!change)
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -6664,7 +6652,7 @@ void MESH_OT_colors_mirror(wmOperatorType *ot)
 
 static int subdivide_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
+	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	int cuts= RNA_int_get(op->ptr,"number_cuts");
@@ -6677,10 +6665,10 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 	if(fractal != 0.0f)
 		flag |= B_FRACTAL;
 
-	esubdivideflag(obedit, em, 1, smooth, fractal, scene->toolsettings->editbutflag|flag, cuts, 0);
+	esubdivideflag(obedit, em, 1, smooth, fractal, ts->editbutflag|flag, cuts, 0);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -6953,7 +6941,6 @@ static void fill_mesh(EditMesh *em)
 
 static int fill_mesh_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -6961,8 +6948,8 @@ static int fill_mesh_exec(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 
@@ -6985,7 +6972,6 @@ void MESH_OT_fill(wmOperatorType *ot)
 
 static int beauty_fill_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -6993,8 +6979,8 @@ static int beauty_fill_exec(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -7018,14 +7004,13 @@ void MESH_OT_beauty_fill(wmOperatorType *ot)
 
 static int quads_convert_to_tris_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
 	convert_to_triface(em,0);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -7048,14 +7033,13 @@ void MESH_OT_quads_convert_to_tris(wmOperatorType *ot)
 
 static int tris_convert_to_quads_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
 	join_triangles(em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -7078,14 +7062,13 @@ void MESH_OT_tris_convert_to_quads(wmOperatorType *ot)
 
 static int edge_flip_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
 	edge_flip(em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -7124,7 +7107,6 @@ void mesh_set_smooth_faces(EditMesh *em, short smooth)
 
 static int mesh_faces_shade_smooth_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
@@ -7132,8 +7114,8 @@ static int mesh_faces_shade_smooth_exec(bContext *C, wmOperator *op)
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -7155,14 +7137,13 @@ void MESH_OT_faces_shade_smooth(wmOperatorType *ot)
 
 static int mesh_faces_shade_flat_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
 	mesh_set_smooth_faces(em, 0);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/mesh_layers.c b/source/blender/editors/mesh/mesh_layers.c
index 17a448ecf90..a36c7a56b7c 100644
--- a/source/blender/editors/mesh/mesh_layers.c
+++ b/source/blender/editors/mesh/mesh_layers.c
@@ -152,20 +152,21 @@ static void delete_customdata_layer(bContext *C, Object *ob, CustomDataLayer *la
 
 /*********************** UV texture operators ************************/
 
+static int layers_poll(bContext *C)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	ID *data= (ob)? ob->data: NULL;
+	return (ob && !ob->id.lib && ob->type==OB_MESH && data && !data->lib);
+}
+
 static int uv_texture_add_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Mesh *me;
+	Mesh *me= ob->data;
 	EditMesh *em;
 	int layernum;
 
-	if(!ob || ob->type!=OB_MESH)
-		return OPERATOR_CANCELLED;
-	
-	me= (Mesh*)ob->data;
-
-	if(scene->obedit == ob) {
+	if(me->edit_mesh) {
 		em= me->edit_mesh;
 
 		layernum= CustomData_number_of_layers(&em->fdata, CD_MTFACE);
@@ -175,7 +176,7 @@ static int uv_texture_add_exec(bContext *C, wmOperator *op)
 		EM_add_data_layer(em, &em->fdata, CD_MTFACE);
 		CustomData_set_layer_active(&em->fdata, CD_MTFACE, layernum);
 	}
-	else if(ob) {
+	else {
 		layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 		if(layernum >= MAX_MTFACE)
 			return OPERATOR_CANCELLED;
@@ -189,8 +190,8 @@ static int uv_texture_add_exec(bContext *C, wmOperator *op)
 		mesh_update_customdata_pointers(me);
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
 	return OPERATOR_FINISHED;
 }
@@ -203,6 +204,7 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot)
 	ot->idname= "MESH_OT_uv_texture_add";
 	
 	/* api callbacks */
+	ot->poll= layers_poll;
 	ot->exec= uv_texture_add_exec;
 
 	/* flags */
@@ -211,16 +213,11 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot)
 
 static int uv_texture_remove_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Mesh *me;
+	Mesh *me= ob->data;
 	CustomDataLayer *cdl;
 	int index;
 
-	if(!ob || ob->type!=OB_MESH)
-		return OPERATOR_CANCELLED;
-	
-	me= (Mesh*)ob->data;
  	index= CustomData_get_active_layer_index(&me->fdata, CD_MTFACE);
 	cdl= (index == -1)? NULL: &me->fdata.layers[index];
 
@@ -229,8 +226,8 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *op)
 
 	delete_customdata_layer(C, ob, cdl);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
 	return OPERATOR_FINISHED;
 }
@@ -243,6 +240,7 @@ void MESH_OT_uv_texture_remove(wmOperatorType *ot)
 	ot->idname= "MESH_OT_uv_texture_remove";
 	
 	/* api callbacks */
+	ot->poll= layers_poll;
 	ot->exec= uv_texture_remove_exec;
 
 	/* flags */
@@ -255,17 +253,12 @@ static int vertex_color_add_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Mesh *me;
+	Mesh *me= ob->data;
 	EditMesh *em;
 	MCol *mcol;
 	int layernum;
 
-	if(!ob || ob->type!=OB_MESH)
-		return OPERATOR_CANCELLED;
-	
-	me= (Mesh*)ob->data;
-
-	if(scene->obedit == ob) {
+	if(me->edit_mesh) {
 		em= me->edit_mesh;
 
 		layernum= CustomData_number_of_layers(&em->fdata, CD_MCOL);
@@ -294,8 +287,8 @@ static int vertex_color_add_exec(bContext *C, wmOperator *op)
 			shadeMeshMCol(scene, ob, me);
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
 	return OPERATOR_FINISHED;
 }
@@ -308,6 +301,7 @@ void MESH_OT_vertex_color_add(wmOperatorType *ot)
 	ot->idname= "MESH_OT_vertex_color_add";
 	
 	/* api callbacks */
+	ot->poll= layers_poll;
 	ot->exec= vertex_color_add_exec;
 
 	/* flags */
@@ -316,16 +310,11 @@ void MESH_OT_vertex_color_add(wmOperatorType *ot)
 
 static int vertex_color_remove_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Mesh *me;
+	Mesh *me= ob->data;
 	CustomDataLayer *cdl;
 	int index;
 
-	if(!ob || ob->type!=OB_MESH)
-		return OPERATOR_CANCELLED;
-	
-	me= (Mesh*)ob->data;
  	index= CustomData_get_active_layer_index(&me->fdata, CD_MCOL);
 	cdl= (index == -1)? NULL: &me->fdata.layers[index];
 
@@ -334,8 +323,8 @@ static int vertex_color_remove_exec(bContext *C, wmOperator *op)
 
 	delete_customdata_layer(C, ob, cdl);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
 	return OPERATOR_FINISHED;
 }
@@ -349,6 +338,7 @@ void MESH_OT_vertex_color_remove(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= vertex_color_remove_exec;
+	ot->poll= layers_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -358,22 +348,16 @@ void MESH_OT_vertex_color_remove(wmOperatorType *ot)
 
 static int sticky_add_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Mesh *me;
-
-	if(!ob || ob->type!=OB_MESH)
-		return OPERATOR_CANCELLED;
-	
-	me= (Mesh*)ob->data;
+	Mesh *me= ob->data;
 
 	if(me->msticky)
 		return OPERATOR_CANCELLED;
 
 	// XXX RE_make_sticky();
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
 	return OPERATOR_FINISHED;
 }
@@ -386,6 +370,7 @@ void MESH_OT_sticky_add(wmOperatorType *ot)
 	ot->idname= "MESH_OT_sticky_add";
 	
 	/* api callbacks */
+	ot->poll= layers_poll;
 	ot->exec= sticky_add_exec;
 
 	/* flags */
@@ -394,14 +379,8 @@ void MESH_OT_sticky_add(wmOperatorType *ot)
 
 static int sticky_remove_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Mesh *me;
-
-	if(!ob || ob->type!=OB_MESH)
-		return OPERATOR_CANCELLED;
-	
-	me= (Mesh*)ob->data;
+	Mesh *me= ob->data;
 
 	if(!me->msticky)
 		return OPERATOR_CANCELLED;
@@ -409,8 +388,8 @@ static int sticky_remove_exec(bContext *C, wmOperator *op)
 	CustomData_free_layer_active(&me->vdata, CD_MSTICKY, me->totvert);
 	me->msticky= NULL;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, me);
 
 	return OPERATOR_FINISHED;
 }
@@ -423,6 +402,7 @@ void MESH_OT_sticky_remove(wmOperatorType *ot)
 	ot->idname= "MESH_OT_sticky_remove";
 	
 	/* api callbacks */
+	ot->poll= layers_poll;
 	ot->exec= sticky_remove_exec;
 
 	/* flags */
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 5d4be254593..2ef1d3b214d 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -681,7 +681,7 @@ void sort_faces(Scene *scene, View3D *v3d)
 
 	MEM_freeN(index);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(ob->data, OB_RECALC_DATA);
 }
 
 
diff --git a/source/blender/editors/metaball/editmball.c b/source/blender/editors/metaball/editmball.c
index b9bb219783f..9ab985fb3fb 100644
--- a/source/blender/editors/metaball/editmball.c
+++ b/source/blender/editors/metaball/editmball.c
@@ -212,8 +212,8 @@ static int select_deselect_all_metaelems_exec(bContext *C, wmOperator *op)
 			else ml->flag |= SELECT;
 			ml= ml->next;
 		}
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
-		//DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, mb);
+		//DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 
 	return OPERATOR_FINISHED;
@@ -251,7 +251,7 @@ static int select_inverse_metaelems_exec(bContext *C, wmOperator *op)
 				ml->flag |= SELECT;
 			ml= ml->next;
 		}
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, mb);
 	}
 	
 	return OPERATOR_FINISHED;
@@ -296,7 +296,7 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op)
 		ml= ml->next;
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, mb);
 	
 	return OPERATOR_FINISHED;
 }
@@ -325,7 +325,6 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot)
 /* Duplicate selected MetaElements */
 static int duplicate_metaelems_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	MetaBall *mb = (MetaBall*)obedit->data;
 	MetaElem *ml, *newml;
@@ -341,8 +340,8 @@ static int duplicate_metaelems_exec(bContext *C, wmOperator *op)
 			}
 			ml= ml->prev;
 		}
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, mb);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 
 	return OPERATOR_FINISHED;
@@ -384,7 +383,6 @@ void MBALL_OT_duplicate_metaelems(wmOperatorType *ot)
 /* Delete all selected MetaElems (not MetaBall) */
 static int delete_metaelems_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	MetaBall *mb= (MetaBall*)obedit->data;
 	MetaElem *ml, *next;
@@ -400,8 +398,8 @@ static int delete_metaelems_exec(bContext *C, wmOperator *op)
 			}
 			ml= next;
 		}
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, mb);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 
 	return OPERATOR_FINISHED;
@@ -426,7 +424,6 @@ void MBALL_OT_delete_metaelems(wmOperatorType *ot)
 /* Hide selected MetaElems */
 static int hide_metaelems_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	MetaBall *mb= (MetaBall*)obedit->data;
 	MetaElem *ml;
@@ -450,8 +447,8 @@ static int hide_metaelems_exec(bContext *C, wmOperator *op)
 				ml= ml->next;
 			}
 		}
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, mb);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 
 	return OPERATOR_FINISHED;
@@ -479,7 +476,6 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot)
 /* Unhide all edited MetaElems */
 static int reveal_metaelems_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	MetaBall *mb= (MetaBall*)obedit->data;
 	MetaElem *ml;
@@ -491,8 +487,8 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *op)
 			ml->flag &= ~MB_HIDE;
 			ml= ml->next;
 		}
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, mb);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	}
 	
 	return OPERATOR_FINISHED;
@@ -584,7 +580,7 @@ void mouse_mball(bContext *C, short mval[2], int extend)
 			}
 			mb->lastelem= act;
 			
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, mb);
 		}
 	}
 }
diff --git a/source/blender/editors/object/editconstraint.c b/source/blender/editors/object/editconstraint.c
index dc0442a5af9..c1b1062bfc4 100644
--- a/source/blender/editors/object/editconstraint.c
+++ b/source/blender/editors/object/editconstraint.c
@@ -825,7 +825,6 @@ void CONSTRAINT_OT_move_up (wmOperatorType *ot)
 
 static int pose_constraints_clear_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	
 	/* free constraints for all selected bones */
@@ -836,7 +835,7 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* do updates */
-	DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+	DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE|ND_CONSTRAINT|NA_REMOVED, ob);
 	
 	return OPERATOR_FINISHED;
@@ -857,7 +856,6 @@ void POSE_OT_constraints_clear(wmOperatorType *ot)
 
 static int object_constraints_clear_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	
 	/* do freeing */
@@ -865,7 +863,7 @@ static int object_constraints_clear_exec(bContext *C, wmOperator *op)
 	free_constraints(&ob->constraints);
 	
 	/* do updates */
-	DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+	DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 	WM_event_add_notifier(C, NC_OBJECT|ND_CONSTRAINT|NA_REMOVED, ob);
 	
 	return OPERATOR_FINISHED;
@@ -1138,10 +1136,10 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 	
 	if ((ob->type==OB_ARMATURE) && (pchan)) {
 		ob->pose->flag |= POSE_RECALC;	/* sort pose channels */
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA|OB_RECALC_OB);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA|OB_RECALC_OB);
 	}
 	else
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT|ND_CONSTRAINT|NA_ADDED, ob);
@@ -1376,7 +1374,6 @@ void POSE_OT_ik_add(wmOperatorType *ot)
 /* remove IK constraints from selected bones */
 static int pose_ik_clear_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	
 	/* only remove IK Constraints */
@@ -1397,7 +1394,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* */
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_CONSTRAINT|NA_REMOVED, ob);
diff --git a/source/blender/editors/object/editkey.c b/source/blender/editors/object/editkey.c
index 82194a4c3b4..2ec3edd846a 100644
--- a/source/blender/editors/object/editkey.c
+++ b/source/blender/editors/object/editkey.c
@@ -473,7 +473,7 @@ int ED_object_shape_key_remove(bContext *C, Scene *scene, Object *ob)
 		free_libblock_us(&(bmain->key), key);
 	}
 	
-	DAG_object_flush_update(scene, OBACT, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 
 	return 1;
@@ -481,14 +481,18 @@ int ED_object_shape_key_remove(bContext *C, Scene *scene, Object *ob)
 
 /********************** shape key operators *********************/
 
+static int shape_key_poll(bContext *C)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	ID *data= (ob)? ob->data: NULL;
+	return (ob && !ob->id.lib && data && !data->lib);
+}
+
 static int shape_key_add_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-
 	ED_object_shape_key_add(C, scene, ob);
 	
 	return OPERATOR_FINISHED;
@@ -501,6 +505,7 @@ void OBJECT_OT_shape_key_add(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_shape_key_add";
 	
 	/* api callbacks */
+	ot->poll= shape_key_poll;
 	ot->exec= shape_key_add_exec;
 
 	/* flags */
@@ -509,12 +514,9 @@ void OBJECT_OT_shape_key_add(wmOperatorType *ot)
 
 static int shape_key_remove_exec(bContext *C, wmOperator *op)
 {
-	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-	
 	if(!ED_object_shape_key_remove(C, scene, ob))
 		return OPERATOR_CANCELLED;
 	
@@ -528,97 +530,10 @@ void OBJECT_OT_shape_key_remove(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_shape_key_remove";
 	
 	/* api callbacks */
+	ot->poll= shape_key_poll;
 	ot->exec= shape_key_remove_exec;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-void move_keys(Object *ob)
-{
-#if 0
-	/* XXX probably goes away entirely */
-	Key *key;
-	KeyBlock *kb;
-	float div, dy, oldpos, vec[3], dvec[3];
-	int afbreek=0, firsttime= 1;
-	unsigned short event = 0;
-	short mval[2], val, xo, yo;
-	char str[32];
-	
-	if(G.sipo->blocktype!=ID_KE) return;
-	
-	if(G.sipo->ipo && G.sipo->ipo->id.lib) return;
-	if(G.sipo->editipo==NULL) return;
-
-	key= ob_get_key(ob);
-	if(key==NULL) return;
-	
-	/* which kb is involved */
-	kb= BLI_findlink(&key->block, ob->shapenr-1);
-	if(kb==NULL) return;	
-	
-	oldpos= kb->pos;
-	
-	getmouseco_areawin(mval);
-	xo= mval[0];
-	yo= mval[1];
-	dvec[0]=dvec[1]=dvec[2]= 0.0; 
-
-	while(afbreek==0) {
-		getmouseco_areawin(mval);
-		if(mval[0]!=xo || mval[1]!=yo || firsttime) {
-			firsttime= 0;
-			
-			dy= (float)(mval[1]- yo);
-
-			div= (float)(G.v2d->mask.ymax-G.v2d->mask.ymin);
-			dvec[1]+= (G.v2d->cur.ymax-G.v2d->cur.ymin)*(dy)/div;
-			
-			VECCOPY(vec, dvec);
-
-			apply_keyb_grid(vec, 0.0, 1.0, 0.1, U.flag & USER_AUTOGRABGRID);
-			apply_keyb_grid(vec+1, 0.0, 1.0, 0.1, U.flag & USER_AUTOGRABGRID);
-
-			kb->pos= oldpos+vec[1];
-			
-			sprintf(str, "Y: %.3f  ", vec[1]);
-			headerprint(str);
-			
-			xo= mval[0];
-			yo= mval[1];
-				
-			force_draw(0);
-		}
-		else BIF_wait_for_statechange();
-		
-		while(qtest()) {
-			event= extern_qread(&val);
-			if(val) {
-				switch(event) {
-				case ESCKEY:
-				case LEFTMOUSE:
-				case SPACEKEY:
-					afbreek= 1;
-					break;
-				default:
-					arrows_move_cursor(event);
-				}
-			}
-		}
-	}
-	
-	if(event==ESCKEY) {
-		kb->pos= oldpos;
-	}
-	
-	sort_keys(key);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	
-	/* for boundbox */
-	editipo_changed(G.sipo, 0);
-
-	BIF_undo_push("Move Shapekey(s)");
-#endif
-}
-
diff --git a/source/blender/editors/object/editlattice.c b/source/blender/editors/object/editlattice.c
index 3e30efd635a..3ec1f3af014 100644
--- a/source/blender/editors/object/editlattice.c
+++ b/source/blender/editors/object/editlattice.c
@@ -203,7 +203,7 @@ int de_select_all_exec(bContext *C, wmOperator *op)
 	else
 		setflagsLatt(obedit, 1);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -234,7 +234,6 @@ int make_regular_poll(bContext *C)
 
 int make_regular_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_edit_object(C);
 	Lattice *lt;
 	
@@ -248,8 +247,8 @@ int make_regular_exec(bContext *C, wmOperator *op)
 		resizelattice(lt, lt->pntsu, lt->pntsv, lt->pntsw, NULL);
 	}
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -318,7 +317,7 @@ void mouse_lattice(bContext *C, short mval[2], int extend)
 		else
 			bp->f1 ^= SELECT; /* swap */
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
 	}
 }
 
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index a5e92096ef9..53882ad8424 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -193,7 +193,7 @@ void ED_base_object_activate(bContext *C, Base *base)
 		for(tbase=FIRSTBASE; tbase; tbase= tbase->next) {
 			if(base!=tbase && (tbase->object->shapeflag & OB_SHAPE_TEMPLOCK)) {
 				tbase->object->shapeflag &= ~OB_SHAPE_TEMPLOCK;
-				DAG_object_flush_update(scene, tbase->object, OB_RECALC_DATA);
+				DAG_id_flush_update(&tbase->object->id, OB_RECALC_DATA);
 			}
 		}
 		WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
@@ -343,7 +343,7 @@ static int object_add_mesh_exec(bContext *C, wmOperator *op)
 		ED_object_enter_editmode(C, EM_DO_UNDO);
 		newob = 1;
 	}
-	else DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 
 	switch(RNA_enum_get(op->ptr, "type")) {
 		case 0:
@@ -379,7 +379,7 @@ static int object_add_mesh_exec(bContext *C, wmOperator *op)
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -425,7 +425,7 @@ static int object_add_curve_exec(bContext *C, wmOperator *op)
 		ED_object_enter_editmode(C, 0);
 		newob = 1;
 	}
-	else DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 	
 	obedit= CTX_data_edit_object(C);
 	nu= add_nurbs_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
@@ -437,7 +437,7 @@ static int object_add_curve_exec(bContext *C, wmOperator *op)
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -500,7 +500,7 @@ static int object_add_surface_exec(bContext *C, wmOperator *op)
 		ED_object_enter_editmode(C, 0);
 		newob = 1;
 	}
-	else DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 	
 	obedit= CTX_data_edit_object(C);
 	nu= add_nurbs_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
@@ -512,7 +512,7 @@ static int object_add_surface_exec(bContext *C, wmOperator *op)
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -557,7 +557,7 @@ static int object_metaball_add_exec(bContext *C, wmOperator *op)
 		ED_object_enter_editmode(C, 0);
 		newob = 1;
 	}
-	else DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 	
 	obedit= CTX_data_edit_object(C);
 	elem= (MetaElem*)add_metaball_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
@@ -569,7 +569,7 @@ static int object_metaball_add_exec(bContext *C, wmOperator *op)
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -621,7 +621,7 @@ static int object_add_text_exec(bContext *C, wmOperator *op)
 	if(U.flag & USER_ADD_EDITMODE)
 		ED_object_enter_editmode(C, 0);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -653,7 +653,7 @@ static int object_armature_add_exec(bContext *C, wmOperator *op)
 		ED_object_enter_editmode(C, 0);
 		newob = 1;
 	}
-	else DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 	
 	if(v3d) 
 		rv3d= CTX_wm_region(C)->regiondata;
@@ -666,7 +666,7 @@ static int object_armature_add_exec(bContext *C, wmOperator *op)
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3034,7 +3034,7 @@ static int make_proxy_exec (bContext *C, wmOperator *op)
 		
 		/* depsgraph flushes are needed for the new data */
 		DAG_scene_sort(scene);
-		DAG_object_flush_update(scene, newob, OB_RECALC);
+		DAG_id_flush_update(&newob->id, OB_RECALC);
 		
 		WM_event_add_notifier(C, NC_OBJECT, NULL);
 	}
@@ -3543,7 +3543,7 @@ static int object_center_set_exec(bContext *C, wmOperator *op)
 			
 			recalc_editnormals(em);
 			tot_change++;
-			DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+			DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 			BKE_mesh_end_editmesh(me, em);
 		}
 	}
@@ -3735,7 +3735,7 @@ static int object_center_set_exec(bContext *C, wmOperator *op)
 					tot_change++;
 					if(obedit) {
 						if (centermode==0) {
-							DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+							DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 						}
 						break;
 					}
@@ -3884,7 +3884,7 @@ void ED_object_exit_editmode(bContext *C, int flag)
 		scene->obedit= NULL; // XXX for context
 		
 		/* also flush ob recalc, doesn't take much overhead, but used for particles */
-		DAG_object_flush_update(scene, obedit, OB_RECALC_OB|OB_RECALC_DATA);
+		DAG_id_flush_update(&obedit->id, OB_RECALC_OB|OB_RECALC_DATA);
 	
 		ED_undo_push(C, "Editmode");
 	
@@ -3963,7 +3963,7 @@ void ED_object_enter_editmode(bContext *C, int flag)
 		scene->obedit= ob;
 		ED_armature_to_edit(ob);
 		/* to ensure all goes in restposition and without striding */
-		DAG_object_flush_update(scene, ob, OB_RECALC);
+		DAG_id_flush_update(&ob->id, OB_RECALC);
 
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_EDITMODE_ARMATURE, scene);
 	}
@@ -3997,7 +3997,7 @@ void ED_object_enter_editmode(bContext *C, int flag)
 	}
 	
 	if(ok) {
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		scene->obedit= NULL; // XXX for context
@@ -4327,7 +4327,7 @@ void special_editmenu(Scene *scene, View3D *v3d)
 					}
 				}
 			}
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 		else if(ob->mode & OB_MODE_VERTEX_PAINT) {
 			Mesh *me= get_mesh(ob);
@@ -4339,7 +4339,7 @@ void special_editmenu(Scene *scene, View3D *v3d)
 				
 // XXX				do_shared_vertexcol(me);
 				
-				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			}
 		}
 		else if(ob->mode & OB_MODE_WEIGHT_PAINT) {
@@ -4386,7 +4386,7 @@ void special_editmenu(Scene *scene, View3D *v3d)
 				break;
 			}
 			
-			DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+			DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 			
 			if(nr>0) waitcursor(0);
 #endif
@@ -4809,7 +4809,7 @@ static void object_flip_subdivison_particles(Scene *scene, Object *ob, int *set,
 			}
 		}
 
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 
 	if(ob->dup_group && depth<=4) {
@@ -6790,7 +6790,6 @@ void OBJECT_OT_join(wmOperatorType *ot)
 
 static int shade_smooth_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob;
 	Curve *cu;
 	Nurb *nu;
@@ -6803,7 +6802,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 		if(ob->type==OB_MESH) {
 			mesh_set_smooth_flag(ob, !clear);
 
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 
 			done= 1;
@@ -6817,7 +6816,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 				nu= nu->next;
 			}
 
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 
 			done= 1;
@@ -6904,7 +6903,7 @@ void image_aspect(Scene *scene, View3D *v3d)
 								else ob->size[1]= ob->size[0]*y/x;
 								
 								done= 1;
-								DAG_object_flush_update(scene, ob, OB_RECALC_OB);								
+								DAG_id_flush_update(&ob->id, OB_RECALC_OB);								
 							}
 						}
 						if(done) break;
@@ -7184,7 +7183,7 @@ void hookmenu(Scene *scene, View3D *v3d)
 							Mat4MulSerie(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
 							
 							changed= 1;
-							DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+							DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 						}
 					} else {
 						float *curs = give_cursor(scene, v3d);
@@ -7202,7 +7201,7 @@ void hookmenu(Scene *scene, View3D *v3d)
 						Mat3MulVecfl(imat, hmd->cent);
 						
 						changed= 1;
-						DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+						DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 					} 
 				}
 			}
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 96e485e5462..aecb778db06 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -119,7 +119,7 @@ int ED_object_modifier_add(ReportList *reports, Scene *scene, Object *ob, int ty
 			DAG_scene_sort(scene);
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	return 1;
 }
@@ -168,7 +168,7 @@ int ED_object_modifier_remove(ReportList *reports, Scene *scene, Object *ob, Mod
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	return 1;
 }
@@ -376,7 +376,7 @@ int ED_object_modifier_apply(ReportList *reports, Scene *scene, Object *ob, Modi
 
 		MEM_freeN(vertexCos);
 
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
@@ -408,7 +408,8 @@ int ED_object_modifier_copy(ReportList *reports, Object *ob, ModifierData *md)
 
 static int modifier_poll(bContext *C)
 {
-	return (CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier).data != NULL);
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier);
+	return (ptr.data != NULL && !((ID*)ptr.id.data)->lib);
 }
 
 /************************ add modifier operator *********************/
@@ -518,7 +519,6 @@ void OBJECT_OT_modifier_remove(wmOperatorType *ot)
 
 static int modifier_move_up_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier);
 	Object *ob= ptr.id.data;
 	ModifierData *md= ptr.data;
@@ -526,7 +526,7 @@ static int modifier_move_up_exec(bContext *C, wmOperator *op)
 	if(!ED_object_modifier_move_up(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -550,7 +550,6 @@ void OBJECT_OT_modifier_move_up(wmOperatorType *ot)
 
 static int modifier_move_down_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier);
 	Object *ob= ptr.id.data;
 	ModifierData *md= ptr.data;
@@ -558,7 +557,7 @@ static int modifier_move_down_exec(bContext *C, wmOperator *op)
 	if(!ob || !md || !ED_object_modifier_move_down(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -590,7 +589,7 @@ static int modifier_apply_exec(bContext *C, wmOperator *op)
 	if(!ob || !md || !ED_object_modifier_apply(op->reports, scene, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -622,7 +621,7 @@ static int modifier_convert_exec(bContext *C, wmOperator *op)
 	if(!ob || !md || !ED_object_modifier_convert(op->reports, scene, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -646,7 +645,6 @@ void OBJECT_OT_modifier_convert(wmOperatorType *ot)
 
 static int modifier_copy_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier);
 	Object *ob= ptr.id.data;
 	ModifierData *md= ptr.data;
@@ -654,7 +652,7 @@ static int modifier_copy_exec(bContext *C, wmOperator *op)
 	if(!ob || !md || !ED_object_modifier_copy(op->reports, ob, md))
 		return OPERATOR_CANCELLED;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -718,8 +716,9 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
 
 static int multires_subdivide_poll(bContext *C)
 {
-	return (CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier).data != NULL) &&
-		CTX_data_edit_object(C) == NULL;
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier);
+	ID *id= ptr.id.data;
+	return (ptr.data && id && !id->lib);
 }
 
 void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
@@ -739,7 +738,9 @@ void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
 
 static int meshdeform_poll(bContext *C)
 {
-	return CTX_data_pointer_get_type(C, "modifier", &RNA_MeshDeformModifier).data != NULL;
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_MeshDeformModifier);
+	ID *id= ptr.id.data;
+	return (ptr.data && id && !id->lib);
 }
 
 static int meshdeform_bind_exec(bContext *C, wmOperator *op)
@@ -864,12 +865,13 @@ static uiBlock *modifiers_add_menu(void *ob_v)
 
 static int hook_poll(bContext *C)
 {
-	return CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier).data != NULL;
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
+	ID *id= ptr.id.data;
+	return (ptr.data && id && !id->lib);
 }
 
 static int hook_reset_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
 	Object *ob= ptr.id.data;
 	HookModifierData *hmd= ptr.data;
@@ -892,7 +894,7 @@ static int hook_reset_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -925,7 +927,7 @@ static int hook_recenter_exec(bContext *C, wmOperator *op)
 	VECSUB(hmd->cent, scene->cursor, ob->obmat[3]);
 	Mat3MulVecfl(imat, hmd->cent);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -952,7 +954,7 @@ static int hook_select_exec(bContext *C, wmOperator *op)
 
 	object_hook_select(ob, hmd);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, ob->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -972,7 +974,6 @@ void OBJECT_OT_hook_select(wmOperatorType *ot)
 
 static int hook_assign_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
 	Object *ob= ptr.id.data;
 	HookModifierData *hmd= ptr.data;
@@ -992,7 +993,7 @@ static int hook_assign_exec(bContext *C, wmOperator *op)
 	hmd->indexar= indexar;
 	hmd->totindex= tot;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
@@ -1015,19 +1016,20 @@ void OBJECT_OT_hook_assign(wmOperatorType *ot)
 
 static int explode_refresh_poll(bContext *C)
 {
-	return CTX_data_pointer_get_type(C, "modifier", &RNA_ExplodeModifier).data != NULL;
+	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_ExplodeModifier);
+	ID *id= ptr.id.data;
+	return (ptr.data && id && !id->lib);
 }
 
 static int explode_refresh_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_ExplodeModifier);
 	Object *ob= ptr.id.data;
 	ExplodeModifierData *emd= ptr.data;
 
 	emd->flag |= eExplodeFlag_CalcFaces;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 	
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 767a04d9170..1660160b56c 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1102,17 +1102,21 @@ void vgroup_operation_with_menu(Object *ob)
 
 /********************** vertex group operators *********************/
 
+static int vertex_group_poll(bContext *C)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	ID *data= (ob)? ob->data: NULL;
+	return (ob && !ob->id.lib && data && !data->lib);
+}
+
 static int vertex_group_add_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Scene *scene= CTX_data_scene(C);
-
-	if(!ob)
-		return OPERATOR_CANCELLED;
 
 	add_defgroup(ob);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1124,6 +1128,7 @@ void OBJECT_OT_vertex_group_add(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_add";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_add_exec;
 
 	/* flags */
@@ -1135,18 +1140,16 @@ static int vertex_group_remove_exec(bContext *C, wmOperator *op)
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 	Scene *scene= CTX_data_scene(C);
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-
 	if(scene->obedit == ob) {
 		del_defgroup(ob);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
 	}
 	else {
 		del_defgroup_in_object_mode(ob);
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
+
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1158,6 +1161,7 @@ void OBJECT_OT_vertex_group_remove(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_remove";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_remove_exec;
 
 	/* flags */
@@ -1166,16 +1170,12 @@ void OBJECT_OT_vertex_group_remove(wmOperatorType *ot)
 
 static int vertex_group_assign_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *ob= CTX_data_edit_object(C);
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-
 	assign_verts_defgroup(ob, ts->vgroup_weight);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1187,6 +1187,7 @@ void OBJECT_OT_vertex_group_assign(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_assign";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_assign_exec;
 
 	/* flags */
@@ -1195,15 +1196,11 @@ void OBJECT_OT_vertex_group_assign(wmOperatorType *ot)
 
 static int vertex_group_remove_from_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_edit_object(C);
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-
 	remove_verts_defgroup(ob, 0);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1215,6 +1212,7 @@ void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_remove_from";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_remove_from_exec;
 
 	/* flags */
@@ -1225,11 +1223,11 @@ static int vertex_group_select_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_edit_object(C);
 
-	if(!ob)
+	if(!ob || ob->id.lib)
 		return OPERATOR_CANCELLED;
 
-	sel_verts_defgroup(ob, 1); /* runs countall() */
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	sel_verts_defgroup(ob, 1);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, ob->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1241,6 +1239,7 @@ void OBJECT_OT_vertex_group_select(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_select";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_select_exec;
 
 	/* flags */
@@ -1251,11 +1250,8 @@ static int vertex_group_deselect_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_edit_object(C);
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-
-	sel_verts_defgroup(ob, 0); /* runs countall() */
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	sel_verts_defgroup(ob, 0);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, ob->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -1267,6 +1263,7 @@ void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_deselect";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_deselect_exec;
 
 	/* flags */
@@ -1275,15 +1272,12 @@ void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot)
 
 static int vertex_group_copy_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 
-	if(!ob)
-		return OPERATOR_CANCELLED;
-
 	duplicate_defgroup(ob);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1295,6 +1289,7 @@ void OBJECT_OT_vertex_group_copy(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_copy";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_copy_exec;
 
 	/* flags */
@@ -1308,9 +1303,6 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *op)
     Base *base;
 	int retval= OPERATOR_CANCELLED;
 
-	if(!ob)
-		return retval;
-
     for(base=scene->base.first; base; base= base->next) {
         if(base->object->type==ob->type) {
             if(base->object!=ob && base->object->data==ob->data) {
@@ -1318,8 +1310,9 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *op)
                 BLI_duplicatelist(&base->object->defbase, &ob->defbase);
                 base->object->actdef= ob->actdef;
 
-                DAG_object_flush_update(scene, base->object, OB_RECALC_DATA);
-				WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, base->object);
+                DAG_id_flush_update(&base->object->id, OB_RECALC_DATA);
+				WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, base->object);
+				WM_event_add_notifier(C, NC_GEOM|ND_DATA, base->object->data);
 
 				retval = OPERATOR_FINISHED;
             }
@@ -1336,6 +1329,7 @@ void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_copy_to_linked";
 	
 	/* api callbacks */
+	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_copy_to_linked_exec;
 
 	/* flags */
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 220928cb79c..3ddc143b5a3 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -1018,7 +1018,6 @@ static void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 
 static void PE_update_selection(Scene *scene, Object *ob, int useflag)
 {
-	ParticleEditSettings *pset= PE_settings(scene);
 	PTCacheEdit *edit= PE_get_current(scene, ob);
 	HairKey *hkey;
 	POINT_P; KEY_K;
@@ -1156,7 +1155,7 @@ void PE_update_object(Scene *scene, Object *ob, int useflag)
 		point->flag &= ~PEP_EDIT_RECALC;
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 }
 
 /************************************************/
@@ -1235,7 +1234,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
 	}
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1283,7 +1282,7 @@ int PE_mouse_particles(bContext *C, short *mval, int extend)
 	for_mouse_hit_keys(&data, toggle_key_select, 1);  /* nearest only */
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1301,7 +1300,7 @@ static int select_first_exec(bContext *C, wmOperator *op)
 
 	PE_set_data(C, &data);
 	foreach_point(&data, select_root);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1334,7 +1333,7 @@ static int select_last_exec(bContext *C, wmOperator *op)
 
 	PE_set_data(C, &data);
 	foreach_point(&data, select_tip);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1374,7 +1373,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
 
 	for_mouse_hit_keys(&data, select_keys, 1);  /* nearest only */
 	PE_update_selection(data.scene, data.ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1429,7 +1428,7 @@ int PE_border_select(bContext *C, rcti *rect, int select)
 	for_mouse_hit_keys(&data, select_key, 0);
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1454,7 +1453,7 @@ int PE_circle_select(bContext *C, int selecting, short *mval, float rad)
 	for_mouse_hit_keys(&data, select_key, 0);
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1520,7 +1519,7 @@ int PE_lasso_select(bContext *C, short mcords[][2], short moves, short select)
 	}
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1554,7 +1553,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 	}
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1596,7 +1595,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
 	}
 
 	PE_update_selection(scene, ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1650,7 +1649,7 @@ static int select_less_exec(bContext *C, wmOperator *op)
 
 	PE_set_data(C, &data);
 	foreach_point(&data, select_less_keys);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1708,7 +1707,7 @@ static int select_more_exec(bContext *C, wmOperator *op)
 
 	PE_set_data(C, &data);
 	foreach_point(&data, select_more_keys);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -1796,7 +1795,7 @@ static int rekey_exec(bContext *C, wmOperator *op)
 	
 	recalc_lengths(data.edit);
 	PE_update_object(data.scene, data.ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -2091,7 +2090,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 	
 	recalc_lengths(data.edit);
 	PE_update_object(data.scene, data.ob, 1);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, data.ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -2180,8 +2179,8 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 	BKE_reportf(op->reports, RPT_INFO, "Remove %d double particles.", totremoved);
 
 	PE_update_object(scene, ob, 0);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -2358,8 +2357,8 @@ static int delete_exec(bContext *C, wmOperator *op)
 
 	PE_update_object(data.scene, data.ob, 0);
 
-	DAG_object_flush_update(data.scene, data.ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, data.ob);
+	DAG_id_flush_update(&data.ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
 
 	return OPERATOR_FINISHED;
 }
@@ -2512,8 +2511,8 @@ static int mirror_exec(bContext *C, wmOperator *op)
 	PE_mirror_x(scene, ob, 0);
 
 	update_world_cos(ob, edit);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -2593,11 +2592,11 @@ static int set_edit_mode_exec(bContext *C, wmOperator *op)
 void PARTICLE_OT_edit_type_set(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Set Brush";
+	ot->name= "Set Edit Type";
 	ot->idname= "PARTICLE_OT_edit_type_set";
 	
 	/* api callbacks */
-	ot->exec= set_brush_exec;
+	ot->exec= set_edit_mode_exec;
 	ot->invoke= WM_menu_invoke;
 	ot->poll= PE_poll;
 
@@ -2627,11 +2626,9 @@ static void brush_comb(PEData *data, float mat[][4], float imat[][4], int point_
 static void brush_cut(PEData *data, int pa_index)
 {
 	PTCacheEdit *edit = data->edit;
-	ParticleSystem *psys= edit->psys;
 	ARegion *ar= data->vc.ar;
 	Object *ob= data->ob;
 	ParticleEditSettings *pset= PE_settings(data->scene);
-	ParticleData *pa= &psys->particles[pa_index];
 	ParticleCacheKey *key= edit->pathcache[pa_index];
 	float rad2, cut_time= 1.0;
 	float x0, x1, v0, v1, o0, o1, xo0, xo1, d, dv;
@@ -3237,12 +3234,12 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 
 			update_world_cos(ob,edit);
 			psys_free_path_cache(NULL, edit);
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 		else
 			PE_update_object(scene, ob, 1);
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_SELECT, ob);
 		
 		bedit->lastmouse[0]= mouse[0];
 		bedit->lastmouse[1]= mouse[1];
@@ -3553,7 +3550,7 @@ void PE_undo_step(Scene *scene, int step)
 	}
 
 	PE_update_object(scene, OBACT, 0);
-	DAG_object_flush_update(scene, OBACT, OB_RECALC_DATA);
+	DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 }
 
 static void PTCacheUndo_number(Scene *scene, PTCacheEdit *edit, int nr)
@@ -3780,9 +3777,7 @@ static int particle_edit_toggle_poll(bContext *C)
 
 static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
-	PTCacheEdit *edit= PE_get_current(scene, ob);
 
 	if(!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 		ob->mode |= OB_MODE_PARTICLE_EDIT;
@@ -3795,7 +3790,7 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	return OPERATOR_FINISHED;
 }
@@ -3819,7 +3814,6 @@ void PARTICLE_OT_particle_edit_toggle(wmOperatorType *ot)
 
 static int clear_edited_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_active_object(C);
 	ParticleSystem *psys = psys_get_current(ob);
 	
@@ -3833,7 +3827,7 @@ static int clear_edited_exec(bContext *C, wmOperator *op)
 			psys->recalc |= PSYS_RECALC_RESET;
 
 			psys_reset(psys, PSYS_RESET_DEPSGRAPH);
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index d082e17cda3..870b66cdbbd 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -5184,7 +5184,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
 		toggle_paint_cursor(C, 1);
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_SCENE|ND_MODE, scene);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index f66a9fbc1ed..953a055c9e5 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -295,7 +295,7 @@ void make_vertexcol(Scene *scene, int shade)	/* single ob */
 	else
 		memset(me->mcol, 255, 4*sizeof(MCol)*me->totface);
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 	
 }
 
@@ -358,7 +358,7 @@ void clear_vpaint(Scene *scene, int selected)
 		}
 	}
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 }
 
 
@@ -468,7 +468,7 @@ void clear_wpaint_selectedfaces(Scene *scene)
 	MEM_freeN(indexar);
 	copy_wpaint_prev(wp, NULL, 0);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 }
 
 
@@ -923,7 +923,7 @@ void sample_wpaint(Scene *scene, ARegion *ar, View3D *v3d, int mode)
 					val= 0; // XXX pupmenu(str);
 					if(val>=0) {
 						ob->actdef= val+1;
-						DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+						DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 					}
 					MEM_freeN(str);
 				}
@@ -1049,7 +1049,7 @@ static int set_wpaint(bContext *C, wmOperator *op)		/* toggle */
 		* exit (exit needs doing regardless because we
 				* should redeform).
 		*/
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 	
 	if(ob->mode & OB_MODE_WEIGHT_PAINT) {
 		Object *par;
@@ -1446,7 +1446,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 			
 	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
-	DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(ob->data, OB_RECALC_DATA);
 	ED_region_tag_redraw(vc->ar);
 }
 
@@ -1478,7 +1478,7 @@ static void wpaint_stroke_done(bContext *C, struct PaintStroke *stroke)
 		}
 	}
 	
-	DAG_object_flush_update(CTX_data_scene(C), ob, OB_RECALC_DATA);
+	DAG_id_flush_update(ob->data, OB_RECALC_DATA);
 	
 	MEM_freeN(wpd);
 }
@@ -1564,7 +1564,7 @@ static int set_vpaint(bContext *C, wmOperator *op)		/* toggle */
 	
 	if (me)
 		/* update modifier stack for mapping requirements */
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&me->id, OB_RECALC_DATA);
 	
 	WM_event_add_notifier(C, NC_SCENE|ND_MODE, scene);
 	
@@ -1735,7 +1735,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 			
 	ED_region_tag_redraw(vc->ar);
 			
-	DAG_object_flush_update(vc->scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(ob->data, OB_RECALC_DATA);
 }
 
 static void vpaint_stroke_done(bContext *C, struct PaintStroke *stroke)
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 2977d07d845..b7a3df563ea 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -372,6 +372,10 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
 			}*/
 			ED_area_tag_refresh(sa);
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_DOPESHEET)
+				ED_area_tag_redraw(sa);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 954a52c54aa..8cdc6b0cd2b 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -260,7 +260,6 @@ void OBJECT_OT_material_slot_remove(wmOperatorType *ot)
 
 static int material_slot_assign_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 
 	if(!ob)
@@ -298,8 +297,8 @@ static int material_slot_assign_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-    DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-    WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+    DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+    WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	
 	return OPERATOR_FINISHED;
 }
@@ -377,7 +376,7 @@ static int material_slot_de_select(bContext *C, int select)
 		}
 	}
 
-    WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob);
+    WM_event_add_notifier(C, NC_GEOM|ND_SELECT, ob->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -648,7 +647,7 @@ static int new_particle_settings_exec(bContext *C, wmOperator *op)
 	psys_check_boid_data(psys);
 
 	DAG_scene_sort(scene);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
@@ -695,7 +694,7 @@ static int new_particle_target_exec(bContext *C, wmOperator *op)
 	BLI_addtail(&psys->targets, pt);
 
 	DAG_scene_sort(scene);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
@@ -742,7 +741,7 @@ static int remove_particle_target_exec(bContext *C, wmOperator *op)
 		pt->flag |= PTARGET_CURRENT;
 
 	DAG_scene_sort(scene);
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
@@ -766,7 +765,6 @@ void PARTICLE_OT_remove_target(wmOperatorType *ot)
 
 static int target_move_up_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem);
 	ParticleSystem *psys= ptr.data;
 	Object *ob = ptr.id.data;
@@ -781,7 +779,7 @@ static int target_move_up_exec(bContext *C, wmOperator *op)
 			BLI_remlink(&psys->targets, pt);
 			BLI_insertlink(&psys->targets, pt->prev->prev, pt);
 
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 			break;
 		}
@@ -806,7 +804,6 @@ void PARTICLE_OT_target_move_up(wmOperatorType *ot)
 
 static int target_move_down_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem);
 	ParticleSystem *psys= ptr.data;
 	Object *ob = ptr.id.data;
@@ -820,7 +817,7 @@ static int target_move_down_exec(bContext *C, wmOperator *op)
 			BLI_remlink(&psys->targets, pt);
 			BLI_insertlink(&psys->targets, pt->next, pt);
 
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 			break;
 		}
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 71f8642afd4..5d1dbe47345 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -335,7 +335,6 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 				case ND_TRANSFORM:
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
-				case ND_GEOM_SELECT:
 				case ND_CONSTRAINT:
 					ED_area_tag_redraw(sa);
 					break;
@@ -346,6 +345,13 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_GEOM:
+			switch(wmn->data) {
+				case ND_SELECT:
+					ED_area_tag_redraw(sa);
+					break;
+			}
+			break;
 		case NC_MATERIAL:
 			ED_area_tag_redraw(sa);
 			
@@ -358,14 +364,15 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 			}					
 			break;
 		case NC_WORLD:
-			ED_area_tag_redraw(sa);
-			sbuts->preview= 1;
 		case NC_LAMP:
-			ED_area_tag_redraw(sa);
-			sbuts->preview= 1;
 		case NC_TEXTURE:
 			ED_area_tag_redraw(sa);
 			sbuts->preview= 1;
+			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_PROPERTIES)
+				ED_area_tag_redraw(sa);
+			break;
 	}
 
 	if(wmn->data == ND_KEYS)
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index 48890d6cac2..7e0dfe94432 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -321,11 +321,11 @@ static void console_main_area_listener(ScrArea *sa, wmNotifier *wmn)
 
 	/* context changes */
 	switch(wmn->category) {
-		case NC_CONSOLE:
-			if(wmn->data == ND_CONSOLE) { /* generic redraw request */
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_CONSOLE) { /* generic redraw request */
 				ED_area_tag_redraw(sa);
 			}
-			else if(wmn->data == ND_CONSOLE_REPORT && sc->type==CONSOLE_TYPE_REPORT) {
+			else if(wmn->data == ND_SPACE_CONSOLE_REPORT && sc->type==CONSOLE_TYPE_REPORT) {
 				/* redraw also but only for report view, could do less redraws by checking the type */
 				ED_area_tag_redraw(sa);
 			}
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index a06c1663d8e..e1a6e346ce2 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -190,9 +190,9 @@ static int file_border_select_exec(bContext *C, wmOperator *op)
 	BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
 	
 	if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val )) {
-		WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	} else {
-		WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 	}
 	return OPERATOR_FINISHED;
 }
@@ -239,12 +239,12 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	file_deselect_all(sfile);
 
 	if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val ))
-		WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	else
-		WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 
 	WM_event_add_mousemove(C); /* for directory changes */
-	WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -322,7 +322,7 @@ static int bookmark_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		BLI_cleanup_dir(G.sce, params->dir);
 		file_change_dir(sfile);				
 
-		WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	}
 	
 	return OPERATOR_FINISHED;
@@ -587,7 +587,7 @@ int file_parent_exec(bContext *C, wmOperator *unused)
 			BLI_parent_dir(sfile->params->dir);
 			BLI_cleanup_dir(G.sce, sfile->params->dir);
 			file_change_dir(sfile);
-			WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+			WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 		}
 	}		
 	
@@ -614,7 +614,7 @@ int file_refresh_exec(bContext *C, wmOperator *unused)
 	
 	file_change_dir(sfile);
 
-	WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	return OPERATOR_FINISHED;
 
@@ -645,7 +645,7 @@ int file_previous_exec(bContext *C, wmOperator *unused)
 
 		file_change_dir(sfile);
 	}
-	WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -676,7 +676,7 @@ int file_next_exec(bContext *C, wmOperator *unused)
 
 		file_change_dir(sfile);
 	}		
-	WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -705,7 +705,7 @@ int file_directory_new_exec(bContext *C, wmOperator *unused)
 			BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), FILE_MAX);
 		} 
 	}		
-	WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -754,7 +754,7 @@ int file_directory_exec(bContext *C, wmOperator *unused)
 		BLI_cleanup_dir(G.sce, sfile->params->dir);
 		BLI_add_slash(sfile->params->dir);
 		file_change_dir(sfile);
-		WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	}		
 	
 
@@ -769,7 +769,7 @@ int file_filename_exec(bContext *C, wmOperator *unused)
 		if (file_select_match(sfile, sfile->params->file))
 		{
 			sfile->params->file[0] = '\0';
-			WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+			WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 		}
 	}		
 
@@ -796,7 +796,7 @@ int file_hidedot_exec(bContext *C, wmOperator *unused)
 		sfile->params->flag ^= FILE_HIDE_DOT;
 		filelist_free(sfile->files);
 		sfile->params->active_file = -1;
-		WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	}
 	
 	return OPERATOR_FINISHED;
@@ -958,7 +958,7 @@ int file_delete_exec(bContext *C, wmOperator *op)
 	file = filelist_file(sfile->files, sfile->params->active_file);
 	BLI_make_file_string(G.sce, str, sfile->params->dir, file->relname);
 	BLI_delete(str, 0, 0);	
-	WM_event_add_notifier(C, NC_FILE | ND_FILELIST, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	
 	return OPERATOR_FINISHED;
 
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 793f7cf8815..722fa475727 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -212,14 +212,14 @@ static void file_listener(ScrArea *sa, wmNotifier *wmn)
 
 	/* context changes */
 	switch(wmn->category) {
-		case NC_FILE:
+		case NC_SPACE:
 			switch (wmn->data) {
-				case ND_FILELIST:
+				case ND_SPACE_FILE_LIST:
 					if (sfile->files) filelist_free(sfile->files);
 					ED_area_tag_refresh(sa);
 					ED_area_tag_redraw(sa);
 					break;
-				case ND_PARAMS:
+				case ND_SPACE_FILE_PARAMS:
 					ED_area_tag_refresh(sa);
 					ED_area_tag_redraw(sa);
 					break;
@@ -249,12 +249,12 @@ static void file_main_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch(wmn->category) {
-		case NC_FILE:
+		case NC_SPACE:
 			switch (wmn->data) {
-				case ND_FILELIST:
+				case ND_SPACE_FILE_LIST:
 					ED_region_tag_redraw(ar);
 					break;
-				case ND_PARAMS:
+				case ND_SPACE_FILE_PARAMS:
 					ED_region_tag_redraw(ar);
 					break;
 			}
@@ -470,9 +470,9 @@ static void file_ui_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch(wmn->category) {
-		case NC_FILE:
+		case NC_SPACE:
 			switch (wmn->data) {
-				case ND_FILELIST:
+				case ND_SPACE_FILE_LIST:
 					ED_region_tag_redraw(ar);
 					break;
 			}
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index 3717ccc8244..8887d464f30 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -423,6 +423,10 @@ static void graph_listener(ScrArea *sa, wmNotifier *wmn)
 			}*/
 			ED_area_tag_refresh(sa);
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_GRAPH)
+				ED_area_tag_redraw(sa);
+			break;
 		default:
 			if(wmn->data==ND_KEYS)
 				ED_area_tag_refresh(sa);
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index bb647e68917..c57bc5773b0 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -295,10 +295,14 @@ static void image_listener(ScrArea *sa, wmNotifier *wmn)
 		case NC_IMAGE:	
 			ED_area_tag_redraw(sa);
 			break;
-		case NC_OBJECT:
+		case NC_SPACE:	
+			if(wmn->data == ND_SPACE_IMAGE)
+				ED_area_tag_redraw(sa);
+			break;
+		case NC_GEOM:
 			switch(wmn->data) {
-				case ND_GEOM_SELECT:
-				case ND_GEOM_DATA:
+				case ND_DATA:
+				case ND_SELECT:
 					ED_area_tag_redraw(sa);
 					break;
 			}
@@ -625,7 +629,7 @@ void ED_space_image_set(bContext *C, SpaceImage *sima, Scene *scene, Object *obe
 
 	if(C) {
 		if(obedit)
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+			WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 		ED_area_tag_redraw(CTX_wm_area(C));
 	}
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index b6f9cbeabb5..d3f9c97205c 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -167,8 +167,9 @@ static void info_header_listener(ARegion *ar, wmNotifier *wmn)
 			if(wmn->data==ND_RENDER_RESULT)
 				ED_region_tag_redraw(ar);
 			break;
-		case NC_INFO:
-			ED_region_tag_redraw(ar);
+		case NC_SPACE:	
+			if(wmn->data == ND_SPACE_INFO)
+				ED_region_tag_redraw(ar);
 			break;
 	}
 	
diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c
index c4f929274c7..89d4e7cddf2 100644
--- a/source/blender/editors/space_nla/space_nla.c
+++ b/source/blender/editors/space_nla/space_nla.c
@@ -488,6 +488,10 @@ static void nla_listener(ScrArea *sa, wmNotifier *wmn)
 			}*/
 			ED_area_tag_refresh(sa);
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_NLA)
+				ED_area_tag_redraw(sa);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 2233a4db3a0..d3a445b18c0 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -163,6 +163,15 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
 			if(wmn->data==ND_NODES)
 				ED_area_tag_refresh(sa);
 			break;
+		case NC_TEXT:
+			/* pynodes */
+			if(wmn->data==ND_SHADING)
+				ED_area_tag_refresh(sa);
+			break;
+		case NC_SPACE:
+			if(wmn->data==ND_SPACE_NODE)
+				ED_area_tag_refresh(sa);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index a9a9a5dab5f..a3b47d505fd 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -1994,7 +1994,7 @@ static int tree_element_active_defgroup(bContext *C, Scene *scene, TreeElement *
 	ob= (Object *)tselem->id;
 	if(set) {
 		ob->actdef= te->index+1;
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
 	}
 	else {
@@ -2121,7 +2121,7 @@ static int tree_element_active_psys(bContext *C, Scene *scene, TreeElement *te,
 	if(set) {
 		Object *ob= (Object *)tselem->id;
 		
-		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
+		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
 		
 // XXX		extern_set_butspace(F7KEY, 0);
 	}
@@ -4682,7 +4682,7 @@ static void restrictbutton_modifier_cb(bContext *C, void *poin, void *poin2)
 	Scene *scene = (Scene *)poin;
 	Object *ob = (Object *)poin2;
 	
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	object_handle_update(scene, ob);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index f57445a32f1..5058a167a29 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -137,6 +137,10 @@ static void outliner_main_area_listener(ARegion *ar, wmNotifier *wmn)
 			/* all actions now, todo: check outliner view mode? */
 			ED_region_tag_redraw(ar);
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_OUTLINER)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 	
 }
@@ -190,6 +194,10 @@ static void outliner_header_area_listener(ARegion *ar, wmNotifier *wmn)
 			if(wmn->data == ND_KEYINGSET)
 				ED_region_tag_redraw(ar);
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_OUTLINER)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 084416f3a60..26ffd88ae67 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -219,6 +219,10 @@ static void sequencer_main_area_listener(ARegion *ar, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_SEQUENCER)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
@@ -241,6 +245,10 @@ static void sequencer_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch(wmn->category) {
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_SEQUENCER)
+				ED_region_tag_redraw(ar);
+			break;
 		
 	}
 }
@@ -293,6 +301,7 @@ void ED_spacetype_sequencer(void)
 	
 	art->init= sequencer_header_area_init;
 	art->draw= sequencer_header_area_draw;
+	art->listener= sequencer_main_area_listener;
 	
 	BLI_addhead(&st->regiontypes, art);
 	
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index 4394fbfe1f5..0d08490cfb0 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -143,6 +143,10 @@ static void text_listener(ScrArea *sa, wmNotifier *wmn)
 				ED_area_tag_redraw(sa);
 
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_TEXT)
+				ED_area_tag_redraw(sa);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 14b72e13856..a8ef72e3273 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -549,7 +549,6 @@ static int refresh_pyconstraints_exec(bContext *C, wmOperator *op)
 {
 #ifndef DISABLE_PYTHON
 	Text *text= CTX_data_edit_text(C);
-	Scene *scene= CTX_data_scene(C);
 	Object *ob;
 	bConstraint *con;
 	short update;
@@ -579,7 +578,7 @@ static int refresh_pyconstraints_exec(bContext *C, wmOperator *op)
 		}
 		
 		if(update) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 #endif
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index ce6846a4489..8f7486f81d9 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -260,6 +260,11 @@ static void time_main_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch(wmn->category) {
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_TIME)
+				ED_region_tag_redraw(ar);
+			break;
+
 		case NC_ANIMATION:
 			ED_region_tag_redraw(ar);
 			break;
@@ -293,6 +298,7 @@ static void time_header_area_listener(ARegion *ar, wmNotifier *wmn)
 			if(wmn->data==ND_ANIMPLAY)
 				ED_region_tag_redraw(ar);
 			break;
+
 		case NC_SCENE:
 			switch (wmn->data) {
 				case ND_FRAME:
@@ -300,6 +306,11 @@ static void time_header_area_listener(ARegion *ar, wmNotifier *wmn)
 					ED_region_tag_redraw(ar);
 				break;
 			}
+
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_TIME)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 97c5549e1ea..2250c2e7718 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -452,16 +452,24 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
 				case ND_TRANSFORM:
-				case ND_GEOM_SELECT:
-				case ND_GEOM_DATA:
 				case ND_DRAW:
 				case ND_MODIFIER:
 				case ND_CONSTRAINT:
 				case ND_KEYS:
-				case ND_PARTICLE:
+				case ND_PARTICLE_SELECT:
+				case ND_PARTICLE_DATA:
 					ED_region_tag_redraw(ar);
 					break;
 			}
+			break;
+		case NC_GEOM:
+			switch(wmn->data) {
+				case ND_DATA:
+				case ND_SELECT:
+					ED_region_tag_redraw(ar);
+					break;
+			}
+			break;
 		case NC_GROUP:
 			/* all group ops for now */
 			ED_region_tag_redraw(ar);
@@ -483,6 +491,10 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
 			 * more context than just the region */
 			ED_region_tag_redraw(ar);
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_VIEW3D)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
@@ -528,6 +540,10 @@ static void view3d_header_area_listener(ARegion *ar, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_VIEW3D)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
@@ -576,13 +592,24 @@ static void view3d_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
 				case ND_TRANSFORM:
-				case ND_GEOM_SELECT:
-				case ND_GEOM_DATA:
 				case ND_DRAW:
 				case ND_KEYS:
 					ED_region_tag_redraw(ar);
 					break;
 			}
+			break;
+		case NC_GEOM:
+			switch(wmn->data) {
+				case ND_DATA:
+				case ND_SELECT:
+					ED_region_tag_redraw(ar);
+					break;
+			}
+			break;
+		case NC_SPACE:
+			if(wmn->data == ND_SPACE_VIEW3D)
+				ED_region_tag_redraw(ar);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 7c305d59866..c854de8e54d 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -660,7 +660,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 		return; /* no notifier! */
 		
 	case B_OBJECTPANEL:
-		DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+		DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 		break;
 		
 	case B_OBJECTPANELROT:
@@ -668,7 +668,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 			ob->rot[0]= M_PI*tfp->ob_eul[0]/180.0;
 			ob->rot[1]= M_PI*tfp->ob_eul[1]/180.0;
 			ob->rot[2]= M_PI*tfp->ob_eul[2]/180.0;
-			DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+			DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 		}
 		break;
 
@@ -706,7 +706,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 				VECCOPY(ob->size, tfp->ob_scale);
 				
 			}
-			DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+			DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 		}
 		break;
 
@@ -752,14 +752,14 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 			/* prevent multiple B_OBJECTPANELDIMS events to keep scaling, cycling with TAB on buttons can cause that */
 			VECCOPY(tfp->ob_dims, old_dims);
 			
-			DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+			DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 		}
 		break;
 	
 	case B_OBJECTPANELMEDIAN:
 		if(ob) {
 			v3d_editvertex_buts(C, NULL, v3d, ob, 1.0);
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 		break;
 		
@@ -770,7 +770,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 				ob->parent= NULL;
 			else {
 				DAG_scene_sort(scene);
-				DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+				DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 			}
 		}
 		break;
@@ -847,7 +847,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 	case B_ARMATUREPANEL2:
 		{
 			ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK);
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 		break;
 	case B_TRANSFORMSPACEADD:
@@ -900,7 +900,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 				int a;
 				for(a=0; a<me->totvert; a++)
 					remove_vert_defgroup (ob, defGroup, a);
-				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			}
 		}
 		break;
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 305b6956037..2283d36e018 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -1725,7 +1725,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 				em->selectmode= SCE_SELECT_VERTEX;
 			ts->selectmode= em->selectmode;
 			EM_selectmode_set(em);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 			ED_undo_push(C, "Selectmode Set: Vertex");
 		}
 		break;
@@ -1739,7 +1739,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 			}
 			ts->selectmode= em->selectmode;
 			EM_selectmode_set(em);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 			ED_undo_push(C, "Selectmode Set: Edge");
 		}
 		break;
@@ -1753,7 +1753,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 			}
 			ts->selectmode= em->selectmode;
 			EM_selectmode_set(em);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 			ED_undo_push(C, "Selectmode Set: Face");
 		}
 		break;	
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 7743ede399b..5c6a22f5157 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1359,7 +1359,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 			vc.em= me->edit_mesh;
 			do_mesh_box_select(&vc, &rect, (val==LEFTMOUSE));
 //			if (EM_texFaceCheck())
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 			
 		}
 		else if(ELEM(obedit->type, OB_CURVE, OB_SURF)) {
@@ -1802,7 +1802,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 
 		if(CTX_data_edit_object(C)) {
 			obedit_circle_select(&vc, selecting, mval, (float)radius);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obact);
+			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
 		}
 		else
 			return PE_circle_select(C, selecting, mval, (float)radius);
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 335bc2c9e56..2e5696170e2 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -106,7 +106,7 @@ static void special_transvert_update(Scene *scene, Object *obedit)
 	
 	if(obedit) {
 		
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 		
 		if(obedit->type==OB_MESH) {
 			Mesh *me= obedit->data;
@@ -514,7 +514,7 @@ static int snap_sel_to_grid(bContext *C, wmOperator *op)
 				
 				/* auto-keyframing */
 // XXX				autokeyframe_pose_cb_func(ob, TFM_TRANSLATION, 0);
-				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			}
 			else {
 				ob->recalc |= OB_RECALC_OB;
@@ -640,7 +640,7 @@ static int snap_sel_to_curs(bContext *C, wmOperator *op)
 				
 				/* auto-keyframing */
 // XXX				autokeyframe_pose_cb_func(ob, TFM_TRANSLATION, 0);
-				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			}
 			else {
 				ob->recalc |= OB_RECALC_OB;
@@ -1028,7 +1028,7 @@ static int snap_selected_to_center(bContext *C, wmOperator *op)
 				/* auto-keyframing */
 				ob->pose->flag |= POSE_DO_UNLOCK;
 // XXX				autokeyframe_pose_cb_func(ob, TFM_TRANSLATION, 0);
-				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			}
 			else {
 				ob->recalc |= OB_RECALC_OB;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index f0de28476f0..370e98ebd07 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -333,7 +333,7 @@ static void viewRedrawForce(bContext *C, TransInfo *t)
 		else force_draw(0);
 #endif
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, t->obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, t->obedit->data);
 	}
 }
 
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 302d9b675a0..0fce9592d1d 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4722,9 +4722,9 @@ void special_aftertrans_update(TransInfo *t)
 				ob->ctime= -1234567.0f;
 				
 				if (ob->pose || ob_get_key(ob))
-					DAG_object_flush_update(scene, ob, OB_RECALC);
+					DAG_id_flush_update(&ob->id, OB_RECALC);
 				else
-					DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+					DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 			}
 			
 			/* Do curve cleanups? */
@@ -4748,7 +4748,7 @@ void special_aftertrans_update(TransInfo *t)
 			}
 #endif // XXX old animation system
 			
-			DAG_object_flush_update(scene, OBACT, OB_RECALC_DATA);
+			DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 		}
 #if 0 // XXX future of this is still not clear
 		else if (ac.datatype == ANIMCONT_GPENCIL) {
@@ -4912,15 +4912,15 @@ void special_aftertrans_update(TransInfo *t)
 		/* automatic inserting of keys and unkeyed tagging - only if transform wasn't cancelled (or TFM_DUMMY) */
 		if (!cancelled && (t->mode != TFM_DUMMY)) {
 			autokeyframe_pose_cb_func(t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
-			DAG_object_flush_update(t->scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 		else if (arm->flag & ARM_DELAYDEFORM) {
 			/* old optimize trick... this enforces to bypass the depgraph */
-			DAG_object_flush_update(t->scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			ob->recalc= 0;	// is set on OK position already by recalcData()
 		}
 		else
-			DAG_object_flush_update(t->scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 		//if (t->mode==TFM_BONESIZE || t->mode==TFM_BONE_ENVELOPE)
 		//	allqueue(REDRAWBUTSEDIT, 0);
@@ -4948,7 +4948,7 @@ void special_aftertrans_update(TransInfo *t)
 				/* Creates troubles for moving animated objects without */
 				/* autokey though, probably needed is an anim sys override? */
 				/* Please remove if some other solution is found. -jahka */
-				DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+				DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 
 				/* Set autokey if necessary */
 				if (!cancelled)
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 0f715f1d35a..0b7029adde0 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -283,7 +283,7 @@ static void animedit_refresh_id_tags (Scene *scene, ID *id)
 			case ID_OB:
 			{
 				Object *ob= (Object *)id;
-				DAG_object_flush_update(scene, ob, OB_RECALC_DATA);  /* sets recalc flags */
+				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 			}
 				break;
 		}
@@ -621,7 +621,7 @@ void recalcData(TransInfo *t)
 			Curve *cu= t->obedit->data;
 			Nurb *nu= cu->editnurb->first;
 
-			DAG_object_flush_update(scene, t->obedit, OB_RECALC_DATA);  /* sets recalc flags */
+			DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
 
 			if (t->state == TRANS_CANCEL) {
 				while(nu) {
@@ -641,7 +641,7 @@ void recalcData(TransInfo *t)
 		}
 		else if(t->obedit->type==OB_LATTICE) {
 			Lattice *la= t->obedit->data;
-			DAG_object_flush_update(scene, t->obedit, OB_RECALC_DATA);  /* sets recalc flags */
+			DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
 
 			if(la->editlatt->flag & LT_OUTSIDE) outside_lattice(la->editlatt);
 		}
@@ -653,7 +653,7 @@ void recalcData(TransInfo *t)
 				if(sima->flag & SI_LIVE_UNWRAP)
 					ED_uvedit_live_unwrap_re_solve();
 
-				DAG_object_flush_update(scene, t->obedit, OB_RECALC_DATA);
+				DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);
 			} else {
 				EditMesh *em = ((Mesh*)t->obedit->data)->edit_mesh;
 				/* mirror modifier clipping? */
@@ -668,7 +668,7 @@ void recalcData(TransInfo *t)
 				if((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR))
 					editmesh_apply_to_mirror(t);
 
-				DAG_object_flush_update(scene, t->obedit, OB_RECALC_DATA);  /* sets recalc flags */
+				DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
 
 				recalc_editnormals(em);
 			}
@@ -752,7 +752,7 @@ void recalcData(TransInfo *t)
 
 		}
 		else
-			DAG_object_flush_update(scene, t->obedit, OB_RECALC_DATA);  /* sets recalc flags */
+			DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
 	}
 	else if( (t->flag & T_POSE) && t->poseobj) {
 		Object *ob= t->poseobj;
@@ -772,7 +772,7 @@ void recalcData(TransInfo *t)
 
 		/* old optimize trick... this enforces to bypass the depgraph */
 		if (!(arm->flag & ARM_DELAYDEFORM)) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);  /* sets recalc flags */
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
 		}
 		else
 			where_is_pose(scene, ob);
diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c
index 17a1e0b6cdb..2d73a9f1d25 100644
--- a/source/blender/editors/util/editmode_undo.c
+++ b/source/blender/editors/util/editmode_undo.c
@@ -267,7 +267,7 @@ void undo_editmode_step(bContext *C, int step)
 		}
 	}
 
-//	DAG_object_flush_update(G.scene, obedit, OB_RECALC_DATA);
+//	DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 	/* XXX notifiers */
 }
 
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index bb5a8b1dd40..a44421e8145 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -139,7 +139,7 @@ void ED_uvedit_assign_image(Scene *scene, Object *obedit, Image *ima, Image *pre
 
 	/* and update depdency graph */
 	if(update)
-		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 }
@@ -169,8 +169,8 @@ void ED_uvedit_set_tile(bContext *C, Scene *scene, Object *obedit, Image *ima, i
 			tf->tile= curtile; /* set tile index */
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	BKE_mesh_end_editmesh(obedit->data, em);
 }
 
@@ -1058,8 +1058,8 @@ static void weld_align_uv(bContext *C, int tool)
 		}
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 }
@@ -1279,8 +1279,8 @@ static int stitch_exec(bContext *C, wmOperator *op)
 		MEM_freeN(uv_average);
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1336,7 +1336,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1406,7 +1406,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1710,8 +1710,8 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
 		}
 	}
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 	
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_PASS_THROUGH|OPERATOR_FINISHED;
@@ -1834,8 +1834,8 @@ static int select_linked_exec(bContext *C, wmOperator *op)
 	uvedit_pixel_to_float(sima, limit, 0.05f);
 	select_linked(scene, ima, em, limit, NULL, extend);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1890,8 +1890,8 @@ static int unlink_selection_exec(bContext *C, wmOperator *op)
 		}
 	}
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -2167,7 +2167,7 @@ static int border_select_exec(bContext *C, wmOperator *op)
 			}
 		}
 
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 		
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return OPERATOR_FINISHED;
@@ -2262,7 +2262,7 @@ int circle_select_exec(bContext *C, wmOperator *op)
 	if(select) EM_select_flush(em);
 	else EM_deselect_flush(em);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -2567,8 +2567,8 @@ static int snap_selection_exec(bContext *C, wmOperator *op)
 	if(!change)
 		return OPERATOR_CANCELLED;
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	return OPERATOR_FINISHED;
 }
@@ -2627,7 +2627,7 @@ static int pin_exec(bContext *C, wmOperator *op)
 		}
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -2672,7 +2672,7 @@ static int select_pinned_exec(bContext *C, wmOperator *op)
 		}
 	}
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -2704,7 +2704,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
 		EM_hide_mesh(em, swap);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return OPERATOR_FINISHED;
@@ -2812,7 +2812,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 	}
 	
 	EM_validate_selections(em);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -2847,7 +2847,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
 	/* call the mesh function if we are in mesh sync sel */
 	if(ts->uv_flag & UV_SYNC_SELECTION) {
 		EM_reveal_mesh(em);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return OPERATOR_FINISHED;
@@ -2943,7 +2943,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
 				EM_select_face(efa, 1);
 	}
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index c4f4704e47e..c18c9f8e022 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -263,8 +263,8 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, int interact
 
 		ms->lasttime = PIL_check_seconds_timer();
 
-		DAG_object_flush_update(ms->scene, ms->obedit, OB_RECALC_DATA);
-		WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ms->obedit);
+		DAG_id_flush_update(ms->obedit->data, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, ms->obedit->data);
 	}
 }
 
@@ -286,8 +286,8 @@ static void minimize_stretch_exit(bContext *C, wmOperator *op, int cancel)
 	param_stretch_end(ms->handle);
 	param_delete(ms->handle);
 
-	DAG_object_flush_update(ms->scene, ms->obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ms->obedit);
+	DAG_id_flush_update(ms->obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ms->obedit->data);
 
 	MEM_freeN(ms);
 	op->customdata= NULL;
@@ -413,8 +413,8 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
 	param_flush(handle);
 	param_delete(handle);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -446,8 +446,8 @@ static int average_islands_scale_exec(bContext *C, wmOperator *op)
 	param_flush(handle);
 	param_delete(handle);
 	
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -810,8 +810,8 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 
 	param_delete(handle);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -943,8 +943,8 @@ static int from_view_exec(bContext *C, wmOperator *op)
 
 	uv_map_clip_correct(em, op);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1010,8 +1010,8 @@ static int reset_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1098,8 +1098,8 @@ static int sphere_project_exec(bContext *C, wmOperator *op)
 
 	uv_map_clip_correct(em, op);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1170,8 +1170,8 @@ static int cylinder_project_exec(bContext *C, wmOperator *op)
 
 	uv_map_clip_correct(em, op);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
@@ -1257,8 +1257,8 @@ static int cube_project_exec(bContext *C, wmOperator *op)
 
 	uv_map_clip_correct(em, op);
 
-	DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
+	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
 	return OPERATOR_FINISHED;
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index 7bab7947843..3f4b75508fe 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -48,29 +48,17 @@
 
 static void rna_Armature_update_data(bContext *C, PointerRNA *ptr)
 {
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
 	ID *id= ptr->id.data;
-	Object *ob;
 
-	for(ob=bmain->object.first; ob; ob= ob->id.next) {
-		if(ob->data == id) {
-			/* XXX this will loop over all objects again (slow) */
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-		}
-	}
+	DAG_id_flush_update(id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
 
 static void rna_Armature_redraw_data(bContext *C, PointerRNA *ptr)
 {
-	Main *bmain= CTX_data_main(C);
 	ID *id= ptr->id.data;
-	Object *ob;
 
-	for(ob=bmain->object.first; ob; ob= ob->id.next)
-		if(ob->data == id)
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
 
 static void rna_bone_layer_set(short *layer, const int *values)
diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c
index 0c5565e253a..8002aa89313 100644
--- a/source/blender/makesrna/intern/rna_boid.c
+++ b/source/blender/makesrna/intern/rna_boid.c
@@ -41,6 +41,7 @@
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 
+#include "WM_api.h"
 #include "WM_types.h"
 
 EnumPropertyItem boidrule_type_items[] ={
@@ -82,14 +83,15 @@ static void rna_Boids_reset(bContext *C, PointerRNA *ptr)
 		
 		psys->recalc = PSYS_RECALC_RESET;
 
-		if(ob) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-		}
+		if(ob)
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		part = ptr->id.data;
 		psys_flush_particle_settings(scene, part, PSYS_RECALC_RESET);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 static void rna_Boids_reset_deps(bContext *C, PointerRNA *ptr)
 {
@@ -102,15 +104,16 @@ static void rna_Boids_reset_deps(bContext *C, PointerRNA *ptr)
 		
 		psys->recalc = PSYS_RECALC_RESET;
 
-		if(ob) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-		}
+		if(ob)
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		part = ptr->id.data;
 		psys_flush_particle_settings(scene, part, PSYS_RECALC_RESET);
 		DAG_scene_sort(scene);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 
 static StructRNA* rna_BoidRule_refine(struct PointerRNA *ptr)
@@ -247,12 +250,12 @@ static void rna_def_boidrule_goal(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "ob");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Object", "Goal object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset_deps");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset_deps");
 
 	prop= RNA_def_property(srna, "predict", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_GOAL_AVOID_PREDICT);
 	RNA_def_property_ui_text(prop, "Predict", "Predict target movement.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 static void rna_def_boidrule_avoid(BlenderRNA *brna)
@@ -268,17 +271,17 @@ static void rna_def_boidrule_avoid(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "ob");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Object", "Object to avoid.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset_deps");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset_deps");
 
 	prop= RNA_def_property(srna, "predict", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_GOAL_AVOID_PREDICT);
 	RNA_def_property_ui_text(prop, "Predict", "Predict target movement.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "fear_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Fear factor", "Avoid object if danger from it is above this threshol.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 static void rna_def_boidrule_avoid_collision(BlenderRNA *brna)
@@ -292,17 +295,17 @@ static void rna_def_boidrule_avoid_collision(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "boids", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_ACOLL_WITH_BOIDS);
 	RNA_def_property_ui_text(prop, "Boids", "Avoid collision with other boids.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "deflectors", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_ACOLL_WITH_DEFLECTORS);
 	RNA_def_property_ui_text(prop, "Deflectors", "Avoid collision with deflector objects.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "look_ahead", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Look ahead", "Time to look ahead in seconds.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 static void rna_def_boidrule_follow_leader(BlenderRNA *brna)
@@ -317,22 +320,22 @@ static void rna_def_boidrule_follow_leader(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "ob");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Object", "Follow this object instead of a boid.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset_deps");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset_deps");
 
 	prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Distance", "Distance behind leader to follow.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "queue_size", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Queue Size", "How many boids in a line.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "line", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_LEADER_IN_LINE);
 	RNA_def_property_ui_text(prop, "Line", "Follow leader in a line.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 static void rna_def_boidrule_average_speed(BlenderRNA *brna)
@@ -346,17 +349,17 @@ static void rna_def_boidrule_average_speed(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "wander", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Wander", "How fast velocity's direction is randomized.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "level", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Level", "How much velocity's z-component is kept constant.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Speed", "Percentage of maximum speed.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 static void rna_def_boidrule_fight(BlenderRNA *brna)
@@ -370,12 +373,12 @@ static void rna_def_boidrule_fight(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Fight Distance", "Attack boids at max this distance.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "flee_distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Flee Distance", "Flee to this distance.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 static void rna_def_boidrule(BlenderRNA *brna)
@@ -405,12 +408,12 @@ static void rna_def_boidrule(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "in_air", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BOIDRULE_IN_AIR);
 	RNA_def_property_ui_text(prop, "In Air", "Use rule when boid is flying.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 	
 	prop= RNA_def_property(srna, "on_land", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BOIDRULE_ON_LAND);
 	RNA_def_property_ui_text(prop, "On Land", "Use rule when boid is on land.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 	
 	//prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE);
 	//RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Expanded);
@@ -457,17 +460,17 @@ static void rna_def_boidstate(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "rule_fuzziness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Rule Fuzzines", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "volume", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Volume", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 10.0);
 	RNA_def_property_ui_text(prop, "Falloff", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 static void rna_def_boid_settings(BlenderRNA *brna)
 {
@@ -480,17 +483,17 @@ static void rna_def_boid_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "landing_smoothness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 10.0);
 	RNA_def_property_ui_text(prop, "Landing Smoothness", "How smoothly the boids land.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "banking", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 2.0);
 	RNA_def_property_ui_text(prop, "Banking", "Amount of rotation around velocity vector on turns.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "height", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 2.0);
 	RNA_def_property_ui_text(prop, "Height", "Boid height relative to particle size.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	/* states */
 	prop= RNA_def_property(srna, "states", PROP_COLLECTION, PROP_NONE);
@@ -510,99 +513,99 @@ static void rna_def_boid_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "health", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Health", "Initial boid health when born.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Strength", "Maximum caused damage on attack per second.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "aggression", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Aggression", "Boid will fight this times stronger enemy.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "accuracy", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Accuracy", "Accuracy of attack.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "range", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Range", "The maximum distance from which a boid can attack.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	/* physical properties */
 	prop= RNA_def_property(srna, "air_min_speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Min Air Speed", "Minimum speed in air (relative to maximum speed).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "air_max_speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Max Air Speed", "Maximum speed in air.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "air_max_acc", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Max Air Acceleration", "Maximum acceleration in air (relative to maximum speed).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "air_max_ave", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Max Air Angular Velocity", "Maximum angular velocity in air (relative to 180 degrees).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "air_personal_space", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 10.0);
 	RNA_def_property_ui_text(prop, "Air Personal Space", "Radius of boids personal space in air (% of particle size).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "land_jump_speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Jump Speed", "Maximum speed for jumping.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "land_max_speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 100.0);
 	RNA_def_property_ui_text(prop, "Max Land Speed", "Maximum speed on land.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "land_max_acc", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Max Land Acceleration", "Maximum acceleration on land (relative to maximum speed).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "land_max_ave", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Max Land Angular Velocity", "Maximum angular velocity on land (relative to 180 degrees).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "land_personal_space", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 10.0);
 	RNA_def_property_ui_text(prop, "Land Personal Space", "Radius of boids personal space on land (% of particle size).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "land_stick_force", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0, 1000.0);
 	RNA_def_property_ui_text(prop, "Land Stick Force", "How strong a force must be to start effecting a boid on land.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	/* options */
 	prop= RNA_def_property(srna, "allow_flight", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BOID_ALLOW_FLIGHT);
 	RNA_def_property_ui_text(prop, "Allow Flight", "Allow boids to move in air.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "allow_land", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BOID_ALLOW_LAND);
 	RNA_def_property_ui_text(prop, "Allow Land", "Allow boids to move on land.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 
 	prop= RNA_def_property(srna, "allow_climb", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "options", BOID_ALLOW_CLIMB);
 	RNA_def_property_ui_text(prop, "Allow Climbing", "Allow boids to climb goal objects.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Boids_reset");
+	RNA_def_property_update(prop, 0, "rna_Boids_reset");
 }
 
 void RNA_def_boid(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index 9096bfc2844..38086502d6f 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -37,6 +37,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "WM_api.h"
 #include "WM_types.h"
 
 #ifdef RNA_RUNTIME
@@ -46,10 +47,10 @@
 
 static void rna_cloth_update(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = ptr->id.data;
+	Object *ob= (Object*)ptr->id.data;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 }
 
 static void rna_ClothSettings_max_bend_set(struct PointerRNA *ptr, float value)
@@ -180,50 +181,50 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "mingoal");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Goal Minimum", "Goal minimum, vertex group weights are scaled to match this range.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "goal_max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "maxgoal");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Goal Maximum", "Goal maximum, vertex group weights are scaled to match this range.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "goal_default", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "defgoal");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Goal Default", "Default Goal (vertex target position) value, when no Vertex Group used.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "goal_spring", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "goalspring");
 	RNA_def_property_range(prop, 0.0f, 0.999f);
 	RNA_def_property_ui_text(prop, "Goal Stiffness", "Goal (vertex target position) spring stiffness.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "goal_friction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "goalfrict");
 	RNA_def_property_range(prop, 0.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Goal Damping", "Goal (vertex target position) friction.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	/* mass */
 
 	prop= RNA_def_property(srna, "mass", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Mass", "Mass of cloth material.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "mass_vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ClothSettings_mass_vgroup_get", "rna_ClothSettings_mass_vgroup_length", "rna_ClothSettings_mass_vgroup_set");
 	RNA_def_property_ui_text(prop, "Mass Vertex Group", "Vertex Group for pinning of vertices.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_ACCELERATION);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, -100.0, 100.0);
 	RNA_def_property_float_funcs(prop, "rna_ClothSettings_gravity_get", "rna_ClothSettings_gravity_set", NULL);
 	RNA_def_property_ui_text(prop, "Gravity", "Gravity or external force vector.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	/* various */
 
@@ -231,73 +232,73 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "Cvi");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Air Damping", "Air has normally some thickness which slows falling things down.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "pin_cloth", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_SIMSETTINGS_FLAG_GOAL);
 	RNA_def_property_ui_text(prop, "Pin Cloth", "Enable pinning of cloth vertices to other objects/positions.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "pin_stiffness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "goalspring");
 	RNA_def_property_range(prop, 0.0f, 50.0);
 	RNA_def_property_ui_text(prop, "Pin Stiffness", "Pin (vertex target position) spring stiffness.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "quality", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "stepsPerFrame");
 	RNA_def_property_range(prop, 4, 80);
 	RNA_def_property_ui_text(prop, "Quality", "Quality of the simulation in steps per frame. (higher is better quality but slower)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	/* springs */
 
 	prop= RNA_def_property(srna, "stiffness_scaling", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_SIMSETTINGS_FLAG_SCALING);
 	RNA_def_property_ui_text(prop, "Stiffness Scaling", "If enabled, stiffness can be scaled along a weight painted vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "spring_damping", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "Cdis");
 	RNA_def_property_range(prop, 0.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Spring Damping", "Damping of cloth velocity. (higher = more smooth, less jiggling)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "structural_stiffness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "structural");
 	RNA_def_property_range(prop, 1.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Structural Stiffness", "Overall stiffness of structure.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "structural_stiffness_max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max_struct");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_float_funcs(prop, NULL, "rna_ClothSettings_max_struct_set", NULL);
 	RNA_def_property_ui_text(prop, "Structural Stiffness Maximum", "Maximum structural stiffness value.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "structural_stiffness_vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ClothSettings_struct_vgroup_get", "rna_ClothSettings_struct_vgroup_length", "rna_ClothSettings_struct_vgroup_set");
 	RNA_def_property_ui_text(prop, "Structural Stiffness Vertex Group", "Vertex group for fine control over structural stiffness.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "bending_stiffness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "bending");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Bending Stiffness", "Wrinkle coefficient. (higher = less smaller but more big wrinkles)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "bending_stiffness_max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max_bend");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_float_funcs(prop, NULL, "rna_ClothSettings_max_bend_set", NULL);
 	RNA_def_property_ui_text(prop, "Bending Stiffness Maximum", "Maximum bending stiffness value.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "bending_vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ClothSettings_bend_vgroup_get", "rna_ClothSettings_bend_vgroup_length", "rna_ClothSettings_bend_vgroup_set");
 	RNA_def_property_ui_text(prop, "Bending Stiffness Vertex Group", "Vertex group for fine control over bending stiffness.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	/* unused */
 
@@ -358,48 +359,48 @@ static void rna_def_cloth_collision_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "enable_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_COLLSETTINGS_FLAG_ENABLED);
 	RNA_def_property_ui_text(prop, "Enable Collision", "Enable collisions with other objects.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "min_distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "epsilon");
 	RNA_def_property_range(prop, 0.001f, 1.0f);
 	RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance between collision objects before collision response takes in.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "friction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 80.0f);
 	RNA_def_property_ui_text(prop, "Friction", "Friction force if a collision happened. (higher = less movement)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "collision_quality", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "loop_count");
 	RNA_def_property_range(prop, 1, 20);
 	RNA_def_property_ui_text(prop, "Collision Quality", "How many collision iterations should be done. (higher is better quality but slower)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	/* self collision */
 
 	prop= RNA_def_property(srna, "enable_self_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_COLLSETTINGS_FLAG_SELF);
 	RNA_def_property_ui_text(prop, "Enable Self Collision", "Enable self collisions.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "self_min_distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "selfepsilon");
 	RNA_def_property_range(prop, 0.5f, 1.0f);
 	RNA_def_property_ui_text(prop, "Self Minimum Distance", "0.5 means no distance at all, 1.0 is maximum distance.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "self_friction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 80.0f);
 	RNA_def_property_ui_text(prop, "Self Friction", "Friction/damping with self contact.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "self_collision_quality", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "self_loop_count");
 	RNA_def_property_range(prop, 1, 10);
 	RNA_def_property_ui_text(prop, "Self Collision Quality", "How many self collision iterations should be done. (higher is better quality but slower)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 }
 
 void RNA_def_cloth(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index a8dc0454cef..c09a71f752a 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -160,15 +160,14 @@ static char *rna_Constraint_path(PointerRNA *ptr)
 
 static void rna_Constraint_update(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= ptr->id.data;
 
 	if(ob->pose) update_pose_constraint_flags(ob->pose);
 
 	object_test_constraints(ob);
 
-	if(ob->type==OB_ARMATURE) DAG_object_flush_update(scene, ob, OB_RECALC_DATA|OB_RECALC_OB);
-	else DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+	if(ob->type==OB_ARMATURE) DAG_id_flush_update(&ob->id, OB_RECALC_DATA|OB_RECALC_OB);
+	else DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 }
 
 static void rna_Constraint_dependency_update(bContext *C, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 503ca031fb6..d19a2289490 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -156,21 +156,10 @@ static void rna_BPoint_array_begin(CollectionPropertyIterator *iter, PointerRNA
 
 static void rna_Curve_update_data(bContext *C, PointerRNA *ptr)
 {
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
-	Curve *cu= ptr->id.data;
-	Object *ob;
+	ID *id= ptr->id.data;
 	
-	if (cu == NULL)
-		return;
-	
-	for(ob=bmain->object.first; ob; ob= ob->id.next) {
-		if(ob->data == cu) {
-			/* XXX this will loop over all objects again (slow) */
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-		}
-	}
+	DAG_id_flush_update(id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
 
 #else
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 1f51b3ff34c..69e6698bd3b 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -2559,13 +2559,14 @@ void RNA_def_property_free_pointers(PropertyRNA *prop)
 			}
 			case PROP_ENUM: {
 				EnumPropertyRNA *eprop= (EnumPropertyRNA*)prop;
-				if(eprop->item) MEM_freeN((void*)eprop->item);
 
 				for(a=0; a<eprop->totitem; a++) {
 					if(eprop->item[a].identifier) MEM_freeN((void*)eprop->item[a].identifier);
 					if(eprop->item[a].name) MEM_freeN((void*)eprop->item[a].name);
 					if(eprop->item[a].description) MEM_freeN((void*)eprop->item[a].description);
 				}
+
+				if(eprop->item) MEM_freeN((void*)eprop->item);
 				break;
 			}
 			case PROP_STRING: {
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
index dda21f63528..a62002365c9 100644
--- a/source/blender/makesrna/intern/rna_fluidsim.c
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -72,10 +72,17 @@ static StructRNA* rna_FluidSettings_refine(struct PointerRNA *ptr)
 	}
 }
 
+static void rna_fluid_update(bContext *C, PointerRNA *ptr)
+{
+	Object *ob= ptr->id.data;
+
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+}
+
 static void rna_FluidSettings_update_type(bContext *C, PointerRNA *ptr)
 {
 	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= (Object*)ptr->id.data;
 	FluidsimModifierData *fluidmd;
 	ParticleSystemModifierData *psmd;
@@ -124,8 +131,7 @@ static void rna_FluidSettings_update_type(bContext *C, PointerRNA *ptr)
 		}
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+	rna_fluid_update(C, ptr);
 }
 
 static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *value)
@@ -216,7 +222,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "guiDisplayMode");
 	RNA_def_property_enum_items(prop, quality_items);
 	RNA_def_property_ui_text(prop, "Viewport Display Mode", "How to display the mesh in the viewport.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_fluid_update");
 
 	prop= RNA_def_property(srna, "render_display_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "renderDisplayMode");
@@ -231,7 +237,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna)
 	RNA_def_property_string_maxlength(prop, 240);
 	RNA_def_property_string_sdna(prop, NULL, "surfdataPath");
 	RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store baked fluid simulation files in.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_fluid_update");
 
 	prop= RNA_def_property(srna, "memory_estimate", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -431,7 +437,7 @@ static void rna_def_fluidsim_particle(BlenderRNA *brna)
 	RNA_def_property_string_maxlength(prop, 240);
 	RNA_def_property_string_sdna(prop, NULL, "surfdataPath");
 	RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store and load particles from.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_fluid_update");
 }
 
 static void rna_def_fluidsim_control(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 0a9ef9f90d1..13cc2ae9017 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -195,6 +195,7 @@ void rna_object_vcollayer_name_set(struct PointerRNA *ptr, const char *value, ch
 
 void rna_Object_update(struct bContext *C, struct PointerRNA *ptr);
 void rna_Object_update_data(struct bContext *C, struct PointerRNA *ptr);
+void rna_Mesh_update_draw(struct bContext *C, struct PointerRNA *ptr);
 
 /* API functions */
 
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index 88047cda12b..fbe339fe7f3 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -260,14 +260,13 @@ static PointerRNA rna_ShapeKey_data_get(CollectionPropertyIterator *iter)
 static void rna_Key_update_data(bContext *C, PointerRNA *ptr)
 {
 	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
 	Key *key= ptr->id.data;
 	Object *ob;
 
 	for(ob=bmain->object.first; ob; ob= ob->id.next) {
 		if(ob_get_key(ob) == key) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+			WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
 		}
 	}
 }
diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c
index b53a0589ba6..1f7eee4d2d8 100644
--- a/source/blender/makesrna/intern/rna_lattice.c
+++ b/source/blender/makesrna/intern/rna_lattice.c
@@ -89,18 +89,10 @@ static void rna_Lattice_points_begin(CollectionPropertyIterator *iter, PointerRN
 
 static void rna_Lattice_update_data(bContext *C, PointerRNA *ptr)
 {
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
-	Lattice *lt= ptr->id.data;
-	Object *ob;
+	ID *id= ptr->id.data;
 
-	for(ob=bmain->object.first; ob; ob= ob->id.next) {
-		if(ob->data == lt) {
-			/* XXX this will loop over all objects again (slow) */
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-		}
-	}
+	DAG_id_flush_update(id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
 
 static void rna_Lattice_update_size(bContext *C, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index edecfc8cdb0..f7235db49a5 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -52,18 +52,24 @@
 
 static void rna_Mesh_update_data(bContext *C, PointerRNA *ptr)
 {
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
 	ID *id= ptr->id.data;
-	Object *ob;
 
-	for(ob=bmain->object.first; ob; ob= ob->id.next) {
-		if(ob->data == id) {
-			/* XXX this will loop over all objects again (slow) */
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-		}
-	}
+	DAG_id_flush_update(id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
+}
+
+static void rna_Mesh_update_select(bContext *C, PointerRNA *ptr)
+{
+	ID *id= ptr->id.data;
+
+	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, id);
+}
+
+void rna_Mesh_update_draw(bContext *C, PointerRNA *ptr)
+{
+	ID *id= ptr->id.data;
+
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
 
 static void rna_MeshVertex_normal_get(PointerRNA *ptr, float *value)
@@ -867,10 +873,12 @@ static void rna_def_mvert_group(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "def_nr");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Group Index", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "weight", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Weight", "Vertex Weight");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 }
 
 static void rna_def_mvert(BlenderRNA *brna)
@@ -886,6 +894,7 @@ static void rna_def_mvert(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_ui_text(prop, "Location", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_DIRECTION);
 	RNA_def_property_float_sdna(prop, NULL, "no");
@@ -896,14 +905,17 @@ static void rna_def_mvert(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
 	RNA_def_property_ui_text(prop, "Selected", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE);
 	RNA_def_property_ui_text(prop, "Hidden", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "bevel_weight", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_funcs(prop, "rna_MeshVertex_bevel_weight_get", "rna_MeshVertex_bevel_weight_set", NULL);
 	RNA_def_property_ui_text(prop, "Bevel Weight", "Weight used by the Bevel modifier 'Only Vertices' option");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_funcs(prop, "rna_MeshVertex_groups_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", 0, 0, 0, 0, 0);
@@ -931,26 +943,32 @@ static void rna_def_medge(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "crease", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_funcs(prop, "rna_MEdge_crease_get", "rna_MEdge_crease_set", NULL);
 	RNA_def_property_ui_text(prop, "Crease", "Weight used by the Subsurf modifier for creasing");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "bevel_weight", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_funcs(prop, "rna_MEdge_bevel_weight_get", "rna_MEdge_bevel_weight_set", NULL);
 	RNA_def_property_ui_text(prop, "Bevel Weight", "Weight used by the Bevel modifier");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
 	RNA_def_property_ui_text(prop, "Selected", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE);
 	RNA_def_property_ui_text(prop, "Hidden", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "seam", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SEAM);
 	RNA_def_property_ui_text(prop, "Seam", "Seam edge for UV unwrapping");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "sharp", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SHARP);
 	RNA_def_property_ui_text(prop, "Sharp", "Sharp edge for the EdgeSplit modifier");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 }
 
 static void rna_def_mface(BlenderRNA *brna)
@@ -984,18 +1002,22 @@ static void rna_def_mface(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "mat_nr");
 	RNA_def_property_ui_text(prop, "Material Index", "");
 	RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MeshFace_material_index_range");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_FACE_SEL);
 	RNA_def_property_ui_text(prop, "Selected", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE);
 	RNA_def_property_ui_text(prop, "Hidden", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SMOOTH);
 	RNA_def_property_ui_text(prop, "Smooth", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 	
 	prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_DIRECTION);
 	RNA_def_property_array(prop, 3);
@@ -1021,20 +1043,24 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock.");
 	RNA_def_struct_sdna(srna, "CustomDataLayer");
 	RNA_def_struct_path_func(srna, "rna_MeshTextureFaceLayer_path");
+	RNA_def_struct_ui_icon(srna, ICON_GROUP_UVS);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshTextureFaceLayer_name_set");
 	RNA_def_property_ui_text(prop, "Name", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_get", "rna_MeshTextureFaceLayer_active_set");
 	RNA_def_property_ui_text(prop, "Active", "Sets the layer as active for display and editing");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
 	RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get", "rna_MeshTextureFaceLayer_active_render_set");
 	RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MeshTextureFace");
@@ -1052,88 +1078,109 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_TextureFace_image_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Image", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "tex", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TEX);
 	RNA_def_property_ui_text(prop, "Tex", "Render face with texture");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "light", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_LIGHT);
 	RNA_def_property_ui_text(prop, "Light", "Use light for face");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "invisible", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_INVISIBLE);
 	RNA_def_property_ui_text(prop, "Invisible", "Make face invisible");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_DYNAMIC);
 	RNA_def_property_ui_text(prop, "Collision", "Use face for collision and ray-sensor detection");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "shared", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHAREDCOL);
 	RNA_def_property_ui_text(prop, "Shared", "Blend vertex colors across face when vertices are shared");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "twoside", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TWOSIDE);
 	RNA_def_property_ui_text(prop, "Twoside", "Render face twosided");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "object_color", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_OBCOL);
 	RNA_def_property_ui_text(prop, "Object Color", "Use ObColor instead of vertex colors");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "halo", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD);
 	RNA_def_property_ui_text(prop, "Halo", "Screen aligned billboard");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "billboard", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD2);
 	RNA_def_property_ui_text(prop, "Billboard", "Billboard with Z-axis constraint");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "shadow", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHADOW);
 	RNA_def_property_ui_text(prop, "Shadow", "Face is used for shadow");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "text", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BMFONT);
 	RNA_def_property_ui_text(prop, "Text", "Enable bitmap text on face");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "alpha_sort", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_ALPHASORT);
 	RNA_def_property_ui_text(prop, "Alpha Sort", "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "transp", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, transp_items);
 	RNA_def_property_ui_text(prop, "Transparency", "Transparency blending mode");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "uv_selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TF_SEL1);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "UV Selected", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "uv_pinned", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "unwrap", TF_PIN1);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "UV Pinned", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
 	prop= RNA_def_property(srna, "uv1", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv1_get", "rna_MeshTextureFace_uv1_set", NULL);
 	RNA_def_property_ui_text(prop, "UV 1", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "uv2", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv2_get", "rna_MeshTextureFace_uv2_set", NULL);
 	RNA_def_property_ui_text(prop, "UV 2", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "uv3", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv3_get", "rna_MeshTextureFace_uv3_set", NULL);
 	RNA_def_property_ui_text(prop, "UV 3", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "uv4", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_array(prop, 2);
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv4_get", "rna_MeshTextureFace_uv4_set", NULL);
 	RNA_def_property_ui_text(prop, "UV 4", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_multidimensional_array(prop, 4 * 2, 2, uv_dim);
@@ -1141,6 +1188,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length", "rna_MeshTextureFace_uv_set_length");
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv_get", "rna_MeshTextureFace_uv_set", NULL);
 	RNA_def_property_ui_text(prop, "UV", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 }
 
 static void rna_def_msticky(BlenderRNA *brna)
@@ -1155,6 +1203,7 @@ static void rna_def_msticky(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_ui_text(prop, "Location", "Sticky texture coordinate location.");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 }
 
 static void rna_def_mcol(BlenderRNA *brna)
@@ -1166,20 +1215,24 @@ static void rna_def_mcol(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Mesh Vertex Color Layer", "Layer of vertex colors in a Mesh datablock.");
 	RNA_def_struct_sdna(srna, "CustomDataLayer");
 	RNA_def_struct_path_func(srna, "rna_MeshColorLayer_path");
+	RNA_def_struct_ui_icon(srna, ICON_GROUP_VCOL);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshColorLayer_name_set");
 	RNA_def_property_ui_text(prop, "Name", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_MeshColorLayer_active_get", "rna_MeshColorLayer_active_set");
 	RNA_def_property_ui_text(prop, "Active", "Sets the layer as active for display and editing");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
 	RNA_def_property_boolean_funcs(prop, "rna_MeshColorLayer_active_render_get", "rna_MeshColorLayer_active_render_set");
 	RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MeshColor");
@@ -1196,24 +1249,28 @@ static void rna_def_mcol(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_float_funcs(prop, "rna_MeshColor_color1_get", "rna_MeshColor_color1_set", NULL);
 	RNA_def_property_ui_text(prop, "Color 1", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "color2", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_float_funcs(prop, "rna_MeshColor_color2_get", "rna_MeshColor_color2_set", NULL);
 	RNA_def_property_ui_text(prop, "Color 2", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "color3", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_float_funcs(prop, "rna_MeshColor_color3_get", "rna_MeshColor_color3_set", NULL);
 	RNA_def_property_ui_text(prop, "Color 3", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "color4", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_float_funcs(prop, "rna_MeshColor_color4_get", "rna_MeshColor_color4_set", NULL);
 	RNA_def_property_ui_text(prop, "Color 4", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 }
 
 static void rna_def_mproperties(BlenderRNA *brna)
@@ -1230,6 +1287,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_ui_text(prop, "Name", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MeshFloatProperty");
@@ -1244,6 +1302,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "f");
 	RNA_def_property_ui_text(prop, "Value", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	/* Int */
 	srna= RNA_def_struct(brna, "MeshIntPropertyLayer", NULL);
@@ -1254,6 +1313,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_ui_text(prop, "Name", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MeshIntProperty");
@@ -1268,6 +1328,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "value", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "i");
 	RNA_def_property_ui_text(prop, "Value", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	/* String */
 	srna= RNA_def_struct(brna, "MeshStringPropertyLayer", NULL);
@@ -1278,6 +1339,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_ui_text(prop, "Name", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MeshStringProperty");
@@ -1292,6 +1354,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "value", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "s");
 	RNA_def_property_ui_text(prop, "Value", "");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 }
 
 void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable)
@@ -1307,17 +1370,20 @@ void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable)
 	RNA_def_property_float_sdna(prop, NULL, "loc");
 	RNA_def_property_ui_text(prop, "Texure Space Location", "Texture space location.");
 	RNA_def_property_editable_func(prop, texspace_editable);
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 
 	prop= RNA_def_property(srna, "texspace_size", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_float_sdna(prop, NULL, "size");
 	RNA_def_property_ui_text(prop, "Texture Space Size", "Texture space size.");
 	RNA_def_property_editable_func(prop, texspace_editable);
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 
 	/* not supported yet
 	prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER);
 	RNA_def_property_float(prop, NULL, "rot");
 	RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation");
-	RNA_def_property_editable_func(prop, texspace_editable);*/
+	RNA_def_property_editable_func(prop, texspace_editable);
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");*/
 
 	/* materials */
 	prop= RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE);
@@ -1445,58 +1511,58 @@ static void rna_def_mesh(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "draw_edges", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEDGES);
 	RNA_def_property_ui_text(prop, "Draw Edges", "Displays selected edges using hilights in the 3d view and UV editor");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_faces", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWFACES);
 	RNA_def_property_ui_text(prop, "Draw Faces", "Displays all faces as shades in the 3d view and UV editor");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_normals", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWNORMALS);
 	RNA_def_property_ui_text(prop, "Draw Normals", "Displays face normals as lines");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_vertex_normals", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_VNORMALS);
 	RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Displays vertex normals as lines");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_creases", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWCREASES);
 	RNA_def_property_ui_text(prop, "Draw Creases", "Displays creases created for subsurf weighting");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_bevel_weights", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWBWEIGHTS);
 	RNA_def_property_ui_text(prop, "Draw Bevel Weights", "Displays weights created for the Bevel modifier");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_seams", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSEAMS);
 	RNA_def_property_ui_text(prop, "Draw Seams", "Displays UV unwrapping seams");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_sharp", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSHARP);
 	RNA_def_property_ui_text(prop, "Draw Sharp", "Displays sharp edges, used with the EdgeSplit modifier");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	
 	prop= RNA_def_property(srna, "draw_edge_lenght", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_EDGELEN);
 	RNA_def_property_ui_text(prop, "Edge Length", "Displays selected edge lengths");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_edge_angle", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_EDGEANG);
 	RNA_def_property_ui_text(prop, "Edge Angles", "Displays the angles in the selected edges in degrees");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 	
 	prop= RNA_def_property(srna, "draw_face_area", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_FACEAREA);
 	RNA_def_property_ui_text(prop, "Face Area", "Displays the area of selected faces");
-	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
 
 	rna_def_texmat_common(srna, "rna_Mesh_texspace_editable");
 
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index c98b3fb7b09..686d91e4fe2 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -102,20 +102,13 @@ static void rna_Mesh_calc_edges(Mesh *mesh)
 
 static void rna_Mesh_update(Mesh *mesh, bContext *C)
 {
-	Main *bmain= CTX_data_main(C);
-	Object *ob;
-
 	if(mesh->totface && mesh->totedge == 0)
 		rna_Mesh_calc_edges(mesh);
 
 	mesh_calc_normals(mesh->mvert, mesh->totvert, mesh->mface, mesh->totface, NULL);
 
-	for(ob=bmain->object.first; ob; ob=ob->id.next) {
-		if(ob->data == mesh) {
-			ob->recalc |= OB_RECALC_DATA;
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-		}
-	}
+	DAG_id_flush_update(&mesh->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, mesh);
 }
 
 static void rna_Mesh_add_verts(Mesh *mesh, int len)
diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c
index 7b14a7a4712..f3160a7bb18 100644
--- a/source/blender/makesrna/intern/rna_meta.c
+++ b/source/blender/makesrna/intern/rna_meta.c
@@ -57,14 +57,12 @@ static void rna_MetaBall_update_data(bContext *C, PointerRNA *ptr)
 	MetaBall *mb= ptr->id.data;
 	Object *ob;
 
-	for(ob=bmain->object.first; ob; ob= ob->id.next) {
-		if(ob->data == mb) {
+	for(ob=bmain->object.first; ob; ob= ob->id.next)
+		if(ob->data == mb)
 			copy_mball_properties(scene, ob);
-			/* XXX this will loop over all objects again (slow) */
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
-		}
-	}
+
+	DAG_id_flush_update(&mb->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_GEOM|ND_DATA, mb);
 }
 
 #else
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index bb073d19a46..f8c8ddb9431 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -40,6 +40,7 @@
 #include "BKE_bmesh.h" /* For BevelModifierData */
 #include "BKE_smoke.h" /* For smokeModifier_free & smokeModifier_createType */
 
+#include "WM_api.h"
 #include "WM_types.h"
 
 EnumPropertyItem modifier_type_items[] ={
@@ -170,7 +171,8 @@ static char *rna_Modifier_path(PointerRNA *ptr)
 
 static void rna_Modifier_update(bContext *C, PointerRNA *ptr)
 {
-	DAG_object_flush_update(CTX_data_scene(C), ptr->id.data, OB_RECALC_DATA);
+	DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ptr->id.data);
 }
 
 static void rna_Modifier_dependency_update(bContext *C, PointerRNA *ptr)
@@ -441,7 +443,7 @@ static void rna_def_property_subdivision_common(StructRNA *srna, const char type
 	RNA_def_property_enum_sdna(prop, NULL, type);
 	RNA_def_property_enum_items(prop, prop_subdivision_type_items);
 	RNA_def_property_ui_text(prop, "Subdivision Type", "Selects type of subdivision algorithm.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_subsurf(BlenderRNA *brna)
@@ -461,7 +463,7 @@ static void rna_def_modifier_subsurf(BlenderRNA *brna)
 	RNA_def_property_range(prop, 1, 6);
 	RNA_def_property_ui_range(prop, 1, 6, 1, 0);
 	RNA_def_property_ui_text(prop, "Levels", "Number of subdivisions to perform.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "render_levels", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "renderLevels");
@@ -472,12 +474,12 @@ static void rna_def_modifier_subsurf(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "optimal_draw", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", eSubsurfModifierFlag_ControlEdges);
 	RNA_def_property_ui_text(prop, "Optimal Draw", "Skip drawing/rendering of interior subdivided edges");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "subsurf_uv", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", eSubsurfModifierFlag_SubsurfUv);
 	RNA_def_property_ui_text(prop, "Subsurf UV", "Use subsurf to subdivide UVs.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_multires(BlenderRNA *brna)
@@ -496,7 +498,7 @@ static void rna_def_modifier_multires(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "lvl");
 	RNA_def_property_ui_text(prop, "Level", "");
 	RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MultiresModifier_level_range");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_lattice(BlenderRNA *brna)
@@ -513,13 +515,13 @@ static void rna_def_modifier_lattice(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Object", "Lattice object to deform with.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_LatticeModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_LatticeModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_curve(BlenderRNA *brna)
@@ -545,19 +547,19 @@ static void rna_def_modifier_curve(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Object", "Curve object to deform with.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_CurveModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_CurveModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "deform_axis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "defaxis");
 	RNA_def_property_enum_items(prop, prop_deform_axis_items);
 	RNA_def_property_ui_text(prop, "Deform Axis", "The axis that the curve deforms along.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_build(BlenderRNA *brna)
@@ -573,21 +575,21 @@ static void rna_def_modifier_build(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Start", "Specify the start frame of the effect.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "length", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_range(prop, 1, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Length", "Specify the total time the build effect requires");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "randomize", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Randomize", "Randomize the faces or edges during build.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "seed", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 1, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Seed", "Specify the seed for random if used.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_mirror(BlenderRNA *brna)
@@ -603,50 +605,50 @@ static void rna_def_modifier_mirror(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_X);
 	RNA_def_property_ui_text(prop, "X", "Enable X axis mirror.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_Y);
 	RNA_def_property_ui_text(prop, "Y", "Enable Y axis mirror.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_Z);
 	RNA_def_property_ui_text(prop, "Z", "Enable Z axis mirror.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "clip", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_CLIPPING);
 	RNA_def_property_ui_text(prop, "Clip", "Prevents vertices from going through the mirror during transform.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "mirror_vertex_groups", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_VGROUP);
 	RNA_def_property_ui_text(prop, "Mirror Vertex Groups", "Mirror vertex groups (e.g. .R->.L).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "mirror_u", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_U);
 	RNA_def_property_ui_text(prop, "Mirror U", "Mirror the U texture coordinate around the 0.5 point.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "mirror_v", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_V);
 	RNA_def_property_ui_text(prop, "Mirror V", "Mirror the V texture coordinate around the 0.5 point.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "merge_limit", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "tolerance");
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 1, 10, 3); 
 	RNA_def_property_ui_text(prop, "Merge Limit", "Distance from axis within which mirrored vertices are merged.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "mirror_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "mirror_ob");
 	RNA_def_property_ui_text(prop, "Mirror Object", "Object to use as mirror.");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 }
 
 static void rna_def_modifier_decimate(BlenderRNA *brna)
@@ -663,7 +665,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "percent");
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_text(prop, "Ratio", "Defines the ratio of triangles to reduce to.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "face_count", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "faceCount");
@@ -691,135 +693,135 @@ static void rna_def_modifier_wave(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_X);
 	RNA_def_property_ui_text(prop, "X", "X axis motion.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_Y);
 	RNA_def_property_ui_text(prop, "Y", "Y axis motion.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_CYCL);
 	RNA_def_property_ui_text(prop, "Cyclic", "Cyclic wave effect.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "normals", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM);
 	RNA_def_property_ui_text(prop, "Normals", "Dispace along normals.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "x_normal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_X);
 	RNA_def_property_ui_text(prop, "X Normal", "Enable displacement along the X normal");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "y_normal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_Y);
 	RNA_def_property_ui_text(prop, "Y Normal", "Enable displacement along the Y normal");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "z_normal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_Z);
 	RNA_def_property_ui_text(prop, "Z Normal", "Enable displacement along the Z normal");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "time_offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "timeoffs");
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Time Offset", "Either the starting frame (for positive speed) or ending frame (for negative speed.)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "lifetime", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Lifetime",  "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "damping_time", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_float_sdna(prop, NULL, "damp");
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Damping Time",  "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "falloff_radius", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "falloff");
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 100, 100, 2);
 	RNA_def_property_ui_text(prop, "Falloff Radius",  "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "start_position_x", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "startx");
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -100, 100, 100, 2);
 	RNA_def_property_ui_text(prop, "Start Position X",  "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "start_position_y", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "starty");
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -100, 100, 100, 2);
 	RNA_def_property_ui_text(prop, "Start Position Y",  "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "start_position_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "objectcenter");
 	RNA_def_property_ui_text(prop, "Start Position Object", "");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name for modulating the wave.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WaveModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "texture", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Texture", "Texture for modulating the wave.");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "texmapping");
 	RNA_def_property_enum_items(prop, prop_texture_coordinates_items);
 	RNA_def_property_ui_text(prop, "Texture Coordinates", "Texture coordinates used for modulating input.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
 	RNA_def_property_ui_text(prop, "UV Layer", "UV layer name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WaveModifier_uvlayer_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "texture_coordinates_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "map_object");
 	RNA_def_property_ui_text(prop, "Texture Coordinates Object", "");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -1, 1, 10, 2);
 	RNA_def_property_ui_text(prop, "Speed", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "height", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -2, 2, 10, 2);
 	RNA_def_property_ui_text(prop, "Height", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 5, 10, 2);
 	RNA_def_property_ui_text(prop, "Width", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "narrowness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "narrow");
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 10, 10, 2);
 	RNA_def_property_ui_text(prop, "Narrowness", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_armature(BlenderRNA *brna)
@@ -836,43 +838,43 @@ static void rna_def_modifier_armature(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Object", "Armature object to deform with.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_ArmatureModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ArmatureModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_INVERT_VGROUP);
 	RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "use_vertex_groups", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_VGROUP);
 	RNA_def_property_ui_text(prop, "Use Vertex Groups", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "use_bone_envelopes", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_ENVELOPE);
 	RNA_def_property_ui_text(prop, "Use Bone Envelopes", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "quaternion", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_QUATERNION);
 	RNA_def_property_ui_text(prop, "Quaternion", "Deform rotation interpolation with quaternions.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "b_bone_rest", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_B_BONE_REST);
 	RNA_def_property_ui_text(prop, "B-Bone Rest",  "Make B-Bones deform already in rest position");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "multi_modifier", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "multi", 0);
 	RNA_def_property_ui_text(prop, "Multi Modifier",  "Use same input as previous modifier, and mix results using overall vgroup");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_hook(BlenderRNA *brna)
@@ -889,28 +891,28 @@ static void rna_def_modifier_hook(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 100, 100, 2);
 	RNA_def_property_ui_text(prop, "Falloff",  "If not zero, the distance from the hook where influence ends.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "force", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_text(prop, "Force",  "Relative force of the hook.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Parent Object for hook, also recalculates and clears offset");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 	
 	prop= RNA_def_property(srna, "subtarget", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "subtarget");
 	RNA_def_property_ui_text(prop, "Sub-Target", "Name of Parent Bone for hook (if applicable), also recalculates and clears offset");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_HookModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_softbody(BlenderRNA *brna)
@@ -954,12 +956,12 @@ static void rna_def_modifier_boolean(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Object", "Mesh object to use for boolean operation.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_BooleanModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "operation", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_operation_items);
 	RNA_def_property_ui_text(prop, "Operation", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_array(BlenderRNA *brna)
@@ -982,90 +984,90 @@ static void rna_def_modifier_array(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "fit_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_fit_type_items);
 	RNA_def_property_ui_text(prop, "Fit Type", "Array length calculation method.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "count", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 1, INT_MAX);
 	RNA_def_property_ui_range(prop, 1, 1000, 1, 0);
 	RNA_def_property_ui_text(prop, "Count",  "Number of duplicates to make.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "length", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_range(prop, 0, INT_MAX);
 	RNA_def_property_ui_range(prop, 0, 10000, 10, 2);
 	RNA_def_property_ui_text(prop, "Length", "Length to fit array within.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "curve", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "curve_ob");
 	RNA_def_property_ui_text(prop, "Curve", "Curve object to fit array length to.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_ArrayModifier_curve_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	/* Offset parameters */
 	prop= RNA_def_property(srna, "constant_offset", PROP_BOOLEAN, PROP_TRANSLATION);
 	RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_CONST);
 	RNA_def_property_ui_text(prop, "Constant Offset", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "constant_offset_displacement", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "offset");
 	RNA_def_property_ui_text(prop, "Constant Offset Displacement", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "relative_offset", PROP_BOOLEAN, PROP_TRANSLATION);
 	RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_RELATIVE);
 	RNA_def_property_ui_text(prop, "Relative Offset", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "relative_offset_displacement", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "scale");
 	RNA_def_property_ui_text(prop, "Relative Offset Displacement", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	/* Vertex merging parameters */
 	prop= RNA_def_property(srna, "merge_adjacent_vertices", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_ARR_MERGE);
 	RNA_def_property_ui_text(prop, "Merge Vertices", "Merge vertices in adjacent duplicates.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "merge_end_vertices", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_ARR_MERGEFINAL);
 	RNA_def_property_ui_text(prop, "Merge Vertices", "Merge vertices in first and last duplicates.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "merge_distance", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "merge_dist");
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 1, 1, 4);
 	RNA_def_property_ui_text(prop, "Merge Distance", "Limit below which to merge vertices.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	/* Offset object */
 	prop= RNA_def_property(srna, "add_offset_object", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_OBJ);
 	RNA_def_property_ui_text(prop, "Add Offset Object", "Add an object transformation to the total offset.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "offset_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "offset_ob");
 	RNA_def_property_ui_text(prop, "Offset Object", "");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 	
 	/* Caps */
 	prop= RNA_def_property(srna, "start_cap", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Start Cap", "Mesh object to use as a start cap.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_ArrayModifier_start_cap_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "end_cap", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "End Cap", "Mesh object to use as an end cap.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_ArrayModifier_end_cap_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 }
 
 static void rna_def_modifier_edgesplit(BlenderRNA *brna)
@@ -1082,17 +1084,17 @@ static void rna_def_modifier_edgesplit(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 180);
 	RNA_def_property_ui_range(prop, 0, 180, 100, 2);
 	RNA_def_property_ui_text(prop, "Split Angle", "Angle above which to split edges.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "use_edge_angle", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_EDGESPLIT_FROMANGLE);
 	RNA_def_property_ui_text(prop, "Use Edge Angle", "Split edges with high angle between faces.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "use_sharp", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_EDGESPLIT_FROMFLAG);
 	RNA_def_property_ui_text(prop, "Use Sharp Edges", "Split edges that are marked as sharp.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_displace(BlenderRNA *brna)
@@ -1124,47 +1126,47 @@ static void rna_def_modifier_displace(BlenderRNA *brna)
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DisplaceModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "texture", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Texture", "");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "midlevel", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
 	RNA_def_property_ui_text(prop, "Midlevel", "Material value that gives no displacement.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -100, 100, 10, 2);
 	RNA_def_property_ui_text(prop, "Strength", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "direction", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_direction_items);
 	RNA_def_property_ui_text(prop, "Direction", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "texmapping");
 	RNA_def_property_enum_items(prop, prop_texture_coordinates_items);
 	RNA_def_property_ui_text(prop, "Texture Coordinates", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
 	RNA_def_property_ui_text(prop, "UV Layer", "UV layer name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DisplaceModifier_uvlayer_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "texture_coordinate_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "map_object");
 	RNA_def_property_ui_text(prop, "Texture Coordinate Object", "");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 }
 
 static void rna_def_modifier_uvproject(BlenderRNA *brna)
@@ -1181,13 +1183,13 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 	RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
 	RNA_def_property_ui_text(prop, "UV Layer", "UV layer name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVProjectModifier_uvlayer_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "num_projectors", PROP_INT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Number of Projectors", "Number of projectors to use.");
 	RNA_def_property_int_funcs(prop, NULL, "rna_UVProjectModifier_num_projectors_set", NULL);
 	RNA_def_property_range(prop, 1, MOD_UVPROJECT_MAX);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "projectors", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "UVProjector");
@@ -1197,26 +1199,26 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Image", "");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "horizontal_aspect_ratio", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "aspectx");
 	RNA_def_property_range(prop, 1, FLT_MAX);
 	RNA_def_property_ui_range(prop, 1, 1000, 100, 2);
 	RNA_def_property_ui_text(prop, "Horizontal Aspect Ratio", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "vertical_aspect_ratio", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "aspecty");
 	RNA_def_property_range(prop, 1, FLT_MAX);
 	RNA_def_property_ui_range(prop, 1, 1000, 100, 2);
 	RNA_def_property_ui_text(prop, "Vertical Aspect Ratio", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "override_image", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_UVPROJECT_OVERRIDEIMAGE);
 	RNA_def_property_ui_text(prop, "Override Image", "Override faces' current images with the given image.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	srna= RNA_def_struct(brna, "UVProjector", NULL);
 	RNA_def_struct_ui_text(srna, "UVProjector", "UV projector used by the UV project modifier.");
@@ -1241,35 +1243,35 @@ static void rna_def_modifier_smooth(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_X);
 	RNA_def_property_ui_text(prop, "X", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Y);
 	RNA_def_property_ui_text(prop, "Y", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Z);
 	RNA_def_property_ui_text(prop, "Z", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac");
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -10, 10, 0.5, 2);
 	RNA_def_property_ui_text(prop, "Factor", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "repeat", PROP_INT, PROP_NONE);
 	RNA_def_property_ui_range(prop, 0, 30, 1, 0);
 	RNA_def_property_ui_text(prop, "Repeat", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SmoothModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_cast(BlenderRNA *brna)
@@ -1292,63 +1294,63 @@ static void rna_def_modifier_cast(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, prop_cast_type_items);
 	RNA_def_property_ui_text(prop, "Cast Type", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Control object: if available, its location determines the center of the effect");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_CastModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_X);
 	RNA_def_property_ui_text(prop, "X", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_Y);
 	RNA_def_property_ui_text(prop, "Y", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_Z);
 	RNA_def_property_ui_text(prop, "Z", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "from_radius", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_SIZE_FROM_RADIUS);
 	RNA_def_property_ui_text(prop, "From Radius", "Use radius as size of projection shape (0 = auto)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "use_transform", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_USE_OB_TRANSFORM);
 	RNA_def_property_ui_text(prop, "Use transform", "Use object transform to control projection shape");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac");
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -10, 10, 5, 2);
 	RNA_def_property_ui_text(prop, "Factor", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 100, 10, 2);
 	RNA_def_property_ui_text(prop, "Radius", "Only deform vertices within this distance from the center of the effect (leave as 0 for infinite.)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 100, 10, 2);
 	RNA_def_property_ui_text(prop, "Size", "Size of projection shape (leave as 0 for auto.)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_CastModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_meshdeform(BlenderRNA *brna)
@@ -1365,29 +1367,29 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Object", "Mesh object to deform with.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_MeshDeformModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_INVERT_VGROUP);
 	RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshDeformModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "precision", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gridsize");
 	RNA_def_property_range(prop, 2, 10);
 	RNA_def_property_ui_text(prop, "Precision", "The grid size for binding.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "dynamic", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_DYNAMIC_BIND);
 	RNA_def_property_ui_text(prop, "Dynamic", "Recompute binding dynamically on top of other deformers (slower and more memory consuming.)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 }
 
@@ -1422,71 +1424,71 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "ob");
 	RNA_def_property_ui_text(prop, "Object", "Object that has the particle system.");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "particle_system_number", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "psys");
 	RNA_def_property_range(prop, 1, 10);
 	RNA_def_property_ui_text(prop, "Particle System Number", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "axis");
 	RNA_def_property_enum_items(prop, particleinstance_axis);
 	RNA_def_property_ui_text(prop, "Axis", "Pole axis for rotation");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "normal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Parents);
 	RNA_def_property_ui_text(prop, "Normal", "Create instances from normal particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "children", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Children);
 	RNA_def_property_ui_text(prop, "Children", "Create instances from child particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "path", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Path);
 	RNA_def_property_ui_text(prop, "Path", "Create instances along particle paths.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "unborn", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Unborn);
 	RNA_def_property_ui_text(prop, "Unborn", "Show instances when particles are unborn.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "alive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Alive);
 	RNA_def_property_ui_text(prop, "Alive", "Show instances when particles are alive.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "dead", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Dead);
 	RNA_def_property_ui_text(prop, "Dead", "Show instances when particles are dead.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "keep_shape", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_KeepShape);
 	RNA_def_property_ui_text(prop, "Keep Shape", "Don't stretch the object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "size", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_UseSize);
 	RNA_def_property_ui_text(prop, "Size", "Use particle size to scale the instances.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "position", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "position");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Position", "Position along path.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "random_position", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "random_position");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Random Position", "Randomize position along path.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_explode(BlenderRNA *brna)
@@ -1506,27 +1508,27 @@ static void rna_def_modifier_explode(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "protect", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_text(prop, "Protect", "Clean vertex group edges");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "split_edges", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_EdgeSplit);
 	RNA_def_property_ui_text(prop, "Split Edges", "Split face edges for nicer shrapnel.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "unborn", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Unborn);
 	RNA_def_property_ui_text(prop, "Unborn", "Show mesh when particles are unborn.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "alive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Alive);
 	RNA_def_property_ui_text(prop, "Alive", "Show mesh when particles are alive.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "dead", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Dead);
 	RNA_def_property_ui_text(prop, "Dead", "Show mesh when particles are dead.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_cloth(BlenderRNA *brna)
@@ -1583,7 +1585,7 @@ static void rna_def_modifier_smoke(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, prop_smoke_type_items);
 	RNA_def_property_ui_text(prop, "Type", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_set_type");
+	RNA_def_property_update(prop, 0, "rna_Smoke_set_type");
 }
 
 static void rna_def_modifier_collision(BlenderRNA *brna)
@@ -1605,7 +1607,7 @@ static void rna_def_modifier_collision(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "absorption");
 	RNA_def_property_ui_range(prop, 0, 100, 1, 2);
 	RNA_def_property_ui_text(prop, "Absorption %", "How much of effector force gets lost during collision with this object (in percent).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_bevel(BlenderRNA *brna)
@@ -1634,31 +1636,31 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "value");
 	RNA_def_property_range(prop, 0, 0.5);
 	RNA_def_property_ui_text(prop, "Width", "Bevel value/amount.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "only_vertices", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", BME_BEVEL_VERT);
 	RNA_def_property_ui_text(prop, "Only Vertices", "Bevel verts/corners, not edges.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "limit_method", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "lim_flags");
 	RNA_def_property_enum_items(prop, prop_limit_method_items);
 	RNA_def_property_ui_text(prop, "Limit Method", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "edge_weight_method", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "e_flags");
 	RNA_def_property_enum_items(prop, prop_edge_weight_method_items);
 	RNA_def_property_ui_text(prop, "Edge Weight Method", "What edge weight to use for weighting a vertex.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "bevel_angle");
 	RNA_def_property_range(prop, 0, 180);
 	RNA_def_property_ui_range(prop, 0, 180, 100, 2);
 	RNA_def_property_ui_text(prop, "Angle", "Angle above which to bevel edges.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_shrinkwrap(BlenderRNA *brna)
@@ -1681,80 +1683,80 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "shrinkType");
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Target", "Mesh target to shrink to.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_ShrinkwrapModifier_target_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "auxiliary_target", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "auxTarget");
 	RNA_def_property_ui_text(prop, "Auxiliary Target", "Additional mesh target to shrink to.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_ShrinkwrapModifier_auxiliary_target_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "vgroup_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ShrinkwrapModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "keepDist");
 	RNA_def_property_range(prop, 0, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 100, 1, 2);
 	RNA_def_property_ui_text(prop, "Offset", "Distance to keep from the target.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS);
 	RNA_def_property_ui_text(prop, "X", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS);
 	RNA_def_property_ui_text(prop, "Y", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS);
 	RNA_def_property_ui_text(prop, "Z", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "subsurf_levels", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "subsurfLevels");
 	RNA_def_property_range(prop, 0, 6);
 	RNA_def_property_ui_range(prop, 0, 6, 1, 0);
 	RNA_def_property_ui_text(prop, "Subsurf Levels", "Number of subdivisions that must be performed before extracting vertices' positions and normals.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "negative", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR);
 	RNA_def_property_ui_text(prop, "Negative", "Allow vertices to move in the negative direction of axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "positive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR);
 	RNA_def_property_ui_text(prop, "Positive", "Allow vertices to move in the positive direction of axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "cull_front_faces", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE);
 	RNA_def_property_ui_text(prop, "Cull Front Faces", "Stop vertices from projecting to a front face on the target.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "cull_back_faces", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_CULL_TARGET_BACKFACE);
 	RNA_def_property_ui_text(prop, "Cull Back Faces", "Stop vertices from projecting to a back face on the target.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "keep_above_surface", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE);
 	RNA_def_property_ui_text(prop, "Keep Above Surface", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_fluidsim(BlenderRNA *brna)
@@ -1790,25 +1792,25 @@ static void rna_def_modifier_mask(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "armature", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "ob_arm");
 	RNA_def_property_ui_text(prop, "Armature", "Armature to use as source of bones to mask.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_MaskModifier_armature_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "vgroup");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MaskModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "inverse", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MASK_INV);
 	RNA_def_property_ui_text(prop, "Inverse", "Use vertices that are not part of region defined.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_simpledeform(BlenderRNA *brna)
@@ -1831,29 +1833,29 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "vgroup_name");
 	RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name.");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SimpleDeformModifier_vgroup_set");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "origin", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Origin", "Origin of modifier space coordinates.");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_dependency_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
 	prop= RNA_def_property(srna, "relative", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "originOpts", MOD_SIMPLEDEFORM_ORIGIN_LOCAL);
 	RNA_def_property_ui_text(prop, "Relative", "Sets the origin of deform space to be relative to the object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -10, 10, 0.5, 2);
 	RNA_def_property_ui_text(prop, "Factor", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "limits", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "limit");
@@ -1861,17 +1863,17 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_range(prop, 0, 1, 5, 2);
 	RNA_def_property_ui_text(prop, "Limits", "Lower/Upper limits for deform.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "lock_x_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_X);
 	RNA_def_property_ui_text(prop, "Lock X Axis", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop= RNA_def_property(srna, "lock_y_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_Y);
 	RNA_def_property_ui_text(prop, "Lock Y Axis", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_surface(BlenderRNA *brna)
@@ -1911,7 +1913,7 @@ void RNA_def_modifier(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "realtime", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Realtime);
 	RNA_def_property_ui_text(prop, "Realtime", "Realtime display of a modifier.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 0);
 	
 	prop= RNA_def_property(srna, "render", PROP_BOOLEAN, PROP_NONE);
@@ -1922,13 +1924,13 @@ void RNA_def_modifier(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "editmode", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Editmode);
 	RNA_def_property_ui_text(prop, "Editmode", "Use modifier while in the edit mode.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	RNA_def_property_ui_icon(prop, ICON_EDITMODE_HLT, 0);
 	
 	prop= RNA_def_property(srna, "on_cage", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_OnCage);
 	RNA_def_property_ui_text(prop, "On Cage", "Enable direct editing of modifier control cage.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Expanded);
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index bbb10991564..50ccbc86719 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -39,9 +39,9 @@
 #include "DNA_property_types.h"
 #include "DNA_scene_types.h"
 
+#include "WM_api.h"
 #include "WM_types.h"
 
-
 EnumPropertyItem object_mode_items[] = {
 	{OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object", ""},
 	{OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit", ""},
@@ -84,17 +84,18 @@ static EnumPropertyItem parent_type_items[] = {
 
 void rna_Object_update(bContext *C, PointerRNA *ptr)
 {
-	DAG_object_flush_update(CTX_data_scene(C), ptr->id.data, OB_RECALC_OB);
+	DAG_id_flush_update(ptr->id.data, OB_RECALC_OB);
 }
 
 void rna_Object_update_data(bContext *C, PointerRNA *ptr)
 {
-	DAG_object_flush_update(CTX_data_scene(C), ptr->id.data, OB_RECALC_DATA);
+	DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ptr->id.data);
 }
 
 static void rna_Object_dependency_update(bContext *C, PointerRNA *ptr)
 {
-	DAG_object_flush_update(CTX_data_scene(C), ptr->id.data, OB_RECALC_OB);
+	DAG_id_flush_update(ptr->id.data, OB_RECALC_OB);
 	DAG_scene_sort(CTX_data_scene(C));
 }
 
@@ -1042,7 +1043,7 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_editable_func(prop, "rna_Object_data_editable");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Data", "Object data.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_Object_update_data");
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "type");
@@ -1223,13 +1224,13 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "VertexGroup");
 	RNA_def_property_pointer_funcs(prop, "rna_Object_active_vertex_group_get", "rna_Object_active_vertex_group_set", NULL);
 	RNA_def_property_ui_text(prop, "Active Vertex Group", "Vertex groups of the object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_Object_update_data");
 
 	prop= RNA_def_property(srna, "active_vertex_group_index", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "actdef");
 	RNA_def_property_int_funcs(prop, "rna_Object_active_vertex_group_index_get", "rna_Object_active_vertex_group_index_set", "rna_Object_active_vertex_group_index_range");
 	RNA_def_property_ui_text(prop, "Active Vertex Group Index", "Active index in vertex group array.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_Object_update_data");
 
 	/* empty */
 
@@ -1490,7 +1491,7 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_Object_shape_key_lock_set");
 	RNA_def_property_ui_text(prop, "Shape Key Lock", "Always show the current Shape for this Object.");
 	RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1);
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_Object_update_data");
 
 	prop= RNA_def_property(srna, "active_shape_key", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ShapeKey");
@@ -1501,7 +1502,7 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "shapenr");
 	RNA_def_property_int_funcs(prop, "rna_Object_active_shape_key_index_get", "rna_Object_active_shape_key_index_set", "rna_Object_active_shape_key_index_range");
 	RNA_def_property_ui_text(prop, "Active Shape Key Index", "Current shape key index.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_Object_update_data");
 
 	RNA_api_object(srna);
 }
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 932bef9969d..3dfbfcccacf 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -54,7 +54,6 @@
 
 static void rna_Cache_change(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	PointCache *cache = (PointCache*)ptr->data;
 	PTCacheID *pid = NULL;
@@ -67,7 +66,7 @@ static void rna_Cache_change(bContext *C, PointerRNA *ptr)
 
 	BKE_ptcache_ids_from_object(&pidlist, ob);
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 
 	for(pid=pidlist.first; pid; pid=pid->next) {
 		if(pid->cache==cache)
@@ -105,7 +104,6 @@ static void rna_Cache_toggle_disk_cache(bContext *C, PointerRNA *ptr)
 
 static void rna_Cache_idname_change(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 	PointCache *cache = (PointCache*)ptr->data;
 	PTCacheID *pid = NULL, *pid2= NULL;
@@ -133,7 +131,7 @@ static void rna_Cache_idname_change(bContext *C, PointerRNA *ptr)
 		cache->flag &= ~(PTCACHE_OUTDATED|PTCACHE_FRAMES_SKIPPED);
 
 		BKE_ptcache_load_external(pid);
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		for(pid=pidlist.first; pid; pid=pid->next) {
@@ -362,7 +360,6 @@ static void rna_SoftBodySettings_goal_vgroup_set(PointerRNA *ptr, const char *va
 
 static void rna_FieldSettings_update(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= (Object*)ptr->id.data;
 
 	if(ob->pd->forcefield != PFIELD_TEXTURE && ob->pd->tex) {
@@ -370,7 +367,7 @@ static void rna_FieldSettings_update(bContext *C, PointerRNA *ptr)
 		ob->pd->tex= 0;
 	}
 
-	DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+	DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 }
 
@@ -413,9 +410,9 @@ static void rna_FieldSettings_dependency_update(bContext *C, PointerRNA *ptr)
 	DAG_scene_sort(scene);
 
 	if(ob->type == OB_CURVE && ob->pd->forcefield == PFIELD_GUIDE)
-		DAG_object_flush_update(scene, ob, OB_RECALC);
+		DAG_id_flush_update(&ob->id, OB_RECALC);
 	else
-		DAG_object_flush_update(scene, ob, OB_RECALC_OB);
+		DAG_id_flush_update(&ob->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 }
@@ -437,13 +434,20 @@ static void rna_CollisionSettings_dependency_update(bContext *C, PointerRNA *ptr
 
 static void rna_CollisionSettings_update(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene= CTX_data_scene(C);
 	Object *ob= (Object*)ptr->id.data;
 
-	DAG_object_flush_update(scene, ob, OB_RECALC);
+	DAG_id_flush_update(&ob->id, OB_RECALC);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 }
 
+static void rna_softbody_update(bContext *C, PointerRNA *ptr)
+{
+	Object *ob= (Object*)ptr->id.data;
+
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+}
+
 #else
 
 static void rna_def_pointcache(BlenderRNA *brna)
@@ -896,25 +900,25 @@ static void rna_def_softbody(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "mediafrict");
 	RNA_def_property_range(prop, 0.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Friction", "General media friction for point movements");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "mass", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "nodemass");
 	RNA_def_property_range(prop, 0.0f, 50000.0f);
 	RNA_def_property_ui_text(prop, "Mass", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_ACCELERATION);
 	RNA_def_property_float_sdna(prop, NULL, "grav");
 	RNA_def_property_range(prop, -10.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Gravitation", "Apply gravitation to point movement");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "speed", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "physics_speed");
 	RNA_def_property_range(prop, 0.01f, 100.0f);
 	RNA_def_property_ui_text(prop, "Speed", "Tweak timing for physics to control frequency and speed");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	/* Goal */
 	
@@ -927,31 +931,31 @@ static void rna_def_softbody(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "mingoal");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Goal Minimum", "Goal minimum, vertex group weights are scaled to match this range.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 
 	prop= RNA_def_property(srna, "goal_max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "maxgoal");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Goal Maximum", "Goal maximum, vertex group weights are scaled to match this range.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 
 	prop= RNA_def_property(srna, "goal_default", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "defgoal");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Goal Default", "Default Goal (vertex target position) value, when no Vertex Group used.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "goal_spring", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "goalspring");
 	RNA_def_property_range(prop, 0.0f, 0.999f);
 	RNA_def_property_ui_text(prop, "Goal Stiffness", "Goal (vertex target position) spring stiffness.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "goal_friction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "goalfrict");
 	RNA_def_property_range(prop, 0.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Goal Damping", "Goal (vertex target position) friction.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	/* Edge Spring Settings */
 	
@@ -959,43 +963,43 @@ static void rna_def_softbody(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "inspring");
 	RNA_def_property_range(prop, 0.0f, 0.999f);
 	RNA_def_property_ui_text(prop, "Pull", "Edge spring stiffness when longer than rest length");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "push", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "inpush");
 	RNA_def_property_range(prop, 0.0f, 0.999f);
 	RNA_def_property_ui_text(prop, "Push", "Edge spring stiffness when shorter than rest length");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "damp", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "infrict");
 	RNA_def_property_range(prop, 0.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Damp", "Edge spring friction");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "spring_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "springpreload");
 	RNA_def_property_range(prop, 0.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "SL", "Alter spring length to shrink/blow up (unit %) 0 to disable");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "aero", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "aeroedge");
 	RNA_def_property_range(prop, 0.0f, 30000.0f);
 	RNA_def_property_ui_text(prop, "Aero", "Make edges 'sail'");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "plastic", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "plastic");
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Plastic", "Permanent deform");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "bending", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "secondspring");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Bending", "Bending Stiffness");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "shear", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "shearstiff");
@@ -1008,25 +1012,25 @@ static void rna_def_softbody(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "sbc_mode");
 	RNA_def_property_enum_items(prop, collision_type_items);
 	RNA_def_property_ui_text(prop, "Collision Type", "Choose Collision Type");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "ball_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "colball");
 	RNA_def_property_range(prop, -10.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Ball Size", "Absolute ball size or factor if not manual adjusted");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "ball_stiff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "ballstiff");
 	RNA_def_property_range(prop, 0.001f, 100.0f);
 	RNA_def_property_ui_text(prop, "Ball Size", "Ball inflating presure");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "ball_damp", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "balldamp");
 	RNA_def_property_range(prop, 0.001f, 1.0f);
 	RNA_def_property_ui_text(prop, "Ball Size", "Blending to inelastic collision");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	/* Solver */
 	
@@ -1034,36 +1038,36 @@ static void rna_def_softbody(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "rklimit");
 	RNA_def_property_range(prop, 0.001f, 10.0f);
 	RNA_def_property_ui_text(prop, "Error Limit", "The Runge-Kutta ODE solver error limit, low value gives more precision, high values speed");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "minstep", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "minloops");
 	RNA_def_property_range(prop, 0, 30000);
 	RNA_def_property_ui_text(prop, "Min Step", "Minimal # solver steps/frame");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "maxstep", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "maxloops");
 	RNA_def_property_range(prop, 0, 30000);
 	RNA_def_property_ui_text(prop, "Max Step", "Maximal # solver steps/frame");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "choke", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "choke");
 	RNA_def_property_range(prop, 0, 100);
 	RNA_def_property_ui_text(prop, "Choke", "'Viscosity' inside collision target");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "fuzzy", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "fuzzyness");
 	RNA_def_property_range(prop, 1, 100);
 	RNA_def_property_ui_text(prop, "Fuzzy", "Fuzzyness while on collision, high values make collsion handling faster but less stable");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "auto_step", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "solverflags", SBSO_OLDERR);
 	RNA_def_property_ui_text(prop, "V", "Use velocities for automagic step sizes");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "diagnose", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "solverflags", SBSO_MONITOR);
@@ -1074,37 +1078,37 @@ static void rna_def_softbody(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "use_goal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_use_goal_get", "rna_SoftBodySettings_use_goal_set");
 	RNA_def_property_ui_text(prop, "Use Goal", "Define forces for vertices to stick to animated position.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "use_edges", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_use_edges_get", "rna_SoftBodySettings_use_edges_set");
 	RNA_def_property_ui_text(prop, "Use Edges", "Use Edges as springs");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "stiff_quads", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_stiff_quads_get", "rna_SoftBodySettings_stiff_quads_set");
 	RNA_def_property_ui_text(prop, "Stiff Quads", "Adds diagonal springs on 4-gons.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "edge_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_edge_collision_get", "rna_SoftBodySettings_edge_collision_set");
 	RNA_def_property_ui_text(prop, "Edge Collision", "Edges collide too.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "face_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_face_collision_get", "rna_SoftBodySettings_face_collision_set");
 	RNA_def_property_ui_text(prop, "Face Collision", "Faces collide too, SLOOOOOW warning.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "new_aero", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_new_aero_get", "rna_SoftBodySettings_new_aero_set");
 	RNA_def_property_ui_text(prop, "N", "New aero(uses angle and length).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop= RNA_def_property(srna, "self_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_self_collision_get", "rna_SoftBodySettings_self_collision_set");
 	RNA_def_property_ui_text(prop, "Self Collision", "Enable naive vertex ball self collision.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_Object_update_data");
+	RNA_def_property_update(prop, 0, "rna_softbody_update");
 }
 
 void RNA_def_object_force(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index a1f35eca3c2..2525209c3be 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -114,12 +114,14 @@ static void rna_Particle_redo(bContext *C, PointerRNA *ptr)
 		psys->recalc = PSYS_RECALC_REDO;
 
 		if(ob)
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		part = ptr->id.data;
 		psys_flush_particle_settings(scene, part, PSYS_RECALC_REDO);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 
 static void rna_Particle_reset(bContext *C, PointerRNA *ptr)
@@ -134,13 +136,15 @@ static void rna_Particle_reset(bContext *C, PointerRNA *ptr)
 		psys->recalc = PSYS_RECALC_RESET;
 
 		if(ob) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 	else {
 		part = ptr->id.data;
 		psys_flush_particle_settings(scene, part, PSYS_RECALC_RESET);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 
 static void rna_Particle_target_reset(bContext *C, PointerRNA *ptr)
@@ -172,22 +176,23 @@ static void rna_Particle_target_reset(bContext *C, PointerRNA *ptr)
 		
 		psys->recalc = PSYS_RECALC_RESET;
 
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		DAG_scene_sort(scene);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 
 static void rna_Particle_target_redo(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
-
 	if(ptr->type==&RNA_ParticleTarget) {
 		Object *ob = (Object*)ptr->id.data;
 		ParticleSystem *psys = psys_get_current(ob);
 		
 		psys->recalc = PSYS_RECALC_REDO;
 
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 	}
 }
 
@@ -203,13 +208,15 @@ static void rna_Particle_change_type(bContext *C, PointerRNA *ptr)
 		psys->recalc = PSYS_RECALC_RESET|PSYS_RECALC_TYPE;
 
 		if(ob) {
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 	else {
 		part = ptr->id.data;
 		psys_flush_particle_settings(scene, part, PSYS_RECALC_RESET|PSYS_RECALC_TYPE);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 
 static void rna_Particle_change_physics(bContext *C, PointerRNA *ptr)
@@ -217,6 +224,7 @@ static void rna_Particle_change_physics(bContext *C, PointerRNA *ptr)
 	Scene *scene = CTX_data_scene(C);
 	ParticleSettings *part = ptr->id.data;
 	psys_flush_particle_settings(scene, part, PSYS_RECALC_RESET|PSYS_RECALC_PHYS);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 
 static void rna_Particle_redo_child(bContext *C, PointerRNA *ptr)
@@ -231,13 +239,15 @@ static void rna_Particle_redo_child(bContext *C, PointerRNA *ptr)
 		psys->recalc = PSYS_RECALC_CHILD;
 
 		if(ob)
-			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	}
 	else {
 		part = ptr->id.data;
 
 		psys_flush_particle_settings(scene, part, PSYS_RECALC_CHILD);
 	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
 static PointerRNA rna_particle_settings_get(PointerRNA *ptr)
 {
@@ -892,19 +902,19 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_REACT_STA_END);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Start/End", "Give birth to unreacted particles eventually.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "react_multiple", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_REACT_MULTIPLE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Multi React", "React multiple times.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "loop", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_LOOP);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Loop", "Loop particle lives.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* TODO: used somewhere? */
 	prop= RNA_def_property(srna, "hair_geometry", PROP_BOOLEAN, PROP_NONE);
@@ -914,94 +924,94 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "unborn", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_UNBORN);
 	RNA_def_property_ui_text(prop, "Unborn", "Show particles before they are emitted.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "died", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_DIED);
 	RNA_def_property_ui_text(prop, "Died", "Show particles after they have died");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "trand", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_TRAND);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Random", "Emit in random order of elements");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "even_distribution", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_EDISTR);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Even Distribution", "Use even distribution from faces based on face areas or edge lengths.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "sticky", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_STICKY);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Sticky", "Particles stick to collided objects if they die in the collision.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "die_on_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_DIE_ON_COL);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Die on hit", "Particles die when they collide with a deflector object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "size_deflect", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SIZE_DEFL);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Size Deflect", "Use particle's size in deflection.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "rotation_dynamic", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_ROT_DYN);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Dynamic", "Sets rotation to dynamic/constant");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "sizemass", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SIZEMASS);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Mass from Size", "Multiply mass with particle size.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "boids_2d", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_BOIDS_2D);
 	RNA_def_property_ui_text(prop, "Boids 2D", "Constrain boids to a surface");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "branching", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_BRANCHING);
 	RNA_def_property_ui_text(prop, "Branching", "Branch child paths from each other.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "animate_branching", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_ANIM_BRANCHING);
 	RNA_def_property_ui_text(prop, "Animated", "Animate branching");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "symmetric_branching", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SYMM_BRANCHING);
 	RNA_def_property_ui_text(prop, "Symmetric", "Start and end points are the same.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "hair_bspline", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_HAIR_BSPLINE);
 	RNA_def_property_ui_text(prop, "B-Spline", "Interpolate hair using B-Splines.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "grid_invert", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_GRID_INVERT);
 	RNA_def_property_ui_text(prop, "Invert", "Invert what is considered object and what is not.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "child_effector", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_EFFECT);
 	RNA_def_property_ui_text(prop, "Children", "Apply effectors to children.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "child_seams", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_SEAMS);
 	RNA_def_property_ui_text(prop, "Use seams", "Use seams to determine parents");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	/* TODO: used somewhere? */
 	prop= RNA_def_property(srna, "child_render", PROP_BOOLEAN, PROP_NONE);
@@ -1011,19 +1021,19 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "child_guide", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_GUIDE);
 	RNA_def_property_ui_text(prop, "child_guide", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "self_effect", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SELF_EFFECT);
 	RNA_def_property_ui_text(prop, "Self Effect", "Particle effectors effect themselves.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, type_items);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Type", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_change_type");
+	RNA_def_property_update(prop, 0, "rna_Particle_change_type");
 
 	prop= RNA_def_property(srna, "emit_from", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "from");
@@ -1031,14 +1041,14 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_from_itemf");
 	RNA_def_property_ui_text(prop, "Emit From", "Where to emit particles from");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "distribution", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "distr");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_enum_items(prop, dist_items);
 	RNA_def_property_ui_text(prop, "Distribution", "How to distribute particles on selected element");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* physics modes */
 	prop= RNA_def_property(srna, "physics_type", PROP_ENUM, PROP_NONE);
@@ -1046,130 +1056,130 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_enum_items(prop, phys_type_items);
 	RNA_def_property_ui_text(prop, "Physics Type", "Particle physics type");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_change_physics");
+	RNA_def_property_update(prop, 0, "rna_Particle_change_physics");
 
 	prop= RNA_def_property(srna, "rotation_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "rotmode");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_enum_items(prop, rot_mode_items);
 	RNA_def_property_ui_text(prop, "Rotation", "Particles initial rotation");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "angular_velocity_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "avemode");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_enum_items(prop, ave_mode_items);
 	RNA_def_property_ui_text(prop, "Angular Velocity Mode", "Particle angular velocity mode.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "react_event", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "reactevent");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_enum_items(prop, react_event_items);
 	RNA_def_property_ui_text(prop, "React On", "The event of target particles to react on.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/*draw flag*/
 	prop= RNA_def_property(srna, "velocity", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_VEL);
 	RNA_def_property_ui_text(prop, "Velocity", "Show particle velocity");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "show_size", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_SIZE);
 	RNA_def_property_ui_text(prop, "Size", "Show particle size");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "emitter", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_EMITTER);
 	RNA_def_property_ui_text(prop, "Emitter", "Render emitter Object also.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "draw_health", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_HEALTH);
 	RNA_def_property_ui_text(prop, "Health", "Draw boid health");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "abs_path_time", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_ABS_PATH_TIME);
 	RNA_def_property_ui_text(prop, "Absolute Path Time", "Path timing is in absolute frames");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_abspathtime_update");
+	RNA_def_property_update(prop, 0, "rna_Particle_abspathtime_update");
 
 	prop= RNA_def_property(srna, "billboard_lock", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_BB_LOCK);
 	RNA_def_property_ui_text(prop, "Lock Billboard", "Lock the billboards align axis");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "parent", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_PARENT);
 	RNA_def_property_ui_text(prop, "Parents", "Render parent particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "num", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_NUM);
 	RNA_def_property_ui_text(prop, "Number", "Show particle number");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "rand_group", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_RAND_GR);
 	RNA_def_property_ui_text(prop, "Pick Random", "Pick objects from group randomly");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "render_adaptive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_REN_ADAPT);
 	RNA_def_property_ui_text(prop, "Adaptive render", "Draw steps of the particle path");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "velocity_length", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_VEL_LENGTH);
 	RNA_def_property_ui_text(prop, "Speed", "Multiply line length by particle speed");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "material_color", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_MAT_COL);
 	RNA_def_property_ui_text(prop, "Material Color", "Draw particles using material's diffuse color.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "whole_group", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_WHOLE_GR);
 	RNA_def_property_ui_text(prop, "Whole Group", "Use whole group at once.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "render_strand", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_REN_STRAND);
 	RNA_def_property_ui_text(prop, "Strand render", "Use the strand primitive for rendering");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "draw_as", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "draw_as");
 	RNA_def_property_enum_items(prop, part_draw_as_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_draw_as_itemf");
 	RNA_def_property_ui_text(prop, "Particle Drawing", "How particles are drawn in viewport");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "ren_as", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "ren_as");
 	RNA_def_property_enum_items(prop, part_ren_as_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_ren_as_itemf");
 	RNA_def_property_ui_text(prop, "Particle Rendering", "How particles are rendered");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "draw_size", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 10);
 	RNA_def_property_ui_text(prop, "Draw Size", "Size of particles on viewport in pixels (0=default)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "child_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "childtype");
 	RNA_def_property_enum_items(prop, child_type_items);
 	RNA_def_property_ui_text(prop, "Children From", "Create child particles");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "draw_step", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 7);
 	RNA_def_property_ui_range(prop, 0, 10, 1, 0);
 	RNA_def_property_ui_text(prop, "Steps", "How many steps paths are drawn with (power of 2)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "render_step", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "ren_step");
@@ -1180,7 +1190,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "hair_step", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 2, 50);
 	RNA_def_property_ui_text(prop, "Segments", "Number of hair segments");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 
 	//TODO: not found in UI, readonly?
@@ -1203,13 +1213,13 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "disp");
 	RNA_def_property_range(prop, 0, 100);
 	RNA_def_property_ui_text(prop, "Display", "Percentage of particles to display in 3d view");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "material", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "omat");
 	RNA_def_property_range(prop, 1, 16);
 	RNA_def_property_ui_text(prop, "Material", "Specify material used for the particles");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 
 	//TODO: is this read only/internal?
@@ -1221,24 +1231,24 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "integrator", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, integrator_type_items);
 	RNA_def_property_ui_text(prop, "Integration", "Select physics integrator type");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "kink", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, kink_type_items);
 	RNA_def_property_ui_text(prop, "Kink", "Type of periodic offset on the path");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "kink_axis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, kink_axis_items);
 	RNA_def_property_ui_text(prop, "Axis", "Which axis to use for offset");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	/* billboards */
 	prop= RNA_def_property(srna, "billboard_align", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "bb_align");
 	RNA_def_property_enum_items(prop, bb_align_items);
 	RNA_def_property_ui_text(prop, "Align to", "In respect to what the billboards are aligned");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "billboard_uv_split", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "bb_uv_split");
@@ -1260,13 +1270,13 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "bb_tilt");
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Tilt", "Tilt of the billboards");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "billboard_random_tilt", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "bb_rand_tilt");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random Tilt", "Random tilt of the billboards");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "billboard_offset", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "bb_offset");
@@ -1274,7 +1284,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, -100.0f, 100.0f);
 	RNA_def_property_ui_range(prop, -1.0, 1.0, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Billboard Offset", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	/* simplification */
 	prop= RNA_def_property(srna, "enable_simplify", PROP_BOOLEAN, PROP_NONE);
@@ -1309,7 +1319,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_float_funcs(prop, NULL, "rna_PartSettings_start_set", NULL);
 	RNA_def_property_ui_text(prop, "Start", "Frame # to start emitting particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "end", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
@@ -1317,37 +1327,37 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_float_funcs(prop, NULL, "rna_PartSettings_end_set", NULL);
 	RNA_def_property_ui_text(prop, "End", "Frame # to stop emitting particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "lifetime", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_range(prop, 1.0f, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Lifetime", "Specify the life span of the particles");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "random_lifetime", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "randlife");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random", "Give the particle life a random variation.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "time_tweak", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "timetweak");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Tweak", "A multiplier for physics timestep (1.0 means one frame = 1/25 seconds)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "jitter_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_float_sdna(prop, NULL, "jitfac");
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Amount", "Amount of jitter applied to the sampling.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "effect_hair", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "eff_hair");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Stiffnes", "Hair stiffness for effectors");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "amount", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "totpart");
@@ -1358,14 +1368,14 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 10000000);
 	RNA_def_property_ui_range(prop, 0, 100000, 1, 0);
 	RNA_def_property_ui_text(prop, "Amount", "Total number of particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "userjit", PROP_INT, PROP_UNSIGNED);//TODO: can we get a better name for userjit?
 	RNA_def_property_int_sdna(prop, NULL, "userjit");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_range(prop, 0, 1000);
 	RNA_def_property_ui_text(prop, "P/F", "Emission locations / face (0 = automatic).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "grid_resolution", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "grid_res");
@@ -1373,102 +1383,102 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 1, 46); /* ~100k particles in a cube */
 	RNA_def_property_ui_range(prop, 1, 215, 1, 0); /* ~10M particles in a cube */
 	RNA_def_property_ui_text(prop, "Resolution", "The resolution of the particle grid.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* initial velocity factors */
 	prop= RNA_def_property(srna, "normal_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "normfac");//optional if prop names are the same
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Normal", "Let the surface normal give the particle a starting speed.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "object_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "obfac");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, -1.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Object", "Let the object give the particle a starting speed");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "random_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "randfac");//optional if prop names are the same
 	RNA_def_property_range(prop, 0.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Random", "Give the starting speed a random variation.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "particle_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "partfac");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, -1.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Particle", "Let the target particle give the particle a starting speed.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "tangent_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "tanfac");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Tangent", "Let the surface tangent give the particle a starting speed.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "tangent_phase", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "tanphase");
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Rot", "Rotate the surface tangent.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "reactor_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "reactfac");
 	RNA_def_property_range(prop, -10.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Reactor", "Let the vector away from the target particles location give the particle a starting speed.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "angular_velocity_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "avefac");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Angular Velocity", "Angular velocity amount");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "phase_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "phasefac");
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Phase", "Initial rotation phase");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "random_rotation_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "randrotfac");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random Rotation", "Randomize rotation");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "random_phase_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "randphasefac");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random Phase", "Randomize rotation phase");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* physical properties */
 	prop= RNA_def_property(srna, "mass", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.001f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 100.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Mass", "Specify the mass of the particles");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "particle_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "size");
 	RNA_def_property_range(prop, 0.001f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 100.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Size", "The size of the particles");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "random_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "randsize");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random Size", "Give the particle size a random variation");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "reaction_shape", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "reactshape");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Shape", "Power of reaction strength dependence on distance to target.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 
 	/* global physical properties */
@@ -1477,38 +1487,38 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Acceleration", "Constant acceleration");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_ACCELERATION);
 	RNA_def_property_float_sdna(prop, NULL, "acc[2]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Gravity", "Constant acceleration in global Z axis direction");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "drag_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "dragfac");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Drag", "Specify the amount of air-drag.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "brownian_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "brownfac");
 	RNA_def_property_range(prop, 0.0f, 200.0f);
 	RNA_def_property_ui_text(prop, "Brownian", "Specify the amount of brownian motion");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "damp_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "dampfac");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Damp", "Specify the amount of damping");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* random length */
 	prop= RNA_def_property(srna, "random_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "randlength");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random Length", "Give path length a random variation.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	/* children */
 	prop= RNA_def_property(srna, "child_nbr", PROP_INT, PROP_NONE);
@@ -1516,7 +1526,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 100000);
 	RNA_def_property_ui_range(prop, 0, 1000, 1, 0);
 	RNA_def_property_ui_text(prop, "Children Per Parent", "Amount of children/parent");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rendered_child_nbr", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "ren_child_nbr");
@@ -1528,45 +1538,45 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "parents");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Virtual Parents", "Relative amount of virtual parents.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "child_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "childsize");
 	RNA_def_property_range(prop, 0.001f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 100.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Child Size", "A multiplier for the child particle size.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "child_random_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "childrandsize");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Random Child Size", "Random variation to the size of the child particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "child_radius", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "childrad");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Child Radius", "Radius of children around parent.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "child_roundness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "childflat");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Child Roundness", "Roundness of children around parent.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	/* clumping */
 	prop= RNA_def_property(srna, "clump_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "clumpfac");
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Clump", "Amount of clumping");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "clumppow", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "clumppow");
 	RNA_def_property_range(prop, -0.999f, 0.999f);
 	RNA_def_property_ui_text(prop, "Shape", "Shape of clumping");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 
 	/* kink */
@@ -1575,19 +1585,19 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, -100000.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, -10.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Amplitude", "The amplitude of the offset.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "kink_frequency", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "kink_freq");
 	RNA_def_property_range(prop, -100000.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, -10.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Frequency", "The frequency of the offset (1/total length)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "kink_shape", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -0.999f, 0.999f);
 	RNA_def_property_ui_text(prop, "Shape", "Adjust the offset to the beginning/end");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 
 	/* rough */
@@ -1595,64 +1605,64 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Rough1", "Amount of location dependent rough.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rough1_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.01f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Size1", "Size of location dependent rough.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rough2", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rough2");
 	RNA_def_property_range(prop, 0.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Rough2", "Amount of random rough.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rough2_size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rough2_size");
 	RNA_def_property_range(prop, 0.01f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Size2", "Size of random rough.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rough2_thres", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rough2_thres");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Threshold", "Amount of particles left untouched by random rough.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rough_endpoint", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rough_end");
 	RNA_def_property_range(prop, 0.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Rough Endpoint", "Amount of end point rough.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "rough_end_shape", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Shape", "Shape of end point rough");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "child_length", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "clength");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Length", "Length of child paths");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "child_length_thres", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "clength_thres");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Threshold", "Amount of particles left untouched by child path length.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	/* branching */
 	prop= RNA_def_property(srna, "branch_threshold", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "branch_thres");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Threshold", "Threshold of branching.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	/* drawing stuff */
 	prop= RNA_def_property(srna, "line_length_tail", PROP_FLOAT, PROP_NONE);
@@ -1660,33 +1670,33 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Back", "Length of the line's tail");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "line_length_head", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_funcs(prop, "rna_PartSetting_linelenhead_get", "rna_PartSetting_linelenhead_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 100000.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Head", "Length of the line's head");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "path_start", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "path_start");
 	RNA_def_property_float_funcs(prop, NULL, NULL, "rna_PartSetting_pathstartend_range");
 	RNA_def_property_ui_text(prop, "Path Start", "Starting time of drawn path.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "path_end", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "path_end");
 	RNA_def_property_float_funcs(prop, NULL, NULL, "rna_PartSetting_pathstartend_range");
 	RNA_def_property_ui_text(prop, "Path End", "End time of drawn path.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "trail_count", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "trail_count");
 	RNA_def_property_range(prop, 1, 100000);
 	RNA_def_property_ui_range(prop, 1, 100, 1, 0);
 	RNA_def_property_ui_text(prop, "Trail Count", "Number of trail particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	/* keyed particles */
 	prop= RNA_def_property(srna, "keyed_loops", PROP_INT, PROP_NONE);
@@ -1694,7 +1704,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 1.0f, 10000.0f);
 	RNA_def_property_ui_range(prop, 1.0f, 100.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Loop count", "Number of times the keys are looped.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	/* boids */
 	prop= RNA_def_property(srna, "boids", PROP_POINTER, PROP_NONE);
@@ -1709,21 +1719,21 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "Group");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Dupli Group", "Show Objects in this Group in place of particles");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "dupli_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "dup_ob");
 	RNA_def_property_struct_type(prop, "Object");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Dupli Object", "Show this Object in place of particles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "billboard_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "bb_ob");
 	RNA_def_property_struct_type(prop, "Object");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Billboard Object", "Billboards face this object (default is active camera)");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	/* effectors */
 	prop= RNA_def_property(srna, "effector_group", PROP_POINTER, PROP_NONE);
@@ -1731,77 +1741,77 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "Group");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Effector Group", "Limit effectors to this Group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_all", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[0]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "All", "All effector's weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_spherical", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[1]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Spherical", "Spherical effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_vortex", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[2]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Vortex", "Vortex effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_magnetic", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[3]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Magnetic", "Magnetic effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_wind", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[4]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Wind", "Wind effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_curveguide", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[5]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Curve Guide", "Curve guide effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_texture", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[6]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Magnetic", "Texture effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_harmonic", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[7]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Harmonic", "Harmonic effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_charge", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[8]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Charge", "Charge effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_lennardjones", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[9]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Lennard-Jones", "Lennard-Jones effector weight.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 	
 	/* animation here? */
 	rna_def_animdata_common(srna);
@@ -1836,25 +1846,25 @@ static void rna_def_particle_target(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "ob");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Target Object", "The object that has the target particle system (empty if same object).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_target_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_target_reset");
 
 	prop= RNA_def_property(srna, "system", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "psys");
 	RNA_def_property_range(prop, 1, INT_MAX);
 	RNA_def_property_ui_text(prop, "Target Particle System", "The index of particle system on the target object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_target_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_target_reset");
 
 	prop= RNA_def_property(srna, "time", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_float_sdna(prop, NULL, "time");
 	RNA_def_property_range(prop, 0.0, 30000.0f); //TODO: replace 30000 with MAXFRAMEF when available in 2.5
 	RNA_def_property_ui_text(prop, "Time", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_target_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_target_redo");
 
 	prop= RNA_def_property(srna, "duration", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "duration");
 	RNA_def_property_range(prop, 0.0, 30000.0f); //TODO: replace 30000 with MAXFRAMEF when available in 2.5
 	RNA_def_property_ui_text(prop, "Duration", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_target_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_target_redo");
 
 	prop= RNA_def_property(srna, "valid", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PTARGET_VALID);
@@ -1865,7 +1875,7 @@ static void rna_def_particle_target(BlenderRNA *brna)
 	RNA_def_property_enum_items(prop, mode_items);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Mode", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_target_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_target_reset");
 
 }
 static void rna_def_particle_system(BlenderRNA *brna)
@@ -1889,7 +1899,7 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_pointer_funcs(prop, "rna_particle_settings_get", "rna_particle_settings_set", NULL);
 	RNA_def_property_ui_text(prop, "Settings", "Particle system settings.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "particles", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "particles", "totpart");
@@ -1903,7 +1913,7 @@ static void rna_def_particle_system(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_ui_text(prop, "Seed", "Offset in the random number table, to get a different randomized result.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* hair */
 	prop= RNA_def_property(srna, "softbody", PROP_POINTER, PROP_NONE);
@@ -1919,20 +1929,20 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "target_ob");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Reactor Target Object", "For reactor systems, the object that has the target particle system (empty if same object).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "reactor_target_particle_system", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "target_psys");
 	RNA_def_property_range(prop, 1, INT_MAX);
 	RNA_def_property_ui_text(prop, "Reactor Target Particle System", "For reactor systems, index of particle system on the target object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* keyed */
 	prop= RNA_def_property(srna, "keyed_timing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_KEYED_TIMING);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Keyed timing", "Use key times");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "targets", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ParticleTarget");
@@ -1968,122 +1978,122 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "vertex_group_density", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[0]");
 	RNA_def_property_ui_text(prop, "Vertex Group Density", "Vertex group to control density.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_density_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_DENSITY));
 	RNA_def_property_ui_text(prop, "Vertex Group Density Negate", "Negate the effect of the density vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_velocity", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[1]");
 	RNA_def_property_ui_text(prop, "Vertex Group Velocity", "Vertex group to control velocity.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_velocity_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_VEL));
 	RNA_def_property_ui_text(prop, "Vertex Group Velocity Negate", "Negate the effect of the velocity vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_length", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[2]");
 	RNA_def_property_ui_text(prop, "Vertex Group Length", "Vertex group to control length.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "vertex_group_length_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_LENGTH));
 	RNA_def_property_ui_text(prop, "Vertex Group Length Negate", "Negate the effect of the length vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	prop= RNA_def_property(srna, "vertex_group_clump", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[3]");
 	RNA_def_property_ui_text(prop, "Vertex Group Clump", "Vertex group to control clump.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_clump_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_CLUMP));
 	RNA_def_property_ui_text(prop, "Vertex Group Clump Negate", "Negate the effect of the clump vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_kink", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[4]");
 	RNA_def_property_ui_text(prop, "Vertex Group Kink", "Vertex group to control kink.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_kink_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_KINK));
 	RNA_def_property_ui_text(prop, "Vertex Group Kink Negate", "Negate the effect of the kink vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_roughness1", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[5]");
 	RNA_def_property_ui_text(prop, "Vertex Group Roughness 1", "Vertex group to control roughness 1.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_roughness1_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROUGH1));
 	RNA_def_property_ui_text(prop, "Vertex Group Roughness 1 Negate", "Negate the effect of the roughness 1 vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_roughness2", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[6]");
 	RNA_def_property_ui_text(prop, "Vertex Group Roughness 2", "Vertex group to control roughness 2.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_roughness2_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROUGH2));
 	RNA_def_property_ui_text(prop, "Vertex Group Roughness 2 Negate", "Negate the effect of the roughness 2 vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_roughness_end", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[7]");
 	RNA_def_property_ui_text(prop, "Vertex Group Roughness End", "Vertex group to control roughness end.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_roughness_end_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROUGHE));
 	RNA_def_property_ui_text(prop, "Vertex Group Roughness End Negate", "Negate the effect of the roughness end vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo_child");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
 
 	prop= RNA_def_property(srna, "vertex_group_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[8]");
 	RNA_def_property_ui_text(prop, "Vertex Group Size", "Vertex group to control size.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_size_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_SIZE));
 	RNA_def_property_ui_text(prop, "Vertex Group Size Negate", "Negate the effect of the size vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_tangent", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[9]");
 	RNA_def_property_ui_text(prop, "Vertex Group Tangent", "Vertex group to control tangent.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_tangent_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_TAN));
 	RNA_def_property_ui_text(prop, "Vertex Group Tangent Negate", "Negate the effect of the tangent vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_rotation", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[10]");
 	RNA_def_property_ui_text(prop, "Vertex Group Rotation", "Vertex group to control rotation.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_rotation_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROT));
 	RNA_def_property_ui_text(prop, "Vertex Group Rotation Negate", "Negate the effect of the rotation vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_field", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "vgroup[11]");
 	RNA_def_property_ui_text(prop, "Vertex Group Field", "Vertex group to control field.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "vertex_group_field_negate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_EFFECTOR));
 	RNA_def_property_ui_text(prop, "Vertex Group Field Negate", "Negate the effect of the field vertex group.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_reset");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* pointcache */
 	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
@@ -2101,7 +2111,7 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "parent");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Parent", "Use this object's coordinate system instead of global coordinate system.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_PARTICLE, "rna_Particle_redo");
+	RNA_def_property_update(prop, 0, "rna_Particle_redo");
 
 	/* hair or cache editing */
 	prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 727e3ff6a6d..6c951b5a1b7 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -55,7 +55,7 @@ static void rna_Pose_update(bContext *C, PointerRNA *ptr)
 {
 	// XXX when to use this? ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK);
 
-	DAG_object_flush_update(CTX_data_scene(C), ptr->id.data, OB_RECALC_DATA);
+	DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA);
 }
 
 static char *rna_PoseChannel_path(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index b00119efaf6..5575b170398 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -45,13 +45,6 @@ static EnumPropertyItem particle_edit_hair_brush_items[] = {
 	{PE_BRUSH_CUT, "CUT", 0, "Cut", "Cut hairs."},
 	{0, NULL, 0, NULL, NULL}};
 
-static EnumPropertyItem particle_edit_cache_brush_items[] = {
-	{PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush."},
-	{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb paths."},
-	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth paths."},
-	{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make paths longer or shorter."},
-	{0, NULL, 0, NULL, NULL}};
-
 #ifdef RNA_RUNTIME
 
 #include "BKE_context.h"
@@ -61,6 +54,13 @@ static EnumPropertyItem particle_edit_cache_brush_items[] = {
 
 #include "ED_particle.h"
 
+static EnumPropertyItem particle_edit_cache_brush_items[] = {
+	{PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush."},
+	{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb paths."},
+	{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth paths."},
+	{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make paths longer or shorter."},
+	{0, NULL, 0, NULL, NULL}};
+
 static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr)
 {
 	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
@@ -72,7 +72,6 @@ static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr)
 	return rna_pointer_inherit_refine(ptr, &RNA_ParticleBrush, brush);
 }
 
-
 static PointerRNA rna_ParticleBrush_curve_get(PointerRNA *ptr)
 {
 	return rna_pointer_inherit_refine(ptr, &RNA_CurveMapping, NULL);
@@ -113,11 +112,9 @@ static void rna_ParticleEdit_redo(bContext *C, PointerRNA *ptr)
 
 static void rna_ParticleEdit_update(bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
 
-	if(ob)
-		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
+	if(ob) DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 }
 
 static EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *ptr, int *free)
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index d7c70d8b9e9..b3192b110f4 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -52,7 +52,7 @@
 
 static void rna_Smoke_update(bContext *C, PointerRNA *ptr)
 {
-	DAG_object_flush_update(CTX_data_scene(C), ptr->id.data, OB_RECALC_DATA);
+	DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA);
 }
 
 static void rna_Smoke_dependency_update(bContext *C, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index d6a17526a65..0ac7fa40727 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -375,65 +375,68 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "sticky");
 	RNA_def_property_enum_items(prop, sticky_mode_items);
 	RNA_def_property_ui_text(prop, "Sticky Selection Mode", "Automatically select also UVs sharing the same vertex as the ones being selected.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	/* drawing */
 	prop= RNA_def_property(srna, "edge_draw_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "dt_uv");
 	RNA_def_property_enum_items(prop, dt_uv_items);
 	RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for drawing UV edges.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "draw_smooth_edges", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_SMOOTH_UV);
 	RNA_def_property_ui_text(prop, "Draw Smooth Edges", "Draw UV edges anti-aliased.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "draw_stretch", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_STRETCH);
 	RNA_def_property_ui_text(prop, "Draw Stretch", "Draw faces colored according to the difference in shape between UVs and their 3D coordinates (blue for low distortion, red for high distortion).");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "draw_stretch_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "dt_uvstretch");
 	RNA_def_property_enum_items(prop, dt_uvstretch_items);
 	RNA_def_property_ui_text(prop, "Draw Stretch Type", "Type of stretch to draw.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "draw_modified_edges", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAWSHADOW);
 	RNA_def_property_ui_text(prop, "Draw Modified Edges", "Draw edges after modifiers are applied.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "draw_other_objects", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_OTHER);
 	RNA_def_property_ui_text(prop, "Draw Other Objects", "Draw other selected objects that share the same image.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "normalized_coordinates", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_COORDFLOATS);
 	RNA_def_property_ui_text(prop, "Normalized Coordinates", "Display UV coordinates from 0.0 to 1.0 rather than in pixels.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	/* todo: move edge and face drawing options here from G.f */
 
 	prop= RNA_def_property(srna, "snap_to_pixels", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_PIXELSNAP);
 	RNA_def_property_ui_text(prop, "Snap to Pixels", "Snap UVs to pixel locations while editing.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "constrain_to_image_bounds", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_CLIP_UV);
 	RNA_def_property_ui_text(prop, "Constrain to Image Bounds", "Constraint to stay within the image bounds while editing.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "live_unwrap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_LIVE_UNWRAP);
 	RNA_def_property_ui_text(prop, "Live Unwrap", "Continuously unwrap the selected UV island while transforming pinned vertices.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "pivot", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "around");
 	RNA_def_property_enum_items(prop, pivot_items);
 	RNA_def_property_ui_text(prop, "Pivot", "Rotation/Scaling Pivot.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 }
 
 static void rna_def_space_outliner(BlenderRNA *brna)
@@ -464,12 +467,12 @@ static void rna_def_space_outliner(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "outlinevis");
 	RNA_def_property_enum_items(prop, display_mode_items);
 	RNA_def_property_ui_text(prop, "Display Mode", "Type of information to display");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL);
 
 	prop= RNA_def_property(srna, "show_restriction_columns", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_HIDE_RESTRICTCOLS);
 	RNA_def_property_ui_text(prop, "Show Restriction Columns", "Show colum");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL);
 
 }
 
@@ -486,35 +489,34 @@ static void rna_def_background_image(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "ima");
 	RNA_def_property_ui_text(prop, "Image", "Image displayed and edited in this space.");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop= RNA_def_property(srna, "image_user", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "iuser");
 	RNA_def_property_ui_text(prop, "Image User", "Parameters defining which layer, pass and frame of the image is displayed.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xof");
 	RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally from the view center");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yof");
 	RNA_def_property_ui_text(prop, "Y Offset", "Offsets image vertically from the view center");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "size");
 	RNA_def_property_ui_text(prop, "Size", "Scaling factor for the background image.");
 	RNA_def_property_range(prop, 0.0, FLT_MAX);
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "transparency", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "blend");
 	RNA_def_property_ui_text(prop, "Transparency", "Amount to blend the image against the background color.");
 	RNA_def_property_range(prop, 0.0, 1.0);
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
-
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_space_3dview(BlenderRNA *brna)
@@ -553,10 +555,12 @@ static void rna_def_space_3dview(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "camera");
 	RNA_def_property_ui_text(prop, "Camera", "Active camera used in this view (when unlocked from the scene's active camera).");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "lock_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "ob_centre");
 	RNA_def_property_ui_text(prop, "Lock Object", "3D View center is locked to this object's position");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "background_image", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "bgpic");
@@ -566,136 +570,142 @@ static void rna_def_space_3dview(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "drawtype");
 	RNA_def_property_enum_items(prop, viewport_shading_items);
 	RNA_def_property_ui_text(prop, "Viewport Shading", "Method to display/shade objects in the 3D View.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop= RNA_def_property(srna, "localview", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "localview", 0);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Local View", "Display an isolated sub-set of objects, apart from the scene visibility.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop= RNA_def_property(srna, "lens", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "lens");
 	RNA_def_property_ui_text(prop, "Lens", "Lens angle (mm) in perspective view.");
 	RNA_def_property_range(prop, 1.0f, 250.0f);
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "near");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
 	RNA_def_property_ui_text(prop, "Clip Start", "3D View near clipping distance.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop= RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "far");
 	RNA_def_property_range(prop, 1.0f, FLT_MAX);
 	RNA_def_property_ui_text(prop, "Clip End", "3D View far clipping distance.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "grid_spacing", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "grid");
 	RNA_def_property_ui_text(prop, "Grid Spacing", "The distance between 3D View grid lines.");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "grid_lines", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gridlines");
 	RNA_def_property_ui_text(prop, "Grid Lines", "The number of grid lines to display in perspective view.");
 	RNA_def_property_range(prop, 0, 1024);
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "grid_subdivisions", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gridsubdiv");
 	RNA_def_property_ui_text(prop, "Grid Subdivisions", "The number of subdivisions between grid lines.");
 	RNA_def_property_range(prop, 1, 1024);
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "display_floor", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_FLOOR);
 	RNA_def_property_ui_text(prop, "Display Grid Floor", "Show the ground plane grid in perspective view.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "display_x_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_X);
 	RNA_def_property_ui_text(prop, "Display X Axis", "Show the X axis line in perspective view.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "display_y_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_Y);
 	RNA_def_property_ui_text(prop, "Display Y Axis", "Show the Y axis line in perspective view.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "display_z_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_Z);
 	RNA_def_property_ui_text(prop, "Display Z Axis", "Show the Z axis line in perspective view.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "outline_selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_SELECT_OUTLINE);
 	RNA_def_property_ui_text(prop, "Outline Selected", "Show an outline highlight around selected objects in non-wireframe views.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "all_object_centers", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DRAW_CENTERS);
 	RNA_def_property_ui_text(prop, "All Object Centers", "Show the object center dot for all (selected and unselected) objects.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop= RNA_def_property(srna, "relationship_lines", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", V3D_HIDE_HELPLINES);
 	RNA_def_property_ui_text(prop, "Relationship Lines", "Show dashed lines indicating parent or constraint relationships.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "textured_solid", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_SOLID_TEX);
 	RNA_def_property_ui_text(prop, "Textured Solid", "Display face-assigned textures in solid view");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "display_background_image", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_View3D_display_background_image_set");
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DISPBGPIC);
 	RNA_def_property_ui_text(prop, "Display Background Image", "Display a reference image behind objects in the 3D View");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "around");
 	RNA_def_property_enum_items(prop, pivot_items);
 	RNA_def_property_ui_text(prop, "Pivot Point", "Pivot center for rotation/scaling.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "manipulator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "twflag", V3D_USE_MANIPULATOR);
 	RNA_def_property_ui_text(prop, "Manipulator", "Use a 3D manipulator widget for controlling transforms.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "manipulator_translate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_TRANSLATE);
 	RNA_def_property_ui_text(prop, "Manipulator Translate", "Use the manipulator for movement transformations.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "manipulator_rotate", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_ROTATE);
 	RNA_def_property_ui_text(prop, "Manipulator Rotate", "Use the manipulator for rotation transformations.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "manipulator_scale", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_SCALE);
 	RNA_def_property_ui_text(prop, "Manipulator Scale", "Use the manipulator for scale transformations.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "transform_orientation", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "twmode");
 	RNA_def_property_enum_items(prop, transform_orientation_items);
 	RNA_def_property_ui_text(prop, "Transform Orientation", "The alignment of manipulator handles.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop= RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, "RegionView3D", "viewlock", RV3D_LOCKED);
 	RNA_def_property_ui_text(prop, "Lock", "Lock View Rotation");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "box_preview", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, "RegionView3D", "viewlock", RV3D_BOXVIEW);
 	RNA_def_property_ui_text(prop, "Box", "");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 	
 	prop= RNA_def_property(srna, "box_clip", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, "RegionView3D", "viewlock", RV3D_BOXCLIP);
 	RNA_def_property_ui_text(prop, "Clip", "");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_space_buttons(BlenderRNA *brna)
@@ -730,19 +740,19 @@ static void rna_def_space_buttons(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "mainb");
 	RNA_def_property_enum_items(prop, buttons_context_items);
 	RNA_def_property_ui_text(prop, "Context", "Type of active data to display and edit.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_PROPERTIES, NULL);
 	
 	prop= RNA_def_property(srna, "align", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "align");
 	RNA_def_property_enum_items(prop, align_items);
 	RNA_def_property_enum_funcs(prop, NULL, "rna_SpaceProperties_align_set", NULL);
 	RNA_def_property_ui_text(prop, "Align", "Arrangement of the panels.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_PROPERTIES, NULL);
 
 	prop= RNA_def_property(srna, "brush_texture", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SB_BRUSH_TEX);
 	RNA_def_property_ui_text(prop, "Brush Texture", "Show brush textures.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_PROPERTIES, NULL);
 
 	/* pinned data */
 	prop= RNA_def_property(srna, "pin_id", PROP_POINTER, PROP_NONE);
@@ -750,6 +760,7 @@ static void rna_def_space_buttons(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "ID");
 	RNA_def_property_pointer_funcs(prop, NULL, NULL, "rna_SpaceProperties_pin_id_typef");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_PROPERTIES, NULL);
 }
 
 static void rna_def_space_image(BlenderRNA *brna)
@@ -766,35 +777,35 @@ static void rna_def_space_image(BlenderRNA *brna)
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceImageEditor_image_set", NULL);
 	RNA_def_property_ui_text(prop, "Image", "Image displayed and edited in this space.");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "image_user", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "iuser");
 	RNA_def_property_ui_text(prop, "Image User", "Parameters defining which layer, pass and frame of the image is displayed.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "curves", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "cumap");
 	RNA_def_property_ui_text(prop, "Curves", "Color curve mapping to use for displaying the image.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "image_pin", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "pin", 0);
 	RNA_def_property_ui_text(prop, "Image Pin", "Display current image regardless of object selection.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	/* image draw */
 	prop= RNA_def_property(srna, "draw_repeated", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_TILE);
 	RNA_def_property_ui_text(prop, "Draw Repeated", "Draw the image repeated outside of the main view.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "draw_channels", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
 	RNA_def_property_enum_items(prop, dc_all_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_SpaceImageEditor_draw_channels_itemf");
 	RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the image to draw.");
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	/* uv */
 	prop= RNA_def_property(srna, "uv_editor", PROP_POINTER, PROP_NEVER_NULL);
@@ -807,7 +818,7 @@ static void rna_def_space_image(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAWTOOL);
 	RNA_def_property_ui_text(prop, "Image Painting", "Enable image painting mode.");
 	RNA_def_property_ui_icon(prop, ICON_TPAINT_HLT, 0);
-	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_SpaceImageEditor_paint_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, "rna_SpaceImageEditor_paint_update");
 
 	/* grease pencil */
 	prop= RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
@@ -866,64 +877,69 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "mainb");
 	RNA_def_property_enum_items(prop, display_mode_items);
 	RNA_def_property_ui_text(prop, "Display Mode", "The view mode to use for displaying sequencer output.");
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 		
 	/* flag's */
 	prop= RNA_def_property(srna, "draw_frames", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAWFRAMES);
 	RNA_def_property_ui_text(prop, "Draw Frames", "Draw frames rather then seconds.");
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "transform_markers", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_MARKER_TRANS);
 	RNA_def_property_ui_text(prop, "Transform Markers", "Transform markers as well as strips.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "seperate_color_preview", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_COLOR_SEPERATED);
 	RNA_def_property_ui_text(prop, "Seperate Colors", "Seperate color channels in preview.");
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 
 	prop= RNA_def_property(srna, "draw_safe_margin", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_SAFE_MARGINS);
 	RNA_def_property_ui_text(prop, "Safe Margin", "Draw title safe margins in preview.");	
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "use_grease_pencil", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_GPENCIL);
 	RNA_def_property_ui_text(prop, "Use Grease Pencil", "Display and edit the grease pencil freehand annotations overlay.");	
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	/* grease pencil */
 	prop= RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "gpd");
 	RNA_def_property_struct_type(prop, "UnknownType");
 	RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this space.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "display_channel", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "chanshown");
 	RNA_def_property_ui_text(prop, "Display Channel", "The channel number shown in the image preview. 0 is the result of all strips combined.");
 	RNA_def_property_range(prop, 0, 32); // MAXSEQ --- todo, move from BKE_sequence.h
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "draw_overexposed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "zebra");
 	RNA_def_property_ui_text(prop, "Show Overexposed", "Show overexposed areas with zebra stripes.");
 	RNA_def_property_range(prop, 0, 110);
-	RNA_def_property_update(prop, ND_SEQUENCER|NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	
 	/* not sure we need rna access to these but adding anyway */
 	prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "xof");
 	RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally from the view center");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 
 	prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "yof");
 	RNA_def_property_ui_text(prop, "Y Offset", "Offsets image horizontally from the view center");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 	
 	prop= RNA_def_property(srna, "zoom", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "zoom");
 	RNA_def_property_ui_text(prop, "Zoom", "Display zoom level");	
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
 }
 
 static void rna_def_space_text(BlenderRNA *brna)
@@ -940,63 +956,68 @@ static void rna_def_space_text(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Text", "Text displayed and edited in this space.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceTextEditor_text_set", NULL);
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	/* display */
 	prop= RNA_def_property(srna, "syntax_highlight", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "showsyntax", 0);
 	RNA_def_property_ui_text(prop, "Syntax Highlight", "Syntax highlight for scripting.");
 	RNA_def_property_ui_icon(prop, ICON_SYNTAX_OFF, 1);
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "word_wrap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "wordwrap", 0);
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_SpaceTextEditor_word_wrap_set");
 	RNA_def_property_ui_text(prop, "Word Wrap", "Wrap words if there is not enough horizontal space.");
 	RNA_def_property_ui_icon(prop, ICON_WORDWRAP_OFF, 1);
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "line_numbers", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "showlinenrs", 0);
 	RNA_def_property_ui_text(prop, "Line Numbers", "Show line numbers next to the text.");
 	RNA_def_property_ui_icon(prop, ICON_LINENUMBERS_OFF, 1);
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "overwrite", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Overwrite", "Overwrite characters when typing rather than inserting them.");
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 	
 	prop= RNA_def_property(srna, "live_edit", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Live Edit", "Run python while editing.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "tab_width", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tabnumber");
 	RNA_def_property_range(prop, 2, 8);
 	RNA_def_property_ui_text(prop, "Tab Width", "Number of spaces to display tabs with.");
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "font_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "lheight");
 	RNA_def_property_range(prop, 8, 32);
 	RNA_def_property_ui_text(prop, "Font Size", "Font size to use for displaying the text.");
-	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	/* find */
 	prop= RNA_def_property(srna, "find_all", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", ST_FIND_ALL);
 	RNA_def_property_ui_text(prop, "Find All", "Search in all text datablocks, instead of only the active one.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "find_wrap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", ST_FIND_WRAP);
 	RNA_def_property_ui_text(prop, "Find Wrap", "Search again from the start of the file when reaching the end.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "find_text", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "findstr");
 	RNA_def_property_ui_text(prop, "Find Text", "Text to search for with the find tool.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
 	prop= RNA_def_property(srna, "replace_text", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "replacestr");
 	RNA_def_property_ui_text(prop, "Replace Text", "Text to replace selected text with using the replace tool.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 }
 
 static void rna_def_space_dopesheet(BlenderRNA *brna)
@@ -1021,25 +1042,30 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "mode");
 	RNA_def_property_enum_items(prop, mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "Editing context being displayed.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
 	
 	/* display */
 	prop= RNA_def_property(srna, "show_seconds", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SACTION_DRAWTIME);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); // XXX for now, only set with operator
 	RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
 	
 	prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NODRAWCFRANUM);
 	RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
 	
 	prop= RNA_def_property(srna, "show_sliders", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SACTION_SLIDERS);
 	RNA_def_property_ui_text(prop, "Show Sliders", "Show sliders beside F-Curve channels.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
 	
 	/* editing */
 	prop= RNA_def_property(srna, "automerge_keyframes", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NOTRANSKEYCULL);
 	RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Show handles of Bezier control points.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
 	
 	// TODO... autosnap, dopesheet?
 }
@@ -1064,33 +1090,40 @@ static void rna_def_space_graph(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "mode");
 	RNA_def_property_enum_items(prop, mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "Editing context being displayed.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	/* display */
 	prop= RNA_def_property(srna, "show_seconds", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_DRAWTIME);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); // XXX for now, only set with operator
 	RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NODRAWCFRANUM);
 	RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	prop= RNA_def_property(srna, "show_sliders", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_SLIDERS);
 	RNA_def_property_ui_text(prop, "Show Sliders", "Show sliders beside F-Curve channels.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	prop= RNA_def_property(srna, "show_handles", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_NOHANDLES);
 	RNA_def_property_ui_text(prop, "Show Handles", "Show handles of Bezier control points.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	prop= RNA_def_property(srna, "only_selected_curves_handles", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_SELCUVERTSONLY);
 	RNA_def_property_ui_text(prop, "Only Selected Curve Keyframes", "Only keyframes of selected F-Curves are visible and editable.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	/* editing */
 	prop= RNA_def_property(srna, "automerge_keyframes", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NOTRANSKEYCULL);
 	RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Show handles of Bezier control points.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
 	
 	// TODO... autosnap, dopesheet?
 }
@@ -1109,14 +1142,17 @@ static void rna_def_space_nla(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNLA_DRAWTIME);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); // XXX for now, only set with operator
 	RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL);
 	
 	prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SNLA_NODRAWCFRANUM);
 	RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL);
 	
 	prop= RNA_def_property(srna, "show_strip_curves", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SNLA_NOSTRIPCURVES);
 	RNA_def_property_ui_text(prop, "Show Control Curves", "Show influence curves on strips.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL);
 	
 	/* editing */
 	// TODO... autosnap, dopesheet?
@@ -1136,43 +1172,44 @@ static void rna_def_space_time(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "play_top_left", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_REGION);
 	RNA_def_property_ui_text(prop, "Top-Left 3D Window", "");
-	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update");
 	
 	prop= RNA_def_property(srna, "play_all_3d", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_3D_WIN);
 	RNA_def_property_ui_text(prop, "All 3D Windows", "");
-	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update");
 	
 	prop= RNA_def_property(srna, "play_anim", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_ANIM_WIN);
 	RNA_def_property_ui_text(prop, "Animation Windows", "");
-	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update");
 	
 	prop= RNA_def_property(srna, "play_buttons", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_BUTS_WIN);
 	RNA_def_property_ui_text(prop, "Properties Windows", "");
-	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update");
 	
 	prop= RNA_def_property(srna, "play_image", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_IMAGE_WIN);
 	RNA_def_property_ui_text(prop, "Image Windows", "");
-	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update");
 	
 	prop= RNA_def_property(srna, "play_sequencer", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_SEQ);
 	RNA_def_property_ui_text(prop, "Sequencer Windows", "");
-	RNA_def_property_update(prop, 0, "rna_SpaceTime_redraw_update");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update");
 	
 	/* Other options */
 	
 	prop= RNA_def_property(srna, "continue_physics", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_CONTINUE_PHYSICS);
 	RNA_def_property_ui_text(prop, "Continue Physics", "During playblack, continue physics simulations regardless of the frame number");	
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL);
 	
 	prop= RNA_def_property(srna, "only_selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TIME_ONLYACTSEL);
 	RNA_def_property_ui_text(prop, "Only Selected channels", "Show keyframes only from active/selected channels.");	
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL);
 }
 
 static void rna_def_console_line(BlenderRNA *brna)
@@ -1182,15 +1219,17 @@ static void rna_def_console_line(BlenderRNA *brna)
 	
 	srna = RNA_def_struct(brna, "ConsoleLine", NULL);
 	RNA_def_struct_ui_text(srna, "Console Input", "Input line for the interactive console.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
 	
 	prop= RNA_def_property(srna, "line", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ConsoleLine_line_get", "rna_ConsoleLine_line_length", "rna_ConsoleLine_line_set");
 	RNA_def_property_ui_text(prop, "Line", "Text in the line.");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
 	
 	prop= RNA_def_property(srna, "current_character", PROP_INT, PROP_NONE); /* copied from text editor */
 	RNA_def_property_int_sdna(prop, NULL, "cursor");
 	RNA_def_property_int_funcs(prop, NULL, NULL, "rna_ConsoleLine_cursor_index_range");
-	
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
 }
 
 static EnumPropertyItem console_type_items[] = {
@@ -1212,39 +1251,39 @@ static void rna_def_space_console(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "lheight");
 	RNA_def_property_range(prop, 8, 32);
 	RNA_def_property_ui_text(prop, "Font Size", "Font size to use for displaying the text.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
 	
 	prop= RNA_def_property(srna, "console_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, console_type_items);
 	RNA_def_property_ui_text(prop, "Type", "Console type.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
 	
 	/* reporting display */
 	prop= RNA_def_property(srna, "show_report_debug", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "rpt_mask", CONSOLE_RPT_DEBUG);
 	RNA_def_property_ui_text(prop, "Show Debug", "Display debug reporting info.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE_REPORT, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL);
 	
 	prop= RNA_def_property(srna, "show_report_info", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "rpt_mask", CONSOLE_RPT_INFO);
 	RNA_def_property_ui_text(prop, "Show Info", "Display general information.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE_REPORT, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL);
 	
 	prop= RNA_def_property(srna, "show_report_operator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "rpt_mask", CONSOLE_RPT_OP);
 	RNA_def_property_ui_text(prop, "Show Operator", "Display the operator log.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE_REPORT, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL);
 	
 	prop= RNA_def_property(srna, "show_report_warn", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "rpt_mask", CONSOLE_RPT_WARN);
 	RNA_def_property_ui_text(prop, "Show Warn", "Display warnings.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE_REPORT, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL);
 	
 	prop= RNA_def_property(srna, "show_report_error", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "rpt_mask", CONSOLE_RPT_ERR);
 	RNA_def_property_ui_text(prop, "Show Error", "Display error text.");
-	RNA_def_property_update(prop, NC_CONSOLE | ND_CONSOLE_REPORT, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL);
 
 	
 	
@@ -1292,82 +1331,82 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "directory", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "dir");
 	RNA_def_property_ui_text(prop, "Directory", "Directory displayed in the file browser.");
-	RNA_def_property_update(prop, NC_FILE | ND_PARAMS, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 
 	prop= RNA_def_property(srna, "file", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "file");
 	RNA_def_property_ui_text(prop, "File Name", "Active file in the file browser.");
-	RNA_def_property_update(prop, NC_FILE | ND_PARAMS, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 
 	prop= RNA_def_property(srna, "display", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "display");
 	RNA_def_property_enum_items(prop, file_display_items);
 	RNA_def_property_ui_text(prop, "Display Mode", "Display mode for the file list");
-	RNA_def_property_update(prop, NC_FILE | ND_PARAMS, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 
 	prop= RNA_def_property(srna, "do_filter", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FILE_FILTER);
 	RNA_def_property_ui_text(prop, "Filter Files", "Enable filtering of files.");
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "hide_dot", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FILE_HIDE_DOT);
 	RNA_def_property_ui_text(prop, "Hide Dot Files", "Hide hidden dot files.");
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST , NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST , NULL);
 
 	prop= RNA_def_property(srna, "sort", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "sort");
 	RNA_def_property_enum_items(prop, file_sort_items);
 	RNA_def_property_ui_text(prop, "Sort", "");
-	RNA_def_property_update(prop, NC_FILE | ND_PARAMS, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
 
 	prop= RNA_def_property(srna, "filter_image", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", IMAGEFILE);
 	RNA_def_property_ui_text(prop, "Filter Images", "Show image files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_IMAGE, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_blender", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", BLENDERFILE);
 	RNA_def_property_ui_text(prop, "Filter Blender", "Show .blend files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_BLEND, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_movie", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", MOVIEFILE);
 	RNA_def_property_ui_text(prop, "Filter Movies", "Show movie files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_MOVIE, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_script", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", PYSCRIPTFILE);
 	RNA_def_property_ui_text(prop, "Filter Script", "Show script files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_SCRIPT, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_font", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", FTFONTFILE);
 	RNA_def_property_ui_text(prop, "Filter Fonts", "Show font files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_FONT, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_sound", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", SOUNDFILE);
 	RNA_def_property_ui_text(prop, "Filter Sound", "Show sound files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_SOUND, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_text", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", TEXTFILE);
 	RNA_def_property_ui_text(prop, "Filter Text", "Show text files.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_BLANK, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	prop= RNA_def_property(srna, "filter_folder", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filter", FOLDERFILE);
 	RNA_def_property_ui_text(prop, "Filter Folder", "Show folders.");
 	RNA_def_property_ui_icon(prop, ICON_FILE_FOLDER, 0);
-	RNA_def_property_update(prop, NC_FILE | ND_FILELIST, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
 	
 }
@@ -1430,13 +1469,13 @@ static void rna_def_space_node(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "treetype");
 	RNA_def_property_enum_items(prop, tree_type_items);
 	RNA_def_property_ui_text(prop, "Tree Type", "Node tree type to display and edit.");
-	RNA_def_property_update(prop, NC_NODE, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NODE, NULL);
 
 	prop= RNA_def_property(srna, "texture_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "texfrom");
 	RNA_def_property_enum_items(prop, texture_type_items);
 	RNA_def_property_ui_text(prop, "Texture Type", "Type of data to take texture from.");
-	RNA_def_property_update(prop, NC_NODE, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NODE, NULL);
 
 	prop= RNA_def_property(srna, "id", PROP_POINTER, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -1454,7 +1493,7 @@ static void rna_def_space_node(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "backdrop", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_BACKDRAW);
 	RNA_def_property_ui_text(prop, "Backdrop", "Use active Viewer Node output as backdrop for compositing nodes.");
-	RNA_def_property_update(prop, NC_NODE, NULL);
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NODE, NULL);
 }
 
 static void rna_def_space_logic(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index a0716cc7dc7..ffc3f1696fc 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -33,6 +33,7 @@
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 
+#include "WM_api.h"
 #include "WM_types.h"
 
 #include "BKE_utildefines.h"
@@ -41,7 +42,12 @@
 
 #ifdef RNA_RUNTIME
 
-static void rna_userdef_lmb_select_set(struct PointerRNA *ptr,int value)
+static void rna_userdef_update(bContext *C, PointerRNA *ptr)
+{
+	WM_event_add_notifier(C, NC_WINDOW, NULL);
+}
+
+static void rna_userdef_lmb_select_set(PointerRNA *ptr,int value)
 {
 	UserDef *userdef = (UserDef*)ptr->data;
 
@@ -53,12 +59,12 @@ static void rna_userdef_lmb_select_set(struct PointerRNA *ptr,int value)
 		userdef->flag &= ~USER_LMOUSESELECT;
 }
 
-static void rna_userdef_rmb_select_set(struct PointerRNA *ptr,int value)
+static void rna_userdef_rmb_select_set(PointerRNA *ptr,int value)
 {
 	rna_userdef_lmb_select_set(ptr, !value);
 }
 
-static void rna_userdef_emulate_set(struct PointerRNA *ptr,int value)
+static void rna_userdef_emulate_set(PointerRNA *ptr,int value)
 {
 	UserDef *userdef = (UserDef*)ptr->data;
 
@@ -68,7 +74,7 @@ static void rna_userdef_emulate_set(struct PointerRNA *ptr,int value)
 		userdef->flag ^= USER_TWOBUTTONMOUSE;
 }
 
-static int rna_userdef_autokeymode_get(struct PointerRNA *ptr)
+static int rna_userdef_autokeymode_get(PointerRNA *ptr)
 {
 	UserDef *userdef = (UserDef*)ptr->data;
 	short retval = userdef->autokey_mode;
@@ -79,7 +85,7 @@ static int rna_userdef_autokeymode_get(struct PointerRNA *ptr)
 	return retval;
 }
 
-static void rna_userdef_autokeymode_set(struct PointerRNA *ptr,int value)
+static void rna_userdef_autokeymode_set(PointerRNA *ptr,int value)
 {
 	UserDef *userdef = (UserDef*)ptr->data;
 
@@ -142,38 +148,38 @@ static void rna_def_userdef_theme_ui_font_style(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "points", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 6, 48);
 	RNA_def_property_ui_text(prop, "Points", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "font_kerning_style", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "kerning");
 	RNA_def_property_enum_items(prop, font_kerning_style);
 	RNA_def_property_ui_text(prop, "Kerning Style", "Which style to use for font kerning.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "shadow", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 5);
 	RNA_def_property_ui_text(prop, "Shadow Size", "Shadow size in pixels (0, 3 and 5 supported)");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "shadx", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, -10, 10);
 	RNA_def_property_ui_text(prop, "Shadow X Offset", "Shadow offset in pixels");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "shady", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, -10, 10);
 	RNA_def_property_ui_text(prop, "Shadow Y Offset", "Shadow offset in pixels");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "shadowalpha", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Shadow Alpha", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "shadowcolor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Shadow Brightness", "Shadow color in grey value");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }	
 
 static void rna_def_userdef_theme_ui_style(BlenderRNA *brna)
@@ -195,25 +201,25 @@ static void rna_def_userdef_theme_ui_style(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "paneltitle");
 	RNA_def_property_struct_type(prop, "ThemeFontStyle");
 	RNA_def_property_ui_text(prop, "Panel Font", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "grouplabel", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "grouplabel");
 	RNA_def_property_struct_type(prop, "ThemeFontStyle");
 	RNA_def_property_ui_text(prop, "Group Label Font", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "widgetlabel", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "widgetlabel");
 	RNA_def_property_struct_type(prop, "ThemeFontStyle");
 	RNA_def_property_ui_text(prop, "Widget Label Font", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "widget", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "widget");
 	RNA_def_property_struct_type(prop, "ThemeFontStyle");
 	RNA_def_property_ui_text(prop, "Widget Font", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 }	
 
@@ -229,47 +235,47 @@ static void rna_def_userdef_theme_ui_wcol(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "outline", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Outline", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "inner", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Inner", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "inner_sel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Inner Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "item", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Item", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "text", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Text", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "text_sel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Text Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "shaded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shaded", 1);
 	RNA_def_property_ui_text(prop, "Shaded", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "shadetop", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, -100, 100);
 	RNA_def_property_ui_text(prop, "Shade Top", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "shadedown", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, -100, 100);
 	RNA_def_property_ui_text(prop, "Shade Down", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_ui_wcol_state(BlenderRNA *brna)
@@ -284,36 +290,36 @@ static void rna_def_userdef_theme_ui_wcol_state(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "inner_anim", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Animated", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "inner_anim_sel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Animated Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "inner_key", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Keyframe", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "inner_key_sel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Keyframe Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "inner_driven", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Driven", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "inner_driven_sel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Driven Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "blend", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_ui_text(prop, "Blend", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_ui(BlenderRNA *brna)
@@ -332,102 +338,102 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_regular");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Regular Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_tool", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_tool");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Tool Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_radio", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_radio");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Radio Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_text", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_text");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Text Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_option", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_option");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Option Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "wcol_toggle", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_toggle");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Toggle Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_num", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_num");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Number Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_numslider", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_numslider");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Slider Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_box", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_box");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Box Backdrop Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_menu", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_menu");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Menu Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_pulldown", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_pulldown");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Pulldown Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_menu_back", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_menu_back");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Menu Backdrop Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "wcol_menu_item", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_menu_item");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Menu Item Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "wcol_scroll", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_scroll");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "Scroll Widget Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "wcol_list_item", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_list_item");
 	RNA_def_property_struct_type(prop, "ThemeWidgetColors");
 	RNA_def_property_ui_text(prop, "List Item Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "wcol_state", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "wcol_state");
 	RNA_def_property_struct_type(prop, "ThemeWidgetStateColors");
 	RNA_def_property_ui_text(prop, "State Colors", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "icon_file", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "iconfile");
 	RNA_def_property_ui_text(prop, "Icon File", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_spaces_main(StructRNA *srna, int spacetype)
@@ -438,60 +444,60 @@ static void rna_def_userdef_theme_spaces_main(StructRNA *srna, int spacetype)
 	prop= RNA_def_property(srna, "back", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Back", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "title", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Title", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "text", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Text", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "text_hi", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Text Highlight", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	/* header */
 	prop= RNA_def_property(srna, "header", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Header", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "header_text", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Header Text", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "header_text_hi", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Header Text Highlight", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	/* buttons */
 	if(! ELEM(spacetype, SPACE_BUTS, SPACE_OUTLINER)) {
 		prop= RNA_def_property(srna, "button", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "Button Back", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 		
 		prop= RNA_def_property(srna, "button_title", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "Button Title", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 		
 		prop= RNA_def_property(srna, "button_text", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "Button Text", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 		
 		prop= RNA_def_property(srna, "button_text_hi", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "Button Text Highlight", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 	}
 	
 	/* list/channels */
@@ -499,22 +505,22 @@ static void rna_def_userdef_theme_spaces_main(StructRNA *srna, int spacetype)
 		prop= RNA_def_property(srna, "list", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "List Back", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 		
 		prop= RNA_def_property(srna, "list_title", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "List Title", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 		
 		prop= RNA_def_property(srna, "list_text", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "List Text", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 		
 		prop= RNA_def_property(srna, "list_text_hi", PROP_FLOAT, PROP_COLOR);
 		RNA_def_property_array(prop, 3);
 		RNA_def_property_ui_text(prop, "List Text Highlight", "");
-		RNA_def_property_update(prop, NC_WINDOW, NULL);
+		RNA_def_property_update(prop, 0, "rna_userdef_update");
 	}	
 }
 
@@ -525,17 +531,17 @@ static void rna_def_userdef_theme_spaces_vertex(StructRNA *srna)
 	prop= RNA_def_property(srna, "vertex", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Vertex", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "vertex_select", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Vertex Select", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "vertex_size", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 1, 10);
 	RNA_def_property_ui_text(prop, "Vertex Size", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_spaces_edge(StructRNA *srna)
@@ -545,22 +551,22 @@ static void rna_def_userdef_theme_spaces_edge(StructRNA *srna)
 	prop= RNA_def_property(srna, "edge_select", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "edge Select", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "edge_seam", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Edge Seam", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "edge_sharp", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Edge Sharp", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "edge_facesel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Edge UV Face Select", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_spaces_face(StructRNA *srna)
@@ -570,22 +576,22 @@ static void rna_def_userdef_theme_spaces_face(StructRNA *srna)
 	prop= RNA_def_property(srna, "face", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Face", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "face_select", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Face Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "face_dot", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Face Dot Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "facedot_size", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 1, 10);
 	RNA_def_property_ui_text(prop, "Face Dot Size", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
@@ -604,51 +610,51 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Panel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "wire", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Wire", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "lamp", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Lamp", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "object_selected", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "select");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Object Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "object_active", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "active");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Active Object", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "object_grouped", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "group");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Object Grouped", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "object_grouped_active", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "group_active");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Object Grouped Active", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "transform", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Transform", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	rna_def_userdef_theme_spaces_vertex(srna);
 	rna_def_userdef_theme_spaces_edge(srna);
@@ -657,28 +663,28 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "editmesh_active", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Normal", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "bone_solid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Bone Solid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "bone_pose", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Bone Pose", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
@@ -697,24 +703,24 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Panel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Sliders", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "channels_region", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade2");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Channels Region", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	rna_def_userdef_theme_spaces_vertex(srna);
 
@@ -722,46 +728,46 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "handle_vertex", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Handle Vertex", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "handle_vertex_select", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Handle Vertex Select", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "handle_vertex_size", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 255);
 	RNA_def_property_ui_text(prop, "Handle Vertex Size", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "group");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Channel Group", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "active_channels_group", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "group_active");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Active Channel Group", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "ds_channel");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "DopeSheet Channel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "ds_subchannel");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "DopeSheet Sub-Channel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_file(BlenderRNA *brna)
@@ -781,37 +787,37 @@ static void rna_def_userdef_theme_space_file(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "hilite");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Selected File", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "tiles", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "panel");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Tiles", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "scrollbar", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Scrollbar", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "scroll_handle", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade2");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Scroll Handle", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "active_file", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "active");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Active File", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "active_file_text", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "grid");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Active File Text", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_outliner(BlenderRNA *brna)
@@ -871,55 +877,55 @@ static void rna_def_userdef_theme_space_text(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "grid");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Line Numbers Background", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "scroll_bar", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Scroll Bar", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "selected_text", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade2");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Selected Text", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "cursor", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "hilite");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Cursor", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "syntax_builtin", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxb");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Syntax Builtin", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "syntax_special", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxv");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Syntax Special", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "syntax_comment", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxc");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Syntax Comment", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "syntax_string", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxl");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Syntax String", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "syntax_numbers", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxn");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Syntax Numbers", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
@@ -939,49 +945,49 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "wire");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Wires", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "wire_select", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "edge_select");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Wire Select", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "selected_text", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade2");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Selected Text", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "node_backdrop", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxl");
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Node Backdrop", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "in_out_node", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxn");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "In/Out Node", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "converter_node", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxv");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Converter Node", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "operator_node", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxb");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Operator Node", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "group_node", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "syntaxc");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Group Node", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_logic(BlenderRNA *brna)
@@ -1000,7 +1006,7 @@ static void rna_def_userdef_theme_space_logic(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Panel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 
@@ -1020,7 +1026,7 @@ static void rna_def_userdef_theme_space_buts(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "panel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Panel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_time(BlenderRNA *brna)
@@ -1039,13 +1045,13 @@ static void rna_def_userdef_theme_space_time(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_sound(BlenderRNA *brna)
@@ -1064,19 +1070,19 @@ static void rna_def_userdef_theme_space_sound(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Sliders", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
@@ -1097,7 +1103,7 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "editmesh_active", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_seq(BlenderRNA *brna)
@@ -1114,79 +1120,79 @@ static void rna_def_userdef_theme_space_seq(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Window Sliders", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "movie_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "movie");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Movie Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "image_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "image");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Image Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "scene_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "scene");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Scene Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "audio_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "audio");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Audio Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "effect_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "effect");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Effect Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "plugin_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "plugin");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Plugin Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "transition_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "transition");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Transition Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "meta_strip", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "meta");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Meta Strip", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "keyframe", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "vertex_select");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Keyframe", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "draw_action", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "bone_pose");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Draw Action", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
@@ -1205,73 +1211,73 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "value_sliders", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "face");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Value Sliders", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "view_sliders", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "View Sliders", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "channels", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade2");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Channels", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "channels_selected", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "hilite");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Channels Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "group");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Channel Group", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "active_channels_group", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "group_active");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Active Channel Group", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "long_key", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "strip");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Long Key", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "long_key_selected", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "strip_select");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Long Key Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "ds_channel");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "DopeSheet Channel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "ds_subchannel");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "DopeSheet Sub-Channel", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
@@ -1290,43 +1296,43 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Grid", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "view_sliders", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade1");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "View Sliders", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "bars", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "shade2");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Bars", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "bars_selected", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "hilite");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Bars Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "strip");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "strips", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "strips_selected", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "strip_select");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Strips Selected", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Current Frame", "");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_colorset(BlenderRNA *brna)
@@ -1342,23 +1348,23 @@ static void rna_def_userdef_theme_colorset(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "solid");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Normal", "Color used for the surface of bones.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "selected", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "select");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Selected", "Color used for selected bones.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "active", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Active", "Color used for active bones.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "colored_constraints", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TH_WIRECOLOR_CONSTCOLS);
 	RNA_def_property_ui_text(prop, "Colored Constraints", "Allow the use of colors indicating constraints/keyed status.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_themes(BlenderRNA *brna)
@@ -1547,27 +1553,27 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "display_object_info", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_DRAWVIEWINFO);
 	RNA_def_property_ui_text(prop, "Display Object Info", "Display objects name and frame number in 3d view.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "global_scene", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_SCENEGLOBAL);
 	RNA_def_property_ui_text(prop, "Global Scene", "Forces the current Scene to be displayed in all Screens.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "use_large_cursors", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "curssize", 0);
 	RNA_def_property_ui_text(prop, "Large Cursors", "Use large mouse cursors when available.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "show_view_name", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_VIEWPORTNAME);
 	RNA_def_property_ui_text(prop, "Show View Name", "Show the name of the view's direction in each 3D View.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "show_playback_fps", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_FPS);
 	RNA_def_property_ui_text(prop, "Show Playback FPS", "Show the frames per second screen refresh rate, while animation is played back.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	/* menus */
 	prop= RNA_def_property(srna, "open_mouse_over", PROP_BOOLEAN, PROP_NONE);
@@ -1662,19 +1668,19 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "show_mini_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_ROTVIEWICON);
 	RNA_def_property_ui_text(prop, "Show Mini Axis", "Show a small rotating 3D axis in the bottom left corner of the 3D View.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "mini_axis_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "rvisize");
 	RNA_def_property_range(prop, 10, 64);
 	RNA_def_property_ui_text(prop, "Mini Axis Size", "The axis icon's size.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "mini_axis_brightness", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "rvibright");
 	RNA_def_property_range(prop, 0, 10);
 	RNA_def_property_ui_text(prop, "Mini Axis Brightness", "The brightness of the icon.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	/* middle mouse button */
 	prop= RNA_def_property(srna, "middle_mouse_rotate", PROP_BOOLEAN, PROP_NONE);
@@ -1708,19 +1714,19 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "use_manipulator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "tw_flag", 1);
 	RNA_def_property_ui_text(prop, "Manipulator", "Use 3d transform manipulator.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "manipulator_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tw_size");
 	RNA_def_property_range(prop, 2, 40);
 	RNA_def_property_ui_text(prop, "Manipulator Size", "Diameter of widget, in 10 pixel units.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "manipulator_handle_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tw_handlesize");
 	RNA_def_property_range(prop, 2, 40);
 	RNA_def_property_ui_text(prop, "Manipulator Handle Size", "Size of widget handles as percentage of widget radius.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "manipulator_hotspot", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "tw_hotspot");
@@ -1731,7 +1737,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "obcenter_dia");
 	RNA_def_property_range(prop, 4, 10);
 	RNA_def_property_ui_text(prop, "Object Center Size", "Diameter in Pixels for Object/Lamp center display.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "ndof_pan_speed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "ndof_pan");
@@ -1951,13 +1957,13 @@ static void rna_def_userdef_language(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "international_fonts", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_DOTRANSLATE);
 	RNA_def_property_ui_text(prop, "International Fonts", "Use international fonts.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "dpi", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "dpi");
 	RNA_def_property_range(prop, 48, 128);
 	RNA_def_property_ui_text(prop, "DPI", "Font size and resolution for display.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
 	prop= RNA_def_property(srna, "scrollback", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "scrollback");
@@ -1969,27 +1975,27 @@ static void rna_def_userdef_language(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "language", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, language_items);
 	RNA_def_property_ui_text(prop, "Language", "Language use for translation.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "translate_tooltips", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_TOOLTIPS);
 	RNA_def_property_ui_text(prop, "Translate Tooltips", "Translate Tooltips.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "translate_buttons", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_BUTTONS);
 	RNA_def_property_ui_text(prop, "Translate Buttons", "Translate button labels.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "translate_toolbox", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_MENUS);
 	RNA_def_property_ui_text(prop, "Translate Toolbox", "Translate toolbox menu.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop= RNA_def_property(srna, "use_textured_fonts", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_USETEXTUREFONT);
 	RNA_def_property_ui_text(prop, "Textured Fonts", "Use textures for drawing international fonts.");
-	RNA_def_property_update(prop, NC_WINDOW, NULL);
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_system(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index eaed0100386..148af2c28e9 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -419,6 +419,7 @@ static void rna_def_windowmanager(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "WindowManager", "ID");
 	RNA_def_struct_ui_text(srna, "Window Manager", "Window manager datablock defining open windows and other user interface data.");
+	RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
 	RNA_def_struct_sdna(srna, "wmWindowManager");
 
 	prop= RNA_def_property(srna, "operators", PROP_COLLECTION, PROP_NONE);
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 5687cb565d1..806f5409b0a 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -130,11 +130,10 @@ typedef struct wmNotifier {
 #define	NC_BRUSH			(11<<24)
 #define	NC_TEXT				(12<<24)
 #define NC_WORLD			(13<<24)
-#define NC_FILE				(14<<24)
-#define NC_ANIMATION		(15<<24)
-#define NC_CONSOLE			(16<<24)
-#define NC_NODE				(17<<24)
-#define NC_INFO				(18<<24)
+#define NC_ANIMATION		(14<<24)
+#define NC_SPACE			(15<<24)
+#define NC_NODE				(15<<24)
+#define	NC_GEOM				(16<<24)
 
 /* data type, 256 entries is enough, it can overlap */
 #define NOTE_DATA			0x00FF0000
@@ -172,13 +171,12 @@ typedef struct wmNotifier {
 #define ND_POSE				(18<<16)
 #define ND_BONE_ACTIVE		(19<<16)
 #define ND_BONE_SELECT		(20<<16)
-#define ND_GEOM_SELECT		(21<<16)
-#define ND_DRAW				(22<<16)
-#define ND_MODIFIER			(23<<16)
-#define ND_KEYS				(24<<16)
-#define ND_GEOM_DATA		(25<<16)
-#define ND_CONSTRAINT		(26<<16)
-#define ND_PARTICLE			(27<<16)
+#define ND_DRAW				(21<<16)
+#define ND_MODIFIER			(22<<16) /* modifiers edited */
+#define ND_KEYS				(23<<16)
+#define ND_CONSTRAINT		(24<<16) /* constraints edited */
+#define ND_PARTICLE_DATA	(25<<16) /* particles edited */
+#define ND_PARTICLE_SELECT	(26<<16) /* particles selecting change */
 
 	/* NC_MATERIAL Material */
 #define	ND_SHADING			(30<<16)
@@ -193,10 +191,6 @@ typedef struct wmNotifier {
 #define ND_CURSOR			(50<<16)
 #define ND_DISPLAY			(51<<16)
 	
-	/* NC_FILE Filebrowser */
-#define ND_PARAMS			(60<<16)
-#define ND_FILELIST			(61<<16)
-
 	/* NC_ANIMATION Animato */
 #define ND_KEYFRAME_SELECT	(70<<16)
 #define ND_KEYFRAME_EDIT	(71<<16)
@@ -207,9 +201,28 @@ typedef struct wmNotifier {
 #define ND_NLA_EDIT			(76<<16)
 #define ND_NLA_ACTCHANGE	(77<<16)
 
-	/* console */
-#define ND_CONSOLE			(78<<16) /* general redraw */
-#define ND_CONSOLE_REPORT	(79<<16) /* update for reports, could spesify type */
+	/* NC_GEOM Geometry */
+	/* Mesh, Curve, MetaBall, Armature, .. */
+#define ND_SELECT			(80<<16)
+#define ND_DATA				(81<<16)
+
+	/* NC_SPACE */
+#define ND_SPACE_CONSOLE		(1<<16) /* general redraw */
+#define ND_SPACE_CONSOLE_REPORT	(2<<16) /* update for reports, could specify type */
+#define ND_SPACE_INFO			(2<<16)
+#define ND_SPACE_IMAGE			(3<<16)
+#define ND_SPACE_FILE_PARAMS	(4<<16)
+#define ND_SPACE_FILE_LIST		(5<<16)
+#define ND_SPACE_NODE			(6<<16)
+#define ND_SPACE_OUTLINER		(7<<16)
+#define ND_SPACE_VIEW3D			(8<<16)
+#define ND_SPACE_PROPERTIES		(9<<16)
+#define ND_SPACE_TEXT			(10<<16)
+#define ND_SPACE_TIME			(11<<16)
+#define ND_SPACE_GRAPH			(12<<16)
+#define ND_SPACE_DOPESHEET		(13<<16)
+#define ND_SPACE_NLA			(14<<16)
+#define ND_SPACE_SEQUENCER		(15<<16)
 
 /* subtype, 256 entries too */
 #define NOTE_SUBTYPE		0x0000FF00
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index fecd5c20a15..38cf39c2081 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -108,7 +108,7 @@ void wm_operator_register(bContext *C, wmOperator *op)
 	MEM_freeN(buf);
 	
 	/* so the console is redrawn */
-	WM_event_add_notifier(C, NC_CONSOLE|ND_CONSOLE_REPORT, NULL);
+	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL);
 }
 
 
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 717c2d25261..c2c90f055b0 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -177,9 +177,9 @@ void wm_event_do_notifiers(bContext *C)
 						do_anim= 1;
 				}
 			}
-			if(note->category == NC_SCENE || note->category == NC_OBJECT) {
+			if(ELEM3(note->category, NC_SCENE, NC_OBJECT, NC_GEOM)) {
 				ED_info_stats_clear(CTX_data_scene(C));
-				WM_event_add_notifier(C, NC_INFO, NULL);
+				WM_event_add_notifier(C, NC_SPACE|ND_SPACE_INFO, NULL);
 			}
 		}
 		if(do_anim) {

From 670296dabe9c4c5444c696af54e1b4ef07a8e60b Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Fri, 4 Sep 2009 20:57:50 +0000
Subject: [PATCH 434/577] fix for relative path to build bplayer with cmake in
 windows (ffmpeg still needs to be off)

---
 source/blenderplayer/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 30a1c08ebc9..76a1a405698 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -44,7 +44,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 IF(WIN32)
-  ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../source/icons/winblender.rc)
+  ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
 ELSE(WIN32)
   ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 ENDIF(WIN32)

From 5dd9f7635afeda66ca4475288b1eb7ad621486f4 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 4 Sep 2009 21:02:43 +0000
Subject: [PATCH 435/577] 2.5

Make local and make single user are back for ID template.

Internally these calls got unified, id_make_local and
id_copy are now used to do these operations for all types
that support it. Also reveals that for some ID types the
implementation is still missing.

Further, some small changes:

* unlink_text is now in blenkernel.
* copy_group was implemented.
* ID template now has an open operator again.
* fix preview to not change material reference count,
  even if temporary it shows up with threaded preview.
* id_unlink unifies unlink for text, object and group.
---
 source/blender/blenkernel/BKE_armature.h      |   1 -
 source/blender/blenkernel/BKE_group.h         |   1 +
 source/blender/blenkernel/BKE_library.h       |   3 +
 source/blender/blenkernel/BKE_sca.h           |   1 -
 source/blender/blenkernel/BKE_scene.h         |   2 -
 source/blender/blenkernel/BKE_text.h          |   2 +
 source/blender/blenkernel/intern/group.c      |  10 +
 source/blender/blenkernel/intern/library.c    | 225 +++++++++++++++++-
 source/blender/blenkernel/intern/sca.c        |  24 --
 source/blender/blenkernel/intern/scene.c      |  11 -
 source/blender/blenkernel/intern/text.c       |  93 +++++++-
 .../blender/editors/gpencil/gpencil_buttons.c |   2 +-
 source/blender/editors/include/UI_interface.h |   2 +-
 .../editors/interface/interface_templates.c   | 112 +++++++--
 source/blender/editors/object/object_edit.c   |   4 +-
 .../blender/editors/preview/previewrender.c   |  10 +-
 .../blender/editors/space_nla/nla_buttons.c   |   2 +-
 .../blender/editors/space_text/text_intern.h  |   2 -
 source/blender/editors/space_text/text_ops.c  |  44 +---
 source/blender/makesrna/intern/rna_ui_api.c   |   1 +
 20 files changed, 436 insertions(+), 116 deletions(-)

diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 0595134f5c9..1cbb2331782 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -74,7 +74,6 @@ struct bArmature *add_armature(char *name);
 struct bArmature *get_armature(struct Object *ob);
 void free_boneChildren(struct Bone *bone);
 void free_bones (struct bArmature *arm);
-void unlink_armature(struct bArmature *arm);
 void free_armature(struct bArmature *arm);
 void make_local_armature(struct bArmature *arm);
 struct bArmature *copy_armature(struct bArmature *arm);
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index 35084aabadf..b66ddf13527 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -41,6 +41,7 @@ void		free_group_object(struct GroupObject *go);
 void		free_group(struct Group *group);
 void		unlink_group(struct Group *group);
 struct Group *add_group(char *name);
+struct Group *copy_group(struct Group *group);
 void		add_to_group(struct Group *group, struct Object *ob);
 int			rem_from_group(struct Group *group, struct Object *ob);
 struct Group *find_group(struct Object *ob, struct Group *group);
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 4e7db115168..54722dac910 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -46,6 +46,9 @@ void *copy_libblock(void *rt);
 void id_lib_extern(struct ID *id);
 void id_us_plus(struct ID *id);
 void id_us_min(struct ID *id);
+int id_make_local(struct ID *id, int test);
+int id_copy(struct ID *id, struct ID **newid, int test);
+int id_unlink(struct ID *id, int test);
 
 int check_for_dupid(struct ListBase *lb, struct ID *id, char *name);
 int new_id(struct ListBase *lb, struct ID *id, const char *name);
diff --git a/source/blender/blenkernel/BKE_sca.h b/source/blender/blenkernel/BKE_sca.h
index 22c4f39148a..1b8e61f136f 100644
--- a/source/blender/blenkernel/BKE_sca.h
+++ b/source/blender/blenkernel/BKE_sca.h
@@ -47,7 +47,6 @@ void unlink_actuators(struct ListBase *lb);
 void free_actuator(struct bActuator *act);
 void free_actuators(struct ListBase *lb);
 
-void free_text_controllers(struct Text *txt);
 void free_sensor(struct bSensor *sens);
 void free_sensors(struct ListBase *lb);
 struct bSensor *copy_sensor(struct bSensor *sens);
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 12a13a2b50c..686fc265de0 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -84,7 +84,5 @@ int get_render_child_particle_number(struct RenderData *r, int num);
 int get_render_shadow_samples(struct RenderData *r, int samples);
 float get_render_aosss_error(struct RenderData *r, float error);
 
-void free_dome_warp_text(struct Text *txt);
-
 #endif
 
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index d288c0b6516..bd14053d121 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -35,6 +35,7 @@
 extern "C" {
 #endif
 
+struct Main;
 struct Text;
 struct TextLine;
 struct SpaceText;
@@ -46,6 +47,7 @@ struct Text*	add_empty_text	(char *name);
 int	            reopen_text		(struct Text *text);
 struct Text*	add_text		(char *file, const char *relpath); 
 struct Text*	copy_text		(struct Text *ta);
+void			unlink_text		(struct Main *bmain, struct Text *text);
 
 char*	txt_to_buf			(struct Text *text);
 void	txt_clean_text		(struct Text *text);
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 6fffbd794ef..6bb47bc0f0f 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -142,6 +142,16 @@ Group *add_group(char *name)
 	return group;
 }
 
+Group *copy_group(Group *group)
+{
+	Group *groupn;
+
+	groupn= MEM_dupallocN(group);
+	BLI_duplicatelist(&groupn->gobject, &group->gobject);
+
+	return groupn;
+}
+
 /* external */
 void add_to_group(Group *group, Object *ob)
 {
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 3c8bf9200f8..f15552ab40c 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -119,6 +119,13 @@
 
 #define MAX_IDPUP		60	/* was 24 */
 
+/* GS reads the memory pointed at in a specific ordering. 
+   only use this definition, makes little and big endian systems
+   work fine, in conjunction with MAKE_ID */
+
+/* from blendef: */
+#define GS(a)	(*((short *)(a)))
+
 /* ************* general ************************ */
 
 void id_lib_extern(ID *id)
@@ -148,6 +155,217 @@ void id_us_min(ID *id)
 		id->us--;
 }
 
+int id_make_local(ID *id, int test)
+{
+	if(id->flag & LIB_INDIRECT)
+		return 0;
+
+	switch(GS(id->name)) {
+		case ID_SCE:
+			return 0; /* not implemented */
+		case ID_LI:
+			return 0; /* can't be linked */
+		case ID_OB:
+			if(!test) make_local_object((Object*)id);
+			return 1;
+		case ID_ME:
+			if(!test) {
+				make_local_mesh((Mesh*)id);
+				make_local_key(((Mesh*)id)->key);
+			}
+			return 1;
+		case ID_CU:
+			if(!test) {
+				make_local_curve((Curve*)id);
+				make_local_key(((Curve*)id)->key);
+			}
+			return 1;
+		case ID_MB:
+			if(!test) make_local_mball((MetaBall*)id);
+			return 1;
+		case ID_MA:
+			if(!test) make_local_material((Material*)id);
+			return 1;
+		case ID_TE:
+			if(!test) make_local_texture((Tex*)id);
+			return 1;
+		case ID_IM:
+			return 0; /* not implemented */
+		case ID_WV:
+			return 0; /* deprecated */
+		case ID_LT:
+			if(!test) make_local_lattice((Lattice*)id);
+			return 1;
+		case ID_LA:
+			if(!test) make_local_lamp((Lamp*)id);
+			return 1;
+		case ID_CA:
+			if(!test) make_local_camera((Camera*)id);
+			return 1;
+		case ID_IP:
+			return 0; /* deprecated */
+		case ID_KE:
+			if(!test) make_local_key((Key*)id);
+			return 1;
+		case ID_WO:
+			if(!test) make_local_world((World*)id);
+			return 1;
+		case ID_SCR:
+			return 0; /* can't be linked */
+		case ID_VF:
+			return 0; /* not implemented */
+		case ID_TXT:
+			return 0; /* not implemented */
+		case ID_SCRIPT:
+			return 0; /* deprecated */
+		case ID_SO:
+			return 0; /* not implemented */
+		case ID_GR:
+			return 0; /* not implemented */
+		case ID_AR:
+			if(!test) make_local_armature((bArmature*)id);
+			return 1;
+		case ID_AC:
+			if(!test) make_local_action((bAction*)id);
+			return 1;
+		case ID_NT:
+			return 0; /* not implemented */
+		case ID_BR:
+			if(!test) make_local_brush((Brush*)id);
+			return 1;
+		case ID_PA:
+			if(!test) make_local_particlesettings((ParticleSettings*)id);
+			return 1;
+		case ID_WM:
+			return 0; /* can't be linked */
+		case ID_GD:
+			return 0; /* not implemented */
+	}
+
+	return 0;
+}
+
+int id_copy(ID *id, ID **newid, int test)
+{
+	if(!test) *newid= NULL;
+
+	/* conventions:
+	 * - make shallow copy, only this ID block
+	 * - id.us of the new ID is set to 1 */
+	switch(GS(id->name)) {
+		case ID_SCE:
+			return 0; /* can't be copied from here */
+		case ID_LI:
+			return 0; /* can't be copied from here */
+		case ID_OB:
+			if(!test) *newid= (ID*)copy_object((Object*)id);
+			return 1;
+		case ID_ME:
+			if(!test) *newid= (ID*)copy_mesh((Mesh*)id);
+			return 1;
+		case ID_CU:
+			if(!test) *newid= (ID*)copy_curve((Curve*)id);
+			return 1;
+		case ID_MB:
+			if(!test) *newid= (ID*)copy_mball((MetaBall*)id);
+			return 1;
+		case ID_MA:
+			if(!test) *newid= (ID*)copy_material((Material*)id);
+			return 1;
+		case ID_TE:
+			if(!test) *newid= (ID*)copy_texture((Tex*)id);
+			return 1;
+		case ID_IM:
+			return 0; /* not implemented */
+		case ID_WV:
+			return 0; /* deprecated */
+		case ID_LT:
+			if(!test) *newid= (ID*)copy_lattice((Lattice*)id);
+			return 1;
+		case ID_LA:
+			if(!test) *newid= (ID*)copy_lamp((Lamp*)id);
+			return 1;
+		case ID_CA:
+			if(!test) *newid= (ID*)copy_camera((Camera*)id);
+			return 1;
+		case ID_IP:
+			return 0; /* deprecated */
+		case ID_KE:
+			if(!test) *newid= (ID*)copy_key((Key*)id);
+			return 1;
+		case ID_WO:
+			if(!test) *newid= (ID*)copy_world((World*)id);
+			return 1;
+		case ID_SCR:
+			return 0; /* can't be copied from here */
+		case ID_VF:
+			return 0; /* not implemented */
+		case ID_TXT:
+			if(!test) *newid= (ID*)copy_text((Text*)id);
+			return 1;
+		case ID_SCRIPT:
+			return 0; /* deprecated */
+		case ID_SO:
+			return 0; /* not implemented */
+		case ID_GR:
+			if(!test) *newid= (ID*)copy_group((Group*)id);
+			return 1;
+		case ID_AR:
+			if(!test) *newid= (ID*)copy_armature((bArmature*)id);
+			return 1;
+		case ID_AC:
+			if(!test) *newid= (ID*)copy_action((bAction*)id);
+			return 1;
+		case ID_NT:
+			if(!test) *newid= (ID*)ntreeCopyTree((bNodeTree*)id, 0);
+			return 1;
+		case ID_BR:
+			if(!test) *newid= (ID*)copy_brush((Brush*)id);
+			return 1;
+		case ID_PA:
+			if(!test) *newid= (ID*)psys_copy_settings((ParticleSettings*)id);
+			return 1;
+		case ID_WM:
+			return 0; /* can't be copied from here */
+		case ID_GD:
+			return 0; /* not implemented */
+	}
+	
+	return 0;
+}
+
+int id_unlink(ID *id, int test)
+{
+	Main *mainlib= G.main;
+	ListBase *lb;
+
+	switch(GS(id->name)) {
+		case ID_TXT:
+			if(test) return 1;
+			unlink_text(mainlib, (Text*)id);
+			break;
+		case ID_GR:
+			if(test) return 1;
+			unlink_group((Group*)id);
+			break;
+		case ID_OB:
+			if(test) return 1;
+			unlink_object(NULL, (Object*)id);
+			break;
+	}
+
+	if(id->us == 0) {
+		if(test) return 1;
+
+		lb= wich_libbase(mainlib, GS(id->name));
+		free_libblock(lb, id);
+
+		return 1;
+	}
+
+	return 0;
+}
+
 ListBase *wich_libbase(Main *mainlib, short type)
 {
 	switch( type ) {
@@ -409,13 +627,6 @@ void *alloc_libblock(ListBase *lb, short type, const char *name)
 	return id;
 }
 
-/* GS reads the memory pointed at in a specific ordering. 
-   only use this definition, makes little and big endian systems
-   work fine, in conjunction with MAKE_ID */
-
-/* from blendef: */
-#define GS(a)	(*((short *)(a)))
-
 /* by spec, animdata is first item after ID */
 /* we still read ->adt itself, to ensure compiler warns when it doesnt exist */
 static void id_copy_animdata(ID *id)
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index e4d73208c64..de2118af202 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -52,30 +52,6 @@
 #include "BKE_blender.h"
 #include "BKE_sca.h"
 
-//#include "wm_event_types.h"
-
-void free_text_controllers(Text *txt)
-{
-	Object *ob;
-	bController *cont;
-	
-	ob= G.main->object.first;
-	while(ob) {
-		cont= ob->controllers.first;
-		while(cont) {
-			if(cont->type==CONT_PYTHON) {
-				bPythonCont *pc;
-				
-				pc= cont->data;
-				if(pc->text==txt) pc->text= NULL;
-			}
-			cont= cont->next;
-		}
-		ob= ob->id.next;
-	}
-}
-
-
 /* ******************* SENSORS ************************ */
 
 void free_sensor(bSensor *sens)
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 10f6a8cf47c..6f9ed3e0978 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -860,14 +860,3 @@ float get_render_aosss_error(RenderData *r, float error)
 		return error;
 }
 
-void free_dome_warp_text(struct Text *txt)
-{
-	Scene *scene;
-
-	scene = G.main->scene.first;
-	while(scene) {
-		if (scene->r.dometext == txt)
-			scene->r.dometext = NULL;
-		scene = scene->id.next;
-	}
-}
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 8e3d59bbc58..dac426de4eb 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -37,14 +37,22 @@
 
 #include "BLI_blenlib.h"
 
+#include "DNA_action_types.h"
+#include "DNA_armature_types.h"
+#include "DNA_constraint_types.h"
+#include "DNA_controller_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_text_types.h"
 
-#include "BKE_utildefines.h"
-#include "BKE_text.h"
-#include "BKE_library.h"
+#include "BKE_depsgraph.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_node.h"
+#include "BKE_text.h"
+#include "BKE_utildefines.h"
 
 #ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
@@ -451,6 +459,85 @@ Text *copy_text(Text *ta)
 	return tan;
 }
 
+void unlink_text(Main *bmain, Text *text)
+{
+	bScreen *scr;
+	ScrArea *area;
+	SpaceLink *sl;
+	Scene *scene;
+	Object *ob;
+	bController *cont;
+	bConstraint *con;
+	short update;
+
+	/* dome */
+	for(scene=bmain->scene.first; scene; scene=scene->id.next)
+		if(scene->r.dometext == text)
+			scene->r.dometext = NULL;
+	
+	for(ob=bmain->object.first; ob; ob=ob->id.next) {
+		/* game controllers */
+		for(cont=ob->controllers.first; cont; cont=cont->next) {
+			if(cont->type==CONT_PYTHON) {
+				bPythonCont *pc;
+				
+				pc= cont->data;
+				if(pc->text==text) pc->text= NULL;
+			}
+		}
+
+		/* pyconstraints */
+		update = 0;
+
+		if(ob->type==OB_ARMATURE && ob->pose) {
+			bPoseChannel *pchan;
+			for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+				for(con = pchan->constraints.first; con; con=con->next) {
+					if(con->type==CONSTRAINT_TYPE_PYTHON) {
+						bPythonConstraint *data = con->data;
+						if (data->text==text) data->text = NULL;
+						update = 1;
+						
+					}
+				}
+			}
+		}
+
+		for(con = ob->constraints.first; con; con=con->next) {
+			if(con->type==CONSTRAINT_TYPE_PYTHON) {
+				bPythonConstraint *data = con->data;
+				if (data->text==text) data->text = NULL;
+				update = 1;
+			}
+		}
+		
+		if(update)
+			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	}
+
+	/* pynodes */
+	// XXX nodeDynamicUnlinkText(&text->id);
+	
+	/* text space */
+	for(scr= bmain->screen.first; scr; scr= scr->id.next) {
+		for(area= scr->areabase.first; area; area= area->next) {
+			for(sl= area->spacedata.first; sl; sl= sl->next) {
+				if(sl->spacetype==SPACE_TEXT) {
+					SpaceText *st= (SpaceText*) sl;
+					
+					if(st->text==text) {
+						st->text= NULL;
+						st->top= 0;
+					}
+				}
+			}
+		}
+	}
+
+	text->id.us= 0;
+}
+
+
 /*****************************/
 /* Editing utility functions */
 /*****************************/
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 0d7cd263245..1036b4ccd8f 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -238,7 +238,7 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
 	col= uiLayoutColumn(layout, 0);
 		/* current Grease Pencil block */
 		// TODO: show some info about who owns this?
-		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", "GPENCIL_OT_data_unlink"); 
+		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink"); 
 		
 		/* add new layer button - can be used even when no data, since it can add a new block too */
 		uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add");
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 0cb6964b39e..e2338078a8a 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -633,7 +633,7 @@ uiBlock *uiLayoutFreeBlock(uiLayout *layout);
 /* templates */
 void uiTemplateHeader(uiLayout *layout, struct bContext *C, int menus);
 void uiTemplateID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
-	char *newop, char *unlinkop);
+	char *newop, char *openop, char *unlinkop);
 uiLayout *uiTemplateModifier(uiLayout *layout, struct PointerRNA *ptr);
 uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr);
 void uiTemplatePreview(uiLayout *layout, struct ID *id, struct ID *parent, struct MTex *slot);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index d253948e2e8..2b7d6f383bf 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -157,7 +157,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 {
 	TemplateID *template= (TemplateID*)arg_litem;
 	PointerRNA idptr= RNA_property_pointer_get(&template->ptr, template->prop);
-	ID *id= idptr.data;
+	ID *id= idptr.data, *newid;
 	int event= GET_INT_FROM_POINTER(arg_event);
 	
 	switch(event) {
@@ -185,28 +185,48 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 			}
 			else return;
 			break;
-#if 0
-		case UI_ID_ALONE:
-			if(!id || id->us < 1)
-				return;
-			break;
 		case UI_ID_LOCAL:
-			if(!id || id->us < 1)
-				return;
+			if(id) {
+				if(id_make_local(id, 0)) {
+					/* reassign to get get proper updates/notifiers */
+					idptr= RNA_property_pointer_get(&template->ptr, template->prop);
+					RNA_property_pointer_set(&template->ptr, template->prop, idptr);
+					RNA_property_update(C, &template->ptr, template->prop);
+				}
+			}
 			break;
+		case UI_ID_ALONE:
+			if(id) {
+				/* make copy */
+				if(id_copy(id, &newid, 0) && newid) {
+					/* us is 1 by convention, but RNA_property_pointer_set
+					   will also incremement it, so set it to zero */
+					newid->us= 0;
+
+					/* assign copy */
+					RNA_id_pointer_create(newid, &idptr);
+					RNA_property_pointer_set(&template->ptr, template->prop, idptr);
+					RNA_property_update(C, &template->ptr, template->prop);
+				}
+			}
+			break;
+#if 0
 		case UI_ID_AUTO_NAME:
 			break;
 #endif
 	}
 }
 
-static void template_ID(bContext *C, uiBlock *block, TemplateID *template, StructRNA *type, int flag, char *newop, char *unlinkop)
+static void template_ID(bContext *C, uiBlock *block, TemplateID *template, StructRNA *type, int flag, char *newop, char *openop, char *unlinkop)
 {
 	uiBut *but;
 	PointerRNA idptr;
 	ListBase *lb;
+	ID *id, *idfrom;
 
 	idptr= RNA_property_pointer_get(&template->ptr, template->prop);
+	id= idptr.data;
+	idfrom= template->ptr.id.data;
 	lb= template->idlb;
 
 	uiBlockBeginAlign(block);
@@ -221,33 +241,86 @@ static void template_ID(bContext *C, uiBlock *block, TemplateID *template, Struc
 			but->flag|= UI_HAS_ICON;
 			but->flag|= UI_ICON_LEFT;
 		}
+
+		if((idfrom && idfrom->lib))
+			uiButSetFlag(but, UI_BUT_DISABLED);
 	}
 
 	/* text button with name */
-	if(idptr.data) {
+	if(id) {
 		char name[64];
 
-		//text_idbutton(idptr.data, name);
+		//text_idbutton(id, name);
 		name[0]= '\0';
 		but= uiDefButR(block, TEX, 0, name, 0, 0, UI_UNIT_X*6, UI_UNIT_Y, &idptr, "name", -1, 0, 0, -1, -1, NULL);
 		uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_RENAME));
+
+		if(id->lib) {
+			if(id->flag & LIB_INDIRECT) {
+				but= uiDefIconBut(block, BUT, 0, ICON_LIBRARY_DATA_INDIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, 0, 0, 0, 0, 0,
+					"Indirect library datablock, cannot change.");
+				uiButSetFlag(but, UI_BUT_DISABLED);
+			}
+			else {
+				but= uiDefIconBut(block, BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, 0, 0, 0, 0, 0,
+					"Direct linked library datablock, click to make local.");
+				if(!id_make_local(id, 1 /* test */) || (idfrom && idfrom->lib))
+					uiButSetFlag(but, UI_BUT_DISABLED);
+			}
+
+			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_LOCAL));
+		}
+
+		if(id->us > 1) {
+			char str[32];
+
+			sprintf(str, "%d", id->us);
+
+			if(id->us<10)
+				but= uiDefBut(block, BUT, 0, str, 0,0,UI_UNIT_X,UI_UNIT_Y, 0, 0, 0, 0, 0, "Displays number of users of this data. Click to make a single-user copy.");
+			else
+				but= uiDefBut(block, BUT, 0, str, 0,0,UI_UNIT_X+10,UI_UNIT_Y, 0, 0, 0, 0, 0, "Displays number of users of this data. Click to make a single-user copy.");
+
+			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ALONE));
+			if(!id_copy(id, NULL, 1 /* test only */) || (idfrom && idfrom->lib))
+				uiButSetFlag(but, UI_BUT_DISABLED);
+		}
 	}
 	
 	if(flag & UI_ID_ADD_NEW) {
-		int w= idptr.data?UI_UNIT_X:UI_UNIT_X*6;
+		int w= id?UI_UNIT_X: (flag & UI_ID_OPEN)? UI_UNIT_X*3: UI_UNIT_X*6;
 		
 		if(newop) {
-			but= uiDefIconTextButO(block, BUT, newop, WM_OP_INVOKE_REGION_WIN, ICON_ZOOMIN, (idptr.data)? "": "Add New", 0, 0, w, UI_UNIT_Y, NULL);
+			but= uiDefIconTextButO(block, BUT, newop, WM_OP_INVOKE_REGION_WIN, ICON_ZOOMIN, (id)? "": "New", 0, 0, w, UI_UNIT_Y, NULL);
 			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
 		}
 		else {
-			but= uiDefIconTextBut(block, BUT, 0, ICON_ZOOMIN, (idptr.data)? "": "Add New", 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+			but= uiDefIconTextBut(block, BUT, 0, ICON_ZOOMIN, (id)? "": "New", 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
 			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
 		}
+
+		if((idfrom && idfrom->lib))
+			uiButSetFlag(but, UI_BUT_DISABLED);
+	}
+
+	if(flag & UI_ID_OPEN) {
+		int w= id?UI_UNIT_X: (flag & UI_ID_ADD_NEW)? UI_UNIT_X*3: UI_UNIT_X*6;
+		
+		if(openop) {
+			but= uiDefIconTextButO(block, BUT, openop, WM_OP_INVOKE_REGION_WIN, ICON_FILESEL, (id)? "": "Open", 0, 0, w, UI_UNIT_Y, NULL);
+			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_OPEN));
+		}
+		else {
+			but= uiDefIconTextBut(block, BUT, 0, ICON_FILESEL, (id)? "": "Open", 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_OPEN));
+		}
+
+		if((idfrom && idfrom->lib))
+			uiButSetFlag(but, UI_BUT_DISABLED);
 	}
 	
 	/* delete button */
-	if(idptr.data && (flag & UI_ID_DELETE)) {
+	if(id && (flag & UI_ID_DELETE)) {
 		if(unlinkop) {
 			but= uiDefIconButO(block, BUT, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
 		}
@@ -255,12 +328,15 @@ static void template_ID(bContext *C, uiBlock *block, TemplateID *template, Struc
 			but= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
 			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_DELETE));
 		}
+
+		if((idfrom && idfrom->lib))
+			uiButSetFlag(but, UI_BUT_DISABLED);
 	}
 	
 	uiBlockEndAlign(block);
 }
 
-void uiTemplateID(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propname, char *newop, char *unlinkop)
+void uiTemplateID(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propname, char *newop, char *openop, char *unlinkop)
 {
 	TemplateID *template;
 	uiBlock *block;
@@ -286,6 +362,8 @@ void uiTemplateID(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propname
 
 	if(newop)
 		flag |= UI_ID_ADD_NEW;
+	if(openop)
+		flag |= UI_ID_OPEN;
 
 	type= RNA_property_pointer_type(ptr, prop);
 	template->idlb= wich_libbase(CTX_data_main(C), RNA_type_to_ID_code(type));
@@ -293,7 +371,7 @@ void uiTemplateID(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propname
 	if(template->idlb) {
 		uiLayoutRow(layout, 1);
 		block= uiLayoutGetBlock(layout);
-		template_ID(C, block, template, type, flag, newop, unlinkop);
+		template_ID(C, block, template, type, flag, newop, openop, unlinkop);
 	}
 
 	MEM_freeN(template);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 53882ad8424..0ae987f2308 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2951,10 +2951,10 @@ static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 	else if (ob->id.lib) {
 		uiPopupMenu *pup= uiPupMenuBegin(C, "OK?", ICON_QUESTION);
 		uiLayout *layout= uiPupMenuLayout(pup);
-		PointerRNA props_ptr = {0};
+		PointerRNA props_ptr;
 		
 		/* create operator menu item with relevant properties filled in */
-		props_ptr= uiItemFullO(layout, op->type->name, 0, op->idname, props_ptr.data, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+		props_ptr= uiItemFullO(layout, op->type->name, 0, op->idname, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
 		RNA_string_set(&props_ptr, "object", ob->id.name+2);
 		
 		/* present the menu and be done... */
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c
index d17391811bb..714ebcef0fb 100644
--- a/source/blender/editors/preview/previewrender.c
+++ b/source/blender/editors/preview/previewrender.c
@@ -349,8 +349,14 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre
 			
 			for(base= sce->base.first; base; base= base->next) {
 				if(base->object->id.name[2]=='p') {
-					if(ELEM4(base->object->type, OB_MESH, OB_CURVE, OB_SURF, OB_MBALL))
-						assign_material(base->object, mat, base->object->actcol);
+					if(ELEM4(base->object->type, OB_MESH, OB_CURVE, OB_SURF, OB_MBALL)) {
+						/* don't use assign_material, it changed mat->id.us, which shows in the UI */
+						Material ***matar= give_matarar(base->object);
+						int actcol= MAX2(base->object->actcol > 0, 1) - 1;
+
+						if(matar && actcol < base->object->totcol)
+							(*matar)[actcol]= mat;
+					}
 				}
 			}
 		}
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index bbf1358a37c..8532d78aa06 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -211,7 +211,7 @@ static void nla_panel_animdata (const bContext *C, Panel *pa)
 	/* Active Action Properties ------------------------------------- */
 	/* action */
 	row= uiLayoutRow(layout, 1);
-		uiTemplateID(row, (bContext *)C, &adt_ptr, "action", NULL, NULL/*"ACT_OT_new", "ACT_OT_unlink"*/); // XXX: need to make these operators
+		uiTemplateID(row, (bContext *)C, &adt_ptr, "action", NULL /*"ACT_OT_new"*/, NULL, NULL /*"ACT_OT_unlink"*/); // XXX: need to make these operators
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h
index cb425274fc0..4847f2f0741 100644
--- a/source/blender/editors/space_text/text_intern.h
+++ b/source/blender/editors/space_text/text_intern.h
@@ -83,8 +83,6 @@ typedef struct FlattenString {
 int flatten_string(struct SpaceText *st, FlattenString *fs, char *in);
 void flatten_string_free(FlattenString *fs);
 
-void unlink_text(struct Text *text);
-
 int wrap_width(struct SpaceText *st, struct ARegion *ar);
 void wrap_offset(struct SpaceText *st, struct ARegion *ar, struct TextLine *linein, int cursin, int *offl, int *offc);
 
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index a8ef72e3273..7751355a14d 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -273,48 +273,9 @@ void TEXT_OT_reload(wmOperatorType *ot)
 
 /******************* delete operator *********************/
 
-static void text_unlink(Main *bmain, Text *text)
-{
-	bScreen *scr;
-	ScrArea *area;
-	SpaceLink *sl;
-
-	/* XXX this ifdef is in fact dangerous, if python is
-	 * disabled it will leave invalid pointers in files! */
-
-#ifndef DISABLE_PYTHON
-	// XXX BPY_free_pyconstraint_links(text);
-	// XXX free_text_controllers(text);
-	// XXX free_dome_warp_text(text);
-
-	/* equivalently for pynodes: */
-	if(0) // XXX nodeDynamicUnlinkText ((ID*)text))
-		; // XXX notifier: allqueue(REDRAWNODE, 0);
-#endif
-	
-	for(scr= bmain->screen.first; scr; scr= scr->id.next) {
-		for(area= scr->areabase.first; area; area= area->next) {
-			for(sl= area->spacedata.first; sl; sl= sl->next) {
-				if(sl->spacetype==SPACE_TEXT) {
-					SpaceText *st= (SpaceText*) sl;
-					
-					if(st->text==text) {
-						st->text= NULL;
-						st->top= 0;
-						
-						if(st==area->spacedata.first)
-							ED_area_tag_redraw(area);
-					}
-				}
-			}
-		}
-	}
-
-	free_libblock(&bmain->text, text);
-}
-
 static int unlink_exec(bContext *C, wmOperator *op)
 {
+	Main *bmain= CTX_data_main(C);
 	SpaceText *st= CTX_wm_space_text(C);
 	Text *text= CTX_data_edit_text(C);
 
@@ -330,7 +291,8 @@ static int unlink_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	text_unlink(CTX_data_main(C), text);
+	unlink_text(bmain, text);
+	free_libblock(&bmain->text, text);
 	WM_event_add_notifier(C, NC_TEXT|NA_REMOVED, text);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 7fc2d75a708..20948843f8a 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -247,6 +247,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 	api_ui_item_rna_common(func);
 	RNA_def_string(func, "new", "", 0, "", "Operator identifier to create a new ID block.");
+	RNA_def_string(func, "open", "", 0, "", "Operator identifier to open a file for creating a new ID block.");
 	RNA_def_string(func, "unlink", "", 0, "", "Operator identifier to unlink the ID block.");
 
 	func= RNA_def_function(srna, "template_modifier", "uiTemplateModifier");

From a49020b2414005cc7aef06749ff1f9c1c7e75a3f Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Fri, 4 Sep 2009 21:21:12 +0000
Subject: [PATCH 436/577] Strip input is not used for sound strips in 2.5.

---
 release/ui/space_sequencer.py | 41 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index bef48f5ebdb..daae4a83ec4 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -416,7 +416,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
 		if not strip:
 			return False
 		
-		return strip.type in ('MOVIE', 'IMAGE', 'SOUND')
+		return strip.type in ('MOVIE', 'IMAGE')
 	
 	def draw(self, context):
 		layout = self.layout
@@ -440,27 +440,26 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
 			col = split.column()
 			col.itemR(elem, "filename", text="") # strip.elements[0] could be a fallback
 		
-		if strip.type != 'SOUND':
-			layout.itemR(strip, "use_translation", text="Image Offset:")
-			if strip.transform:
-				col = layout.column(align=True)
-				col.active = strip.use_translation
-				col.itemR(strip.transform, "offset_x", text="X")
-				col.itemR(strip.transform, "offset_y", text="Y")
-		
-			layout.itemR(strip, "use_crop", text="Image Crop:")
-			if strip.crop:
-				col = layout.column(align=True)
-				col.active = strip.use_crop
-				col.itemR(strip.crop, "top")
-				col.itemR(strip.crop, "left")
-				col.itemR(strip.crop, "bottom")
-				col.itemR(strip.crop, "right")
-			
+		layout.itemR(strip, "use_translation", text="Image Offset:")
+		if strip.transform:
 			col = layout.column(align=True)
-			col.itemL(text="Trim Duration:")
-			col.itemR(strip, "animation_start_offset", text="Start")
-			col.itemR(strip, "animation_end_offset", text="End")
+			col.active = strip.use_translation
+			col.itemR(strip.transform, "offset_x", text="X")
+			col.itemR(strip.transform, "offset_y", text="Y")
+	
+		layout.itemR(strip, "use_crop", text="Image Crop:")
+		if strip.crop:
+			col = layout.column(align=True)
+			col.active = strip.use_crop
+			col.itemR(strip.crop, "top")
+			col.itemR(strip.crop, "left")
+			col.itemR(strip.crop, "bottom")
+			col.itemR(strip.crop, "right")
+		
+		col = layout.column(align=True)
+		col.itemL(text="Trim Duration:")
+		col.itemR(strip, "animation_start_offset", text="Start")
+		col.itemR(strip, "animation_end_offset", text="End")
 
 class SEQUENCER_PT_sound(SequencerButtonsPanel):
 	__label__ = "Sound"

From d3e35f096811dced93cc213392db43b7cb426a29 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 4 Sep 2009 21:34:17 +0000
Subject: [PATCH 437/577] 2.5: increase subversion to init new sound userpref
 variables.

---
 source/blender/blenkernel/BKE_blender.h      |  2 +-
 source/blender/blenloader/intern/readfile.c  | 10 ----------
 source/blender/editors/interface/resources.c | 12 ++++++++++++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 42ee11587a7..d60737d62fe 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -43,7 +43,7 @@ struct bContext;
 struct ReportList;
 
 #define BLENDER_VERSION			250
-#define BLENDER_SUBVERSION		2
+#define BLENDER_SUBVERSION		3
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0231d841c2b..5a628192af6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9686,16 +9686,6 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
 	bfd->user->uifonts.first= bfd->user->uifonts.last= NULL;
 	bfd->user->uistyles.first= bfd->user->uistyles.last= NULL;
 
-	// AUD_XXX that's bad because if the user has saved No Audio, it changes to OpenAL always
-	if(bfd->user->audiochannels == 0)
-		bfd->user->audiochannels = 2;
-	if(bfd->user->audiodevice == 0)
-		bfd->user->audiodevice = 2;
-	if(bfd->user->audioformat == 0)
-		bfd->user->audioformat = 0x24;
-	if(bfd->user->audiorate == 0)
-		bfd->user->audiorate = 44100;
-
 	bhead = blo_nextbhead(fd, bhead);
 
 		/* read all attached data */
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 8aaede7515a..c54e09b2b40 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1245,6 +1245,18 @@ void init_userdef_do_versions(void)
 			SETCOLF(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0);
 		}
 	}
+
+	if (G.main->versionfile < 250 || (G.main->versionfile == 250 && G.main->subversionfile < 3)) {
+		/* new audio system */
+		if(U.audiochannels == 0)
+			U.audiochannels = 2;
+		if(U.audiodevice == 0)
+			U.audiodevice = 2;
+		if(U.audioformat == 0)
+			U.audioformat = 0x24;
+		if(U.audiorate == 0)
+			U.audiorate = 44100;
+	}
 	
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {

From eaa079b9b7e8650411da90419fce73ffe3334f55 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 4 Sep 2009 22:07:33 +0000
Subject: [PATCH 438/577] - buttons to move logic bricks up and down when they
 are collapsed - made actuators and sensors 300 wide (like they were in 2.4x,
 someone must have changed that). The layout didnt take advantage of the extra
 width and it looked odd.

---
 .../editors/space_logic/logic_window.c        | 65 +++++++++++++------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index 47ba197daa0..3040d73bda9 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -74,11 +74,6 @@
 #include "logic_intern.h"
 
 
-
-/* XXX */
-static int pupmenu() {return 1;}
-/* XXX */
-
 #define MAX_RENDER_PASS   100
 #define B_REDR		1
 #define B_IDNAME	2
@@ -202,7 +197,7 @@ static void make_unique_prop_names_cb(bContext *C, void *strv, void *redraw_view
 }
 
 
-static void sca_move_sensor(bContext *C, void *datav, void *data2_unused)
+static void sca_move_sensor(bContext *C, void *datav, void *move_up)
 {
 	Scene *scene= CTX_data_scene(C);
 	bSensor *sens_to_delete= datav;
@@ -210,7 +205,8 @@ static void sca_move_sensor(bContext *C, void *datav, void *data2_unused)
 	Base *base;
 	bSensor *sens, *tmp;
 	
-	val= pupmenu("Move up%x1|Move down %x2");
+	// val= pupmenu("Move up%x1|Move down %x2");
+	val = move_up ? 1:2;
 	
 	if(val>0) {
 		/* now find out which object has this ... */
@@ -253,7 +249,7 @@ static void sca_move_sensor(bContext *C, void *datav, void *data2_unused)
 	}
 }
 
-static void sca_move_controller(bContext *C, void *datav, void *data2_unused)
+static void sca_move_controller(bContext *C, void *datav, void *move_up)
 {
 	Scene *scene= CTX_data_scene(C);
 	bController *controller_to_del= datav;
@@ -261,7 +257,8 @@ static void sca_move_controller(bContext *C, void *datav, void *data2_unused)
 	Base *base;
 	bController *cont, *tmp;
 	
-	val= pupmenu("Move up%x1|Move down %x2");
+	//val= pupmenu("Move up%x1|Move down %x2");
+	val = move_up ? 1:2;
 	
 	if(val>0) {
 		/* now find out which object has this ... */
@@ -307,7 +304,7 @@ static void sca_move_controller(bContext *C, void *datav, void *data2_unused)
 	}
 }
 
-static void sca_move_actuator(bContext *C, void *datav, void *data2_unused)
+static void sca_move_actuator(bContext *C, void *datav, void *move_up)
 {
 	Scene *scene= CTX_data_scene(C);
 	bActuator *actuator_to_move= datav;
@@ -315,7 +312,8 @@ static void sca_move_actuator(bContext *C, void *datav, void *data2_unused)
 	Base *base;
 	bActuator *act, *tmp;
 	
-	val= pupmenu("Move up%x1|Move down %x2");
+	//val= pupmenu("Move up%x1|Move down %x2");
+	val = move_up ? 1:2;
 	
 	if(val>0) {
 		/* now find out which object has this ... */
@@ -981,6 +979,7 @@ static void draw_default_sensor_header(bSensor *sens,
 	uiBut *but;
 	
 	/* Pulsing and frequency */
+	uiBlockBeginAlign(block);
 	uiDefIconButBitS(block, TOG, SENS_PULSE_REPEAT, 1, ICON_DOTSUP,
 			 (short)(x + 10 + 0. * (w-20)), (short)(y - 21), (short)(0.1 * (w-20)), 19,
 			 &sens->pulse, 0.0, 0.0, 0, 0,
@@ -994,8 +993,10 @@ static void draw_default_sensor_header(bSensor *sens,
 			 (short)(x + 10 + 0.2 * (w-20)), (short)(y - 21), (short)(0.275 * (w-20)), 19,
 			 &sens->freq, 0.0, 10000.0, 0, 0,
 			 "Delay between repeated pulses (in logic tics, 0 = no delay)");
+	uiBlockEndAlign(block);
 	
 	/* value or shift? */
+	uiBlockBeginAlign(block);
 	but= uiDefButS(block, TOG, 1, "Level",
 			 (short)(x + 10 + 0.5 * (w-20)), (short)(y - 21), (short)(0.20 * (w-20)), 19,
 			 &sens->level, 0.0, 0.0, 0, 0,
@@ -1006,6 +1007,7 @@ static void draw_default_sensor_header(bSensor *sens,
 			 &sens->tap, 0.0, 0.0, 0, 0,
 			 "Trigger controllers only for an instant, even while the sensor remains true");
 	uiButSetFunc(but, verify_logicbutton_func, sens, &(sens->tap));
+	uiBlockEndAlign(block);
 	
 	uiDefButS(block, TOG, 1, "Inv",
 			 (short)(x + 10 + 0.85 * (w-20)), (short)(y - 21), (short)(0.15 * (w-20)), 19,
@@ -3020,7 +3022,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 		
 	/* start with the controller because we need to know which one is visible */
 	/* ******************************* */
-	xco= 500; yco= 170; width= 300;
+	xco= 400; yco= 170; width= 300;
 
 	uiDefBlockBut(block, controller_menu, NULL, "Controllers", xco-10, yco+35, 100, UI_UNIT_Y, "");
 	
@@ -3129,9 +3131,17 @@ void logic_buttons(bContext *C, ARegion *ar)
 							cpack(0x999999);
 							glRecti(xco+22, yco, xco+width-22,yco+19);
 							but= uiDefBut(block, LABEL, 0, controller_name(cont->type), (short)(xco+22), yco, 70, UI_UNIT_Y, cont, 0, 0, 0, 0, "Controller type");
-							uiButSetFunc(but, sca_move_controller, cont, NULL);
+							//uiButSetFunc(but, sca_move_controller, cont, NULL);
 							but= uiDefBut(block, LABEL, 0, cont->name,(short)(xco+92), yco,(short)(width-158), UI_UNIT_Y, cont, 0, 0, 0, 0, "Controller name");
-							uiButSetFunc(but, sca_move_controller, cont, NULL);
+							//uiButSetFunc(but, sca_move_controller, cont, NULL);
+
+							uiBlockBeginAlign(block);
+							but= uiDefIconBut(block, BUT, B_REDR, VICON_MOVE_UP, (short)(xco+width-(110+5)), yco, 22, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Move this logic brick up");
+							uiButSetFunc(but, sca_move_controller, cont, (void *)TRUE);
+							but= uiDefIconBut(block, BUT, B_REDR, VICON_MOVE_DOWN, (short)(xco+width-(88+5)), yco, 22, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Move this logic brick down");
+							uiButSetFunc(but, sca_move_controller, cont, (void *)FALSE);
+							uiBlockEndAlign(block);
+
 							ycoo= yco;
 						}
 				
@@ -3152,7 +3162,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 	}
 	
 	/* ******************************* */
-	xco= 10; yco= 170; width= 400;
+	xco= 10; yco= 170; width= 300;
 
 	uiDefBlockBut(block, sensor_menu, NULL, "Sensors", xco-10, yco+35, 70, UI_UNIT_Y, "");
 	
@@ -3213,9 +3223,16 @@ void logic_buttons(bContext *C, ARegion *ar)
 						set_col_sensor(sens->type, 1);
 						glRecti(xco+22, yco, xco+width-22,yco+19);
 						but= uiDefBut(block, LABEL, 0, sensor_name(sens->type),	(short)(xco+22), yco, 80, UI_UNIT_Y, sens, 0, 0, 0, 0, "");
-						uiButSetFunc(but, sca_move_sensor, sens, NULL);
+						//uiButSetFunc(but, sca_move_sensor, sens, NULL);
 						but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+102), yco, (short)(width-(pin?146:124)), UI_UNIT_Y, sens, 0, 31, 0, 0, "");
-						uiButSetFunc(but, sca_move_sensor, sens, NULL);
+						//uiButSetFunc(but, sca_move_sensor, sens, NULL);
+
+						uiBlockBeginAlign(block);
+						but= uiDefIconBut(block, BUT, B_REDR, VICON_MOVE_UP, (short)(xco+width-(66+5)), yco, 22, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Move this logic brick up");
+						uiButSetFunc(but, sca_move_sensor, sens, (void *)TRUE);
+						but= uiDefIconBut(block, BUT, B_REDR, VICON_MOVE_DOWN, (short)(xco+width-(44+5)), yco, 22, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Move this logic brick down");
+						uiButSetFunc(but, sca_move_sensor, sens, (void *)FALSE);
+						uiBlockEndAlign(block);
 					}
 
 					but= uiDefIconBut(block, LINK, 0, ICON_LINK,	(short)(xco+width), ycoo, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
@@ -3230,7 +3247,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 	}
 
 	/* ******************************* */
-	xco= 900; yco= 170; width= 400;
+	xco= 800; yco= 170; width= 300;
 	
 	uiDefBlockBut(block, actuator_menu, NULL, "Actuators", xco-10, yco+35, 90, UI_UNIT_Y, "");
 
@@ -3286,9 +3303,17 @@ void logic_buttons(bContext *C, ARegion *ar)
 						set_col_actuator(act->type, 1);
 						glRecti((short)(xco+22), yco, (short)(xco+width-22),(short)(yco+19));
 						but= uiDefBut(block, LABEL, 0, actuator_name(act->type), (short)(xco+22), yco, 90, UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator type");
-						uiButSetFunc(but, sca_move_actuator, act, NULL);
+						// uiButSetFunc(but, sca_move_actuator, act, NULL);
 						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator name");
-						uiButSetFunc(but, sca_move_actuator, act, NULL);
+						// uiButSetFunc(but, sca_move_actuator, act, NULL);
+
+						uiBlockBeginAlign(block);
+						but= uiDefIconBut(block, BUT, B_REDR, VICON_MOVE_UP, (short)(xco+width-(66+5)), yco, 22, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Move this logic brick up");
+						uiButSetFunc(but, sca_move_actuator, act, (void *)TRUE);
+						but= uiDefIconBut(block, BUT, B_REDR, VICON_MOVE_DOWN, (short)(xco+width-(44+5)), yco, 22, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Move this logic brick down");
+						uiButSetFunc(but, sca_move_actuator, act, (void *)FALSE);
+						uiBlockEndAlign(block);
+
 						ycoo= yco;
 					}
 

From ec5a8c010c8100a1709786f81d5b9b501383287a Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 4 Sep 2009 22:50:15 +0000
Subject: [PATCH 439/577] 2.5 - Animation Tweaks

* Sequencer data is now animateable. Was missing a 'path' setting. For now, sequencer data is animated under scene, since SequenceEditor is not an ID block.
* Fixed some buggy insert-keyframe code.
---
 source/blender/editors/animation/keyframing.c | 18 +++++-------------
 source/blender/makesrna/intern/rna_sequence.c | 11 +++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index d731ec6f148..7135f8802bc 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -292,14 +292,8 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt, short flag)
 			}
 		}
 		else if ((flag & INSERTKEY_REPLACE) == 0) {
-			/* add new - if we're not restricted to replacing keyframes only */
-			BezTriple *newb;
-			
-			/* allocate a new array only if we have to */
-			if ((flag & INSERTKEY_FASTR) == 0)
-				newb= MEM_callocN((fcu->totvert+1)*sizeof(BezTriple), "beztriple");
-			else
-				newb= fcu->bezt;
+			/* insert new - if we're not restricted to replacing keyframes only */
+			BezTriple *newb= MEM_callocN((fcu->totvert+1)*sizeof(BezTriple), "beztriple");
 			
 			/* add the beztriples that should occur before the beztriple to be pasted (originally in ei->icu) */
 			if (i > 0)
@@ -313,11 +307,9 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt, short flag)
 				memcpy(newb+i+1, fcu->bezt+i, (fcu->totvert-i)*sizeof(BezTriple));
 			
 			/* replace (+ free) old with new, only if necessary to do so */
-			if ((flag & INSERTKEY_FASTR) == 0) {
-				MEM_freeN(fcu->bezt);
-				fcu->bezt= newb;
-			}
-			
+			MEM_freeN(fcu->bezt);
+			fcu->bezt= newb;
+				
 			fcu->totvert++;
 		}
 	}
diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c
index 5d275f7a87c..9f016f73694 100644
--- a/source/blender/makesrna/intern/rna_sequence.c
+++ b/source/blender/makesrna/intern/rna_sequence.c
@@ -221,6 +221,16 @@ static StructRNA* rna_Sequence_refine(struct PointerRNA *ptr)
 	}
 }
 
+static char *rna_Sequence_path(PointerRNA *ptr)
+{
+	Sequence *seq= (Sequence*)ptr->data;
+	
+	/* sequencer data comes from scene... 
+	 * TODO: would be nice to make SequenceEditor data a datablock of its own (for shorter paths)
+	 */
+	return BLI_sprintfN("sequence_editor.sequences[\"%s\"]", seq->name+2);
+}
+
 static PointerRNA rna_SequenceEdtior_meta_stack_get(CollectionPropertyIterator *iter)
 {
 	ListBaseIterator *internal= iter->internal;
@@ -393,6 +403,7 @@ static void rna_def_sequence(BlenderRNA *brna)
 	srna = RNA_def_struct(brna, "Sequence", NULL);
 	RNA_def_struct_ui_text(srna, "Sequence", "Sequence strip in the sequence editor.");
 	RNA_def_struct_refine_func(srna, "rna_Sequence_refine");
+	RNA_def_struct_path_func(srna, "rna_Sequence_path");
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_Sequence_name_get", "rna_Sequence_name_length", "rna_Sequence_name_set");

From f09d6054100a17cc6129d035cf3634394f5e9377 Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Fri, 4 Sep 2009 23:06:15 +0000
Subject: [PATCH 440/577] Some particles cleanup & fixes: - Some big refresh
 issues with softbody & cloth point cache usage should now be fixed. - Removed
 sticky objects from particles (better stuff will come back when I get to
 updating reactor particles). - Some initial easy memory efficiency cleanup
 for ParticleData struct. The ultimate goal is to get particles less memory
 hungry -> more particles possible in single scene. - Wrong path timing
 clamping caused hair particles to seem disappeared when changing between
 normal<->hair particles. - "Calculate to current frame" in cache buttons
 baked instead of the intended function. - Boids particle data is now a bit
 better organized.

---
 release/ui/buttons_particle.py                |   1 -
 source/blender/blenkernel/BKE_particle.h      |   4 +
 source/blender/blenkernel/intern/boids.c      | 198 +++++----
 source/blender/blenkernel/intern/cloth.c      |  27 +-
 source/blender/blenkernel/intern/modifier.c   |   6 +-
 source/blender/blenkernel/intern/object.c     |  51 ++-
 source/blender/blenkernel/intern/particle.c   | 140 +++----
 .../blenkernel/intern/particle_system.c       | 383 ++++++++----------
 source/blender/blenkernel/intern/pointcache.c |  10 +-
 source/blender/blenkernel/intern/softbody.c   |  40 +-
 source/blender/blenloader/intern/readfile.c   |   9 -
 source/blender/blenloader/intern/writefile.c  |   2 +-
 source/blender/editors/object/object_edit.c   |   3 +
 .../blender/editors/physics/ed_pointcache.c   |   2 +-
 source/blender/editors/physics/editparticle.c |  61 +--
 .../blender/editors/space_view3d/drawobject.c |  11 +-
 source/blender/makesdna/DNA_particle_types.h  |  45 +-
 source/blender/makesrna/intern/rna_particle.c |  42 +-
 .../render/intern/source/convertblender.c     |   6 +-
 19 files changed, 512 insertions(+), 529 deletions(-)

diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index 0b18b7c2072..f3339049962 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -396,7 +396,6 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
 		if part.physics_type=='NEWTON':
 			sub.itemR(part, "size_deflect")
 			sub.itemR(part, "die_on_collision")
-			sub.itemR(part, "sticky")
 		elif part.physics_type=='KEYED' or part.physics_type=='BOIDS':
 			if part.physics_type=='BOIDS':
 				layout.itemL(text="Relations:")
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index e24114cd219..15896477a6a 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -59,6 +59,9 @@ struct SurfaceModifierData;
 struct BVHTreeRay;
 struct BVHTreeRayHit; 
 
+#define PARTICLE_P				ParticleData *pa; int p
+#define LOOP_PARTICLES	for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++)
+
 typedef struct ParticleEffectorCache {
 	struct ParticleEffectorCache *next, *prev;
 	struct Object *ob;
@@ -207,6 +210,7 @@ void free_child_path_cache(struct ParticleSystem *psys);
 void psys_free_path_cache(struct ParticleSystem *psys, struct PTCacheEdit *edit);
 void free_hair(struct ParticleSystem *psys, int softbody);
 void free_keyed_keys(struct ParticleSystem *psys);
+void psys_free_particles(struct ParticleSystem *psys);
 void psys_free(struct Object * ob, struct ParticleSystem * psys);
 void psys_free_children(struct ParticleSystem *psys);
 
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c
index 5c62e434cb6..18f065b59d9 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -74,6 +74,7 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
 	BoidSettings *boids = bbd->part->boids;
 	ParticleEffectorCache *ec;
 	Object *priority_ob = NULL;
+	BoidParticle *bpa = pa->boid;
 	float vec[3] = {0.0f, 0.0f, 0.0f}, loc[3] = {0.0f, 0.0f, 0.0f};
 	float mul = (rule->type == eBoidRuleType_Avoid ? 1.0 : -1.0);
 	float priority = 0.0f, len = 0.0f;
@@ -81,7 +82,7 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
 
 	/* first find out goal/predator with highest priority */
 	/* if rule->ob specified use it */
-	if(gabr->ob && (rule->type != eBoidRuleType_Goal || gabr->ob != pa->stick_ob)) {
+	if(gabr->ob && (rule->type != eBoidRuleType_Goal || gabr->ob != bpa->ground)) {
 		PartDeflect *pd = gabr->ob->pd;
 		float vec_to_part[3];
 
@@ -104,7 +105,7 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
 			PartDeflect *pd = eob->pd;
 
 			/* skip current object */
-			if(rule->type == eBoidRuleType_Goal && eob == pa->stick_ob)
+			if(rule->type == eBoidRuleType_Goal && eob == bpa->ground)
 				continue;
 
 			if(pd->forcefield == PFIELD_BOID && mul * pd->f_strength > 0.0f) {
@@ -169,10 +170,10 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
 				VECCOPY(bbd->goal_nor, nor);
 			}
 		}
-		else if(rule->type == eBoidRuleType_Avoid && pa->boid->mode == eBoidMode_Climbing &&
+		else if(rule->type == eBoidRuleType_Avoid && bpa->data.mode == eBoidMode_Climbing &&
 			priority > 2.0f * gabr->fear_factor) {
 			/* detach from surface and try to fly away from danger */
-			VECCOPY(vec_to_part, pa->r_ve);
+			VECCOPY(vec_to_part, bpa->gravity);
 			VecMulf(vec_to_part, -1.0f);
 		}
 
@@ -205,6 +206,7 @@ static int rule_avoid_collision(BoidRule *rule, BoidBrainData *bbd, BoidValues *
 	KDTreeNearest *ptn = NULL;
 	ParticleEffectorCache *ec;
 	ParticleTarget *pt;
+	BoidParticle *bpa = pa->boid;
 	float vec[3] = {0.0f, 0.0f, 0.0f}, loc[3] = {0.0f, 0.0f, 0.0f};
 	float co1[3], vel1[3], co2[3], vel2[3];
 	float  len, t, inp, t_min = 2.0f;
@@ -231,7 +233,7 @@ static int rule_avoid_collision(BoidRule *rule, BoidBrainData *bbd, BoidValues *
 				Object *eob = ec->ob;
 
 				/* don't check with current ground object */
-				if(eob == pa->stick_ob)
+				if(eob == bpa->ground)
 					continue;
 
 				col.md = ( CollisionModifierData * ) ( modifiers_findByType ( eob, eModifierType_Collision ) );
@@ -558,18 +560,19 @@ static int rule_follow_leader(BoidRule *rule, BoidBrainData *bbd, BoidValues *va
 }
 static int rule_average_speed(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, ParticleData *pa)
 {
+	BoidParticle *bpa = pa->boid;
 	BoidRuleAverageSpeed *asbr = (BoidRuleAverageSpeed*)rule;
 	float vec[3] = {0.0f, 0.0f, 0.0f};
 
 	if(asbr->wander > 0.0f) {
 		/* abuse pa->r_ave for wandering */
-		pa->r_ave[0] += asbr->wander * (-1.0f + 2.0f * BLI_frand());
-		pa->r_ave[1] += asbr->wander * (-1.0f + 2.0f * BLI_frand());
-		pa->r_ave[2] += asbr->wander * (-1.0f + 2.0f * BLI_frand());
+		bpa->wander[0] += asbr->wander * (-1.0f + 2.0f * BLI_frand());
+		bpa->wander[1] += asbr->wander * (-1.0f + 2.0f * BLI_frand());
+		bpa->wander[2] += asbr->wander * (-1.0f + 2.0f * BLI_frand());
 
-		Normalize(pa->r_ave);
+		Normalize(bpa->wander);
 
-		VECCOPY(vec, pa->r_ave);
+		VECCOPY(vec, bpa->wander);
 
 		QuatMulVecf(pa->prev_state.rot, vec);
 
@@ -615,6 +618,7 @@ static int rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti
 	ParticleTarget *pt;
 	ParticleData *epars;
 	ParticleData *enemy_pa = NULL;
+	BoidParticle *bpa;
 	/* friends & enemies */
 	float closest_enemy[3] = {0.0f,0.0f,0.0f};
 	float closest_dist = fbr->distance + 1.0f;
@@ -624,8 +628,10 @@ static int rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti
 
 	/* calculate own group strength */
 	int neighbors = BLI_kdtree_range_search(bbd->psys->tree, fbr->distance, pa->prev_state.co, NULL, &ptn);
-	for(n=0; n<neighbors; n++)
-		health += bbd->psys->particles[ptn[n].index].boid->health;
+	for(n=0; n<neighbors; n++) {
+		bpa = bbd->psys->particles[ptn[n].index].boid;
+		health += bpa->data.health;
+	}
 
 	f_strength += bbd->part->boids->strength * health;
 
@@ -642,7 +648,8 @@ static int rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti
 			health = 0.0f;
 
 			for(n=0; n<neighbors; n++) {
-				health += epars[ptn[n].index].boid->health;
+				bpa = epars[ptn[n].index].boid;
+				health += bpa->data.health;
 
 				if(n==0 && pt->mode==PTARGET_MODE_ENEMY && ptn[n].dist < closest_dist) {
 					VECCOPY(closest_enemy, ptn[n].co);
@@ -674,7 +681,8 @@ static int rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti
 
 			/* must face enemy to fight */
 			if(Inpf(pa->prev_state.ave, enemy_dir)>0.5f) {
-				enemy_pa->boid->health -= bbd->part->boids->strength * bbd->timestep * ((1.0f-bbd->part->boids->accuracy)*damage + bbd->part->boids->accuracy);
+				bpa = enemy_pa->boid;
+				bpa->data.health -= bbd->part->boids->strength * bbd->timestep * ((1.0f-bbd->part->boids->accuracy)*damage + bbd->part->boids->accuracy);
 			}
 		}
 		else {
@@ -683,7 +691,8 @@ static int rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti
 		}
 
 		/* check if boid doesn't want to fight */
-		if(pa->boid->health/bbd->part->boids->health * bbd->part->boids->aggression < e_strength / f_strength) {
+		bpa = pa->boid;
+		if(bpa->data.health/bbd->part->boids->health * bbd->part->boids->aggression < e_strength / f_strength) {
 			/* decide to flee */
 			if(closest_dist < fbr->flee_distance * fbr->distance) {
 				VecMulf(bbd->wanted_co, -1.0f);
@@ -721,18 +730,20 @@ static boid_rule_cb boid_rules[] = {
 
 static void set_boid_values(BoidValues *val, BoidSettings *boids, ParticleData *pa)
 {
-	if(ELEM(pa->boid->mode, eBoidMode_OnLand, eBoidMode_Climbing)) {
-		val->max_speed = boids->land_max_speed * pa->boid->health/boids->health;
+	BoidParticle *bpa = pa->boid;
+
+	if(ELEM(bpa->data.mode, eBoidMode_OnLand, eBoidMode_Climbing)) {
+		val->max_speed = boids->land_max_speed * bpa->data.health/boids->health;
 		val->max_acc = boids->land_max_acc * val->max_speed;
-		val->max_ave = boids->land_max_ave * M_PI * pa->boid->health/boids->health;
+		val->max_ave = boids->land_max_ave * M_PI * bpa->data.health/boids->health;
 		val->min_speed = 0.0f; /* no minimum speed on land */
 		val->personal_space = boids->land_personal_space;
-		val->jump_speed = boids->land_jump_speed * pa->boid->health/boids->health;
+		val->jump_speed = boids->land_jump_speed * bpa->data.health/boids->health;
 	}
 	else {
-		val->max_speed = boids->air_max_speed * pa->boid->health/boids->health;
+		val->max_speed = boids->air_max_speed * bpa->data.health/boids->health;
 		val->max_acc = boids->air_max_acc * val->max_speed;
-		val->max_ave = boids->air_max_ave * M_PI * pa->boid->health/boids->health;
+		val->max_ave = boids->air_max_ave * M_PI * bpa->data.health/boids->health;
 		val->min_speed = boids->air_min_speed * boids->air_max_speed;
 		val->personal_space = boids->air_personal_space;
 		val->jump_speed = 0.0f; /* no jumping in air */
@@ -740,11 +751,13 @@ static void set_boid_values(BoidValues *val, BoidSettings *boids, ParticleData *
 }
 static Object *boid_find_ground(BoidBrainData *bbd, ParticleData *pa, float *ground_co, float *ground_nor)
 {
-	if(pa->boid->mode == eBoidMode_Climbing) {
+	BoidParticle *bpa = pa->boid;
+
+	if(bpa->data.mode == eBoidMode_Climbing) {
 		SurfaceModifierData *surmd = NULL;
 		float x[3], v[3];
 
-		surmd = (SurfaceModifierData *)modifiers_findByType ( pa->stick_ob, eModifierType_Surface );
+		surmd = (SurfaceModifierData *)modifiers_findByType ( bpa->ground, eModifierType_Surface );
 
 		/* take surface velocity into account */
 		effector_find_co(bbd->scene, pa->state.co, surmd, NULL, NULL, x, NULL, v, NULL);
@@ -753,7 +766,7 @@ static Object *boid_find_ground(BoidBrainData *bbd, ParticleData *pa, float *gro
 		/* get actual position on surface */
 		effector_find_co(bbd->scene, x, surmd, NULL, NULL, ground_co, ground_nor, NULL, NULL);
 
-		return pa->stick_ob;
+		return bpa->ground;
 	}
 	else {
 		float zvec[3] = {0.0f, 0.0f, 2000.0f};
@@ -803,13 +816,15 @@ static Object *boid_find_ground(BoidBrainData *bbd, ParticleData *pa, float *gro
 }
 static int boid_rule_applies(ParticleData *pa, BoidSettings *boids, BoidRule *rule)
 {
+	BoidParticle *bpa = pa->boid;
+
 	if(rule==NULL)
 		return 0;
 	
-	if(ELEM(pa->boid->mode, eBoidMode_OnLand, eBoidMode_Climbing) && rule->flag & BOIDRULE_ON_LAND)
+	if(ELEM(bpa->data.mode, eBoidMode_OnLand, eBoidMode_Climbing) && rule->flag & BOIDRULE_ON_LAND)
 		return 1;
 	
-	if(pa->boid->mode==eBoidMode_InAir && rule->flag & BOIDRULE_IN_AIR)
+	if(bpa->data.mode==eBoidMode_InAir && rule->flag & BOIDRULE_IN_AIR)
 		return 1;
 
 	return 0;
@@ -835,12 +850,13 @@ void boids_precalc_rules(ParticleSettings *part, float cfra)
 }
 static void boid_climb(BoidSettings *boids, ParticleData *pa, float *surface_co, float *surface_nor)
 {
+	BoidParticle *bpa = pa->boid;
 	float nor[3], vel[3];
 	VECCOPY(nor, surface_nor);
 
-	/* gather apparent gravity to r_ve */
-	VECADDFAC(pa->r_ve, pa->r_ve, surface_nor, -1.0);
-	Normalize(pa->r_ve);
+	/* gather apparent gravity */
+	VECADDFAC(bpa->gravity, bpa->gravity, surface_nor, -1.0);
+	Normalize(bpa->gravity);
 
 	/* raise boid it's size from surface */
 	VecMulf(nor, pa->size * boids->height);
@@ -877,16 +893,17 @@ static int apply_boid_rule(BoidBrainData *bbd, BoidRule *rule, BoidValues *val,
 }
 static BoidState *get_boid_state(BoidSettings *boids, ParticleData *pa) {
 	BoidState *state = boids->states.first;
+	BoidParticle *bpa = pa->boid;
 
 	for(; state; state=state->next) {
-		if(state->id==pa->boid->state_id)
+		if(state->id==bpa->data.state_id)
 			return state;
 	}
 
 	/* for some reason particle isn't at a valid state */
 	state = boids->states.first;
 	if(state)
-		pa->boid->state_id = state->id;
+		bpa->data.state_id = state->id;
 
 	return state;
 }
@@ -902,9 +919,11 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 	BoidSettings *boids = bbd->part->boids;
 	BoidValues val;
 	BoidState *state = get_boid_state(boids, pa);
+	BoidParticle *bpa = pa->boid;
+	int rand;
 	//BoidCondition *cond;
 
-	if(pa->boid->health <= 0.0f) {
+	if(bpa->data.health <= 0.0f) {
 		pa->alive = PARS_DYING;
 		return;
 	}
@@ -922,7 +941,9 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 	bbd->wanted_co[0]=bbd->wanted_co[1]=bbd->wanted_co[2]=bbd->wanted_speed=0.0f;
 
 	/* create random seed for every particle & frame */
-	BLI_srandom(bbd->psys->seed + p + (int)bbd->cfra + (int)(1000*pa->r_rot[0]));
+	BLI_srandom(bbd->psys->seed + p);
+	rand = BLI_rand();
+	BLI_srandom((int)bbd->cfra + rand);
 
 	set_boid_values(&val, bbd->part->boids, pa);
 
@@ -939,7 +960,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 		case eBoidRulesetType_Random:
 		{
 			/* use random rule for each particle (allways same for same particle though) */
-			rule = BLI_findlink(&state->rules, (int)(1000.0f * pa->r_rot[1]) % BLI_countlist(&state->rules));
+			rule = BLI_findlink(&state->rules, rand % BLI_countlist(&state->rules));
 
 			apply_boid_rule(bbd, rule, &val, pa, -1.0);
 		}
@@ -969,7 +990,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 	}
 
 	/* decide on jumping & liftoff */
-	if(pa->boid->mode == eBoidMode_OnLand) {
+	if(bpa->data.mode == eBoidMode_OnLand) {
 		/* fuzziness makes boids capable of misjudgement */
 		float mul = 1.0 + state->rule_fuzziness;
 		
@@ -983,7 +1004,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 			Normalize2(cvel);
 
 			if(Inp2f(cvel, dir) > 0.95 / mul)
-				pa->boid->mode = eBoidMode_Liftoff;
+				bpa->data.mode = eBoidMode_Liftoff;
 		}
 		else if(val.jump_speed > 0.0f) {
 			float jump_v[3];
@@ -1036,7 +1057,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 
 			if(jump) {
 				VECCOPY(pa->prev_state.vel, jump_v);
-				pa->boid->mode = eBoidMode_Falling;
+				bpa->data.mode = eBoidMode_Falling;
 			}
 		}
 	}
@@ -1045,6 +1066,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
 void boid_body(BoidBrainData *bbd, ParticleData *pa)
 {
 	BoidSettings *boids = bbd->part->boids;
+	BoidParticle *bpa = pa->boid;
 	BoidValues val;
 	float acc[3] = {0.0f, 0.0f, 0.0f}, tan_acc[3], nor_acc[3];
 	float dvec[3], bvec[3];
@@ -1066,10 +1088,10 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 		pa_mass*=pa->size;
 
 	/* if boids can't fly they fall to the ground */
-	if((boids->options & BOID_ALLOW_FLIGHT)==0 && ELEM(pa->boid->mode, eBoidMode_OnLand, eBoidMode_Climbing)==0 && bbd->part->acc[2] != 0.0f)
-		pa->boid->mode = eBoidMode_Falling;
+	if((boids->options & BOID_ALLOW_FLIGHT)==0 && ELEM(bpa->data.mode, eBoidMode_OnLand, eBoidMode_Climbing)==0 && bbd->part->acc[2] != 0.0f)
+		bpa->data.mode = eBoidMode_Falling;
 
-	if(pa->boid->mode == eBoidMode_Falling) {
+	if(bpa->data.mode == eBoidMode_Falling) {
 		/* Falling boids are only effected by gravity. */
 		acc[2] = bbd->part->acc[2];
 	}
@@ -1079,14 +1101,14 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 		float level = landing_level + 1.0f;
 		float new_vel[3];
 
-		if(pa->boid->mode == eBoidMode_Liftoff) {
-			pa->boid->mode = eBoidMode_InAir;
-			pa->stick_ob = boid_find_ground(bbd, pa, ground_co, ground_nor);
+		if(bpa->data.mode == eBoidMode_Liftoff) {
+			bpa->data.mode = eBoidMode_InAir;
+			bpa->ground = boid_find_ground(bbd, pa, ground_co, ground_nor);
 		}
-		else if(pa->boid->mode == eBoidMode_InAir && boids->options & BOID_ALLOW_LAND) {
+		else if(bpa->data.mode == eBoidMode_InAir && boids->options & BOID_ALLOW_LAND) {
 			/* auto-leveling & landing if close to ground */
 
-			pa->stick_ob = boid_find_ground(bbd, pa, ground_co, ground_nor);
+			bpa->ground = boid_find_ground(bbd, pa, ground_co, ground_nor);
 			
 			/* level = how many particle sizes above ground */
 			level = (pa->prev_state.co[2] - ground_co[2])/(2.0f * pa->size) - 0.5;
@@ -1097,7 +1119,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 				if(level < 1.0f) {
 					bbd->wanted_co[0] = bbd->wanted_co[1] = bbd->wanted_co[2] = 0.0f;
 					bbd->wanted_speed = 0.0f;
-					pa->boid->mode = eBoidMode_Falling;
+					bpa->data.mode = eBoidMode_Falling;
 				}
 				else if(level < landing_level) {
 					bbd->wanted_speed *= (level - 1.0f)/landing_level;
@@ -1188,7 +1210,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 	/* account for effectors */
 	do_effectors(p, pa, &pa->state, bbd->scene, bbd->ob, bbd->psys, pa->state.co, force, tvel, bbd->dfra, bbd->cfra);
 
-	if(ELEM(pa->boid->mode, eBoidMode_OnLand, eBoidMode_Climbing)) {
+	if(ELEM(bpa->data.mode, eBoidMode_OnLand, eBoidMode_Climbing)) {
 		float length = Normalize(force);
 
 		length = MAX2(0.0f, length - boids->land_stick_force);
@@ -1199,8 +1221,8 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 	VecAddf(acc, acc, force);
 
 	/* store smoothed acceleration for nice banking etc. */
-	VECADDFAC(pa->boid->acc, pa->boid->acc, acc, dtime);
-	VecMulf(pa->boid->acc, 1.0f / (1.0f + dtime));
+	VECADDFAC(bpa->data.acc, bpa->data.acc, acc, dtime);
+	VecMulf(bpa->data.acc, 1.0f / (1.0f + dtime));
 
 	/* integrate new location & velocity */
 
@@ -1218,32 +1240,32 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 
 	VECADDFAC(pa->state.vel, pa->state.vel, acc, dtime);
 
-	if(pa->boid->mode != eBoidMode_InAir)
-		pa->stick_ob = boid_find_ground(bbd, pa, ground_co, ground_nor);
+	if(bpa->data.mode != eBoidMode_InAir)
+		bpa->ground = boid_find_ground(bbd, pa, ground_co, ground_nor);
 
 	/* change modes, constrain movement & keep track of down vector */
-	switch(pa->boid->mode) {
+	switch(bpa->data.mode) {
 		case eBoidMode_InAir:
 		{
 			float grav[3] = {0.0f, 0.0f, bbd->part->acc[2] < 0.0f ? -1.0f : 0.0f};
 
 			/* don't take forward acceleration into account (better banking) */
-			if(Inpf(pa->boid->acc, pa->state.vel) > 0.0f) {
-				Projf(dvec, pa->boid->acc, pa->state.vel);
-				VecSubf(dvec, pa->boid->acc, dvec);
+			if(Inpf(bpa->data.acc, pa->state.vel) > 0.0f) {
+				Projf(dvec, bpa->data.acc, pa->state.vel);
+				VecSubf(dvec, bpa->data.acc, dvec);
 			}
 			else {
-				VECCOPY(dvec, pa->boid->acc);
+				VECCOPY(dvec, bpa->data.acc);
 			}
 
-			/* gather apparent gravity to r_ve */
-			VECADDFAC(pa->r_ve, grav, dvec, -boids->banking);
-			Normalize(pa->r_ve);
+			/* gather apparent gravity */
+			VECADDFAC(bpa->gravity, grav, dvec, -boids->banking);
+			Normalize(bpa->gravity);
 
 			/* stick boid on goal when close enough */
 			if(bbd->goal_ob && boid_goal_signed_dist(pa->state.co, bbd->goal_co, bbd->goal_nor) <= pa->size * boids->height) {
-				pa->boid->mode = eBoidMode_Climbing;
-				pa->stick_ob = bbd->goal_ob;
+				bpa->data.mode = eBoidMode_Climbing;
+				bpa->ground = bbd->goal_ob;
 				boid_find_ground(bbd, pa, ground_co, ground_nor);
 				boid_climb(boids, pa, ground_co, ground_nor);
 			}
@@ -1251,7 +1273,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 			else if(boids->options & BOID_ALLOW_LAND && pa->state.co[2] <= ground_co[2] + pa->size * boids->height) {
 				pa->state.co[2] = ground_co[2] + pa->size * boids->height;
 				pa->state.vel[2] = 0.0f;
-				pa->boid->mode = eBoidMode_OnLand;
+				bpa->data.mode = eBoidMode_OnLand;
 			}
 			break;
 		}
@@ -1259,15 +1281,15 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 		{
 			float grav[3] = {0.0f, 0.0f, bbd->part->acc[2] < 0.0f ? -1.0f : 0.0f};
 
-			/* gather apparent gravity to r_ve */
-			VECADDFAC(pa->r_ve, pa->r_ve, grav, dtime);
-			Normalize(pa->r_ve);
+			/* gather apparent gravity */
+			VECADDFAC(bpa->gravity, bpa->gravity, grav, dtime);
+			Normalize(bpa->gravity);
 
 			if(boids->options & BOID_ALLOW_LAND) {
 				/* stick boid on goal when close enough */
 				if(bbd->goal_ob && boid_goal_signed_dist(pa->state.co, bbd->goal_co, bbd->goal_nor) <= pa->size * boids->height) {
-					pa->boid->mode = eBoidMode_Climbing;
-					pa->stick_ob = bbd->goal_ob;
+					bpa->data.mode = eBoidMode_Climbing;
+					bpa->ground = bbd->goal_ob;
 					boid_find_ground(bbd, pa, ground_co, ground_nor);
 					boid_climb(boids, pa, ground_co, ground_nor);
 				}
@@ -1275,14 +1297,14 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 				else if(pa->state.co[2] <= ground_co[2] + 1.01 * pa->size * boids->height){
 					pa->state.co[2] = ground_co[2] + pa->size * boids->height;
 					pa->state.vel[2] = 0.0f;
-					pa->boid->mode = eBoidMode_OnLand;
+					bpa->data.mode = eBoidMode_OnLand;
 				}
 				/* if we're falling, can fly and want to go upwards lets fly */
 				else if(boids->options & BOID_ALLOW_FLIGHT && bbd->wanted_co[2] > 0.0f)
-					pa->boid->mode = eBoidMode_InAir;
+					bpa->data.mode = eBoidMode_InAir;
 			}
 			else
-				pa->boid->mode = eBoidMode_InAir;
+				bpa->data.mode = eBoidMode_InAir;
 			break;
 		}
 		case eBoidMode_Climbing:
@@ -1308,14 +1330,14 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 		{
 			/* stick boid on goal when close enough */
 			if(bbd->goal_ob && boid_goal_signed_dist(pa->state.co, bbd->goal_co, bbd->goal_nor) <= pa->size * boids->height) {
-				pa->boid->mode = eBoidMode_Climbing;
-				pa->stick_ob = bbd->goal_ob;
+				bpa->data.mode = eBoidMode_Climbing;
+				bpa->ground = bbd->goal_ob;
 				boid_find_ground(bbd, pa, ground_co, ground_nor);
 				boid_climb(boids, pa, ground_co, ground_nor);
 			}
 			/* ground is too far away so boid falls */
 			else if(pa->state.co[2]-ground_co[2] > 1.1 * pa->size * boids->height)
-				pa->boid->mode = eBoidMode_Falling;
+				bpa->data.mode = eBoidMode_Falling;
 			else {
 				/* constrain to surface */
 				pa->state.co[2] = ground_co[2] + pa->size * boids->height;
@@ -1329,17 +1351,17 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 				VECCOPY(grav, ground_nor);
 				VecMulf(grav, -1.0f);
 				
-				Projf(dvec, pa->boid->acc, pa->state.vel);
-				VecSubf(dvec, pa->boid->acc, dvec);
+				Projf(dvec, bpa->data.acc, pa->state.vel);
+				VecSubf(dvec, bpa->data.acc, dvec);
 
-				/* gather apparent gravity to r_ve */
-				VECADDFAC(pa->r_ve, grav, dvec, -boids->banking);
-				Normalize(pa->r_ve);
+				/* gather apparent gravity */
+				VECADDFAC(bpa->gravity, grav, dvec, -boids->banking);
+				Normalize(bpa->gravity);
 			}
 			else {
-				/* gather negative surface normal to r_ve */
-				VECADDFAC(pa->r_ve, pa->r_ve, ground_nor, -1.0f);
-				Normalize(pa->r_ve);
+				/* gather negative surface normal */
+				VECADDFAC(bpa->gravity, bpa->gravity, ground_nor, -1.0f);
+				Normalize(bpa->gravity);
 			}
 			break;
 		}
@@ -1347,29 +1369,29 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
 
 	/* save direction to state.ave unless the boid is falling */
 	/* (boids can't effect their direction when falling) */
-	if(pa->boid->mode!=eBoidMode_Falling && VecLength(pa->state.vel) > 0.1*pa->size) {
+	if(bpa->data.mode!=eBoidMode_Falling && VecLength(pa->state.vel) > 0.1*pa->size) {
 		VECCOPY(pa->state.ave, pa->state.vel);
 		Normalize(pa->state.ave);
 	}
 
 	/* apply damping */
-	if(ELEM(pa->boid->mode, eBoidMode_OnLand, eBoidMode_Climbing))
+	if(ELEM(bpa->data.mode, eBoidMode_OnLand, eBoidMode_Climbing))
 		VecMulf(pa->state.vel, 1.0f - 0.2f*bbd->part->dampfac);
 
 	/* calculate rotation matrix based on forward & down vectors */
-	if(pa->boid->mode == eBoidMode_InAir) {
+	if(bpa->data.mode == eBoidMode_InAir) {
 		VECCOPY(mat[0], pa->state.ave);
 
-		Projf(dvec, pa->r_ve, pa->state.ave);
-		VecSubf(mat[2], pa->r_ve, dvec);
+		Projf(dvec, bpa->gravity, pa->state.ave);
+		VecSubf(mat[2], bpa->gravity, dvec);
 		Normalize(mat[2]);
 	}
 	else {
-		Projf(dvec, pa->state.ave, pa->r_ve);
+		Projf(dvec, pa->state.ave, bpa->gravity);
 		VecSubf(mat[0], pa->state.ave, dvec);
 		Normalize(mat[0]);
 
-		VECCOPY(mat[2], pa->r_ve);
+		VECCOPY(mat[2], bpa->gravity);
 	}
 	VecMulf(mat[2], -1.0f);
 	Crossf(mat[1], mat[2], mat[0]);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index eafd9eb01fe..8be8df8e63b 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -496,23 +496,30 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob,
 	if(!do_init_cloth(ob, clmd, result, framenr))
 		return result;
 
+	if(framenr == startframe && cache->flag & PTCACHE_REDO_NEEDED) {
+		BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+		cache->simframe= framenr;
+		cache->flag &= ~PTCACHE_REDO_NEEDED;
+		return result;
+	}
+
 	/* try to read from cache */
 	cache_result = BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
 
 	if(cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED) {
-		cache->flag |= PTCACHE_SIMULATION_VALID;
-		cache->simframe= framenr;
-
 		implicit_set_positions(clmd);
 		cloth_to_object (ob, clmd, result);
 
+		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
+
+		if(cache_result == PTCACHE_READ_INTERPOLATED && cache->flag & PTCACHE_REDO_NEEDED)
+			BKE_ptcache_write_cache(&pid, framenr);
+
 		return result;
 	}
 	else if(cache_result==PTCACHE_READ_OLD) {
-		BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_FREE);
-
 		implicit_set_positions(clmd);
-
 		cache->flag |= PTCACHE_SIMULATION_VALID;
 	}
 	else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) {
@@ -524,12 +531,10 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob,
 	}
 
 	if(framenr == startframe) {
-		if(cache->flag & PTCACHE_REDO_NEEDED) {
-			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
-			do_init_cloth(ob, clmd, result, framenr);
-		}
-		cache->flag |= PTCACHE_SIMULATION_VALID;
+		implicit_set_positions(clmd);
+
 		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
 
 		/* don't write cache on first frame, but on second frame write
 		 * cache for frame 1 and 2 */
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 7a0eb882083..9c8c43cc8cb 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -6696,10 +6696,8 @@ static DerivedMesh * particleInstanceModifier_applyModifier(
 		if((psys->flag & (PSYS_HAIR_DONE|PSYS_KEYED) || psys->pointcache->flag & PTCACHE_BAKED) && pimd->flag & eParticleInstanceFlag_Path){
 			float ran = 0.0f;
 			if(pimd->random_position != 0.0f) {
-				/* just use some static collection of random numbers */
-				/* TODO: use something else that's unique to each instanced object */
-				pa = psys->particles + (i/totvert)%totpart;
-				ran = pimd->random_position * 0.5 * (1.0f + pa->r_ave[0]);
+				BLI_srandom(psys->seed + (i/totvert)%totpart);
+				ran = pimd->random_position * BLI_frand();
 			}
 
 			if(pimd->flag & eParticleInstanceFlag_KeepShape) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 1cb0abfe21c..9a137bdb7e6 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -481,15 +481,15 @@ void unlink_object(Scene *scene, Object *ob)
 				if(tpsys->part->dup_ob==ob)
 					tpsys->part->dup_ob= NULL;
 
-				if(tpsys->part->flag&PART_STICKY) {
+				if(tpsys->part->phystype==PART_PHYS_BOIDS) {
 					ParticleData *pa;
+					BoidParticle *bpa;
 					int p;
 
 					for(p=0,pa=tpsys->particles; p<tpsys->totpart; p++,pa++) {
-						if(pa->stick_ob==ob) {
-							pa->stick_ob= 0;
-							pa->flag &= ~PARS_STICKY;
-						}
+						bpa = pa->boid;
+						if(bpa->ground == ob)
+							bpa->ground = NULL;
 					}
 				}
 				if(tpsys->part->boids) {
@@ -1082,19 +1082,35 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys)
 {
 	ParticleSystem *psysn;
 	ParticleData *pa;
-	int a;
+	int p;
 
 	psysn= MEM_dupallocN(psys);
 	psysn->particles= MEM_dupallocN(psys->particles);
 	psysn->child= MEM_dupallocN(psys->child);
-	if(psysn->particles->keys)
-		psysn->particles->keys = MEM_dupallocN(psys->particles->keys);
 
-	for(a=0, pa=psysn->particles; a<psysn->totpart; a++, pa++) {
-		if(pa->hair)
-			pa->hair= MEM_dupallocN(pa->hair);
-		if(a)
-			pa->keys= (pa-1)->keys + (pa-1)->totkey;
+	if(psys->part->type == PART_HAIR) {
+		for(p=0, pa=psysn->particles; p<psysn->totpart; p++, pa++)
+			pa->hair = MEM_dupallocN(pa->hair);
+	}
+
+	if(psysn->particles->keys || psysn->particles->boid) {
+		ParticleKey *key = psysn->particles->keys;
+		BoidParticle *boid = psysn->particles->boid;
+
+		if(key)
+			key = MEM_dupallocN(key);
+		
+		if(boid)
+			boid = MEM_dupallocN(boid);
+		
+		for(p=0, pa=psysn->particles; p<psysn->totpart; p++, pa++) {
+			if(boid)
+				pa->boid = boid++;
+			if(key) {
+				pa->keys = key;
+				key += pa->totkey;
+			}
+		}
 	}
 
 	if(psys->soft) {
@@ -1102,14 +1118,7 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys)
 		psysn->soft->particles = psysn;
 	}
 
-	if(psys->particles->boid) {
-		psysn->particles->boid = MEM_dupallocN(psys->particles->boid);
-		for(a=1, pa=psysn->particles+1; a<psysn->totpart; a++, pa++)
-			pa->boid = (pa-1)->boid + 1;
-	}
-
-	if(psys->targets.first)
-		BLI_duplicatelist(&psysn->targets, &psys->targets);
+	BLI_duplicatelist(&psysn->targets, &psys->targets);
 	
 	psysn->pathcache= NULL;
 	psysn->childcache= NULL;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 1ae3ec5dd50..81eb0b79c40 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -92,10 +92,10 @@ static void do_child_modifiers(Scene *scene, Object *ob, ParticleSystem *psys, P
 /* few helpers for countall etc. */
 int count_particles(ParticleSystem *psys){
 	ParticleSettings *part=psys->part;
-	ParticleData *pa;
-	int tot=0,p;
+	PARTICLE_P;
+	int tot=0;
 
-	for(p=0,pa=psys->particles; p<psys->totpart; p++,pa++){
+	LOOP_PARTICLES {
 		if(pa->alive == PARS_KILLED);
 		else if(pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN)==0);
 		else if(pa->alive == PARS_DEAD && (part->flag & PART_DIED)==0);
@@ -106,10 +106,10 @@ int count_particles(ParticleSystem *psys){
 }
 int count_particles_mod(ParticleSystem *psys, int totgr, int cur){
 	ParticleSettings *part=psys->part;
-	ParticleData *pa;
-	int tot=0,p;
+	PARTICLE_P;
+	int tot=0;
 
-	for(p=0,pa=psys->particles; p<psys->totpart; p++,pa++){
+	LOOP_PARTICLES {
 		if(pa->alive == PARS_KILLED);
 		else if(pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN)==0);
 		else if(pa->alive == PARS_DEAD && (part->flag & PART_DIED)==0);
@@ -120,10 +120,10 @@ int count_particles_mod(ParticleSystem *psys, int totgr, int cur){
 }
 int psys_count_keys(ParticleSystem *psys)
 {
-	ParticleData *pa;
-	int i, totpart=psys->totpart, totkey=0;
+	PARTICLE_P;
+	int totkey=0;
 
-	for(i=0, pa=psys->particles; i<totpart; i++, pa++)
+	LOOP_PARTICLES
 		totkey += pa->totkey;
 
 	return totkey;
@@ -368,13 +368,16 @@ void psys_free_settings(ParticleSettings *part)
 
 void free_hair(ParticleSystem *psys, int softbody)
 {
-	ParticleData *pa;
-	int i, totpart=psys->totpart;
+	PARTICLE_P;
 
-	for(i=0, pa=psys->particles; i<totpart; i++, pa++) {
+	if(psys->part->type != PART_HAIR)
+		return;
+
+	LOOP_PARTICLES {
 		if(pa->hair)
 			MEM_freeN(pa->hair);
 		pa->hair = NULL;
+		pa->totkey = 0;
 	}
 
 	psys->flag &= ~PSYS_HAIR_DONE;
@@ -386,13 +389,15 @@ void free_hair(ParticleSystem *psys, int softbody)
 }
 void free_keyed_keys(ParticleSystem *psys)
 {
-	ParticleData *pa;
-	int i;
+	PARTICLE_P;
+
+	if(psys->part->type == PART_HAIR)
+		return;
 
 	if(psys->particles && psys->particles->keys) {
 		MEM_freeN(psys->particles->keys);
 
-		for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++) {
+		LOOP_PARTICLES {
 			if(pa->keys) {
 				pa->keys= NULL;
 				pa->totkey= 0;
@@ -431,6 +436,29 @@ void psys_free_children(ParticleSystem *psys)
 
 	free_child_path_cache(psys);
 }
+void psys_free_particles(ParticleSystem *psys)
+{
+	PARTICLE_P;
+
+	if(psys->particles) {
+		if(psys->part->type==PART_HAIR) {
+			LOOP_PARTICLES {
+				if(pa->hair)
+					MEM_freeN(pa->hair);
+			}
+		}
+		
+		if(psys->particles->keys)
+			MEM_freeN(psys->particles->keys);
+		
+		if(psys->particles->boid)
+			MEM_freeN(psys->particles->boid);
+
+		MEM_freeN(psys->particles);
+		psys->particles= NULL;
+		psys->totpart= 0;
+	}
+}
 /* free everything */
 void psys_free(Object *ob, ParticleSystem * psys)
 {	
@@ -440,22 +468,11 @@ void psys_free(Object *ob, ParticleSystem * psys)
 		
 		psys_free_path_cache(psys, NULL);
 
-		free_hair(psys, 1);
-
-		free_keyed_keys(psys);
+		psys_free_particles(psys);
 
 		if(psys->edit && psys->free_edit)
 			psys->free_edit(psys->edit);
 
-		if(psys->particles){
-			if(psys->particles->boid)
-				MEM_freeN(psys->particles->boid);
-
-			MEM_freeN(psys->particles);
-			psys->particles = 0;
-			psys->totpart = 0;
-		}
-
 		if(psys->child){
 			MEM_freeN(psys->child);
 			psys->child = 0;
@@ -485,14 +502,11 @@ void psys_free(Object *ob, ParticleSystem * psys)
 			psys->part=0;
 		}
 
-		if(psys->reactevents.first)
-			BLI_freelistN(&psys->reactevents);
-
 		BKE_ptcache_free_list(&psys->ptcaches);
 		psys->pointcache = NULL;
 		
-		if(psys->targets.first)
-			BLI_freelistN(&psys->targets);
+		BLI_freelistN(&psys->targets);
+		BLI_freelistN(&psys->reactevents);
 
 		BLI_kdtree_free(psys->tree);
 
@@ -1015,11 +1029,12 @@ static void init_particle_interpolation(Object *ob, ParticleSystem *psys, Partic
 		pind->dietime = *((point->keys + point->totkey - 1)->time);
 	}
 	else if(pind->keyed) {
-		pind->kkey[0] = pa->keys;
-		pind->kkey[1] = pa->totkey > 1 ? pa->keys + 1 : NULL;
+		ParticleKey *key = pa->keys;
+		pind->kkey[0] = key;
+		pind->kkey[1] = pa->totkey > 1 ? key + 1 : NULL;
 
-		pind->birthtime = pa->keys->time;
-		pind->dietime = (pa->keys + pa->totkey - 1)->time;
+		pind->birthtime = key->time;
+		pind->dietime = (key + pa->totkey - 1)->time;
 	}
 	else if(pind->cache) {
 		get_pointcache_keys_for_time(ob, pind->cache, -1, 0.0f, NULL, NULL);
@@ -1028,17 +1043,18 @@ static void init_particle_interpolation(Object *ob, ParticleSystem *psys, Partic
 		pind->dietime = pa ? pa->dietime : pind->cache->endframe;
 	}
 	else {
-		pind->hkey[0] = pa->hair;
-		pind->hkey[1] = pa->hair + 1;
+		HairKey *key = pa->hair;
+		pind->hkey[0] = key;
+		pind->hkey[1] = key + 1;
 
-		pind->birthtime = pa->hair->time;
-		pind->dietime = (pa->hair + pa->totkey - 1)->time;
+		pind->birthtime = key->time;
+		pind->dietime = (key + pa->totkey - 1)->time;
 	}
 
-	if(pind->soft) {
-		pind->bp[0] = pind->soft->bpoint + pa->bpi;
-		pind->bp[1] = pind->soft->bpoint + pa->bpi + 1;
-	}
+	//if(pind->soft) {
+	//	pind->bp[0] = pind->soft->bpoint + pa->bpi;
+	//	pind->bp[1] = pind->soft->bpoint + pa->bpi + 1;
+	//}
 }
 static void edit_to_particle(ParticleKey *key, PTCacheEditKey *ekey)
 {
@@ -2558,6 +2574,9 @@ void psys_cache_child_paths(Scene *scene, Object *ob, ParticleSystem *psys, floa
 	ListBase threads;
 	int i, totchild, totparent, totthread;
 
+	if(psys->flag & PSYS_GLOBAL_HAIR)
+		return;
+
 	pthreads= psys_threads_create(scene, ob, psys);
 
 	if(!psys_threads_init_path(pthreads, scene, cfra, editupdate)) {
@@ -2688,7 +2707,8 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 		}
 
 		if(!psys->totchild) {
-			pa_length = 1.0f - part->randlength * 0.5 * (1.0f + pa->r_ave[0]);
+			BLI_srandom(psys->seed + i);
+			pa_length = 1.0f - part->randlength * BLI_frand();
 			if(vg_length)
 				pa_length *= psys_particle_value_from_verts(psmd->dm,part->from,pa,vg_length);
 		}
@@ -2740,7 +2760,7 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 			do_particle_interpolation(psys, i, pa, t, frs_sec, &pind, &result);
 
 			 /* keyed, baked and softbody are allready in global space */
-			if(!keyed && !baked && !soft) {
+			if(!keyed && !baked && !soft && !(psys->flag & PSYS_GLOBAL_HAIR)) {
 				Mat4MulVecfl(hairmat, result.co);
 			}
 
@@ -3574,6 +3594,8 @@ float psys_get_size(Object *ob, Material *ma, ParticleSystemModifierData *psmd,
 {
 	ParticleTexture ptex;
 	float size=1.0f;
+
+	BLI_srandom(psys->seed + (pa - psys->particles) + 100);
 	
 	if(ma && part->from!=PART_FROM_PARTICLE){
 		ptex.size=size;
@@ -3592,7 +3614,7 @@ float psys_get_size(Object *ob, Material *ma, ParticleSystemModifierData *psmd,
 		size*=psys_particle_value_from_verts(psmd->dm,part->from,pa,vg_size);
 
 	if(part->randsize!=0.0)
-		size*= 1.0f - part->randsize*pa->sizemul;
+		size*= 1.0f - part->randsize * BLI_frand();
 
 	return size*part->size;
 }
@@ -3759,13 +3781,6 @@ void psys_get_particle_on_path(Scene *scene, Object *ob, ParticleSystem *psys, i
 
 	if(p<totpart){
 		pa = psys->particles + p;
-
-		if(pa->alive==PARS_DEAD && part->flag & PART_STICKY && pa->flag & PARS_STICKY && pa->stick_ob){
-			copy_particle_key(state,&pa->state,0);
-			key_from_object(pa->stick_ob,state);
-			return;
-		}
-
 		pind.keyed = keyed;
 		pind.cache = cached ? psys->pointcache : NULL;
 		pind.soft = NULL;
@@ -3981,20 +3996,11 @@ int psys_get_particle_state(struct Scene *scene, Object *ob, ParticleSystem *psy
 			return 0; /* currently not supported */
 		else if(psys->totchild && p>=psys->totpart){
 			ChildParticle *cpa=psys->child+p-psys->totpart;
-			ParticleKey *key1, skey;
+			ParticleKey *key1;
 			float t = (cfra - pa->time + pa->loop * pa->lifetime) / pa->lifetime;
 
 			pa = psys->particles + cpa->parent;
-
-			if(pa->alive==PARS_DEAD && part->flag&PART_STICKY && pa->flag&PARS_STICKY && pa->stick_ob) {
-				key1 = &skey;
-				copy_particle_key(key1,&pa->state,0);
-				key_from_object(pa->stick_ob,key1);
-			}
-			else {
-				key1=&pa->state;
-			}
-			
+			key1=&pa->state;
 			offset_child(cpa, key1, state, part->childflat, part->childrad);
 			
 			CLAMP(t,0.0,1.0);
@@ -4051,10 +4057,6 @@ int psys_get_particle_state(struct Scene *scene, Object *ob, ParticleSystem *psy
 				}
 			}
 
-			if(pa->alive==PARS_DEAD && part->flag&PART_STICKY && pa->flag&PARS_STICKY && pa->stick_ob){
-				key_from_object(pa->stick_ob,state);
-			}
-
 			if(psys->lattice)
 				calc_latt_deform(psys->lattice, state->co,1.0f);
 		}
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 0f72c1c5866..eb570ba287c 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -123,21 +123,11 @@ static int get_current_display_percentage(ParticleSystem *psys)
 void psys_reset(ParticleSystem *psys, int mode)
 {
 	ParticleSettings *part= psys->part;
-	ParticleData *pa;
-	int i;
+	PARTICLE_P;
 
 	if(ELEM(mode, PSYS_RESET_ALL, PSYS_RESET_DEPSGRAPH)) {
 		if(mode == PSYS_RESET_ALL || !(part->type == PART_HAIR && (psys->edit && psys->edit->edited))) {
-			if(psys->particles) {
-				if(psys->particles->keys)
-					MEM_freeN(psys->particles->keys);
-
-				for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++)
-					if(pa->hair) MEM_freeN(pa->hair);
-
-				MEM_freeN(psys->particles);
-				psys->particles= NULL;
-			}
+			psys_free_particles(psys);
 
 			psys->totpart= 0;
 			psys->totkeyed= 0;
@@ -155,10 +145,7 @@ void psys_reset(ParticleSystem *psys, int mode)
 	}
 	else if(mode == PSYS_RESET_CACHE_MISS) {
 		/* set all particles to be skipped */
-		ParticleData *pa = psys->particles;
-		int p=0;
-
-		for(; p<psys->totpart; p++, pa++)
+		LOOP_PARTICLES
 			pa->flag |= PARS_NO_DISP;
 	}
 
@@ -180,9 +167,10 @@ void psys_reset(ParticleSystem *psys, int mode)
 
 static void realloc_particles(Object *ob, ParticleSystem *psys, int new_totpart)
 {
-	ParticleData *newpars = 0, *pa;
-	BoidData *newboids = 0;
-	int i, totpart, totsaved = 0;
+	ParticleData *newpars = NULL;
+	BoidParticle *newboids = NULL;
+	PARTICLE_P;
+	int totpart, totsaved = 0;
 
 	if(new_totpart<0) {
 		if(psys->part->distr==PART_DISTR_GRID  && psys->part->from != PART_FROM_VERT) {
@@ -195,47 +183,46 @@ static void realloc_particles(Object *ob, ParticleSystem *psys, int new_totpart)
 	else
 		totpart=new_totpart;
 
-	if(totpart) {
+	if(totpart && totpart != psys->totpart) {
 		newpars= MEM_callocN(totpart*sizeof(ParticleData), "particles");
+	
+		if(psys->particles) {
+			totsaved=MIN2(psys->totpart,totpart);
+			/*save old pars*/
+			if(totsaved) {
+				memcpy(newpars,psys->particles,totsaved*sizeof(ParticleData));
 
-		if(psys->part->phystype == PART_PHYS_BOIDS)
-			newboids = MEM_callocN(totpart*sizeof(BoidData), "Boid Data");
-	}
-	if(psys->particles) {
-		totsaved=MIN2(psys->totpart,totpart);
-		/*save old pars*/
-		if(totsaved) {
-			memcpy(newpars,psys->particles,totsaved*sizeof(ParticleData));
-
-			if(newboids)
-				memcpy(newboids, psys->particles->boid, totsaved*sizeof(BoidData));
-		}
-
-		if(psys->particles->keys)
-			MEM_freeN(psys->particles->keys);
-
-		if(psys->particles->boid)
-			MEM_freeN(psys->particles->boid);
-
-		for(i=0, pa=newpars; i<totsaved; i++, pa++) {
-			if(pa->keys) {
-				pa->keys= NULL;
-				pa->totkey= 0;
+				if(psys->particles->boid)
+					memcpy(newboids, psys->particles->boid, totsaved*sizeof(BoidParticle));
 			}
+
+			if(psys->particles->keys)
+				MEM_freeN(psys->particles->keys);
+
+			if(psys->particles->boid)
+				MEM_freeN(psys->particles->boid);
+
+			for(p=0, pa=newpars; p<totsaved; p++, pa++) {
+				if(pa->keys) {
+					pa->keys= NULL;
+					pa->totkey= 0;
+				}
+			}
+
+			for(p=totsaved, pa=psys->particles+totsaved; p<psys->totpart; p++, pa++)
+				if(pa->hair) MEM_freeN(pa->hair);
+
+			MEM_freeN(psys->particles);
 		}
+		
+		psys->particles=newpars;
 
-		for(i=totsaved, pa=psys->particles+totsaved; i<psys->totpart; i++, pa++)
-			if(pa->hair) MEM_freeN(pa->hair);
-
-		MEM_freeN(psys->particles);
-	}
-	psys->particles=newpars;
-
-	if(newboids) {
-		pa = psys->particles;
-		pa->boid = newboids;
-		for(i=1, pa++; i<totpart; i++,pa++)
-			pa->boid = (pa-1)->boid + 1;
+		if(newboids) {
+			LOOP_PARTICLES
+				pa->boid = newboids++;
+		}
+		
+		psys->totpart=totpart;
 	}
 
 	if(psys->child) {
@@ -243,8 +230,6 @@ static void realloc_particles(Object *ob, ParticleSystem *psys, int new_totpart)
 		psys->child=0;
 		psys->totchild=0;
 	}
-
-	psys->totpart=totpart;
 }
 
 static int get_psys_child_number(struct Scene *scene, ParticleSystem *psys)
@@ -291,8 +276,7 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys)
 	              each original elements can reference its derived elements
 	*/
 	Mesh *me= (Mesh*)ob->data;
-	ParticleData *pa= 0;
-	int p;
+	PARTICLE_P;
 	
 	/* CACHE LOCATIONS */
 	if(!dm->deformedOnly) {
@@ -329,7 +313,7 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys)
 		}
 		
 		/* cache the verts/faces! */
-		for(p=0,pa=psys->particles; p<psys->totpart; p++,pa++) {
+		LOOP_PARTICLES {
 			if(psys->part->from == PART_FROM_VERT) {
 				if(nodearray[pa->num])
 					pa->num_dmcache= GET_INT_FROM_POINTER(nodearray[pa->num]->link);
@@ -349,7 +333,7 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys)
 		 * should know to use the num or num_dmcache, set the num_dmcache to
 		 * an invalid value, just incase */
 		
-		for(p=0,pa=psys->particles; p<psys->totpart; p++,pa++)
+		LOOP_PARTICLES
 			pa->num_dmcache = -1;
 	}
 }
@@ -1449,12 +1433,11 @@ static void distribute_particles_on_dm(DerivedMesh *finaldm, Scene *scene, Objec
 /* ready for future use, to emit particles without geometry */
 static void distribute_particles_on_shape(Object *ob, ParticleSystem *psys, int from)
 {
-	ParticleData *pa;
-	int totpart=psys->totpart, p;
+	PARTICLE_P;
 
 	fprintf(stderr,"Shape emission not yet possible!\n");
 
-	for(p=0,pa=psys->particles; p<totpart; p++,pa++){
+	LOOP_PARTICLES {
 		pa->fuv[0]=pa->fuv[1]=pa->fuv[2]=pa->fuv[3]= 0.0;
 		pa->foffset= 0.0f;
 		pa->num= -1;
@@ -1476,12 +1459,11 @@ static void distribute_particles(Scene *scene, Object *ob, ParticleSystem *psys,
 		distribute_particles_on_shape(ob,psys,from);
 
 	if(distr_error){
-		ParticleData *pa;
-		int totpart=psys->totpart, p;
+		PARTICLE_P;
 
 		fprintf(stderr,"Particle distribution error!\n");
 
-		for(p=0,pa=psys->particles; p<totpart; p++,pa++){
+		LOOP_PARTICLES {
 			pa->fuv[0]=pa->fuv[1]=pa->fuv[2]=pa->fuv[3]= 0.0;
 			pa->foffset= 0.0f;
 			pa->num= -1;
@@ -1576,7 +1558,7 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps
 	Material *ma=0;
 	//IpoCurve *icu=0; // XXX old animation system
 	int totpart;
-	float rand,length;
+	float rand;
 
 	part=psys->part;
 
@@ -1631,40 +1613,8 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps
 
 	pa->dietime= pa->time+pa->lifetime;
 
-	pa->sizemul= BLI_frand();
-
-	rand= BLI_frand();
-
-	/* while loops are to have a spherical distribution (avoid cubic distribution) */
-	if(part->phystype != PART_PHYS_BOIDS) {
-		/* boids store gravity in r_ve, so skip here */
-		length=2.0f;
-		while(length>1.0){
-			pa->r_ve[0]=2.0f*(BLI_frand()-0.5f);
-			pa->r_ve[1]=2.0f*(BLI_frand()-0.5f);
-			pa->r_ve[2]=2.0f*(BLI_frand()-0.5f);
-			length=VecLength(pa->r_ve);
-		}
-	}
-
-	length=2.0f;
-	while(length>1.0){
-		pa->r_ave[0]=2.0f*(BLI_frand()-0.5f);
-		pa->r_ave[1]=2.0f*(BLI_frand()-0.5f);
-		pa->r_ave[2]=2.0f*(BLI_frand()-0.5f);
-		length=VecLength(pa->r_ave);
-	}
-
-	pa->r_rot[0]=2.0f*(BLI_frand()-0.5f);
-	pa->r_rot[1]=2.0f*(BLI_frand()-0.5f);
-	pa->r_rot[2]=2.0f*(BLI_frand()-0.5f);
-	pa->r_rot[3]=2.0f*(BLI_frand()-0.5f);
-
-	NormalQuat(pa->r_rot);
-
 	if(part->type!=PART_HAIR && part->distr!=PART_DISTR_GRID && part->from != PART_FROM_VERT){
-		/* any unique random number will do (r_ave[0]) */
-		if(ptex.exist < 0.5*(1.0+pa->r_ave[0]))
+		if(ptex.exist < BLI_frand())
 			pa->flag |= PARS_UNEXIST;
 		else
 			pa->flag &= ~PARS_UNEXIST;
@@ -1678,10 +1628,9 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps
 static void initialize_all_particles(Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd)
 {
 	//IpoCurve *icu=0; // XXX old animation system
-	ParticleData *pa;
-	int p, totpart=psys->totpart;
+	PARTICLE_P;
 
-	for(p=0, pa=psys->particles; p<totpart; p++, pa++)
+	LOOP_PARTICLES
 		initialize_particle(pa,p,ob,psys,psmd);
 	
 	if(psys->part->type != PART_FLUID) {
@@ -1749,10 +1698,39 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 	float fac, phasefac, nor[3]={0,0,0},loc[3],tloc[3],vel[3]={0.0,0.0,0.0},rot[4],q2[4];
 	float r_vel[3],r_ave[3],r_rot[4],p_vel[3]={0.0,0.0,0.0};
 	float x_vec[3]={1.0,0.0,0.0}, utan[3]={0.0,1.0,0.0}, vtan[3]={0.0,0.0,1.0}, rot_vec[3]={0.0,0.0,0.0};
-	float q_phase[4];
+	float q_phase[4], length, r_phase;
 	part=psys->part;
 
 	ptex.ivel=1.0;
+
+	BLI_srandom(psys->seed + (pa - psys->particles));
+
+	/* we need to get every random even if they're not used so that they don't effect eachother */
+	/* while loops are to have a spherical distribution (avoid cubic distribution) */
+	length=2.0f;
+	while(length>1.0){
+		r_vel[0]=2.0f*(BLI_frand()-0.5f);
+		r_vel[1]=2.0f*(BLI_frand()-0.5f);
+		r_vel[2]=2.0f*(BLI_frand()-0.5f);
+		length=VecLength(r_vel);
+	}
+
+	length=2.0f;
+	while(length>1.0){
+		r_ave[0]=2.0f*(BLI_frand()-0.5f);
+		r_ave[1]=2.0f*(BLI_frand()-0.5f);
+		r_ave[2]=2.0f*(BLI_frand()-0.5f);
+		length=VecLength(r_ave);
+	}
+
+	r_rot[0]=2.0f*(BLI_frand()-0.5f);
+	r_rot[1]=2.0f*(BLI_frand()-0.5f);
+	r_rot[2]=2.0f*(BLI_frand()-0.5f);
+	r_rot[3]=2.0f*(BLI_frand()-0.5f);
+
+	NormalQuat(r_rot);
+
+	r_phase = BLI_frand();
 	
 	if(part->from==PART_FROM_PARTICLE){
 		Object *tob;
@@ -1763,29 +1741,26 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 		if(tob==0)
 			tob=ob;
 
-		tpsys=BLI_findlink(&tob->particlesystem,psys->target_psys-1);
+		tpsys=BLI_findlink(&tob->particlesystem, psys->target_psys-1);
 
 		state.time = pa->time;
 		if(pa->num == -1)
 			memset(&state, 0, sizeof(state));
 		else
 			psys_get_particle_state(scene, tob,tpsys,pa->num,&state,1);
-		psys_get_from_key(&state,loc,nor,rot,0);
+		psys_get_from_key(&state, loc, nor, rot, 0);
 
-		QuatMulVecf(rot,vtan);
-		QuatMulVecf(rot,utan);
-		VECCOPY(r_vel,pa->r_ve);
-		VECCOPY(r_rot,pa->r_rot);
-		VECCOPY(r_ave,pa->r_ave);
+		QuatMulVecf(rot, vtan);
+		QuatMulVecf(rot, utan);
 
-		VECCOPY(p_vel,state.vel);
+		VECCOPY(p_vel, state.vel);
 		speed=Normalize(p_vel);
-		VecMulf(p_vel,Inpf(pa->r_ve,p_vel));
-		VECSUB(p_vel,pa->r_ve,p_vel);
+		VecMulf(p_vel, Inpf(r_vel, p_vel));
+		VECSUB(p_vel, r_vel, p_vel);
 		Normalize(p_vel);
-		VecMulf(p_vel,speed);
+		VecMulf(p_vel, speed);
 
-		VECCOPY(pa->fuv,loc); /* abusing pa->fuv (not used for "from particle") for storing emit location */
+		VECCOPY(pa->fuv, loc); /* abusing pa->fuv (not used for "from particle") for storing emit location */
 	}
 	else{
 		/* get precise emitter matrix if particle is born */
@@ -1839,29 +1814,25 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 
 		/* -velocity							*/
 		if(part->randfac!=0.0){
-			VECADD(r_vel,tloc,pa->r_ve);
-			Mat4MulVecfl(ob->obmat,r_vel);
-			VECSUB(r_vel,r_vel,loc);
+			Mat4Mul3Vecfl(ob->obmat,r_vel);
 			Normalize(r_vel);
 		}
 
 		/* -angular velocity					*/
 		if(part->avemode==PART_AVE_RAND){
-			VECADD(r_ave,tloc,pa->r_ave);
-			Mat4MulVecfl(ob->obmat,r_ave);
-			VECSUB(r_ave,r_ave,loc);
+			Mat4Mul3Vecfl(ob->obmat,r_ave);
 			Normalize(r_ave);
 		}
 		
 		/* -rotation							*/
 		if(part->randrotfac != 0.0f){
-			QUATCOPY(r_rot,pa->r_rot);
 			Mat4ToQuat(ob->obmat,rot);
 			QuatMul(r_rot,r_rot,rot);
 		}
 	}
 
 	if(part->phystype==PART_PHYS_BOIDS) {
+		BoidParticle *bpa = pa->boid;
 		float dvec[3], q[4], mat[3][3];
 
 		VECCOPY(pa->state.co,loc);
@@ -1878,16 +1849,21 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 			VECCOPY(pa->state.ave, nor);
 		}
 		/* and gravity in r_ve */
-		pa->r_ve[0] = pa->r_ve[1] = 0.0f;
-		pa->r_ve[2] = -1.0f;
+		bpa->gravity[0] = bpa->gravity[1] = 0.0f;
+		bpa->gravity[2] = -1.0f;
 		if(part->acc[2]!=0.0f)
-			pa->r_ve[2] = part->acc[2];
+			bpa->gravity[2] = part->acc[2];
+
+		//pa->r_ve[0] = pa->r_ve[1] = 0.0f;
+		//pa->r_ve[2] = -1.0f;
+		//if(part->acc[2]!=0.0f)
+		//	pa->r_ve[2] = part->acc[2];
 
 		/* calculate rotation matrix */
-		Projf(dvec, pa->r_ve, pa->state.ave);
+		Projf(dvec, r_vel, pa->state.ave);
 		VecSubf(mat[0], pa->state.ave, dvec);
 		Normalize(mat[0]);
-		VECCOPY(mat[2], pa->r_ve);
+		VECCOPY(mat[2], r_vel);
 		VecMulf(mat[2], -1.0f);
 		Normalize(mat[2]);
 		Crossf(mat[1], mat[2], mat[0]);
@@ -1896,10 +1872,10 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 		Mat3ToQuat_is_ok(mat, q);
 		QuatCopy(pa->state.rot, q);
 
-		pa->boid->health = part->boids->health;
-		pa->boid->mode = eBoidMode_InAir;
-		pa->boid->state_id = ((BoidState*)part->boids->states.first)->id;
-		pa->boid->acc[0]=pa->boid->acc[1]=pa->boid->acc[2]=0.0f;
+		bpa->data.health = part->boids->health;
+		bpa->data.mode = eBoidMode_InAir;
+		bpa->data.state_id = ((BoidState*)part->boids->states.first)->id;
+		bpa->data.acc[0]=bpa->data.acc[1]=bpa->data.acc[2]=0.0f;
 	}
 	else {
 		/* conversion done so now we apply new:	*/
@@ -1988,8 +1964,8 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 
 			/* rotation phase */
 			phasefac = part->phasefac;
-			if(part->randphasefac != 0.0f) /* abuse r_ave[0] as a random number */
-				phasefac += part->randphasefac * pa->r_ave[0];
+			if(part->randphasefac != 0.0f)
+				phasefac += part->randphasefac * r_phase;
 			VecRotToQuat(x_vec, phasefac*(float)M_PI, q_phase);
 
 			/* combine base rotation & phase */
@@ -2027,8 +2003,7 @@ void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, Partic
 
 	pa->state.time = cfra;
 
-	pa->stick_ob = 0;
-	pa->flag &= ~PARS_STICKY;
+//	pa->flag &= ~PARS_STICKY;
 }
 static void reset_all_particles(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd, float dtime, float cfra, int from)
 {
@@ -2094,8 +2069,9 @@ static void set_keyed_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 {
 	ParticleSystem *kpsys = psys;
 	ParticleTarget *pt;
-	ParticleData *pa;
-	int totpart = psys->totpart, i, k, totkeys = psys->totkeyed;
+	PARTICLE_P;
+	ParticleKey *key;
+	int totpart = psys->totpart, k, totkeys = psys->totkeyed;
 
 	/* no proper targets so let's clear and bail out */
 	if(psys->totkeyed==0) {
@@ -2107,12 +2083,12 @@ static void set_keyed_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 	if(totpart && psys->particles->totkey != totkeys) {
 		free_keyed_keys(psys);
 		
-		psys->particles->keys = MEM_callocN(totpart*totkeys*sizeof(ParticleKey), "Keyed keys");
-		psys->particles->totkey = totkeys;
+		key = MEM_callocN(totpart*totkeys*sizeof(ParticleKey), "Keyed keys");
 		
-		for(i=1, pa=psys->particles+1; i<totpart; i++,pa++){
-			pa->keys = (pa-1)->keys + totkeys;
+		LOOP_PARTICLES {
+			pa->keys = key;
 			pa->totkey = totkeys;
+			key += totkeys;
 		}
 	}
 	
@@ -2126,22 +2102,23 @@ static void set_keyed_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 		else
 			kpsys = BLI_findlink(&ob->particlesystem, pt->psys - 1);
 
-		for(i=0,pa=psys->particles; i<totpart; i++, pa++) {
-			(pa->keys + k)->time = -1.0; /* use current time */
+		LOOP_PARTICLES {
+			key = pa->keys + k;
+			key->time = -1.0; /* use current time */
 
-			psys_get_particle_state(scene, pt->ob, kpsys, i%kpsys->totpart, pa->keys + k, 1);
+			psys_get_particle_state(scene, pt->ob, kpsys, p%kpsys->totpart, key, 1);
 
 			if(psys->flag & PSYS_KEYED_TIMING){
-				(pa->keys+k)->time = pa->time + pt->time;
+				key->time = pa->time + pt->time;
 				if(pt->duration != 0.0f && k+1 < totkeys) {
-					copy_particle_key(pa->keys+k+1, pa->keys+k, 1);
-					(pa->keys+k+1)->time = pa->time + pt->time + pt->duration;
+					copy_particle_key(key+1, key, 1);
+					(key+1)->time = pa->time + pt->time + pt->duration;
 				}
 			}
 			else if(totkeys > 1)
-				(pa->keys+k)->time = pa->time + (float)k / (float)(totkeys - 1) * pa->lifetime;
+				key->time = pa->time + (float)k / (float)(totkeys - 1) * pa->lifetime;
 			else
-				pa->keys->time = pa->time;
+				key->time = pa->time;
 		}
 
 		if(psys->flag & PSYS_KEYED_TIMING && pt->duration!=0.0f)
@@ -2296,16 +2273,15 @@ void psys_get_pointcache_start_end(Scene *scene, ParticleSystem *psys, int *sfra
 static void update_particle_tree(ParticleSystem *psys)
 {
 	if(psys) {
-		ParticleData *pa = psys->particles;
-		int p, totpart = psys->totpart;
+		PARTICLE_P;
 
 		if(!psys->tree || psys->tree_frame != psys->cfra) {
 			
 			BLI_kdtree_free(psys->tree);
 
-			psys->tree = BLI_kdtree_new(totpart);
+			psys->tree = BLI_kdtree_new(psys->totpart);
 			
-			for(p=0, pa=psys->particles; p<totpart; p++,pa++){
+			LOOP_PARTICLES {
 				if(pa->flag & (PARS_NO_DISP+PARS_UNEXIST) || pa->alive != PARS_ALIVE)
 					continue;
 
@@ -2548,9 +2524,9 @@ static void precalc_effectors(Scene *scene, Object *ob, ParticleSystem *psys, Pa
 	ListBase *lb=&psys->effectors;
 	ParticleEffectorCache *ec;
 	ParticleSettings *part=psys->part;
-	ParticleData *pa;
+	PARTICLE_P;
+	int totpart;
 	float vec2[3],loc[3],*co=0;
-	int p,totpart;
 	
 	for(ec= lb->first; ec; ec= ec->next) {
 		PartDeflect *pd= ec->ob->pd;
@@ -2574,7 +2550,7 @@ static void precalc_effectors(Scene *scene, Object *ob, ParticleSystem *psys, Pa
 				ec->distances=MEM_callocN(totpart*sizeof(float),"particle distances");
 				ec->locations=MEM_callocN(totpart*3*sizeof(float),"particle locations");
 
-				for(p=0,pa=psys->particles; p<totpart; p++, pa++){
+				LOOP_PARTICLES {
 					if(part->from == PART_FROM_PARTICLE) {
 						VECCOPY(loc, pa->fuv);
 					}
@@ -3253,9 +3229,10 @@ static void deflect_particle(Scene *scene, Object *pob, ParticleSystemModifierDa
 
 	/* override for boids */
 	if(part->phystype == PART_PHYS_BOIDS) {
+		BoidParticle *bpa = pa->boid;
 		radius = pa->size;
 		boid_z = pa->state.co[2];
-		skip_ob = pa->stick_ob;
+		skip_ob = bpa->ground;
 	}
 
 	/* 10 iterations to catch multiple deflections */
@@ -3325,12 +3302,7 @@ static void deflect_particle(Scene *scene, Object *pob, ParticleSystemModifierDa
 				deflections=max_deflections;
 
 				/* store for reactors */
-				copy_particle_key(&reaction_state,&pa->state,0);
-
-				if(part->flag & PART_STICKY){
-					pa->stick_ob=ob;
-					pa->flag |= PARS_STICKY;
-				}
+				copy_particle_key(&reaction_state, &pa->state, 0);
 			}
 			else {
 				float nor_vec[3], tan_vec[3], tan_vel[3], vel[3];
@@ -3418,7 +3390,8 @@ static void deflect_particle(Scene *scene, Object *pob, ParticleSystemModifierDa
 				VECADDFAC(co, co, col.nor, (through ? -0.0001f : 0.0001f));
 
 				if(part->phystype == PART_PHYS_BOIDS && part->boids->options & BOID_ALLOW_LAND) {
-					if(pa->boid->mode == eBoidMode_OnLand || co[2] <= boid_z) {
+					BoidParticle *bpa = pa->boid;
+					if(bpa->data.mode == eBoidMode_OnLand || co[2] <= boid_z) {
 						co[2] = boid_z;
 						vel[2] = 0.0f;
 					}
@@ -3460,10 +3433,9 @@ static void deflect_particle(Scene *scene, Object *pob, ParticleSystemModifierDa
 /*			Hair								*/
 /************************************************/
 static void save_hair(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd, float cfra){
-	ParticleData *pa;
-	HairKey *key;
+	HairKey *key, *root;
+	PARTICLE_P;
 	int totpart;
-	int i;
 
 	Mat4Invert(ob->imat,ob->obmat);
 	
@@ -3474,21 +3446,22 @@ static void save_hair(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSy
 	totpart=psys->totpart;
 	
 	/* save new keys for elements if needed */
-	for(i=0,pa=psys->particles; i<totpart; i++,pa++) {
+	LOOP_PARTICLES {
 		/* first time alloc */
 		if(pa->totkey==0 || pa->hair==NULL) {
 			pa->hair = MEM_callocN((psys->part->hair_step + 1) * sizeof(HairKey), "HairKeys");
 			pa->totkey = 0;
 		}
 
-		key = pa->hair + pa->totkey;
+		key = root = pa->hair;
+		key += pa->totkey;
 
 		/* convert from global to geometry space */
 		VecCopyf(key->co, pa->state.co);
 		Mat4MulVecfl(ob->imat, key->co);
 
 		if(pa->totkey) {
-			VECSUB(key->co, key->co, pa->hair->co);
+			VECSUB(key->co, key->co, root->co);
 			psys_vec_rot_to_face(psmd->dm, pa, key->co);
 		}
 
@@ -3500,7 +3473,7 @@ static void save_hair(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSy
 
 		/* root is always in the origin of hair space so we set it to be so after the last key is saved*/
 		if(pa->totkey == psys->part->hair_step + 1)
-			pa->hair->co[0] = pa->hair->co[1] = pa->hair->co[2] = 0.0f;
+			root->co[0] = root->co[1] = root->co[2] = 0.0f;
 	}
 }
 /************************************************/
@@ -3510,14 +3483,14 @@ static void save_hair(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSy
 static void dynamics_step(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd, float cfra,
 						  float *vg_vel, float *vg_tan, float *vg_rot, float *vg_size)
 {
-	ParticleData *pa;
 	ParticleSettings *part=psys->part;
 	KDTree *tree=0;
 	IpoCurve *icu_esize= NULL; //=find_ipocurve(part->ipo,PART_EMIT_SIZE); // XXX old animation system
 	Material *ma=give_current_material(ob,part->omat);
 	BoidBrainData bbd;
+	PARTICLE_P;
 	float timestep;
-	int p, totpart;
+	int totpart;
 	/* current time */
 	float ctime, ipotime; // XXX old animation system
 	/* frame & time changes */
@@ -3546,7 +3519,7 @@ static void dynamics_step(Scene *scene, Object *ob, ParticleSystem *psys, Partic
 		if(part->type==PART_REACTOR)
 			vg_size=psys_cache_vgroup(psmd->dm,psys,PSYS_VG_SIZE);
 
-		for(p=0, pa=psys->particles; p<totpart; p++,pa++){
+		LOOP_PARTICLES {
 			if(pa->flag & PARS_UNEXIST) continue;
 
 			/* set correct ipo timing */
@@ -3615,7 +3588,7 @@ static void dynamics_step(Scene *scene, Object *ob, ParticleSystem *psys, Partic
 		}
 
 		/* main loop: calculate physics for all particles */
-		for(p=0, pa=psys->particles; p<totpart; p++,pa++){
+		LOOP_PARTICLES {
 			if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;
 
 			copy_particle_key(&pa->prev_state,&pa->state,1);
@@ -3703,9 +3676,6 @@ static void dynamics_step(Scene *scene, Object *ob, ParticleSystem *psys, Partic
 					else{
 						pa->alive=PARS_DEAD;
 						pa->state.time=pa->dietime;
-
-						if(pa->flag&PARS_STICKY)
-							psys_key_to_object(pa->stick_ob,&pa->state,0);
 					}
 				}
 				else
@@ -3769,12 +3739,13 @@ static void psys_update_path_cache(Scene *scene, Object *ob, ParticleSystemModif
 static void hair_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
 {
 	ParticleSettings *part = psys->part;
-	ParticleData *pa;
-	int p;
-	float disp = (float)get_current_display_percentage(psys)/50.0f-1.0f;
+	PARTICLE_P;
+	float disp = (float)get_current_display_percentage(psys)/100.0f;
 
-	for(p=0, pa=psys->particles; p<psys->totpart; p++,pa++){
-		if(pa->r_rot[0] > disp)
+	BLI_srandom(psys->seed);
+
+	LOOP_PARTICLES {
+		if(BLI_frand() > disp)
 			pa->flag |= PARS_NO_DISP;
 		else
 			pa->flag &= ~PARS_NO_DISP;
@@ -3798,13 +3769,14 @@ static void hair_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd
 static void cached_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
 {
 	ParticleSettings *part=psys->part;
-	ParticleData *pa;
 	ParticleKey state;
 	IpoCurve *icu_esize= NULL; //=find_ipocurve(part->ipo,PART_EMIT_SIZE); // XXX old animation system
 	Material *ma=give_current_material(ob,part->omat);
-	int p;
+	PARTICLE_P;
 	float disp, birthtime, dietime, *vg_size= NULL; // XXX ipotime=cfra
 
+	BLI_srandom(psys->seed);
+
 	if(part->from!=PART_FROM_PARTICLE)
 		vg_size= psys_cache_vgroup(psmd->dm,psys,PSYS_VG_SIZE);
 
@@ -3817,9 +3789,9 @@ static void cached_step(Scene *scene, Object *ob, ParticleSystemModifierData *ps
 			precalc_effectors(scene, ob,psys,psmd,cfra);
 	//}
 	
-	disp= (float)get_current_display_percentage(psys)/50.0f-1.0f;
+	disp= (float)get_current_display_percentage(psys)/100.0f;
 
-	for(p=0, pa=psys->particles; p<psys->totpart; p++,pa++){
+	LOOP_PARTICLES {
 #if 0 // XXX old animation system
 		if((part->flag&PART_ABS_TIME)==0 && part->ipo){
 			ipotime=100.0f*(cfra-pa->time)/pa->lifetime;
@@ -3866,7 +3838,7 @@ static void cached_step(Scene *scene, Object *ob, ParticleSystemModifierData *ps
 			psys->lattice= NULL;
 		}
 
-		if(pa->r_rot[0] > disp)
+		if(BLI_frand() > disp)
 			pa->flag |= PARS_NO_DISP;
 		else
 			pa->flag &= ~PARS_NO_DISP;
@@ -3919,8 +3891,8 @@ static void psys_changed_type(Object *ob, ParticleSystem *psys)
 	else {
 		free_hair(psys, 1);
 
-		CLAMP(part->path_start, part->sta, part->end + part->lifetime);
-		CLAMP(part->path_end, part->sta, part->end + part->lifetime);
+		CLAMP(part->path_start, 0.0f, MAX2(100.0f, part->end + part->lifetime));
+		CLAMP(part->path_end, 0.0f, MAX2(100.0f, part->end + part->lifetime));
 	}
 
 	psys->softflag= 0;
@@ -3929,23 +3901,25 @@ static void psys_changed_type(Object *ob, ParticleSystem *psys)
 }
 void psys_check_boid_data(ParticleSystem *psys)
 {
-		ParticleData *pa = psys->particles;
-		int p = 1;
+		BoidParticle *bpa;
+		PARTICLE_P;
+
+		pa = psys->particles;
 
 		if(!pa)
 			return;
 
 		if(psys->part && psys->part->phystype==PART_PHYS_BOIDS) {
 			if(!pa->boid) {
-				pa->boid = MEM_callocN(psys->totpart * sizeof(BoidData), "Boid Data");
+				bpa = MEM_callocN(psys->totpart * sizeof(BoidParticle), "Boid Data");
 
-				for(pa++; p<psys->totpart; p++, pa++)
-					pa->boid = (pa-1)->boid + 1;
+				LOOP_PARTICLES
+					pa->boid = bpa++;
 			}
 		}
 		else if(pa->boid){
 			MEM_freeN(pa->boid);
-			for(; p<psys->totpart; p++, pa++)
+			LOOP_PARTICLES
 				pa->boid = NULL;
 		}
 }
@@ -4093,10 +4067,10 @@ static void particles_fluid_step(Scene *scene, Object *ob, ParticleSystem *psys,
 static void system_step(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd, float cfra)
 {
 	ParticleSettings *part;
-	ParticleData *pa;
 	PointCache *cache;
 	PTCacheID pid;
-	int totpart, oldtotpart, totchild, oldtotchild, p;
+	PARTICLE_P;
+	int totpart, oldtotpart, totchild, oldtotchild;
 	float disp, *vg_vel= 0, *vg_tan= 0, *vg_rot= 0, *vg_size= 0;
 	int init= 0, distr= 0, alloc= 0, usecache= 0, only_children_changed= 0;
 	int framenr, framedelta, startframe, endframe;
@@ -4239,7 +4213,7 @@ static void system_step(Scene *scene, Object *ob, ParticleSystem *psys, Particle
 		}
 		else if(result==PTCACHE_READ_OLD) {
 			psys->cfra = (float)cache->simframe;
-			for(p=0, pa=psys->particles; p<totpart; p++, pa++) {
+			LOOP_PARTICLES {
 				/* update alive status */
 				if(pa->time > psys->cfra)
 					pa->alive = PARS_UNBORN;
@@ -4278,10 +4252,11 @@ static void system_step(Scene *scene, Object *ob, ParticleSystem *psys, Particle
 	}
 
 	/* set particles to be not calculated TODO: can't work with pointcache */
-	disp= (float)get_current_display_percentage(psys)/50.0f-1.0f;
+	disp= (float)get_current_display_percentage(psys)/100.0f;
 
-	for(p=0, pa=psys->particles; p<totpart; p++,pa++){
-		if(pa->r_rot[0] > disp)
+	BLI_srandom(psys->seed);
+	LOOP_PARTICLES {
+		if(BLI_frand() > disp)
 			pa->flag |= PARS_NO_DISP;
 		else
 			pa->flag &= ~PARS_NO_DISP;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 7a156f56d72..3e429749953 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -181,6 +181,7 @@ static int ptcache_write_particle(int index, void *psys_v, void **data)
 {
 	ParticleSystem *psys= psys_v;
 	ParticleData *pa = psys->particles + index;
+	BoidParticle *boid = (psys->part->phystype == PART_PHYS_BOIDS) ? pa->boid : NULL;
 	float times[3] = {pa->time, pa->dietime, pa->lifetime};
 
 	if(data[BPHYS_DATA_INDEX]) {
@@ -198,8 +199,8 @@ static int ptcache_write_particle(int index, void *psys_v, void **data)
 	ptcache_data_from(data, BPHYS_DATA_SIZE, &pa->size);
 	ptcache_data_from(data, BPHYS_DATA_TIMES, times);
 
-	if(pa->boid)
-		ptcache_data_from(data, BPHYS_DATA_TIMES, &pa->boid);
+	if(boid)
+		ptcache_data_from(data, BPHYS_DATA_BOIDS, &boid->data);
 
 	return 1;
 }
@@ -215,6 +216,7 @@ static void ptcache_read_particle(int index, void *psys_v, void **data, float fr
 {
 	ParticleSystem *psys= psys_v;
 	ParticleData *pa = psys->particles + index;
+	BoidParticle *boid = (psys->part->phystype == PART_PHYS_BOIDS) ? pa->boid : NULL;
 
 	if(cfra > pa->state.time)
 		memcpy(&pa->prev_state, &pa->state, sizeof(ParticleKey));
@@ -238,8 +240,8 @@ static void ptcache_read_particle(int index, void *psys_v, void **data, float fr
 		pa->lifetime = times[2];
 	}
 
-	if(pa->boid)
-		ptcache_data_to(data, BPHYS_DATA_BOIDS, 0, &pa->boid);
+	if(boid)
+		ptcache_data_to(data, BPHYS_DATA_BOIDS, 0, &boid->data);
 
 	/* determine velocity from previous location */
 	if(data[BPHYS_DATA_LOCATION] && !data[BPHYS_DATA_VELOCITY]) {
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 40a28251495..fdbfe154fae 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3623,9 +3623,9 @@ static void particles_to_softbody(Scene *scene, Object *ob)
 
 	/* find first BodyPoint index for each particle */
 	if(psys->totpart > 0) {
-		psys->particles->bpi = 0;
-		for(a=1, pa=psys->particles+1; a<psys->totpart; a++, pa++)
-			pa->bpi = (pa-1)->bpi + (pa-1)->totkey;
+//		psys->particles->bpi = 0;
+//		for(a=1, pa=psys->particles+1; a<psys->totpart; a++, pa++)
+//			pa->bpi = (pa-1)->bpi + (pa-1)->totkey;
 	}
 
 	/* we always make body points */
@@ -4079,7 +4079,7 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 	if(framenr < startframe) {
 		cache->flag &= ~PTCACHE_SIMULATION_VALID;
 		cache->simframe= 0;
-		cache->last_exact= 0;
+		//cache->last_exact= 0;
 
 		return;
 	}
@@ -4141,20 +4141,29 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 		pa= sb->particles->particles;
 	}
 
+	if(framenr == startframe && cache->flag & PTCACHE_REDO_NEEDED) {
+		BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+		cache->simframe= framenr;
+		cache->flag &= ~PTCACHE_REDO_NEEDED;
+		return;
+	}
+
 	/* try to read from cache */
 	cache_result = BKE_ptcache_read_cache(&pid, framenr, scene->r.frs_sec);
 
 	if(cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED) {
-		cache->flag |= PTCACHE_SIMULATION_VALID;
-		cache->simframe= framenr;
-
 		if(sb->particles==0)
 			softbody_to_object(ob, vertexCos, numVerts, sb->local);
 
+		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
+
+		if(cache_result == PTCACHE_READ_INTERPOLATED && cache->flag & PTCACHE_REDO_NEEDED)
+			BKE_ptcache_write_cache(&pid, framenr);
+
 		return;
 	}
 	else if(cache_result==PTCACHE_READ_OLD) {
-		BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_FREE);
 		cache->flag |= PTCACHE_SIMULATION_VALID;
 	}
 	else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) {
@@ -4166,16 +4175,11 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 	}
 
 	if(framenr == startframe) {
-		if(cache->flag & PTCACHE_REDO_NEEDED) {
-			softbody_update_positions(ob, sb, vertexCos, numVerts);
-			softbody_reset(ob, sb, vertexCos, numVerts);
-			cache->flag &= ~PTCACHE_REDO_NEEDED;
-		}
 		/* first frame, no simulation to do, just set the positions */
 		softbody_update_positions(ob, sb, vertexCos, numVerts);
 
-		cache->flag |= PTCACHE_SIMULATION_VALID;
 		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
 
 		/* don't write cache on first frame, but on second frame write
 		 * cache for frame 1 and 2 */
@@ -4187,10 +4191,6 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 
 		softbody_update_positions(ob, sb, vertexCos, numVerts);
 
-		/* do simulation */
-		cache->flag |= PTCACHE_SIMULATION_VALID;
-		cache->simframe= framenr;
-
 		/* checking time: */
 		dtime = framedelta*timescale;
 
@@ -4199,6 +4199,10 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 		if(sb->particles==0)
 			softbody_to_object(ob, vertexCos, numVerts, 0);
 
+		/* do simulation */
+		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
+
 		BKE_ptcache_write_cache(&pid, framenr);
 	}
 }
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5a628192af6..6a26a71ee3d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3055,11 +3055,8 @@ static void direct_link_particlesettings(FileData *fd, ParticleSettings *part)
 static void lib_link_particlesystems(FileData *fd, Object *ob, ID *id, ListBase *particles)
 {
 	ParticleSystem *psys, *psysnext;
-	int a;
 
 	for(psys=particles->first; psys; psys=psysnext){
-		ParticleData *pa;
-		
 		psysnext= psys->next;
 		
 		psys->part = newlibadr_us(fd, id->lib, psys->part);
@@ -3070,12 +3067,6 @@ static void lib_link_particlesystems(FileData *fd, Object *ob, ID *id, ListBase
 				pt->ob=newlibadr(fd, id->lib, pt->ob);
 
 			psys->target_ob = newlibadr(fd, id->lib, psys->target_ob);
-
-			for(a=0,pa=psys->particles; a<psys->totpart; a++,pa++){
-				pa->stick_ob=newlibadr(fd, id->lib, pa->stick_ob);
-			}
-
-
 		}
 		else {
 			/* particle modifier must be removed before particle system */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 88c6f205d15..c4a94660932 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -653,7 +653,7 @@ static void write_particlesystems(WriteData *wd, ListBase *particles)
 			}
 
 			if(psys->particles->boid && psys->part->phystype == PART_PHYS_BOIDS)
-				writestruct(wd, DATA, "BoidData", psys->totpart, psys->particles->boid);
+				writestruct(wd, DATA, "BoidParticle", psys->totpart, psys->particles->boid);
 		}
 		pt = psys->targets.first;
 		for(; pt; pt=pt->next)
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 0ae987f2308..a5d365cafd4 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -102,6 +102,7 @@
 #include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 #include "BKE_property.h"
 #include "BKE_report.h"
 #include "BKE_sca.h"
@@ -3883,6 +3884,8 @@ void ED_object_exit_editmode(bContext *C, int flag)
 		/* for example; displist make is different in editmode */
 		scene->obedit= NULL; // XXX for context
 		
+		BKE_ptcache_object_reset(scene, obedit, PTCACHE_RESET_DEPSGRAPH);
+
 		/* also flush ob recalc, doesn't take much overhead, but used for particles */
 		DAG_id_flush_update(&obedit->id, OB_RECALC_OB|OB_RECALC_DATA);
 	
diff --git a/source/blender/editors/physics/ed_pointcache.c b/source/blender/editors/physics/ed_pointcache.c
index 22316290c7b..f2c7b64032f 100644
--- a/source/blender/editors/physics/ed_pointcache.c
+++ b/source/blender/editors/physics/ed_pointcache.c
@@ -226,7 +226,7 @@ void PTCACHE_OT_bake(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	RNA_def_boolean(ot->srna, "bake", 1, "Bake", "");
+	RNA_def_boolean(ot->srna, "bake", 0, "Bake", "");
 }
 void PTCACHE_OT_free_bake(wmOperatorType *ot)
 {
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 3ddc143b5a3..bc48d8f4f55 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -102,8 +102,6 @@ static void PTCacheUndo_clear(PTCacheEdit *edit);
 #define LOOP_SELECTED_KEYS		for(k=0, key=point->keys; k<point->totkey; k++, key++) if((key->flag & PEK_SELECT) && !(key->flag & PEK_HIDE))
 #define LOOP_TAGGED_KEYS		for(k=0, key=point->keys; k<point->totkey; k++, key++) if(key->flag & PEK_TAG)
 
-#define LOOP_PARTICLES(i, pa)	for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++)
-
 #define KEY_WCO					(key->flag & PEK_USE_WCO ? key->world_co : key->co)
 
 /**************************** utilities *******************************/
@@ -642,12 +640,13 @@ static int count_selected_keys(Scene *scene, PTCacheEdit *edit)
 static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 {
 	PTCacheEdit *edit;
-	ParticleData *pa;
 	ParticleSystemModifierData *psmd;
 	KDTree *tree;
 	KDTreeNearest nearest;
+	HairKey *key;
+	PARTICLE_P;
 	float mat[4][4], co[3];
-	int i, index, totpart;
+	int index, totpart;
 
 	edit= psys->edit;
 	psmd= psys_get_modifier(ob, psys);
@@ -656,11 +655,12 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 	tree= BLI_kdtree_new(totpart);
 
 	/* insert particles into kd tree */
-	LOOP_PARTICLES(i, pa) {
+	LOOP_PARTICLES {
+		key = pa->hair;
 		psys_mat_hair_to_orco(ob, psmd->dm, psys->part->from, pa, mat);
-		VECCOPY(co, pa->hair[0].co);
+		VECCOPY(co, key->co);
 		Mat4MulVecfl(mat, co);
-		BLI_kdtree_insert(tree, i, co, NULL);
+		BLI_kdtree_insert(tree, p, co, NULL);
 	}
 
 	BLI_kdtree_balance(tree);
@@ -669,27 +669,28 @@ static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
 	if(!edit->mirror_cache)
 		edit->mirror_cache= MEM_callocN(sizeof(int)*totpart, "PE mirror cache");
 	
-	LOOP_PARTICLES(i, pa) {
+	LOOP_PARTICLES {
+		key = pa->hair;
 		psys_mat_hair_to_orco(ob, psmd->dm, psys->part->from, pa, mat);
-		VECCOPY(co, pa->hair[0].co);
+		VECCOPY(co, key->co);
 		Mat4MulVecfl(mat, co);
 		co[0]= -co[0];
 
 		index= BLI_kdtree_find_nearest(tree, co, NULL, &nearest);
 
 		/* this needs a custom threshold still, duplicated for editmode mirror */
-		if(index != -1 && index != i && (nearest.dist <= 0.0002f))
-			edit->mirror_cache[i]= index;
+		if(index != -1 && index != p && (nearest.dist <= 0.0002f))
+			edit->mirror_cache[p]= index;
 		else
-			edit->mirror_cache[i]= -1;
+			edit->mirror_cache[p]= -1;
 	}
 
 	/* make sure mirrors are in two directions */
-	LOOP_PARTICLES(i, pa) {
-		if(edit->mirror_cache[i]) {
-			index= edit->mirror_cache[i];
-			if(edit->mirror_cache[index] != i)
-				edit->mirror_cache[i]= -1;
+	LOOP_PARTICLES {
+		if(edit->mirror_cache[p]) {
+			index= edit->mirror_cache[p];
+			if(edit->mirror_cache[index] != p)
+				edit->mirror_cache[p]= -1;
 		}
 	}
 
@@ -1735,7 +1736,7 @@ static void rekey_particle(PEData *data, int pa_index)
 	ParticleData *pa= psys->particles + pa_index;
 	PTCacheEditPoint *point = edit->points + pa_index;
 	ParticleKey state;
-	HairKey *key, *new_keys;
+	HairKey *key, *new_keys, *okey;
 	PTCacheEditKey *ekey;
 	float dval, sta, end;
 	int k;
@@ -1744,12 +1745,13 @@ static void rekey_particle(PEData *data, int pa_index)
 
 	key= new_keys= MEM_callocN(data->totrekey * sizeof(HairKey),"Hair re-key keys");
 
+	okey = pa->hair;
 	/* root and tip stay the same */
-	VECCOPY(key->co, pa->hair->co);
-	VECCOPY((key + data->totrekey - 1)->co, (pa->hair + pa->totkey - 1)->co);
+	VECCOPY(key->co, okey->co);
+	VECCOPY((key + data->totrekey - 1)->co, (okey + pa->totkey - 1)->co);
 
-	sta= key->time= pa->hair->time;
-	end= (key + data->totrekey - 1)->time= (pa->hair + pa->totkey - 1)->time;
+	sta= key->time= okey->time;
+	end= (key + data->totrekey - 1)->time= (okey + pa->totkey - 1)->time;
 	dval= (end - sta) / (float)(data->totrekey - 1);
 
 	/* interpolate new keys from old ones */
@@ -2034,9 +2036,11 @@ static void subdivide_particle(PEData *data, int pa_index)
 
 	nkey= new_keys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(HairKey)),"Hair subdivide keys");
 	nekey= new_ekeys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(PTCacheEditKey)),"Hair subdivide edit keys");
-	endtime= pa->hair[pa->totkey-1].time;
+	
+	key = pa->hair;
+	endtime= key[pa->totkey-1].time;
 
-	for(k=0, key=pa->hair, ekey=point->keys; k<pa->totkey-1; k++, key++, ekey++) {
+	for(k=0, ekey=point->keys; k<pa->totkey-1; k++, key++, ekey++) {
 
 		memcpy(nkey,key,sizeof(HairKey));
 		memcpy(nekey,ekey,sizeof(PTCacheEditKey));
@@ -2461,7 +2465,6 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 			*newpa= *pa;
 			*newpoint= *point;
 			if(pa->hair) newpa->hair= MEM_dupallocN(pa->hair);
-			if(pa->keys) newpa->keys= MEM_dupallocN(pa->keys);
 			if(point->keys) newpoint->keys= MEM_dupallocN(point->keys);
 
 			/* rotate weights according to vertex index rotation */
@@ -2966,7 +2969,7 @@ static void brush_add(PEData *data, short number)
 					weight[w] /= totw;
 
 				for(k=0; k<pset->totaddkey; k++) {
-					hkey= pa->hair + k;
+					hkey= (HairKey*)pa->hair + k;
 					hkey->time= pa->time + k * framestep;
 
 					key[0].time= hkey->time/ 100.0f;
@@ -2990,15 +2993,15 @@ static void brush_add(PEData *data, short number)
 					if(k==0)
 						VECSUB(co1, pa->state.co, key[0].co);
 
-					VECADD(pa->hair[k].co, key[0].co, co1);
+					VECADD(hkey->co, key[0].co, co1);
 
-					pa->hair[k].time= key[0].time;
+					hkey->time= key[0].time;
 				}
 			}
 			else {
 				for(k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {
 					VECADDFAC(hkey->co, pa->state.co, pa->state.vel, k * framestep * timestep);
-					pa->hair[k].time += k * framestep;
+					hkey->time += k * framestep;
 				}
 			}
 			for(k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index e49616fc740..25ff1244254 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3373,8 +3373,9 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 				pa_birthtime=pa->time;
 				pa_dietime = pa->dietime;
 				pa_size=pa->size;
-				if(part->phystype==PART_PHYS_BOIDS)
-					pa_health = pa->boid->health;
+				if(part->phystype==PART_PHYS_BOIDS) {
+					pa_health = pa->boid->data.health;
+				}
 				else
 					pa_health = -1.0;
 
@@ -3409,8 +3410,10 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 				}
 #endif // XXX old animation system
 
-				r_tilt = 1.0f + pa->r_ave[0];
-				r_length = 0.5f * (1.0f + pa->r_ave[1]);
+				BLI_srandom(psys->seed+a);
+
+				r_tilt = 2.0f*(BLI_frand() - 0.5f);
+				r_length = BLI_frand();
 			}
 			else{
 				ChildParticle *cpa= &psys->child[a-totpart];
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 12c253a7cb8..d4dc3df0965 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -33,6 +33,7 @@
 #define DNA_PARTICLE_TYPES_H
 
 #include "DNA_ID.h"
+#include "DNA_boid_types.h"
 
 struct AnimData;
 
@@ -52,6 +53,14 @@ typedef struct ParticleKey {	/* when changed update size of struct to copy_parti
 	float time;		/* when this key happens */
 } ParticleKey;
 
+typedef struct BoidParticle {
+	struct Object *ground;
+	struct BoidData data;
+	float gravity[3];
+	float wander[3];
+	float rt;
+} BoidParticle;
+
 /* Child particles are created around or between parent particles */
 typedef struct ChildParticle {
 	int num, parent;	/* num is face index on the final derived mesh */
@@ -69,42 +78,34 @@ typedef struct ParticleTarget {
 	float time, duration;
 } ParticleTarget;
 
-/* Everything that's non dynamic for a particle:			*/
 typedef struct ParticleData {
-	struct Object *stick_ob;/* object that particle sticks to when dead */
-
-	ParticleKey state;		/* normally current global coordinates or	*/
-							/* in sticky object space if dead & sticky	*/
+	ParticleKey state;		/* current global coordinates */
 
 	ParticleKey prev_state; /* previous state */
-
+	
 	HairKey *hair;			/* hair vertices */
 
-	ParticleKey *keys;		/* keyed states */
+	ParticleKey *keys;		/* keyed keys */
 
-	struct BoidData *boid;	/* boids data */
+	BoidParticle *boid;		/* boids data */
 
-	float r_rot[4];			/* random values */
-	float r_ave[3],r_ve[3];
-
-	float fuv[4], foffset;	/* coordinates on face/edge number "num" and depth along*/
-							/* face normal for volume emission						*/
+	int totkey;				/* amount of hair or keyed keys*/
 
 	float time, lifetime;	/* dietime is not nescessarily time+lifetime as	*/
 	float dietime;			/* particles can die unnaturally (collision)	*/
 
-	float size, sizemul;	/* size and multiplier so that we can update size when ever */
-
 	int num;				/* index to vert/edge/face */
 	int num_dmcache;		/* index to derived mesh data (face) to avoid slow lookups */
 
-	int totkey;
-	int bpi;				/* softbody body point start index */
+	float fuv[4], foffset;	/* coordinates on face/edge number "num" and depth along*/
+							/* face normal for volume emission						*/
+
+	float size;				/* size and multiplier so that we can update size when ever */
 
 	short flag;
-	short alive;				/* the life state of a particle */
+	short alive;			/* the life state of a particle */
 	short loop;				/* how many times particle life has looped */
-	short rt2;
+	short rt;
 } ParticleData;
 
 typedef struct ParticleSettings {
@@ -258,7 +259,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_TRAND			128	
 #define PART_EDISTR			256	/* particle/face from face areas */
 
-#define PART_STICKY			512	/*collided particles can stick to collider*/
+//#define PART_STICKY			512	/*collided particles can stick to collider*/
 #define PART_DIE_ON_COL		(1<<12)
 #define PART_SIZE_DEFL		(1<<13) /* swept sphere deflections */
 #define PART_ROT_DYN		(1<<14)	/* dynamic rotation */
@@ -409,7 +410,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 
 /* psys->flag */
 #define PSYS_CURRENT		1
-//#define PSYS_BAKING			2
+#define PSYS_GLOBAL_HAIR	2
 //#define PSYS_BAKE_UI		4
 #define	PSYS_KEYED_TIMING	8
 #define PSYS_ENABLED		16	/* deprecated */
@@ -426,7 +427,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 /* pars->flag */
 #define PARS_UNEXIST		1
 #define PARS_NO_DISP		2
-#define PARS_STICKY			4
+//#define PARS_STICKY			4
 #define PARS_REKEY			8
 
 /* pars->alive */
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 2525209c3be..4a23605c717 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -643,12 +643,6 @@ static void rna_def_particle(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "ParticleData");
 	RNA_def_struct_ui_text(srna, "Particle", "Particle in a particle system.");
 
-	prop= RNA_def_property(srna, "stick_object", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "stick_ob");
-	RNA_def_property_struct_type(prop, "Object");
-	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Stick Object", "Object that particle sticks to when dead");
-
 	/* Particle State & Previous State */
 	prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "state.co");
@@ -693,24 +687,6 @@ static void rna_def_particle(BlenderRNA *brna)
 	RNA_def_property_collection_sdna(prop, NULL, "keys", "totkey");
 	RNA_def_property_struct_type(prop, "ParticleKey");
 	RNA_def_property_ui_text(prop, "Keyed States", "");
-
-	/* Random variables */
-
-	prop= RNA_def_property(srna, "random_rotation", PROP_FLOAT, PROP_QUATERNION);
-	RNA_def_property_float_sdna(prop, NULL, "r_rot");
-//	RNA_def_property_range(prop, lowerLimitf, upperLimitf);
-	RNA_def_property_ui_text(prop, "Random Rotation", "");
-
-	prop= RNA_def_property(srna, "random_a_velocity", PROP_FLOAT, PROP_VELOCITY);
-	RNA_def_property_float_sdna(prop, NULL, "r_ave");
-//	RNA_def_property_range(prop, lowerLimitf, upperLimitf);
-	RNA_def_property_ui_text(prop, "Random Angular Velocity", "");
-
-	prop= RNA_def_property(srna, "random_velocity", PROP_FLOAT, PROP_VELOCITY);
-	RNA_def_property_float_sdna(prop, NULL, "r_ve");
-//	RNA_def_property_range(prop, lowerLimitf, upperLimitf);
-	RNA_def_property_ui_text(prop, "Random Velocity", "");
-
 //
 //	float fuv[4], foffset;	/* coordinates on face/edge number "num" and depth along*/
 //							/* face normal for volume emission						*/
@@ -733,18 +709,12 @@ static void rna_def_particle(BlenderRNA *brna)
 //	RNA_def_property_range(prop, lowerLimitf, upperLimitf);
 	RNA_def_property_ui_text(prop, "Size", "");
 
-	prop= RNA_def_property(srna, "size_multiplier", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_sdna(prop, NULL, "sizemul");
-//	RNA_def_property_range(prop, lowerLimitf, upperLimitf);
-	RNA_def_property_ui_text(prop, "Size Multiplier", "");
-
 //
 //	int num;				/* index to vert/edge/face */
 //	int num_dmcache;		/* index to derived mesh data (face) to avoid slow lookups */
 //	int pad;
 //
 //	int totkey;
-//	int bpi;				/* softbody body point start index */
 
 	/* flag */
 	prop= RNA_def_property(srna, "unexist", PROP_BOOLEAN, PROP_NONE);
@@ -755,10 +725,6 @@ static void rna_def_particle(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_NO_DISP);
 	RNA_def_property_ui_text(prop, "no_disp", "");
 
-	prop= RNA_def_property(srna, "sticky", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_STICKY);
-	RNA_def_property_ui_text(prop, "sticky", "");
-
 	prop= RNA_def_property(srna, "rekey", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PARS_REKEY);
 	RNA_def_property_ui_text(prop, "rekey", "");
@@ -942,13 +908,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
 	RNA_def_property_ui_text(prop, "Even Distribution", "Use even distribution from faces based on face areas or edge lengths.");
 	RNA_def_property_update(prop, 0, "rna_Particle_reset");
-
-	prop= RNA_def_property(srna, "sticky", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_STICKY);
-	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
-	RNA_def_property_ui_text(prop, "Sticky", "Particles stick to collided objects if they die in the collision.");
-	RNA_def_property_update(prop, 0, "rna_Particle_reset");
-
+ 
 	prop= RNA_def_property(srna, "die_on_collision", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_DIE_ON_COL);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE);
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index cf6246e3641..df99d5f2843 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1743,8 +1743,10 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 
 			pa_size = pa->size;
 
-			r_tilt = 1.0f + pa->r_ave[0];
-			r_length = 0.5f * (1.0f + pa->r_ave[1]);
+			BLI_srandom(psys->seed+a);
+
+			r_tilt = 2.0f*(BLI_frand() - 0.5f);
+			r_length = BLI_frand();
 
 			if(path_nbr) {
 				cache = psys->pathcache[a];

From c802d187e5810441545e08dbf1b7d63a71c21f88 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Fri, 4 Sep 2009 23:20:45 +0000
Subject: [PATCH 441/577] Comment out line so build does not crash due to NULL
 pointer.

---
 source/blender/makesrna/intern/rna_space.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 0ac7fa40727..542f6e2aeda 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1219,7 +1219,7 @@ static void rna_def_console_line(BlenderRNA *brna)
 	
 	srna = RNA_def_struct(brna, "ConsoleLine", NULL);
 	RNA_def_struct_ui_text(srna, "Console Input", "Input line for the interactive console.");
-	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
+	// XXX using non-inited "prop", uh? RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL);
 	
 	prop= RNA_def_property(srna, "line", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ConsoleLine_line_get", "rna_ConsoleLine_line_length", "rna_ConsoleLine_line_set");

From fc8ba755bd1f9171064528761934e11ca43918ce Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 4 Sep 2009 23:22:46 +0000
Subject: [PATCH 442/577] * fix linking order.

NOTE: this needs changes to stubs.c, but need to check with ideasman_42 how to fix with cmake. Probably linking order issues, but stubs.c currently generates warnings for msvc (redefinition of funcs) and errors for mingw (same redefinitions). Removing the offending lines from stubs.c fixes that.
---
 source/blender/avi/SConscript        | 3 +--
 source/blender/blenkernel/SConscript | 2 +-
 source/blender/blenlib/SConscript    | 2 +-
 source/blender/blenloader/SConscript | 2 +-
 source/blender/imbuf/SConscript      | 2 +-
 source/blender/makesrna/SConscript   | 2 +-
 source/blender/python/SConscript     | 4 ++--
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index f6e5b787b58..61385958a84 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-#Import ('extra_includes')
 Import ('env')
 
 sources = env.Glob('intern/*.c')
@@ -7,4 +6,4 @@ sources = env.Glob('intern/*.c')
 incs = '. #/intern/guardedalloc'
 incs += ' ' + env['BF_JPEG_INC']
 
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [185] )
+env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [190] )
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 0c7922de6ff..f000f778dcb 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -65,4 +65,4 @@ if env['WITH_BF_LCMS']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [165] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [166] )
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 3d7d6b63e64..65bd65bdc35 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -16,4 +16,4 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [363], compileflags =cflags )
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 0a9b8d05747..00e102c686c 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -11,4 +11,4 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [135] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [167] )
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 9da0cf21596..cdc1a5f5257 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -35,4 +35,4 @@ if env['WITH_BF_QUICKTIME']:
 	incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [190] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [185] )
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 80abd4fda61..482c9ce7afd 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -37,4 +37,4 @@ if env['WITH_BF_LCMS']:
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
 
-env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [195] )
+env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [165] )
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index d44cf762a0f..2601626851e 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -13,9 +13,9 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
 	defs.append('_DEBUG')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
 
 
 # generic
 sources = env.Glob('generic/*.c')
-env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [362]) # ketsji is 360

From 9216efcba2a5c62b081872da3fbd9c59524685bf Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sat, 5 Sep 2009 01:58:02 +0000
Subject: [PATCH 443/577] == SCons == * bring back 'player' libtype, after
 investigation with ideasman.   scons/mingw works nicely, for some reason msvc
 fails to link still, will look further into it.

---
 SConstruct                                       |  2 +-
 extern/binreloc/SConscript                       |  2 +-
 extern/bullet2/src/SConscript                    | 16 ++++++++--------
 extern/glew/SConscript                           |  2 +-
 extern/libopenjpeg/SConscript                    |  4 ++--
 intern/audaspace/SConscript                      |  2 +-
 intern/ghost/SConscript                          |  2 +-
 intern/guardedalloc/SConscript                   |  2 +-
 intern/iksolver/SConscript                       |  2 +-
 intern/memutil/SConscript                        |  2 +-
 intern/moto/SConscript                           |  2 +-
 intern/string/SConscript                         |  2 +-
 source/blender/avi/SConscript                    |  2 +-
 source/blender/blenfont/SConscript               |  2 +-
 source/blender/blenkernel/SConscript             |  2 +-
 source/blender/blenlib/SConscript                |  2 +-
 source/blender/blenloader/SConscript             |  2 +-
 source/blender/gpu/SConscript                    |  2 +-
 source/blender/imbuf/SConscript                  |  2 +-
 source/blender/imbuf/intern/cineon/SConscript    |  2 +-
 source/blender/imbuf/intern/dds/SConscript       |  2 +-
 source/blender/imbuf/intern/openexr/SConscript   |  2 +-
 source/blender/makesdna/SConscript               |  2 +-
 source/blender/makesrna/SConscript               |  2 +-
 source/blender/nodes/SConscript                  |  8 ++++----
 source/blender/python/SConscript                 |  4 ++--
 source/blender/quicktime/SConscript              |  4 ++--
 source/blender/readblenfile/SConscript           |  2 +-
 .../bad_level_call_stubs/SConscript              |  2 +-
 source/gameengine/BlenderRoutines/SConscript     |  2 +-
 source/gameengine/Converter/SConscript           |  2 +-
 source/gameengine/Expressions/SConscript         |  2 +-
 source/gameengine/GameLogic/SConscript           |  2 +-
 source/gameengine/GamePlayer/common/SConscript   |  2 +-
 source/gameengine/GamePlayer/ghost/SConscript    |  2 +-
 source/gameengine/Ketsji/KXNetwork/SConscript    |  2 +-
 source/gameengine/Ketsji/SConscript              |  2 +-
 .../Network/LoopBackNetwork/SConscript           |  2 +-
 source/gameengine/Network/SConscript             |  2 +-
 source/gameengine/Physics/Bullet/SConscript      |  2 +-
 source/gameengine/Physics/Dummy/SConscript       |  2 +-
 source/gameengine/Physics/common/SConscript      |  2 +-
 .../Rasterizer/RAS_OpenGLRasterizer/SConscript   |  2 +-
 source/gameengine/Rasterizer/SConscript          |  2 +-
 source/gameengine/SceneGraph/SConscript          |  2 +-
 source/gameengine/VideoTexture/SConscript        |  2 +-
 source/kernel/SConscript                         |  2 +-
 47 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/SConstruct b/SConstruct
index f322ae27e06..12aa37772da 100644
--- a/SConstruct
+++ b/SConstruct
@@ -404,7 +404,7 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
-	playerlist = playerlist[0:2] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
+	#playerlist = playerlist[0:2] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets
diff --git a/extern/binreloc/SConscript b/extern/binreloc/SConscript
index 98d7adb2d1e..331b70a4ebc 100644
--- a/extern/binreloc/SConscript
+++ b/extern/binreloc/SConscript
@@ -9,5 +9,5 @@ cflags = []
 sources = ['binreloc.c']
 incs = 'include'
 
-env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['extern'], priority=[36], compileflags = cflags)
+env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[36,225], compileflags = cflags)
 
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index 319cc57ce55..3d0c645e7a0 100644
--- a/extern/bullet2/src/SConscript
+++ b/extern/bullet2/src/SConscript
@@ -35,11 +35,11 @@ softbody_src = env.Glob("BulletSoftBody/*.cpp")
 
 incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
 
-env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[19], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[25], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[18], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[19,136], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[25,145], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[18,135], compileflags=cflags )
diff --git a/extern/glew/SConscript b/extern/glew/SConscript
index b83525daffe..81a2fc67ccc 100644
--- a/extern/glew/SConscript
+++ b/extern/glew/SConscript
@@ -9,4 +9,4 @@ sources = ['src/glew.c']
 defs = ''
 incs = 'include'
 
-env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern'], priority=[50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[50,230])
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript
index 693fee15c91..da661739783 100644
--- a/extern/libopenjpeg/SConscript
+++ b/extern/libopenjpeg/SConscript
@@ -24,5 +24,5 @@ if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 oj_env.BlenderLib ( libname='extern_openjpeg', 
                     sources=sources, includes=Split(incs),
                     defines=defs,
-                    libtype=['extern'],
-                    priority=[10], compileflags = flags)
+                    libtype=['extern','player'],
+                    priority=[10,185], compileflags = flags)
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index 0dfd0bb9e3a..025fa5a2379 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -31,4 +31,4 @@ if env['WITH_BF_SNDFILE']:
 	incs += ' sndfile ' + env['BF_SNDFILE_INC']
 	defs.append('WITH_SNDFILE')
 
-env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] )
+env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 9de82ac44fb..48009152699 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -29,4 +29,4 @@ else:
 incs = '. ../string ' + env['BF_OPENGL_INC']
 if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
     incs = env['BF_WINTAB_INC'] + ' ' + incs
-env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] ) 
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern','player'], priority = [40,15] ) 
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript
index 8927bef2efc..2ee0f84b464 100644
--- a/intern/guardedalloc/SConscript
+++ b/intern/guardedalloc/SConscript
@@ -5,4 +5,4 @@ Import('env')
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern'], priority = [5] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )
diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript
index df8c10b7302..7adb2d50893 100644
--- a/intern/iksolver/SConscript
+++ b/intern/iksolver/SConscript
@@ -5,5 +5,5 @@ sources = env.Glob('intern/*.cpp')
 
 incs = 'intern ../moto/include ../memutil'
 
-env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern'], priority=[100] )
+env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )
 
diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript
index 55c314d5211..318d4a3997e 100644
--- a/intern/memutil/SConscript
+++ b/intern/memutil/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = '. ..'
 
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern'], priority = [0] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern','player'], priority = [0,155] )
diff --git a/intern/moto/SConscript b/intern/moto/SConscript
index a730e6de535..d9bbafe4623 100644
--- a/intern/moto/SConscript
+++ b/intern/moto/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = 'include'
 
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern'], priority = [130] )
+env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','player'], priority = [130,95] )
diff --git a/intern/string/SConscript b/intern/string/SConscript
index 8973ac88a66..4aca220183c 100644
--- a/intern/string/SConscript
+++ b/intern/string/SConscript
@@ -4,4 +4,4 @@ Import ('env')
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['intern'], priority = [50] )
+env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] )
diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index 61385958a84..0bf8c3c74db 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('intern/*.c')
 incs = '. #/intern/guardedalloc'
 incs += ' ' + env['BF_JPEG_INC']
 
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [190] )
+env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [190,120] )
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript
index fa6fa19a9ef..d070d985247 100644
--- a/source/blender/blenfont/SConscript
+++ b/source/blender/blenfont/SConscript
@@ -14,4 +14,4 @@ defs = ''
 if sys.platform == 'win32':
 	defs += ' _WIN32 USE_GETTEXT_DLL'
 
-env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] )
+env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[210,210] )
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index f000f778dcb..1f42390504d 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -65,4 +65,4 @@ if env['WITH_BF_LCMS']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [166] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] )
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 65bd65bdc35..fc586de5085 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -16,4 +16,4 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [363], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags )
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 00e102c686c..88d345290e5 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -11,4 +11,4 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [167] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30] )
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index b45547e359c..e55fbe973f8 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -8,4 +8,4 @@ incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core'], priority=[160] )
+env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core','player'], priority=[160,110] )
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index cdc1a5f5257..6052b344da7 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -35,4 +35,4 @@ if env['WITH_BF_QUICKTIME']:
 	incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [185] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] )
diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
index 371e4cff9eb..d9c8ab14d35 100644
--- a/source/blender/imbuf/intern/cineon/SConscript
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -14,4 +14,4 @@ incs = ['.',
 
 defs = []
 
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core'], priority = [220])
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175])
diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index 6cabc3f7d79..0b7fd50e317 100644
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/source/blender/imbuf/intern/dds/SConscript
@@ -16,4 +16,4 @@ incs = ['.',
 
 defs = ['WITH_DDS']
 
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core'], priority = [230])
+env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190])
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index 729619c963b..f504c503109 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -15,4 +15,4 @@ incs += Split(env['BF_OPENEXR_INC'])
 
 defs = ['WITH_OPENEXR']
 
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core'], priority = [225])
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180])
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript
index 1cb61f59121..c3d39783b00 100644
--- a/source/blender/makesdna/SConscript
+++ b/source/blender/makesdna/SConscript
@@ -8,4 +8,4 @@ objs += o
 
 incs = '#/intern/guardedalloc .'
 
-env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core'], priority = [215] )
+env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215,200] )
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 482c9ce7afd..c2790927cef 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -37,4 +37,4 @@ if env['WITH_BF_LCMS']:
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
 
-env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [165] )
+env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 0b35db3b4b7..771ce42e1dc 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -38,7 +38,7 @@ if env['WITH_BF_QUICKTIME']:
 	defs.append('WITH_QUICKTIME')
 	incs += ' ' + env['BF_QUICKTIME_INC']
 
-env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [190] )
-env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core'], priority = [175] )
-env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core'], priority = [175] )
-env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = defs, libtype=['core'], priority = [175] )
+env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
+env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
+env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
+env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 2601626851e..ca742a3646a 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -13,9 +13,9 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
 	defs.append('_DEBUG')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160])
 
 
 # generic
 sources = env.Glob('generic/*.c')
-env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [362]) # ketsji is 360
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index 5f3995a410a..10e88a8f461 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -19,7 +19,7 @@ incs  = ['.',
 
 incs.append(env['BF_QUICKTIME_INC'])
 
-types = ['core']
-priorities = [200]
+types = ['core','player']
+priorities = [200,235]
 
 env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=['WITH_QUICKTIME'], libtype=types, priority=priorities)
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index c8189501d4b..57ee1866263 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c')
 
 incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
 
-env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core'], priority = [0] )
+env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,195] )
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index ce502af57be..ab98e984cef 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -10,4 +10,4 @@ defs = ''
 if env['WITH_BF_INTERNATIONAL']:
     defs += 'WITH_FREETYPE2'
 
-env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[145] )
+env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[220] )
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index cfb5b0ef525..ad6f9f23fce 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -28,4 +28,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core'], priority=[300] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index bf2dfa5e659..2d126310475 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -23,4 +23,4 @@ incs += ' #source/blender/makesrna'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core'], priority=[305], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index cbf33f39568..c819bfb0d3e 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core'], priority = [360], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index f456f4125ab..1530c71c7f3 100644
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -21,4 +21,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG')
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core'], priority=[330], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 6f37c2f769e..dd5a48c2b55 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -62,4 +62,4 @@ incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
 
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype=['player'], priority=[15], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index 6c71eafa1dc..fdd7792b72a 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -46,4 +46,4 @@ defs = []
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index 6429bd76a37..8f88511acca 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -9,4 +9,4 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core'], priority=[400], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 122b77e0173..5f38020780b 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -33,4 +33,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	if env['BF_DEBUG']:
 		defs.append('_DEBUG') # for Python
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core'], priority=[320], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index 2c27ee707f0..dd23e1327eb 100644
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core'], priority=[400] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index f584503e109..3883dc71c9c 100644
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_Netw
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core'], priority=[400] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core','player'], priority=[400,130] )
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index baba40bcdc7..49f2af1b001 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -21,4 +21,4 @@ incs += ' #intern/guardedalloc'
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core'], priority=[350], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index f4444cf6746..dc76e8046a0 100644
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -5,4 +5,4 @@ sources = 'DummyPhysicsEnvironment.cpp'
 
 incs = '. ../common'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core'], priority=[350] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,60] )
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index b9adbd7210a..719c028ee8f 100644
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -5,4 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp P
 
 incs = '. ../Dummy #intern/moto/include'
 
-env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core'], priority=[360], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index b1e5289c14c..fb4c685f8d3 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -8,4 +8,4 @@ incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
 incs += ' #intern/guardedalloc #source/blender/blenlib'
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core'], priority=[350], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 064736bcc88..dbec2d92e31 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -7,4 +7,4 @@ sources = env.Glob('*.cpp')
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core'], priority=[350], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index 79bf3033fa1..2a33cd67b5e 100644
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core'], priority=[325], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 0b35c019178..0d3e495f3e2 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -27,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
     defs.append('__STDC_CONSTANT_MACROS')
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core'], priority=[300], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300,205], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 746fb60d4ff..3110f46cfad 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core'], priority = [400] )
+env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core','player'], priority = [400,100] )

From d56f826ea9844a0289a216df6f62d28d123f0888 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sat, 5 Sep 2009 02:13:13 +0000
Subject: [PATCH 444/577] remove unnecessary semi-colons

---
 .../bad_level_call_stubs/stubs.c              | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 5ddafca5340..c1585a71ac1 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -177,24 +177,24 @@ void WM_operator_bl_idname(char *to, const char *from){}
 short insert_keyframe (struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag){return 0;}
 
 /* smoke */
-void lzo1x_1_compress(void) {return;};
-void LzmaCompress(void) {return;};
-void smoke_export(void) {return;};
-void lzo1x_decompress(void) {return;};
-void LzmaUncompress(void) {return;};
-void smoke_init(void) {return;};
-void smoke_turbulence_init(void) {return;};
-void smoke_turbulence_initBlenderRNA(void) {return;};
-void smoke_initBlenderRNA(void) {return;};
-void smoke_free(void) {return;};
-void smoke_turbulence_free(void) {return;};
-void smoke_turbulence_step(void) {return;};
-void smoke_dissolve(void) {return;};
-void smoke_get_density(void) {return;};
-void smoke_get_heat(void) {return;};
-void smoke_get_velocity_x(void) {return;};
-void smoke_get_velocity_y(void) {return;};
-void smoke_get_velocity_z(void) {return;};
-void smoke_get_obstacle(void) {return;};
-void smoke_get_index(void) {return;};
-void smoke_step(void) {return;};
+void lzo1x_1_compress(void) {return;}
+void LzmaCompress(void) { return; }
+void smoke_export(void) {return;}
+void lzo1x_decompress(void) {return;}
+void LzmaUncompress(void) {return;}
+void smoke_init(void) {return;}
+void smoke_turbulence_init(void) {return;}
+void smoke_turbulence_initBlenderRNA(void) {return;}
+void smoke_initBlenderRNA(void) {return;}
+void smoke_free(void) {return;}
+void smoke_turbulence_free(void) {return;}
+void smoke_turbulence_step(void) {return;}
+void smoke_dissolve(void) {return;}
+void smoke_get_density(void) {return;}
+void smoke_get_heat(void) {return;}
+void smoke_get_velocity_x(void) {return;}
+void smoke_get_velocity_y(void) {return;}
+void smoke_get_velocity_z(void) {return;}
+void smoke_get_obstacle(void) {return;}
+void smoke_get_index(void) {return;}
+void smoke_step(void) {return;}

From 668b92dfedca02959bbe3467a9f62ca597987544 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sat, 5 Sep 2009 02:14:45 +0000
Subject: [PATCH 445/577] * fix lib list creation. now blenderplayer links fine
 with both scons/mingw and scons/msvc

---
 SConstruct | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 12aa37772da..83ec6c1b718 100644
--- a/SConstruct
+++ b/SConstruct
@@ -404,7 +404,8 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
-	#playerlist = playerlist[0:2] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
+	playerlist += B.create_blender_liblist(env, 'intern')
+	playerlist += B.create_blender_liblist(env, 'extern')
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets

From 05c44056dc48bf718475a1e98c9abbd6cc00a535 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 5 Sep 2009 04:04:51 +0000
Subject: [PATCH 446/577] 2.5 - Demo of how to get node attributes animateable

* Made sure that nodes have a working 'path' function (needed for any tools that will resolve paths needed for animating properties)

* Replaced all the UI button controls for a single node (Vector Blur) with relevant RNA buttons which can be animated. There are probably some even nicer ways to do this (i.e. using layout engine for drawing all sets of buttons), though this is the easiest way forward in the immediate future.
Anyways, if people are interested in getting this working, they will need to spend time to replace all the necessary button calls :)
---
 source/blender/editors/space_node/drawnode.c  | 98 ++++---------------
 source/blender/makesrna/intern/rna_nodetree.c | 10 ++
 2 files changed, 29 insertions(+), 79 deletions(-)

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 1fb8cb3452b..2f64108384e 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1459,26 +1459,28 @@ static int node_composit_buts_lensdist(uiBlock *block, bNodeTree *ntree, bNode *
 static int node_composit_buts_vecblur(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
 {
 	if(block) {
-		NodeBlurData *nbd= node->storage;
+		PointerRNA ptr;
 		short dy= butr->ymin;
 		short dx= (butr->xmax-butr->xmin);
 		
-		uiBlockBeginAlign(block);
-		uiDefButS(block, NUM, B_NODE_EXEC, "Samples:",
-				 butr->xmin, dy+76, dx, 19, 
-				 &nbd->samples, 1, 256, 0, 0, "Amount of samples");
-		uiDefButS(block, NUM, B_NODE_EXEC, "MinSpeed:",
-				  butr->xmin, dy+57, dx, 19, 
-				  &nbd->minspeed, 0, 1024, 0, 0, "Minimum speed for a pixel to be blurred, used to separate background from foreground");
-		uiDefButS(block, NUM, B_NODE_EXEC, "MaxSpeed:",
-				  butr->xmin, dy+38, dx, 19, 
-				  &nbd->maxspeed, 0, 1024, 0, 0, "If not zero, maximum speed in pixels");
-		uiDefButF(block, NUM, B_NODE_EXEC, "Blur:",
-				  butr->xmin, dy+19, dx, 19, 
-				  &nbd->fac, 0.0f, 2.0f, 10, 2, "Scaling factor for motion vectors, actually 'shutter speed' in frames");
-		uiDefButS(block, TOG, B_NODE_EXEC, "Curved",
-				  butr->xmin, dy, dx, 19, 
-				  &nbd->curved, 0.0f, 2.0f, 10, 2, "Interpolate between frames in a bezier curve, rather than linearly");
+		RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
+		
+		uiBlockBeginAlign(block);	
+		uiDefButR(block, NUM, B_NODE_EXEC, NULL, 
+			butr->xmin, dy+76, dx, 19, 
+			&ptr, "samples", 0, 1, 256, 0, 0, NULL);
+		uiDefButR(block, NUM, B_NODE_EXEC, NULL, 
+			butr->xmin, dy+57, dx, 19, 
+			&ptr, "min_speed", 0, 0, 1024, 0, 0, NULL);
+		uiDefButR(block, NUM, B_NODE_EXEC, NULL, 
+			butr->xmin, dy+38, dx, 19, 
+			&ptr, "max_speed", 0, 0, 1024, 0, 0, NULL);
+		uiDefButR(block, NUM, B_NODE_EXEC, "Blur", 
+			butr->xmin, dy+19, dx, 19, 
+			&ptr, "factor", 0, 0, 2, 10, 2, NULL);
+		uiDefButR(block, TOG, B_NODE_EXEC, NULL, 
+			butr->xmin, dy, dx, 19, 
+			&ptr, "curved", 0, 0, 2, 10, 2, NULL);
 		uiBlockEndAlign(block);
 	}
 	return 95;
@@ -2625,66 +2627,4 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
 	node_draw_link_bezier(v2d, snode, link, th_col1, th_col2, do_shaded);
 }
 
-#if 0
 
-static void nodes_panel_gpencil(short cntrl)	// NODES_HANDLER_GREASEPENCIL
-{
-	uiBlock *block;
-	SpaceNode *snode;
-	
-	snode= curarea->spacedata.first;
-
-	block= uiNewBlock(&curarea->uiblocks, "nodes_panel_gpencil", UI_EMBOSS, UI_HELV, curarea->win);
-	uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE  | cntrl);
-	uiSetPanelHandler(NODES_HANDLER_GREASEPENCIL);  // for close and esc
-	if (uiNewPanel(curarea, block, "Grease Pencil", "SpaceNode", 100, 30, 318, 204)==0) return;
-	
-	/* we can only really draw stuff if there are nodes (otherwise no events are handled */
-	if (snode->nodetree == NULL)
-		return;
-	
-	/* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
-	if (snode->flag & SNODE_DISPGP) {
-		if (snode->gpd == NULL)
-			gpencil_data_setactive(curarea, gpencil_data_addnew());
-	}
-	
-	if (snode->flag & SNODE_DISPGP) {
-		bGPdata *gpd= snode->gpd;
-		short newheight;
-		
-		/* this is a variable height panel, newpanel doesnt force new size on existing panels */
-		/* so first we make it default height */
-		uiNewPanelHeight(block, 204);
-		
-		/* draw button for showing gpencil settings and drawings */
-		uiDefButBitS(block, TOG, SNODE_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &snode->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Node Editor (draw using Shift-LMB)");
-		
-		/* extend the panel if the contents won't fit */
-		newheight= draw_gpencil_panel(block, gpd, curarea); 
-		uiNewPanelHeight(block, newheight);
-	}
-	else {
-		uiDefButBitS(block, TOG, SNODE_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &snode->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Node Editor");
-		uiDefBut(block, LABEL, 1, " ",	160, 180, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
-	}
-}
-
-static void nodes_blockhandlers(ScrArea *sa)
-{
-	SpaceNode *snode= sa->spacedata.first;
-	short a;
-	
-	for(a=0; a<SPACE_MAXHANDLER; a+=2) {
-		switch(snode->blockhandler[a]) {
-			case NODES_HANDLER_GREASEPENCIL:
-				nodes_panel_gpencil(snode->blockhandler[a+1]);
-				break;
-		}
-		
-		/* clear action value for event */
-		snode->blockhandler[a+1]= 0;
-	}
-	uiDrawBlocksPanels(sa, 0);
-}
-#endif
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 23e79831292..9062cec3828 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -57,6 +57,15 @@ StructRNA *rna_Node_refine(struct PointerRNA *ptr)
 	}
 }
 
+static char *rna_Node_path(PointerRNA *ptr)
+{
+	bNodeTree *ntree= (bNodeTree*)ptr->id.data;
+	bNode *node= (bNode*)ptr->data;
+	int index = BLI_findindex(&ntree->nodes, node);
+	
+	return BLI_sprintfN("nodes[%d]", index);
+}
+
 #else
 
 #define MaxNodes 1000
@@ -1353,6 +1362,7 @@ static void rna_def_node(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Node", "Node in a node tree.");
 	RNA_def_struct_sdna(srna, "bNode");
 	RNA_def_struct_refine_func(srna, "rna_Node_refine");
+	RNA_def_struct_path_func(srna, "rna_Node_path");
 	
 	prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_float_sdna(prop, NULL, "locx");

From 3b743ac5565663d2fd0be4bbbc92e404afafbce4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 5 Sep 2009 09:54:01 +0000
Subject: [PATCH 447/577] Option to correct for 3D curve twist error. example
 before and after.
 http://www.graphicall.org/ftp/ideasman42/curve_auto_twist.png Access next to
 the "3D" edit button.

details...
- open curves use the first points orientation and minimize twist for each new segment.
- cyclic curves calculate the least twist in both directions and blend between them
- AxisAngleToQuat replaced inline code.
- Notice the model on the right now has more even corners. added Vec3ToTangent to arithb.c.
---
 source/blender/blenkernel/intern/curve.c  | 176 +++++++++++++++++-----
 source/blender/blenlib/BLI_arithb.h       |   1 +
 source/blender/blenlib/intern/arithb.c    |  13 ++
 source/blender/makesdna/DNA_curve_types.h |   2 +
 source/blender/src/buttons_editing.c      |   3 +-
 5 files changed, 158 insertions(+), 37 deletions(-)

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 0d6382a8d37..709507a9b26 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1513,7 +1513,7 @@ void makeBevelList(Object *ob)
 	BPoint *bp;
 	BevList *bl, *blnew, *blnext;
 	BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0;
-	float min, inp, x1, x2, y1, y2, vec[3];
+	float min, inp, x1, x2, y1, y2, vec[3], vec_prev[3], q[4], quat[4], quat_prev[4], cross[3];
 	float *coord_array, *tilt_array=NULL, *radius_array=NULL, *coord_fp, *tilt_fp=NULL, *radius_fp=NULL;
 	float *v1, *v2;
 	struct bevelsort *sortdata, *sd, *sd1;
@@ -1872,7 +1872,10 @@ void makeBevelList(Object *ob)
 	bl= cu->bev.first;
 	while(bl) {
 	
-		if(bl->nr==2) {	/* 2 pnt, treat separate */
+		if(bl->nr < 2) {
+			/* do nothing */
+		}
+		else if(bl->nr==2) {	/* 2 pnt, treat separate */
 			bevp2= (BevPoint *)(bl+1);
 			bevp1= bevp2+1;
 
@@ -1886,56 +1889,106 @@ void makeBevelList(Object *ob)
 			if(cu->flag & CU_3D) {	/* 3D */
 				float quat[4], q[4];
 			
-				vec[0]= bevp1->x - bevp2->x;
-				vec[1]= bevp1->y - bevp2->y;
-				vec[2]= bevp1->z - bevp2->z;
+				VecSubf(vec, &bevp1->x, &bevp2->x);
 				
 				vectoquat(vec, 5, 1, quat);
 				
-				Normalize(vec);
-				q[0]= (float)cos(0.5*bevp1->alfa);
-				x1= (float)sin(0.5*bevp1->alfa);
-				q[1]= x1*vec[0];
-				q[2]= x1*vec[1];
-				q[3]= x1*vec[2];
+				AxisAngleToQuat(q, vec, bevp1->alfa);
 				QuatMul(quat, q, quat);
 				
 				QuatToMat3(quat, bevp1->mat);
 				Mat3CpyMat3(bevp2->mat, bevp1->mat);
 			}
 
-		}
-		else if(bl->nr>2) {
+		}	/* this has to be >2 points */
+		else if(cu->flag & CU_NO_TWIST && cu->flag & CU_3D && bl->poly != -1) {
+
+			/* Special case, cyclic curve with no twisy. tricky... */
+
+			float quat[4], q[4], cross[3];
+
+			/* correcting a cyclic curve is more complicated, need to be corrected from both ends */
+			float *quat_tmp1, *quat_tmp2; /* store a quat in the matrix temporarily */
+			int iter_dir;
+			BevPoint *bevp_start= (BevPoint *)(bl+1);
+
+			/* loop over the points twice, once up, once back, accumulate the quat rotations
+			 * in both directions, then blend them in the 3rd loop and apply the tilt */
+			for(iter_dir = 0; iter_dir < 2; iter_dir++) {
+
+				bevp2= (BevPoint *)(bl+1);
+				bevp1= bevp2+(bl->nr-1);
+				bevp0= bevp1-1;
+
+				nr= bl->nr;
+				while(nr--) {
+	
+					/* Normalizes */
+					Vec3ToTangent(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+
+					if(bl->nr==nr+1) { /* first time */
+						vectoquat(vec, 5, 1, quat);
+					}
+					else {
+						float angle = NormalizedVecAngle2(vec_prev, vec);
+					
+						if(angle > 0.0f) { /* otherwise we can keep as is */
+							Crossf(cross, vec_prev, vec);
+							AxisAngleToQuat(q, cross, angle);
+							QuatMul(quat, q, quat_prev);
+						}
+						else {
+							QUATCOPY(quat, quat_prev);
+						}
+					}
+					QUATCOPY(quat_prev, quat); /* quat_prev can't have the tilt applied */
+					VECCOPY(vec_prev, vec);
+
+					if(iter_dir==0) { /* up, first time */
+						quat_tmp1= (float *)bevp1->mat;
+
+						bevp0= bevp1;
+						bevp1= bevp2;
+						bevp2++;
+					}
+					else { /* down second time */
+						quat_tmp1= ((float *)bevp1->mat)+4;
+
+						bevp2= bevp1;
+						bevp1= bevp0;
+						bevp0--;
+
+						/* wrap around */
+						if (bevp0 < bevp_start)
+							bevp0= bevp_start+(bl->nr-1);
+					}
+
+					QUATCOPY(quat_tmp1, quat);
+				}
+			}
+
+			/* Now interpolate the 2 quats and apply tilt */
+
 			bevp2= (BevPoint *)(bl+1);
 			bevp1= bevp2+(bl->nr-1);
 			bevp0= bevp1-1;
 
-		
 			nr= bl->nr;
-	
 			while(nr--) {
-	
-				if(cu->flag & CU_3D) {	/* 3D */
-					float quat[4], q[4];
-				
-					vec[0]= bevp2->x - bevp0->x;
-					vec[1]= bevp2->y - bevp0->y;
-					vec[2]= bevp2->z - bevp0->z;
-					
-					Normalize(vec);
 
-					vectoquat(vec, 5, 1, quat);
-					
-					q[0]= (float)cos(0.5*bevp1->alfa);
-					x1= (float)sin(0.5*bevp1->alfa);
-					q[1]= x1*vec[0];
-					q[2]= x1*vec[1];
-					q[3]= x1*vec[2];
-					QuatMul(quat, q, quat);
-					
-					QuatToMat3(quat, bevp1->mat);
-				}
+				Vec3ToTangent(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+
+				quat_tmp1= (float *)bevp1->mat;
+				quat_tmp2= quat_tmp1+4;
+
+				/* blend the 2 rotations gathered from both directions */
+				QuatInterpol(quat, quat_tmp1, quat_tmp2, 1.0 - (((float)nr)/bl->nr));
+
+				AxisAngleToQuat(q, vec, bevp1->alfa);
+				QuatMul(quat, q, quat);
+				QuatToMat3(quat, bevp1->mat);
 				
+				/* generic */
 				x1= bevp1->x- bevp0->x;
 				x2= bevp1->x- bevp2->x;
 				y1= bevp1->y- bevp0->y;
@@ -1943,11 +1996,62 @@ void makeBevelList(Object *ob)
 			
 				calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
 				
-				
 				bevp0= bevp1;
 				bevp1= bevp2;
 				bevp2++;
 			}
+		}
+		else {
+			/* Any curve with 3 or more points */
+
+			bevp2= (BevPoint *)(bl+1);
+			bevp1= bevp2+(bl->nr-1);
+			bevp0= bevp1-1;
+
+			nr= bl->nr;
+			while(nr--) {
+
+				if(cu->flag & CU_3D) {	/* 3D */
+
+					/* Normalizes */
+					Vec3ToTangent(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+
+					if(bl->nr==nr+1 || !(cu->flag & CU_NO_TWIST)) { /* first time */
+						vectoquat(vec, 5, 1, quat);
+					}
+					else {
+						float angle = NormalizedVecAngle2(vec_prev, vec);
+
+						if(angle > 0.0f) { /* otherwise we can keep as is */
+							Crossf(cross, vec_prev, vec);
+							AxisAngleToQuat(q, cross, angle);
+							QuatMul(quat, q, quat_prev);
+						}
+						else {
+							QUATCOPY(quat, quat_prev);
+						}
+					}
+					QUATCOPY(quat_prev, quat); /* quat_prev can't have the tilt applied */
+					VECCOPY(vec_prev, vec);
+
+					AxisAngleToQuat(q, vec, bevp1->alfa);
+					QuatMul(quat, q, quat);
+					QuatToMat3(quat, bevp1->mat);
+				}
+
+				x1= bevp1->x- bevp0->x;
+				x2= bevp1->x- bevp2->x;
+				y1= bevp1->y- bevp0->y;
+				y2= bevp1->y- bevp2->y;
+
+				calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
+
+
+				bevp0= bevp1;
+				bevp1= bevp2;
+				bevp2++;
+			}
+
 			/* correct non-cyclic cases */
 			if(bl->poly== -1) {
 				if(bl->nr>2) {
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 092ed00fbe5..63b351016d4 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -270,6 +270,7 @@ void AxisAngleToQuat(float *q, float *axis, float angle);
 void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3]);
 void vectoquat(float *vec, short axis, short upflag, float *q);
 
+void Vec3ToTangent(float *v, float *v1, float *v2, float *v3);
 float VecAngle2(float *v1, float *v2);
 float VecAngle3(float *v1, float *v2, float *v3);
 float NormalizedVecAngle2(float *v1, float *v2);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index ad1dc1ca12c..970d8f7d0de 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2969,6 +2969,19 @@ void VecRotToQuat( float *vec, float phi, float *quat)
 	}
 }
 
+/* get a direction from 3 vectors that wont depend
+ * on the distance between the points */
+void Vec3ToTangent(float *v, float *v1, float *v2, float *v3)
+{
+	float d_12[3], d_23[3];
+	VecSubf(d_12, v2, v1);
+	VecSubf(d_23, v3, v2);
+	Normalize(d_12);
+	Normalize(d_23);
+	VecAddf(v, d_12, d_23);
+	Normalize(v);
+}
+
 /* Return the angle in degrees between vecs 1-2 and 2-3 in degrees
    If v1 is a shoulder, v2 is the elbow and v3 is the hand,
    this would return the angle at the elbow */
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index f809cac037d..88c03a41160 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -205,6 +205,8 @@ typedef struct Curve {
 #define CU_FAST			512 /* Font: no filling inside editmode */
 #define CU_RETOPO               1024
 
+#define CU_NO_TWIST		4096
+
 /* spacemode */
 #define CU_LEFT			0
 #define CU_MIDDLE		1
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 2f9eac67d94..1e37fd0b9f8 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -3671,7 +3671,8 @@ static void editing_panel_curve_type(Object *ob, Curve *cu)
 		uiBlockSetCol(block, TH_BUT_SETTING1);
 		uiDefButBitS(block, TOG, CU_BACK, B_MAKEDISP, "Back",	760,115,50,19, &cu->flag, 0, 0, 0, 0, "Draw filled back for extruded/beveled curves");
 		uiDefButBitS(block, TOG, CU_FRONT, B_MAKEDISP, "Front",810,115,50,19, &cu->flag, 0, 0, 0, 0, "Draw filled front for extruded/beveled curves");
-		uiDefButBitS(block, TOG, CU_3D, B_CU3D, "3D",		860,115,50,19, &cu->flag, 0, 0, 0, 0, "Allow Curve to be 3d, it doesn't fill then");
+		uiDefButBitS(block, TOG, CU_3D, B_CU3D, "3D",		860,115,30,19, &cu->flag, 0, 0, 0, 0, "Allow Curve to be 3d, it doesn't fill then");
+		uiDefIconButBitS(block, TOG, CU_NO_TWIST, B_MAKEDISP, ICON_AUTO,	890,115,20,19, &cu->flag, 0.0, 0.0, 0, 0, "Avoid twisting artifacts for 3D beveled/extruded curves");
 	}
 }
 

From 08b8fc34cfc082d73e657d1c2941662c36bc3514 Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Sat, 5 Sep 2009 20:12:08 +0000
Subject: [PATCH 448/577] Disconnect/connect hair: - Moves hair from face-space
 to global space and back. - Allows for editing of emitter mesh after hair
 combing. - Disconnect hair before doing topology changing changes in mesh
 edit mode, connect after changes. - Notes: 	* The closest location on
 emitter surface to the hair root is used to connect the hair. 	* Emitter
 deflection, sticky roots and add brush don't apply for disconnect hair in
 particle mode. - Todo for future: 	* Copy disconnected hair from object
 to another (when 2.5 has proper copy operators again). 	* Possible
 automatic disconnect/connect with topology changing operations in mesh edit
 mode.

Other changes/fixes:
- Proper subtypes for some particle mode notifiers.
- Particle mode selections didn't draw correctly because of using lighting for the paths.
---
 release/ui/buttons_particle.py                |   5 +
 source/blender/blenkernel/BKE_pointcache.h    |   1 +
 source/blender/blenkernel/intern/particle.c   |   8 +-
 .../blenkernel/intern/particle_system.c       |   2 +-
 source/blender/editors/physics/editparticle.c |  52 ++++-
 .../editors/space_buttons/buttons_intern.h    |   2 +
 .../editors/space_buttons/buttons_ops.c       | 218 ++++++++++++++++++
 .../editors/space_buttons/space_buttons.c     |   2 +
 .../blender/editors/space_view3d/drawobject.c |  18 +-
 .../editors/space_view3d/view3d_header.c      |   6 +-
 .../editors/transform/transform_conversions.c |   8 +-
 source/blender/makesrna/intern/rna_particle.c |   5 +
 .../makesrna/intern/rna_sculpt_paint.c        |  10 +-
 13 files changed, 294 insertions(+), 43 deletions(-)

diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index f3339049962..b0051453b29 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -151,6 +151,11 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
 					row = split.row()
 					row.enabled = particle_panel_enabled(psys)
 					row.itemR(part, "hair_step")
+					if psys.edited==True:
+						if psys.global_hair:
+							layout.itemO("particle.connect_hair")
+						else:
+							layout.itemO("particle.disconnect_hair")
 				elif part.type=='REACTOR':
 					split.enabled = particle_panel_enabled(psys)
 					split.itemR(psys, "reactor_target_object")
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index 9ba34091064..b7ab07b0f91 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -192,6 +192,7 @@ typedef struct PTCacheUndo {
 	struct ParticleData *particles;
 	struct KDTree *emitter_field;
 	float *emitter_cosnos;
+	int psys_flag;
 
 	/* cache stuff */
 	struct ListBase mem_cache;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 81eb0b79c40..0ba2f357a1f 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -418,7 +418,7 @@ void psys_free_path_cache(ParticleSystem *psys, PTCacheEdit *edit)
 		edit->pathcache= NULL;
 		edit->totcached= 0;
 	}
-	else {
+	if(psys) {
 		psys_free_path_cache_buffers(psys->pathcache, &psys->pathcachebufs);
 		psys->pathcache= NULL;
 		psys->totcached= 0;
@@ -2676,7 +2676,7 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	baked = psys->pointcache->flag & PTCACHE_BAKED;
 
 	/* clear out old and create new empty path cache */
-	psys_free_path_cache(psys, NULL);
+	psys_free_path_cache(psys, psys->edit);
 	cache= psys->pathcache= psys_alloc_path_cache_buffers(&psys->pathcachebufs, totpart, steps+1);
 
 	if(psys->soft && psys->softflag & OB_SB_ENABLE) {
@@ -2891,7 +2891,7 @@ void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cf
 
 	if(!cache || edit->totpoint != edit->totcached) {
 		/* clear out old and create new empty path cache */
-		psys_free_path_cache(NULL, edit);
+		psys_free_path_cache(edit->psys, edit);
 		cache= edit->pathcache= psys_alloc_path_cache_buffers(&edit->pathcachebufs, totpart, steps+1);
 	}
 
@@ -2946,7 +2946,7 @@ void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cf
 			do_particle_interpolation(psys, i, pa, t, frs_sec, &pind, &result);
 
 			 /* non-hair points are allready in global space */
-			if(psys)
+			if(psys && !(psys->flag & PSYS_GLOBAL_HAIR))
 				Mat4MulVecfl(hairmat, result.co);
 
 			VECCOPY(ca->co, result.co);
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index eb570ba287c..1931b89af38 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -158,7 +158,7 @@ void psys_reset(ParticleSystem *psys, int mode)
 	psys->totchild= 0;
 
 	/* reset path cache */
-	psys_free_path_cache(psys, NULL);
+	psys_free_path_cache(psys, psys->edit);
 
 	/* reset point cache */
 	psys->pointcache->flag &= ~PTCACHE_SIMULATION_VALID;
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index bc48d8f4f55..0f5e677b912 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -555,7 +555,7 @@ static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected
 	Mat4One(mat);
 
 	LOOP_VISIBLE_POINTS {
-		if(edit->psys) {
+		if(edit->psys && !(edit->psys->flag & PSYS_GLOBAL_HAIR)) {
 			psys_mat_hair_to_global(data->ob, psmd->dm, psys->part->from, psys->particles + p, mat);
 			Mat4Invert(imat,mat);
 		}
@@ -812,7 +812,7 @@ static void pe_deflect_emitter(Scene *scene, Object *ob, PTCacheEdit *edit)
 	float *vec, *nor, dvec[3], dot, dist_1st;
 	float hairimat[4][4], hairmat[4][4];
 
-	if(edit==NULL || edit->psys==NULL || (pset->flag & PE_DEFLECT_EMITTER)==0)
+	if(edit==NULL || edit->psys==NULL || (pset->flag & PE_DEFLECT_EMITTER)==0 || (edit->psys->flag & PSYS_GLOBAL_HAIR))
 		return;
 
 	psys = edit->psys;
@@ -876,6 +876,9 @@ void PE_apply_lengths(Scene *scene, PTCacheEdit *edit)
 	if(edit==0 || (pset->flag & PE_KEEP_LENGTHS)==0)
 		return;
 
+	if(edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
+		return;
+
 	LOOP_EDITED_POINTS {
 		LOOP_KEYS {
 			if(k) {
@@ -899,10 +902,10 @@ static void pe_iterate_lengths(Scene *scene, PTCacheEdit *edit)
 	float dv1[3]= {0.0f, 0.0f, 0.0f};
 	float dv2[3]= {0.0f, 0.0f, 0.0f};
 
-	if(edit==0)
+	if(edit==0 || (pset->flag & PE_KEEP_LENGTHS)==0)
 		return;
 
-	if((pset->flag & PE_KEEP_LENGTHS)==0)
+	if(edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
 		return;
 
 	LOOP_EDITED_POINTS {
@@ -1057,11 +1060,13 @@ static void update_world_cos(Object *ob, PTCacheEdit *edit)
 		return;
 
 	LOOP_POINTS {
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles+p, hairmat);
+		if(!(psys->flag & PSYS_GLOBAL_HAIR))
+			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles+p, hairmat);
 
 		LOOP_KEYS {
 			VECCOPY(key->world_co,key->co);
-			Mat4MulVecfl(hairmat, key->world_co);
+			if(!(psys->flag & PSYS_GLOBAL_HAIR))
+				Mat4MulVecfl(hairmat, key->world_co);
 		}
 	}
 }
@@ -1480,7 +1485,7 @@ int PE_lasso_select(bContext *C, short mcords[][2], short moves, short select)
 	Mat4One(mat);
 
 	LOOP_VISIBLE_POINTS {
-		if(edit->psys)
+		if(edit->psys && !(psys->flag & PSYS_GLOBAL_HAIR))
 			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + p, mat);
 
 		if(pset->selectmode==SCE_SELECT_POINT) {
@@ -1777,7 +1782,8 @@ static void rekey_particle(PEData *data, int pa_index)
 	for(k=0, key=pa->hair; k<pa->totkey; k++, key++, ekey++) {
 		ekey->co= key->co;
 		ekey->time= &key->time;
-		ekey->flag |= PEK_USE_WCO;
+		if(!(psys->flag & PSYS_GLOBAL_HAIR))
+			ekey->flag |= PEK_USE_WCO;
 	}
 
 	pa->flag &= ~PARS_REKEY;
@@ -2059,7 +2065,9 @@ static void subdivide_particle(PEData *data, int pa_index)
 
 			nekey->co= nkey->co;
 			nekey->time= &nkey->time;
-			nekey->flag |= (PEK_SELECT|PEK_USE_WCO);
+			nekey->flag |= PEK_SELECT;
+			if(!(psys->flag & PSYS_GLOBAL_HAIR))
+				nekey->flag |= PEK_USE_WCO;
 
 			nekey++;
 			nkey++;
@@ -2129,6 +2137,9 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 	float mat[4][4], co[3], threshold= RNA_float_get(op->ptr, "threshold");
 	int n, totn, removed, flag, totremoved;
 
+	if(psys->flag & PSYS_GLOBAL_HAIR)
+		return OPERATOR_CANCELLED;
+
 	edit= psys->edit;
 	psmd= psys_get_modifier(ob, psys);
 	totremoved= 0;
@@ -2400,6 +2411,9 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 	int *mirrorfaces;
 	int rotation, totpart, newtotpart;
 
+	if(psys->flag & PSYS_GLOBAL_HAIR)
+		return;
+
 	psmd= psys_get_modifier(ob, psys);
 
 	mirrorfaces= mesh_get_x_mirror_faces(ob, NULL);
@@ -2750,7 +2764,7 @@ static void brush_puff(PEData *data, int point_index)
 	float mat[4][4], imat[4][4];
 	float lastco[3], rootco[3], co[3], nor[3], kco[3], dco[3], fac, length;
 
-	if(psys) {
+	if(psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
 		psys_mat_hair_to_global(data->ob, data->dm, psys->part->from, psys->particles + point_index, mat);
 		Mat4Invert(imat,mat);
 	}
@@ -2849,6 +2863,9 @@ static void brush_add(PEData *data, short number)
 	DerivedMesh *dm=0;
 	Mat4Invert(imat,ob->obmat);
 
+	if(psys->flag & PSYS_GLOBAL_HAIR)
+		return;
+
 	BLI_srandom(psys->seed+data->mval[0]+data->mval[1]);
 	
 	/* painting onto the deformed mesh, could be an option? */
@@ -3070,6 +3087,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 	float vec[3], mousef[2];
 	short mval[2], mvalo[2];
 	int flip, mouse[2], dx, dy, removed= 0, selected= 0;
+	int lock_root = pset->flag & PE_LOCK_FIRST;
 
 	if(!PE_start_edit(edit))
 		return;
@@ -3093,6 +3111,10 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 	mvalo[0]= bedit->lastmouse[0];
 	mvalo[1]= bedit->lastmouse[1];
 
+	/* disable locking temporatily for disconnected hair */
+	if(edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
+		pset->flag &= ~PE_LOCK_FIRST;
+
 	if(((pset->brushtype == PE_BRUSH_ADD) ?
 		(sqrt(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0))
 		|| bedit->first) {
@@ -3248,6 +3270,8 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 		bedit->lastmouse[1]= mouse[1];
 		bedit->first= 0;
 	}
+
+	pset->flag |= lock_root;
 }
 
 static void brush_edit_exit(bContext *C, wmOperator *op)
@@ -3382,6 +3406,8 @@ static void make_PTCacheUndo(PTCacheEdit *edit, PTCacheUndo *undo)
 
 		for(i=0; i<edit->totpoint; i++, pa++)
 			pa->hair= MEM_dupallocN(pa->hair);
+
+		undo->psys_flag = edit->psys->flag;
 	}
 	else {
 		PTCacheMem *pm;
@@ -3449,6 +3475,8 @@ static void get_PTCacheUndo(PTCacheEdit *edit, PTCacheUndo *undo)
 				hkey++;
 			}
 		}
+
+		psys->flag = undo->psys_flag;
 	}
 	else {
 		PTCacheMem *pm;
@@ -3704,7 +3732,8 @@ static void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache,
 					key->co= hkey->co;
 					key->time= &hkey->time;
 					key->flag= hkey->editflag;
-					key->flag |= PEK_USE_WCO;
+					if(!(psys->flag & PSYS_GLOBAL_HAIR))
+						key->flag |= PEK_USE_WCO;
 					hkey++;
 				}
 				pa++;
@@ -3828,6 +3857,7 @@ static int clear_edited_exec(bContext *C, wmOperator *op)
 			psys->free_edit = NULL;
 
 			psys->recalc |= PSYS_RECALC_RESET;
+			psys->flag &= ~PSYS_GLOBAL_HAIR;
 
 			psys_reset(psys, PSYS_RESET_DEPSGRAPH);
 			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index 8ed17ab1fa8..0a5a5714a06 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -85,6 +85,8 @@ void PARTICLE_OT_new_target(struct wmOperatorType *ot);
 void PARTICLE_OT_remove_target(struct wmOperatorType *ot);
 void PARTICLE_OT_target_move_up(struct wmOperatorType *ot);
 void PARTICLE_OT_target_move_down(struct wmOperatorType *ot);
+void PARTICLE_OT_connect_hair(struct wmOperatorType *ot);
+void PARTICLE_OT_disconnect_hair(struct wmOperatorType *ot);
 
 void SCENE_OT_render_layer_add(struct wmOperatorType *ot);
 void SCENE_OT_render_layer_remove(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 8cdc6b0cd2b..60480a9f165 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -35,6 +35,8 @@
 #include "DNA_group_types.h"
 #include "DNA_object_types.h"
 #include "DNA_material_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_scene_types.h"
@@ -42,8 +44,11 @@
 #include "DNA_space_types.h"
 #include "DNA_world_types.h"
 
+#include "BKE_bvhutils.h"
+#include "BKE_cdderivedmesh.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
+#include "BKE_DerivedMesh.h"
 #include "BKE_group.h"
 #include "BKE_font.h"
 #include "BKE_library.h"
@@ -51,11 +56,13 @@
 #include "BKE_material.h"
 #include "BKE_node.h"
 #include "BKE_particle.h"
+#include "BKE_pointcache.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 #include "BKE_world.h"
 
+#include "BLI_arithb.h"
 #include "BLI_editVert.h"
 #include "BLI_listbase.h"
 
@@ -838,6 +845,217 @@ void PARTICLE_OT_target_move_down(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
+/************************ connect/disconnect hair operators *********************/
+
+static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
+{
+	ParticleSystemModifierData *psmd = psys_get_modifier(ob,psys);
+	ParticleData *pa = psys->particles;
+	PTCacheEdit *edit = psys->edit;
+	PTCacheEditPoint *point = edit ? edit->points : NULL;
+	PTCacheEditKey *ekey = NULL;
+	HairKey *key;
+	int i, k;
+	float hairmat[4][4];
+
+	if(!ob || !psys || psys->flag & PSYS_GLOBAL_HAIR)
+		return;
+
+	if(!psys->part || psys->part->type != PART_HAIR)
+		return;
+
+	for(i=0; i<psys->totpart; i++,pa++) {
+		if(point) {
+			ekey = point->keys;
+			point++;
+		}
+
+		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
+
+		for(k=0,key=pa->hair; k<pa->totkey; k++,key++) {
+			Mat4MulVecfl(hairmat,key->co);
+			
+			if(ekey) {
+				ekey->flag &= ~PEK_USE_WCO;
+				ekey++;
+			}
+		}
+	}
+
+	psys_free_path_cache(psys, psys->edit);
+
+	psys->flag |= PSYS_GLOBAL_HAIR;
+
+	PE_update_object(scene, ob, 0);
+}
+
+static int disconnect_hair_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem);
+	ParticleSystem *psys= NULL;
+	int all = RNA_boolean_get(op->ptr, "all");
+
+	if(!ob)
+		return OPERATOR_CANCELLED;
+
+	if(all) {
+		for(psys=ob->particlesystem.first; psys; psys=psys->next) {
+			disconnect_hair(scene, ob, psys);
+		}
+	}
+	else {
+		psys = ptr.data;
+		disconnect_hair(scene, ob, psys);
+	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+
+	return OPERATOR_FINISHED;
+}
+
+void PARTICLE_OT_disconnect_hair(wmOperatorType *ot)
+{
+	ot->name= "Disconnect Hair";
+	ot->description= "Disconnect hair from the emitter mesh.";
+	ot->idname= "PARTICLE_OT_disconnect_hair";
+
+	ot->exec= disconnect_hair_exec;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "all", 0, "All hair", "Disconnect all hair systems from the emitter mesh");
+}
+
+static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
+{
+	ParticleSystemModifierData *psmd = psys_get_modifier(ob,psys);
+	ParticleData *pa = psys->particles;
+	PTCacheEdit *edit = psys->edit;
+	PTCacheEditPoint *point = edit ? edit->points : NULL;
+	PTCacheEditKey *ekey;
+	HairKey *key;
+	BVHTreeFromMesh bvhtree;
+	BVHTreeNearest nearest;
+	MFace *mface;
+	DerivedMesh *dm = CDDM_copy(psmd->dm);
+	int numverts = dm->getNumVerts (dm);
+	int i, k;
+	float hairmat[4][4], imat[4][4];
+	float v[4][3], vec[3];
+
+	if(!psys || !psys->part || psys->part->type != PART_HAIR)
+		return;
+
+	memset( &bvhtree, 0, sizeof(bvhtree) );
+
+	/* convert to global coordinates */
+	for (i=0; i<numverts; i++)
+		Mat4MulVecfl (ob->obmat, CDDM_get_vert(dm, i)->co);
+
+	bvhtree_from_mesh_faces(&bvhtree, dm, 0.0, 2, 6);
+
+	for(i=0; i<psys->totpart; i++,pa++) {
+		key = pa->hair;
+
+		nearest.index = -1;
+		nearest.dist = FLT_MAX;
+
+		BLI_bvhtree_find_nearest(bvhtree.tree, key->co, &nearest, bvhtree.nearest_callback, &bvhtree);
+
+		if(nearest.index == -1) {
+			printf("No nearest point found for hair root!");
+			continue;
+		}
+
+		mface = CDDM_get_face(dm,nearest.index);
+
+		VecCopyf(v[0], CDDM_get_vert(dm,mface->v1)->co);
+		VecCopyf(v[1], CDDM_get_vert(dm,mface->v2)->co);
+		VecCopyf(v[2], CDDM_get_vert(dm,mface->v3)->co);
+		if(mface->v4) {
+			VecCopyf(v[3], CDDM_get_vert(dm,mface->v4)->co);
+			MeanValueWeights(v, 4, nearest.co, pa->fuv);
+		}
+		else
+			MeanValueWeights(v, 3, nearest.co, pa->fuv);
+
+		pa->num = nearest.index;
+		pa->num_dmcache = psys_particle_dm_face_lookup(ob,psmd->dm,pa->num,pa->fuv,NULL);
+		
+		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
+		Mat4Invert(imat,hairmat);
+
+		VECSUB(vec, nearest.co, key->co);
+
+		if(point) {
+			ekey = point->keys;
+			point++;
+		}
+
+		for(k=0,key=pa->hair; k<pa->totkey; k++,key++) {
+			VECADD(key->co, key->co, vec);
+			Mat4MulVecfl(imat,key->co);
+
+			if(ekey) {
+				ekey->flag |= PEK_USE_WCO;
+				ekey++;
+			}
+		}
+	}
+
+	free_bvhtree_from_mesh(&bvhtree);
+	dm->release(dm);
+
+	psys_free_path_cache(psys, psys->edit);
+
+	psys->flag &= ~PSYS_GLOBAL_HAIR;
+
+	PE_update_object(scene, ob, 0);
+}
+
+static int connect_hair_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem);
+	ParticleSystem *psys= NULL;
+	int all = RNA_boolean_get(op->ptr, "all");
+
+	if(!ob)
+		return OPERATOR_CANCELLED;
+
+	if(all) {
+		for(psys=ob->particlesystem.first; psys; psys=psys->next) {
+			connect_hair(scene, ob, psys);
+		}
+	}
+	else {
+		psys = ptr.data;
+		connect_hair(scene, ob, psys);
+	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+
+	return OPERATOR_FINISHED;
+}
+
+void PARTICLE_OT_connect_hair(wmOperatorType *ot)
+{
+	ot->name= "Connect Hair";
+	ot->description= "Connect hair to the emitter mesh.";
+	ot->idname= "PARTICLE_OT_connect_hair";
+
+	ot->exec= connect_hair_exec;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "all", 0, "All hair", "Connect all hair systems to the emitter mesh");
+}
+
 /********************** render layer operators *********************/
 
 static int render_layer_add_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 5d1dbe47345..385f55b71c1 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -204,6 +204,8 @@ void buttons_operatortypes(void)
 	WM_operatortype_append(PARTICLE_OT_remove_target);
 	WM_operatortype_append(PARTICLE_OT_target_move_up);
 	WM_operatortype_append(PARTICLE_OT_target_move_down);
+	WM_operatortype_append(PARTICLE_OT_connect_hair);
+	WM_operatortype_append(PARTICLE_OT_disconnect_hair);
 
 	WM_operatortype_append(SCENE_OT_render_layer_add);
 	WM_operatortype_append(SCENE_OT_render_layer_remove);
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 25ff1244254..57e7d897e24 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3749,7 +3749,6 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 	nosel_col[1]=(float)nosel[1]/255.0f;
 	nosel_col[2]=(float)nosel[2]/255.0f;
 
-
 	/* draw paths */
 	if(timed) {
 		glEnable(GL_BLEND);
@@ -3758,24 +3757,16 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 	}
 
 	glEnableClientState(GL_VERTEX_ARRAY);
-
-	/* solid shaded with lighting */
-	glEnableClientState(GL_NORMAL_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
 	glEnableClientState(GL_COLOR_ARRAY);
 
 	glEnable(GL_COLOR_MATERIAL);
 	glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 
-	/* only draw child paths with lighting */
-	if(dt > OB_WIRE)
-		glEnable(GL_LIGHTING);
-
-	/* draw paths without lighting */
 	cache=edit->pathcache;
 	for(i=0; i<totpoint; i++){
 		path = cache[i];
 		glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
-		glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
 
 		if(timed) {
 			for(k=0, pcol=pathcol, pkey=path; k<steps; k++, pkey++, pcol+=4){
@@ -3796,9 +3787,6 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 
 	/* draw edit vertices */
 	if(pset->selectmode!=SCE_SELECT_PATH){
-		glDisableClientState(GL_NORMAL_ARRAY);
-		glEnableClientState(GL_COLOR_ARRAY);
-		glDisable(GL_LIGHTING);
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 
 		if(pset->selectmode==SCE_SELECT_POINT){
@@ -3810,7 +3798,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 				if(!(point->flag & PEP_HIDE))
 					totkeys += point->totkey;
 
-			if(!edit->psys)
+			if(!(edit->points->keys->flag & PEK_USE_WCO))
 				pd=pdata=MEM_callocN(totkeys*3*sizeof(float), "particle edit point data");
 			cd=cdata=MEM_callocN(totkeys*(timed?4:3)*sizeof(float), "particle edit color data");
 
@@ -3843,7 +3831,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 				if(point->flag & PEP_HIDE)
 					continue;
 
-				if(edit->psys)
+				if(point->keys->flag & PEK_USE_WCO)
 					glVertexPointer(3, GL_FLOAT, sizeof(PTCacheEditKey), point->keys->world_co);
 				else
 					glVertexPointer(3, GL_FLOAT, 3*sizeof(float), pd);
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 2283d36e018..b6159cf4314 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -1760,17 +1760,17 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 
 	case B_SEL_PATH:
 		ts->particle.selectmode= SCE_SELECT_PATH;
-		WM_event_add_notifier(C, NC_OBJECT, ob);
+		WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 		ED_undo_push(C, "Selectmode Set: Path");
 		break;
 	case B_SEL_POINT:
 		ts->particle.selectmode = SCE_SELECT_POINT;
-		WM_event_add_notifier(C, NC_OBJECT, ob);
+		WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 		ED_undo_push(C, "Selectmode Set: Point");
 		break;
 	case B_SEL_END:
 		ts->particle.selectmode = SCE_SELECT_END;
-		WM_event_add_notifier(C, NC_OBJECT, ob);
+		WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 		ED_undo_push(C, "Selectmode Set: End point");
 		break;	
 	
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 0fce9592d1d..3f32b707043 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1690,11 +1690,11 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 
 		if(!(point->flag & PEP_TRANSFORM)) continue;
 
-		if(psys)
+		if(psys && !(psys->flag & PSYS_GLOBAL_HAIR))
 			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + i, mat);
 
 		for(k=0, key=point->keys; k<point->totkey; k++, key++) {
-			if(psys) {
+			if(key->flag & PEK_USE_WCO) {
 				VECCOPY(key->world_co, key->co);
 				Mat4MulVecfl(mat, key->world_co);
 				td->loc = key->world_co;
@@ -1714,7 +1714,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 			Mat3One(td->smtx);
 
 			/* don't allow moving roots */
-			if(k==0 && pset->flag & PE_LOCK_FIRST)
+			if(k==0 && pset->flag & PE_LOCK_FIRST && (!psys || !(psys->flag & PSYS_GLOBAL_HAIR)))
 				td->protectflag |= OB_LOCK_LOC;
 
 			td->ob = ob;
@@ -1764,7 +1764,7 @@ void flushTransParticles(TransInfo *t)
 	for(i=0, point=edit->points; i<edit->totpoint; i++, point++, td++) {
 		if(!(point->flag & PEP_TRANSFORM)) continue;
 
-		if(psys) {
+		if(psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
 			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + i, mat);
 			Mat4Invert(imat,mat);
 
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 4a23605c717..71b953effdf 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -1884,6 +1884,11 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "softflag", OB_SB_ENABLE);
 	RNA_def_property_ui_text(prop, "Use Soft Body", "Enable use of soft body for hair physics simulation.");
 
+	prop= RNA_def_property(srna, "global_hair", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_GLOBAL_HAIR);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Global Hair", "Hair keys are in global coordinate space");
+
 	/* reactor */
 	prop= RNA_def_property(srna, "reactor_target_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "target_ob");
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 5575b170398..ab4b27cea7b 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -107,7 +107,7 @@ static void rna_ParticleEdit_redo(bContext *C, PointerRNA *ptr)
 	if(!edit)
 		return;
 
-	psys_free_path_cache(NULL, edit);
+	psys_free_path_cache(edit->psys, edit);
 }
 
 static void rna_ParticleEdit_update(bContext *C, PointerRNA *ptr)
@@ -410,7 +410,7 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "fade_time", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_FADE_TIME);
 	RNA_def_property_ui_text(prop, "Fade Time", "Fade paths and keys further away from current frame.");
-	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_update");
 
 	prop= RNA_def_property(srna, "auto_velocity", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_AUTO_VELOCITY);
@@ -443,18 +443,18 @@ static void rna_def_particle_edit(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "draw_step", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 2, 10);
 	RNA_def_property_ui_text(prop, "Steps", "How many steps to draw the path with.");
-	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_redo");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_redo");
 
 	prop= RNA_def_property(srna, "fade_frames", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 2, 100);
 	RNA_def_property_ui_text(prop, "Frames", "How many frames to fade.");
-	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_update");
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "edittype");
 	RNA_def_property_enum_items(prop, edit_type_items);
 	RNA_def_property_ui_text(prop, "Type", "");
-	RNA_def_property_update(prop, NC_OBJECT, "rna_ParticleEdit_redo");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_redo");
 
 	prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_ParticleEdit_editable_get", NULL);

From 75407a4ecceb701c9cc760768f5b58f2d099727b Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sat, 5 Sep 2009 22:39:42 +0000
Subject: [PATCH 449/577] == SCons == * makesrna and makesdna now use CFLAGS,
 CCFLAGS and Linking flags as specified in config.   This might help with
 cross-compile on OSX 10.6 (32bit on 64bit). devroo & jensverwiebe, please
 test and report.

---
 source/blender/makesdna/intern/SConscript | 3 +++
 source/blender/makesrna/intern/SConscript | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 1c716019e80..120398791a8 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -34,6 +34,9 @@ if not USE_WINE:
 if sys.platform != 'cygwin':
 	makesdna_tool.Append (CCFLAGS = cflags)
 makesdna_tool.Append (CPPDEFINES = defines)
+makesdna_tool.Append( CFLAGS = env['CFLAGS'])
+makesdna_tool.Append( CCFLAGS = env['CCFLAGS'])
+makesdna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
 targetdir = normpath(root_build_dir+'/lib')
 
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index a24c25b8b95..9234efa2a5d 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -6,7 +6,7 @@ def normpath(path):
 	return os.path.abspath(os.path.normpath(path))
 
 Import ('env')
-cflags = '-Wall'
+cflags = ['-Wall']
 defines = []
 root_build_dir=normpath(env['BF_BUILDDIR'])
 
@@ -96,6 +96,10 @@ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
 
 makesrna_tool.Append (LIBPATH = libdir)
 
+makesrna_tool.Append( CFLAGS = env['CFLAGS'])
+makesrna_tool.Append( CCFLAGS = env['CCFLAGS'])
+makesrna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
+
 if env['BF_PROFILE']:
 	makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])
 

From c9dd69c11a639aece463dac9018e88dede4b9515 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 6 Sep 2009 00:19:15 +0000
Subject: [PATCH 450/577] remove MTC_ functions, (don't merge)

replacements...
MTC_cross3Float -> Crossf
MTC_diff3Float -> VecSubf
MTC_dot3Float -> Inpf
MTC_Mat3CpyMat4 -> Mat3CpyMat4
MTC_Mat3MulVecd -> Mat3MulVecd
MTC_Mat3MulVecfl -> Mat3MulVecfl
MTC_Mat4CpyMat4 -> Mat4CpyMat4
MTC_Mat4Invert -> Mat4Invert
MTC_Mat4Mul3Vecfl -> Mat4Mul3Vecfl
MTC_Mat4MulMat4 -> Mat4MulMat4
MTC_Mat4MulSerie -> Mat4MulSerie
MTC_Mat4MulVec4fl -> Mat4MulVec4fl
MTC_Mat4MulVecfl -> Mat4MulVecfl
MTC_Mat4One -> Mat4One
MTC_Mat4Ortho -> Mat4Ortho
MTC_Mat4SwapMat4 -> Mat4SwapMat4
---
 source/blender/blenkernel/intern/modifier.c   |  34 +-
 source/blender/blenkernel/intern/texture.c    |   2 +-
 source/blender/blenlib/MTC_matrixops.h        | 162 -------
 source/blender/blenlib/MTC_vectorops.h        |  58 ---
 source/blender/blenlib/intern/matrixops.c     | 438 ------------------
 source/blender/blenlib/intern/vectorops.c     | 166 -------
 .../nodes/intern/TEX_nodes/TEX_rotate.c       |   8 +-
 source/blender/python/api2_2x/Effect.c        |   2 +-
 .../render/intern/source/convertblender.c     | 102 ++--
 source/blender/render/intern/source/envmap.c  |  80 ++--
 .../blender/render/intern/source/initrender.c |   2 +-
 .../render/intern/source/pixelshading.c       |  12 +-
 source/blender/render/intern/source/shadbuf.c |  16 +-
 .../blender/render/intern/source/shadeinput.c |  14 +-
 .../render/intern/source/shadeoutput.c        |   8 +-
 source/blender/render/intern/source/texture.c |  36 +-
 source/blender/render/intern/source/zbuf.c    |   4 +-
 source/blender/src/drawobject.c               |   6 +-
 source/blender/src/editface.c                 |   2 +-
 source/blender/src/editfont.c                 |   2 +-
 source/blender/src/editmesh_mods.c            |   2 +-
 source/blender/src/editmesh_tools.c           |   2 +-
 source/blender/src/fluidsim.c                 |   4 +-
 source/blender/src/previewrender.c            |   2 +-
 source/blender/src/vpaint.c                   |  10 +-
 source/blender/yafray/intern/export_File.cpp  |  39 +-
 .../blender/yafray/intern/export_Plugin.cpp   |  38 +-
 .../blender/yafray/intern/yafray_Render.cpp   |   2 +-
 source/blender/yafray/intern/yafray_Render.h  |   3 +-
 29 files changed, 216 insertions(+), 1040 deletions(-)
 delete mode 100644 source/blender/blenlib/MTC_matrixops.h
 delete mode 100644 source/blender/blenlib/MTC_vectorops.h
 delete mode 100644 source/blender/blenlib/intern/matrixops.c
 delete mode 100644 source/blender/blenlib/intern/vectorops.c

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index fa2f857cc8b..77d54125564 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -72,8 +72,8 @@
 
 #include "BLI_editVert.h"
 
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
+
+
 
 #include "BKE_main.h"
 #include "BKE_anim.h"
@@ -1182,7 +1182,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 	if(amd->end_cap && amd->end_cap != ob)
 		end_cap = mesh_get_derived_final(amd->end_cap, CD_MASK_MESH);
 
-	MTC_Mat4One(offset);
+	Mat4One(offset);
 
 	indexMap = MEM_callocN(sizeof(*indexMap) * dm->getNumVerts(dm),
 			       "indexmap");
@@ -1204,14 +1204,14 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 		float result_mat[4][4];
 
 		if(ob)
-			MTC_Mat4Invert(obinv, ob->obmat);
+			Mat4Invert(obinv, ob->obmat);
 		else
-			MTC_Mat4One(obinv);
+			Mat4One(obinv);
 
-		MTC_Mat4MulSerie(result_mat, offset,
+		Mat4MulSerie(result_mat, offset,
 				 obinv, amd->offset_ob->obmat,
      NULL, NULL, NULL, NULL, NULL);
-		MTC_Mat4CpyMat4(offset, result_mat);
+		Mat4CpyMat4(offset, result_mat);
 	}
 
 	if(amd->fit_type == MOD_ARR_FITCURVE && amd->curve_ob) {
@@ -1236,7 +1236,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 	prescribed length */
 	if(amd->fit_type == MOD_ARR_FITLENGTH
 		  || amd->fit_type == MOD_ARR_FITCURVE) {
-		float dist = sqrt(MTC_dot3Float(offset[3], offset[3]));
+		float dist = sqrt(Inpf(offset[3], offset[3]));
 
 		if(dist > 1e-6f)
 			/* this gives length = first copy start to last copy end
@@ -1269,11 +1269,11 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 		  result = CDDM_from_template(dm, finalVerts, finalEdges, finalFaces);
 
 		  /* calculate the offset matrix of the final copy (for merging) */ 
-		  MTC_Mat4One(final_offset);
+		  Mat4One(final_offset);
 
 		  for(j=0; j < count - 1; j++) {
-			  MTC_Mat4MulMat4(tmp_mat, final_offset, offset);
-			  MTC_Mat4CpyMat4(final_offset, tmp_mat);
+			  Mat4MulMat4(tmp_mat, final_offset, offset);
+			  Mat4CpyMat4(final_offset, tmp_mat);
 		  }
 
 		  numVerts = numEdges = numFaces = 0;
@@ -1309,7 +1309,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 			  if((count > 1) && (amd->flags & MOD_ARR_MERGE)) {
 				  float tmp_co[3];
 				  VECCOPY(tmp_co, mv->co);
-				  MTC_Mat4MulVecfl(offset, tmp_co);
+				  Mat4MulVecfl(offset, tmp_co);
 
 				  for(j = 0; j < maxVerts; j++) {
 					  /* if vertex already merged, don't use it */
@@ -1324,7 +1324,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 						  if(amd->flags & MOD_ARR_MERGEFINAL) {
 							  VECCOPY(tmp_co, inMV->co);
 							  inMV = &src_mvert[i];
-							  MTC_Mat4MulVecfl(final_offset, tmp_co);
+							  Mat4MulVecfl(final_offset, tmp_co);
 							  if(VecLenCompare(tmp_co, inMV->co, amd->merge_dist))
 								  indexMap[i].merge_final = 1;
 						  }
@@ -1342,7 +1342,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 					  *mv2 = *mv;
 					  numVerts++;
 
-					  MTC_Mat4MulVecfl(offset, co);
+					  Mat4MulVecfl(offset, co);
 					  VECCOPY(mv2->co, co);
 				  }
 			  } else if(indexMap[i].merge != i && indexMap[i].merge_final) {
@@ -3174,7 +3174,7 @@ static void tag_and_count_extra_edges(SmoothMesh *mesh, float split_angle,
 							 /* we know the edge has 2 faces, so check the angle */
 							 SmoothFace *face1 = edge->faces->link;
 							 SmoothFace *face2 = edge->faces->next->link;
-							 float edge_angle_cos = MTC_dot3Float(face1->normal,
+							 float edge_angle_cos = Inpf(face1->normal,
 									 face2->normal);
 
 							 if(edge_angle_cos < threshold) {
@@ -4042,11 +4042,11 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
 				/* find the projector which the face points at most directly
 				* (projector normal with largest dot product is best)
 				*/
-				best_dot = MTC_dot3Float(projectors[0].normal, face_no);
+				best_dot = Inpf(projectors[0].normal, face_no);
 				best_projector = &projectors[0];
 
 				for(j = 1; j < num_projectors; ++j) {
-					float tmp_dot = MTC_dot3Float(projectors[j].normal,
+					float tmp_dot = Inpf(projectors[j].normal,
 							face_no);
 					if(tmp_dot > best_dot) {
 						best_dot = tmp_dot;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 52b88de06e0..be005af7827 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -38,7 +38,7 @@
 
 #include "PIL_dynlib.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
diff --git a/source/blender/blenlib/MTC_matrixops.h b/source/blender/blenlib/MTC_matrixops.h
deleted file mode 100644
index 2bc644be564..00000000000
--- a/source/blender/blenlib/MTC_matrixops.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * matrixops.h
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef MATRIXOPS_H
-#define MATRIXOPS_H 
-
-#ifdef __cplusplus
-extern "C" { 
-#endif
-
-/* ------------------------------------------------------------------------- */
-/* need rewriting: */
-/**
- * copy the left upp3 3 by 3 of m2 to m1
- */
-void MTC_Mat3CpyMat4(float m1[][3], float m2[][4]);
-
-/* ------------------------------------------------------------------------- */
-/* operations based on 4 by 4 matrices */
-
-/**
- * Copy m1 to m2
- */
-void MTC_Mat4CpyMat4(float m1[][4], float m2[][4]);
-
-/**
- * Multiply all matrices after the first, leave the result in the
- * first argument
- */
-void MTC_Mat4MulSerie(float answ[][4],
-					  float m1[][4], float m2[][4], float m3[][4],
-					  float m4[][4], float m5[][4], float m6[][4],
-					  float m7[][4], float m8[][4]);
-
-/**
- * m1 = m2 matprod m3
- */
-void MTC_Mat4MulMat4(float m1[][4], float m2[][4], float m3[][4]);
-
-/**
- * Do vec^t prod mat, result in vec. Ignore vec[3] (vec is a
- * float[3])
- */
-void MTC_Mat4MulVecfl(float mat[][4], float *vec);
-
-/**
- * Invert mat, result in inverse. Always returns 1
- */
-int MTC_Mat4Invert(float inverse[][4], float mat[][4]);
-
-/**
- * Make the set of mat orthonormal (mat should already be orthogonal)?
- * (doesn't appear to normalize properly?)
- */
-void MTC_Mat4Ortho(float mat[][4]);
-
-/**
- * vec = mat prod vec, result in vec, ignore fourth component entirely
- * (4th component is _not_ accessed!!! vec is 3d)
- */
-void MTC_Mat4Mul3Vecfl(float mat[][4], float *vec);
-
-/**
- * vec = mat prod vec, result in vec
- */
-void MTC_Mat4MulVec4fl(float mat[][4], float *vec);
-
-/**
- * Set <m> to the 4-D unity matrix
- */
-void MTC_Mat4One(float m[][4]);
-
-/**
- * Swap matrices m1 and m2
- */
-void MTC_Mat4SwapMat4(float m1[][4], float m2[][4]);
-
-/**
- * Copy m2 to the top-left 3x3 of m1, don't touch the remaining elements.
- */
-void MTC_Mat4CpyMat3nc(float m1[][4], float m2[][3]);
-
-/**
- * m1 = m2 * m3, but only the top-left 3x3
- */
-void MTC_Mat4MulMat33(float m1[][3], float m2[][4], float m3[][3]); 
-
-/* ------------------------------------------------------------------------- */
-/* Operations based on 3 by 3 matrices */
-/**
- * Do vec^t prod mat, result in vec.(vex is 3d)
- */
-void MTC_Mat3MulVecfl(float mat[][3], float *vec);
-
-/**
- * Copy m1 to m2
- */
-void MTC_Mat3CpyMat3(float m1[][3], float m2[][3]);
-
-/**
- * m1 = m2 prod m3
- */
-void MTC_Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3]);
-
-/**
- * vec = vec prod mat
- */
-void MTC_Mat3MulVecd(float mat[][3], double *vec);
-
-/**
- * Guess: invert matrix
- * result goes to m1
- */
-void MTC_Mat3Inv(float m1[][3], float m2[][3]);
-
-/**
- * Sort of a determinant matrix? Doesn't seem very adjoint to me...
- * result goes to m1
- */
-void MTC_Mat3Adj(float m1[][3], float m[][3]);
-
-/**
- * Set <m> to the 3D unity matrix
- */
-void MTC_Mat3One(float m[][3]);
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MATRIXOPS_H */
-
diff --git a/source/blender/blenlib/MTC_vectorops.h b/source/blender/blenlib/MTC_vectorops.h
deleted file mode 100644
index 4fec93b37b9..00000000000
--- a/source/blender/blenlib/MTC_vectorops.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * vectorops.h
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef VECTOROPS_H
-#define VECTOROPS_H 
-
-/* ------------------------------------------------------------------------- */
-
-void  MTC_diff3Int(int v1[3], int v2[3], int v3[3]);
-void  MTC_cross3Int(int v1[3], int v2[3], int v3[3]);
-int   MTC_dot3Int(int v1[3], int v2[3]); 
-
-void  MTC_diff3Float(float v1[3], float v2[3], float v3[3]);
-void  MTC_cross3Float(float v1[3], float v2[3], float v3[3]);
-float MTC_dot3Float(float v1[3], float v2[3]); 
-void  MTC_cp3Float(float v1[3], float v2[3]);
-/**
- * Copy vector with a minus sign (so a = -b)
- */
-void  MTC_cp3FloatInv(float v1[3], float v2[3]);
-
-void  MTC_swapInt(int *i1, int *i2);
-
-void  MTC_diff3DFF(double v1[3], float v2[3], float v3[3]);
-void  MTC_cross3Double(double v1[3], double v2[3], double v3[3]);
-float MTC_normalize3DF(float n[3]);
-
-/* ------------------------------------------------------------------------- */
-#endif /* VECTOROPS_H */
-
diff --git a/source/blender/blenlib/intern/matrixops.c b/source/blender/blenlib/intern/matrixops.c
deleted file mode 100644
index 0f9fc65f016..00000000000
--- a/source/blender/blenlib/intern/matrixops.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- *
- * Some matrix operations.
- *
- * Always use
- * - vector with x components :   float x[3], int x[3], etc
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/* ------------------------------------------------------------------------- */
-#include <string.h>
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
-/* ------------------------------------------------------------------------- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
-#include <strings.h>
-#endif
-
-#define ABS(x)	((x) < 0 ? -(x) : (x))
-#define SWAP(type, a, b)	{ type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
-
-void MTC_Mat4CpyMat4(float m1[][4], float m2[][4])
-{
-	memcpy(m1, m2, 4*4*sizeof(float));
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulSerie(float answ[][4],
-				  float m1[][4], float m2[][4], float m3[][4],
-				  float m4[][4], float m5[][4], float m6[][4],
-				  float m7[][4], float m8[][4])
-{
-	float temp[4][4];
-	
-	if(m1==0 || m2==0) return;
-	
-	MTC_Mat4MulMat4(answ, m2, m1);
-	if(m3) {
-		MTC_Mat4MulMat4(temp, m3, answ);
-		if(m4) {
-			MTC_Mat4MulMat4(answ, m4, temp);
-			if(m5) {
-				MTC_Mat4MulMat4(temp, m5, answ);
-				if(m6) {
-					MTC_Mat4MulMat4(answ, m6, temp);
-					if(m7) {
-						MTC_Mat4MulMat4(temp, m7, answ);
-						if(m8) {
-							MTC_Mat4MulMat4(answ, m8, temp);
-						}
-						else MTC_Mat4CpyMat4(answ, temp);
-					}
-				}
-				else MTC_Mat4CpyMat4(answ, temp);
-			}
-		}
-		else MTC_Mat4CpyMat4(answ, temp);
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_Mat4MulMat4(float m1[][4], float m2[][4], float m3[][4])
-{
-  /* matrix product: c[j][k] = a[j][i].b[i][k] */
-
-	m1[0][0] = m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0] + m2[0][3]*m3[3][0];
-	m1[0][1] = m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1] + m2[0][3]*m3[3][1];
-	m1[0][2] = m2[0][0]*m3[0][2] + m2[0][1]*m3[1][2] + m2[0][2]*m3[2][2] + m2[0][3]*m3[3][2];
-	m1[0][3] = m2[0][0]*m3[0][3] + m2[0][1]*m3[1][3] + m2[0][2]*m3[2][3] + m2[0][3]*m3[3][3];
-
-	m1[1][0] = m2[1][0]*m3[0][0] + m2[1][1]*m3[1][0] + m2[1][2]*m3[2][0] + m2[1][3]*m3[3][0];
-	m1[1][1] = m2[1][0]*m3[0][1] + m2[1][1]*m3[1][1] + m2[1][2]*m3[2][1] + m2[1][3]*m3[3][1];
-	m1[1][2] = m2[1][0]*m3[0][2] + m2[1][1]*m3[1][2] + m2[1][2]*m3[2][2] + m2[1][3]*m3[3][2];
-	m1[1][3] = m2[1][0]*m3[0][3] + m2[1][1]*m3[1][3] + m2[1][2]*m3[2][3] + m2[1][3]*m3[3][3];
-
-	m1[2][0] = m2[2][0]*m3[0][0] + m2[2][1]*m3[1][0] + m2[2][2]*m3[2][0] + m2[2][3]*m3[3][0];
-	m1[2][1] = m2[2][0]*m3[0][1] + m2[2][1]*m3[1][1] + m2[2][2]*m3[2][1] + m2[2][3]*m3[3][1];
-	m1[2][2] = m2[2][0]*m3[0][2] + m2[2][1]*m3[1][2] + m2[2][2]*m3[2][2] + m2[2][3]*m3[3][2];
-	m1[2][3] = m2[2][0]*m3[0][3] + m2[2][1]*m3[1][3] + m2[2][2]*m3[2][3] + m2[2][3]*m3[3][3];
-
-	m1[3][0] = m2[3][0]*m3[0][0] + m2[3][1]*m3[1][0] + m2[3][2]*m3[2][0] + m2[3][3]*m3[3][0];
-	m1[3][1] = m2[3][0]*m3[0][1] + m2[3][1]*m3[1][1] + m2[3][2]*m3[2][1] + m2[3][3]*m3[3][1];
-	m1[3][2] = m2[3][0]*m3[0][2] + m2[3][1]*m3[1][2] + m2[3][2]*m3[2][2] + m2[3][3]*m3[3][2];
-	m1[3][3] = m2[3][0]*m3[0][3] + m2[3][1]*m3[1][3] + m2[3][2]*m3[2][3] + m2[3][3]*m3[3][3];
-
-}
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulVecfl(float mat[][4], float *vec)
-{
-	float x,y;
-
-	x=vec[0]; 
-	y=vec[1];
-	vec[0]=x*mat[0][0] + y*mat[1][0] + mat[2][0]*vec[2] + mat[3][0];
-	vec[1]=x*mat[0][1] + y*mat[1][1] + mat[2][1]*vec[2] + mat[3][1];
-	vec[2]=x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2] + mat[3][2];
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_Mat3MulVecfl(float mat[][3], float *vec)
-{
-	float x,y;
-
-	x=vec[0]; 
-	y=vec[1];
-	vec[0]= x*mat[0][0] + y*mat[1][0] + mat[2][0]*vec[2];
-	vec[1]= x*mat[0][1] + y*mat[1][1] + mat[2][1]*vec[2];
-	vec[2]= x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-int MTC_Mat4Invert(float inverse[][4], float mat[][4])
-{
-	int i, j, k;
-	double temp;
-	float tempmat[4][4];
-	float max;
-	int maxj;
-
-	/* Set inverse to identity */
-	for (i=0; i<4; i++)
-		for (j=0; j<4; j++)
-			inverse[i][j] = 0;
-	for (i=0; i<4; i++)
-		inverse[i][i] = 1;
-
-	/* Copy original matrix so we don't mess it up */
-	for(i = 0; i < 4; i++)
-		for(j = 0; j <4; j++)
-			tempmat[i][j] = mat[i][j];
-
-	for(i = 0; i < 4; i++) {
-		/* Look for row with max pivot */
-		max = ABS(tempmat[i][i]);
-		maxj = i;
-		for(j = i + 1; j < 4; j++) {
-			if(ABS(tempmat[j][i]) > max) {
-				max = ABS(tempmat[j][i]);
-				maxj = j;
-			}
-		}
-		/* Swap rows if necessary */
-		if (maxj != i) {
-			for( k = 0; k < 4; k++) {
-				SWAP(float, tempmat[i][k], tempmat[maxj][k]);
-				SWAP(float, inverse[i][k], inverse[maxj][k]);
-			}
-		}
-
-		temp = tempmat[i][i];
-		if (temp == 0)
-			return 0;  /* No non-zero pivot */
-		for(k = 0; k < 4; k++) {
-			tempmat[i][k] /= temp;
-			inverse[i][k] /= temp;
-		}
-		for(j = 0; j < 4; j++) {
-			if(j != i) {
-				temp = tempmat[j][i];
-				for(k = 0; k < 4; k++) {
-					tempmat[j][k] -= tempmat[i][k]*temp;
-					inverse[j][k] -= inverse[i][k]*temp;
-				}
-			}
-		}
-	}
-	return 1;
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_Mat3CpyMat4(float m1[][3], float m2[][4])
-{
-	
-	m1[0][0]= m2[0][0];
-	m1[0][1]= m2[0][1];
-	m1[0][2]= m2[0][2];
-
-	m1[1][0]= m2[1][0];
-	m1[1][1]= m2[1][1];
-	m1[1][2]= m2[1][2];
-
-	m1[2][0]= m2[2][0];
-	m1[2][1]= m2[2][1];
-	m1[2][2]= m2[2][2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3CpyMat3(float m1[][3], float m2[][3])
-{	
-	memcpy(m1, m2, 3*3*sizeof(float));
-}
-
-/* ------------------------------------------------------------------------- */
-/*  void Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3]) */
-void MTC_Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3])
-{
-	/* be careful about this rewrite... */
-	    /* m1[i][j] = m2[i][k]*m3[k][j], args are flipped! */
-	m1[0][0]= m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0];
-	m1[0][1]= m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1];
-	m1[0][2]= m2[0][0]*m3[0][2] + m2[0][1]*m3[1][2] + m2[0][2]*m3[2][2];
-
-	m1[1][0]= m2[1][0]*m3[0][0] + m2[1][1]*m3[1][0] + m2[1][2]*m3[2][0];
-	m1[1][1]= m2[1][0]*m3[0][1] + m2[1][1]*m3[1][1] + m2[1][2]*m3[2][1];
-	m1[1][2]= m2[1][0]*m3[0][2] + m2[1][1]*m3[1][2] + m2[1][2]*m3[2][2];
-
-	m1[2][0]= m2[2][0]*m3[0][0] + m2[2][1]*m3[1][0] + m2[2][2]*m3[2][0];
-	m1[2][1]= m2[2][0]*m3[0][1] + m2[2][1]*m3[1][1] + m2[2][2]*m3[2][1];
-	m1[2][2]= m2[2][0]*m3[0][2] + m2[2][1]*m3[1][2] + m2[2][2]*m3[2][2];
-
-/*  	m1[0]= m2[0]*m3[0] + m2[1]*m3[3] + m2[2]*m3[6]; */
-/*  	m1[1]= m2[0]*m3[1] + m2[1]*m3[4] + m2[2]*m3[7]; */
-/*  	m1[2]= m2[0]*m3[2] + m2[1]*m3[5] + m2[2]*m3[8]; */
-/*  	m1+=3; */
-/*  	m2+=3; */
-/*  	m1[0]= m2[0]*m3[0] + m2[1]*m3[3] + m2[2]*m3[6]; */
-/*  	m1[1]= m2[0]*m3[1] + m2[1]*m3[4] + m2[2]*m3[7]; */
-/*  	m1[2]= m2[0]*m3[2] + m2[1]*m3[5] + m2[2]*m3[8]; */
-/*  	m1+=3; */
-/*  	m2+=3; */
-/*  	m1[0]= m2[0]*m3[0] + m2[1]*m3[3] + m2[2]*m3[6]; */
-/*  	m1[1]= m2[0]*m3[1] + m2[1]*m3[4] + m2[2]*m3[7]; */
-/*  	m1[2]= m2[0]*m3[2] + m2[1]*m3[5] + m2[2]*m3[8]; */
-} /* end of void Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3]) */
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4Ortho(float mat[][4])
-{
-	float len;
-	
-	len= MTC_normalize3DF(mat[0]);
-	if(len!=0.0) mat[0][3]/= len;
-	len= MTC_normalize3DF(mat[1]);
-	if(len!=0.0) mat[1][3]/= len;
-	len= MTC_normalize3DF(mat[2]);
-	if(len!=0.0) mat[2][3]/= len;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4Mul3Vecfl(float mat[][4], float *vec)
-{
-	float x,y;
-	/* vec = mat^T dot vec !!! or vec a row, then vec = vec dot mat*/
-
-	x= vec[0]; 
-	y= vec[1];
-	vec[0]= x*mat[0][0] + y*mat[1][0] + mat[2][0]*vec[2];
-	vec[1]= x*mat[0][1] + y*mat[1][1] + mat[2][1]*vec[2];
-	vec[2]= x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4One(float m[][4])
-{
-
-	m[0][0]= m[1][1]= m[2][2]= m[3][3]= 1.0;
-	m[0][1]= m[0][2]= m[0][3]= 0.0;
-	m[1][0]= m[1][2]= m[1][3]= 0.0;
-	m[2][0]= m[2][1]= m[2][3]= 0.0;
-	m[3][0]= m[3][1]= m[3][2]= 0.0;
-}
-
-
-/* ------------------------------------------------------------------------- */
-/* Result is a 3-vector!*/
-void MTC_Mat3MulVecd(float mat[][3], double *vec)
-{
-	double x,y;
-
-	/* vec = mat^T dot vec !!! or vec a row, then vec = vec dot mat*/
-	x=vec[0]; 
-	y=vec[1];
-	vec[0]= x * mat[0][0] + y * mat[1][0] + mat[2][0] * vec[2];
-	vec[1]= x * mat[0][1] + y * mat[1][1] + mat[2][1] * vec[2];
-	vec[2]= x * mat[0][2] + y * mat[1][2] + mat[2][2] * vec[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3Inv(float m1[][3], float m2[][3])
-{
-	short a,b;
-	float det;
-
-	/* first adjoint */
-	MTC_Mat3Adj(m1,m2);
-
-	/* then determinant old mat! */
-	det= m2[0][0]* (m2[1][1]*m2[2][2] - m2[1][2]*m2[2][1])
-	    -m2[1][0]* (m2[0][1]*m2[2][2] - m2[0][2]*m2[2][1])
-	    +m2[2][0]* (m2[0][1]*m2[1][2] - m2[0][2]*m2[1][1]);
-
-	if(det==0) det=1;
-	det= 1/det;
-	for(a=0;a<3;a++) {
-		for(b=0;b<3;b++) {
-			m1[a][b]*=det;
-		}
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3Adj(float m1[][3], float m[][3])
-{
-	m1[0][0]=m[1][1]*m[2][2]-m[1][2]*m[2][1];
-	m1[0][1]= -m[0][1]*m[2][2]+m[0][2]*m[2][1];
-	m1[0][2]=m[0][1]*m[1][2]-m[0][2]*m[1][1];
-
-	m1[1][0]= -m[1][0]*m[2][2]+m[1][2]*m[2][0];
-	m1[1][1]=m[0][0]*m[2][2]-m[0][2]*m[2][0];
-	m1[1][2]= -m[0][0]*m[1][2]+m[0][2]*m[1][0];
-
-	m1[2][0]=m[1][0]*m[2][1]-m[1][1]*m[2][0];
-	m1[2][1]= -m[0][0]*m[2][1]+m[0][1]*m[2][0];
-	m1[2][2]=m[0][0]*m[1][1]-m[0][1]*m[1][0];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3One(float m[][3])
-{
-
-	m[0][0]= m[1][1]= m[2][2]= 1.0;
-	m[0][1]= m[0][2]= 0.0;
-	m[1][0]= m[1][2]= 0.0;
-	m[2][0]= m[2][1]= 0.0;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4SwapMat4(float m1[][4], float m2[][4])
-{
-	float t;
-	int i, j;
-
-	for(i = 0; i < 4; i++) {
-		for (j = 0; j < 4; j++) {
-			t        = m1[i][j];
-			m1[i][j] = m2[i][j];
-			m2[i][j] = t;
-		}
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulVec4fl(float mat[][4], float *vec)
-{
-	float x,y,z;
-
-	x = vec[0]; 
-	y = vec[1]; 
-	z = vec[2];
-	vec[0] = x*mat[0][0] + y*mat[1][0] + z*mat[2][0] + mat[3][0]*vec[3];
-	vec[1] = x*mat[0][1] + y*mat[1][1] + z*mat[2][1] + mat[3][1]*vec[3];
-	vec[2] = x*mat[0][2] + y*mat[1][2] + z*mat[2][2] + mat[3][2]*vec[3];
-	vec[3] = x*mat[0][3] + y*mat[1][3] + z*mat[2][3] + mat[3][3]*vec[3];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4CpyMat3nc(float m1[][4], float m2[][3])	/* no clear */
-{
-	m1[0][0]= m2[0][0];
-	m1[0][1]= m2[0][1];
-	m1[0][2]= m2[0][2];
-
-	m1[1][0]= m2[1][0];
-	m1[1][1]= m2[1][1];
-	m1[1][2]= m2[1][2];
-
-	m1[2][0]= m2[2][0];
-	m1[2][1]= m2[2][1];
-	m1[2][2]= m2[2][2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulMat33(float m1[][3], float m2[][4], float m3[][3])
-{
-	/* m1_i_j = m2_i_k * m3_k_j ? */
-	
-	m1[0][0] = m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0];
-	m1[0][1] = m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1];
-	m1[0][2] = m2[0][0]*m3[0][2] + m2[0][1]*m3[1][2] + m2[0][2]*m3[2][2];
-
-	m1[1][0] = m2[1][0]*m3[0][0] + m2[1][1]*m3[1][0] + m2[1][2]*m3[2][0];
-	m1[1][1] = m2[1][0]*m3[0][1] + m2[1][1]*m3[1][1] + m2[1][2]*m3[2][1];
-	m1[1][2] = m2[1][0]*m3[0][2] + m2[1][1]*m3[1][2] + m2[1][2]*m3[2][2];
-
-	m1[2][0] = m2[2][0]*m3[0][0] + m2[2][1]*m3[1][0] + m2[2][2]*m3[2][0];
-	m1[2][1] = m2[2][0]*m3[0][1] + m2[2][1]*m3[1][1] + m2[2][2]*m3[2][1];
-	m1[2][2] = m2[2][0]*m3[0][2] + m2[2][1]*m3[1][2] + m2[2][2]*m3[2][2];
-
-}
-
-/* ------------------------------------------------------------------------- */
-
-/* eof */
diff --git a/source/blender/blenlib/intern/vectorops.c b/source/blender/blenlib/intern/vectorops.c
deleted file mode 100644
index 3bff5235cfd..00000000000
--- a/source/blender/blenlib/intern/vectorops.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *
- * Some vector operations.
- *
- * Always use
- * - vector with x components :   float x[3], int x[3], etc
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/* ------------------------------------------------------------------------- */
-/* General format: op(a, b, c): a = b op c                                   */
-/* Copying is done cp <from, to>                                             */
-/* ------------------------------------------------------------------------- */
-
-#include "MTC_vectorops.h"
-#include <math.h>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-void MTC_diff3Int(int v1[3], int v2[3], int v3[3])
-{
-	v1[0] = v2[0] - v3[0];
-	v1[1] = v2[1] - v3[1];
-	v1[2] = v2[2] - v3[2];
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_diff3Float(float v1[3], float v2[3], float v3[3])
-{
-	v1[0] = v2[0] - v3[0];
-	v1[1] = v2[1] - v3[1];
-	v1[2] = v2[2] - v3[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cross3Int(int v1[3], int v2[3], int v3[3])
-{
-	v1[0] = v2[1]*v3[2] - v2[2]*v3[1];
-	v1[1] = v2[2]*v3[0] - v2[0]*v3[2];
-	v1[2] = v2[0]*v3[1] - v2[1]*v3[0];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cross3Float(float v1[3], float v2[3], float v3[3])
-{
-	v1[0] = v2[1]*v3[2] - v2[2]*v3[1];
-	v1[1] = v2[2]*v3[0] - v2[0]*v3[2];
-	v1[2] = v2[0]*v3[1] - v2[1]*v3[0];
-}
-/* ------------------------------------------------------------------------- */
-
-void MTC_cross3Double(double v1[3], double v2[3], double v3[3])
-{
-	v1[0] = v2[1]*v3[2] - v2[2]*v3[1];
-	v1[1] = v2[2]*v3[0] - v2[0]*v3[2];
-	v1[2] = v2[0]*v3[1] - v2[1]*v3[0];
-}
-
-/* ------------------------------------------------------------------------- */
-
-int MTC_dot3Int(int v1[3], int v2[3])
-{
-	return (v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2]);
-}
-
-/* ------------------------------------------------------------------------- */
-
-float MTC_dot3Float(float v1[3], float v2[3])
-{
-	return (v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2]);
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cp3Float(float v1[3], float v2[3])
-{
-	v2[0] = v1[0];
-	v2[1] = v1[1];
-	v2[2] = v1[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cp3FloatInv(float v1[3], float v2[3])
-{
-	v2[0] = -v1[0];
-	v2[1] = -v1[1];
-	v2[2] = -v1[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_swapInt(int *i1, int *i2)
-{
-	int swap;
-	swap = *i1;
-	*i1 = *i2;
-	*i2 = swap;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void  MTC_diff3DFF(double v1[3], float v2[3], float v3[3])
-{
-	v1[0] = v2[0] - v3[0];
-	v1[1] = v2[1] - v3[1];
-	v1[2] = v2[2] - v3[2];
-}
-
-/* ------------------------------------------------------------------------- */
-float MTC_normalize3DF(float n[3])
-{
-	float d;
-	
-	d= n[0]*n[0]+n[1]*n[1]+n[2]*n[2];
-	/* FLT_EPSILON is too large! A larger value causes normalize errors in   */
-	/* a scaled down utah teapot                                             */
-	if(d>0.0000000000001) {
-
-		/* d= sqrt(d);  This _should_ be sqrt, but internally it's a double*/
-		/* anyway. This is safe.                                             */
-		d = sqrt(d);
-		
-		n[0]/=d; 
-		n[1]/=d; 
-		n[2]/=d;
-	} else {
-		n[0]=n[1]=n[2]= 0.0;
-		d= 0.0;
-	}
-	return d;
-}
-
-/* ------------------------------------------------------------------------- */
-
-/* eof */
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
index 3a2c2b1def1..9fcc9dcb90c 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
@@ -27,7 +27,7 @@
  */
 
 #include <math.h>
-#include "MTC_vectorops.h"
+
 #include "../TEX_util.h"
 
 static bNodeSocketType inputs[]= { 
@@ -64,19 +64,19 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
 	
 	if(magsq == 0) magsq = 1;
 	
-	ndx = MTC_dot3Float(coord, ax);
+	ndx = Inpf(coord, ax);
 	
 	para[0] = ax[0] * ndx * (1 - cos_a);
 	para[1] = ax[1] * ndx * (1 - cos_a);
 	para[2] = ax[2] * ndx * (1 - cos_a);
 	
-	MTC_diff3Float(perp, coord, para);
+	VecSubf(perp, coord, para);
 	
 	perp[0] = coord[0] * cos_a;
 	perp[1] = coord[1] * cos_a;
 	perp[2] = coord[2] * cos_a;
 	
-	MTC_cross3Float(cp, ax, coord);
+	Crossf(cp, ax, coord);
 	
 	cp[0] = cp[0] * sin_a;
 	cp[1] = cp[1] * sin_a;
diff --git a/source/blender/python/api2_2x/Effect.c b/source/blender/python/api2_2x/Effect.c
index 4d3dce741fc..1a37856a4d6 100644
--- a/source/blender/python/api2_2x/Effect.c
+++ b/source/blender/python/api2_2x/Effect.c
@@ -41,7 +41,7 @@
 #include "gen_utils.h"
 #include "blendef.h"
 #include "vector.h"
-#include "MTC_matrixops.h"
+
  
 #define EXPP_EFFECT_STA_MIN           -250.0f
 #define EXPP_EFFECT_END_MIN              1.0f
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 3c6b872a16d..24f4a6f7ad3 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -32,7 +32,7 @@
 #include <limits.h>
 
 #include "blendef.h"
-#include "MTC_matrixops.h"
+
 
 #include "MEM_guardedalloc.h"
 
@@ -203,8 +203,8 @@ void RE_make_stars(Render *re, void (*initfunc)(void),
 	if (re) re->flag |= R_HALO;
 	else stargrid *= 1.0;				/* then it draws fewer */
 	
-	if(re) MTC_Mat4Invert(mat, re->viewmat);
-	else MTC_Mat4One(mat);
+	if(re) Mat4Invert(mat, re->viewmat);
+	else Mat4One(mat);
 	
 	/* BOUNDING BOX CALCULATION
 		* bbox goes from z = loc_near_var | loc_far_var,
@@ -252,7 +252,7 @@ void RE_make_stars(Render *re, void (*initfunc)(void),
 					done++;
 				}
 				else {
-					MTC_Mat4MulVecfl(re->viewmat, vec);
+					Mat4MulVecfl(re->viewmat, vec);
 					
 					/* in vec are global coordinates
 					* calculate distance to camera
@@ -841,7 +841,7 @@ static void autosmooth(Render *re, ObjectRen *obr, float mat[][4], int degr)
 	/* rotate vertices and calculate normal of faces */
 	for(a=0; a<obr->totvert; a++) {
 		ver= RE_findOrAddVert(obr, a);
-		MTC_Mat4MulVecfl(mat, ver->co);
+		Mat4MulVecfl(mat, ver->co);
 	}
 	for(a=0; a<obr->totvlak; a++) {
 		vlr= RE_findOrAddVlak(obr, a);
@@ -1278,19 +1278,19 @@ static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, Particl
 
 	VECADD(vlr->v1->co, bb_center, xvec);
 	VECADD(vlr->v1->co, vlr->v1->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v1->co);
+	Mat4MulVecfl(re->viewmat, vlr->v1->co);
 
 	VECSUB(vlr->v2->co, bb_center, xvec);
 	VECADD(vlr->v2->co, vlr->v2->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v2->co);
+	Mat4MulVecfl(re->viewmat, vlr->v2->co);
 
 	VECSUB(vlr->v3->co, bb_center, xvec);
 	VECSUB(vlr->v3->co, vlr->v3->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v3->co);
+	Mat4MulVecfl(re->viewmat, vlr->v3->co);
 
 	VECADD(vlr->v4->co, bb_center, xvec);
 	VECSUB(vlr->v4->co, vlr->v4->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v4->co);
+	Mat4MulVecfl(re->viewmat, vlr->v4->co);
 
 	CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
 	VECCOPY(vlr->v1->n,vlr->n);
@@ -1581,8 +1581,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	}
 	
 /* 2.5 setup matrices */
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);	/* need to be that way, for imat texture */
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);	/* need to be that way, for imat texture */
 	Mat3CpyMat4(nmat, ob->imat);
 	Mat3Transp(nmat);
 
@@ -1854,7 +1854,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 				time= curlen/strandlen;
 
 				VECCOPY(loc,state.co);
-				MTC_Mat4MulVecfl(re->viewmat,loc);
+				Mat4MulVecfl(re->viewmat,loc);
 
 				if(strandbuf) {
 					VECCOPY(svert->co, loc);
@@ -1894,7 +1894,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 
 			VECCOPY(loc,state.co);
 			if(part->draw_as!=PART_DRAW_BB)
-				MTC_Mat4MulVecfl(re->viewmat,loc);
+				Mat4MulVecfl(re->viewmat,loc);
 
 			switch(part->draw_as) {
 				case PART_DRAW_LINE:
@@ -1903,7 +1903,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 					sd.size = hasize;
 
 					VECCOPY(vel,state.vel);
-					MTC_Mat4Mul3Vecfl(re->viewmat,vel);
+					Mat4Mul3Vecfl(re->viewmat,vel);
 					Normalize(vel);
 
 					if(part->draw & PART_DRAW_VEL_LENGTH)
@@ -1997,8 +1997,8 @@ static void make_render_halos(Render *re, ObjectRen *obr, Mesh *me, int totvert,
 	float vec[3], hasize, mat[4][4], imat[3][3];
 	int a, ok, seed= ma->seed1;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat3CpyMat4(imat, ob->imat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat3CpyMat4(imat, ob->imat);
 
 	re->flag |= R_HALO;
 
@@ -2009,7 +2009,7 @@ static void make_render_halos(Render *re, ObjectRen *obr, Mesh *me, int totvert,
 			hasize= ma->hasize;
 
 			VECCOPY(vec, mvert->co);
-			MTC_Mat4MulVecfl(mat, vec);
+			Mat4MulVecfl(mat, vec);
 
 			if(ma->mode & MA_HALOPUNO) {
 				xn= mvert->no[0];
@@ -2142,7 +2142,7 @@ static void displace_render_vert(Render *re, ObjectRen *obr, ShadeInput *shi, Ve
 	}
 	if (texco & TEXCO_GLOB) {
 		VECCOPY(shi->gl, shi->co);
-		MTC_Mat4MulVecfl(re->viewinv, shi->gl);
+		Mat4MulVecfl(re->viewinv, shi->gl);
 	}
 	if (texco & TEXCO_NORM) {
 		VECCOPY(shi->orn, shi->vn);
@@ -2282,9 +2282,9 @@ static void init_render_mball(Render *re, ObjectRen *obr)
 	if (ob!=find_basis_mball(ob))
 		return;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
-	MTC_Mat3CpyMat4(imat, ob->imat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
+	Mat3CpyMat4(imat, ob->imat);
 
 	ma= give_render_material(re, ob, 1);
 
@@ -2305,7 +2305,7 @@ static void init_render_mball(Render *re, ObjectRen *obr)
 
 		ver= RE_findOrAddVert(obr, obr->totvert++);
 		VECCOPY(ver->co, data);
-		MTC_Mat4MulVecfl(mat, ver->co);
+		Mat4MulVecfl(mat, ver->co);
 
 		/* render normals are inverted */
 		xn= -nors[0];
@@ -2389,7 +2389,7 @@ static int dl_surf_to_renderdata(ObjectRen *obr, DispList *dl, Material **matar,
 		if(orco) {
 			v1->orco= orco; orco+= 3; orcoret++;
 		}	
-		MTC_Mat4MulVecfl(mat, v1->co);
+		Mat4MulVecfl(mat, v1->co);
 		
 		for (v = 1; v < sizev; v++) {
 			ver= RE_findOrAddVert(obr, obr->totvert++);
@@ -2397,7 +2397,7 @@ static int dl_surf_to_renderdata(ObjectRen *obr, DispList *dl, Material **matar,
 			if(orco) {
 				ver->orco= orco; orco+= 3; orcoret++;
 			}	
-			MTC_Mat4MulVecfl(mat, ver->co);
+			Mat4MulVecfl(mat, ver->co);
 		}
 		/* if V-cyclic, add extra vertices at end of the row */
 		if (dl->flag & DL_CYCL_U) {
@@ -2547,8 +2547,8 @@ static void init_render_surf(Render *re, ObjectRen *obr)
 	nu= cu->nurb.first;
 	if(nu==0) return;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
 
 	/* material array */
 	memset(matar, 0, 4*32);
@@ -2609,8 +2609,8 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 	dl= cu->disp.first;
 	if(cu->disp.first==NULL) return;
 	
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
 
 	/* material array */
 	memset(matar, 0, 4*32);
@@ -2651,7 +2651,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 					ver->flag = 0;
 				}
 
-				MTC_Mat4MulVecfl(mat, ver->co);
+				Mat4MulVecfl(mat, ver->co);
 				
 				if (orco) {
 					ver->orco = orco;
@@ -2703,7 +2703,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 					ver= RE_findOrAddVert(obr, obr->totvert++);
 						
 					VECCOPY(ver->co, fp);
-					MTC_Mat4MulVecfl(mat, ver->co);
+					Mat4MulVecfl(mat, ver->co);
 					fp+= 3;
 
 					if (orco) {
@@ -2951,9 +2951,9 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 
 	me= ob->data;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
-	MTC_Mat3CpyMat4(imat, ob->imat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
+	Mat3CpyMat4(imat, ob->imat);
 
 	if(me->totvert==0)
 		return;
@@ -3046,7 +3046,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 			ver= RE_findOrAddVert(obr, obr->totvert++);
 			VECCOPY(ver->co, mvert->co);
 			if(do_autosmooth==0)	/* autosmooth on original unrotated data to prevent differences between frames */
-				MTC_Mat4MulVecfl(mat, ver->co);
+				Mat4MulVecfl(mat, ver->co);
   
 			if(orco) {
 				ver->orco= orco;
@@ -3267,13 +3267,13 @@ static void initshadowbuf(Render *re, LampRen *lar, float mat[][4])
 	shb->soft= lar->soft;
 	shb->shadhalostep= lar->shadhalostep;
 	
-	MTC_Mat4Ortho(mat);
-	MTC_Mat4Invert(shb->winmat, mat);	/* winmat is temp */
+	Mat4Ortho(mat);
+	Mat4Invert(shb->winmat, mat);	/* winmat is temp */
 	
 	/* matrix: combination of inverse view and lampmat */
 	/* calculate again: the ortho-render has no correct viewinv */
-	MTC_Mat4Invert(viewinv, re->viewmat);
-	MTC_Mat4MulMat4(shb->viewmat, viewinv, shb->winmat);
+	Mat4Invert(viewinv, re->viewmat);
+	Mat4MulMat4(shb->viewmat, viewinv, shb->winmat);
 	
 	/* projection */
 	shb->d= lar->clipsta;
@@ -3351,11 +3351,11 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 	BLI_addtail(&re->lampren, lar);
 	go->lampren= lar;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
 
-	MTC_Mat3CpyMat4(lar->mat, mat);
-	MTC_Mat3CpyMat4(lar->imat, ob->imat);
+	Mat3CpyMat4(lar->mat, mat);
+	Mat3CpyMat4(lar->imat, ob->imat);
 
 	lar->bufsize = la->bufsize;
 	lar->samp = la->samp;
@@ -3527,7 +3527,7 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 			lar->sh_invcampos[0]= -lar->co[0];
 			lar->sh_invcampos[1]= -lar->co[1];
 			lar->sh_invcampos[2]= -lar->co[2];
-			MTC_Mat3MulVecfl(lar->imat, lar->sh_invcampos);
+			Mat3MulVecfl(lar->imat, lar->sh_invcampos);
 
 			/* z factor, for a normalized volume */
 			angle= saacos(lar->spotsi);
@@ -4149,7 +4149,7 @@ static void set_dupli_tex_mat(Render *re, ObjectInstanceRen *obi, DupliObject *d
 
 		obi->duplitexmat= BLI_memarena_alloc(re->memArena, sizeof(float)*4*4);
 		Mat4Invert(imat, dob->mat);
-		MTC_Mat4MulSerie(obi->duplitexmat, re->viewmat, dob->omat, imat, re->viewinv, 0, 0, 0, 0);
+		Mat4MulSerie(obi->duplitexmat, re->viewmat, dob->omat, imat, re->viewinv, 0, 0, 0, 0);
 	}
 }
 
@@ -4273,8 +4273,8 @@ static void init_render_object(Render *re, Object *ob, Object *par, DupliObject
 	else if(render_object_type(ob->type))
 		add_render_object(re, ob, par, dob, timeoffset, vectorlay);
 	else {
-		MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-		MTC_Mat4Invert(ob->imat, mat);
+		Mat4MulMat4(mat, ob->obmat, re->viewmat);
+		Mat4Invert(ob->imat, mat);
 	}
 	
 	time= PIL_check_seconds_timer();
@@ -4516,8 +4516,8 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 	for(SETLOOPER(re->scene, base)) {
 		ob= base->object;
 		/* imat objects has to be done here, since displace can have texture using Object map-input */
-		MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-		MTC_Mat4Invert(ob->imat, mat);
+		Mat4MulMat4(mat, ob->obmat, re->viewmat);
+		Mat4Invert(ob->imat, mat);
 		/* each object should only be rendered once */
 		ob->flag &= ~OB_DONE;
 		ob->transflag &= ~OB_RENDER_DUPLI;
@@ -4663,8 +4663,8 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 	if(redoimat) {
 		for(SETLOOPER(re->scene, base)) {
 			ob= base->object;
-			MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-			MTC_Mat4Invert(ob->imat, mat);
+			Mat4MulMat4(mat, ob->obmat, re->viewmat);
+			Mat4Invert(ob->imat, mat);
 		}
 	}
 
@@ -5070,7 +5070,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
 		return 0;
 	
 	Mat4CpyMat4(mat, re->viewmat);
-	MTC_Mat4Invert(imat, mat);
+	Mat4Invert(imat, mat);
 
 	/* set first vertex OK */
 	if(!fss->meshSurfNormals) return 0;
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 13fa9b17b71..46669fd8f47 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -51,7 +51,7 @@
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 
-#include "MTC_matrixops.h"
+
 
 /* this module */
 #include "render_types.h"
@@ -209,9 +209,9 @@ static void envmap_transmatrix(float mat[][4], int part)
 		eul[2]= -M_PI/2.0;
 	}
 	
-	MTC_Mat4CpyMat4(tmat, mat);
+	Mat4CpyMat4(tmat, mat);
 	EulToMat4(eul, rotmat);
-	MTC_Mat4MulSerie(mat, tmat, rotmat,
+	Mat4MulSerie(mat, tmat, rotmat,
 					 0,   0,    0,
 					 0,   0,    0);
 }
@@ -229,12 +229,12 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 	int a;
 	
 	if(mode==0) {
-		MTC_Mat4Invert(tmat, mat);
-		MTC_Mat3CpyMat4(imat, tmat);
+		Mat4Invert(tmat, mat);
+		Mat3CpyMat4(imat, tmat);
 	}
 	else {
-		MTC_Mat4CpyMat4(tmat, mat);
-		MTC_Mat3CpyMat4(imat, mat);
+		Mat4CpyMat4(tmat, mat);
+		Mat3CpyMat4(imat, mat);
 	}
 
 	for(obi=re->instancetable.first; obi; obi=obi->next) {
@@ -265,7 +265,7 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 			if((a & 255)==0) har= obr->bloha[a>>8];
 			else har++;
 		
-			MTC_Mat4MulVecfl(tmat, har->co);
+			Mat4MulVecfl(tmat, har->co);
 		}
 	}
 	
@@ -278,22 +278,22 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 		Mat3CpyMat3(cmat, lar->imat); 
 		Mat3MulMat3(lar->imat, cmat, imat); 
 
-		MTC_Mat3MulVecfl(imat, lar->vec);
-		MTC_Mat4MulVecfl(tmat, lar->co);
+		Mat3MulVecfl(imat, lar->vec);
+		Mat4MulVecfl(tmat, lar->co);
 
 		lar->sh_invcampos[0]= -lar->co[0];
 		lar->sh_invcampos[1]= -lar->co[1];
 		lar->sh_invcampos[2]= -lar->co[2];
-		MTC_Mat3MulVecfl(lar->imat, lar->sh_invcampos);
+		Mat3MulVecfl(lar->imat, lar->sh_invcampos);
 		lar->sh_invcampos[2]*= lar->sh_zfac;
 		
 		if(lar->shb) {
 			if(mode==1) {
-				MTC_Mat4Invert(pmat, mat);
-				MTC_Mat4MulMat4(smat, pmat, lar->shb->viewmat);
-				MTC_Mat4MulMat4(lar->shb->persmat, smat, lar->shb->winmat);
+				Mat4Invert(pmat, mat);
+				Mat4MulMat4(smat, pmat, lar->shb->viewmat);
+				Mat4MulMat4(lar->shb->persmat, smat, lar->shb->winmat);
 			}
-			else MTC_Mat4MulMat4(lar->shb->persmat, lar->shb->viewmat, lar->shb->winmat);
+			else Mat4MulMat4(lar->shb->persmat, lar->shb->viewmat, lar->shb->winmat);
 		}
 	}
 	
@@ -371,8 +371,8 @@ static void env_set_imats(Render *re)
 	
 	base= G.scene->base.first;
 	while(base) {
-		MTC_Mat4MulMat4(mat, base->object->obmat, re->viewmat);
-		MTC_Mat4Invert(base->object->imat, mat);
+		Mat4MulMat4(mat, base->object->obmat, re->viewmat);
+		Mat4Invert(base->object->imat, mat);
 		
 		base= base->next;
 	}
@@ -391,18 +391,18 @@ static void render_envmap(Render *re, EnvMap *env)
 	short part;
 	
 	/* need a recalc: ortho-render has no correct viewinv */
-	MTC_Mat4Invert(oldviewinv, re->viewmat);
+	Mat4Invert(oldviewinv, re->viewmat);
 
 	envre= envmap_render_copy(re, env);
 	
 	/* precalc orthmat for object */
-	MTC_Mat4CpyMat4(orthmat, env->object->obmat);
-	MTC_Mat4Ortho(orthmat);
+	Mat4CpyMat4(orthmat, env->object->obmat);
+	Mat4Ortho(orthmat);
 	
 	/* need imat later for texture imat */
-	MTC_Mat4MulMat4(mat, orthmat, re->viewmat);
-	MTC_Mat4Invert(tmat, mat);
-	MTC_Mat3CpyMat4(env->obimat, tmat);
+	Mat4MulMat4(mat, orthmat, re->viewmat);
+	Mat4Invert(tmat, mat);
+	Mat3CpyMat4(env->obimat, tmat);
 
 	for(part=0; part<6; part++) {
 		if(env->type==ENV_PLANE && part!=1)
@@ -410,17 +410,17 @@ static void render_envmap(Render *re, EnvMap *env)
 		
 		re->display_clear(envre->result);
 		
-		MTC_Mat4CpyMat4(tmat, orthmat);
+		Mat4CpyMat4(tmat, orthmat);
 		envmap_transmatrix(tmat, part);
-		MTC_Mat4Invert(mat, tmat);
+		Mat4Invert(mat, tmat);
 		/* mat now is the camera 'viewmat' */
 
-		MTC_Mat4CpyMat4(envre->viewmat, mat);
-		MTC_Mat4CpyMat4(envre->viewinv, tmat);
+		Mat4CpyMat4(envre->viewmat, mat);
+		Mat4CpyMat4(envre->viewinv, tmat);
 		
 		/* we have to correct for the already rotated vertexcoords */
-		MTC_Mat4MulMat4(tmat, oldviewinv, envre->viewmat);
-		MTC_Mat4Invert(env->imat, tmat);
+		Mat4MulMat4(tmat, oldviewinv, envre->viewmat);
+		Mat4Invert(env->imat, tmat);
 		
 		env_rotate_scene(envre, tmat, 1);
 		init_render_world(envre);
@@ -501,13 +501,13 @@ void make_envmaps(Render *re)
 							float orthmat[4][4], mat[4][4], tmat[4][4];
 							
 							/* precalc orthmat for object */
-							MTC_Mat4CpyMat4(orthmat, env->object->obmat);
-							MTC_Mat4Ortho(orthmat);
+							Mat4CpyMat4(orthmat, env->object->obmat);
+							Mat4Ortho(orthmat);
 							
 							/* need imat later for texture imat */
-							MTC_Mat4MulMat4(mat, orthmat, re->viewmat);
-							MTC_Mat4Invert(tmat, mat);
-							MTC_Mat3CpyMat4(env->obimat, tmat);
+							Mat4MulMat4(mat, orthmat, re->viewmat);
+							Mat4Invert(tmat, mat);
+							Mat3CpyMat4(env->obimat, tmat);
 						}
 						else {
 							
@@ -676,20 +676,20 @@ int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexRe
 	
 	/* rotate to envmap space, if object is set */
 	VECCOPY(vec, texvec);
-	if(env->object) MTC_Mat3MulVecfl(env->obimat, vec);
-	else MTC_Mat4Mul3Vecfl(R.viewinv, vec);
+	if(env->object) Mat3MulVecfl(env->obimat, vec);
+	else Mat4Mul3Vecfl(R.viewinv, vec);
 	
 	face= envcube_isect(env, vec, sco);
 	ibuf= env->cube[face];
 	
 	if(osatex) {
 		if(env->object) {
-			MTC_Mat3MulVecfl(env->obimat, dxt);
-			MTC_Mat3MulVecfl(env->obimat, dyt);
+			Mat3MulVecfl(env->obimat, dxt);
+			Mat3MulVecfl(env->obimat, dyt);
 		}
 		else {
-			MTC_Mat4Mul3Vecfl(R.viewinv, dxt);
-			MTC_Mat4Mul3Vecfl(R.viewinv, dyt);
+			Mat4Mul3Vecfl(R.viewinv, dxt);
+			Mat4Mul3Vecfl(R.viewinv, dyt);
 		}
 		set_dxtdyt(dxts, dyts, dxt, dyt, face);
 		imagewraposa(tex, NULL, ibuf, sco, dxts, dyts, texres);
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 40c0edb6e5f..e5894606454 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -41,7 +41,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_jitter.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_camera_types.h"
 #include "DNA_group_types.h"
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c
index af6093ab36c..58101b5126a 100644
--- a/source/blender/render/intern/source/pixelshading.c
+++ b/source/blender/render/intern/source/pixelshading.c
@@ -32,8 +32,8 @@
 /* External modules: */
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
+
+
 
 #include "DNA_camera_types.h"
 #include "DNA_group_types.h"
@@ -153,7 +153,7 @@ static void render_lighting_halo(HaloRen *har, float *colf)
 					
 					/* rotate view to lampspace */
 					VECCOPY(lvrot, lv);
-					MTC_Mat3MulVecfl(lar->imat, lvrot);
+					Mat3MulVecfl(lar->imat, lvrot);
 					
 					x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
 					/* 1.0/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
@@ -545,7 +545,7 @@ void shadeSkyView(float *colf, float *rco, float *view, float *dxyview, short th
 		VECCOPY(lo, view);
 		if(R.wrld.skytype & WO_SKYREAL) {
 			
-			MTC_Mat3MulVecfl(R.imat, lo);
+			Mat3MulVecfl(R.imat, lo);
 			
 			SWAP(float, lo[1],  lo[2]);
 			
@@ -587,7 +587,7 @@ void shadeSunView(float *colf, float *view)
 				
 				VECCOPY(sview, view);
 				Normalize(sview);
-				MTC_Mat3MulVecfl(R.imat, sview);
+				Mat3MulVecfl(R.imat, sview);
 				if (sview[2] < 0.0)
 					sview[2] = 0.0;
 				Normalize(sview);
@@ -668,7 +668,7 @@ void shadeAtmPixel(struct SunSky *sunsky, float *collector, float fx, float fy,
 		
 	calc_view_vector(view, fx, fy);
 	Normalize(view);
-	/*MTC_Mat3MulVecfl(R.imat, view);*/
+	/*Mat3MulVecfl(R.imat, view);*/
 	AtmospherePixleShader(sunsky, view, distance, collector);
 }
 
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index c53a2b68c9c..cd7a0449d0e 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "MTC_matrixops.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_group_types.h"
@@ -403,7 +403,7 @@ void makeshadowbuf(Render *re, LampRen *lar)
 	wsize= shb->pixsize*(shb->size/2.0);
 	
 	i_window(-wsize, wsize, -wsize, wsize, shb->d, shb->clipend, shb->winmat);
-	MTC_Mat4MulMat4(shb->persmat, shb->viewmat, shb->winmat);
+	Mat4MulMat4(shb->persmat, shb->viewmat, shb->winmat);
 
 	if(ELEM(lar->buftype, LA_SHADBUF_REGULAR, LA_SHADBUF_HALFWAY)) {
 		/* jitter, weights - not threadsafe! */
@@ -673,7 +673,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
 	VECCOPY(co, rco);
 	co[3]= 1.0f;
 
-	MTC_Mat4MulVec4fl(shb->persmat, co);	/* rational hom co */
+	Mat4MulVec4fl(shb->persmat, co);	/* rational hom co */
 
 	xs1= siz*(1.0f+co[0]/co[3]);
 	ys1= siz*(1.0f+co[1]/co[3]);
@@ -714,7 +714,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
 	co[1]= rco[1]+dxco[1];
 	co[2]= rco[2]+dxco[2];
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
+	Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
 	dx[0]= xs1- siz*(1.0+co[0]/co[3]);
 	dx[1]= ys1- siz*(1.0+co[1]/co[3]);
 	
@@ -722,7 +722,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
 	co[1]= rco[1]+dyco[1];
 	co[2]= rco[2]+dyco[2];
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
+	Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
 	dy[0]= xs1- siz*(1.0+co[0]/co[3]);
 	dy[1]= ys1- siz*(1.0+co[1]/co[3]);
 	
@@ -858,7 +858,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
 	co[1]= p1[1];
 	co[2]= p1[2]/lar->sh_zfac;
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
+	Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
 	xf1= siz*(1.0+co[0]/co[3]);
 	yf1= siz*(1.0+co[1]/co[3]);
 	zf1= (co[2]/co[3]);
@@ -868,7 +868,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
 	co[1]= p2[1];
 	co[2]= p2[2]/lar->sh_zfac;
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
+	Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
 	xf2= siz*(1.0+co[0]/co[3]);
 	yf2= siz*(1.0+co[1]/co[3]);
 	zf2= (co[2]/co[3]);
@@ -1659,7 +1659,7 @@ static int viewpixel_to_lampbuf(ShadBuf *shb, ObjectInstanceRen *obi, VlakRen *v
 	}
 	
 	/* move 3d vector to lampbuf */
-	MTC_Mat4MulVec4fl(shb->persmat, hoco);	/* rational hom co */
+	Mat4MulVec4fl(shb->persmat, hoco);	/* rational hom co */
 	
 	/* clip We can test for -1.0/1.0 because of the properties of the
 	 * coordinate transformations. */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 1cd8ec110f9..7e3d906b035 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -29,7 +29,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "MTC_matrixops.h"
+
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
@@ -416,13 +416,13 @@ void shade_input_set_strand_texco(ShadeInput *shi, StrandRen *strand, StrandVert
 
 		if(texco & TEXCO_GLOB) {
 			VECCOPY(shi->gl, shi->co);
-			MTC_Mat4MulVecfl(R.viewinv, shi->gl);
+			Mat4MulVecfl(R.viewinv, shi->gl);
 			
 			if(shi->osatex) {
 				VECCOPY(shi->dxgl, shi->dxco);
-				MTC_Mat3MulVecfl(R.imat, shi->dxco);
+				Mat3MulVecfl(R.imat, shi->dxco);
 				VECCOPY(shi->dygl, shi->dyco);
-				MTC_Mat3MulVecfl(R.imat, shi->dyco);
+				Mat3MulVecfl(R.imat, shi->dyco);
 			}
 		}
 
@@ -974,12 +974,12 @@ void shade_input_set_shade_texco(ShadeInput *shi)
 		
 		if(texco & TEXCO_GLOB) {
 			VECCOPY(shi->gl, shi->co);
-			MTC_Mat4MulVecfl(R.viewinv, shi->gl);
+			Mat4MulVecfl(R.viewinv, shi->gl);
 			if(shi->osatex) {
 				VECCOPY(shi->dxgl, shi->dxco);
-				MTC_Mat3MulVecfl(R.imat, shi->dxco);
+				Mat3MulVecfl(R.imat, shi->dxco);
 				VECCOPY(shi->dygl, shi->dyco);
-				MTC_Mat3MulVecfl(R.imat, shi->dyco);
+				Mat3MulVecfl(R.imat, shi->dyco);
 			}
 		}
 		
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 2fbd93df0ce..4bdd0b69699 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -30,7 +30,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "MTC_matrixops.h"
+
 #include "BLI_arithb.h"
 
 #include "BKE_colortools.h"
@@ -168,7 +168,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens)
 		p1[0]= shi->co[0]-lar->co[0];
 		p1[1]= shi->co[1]-lar->co[1];
 		p1[2]= -lar->co[2];
-		MTC_Mat3MulVecfl(lar->imat, p1);
+		Mat3MulVecfl(lar->imat, p1);
 		VECCOPY(npos, p1);	// npos is double!
 		
 		/* pre-scale */
@@ -180,7 +180,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens)
 	
 	/* rotate view */
 	VECCOPY(nray, shi->view);
-	MTC_Mat3MulVecd(lar->imat, nray);
+	Mat3MulVecd(lar->imat, nray);
 	
 	if(R.wrld.mode & WO_MIST) {
 		/* patchy... */
@@ -1143,7 +1143,7 @@ float lamp_get_visibility(LampRen *lar, float *co, float *lv, float *dist)
 							
 							/* rotate view to lampspace */
 							VECCOPY(lvrot, lv);
-							MTC_Mat3MulVecfl(lar->imat, lvrot);
+							Mat3MulVecfl(lar->imat, lvrot);
 							
 							x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
 							/* 1.0f/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 007b69a9b97..3e8cf71605d 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "MTC_matrixops.h"
+
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
@@ -829,7 +829,7 @@ static int cubemap_glob(float *n, float x, float y, float z, float *adr1, float
 	else {
 		VECCOPY(nor, n);
 	}
-	MTC_Mat4Mul3Vecfl(R.viewinv, nor);
+	Mat4Mul3Vecfl(R.viewinv, nor);
 
 	x1= fabs(nor[0]);
 	y1= fabs(nor[1]);
@@ -922,7 +922,7 @@ static int cubemap_ob(Object *ob, float *n, float x, float y, float z, float *ad
 	if(n==NULL) return 0;
 	
 	VECCOPY(nor, n);
-	if(ob) MTC_Mat4Mul3Vecfl(ob->imat, nor);
+	if(ob) Mat4Mul3Vecfl(ob->imat, nor);
 	
 	x1= fabs(nor[0]);
 	y1= fabs(nor[1]);
@@ -1540,13 +1540,13 @@ void do_material_tex(ShadeInput *shi)
 					VECCOPY(tempvec, shi->co);
 					if(mtex->texflag & MTEX_OB_DUPLI_ORIG)
 						if(shi->obi && shi->obi->duplitexmat)
-							MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
-					MTC_Mat4MulVecfl(ob->imat, tempvec);
+							Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
+					Mat4MulVecfl(ob->imat, tempvec);
 					if(shi->osatex) {
 						VECCOPY(dxt, shi->dxco);
 						VECCOPY(dyt, shi->dyco);
-						MTC_Mat4Mul3Vecfl(ob->imat, dxt);
-						MTC_Mat4Mul3Vecfl(ob->imat, dyt);
+						Mat4Mul3Vecfl(ob->imat, dxt);
+						Mat4Mul3Vecfl(ob->imat, dyt);
 					}
 				}
 				else {
@@ -2237,7 +2237,7 @@ void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, f
 			case TEXCO_OBJECT:
 				if(mtex->object) {
 					VECCOPY(tempvec, lo);
-					MTC_Mat4MulVecfl(mtex->object->imat, tempvec);
+					Mat4MulVecfl(mtex->object->imat, tempvec);
 					co= tempvec;
 				}
 				break;
@@ -2245,16 +2245,16 @@ void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, f
 			case TEXCO_GLOB:
 				if(rco) {
 					VECCOPY(tempvec, rco);
-					MTC_Mat4MulVecfl(R.viewinv, tempvec);
+					Mat4MulVecfl(R.viewinv, tempvec);
 					co= tempvec;
 				}
 				else
 					co= lo;
 				
 //				VECCOPY(shi->dxgl, shi->dxco);
-//				MTC_Mat3MulVecfl(R.imat, shi->dxco);
+//				Mat3MulVecfl(R.imat, shi->dxco);
 //				VECCOPY(shi->dygl, shi->dyco);
-//				MTC_Mat3MulVecfl(R.imat, shi->dyco);
+//				Mat3MulVecfl(R.imat, shi->dyco);
 				break;
 			}
 			
@@ -2376,12 +2376,12 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
 					dx= dxt;
 					dy= dyt;
 					VECCOPY(tempvec, shi->co);
-					MTC_Mat4MulVecfl(ob->imat, tempvec);
+					Mat4MulVecfl(ob->imat, tempvec);
 					if(shi->osatex) {
 						VECCOPY(dxt, shi->dxco);
 						VECCOPY(dyt, shi->dyco);
-						MTC_Mat4Mul3Vecfl(ob->imat, dxt);
-						MTC_Mat4Mul3Vecfl(ob->imat, dyt);
+						Mat4Mul3Vecfl(ob->imat, dxt);
+						Mat4Mul3Vecfl(ob->imat, dyt);
 					}
 				}
 				else {
@@ -2392,12 +2392,12 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
 			else if(mtex->texco==TEXCO_GLOB) {
 				co= shi->gl; dx= shi->dxco; dy= shi->dyco;
 				VECCOPY(shi->gl, shi->co);
-				MTC_Mat4MulVecfl(R.viewinv, shi->gl);
+				Mat4MulVecfl(R.viewinv, shi->gl);
 			}
 			else if(mtex->texco==TEXCO_VIEW) {
 				
 				VECCOPY(tempvec, lavec);
-				MTC_Mat3MulVecfl(la->imat, tempvec);
+				Mat3MulVecfl(la->imat, tempvec);
 				
 				if(la->type==LA_SPOT) {
 					tempvec[0]*= la->spottexfac;
@@ -2410,8 +2410,8 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
 					VECCOPY(dxt, shi->dxlv);
 					VECCOPY(dyt, shi->dylv);
 					/* need some matrix conversion here? la->imat is a [3][3]  matrix!!! **/
-					MTC_Mat3MulVecfl(la->imat, dxt);
-					MTC_Mat3MulVecfl(la->imat, dyt);
+					Mat3MulVecfl(la->imat, dxt);
+					Mat3MulVecfl(la->imat, dyt);
 					
 					VecMulf(dxt, la->spottexfac);
 					VecMulf(dyt, la->spottexfac);
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 509ac81c58b..19ec0059a08 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -42,7 +42,7 @@
 #include "BLI_jitter.h"
 #include "BLI_threads.h"
 
-#include "MTC_matrixops.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_lamp_types.h"
@@ -2314,7 +2314,7 @@ void RE_zbufferall_radio(struct RadView *vw, RNode **rg_elem, int rg_totelem, Re
 	hashlist_projectvert(NULL, winmat, NULL);
 	
 	/* needed for projectvert */
-	MTC_Mat4MulMat4(winmat, vw->viewmat, vw->winmat);
+	Mat4MulMat4(winmat, vw->viewmat, vw->winmat);
 
 	/* 1.0f for clipping in clippyra()... bad stuff actually */
 	zbuf_alloc_span(&zspan, vw->rectx, vw->recty, 1.0f);
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index ef37b184a85..fddbadac22d 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -41,7 +41,7 @@
 #include "IMB_imbuf.h"
 
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
@@ -1040,7 +1040,7 @@ static void drawcamera(Object *ob, int flag)
 			Mat4Ortho(vec);
 			mymultmatrix(vec);
 
-			MTC_Mat4SwapMat4(G.vd->persmat, tmat);
+			Mat4SwapMat4(G.vd->persmat, tmat);
 			mygetsingmatrix(G.vd->persmat);
 
 			if(cam->flag & CAM_SHOWLIMITS) {
@@ -1053,7 +1053,7 @@ static void drawcamera(Object *ob, int flag)
 			if(cam->flag & CAM_SHOWMIST) 
 				if(wrld) draw_limit_line(wrld->miststa, wrld->miststa+wrld->mistdist, 0xFFFFFF);
 				
-			MTC_Mat4SwapMat4(G.vd->persmat, tmat);
+			Mat4SwapMat4(G.vd->persmat, tmat);
 		}
 	}
 }
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c
index f6a0b88cbc8..1430c6ad0d5 100644
--- a/source/blender/src/editface.c
+++ b/source/blender/src/editface.c
@@ -39,7 +39,7 @@
 #include "BLI_edgehash.h"
 #include "BLI_editVert.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c
index 682125dabb1..30097f9e786 100644
--- a/source/blender/src/editfont.c
+++ b/source/blender/src/editfont.c
@@ -42,7 +42,7 @@
 #include <io.h>
 #endif
 
-#include "MTC_matrixops.h"
+
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index 3dbbe7d7336..980478945cb 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -39,7 +39,7 @@ editmesh_mods.c, UI level access, no geometry changes
 
 #include "MEM_guardedalloc.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_mesh_types.h"
 #include "DNA_material_types.h"
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index 0fb072c1af4..4c72d7450b6 100644
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -106,7 +106,7 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 
 #include "editmesh.h"
 
-#include "MTC_vectorops.h"
+
 
 #include "PIL_time.h"
 
diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c
index 4be00b63ecb..c176ff7800e 100644
--- a/source/blender/src/fluidsim.c
+++ b/source/blender/src/fluidsim.c
@@ -57,7 +57,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
 #include "BLI_arithb.h"
-#include "MTC_matrixops.h"
+
 
 #include "BKE_customdata.h"
 #include "BKE_displist.h"
@@ -801,7 +801,7 @@ void fluidsimBake(struct Object *ob)
 	}
 
 	// init trafo matrix
-	MTC_Mat4CpyMat4(domainMat, fsDomain->obmat);
+	Mat4CpyMat4(domainMat, fsDomain->obmat);
 	if(!Mat4Invert(invDomMat, domainMat)) {
 		snprintf(debugStrBuffer,256,"fluidsimBake::error - Invalid obj matrix?\n"); 
 		elbeemDebugOut(debugStrBuffer);
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c
index 21be4b2cf49..98cdb99b6d2 100644
--- a/source/blender/src/previewrender.c
+++ b/source/blender/src/previewrender.c
@@ -47,7 +47,7 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_texture_types.h"
 #include "DNA_world_types.h"
diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index 8da5e1b2572..2b4c4b33ddf 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -43,7 +43,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
-#include "MTC_matrixops.h"
+
 
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
@@ -1204,7 +1204,7 @@ void weight_paint(void)
 				else totindex= 0;
 			}
 			
-			MTC_Mat4SwapMat4(G.vd->persmat, mat);
+			Mat4SwapMat4(G.vd->persmat, mat);
 			
 			if(Gwp.flag & VP_COLINDEX) {
 				for(index=0; index<totindex; index++) {
@@ -1313,7 +1313,7 @@ void weight_paint(void)
 				}
 			}
 			
-			MTC_Mat4SwapMat4(G.vd->persmat, mat);
+			Mat4SwapMat4(G.vd->persmat, mat);
 			
 		}
 		else BIF_wait_for_statechange();
@@ -1436,7 +1436,7 @@ void vertex_paint()
 				else totindex= 0;
 			}
 			
-			MTC_Mat4SwapMat4(G.vd->persmat, mat);
+			Mat4SwapMat4(G.vd->persmat, mat);
 			
 			if(Gvp.flag & VP_COLINDEX) {
 				for(index=0; index<totindex; index++) {
@@ -1497,7 +1497,7 @@ void vertex_paint()
 				}
 			}
 				
-			MTC_Mat4SwapMat4(G.vd->persmat, mat);
+			Mat4SwapMat4(G.vd->persmat, mat);
 			
 			do_shared_vertexcol(me);
 	
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index ea700965826..425ec66bab3 100644
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -6,6 +6,8 @@
 
 using namespace std;
 
+#define MTC_cp3Float(_a, _b)  VecCopyf(_b, _a)
+
 static string command_path = "";
 
 #ifdef WIN32 
@@ -20,7 +22,6 @@ static string command_path = "";
 #define FILE_MAXFILE 80
 #endif
 
-
 static string find_path()
 {
 	HKEY	hkey;
@@ -1036,10 +1037,10 @@ void yafrayFileRender_t::writeMaterialsAndModulators()
 					// In this case this means the inverse of that matrix
 					float texmat[4][4], itexmat[4][4];
 					if ((mtex->texco & TEXCO_OBJECT) && (mtex->object))
-						MTC_Mat4CpyMat4(texmat, mtex->object->obmat);
+						Mat4CpyMat4(texmat, mtex->object->obmat);
 					else	// also for refl. map
-						MTC_Mat4CpyMat4(texmat, maincam_obj->obmat);
-					MTC_Mat4Invert(itexmat, texmat);
+						Mat4CpyMat4(texmat, maincam_obj->obmat);
+					Mat4Invert(itexmat, texmat);
 					ostr << "\n\t\tm00=\"" << itexmat[0][0] << "\" m01=\"" << itexmat[1][0]
 							 << "\" m02=\"" << itexmat[2][0] << "\" m03=\"" << itexmat[3][0] << "\"\n";
 					ostr << "\t\tm10=\"" << itexmat[0][1] << "\" m11=\"" << itexmat[1][1]
@@ -1304,8 +1305,8 @@ void yafrayFileRender_t::writeObject(Object* obj, ObjectRen *obr, const vector<V
 	// for deformed objects, object->imat is no longer valid,
 	// so have to create inverse render matrix ourselves here
 	float mat[4][4], imat[4][4];
-	MTC_Mat4MulMat4(mat, obj->obmat, re->viewmat);
-	MTC_Mat4Invert(imat, mat);
+	Mat4MulMat4(mat, obj->obmat, re->viewmat);
+	Mat4Invert(imat, mat);
 
 	for (vector<VlakRen*>::const_iterator fci=VLR_list.begin();
 				fci!=VLR_list.end();++fci)
@@ -1319,7 +1320,7 @@ void yafrayFileRender_t::writeObject(Object* obj, ObjectRen *obr, const vector<V
 			vert_idx[vlr->v1] = vidx++;
 			ver = vlr->v1;
 			MTC_cp3Float(ver->co, tvec);
-			MTC_Mat4MulVecfl(imat, tvec);
+			Mat4MulVecfl(imat, tvec);
 			ostr << "\t\t\t<p x=\"" << tvec[0]
 			           << "\" y=\"" << tvec[1]
 			           << "\" z=\"" << tvec[2] << "\" />\n";
@@ -1340,7 +1341,7 @@ void yafrayFileRender_t::writeObject(Object* obj, ObjectRen *obr, const vector<V
 			vert_idx[vlr->v2] = vidx++;
 			ver = vlr->v2;
 			MTC_cp3Float(ver->co, tvec);
-			MTC_Mat4MulVecfl(imat, tvec);
+			Mat4MulVecfl(imat, tvec);
 			ostr << "\t\t\t<p x=\"" << tvec[0]
 			           << "\" y=\"" << tvec[1]
 			           << "\" z=\"" << tvec[2] << "\" />\n";
@@ -1361,7 +1362,7 @@ void yafrayFileRender_t::writeObject(Object* obj, ObjectRen *obr, const vector<V
 			vert_idx[vlr->v3] = vidx++;
 			ver = vlr->v3;
 			MTC_cp3Float(ver->co, tvec);
-			MTC_Mat4MulVecfl(imat, tvec);
+			Mat4MulVecfl(imat, tvec);
 			ostr << "\t\t\t<p x=\"" << tvec[0]
 			           << "\" y=\"" << tvec[1]
 			           << "\" z=\"" << tvec[2] << "\" />\n";
@@ -1382,7 +1383,7 @@ void yafrayFileRender_t::writeObject(Object* obj, ObjectRen *obr, const vector<V
 			vert_idx[vlr->v4] = vidx++;
 			ver = vlr->v4;
 			MTC_cp3Float(ver->co, tvec);
-			MTC_Mat4MulVecfl(imat, tvec);
+			Mat4MulVecfl(imat, tvec);
 			ostr << "\t\t\t<p x=\"" << tvec[0]
 			           << "\" y=\"" << tvec[1]
 			           << "\" z=\"" << tvec[2] << "\" />\n";
@@ -1532,7 +1533,7 @@ void yafrayFileRender_t::writeAllObjects()
 			for (int j=0;j<4;j++)
 				obmat[i][j] = dupMtx->second[(i<<2)+j];
 
-		MTC_Mat4Invert(imat, obmat);
+		Mat4Invert(imat, obmat);
 
 		// first object written as normal (but with transform of first duplivert)
 		Object* obj = dup_srcob[dupMtx->first];
@@ -1546,7 +1547,7 @@ void yafrayFileRender_t::writeAllObjects()
 				for (int j=0;j<4;j++)
 					nmat[i][j] = dupMtx->second[curmtx+(i<<2)+j];
 
-			MTC_Mat4MulMat4(cmat, imat, nmat);	// transform with respect to original = inverse_original * new
+			Mat4MulMat4(cmat, imat, nmat);	// transform with respect to original = inverse_original * new
 
 			ostr.str("");
 			// yafray matrix = transpose of Blender
@@ -1592,13 +1593,13 @@ void yafrayFileRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][4]
 	// transform area lamp coords back to world
 	float lpco[4][3];
 	MTC_cp3Float(a, lpco[0]);
-	MTC_Mat4MulVecfl(iview, lpco[0]);
+	Mat4MulVecfl(iview, lpco[0]);
 	MTC_cp3Float(b, lpco[1]);
-	MTC_Mat4MulVecfl(iview, lpco[1]);
+	Mat4MulVecfl(iview, lpco[1]);
 	MTC_cp3Float(c, lpco[2]);
-	MTC_Mat4MulVecfl(iview, lpco[2]);
+	Mat4MulVecfl(iview, lpco[2]);
 	MTC_cp3Float(d, lpco[3]);
-	MTC_Mat4MulVecfl(iview, lpco[3]);
+	Mat4MulVecfl(iview, lpco[3]);
 	ostr << "\t<a x=\""<< lpco[0][0] <<"\" y=\""<< lpco[0][1] <<"\" z=\"" << lpco[0][2] <<"\" />\n";
 	ostr << "\t<b x=\""<< lpco[1][0] <<"\" y=\""<< lpco[1][1] <<"\" z=\"" << lpco[1][2] <<"\" />\n";
 	ostr << "\t<c x=\""<< lpco[2][0] <<"\" y=\""<< lpco[2][1] <<"\" z=\"" << lpco[2][2] <<"\" />\n";
@@ -1618,7 +1619,7 @@ void yafrayFileRender_t::writeLamps()
 	float iview[4][4];
 	// re->viewinv != inv.re->viewmat because of possible ortho mode (see convertBlenderScene.c)
 	// have to invert it here
-	MTC_Mat4Invert(iview, re->viewmat);
+	Mat4Invert(iview, re->viewmat);
 	
 	// all lamps
 	for(go=(GroupObject *)re->lights.first; go; go= go->next, i++) {
@@ -1751,9 +1752,9 @@ void yafrayFileRender_t::writeLamps()
 		// transform lamp co & vec back to world
 		float lpco[3], lpvec[3];
 		MTC_cp3Float(lamp->co, lpco);
-		MTC_Mat4MulVecfl(iview, lpco);
+		Mat4MulVecfl(iview, lpco);
 		MTC_cp3Float(lamp->vec, lpvec);
-		MTC_Mat4Mul3Vecfl(iview, lpvec);
+		Mat4Mul3Vecfl(iview, lpvec);
 
 		// position, (==-blendir for sun/hemi)
 		if ((lamp->type==LA_SUN) || (lamp->type==LA_HEMI))
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index db9fb7ccc72..cabb90f44c4 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -6,6 +6,7 @@
 
 using namespace std;
 
+#define MTC_cp3Float(_a, _b)  VecCopyf(_b, _a)
 
 #ifdef WIN32 
 #define WIN32_SKIP_HKEY_PROTECTION
@@ -19,7 +20,6 @@ using namespace std;
 #define FILE_MAXFILE 80
 #endif
 
-
 static string find_path()
 {
 	HKEY	hkey;
@@ -939,10 +939,10 @@ void yafrayPluginRender_t::writeMaterialsAndModulators()
 					// In this case this means the inverse of that matrix
 					float texmat[4][4], itexmat[4][4];
 					if ((mtex->texco & TEXCO_OBJECT) && (mtex->object))
-						MTC_Mat4CpyMat4(texmat, mtex->object->obmat);
+						Mat4CpyMat4(texmat, mtex->object->obmat);
 					else	// also for refl. map
-						MTC_Mat4CpyMat4(texmat, maincam_obj->obmat);
-					MTC_Mat4Invert(itexmat, texmat);
+						Mat4CpyMat4(texmat, maincam_obj->obmat);
+					Mat4Invert(itexmat, texmat);
 #define flp yafray::parameter_t
 					params["m00"]=flp(itexmat[0][0]);  params["m01"]=flp(itexmat[1][0]);
 					params["m02"]=flp(itexmat[2][0]);  params["m03"]=flp(itexmat[3][0]);
@@ -1231,15 +1231,15 @@ void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vi
 	// for deformed objects, object->imat is no longer valid,
 	// so have to create inverse render matrix ourselves here
 	float mat[4][4], imat[4][4];
-	MTC_Mat4MulMat4(mat, obj->obmat, re->viewmat);
-	MTC_Mat4Invert(imat, mat);
+	Mat4MulMat4(mat, obj->obmat, re->viewmat);
+	Mat4Invert(imat, mat);
 
 	if (vert_idx.find(vlr->v1)==vert_idx.end()) 
 	{
 		vert_idx[vlr->v1] = vidx++;
 		ver = vlr->v1;
 		MTC_cp3Float(ver->co, tvec);
-		MTC_Mat4MulVecfl(imat, tvec);
+		Mat4MulVecfl(imat, tvec);
 		verts.push_back(yafray::point3d_t(tvec[0], tvec[1], tvec[2]));
 		// has_orco now an int, if 1 -> strand mapping, if 2 -> normal orco mapping
 		if (has_orco==1)
@@ -1252,7 +1252,7 @@ void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vi
 		vert_idx[vlr->v2] = vidx++;
 		ver = vlr->v2;
 		MTC_cp3Float(ver->co, tvec);
-		MTC_Mat4MulVecfl(imat, tvec);
+		Mat4MulVecfl(imat, tvec);
 		verts.push_back(yafray::point3d_t(tvec[0], tvec[1], tvec[2]));
 		// has_orco now an int, if 1 -> strand mapping, if 2 -> normal orco mapping
 		if (has_orco==1)
@@ -1265,7 +1265,7 @@ void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vi
 		vert_idx[vlr->v3] = vidx++;
 		ver = vlr->v3;
 		MTC_cp3Float(ver->co, tvec);
-		MTC_Mat4MulVecfl(imat, tvec);
+		Mat4MulVecfl(imat, tvec);
 		verts.push_back(yafray::point3d_t(tvec[0], tvec[1], tvec[2]));
 		// has_orco now an int, if 1 -> strand mapping, if 2 -> normal orco mapping
 		if (has_orco==1)
@@ -1278,7 +1278,7 @@ void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vi
 		vert_idx[vlr->v4] = vidx++;
 		ver = vlr->v4;
 		MTC_cp3Float(ver->co, tvec);
-		MTC_Mat4MulVecfl(imat, tvec);
+		Mat4MulVecfl(imat, tvec);
 		verts.push_back(yafray::point3d_t(tvec[0], tvec[1], tvec[2]));
 		// has_orco now an int, if 1 -> strand mapping, if 2 -> normal orco mapping
 		if (has_orco==1)
@@ -1414,7 +1414,7 @@ void yafrayPluginRender_t::writeAllObjects()
 		for (int i=0;i<4;i++)
 			for (int j=0;j<4;j++)
 				obmat[i][j] = dupMtx->second[(i<<2)+j];
-		MTC_Mat4Invert(imat, obmat);
+		Mat4Invert(imat, obmat);
 
 		// first object written as normal (but with transform of first duplivert)
 		Object* obj = dup_srcob[dupMtx->first];
@@ -1428,7 +1428,7 @@ void yafrayPluginRender_t::writeAllObjects()
 				for (int j=0;j<4;j++)
 					nmat[i][j] = dupMtx->second[curmtx+(i<<2)+j];
 
-			MTC_Mat4MulMat4(cmat, imat, nmat);	// transform with respect to original = inverse_original * new
+			Mat4MulMat4(cmat, imat, nmat);	// transform with respect to original = inverse_original * new
 
 			float mtr[4*4];
 			mtr[0*4+0]=cmat[0][0];  mtr[0*4+1]=cmat[1][0];  mtr[0*4+2]=cmat[2][0];  mtr[0*4+3]=cmat[3][0];
@@ -1475,13 +1475,13 @@ void yafrayPluginRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][
 	// transform area lamp coords back to world
 	float lpco[4][3];
 	MTC_cp3Float(a, lpco[0]);
-	MTC_Mat4MulVecfl(iview, lpco[0]);
+	Mat4MulVecfl(iview, lpco[0]);
 	MTC_cp3Float(b, lpco[1]);
-	MTC_Mat4MulVecfl(iview, lpco[1]);
+	Mat4MulVecfl(iview, lpco[1]);
 	MTC_cp3Float(c, lpco[2]);
-	MTC_Mat4MulVecfl(iview, lpco[2]);
+	Mat4MulVecfl(iview, lpco[2]);
 	MTC_cp3Float(d, lpco[3]);
-	MTC_Mat4MulVecfl(iview, lpco[3]);	
+	Mat4MulVecfl(iview, lpco[3]);	
 	params["a"] = yafray::parameter_t(yafray::point3d_t(lpco[0][0], lpco[0][1], lpco[0][2]));
 	params["b"] = yafray::parameter_t(yafray::point3d_t(lpco[1][0], lpco[1][1], lpco[1][2]));
 	params["c"] = yafray::parameter_t(yafray::point3d_t(lpco[2][0], lpco[2][1], lpco[2][2]));
@@ -1500,7 +1500,7 @@ void yafrayPluginRender_t::writeLamps()
 	float iview[4][4];
 	// re->viewinv != inv.re->viewmat because of possible ortho mode (see convertBlenderScene.c)
 	// have to invert it here
-	MTC_Mat4Invert(iview, re->viewmat);
+	Mat4Invert(iview, re->viewmat);
 
 	// all lamps
 	for(go=(GroupObject *)re->lights.first; go; go= go->next, i++)
@@ -1641,9 +1641,9 @@ void yafrayPluginRender_t::writeLamps()
 		// transform lamp co & vec back to world
 		float lpco[3], lpvec[3];
 		MTC_cp3Float(lamp->co, lpco);
-		MTC_Mat4MulVecfl(iview, lpco);
+		Mat4MulVecfl(iview, lpco);
 		MTC_cp3Float(lamp->vec, lpvec);
-		MTC_Mat4Mul3Vecfl(iview, lpvec);
+		Mat4Mul3Vecfl(iview, lpvec);
 
 		// position, (==-blendir for sun/hemi)
 		if ((lamp->type==LA_SUN) || (lamp->type==LA_HEMI))
diff --git a/source/blender/yafray/intern/yafray_Render.cpp b/source/blender/yafray/intern/yafray_Render.cpp
index 01da4683d71..97a3f3b518a 100644
--- a/source/blender/yafray/intern/yafray_Render.cpp
+++ b/source/blender/yafray/intern/yafray_Render.cpp
@@ -85,7 +85,7 @@ bool yafrayRender_t::getAllMatTexObs()
 		if(obi->flag & R_DUPLI_TRANSFORMED) {
 			// compute object matrix with dupli transform, need to transform
 			// obi->mat out of view space for it
-			MTC_Mat4MulSerie(mat, re->viewinv, obi->mat, re->viewmat, obi->obr->ob->obmat, 0, 0, 0, 0);
+			Mat4MulSerie(mat, re->viewinv, obi->mat, re->viewmat, obi->obr->ob->obmat, 0, 0, 0, 0);
 			addDupliMtx(obi->obr->ob, mat);
 		}
 	}
diff --git a/source/blender/yafray/intern/yafray_Render.h b/source/blender/yafray/intern/yafray_Render.h
index 43d2c6c602a..b3ab12e8ae9 100644
--- a/source/blender/yafray/intern/yafray_Render.h
+++ b/source/blender/yafray/intern/yafray_Render.h
@@ -29,8 +29,7 @@ extern "C" {
 #include "renderpipeline.h"
 
 /* useful matrix & vector operations */
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
+#include "BLI_arithb.h"
 
 #include "BLI_blenlib.h"
 

From d1c90f4bef6de71087cdcaaa6afd055e49bb893c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 6 Sep 2009 00:36:26 +0000
Subject: [PATCH 451/577] =?UTF-8?q?easier=20to=20re-apply=20the=20replacem?=
 =?UTF-8?q?ent=20table=20then=20merge=20from=202.4x=EF=BB=BF,=20same=20as?=
 =?UTF-8?q?=2023023?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 replacements...
 MTC_cross3Float -> Crossf
 MTC_diff3Float -> VecSubf
 MTC_dot3Float -> Inpf
 MTC_Mat3CpyMat4 -> Mat3CpyMat4
 MTC_Mat3MulVecd -> Mat3MulVecd
 MTC_Mat3MulVecfl -> Mat3MulVecfl
 MTC_Mat4CpyMat4 -> Mat4CpyMat4
 MTC_Mat4Invert -> Mat4Invert
 MTC_Mat4Mul3Vecfl -> Mat4Mul3Vecfl
 MTC_Mat4MulMat4 -> Mat4MulMat4
 MTC_Mat4MulSerie -> Mat4MulSerie
 MTC_Mat4MulVec4fl -> Mat4MulVec4fl
 MTC_Mat4MulVecfl -> Mat4MulVecfl
 MTC_Mat4One -> Mat4One
 MTC_Mat4Ortho -> Mat4Ortho
 MTC_Mat4SwapMat4 -> Mat4SwapMat4
---
 source/blender/blenkernel/intern/modifier.c   |  34 +-
 source/blender/blenkernel/intern/texture.c    |   2 +-
 source/blender/blenlib/MTC_matrixops.h        | 162 -------
 source/blender/blenlib/MTC_vectorops.h        |  58 ---
 source/blender/blenlib/intern/matrixops.c     | 438 ------------------
 source/blender/blenlib/intern/vectorops.c     | 166 -------
 source/blender/editors/mesh/editmesh_mods.c   |   2 +-
 .../editors/sculpt_paint/paint_vertex.c       |  10 +-
 .../blender/editors/space_view3d/drawobject.c |   6 +-
 .../blender/editors/space_view3d/drawvolume.c |   2 +-
 .../nodes/intern/TEX_nodes/TEX_rotate.c       |   8 +-
 .../render/intern/source/convertblender.c     | 102 ++--
 source/blender/render/intern/source/envmap.c  |  80 ++--
 .../blender/render/intern/source/initrender.c |   2 +-
 .../render/intern/source/pixelshading.c       |  12 +-
 source/blender/render/intern/source/shadbuf.c |  16 +-
 .../blender/render/intern/source/shadeinput.c |  18 +-
 .../render/intern/source/shadeoutput.c        |   8 +-
 source/blender/render/intern/source/texture.c |  44 +-
 source/blender/render/intern/source/zbuf.c    |   2 +-
 20 files changed, 174 insertions(+), 998 deletions(-)
 delete mode 100644 source/blender/blenlib/MTC_matrixops.h
 delete mode 100644 source/blender/blenlib/MTC_vectorops.h
 delete mode 100644 source/blender/blenlib/intern/matrixops.c
 delete mode 100644 source/blender/blenlib/intern/vectorops.c

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 9c8c43cc8cb..f06173264ee 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -73,8 +73,8 @@
 
 #include "BLI_editVert.h"
 
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
+
+
 
 #include "BKE_main.h"
 #include "BKE_anim.h"
@@ -1190,7 +1190,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 	if(amd->end_cap && amd->end_cap != ob)
 		end_cap = mesh_get_derived_final(scene, amd->end_cap, CD_MASK_MESH);
 
-	MTC_Mat4One(offset);
+	Mat4One(offset);
 
 	indexMap = MEM_callocN(sizeof(*indexMap) * dm->getNumVerts(dm),
 			       "indexmap");
@@ -1212,14 +1212,14 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 		float result_mat[4][4];
 
 		if(ob)
-			MTC_Mat4Invert(obinv, ob->obmat);
+			Mat4Invert(obinv, ob->obmat);
 		else
-			MTC_Mat4One(obinv);
+			Mat4One(obinv);
 
-		MTC_Mat4MulSerie(result_mat, offset,
+		Mat4MulSerie(result_mat, offset,
 				 obinv, amd->offset_ob->obmat,
      NULL, NULL, NULL, NULL, NULL);
-		MTC_Mat4CpyMat4(offset, result_mat);
+		Mat4CpyMat4(offset, result_mat);
 	}
 
 	if(amd->fit_type == MOD_ARR_FITCURVE && amd->curve_ob) {
@@ -1244,7 +1244,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 	prescribed length */
 	if(amd->fit_type == MOD_ARR_FITLENGTH
 		  || amd->fit_type == MOD_ARR_FITCURVE) {
-		float dist = sqrt(MTC_dot3Float(offset[3], offset[3]));
+		float dist = sqrt(Inpf(offset[3], offset[3]));
 
 		if(dist > 1e-6f)
 			/* this gives length = first copy start to last copy end
@@ -1277,11 +1277,11 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 		  result = CDDM_from_template(dm, finalVerts, finalEdges, finalFaces);
 
 		  /* calculate the offset matrix of the final copy (for merging) */ 
-		  MTC_Mat4One(final_offset);
+		  Mat4One(final_offset);
 
 		  for(j=0; j < count - 1; j++) {
-			  MTC_Mat4MulMat4(tmp_mat, final_offset, offset);
-			  MTC_Mat4CpyMat4(final_offset, tmp_mat);
+			  Mat4MulMat4(tmp_mat, final_offset, offset);
+			  Mat4CpyMat4(final_offset, tmp_mat);
 		  }
 
 		  numVerts = numEdges = numFaces = 0;
@@ -1317,7 +1317,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 			  if((count > 1) && (amd->flags & MOD_ARR_MERGE)) {
 				  float tmp_co[3];
 				  VECCOPY(tmp_co, mv->co);
-				  MTC_Mat4MulVecfl(offset, tmp_co);
+				  Mat4MulVecfl(offset, tmp_co);
 
 				  for(j = 0; j < maxVerts; j++) {
 					  /* if vertex already merged, don't use it */
@@ -1332,7 +1332,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 						  if(amd->flags & MOD_ARR_MERGEFINAL) {
 							  VECCOPY(tmp_co, inMV->co);
 							  inMV = &src_mvert[i];
-							  MTC_Mat4MulVecfl(final_offset, tmp_co);
+							  Mat4MulVecfl(final_offset, tmp_co);
 							  if(VecLenCompare(tmp_co, inMV->co, amd->merge_dist))
 								  indexMap[i].merge_final = 1;
 						  }
@@ -1350,7 +1350,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 					  *mv2 = *mv;
 					  numVerts++;
 
-					  MTC_Mat4MulVecfl(offset, co);
+					  Mat4MulVecfl(offset, co);
 					  VECCOPY(mv2->co, co);
 				  }
 			  } else if(indexMap[i].merge != i && indexMap[i].merge_final) {
@@ -3182,7 +3182,7 @@ static void tag_and_count_extra_edges(SmoothMesh *mesh, float split_angle,
 							 /* we know the edge has 2 faces, so check the angle */
 							 SmoothFace *face1 = edge->faces->link;
 							 SmoothFace *face2 = edge->faces->next->link;
-							 float edge_angle_cos = MTC_dot3Float(face1->normal,
+							 float edge_angle_cos = Inpf(face1->normal,
 									 face2->normal);
 
 							 if(edge_angle_cos < threshold) {
@@ -4051,11 +4051,11 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
 				/* find the projector which the face points at most directly
 				* (projector normal with largest dot product is best)
 				*/
-				best_dot = MTC_dot3Float(projectors[0].normal, face_no);
+				best_dot = Inpf(projectors[0].normal, face_no);
 				best_projector = &projectors[0];
 
 				for(j = 1; j < num_projectors; ++j) {
-					float tmp_dot = MTC_dot3Float(projectors[j].normal,
+					float tmp_dot = Inpf(projectors[j].normal,
 							face_no);
 					if(tmp_dot > best_dot) {
 						best_dot = tmp_dot;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 61f62b2222d..fe8b97db606 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -38,7 +38,7 @@
 
 #include "PIL_dynlib.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
diff --git a/source/blender/blenlib/MTC_matrixops.h b/source/blender/blenlib/MTC_matrixops.h
deleted file mode 100644
index 2bc644be564..00000000000
--- a/source/blender/blenlib/MTC_matrixops.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * matrixops.h
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef MATRIXOPS_H
-#define MATRIXOPS_H 
-
-#ifdef __cplusplus
-extern "C" { 
-#endif
-
-/* ------------------------------------------------------------------------- */
-/* need rewriting: */
-/**
- * copy the left upp3 3 by 3 of m2 to m1
- */
-void MTC_Mat3CpyMat4(float m1[][3], float m2[][4]);
-
-/* ------------------------------------------------------------------------- */
-/* operations based on 4 by 4 matrices */
-
-/**
- * Copy m1 to m2
- */
-void MTC_Mat4CpyMat4(float m1[][4], float m2[][4]);
-
-/**
- * Multiply all matrices after the first, leave the result in the
- * first argument
- */
-void MTC_Mat4MulSerie(float answ[][4],
-					  float m1[][4], float m2[][4], float m3[][4],
-					  float m4[][4], float m5[][4], float m6[][4],
-					  float m7[][4], float m8[][4]);
-
-/**
- * m1 = m2 matprod m3
- */
-void MTC_Mat4MulMat4(float m1[][4], float m2[][4], float m3[][4]);
-
-/**
- * Do vec^t prod mat, result in vec. Ignore vec[3] (vec is a
- * float[3])
- */
-void MTC_Mat4MulVecfl(float mat[][4], float *vec);
-
-/**
- * Invert mat, result in inverse. Always returns 1
- */
-int MTC_Mat4Invert(float inverse[][4], float mat[][4]);
-
-/**
- * Make the set of mat orthonormal (mat should already be orthogonal)?
- * (doesn't appear to normalize properly?)
- */
-void MTC_Mat4Ortho(float mat[][4]);
-
-/**
- * vec = mat prod vec, result in vec, ignore fourth component entirely
- * (4th component is _not_ accessed!!! vec is 3d)
- */
-void MTC_Mat4Mul3Vecfl(float mat[][4], float *vec);
-
-/**
- * vec = mat prod vec, result in vec
- */
-void MTC_Mat4MulVec4fl(float mat[][4], float *vec);
-
-/**
- * Set <m> to the 4-D unity matrix
- */
-void MTC_Mat4One(float m[][4]);
-
-/**
- * Swap matrices m1 and m2
- */
-void MTC_Mat4SwapMat4(float m1[][4], float m2[][4]);
-
-/**
- * Copy m2 to the top-left 3x3 of m1, don't touch the remaining elements.
- */
-void MTC_Mat4CpyMat3nc(float m1[][4], float m2[][3]);
-
-/**
- * m1 = m2 * m3, but only the top-left 3x3
- */
-void MTC_Mat4MulMat33(float m1[][3], float m2[][4], float m3[][3]); 
-
-/* ------------------------------------------------------------------------- */
-/* Operations based on 3 by 3 matrices */
-/**
- * Do vec^t prod mat, result in vec.(vex is 3d)
- */
-void MTC_Mat3MulVecfl(float mat[][3], float *vec);
-
-/**
- * Copy m1 to m2
- */
-void MTC_Mat3CpyMat3(float m1[][3], float m2[][3]);
-
-/**
- * m1 = m2 prod m3
- */
-void MTC_Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3]);
-
-/**
- * vec = vec prod mat
- */
-void MTC_Mat3MulVecd(float mat[][3], double *vec);
-
-/**
- * Guess: invert matrix
- * result goes to m1
- */
-void MTC_Mat3Inv(float m1[][3], float m2[][3]);
-
-/**
- * Sort of a determinant matrix? Doesn't seem very adjoint to me...
- * result goes to m1
- */
-void MTC_Mat3Adj(float m1[][3], float m[][3]);
-
-/**
- * Set <m> to the 3D unity matrix
- */
-void MTC_Mat3One(float m[][3]);
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MATRIXOPS_H */
-
diff --git a/source/blender/blenlib/MTC_vectorops.h b/source/blender/blenlib/MTC_vectorops.h
deleted file mode 100644
index 4fec93b37b9..00000000000
--- a/source/blender/blenlib/MTC_vectorops.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * vectorops.h
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef VECTOROPS_H
-#define VECTOROPS_H 
-
-/* ------------------------------------------------------------------------- */
-
-void  MTC_diff3Int(int v1[3], int v2[3], int v3[3]);
-void  MTC_cross3Int(int v1[3], int v2[3], int v3[3]);
-int   MTC_dot3Int(int v1[3], int v2[3]); 
-
-void  MTC_diff3Float(float v1[3], float v2[3], float v3[3]);
-void  MTC_cross3Float(float v1[3], float v2[3], float v3[3]);
-float MTC_dot3Float(float v1[3], float v2[3]); 
-void  MTC_cp3Float(float v1[3], float v2[3]);
-/**
- * Copy vector with a minus sign (so a = -b)
- */
-void  MTC_cp3FloatInv(float v1[3], float v2[3]);
-
-void  MTC_swapInt(int *i1, int *i2);
-
-void  MTC_diff3DFF(double v1[3], float v2[3], float v3[3]);
-void  MTC_cross3Double(double v1[3], double v2[3], double v3[3]);
-float MTC_normalize3DF(float n[3]);
-
-/* ------------------------------------------------------------------------- */
-#endif /* VECTOROPS_H */
-
diff --git a/source/blender/blenlib/intern/matrixops.c b/source/blender/blenlib/intern/matrixops.c
deleted file mode 100644
index 0f9fc65f016..00000000000
--- a/source/blender/blenlib/intern/matrixops.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- *
- * Some matrix operations.
- *
- * Always use
- * - vector with x components :   float x[3], int x[3], etc
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/* ------------------------------------------------------------------------- */
-#include <string.h>
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
-/* ------------------------------------------------------------------------- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
-#include <strings.h>
-#endif
-
-#define ABS(x)	((x) < 0 ? -(x) : (x))
-#define SWAP(type, a, b)	{ type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
-
-void MTC_Mat4CpyMat4(float m1[][4], float m2[][4])
-{
-	memcpy(m1, m2, 4*4*sizeof(float));
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulSerie(float answ[][4],
-				  float m1[][4], float m2[][4], float m3[][4],
-				  float m4[][4], float m5[][4], float m6[][4],
-				  float m7[][4], float m8[][4])
-{
-	float temp[4][4];
-	
-	if(m1==0 || m2==0) return;
-	
-	MTC_Mat4MulMat4(answ, m2, m1);
-	if(m3) {
-		MTC_Mat4MulMat4(temp, m3, answ);
-		if(m4) {
-			MTC_Mat4MulMat4(answ, m4, temp);
-			if(m5) {
-				MTC_Mat4MulMat4(temp, m5, answ);
-				if(m6) {
-					MTC_Mat4MulMat4(answ, m6, temp);
-					if(m7) {
-						MTC_Mat4MulMat4(temp, m7, answ);
-						if(m8) {
-							MTC_Mat4MulMat4(answ, m8, temp);
-						}
-						else MTC_Mat4CpyMat4(answ, temp);
-					}
-				}
-				else MTC_Mat4CpyMat4(answ, temp);
-			}
-		}
-		else MTC_Mat4CpyMat4(answ, temp);
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_Mat4MulMat4(float m1[][4], float m2[][4], float m3[][4])
-{
-  /* matrix product: c[j][k] = a[j][i].b[i][k] */
-
-	m1[0][0] = m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0] + m2[0][3]*m3[3][0];
-	m1[0][1] = m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1] + m2[0][3]*m3[3][1];
-	m1[0][2] = m2[0][0]*m3[0][2] + m2[0][1]*m3[1][2] + m2[0][2]*m3[2][2] + m2[0][3]*m3[3][2];
-	m1[0][3] = m2[0][0]*m3[0][3] + m2[0][1]*m3[1][3] + m2[0][2]*m3[2][3] + m2[0][3]*m3[3][3];
-
-	m1[1][0] = m2[1][0]*m3[0][0] + m2[1][1]*m3[1][0] + m2[1][2]*m3[2][0] + m2[1][3]*m3[3][0];
-	m1[1][1] = m2[1][0]*m3[0][1] + m2[1][1]*m3[1][1] + m2[1][2]*m3[2][1] + m2[1][3]*m3[3][1];
-	m1[1][2] = m2[1][0]*m3[0][2] + m2[1][1]*m3[1][2] + m2[1][2]*m3[2][2] + m2[1][3]*m3[3][2];
-	m1[1][3] = m2[1][0]*m3[0][3] + m2[1][1]*m3[1][3] + m2[1][2]*m3[2][3] + m2[1][3]*m3[3][3];
-
-	m1[2][0] = m2[2][0]*m3[0][0] + m2[2][1]*m3[1][0] + m2[2][2]*m3[2][0] + m2[2][3]*m3[3][0];
-	m1[2][1] = m2[2][0]*m3[0][1] + m2[2][1]*m3[1][1] + m2[2][2]*m3[2][1] + m2[2][3]*m3[3][1];
-	m1[2][2] = m2[2][0]*m3[0][2] + m2[2][1]*m3[1][2] + m2[2][2]*m3[2][2] + m2[2][3]*m3[3][2];
-	m1[2][3] = m2[2][0]*m3[0][3] + m2[2][1]*m3[1][3] + m2[2][2]*m3[2][3] + m2[2][3]*m3[3][3];
-
-	m1[3][0] = m2[3][0]*m3[0][0] + m2[3][1]*m3[1][0] + m2[3][2]*m3[2][0] + m2[3][3]*m3[3][0];
-	m1[3][1] = m2[3][0]*m3[0][1] + m2[3][1]*m3[1][1] + m2[3][2]*m3[2][1] + m2[3][3]*m3[3][1];
-	m1[3][2] = m2[3][0]*m3[0][2] + m2[3][1]*m3[1][2] + m2[3][2]*m3[2][2] + m2[3][3]*m3[3][2];
-	m1[3][3] = m2[3][0]*m3[0][3] + m2[3][1]*m3[1][3] + m2[3][2]*m3[2][3] + m2[3][3]*m3[3][3];
-
-}
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulVecfl(float mat[][4], float *vec)
-{
-	float x,y;
-
-	x=vec[0]; 
-	y=vec[1];
-	vec[0]=x*mat[0][0] + y*mat[1][0] + mat[2][0]*vec[2] + mat[3][0];
-	vec[1]=x*mat[0][1] + y*mat[1][1] + mat[2][1]*vec[2] + mat[3][1];
-	vec[2]=x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2] + mat[3][2];
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_Mat3MulVecfl(float mat[][3], float *vec)
-{
-	float x,y;
-
-	x=vec[0]; 
-	y=vec[1];
-	vec[0]= x*mat[0][0] + y*mat[1][0] + mat[2][0]*vec[2];
-	vec[1]= x*mat[0][1] + y*mat[1][1] + mat[2][1]*vec[2];
-	vec[2]= x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-int MTC_Mat4Invert(float inverse[][4], float mat[][4])
-{
-	int i, j, k;
-	double temp;
-	float tempmat[4][4];
-	float max;
-	int maxj;
-
-	/* Set inverse to identity */
-	for (i=0; i<4; i++)
-		for (j=0; j<4; j++)
-			inverse[i][j] = 0;
-	for (i=0; i<4; i++)
-		inverse[i][i] = 1;
-
-	/* Copy original matrix so we don't mess it up */
-	for(i = 0; i < 4; i++)
-		for(j = 0; j <4; j++)
-			tempmat[i][j] = mat[i][j];
-
-	for(i = 0; i < 4; i++) {
-		/* Look for row with max pivot */
-		max = ABS(tempmat[i][i]);
-		maxj = i;
-		for(j = i + 1; j < 4; j++) {
-			if(ABS(tempmat[j][i]) > max) {
-				max = ABS(tempmat[j][i]);
-				maxj = j;
-			}
-		}
-		/* Swap rows if necessary */
-		if (maxj != i) {
-			for( k = 0; k < 4; k++) {
-				SWAP(float, tempmat[i][k], tempmat[maxj][k]);
-				SWAP(float, inverse[i][k], inverse[maxj][k]);
-			}
-		}
-
-		temp = tempmat[i][i];
-		if (temp == 0)
-			return 0;  /* No non-zero pivot */
-		for(k = 0; k < 4; k++) {
-			tempmat[i][k] /= temp;
-			inverse[i][k] /= temp;
-		}
-		for(j = 0; j < 4; j++) {
-			if(j != i) {
-				temp = tempmat[j][i];
-				for(k = 0; k < 4; k++) {
-					tempmat[j][k] -= tempmat[i][k]*temp;
-					inverse[j][k] -= inverse[i][k]*temp;
-				}
-			}
-		}
-	}
-	return 1;
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_Mat3CpyMat4(float m1[][3], float m2[][4])
-{
-	
-	m1[0][0]= m2[0][0];
-	m1[0][1]= m2[0][1];
-	m1[0][2]= m2[0][2];
-
-	m1[1][0]= m2[1][0];
-	m1[1][1]= m2[1][1];
-	m1[1][2]= m2[1][2];
-
-	m1[2][0]= m2[2][0];
-	m1[2][1]= m2[2][1];
-	m1[2][2]= m2[2][2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3CpyMat3(float m1[][3], float m2[][3])
-{	
-	memcpy(m1, m2, 3*3*sizeof(float));
-}
-
-/* ------------------------------------------------------------------------- */
-/*  void Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3]) */
-void MTC_Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3])
-{
-	/* be careful about this rewrite... */
-	    /* m1[i][j] = m2[i][k]*m3[k][j], args are flipped! */
-	m1[0][0]= m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0];
-	m1[0][1]= m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1];
-	m1[0][2]= m2[0][0]*m3[0][2] + m2[0][1]*m3[1][2] + m2[0][2]*m3[2][2];
-
-	m1[1][0]= m2[1][0]*m3[0][0] + m2[1][1]*m3[1][0] + m2[1][2]*m3[2][0];
-	m1[1][1]= m2[1][0]*m3[0][1] + m2[1][1]*m3[1][1] + m2[1][2]*m3[2][1];
-	m1[1][2]= m2[1][0]*m3[0][2] + m2[1][1]*m3[1][2] + m2[1][2]*m3[2][2];
-
-	m1[2][0]= m2[2][0]*m3[0][0] + m2[2][1]*m3[1][0] + m2[2][2]*m3[2][0];
-	m1[2][1]= m2[2][0]*m3[0][1] + m2[2][1]*m3[1][1] + m2[2][2]*m3[2][1];
-	m1[2][2]= m2[2][0]*m3[0][2] + m2[2][1]*m3[1][2] + m2[2][2]*m3[2][2];
-
-/*  	m1[0]= m2[0]*m3[0] + m2[1]*m3[3] + m2[2]*m3[6]; */
-/*  	m1[1]= m2[0]*m3[1] + m2[1]*m3[4] + m2[2]*m3[7]; */
-/*  	m1[2]= m2[0]*m3[2] + m2[1]*m3[5] + m2[2]*m3[8]; */
-/*  	m1+=3; */
-/*  	m2+=3; */
-/*  	m1[0]= m2[0]*m3[0] + m2[1]*m3[3] + m2[2]*m3[6]; */
-/*  	m1[1]= m2[0]*m3[1] + m2[1]*m3[4] + m2[2]*m3[7]; */
-/*  	m1[2]= m2[0]*m3[2] + m2[1]*m3[5] + m2[2]*m3[8]; */
-/*  	m1+=3; */
-/*  	m2+=3; */
-/*  	m1[0]= m2[0]*m3[0] + m2[1]*m3[3] + m2[2]*m3[6]; */
-/*  	m1[1]= m2[0]*m3[1] + m2[1]*m3[4] + m2[2]*m3[7]; */
-/*  	m1[2]= m2[0]*m3[2] + m2[1]*m3[5] + m2[2]*m3[8]; */
-} /* end of void Mat3MulMat3(float m1[][3], float m3[][3], float m2[][3]) */
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4Ortho(float mat[][4])
-{
-	float len;
-	
-	len= MTC_normalize3DF(mat[0]);
-	if(len!=0.0) mat[0][3]/= len;
-	len= MTC_normalize3DF(mat[1]);
-	if(len!=0.0) mat[1][3]/= len;
-	len= MTC_normalize3DF(mat[2]);
-	if(len!=0.0) mat[2][3]/= len;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4Mul3Vecfl(float mat[][4], float *vec)
-{
-	float x,y;
-	/* vec = mat^T dot vec !!! or vec a row, then vec = vec dot mat*/
-
-	x= vec[0]; 
-	y= vec[1];
-	vec[0]= x*mat[0][0] + y*mat[1][0] + mat[2][0]*vec[2];
-	vec[1]= x*mat[0][1] + y*mat[1][1] + mat[2][1]*vec[2];
-	vec[2]= x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4One(float m[][4])
-{
-
-	m[0][0]= m[1][1]= m[2][2]= m[3][3]= 1.0;
-	m[0][1]= m[0][2]= m[0][3]= 0.0;
-	m[1][0]= m[1][2]= m[1][3]= 0.0;
-	m[2][0]= m[2][1]= m[2][3]= 0.0;
-	m[3][0]= m[3][1]= m[3][2]= 0.0;
-}
-
-
-/* ------------------------------------------------------------------------- */
-/* Result is a 3-vector!*/
-void MTC_Mat3MulVecd(float mat[][3], double *vec)
-{
-	double x,y;
-
-	/* vec = mat^T dot vec !!! or vec a row, then vec = vec dot mat*/
-	x=vec[0]; 
-	y=vec[1];
-	vec[0]= x * mat[0][0] + y * mat[1][0] + mat[2][0] * vec[2];
-	vec[1]= x * mat[0][1] + y * mat[1][1] + mat[2][1] * vec[2];
-	vec[2]= x * mat[0][2] + y * mat[1][2] + mat[2][2] * vec[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3Inv(float m1[][3], float m2[][3])
-{
-	short a,b;
-	float det;
-
-	/* first adjoint */
-	MTC_Mat3Adj(m1,m2);
-
-	/* then determinant old mat! */
-	det= m2[0][0]* (m2[1][1]*m2[2][2] - m2[1][2]*m2[2][1])
-	    -m2[1][0]* (m2[0][1]*m2[2][2] - m2[0][2]*m2[2][1])
-	    +m2[2][0]* (m2[0][1]*m2[1][2] - m2[0][2]*m2[1][1]);
-
-	if(det==0) det=1;
-	det= 1/det;
-	for(a=0;a<3;a++) {
-		for(b=0;b<3;b++) {
-			m1[a][b]*=det;
-		}
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3Adj(float m1[][3], float m[][3])
-{
-	m1[0][0]=m[1][1]*m[2][2]-m[1][2]*m[2][1];
-	m1[0][1]= -m[0][1]*m[2][2]+m[0][2]*m[2][1];
-	m1[0][2]=m[0][1]*m[1][2]-m[0][2]*m[1][1];
-
-	m1[1][0]= -m[1][0]*m[2][2]+m[1][2]*m[2][0];
-	m1[1][1]=m[0][0]*m[2][2]-m[0][2]*m[2][0];
-	m1[1][2]= -m[0][0]*m[1][2]+m[0][2]*m[1][0];
-
-	m1[2][0]=m[1][0]*m[2][1]-m[1][1]*m[2][0];
-	m1[2][1]= -m[0][0]*m[2][1]+m[0][1]*m[2][0];
-	m1[2][2]=m[0][0]*m[1][1]-m[0][1]*m[1][0];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat3One(float m[][3])
-{
-
-	m[0][0]= m[1][1]= m[2][2]= 1.0;
-	m[0][1]= m[0][2]= 0.0;
-	m[1][0]= m[1][2]= 0.0;
-	m[2][0]= m[2][1]= 0.0;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4SwapMat4(float m1[][4], float m2[][4])
-{
-	float t;
-	int i, j;
-
-	for(i = 0; i < 4; i++) {
-		for (j = 0; j < 4; j++) {
-			t        = m1[i][j];
-			m1[i][j] = m2[i][j];
-			m2[i][j] = t;
-		}
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulVec4fl(float mat[][4], float *vec)
-{
-	float x,y,z;
-
-	x = vec[0]; 
-	y = vec[1]; 
-	z = vec[2];
-	vec[0] = x*mat[0][0] + y*mat[1][0] + z*mat[2][0] + mat[3][0]*vec[3];
-	vec[1] = x*mat[0][1] + y*mat[1][1] + z*mat[2][1] + mat[3][1]*vec[3];
-	vec[2] = x*mat[0][2] + y*mat[1][2] + z*mat[2][2] + mat[3][2]*vec[3];
-	vec[3] = x*mat[0][3] + y*mat[1][3] + z*mat[2][3] + mat[3][3]*vec[3];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4CpyMat3nc(float m1[][4], float m2[][3])	/* no clear */
-{
-	m1[0][0]= m2[0][0];
-	m1[0][1]= m2[0][1];
-	m1[0][2]= m2[0][2];
-
-	m1[1][0]= m2[1][0];
-	m1[1][1]= m2[1][1];
-	m1[1][2]= m2[1][2];
-
-	m1[2][0]= m2[2][0];
-	m1[2][1]= m2[2][1];
-	m1[2][2]= m2[2][2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_Mat4MulMat33(float m1[][3], float m2[][4], float m3[][3])
-{
-	/* m1_i_j = m2_i_k * m3_k_j ? */
-	
-	m1[0][0] = m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0];
-	m1[0][1] = m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1];
-	m1[0][2] = m2[0][0]*m3[0][2] + m2[0][1]*m3[1][2] + m2[0][2]*m3[2][2];
-
-	m1[1][0] = m2[1][0]*m3[0][0] + m2[1][1]*m3[1][0] + m2[1][2]*m3[2][0];
-	m1[1][1] = m2[1][0]*m3[0][1] + m2[1][1]*m3[1][1] + m2[1][2]*m3[2][1];
-	m1[1][2] = m2[1][0]*m3[0][2] + m2[1][1]*m3[1][2] + m2[1][2]*m3[2][2];
-
-	m1[2][0] = m2[2][0]*m3[0][0] + m2[2][1]*m3[1][0] + m2[2][2]*m3[2][0];
-	m1[2][1] = m2[2][0]*m3[0][1] + m2[2][1]*m3[1][1] + m2[2][2]*m3[2][1];
-	m1[2][2] = m2[2][0]*m3[0][2] + m2[2][1]*m3[1][2] + m2[2][2]*m3[2][2];
-
-}
-
-/* ------------------------------------------------------------------------- */
-
-/* eof */
diff --git a/source/blender/blenlib/intern/vectorops.c b/source/blender/blenlib/intern/vectorops.c
deleted file mode 100644
index 3bff5235cfd..00000000000
--- a/source/blender/blenlib/intern/vectorops.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *
- * Some vector operations.
- *
- * Always use
- * - vector with x components :   float x[3], int x[3], etc
- *
- * $Id$
- *
- * ***** 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/* ------------------------------------------------------------------------- */
-/* General format: op(a, b, c): a = b op c                                   */
-/* Copying is done cp <from, to>                                             */
-/* ------------------------------------------------------------------------- */
-
-#include "MTC_vectorops.h"
-#include <math.h>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-void MTC_diff3Int(int v1[3], int v2[3], int v3[3])
-{
-	v1[0] = v2[0] - v3[0];
-	v1[1] = v2[1] - v3[1];
-	v1[2] = v2[2] - v3[2];
-}
-
-/* ------------------------------------------------------------------------- */
-void MTC_diff3Float(float v1[3], float v2[3], float v3[3])
-{
-	v1[0] = v2[0] - v3[0];
-	v1[1] = v2[1] - v3[1];
-	v1[2] = v2[2] - v3[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cross3Int(int v1[3], int v2[3], int v3[3])
-{
-	v1[0] = v2[1]*v3[2] - v2[2]*v3[1];
-	v1[1] = v2[2]*v3[0] - v2[0]*v3[2];
-	v1[2] = v2[0]*v3[1] - v2[1]*v3[0];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cross3Float(float v1[3], float v2[3], float v3[3])
-{
-	v1[0] = v2[1]*v3[2] - v2[2]*v3[1];
-	v1[1] = v2[2]*v3[0] - v2[0]*v3[2];
-	v1[2] = v2[0]*v3[1] - v2[1]*v3[0];
-}
-/* ------------------------------------------------------------------------- */
-
-void MTC_cross3Double(double v1[3], double v2[3], double v3[3])
-{
-	v1[0] = v2[1]*v3[2] - v2[2]*v3[1];
-	v1[1] = v2[2]*v3[0] - v2[0]*v3[2];
-	v1[2] = v2[0]*v3[1] - v2[1]*v3[0];
-}
-
-/* ------------------------------------------------------------------------- */
-
-int MTC_dot3Int(int v1[3], int v2[3])
-{
-	return (v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2]);
-}
-
-/* ------------------------------------------------------------------------- */
-
-float MTC_dot3Float(float v1[3], float v2[3])
-{
-	return (v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2]);
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cp3Float(float v1[3], float v2[3])
-{
-	v2[0] = v1[0];
-	v2[1] = v1[1];
-	v2[2] = v1[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_cp3FloatInv(float v1[3], float v2[3])
-{
-	v2[0] = -v1[0];
-	v2[1] = -v1[1];
-	v2[2] = -v1[2];
-}
-
-/* ------------------------------------------------------------------------- */
-
-void MTC_swapInt(int *i1, int *i2)
-{
-	int swap;
-	swap = *i1;
-	*i1 = *i2;
-	*i2 = swap;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void  MTC_diff3DFF(double v1[3], float v2[3], float v3[3])
-{
-	v1[0] = v2[0] - v3[0];
-	v1[1] = v2[1] - v3[1];
-	v1[2] = v2[2] - v3[2];
-}
-
-/* ------------------------------------------------------------------------- */
-float MTC_normalize3DF(float n[3])
-{
-	float d;
-	
-	d= n[0]*n[0]+n[1]*n[1]+n[2]*n[2];
-	/* FLT_EPSILON is too large! A larger value causes normalize errors in   */
-	/* a scaled down utah teapot                                             */
-	if(d>0.0000000000001) {
-
-		/* d= sqrt(d);  This _should_ be sqrt, but internally it's a double*/
-		/* anyway. This is safe.                                             */
-		d = sqrt(d);
-		
-		n[0]/=d; 
-		n[1]/=d; 
-		n[2]/=d;
-	} else {
-		n[0]=n[1]=n[2]= 0.0;
-		d= 0.0;
-	}
-	return d;
-}
-
-/* ------------------------------------------------------------------------- */
-
-/* eof */
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index 667a889b5fc..7301901aff5 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -39,7 +39,7 @@ editmesh_mods.c, UI level access, no geometry changes
 
 #include "MEM_guardedalloc.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_mesh_types.h"
 #include "DNA_material_types.h"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 953a055c9e5..73589371c4f 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -43,7 +43,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
-#include "MTC_matrixops.h"
+
 
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
@@ -1327,7 +1327,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 	mval[0]-= vc->ar->winrct.xmin;
 	mval[1]-= vc->ar->winrct.ymin;
 			
-	MTC_Mat4SwapMat4(wpd->vc.rv3d->persmat, mat);
+	Mat4SwapMat4(wpd->vc.rv3d->persmat, mat);
 			
 	/* which faces are involved */
 	if(wp->flag & VP_AREA) {
@@ -1444,7 +1444,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 		}
 	}
 			
-	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
+	Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
 	DAG_id_flush_update(ob->data, OB_RECALC_DATA);
 	ED_region_tag_redraw(vc->ar);
@@ -1724,14 +1724,14 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 		else totindex= 0;
 	}
 			
-	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
+	Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
 	for(index=0; index<totindex; index++) {				
 		if(indexar[index] && indexar[index]<=me->totface)
 			vpaint_paint_face(vp, vpd, ob, indexar[index]-1, mval);
 	}
 						
-	MTC_Mat4SwapMat4(vc->rv3d->persmat, mat);
+	Mat4SwapMat4(vc->rv3d->persmat, mat);
 			
 	ED_region_tag_redraw(vc->ar);
 			
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 57e7d897e24..3b6ca455b48 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -37,7 +37,7 @@
 #include "IMB_imbuf.h"
 
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_armature_types.h"
 #include "DNA_boid_types.h"
@@ -1124,7 +1124,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob
 			Mat4Ortho(vec);
 			wmMultMatrix(vec);
 
-			MTC_Mat4SwapMat4(rv3d->persmat, tmat);
+			Mat4SwapMat4(rv3d->persmat, tmat);
 			wmGetSingleMatrix(rv3d->persmat);
 
 			if(cam->flag & CAM_SHOWLIMITS) {
@@ -1137,7 +1137,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob
 			if(cam->flag & CAM_SHOWMIST) 
 				if(wrld) draw_limit_line(wrld->miststa, wrld->miststa+wrld->mistdist, 0xFFFFFF);
 				
-			MTC_Mat4SwapMat4(rv3d->persmat, tmat);
+			Mat4SwapMat4(rv3d->persmat, tmat);
 		}
 	}
 }
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index f4242c70139..342acfe92b3 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -38,7 +38,7 @@
 #include "IMB_imbuf.h"
 
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_armature_types.h"
 #include "DNA_boid_types.h"
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
index 0fd95642be6..bdf5a1ce079 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
@@ -27,7 +27,7 @@
  */
 
 #include <math.h>
-#include "MTC_vectorops.h"
+
 #include "../TEX_util.h"
 
 static bNodeSocketType inputs[]= { 
@@ -65,19 +65,19 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	
 	if(magsq == 0) magsq = 1;
 	
-	ndx = MTC_dot3Float(coord, ax);
+	ndx = Inpf(coord, ax);
 	
 	para[0] = ax[0] * ndx * (1 - cos_a);
 	para[1] = ax[1] * ndx * (1 - cos_a);
 	para[2] = ax[2] * ndx * (1 - cos_a);
 	
-	MTC_diff3Float(perp, coord, para);
+	VecSubf(perp, coord, para);
 	
 	perp[0] = coord[0] * cos_a;
 	perp[1] = coord[1] * cos_a;
 	perp[2] = coord[2] * cos_a;
 	
-	MTC_cross3Float(cp, ax, coord);
+	Crossf(cp, ax, coord);
 	
 	cp[0] = cp[0] * sin_a;
 	cp[1] = cp[1] * sin_a;
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index df99d5f2843..73ff826994a 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include "MTC_matrixops.h"
+
 
 #include "MEM_guardedalloc.h"
 
@@ -191,8 +191,8 @@ void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void),
 	if (re) re->flag |= R_HALO;
 	else stargrid *= 1.0;				/* then it draws fewer */
 	
-	if(re) MTC_Mat4Invert(mat, re->viewmat);
-	else MTC_Mat4One(mat);
+	if(re) Mat4Invert(mat, re->viewmat);
+	else Mat4One(mat);
 	
 	/* BOUNDING BOX CALCULATION
 		* bbox goes from z = loc_near_var | loc_far_var,
@@ -240,7 +240,7 @@ void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void),
 					done++;
 				}
 				else {
-					MTC_Mat4MulVecfl(re->viewmat, vec);
+					Mat4MulVecfl(re->viewmat, vec);
 					
 					/* in vec are global coordinates
 					* calculate distance to camera
@@ -829,7 +829,7 @@ static void autosmooth(Render *re, ObjectRen *obr, float mat[][4], int degr)
 	/* rotate vertices and calculate normal of faces */
 	for(a=0; a<obr->totvert; a++) {
 		ver= RE_findOrAddVert(obr, a);
-		MTC_Mat4MulVecfl(mat, ver->co);
+		Mat4MulVecfl(mat, ver->co);
 	}
 	for(a=0; a<obr->totvlak; a++) {
 		vlr= RE_findOrAddVlak(obr, a);
@@ -1280,19 +1280,19 @@ static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, Particl
 
 	VECADD(vlr->v1->co, bb_center, xvec);
 	VECADD(vlr->v1->co, vlr->v1->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v1->co);
+	Mat4MulVecfl(re->viewmat, vlr->v1->co);
 
 	VECSUB(vlr->v2->co, bb_center, xvec);
 	VECADD(vlr->v2->co, vlr->v2->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v2->co);
+	Mat4MulVecfl(re->viewmat, vlr->v2->co);
 
 	VECSUB(vlr->v3->co, bb_center, xvec);
 	VECSUB(vlr->v3->co, vlr->v3->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v3->co);
+	Mat4MulVecfl(re->viewmat, vlr->v3->co);
 
 	VECADD(vlr->v4->co, bb_center, xvec);
 	VECSUB(vlr->v4->co, vlr->v4->co, yvec);
-	MTC_Mat4MulVecfl(re->viewmat, vlr->v4->co);
+	Mat4MulVecfl(re->viewmat, vlr->v4->co);
 
 	CalcNormFloat4(vlr->v4->co, vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
 	VECCOPY(vlr->v1->n,vlr->n);
@@ -1392,7 +1392,7 @@ static void particle_normal_ren(short ren_as, ParticleSettings *part, Render *re
 	VECCOPY(loc, state->co);
 
 	if(ren_as != PART_DRAW_BB)
-		MTC_Mat4MulVecfl(re->viewmat, loc);
+		Mat4MulVecfl(re->viewmat, loc);
 
 	switch(ren_as) {
 		case PART_DRAW_LINE:
@@ -1401,7 +1401,7 @@ static void particle_normal_ren(short ren_as, ParticleSettings *part, Render *re
 			sd->size = hasize;
 
 			VECCOPY(vel, state->vel);
-			MTC_Mat4Mul3Vecfl(re->viewmat, vel);
+			Mat4Mul3Vecfl(re->viewmat, vel);
 			Normalize(vel);
 
 			if(part->draw & PART_DRAW_VEL_LENGTH)
@@ -1621,8 +1621,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	}
 	
 /* 2.5 setup matrices */
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);	/* need to be that way, for imat texture */
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);	/* need to be that way, for imat texture */
 	Mat3CpyMat4(nmat, ob->imat);
 	Mat3Transp(nmat);
 
@@ -1904,7 +1904,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 				time= curlen/strandlen;
 
 				VECCOPY(loc,state.co);
-				MTC_Mat4MulVecfl(re->viewmat,loc);
+				Mat4MulVecfl(re->viewmat,loc);
 
 				if(strandbuf) {
 					VECCOPY(svert->co, loc);
@@ -2046,8 +2046,8 @@ static void make_render_halos(Render *re, ObjectRen *obr, Mesh *me, int totvert,
 	float vec[3], hasize, mat[4][4], imat[3][3];
 	int a, ok, seed= ma->seed1;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat3CpyMat4(imat, ob->imat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat3CpyMat4(imat, ob->imat);
 
 	re->flag |= R_HALO;
 
@@ -2058,7 +2058,7 @@ static void make_render_halos(Render *re, ObjectRen *obr, Mesh *me, int totvert,
 			hasize= ma->hasize;
 
 			VECCOPY(vec, mvert->co);
-			MTC_Mat4MulVecfl(mat, vec);
+			Mat4MulVecfl(mat, vec);
 
 			if(ma->mode & MA_HALOPUNO) {
 				xn= mvert->no[0];
@@ -2191,7 +2191,7 @@ static void displace_render_vert(Render *re, ObjectRen *obr, ShadeInput *shi, Ve
 	}
 	if (texco & TEXCO_GLOB) {
 		VECCOPY(shi->gl, shi->co);
-		MTC_Mat4MulVecfl(re->viewinv, shi->gl);
+		Mat4MulVecfl(re->viewinv, shi->gl);
 	}
 	if (texco & TEXCO_NORM) {
 		VECCOPY(shi->orn, shi->vn);
@@ -2332,9 +2332,9 @@ static void init_render_mball(Render *re, ObjectRen *obr)
 	if (ob!=find_basis_mball(re->scene, ob))
 		return;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
-	MTC_Mat3CpyMat4(imat, ob->imat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
+	Mat3CpyMat4(imat, ob->imat);
 
 	ma= give_render_material(re, ob, 1);
 
@@ -2355,7 +2355,7 @@ static void init_render_mball(Render *re, ObjectRen *obr)
 
 		ver= RE_findOrAddVert(obr, obr->totvert++);
 		VECCOPY(ver->co, data);
-		MTC_Mat4MulVecfl(mat, ver->co);
+		Mat4MulVecfl(mat, ver->co);
 
 		/* render normals are inverted */
 		xn= -nors[0];
@@ -2439,7 +2439,7 @@ static int dl_surf_to_renderdata(ObjectRen *obr, DispList *dl, Material **matar,
 		if(orco) {
 			v1->orco= orco; orco+= 3; orcoret++;
 		}	
-		MTC_Mat4MulVecfl(mat, v1->co);
+		Mat4MulVecfl(mat, v1->co);
 		
 		for (v = 1; v < sizev; v++) {
 			ver= RE_findOrAddVert(obr, obr->totvert++);
@@ -2447,7 +2447,7 @@ static int dl_surf_to_renderdata(ObjectRen *obr, DispList *dl, Material **matar,
 			if(orco) {
 				ver->orco= orco; orco+= 3; orcoret++;
 			}	
-			MTC_Mat4MulVecfl(mat, ver->co);
+			Mat4MulVecfl(mat, ver->co);
 		}
 		/* if V-cyclic, add extra vertices at end of the row */
 		if (dl->flag & DL_CYCL_U) {
@@ -2597,8 +2597,8 @@ static void init_render_surf(Render *re, ObjectRen *obr)
 	nu= cu->nurb.first;
 	if(nu==0) return;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
 
 	/* material array */
 	totmat= ob->totcol+1;
@@ -2658,8 +2658,8 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 	dl= cu->disp.first;
 	if(cu->disp.first==NULL) return;
 	
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
 
 	/* material array */
 	totmat= ob->totcol+1;
@@ -2701,7 +2701,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 					ver->flag = 0;
 				}
 
-				MTC_Mat4MulVecfl(mat, ver->co);
+				Mat4MulVecfl(mat, ver->co);
 				
 				if (orco) {
 					ver->orco = orco;
@@ -2753,7 +2753,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset)
 					ver= RE_findOrAddVert(obr, obr->totvert++);
 						
 					VECCOPY(ver->co, fp);
-					MTC_Mat4MulVecfl(mat, ver->co);
+					Mat4MulVecfl(mat, ver->co);
 					fp+= 3;
 
 					if (orco) {
@@ -3050,9 +3050,9 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 
 	me= ob->data;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
-	MTC_Mat3CpyMat4(imat, ob->imat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
+	Mat3CpyMat4(imat, ob->imat);
 
 	if(me->totvert==0)
 		return;
@@ -3136,7 +3136,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 			ver= RE_findOrAddVert(obr, obr->totvert++);
 			VECCOPY(ver->co, mvert->co);
 			if(do_autosmooth==0)	/* autosmooth on original unrotated data to prevent differences between frames */
-				MTC_Mat4MulVecfl(mat, ver->co);
+				Mat4MulVecfl(mat, ver->co);
   
 			if(orco) {
 				ver->orco= orco;
@@ -3357,13 +3357,13 @@ static void initshadowbuf(Render *re, LampRen *lar, float mat[][4])
 	shb->soft= lar->soft;
 	shb->shadhalostep= lar->shadhalostep;
 	
-	MTC_Mat4Ortho(mat);
-	MTC_Mat4Invert(shb->winmat, mat);	/* winmat is temp */
+	Mat4Ortho(mat);
+	Mat4Invert(shb->winmat, mat);	/* winmat is temp */
 	
 	/* matrix: combination of inverse view and lampmat */
 	/* calculate again: the ortho-render has no correct viewinv */
-	MTC_Mat4Invert(viewinv, re->viewmat);
-	MTC_Mat4MulMat4(shb->viewmat, viewinv, shb->winmat);
+	Mat4Invert(viewinv, re->viewmat);
+	Mat4MulMat4(shb->viewmat, viewinv, shb->winmat);
 	
 	/* projection */
 	shb->d= lar->clipsta;
@@ -3441,11 +3441,11 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 	BLI_addtail(&re->lampren, lar);
 	go->lampren= lar;
 
-	MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-	MTC_Mat4Invert(ob->imat, mat);
+	Mat4MulMat4(mat, ob->obmat, re->viewmat);
+	Mat4Invert(ob->imat, mat);
 
-	MTC_Mat3CpyMat4(lar->mat, mat);
-	MTC_Mat3CpyMat4(lar->imat, ob->imat);
+	Mat3CpyMat4(lar->mat, mat);
+	Mat3CpyMat4(lar->imat, ob->imat);
 
 	lar->bufsize = la->bufsize;
 	lar->samp = la->samp;
@@ -3601,7 +3601,7 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 			lar->sh_invcampos[0]= -lar->co[0];
 			lar->sh_invcampos[1]= -lar->co[1];
 			lar->sh_invcampos[2]= -lar->co[2];
-			MTC_Mat3MulVecfl(lar->imat, lar->sh_invcampos);
+			Mat3MulVecfl(lar->imat, lar->sh_invcampos);
 
 			/* z factor, for a normalized volume */
 			angle= saacos(lar->spotsi);
@@ -4225,7 +4225,7 @@ static void set_dupli_tex_mat(Render *re, ObjectInstanceRen *obi, DupliObject *d
 
 		obi->duplitexmat= BLI_memarena_alloc(re->memArena, sizeof(float)*4*4);
 		Mat4Invert(imat, dob->mat);
-		MTC_Mat4MulSerie(obi->duplitexmat, re->viewmat, dob->omat, imat, re->viewinv, 0, 0, 0, 0);
+		Mat4MulSerie(obi->duplitexmat, re->viewmat, dob->omat, imat, re->viewinv, 0, 0, 0, 0);
 	}
 }
 
@@ -4349,8 +4349,8 @@ static void init_render_object(Render *re, Object *ob, Object *par, DupliObject
 	else if(render_object_type(ob->type))
 		add_render_object(re, ob, par, dob, timeoffset, vectorlay);
 	else {
-		MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-		MTC_Mat4Invert(ob->imat, mat);
+		Mat4MulMat4(mat, ob->obmat, re->viewmat);
+		Mat4Invert(ob->imat, mat);
 	}
 	
 	time= PIL_check_seconds_timer();
@@ -4600,8 +4600,8 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 	for(SETLOOPER(re->scene, base)) {
 		ob= base->object;
 		/* imat objects has to be done here, since displace can have texture using Object map-input */
-		MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-		MTC_Mat4Invert(ob->imat, mat);
+		Mat4MulMat4(mat, ob->obmat, re->viewmat);
+		Mat4Invert(ob->imat, mat);
 		/* each object should only be rendered once */
 		ob->flag &= ~OB_DONE;
 		ob->transflag &= ~OB_RENDER_DUPLI;
@@ -4747,8 +4747,8 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp
 	if(redoimat) {
 		for(SETLOOPER(re->scene, base)) {
 			ob= base->object;
-			MTC_Mat4MulMat4(mat, ob->obmat, re->viewmat);
-			MTC_Mat4Invert(ob->imat, mat);
+			Mat4MulMat4(mat, ob->obmat, re->viewmat);
+			Mat4Invert(ob->imat, mat);
 		}
 	}
 
@@ -5174,7 +5174,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
 		return 0;
 	
 	Mat4CpyMat4(mat, re->viewmat);
-	MTC_Mat4Invert(imat, mat);
+	Mat4Invert(imat, mat);
 
 	/* set first vertex OK */
 	if(!fss->meshSurfNormals) return 0;
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index a57e38f47c8..b5774d11799 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -51,7 +51,7 @@
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 
-#include "MTC_matrixops.h"
+
 
 /* this module */
 #include "render_types.h"
@@ -211,9 +211,9 @@ static void envmap_transmatrix(float mat[][4], int part)
 		eul[2]= -M_PI/2.0;
 	}
 	
-	MTC_Mat4CpyMat4(tmat, mat);
+	Mat4CpyMat4(tmat, mat);
 	EulToMat4(eul, rotmat);
-	MTC_Mat4MulSerie(mat, tmat, rotmat,
+	Mat4MulSerie(mat, tmat, rotmat,
 					 0,   0,    0,
 					 0,   0,    0);
 }
@@ -231,12 +231,12 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 	int a;
 	
 	if(mode==0) {
-		MTC_Mat4Invert(tmat, mat);
-		MTC_Mat3CpyMat4(imat, tmat);
+		Mat4Invert(tmat, mat);
+		Mat3CpyMat4(imat, tmat);
 	}
 	else {
-		MTC_Mat4CpyMat4(tmat, mat);
-		MTC_Mat3CpyMat4(imat, mat);
+		Mat4CpyMat4(tmat, mat);
+		Mat3CpyMat4(imat, mat);
 	}
 
 	for(obi=re->instancetable.first; obi; obi=obi->next) {
@@ -267,7 +267,7 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 			if((a & 255)==0) har= obr->bloha[a>>8];
 			else har++;
 		
-			MTC_Mat4MulVecfl(tmat, har->co);
+			Mat4MulVecfl(tmat, har->co);
 		}
 	}
 	
@@ -280,22 +280,22 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 		Mat3CpyMat3(cmat, lar->imat); 
 		Mat3MulMat3(lar->imat, cmat, imat); 
 
-		MTC_Mat3MulVecfl(imat, lar->vec);
-		MTC_Mat4MulVecfl(tmat, lar->co);
+		Mat3MulVecfl(imat, lar->vec);
+		Mat4MulVecfl(tmat, lar->co);
 
 		lar->sh_invcampos[0]= -lar->co[0];
 		lar->sh_invcampos[1]= -lar->co[1];
 		lar->sh_invcampos[2]= -lar->co[2];
-		MTC_Mat3MulVecfl(lar->imat, lar->sh_invcampos);
+		Mat3MulVecfl(lar->imat, lar->sh_invcampos);
 		lar->sh_invcampos[2]*= lar->sh_zfac;
 		
 		if(lar->shb) {
 			if(mode==1) {
-				MTC_Mat4Invert(pmat, mat);
-				MTC_Mat4MulMat4(smat, pmat, lar->shb->viewmat);
-				MTC_Mat4MulMat4(lar->shb->persmat, smat, lar->shb->winmat);
+				Mat4Invert(pmat, mat);
+				Mat4MulMat4(smat, pmat, lar->shb->viewmat);
+				Mat4MulMat4(lar->shb->persmat, smat, lar->shb->winmat);
 			}
-			else MTC_Mat4MulMat4(lar->shb->persmat, lar->shb->viewmat, lar->shb->winmat);
+			else Mat4MulMat4(lar->shb->persmat, lar->shb->viewmat, lar->shb->winmat);
 		}
 	}
 	
@@ -373,8 +373,8 @@ static void env_set_imats(Render *re)
 	
 	base= re->scene->base.first;
 	while(base) {
-		MTC_Mat4MulMat4(mat, base->object->obmat, re->viewmat);
-		MTC_Mat4Invert(base->object->imat, mat);
+		Mat4MulMat4(mat, base->object->obmat, re->viewmat);
+		Mat4Invert(base->object->imat, mat);
 		
 		base= base->next;
 	}
@@ -393,18 +393,18 @@ static void render_envmap(Render *re, EnvMap *env)
 	short part;
 	
 	/* need a recalc: ortho-render has no correct viewinv */
-	MTC_Mat4Invert(oldviewinv, re->viewmat);
+	Mat4Invert(oldviewinv, re->viewmat);
 
 	envre= envmap_render_copy(re, env);
 	
 	/* precalc orthmat for object */
-	MTC_Mat4CpyMat4(orthmat, env->object->obmat);
-	MTC_Mat4Ortho(orthmat);
+	Mat4CpyMat4(orthmat, env->object->obmat);
+	Mat4Ortho(orthmat);
 	
 	/* need imat later for texture imat */
-	MTC_Mat4MulMat4(mat, orthmat, re->viewmat);
-	MTC_Mat4Invert(tmat, mat);
-	MTC_Mat3CpyMat4(env->obimat, tmat);
+	Mat4MulMat4(mat, orthmat, re->viewmat);
+	Mat4Invert(tmat, mat);
+	Mat3CpyMat4(env->obimat, tmat);
 
 	for(part=0; part<6; part++) {
 		if(env->type==ENV_PLANE && part!=1)
@@ -412,17 +412,17 @@ static void render_envmap(Render *re, EnvMap *env)
 		
 		re->display_clear(re->dch, envre->result);
 		
-		MTC_Mat4CpyMat4(tmat, orthmat);
+		Mat4CpyMat4(tmat, orthmat);
 		envmap_transmatrix(tmat, part);
-		MTC_Mat4Invert(mat, tmat);
+		Mat4Invert(mat, tmat);
 		/* mat now is the camera 'viewmat' */
 
-		MTC_Mat4CpyMat4(envre->viewmat, mat);
-		MTC_Mat4CpyMat4(envre->viewinv, tmat);
+		Mat4CpyMat4(envre->viewmat, mat);
+		Mat4CpyMat4(envre->viewinv, tmat);
 		
 		/* we have to correct for the already rotated vertexcoords */
-		MTC_Mat4MulMat4(tmat, oldviewinv, envre->viewmat);
-		MTC_Mat4Invert(env->imat, tmat);
+		Mat4MulMat4(tmat, oldviewinv, envre->viewmat);
+		Mat4Invert(env->imat, tmat);
 		
 		env_rotate_scene(envre, tmat, 1);
 		init_render_world(envre);
@@ -503,13 +503,13 @@ void make_envmaps(Render *re)
 							float orthmat[4][4], mat[4][4], tmat[4][4];
 							
 							/* precalc orthmat for object */
-							MTC_Mat4CpyMat4(orthmat, env->object->obmat);
-							MTC_Mat4Ortho(orthmat);
+							Mat4CpyMat4(orthmat, env->object->obmat);
+							Mat4Ortho(orthmat);
 							
 							/* need imat later for texture imat */
-							MTC_Mat4MulMat4(mat, orthmat, re->viewmat);
-							MTC_Mat4Invert(tmat, mat);
-							MTC_Mat3CpyMat4(env->obimat, tmat);
+							Mat4MulMat4(mat, orthmat, re->viewmat);
+							Mat4Invert(tmat, mat);
+							Mat3CpyMat4(env->obimat, tmat);
 						}
 						else {
 							
@@ -678,20 +678,20 @@ int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexRe
 	
 	/* rotate to envmap space, if object is set */
 	VECCOPY(vec, texvec);
-	if(env->object) MTC_Mat3MulVecfl(env->obimat, vec);
-	else MTC_Mat4Mul3Vecfl(R.viewinv, vec);
+	if(env->object) Mat3MulVecfl(env->obimat, vec);
+	else Mat4Mul3Vecfl(R.viewinv, vec);
 	
 	face= envcube_isect(env, vec, sco);
 	ibuf= env->cube[face];
 	
 	if(osatex) {
 		if(env->object) {
-			MTC_Mat3MulVecfl(env->obimat, dxt);
-			MTC_Mat3MulVecfl(env->obimat, dyt);
+			Mat3MulVecfl(env->obimat, dxt);
+			Mat3MulVecfl(env->obimat, dyt);
 		}
 		else {
-			MTC_Mat4Mul3Vecfl(R.viewinv, dxt);
-			MTC_Mat4Mul3Vecfl(R.viewinv, dyt);
+			Mat4Mul3Vecfl(R.viewinv, dxt);
+			Mat4Mul3Vecfl(R.viewinv, dyt);
 		}
 		set_dxtdyt(dxts, dyts, dxt, dyt, face);
 		imagewraposa(tex, NULL, ibuf, sco, dxts, dyts, texres);
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 842adcf8520..d388e81a745 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -41,7 +41,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_jitter.h"
 
-#include "MTC_matrixops.h"
+
 
 #include "DNA_camera_types.h"
 #include "DNA_group_types.h"
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c
index 75a2ab257f4..de3a50acddf 100644
--- a/source/blender/render/intern/source/pixelshading.c
+++ b/source/blender/render/intern/source/pixelshading.c
@@ -32,8 +32,8 @@
 /* External modules: */
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "MTC_matrixops.h"
-#include "MTC_vectorops.h"
+
+
 
 #include "DNA_camera_types.h"
 #include "DNA_group_types.h"
@@ -155,7 +155,7 @@ static void render_lighting_halo(HaloRen *har, float *colf)
 					
 					/* rotate view to lampspace */
 					VECCOPY(lvrot, lv);
-					MTC_Mat3MulVecfl(lar->imat, lvrot);
+					Mat3MulVecfl(lar->imat, lvrot);
 					
 					x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
 					/* 1.0/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
@@ -553,7 +553,7 @@ void shadeSkyView(float *colf, float *rco, float *view, float *dxyview, short th
 		VECCOPY(lo, view);
 		if(R.wrld.skytype & WO_SKYREAL) {
 			
-			MTC_Mat3MulVecfl(R.imat, lo);
+			Mat3MulVecfl(R.imat, lo);
 			
 			SWAP(float, lo[1],  lo[2]);
 			
@@ -595,7 +595,7 @@ void shadeSunView(float *colf, float *view)
 				
 				VECCOPY(sview, view);
 				Normalize(sview);
-				MTC_Mat3MulVecfl(R.imat, sview);
+				Mat3MulVecfl(R.imat, sview);
 				if (sview[2] < 0.0)
 					sview[2] = 0.0;
 				Normalize(sview);
@@ -678,7 +678,7 @@ void shadeAtmPixel(struct SunSky *sunsky, float *collector, float fx, float fy,
 		
 	calc_view_vector(view, fx, fy);
 	Normalize(view);
-	/*MTC_Mat3MulVecfl(R.imat, view);*/
+	/*Mat3MulVecfl(R.imat, view);*/
 	AtmospherePixleShader(sunsky, view, distance, collector);
 }
 
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index 33085b98095..48305d31e10 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "MTC_matrixops.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_group_types.h"
@@ -403,7 +403,7 @@ void makeshadowbuf(Render *re, LampRen *lar)
 	wsize= shb->pixsize*(shb->size/2.0);
 	
 	i_window(-wsize, wsize, -wsize, wsize, shb->d, shb->clipend, shb->winmat);
-	MTC_Mat4MulMat4(shb->persmat, shb->viewmat, shb->winmat);
+	Mat4MulMat4(shb->persmat, shb->viewmat, shb->winmat);
 
 	if(ELEM(lar->buftype, LA_SHADBUF_REGULAR, LA_SHADBUF_HALFWAY)) {
 		/* jitter, weights - not threadsafe! */
@@ -673,7 +673,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
 	VECCOPY(co, rco);
 	co[3]= 1.0f;
 
-	MTC_Mat4MulVec4fl(shb->persmat, co);	/* rational hom co */
+	Mat4MulVec4fl(shb->persmat, co);	/* rational hom co */
 
 	xs1= siz*(1.0f+co[0]/co[3]);
 	ys1= siz*(1.0f+co[1]/co[3]);
@@ -714,7 +714,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
 	co[1]= rco[1]+dxco[1];
 	co[2]= rco[2]+dxco[2];
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
+	Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
 	dx[0]= xs1- siz*(1.0+co[0]/co[3]);
 	dx[1]= ys1- siz*(1.0+co[1]/co[3]);
 	
@@ -722,7 +722,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
 	co[1]= rco[1]+dyco[1];
 	co[2]= rco[2]+dyco[2];
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
+	Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
 	dy[0]= xs1- siz*(1.0+co[0]/co[3]);
 	dy[1]= ys1- siz*(1.0+co[1]/co[3]);
 	
@@ -858,7 +858,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
 	co[1]= p1[1];
 	co[2]= p1[2]/lar->sh_zfac;
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
+	Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
 	xf1= siz*(1.0+co[0]/co[3]);
 	yf1= siz*(1.0+co[1]/co[3]);
 	zf1= (co[2]/co[3]);
@@ -868,7 +868,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
 	co[1]= p2[1];
 	co[2]= p2[2]/lar->sh_zfac;
 	co[3]= 1.0;
-	MTC_Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
+	Mat4MulVec4fl(shb->winmat, co);	/* rational hom co */
 	xf2= siz*(1.0+co[0]/co[3]);
 	yf2= siz*(1.0+co[1]/co[3]);
 	zf2= (co[2]/co[3]);
@@ -1659,7 +1659,7 @@ static int viewpixel_to_lampbuf(ShadBuf *shb, ObjectInstanceRen *obi, VlakRen *v
 	}
 	
 	/* move 3d vector to lampbuf */
-	MTC_Mat4MulVec4fl(shb->persmat, hoco);	/* rational hom co */
+	Mat4MulVec4fl(shb->persmat, hoco);	/* rational hom co */
 	
 	/* clip We can test for -1.0/1.0 because of the properties of the
 	 * coordinate transformations. */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 1a0edfd53ed..7541ce53073 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -29,7 +29,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "MTC_matrixops.h"
+
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
@@ -458,13 +458,13 @@ void shade_input_set_strand_texco(ShadeInput *shi, StrandRen *strand, StrandVert
 
 		if(texco & TEXCO_GLOB) {
 			VECCOPY(shi->gl, shi->co);
-			MTC_Mat4MulVecfl(R.viewinv, shi->gl);
+			Mat4MulVecfl(R.viewinv, shi->gl);
 			
 			if(shi->osatex) {
 				VECCOPY(shi->dxgl, shi->dxco);
-				MTC_Mat3MulVecfl(R.imat, shi->dxco);
+				Mat3MulVecfl(R.imat, shi->dxco);
 				VECCOPY(shi->dygl, shi->dyco);
-				MTC_Mat3MulVecfl(R.imat, shi->dyco);
+				Mat3MulVecfl(R.imat, shi->dyco);
 			}
 		}
 
@@ -1021,15 +1021,15 @@ void shade_input_set_shade_texco(ShadeInput *shi)
 		
 		if(texco & TEXCO_GLOB) {
 			VECCOPY(shi->gl, shi->co);
-			MTC_Mat4MulVecfl(R.viewinv, shi->gl);
+			Mat4MulVecfl(R.viewinv, shi->gl);
 			if(shi->osatex) {
 				VECCOPY(shi->dxgl, shi->dxco);
 				// TXF: bug was here, but probably should be in convertblender.c, R.imat only valid if there is a world
-				//MTC_Mat3MulVecfl(R.imat, shi->dxco);
-				MTC_Mat4Mul3Vecfl(R.viewinv, shi->dxco);
+				//Mat3MulVecfl(R.imat, shi->dxco);
+				Mat4Mul3Vecfl(R.viewinv, shi->dxco);
 				VECCOPY(shi->dygl, shi->dyco);
-				//MTC_Mat3MulVecfl(R.imat, shi->dyco);
-				MTC_Mat4Mul3Vecfl(R.viewinv, shi->dyco);
+				//Mat3MulVecfl(R.imat, shi->dyco);
+				Mat4Mul3Vecfl(R.viewinv, shi->dyco);
 			}
 		}
 		
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 2f6f86e9a09..5e523199755 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -30,7 +30,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "MTC_matrixops.h"
+
 #include "BLI_arithb.h"
 
 #include "BKE_colortools.h"
@@ -168,7 +168,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens)
 		p1[0]= shi->co[0]-lar->co[0];
 		p1[1]= shi->co[1]-lar->co[1];
 		p1[2]= -lar->co[2];
-		MTC_Mat3MulVecfl(lar->imat, p1);
+		Mat3MulVecfl(lar->imat, p1);
 		VECCOPY(npos, p1);	// npos is double!
 		
 		/* pre-scale */
@@ -180,7 +180,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens)
 	
 	/* rotate view */
 	VECCOPY(nray, shi->view);
-	MTC_Mat3MulVecd(lar->imat, nray);
+	Mat3MulVecd(lar->imat, nray);
 	
 	if(R.wrld.mode & WO_MIST) {
 		/* patchy... */
@@ -1143,7 +1143,7 @@ float lamp_get_visibility(LampRen *lar, float *co, float *lv, float *dist)
 							
 							/* rotate view to lampspace */
 							VECCOPY(lvrot, lv);
-							MTC_Mat3MulVecfl(lar->imat, lvrot);
+							Mat3MulVecfl(lar->imat, lvrot);
 							
 							x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
 							/* 1.0f/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index c706c6ccc11..4d4a2c04808 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "MTC_matrixops.h"
+
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
@@ -832,7 +832,7 @@ static int cubemap_glob(float *n, float x, float y, float z, float *adr1, float
 	else {
 		VECCOPY(nor, n);
 	}
-	MTC_Mat4Mul3Vecfl(R.viewinv, nor);
+	Mat4Mul3Vecfl(R.viewinv, nor);
 
 	x1= fabs(nor[0]);
 	y1= fabs(nor[1]);
@@ -925,7 +925,7 @@ static int cubemap_ob(Object *ob, float *n, float x, float y, float z, float *ad
 	if(n==NULL) return 0;
 	
 	VECCOPY(nor, n);
-	if(ob) MTC_Mat4Mul3Vecfl(ob->imat, nor);
+	if(ob) Mat4Mul3Vecfl(ob->imat, nor);
 	
 	x1= fabs(nor[0]);
 	y1= fabs(nor[1]);
@@ -1648,13 +1648,13 @@ void do_material_tex(ShadeInput *shi)
 					VECCOPY(tempvec, shi->co);
 					if(mtex->texflag & MTEX_OB_DUPLI_ORIG)
 						if(shi->obi && shi->obi->duplitexmat)
-							MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
-					MTC_Mat4MulVecfl(ob->imat, tempvec);
+							Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
+					Mat4MulVecfl(ob->imat, tempvec);
 					if(shi->osatex) {
 						VECCOPY(dxt, shi->dxco);
 						VECCOPY(dyt, shi->dyco);
-						MTC_Mat4Mul3Vecfl(ob->imat, dxt);
-						MTC_Mat4Mul3Vecfl(ob->imat, dyt);
+						Mat4Mul3Vecfl(ob->imat, dxt);
+						Mat4Mul3Vecfl(ob->imat, dyt);
 					}
 				}
 				else {
@@ -2291,9 +2291,9 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 					VECCOPY(co, xyz);	
 					if(mtex->texflag & MTEX_OB_DUPLI_ORIG) {
 						if(shi->obi && shi->obi->duplitexmat)
-							MTC_Mat4MulVecfl(shi->obi->duplitexmat, co);					
+							Mat4MulVecfl(shi->obi->duplitexmat, co);					
 					} 
-					MTC_Mat4MulVecfl(ob->imat, co);
+					Mat4MulVecfl(ob->imat, co);
 				}
 			}
 			/* not really orco, but 'local' */
@@ -2305,12 +2305,12 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
 				else {
 					Object *ob= shi->obi->ob;
 					VECCOPY(co, xyz);
-					MTC_Mat4MulVecfl(ob->imat, co);
+					Mat4MulVecfl(ob->imat, co);
 				}
 			}
 			else if(mtex->texco==TEXCO_GLOB) {							
 			   VECCOPY(co, xyz);
-			   MTC_Mat4MulVecfl(R.viewinv, co);
+			   Mat4MulVecfl(R.viewinv, co);
 			}
 			else continue;	// can happen when texco defines disappear and it renders old files
 
@@ -2639,7 +2639,7 @@ void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, f
 			case TEXCO_OBJECT:
 				if(mtex->object) {
 					VECCOPY(tempvec, lo);
-					MTC_Mat4MulVecfl(mtex->object->imat, tempvec);
+					Mat4MulVecfl(mtex->object->imat, tempvec);
 					co= tempvec;
 				}
 				break;
@@ -2647,16 +2647,16 @@ void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, f
 			case TEXCO_GLOB:
 				if(rco) {
 					VECCOPY(tempvec, rco);
-					MTC_Mat4MulVecfl(R.viewinv, tempvec);
+					Mat4MulVecfl(R.viewinv, tempvec);
 					co= tempvec;
 				}
 				else
 					co= lo;
 				
 //				VECCOPY(shi->dxgl, shi->dxco);
-//				MTC_Mat3MulVecfl(R.imat, shi->dxco);
+//				Mat3MulVecfl(R.imat, shi->dxco);
 //				VECCOPY(shi->dygl, shi->dyco);
-//				MTC_Mat3MulVecfl(R.imat, shi->dyco);
+//				Mat3MulVecfl(R.imat, shi->dyco);
 				break;
 			}
 			
@@ -2783,12 +2783,12 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
 					dx= dxt;
 					dy= dyt;
 					VECCOPY(tempvec, shi->co);
-					MTC_Mat4MulVecfl(ob->imat, tempvec);
+					Mat4MulVecfl(ob->imat, tempvec);
 					if(shi->osatex) {
 						VECCOPY(dxt, shi->dxco);
 						VECCOPY(dyt, shi->dyco);
-						MTC_Mat4Mul3Vecfl(ob->imat, dxt);
-						MTC_Mat4Mul3Vecfl(ob->imat, dyt);
+						Mat4Mul3Vecfl(ob->imat, dxt);
+						Mat4Mul3Vecfl(ob->imat, dyt);
 					}
 				}
 				else {
@@ -2799,12 +2799,12 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
 			else if(mtex->texco==TEXCO_GLOB) {
 				co= shi->gl; dx= shi->dxco; dy= shi->dyco;
 				VECCOPY(shi->gl, shi->co);
-				MTC_Mat4MulVecfl(R.viewinv, shi->gl);
+				Mat4MulVecfl(R.viewinv, shi->gl);
 			}
 			else if(mtex->texco==TEXCO_VIEW) {
 				
 				VECCOPY(tempvec, lavec);
-				MTC_Mat3MulVecfl(la->imat, tempvec);
+				Mat3MulVecfl(la->imat, tempvec);
 				
 				if(la->type==LA_SPOT) {
 					tempvec[0]*= la->spottexfac;
@@ -2817,8 +2817,8 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
 					VECCOPY(dxt, shi->dxlv);
 					VECCOPY(dyt, shi->dylv);
 					/* need some matrix conversion here? la->imat is a [3][3]  matrix!!! **/
-					MTC_Mat3MulVecfl(la->imat, dxt);
-					MTC_Mat3MulVecfl(la->imat, dyt);
+					Mat3MulVecfl(la->imat, dxt);
+					Mat3MulVecfl(la->imat, dyt);
 					
 					VecMulf(dxt, la->spottexfac);
 					VecMulf(dyt, la->spottexfac);
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 53a05dd0d67..3b3a8568933 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -42,7 +42,7 @@
 #include "BLI_jitter.h"
 #include "BLI_threads.h"
 
-#include "MTC_matrixops.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_lamp_types.h"

From a46beac3f87ee78d6231b2f0038db31c50aa2315 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 6 Sep 2009 01:11:47 +0000
Subject: [PATCH 452/577] Rename Vec3ToTangent VecBisect3, since that's what it
 does.

---
 source/blender/blenkernel/intern/curve.c | 8 ++++----
 source/blender/blenlib/BLI_arithb.h      | 2 +-
 source/blender/blenlib/intern/arithb.c   | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 709507a9b26..25af0cb5ce3 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1903,7 +1903,7 @@ void makeBevelList(Object *ob)
 		}	/* this has to be >2 points */
 		else if(cu->flag & CU_NO_TWIST && cu->flag & CU_3D && bl->poly != -1) {
 
-			/* Special case, cyclic curve with no twisy. tricky... */
+			/* Special case, cyclic curve with no twist. tricky... */
 
 			float quat[4], q[4], cross[3];
 
@@ -1924,7 +1924,7 @@ void makeBevelList(Object *ob)
 				while(nr--) {
 	
 					/* Normalizes */
-					Vec3ToTangent(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+					VecBisect3(vec, &bevp0->x, &bevp1->x, &bevp2->x);
 
 					if(bl->nr==nr+1) { /* first time */
 						vectoquat(vec, 5, 1, quat);
@@ -1976,7 +1976,7 @@ void makeBevelList(Object *ob)
 			nr= bl->nr;
 			while(nr--) {
 
-				Vec3ToTangent(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+				VecBisect3(vec, &bevp0->x, &bevp1->x, &bevp2->x);
 
 				quat_tmp1= (float *)bevp1->mat;
 				quat_tmp2= quat_tmp1+4;
@@ -2014,7 +2014,7 @@ void makeBevelList(Object *ob)
 				if(cu->flag & CU_3D) {	/* 3D */
 
 					/* Normalizes */
-					Vec3ToTangent(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+					VecBisect3(vec, &bevp0->x, &bevp1->x, &bevp2->x);
 
 					if(bl->nr==nr+1 || !(cu->flag & CU_NO_TWIST)) { /* first time */
 						vectoquat(vec, 5, 1, quat);
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 63b351016d4..86b626dabdf 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -270,7 +270,7 @@ void AxisAngleToQuat(float *q, float *axis, float angle);
 void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3]);
 void vectoquat(float *vec, short axis, short upflag, float *q);
 
-void Vec3ToTangent(float *v, float *v1, float *v2, float *v3);
+void VecBisect3(float *v, float *v1, float *v2, float *v3);
 float VecAngle2(float *v1, float *v2);
 float VecAngle3(float *v1, float *v2, float *v3);
 float NormalizedVecAngle2(float *v1, float *v2);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 970d8f7d0de..c20794953b9 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2969,17 +2969,16 @@ void VecRotToQuat( float *vec, float phi, float *quat)
 	}
 }
 
-/* get a direction from 3 vectors that wont depend
- * on the distance between the points */
-void Vec3ToTangent(float *v, float *v1, float *v2, float *v3)
+/* Returns a vector bisecting the angle at v2 formed by v1, v2 and v3 */
+void VecBisect3(float *out, float *v1, float *v2, float *v3)
 {
 	float d_12[3], d_23[3];
 	VecSubf(d_12, v2, v1);
 	VecSubf(d_23, v3, v2);
 	Normalize(d_12);
 	Normalize(d_23);
-	VecAddf(v, d_12, d_23);
-	Normalize(v);
+	VecAddf(out, d_12, d_23);
+	Normalize(out);
 }
 
 /* Return the angle in degrees between vecs 1-2 and 2-3 in degrees

From 0a3694cd6ebec710da7110e9f168a72d47c71ee0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 6 Sep 2009 01:51:23 +0000
Subject: [PATCH 453/577] white space commit. (2 spaces -> tab). Was annoying
 to use a different editor for cmake only. theeth says this should be ok with
 gsoc and merges from branches.

---
 CMakeLists.txt                                | 674 +++++++++---------
 extern/CMakeLists.txt                         |   6 +-
 extern/bullet2/CMakeLists.txt                 |  20 +-
 .../src/BulletCollision/CMakeLists.txt        |   4 +-
 .../bullet2/src/BulletSoftBody/CMakeLists.txt |   2 +-
 extern/glew/CMakeLists.txt                    |   4 +-
 intern/CMakeLists.txt                         |   2 +-
 intern/audaspace/CMakeLists.txt               |  38 +-
 intern/elbeem/CMakeLists.txt                  |   4 +-
 intern/ghost/CMakeLists.txt                   |  46 +-
 intern/guardedalloc/CMakeLists.txt            |   4 +-
 intern/smoke/CMakeLists.txt                   |   6 +-
 source/CMakeLists.txt                         |   4 +-
 source/blender/CMakeLists.txt                 |   8 +-
 source/blender/avi/CMakeLists.txt             |   4 +-
 source/blender/blenfont/CMakeLists.txt        |  10 +-
 source/blender/blenkernel/CMakeLists.txt      |  46 +-
 source/blender/blenlib/CMakeLists.txt         |  12 +-
 source/blender/blenloader/CMakeLists.txt      |  10 +-
 source/blender/blenpluginapi/CMakeLists.txt   |   6 +-
 source/blender/editors/CMakeLists.txt         |  52 +-
 source/blender/editors/screen/CMakeLists.txt  |  40 +-
 source/blender/gpu/CMakeLists.txt             |   4 +-
 source/blender/imbuf/CMakeLists.txt           |  28 +-
 .../imbuf/intern/cineon/CMakeLists.txt        |  16 +-
 .../blender/imbuf/intern/dds/CMakeLists.txt   |  18 +-
 .../imbuf/intern/openexr/CMakeLists.txt       |  20 +-
 source/blender/makesdna/intern/CMakeLists.txt |   6 +-
 source/blender/makesrna/intern/CMakeLists.txt |  42 +-
 source/blender/nodes/CMakeLists.txt           |  26 +-
 source/blender/python/CMakeLists.txt          |  16 +-
 source/blender/quicktime/CMakeLists.txt       |  24 +-
 source/blender/readblenfile/CMakeLists.txt    |   2 +-
 source/blender/render/CMakeLists.txt          |  18 +-
 source/blender/windowmanager/CMakeLists.txt   |  46 +-
 source/blenderplayer/CMakeLists.txt           | 160 ++---
 .../bad_level_call_stubs/CMakeLists.txt       |  10 +-
 source/creator/CMakeLists.txt                 | 586 +++++++--------
 .../gameengine/BlenderRoutines/CMakeLists.txt |  68 +-
 source/gameengine/CMakeLists.txt              |   2 +-
 source/gameengine/Converter/CMakeLists.txt    |  68 +-
 source/gameengine/Expressions/CMakeLists.txt  |  14 +-
 source/gameengine/GameLogic/CMakeLists.txt    |  20 +-
 source/gameengine/GamePlayer/CMakeLists.txt   |   2 +-
 .../GamePlayer/common/CMakeLists.txt          |  82 +--
 .../GamePlayer/ghost/CMakeLists.txt           |  74 +-
 source/gameengine/Ketsji/CMakeLists.txt       |  70 +-
 .../Ketsji/KXNetwork/CMakeLists.txt           |  20 +-
 source/gameengine/Network/CMakeLists.txt      |   8 +-
 .../Network/LoopBackNetwork/CMakeLists.txt    |   8 +-
 .../gameengine/Physics/Bullet/CMakeLists.txt  |  34 +-
 .../gameengine/Physics/Dummy/CMakeLists.txt   |   4 +-
 .../gameengine/Physics/common/CMakeLists.txt  |   6 +-
 source/gameengine/Rasterizer/CMakeLists.txt   |  18 +-
 .../RAS_OpenGLRasterizer/CMakeLists.txt       |  24 +-
 source/gameengine/SceneGraph/CMakeLists.txt   |   4 +-
 source/gameengine/VideoTexture/CMakeLists.txt |  50 +-
 source/kernel/CMakeLists.txt                  |  10 +-
 58 files changed, 1305 insertions(+), 1305 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5000ecfac5c..7196049f964 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,11 +34,11 @@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
 Remove the CMakeCache.txt file and try again from another folder, e.g.: 
 
-   rm CMakeCache.txt 
-   cd ..
-   mkdir cmake-make 
-   cd cmake-make
-   cmake -G \"Unix Makefiles\" ../blender
+	rm CMakeCache.txt 
+	cd ..
+	mkdir cmake-make 
+	cd cmake-make
+	cmake -G \"Unix Makefiles\" ../blender
 ")
 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
@@ -76,7 +76,7 @@ OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-  MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
@@ -95,421 +95,421 @@ INCLUDE(CMake/macros.cmake)
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
-  IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
-  ENDIF(WITH_OPENAL)
+	IF(WITH_OPENAL)
+		FIND_PACKAGE(OpenAL)
+		IF(OPENAL_FOUND)
+			SET(WITH_OPENAL ON)
+		ELSE(OPENAL_FOUND)
+			SET(WITH_OPENAL OFF)
+		ENDIF(OPENAL_FOUND)
+	ENDIF(WITH_OPENAL)
 
-  IF(WITH_JACK)
-    SET(JACK /usr)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK /usr)
+		SET(JACK_INC ${JACK}/include/jack)
+		SET(JACK_LIB jack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
 	SET(SNDFILE /usr)
 	SET(SNDFILE_INC ${SNDFILE}/include)
 	SET(SNDFILE_LIB sndfile)
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	ENDIF(WITH_SNDFILE)
 
-  FIND_LIBRARY(INTL_LIBRARY
-    NAMES intl
-    PATHS
-    /sw/lib
-  )
-  FIND_LIBRARY(ICONV_LIBRARY
-    NAMES iconv
-    PATHS
-    /sw/lib
-  )
+	FIND_LIBRARY(INTL_LIBRARY
+		NAMES intl
+		PATHS
+		/sw/lib
+	)
+	FIND_LIBRARY(ICONV_LIBRARY
+		NAMES iconv
+		PATHS
+		/sw/lib
+	)
   
-  IF(INTL_LIBRARY AND ICONV_LIBRARY)
-    SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-  ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	IF(INTL_LIBRARY AND ICONV_LIBRARY)
+		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
 
-  FIND_PACKAGE(Freetype)
-  # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+	FIND_PACKAGE(Freetype)
+	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-  # No way to set py31. remove for now.
-  # FIND_PACKAGE(PythonLibs)
-  SET(PYTHON /usr)
-  SET(PYTHON_VERSION 3.1)
-  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-  # SET(PYTHON_BINARY python) # not used yet
-  SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-  SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	# No way to set py31. remove for now.
+	# FIND_PACKAGE(PythonLibs)
+	SET(PYTHON /usr)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
   
-  # FIND_PACKAGE(PythonInterp) # not used yet
-  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+	# FIND_PACKAGE(PythonInterp) # not used yet
+	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
   
-  SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
-  IF(WITH_SDL)
-    FIND_PACKAGE(SDL)
-    # UNSET(SDLMAIN_LIBRARY CACHE)
-    IF(NOT SDL_FOUND)
-      SET(WITH_SDL OFF)
-    ENDIF(NOT SDL_FOUND)
-  ENDIF(WITH_SDL)
+	IF(WITH_SDL)
+		FIND_PACKAGE(SDL)
+		# UNSET(SDLMAIN_LIBRARY CACHE)
+		IF(NOT SDL_FOUND)
+			SET(WITH_SDL OFF)
+		ENDIF(NOT SDL_FOUND)
+	ENDIF(WITH_SDL)
 
-  FIND_PATH(OPENEXR_INC
-    ImfXdr.h
-    PATHS
-    /usr/local/include/OpenEXR
-    /usr/include/OpenEXR
-    /sw/include/OpenEXR
-    /opt/local/include/OpenEXR
-    /opt/csw/include/OpenEXR
-    /opt/include/OpenEXR
-  )
-  SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	FIND_PATH(OPENEXR_INC
+		ImfXdr.h
+		PATHS
+		/usr/local/include/OpenEXR
+		/usr/include/OpenEXR
+		/sw/include/OpenEXR
+		/opt/local/include/OpenEXR
+		/opt/csw/include/OpenEXR
+		/opt/include/OpenEXR
+	)
+	SET(OPENEXR_LIB Half IlmImf Iex Imath)
 
-  SET(FFMPEG /usr)
-  SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	SET(FFMPEG /usr)
+	SET(FFMPEG_INC ${FFMPEG}/include)
+	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 /usr)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB fftw3)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+	IF(WITH_FFTW3)
+		SET(FFTW3 /usr)
+		SET(FFTW3_INC ${FFTW3}/include)
+		SET(FFTW3_LIB fftw3)
+		SET(FFTW3_LIBPATH ${FFTW3}/lib)
+	ENDIF(WITH_FFTW3)
 
-  SET(LIBSAMPLERATE /usr)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB samplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+	SET(LIBSAMPLERATE /usr)
+	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+	SET(LIBSAMPLERATE_LIB samplerate)
+	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-  FIND_PACKAGE(JPEG REQUIRED)
+	FIND_PACKAGE(JPEG REQUIRED)
 
-  FIND_PACKAGE(PNG REQUIRED)
+	FIND_PACKAGE(PNG REQUIRED)
 
-  FIND_PACKAGE(ZLIB REQUIRED)
+	FIND_PACKAGE(ZLIB REQUIRED)
 
-  # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+	# Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+	SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
 
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    # BSD's dont use libdl.so
-    SET(LLIBS "${LLIBS} -ldl")
-  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+		# BSD's dont use libdl.so
+		SET(LLIBS "${LLIBS} -ldl")
+	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-  IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
-  ENDIF(WITH_OPENMP)
+	IF(WITH_OPENMP)
+		SET(LLIBS "${LLIBS} -lgomp")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+	ENDIF(WITH_OPENMP)
 
 
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
+	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
 
-  SET(PLATFORM_LINKFLAGS "-pthread")
+	SET(PLATFORM_LINKFLAGS "-pthread")
 
-  # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
-  SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+	# Better warnings
+	SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+	SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
-  INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+	INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
 
 IF(WIN32)
 
-  # this file is included anyway when building under Windows with cl.exe
-  #  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+	# this file is included anyway when building under Windows with cl.exe
+	#  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
   
-  SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
-  # Setup 64bit and 64bit windows systems
-  IF(CMAKE_CL_64)
-    message("64 bit compiler detected.")
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
-  ENDIF(CMAKE_CL_64)
+	# Setup 64bit and 64bit windows systems
+	IF(CMAKE_CL_64)
+		message("64 bit compiler detected.")
+		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+	ENDIF(CMAKE_CL_64)
 
-  SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 3.1)
-  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-  # SET(PYTHON_BINARY python) # not used yet
-  SET(PYTHON_LIB python31)
-  SET(PYTHON_LIBPATH ${PYTHON}/lib)
+	SET(PYTHON ${LIBDIR}/python)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python31)
+	SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
-  IF(CMAKE_CL_64)
-    SET(WITH_OPENAL OFF)
-  ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-    SET(OPENAL_LIBRARY wrap_oal)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
-  ENDIF(CMAKE_CL_64)
+	IF(CMAKE_CL_64)
+		SET(WITH_OPENAL OFF)
+	ELSE(CMAKE_CL_64)
+		#SET(WITH_OPENAL ON)
+		SET(OPENAL ${LIBDIR}/openal)
+		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+		SET(OPENAL_LIBRARY wrap_oal)
+		SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	ENDIF(CMAKE_CL_64)
 
-  IF(WITH_JACK)
-    SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
-    SET(JACK_LIB libjack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK ${LIBDIR}/jack)
+		SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+		SET(JACK_LIB libjack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
-	SET(SNDFILE ${LIBDIR}/sndfile)
-	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB libsndfile-1)
-	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
+		SET(SNDFILE ${LIBDIR}/sndfile)
+		SET(SNDFILE_INC ${SNDFILE}/include)
+		SET(SNDFILE_LIB libsndfile-1)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
 
-  IF(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng)
-  ELSE(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng_st)
-  ENDIF(CMAKE_CL_64)
-  SET(JPEG_LIBRARY libjpeg)
+	IF(CMAKE_CL_64)
+		SET(PNG_LIBRARIES libpng)
+	ELSE(CMAKE_CL_64)
+		SET(PNG_LIBRARIES libpng_st)
+	ENDIF(CMAKE_CL_64)
+	SET(JPEG_LIBRARY libjpeg)
 
-  SET(ZLIB ${LIBDIR}/zlib)
-  SET(ZLIB_INC ${ZLIB}/include)
-  IF(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES libz)
-  ELSE(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES zlib)
-  ENDIF(CMAKE_CL_64)
-  SET(ZLIB_LIBPATH ${ZLIB}/lib)
+	SET(ZLIB ${LIBDIR}/zlib)
+	SET(ZLIB_INC ${ZLIB}/include)
+	IF(CMAKE_CL_64)
+		SET(ZLIB_LIBRARIES libz)
+	ELSE(CMAKE_CL_64)
+		SET(ZLIB_LIBRARIES zlib)
+	ENDIF(CMAKE_CL_64)
+	SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
-  SET(PTHREADS ${LIBDIR}/pthreads)
-  SET(PTHREADS_INC ${PTHREADS}/include)
-  SET(PTHREADS_LIB pthreadVC2)
-  SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
+	SET(PTHREADS ${LIBDIR}/pthreads)
+	SET(PTHREADS_INC ${PTHREADS}/include)
+	SET(PTHREADS_LIB pthreadVC2)
+	SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
   
-  SET(ICONV ${LIBDIR}/iconv)
-  SET(ICONV_INC ${ICONV}/include)
-  SET(ICONV_LIB iconv)
-  SET(ICONV_LIBPATH ${ICONV}/lib)
+	SET(ICONV ${LIBDIR}/iconv)
+	SET(ICONV_INC ${ICONV}/include)
+	SET(ICONV_LIB iconv)
+	SET(ICONV_LIBPATH ${ICONV}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 ${LIBDIR}/fftw3)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB libfftw)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+	IF(WITH_FFTW3)
+		SET(FFTW3 ${LIBDIR}/fftw3)
+		SET(FFTW3_INC ${FFTW3}/include)
+		SET(FFTW3_LIB libfftw)
+		SET(FFTW3_LIBPATH ${FFTW3}/lib)
+	ENDIF(WITH_FFTW3)
   
-  SET(GETTEXT ${LIBDIR}/gettext)
-  SET(GETTEXT_INC ${GETTEXT}/include)
-  IF(CMAKE_CL_64)
-    SET(GETTEXT_LIB gettext)
-  ELSE(CMAKE_CL_64)
-    SET(GETTEXT_LIB gnu_gettext)
-  ENDIF(CMAKE_CL_64)
-  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+	SET(GETTEXT ${LIBDIR}/gettext)
+	SET(GETTEXT_INC ${GETTEXT}/include)
+	IF(CMAKE_CL_64)
+		SET(GETTEXT_LIB gettext)
+	ELSE(CMAKE_CL_64)
+		SET(GETTEXT_LIB gnu_gettext)
+	ENDIF(CMAKE_CL_64)
+	SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
 
-  SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIBRARY freetype2ST)
+	SET(FREETYPE ${LIBDIR}/freetype)
+	SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+	SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
+	SET(FREETYPE_LIBRARY freetype2ST)
   
-  SET(OPENEXR ${LIBDIR}/openexr)
-  SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  IF (MSVC80)
-    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
-  ELSE (MSVC80)
-    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
-  ENDIF(MSVC80)
-  IF (MSVC90)
-    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
-  ENDIF(MSVC90)
+	SET(OPENEXR ${LIBDIR}/openexr)
+	SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
+	SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+	IF (MSVC80)
+		SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+	ELSE (MSVC80)
+		SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+	ENDIF(MSVC80)
+	IF (MSVC90)
+		SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+	ENDIF(MSVC90)
 
   
-  SET(QUICKTIME ${LIBDIR}/QTDevWin)
-  SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
-  SET(QUICKTIME_LIB qtmlClient)
-  SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
+	SET(QUICKTIME ${LIBDIR}/QTDevWin)
+	SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
+	SET(QUICKTIME_LIB qtmlClient)
+	SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
 
-  SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
-  SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	SET(FFMPEG ${LIBDIR}/ffmpeg)
+	SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
+	SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
-  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB libsamplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+	SET(LIBSAMPLERATE_LIB libsamplerate)
+	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-  IF(CMAKE_CL_64)
-    SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
-  ELSE(CMAKE_CL_64)
-    SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
-  ENDIF(CMAKE_CL_64)
+	IF(CMAKE_CL_64)
+		SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+	ELSE(CMAKE_CL_64)
+		SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+	ENDIF(CMAKE_CL_64)
 
-  SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
 
-  IF(WITH_OPENMP)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
-  ENDIF(WITH_OPENMP)
+	IF(WITH_OPENMP)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+	ENDIF(WITH_OPENMP)
 
-  SET(SDL ${LIBDIR}/sdl)
-  SET(SDL_INCLUDE_DIR ${SDL}/include)
-  SET(SDL_LIBRARY SDL)
-  SET(SDL_LIBPATH ${SDL}/lib)
+	SET(SDL ${LIBDIR}/sdl)
+	SET(SDL_INCLUDE_DIR ${SDL}/include)
+	SET(SDL_LIBRARY SDL)
+	SET(SDL_LIBPATH ${SDL}/lib)
 
-  SET(PNG "${LIBDIR}/png")
-  SET(PNG_INC "${PNG}/include")
-  SET(PNG_LIBPATH ${PNG}/lib)
+	SET(PNG "${LIBDIR}/png")
+	SET(PNG_INC "${PNG}/include")
+	SET(PNG_LIBPATH ${PNG}/lib)
 
-  SET(JPEG "${LIBDIR}/jpeg")
-  SET(JPEG_INC "${JPEG}/include")
-  SET(JPEG_LIBPATH ${JPEG}/lib)
+	SET(JPEG "${LIBDIR}/jpeg")
+	SET(JPEG_INC "${JPEG}/include")
+	SET(JPEG_LIBPATH ${JPEG}/lib)
 
-  SET(TIFF ${LIBDIR}/tiff)
-  SET(TIFF_INC ${TIFF}/include)
+	SET(TIFF ${LIBDIR}/tiff)
+	SET(TIFF_INC ${TIFF}/include)
   
-  SET(WINTAB_INC ${LIBDIR}/wintab/include) 
+	SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
-  IF(CMAKE_CL_64)
-    SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
-  ELSE(CMAKE_CL_64)
-    SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
-  ENDIF(CMAKE_CL_64)
+	IF(CMAKE_CL_64)
+		SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+	ELSE(CMAKE_CL_64)
+		SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+	ENDIF(CMAKE_CL_64)
   
-  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
+	SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
 ENDIF(WIN32)
 
 IF(APPLE)
-  IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
-  ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
-  ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+	IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
+	ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
 
-  IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
-  ENDIF(WITH_OPENAL)
+	IF(WITH_OPENAL)
+		FIND_PACKAGE(OpenAL)
+		IF(OPENAL_FOUND)
+			SET(WITH_OPENAL ON)
+		ELSE(OPENAL_FOUND)
+			SET(WITH_OPENAL OFF)
+		ENDIF(OPENAL_FOUND)
+	ENDIF(WITH_OPENAL)
 
-  IF(WITH_JACK)
-    SET(JACK /usr)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK /usr)
+		SET(JACK_INC ${JACK}/include/jack)
+		SET(JACK_LIB jack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
-	SET(SNDFILE /usr)
-	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB sndfile)
-	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
+		SET(SNDFILE /usr)
+		SET(SNDFILE_INC ${SNDFILE}/include)
+		SET(SNDFILE_LIB sndfile)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
 
-  SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_VERSION 3.1)
 
-  IF(PYTHON_VERSION MATCHES 3.1)
-    # we use precompiled libraries for py 3.1 and up by default
+	IF(PYTHON_VERSION MATCHES 3.1)
+		# we use precompiled libraries for py 3.1 and up by default
 
-    SET(PYTHON ${LIBDIR}/python)
-    SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
-    SET(PYTHON_LIB python${PYTHON_VERSION})
-    SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
-    #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
-  ELSE(PYTHON_VERSION MATCHES 3.1)
-    # otherwise, use custom system framework
+		SET(PYTHON ${LIBDIR}/python)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		# SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
+		SET(PYTHON_LIB python${PYTHON_VERSION})
+		SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+		#    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+	ELSE(PYTHON_VERSION MATCHES 3.1)
+		# otherwise, use custom system framework
 
-    SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
-    SET(PYTHON_VERSION 2.5)
-    SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
-    SET(PYTHON_LIB "")
-    SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
-    SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
-  ENDIF(PYTHON_VERSION MATCHES 3.1)
+		SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
+		SET(PYTHON_VERSION 2.5)
+		SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		# SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
+		SET(PYTHON_LIB "")
+		SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
+		SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+	ENDIF(PYTHON_VERSION MATCHES 3.1)
 
-  SET(GETTEXT ${LIBDIR}/gettext)
-  SET(GETTEXT_INC "${GETTEXT}/include")
-  SET(GETTEXT_LIB intl iconv)
-  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+	SET(GETTEXT ${LIBDIR}/gettext)
+	SET(GETTEXT_INC "${GETTEXT}/include")
+	SET(GETTEXT_LIB intl iconv)
+	SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 ${LIBDIR}/fftw3)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB libfftw)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+	IF(WITH_FFTW3)
+		SET(FFTW3 ${LIBDIR}/fftw3)
+		SET(FFTW3_INC ${FFTW3}/include)
+		SET(FFTW3_LIB libfftw)
+		SET(FFTW3_LIBPATH ${FFTW3}/lib)
+	ENDIF(WITH_FFTW3)
 
-  SET(PNG_LIBRARIES png)
-  SET(JPEG_LIBRARY jpeg)
+	SET(PNG_LIBRARIES png)
+	SET(JPEG_LIBRARY jpeg)
 
-  SET(ZLIB /usr)
-  SET(ZLIB_INC "${ZLIB}/include")
-  SET(ZLIB_LIBRARIES z)
+	SET(ZLIB /usr)
+	SET(ZLIB_INC "${ZLIB}/include")
+	SET(ZLIB_LIBRARIES z)
 
-  SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIBRARY freetype)
+	SET(FREETYPE ${LIBDIR}/freetype)
+	SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+	SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
+	SET(FREETYPE_LIBRARY freetype)
 
-  SET(OPENEXR ${LIBDIR}/openexr)
-  SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+	SET(OPENEXR ${LIBDIR}/openexr)
+	SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
+	SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+	SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 
-  SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg)
-  SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	SET(FFMPEG ${LIBDIR}/ffmpeg)
+	SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg)
+	SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore)
+	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
-  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB samplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+	SET(LIBSAMPLERATE_LIB samplerate)
+	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-  SET(LLIBS stdc++ SystemStubs)
+	SET(LLIBS stdc++ SystemStubs)
 
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-  SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 
-  IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp ")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
-  ENDIF(WITH_OPENMP)
+	IF(WITH_OPENMP)
+		SET(LLIBS "${LLIBS} -lgomp ")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+	ENDIF(WITH_OPENMP)
 
-  SET(SDL ${LIBDIR}/sdl)
-  SET(SDL_INCLUDE_DIR ${SDL}/include)
-  SET(SDL_LIBRARY SDL)
-  SET(SDL_LIBPATH ${SDL}/lib)
+	SET(SDL ${LIBDIR}/sdl)
+	SET(SDL_INCLUDE_DIR ${SDL}/include)
+	SET(SDL_LIBRARY SDL)
+	SET(SDL_LIBPATH ${SDL}/lib)
 
-  SET(PNG "${LIBDIR}/png")
-  SET(PNG_INC "${PNG}/include")
-  SET(PNG_LIBPATH ${PNG}/lib)
+	SET(PNG "${LIBDIR}/png")
+	SET(PNG_INC "${PNG}/include")
+	SET(PNG_LIBPATH ${PNG}/lib)
 
-  SET(JPEG "${LIBDIR}/jpeg")
-  SET(JPEG_INC "${JPEG}/include")
-  SET(JPEG_LIBPATH ${JPEG}/lib)
+	SET(JPEG "${LIBDIR}/jpeg")
+	SET(JPEG_INC "${JPEG}/include")
+	SET(JPEG_LIBPATH ${JPEG}/lib)
 
-  SET(TIFF ${LIBDIR}/tiff)
-  SET(TIFF_INC ${TIFF}/include)
+	SET(TIFF ${LIBDIR}/tiff)
+	SET(TIFF_INC ${TIFF}/include)
 
-  SET(EXETYPE MACOSX_BUNDLE)
+	SET(EXETYPE MACOSX_BUNDLE)
 ENDIF(APPLE)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
-  SET(BINRELOC_INC ${BINRELOC}/include)
+	SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+	SET(BINRELOC_INC ${BINRELOC}/include)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 
@@ -534,10 +534,10 @@ set(OPENJPEG_LIb extern_libopenjpeg)
 # Blender WebPlugin
 
 IF(WITH_WEBPLUGIN) 
-  SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
-  SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
+	SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
+	SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
 
-  SET(WITH_PLAYER ON)
+	SET(WITH_PLAYER ON)
 ENDIF(WITH_WEBPLUGIN)
 
 
@@ -555,7 +555,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
 
 # better not define flags here but this is a debugging option thats off by default.
 IF(WITH_CXX_GUARDEDALLOC)
-  SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
 
 #-----------------------------------------------------------------------------
@@ -574,6 +574,6 @@ ADD_SUBDIRECTORY(source/creator)
 #-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(source/blenderplayer)
+	ADD_SUBDIRECTORY(source/blenderplayer)
 ENDIF(WITH_PLAYER)
 
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 019cd9de28b..44e47aaf88d 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -25,17 +25,17 @@
 # ***** END GPL LICENSE BLOCK *****
 
 IF(WITH_BULLET)
-  ADD_SUBDIRECTORY(bullet2)
+	ADD_SUBDIRECTORY(bullet2)
 ENDIF(WITH_BULLET)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  ADD_SUBDIRECTORY(binreloc)
+	ADD_SUBDIRECTORY(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_SUBDIRECTORY(glew)
 
 IF(WITH_OPENJPEG)
-  ADD_SUBDIRECTORY(libopenjpeg)
+	ADD_SUBDIRECTORY(libopenjpeg)
 ENDIF(WITH_OPENJPEG)
 
 ADD_SUBDIRECTORY(lzo)
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index edb6b9c525f..2e2d8920781 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -27,16 +27,16 @@
 SET(INC . src)
 
 FILE(GLOB SRC   
-  src/LinearMath/*.cpp
-  src/BulletCollision/BroadphaseCollision/*.cpp
-  src/BulletCollision/CollisionShapes/*.cpp
-  src/BulletCollision/NarrowPhaseCollision/*.cpp
-  src/BulletCollision/Gimpact/*.cpp
-  src/BulletCollision//CollisionDispatch/*.cpp
-  src/BulletDynamics/ConstraintSolver/*.cpp
-  src/BulletDynamics/Vehicle/*.cpp
-  src/BulletDynamics/Dynamics/*.cpp
-  src/BulletSoftBody/*.cpp
+	src/LinearMath/*.cpp
+	src/BulletCollision/BroadphaseCollision/*.cpp
+	src/BulletCollision/CollisionShapes/*.cpp
+	src/BulletCollision/NarrowPhaseCollision/*.cpp
+	src/BulletCollision/Gimpact/*.cpp
+	src/BulletCollision//CollisionDispatch/*.cpp
+	src/BulletDynamics/ConstraintSolver/*.cpp
+	src/BulletDynamics/Vehicle/*.cpp
+	src/BulletDynamics/Dynamics/*.cpp
+	src/BulletSoftBody/*.cpp
 )
 
 ADD_DEFINITIONS(-D_LIB)
diff --git a/extern/bullet2/src/BulletCollision/CMakeLists.txt b/extern/bullet2/src/BulletCollision/CMakeLists.txt
index 4b4304f43b0..ddc806a3e6a 100644
--- a/extern/bullet2/src/BulletCollision/CMakeLists.txt
+++ b/extern/bullet2/src/BulletCollision/CMakeLists.txt
@@ -211,13 +211,13 @@ ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
 SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION})
 IF (BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
+	TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
 ENDIF (BUILD_SHARED_LIBS)
 
 #INSTALL of other files requires CMake 2.6
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 	INSTALL(TARGETS BulletCollision DESTINATION lib)
-        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
diff --git a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
index dbd87afea38..fe31d2bee71 100644
--- a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
+++ b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
@@ -34,7 +34,7 @@ ENDIF (BUILD_SHARED_LIBS)
 
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
-        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index eea34488e17..26d10a6ca9f 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -27,11 +27,11 @@
 SET(INC include src)
 
 IF(UNIX)
-  SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+	SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
 ENDIF(UNIX)
 
 SET(SRC
-  src/glew.c
+	src/glew.c
 )
 
 BLENDERLIB(extern_glew "${SRC}" "${INC}")
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index f33ce6a893c..9efd1a6ee7c 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -38,7 +38,7 @@ ADD_SUBDIRECTORY(opennl)
 ADD_SUBDIRECTORY(smoke)
 
 IF(WITH_ELBEEM)
-  ADD_SUBDIRECTORY(elbeem)
+	ADD_SUBDIRECTORY(elbeem)
 ENDIF(WITH_ELBEEM)
 
 ADD_SUBDIRECTORY(bsp)
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 1b48de3190b..587ef30979b 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -25,38 +25,38 @@ SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC})
 FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ffmpeg ${FFMPEG_INC})
-  FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ffmpeg ${FFMPEG_INC})
+	FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_SDL)
-  SET(INC ${INC} SDL ${SDL_INCLUDE_DIR})
-  FILE(GLOB SDLSRC SDL/*.cpp)
-  ADD_DEFINITIONS(-DWITH_SDL)
+	SET(INC ${INC} SDL ${SDL_INCLUDE_DIR})
+	FILE(GLOB SDLSRC SDL/*.cpp)
+	ADD_DEFINITIONS(-DWITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_OPENAL)
-  SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR})
-  FILE(GLOB OPENALSRC OpenAL/*.cpp)
-  ADD_DEFINITIONS(-DWITH_OPENAL)
+	SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR})
+	FILE(GLOB OPENALSRC OpenAL/*.cpp)
+	ADD_DEFINITIONS(-DWITH_OPENAL)
 
-  STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR})
-  IF(FRAMEWORK)
-    ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
-  ENDIF(FRAMEWORK)
+	STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR})
+	IF(FRAMEWORK)
+		ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
+	ENDIF(FRAMEWORK)
 ENDIF(WITH_OPENAL)
 
 IF(WITH_JACK)
-  SET(INC ${INC} jack ${JACK_INC})
-  FILE(GLOB JACKSRC jack/*.cpp)
-  ADD_DEFINITIONS(-DWITH_JACK)
+	SET(INC ${INC} jack ${JACK_INC})
+	FILE(GLOB JACKSRC jack/*.cpp)
+	ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
 IF(WITH_SNDFILE)
-  SET(INC ${INC} sndfile ${SNDFILE_INC})
-  FILE(GLOB SNDFILESRC sndfile/*.cpp)
-  ADD_DEFINITIONS(-DWITH_SNDFILE)
+	SET(INC ${INC} sndfile ${SNDFILE_INC})
+	FILE(GLOB SNDFILESRC sndfile/*.cpp)
+	ADD_DEFINITIONS(-DWITH_SNDFILE)
 ENDIF(WITH_SNDFILE)
 
 SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC})
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index 8b8a3000efd..e541d334086 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -30,11 +30,11 @@ FILE(GLOB SRC intern/*.cpp)
 
 ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1)
 IF(WINDOWS)
-    ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
+		ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
 ENDIF(WINDOWS)
 
 IF(WITH_OPENMP)
-    ADD_DEFINITIONS(-DPARALLEL=1)
+		ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
 BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}")
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 3d588ecfd00..9128e923e19 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -29,30 +29,30 @@ SET(INC . ../string)
 FILE(GLOB SRC intern/*.cpp)
 
 IF(APPLE)
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
+	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
+	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
+	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
+	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
+	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
+	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
 ELSE(APPLE)
-  IF(WIN32)
-    SET(INC ${INC} ${WINTAB_INC})
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
-  ELSE(WIN32)
-    SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
-  ENDIF(WIN32)
+	IF(WIN32)
+		SET(INC ${INC} ${WINTAB_INC})
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
+	ELSE(WIN32)
+		SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
+		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
+	ENDIF(WIN32)
 ENDIF(APPLE)
 
 BLENDERLIB(bf_ghost "${SRC}" "${INC}")
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index b29837fac7d..40ca35632d7 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -32,6 +32,6 @@ BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}")
 
 # Override C++ alloc optional
 IF(WITH_CXX_GUARDEDALLOC)
-  FILE(GLOB SRC cpp/*.cpp)
-  BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
+	FILE(GLOB SRC cpp/*.cpp)
+	BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 0db6acb683f..8ed7a7c9115 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -29,12 +29,12 @@ SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../gua
 FILE(GLOB SRC intern/*.cpp)
 
 IF(WITH_OPENMP)
-    ADD_DEFINITIONS(-DPARALLEL=1)
+		ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
 IF(WITH_FFTW3)
-  ADD_DEFINITIONS(-DFFTW3=1)
-  SET(INC ${INC} ${FFTW3_INC})
+	ADD_DEFINITIONS(-DFFTW3=1)
+	SET(INC ${INC} ${FFTW3_INC})
 ENDIF(WITH_FFTW3)
 
 
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 4764caddf6a..4adc51bcb15 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -28,9 +28,9 @@ ADD_SUBDIRECTORY(blender)
 ADD_SUBDIRECTORY(kernel)
 
 IF(WITH_GAMEENGINE)
-   ADD_SUBDIRECTORY(gameengine)
+	ADD_SUBDIRECTORY(gameengine)
 ENDIF(WITH_GAMEENGINE)
 	
 IF(WINDOWS)
-   ADD_SUBDIRECTORY(icons)
+	ADD_SUBDIRECTORY(icons)
 ENDIF(WINDOWS)
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index a9e3d50211f..703c5acd8a2 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -42,18 +42,18 @@ ADD_SUBDIRECTORY(render)
 ADD_SUBDIRECTORY(blenfont)
 
 IF(WITH_OPENEXR)
-  ADD_SUBDIRECTORY(imbuf/intern/openexr)
+	ADD_SUBDIRECTORY(imbuf/intern/openexr)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_DDS)
-  ADD_SUBDIRECTORY(imbuf/intern/dds)
+	ADD_SUBDIRECTORY(imbuf/intern/dds)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  ADD_SUBDIRECTORY(quicktime)
+	ADD_SUBDIRECTORY(quicktime)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_PYTHON)
-  ADD_SUBDIRECTORY(python)
+	ADD_SUBDIRECTORY(python)
 ENDIF(WITH_PYTHON)
 
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index 4738ea14292..4e48b689055 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -27,8 +27,8 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc
-  ${JPEG_INC}
+	. ../../../intern/guardedalloc
+	${JPEG_INC}
 )
 
 BLENDERLIB(bf_avi "${SRC}" "${INC}")
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index bc03e69eb88..844a6899bf5 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -25,17 +25,17 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
-  ../blenkernel ../../../extern/glew/include .
-  ${FREETYPE_INCLUDE_DIRS}
+	../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
+	../blenkernel ../../../extern/glew/include .
+	${FREETYPE_INCLUDE_DIRS}
 )
 
 IF(WITH_INTERNATIONAL)
-  SET(INC ${INC} ${GETTEXT_INC})
+	SET(INC ${INC} ${GETTEXT_INC})
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WIN32)
-  ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
+	ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
 ENDIF(WIN32)
 
 BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 17079205423..68aed2b0184 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -27,57 +27,57 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna
-  ../render/extern/include ../../../intern/decimation/extern
-  ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
-  ../../../intern/iksolver/extern ../blenloader
-  ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
-  ../../../intern/bsp/extern ../blenfont
-  ../../../intern/audaspace/intern
-  ../../../extern/lzo/minilzo
-  ../../../extern/lzma
-  ${ZLIB_INC}
+	. ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna
+	../render/extern/include ../../../intern/decimation/extern
+	../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
+	../../../intern/iksolver/extern ../blenloader
+	../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
+	../../../intern/bsp/extern ../blenfont
+	../../../intern/audaspace/intern
+	../../../extern/lzo/minilzo
+	../../../extern/lzma
+	${ZLIB_INC}
 )
 
 IF(WITH_BULLET)
-  SET(INC ${INC} ../../../extern/bullet2/src)
-  ADD_DEFINITIONS(-DUSE_BULLET)
+	SET(INC ${INC} ../../../extern/bullet2/src)
+	ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+	ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../python ${PYTHON_INC})
+	SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(NOT WITH_ELBEEM)
-  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index a0bf2367b98..4ed9eb4b007 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -27,20 +27,20 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../makesdna ../blenkernel ../../../intern/guardedalloc ../include
-  ${FREETYPE_INCLUDE_DIRS}
-  ${ZLIB_INC}
+	. ../makesdna ../blenkernel ../../../intern/guardedalloc ../include
+	${FREETYPE_INCLUDE_DIRS}
+	${ZLIB_INC}
 )
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 SET(INC
-  ${INC}
-  ${BINRELOC_INC}
+	${INC}
+	${BINRELOC_INC}
 )
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_blenlib "${SRC}" "${INC}")
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 7bdffdedc05..d31a85ab208 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -27,11 +27,11 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../blenlib ../blenkernel
-  ../makesdna ../readblenfile ../include ../makesrna
-  ../python ../../kernel/gen_messaging
-  ../render/extern/include
-  ${ZLIB_INC}
+	. ../../../intern/guardedalloc ../blenlib ../blenkernel
+	../makesdna ../readblenfile ../include ../makesrna
+	../python ../../kernel/gen_messaging
+	../render/extern/include
+	${ZLIB_INC}
 )
 
 BLENDERLIB(bf_blenloader "${SRC}" "${INC}")
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt
index 856fb931e9d..1c5e2697c01 100644
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/blenpluginapi/CMakeLists.txt
@@ -27,12 +27,12 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
+	. .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
 )
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}")
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index c40b18ea099..066d42e723e 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -27,64 +27,64 @@
 FILE(GLOB SRC */*.c)
 
 SET(INC ../windowmanager
-  ../editors/include
-  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../makesrna ../blenkernel
-  ../include ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern
-  ../../../intern/decimation/extern ../blenloader ../python
-  ../../kernel/gen_system ../readstreamglue
-  ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
-  ../../../intern/audaspace/intern
-  ../nodes
-  ../gpu
-  ../blenfont
+	../editors/include
+	../../../intern/guardedalloc ../../../intern/memutil
+	../blenlib ../makesdna ../makesrna ../blenkernel
+	../include ../imbuf ../render/extern/include
+	../../../intern/bsp/extern
+	../../../intern/decimation/extern ../blenloader ../python
+	../../kernel/gen_system ../readstreamglue
+	../../../intern/elbeem/extern
+	../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
+	../../../intern/audaspace/intern
+	../nodes
+	../gpu
+	../blenfont
 )
 
 IF(WITH_GAMEENGINE)
-  ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
+	ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(NOT WITH_ELBEEM)
-  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ${PYTHON_INC})
+	SET(INC ${INC} ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+	ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 7429f45c00f..ad7770e12fa 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -30,49 +30,49 @@
 FILE(GLOB SRC */*.c)
 
 SET(INC ../../windowmanager
-  ../../editors/include
-  ../../../../intern/guardedalloc ../../../../intern/memutil
-  ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
-  ../../include ../../imbuf 
-  ../../render/extern/include ../../../../intern/bsp/extern 
-  ../../../intern/decimation/extern ../../blenloader
-  ../../../kernel/gen_system ../../readstreamglue
-  ../../../../intern/elbeem/extern
-  ../../../../intern/ghost ../../../../intern/opennl/extern
-  ../../nodes
+	../../editors/include
+	../../../../intern/guardedalloc ../../../../intern/memutil
+	../../blenlib ../../makesdna ../../makesrna ../../blenkernel
+	../../include ../../imbuf 
+	../../render/extern/include ../../../../intern/bsp/extern 
+	../../../intern/decimation/extern ../../blenloader
+	../../../kernel/gen_system ../../readstreamglue
+	../../../../intern/elbeem/extern
+	../../../../intern/ghost ../../../../intern/opennl/extern
+	../../nodes
 )
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
+	ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../../python ${PYTHON_INC})
+	SET(INC ${INC} ../../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+	ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 4d376f47d91..85f4233a251 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -27,8 +27,8 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../blenlib ../blenkernel ../makesdna ../include
-  ../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
+	. ../blenlib ../blenkernel ../makesdna ../include
+	../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
 
 BLENDERLIB(bf_gpu "${SRC}" "${INC}")
 
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 76dd2afebdc..5eb98151c14 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -27,35 +27,35 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
-  ../avi ../blenkernel
-  ${JPEG_INC}
-  ${PNG_INC}
-  ${TIFF_INC}
-  ${ZLIB_INC}
-  ${OPENJPEG_INC}
+	. ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
+	../avi ../blenkernel
+	${JPEG_INC}
+	${PNG_INC}
+	${TIFF_INC}
+	${ZLIB_INC}
+	${OPENJPEG_INC}
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 if(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+	ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_imbuf "${SRC}" "${INC}")
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 53cd161634b..8b28086016b 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -27,14 +27,14 @@
 FILE(GLOB SRC *.c)
 
 SET(INC 
-    .
-    ../../../blenkernel
-    ../../
-    ..
-    ../../../blenlib
-    intern/include
-    ../../../../../intern/guardedalloc
-    ../../../makesdna
+		.
+		../../../blenkernel
+		../../
+		..
+		../../../blenlib
+		intern/include
+		../../../../../intern/guardedalloc
+		../../../makesdna
 )
 
 BLENDERLIB(bf_cineon "${SRC}" "${INC}")
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index 842f53bd88b..dc45afb9f5b 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -27,18 +27,18 @@
 FILE (GLOB SRC *.cpp)
 
 SET(INC 
-  .
-  ../../../blenkernel
-  ../../../makesdna
-  ../../
-  ..
-  ../../../blenlib
-  intern/include
-  ../../../../../intern/guardedalloc
+	.
+	../../../blenkernel
+	../../../makesdna
+	../../
+	..
+	../../../blenlib
+	intern/include
+	../../../../../intern/guardedalloc
 )
 
 if(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+	ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_dds "${SRC}" "${INC}")                 
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 21792086774..33681da55af 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -27,19 +27,19 @@
 SET(SRC openexr_api.cpp)
 
 SET(INC 
-  .
-  ../../../blenkernel
-  ../../
-  ..
-  ../../../blenlib
-  intern/include
-  ../../../../../intern/guardedalloc
-  ../../../makesdna
-  ${OPENEXR_INC}
+	.
+	../../../blenkernel
+	../../
+	..
+	../../../blenlib
+	intern/include
+	../../../../../intern/guardedalloc
+	../../../makesdna
+	${OPENEXR_INC}
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 BLENDERLIB(bf_openexr "${SRC}" "${INC}")                 
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 6024799f852..1fb63156f26 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -33,9 +33,9 @@ ADD_EXECUTABLE(makesdna ${SRC} ${INC_FILES})
 
 # Output dna.c
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
-  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
-  DEPENDS makesdna
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
+	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
+	DEPENDS makesdna
 )
 
 # Build bf_dna library
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index a1f42fbccb3..709c5d017ec 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -32,59 +32,59 @@ LIST(REMOVE_ITEM DEFSRC ${APISRC})
 STRING(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
 
 SET(SRC
-     makesrna.c
-     rna_define.c
-     ${DEFSRC}
-     ${APISRC}
-     ../../../../intern/guardedalloc/intern/mallocn.c
-     ../../../../intern/guardedalloc/intern/mmap_win.c)
+		makesrna.c
+		rna_define.c
+		${DEFSRC}
+		${APISRC}
+		../../../../intern/guardedalloc/intern/mallocn.c
+		../../../../intern/guardedalloc/intern/mmap_win.c)
 
 INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib ../../windowmanager ../../editors/include ../../imbuf ../../render/extern/include .)
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
 IF(WITH_GAMEENGINE)
-  ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+	ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(NOT WITH_ELBEEM)
-  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
 
 IF(WITH_FFTW3)
-  ADD_DEFINITIONS(-DFFTW3=1)
+	ADD_DEFINITIONS(-DFFTW3=1)
 ENDIF(WITH_FFTW3)
 
 IF(WITH_SDL)
-  ADD_DEFINITIONS(-DWITH_SDL)
+	ADD_DEFINITIONS(-DWITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_OPENAL)
-  ADD_DEFINITIONS(-DWITH_OPENAL)
+	ADD_DEFINITIONS(-DWITH_OPENAL)
 ENDIF(WITH_OPENAL)
 
 IF(WITH_JACK)
-  ADD_DEFINITIONS(-DWITH_JACK)
+	ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
 # Build makesrna executable
@@ -93,9 +93,9 @@ TARGET_LINK_LIBRARIES(makesrna bf_dna)
 
 # Output rna_*_gen.c
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${GENSRC}
-  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/
-  DEPENDS makesrna
+	OUTPUT ${GENSRC}
+	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/
+	DEPENDS makesrna
 )
 
 # Build bf_rna
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index bba96adf25e..df2567142ca 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -26,32 +26,32 @@
 FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c intern/TEX_nodes/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
-  ../render/extern/include ../../../intern/decimation/extern ../makesrna
-  ../imbuf ../avi ../../../intern/elbeem/extern
-  ../../../intern/iksolver/extern ../blenloader
-  ../blenkernel ../../../extern/glew/include ../gpu
-  ${ZLIB_INC}
+	. ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
+	../render/extern/include ../../../intern/decimation/extern ../makesrna
+	../imbuf ../avi ../../../intern/elbeem/extern
+	../../../intern/iksolver/extern ../blenloader
+	../blenkernel ../../../extern/glew/include ../gpu
+	${ZLIB_INC}
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../python ${PYTHON_INC})
+	SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_nodes "${SRC}" "${INC}")
diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt
index 7700e6bc2aa..7abec566505 100644
--- a/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@@ -27,23 +27,23 @@ FILE(GLOB SRC intern/*.c)
 FILE(GLOB GENSRC generic/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
-  ../blenkernel ../editors/include ../windowmanager ${PYTHON_INC}
-  ../../../extern/glew/include
+	. ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
+	../blenkernel ../editors/include ../windowmanager ${PYTHON_INC}
+	../../../extern/glew/include
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt
index 95969878cf1..ac503bb62cb 100644
--- a/source/blender/quicktime/CMakeLists.txt
+++ b/source/blender/quicktime/CMakeLists.txt
@@ -27,18 +27,18 @@
 SET(SRC apple/quicktime_import.c apple/quicktime_export.c)
 
 SET(INC 
-  .
-  ../quicktime
-  ../makesdna
-  ../../../intern/guardedalloc
-  ../blenlib
-  ../blenkernel
-  ../avi
-  ../imbuf
-  ../imbuf/intern
-  ../blenloader
-  ../render/extern/include
-  ../include
+	.
+	../quicktime
+	../makesdna
+	../../../intern/guardedalloc
+	../blenlib
+	../blenkernel
+	../avi
+	../imbuf
+	../imbuf/intern
+	../blenloader
+	../render/extern/include
+	../include
 )
 
 SET(INC ${INC} ${QUICKTIME_INC})
diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt
index dc4a8f5636d..ded4a1e00cf 100644
--- a/source/blender/readblenfile/CMakeLists.txt
+++ b/source/blender/readblenfile/CMakeLists.txt
@@ -27,7 +27,7 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  .  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging
+	.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging
 )
 
 BLENDERLIB(bf_readblenfile "${SRC}" "${INC}")
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index ad96b9db166..3284f7ea79a 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -27,24 +27,24 @@
 FILE(GLOB SRC intern/source/*.c)
 
 SET(INC 
-  intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
-  extern/include ../blenkernel ../imbuf
-  ../include ../../kernel/gen_messaging ../blenloader
-  ../../../intern/smoke/extern
-  ../makesrna
+	intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
+	extern/include ../blenkernel ../imbuf
+	../include ../../kernel/gen_messaging ../blenloader
+	../../../intern/smoke/extern
+	../makesrna
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 #TODO
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 26d4ab20356..cb2fc92a1b6 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -27,52 +27,52 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC .
-  ../editors/include
-  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../makesrna ../blenkernel
-  ../include ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern
-  ../../../intern/decimation/extern ../blenloader
-  ../../kernel/gen_system ../readstreamglue
-  ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
-  ../nodes
-  ../gpu
-  ../blenfont
-  ${OPENGL_INCLUDE_DIR}
+	../editors/include
+	../../../intern/guardedalloc ../../../intern/memutil
+	../blenlib ../makesdna ../makesrna ../blenkernel
+	../include ../imbuf ../render/extern/include
+	../../../intern/bsp/extern
+	../../../intern/decimation/extern ../blenloader
+	../../kernel/gen_system ../readstreamglue
+	../../../intern/elbeem/extern
+	../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
+	../nodes
+	../gpu
+	../blenfont
+	${OPENGL_INCLUDE_DIR}
 )
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
+	ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	SET(INC ${INC} ${FFMPEG_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../python ${PYTHON_INC})
+	SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+	ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 76a1a405698..62064e31d59 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -29,24 +29,24 @@ MESSAGE(STATUS "Configuring blenderplayer")
 SETUP_LIBDIRS()
 
 IF(WITH_QUICKTIME)
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  ADD_DEFINITIONS(-DWITH_BINRELOC)
-  INCLUDE_DIRECTORIES(${BINRELOC_INC})
+	ADD_DEFINITIONS(-DWITH_BINRELOC)
+	INCLUDE_DIRECTORIES(${BINRELOC_INC})
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
-  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
-  DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
+	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
+	DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
 )
 
 IF(WIN32)
-  ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+	ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
 ELSE(WIN32)
-  ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+	ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 ENDIF(WIN32)
 
 ADD_DEPENDENCIES(blenderplayer makesdna)
@@ -56,89 +56,89 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(UNIX)
-  # Sort libraries
-  SET(BLENDER_SORTED_LIBS
-    gp_ghost 
-    gp_common 
-    bf_string 
-    bf_ghost 
-    bf_rna
-    bf_blenkernel
-    bf_blenloader 
-    bf_blenpluginapi 
-    bf_blroutines 
-    bf_converter 
-    bf_ketsji 
-    bf_bullet 
-    bf_common 
-    bf_dummy 
-    bf_logic 
-    bf_rasterizer 
-    bf_oglrasterizer 
-    bf_expressions 
-    bf_scenegraph 
-    bf_IK
-    bf_moto 
-    bf_kernel 
-    bf_nodes
-    bf_gpu
-    bf_imbuf
-    bf_avi 
-    kx_network 
-    bf_ngnetwork 
-    bf_loopbacknetwork 
-    extern_bullet 
-    bf_guardedalloc 
-    bf_memutil 
-    bf_python
-    bf_gen_python
-    bf_blenlib 
-    bf_cineon 
-    bf_openexr 
-    extern_libopenjpeg 
-    bf_dds
-    bf_readblenfile 
-    bf_dna
-    bf_videotex
-    bf_blenfont
-    bf_audaspace
-    blenkernel_blc
-    extern_binreloc
-    extern_glew
-  )
+	# Sort libraries
+	SET(BLENDER_SORTED_LIBS
+		gp_ghost 
+		gp_common 
+		bf_string 
+		bf_ghost 
+		bf_rna
+		bf_blenkernel
+		bf_blenloader 
+		bf_blenpluginapi 
+		bf_blroutines 
+		bf_converter 
+		bf_ketsji 
+		bf_bullet 
+		bf_common 
+		bf_dummy 
+		bf_logic 
+		bf_rasterizer 
+		bf_oglrasterizer 
+		bf_expressions 
+		bf_scenegraph 
+		bf_IK
+		bf_moto 
+		bf_kernel 
+		bf_nodes
+		bf_gpu
+		bf_imbuf
+		bf_avi 
+		kx_network 
+		bf_ngnetwork 
+		bf_loopbacknetwork 
+		extern_bullet 
+		bf_guardedalloc 
+		bf_memutil 
+		bf_python
+		bf_gen_python
+		bf_blenlib 
+		bf_cineon 
+		bf_openexr 
+		extern_libopenjpeg 
+		bf_dds
+		bf_readblenfile 
+		bf_dna
+		bf_videotex
+		bf_blenfont
+		bf_audaspace
+		blenkernel_blc
+		extern_binreloc
+		extern_glew
+	)
   
-  IF(WITH_QUICKTIME)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
-  ENDIF(WITH_QUICKTIME)
+	IF(WITH_QUICKTIME)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
+	ENDIF(WITH_QUICKTIME)
 
-  IF(WITH_CXX_GUARDEDALLOC)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
-  ENDIF(WITH_CXX_GUARDEDALLOC)
+	IF(WITH_CXX_GUARDEDALLOC)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+	ENDIF(WITH_CXX_GUARDEDALLOC)
 
-  FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
-    SET(REMLIB ${SORTLIB})
-    FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
-      IF(${SEARCHLIB} STREQUAL ${SORTLIB})
-        SET(REMLIB "")
-      ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
-    ENDFOREACH(SEARCHLIB)
-    IF(REMLIB)
-      MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
-      LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-    ENDIF(REMLIB)
-  ENDFOREACH(SORTLIB)
+	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+		SET(REMLIB ${SORTLIB})
+		FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+			IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+				SET(REMLIB "")
+			ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+		ENDFOREACH(SEARCHLIB)
+		IF(REMLIB)
+			MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
+			LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+		ENDIF(REMLIB)
+	ENDFOREACH(SORTLIB)
 
-  TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS})
+	TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS})
 ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
+	TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
 ENDIF(UNIX)
 
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(bad_level_call_stubs)
+	ADD_SUBDIRECTORY(bad_level_call_stubs)
 ENDIF(WITH_PLAYER)
 
 SETUP_LIBLINKS(blenderplayer)
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index fea19d90ed0..502b374a318 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -27,14 +27,14 @@
 FILE(GLOB SRC stubs.c)
 
 SET(INC 
-  .
-  .. 
-  ../../../source/blender/makesdna
-  ../../../source/blender/makesrna  
+	.
+	.. 
+	../../../source/blender/makesdna
+	../../../source/blender/makesrna  
 )
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DWITH_FREETYPE2)
+	ADD_DEFINITIONS(-DWITH_FREETYPE2)
 ENDIF(WITH_INTERNATIONAL)
 
 BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}")
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f563dec9575..1256881182b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -27,56 +27,56 @@
 SETUP_LIBDIRS()
 
 INCLUDE_DIRECTORIES(../../intern/guardedalloc
-  ../blender/blenlib
-  ../blender/blenkernel
-  ../blender/editors/include
-  ../blender/makesrna
-  ../blender/makesrna/intern
-  ../blender/nodes
-  ../blender/include
-  ../blender/blenloader
-  ../blender/imbuf
-  ../blender/renderconverter
-  ../blender/render/extern/include
-  ../blender/makesdna
-  ../blender/gpu
-  ../blender/windowmanager
-  ../kernel/gen_messaging
-  ../kernel/gen_system
-  ../../extern/glew/include
+	../blender/blenlib
+	../blender/blenkernel
+	../blender/editors/include
+	../blender/makesrna
+	../blender/makesrna/intern
+	../blender/nodes
+	../blender/include
+	../blender/blenloader
+	../blender/imbuf
+	../blender/renderconverter
+	../blender/render/extern/include
+	../blender/makesdna
+	../blender/gpu
+	../blender/windowmanager
+	../kernel/gen_messaging
+	../kernel/gen_system
+	../../extern/glew/include
 )
 
 
 
 IF(WITH_QUICKTIME)
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_PYTHON)
-  INCLUDE_DIRECTORIES(../blender/python)
+	INCLUDE_DIRECTORIES(../blender/python)
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(NOT WITH_SDL)
-  ADD_DEFINITIONS(-DDISABLE_SDL)
+	ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(NOT WITH_SDL)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  ADD_DEFINITIONS(-DWITH_BINRELOC)
-  INCLUDE_DIRECTORIES(${BINRELOC_INC})
+	ADD_DEFINITIONS(-DWITH_BINRELOC)
+	INCLUDE_DIRECTORIES(${BINRELOC_INC})
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 MESSAGE(STATUS "Configuring blender")
 
 IF(WIN32)
-  ADD_EXECUTABLE(blender ${EXETYPE} creator.c ../icons/winblender.rc)
+	ADD_EXECUTABLE(blender ${EXETYPE} creator.c ../icons/winblender.rc)
 ELSE(WIN32)
-  ADD_EXECUTABLE(blender ${EXETYPE} creator.c)
+	ADD_EXECUTABLE(blender ${EXETYPE} creator.c)
 ENDIF(WIN32)
 
 
@@ -86,210 +86,210 @@ SET(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
 IF(WITH_INSTALL)
 
-  IF(UNIX)
-    ADD_CUSTOM_COMMAND(TARGET blender
-      POST_BUILD
-      MAIN_DEPENDENCY blender
-      #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
-      #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
-    )
-  ENDIF(UNIX)
+	IF(UNIX)
+		ADD_CUSTOM_COMMAND(TARGET blender
+			POST_BUILD
+			MAIN_DEPENDENCY blender
+			#COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
+			#COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
+		)
+	ENDIF(UNIX)
 
-  IF(UNIX AND NOT APPLE)
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-      COMMAND rm -Rf ${TARGETDIR}/.blender
-      COMMAND mkdir ${TARGETDIR}/.blender/
-      COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
-    )
+	IF(UNIX AND NOT APPLE)
+		ADD_CUSTOM_COMMAND(
+			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+			COMMAND rm -Rf ${TARGETDIR}/.blender
+			COMMAND mkdir ${TARGETDIR}/.blender/
+			COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
+		)
     
-    IF(WITH_INTERNATIONAL)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
-      )
-    ENDIF(WITH_INTERNATIONAL)
+		IF(WITH_INTERNATIONAL)
+			ADD_CUSTOM_COMMAND(
+				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+				COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
+				COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
+			)
+		ENDIF(WITH_INTERNATIONAL)
     
-    IF(WITH_PYTHON)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMENT "copying blender scripts..."
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/.blender/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/.blender/
-        COMMAND find ${TARGETDIR} -name "*.py?" -prune -exec rm -rf {} "\;"
-      )
+		IF(WITH_PYTHON)
+			ADD_CUSTOM_COMMAND(
+				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+				COMMENT "copying blender scripts..."
+				COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/.blender/
+				COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/.blender/
+				COMMAND find ${TARGETDIR} -name "*.py?" -prune -exec rm -rf {} "\;"
+			)
       
-      # Copy the systems python into the install directory
-      # Scons copy in tools/Blender.py
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMENT "copying a subset of the systems python..."
+			# Copy the systems python into the install directory
+			# Scons copy in tools/Blender.py
+			ADD_CUSTOM_COMMAND(
+				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+				COMMENT "copying a subset of the systems python..."
         
-        COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
-        COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
-        COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
+				COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
+				COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
+				COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
         
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/idlelib
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/tkinter
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/config
+				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
+				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
+				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/idlelib
+				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/tkinter
+				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/config
         
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
-        COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
+				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
+				COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
 
-        COMMAND rm -f ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
-        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
-        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
-        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
-      )
+				COMMAND rm -f ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
+				COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
+				COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
+				COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
+			)
      
-    ENDIF(WITH_PYTHON)
+		ENDIF(WITH_PYTHON)
       
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-      COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
-    )
+		ADD_CUSTOM_COMMAND(
+			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+			COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
+		)
     
-  ENDIF(UNIX AND NOT APPLE)
+	ENDIF(UNIX AND NOT APPLE)
 
-  IF(APPLE)
-    SET(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
-    SET(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
-    SET(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
+	IF(APPLE)
+		SET(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
+		SET(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
+		SET(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
 
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-      COMMAND cp -R ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/
-      COMMAND cp -R ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/
-      COMMAND cp -R ${SOURCEDIR}/Contents/Resources ${TARGETDIR}/blender.app/Contents/
-      COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat ${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > ${TARGETINFO}
-      COMMAND rm -Rf ${TARGETDIR}/blender.app/Contents/MacOS/.blender
-      COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-      COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-    )
+		ADD_CUSTOM_COMMAND(
+			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+			COMMAND cp -R ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/
+			COMMAND cp -R ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/
+			COMMAND cp -R ${SOURCEDIR}/Contents/Resources ${TARGETDIR}/blender.app/Contents/
+			COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat ${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > ${TARGETINFO}
+			COMMAND rm -Rf ${TARGETDIR}/blender.app/Contents/MacOS/.blender
+			COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+			COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+		)
       
-    IF(WITH_INTERNATIONAL)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/Resources/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/Resources/
-      )
-    ENDIF(WITH_INTERNATIONAL)
+		IF(WITH_INTERNATIONAL)
+			ADD_CUSTOM_COMMAND(
+				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+				COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+				COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/Resources/
+				COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+				COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/Resources/
+			)
+		ENDIF(WITH_INTERNATIONAL)
       
-    IF(WITH_PYTHON)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
-        COMMAND unzip -q ${LIBDIR}/release/python.zip -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
-        COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;"
-      )
-    ENDIF(WITH_PYTHON)      
+		IF(WITH_PYTHON)
+			ADD_CUSTOM_COMMAND(
+				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+				COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+				COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+				COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
+				COMMAND unzip -q ${LIBDIR}/release/python.zip -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
+				COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;"
+			)
+		ENDIF(WITH_PYTHON)      
     
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender    
-      COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"
-      COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;"
-    )
-  ENDIF(APPLE)
+		ADD_CUSTOM_COMMAND(
+			TARGET blender POST_BUILD MAIN_DEPENDENCY blender    
+			COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"
+			COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;"
+		)
+	ENDIF(APPLE)
 
-  IF(WIN32)
-    FILE(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} WIN_SOURCE_DIR)
+	IF(WIN32)
+		FILE(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} WIN_SOURCE_DIR)
     
-    ADD_CUSTOM_COMMAND(TARGET blender
-      POST_BUILD
-      MAIN_DEPENDENCY blender
-      COMMAND if not exist \"${TARGETDIR}\\.blender\" mkdir \"${TARGETDIR}\\.blender\"
-      COMMAND if not exist \"${TARGETDIR}\\.blender\\locale\" mkdir \"${TARGETDIR}\\.blender\\locale\"
-      COMMAND if not exist \"${TARGETDIR}\\.blender\\ui\" mkdir \"${TARGETDIR}\\.blender\\ui\"
-      COMMAND if not exist \"${TARGETDIR}\\.blender\\io\" mkdir \"${TARGETDIR}\\.blender\\io\"
-      COMMAND if not exist \"${TARGETDIR}\\plugins\" mkdir \"${TARGETDIR}\\plugins\"
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\.blender\\\" 
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.bfont.ttf\" \"${TARGETDIR}\\.blender\\\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\.blender\\locale\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\scripts\\*.*\" \"${TARGETDIR}\\.blender\\scripts\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\ui\\*.*\" \"${TARGETDIR}\\.blender\\ui\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\io\\*.*\" \"${TARGETDIR}\\.blender\\io\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\plugins\\*.*\" \"${TARGETDIR}\\plugins\"
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\text\\*.*\" \"${TARGETDIR}\"
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\windows\\extra\\python26.zip\" \"${TARGETDIR}\\\"
-    )
+		ADD_CUSTOM_COMMAND(TARGET blender
+			POST_BUILD
+			MAIN_DEPENDENCY blender
+			COMMAND if not exist \"${TARGETDIR}\\.blender\" mkdir \"${TARGETDIR}\\.blender\"
+			COMMAND if not exist \"${TARGETDIR}\\.blender\\locale\" mkdir \"${TARGETDIR}\\.blender\\locale\"
+			COMMAND if not exist \"${TARGETDIR}\\.blender\\ui\" mkdir \"${TARGETDIR}\\.blender\\ui\"
+			COMMAND if not exist \"${TARGETDIR}\\.blender\\io\" mkdir \"${TARGETDIR}\\.blender\\io\"
+			COMMAND if not exist \"${TARGETDIR}\\plugins\" mkdir \"${TARGETDIR}\\plugins\"
+			COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\.blender\\\" 
+			COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.bfont.ttf\" \"${TARGETDIR}\\.blender\\\"
+			COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\.blender\\locale\"
+			COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\scripts\\*.*\" \"${TARGETDIR}\\.blender\\scripts\"
+			COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\ui\\*.*\" \"${TARGETDIR}\\.blender\\ui\"
+			COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\io\\*.*\" \"${TARGETDIR}\\.blender\\io\"
+			COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\plugins\\*.*\" \"${TARGETDIR}\\plugins\"
+			COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\text\\*.*\" \"${TARGETDIR}\"
+			COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\windows\\extra\\python26.zip\" \"${TARGETDIR}\\\"
+		)
     
-    FILE(TO_NATIVE_PATH "${LIBDIR}" WIN_LIBDIR)
+		FILE(TO_NATIVE_PATH "${LIBDIR}" WIN_LIBDIR)
     
-    ADD_CUSTOM_COMMAND(TARGET blender
-      POST_BUILD
-      MAIN_DEPENDENCY blender
-      COMMAND copy /Y \"${WIN_LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\tiff\\lib\\libtiff.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\samplerate\\lib\\libsamplerate-0.dll\" \"${TARGETDIR}\\\"
-    )
+		ADD_CUSTOM_COMMAND(TARGET blender
+			POST_BUILD
+			MAIN_DEPENDENCY blender
+			COMMAND copy /Y \"${WIN_LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\tiff\\lib\\libtiff.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\"
+			COMMAND copy /Y \"${WIN_LIBDIR}\\samplerate\\lib\\libsamplerate-0.dll\" \"${TARGETDIR}\\\"
+		)
 
-    IF(WITH_INTERNATIONAL)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\iconv\\lib\\iconv.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_INTERNATIONAL)
+		IF(WITH_INTERNATIONAL)
+			ADD_CUSTOM_COMMAND(TARGET blender
+				POST_BUILD
+				MAIN_DEPENDENCY blender
+				COMMAND copy /Y \"${WIN_LIBDIR}\\iconv\\lib\\iconv.dll\" \"${TARGETDIR}\\\"
+			)
+		ENDIF(WITH_INTERNATIONAL)
 
-    IF(WITH_FFMPEG)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avcodec-52.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avformat-52.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avdevice-52.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaac-0.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaad-2.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libmp3lame-0.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libx264-67.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_FFMPEG)
+		IF(WITH_FFMPEG)
+			ADD_CUSTOM_COMMAND(TARGET blender
+				POST_BUILD
+				MAIN_DEPENDENCY blender
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avcodec-52.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avformat-52.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avdevice-52.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaac-0.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaad-2.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libmp3lame-0.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libx264-67.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
+			)
+		ENDIF(WITH_FFMPEG)
 
-    IF(WITH_SNDFILE)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_SNDFILE)
+		IF(WITH_SNDFILE)
+			ADD_CUSTOM_COMMAND(TARGET blender
+				POST_BUILD
+				MAIN_DEPENDENCY blender
+				COMMAND copy /Y \"${WIN_LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
+			)
+		ENDIF(WITH_SNDFILE)
 
-    IF(WITH_JACK)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_JACK)
+		IF(WITH_JACK)
+			ADD_CUSTOM_COMMAND(TARGET blender
+				POST_BUILD
+				MAIN_DEPENDENCY blender
+				COMMAND copy /Y \"${WIN_LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
+			)
+		ENDIF(WITH_JACK)
 
-    IF(WITH_OPENAL)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
+		IF(WITH_OPENAL)
+			ADD_CUSTOM_COMMAND(TARGET blender
+				POST_BUILD
+				MAIN_DEPENDENCY blender
+				COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
+				COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
 
-      )
-    ENDIF(WITH_OPENAL)
+			)
+		ENDIF(WITH_OPENAL)
 
 
-  ENDIF(WIN32)
+	ENDIF(WIN32)
 ENDIF(WITH_INSTALL)
 
 ADD_DEPENDENCIES(blender makesdna)
@@ -299,108 +299,108 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render)
 
 IF(WITH_ELBEEM)
-  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
+	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
 ENDIF(WITH_ELBEEM)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(UNIX)
-  # Sort libraries
-  SET(BLENDER_SORTED_LIBS
-    bf_windowmanager
-    bf_editors
-    bf_decimation 
-    blender_BSP 
-    bf_ghost 
-    bf_string 
-    blender_render 
-    blender_ONL 
-    bf_python 
-    bf_gen_python 
-    bf_blenkernel 
-    bf_nodes
-    bf_gpu
-    bf_blenloader 
-    bf_blenpluginapi 
-    bf_imbuf 
-    bf_blenlib 
-    bf_avi 
-    bf_cineon 
-    bf_openexr 
-    bf_dds
-    bf_readblenfile 
-    blender_bop 
-    bf_kernel 
-    bf_decimation 
-    bf_elbeem 
-    bf_IK 
-    bf_memutil 
-    bf_guardedalloc 
-    blender_CTR 
-    bf_moto 
-    bf_windowmanager
-    bf_editors
-    bf_blroutines 
-    bf_converter 
-    bf_dummy 
-    bf_bullet 
-    bf_smoke
-    bf_minilzo
-    bf_lzma
-    bf_common 
-    bf_ketsji 
-    bf_logic 
-    bf_rasterizer 
-    bf_oglrasterizer 
-    bf_expressions 
-    bf_scenegraph 
-    bf_moto 
-    bf_blroutines 
-    kx_network 
-    bf_kernel 
-    bf_ngnetwork 
-    extern_bullet 
-    bf_loopbacknetwork 
-    bf_common 
-    bf_moto 
-    bf_python
-    bf_gen_python
-    extern_binreloc
-    extern_glew
-    extern_libopenjpeg
-    bf_videotex
-    bf_rna
-    bf_dna
-    bf_blenfont
-    bf_audaspace
-  )
+	# Sort libraries
+	SET(BLENDER_SORTED_LIBS
+		bf_windowmanager
+		bf_editors
+		bf_decimation 
+		blender_BSP 
+		bf_ghost 
+		bf_string 
+		blender_render 
+		blender_ONL 
+		bf_python 
+		bf_gen_python 
+		bf_blenkernel 
+		bf_nodes
+		bf_gpu
+		bf_blenloader 
+		bf_blenpluginapi 
+		bf_imbuf 
+		bf_blenlib 
+		bf_avi 
+		bf_cineon 
+		bf_openexr 
+		bf_dds
+		bf_readblenfile 
+		blender_bop 
+		bf_kernel 
+		bf_decimation 
+		bf_elbeem 
+		bf_IK 
+		bf_memutil 
+		bf_guardedalloc 
+		blender_CTR 
+		bf_moto 
+		bf_windowmanager
+		bf_editors
+		bf_blroutines 
+		bf_converter 
+		bf_dummy 
+		bf_bullet 
+		bf_smoke
+		bf_minilzo
+		bf_lzma
+		bf_common 
+		bf_ketsji 
+		bf_logic 
+		bf_rasterizer 
+		bf_oglrasterizer 
+		bf_expressions 
+		bf_scenegraph 
+		bf_moto 
+		bf_blroutines 
+		kx_network 
+		bf_kernel 
+		bf_ngnetwork 
+		extern_bullet 
+		bf_loopbacknetwork 
+		bf_common 
+		bf_moto 
+		bf_python
+		bf_gen_python
+		extern_binreloc
+		extern_glew
+		extern_libopenjpeg
+		bf_videotex
+		bf_rna
+		bf_dna
+		bf_blenfont
+		bf_audaspace
+	)
 
-  IF(WITH_CXX_GUARDEDALLOC)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
-  ENDIF(WITH_CXX_GUARDEDALLOC)
+	IF(WITH_CXX_GUARDEDALLOC)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+	ENDIF(WITH_CXX_GUARDEDALLOC)
 
-  IF(WITH_QUICKTIME)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
-  ENDIF(WITH_QUICKTIME)
+	IF(WITH_QUICKTIME)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
+	ENDIF(WITH_QUICKTIME)
 
 
-  FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
-    SET(REMLIB ${SORTLIB})
-    FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
-      IF(${SEARCHLIB} STREQUAL ${SORTLIB})
-        SET(REMLIB "")
-      ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
-    ENDFOREACH(SEARCHLIB)
-    IF(REMLIB)
-      MESSAGE(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-      LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-    ENDIF(REMLIB)
-  ENDFOREACH(SORTLIB)
-  TARGET_LINK_LIBRARIES(blender ${BLENDER_SORTED_LIBS})
+	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+		SET(REMLIB ${SORTLIB})
+		FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+			IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+				SET(REMLIB "")
+			ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+		ENDFOREACH(SEARCHLIB)
+		IF(REMLIB)
+			MESSAGE(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
+			LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+		ENDIF(REMLIB)
+	ENDFOREACH(SORTLIB)
+	TARGET_LINK_LIBRARIES(blender ${BLENDER_SORTED_LIBS})
 ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
+	TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
 ENDIF(UNIX)
 
 SETUP_LIBLINKS(blender)
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 42e270d0fe7..ee15fd99ed5 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -2,43 +2,43 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/guardedalloc
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-  ../../../source/gameengine/Converter
-  ../../../source/blender/imbuf
-  ../../../intern/ghost/include
-  ../../../intern/moto/include
-  ../../../source/gameengine/Ketsji 
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel 
-  ../../../source/blender/blenfont
-  ../../../source/blender/editors/include
-  ../../../source/blender/windowmanager
-  ../../../source/blender 
-  ../../../source/blender/include
-  ../../../source/blender/makesdna
-  ../../../source/blender/makesrna 
-  ../../../source/gameengine/Rasterizer 
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/Expressions 
-  ../../../source/gameengine/Network
-  ../../../source/gameengine/SceneGraph 
-  ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet
-  ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../source/blender/misc 
-  ../../../source/blender/blenloader
-  ../../../source/blender/gpu
-  ../../../extern/bullet2/src
-  ../../../extern/glew/include
-  ${PYTHON_INC}
+	.
+	../../../source/kernel/gen_system
+	../../../intern/string
+	../../../intern/guardedalloc
+	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
+	../../../source/gameengine/Converter
+	../../../source/blender/imbuf
+	../../../intern/ghost/include
+	../../../intern/moto/include
+	../../../source/gameengine/Ketsji 
+	../../../source/blender/blenlib
+	../../../source/blender/blenkernel 
+	../../../source/blender/blenfont
+	../../../source/blender/editors/include
+	../../../source/blender/windowmanager
+	../../../source/blender 
+	../../../source/blender/include
+	../../../source/blender/makesdna
+	../../../source/blender/makesrna 
+	../../../source/gameengine/Rasterizer 
+	../../../source/gameengine/GameLogic
+	../../../source/gameengine/Expressions 
+	../../../source/gameengine/Network
+	../../../source/gameengine/SceneGraph 
+	../../../source/gameengine/Physics/common
+	../../../source/gameengine/Physics/Bullet
+	../../../source/gameengine/Network/LoopBackNetwork
+	../../../source/blender/misc 
+	../../../source/blender/blenloader
+	../../../source/blender/gpu
+	../../../extern/bullet2/src
+	../../../extern/glew/include
+	${PYTHON_INC}
 )
 
 IF(WITH_FFMPEG)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt
index f546a31fb2e..5a1887bd6c3 100644
--- a/source/gameengine/CMakeLists.txt
+++ b/source/gameengine/CMakeLists.txt
@@ -41,5 +41,5 @@ ADD_SUBDIRECTORY(Physics/Bullet)
 ADD_SUBDIRECTORY(VideoTexture)
 
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(GamePlayer)
+	ADD_SUBDIRECTORY(GamePlayer)
 ENDIF(WITH_PLAYER)
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index f16e9e169ab..257ca856b2c 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -27,40 +27,40 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/guardedalloc
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../intern/audaspace/intern
-  ../../../source/gameengine/Converter
-  ../../../source/gameengine/BlenderRoutines
-  ../../../source/blender/imbuf
-  ../../../intern/moto/include
-  ../../../source/gameengine/Ketsji
-  ../../../source/gameengine/Ketsji/KXNetwork
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel
-  ../../../source/blender/windowmanager
-  ../../../source/blender
-  ../../../source/blender/include
-  ../../../source/blender/makesdna
-  ../../../source/blender/makesrna
-  ../../../source/gameengine/Rasterizer
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/Expressions
-  ../../../source/gameengine/Network
-  ../../../source/gameengine/SceneGraph
-  ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet
-  ../../../source/gameengine/Physics/Dummy
-  ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../source/blender/misc
-  ../../../source/blender/blenloader
-  ../../../source/blender/gpu
-  ../../../extern/bullet2/src
-  ${PYTHON_INC}
+	.
+	../../../source/kernel/gen_system
+	../../../intern/string
+	../../../intern/guardedalloc
+	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+	../../../intern/audaspace/intern
+	../../../source/gameengine/Converter
+	../../../source/gameengine/BlenderRoutines
+	../../../source/blender/imbuf
+	../../../intern/moto/include
+	../../../source/gameengine/Ketsji
+	../../../source/gameengine/Ketsji/KXNetwork
+	../../../source/blender/blenlib
+	../../../source/blender/blenkernel
+	../../../source/blender/windowmanager
+	../../../source/blender
+	../../../source/blender/include
+	../../../source/blender/makesdna
+	../../../source/blender/makesrna
+	../../../source/gameengine/Rasterizer
+	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+	../../../source/gameengine/GameLogic
+	../../../source/gameengine/Expressions
+	../../../source/gameengine/Network
+	../../../source/gameengine/SceneGraph
+	../../../source/gameengine/Physics/common
+	../../../source/gameengine/Physics/Bullet
+	../../../source/gameengine/Physics/Dummy
+	../../../source/gameengine/Network/LoopBackNetwork
+	../../../source/blender/misc
+	../../../source/blender/blenloader
+	../../../source/blender/gpu
+	../../../extern/bullet2/src
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_converter "${SRC}" "${INC}")
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index dffd13f64ff..439a50852a7 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -27,13 +27,13 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/moto/include
-  ../../../source/gameengine/SceneGraph
-  ../../../source/blender/blenloader
-  ${PYTHON_INC}
+	.
+	../../../source/kernel/gen_system
+	../../../intern/string
+	../../../intern/moto/include
+	../../../source/gameengine/SceneGraph
+	../../../source/blender/blenloader
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_expressions "${SRC}" "${INC}")
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index a1dce49e14b..601585f79d6 100644
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -27,20 +27,20 @@
 FILE(GLOB SRC *.cpp Joystick/*.cpp)
 
 SET(INC
-  . 
-  ../../../source/kernel/gen_system 
-  ../../../intern/string
-  ../../../source/gameengine/Expressions 
-  ../../../source/gameengine/SceneGraph
-  ../../../intern/moto/include
-  ../../../source/gameengine/Rasterizer
-  ${PYTHON_INC}
+	. 
+	../../../source/kernel/gen_system 
+	../../../intern/string
+	../../../source/gameengine/Expressions 
+	../../../source/gameengine/SceneGraph
+	../../../intern/moto/include
+	../../../source/gameengine/Rasterizer
+	${PYTHON_INC}
 )
 
 IF(WITH_SDL)
-  SET(INC ${INC} ${SDL_INCLUDE_DIR})
+	SET(INC ${INC} ${SDL_INCLUDE_DIR})
 ELSE(WITH_SDL)
-  ADD_DEFINITIONS(-DDISABLE_SDL)
+	ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(WITH_SDL)
 
 BLENDERLIB(bf_logic "${SRC}" "${INC}")
diff --git a/source/gameengine/GamePlayer/CMakeLists.txt b/source/gameengine/GamePlayer/CMakeLists.txt
index 134f8fce3b2..7b4fa4892df 100644
--- a/source/gameengine/GamePlayer/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/CMakeLists.txt
@@ -28,5 +28,5 @@ ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(ghost)
 
 IF(WITH_WEBPLUGIN) 
-  ADD_SUBDIRECTORY(xembed)
+	ADD_SUBDIRECTORY(xembed)
 ENDIF(WITH_WEBPLUGIN)
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index da99087c917..c865cf5ce25 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -25,50 +25,50 @@
 # ***** END GPL LICENSE BLOCK *****
 
 SET(SRC 
-  bmfont.cpp
-  GPC_Canvas.cpp
-  GPC_Engine.cpp
-  GPC_KeyboardDevice.cpp
-  GPC_MouseDevice.cpp
-  GPC_RawImage.cpp
-  GPC_RawLoadDotBlendArray.cpp
-  GPC_RawLogoArrays.cpp
-  GPC_RenderTools.cpp
-  GPC_System.cpp
+	bmfont.cpp
+	GPC_Canvas.cpp
+	GPC_Engine.cpp
+	GPC_KeyboardDevice.cpp
+	GPC_MouseDevice.cpp
+	GPC_RawImage.cpp
+	GPC_RawLoadDotBlendArray.cpp
+	GPC_RawLogoArrays.cpp
+	GPC_RenderTools.cpp
+	GPC_System.cpp
 )
 
 SET(INC
-  .
-  ../../../../intern/string
-  ../../../../intern/ghost
-  ../../../../intern/guardedalloc
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../../source/kernel/gen_system
-  ../../../../source/kernel/gen_messaging
-  ../../../../source/gameengine/Converter
-  ../../../../source/blender/imbuf
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenkernel
-  ../../../../source/blender
-  ../../../../source/blender/include
-  ../../../../source/blender/makesdna
-  ../../../../source/gameengine/Rasterizer
-  ../../../../source/gameengine/GameLogic
-  ../../../../source/gameengine/Expressions
-  ../../../../source/gameengine/Network
-  ../../../../source/gameengine/SceneGraph
-  ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Network/LoopBackNetwork
-  ../../../../source/gameengine/GamePlayer/ghost
-  ../../../../source/blender/misc
-  ../../../../source/blender/blenloader
-  ../../../../source/blender/gpu
-  ../../../../extern/glew/include
-  ${PYTHON_INC}
-  ${PNG_INC}
-  ${ZLIB_INC}
+	.
+	../../../../intern/string
+	../../../../intern/ghost
+	../../../../intern/guardedalloc
+	../../../../intern/moto/include
+	../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+	../../../../source/kernel/gen_system
+	../../../../source/kernel/gen_messaging
+	../../../../source/gameengine/Converter
+	../../../../source/blender/imbuf
+	../../../../source/gameengine/Ketsji
+	../../../../source/blender/blenlib
+	../../../../source/blender/blenkernel
+	../../../../source/blender
+	../../../../source/blender/include
+	../../../../source/blender/makesdna
+	../../../../source/gameengine/Rasterizer
+	../../../../source/gameengine/GameLogic
+	../../../../source/gameengine/Expressions
+	../../../../source/gameengine/Network
+	../../../../source/gameengine/SceneGraph
+	../../../../source/gameengine/Physics/common
+	../../../../source/gameengine/Network/LoopBackNetwork
+	../../../../source/gameengine/GamePlayer/ghost
+	../../../../source/blender/misc
+	../../../../source/blender/blenloader
+	../../../../source/blender/gpu
+	../../../../extern/glew/include
+	${PYTHON_INC}
+	${PNG_INC}
+	${ZLIB_INC}
 )
 
 BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}")
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 377d765af85..d50784cb967 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -25,49 +25,49 @@
 # ***** END GPL LICENSE BLOCK *****
 
 SET(SRC 
-  GPG_Application.cpp
-  GPG_Canvas.cpp
-  GPG_ghost.cpp
-  GPG_KeyboardDevice.cpp
-  GPG_System.cpp
+	GPG_Application.cpp
+	GPG_Canvas.cpp
+	GPG_ghost.cpp
+	GPG_KeyboardDevice.cpp
+	GPG_System.cpp
 )
 
 SET(INC
-  .
-  ../../../../intern/string
-  ../../../../intern/ghost
-  ../../../../intern/guardedalloc
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../../source/kernel/gen_system
-  ../../../../source/kernel/gen_messaging
-  ../../../../source/gameengine/Converter
-  ../../../../source/blender/imbuf
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenkernel
-  ../../../../source/blender/readblenfile
-  ../../../../source/blender
-  ../../../../source/blender/include
-  ../../../../source/blender/makesdna
-  ../../../../source/blender/makesrna
-  ../../../../source/gameengine/Rasterizer
-  ../../../../source/gameengine/GameLogic
-  ../../../../source/gameengine/Expressions
-  ../../../../source/gameengine/Network
-  ../../../../source/gameengine/SceneGraph
-  ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Network/LoopBackNetwork
-  ../../../../source/gameengine/GamePlayer/common
-  ../../../../source/blender/misc
-  ../../../../source/blender/blenloader
-  ../../../../source/blender/gpu
-  ../../../../extern/glew/include
-  ${PYTHON_INC}
+	.
+	../../../../intern/string
+	../../../../intern/ghost
+	../../../../intern/guardedalloc
+	../../../../intern/moto/include
+	../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+	../../../../source/kernel/gen_system
+	../../../../source/kernel/gen_messaging
+	../../../../source/gameengine/Converter
+	../../../../source/blender/imbuf
+	../../../../source/gameengine/Ketsji
+	../../../../source/blender/blenlib
+	../../../../source/blender/blenkernel
+	../../../../source/blender/readblenfile
+	../../../../source/blender
+	../../../../source/blender/include
+	../../../../source/blender/makesdna
+	../../../../source/blender/makesrna
+	../../../../source/gameengine/Rasterizer
+	../../../../source/gameengine/GameLogic
+	../../../../source/gameengine/Expressions
+	../../../../source/gameengine/Network
+	../../../../source/gameengine/SceneGraph
+	../../../../source/gameengine/Physics/common
+	../../../../source/gameengine/Network/LoopBackNetwork
+	../../../../source/gameengine/GamePlayer/common
+	../../../../source/blender/misc
+	../../../../source/blender/blenloader
+	../../../../source/blender/gpu
+	../../../../extern/glew/include
+	${PYTHON_INC}
 )
 
 IF(WITH_FFMPEG)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index c91a3771b45..01d369bc7a9 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -27,45 +27,45 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/guardedalloc
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-  ../../../source/gameengine/Converter
-  ../../../source/blender/imbuf
-  ../../../intern/ghost/include
-  ../../../intern/moto/include
-  ../../../source/gameengine/Ketsji 
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel
-  ../../../source/blender/python
-  ../../../source/blender/python/generic
-  ../../../source/blender 
-  ../../../source/blender/include
-  ../../../source/blender/makesdna 
-  ../../../source/gameengine/Rasterizer 
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/Expressions 
-  ../../../source/gameengine/Ketsji/KXNetwork
-  ../../../source/gameengine/Network
-  ../../../source/gameengine/SceneGraph 
-  ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet 
-  ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../intern/audaspace/intern
-  ../../../source/blender/misc 
-  ../../../source/blender/blenloader
-  ../../../source/blender/gpu
-  ../../../extern/bullet2/src
-  ../../../extern/glew/include
-  ${PYTHON_INC}
+	.
+	../../../source/kernel/gen_system
+	../../../intern/string
+	../../../intern/guardedalloc
+	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
+	../../../source/gameengine/Converter
+	../../../source/blender/imbuf
+	../../../intern/ghost/include
+	../../../intern/moto/include
+	../../../source/gameengine/Ketsji 
+	../../../source/blender/blenlib
+	../../../source/blender/blenkernel
+	../../../source/blender/python
+	../../../source/blender/python/generic
+	../../../source/blender 
+	../../../source/blender/include
+	../../../source/blender/makesdna 
+	../../../source/gameengine/Rasterizer 
+	../../../source/gameengine/GameLogic
+	../../../source/gameengine/Expressions 
+	../../../source/gameengine/Ketsji/KXNetwork
+	../../../source/gameengine/Network
+	../../../source/gameengine/SceneGraph 
+	../../../source/gameengine/Physics/common
+	../../../source/gameengine/Physics/Bullet 
+	../../../source/gameengine/Network/LoopBackNetwork
+	../../../intern/audaspace/intern
+	../../../source/blender/misc 
+	../../../source/blender/blenloader
+	../../../source/blender/gpu
+	../../../extern/bullet2/src
+	../../../extern/glew/include
+	${PYTHON_INC}
 )
 
 IF(WITH_SDL)
-  SET(INC ${INC} ${SDL_INCLUDE_DIR})  
+	SET(INC ${INC} ${SDL_INCLUDE_DIR})  
 ELSE(WITH_SDL)
-  ADD_DEFINITIONS(-DDISABLE_SDL)
+	ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(WITH_SDL)
 
 BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index d9a9fc54f4b..b89b0dcff9f 100644
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -27,16 +27,16 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../../source/kernel/gen_system
-  ../../../../intern/string
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/gameengine/GameLogic
-  ../../../../source/gameengine/Expressions
-  ../../../../source/gameengine/SceneGraph
-  ../../../../source/gameengine/Network
-  ${PYTHON_INC}
+	.
+	../../../../source/kernel/gen_system
+	../../../../intern/string
+	../../../../intern/moto/include
+	../../../../source/gameengine/Ketsji
+	../../../../source/gameengine/GameLogic
+	../../../../source/gameengine/Expressions
+	../../../../source/gameengine/SceneGraph
+	../../../../source/gameengine/Network
+	${PYTHON_INC}
 )
 
 BLENDERLIB(kx_network "${SRC}" "${INC}")
diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index 933f0550d0b..1e467a7d08d 100644
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -27,10 +27,10 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/moto/include
+	.
+	../../../source/kernel/gen_system
+	../../../intern/string
+	../../../intern/moto/include
 )
 
 BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}")
diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index 0b958920dc5..18e3d8ef496 100644
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -27,10 +27,10 @@
 SET(SRC NG_LoopBackNetworkDeviceInterface.cpp)
 
 SET(INC
-  .
-  ../../../../source/kernel/gen_system
-  ../../../../intern/string
-  ../../../../source/gameengine/Network
+	.
+	../../../../source/kernel/gen_system
+	../../../../intern/string
+	../../../../source/gameengine/Network
 )
 
 BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 7b7fb508ebd..da885122a4f 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -27,23 +27,23 @@
 SET(SRC CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp)
 
 SET(INC
-  .
-  ../common
-  ../../../../extern/bullet2/src
-  ../../../../extern/glew/include
-  ../../../../intern/moto/include
-  ../../../../intern/guardedalloc
-  ../../../kernel/gen_system
-  ../../../../intern/string
-  ../../Rasterizer
-  ../../Ketsji
-  ../../Expressions
-  ../../GameLogic
-  ../../SceneGraph
-  ../../../../source/blender/makesdna
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenkernel
-  ${PYTHON_INC}
+	.
+	../common
+	../../../../extern/bullet2/src
+	../../../../extern/glew/include
+	../../../../intern/moto/include
+	../../../../intern/guardedalloc
+	../../../kernel/gen_system
+	../../../../intern/string
+	../../Rasterizer
+	../../Ketsji
+	../../Expressions
+	../../GameLogic
+	../../SceneGraph
+	../../../../source/blender/makesdna
+	../../../../source/blender/blenlib
+	../../../../source/blender/blenkernel
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_bullet "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt
index 4bd29e7779b..d613bf8fd14 100644
--- a/source/gameengine/Physics/Dummy/CMakeLists.txt
+++ b/source/gameengine/Physics/Dummy/CMakeLists.txt
@@ -27,8 +27,8 @@
 SET(SRC DummyPhysicsEnvironment.cpp)
 
 SET(INC
-  .
-  ../common
+	.
+	../common
 )
 
 BLENDERLIB(bf_dummy "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt
index 41b2687fe38..a34bd19d400 100644
--- a/source/gameengine/Physics/common/CMakeLists.txt
+++ b/source/gameengine/Physics/common/CMakeLists.txt
@@ -27,9 +27,9 @@
 SET(SRC PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp PHY_IGraphicController.cpp PHY_IPhysicsEnvironment.cpp PHY_IVehicle.cpp)
 
 SET(INC
-  .
-  ../Dummy
-  ../../../intern/moto/include
+	.
+	../Dummy
+	../../../intern/moto/include
 )
 
 BLENDERLIB(bf_common "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index 143209f5a54..51d1f5001dd 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -27,15 +27,15 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../source/blender/makesdna
-  ../../../source/gameengine/SceneGraph
-  ../../../intern/string
-  ../../../intern/moto/include
-  ../../../extern/glew/include
-  ../Expressions
-  ${PYTHON_INC}
+	.
+	../../../source/kernel/gen_system
+	../../../source/blender/makesdna
+	../../../source/gameengine/SceneGraph
+	../../../intern/string
+	../../../intern/moto/include
+	../../../extern/glew/include
+	../Expressions
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_rasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index fe3d0f6aeea..f2b97bedb2f 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -27,18 +27,18 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  ../../../../source/kernel/gen_system
-  ../../../../intern/string
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Rasterizer
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/gameengine/SceneGraph
-  ../../../../extern/glew/include
-  ../../../../source/blender/gpu
-  ../../../../source/blender/makesdna
-  ../../../../source/blender/blenkernel
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenloader
+	../../../../source/kernel/gen_system
+	../../../../intern/string
+	../../../../intern/moto/include
+	../../../../source/gameengine/Rasterizer
+	../../../../source/gameengine/Ketsji
+	../../../../source/gameengine/SceneGraph
+	../../../../extern/glew/include
+	../../../../source/blender/gpu
+	../../../../source/blender/makesdna
+	../../../../source/blender/blenkernel
+	../../../../source/blender/blenlib
+	../../../../source/blender/blenloader
 )
 
 BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt
index 0409b8c0ac4..2ac52be938e 100644
--- a/source/gameengine/SceneGraph/CMakeLists.txt
+++ b/source/gameengine/SceneGraph/CMakeLists.txt
@@ -27,8 +27,8 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../intern/moto/include
+	.
+	../../../intern/moto/include
 )
 
 BLENDERLIB(bf_scenegraph "${SRC}" "${INC}")
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 255d0907101..935c5a2c292 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -27,34 +27,34 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/gameengine/Ketsji
-  ../../../source/gameengine/Expressions
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/SceneGraph
-  ../../../source/gameengine/Rasterizer
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../source/gameengine/BlenderRoutines
-  ../../../source/blender/include
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel
-  ../../../source/blender/makesdna
-  ../../../source/blender/editors/include
-  ../../../source/blender/imbuf
-  ../../../source/blender/python
-  ../../../source/blender/gpu
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/moto/include
-  ../../../intern/guardedalloc
-  ../../../extern/glew/include
-  ${PYTHON_INC}
+	.
+	../../../source/gameengine/Ketsji
+	../../../source/gameengine/Expressions
+	../../../source/gameengine/GameLogic
+	../../../source/gameengine/SceneGraph
+	../../../source/gameengine/Rasterizer
+	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+	../../../source/gameengine/BlenderRoutines
+	../../../source/blender/include
+	../../../source/blender/blenlib
+	../../../source/blender/blenkernel
+	../../../source/blender/makesdna
+	../../../source/blender/editors/include
+	../../../source/blender/imbuf
+	../../../source/blender/python
+	../../../source/blender/gpu
+	../../../source/kernel/gen_system
+	../../../intern/string
+	../../../intern/moto/include
+	../../../intern/guardedalloc
+	../../../extern/glew/include
+	${PYTHON_INC}
 )
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
-  ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
+	SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC})
+	ADD_DEFINITIONS(-DWITH_FFMPEG)
+	ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB(bf_videotex "${SRC}" "${INC}")
diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt
index ac759393326..3aea2b9bcb0 100644
--- a/source/kernel/CMakeLists.txt
+++ b/source/kernel/CMakeLists.txt
@@ -27,11 +27,11 @@
 SET(INC gen_messaging gen_system ../../intern/string ../../intern/moto/include ../../source/blender/blenloader )
 
 FILE(GLOB SRC   
-  gen_messaging/intern/messaging.c
-  gen_system/GEN_HashedPtr.cpp
-  gen_system/GEN_Matrix4x4.cpp
-  gen_system/SYS_SingletonSystem.cpp
-  gen_system/SYS_System.cpp
+	gen_messaging/intern/messaging.c
+	gen_system/GEN_HashedPtr.cpp
+	gen_system/GEN_Matrix4x4.cpp
+	gen_system/SYS_SingletonSystem.cpp
+	gen_system/SYS_System.cpp
 )
 
 BLENDERLIB(bf_kernel "${SRC}" "${INC}")

From 51aa207d200d2cef1cdc7f4e90a6a0f7a4b31c8e Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 6 Sep 2009 07:22:32 +0000
Subject: [PATCH 454/577] 2.5 Anim Bugfixes:

* Rotation order code should be more correct now. Previously was only shuffling axes, and was also doing some evil things to provided that that it shouldn't have been doing, which was causing some flipping issues.

* Built-in keyingsets for 'visual' options should now be more correct. The old code had typos, giving wrong array indices to start from.
---
 source/blender/blenlib/intern/arithb.c        | 55 ++++++++++---------
 source/blender/editors/animation/keyingsets.c | 14 ++---
 source/blender/editors/transform/transform.c  |  8 +--
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 9d67ac50108..7a4aaa1a858 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2835,9 +2835,9 @@ void EulOToQuat(float e[3], short order, float q[4])
 	double ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
 	double a[3];
 	
-	if (R->parity) e[1] = -e[1];
+	if (R->parity) e[1] = -e[1]; // xxx watch it!
 	
-	ti = e[0]/2; tj = e[1]/2; th = e[2]/2;
+	ti = e[i]/2; tj = e[j]/2; th = e[k]/2;
 	
 	ci = cos(ti);  cj = cos(tj);  ch = cos(th);
 	si = sin(ti);  sj = sin(tj);  sh = sin(th);
@@ -2874,12 +2874,11 @@ void EulOToMat3(float e[3], short order, float M[3][3])
 	double ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
 	
 	if (R->parity) {
-		e[0] = -e[0]; 
-		e[1] = -e[1]; 
-		e[2] = -e[2];
+		ti = -e[i];	  tj = -e[j];	th = -e[k];
+	}
+	else {
+		ti = e[i];	  tj = e[j];	th = e[k];
 	}
-	
-	ti = e[0];	  tj = e[1];	th = e[2];
 	
 	ci = cos(ti); cj = cos(tj); ch = cos(th);
 	si = sin(ti); sj = sin(tj); sh = sin(th);
@@ -2908,17 +2907,17 @@ void Mat3ToEulO(float M[3][3], float e[3], short order)
 {
 	RotOrderInfo *R= GET_ROTATIONORDER_INFO(order); 
 	short i=R->i,  j=R->j, 	k=R->k;
-	double cy = sqrt(M[i][i]*M[i][i] + M[j][i]*M[j][i]);
+	double cy = sqrt(M[i][i]*M[i][i] + M[i][j]*M[i][j]);
 	
 	if (cy > 16*FLT_EPSILON) {
-		e[0] = atan2(M[j][k], M[k][k]);
-		e[1] = atan2(-M[i][k], cy);
-		e[2] = atan2(M[i][j], M[i][i]);
+		e[i] = atan2(M[j][k], M[k][k]);
+		e[j] = atan2(-M[i][k], cy);
+		e[k] = atan2(M[i][j], M[i][i]);
 	} 
 	else {
-		e[0] = atan2(-M[k][j], M[j][j]);
-		e[1] = atan2(-M[i][k], cy);
-		e[2] = 0;
+		e[i] = atan2(-M[k][j], M[j][j]);
+		e[j] = atan2(-M[i][k], cy);
+		e[k] = 0;
 	}
 	
 	if (R->parity) {
@@ -2944,21 +2943,28 @@ static void mat3_to_eulo2(float M[3][3], float *e1, float *e2, short order)
 {
 	RotOrderInfo *R= GET_ROTATIONORDER_INFO(order); 
 	short i=R->i,  j=R->j, 	k=R->k;
-	double cy = sqrt(M[i][i]*M[i][i] + M[j][i]*M[j][i]);
+	float m[3][3];
+	double cy;
+	
+	/* process the matrix first */
+	Mat3CpyMat3(m, M);
+	Mat3Ortho(m);
+	
+	cy= sqrt(m[i][i]*m[i][i] + m[i][j]*m[i][j]);
 	
 	if (cy > 16*FLT_EPSILON) {
-		e1[0] = atan2(M[j][k], M[k][k]);
-		e1[1] = atan2(-M[i][k], cy);
-		e1[2] = atan2(M[i][j], M[i][i]);
+		e1[i] = atan2(m[j][k], m[k][k]);
+		e1[j] = atan2(-m[i][k], cy);
+		e1[k] = atan2(m[i][j], m[i][i]);
 		
-		e2[0] = atan2(-M[j][k], -M[k][k]);
-		e2[1] = atan2(-M[i][k], -cy);
-		e2[2] = atan2(-M[i][j], -M[i][i]);
+		e2[i] = atan2(-m[j][k], -m[k][k]);
+		e2[j] = atan2(-m[i][k], -cy);
+		e2[k] = atan2(-m[i][j], -m[i][i]);
 	} 
 	else {
-		e1[0] = atan2(-M[k][j], M[j][j]);
-		e1[1] = atan2(-M[i][k], cy);
-		e1[2] = 0;
+		e1[i] = atan2(-m[k][j], m[j][j]);
+		e1[j] = atan2(-m[i][k], cy);
+		e1[k] = 0;
 		
 		VecCopyf(e2, e1);
 	}
@@ -2975,7 +2981,6 @@ static void mat3_to_eulo2(float M[3][3], float *e1, float *e2, short order)
 }
 
 /* uses 2 methods to retrieve eulers, and picks the closest */
-// FIXME: this does not work well with the other rotation modes...
 void Mat3ToCompatibleEulO(float mat[3][3], float eul[3], float oldrot[3], short order)
 {
 	float eul1[3], eul2[3];
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 15d47211615..2639d49b5be 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -801,24 +801,24 @@ static bBuiltinKeyingSet def_builtin_keyingsets_v3d[] =
 	
 	/* Keying Sets with Keying Flags ************************* */
 	/* Keying Set - "VisualLoc" ---------- */
-	BI_KS_DEFINE_BEGIN("VisualLoc", 0)
+	BI_KS_DEFINE_BEGIN("VisualLoc", INSERTKEY_MATRIX)
 		BI_KS_PATHS_BEGIN(1)
-			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "location", INSERTKEY_MATRIX, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM) 
+			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "location", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM) 
 		BI_KS_PATHS_END
 	BI_KS_DEFINE_END,
 
 	/* Keying Set - "Rotation" ---------- */
-	BI_KS_DEFINE_BEGIN("VisualRot", 0)
+	BI_KS_DEFINE_BEGIN("VisualRot", INSERTKEY_MATRIX)
 		BI_KS_PATHS_BEGIN(1)
-			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN|KSP_TEMPLATE_PCHAN_ROT, "rotation", INSERTKEY_MATRIX, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM) 
+			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN|KSP_TEMPLATE_PCHAN_ROT, "rotation", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM) 
 		BI_KS_PATHS_END
 	BI_KS_DEFINE_END,
 	
 	/* Keying Set - "VisualLocRot" ---------- */
-	BI_KS_DEFINE_BEGIN("VisualLocRot", 0)
+	BI_KS_DEFINE_BEGIN("VisualLocRot", INSERTKEY_MATRIX)
 		BI_KS_PATHS_BEGIN(2)
-			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "location", INSERTKEY_MATRIX, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM), 
-			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN|KSP_TEMPLATE_PCHAN_ROT, "rotation", INSERTKEY_MATRIX, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM) 
+			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "location", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM), 
+			BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN|KSP_TEMPLATE_PCHAN_ROT, "rotation", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_TEMPLATE_ITEM) 
 		BI_KS_PATHS_END
 	BI_KS_DEFINE_END
 };
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 370e98ebd07..1f568be3e10 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1738,12 +1738,12 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 			eul[1]= tdi->roty[0];
 			eul[2]= tdi->rotz[0];
 
-			EulToMat4(eul, cob.matrix);
+			EulOToMat4(eul, td->rotOrder, cob.matrix);
 		}
 		else {
 			/* eulers */
 			if (td->ext)
-				EulToMat4(td->ext->rot, cob.matrix);
+				EulOToMat4(td->ext->rot, td->rotOrder, cob.matrix);
 			else
 				return;
 		}
@@ -1796,7 +1796,7 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 			TransDataIpokey *tdi= td->tdi;
 			float eul[3];
 
-			Mat4ToEul(cob.matrix, eul);
+			Mat4ToEulO(cob.matrix, eul, td->rotOrder);
 
 			tdi->rotx[0]= eul[0];
 			tdi->roty[0]= eul[1];
@@ -1804,7 +1804,7 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 		}
 		else {
 			/* eulers */
-			Mat4ToEul(cob.matrix, td->ext->rot);
+			Mat4ToEulO(cob.matrix, td->ext->rot, td->rotOrder);
 		}
 	}
 }

From fb649d5824ccccca544c905209ba64340dc1bded Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sun, 6 Sep 2009 13:20:05 +0000
Subject: [PATCH 455/577] * cleaning up warnings (mostly windows). A collection
 of other warning fixes too (undefined function, assuming int, etc.)

This compiled fine with scons/msvc and scons/mingw (gcc 4.4.0). Please test and report any problems.
---
 intern/iksolver/intern/TNT/tntmath.h          |  4 ++-
 intern/smoke/intern/tnt/tnt_math_utils.h      |  4 ++-
 intern/string/STR_String.h                    |  4 +++
 source/blender/blenkernel/intern/image.c      |  5 +++
 source/blender/blenkernel/intern/packedFile.c |  8 +++++
 source/blender/blenkernel/intern/pointcache.c | 18 +++-------
 source/blender/blenkernel/intern/sound.c      |  2 +-
 source/blender/blenlib/BLI_fileops.h          |  2 --
 source/blender/blenlib/BLI_winstuff.h         | 31 +++++++----------
 source/blender/blenlib/intern/bpath.c         | 34 ++++++++++---------
 source/blender/blenlib/intern/fileops.c       | 14 ++++----
 source/blender/blenlib/intern/storage.c       | 15 ++++----
 .../blender/blenloader/intern/readblenentry.c |  9 +++--
 source/blender/blenloader/intern/readfile.c   |  7 ++--
 source/blender/blenloader/intern/writefile.c  | 14 ++++----
 .../editors/armature/editarmature_generate.c  |  1 +
 .../editors/interface/interface_icons.c       |  1 +
 source/blender/editors/mesh/meshtools.c       |  1 +
 .../editors/space_buttons/buttons_ops.c       |  1 +
 source/blender/imbuf/intern/anim5.c           |  6 ++++
 source/blender/imbuf/intern/hamx.c            | 10 +++---
 source/blender/imbuf/intern/iff.c             |  7 ++--
 source/blender/imbuf/intern/thumbs.c          | 20 +++++------
 source/blender/imbuf/intern/writeimage.c      |  8 ++---
 source/blender/python/intern/bpy_interface.c  | 11 +++---
 .../readblenfile/intern/BLO_readblenfile.c    |  1 +
 .../blender/windowmanager/intern/wm_files.c   |  2 +-
 .../Converter/KX_ConvertProperties.cpp        | 10 +++---
 source/gameengine/Ketsji/KX_PythonInit.cpp    | 14 ++++----
 source/gameengine/VideoTexture/SConscript     |  1 -
 30 files changed, 143 insertions(+), 122 deletions(-)

diff --git a/intern/iksolver/intern/TNT/tntmath.h b/intern/iksolver/intern/TNT/tntmath.h
index 5773900caf9..55a79e2aba0 100644
--- a/intern/iksolver/intern/TNT/tntmath.h
+++ b/intern/iksolver/intern/TNT/tntmath.h
@@ -35,7 +35,9 @@
 
 // conventional functions required by several matrix algorithms
 
-
+#ifdef _WIN32
+#define hypot _hypot
+#endif
 
 namespace TNT 
 {
diff --git a/intern/smoke/intern/tnt/tnt_math_utils.h b/intern/smoke/intern/tnt/tnt_math_utils.h
index 6e14a1d9b90..f6aad8eaf38 100644
--- a/intern/smoke/intern/tnt/tnt_math_utils.h
+++ b/intern/smoke/intern/tnt/tnt_math_utils.h
@@ -4,7 +4,9 @@
 /* needed for fabs, sqrt() below */
 #include <cmath>
 
-
+#ifdef _WIN32
+#define hypot _hypot
+#endif
 
 namespace TNT
 {
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index a5e7a0721ec..d8023a06f81 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -54,6 +54,10 @@ using namespace std;
 #include "MEM_guardedalloc.h"
 #endif
 
+#ifdef _WIN32
+#define stricmp _stricmp
+#endif
+
 class STR_String;
 
 typedef  unsigned long dword;
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index eb8872c43a5..cdb175ed661 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -38,6 +38,11 @@
 
 #include <time.h>
 
+#ifdef _WIN32
+#define open _open
+#define close _close
+#endif
+
 #include "MEM_guardedalloc.h"
 
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index 3e47c1006e5..bd0b1a5e36e 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -63,6 +63,14 @@
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
 
+#ifdef _WIN32
+#define open _open
+#define close _close
+#define read _read
+#define write _write
+#endif
+
+
 int seekPackedFile(PackedFile *pf, int offset, int whence)
 {
 	int oldseek = -1, seek = 0;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 3e429749953..912acc4786f 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -67,23 +67,13 @@
 
 
 /* needed for directory lookup */
+/* untitled blend's need getpid for a unique name */
 #ifndef WIN32
   #include <dirent.h>
-#else
-  #include "BLI_winstuff.h"
-#endif
-
-/* untitled blend's need getpid for a unique name */
-#ifdef WIN32
-#include <process.h>
-#else
 #include <unistd.h>
-#endif
-
-#ifdef _WIN32
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
+#else
+#include <process.h>
+  #include "BLI_winstuff.h"
 #endif
 
 static void ptcache_data_to(void **data, int type, int index, void *to);
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 06ef8a23142..2d5d8dad7a8 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -250,12 +250,12 @@ void sound_free(struct bSound* sound)
 
 void sound_unlink(struct bContext *C, struct bSound* sound)
 {
-	bSound *snd;
 	Scene *scene;
 	SoundHandle *handle;
 
 // XXX unused currently
 #if 0
+	bSound *snd;
 	for(snd = CTX_data_main(C)->sound.first; snd; snd = snd->id.next)
 	{
 		if(snd->child_sound == sound)
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
index d2dd40b21a5..0c1cdbc4d3a 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
@@ -36,8 +36,6 @@
 #ifndef BLI_FILEOPS_H
 #define BLI_FILEOPS_H
 
-
-
 void  BLI_recurdir_fileops(char *dirname);
 int BLI_link(char *file, char *to);
 int BLI_is_writable(char *filename);
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index fad45f1b6c3..b46ebebacd5 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -65,24 +65,7 @@
 extern "C" {
 #endif
 
-# ifndef _WIN64
-	#ifndef M_PI
-	#define M_PI		3.14159265358979323846
-	#endif
-	#ifndef M_PI_2
-	#define M_PI_2		1.57079632679489661923
-	#endif
-	#ifndef M_SQRT2
-	#define M_SQRT2		1.41421356237309504880
-	#endif
-	#ifndef M_SQRT1_2
-	#define M_SQRT1_2	0.70710678118654752440
-	#endif
-	#ifndef M_1_PI
-	#define M_1_PI		0.318309886183790671538
-	#endif
-#endif
-
+#define _USE_MATH_DEFINES
 #define MAXPATHLEN MAX_PATH
 
 #ifndef S_ISREG
@@ -92,6 +75,18 @@ extern "C" {
 #define S_ISDIR(x) ((x&S_IFMT) == S_IFDIR)
 #endif
 
+/* defines for using ISO C++ conformant names */
+#define open _open
+#define close _close
+#define write _write
+#define read _read
+#define getcwd _getcwd
+#define chdir _chdir
+#define strdup _strdup
+#define lseek _lseek
+#define getpid _getpid
+#define snprintf _snprintf
+
 #ifndef FREE_WINDOWS
 typedef unsigned int mode_t;
 #endif
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 6c89afe7173..cadf8d2bdd1 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -26,6 +26,24 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* path/file handeling stuff */
+#ifndef WIN32
+  #include <dirent.h>
+  #include <unistd.h>
+#else
+  #include <io.h>
+  #include "BLI_winstuff.h"
+#endif
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_ID.h" /* Library */
@@ -53,23 +71,7 @@
 //XXX define below from BSE_sequence.h - otherwise potentially odd behaviour
 #define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_IMAGE)
 
-/* path/file handeling stuff */
-#ifndef WIN32
-  #include <dirent.h>
-  #include <unistd.h>
-#else
-  #include "BLI_winstuff.h"
-  #include <io.h>
-#endif
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define FILE_MAX			240
 
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 0228032df01..e7dc9b0eb1f 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -31,27 +31,29 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <errno.h>
+
 #include "zlib.h"
 
 #ifdef WIN32
-#include "BLI_winstuff.h"
 #include <io.h>
+#include "BLI_winstuff.h"
 #else
 #include <unistd.h> // for read close
 #include <sys/param.h>
 #endif
 
+
 #include "BLI_blenlib.h"
 #include "BLI_storage.h"
 #include "BLI_fileops.h"
 #include "BLI_callbacks.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
 #include "BKE_utildefines.h"
-#include <errno.h>
 
 #include "BLO_sys_types.h" // for intptr_t support
 
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 7cbef85b938..cdc5cec705f 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -33,13 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>	
 
-#ifdef WIN32
-#include "BLI_winstuff.h"
-#include <sys/types.h>
-#include <io.h>
-#include <direct.h>
-#endif
-
 #ifndef WIN32
 #include <dirent.h>
 #endif
@@ -82,6 +75,14 @@
 #include <malloc.h>
 #endif
 
+#ifdef WIN32
+#include <sys/types.h>
+#include <io.h>
+#include <direct.h>
+#include "BLI_winstuff.h"
+#endif
+
+
 /* lib includes */
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index 33641a0b004..1c21c1817e6 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -32,13 +32,14 @@
 #include <config.h>
 #endif
 
-#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 
+
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
@@ -67,6 +68,10 @@
 
 #include "BLO_sys_types.h" // needed for intptr_t
 
+#ifdef _WIN32
+#include "BLI_winstuff.h"
+#endif
+
 	/**
 	 * IDType stuff, I plan to move this
 	 * out into its own file + prefix, and
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6a26a71ee3d..0c4835a79b7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -29,11 +29,6 @@
 
 #include "zlib.h"
 
-#ifdef WIN32
-#include "winsock2.h"
-#include "BLI_winstuff.h"
-#endif
-
 #include <limits.h>
 #include <stdio.h> // for printf fopen fwrite fclose sprintf FILE
 #include <stdlib.h> // for getenv atoi
@@ -46,6 +41,8 @@
     #include <sys/param.h> // for MAXPATHLEN
 #else
     #include <io.h> // for open close read
+#include "winsock2.h"
+#include "BLI_winstuff.h"
 #endif
 
 #include "DNA_anim_types.h"
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index c4a94660932..a22e4f66c8d 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -72,23 +72,23 @@ Any case: direct data is ALWAYS after the lib block
 #include <config.h>
 #endif
 
+#include <math.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
 #include "zlib.h"
 
 #ifndef WIN32
 #include <unistd.h>
 #else
 #include "winsock2.h"
-#include "BLI_winstuff.h"
 #include <io.h>
 #include <process.h> // for getpid
+#include "BLI_winstuff.h"
 #endif
 
-#include <math.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c
index 6c0eab16af0..d327ed34839 100644
--- a/source/blender/editors/armature/editarmature_generate.c
+++ b/source/blender/editors/armature/editarmature_generate.c
@@ -30,6 +30,7 @@
 
 #include <string.h>
 #include <math.h>
+#include <float.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 549164c23a1..6c4110c8c37 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -34,6 +34,7 @@
 #else
 #include <io.h>
 #include <direct.h>
+#include "BLI_winstuff.h"
 #endif   
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 2ef1d3b214d..4aa99820a6e 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <float.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 60480a9f165..1567f393d87 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -74,6 +74,7 @@
 
 #include "ED_curve.h"
 #include "ED_mesh.h"
+#include "ED_particle.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
diff --git a/source/blender/imbuf/intern/anim5.c b/source/blender/imbuf/intern/anim5.c
index b6f29b6a145..4fe4217cd2c 100644
--- a/source/blender/imbuf/intern/anim5.c
+++ b/source/blender/imbuf/intern/anim5.c
@@ -31,6 +31,7 @@
 
 #include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
                             BLI_countlist BLI_stringdec */
+
 #include "imbuf.h"
 #include "imbuf_patch.h"
 
@@ -46,6 +47,11 @@
 
 #include "IMB_anim5.h"
 
+#ifdef _WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
+
 typedef struct Anhd{
 	unsigned char type, mask;
 	unsigned short w, h;
diff --git a/source/blender/imbuf/intern/hamx.c b/source/blender/imbuf/intern/hamx.c
index 2f32d155407..258c196fcdf 100644
--- a/source/blender/imbuf/intern/hamx.c
+++ b/source/blender/imbuf/intern/hamx.c
@@ -31,11 +31,6 @@
 
 #include "BLI_blenlib.h"
 
-#ifdef WIN32
-#include <io.h>
-#endif
-
-
 #include "imbuf.h"
 #include "imbuf_patch.h"
 #include "IMB_imbuf_types.h"
@@ -46,6 +41,11 @@
 #include "IMB_ham.h"
 #include "IMB_hamx.h"
 
+#ifdef WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
+
 /* actually hard coded endianness */
 #define GET_BIG_LONG(x) (((uchar *) (x))[0] << 24 | ((uchar *) (x))[1] << 16 | ((uchar *) (x))[2] << 8 | ((uchar *) (x))[3])
 #define GET_LITTLE_LONG(x) (((uchar *) (x))[3] << 24 | ((uchar *) (x))[2] << 16 | ((uchar *) (x))[1] << 8 | ((uchar *) (x))[0])
diff --git a/source/blender/imbuf/intern/iff.c b/source/blender/imbuf/intern/iff.c
index c3695173068..5fd823e78c1 100644
--- a/source/blender/imbuf/intern/iff.c
+++ b/source/blender/imbuf/intern/iff.c
@@ -29,14 +29,15 @@
  * $Id$
  */
 
-#ifdef WIN32
-#include <io.h>
-#endif
 #include "BLI_blenlib.h"
 #include "imbuf.h"
 #include "imbuf_patch.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_iff.h"
+#ifdef WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
 
 unsigned short imb_start_iff(struct ImBuf *ibuf, int file)
 {
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 86ca43824f3..6053c5556f1 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -39,31 +39,29 @@
 #include "IMB_thumbs.h"
 #include "IMB_imginfo.h"
 
-
 #include "md5.h"
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
 #ifdef WIN32
 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined  */
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0400 /* minimal requirements for SHGetSpecialFolderPath on MINGW MSVC has this defined already */
 #endif
 #include <shlobj.h> /* for SHGetSpecialFolderPath, has to be done before BLI_winstuff because 'near' is disabled through BLI_windstuff */
-#include "BLI_winstuff.h"
 #include <process.h> /* getpid */
 #include <direct.h> /* chdir */
+#include "BLI_winstuff.h"
 #else
 #include <unistd.h>
 #endif
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-
 #define URI_MAX FILE_MAX*3 + 8
 
 static int get_thumb_dir( char* dir , ThumbSize size)
diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c
index 7e1120bf3e4..b3af727190a 100644
--- a/source/blender/imbuf/intern/writeimage.c
+++ b/source/blender/imbuf/intern/writeimage.c
@@ -29,10 +29,6 @@
  * $Id$
  */
 
-#ifdef WIN32
-#include <io.h>
-#endif
-
 #include <stdio.h>
 
 #include "BKE_global.h"
@@ -71,6 +67,10 @@
 #include "IMB_bitplanes.h"
 #include "IMB_divers.h"
 
+#ifdef WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
 /* added facility to copy with saving non-float rects */
 
 short IMB_saveiff(struct ImBuf *ibuf, char *name, int flags)
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index a935b517f77..a85bcd011a6 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -28,11 +28,6 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#ifndef WIN32
-#include <dirent.h>
-#else
-#include "BLI_winstuff.h"
-#endif
 
 /* grr, python redefines */
 #ifdef _POSIX_C_SOURCE
@@ -48,6 +43,12 @@
 #include "bpy_ui.h"
 #include "bpy_util.h"
 
+#ifndef WIN32
+#include <dirent.h>
+#else
+#include "BLI_winstuff.h"
+#endif
+
 #include "DNA_anim_types.h"
 #include "DNA_space_types.h"
 #include "DNA_text_types.h"
diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c
index 40a991ad702..5672b9f4cb2 100644
--- a/source/blender/readblenfile/intern/BLO_readblenfile.c
+++ b/source/blender/readblenfile/intern/BLO_readblenfile.c
@@ -43,6 +43,7 @@
 
 #ifdef WIN32
 #include <io.h>		// read, open
+#include "BLI_winstuff.h"
 #else // ! WIN32
 #include <unistd.h>		// read
 #endif
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 3921da4f062..a6e38a61e0f 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -37,8 +37,8 @@
 #define _WIN32_IE 0x0400 /* minimal requirements for SHGetSpecialFolderPath on MINGW MSVC has this defined already */
 #endif
 #include <shlobj.h> /* for SHGetSpecialFolderPath, has to be done before BLI_winstuff because 'near' is disabled through BLI_windstuff */
-#include "BLI_winstuff.h"
 #include <process.h> /* getpid */
+#include "BLI_winstuff.h"
 #else
 #include <unistd.h> /* getpid */
 #endif
diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp
index 5e8d6f3cbf0..1c22d2a0600 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.cpp
+++ b/source/gameengine/Converter/KX_ConvertProperties.cpp
@@ -32,26 +32,26 @@
 #include <config.h>
 #endif
 
-/* This little block needed for linking to Blender... */
-#ifdef WIN32
-#include "BLI_winstuff.h"
-#endif
 
 #include "DNA_object_types.h"
 #include "DNA_property_types.h"
 /* end of blender include block */
 
+
 #include "Value.h"
 #include "VectorValue.h"
 #include "BoolValue.h"
 #include "StringValue.h"
 #include "FloatValue.h"
 #include "KX_GameObject.h"
-//#include "ListValue.h"
 #include "IntValue.h"
 #include "SCA_TimeEventManager.h"
 #include "SCA_IScene.h"
 
+/* This little block needed for linking to Blender... */
+#ifdef WIN32
+#include "BLI_winstuff.h"
+#endif
 
 void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventManager* timemgr,SCA_IScene* scene, bool isInActiveLayer)
 {
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 9e81bcb3871..298d485aaaf 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -32,11 +32,6 @@
 
 // directory header for py function getBlendFileList
 #include <stdlib.h>
-#ifndef WIN32
-  #include <dirent.h>
-#else
-  #include "BLI_winstuff.h"
-#endif
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -80,8 +75,6 @@ extern "C" {
 #include "InputParser.h"
 #include "KX_Scene.h"
 
-#include "NG_NetworkScene.h" //Needed for sendMessage()
-
 #include "BL_Shader.h"
 
 #include "KX_PyMath.h"
@@ -111,6 +104,13 @@ extern "C" {
 #include "BLI_blenlib.h"
 #include "GPU_material.h"
 
+#ifndef WIN32
+  #include <dirent.h>
+#else
+  #include "BLI_winstuff.h"
+#endif
+#include "NG_NetworkScene.h" //Needed for sendMessage()
+
 static void setSandbox(TPythonSecurityLevel level);
 
 // 'local' copy of canvas ptr, for window height/width python scripts
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 0d3e495f3e2..119bd1c9954 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -25,6 +25,5 @@ incs += ' ' + env['BF_PYTHON_INC']
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
-    defs.append('__STDC_CONSTANT_MACROS')
 
 env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300,205], cxx_compileflags=env['BGE_CXXFLAGS'])

From 3d64d65ad9c43f82bd4b9241b4a7fdde0fd12000 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sun, 6 Sep 2009 14:32:02 +0000
Subject: [PATCH 456/577] * clean out some warnings (unrefenced vars mainly)

---
 intern/audaspace/FX/AUD_DoubleReader.cpp     |  2 +-
 intern/audaspace/FX/AUD_PingPongFactory.cpp  |  2 +-
 intern/audaspace/OpenAL/AUD_OpenALDevice.cpp | 14 +++----
 intern/audaspace/SDL/AUD_SDLMixerReader.cpp  |  2 +-
 intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp |  8 ++--
 intern/audaspace/intern/AUD_C-API.cpp        | 42 ++++++++++----------
 intern/audaspace/jack/AUD_JackDevice.cpp     |  8 ++--
 7 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/intern/audaspace/FX/AUD_DoubleReader.cpp b/intern/audaspace/FX/AUD_DoubleReader.cpp
index 181e394da98..8d3afbf2f1d 100644
--- a/intern/audaspace/FX/AUD_DoubleReader.cpp
+++ b/intern/audaspace/FX/AUD_DoubleReader.cpp
@@ -47,7 +47,7 @@ AUD_DoubleReader::AUD_DoubleReader(AUD_IReader* reader1,
 			AUD_THROW(AUD_ERROR_READER);
 	}
 
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		if(reader1)
 		{
diff --git a/intern/audaspace/FX/AUD_PingPongFactory.cpp b/intern/audaspace/FX/AUD_PingPongFactory.cpp
index a030d581b1a..8b72afe05e7 100644
--- a/intern/audaspace/FX/AUD_PingPongFactory.cpp
+++ b/intern/audaspace/FX/AUD_PingPongFactory.cpp
@@ -46,7 +46,7 @@ AUD_IReader* AUD_PingPongFactory::createReader()
 		{
 			reader2 = factory.createReader();
 		}
-		catch(AUD_Exception e)
+		catch(AUD_Exception)
 		{
 			reader2 = 0;
 		}
diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
index f94b11a11b8..b33afa2b955 100644
--- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
+++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
@@ -544,13 +544,13 @@ AUD_Handle* AUD_OpenALDevice::play(AUD_IFactory* factory, bool keep)
 					if(alGetError() != AL_NO_ERROR)
 						AUD_THROW(AUD_ERROR_OPENAL);
 				}
-				catch(AUD_Exception e)
+				catch(AUD_Exception)
 				{
 					alDeleteSources(1, &sound->source);
 					throw;
 				}
 			}
-			catch(AUD_Exception e)
+			catch(AUD_Exception)
 			{
 				delete sound; AUD_DELETE("handle")
 				alcProcessContext(m_context);
@@ -648,19 +648,19 @@ AUD_Handle* AUD_OpenALDevice::play(AUD_IFactory* factory, bool keep)
 				if(alGetError() != AL_NO_ERROR)
 					AUD_THROW(AUD_ERROR_OPENAL);
 			}
-			catch(AUD_Exception e)
+			catch(AUD_Exception)
 			{
 				alDeleteSources(1, &sound->source);
 				throw;
 			}
 		}
-		catch(AUD_Exception e)
+		catch(AUD_Exception)
 		{
 			alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
 			throw;
 		}
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		delete sound; AUD_DELETE("handle")
 		delete reader; AUD_DELETE("reader")
@@ -1051,13 +1051,13 @@ bool AUD_OpenALDevice::setCapability(int capability, void *value)
 						if(alGetError() != AL_NO_ERROR)
 							AUD_THROW(AUD_ERROR_OPENAL);
 					}
-					catch(AUD_Exception e)
+					catch(AUD_Exception)
 					{
 						alDeleteBuffers(1, &bf->buffer);
 						throw;
 					}
 				}
-				catch(AUD_Exception e)
+				catch(AUD_Exception)
 				{
 					delete bf; AUD_DELETE("bufferedfactory")
 					delete reader; AUD_DELETE("reader")
diff --git a/intern/audaspace/SDL/AUD_SDLMixerReader.cpp b/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
index ec61f99f02d..0a47e36533a 100644
--- a/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
+++ b/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
@@ -87,7 +87,7 @@ AUD_SDLMixerReader::AUD_SDLMixerReader(AUD_IReader* reader,
 							 specs.rate) == -1)
 			AUD_THROW(AUD_ERROR_SDL);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		delete m_reader; AUD_DELETE("reader")
 		throw;
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
index d70a9c25bcb..0384ba5e0e6 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -119,7 +119,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(const char* filename)
 		// find audio stream and codec
 		m_stream = -1;
 
-		for(int i = 0; i < m_formatCtx->nb_streams; i++)
+		for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
 			if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
 				&& (m_stream < 0))
 			{
@@ -146,7 +146,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(const char* filename)
 		m_specs.format = FFMPEG_TO_AUD(m_codecCtx->sample_fmt);
 		m_specs.rate = (AUD_SampleRate) m_codecCtx->sample_rate;
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		av_close_input_file(m_formatCtx);
 		throw;
@@ -188,7 +188,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer)
 		// find audio stream and codec
 		m_stream = -1;
 
-		for(int i = 0; i < m_formatCtx->nb_streams; i++)
+		for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
 			if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
 				&& (m_stream < 0))
 			{
@@ -215,7 +215,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer)
 		m_specs.format = FFMPEG_TO_AUD(m_codecCtx->sample_fmt);
 		m_specs.rate = (AUD_SampleRate) m_codecCtx->sample_rate;
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		av_close_input_stream(m_formatCtx);
 		av_free(m_byteiocontext); AUD_DELETE("byteiocontext")
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index 995d4c5f99e..7a624aa53fd 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -116,7 +116,7 @@ int AUD_init(AUD_DeviceType device, AUD_Specs specs, int buffersize)
 
 		return true;
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return false;
 	}
@@ -204,7 +204,7 @@ AUD_Sound* AUD_bufferSound(AUD_Sound* sound)
 	{
 		return new AUD_StreamBufferFactory(sound);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -218,7 +218,7 @@ AUD_Sound* AUD_delaySound(AUD_Sound* sound, float delay)
 	{
 		return new AUD_DelayFactory(sound, delay);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -232,7 +232,7 @@ extern AUD_Sound* AUD_limitSound(AUD_Sound* sound, float start, float end)
 	{
 		return new AUD_LimiterFactory(sound, start, end);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -246,7 +246,7 @@ AUD_Sound* AUD_pingpongSound(AUD_Sound* sound)
 	{
 		return new AUD_PingPongFactory(sound);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -260,7 +260,7 @@ AUD_Sound* AUD_loopSound(AUD_Sound* sound)
 	{
 		return new AUD_LoopFactory(sound);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -278,7 +278,7 @@ int AUD_stopLoop(AUD_Handle* handle)
 		{
 			return AUD_device->sendMessage(handle, message);
 		}
-		catch(AUD_Exception e)
+		catch(AUD_Exception)
 		{
 		}
 	}
@@ -299,7 +299,7 @@ AUD_Handle* AUD_play(AUD_Sound* sound, int keep)
 	{
 		return AUD_device->play(sound, keep);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -360,7 +360,7 @@ AUD_Handle* AUD_play3D(AUD_Sound* sound, int keep)
 		else
 			return AUD_device->play(sound, keep);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -376,7 +376,7 @@ int AUD_updateListener(AUD_3DData* data)
 		if(AUD_3ddevice)
 			return AUD_3ddevice->updateListener(*data);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 	}
 	return false;
@@ -391,7 +391,7 @@ int AUD_set3DSetting(AUD_3DSetting setting, float value)
 		if(AUD_3ddevice)
 			return AUD_3ddevice->setSetting(setting, value);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 	}
 	return false;
@@ -406,7 +406,7 @@ float AUD_get3DSetting(AUD_3DSetting setting)
 		if(AUD_3ddevice)
 			return AUD_3ddevice->getSetting(setting);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 	}
 	return 0.0;
@@ -424,7 +424,7 @@ int AUD_update3DSource(AUD_Handle* handle, AUD_3DData* data)
 			if(AUD_3ddevice)
 				return AUD_3ddevice->updateSource(handle, *data);
 		}
-		catch(AUD_Exception e)
+		catch(AUD_Exception)
 		{
 		}
 	}
@@ -443,7 +443,7 @@ int AUD_set3DSourceSetting(AUD_Handle* handle,
 			if(AUD_3ddevice)
 				return AUD_3ddevice->setSourceSetting(handle, setting, value);
 		}
-		catch(AUD_Exception e)
+		catch(AUD_Exception)
 		{
 		}
 	}
@@ -461,7 +461,7 @@ float AUD_get3DSourceSetting(AUD_Handle* handle, AUD_3DSourceSetting setting)
 			if(AUD_3ddevice)
 				return AUD_3ddevice->getSourceSetting(handle, setting);
 		}
-		catch(AUD_Exception e)
+		catch(AUD_Exception)
 		{
 		}
 	}
@@ -481,7 +481,7 @@ int AUD_setSoundVolume(AUD_Handle* handle, float volume)
 		{
 			return AUD_device->setCapability(AUD_CAPS_SOURCE_VOLUME, &caps);
 		}
-		catch(AUD_Exception e) {}
+		catch(AUD_Exception) {}
 	}
 	return false;
 }
@@ -499,7 +499,7 @@ int AUD_setSoundPitch(AUD_Handle* handle, float pitch)
 		{
 			return AUD_device->setCapability(AUD_CAPS_SOURCE_PITCH, &caps);
 		}
-		catch(AUD_Exception e) {}
+		catch(AUD_Exception) {}
 	}
 	return false;
 }
@@ -510,7 +510,7 @@ AUD_Device* AUD_openReadDevice(AUD_Specs specs)
 	{
 		return new AUD_ReadDevice(specs);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return NULL;
 	}
@@ -525,7 +525,7 @@ int AUD_playDevice(AUD_Device* device, AUD_Sound* sound)
 	{
 		return device->play(sound) != NULL;
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return false;
 	}
@@ -540,7 +540,7 @@ int AUD_readDevice(AUD_Device* device, sample_t* buffer, int length)
 	{
 		return device->read(buffer, length);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		return false;
 	}
@@ -554,7 +554,7 @@ void AUD_closeReadDevice(AUD_Device* device)
 	{
 		delete device;
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 	}
 }
diff --git a/intern/audaspace/jack/AUD_JackDevice.cpp b/intern/audaspace/jack/AUD_JackDevice.cpp
index 445e68e1a9a..4d8ab93d672 100644
--- a/intern/audaspace/jack/AUD_JackDevice.cpp
+++ b/intern/audaspace/jack/AUD_JackDevice.cpp
@@ -35,7 +35,7 @@
 int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data)
 {
 	AUD_JackDevice* device = (AUD_JackDevice*)data;
-	int samplesize = AUD_SAMPLE_SIZE(device->m_specs);
+	unsigned int samplesize = AUD_SAMPLE_SIZE(device->m_specs);
 	if(device->m_buffer->getSize() < samplesize * length)
 		device->m_buffer->resize(samplesize * length);
 	device->mix(device->m_buffer->getBuffer(), length);
@@ -44,10 +44,10 @@ int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data)
 	float* out;
 	int count = device->m_specs.channels;
 
-	for(int i = 0; i < count; i++)
+	for(unsigned int i = 0; i < count; i++)
 	{
 		out = (float*)jack_port_get_buffer(device->m_ports[i], length);
-		for(int j = 0; j < length; j++)
+		for(unsigned int j = 0; j < length; j++)
 			out[j] = in[j * count + i];
 	}
 
@@ -105,7 +105,7 @@ AUD_JackDevice::AUD_JackDevice(AUD_Specs specs)
 		if(jack_activate(m_client))
 			AUD_THROW(AUD_ERROR_JACK);
 	}
-	catch(AUD_Exception e)
+	catch(AUD_Exception)
 	{
 		jack_client_close(m_client);
 		delete[] m_ports; AUD_DELETE("jack_port")

From 62138aaa5a7f931fa2ddb4815f755413111cceb0 Mon Sep 17 00:00:00 2001
From: Arystanbek Dyussenov <arystan.d@gmail.com>
Date: Sun, 6 Sep 2009 15:13:57 +0000
Subject: [PATCH 457/577] Python part of multidim. array support for RNA
 complete.

Multidim. arrays can now be modified at any level, for example:

struc.arrayprop = x
struc.arrayprop[i] = x
struc.arrayprop[i][j] = x
struc.arrayprop[i][j][k] = x
etc...

Approriate rvalue type/length checking is done.

To ensure all works correctly, I wrote automated tests in release/test/rna_array.py.

These tests cover: array/item access, assignment on different levels, tests that proper exceptions are thrown on invalid item access/assignment.

The tests use properties of the RNA Test struct defined in rna_test.c. This struct is only compiled when building with BF_UNIT_TEST=1 scons arg.

Currently unit tests are run manually by loading the script in the Text Editor.
Here's the output I have: http://www.pasteall.org/7644

Things to improve here:
- better exception messages when multidim. array assignment fails. Those we have currently are not very useful for multidim.
- add tests for slice assignment
---
 release/test/rna_array.py                     | 279 +++++++++++++
 .../blender/blenloader/intern/readblenentry.c |   5 +-
 source/blender/makesrna/RNA_access.h          |   1 +
 source/blender/makesrna/SConscript            |   3 +
 source/blender/makesrna/intern/SConscript     |   3 +
 source/blender/makesrna/intern/makesrna.c     |   1 +
 source/blender/makesrna/intern/rna_access.c   |  33 +-
 source/blender/makesrna/intern/rna_define.c   |   2 +
 source/blender/makesrna/intern/rna_internal.h |   1 +
 .../makesrna/intern/rna_internal_types.h      |   8 +-
 source/blender/makesrna/intern/rna_main.c     |  24 ++
 source/blender/makesrna/intern/rna_mesh.c     |   2 +-
 source/blender/makesrna/intern/rna_test.c     | 188 +++++++++
 source/blender/python/intern/bpy_array.c      | 387 +++++++++++++++---
 source/blender/python/intern/bpy_rna.c        | 298 +++++++-------
 source/blender/python/intern/bpy_rna.h        |  13 +-
 tools/btools.py                               |   6 +-
 17 files changed, 1041 insertions(+), 213 deletions(-)
 create mode 100644 release/test/rna_array.py
 create mode 100644 source/blender/makesrna/intern/rna_test.c

diff --git a/release/test/rna_array.py b/release/test/rna_array.py
new file mode 100644
index 00000000000..9b7c65ff017
--- /dev/null
+++ b/release/test/rna_array.py
@@ -0,0 +1,279 @@
+import unittest
+import random
+
+test= bpy.data.test
+
+# farr - 1-dimensional array of float
+# fdarr - dynamic 1-dimensional array of float
+# fmarr - 3-dimensional ([3][4][5]) array of float
+# fdmarr - dynamic 3-dimensional (ditto size) array of float
+
+# same as above for other types except that the first letter is "i" for int and "b" for bool
+
+class TestArray(unittest.TestCase):
+	# test that assignment works by: assign -> test value
+	# - rvalue = list of float
+	# - rvalue = list of numbers
+	# test.object
+	# bpy.data.test.farr[3], iarr[3], barr[...], fmarr, imarr, bmarr
+
+	def setUp(self):
+		test.farr= (1.0, 2.0, 3.0)
+		test.iarr= (7, 8, 9)
+		test.barr= (False, True, False)
+	
+	# test access
+	# test slice access, negative indices
+	def test_access(self):
+		rvals= ([1.0, 2.0, 3.0], [7, 8, 9], [False, True, False])
+		for arr, rval in zip((test.farr, test.iarr, test.barr), rvals):
+			self.assertEqual(prop_to_list(arr), rval)
+			self.assertEqual(arr[0:3], rval)
+			self.assertEqual(arr[1:2], rval[1:2])
+			self.assertEqual(arr[-1], arr[2])
+			self.assertEqual(arr[-2], arr[1])
+			self.assertEqual(arr[-3], arr[0])
+
+	# fail when index out of bounds
+	def test_access_fail(self):
+		for arr in (test.farr, test.iarr, test.barr):
+			self.assertRaises(IndexError, lambda : arr[4])
+	
+	# test assignment of a whole array
+	def test_assign_array(self):
+		# should accept int as float
+		test.farr= (1, 2, 3)
+
+	# fail when: unexpected no. of items, invalid item type
+	def test_assign_array_fail(self):
+		def assign_empty_list(arr):
+			setattr(test, arr, ())
+
+		for arr in ("farr", "iarr", "barr"):
+			self.assertRaises(ValueError, assign_empty_list, arr)
+
+		def assign_invalid_float():
+			test.farr= (1.0, 2.0, "3.0")
+
+		def assign_invalid_int():
+			test.iarr= ("1", 2, 3)
+
+		def assign_invalid_bool():
+			test.barr= (True, 0.123, False)
+
+		for func in [assign_invalid_float, assign_invalid_int, assign_invalid_bool]:
+			self.assertRaises(TypeError, func)
+
+		# shouldn't accept float as int
+		def assign_float_as_int():
+			test.iarr= (1, 2, 3.0)
+		self.assertRaises(TypeError, assign_float_as_int)
+
+		# non-dynamic arrays cannot change size
+		def assign_different_size(arr, val):
+			setattr(test, arr, val)
+		for arr, val in zip(("iarr", "farr", "barr"), ((1, 2), (1.0, 2.0), (True, False))):
+			self.assertRaises(ValueError, assign_different_size, arr, val)
+
+	# test assignment of specific items
+	def test_assign_item(self):
+		for arr, rand_func in zip((test.farr, test.iarr, test.barr), (rand_float, rand_int, rand_bool)):
+			for i in range(len(arr)):
+				val= rand_func()
+				arr[i]= val
+				
+				self.assertEqual(arr[i], val)
+
+		# float prop should accept also int
+		for i in range(len(test.farr)):
+			val= rand_int()
+			test.farr[i]= val
+			self.assertEqual(test.farr[i], float(val))
+
+		# 
+
+	def test_assign_item_fail(self):
+		def assign_bad_index(arr):
+			arr[4] = 1.0
+
+		def assign_bad_type(arr):
+			arr[1]= "123"
+			
+		for arr in [test.farr, test.iarr, test.barr]:
+			self.assertRaises(IndexError, assign_bad_index, arr)
+
+		# not testing bool because bool allows not only (True|False)
+		for arr in [test.farr, test.iarr]:	
+			self.assertRaises(TypeError, assign_bad_type, arr)
+
+	def test_dynamic_assign_array(self):
+		# test various lengths here
+		for arr, rand_func in zip(("fdarr", "idarr", "bdarr"), (rand_float, rand_int, rand_bool)):
+			for length in range(1, 64):
+				rval= make_random_array(length, rand_func)
+				setattr(test, arr, rval)
+				self.assertEqual(prop_to_list(getattr(test, arr)), rval)
+
+	def test_dynamic_assign_array_fail(self):
+		# could also test too big length here
+		
+		def assign_empty_list(arr):
+			setattr(test, arr, ())
+
+		for arr in ("fdarr", "idarr", "bdarr"):
+			self.assertRaises(ValueError, assign_empty_list, arr)
+
+
+class TestMArray(unittest.TestCase):
+	def setUp(self):
+		# reset dynamic array sizes
+		for arr, func in zip(("fdmarr", "idmarr", "bdmarr"), (rand_float, rand_int, rand_bool)):
+			setattr(test, arr, make_random_3d_array((3, 4, 5), func))
+
+	# test assignment
+	def test_assign_array(self):
+		for arr, func in zip(("fmarr", "imarr", "bmarr"), (rand_float, rand_int, rand_bool)):
+			# assignment of [3][4][5]
+			rval= make_random_3d_array((3, 4, 5), func)
+			setattr(test, arr, rval)
+			self.assertEqual(prop_to_list(getattr(test, arr)), rval)
+
+		# test assignment of [2][4][5], [1][4][5] should work on dynamic arrays
+
+	def test_assign_array_fail(self):
+		def assign_empty_array():
+			test.fmarr= ()
+		self.assertRaises(ValueError, assign_empty_array)
+
+		def assign_invalid_size(arr, rval):
+			setattr(test, arr, rval)
+
+		# assignment of 3,4,4 or 3,3,5 should raise ex
+		for arr, func in zip(("fmarr", "imarr", "bmarr"), (rand_float, rand_int, rand_bool)):
+			rval= make_random_3d_array((3, 4, 4), func)
+			self.assertRaises(ValueError, assign_invalid_size, arr, rval)
+
+			rval= make_random_3d_array((3, 3, 5), func)
+			self.assertRaises(ValueError, assign_invalid_size, arr, rval)
+
+			rval= make_random_3d_array((3, 3, 3), func)
+			self.assertRaises(ValueError, assign_invalid_size, arr, rval)
+
+	def test_assign_item(self):
+		# arr[i] = x
+		for arr, func in zip(("fmarr", "imarr", "bmarr", "fdmarr", "idmarr", "bdmarr"), (rand_float, rand_int, rand_bool) * 2):
+			rval= make_random_2d_array((4, 5), func)
+
+			for i in range(3):
+				getattr(test, arr)[i]= rval
+				self.assertEqual(prop_to_list(getattr(test, arr)[i]), rval)
+
+		# arr[i][j] = x
+		for arr, func in zip(("fmarr", "imarr", "bmarr", "fdmarr", "idmarr", "bdmarr"), (rand_float, rand_int, rand_bool) * 2):
+
+			arr= getattr(test, arr)
+			rval= make_random_array(5, func)
+
+			for i in range(3):
+				for j in range(4):
+					arr[i][j]= rval
+					self.assertEqual(prop_to_list(arr[i][j]), rval)
+
+
+	def test_assign_item_fail(self):
+		def assign_wrong_size(arr, i, rval):
+			getattr(test, arr)[i]= rval
+
+		# assign wrong size at level 2
+		for arr, func in zip(("fmarr", "imarr", "bmarr"), (rand_float, rand_int, rand_bool)):
+			rval1= make_random_2d_array((3, 5), func)
+			rval2= make_random_2d_array((4, 3), func)
+
+			for i in range(3):
+				self.assertRaises(ValueError, assign_wrong_size, arr, i, rval1)
+				self.assertRaises(ValueError, assign_wrong_size, arr, i, rval2)
+
+	def test_dynamic_assign_array(self):
+		for arr, func in zip(("fdmarr", "idmarr", "bdmarr"), (rand_float, rand_int, rand_bool)):
+			# assignment of [3][4][5]
+			rval= make_random_3d_array((3, 4, 5), func)
+			setattr(test, arr, rval)
+			self.assertEqual(prop_to_list(getattr(test, arr)), rval)
+
+			# [2][4][5]
+			rval= make_random_3d_array((2, 4, 5), func)
+			setattr(test, arr, rval)
+			self.assertEqual(prop_to_list(getattr(test, arr)), rval)
+
+			# [1][4][5]
+			rval= make_random_3d_array((1, 4, 5), func)
+			setattr(test, arr, rval)
+			self.assertEqual(prop_to_list(getattr(test, arr)), rval)
+
+
+	# test access
+	def test_access(self):
+		pass
+
+	# test slice access, negative indices
+	def test_access_fail(self):
+		pass
+
+random.seed()
+
+def rand_int():
+	return random.randint(-1000, 1000)
+
+def rand_float():
+	return float(rand_int())
+
+def rand_bool():
+	return bool(random.randint(0, 1))
+
+def make_random_array(len, rand_func):
+	arr= []
+	for i in range(len):
+		arr.append(rand_func())
+		
+	return arr
+
+def make_random_2d_array(dimsize, rand_func):
+	marr= []
+	for i in range(dimsize[0]):
+		marr.append([])
+
+		for j in range(dimsize[1]):
+			marr[-1].append(rand_func())
+
+	return marr
+
+def make_random_3d_array(dimsize, rand_func):
+	marr= []
+	for i in range(dimsize[0]):
+		marr.append([])
+
+		for j in range(dimsize[1]):
+			marr[-1].append([])
+
+			for k in range(dimsize[2]):
+				marr[-1][-1].append(rand_func())
+
+	return marr
+
+def prop_to_list(prop):
+	ret= []
+
+	for x in prop:
+		if type(x) not in (bool, int, float):
+			ret.append(prop_to_list(x))
+		else:
+			ret.append(x)
+
+	return ret
+
+def suite():
+	return unittest.TestSuite([unittest.TestLoader().loadTestsFromTestCase(TestArray), unittest.TestLoader().loadTestsFromTestCase(TestMArray)])
+
+if __name__ == "__main__":
+	unittest.TextTestRunner(verbosity=2).run(suite())
+
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index 1c21c1817e6..9cd45a268da 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -32,14 +32,13 @@
 #include <config.h>
 #endif
 
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 
-
-#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 98205d17ef3..4107c1346e5 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -586,6 +586,7 @@ PropertyUnit RNA_property_unit(PropertyRNA *prop);
 int RNA_property_flag(PropertyRNA *prop);
 
 int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop);
+int RNA_property_multidimensional_array_length(PointerRNA *ptr, PropertyRNA *prop, int dimension);
 int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length);
 char RNA_property_array_item_char(PropertyRNA *prop, int index);
 unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dim_size[]);
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index c2790927cef..845abf636e2 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -37,4 +37,7 @@ if env['WITH_BF_LCMS']:
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
 
+if env['BF_UNIT_TEST']:
+	defs.append('UNIT_TEST')
+
 env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 9234efa2a5d..569f0547731 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -71,6 +71,9 @@ if env['WITH_BF_OPENAL']:
 if env['WITH_BF_JACK']:
     defs.append('WITH_JACK')
 
+if env['BF_UNIT_TEST']:
+	defs.append('UNIT_TEST')
+
 makesrna_tool.Append(CPPDEFINES=defs)
 
 makesrna_tool.Append (CPPPATH = Split(incs))
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index bb7b6cbcd37..907eba4018f 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1991,6 +1991,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
 	{"rna_sequence.c", NULL, RNA_def_sequence},
 	{"rna_smoke.c", NULL, RNA_def_smoke},
 	{"rna_space.c", NULL, RNA_def_space},
+	{"rna_test.c", NULL, RNA_def_test},
 	{"rna_text.c", NULL, RNA_def_text},
 	{"rna_timeline.c", NULL, RNA_def_timeline_marker},
 	{"rna_sound.c", NULL, RNA_def_sound},
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index e71dcc2a586..f37fa01480c 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -557,14 +557,24 @@ int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop)
 
 int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length)
 {
-	if (prop->setlength)
-		return prop->setlength(ptr, length);
+	/* length 0 is not allowed */
+	if (!length)
+		return 0;
+
+	if (prop->getlength) {
+		if (prop->setlength)
+			return prop->setlength(ptr, length);
+		else
+			/* length cannot be changed */
+			return 0;
+	}
 	else
 		prop->arraylength= length; /* function parameters only? */
 
 	return 1;
 }
 
+/* used by BPY to make an array from the python object */
 unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dimsize[])
 {
 	if (dimsize && prop->arraydimension > 1) {
@@ -573,6 +583,25 @@ unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short di
 	return prop->arraydimension;
 }
 
+/* Return the size of Nth dimension. */
+int RNA_property_multidimensional_array_length(PointerRNA *ptr, PropertyRNA *prop, int dim)
+{
+	unsigned short i;
+	int len;
+
+	if (dim == 0) {
+		len= RNA_property_array_length(ptr, prop);
+
+		for (i= 0; i < prop->arraydimension - 1; i++)
+			len /= prop->dimsize[i];
+	}
+	else {
+		len= prop->dimsize[dim - 1];
+	}
+
+	return len;
+}
+
 char RNA_property_array_item_char(PropertyRNA *prop, int index)
 {
 	const char *vectoritem= "XYZW";
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 69e6698bd3b..e415304ab6c 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -1046,6 +1046,8 @@ void RNA_def_property_multidimensional_array(PropertyRNA *prop, int arraylength,
 
 	prop->arraydimension= dimension;
 
+	/* TODO make sure dimsize values are sane  */
+
 	if (dimension > 1)
 		memcpy(prop->dimsize, dimsize, sizeof(dimsize[0]) * (dimension - 1));
 }
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 13cc2ae9017..7de80843f27 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -157,6 +157,7 @@ void RNA_def_sensor(struct BlenderRNA *brna);
 void RNA_def_sequence(struct BlenderRNA *brna);
 void RNA_def_smoke(struct BlenderRNA *brna);
 void RNA_def_space(struct BlenderRNA *brna);
+void RNA_def_test(struct BlenderRNA *brna);
 void RNA_def_text(struct BlenderRNA *brna);
 void RNA_def_texture(struct BlenderRNA *brna);
 void RNA_def_timeline_marker(struct BlenderRNA *brna);
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h
index d706fd5ac19..2bd89dbd3bf 100644
--- a/source/blender/makesrna/intern/rna_internal_types.h
+++ b/source/blender/makesrna/intern/rna_internal_types.h
@@ -39,7 +39,12 @@ struct bContext;
 struct IDProperty;
 struct GHash;
 
+#ifdef UNIT_TEST
+#define RNA_MAX_ARRAY 64
+#else
 #define RNA_MAX_ARRAY 32
+#endif
+
 #define RNA_MAX_ARRAY_DIMENSION 3
 
 /* Function Callbacks */
@@ -134,11 +139,10 @@ struct PropertyRNA {
 	PropertySubType subtype;
 	/* if an array this is > 0, specifying the length */
 	unsigned int arraylength;
-	/* these, if non-NULL, override arraylength */
+	/* if non-NULL, overrides arraylength. Must not return 0? */
 	PropArrayLengthGetFunc getlength;
 	/* if NULL, length cannot be changed by a user */
 	PropArrayLengthSetFunc setlength;
-	/* used only for dynamic arrays for now, default 1 */
 	unsigned short arraydimension;
 	/* dimension sizes for dimensions greater than 1, first dimension size is not specified */
 	unsigned short dimsize[RNA_MAX_ARRAY_DIMENSION - 1];
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 82e460ea57d..344135acaff 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -219,6 +219,18 @@ static void rna_Main_wm_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 	rna_iterator_listbase_begin(iter, &bmain->wm, NULL);
 }
 
+#ifdef UNIT_TEST
+
+static PointerRNA rna_Test_test_get(PointerRNA *ptr)
+{
+	PointerRNA ret= *ptr;
+	ret.type= &RNA_Test;
+
+	return ret;
+}
+
+#endif
+
 #else
 
 void RNA_def_main(BlenderRNA *brna)
@@ -276,6 +288,18 @@ void RNA_def_main(BlenderRNA *brna)
 	}
 
 	RNA_api_main(srna);
+
+#ifdef UNIT_TEST
+
+	RNA_define_verify_sdna(0);
+
+	prop= RNA_def_property(srna, "test", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "Test");
+	RNA_def_property_pointer_funcs(prop, "rna_Test_test_get", NULL, NULL);
+
+	RNA_define_verify_sdna(1);
+
+#endif
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index f7235db49a5..efd0046d827 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1182,7 +1182,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "UV 4", "");
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
-	prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_XYZ);
+	prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_multidimensional_array(prop, 4 * 2, 2, uv_dim);
 	RNA_def_property_flag(prop, PROP_DYNAMIC);
 	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length", "rna_MeshTextureFace_uv_set_length");
diff --git a/source/blender/makesrna/intern/rna_test.c b/source/blender/makesrna/intern/rna_test.c
new file mode 100644
index 00000000000..bfaf318018a
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_test.c
@@ -0,0 +1,188 @@
+/**
+ * $Id: rna_test.c  $
+ *
+ * ***** 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): Arystanbek Dyussenov
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/* Defines a structure with properties used for array manipulation tests in BPY. */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#define ARRAY_SIZE 3
+#define DYNAMIC_ARRAY_SIZE 64
+#define MARRAY_DIM [3][4][5]
+#define MARRAY_TOTDIM 3
+#define MARRAY_DIMSIZE 4, 5
+#define MARRAY_SIZE(type) (sizeof(type MARRAY_DIM) / sizeof(type))
+#define DYNAMIC_MARRAY_DIM [3][4][5]
+#define DYNAMIC_MARRAY_SIZE(type) (sizeof(type DYNAMIC_MARRAY_DIM) / sizeof(type))
+
+#ifdef RNA_RUNTIME
+
+#ifdef UNIT_TEST
+
+#define DEF_VARS(type, prefix)								\
+	static type prefix ## arr[ARRAY_SIZE];					\
+	static type prefix ## darr[DYNAMIC_ARRAY_SIZE];			\
+	static int prefix ## darr_len= ARRAY_SIZE;				\
+	static type prefix ## marr MARRAY_DIM;					\
+	static type prefix ## dmarr DYNAMIC_MARRAY_DIM;			\
+	static int prefix ## dmarr_len= sizeof(prefix ## dmarr);
+
+#define DEF_GET_SET(type, arr)											\
+	void rna_Test_ ## arr ## _get(PointerRNA *ptr, type *values)		\
+	{																	\
+		memcpy(values, arr, sizeof(arr));								\
+	}																	\
+																		\
+	void rna_Test_ ## arr ## _set(PointerRNA *ptr, const type *values)	\
+	{																	\
+		memcpy(arr, values, sizeof(arr));								\
+	}
+
+#define DEF_GET_SET_LEN(arr, max)										\
+	static int rna_Test_ ## arr ## _get_length(PointerRNA *ptr)			\
+	{																	\
+		return arr ## _len;												\
+	}																	\
+																		\
+	static int rna_Test_ ## arr ## _set_length(PointerRNA *ptr, int length)	\
+	{																	\
+		if (length > max)												\
+			return 0;													\
+																		\
+		arr ## _len= length;											\
+																		\
+		return 1;														\
+	}																	\
+
+DEF_VARS(float, f)
+DEF_VARS(int, i)
+DEF_VARS(int, b)
+
+DEF_GET_SET(float, farr)
+DEF_GET_SET(int, iarr)
+DEF_GET_SET(int, barr)
+
+DEF_GET_SET(float, fmarr)
+DEF_GET_SET(int, imarr)
+DEF_GET_SET(int, bmarr)
+
+DEF_GET_SET(float, fdarr)
+DEF_GET_SET_LEN(fdarr, DYNAMIC_ARRAY_SIZE)
+DEF_GET_SET(int, idarr)
+DEF_GET_SET_LEN(idarr, DYNAMIC_ARRAY_SIZE)
+DEF_GET_SET(int, bdarr)
+DEF_GET_SET_LEN(bdarr, DYNAMIC_ARRAY_SIZE)
+
+DEF_GET_SET(float, fdmarr)
+DEF_GET_SET_LEN(fdmarr, DYNAMIC_MARRAY_SIZE(float))
+DEF_GET_SET(int, idmarr)
+DEF_GET_SET_LEN(idmarr, DYNAMIC_MARRAY_SIZE(int))
+DEF_GET_SET(int, bdmarr)
+DEF_GET_SET_LEN(bdmarr, DYNAMIC_MARRAY_SIZE(int))
+
+#endif
+
+#else
+
+void RNA_def_test(BlenderRNA *brna)
+{
+#ifdef UNIT_TEST
+	StructRNA *srna;
+	PropertyRNA *prop;
+	unsigned short dimsize[]= {MARRAY_DIMSIZE};
+
+	srna= RNA_def_struct(brna, "Test", NULL);
+	RNA_def_struct_sdna(srna, "Test");
+
+	prop= RNA_def_float_array(srna, "farr", ARRAY_SIZE, NULL, 0.0f, 0.0f, "farr", "float array", 0.0f, 0.0f);
+	RNA_def_property_float_funcs(prop, "rna_Test_farr_get", "rna_Test_farr_set", NULL);
+
+	prop= RNA_def_int_array(srna, "iarr", ARRAY_SIZE, NULL, 0, 0, "iarr", "int array", 0, 0);
+	RNA_def_property_int_funcs(prop, "rna_Test_iarr_get", "rna_Test_iarr_set", NULL);
+
+	prop= RNA_def_boolean_array(srna, "barr", ARRAY_SIZE, NULL, "barr", "boolean array");
+	RNA_def_property_boolean_funcs(prop, "rna_Test_barr_get", "rna_Test_barr_set");
+
+	/* dynamic arrays */
+
+	prop= RNA_def_float_array(srna, "fdarr", DYNAMIC_ARRAY_SIZE, NULL, 0.0f, 0.0f, "fdarr", "dynamic float array", 0.0f, 0.0f);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_Test_fdarr_get_length", "rna_Test_fdarr_set_length");
+	RNA_def_property_float_funcs(prop, "rna_Test_fdarr_get", "rna_Test_fdarr_set", NULL);
+
+	prop= RNA_def_int_array(srna, "idarr", DYNAMIC_ARRAY_SIZE, NULL, 0, 0, "idarr", "int array", 0, 0);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_Test_idarr_get_length", "rna_Test_idarr_set_length");
+	RNA_def_property_int_funcs(prop, "rna_Test_idarr_get", "rna_Test_idarr_set", NULL);
+	
+	prop= RNA_def_boolean_array(srna, "bdarr", DYNAMIC_ARRAY_SIZE, NULL, "bdarr", "boolean array");
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_Test_bdarr_get_length", "rna_Test_bdarr_set_length");
+	RNA_def_property_boolean_funcs(prop, "rna_Test_bdarr_get", "rna_Test_bdarr_set");
+
+	/* multidimensional arrays */
+
+	prop= RNA_def_property(srna, "fmarr", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_multidimensional_array(prop, MARRAY_SIZE(float), MARRAY_TOTDIM, dimsize);
+	RNA_def_property_float_funcs(prop, "rna_Test_fmarr_get", "rna_Test_fmarr_set", NULL);
+
+	prop= RNA_def_property(srna, "imarr", PROP_INT, PROP_NONE);
+	RNA_def_property_multidimensional_array(prop, MARRAY_SIZE(int), MARRAY_TOTDIM, dimsize);
+	RNA_def_property_int_funcs(prop, "rna_Test_imarr_get", "rna_Test_imarr_set", NULL);
+
+	prop= RNA_def_property(srna, "bmarr", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_multidimensional_array(prop, MARRAY_SIZE(int), MARRAY_TOTDIM, dimsize);
+	RNA_def_property_boolean_funcs(prop, "rna_Test_bmarr_get", "rna_Test_bmarr_set");
+
+	/* dynamic multidimensional arrays */
+
+	prop= RNA_def_property(srna, "fdmarr", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_multidimensional_array(prop, DYNAMIC_MARRAY_SIZE(float), MARRAY_TOTDIM, dimsize);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_Test_fdmarr_get_length", "rna_Test_fdmarr_set_length");
+	RNA_def_property_float_funcs(prop, "rna_Test_fdmarr_get", "rna_Test_fdmarr_set", NULL);
+
+	prop= RNA_def_property(srna, "idmarr", PROP_INT, PROP_NONE);
+	RNA_def_property_multidimensional_array(prop, DYNAMIC_MARRAY_SIZE(int), MARRAY_TOTDIM, dimsize);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_Test_idmarr_get_length", "rna_Test_idmarr_set_length");
+	RNA_def_property_int_funcs(prop, "rna_Test_idmarr_get", "rna_Test_idmarr_set", NULL);
+
+	prop= RNA_def_property(srna, "bdmarr", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_multidimensional_array(prop, DYNAMIC_MARRAY_SIZE(int), MARRAY_TOTDIM, dimsize);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_Test_bdmarr_get_length", "rna_Test_bdmarr_set_length");
+	RNA_def_property_boolean_funcs(prop, "rna_Test_bdmarr_get", "rna_Test_bdmarr_set");
+
+#endif
+}
+
+#endif	/* RNA_RUNTIME */
+
+
diff --git a/source/blender/python/intern/bpy_array.c b/source/blender/python/intern/bpy_array.c
index 669cccb7011..9db4b20d011 100644
--- a/source/blender/python/intern/bpy_array.c
+++ b/source/blender/python/intern/bpy_array.c
@@ -30,33 +30,65 @@
 
 #include "BLI_string.h"
 
+#include "BKE_global.h"
+
 #include "MEM_guardedalloc.h"
 
-typedef void (*ItemConvertFunc)(PyObject *, char *);
-typedef int (*ItemTypeCheckFunc)(PyObject *);
-typedef void (*RNA_SetArrayFunc)(PointerRNA *, PropertyRNA *, const char *);
+#define MAX_ARRAY_DIMENSION 10
 
-/* Ensures that a python sequence has an expected number of items/sub-items and items are of expected type. */
-static int pyrna_validate_array(PyObject *seq, unsigned short dim, unsigned short totdim, unsigned short dim_size[],
-								ItemTypeCheckFunc check_item_type, const char *item_type_str, char *error_str, int error_str_size)
+/* convenient way to access array dimension size */
+#define DIMSIZE(a) (dimsize[a - 1])
+
+typedef void (*ItemConvertFunc)(PyObject *, char *);
+typedef int  (*ItemTypeCheckFunc)(PyObject *);
+typedef void (*RNA_SetArrayFunc)(PointerRNA *, PropertyRNA *, const char *);
+typedef void (*RNA_SetIndexFunc)(PointerRNA *, PropertyRNA *, int index, void *);
+
+/*
+  arr[3][4][5]
+      0  1  2  <- dimension index
+*/
+
+/*
+  arr[2] = x
+
+  py_to_array_index(arraydim=0, arrayoffset=0, index=2)
+    validate_array(lvalue_dim=0)
+    ... make real index ...
+*/
+
+/* arr[3]=x, self->arraydim is 0, lvalue_dim is 1 */
+/* Ensures that a python sequence has expected number of items/sub-items and items are of desired type. */
+static int validate_array_type(PyObject *seq, unsigned short dim, unsigned short totdim, unsigned short dimsize[],
+							   ItemTypeCheckFunc check_item_type, const char *item_type_str, const char *error_prefix)
 {
 	int i;
-	if (dim < totdim) {
+
+	/* not the last dimension */
+	if (dim + 1 < totdim) {
+		/* check that a sequence contains dimsize[dim] items */
+
 		for (i= 0; i < PySequence_Length(seq); i++) {
 			PyObject *item;
 			int ok= 1;
 			item= PySequence_GetItem(seq, i);
 
 			if (!PySequence_Check(item)) {
-				BLI_snprintf(error_str, error_str_size, "expected a %d-dimensional sequence of %s", (int)totdim, item_type_str);
+				/* BLI_snprintf(error_str, error_str_size, "expected a sequence of %s", item_type_str); */
+				PyErr_Format(PyExc_TypeError, "%s expected a sequence of %s", error_prefix, item_type_str);
 				ok= 0;
 			}
-			else if (PySequence_Length(item) != dim_size[dim - 1]) {
-				BLI_snprintf(error_str, error_str_size, "dimension %d should contain %d items", (int)dim, (int)dim_size[dim - 1]);
+			/* arr[3][4][5]
+			   DIMSIZE(1)=4
+			   DIMSIZE(2)=5
+		   
+			   dim=0 */
+			else if (PySequence_Length(item) != DIMSIZE(dim + 1)) {
+				/* BLI_snprintf(error_str, error_str_size, "sequences of dimension %d should contain %d items", (int)dim + 1, (int)DIMSIZE(dim + 1)); */
+				PyErr_Format(PyExc_ValueError, "%s sequences of dimension %d should contain %d items", error_prefix, (int)dim + 1, (int)DIMSIZE(dim + 1));
 				ok= 0;
 			}
-
-			if (!pyrna_validate_array(item, dim + 1, totdim, dim_size, check_item_type, item_type_str, error_str, error_str_size)) {
+			else if (!validate_array_type(item, dim + 1, totdim, dimsize, check_item_type, item_type_str, error_prefix)) {
 				ok= 0;
 			}
 
@@ -67,13 +99,15 @@ static int pyrna_validate_array(PyObject *seq, unsigned short dim, unsigned shor
 		}
 	}
 	else {
+		/* check that items are of correct type */
 		for (i= 0; i < PySequence_Length(seq); i++) {
 			PyObject *item= PySequence_GetItem(seq, i);
 
 			if (!check_item_type(item)) {
 				Py_DECREF(item);
-							
-				BLI_snprintf(error_str, error_str_size, "sequence items should be of type %s", item_type_str);
+
+				/* BLI_snprintf(error_str, error_str_size, "sequence items should be of type %s", item_type_str); */
+				PyErr_Format(PyExc_TypeError, "sequence items should be of type %s", item_type_str);
 				return 0;
 			}
 
@@ -85,7 +119,7 @@ static int pyrna_validate_array(PyObject *seq, unsigned short dim, unsigned shor
 }
 
 /* Returns the number of items in a single- or multi-dimensional sequence. */
-static int pyrna_count_items(PyObject *seq)
+static int count_items(PyObject *seq)
 {
 	int totitem= 0;
 
@@ -93,7 +127,7 @@ static int pyrna_count_items(PyObject *seq)
 		int i;
 		for (i= 0; i < PySequence_Length(seq); i++) {
 			PyObject *item= PySequence_GetItem(seq, i);
-			totitem += pyrna_count_items(item);
+			totitem += count_items(item);
 			Py_DECREF(item);
 		}
 	}
@@ -103,40 +137,103 @@ static int pyrna_count_items(PyObject *seq)
 	return totitem;
 }
 
-static int pyrna_apply_array_length(PointerRNA *ptr, PropertyRNA *prop, int totitem, char *error_str, int error_str_size)
+/* Modifies property array length if needed and PROP_DYNAMIC flag is set. */
+static int validate_array_length(PyObject *rvalue, PointerRNA *ptr, PropertyRNA *prop, int lvalue_dim, int *totitem, const char *error_prefix)
 {
-	if (RNA_property_flag(prop) & PROP_DYNAMIC) {
-		/* length can be flexible */
-		if (RNA_property_array_length(ptr, prop) != totitem) {
-			if (!RNA_property_dynamic_array_set_length(ptr, prop, totitem)) {
-				BLI_snprintf(error_str, error_str_size, "%s.%s: array length cannot be changed to %d", RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), totitem);
+	unsigned short dimsize[MAX_ARRAY_DIMENSION];
+	int tot, totdim, len;
+
+	tot= count_items(rvalue);
+	totdim= RNA_property_array_dimension(prop, dimsize);
+
+	if ((RNA_property_flag(prop) & PROP_DYNAMIC) && lvalue_dim == 0) {
+		/* length is flexible */
+		if (RNA_property_array_length(ptr, prop) != tot) {
+			if (!RNA_property_dynamic_array_set_length(ptr, prop, tot)) {
+				/* BLI_snprintf(error_str, error_str_size, "%s.%s: array length cannot be changed to %d", RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), tot); */
+				PyErr_Format(PyExc_ValueError, "%s %s.%s: array length cannot be changed to %d", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), tot);
 				return 0;
 			}
+
+			len= tot;
 		}
 	}
 	else {
 		/* length is a constraint */
-		int len= RNA_property_array_length(ptr, prop);
-		if (totitem != len) {
-			BLI_snprintf(error_str, error_str_size, "sequence must have length of %d", len);
+		if (!lvalue_dim) {
+			len= RNA_property_array_length(ptr, prop);
+		}
+		/* array item assignment */
+		else {
+			int i;
+
+			len= 1;
+
+			/* arr[3][4][5]
+
+			   arr[2] = x
+			   dimsize={4, 5}
+			   DIMSIZE(1) = 4
+			   DIMSIZE(2) = 5
+			   lvalue_dim=0, totdim=3
+
+			   arr[2][3] = x
+			   lvalue_dim=1
+
+			   arr[2][3][4] = x
+			   lvalue_dim=2 */
+			for (i= lvalue_dim; i < totdim; i++)
+				len *= DIMSIZE(i);
+		}
+
+		if (tot != len) {
+			/* BLI_snprintf(error_str, error_str_size, "sequence must have length of %d", len); */
+			PyErr_Format(PyExc_ValueError, "%s sequence must have %d items total", error_prefix, len);
 			return 0;
 		}
 	}
+
+	*totitem= len;
+
 	return 1;
 }
 
-static char *pyrna_py_to_array(PyObject *seq, unsigned short dim, unsigned short totdim, char *data, unsigned int item_size, ItemConvertFunc convert_item)
+static int validate_array(PyObject *rvalue, PointerRNA *ptr, PropertyRNA *prop, int lvalue_dim, ItemTypeCheckFunc check_item_type, const char *item_type_str, int *totitem, const char *error_prefix)
+{
+	unsigned short dimsize[MAX_ARRAY_DIMENSION];
+	int totdim= RNA_property_array_dimension(prop, dimsize);
+
+	/* validate type first because length validation may modify property array length */
+
+	if (!validate_array_type(rvalue, lvalue_dim, totdim, dimsize, check_item_type, item_type_str, error_prefix))
+		return 0;
+
+	return validate_array_length(rvalue, ptr, prop, lvalue_dim, totitem, error_prefix);
+}
+
+static char *copy_values(PyObject *seq, PointerRNA *ptr, PropertyRNA *prop, unsigned short dim, char *data, unsigned int item_size, int *index, ItemConvertFunc convert_item, RNA_SetIndexFunc rna_set_index)
 {
 	unsigned int i;
+	int totdim= RNA_property_array_dimension(prop, NULL);
+
 	for (i= 0; i < PySequence_Length(seq); i++) {
 		PyObject *item= PySequence_GetItem(seq, i);
 
-		if (dim < totdim) {
-			data= pyrna_py_to_array(item, dim + 1, totdim, data, item_size, convert_item);
+		if (dim + 1 < totdim) {
+			data= copy_values(item, ptr, prop, dim + 1, data, item_size, index, convert_item, rna_set_index);
 		}
 		else {
-			convert_item(item, data);
-			data += item_size;
+			if (!data) {
+				char value[sizeof(int)];
+
+				convert_item(item, value);
+				rna_set_index(ptr, prop, *index, value);
+				*index = *index + 1;
+			}
+			else {
+				convert_item(item, data);
+				data += item_size;
+			}
 		}
 			
 		Py_DECREF(item);
@@ -145,21 +242,15 @@ static char *pyrna_py_to_array(PyObject *seq, unsigned short dim, unsigned short
 	return data;
 }
 
-static int pyrna_py_to_array_generic(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size,
-									 ItemTypeCheckFunc check_item_type, const char *item_type_str, int item_size, ItemConvertFunc convert_item, RNA_SetArrayFunc rna_set_array)
+static int py_to_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, ItemTypeCheckFunc check_item_type, const char *item_type_str, int item_size, ItemConvertFunc convert_item, RNA_SetArrayFunc rna_set_array, const char *error_prefix)
 {
-	unsigned short totdim, dim_size[100];
+	unsigned short totdim, dim_size[MAX_ARRAY_DIMENSION];
 	int totitem;
 	char *data= NULL;
 
 	totdim= RNA_property_array_dimension(prop, dim_size);
 
-	if (!pyrna_validate_array(py, 1, totdim, dim_size, check_item_type, item_type_str, error_str, error_str_size))
-		return 0;
-
-	totitem= pyrna_count_items(py);
-
-	if (!pyrna_apply_array_length(ptr, prop, totitem, error_str, error_str_size))
+	if (!validate_array(py, ptr, prop, 0, check_item_type, item_type_str, &totitem, error_prefix))
 		return 0;
 
 	if (totitem) {
@@ -168,7 +259,7 @@ static int pyrna_py_to_array_generic(PyObject *py, PointerRNA *ptr, PropertyRNA
 		else
 			data= param_data;
 
-		pyrna_py_to_array(py, 1, totdim, data, item_size, convert_item);
+		copy_values(py, ptr, prop, 0, data, item_size, NULL, convert_item, NULL);
 
 		if (param_data) {
 			if (RNA_property_flag(prop) & PROP_DYNAMIC) {
@@ -186,50 +277,236 @@ static int pyrna_py_to_array_generic(PyObject *py, PointerRNA *ptr, PropertyRNA
 	return 1;
 }
 
-static void pyrna_py_to_float(PyObject *py, char *data)
+static int py_to_array_index(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, int lvalue_dim, int arrayoffset, int index, ItemTypeCheckFunc check_item_type, const char *item_type_str, ItemConvertFunc convert_item, RNA_SetIndexFunc rna_set_index, const char *error_prefix)
+{
+	unsigned short totdim, dimsize[MAX_ARRAY_DIMENSION];
+	int totitem, i;
+
+	totdim= RNA_property_array_dimension(prop, dimsize);
+
+	/* convert index */
+
+	/* arr[3][4][5]
+
+	   arr[2] = x
+	   lvalue_dim=0, index = 0 + 2 * 4 * 5
+
+	   arr[2][3] = x
+	   lvalue_dim=1, index = 40 + 3 * 5 */
+
+	lvalue_dim++;
+
+	for (i= lvalue_dim; i < totdim; i++)
+		index *= DIMSIZE(i);
+
+	index += arrayoffset;
+
+	if (!validate_array(py, ptr, prop, lvalue_dim, check_item_type, item_type_str, &totitem, error_prefix))
+		return 0;
+
+	if (totitem)
+		copy_values(py, ptr, prop, lvalue_dim, NULL, 0, &index, convert_item, rna_set_index);
+
+	return 1;
+}
+
+static void py_to_float(PyObject *py, char *data)
 {
 	*(float*)data= (float)PyFloat_AsDouble(py);
 }
 
-static void pyrna_py_to_int(PyObject *py, char *data)
+static void py_to_int(PyObject *py, char *data)
 {
 	*(int*)data= (int)PyLong_AsSsize_t(py);
 }
 
-static void pyrna_py_to_boolean(PyObject *py, char *data)
+static void py_to_bool(PyObject *py, char *data)
 {
 	*(int*)data= (int)PyObject_IsTrue(py);
 }
 
 static int py_float_check(PyObject *py)
 {
-	return PyFloat_Check(py) || (PyIndex_Check(py));
+	/* accept both floats and integers */
+	return PyFloat_Check(py) || PyLong_Check(py);
 }
 
 static int py_int_check(PyObject *py)
 {
-	return PyLong_Check(py) || (PyIndex_Check(py));
+	/* accept only integers */
+	return PyLong_Check(py);
 }
 
 static int py_bool_check(PyObject *py)
 {
-	return PyBool_Check(py) || (PyIndex_Check(py));
+	return PyBool_Check(py);
 }
 
-int pyrna_py_to_float_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
+static void float_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, void *value)
 {
-	return pyrna_py_to_array_generic(py, ptr, prop, param_data, error_str, error_str_size,
-									 py_float_check, "float", sizeof(float), pyrna_py_to_float, (RNA_SetArrayFunc)RNA_property_float_set_array);
+	RNA_property_float_set_index(ptr, prop, index, *(float*)value);
 }
 
-int pyrna_py_to_int_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
+static void int_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, void *value)
 {
-	return pyrna_py_to_array_generic(py, ptr, prop, param_data, error_str, error_str_size,
-									 py_int_check, "int", sizeof(int), pyrna_py_to_int, (RNA_SetArrayFunc)RNA_property_int_set_array);
+	RNA_property_int_set_index(ptr, prop, index, *(int*)value);
 }
 
-int pyrna_py_to_boolean_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size)
+static void bool_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, void *value)
 {
-	return pyrna_py_to_array_generic(py, ptr, prop, param_data, error_str, error_str_size,
-									 py_bool_check, "boolean", sizeof(int), pyrna_py_to_boolean, (RNA_SetArrayFunc)RNA_property_boolean_set_array);
+	RNA_property_boolean_set_index(ptr, prop, index, *(int*)value);
+}
+
+int pyrna_py_to_array(PointerRNA *ptr, PropertyRNA *prop, char *param_data, PyObject *py, const char *error_prefix)
+{
+	int ret;
+	switch (RNA_property_type(prop)) {
+	case PROP_FLOAT:
+		ret= py_to_array(py, ptr, prop, param_data, py_float_check, "float", sizeof(float), py_to_float, (RNA_SetArrayFunc)RNA_property_float_set_array, error_prefix);
+		break;
+	case PROP_INT:
+		ret= py_to_array(py, ptr, prop, param_data, py_int_check, "int", sizeof(int), py_to_int, (RNA_SetArrayFunc)RNA_property_int_set_array, error_prefix);
+		break;
+	case PROP_BOOLEAN:
+		ret= py_to_array(py, ptr, prop, param_data, py_bool_check, "boolean", sizeof(int), py_to_bool, (RNA_SetArrayFunc)RNA_property_boolean_set_array, error_prefix);
+		break;
+	default:
+		PyErr_SetString(PyExc_TypeError, "not an array type");
+		ret= 0;
+	}
+
+	return ret;
+}
+
+int pyrna_py_to_array_index(PointerRNA *ptr, PropertyRNA *prop, int arraydim, int arrayoffset, int index, PyObject *py, const char *error_prefix)
+{
+	int ret;
+	switch (RNA_property_type(prop)) {
+	case PROP_FLOAT:
+		ret= py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, py_float_check, "float", py_to_float, float_set_index, error_prefix);
+		break;
+	case PROP_INT:
+		ret= py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, py_int_check, "int", py_to_int, int_set_index, error_prefix);
+		break;
+	case PROP_BOOLEAN:
+		ret= py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, py_bool_check, "boolean", py_to_bool, bool_set_index, error_prefix);
+		break;
+	default:
+		PyErr_SetString(PyExc_TypeError, "not an array type");
+		ret= 0;
+	}
+
+	return ret;
+}
+
+static PyObject *pyrna_array_item(PointerRNA *ptr, PropertyRNA *prop, int index)
+{
+	PyObject *item;
+
+	switch (RNA_property_type(prop)) {
+	case PROP_FLOAT:
+		item= PyFloat_FromDouble(RNA_property_float_get_index(ptr, prop, index));
+		break;
+	case PROP_BOOLEAN:
+		item= PyBool_FromLong(RNA_property_boolean_get_index(ptr, prop, index));
+		break;
+	case PROP_INT:
+		item= PyLong_FromSsize_t(RNA_property_int_get_index(ptr, prop, index));
+		break;
+	default:
+		PyErr_SetString(PyExc_TypeError, "not an array type");
+		item= NULL;
+	}
+
+	return item;
+}
+
+#if 0
+/* XXX this is not used (and never will?) */
+/* Given an array property, creates an N-dimensional tuple of values. */
+static PyObject *pyrna_py_from_array_internal(PointerRNA *ptr, PropertyRNA *prop, int dim, int *index)
+{
+	PyObject *tuple;
+	int i, len;
+	int totdim= RNA_property_array_dimension(prop, NULL);
+
+	len= RNA_property_multidimensional_array_length(ptr, prop, dim);
+
+	tuple= PyTuple_New(len);
+
+	for (i= 0; i < len; i++) {
+		PyObject *item;
+
+		if (dim + 1 < totdim)
+			item= pyrna_py_from_array_internal(ptr, prop, dim + 1, index);
+		else {
+			item= pyrna_array_item(ptr, prop, *index);
+			*index= *index + 1;
+		}
+
+		if (!item) {
+			Py_DECREF(tuple);
+			return NULL;
+		}
+
+		PyTuple_SetItem(tuple, i, item);
+	}
+
+	return tuple;
+}
+#endif
+
+PyObject *pyrna_py_from_array_index(BPy_PropertyRNA *self, int index)
+{
+	int totdim, i, len;
+	unsigned short dimsize[MAX_ARRAY_DIMENSION];
+	BPy_PropertyRNA *ret= NULL;
+
+	/* just in case check */
+	len= RNA_property_multidimensional_array_length(&self->ptr, self->prop, self->arraydim);
+	if (index >= len || index < 0) {
+		/* this shouldn't happen because higher level funcs must check for invalid index */
+		if (G.f & G_DEBUG) printf("pyrna_py_from_array_index: invalid index %d for array with length=%d\n", index, len);
+
+		PyErr_SetString(PyExc_IndexError, "out of range");
+		return NULL;
+	}
+
+	totdim= RNA_property_array_dimension(self->prop, dimsize);
+
+	if (self->arraydim + 1 < totdim) {
+		ret= (BPy_PropertyRNA*)pyrna_prop_CreatePyObject(&self->ptr, self->prop);
+		ret->arraydim= self->arraydim + 1;
+
+		/* arr[3][4][5]
+
+		   x = arr[2]
+		   index = 0 + 2 * 4 * 5
+
+		   x = arr[2][3]
+		   index = offset + 3 * 5 */
+
+		for (i= self->arraydim + 1; i < totdim; i++)
+			index *= DIMSIZE(i);
+
+		ret->arrayoffset= self->arrayoffset + index;
+	}
+	else {
+		index = self->arrayoffset + index;
+		ret= (BPy_PropertyRNA*)pyrna_array_item(&self->ptr, self->prop, index);
+	}
+
+	return (PyObject*)ret;
+}
+
+PyObject *pyrna_py_from_array(PointerRNA *ptr, PropertyRNA *prop)
+{
+	PyObject *ret;
+
+	ret= pyrna_math_object_from_array(ptr, prop);
+
+	/* is this a maths object? */
+	if (ret) return ret;
+
+	return pyrna_prop_CreatePyObject(ptr, prop);
 }
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 8ba3b5f8732..f2ffd5e0358 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -130,6 +130,70 @@ Mathutils_Callback mathutils_rna_matrix_cb = {
 	(BaseMathSetIndexFunc)	NULL
 };
 
+PyObject *pyrna_math_object_from_array(PointerRNA *ptr, PropertyRNA *prop)
+{
+	PyObject *ret= NULL;
+
+#ifdef USE_MATHUTILS
+	int type, subtype, totdim;
+	int len;
+
+	len= RNA_property_array_length(ptr, prop);
+	type= RNA_property_type(prop);
+	subtype= RNA_property_subtype(prop);
+	totdim= RNA_property_array_dimension(prop, NULL);
+
+	if (type != PROP_FLOAT) return NULL;
+
+	if (totdim == 1 || (totdim == 2 && subtype == PROP_MATRIX)) {
+		ret = pyrna_prop_CreatePyObject(ptr, prop);
+
+		switch(RNA_property_subtype(prop)) {
+		case PROP_TRANSLATION:
+		case PROP_DIRECTION:
+		case PROP_VELOCITY:
+		case PROP_ACCELERATION:
+		case PROP_XYZ:
+			if(len>=2 && len <= 4) {
+				PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, FALSE);
+				Py_DECREF(ret); /* the vector owns now */
+				ret= vec_cb; /* return the vector instead */
+			}
+			break;
+		case PROP_MATRIX:
+			if(len==16) {
+				PyObject *mat_cb= newMatrixObject_cb(ret, 4,4, mathutils_rna_matrix_cb_index, FALSE);
+				Py_DECREF(ret); /* the matrix owns now */
+				ret= mat_cb; /* return the matrix instead */
+			}
+			else if (len==9) {
+				PyObject *mat_cb= newMatrixObject_cb(ret, 3,3, mathutils_rna_matrix_cb_index, FALSE);
+				Py_DECREF(ret); /* the matrix owns now */
+				ret= mat_cb; /* return the matrix instead */
+			}
+			break;
+		case PROP_EULER:
+		case PROP_QUATERNION:
+			if(len==3) { /* euler */
+				PyObject *eul_cb= newEulerObject_cb(ret, mathutils_rna_array_cb_index, FALSE);
+				Py_DECREF(ret); /* the matrix owns now */
+				ret= eul_cb; /* return the matrix instead */
+			}
+			else if (len==4) {
+				PyObject *quat_cb= newQuaternionObject_cb(ret, mathutils_rna_array_cb_index, FALSE);
+				Py_DECREF(ret); /* the matrix owns now */
+				ret= quat_cb; /* return the matrix instead */
+			}
+			break;
+		default:
+			break;
+		}
+	}
+#endif
+
+	return ret;
+}
+
 #endif
 
 static StructRNA *pyrna_struct_as_srna(PyObject *self);
@@ -288,58 +352,7 @@ PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
 	int len = RNA_property_array_length(ptr, prop);
 
 	if (len > 0) {
-		/* resolve the array from a new pytype */
-		PyObject *ret = pyrna_prop_CreatePyObject(ptr, prop);
-		
-#ifdef USE_MATHUTILS
-
-		/* return a mathutils vector where possible */
-		if(RNA_property_type(prop)==PROP_FLOAT) {
-			switch(RNA_property_subtype(prop)) {
-			case PROP_TRANSLATION:
-			case PROP_DIRECTION:
-			case PROP_VELOCITY:
-			case PROP_ACCELERATION:
-			case PROP_XYZ:
-				if(len>=2 && len <= 4) {
-					PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, FALSE);
-					Py_DECREF(ret); /* the vector owns now */
-					ret= vec_cb; /* return the vector instead */
-				}
-				break;
-			case PROP_MATRIX:
-				if(len==16) {
-					PyObject *mat_cb= newMatrixObject_cb(ret, 4,4, mathutils_rna_matrix_cb_index, FALSE);
-					Py_DECREF(ret); /* the matrix owns now */
-					ret= mat_cb; /* return the matrix instead */
-				}
-				else if (len==9) {
-					PyObject *mat_cb= newMatrixObject_cb(ret, 3,3, mathutils_rna_matrix_cb_index, FALSE);
-					Py_DECREF(ret); /* the matrix owns now */
-					ret= mat_cb; /* return the matrix instead */
-				}
-				break;
-			case PROP_EULER:
-			case PROP_QUATERNION:
-				if(len==3) { /* euler */
-					PyObject *eul_cb= newEulerObject_cb(ret, mathutils_rna_array_cb_index, FALSE);
-					Py_DECREF(ret); /* the matrix owns now */
-					ret= eul_cb; /* return the matrix instead */
-				}
-				else if (len==4) {
-					PyObject *quat_cb= newQuaternionObject_cb(ret, mathutils_rna_array_cb_index, FALSE);
-					Py_DECREF(ret); /* the matrix owns now */
-					ret= quat_cb; /* return the matrix instead */
-				}
-				break;
-			default:
-				break;
-			}
-		}
-
-#endif
-		
-		return ret;
+		return pyrna_py_from_array(ptr, prop);
 	}
 	
 	/* see if we can coorce into a python type - PropertyType */
@@ -511,7 +524,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
 	int len = RNA_property_array_length(ptr, prop);
 	
 	if (len > 0) {
-		char error_str[512];
+		/* char error_str[512]; */
 		int ok= 1;
 
 #ifdef USE_MATHUTILS
@@ -526,21 +539,10 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
 			return -1;
 		}
 		/* done getting the length */
-		
-		/* for arrays we have a limited number of types */
-		switch (type) {
-		case PROP_BOOLEAN:
-			ok= pyrna_py_to_boolean_array(value, ptr, prop, data, error_str, sizeof(error_str));
-			break;
-		case PROP_INT:
-			ok= pyrna_py_to_int_array(value, ptr, prop, data, error_str, sizeof(error_str));
-			break;
-		case PROP_FLOAT:
-			ok= pyrna_py_to_float_array(value, ptr, prop, data, error_str, sizeof(error_str));
-			break;
-		}
+		ok= pyrna_py_to_array(ptr, prop, data, value, error_prefix);
+
 		if (!ok) {
-			PyErr_Format(PyExc_AttributeError, "%.200s %s", error_prefix, error_str);
+			/* PyErr_Format(PyExc_AttributeError, "%.200s %s", error_prefix, error_str); */
 			return -1;
 		}
 	}
@@ -733,82 +735,84 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
 	return 0;
 }
 
-static PyObject * pyrna_prop_to_py_index(PointerRNA *ptr, PropertyRNA *prop, int index)
+static PyObject * pyrna_prop_to_py_index(BPy_PropertyRNA *self, int index)
 {
-	PyObject *ret;
-	int type = RNA_property_type(prop);
-	
-	/* see if we can coorce into a python type - PropertyType */
-	switch (type) {
-	case PROP_BOOLEAN:
-		ret = PyBool_FromLong( RNA_property_boolean_get_index(ptr, prop, index) );
-		break;
-	case PROP_INT:
-		ret = PyLong_FromSsize_t( (Py_ssize_t)RNA_property_int_get_index(ptr, prop, index) );
-		break;
-	case PROP_FLOAT:
-		ret = PyFloat_FromDouble( RNA_property_float_get_index(ptr, prop, index) );
-		break;
-	default:
-		PyErr_SetString(PyExc_AttributeError, "not an array type");
-		ret = NULL;
-		break;
-	}
-	
-	return ret;
+	return pyrna_py_from_array_index(self, index);
 }
 
-static int pyrna_py_to_prop_index(PointerRNA *ptr, PropertyRNA *prop, int index, PyObject *value)
+static int pyrna_py_to_prop_index(BPy_PropertyRNA *self, int index, PyObject *value)
 {
 	int ret = 0;
+	int totdim;
+	PointerRNA *ptr= &self->ptr;
+	PropertyRNA *prop= self->prop;
 	int type = RNA_property_type(prop);
-	
-	/* see if we can coorce into a python type - PropertyType */
-	switch (type) {
-	case PROP_BOOLEAN:
-	{
-		int param = PyObject_IsTrue( value );
+
+	totdim= RNA_property_array_dimension(prop, NULL);
+
+	if (totdim > 1) {
+		/* char error_str[512]; */
+		if (!pyrna_py_to_array_index(&self->ptr, self->prop, self->arraydim, self->arrayoffset, index, value, "")) {
+			/* PyErr_SetString(PyExc_AttributeError, error_str); */
+			ret= -1;
+		}
+	}
+	else {
+		/* see if we can coorce into a python type - PropertyType */
+		switch (type) {
+		case PROP_BOOLEAN:
+			{
+				int param = PyObject_IsTrue( value );
 		
-		if( param < 0 ) {
-			PyErr_SetString(PyExc_TypeError, "expected True/False or 0/1");
+				if( param < 0 ) {
+					PyErr_SetString(PyExc_TypeError, "expected True/False or 0/1");
+					ret = -1;
+				} else {
+					RNA_property_boolean_set_index(ptr, prop, index, param);
+				}
+				break;
+			}
+		case PROP_INT:
+			{
+				int param = PyLong_AsSsize_t(value);
+				if (PyErr_Occurred()) {
+					PyErr_SetString(PyExc_TypeError, "expected an int type");
+					ret = -1;
+				} else {
+					RNA_property_int_set_index(ptr, prop, index, param);
+				}
+				break;
+			}
+		case PROP_FLOAT:
+			{
+				float param = PyFloat_AsDouble(value);
+				if (PyErr_Occurred()) {
+					PyErr_SetString(PyExc_TypeError, "expected a float type");
+					ret = -1;
+				} else {
+					RNA_property_float_set_index(ptr, prop, index, param);
+				}
+				break;
+			}
+		default:
+			PyErr_SetString(PyExc_AttributeError, "not an array type");
 			ret = -1;
-		} else {
-			RNA_property_boolean_set_index(ptr, prop, index, param);
+			break;
 		}
-		break;
-	}
-	case PROP_INT:
-	{
-		int param = PyLong_AsSsize_t(value);
-		if (PyErr_Occurred()) {
-			PyErr_SetString(PyExc_TypeError, "expected an int type");
-			ret = -1;
-		} else {
-			RNA_property_int_set_index(ptr, prop, index, param);
-		}
-		break;
-	}
-	case PROP_FLOAT:
-	{
-		float param = PyFloat_AsDouble(value);
-		if (PyErr_Occurred()) {
-			PyErr_SetString(PyExc_TypeError, "expected a float type");
-			ret = -1;
-		} else {
-			RNA_property_float_set_index(ptr, prop, index, param);
-		}
-		break;
-	}
-	default:
-		PyErr_SetString(PyExc_AttributeError, "not an array type");
-		ret = -1;
-		break;
 	}
 	
 	return ret;
 }
 
 //---------------sequence-------------------------------------------
+static int pyrna_prop_array_length(BPy_PropertyRNA *self)
+{
+	if (RNA_property_array_dimension(self->prop, NULL) > 1)
+		return RNA_property_multidimensional_array_length(&self->ptr, self->prop, self->arraydim);
+	else
+		return RNA_property_array_length(&self->ptr, self->prop);
+}
+
 static Py_ssize_t pyrna_prop_len( BPy_PropertyRNA * self )
 {
 	Py_ssize_t len;
@@ -816,10 +820,10 @@ static Py_ssize_t pyrna_prop_len( BPy_PropertyRNA * self )
 	if (RNA_property_type(self->prop) == PROP_COLLECTION) {
 		len = RNA_property_collection_length(&self->ptr, self->prop);
 	} else {
-		len = RNA_property_array_length(&self->ptr, self->prop);
+		len = pyrna_prop_array_length(self);
 		
 		if (len==0) { /* not an array*/
-			PyErr_SetString(PyExc_AttributeError, "len() only available for collection RNA types");
+			PyErr_SetString(PyExc_AttributeError, "len() only available for collection and array RNA types");
 			return -1;
 		}
 	}
@@ -840,14 +844,15 @@ static PyObject *prop_subscript_collection_int(BPy_PropertyRNA * self, int keynu
 	PyErr_Format(PyExc_IndexError, "index %d out of range", keynum);
 	return NULL;
 }
+
 static PyObject *prop_subscript_array_int(BPy_PropertyRNA * self, int keynum)
 {
-	int len= RNA_property_array_length(&self->ptr, self->prop);
+	int len= pyrna_prop_array_length(self);
 
 	if(keynum < 0) keynum += len;
 
 	if(keynum >= 0 && keynum < len)
-		return pyrna_prop_to_py_index(&self->ptr, self->prop, keynum);
+		return pyrna_prop_to_py_index(self, keynum);
 
 	PyErr_Format(PyExc_IndexError, "index %d out of range", keynum);
 	return NULL;
@@ -894,7 +899,7 @@ static PyObject *prop_subscript_array_slice(BPy_PropertyRNA * self, int start, i
 	start = MIN2(start,stop); /* values are clamped from PySlice_GetIndicesEx */
 
 	for(count = start; count < stop; count++)
-		PyList_SetItem(list, count - start, pyrna_prop_to_py_index(&self->ptr, self->prop, count));
+		PyList_SetItem(list, count - start, pyrna_prop_to_py_index(self, count));
 
 	return list;
 }
@@ -947,8 +952,8 @@ static PyObject *prop_subscript_array(BPy_PropertyRNA * self, PyObject *key)
 		return prop_subscript_array_int(self, PyLong_AsSsize_t(key));
 	}
 	else if (PySlice_Check(key)) {
-		int len= RNA_property_array_length(&self->ptr, self->prop);
 		Py_ssize_t start, stop, step, slicelength;
+		int len = pyrna_prop_array_length(self);
 
 		if (PySlice_GetIndicesEx((PySliceObject*)key, len, &start, &stop, &step, &slicelength) < 0)
 			return NULL;
@@ -974,13 +979,12 @@ static PyObject *pyrna_prop_subscript( BPy_PropertyRNA * self, PyObject *key )
 {
 	if (RNA_property_type(self->prop) == PROP_COLLECTION) {
 		return prop_subscript_collection(self, key);
-	} else if (RNA_property_array_length(&self->ptr, self->prop)) { /* arrays are currently fixed length, zero length means its not an array */
+	} else if (RNA_property_array_length(&self->ptr, self->prop)) { /* zero length means its not an array */
 		return prop_subscript_array(self, key);
-	} else {
-		PyErr_SetString(PyExc_TypeError, "rna type is not an array or a collection");
-		return NULL;
-	}
+	} 
 
+	PyErr_SetString(PyExc_TypeError, "rna type is not an array or a collection");
+	return NULL;
 }
 
 static int prop_subscript_ass_array_slice(BPy_PropertyRNA * self, int begin, int end, PyObject *value)
@@ -991,7 +995,7 @@ static int prop_subscript_ass_array_slice(BPy_PropertyRNA * self, int begin, int
 	begin = MIN2(begin,end);
 
 	for(count = begin; count < end; count++) {
-		if(pyrna_py_to_prop_index(&self->ptr, self->prop, count - begin, value) == -1) {
+		if(pyrna_py_to_prop_index(self, count - begin, value) == -1) {
 			/* TODO - this is wrong since some values have been assigned... will need to fix that */
 			return -1; /* pyrna_struct_CreatePyObject should set the error */
 		}
@@ -1002,13 +1006,12 @@ static int prop_subscript_ass_array_slice(BPy_PropertyRNA * self, int begin, int
 
 static int prop_subscript_ass_array_int(BPy_PropertyRNA * self, int keynum, PyObject *value)
 {
-
-	int len= RNA_property_array_length(&self->ptr, self->prop);
+	int len= pyrna_prop_array_length(self);
 
 	if(keynum < 0) keynum += len;
 
 	if(keynum >= 0 && keynum < len)
-		return pyrna_py_to_prop_index(&self->ptr, self->prop, keynum, value);
+		return pyrna_py_to_prop_index(self, keynum, value);
 
 	PyErr_SetString(PyExc_IndexError, "out of range");
 	return -1;
@@ -1682,7 +1685,7 @@ PyObject *pyrna_prop_iter(BPy_PropertyRNA *self)
 	
 	if (ret==NULL) {
 		/* collection did not work, try array */
-		int len = RNA_property_array_length(&self->ptr, self->prop);
+		int len = pyrna_prop_array_length(self);
 		
 		if (len) {
 			int i;
@@ -1690,7 +1693,7 @@ PyObject *pyrna_prop_iter(BPy_PropertyRNA *self)
 			ret = PyList_New(len);
 			
 			for (i=0; i < len; i++) {
-				PyList_SET_ITEM(ret, i, pyrna_prop_to_py_index(&self->ptr, self->prop, i));
+				PyList_SET_ITEM(ret, i, pyrna_prop_to_py_index(self, i));
 			}
 		}
 	}
@@ -1781,6 +1784,8 @@ PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *data)
 		/* resolve the array from a new pytype */
 		ret = PyTuple_New(len);
 
+		/* kazanbas: TODO make multidim sequences here */
+
 		switch (type) {
 		case PROP_BOOLEAN:
 			for(a=0; a<len; a++)
@@ -2445,6 +2450,9 @@ PyObject *pyrna_prop_CreatePyObject( PointerRNA *ptr, PropertyRNA *prop )
 	
 	pyrna->ptr = *ptr;
 	pyrna->prop = prop;
+
+	pyrna->arraydim= 0;
+	pyrna->arrayoffset= 0;
 		
 	return ( PyObject * ) pyrna;
 }
diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h
index d65849ad8a4..d006b168f45 100644
--- a/source/blender/python/intern/bpy_rna.h
+++ b/source/blender/python/intern/bpy_rna.h
@@ -55,6 +55,10 @@ typedef struct {
 	PyObject_HEAD /* required python macro   */
 	PointerRNA ptr;
 	PropertyRNA *prop;
+
+	/* Arystan: this is a hack to allow sub-item r/w access like: face.uv[n][m] */
+	int arraydim; /* array dimension, e.g: 0 for face.uv, 2 for face.uv[n][m], etc. */
+	int arrayoffset; /* array first item offset, e.g. if face.uv is [4][2], arrayoffset for face.uv[n] is 2n */
 } BPy_PropertyRNA;
 
 /* cheap trick */
@@ -92,8 +96,11 @@ void pyrna_alloc_types(void);
 void pyrna_free_types(void);
 
 /* primitive type conversion */
-int pyrna_py_to_boolean_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size);
-int pyrna_py_to_int_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size);
-int pyrna_py_to_float_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, char *error_str, int error_str_size);
+int pyrna_py_to_array(PointerRNA *ptr, PropertyRNA *prop, char *param_data, PyObject *py, const char *error_prefix);
+int pyrna_py_to_array_index(PointerRNA *ptr, PropertyRNA *prop, int arraydim, int arrayoffset, int index, PyObject *py, const char *error_prefix);
+
+PyObject *pyrna_py_from_array(PointerRNA *ptr, PropertyRNA *prop);
+PyObject *pyrna_py_from_array_index(BPy_PropertyRNA *self, int index);
+PyObject *pyrna_math_object_from_array(PointerRNA *ptr, PropertyRNA *prop);
 
 #endif
diff --git a/tools/btools.py b/tools/btools.py
index 580a457e3a0..7cadab992b8 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -91,7 +91,7 @@ def validate_arguments(args, bc):
 			'BF_BSC', 'BF_CONFIG',
 			'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
 			'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG',
-			'BF_DOCDIR']
+			'BF_DOCDIR', 'BF_UNIT_TEST']
 
 	okdict = {}
 
@@ -386,7 +386,9 @@ def read_opts(cfg, args):
 		
 		('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),
 		('BF_NUMJOBS', 'Number of build processes to spawn', '1'),
-		('BF_MSVS', 'Generate MSVS project files and solution', False)
+		('BF_MSVS', 'Generate MSVS project files and solution', False),
+
+		(BoolVariable('BF_UNIT_TEST', 'Build with unit test support.', False))
 
 	) # end of opts.AddOptions()
 

From 952fa6d1c182fafa1f2a9133809a2b58ad7a91c2 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Sun, 6 Sep 2009 16:58:14 +0000
Subject: [PATCH 458/577] 2.5/Paint:

* Fixed some bad UI pointed out by letterrip. People had made some quite bad changes (duplicating buttons, adding UI for non-existent features, even deleting UI for existing features!)
---
 release/ui/space_view3d_toolbar.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 0b7ccb15d6c..8a42d9683f8 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -342,9 +342,6 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			
 				col = layout.column()
 
-				if brush.sculpt_tool != 'LAYER':
-					col.itemR(brush, "anchored")
-
 				if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
 					col.itemR(brush, "flip_direction")
 
@@ -352,8 +349,6 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 					col.itemR(brush, "persistent")
 					col.itemO("sculpt.set_persistent_base")
 
-				col.itemR(brush, "rake")
-
 			col.itemR(brush, "sculpt_tool")
 				
 		# Texture Paint Mode #
@@ -426,24 +421,29 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 		brush = settings.brush
 		texture_paint = context.texture_paint_object
 
+		if context.sculpt_object:
+			if brush.sculpt_tool != 'LAYER':
+				layout.itemR(brush, "anchored")
+			layout.itemR(brush, "rake")
+
+		layout.itemR(brush, "airbrush")
+		col = layout.column()
+		col.active = brush.airbrush
+		col.itemR(brush, "rate", slider=True)
+
 		if not texture_paint:
 			layout.itemR(brush, "smooth_stroke")
 			col = layout.column()
-			col.itemR(brush, "airbrush")
-			col.itemR(brush, "anchored")
-			col.itemR(brush, "rake")
+			col.active = brush.smooth_stroke
+			col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
+			col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
 
 		layout.itemR(brush, "space")
 		row = layout.row(align=True)
 		row.active = brush.space
 		row.itemR(brush, "spacing", text="Distance", slider=True)
 		if texture_paint:
-			row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
-
-		layout.itemR(brush, "airbrush")
-		col = layout.column()
-		col.active = brush.airbrush
-		col.itemR(brush, "rate", slider=True)
+			row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")	
 
 class VIEW3D_PT_tools_brush_curve(PaintPanel):
 	__label__ = "Curve"

From 6a301de3eb0e4021d892708ead17c55900682e47 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 6 Sep 2009 19:18:12 +0000
Subject: [PATCH 459/577] users on blenderartist reported uncompressed TGA
 loading worked for them where compressed didnt.

---
 release/io/engine_render_pov.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index c3165d22540..02b8aab4c42 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -616,7 +616,7 @@ def write_pov_ini(filename_ini, filename_pov, filename_image):
 	
 	file.write('Display=0\n')
 	file.write('Pause_When_Done=0\n')
-	file.write('Output_File_Type=C\n') # TGA, best progressive loading
+	file.write('Output_File_Type=T\n') # TGA, best progressive loading
 	file.write('Output_Alpha=1\n')
 	
 	if render.antialiasing: 

From 7064f6c5d88e17406df1c7c8d1fec20364571084 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Sun, 6 Sep 2009 19:51:57 +0000
Subject: [PATCH 460/577] Mathutils fix: Vector.reflect * correct function for
 reflection and moving it to arithb.c * note: 2.5 has an already more elegant
 solution for it (still wrong, but the code is cleaner). Therefore the merge
 may need to be manual in that case.

Specifically in 2.5 we are doing:
if(!BaseMath_ReadCallback(self) || !BaseMath_ReadCallback(value)) return NULL;
And there we don't need to create a VectorObject *mirrvec; only to get the values.

Code used to test it:
http://www.pasteall.org/7654/python

* YoFrankie script probably needs to be fixed too.
---
 source/blender/blenlib/BLI_arithb.h    |  1 +
 source/blender/blenlib/intern/arithb.c | 23 +++++++++++++++++++
 source/blender/python/api2_2x/vector.c | 31 +++++---------------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 86b626dabdf..0c3ec40f16d 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -270,6 +270,7 @@ void AxisAngleToQuat(float *q, float *axis, float angle);
 void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3]);
 void vectoquat(float *vec, short axis, short upflag, float *q);
 
+void VecReflect(float *out, float *v1, float *v2);
 void VecBisect3(float *v, float *v1, float *v2, float *v3);
 float VecAngle2(float *v1, float *v2);
 float VecAngle3(float *v1, float *v2, float *v3);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index c20794953b9..e7a31e37581 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2981,6 +2981,29 @@ void VecBisect3(float *out, float *v1, float *v2, float *v3)
 	Normalize(out);
 }
 
+/* Returns a reflection vector from a vector and a normal vector
+reflect = vec - ((2 * DotVecs(vec, mirror)) * mirror)
+*/
+void VecReflect(float *out, float *v1, float *v2)
+{
+	float vec[3], normal[3];
+	float reflect[3] = {0.0f, 0.0f, 0.0f};
+	float dot2;
+
+	VecCopyf(vec, v1);
+	VecCopyf(normal, v2);
+
+	Normalize(normal);
+
+	dot2 = 2 * Inpf(vec, normal);
+
+	reflect[0] = vec[0] - (dot2 * normal[0]);
+	reflect[1] = vec[1] - (dot2 * normal[1]);
+	reflect[2] = vec[2] - (dot2 * normal[2]);
+
+	VecCopyf(out, reflect);
+}
+
 /* Return the angle in degrees between vecs 1-2 and 2-3 in degrees
    If v1 is a shoulder, v2 is the elbow and v3 is the hand,
    this would return the angle at the elbow */
diff --git a/source/blender/python/api2_2x/vector.c b/source/blender/python/api2_2x/vector.c
index a7e00e2878a..6a0107142c1 100644
--- a/source/blender/python/api2_2x/vector.c
+++ b/source/blender/python/api2_2x/vector.c
@@ -277,19 +277,14 @@ PyObject *Vector_ToTrackQuat( VectorObject * self, PyObject * args )
 
 /*----------------------------Vector.reflect(mirror) ----------------------
   return a reflected vector on the mirror normal
-  ((2 * DotVecs(vec, mirror)) * mirror) - vec
-  using arithb.c would be nice here */
+   vec - ((2 * DotVecs(vec, mirror)) * mirror)
+*/
 PyObject *Vector_Reflect( VectorObject * self, PyObject * value )
 {
 	VectorObject *mirrvec;
 	float mirror[3];
 	float vec[3];
-	float reflect[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-	float dot2;
-	
-	/* for normalizing */
-	int i;
-	float norm = 0.0f;
+	float reflect[3] = {0.0f, 0.0f, 0.0f};
 	
 	if (!VectorObject_Check(value)) {
 		PyErr_SetString( PyExc_TypeError, "vec.reflect(value): expected a vector argument" );
@@ -302,27 +297,13 @@ PyObject *Vector_Reflect( VectorObject * self, PyObject * value )
 	if (mirrvec->size > 2)	mirror[2] = mirrvec->vec[2];
 	else					mirror[2] = 0.0;
 	
-	/* normalize, whos idea was it not to use arithb.c? :-/ */
-	for(i = 0; i < 3; i++) {
-		norm += mirror[i] * mirror[i];
-	}
-	norm = (float) sqrt(norm);
-	for(i = 0; i < 3; i++) {
-		mirror[i] /= norm;
-	}
-	/* done */
-	
 	vec[0] = self->vec[0];
 	vec[1] = self->vec[1];
 	if (self->size > 2)		vec[2] = self->vec[2];
 	else					vec[2] = 0.0;
-	
-	dot2 = 2 * vec[0]*mirror[0]+vec[1]*mirror[1]+vec[2]*mirror[2];
-	
-	reflect[0] = (dot2 * mirror[0]) - vec[0];
-	reflect[1] = (dot2 * mirror[1]) - vec[1];
-	reflect[2] = (dot2 * mirror[2]) - vec[2];
-	
+
+	VecReflect(reflect, vec, mirror);
+
 	return newVectorObject(reflect, self->size, Py_NEW);
 }
 

From a6466883250037a502ef2415dcb8e2acc3e9766f Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Sun, 6 Sep 2009 20:59:06 +0000
Subject: [PATCH 461/577] SVN maintenance.

---
 source/blender/makesrna/intern/rna_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/makesrna/intern/rna_test.c b/source/blender/makesrna/intern/rna_test.c
index bfaf318018a..988c8f8a539 100644
--- a/source/blender/makesrna/intern/rna_test.c
+++ b/source/blender/makesrna/intern/rna_test.c
@@ -1,5 +1,5 @@
 /**
- * $Id: rna_test.c  $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *

From 84448173c39317a71a3f9456b5885c3eb653d675 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 6 Sep 2009 23:15:43 +0000
Subject: [PATCH 462/577] 2.5 - Rotation Order Tweaks

* Copy Rotation constraint should now work ok with this new code again. Previously, it was the only thing that really went beserk when the typos were still uncaught.

* Fixed one other case of a potential case where typos would cause problems.

* Made changing the rotation order setting perform conversions of the current rotation to an equivalent representation in the other orders/forms. This is done at RNA level, so maybe not that great for switching representations while animating?
---
 source/blender/blenkernel/intern/constraint.c |  3 +-
 source/blender/blenlib/intern/arithb.c        |  4 +-
 source/blender/makesrna/intern/rna_pose.c     | 62 +++++++++++++++++++
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index e6e65ebd614..0f7767a1808 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1558,8 +1558,7 @@ static void rotlike_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 		VECCOPY(loc, cob->matrix[3]);
 		Mat4ToSize(cob->matrix, size);
 		
-		//Mat4ToEulO(ct->matrix, eul, ct->rotOrder);
-		Mat4ToEul(ct->matrix, eul); // the version we should be using causes errors...
+		Mat4ToEulO(ct->matrix, eul, ct->rotOrder);
 		Mat4ToEulO(cob->matrix, obeul, cob->rotOrder);
 		
 		if ((data->flag & ROTLIKE_X)==0)
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 7a4aaa1a858..2e60fbba4c9 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2835,10 +2835,10 @@ void EulOToQuat(float e[3], short order, float q[4])
 	double ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
 	double a[3];
 	
-	if (R->parity) e[1] = -e[1]; // xxx watch it!
-	
 	ti = e[i]/2; tj = e[j]/2; th = e[k]/2;
 	
+	if (R->parity) e[j] = -e[j];
+	
 	ci = cos(ti);  cj = cos(tj);  ch = cos(th);
 	si = sin(ti);  sj = sin(tj);  sh = sin(th);
 	
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 6c951b5a1b7..c5297f7b7fa 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -130,6 +130,67 @@ static void rna_PoseChannel_euler_rotation_set(PointerRNA *ptr, const float *val
 		VECCOPY(pchan->eul, value);
 }
 
+static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
+{
+	bPoseChannel *pchan= ptr->data;
+	
+	/* check if any change - if so, need to convert data */
+	// TODO: this needs to be generalised at some point to work for objects too...
+	if (value > 0) { /* to euler */
+		if (pchan->rotmode < 0) { // FIXME: need a define for this
+			/* axis-angle to euler */
+			float m[3][3];
+			
+			/* convert to 3x3 matrix, then to euler 
+			 *	- axis angle is stored in quats
+			 */
+			VecRotToMat3(&pchan->quat[1], pchan->quat[0], m);
+			Mat3ToEulO(m, pchan->eul, value);
+		}
+		else if (pchan->rotmode == PCHAN_ROT_QUAT) {
+			/* quat to euler */
+			QuatToEulO(pchan->quat, pchan->eul, value);
+		}
+		/* else { no conversion needed } */
+	}
+	else if (value == PCHAN_ROT_QUAT) { /* to quat */
+		if (pchan->rotmode < 0) { // FIXME: need a define for this
+			/* axis angle to quat */
+			float q[4];
+			
+			/* copy to temp var first, since quats and axis-angle are stored in same place */
+			QuatCopy(q, pchan->quat);
+			AxisAngleToQuat(q, &pchan->quat[1], pchan->quat[0]);
+		}
+		else if (pchan->rotmode > 0) {
+			/* euler to quat */
+			EulOToQuat(pchan->eul, pchan->rotmode, pchan->quat);
+		}
+		/* else { no conversion needed } */
+	}
+	else { /* to axis-angle */
+		if (pchan->rotmode > 0) { // FIXME: need a define for this
+			/* euler to axis angle */
+			float q[4];
+			
+			/* convert to temp quat, then to axis angle (since stored in same var) */
+			EulOToQuat(pchan->eul, pchan->rotmode, q);
+			QuatToAxisAngle(q, &pchan->quat[1], pchan->quat[0]);
+		}
+		else if (pchan->rotmode == PCHAN_ROT_QUAT) {
+			/* quat to axis angle */
+			float q[4];
+			
+			/* copy to temp var first, since quats and axis-angle are stored in same place */
+			QuatCopy(q, pchan->quat);
+			QuatToAxisAngle(q, &pchan->quat[1], pchan->quat[0]);
+		}
+	}
+	
+	/* finally, set the new rotation type */
+	pchan->rotmode= value;
+}
+
 static void rna_PoseChannel_name_set(PointerRNA *ptr, const char *value)
 {
 	Object *ob= (Object*)ptr->id.data;
@@ -439,6 +500,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "rotation_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "rotmode");
 	RNA_def_property_enum_items(prop, prop_rotmode_items);
+	RNA_def_property_enum_funcs(prop, NULL, "rna_PoseChannel_rotation_mode_set", NULL);
 	RNA_def_property_ui_text(prop, "Rotation Mode", "");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
 

From f5e80e7a80feb4b516792b961c2310210536aef8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 7 Sep 2009 04:52:42 +0000
Subject: [PATCH 463/577] Operator docstring patch from Ron Walker, added
 console operator docs too.

---
 release/ui/space_console.py                          |  4 ++--
 source/blender/editors/interface/view2d_ops.c        | 11 +++++++++++
 source/blender/editors/space_view3d/view3d_buttons.c |  1 +
 source/blender/editors/space_view3d/view3d_edit.c    |  2 +-
 source/blender/editors/space_view3d/view3d_header.c  |  1 +
 source/blender/editors/space_view3d/view3d_select.c  |  4 ++++
 source/blender/editors/space_view3d/view3d_snap.c    |  7 +++++++
 source/blender/editors/space_view3d/view3d_toolbar.c |  1 +
 source/blender/editors/space_view3d/view3d_view.c    |  3 +++
 9 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/release/ui/space_console.py b/release/ui/space_console.py
index dbf202f924c..136082a285a 100644
--- a/release/ui/space_console.py
+++ b/release/ui/space_console.py
@@ -108,7 +108,7 @@ def get_console(console_id):
 
 class CONSOLE_OT_exec(bpy.types.Operator):
 	'''
-	Operator documentatuon text, will be used for the operator tooltip and python docs.
+	Execute the current console line as a python expression.
 	'''
 	__idname__ = "console.execute"
 	__label__ = "Console Execute"
@@ -385,7 +385,7 @@ def autocomp(bcon):
 
 class CONSOLE_OT_autocomplete(bpy.types.Operator):
 	'''
-	Operator documentatuon text, will be used for the operator tooltip and python docs.
+	Evaluate the namespace up until the cursor and give a list of options or complete the name if there is only one.
 	'''
 	__idname__ = "console.autocomplete"
 	__label__ = "Console Autocomplete"
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index f3610769d17..3e009884dee 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -257,6 +257,7 @@ void VIEW2D_OT_pan(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Pan View";
+	ot->description= "Pan the view.";
 	ot->idname= "VIEW2D_OT_pan";
 	
 	/* api callbacks */
@@ -305,6 +306,7 @@ void VIEW2D_OT_scroll_right(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroll Right";
+	ot->description= "Scroll the view right.";
 	ot->idname= "VIEW2D_OT_scroll_right";
 	
 	/* api callbacks */
@@ -351,6 +353,7 @@ void VIEW2D_OT_scroll_left(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroll Left";
+	ot->description= "Scroll the view left.";
 	ot->idname= "VIEW2D_OT_scroll_left";
 	
 	/* api callbacks */
@@ -396,6 +399,7 @@ void VIEW2D_OT_scroll_down(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroll Down";
+	ot->description= "Scroll the view down.";
 	ot->idname= "VIEW2D_OT_scroll_down";
 	
 	/* api callbacks */
@@ -442,6 +446,7 @@ void VIEW2D_OT_scroll_up(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroll Up";
+	ot->description= "Scroll the view up.";
 	ot->idname= "VIEW2D_OT_scroll_up";
 	
 	/* api callbacks */
@@ -575,6 +580,7 @@ void VIEW2D_OT_zoom_in(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Zoom In";
+	ot->description= "Zoom in the view.";
 	ot->idname= "VIEW2D_OT_zoom_in";
 	
 	/* api callbacks */
@@ -611,6 +617,7 @@ void VIEW2D_OT_zoom_out(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Zoom Out";
+	ot->description= "Zoom out the view.";
 	ot->idname= "VIEW2D_OT_zoom_out";
 	
 	/* api callbacks */
@@ -857,6 +864,7 @@ void VIEW2D_OT_zoom(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Zoom View";
+	ot->description= "Zoom in/out the view.";
 	ot->idname= "VIEW2D_OT_zoom";
 	
 	/* api callbacks */
@@ -958,6 +966,7 @@ void VIEW2D_OT_zoom_border(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Zoom to Border";
+	ot->description= "Zoom in the view to the nearest item contained in the border.";
 	ot->idname= "VIEW2D_OT_zoom_border";
 	
 	/* api callbacks */
@@ -1297,6 +1306,7 @@ void VIEW2D_OT_scroller_activate(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroller Activate";
+	ot->description= "Scroll view by mouse click and drag.";
 	ot->idname= "VIEW2D_OT_scroller_activate";
 
 	/* flags */
@@ -1363,6 +1373,7 @@ void VIEW2D_OT_reset(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Reset View";
+	ot->description= "Reset the view.";
 	ot->idname= "VIEW2D_OT_reset";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index c854de8e54d..39e90a37b3f 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -1451,6 +1451,7 @@ static int view3d_properties(bContext *C, wmOperator *op)
 void VIEW3D_OT_properties(wmOperatorType *ot)
 {
 	ot->name= "Properties";
+	ot->description= "Display the properties panel.";
 	ot->idname= "VIEW3D_OT_properties";
 	
 	ot->exec= view3d_properties;
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index a7ea19e49f9..bbcee0415f8 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1895,7 +1895,7 @@ void VIEW3D_OT_manipulator(wmOperatorType *ot)
 
 	/* identifiers */
 	ot->name= "3D Manipulator";
-	ot->description = "";
+	ot->description = "Manipulate selected item by axis.";
 	ot->idname= "VIEW3D_OT_manipulator";
 
 	/* api callbacks */
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index b6159cf4314..45b0ea41215 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -252,6 +252,7 @@ void VIEW3D_OT_layers(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Layers";
+	ot->description= "Toggle layer(s) visibility.";
 	ot->idname= "VIEW3D_OT_layers";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 5c6a22f5157..42954e09060 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -756,6 +756,7 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_select_lasso(wmOperatorType *ot)
 {
 	ot->name= "Lasso Select";
+	ot->description= "Select items using lasso selection.";
 	ot->idname= "VIEW3D_OT_select_lasso";
 	
 	ot->invoke= WM_gesture_lasso_invoke;
@@ -1534,6 +1535,7 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Border Select";
+	ot->description= "Select items using border selection.";
 	ot->idname= "VIEW3D_OT_select_border";
 	
 	/* api callbacks */
@@ -1593,6 +1595,7 @@ void VIEW3D_OT_select(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Activate/Select";
+	ot->description= "Activate/select item(s).";
 	ot->idname= "VIEW3D_OT_select";
 	
 	/* api callbacks */
@@ -1831,6 +1834,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_select_circle(wmOperatorType *ot)
 {
 	ot->name= "Circle Select";
+	ot->description= "Select items using circle selection.";
 	ot->idname= "VIEW3D_OT_select_circle";
 	
 	ot->invoke= WM_gesture_circle_invoke;
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 2e5696170e2..73b70ccb532 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -555,6 +555,7 @@ void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Snap Selection to Grid";
+	ot->description= "Snap selected item(s) to nearest grid node.";
 	ot->idname= "VIEW3D_OT_snap_selected_to_grid";
 	
 	/* api callbacks */
@@ -680,6 +681,7 @@ void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Snap Selection to Cursor";
+	ot->description= "Snap selected item(s) to cursor.";
 	ot->idname= "VIEW3D_OT_snap_selected_to_cursor";
 	
 	/* api callbacks */
@@ -715,6 +717,7 @@ void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Snap Cursor to Grid";
+	ot->description= "Snap cursor to nearest grid node.";
 	ot->idname= "VIEW3D_OT_snap_cursor_to_grid";
 	
 	/* api callbacks */
@@ -821,6 +824,7 @@ void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Snap Cursor to Selected";
+	ot->description= "Snap cursor to center of selected item(s)."; 
 	ot->idname= "VIEW3D_OT_snap_cursor_to_selected";
 	
 	/* api callbacks */
@@ -870,6 +874,7 @@ void VIEW3D_OT_snap_cursor_to_active(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Snap Cursor to Active";
+	ot->description= "Snap cursor to active item.";
 	ot->idname= "VIEW3D_OT_snap_cursor_to_active";
 	
 	/* api callbacks */
@@ -1069,6 +1074,7 @@ void VIEW3D_OT_snap_selected_to_center(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Snap Selection to Center";
+	ot->description= "Snap selected items to selections geometric center.";
 	ot->idname= "VIEW3D_OT_snap_selected_to_center";
 	
 	/* api callbacks */
@@ -1135,6 +1141,7 @@ void VIEW3D_OT_snap_menu(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Snap Menu";
+	ot->description= "Display snap menu.";
 	ot->idname= "VIEW3D_OT_snap_menu";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c
index c87dd0b7948..58248f675da 100644
--- a/source/blender/editors/space_view3d/view3d_toolbar.c
+++ b/source/blender/editors/space_view3d/view3d_toolbar.c
@@ -322,6 +322,7 @@ static int view3d_toolbar(bContext *C, wmOperator *op)
 void VIEW3D_OT_toolbar(wmOperatorType *ot)
 {
 	ot->name= "Toolbar";
+	ot->description= "Toggles toolbar display.";
 	ot->idname= "VIEW3D_OT_toolbar";
 	
 	ot->exec= view3d_toolbar;
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index de8166b372b..808d1635b37 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -415,6 +415,7 @@ void VIEW3D_OT_setcameratoview(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Align Camera To View";
+	ot->description= "Set camera view to active view.";
 	ot->idname= "VIEW3D_OT_camera_to_view";
 	
 	/* api callbacks */
@@ -1395,6 +1396,7 @@ void VIEW3D_OT_localview(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Local View";
+	ot->description= "Toggle display of selected object(s) seperately and centered in view.";
 	ot->idname= "VIEW3D_OT_localview";
 	
 	/* api callbacks */
@@ -1562,6 +1564,7 @@ void VIEW3D_OT_game_start(wmOperatorType *ot)
 	
 	/* identifiers */
 	ot->name= "Start Game Engine";
+	ot->description= "Start game engine.";
 	ot->idname= "VIEW3D_OT_game_start";
 	
 	/* api callbacks */

From 183c8e0a0a82f260c4db250f4b04bb3f650618c3 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 7 Sep 2009 07:42:12 +0000
Subject: [PATCH 464/577] no functional changes, use hole rather then  dutch
 'gat' for bevel lists and made some comments English.

---
 source/blender/blenkernel/intern/curve.c  | 10 +++++-----
 source/blender/imbuf/intern/anim5.c       | 10 +++++-----
 source/blender/include/BIF_oops.h         |  2 +-
 source/blender/makesdna/DNA_curve_types.h |  2 +-
 source/blender/src/editlattice.c          |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 25af0cb5ce3..a1ad5347f7e 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1783,14 +1783,14 @@ void makeBevelList(Object *ob)
 		bl= blnext;
 	}
 
-	/* STEP 3: COUNT POLYS TELLEN AND AUTOHOLE */
+	/* STEP 3: POLYS COUNT AND AUTOHOLE */
 	bl= cu->bev.first;
 	poly= 0;
 	while(bl) {
 		if(bl->nr && bl->poly>=0) {
 			poly++;
 			bl->poly= poly;
-			bl->gat= 0;	/* 'gat' is dutch for hole */
+			bl->hole= 0;
 		}
 		bl= bl->next;
 	}
@@ -1842,7 +1842,7 @@ void makeBevelList(Object *ob)
 			sd1= sortdata+ (a-1);
 			for(b=a-1; b>=0; b--, sd1--) {	/* all polys to the left */
 				if(bevelinside(sd1->bl, bl)) {
-					bl->gat= 1- sd1->bl->gat;
+					bl->hole= 1- sd1->bl->hole;
 					break;
 				}
 			}
@@ -1852,7 +1852,7 @@ void makeBevelList(Object *ob)
 		if((cu->flag & CU_3D)==0) {
 			sd= sortdata;
 			for(a=0; a<poly; a++, sd++) {
-				if(sd->bl->gat==sd->dir) {
+				if(sd->bl->hole==sd->dir) {
 					bl= sd->bl;
 					bevp1= (BevPoint *)(bl+1);
 					bevp2= bevp1+ (bl->nr-1);
@@ -2033,7 +2033,7 @@ void makeBevelList(Object *ob)
 					}
 					QUATCOPY(quat_prev, quat); /* quat_prev can't have the tilt applied */
 					VECCOPY(vec_prev, vec);
-
+					
 					AxisAngleToQuat(q, vec, bevp1->alfa);
 					QuatMul(quat, q, quat);
 					QuatToMat3(quat, bevp1->mat);
diff --git a/source/blender/imbuf/intern/anim5.c b/source/blender/imbuf/intern/anim5.c
index b6f29b6a145..2437d0d9568 100644
--- a/source/blender/imbuf/intern/anim5.c
+++ b/source/blender/imbuf/intern/anim5.c
@@ -204,12 +204,12 @@ static void anim5decode(struct ImBuf * ibuf, uchar * dlta) {
 	int *ofspoint;
 	uchar **planes;
 
-	/*	samenstelling delta:
-		lijst met ofsets voor delta's per bitplane (ofspoint)
-		per kolom in delta (point)
-			aantal handelingen (noops)
+	/*	composition delta:
+		list with ofsets for delta' s by bitplane (ofspoint)
+		by column in delta (point)
+			number of operations (noops)
 				code
-					bijbehorende data
+					associated data
 				...
 			...
 	*/
diff --git a/source/blender/include/BIF_oops.h b/source/blender/include/BIF_oops.h
index 2375a918d0e..c35acf584f1 100644
--- a/source/blender/include/BIF_oops.h
+++ b/source/blender/include/BIF_oops.h
@@ -61,7 +61,7 @@ struct Oops *add_test_oops(void *id);	/* incl links */
 void add_texture_oops(struct Material *ma);
 void build_oops(void);
 struct Oops *find_oops(ID *id);
-void free_oops(struct Oops *oops);	/* ook oops zelf */
+void free_oops(struct Oops *oops);	/* also oops themselves */
 void free_oopspace(struct SpaceOops *so);
 void new_oops_location(struct Oops *);
 int oops_test_overlap(struct Oops *test);
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 88c03a41160..60dba9ce018 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -61,7 +61,7 @@ typedef struct Path {
 typedef struct BevList {
 	struct BevList *next, *prev;
 	int nr, flag;
-	short poly, gat;
+	short poly, hole;
 } BevList;
 
 /* These two Lines with # tell makesdna this struct can be excluded. */
diff --git a/source/blender/src/editlattice.c b/source/blender/src/editlattice.c
index 06b092a30ac..a65c51c76f6 100644
--- a/source/blender/src/editlattice.c
+++ b/source/blender/src/editlattice.c
@@ -25,7 +25,7 @@
  * Contributor(s): none yet.
  *
  * ***** END GPL LICENSE BLOCK *****
- * i.t.t. wat de naam doet vermoeden: ook algemene lattice (calc) functies
+ * what the name suggests: also general lattice (calc) functions
  */
 
 #include <stdlib.h>

From 10c18d72f49738d6b4caef3bfff7af87927e5d26 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 7 Sep 2009 09:43:04 +0000
Subject: [PATCH 465/577] * Another handful of brilliant new icons by jendryzch

---
 release/datafiles/blenderbuttons              |   Bin 179274 -> 182512 bytes
 .../editors/datafiles/blenderbuttons.c        | 11309 ++++++++--------
 source/blender/editors/include/UI_icons.h     |    14 +-
 .../editors/space_image/image_buttons.c       |     8 +-
 source/blender/makesrna/intern/rna_brush.c    |     4 +
 source/blender/makesrna/intern/rna_gpencil.c  |     2 +-
 source/blender/makesrna/intern/rna_modifier.c |     2 +-
 source/blender/makesrna/intern/rna_scene.c    |     8 +-
 8 files changed, 5726 insertions(+), 5621 deletions(-)

diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons
index 98c321cd954437b619c43da2298b1b581381b6c7..79d6138e3f03e8b9a805e383f9560da48d27daaa 100644
GIT binary patch
literal 182512
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

literal 179274
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%0AMufzZN02??n9V27ejDwK)2vs>o%=m-i
zG8<K=?gV{~qj&`I>>I5Y?&ygfCepUSW7Rj*^C?N`Ul46Gm)RS?h^$39=d~=hjJO9W
z&W-(^xTu>}TlNz(4Gvge^OAiX!$3-^%0mjBo7&<;o-J#KZ<AlBkjW-!y4rbx!%L%m
znD<>8wpT(LN?x|;s>D=b*0vjGtZM^M=G0;D3w3K_qz3?ss4PrB=_4ADY>0={54|_)
zSA=wayCUhDlZyZfRI-i7^GJVYSsnsHY)-P{?LTS{b@k?ZwEaa@<~gOMR(PbJ=wc-9
zT>vlP7hsLVm6w;dDwEN^<u!Z9oFG9rFbrbfx&d3M3ILpkdPhb&KGCwzJVWCXphDIA
zVKk*hlC^!gG&`v$n&&|y;>Y?>gwhj5{1<%y&z5<h?ZLxaZtDVHv`~@D;-qJVNtTg?
zJ3Q?xX~LX5Y1Hxxva!p>k|v7tY}3m-L&Gm)oqr=Xb04;<8f=~w<+_p04ZNDBFt-f{
zLZdeBxd~-(Q~B<GrtjRg{~UfRb8bDaN<3Cy;5gRK-UVe<CQW_S|JV1x19SE{J~cpm
zWY!&y4HFA7YbHL2g)exb<h=jl%e9AAY`YWFL(NFL?wx81?pl4E6mht^3VsP$9cKBp
zB7SY2M6;uu9?kGe?zL%}21wc@E4y9FA1uo1|4doJ<}cj&dCTZlO-b|Hq~Uw|(k4El
zqs>ssp|ZnKCTxL2Ps-QG^bZCa?imfZl1JZlN)e#oY}Y!IB1a3SdWZW&e02HQ2q<w}
zhC|Kf(5_wTB^vDsAXWQYY9rEL7wXN)qokPw`UXW%u!l+Ji#byw1J1u(r<a~MCT{GV
z&30ef>2WeU&`SnImiPvqeWsYOs(;5J62ADu!N@pY=`>-(?N`y5zWrP38+5b4F{Quj
zKlN1CbsgY+9`0hAnrn8x#s`x%8<wM3>;C4fc=?fB_hRx*(6rS1iMB}#lCAr494e<o
zR)^m&>TBcWE$y6)?oIgKhszS@(CX8>z|3ro(;d;+tnWxdi2lQ!28R*GvyE0%G=7}R
z$tt=^+$H#=AF6COe(60Dcbs@7OP~8e>8JpItSa#KcK-bf4~$=SE-t~bu}W#~zLzcH
zI^N~5&`?&^)&>B}p#@N^tTyr%&nZpkR@~J(HwIcBDCrbn)pI`I?+J+SzrwoF^o%5C
zKUf6mRBoGbv`Q2it?ZAzF%z7}NBs4c3f~kr#A$<Kb9A-`+Q?oaEC_%20GF>1An?Eo
zOUUT#fj|*;&-L3r%FjA223O6DFzf3lXcAJ*=pBB7Y!+`L9M&UZO^1b)el$!cJE>BB
z_%L1o;w9Rp@)QMtl?+2_Z#gtHlmon<;THD`6II!+=MoEDZLV63&imjcDw`1w+7+0}
zS%FTHf)SnHc^7J`xU`RW?ffq5o52A=wkXH53cJUpo!cwz*vB1l^$caR)$pBUmgS$f
zx-`EC7nq>x*DIV}X6;q~3@@=JE0t3+ifiKs(T2I9+l(tDJod%8#+fAL{0h*4nf?Wg
z0BK?GvSX`l?($nI>-$S9{|@WH-)XAX86ew+Y9%c44<M&}HYi<OTr6f+m$yhruwY`)
zY;K-N*$CFxZ?H>kN`T$Sxl5o64lK~tr1Z8`&O9qylbzzOVLPf(o|-F;?d30$q-Dnv
zzNV(4a<Ku%=Pp2GOX$|&I-mXI3dAeb4_iO=K+q2|d;sZOaVv7=-QTMNCMwowM>QMH
zgSjF~w^x8piE8PimlNIOXj#Oua&eJN)ljzQrI~JkV-Q4@SHQ&+JsOWUoR&m?VG}U=
zoPjdj-sW3rs!q}f-yWFC^I*T$n;*d2<IS)Gw>SSAwyf^P6Yc}yA0C6U7BX@^)S{a&
zGY4TOJG1V=<s*Gk8S@`o!J?VFw~>V}DgSW7G*im!{Jg$<Nc6zRX3R|(BcZ^A9pfeG
zKF(n|A-S<3do09^O2WD|(UIWIr*^nTA);GEY>|eP?0^j$nE9=N(Mgk?iD*&3em7iv
z3?W*4vDl(H2>tFWh78Ck;lhw2Y9+jR?4~d~L^9=lpX3gcX%C8?(M|Mw@GNQEc)HD+
z2-|B*%;~rr!$_nGmz#iZo*#Yjdth*%*N_GBAZ2+=?Zs4Z6bsMIeyLuRPGYPmVrWz~
zaL`#8a>H_nHj}Ra7@mfP?suK^jy>0z>MOW*8jH+%qak)OvIQ#Q<8lf;>%d6m&;d@l
z6xzyZ0!Nj!{9^5<!wu1u=)0|!yY!eyqVFoXBC1)$1W#Q6T=2WAP>J+xK8qJ^Yv8#F
zlc8$X?no~Ca3g4C{Wt)pRO2pZTAxG1y1aNJx`DvDY=x6}NbBBRlZbgyo()-%m^bhC
zLQ2=T=G{x7_|_1Gu}+ZK;}H*|Kq-r`z+qoIL+tA_fDg+1XZ~j60}Q{{IS7Col9m&e
zN|d{{anJr%CAJB8c~;$t!8TA?RaN9VkyGX=QQ^WDY<={86ZO}(wvxMpf}0L))$ff3
z?K6e7wQNxs4!+=)#5hx`G2sRd+kGV+>Gxe-oQ)v^WPmIgE0@AC1Qa?-KrLyjUeoLB
z?z28F;G=={BPs1cQ~wiBBfAa42-VT&;`eL&0dFZ*`225?c^dX!@wFGrdjJ6K9y4w@
z0u*9ZRh2o&GY$K*u7*f@gGA~I7^iZX!CT?Q<VTm9B3(Av9r81?uJXh5w(;dv9U4rI
zsTy{MLI01vw+xH2?cPTRqy&{vP)SK?P?0W4X+#<X1SO>fq+3)3M5H?gq`Rd>q)WQH
zyL+#B-{1c44?B+ic^}&Yd3?r^nfspWTGv|VI@ftNq#pIX{ik}T+$i2<2(_();|1G^
zvh6&S-p~pi9#{;9ERqm>7jQkqzKThoc`?7*`{O3xpsAp?(he=z)^?)dRBX{t=P|{(
zs(mv0X*x&VA`@bTN_)G2PuhzScj=IVYvPUI^=p=wWm)C$!r^Rfd1dGpx$vGtonHJa
zkIQvpx3e|9;nBaM&UjJ>+ny(z5yHObg7d=Fif`lNYXuKeckTLXss_7U-$ZqfjE&uO
zMA@y%Gth$cA&rxhQx{0^MS;$v73V$27qX=Xtr@Kyv`_Uz+^d~t4#RI(xbnQP=egVr
zk&uXtT$pgp`pc}p!6>G^^}<g(xl@A&-))SoqNSSRl@EUd-}LLG=i$VG9TozIW_EP6
zOhN9eg<F%gLB5&FUjj3(&=*d^5u(l>3!Qt|8D(2nSfmv^@1EgMAG``7M7%){Tg`XS
z-*~Q|ASot>4$?(l;MMU?Q7AhrMDbZ)vk|32_5S_6)2|`{LH8Jrtp7<6%&s9c1PF;<
z7KPq%P4u)`%1Kzo{YWBIp$rsjJhByPg6|<p>z);52K(QJ#D(L8tHrO~T{2Icqi;s`
zVd5?NtFG%0Y5SokD?f2w6(~ce5p7;cA+~%IE<)+??USTKMDOROl=>aP68<N^fm0>D
zW*7M5Q}r1_ql-eyywCk+i*1HzVResW=|<~k2Me}Df>RzFN6{D+{7O~7xUY0wzgH4n
zz8|FMoY@P}eB4hs9()*3{r<DvyUDDe#(@SjBEoM!UU&)c<eB$xO{nN}RMkoro+Ubm
zM_g(7zAdupEf&^t`)61<{K-!&K6=+Zv03-xm2#U&&A}#i_={HvPMr_2aNy=<pMDhW
zAd!@u&k7E8X%s^~d$JTcwicNaGIjmIrIz#|nrP<ehcV>PA$5#hFrq>yD7_5K#KMi&
zUf9PE5c{d-MUA@mtohtN8{8gJ+#oyQTFjEgG)A}aCm;fyyzw$h_yxi)Vc7%bJKZ8z
zIUFG2`Z9YUlCiYbvoTfHJ|#%HSnbVH%w*T5uzQ^DMN9;VF@0uW@vYmGEnJwNBUfVw
zVRrwmgp|}KF|I!kq5{1j<41%Ixdt;y;2zQK+iNusEJjyKKeAh2)FRX3BJW{-XEVzf
zB1Js7T3)w9oC#KW3c6h(OQ>dLDW=$X4+btzS52nI2j`u`Jzpv6l6Vch6B4TptaLUL
zPA1T)cYl%Kd3Czib2qU06x@+j1+<kJ!Up*322-&wNc(cfs+t~l)i^E>pX3X?Utgy=
zI(X()e0@#W^kVaKtiJ}fr_EvHJoyEMY-X*nS-&aQ5e_x-?c2BFjL2v|f;uqA)-f*T
zOP`eTYRRS$C>xW<A$$>hwfJ4LLNd{nXU*(Jvr+GW)U7B%2W=bWu=EB9{2zHrT82Mc
zWAVHrCqK_WxNhN@oWjTR{x@xr#%wP#v6Al9hxT;u{P;4)+%&F@)4pBw5TsIGkFvfB
z)o(Wa;{DW-$`K}u63in*G*KNJ4)vMd{o<5gIU~)Ot#XNnx~8S0DANr-u!WbI28GVX
zMzJ`4hc8Rc!qv6fCr4cgG|!&hEX#T6PFqyC)vYzH!1RFV!O$CJ3ikJX?xI_|Sv9)5
zBx0DV%7tYQy7%VC61mf^H}{#xs<IiU`YbtT57BhoO|O=S63-=VzAHzx`hgEAt+&ck
zi{GNvf!J3oLziupA!zSS!HSVPc%&9Gu*VQ~+mC2?Eb5tPk~-5{E0UE76DGNn!n4`u
z<yL5a<{mzb<8!j5TVM-fy@R07lnV2Z_7?9w%~067BK5lr+Iyinrn@_pE`t*)n3cn(
z7Fp*^xsqdP*<jLIU87Ol^|*4@ch{~nX7}9HQ@DFi2FLbC>ziB<^!g3qOoI`bb$6#q
zgMRfOK2ONiznj;E+qOA%u}RiVnmsaPZOVP{bmHvN^3F`)x1&0_u=i^Wb{q~LIt^#)
zmI-s1y5(fz9NE*iagnNftSg|GW~9In76f8A_k;c@T(LPjh1@&k!->&i6SFOU;JEdR
zKau+NYa&VNxb{HZz%`4UOWL7$g4f`(_d|kar(Ba2H?>zYuYW}a+(g(1OCFp|#VdyV
zO>PGfZC8W=cWhmE$cR8{+16mm)s>t(mtESo&EeN40(qfI*^%MKPnI-yswG%e-cF3K
z>?bnIaggu#?&5g1U_FR2d#sS&%9TB$QQ!5j|6Ix3<tf?n(!jf<#L}sJD^EvZreXCx
z21Amt27_~Kz4Z@{B=@dl>}Ibz&IOK4IB~p|Nh!V511@o>dzE&)gu1w*8T#ME$cLFd
z?(~c>el^M=-%o2n^WR5MuM^E+LE}~%ivWYN1^{!uF5y1W{GUH}7=T#Ve;)R2hQC7n
z@dn9%o^=CjZskPB#Lncuj~+j4r1^jIk9_a5{`XaG7#IA{PmXFZ{O`{&IA6L+LQVHS
zSN}h6`hPti>;LIZ8DIsX-a5P~5ezitjpqp2729md1VgT8uTD`H{@=^&ciZ7w>&pwd
zI?n&7a$0VQNcmrP2K9t1Gcvd>|9vkXx;X#OSNwnR4iYGLO}P;N`yJtH`2TOh-2Z<Q
zU>W{@?k0T7I!mp%h&&;0sl4X(oQ|1O|KeXZH=zheegcWXQv{AT&l7vQV6{}|uXDUh
z(lN-z?8L)Ng_q--fwUnTo^P%4&1VC}Y^yo!5}s!}2{k%JT!p;9%s0IZ3w?k5c<P;p
zX7F#r7v3wf8w=0-E(7CQ4(kMmQn?lUgK~KPwpeOe#<cQDJ}F&ri5%s+GTBsM+1cNJ
zM@xVsOz+35da@S}=fja!CTv~~Fh}9-y7-fD(nIQ%Fjr@TPky?#=s6~>&pa?OMaJYm
zI3m@-2ht#k2(R+;BXh*%fGPjf@Dr*9sigL0|E~CpbMjrkMy<zWv74aLK#l+<qPS-n
z0t;q^Zb$Q%Pv0h)YrB3uYZQ9FoWG_0K`%>gve$noEs&06t~-BWkunBfGl!2_Eo98$
z-$V9GJw2f`J7+vs>;T4uK4Zb|+juR_7VT|aJLFDdhU`w2g-0y4W$%TfBSXEGi!zql
zadpNv(L<N%5z~B|hL!5BS>k$=iWa+88z;`A7guIcopG*hp(mVC-s-fqj@Fl}r=17`
z){2c6j-H;bh=QA>A0!t?n5hsFE0vo^w>tbAZg7!R^wh9-e%>pqcH?!fxPb`XJk4Bb
zonSdb6AhW^zjZ+Q=z<dAwl`)K2^LN&+35~P>9Q$Ro=Kly#IMbpu<ZT<`}8E?qjZkx
zD7;^61h}a_Kvu%^Vt7bDQDQUh%rU*Rq!r;OHd76wF}_)soh>Z^#LuyOcML(l4?ck>
z_+EJwF-E)D7aLiZ)<;``=f#F0{vM@=WY1tW0+dyA`86vEdEKeLt-Rd8OY2K>PV`tM
zASR~Y-E}!8(gT^rne&r9OOV9lR7+Q4W8)FCKlPZXA~w5eJxY+M=-Et&i0GaiS)6Vj
zyQ%W>rK`umfJU=$Bzx{VgTkC3CdR)d4Dn;Z<KMCGhhWwU+Ro;IADaNE%BLtZg3fWW
zdiKTb+qcia|47Gmb641`V}r0&t1-gGVwZj9%Y0!&gDuC=+LD0Hw5T&!kRTA5nVAhJ
z-}hyJNV>voBy}qZPpfwIlCLA|rs*F#9Tkcd^2W{aCQA4EzY828&tPR7-k-nx>e*s|
zwYiAi`y!Xq>O%<|!i{US{nkn*J{@?SDTv27Xzw2s!D243J=$rz$nE`Q&x5&lmrYu+
zqw5yQfbS-0sVolSR&a2Wlhv4An*g|Z;D3=<Hyd=crkp%X)lgs0EYJ_Wq&_@4l9rd3
zuh~@iNwne2k$=1;d|Y1)(uW|r>-(Gzy~VZ{1mr_Np5&72CsFC(WUTsjJP=5asA>PW
zIBY#3XgYH=#0+gP_*H==M@K}wAG00qs(OZ_TkWnC9ucaez9X_QF`*zWjqRVye|+}_
z)-`tB3NOIRX`enNh6&=Q5CklGST`QKBo}vlGaDMEFYX=e%<uz=Mo^MOY3`?~FuA$A
z_rkngFQ8UrUrC<~79RD;FkwaOM?*}>eRPfH#k1}m{fYog9tjog;MM+oPmVcfW@e@C
z$MG-%3ATof;L)ZFFn|b@91|IOB6%0WJS?`3Y%a)GQXKEC%=zvY*tb)Chj%3hhFAWe
z776O>ynK8O{r$Hgi>3$ty0TYCo1c&0Ev9+tW>9~AiYyj;Y1pBLftL?XZ*_V-V4|Sn
zKn1p7V0WS*{BF1)$;`U0Ng6-)`<w4B;X}ylmgzxqC-hsOwR^;&ThY@BKN)0%5r}Zv
zh1iIQ!Pfv-(B_SgFswf2e1cu(Q8n7NBtl%Msj5u)6r@y{Iy>5i(7k#AwKer?FsRq*
zPsf=e@6D4D{a0PCQoJV@Ls2)LG+XUp_NDD*c-z<8)?HWA*Oc%>JWJ0l#|xfmf_$=&
z=jAzP)^hqgZkyznmNBK1u}7EYC8jQkBy}F{2$Dcd&<t$^&*?(233EYd$@=D6<{mMq
zem;z^*+q|J9gzh6Q!wxVg)|J5SNVVat;OHJFIk#zeQ6q5oBDm`UW#)>kpvFm2WRJ+
zv%#~(4>zeUNIlLE?NN!_pFr`_nklqrbIEm96SnbJ**iV@<tn10Xx`U)Kn=7lN0oU6
z#AjD@tZR@L;LE23dq!V?FU(9Kn}jVwMN~P=*j`$?rM|u%q%`GSwx^#}fmCG`n53fK
zuFLtcE$Y9Z!Kd!B)J1VR-Ea*Y&QyoT!T*><fg00KAs{cNW-Z3~_1_+S6J^oijwV`E
zFE;`@Abp@4*#|x;{ZQNXfd204Z30crotl_F8MJ3$35XjmOMkGpm#UKa!v&NF!Pc+u
z76pHg$Hi$c7{iBqfIFsYrfQ#;m)H51t${SYp7wSI@DHYCVE8!br<jonMaVwb7jwa5
zMoE#83YIb4qF{{ow-H{-{Bg9YloVDF2ug#4Ar~#J@9O(1*$pri?}aNBBTI4!in*H4
zO_3KYJaPT7zqh~t4+K#IfdSeN+Ji69wioI)bOO`wEKk4=X-CRME&~R=4E`qaXZtJS
zAbu$a`&S93c1_jQNj8S^!Kq|FFWXJs$(kSi5_G!%Mawh9#Kp-2kEYnKUQ_2m4$Fh=
zY`0TH7q}8s!kS2_cG^luLqqcyGf27CGmK`+iow8bHD0mZhm<R+sE9f}J6nQhE9pca
zaDM&zb$L7+n`mkn5#h1ZsRS01EWRqTfI0^kK5peME8OsOzdg|Yb!60|)U=l-R4=~;
z++OnTKQaGj1^VNPtR%iTtCZh<+P-(Q-i+f@#PUT02~lZ)4Z&0!rAGQ6nf9551%J?K
z1uJ1Apa2JpTpiE3Drb@mq_^*>VjxHoBDwbu6Ua&LSH1_OP;?y~o#g`;Nb~9F=<1uB
zF>%SrvUkDt9Rt-*1Rpz(vke}gVbk#N+&w%z#KFgx2K*W|gb51cz64^ceSvoarzm+`
zN?bwfqV#HL?Le71Tsc#9dwW~7&f{YIYP@{Q5;3J#UWYfmLPq}U3VZ?beyD(P10g^J
zoTNeUQs3Gaptm6fUgFb>iyx<_4M5F#q7<ANuyt{9weMczTR%v#>f753ImFU!0c-5!
zF{e$5APNBz5Uo!9Byy=~h7~b%a6wRC=p6|mQZ51qw39h426Iy4_V+_5yzLP-v)eO2
zAy%<Xg8$|kOo?Ma+|wre9!i*i^K&&!@#gj>c%{s{)KG%xt!zX_df7B0zI3V^b5iec
zCLjTXd*P}fW-5hDdo?mwr&S`;$SFlU+}2@t=z{ynCZFMOK{=Y6*~X(RN7JL-U0lk?
zhB?yx1<%(ft8Ufh9GmAh8=efbw3t+hJ~)mD7lh+njGJ)KFECaowx>rq4k9rqsA|N=
z#qoZY$12pk(YEK{G4*G#%mmh$1c)0;7#KW&-Y#>HS~ElF^XY{J%u?+j(7oIlEwyk(
z*Hn#kRMbwPP#LVPI<7_rjg?wphl9`Q5{#*VBM&vvXZW7Xqf+|Rxm1&tBw6`WeLYw)
z4QPP-Fj&4I5MUXMRQU|X18GR4x3CL+{!JZ$>PuADLj6d@w*dk%CVU}PuGi>=fLD>6
zQoP_u9fR-NZ|%|$&Kq7ahl^$OKLe^GsN1frtenCE?3$d^BOoAn@U8Vt5eT;u!ApqY
zVBI2LE^?mxqk&*GYM$Z`M*lb{HJ5a_F&h8NWkWmrXwnrQ@H4HH;j#^RJ{w>cGF-Ff
z$Tie8b#X~sxjsj<-Ba;f^<HG?0T(;MU~74Ju)Q4*1pURN%vYrk9%&#R5a0?pt@L5S
z&K6g9Ih9t5VnK*fD>KR}UYbH+@ceaox<>FtBEG>^ohr5J)`oT65h1*K2{#YV(M?$<
z{Ap$uTc|Z8ll1lsoWWWeh8Ji+`M*<491r4qn&G2)l}xoMSmmK0eGSXp#=*f~f+ll3
zO~q`%1SlR5`j3x~Me~QG2a)YeTh&y0M>{&6o1;Ay`gNB!j#dZ}5&eql>L%#u!Q8TG
zU)uFoH7-vvZYkurcxgNZYhN5VYG7G|)8lVgTQ)0w^dR_;M;e5se#~Op-mas1clq(X
z8?eX1ds*NU1LO)eqIhm^NsdhSNb}ndAc;zVfQ8ZnI^-xjm+?f`qhQ?X_nF>Pp|pzG
z8o8tgyX_o0AR&4K77zrl#?DR!y6|@W*OGM}<A{<xQiZ8VJr^cPq{<99bQ6Et*znZB
z!CA8*jt6acA21T9eJFG>w{QMcj$b({H0~U=0DHl^h#>UmBt<Cy`(=WLJwb3JpT^M5
z+&c1w)E2y<QK#at@RvNbvlK)ebO0Gp?~s)>$3X~x50x)%j%~U7O$2Zt5b$CA&~MfS
zjO33<zkwPmq=mOW2$!WIrH$@b-69fu5ZTUhQ%%iC?VwmJxuC5A;l;Nl_K$^DKSGv{
z=w1+(vMfxA&&<#J!3zHoY4Pa8UmNjs6+6+{vAwST`RF-b5Xbuw5s{LXhGAYx3W=0@
z$t`vDQs}=77rn*%5*UakxGwtYbr!QndRm$ROd12W4z?;Kr>7E<k~84y)MzE-n#V^%
z@Xem}!GjE)?gWd&ttpQEot<ae+N9ta72MaSqAYuz<@Dg;bw)N0Cg+PVCE;WUr^i4M
zAkjxR%6ZBjTzc<ri^&uAq#pnm0;MpcjSQrpn`cjdm`u;8=nSsnF(S8W4=x|-ZMkvc
zX9Sb~JU(+b&O>Dh&ue0E?CtD|O0_NLAoB(j^UAZcvkbXr!{=!#*{24r3%gO^>8mI#
zEIiGd*C#JDBB4nbUg>(o4rN#TTnA=E(MPbO3lDt&M+#(dVhmwMJG0H_F)(PaMR{4a
zdLcvAN2Z_WocFM26jvr$`8SvOzn`gM$@Sn-9U2kw5iajXWMq>8XVR}<<dAKH^9g8l
znD!*0!3@87hpU<G&Sq3pR4{C}?5|0{MvjNy6Q#2d747a26VJc_!0U0&i$e{*C$-H<
z{g!VfuU2}l-SxK^x_pE}WMOK<2Xh(QV9v9xLKSuZQZul*FB4oUl+icP*0Up>-L|J0
zT5N?tNZNZsz)=G2dA5}Z8v#(JS(e}Pj|YX+z0R$K6F_?pax8gr;nSz6AbjR%*>-+%
zM(^=M<u;2N>~SjV0@=Vo>)(I=a9d4OJspHT*(NfWqL^NV>0$Wu2L&nUy=J8k!QgDF
z792fN+9Nrd`umIf4Ajo=e3nT1A(pH>4es#_@#?NA?62@l3UMg!3(7M6kfo<1x~`tD
z=j%{+acHh?wb?bz-9?4?cGbeXxVsznP%+N*iT$E{VSYXbJQvb#;7Gt$ya~Gz?kr=t
z?B4}DK`;l&;ouO_3QLgBp8~^pKYZw-uh2sn=Z=N#^&ugk^-Uv0XM($TQCkbNY(!Z}
z#2N3*f_6Q!%y{pX`hFtiqk=Oi^uj>X8rxcbD(`PwQCr1&Zga)YgvJU%V>hlC3*hL*
zLq>?jp+80cT1%^CcC8n`z0r0Fb<y_c$2*#E>JgRy_|fFA#AQ;2W)<Y)6CoeRO9;IX
zfB!l2uYZMllWS(a5gJ`+1~|fzrj(+m;3ttC|HNriw^*6+H`p?59BoWp?dFb^U&F)2
zjbkN|gMmZlfuleYHkFu8WAKwqf{h3<4<a9Y`9U^-K0Go)&CY%cY!6<JWvfmNA=~%d
zI>6ix+;M*DvSU+Yz!O3CpFJupwwes#hwe>?z(6-t%hwfq9={Q$l6mL6sq4aFbIq7L
zU$fLaeDU()3}&Umd&|HdyG?OV7D?ns067o%s;kezbAHO?-}~EM<>_eyGT~pq&>~4C
z6D36f{#ZtEjPSbbGeTbt5j+PzXxC(!4mT&VXSrfLnnfvDPM`Mo^cQCYRJ(qR&9+b%
zSL#ksx||}cfb}9|LmmJbDpu)1Qwq5gNYm`y6Y&r{C*{#2M^p$^Dj}vx2=0_rG*&1F
z3+PXAja?IQ+it+-2bUHQ7Qu{(<&q&lGg|lRvGPjG+j2z{@q{ee*^dC+S6T-iF*2%S
z$lG9$@}u9BtjB0cN<yiTRN9dT+<#&`?~Eogl=kor?o=m;e*B1!p8)TgmaV0&$mxHf
z*N)#dYgpLZ+fSj0NHOv8LhN8>6cNq~A0CZZ*4h%C)zw>J(TQqD(_oA8+iH1Tx1^ab
zGk#T9uhid4=!6xm1I|P+jX@(UjOs;y*s3|YVeI?brrE{B@0+RY%8qnQ3vaM}#Qnz`
z+I$&YlNBDhJ(H7^km`l^<1*gCMS0G^K-Rsh(X|M=Jjn%#RN}RGwE+xj5DQyc&#7Pu
z>$Kb1j=Ja)*cyJnF-i<d`Ie*73nOK57rvsR6*-0n<4GSUgLjVl5#ItVNQAWm3##5r
zwQXTooiEr2K++j-qRt$em>2>H2<#<@^@w^H8MECr|H40%r(vhCa;`DizaBd>Zn59=
z<*gXR!1<-6)Pe#6SQc;?z)FNu;S8U=gieR%<;|jxF;!g2oh4?<jtv=VnuvHVv+p&&
zzSlk^NJH%n=0V@SfA<0XZF9UIQl_t5->S)TX>Xjk>G`jEzSw)Ag^sZ1$cG&Cy;EQ_
zI{2C?YN-@y;*ytQ+oAQ)O!pIuoNu3gqZaRh0=(nb`MK0UI6VQ)4K(t0clWtGy_(hN
z&`@u9_ji#G>D3hblh9MpeSAo)$I3cU?k6DZ-4UiC->>X`l5;Zo>qsNjtchl{_FzzF
zn)eon6gPwO8<?#HgHRG9#XC#s0Y_`GaMLLcO|lBJekq#J=LO(&jdD6e>9Dh)wl#Un
z>-AyV{d|eow$D=8EONEAwS<D*9Q1zA8IhK7=FG#H!Uw-R4p!`&+a5v(<chrWZV>+v
z&AA~xIhB6!TxXn6ohQ?3f4TnhxY8nycBwh0h=>R{wc+wuPyTocDS6&OSDOod{Et3J
z88XVJJjM!PTHnxmD`0K)PjmAOMAUR}D)?E9e9?v%;K5OBTvIHLL@pqNt*y8&4@br;
z_nK&FAJ$x5o}mlq_#d}dTK`3x4ooZ)xaEAJmSc+kp5o;NzqML_bhyqpVdL3$g-H*i
zuWx&jo|VA~yuG*QTU`7EP%XmSx5YurUfq$FUG10ES?~MI`0A%?SmrMH(ck!AH)1S-
zH^xXnKtNzKq<nUKkQRhSN1O43NWE5Bn$e1X(;An0p5)K9$1XFz_AMkGp8`MMZ@I=M
z&kz>UY)Fmn{UCDb<X)K6UO@7I&%!%4v9$tCRw7sgkg^%I1b_bi{kw1tn5JaF-Q<kz
zy!Xfu1MZbSSRN#Eid=P%mJp$Zv$9ys##+}pn?era1K>+FkP8owR=>7a*v=iFfBpLT
zqxNEb*4!j3|F4afG4X&p@-l<Tj9EzDt^)-Tj6Qr?-`Ew+PX2qpBEVb;Y^*Xk!j9Yk
zHh2V=f$&nyXabLvM@E0X{<`tPbtCBIm^oWw2+hkHM14!k(hV<m#CNU#MD-AE&HB1Q
z0Rbm^61B*=51(`dm-uPSR@do6RZQcXe^1-2Eh@kTsjM|H4+=c_d){`3PjbUUvv9Ts
zKJfjVs4vghBU_eBMsK46|HnTb4_B)lC*!|=cSH1xu|-hn#d0l>dB^7;hj9!o`=fjB
zJX54r=K@0Fy=_e^48t!Il^@>A=@!|{<PcA}4=KJj85-!YZ4m7C)n+|%;Gei3C9hHZ
z>!IhvQu~a-JTlX7JbfQbyGzDOjasUqGB_>&<+^i@-+C)3SSRc#>ulLOkdd)Mb8ZZ4
zSlds1>W-iYpsdc~V6L$MoQ`{(1_(Wu75Z&Kd|4(g(wk-0Q^D4?CyO4m(|c9>H|npC
zH27YC>oLsD&h7ry9T-_EICOpKm}pNP$9=kyA9HV@Qjs0E>j^uzl)*;L^%jDlg~h`|
z+K)F~br^{xg-Cm!Z~bYR`l-2oKbL_rTS+Tre`ef1M_j<S;kbp2HS{?ES__1qB`{lE
zGk$5ueoBng=$5u_`Dww{_@%pCjkz=R{%Cf*gzEY4%Y#-`v1iX{yu3yEza19{1XfJk
zrBdsB8T4?za86dXZ+EYI=C!?IX}oRo<@fJZeJ5`wyG@L<s1~YEf4L6EJG~I<4q3hr
zC|b~ZN=gl4-3_07o7Zi+o~78hi+pBbgJOPlb@iRKH3zua+2LjkUG)%YI$<)FOZ6k-
za9aQ3Q1QJR9+RM3)g6EXteODl{9S?J;h_t#a!#jWweb6Q=y^BgV6%1{F?8?gLrG-%
z-wYvSc1t$^Ta*i82gjF1@ep)uN8$f=4EIhfE>nk~S$H|aK}&)#cVs{{Ghf`r5Pg3$
z{PRHSHB|5Qg%*X$f7-79={_!s$Q841+%<kr^MBWSt#9;~KoFoq*IdBA{`pMPRANFX
ztxRcH57=lGnwZ2jd?<YFUU2CPh#bI2AI@c&=)nvn3=YUA!&)a>P0h{7hb^{H=RMT>
zeeTag-SiXDc}YAdC3Wszm0acC<kR}$n`b9d^22zLtLTxYE34Qi15=T5B%<I*d1k%N
zNRQRpdMllson6{bEcvftp?u)y&wR?oXrxRS2%gvp`#91HkMj{$8g9~BHPU^Ta8Wwh
zaM?RceBK+$Ip-cb1MZ$J!4yyP@+b)9PyIjo-!!K%3;VTy=EzcoRrTfNW9yOJ@oziX
zvBlj<N0S5;-(Iv=(AV`pc8t{O9`fVjL<=>H?&xl`rNl@Q3uT;o$N5IqOMvQSmRs*r
z`p41v{&Rwe>AFYpU-@sSLs!7TTXb5d@Q?mLvpI{f$VtCp;Tw87x{|`fX@LJ60Vv2P
z5YxkiHn4G}ZmkeK{X!-`5s%gQu(t~T*q=Y?0eboP*oaD9N|0YwBod1d4q~U4m|s|U
z+BY~@CeUI#!Gx5cBZ_B+v^E-aR()041~mG|#>OD(FSLU<+E-_A01PDKG9`em-e^Hc
zNT>s9J&TL;^UIfHxY*QmfBXCGivhd<jYmgpsH5v%N~QLyC@XI>Be^n#T|jBB%&@S+
zH#gUk4EV6@B!S40)Pvhw=B1;>#>FR9BkyWKTI}bAbtRCe4mUS9$*xmB@WXg1`;=o;
z+zTc@h1sdo`Xu}V2JOVA^*d|T$#O1*;!kgp{u4tW82U?V5x0b`?FYaLEf9`v-(mpg
zVBV$xB)pH8&W^UaGdElTAbTRLzaKW+Tig-9<a{(f-ZA~#FRJ$Q=R*DH5?A)vpEh5L
z+-!WFuHfL&TnqS0&ON=?eb=Dl=cAi*v-{k_w^~(7TgyIYXKzi12y2P4>+=hJXgPfP
zP$Wjeg){8!K+W@7g3tWC0UsUjmpXB*pPx(6M9U)(aShWN5z#B9mfO>Zc-Q%a68l)>
z_pbEAULzZba4>4&<b7XWTG~vzcMT4pz-E=opPa~&U0ByB2Uj)g0zfi_5Wh$W2_G2(
zPw+d;$~PDmP6HzQf<-;&xOZ&KmB-5gRR165xHlc_?yeeHSX8g{D~UM38AAkOvS<hx
z)#Z-^&zDXgOuTe>BnXUBg$y@ZcMcAMaBkh29Ld)gnF3<bUw|rcWtpJdI&d*Goc&MB
z=jh<TePs0D9}YDgBcrKLM#fSk_?o=q1QSm)KnctM_Zq2jEgwU9A#H%E)%}q)nXpQ*
zc3v}cSi2|m%*JLLwQ?<j&=~x@=6JK^IjPg$LT9NgQNSthg|>Fg+vT2QG6d>+LXC@~
z_ctfb2&m^lM48QEcXMv8f4sBPathK8vg5Ne7HFk>)@2V+W|Yv<igp4NV;|t+_h3KA
zxU;i!KQ2DrJ%bW|G7?4xT0S?=;snpRAw=nj-o|z=4*U4{1pVj>RC4wG0D<Hf2)<P$
zckc9n$H^6rL1W-4=kTw$*m?TZ=m;W^ohv#g6nkE5@O;wKlVP;PGDM^0YtBpiWyDZ7
zQY=)iveyRroPKy|i=Beo@lEU-1g{&TvF6#~&8}+xUGY0ATCS=7ER$y%y}wSQn82cy
z7FOOD;932G3OpPjnkz#veCYy<DR8>@ZINGN92p;fQC3%Xg#<4+Qd%w2pv5zeyPa_+
zThpwn!^4eTlW0Mtn5mZ4j1otrU+3q4-x@2=t7Ph!I4PAJUByEdy$I??ZWHvCHtK@9
z2jYl`h|4U~$LVsEMP+~OKJ$~9wmw*_6F<dUtPnlMs3m(hm|kef+GVHXY>!JLF|hge
zDXaeGr1>b9jFx#8lk-5<?s>5Z8%^}r(}NAU@hYcCrD|6VyVpCj?D{fD@5FmSu~Cax
zi43V8Sa{F~8ZNUW1BX-z8p7X(wn2#(7Z<sYo&hA^<OwRC=`G+JJH38>%uEJ=y~Ne!
z1wGWYsbKo|$OSx%ond)z%?oQ6R7SK_yBZiwZ$f@K3_wAgusbOdiToyu+&(yv1epj)
zXsKCoy6i7cK%RT8xVTtpAY2{pE;oc06BG{aY--BrygiKu2>=>`k)8bypg{}p5_m3a
zx#jGxE-sFp?d{ci(vv#nroD#lU?5l{a(Qfoa?J!-b-~5O1xq6;ky`xYbJv5_g;KkP
zwk>>0!DH{p$RR%<o0FBU;9{Upk?~knu-w6gvcw1|gdZR(Qs2RSp{(q+F;+eo?=<NR
z9>224qBe}N(NQUQq1hwwB0J@We%#oY&i05&q9g_u)+pDzVP(*>4g^gM>|pqjiMs5b
zukwe6M&2*Z&hEB=ui*ulI0mU@t0zMN4n;Fq<ZXiyxQz{GG`D3;3Y7R?F!4yv(UOqF
z_!A@$FYCZulpjK~zal`NKR-~zsaOlHk`w?39~A`zNXtHZ)^JC5Wy3}IpAN(kdlWk2
z4`E{%@>Nl>=W-Sb3s<B=`L7!0%O_d(4)?;&D?Qh~6%|c&ja`qEKq&uVsZ^v`=f@`%
z)b8`F?<tz{IGOAs^`$5NqFZJe6XSf?cwsCZoFR!%LC!`XBj$rJ80_Fdx*kzoRVux2
z8fTC9c_JP3YC(g_p7`Fq52t@aX({2d;1gzt3gguvxH&$9J|F!0783(4D}Tq0(UIns
zmV6B5)CT5%H?JP|)GT9D-CdG$32U2ZBo2rd^r$|`qgcot7jpNN4oUbLvdBufHB#y^
z8C@)m#+Bua<@qI2I9dSPJP6IG<=1ChqsjNloGvc{CkKDBIN1I8O`%!m(87tRRg)jQ
zZd_!(Xdn9XqCU~XF7U(L&5;d%yi!S%?$wz6E&WmRRn=<<Q<azWM~mGW6%H$g{kDhi
zOagnCD?fd6Onl)|S{oDe=W8MBL{0U^LUUmC>t34IN9ws&ofiv{>n6Q!2`e3Z_J5Kr
z2XBPZO5HiDsJNG4GMPvp|J8i;TZ|7KH8u4K$T4jK+MCy}`?=W=(j97M=Bx({41ZE1
z0u13qP3LH_g`H5!AP*Qm0|OQW(6+YL*36xTv7~3$Tun@t=Ak&LM3rc;bZ~Cm@Pj%E
zwq%F#6Oh#t6B9EqGV%qW<!<<o9~dyr{qOjJ#c)9~cymupm0CpVOGscqL5mB;;0G5M
zbOcmjwwLG5`&&~~Kp>CecQ8*Md3Q@uPVULS;Wq>%5!Fy6<v?GgMm?JtHbNkz=j~vv
zD*&BFb>?uxQf;<A^HM`^(FcGN&q7&)2kxU3<^oE|$;l_sC)|VsS^CWzI>)WaAgy9!
zShILg`Za-j7pLptI}n&?92g)*nMWUxqKSfmJ>~D;zcFO!hyY5bWnsxS6cV^YLP7%u
zd{7&pF#11V?}z;e4<AU&^BDxZtnv0k#R_id@B&b81EYAUskC4o$t;46g=M(d5p4?H
zYQTbHq+cyQeEfL#@8{bObt%Zn!L1P+a6a(3_ZLIc(9i&!4^a=n`jJ7sSIYeSyzpQQ
zt=OmfrY71MKu8+ES@_MH2ag^RTGt#5x`X}bDNSys22wx#P2=y@@5#OaKc=cYqRJcY
zmspskVt8ejzgOgcFWJuRj_G=|^)g5QDE6M9py;=Io+0d6GOh+x89T*OYhyWb8SFHr
zF)o+2uN|uQf4sp*;Fyv}iI|<oYEY0rpB%w6sYFgu)w)i9vhyVlT@dy3ypjX|*?{cW
zSTb@7isS+F*N>wKsHpO%$}D3?z@k8yg99I+6M*EPQPuVr+A$wgvQzL$5WfcUqj__r
z3yLNFj0}I;a`x7I<2ULIUY40BnNODVHbiWG=(Ge+6wYUdbli77$^Eh5dpm2*cYrl&
z{~o{L@ZW9`eJ{*ClG*yp8fF0<?}i4M^<kv=!;6mcfHx75Z%^3HoDZV(+@(%|mwYpl
zBmPhDhDDwntMQ=jF$UgsTSwd*al4xrXWz&0NPgJz@gXgZI~cR9rgDs0-XSL^Z*_sQ
z{ju-^uNXXBkK8=`7Y;ERHNWBx<M;={?tZSS6>_gqc>kUY*7hxOUN5#-9x_28LBlvG
z!S6@Ko@JKCpnhDDChMD34gG_v$mo&Oq>2h^M1=sqvDERYo_?*_%h`}1(w)I{`!Rn!
z$^cxvDOf2*OsvdAt!aI;>IyOI$1X7K@+X#u-cDa1yT$w3TKp0B6XQFXZS9iwp2x{A
z6>V*yuQM#6roPx3EsyR>7CY<3pn%KuP;nmXM|e%SST>sha`!&1rXPW_Z0;95NJv^v
zO$U4=00st(9lGhFumwn;n(q(af>eMPJS72e)-JcYiTFN>v9Yl+mH5OY7znTR(Aw`!
zS0MZQ=J9j7?=2nr&z_+*HZ=hjuL_Ow^BwnpMIXtL?@xi9F+q!xxCeh#Vly;EMP=m-
z;LWD}={E%h1$!XJI|4{U0lT2&&sRA*A28`F3!#w!ME3~fT*l!k?_d{PvV}l6R)fK?
z;-?Rv!s3BMA5IbkB3C^SssPbkkKu(51J3%fF*5#F8?UNS#r6X(t`aBUrn~`-&vNT2
zDc~FwSdMW+!X^$NJVYIU!hVCXHL82Oy=|klHkjKDaVQSJbsc57Gz9}_KtWD94KA9Z
z=H|>WJ!@cX9Rl8zG_0&QIBNEZz!x50Mfx?3-v=ygY^n;EgDe*09XK>03%vhTiWUa#
z00V;T5AYIvxN2$`w*^4P3HSn24bp@^e^qs5f+V>s2s0hoJ2^>1A4rv%7<Er_b$Aj1
zN3O#*I0@V(__^Gph(qnUImQ2bN^Ugg6^nvs$ITZ#4RiQ0B7#(CPNSuRbgybWcrUsy
zbn?e*0^A3=Uf<2cI146M3bdl6q(7foIuU13TBWs^CYSt&Ic7T}D_?JdC+w(SVz844
zXQS2^RUeLA8Ea(&Un-|ul1lThB6EYp(xT&pLDyo%a@EDzBimcP-Zz4KrC14mA!2ky
zs80|R-8)I?Rh5gAiTR^wK4#+GAH!>(kP@V1i9UI+&KAlo`&YA@r`WIPI5~e?b__Gk
zBIQJ0VLr&>kFP#jX)SnQc+H@GDUjp=-%0J>{Ll|P$;V_{Jzk23*_XTn<uYMXHy<jw
zUF1&<UOq}Pr?Xg#m^vgBbJ4c9x_ZV%<ur|Gd;GYAeyMB4^>Y8^i?yA($XLFv(v-Zc
zV;LN@4+)<l*ol>`t)t@O^v>>?YDX>_7CRsJM6h9>*P7i%M@MIVN<l$^LbT*#xfM{Z
zvW{Q_@veMkDN#rm>!VIsS8=(ufameWk$tSB#Bu)d%0n$l_sEC{lJou$5v=`B!ChC&
zP546-aZg#u@gv`4zj(5>t~HnZ{X382`uNHnqTK?rH!3RM&wz<>X&h2MMJZshzpUgc
z_#x>%BkPZw=R4B9gQ2u*|8kx`M0|}BI=eWG=l4G#dy?*5Ud{uDn|JFQF)$Rdhhn0~
z7OCRCKbRZzq2!am-2EFQ2q<T>JHnsSoodXKEhf<r{;H{Yp{nW!eRvEEjQV%nbCAWr
z?jQ(khAus4^r{}&AUJkb0Rb%~@Gb`pCno{euZOQ>4MWcf*d<Bo*@Qs!)2nv0d~b=>
z-qn?N1@JPn_&dPg32^<xjgdJyH|Xi<p?wVXJe*UNDB{h9#S=|6CJqh`7Dh%J@CUZj
z18qb@03O7%F0b}i`dz@mBtjPHkY_KA(*W!q=5BXKM{b~kshwQGK|2>f<?%BvGPTU&
z4k_uVHK3K2V1%vAd<Qo)D(X{bERU}WE)Ne6^bBdiRXsy79$0e)K%WZ<32_6z=Xg|g
zg;kIgQS^oo*B`uN>cPwv2GgiR1^2@Ni-*GnDp(2FQ>$6J^L8ig;Ld6jDT@Sq+a6Oc
zC~zcPT&il5lDvw`%kRQn!+G;K`W=*fX^o~3x_jQj`$=7WEbT{74tBNfyNj{bZP`&)
z08G3--k$jacd?7w?_K&2lG^9^(A{BUIomiNaTj?SSV@ihm{d;SaP=wy2f?18HTGyx
ziuD~%q{s4d-=3pmnAt1BdK5r#S}hlF6H?M+_oh|Hu!jesl{|V1h<dHrz)03&3>RPZ
z%d?LI8y|0NdeT3ocR%qmT@u1pV#FUJq29N<d%`<*w_&7~7#)4Xc5jekea!t<Lvs9U
z&U^K?aT`$9v_Tb<%)!n+7$u*c2UzjZYMZCJx**l;NCRDAs4Z!D+WDN4Q}DZqS|>6S
z4ywXfwkwmPyce<M?@k^5<lvJezikhu*b?TwgY_U?yFW$(UjpMc`$>Z@+KQQ(mV%IA
zkc_Ok$JX3HO-fbmxZqE%yP&9c|MA`iPdO{<c*PBKI9w0S!y`$PLA$4Uu)n;Z%CJ|8
zheLqO)5*Xi=lXdE(LuiCva<VD8gd$0rVishBX>WRQ%q^6wZ+###)}+vT%J(CghJ{Q
zJO{n}L^osc)Lw(%p9nRp?cQQraIul#oot_NEh&0#)g*zZFm9HxE0AEe$5sdWfWURa
zeliy_<kI@4)xpfXv1#VcZKId3^AHah8FAo~iwL3=(gw8NZ);XetXBV9!eu?u>?L-l
z{G!Fi35M6>)JKMwONj#dm3EkL?}+VRc@y~j{rmi}-Td>GTb83GM)bRUk_D_J?M6~a
zc3-uvLm4p?u_mn54}fb?now2sDg^Lm*8ag}`5(TA>1fG{Q7Fr233SNg;Cr+@%w8a%
zwF7>8fBA1H%VA>&w0#*c;8cwPdd7A5O6~oG>X?UzKg(1FEwGXzhHk-bTG+NsbaZJ*
zsO3OBC09K=cU?eLMa2h>VhfOD+HzTFBhDrv@>q&@0&bVGo?b9?b7m);rhskY4N@;4
z55@^yWN60S3zB*VRs@UBrQF<BL2*H+)M{eX84_lHpfcI5^=IG%ijvg70-fVt&{_BU
z_%S6Z2?5ABGw!Whjx}}*xQUUGk$M^nuLcZsSV<t;7SB{ofrc2|GSJuec}^$xien2P
zOgQ>!{1B)-A5Km~n1_s0%y7l5PnNDe(1DjqfYUD!;#cUmZwT1#p}Oq({U{1e-o;+G
z2$^cs>X#yIy~}O88&tx-8i0W{h`xN4B1Eu`p_t;xX88j<M8tG5`^uFjKj{SF6^ZCA
z^qu0_qMCRkEm@Z{dT+GbawX{*8-|f|nG6XOf83VGld0bJ|LQ1-8nFsW(ZqaNedKh)
zgp6zN8jk<k44PLE$di_%D|baiX@xoJra0HhjwMB>&U1OYacY;|_!t{Y#Ns)Ipt@3o
z;S?KCB1UjV%cm<00$qsLR;)E3fF(%mW_QiSX5Z_Y)0?-}dTC=sT-JYPzGQi66+%g|
zrxY*jD#F1bz{^#_w@E*_iuX-3=@gyJHIecbE=>mH#vN<NvE2G@_xr8uy{;3!N~zjz
z2~Omaeer%MZ%=OIwp3k_$=Ie)4e+RXB#>Pq+Z)|KqO-F&Ovsn0zqexeXDHf+hB2rm
zkok*wLsIpOIb7X}=yTd`aX<hz4$|k;6hs<9C>=jII2g>_#P#$j+4X*X0$SuVR+3aG
z><RuUTMK9M9c1UbJhdF`xRSB=55T+)q5o5GFi9M*ZR1{_FSak*yDT;P?de%4XtIPH
zp+*}iw@!T5vE2KF<nnl~TOSVObU=yM!kolDc@dyP^#)9XB+wJ1nMRnHm_&6NZwqo5
z)AzYxI7FjabcAcNeiVK1fjLa=sn|B%;JutLZA$EsB96XlQKealER&8oqCeHMQ4PN~
zA7kL7sbnUpGNZl^t%b(Kd;zEp#kCSk?#YtT2@4C$=K<o$Tgioq8ds+&XtFM<#`!9V
zT$KC-Wt%)TmLvY#EO%ySn*-q_06GRuD5_W@Z}DDohFt;m+u;3%FF`@^$3TM0j{<L(
zOmO(#)&y&&C)cUr!-fytD<k6}3{xf#t?dAz)&z)bGskV=EK0dhGfJwf53U_lPLj7g
z%N|H6DY=6>HnRsH5-6#C1S@2l>3X!+u**F0ad7^E<=Nl0k>aH-I1cZEjMoD;wwows
zCiI9Ik)@Qt&2XXuwx9_xpbZ~K!&DXO>v44bo*;mBJvmxWo{5TzN{c;rI>afYbZBtw
z*-aF^snd|{`SFnHAuSUd+r@5fh#DqI6Wi~WxR2@M*tJ0qXFG?g=T;X|8JU=#xw#2e
zIc_jh`~Az-r4(=+*=?(E0=Ui9CU$xGay*o_C5R`FqH>b%Z>87n+Y?2_FR|dxCTY{p
z8P&1KXz(m|fr;re>D6g_`)*s>u&w)P?O=*Yx9}ou%VkNNK<S=wqVO}5+DngW{m+lM
zbT_A+3ye%8|NYarcv$>hMVw2NeQ9U8QnS||nN{gxSDdbxm8Dh6uEHD+1RvpApbVfG
zY$WYXd5#Va#Xqy6qe6S<Ad-cvndCuV6_xL-ufMxN&a134yFOmUu0ZAF<SWMBT?Z_R
zI-~|<t<2%GEr}lA$z`5@So_-=mUqCHsJ5m8W7rs&n8|=(LHh5f%Py^}OYU)Tpn-FJ
zMpMR3kuc}<9(<u&6sCVxh6W@AHmBX49kdqPaO2fhhQ=?ZEr5+tN46W8_p37Ac?4uK
zBOrhjxE@)-EGRBOh>RQ@0SyMwCl!aE3>|;iAE**onbB}nHd{Tr6QpgZA&y^}Z*K33
z+1fs`=8i4&xNs@W$jHbI3cAU>NLBnt7ck)Zp`r33{0OO3@9Js+d4`v7F@PFbt7tF7
zG;l3SO|p6elDu+M4BtU96(I1V3ajk=T3H!6IWlpkn!{iDl~2J;vf_gV%p$Y^Zly+2
z1!Sx+_+71jbLB1x398`xKS))Q8U2=-3&Y=maqR#@1f_Glc}4HWhKEJjBgJV#MH%nV
z!1@&bc*FL5B_nZ=NX&;3nSOV{8->83V1%wNG$&NTvxAiG{uF33Xoq?rZ?cciVdtft
zqr>vLkSg!ko2tR1?c}J}#m2QvHvvNMMAag45nAXvWTM&EWPgZ?egB4!dVE7FWxx8Z
z1$w)~pZ_L4>G9#=$RmK$`7M%XJC+}9s(c>DkLe>by*KTnA>}u{G-XxaklfIOgGF67
zxLEV^=cn~i7puPGp~>~0j3dP6c4(bMM(}1`#bLS9p>neNv!8$dbWa^Anzz+FdR4Xm
zF-Wx+11GnvUi}t%(q96c2UJ(1^O2|f_d6)~itb9^vZ@gD^l0*B8i}Qk%zN7!P%D_b
zU!Pq4htQXFVz10H(`caYHpe%b7s4i-$0vs?w5&=>cgLJR*r29QuR2xLf())>po>13
z2FfKj8wh(%qjiyXHh%y9QR(mzcWfuX!g=FRXG6g#OQk@n9cdi7*g3>;wpl$=m#fE?
zX`aW-?JerXm*_?leRMF?|1nTvYhcMu{Z|g2zZe9rw2TZ|TH0&Cp?$8T6adSJky?-?
zw7bDTO;^xDpi;*Ihj|hsA+iDRuNIIM{6BHia!egn81L}DU;ZYOJuq1HEln{)z;^cc
zXKpBf?<fJu0~#4%GK>pv5x@=9{)5~C<`$qdoNMsKHjY=+7*fS7NlHrUfF{mbtLLxt
z-FC{l^IbV-F)^P?00D0ek_O?HSxso0CBOm<(Dyh&7IhCmkFenVN?%)L`|5qQUnG>2
zUD2J!5Ovd1oQa{0G<|u?{w<qJjmMJT_1nT#&U@)#*q4R#%6G{*N}d7uZU|djTTqb}
zg~rYTUOgNIvYp0zhcWNLyF>V5E<{9-7`NGILF)m5s_=U#c0dph#qk7ISXCmg?d(g$
zo}OO-8nxg1RS>d`H_K0cWuc(b5u`~jaO`eB{rch2-$6nd4eQZV{jHIB4&4M5i-$+j
z?murqgMa#b@}kA_^21`RhKSB~VfAEEcmS3bM!mSb!%BLtN3Rc0KD%C7LN_C4XN4WI
z<WFynnnGYP#e9Ot6FX9@L(@C<MmKdS<X%su-99}q3z>Up_$?t<8ZZ>ZKmLtpjqyTr
zjLDaN-*3<)?b_a+{6xxWz$s*7AX4tsoxV55b6N260b$^KDQQ}27h;ZrkRkIxDq%tT
z?=g|p&Ro<Mnjd~HRa}2bes)AA1~I$cdaCU5-{I5H*bm;?-($7dUuJeP%cd#5HLn#E
z;d{O%H2wB=c0|HY>>D3*iaO-;v0hcTQL<_#ZJSQ%=|h0#_NBjr`wVT8RKcP@rGG{A
z`XiAbpi+iJXXE-FENfY-@z=RuU9?;3yXMZr00Sk3fFm7nkD*`mC~RSIQHm5Bi#d3H
z5v!|s*G)Uj$y-!;?&OW2e?!(M11+Nh=y5+yhpIJpW^*$b&PY-gH*Zk{85tRhhV|2d
zE?z2CtI)JJWd#DS)6MJGpS^xf4JZkU(R=n$ZMpf+A44GhnFmP~rv$rk=$D!gi~&As
zJ-xb$3)#kar9Czn!oeX7<Y>Q|8X+8NIE{H-4|6^)oh&$vN9_a5%iu3&n^91p3?n@>
zAUQ@1p5=v5K~f334G+Mi%Q=+0{+E}Rjo>5)2F-UgUog$q98LN{QVlp5i~s;Wyxu0P
zG3B;*bFnL4=f27nWUp%$MQ~cf{(sFKoBOz?+vllNyh@BT&i!G)15?4r-lnj;9EJMq
z?(LztXF$q^eBXPH7kCd3pyq|NOwEidMz}Nx2ITy2!<~^(N>856&1)=afAbii-z0cO
zUw?*@(y=~|Ch;Gn7AKuAR!Bt2yZ-X?)q|!LZa+CxDvZ5t6Z0{fXQQ`BLBAnM*U0tl
ziZxqP4AD!=_Em&eHmyh+G(vQ-v1znXcu<|S=EP>-pr=BAfoVgN8R@A6&;0D|&6{Wi
z4ch&WZ444)J#!{LuKyFMiS)Fh^{>4{5bz+&_gdaXoIi|y3MMRBSpGr!owhW$a0lJM
z-y`RFUDQ<XEe?r~@H^eQ#r03UO`hHCYIqaPxSxG?Rg!<dpwnQ)mFMHbr%IqHyvF$*
z+dTLN<hO%`()$GG4mMQWc~=`9CNmuQX8*G8n@ydLnFW#Z;Pyl;WMfL0_pLdfSr28f
z$t4I-pBS(I-5O?WY^f+N^t^K1VxX59=XWY=<#UjI9n?VdS;9-SUJJ~jDQ?56vI&=<
zdFJfQ$15g3Xj(N@6&?-P&iefPepDqh6I14S&d}OxF4EVuku6%O(VmAn9-F^E?@fBF
z<x-VdjWIaAe-F(xmkxvbK~g0aQ+h?*)UV0CP6p$YLN+JX*0;|778Efwp8hj&csigd
z@TH*YODF-+#qTZqvxBt^B^ep-x;js!Os0!GHa0epsiD(?1|+v$Lb1icbS)K?l-{+2
zR2Xc@4SP<9bMt0y+!csS!1Nqytbm)F<TismBg_({Cd6G^lj#J}o^bVScbLl1XM^O2
z5|w419a_RtN(R^l<|J|O@O*nse?xb`K|A+w0G_XA8ABRm-1D7Y&JTrp&4Z7{B#;Te
zL0rVTNyg2Z<au?e2Ppk1cz{+wZP~5Bc;`#l_wRO0$P4rS9CKNS;2I-zj6|Q6RaI5_
z`aPPPe)3<_4Kr2?d-Xbp`K$V??#op$33E`tr;=Gh(<rmnm-b__3UZ`;So)Jd?*GmJ
zRS0S_=*A6+{&a;I*sD-KgZro{WZGmf6ILa{hdme;1C+SZssIbg{j5fysN2ELP>mb=
zcN*87@s;(WCMM*oTsNgV=@Av@KijQK_b*f$dDUZY|L&{hp%pt;V|9#9p#DcBPuIx_
z_1BlzKJp)~_h#6->5Ba|S|d^qQ}kB_`}hol1yl>8xqVQFzvkan8@@=+=w%arcA1k)
z=2bZA;VwPic88TaIjYa!ZsfL}{cAO%z}~0wxrTjcqr;tdY&=D1G!*%8ZLj~OwepXA
z-&pY*!17cjZ*j=a^L2HIc{xe0GoTx9zw=ew{fM2lCHTTj*mgF3b37M);NUpryJ4xY
zWcCX(=LGBpHV8-0%&Vn<&fe5I2dUviK666A<pPBOE3Gtp6535NtaqbT(KpBi|AnHT
zC(Ve*mAxAiBjqt0=j7a;`Nwq?2HU$QPRT5jU+AJEDAD8bhp(gqqN_7Ah=hm4-A6Ip
zq0jd<e<QgSLa=TYft#Yww{HY+Uj+vjkcKpt&|xAMaJ+G+!Yar(s{AM@(et$R@17uF
z;#X`gYTDYk2}`zz9rshSa^BUHI$K+FMclOPUj+EIB^J7KKr+vgDgs_dk}{)mUjK>n
zhYyT7y{x=$!z2!ZLzw6dMhbqOEe==Gk_EiMzKMxbMtfgzFnn6dPQO0r=<1pTRTbMe
z;}y1h+GX$f9H4*J2sCtYq)Nlc$bIM~!%RgpfY7Y6NV{+tj1mMkPY>?IOH|(-LSfCu
zM){QEI?N9YLmL2rBDq7!7hU#lBn4`+)ST#M3Iu4lg}4CIB#QHOV>*hgxpv@U3*bJ$
z^}NC2GBTf6I-;Mvh5XD2$Xp@X$xglmM8=P!8G!J**G@<)Rq<=TPmU;f&IYL2jeuoV
zf>cjGC^ddLaJd+dizCmDXruNM%~fxLP9e<M33fM`ay0^=YUfNVyYliVbdFci^l>z>
z1x&XELm<QPnyYXLgm&SpkibB)dz6%VX4=ec-{cv5v$I)1r_%=JFLC@E*VLtktge|#
z;y5!gFc=GZMKFZ5wip%?c#D3MW2#A2&-N^L%!~sn35UMxMyYx%k9FDY&zBAskQhRD
z1~oX;+e`RE1u!4C)0GVKT=lbsz+Fz${xTttvjx}c+YdwTOxA?Bt7RA#T(g<k{o&r$
zH>JJ!#(1>UY;2NQ0azoHPaVUjQjvDG@(MEgwayb{t%&W3qNm>XG1KqwTtE7lqw7#r
z)7wa_lX}9@UnGNx3s~<VvA+J4)C+NWdvTw?)8{n8u>`w{K&LG#b>14!WKpD?@CjPu
z$z<aAS6x-5f~asE3ZJaWP7`f*3sThPk(^nwUy_f{>@|(JI=9@o-NkL)i`J?0zJA|H
z*!Bh<{sFcZg}_gGny7QWtzt}Hkt;W}f27xhug+(R_&*o!c+%6qpv{h<G@)#H)zA^$
zus~056)$r7S8acz+-H@)QbVF3YqD<8loIw~KE82Rhu-N%xjPAmmSH~>)`0U;b8+2)
zg;ilQgC0yS_>--FWf7Pdc_mVNEo?eO)%(jYN?tc%ZBYuj5ag=k{ddp}Fg;-6Ls=RV
z8tu%(!eS9#>Rf(@q|M~*n>U}KWAgaz?)=CTlg{rar>8`|4a)bMA4kh8Gu~kclA1$L
z8Yfj4N%XX9Zf>@*watuk%v}BDqn%6gqe#YP?I1<@B?ToZsmm)mq7(HX<AMER*|%}T
zWMpIMSxv|v>SI%_Lqj~@mQM14hl(Tw@+kwK{o)P91VI^?Qgy_|@Tt_&(rSHLGx9HO
z1l5{%bv-)*&G1x~bVHb<d;|wW1*BOo`qwu~&0r99*n8>Z2xKB%iHV6zF%TLWLpt!3
zD40U5O~*{L=-)p)EGsN7J}Y|Wi<J*d*I0HCA8)O3Sc{OzRkvQ`&HK}wkllX+56|@-
zTjP>*5F!bf#MmhFO@sB}Lf|fIR@%`+WBqUlQZ?+s!^4xbbSQwcLqfV&fTWIjgMwf6
ze`D+|!>U}n_TNcJ2?CM=5`u()bT?8Gf+#5|B_$x;AfR+eNtaVVQbIsU0g;wYY3c4}
z51!|J_x|tW*dO*hSj)wN1#{i^eO=dx^Zbq3nHfZu8Wwc;;^K%QjC&6?ib6IhDJta-
zICp{xw(QVLyz|9wY%&P=3ScuCKG|EEI9eU*1iirx;Nh8<-vJ>>a709F4842>xR3`)
z$;hHU$EBaBe%f=lddGJ^L+q=cV?=rR$hQ){6)J*_N#B;>Z+(bT>ygTN-@6=Q#}zAu
ztVP4G_-~T-M1@6p+uZBeE)DkVzW3hOI6|{kc~f<<u4DaJV+xDf?n#k0!D(!b<MvRZ
zp~-Zlm~SgnAKF!?*~->np?0eF?7tziu!6PJoVKV54ezG~!Ms}DNj76;W=)W_h!*xy
z9nVKG*45S7?0nJC?~M3Wd~KrnTkU}Mg5P$|DJdysmo4Gwi}gjG3eR!?{(_<Hl;~IE
z`CprmkP|`<_==YTBEp%upqszq1_zJ9$J7KjTxi(p7POjTpBd2-zka>{6R8wQ11_DR
zfzHmaj?d$?v(z%7Mg=A|U;yh$L8n;&IruVS@$%!xMWzxx_mgIPiMV%xfsNqBfOsBq
zz-qUhY-4DYJ}A-@;p5?Pyqb3Yd&PyZcD42kOw|A3fOrm4Rpu4*T^M|N9|<Mm2552G
z0i>D&_Z<t|jXPJiD-40b;33{q0_BfVoVuW}ut9iOm}l6vv@@3A-v0i+S38J5>p+sJ
z727_z{#2s&2kgie&?bn7ZdF*EdZ#b<Rv-bLpTX4Bl-;)IbRfZ;=~r!twBtp4C7|(T
zji5SH&E0dieD`1Ntra(F)SYCeaI{$mflZXZCbq)ZbZ@gRCKFKc<tc_M7yg)Fbm9!C
z+c}QO>{HwyyxMtxuN}))+-AO<oXr{=pH5$D=eDZDzfEtCU0Ls8G1cx8Y|GLd%YiV|
znBVY@5r}&P+oDGPl8qX+q=l!_I*FgLgNZv$eMlqsm}3;yAC8WH<42gKlXhCPg@qAi
zFs3omsx!x)7?xJiWIMUMHn8HZLCJ)gkZWg0=SVIRd7;;xz3ObGXv%HanG^FKH70K+
zSb0%vd6B<fFZU*_S98VuaZ~Py?%%%!pJvorU<Dbwu5aY9-MaPAT-qjrG_2i}-vTZ;
zd6rr=8#r}VwrV#ys7P|UFC+2(BclFa64RBB3e>}bVC6|5X0KjO8CIyYurdAzqI7iz
zrLV-CWO1$VD>WiIKv~^;0Vu0<b6$TE73}~00U*NmY66s#k8v`!4iVk|(5<dz);dJ9
zdw<c51{Vq;<D%~MH2f8&Px|Gg7@w{sH~q}>Yk3b;Gp{Dj8;+X3fFT)q(rePNbn#by
z`YM^g>v(xjAg*7i*JS$pHbjZme=?h_!JUu>g@;}!VHdLl*`TQHDB$0llNS&oq9WYV
zqlVTF8ej=b`raCeKzxLO6$TD2F0a+q)pr|T@oplv*9N+TH~#$_8h`n<HtapUjxReK
zTdmQCD*yvu=Sp%SP*jf-Z#*w0La6$koqY8)bnp3hkY8fw-Jpb}Bj<M{C7Dsl2D%}P
zdEehgC&$Oi2u@0Ti}A~cA|jp_(@%B8+7xYXAe}TXa!8J&m+}!{F58U(eOsUc1Gi`m
z=%l!%|0FK4xL0hw4~*W*_%&JsmANQzUJWc|_`c3jV~&oA;d1Ip73zbBdLC>u+-s*k
z(1mQ1;kOfV>|x3ntEu@h@g}u3E-4Lpe7GjN0ZM~&Z$-t9gi~@Bi0MN09^&_}9XzIL
z+kkY@yB-QK!60(z9I~p6o3Cbs?@m1dVa7gvAa1^GwYMz#d-Y`ff0K32@Jpy)e*Gw_
zTX7<7d!`kH+T^h0DuXKNwiI(T*R$1_)7yJtHq%}<v%X$i1KC6ULwdu%uGn-EYKnW%
zxe-BeTk9*nzVv#ufo>gUWk=2)Vkna7$p5)o9B=uSU{3d8oI2R{yl@+>0uD@r=!tQ}
zH-`#FWRjE*wOegC$w4gPP^C?MStCxO(#jPs7a+-&Ak9qNb-hD2fHCzEchY*w;Nalf
z+>psa!-o3!u&~aCJHbE|kpj}jWAA;&+xK{Wn{M0>bkh;+!A8j3dumC9A61;ulVq}|
zKn9&`w~fjXVh~P}-<&BBzNe+~qQZ*Dq;pZFd+<K;bg0v}E{o`K2W3!@BB^&>*U3PX
zdHwvxhIhetvq$N_3lNRzF!4_UtPcL_5pwh+D^7R<w&VMjDg3tU5UaBM{qD^AH2-;K
z+ym)Hk5*VqYO|*yp>je<47RcDiE<PcQ|X!%W7|vA?kV_XKAt?eyStqi<Dn)>+jt?*
zftrD)vFPlPdQI+8t#q03LqWqvIz<5#DFj#+p3<D(sry*w78eh1`Kf}zH$&L@3q1nd
zvHGYpAR;qS&1sSxr4Iq@+ND26nEC@WKd9dNt3U8f&XgQ7g!c6fGO|P_m75R@Je_x4
z^$ag*xE#;V%rx2uaf0~Zz`))HY^%-A3tSllyWKg#Xfd6(icBiWPCI>9$rmR}8HX^V
zt)D=86V*@e^?(MH37;vlAdf%u(+hrxmdt-XZqgAY@umn9@AlaD8bXAEs)GH+Y;MMP
zW*#21d!A=y=l$yQb)H91uL+T)U4E|h4r+2g%FTUk3LZXP-M5N(`a22lkRM0M$3W_9
zT7>P%Le+G9&z0%n4~=X_J}z&N#&v^Pe5u^~%q3erAMBjhS3CrC;o8^X4JefYgM+bB
zC48xYcfbIE2K9A#-1M9=3WT4DnRk5*0l>)CcqQu;=qJ?_`=AB-1fKZLp%o|1q_t3U
z$)n&bSA@*lIVq|2sYMMJ%Y=^~N3$v_D$2@@TYt{!e|O4Pb?;>g^x}E-r!flUEeyjc
z17ywsX#b`ly|8q;x(uKgI58DU7Ise7WFu`@+}OCQibWXKIv485U<GPMkQ6RZad4Ep
z$&$>>%=_`*WpRUBJ1{yG<Uj&!92{U%XbZ(zbsNHwXSjXANR0CtAvy7Fqe3ZxEx%YN
z1gv{$n#{zb;)S(=4R5Ft4b#l=Nam{4^ViW3Eh8f(z`gK34<@AFhWw{P99nQ0Aa)oP
zV`pct`|Kos>KzH&Pz&fUU#KMWuDpc6d|N&y<}X4RZmH(Q1myCD$&e0p!zvTvvy7x=
zV5a4*Xj`)ARrha_4DCsKmPkyR{2?^dMxd=F{L+3_IwUs={~?u_RYvY}tGIvvenC}i
z>gCte(tBI8uZxRA4HJuM%{fSSH|xb^CNupNGVP;rWKkdGyz^H_%sT7ShsbajLz5;H
z%%?GM=b-*E3(;M*^BO5+nKvM4gD<o~ZDM9?3m=Sc;o-Pi`OjB1J5LxiI`G9$m+7I=
z(PYD)^Ir$>HSou;wpMg~qN=K=%oHgk4H6XA2>T%{O>bUrFRvaFQqqX^z8p-jg;awy
z`8p7Vc6>gcnNOrL;~70It<m4X{AZNHA|hZ;XJZF_HYiiD5U)V}`$BQ0=y5D#79@(v
zutc&Ugv8Z&5bv7KzonT@^B-X2z<EjkxjZEs;slZfJX;$ZMCO#;2vwVkv#TrFb+#2i
zA@I6OHADPD+RAFx<gNuguNCvTz}AWb@7rZ7nc+E1dE+cfC%d4R{{034$`rOKFgXqa
zG^oL#-m7K{q%>ww<h#O>OiR8O^IJ{7+{n4Qx_W!)pzn(j0UiG>b<3mP-gM-zii%xZ
zi7T7()$vMqbHzF+kp}9ExblxGA(PKjsiww85<fBAA4>|79++)@-wCB~0i76hKGpob
zo{{PE-9H9|BgK=7rLL|d6;^lpL}v}g@wQ2c5YGDdpj)g0N?BlZ&4N@8verfbEkQ&U
z92S-XX3vH7vGQvzJd|Z2jpn6LfuiW2AyYTmdwn#hC`mF{QVI%rE?_MXMG|)>^EHFL
z8=AQfTUuK+WRj0FGZ}UL{YFt|GVX^qL-~MW_H=Gz!xn9(d1hwjX-WO*1Ev^-%pt3+
zffWKu%1%6T&QhB{nf@*S|I#X2;U&j?3>Y1HSmzG=BZj`tNg}Qf-O@`Y1tSae;yhud
zncMbEQ|gz+&}%B?6>h*m7w{5#ub{g-W$1knUk#4eG&sZzLA6|SoTu)Y52dd(Fly{v
z98FUKK6FWSrLaKLC0A5TEEj&7=M_NkLG3Ygc_q?&i(9AQF{`Hi%W|DkpemUerU`z1
zIdQl#=VCkY7Bx63EY^E(KB_DR4U@D*%+0U4Es8S!{(Ye!s{=6MoJ+HYuOZ_GiMR5K
z?|S#>MbsVa{<#!uxrgE&o#6bpb6{v^?qp9ma{l2EGH1x@nNXy)B#X0%_bD%E{?(um
zQ$B{9)AtH?k3=#uvPUH&@boq|HKA~EaRC}It?<6B9f35dnj#?$O$HtUs3FE6)o*)1
zswNIv<}GN(S3ig;)`iv(Ws`?4JlwjS|90(Q^Pt}%W!KFtEyaS`MNiKyFgHU0whSv|
z3S2ts%(4<NQ{L7C8cps{5YNd~PTDnro;aKcZvz6ZfgV)CPFPUGdjuLt*MrreA<%<N
zjGA1ZP9K}T2*3$91`CDq^;E6UO1zdqQ~tBuMbu?X#G4wgO*l5+LhWJ>b|gxecT=9x
z#)VYRAAZF<*T+SCP?(n@W<`OHtk6;MEx_|vSRfgzD#_a)W<S{7TOzX^`>ruruP^ek
z%Y2*kCJgiGqZiiwW_;%I;z>c>_L%3^UEPy$YqP}84r=XKIjDd%TV!|<*V&#u%qabn
ziSa%v{rk$?T;8kkPa#F>`DJV`PUG_m3)kDeJ2?seO$RY1KCr4B!y+Pr02bEzQVM$b
ztf$jEAYcaJIOqay9Bobag3H4nw{cFmXEt`kp&yR%YxN9Vll8wpj+_xZR%2KBxSB(2
z=&T}D*K>WW`aiWF!5&X|e0mB%4?z);9AIO}%C=rtY%?-wNI48}5ii!bwManIJ$d7g
z7&EiNmytCQS$TOoSaVEp5ko-FbVwVxuyWv04!JWM;z?Zpbm1Mb4tUzbuN(qMh>1;s
zxc(g=MngR>XX)S{1#CwDaIv$i91zD(A3^-$;S3>G844N(FQ7J7@euU#kv5w%Gk)-&
z++jveOOz<Tp%SQo&#ol{y1L`7r(Q<@r>?;KlU3X><l&XmH`d-JAML#wmoHOvSj?$~
z>W=``gMzA3KtP??91)Qj>$JD)3rU&4(U-j6wF?ZvPIs`spDMUju6lHSJfQkou~NAG
zmz;5QJ3~5HS1R+Kf58U0mzkylJ4oUk;cz>f+BrIM<zQpm2O?O-r%!=1#)c125rF);
zhNoD3)$Tz(PF1(6;4gyM`5|<ls1`Rj4aSJ!f2`9O{*@uv0f{Age|m$t$5YV~Q<3HL
zaKn0IWQs!2J`)rwX-_agk@ez*$moPfrsV*Esf9%joKOicLXrJ;$in;6&yRBlB31_T
z2Yv!i1f(Lkcev3(&b$WM#W38wCn-?Teh;H{AlO3YSqa|(3+fIk#kGs`6?h<!Po7Y_
z$VXC<ph&`@V$*HD`2k|PHdq<H!%La)M=QL?27_9+ojTZ==SRPqWFQ)0mvq>flZCf%
zep>tB1*~Fh{U0vgKj3eI_A>~OpEaF&HLM0Vt;!K<o_9as$|49P0AZ+Fy8KfIuG_bX
zz{G|F&OLqi8lh?jlcJ7SPPF(-6y?_k**^4X!{5~P{B5oAf07j~mBSL-GFhXM5Fa0J
zirj$-6yK?ZonED@F?)g21rr_!2B^#jK7SBoP;xC!xjf%fwWk^(N5D=bO2Kbatwc+(
zko)PA@|QL8z~~)_7H?BV$g$~GV1c+x9&lbQVEBY7T4Q?;Mn!vb01u}jQZrq&CIV42
z5q8ke=*&!7P~Kdt$G|fM3Ew+VJb+s4`l!)E#y#xm>{QCLONKquyzX$^x?B!iXAyD%
z@aShlV_Cb*G-RvBaf$Ss<p2hNAHa@<(dLl9zS9D0fFrL7)EkzKd*_MZ@}dHJ6DONa
zS#_uuf$_$;b0k<>4E`-G2`DoY`=ll$m^;5WrKC)WhfOFQ?t=Uo1bapZAW@xzTZs=6
zbk?<$7$zp~eOM@L@rt?l6ufzREg?jNP-=!w_7v=tQ--R4e>g|nD`ZW+AEy`=@9zG@
z<?`|+nS5I+yw@8QcGJ`=ckZYqBmnpda3zt7GTFp2<vfoYoI<dW{T`IcFNCl!*PGk%
z4m`Z86_Il-w?jtd6xW8jVEhj#*YUq<vlWAZb$xc0P8@JJz;VQ)yB4xMf53NodTNCL
z7@KUV+s?}!P#)80CAvVZrWFpzSn%4|!{gM_*2V-;h0rI^zijX9Bn^Tug~o2O+SrHs
zMvA)b){{-B<7L6)2>N^YfYA{_K|!x3tGP6b^+MowoPS73IeQ*61b565U@TMAd{)F@
z;@^hm)3xJ<MihK-$FN31gq>FdAvr75|1s<Zi<$-s?^<PTL{M6&^~31w?X}C+duS+V
zHOTx_K>-UIpjmx!I``=5*${v{`X-a5X4DbKa_xvIi4s4}%Z24K0_#NLh2zYpPYe<8
zDLx1j^xmxW%f3KB<e0$E#IzI!^>-C96}8rdxR&AJLmzPHbfID3+TY=~A=lH_ci3B0
zVKb;b{;XMWHx};o<&}7QYE!hU_m;ug>yrA_ZJ<aP)<G##qSvrgl8TrdE2lm1_}J~c
zb0_IQ!hNNB@CYCG7wfC%^nEnQFo9+7vN2s{{kz{xLb8OlIX=u6vIc^N%WonOlUG@T
z5bRFDK&OL01dZqjXx@2Uo-AEI+rR+<L;#~|Ive!Nk5H}^44`W+=kFNy-CbyZ0`V`X
zEc=xhK4<~i&f}~5-s0{<{qKUd&=x`X)%A87iM6`2!5PW|UOQV+5Tz<G+y*k$PdNJ}
zF7}B^)R>3GAAR_Q6C`c^Rl5|DCb%#7h09UU@?PhF>@)zpY#*-M70|B5T<`mzRWj#(
z*$fLk7-oC{g(w2Vc73qkwv-tMMsR}Ova+xwU4RDqNgCL7X&*em0oTrL-q(|E!hRVA
z<QdE3iyh4D>|!4i6VG^hB?@tGpuU6=w6}(hKT{7Bnsax4HuSx4_J<9U23874Qgs1%
zRUfu=q8b(&+ELW!Mg4pz?#*OGM7f24wU{ZE#Ce1OF3@+2N)kA(K0VLh$DkX8xqjZ=
ziG~k7@;zO>CzE(~!3Graw`+0Y;IRc<>!cZ4-@+GlxQwwVHDmY}I#0jiR3;Uy@`6cW
zw{pbb8T3B5q3hxR0t@Jqz<9k%3Wy-d;Ci4SAY_WqSX0c6i0J+VHfB08vAa;}6oDGd
zE)-;4p)ef<DHuB_s17_}&`tfwZ;AkoM^n?Ikkw+sl~@(A9%kzYxgkOlqMnSDlmd5(
z?k|>eg0~Qm^ztFLe=A3L>2@zY{a<E5gVY|4NhuVmNN+;HCjfK}j-YXIGccGscyM*~
zb7aKz3eve-jEsz-bMx~keg(Zvco+dO1ZwBj+=^Ckva3246<qGZ5~mjs7y(*KeZ2bj
z2OytayK|4OS2Wa~9r;cRTS&aYamipW@@{M$x5+!p<GiQk>`>!pj@ed!@xou0k*F<A
zi2llFyaGcwV0QbLhZ9xF?WUjBc3pnOis)<om7aNa=s=%6N$EDf)8;TH+G_%AC)g1n
zB!prx9Py{FQ||Hz1WphtT!;kS97=NXQ3W>Ac{sYjda#B90>%;vm-W$OpoKI}PfLUY
z_)%B%`<t&8ZyBSCeTc3z?=NhJURAIe`H@@{r!(;I@Q^j)Lffd42DnD=!MbW!4meT*
z>A+r(@*Pq9^09N}XA1wp%ll3nv9C?lohd8k2NUdW5G{VWXLWmNetu5}vU^rCzv5i?
zcBVi!Lag8K@qJ6KT0Us-ihI1e)iME(-sNLx<?tipJco()Mdb)l8_gA;$rHUX)s&HO
znzkJHQ)_34x#fol>oJ`(>B(RsbKQ)a6n0TA<RQPc^_e%Pex<9ULzswo*>nHj?1d*L
z|1JiCA$Kt|PsX`Id=Uo$>P%b&E*OZL!FE)?7qgPD=YruU#c=xunx9+__9%!_%>mkx
z8v>VYGZ~r|s*j&MnM#J!7YhM_bqFl(>4n9`C*56LdXJ0jX;j$`!>jj177+JXNj-hW
zD={(zGrl5zfnwBYYaqAR3E|$G4fOvm(3E%W)sC8SKZR}9Jc<TBKgOgegmr#U`jX4S
z`lz6lwwo@{%g{I>U8C8QTdd?@V)GWYXtlxFNM*C8;=uHM(`J7fUmJI~p$9ZK+iD2>
zaFG2kVZU26=btXNTln(eal4K;f>u!Qqc~`<;`%LgMFjzYm{(F#@&im@w|76r&BkD(
z`H2KZb0VDO+_-so64A5`RPN}a7zI_Xe9>FKL$Dp_D^$DpI}LFh+M1rh1PMVdBGu#8
zJC*5D<7N#Ahm$;jpEV6_tNryINNUKhBm)kv+V`{v58XM!&qT9nhjyADp*f#yiDp31
z&D5*37DM=F#9@<Vbxib}?K#__UQqB=PzsbkHsJJo!O`8(@v@H<E{0nZVd=9*qw}ks
z+Rs_=gK>ZP3IHd>`6{n>86mCU<c+VFDE@zxunk4KzgHN3><iHl;gHz+e^<_v7A0(<
znGJ#7bz<3jhfw6k&_KUZ_3!DCIu*0Hs3jD{d5#YHgIuB+cQwVBXPLDQOc_3h6>T?n
z=<p{0?UINh(`YVM!oQ4i(re1b4_oo>F?27WdNn@d#YCVq-4%<n+gj}V(d!`&go8=E
zSR{Yw)5s@1DvC;Bn<@M6?(PH~$BVbNJdwgvz)YVbLZE&{O#fy5oU5I00#{5`bgkAU
zVU;?zH?N)X_Zbsqp}i|N9{Np$ni^X;YvzG22m54-OlQzfK185LtQqM)hi~H@dVUYz
zglvl-YNuW%5ht2>d)fqYtgz1ApmbMkB~35JY(){leyG=xeLz9FwY4^7zBM#Cm8)6*
z{;)ehlAWqCB`f$8!ITgse`bD}S$k(jX!PJks1ISJs<&g{aWn=>@#a^+ukGx^m}5~3
z>A9gClj$pagD5Qd+r|;?R<kNoSXNZKP2o2>0}ZBpzSWL3{zFdL9yAN=xm0d5PXF!6
zvM%IPH-7!`-iOEX<G*cFfYL~<t-N@ba4Nfg`k{Vb*^81(7gCk<#x8oBvu{Nx5|`&n
zzS6&q6j=;2ME8hkrY1OR8nhW0x(y83Tb?}$B3P9AMG%@NoS}!lG`F{skSip|gTE`1
z^$O>0THs4-Jrs7Ms9PBGt*{**J=fIKJX*?M+1U6?2ayK1$d4`~ou_AWVb!0MEwq)f
z>?o?SB<pY!^qBR0H+<@u1c@|#Plow(?#y&CY76qPrQV^kc-v}&!AHrt74^*TX#hWA
z(;AAKjwdb`iA}A;<twz8&y71fN~YV{*gThx(^9kT@wu7m5!P!a=ue6~@KX-Y;}0&j
z#?jN&dF@NF?}%{r*frNbOJW^fBSJLxX;N^{_IO`e)L?DCISDoNJ?R_hY<*`>Mix-6
zJwwJRDQI!3UBZ!2qH}Aea=e~qRqAIl2470$Wl7kjuCxEn@}lYoBfqhM+$6WYk<LIz
z2@gB-Jj|L8(W>)noLX<qH%E^S=8)Z<`;@QR5=n3l#>+kzTxplnR=A7EJ`XJUWYqRN
zdmyfnA-dBeP+nyDR|J2FL6xPjAI<8)sr;43q1)xkG$Xd`U{Po8XYDt|{<>X$t<O)0
zNO_pAwk^)`eG!e%?y#ZAZp|;1xc^)F_f5Zkzd*=%bAf<u)U68LV%3`M4lGp;h)VUI
zJn3<?9fQ+(B?G7$+jj;IQ2Yd_FTOLvU74^@(E=f$Hw!X7D*eJ8QmxLH_h%$5OA$iM
z`0G?S2>t^x@*4}Z(v5|!(LQxEtDD##J5inq84aVDvl|U(F$>(~wDeziG{YP}B%*~u
zVsD4(@oo2gN)FW)9=7Af#x{VdA{ph-$jvl#S!B<CGamay@Ec!6ycI`qW+K;S4~<cL
zu5ZZY_h<cNh*McXYAdq2f4vfqoDy?+JAN1wy{tK4b#o>iw7OfSF3>oZTiN(C$69~7
zig0e;b?G5tV!>WSZT_D*MmCbrPoh$XcOKm-sp$GBnx1knmPms}{=%B~_uYYpv)8hw
zx%^q1?mwpJ&5$QEfjDE)k!dr;RKJ!oE+ZAta%LB92d{^v#JIQ%tV~)}+iZ}wS103Y
zmQt=v<|_TL^}n1lh})fU$LV;necD;aW#P#Uafsah%A{j^9Ch51yIKc5Pf7LpLVRHQ
z<NN!ed@=c?cfY&VJI=q!JDJLO#dElZj+$Dcz9>8`TE<U&JimfVMfWL5gw66jS#v|D
z>1@f1TR-w~%9+;3x1mW7fgh1y{yNuBqgrz45sA9SIs-Q})q+b0%Dfw>Gb!MK$0<Kh
zfjxgoqp09ZW_Da;-8E!koEK7&6}-$o5TLO}_T|C1M|_#k%2Lw?b8if&ddjFYr7sNv
z;-kOL*J-|+<VGlz{`@35T#+mAg0$oXr;meMGsd4+5rQ6Kc%)%>NFzOo+vkjCyOsxj
zl5ni#&b>zqnPEF0sk9Ui3E4H#1#3;(QvP#B(!Au;n(AJPKI!eLX!~X5NmgU(1ye6^
zecO1(t1U;1{?$wK+0`yj_P*T19L&QvnHVHpvh9E3QeyOM<kAhW@3dDc#^%1-T$@K$
zmu}=dC(F`Zc(}lzj)HkpHR$;ryH^C`N_u@91>c;;nb+G~SHv2*O!iD)4piVzzBr*f
zSQjSNlkl5M<(<pa`q_LR>*81B&#Ihp>6~H7k0}exB%P^HH6jhac-@|8a4&0S_M~u>
z&3qXbqw%NI!#Sx}tyf*8A5}sZn<YGMHpYM7rOr^T3j7hvyuGMqHSCXAn#XyCT*2O>
zHPJmvBA3PP5$om)wQp+Vk65>{9m4)Sesb#rZ7y}%RO82yTvmXWR7nL!TWXwTUfgXC
zgI@2s;gFM)lg%WY)b8fxHDNG(32I+6?&7Ks;?tFsl+N^!>d5n|e-{Ap&`e>o<^>Mk
zlT^W-M%`GAZq$8BsMv%+P=|(qFgpl{-4m<zDFDb5dD#*ifjGAsfEgD)^BfK5*W=L8
z5#X#rfx1%>zZk?(q&`qgk3d;C|2wjr@w)WGMH;dwvkD>k#v7kBLq4%$`}UF8*S#e;
z!Vr5}y&Y_9eNF^~+la=eSg9MI66@3d{A{RDj=In)@BQ^}z#~X{{>?HM;>pz)+Q$Rf
z)6^5+59aH;EpRO(y~zg55!(6|bg&T83)TlO|Fmx-dc_WZH3o>EQyMm4X$nZoAUBss
zB<U_JJK_ZHb_E?heHlkv{ya)Fjoj>>t0_|p*l^ocBg-UJgz93;2cHo1t+CS_%&ICP
z1Brxj&wl1Fx0LZdd69P?-T8_A%JMRCA;%M<FN$F^3wI*xOK@9$q8R_lt7K-Ykx6kA
zir#lj;jA*`AzoVgX@n6xtd=dX+G!;kg?fH^xsKn4?p8CViA$PUdxJgsMz&Vsp`gnp
zYH{l%+SRL4#6NdalDNe+l?3Ml;VjZygM}r-ezPpe81!PnKT*AgvqCODMPXu$PIO@H
zo8R1*<KZRqd8^c{z`XFLA4ixF!SBu-@H7atGaY+-d#d>4oV0~dy9tGEJt(uO#5{;~
zi})LRdpTyn;@>O+2<NS}wFz5jzZ|U4v;J%l&fh~+%PYBK@08{Usj^gx+KwaDSs<6)
zpQP7;ALPBw8^czl$-1+<dp(vKHlYe#cHpF5i>cC=jKML;QU4+$FeUfe+>-bF!DIbo
zC<_8`9vzf*V6Z9~nLpl{k8gmd(5w2D(5Ajb1dO7{0_R7m`o$4tp~bJ4vy127eAbXc
z&*Y6ymtQsX`cB=wYp5`SCi#&viL=;~$d@UI{HA~*CUe?eVOtpc=cAuu?crit{i?p)
zUr12vsNM#=4d!KO59PaZyVc`T7LCHLj~}o!YszsmC@3H{jqQ_R;5;3|UR^=DAk1lq
zeDfetS@X9{tnCZWlLr30M3pP4X4~}^s?ZXuAl>zwjsXbruKT|gAD5+8dkOqdF!`uq
z!OhZRp3Cr^@AXt?&2r=9+h0Ti0=NChUh(5~Ryo^QIPwW0!*j2wo7`_#D#n|CYgDoz
z9Aiq;4U0OH&93-_@F2pBkK}O|ZZ~@ur%kR*6>d)bl8J_@j`&$iO80xKe&q+*RftiI
zix<(9mOC*4-RvKo6?!|GP8%LpdQ?mgG^FiLHk&U#h+&l`Jm5{6NO6yL;eXQ}HQnXL
zS7<VT!7aXa8_Vu(kt}-JAgX+W<hC3h`^Z|n!&Q_LIv4rXO|XS}2n!4U>P{E?(FB`9
zsYNe!-jG${i>h1T-e`o50aU<u00_<kJNnQjaJbrWz^kpQs#;<#<%}wcA$gv+c@J?6
zOyX?ctIKQH#MQDLsdR9Xx|N%5!2Nhd@P%&cDJOtMFfHvaRJ*RH7}}NzMiQBunMonl
zvqmzdv@c-{%v7C-$HD3iMV3e!iOA(AgyekHl$%p^H_OLtG(7fpccVdIUmt*Be8AC=
z3C>8U+JmJ_5V|P_n*-RpS$zQCrDh$xV#Q$n=4Wurksed-$Wp*wZHcpR%4M#zl(UQk
zp|@^k7`{avd>pQxS{?65TOTc+*hf}-qxj)197*P&o)*Vj?Rn)U+^Q_Z`r<#UrFMKa
zn$OQ4$Ptbo7{0^i!atvQ=XTos5`)cLFnk=Bt*nUWZW?80q&KhiFQtoj^)Kl)1b=4t
z1PXCrv>x?J7huU5cyNECsmcDHp;1VRWzTD9c1)Wem@tGa5SU+cceKD8t#?kTV=Lu(
ze45{&_+ZZTb%gHCj(^4b1<n&x6>@CFO1XLkQ{LyxvrknhT)(N-9g;bDpy8U+*6Isr
zvprWt4|FBKc`W6?5<K?7chkjc^JJo3I>7tycod27Jug?assuls_f7iuzIqLWxFVFj
zzJ;B0zLoXwncXxc@#`5mD#o(q+4mk~dP_1ZcPfkSUZQ{5Dvzh<6%Z6C5a7X&Ij9q7
zs{b}e)l<7xWVVVXAz?@K?<w!I=TMd9hH}Rdw0J4Nzej*j)6{$iYyx9w4whDWp9_sO
z`1-0TQg&rX_zL(%@>#m94qE;J8)ozX)bkhQ8I@2ap%usqtx^VXb_@ayFf}%|8Ljl1
z(l0F{@`Dl79v11tMvsyGOZ`krF#m!8HUBxzf25h~9!YGG^D-cNZ-KbtYo?h}*Y*yG
z81d{+_bt^FjjgT2u1BH%{eBJlL9{vCwsyKcv_L&$^fZP4<LojPV7aIyE=z}08Dp<2
zMPR#@2grza*5wbp>!YCsEuAsvR$LCk-&LDDrlsxKGjIF{1V)?qYxua@hnKY6?h341
zy(8(#7>HOo-h-#VWsZFeMM<zYkK9c;*}@gjQI*$*#L<Nm=|8-QW145F{PK9IrOaWp
z^vY>56z>#WktKEAl#XbV;iN>&jeh>e#wmKoGeMS?ETS!!FOI~<FMQh<glN3~SpIGq
zd-Kp3GyJi9V~Uen3WFMsSWJA3e~FJsbp9}fd@Jc-ul5vcwwdv3(^0LP5<-UuWP2M<
z?YW(Sfdkl-E+pPxjqdc3hnFzKtEuP<V|cO|?Eb|^o1zjC&9b!DB2#)28fH-RaMbJg
z-BOOgBUHp=omS@OmO?iz#7#JUEjbL!pwSR6OHIC$<?|itHbB)+y1jY$a^I3>-zpRH
zgjpzqRJ^W<J0RJ)y0%)Lx$@&9W3FZ=3zG|aV|1R+u3sJP`9I@iR^G7DlcGXJw8_a#
zu9GY<v^l^i$Zvx8+1FgPD7`wV>2QC|gY_*6kTg9fU`O+;{{H<QH}`EY)V4u~jP=NJ
ztn5BB5;|8+@U-m$!sXY<=Q|*WfxYV8Lt|rO#t@loblPVR;&<V$XOFCbfPHIu`4xa~
zxS}ZdI-q3UN?W9va>+(m2zs7h58@T$!K%E-LiM0aLq;YrMYG@^N}PB%@hz&hEC^Ku
z-yAaDO0ULpesb?~oe(w5<`8_d@cWrzIrLO#ws-afeJ}X?xBfPX3{1(u)U8`I;$1lV
z)3&9_H8G@9DxWBqj&52pZt~H{*aX~ddN0y_v6>sGfX~g(*s$4W5GDI{*HW)qWbDn^
z>*a!gi8JE^pH>URw&HUWy*k5S)+3y6EhK-cExPqSVLtVH+4;fsz0=L@gO+5mB`GYI
z7aD!)iWBc|7`47*lE?Kp^{vv+uxHTxi;wUSC>I;#|2@`FtN<=ZUgY$)!<)@1AKDE;
zEDOJ$7WyiMfH(3Isr61Ta{DQ#qgdU(=jnUVsk~m1<?g5u<_LNbZNNNp!j0BCbj<6l
z_fVxmjvjo$BBvknG}fwmiIhH-U||RUh%K7<VipDj9n2~1L*Ml@XSe6_6Th~E*2ex;
z+uaVHK|y_N&zyzM4upJS2=CqerDN2Y)l*4XWv$gF!#wR(Xz8#6X&qc&h<Pra(eGje
z+n`=d)$gAdTbGz_ObI!fZtit;@kkmApQ>tqpiam;Lic;;B6AX%=#~;qhfS94?D*vj
z?`7ktv6ybCpgtWV`*c7z&)IBjv5HJviEPA;($a5d$rL(j0TdhNhCT{@1;op4u3Oo^
zB!k;2d;)_5dp?Dz-VOSwRE_a)mV%_(8Iiwti|)zgelE%0&8pWI|8U!kq?}ne+}tjU
z)D$yxb#xA{yS^u&+?e3C9>zte37d3JPt$<CMh5%_*D4(#CN8AM^*?CaUtC&}m}u~A
zFo7qs6Lj03hJXO1n$s5z9gRpc9qkt{l&&RD@PLy+7ob@T3WPM0%C;R>AkLbfX__;i
zQ(0&QPBge_oNB;Jd=D|m$f0?%_z(1d)x;kVSx@jDd)$6aJswqW@+-j1T0(agz9Q(g
z$w;hDM=gfa2A^@k^r4adh5TPeLk02-{it1Qvs>KrIgtnG?`j$B<!+%8&KOzvOI%I<
ztFi7)r)1ZYSrbgS;Ae{`9h#|HDjIh@$dSmsfz@_kWrK!zNf%J*8&r;1tm~1hbi7}N
ziY6yArrUF|xOZfOdQLglUxcY$b@j{aF~zqOFEz(^iMfrMf?))D2lFfua;prQ+K*@)
z3IAAU_N@|TSju=MU`W@HyXM>;{Kg`vIbq8f7#(TAJ>(kZ>ok;ibF_9HSCg%V<wMHj
zSnF&@dVecn&(I6R6WW-*?6GI^%(v;E<cP<jOS5z(*J3*I_*ciihr+yQD%<@|GA~;p
zv&FYoZEo&F_g+tRSSpr(AFif4CrE65*~~HRJy@aSNJ8;lSLKk=R0qAtU8cgVt<+EI
z8GqQHi5OhVgT7Q83w+IYn2oY`Sb`-H1fSjHOwReRifWgO>)wa?oS2;*5w65V>F#Vl
ze+23a7(=i%3l-`%K#_L6$D{mwIv2)4jsRE7KNuqsyAN>Gf99s9;e%@j#-As*Z%Y?n
z>r_^>iuEkVzdKv!gCxMh)|MTn<;tZ!$qfk&<pzJ&pb)_5DH>zPou&((Kj6eI|1&gn
z@B`Y$=5{Y}H7`yNG!WVPdU~rP6`tGi7%!M*0KyZh{*zA04VUHynw|B1Ha0ecPF%2Q
zq6UQk!%DodthAyc5Q)5RS9<v{U}(@kygb3E`{U7Sh}deibc#LM(frMA+lgU9)chLr
zuH1`rOk5{<$urHC=CL=sWg3)Byv_`U?{oVrKcCyXQFsrx_@BSw;x#TT(8G(&sU}Yd
zFa5Y~cyD02JlRI(83{J=+p$M1@j4HPPuO4Ze!FQi@^)oxjOHbZ{lTHPSLN!AN@UK~
zjg(O_ZBdhL+4<+9CV#enhD!l*CtX(ip!A`?-zVbMDTmu*{C=nHvMr{L!782d>3^`t
zTV(v+I7r0}pT7E5UhcTP|61Gb;@ia^vVU_re`uJ0Klzod;ydK%?7Wd09c`bFVO}(Q
zV)BCu=B6ox&Ql)VYaYgRdBY{>Ec{FPj`>)@1g8=r*xL!;`JYv+)4@0L?Wc)ynw)uG
zHwMM<(Do;N7|$Ok{?aUq5+1HJ_!zfGXO)Co!TVN&w6CCby~#U{B4sp|$+I|@1;b@8
zHY_Oc&s!Na9ub?#ZzYm18%ZxeG&P%0KyK3%7`+G^1`Ri~>Rds@%Y=ZoxHu0vZX(M1
zmv)<m+s(u(Snh`l?L=)La?nPJj;}33iAJM6a5g7MNM?ywJouaP<-I!3zqvW}2L5R>
zEOa?(EG#-8G*$z!1*2{RFQ(1$PnTlIFnya*?^ro>cxeMAX$c1N?gB&!ZvF%D6F1sV
z(vAK7x8Z%XLFz|Kyj!qxAx6mdHpt>i``)`gzZ~ClKNEZ$r>OoN+Z?CDu_&*H-b069
zElR|-g{<spPJZZrpZ)9i@aN|u;ocji-}D~c)z&D+rGLLwmFgjAuBt}tFHRHiqbghO
z*0k2ZaYMGH<>yJqgI{>o%Qp!ex88RBEvGgbq!&Kr@)>stzWM!PS@mw%W7V=(S^3GW
zk)c6I>Ha(|p3Yb*=E8-!UvWG?6(3qn)`iS5Amfr#LMWc)Wa+9@M*gkcs5109UoY<^
zzJtx8(BbKa8gdi&jeuy4tB(FBvjW@Nf-k*5wXK+Wp)*=;$$~4)-hVq(%t~F3nr&V0
z^`OkN-ZwR9?;=Q3lA70JQM?&cxhuCdlE@4faQX?|Hy@zlgk6jexM4WI$WwlhTca$R
zpO|qoz4iXQqTAfJ+$7%i&IB9J4{<!-3@3!Oy&2{@JCvWAB~L|~V);e3222iRO3K^G
zbGO7L1&~<cw346Bw~q>)ZJO?<a8<<0o*mZRH*)^1WsOHT#=GTw*k>)n<gQ|{=c``c
zvVN|!>lT~**o}o_VC}W%$z~%o#El>Cf9a6g9I{N<x&^EU(WkfTzHo<X_?xSPzQ+c%
zE;j)u1c53&zc{tONkd?KJjuiN@8*C@cf9#ytI>f9ltf8tX`dAs`hg59ecpsg<7cKL
z>U~NK{Lkanf)XQ3%Mg&`ajSqC2NZKFR}zs(->4?ka88P7PZ#Q81AhZM$@y*G)7r^1
zN^hI?zCW1w88-|)wcb{g&TS3)<>4kzcBp*B_pZN@p5C%Ic>Wgtjov^+W@?P2Av(i!
z>p^ECfzzJ&W}q0a0e<9ov;DF7y#VpzuZ&2w`YH<gpV?~_R?FI$a-?xQjc>LehKIj0
z%#BafNSpf|k20KLi13Ni$aiIW(tym#-ETfm?fRxKQuR!me<dh<nOU^nSL5#aO#6X|
z!|6z9BxomV2Pz%uajEz4_GN3_DE29F%GB-uy}OOSw>yr)DfHG^Z1@i`Lf9jCzAMZ5
zv_jQTAp|3pAO90Gn(A%m8k*Ok0-%Ie48%#cHV!Rz)t|t4<Bu}Y`z~NUG*M?x&}PzS
zwtaL<VkgM;?iy(zfqLv8@vLPhi{7`tlJ^`@o<tSI+ETdcrVQnOizzLYNyaj=AtD(Q
zb>GOZxwN1cesWfuaf7*mQy3q=*Z2NyL37YQr$8553?a=D1YFbC;}wrv%Gh8?X*hRM
zINq&W{Pt9d#UpEN&vWw!R?@Gv@##%Q%qb3#hhJyjz@d?bF>CqH=Rmbg8@LQsGa?_=
z+Q$L1Uo)GT_7+iSGe2H^s6j;pn)iSDd~2cLdfl>KJW;us$wh(r&1%YC0P!k+CwAOM
zCSCL5X{YAKp?w^Vj-s!zAl0AJU|zFDJ)|qOrBD;{rl4cy)e0%w<2Feaq}kuM62GHk
z3X1rn28JxgUl*+g%V*TM*oF5gq@kmJ$R7ThVmP7~Kk2Q%>q2WG{X)>CDmGE3GSn~p
zUg~3o&W7id-Rshi8pf<6&+ijr2WD0X5;7zIEJx@d8N1pN@;=j;yWT`+_$FNUBI<({
zzJbf;+BO_3=@tW+h;7jn@jN@FMe)b&SEo`ohxmMV1*EWxD=0*_;ztas#OY&~y%85F
z!qKk-axZuz2(~+Awztp2m?K_t;g)Z!SSHAQMaYcIh*TkXePbs`si;!1X=A55ukHts
zq{|8X3~WtRxzIySt7b1DM(caz;$Dr`wufS?ARVtFaX7f1`F3ij2lI}jAt-oXN#^9_
zNU?Yqt^bHw*%vp^eUo)B7B4fF#pCIneb1SphcnB{-?19Ab!{Elc`8%9Y><8Bk_Th^
zV4IzK5_|BO&(L+&BE727Xy<%u_jt#|M+c3XnmWCM>k=>7tKT@C%;@+5SZ4q8axW)9
z_><`FP;}h_KK=0Ms#Z>~^=@)4V@dn<ABz*YI%$V5ctm0nC~MC@(;!e`M~NL-;QOCH
zu59t^!=hny$@OaqubGk!e$#(mQ${;5Am=|XjIjTH{r!6ZZIBoL_f`3R(BAC!|9*G6
z)eQar{k7Vrx&L{0vv{QV|MRjd1=9KdyaHOUaopFh|Igodesn#CKKlQ8m)CFh|M=Da
z|9}3T;afzWJtG3SpW1$}@}r7cn)rXO%YQGAU52^yINuJ<)hlMC?*y78?f?13+Qo*A
zCRf7Uj}%BJhCsnxzNY`Y<7Z+&1z3hZM)R{y=kt^tAxG00c}H<Cc`(9RZ+#}2m>c0l
zvD1siqzz=dkItibX(+{Vv1mKl1CAfu{R7(@);bS#-Ni7<Tv3K;jC)odzWO(TlK5!O
z;ly0<was!^Z*EtBT#me)-0e+6vC1p<@ey0lQ_BO#aS`a*ODN|zX1oC!R}Ag*6N~_3
z4&=VMZN;?ZV{^rp?57lU#wSCb`&9^umz{648HsL+SURtVvL3B)@UgMFvrzPAtd+F?
z*s2$irX^s*K;-lt16P{t(v9f*gLo?}<nyOx(>P%FcS$<c2aB~f!dWr>*9}a}5x#$7
z>B$a9oBDu*)rVQN=TE_Yq#D;B;Z=102v?I{dNpd}@1@NVz9+LXmozvvJJ&Zh+Q33;
ziBR*GlmwL|sx+2jNs3$!*99mYyOsI0>=er(6?eV!&Vk+cqIlCca{e{|<IW3Mb0KQO
ze`jp2aU>Kup8&(CGKyDu01Ju#l$kgZw>i2){8@dsu}%Uh2?_Gu`}b$VnS_oE=sbdv
z+=xa_)6bQa2R$Hs2<|^p@?olE1m9g)r#-?DEfe7bC*-7N?3Tc*KQqPJY%U~N=nMb6
z)%zSH=kuQAD!GBP7kS3ayxd<;!m1f)b8<j7P0Eh>HpbOIU6+<YE=-dhi@8lIHW4Fo
zUhPxg+<Dft^s3w7p6rhHuc{`!11fQ^;|~DTn*cDhIVi?AVDf0eQ|NrVoGj-=bvX;)
z6>wbaa>b&9S$*<W*?;TrTTc9LKKT*SJk>g)<f^(pnrixyrG-*r{dw<~{9Ha#n|g8V
zMh-q^RtHB%Yv>j%gAP9e@u$M_*#iPBgX2_#k`W27<85@`d;vUv$<kwxYWKvc?=Sb6
zaQO+mEM-Q9LY~=gotgd4u!M+;O3x~9b#O*3)^emcEqrLL?I!tWksHZ5$DeNTpjre;
z&-Q{=^H1%@*(KCZ$i+N(fByVQktXQyGC&cT4Eg9}ka}`Y#+@tKfT1{o_u@Vg#o<?`
znW+;E?~GbfA4Eih+jAG1I}zhwP2R)w)Mgy;7Y4V!g!ydn!HJ6oGep5iHT~(`nprof
zLs>ySdaOv_$%zZqTa6;dX3k=OVcg<QD(w1XPj&P&M^A!RJ3$ukpUPiY;c1YSldFHG
zt*vb~Z5uMRVpZ{cq&U@;_S6EAa^pcM3PU=AzG!<7jIYc6$gmmb!voK)1G>0=K!L4#
z$;rJFqC2imh$*rIL`D}2^3`Bo9~**?TN~BC@c?Z9w}4e)BcXLT@`_iwWF!aT92>sR
zq!M<Q-C8+(l8^opQtJfAGT}Gn{PAPL=baHG;XSbgf?QEwmTcquda9#CbQLysc1!@4
zk6&I_x;^)oV|)N^aR{@LEP*G&1yZPe(5{9+@59y?SfkVkE7Q_I^l9J85)obu3=A~u
zEgQSbrG;6Pdy3AZJ`Cg-31>y07r(&wJHuUJhIo~j-?ATFF6ZldlLJ+_Tu%Ga{ob2P
zq#zPAhFyV_fFN2KE6Ep%R_wlQc6Coo*HmVgmPT}cb7C&`q%SWFlp!0N`lz2q0aVl8
zzYjkLHQ~I}p$x3k?}7GFHT}(7-?fp0QczQ(_&ABgj~%AHwShY^5`=-gme8%`M&ulq
z&o!8q)?z=cuy@5dy<FoO-e1^Kerit9qCpPQh+J9VR-Bqb4`?`$AT>=8XV?Sp`E-$A
zWtx~%xm@$)@1ILA^YY0iw0LR6Jgxz5FtrcnJUwEJ1p*;Z#y)<*PEvjc{xvCPV%VGj
zI+h^TApwbuy%VqZtJ`f3onWU~Cn6y+i;0a5fRfxIp|o`8-<1>SMCg8;99_=HqJ2&D
z>JX*T3K32kkmYZogZAta+?SO#d&>6%3zsLVdfEJFIXO#>fNr%95%6D$<IIe<`L@3M
z=22a=frWg0A7okLQ5!*}D9I8(v^W|I*^|S(oKD~eV{&+afx?y3=fXV5#jNP<$8k33
z52Hs|-<`#KKVo4Fze7@He?nmh(KZZMcnPB=VS*sm^7!3e%bUD=6=*OM$l3|3&WTn=
zqix{GwuT&3UYBE~#*d_6X6y|_FD^#&sl?U!z-)Q1xY7i0O=S?TS+$DSVT?m*F5~w!
z-RP-H_LRz^`NeliBX*D22z4T8`Y;ud1QO?OQo~e!C%gR<|7$*1^BADh-rrrfHow6e
z=R#a_vf%M3t*i_JvILBG|6x3zAJg}06sbg()b~mTj5}cYe`N_k|1sF8+!4zB+R&v{
z1&bUg7-JOrK{B_AmH8Wvy}||hRSLOpa~-m|b5`31l^{v3vg-dcKiQAmix+ZdDXmbx
z5kO@#w#x%PCQiF4n=IcH{)e#*$=*HCDBQN?(V;4!8Tr}ZJ+^0SF(PHX64r9E_tm@`
zVx>Qse7@%AiMW~wI%zG+e|>m+jGmkVks*T)eG2{L#s?X(OL`|a=@GyB`W(&yBg3Xh
z`9rP+i*<RnuYzSEK~ur_AQJ=pGf#u?vRRUmgq$!A`Kz{`OA`S1hOFw<grw=n-!*})
zs;P_(<_RB%*4)Mk;&77E%uPy7^%`$&y&tE38rk;>osNN*i|ec7${92l#6WAn6*gaO
z#uy*ljov+eW6$Nz?;pmP*;wfElZ1zYcgQwdXvKaI_~32y<#>yM$~3mBP83c)t^NTX
zj5^@A0Sxse3=5CCcGbX17oU`C#fMGz7)B0kf(A7(nt=#+tR^&k8wS;2M=TC4*EuiU
zKlYH+4?llHsVO=h1_i^Je{{ke)-b0rsB`%EOXc^n?|^ZGXA+}A_N2OcKCEmRshbl}
zpeiuE$~%pIWtbe-Pm7THx9Zvhgar%~K?Rn&TQkCbfB7CVHT{ml@IqvbQsL(i{i#Xg
zpt?&%KyiZpHAE*r&`75DR==55<?Eh*p8F%Kyg-;0tFjrp_khNM5DT3nbq!gfVOn;X
zc+@wIT!C$cla_YoG+Q>T5VjwOjd4EUjO66yVGZHgdg?sO9T19J`{s!71N7(LV^uBT
zqQ^o76j~awTv{B7<py;gw?(YiygL&(p3BJ?$aRw1W>xHCSSU-GYoe6p#FoD5!|6)7
zV%KCd{6r;cy5N7^KIE9zKW?a>zLVuPfAM3a4MoymK}wmrpZesak6gs%A#?_JpdUPQ
z)%#`_qad|rCo$AzGhN_oB`>3LwzoanW8KJ0!d}Kpwbmn`RXc$nqbUhHM=hhY^yKw@
zDt*0Zo?Y(+%KbdoUH(rnjTOhNlJNa*^7RaDsMH5a(*gPpKA;83aQksm&6h4CjW^p+
zJDCCe9UvxxAg6|h@*VtDf4lX|KNLe_nS9g9A<Jicv}I^E;!>9?Bt~Mm7}`x>XEJbN
zl=I!CMi`x^s$kj7KQ+Il41<%CP(JnnytxTnrDmX;0D~T!^gA<6Xoq!2r^Ndk6Y}nW
zgNalx%$pS~d>*g(&!8VKMK^37Kac=Q%~d~-<O@UnAh;%l#f+8Hho#7pUo75`!gt?v
zw=1X~8WbSv{>X1jkuL5X3LUR_Su_@;nsucDt_a!O`r_=_Hv=kWBohLL&ELl%!(<ZR
z9Q6BCq3pG7;EL6vC>qr(dDD(#DQnBso|J%;Ct-sEe@2U_$JNBt^wTobkD-=ST3YI-
z_mD%Rt&{R$ddJFe(F8eSj~OWh{)0#`YkYg6tPIoM(V@kk(o@EE(@#y2tk&Nogq3E@
z3QRuZ(2u)|O&5fOX0(Dad-m(>+SCP(B9e-XXs#opJ)Crl@-D)go^2UmG{e*I9_fc^
zb*(pZzpSqdqC5GJwdZ@VB?(g{C7m2Quc;$$FYBO8VILC!5@C7pYwQ5BK#LJ^JZme2
z@e<!hJe^?I8xE?6wz}Udd_X9Mf`BF3X7}iwk@)tCu=EF}IwVob<yVZ(M_+0y{uM~s
z+D6FU`#Y4QF!*L2zwb0#M9AqkK1qgA9KlaQX+dabYm@VqW(x~`dCpn&RW>0@@Xh_F
z%(PFLRlW-*i~uV|4od!jAB5)z@Q8+7TAvN<vFTvmCO}GHBUm2&N)J|=QZS=H*ft;k
z@X<4siOvZ3lVJ6g8P{hRRSkZhsI~W^8h`)ziBNham^-&Aspv50@_@S4{4LKLzRi11
zVCs!+H)RF?QNC4Q_6^v4psEAE4q%P&8-d{bJ`Qxo5;??m%t)522()8}cQ~Bz6U1?1
zi8$Z%-%<#agegUEw(5CTr{;X*b@VThD*(Qo6v(pr;Fv9Qa6n>cfXVRH!py=&F^Bt2
z4xGSfO@w%PMTHZ`g9nO0M(|Wp_QeMf0Wh3hJG#3gP_|i-`%j!bfS*+K+#Drx2>kpo
zHXLm*?~zM71wF=*timgXC;GMR6u6VZ&pJop9E1_E*QY)N1VAQvnj;q+6~)1$<wa&(
z$tLK&`zb(;*@>GX0(_^BU`-Ae>!&0`O`HJcL}*Yx4UzevNm27bfx%Kk_M3r4SA0Q1
zL1I|I{yL2{)9{YvSTYw8bNS7T&n~szd*)|C4VxK22pkuqqnouvM$k0xTg^_WV<n?z
zeWKT7qY2*+7d5r`_lQkX(t@DzH(|xrD0YM0L;!H?vC$=~s@jd>W&9HFihEVpD>F6&
zP1yML>&TR8->B)9mmg6^^G1468z~E~I0BINHoT@sOn-&lJil|ktFw+#Yq44s>$j#}
z95|w9uG5S!p$$}nld3IgI_GuyA~Tg3LI*>vHgY=fd45at>-tRLyHoBT&A&Kg1rp#O
zz+iL@^=~(Yk}iCh{Za%lD@08;?|@$A1JAXDZzRMtK;_I~7>odK4_xwlz&8e1{x!82
zcCLu=@i%zifHu{6UplxKoCoaZ7Z=7>=mph$#E-(h&je50G%3QxI1I97iKzcbUbCtR
z{;f)wm16-G8VEWIi;Aw%yW!!=Zl0da-Q9TbB}~7+SL}{Ah+Q!gDGGPxtozTLqvMf*
zl8te97OjqiklIyV2EYIG4S3~t>7Ybt;#X>7MqGaw?rOd7_upV4B%At<MN0Qc6~=6x
zf)@asK0+b=0|P)qx~ypfuOSr|%vRmPCSufvUjI#)wTug1stqZuBw3cf`u`53jbGCf
zuu29KXeJC3C=$<T(}hzR8CyoJ(VaQ4v-v9PG9D(qc{T)GC&-wLtgX+aM`#g%ow+7q
zqxxsA^QCu`NX4m(dLH6J5x&~zLKsE>L|>NG;Naq(L*=YTt6+%rNrrgcH{rh@xU}rT
zL)E#CPfkKoZEocDQt9cBr2dd6*b~|o<j`~PoJ}h(nlefDl^ClVS*KAwJ2~O|!UiGb
z0pBxblu!4LU#lh6baZtDX>#~!%4hcRxCxXp4cna(h2$qOrx_pf!x4Zc0ghhfB<>r@
z`ajeVnfQLq9%6__s*k@i*soMEIy>^8E(!54m8={at1=#hx%_7NV`U*zswe%lauFv^
zeH`3=5T_!MBwcK5nJi>AA0Bi|ISbo++-+erpi<&vL2~l&1ZcDQWLcLEY7a5Iy@7!1
zJz8Z)b3NpxM(-9dmw-$!BPaJ0#_|LbKtf9nkft_h2+VG56ct7^2?IRy26F$d;`JzF
zt4boF$VXtSxpuNFESO$jR}uMJN*b|q(+@1lluf-d#J$O-v0x{Hvy&JHc0l$&rN;Cy
zPAMDg55JgH)7PPOxn`w11u0<C(!xUR5}4aC5Ij8P;=p`M0C!FeA1|8OuTTPYezbUF
za;!TTJx^|#^(uW!d#)ArsQ%;P|Hal<09Ca|?;b<}krEV;4waPdkPZ=0Dd}!R8l+Jg
zq@<)vy1PL{8blfdL0U?>>#cMD@6Eh7^X_oRdr=Q?_TKBa*0;Xsd*C$LvaXEBL%__O
z;eSUxE4}|K1W9mhT?}bGXoFX82ZqM_9=M+@k@4F<tc6W|2zd4LA;Hp62($%F_b{Xj
zs!l=}O&{dE)s2?wU3;pqv4rAfA|O?P4yE{sKmVzvZ4u6(VJdB{DEf~)8EtWVOfG3-
z)8+QA+VdA;Vq$an;-<=S5vs2hq5ntfn8CH8&f}EB(8#E7wz913EA*a2&~jg4>K$^M
z>w-vnb?VozUXUo5X#k#5#$4#mZ@;{~Edsn({vSvIj3feXR`*z`8u>r5Dp+f440;z;
zPIW2bWJ!KqA`LO$4Sh0&sLbhP1M3H6Zid(DdKq65A$U|CUo2S&@x0ZJD9!o!b-T3$
z(RDk68{=hH){`nX9KXAn{-q);XgcqMP##CrAC8lwM^K8ikb{-jJ8<Ve`Q32~9Ckhn
z*vw+bnN07S^;}1{?OFXjY|ail%sVPhoK#FX@&9WPf<`3Z6<z6lDsLjBsu+~bKVgaQ
zq)((MmGcTcB5Q(LmGSOaJEcmlL|~-4Y^)rHiD@<ed%eFn9;f{6pX2HPw9tZ}25eBX
zc7WZ2I?qahNnacYs(8_`h<)I`Ksx?`q*5BhJa!PoMKUK$5+)6&BW(m8z8u40z2|w2
zlmfRLX%aG_2kFHcA5R30ft_g^ZshbRivF!1=6;H~sO@ZH;cY-U!vhC2X^^8!xVZ^H
zWiha^!3CBfxNjC|R%3$oX1xM~PTZ$Ydu2K2Al192sik!dsVE)UCe(gGFihEiCRqbK
zhGnb_%MRSY(1`C!-d~(tOjn%kajV|(t@cOw!Md`Auj<<}C#w&;A~ohbRzi!&^*LR9
z)N$M1@1&mW$2~!$XAt;O$}r6R!idu?og0P+{jX!gKB6WdAmHeQqN4647#QS(M_P;{
z{Gg=>GE8i2^7?nX3ngg28Q-Q%ZoL0<403riEE2Aupa;JH`q!+*<G3T&D!tj!beg}H
z6}|U3*;V=X-Ji|0|4VFVob_Bg@amEwETs~|=NTGExndvu#q>(srYQ;l=*0%DjGu~%
zN)=Ap^z=Wm4qxC}a6nQTL9nFx?}lmxP#<Oz2WYs1D3OFNqlmsjb(#x%Wn4Qg&N?Yk
zgd@#{g~0M(y-W`?hL3jfV&z7;@4jqel}V+jOZNkfv|cPgZXdGJ)xOqk!FgRO{I$z>
zL!yxG4<Fhse@#)U8>sr-Kj+gWgEl|j!=u`?7R31|y;$URc~-62^v*6Ce$2Rk@y?8~
zj2{L;{G(q+@~-}9bEemOxVEyD+uP%uqebU{;PqUq%)bhqz<q~Urv}1D!cDJ7@_d81
zeJb2!V|$5cUgP`Upy6~4<N1JhLvD@f_xt4mRRxwB{NRVHVAqcWx_wqG^W&Wz1ocfQ
z58nV=+}-V>lmOu2AwIbOakcW?EgIJFLr#HUSEf9_DW*)L4r<LE;H#<?`d3$TS16^<
zuPp}B50m`)M<pgLjV8D6rrMGHJU$Q1VX60`Q&VxEH+(ZwcNcE4DL~J(7aP@~wv&c0
z5+1`k#^(C!5{~N#qS-ls%a&o1;024cLx4LfA@@hAaC#N7Gi}qc7QJM>YA{aa;=$oX
z>UFV8^+jpzPS_S0g%*~|$PI0^4|+D9{MGLl!U{c_>TY}+Hshf;qd7*3_<2!jls-z1
znC-<N%sycDsa)3m^#X$(Pdwnpqy&So`ra999u2!Wh$ggtqzY@PB=Sh8nz0v7Z15w@
zm-c_$@dWeZp%ZvhUa6~N*kOO`fB*iyi4hG9CjhNN`~pnUHYJvwP2h_$m=&WGzPJ+C
zIQ0o09=%hrh<~FI*HL9LQUoHf;!c=E?}%oj6@KEvjwQFLmK*tMXP&2`Nkwq`=dTBv
zE0Yx(X3?#6xgm##YQ)&7@~Jp+91g$%R6Ckx?n?0>zB|+$uI1UL*Ts^hcP;kQ@_{+l
zO-ZU7cY}szx`@J(&U|hJVd9#Ev8Iw<?~ju2^r20(h(w_JSXd1%PH(?9nhX?X1EuU!
z-0|zcwgTnc@K|4^t7*SM>4dJ?*7trtN$Z@s8QoXk(+0cNuceKB*N%<QcirN{Au?O7
z=vF=dLkuPCCbtVp?pWseeiMm}ywocuz!nM<ys~rFmr=F=;cJ6Bj!a5H0vY2jy{r+z
z1wET>Ayw<6`MzakZ0eethR{pfIytp<r|RNigf!L=2e4aU5oVA6g=Ec5=*Lrmh4?|8
zSsDl$z{w~B9*-hR{I%}L9^4aQF+Ik2&~Pc3-;Czn1*27f`+8!Tt#6W&TEQPO>i^6R
zYVI{2K$c4Y!naUT8Xg==DEi$P>Yn>l>l{x&XZIx%N%#ue0{_9M&`O_a_>l!xqI=zb
zAYxa>T2AqyX=6M+j*_<eE14im_Pmnp8;#7N+9w~RFxCPWGKlEtvjZ`xQBe-)J;O;J
z6PjqmabQWn+<$0apFBA^i2=m!DoyKzp^)(KPQa}qA<YF0ygPwM;MV+f`g`NQ*TbAK
z7c6kM$U<hcDI)24S}TAfv;a8QBA5YXFa*w~6hwtuPF9#a4;Q8CMk{MzYz{%IY{j{s
zZJ2)Vu15XfdPtGVj3;*U(??!vi*H_ex(`=9ILnpNCGUA^k(T<Y^X1Q=UPth4^*;5S
zZdr3bzEG1Xh%xM+oZ|CZr@^587Q0cKK0+E56&u<n5zsa^g+nhZPxS1eNUOs6mA{bs
z)t24XAGyu&0^jf3t*iU`mnmp{zkll#;2BhfCA{nO%b=Xh6}~MaZj6BtEmS4_l*Llb
zHlIm;VqfxcxP+9{JrHh{(<$F%wL6NXsElhr^5vrqKEM8`dV0r3p;v>1JfFTT5AqP>
zSai<hD43OdHSFWZeeo8QEkDv{KSfp<`2>FT1XGL7bpQ`x333Ba{IwBuuo!^@+2nCy
zCcFB53l6M(2x3CdovX9UT7{=ec1=C*!-pFz(89ImEHClB?S#7GFP(K4sPG*rf-b;0
z(tC^_9M`*SKd#T_aS4V)A3?<ZbR=Jy4!C5#yWqru@n?0t<`VAT4xJwwcElo9xc5xO
zg*;C107x%=NLk#He6K|Z?bKccx7i+#xY8vwzSp%xiYaX&FH3;6xrl-(L|;|y#{`#%
zcj05|FE*gNZwU?xvbCOVs^_JCm=3Wh#jr(?OADpXcDKrOg|M~Djfql9P<>#qciDA9
zY#AzIVQJ}Mox>{5F`R*7|M};}LaC(&5PlhK0c>8$nI$!BWk*>+eiE3&S8G~-sz1}4
zk-1I-i)j7%_o(RFARd5ZQQ*ksg7un~BsfWQfx^Vex=$ne=9e)G!X=FGG=a<X*z{Fa
z;<T9A^8R;s4IO?CHD)zA?Mv?WF(uHLhriA_1#(RaL>{LnaIU22m6^Y{|JUSN=gfqa
zz<=vc9)gVe<Y>CywxaTV*!Pz)8nS1tO~ya2&%C@-gw(xd_^-Lq`m}@4$(x(C1x|Tl
zZ--evlzb|tmVsv0Zsb7RdvPTof*e6CEN+*pe{?nojtuIEWE?<A=d+h$AP%m|L4WCw
zR#*clB6QI$Wt(!RXpN)v<6KhE$5aA8&j5@jz`O*9T)-F^|EW<OtouqXDk0%Eq-4d)
z4ON=Ga9kg~efDXJG8_A)0%v^}xILhr^a3FadD;v@<YL(M#p%8nM!vPVs0|m1-P-UY
zGNE^oW9D3_U}f?z&fPnzuy8{UTod?qq1Q41v<6W&7F;l931tnz+-G?Dj(2I57rn27
zjU)_=Ygv~rIZQ<CVkEjdJgJ?uj&_RQ<|o%Oe;DJWq50+nD-H`_G?u_NpmKdAH^Q(x
zlKQ_-_(i%PHi2-pk4?Qa3dCGfFeb|%0Li-~O;pfxd3j@(tzS|A34evnkv;IT|G`z|
z)riwkWN20z*^tezU+B_qeszQce`E<<cKTs(c><ZXdiG!^z{vIb{;Oy%Y;FZnO*yE8
zrO%0UQ}>=NQtPHo*Dq=tkW~2J==>J)-bM#ylz(t*a86)Hh@T<9x5*M5Uz!(JSBXw~
z=xA|2o^IX=te@+@w{^X7^Xt0ZdGCGop4%pOqLn$FmV9f$pLfzXEdrelkfdGkhIS64
z6rmvNqK1Sqk-_BPQ|ZOr4Ge}v$+dS^RquS!?qKz_p7PcF8DE^dVH;x~WBCAW*Wc~(
zQ(o@vTs^Zi$UTmBovKs0*;kQ+Qxb}eh2>$CNY?epadUDvHlV)Z`ne;4JZ6vmOa<Ve
z&3l@~-x|q|ivZ3$i&uE9Iv6Hx^dbKY`WajVmV+H!RA?!J5td2e2CCprkfS8$?-v=%
znou}Ahv{Nxm$0$6rcr}%beg6hCeAB;8@0NJn$92oJWn$^Q!(^ki<?CGvqH=K<X#%}
z>#R-ae-XxzVbi3HUoVIB(y9l{K=8&`?u)!7v_F_WOn#Ay;5K&x23+jL$k=KFQBeeF
zFy3NeVm4%}6~>Q^s^1mI)O{LQK;N#_D!ZMu0*ghxTC0h-|G?Pi6S&cQp^1_;E2zI=
z8JF`OJYe@G4I!G*eVbU|N;dR1t&p4ZPJCmXV4aX#>U+O32mcqo<6Xqu8kh9hW3zeC
z!q2@00Phl8izkeTP2OeP{2)QVi};Z!F?#a-=Z|bI4F{FVPeuSc_ya(~_Y7{UpS08{
zjU9%cgF67Gi9iLIhS#F(8->X6xu6#t4Nc~65gp{+d%az-Gx5MmRgC{yFJ}m>7<6yi
z?sB)ZVn1eHd9%KX_yY@U8;|MyQTvxOmz?~H3bWOQ8bJ2}BVI5IC-{}=adV4IC$5M5
zo@{Va<l@p$|GM`jjVMDi)*t&|*R>ZIYuJCdvK_BUhgmr_wQAlZh%-om0YqXVNnwSR
zvijt$or_{9&=MonRugl8LeIo4)``setyq1r$cqFc%vHZg!kJ?$nOj;3tuom1w1#*T
zj~e<HA%Lj$m0TG2)a<9E2FmNO^K&nCbzH>Xu|lHJk&qEx>+=^BMPU~Yc5{$4jcX44
ztPjViqH@M|=a)b~ML~dn%WiK`*YMyMA@3cvF|i(>BMI;5qx*>0C$wAMzA!hm4&98l
z5kRr%VK=#1R=w1w{2X?;vWTx>7Up1CmQ3<ujLqZz|6z<YX<+z#mHUS!pGq!@al5D^
zrHlXnVV&qCj#;#FR}wtu)V?OiMZEt%bd~?1Wn9<D+&3yax`R((KpoZHfk+>@zXm`(
zIu_T5z}&|MO5$YC`#si^E|~wLmJEvAH!xXYq?LF}ch8iUi-bE2MU>u{!qiw@W@>6{
z@ZHE`SZ?W7GGvF-ME$Lcj#mB&u0Gh;rdhiJj~B1o(;;1<fQ+0x5V+g7U@@l)^WIb{
zxIC#mbB)9Q@ZiyPX?l#8vecBq)n*^egJ=*KDb&t3fB+A7bcj=sfMT=gJ^c*q!}{s7
zDT5?4=fN?kcw}T`mG1H5l9FY1rkiZwMX+uJj=Y0lz?SRk>gtYiA<IyFB&5TpF~*WE
z^EEkrL@acrSfOFJ_gt^=O{2>O8}Hx0hyHU#FZv4%rid@h$QWLGOkO+4{1xEit9tV6
zOD`MNz7bdpc6jgE8Qa*DLSC?@BE}jM9tI8ci86HH)6tY+MXd}7!#;Fs7r$~WPk6z`
zrctF?SI@-Rqg*}Nd9f2)rlsa81C5FOE}^)Ab9+@xS=+Oo3`!KA-YK(EU*&z_;9z{u
z!ndd~H1)Q=qEwdoLl#?-;;#Zyxo3<V9X<BieeHnm3n)J6jk1Ho!{)4!HO*33gr7pz
z{ZrU2OU!y-UuMM&kAP{7>crnK*cf;MOOqaqc$numb~5fE?)urg{SM|TAE4x_JL)Xf
zL7fipTh9%}*fLIE!hEz4%S&M<J@)5=;V0L3<k7psE)y^1a+}vsJ3*-N7Cc!6VY~K)
zjhB}Wz@p1m@bIC4jej(dpikllD5yWT*~OqB0;oBmt|Z;|7vJh@VD6K<E%qXuN%u#9
zK{u9ox2E#POjzVbt~`B`>&59_GCbQR)>a|y>0$W6V|jRc8sf)GJfTdNB)+Ai_5+m(
z4q>pQCxVN?m48^DjqJIs?4*&U#4K#X`moyTCYEZUCTp9Un|J-%1k0OvG1v&UR$EW2
z%|dqzhgy+(xgkk`#_X3-*`DRSHcbC-g)oB$YZgC+b?XhNXB*=%O6-HNCJi12Sp@i`
zuK}3rh9};j7H>v>d^?49Yx;}wzvxg0#DSYhtCewk{@3D&#DMQvXv#~ssXxLYt|=qa
z6=hkiDS-jV@h>={hL2GY0x2x#FmQ$y4DXqnIlTUgq0RK0GMRn;G^}Vs@wXuti5V<t
z4&X=o0xp?1MyU>i<+3ehF;3%@-01lET_t)xsp-&Xn@og!a%2RP`l*)y4j%)@jTh=8
ziyL-Ui)+uPN0f(uha@5s64t;H=Qsr+(5y&~L`$K;$f-6TTIhq=1b*O=<-#-M1gv-w
z2v2_P?s>Gk`wG0kq7YASQKiTHL)(#&mF*t!mhdf}*dYJ$B=HW-J@N5!CcwEndtLP_
zIrMAI$$=T7ub+<k?y4T`IZae(n6$#;m!+Q(vuhX8j}Y1|2g@=ziVBpn5BKQv{Wt&k
zw7h?UezYd9okAWNnY?nc@oz*pBBkXWp3k$>N-#_(oG8|sfLw=tcKqP)@{gmVU`dvM
z{ea{9IZWERKtUk^e6Us7u>9l%PObu-wEl8eZyUOdkt;9C1AFh%B;PM3(Zcj}?d@h~
z0%oOt2SQ$Z2UzIaSClzYWE`&C2c`qe#r>m>5M}2zQyEq(Gxv5Y7*P343Mp5eCTBC_
z_|BEVF}DgWYiTv%cacfTsw(+SLwFdUHNYp06xiK*bq*tz)mZI#=vn0_%ZZ;q4$u8u
ztNJMW5S+*5t-<WB6wZZcrF_Q@DAQIkE~fa@pWbBrjEIs;2@^<pg1`%Y*ce`HJ-yv>
zuE>Cg0hj1@n6v~$COA|A3i}aJRwgh~0SVc9T3XYu|EYr+PXa7z$N6k>;Vzi`HgR1D
zexg8a?j3)l)673f6>TM)#D(wK>KMD6oS@ta-h9X41t!k}zL7tiz(W%kK!rvP=>DW|
zaBz^>9nhBmr0u-r+a8Gf!ok^@0ttz14S=U(TU6|G@-I9!f3VOdPfp?<c`LNMLz8Z%
zNNz*a9zPX*wuBAe^xI;kPY@MRfaDCV7HL#|2PYz63n4e*kjz|DB;X*0!Ov+kD>MOU
zL!z0nF&KaUf*sAfCh({6PfAKMh6x-3&JleTJmAj51J?ON)=;xZe3oOSO7>EJ@-uud
zG^1^um!-~iQ`}ni7|x_%2sJ(|cs)2%SZ<gzoLR4+yHKCdygoMVw%0?T9A{_<Asyqe
z&~yja3({rKd+k9QIUEQT@>khRM2_n!&6Id-Hzusm+sXU;`+LVRo?L3Fs|QiEPhXKw
zOeg+Zyaj=el#YP08GxOdB|@L3%gzCk+yqfYVT^i+U@1^3cm)_JDX-mvB+^dS;Wl-s
z6~P#-A4VcLAU8rey#c8caH$|k)~&R17fdo1fZl|9hlpi!1mJ88e{ox~RY!1N%?2ux
z)i&(yTREb^^KJtF>o@QOJ|>18RywSl;eGiE*(xo<(B##EUFZZ#Kah)Y+@?vb-w%^T
zpgF#OZTuKPWzsH(@ab?7*$H3qhIBcZSFfVBd841+YQI+-cqqJ~zqUEF)LlN(GUmto
z`axJH8XSQm+$3RdK-*aX^|%w1dAZ=)69|G{keDFjC$|6=Z-#krg8$u)e(Uk9`*sA_
zZBiEZYEMl~>zx@45%CNNHK+3u<E6!6$UU@me)%W*>PZLr<s)5@3lEm=a*b9OB}%f}
zrEf_E$6n9;+kQP*YNPL-BSvczWU^OroLGAxwIA1Fe9-MN2w#1W-)U`pQ}OVA+w06b
zg_^|sxAxhre{sR#-|~jTcK+L`T&q#9Q~5<Sz<8S3+1Z{K8>OvYf0mZGs2@FAj$xol
z!(YJ3uiEH_WrAkQb<5Y@p5Xb9(w}ygf`3O?jo)19>gpR?S-G`VU*7;q`OgUnci)Tt
z%(&qYC5NHW#%BDO+OON#bSlmBXzK9OaU#g*N1MPU>eMe%7MuqA1@7GZ$o=HsUk!th
z@|eEm=p0Ys=TY&oS>r^6B%4oS{OAX6xz<B9?OFR}r>A(gKY`l`U%p=w@Hp*U2+pWQ
zE;?Yvh4jLMW$FS9POxTfc02rZ26j<bb(Uk;U`Xkl^O-rJnEa@91Rufn*TPi8Z+Yp@
zQ<Jm@_(@t98VN<6eXOyC+s@<yj(DhFfls&(T!eUhap%X-OsMUTSpdvr2f#s5qr<A=
zy?gf%KE6=Kz}VOrntt*20Bqzk6!wCP&|mHB?{gA`c2KICmfdi>*&lUeJ)9pkXG{Mi
zx!h@jLI`tq{8?c{a;0NtADty5`TVc19&wG{X47X1b22)uc!FWOy_NL@O>wtP60P^W
zWP6MHwE^iU-URFTba*H<QAE|%iII310Qz9z39ec-UU~WOrc?9t*S|?%fKANBg$Gzn
z-)~I1<(I%aSXIIdZ$LQM77M~c^LKCSY?ch}M+#w*7$rxTS2w`QfFb)HOmf`Z)l|&P
zMOuc23&nCZS}C7CeSr5DEF0f`kjoA+A(mEaAS0%h1V?fxN0YW&@E7kA5cuZh<xN*_
zab(Ak0IEuA%|?8o5$CU2EDe6KCh!d_-Vc_<1!K8@Smu0_5DfxwofZTMYM7qKuGBVM
ztVNhAVAK5&p3FcW9|WL+tIZ$?lt+CzHSqNcEG*wa?-BPT*x10}{ovDctTeAP1~Awd
z@`7_09b)atz}#-Kwtgt?tTqsy*Hj*cw<2<3YHJR4Cm&WR-;_Bv&@{j77E<9q-)#0+
z>#JZ9_i@dGt~#`R<({h)bN?4CL#4gDS6o?{(FZfnJ2wkqNn_9va=&@h(y0x6%Rb$K
za3_(|B?6jzm`Ki#koOfC0Ox@Kh6^}v(u3l@aXRl+)>9PQDjEfRJSxYyUzFPQ=4IHQ
z=_Nas(^IXiCN=7**_#nAG>U(AqZjj5m58ze$7?m4Pk*s5@aE{A{`(e^<JWt$Q*Gbn
zcOd)5ZS%Ke=JSPx-@CVFe%7VXE~y>KPqvR0Gfq3pSrojapP|8HGeV@R7LNPF9as9-
zZ~*fE8eUTA-|M)`+-4eQqFl(h`rOnsTaqRP#|PfL`>+A@JKt%?Ew^8mTZ2=?%NfGK
zfILK?HTIN5RF*v6?XZEh#W^el3+<EBxwEd9WdSw2h~ANmZ1>mOoTlB$O-;6!GyMB8
zo0}KOnKZxQUCA3VZ&K>1@m~D<cM=j=ty}(ky1^kH<<W0qbd;(`ev)zCTfh|B3dE(P
z_>`D<rl7jaETil$D0o^jFfC!-KS1pM`aW$%1%3rSCp&uHMx84?f~)w;4_#fZWZ+d%
zUVt4nxg^b9FxUo4_3p)~1CV-=A%TMw(%;$#u%l(X|26#yR7Jl{eYH$lj!CpQzM=Ql
zmQjm}EGMRtgD>1YH74d}y>>VpPxRYhxBdt^<#GW9h+lXGc9Z=8xZHxAW<aTF0Kx#!
z1~L-mVW|t`k@7cF9HYfrL@=!Y@uCuLVCPs1v=ki8nDeED<a_o7tK&NEI~|d2wwW(V
z)yHW=8;-Yj$nV!3zWRKw&TBqSWEhN3V8$#t>YFt#b(%pC#6FAtbt#_vncXdR=+gJ$
z_DPEWJrrN`Onp{8_9<h*NH3v0#M{Al03cI$cef}I8;XkL@DB%3F)%V>i^TPG0a!Hv
zjhtO{-!iK=+M^+{?qz#hGW2F$+&GhrG0RwB94(^E6v!%5;mMN&sU^^;E8O)77}A38
zfC;PsAzKeSeDNnB)ip80G61)tA;4{5?j<;}*VJ@<f{xY&`hsSN%839nGe~F_fGuAM
zO}l>w>^impRXHQ|p-{CrL-w`G%4RqKfoMW2Y66kJaL(H<b>Dq6+jROxw=~TG#*+@1
z@7Jc_G=@*QD)p3Ml-y8=1t=KYCk?Evv7rXQytx3?vd;6I2S_+r;z3T&k~&*{xT;9d
zo?Vw{2uOr6xoj%Qh4Lnjw<P=FWyoc(o0*t!L&^g(HjO#H?^wijPxAP>dg~g~cX{DM
z(?_fgdi2~Cce3QfxGx2!6qq;1UxkNDxgyfd7)nI?#mpTszhx??N2+;GSi^CFEIp7X
z41Al{ELt^1?_ocC447Nb@880W@ZRACOCrHpXp+COVZj<7+|>`%MyaRWPIiU{gtv-_
z$(r3Ttx1mqwHd|T!bxu4e36!h+Qn!m!hyEsx%4i#I@YS~v}g$7#gqNvVDJOgE(O9?
zL98;(r|<dASi$s2P6=rxW(wUY^ny~aJmS6zBXTmb&rtUcz$kj@v10POEnqMC_Ih`=
zw;RntZ4?BqMiE4UO39224|k63d{2Icp@EG6U$6vt!v6i&?jR}mKwQss1fnk|%E!V2
zt(VlXXe=!r2^F_*|B^`Jy)zEJw$BIcoHohH{7_N^EH;aZFqM^+_?TitguM48dx9m;
zfM>D{Z?tN|cYr%b)kdGF_ppCc<&rMM+~bowR7*{*a-VQM%%T+bWUQ>f=gQk2qQ98m
zpC0YDL@XstcJRD|3qAlrGr-0IZg><d1XC0Po0^3F?m1-i4M?ePIyhorh#oszCz0_I
zqoGdf#Fm6b*k~+SrcHQf#!+@H#UvCH6mN)Ss-&OB*jRdUfY>(>p2lNIn6BL*J|+NA
z3jSrNJ8)oeXBKQT#P+&n2YiFY3#=U9XJyd>*U@(M2l@K?x*TM^V?e$in2C!5za5rR
zkoc_X_9xyE^(gUI-|14;AL|tD?n*&Qg$=Sx`b~qGgvyB)GwzC$WIqQ^VJ-hjh0iUB
zjn_Zgv$WzX$u^cQ-$++^SFNd;+|=3MnU~my?h2eXzy_*&c@I+|E}uB8v!WHkr67{H
zD|(WitgZ|jZCwA@oiy|wYdPO2OML&2ccKyn{J6Z{7rR})pi=JdYlRv54i+g77Fd5G
zleYUB*cr0n1zzxwgn6s{=iRUfw5@%}SH*n_am5|r3jzWbj5w3N2C3)Qz+fN%xWNH9
zLKNdGd|>!sIRoZVeZZ=&g!DoZAgsVc?gLS)0J4J!2`|osRCR*9o2@?zI_3jN7C=FK
z)o1$y_ZWyD9CNf;uIV2?&Uu-w<mnFXr>Q^=@r#IvP}bB;<oB78drPIyMFLkf{NTXx
z;%viv+-}^m`cWGSxy4vPY!|FwQd^6|ocq(X?sA?#uhVnAiNH8wp|DpyRx;k*@ttqC
z`jV@Z|Arx3?<N|W;@VVYZnIqW2S{&*b%{VSh`Z?^cuhe%%PyK>$c-Yp0Rx?6YxBtL
z;bXZ2{9vI1t^(CJC1@n?b@UGdKHa(b#P#!damKSNyyP=hzV35_zBmcl=g$dBH7Yxi
zeq1Hcn1vSVwR*h;gcc}$XmBfmkCUxxP|`FpdX2TN-VWap$^|KoUtj@k>f;p}CcV&p
zZEh0o<nYmcnk7O@yd!fu?PQ?`@Bcn~p^P23a)o2wek8g%cI#7)FSWgO;7J+PjNmRU
z{<qQ(_R@R}yzCa!AX)kb&Af{qcy#9hUQMpTsCo`#z{VqV*K??(E)X5?6=*U}G*RXT
zPqw{!T?%y^?d=nhKyz#7#|Nm;tMRCM^6EUaWH;==XT-<&yF2GaTlpecz4mfY<PmhJ
z2oyXL!pB-QreRZmye@|`Q$@NG?hsX3Ffcq=^Y`bR9o@`K{8q6UR(HZjbj|Z*OM)iN
z|M*?4r+a|GXPFm9rPI?|-KE;~MP?dD0m0`WdJZS|2T>KIh{0VaV`xZ&g@(#iKlO8U
z<y&Mts*wRo>hF4N8(yNdgaxsk#=^$MB6@Mvr=K2izZNf0X({8Y4kqgIA|xc_M0#cc
z$%$on&5<CUS!37|Xe`bU>Q?a?>~NpDxEv#yO|gmN(6P}m_x(b#<@3H00xDx<Qj%8F
zZ<4T*ygb=B7||hJ5d7)y+_^IY?3g5zsn!CfG%4W<S!kP$rX{1km=z1=n%GT2cdUu=
zr%U&6-FnO+K26xmcJ%BtCB5iNm%px7gvdZC%(B#ew0=JWut{maw+3AL?d!=P<QU1a
z@$m2{#wP5mFj-mO3^VFxmhBvmZTz#a)QKp2As@WWWBDtcCzZT7{%K>P&RSg!TtRmP
zcxhWWtpT~oK@6<SA3sI|+R|;v;;vJP_DliSrqPa$>{WD1kFsL0us)>EM!JY2+gfO1
zsbIMY?ZgadEWCjDQZnR2CXSI2qXbu5+Vkw7z5#aM8y`PnfrJ$V@P@#WfB*`DH*en9
zp6nRZRLNv;I7l%F+e5#e3UmCslO1Y68ty=mfWS*wnRYotw@m=n&99-g-Uc!eHjDva
z_5Qf4vvcLO*#{=^Vl`hSOy9OLxCbJ@=DGohKyzMNB$n{F<-o020qraYCr4x-3T!~r
zV`$=;aI_gXu15-IfuFr-S?%TwcIw$yuJv_wCs6Acz)*_(2nN^NaIe4)I|P`_Ncm8n
zUh7lXix@zLr75tDElpvhSA@~qTRHY|#51(QN#puDs>Y@8&L5qfrp-g<n>Rer9WowK
z1k8x3<sdYx?~*;?(Rl1+lz06>N+P6*9y#gD$jC5j)nEZ7;2ZE`U76L({-i4AN`Qm|
z2zK!CQQ9aQ?K$%pPwC<$;&gpH^7*6g-Vws2LNaWei$nG*DNEu*w=x0LnDEP2gN=85
z{+d2cj9q9YyQ6cU@i%i&e8>bRocY1gaInp<C1_y3O9Fbi1t3eB=fRK+r2j3{(kEy<
zitcH-1T`BTKK=)2(6(Zownpy-ODg4!tjRTgSQ_&f&mQwZk$)>IJNxMl(aI$-NItm;
zIDKe)`6fqLNa$y?4DMQZvwQ4%a<X70o#KTRWWu=C-od2!te&PI*MKI*V68M|#hp=B
zX8U_nW8}s$CEtQt*FeX@!PN8PY*YNszN}Peer4*s1|m#v-MS@`KtJ&v_7AZ92nr7m
zP%C^gdz2~ux56R4Z{WsI9yK>fMvtt2V?5nX+Jk^GZvFctMZ>M8goJoZ_wa%wA4jy=
z1Alt|@bGt|Ngv@Z47}6ObC*I+bFdQ_L^Rkh_f7+UJr26Oq9N$g0#PTm*A)DuD~~~M
zAORl38+e3-XkpUI0<%~M<Loq~@Jlmm=nFt8RIEHaYUl)}mjhZ!jz;TL6DZ+|EW9SB
z|0t@czFd!rl`y^Ddj2!nWACB&zni5d{?H#6Y2WdB>Uv<&!VvhX=c5<^6F}kxN>YX+
zGc=~OV5DETNmEp`3#kYaZ{M;|h<FF}e=ts-azcfzKS@~5WWPYe!py(v6%<shfto{V
zB2I}la^(o+0D~MXVm5?ZGX<D}w8H`*2T`XovM9{Xz6)D>F-ONL|2F-1t$;;%A3z2(
z2+qDj(}n6Npc6A>t^z$Os}qE`f}FM3@`KDX#sF+!Q9?LgJj*dWVZYzNi>iUhC_9=2
z$R9ogbczo_;l&lP$fp%x5Dr+Jhq6X(x^AfmlG}!SYU>==@Z*>@KEV5lwDGfbaghO>
z3tay=`5`OoH-xIYou8d8z`+H`;bne73^sG0npN4X=kf0$=*py^KOaP@k6PfXUwb4H
z#>!PQv$5Hl0*tl;nl<so36zkzhy}4UoOFarD<w+yz4^;olv{s>oTyBHBu_Ph-JH|Q
zo*fJ@&1k1f^WfNm^_P^bEgO%`>_>P>NNxp}K>+lS;R=<NoWP=!fCFg+xk5TZT(s>s
zpcOJ}zX3lM@+;^?rfc5**8Ez*%z}2y;L2s>XJMDwPlq^tCqrAq1dCSsEnj$g6=z5R
zu+-bU*B0`{U;sk~K?PT<Up;nKSoMBe@1W{mY_yOsRp3w@*e<??#%L>{sdg8Gtj#h@
zpX(keRj~kyl)#?mebat7C!Vq>Zcq6~*^XNPbOw}YR?D41^*QAe6m&uN0o3{w6q5RI
zkZH=T{o*B_KLzu3N~mN(!NK*q%Qb6`HFD_aV!t{<1Bxy#1XASs@3*sc|M<}fsBwl0
z{SFn4_}OBeogm5i30pQNmcl$h8!L!kYR8%ia3r$A`Al-UwK)|ChMaVLqgA8y`I6rl
zV>!l_dKUems!MQkaA3-h^}!3mXsmB)idHUrQ&Hz89GzSmYj}U1B8kJwqMpyM{0$N~
za?Wx3ts|t&liuu6`zQY>j7pUeK8EIPcky_D6<;)ED90O~BA0z;1^3rNf4{t6VBlOt
zaBxp`c{w{#u;dJM7lXncCuI?UK*2_M;OYz%Grqq8jOccQ@M*AOUx(T1)6x=A7u#ID
zgA63VzV5c0p}x1;R&ew+O`u!VS@>qOz_G2(TZ2_!W}Yvn1Lr-_IXLz@wU&AxIzO6U
zQ+2-M&5*Ag_`V<L=I-vR6at;;;`&%&-T$WcJ~aY!4ERYi;Zb-@DFY00TW9A0I6-i9
zXTpn_Tw<{uSs&5TqQYq#+NzsP#%=WH7}1cFxdp7ADG+8H!_F}(B?TMKpeoC;f>Ibh
zWh^Z%iyJB+dFTY}GMUf71qi5i;2C8EbI%*_e19<kGl0vm-)#c2t<6m~uZwrLd{9)0
zi?YFWk(h*-xSJR&zy&$Ie*R4S*HNI1ITZe*KZ%zW`D{6ei+_t=?~VQRiDL^Cy3H`V
z2Ej`jK`?I@j4Fu$6haBi#Q`@xRzT8#i92Nn{zRUz8h#JTOatg+y1=y8tLVo~2%aUz
zVx9eodGp3hqYExz^epgj-9|v1Y_b$o1<IQ@Z>rzCb<1K`<fC{7@hLK~KtO;59F34{
zNk;*4d%2>#s)wJXbk;L3tEPyD%@CiWquba%>fGn`Xg3{94MXZE0le-W7%1Lx0D+?U
zSiyay7Zx0^C_d!xW|P}0YHD;rLyk5Lv=|JzejLqOOaFOVnT5?ZBU|%H0?FK)O!1!y
z+bSjl<Ru;(8$S3VK+g9AE8}(|$3&4@;Va7uq|oXmeE|=iz%$z=&haO_*A#C9-UN!7
zi8cpRX7Egk8(cr&YG~E(XGpDQD#s9&lS4xoT7F+1ix#>bYx|cxbkI}?Q&<8J@Al#3
zrvsx@1bllb*a+a!e1*^K0^?!e*|YnD=>-h12y6#)TcHd9*7%$^iGlWdTe*b}FPNVC
zW;SPXMMWi&cw=m0`pujxQ?}SNiN`WVhW|&?<7EaBqq0m5zwFX6M?n~G3^!n<|5`=G
z+{W4@g*8g{qwDEu{m?61ryMTK<)Dv2LFRE#hwJM2%KT69%$@YBr2hVDA@3KZMn%7C
z<|9ib?zQ`-vD-4@)E-+rzn;cVG)F}|Q$^IW#DhB1r1v{3(C<@##O~~DZ~qN46CwO_
zh7V-3d2k1q!Z~0*Sw;=Y5oAOWo_MN?Lvp2G<UhEs3BXXP7GsPJK`tx)LP(V{#{(Ea
zBU4hs;87*W8v3hcxU=5S*tkvO_Yly-i>!F=+R~#}*(P>r`~vj{+cWLWr;Wll=BNJX
zG)>duAmXMljGpT9=T1=z@+QswNEQ$*HClCPP2uiz8>$$X8Vir7^^4)I!D?3_&IUoJ
zN##I6v&F*4+rlzcOzv;>v7K2I-^yDoVIrg7Aqx!`dMGU|En+OUG!jP<MG~QRY(wT;
zNLifM$vpbO#ze#nSZ(3^FjNPb7bQb1VilMm(a_PMgM>yDaGx?z)Sknr$ZRp!A`GFW
z$i}l-_d2f^O_bh4gpDmSI3fbM+-PkTft;0>AeDi{ROr&E9zi?@6`Zxfx6l38erB{U
zK`*=ri$!8MXrK9uvr|EuGAOz=cwq|y$tuLJUcGv^-F*DBK$S_m&K8B!w4aY9zE7m+
zG4A*x5VlPreT|-xQCwG-0$@R46W~2~5DeULeXxsBueQ9OqnOg`v^|>wskny0l6xX^
zvP6W0!=TSV9u07IVhFmB(6wA(Rq!*3F-ToxYWx*2!ud7p4Q2tx0AXTdwZ{wu6&G3e
z4Gc*2#XYe*Ke9%C8je4f(D4vS8hEhNfnxaX;)ESeObGhEGt1s=;oD(1(+Clq_^=fa
z%^IS5^yn50Ic(8M)K6*eKJhq|o!`TA6`7H}ndv_E`#n@9_yFZL;R{cjvZ^=fxo!GB
zz^v9R?gTpuaQyWb&!AF0Y<4I*TJkSEcE{bAld|VAXTlP|aV5EP4=j>@2BpUyA*f-I
z{l$E);wg)E*f24+TlDaKA5QVVo2Wee2O_M^TuCpPUw_~nf1_5GkTBH=Q+fCsFh6kB
z*VjiyfQoA7M~dJ+WNq+_JJPizH~*fRs?U<7NdQI698&p?lz&3v)!;c}Y(XzO=Z)Zp
zl~hj#<kse?t2lUH2zZ`VoeQQ2((*h;gCq83;aE`6$1jEf!L)>g{aKNC(o|8#<6v_%
zHb7Hk&Gp<sdVL^)zf(DDhzk<TjiiA3#FA0YJp^GCT_xJ}dtv~_etDH~{B>nTJU$7V
z-OMk{<_^Yzrl^_Ea{^3-aI%Si!rV~YjdDnsrK#T8&BXfSD>*pG#`F^D(v2Nh@e2s_
zx+7!vCTjU|$ARXaF|qLo<O6RWYXh2lv^^IA!frhf?Opu#OS(NiHs%BiM;zw9^{uU~
z4rqHoAP!tZb8yWx=15S>R$6=Bs}HwR><%c>30{Ah$a7r;k0B?sgoMUG{}fyy(xy9z
zzvE{2gf=F`bfxnGrO8M1nEPvR^x}yPj&v)d{4K;HP%aFI^Ly;ToKO-p1-%WZ0Pdxa
ztO0Uj#T8e~75w+ZEx$IQKgT?T42aFXq(Z1!kPR988^eCI>K-FwY;XU_h=U|d&bC(<
zu5h<JM!R*ZzUu975=exmRb?F81P82W0!EOAF+u9o!7|{Oy8uV^Cvr1!^7Ehm1j2*J
zHJDg^hU-lG<Ow#kwp_EY!AG~U+VCISJPw57T>^<VaQXB#2;uzZb6UR#a<7!c=xBmS
z$ey>Bn_3?)w)(fdy?p{MJe$9&?*NVrYSxdl!^8GnKww<afM7hpa54|-E@55B26b%_
z4l7h(@g9tIA75X=!B<;Zd2S9P>qjUJNM~Z0NuddkODIHY*@T?dM@12aK%+j_i_neD
z95TndfBzN?d!shLaX2Z3x?(qYMH!^Jc2;3e3-sjcaNxFrqsBW|SJlG&iH*DD<Y9n8
zLH)u7n5P}OXQ1crLLMv)6Vn|)pP{|y`X3GR_UGBEHpVs68(ns?^77vSVnc2d=<i|X
zY0%d0&Zvgt+1-#?<L)IiyIa~DOp1ku-1J<YIU(J^Rt_x^>KViI!O;cMZ0-X+jrK7g
z-=s4Ay>-SB`N|)&&PNyZYhF*9NgX$YD7(T3B%I$;ggDYH6&}*7DA%cTiCR%oelc6y
z;S=JcmUyFVP5JRXN4;QtSha`uB;V)yR#fYgr?#gIfA&Hf6&_;V`8-{pkuK|7h@1LN
zG(lUL>9Qx9?i7w$WMFGNFrY!V3rz--yqugS$joE(qRG`++y%iPCIa@!Hpue%1~5rn
zm|Y-xS|11!)R1N-0n!RAI71(zQ9gZhcV{hEt@7+pi^uEYB#n?oo4(|A>r=k0yYP=A
zbkLiu4yz?Gpj(}WY%KL+p50bYJfI*r|NC9(5KXC8>?^I~qcsshD=0{wR7>_|0iemL
z(YEiv#dHS^A=^M#V{mDF66rU?G>LBys7*ECQD!SbdpkgnVH6${<MBqwb6yPEu~bXi
z;O5z`$VqKHaoe0|UgH%x*?X8(BDVScDjh7BBsBi`<Hd9NHOcw;`BKnPw4OubrWQuR
z{S7R(@!(XGV}MSV3mF~+gf(`*NC~*7wG?zh{1*8Ffpu}ihZq6vAX4)L@a)p^@;ppC
zv0lf&T@XG1jD*0>f^iJ<PWS~iU7G30hsZ09H?sRK?%%Vt(xUj>H(j*(JaKrweO`UJ
zl-B<)H7fq)q`opi>)@>(|6E>$b+ae7&MQX)zh1g7%nl3Mz88JTgI4G$>aH-L>bf$J
zMTSDHYiMU~DCfZ&o5cj{5;%q<kPmrRR~9IK-cg+2!w)`54Suzg0YC~jWNY(zoUlE|
zSaX0;u@Sa5c+P9X9T#95Ly4(xrSK1A_}S`U{vIK6B?>sqDqMMxXH;82|4N$3WuYX(
z!Le7aSxk`zkFI8lIz)!#r3$<MTjVQw3s>|$q|sG^$<JLNsE9FO7xpMAmzS5H!dRzZ
z4Y9ykFzbCc+~oi$N=hz!FA)0gNqAvYNEHl_efSOf<Y)?DOaSrBqL|^qjIXb68Vd0+
zkh4zVXiRNq>!$-4?7i&68$KKk%k%T>9&pyS&sI49LRLIjw7^69B|AF<wn`8%Ope5h
z$OOZ|<HJV@6K+%3zb$~49`SN))4*4^G!UR*fUs?^uRQtq`1C<a@^j5`veAVV5>n9v
z48V~O0dfarE>}y-vYR*BIsl}=IoRF3D=i~KE6{LaDqXBrDUNcK8$dy!B(+GX{`7T#
zB+V4WM}FPSk`DU@$%SGVZ8pb_L7|HfVicK}7y?UyU(j)UvrB#o?hc{w6~=G8rz+)8
zAi4KlfM@%9evq_QmxSHWPhrkWWKq}nrhVupirl<mspLk09_<rl-x0b96NjP|i8KA$
zi~{=`q75&%$}G;`$2K05Ul<;AXH@uneL?*L12yR$7SVQix;W<y4h}4%nsQ`WCll$^
zUX&_U3c<iZr=;}Bn<a(pE1M*Bl<W%?qnsOhy>|}m15S`m;R==2)yv=7+smODTZ9UR
zYfHvUM@yTPC!pZ&JAd^<qq0d0mss@Nd)Gf8s;84xtJ>1p^lix<#H6}LhYg6N4N7O5
z_uET#xf{Js$`brcd<&UYlhPRnpiDf+ULR|t)Oro^0yO;Pe73Ps384l3V@zF2yUYbB
zg%d^1{QpK?B+ssq1l64%rw_`ZvzOuBrN$gtl70T<>oCFU@F>ZEPdov?n%a+ww_<l3
zWbbt>mh{RLe_tWQV~D{E>bQ>`fLlbBJA-^MafIy_{0<|jC3fJ52!x%kV^42yZ>hB>
z2UherB*&tsD0V?Ym-^?ZsQ1GRM}T!9*#RWnjHxM<6cphgM^`I2J^ffFiMW#sGpp;q
z*WN=!pU_6*{5RP7+s~gB)eO`*H3wFo>CP@^ttnhQB|=g!w*H`q8Sk)$hK77wM>%Pz
zu#a=rYfb(H!iyy1k^+G^div_VN0l-Pq@ydFC0Z+h5(8`$qcmFh8dp3Dua)8~pN)>r
zsDvRA)8Eh#)(NRXt{;B>{D}%xCj)l6Utt_ZtA#jD*wH4aC$tsFS8^E%XWs+guR92!
zi2X~#zx33oe5hfLjxZno@~jDF-VV?h&u?yGHS5mhJnq8Jj#186u>vrvxeA1#Cnt*$
zjlY}SYqbF0f%s*A*d@#ZIl>#FX?ghhHI!BHM|*27VT(D0cnU$i=dw_;VaXHu`7=GA
z!wMGS<7}->S~<`8<#ruQGlPP7cP&uR=D1Azi8a6?Q#U9tmCx=5Sy$WmI3Waz1BloO
zler_HtX5DADhjwDS#d-GR9;cl(09P6O;)xbAe71v$$EyrfNX<d{QT1M<A-kc$eP+k
z%Jfw!r#f^L(MUEb3(!0Ktqlw^zQXGRNVy5)bp?c8(oHONfw#`n49Ew!LZ+=eftGp;
z?0WP)0MH?xP{RT6UmOE^k;}i}F_3Clt}Y1lHk_{mmfL^ZaisWow&z@bzaTw2KdUX?
z_&3jDy={5Bxh-h4N?yBxq9iP&E?)NV40nX4U~mBkardqYu6{*rZO4cENzQL(TCBXU
zhuYCFJhdD<DmMacPgid7Xi4BMhu&PI$=t87(%jW7R+GV?zXCWPc%(YkKf3l_ctPs+
zLpnMuBO@ahWjS83WlKtaYCxXdfZ~^&G*WIf$e;V756$y5yW~2MQZZ1iFi=w5AM+M!
zzREqX!-A<_c8hO<6kU#7<P>n)uE{Gg`lQO(7WPZiS%}&i?C3DLgY{8Fq2eWj`P;OV
z)dczGSdCLO8lzc$aiCy~qGES%_t#?g7g!=GjR&H|Ls)FwtXN%kCY3Wyt;x5gspvUx
zWIscFav}Hu!=FtF69~>*R7J3?xCtOOZtKNf-##oF(FySIe(sgFUbz)ZIS}CEYd>$O
z-UGp%AN2ZuZTh0GUfqRJ5mYt#DI6vt_YmI=%QIk{AJY|41E^M>e5v7wH1WP2vfB+~
zTXCH>ooP@#$LG4!QlS}h*MWhte&-;^8XXrS;Q0FI-vSSz=PRPet<$x?r2oc#$*d03
zZkF#vC0Upna<hmRD>h?ItdU#$qmMh@z2G{-dEsp9Y0$#sZfAP4*(xM1H#av>l<F%?
zpa^}>p1zG2DFWQ@Ktz+LRa;Wq*w|QAz(sOjY8y_G*@K30zsOu@Z5`n>qlQ7;;6VVt
zrZP5Ia#4c5dp20<*T}>K5ugrF>Qklvz+}(}oEMp<jE)or>YD)DWutB#z=2n+%_YFj
zZr7NVwYUcGuQ!~F&E-(22q8Kb4{m&<$BSIHIPAr0Z06p|L*!4G!RK4>+&`-xtE#C9
zfa4S9UODbs7*hP9AIbmYT8YL4ys`G4p8Pd<*Bfg16eR3am_$Up?d5iZc1i5uc%?(!
z0Dx5)sfX2a{x>sK4{J(d7|ns;3twNliL9E#f3!^E?nA2dwclFtBG~ormAKiX=m=`8
z{j`o$TFaJ62T4g?9-jygohMC%rE}$D^4(4<mHn#Kai=s7sY}Q2e2g>J)%(F_EWPV6
z5*Ls!Y4jL@;h!lCqMsDdz9*UYVwHyQ$y&_h`Xwj)TO6q#1gc-_zuyDaGc$a0`MamZ
zT1%Z#w3(zb;oVr8Tc@5e<K}3ibL^pIVDmiKci8_GrMc1FH4lM!kw!;N%XBQS;D8;Q
z$SfXot;Z~={t*9=`cXcy`4d8SSY+P@CU}MGew?alw~|8B4qCoS!HZwDHm%GI3~Txj
zO*v26z;f^lGL1pl)vp_3yA1DNLOj<OC%6HsL-CY~-|JPgidEVxR!WdK$$Muq3shNJ
z?-s?m7CP9YTyW&KViP^M=))um?cyA#=shbI5DqY)fO?$MZ?39*{j56Q$Lw`w{M1=w
zXxaeTNwZ?9O&i|JD0L4JWKqvwDfq5_0bxB=Jugy)rc@L6S>W4h01TEL$Zz5v9v1)*
zzKb4+RmvZQ1s(X)OM}HMNGj%3j9#j%^Etu*(n^9A050uWz}4ga;YLbE_6Cw~|GB^h
zy$6><=<_<b7=8w&3n>v%Ef=sV<9Ursz{Q0bD)&fSAyH_pNt3GomX@WZfKM<Cc~&_u
z(pu_(k&Y@8Mk2Lj&kuxK05m^K#0*byuMHQ=kM#Fr!SI?5Si?DSKtgm(%t5KT?D@7&
z(^_MCV!(@YxVKnoX^leF3O&(94b08+PQ3*mYTZYfJqk$=S|{aD=GLP~*CicDH2++n
zF=aTI4Ci29h0DaN0#4PDjt&!Q`F<i*abw^Dx>V;60?hIgLLy$u^(4(~dv}!|*bL9K
z{E`_%4#x&<Q6e#plyT+ypTb<bTu@hZoAC}Vo19pk?OL#>6)_ALIS8|RgsloRfKaXg
zG(<h<IW9<uh<MM^8n(bK7<3xX6fzwyT#XZRqNAfl+SweQzvUyOd-!n1%QsP4ZY>kK
zgvje{>+1=rva7dpw3;vtwtyz%q>FXfBBZ{+;@)~%`Yy*KwDq&3pKepkmnlMC7oT@>
z4@Dwgv|=jUVC!i8Fskw>$I>nSc<zUFDYK>WwEySDg@sPw8s~E-c%JC}dW$LAM|o)j
zoUxcj#M#vdx2x|V?mRrba*HnLAhvmNcrh|?AAa3Mtbx4esXWf*UGW=Mb}kO#|Cd?o
zfOq^#YrwFEym#0C&r)@VFnV=+B^TxUGV<T;Gok;j;=!Jut`P%xYc^&$!!Ppvqq_~4
zevv8gpmH;y7AGWV6aXOtfk=>#%Na6H?v;7|{&ie;dWVSesgLT57lSIrY8(3ET)X(x
zOC0TN@s`oLe}22nkyGPg5Tg1FnO__M=H`8&b108tv6y3jrepK7GJj3OfgxLl@oXlb
z#W+7w->v7Gsf#jORq?W9ZMBd-tyT76BHXc)OyCv7;`1P8*fIiziD>%;up8KXhyFgo
z$4G_yot!`T?)2&NTgabcaL%;s7k8PpY@Sy`&`(7)xssPOx~_|MrlTA8M6;FZ;mxAY
zRv-?zy~y`ZUV%vPXn)@Ub%))D8ba=@!M=+R3`i&ek^l%QwHo+W8bHX#MQq+E6NEXS
zh2sgBIKNzv#h}K4WqOm&tV%31%X9i{UJU99_?-cmqB?jVe;FXg-M#7=bSz=Dg7Z7j
zNSV$@2`8~1%Tc|iX0th3c=`i72~|`G>n*Zoy9ZyhKgooF&08pxm}PkeDL`rnQBSnM
z#X<7dcxy*T7P@l}*klh?&ix_xi@X~%jLP~sd-i)22D|6Xr<5CrNjCStAGw9Q8yIpe
zLPA5I6UnW8#BaV2{^3Nt2am(?^jGR03EoD$NfvfI3z#+DIw9ardh`tAfe1vuIl<gQ
z2+J#4pd>=nw~K^$5N~$Xa9bOXlgH7)=2YMQq8RGZk@L8$?2ob&hpr#&@EdL>9sW2g
ztVI8r5Zm<Yb6c5OnB?Rr4}3pZOto$jK6AEuAtWq(_mIAKW1(7*wvmg+yJS52w<TxA
zdYf;-1TN|Pb1XEYU7HYpHeFd4;d{iyf7v0A9CE!EV7$_SUXpieU|=h}O`nfCR?fGe
zFJobKwYDFsK_}?0g8;?(qGU1U4!to*8l)ylbfOXye{DjWHUKAB{U}77!#Z(?S((us
z{`cyBlSc^No}bB-JA`-ahGFE3)VQ2iE(&tJRJoh-Ev2KQ&?<&ky^5Za=Fa|en(V#%
z4r3tjvo21U^X}m|8~tib{q!kC9K@CbwXw%9@)W5E+zW_E;@QuQATsOnqgkHEmM0&5
z^>jJ6wFTWa-Ey&=&0DBCiTl>)e!H0&*wX(%{QUBa;I>cbbY`)8g!w0}4K8r^DTl)0
z3O8MvH{kW)W7jcO_&P&{vD|iE{1^_5C%4$@LDn9T+APd_#nvS#!t}cFbhX(<Wq^cT
z`LP1qM7bLs@=-XI{m<Wdkd$3LWu58m@p0km1aFz}NO~0ScMjJn_W`Z5OxNdn9B#%f
ztI+7LCO0@*Ip>~*{9zjMFJ>CyB&G&VDjniaS7{)oR}22~E3dXmfa|hg+t5Fp{d`)x
z>0S8%T$V%FpIAZTa;*BQ{{g5uXo1E87EZ&s0DNXb^9-xE$B;FCh=sUM!VD!s8UsoN
zI1wy@tY`a`<~XV>LpCpQKz)zhOfmF(54j$F&xp{=Vp<e=K%aX)p<;<s#jkO{h2>Q@
z>$7_yeM+2_ME$DD;@Z<ZdwiAig&8Z4rFTgHj*v3tA^}s3AS4Gp5o*%W`j{1k4~Orv
zg6ux7>W86yf~nipY;0;NzfQX@s@|mfdrvFA^Vof1Y_d$tn~PvIyF~NZr88fLg0mc8
z6Y%39mW1X(+ItG@wTH2C_Z2bj#<EaKVBBr^AGJ$;g;+%A<jEFYdPgW%2^Y7U6owtB
z-9+pG?B@Zv{Xg%L%_+{0lp?ykV3h^%XL}D|WUUYVHgjWi-A~Vf)G{f9`ZV(1(vpRv
zX7i8EA0Z=zmLVJ!`&?;Q<T;Hlyzhv8USo}KjMDvAzgkE2d;VVzwm~mbS`^@Mc7ih9
z#hVFbfrVPl_p0;l3rzFte+j9KRj~<bU?DKA%r5_u2hYPd^#KStC$QvDM%gSBkN*4Z
z!*1CN_fhxHx4>cwHWJ^^L8fARx@Q7dZyOj*y|W-wbycX=+(O1<r-Svf;}y_GC}HVP
z>|pX+Zq|=pvrh1q=k+16mD`?64m~IKf?V&E*Dhm~UK1vwY-0KW#~p|6nBM2_bGKXY
z>-T8Cf9sn%`gV32eZQ_u<^wCCnnoH_QEb#3H%eGFtGXHCd4h-5x3N(W_EWm*rTs~G
zUE^WvsR_c?Ump3~&e_Z&k`EHyxy0Q!Q&*Q`NYxhfGkcM`==|NG{irfSI;D-TAoGmO
zJI0H%xbWb(@l;pl+%e&&{t%uFNO6jx^#uYU7s%BBa}s<hM?j~Lc$1Zt^$kC{>cjqq
z`(=x6vpUM*kHlpw0X#|to1e@q2tfogSmdWqH-MTa|Cvp!0zyu$p*Qy>WYuMM2Tt5u
z@gS{W3ziWsd+FHRMmbmg<F)hg75mX$dxASLgwmKwDqT~$Z<an5U>;ptjpgR={Ez?p
z6)D%XDq7*a%StNQCUk_h^3P4WKYRFM%Q*B){gF}kLIYnPy<aaJbf?4jN#Qie`zePe
z+rM>qdU^^PfBJq!!WZWm%oUGX-tE$W$5Mt;zC0uC*!^Rg_5T()Uk=`4OHI2(UiREf
z7V)M45(v_xPWGYx)OvIW=cB^TIO$@>Gx`6&t*eQ+r(7(i?2>8xLpdp_6}c}jd&93<
z%nPEamYU?r$u&)X^^O#4)v_a2UdcHi1rAX7-lTl~9269U0j`(4DNkl!iZkdS5L*~g
zW9791%~y>*D|K};9|kQ`wSQMUn_HyBq2x9Az0^YA|JrDE3NIPcYwxK~Va%``=gjpx
zUDB<Eh2g_c)|NV#oj+oYlwKz&K%-&q`(QFvaUCX23+qh(LKj+4zAPtH&5}|}0;p&A
z54<vtV4n|Tp%f?>fv)>K=q`-KtBX(%yod=1_S=El#({!?C}aKSFi#N2&E@=7Nslkj
zCRg!RLdMHqXMZ{`>11HY9mS&cP`cW;$$Sc)|BxNEjP~5Y8@<ZFo$6@)#<P(&y!sjm
z4|TkMDJOSt&%YMqrzQJcsAu^v0*_HCU!@JEE(kJggB>|lbdT=o3=C{22>6B`Tl;-)
z6`uJ=N894hiTJwZ#eo1}))ZV8_%I3mmS|We+Y?y7@Rm_?==@4)=*RE<$2D=Ce$T3K
z-%>s68_LS>T%7%1biHL%)oa-Gy9fbkkOnDHX_Sx#0YOASKv|@8gEZ1zN|=Ozv~;J^
zQqnEmE!|!3#eSaij&nYoJ^0{Y=tkH2uRG>7=WnJ{uveUad6HGlj%3z(poVxXowDK0
z`R!k-tY>!bgy2Ubyo{fj>L&G|$=?o;O#TWWVQ{}+t8(y~{RLN@52%Nk_KU`vG0zUI
zbp=LWQn)=!_uNgA96*vDcAXu$h$l7gJWTWmC2(_Y*+$r$im*IKn_*A;t3G)Iag1Bw
z2d>1Uc%b(bf@^U~a(%$HyPj`g;?q0^E(ORZ2XM{RxIXO1u^2N3wC3gIy?Fi0wqA!b
zdLFbP7{$SE;Kg8H=D4CV3f`7s0MU)zM!f8k9C1TdE&hB{HLP&4ixZ8*f2Z3LXP0Ab
zD7>fSCo+~xr?UD(!eDsTFEM`$)x`e}7+3cGs$<Ph1j#D@mGnv{2Bvh-&}eY42lh~g
z2WgVRsPl1d>EPAzfzm^SEu-}4>Nbt(Si>5hMt{ydjGQM&q<b?Asybu4gGuG(e;7Y+
zt|~KG2p$HTdG^KAR2sa!8{1M@7Q`To#_iCYmOxJTN<gbu%EZoV>o3FY_$I=&4_i`S
zq6Vx(9-fz%e|eK0F$a-382&cEB)|^h1^dxms?S{gz2YC{hD&>es5>vyd@222p3IWo
zp5cx8P^z0yMsKL<D}TC2A6<_3Md+ZQ<7&xf>-&$`rKh9m-*W8lv61*(>j@FYqnvPf
z6zv1$5r#WxKx(msInq}YIJ0t~&wxuh1a2!Ck?VJ4*vYoUoHw;!M#=@k9u2~wA^d^L
z_qXncJPo6e00E_gQ4OMvJrLLeP;W!y*CA_#ap#qZd~bh@1CE5H<+Qd%?vl{x{C75!
z)n#H_47+ce4_v1fP8a@bjKD)iQk3Yt*$cDU7&f=&-*fyG6GM5;wXM+BF`R$pxJx+K
zLckHK9Vt`X>(FFL37wAlXfE}OEHu=3qZiM9;!h=ThUsr<GLaO;x_;b`4L;ewc!!Pg
zB3i#!BAxkzwyIHngd(2!#G@b2ABV~uP`vG7Wg?@*Hj!REc!9H0FDJiP4X2GB(3vA)
z^#LJwvQke2c~o4XBJhZ+*c3>~c=5TEjhBgp1&_$`JS|4b+t3}1O|wL5%-dXeDqf+7
z%lI2pAI^7{VS4sA;>TmyR+gV>6%2a=bK{pAXdN(Vr1L(12(zf}Cr_UifY0#44X($m
z?(Xhkw}p|odQa|hcR=&xXa?MSuf1}hih&0s3|?V5AP7}*aB<o6!sO8itgboS_Noaq
zu~q+~2Mz12C(F@p-M-!Yr);zHySVe5eYwBmIL?7!v0C`r*Z=A}_|*qxg2PS<@ZT<n
z-NWRTf21gLi%&2wU8wQZ9e-7Bj5U(9{Tu$qi+?lszQ=qWc04b<|MgT_c!9*MjE7O3
zGdYvW;fBw{Rj&8!?3|&xu^d<klMe@4J*TT3cw6`@&-+`Pp1l2_dFCYWoOsYt2|bOR
ztzQ@hq5yq@y;p@4`vyeFbh3u~ci$dg|DRo{jYwC^cp5aAvMMGAW7yo;_6Fj}K1Sca
z+w>Ti@K9W{KKS5=xPZs06TSc#bWgxV8_N&uAR|-Ld2rUaz!Yl-EO^5;kltK{W4jbU
znc@2|Qvb*{ns@;b*^2{U488;3)*YA!2ezuhNT}r+TCxob=AcY|`#fstVeYWXdDjG8
zGKbu)^!roQj+g8;%KU84@#%k-AGG~f_(7eEJrPPIX-ZevmVD*9k~SJ(P(l2?$Zejx
zA(}#F$lq3#3&S8SuXeI?U^dbdne{4mOxld(=u%0kpas)qY~tqMB(6{+{lj(g|N3l!
zPRRQ2(EYtuz$Xd>KXcmOg5=>N?m&YdbuUD#SmwpaMPCfeNw(P7A95vTg=MtgEaF|(
z<O|wW*<vHmeXo7;X#W&>FWR%OTtg~D<7G=|LWV_K;1JI)e(pC0Z;ZWydGkZ*Tjkz5
zK($#`mScfjF-nq$Ylh;v<UX&o|K9DoF0n$7bXSpV&Vrg3SNI=>$TIjjV(4Eeh6RH2
zqM|}@?xh0*G4|gAhr)`gs^{aS<~$C^+q2+@Y=YF>7w8AUrxmm}nt*d=Ab2WdAYE}y
zk%tJ=;TO;iB1vgWC1;nXy{|+S<m4FPG4%&+u=afSIYbqoxBt-|WU^P4gV|>q#=+{$
z#aGMURHf1O-1D5`9<iQnGK?`peLWe-|NGLbJy5#myj)xqwM9UU$#dkKgg1@JDSkuS
ztH}2=GrOMka*!V*UcQ(MHkz@0&R-tMU;mb`I>}0lizThCH*r3b!=V$FDoEa}PuJ0v
z#<mis?Vmx`(wiT=bLmr`l$n3IE-sppz#tU1(rX7RJT`U_{aZQjT_z1Q4liLfxOEL7
z#5Egq>tDAqiFv9m=wI=C$l>6^eSve_NkCjpBg0a;ztMeAm78H<kSQg>Y3j}Lxc%uw
z#k6LCu3+dE(kcZ{6MZRPz?O+iYIEv!{AuDtaaAG`l2XdwOa04S(au8+W!jBM(URy5
zA*FAoI`<2+cZFOC%(j-S9Ds9XxXAL}4*V)gtdZ}Ych^_*x#Jwr4Da!M<j;~!{<M1F
z1|b?cnCV+ZL--dss-@Qx(KVQe_8)@<;v*zC?|~LBk}KcT-ku#_QzKdd!Fd4l<(%zy
za5cj`<US1E%0jdwL-U<Bk96D}|2^9LqWIO}<fQRUG=-bO(s2L(>kYwvMxK59(HrqX
z`=eTa-7s3gS7e08EKQX9dSCr!=O&3>nFWnIOA($j>Ad_wZq;=wC!@}Y9W|#t@^f4q
z4wQndQw?WkJ>pW(#zcHI%c>(B6h7Zw?6`p_e`MCHr>hzZo^u>9`nfK|+0<%`f$u&c
zmHZNSCt_CVX@Df{11t!ZLjiCT*jYX&CVGdcoOS_iq9MEgN5mA2K%Zs)2l?w?|7n+q
z$Nv$p=KbHyv;Pm|Pj&ED)UXl7(hY~f!sK`rhO#L!{e9-pUxnkcp_RdG!?dPbW1h^S
zJUmWD#!K0ir@5Kc`~@QIQ#D&kl3x0U%cPM%tJ75&V!akVO7H#%7~ysxjr$(HHMGw8
zY7JL(K#CxSBr7ZXJ57tPv4)Zy3^8{RNlo%je5yPU@4wCzC8}hxhiXIbB0l^xHNqKz
zi_ZfBlZxnz;l(z8O!N5o4X)dwuJ=17%nu984^Gl&{->+yoZsv+2N(GSeGu*2`o^0g
zz2@}W)IYbzroHzIQ6#6yUhk}*GHBPj`gRTVN}Vv)|9bbYdVSSPo(TaJ?Me&?*#JGY
zgOyu<LB#m*2G4xXbuHwM7S269Qp`#GvHOv7{NnD1>^%|T%n#*jG|Mawx`D`6Q~fj8
za_w@X>M;}XEG)6`%2#(i=<I|KN=N!XFjW}y=52|M{*f2)Z0Nl_TzSFxiI5T%(Q7dn
zw2=9n!$PGk4Tm4Lw$Sh~KO*kr<_SBxBZpRxOTwMm=9PrfSVm8ezkz?sM&ASQS0xb3
zkd?ha(NNZvX0)Fqo-xn5&2MnLiYr!3#R6i_Gnjqfsw~vPJ5`;aulWIm1@B%7s!2Jd
z0sBCFp^gY!bjxd1bxja?{*9E7aOU;}^RH0g_qF`*)t11fP^ql1y#r(Wb3snv@Z5oL
zdF;)K4;E1s*+bmA0Za>`d<QL;Sjj2Tx_gI*$R{|;N~a=1II`d|QH~1-O}^V0@y5f`
z^DL3x=+QPwME_lQQiCm03^|+pKTPRx#(TuIqs#CSGbYmKDEXJn775}SdlkGf<~dC{
zi?3cAbZsff(thG7`wmMcUo)6zwy1*s#}HcD^efkwk_6L5M=Nx)Sc3fSbA&6^s#VjO
z6~#qGEOO7Dwf!~YEeH395X>r4G-FH6BxUzlUZ%4{>Z~AxOSe{AJMN)c<mY$__kZ!}
zHeOeI|5MnNBPrMU>aowynz_}~{RVzzAGkL)5Y_&G+Z?fv=j$$FDW}XK)c=1vSy`g=
z(|0?Hj^9r=zq;Tp3bZR{-$7@=K>N8+Kk)6&Rlsg~Fm2`1f@sn}nHE7h8QJP^##5Tg
z%XIv5@F&57zgGxGs}FMm)-MeVQj*IxBUEnt!~}fuhlH^^z*G{>?{yANS6=;h`El`A
zC6yqu`J)}FqHMHQ_iSW-*~>e4)4!!B?t&|V|L)w(YXsfZZDR#RMKQFQ&ba>6h$)5u
z7X)E7k;4K1ruYACD?9Ib9E#~!<e~82YjFOO9)ZecUi!ZXD(O_0|JA7XIQrysB=;ov
zVu7%H`!aa7#Q1J(M^4{&jpp&A<N3Xfzvuju7f_7$f3Z|os9h!=p0&zdF&>_mXS~zp
zn2lQU*FP3wesKYWEDTRH$B$fHF4eMjD01PBIE?87hmNOL;rADwfT5%hq(22<6n;%i
zteXKDdQbOqLRdlC`3A0bhvzMNR3Cl4AF{tZ>RJ=0o3CDfkB@)RVN_fRE65^qSZ>jA
z!Ds(^+2mn!gR;O1QH!)m`^UG3WTR0gFi=fsZv6bLWI|(H=xa-XldOMNy>D2uXnXv}
zjOUJxl;`Gjo$j{KG@XF0USP+QlhadL=n6PsJ<|b?=`N^oRn=WB*<Zg72;(-MqbIFA
zw-H5uAP6&`^R-JE%L;9?`-EXcMBHcy+=%?v2UPsioUErUVGNG8w!hd3v8YMNNXeF#
z7hPlGv_$y6c96;p9ShvKvk_0F)6s&auCaUND7O+6Tiw&RhookQI<X*x&@D-!mvYnQ
z6TgZKVcH5;MU|Tj(JX1v2yJY9{10xoZV+Rki|2x@ItD#T8s)MMKvHT>G@fzW`6n1G
ztgmcFDp1&@_wcbkH^_*ubEbbn7yzP#>W{G~n;yuQg;TcJ!JwqJw6xR}M(`(mCwa(A
zu^@w|>O_BCmaWYqOW0sg>Y+wY_$x~LyH0JP>TzA4nLHK&!4ZEMr;+`MV*?hNM8zCa
zW`L`#;Nkc5OtUnWakfagHH_d1OG2Up5*=Enq=Ay&6%86eXKD^A_avJw>oPH9SOohw
zVORC&W=rSt)3>`y%^*B$c?uh6+V51xUrsAhrfZj42VZ?>X=EoW7|+7o)_CJJU$W$c
zLwQGQc9QQtp@lbIsOmYt;sj*7_+Ta-MlqOiaHKGCn~mn`>(`jo?c@553dxv;Gyj!3
zRadW&W`iD}9`FO=<3G_N>SA!k@fg?!)2#s%-riTr5&g~0!FM$r!6kQ4V0R}SI%RdA
zF@5P~?|6iQ_$*73HE6+A#9kGvqN#KXW`si^!nSB-y@L9yXbxO1LM$p68ZMb4@N}Hd
zHqiYZZV12C7Pe?7kvNPOJ~m$);%n{3@JY-$%Lm@nYsq((3SJ*oVqs61(JiqoER?YF
z_#*Y1pA-Ro4s4quE}JvMe^dW_W<#*Cq?z13s49n(;szE2JEGl=Mhc4(JV%8Kdu%ru
zfL~YUG0^$HkIOBD5ICeqazWhPJ~)sD6cWSNHUt9R*AL*)qXYNPRw}%kzk7OK;LTV-
zo;0xU-S67?+6b1kH3YpV1CQXW##klH%pxOH@+WSt@IhBv7F;13ApBowIm`(W*oEcg
zYbSQ(gk}cASp)au9h!Gl=&iRAf%9t<H5@R9-X^iJ*(%PRheQy2M}yu2dSPK|aBXtb
zxcJTsfIEA(16utMztu?1->zwI<$oen+Z0b{pIu+fxI_?5RJbR;vZ~d@%B~~C)|Qf#
zqyb04v++N6G_Z>(oaSB+O9J~1hJ6?kwSMluVX?P+8{})ev+k<Bc6Q{al^|HTj064!
z1{kHNa>~Bpwf{x8L$RDcC8hfrH<0Q!_Mni})tV4-zrAHmB5<nb8OcX}UfTb~3?UVN
z^U_0b6)ji0u4ZBDQFC<ass7@rc!chU)!;H}FU#?C1?p&cS??m#)keh(!g3ugpQIoV
z{rqqI7&!2<UH1?OU6-nF6M21b-mj8OE*$&w*?2SnlYsU(&LCesDorxkc60Fd^ww5y
z@hnaxC6scVOgcMYZsK)k(4E9QrO^@0miyXlN0SOoq!97KE?MWnHO%eu0v`J(NXTx!
zVvQ7ovqLI#+B6uO1i5kjfB*iy1*w8WSoiQO%1#qhvS`3cZlp3VhvnMR&|q)|uAE#?
zPtO<#hk{&2&&HN>09|_*VrS6wi^Y(rBF8nH^eY@j#DIMgct~|sQc-t#%69(!<y!bg
z7IXhUv(1y1D8puhok5r%Q_=lqlr#y8<(8&bR19Kd#rDJ^vS#^Ua$(i*s48FcXTJpF
zXCLEH?px|^;oKCs*FXviTwqc>_=h)Ax$;vp(a=6ndvjs^yTv`V*6AmPci@I`O??4V
zHv&*=_`p26<H6IpXA`D(0C!$gpr-QkgQ3Gku+rCg$`unv>=Jr<^t7UGM&%wSyK;?0
zQW*!nTK)#}h7WAJhd)ef9j+anZJ@}r(LJDm+Q>FI@4`Wt)3R*rh$Sr&xX%lpdKc&Q
zXP6&qd0Mjdng5N@r*JYSha`0fX4Wg#^{E<2oNY!PL8^z4mR4tKAql)xsFJNoKxdbF
zx7L>Qub5K8f7*s+bE-lo`_pG7!~!(Na`0Fo3iawyzjm;Zg<hvoz-KJ7qU7N}$<9Oz
z^Ohsekgdn#PnV(m=rLS!E%H%m;$IVZ^Vnon{CRA5-teaBZv2fjl5YG*W?Rc_7Gu?c
zjRoQb0_z~Oa>0Z?lbZw0^2t|>gps%ZxXIoK_;iZ!?S_V|m04=poU5G4F1O2UZd%uE
zi3YxXqc!`nCZjK3fsI7m#$Ws}LGtWvGZcztsoiJ0=X^K2b>pC2Y*nrLqX_z3F$TTK
zgaCq>N1acoFF<k_`~ZTljw+%!v|>prfXoT9G$^#!a7R3Ln_{`H!GtPTrD^RKZ_l0H
zQy+RQziVWB>Pi5f-D1Yq5a_6eKVSM|*5R`((_A#}w`?F}6;PC}R^mg_!P$DWIL#ZN
zN)G_S%LBwMVgReadQjih)zv*Qaoz+It0IVU34s-K^hQ$M&1Ew^h>pCa6Midyk1P~g
zorq{@@xh2I%R~%{<_pL;VvhUx_@D)RV&IGE`_X6i5A+L$=nnXTWKxn6v);X>*7P=7
zldt6q-#qzj28uVRmvnPqW^@D3)lQI4l&pAb!WSOk*eYjB4;l?ts|P@TSpC2UsKHY3
z&}r6yWMT!I>LFLGIpepp4gPiiZRWr!SyC#FP-&dyV$>iaUdy3%!Zcop=X&Jc?Bn5J
zFcNBfV40?p)e8)e>xm|RNEH=Aj%9vxb84)!GdCZZV~irdoT?^rMdp7aP31kLntTXR
z!H)_Flj{O;m|MVM^Eccpfs2GDi3OxrCAYZ<;rez?D`9UDj2IPcNyN0X=ggiWPif_a
zW3gP?7zhXZ-v}A4fR=9xqwr=39wiN0sDWD7ZmEOMe~bp+qtnx#moF9)_jA=iW!RTe
zV4GdUv4u35zy}^d)(F6QrY&_4`AT;nwHBAt=gt<rVZqjeg>gmziu69~NH4N)oZf;y
zGm4qj1hq7CKxTewU#P0RJapgd%|xfEvZantp&8x1jYyjQ7bq*=_87D755>c`*(a-a
zOPoi?$A_Q4xO%ZWx*LlT)#&?@|5Jp9&n#M{Wa{7@QH~pR7uBfqPicJ0`a9b?I@q#3
zZY#^ZS7)!KA|*X=HD2VUz^$o`IlVDtE$U-(5O2G`?sUwb7y6alI`xeM!S`B{uyV14
zUyeL9FaLOjtb8pv%x)9YtadC@_0nPez%dn6n&>UF-t^w=^=`~~z~l8*>~CtiiCniR
zDS;B8)i)`6ZGYYnV-43%OHcm-^hmJv6H{LP9{FKj;=4b4nTJrKsc4t#J8)8(KE7%2
zQORVjp$K3{<0Q)YcJ9gF0nEmglL%}Gv1+#ii`4%4oF6$#oyAuE{nk?dfps1lwGv9G
zj$50UEX{)p6VCY8VkJE8<RD`D6Z(Nutzmqe8irrjIXwup^!EoCPH87Aoxg=zRZ57N
z_Vi%3*g*;c4Z8TConjjz3Ud(H1jlz_4D?Xi1bn&|(eH8VkO-L6us>W^S3@@>d_mDs
zp6LTOr(7g`$$V`2y1LE6kGq`&4o_brY=1o2^JN*vK}%yBy4vliJW>*=H`DbJGfi>~
zWLdt4AThI79_}E;Jf!&(>@S|#tNs3o!8>V2^%3UmL5Qutg$o>Vv4DWRL&oc5F<OUi
z-@V6ftKQJ>1;!DNkl>gp7}aIa3Sr=onoheH(T@iZkbP00g=GTSeDVS=V0Bzqm*A))
z2NP+EHF(&5PJ@6hRk6k4JrF)Q{aMIocp<B-o^|>doc9b+Is}}W5onZXd(ZBt#2lc+
z%uZdPM7jJy=j7(^7ciqtDWpDA>>lCH%JEJrpg;B)d5j1}>{Eg5{5AsSp&V$x+pc5+
zmE?{@LA(lqDbgrK#O`DOdk4H!$&R@pP+S7Da}78FXRmUxo}<zR>#|?cw)papc|$d&
z9w06kGinV$uYZg;B$>}{Ke%c42*M%xE@Z;KQ!D$CMVbYU`m#m?ZUhu2jVcll`Irha
zXk;P6(Z5G}XVsi$;`MoN*%9W@@`u~sFp?Sy<EC1Z)qLo@rfvmPqw?98lzgHkf8W|G
zOo$!$%l#<7A}}zmA|nGcj3(HUf78!z=AUkG^{Si8+|@|c>Na!!q5Ed%sr5w3O+wjs
zsLEKI%`BTFKT`r3r9;YpMa(JvDE(DM;`}8E>O@c&sgJCNoR^NC{_vG~#4@c`t9vBU
zBT^;I<G$2g1DVsasiWGXi}8`ZMJz4F5_-A?QzoBubKV1IG=%{(q6L)L^uFrk`vNrh
zn*4_naFkSDUskrGyztG8=9hc_nv5Nxpwh3a8}aO!p29}9=FbP<U%pNkb+z~@vPSM+
zW381(8AkvQ8r(P=U}|E*ZBX>hfI@Wsb%B`Y^3SxVp*<SKMk{@nz9ybWbb=kb+OfA9
zNdNuus0;5QlJme_=LPK!8}7aNj>^_i#%#Gt_7xs3FqYzc0n=Vtta?zho}-H^3_wyF
zMOqmg#+a{I2hq{keFtEOY|_2F_c=ORZFi!VHyp;Fa4N$9ubmW3-2lmS4Vox6Xbv$)
zL{ZqT^#HH!6T}den4c8&qWbhQosokt6b}#@G*&hVqLZav(OyI49~44vL?yo)uyAf&
z*gd&;yH#H0bjrIox4(k^L8oqVM(9V{w%9!sX#K##!voan4CauPSRw)KM@;yle(tY*
zS3NfU^Y`!P^|f%CuBGEPdUqSa)J8mFldhmB|Kf$|#s=Hc{@z}dv~onp)07c=c;+Bz
zzR9iM5U>=8<Yu*lFoqP0PtUTNJJuN1oy+ALQ4E>#dZc%Fd0(x8g2}VmR`u4pHlOer
z`fV%*aU68N6<yB*Qd$ugAD9E5?>a||n)fEv--XCYPOc$1&o5xk*RfCfTtVUWF`Qgp
zEi6pcd0+K&r4rvive$YL6o^a>tbV+++)*W~*S2U6K!h1I93;f8%Qh=mqjGj1_c=b*
ztwU^<x%Y^H+Dr2j7nK&%0EIvjg`5$EVCOx{_HK4hmFtRC%Px8pvPEx@YZ-xf+N~|6
z^yVR1PhvRaS$uoQ=b+F}y~LI7&oC={whZ1yk=vRC`|ILwLiWe94rn^RW^4tL%ul%z
zo2T)LWQuWdx>}5z3K1O*C&6?x=Zyp|ub31)7wlp2PAapBY>L#(3zEM#00FGOwPEBh
zLp1a9U-iP-PS}2-^|KffiJa|85F0!_J+Tu%tl!<<ZvF2WOunc*m^_?(Jb8S#&K}p!
zk&CFAs%spyJ8GsKQfz5^*B0;^$Pi0<fk;9KS|G-C2M)lLenTgbBf<=#FdMM0KZEci
z+(RK6QpwNEY-TR~Var3T&Iukn;L#qC+m#tKV?!Si7HA-P6c}I_fQ|t?X8<|m;Ss5m
zNGrS<&Yz?r>1Jf-pwUJ7reQRxxH)7x(m}T2j#=?HZ%dsrqo(G<nMC>k^D)}HjNIJS
zG5GK2`VihpK<_x04inAiR&*Z;sc^YGnlf#i*C(gA|K9iZD(&AM!4aV)pur~>;Uw4A
zNxsq1@F!PuLsohD^S8J-G<H1`YaOdLCWLxO$_Vyq#o6UE!wnacB|S&Yzvsm^&*DFf
z)kvcU5iPdVH2+=u`0GIfR_bqV+_ZSf4oNt`-;axpwPv?)A-bX`+94pG-Own|@X=N3
zhO@UGG(p<bT}0j3ey&<Tck84d9Ra#P9Y-<Nv8daA>*3CP3nZiUSE4av`MIuYUi0#7
zQb)|cP*upG;HARD#wJn9;p;W0gxD+k5KnV~@Dj=90I607cAgPx0(KtNaIc?INZir1
z+K5V&aYc$bm9sX^)eyro%fem*%9;%S8qqmUF?7VYcY(i3ZCIG*8rtw)2XzI?{`Qys
z4W%ExHLu_N+t=)|5B!PD%Qv>cZ{ZBz+28T>;Bm#3`9O0cp_hc;M(62wc2XPS;s>s?
zWM)pdyh5V9nxc=^MKQw@^7ilc%<nuf{DZ6P+5$%1%m>wBrJp)T0fy9@>C|iH)H^(@
zzj9vRYwpNQF@jE&hu>MM)0<iLj@%)02`^34M`gnGyB?C#yNEec)`!y1;Pc|zGPzi_
zWh$xjmbhY-`_+zaw?p1A^V{=Xe}`<wd>?{foGX)>t4ko<9s)xehD+!Q1M~q#5c3>E
z`wckl{tE4UK81nnfVKe5hmC738u2?FTgZMYJw2UHy}(6;7EDn7a4(E{$42`x7={4X
z1Vf9mvGGs)_n4SOFnSvhD3T#hT+<G|rew~(xG$fX<FSvW%M*5ujEImkZnNX({}~I3
zy*8DseSU<N5%=iVkmFK0j4ear5aAqX30HpKoLzbl(lRg6#Ghp!^AOj6VnW*u=4wtJ
z9;-x%?Zf=1u;1zqG&L~|wYST?T;VY{`H+)}fk2#=ZM?E-mTc{>n6a(cjuRvQo%&^O
z(1MR5C|N&%NXA#S+rMBC>EZ!f5!41r1ae(NO|N-JYwA(qS*r(CWjL9^2lsU<-AEo`
zKTmhcfSc`gb`(z8)vku>Bl%ZPzF|b&;MKgna6=Bv*z$44y`7FJ%FA|@Z!I+PU6^S%
zQ<<|>=yKbGFvJV>%*vR(oEFHL``&IlyEs~)AxJ{l7|0pL2pGjMNl>ubmxoyG>$K|}
zhc@!+&Q~W&7AfQtcqwUWDWZnTdmpk}$ZZhDe+x7e?_s4PHSV)-Wz3Be$H*Z^S~o4&
z3c!ix>zrYZ>dK4q-J_XA)SSmCfhvJEb>jvululL*+zSgK=&y`XbJ;%|x9+VC-`cxs
z!wAx+_%7_6|3jpmO-d>+54Uj!<Vcs3-Maum41+0_EekeJf_QL`nyy6GystjR_K8Or
zHGlWad2Wh5`>x@Dn(XGkf4_!0I&!S#kz|sIV$!KahA0S_o3p$@X@Ya*3G8~QkiwM#
ze_;M|Ik{Nn&Ap~<Igi3qf=&NQ9j8L?9^WtX1Ez{MqC3!{TLJ?sq$6!O`1zwt-fjp@
z&&>QuVbBdv;uRu$u4bJ?KzBUoHeGNgEt$Nnnr8fC@H{P^F~FyB(XVkC1s5&K`0h0w
zW*5d-K>)ac4~;I7WJ8!;Vc4<SP4?JywlYO!64e#LSwK|jTUcmLg$8><qS*y{1Ms7a
zb4baT*Xi`R$h`;H2z*cxu<G{1S`<g{_<HI}(5;&FYO7<usH8-z8m^WsFmX+14mo{3
zf4P%BXkiDR0TxgKpSmIo=AxZ_wNa!$`#bE1rUpG)icHw;?8%bv7$oP$GmHImqpIQT
z-xs7HdGf#3pIh_Pf+OnmZ1?F<#mE`!6NfxL7xuc{CAQT!*AEE`BeAWRXvGd_beEJ3
zMX9OOPB;5dxc@M}Ro-K9)1f0mUQmu2&hgC=Y3{f=ziIFR)To~SThQ~=F_J?a+nBVY
z_3>p$5Q0ruhcd*JT#ku2k#WcP0m!|aa4+@ur=g^Bj36xj0T(@SaQ}`ge0$&vC!3@s
z`Z%z(i)Hk3&%M!{_yZ-4v=9Q3y94B*cVBy!pTY`{Sq2*xgbRRI8T^FNw`Z)(<?>*7
z8vq5b#>?pg;6O1CqkW)O5-sk)Z@W<vsJPU%y<A9-GsDSXgajXdBlnmvHew&Q5ov$r
z4^>pcN{mD_alF2a_b|YB4WB~JqHNF|DR>o9!TV8IT-*RlJLY_2%pl$4n1cGVZ|E>r
z{n4Z{2=yGqIAqZs97RS%o{N5wgbiMQ$!>`y-luqEK*F~+ZbOl$*wM=yefsv&ezj|j
z9JNAQ@w1$pC7=7gRNdP^nO;MuHxlGGb7;AU<=UIq*Xho|`?!CwyUR*rjVbU)KwaiM
z4juUyf~S)}{0RQ_>sMW;6`R)|s1ts|s9Y4toGnreX}AmAndP}@m8{ZdahG{pe5-#6
z>$t=}fjMeHi{@4+p(IqsDRCz9{4VqALh5}}ReLe5@v1NUm)qYC%p_*MP+J8j?f}C6
z0vK<-f-V2Lgb_Z8(e9g|P1u1k4w`5_YZe(u*R`V~lbxPi(6MzEv#ZgCHpvAdQmanS
zpJmqBD81aQ3LwEcp~1T0-9181dZPOtU0Yy8bFQz3nkrt=y^Ppyht?R~oaEcs6R*Bp
zn2TO%oK32k*_ypcTUoTP7=e6WipW}Iva6Dr@!yoB$G)h6yI&*UgO4;XK7JAj%8R}R
z>gxQw_fu`s=4Na<a34fIAxrEj@C1GP3w<i7ClnR!Z%t3rcQ`|Nz$Qp4W`MG1gRzSr
z<TZes7G_(aT{3rg2kv0J3U?qHAMj}wZhz!#a{#aBx0$M5nFc7K5F;ZhuL5~`&a+#`
zZ^nbjr#<|UTT>EQeUF(*=HO5i3n!;I(uuPV5H26Sg&o*y#tVlZ5@{m*;DL#j7SlUE
zL3B>P*Z(N!u4E0b>_4;XGsjR5DD=Max(0iIHTF6_1<s#dK#YHJxUS=d*zK>13RUa+
z)Kc5MTs$~kb4KIP{@gCHWh>R*`6Xg2sEs8piB@(M?9^Y~x_g%_^c%QFgX-RY*g?T*
z@9dnQ*Bv(ylazh`Yi`%|ZWKGBwXIDV>MHj5Bjxx|6K$EA;c%^nj*JE)fXy1br&S<W
z|88nR2M6I@0*b^Q2-fgjgE2u4W)K!Wqw=u}(h-0WP<`BeWy&|FkIM3g{|+#Uu_izC
zahIN3jg}aw3Nst1B69KIoSSC48s-j2VU8vALqWr!aJ+=h4>;H>yyE??ZcxvvB$<Eg
z7|$b#1;v?EPfffY@Z^lxtFp7>7HLQBf5O2=PS?6w<f?g!kN>&cbh#Dhqw3HSL38!?
zoPJ%@kxCK&krLU$?A!^DAf(T7a@+~d6v_VhT0J~&6huX<J!wn2a;VS_qj;F2jWYzM
zOOhbmkI*e1t{Li4fg0lX;!fcYl`LI2kQP`?*G`W8`2)2r>uA1rBjql@%KAUwgit2j
z$T5O3S){ZXI5@(MjEx_H)n1iYgG5>)O=T7=@j+sDFnW%;A3hu{@i?)Uu&`i-r4&|s
zvCN$2ap!5zU>FQr-%!e76pL5<X$|^DDwxzcfXxK_2z0nIMHx$g*c&>cZnp0RkU}We
zH2`0*J;c`Y**Sp>BPOl92?tteBseM5*&GkPS61xz$BUtLSRzx7$f@@6059dy2J6R}
zsMl+CUONwjIPT6`-~CyjnllJ(l-Gz&yMtBL(l_H|piMNv>UB-#gNKSx5)Q1d*G-g@
z3j!-22fxzzqnoQrceS+RqQt_B5vgq6_XNu~GBVPl@pKRsESI8)Z?a9Njc1P<|BT5s
zQ<)iXP?E6|tMNvk`Nn~K?Fud)>gQOlGFX5W|8HY+#>$1<uR3A_tX&w>K+c(j&Fu|v
zgFXPO>u<Iyj!G5@#1H?#@-?6l6;DJ=TwE6h625B@w|bN@@I{DJy)K7+^Q!GOwl@|(
zeE2XAWT|w##BswXYYBKnl!s&loZ?UAw1t9xep6*wZc*HX!9gm_Q0aWq!*sSWOR%0h
zaO0*zL9+nBU?mvW;Ms#awjPCy?o`bhWsvPJR9Q<GiPX>j`nZYoZOAW)pvyzt<PR7`
ziyX~QQrT$mG2yQ(V{9A&<OHxk1k+9&4D>M=rhgOSKWI*9Bu^SNqbGz7@t(xwSho_}
z;z+r<XTC}@#c9!&hV<g)!=MAJ_oTv#vxi&Wijr0jT^PKyL~o*?RIx4mT|0oAo`B1C
zQcCWqKd*v+$6}Oa{b^y?en7{q6d4Y>Ox2UbA7N0bZMr#D)}aYjH*j>i9ITRJG2CTM
zKXw6Ri%zwRGP|vg>Y^ZPxi-`hd<HoJcF$FCfXeCWPH%@KZ1sPKi|=)<Mtcc`;7xQt
z0uv8X%-a_(nT5HIWF#aax)3Rg2kPf_|D?ssmoG2jEz*chZ-Z}rii}K4;4#I&f_veo
zj>Q+ORnAeydsqyH5Q?tc0y~8PICX%Z=4Y${W@~a7n}J~U#K?#Vd|Vx{3i=hL8R|tY
z{atYk=vXYqZPcsxyKz@SI@CWb#Kmp>+a_yFCC^jt<Fj~O6d#?8f$K-tZ7Y4NV9%vm
zD@|a{n+7M8kb4VynJ31eo%{3q_cwvcV0X0n8d#^~5Pss!M}w_b5*jg~YmzkJlPl@s
zecjH$oTnQNqkht4Y}Q$${%Ls{BAh?_moE&D@S$1hwVvMNUy{j5p=A-_;a#CA4x>;^
zkSU(M>pdGbRz}Itu|$fGBleMtNNczb3lZER6>jY*SBF_nDEXG$Q!R4t`$d+azG~WQ
zZu?7~?^pM5$PiEiuzmzV23_EPH-`Y(Ff4}K82cd)Pb0{kBVl1-q8?)2OR!y*WINbJ
z86Qmuc-b@*3W~Pv<2A+wpYJfHNW66BHCz4g$#Qmt_vp7*4YH0NQsDW-0K+v&pcAgp
zny$VKc2YGZDrR?I04l@FO2-vRxKIA$5>spLn16ul4}=IX8P5RPMqb*kkfJc7{EddF
z)p-8AhuFuN%RIx@w(JqsmU+9Kao?9z_`zPUB{Zjl0|PY*G|NKn1?U06DTz5-JNOV(
zlLwl4<^9E9+KkiyHj81c@zcd7?t>_Mb&ZF>+qZo6$v2C+`-ygE$~WgKUXB86<(K@u
zs$FN+nca>19TU^0?Un7h%tCp{4w#Gpjlwv{0{Ua~{((OZJ6r}0PPwn-aktw#WDADf
z0h}$t84X%a#3ZPln!wnc=x>3l5)iS1KYb#63(uoDEb0z9U%Z>`ii(SiDT>tP&C4|N
zpsq!U@ge&XDMAFQN?*FR#PV5^Il(4h=~h#_PZcNv3&(YD!v~ZVY8ad?PQ#325<JS`
zataEQm`V478|&dS-47aABCuySK6fnkD9FoWP>)z^GX>!893D>9xa=5wg(4z5P|l#g
z;azL1EL=nsulb*@5)$>YQN{(YdRO#N2m!q-mZ)2N6CHKiMT8`iB}|7pwO8VY`cJcU
zK{EQborfz~Z94=v8GagZYbd%#J%qnmPci#_etu_vxil(3I6JmLqkTO@uR#=tXW0)B
zo}eTXQB&s(oAHkCLkS>^F|dPgmkc<}t}E@KJ-^>ktasppObga&lvF64u`hdIdy@m1
zF^~*<vjAAL+z!{<P??8A9ASTN51ydJ&_<!7nM!Q*3mnRA@FY2T?n;%1lsOl^f$R$v
zr2hR2KIWTo@H%P)>HorQbo7L-nT<M!9k2qz4dpbxrerasTPm(`ppI-`NOUv7+fP(H
zLF5}nqCoY&X5gZDPv?P&L;?vyCu^2GU8n>L77%hk#N&#eZ%aj*5=A+8*R;H!k3|<0
zB3K_Nza!0zOhc;nvLUqAN$Y2O3v9&R9dT?;!2JE~t$Xsv{wbN7X$pIbK-ai$Y-Hs4
zfQb%(e_U|<cb}+sS*;RQ>-jmf#%GO=E<($tnKL}un?2ZZ3wDi5>l^3R+Apf3)BGEg
zanRh!NRNub2Z#u_wJNS)nnV6}YijZhC@()ow!(}@38?mg1J4RPTzHWhL!P8yqYZnh
z%LJ&Z&JY-zQ38Ya<9c6eiw*)6VFSkMKQM0&=x+hFw}RZqhj2G~J}61R$UiO3*yZ!0
zocisjN7$?Uucx+?8KeTGEpZMxFK>fu)2Jcf=G{<H_?S(i%xH#pkCIBt*4)4$^SDET
zJq`dg7m}Nm0H$$zovZ|O>GFmV6=+jl1w_@8RmaLxphm#vaF-DWLEEGe2%zXkxfWx<
z=-DzbHy`yS?2k6q=mERxAYgC2w*Zn_0d9wQ%~CT7_|$G6ZfHFc7r$bbR^Ef>E)3=9
zdm&^|vX@>49z4rKW=z(3Pp<-^vQ(#_1)wm`g}xYvWBh4qdYp$;69~$0YxCRsJE|9I
z;y{*aGAu@~SDzj3*8a{Lv(?*(%7Ikj9aKp9C^3Fh?`Z5(Bl}8~5dE@HoQ1_)xTE-V
z)gF1bH?yzvtjBh@*(4gPD@S#+L!!X7fU|W&oy^qMw(!=+7A@$&6H+5di%&O?mu0F<
zdc|t$RXwtIW#9#~?o#<an}6&L;0s&L`JxDhpf!V{U!6X&U;(fL4#vi|;DYH+=OZbP
z067PwDVe_D_q$R75c@+7m$`-bjplR1M?Mef{*Z%%qq)AG;ay7R4e2>2b9fh9#ZRoD
zPXz~1ZpfD;i)O7?ltIcF>FJ69hJL{rS^~g)23`fV%FGI#f)^k%7%Saa;l(Gq#1XuT
zB+I?x1>uJQ5iEAs)b;aN__2o)dqTE9V-fH6bd+f`YF5}q0pimOPf@9chaUKPIioMx
ziIq6Sj5UE`o`GsxV0MO(_RBt7{$c}4k{sfz7^$vwN*kQI-z0@;=z-QlaV_{z?3ha+
zO1UzgniZ~mB<!!H679~BQM{A!d7$;=DuAa9wVOQBc8F{F)8v(s*J*TPMKLivRy1A)
zxrtZe&@RjT*5v$!6=IB9F#P-f{yFmnUi-`ONArZq|Ig3RZ@M2;kJ`~xKR!OxY*V0$
zH*JdK^GF=6Jl^25+djPHH;H}4N(zDqe!fP@5-IqEw1E;~6Q-KAYNmi?O3!dBn24A^
z?9(sb0C_8g)~hOG9<mpak19OvS_7M3rYW?GT;}~fosGN{=SW;II$+6viuJJU=g;Zc
znVIeGsi{l2uU$Y;t)l1;<@LY${7A32qca=n-#4X`z!S|8`<!Oos!2#R)%A>X%5=7v
z^l6?2pL+Dk<w?FpHTpa73?ewA$MGH)DY>T&TJ(U1N5k!i{8Uh|bvriQ61g~r+gR;>
zx^LdGYV-}Jy}&HUn1mBA+1c5df6Ki7V74j`BA5SoO6%v+h_RNZw1dDT%5gC}LQ>q2
zcXcmIB&Wve-`hL}5jbo@nO38+K%Pgm{5`FU#7ri*K4UQa!0Ra1A(0j}rC2JKzt?eG
zRekvTS9(|66|dDFTur+*GOw{3cQktk6g>ykH5J=JZ{3$K9q&9wU}4=jd}i{<>2hbj
zP%5ZNg^d8_Cd&vCE*fVsUfxnmRYCid(G$PTDGvLTf*#D?llgg}G+T=2!~fFt8s|`Q
zFN9s?u!zRT#>9l3RwEn$&?JC>WBjfv2=ilPfyAvB_o-rGj;{`@hbJ#XIAu@~0uho@
ze87I@(>RNpV_j%)C+tDPyDJS}V}q^5mjww&VWIaA2V1*4k(bpbx|!b_xonT@mM^Nk
z$`+fl1~Ots+(kQIyvO3-Pl4Bh58_rIdg6tDdcjPl0tlb7&z{u-Mr{pl#6OoI<Yfw-
z#D|aQ{e+o3bmFCQqJ+1*IDW4>73OZ~3S725kgatkbqmK}PYrg+;0kRfh1-?uU>lSz
znPvqCw_HM*$2Kg-0Oh%+S>5B~a|*0aNs-{9!~D?LM=L5^<#^HXLARrxjQ!4&C%NfM
zk>mRD-LHS~c64W`CH~#M)x$QI1yB&fkQ6VlxU-W<<iHQ8<MQlop^DU}uod_o0jE(E
zE@-%53w3ru^jRDP9{9ERUTVhfy@$i?FhmuYAU+5$X#WzNqF!45&D>GX8B8F@Lgx=j
zPgA25(HknH<T3l|yrs9h&l0q-WRFBG$!07>MMGP2G^4XEHQho^;p2;ma1LX@q&25&
zU-r5C;P3>E1Dr4aF2ltdLpm0Apk&d;2jl8di$s$5(Eiy29`)aWn<Fq$p9604c9gOA
zqlXXmNwJ$Vq2es#l~F}|xXJSUTf>S8zKx&cIp4-kjqdoxP-~QL-yiiv{99i#SzWyw
z^TuH4H!J_n>Uy`ewJ_I{r^~7tjViAQkXJB!=7ZPa`JC~|+1WLl`t9jboXsNyg?>^d
zn8wR%n;wL%f<cP5`E29djlb+sWa;yc_NvIs-30}yU+{{_>@r)loZk3qR)FC}I6fx%
zmEK>wpv-N1-*`B3&G`qc$>Df6Z;rmP`VtP0mUsAXVyt5avhFyAVxD5s_6d<Ph`FeU
zAWuX@9!1Xej!w(R8wf2|xjG<lAHLEC2Z$(8OfuplBS~R>{saswNL7ID<G4AYF*BUx
z^}F(bdQ(_P=uwuuk=-wv2GUTwTvY@!ErBQF7wqOhq(2T?B?`h!jP4>8`~C@5V1tDz
zloTkyY48u44>VdYw=eE427H<}=GI6_o@@Uzbhs32Y?!+`Y!@h#Bkf_qsNN8q8jmjJ
zezF&fx$}D1s@AQs*6U*w3zuRIyPCQj(-~BE`G7+O4FMP?e7Ng8Gd6d*I4xU)05t(>
zrq+;M9_@FCu-rxz9*)=VFO7dLlTHyIR<XXO5SLj<bLiHJTxXo?!4&rwTE^bMvniqy
zFQPh8dE;xw3*R{YobzcgwF&9y3=s_FT}&-?jz+7OnDD2hrlKGKZ9*ZENq2NKT|OAc
zW7<~(zjG-$IXO~>-;}~+{O7dSSsEZHmwFQEfEIEaSj_rxWG*Z%4M66EYXju<>AkP|
zAZ^q|6kA{1$P+G4;DU2_1CK3*d?!uO-fxC#{K;X-G*>?F6Q+!0Y~+K9(MiV-&z0EL
zDi3O(<o$j?op$+l-S2%qn}FnEZJ_0)#a*V05B&!YcXD;KB``WTjY0xcpPjRbhH?Qy
zQiCxc_Bu>J2-?`#$mJoaNe1LtBi%}^Mt8d}FV6C`O3ila`#JE3$Zp%vPCr--PW0L<
z-dl-$t?`r|Mu$ddFMhtJMtZ*ZSM6fU-jDDU`htIf%2+Nryfe`EK;T=#Zr8+XJnBbA
zbmCssEhFsIuy<Tx`!*Mb71YF+nKj1Nd^8W&<S2Te=FrteVPK(X`FHGGGr#N@x8peK
zj%>cyM8{k3Le-k~&<cZi7Nmbo+k-14BX~8htw>%6*kzVOzaxqaX`=Hr+`khNzjFJv
zZKxQfU;odM?r6!EJ1UIDhLTb$BZ3=u4+)MFcCtobiY|ce`}0<)f^6iZ``QrAQ{Ro9
z!43>{-;gIp+K(o_Q`i4V!5|*k-4Qq!NlEFc@5&<kgP(6%<aIV#!eskhYh|{f|2zEr
zdr(W}2X7`t5Oga&1&MXv&9iN*Khgc;Yk$ro(IA*=bMx>h;MN=&*p+z}mL`a>y~jil
zKY!XaGEJ-tk0~J>7_Uuf3YfM(vQM&5kQb$<J%6C)js&sJ7|=%|Gx#Wzv&?48*{U(<
z#-jkd;K&m>5x0F>Dg}MjwpQ8Zh4(Onk}rBY$+&iT(L%>Y#c0SX2X~EX5Rdg?_5?Bo
zeQ>(Dh{rJ@<7ccpGGULw;3fdSgkg#V^bBM%$MbVesz=@O^z`Dc7%^Y=m7?G=L(q(T
z8(*?E(g@z{sx@7qnq*3^joLh@@^9g<|Do}m@MJE`SYoQ={S!J}XcGJ=IC{tPfSO<e
zr&?vtj>CNBS1=;sf~8PfFrYt<T#IYE+SMO~T3Z1cW|9yBvICATN<zX1iV&M5Kv<Ny
z6~MuwHPQQWw9@5fN`F*N=lVph`$yf{1hIUZH7x?2CavRxunsRb?u^`XtNtJF?<S@@
zpO?BZ^tEXF|E}T_xVPDBc`Lc|ixg!X`oW=sZTvPKvf$homrBSYI4*8{=bs8$^;MIj
z&HtRoT<tH{(8(BH<?Hldxs<<cSH2kM`{lv6@P6b^*g%of<D92GhFiBn%x)&*?yf=7
zn6?n|hZsP81uYoR?ohqs550eiiukWwD|#0e=giNAc`XO2HsW{>Ym)}?5w?XQilWjb
zLnz_BT=&qzWWw*{58XxP_-++TV4<Wc&r90A-d14Rj;kmfi-`o3B{Bz@hXZ4uO%dS3
zutJbArKZNS1TK$q!B01e*@N+@$CEyU-w5P!=1eJ4<9c^P`-d^x<Hv-1hpZIwHxp{z
zg41gaO0A4$zh6CFQjZYVmVp~L4EC{sF_(u7t-Uy%9riq<{~yaCG6%rH63Qg`-$nh7
zN7T&5e%w@&XtLqNn;f&jbU^snSmc1e%^zkj@SO4+D!exibp}W*jBUZOMfK`qyCiSn
ze4dVY-QN3KZ=GL!*Q5O|_?5o3W8Avc+u#4<OfhC+@Ff!o1A{eMb+ya4op8RW0(ne?
ze9U@Ski?_bE-`FsVgAl<Qv)30i5J+vr$W|*W6r@8DGMPYMW}o{_7DT?HGF|@2`-Re
zskDP?nAd%T1{KUy80#W6CG&y9$!D4ZeMK+M<Si~YNBs+{JJdEg2U!AlMsKQ_4x3Y$
z@YpRGSZUS}7SK(#mlniSX*_x5?qA2;$U5Zq&~(o4veK^cO#ORN9sj0C@Q=G0!TI&$
z4+4{{e=8BF$$3Kgp)$xS$*;&bDW4AT0$RBToD*xtnjB?gTT)U|w;||?0Ss7UXelG+
zjMh5#SUI3m&yUKxI_NLm;@7Qnv`upy{r)*GSpIZY$S2fz=lWbnjr4ko!(K{{C;a$p
z%I~vy!=!H22E!Etghyr>N%z4&oOZd8K8{$s^6APFg2yim2du77*jGRG9(LyO7j0F-
zNoC#RaA~h)Ud9pZ5G1a|mzU{U9GG!y{MJRdjT77p2HKoIwcv;+2o8D(6T)K(KwQRB
zO^yh`QKjWY$@n<58WDm%hL1C<0~)qvy*DqD7|!XmGDFBOZZHsji+!wTpmHL&O$Utk
z!v{P(aq-d7&SF4}i_y$W07|2{m=1J3b$u6f=rrkybpp6Ya~-!h(@Qqb=|6a@{mNUq
z^sT8}7SH4E+<S-_<H~BZz&x|^@D>Z@jn>a>JLd;mw)UA)eG~r_NwL^LqVTZo!6cx0
zETM=$F)=Z-v4IEd_G<4dT3D3oKV9njb!_-U=P~w{vkgT@q+D7ucML8>i-6zA>7af9
zfLLaa9U%dV@6m^chttX=gLDWy`h+iXYu7Fl{<YCtg4&!H!0Zn&w6;d2uj1z9;c>*n
zw&?EZ9>YuOW#+RF;1F^y#!N>4BoynXgi6@()c2gqWA$WLUg4v2j;tQ3aOp50F+qNB
zfdg`p^HyTU(aHcOco1Zuvk;0J1-WC`?*TPmrNx<tzgQl&;^~IhU($mW20ZfU4QFG&
z1tNytzI7PS(zkAwsSz+dIot`C*NB*KTCVtJ?^$R)g>Jaz{&LSa1Nl8+a-2j!aNPa8
zTBAmMpv^7jxxz97j`#OG%CVe4lf$sK2{*ARCVqZ$Ac*$^27%$d{x|c*-hOFGoa;#*
zXvSb;Yy{8>?#pjKpP5tkY>9ahJ@oXbL)InMUat0se^L__=G(gy;Kag}2iFTv56}AI
z_emABvLoWe?O`IB3vx=@H~(r<Q3XAo8OO3wOpuwZKlsh?Bc@2>Q3G6b#gkOZB-jQ!
z>f%M|qLvu<WKcHoGdQPkE1b9%BA???Yaw&Wwacu(@~|jTtS)T4F*HPjkUR|C=ouJL
zVCE`RL6g01#avRH6us=5F)Z~t3i~+&-LXTEzI1xKc=IbtzfeNd&oPwf>FG%VrS&mT
zwn_1CYs>o>`orp>L{fKkZq6V9%xGeF@1{+H`k@LtCIwj1GLSj9k(A^wk}Q-4rf&1C
z*9H7df5`2iD%*vmznh8({y^}1aSv^0p<B&m&z7lwuZzCa0?j8+muMN@$U^ADz6Rfe
z_|^;<3J}Z#;k<W;lN0~C5I{wR7%X+$3vIVxx^x?uS=sh?m02TaV$>~%yo4z%>u%!)
zvGqj|&jhJG3ZY8)TVm?Zgo8r|!hJWqDb7%^%qh6Jw1oWHILq`rt^YM3_38{3doa{B
zU8V9um{|=uv4~PO$P0RNrLlN5X_*-j(l?U_jDL6jrDcD<s`jOc69nBRFzkXNG)}BP
z3ao-Qe+)dK{NXjb!*z}CBCf<RpAJe)q~oPhh;H9>pM6n$R##B<;8RZ7K6!|?g_L!_
zp@F5=O@#Kl58Wj>F;$WYN9^4Vg5Ji)_?zripKgYSxNM)j4;9Q}(U|bTI3VeW?p&z&
zn_p!yyS{_}zM^5BD_#4YfY*-lWiOGTW9lD86`fx$i|CCH@Y>@fS|8v7?R9&1@i{a}
z(F1xNG|*PCMN=Y4mKPJoOP4!ezL#afx1Q12(^q%Ne!@gtHJra9(Q1%Qql1$yi{(SV
z)y%=nvzOf39n8%}$BKuS7UCzVP@gW1xzG`*WMbs2ukqZl<i9nLja_|Z<@1S2xmZnI
z%)vz<THU!-h6-tuhF0u9g(i<U<$15iI$p5f%Qu>e8XFrkJbFY1ryKB(xdo!S1=57%
z;wn**y10qvHZlJFBJ{ht)_x7E>)-qJc2{kxu{EwnKk_&?Nj*m2-Ui|>#VJk_Aracb
z!d>YxpxIl&bbSTtkanP65dO6t8Q=}-0707@rrPqaUj2nmfOpnFct`0dwvOCcT$JV2
z<iOEbb!TF#35a=ySLlfM!-UM|H?5E=)Bc#GGg~Ah$_<Ogp$+gr!)&?Nq70N;3L!_R
z*R2Znzkl`E%8^OLQg|k(AgBSFePF(p|5n<Z`>g-@XW0OF1SHwXyy>m+NOCO4%PiIS
zRXAHZ-eK{s4ig}t2{QhR0}1R*1hkzW!^3Zr5)nOY@9VRB4JMSZU4fqXs*gMKjh~~C
z|AIaLJ+Ap;Xk*Ct?{AsyLVH64>e|pCKXW{gfQ6yzmy!$}0rPGvU|H032u-)NWT<qn
zTzn6FF%^0*cGxM))MP#s_l^2RVbhPcfipoHb!R3C7RKxvI0^dSd9}&I6b{AS*&Nz3
z>(3QC;`z-x^(=XCpbl4|gM%g3;6<=m@mhtZ*1p;K%gbXMvVbh7ov(!6Ld7Xcq_~Zb
z?|p?iEgobat_z9W4hNnGVdX%?;4gebumT5PDyYG*jrboWe#8wonm42P6{Fahl&GP<
z)Bo8XKEg`Hq@Ca?ZwE!LsZI)bv(}m}VNM*nG1?5|<Kv^*O_C^Izs5Zc7WK|<d*QZM
zi9PI23gH=XSf%W?rlm4I`Kx5rv*PsDy1v9h!D2zBO+^V_y2B+-j?ht+X*VmQ<6R9P
zBn<KEZ9?~Wc@y0PTxzAbKm<R%j=O!p$H!OyX?+_ye`<jEse4`T@fj%J0GS~qAqfDz
z#h;M)HD#h=7l9{fPR{4AN9Y6%UV+HGz_=D|=F*{0BOm-!JgH9CsS$`;4NIo`8EEue
z*(%@IJFb~90=BF7Xe?dtaI&Hj4HwMi=kaNKtU`M&75h6}(VkxN2Mk8r&_4L7YZmdk
z%8&fk^#TmeyHx$gAcPP6!av;{dWFb`hOVn=M)VNI*z8fC?uUsrb_@=dJ<;1Z<HOTu
z(Dm{87#?>S)~-}yqQG>&#gDMO_*`Tf))`J1np1$z0%tO}gH_0cjM5>Hx$3@93zXl>
zT4u{Y#-SMiqJw>KkoW5?Hia%DnNeYZ0}I3X{-if8hne$JWN(E3p#1)b{O)`KE$-e8
z=|O{=9pnY<R#Vv<)q?Zv(Rm{Ys#z}#yU%J|3r^66uBtbN52n5ORVkv=yX86!_7u=*
zZt=StaJvrmtH-dLV9asJP^kn#>gcZ6HK`AnO)%-dyO{Ion^P=rN>!qEGPBFE2&?sF
z1cSl?wzS0G@n5o07w=gzI!kaCZXmO1?%F5R204vu_Wr|q<tAF(zn3(Gq8W>`T&pXA
zgKt0ZMS{p6EZF$^5ate-g@9we%)75^Y~S&u4!EYLXZ#bOLHQX}!I;HLK44L1dOfBp
zfr*q~=JJc=?lxbc`_$Spm~6^~%;DHi@`ApSqZub)9nsc6iRf4fDK<(Wdny}=dO(U8
z1uMz7I7vMNRNpM~7^!!Q^;1(ikkwp%3p79=$$;<^B$GM|xiI2TWjJ|UcMx7v@bW7v
zT+?25P{yw|lnKA6!d)2*@?QL-Xf}vzA8FF6mieh*LGtcDEJ<tslpAKNy5z%~PgoB$
zyPC7H86ePe{L5MP-G_i@*4$QIP0a7!2VAK&CLwd!YK~@6o(R{7{U5g80xZjQTNnNS
zkxr48QUNLHE=i@NOG>0WM7pFwL|R%vx<L>`Lg_B)1`!ECr2C9-?fswY?Ejp3dAa7C
zYr==``@|UcxI=JDSOa;}rS>;#Iuv5wx)slYN0eVsfHYr1hCKp65&{8&aP)srOqP(J
z{@+9wEjyC_0rMeCi{_0<nBpyf4g{jp=H>@XELc#oZ~Q%~LsKohgc}#HR#=TGdDTZY
z9Z(TNG(h64YG=BUV>^h|4T1>*G9C^Q0NA3*V7d_P1(Sq?u^vs9C0a#_+smY~V20!w
z3;t&0x<dSw{Ty4U@tM(OENfhwW#MqextcA@UI~}XtxQ5H#p^D10DYjhp6rk81i_u*
zHm0Y><db=`$p&Rc1trE&w$4A>8-BDOJ4?{-tVG3ieKZZs8yXl0kzsfQAt1%jm7|78
z1wtv4fXOC8#hPV-x8=?L?0V~dge2YXDdBDr(M?~}zBu=_f7RPT0u@H?wXUT&(*qcU
z0=uY*k+0PUB=gW-@)G>=1HUh?AoRbRry9R?kIMhMu;N4Q>+J00prh-yUw;?|L10E<
zWskINZjfGhEDk_ejTV@wC`)^Q?K1uykym!16){gG?JX@ueUC{+wFxqf2o!Qr<tsv6
zeZ`nfUw`~)VAtYtC<|Ycjctq{EEm1w%lSL1+@zM$z+o9Jy9nzBDXEp$!A(qh6F2>@
z##ik1#J6<$ibP3N6%-VZnh9y3Q&NISvFYAQ2k`GO`l=zIPb)t!@4khZ+1I<l>F;{X
zMDQX=GHp_7cYA4dEN`Bj*ZYsy5DjJ;hL@%rkQ6p_Ygp0gR623H%HK6M{%BrIbjZz1
zpJ7>>%QC?lne!Lidg~RGi9F94?b;1ap4_3cpP+^<92#LFCYWc5qpzz=2VQGv^h~5t
z;LHhrB2i#(@|tfuukioo!yw%e!B7xsG#DHb5=e*&p)aP3SuS^HB)kp|!XvO!L`>U*
zy?}W04b&D~F2R<uFB%cXua4W}@?wan=P2v=MGYFxxRctruEzs>E>0m^@E0)iK{MP2
z{3!~GkmbVODw9Mi-9MhcOZcWe?MTyTCs;MeCg4c(@ENhcQJy{@WSd<6J#v4C{hlY;
z=wkjlW6%6&PmH(uw|*wqDQ`S~A|lK!|I4nYr<^W>jXu~cbXUUnbw{#t+KtIF<FVMR
z#LQkAF}LNAUw^82I==S?Xb~mZO;s*?BTUFGcA*-TA4(S*1H>v3v-HP7zpZkk%7mra
zdZBwo*0|0+lE3Q}Q@+xQtB)F@al&})b|w}_-`<&)p2hU67qO(zsW1u)UCCZu3sbc{
z=vMA)Jyg5(eAy&oe?#po{p;NGPK#;GyKhde5kdJs^1zRL;maYRz#vE4KuzCY?(GL=
z5jOYonV(x&ylO%1(>aeZ##YFyK0d>vit8Z8(yz0{z<4GS?rAVAe3N&XL1F+^ZRobH
z--=zaRMGb3Uf=SILG^PKDLQT*^u_iY-$%7srCNFT(1w2C^2Qij3!^~J)rTQa!PG$T
zIH%Px9VoHskPfRBK(oCq=706IT#0cDJpSvOM4b<ly<426yEb`!`5os|iiT%$y<-MA
zS1lz=#?aVsn4aC@wK-x}*HU&q>YrwlE7;!OixbKd(n~T2+c=5JUNw>sP?3KyUKIa5
zRl;Ov+xWfQm+U3A7!4RWV92V$<o>KRN6pBO^e$w9!8FpN{)=K0&R7$wjodXgonLj`
z0$hNV;Cy!hR;zAcW3s57lm&zpiK~;`6{z(&xwryV3fe%fUIiQj@HQZYJ{1spIoMHv
zv#hMFkRa(TKkhR=j2T=1w|0wSzVUPW&V1U^(lCj^TQos~XOES>R@$yBy!=BPu0!;c
zdw*ZZ*I}+cn};qVb$uuc8KS8Rt+xYgOJM&!s4}@-5!Y-r!hitHBymEQkk`b1drF@X
z+mk0Mc0T)Om)|Bi3}x+p@EJ6|y#2XiJ}o{jeM;~{EJnrg?<YLRcO>M}-V2#7?!7qp
z&@<+TxjFSJ6UDq8)ns2oqxsx<VCYmhI!^y`%p!$>-I^w{Ks)J06UzX_ty?vhAYvK?
z;8kI<#a{vhzg2+I_l-r~(8+G~^4z>Cnf3PjR8vL5XRkZtI)9Wau(G1z$NDx<OIvt%
zu_Y^SbhFb>#Fi*6qbzj&htM#V(uYwL%Fxi8)WPh}Ff?p6=FDq!Z!1SfTy^)fRG;bH
zAxDlv2Z!SKjjg}IkilkpweQGk-d-H6<7IxcnB_Hv#s?v|oEwx8bG!$yf$!)H!>;IL
z`zepFFP!c=x--cKhA6T>2BuzSW+(=I>`Ym5MUyIX;!XC%Hcs3=PFzqJ=%$7aB?!@x
zphxySsM-!7e2>nLw(OG4H*EQsG5$W_{)Z_*u%Lx|AWt6x9Q<KA`D@qgRqy_-<s&?=
z+L@F6q+FCo(Y6ggUJ>!S@rTKk$Sc^~bXf2%ip2Gg>$c(bRd4HyfrtkEGX6m@Ve*4_
z2;3UvudPEUal2pvjeK~{`Bnan)PLD*VZvPP0^k<trrMz5?;X$qXm05naDxPg%eE%|
z$N_kpDln1%kJN$flb!M%p7-u|cRGmzB`d}F`Rk<o>49_D40;Dky`;f`fq9tFhr#T9
z-nk?4HZqCT%S#ye#lXcvQgx=LberUIr}HPbk^zzVsMUT6fuI6Vc|>by)X`*dHs>~K
zleG)**rFtjGl;OFwDJr@#Opwi&c*_8Yt?QZ3NqVVz%ixvRZ|66uMry+Y&c2u$bJB8
zsddva)h|Bns(&7iNBh;Y{!TY};)JM{D&3^39SgI#i_tpYu9%TFufq|MG?@XSnJW3&
zR~0{II?v9}C+Y6hsMvIFy^GE5IuuxcFnBIxS+B;277RPf5zlaJKlckQsFa=|r`*H=
z1U~)hV>}gn8~hOigM*%Nlzy9@<_7QsHU_<Z{dasgR;2R{rSxPL_pJzlauhH2ILF1{
zZkd>xjokxuUOxVN_u9!j=8;FCJ60)}Af`E#4<_He`|MTWhTXHNEnik?)5y*0?6x4<
zC^o6b!$KJjt>zq`sUBc=v}(VoT8FAP0SfHoTi(lE+{c@TXE&tlfp6*fIBzr?8b?F$
zw0K*Pm)CRc5LzHAL8PMpxt#3Z-wB=P^aNk3*tT#22qVv2tJeSal6h-0ldQr>s3oIq
z`G<_!((nq~m=!N1_BMvt)TZ8)^bpM)gsRIENOT!S6){kDuJ*3ZQ+2vXEUd4t-t}yI
z<hQqriw-Vl+7vD=aB#R+efqR5iMi2NU8-Ybl(`8}Wi5c^9?pS%qr1&W4!X0Glcb#;
zTN>DGCFB%(0;JVBd;y7nQBdyo;7kSPGm<rOvt1yPAP91OJ%0b~+wvB}2AB4wA}1tS
zhWY9aIXTetw<ZlE*>!2pO|-C9F2)o(8pYc`F13HjB2GY5I{CiB4=~j5(&MU-axZh?
zj!Hcoi%<%h_=$sw>6FK8g9tc#^?LhD-37H6y&aVlGZkV8BFhI+9~Y{q!|?B3fIjW+
zQ(w<b@qlx!Wo#H&&VPIouaV|%H!FW@^!@Kc(zCswD}!ylR$5Y1gYEy^Xad-5i14>h
zeq$owu-*o`7?hx=B4ixIsu<5r2uJ??g?lF8+U#bJSv490-$y~E&Z*GGeMFlbs5;^p
zgcpm2_rR(0-!jU__UewjY@UM_2&4C?7_llx4QC40MRbE<Q!<2dsRLi<HHZ*fK6Dc|
z@PZiOW2##O%3tr1qbEd^lrvf^iJ^MWo;AWkh5h(5apH<0mU%#x14pAexvQtTj`P0%
z19w&?YK?AV4}GC!U9I-KmX>S3$Q+v*Hd}(qUu;plN#<ih)GDUnhq1CgIz0D~M0Ng+
zaygO>LZZ7y$HEdxUh`)$teWjv=m+NSmrXf;&`7X~ce2i#fc5m0VMTt(D-+X1UzK8?
zjntvPAC0qSAX#hG=ikpK)B%Do@c01Rdvo$tlA@*+{sxqC@Y~ARYXq|^qokI0Z~36z
z>)w<9$ws+ey_o#qF>~r~iZ;B^jU=d0{(pRx{lz+pFie;w|M&M2=jwHHad#_QmflFQ
zU{f4n>#%uJzM}fl;uppv1b7%&f6E)rs4NX8lp7lUG5`MkiIX(P_UdXI8fSXn8vmqC
z?OSSmrYA+33(GDI-r&;6m!-kT=eXd54E<vVihTa46|ZohWb5hW@gh15wYr;K*HvmQ
z$l>_-Y}n-GmI2sV4s>Myz*6%sY*G&%%fUBDid=266KMU<fmmRSMbFz;ZG3xx^CBjI
zkQ-A{0`V3RheB<kcO=QzAe=o6#hle755iJ6sp&*ubP`L_JvILlMY3X2;#4!;fCFHc
zPx_E9-SGr-kG1-qP81I(=U;E}EQy<lA2x>$&^E1^XSf4j-pw=nsm~@MzfY3R^05{X
z+}r+L+ODK~uN>>xjNW)_{psO>6MGAO(tdDaULgRYk;s3TMSBg{Y&w%bHuOHaa=xg?
z3eJD<H8OljDgB=^2Fz-iBGfkqP~S-1^LjL<xiT>zk>=&)0jz|ZvvrPtwm0=(IG8g)
zT66hZ$b1O}Pq8Vt-@}2B6C^Js^?DloMmMj(A8>wqdpjRo1v<6YLjk;aHl_C=DB_)c
zn89lwv8%^g%Ps&Q{n@mLgDHT4swyF1-vbV_b<uAqctY<76NX4tk&WXn(~(9Ae72vR
zXaeCp7tlGkzE^LbLL2ubvSWoAL8G;tW9{|S!=pY+y+{Vs#t#vw*U~GSWVW`p7Lc+&
zOT}xo#F*TNBNsz6A4@ozWInB?wG@k(vT|@3gaP$*5Lj+??Vb8K13_8Dyf+~>_+2w1
zzmko$f~7!{h3{E|%i0!bLcD#%vyOp5r<5V=cCom8@b4dS1w?NaLGl3TrGGZTcme3@
zw8~>IjYFRocUW6mGU+w@obE$0YL~6r9rgCD1v1o$OY4axjO1>rlhmHT2O|Q2o8wcV
zU9#@)L(^AnweYo}8knCi92UOnS?DJCzSavunEX1HZHYQcKJ<QXqm{Vz_354OsIBde
zpK;kQ*ydVlnP2Yy5)Lklv~q=r?a4y5++7;b{6B=@`6kG}>!DJ7#+axu4-CQ|$1rg(
zxy!)7PnG6@+>kZIx(S)q{C;ycxJ`yze|}8R>}>zxGYmP%?I6uf__v;w4f9C9&Nunc
zrT$P!<(JM@C*5}b^!XO8u+#AJNmcFuB3Q?)!R6)4Ij8L@t}yrzU<-m(A)0;}DHIbq
zP#te`g5nqt)HF>crajfQwYBaQJz|Yc`j#<uWvKV@RcZro+>EGlq%`s+7tU))b2ZZ}
z|ME;<Utd9s=K-XzOw>ECz6JNO8AywU7>jqXMGL@JoBfK)G>^05fr9bb*f4sL#OoUH
z9_=3(Kxy6B)eHwg^$6g6FUUjpIGTWj*fTyc!N2xr*4+=gmeK0_$A+kz2lkH6y9;7K
zvPonJ#w~t*-}VLAK>dIWOb<0K$1O3BiyOrBPj|Ps?|B?;Q~0m-CO!c2YMUJ5ZppiY
zXt?S6Qu*!mADJD@&JeU^)-a-GPAn`WHM{T9z^)uH1E@jk7qytz%TZ8C3tCf5yTxma
z>WRlpfX|5&SX@Z`nXZxNf#t^H3gthaIUo^p;f3Ur7}-P58J2ABP;dVRcE~V1zaQ)d
z^}}>3N#>u+K)Mh4FQ^D=K_?^)gckRlHGxI-hR69)nFrVa&#KDJHT=~xn!+#vPHRu7
zUbePYnY#V4MO4T*gnsu%4e<Raz-B0ceN;nmN7&32l;Dm}(*@P$tce_FK5c9P&(Z{h
zt2HR(=t)T0p(hqwQl3?6{=3w;^2;3Gu-LRZ$i6)F0nKQ4g&|sr=65MJIq;~dhih7Z
zN&u+m31-u;QuC>GlX6%ae*Hxr3*$u^>p@8P7laa=e0;JXQ?-Y&rv!DtqhEe7mn9?6
zId7DAA8`6q^C93<ZtJ-~>#kJ&?0B$u+C&^pH06y0<0g^*g@tB41%=+mVzW_bt#+XR
z8o>@(Awg_H1!HGmFjo&$;p6cEkI?6k8I2eE{CCb`N7l8j`R~aJ+B>wg5`(j|jXNN>
zg|rRq*vB`TjACFcGXa6VhA;Ky>hiP;w3zP82ng4&8U|)Ho;LxxM*!Na9mjA!AYAtR
z_>r&=LrV30QhY-ybj60DHsh96EI}m|6$hk7<t`+EPJ#Ww7({HSgyN<UNeK%H3ciQ5
zMlBBRTI&VQski$K7s?FD^44j5wiCZ#7kY#7!m>B`<D?fm!7-r2Yd^y~Gxt5esVpd=
zuD03<EdZRRE`jc^2K;9$5BLwi7CX&MO@*)br?eIQ*_`egpO63IwYuyoo;Aus64?*E
zZBvSv_p4#R_gwIn*_fF*-CSHCO+k!21QqHBLB9(@=!e0Vo1Qr0Z`+qY;eLAv=(j?p
zvN<nF4%;oYZhY^e;3%)-jt|wQD^*qS!0Ui3Bxm`%dQu58<ZKE!_sIBhL;&a)asZV^
z=G}4_H&ahS(If!)s4Y~cpQ+NkkOxakG<U|Fp488W#!V}!y1KaYpUk5I`qq#wE%@ch
zf1~x6bl#;=S66?Rl|=x<SvKQZh3~hX$jLQ%O4pE-u#dN0^=T@LXDxn(+{QKGNk}%x
z1urFP7#(~~H##4WG18Z@Q5>Y6<{BS)yHD-GbEg{zP51T(4K!z>)*d&f-f#vC#$$IU
z;=RFlG5s=$$`9Otn+SH<^Wy-YV<S=p990Yq4c!GrL>jeC3=7{uY@m2|Z?6=vCQCuZ
z;#CVc;zY-JNuS=0Ex7D0>c4!UadLJhA~!*Qu>2+}iVBQuwA^7X!mB(s1sNm|;};Ah
z3pzeNEpS|T8C9c0Yw*>3ePn}gzom9(yu7x=Tt&Y;F;R;Qfqyf<<{W}W9K}6vzmRvX
z7e$F-t*)&qTr;uNo9vmXE`N|^3+NP;H`G#h6wv9*-nc?Ea|MIxO4)<dwzW}%=8%Sn
z!{mA4Pbdf?<s0x?_CQfsLA(w}msI>{^>)3exP0p>b`*hbYRZ)24OBIdCY*!Pr>La+
z^uYXwH<eUizGQt;QvRzt(tP|^7L52(*xzAL?hYRL!{ogw5a<a$AwR692w_plf*sjN
zi@!fEwIGt=W1q&`3J@{`2OByxkey3w-6+!Z%4KoGVx}f7eQe;{uQ%aI>&kCCVTUv|
zu%D<f-n||WSZt@3@S}#<Dx^vYq*_j(4OL3zeP97Bhbyq-k5$MU)f@MDTYTd`BpU1B
zN2F}*K|JvVD!YE$C(c}1LtU`zVedw|S`Pjm60lMQY1{1i6xY}l8V1lLqM&BWft8Xo
z@`CB3%g;#ZM3TsivNHB&Q0TH5Uu8?|05h-ZdD~5h4|`2$YT1p4WTjFG)kN3mvDc9B
z+tDTuo3aj@2CSek5Pi@>v%xOza_64rPjeNy`BUhA3BeJX)6}pMn5ybIfg{mu3Xf$q
zu(R&nzaNqz=3Vy(-X<A>Tsz}Ua*vs!{9Ed25F^bW`JNqcJ=_c|=r#l2uL8*i0}dqp
zqXdM@cm_a>Yl3rM2;9h9Kw!T4ETtp*Ir%OSbzbM=M86}E4IEkz8d`6gn-djbWR%-A
zeYn!65$D1tlw`2-+r)l(X-c0Xc@c$<i!-7bI(ht-SJxqa-~ZORb%;jVvJj6lh$j;!
zjoW_OWK26YTtv#eOb|Emh;B(;fPJ9jJV8|ZSTYw@own(gihY`Al0l`~YG9s<fR!~B
ze%R_HSXTV3|EM%I{obGMBfI_f3|fFFlVuI$ZOV^$y}Oym198%SR36`>wks=*e3h0c
z&LsB0IxQ+H3WL6Vns5-3B^Y>lNffun+my)2re<bVfK!10A3H9tM<B|=rxkw#fA-5i
zoxu880Nl4sk$Ox5B~l2l_U$|zUng+DG{16nZ3`#5YjC_heQOm4z%ySxU18y2K%jS|
z-Y2VAB-awC6GqTiU0K-uLh?+9<V=7!Vh(qT2y6;9n_5aZ_v&9RzrI>pZd-?{nItmD
z!`uJTEiEYbMcRVz86gmuU;@5hVc2MK$;QD^k%KeJYiKHV1_aqEze_LhW(41ug4Qt`
zydzoS6i!3^+6qU~ho{p@W14BZ#P(;BaSyRkJJu!d-N+@~%&DFYlW8gYb5}io!r>Ri
z8)*WSmqn4S#1S&lpgaWln;S+EH6SzSpP!$%2NibiriBmOY0rR)o&=nMOc^yz@6hMv
zfQQ?Gb+4yw_jN{kI%6eUBVp^viZA?eU{wGMc6Z?pt9I$%2CqXF(3qR^dHh|%P%q+5
zBjjcQ*vx=c4_wXQ$hwIih6dVaSn*QKBsp+!KY+%_S;A>4fM0|!G5nv4X8VjjruBe|
z^f`eCVktcP*Z~+lE7FPb8;L(QWz&RAX<{%vsWIQ9dhJA-m%gi<TcOvGrYFHZB^EDP
z!DcRdZz|Cv$Qss0gjuhe;GQl|luF2e`k`1sSo!44Wr$4u!-GiTq^{`-n&&Y}ETn?>
z<@mtAgxBT=CdO04u2YE}`pZimr4&wLXrv*jKt05o<>(vt2Mtx`@MeLEi=PZFC15|H
z=z3NfS?KgC2MGSUpgDNXq>?TP2lQ~+GXW1TuP=~tOO6<>HdkcRt!#CJR0}}}x&=K<
z43ynP@Km%I<L$ZlkC9Vb364sH<cATD;yU}Fi%qS+4~;wZBwBnjR0O0M<2%p-fF}5<
zP5$ki{dE_u#b!9BpoBmE+pw^fY%-2IBd|P0v_g_yB-l$psUcaw<H7#i>D0=>((u-k
zaMZSJr3Ft?UVgRI-t?92H6c*~nR`FtnX9#;vC2ZZn-GHo^WPp#x5cal<`k|Zzpwyj
z+G9}XWTBX7d~Nvx^j{w|69u;`#j%6$aL~<y4W-BEQ;Ey=BvRduMImZ@-6WVAp@g+n
zNr1BL66|doC?p%!?vX}4x3mPM83D+vx?OATJ@Zdr)VH&C<TKyIwE-LVWh#EV!sVrn
zjZ1(fJ~!RO{p!B?<ALmL>bWdg8JXc72M$rW5|ewPk|zgDp^lpfdgUPL*2s3^#*>d9
z1rbj|39H%84*+~_*RvVwiD#|3PaR5oelk)bj7Q~(7VvMc=@#mcSAO-JXe>x7-q5Fm
zZKSo76e@5SR^()xP6uZCHEqlt7by`xQmj9ROFdY1X;87Ipm-vj!7(`e62?=+mPKOg
z{SEsVckY?W<HWWaJPyRvV+^YpyC2m~Y%OJKirrVec829(&WOi;anyGeQz}wVLyY69
zPf)J?7Nd(G_xPtHu2-h^Lkd5W!?@+OP|K6Ygpc@l9P319n;b7fG_<RNyrE=9=I%-x
zT%3a@8(OTtYM_th5`MLfDIp;No^{y3vPBv-JR0M5ho|<x%U@&J25jJp$R(#>X=_cz
zg8rGUulhdVaecSb($a2~*YJdY=pGLvykx4Rl&la)m#e_Q%Rz~fkiO^+xgjz2sg0yZ
z;PJ1tWWTn+ajxN9n+YN*Ojck@f`$A1+}t35H+?x|jOR~pr>hi1EjtO4gZrpz{ZArL
zJY<S`q5@~SRzDh?Y8ha70NWof%11DmYF&1sW?eBSzX?R8%Fmy}6f#+b>Rw1sYDG2I
zQ2gvvZ?QAz16u&|@e1QbaL+JDzj@Ol3xMXAT2j0SK|m^~!J)*24ChvaTx$XSaF1Rf
zOVAqg=(PSI2jycW%EOH@d4i=k+36bjN<|xgfN}Mlv1d*7@z0IJ2tE4aas*<iQw1gB
zNiG=i*_M140^1(}D9>yo8K#A!fB8P~Rb^4P3RJ}ptn7eZ^re<kK?w*mYx5fP_>&o&
zMVmN`+Ba{V=qsnT4vNzf$6EmLh(#cyW1=L6T^dx?;8)B1P7LiK7pfnl0q?8IKpBQ2
z1CwZP+3zp(h-vzW-+0URo*9OA7gz4+{GP0xKbLb89LkbtsRoU}3>XO@GivFAm!Q;#
zT_po*d6;~{!&GNzK0Epo1qbGBgRdTY7%wy&VfyaFkE+N@_|=T@X=umB*pi%Vw&U)C
z1!|xP+;lGh-L_{Wj^H19FFyan;?(7_<Gj?r@seSehL{o;=MX71Hj@u5#4eyL*CN(^
zgMS=9n$sGFLtc4G=K4&WnuKR@$Iju-v4BhFIq_`gD=J$)e`cn1pXLz4Y8i?HlO3J=
z847va@*K%Xr;rJlR6D>ys4e^Y*T`azPm$)#JxEf23~&b0;`1)jq2u<|RUdE$VUa@m
zLKKMntavHS%*^P3R0fL!U>%Sk@WIjny1h<Z*KHtheE;!-WSXKVPWsv8E5kagOlBrw
z60B+xPOlI<P+W64I5@b2Sz@wE0TNNkX2I0LZoTF1evFSq(3(v;I07GJbp2CC$6ZVq
z`qxDH;^4dTcegF=MSzfcxST9#(3hT=n3%-Farg`D2e0tm#DY<otc8vBS%b7l4DxIy
zc7Rr&ISVDVLJ>ANcKPl@>4W|Q4Cu0l=L{0EGMc0lGa907SLt#}?ayEcy&Z$}$=3`S
z8yl;chVjoONN-T@h>3<UFs<`uYLsclI=*{Xyf)(wZQCS}rP3U%TGb+RTGw14D8UJ^
zFx<^~EGTII{ymV{a*lW2nG=F$^}^70tBX^HP)o~4tMfs8PaQHk^#_!+;BiU=<BJaX
zflOh&U?4os4jzE>E2%4JjldfM73hIoP|F-q1jSH-t{^MA)upDITZ;vU7+zUkHZ!(q
z75U{&+z);bp+PEkc~Oq%F#7ZRvUC{g1sW>$<ZL!`y0Du9oQ)Z3KzhNEewdk*q&<2L
zP&}|Nz=#UgO{CA}=AX1>z0#|#dJe}4TkU(txPul4>C{c6LfE993QjcY+TYsdy{%1W
zF<Sgi_}Qcfic5IU=~-EA7oer*2E;6)sOSOwPZ1Ir>FVlwSme-oesY2fRQ8?}$X#v*
zN$V>im!FRp0clEyK8?bPu45TIFM3aX#F2(cu#yVLHx)iBptH6itxCGf@$MwCr!w`v
z@d&qcFJD@DruFUnZ3!{(WgP!v>@M;o=%)IZ&f*(tx-=f|Ixx%`>KJQD>Fgb?)_Xqb
z#yjqXa;R=C?e)?&ik5U}6M+`0;=6qhZ&OjZt>umgvqf*hgBAF6QeKE87hz(OH*?q}
zr>m?1uM2a<RDRndGXN$26}xcgR!X{@AK5>G)B7I;L*19U6>pN6BHQ;Vow^3zR@mY0
zqVcmkgD`Hu0U#zdIX?a_SB<;fy-%)IvF}sNXX>BCS8~1REM#5T{=D(jnSnHl2PB4E
z{#QP1MqkMRzmeXa)%`@tMd}tB)0J{g5DV#WP<(!$pT9#Qd*8RWGne6!X69W$+gx%P
zBuaW^w1FZkckp`z4SpgPXDhHR#6+|Lk&efr-^mc(Z$C64$gE80DgCYgt0MJBHShYy
zeG6}@%Dm?EqczV@aQ#gJE*D+!2QdEq*wYb}Z%{-sfk&CZX611{!EVs_O1atp_@T;O
z`IsI2gk7FzUb^f6roorouNgPvrhutH>*^jfKLu7B$=KsbK|yU5tVvDj@k=7PDwXdU
z$bR+=*Ra*g5HRan9R?`$F%<IKABIsT5f~f2b#rn$sbxtaxpm8R9=Ll3&=sm7egKQ+
zJ-`4eyg%rh*urIU^xzz=)vq>tG69ommzg?y+h#E9D+xry7?h&;M%U*-^Z;m!%`nl6
z0NIU<g#{xx)JaK8FYoNU1$91*6PDm6{d;f_Y*Z1ZUKG55IAn?PcVy5uPwAmClKi=^
znjWKeyL7?#w-4Gio#!5ITXE}{k@`^2;Mu>(j>XxgMnB9hcSqCmED2*{v(V=QH<j)b
zj(kVI@j7WBHK$SQW2O$;1OKn3f^iK6O&>FVOq`8wt|=<zKHTY8{<Afe+d_k>ih2m$
z?3XcKdjd(&Bji3`BIY%BzH&aY`#@Z{zP&w{(YH2%_%LcyyDNci3HWH^Eva+_bCgec
z@h43cpxf!}0y!9>tE*Ye?eD|eel3?vFG>>w)&=2FQ7=&LRk4X&Y4A})e}^=qB}LQK
z9q|NoiyG-8Vg9{Obr7~(IW??{e((%oWP{j9e=y@hR;D%+r4g`VUjY4)F1Q{!V(fu$
zaR(BcCn?iB{{zWZnGl6K%>!w&1n1xJ8yc>hB~aqQKo`cks^VTZPCKIDAK?5TpcQRR
z=!xG?L_ck`nSAvet1n4uk}3Gp_4{Xry>D{<V*m}Mf{BeyBv|^wIS2+aC#R=sgM)+f
zS8;VQf}l32?bbRJ<MXkJa}9iZ$5M@|)*~lQFC5?EhVhy6^C3mctUq_|-Tji@47bxv
zq@YBoCd=X9y}jvCz`3yzNL4x1Q@fT$n)*9&{E5!kAyOy^gC;M&eQ2sO%8i;*^}Jf>
z(@A9iOnq@<g&ydo@EtH$h`0u`H!yvGd{t!hkO}!O1M`i8^4+wowyMX|?!PEGzK;FW
z(K1N<Rk~%hvSISV*ZeR>(Y|IOn1P-?u<7OAoG*GGqs7lk3A0~S;-?DQ)S6U#>wcMo
zezP}(2`g_qPq^~#y{xWn{`BfFCV$#dDmEeg&HnnJs9L2RLtix+7|MJY+o0Td`9+Sc
zPlfsEC(T5S+>sl$ys1l1dwMvPINLaHx?Twd5x$r3zsdz1=+GZ}{>GI*pos_i`HNZ5
z7JrJ!xc?zb!hg{7;)LrM7Cav~^m9<^OR##7Dnwn#a;LmW=n>kvJ^l69)+GP}Ro7<e
z2xtNMVP%yh!RuZH#~Eb%x;;~iBl-N^xq1?7BSatwo1;^d?KDy8um9I<jA#vq?K^Vl
z^6KbSzI9Pi8lw_<R+U)~@fzGs*>A%GxY=-_Ec^y(S~#6=sgggkbuTWNI9ldT^3Vkr
z4NFO>X#$g2)7g;<dZtlpUds2Wq&HI*0I+JSW`jk}1Ou>}?2qDLM8+ndGO;%mus2eH
zpE3AvVAv%5aU@D$K#VmtG3`~Ho1@~;@7Mh&Do~#d6{kJ{Wdx4@^`(0w*lKF$snc_D
z#b)r?CS^bq^?lPqw6FRe2<U<d^9!rFJI?Xe9zTBU;S2}61}y$CupW-+KGQXE7NjPW
zs)WwePO95IaS!nQZBehi@1LK=(2DyUj_hsfmm>n6szqsYTrO~2j-&lsx#IgZJob?!
zBQrzuSC1!mU7@=6_N??sl=fA9`&W;Xf5)nN93wUH*9-A~CBB~$<T&MLy?LCcPA&4P
zv{zhL+^yR<eYT_zY5;BDy$-T!$jGw?-u=Iv!88ld+S<YenE;Q%>XQLdf_}~1OU+<r
zwYgLG=a~p{-VvDp09Xy5V_GQrSoQ$4)t>v}Mx{p5Q3xGOR#sa4=~m`^Eo{X-R{iZ1
zbE{1USu$w$=S0A;Uk*-{RjAz+GT*=VIE5{r@!4*g0q_jVM@B{q8*qmng9U1|N|`np
zxz}BQeV2m?9c})Uf2;U>b%m}NZ=t#;sXK3|z|<1Q5PvyXU0N=ja*sIT0;EhZXow##
zRJ+TUHMHJPU#}Y_!_d+~UpZA;%2vtNhayQHx=iw?LLHZhCPu&sUO@qjyhgJDzjbnR
z3(+nK2@Au3q7g_N(3VsJL<SVKr%#oX`itLaFq6Cn2x_d+FA(f|+&XR}9@i&qZPhf!
zrp69Z`=!RIe;9FpqmbBgaq<;a?5Dk)(vusA+d&uDLZ?pAqMvU)DB2JtNlIX!<jgQi
z{-&4r@+!vZXqF^!!kEf$C)PPDKbzTJi<@M*itXDgN77k=M2gj7;q*LVtyvU13<M<K
z{D%2Kzmk%YficOhO?H*F0L*{I6$5YIx<$JK1IV4d7xHOUY_c`M-6)&=;A2>$n6++U
zZZ7Q7-;EMXZy-f3CavNA0$lr8t;w?ppcmGFT_Cq{c%}srHpyaQVp%UYe{4Jh?=41Q
z;j`-G<jF(;nFmI<4i|OQKK)kxeO<e&VL>dbrl_05M;0L?1iTLnh}{wjH`jBG%yB91
zE7C4uT3=h626R+a5p!>Qyks)Hu#majfFq^|dk9)LO(1=VHD8@=8H&<W+`*RSugv>*
z1BBoelUYeUX19OgB=-&M&Nb9L$<uxyF0nX#uvT<9R%hhhU{GYPcc<;GcLu{lSM2HB
zNjtG1p~U`A(aGPFOFrS|zL?rubJj+`W=%(M2F`q<g{LR@m5hMO@8Vn{gdyq{&WC>;
zgHdeSiDibm_XlHCc@>8RHHQB)lUKb!z50K<LG&_n{U0-ScFcgIHQhSgx3{%2rf($f
z{SWtui|ek_ia_V^;r}tHhkq87v4Y0xzilh@+L$YgQKY(cg5O02zatBNrx^UM;_7B{
zI3afd$s)Q`H=9&=>-(`Rw>uxA8%$)})JVPxe#$ZFK*BZG{DNzDoLpTS<<&GZR%A`1
z?&gyDU!MpdD%q&0XlNEbi4MZFF~Nz{F_;k2STs`e_j^~sI|~bpvhmN}7?qxvm6pDT
zj>G=w@UScm9I!cI=E4#D?ue}qzl=f0SE{=LDi~35Fl4+7(@6{Lkk|f8tteseCG(8I
zZ_M=g=X8}NXaOm{Nhrk+VTKq_@<zK5jJ;;n1)b@q72-j;r#^m6&@jodB(kvb^B=_;
zRa|G9Pyc+{?uftS9Vkh-4I-VpEG#TWxg(-CDj~)_{V9DpDDQWXB&>-=-{bi^(CHa4
z#>-MFPK5iT!f*(TbJrRLsZ|0b>70=4zlew@)sX!G<*Ph^!yL2k6|;0rMtJ{RfKPSf
zN=Gt9C`ucriC*2$8gg0Zq+tkWQ4S$nb+SQP;ikO5ps;z8JJLEinT&;lQ*-V?{~Qp7
z)>g?Q*B&;hZbBH5pPnB(vnR4B|9#)HIB;k57^e?bZ4PkKc<Fz#g7E;~J4G4HQ*#(V
zu{QWr%~!d)|HczJYB@eGRL)mQvEqiO*9A|n5sRK(H%W`4WYbdZDjmEH()F8t8Z=zg
zi6_d87s*>m5z)~N`^Kz6LQoPJiF^Dtfm;m-u^T|4*&KlWos9k?QC~HefBfPEBuAJ+
z@`5&)3!=)Z0V^?fq1m@_?_tZuzuWZfQRdU1T3qoI75f$^O7&i_6Jmmi4GpN1&li&v
z^4N=6t1;;lYHJTk5cU+I%V-|&6BBFSnCnGXb&{(Qf$T~S_NzT<REH>7N`br$tR4TJ
zUZjEsfe*}{zJM#W)e025uP9u%Zeg=U=FkyGIDtlVm=_P^;YfSM7@c3oU?o5~N{B$f
z&=w884OojJC33-p5P5<uX_j0-G%X0fV`5{UwW=R2O15|fqxa%3Ox0#$eR+CS^)yg@
z3_n0rgq3w`Z*P^`pMYQiQY9}-OG|H}aK5D9C<12^@qvH$j@m+F$oV6st(z&2{}Ajw
z+4u*B=`<2hcvixHA*Y-!=!_kp6`H@;(XmFOJl2sUKMl_lRXm<7m!#DOp^sqIONwT8
z>j#IEGN81iAV{m(sIG;?*&yxN2#&hi9;K&UUk<mT+%YJsnNJJkpr5~!ty)hh3G7c7
zRLFWt=&s(z3X$S^2-fOq11`lVA84>G$&=Avfq#~o>#zQZQ%6@~DFf&~{kLJ%ifqi_
zGP9LsAhLv#*KDOdA_;Psw@{Y~T2g8aA&}f|?a!ZRAYLPdC)i+}pav9;Z_7@lzXmgA
zDOwj=Tm#`Ln8Pe*9zvuT$ACr1rdQo=G5Ya|K%TlatF)|kEY3H0w^peRTs|jG^FMpy
z8%SiWp{{T|?|aySTUk|w1>DD>FrvcNcORaUhvG<fSC<x7FJ5Qu%+JhtNoi|OkQQlT
zgTrT>J9`@^Y&S?NhulZ}q1jpQb(m$=!zD3eQ_7X~*n~)`l@qt#U<U)WMEAnyqN!hd
zKes5AL^c-OXo;Q8EiAN6v4AS)zdXKm_<=dHEW9TD(^JG>Ah(Z%nn_s?-i`lS`IOUE
z)wz40W0BNv2hHhlpkAvam9K=${9C7NB(C1sT=u--+?`U{xa}X*icg1j5bDM627kTi
zdMoC2v8f2ekyU4_)Y-3rVQzS?Gjk-IF)<Nej>mP3qf;O?LaVBk`{x39UGKxd`VRyY
zz{1S0=xy?6NoW(2xPRaL15jdARfm&<-|@5ciPH!30td6}4@`64hlYe?JFj*!ATF=J
zy}UvPiV%0eL#xzKuoJ8>I{(J)PM_B??teGq>gvkKwCZF5%A)}w&tWF_g{TxrLrobC
zv)mZ(ixcN{I8U--$oK^QE^N&=`##&*+|;+2?->|agJ$p(D&anX6EZ>c;9@1}VJ9Gk
z@*sGgMr_VbO$8tB%tP!^VKhBzNe*{)P0iK_IKJ7<e8K|bI=i9jZQ9^>uV9p;13O<4
zcoPR~iY8jw9G);luv&+4yD}KhU?8mqfBrOqDD_uBmiP+P{%2%SrT+x6=*0oZ+l9TX
z1e0DvPf?n+&CSUEekJBag>T?kKMbLiVwW2QSx2b9FQ1Cb2fw36SRmMnxxeavYg$JT
zCfMxKkzm8TgPstRkc!ItP5uUv?41S$p`I);4+*L6yI@*(ak-~%aV^s*gXzo|Y=;=W
z8RGXt0PH*S8JU<`1QIk@67|>D*RSs-DgaKe!^RJ(tv5g-ll;*5^>cE_K56Uk$Hk-M
zJ+TJnt~@A1-|uC8JqEiJ7VT<k{B^Xz!#!=bP)zzn4oxM@Y-H<H&n+PE@U%jufK|gp
zOC#l+8&@NYuzFrK_K*t<+m6Wm--4>;-p7Ih9$(?JCk!0jadT|SGIja+wINB`q+qoF
z8S!3onOFsIh+i-md>4IcaXLz;W6NV~Nu`M4O0*cv;F7J9Mi=|o2Vtgpf1X748~lg`
zPqXBzuIDUK6+y28btNcU2kd}vGKod6fpkCH0BfAM?QJ^%BoV4Up+i0Da5^VJ*}F_D
z>hpf6x|BMkk7%vNP6$Wm8Uvnai(#EzN=i%&K~Hx#qK)$dGd9Gsz87-McY=@+6}Z1M
zqionj&;k;ef)TCo#=?r9zI_m{Q7{$@;_v}Th;W2(BR|fij$AaSFIKD$8kur3GR$Yk
zyAO+D()o9B;28ly45I-D83C=hCQ7~Dr}JMR=Fo&08!50`awD=0Kr!1kFz_cbIy$=0
zW9Aj$i4CBJ;#YqBI6yA<8_3X+^Cew<eN!lyj{ulF!ILyWw=aA*w0?c|Yk<mKUS56#
zTK}c3t*C>8myi&3S3-ier>BRU&n5u?g{_ZSBRmNMt9w9QV~2I^dUZ1ffoS<u4`E7h
zNt{e|{Jg%4Nv{(8&WR?5i4ZO$xM*S@3r`fPt**h$QR^BU>wPUTW7LZ-wC)i*+uPft
zAb=>^3PaD>q@>PnGj0!0Pc?9wmQ+x{Mk=J_qA8uB-tj{po@P!H&qj}GTTZYu*DH_w
z9CK%}Zx!ky<fs6mJ#^VP{`6mw`GIvfpA2*CV@|k=U%?r?8YMG9C4D{Xs38+EzWL(h
z>}(+eT>lH;BsNEHnE3VBY<EAzf|S&$eEP7&4{ZlUP&LG?7aYNc2J}kvneP`pSb8t4
z;DL&vsK}J5pJ-!Y-Sd!=J6=mpQ`8dzo?sH`Fv0|Ez#BjndJ51fTVHRcgulaIr|gmv
zTTEHC!QgiUjQ0{2$U~oi$y#3aEy7>0Tx(~l&7;a18%2;D3<v`nX==GVqJk&7w=*yD
z2Kq3vkhbuw+i+#<KqM9cFfh!bgo%iy!YdjYPPZVV;`&P#j;z|9rmtTggQo_0D2npf
z{X6uj`FoHcgnVdxEl=VZc^V8H%2f(P-e+Z9w?Ta(&T2UhqC=lsw6u$5pc}Kil5@;L
znlw=cgy&oDFnI)y$o`3~_Hgz{GIs;JuHKwv5yKF#{aGkNGT^W5ahvS14WPEfz=;F~
zlaC6<zCnEehnl7eu&q46=vNc&)Q`k7MS!*?LWLO#;#wfN6OxmM1037E<^o25;M_?k
zATSB7LWx8g8D1D#pd^AOCfTq=o1IW97~t=c!FOpC0R|k&eGl17Z=j;U^Ykke-O`dh
zEMRGoKntu5>{`WwN8{0P4jA1Kglhq$w{YV_RG@u$3ka_;>6i9AkO^@>`+5o3%5n(+
zMexBFHVzI8tbBa8fwTqM!;lvEOO4yt6i3_h_2!Fj=Haz6xg+n9#JLBTaU5r~MUp03
zC9lCxc?|0o<4=27|J3wma0jZ54}9e5!k?<R@EbhV9-VQ3P528a=jSt-V&0Vcp5Fe>
zm;e0Em21{BMcp<v1GDjWWb3_G+OfJeG#LLiU%%Rv<#DHK#;S_L)cVJJs}lQ>VTFU`
zL&Hc6r>=m`zEdcfUcvMQfz5;gmxBo`;-rowDd|ug2`@xO+xPF=&^m%KiJ}oETVE0{
z0Q+^Ny-}Q@grol;d#Sk=1U1h<&%kE*g@l5F0+7A7cl6ROFHB8m5{?GWsKML@?FiUq
z^&Wc+$oz2^n4Cr%Rjl6!BKLK{=*O`QB~MYKo=UH(N|uH6j0~ievI<!5GKq;9UO*+H
zgpY;ge1r3MR(~H5G$tr{ER?9j+Ma_;8}9*Jonm+H+_|m?o}xZN3tvaI#qW|3m=|D=
zz6%wNev{FVE&Kqz^4|zyB@r{+y&HtP44&a%VM=0^sBnL1a#A3VgkTqNAAK-Y-9I?M
z<ubEyg@CPh)?@ke;*g7lr#$9yeI*9kaubL@23_ZEc>A4zymPw=&;N#AVo-;fL>l++
zHyc2e4OjuLfoBQT5GEE@ARNsAHZw=Q4hcaAxIkSJv*&_36Sj?FsZyRyY&GnedKlI0
zY7xn@^%XZjf%LujL_~Q^i{>AIlcG}L5|I~Ztml^$9};!hekH0+dH|i29ryn7{^<nV
z_wOpTSU=|HZ^E^V0mkdbI0&$#q5@NyVz2}TLKV_o1n`)$=(r6DaGC6O(VBU!rFZ`$
zGm8k6p^%fPa0Gs@C+FupxNYxZDm2pHZockYOZ7XRcb^7E?<sbxsPvVqSsdAs@4fQ6
zGK1=k^~Ao?oQFH#%A;)$44R*Wx3u{8!6ZL1L?+}XZn}xy(Px$eDP}|%WZqtXgu<BM
z6|Jzt{iukBhuz9gxl6VNmxabR@9UH_0H>83rE&xz4i+WLFlhrXlc1Co3W!}$Xx3pO
zhzhd@vum6Pnb$c*jqe`cTiQQmHVoAw)B{p+5qP&r)PoPWnT3TENAip1?;#M_l+szf
z9Y3_O3@N4Npk#`H?hF3URnQBD!VK~m0_UpdB^PcRYaMeEsdiqOF0ZmQGs$-_B!}m}
z<_p1N^H)8*;MZHc0|kKJG(h<w^wOc!NG%YitLy$cTy4)72{GT>=*y<V6xdYfEY^}-
zu5@ezFi;4|Qv>&QKx?V`kD;IBLI8^*07tT)6Bk_9BZVOQy&m3!D}T2Pd%P@gv`As$
zwzva%s}EGVfcX&t8d&)3GY7xJ95Z;8>cticn=jcbg2`qBux|me{(F4f1se|%4-r2q
zjA@~k1NvVVJU4dOJ6Zl`6gkYB4_As0v<L7*Q&gGzZ)4uLFug8;Q&DT$ORLz>OFeP%
z`ks=q@^e#D)Uu<t*@VaU-~-FQi9+nl$Ek2QX=4)-KKk#igox99aC+A^GNN|<cUihg
zz38K|va%X4i<C)wL5<1nXRIvM2Dkkm*2!ocRgUmR!zrJnN%HVvMVzg#O`y5GJv#wD
zK7Uk9jD%{&HCa^2nj)FLd9zo*4LxFRjoNJY%$6qHC2oXC<1yYFZ}ZCfe|5Ld`QD{w
zp5!Qgro8O(lZIZbY7YoY+@ZJ>+-moTJ-1$dc~g_jA$z<z-Uk-|o~7OdVb;fB!2ZA~
zyRxQcb!YbT&?r<_NPU49FnH?<nUd5yW}jL?jG=KTdX({YM^Ye5B>y!G8~=d87U$^L
z7(_dMTXU&`m_1m3mok{1dkwr6FnryH`hV}@)U{BP<qeJ4mrpUz!~DHI(!m=7Y9K}%
zCm5PwLjH#qLn+uERe2vfK=%zK`<nnbfGgbXI*0jG*VRtEd5PF1Fvye75_DdXf@*&q
zj*B{mU``+n7=T*y=(B~f#oEv1!?ff3sJ~YSCOV6Iebl)2?q5%CDeiAPw>Q_jkDLs>
zhMd(?=rq_N0P@M^L|GJcanNT26^T?vMn;p5SK8FVA|K9+uRtqr?dU-N_U+rrau_XW
z>F~ihSwuucu4Fv4Xngb8^?|GAOs}R_BLEV+yviDgK}2C(tA(C64BQ3?>PucUoe}77
zU%lYDB_=BBpl~nF0jkHV)<_^lnM8v*m%X$nK(N)IZmLx;YKPUk3<`t3o*q3F%oL3u
z4F;KUao^(=aOO`$#l%3gmTaD&1n^3tc>{~0*~rVaa;#uN04W~di;F9p8Y*TB)cSd@
zQAYor!TG*0(5`lo4TtUTYlU+Yd*jBJ=2i7xua2=*WPg4f(r@;YcH^1t(q7pzaddqF
z1B`w+fBrL~vW%hOqrU#FmIY&jXDE+R-(fC^2V~)r=s=7S8`cgbAt9k7#Ew27jsUfl
z=F?2kqNH3~umfSj+fl&W`@PU~UIy*q6J!x|b?M!oE_4fe{!loCp!v3(fxCt(_+9?>
zOD8RVe}5zi)8lyO4oqHvoUH}{ZP(T4Q5g`61g{1Q${^?@LDcv8XFX6;^}2rNtY6X+
z=>pBR3DhmUQ2Nk|i#NLh3t<RW>EnyWuSvi1|L!}7DCE6{Uz#kkMn*JXN(j&~3?0<W
zn*+|=6i=YagKKvWv=YD*hgYwiH#qrws%jN17p~{ez?oPF*pX>1FvWmn5DGPi=2+AE
zFSwCxY8@9B_F<+}@43$ipfu8X^Y-l!faU4Hws;xH4^RE^-D*8f$~|zfu!P!I_jD2C
z)%>@?S4Ra(@e*R}kPC*Yqt7Se&d-iNTQF+h(9xN+hJhC{XW;MVIBTXPT`Oq+`3%3j
z909wyAf`E(c<R7W!mh<~8$J+t`ADU=9#EdLQXzsNMX7Ur|MdRVXLzb|a&n!lxn^fF
zs3rAp$+<<X3JFMM)l^Hy;h2XC9)7<+Ngtf>pt3j!;4eBsL0!nyUPfY6t`)-6^8Smv
zR)Zuz-ie9EbgyR%5@lwH+n%01m_Nr=IMsc3hr&{Fs7*zEv1j3|b4IIgfZJG1Qr(4n
zP{N10nB@TPeEF9695c<c>vTFo%=|lIUYc<k8PV_Glfz+i?;L(yW8g`;?!%;z9a4Ld
zvh^|eA=og6|Ipe|>jB%nzhCM&5xOT|?G<c<l$4YQe9bkQ<Sa0J1E0V5h5_F|WQ@+s
ze!|P7<m4_sK0fw+^N!U$53O3kgkMMl!APhcGQkC;Gp(gZFCV=G=3=UaypJFEfH7f^
zRQ%azHeD$EqyyEXfjIj6rPt2~FGDBp?vWY$IB!6r5<Y~4hAHHk!bdNFDrLeB8nKDB
zkUA~|6$T#V4_FY5DVdp>+R(AdKuiX#R~S9xh-cA$h6|Gh*NOea5sNKQG5|_?)8~BK
z8qnQm8UK0Sd98JEH0u}vUFe>(i^~irDBStgixQyE5)h&u)I{v!tu60)+=cr&=Rsr+
zFx2;;eQWRRL`AfG_<#UT_<gzfM?p8Up%pkQEG#6F>p6&E*Huhn`v$inmxDnE%L@2X
zw8~2d%l35{uwVY0+&a{S=x&T_RvJGfPgG(Fs8v6WLop?OvEdXI6;-^Y7W(G_M=b%K
z9j>BalyBu3K27Q;>yG1xM;Q&;5>LJ{4#45i*|pNEs^W-o%h6I~E6rA$UEpC|=p9_e
zK^Vm9Bz^}}$4%JqbxVr`0jHhrFyWw0ctVR)u_g;>*%1h&pk~{BccIoy@8~}LPc2|M
zIU0R=*%SAi{6l&r$#vOF(lshTgJ7sr!d8CuY(q&wfl|Ql;^YrYV&vWAzAg%{((0Gs
zZTmC2vC*3~fi^PmL3O2enkxkKA(l?v1^a4Dpxea6ZTk=!gbqDkyQy=cphTSs@Dj=4
zU*_k+W^rrCNRAN#8T=$Dw}*rn7*K(NqziTI`KM2xIH>XE|LzY-EdGXhXOl{ShF0yI
zUXm7(lpF{h4kjT_y2H!Ua~u+TQ)FRd%>c`0!2xVeWD3TjnH_&`w473-NJ8F{HDaz9
zn^k%gd7HG!&aLAuUpda7FJ`3Z>IuugA&(7+SxM94%K$*dPXG?&JZLVB%}h;SgPK0B
z@^Ob-I^k<5v6rFV?}XHxBzULC^ZvpT*L<jo6_Z^p-p7N^i_Kt*d;{55Dm<Moutt(>
z+a7#`Zx&cy{a(YXNn9L6ynfJb&6&nK14EWP^f~Aj3gIkkYNza61}ghEv<$i2h>}fZ
z_@ns6EzFiB@8%l``;X>3J4M;?u$FK)mUj>>vX;(KZ-ymGa8xmq>V$odt4U<>P1CVP
z9};&96!$(V-LTZ3B(1X<k3=y+Gx6Ii9b||duZOFj2N8~7yI?BQ$&(K9aY!l|g;33C
z^x^X2E*5F{*<Yy2wGOoeUEi?e;;wNe+UFn&8T^fVu&bePk^f2m4!3Iwi5$M35IC8p
z>3-sUPvg~88eTCxk}<$im;lKl{EL;(rO6_53PEgC2<QFntfZugAoFQK1i1W_!R2$B
zhC)x#yLA$JODeS=`Znx<UkDr2aOveYtI=6{?R(F!bLYl8uY3F3;feU}0d6sXg^!;(
z3*UAV76zDnpog^u!jMt;<!=NT8QCuwdP*E^j@xp*IeCf7Dkj#n3RA~&RT8bn15P8o
zEJQ13e<L#6Am|+!N4OinUb~GSrqQT*!Kwu(@FWm-X1}kwpy!ntf}{6S1%<N;VG@68
zjFK10nH&DeW5MzbvYE3H2|r#^V=E5!YHU4|&+jq5NMoVwt1dz`bF5EMAy&nMc;gsi
z&C}WUB@h`Z$-~X|kbj-Dyt)Xl`<rU>D|`LKK8=eeZt>K7%NrONV?gD2+yFkEwBUXS
zfi&!D7P2)r(XK5FwX&T;!n8V5|LWDbU*F=n1ykK>6FBm{0R=dQ;%06P!oB-}h6k0e
zCwy@QbO$14AkM1lB))7%Wo2hq#{bY$@KyJIdaZaGN3zX0ik<P{H{sxpm6HC&#K%F@
zAr32@iVr6XU$W(naNWJDv9{b<d_2wnM$Y+A;x&v?Zuq|Sv8na40hHYz2A8(A`hV`c
zctWu!^a9SHs*c??SpOpk82l17aampkp>8ck-hFuO^UaSfo#ot+#)xTs@uE>o8%aI!
zm;2a-^80x|79^@J_{%*%eDdi3FW<E?R(aUJG>rmNG_9se6xPuHITZBoJgs<SEkF3Q
z3B}6s{}k|oQN82r8|mQx9t<MMbmVeO?(nJK!_{G>&7-i%W#e?Xq$s_bde16%;r|*A
zmiC#MGXjt-qtJ#Lu-vT|0PkCMFiH&rxcA_ialJ*wq_)g<<a_PgzFq60jpwJmb87xy
z2m49~L$K&4AY3IthQS)ZM^@!AA`k-Tz>|3dF*VUK0Yull7nhe*F!#|5e%C3SF__Y~
z){78@Fs~AT4Zgn-I=Ds)CIo}CJtokrFF`#+kN5@0)R{U7IxTHh1Mtcr%iK=K!C|Kf
z%H1L@J(0oiAu`}o(v!#vkv;4=s-k07r2DTyrI7<CxGq@g@bJ{IBPjjYSj6Q<IA>RZ
zp;Q406}`CawqPq~V`=&MJ>h6fPN4$Xg*mw#VBfLeP#FTOBG0u9OM83YLm(XB+1uH%
z;3?(;wgfB%aA})-hWL7wmVPZ9h@M3G#cP4Q;M0j!K?BuW?@xcLt$jrp#2Q#g7-Fpg
zzy`lF%kQjbrlTVShF&0C@e~6l`6NVTlDag^5$Ts5^)A}+vX{1}>ruG;aqrA;4=?@z
z&gn0Gd@dNMsL~ukcXqeXu#q1y6=>A;_kn-H#}5m<3GfDqlJU(`C?WJ;yuEaU7HqEo
z*lo)H4i03%>U0-8#?vA?Oo4Vw1W)J?>Tw#R#<vl&R9c{<Lu)mAQGU4_l*7CZ(NiK-
zy0}e7#w1Ny;CgpIE3e}n_#VSRhW9qmi@py4)7R1X>s#Xo^jeG%VQ~(V8oQgS7LxX$
z<LZF&K1;jB&lkb`#B$FP%qWn_f-WEibOLDT!J^MT9>PcCThk=Sc<2+^13!by32?J8
zp@_dnjo+0McX9C(`6y+XUHr!CnsW1x9hJ1B?U%(JC!^2*Z0Xj0rA)i+_@O?P8*b9u
zP$CdD`(09knjiXH5H^NXR6KNpV8*T@jRKmr{nNYSHivtg3-5y{+-qed@qW1q5{wJa
zZwztmgJnJkm~JIP^E`R2!}11r#!zOGHACq2t-k6n*D(aLplFN(eZW&=P`WI^F&Z8j
z`C5q)35qPQtVki-ZKS0T6HEdVa7?_k*zN;EFc-NXx`0$K3a&@%P*4?si{dLyfrnW1
z$V{WZaF-k+<8l;KR0h9*(;BE6e;E3AjY?rU-&n$F{bHpP7Zugl2M9vGpOi{URFtBJ
zn;;<1_hA&lNiU-x7$TWJwsA&=F33R!+b|kbEMP?t2?Wq*$XrE;!9$_H0VgFLjDzPO
zZ|Vj*`ZD-wDnFOe>b<~3;2?r@lawFUF5YZ?f+%9^JGv?uWrE=<pb5|$!Y?y(^Kalw
z^;00Gi}ln9`a6YF@=$A;F<uD10UDoT9ZVQ1*>C^_ZEAL!&Rcnb+s0c=cYXE*2tJ^P
zwW<A5`UTqhD+7|?d}}1rE%=?^Z7en^OdJICOXvXnDlP&7umI2ofV-N%E0xs}6Aziz
zFS07GZx?OxJ0ux@b{O%fRc$5W5@tUTW+%^}<b6K;eHI^uFQmJ_x9#HcsjE3f?^2%{
zMQkETfFj6+r{IyZU7f5FKs4J*7_A=y@%SDwa-~CT*K=}Umpo8rjQ6Z!OVf)E`=Z@<
zHkjSjVr#AC_<iKKN61De$y}llVFUFlI6k5aXOy2`zwVAx$Qyu>qilu>(=V5X94PaO
zu3E$hVGf4}SS}5We5H^X)$p|F0ip$x{x>)o)GCa`;FE#nrvv~qbh4Ae_wN0yLUD_8
zn66$61WWh<*@7`O1Q@Xq(b86A0kUrZS%)8rBjNdsgF^Wd3ZOKqtf2yM8iycw=qL|B
z#q3Q+Nhw?}e3(hN@{lyj7s+G!1Yofh0?F|NThgKa%^yYken2LFKE8y@%g1*}E#P3_
z1&r@cz?W?BKIUNJ<{s_u=(ukI1cISrU9zDJ7+cnAvW%mdL{WJ_&T`IEaC&nBZoW6D
zaD4TiTlRnZHVa3{#A|e%(nw?Vyw5Auz%-0yeDI*CN{P`M^)4>^aTtOU#RKaDdtdbi
z#0m-{Xc6vuN%mJyKMstI@vH$)?-j5%QIq>R0KWi&nKrekN2OBi+V9`t|Es6#fX2Fg
z{}0)l>_k?C>|~~7R46i{Y_gJ-qU@}UNJ3W13>jq<5{gvl)oWyDq)1lCDt@2m|DN;j
zIEQmuJkR~TuKT(^3-7!TF6?>Q*E3O!ln|}sh~9vurQiA@KSXKdSU&Xk_ctNj58%K}
zO@RZ<=0vUc?f7^FsaQb77Ze=cF|~p922VLz@;<zDr!FJ{yXgX^orh^Ed1&J?KK%<i
z(q3Gbejl@x(q;N2PY;C-qCbVE;P}h1qyKT|GrPpvd4}azd%hTvHBdY;C2^)9=pW&{
zN<wvp%$coX!pUy3LfNtXOoM-KUvJH9_5G^YsU>qWGYQN^8TbjMn7Fv2!JV_6`8OYH
z{C6E4ni!&piguuI9ogz%T#;dvWH9Y^UTc=kX?A>MPwA6sx;VEzb`2Z9hRR9){83_W
z!sFSB2Tger9o0Nm0$db5Ar{L_(5W3@>65MbL|H}U^Q5O@6vT6J=ybZh&M#rkMOlt5
zo_Y$LUGkn>K||QQe&fb(I%?{)wr4+wJ}8otHs6Cnk_OXOBE;ClAgm9n{A8q|g#VK@
zPL`CvVj-GCd?9d}xn%ixa#jcL1aaKfK8|R0#AV?_-nlE}fzlPn+aQ3&QC1X*tzjdg
z<Ob=uJ6ssxD5rt%dJ%g*;^hoq7At{<@{~|x+WP^Ts9E$awO5$vgd55MThBuLn9jw_
zJboR2KMu=;7L(BKlM?LyS?a+@T;AUmo~yyyVHW`dv(F8@nxEmQPXw}6D$yLNO->Y7
zH#9WNV}wvRxDXBu(UDM5l4s>xDC+8kZEy#eDq$FgZQ=eQhIj*V0?PH8S(P)hIwX)-
zsiPF;jR0?)UUyf#L3jZIMaZS_JKKbK(nSg;>W2&JX^IV2j0{m>;o)S6$CFwIfdph~
zhEmfD0u>nIURX#{@l#0U=XcL6t}ogD+*v)>k$sr4pdg~x7zmM^IIYH`ik6!u%w{QS
zztA&?`wl)jdiG%UYA<-oBe+m3nFhdE&r=Eiyt_`%S|$!bYyQ|c_;+$(U?2$r1hvKG
zW$_J5w@0$!SDd;x4eluqUHOzgp}>cM+|$QL{?_tNbyG}?uBFnYr8Ad=0@77-Di7y5
zS{!vCw`w2Q$6ie%e$-LI^SZ(}-**qciOP$p)SC}j-IDxVTV{xd$P+An;1ra!>=GfV
zsT^>K!u*5<5i}cjV8Ry?LKy7nsnRzgXXh8P@mU+w=JEHCzx0_im7^x*XG7ZhUVaDP
z8S-=L94m7}9Kcv7z}hmt-~g_pMW3_0HKz?jBk$h5BQ<psKQOAZ;6Zz0_H@E1x<mzF
ziG01!%)it+I&D@a%((0g;#pRyhv#Sl0L339_XZxWudlDvV#lxm`2^_GJ|%h%%o^!^
zWtMv&l|YzHC>RvLSP4YCX}q!!RD@Jk%E5RQm}PTh-gDS6sSym&af#0Tu%N(?mzkCI
z37MAh85tK+i)o%<Ew{!T+iDyTpb8!nZStuIFa$vv$^}+!f!&+C37Z+=N5Wneh5V`)
zVv(8x`~XYR;HDZ%m?(ZtJlQ?i>pX`}?Z?lFEYy}Pa)SEbmF~-+upA}eeYY`B;X>@+
z9^}6gpEZQep__KeUv?*S4kMw?8qXox)6D`GCXG=b$JT`V@Cm5Wc;pEeq3NOLQZv}c
zhoO{o?pidbf(_Mi!Ytu2Nr%1p@A2<Fuh6_Ss9Y>hIjE8B6J<G9YM!FMLAlI8_Xc`?
zJBY(!HM|Zmm8grx5H~UHj-4LJN!zVU4YK1kpg4CtI8>r(K|)Aq3kz#ddve*0Y4>iU
zq9%mySrQwW@z<}T^=sLJPx7;d=}(I2cf+-KeIi!fnh&{=VjB<A(#-$pg>d>U1Nmqs
zRf`CopOv-Oe!sS|vLbe6yOGuGV6NQZ5y8cbL(fJ$i*9rE|6yGmlx$hnlTmOJ58yaG
zyC-CGF7;SL;V$is*^Mtkw);cKFD?yWFFEU@%%p+RO*DvqWN@phN?z}QDi>y|aP3@@
zgtp@_dU^QC*`ma@VX!)AHG!SWmXe7(gZ}AN`i?z4@4P>GB(Rg-UsYni38U;333CCf
z7oN7&nkm}3<{zfKGya0&mxI;P->G$2M0|qnKm^eIM>wTmuCPEV0AuyZg(JILCw^ch
zdbq@-gdOEr1QL+aW`S6yi6J0ClPF!qhwNHzt$}%ZApFj+@E2}iBrIUrH+hUo=|bAO
ze`kCSwc5$RF-jW#E{r_Ju~C&I`($NVa8{9MdOC8r5<#uP1md!PX(_l)Tv<s8J6&E3
zJ;lWv&KNzAmIW0)Em$#xqbQJo7l<Aix3%ppZ%;g(!TRRO%P?H`xOH`P7sR~J<36J1
zg@scvSFu0v_*7F<({msms1_%h7F0bH+y3}{Irbm}#cDiPWHaP6kg6zVs%Nwy;4ZEb
z4^QLOS$04Wz%dd5kAo@E=kn#%-)@X_zPL#@Y`X|5hS)V$loI|NdH%cfgv07Crn5q2
zJ%r6aNfX6B16LF??|!!sWfj=B@1dq1vj)P4VJB_$Q_8_$G8Mf>hmsN~Lrz(}%BZFm
z$<g<|xGic>`P9WUkj6NY28Gf5DJni7IbbJad~%C1(l%x&;I|RcRs;LxFZ(|3JSV**
z!{5_TXWH1oJ$l2BmQh!<dsM^5b(h`vP5L3p@!ook&yVSK-c+pB$A`S5Dche|k$B5L
zS)>9jW9ocqALN#yZ^n@$PISOQy=wwQjSD*|3Osg~L>Y$POR>(=Up-HJ*0NXroTB(b
zaPq^yud{w{a}H%ql&ftAaPm9gR#TLHfgk=K4-Ip*?@Qa>^aF`?i=cRJY6mIAWyWH2
z(ztB5V|>T~Y)bSK#ReN*;Y~YFedi1fEv|2t6bJ3<)P2NeAWf3~O~#GDe9d#2^Uz&=
z$J>rrsyWM7HaS>!a9c-pI=^Np5pnWi(P^nX<@gVY<^JhNMK9`aap_A+&Ai-f)AOO)
zWKYSJRqIPK%Ibr=M!FsSd<3H(uV!62V>FUk{$sSbZmnctd%hfZ^iD9$)VX~1L|IcD
zot(DtT0rlO2K~jzGHc=oC_>wCl%%Jp$5o{TnH>3;>e3Aylpgp61>zuyh8{f{`0KsM
zGU2QLvjvPPFJfY1tPNSK<KmbDL|LK-<FxHpK+N%+?&3$>dwe_t(K}yDOUtanhUBZa
z5~A#P0XxDKX8iptygUP)UKZ21Y}v|lTYk~e*3Ky`q-2lHZy&00!-k*qAr|+}E-uZ;
z<@N%HEiXU6nK_~NP_&VQ6KAAe*Y+`^_cNSTFQ>@(!(Y&fegE=NfQd?#`qxhWsr<o>
ze*1)04pvqwuE=AirYXO&d`D$qNW(>xig0z(QQYC-<6BUnuVeI0bw4ku{76)+XM8=H
z#B6W2j%dt{w`z-jgOttCku||c0q+9<J89_AF)>!HTAqU*OvMIqTlI1jmu^NqUJ%j`
zE3|WVuwe81IvU84$(Y~d9aC~p-SWkL-I;`Rx!~8`3Ec#7-a^{yP?il1{zAdGPZ@eC
z!ff4bZ1z1dB}#6PC+&ry6mwH73JniTVrWWwZ@i7oh%kH?!RIdNXU))QOST!a<l`zY
zeVn|Yp1E;wU1L#wLAi#5x21iUF%<Q|@a$Px=ci^t%3KVE@5Ce}%NXeB?x}5jO+xMO
zuX0IByEqV>=@yXM>3Cslz$rT`E<XM@vLwbWudO+>u)UGC27GdwmyL}aKm^)7W;0u;
z7DT0_Qp<oNTO?{xVQ(^3YEk>F7)96{Q*Pvk4<Ez`_E+~q1)ADu0QbsT?6I^79!XxN
z*F1TAPZxHpm7OgT%|A>1)GTgskvR#`HeBe~5GfJ}h^8T=supd5Vyb@G)%AQTC{rEj
zhuYax#aW^a%*>n*angyry!;Q5QT#$X_qv?8xGsFu$pG79ZiV6Rql${I!QtTmJC?#C
zliW`yp!(67+qfv3rcUt4irRy9GrN<6L%=3+2Cv%zY`I;Ooo!7Bi9g9B{$28MW~<W0
z>F6d`507#XGW)DqX<GTP>mdaThlYkmlRfsLyT1PIOZ#}Ilv|pbLfp80_%;Z?35z5Z
z7rA4^$+bxbC#7W%u0K2OreyzYzT}-iICPl;(D`Cj(Nbnvf9F4Y&Cj*I6t(`7Hqn{_
z2tG>G5@A@QAynz>gJCwN$N+8Av`s{0<UB%=*CH`HZw`siXSxUv$96g%H!<mr%*he(
zo46rE7lz_nUqHS#w{<B`16Li8bblr~dw-7`T57iJzS+pQajCM?{I6Wg_AkM5MLy%W
zI_+N;dN$)JpMzfP7uSxL`e@NS`sMIpPUX6$tFBF4<$^o;tSvg^f=9$SH>C1I>Ma@n
z&818vn~0>Io9r*BAH|;7$kS6A3=<qsM5;jdM2Oa$xIvol!j0%S?c7g(P2Dl;F*Dh7
zo6l3(1d8}PC+Yr71u3p%FotYj3t=9Q5ZQ@OQ<GcdipjaxJtqV(8@P{cmz%;Dqld8n
z*y1ZSoxPirlk*65#Gn1#X_#lF&f_#3E$kjiLKq#{h06*V!6#2rr>3X7T7!%jh%w+d
zn1=o^uM5QJbFFef0;g#}?O35->9c3vpI}6~2OUt5L&A(nn`)!gSs1I^an^HeY;3#V
z+L%kE1j2g6@w*rYjw57{sZ8wAnt%i=&X@K#2Jay3yvyp$kI~-Vt9}@(OM82JYv9Fh
zz#4%;I|qmD22g~I{Yf(qpU=TR@IoEX*AzrX_dBO+pE<*bWu;{%F6&kx_&ENcqX^p>
z8yj<W-#;}wtHRfmI_g=Fmp2U;rKyOBh(eBo=c{xjQxCtN`c;4dW^Q{rH(`5U@~LhT
zzrWsQ=><w_L2uM3bOjQ@f4zRM0G)Jf5<bEqsHkQV>_BYsQB_@COEGRZ`X;iu`Pj_g
zc@--D;C<mjyESsC`MbRmI~ImpdX2)F=tBy5hN21EYp7?ZLxq{B7JrnKPvEW(UW*rb
zO+96;zaUj)R1_#0WVG$0!d>K~BpMpW!Dv$Tt`LpcJP9+HK+vYZTIlKPtBXPKm8Iq0
zAG5Pw@W}x|=(UaX80yK@0vFD;f0ueLdzX=|G+o}5ROCBCDK60BG{^YeaDCz@TY%Zf
zwhVvXue^e_%FG^HGjUV?nfx8zG<LG4k+P`jiK_-j<h+WE;;bq!cN99J{>g}nPQOEM
z{@k$ic8?ulacQY}$fJ>7g9-<dGZMLF?mNUOj!DCZcU1J*;y$nDOX@qm2YM(;&WEc6
z9XJtmZLj;`2b6VXyW*%Quf0@SZu1EAWNLan<4ub1eyQ(*$4KRi&6*?=E354bDHp$F
zYJAKGF-fV&Ky<&_K|5(qQ*@-VjOn-Cv#YyLUuDurKM-@{Ret`IIyX0We8Orl+GHCp
zq8(Tzd6kHiP(i41NlsQah6tR)QB^AGgb=7TI`;Ot;*1RK&-yXV-05`OT1UD3uEs+Z
zg?~<1M8pX+m_IUYUUFtBbFwITo12^alPP1FUZbswA!}OS&Fv@Jf$|&o=f2f7H9>=5
zz&p!k!qrNSNQ9Eo&NW2R$I@-wZ`+?q2qwM%gF|RU$fWe_-18A;D4Ts?SD%+)*B!>^
zk1)r~&Jm4)-_0>xQ(OpzB+d<LrjfR9uU3rN2IwHYrWFHO-jSu2-J+6`^S_sulgiDW
zYS_r8JznB@GPAFOm*AshF&gas)}ogD)eb|*%n{n2`tTkAMwUbKtp_RE1^ef&LB$G{
zMF#`zm1rg0?3DM`)z_=BfEFdks$~n4KHj;t<a1WdV6n)2^2ynXX#}cE-Fj!zOw~$@
zlbKmYnAk;K52e!{=6(56KX~Zu#@gV6+bRT7GH@7+glT6K%orR)fAMj-od~8BwI)|)
z3bj5r>oIWas>NEfgY4A8(DQ_%va+CB3~``#j<0^U2G#L#Ny%|&DxQCGmXJx)t5+>;
z(Nk}(_uskro^G&@ak!XVh~z%k*C=&s<z2&@+%}p7LG3|C;}h`-riQG^T2vdZ%9$ZV
zsQg1qa{WHi#eQSnLL&#*{e2T^^E#6B)OW8^+E1f?B?bGN2ds5ABWXPRE-MTvAcq4m
z!Y~LE?e|UzquzD(^n|~Cs}1;!j-HW`Pc}_2W53}Ji%wdx!We<)+PworwPE(^jlgqQ
z{*fl0SlJcVvN7!a^SBDvN6_J_t;!pB^YT6zAEP7l+}#wcf45S%)Kmxl?N>-cLlk)^
z1XyXJ4Mc?q29}lwNu+H%E@H55M6L@R2m`cu|E+f|4uQ+F;_+(Z?IEg!@oT62{>qQ9
z*1E+lsE|15hfTimUucNBdzVG;Ug*o>Vw(FlF<sY76<d>fU9|!O8<t1>%Uq5*#YAEh
z@RDn|!sFy*&JHfv>IsMB)YLa_3SpCq37h6Rc4vKjeSztB%qZ4p2v|Ko@J5<Q-von1
z`pP#wf?)SeNna0}vBcW#HhuXY@r600yPTP?{?w7lDSU9|uKnp-d}Mai?rVcf$*=f!
zu8jJHRS#vW_x9&5bzS{{+4%Rh`jH1Gx~mxZ^RjL4i_gu?sZjH;jv5OXymbx>NFzKl
z(EG_l8A2iIWUGB-CUK6x(!@c;_+sG_9)Xc{$i{DgFcaGTb$)hsi?-BstIN^b*AC2f
z7uhs7l{T;CPRC`5G`+r)hCSJMBDa^}Si-SBzPxQKCRdx_eY=rh^Bv>bJ-F4e_)@kv
zG_LHIVo8{Z!loh?^O_5YfB7T323*pw3Ag3B3|2o|c^yIf26klMfjFqgwZcu^$kNED
zvfn}W@9jI@|NNXE=H=#oU5`8!=sowYnkb1SyPkpiKl1wn|M&uzO^EF?%U8YFOL}8I
zd^lBBRkiX4i82XXVaa#zdgs>ED7;RSwS6)X9~T!FPs<@09+;h(5ZC1GBibV;6DqY^
z<8L@=vZj%ys$SO#lHMa>cmJBq%^m-9xqb4{OGD9^Z`QxIocZBlR?_R5+g7{ZFLX5|
zb_G4(NM2t@S!=~Co8fR#KJ1-zfSKBVGm5))%g;hAc{_6Qh0htQ-+J9E!j%JmmKU}z
z{)3694t#Vq$)xx5G2%Xb8$)fQ!^3g7BJKenp=a&=#tCW(UQi_bjG1_OgFd-d7k4;T
zcG*3pii(O_;2v|3O@k}7^gWLQyo}rc`tE_dy(7X(Bb=+I7_bNL`Y-}(s<7=_+WHzW
zCNoHrRwPDXU&>S!`RDzWU;lkN;u`U-T9uLbzkt@#)^n4??7uGopucRI0KM<O-y>)L
f|34!bvBO88c(|q*O`aV~z^{{9r!~toY;OJ!aE=8S

diff --git a/source/blender/editors/datafiles/blenderbuttons.c b/source/blender/editors/datafiles/blenderbuttons.c
index 722e3ada57b..cfd526d82ef 100644
--- a/source/blender/editors/datafiles/blenderbuttons.c
+++ b/source/blender/editors/datafiles/blenderbuttons.c
@@ -1,5609 +1,5710 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 179274;
+int datatoc_blenderbuttons_size= 182512;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,  0,
-  0, 13, 73, 72, 68, 82,  0,  0,  2, 88,  0,  0,  2,128,  8,  6,  0,  0,  0, 64, 11,  6,158,  0,  0,  0,  9,112, 72, 89,115,  0,
-  0, 13,215,  0,  0, 13,215,  1, 66, 40,155,120,  0,  0, 10, 79,105, 67, 67, 80, 80,104,111,116,111,115,104,111,112, 32, 73, 67,
- 67, 32,112,114,111,102,105,108,101,  0,  0,120,218,157, 83,103, 84, 83,233, 22, 61,247,222,244, 66, 75,136,128,148, 75,111, 82,
- 21,  8, 32, 82, 66,139,128, 20,145, 38, 42, 33,  9, 16, 74,136, 33,161,217, 21, 81,193, 17, 69, 69,  4, 27,200,160,136,  3,142,
-142,128,140, 21, 81, 44, 12,138, 10,216,  7,228, 33,162,142,131,163,136,138,202,251,225,123,163,107,214,188,247,230,205,254,181,
-215, 62,231,172,243,157,179,207,  7,192,  8, 12,150, 72, 51, 81, 53,128, 12,169, 66, 30, 17,224,131,199,196,198,225,228, 46, 64,
-129, 10, 36,112,  0, 16,  8,179,100, 33,115,253, 35,  1,  0,248,126, 60, 60, 43, 34,192,  7,190,  0,  1,120,211, 11,  8,  0,192,
- 77,155,192, 48, 28,135,255, 15,234, 66,153, 92,  1,128,132,  1,192,116,145, 56, 75,  8,128, 20,  0, 64,122,142, 66,166,  0, 64,
- 70,  1,128,157,152, 38, 83,  0,160,  4,  0, 96,203, 99, 98,227,  0, 80, 45,  0, 96, 39,127,230,211,  0,128,157,248,153,123,  1,
-  0, 91,148, 33, 21,  1,160,145,  0, 32, 19,101,136, 68,  0,104, 59,  0,172,207, 86,138, 69,  0, 88, 48,  0, 20,102, 75,196, 57,
-  0,216, 45,  0, 48, 73, 87,102, 72,  0,176,183,  0,192,206, 16, 11,178,  0,  8, 12,  0, 48, 81,136,133, 41,  0,  4,123,  0, 96,
-200, 35, 35,120,  0,132,153,  0, 20, 70,242, 87, 60,241, 43,174, 16,231, 42,  0,  0,120,153,178, 60,185, 36, 57, 69,129, 91,  8,
- 45,113,  7, 87, 87, 46, 30, 40,206, 73, 23, 43, 20, 54, 97,  2, 97,154, 64, 46,194,121,153, 25, 50,129, 52, 15,224,243,204,  0,
-  0,160,145, 21, 17,224,131,243,253,120,206, 14,174,206,206, 54,142,182, 14, 95, 45,234,191,  6,255, 34, 98, 98,227,254,229,207,
-171,112, 64,  0,  0,225,116,126,209,254, 44, 47,179, 26,128, 59,  6,128,109,254,162, 37,238,  4,104, 94, 11,160,117,247,139,102,
-178, 15, 64,181,  0,160,233,218, 87,243,112,248,126, 60, 60, 69,161,144,185,217,217,229,228,228,216, 74,196, 66, 91, 97,202, 87,
-125,254,103,194, 95,192, 87,253,108,249,126, 60,252,247,245,224,190,226, 36,129, 50, 93,129, 71,  4,248,224,194,204,244, 76,165,
- 28,207,146,  9,132, 98,220,230,143, 71,252,183, 11,255,252, 29,211, 34,196, 73, 98,185, 88, 42, 20,227, 81, 18,113,142, 68,154,
-140,243, 50,165, 34,137, 66,146, 41,197, 37,210,255,100,226,223, 44,251,  3, 62,223, 53,  0,176,106, 62,  1,123,145, 45,168, 93,
- 99,  3,246, 75, 39, 16, 88,116,192,226,247,  0,  0,242,187,111,193,212, 40,  8,  3,128,104,131,225,207,119,255,239, 63,253, 71,
-160, 37,  0,128,102, 73,146,113,  0,  0, 94, 68, 36, 46, 84,202,179, 63,199,  8,  0,  0, 68,160,129, 42,176, 65, 27,244,193, 24,
- 44,192,  6, 28,193,  5,220,193, 11,252, 96, 54,132, 66, 36,196,194, 66, 16, 66, 10,100,128, 28,114, 96, 41,172,130, 66, 40,134,
-205,176, 29, 42, 96, 47,212, 64, 29, 52,192, 81,104,134,147,112, 14, 46,194, 85,184, 14, 61,112, 15,250, 97,  8,158,193, 40,188,
-129,  9,  4, 65,200,  8, 19, 97, 33,218,136,  1, 98,138, 88, 35,142,  8, 23,153,133,248, 33,193, 72,  4, 18,139, 36, 32,201,136,
- 20, 81, 34, 75,145, 53, 72, 49, 82,138, 84, 32, 85, 72, 29,242, 61,114,  2, 57,135, 92, 70,186,145, 59,200,  0, 50,130,252,134,
-188, 71, 49,148,129,178, 81, 61,212, 12,181, 67,185,168, 55, 26,132, 70,162, 11,208,100,116, 49,154,143, 22,160,155,208,114,180,
- 26, 61,140, 54,161,231,208,171,104, 15,218,143, 62, 67,199, 48,192,232, 24,  7, 51,196,108, 48, 46,198,195, 66,177, 56, 44,  9,
-147, 99,203,177, 34,172, 12,171,198, 26,176, 86,172,  3,187,137,245, 99,207,177,119,  4, 18,129, 69,192,  9, 54,  4,119, 66, 32,
- 97, 30, 65, 72, 88, 76, 88, 78,216, 72,168, 32, 28, 36, 52, 17,218,  9, 55,  9,  3,132, 81,194, 39, 34,147,168, 75,180, 38,186,
- 17,249,196, 24, 98, 50, 49,135, 88, 72, 44, 35,214, 18,143, 19, 47, 16,123,136, 67,196, 55, 36, 18,137, 67, 50, 39,185,144,  2,
- 73,177,164, 84,210, 18,210, 70,210,110, 82, 35,233, 44,169,155, 52, 72, 26, 35,147,201,218,100,107,178,  7, 57,148, 44, 32, 43,
-200,133,228,157,228,195,228, 51,228, 27,228, 33,242, 91, 10,157, 98, 64,113,164,248, 83,226, 40, 82,202,106, 74, 25,229, 16,229,
- 52,229,  6,101,152, 50, 65, 85,163,154, 82,221,168,161, 84, 17, 53,143, 90, 66,173,161,182, 82,175, 81,135,168, 19, 52,117,154,
- 57,205,131, 22, 73, 75,165,173,162,149,211, 26,104, 23,104,247,105,175,232,116,186, 17,221,149, 30, 78,151,208, 87,210,203,233,
- 71,232,151,232,  3,244,119, 12, 13,134, 21,131,199,136,103, 40, 25,155, 24,  7, 24,103, 25,119, 24,175,152, 76,166, 25,211,139,
- 25,199, 84, 48, 55, 49,235,152,231,153, 15,153,111, 85, 88, 42,182, 42,124, 21,145,202, 10,149, 74,149, 38,149, 27, 42, 47, 84,
-169,170,166,170,222,170, 11, 85,243, 85,203, 84,143,169, 94, 83,125,174, 70, 85, 51, 83,227,169,  9,212,150,171, 85,170,157, 80,
-235, 83, 27, 83,103,169, 59,168,135,170,103,168,111, 84, 63,164,126, 89,253,137,  6, 89,195, 76,195, 79, 67,164, 81,160,177, 95,
-227,188,198, 32, 11, 99, 25,179,120, 44, 33,107, 13,171,134,117,129, 53,196, 38,177,205,217,124,118, 42,187,152,253, 29,187,139,
- 61,170,169,161, 57, 67, 51, 74, 51, 87,179, 82,243,148,102, 63,  7,227,152,113,248,156,116, 78,  9,231, 40,167,151,243,126,138,
-222, 20,239, 41,226, 41, 27,166, 52, 76,185, 49,101, 92,107,170,150,151,150, 88,171, 72,171, 81,171, 71,235,189, 54,174,237,167,
-157,166,189, 69,187, 89,251,129, 14, 65,199, 74, 39, 92, 39, 71,103,143,206,  5,157,231, 83,217, 83,221,167, 10,167, 22, 77, 61,
- 58,245,174, 46,170,107,165, 27,161,187, 68,119,191,110,167,238,152,158,190, 94,128,158, 76,111,167,222,121,189,231,250, 28,125,
- 47,253, 84,253,109,250,167,245, 71, 12, 88,  6,179, 12, 36,  6,219, 12,206, 24, 60,197, 53,113,111, 60, 29, 47,199,219,241, 81,
- 67, 93,195, 64, 67,165, 97,149, 97,151,225,132,145,185,209, 60,163,213, 70,141, 70, 15,140,105,198, 92,227, 36,227,109,198,109,
-198,163, 38,  6, 38, 33, 38, 75, 77,234, 77,238,154, 82, 77,185,166, 41,166, 59, 76, 59, 76,199,205,204,205,162,205,214,153, 53,
-155, 61, 49,215, 50,231,155,231,155,215,155,223,183, 96, 90,120, 90, 44,182,168,182,184,101, 73,178,228, 90,166, 89,238,182,188,
-110,133, 90, 57, 89,165, 88, 85, 90, 93,179, 70,173,157,173, 37,214,187,173,187,167, 17,167,185, 78,147, 78,171,158,214,103,195,
-176,241,182,201,182,169,183, 25,176,229,216,  6,219,174,182,109,182,125, 97,103, 98, 23,103,183,197,174,195,238,147,189,147,125,
-186,125,141,253, 61,  7, 13,135,217, 14,171, 29, 90, 29,126,115,180,114, 20, 58, 86, 58,222,154,206,156,238, 63,125,197,244,150,
-233, 47,103, 88,207, 16,207,216, 51,227,182, 19,203, 41,196,105,157, 83,155,211, 71,103, 23,103,185,115,131,243,136,139,137, 75,
-130,203, 46,151, 62, 46,155, 27,198,221,200,189,228, 74,116,245,113, 93,225,122,210,245,157,155,179,155,194,237,168,219,175,238,
- 54,238,105,238,135,220,159,204, 52,159, 41,158, 89, 51,115,208,195,200, 67,224, 81,229,209, 63, 11,159,149, 48,107,223,172,126,
- 79, 67, 79,129,103,181,231, 35, 47, 99, 47,145, 87,173,215,176,183,165,119,170,247, 97,239, 23, 62,246, 62,114,159,227, 62,227,
- 60, 55,222, 50,222, 89, 95,204, 55,192,183,200,183,203, 79,195,111,158, 95,133,223, 67,127, 35,255,100,255,122,255,209,  0,167,
-128, 37,  1,103,  3,137,129, 65,129, 91,  2,251,248,122,124, 33,191,142, 63, 58,219,101,246,178,217,237, 65,140,160,185, 65, 21,
- 65,143,130,173,130,229,193,173, 33,104,200,236,144,173, 33,247,231,152,206,145,206,105, 14,133, 80,126,232,214,208,  7, 97,230,
- 97,139,195,126, 12, 39,133,135,133, 87,134, 63,142,112,136, 88, 26,209, 49,151, 53,119,209,220, 67,115,223, 68,250, 68,150, 68,
-222,155,103, 49, 79, 57,175, 45, 74, 53, 42, 62,170, 46,106, 60,218, 55,186, 52,186, 63,198, 46,102, 89,204,213, 88,157, 88, 73,
-108, 75, 28, 57, 46, 42,174, 54,110,108,190,223,252,237,243,135,226,157,226, 11,227,123, 23,152, 47,200, 93,112,121,161,206,194,
-244,133,167, 22,169, 46, 18, 44, 58,150, 64, 76,136, 78, 56,148,240, 65, 16, 42,168, 22,140, 37,242, 19,119, 37,142, 10,121,194,
- 29,194,103, 34, 47,209, 54,209,136,216, 67, 92, 42, 30, 78,242, 72, 42, 77,122,146,236,145,188, 53,121, 36,197, 51,165, 44,229,
-185,132, 39,169,144,188, 76, 13, 76,221,155, 58,158, 22,154,118, 32,109, 50, 61, 58,189, 49,131,146,145,144,113, 66,170, 33, 77,
-147,182,103,234,103,230,102,118,203,172,101,133,178,254,197,110,139,183, 47, 30,149,  7,201,107,179,144,172,  5, 89, 45, 10,182,
- 66,166,232, 84, 90, 40,215, 42,  7,178,103,101, 87,102,191,205,137,202, 57,150,171,158, 43,205,237,204,179,202,219,144, 55,156,
-239,159,255,237, 18,194, 18,225,146,182,165,134, 75, 87, 45, 29, 88,230,189,172,106, 57,178, 60,113,121,219, 10,227, 21,  5, 43,
-134, 86,  6,172, 60,184,138,182, 42,109,213, 79,171,237, 87,151,174,126,189, 38,122, 77,107,129, 94,193,202,130,193,181,  1,107,
-235, 11, 85, 10,229,133,125,235,220,215,237, 93, 79, 88, 47, 89,223,181, 97,250,134,157, 27, 62, 21,137,138,174, 20,219, 23,151,
- 21,127,216, 40,220,120,229, 27,135,111,202,191,153,220,148,180,169,171,196,185,100,207,102,210,102,233,230,222, 45,158, 91, 14,
-150,170,151,230,151, 14,110, 13,217,218,180, 13,223, 86,180,237,245,246, 69,219, 47,151,205, 40,219,187,131,182, 67,185,163,191,
- 60,184,188,101,167,201,206,205, 59, 63, 84,164, 84,244, 84,250, 84, 54,238,210,221,181, 97,215,248,110,209,238, 27,123,188,246,
- 52,236,213,219, 91,188,247,253, 62,201,190,219, 85,  1, 85, 77,213,102,213,101,251, 73,251,179,247, 63,174,137,170,233,248,150,
-251,109, 93,173, 78,109,113,237,199,  3,210,  3,253,  7, 35, 14,182,215,185,212,213, 29,210, 61, 84, 82,143,214, 43,235, 71, 14,
-199, 31,190,254,157,239,119, 45, 13, 54, 13, 85,141,156,198,226, 35,112, 68,121,228,233,247,  9,223,247, 30, 13, 58,218,118,140,
-123,172,225,  7,211, 31,118, 29,103, 29, 47,106, 66,154,242,154, 70,155, 83,154,251, 91, 98, 91,186, 79,204, 62,209,214,234,222,
-122,252, 71,219, 31, 15,156, 52, 60, 89,121, 74,243, 84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126, 46,249,
-220, 96,219,162,182,123,231, 99,206,223,106, 15,111,239,186, 16,116,225,210, 69,255,139,231, 59,188, 59,206, 92,242,184,116,242,
-178,219,229, 19, 87,184, 87,154,175, 58, 95,109,234,116,234, 60,254,147,211, 79,199,187,156,187,154,174,185, 92,107,185,238,122,
-189,181,123,102,247,233, 27,158, 55,206,221,244,189,121,241, 22,255,214,213,158, 57, 61,221,189,243,122,111,247,197,247,245,223,
- 22,221,126,114, 39,253,206,203,187,217,119, 39,238,173,188, 79,188, 95,244, 64,237, 65,217, 67,221,135,213, 63, 91,254,220,216,
-239,220,127,106,192,119,160,243,209,220, 71,247,  6,133,131,207,254,145,245,143, 15, 67,  5,143,153,143,203,134, 13,134,235,158,
- 56, 62, 57, 57,226, 63,114,253,233,252,167, 67,207,100,207, 38,158, 23,254,162,254,203,174, 23, 22, 47,126,248,213,235,215,206,
-209,152,209,161,151,242,151,147,191,109,124,165,253,234,192,235, 25,175,219,198,194,198, 30,190,201,120, 51, 49, 94,244, 86,251,
-237,193,119,220,119, 29,239,163,223, 15, 79,228,124, 32,127, 40,255,104,249,177,245, 83,208,167,251,147, 25,147,147,255,  4,  3,
-152,243,252, 99, 51, 45,219,  0,  0,  0,  4,103, 65, 77, 65,  0,  0,177,142,124,251, 81,147,  0,  0,  0, 32, 99, 72, 82, 77,  0,
-  0,122, 37,  0,  0,128,131,  0,  0,249,255,  0,  0,128,233,  0,  0,117, 48,  0,  0,234, 96,  0,  0, 58,152,  0,  0, 23,111,146,
- 95,197, 70,  0,  2,177,101, 73, 68, 65, 84,120,218,236,157,119,120, 20,197, 31,198,223,217,221,235,119,233, 33, 29, 82,168,129,
-208,123,  9,189,137, 52,  5,233, 42, 88,  0,  5, 20,165,217, 16, 68,176,162,128, 74, 87, 17, 16, 17,164, 42,210,165, 55,  9,189,
-183,  0,105,164,215,235,101,231,247, 71,114,247,187,132, 36,119,  1, 68,132,249, 60,207, 62, 87,118,239,189,153,221,217,217,119,
-191, 83,150, 80, 74,193, 96, 48, 24, 12,  6,131,193,120,112,112,108, 23, 48, 24, 12,  6,131,193, 96,252,135, 12, 22, 33,164, 51,
-211,100,154, 76,147,105, 50, 77,166,201, 52,153, 38, 51, 88, 12,  6,131,193, 96, 48, 24, 12,102,176, 24, 12,  6,131,193, 96, 48,
-152,193, 98, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,
-  6,131,193, 96, 48, 24,143,  7,132, 77, 52,202, 96, 48, 24, 12,  6,131,241, 96, 17,202, 90,209,168, 81,163,223, 21, 10, 69,181,
-178,214,235,116,186,148, 83,167, 78,117, 96,187,144,193, 96,184,188,147, 35,132,195,255, 35,230, 34,  0, 74,217,221, 29,131,193,
-120, 18, 13,150, 84, 42,141,218,183,111, 95, 13, 81, 20, 97,179,217, 96,181, 90, 29,175, 38,147,  9,253,250,245, 19, 42,250,103,
- 13, 26, 52,216,199,113, 92, 68, 69,126, 99,179,217,110,159, 62,125,186, 77, 89,235,  3,  3,  3, 15,  1,136, 34,132,216, 43,242,
- 82, 95,  1,128,227, 28, 45,162,201,  9,  9,  9,141,202,211, 36,132, 68, 57, 93, 28,238,210,178,191,119, 87,179, 86,173, 90,199,
-  5, 65,  8, 43,249,251,210, 62,219,223,139,162,120,227,236,217,179,173, 88, 49,125, 56, 52,104,208, 96, 31,207,243, 21, 46,159,
-167, 78,157, 42,179,124,214,173, 91,247, 36,199,113, 33,165, 29,227,210,142, 57,  0,222,102,179, 93, 62,125,250,116,155,178, 12,
- 72,112,112,240, 33,  0, 81,229,149,157, 18,101, 19,  0, 18, 19, 18, 18,154,184, 58,143,202, 59,135, 74, 41,243,229,106, 58,155,
-171,208,208,208, 79, 43, 85,170, 52, 90,167,211, 25,  0, 80,158,231,105,237,218,181,139,237,  7,155,205,150,126,241,226,197,186,
-172, 36, 50, 24,140,199,218, 96,137,162,200, 25,141, 70, 92,185,114,  5,165,213,243, 28,199,217, 42,250,103,148,210, 26,187, 86,
-173,  8, 80, 86, 10,132,205, 98,134,220,175,146, 67, 59,231,226, 57,136,102, 51,108,102, 19,252,155,180,176, 87,184,232,208,161,
-  3,239, 66, 54,236,173,183,222, 10,240,240,240,128,193, 96,128,193, 96,128,209,104,132,193, 96,128,201,100,130,201,100,130,217,
-108,134,217,108,134,213,106,133,209,104,196,153, 51,103,108, 46, 46,  8, 97,227,198,141, 11,240,244,244,116,232,217, 23,187,166,
- 93,215, 98,177,192, 96, 48,224,220,185,115,229,106, 10,130, 16,118,226,196,137,  0,169, 84, 10, 74, 41, 68, 81,  4,165,180,216,
- 82,146, 86,173, 90,153, 89, 17,125,168,212,216,240,249,172,  0,185,175, 31, 68,139,  5,126, 13, 26,219,203, 45,146,119,111,131,
-205,108,134,104,177, 32,188,215,179,142,239,219,181,107,231,170,124,134,255, 54,245, 29,111,169,135,  7,172,  6,  3, 34,123, 62,
-227, 88,113,126,225, 28,136, 22, 51,168,197,140,122,111,189, 15,  0,200,200,200,208, 71, 71, 71, 39,  3, 32,  0,202,138,240,132,
-221,184,113, 35,192,158,134,210, 76,191,243,114,240,224, 65, 12, 29, 58,212, 85,222,195,222,123,239,189,  0,251, 57, 82,178,156,
- 91,173, 86,199,171,213,106,133,193, 96,192,201,147, 39,221,138, 92,  5,  7,  7,127, 22, 27, 27, 59, 98,229,202,149,234, 13, 27,
- 54,168, 35, 34, 34, 32,149, 74,193,243, 60,120,158,  7,199,113, 16,  4,  1,189,123,247, 38,172,  8, 50, 24,140,199,222, 96,153,
-205,230,248,174, 93,187, 82,  0, 48,153, 76,161, 50,153, 76, 90,194,128,133,180,110,221,250,114,201,223,185,106, 58, 84, 86, 10,
-196, 15,145,190,  0,128,231,174,103, 58, 46, 12,107, 99, 27, 56,182, 25,124, 43,183,112, 91,165, 18, 28,199, 17, 23, 21, 56,212,
-106, 53,186,116,233,  2,153, 76,134, 38, 77,154, 64, 34,145,148,186, 72,165, 82, 72, 36,146,187,162, 71,165,161,209,104, 48,125,
-250,116,187, 57,130, 90, 33,199,216, 86, 77,160,  0,197,226,115, 87, 97, 18, 41,  4, 65,112, 44,238,104, 74,165, 82,156, 61,123,
- 22,130, 32,128,231,121,199,171,253,253,166, 77,155,208,191,127,127,  8,130,  0,165, 82,137,162,139, 44,227, 33,162,240,243,199,
-218,182, 13,  1,  0, 67, 19,242, 29,101,236,207,129, 61, 29,219, 60,159,164,  5, 33,  4, 82,169,212,189,227,238,225,129, 45,253,
-159,  2,  0, 60,123, 37, 13, 18,137,  4,130, 32,224,204, 87, 31, 67, 34,147, 65,144, 74, 81,239,173,247,145,145,145,161,127,230,
-153,103, 14, 40, 20,138,109,110,220,172, 32, 33, 33,  1,130, 32,148, 89,222, 57,142,195,178,101,203,112,235,214, 45,183,242,174,
-215,235,241,201, 39,159,128, 16, 82,236,124, 41,235,189,171,188, 19, 66,184,160,160,160,143, 99, 99, 99,135,173, 92,185,210,135,
- 16,130,111,191,253, 22, 82,169, 20, 61,122,244,128,159,159, 31,182,111,223, 14,169, 84,138, 73,147, 38,177,194,199, 96, 48,158,
- 12,131,117,234,212,169,167,236,239, 91,180,104,113,241,192,129,  3,181,156, 66,249,176, 90,173, 82,171,213, 90,195,222,108,104,
-191,243, 29, 60,120,112,185,119,244, 54,139,249, 46,131, 84, 90, 69,237,206,133,203,201, 12, 98,192,128,  1,  0, 80,230,197,198,
-121,113,227,174, 27, 38,147,  9,130, 32,160,102,229, 74,248,160, 91, 67, 52,163, 22,104, 11,  8,172,185, 90,244,209, 88,112,177,
-118, 35, 44,186,157,142, 91,121,  5, 16,  4,247, 90, 75, 69, 81, 44,211, 92,241, 60,143,  5, 11, 22, 96,208,160, 65,224,121,190,
-204,253,194,248,103,177,153,205, 46,203, 97, 69,143,141,213, 96, 40,140, 44,  9,188,195, 92, 73, 36, 18, 72,228,114,  8, 82, 41,
-  4,153, 20, 25, 25, 25,250,206,157, 59, 31,145,201,100, 63,  5,  6,  6, 38, 39, 38, 38,150, 91, 62, 41,165,197,181, 74,185,153,
-248,241,199, 31,177,124,249,114, 52,111,222,220, 29, 51,  4,147,201,  4,169, 84,138,143, 63,254,248,174,245, 11, 23, 46,188,203,
- 96,185,208, 35,  0,184,192,192,192,215, 86,173, 90,229,105,255,127,127,127,127, 72, 36, 18,212,173, 91, 23, 30, 30, 30, 56,112,
-224,  0,108, 54,155,219, 55, 62, 12,  6,131,241,159, 55, 88, 37,140,  1,103, 52, 26,113,233,210, 37,184,234,151, 74, 41, 45,183,
-150,148,251, 85,114, 68,174,214, 84,245,115,124, 63,232,102,142,227,194,181,165, 89, 53,200, 52,106, 52,249,240, 11,183,205, 80,
- 90, 90,154,227,206,219,213,226, 78, 69,110, 50,153,160, 82, 42,176,115,124, 93, 36,100,202, 48,237,112, 22,254, 56,117, 13, 18,
-137,  4,221,107,215,197, 83, 82, 15,188, 31, 46,195,248,171, 55, 97,161,212,173, 11, 24,165,180, 84, 99,101,127,111,111, 42,177,
- 27, 44,198,195,199,175, 65, 99, 71,228,106,101,101,143,187,162, 86,  0,176,169, 81,  4,228, 30, 26,212,125, 99,138, 91,229, 51,
-178,231, 51,142,200,213, 31,141, 35,193, 75, 36,144,200,100,120,238,108, 18,128,194,102,193, 14,117,163,247,230,240,178,101,195,
-134, 13,139,255,235,175,191,148,238,164,181, 52,131,101, 55, 63, 63,254,248, 35, 86,172, 88,  1, 65, 16, 96, 54,155,221, 74,167,
-209,104, 44,211, 56,221, 75,  4, 11,  0,116, 58,157,105,227,198,141,248,230,155,111,224,231,231,135,174, 93,187, 34, 56, 56, 24,
-107,214,172,  1,165, 20, 99,198,140,129, 82,169,132, 82,169,100,101,158,193, 96, 60,121,  6,203,108, 54,199,119,238,220,217,173,
- 17, 63,122,189,254,142, 11,  3, 86,106,100,192, 57, 42, 32,247,208, 64,174,209,128,115,115,150, 46,139,197,226, 48, 40, 59,118,
-236,128, 82,169, 68,143, 30, 61,238, 43,130,101, 54,155, 33,147, 74,192,249,  7,226,133,175,255, 66,102,190,222,113, 65,219,115,
- 35, 30, 39, 82,211, 48,190,101, 39,168,149,105, 40, 48,153,220,142, 96,149, 52, 87,130, 32, 96,192,128,  1, 48, 26,141, 32,132,
- 20,235,151,226,202,172, 50,254, 57,202, 26,132, 64,  8,129,194,211,  3, 50,181, 26, 60,207,187,165,229, 28,109, 18,100, 50, 72,
-228, 50,  8, 69,229,208, 30,185,202,225,101,203,146,146,146,142,  0, 80, 52,107,214, 76,233, 78,218,156, 13,150,179,  1,114, 54,
- 87, 60,207,195, 98,177,184,101, 94,140, 70, 35,164,210,255,247,  4,184,125,251,118,185,  6,203, 69,158, 41, 33, 68, 36,132,136,
- 81, 81, 81,142,223,  6,  5,  5,193,219,219, 27,162, 40, 66, 20, 69, 40, 20, 10, 40,149,202, 98,255,203, 96, 48, 24, 79,140,193,
-114,110, 46,124, 80, 23,175,242, 46, 96, 74, 79, 79, 72,213,106,251,104, 37,234,142, 25,178,247, 57, 25, 61,122,116,185,253, 82,
-236, 70,204, 13, 83,  9, 78,224,145, 18, 20,  9, 27,183,255,255, 23,200,162,133, 19, 36,184, 21, 84, 11,252,165,147,144,136,162,
- 91, 23,176,146, 17,172, 49, 99,198, 96,201,146, 37,224, 56,206,177, 79,  4, 65, 64,245,234,213, 17, 31, 31,207, 74,231,191,  0,
- 45, 39, 26,105,255, 94,225,225,  1,153, 70,  3,222,141,190,119, 37,205,144, 84, 46,135, 32,147, 66,144, 22, 54, 11,246,234,213,
-107,111, 78, 78,206,178, 58,117,234, 92, 69,225, 52,  6,156,187,231,144, 32,  8,197,140, 79,105,230, 74, 16,  4, 88,173, 86,183,
-111, 42, 74, 26,157,153, 51,103,222,181,109,191,126,253,220,141, 96, 81, 66,  8,149, 74,165,232,210,165, 11,234,213,171,135, 13,
- 27, 54, 64, 20, 69,188,254,250,235, 80, 42,149,152, 51,103, 14,172, 86, 43, 62,251,236, 51, 22,193, 98, 48, 24, 79,158,193,122,
-144,228, 92, 56,235,232, 68,236,220, 44,184,181, 85, 45,200, 53,106,200, 53, 26,180,222,176,223,113,215,140,143,103,187, 21,193,
-178, 27,172,204,204,204,114,205,149, 59, 17, 44,135,193,146,  9, 88, 27,150, 13, 42,147, 64, 48, 89,138, 25, 44, 94,144, 32,193,
- 47, 18,156, 68, 10,193,102,117, 75,147, 82,122, 87,147,224,139, 47,190,  8, 66,136, 99,196, 87,253,250,245,157, 47, 52,236,138,
-243,144, 73,222,189,205,209,161,221,185, 89,240,247,102,213,160,240,208, 64,166, 86,163,237,230, 67,142,104, 35,230, 44,118,169,
-121,249,251,239,112,118,206, 44, 72,100, 50, 60,123,242,150, 35,114,213,170,102,181, 35, 38,181,231,178,219,183,111, 31,  1,192,
- 13, 28, 56,208,187,126,253,250,110,157,147,246, 78,246,101,153, 43,103,131,101,177, 88,220, 46,243,238,156, 31,246, 40,150, 27,
-229,157, 70, 71, 71,131,227, 56,120,122,122, 66,163,209, 56, 70,208, 42, 20, 10,168, 84, 42, 71,255, 77,119,207, 75,  6,131,193,
-248, 79, 27,172,  6, 13, 26,252,169, 82,169, 34,221, 21,169,200,164,163,206,157,136,237,230,138, 16,  2,133, 70,  3,153, 70, 13,
-185,135,166,204, 40, 87, 89, 23, 26,123, 19, 33,207,243,142,139,205, 79, 63,253,  4,141, 70,131,225,195,135, 87,184, 15,150,253,
-110,158,147,114,216, 46,223, 13, 94, 38, 20, 51, 87,130, 32,128,151, 72,112, 71, 19, 12, 78, 34,129, 96,117, 29, 21, 35,132, 32,
- 55, 55, 23,130, 32,224,131, 15, 62,112,220,177, 59,155, 43,214,177,253,223, 71,116, 50, 35,197,162,170, 30, 30,142,242,233,252,
-189,171, 62,137,132, 16, 80,171,  5, 18,185, 28,146,162,129,184,246,200,149, 73,237,185,172, 86,173, 90,142,200,149, 74,165,178,
-143, 30,117,169,201,113, 92,177, 50,189,108,217,178, 98,230,170,100,  4,203,221, 50, 47,149, 74,177,100,201,146,114, 77,148, 84,
- 42,117,123,  4, 37, 80, 56,109,196,222,189,123,113,226,196,  9,140, 30, 61, 26, 74,165, 18,243,230,205,131,213,106,197,140, 25,
- 51,160, 84, 42, 33,147,201, 88,225, 99, 48, 24,143,191,193,146,201,100,145,  7, 15, 30,116, 76, 50, 90,222,171,201,100,194,128,
-  1,  3,220,142,132,137, 69,163,  8,185, 18, 35,229,228,158, 26,200,139,154, 94,156,191, 39,110,212,226,246, 59, 96,103,131,245,
-225,135, 31, 66, 16,  4, 44, 89,178,  4,  0, 48, 97,194,  4,183,251, 96,217, 53, 97, 35, 72,164,215,209,240,235,254, 48,173,180,
- 32,245,224,105,  8,130,128,128, 22, 79, 65,108,214, 31, 58,165,  6,130,205,234,246, 40,194,172,172, 44,196,199,199,131,231,121,
-188,245,214, 91,197,230, 42, 42,145,103,236,216,177,131,245,193,250, 23, 13, 22, 87,212,191,170,180,242, 89,194,124,185,110, 39,
-179, 89, 11,251, 93, 73,255, 63, 90, 48, 39, 39,103,217,237,219,183,143,  2,224,134, 13, 27,230,173, 82,169,240,253,247,223,235,
-  0,200,214,172, 89,227,210,101,217,203, 77, 89,230,234, 94,154,  8,237,145, 96,231,126, 93,247,107,176,236,102,144, 16,  2,155,
-205,  6,165, 82, 89, 44,114,165, 80, 40, 32,151,203, 89,193, 99, 48, 24, 79,134,193,226, 56, 14, 70,163, 17, 23, 46, 92,112,247,
- 14,213,237, 73, 71,253, 26, 55,199,224, 91,185, 32,132, 96,123,108, 29, 71,179, 75,171,223,246, 58, 42,236, 91,159, 76,128, 68,
-173,129, 95,108,215, 10, 93, 24,156, 13, 86, 78, 78, 14, 36, 18,  9, 62,254,248, 99,112, 28,135,207, 62,251, 12,161,161,161, 72,
- 73, 73, 65,187,118,237,220,186,155,231,109, 60,130,159,143,134,234, 69, 47,120, 62,223, 22, 62, 93, 62, 68,146, 73,192, 33,131,
- 10,109, 13,231, 33,219, 62, 23, 38,209,230,150,193, 34,132,192,106,181, 98,239,222,189,197, 58,178,  3,133, 77,135,246,233, 46,
- 44, 22, 11,204,102, 51, 62,251,236, 51, 86, 58,255,  5, 42, 63,221, 23, 47, 36,235,  0,  0,127, 58, 53, 91,183, 89,191,223, 81,
- 62,227,103,190,  5,137, 90,  3,159,166,177,110,105,214,126,125, 34,106,191, 62, 17, 25, 25, 25,250, 78, 13,234,236, 43,144,170,
-126,172, 91,183,110,177,200,149, 66,161, 32, 69,159,137, 59,101,137,227, 56,240, 60,239, 48, 87,118, 51, 85,154,193,114,247,  6,
-192, 98,177, 64, 42,149,186,109,176,220,133,227, 56,188,244,210, 75,  8, 14, 14,118, 68,174, 62,250,232, 35, 40,149, 74,188,243,
-206, 59,176, 88, 44,152, 59,119, 46, 43,124, 12,  6,227,241, 55, 88, 70,163,241,102,167, 78,157, 80,198,186, 80,185, 92, 94, 44,
- 12,100,159,116,180,100, 83, 33, 33,164, 51,165,116,103,105, 23,  8,231,209, 88,242, 18, 81, 43,169,135, 39, 36,106, 13,184, 82,
-162, 77, 37, 53,237,119,198, 37, 13,150,125,201,205,205,133, 68, 34,193, 55,223,124,  3, 79, 79, 79,199,104,189,242, 52,237, 17,
- 44,158,231,161, 75,200,199,197, 89, 59, 33, 83, 28, 66,181,174,131, 16, 44, 81, 66,122, 96, 29,244, 54, 75,185, 19,141,150,166,
- 89,163, 70, 13, 76,157, 58,245,174,233, 25,202,162, 81,163, 70, 46, 53,239, 23,166, 89,186,166, 59,229,147,151,203, 93, 30,119,
-251,122,123,228,170, 64,170,250, 49, 62, 62,222, 30,185,242, 82,169, 84, 88,184,112,161, 14,  0, 55, 99,198, 12, 85,120,120, 56,
-239, 78, 58,121,158,199, 79, 63,253,116, 87,135,246,210,204, 85,105,211,126,148,150, 78,171,213,122,151,193, 26, 48, 96,192, 93,
-163,  7,203,138, 96,149,150, 78,123, 95, 53, 63, 63, 63, 71,228,202,102,179, 57, 70, 15, 90, 44, 22, 88,173,214, 50,155, 90, 89,
-249,100,154, 76,243,201,209,124, 34, 12,214,201,147, 39,187,151,245,131,214,173, 91, 95, 57,120,240, 96,117,155,205,230,252,140,
- 66,169,193, 96,168,209,167, 79, 31,151,183,202,162, 40, 66, 46,151,131, 82,138,134,239,127, 10, 66,238,238,111,229,221,170, 19,
-136, 32,192,102,179,193, 98,177,184,156, 30, 66,175,215, 59, 46, 38,101,117,112, 47, 40, 40, 40,119,158,159,146, 23,  5,131,193,
- 80,236, 66, 69,168,136, 91,187,126,189,107, 52, 97, 69, 34,  4,  0,160, 80, 40,138,245,187,114,149, 20, 86, 68, 31, 46,246, 41,
- 21, 40,165,168, 51,118,114,225,113, 42,106, 46,180,155,  0,175, 38,177, 32, 18,  1, 34,  0,179,217,236,170,124, 18,123,159, 43,
- 74,233, 15,125,250,244,185, 12,192,  8,128,106, 52, 26,185, 68, 34, 17,  1,100,  1,160,217,217,217, 94, 73, 73, 73,162,193, 96,
-168,226, 42,157,123,247,238,197,181,107,215,208,184,113, 99,199, 35,155,236,205,110,118, 19,227,108,176,220,141, 96,149, 54,167,
- 86, 89,179,185,187, 11,207,243,240,242,242,114, 76, 98, 42,149, 74,161, 82,169,  0,  0,115,231,206,117,236,115,  6,131,193,120,
-236, 13,150, 11,131,196,151,213,124,232,170,169,208,102,179, 37, 54,107,214,172,162,255,151,234,226,130,152,184,111,223, 62,105,
-121, 15,121, 46,229, 59,151,154, 71,143, 30,149,150,243,251,210,222,167,186,202,123,243,230,205, 75,253,125, 89, 88,173,214, 36,
- 86, 68, 31, 30, 86,171,181,236,242,249,225,167,101, 29,215, 84, 23,166,229,106,245,234,213,147, 53, 26,205, 31,129,129,129,153,
-  7, 15, 30,244,107,218,180,169,159,243, 54, 77,155, 54, 13, 46,241, 51, 19,202,153,158,132, 16,146,248,194, 11, 47, 72, 93,148,
-241,146,159, 19, 93,220, 84, 36,158, 59,119, 78, 90,154, 86, 89,175,148,210, 68, 55,118,235,173,238,221,187,115,206,191, 45,171,
-236, 91,173,214,116, 86, 10, 25, 12,198, 19,107,176, 12,  6, 67, 66,167, 78,157, 74,237, 53,171,211,233,110,151,247,219,115,231,
-206, 53,121,208, 25, 72, 76, 76,108,245, 95,208,252, 39,242,206,120,244,143,209,185,115,231,154, 61,104,205,219,183,111,183,250,
- 47,104,  2,192,249,243,231, 91,178,146,197, 96, 48,152,193,114,  3,119,167, 99, 96, 48, 24, 12,  6,131,193,120, 82,225,216, 46,
- 96, 48, 24, 12,  6,131,193,120,176, 16,  0,157, 75, 91, 81,145,209,  1,132,144,206, 21,253, 99, 87,250, 76,147,105, 50, 77,166,
-201, 52,153, 38,211,124,252, 52, 93,105, 63, 54,163, 19, 41,165,255,216,  2,160, 51,211,100,154, 76,147,105, 50, 77,166,201, 52,
-153,230,147,182,176, 38, 66,  6,131,193, 96, 48, 24,140,  7,140,192,118,193,191,  3, 33,132,167,148,218, 30,160,164, 15,128,178,
- 30,232,102,  2,144,125, 47,201,  4, 32, 45, 90,236, 19, 21, 89,  0,152,139, 22,234, 90, 98, 58,151,156,236, 19, 67,109,146,166,
-148, 16,137, 40,226, 84,149, 42,149, 79,  2,221, 77,  0,160,  9,170, 93, 91,163, 86,118, 54,154, 77,145,114,137,236, 66,142,182,
- 96,135, 33,245,242, 77, 86, 66, 24,140,135, 79,147, 38, 77, 70, 80, 74,103, 22, 86, 81,228,227,227,199,143,127,203,246, 10,131,
-241,128, 13, 86,181,106,213,142,115, 28, 23,102,159, 12,179,188, 57,119,236,175, 54,155, 45,241,226,197,139,110, 13,117, 39,132,
-  8,193,193,193,207,169,213,234, 14, 60,207,183, 46,250,253, 65,173, 86,251, 87, 74, 74,202, 26, 74,169,245, 94, 50, 20, 21, 21,
-229,105, 48, 24,  6, 16, 66,134,  0,  0,165,244,103,133, 66,241,235,141, 27, 55,242,238,209,  8, 85, 11, 10, 10,250, 89, 34,145,
-240,  9,  9,  9, 29,  0,160,114,229,202,127,153, 76, 38, 91, 90, 90,218, 16, 74,233,181, 10,234,113, 82,169,244,211,216,216,216,
- 54,132,144,229,148,210,  5, 15,232, 88,202, 57,142, 43,213,152,136,162, 24,113, 15,122, 82,  0, 94,223,124,243,141,223,138, 21,
- 43, 26, 38, 38, 38,214,  5,128,176,176,176,179,195,134, 13, 59, 57,118,236,216, 76,  0,185, 69, 70,171, 76,146,147,125, 98,210,
-238,220, 24,157,154,118, 97,  0,  0,  4,  5,215,253,149,231, 57,105,104,232,137,195, 42,255, 33,254, 53,107, 85, 29,245,203,247,
-223, 72, 35, 34, 43, 99,247,161, 19, 13,198,190,241,110,140, 34,176,230,108,102,178, 30, 30, 53,106,212, 56,206,113, 92, 88, 69,
-230,146, 43,122,130, 66,226,249,243,231,155,148,165,201,243,124,152,171,185,186, 74,126, 39,138,226,141,115,231,206,149, 58,101,
- 68,205,154, 53, 15,243, 60, 31,233,110,125,228,156,206,178,166,224,168, 89,179,230,113,158,231,195, 92,105,150,252, 78, 20,197,
- 27,103,207,158,109,229,174,166,139, 57,244,238, 41,157,238,104,150,151, 78,  0,104,223,190,189, 92,171,213,254,172,209,104,234,
-107,181,218, 17,148,210,169,123,246,236,  9,228, 56, 14,157, 59,119,158,218,164, 73,147,120,133, 66, 49, 95,175,215,159,212,104,
- 52,131,247,236,217, 99,100,103, 12,131,113,159,  6,139,227,184,176, 19, 39, 78,  4,168,213,106, 20, 25, 21,216,103,111, 23, 69,
- 17,162, 40,130, 82,234,120,181, 90,173,104,223,190,189, 91,127, 26, 22, 22, 86,183,102,205,154,107,199,140, 25, 83,165, 87,175,
- 94,178,192,192, 64, 16, 66,112,231,206,157, 26,127,252,241,199,208,121,243,230,125, 24, 22, 22,214, 63, 49, 49,241,172,187,166,
- 37, 56, 56,184, 19,128, 23,235,214,173,251,236,132,  9, 19,164,173, 91,183,134,205,102,195,238,221,187, 99,231,204,153,243, 77,
- 72, 72,200, 58,  0,203, 82, 82, 82,118, 81, 74, 69, 55,117, 27, 70, 70, 70,254,186,127,255,254,200,155, 55,111,218,250,246,237,
-187, 28,  0, 14, 29, 58, 84, 95, 20, 69,210,186,117,235, 63,  9, 33,  3, 40,165, 39, 43,176,207,251,140, 29, 59,182,255,152, 49,
- 99, 42, 13, 31, 62,252,121,  0, 11,138,254,139, 20,237,103, 90,193, 99,232,136, 92, 81, 74,203,155, 94, 59,168,  2,145, 44,117,
-124,124,188, 79,171, 86,173, 94, 75, 75, 75, 27,239,172,155,154,154,138,184,184, 56,243,172, 89,179,190, 62,116,232,208,252,200,
-200,200,108,  0,218,178,132,168, 77,210, 52, 53,237,194,128,182, 45,191,241,  2,128, 53,155, 94, 27,116,236,100,186,199,239, 91,
- 23, 13,149, 41,164,198, 21,139,191,150, 86,175, 22,129, 61,199,175,226,232,133, 44, 82,183, 77, 79, 33,247,247,229, 93,  0, 44,
- 98,167,231,195,129,231,249,208,227,199,143,  7,168, 84,170, 82, 31,232, 94,162,223,  5,  8, 33,160,148, 34, 54, 54,182, 60,205,
-176, 19, 39, 78,  4, 40, 20, 10, 71,221, 81,178,206,176,215, 43,142,178, 66, 41,218,182,109,107, 46,167, 78, 10,255,251,239,191,
-  3, 84, 42,149, 67,167,180,244,149, 52, 26,109,219,182, 45, 55,157,113,113,113,142,116,186,163, 73, 41, 69,235,214,173,109,174,
-242,110,127, 98,133,171,124,219, 53, 91,182,108, 73, 43,162,233,102, 58,203,189,  1,210,106,181, 63,175, 89,179,230,153,192,192,
- 64,244,233,211,103,123,157, 58,117,100, 42,149, 10, 91,183,110, 69,229,202,149,253, 61, 60, 60,182,124,242,201, 39,152, 61,123,
-118,149, 29, 59,118,172,  2,240, 12, 59, 99, 24,140,251, 55, 88, 80,171,213, 88,189,122,181,227,241, 48,246,199,100,148,246,190,
- 74,149, 42,110,253, 97, 80, 80, 80,147,136,136,136,189, 27, 54,108, 80,  6,  4,  4, 56,190, 55,153, 76,240,244,244,196,139, 47,
-190, 40,235,210,165, 75,245, 33, 67,134, 28,  9, 10, 10,106,119,231,206,157,227,229,233,  5,  7,  7, 63, 27, 19, 19,243,237,248,
-241,227,  3,123,247,238, 13, 31, 31,159, 98,235,123,246,236,137, 30, 61,122, 72,111,220,184, 49,104,205,154, 53,131,150, 47, 95,
-126, 39, 56, 56,120,108, 74, 74,202,186,114, 29,134, 90,221,185, 65,131,  6,223,239,222,189, 59,204,219,219, 27, 33, 33, 33,220,
-  7, 31,124, 80,183,106,213,170,202,160,160, 32, 46, 37, 37,  5,235,214,173,171, 58,108,216,176,141, 10,133, 98,132,193, 96,216,
-229,134, 97,147,249,250,250, 78, 28, 57,114,164, 95, 94, 94,158,245,196,137, 19, 87,237,223,203,229,242,169, 45, 90,180,104, 68,
-  8, 89, 77, 41, 93,118, 47,145, 43, 74,105, 30,254,223,148,103,199, 98, 95,239,102, 36, 75,118,234,212, 41,223,150, 45, 91,174,
- 51, 26,141,141, 70,143, 30,125,123,214,172, 89, 74, 79, 79, 79, 79,  0, 36, 47, 47, 47,123,250,244,233,166, 57,115,230, 76,174,
- 93,187,118,167,195,135, 15, 63,219,160, 65,  3, 75,145,121,187,219, 96, 17,226, 72, 79, 66, 82, 58,246, 30, 18,101, 83,223,153,
- 16,246,249,204,200, 91,127,159, 79, 16,  5,165, 39, 54,239, 59,135,212,204,  2,252,121,248, 60,130,252, 60,136, 84, 46,137,241,
- 14,139,105,151,155,116,126,223, 61, 24, 78,198, 61,160, 82,169,176,121,243,230,187, 30, 49, 85,218,227,167,  4, 65,128,183,183,
-119,185, 79, 35, 32,132, 64,161, 80, 96,199,142, 29,197, 30, 47, 85,218,123,251,171,151,151, 23, 40,165,229, 62,226, 64,161, 80,
-224,224,193,131,224, 56,238,174,223,151, 76,179, 32,  8, 80,171,213, 32,132,112,174, 52,247,237,219,231, 82,203,254,170,209,104,
-  0,160,220,231, 15,201,229,114, 28, 56,112,160,204, 60,151,124,175, 41,122,222,165, 43,205,131,  7, 15, 22,123, 68, 87,201, 71,
-119, 57,127, 46,186, 57, 46, 87, 84,169, 84,214, 15, 12, 12,196,177, 99,199, 48,109,218, 52, 89, 76, 76, 12,174, 94,189, 10, 66,
-  8,134, 15, 31,142, 58,117,234, 32, 37, 37,  5,117,234,212,193,129,  3,  7, 26,178, 51,133,193,120,  0,  6,203,142, 59,230,202,
-254, 28,177,146, 21, 68,201,161,150, 17, 17, 17,114,141, 70,243,219,230,205,155,149,126,126,255,127, 90,136,209,104, 68,126,126,
- 62, 10, 10, 10,144,159,159, 15, 15, 15, 15,204,159, 63, 95, 57,120,240,224,223, 34, 34, 34,106,220,188,121,211, 88,150, 38, 33,
-228,235, 83,167, 78,  5, 90,173, 86,200,100,178, 50,205, 98,181,106,213, 48,118,236, 88,196,198,198,  6, 13, 28, 56,240,107,  0,
-235,202,210, 44, 50,110,223, 29, 58,116, 40, 76, 42,149,226,202,149, 43, 72, 76, 76,196,168, 81,163,194, 69, 81, 68, 66, 66,  2,
-174, 94,189,138,164,164, 36, 44, 89,178, 36,108,240,224,193,243,  1, 84, 47, 47,239, 69,188,242,214, 91,111,213,240,245,245,229,
-190,248,226,139,220,130,130,130,197, 69,223,191, 51,119,238,220,193,109,219,182,173,244,242,203, 47,131, 16,242, 11,165,244, 46,
-195, 82, 66,179,180,200,149, 13,192,197, 18, 63,139, 46, 17,217, 10, 66,225,179,240,114, 74,209, 36,  0,188,186,118,237,250,150,
-209,104,108,116,224,192,129,107,173, 91,183, 14,  7,144,  2, 32, 29,  0,188,188,188,212, 95,127,253,117, 96,207,158, 61, 47,119,
-236,216,177, 81,215,174, 93,223, 74, 79, 79,159, 85,180,158,150,212, 20, 69,156, 10, 10,174,251,235,190,195, 99,  7,236, 57,104,
-146, 78,120,227,195,219, 85, 42, 71,228,158,186,146,101, 59,127, 35, 29,249,122, 43,158,233, 88, 15,  0,208,162,110, 21,124,187,
-250,  0, 94,127,243, 61,201,186, 95,151,247,187, 70,161,  6,240, 71, 57,251,243,190, 96,154,255, 55, 67,162, 40, 66, 34,145,224,
-169,167,158,  2, 33,228,174,103,109, 74, 36, 18, 28, 62,124, 24, 29, 59,118,132, 68, 34,193, 75, 47,189,228, 50,157,162, 40, 66,
- 16,  4,116,237,218, 21, 86,171,245, 46,189,146,102,193,254,140,206,242, 52, 41,165, 16,  4,  1, 28,199,149,106,126, 74, 46,165,
-153,150,210,242,238, 74,203,121, 93,105,143,251, 41,169,105, 79,167, 59,230,202,174,233,110, 58,  5, 65, 64,171, 86,173,112,242,
-228,201,114,205, 22,199,113, 46,235,100,173, 86,251, 98,159, 62,125,182,143, 30, 61, 90,  1,  0,153,153,153,142,  7,209,243, 60,
-143, 75,151, 46,193,100, 50, 97,229,202,149, 48, 26,141,163,217,121,196, 52,255, 73,205, 39,198, 96,217, 43,  9,119, 13,150, 59,
-207,214,163,148,142,121,231,157,119,  2,203, 51, 87,  5,  5,  5, 72, 78, 78, 70,120,120, 56,158,123,238,185,192,229,203,151,143,
-  1,240,101, 57,178, 82,158,231,113,236,216, 49,164,165,165,161, 94,189,122,136,140,140, 44,182,193,245,235,215,177,101,203, 22,
-228,228,228,160,113,227,198, 64, 97,255,162, 82,105,208,160,193,180,232,232,232,174,237,219,183,151, 75, 36, 18,156, 58,117, 10,
-141, 26, 53,194,234,213,171, 81,165, 74, 21,168, 84, 42, 92,190,124, 25,245,234,213,195,222,189,123, 81,169, 82, 37,196,196,196,
-200, 27, 55,110,188, 63, 43, 43,235,175,155, 55,111, 78, 43, 99,127, 74, 67, 67, 67,223, 29, 57,114,164, 44, 57, 57, 89,252,233,
-167,159, 14, 81, 74, 15, 17, 66, 70,189,247,222,123,207,119,235,214,173,210,137, 19, 39,242,254,254,251,239,191, 75, 51, 87,110,
- 70,174,172, 37, 47, 70, 54,155,205,168,215,235, 77, 70,163,209,194,113,220, 77, 66,136,201,102,179,213, 40,235,102,254,197, 23,
- 95,172,154,145,145,241,250,155,111,190, 25, 95,100,174, 46,161,176, 99, 59,  0,192,106,181, 26, 11, 10, 10,242, 90,182,108, 25,
- 62,120,240,224,107,171, 86,173,122,253,197, 23, 95, 92,179,108,217,178,  2,  0,250,146,130, 85,170, 84, 62,201,243,156, 84,155,
-239,123, 99,237,154,165,227,183,108, 26, 83, 57, 33, 33,169,186,159,127, 37,173, 84, 83, 41,121,205,207, 63, 30,  7, 96, 74, 78,
-207,195,153,235,119, 32,145,240,184,144,144,139,182,221,159,147, 92,187, 50,179,141,221, 96, 49,254, 81,168,253,225,208,123,246,
-236, 41, 55,130,117,248,240, 97, 72, 36, 18, 40,149, 74,172, 94,189,186, 92, 81,187, 33,176, 71,135, 92,153, 24, 87, 15, 63,183,
-155, 12,251,  3,216, 75, 46,223,125,247, 29,222,124,243,205, 98,255, 81,164, 73,220, 73,103,105,233, 11,143,136, 64, 90,106,106,
-177,239,220,120, 72, 59,108, 54, 27, 36, 18,  9,150, 44, 89,130,158, 61,123,226,247,223,127, 47,247,181,200,216, 82,119,210,217,
-170, 85, 43,152,205,102, 71,154, 47, 93,186, 84,170,238,130,  5,229,119,239,108,210,164,201,  8, 66,200,204,154, 53,107,202, 59,
-116,232,128,125,251,246, 97,230,204,153,162,213,106,205,  0,128, 86,173, 90, 85, 26, 63,126, 60,137,139,139,131, 70,163, 65,122,
-122,250,178, 38, 77,154,204, 96, 29,223, 25,140,  7, 16,193,178, 87,186,174,204,149,253, 78,209,149,201,210,104, 52, 61,186,119,
-239,238, 48, 55,  6,131,193, 97,172,236,230,202,254,249,242,229,203,136,137,137,145,106, 52,154, 30, 46, 12, 86, 97, 70,  4,  1,
- 33, 33, 33,200,200,200,192,217,179,103, 17, 30, 30, 14,139,197,130,109,219,182, 33, 55, 55, 23, 18,137,  4, 82,169, 20,102,115,
-185, 93, 18, 16, 29, 29,253,212,138, 21, 43,154, 44, 95,190, 60,219,126,  7,247,243,207, 63,131, 82,138, 74,149, 42, 65,167,211,
- 33, 53, 53, 21,127,253,245, 23,172, 86, 43, 52, 26, 13, 66, 67, 67, 21, 99,198,140,105, 51,125,250,116,  9,128,105,101, 72, 55,
-239,215,175,159,167,167,167, 39,222,120,227, 13,106, 54,155,191, 36,132,180,120,246,217,103,223, 29, 59,118,172,239,205,155, 55,
- 77,175,188,242,202,113,179,217,252,117,209,197, 68, 66, 41,181,184, 48,172,101, 70,174, 44, 22,139,125,159,198, 23, 20, 20,192,
-223,223, 63,220, 69, 31, 45,  0,144, 30, 60,120,176, 21,  0,126,198,140, 25, 10, 20, 62,192,218,145,  6,147,201,132,130,130,  2,
-104,181, 90, 75,110,110,110,218,196,137, 19,173,171, 86,173,226,139,126,115,161, 52,131,  5,116, 55,213,169,163,150, 81,202,191,
-183,104,209, 34, 77,183,110,221, 56,141, 70,131,252,252,124,207, 63,183,110,213,116,234,208, 38,106,214,167,159,111,247, 12,171,
-151,122,240,212, 13, 36,221,201,133,201, 98, 65, 84,176, 87, 97,252,139,241,143, 83,212,193,218, 17,193,114, 54, 19,251,246,237,
- 67,247,238,221, 29,231,186, 84, 42,117,108,231,142,166, 32,  8,232,222,189,251, 93, 17,157, 61,123,246,148, 26,109,114, 85,135,
- 56,155,161,146,166,168, 52,227,197,113, 28, 92,181, 50,219,163,119,165,153, 44,231, 40,126,  9,211,230,234,102, 18,130, 32, 96,
-236,216,177,144, 72, 36,152, 52,105, 18,  4, 65, 64,195,134, 13, 33,  8,  2, 90,182,108,  9,137, 68,130,142, 29, 59,150, 25,105,
- 43,205, 92, 10,130,128, 35, 71,142,160, 81,163, 70,142, 52, 53,108,216, 16, 77,155, 54,133, 32,  8,136,141,141,133, 68, 34, 65,
-215,174, 93, 93,106,218, 59,180,107, 52, 26, 92,190,124, 25, 60,207,131, 16,146, 25, 23, 23, 23,  8,  0,211,166, 77,203,208,235,
-245,126,  6,131,  1,157, 58,117, 66,155, 54,109, 42,253,252,243,207, 31,  0, 96,  6,139,193,184,223,  8,150,189,210,117,215, 96,
-185,194, 96, 48, 52,176, 71,175, 74, 51, 87,206,175, 38,147,  9, 85,171, 86,133,193, 96,104, 80,209,139, 69,112,112, 48,204,102,
- 51,150, 46, 93, 10,169, 84, 10,169,244,255,190,194,100, 42, 63, 56,116,254,252,249,248, 35, 71,142, 52,106,220,184,177,207,250,
-245,235,211,187,116,233, 82,169, 91,183,110, 80, 42,149,208,235,245,176, 88, 44,104,209,162,  5,162,163,163,145,150,150,134, 63,
-255,252, 51,163, 70,141, 26,254, 71,143, 30, 21,239,220,185,115,171, 28,233, 78,157, 58,117,  2, 33,  4,127,254,249,103, 38,165,
- 52, 78,169, 84,174,159, 53,107,150,183,201,100, 18,159,127,254,249,132,172,172,172,137,  0, 44,114,185,252,203,110,221,186, 53,
-231,121,126,181,205,102,171,112,101, 86,114,223,106,181, 90, 40, 20, 10,119,166,132,144,100,101,101,213,  5,  0,181, 90,237, 11,
-192, 49, 66, 82,175,215, 23, 51,193, 38,147,201,224,235,235,171,  6,128,162,223, 72,202, 56, 30,149, 84, 42,213,218, 91,183,110,
-120, 56, 71, 46,189,189,189, 49,100,240, 96,174,117,171, 86,178,250, 13, 26,116,125,127,246,242,213, 33,126,158,166,168, 16, 63,
- 88,108, 22,236,220,190, 77,164,162,101, 59, 59, 69, 31, 14,118,147, 81, 50,130, 37,145, 72,176,119,239,222,187,190,147, 74,165,
-216,188,121,179, 91,102,200,110,166,202,106, 34, 43, 97,134,136, 59, 81,117,158,231,177,100,201, 18,136,162,136,241,227,199, 23,
-107, 54,116,214,183,155, 29, 87,154,246,223, 68,127, 40,  2, 48, 33,241, 43,185,227,247, 37,211, 91,164, 73,220, 49, 67,223,124,
-243,141, 91, 17,172,167,159,126,218, 45,211,230,156, 47,123,186, 78,158, 60, 89,170,238,162, 69,139, 92,246,105, 19, 69, 17,127,
-252,241,135,195,156,218,249,224,131, 15, 70,122,122,122,106,246,237,219,135, 59,119,238, 64,171,213,162,160,160,  0, 62, 62, 62,
-222,157, 59,119, 62,117,231,206,157,155,231,207,159,103, 29,222, 25,140,123,141, 96,217, 43, 93,119,154,  9, 75,107,239, 47, 69,
- 79, 32,132,192, 96, 48,148,106,172,156, 77,129,217,108, 70,102,102, 38, 68, 81,188,231,185,186, 74,171, 88, 93, 25,172,179,103,
-207, 14, 31, 49, 98, 68,178,151,151, 87,253,204,204,204, 20,185, 92, 30,187,111,223,190,202,102,179, 25,158,158,158,240,244,244,
-196,150, 45, 91,224,237,237,141, 55,223,124,243,182, 94,175, 63,164, 86,171,  3,245,122,253,233, 59,119,238,188, 95,166,115,145,
- 72, 58,181,109,219, 22,113,113,113,200,201,201,217, 77,  8,169,255,242,203, 47,119,169, 92,185, 50,153, 57,115,166,225,218,181,
-107,223,  1, 72, 87,171,213, 75, 87,172, 88,209,174,113,227,198,154, 97,195,134,129, 16,242, 61,165,212,224,110,158,181, 90,109,
- 49, 99,149,151,151,135,252,252,124,168,213,106,171,155,251, 76,130,194,190, 84,246,254, 84,142, 99, 83, 20,189,178, 31, 31, 42,
-  8,  2, 45,220,132, 74,202,210, 83,171,213, 51,150, 47, 95, 94,172,207,157, 61, 58,154,154,154, 10, 79, 79, 79,124,240,254,251,
-210,143,222,126,185, 17,175,  9, 60,204,113,  4, 38, 51,205,161,162,105,155, 54,117,224,126,118,138, 62,156,  8,150,221, 16,244,
-238,221,251,174,102, 65,169, 84,138, 29, 59,118,160,111,223,190,142, 27,150,162,166,118,183, 12, 65,175, 94,189, 28,145,160,109,
-219,182,149,218,188,103,143, 64,185, 99,  4,237,219,142, 27, 55, 14,130, 32,224,219,111,191,197, 91,111,189,  5,142,227,240,213,
- 87, 95,129,227, 56, 76,157, 58,181, 66,245,132,189, 46,187,249,121,225,107,216, 91,121,200, 92, 16,  8,  0,240,240,244,180,111,
- 88, 33, 77, 65, 16, 28,145,171,  6, 13, 26, 64, 34,145,160,101,203,150, 16,  4,193, 17,185,234,209,163,135,243,180, 10,212, 29,
- 77, 65, 16,112,229,202, 21, 71,154, 91,182,108, 89, 44,114, 37,  8,130, 91,134,141, 16,242, 81,199,142, 29,103,134,133,133,  5,
-140, 30, 61,154,240, 60,143, 38, 77,154,248, 79,157, 58, 53, 87, 34,145, 40, 39, 76,152, 80,218,121, 45,  1, 80,191,118,237,218,
-106,118,230, 48, 24,247, 17,193,170,136,193,114,167,114, 84,169, 84,103, 50, 50, 50, 90,202,229,242, 98,230,170, 52,163,197,243,
- 60,210,210,210,160, 82,169,206, 60,200, 12,187,106, 34, 44, 50, 51,111, 59,237,135,166,207, 61,247,220,170,213,171, 87, 71,237,
-220,185, 19, 71,143, 30, 69,165, 74,149, 48,107,214,172, 27, 55,111,222, 28, 76, 41,253,219,157,255,173, 90,181,106, 29,181, 90,
-141, 67,135, 14,  1,192,126,  0, 47,190,254,250,235,196,106,181, 98,254,252,249, 58,  0, 59,188,188,188,214,253,246,219,111, 13,
-234,213,171, 39,219,185,115,103,254,209,163, 71,247,184,105,174,108,162, 40,222,101,172,156,247,169,135,135,135, 59, 17, 44,139,
-151,151,215,217,188,188,188,231,244,122,125,158, 92, 46,247,200,203,203, 51, 58, 27, 43,187,190, 32,  8,146, 43, 87,174, 36,  3,
-136,242,242,242, 58, 11,167,166,196, 98,  5, 76, 16, 58,117,234,212, 73, 40,121, 12, 82, 83, 83,113,231,206, 29,152,205,102, 52,
-110,220,152,240,196,194,103,221, 62, 61,146,157,146, 15, 31,142,227,168,253, 92,183,143,250, 43,109,228,224,182,109,219, 28,159,
- 57,142,195,159,127,254,233,150,105,219,177, 99, 71,185, 29,209, 75,116, 72,119, 25, 10,183,111, 63,127,254,252,194,199, 81, 20,
- 69,174, 56,142,195,148, 41, 83, 32,151,203, 49,115,230, 76, 76,153, 50,165, 88, 84,198, 85,  4, 75, 16,  4, 68, 76,210, 57,223,
- 20, 21,158, 20, 69,253,157,  8, 33,206, 38,203,173, 72,155,171, 14,238,238, 68,254, 75, 75,167, 66,161, 40,179,131,123,  9,205,
- 50,255,224,248,241,227, 63, 52,106,212,232, 90,165, 74,149,118,180,108,217, 82,126,252,248,113,140, 25, 51,134, 24,141, 70,207,
-157, 59,119, 58,254,183, 52,163,167,213,106,149,236,204, 97, 48,238, 35,130, 85,145, 78,238,238,244, 75,208,235,245,187,246,236,
-217,211,180, 79,159, 62, 66,121,205,131, 90,173, 22,129,129,129,184,126,253,186, 85,175,215,187,156,254,192,102,115,127, 66,116,
- 87,  6,171,148,125,240,119, 76, 76,140,213, 98,177,160,122,245,234,  8, 13, 13,133,193, 96,192,156, 57,115,172,238,154, 43, 66,
-136,180, 73,147, 38, 60,  0,100,103,103,  3, 64, 38,128, 26, 53,106,212, 64, 92, 92, 28,178,179,179, 55,  2,232,252,209, 71, 31,
- 53,108,222,188,185,116,245,234,213,186,209,163, 71,111,180, 88, 44, 51,221,209, 23, 69,209,100,181, 90, 35, 57,142, 51,231,228,
-228, 36, 57,239,207,192,192, 64, 95,181, 90, 77, 82, 83, 83, 45,238, 24,172,250,245,235, 31,187,125,251, 54,102,204,152,145, 62,
-107,214,172, 26,249,249,249,217,185,185,185, 86,103,147,101, 48, 24, 56,127,127,127,249,130,  5, 11,148,  0, 80,191,126,253, 99,
-101, 25, 44,173, 86, 91, 89,165, 82, 57, 62, 27,141, 70,220,185,115,  7,119,238,220, 65,106,106, 42,242,243,243, 17, 21, 21,  5,
-157, 78, 23,206, 78,199,127, 15,231,102, 50,231,243,219,249,  2, 94,145,115,221, 89,179,119,239,222,142,190, 91,246,136,152,125,
- 89,187,118,109,177,142,227,174,154,222,236,  6,107,254,252,249, 24, 55,110, 28, 20, 10,  5,190,254,250,235, 98, 77,132,165,152,
-  2,226, 78, 58, 35, 39,235,113,103,158, 47, 36, 18,  9,252, 70,167, 22,107,138, 43,101, 52,158, 91, 70,112,214,172, 89, 15,172,
-137,208,174, 25, 30, 94,120,170, 44, 89,178,  4,207, 61,247, 28,246,239,223,127,207, 77,132,145,145,145, 43,230,206,157, 43, 63,
-127,254, 60,242,242,242,144,158,158, 14,163,209,136,196,196, 68,199,190, 41, 13,157, 78,167, 96,103, 13,131,113, 31,  6,203,185,
-243,167, 43,131, 85,212, 65,210,149, 17,248,250,195, 15, 63,124,189, 77,155, 54,190, 30, 30, 30, 72, 78, 78,190,203, 92, 21, 20,
- 20, 64,163,209,192,100, 50, 97,207,158, 61,121,162, 40,126,237,202, 20, 88, 44, 22,  4,  4,  4, 32, 35, 35,  3, 98, 25,253,162,
- 57,142,131, 82,169,132, 86,171, 69, 89,102,160,188, 10,216,108, 54,195, 98,177,192, 98,177, 84,216,164,  1, 80,218, 39,108, 45,
-250,127,109, 72, 72, 72, 85,133, 66,129,248,248,120,  0,184,  2,160, 67,183,110,221, 36,153,153,153,244,149, 87, 94, 57, 76, 41,
- 29,235, 98, 54,123,211,190,125,251, 34,  1, 64,169, 84, 94,  6,128,196,196, 68, 75, 78, 78, 78,177,200,160, 74,165,162,125,251,
-246, 13,166,148, 98,223,190,125,145, 82,169,148,162,140, 57,171,  0, 24, 54,110,220,120,222,203,203,107,213,167,159,126, 58,184,
-103,207,158,231,234,214,173, 27,169,213,106,211,244,122,189,222, 96, 48, 80,158,231,165, 62, 62, 62,138,237,219,183, 95, 59,124,
-248,112,103, 79, 79,207, 85, 27, 55,110, 60, 15,160,212, 72,155, 90,173, 78,212,233,116, 17, 26,141,  6,122,189,190,152,185,186,
-115,231, 14, 40,165,184,113,227,  6, 84, 42,213,109,118, 58,254, 59, 56, 71, 92, 74, 70, 90, 74,126,231,174,185,114, 54, 67,219,
-183,111, 47,119, 14, 44,119, 53,157,205,208, 91,111,189,133,121,243,230,221, 21,193,154, 57,179,240,158,228,253,247,223,119, 25,
-189,114, 70, 34,145,224,206, 60, 95,  4,141,203, 42,102,102,  0,128,216,211, 87,193, 41,217,  4, 65,192,140, 25, 51,238,234,124,
-238,220,132,231,174,177,114, 78,103, 90, 90, 26,  4, 65,128,175,175, 47,134, 12, 25,130,174, 93,187, 58,154, 26, 43,170,155,144,
-144,112,114,246,236,217, 85, 66, 67, 67,177,122,245,106,147, 90,173,150,117,236,216,145,230,228,228,144,242, 34, 88,204, 96, 49,
- 24,174,225,220,169, 32,221,105, 38, 44,173,146, 36,132,116,118,254,124,243,230,205, 92,173, 86, 59,100,208,160, 65,122,163,209,
-136,170, 85,171, 66, 46,151,195, 98,177,192,100, 50, 65, 42,149, 34, 56, 56, 24,148, 82,172, 91,183, 78,175,211,233,134,220,188,
-121, 51,183, 60, 77, 66,200,123, 79, 61,245,148, 33, 62, 62, 30, 85,170, 84,129,135,135,199, 93,143,141,240,244,244,132,183,183,
- 55, 46, 94,188,136,165, 75,151,234,  9, 33,239,149,167, 89,154,209,180, 27, 43,187,209,114, 53, 50,169,132,166,218, 30,197,209,
-233,116,  0, 96,173, 82,165, 74, 32,  0,220,184,113,  3,  0,110, 69, 69, 69,181,171, 86,173, 26,217,191,127, 63, 40,165, 59, 75,
- 51, 87, 37, 52,179, 98, 99, 99,111,197,198,198,154, 76, 38,147,212,100, 50, 73,115,115,115,205,254,254,254,  1,254,254,254,254,
-129,129,129,190,  1,  1,  1,222,201,201,201, 86,171,213, 42,181,217,108,210,216,216, 88, 83,243,230,205,111,195,105, 54,247, 18,
-154, 34,128,188, 69,139, 22, 77,151, 72, 36,183, 90,181,106, 21, 51,121,242,228,155, 22,139,197, 24, 26, 26,234, 19, 20, 20,164,
-212,233,116,249,159,124,242, 73,218,188,121,243, 58, 75, 36,146, 91,139, 22, 45,154, 14, 32,175,232,183,119,105, 90,173,214, 93,
- 59,119,238,180, 90, 44, 22, 36, 37, 37, 33, 57, 57, 25, 41, 41, 41,142, 87,111,111,111, 28, 59,118,204,102, 54,155,119, 86, 96,
-127, 62, 40, 99,193, 52,241,255,190, 63,229, 25, 43,119,186,  1,148, 76,167,221, 12, 61,247,220,115, 24, 56,112, 32,  6, 13, 26,
-132, 33, 67,134, 96,216,176, 97, 21,153,154,161,228,249,238,248,237,228,201,147,241,254,251,239,227,195, 15, 63,132, 92, 46,199,
-  7, 31,124,128,105,211,166, 97,218,180,105, 37,205, 21, 41, 39,239,197,234,185,220, 37,161,208, 45,139,128,105,101,181,194, 38,
- 66, 74,255,191,184,191, 63, 29,102,232,131, 15, 62,192,225,195,135, 49,113,226, 68,236,222,189, 27, 99,198,140,193,150, 45, 91,
- 48,114,228, 72,252,241,199, 31,142,215,162,155, 64,234, 78, 58,  5, 65, 64,187,118,237,160,211,233, 28,  6,118,212,168, 81,197,
-244, 70,142, 28,233,214,254, 84, 42,149,131, 55,110,220,184,126,233,210,165, 55,178,178,178,186,222,188,121,243,182, 86,171, 37,
-185,185,185,142, 99, 88,114, 41,138, 68,203,217,121,196, 52,153,133,186,143,  8,150,213,106, 69,229,202,149,139, 61,219,138,227,
-184, 98, 75, 69,250, 17,  0, 64, 74, 74,202,246,224,224,224,103,159,121,230,153,149, 47,190,248,162, 71,116,116,180, 36, 34, 34,
-  2, 58,157, 14,183,110,221,194,205,155, 55,173,187,119,239,206,211,233,116, 67, 83, 82, 82, 92,142, 34, 75, 74, 74, 90, 30, 24,
- 24,184,109,232,208,161, 83, 27, 54,108, 56,106,252,248,241,124, 84, 84, 20,114,115,115,225,227,227,131,128,128,  0,196,199,199,
- 99,239,222,189,182,156,156,156,133, 54,155,237,163,212,212,212,244,138,236, 36,171,213,202,155,205,102, 12, 26, 52,  8,162, 40,
- 98,206,156, 57,176, 90,173,124,  5, 36,204,102,179,153,  2, 32, 25, 25, 25,  0,160,179, 27,174,171, 87,175,  2,192,237,136,136,
-  8, 13,  0,236,220,185,147,  0, 56,228,238, 13,189,115, 36, 43, 58, 58, 58,222, 94, 41, 58, 95,228,236,235,139, 34, 87,174,110,
-195, 13,  3,  6, 12, 72,211,233,116,221,222,122,235,173,169,243,231,207, 31, 60,127,254,252,187, 54,242,244,244, 92,245,213, 87,
- 95,125, 52, 96,192,128,180,178,162, 87, 69, 17,187,247, 95,120,225,133,  1,103,206,156,241, 80, 40, 20,208,106,181,200,204,204,
-132,217,108, 70, 84, 84, 20,210,210,210,176,124,249,242,124,189, 94, 63,141,157,142,255, 46,101, 25, 43,119,251, 88,150, 21,197,
-217,188,121,115,169,115, 76, 85, 84,179,164,201,112,119,110, 42, 55,110,134, 74,157,250,161, 34,245, 90, 89,154, 95,124,241,133,
- 99,178,213,210, 34, 87, 21,137, 96,217, 53,125,125,125,  1, 20,206,190, 47,138, 34,158,126,250,233,123,214, 45,122,182,224,179,
-246,207, 77,154, 52,249,104,245,234,213, 51, 41,165,126,  0,  4,231,125,192, 30,170,192, 96, 60, 32,131,101,179,217, 18,219,181,
-107, 87,172, 98, 43,239,161,170, 69, 70, 36,209, 77,147,181, 45, 42, 42, 42,106,201,146, 37,111,168,213,234,206,  6,131,161, 30,
-  0, 40, 20,138, 51, 90,173,118, 39,199,113,115, 83, 82, 82,220,126, 56,115,145, 97, 26, 19, 22, 22, 54,103,216,176, 97, 51, 91,
-181,106,213,255,149, 87, 94, 33,130, 32, 96,205,154, 53, 52, 49, 49,113, 45,199,113,239, 37, 39, 39, 95,191,151,157,164, 82,169,
- 46,175, 93,187,182,234,230,205,155, 97,177, 88,176, 96,193,  2, 40, 20,138,203,238,254,158, 82,154, 46,  8,194,202, 86,173, 90,
- 13, 62,124,248,240, 42, 74,233, 89,185, 92,254,115,108,108,236,144, 67,135, 14,253, 74, 41,189, 32,  8,194,207, 45, 91,182, 28,
-114,236,216,177,117,148,210,211, 21, 72, 94, 86,108,108,108, 54,128, 32,171,181,244, 22,197,216,216, 88, 19,128, 59,110,152, 43,
- 59,121, 35, 70,140, 48,143, 24, 49,226,237,  1,  3,  6, 44,253,251,239,191,155,229,228,228,212,  3,  0,111,111,239, 51, 77,155,
- 54, 61,246,235,175,191, 94, 42,138, 92, 25, 92,229,157, 16,210,183, 94,189,122,235, 62,254,248, 99,117, 76, 76,140, 80,189,122,
-117,220,188,121, 19,103,207,158,181,254,240,195, 15,  5,122,189,190, 55,165, 52,155,157,142,255, 14,246, 38, 66,111,111,239, 98,
- 55, 79,246,161,251, 21,105,194, 43, 77,179,228,141, 25,207,243,229,105,186,116, 53, 26,141,198, 49,106,217,157,174,  9,229, 61,
-123,212,158, 78,187,166,125,113,195, 92, 81, 87,154, 69,143,233,169,136, 38,220,209,180, 88, 44, 14, 93, 55, 52, 43,244,167,199,
-143, 31,255,  1,192, 15,213,171, 87,191, 10,160, 26, 51, 85, 12,198, 63, 96,176, 46, 94,188,216,228,159,252,227, 27, 55,110,228,
-  1,248,168,104,121, 32, 36, 38, 38, 94,  7, 48, 32, 40, 40,232,203, 67,135, 14,125,  0,  0,162, 40,206,112,245, 60, 67, 87,156,
- 62,125,186,175, 68, 34,153,191,108,217,178, 86,148, 82,120,121,121, 29,186,122,245,234,107, 21,140,130,141, 34,132,140,183,143,
- 10, 52, 26,141,163,  8, 33, 19, 40,165, 90,167,245,142,207, 21,132,  2, 48, 82, 74, 67,202, 88,111,172,128,185,114, 68,178,  0,
-152,126,253,245,215,  2,  0,167,240,255,121,174, 44, 69,139,  1, 78,205,130, 46, 46,112,127, 17, 66,170,127,240,193,  7,179,120,
-158,239,164,213,106, 67,213,106,117,130,213,106,221,165,211,233,222,163,148,102,178, 83,241,223,195,106,181, 38,181,107,215, 78,
- 40,237,198,169,188, 11,120,121, 55, 84, 54,155, 45, 49, 54, 54, 22,247,160,153, 84, 78, 82,111,181,108,217,146,115, 87,203,142,
-197, 98, 73, 43, 47,157, 45, 91,182, 44,243,166,241, 94,243,222,178,101,203, 10,165,177,168,174, 74,122,208,154, 46,246,103,153,
-232,245,250,236, 74,149, 42, 21, 24, 12,  6,137,209,104,148,148,140,216, 43,149,202,116,118,230, 48, 24,247,104,176,254,203, 20,
- 25,170, 94, 15, 74,175,168, 63,212,171, 15, 64,199, 80,226,179,182,188,207, 21,228,159,136,  0,137,  0,116, 15,104, 31,102,  0,
-120,133,157,114,143, 30,103,207,158,109,254,160, 53,207,159, 63,223,228, 31, 72,103,203,  7,173,121,238,220,185, 38, 79,170,102,
-121, 36, 37, 37, 53,103,103,  6,131,113,127,112,108, 23, 48, 24, 12,  6,131,193, 96, 60, 88,  8,128, 82, 71,  2, 84,228, 73,217,
-247, 50,154,192,149, 62,211,100,154, 76,147,105, 50, 77,166,201, 52, 31, 63, 77, 87,218, 21,241, 31,143, 52,165, 13,195,125, 80,
- 11,128,206, 76,147,105, 50, 77,166,201, 52,153, 38,211,100,154, 79,218,194,154,  8, 25, 12,  6,131,193, 96, 48, 30, 48,204, 96,
- 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24,140, 39,  8, 66,  8,  9, 11, 11,
-107, 23, 18, 18,210,242, 73,221,  7,  2, 43,  6, 12,  6,131,193, 96, 48, 30,  4, 85,170, 84,241,182,217,108, 47,134,132,132,188,
- 86,181,106,213,170,  0, 16, 26, 26,122,150, 82, 58, 87,169, 84,254,124,237,218, 53,211, 19, 99, 50,217,163, 16, 24, 12,  6,131,
-193, 96,220, 15, 33, 33, 33, 13,  1,188,166, 84, 42,135, 54,111,222, 92,214,177, 99, 71,248,248,248,192,106,181, 34, 37, 37,  5,
-127,253,245, 23, 78,158, 60,153,101,177, 88,230, 91, 44,150,249,233,233,233,169,204, 96, 49, 24, 12,  6,131,193, 96,148, 65,112,
-112,240,236,238,221,187,191,229,227,227,131,234,213,171, 35, 40, 40,  8, 70,163, 17,122,189, 30,148, 82,  8,130,  0, 74, 41,242,
-243,243,113,252,248,113, 28, 61,122,212,154,151,151,183,138, 16, 50, 55, 57, 57,249, 36, 51, 88, 12,  6,131,193, 96, 48, 24, 37,
-  8,  9,  9, 73,221,189,123,119,128,213,106, 69, 70, 70,  6,140, 70, 35,116, 58,157,195, 96,241, 60, 15, 74, 41,172, 86, 43,  0,
- 64, 20, 69, 92,184,112,  1,135, 15, 31, 70, 66, 66,194, 87, 41, 41, 41,111, 63,142,251,133,117,114,103, 48, 24, 12,  6,131,113,
- 95, 24,141, 70,172, 88,177,  2, 25, 25, 25,168, 92,185, 50, 66, 67, 67,225,237,237, 13,165, 82,  9,  0, 14,115,  5,  0, 28,199,
- 33, 38, 38,  6, 67,135, 14,  5, 33,100,200,227,186, 79, 88, 39,119,  6,131,193, 96, 48, 24,247,131,197,100, 50,161, 73,147, 38,
-136,143,143, 71, 92, 92, 28, 26, 53,106,132,218,181,107, 35, 35, 35,  3,201,201,201,197, 54, 62,118,236, 24, 78,156, 56,129,182,
-109,219, 62,214, 59,133, 53, 17, 50, 24, 12,  6,131,193,184,103, 66, 67, 67,159,175, 84,169,210,130, 97,195,134, 41, 27, 52,104,
-128,196,196, 68, 36, 37, 37, 33, 59, 59, 27, 13, 27, 54, 68, 76, 76, 12,174, 95,191,142,109,219,182,225,196,137, 19,144,203,229,
-  8, 11, 11,131,102,213, 47,248, 35, 36, 56, 41, 57, 57, 57,140, 25, 44,  6,131,193, 96, 48, 24,140, 18,132,132,132,248, 17, 66,
-222, 11, 13, 13,125,125,200,144, 33,146,234,213,171, 35, 49, 49, 17,233,233,233,200,206,206,198,145, 35, 71,236,102, 12, 97, 97,
- 97,184,121,243, 38,206,156, 57,163, 55, 26,141,163,147,146,146,150, 51,131,197, 96, 48, 24, 12,  6,131, 81,182,209,170, 12, 96,
-122,181,106,213,158,127,238,185,231,184,144,144, 16, 36, 37, 37, 97,247,238,221,168, 86,173, 26, 82, 83, 83,113,252,248,113, 91,
- 94, 94,222, 66,155,205,246, 81,106,106,106,250,227,186, 47,254,209, 78,238,132,144,206, 76,147,105, 50, 77,166,201, 52,153, 38,
-211,124, 50, 52,147,147,147, 19,146,147,147,135, 95,185,114, 37,102,230,204,153, 27, 23, 44, 88,  0,158,231, 17, 26, 26,138,221,
-187,119,211, 93,187,118,173, 45, 40, 40,168,153,156,156, 60,230,113, 54, 87,  0,235,228,206, 96, 48, 24, 12,  6,227,  1,115,231,
-206,157,139,  0,250,134,134,134, 54, 63,119,238,220,187,  0, 32,138,226,140, 59,119,238, 28,127, 82,246,  1, 51, 88, 12,  6,131,
-193, 96, 48,254, 17,146,146,146,142,  2,232,245, 36,230,157,205,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24,
- 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24, 79, 20,  4, 64,169, 35,  1, 40,165, 59,221, 22,185,135, 17, 10,174,244,153, 38,211,
-100,154, 76,147,105, 50, 77,166,249,248,105,186,210,174,136,255,120,164,161,148,186, 92, 80, 52, 95, 86, 69, 23,  0,157,239,229,
-119, 76,147,105, 50, 77,166,201, 52, 31,190,230,189,212,245,165,105, 22,221,188, 19, 20,182,146,112,246,207,143, 90, 58,255, 43,
-121,127, 82, 52, 31,183, 69,112,225, 46, 29, 59,137, 16, 34,  2, 16,233,  3,152,153,148, 16, 98, 63,  0, 15, 68,143,241, 15,132,
- 54, 11,143, 17,249,191, 15,103,199,137,193,120,140,207,247,  7, 86,215, 59,213, 29,188,211, 69,214,  6,192, 70,  8,193,253,212,
- 37,255,196, 53,233, 81,207,251,147,172,249, 95, 71, 40,111, 71, 85,170, 84,105,123, 64, 64, 64,135,140,140, 12,177,232,123,132,
-134,134,130,227, 56,  8,130,160,143,143,143,247,172,232, 31,  6,  6,  6,126, 31, 19, 19,243, 98,102,102,166,200,113, 28, 42, 87,
-174, 12, 66,  8,120,158,  7,207,243,250,107,215,174,121,254,219, 59,165,113,227,198,217, 38,147, 73, 83,242,123,153, 76,102,136,
-139,139,243,120, 18,204,149,191,191,255,179,129,129,129,222, 89, 89, 89, 20,  0,194,194,194,192,243,124, 97,161, 17,  4,235,245,
-235,215,151,185,171, 23, 25, 25,121, 76,169, 84,122, 11,130,  0,158,231, 33,  8,  2,180, 90,109,206,133, 11, 23,154, 21,173, 63,
-168, 84, 42,253,120,158,183,151, 45, 24, 12,134,204,243,231,207,183,102,151,190,255, 38,107,215,174,229,187,133,190, 84, 77,160,
-250,250, 28, 71,189, 68,145,228, 90,137,242,244,182,164,239,175,185,243,251,254,253,251,219,254,229,115,160, 10,  0, 43,165, 52,
-249, 30,126,204,149, 82,209,118,183,  1,  3,139, 62, 26, 56, 32,147,  0, 87,106,  2,235,206,  3,250, 18,205, 10,226,195,190,145,
-170, 82,165,202,220, 74,149, 42, 13, 47, 40, 40,208,113, 28,  7, 66,  8,141,137,137,177,111, 83,236, 85, 20,197,196,115,231,206,
- 53,113,113,145,149, 84,169, 82,229,171, 74,149, 42,189,160,211,233,116,132, 16, 16, 66, 40, 33,  4,245,234,213,187, 75,211,102,
-179, 37,158, 61,123,182,201,195, 74,231,191,149,247,186,117,235,150,170, 89, 86,222, 75,211,116, 78, 39, 33,  4, 49, 49, 49,247,
-157,206, 71, 81,243,177, 53, 88,  0,184,128,128,128,141,205,154, 53,107,191,105,211, 38,238,226,197,139, 92,116,116, 52,108, 54,
- 27, 68,177,240,220,111,212,168,145,170,162,127, 22, 20, 20,244, 83,179,102,205,  6,109,218,180,137,219,184,113, 35,215,180,105,
- 83, 16, 66, 96,179,217, 96,179,217,208,169, 83, 39,229,125, 86, 22, 26, 65, 16,198,203,100,178,118, 86,171,181, 54,  0, 72, 36,
-146, 11, 70,163,113,175,213,106,253,154, 82, 90,224,142,142,197, 98, 81,157, 59,119,238,174,125,211,172, 89, 51,217,189,166,173,
- 70,141, 26,135, 56,142,139, 42,237,164, 45,235,149, 82,122,227,220,185,115,173,202,210,172, 85,171,214, 33,142,227,162,236,219,
-151,166, 81,242, 59, 81, 20,111,156, 61,123,182, 85,121,149, 78, 96, 96, 96,191, 86,173, 90,121,253,246,219,111, 36, 33, 33,129,
- 40,149, 74,136,162,  8,155,205,  6,139,197,130,142, 29, 59, 86,104,254, 52,149, 74,229,185,107,215,174,106,  1,  1,  1, 72, 75,
- 75, 67,102,102, 38, 70,142, 28,121,197,190, 94,169, 84,250,253,245,215, 95, 53,124,125,125,161,211,233,144,155,155,139, 33, 67,
-134,252,231, 79,174,174,109,171,126, 76,  0, 95,251,103,155,136,172,157,  7,174,191,127,191,186,181,106,213, 58, 33,147,201,  2,
-203, 58,230,165, 29,123,147,201,148,122,238,220,185, 70, 46,206,159,  8,  0,189,120,158,175, 46,  8, 66, 45,  0, 17, 86,171, 53,
- 16,  0,164, 82,105, 42,207,243, 55, 45, 22,203, 37,147,201,116, 21,192,102, 74,233,205,178,180,186,133,190, 84,141, 88,117,253,
-243,141, 98, 15, 85,213, 79,107,234,174, 79,185,172,146,235,182,116, 11,125,105,173,187, 38,235, 95, 52, 87,145, 33, 33, 33, 95,
- 20,189,159, 72, 41,141,191, 95, 77, 27, 48,144, 82,234,  5,  0,185,185,185, 94,  9,  9,  9, 65,155, 55,111,142,153, 53,107, 86,
- 71,153,193,240,185,  9,184, 88,222,239,187,180,171,118, 92,224, 72, 24,138, 98,  0, 86, 42, 38,238,216,123,253, 65, 92,152,184,
-208,208,208,185,221,186,117, 27,182,112,225, 66,213,209,163, 71, 85,117,235,214,  5,207,243,246,250,  2, 37,  3, 15, 45, 90,180,
- 40,119,247,  1, 16, 66, 66, 66,230, 60,245,212, 83,131,231,207,159,175,186,116,233,146, 42, 50, 50, 18, 69, 23,219, 98,101,211,
-254, 93,195,134, 13, 31,118, 58,255,209,188,119,239,222,125,240,130,  5, 11, 84,103,206,156, 81, 85,175, 94, 29, 28,199,129,227,
-184,187,244, 56,142, 67,147, 38, 77,220,210,236,218,181,235,224, 69,139, 22,169, 78,156, 56,161,170, 85,171,150, 99,223, 57, 53,
-207, 85, 56,157,143,184,230,227,103,176,  8, 33, 92,165, 74,149, 86, 52,105,210,164,219,166, 77,155,120,  0, 56,113,226,  4,178,
-178,178, 16, 26, 26, 10,141, 70,  3,185, 92, 14,131,193, 80,161,112, 95, 96, 96,224,247, 69,230, 74,  2,  0,235,134,246,197, 13,
-  9, 48, 54,205,  4,169, 84,138,235,215,175,131,231,249,251,  9, 29,183,245,244,244, 92,190,126,253,122,159, 70,141, 26,113, 25,
- 25, 25,136,140,140, 68, 86, 86, 86,179,125,251,246, 53,126,233,165,151, 94, 34,132, 60, 79, 41,221,231,174,230,150, 45, 91,160,
- 86,171,161, 82,169,160, 86,171, 97, 54,155,201,189,166,143,231,249,176,163, 71,143,  6,104, 52, 26,136,162,232, 88, 74,180, 95,
- 59, 16, 69, 17,109,219,182, 53,151,123,240,  4, 33,236,232,209,163,  1, 74,165, 18,148,210, 98,122, 54,155, 13,114,185,220,249,
- 14, 17, 54,155, 13, 45, 91,182, 52,187,138, 92,217,205, 21,  0,172, 90,181, 10, 65, 65, 65,  8,  8,  8,128, 90,173,134, 82,169,
-188,151,188,195,207,207, 15,175,191,254, 58,  6, 14, 28,136,149, 43, 87, 66, 34,145, 56,231,  3,190,190,190,216,186,117, 43, 60,
- 61, 61, 17, 30, 30, 94,108,253,127, 54, 18,  8,248,110,219,119,221, 17,145,237,223,179,129,208, 57, 54,106,190,163,114, 45,220,
-136,138,133,219, 82,209,102,203,222,117,240,214, 84,151, 87,  5,142, 11, 57,122,244,104,128, 92, 46,119,239,226,110,179,161, 81,
-163, 70,188,139,243,167, 71, 76, 76,204,186,215, 94,123, 77, 90,189,122,117, 34,149, 74, 33,  8,  2,  4, 65,176,151,199,112, 74,
-105,184, 40,138,237, 83, 83, 83,233, 55,223,124,243, 57, 33,228, 25, 74,233,150, 82,203, 38,213,215,207, 55,138, 61,246,159, 68,
-179,254,157, 39, 99,235,154, 41,205, 98, 27,138,240, 80,233,175,  1,120,100, 13, 22, 33,196, 83,169, 84,126,176,102,205, 26, 41,
-  0,116,238,220,249,  3, 66,200,155,148,210,188,  7,245, 31, 94, 94, 94,240,242,242, 66,221,186,117,241,236,179,207,122, 55,108,
-216,112, 66,123,163,113,212, 30,160,204,115, 83,224,184,176, 63,255,186, 18, 96,255, 60,184,111, 99,105,183,246,213, 82, 11,111,
-196, 74,110, 77, 33,218,104,226,206,  3, 55,154,184,200, 43, 23, 20, 20,244,101,247,238,221,  7, 44, 92,184,208,  3,  0,190,255,
-254,123, 60,253,244,211,  8, 12, 12,132, 82,169,132, 76, 38,131, 68, 34,129, 84, 42,117,188,186,136,  8,241, 65, 65, 65,159, 63,
-253,244,211,253,231,207,159,239,  1,  0, 63,253,244, 19,122,246,236,  9, 63, 63, 63,120,122,122, 66, 46,151, 67, 38,147, 65, 42,
-149, 22, 51, 92, 21, 73,231,203, 93, 59,162,170, 82,142,158, 31,127, 14, 31, 31, 31,236,122,251, 53, 72, 56, 14, 99,182,237,131,
-135,135, 71,185,233, 44, 75, 51, 46, 46, 14,105,105,105,165,230,157, 16, 82,110,221,231,156,247, 30, 61,122,244, 95,176, 96,129,
- 35,239,221,186,117,131,159,159, 31, 60, 60, 60, 32,151,203, 33,149, 74,139, 45,101,237,  3,103,205,238,221,187,247, 95,180,104,
-145,  7,  0, 44, 91,182, 12,157, 59,119,134,143,143, 15, 60, 60, 60, 28,251,178,162,199,232, 81,214,124, 44, 13,150,189,111, 84,
- 64, 64,192,128,223,127,255,157,115,190,  0,202,229,114,199,137, 33,147,201,192,113, 92, 69, 42, 45, 18, 19, 19,243,226,166, 77,
-155, 28, 63, 50,149,168, 20,228,114,121,133, 52, 75,232,119,238,208,161,195, 47,191,255,254,187, 66, 42,149, 66,175,215,227,220,
-185,115,240,242,242,130, 76, 38, 67,159, 62,125,248,214,173, 91,251,181,111,223,254, 55, 66,200, 96,119, 70, 40, 80, 74,161,209,
-104,138, 25,172,251,105, 66,182,159,160,155, 54,109,  2,207,243,197, 10,153,253,213,249,125, 64, 64,128, 91,186,114,185, 28,135,
- 14, 29,  2,207,243,144, 72, 36, 16,  4,  1, 18,137,  4,127,252,241,  7,222,126,251,109,100,100,100,128, 16,  2,137, 68,  2, 15,
- 15,151,173,155, 36, 48, 48,208,219,110,174,138, 34,128, 80, 42,149,144, 72, 36, 68, 16,  4, 98,111,198, 35,132, 16,119,219,212,
-  5, 65,192,205,155, 55, 49,116,232, 80, 44, 91,182, 12, 51,102,204,192,224,193,131,139,173,207,203,203,131,143,143, 15,124,124,
-124,160, 80, 40,238,185, 44, 60, 74,136, 37,246,206, 71, 51,191, 80, 65,164, 40,236,228, 33,  2, 34, 64, 65, 33, 82, 17,169, 73,
-215, 48,251,203,121,188,187,101, 73, 46,151,227,224,193,131, 14, 19, 36,  8,  2,  8, 33,112, 54, 70,246, 37, 40, 40,200,165,166,
- 84, 42,157,190, 97,195,  6,217,202,149, 43,177,122,245,106,199,127,168,213,106,120,123,123,195,207,207,207,177,132,133,133,145,
- 31,126,248, 65, 90,191,126,253,233,  0,182,148,110,  2,169,151,170,234,167, 53,251,119,158, 92,104, 46, 39, 83,100, 95,153,217,
-128,203,153,234,245,  8,155, 43,  1,192, 59,223,126,251,173, 95,227,198,141,  1,  0,223,126,251,173,223,136, 17, 35,222, 33,132,
-188, 79, 41,181,222,243, 13, 22,176,154, 16, 50,176, 40, 98,171,232,210,165,139,236,187,239,190, 67,173, 90,181, 48,110,220, 56,
-223,217,159,127,222, 11,192,111,101,151,165,226,133,233,211, 47,230,122, 83, 90, 88,126,168, 72,139,189,102,165,221,196,  7, 31,
-124,236,178, 78,  6,192,133,132,132,188,180,120,241, 98, 71,119,  8, 31, 31,159, 82,235, 38,137, 68,226, 88,202, 49, 69,164, 40,
- 42, 52, 98,225,194,133, 14, 77,127,127,127, 72,165,210, 98, 23,216, 91, 23, 79, 97,203,210, 79,160,246, 13,194,208,137,159, 85,
- 56,157, 97,114, 25,194,148, 50, 52,104,208,  0, 42,149, 10,113,146,194, 75,153,135,135,135,203,116,150,165,233, 92, 47,  3,128,
- 78,167,115, 68,237, 77, 38, 19,154, 52,105,226, 86,222, 23, 45, 90,228,208,244,243,243,115,228,221,158, 46,231,186,222,126,  3,
- 83,158,102, 72, 72,200,136, 37, 75,150, 56, 52,125,125,125,139,105, 72, 36, 18, 44, 95,190,252,174, 58,226,126, 53, 43,122,220,
- 75,106,222,188,121, 19,179,102,205,114,212, 73,246, 40,158,189,171,209,188,121,243,220, 50,216,143, 85,  4, 11,  0,201,200,200,
- 16, 47, 94,188,200,197,197,197, 65, 34,145, 32, 32, 32,  0, 77,155, 54,  5,  0,152,205,102,251, 69,151,212,170, 85, 43,149,227,
- 56,216, 47,186, 28,199,193,106,181, 58,218,147,157,140, 12,151,149,149, 37,238,216,177,131, 91,241, 76, 87,152, 40,208,240,131,
- 79,208,173,103, 79,108, 11,149,129,  7,208,236, 98,  6,100, 50,153, 16, 28, 28,108,177, 31,  4,187,182,115,223,172,146,230,136,
- 16,226,161, 86,171,127,216,188,121,179,130,227, 56,228,231,231, 67, 20, 69,180,110,221, 26, 28,199,225,236,217,179,120,239,189,
-247,176,110,221, 58,108,216,176, 65,217,168, 81,163, 31,  8, 33,181, 41,165,249, 78,102,106,103,105,133,211,195,195,  3, 42,149,
-202, 97,176,236,121, 46,106, 83, 47,217, 36,147,116,238,220,185,198,101,105,218, 35,  9,125,251,246,117,244, 57,179,155,161,146,
-175, 82,169, 20,103,207,158, 45,205,244,221,165, 41,138, 34,218,180,105, 99,111,138,131, 70,163,193,158, 61,123, 28,235, 27, 54,
-108,  8,147,201,  4,127,127,127, 92,184,112,193,165,102,122,122, 58, 77, 78, 78, 38, 43, 86,172,128, 68, 34,129,159,159, 31, 84,
- 42, 21,249,237,183,223,222, 81, 40, 20, 97, 70,163, 81,180, 88, 44,  8, 11, 11,155, 23, 30, 30,110, 63, 70,218,107,215,174,249,
-149,165,201,243, 60, 20, 10,  5,126,250,233, 39,204,154, 53, 11,239,190,251,110,177, 19,139,231,121, 24, 12,  6,248,251,251, 59,
- 76, 86,201, 19,239,159, 24,182,251, 79,107, 82, 80,156, 59,177, 13,231,207,236,132,104, 19, 97, 19, 41, 40,181, 65,180,  2,113,
- 59,142,212, 72,185,145, 28, 74, 65,129,162, 30, 55,150,  2,173,181,189,191,188, 22,128,141,123, 50,140,115, 92,165, 83, 16,  4,
- 88, 44, 22,108,222,188, 25,215,174, 93,195,246,237,219,161,215,235, 29,251,177,101,203,150, 24, 49, 98,  4,130,130,130, 92,238,
- 79, 74,233, 79,  9,  9,  9, 13,219,180,105, 67,114,114,114,144,147,147,  3,189, 94, 15,155,205,  6,171,213, 10, 65, 16,160, 80,
- 40,160, 84, 42, 17, 24, 24,  8,131,193, 64,141, 70,227, 79,101,105,138, 34,201,213, 93,159,114,121,235,154, 41,205,250, 79,166,
- 88,251, 25, 65,141,  8,185,110,239, 41,239, 17, 91,142,190,211,133, 80,142,  2,133, 89,231,  8,168,205,102,203,120,117,236,167,
- 99, 30,246, 49, 42,193,168,241,227,199,215,118,110,158, 30, 50,100,  8,206,157, 59, 87,251,235,175,191, 30,  5,224,219,138,106,
-250,  0,161,  0, 96,  5,182,162,112,193, 90,189,158, 12,218,184,177, 47,128, 23, 54,108,216,128,193,131,  7,227,203,207, 63,175,
- 91,210, 96, 21, 43, 75,148,226,230,149,253,184,121,245,  0, 68,145, 58, 69,193, 75,127, 79,221, 75, 39, 41, 40, 40, 48, 28, 61,
-122, 84,179,108,217, 50,120,123,123, 35, 42, 42,202,209, 74, 81,242,  2,107,255,236,170, 44,233,116, 58,195,197,139, 23, 53,191,
-252,242, 11,124,125,125, 17, 30, 30, 14,149, 74,229,208,148,201,100, 56,178,109, 61, 70, 13,237,129,140,155,231, 49,247,205,  1,
-110,167,243,229, 46, 29, 81, 89, 33, 67,223, 25,159, 34, 58, 58, 26,107,  7,246,  6, 71,128,209,187,143, 64, 42,149, 98, 89,143,
-182,144,201,101, 24,189,251,111, 87,233,116,104, 30, 63,126, 28,162, 40, 34, 34, 34,  2, 58,157, 14,158,158,158, 80, 40, 20,144,
- 72, 36,216,177, 99,  7,250,244,233,131,149, 43, 87,162,101,203,150, 46,243, 94, 80, 80, 96, 56,115,230,140,230,231,159,127,134,
-175,175, 47, 42, 87,174, 12,149, 74,229,  8, 76,216,141, 22,207,243,136,138,138, 66,110,110, 46,170, 86,173, 90,174,166, 86,171,
- 53,196,197,197,105,126,254,249,103,248,248,248, 32, 44, 44,204, 17, 97,179,155,162,105,211,166, 21,211,104,208,160,193,125,107,
- 86,244,184,151,212,236,219,183, 47,170, 85,171,  6, 79, 79, 79,168,213,106,135,118,121,154,143,181,193,162,148,210,162, 81, 20,
-136,142,142, 70, 86, 86, 22,228,114, 57,154, 54,109,138,140,140, 12,104, 52, 26, 72,165, 82, 80, 74, 49,112,224, 64,126,226,196,
-137,  1, 69,166,202, 81,225,151,209,150, 46,114, 28,135, 86,173, 90,225, 92, 81,203, 79,183,158, 61, 17, 22, 22,  6,123, 39, 14,
-133, 66,129,193,131,  7,147,183,223,126, 91,176, 71, 47, 40,165,208,235,245,168, 95,191,190,178,156,232,200,155,191,253,246,155,
-151, 76, 38, 67,126,126,190,163,137,140,231,121, 92,188,120, 17, 95,126,249, 37, 94,120,225,  5,220,190,125, 27, 33, 33, 33,152,
- 48, 97,130,230,211, 79, 63,125, 19,192, 71,174,118,142, 70,163,113,152, 43,149, 74,133, 97,195,134,  9,173, 91,183, 14,208,104,
- 52,240,240,240,128,189,185,207,102,179,161, 85,171, 86,196, 85,212, 65, 20, 69,108,219,182, 13,130, 32,184,140, 96, 21,181, 89,
-187,165,121,244,232, 81,135, 57,115,190, 43, 34,132,224,220,185,115, 14, 51, 87, 84,152,203,211,164, 60,207, 67,173, 86, 35, 40,
- 40,  8, 74,165, 18, 42,149,138,108,218,180,233,253,136,136,136,224,215, 94,123,141,203,203,203,227,154, 52,105,130, 30, 61,122,
-  8,162, 40,194,108, 54,163, 99,199,142,229,238, 71,137, 68,130, 99,199,142,225,211, 79, 63,197,228,201,147,177,104,209, 34,116,
-238,220,185,152, 81, 32,132,160, 82,165, 74,240,244,244,124,124,206, 46, 17, 48, 91, 45,208, 21,232, 29, 77,184, 54,155, 13,103,
-246,156,170,113,227,212,149,152,223,127, 89, 41,  1,  0,195,158,245,206,191, 10,126,118,254,175, 53,219,251, 74,143,238,201, 50,
- 31,117,209, 84,136,113,227,198, 97,234,212,169, 24, 56,112, 32,118,236,216,129,247,222,123, 15, 47,189,244, 82,177,  8,150, 59,
- 88, 44,150,197,207, 63,255,252,200,181,107,215,214,154, 60,121, 50,103,143, 96,169, 84, 42, 16, 66, 96, 48, 24, 96, 52, 26,161,
-215,235,113,233,210, 37,241,149, 87, 94,185,108, 50,153, 22,151,165,103, 37,202,211, 42,185,110, 75,245, 42,124, 53,109,252, 23,
- 30,109,154, 71,232,137,178,113,238,211,213, 59,211,206,131, 35,124, 64, 41,168, 88, 24,229, 51, 26,181,120,103,210,  4,254,223,
- 60, 84,132,144, 30, 93,186,116,233, 58,115,230,204,187,214,205,156, 57, 19, 23, 46, 92,232, 74,  8,185, 89, 86,147,104,105,120,
-  3, 97,138,160,160,175,  0,192,251,206,157,183,114,128, 68,  0, 24,  4,116,179,  1,189,119,236,216,  1,  0,168, 82,165, 10, 68,
-160, 14,  1,126,226,129,213,214,210,162,130,148,194, 98,177, 66,175, 55,150,107,172,236,159, 93,  5,151,237,117, 61,207,243,168,
- 91,183, 46,186,117,235,  6,169, 84, 10, 15, 15, 15, 71,115, 78,105, 81, 12, 23, 77,247, 20,128, 72,  8, 65, 84, 84, 20,186,118,
-237, 10,169, 84, 10,181, 90,237, 48, 45, 50,153, 12, 60,207,163, 94,235, 78, 88,185,124, 38, 94,236,217,  8, 47,196,  6, 98,221,
-153, 76,183,210, 25,161,148, 33, 92, 37, 71,116,116, 52, 60, 60, 60, 64,  8, 32,240,255,175, 79, 85, 42, 37,100,114, 89,185,233,
- 44,169,153,154,154,138,248,248,120,196,199,199,131,227, 56,180,105,211,198, 17,117,185,122,245, 42, 62,250,232, 35, 24,141, 70,
-183,242,206,113, 28,170, 87,175,142,142, 29, 59, 66, 38,147, 65,165, 82, 21,107, 26,180,239,211,252,252,124, 84,171, 86, 13, 27,
- 55,110, 68,219,182,109, 93,106, 70, 71, 71,163, 93,187,118,144, 74,165,142, 27,105,165, 82,233,184,110, 20,153, 59,199,127, 52,
-106,212,168, 66,154,219,143,221,198,210, 29,127,193,104, 18,145,167,179, 20,251, 65,176,191, 39, 14,252, 60,217,173,188,219, 53,
-151, 44, 89,130,156,156, 28, 71, 29,100, 15,192,216,131, 39,149, 43, 87,198,130,  5, 11,158,172, 38, 66,251,101,193,238, 42, 67,
- 67, 67, 97,239,231,161,209,104, 32,147,253,191,143,183,213,106,197,186,117,235, 16, 16, 16,224, 88,188,188,188,202, 44,208, 85,
-170, 84,  1,165, 20,227,210, 11,187, 25,108, 13,145,226, 38,128,167,211,169, 35,186, 99,179,217,240,219,111,191,193,217,192,120,
-120,120,148,219, 92, 36,147,201,218, 55,109,218,148, 51, 26,141,119,153,171, 79, 63,253, 20,131,  7, 15, 70,205,154, 53, 33,138,
- 34, 10, 10, 10,208,161, 67,  7,201,188,121,243,218, 87,196, 96,169, 84,133,253,249, 77, 38, 19,246,236,217,  3, 31, 31, 31,248,
-249,249,193,215,215, 23, 30, 30, 30, 80, 40, 20, 32,132,184,108, 46,163,148,162,111,223,190,142, 66,231, 28,181, 42,105,182, 14,
- 29, 58,228, 86, 51, 25,165, 20,205,155, 55,135, 90,173,134, 70,163,129, 70,163,193,182,109,219, 28,235,155, 53,107,  6, 81, 20,
- 17, 16, 16,128,195,135, 15,187,172,116,195,194,194, 28,219, 75, 36, 18,242,219,111,191,189, 19, 25, 25, 25, 60,122,244,104,142,
-231,121,156, 56,113,  2,231,207,159, 71, 80, 80,144,163, 79,150,171,116,106,181,218,148,121,243,230,217,190,251,238, 59,  0, 64,
-199,142, 29,145,155,155,155,230,180, 62,115,232,208,161,142, 81,138,  0,144,149,149,149,249, 24,248, 43, 88,205, 86,232, 12,  6,
- 20,228,235, 28,209,160,180,228, 84,239,201,111,143,151,124, 57,102, 56,  0,224,237, 57,223, 34,127,209,255, 43,176,245,111, 15,
- 10,120,102,246,234, 41,  0,250,148,167,175,211,233, 96, 52, 26, 17, 30, 30,142, 99,199,142, 33, 63, 63, 31,157, 59,119, 46, 22,
- 33,117,222,167, 46,142,189,137, 16,210,186,103,207,158,127,127,253,245,215, 85,107,215,174, 77,180, 90, 45,116, 58, 29,156, 95,
-207,156, 57, 67, 87,173, 90,117, 67,167,211,181,162,148,154,202,210,219,150,244,253,181,110,161, 47,173,221,119, 90,214,211, 63,
-234,178,103, 82,118, 85,107,102,146, 92,155,167,191,100,176,209,243,160, 54,192,  6, 17,212, 42,194,  6,138,127,115,252, 54, 33,
- 36,172, 70,141, 26,175,174, 92,185,178,212,253,197,243, 60, 86,174, 92,137, 54,109,218,188, 74,  8,185, 88, 94,231,126, 59, 45,
-  1,153, 65, 34,153,188,249,215, 95, 11,251,114,117,236, 56,185,165,197,242,246, 97,192, 84,167, 94,189,126,135, 14, 29,242,178,
-215, 43, 94, 94, 94,160,148,242, 58,157,206,171, 85,171, 86,253, 74,107,118,165, 34, 96,177, 88,160,215, 27,145,155,155, 15,147,
-217, 82, 84,103,138,176,217,172, 69,175, 34,172, 69,245,168, 68,224, 61,218,183,172, 82, 80,104,180, 72,206,222, 35,183, 43,151,
- 81,215, 83, 66,  8,  2,  3,  3, 33,149, 74,139, 69,153,220,137, 94,149,130,205, 94, 23,250,249,249, 65, 38,147,225,244,158,223,
-145,118,225,  0,164,132, 66,180, 89, 32, 90,205,176, 89,205,224, 57, 30,151,174, 39, 35, 58,216,229,216, 33, 71, 58,187,125, 48,
-  3, 45, 90,180,192,218,129,189, 65,  8,240,218,238, 35,144, 72, 36,248,185,111, 39,200,101, 82,188,178,227,136,187,233, 44,150,
-247,227,199,143, 99,220,184,113,248,236,179,207,160, 84, 42,237, 45, 39,184,120,241, 34,126,253,245, 87,116,233,210,197,237,188,
- 19, 66, 28,121, 23,  4,  1, 83,166, 76, 65,114,114, 50,230,204,153,131,198,141, 27, 67, 34,145, 32, 39, 39,  7,173, 90,181, 66,
-106,106,170,219,251,211,222,140, 39,147,201,138, 69,155,236,198,239, 94,142,145, 93,115,120,223, 96,108, 58,184, 10,  4,  4, 71,
-126, 30, 95,236, 90,180, 96,245,254, 10,107, 78,157, 58,181, 88, 58,159,196,232, 85,169,  6,139, 82, 74, 67, 67, 67, 33,138, 98,
- 49, 83, 85,178, 67,173, 61,228,231, 28, 82, 44,183, 15,  2,207, 67, 20, 69, 71, 97,224, 75, 89,127,248,240,225,187, 76,192,210,
-165, 75,203,189,128, 91,173,214,218, 30, 30, 30,197,162, 87, 82,169, 20, 83,166, 76,193,176, 97,195, 28,230, 74, 42,149, 98,217,
-178,101,104,210,164,  9, 76, 38, 83,237,242,210, 42,149, 74,117,245,234,213,227,236, 81, 32,165, 82, 73,  6, 15, 30,204, 91,173,
- 86,199, 62,177, 47,246,190,105,174, 76,134, 61,218,180,125,251,118,183, 34, 88,238,246, 65,162,148,226,212,169, 83,197, 76,155,
-125, 20, 12,  0,156, 58,117,202,209, 63,203, 93, 77,155,205,  6,165, 82, 73,164, 82, 41, 81, 40, 20, 97,118,115,197,243,188,227,
-120, 59,247,201,115,117,162,156, 62,125,186, 67,121,235,207,156, 57,243, 88, 78,199, 32, 66,132,217, 98,129, 94,103, 66,126,129,
- 30,211, 63,249,177,112,197,116, 28,  5,112,180,245,168,113,120,173, 91,151,142,  0, 42, 85,208, 16,192,126,  1,251,237,183,223,
- 32,145, 72,176,113,227, 70,120,122,122,162,119,239,222,240,244,244,196,228,201,147, 49,112,224, 64,183, 35, 88, 69,101, 41,151,
- 16,210,250,205, 55,223,252,251,139, 47,190,168, 82,185,114,101,152, 76, 38,152,205,102,152, 76, 38, 92,187,118, 13,171, 86,173,
- 74,208,233,116,173, 41,165,185,174,244,182, 37,125,127,237,247,195,239, 36,199, 62,251,172,254, 98,234, 86,220,185,147,  9,171,
- 53,  9,162,205, 10,179,181,112, 68,178,205,106,133,213,106,131,192,115,158, 11,190,158,184,163,176,195, 63, 49,245,239,223,255,
-169,135,120,168,232,149, 43, 87, 50, 43, 85,170,100,175,196, 60, 77, 38, 19, 41,186,129,163,  0,236, 29,220,181, 40,167, 35,186,
- 51,199,128,145, 95,126,246, 89,152,189,249,254,147,207, 62, 11,155,240,214, 91, 35,  1,204,187,112,230,204,202,225,195,135,191,
-185,102,205,154, 98,191, 25, 62,124, 56, 46,156, 57,179,178,244, 16, 65, 81,  4,203, 96, 64,122,102, 54, 94, 30,245,190, 35,116,
-  0, 80, 56, 59, 84, 90,248, 89,  1,  0, 25,169,215, 48,118,220,219,242,178,110,168,234,212,169,  3, 81, 20,139, 69, 67,238,161,
-239,149,115,100,200,177,157,167,167, 39,164, 82, 41,174, 29,250, 29,111,141, 26,  0,216,204,160, 22, 61, 96,214,  1,230,  2,136,
- 38, 29,136, 84,  9, 88,244, 46,117,237,233,244,244,244, 44,236, 19, 42,240,144, 73,255,111,254,156, 35, 87,238, 92,184, 75,230,
-253,230,205,155,120,237,181,215, 96, 54,155,209,183,111, 95,152, 76, 38, 24, 12,  6,232,245,122, 68, 69, 69, 65,167,211,185,157,
-119,251,181, 83, 42,149, 98,252,248,241,104,210,164,  9, 62,250,232, 35, 76,154, 52,  9, 81, 81, 81, 24, 61,122, 52, 86,173, 90,
-133,152,152,152,114,117,237,154,133, 77,238,133,154,246,252,150,108,202,179,183, 20,184,123,140, 74,211,180,207, 46, 82,242,184,
-191,241,124,167, 10,107,126,250,233,167, 72, 79, 79,191, 43,114,101,127, 31, 26, 26,138,249,243,231, 63,145, 17, 44,199,112, 82,
-251,  5,212,126, 33,119,174,220, 85, 42, 21,214,173, 91, 87,172,115, 93,121, 97,105,142,227, 32,138, 34,182, 84, 42,252,125,143,
-162,200,149,243,231, 94,189,122, 33, 50, 50,178, 88,244, 74,169, 84,150, 91,104, 68, 81,196,173, 91,183,112,238,220, 57,180,104,
-209,  2,185,185,185,144,112, 28,222, 62,115,  6,117,158,127, 30, 38,169, 20,162, 40, 66, 38,147, 97,228,200,145,110,117, 84,255,
-251,239,191,125,156, 63,215,169, 83, 39, 49, 54, 54, 54,244,216,177, 99,142,142,239, 69,205,103, 14,163,225,230, 73,141,126,253,
-250, 21,139, 90, 57,155, 43,231,101,235,214,173,110, 53, 17, 82, 74, 17, 27, 27,235,136, 94,121,120,120, 96,195,134, 13,142,245,
-246,240,115, 96, 96,160, 91,154,246, 59,248,162,142,237, 48, 26,141, 98,126,126, 62, 23, 23, 23,  7,153, 76,230, 56, 38, 74,165,
- 18, 10,133,226,190,  6, 39, 60,246,216, 68,152, 44, 22,232,245,122, 20, 20, 20,206, 16,114,237,108,241,126,204,102,227,189, 15,
- 78,179, 71,169,242,243,243,177,107,215, 46,172, 95,191, 30,141, 27, 55,190,171,147,187,243,121,235, 70, 25, 77, 39,132,180,153,
- 56,113,226,145,143, 63,254, 56,196,215,215, 23,102,179, 25,183,111,223,198, 15, 63,252,144,172,211,233,218, 80, 74,211, 43,224,
-218, 96,177, 88, 97,208, 25,145,155,151,143,105, 51,151,149, 89, 69,  0, 64, 86,218, 37, 12, 30, 60, 68,246, 48, 15, 19,165, 52,
-  9,192, 75, 78,231,213, 10,  0,246,112,124, 30,165,116, 88, 69,244, 36, 64,251,103,251,247,239, 56,126,252,120,199,119,227,199,
-143,199,145, 35, 71, 58, 74,214,174, 61,103,  1,246,240,107,215,198,124,253,245,215,142,109,190,254,250,107,172, 91,187,118,183,
- 13,216, 83, 86,221, 97,111, 34, 44, 40,208,195,211, 59, 24, 73,241,123, 93,166, 69,202, 27, 64, 69,209,229,141, 95,201,126, 55,
- 37,235,167, 10,148, 31, 90,175, 94, 61,123,235,  2,164, 82, 41,234,118,236,143,217,115, 23, 67,206, 81, 60,219,185, 46, 42, 41,
-108,128,210, 23,210,182,147, 65,188,195,139,110, 58, 26,186,117,131,186,239,253,  9,184,161, 86,224,149,237,  7, 32,149, 74,241,
-219,192, 30,144,203,165,120,225,247,125,144, 74,165,248,125,196, 51,144,202,164,232,182,240, 87,183,110, 84,236,121,191,118,237,
- 26, 14, 29, 58,132,232,232,104, 92,189,122, 21,206,253,108, 41,165,110,155,182,186,117,235, 58,  2, 18, 18,137,  4,119,238,220,
- 65,207,158, 61, 29, 55,248,123,247,238,197,196,137, 19, 49, 98,196,  8,180,111,223,190,212,126,177, 37, 53, 99, 98, 98, 28,129,
-131,146, 38,216,185,217,182, 34,199,168, 52, 77, 71,249,189,199,227,238,172,249,241,199, 31,151,106,214, 43,162,249, 88, 27, 44,
-251,  9, 82, 86,187,179, 90,173,198,235,175,191,142,169, 83,167,194,223,223,223,101,223, 25,187,115, 45,143,205,155, 55,223,245,
-221,198,141, 27, 93, 53, 17, 94,244,242,242,106,210,161, 67,  7,228,230,230, 34, 33, 33,  1,106,181, 26,117,102,207,198,153,215,
- 94, 67,131,133, 11,193,117,236,  8, 66,  8,100, 50, 25,206,156, 57,  3,165, 82,121,177,162, 17,  3, 15, 15, 15,248,248,248, 56,
-218,212,237, 70,203,201, 96, 81,119,204,208,150, 45, 91, 74, 29,161,115, 47,125,176,236, 21,239,145, 35, 71,138,245,191,114,110,
-230, 56,114,228,136, 35,130, 85,180, 61,113,117,156,138,238,234,168, 93, 79,165, 82,193,215,215, 23,114,185,220, 97,172,236,230,
-202, 29,115,233,106, 34,209,136,136,136, 98, 19,145, 74, 36,146, 98, 19,145,254,215,155,  8,245,122,  3, 10,242,245, 15,178, 73,
-171,208,156, 21, 13, 56, 89,183,110, 29,154, 55,111,126,151,185,178, 71, 29,239,193,112, 36, 18, 66,218,207,157, 59,247,232, 87,
- 95,125,229, 83, 80, 80,128, 31,127,252, 49,183,160,160,160, 61,165, 52,177, 66, 90,  0, 44,102, 51,116,  6, 35,180,  5,133,251,
-224,250,185,223, 92,154,178,255, 50,181,235,213, 27,250,227,143, 63,222,245,253,143, 63,254,136,171, 87,175, 14,197,153, 51,123,
-154,  1,139,222,153, 60,185,122,227,198,141,195,  0,224,157,201,147, 19,155,  1,139,202, 59,207,205, 69, 77,132,  5,  5,133, 81,
- 15,131, 54,227,193,148,211, 34,147, 81, 86,159,171,123,185, 32,218,235, 91,169, 84,138,174,  3, 95, 70,242,141, 75,136, 86,103,
-160,146,183, 10, 52, 47,  9,210,142, 31,226, 76,150, 10,115, 22,110,171, 80, 58,213,114, 25, 20, 10,185, 83,159, 43,  5,100, 10,
-185, 35,157, 10,165, 18, 18,185,172,194,121,191,124,249, 50,148, 74, 37,108, 54,219, 93,215,155,138,230,223,217,184,124,253,245,
-215,152, 56,113, 34,150, 45, 91,134, 51,103,206,160, 65,131,  6,232,220,185, 51,210,210,210,112,250,244,105, 24,141, 70,183,211,
-233,220, 47,238,252,249,243,248,243,207, 63, 17, 31, 31,143,132,132,132,123, 62,238,206,154, 37, 13,214,186,157, 39,209,175, 75,
-163,123,210,156, 54,109, 26,210,210,210,138, 69,174,156,163,155, 79,116,  4,203,222,196,228,116, 81,190, 43, 74,165, 86,171, 29,
- 29, 34, 61, 61, 61, 93, 70,134,236,  6, 43,246, 70,126,177,190, 92,246, 72, 22,  0,140, 24, 49,226,174,  8, 86,201,201,233, 74,
- 98, 52, 26,247,238,221,187,183, 97,175, 94,189,248,139, 23, 47, 58,154, 34, 77, 45, 91,162,193,194,133, 56, 59,126, 60,218,221,
-188,  9,131,217, 12,133, 66,129,109,219,182,153,117, 58,221,222, 10, 86, 22,196,217, 96,169,213,106,120,121,121, 57, 12, 70, 69,
- 92,121, 89,119,136,206,159, 43, 18, 17,178,247, 57,179, 47,246, 11, 43, 33,  4,122,189,222,209, 89,179, 34, 81, 17,155,205,230,
- 56,241,236, 29, 20,189,189,189, 29,149,134,125, 52,153,187,205,163,174, 38, 18, 85, 40, 20,158,251,247,239,175,102,159, 70, 34,
- 35, 35,  3,  3,  7, 14,188,242, 95, 63,185, 40, 40,204, 86, 27, 10,244,  6, 20,232,117, 15, 92,127,229,202,149,184,118,237, 26,
-204,102, 51, 62,249,228,147,187,140, 85, 69, 58,185,151, 82,174,174, 53,106,212, 72,236,222,189, 59,142, 28, 57,  2,185, 92,110,
-161,148, 86,120,254, 42, 42,138, 48, 91,173, 48,232,245, 40,208,106,159,136,187,214,243,103,206,252,166, 86,171,  7,  2,208,228,
-228,228,240, 94, 94, 94, 80,169, 84,208,235,245,185,124,209, 72,193,195,128,201,219, 98,249,108,192,128,  1, 95,  1,128,194, 98,
-249,236, 48, 96, 42,239, 60,183, 88,139,204,250,  3,220,143,246,122,171,172, 58,233, 94,162,211,246, 11,169, 84, 42,133,192,243,
-248,113,214,  4, 68,171,211,209, 40,210,  3,198,212,171,144,121,248,131,120, 71, 96,206,194,109,184,112, 51,171, 66,233, 28,180,
-124, 45, 42, 87,174,140, 77,207,247,134, 66,174,192,160,117,187, 32,145, 72,176,125,244, 64, 72,101, 50,116,254,238,231,123,202,
-187, 86,171, 45, 51, 82,229,110,  4,171,100,222, 37, 18,  9, 26, 54,108,136, 26, 53,106, 96,207,158, 61,104,212,168, 17,174, 94,
-189,138,171, 87,175,226,230,205,155, 56,115,230, 12,178,179,179, 43,124,140, 86,175, 94,141,172,172, 44,200,100, 50,100,100,100,
- 32, 62, 62,222,173,169, 88, 92, 29,119, 59,181,158,158,  6,  0,  8,169,228, 85, 33,131,229,172,249,249,231,159,223,101,218,159,
-196,150, 14,161, 12, 19,160,175, 85,171,150,210,185,253,148,227, 56,120,120,120,144,137, 19, 39,242, 69,239,225,229,229,133, 74,
-149, 42,185,213,236, 38,145, 72,244,205,154, 53, 83,218, 11,160,221, 56,169,213,106,126,210,164, 73,100,233,210,165,101, 70,181,
- 92,244,193,250,106,216,176, 97, 47, 37, 38, 38,250,  4,  4,  4, 32, 37, 37,  5, 50,153,172,240,164,232,208,  1,177, 55,110,192,
- 92,216,167,  8,151, 47, 95,198,226,197,139,181, 70,163,241,171,138,238, 40,141, 70,  3, 63, 63, 63, 71,211,160, 61,130,227,100,
- 22,233,189, 84,100, 37,151,138, 68, 28,236,154,206,  6,203,126, 97, 29, 53,106, 84, 49,179,229,118,129, 16,  4,107,187,118,237,
-  4,123, 58, 44, 22, 11,234,213,171,135,180,180, 52, 72, 36, 18,200,100,178, 98,145, 59,119, 12,150,171,137, 68,  5, 65,128,201,
-100, 66,219,182,109, 65,  8,193,183,223,126,123, 79,145,151, 71,206, 96, 89, 69,162,209,248, 33, 36,164, 38, 42,  5, 24, 32,138,
- 15,238,233, 47, 86,171, 21,163, 71,143, 46, 22,177,178,143, 84,180, 55,241, 23, 54, 43, 89,238,121,210, 86,251,121,125, 63,243,
-191,137, 20,142,166, 45,173,214,240,159, 59,134,225,225,225,158, 69, 77,134, 37,249,133, 82,250,103,169,199,166,104, 74,  6, 30,
-152,113,251,246,237,186, 94, 94, 94,232,218,181, 43, 54,111,216,176,233, 23,192, 17,178,201,  1, 18,125,238,220, 25, 95,244, 62,
-201, 85, 80,175,176, 15,150, 17, 90,173,254,129,231,243,126,111,244, 74,187,161,230,121, 30,235, 22,126,138,104, 85, 42, 26, 86,
-145,227,208,145,147,104, 94, 25,128,233,222, 91,128,237,125,155, 84, 42, 37,164, 50,185, 35,157, 10,149, 10, 18,169,236,158,243,
-238, 92,159,150,172, 47,239, 37,130,231,188, 63, 95,126,249,101, 76,158, 60, 25, 93,187,118,197,213,171, 87,177,111,223, 62, 92,
-189,122, 21,227,198,141, 67, 76, 76, 12,186,117,235, 86, 33,205,181,107,215, 34, 55, 55, 23, 28,199, 33, 51, 51, 19,122,189, 30,
- 83,167, 78,189,239,227,110, 39,126,231, 39,  0,128,223,118,156,184,103,205,247,222,123, 15,119,238,220, 41, 22,185,122, 82,162,
- 86, 46, 13,214,229,203,151, 75,109,239,139,137,137, 73,237,210,165, 75, 64, 74, 74, 10, 52, 26,141, 75,115, 69,  8,233,108,159,
- 43,227,220,185,115,165,106, 86,173, 90,213,220,165, 75, 23, 73,112,112,112,177,209,131,106,181,186,216,201, 90,154,102, 81,229,
-159, 79,  8,121,181,117,235,214, 63,109,221,186, 85, 85,163, 70, 13,228,229,229,129, 82,138,101,203,150, 97,204,152, 49, 80, 40,
- 20,184,124,249, 50,122,247,238,173,211,233,116,175, 58,207,129, 85,154,102,105, 70,134,227, 56,199,252, 48,165,152,171,114,243,
-238,204,220,185,115, 29,115, 65,149,199,162, 69,139,128, 18, 83, 42,148,166, 73, 41,197,151, 95,126,249,192, 52, 47, 93,186,180,
-204,121,125,100,100,228,183, 79, 61,245,148,144,144,144, 80,204, 84, 57, 47,165, 84, 72,197, 52, 93, 77, 36,202,243, 60,  2,  3,
-  3,241,241,199, 31,195,207,207, 15, 65, 65, 65,119, 69, 94, 92, 29,163,123,188,123,255, 71, 53, 41, 71,227,230,126, 53,173,205,
-162,239,215, 75,228, 50,224,240,190,223,144,151,125,167,120,  4,214,252,255, 33,209,178, 70,157, 96, 58,177,203,173,116, 26,141,
- 70,124,254,249,231,152, 54,109,218, 93,115,224,148,113,220,239, 43,239,238,152,172,210, 52, 69, 81, 36, 42,181, 15, 20,234, 16,
-212,137,241,129,232,198, 92,157,226,191,127,220,117,  9,  9,  9, 94,149, 43, 87,198,149, 43, 87,  8,254,223, 31,235,255,199, 74,
- 38, 27,  4,224,207,242, 52,  9,112,102,213,170, 85,117,235,213,171,135,111,191,253, 22,  0, 94,120,113,251,246,129,207,233,245,
-  6,160,112,242,209, 34, 51,230, 50,157, 54, 74,137, 82,229, 13,133, 58, 24,117,234,122, 67, 20,221,159,243,148,150,147,119,251,
-197,175,100,244,170,130, 19, 73,223,165,105,191, 65,186,126,248, 15,244,236, 17,134,131, 71,207, 98, 87,130, 10, 97,178, 20,132,
-232,210, 33,166, 95,196,155,253, 27, 97,206,218,194,139,248,217, 56,215,154,132, 16, 28,124,251, 21,168, 85, 10, 60,187,234, 79,
- 72,165, 82,252,245,230,243,144, 74,229,104,247, 85, 97,147,236,153,207,166, 64, 34,151, 35,250,141,105,110,165,179,100, 75,141,
-189, 43,135,243, 54,229, 69,176,202,203,123,126,126, 62,114,114,114,240,211, 79, 63, 97,248,240,225, 72, 75, 75,195,205,155, 55,
-113,229,202, 21,252,242,203, 47,142,209,233, 21, 73,167,221,188,188,245,214, 91,160,148,162, 78,157, 58,152, 54,109, 26, 90,182,
-108, 89,225, 99, 84,242,184,151,196, 85,244,170, 60,205, 57,115,230,220, 83, 89,122, 34, 12, 86,121,119, 37, 28,199,193,223,223,
-223, 81, 56,156, 11,222,189,220,233,242, 60, 15,171,213,234,232, 56,109, 95,  0,160, 87,175, 94,216,188,121,179, 59, 35, 35,182,
- 18, 66,134,214,174, 93,251,135,233,211,167,107,218,181,107, 39,132,132,132,160,105,211,166,184,124,249, 50,254,248,227, 15,203,
-252,249,243,181, 58,157,110,  4,165,116,199,189,212,201,246, 71,207, 56, 47, 21,193,102,179, 37,196,199,199,  7,127,249,229,151,
- 60,199,113,152, 51,103,142,243, 67,174,239, 42,132, 71,142, 28,177,186,106,146,177, 90,173,  9,241,241,241,193,179,103,207,230,
-  9, 33, 14, 77,231,201, 95,157,247,157, 59,154,165,153, 75,251,128,135,210,150,210,210, 94,218, 49, 46,111, 34, 81, 65, 16,112,
-249,242,101, 76,157, 58, 21,132, 16,252,246,219,111,143,197,201,117,240, 88,242,210, 86, 77, 66,124,  6,245,111, 95,143,128,131,
-201,124,247,  0, 52, 62, 51,199, 97,174,158,153,189, 26,235,223, 30,232,142,217,185,118,236,216, 49,223,207, 63,255, 92,224,121,
- 30, 95,127,253,117,177,201,126, 75, 30,247,163, 71,143, 90,239,169,121,175,232,124, 54,155,205,208,235,239, 45,106, 66, 57,114,
-104,206,231, 31,118, 89,244,227,102,  9, 33, 38, 28,222,251, 27,114,115, 74, 31,154, 46,147,  8, 88,177,106,147, 85,224,185,132,
-127,249,208, 45,234,220,185,243,212,157, 59,119, 10,149, 43, 87,190,103,145, 54,192,230,121,243,230, 61,245,252,243,207,251,214,
-174, 93, 27,235,215,175,  7,  0, 89,209,130,162,153,221,183,186,103,146,196,141, 95,127,241,225, 11,139,127,220, 44,227,136, 25,
-135,247,253,134,220, 18,102,189, 36, 82,169,  4, 43, 87,109, 52, 11,  2,127,201, 85,189,238, 28,189,186,223, 11,162,115,217,107,
-212,243, 37,124,251,199, 98,  4,212,235,142,  1,189, 98,113,224,219,231, 49, 32,218,  0,243,154, 33,168,219,127, 57,150,189, 83,
- 24,189,105,184,246, 93,183,174, 63, 30, 30,106, 71,  7,114,142,227, 32, 87,168, 32,145,255,191,255,144, 76,165,130, 80,129, 72,
-150, 61,239,229, 69,170, 42, 26,193,226, 56, 14,145,145,145,168, 90,181, 42, 90,183,110,141, 70,141, 26,161, 67,135, 14, 56,125,
-250, 52, 78,159, 62,141,113,227,198,149,105,174,220, 57, 70, 93,186,116,193,165, 75,151,238,187,144,151, 60,238, 15,  2,119,202,
-210,107,175,189,  6,  0, 79,110, 31, 44, 87, 59,207, 94, 32,233,  3,232,140, 74,  8,129,201,100,114, 52,189, 57,207,171,100,239,
-244,238,230,124, 80, 59,  8, 33, 49, 31,124,240,193,120,133, 66,209, 65,167,211,213,  4,  0,181, 90,125,217,104, 52,254,165,215,
-235,191,166,148,230,220, 79, 90,157,167,101, 40, 37, 31,229,238,140,244,244,244,110,195,134, 13,219,193,113, 92,100,121, 15,231,
-117,186,243,191,153,154,154,250,148, 43,205,161, 67,135,150,170, 89,154,174, 59,154,165, 29,115, 81, 20,203, 52, 87,238, 84, 64,
-174, 38, 18,149, 72, 36, 80,171,213,216,176, 97,  3,252,253,253, 31,171, 19,236,208,241,228,207,203, 91,223,222, 95,190, 23, 64,
-165,103,102,175,190,189, 39,195, 20,222,222, 95,118,107,253,219,  3,171,148,247,155,236,236,236,174,111,189,245,214,159,130, 32,
- 68,150,119,188,157,140,120,124,122,122,122,133,167, 61,160,148,226,210,165, 75,226,203, 47,191,156,145,158,158,254,220,189,228,
-127,236,248, 47,190,154,247,229,155,126,253,251,180,105, 10, 66, 96, 50,149,209,169,151,128, 82, 74,169,192,115,  9,175,191, 53,
-251,149,127,243,152, 81, 74, 79, 17, 66, 62,170, 86,173,218, 72,  0,101, 93,  9,127,113,165,179,  7, 48,203,140,198, 47,155, 52,
-105, 50,233,221,119,223,245,238,213,171, 23, 42, 87,174, 92,230,124,129,229,113,224,104,226,200,150, 77,130,195,250,245,110,211,
-141, 35,132, 26, 77, 70, 23,245,106,209,254, 20,248, 75,123,143, 36,212,119, 21,157,231, 56,174,194, 93, 20,220,161, 83,255,225,
-232,212,127,184,163, 60,237, 92,211, 30,113,201, 59,208,152, 75,132,113,113, 27, 16, 79,123, 81,231, 93, 94, 39, 56,142, 67,239,
-101, 27,139,165,179,245,103,197,163,179, 53,199,124, 80,161,107,143,243,224,171,  7,213,  7,139,231,121,100,100,100,224,242,229,
-203, 72, 77, 77,133, 78,167,195,133, 11, 23, 96, 54,155,145,157,157, 13,251, 72,195,123, 73,231,131, 58, 70,255,166,230,147,212,
- 76, 88, 33,131,101,179,217, 18, 93, 61,245,220,106,181, 86,104,148,145, 32,  8,134, 54,109,218,144,210, 70, 27,216,223, 43,149,
- 74,189,155, 21, 99, 14,128,169,  0,166, 22, 61,111, 10, 89, 89, 89,247,237,  2,109, 54, 91,114,179,102,205,248,242, 12,145,205,
-102, 75,117, 97,134,180,  0, 90, 62,200,131,247, 79,104,150,114,124,180,237,218,181,187,107, 30, 19,231,227,163, 80, 40,202,237,
-117,235,106, 34, 81,157, 78,151, 50,108,216, 48,155,115,179,160,243, 68,164,143, 53,132,222,234, 49,232,165,240, 61, 25,166,112,
-  0,176,155, 44, 80,122,171,172,159, 36, 39, 39,235,  1,180,251,167,147,118,227,198, 13, 83,243,230,205, 87,230,231,231,191, 70,
- 41,189,231, 94,250,227, 38,204,121,247,191,118, 88, 40,165,167,  0,140,186, 95, 29, 19,112,177,142,193,240,218,180, 15, 62,120,
-246,195, 15, 62,168, 33,  2,126, 64,225, 28, 85, 60,176,186, 34, 90,135,143,167, 60,240,185,193,108, 54, 91, 98,171, 86,173, 42,
- 20,169,113, 85,199, 91,173,214,114,175, 19,171, 80, 25, 56, 94, 49,205,127, 34,157,206,154, 13, 26, 52, 64,195,134, 13, 29,175,
-118, 74,126,239,142,102,227,198,141, 81,167, 78,157, 50,103,104, 47,217,231,234,223,206,187, 93,211,110,251, 27, 54,220,254,192,
- 52,239, 55,157, 79,148,193,178, 63, 99,240, 65,114,254,252,249,127,228,217, 40,148, 62,184,177,222,231,207,159,111,138, 39,148,
- 75,151, 46,249,221,175,134,171,137, 68,207,156, 57,211,225, 73,221,191,123,210, 77, 47,222,245, 93,145,217,250,183,209,106,181,
- 85, 40,165,247,212, 51,191,127,255,254,182, 39,245,152,130,210, 98, 19, 79,157, 47,156,160,244,167, 71, 49,169,231,206,157,123,
-224,117,250, 63,113,157,248, 39,210,201,242,254,232,107,254,215, 97, 51, 68, 50, 24,140,178,110, 82,108,108, 47, 48, 24, 12,198,
-189, 65,  0,116, 46,163,114,117,123,228, 14, 33,164,243, 61, 84,222, 59,153, 38,211,100,154, 76,147,105, 50, 77,166,249,100,105,
-186,210,126,208, 35,135,255,205,187,212,127,108,  1,208,153,105, 50, 77,166,201, 52,153, 38,211,100,154, 76,243, 73, 91, 88, 19,
- 33,131,193, 96, 48, 24, 12,198,  3,134, 25, 44,  6,131,193, 96, 48, 24, 12,102,176, 24, 12,  6,131,193, 96, 48,152,193, 98, 48,
- 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,131,113,239,144,  7, 56, 31, 39,131,193, 96, 48, 24, 12,  6,  3, 44,130,
-197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,
-131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,131, 25, 44,  6,131,193, 96, 48, 24, 12,
-198,163, 96,176,  8, 33,157,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 52,153,193, 98, 48, 24, 12,  6,131,193, 96, 48,131,
-197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24, 12,102,176, 24, 12,  6,
-131,193, 96, 48,254, 37,  8,128, 82, 71,  2, 80, 74,119,186, 45,114, 15,163,  9, 92,233, 51, 77,166,201, 52,153, 38,211,100,154,
- 76,243,241,211,116,165, 93, 17,255,241, 72, 67, 41,253,199, 22,  0,157,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 52,159,
-180,133, 53, 17, 50, 92,221, 97,  8,132, 16,225, 94,215, 63, 44, 77,  6,131,193, 96, 48, 30, 37,216, 69,140, 81,158, 17,106,  9,
-160,103,209,251,223, 41,165,135, 43,178,254, 97,105, 62, 44, 26, 55,110,172, 84, 40, 20, 93,119,239,222, 45,187,112,225,  2,254,
-254,251,111,186,114,229, 74,179,193, 96,216, 30, 23, 23,167,103, 37,230,191, 79,163, 70,141,186,  1,152, 82,244,241,211, 19, 39,
- 78,108,187,207,115,136, 84,171, 86,109,156, 76, 38,235, 33,149, 74, 67,172, 86, 43, 49, 26,141,201,122,189,126, 71, 82, 82,210,
-108, 74,169,120, 15,154, 77,253,253,253, 71,197,196,196,212,184,113,227, 70,194,237,219,183, 87,  0,216,  6,160, 91,149, 42, 85,
-134, 69, 69, 69, 85, 62,119,238,220,149,140,140,140,133,148,210,191,255,173,116, 50, 24,204, 96,185,119,242,113, 62, 62, 62, 93,
-148, 74,229, 27,  5,  5,  5, 13, 61, 61, 61,207, 91,173,214,121, 41, 41, 41,191,179, 19,239,177, 53, 87,  2,128,158,148, 82,  9,
-  0,240, 60,223,167,101,203,150,225,132, 16,145, 16, 66, 41,165,132,227,184,134, 54,155,141, 43,218,190, 39, 33,228,111, 74,169,
-181, 34,154,205,155, 55,175, 44,  8,  2,165,148, 18, 74, 41,199,113, 92,253,138,104, 62, 40, 98, 98, 98,102, 81, 74, 67,202,219,
- 70,173, 86, 55,217,189,123,119,173,141, 27, 55,218, 86,172, 88,145, 51,104,208, 32,205,240,225,195,133, 31,127,252,241, 59,  0,
-111,148,220,190, 78,157, 58, 95,113, 28,231,239,206,255,139,162,152,113,254,252,249,183, 88,201,251,215,153,242,242,103,123,219,
- 82, 10,124, 63,165, 29, 87,100, 92,238,153,134, 13, 27,254,212,183,111,223, 65, 53,107,214, 20, 68, 81,132,197, 98,129,201,100,
-170,117,226,196,137,246,219,183,111,111,  2,224,185, 10,158,151, 61,167, 76,153,178,228,163,143, 62,170, 36,145, 72,136,197, 98,
-105,241,235,175,191,118, 31, 53,106,212,169,133, 11, 23, 54, 24, 48, 96,128,135,253,251, 15, 63,252,240, 41, 66,200,120, 74,233,
- 47, 15, 59,157, 12,  6,195,133,193,242,240,240,168, 94,169, 82,165,183,253,252,252,158,106,210,164, 73,238,171,175,190,122,253,
-218,181,107,103, 35, 35, 35,117, 63,254,248,227, 76,139,197, 50,191,102,205,154,219,243,242,242,102,223,185,115,231, 66,  5, 43,
-138,234,  0, 94,  5,240, 20,128, 48,  0,201,  0,254,  4,176,132, 82,122,233, 94, 50, 19, 26, 26, 90, 79,173, 86, 79, 34,132,180,
-208,106,181, 97,106,181, 58,153, 82,122, 52, 63, 63,255,139,148,148,148, 19,247,162, 25, 22, 22, 86, 21,192, 88, 65, 16, 98,109,
- 54, 91, 36,207,243,183,108, 54,219,126,155,205,246,109,114,114,242,149,123,209,108, 93,217,163,151,168,241,156,109,225,149,149,
- 11, 12, 86,169, 70, 46, 88, 36,162, 33, 65,212,230, 76, 57,122,187,224,183, 71,177,160,200,100, 50,110,197,138, 21, 13,100, 50,
- 25,  0,192,100, 50, 33, 38, 38,134,220,143,166, 68, 34,225,102,207,158,221, 72, 16,  4,152,205,102, 49, 63, 63,159, 62,251,236,
-179,255, 74,179, 53, 33, 36, 44, 46, 46,206, 75, 42,149,150,186,222,102,179,161,119,239,222,145, 82,169, 20, 11, 22, 44,176,100,
-102,102, 54, 92,186,116,233,137,249,243,231,251, 47, 91,182,172,127,105,  6,139,227, 56,255,178, 52,109, 54, 27,204,102, 51,172,
- 86, 43, 76, 38, 19, 58,116,232,192,106,163, 71,131,112,  0,216,114,218,  0,  0,190,247, 43,166, 84, 42,163,159,121,230, 25, 33,
- 61, 61, 29, 18,137,  4,102,179, 25,119,238,220, 65,181,106,213,248,141, 27, 55,214,172,168, 94,173, 90,181, 70,125,242,201, 39,
-  1, 91,182,108, 49,175, 92,185,210,216,185,115,103,233,136, 17, 35, 60,219,182,109, 27, 27, 22, 22,198,253,240,195, 15,198,157,
- 59,119,154,135, 14, 29, 42,159, 53,107, 86,192,159,127,254, 57,  8,192, 47, 15, 59,157, 12,  6,163, 28,131,229,225,225,177, 87,
-163,209, 84,123,229,149, 87, 46,189,246,218,107,219, 53, 26,141, 13,  0,126,254,249,103,161, 79,159, 62,233,207, 62,251,108,154,
- 78,167,227,231,207,159, 95,229,155,111,190,217,225,225,225,145,148,159,159,223,204,141, 11, 25,  1,240,  6,199,113, 99,187,118,
-237,186,215, 98,177,164,111,218,180,105,205, 51,207, 60, 19, 75, 41, 85,239,222,189,251, 15, 66,200, 34,  0, 95,186, 27, 29, 35,
-132,240, 81, 81, 81,211,194,194,194, 38, 44, 88,176, 64, 30, 21, 21,  5,165, 82,137,252,252,252, 42, 87,174, 92,169,252,198, 27,
-111,244,174, 90,181,234, 60, 47, 47,175,247,227,226,226, 44,110,106,146,144,144,144, 55, 61, 61, 61, 63,158, 53,107,150,162,118,
-237,218, 68,173, 86, 35, 62, 62,190,238,145, 35, 71, 98,150, 46, 93, 58, 34, 44, 44,108,122, 82, 82,146,219,233,108, 79,136, 96,
-168, 90,105,187, 79,173,102,237, 23, 46,249,158,248,171, 85, 16,  8,129,197,108,150,164,234,244, 81, 99, 70,143, 92,211,178, 70,
-208,193,124, 73,106,167,243,231,169,249, 95, 50, 26,114,  0,160,148, 26,  9, 33,191,243, 60,223, 71, 38,147,113,125,250,244,193,
-206,157, 59,137,193, 96, 16,  0, 64,161, 80, 88,251,244,233,  3,165, 82,  9,147,201, 36,  2,248,189,172, 72, 83,105,154, 18,137,
-132,235,208,161,131,238,216,177, 99, 89,118, 77,149, 74,101,233,208,161,131,159, 76, 38, 83, 90,173, 86, 90,158,230, 63,100, 34,
-113,237,218,181, 98,223,229,231,231, 35, 61, 61, 29,153,153,153, 48,153, 76,200,201,201,129, 40,138,196,104, 52,166,139,162,  8,
-142, 43, 12,182,149,165, 41,149, 74,113,249,242,229, 98,223, 89,173, 86,104,181, 90, 24,141, 70,152,205,102,232,245,122,165, 66,
-161,168, 30, 27, 27,155,  8, 96, 99, 65, 65,193,236, 83,167, 78,221, 98,213,211,191,194,237,223, 79, 26,170,  0, 48,  1,136,127,
-  0,231,147,  8,  0,251,247,239, 71,106,106, 42, 50, 50, 50,144,158,158,142,176,176, 48,220, 75,244,255,210,165, 75,115, 27, 54,
-108, 72, 78,157, 58,181, 25,192,146,213,171, 87, 63,147,149,149,181, 96,226,196,137,190, 95,124,241, 69,214,164, 73,147, 70,  3,
- 88,191,122,245,234,225,245,234,213,235,117,230,204,153, 57,255, 70, 58, 25, 12, 70, 57,243, 96, 81, 74, 67,170, 87,175,158,245,
-245,215, 95,215,154, 50,101,138, 95, 65, 65,  1, 95, 20, 37, 50, 16, 66,168, 78,167,227, 39, 79,158, 92,233,211, 79, 63,173, 37,
-151,203,179,173, 86,107,165, 82, 52, 74, 27,106, 57,214,211,211,179,119,124,124,252,234, 90,181,106,249,126,242,201, 39, 39,149,
- 74, 37,157, 59,119,110, 92,213,170, 85,131,111,221,186,181,220,211,211,179, 35,128,  9,101,164,235, 46,205,200,200,200,143,251,
-247,239, 63,225,224,193,131,242,250,245,235, 67,163,209,128,231,121,120,123,123,163,121,243,230,100,223,190,125,242, 30, 61,122,
-140,203,205,205,253,194, 93,205,144,144,144,119,187,119,239, 62, 51, 46, 46, 78,217,169, 83, 39, 34,147,201,144,157,157, 13,185,
- 92,142, 22, 45, 90,144,133,243,191, 83,214,173, 83,251,195,176,176,176,143,220,213, 52, 87,247,223, 49,232,245,201, 29,126,255,
-115, 27,  9, 12, 12,196,245, 47, 63,194,254,182, 49,184, 58, 99, 10,130,131,131,177,121,203, 86,210,235,133,215,219,120, 90,  2,
-119,187,171,121,191, 56,107, 18, 66, 94,  3,144,  5, 32,139, 16,242, 26,165,244,112, 76, 76, 76,220,133, 11, 23, 16, 27, 27,139,
- 53,107,214,212,159, 56,113,226,107, 19, 39, 78,124,109,205,154, 53,245, 99, 99, 99,113,225,194,  5,196,196,196,196, 57,247,149,
-114, 71,115,239,222,189,232,216,177, 99,246,154, 53,107,162,166, 78,157, 58,107,234,212,169,179, 86,175, 94, 93,181, 99,199,142,
-217,115,230,204, 49,150,167,249, 79,228,221, 57,178,228,188,136,226,255,175, 45,  1,  1,  1,105,191,255,254, 59,122,245,234,197,
-  5,  6,  6,166,244,233,211, 71,126,236,216, 49, 10,224,247,138,164,211, 96, 48, 64,175,215, 67,171,213,226,246,237,219,202,249,
-243,231,183,153, 48, 97, 66,181, 53,107,214,132,142, 27, 55,110,180,167,167,231,137,  6, 13, 26,132, 63,236,188, 51, 77,128,227,
-184, 59,  0,204,  0,180, 28,199,221,186, 31,205,126,253,250,213,141,136,136,  8,252,245,156, 15,178,165,181, 32, 74,189, 33, 74,
-189, 97,243,107,138,107,178,167, 16, 26, 26, 26, 24, 30, 30,222,178, 34,154,148,210, 29, 39, 79,158,124,138, 82,186,144, 82,106,
-163,148,174,157, 52,105,210,203,132,144,223, 38, 77,154, 52,146, 82,186,182,232,251,165,167, 79,159,238, 69, 41,253,235,223, 72,
- 39, 43, 75, 76,147, 81,142,193, 34,132, 88, 62,255,252,243, 35,223,127,255,253,206,148,148,148,224,168,168,168,167,159,121,230,
-153,240,220,220, 92,242,204, 51,207, 68,  6,  7,  7,247,220,187,119,111, 80,255,254,253,119,247,239,223,255, 48, 33,196,101,164,
-129, 16, 82,149,231,249,241,167, 78,157, 58, 80,165, 74, 21,115,114,114,178, 71,195,134, 13,243,  1,160, 70,141, 26,186,204,204,
- 76,165,151,151, 23,182,110,221,122,140, 16,242, 42, 33,164,150, 43,205,224,224,224, 70,126,126,126,111,124,252,241,199,114,158,
-231, 75,221, 70, 46,151,227,227,143, 63,150,123,122,122,190, 18, 26, 26,218,194,149,102, 80, 80, 80,109, 15, 15,143,247,190,249,
-230, 27,133,209,104,132,201,100, 66, 96, 96, 32, 52, 26, 13, 82,146,147,145,124, 51, 30,169,241, 55, 48,238,229,151,148,106,165,
-114,124, 72, 72, 72,  3, 87,154,177, 17, 30,125,212, 97,117,218,143, 25,251,  6,206,141, 27,142,157,161, 50,  4,141,157,140,250,
-123,206, 34,108,250,108,252, 21,229,137,184,231,186,224,205, 55,223,130, 52, 32,170, 85,171,202,154,129,255, 66,228,234, 11, 74,
-169,146, 82,170, 36,132,204,109,213,170,213, 74,165, 82,249,218, 39,159,124,210,109,251,246,237,221,247,237,219,215,222,106,181,
- 74,172, 86,171,100,255,254,253,177,  6,131, 65,144,203,229, 16,  4,129,186,171,217,178,101,203,159,148, 74,229,232,  5, 11, 22,
-116,251,235,175,191,134, 29, 63,126,252,117,155,205, 38,179,217,108,178,227,199,143,143,212,235,245, 18, 74,169,173, 44,205,135,
-141, 68, 34,129, 84, 42,133, 82,169, 68,195,134, 13,175,175, 90,181,202, 18, 28, 28, 44, 89,178,100,137, 79, 96, 96,160,122,217,
-178,101, 57, 57, 57, 57,159,185,171,103, 54,155, 97, 52, 26,161,215,235, 97, 48, 24,112,232,208,161,200, 17, 35, 70,  8, 38,147,
-201, 54,108,216,176, 44,139,197, 98, 28, 51,102,140,167, 70,163,121,155, 85, 79, 15,159,162,136,105,  1,  0, 45,165,212,104,255,
- 62, 34, 34, 66, 30, 26, 26, 90, 47, 34, 34, 66,238,174, 86, 65, 65,193,162,175,190,250, 42,140,147,123,227,128,169,  7,126, 17,
-167, 99,187,215,183, 72, 11,159,128,128,176,106,232,222,189,123,  0, 33,228,219,  7,144,230,141,148,210,254,148,210,117,247,242,
-251,127, 58,157, 77,155, 54,141,109,210,164,201,241,198,141, 27,167, 52,105,210,228,120,211,166, 77, 99,239, 55,207,207,197,144,
-206,195, 26,240,137,253,235, 16, 58,172,  1,159,248, 92, 76,197,231,106, 98, 48,254,105, 92,118,114,175, 84,169,146,233,221,119,
-223, 61,101, 48, 24,206,254,244,211, 79,213,134, 14, 29,218, 48, 60, 60,252,242,179,207, 62,251,135, 70,163,177,218,251,228,184,
-201, 75, 61,122,244,216,226,239,239,143,220,220, 92,193, 98,177,240, 90,173,150,  7,  0, 81, 20, 97, 48, 24,248, 27, 55,110,  8,
- 70,163,145,182,104,209, 98,211,225,195,135, 95,  5, 48,190, 60, 65,181, 90,253,218,226,197,139, 21,101,153, 43,155,205,134,252,
-252,124, 88,173, 86, 76,159, 62, 93, 49, 97,194,132, 55,  0, 28,113,113, 81, 29, 59,119,238, 92,185,213,106,  5,199,113,160,148,
-226,196,137, 19,200, 76, 75,131, 33, 63, 15,198,188, 92,152,243,114,193,107,243, 49,236,169,110,138,133,235, 54,188,  5, 96, 88,
-121,154, 38,185,230,211,159, 22, 47,133,205,102, 67,202,198, 95, 75,221, 38,235,224, 30,216,172, 22,124,242,217, 23,228,205,151,
-  6,124,  2, 96,245,191, 85, 48,228,114,185,176, 98,197,138,193, 50,153, 12,148, 82, 98, 50,153,176,125,251,246,251,214, 92,190,
-124,249, 48,187,166,217,108,166,117,235,214,189,171,121,205,104, 52,210, 71,229,  4,145,201,100, 80, 40, 20, 48,155,205,168, 82,
-165,138,190,119,239,222,135,230,206,157, 91,133,231,121,181, 32,  8, 91,115,115,115,103,157, 59,119,238,134,187,122, 69,157,135,
- 97, 50,153,160,215,235,113,251,246,237,160,208,208, 80,242,222,123,239,217,116, 58, 93,212,210,165, 75,175,253,250,235,175,170,
-111,190,249,230, 89,  0, 99, 89, 21,245,240,168, 86,173,154,204,211,211,211,171,138,159,160,149,240, 40, 72,163,212, 35, 34, 34,
- 34,220, 98,177, 60, 75,  8,105, 81,163, 70, 13,159,171, 87,175,102,135,134,134, 30,225, 56,238,151,132,132,132, 20, 23,198,135,
- 88,173, 86,140,108,150,131,215, 90,242,176, 88,114,145,155,155,139, 91,183,110,225,252,249,243, 56,122,244,220, 61,165, 51, 50,
- 50,242, 37,133, 66,209, 85, 38,147, 69,216,108, 54, 78,167,211,221, 50, 26,141, 59,147,147,147, 23,209,162,  9,138, 42,104,208,
-254,145,116, 58,233,207,126,230,153,103, 66,188,188,188,112,242,228,201,144,211,167, 79,207,  6,208,228,190,206, 75,129,251, 97,
-198,151,223,134,  6,251,123,227,220,193,205,161,115,150,252,250,  3, 10,251,242, 50, 24,255, 29,131,101, 71,161, 80,216, 70,141,
- 26,117,121,211,166, 77, 17, 77,154, 52,185, 88, 86,103, 96, 23,180,142,142,142,190,117,232,208, 33,248,250,250,154, 45, 22, 11,
-111, 48, 24, 56,169, 84, 74,179,178,178,136, 94,175,231, 78,159, 62,173, 72, 76, 76,148,250,248,248, 72,  0, 52,114, 35,194,208,
- 50, 50, 50,178,116, 83, 99, 50,161,160,160,  0,249,249,249, 48, 26,141,  8, 12, 12, 36, 28,199, 53,119, 25,214,227,184, 54, 53,
-107,214, 36,217,217,217,  8,  9,  9,193,193,131,  7, 81,144,147,  3, 67,126, 30, 76,121,185, 48,231,230,192,146,155,131,156,180,
-100, 68,  4,135,145,162,169,  5,202,197,202, 43,195,  3, 52,106, 92,157, 49, 25, 77, 79,220,  2,145, 72,113,172,110, 48,168,165,
-176,171, 85,179, 51,201, 32, 82, 25, 46,142,123, 17,129, 67, 95,129,133,147,135, 62,228, 59,119, 35, 33,100, 34,199,113,115,229,
-114,185, 48,122,244,104,164,164,164, 20, 51, 63,163, 71,143,118,244,185,106,219,182,237,126,133, 66, 97, 77, 79, 79,135,209,104,
-148,184,163, 25, 17, 17,113,235,253,247,223, 63,102, 50,153,194, 66, 66, 66,188,141, 70,163,190,102,205,154, 33, 74,165, 50,208,
-100, 50,217,154, 52,105,178, 72,169, 84, 90, 10, 10, 10,168,213,106, 37,143,194,  9, 66,  8,  1, 33,  4, 86,171, 21, 86,171, 21,
-222,222,222,218,204,204,204,163,215,175, 95, 31,124, 47,122, 22,139,  5, 22,139,197, 17,197, 18, 69, 17,103,206,156,129, 66,161,
-144,136,162,120,206,102,179,169, 36, 18,  9,120,158,103,115,212, 61, 68, 26, 55,110,220,190,126,160,231, 87,163, 67,140,222, 85,
-123,169,181, 42, 25,175,253, 34, 83, 25,241,199, 79,218,213, 61,123, 12,244,152, 48, 97, 66,184,175,175,175,226,198,141, 27,134,
- 57,115,230, 68,174, 95,191,158,  0,248,178, 60,205,228,228,228,223, 62,253,244, 83,223,246,237,219, 71, 73, 36, 18,146,147,147,
-131,244,244,116,164,165,165,225,246,237,219,244,230,205,155,215,173, 86,235,154,138,164,179,126,253,250, 75,135, 14, 29,250,124,
-157, 58,117, 36,148, 82,152,205,102,232,116,186,134, 71,143, 30,237,125,224,192,129, 88,  0, 21, 46,151, 41, 41, 41,107, 62,251,
-236, 51,117,187,118,237,106, 73, 36, 18,238, 65,164,179, 68, 61, 16,162,209,104,176,115,231, 78,120,123,123,195,213,104, 93,119,
- 48, 90,196,208,160,  0, 63, 24, 14,126,133,234,190,225, 48, 90,196, 80, 86,138, 25,255, 89,131,149,158,158, 46,211,106,181,130,
- 40,138,124,110,110,174, 74,165, 82, 89,101, 50,153,169,130,255, 87,167,119,239,222,199,154, 55,111, 94, 80, 20,209,176,  4,  4,
-  4,152,115,115,115, 33,138, 34, 68, 81,180,122,122,122, 22, 88, 44, 22, 68, 69, 69,113,  0, 92, 54, 17,234,245,250, 42, 74,165,
-242,174,239,117, 58,157,195, 92, 21, 20, 20, 64,167,211,193,203,203, 11, 90,173,214,229,201,109,179,217, 34, 84, 42, 21,146,147,
-147,  1,  0,249,217, 89, 48,230,229,193,148,255,127,115,101,203,201,134,168,215,194, 59,172, 50,172, 86,107,101, 87,154, 90,163,
- 77,198,131, 34,109,243,111,  8,124,109, 98,153,219,101, 31,216,  3,143,234,209,208,235,205, 15,125,142, 50, 74,233,252,134, 13,
- 27, 54, 90,191,126,253,136,164,164,164,187,214,247,237,219, 23, 99,199,142,197,152, 49, 99, 46, 62,253,244,211,167, 55,111,222,
-140,215, 95,127, 29,162, 40, 54, 32,132,228, 82, 74,255, 44, 79,115,202,148, 41,199, 19, 18, 18,246, 92,185,114,101,116, 64, 64,
-128,188, 94,189,122, 87,235,213,171,199,175, 95,191, 62,240,149, 87, 94,137,235,222,189,251,205, 93,187,118,249,238,220,185, 83,
- 33,138, 98, 99, 66, 72,210,191, 61, 15,150,189,137,216,100, 50,193, 96, 48,192,108, 54,195,102,179,145, 10,236,211, 98,159, 69,
- 81,116,152, 53,163,209,  8,139,197, 66,118,236,216,142,205,155, 55,115, 23, 46,156, 15,155, 50,229, 29,228,230,230,194,102,179,
-177,218,233, 33,208,164, 73,147,167,  4, 42, 46, 30, 26,100, 85, 12, 14,180,106,165,132, 22, 92, 89,252,126, 65,124,184, 70,235,
-233,207,155, 60,253, 36, 33,147,167, 76, 14,190,126,237,186,241,243,207, 63,191,208,179,103,207,128, 87, 94,121,165,246,150, 45,
- 91, 98,171, 84,169,242,253,237,219,183,115,202, 48,230,210, 17, 35, 70, 28,245,246,246,174,186,114,229,202,180,164,164, 36, 31,
-139,197,162,178, 88, 44,102,131,193,112,205,108, 54, 31, 48,153, 76, 59, 83, 82, 82,226, 42,146, 94,141, 70, 83,127,192,128,  1,
-146,156,156, 28, 20,141,190, 69, 90, 90, 26, 26, 53,106,196,239,218,181,171,206,189,236,131,243,231,207,127, 21, 18, 18,178,103,
-211,166, 77, 93,213,106,117, 99,153, 76, 22, 36,138,162, 77,175,215,167, 26, 12,134, 83,247,146,206, 18,251, 34,249,196,137, 19,
- 33,158,158,158, 72, 72, 72,  0, 33, 36,249,126,143,155, 66,202, 37, 92, 56,176,169,114,117,223, 72, 28, 61,114,  4, 10, 41,151,
-192, 74, 51,227, 63,101,176,242,243,243,133, 19, 39, 78,248, 36, 36, 36,104,252,253,253, 13,181,107,215,206, 37,132,136, 28,199,
-209,148,148, 20,223,248,248,120,133,159,159,159,182,106,213,170, 89,110,254,223,149,113,227,198,197, 78,157, 58, 53,174, 75,151,
- 46, 25,  0,144,157,157,141,204,204, 76,164,167,167,195,108, 54, 35, 57, 57,153, 59,126,252,184,239,214,173, 91, 27,  2,112,217,
-244,162, 84, 42,111,231,231,231,215,244,246,246,118, 92,208,236,166,202,217, 96,217,163, 89,106,181,218,229,201,205,113, 92, 82,
- 82, 82, 82, 53,131, 94,143,219, 87,175,194,152, 95,216, 36,232, 48, 87,185, 89, 64, 65, 62,212, 10,  5,242,179, 50,193,243,252,
- 29, 87,154,106, 57,111,178, 88,109,178, 74,221,123,  3,164,236,235,179, 87,179,214, 16,107,213,131, 82,185,214,242,111, 20,  8,
-142,227,108,229, 53,251,202,100, 50,  4,  6,  6,138, 45, 90,180,192,235,175,191,110, 55,  2,132, 16,210,158, 16,114,128, 82, 90,
- 80,150,166, 40,138,220,133, 11, 23,158,185,118,237, 26, 47,145, 72,184,230,205,155,199,180,105,211,198, 36,147,201, 32,149, 74,
-133,130,130,  2,143,157, 59,119, 42, 44, 22, 11, 41,210,124,104,243, 96,  1,133,163,251, 74, 49,240,208,106,181,208,235,245, 40,
- 40, 40, 64, 78, 78,142,160, 84, 42,107,182,109,219,246,136,209,104, 92, 99,179,217,126,136,139,139,203, 43, 75,211,108, 54, 23,
- 51, 91,162, 40,130, 82, 10,155,205,  6,139,197,  2,137, 68, 34,110,218,180, 25,223,204,159,139,181,171,215,209,206,157, 59,147,
-173, 91,183, 66, 20,197, 68, 86, 61,253,243,136,162, 56,251,175,201,253, 20,176,218,180,198,189,171, 10,182,101,  9,218,239,207,
-253,117, 92, 47,112,121, 85,106,163, 94, 68,229,170,188,151,167, 23,183,108,249,226,204,173, 91,118, 95, 75, 76, 76,204,155, 49,
- 99, 70,203,168,168, 40,175,203,151, 47,135,  2,200, 41,195,  8, 69, 12, 31, 62,124,120,118,118,182,116,201,146, 37,203,146,146,
-146,246, 82, 74,175,151, 48, 30,141,  8, 33, 95,  0,144,  0,  8,  4, 96,  5,176,131, 82,186,188, 28,179, 34, 18, 66,240,215, 95,
-127,221, 53,218, 79,116, 30,145, 81,241, 40, 86,118,243,230,205,235, 95,185,114,101, 99,118,118,246,202,146,235, 85, 42, 85,239,
-152,152,152, 65,199,142, 29,251,128, 82,122,173,130, 55,110,227, 47, 92,184,240,185, 40,138,225, 28,199,221,162,148, 78,122,  0,
- 17,172,151,231, 44, 89,189,196, 96,182, 85, 81, 72,249,219, 70,139,248, 10, 43,205,140,255,140,193,178, 90,173,154,247,223,127,
-191,101,131,  6, 13, 82,218,182,109,123, 39, 50, 50, 82,103, 95,231,225,225,161,247,243,243,211, 27, 12,  6,229,173, 91,183,130,
- 55,108,216, 80,195,102,179,169,220,248,191,221,222,222,222,190,199,143, 31,247,251,229,151, 95,170,159, 56,113, 34,124,200,144,
- 33,237, 76, 38, 19,140, 70, 35,110,220,184, 17,190,120,241, 98, 81, 42,149,230, 16, 66,254,  6,224,242, 54,222, 98,177, 28,190,
-114,229, 74,141,230,205,155, 19,139,197,226, 48, 84,206, 38,171,160,160,  0, 82,169, 20,201,201,201, 84, 20,197,163,110,164,243,
-200,241, 99,199,170,213,173, 29, 13, 99,110,118,145,185,202,133, 53, 55, 27, 98,110, 22, 56,109,  1,252,124,  5,168, 20, 26, 92,
- 78, 78, 65, 81, 90,203, 69, 98,213,223, 76,202,205,171, 89,109,218,151,248, 43,202, 19,212, 98,118, 52, 11,  2,112, 52, 23,182,
-186,152,142,253,135, 14, 67,176, 25,147, 30,213, 66,115,250,244,233,180, 33, 67,134,196,137,162,216,  8,229, 76, 81, 80,206, 93,
-120,126, 65, 65,  1, 50, 50, 50,108,153,153,153,  6,  0, 72, 75, 75,203,222,180,105,211,  5, 81, 20,155,221,139,230,131,192, 98,
-177,220, 21,125,178,217,108,176, 90,173, 48,155,205, 72, 79, 79,151, 29, 56,112,160,237,145, 35, 71,164,231,207,159,199,145, 35,
- 71, 26,108,216,176,225,157,232,232,232,122, 23, 47, 94,188,227,202,180,145,210,141, 53, 15,  0,155,214,255,142, 65,131,  6,145,
-140,140, 12,108,216,176,225,129, 52,163, 48,220, 66, 11,171, 77,105,218,187,170,224,237,171,242,252,115, 58,126, 70, 92, 92,220,
- 54, 74, 41,237,209,163,199,233,154,181,162,252,  1, 64, 46,211,  4,213,173, 91,183,157,143,143,143, 12,  0, 66, 66, 66, 26, 91,
- 44,150,249,  0,218,148, 38,218,183,111,223, 86,  1,  1,  1, 13,255,252,243,207, 83, 73, 73, 73,251, 74,154, 43,  0,168, 89,179,
-230,244,179,103,207, 62, 37,145, 72,136, 83, 25,161,  0, 74, 53, 88,253,250,245,171, 25, 22, 22,230,183,229,138, 23,242,164,213,
- 64,249, 92, 64, 80,192,230, 93, 31,183,164,181, 17, 20,116,201,175, 90,181,106, 13,174, 93,187,118,170,130, 17,166, 42,  3,  6,
- 12,248, 99,233,210,165,209,221,187,119,151,  1,184,203, 96, 69, 71, 71, 63,187,107,215,174,254,163, 71,143,174, 79,  8,233, 69,
- 41,189,234,174,126, 92, 92,220, 65,  0, 45, 31,228, 65, 91,115,142,238, 68,209,156,101, 12,198,127,206, 96,153,205,230, 29, 87,
-175, 94,109,218,175, 95,191, 12,103,115, 69, 41,117, 84,  6, 94, 94, 94,122,127,127,255,172, 83,167, 78, 85, 18, 69,113,175, 27,
-255,183,100,215,174, 93,127,205,155, 55,111,149,175,175,175,101,216,176, 97,220,228,201,147,247,103,102,102,210,204,204, 76,124,
-251,237,183,109, 99, 99, 99,247,223,186,117,203, 22, 23, 23, 55, 28, 64,119,151,181,163, 86, 59,255,245,215, 95, 31,180,127,255,
-126,133,125,158,162,146,209, 43,139,197,  2, 65, 16, 48,127,254,124,163, 86,171,157,235, 70, 36, 99,209,119,223,125,215,127,241,
- 55,243, 20,188,217, 12, 75, 78, 22,172,185, 57,176,229,100,129,211,105,225,161, 32,168,222,168, 18,178,147,228, 88,177,237,160,
-222,106,181,126,231,210, 96, 25, 10, 38,142, 30,249,234,239, 59,118,255,  5,223, 54, 29,145,249,215,214,187,163, 67,149,  2, 97,
- 50,155,241,241, 71,211, 40,209,231, 76,254,151,238,232,121,147,169,236,150, 95,147,201,  4, 81, 20, 19,207,159, 63,191,154, 16,
-146, 79,  8,105, 95,180,106, 79,105,209, 43,103, 77,142,227,196,218,181,107,175, 15, 12, 12,124,  6,128,182,118,237,218,235,229,
-114,121, 71,147,201,212, 92, 20,197,196,147, 39, 79,174, 35,132,220, 33,132,244, 44,250,233, 67,157,  7,203, 98,177, 96,234,212,
-169,248,244,211, 79, 49,101,202, 20, 71,126,237,205,132,102,179, 57,114,251,246,237,210,131,  7, 15,210,159,126,250, 41,243,185,
-231,158,243, 30, 50,100,136,247,138, 21, 43,198,  3,152, 84,150,230,164, 73,147,176,112,225, 66,140, 26, 53,234,110,119,197,243,
- 98, 82, 82, 34, 76,102, 19, 93,190,124,121,178, 32,  8, 62, 95,127,253,181,114,194,132,  9,132, 85, 79,255, 60, 54,155,237,189,
-214,179, 55,188, 73,136,210,108,181, 90,231,158, 62,125,114,143,211,141,128,114,246,151,179,  5,  0,248,242,139,217, 18, 74,169,
-151,125, 98,216, 25, 51,102, 40, 70,142, 28, 25, 80,150,238,218,181,107,115,102,204,152,225,247,242,203, 47,119,223,179,103,143,
-138, 16,178,  5,192,223,  0, 50,138,110, 28,253,  1, 28,172, 84,169, 82,240,234,213,171,171,117,237,218, 85,237, 70, 93,247,253,
-130,  5, 11, 34,102,239,243,192, 22,237, 51, 72, 16,159,  3,245,166,240, 13,200, 71,109,205,109,116,  8, 77, 10, 89,185,114,229,
- 18,  0,141, 43, 96,174,234,244,235,215,111,195,210,165, 75, 35, 95,125,245,213,196,131,  7, 15, 38, 16, 66,166,151,178,105,230,
-139, 47,190,120,107,217,178,101,213, 68, 81,220, 70,  8,233, 78, 41,189,194, 74, 16,131,113,111, 17,172,151,  8, 33, 49, 83,166,
- 76,249, 60, 36, 36,164,202,180,105,211,226,107,215,174,173,117,156,109,153,153,154,189,123,247, 70,229,229,229,229, 91,173,214,
- 97,148,210,211,165,156,188,157,157,231,202,160,148,222, 34,132,124,222,160, 65,131, 65,191,254,250,235, 94, 15, 15,143,188, 35,
- 71,142,120,122,122,122,230, 94,184,112, 65,205,243,188, 46, 62, 62, 30,219,183,111,111, 11,224,155,210,238,146, 74,106,166,164,
-164,156,136,138,138,154, 59, 97,194,132, 55, 62,248,224,  3,  5,165, 20, 58,157, 14,121,121,121, 48, 26,141, 16,  4,  1,132, 16,
-172, 90,181,202,104, 52, 26, 23, 39, 37, 37, 29,113,165,153,156,156,124,184,114,229,202, 63,204,157, 51,231,229, 87,  6, 13,148,
- 33, 55, 19, 57, 41, 73, 32,186,  2,104,148,114,196,116, 10,131, 54,147, 96,233,222,191, 77, 89, 70,243,234,164,164,164, 61,174,
- 52, 15,220,206,255,163,101,141,128, 93, 51,102, 76,235,244,206,143,235, 32,138, 34, 46,190,254, 60,178,247,237,128,170,118, 61,
-180,186,152, 14,147,201,132, 41,147, 38,128,215,165,238, 63,114,187, 96,173, 43,205,  7,129,179, 38, 33,228, 53, 66,200,243,209,
-209,209, 24, 61,122, 52,250,246,237, 91,108,219, 13, 27, 54, 96,193,130,  5, 48, 26,141,207, 19, 66, 78, 80, 74,231, 19, 66, 14,
- 20, 29,219,  2, 87,154, 17, 17, 17, 77, 99, 98, 98, 16, 18, 18,162, 43, 50, 23, 93,206,159, 63,223, 56, 58, 58,186,164,230,223,
- 69,154,214,135,149,119, 74,105,246,213,171, 87, 61,191,248,226, 11, 98, 54,155, 49,125,250,116,216,141,166,189,229,229,221,119,
-223, 13,209,104, 52,248,242,203, 47, 77, 25, 25, 25, 29, 23, 44, 88,176,123,222,188,121,254,171, 86,173, 26,108, 55, 88, 37, 52,
-211, 46, 92,184,224,177,112,225, 66,206,106,181,226,171,175,190,186,171, 25,114,252,248,241, 48,155, 45, 16,120,193,100,208, 27,
-234, 40, 20,138,107, 62, 62, 62, 74, 81, 20,233,195,202,251,147,172,121,250,244,233, 29,  0,118,184,243, 59,131,193,128,244,244,
-116,100,100,100,160,168, 75,  2, 41, 43,157,  6,131,225,228,164, 73,147,226, 22, 45, 90,212,253,224,193,131,253,247,237,219,215,
-125,231,206,157,134, 91,183,110, 89, 45, 22, 11, 13, 14, 14, 22,218,180,105,163,232,209,163,135, 90, 46,151,115,239,189,247, 94,
-198,204,153, 51,253,  1,100,150, 83,127,242,148, 82,188,221, 54, 31,147, 58,240, 48,153,204,200,201,201, 65, 82, 82, 34,206,159,
- 63,143,195,135, 47,130, 82,202, 85,112,127,206, 93,185,114,101,148, 76, 38, 35,171, 86,173,170,178,106,213,170,113,174,246,195,
-242,229,203, 35, 86,173, 90, 53,191, 72, 75,100,101,137,105, 50, 42,104,176,138, 78,232,115,  0,186, 19, 66,218,188,250,234,171,
-159, 69, 71, 71, 27,173, 86,171,100,219,182,109,181, 50, 50, 50,100, 86,171,117, 18,165,116, 95, 69,254,144, 82,186,144, 16,130,
- 62,125,250, 76,170, 90,181,234,174, 19, 39, 78,212,239,221,187,247,182,245,235,215,183,177, 90,173,215,207,158, 61,251, 60,128,
-185,  0,190,113, 87, 51, 62, 62,254,253,157, 59,119, 90,143, 28, 57,242,246,228,201,147,229,  1,  1,  1,196,199,199,  7,201,201,
-201, 72, 76, 76,164, 63,254,248,163,209,104, 52,126,227,229,229,245,190,187,154, 50,153,236,237,125,199,227,200,229,107,215,134,
-191,244, 84, 87, 69,229, 26, 53,161, 33, 53,145,159,153,129,125,123, 82,177,236,239, 83,134, 84,131,233,103,158,231,221, 30, 74,
- 31,122, 53,189,219,142, 95,150,254,185,103,215,238,206,179, 62,253,156,132, 12,125, 25,234,136, 72,136, 17,213,177,119,207, 30,
-204,156, 49,157,242,  5,169,251, 44,215, 82,187, 60,236,130, 96,159,179, 74, 20, 69,  1,  0,148, 74, 37,198,142, 29, 11,231, 71,
-227, 44, 88,176,  0,122,189, 30,  0,  4, 66,200, 23,132,144, 31,202,138, 90,149,161, 89,101,203,150, 45, 85,156, 53,163,163,163,
- 75,211, 52, 62,236,252,167,166,166,190,255,226,139, 47,126, 34,145, 72,188,203,218, 70,173, 86, 35, 63, 63, 31, 54,155,205,230,
-235,235,123,201, 30, 25, 45,235, 60,210,106,181,239,143, 26, 53,234, 99, 66, 72,153,145, 14,165, 82,121,235,192,129,  3,213,135,
- 12, 25,194,173, 94,189,250,198,224,193,131,229,  7, 14, 28,176,  1, 88,199,170,167, 71, 11,231,  1, 11, 90,173, 22,  0,104, 57,
-219,222, 38,132, 76,138,139,139, 83,140, 26, 53,170,241,208,161, 67, 61, 59,116,232,160,113,222, 70,175,215,139,155, 55,111,214,
- 46, 92,184, 48,115,223,190,125,127,143, 24, 49,226, 25, 20,206, 32, 95, 42,201,201,201,127,124,243,205, 55, 94,237,219,183,175,
- 97,179,217, 28,253,175,210,211,211,145,152,152,136,155, 55,111,222, 18, 69,113, 83,  5,179,245,250,144, 33, 67,182, 44, 91,182,
- 44,252,213, 87, 95, 77,252,229,151, 95, 54,  1,200, 45,101, 59,205,179,207, 62,219,123,217,178,101,225, 35, 71,142,188, 13, 96,
- 28,155,225,157,193,184, 15,131,229, 84, 89, 28,  0,208,146, 16,210,135,231,249,137,  5,  5,  5, 95, 81, 74, 55,222, 71, 69,181,
-144, 16,178,237,234,213,171, 47,  3,104,242,213, 87, 95,189,  3, 32,  1,133, 33,244,174,165,245, 87,112,161,103,  3,240, 65,104,
-104,232,111,211,167, 79,127, 32,207, 34,188,118,237,154,  9,192,235, 33, 33, 33,191,124,242,203,218,247, 41,165,141,120, 42,250,
-217,  8,151,205,113,220, 73,155,205, 54, 51, 49, 49,113,111, 69, 52,215, 20,166,179,107,139, 42, 30, 61, 39,141, 28,242,185, 85,
-162,140, 40, 48, 88,101,106,185, 96,146,218,140,183, 56,125,246,123, 71,110, 21, 60, 18, 23, 86,163,209,104,125,230,153,103,190,
-231, 56, 78,  4,  0,155,205, 38, 24,141,198,225,168,192,200,211,210, 52,251,246,237,251, 35,207,243,214,162,200, 16,103, 52, 26,
- 95,186, 31,205,  7, 69, 70, 70, 70,  1,128, 49,229,109, 19, 27, 27,187,226,207, 63,255, 28,210,165, 75, 23,219, 31,127,252,145,
-246,244,211, 79, 11, 39, 78,156,160,132,144, 82,239,226,110,222,188,105, 68, 25, 79, 36,176,211,160, 65,131,240, 31,126,248,225,
-196,203, 47,191,236, 57,127,254,124,223, 99,199,142,217,150, 46, 93,154, 87, 80, 80, 48,155, 85, 79,143, 22, 18,137,  4, 42,149,
- 10, 38,147,  9,233,233,233,112,213,167,156, 82,122,141, 16,242,244,196,137, 19, 99, 39, 78,156,248,116, 88, 88, 88,157, 42, 85,
-170, 84,225, 56,142, 75, 73, 73, 73, 79, 72, 72,184,105, 54,155,119,  1,248,  3,128,180,106,213,170, 39,  1,172, 40, 75,239,252,
-249,243, 31,135,132,132,252,181,126,253,250,167,229,114,121,109,153, 76,230,107,181, 90,185,130,130,130, 44,179,217,124,193,104,
- 52,254,158,156,156,124,168,130,117,231,101, 66, 72,  7, 65, 16,254, 88,186,116,105,116, 74, 74, 74,196,222,189,123,123,149,220,
-174,113,227,198,203,150, 45, 91, 22, 62,122,244,232,107,171, 86,173,170, 80, 31, 44,  6,131, 25, 44,247, 78,198,141,  0, 54, 62,
-136, 63,166,148,222,  2,240,126,209,242, 64, 72, 74, 74, 58,  3, 96,200,131,220, 65,201,201,201,  7,  1,116,  3, 10,103,115, 78,
- 40,188,104,222, 23, 71,110,231,255, 14,167,199,171, 60, 34,119,231, 70, 66,200,196,162, 81, 77,  0, 48,241,228,201,147,243, 75,
- 68,164, 78, 59,175,119, 21,105, 42, 77,243,212,169, 83, 37, 53,207, 86, 68,243,223, 36, 59, 59,251,141,101,203,150, 29,123,253,
-245,215,229,  3,  6, 12,192,197,139, 23,241,221,119,223, 25,179,179,179, 87,221,171,230,169, 83,167,110, 53,104,208,160,209,146,
- 37, 75,222, 94,188,120,113, 31, 66,  8,123, 22,225, 35,130,193, 96,184, 62,104,208, 32,112, 28, 71, 40,165,212,106,181, 58,  6,
- 61, 20,205,103,118,221,141,243,202, 10,224,175,162,197, 21, 95,184, 81, 31, 29,  6,112,248,  1,159,251,183,  9, 33, 79,223,188,
-121,115,214,229,203,151,183,150,182,205,185,115,231, 54,116,237,218, 85,117,248,240,225,119, 43, 58,138,144,193, 96,  6,139,225,
-146,155, 15,192, 92, 61,202, 20,245,127,250,193,110,142, 42,186,254, 97,105,254, 91,156, 63,127, 62, 27,128,227,145, 33, 81, 81,
- 81,232,217,179,231,125,235, 22,153,169,177, 96, 51,183, 63, 82,108,218,180,233,169, 39, 37,175,148,210,219,229,221,156,154, 76,
-166, 77,  0, 54,177, 82,193, 96, 48,131,197,184,247,138,214,120, 63,235, 31,150, 38,131,193, 96, 48, 24,143, 50,  4, 64,231, 50,
- 46,122,110,143, 14, 32,164,226, 15,218,116,165,207, 52,153, 38,211,100,154, 76,147,105, 50,205,199, 79,211,149,246, 99, 51, 58,
-145, 82,250,143, 45,  0, 58, 51, 77,166,201, 52,153, 38,211,100,154, 76,147,105, 62,105, 11,123,160, 44,131,193, 96, 48, 24, 12,
-198,  3,134,245,193, 98,252,231,120,238,185,231,248,138,108, 31,239,237,205,229, 38, 86,153,173, 81,201,123,233, 12,198,217, 87,
-255,120,247,155,199, 97, 63,  4,  7,  7,215,242,244,244, 28,  6,160,142, 78,167, 11, 80,169, 84,105,  0,206,231,229,229,173, 72,
- 73, 73,185,196, 74, 10,131,193, 96, 60,226,  6, 75, 38,147,197, 80, 74, 71, 16, 66,130,  8, 33,119, 40,165, 63,152, 76,166,115,
- 79,218,206,146,201,100, 49,132,144, 17,148,210, 32, 74,233, 29, 66,200,191,188, 31,  8, 89,251, 92, 97, 20,178,255, 26,136,  0,
-165,172, 72,151, 98,174,146,170, 44, 30,222,167,233,139,147, 71,116, 64,163,  1, 95, 77, 66,  5, 38,177,125, 20, 33,132,240, 81,
- 81, 81,175,135,135,135, 15, 92,180,104,145, 52, 42, 42, 10, 10,133,  2,122,189, 62,248,250,245,235,193,163, 71,143,110, 87,181,
-106,213,213, 55,110,220,248,174,104,142, 56,  6,131,193, 96, 60, 42,  6, 43,162,114,229,  1, 28, 79,230,153, 45, 54, 31,111,111,
-111,238,219,111,191,229,122,245,234,133,223, 55,111,198,216,177, 99,199,133,134,134,136, 82, 65,200,166,162,117,220,205,132,228,
- 95,221,249,179,103,159,125, 54,213, 98,177,148, 57,171, 53,207,243,105, 27, 54,108,  8,188,223, 76,133, 54, 30,144,106, 49,155,
-203,252, 31, 65,144,164, 37,159, 92,227,214,255, 84,174, 28, 50,128, 39,220, 60,139, 77,244,241,241,241,225,190,249,230, 27,174,
- 87,175, 94,216,188,121, 51,198,140, 25, 51, 46, 44, 52, 84,148, 74,248,108,209, 70,199,221, 76, 72,248,245,225, 29, 58, 66,214,
-174,  5,135,254,133,159,214,174,  5,215,191, 63,121,162, 77, 86, 70, 70,  6,  1,  0,127,127,127, 90,204, 92,245,110,250,226,123,
-175,118,194,204,197,187,160, 55,154, 86,254,215,243, 25, 21, 21,245,250,115,207, 61, 55,240,227,143, 63,150,114, 92, 97, 43,191,
- 86,171,133, 94,175, 71,104,104, 40,246,236,217, 35,125,255,253,247,  7,110,216,176,  1,  0,230,177,106,142,193, 96, 48, 30, 33,
-131, 69, 56,204, 95,181,232, 11,159,204,172,108,252,178, 97, 27,162,163,163,113,254,252,121,212,138,142, 70,108,179,  6, 92,215,
- 86,245, 57,129,144, 74, 31,124,179,124, 62,  0,183,140,133,197, 98,  9, 88,191,126, 61,  8, 33,176,217,108,176,217,108,246,  9,
-251, 80, 80, 80,128,113,227,198,  5, 60,136, 76, 89,204,230,128,235,127,175,131,132, 39,176,218, 40, 44, 54, 10,179, 85,132,217,
- 74,145,167,179,162,227,211, 67,220,254, 31, 14,220,252, 31,191,249,210, 39, 59, 39,  7,235,255,220,233,216, 15,209,209,209,232,
-216,186, 25,247,220,211,237, 56,181, 66, 94,233,149,201,159,184,189, 31, 30,  4,107,159,251,191,185,114,254,174,255, 26, 60, 81,
- 17,139,139, 23, 47,242, 70,163,113,144,167,167,103, 11,137, 68, 18,168,242, 14, 22,115,164, 85, 51,181, 36,232,134, 89, 43,107,
- 59,162,111,181,238,239,190,220, 30, 51, 23,239,194,143,155,254, 94,230, 21,154, 48,245,191,156,223,224,224,224, 90,225,225,225,
-197,204,149,253,161,230,121,121,121,200,207,207,  7,199,113,152, 52,105,146,116,239,222,189,  3,131,131,131,119,178,230, 66,  6,
-131,193,120,132, 12,150,201, 98,243,  9,242,243,198,143, 63,252,136, 73,239,204, 64,173, 90,181, 64, 41,  5, 33,  4,239, 76,157,
-142,175, 63,154,130,129, 79,181,131,197, 42,250,148,165, 81,218, 80, 75, 66,  8,226,227,227, 97, 48, 24,160,215,235, 29, 75, 76,
- 76,140, 91,  9,118,119,248,166,132, 39,248,227, 68,126,161,177,178,136, 48, 91, 69, 88,172, 34, 58,196,120, 84, 72,211, 98, 19,
-125,188, 60,212, 88,188,112, 62, 38,125,244, 69,177,253, 48,249,221,247,241,221,103, 31, 96,252,168, 23, 96,178,216,124,238, 37,
-157, 21,129,105, 22,231,208,161, 67,193, 42,149,234,171, 33, 67,134,132,140, 27, 55, 78, 70,  5,181,176,237,232, 45,175, 47,127,
-216, 21, 98, 48,153,249,167,219, 84,197, 75,125,155, 96,230,146,191,138,204,213,237, 87, 35,115,114,196,255,114,222, 61, 61, 61,
-135, 45, 90,180,232, 46,115,149,154,154,202, 21, 20, 20,192,108, 54,139, 69,207, 75,196,148, 41, 83, 36,239,191,255,254, 48, 66,
-200, 71, 69, 58, 70, 86,150,152, 38,211,100,154,143,170,230, 19, 99,176,  0,192,108,212, 35,166,138, 47, 22,206,254, 24, 34,229,
- 64, 65, 65, 69, 10, 74,109,136,244, 87,195,168,211, 86,248, 15, 69, 81,132,197, 98,129,217,108,198,162, 69,139, 80, 80, 80,  0,
- 81, 20, 81,187,118,109,  0, 64,227,198,141,157,155,184,110,199,197,197,133,187,210, 12,168,215,247, 22, 40,170, 56,127,247,225,
- 23,223,227,208,201,235, 16, 69, 64,174, 84,161,255,176,145,176,218, 40, 76,150,138, 63,159,212,168,215, 33, 68, 35,193,156, 89,
- 83, 65,  4,  9,120, 66, 64,  8,  1, 71, 68,212, 10,245,134,201,160,123,232,  7,174,255, 26,136,107,215, 22, 31,  5, 90,216, 15,
-235,201,137, 92,169, 84,170,175, 86,172, 88, 17,222,180,105, 83, 14,  0,142, 93,201,150,127,249,195,174,144,239,167, 61, 67, 26,
-213, 10, 66,102,174, 30, 51,151,238,197,238, 19,201, 91, 75,154,171,255, 48,117,162,162,162,138,153,171, 47,191,252,210,127,254,
-252,249,161,  0,208,175, 95,191,164, 78,157, 58,101, 92,190,124, 25,193,193,193, 36, 35, 35,227,105,  0,111, 20,221,220, 76,164,
-148,206,103,213, 30,131,193, 96,252,203,  6,203,100,212, 35,204, 91,134, 32,141,  0,139,197,138,243,150, 16,228,235, 12, 48,155,
- 45,184,109, 54,227,198,169, 59,104,221,186, 53,158,121,230, 25,155,217,108,134, 84, 42,205, 93,191,126,189,175, 43,131,101, 54,
-155, 97, 54,155,161,213,106,177,114,229, 74,  8,130,224,120,112,170,243, 19,235, 91,181,106, 85,197, 61, 43,141, 42,215,142,253,
-  6, 15,  5, 15,171, 72, 97,181, 82, 88, 69,192,106,163,208,155, 41,158, 25,241, 30,108, 54, 10,155, 72, 97,178,186,238,162, 84,
-204,176,249, 54, 69,239, 41,191,  0,208, 56,214,123,202, 41, 38,181,230, 33,147, 73, 32,147,  9, 48,232,244,255,194,161,163,180,
-127,127, 34, 62,169,157,220,141, 70,227,224, 33, 67,134,132,216,205, 21,  0,100,231, 25,  5,131,201,204, 55,170, 21,132, 46,  3,
- 39, 96,199,234, 47,241,231,193, 43,240,209,  8,251,194, 30, 15,115,  5,157, 78, 23,160, 80, 40,160,213,106, 29,145,171,249,243,
-231,135,154, 76, 38, 14,  0,  4, 65, 18,150, 46,134, 42,108, 34,224,229,153,130,236,236, 92, 63, 74, 41, 41, 50, 88, 95, 16, 66,
-126, 96, 51,231, 51, 24, 12,198,191,108,176,204,122, 61, 44, 22, 43,172, 86, 27, 44, 86, 27,114, 11,244,248,236,179,207, 32,151,
-203, 65,  8,129, 40,138, 40,122,  0, 42,103,177, 88,240,244,211, 79,251,184,250, 67,231,126, 87,148, 82,240, 60,143,230,205,155,
-223,181,221,145, 35, 71, 42,148, 17, 15,  5,143,200,206,239,220,245,253,209,223, 62,  6,165,128, 77, 44, 50, 88,102, 55,174,179,
- 46, 12, 91,131,182,253, 97, 50,153, 11, 35,122,148,222, 83, 36,239,129,153,172, 39,172,207,149, 29,153, 76,214,121,220,184,113,
- 50,231,239,124, 60,229, 86,133, 76,106, 59,113, 49,133,236, 88,253, 37,119,252, 66,178, 40,147,  8, 84, 77,239, 68, 61, 46,249,
- 86,169, 84,105, 58,157, 46, 88,175,215, 35, 47, 47, 15,121,121,121,197, 79,104,137,132,188, 58,106,140,191, 68, 42,131,197,108,
-194,159, 43,102,178, 90,142,193, 96, 48, 30, 53,131,101, 52,232, 96,177,218, 96,181, 20, 62, 65,222,100, 50, 65,169, 84,162,109,
-219,182, 69,151,119,234,120,221,190,125, 59, 76, 38,147,203, 63,180, 90,173,142,  8,150, 40,138,160,148,226,151, 95,126,129, 68,
- 34,129, 84, 42,133, 68, 34,129, 68, 34,  1, 33,164, 66, 25,177,218, 40,222,157,252, 54, 36,  2,  7,169,192, 65, 34, 16, 72,  5,
- 14, 54, 74, 65, 65, 97,181, 21, 46, 38,171,123,129,140,242, 12, 27,  0, 24, 77, 22,208, 66, 51,  6,157, 78,199, 74,210, 67, 36,
- 35, 35,131,232,245,250,  8,111,111,111, 39,171, 73, 81, 73,101, 51, 14,239,213, 32,121,248,135,235, 66, 76, 22, 43,164,  2, 79,
-  7,119,141, 78,222,181,126,143, 95,134, 49,135,216, 71, 23,254,199, 57,127,237,218,181,224,202,149, 43, 35, 47, 47, 15, 86,171,
- 85,236,215,175, 95,146, 32, 72,194,  4,137,132,244, 28, 52, 70,188,115, 39,217,194,113, 60, 40,181,225,169,231, 70, 19,185, 66,
- 41, 53,155, 76, 86,  0, 19, 89,244,138,193, 96, 48, 30,  5,131,165,215,195,106,177, 58, 76,150,217,108,  6,  0,204,158, 61,251,
- 46, 67, 68, 41,117,172, 47, 87,211,104, 68, 84, 84, 20, 76, 38, 19,162,163,163, 65, 41,197,160, 65,131,238,218,238,216,177, 99,
- 21,202,136,197, 70, 49,235,179,217,119,125,127, 96,205,199,168, 31, 29,137,230,213, 85, 48, 88, 68,228,106,173,247,109,216,  0,
-192,100, 50,  3, 69,211,225,235,181, 90, 86,146,254, 69, 44, 22, 11,178,179,179, 97, 44,200,182,214, 12,162,185, 47,247,172,106,
- 76,207,210,  9, 28, 53, 88,195, 60,116,198,130,172, 36, 94,165, 82, 61, 22,121,205,203,203, 91, 49,122,244,232,118,251,246,237,
-147,114, 28,135,188,188, 60,116,232,208, 33, 35, 93, 12, 85,188, 58,106,140,127,114,114,146,213, 83, 41, 24,165, 82,  9,210,210,
-210,196,118, 61,134,232,  7,141,120, 51,228,205,247, 62, 89,148,124,112, 62,235,127,197, 96, 48, 24,143,132,193,210,105, 97,177,
-216,138,154,  8,173,142,168,211,216,177, 99,239,218,118,215,174, 93, 46, 13,150, 32,  8,105, 47,191,252,114,177, 41, 18, 40,165,
- 88,183,110, 29,100, 50, 89, 49,211,118, 47, 17,172,105,239, 79,128, 76,194, 23, 25,162, 66, 99, 36, 82,138, 77,127,108,199,166,
- 63,182, 59,182,229,121, 73,218,253, 24,182, 66,163,104,  1,165,  0,  5,160, 47, 96,  6,235, 97,226,239,239, 79,211,211,211,111,
-230,228,228,212, 84,171,213,200,204,204, 68, 86, 86, 22,114,114,114,160,207,203,182,170,173, 57, 90,147, 53, 11,130, 32,224, 78,
- 66, 42,108, 54,219,157,199, 36,122,133,148,148,148, 75, 85,171, 86, 93,253,238,187,239, 14,154, 50,101,138, 68, 20, 69, 92,190,
-124, 25, 32,132, 74,164, 50,112, 28,  7,137, 68, 64,110,110,158,168,210,120,167,152, 41,175,146, 72,101,224,120, 41,155,112,148,
-193, 96, 48, 30, 41,131,101,181,194,106, 41,236,131,101, 54,155, 97,181, 90,177,120,241,226, 98,102, 72, 42,149,130,227, 56,151,
-  6,107,253,250,245,197, 38,247,108,220,184, 49,165,148,162, 95,191,126,142,230,198,225,195,135, 99,228,200,145,176, 15, 67,119,
- 59,138, 97,  3,166,207,156,237,208,233,209, 37, 22,125,158,106,  7, 42, 22, 26,181,180,179, 27, 42,228,216,202, 51,108, 64, 81,
-  4, 11, 20,160, 20,  5,249,249,172, 36, 61,100, 76, 38,211,206,121,243,230, 69,188,255,254,251,178,172,172, 44,100,100,100, 32,
- 59, 59,219,177, 20, 20, 20, 32, 40, 40,  8, 91,183,110, 53,231,229,229, 29,121,156,242,126,227,198,141,239, 54,109,218,132,189,
-123,247, 14,156, 50,101,138, 36, 40, 40,136,120,121,165, 18,139,217,  4,128,210,244,244,116, 81,165,241, 78,241, 15, 12,187,157,
-124, 39, 45,218, 98, 54, 65,180,153,121, 86,106, 24, 12,  6,227, 17, 48, 88, 18,129,203,189,114, 43,197,171,146, 90,  9,171,104,
-132,205, 84, 56,181,130,205,102,195,171,175,190,234,216,110,240,224,193,120,225,133, 23,192,113,220, 93,125,176,  8, 33,157, 93,
-205,149, 33,138, 34, 14, 28, 56, 80, 56,237,  1,199, 57,150,178, 40, 75, 83,107,180,225,224,175, 31, 65,164,128, 88,232,123, 64,
- 65,220, 26, 53, 88,154,166, 43,195,166,240,240,  1,  7, 10,240,192,245,164, 52,  8, 60,151, 91,209,188, 87, 20,166,249,127, 77,
-185, 92,190,234,151, 95,126,233, 17, 27, 27, 27, 94,191,126,125, 46, 43, 43, 11,  5,  5,  5, 40, 40, 40,  0,  0,248,251,251,227,
-194,133, 11,226,173, 91,183,146,228,114,249, 47,143, 83,222,139, 30,127, 51, 47, 56, 56,120,231,212,169, 83,135,101,100,100, 60,
-157,157,157,227,247,251,143, 51,208,253,185,209,164, 93,143,193, 90, 19, 21, 20,137, 41,169,181,246,108,249,217,247,207,213,223,
-193,108, 50,141, 36,100,193, 69,251, 52, 13,172, 44, 49, 77,166,201, 52, 31, 53,205, 39,198, 96, 81, 27, 29,183,240,247, 35,243,
- 44, 54,209,203,254, 93,157, 58,117, 96, 54,155,177,117,235, 86,135,241, 16,  4,  1,130, 32,184, 21,193, 42,133,219,109,219,182,
- 45,111, 42,134,219,238, 29,105,220,110,210, 97, 64,149,242,214, 87, 52, 97,174, 12,219,146, 61,103,255,191, 19, 57, 46, 23,148,
-142, 99,197,233,225, 17, 29, 29,109, 59,116,232,208, 91,163, 71,143,254,170, 83,167, 78,161,125,250,244,145, 86,174, 92, 25,114,
-185, 28,215,175, 95,199,254,253,251,205, 55,110,220, 72,210,233,116,111,213,175, 95,255,177,108, 30, 75, 73, 73,185, 84, 52,137,
-232, 27,246,169, 24,228, 10,165,116,240,136, 55,195, 28,163,  8, 87,127,  7,163, 65, 15,  0,  2,155,166,129,193, 96, 48, 30,  1,
-131,117, 59, 41,105,  5,128, 21,206,223, 61,253,244,211,  5,189,123,247, 86,218, 71, 20,218, 71,  3,154, 76, 38,152, 76, 38, 40,
- 20,138, 10, 77,  8,229,206, 36,162,238,144,118,102, 67,248,  3,221, 43,110, 24,182,228,228,228,112, 86,124,254, 93, 90,181,106,
-149,114,241,226,197, 33, 59,118,236, 24,188,111,223,190,206, 58,157, 46,130, 16,  2,165, 82,121,211,100, 50,237,148,203,229,171,
- 30, 87,115, 85, 22,102,179,217, 58,101,250,151, 63,241,130,212, 42,138,102, 98, 54,155, 71,192,205,135,186, 51, 24, 12,  6,227,
- 33, 24,172,210,208,233,116,222,132, 16, 33, 57, 57,249,174,117, 82,169, 20,183,110,221,178, 62, 14, 59,229,129, 27, 54,198, 63,
- 70,116,116,180,173,232, 70, 96, 69,201,135, 61, 63,  9, 80, 74,141,132,144,137,132,144, 47,138,190,154,120,227,175,185,142,209,
-130,132,204, 59,227,188,142, 69,175, 24, 12,  6,227, 17, 52, 88,123,246,236,177,  2,168,136,137, 74,251,  7,210,156,198, 14,219,
-147,205,154, 53,107,216,136,184,226, 38,107, 62, 33,228,  7,187,225,114,119, 29,131,193, 96, 48, 30, 17,131,197, 96, 48, 30, 89,
-147,101,188,151,117, 12,  6,131,193,248,103, 32,  0,234,150, 81, 41,159,117, 91,132,144,186,247,112, 65, 56,251,  8,105,  6,148,
-163,185,211,133,102,231,123, 72, 39,211,100,154, 76,147,105, 50, 77,166,249, 68,106,186,210,126,108, 70, 39,210,162,217,200,255,
-137,  5, 64,221,255,136,102,103,166,201, 52,153, 38,211,100,154, 76,147,105,254,123,154,143,219,194,129,193, 96, 48, 24, 12,  6,
-131,241, 64, 41,181, 15, 86,165,152,190,224, 74,204,123, 46, 82, 32,253,220,134,123,218, 14,  0,166, 79,159,126, 95,102,238,195,
- 15, 63,116,235, 41,205,149,234,246,  5,231,198, 24, 50,145,  0,233,103, 55,184,253,255, 36,188,239,251, 16,241,110,225,  7,124,
- 78,111,111,152,198,138,207,189,209, 80, 67,252, 45, 68,210,211, 67, 33,233, 29,225, 33,105,121, 61,199,120, 72,103, 22, 55, 83,
- 98,217,120, 62,143,102,179, 61,196, 96,252,243,248, 68,181, 30,226,231, 31, 52, 82,164, 84,  9,  0, 38,147,193,146,148,112,123,
- 46,205, 62,191,186, 88,221,231, 91,187,127, 80, 72,216, 88,165, 66,173, 44,172,254,136, 41, 43,243,206,252,236, 27,  7,127,126,
- 88,105, 37, 69,207, 78, 11, 13, 13,245, 62,120,240, 96,120,235,214,173,111, 37, 37, 37,229, 56,111, 83,218, 58,106,159,176,177,
- 12,205,192,168, 70,207,123,104,212,175, 25,140,198, 72, 47, 79,207,180,172,204,204,133, 41, 55, 78,126,103,223, 38, 60, 60,220,
-115,245,234,213,193,131,  7, 15, 78,142,143,143,207,119,165,201, 96,184, 52, 88, 28,  1,214,172, 89, 13, 74,105,209, 36,155, 20,
-131,  7, 13, 46,117,187,202,242,228, 72, 81, 20, 95,  0, 48,148, 82,122, 42,217, 82,185,223,189, 36,100,215,174, 93,161, 22,139,
-165,169,213,106,109,  4,160,145, 82,165,105, 96, 52, 26,210,  8,232,139, 79, 61,245,212, 73,119,117, 56, 10, 44,249,113, 57,166,
-143,106,255,  7,128, 30,101,156, 88,211, 19,141,161, 21, 51, 72, 34,125,239,239,125,235,228,222, 42,130,106,141,159,157,  4,224,
-145, 52, 88, 33, 33, 33, 74,  0, 47,114, 28,215, 73, 46,151,215, 48, 24, 12, 55,  1,156, 33,132,204, 79, 76, 76, 76,190,199,202,
-141,139,209, 72, 94, 82, 41, 85,221,131,213,178, 70, 41, 57,121, 73, 58,139,184, 95, 36,230, 47, 42,106,136,170, 17, 34,171, 90,
-217,123,239,219,125, 98,163,235, 71, 87,133,237,220, 62,152,204,230,222,199, 83,116,189, 23,157, 76,125,171, 26, 33,141,174, 81,
-106,114, 51, 93,193,  0,  4, 74,105,  2,  0,132,133,133,249,136,162, 24, 11,160,  1,128, 83, 28,199,237, 79, 76, 76,188, 47,195,
-246, 31,210, 12, 17, 69,241,229,192,192,192,167, 83, 83, 83,255,224, 56,110,233,189, 30,111,198,147,129,175, 95,208,107,223,254,
-176, 86,102,255, 76, 69, 81, 50,168, 79,251, 97,  0,138, 25, 44,111,111,191, 23,127, 92,245,167,146,252,255,  9, 27,178, 49, 35,
-250,143,  4,240, 80, 12, 22, 33,132, 80, 74, 49,125,250,116,178,100,201,146,225, 85,170, 84,169, 78, 41,189, 60,109,218,180,185,
-206,219,149, 92,247,225,135, 31,210,162,223,210,210, 52,163, 98,218,108,124,233,133,129,237,199,141,126, 81,163, 82, 42,161,215,
- 27,252, 22, 44, 89,254,229,119, 75, 87,244,124,161, 95,231,238,  0,176,120,241,226,190,149, 43, 87,142, 48,153, 76,241,211,166,
- 77, 91, 94,158, 38,131,225,150,193, 42,114,233,184,122,241, 20,254,248,125, 11,142,157,186,  0,209,169, 56,213,169, 83, 71, 45,
-147,201,250,135,201,184, 23,235, 53,106,217,166,247,115, 47, 18, 11, 81, 97,230,132,193, 21,158,  7,235,196,137, 19,242,148,148,
-148, 25,145,181, 26,191,217,190,107, 31,174,118,116, 45,248,251,249, 64,228,100, 88,182,245,138,223,158, 69,195,191,  5,208,210,
-109, 31, 68,128, 87,134, 63,143, 80, 25,122,252,186,229, 40, 82,114,108, 32,  4, 32,164,208, 16, 22, 24, 68,188, 59,162,205,135,
- 21, 55, 72,132,243, 86, 17,140, 95,101,  0,128, 71,242,185,110,193,193,193,141,252,252,252,190, 27, 62,124,184, 79,141, 26, 53,
-130,101, 50,153,202, 96, 48, 84,191,125,251,118,228, 87, 95,125,213, 37, 56, 56,248,211,148,148,148,117, 21,209,140,246, 86, 84,
-121,170, 86,248,175,147, 71,189,216,172,102, 68,101,  8,198,  2,136, 70,109,229, 91, 55,174,181,156,245,227,186, 87, 98,188, 36,
-131,206,229, 90,220,238,144,168,240,144,190,247,238, 75,131,163,171,169, 41, 76,103, 15, 66,194,243, 80,120,250,160, 57,207,131,
- 35,180,246,135,251,147,222,  5,240,161, 27,149,238, 71,  0,222,  5, 64,164, 82,233,186,192,192,192,203,173, 90,181,170, 63,112,
-224, 64, 82,183,110, 93,156, 58,117,170,225,239,191,255, 62,162,114,229,202,167, 45, 22,203, 95,106,181,250,200,181,107,215,220,
- 50,110,213,170, 85,147,105,181,218, 22, 18,137,164,195,163,172, 25, 18, 18,162, 52,153, 76, 47,132,133,133,189,218,187,119,239,
-122,189,122,245, 34, 53,107,214,196,165, 75,151, 26,255,249,231,159, 31, 54,104,208,224, 76, 98, 98,226, 98,153, 76,246, 83,114,
-114,178, 91,147,  0, 15,172, 75, 46,173, 62, 75,107,221,235,250, 18,199,200, 27,128,146, 82,154,236,198,182,129,  0,212,148,210,
-235, 15, 91,243, 31,186,209,185,  0,192,215,254,208,122,142,227, 28, 15,176,119,126,181,191,183,217,108,218,219,183,111, 87,117,
-161, 89, 83, 20, 69,183, 91,  2,  8, 33, 52, 37, 37,229, 82,153,117, 60,168, 12,  0,102,125, 56,  1, 73,  9,183,160, 55,104,245,
- 57, 57,153,203, 74,110,151,147,157,181,226,229,161, 61,223,144,201, 20,146,208,202,225,120,119,250,151,176, 71,189, 30, 22,211,
-167, 79, 39, 31,126,248, 33, 22, 47, 94,220, 11, 64, 44,165,116,127,116,116,244,188, 18,215, 44,199,186, 15, 63,252,112,238,244,
-233,211,  9,128, 82,141, 80,165,168,  6,195,134, 13,234,219,254,157,183, 95,211,216,191, 83, 42, 21,120,251,141,145, 50,189,209,
-212,114,193,247,203, 95,157, 59,115,242, 18,  0, 29,  1, 52,161,148, 30,  7,176,188, 60, 77,  6,195,109,131, 37, 82,224,143,223,
-183,224,237, 41, 31,224,135,101, 63,225,167,207, 70,146, 38, 77,154,180,165,148,190, 24, 17, 85,173,255,179, 67, 70, 42, 35,170,
-215, 69,129,232,137,248, 12, 17, 39,254, 90,133,146,119, 62,174,216,182,109, 91, 19, 74,241,227,232, 41, 95,213,170,223,176, 41,
-206, 38, 89,113, 48,193,  6,237, 53, 27,  4, 94, 15, 81,172,248, 16,115,123,179, 95,227,198,141,145,152,109,197,254, 75, 38,240,
- 28,192,113,  0,207, 17,240,228, 30,247,148,104,186, 50,227,199, 19, 49, 25,169, 34, 32,154,174, 60,106,  7, 50, 52, 52,180, 99,
- 84, 84,212,156, 55,222,120, 35, 40, 37, 37,197,247,216,177, 99,144,203,229,240,241,241, 17,252,252,252,106, 77,153, 50, 37,119,
-214,172, 89, 19,  3,  3,  3, 79,166,166,166,222,116, 71,179,142, 70, 22,221,174, 81,204,161,169,211, 62,244, 50, 29,253, 19,217,
-171,214,128,231, 40,164,106, 13, 66,148, 74,204,235, 26,225, 59,121,119,194,186,122, 74,101,244, 25,189, 62,201, 29,205,202,  1,
-190, 93,171,215,172,133,236,245,223,226,106,158, 17,135,211,141,232,211,174, 25,170,249, 42,209,192,106,131,159, 66,232,232,202,
- 96, 17, 66,124,  0, 76, 54,153, 76,156, 84, 42, 37, 10,133,162,255,178,101,203,118,215,172, 89,211, 96,223,166, 69,139, 22,104,
-209,162,  5,209,106,181, 13, 14, 30, 60,216, 96,253,250,245,230,224,224,224,  3, 41, 41, 41,115,202,210, 85, 42, 85,183, 13,  6,
-125,101,149, 90,109, 90,186,100,201,174, 22, 45, 90, 80,137, 68,130,251,209,  4,128,160,160,160,117, 17, 17, 17,254, 51,103,206,
-204,111,214,172,217,  3,209,140,140,140,220, 30, 27, 27,219,161,107,215,174, 66,235,214,173, 17, 18, 18,226, 88,231,239,239,143,
-216,216, 88,146,144,144, 80,127,255,254,253,243,183,111,223, 62, 47, 50, 50,242,175,248,248,248,174,174,142, 15,  5,106,222,207,
-250, 18,240,  0,102, 17, 66,150, 80, 74, 15,150,115, 60, 27,  1, 24,  2,224,179,127, 73,179, 92,148, 74,101,170,193, 96,  8,  0,
-  0,133, 66,145,166,215,235,  3,221, 48, 55,154,207, 63,255, 60, 64, 42,149,130,231,121,216,108, 54,199, 66, 41,133, 40,138,197,
- 58,195,126,246,217,103,110,205,237,118,231,206, 29, 45, 10, 71,127, 83,167, 69, 44,237, 53, 34, 34,194,223, 29,205,164,132, 91,
-240,176,196,103,  6,122, 40,195, 35, 61,188,103,180,110,221,122,134,243,250, 86,209, 94,  0,242,160,215,223,185,149,148,  0,191,
-127,161,110,243, 94,178,100,201, 11,139, 23, 47,238, 67,  8,209, 22,237,223,122,111,190,249,230, 95, 37,246,121,189,162, 87,109,
- 72, 72,200, 30, 66,200,230,208,208,208, 31,  1,220, 21, 29,246,210,120,140,124,107,204, 43, 26,  0,152,190, 54,  3,211,214,166,
-227,131,103,124, 49,233,105, 53,134, 15,237,167,254, 97,249,175, 35,  1, 44,113,210,190, 20, 29, 29, 77, 46, 94,188,200,204, 21,
-227,193, 68,176,142,157,186,128, 31,150,253,132,161, 67,135,225,220,206, 69, 91,158,122,230,249,238, 45,218,118,133, 85, 26,128,
- 75,105,  4,  9,241, 20,  2,111,  5,  7, 17, 55,254,222, 72, 57,142,251,169,132, 70,153,211, 38,108,217,178,229,173, 42,213, 26,
-124,250,238,180, 79,248,179,169, 50,252,184, 95, 15,155, 49, 23,250,140,107,208,166, 93, 65,254,157, 11,200, 73, 58,123,134,227,
-184,105,238,106,222,157,  7, 64,164, 20,132,146,194, 42,  7, 20,119,117, 26,131,155, 67, 66,205,218,139, 81, 53, 99, 98,178,101,
- 54,192,172,189,232,250,191, 31,252, 48,211,178, 52, 67, 66, 66,186, 68, 68, 68,124, 49,114,228,200,176, 51,103,206,120,234,116,
- 58,237,209,163, 71,247,166,164,164,  4,250,251,251, 39, 12, 28, 56,176, 85, 96, 96, 96, 64,219,182,109, 85,219,182,109,123, 15,
-192,203,174, 52,235,170,101, 49,177, 77,235, 30,254,248,243,217,234,140, 53,223,192,116,237, 52, 14,103,232,113, 38, 83, 79, 67,
- 61,114,200,128,104, 95,168,100,  2, 70, 54, 14,212,188,177, 45,254,179,162,139,153,203,188, 71,  6,  7, 86,181,232,117, 48,232,
- 45,216,114, 61, 87,127, 56, 47, 55,128, 59,125, 59,125, 82,175,166, 10, 62, 61, 25, 65, 26, 73,245,138,238, 79, 66,  8, 20, 10,
- 69,169,235,188,189,189,209,178,101, 75, 68, 69, 69, 73,  7, 15, 30,220, 17,192,156,178, 52,205,102, 83,176, 40, 82,120,122,122,
- 74, 59,117,234, 68,  8, 33,180,228,  3,204, 43,170,  9,  0,106,181,186, 91,131,  6, 13,248, 85,171, 86, 21,220,185,115,231,230,
-211, 79, 63,157,161, 80, 40,196, 18,219, 32, 60, 60, 28,175,191,254,186,244,229,151, 95,118,169, 25, 24, 24,216,101,197,138, 21,
- 32,132, 56, 46,220, 37,  9, 15, 15, 71, 80, 80, 16,122,244,232, 33,244,235,215,175, 75,121,251,115, 96, 93,114,201,110,158,  6,
-212, 37,229, 94, 68,  6,212, 37,148,  0,151, 75, 70,178, 74,106, 82, 74, 51,  9, 33, 11,  1,172, 39,132,244, 47,205, 16, 17, 66,
- 90,  3, 88, 11,224, 41, 74,105,154,171,227,238,172, 41,147,201,164,102,179,217,167,164,241,169,168,166,115,196, 39, 46, 46, 14,
-141, 27, 55,134,243,171,193, 96,112, 60,123,149, 16, 18,224,110,249,228,121, 30, 95,125,245, 21,120,158,135, 84, 42,133, 76, 38,
- 43,245,181,105,211,166, 21,173, 67, 18,  8, 33, 92,149, 42, 85, 38,243, 60,255,178,201,100, 10,147,203,229,201, 54,155,109,153,
-175,175,239,204,184,184, 56, 11,  0,239,210,158, 13,235,172,169, 55,104,245, 84, 20,149, 38,147,193,162, 84, 43,195, 15, 30, 60,
- 88,163,172, 99,110, 52, 26,209,169, 83, 39,164,230,107,211,237,191,121, 88,117,221,193,131,  7,195,171, 84,169, 82, 19, 64,108,
-209, 87,251,146,146,146,218, 58,125,118,102, 95, 82, 82,210, 83, 69,239, 47,223,190,125, 59,220,110,176,156, 53, 77, 38,115,164,
- 70,163,  6,  0, 76, 91,155, 14,227,138,170,144, 15,187,142, 17,205,141,240,240,240,128,205,102,173,249,230,155,111,254,132,194,
-115,226,111, 74,105,223, 55,223,124,179, 22,128,221,225,225,225, 27,  0,228, 62,236,122,254, 73,208,124, 44, 13, 86, 81,147,178,
-189,105,153,136, 20, 24, 60,104, 48, 68, 10,108,221,186, 21, 98, 97,221,237,153,168,247, 70, 65,188, 63,  4, 78,132,192, 19,  8,
- 60,  0, 16,100, 38, 94,128, 73,155,121, 32,209, 20, 26, 47,186,225,239,183,110,221,218, 50,162,118,179,207,166,125,252, 37,247,
-195, 62, 61,114,117,  6,100,156,223,132,148, 99,223,167,136, 86,243, 38,142,227,142,115, 28,119,162, 81,253,122,151,130,131,131,
-239,121,214,110,145,  2, 54,103, 99, 37,  2,228, 49,139,238,134,133,133, 61, 85,173, 90,181, 79, 70,141, 26, 21, 30, 23, 23,231,
-145,159,159,159,190,115,231,206, 75,102,179,249, 36,199,113,115,147,147,147,219,173, 88,177, 66, 53,105,210,164,174, 53,107,214,
-172,185,125,251,118,157,203,200,149, 90, 90,255,249, 33,  3, 15,247, 25, 53, 78,113,254,215,239, 32,191, 16,135, 69, 87,178,109,
-199,211,245,239, 25, 10,172,115,148, 42,161,117,182,209,186, 99, 66,243, 16, 46, 88, 45, 65,101, 79, 73,123,119,211, 43,147, 41,
-  4, 42, 40, 96, 50, 89,161,181,136,166,243,233, 84,251, 86,187,122,102,170,246, 87,  0,128,192,113,130, 27, 39,118, 54, 33,228,
- 51,153, 76,246, 62, 33,132,246,233,211,231,102,163, 70,141, 12,  0,160,215,235, 97, 52, 26, 33,145, 72, 96, 48, 24,112,227,198,
- 13, 28, 57,114,  4, 62, 62, 62, 21,218,175,217,217,217,  8, 15, 15,135, 70,163,185,111, 77,155,205, 70,190,251,238, 59,217,185,
-115,231,100,191,253,246,155,231,132,  9, 19,180,205,155, 55,191,245,244,211, 79,167,121,122,122, 90, 79,157, 58,133,195,135, 15,
- 35, 39, 39,  7,205,154, 53,115, 75,211,100, 50, 65, 16,  4,232,245,122,200,229,114,  8,130,  0,171,213, 10, 81, 20, 29,166,171,
-160,160,  0, 89, 89, 89,144, 74,165, 40,205, 40, 58, 99, 55, 75,  3,234, 18,250,235,150, 67,105,128, 72, 97,202,183,192,148,107,
-129,209,190,100, 91,  6,140,159,221,224,215,179,148, 84,160, 18, 62, 66,  8,233, 15, 96,109, 73,147,229,100,132,250, 83, 74, 79,
- 85, 84,211,108, 54, 31,176, 27, 31,133, 66, 17, 64, 72,161, 49,148,203,229, 22,163,209,216,161, 34,154,  0, 16, 23, 23,135, 70,
-141, 26,241, 69,154,206,221,108,196,138,158,151,132, 16,240, 60, 15,185, 92, 14,142,227,208,188,121,115,244,235,215, 15,209,209,
-209, 72, 72, 72,192,246,237,219,113,241,226, 69, 72,165,210, 98, 77,133,238,208,190,125,123, 62, 50, 50,242, 80,151, 46, 93, 98,
-198,142, 29,171,  8, 15, 15,199,165, 75,151,170,204,255, 31,123,231, 29, 22,197,213,182,241,251,204,246,194,210,123, 17, 80, 64,
-170,138,128,136, 21, 75,108,177,199, 26,163, 49,177, 39,118, 99, 73,140, 61,154, 24, 99,141, 45,177,247,104, 98,239,189, 87,176,
-161,136,162,128,244,222,183,239,206,249,254,  0,124,213, 40, 44,232,251, 38, 95, 50,191,235,154, 11,157,157,185,231,204,204,153,
- 51,247, 60,167,173, 90, 53,229,210,165, 75,221, 66, 66, 66, 66,163,162,162,170, 76,115, 70, 90,202,138,126,221, 34, 63, 45,200,
-207,219, 90,203,207, 98,150, 70,163,193,195,135, 15, 77,222,231,127, 85,198, 53,109,218, 52,137, 82,250,132, 82,122,145, 16, 82,
- 47, 53, 53,181,133,139,139,203, 81, 74,169,252,181,107, 94,154,154,154,218,209,197,197,165,136, 82,122,143, 16, 18, 71,  8, 73,
- 74, 73, 73,249,243, 71,146,133,121,118, 73, 73,169,131,153,153, 28,223,116,179,132,248,147,167, 24,221,138,  7,189, 94,143,103,
-207, 18,225,233,225, 70,118,110,216, 31, 10,224, 38,128,176,168,168, 40,  0,  8,  5,144,144,156,156,236, 84, 97,176, 56, 56,170,
- 29,193,122,189, 23,160,125,189,238,168, 37,226,245,188,127,108,233, 53,111, 29,117,119,  8,252,176, 60, 18, 93, 22,169, 78,186,
-115, 12, 44,203,110,202, 52,161, 87,222,213,171, 87, 37,  6, 22, 27, 38,127, 61,135, 89,123, 86,133,204,140, 52,164,157, 95,  8,
- 85,214,195,141, 82,169,116, 98,155, 14,157,139,106,114, 34, 47,247,104,116, 17,166,  4, 90,218, 56, 66,163,163,229,  6,235, 85,
-147,245, 79,193,217,217,185,139,151,151,215,156,  3,  7, 14,184,171, 84, 42,197,229,203,151, 11, 78,158, 60,249, 68,167,211,173,
- 75, 79, 79,223, 86, 94,232, 28,224,243,249,115,  1, 64,161, 80,240,121, 60,158,180,178, 70,154, 65, 22,194,134,131, 63, 29,112,
-105,194,178, 95, 37, 79,238,223,193,178, 61, 71, 32, 54,106,141, 15,242,181,221,239, 23,235, 15,149,111,118,166,147,179, 44,149,
-130,186,  9, 24,  2,107,169,208, 49,130, 16,201, 85, 74,213, 85,165,217,214,205,157,209,215,242,196, 69,131, 26,102, 10,161,  8,
-  0, 92,124,252,121,183, 85,122, 92,190,251, 16, 18,137,149,208,196,151,236, 12,123,123,251,198,231,207,159, 39, 37, 37, 37,234,
-123,247,238,193,218,218, 26, 14, 14, 14,176,176,176,192,195,135, 15,113,250,244,105,196,197,197,129, 82,138,250,245,235, 87,235,
-218,102,102,102,162,168,168,  8,221,187,247,104,157,150,150, 42,177,119,112,212,158, 57,125,234, 84, 77, 52, 89,150, 37,  0, 16,
- 24, 24,136,192,192, 64, 65,106,106,170,229,161, 67,135,204, 22, 44, 88,224,108,103,103,119, 83,165, 82,189, 98,156, 76, 53, 88,
-  0,160, 86,171,161,209,104, 32, 20, 10, 33,145, 72, 32, 20, 10, 81, 84, 84,132,204,204, 76, 20, 23, 23,191,136,184,153,170,251,
-226,211,100, 75,179, 91,127,206, 28,159,218,215,240, 75,247,114,185,201, 58, 67,  8,169,184,191,153,229,127,123, 85, 86,213, 87,
-133,230, 43, 17,150,151,162, 76,130,154,104,134,132,132, 84,104,188, 82, 74, 72, 36,146,172,138,200,149, 68, 34, 49,105,170, 46,
- 66,  8, 88,150,133, 80, 40, 68,253,250,245,241,205, 55,223,224,193,131,  7, 56,123,246, 44,156,156,156,208,165, 75, 23,  8,  4,
-  2, 36, 38, 38,190,210, 62,203,148,155,147,152,152, 56,165, 93,187,118,129,203,150, 45,147, 36, 37, 37, 33, 54, 54, 22,230,230,
-230,152, 51,103,142,120,234,212,169, 94, 87,174, 92,153,  1,224,199, 42,175, 97,222,195, 61,229,  6, 23,193,193,193,159,182,105,
-211,230,207,229,170,157,157,197,142, 29, 59,236, 43,140,215,203,251,252,175, 72, 77, 77, 45,152, 53,107,214, 18, 63, 63,191,165,
-229,213,130,205, 41,165,242,180,180,180,200, 61,123,246, 16,  0,232,213,171, 23,117,118,118, 62, 87,158, 55,238, 45, 93,186,180,
- 85,108,108, 44,157, 53,107,214, 27,203,185,244,172,244, 53, 63, 46, 95,187,100,214,180,241,162,175, 58,201,240, 89,184,  6, 44,
-203,130,199,227, 97,217,234, 13,250,184,  7,247,238,134,134,134, 30,162,148,118, 47,143,102,150,  0,136, 35,132, 36,136, 68,162,
-180,103,207,158,113,238,129,163, 74,152,151,195,227,111,219, 40,235,222, 62,176, 44,235,100,105,231, 98, 61,252,227,246, 96, 89,
-192,192,  2,  6, 35,133, 74, 89,138,140, 71,103,149, 90,173,214,164,135, 46, 55, 55,119,238,224,113,223,123,221,122,206, 71,122,
-190, 22, 41,167,231, 80, 77,206,163,143,186,116,233, 50,164, 77,155, 54, 69, 53, 62,145,242,158,143, 46,194,148, 64, 43, 91,231,
-115,223, 46, 92,143,155,207,180, 96,233,127, 34, 89, 70, 22, 96,255, 33,  1, 44, 23, 23, 23,111, 43, 43,171, 69,  7, 14, 28,240,
- 16,137, 68,138,248,248,120,227,185,115,231,210,244,122,253,170, 10,115, 85,110,194,  6,  4,  5,  5,233,101, 50, 25,148, 74,165,
- 90,175,215,151,188,205, 92,  5, 74,165,174, 33, 65, 65, 23, 38, 44,251, 85,162,214,106, 81,168,210,192,206,201,209,120, 47, 95,
-217,253, 94,177,230,208,139,  8,151, 66,208, 36,180,142,139, 11,145, 40, 64,  1,164, 22,107,211, 76, 49, 87,  0, 32, 87, 88, 48,
-174,161,145,  8, 29,187,  2, 42,158,  5,  5,  0, 43,123,103,166,213,168,239,208, 97,217,121,104,248, 10,147, 45, 48,159,207,215,
-120,123,123,171,203, 11, 85,228,230,230,226,193,131,  7,200,203,203,195,138, 21, 43,240,232,209,163, 23, 47,221,234, 25,140, 23,
- 47,113,100,103,103,137, 41,165,200,202,204, 16,213, 84,179,194, 96,189,116,239, 48,114,228, 72,126,105,105,169,228,101,115, 85,
- 93,131, 85,145, 14, 74, 41,180, 90, 45, 10, 11, 11,161,213,106,241,228,201,147, 23,230,170, 60,130, 86,189,243,215, 22,235,223,
-184, 94,157,167,127,135,234,132,203,  0,132, 47, 13, 82,232, 80, 83,115,245,154,241,169, 86,244,167,170,  8, 22,222,208,128, 89,
-165, 82, 57, 80, 74, 73, 84, 84, 20, 76,105,127,245,178,193, 18,137, 68,232,221,187, 55, 98, 98, 98,144,156,156, 12, 62,159, 15,
-181, 90, 13,181, 90,141, 70,141, 26, 65, 36, 18, 85, 55,130, 69,  5,  2,193,128,209,163, 71, 75, 18, 18, 18,144,147,147,  3,134,
- 97, 96, 48, 24, 96, 52, 26, 49,100,200, 16,169, 72, 36, 26,128,106, 54,196,190,125,251,118,251,203,151, 47,215,125,125,201,206,
-206, 46, 20,139,197,127,203, 50,112,207,158, 61,164, 87,175, 94,180, 87,175, 94,180,194,104,153, 74,118,194,253, 53,219,118,238,
- 59,249,205,172,133, 37, 57,185,121,144,203,229,200,206,201,197,183,115, 23,233,207, 94,186,113,110,228,144,143, 35,150, 44, 89,
-242, 61,128,184,242, 93,226,150, 46, 93, 58,104,232,208,161, 91, 42,134,107,224,224, 48, 57,130, 85, 81, 69,248,150, 47,187, 96,
- 75, 91,151,179,211,230,255,106,182,247, 46, 15,249,233,113, 80,103,197,193,173, 97, 55,100,198, 93,  6, 53,234,255,120,240,224,
- 65,105, 85,  7, 59,126,252,184,143, 91,221,208,177, 13, 66,194,177,240,112,  9, 74, 30,236,132, 54, 63, 97,117,231,206,157,247,
-189,235,137,176, 20,152, 48,160, 73,160,149,141,211,185,175,191,255,213,250, 96,140,  0,185,105,113,120,180,127, 10,140,186, 63,
-213,138, 29,169,174,190,148,213,138, 74, 10, 50,161, 45, 54, 66,194, 40, 37,127,245,141, 75, 77, 77,125, 18, 24, 24,184,249,151,
- 95,126, 25, 81,191,126,125,217,216,177, 99, 31, 23, 21, 21,205, 75, 75, 75,251,237,165, 23,121,235,218,181,107, 79,154, 51,103,
-142,215,243,231,207,113,225,194,133, 39, 60, 30,239,230,219, 52, 99, 84,170,148,122, 22,226, 85,151,182,175,251,138,231, 94, 23,
-187,102, 77, 54, 92,185,255,176,235,131, 98,195,209, 23,230,202, 76,228, 23, 17,232,125,232,203,209, 35, 24, 99,244, 49, 60, 74,
-206, 66,122,169,254,180,201,233, 46, 86,234,  5, 98, 41,204, 28, 61,144,164,102,133,174,174,174, 55,134,246,232, 34,100,120,124,
- 48,124, 33,158, 21,104, 76,126,137, 27, 12,  6,241,195,135, 15,  9,128, 87,204,157, 90,173,126,107,196,231,125, 98,170,230,155,
-218, 71,  1,128, 94,175,175,177,230,203, 17,155,170,142,197,178, 44, 52,154,106,244, 21,209, 20,188,249, 30,168,114,244,239,227,
-178,149,255, 21,189,139,185,170, 48, 62, 21, 13,208,197, 98,241, 11,147, 98,106,148,169,146,  8, 86,141,126,127,147, 65, 23, 10,
-133,240,245,245,197,133, 11, 23, 96,105,105,  9, 51, 51, 51,200,229,114, 72, 36, 18, 88, 90, 90, 66, 36, 18,129, 97,170, 53, 68,
- 32,213,233,116,181, 92, 93, 93,241,228,201, 19, 72, 36,146, 23,139, 88, 44,134,175,175, 47,148, 74,165, 11,254, 81,177,250,255,
- 14,131,122,181,237,182,102,251,222,129,187,246, 30, 26,165, 81,171,131,124,235,122,211,216,251,209,119, 71, 14, 25,208,129,187,
- 58, 28,239,213, 96, 85, 82,168,  4, 91,218,186,156,157,242,221, 47,230,187,163, 25, 20,164, 63, 66,210,177,175,139,141, 58,101,
- 62,203,234,221,243,159, 94,  2,128, 77, 38,126,201,135, 53,105,221,141, 57, 23,171,133,174, 56, 13, 69, 49,187, 18,197, 98,241,
-212,247,113, 34,110,162,148, 64, 43, 27,167,115, 83, 23,252,106,189,247, 46, 31,121,105,113,120,122,100, 90,161, 81,167,108, 29,
- 21, 21,245, 98, 28, 45,135,192,238,248,108,202, 18,108,248, 97,188,201,218,159,136, 68,221,250,250, 91,118, 30,210, 60, 13, 70,
- 98,196,128,135,177, 29,157,155,147,110,105, 23,233,254,191,242,230,197,196,196,124,231,237,237,205, 24, 12,134,207,116, 58,221,
-172,180,180,180, 61, 47, 69,174, 62,112,119,119, 95, 56,119,238, 92,215,164,164, 36,209,213,171, 87,243,110,223,190,205, 26,141,
-198,239, 43,211,188, 87,168,153, 28,164, 16,242,188,221,156, 71, 63, 73, 73,233,122,191,200,112,172,226,183, 32,185, 40,176,121,
-  3,191,203,115,103,125,173,208, 94,218,131,210,244,100,172,136,202, 40, 98,141,250,105, 38, 70,221,172,221,133,148, 76, 27,250,
- 41, 91, 92, 92, 12,153, 72,200, 38, 63,122,202, 27,216,182,133,241,135, 41, 19,153,140,140, 12, 40, 75, 75,249, 46, 46, 46,214,
-169,169,169,121, 85, 68,  8,230,  0,104, 93,191,126,125,180,107,215, 46,113,246,236,217,177, 47,155,143,191,153,193,122,227,215,
-181, 78,167, 35, 53,213,124, 57,130, 85,149,193,170,118,  4, 75, 83,244,102, 35,165,204,126, 87,131,245,156, 16, 82,171,226,223,
-239,227, 30,168,213,106,251,151,170,  6, 65, 41,173,113, 56,171, 60,130, 85,227,223, 95,134, 97, 24, 80, 74, 33, 18,137, 16, 23,
- 23,  7, 71, 71, 71, 24, 12,  6,200,229,114,200,100, 50,148, 71,148, 33, 18,137,192,231,243,171,147, 76, 86, 36, 18, 61,143,139,
-139,171,107,101,101,  5,163,209,248,138,201, 74, 72, 72,128, 92, 46, 79,173,110,  4, 43, 56, 56,248,184, 84, 42,117,127,125,189,
-157,157,157,197,223,245,229,245,114,228,170, 87,175, 94,116,220,184,113,213,214, 88,254,221, 87, 91,  1,108, 29, 55,110,220,230,
-237,235,142,132,134,134,134, 30,246,243,243, 35,  0,192,245, 24,228,120, 47,  6,171,162, 80,170,248, 91,209,158,201, 69,152, 18,
-108,105,227,124,118,210,220,181,230,219,111, 49, 40, 76,143, 69,218,169,233,133,172, 78,217,154, 97,152,244,228, 43,191,236,  1,
-160,140,142,142, 62,111, 23,216, 29,132,148,245,220,123,211, 72,238,229,  5,125, 67, 95, 31, 31,236,142, 49, 64,157,113, 23, 12,
-161,155,218,182,109,171,124,215,147,  8,  9,  9,  9,180,178,113, 58, 55,121,254, 47,214,187,111,243,145, 95,102,  2, 11, 89,157,
-178,117,170,206,245,149, 65, 74, 89,  2,108,248, 97, 60, 88, 19,138,225, 33,132, 88,241,228,146, 85,  3,219,133,245,113,175,227,
- 10,150,234,193, 10, 41,122, 78,182,229,199, 69, 43,247,213,106,199,251,141, 45, 97, 71,165, 92,253,235, 70, 31,127,242,228,201,
- 92, 71, 71,199,189, 25, 25, 25, 47, 90,167,186,186,186,118,244,240,240,152, 63,103,206, 28,143,148,148, 20,197,237,219,183,139,
-246,236,217,147,192, 48,204,156,244,244,244, 42,191,238,239, 23,235, 38,  6,154,137,214,197,148, 24, 94,140,161, 19, 32, 23,214,
-255,116, 96,255,171,109,251,127, 42,121,122,106, 43,172, 19, 30, 98, 89,116,166, 49,181, 88,221, 63, 86, 73, 51, 76, 49, 87, 98,
-177,120,207,138, 61,123,158,212,171, 87,143,148,150,150, 66,175,215, 35, 39, 39,  7, 63,110,219,253,128, 82, 10, 43, 43, 43,156,
- 58,117,138, 29, 59,118,236, 30, 23, 23,151, 94,111, 51, 89, 47, 13,211,  0,161, 80, 72,164, 82,169,103, 98, 98, 98,162,135,135,
-135,250, 77, 38, 69, 44, 22, 87,219, 96, 73,165, 82,176,236,219,131,  0,213,209, 52, 24, 12,196,148,245,213,209,172, 72, 91, 69,
-227,246,215,215, 87,192,227,241,192,178,108,165,231,242,103,247,246,150,  8,150, 50,235,157, 12, 22,165,212,189,162, 35,205,223,
-173, 32, 44,143,132,  1,  0,251,182,161, 24,170, 19,193, 42, 55,123, 16,137, 68,184,112,225,  2,186,116,233,  2, 74, 41,196, 98,
- 49,100, 50, 25, 36, 18,  9, 46, 95,190, 12,145, 72,  4, 30,143, 87,157, 40, 22, 53, 24, 12,219,126,254,249,231,175, 23, 44, 88,
- 32,173, 56, 70,133,193,250,233,167,159, 84, 26,141,102,155, 41,  6,139, 88,  5,244,181,180,178,254,164,160, 32,119, 83, 19, 95,
-203, 74,123, 17,190,105,159,242,246, 88,255,117, 42,134,105,160,148,118,123,125, 40,134,138,109,198,141, 27,135,215,135,112,168,
-108,152,  6,103,103,103,171,117,235,214, 13,101, 89, 54,160,124,213,235,189,  5, 43,238, 99,197,251,169,162, 87,225, 43,189,  8,
- 57, 56,170, 29,193, 98,  8,224,196,127,238,103,105,227,122,118,194,220,181,230,155,175,243, 80,152,254, 16, 57,103,191, 45,164,
-  6, 85,235,168,168,168,219,246,245,186, 35,188,105,235,102,109, 63,236,  5,135,131,187,113,243,202, 25,252,184, 98,  3,190, 26,
-253,121,165, 31, 74,246,246, 54,200,185,162,134, 62,255,  9,  8, 33,209,239,122,  2,141, 26, 53,242,182,180,118, 60, 55,105,222,
- 47,214, 59,162,248, 40, 72,251,143,  9,156,182,242,236,237, 47,134, 14,122,101,123, 83,167,199,249, 68, 36,234, 22,232,227,186,
-190, 95,199,166, 86, 22,196,  0, 67, 82, 44,214,125,218,  7, 81, 93,116,104,218,215,  2,141, 58, 41,224, 21, 44,233,115,228,215,
-188, 54,206,205,201,144,191, 50,154,245,178,185,114,118,118,238,226,234,234, 58,251,240,225,195,238,  6,131, 65,113,225,194,133,
-226, 61,123,246, 60, 53, 24, 12,203,211,211,211, 15,155, 28, 29, 43,209,190, 48, 87, 65, 22,194,134, 67, 62, 27,116,105,236,210,
- 53,146,  7, 81, 55,177,112,219, 65,152,243,244,198, 91, 25,234,222, 49, 37,255,169, 62,172, 52,163,241,249,115,119,236,216, 33,
-247,247,247, 39,185,185,185, 47, 34, 45, 58,157, 14,133,133,133, 40, 46, 46,134, 70,163, 65, 80, 80, 16, 51,107,214, 44,249,183,
-223,126, 59, 23,192, 40, 83,211,107,103,103,  7,161, 80,  8,157, 78,247,194,164,136, 68, 34, 88, 90, 90,162,176,176, 16, 39, 79,
-158, 68, 85,131, 83, 10,133,162,116,134, 33,110,102, 10,133, 94, 46,151, 83,185, 92,254,167,109,170,171, 89,110,114,178, 59,118,
-236,104, 55,103,206, 28, 65, 72, 72,200,139,245, 21, 85,132, 53,209,164,148, 42,219,181,107, 39, 91,190,124, 57,220,221,221,161,
-213,106, 95, 49, 82, 12,195, 64, 40, 20, 34, 57, 57, 25,243,230,205,  3,165,212,244, 15, 25,117,190, 30, 65,131,236,161,202,213,
- 67,149,171,135, 58, 71,135,210, 44, 61,244, 74,227,223,173,  0,171, 73,  3,116, 19, 34, 97,246,239, 26,193,170,168,174, 20,139,
-197, 72, 76, 76,196,241,227,199, 17, 17, 17,  1,115,115,115,148,150,150,226,226,197,139, 72, 77, 77,133, 88, 44,  6,143,199,171,
- 86, 35,247, 90,181,106,253,112,227,198,141, 46, 99,198,140,  9, 24, 54,108,152,212,207,207, 15,  9,  9,  9, 88,178,100,137,250,
-222,189,123,241, 86, 86, 86,115,128,170,231,153,117,113,171, 53,118,221,182, 67,130,193,253, 59,142,  6, 74, 97, 74, 47,194, 87,
-247,249,223, 52,118,127,203, 48, 13, 29,223,178,249,203, 67, 56,188, 50, 76,195,203,236,219,183,207,211,197,197,197, 15,101, 61,
-  3,129, 63,247, 22,124,153,155, 81, 81, 81, 97,224,122, 17,114,188, 15,131, 85, 94, 64,143, 15,255,232, 27,243, 77,215,248,200,
- 79,141, 65,225,197,153, 47,204, 21, 80,214,240,221,190, 94,119, 24, 89,138,214, 29, 62,170, 24, 20,244,245, 66, 38,232,229,113,
-171,  4, 18, 69,144,129, 10,  1,168, 97, 40,120, 10,145, 72,116,187,186,  9,126, 93,147,101,217,137,141, 63,250,198,122,203, 77,
- 62, 10,211, 30, 34,251,220,140, 66, 86,167,108,157,172,117,189,253,197,208, 65, 38, 53,106, 39,132,180,173, 24,211,227, 19,145,
-232, 91,  1,143, 76,255,176, 69, 67, 97,179, 96, 31,200,179, 18,145,145,146,134, 93, 15,179,243,226,243, 53, 67, 46, 19, 29,146,
-158,106,214,117, 26,106,109,109,229, 40, 64,231, 17, 54,214,215, 14, 22,237,115,105,205,232,168,142, 46, 72,187, 68,103,189,174,
-249,190,168, 74,211,197,197,197, 91,161, 80,252,120,236,216, 49, 59,145, 72,100,254,224,193,  3,227,222,189,123,147,141, 70,227,
- 79,233,233,233, 59,107,162, 25, 40,149,186,  6,212,245, 60, 63,118,241,106, 73, 73,169, 18,165, 90, 29,156,221, 92,140,231,163,
- 99, 63,138, 41,209,238, 55, 69,211,193,193,161, 85,255,254,253,235,135,132,132, 48, 47,155, 43,173, 86,139,162,162, 34, 20, 23,
- 23,163,168,168,  8, 69, 69, 69, 72, 77, 77, 69,211,166, 77, 25, 63, 63,191, 32,  7,  7,135, 86,153,153,153,103, 95,215,124,105,
-152,134,175,  1, 48, 50,153, 44,238,202,149, 43,234,143, 62,250,  8, 82,169, 20,165,165,165,112,117,117,  5,203,178,184,120,241,
- 34,226,226,226, 10,  0,236,200,200,200, 56, 85, 89, 58, 85, 42,101, 45, 66,  8,207, 92,161,104,219,190,125,251,254, 67,134, 12,
-177,124,121,251,154,104,  2, 64,118,118,182,199,133, 11, 23,190,237,214,173,219,232, 14, 29, 58,200,166, 77,155, 38,240,244,244,
-132,193, 96, 32, 53,213,204,207,207,183,136,142,142, 94,212,172, 89,179, 47, 58,116,232,192,159, 63,127, 62, 44, 44, 44, 96, 52,
- 26, 33,149, 74, 81, 84, 84,132, 57,115,230,224,210,165, 75,  6, 74,233,202,194,194,194, 73,149,105,190, 50, 14,214,132,197, 13,
- 42,203,135,111, 27,  7,235,175,200,243, 42,149,202,161,186, 81, 49, 83,210, 25, 29, 29, 77, 95, 31, 15,171,178,  8,214,155, 52,
- 43,162, 75,124, 62, 31, 25, 25, 25, 56,116,232,208, 43, 99, 96, 85, 44,111,171, 34,124, 75, 58,233,185,115,231,140,132,144,  8,
-131,193, 48,101,220,184,113, 67,148, 74,165,171, 92, 46, 79,211,233,116,155, 44, 45, 45, 43,198,193, 18, 86,165, 41, 18, 73,  4,
-132, 97, 32,149,200,165, 42, 85,118,210,155,122, 17,190,118,173,147, 68, 34,  7,155,138,125,254, 87,247,253,181, 97, 26, 94, 25,
-138,225,181,125, 94, 25,194,225,245, 97, 26, 94,214,236,222,189,123,  2,128, 71,148, 82,134, 16,242,232,245,222,130, 47,201,214,
-141,138,138, 10, 11, 13, 13, 61, 79, 41,149,189,222,139,240,175,200,243,255,100,205,127,141,193,  2, 32,185, 28,245, 24,140, 56,
- 11,197,215,127,124,197, 92,189,120,210, 89,224,230,149, 51, 96, 89,160, 69,187, 30, 85,154, 25,131,166, 52,126,238,174,103,193,
- 70,173, 10,134,162,164,184, 14, 31,118,202,122,151,196,219,  5,245,128,155,144,202, 47, 69,199,131, 47,201, 69,193,181, 31, 10,
-136, 81,211, 58, 42, 42,234, 78,141, 51, 13, 48,109,245,209, 61, 66, 98, 97,141,187,227,  6, 35,173,160, 20, 71,159,229,255, 70,
-149,154, 81, 91,105, 89, 85,160,107,  4,185,184,254,155,140, 85,205,123, 90,244,177,117, 17, 96,241, 87,155, 32,153,106, 35,108,
-212,166,197, 95, 58, 71, 97, 69,195,247,117,235,214,141, 12,  9,  9, 49,251,242,203, 47, 31, 23, 22, 22,190,210,240,189,186,196,
-168, 84, 41,129, 10,209,234,179,191, 44,254, 74, 26, 24,142, 61,243,166, 25, 47, 68, 63,234,126,191, 88,123,200, 84, 13,177, 88,
- 28, 57,106,212, 40, 97,105,105,233,159,204,213,235,  6,171,168,168,  8,119,239,222, 69,175, 94,189,196,177,177,177,145,  0,206,
-190, 37,130, 51,163,124,192, 73,190,173,173,109,246,234,213,171,187,109,217,178,165,231,144, 33, 67,196,145,145,145,120,240,224,
-  1,110,220,184,161,209,106,181,127,  8,133,194,253,137,137,137, 38,181,242,166,148, 26,  1, 28,247,240,240, 56,191,122,245,234,
-110, 44,203,190,152,207,242, 29, 52,245,  0,102, 88, 91, 91, 47,218,179,103,207,194, 51,103,206,244, 31, 56,112,160, 68,175,215,
-147,119,208, 52,  0, 24,103,103,103, 55,253,200,145, 35,155, 78,156, 56,209,253,147, 79, 62, 97,198,140, 25,131, 21, 43, 86,224,
-247,223,127,103,141, 70,227,126,129, 64, 48, 40, 59, 59,187,202, 14, 40,175,140,131, 85,201, 56, 87, 85,253,110,  2,183,254, 11,
- 89,255,157, 53, 95,143,132, 53,108,216,208,225,229, 94,154, 47,255, 53, 53,130, 69,  8, 65,104,104,232, 43,255,175, 24,146,129,
-199,227,189,178, 84,167,138, 16,128, 37,165,148,  5,176, 18,192, 10,188, 58,138, 59, 15,255, 25,233,221, 36, 92,220,220,145,154,
- 12,155,156, 82,117, 65,229,147, 61, 59,216,184,184,185,255, 21,229, 90,193,172, 89,179,150,204,156, 57,115,201,235, 67, 49,188,
-188,221,235, 67, 56,204,158, 61, 27,111, 27,166, 33, 45, 45, 45,127,214,172, 89, 63,  0,128,159,159, 31, 41,175, 22, 12, 69,121,
-111,193,151, 52, 55,163,108,170, 28,217,176, 97,195,  6,  2,120,171, 38,  7, 71,117, 12,214,215, 37, 81,203,244,  0,108,  8, 33,
-211, 82,117,174, 15,254, 92,136,  0, 63,174,216,240,202,164,208,149,193,227, 49,211,178, 14, 14, 94, 78,129,124, 30,193,180,119,
- 77,188,149,165, 57,140,197,198,111, 74,163,151,179,148, 82, 75, 66,200,212, 91,183,110, 61,120,103,103,110, 97,141,226, 57, 35,
-241,123, 76, 26,205, 40,213,247,216,170,125, 53, 82, 83,222,230,170,175,115,115,178,203,202, 89,176,119, 92,107, 27,114, 56,111,
-224,223,226,134,198,196,196,204,247,246,246,230,173, 89,179,230, 51,173, 86,251, 74,195,247, 26,107, 22,107, 39,  7, 41,132, 60,
- 63, 79,183,209,177,137, 73,221,238, 23,155, 86, 45,248, 18, 34, 23, 23,151,251, 74,165, 18,132, 16,104, 52,154, 23,198,170,184,
-184, 24,133,133,133, 47,254,175,211,233,144,157,157, 13, 79, 79, 79,188, 52,102,210,219, 76, 70,250,203, 30,193,202,202,234,216,
-242,229,203,251, 47, 95,190,188, 13,128,211, 42,149,106, 71,126,126,126,141,134,254, 40, 55, 58,187,164, 82,217,143,132, 16, 23,
-177, 68,170,189,116,233,210,209,119,209,204,203,203, 43,  6, 48, 66, 42,149,206,253,249,231,159,151, 75, 36,146,176,172,172,172,
-119,210, 44, 55, 79, 31,217,216,216, 56,111,222,188,121,247,250,245,235, 27,243,249,252,107,132,144,222,  5,  5,  5,213,158,236,
-153,188,250,245, 94,237,223, 77,224,247,255, 66,182,127,103, 77, 83,135, 95, 48, 21,131,193, 80, 50,115,230,204,172, 55,205, 59,
- 88, 97,166, 94, 94,167,211,233, 76, 26,230,196,209,209,209,228,177,200, 42, 27,122,  7,  0, 24, 66, 84,  0,164, 95,207, 94, 84,
-254,193,108,242,100,207, 32, 32,218,255,101,185, 54,115,230, 76, 58,123,246,108, 66,  8,217,143,178,241,168,158,188,222,  8,253,
-229,223,102,207,158,141,153, 51,103,210, 89,179,102, 85,169, 25, 27, 27, 75,  9, 33,167,  1, 36,  0, 72,124, 89,247,229,245, 21,
-251, 84,166,201,193, 81,165,193, 98, 41,144,170,115, 77,  6, 48,248,229,117,127,126,193,225, 79,109,174, 42,243, 88, 29, 58,116,
- 56, 13,192,239,125, 37,190, 32,191, 16,196,186, 97, 82,126,126,238, 39, 89,247,247,191, 23, 77, 22,248,113, 72,163,200,175,  0,
- 16, 10, 44,126,221, 92,189,242, 21,116,145,238,119,106, 74, 22, 52,106,211, 98,124,249,203,103,254,223,225,166,190,169,225,251,
-187,242,166,134,239,213,120,217,156, 16,139,197,164,184,184, 24, 42,149,234,149,104, 85, 81, 81, 17,148, 74, 37, 74, 74, 74, 80,
- 49,181, 71, 73, 73,  9,204,204,204,160,215,235,171,245,165, 88,110, 82, 86,135,132,132,172, 43,175, 38,121,103, 84, 42,165, 43,
-  0,132,132,132,  8,222,159,166, 42, 13, 64,207,247,169,153,155,155,155,  6,160,137,151,151,151,200,212,201,162, 43,139,100,213,
-244,119, 19, 88,243, 95,200,242, 91,241, 55, 35, 41, 41,201,255,125,107,166,165,165,197,189, 79,189,220,156,140,181, 95, 12,238,
- 53,170, 98,210,103, 83, 38,123,174, 48,102,121,185, 25,107,255, 87,215,178, 98,154, 17,  0,212,197,197,101,243,243,231,207,221,
-  9, 33, 73,175, 71,146, 94,255,109,214,172, 89,120,219,152,127, 47,107,  2,128,167,167,231,190,228,228,100,103,161, 80,152,254,
-178,238,235,235, 43,211,228,224,120, 83, 70,251,175, 45,  0,130,254,159,104,182,229, 52, 57, 77, 78,147,211,228, 52, 57, 77, 78,
-243,175,211,252,167, 45, 12,103, 49, 57, 56, 56, 56, 56, 56, 56, 56,222, 47,  4, 64,208, 91, 34, 91,247, 77, 22, 33, 36,168,  6,
-145,179,251,127, 35, 77,251, 74, 52, 79, 85,161,217,182,  6,233,228, 52, 57, 77, 78,147,211,228, 52, 57,205,127,165,102, 85,218,
-255,152,222,137, 92, 21, 33, 23,230,229, 52, 57, 77, 78,147,211,228, 52, 57, 77,174,138,144,171, 34,228,224,224,224,224,224,224,
-224,248, 91,243,214, 97, 26,122,214, 43,235, 62,252,199, 61,174,195,  4,  7,192,227,241, 22,180,104,209, 98,212,165, 75,151,126,
-210,235,245,115,106,162, 65,  8,113,118,112,112,248,142, 82,218,132, 16, 34,230,243,249, 15, 51, 51, 51,231,235,245,250,139, 53,
- 77, 23, 33,196,205,209,209,241, 59,150,101, 27,  3, 16,242,249,252,152,180,180,180,121,148,210,107,239,160,105,238,232,232,216,
-138,101, 89,215,178, 83,231,101,165,167,167, 95,164,148,166,114, 57,129,131,131,131,131,163,198,  6,235,163,  0,  2,  6, 64, 64,
- 36,156,102, 15, 39,252,153,107,105,114,197,139,  7,101,131,177,249,  1,136,  5,112,139, 82, 90,244, 46,  9,248,255,162,249,119,
-135, 16,194, 88, 90, 90,182,147,201,100, 99, 75, 74, 74,130,205,205,205, 99,202,167,199, 57, 84, 62, 40,225,187,104,219,247,239,
-223,127,234,186,117,235,208,167, 79,159,233,132,144, 37,148,210,146,234,104,216,216,216,116,245,244,244, 92,187,124,249, 10,187,
-102,205,154, 17,169, 84,138,216,216, 88,151, 81,163, 70,134, 58, 59, 59,239, 74, 75, 75,251,162,186,233,178,179,179,235, 93,167,
- 78,157,229, 43, 87,174,180,107,210,164,  9, 17,  8,  4,136,138,138,114, 29, 59,118,108,184,147,147,211,166,244,244,244,137,213,
-213,180,182,182,246,175, 93,187,118,135, 85,171, 86,201,154, 54,109, 10,177, 88,140,187,119,239, 42,134, 15, 31,238,226,236,236,
-124, 55, 45, 45,237,100,117,244, 66,134, 71, 11,132, 50, 29, 31,  0,116, 74,161, 33,106,109, 67,189,169,235,184,226,137,131,131,
-131,227, 31,100,176,122,  7, 16, 16,  0,129,205, 48,135, 24,240, 53, 24,144,113,253,201,111, 43,126, 99,110,180,109,219,214,247,
-243,207, 63, 39,229, 83, 71,248,239,220,185,243, 35, 30,143,247,136,101,217,235,  0,238,184,184,184,232, 42,166, 37,120,157,246,
-222,228,197, 24, 89, 39,159, 66,  8,160,  1,195, 48,225, 85,105,126, 80,  7, 58, 66,128,227, 79,222, 28, 73,107,231, 69,  0, 10,
-156,124, 86, 61,205, 19,241,255,140,200,156, 66,161,240,182,179,179,155,104, 99, 99,211, 49, 52, 52,180,104,196,136, 17,137, 15,
- 30, 60,120,236,235,235,171, 94,191,126,253,124,189, 94,191,202,199,199,231,100,113,113,241,162,119, 24, 23,203, 67,175,215,227,
-209,163, 71, 96, 24, 70,  0,192, 19,192,189,106, 24, 52, 39, 15, 15,143, 53,103, 47, 71,219, 23,105,121,120,146, 77,  1, 40,193,
- 10, 29,177,122,195, 46,171, 25, 83, 70,247, 55, 55, 55,191, 84, 84, 84,180,171, 26,154,110,117,234,212, 89,126,255,254,125,123,
-137, 68,  2,150,101, 81, 92, 92, 12,103,103,103,172, 95,191,222,234,171,175,190,250, 76, 38,147, 93, 80, 42,149,  7,171, 99,204,
-107,215,174,221,225,193,131,  7, 50,177, 88, 76, 12,  6,  3,209,104, 52,112,115,115,163,219,183,111,151,140, 25, 51,166,129, 88,
- 44,126,174,209,104, 30,155,100,174,126,137, 22, 20,229,156,141,160,201,170,233,  0, 64, 36,210,121,145,179,173,111, 20,229,156,
-109, 84,213,186,144, 95,112, 53,106, 24,103,178, 56,254,183, 56, 57, 57,133, 88, 89, 89,237, 41, 40, 40, 56,159,158,158, 62,164,
-124,102,131,119,253,248,115,230,243,249,158,148, 82,203,242,255, 23, 24, 12,134,  4, 83,230,220,124, 27,182, 94,173,186, 64, 44,
- 27, 12,202, 54, 96,  0, 16,134,185, 99,212, 41, 55,230,196,157, 61,248, 78,154, 34,233,103,  0,109,192,  0, 44, 97,152,187,172,
- 65,249,107,118,236,217,163, 92,206,224,120,111, 17,172,128,112, 88, 17, 96,202,180, 17,195, 24, 62,143, 71,230,175,253,165,223,
-205, 43,  7,169, 83,173,  6, 47,166,220,104,222,188, 57,154, 55,111, 78, 22, 46, 92,232,119,230,204, 25,191,237,219,183,235,175,
- 92,185, 18,  5, 96,211,155, 52, 41,  5, 90,118,144, 62, 55,232, 85,110, 77, 63,144,170, 61, 26,175,218,222,164, 73,115, 86, 44,
- 22,163, 50,205,147, 87,174, 68,125, 80,231,205,154,101,194, 64,157, 96,254, 73,151,134,110, 36,178,243,140, 36, 83, 53,223,150,
-206,255,103,230,234,188, 66,161,240, 26, 62,124,248,147,145, 35, 71, 94,144,203,229, 20,  0,148, 74,165,184, 75,151, 46,249,221,
-187,119,207, 85, 42,149, 88,189,122,181,219,242,229,203, 79,154,155,155,167, 22, 21, 21, 53,170, 78, 84, 12,192,204,174, 93,187,
- 78,255,242,203, 47, 81,171, 86, 45,140, 25, 51,  6,122,189, 62,138, 16, 50,  3,192,247,166, 12,186,103,111,111, 63,115,233,210,
-165,246,165,122,  1,190,221, 18,143,188,146,178,  1, 69,101, 34,  6, 95,180,149, 96,244,232, 49, 22, 55,110,220, 88,136,215, 70,
-144,174, 12, 71, 71,199,239, 86,174, 92,105, 39,145, 72, 64, 41, 69, 73, 73,  9,138,139,139, 81, 82, 82,130,210,210, 82,140, 28,
- 57,210, 34, 38, 38,102, 41,128,131,213,208,108,181,106,213, 42,153, 88, 44,198,201,147, 39,235,106, 52, 26,158, 86,171,133,209,
-104, 52,214,169, 83,231,209,151, 95,126, 41,190,127,255,126,123,  0, 38, 25, 44,167, 12,  8, 10, 85,170,149, 63,255,240,149, 29,
-  0,124, 57,229,199,149,128, 42,156,154,176,206, 41,  3, 97,  0, 56,131, 85,121,254,228,  1,232, 33, 16,  8,122,122,121,121,133,
- 62,121,242,228,182,193, 96,248,  3,192, 31,229,211, 19,189,139,118, 27,103,103,231,239,210,210,210,126,166,148,110,253,183, 92,
- 83,123,123,251, 63,246,238,221,235,182,101,203,150, 79,127,253,245,215, 35,120,135, 81,242,  9, 33,  2,  0, 17,141, 26, 53,178,
-237,217,179,167,192,209,209, 17, 74,165, 18,241,241,241,178, 83,167, 78,217, 73, 36,146, 92,141, 70,115,181, 58,247,202,182,110,
- 83, 51,240,205,119, 70,180,106,219,172,207, 71, 61, 20, 14, 54, 22, 80,105,141,120,146,148, 94,235,216,145,  3, 45,157,131, 62,
-188,162,211, 21,246,203,137,187, 92, 82, 93,205, 86, 29, 58, 55,107,219,166,141,194,194,210,  2,133,165, 58, 60, 77, 76,117, 63,
-123,242, 96,115,167,160, 15, 47,176, 68,255, 73,230,189, 19, 74,238,169,227,168, 14,127,106,228,190,251,  1,125,211,131,  2,185,
-153,252,141,  2, 22, 22, 22,136,140,140,196,252,249,243,  5,  0, 26,191,106,170,254, 51,108,  2,  3,192,104,212, 58, 77,255, 98,
- 52, 68,124, 42,254,176, 99,123, 98,110,110,110,146, 38,239, 45,154,  0, 64, 25, 33, 28,172, 13,109,195,235,170, 90,102,222, 25,
- 51,224,206,249,239,130,180,234,  2,193,235,154, 50,153, 12,222,222,222,248,230,155,111,222,148,206,247,222, 37,244,127,161, 73,
- 41,117,246,247,247, 47, 94,186,116,105,221, 89,179,102, 89,169,213,106, 57,  0, 55,175,128, 70,174, 12,195,184,169,213,106,243,
-153, 51,103,218, 45, 92,184,176,174,157,157, 93,  1,165,212,174,154,233,156,187,114,229,202, 25,251,247,239,103,154, 55,111, 14,
- 43, 43, 43,180,106,213, 10, 71,142, 28,225,255,244,211, 79,243,  1, 76, 55, 37,157, 12,195, 52,111,214,172, 25, 97, 89,138,252,
- 18, 61,206, 46,  8,193,229, 31,195,160,212,178,200, 47, 40,130, 90,173,134, 76, 38,147, 18, 66,204, 76, 61,119,150,101, 27, 55,
-105,210,132,  0,101, 35,191,151, 45,165, 40, 46, 46,251,171,213,234, 32, 16,  8, 20,132, 16,113, 53, 52, 93,155, 54,109, 10,  0,
- 80,169, 84,252, 54,109,218,144,214,173, 91,147,226,226, 98,126,197, 52, 62,  2,129, 64, 68,  8,225,155,162,169,149,  9,  8, 75,
- 89,  7,185, 76,106, 43,151, 73,109, 89,202, 58,  0,128, 41,235,180, 50,  1,249, 43,243, 39, 33,196,142,199,227,109,240,242,242,
-122,200,227,241, 54, 19, 66, 28,223, 69,147, 16, 18, 70,  8,153, 47,147,201, 78,249,251,251, 39,203,229,242, 51,132,144,239,  9,
- 33, 17, 53,209, 36,132,136,100, 50,217,153,249,243,231,239,190,125,251,118,159,211,167, 79,123,222,187,119,239,163,133, 11, 23,
-238, 52, 51, 51,187, 72,  8,145,189,203,179,233,233,233,185,254,250,245,235, 97, 77,154, 52, 89, 87, 89, 30,170,142, 38, 33,132,
- 71,  8,  9, 38, 21,243,227,252, 13,202,144,151,113,117,117,117, 14, 12, 12,116, 19,139,197,104,214,172, 25, 40,165,145,239,168,
- 25, 49, 98,196,  8,199,  9, 19, 38,  8,238,220,185,131,117,235,214, 97,255,254,253,200,202,202, 66,231,206,157,133,173, 91,183,
-118, 20,139,197, 17,213,210,228,155,239, 28, 59,110,124,135,175,198, 12, 85,220,125,174,195,198, 83,207,177,239,106, 58,178,148,
- 34,116,249,104,144, 69,251,110,125,219,139,196, 22, 59,171,171, 57,117,202,148, 14,195, 62,251, 88,241, 32,157,197,129,107, 25,
-184,246,168, 16,  6,129, 37, 58,125, 52,196,170, 65,211, 14, 31,242, 33,216,244,119,184, 71,255,116,205,127, 69,  4,107,230, 58,
-154, 63,103, 36,249, 97,254,234, 95,166, 51,132, 80, 87,159,246, 15, 60,189, 27,151,178, 44, 11,149, 74, 85,241,162,129, 74,165,
- 66, 82, 82, 18,174, 95,191, 14, 11, 11,139, 74, 15,116, 44,158, 98,222, 23,255, 57, 92, 65, 97, 33, 92, 92, 61, 33,147,201,170,
-212, 60, 90, 73,117, 30,159,150, 69, 67,134,246,234,206,127,158,158,206,191, 18,125, 54,100,215,178,237, 33,110,117, 62,136,109,
- 16, 57,249,190,153, 69, 45,213,157, 59,119,112,245,234, 85,228,231,231,163, 81,163, 70,255,152,155, 71,  8,209, 47, 90,180, 40,
- 58, 45, 45,141, 92,186,116,169,193,156,165,219, 61,239, 21,213,230,101,151, 80,129,157,217,115, 79,127,217, 99, 99, 97, 97, 97,
-194,196,137, 19,207, 58, 58, 58,106, 70,143, 30,221,210, 68, 93,  9,  0,223, 94,189,122, 77, 29, 53,106, 20,226,227,227, 49,116,
-232, 80,213,141, 27, 55,114,155, 52,105, 98,243,235,175,191, 74, 39, 76,152,128,243,231,207,207, 36,132,236,  5,144, 64, 41,125,
-235, 92,106, 44,203,138,164, 82, 41, 80, 84,246,161,170, 51, 84,204, 77, 11,148,150,150,130,143,  2,136, 68, 34,  6,128, 29,  0,
- 83,191, 60,133, 98,177,248,133,185, 74,201, 42, 70, 82, 86,  9,138, 75, 52, 80,169,244,208,170,  1,177,185,  3, 15, 72,182,  1,
- 96,106,227,116,158, 88, 44,134,193, 96,128, 78,167,131, 90,173,134, 90,173,134, 70,163, 65, 97, 97, 33,138,139,139,193,231,243,
-101,  0,204,  1,228, 85, 41, 38,146, 26,120,140,112,254,215,243, 86,206,  2,  0, 30, 35,156,111,  6, 53,107,202, 58,158, 72,106,
-248, 11,243,149,216,206,206,238,236,238,221,187,253,189,189,189,145,144,144,224,215,187,119,239,112, 66, 72, 48,165, 84, 89, 77,
- 45, 25,195, 48, 63, 12, 30, 60,120, 84,255,254,253,137,143,143, 15,248,124, 62, 12,  6,131,107,124,124,124,171,223,126,251,109,
- 10,159,207,255,213,104, 52, 78, 52,181, 93, 31, 33,132, 17,137, 68,187,214,174, 93,219, 34, 60, 60, 28,155, 55,111,198,141, 27,
- 55,216,176,176, 48,102,224,192,129,112,119,119, 15, 31, 56,112,224, 62, 66, 72,167,154, 68,178,  8, 33,238,  3,  6, 12,112,227,
-241,120,104,210,164,137,240,202,149, 43, 13,  1, 92,121,199,107,106,230,234,234,122, 62, 50, 50, 50,248,212,169, 83,209,132,144,
-200,234,180, 99,116,118,118,238,230,224,224,176, 80,161, 80, 88,153,186, 79, 73, 73,137, 50, 51, 51,115, 82,106,106,170, 73,243,
-145, 82, 74, 27,  7,  5,  5, 33, 53, 53, 21, 94, 94, 94, 16, 10,133, 17, 46, 46, 46,195, 41,165, 29, 88,150,253,166, 58, 77, 12,
-  8, 33,206, 17, 17, 17,182,145,145,145,228,251,239,191,  7,  0,  8,  4,  2, 24,141, 70, 48, 12,  3,129, 64,  0, 63, 63, 63,242,
-236,217, 51,107, 66,136,179, 41,213,133,182, 94,173,186, 52,105,211,161, 89,139,240,250,204, 79,123,158,192,200, 26,193, 35,  6,
-240,  9, 11, 86, 47,134, 88,200,131, 79, 96, 40,239, 81,204,221,112,219,186, 31,116,201,137, 59,121,208, 20,205, 14, 93,186, 54,
-247,247,245, 97,150,237,123,138,130,212,135,198,212,216, 11, 57, 12,143,129,127, 72,107, 91,159,128, 96, 94,112,120,164, 32, 45,
- 33,166,149,181,119,203,182,121, 79,206,115,166,130,163,250,  6,139, 16, 66, 41,165, 47,190,172,102,172,166, 51,108,173,136,199,
-131,251,119,153,228, 12,109,233,221,187,119, 97, 99, 99,  3,123,123,123,152,155,155,227,209,163, 71, 56,117,234, 20,226,226,226,
- 64, 41, 69,112,112,112,181, 14,156,153,145,129,220,188,226,119,214, 60, 26, 79, 49,119,100, 89,178,107, 57, 57,161,150,147, 19,
- 63, 39,191,  0, 87,239,222,243, 63,248,107, 91,223, 76,102,248, 70,149, 74,245, 98,123,189,254,159, 87,235,226,224,224, 96,248,
-226,139, 47,243,134,173, 74,168,211,175,181, 51,175, 91,132, 35,246, 93, 73,231,237, 60,199,163, 51, 62,175,159,253,228,201, 99,
-147, 79, 90, 36, 18,125,215,177, 99,199,175, 40,165,130,177, 99,199,  2,  0,  6, 13, 26, 84,116,237,218, 53, 31, 74,105, 22, 33,
-196,249,243,207, 63,127,124,246,236, 89,217,248,241,227,121,  6,131,225,  1,159,207,167,132,144, 57,148,210, 89,111,204,100,124,
-254,237, 59,119,238,120,192,204, 29,182, 10, 30,218, 79,143,  6,  0,152,137,129,236,140, 20, 92,191,119, 14, 54, 54, 54, 22,205,
-155, 55,143,245,246,246,214,164,167,167,143, 45, 45, 45,221, 84,105,198,229,243, 99,162,162,162, 92, 93, 93, 93,203, 12, 86,142,
- 10, 27,175, 50, 80,106,164,  0,164, 32,172, 28,230,246, 30, 10, 31, 93,209, 29, 59, 59, 59,157, 86,171,157, 90, 84, 84, 84,105,
- 85, 15,143,199,203,186,127,255,190,194,205,205, 13,  0,244,251,246,237,227,107,181, 90, 80, 74,141,135, 15, 31,238,144,156,156,
- 28,236,233,233,201,184,186,186, 78,245,246,246, 86,165,166,166, 14, 85,169, 84,111,173, 66, 57, 54,198, 75,215,114,214,185, 85,
-  5,  9,201,191,  1,128, 75,184,127,222,161, 89, 13,181, 45,103,149, 84,185,238,216, 24, 47, 29, 70,255,101,237,  4,  7,127,253,
-245,215,254,214,214,214, 24, 49, 98,  4,102,207,158,141, 25, 51,102,120,143, 24, 49, 98, 24,128, 37,213,120,201, 74, 29, 29, 29,
-111, 46, 91,182,204,175,105,211,166, 56,114,228,  8,118,236,216,129,103,207,158, 25, 60, 61, 61,249,225,225,225,152, 57,115, 38,
-218,183,111, 63,116,244,232,209, 45,  9, 33, 13, 77, 52, 29,159,205,156, 57,179, 91,179,102,205,240,233,167,159,106,206,157, 59,
-215,  7,192,137,147, 39, 79,182, 62,127,254,252,158,109,219,182, 73,231,207,159,223,118,194,132,  9, 35,  0,172,168,193,249,119,
-111,209,162,  5,  0,160, 89,179,102, 88,184,112, 97,251,119, 49, 88,132, 16,145,141,141,205,225,205,155, 55,  7,215,173, 91, 23,
-159,124,242, 73,195, 62,125,250, 28, 38,132,124, 64, 41, 53,105,222, 72, 39, 39,167, 31,214,174, 93,235, 37,149, 74, 77, 62,174,
- 86,171,181, 30, 62,124,248,247,  0, 76, 50, 88, 44,203, 54, 14, 10, 10,194,190,125,251, 48,124,248,112,248,251,251,215, 15, 14,
- 14, 94, 51, 96,192,  0,140, 24, 49,162,141,157,157,157, 67,249,228,226, 85,191, 88,248,124,207,206,157, 59, 11,254,248,227, 15,
-  0, 64,139, 22, 45,208,182,109, 91,220,191,127, 31,151, 46, 93,  2,143,199,131, 92, 46, 71,211,166, 77, 69,105,105,105,158,  0,
-170, 52, 88,140, 88, 54,184, 91,231, 78,138,  3,215,210, 97,100, 13,  8,245, 50, 71,184,159, 61, 30,165, 20, 33,234, 97, 10,140,
- 90, 33,204,173,109, 16,209,178,157,117, 70,234,179,193, 48,165,121,128, 88, 54,184,103,183, 15,205, 14, 92, 77, 67, 65, 90, 44,
-125,114, 99,239, 25,189,186,116, 40,  0,220, 58,189,115,141,163,141,244,  3,159,144, 80, 94,228,  7, 93,173,254,216,145, 49, 24,
-  0,103,176, 56,222, 45,130, 85, 65,110,  1, 84, 54,142,254, 72,206,184, 93,246,255,220, 92,228,230,230,162,118,237,218, 88,190,
-124,249, 43,219,170,213,234, 26, 37,224,191,161,105,107,101,137,174,173, 90,242,238, 63, 90,205, 83,177,170,247,162,249,119,165,
-124,210, 82, 38, 41, 71,111,153, 93,168, 19,246,109,229, 70,  5, 60,  6,253, 90,213, 34, 63, 31, 76, 18,102,149, 10, 44, 25,134,
- 73, 98,217,170, 59, 18, 18, 66,  4,221,186,117,251,106,215,174, 93,130,216,216, 88,212,169, 83,  7, 58,157, 14,215,174, 93, 75,
-161,148,102,149, 31, 47,141,199,227,165,177, 44,235,221,160, 65,  3, 44, 88,176,  0,126,126,126,164, 83,167, 78, 83,202, 77,214,
-159, 14,148,150,150, 54,255,203, 47,191,108,241,203,198,157, 54,159, 52, 38, 40, 46,214, 64,169, 84,226,209,253,155, 40,205, 44,
-197,154, 53,107, 33,147,201,  8,  0, 97, 70, 70,134,112,194,132,241,235, 92, 93, 93, 59,167,164,164,244,124, 91, 90,211,210,210,
-230,141, 30, 61, 58,124,203,150, 45, 86,101,237,174, 84, 40, 86,137,113,125,113, 89,132, 50,124,194, 13,252,250,203, 58,166,158,
-135,220,166,184,184, 24, 67,135, 14, 93,230,228,228,212, 52, 61, 61,125,248,219, 52,211,211,211, 47, 14, 29, 58,212,229,183,223,
-126,147,120,123,123,199, 21, 22, 22, 34, 47, 47,143,217,182,109,219,104, 39, 39, 39,139,125,251,246, 19,185, 92, 14,  0,188,196,
-196, 68,225,151, 95,126,177,203,209,209,113, 91, 70, 70,198,167,111,187, 55,  0, 52,132, 32,221,217,185,182,151,242, 42, 51,203,
-217, 89,125,233,220,204,212, 45,132, 32,189,108, 27, 80,167,181, 78,  3,158,111, 22, 55,211,104,216,165, 25, 25, 73,113,148,130,
- 98,230, 95,215,  9,195,214,214,118,116,183,110,221,240,253,247,223,227,224,193,131, 19,172,173,173, 23,207,158, 61, 27,206,206,
-206, 95, 18, 66,150, 86, 99,178,219, 31,151, 44, 89,226,231,231,231,135, 65,131,  6,105, 79,157, 58,245, 53,128,125,  0,146, 46,
- 94,188, 88,107,211,166, 77, 93,118,237,218,245,253,178,101,203, 36, 43, 86,172,240,250,232,163,143,150,  2,248,220,132, 15,138,
-241,253,251,247,199,162, 69,139,112,238,220,185,143, 40,165, 71, 42,190,183,  8, 33, 93,230,207,159,127,122,250,244,233, 88,178,
-100,201,216,234, 26, 44, 66,136,153,191,191,255,183, 29, 58,116,192,197,139, 23,209,188,121,115, 68, 68, 68, 76, 32,132, 44,167,
-148,230,212,192, 92, 49,102,102,102,187, 54,110,220,216,220,195,195,  3,243,230,205,195, 87, 95,125,133,245,235,215, 55,255,228,
-147, 79,118, 17, 66,122,154,210,203,215,204,204,204, 76, 42,149,226,251,239,191,167,207,159, 63,207, 55,193,144, 89,125,251,237,
-183,196,162,170,170,133,255, 68,200,164, 98,177,184,137,175,175, 47,126,250,233, 39, 92,188,120, 17, 99,198,140,129,175,175, 47,
- 82, 82, 82,208,181,107, 87,217,227,199,143,123,  1,216,104, 98,185,100, 97, 99, 99,131,172,172, 44,  8,  4,  2, 52,109,218, 20,
-251,246,237,131, 70,163,129,189,189, 61, 10, 10, 10, 94,212, 38,240,249,124, 11, 19, 75,187, 32, 91,107, 11,100,197,164,130, 15,
-  3, 66,124,108,113,246,126, 46,116,122, 22,246, 54,150,200,200,202, 68,227, 32, 87,104,181,181, 64, 41,107,210, 76, 32, 34, 30,
- 19, 34,150, 72,145, 87,156,131,212,135,231,114,117, 70,205,240,130,103,151,146,  1,192,186, 78,139,225,183, 46,157,188,213,251,
-195, 22,246, 37,165,110, 32,148,109,  4, 14,142,106, 80,229, 64,163,111,122, 49,191, 28, 17,170, 64,167,211,189, 83, 66,254, 27,
-154,111,226,191,161,249, 55, 48, 89,172,139, 21,191, 80, 46, 97, 12, 39,163,178,140,122,131, 17,199,111,101, 24,101, 98, 98,176,
- 18,107,139, 88,150,165,132, 16,106,130,142,254,248,241,227,155,199,140, 25,131,197,139, 23,227,241,227,199, 16, 10,133,  8, 10,
- 10,114,170,104, 31, 69,  8,177,  8,  9,  9,177,103, 24,  6,143, 30, 61,194, 79, 63,253,132,207, 62,251,140, 94,185,114,101,253,
-219, 94, 20,148,210,219,233,233,233,107, 39,141, 29, 94,192, 40,147, 33,167, 57,208,229, 61,  6,171,202,198,215, 51,231, 35, 33,
-151, 69,244,179, 98, 68, 63, 43, 70,142, 86,142,159,126,222,192, 11, 12, 12,236, 34, 16,  8,218, 87,146,214,107,233,233,233,155,
-199,143, 31, 95,144,149,149,245,194, 56,235, 12, 44,116,134, 87,147,161, 80, 40,176,102,205, 26, 75, 55, 55,183, 94,  2,129,160,
- 85, 37,154,169,105,105,105,247, 70,141, 26,165, 73, 79, 79, 71, 97, 97, 33, 78,156, 56,241,129,171,171,171,197,172,249, 75, 72,
- 66, 46,125,145,206, 18, 98,131, 13,219,254,224,249,248,248,124, 44, 16,  8, 34, 42,127,121,185,120,249,251,215,217,125,237,218,
-181, 79,189,188,188, 70, 85, 24, 43, 74, 65,  1,192,211,211,115, 68, 84, 84,212,103,193,193,  1,187, 29, 28, 28,125,255,202,188,
- 68,  8,105,213,183,111, 95, 95,150,101,177,123,247,238,123,148,210, 37,123,247,238,189,169,209,104,208,175, 95, 63, 79,  0, 29,
- 76,212,  9,251,248,227,143, 71, 53,111,222, 28,227,198,141,211,157, 58,117, 42,132, 82,186,152, 82,154, 72,203, 72,162,148, 46,
- 63,127,254,124,131,209,163, 71,107, 26, 53,106,132, 79, 63,253,244, 51, 66, 72,243, 42,116,155,244,239,223,223,143,101, 89,236,
-220,185,243,238, 75,230,170,226, 30,158,217,179,103,207, 53,173, 86,139,  1,  3,  6,212, 38,132,180,174,198,185, 11,197, 98,241,
-238,185,115,231, 90,166,166,166, 98,224,192,129,154, 71,143, 30, 97,214,172, 89, 82, 11, 11,139, 35,149,181, 17,124,107,128, 68,
- 44,254,101,245,234,213,221,234,213,171,135,145, 35, 71,106, 87,173, 90, 53,102,212,168, 81,218,144,144, 16,172, 92,185,178,155,
- 72, 36,250,165, 90,145,255,204,204,130,115,231,206,217, 84,181,100,100,100,100,154, 24,253,150,121,123,123, 95,245,241,241, 41,
-242,247,247, 15, 53, 24, 12,120,252,248,241,211,223,127,255,157,245,245,245,197,166, 77,155,176,102,205, 26,180,105,211,  6, 12,
-195,244,170, 78, 90, 75, 75, 75, 33,145, 72, 32, 20, 10, 17, 21, 21,  5,141, 70,  3,153, 76,  6,137, 68,  2, 30,143,  7, 75, 75,
- 75, 40, 20, 10,  0,160,166,221, 31,208, 34,165, 30,  2,  1,  3, 62,195, 34, 54,169, 16, 58, 61, 11,137,144,  7,  1,159,  0,148,
-133,165, 92,  0,137,136,  7,134, 16,214, 68, 77, 20,150,234, 32, 18, 50, 16,  8, 69,132, 49, 24, 95,132,  8, 25,190, 81, 42,149,
-138,136,173,185, 24, 18, 33, 55, 38, 55,199,123,142, 96,  1,128,209,248,231, 94,186,111,138,  2,105,181,218,119, 74,200,127, 67,
-243, 45, 97,243,127,212, 13, 44, 42, 42,226, 95,189,122, 85, 33, 20, 10,197,221,130,195,115, 22,254,246,216,110,246,182, 56,136,
-249, 32, 29,  3,105,230,209, 35,  7, 69,197,197,197,182,190,190,190,185, 38,222,135,161,132,144,121,  0,  2,248,124,254,161,141,
- 27, 55,146,173, 91,183, 90,245,239,223, 63,158, 16,146, 26, 24, 24,232,190,113,227, 70,115,  0, 88,190,124, 57,221,181,107, 87,
-123,  0, 49,148,210,140,202,116,211,211,211,167,139,197,226, 43,143, 30, 61, 90, 46, 16,  8, 44,205,205,205,173,206,159, 63, 79,
- 50, 11,117,248,118,203,179, 23, 61, 11,229, 98, 30,166,245,180,199,224,193,159,241, 31, 60,120,240, 35,128,227,111,211, 76, 77,
- 77,157, 32,147,201,206,223,187,119,111,137,194,165,190,181,109,196,  4,243,214,211,202,170, 31, 29,173, 68, 96,202,203,196,130,
-130,  2,228,228,228, 96,194,132,  9,150, 19, 39, 78,156, 12,224,108, 37,233, 60, 33, 22,139,147, 98, 98, 98,218,241,249,124,177,
-153,153, 89,240,213,171, 87,201,243,  2, 61,166,109,122,138, 98,117, 89,109,171, 66, 34,192,236,254,174, 24, 61,122, 52, 63, 62,
- 62,254,  7,  0,205,222,164,231,226,226,226,237,239,239,191,123,251,246,237,254, 75,151, 46,205,123,242,228, 73,169,179,179,243,
-236,215, 54,211, 44, 88,176, 32,119,203,150, 45,117,  7, 14, 28,184,219,209,209,177,207, 59, 12,169,241, 78,152,155,155,127, 63,
-124,248,112,236,218,181, 11,249,249,249, 75,203,243,216,146,237,219,183,239, 28, 58,116, 40,182,108,217,242, 61, 33,228,152,  9,
- 81,172,142,253,250,245,195,209,163, 71,113,250,244,233,111, 41,165, 15,222, 98,106, 31, 19, 66,166,236,223,191,127, 89,255,254,
-253,177, 97,195,134, 14,  0, 42, 27,120,246,131,246,237,219,227,200,145, 35,200,205,205, 93,249,166, 13, 10, 10, 10, 86, 29, 56,
-112,160,113,251,246,237,177, 96,193,130, 15,  0,156, 49,193, 92,249, 89, 88, 88,108, 92,182,108, 89, 88,189,122,245,240,241,199,
- 31,171,117, 58, 93,135,175,190,250,234,224,142, 29, 59, 20,155, 55,111, 14, 29, 54,108,216,117, 66,200, 16, 83,  7,177,229,241,
-120,243, 87,172, 88,241,121,100,100, 36, 38, 76,152, 96, 56,126,252,120, 87, 74,233,  9, 66, 72,252,228,201,147, 15,255,244,211,
- 79,188, 69,139, 22,125,206,227,241,178,141, 70,227,215,127,201, 23, 54,195,204,157, 51,103, 78,227, 22, 45, 90, 32, 41, 41,  9,
-209,209,209, 48, 24, 12, 91,110,221,186,117,161, 69,139, 22,115,117, 58,221, 65,137, 68, 50,200,204,204, 44, 48, 48, 48,176,181,
-131,131,131, 44, 51, 51, 83,105,194,245, 44,136,143,143,151,219,219,219, 67, 32, 16,224,238,221,187,176,183, 47,155,242, 53, 43,
- 43, 11, 65, 65, 65,224,241,120, 40, 40, 40,  0,128, 66,211,204, 16,115, 47, 62, 49,173,182,181, 66, 14, 24, 37,184,253, 40,  5,
-118,182, 86, 48, 18,  6, 25, 25,233,  8,246,117,  5, 33,  4,  5,185, 25, 32,132,152, 52,151,174,145,178, 81,207,211,178, 92,108,
- 20, 98,212,107,220,206,230,234,177,236,173, 22,117,154, 13,227,243,  8, 79, 44, 49, 95,251,249,167,159,218,178, 44, 69, 65,110,
- 38,248, 12,115,131,179, 12, 28,239,213, 96,177, 44, 11,169, 84,250, 74,132,233,245, 40,144, 84, 42,133, 70,163,169,214,129,165,
- 82, 41,116,  6,188, 87, 77, 83,142,249,190, 53,255, 74, 12,  6,131, 98,226,196,137,225,225,225,225,169,109,218,180, 73,168, 91,
-215, 58,185,115, 99,169,237,178,245,123,131, 59,181,172, 23, 93,144,151,149,243,204,220, 92,147,152,152,104,255,235,175,191,134,
-235,245,122,153,137, 17,177,231,  0,158, 19, 66, 86,117,232,208,225,139,222,189,123,227,193,131,  7,246, 74,165,210, 94, 38, 43,
-147,216,186,117, 43,118,237,218,181,152, 82,106,242,192,155, 26,141,230, 24,  0, 47, 66,136,101,173, 90,181, 50,173,173,173,133,
-233, 37,165, 47,122, 22, 10,249, 12,154,126,117, 19,249,  5, 69,176,181,181,133, 66,161,240,172, 74,179,124,156,171,131,222, 31,
- 76,174,175,186,183,246,220,166,141, 27, 45,  0,128,199, 16,216, 89,  8, 81, 80, 80,128,236,236,108,228,228,228,128, 97, 24, 24,
- 12,  6,127, 19,210,249, 24,192, 99, 66,136,115,235,214,173,231, 42, 20, 10,176,121,165,200, 47,209,189, 82,  5, 89, 82,162,132,
-135,135,  7, 20, 10,197, 27,171, 35,172,173,173, 21, 98,177,120,211,186,117,235,252, 20, 10,  5,111,232,208,161,150, 67,135, 14,
-109,246, 54, 51, 38,147,201,120, 27, 54,108,240,  9, 14, 14,222,232,225,225,241, 65, 98, 98, 98,225,255, 42, 47,149, 15,121, 48,
- 98,210,164, 73,161, 18,137,  4, 63,255,252,243, 51,  0,219,202,127,222,189,106,213,170, 25,253,251,247,247, 29, 51,102, 76,224,
-244,233,211, 39,148, 87, 21,190,117,140, 36,161, 80, 24,226,239,239,143,189,123,247,  2,192,222, 42, 14,191,231,202,149, 43,203,
- 58,119,238, 12,137, 68, 18, 86,197,182,158,110,110,110,216,191,127, 63,  0,220,126,203, 54,183, 31, 61,122,132,158, 61,123,130,
- 16,226,105,194,185,119,107,215,174,221,158,  5, 11, 22,240, 21, 10,  5, 62,255,252,115,237,245,235,215, 59, 81, 74, 47, 16, 66,
- 90, 13, 24, 48,224,252,182,109,219,228,231,207,159,247,251,238,187,239,174,240,120,188,249, 70,163,113,122, 21,154,159,205,155,
- 55,111, 90,247,238,221, 49,123,246,108,250,219,111,191,125, 76, 41, 61, 81,254,124, 29, 39,132, 12,180,178,178,218,246,205, 55,
-223,144,194,194,194,105,132,144, 20, 74,233,234, 74,242,121,161,209,104,116, 84, 42,149, 38,125, 33,154,186,189,141,141, 77,199,
- 22, 45, 90,224,199, 31,127,196,152, 49, 99,176,105,211, 38, 10,224, 80,122,122,250, 93,  0, 45,202, 34,176,206,138,168,168,168,
-192,230,205,155, 11,239,221,187,247, 33,128,223, 76, 40,155, 18,207,158, 61,107,223,169, 83, 39,161, 76, 38,131,209,104, 68,110,
-110, 46,212,106, 53,130,130,130,208,184,113, 99,100,101,101,225,208,161, 67,186,130,130,130, 68,147,202, 59,109,233,230,147,135,
-255,104,213,165,223,112, 11,169,144,  7,163, 94,132,204,204,108, 20, 27, 13,  8,241,119, 71,243,224, 90, 72,202, 84,225,248,161,
- 63,242,139,139,149,155, 77,209,212,107,148, 27, 79, 29, 59,216,178,121,199,  1, 22,114,223, 64,120, 58,141,  9,190,117,229,212,
- 73,137, 72, 64,  6,244,239, 99,217,180,161, 55,238, 62, 43,194,209, 67,123,243, 11,139,138, 54,130,131,163, 38,  6,235,229,  6,
-238, 47,145, 53, 97,194,  4,251,137, 19, 39,194,220,220, 28,185,185,185,208,235,245, 47,162, 77, 98,177, 24,150,150,150,200,205,
-205,197,206,157, 59,  1, 32,171,242, 47, 58, 81,250,188,149, 43,220,  8, 79,174, 21, 75,101,212, 90,246,238,154,  0,160,213,243,
-179, 86,239,252,221,186, 99,139,  8,126, 45, 39,167, 55,133,233,171,173,249,255,  1,157, 78,119, 34, 33, 33, 33,172, 95,191,126,
-217,110,110,110, 42,181, 90, 13,149, 74, 85,124,104,199,178, 58, 46,230, 35,159, 49, 12, 67, 21, 10,  5,107,111,111, 95,120,250,
-244,105,123,131,193,112,174,154,135,152,208,167, 79, 31,230,212,169, 83, 35, 70,141, 26, 69,188,189,189, 17, 21, 21,133,159,127,
-254,153,110,222,188,121, 25,128,169, 53, 76,122,137, 70,163,121, 37,  2,242,114,207,194,146,146, 18,104, 85,153,208, 87,163, 71,
- 66,252,169, 31, 31,213,174, 93, 91, 31,232,254,159,225, 68,242,243,243,145,157,147,243,194, 96,101,103,103,  3, 64,117, 66,152,
- 69,127, 78,231,127,106, 30, 74, 75, 75,161, 86,102,192,104, 52,190, 81, 51, 47, 47,175,216,217,217,121,197,242,229,203,127,154,
- 59,119,174,253,146, 37, 75,242, 98, 99, 99,139, 24,134, 81,191,246, 17, 35,241,242,242, 82, 44, 90,180,200, 97,249,242,229,121,
- 44,203,174,248, 31,155,171,238,245,234,213,219,212,177, 99, 71,197,168, 81,163,176,124,249,114,164,167,167, 79,165,148, 26,202,
-203,  6,150, 16, 50,121,229,202,149,135,166, 76,153,  2,157, 78,183,232,200,145, 35,179,  9, 33, 35, 40,165,219,222,164,105,103,
-103,231,202,231,243, 17, 29, 29, 93, 68, 41,125, 90,133,161,207,168, 91,183,110, 38, 33,196,193,201,201,169, 78,101,219, 90, 91,
- 91,123, 41, 20, 10,164,166,166,  2, 64,194, 91, 54, 75, 76, 75, 75,163, 34,145,136, 56, 59, 59,123, 87,117,254, 86, 86, 86,147,
-215,173, 91,199, 63,123,246, 44,102,206,156,153,146,148,148, 52,128, 82,122,177, 60,109,209,132,144,230,173, 90,181,218, 49,101,
-202,148,186, 63,252,240,  3,121,244,232,209, 72,188,101,136,146, 10,220,221,221, 71,124,246,217,103, 88,177, 98,  5,214,174, 93,
- 59,146, 82,186,251,181,115,222, 65,  8,177,178,177,177, 89, 49,124,248,112,108,220,184,113,  0,128,213,149, 68,107,167,244,237,
-219,119, 70, 94, 94,222,124, 83,238,169, 41,219,187,184,184,180,106,221,186,181,151, 90,173,198,238,221,187,159,238,217,179, 39,
-223,104, 52,238, 44, 55, 87, 47,231,143,125,199,142, 29,155, 49,121,242,100,156, 61,123,118,163,179,179, 51, 47, 45, 45,109, 71,
- 21,247, 52, 77, 34,145,228,220,189,123,215,209,207,207,143,113,114,114, 66,163, 70,141, 96,105,105,  9, 30,143,135,172,172, 44,
- 92,184,112,129,141,143,143,207, 49,117,192,209,156,184,179,  7, 29,235,117,186, 28,125,253, 66,187,192,134, 77,  5, 46,182,214,
-136,  8,116,129,165,153, 16,  4, 64, 82,150, 10,103,206,156,212, 39, 36, 60,189,106, 74, 15,194, 10, 77,231,250, 31, 94,177,180,
-175,213, 46, 32,184, 41,191,142,175, 15,218,181,104, 96,101, 37, 23,130,165, 20,119,159, 21,226,228,137, 99,250,180,148,228,179,
- 92, 15, 66,142,247, 29,193,154,181,118,237,218,166,235,215,175,239, 60, 97,194,  4,197,160, 65,131, 32,149, 74, 81, 90, 90, 10,
- 55, 55, 55, 24, 12,  6, 28, 57,114,  4,209,209,209,197, 44,203, 30,  2,112,249,181,  7, 51,232,229,113,171,166, 45, 87,214, 42,
- 27,188,178,180,233,236,181,245,223,139, 38,  0, 92,121,102,112,113, 78,207,153,149,155,127,100,188,187,139,147,176,125,179,198,
-124, 91,171,178,222,204, 38,106,182,125,223, 99,122,252, 47, 52, 13,  6,195,231,132,144,192,201,147, 39, 47,116,113,113,113,158,
- 61,123,246,243,128,128,  0, 85, 81, 81, 17,213,106,181,108, 78, 78,142,108,247,238,221,158,185,185,185,197,122,189,126, 32,165,
-244,110,117,210, 73, 41,213,  1, 24, 69,  8, 57, 80, 88, 88,120,252,171,175,190,194,119,223,125,135,131,  7, 15, 54,167,148, 94,
-174,233,185, 83, 74, 13,158,158,158,  5,183,111,223,118, 16,217,248,192,193, 82,136, 14,223,150,  5, 35, 20, 98,  2, 85,105, 49,
- 98,239,223, 69, 81, 81,209,173,106,104,106, 93, 92, 92, 10, 51, 51, 51,109, 29, 28, 28,202,204, 85,118,246, 11,115,149,151,151,
-135,220,220, 92,250,242,189, 55, 65,179,212,203,203, 75, 25, 27, 27, 43,226,201,220,224,104, 37, 70, 89, 21, 36,133,157,130,143,
-210,210, 98, 60,188,118, 21,133,133,133,231,222,166,153,150,150,182,211,217,217, 25,  0,126,154, 49, 99,134,109,135, 14, 29,158,
-220,184,113,163,229,203,199,  9,  9,  9,217, 55,123,246,236, 15,191,251,238,187,156, 77,155, 54, 77, 73, 79, 79,223,250,191,204,
- 75, 54, 54, 54, 19, 15, 31, 62,172,208,233,116, 88,190,124, 57, 22, 47, 94,188,158, 82,250,251,107,215,226, 48,143,199, 91,201,
- 48,204, 23, 95,126,249, 37,134, 15, 31, 46, 11, 13, 13,157,240, 82,148,235, 21,205,212,212,212,233, 33, 33, 33, 51,178,178,178,
- 76, 50,  4,143, 31, 63, 30, 22, 18, 18, 50, 61, 43, 43,107, 97,101,231, 46,151,203,229, 70,163, 17,  9,  9,  9,249,148,210,194,
-183,220, 55,181,143,143, 79,170,209,104,116,149,201,100,214, 85,229,207,252,252,252,249,161,161,161,179, 50, 51, 51, 79,  0,152,
-247,250,144, 35,148,210, 59,132,144,192,177, 99,199,142,254,254,251,239,123,102,100,100,236,172, 74, 51, 41, 41,105,126,171, 86,
-173,190,141,139,139,219, 68, 41, 93,251,150,116,254, 76,  8,209,109,221,186,117,100, 66, 66,194,130,202, 52,211,210,210, 14,  1,
- 56,100,234,253,125,219,246, 47,107, 50, 12, 51,121,218,180,105,204,182,109,219,  0, 96, 81, 74, 74,202,218,183,152,181,187, 46,
- 46, 46,155, 67, 67, 67,  7,173, 94,189, 90,210,166, 77,155,225,  0,118, 84,149, 63, 53, 26,205,181, 43, 87,174, 52, 78, 76, 76,
-180,109,213,170,149, 16,  0,138,138,138, 80, 80, 80,128, 67,135, 14,233,226,227,227,115, 74, 75, 75,175, 85,167, 12, 49,104,139,
-250, 95, 57,179,127, 71,226,227,251, 17,145, 29,186, 89,105,117,174, 16,231,242, 80,144,155,129, 99,135,254,200, 79, 72,120,122,
- 85,169, 44,232, 95, 29, 77,157,166,176,223,213,179,  7,118,166, 36,196, 54,110,209,170,147,149, 90,235, 14,177,144, 65,110,102,
- 42,142, 29,222,159,151,144,240,236,162, 90,175,249,244,175, 42,231,255, 77,154,255, 56,104, 69,107,219, 74, 22,  0, 34,  0, 31,
- 42, 20,138,229, 51,103,206, 92,123,253,250,245,181,157, 59,119, 94, 43, 18,137,150,  3,248, 16,128,232, 45,251,  5,253, 47, 53,
- 59, 52,130,226,179,174,204,134,185, 35,249,186,125, 75,124,245,115, 70,128,154,168,217,214,148,235, 80,157,229,127,173,  9,160,
-153, 64, 32,184, 90,175, 94,189,179, 10,133, 34,219,195,195,227,162, 64, 32,184,  1,160,197,187,166, 19,128,109,223,190,125,217,
-226,226, 98,218,167, 79, 31, 10,192,226, 93, 53,197, 98,113,235,200,200, 72,253,243,244,124,122,241, 78, 50, 61,116,254,  1,221,
-126,240, 42, 93,187,227, 56, 93,178,114,  3,173, 95,191,190, 22,128,123,117, 52, 69, 34, 81,135,200,200,200,130,156,156, 28,250,
-232,209, 35,122,225,194,  5,186,103,207, 30,186,118,237, 90,186,106,213, 42,234,236,236,156, 11,192,185, 58,154, 82,169,180, 91,
-135, 14, 29, 12,169,217, 37,244,218,131, 12,122,234,250, 83,186,239,244, 93,186,243,208, 85,186,126,235,239,212,207,207, 79, 13,
-192,161, 42, 77, 39, 39,167,190,125,250,244,121, 82,183,110,221, 53,175,255,230,237,237,189,178, 79,159, 62, 73,206,206,206,  3,
-255,138,188,  4,160,131,139,139,203, 35,161, 80,120, 24,192,192, 42,246,235,199,231,243, 15, 58, 58, 58,222,  4,208,227,127,157,
-231,  1,116,182,183,183,191,  6,160,107, 21,251, 85,108,215,253,159,248,188,191, 15, 77,103,103,231,214,110,110,110, 23,156,157,
-157,191,169,106, 63,127,127,127,161,163,163,227, 92, 23, 23,151, 35, 78, 78, 78,109,170,147, 78,  0,206,102,102,102,205,204,204,
-204,186,152,153,153,117,177,180,180,108,246,242,115, 88,147,115,183,241,105,219,165, 86,195,174,251,220, 26,124,152, 84, 43,184,
-115,146,103, 72,183,125, 54, 62,109,187,188,171,166,123, 72,183,253,181,130, 59, 63,175, 21,220, 37,177,118, 88,183,125,182,190,
-109, 59,254,211,238,251,223, 89,243,159,182,152,188, 97,175,178,150, 43,102,  0,250, 49, 12,243, 51,128,126,  0,204,170,184,  1,
- 65, 38,220,164,247,174,217,161, 37, 92, 70,245,226, 29,153,250,169, 32,219, 68,205,127, 76,134,  6,208,141,207,231, 95,  1,208,
-237,125,166,211,220,220,124, 93,239,222,189,141,  2,129, 96,197,251,210,180,177,177,249, 41, 34, 34, 66,183,108,217, 50,186,119,
-239, 94,186,118,237, 90, 58,122,244,104, 26, 20, 20,164,177,182,182,254,180, 38,154,142,142,142,243,234,213,171,151,183,117,235,
- 86,186,115,231, 78,186, 98,197, 10, 58,107,214, 44,182, 86,173, 90,217,214,214,214, 93,107,162,105,111,111,255, 75,179,102,205,
-116,191,252,242, 11, 61,121,242, 36,221,190,125, 59,157, 56,113, 34,245,247,247, 87,203,229,242,143, 76,213,172, 83,167,142,232,
-109,191, 53,108,216, 80,192, 21,184,156, 38,167,201,105,114,  6,235,159,179,240, 77,141,116,237,126, 64,241, 81,  0, 41, 33,192,
-206,223, 31,178,123,122,250,195,240,251,131,119, 31,171,167,118,237,218, 37,132,144,157, 79,159, 62,221,227,238,238,110, 72, 76,
- 76,124,103,205,163,231,104,106, 59, 79,210,233,100,162,145, 15,192, 96,250,176, 61,255,136,136,228,126,  0,251,223,183,110, 97,
- 97,225, 16, 66,200, 24, 74,169,234,125,105,230,228,228, 76, 36,132,108,125,250,244,233, 34,185, 92, 30,108, 52, 26,245,106,181,
-250, 82,118,118,246,  4, 74,105,114, 77, 52,211,211,211,167, 19, 66,246, 78,157, 58,117, 42,128,250,132, 16,173, 94,175,191,146,
-149,149, 53,135, 82,154, 94, 19,205,204,204,204, 97, 66,161,112, 67,124,124,252,  2,169, 84, 90,159,101, 89,173, 82,169, 60,151,
-147,147, 51,158, 82,154,105,170, 78,124,124,252, 91,219,127, 69, 69, 69,113,243, 14,114,112,112,112,252,139,218, 96,189,194,239,
- 15, 40,122,214, 35,232, 17,  4,195,239,247,222,143,105,121,250,244, 69,251,215,247, 58, 53,200,137,  4,250,222, 53,185,234,228,
-247,103,174, 94,210,188, 11,160,205,123,214,188, 13,160,247,251,212,212,233,116,215,  1, 68,114,185,128,131,131,131,131,227,189,
- 27, 44,  0,248,227, 30,229,174, 26,  7,  7,  7,  7,  7,  7,  7, 71, 37, 16,  0, 65,111,137,  2,220, 55, 89,132,144,160,234, 30,
-184, 42,253,255,177,166,125, 37,154,167,170,208,108, 91,131,116,114,154,156, 38,167,201,105,114,154,156,230,191, 82,179, 42,237,
-127, 76,239,196,255,106, 11,122, 19, 26,164,255, 77, 52,185,134,138,156, 38,167,201,105,114,154,156, 38,167,201, 53,114,127,111,
- 11, 55,193, 18,  7,  7,  7,  7,  7,  7,  7,199,123,134, 51, 88, 28, 28, 28, 28, 28, 28, 28, 28,156,193,226,224,224,224,224,224,
-224,224,224, 12, 22,  7,  7,  7,  7,  7,  7,  7,  7,103,176,222, 35,246,255, 79, 52, 57, 56, 56, 56, 56, 56, 56, 56,222, 27,228,
-223, 52,202, 57,  7,  7,  7,  7,  7,  7,  7,199,255,  2,174,138,144,131,131,131,131,131,131,131,131, 51, 88, 28, 28, 28, 28, 28,
- 28, 28, 28,156,193,226,224,224,224,224,224,224,224,224, 12, 22,  7,  7,  7,  7,  7,  7,  7,  7,  7,103,176, 56, 56, 56, 56, 56,
- 56, 56, 56, 56,131,197,193,193,193,193,193,193,193,193, 25, 44, 14, 14, 14, 14, 14, 14, 14, 14,142,191,222, 96, 17, 66,218,114,
-154,156, 38,167,201,105,114,154,156, 38,167,201,105,114,  6,139,131,131,131,131,131,131,131,131,131, 51, 88, 28, 28, 28, 28, 28,
- 28, 28, 28,156,193,226,224,224,224,224,224,224,224,224, 12, 22,  7,  7,  7,  7,  7,  7,  7,  7,  7,103,176, 56, 56, 56, 56, 56,
- 56, 56, 56,254, 34,  8,128, 55,246,  4,160,148,158, 50, 89,164,  6,189,  9,170,210,231, 52, 57, 77, 78,147,211,228, 52, 57, 77,
- 78,243,159,167, 89,149,118,117,252,199,223, 26, 74,233,127,109,  1,208,150,211,228, 52, 57, 77, 78,147,211,228, 52, 57, 77, 78,
-243,223,182,240,185, 32, 30,  7,199,255,115,246, 16, 30,242,125, 61, 65,169, 51,120,162,116,164,223,123,138,153,148,125,103,205,
-204,  0,119, 72,245, 14, 48, 72,178,145,121,247,217, 59,107,114,112,112,112,252,139,224, 12, 22,  7,199,255,119,178,253,234,130,
-143,  5, 96,224,  4,170,139,135, 93,192,  2,  0,247,223, 89, 83,200,206,131,145,113,  5,213,197,193,222,247,123,  0, 15,184,139,
-205,193,193,193, 97, 26,127, 73, 35,247,176,176,176,168,176,176,176,185,145,145,145, 98,238, 22,112,252,183,136,140,140, 20,135,
-133,133,205, 13, 15, 15,143,250,199,158,228,214,122, 50, 48,198,142, 90, 61,235,114,236, 94,129,189, 82, 99,172, 11,198,208,  9,
- 27,234,154,189,147, 38,159,180, 83,235,216, 90,219,110, 40, 29, 74,181,  6,127, 80,188,155,102, 57, 65, 65, 65,150,141, 26, 53,
- 58, 22, 28, 28,108,203,229, 80, 14, 14, 14,206, 96,189,103, 88,150,109,104,111,111, 63, 65,165, 82, 37,133,134,134,118,253, 55,
- 93,240,198,141, 27, 95,137,136,136,200,108,210,164, 73,102,147, 38, 77,162,171, 90,255, 79,196,217,217,185,110,189,122,245,146,
-  2,  3,  3,227, 94, 94,111,223,160,103, 19,255, 22,131,102,218,  6,118,111,249,174,199,  8, 13, 13,237,170, 86,171,147,106,213,
-170, 53,222, 96, 48, 52,252,199, 94, 76, 53,235,  0,134,215, 42, 38, 93, 41, 75, 47,210, 59, 68, 37, 42, 21,  0, 47, 18, 90, 56,
-213, 88,179,144,117,  0,104,235, 59, 41, 42,249,149, 60, 59,135,139, 79, 53,230, 96,152, 86, 80, 19,199,119, 77,174, 72, 36, 26,
- 73, 41,253, 64, 32, 16,140,227,138,223,127, 55,132,144, 32, 66, 72, 87, 66, 72,216,123,212,252,193,207,207, 47,149, 16, 50,150,
-187,194, 28,255,111, 12, 86,239,218,164,233,199,117,200,249,190,181, 73,113,191, 58,164,100, 96, 29,114,169, 87,109,210,186,166,
-  7,254,253,247,223,165, 91,182,108,177, 15,  8,  8,216, 25, 30, 30,126, 41, 52, 52,212,167, 38, 58, 97, 97, 97,199,194,194,194,
-122,191,190, 46, 52, 52,180,239,203,235, 26, 53,106, 20,211,168, 81,163,194,176,176,176,167,166,232,134,132,132, 60,  9, 13, 13,
- 45, 13, 11, 11,123,242,218,139,187,111,163, 70,141,142,189,118,188,222,175,175,123, 27, 60, 30,207,245,224,193,131,246,135, 15,
- 31,182,231,243,249, 14, 47,110,  4,195,188,113,125, 13,174,199,208,176,176,176, 43,175,157,203,144,215,215, 85, 97, 78,174,132,
-132,132, 12,121, 77,247, 74, 88, 88,216,208,247, 97,174, 90,180,104,113,233,246,237,219,181, 20, 10,133,229,203,191, 57,218, 88,
-182,191,114,104,229,132, 79,123,183, 27,105, 31,208,163, 94, 13,141,149, 79,227,198,141, 47,121,121,121,237, 92,176, 96,129,253,
-204,153, 51,101,255,216,167,119, 79,128, 16,132,109,193, 82,106,247, 48, 85,109,247, 97,215,222,252,219,201, 42, 59,189,209,104,
- 13,240, 34,177,201, 67, 92, 35, 77,190,190, 57, 75,169,195,233, 68,129, 93,171, 62,163,121,103, 18,249,118,122,163,209,  6, 12,
- 90,214, 72,243, 63,249, 80,192,227,241, 38, 12, 31, 62,156, 33,132,124,233,229,229, 37,250, 55, 21,182,225, 46,196,165,141, 55,
-255, 70,136, 51,105,250, 30, 13, 69,160, 92, 46,191, 69,  8,169,251,255,204, 92, 53,  4, 32,163,148, 30,  0,224, 64,  8,225,191,
-  7,205, 37,115,230,204,153, 28, 19, 19,227, 92,187,118,237,217,132, 16, 30,247,138,231,248,219, 27,172,126,181,201, 44,  7, 71,
-151, 19,223, 44,217,222, 98,221,249,103,102,171, 14,221,150,143,159, 50,191,169,163,141,221,193,  1,117,200, 15,111,219,175,178,
-174,150, 34,145,  8,207,158, 61,195,242,229,203, 37,179,102,205,106, 98, 97, 97,113, 55, 60, 60,124,105, 64, 64,128,188,178,180,
-188,174, 73, 41,109, 42, 16,  8,214,133,135,135,111,172, 40,176,  9, 33, 77,197, 98,241, 47,225,225,225, 91, 43,170, 33, 67, 66,
- 66,106,223,184,113,195,156, 16,226, 96, 74, 58, 27, 53,106,228,116,235,214, 45, 25, 80, 22,  9,136,140,140, 20, 55,106,212,104,
-139,139,139,203, 90,  0, 77,  1,192,203,203, 75, 20, 30, 30,190,209,205,205,237, 87, 66, 94, 45, 52,223,118,238,132, 16, 88, 90,
- 90, 98,251,246,237,224,241,120,127, 90,191,117,235, 86, 16, 66,170,125, 61,  3,  2,  2,228, 97, 97, 97,191, 59, 57, 57, 45,101,
- 89, 54,  2,  0,234,213,171, 39,107,212,168,209, 30, 87, 87,215,101, 21,235, 76,209,164,148, 70,  8,133,194,165,141, 26, 53,218,
- 83,175, 94, 61, 25,  0,176, 44, 27,193,231,243,151,132,133,133,253, 94,157,123,212,176, 97,195,225,245,235,215, 79,171, 95,191,
-126,154,175,175,239,119, 14, 14, 14,231, 86,172, 88, 97,243,242,185, 87, 68,174, 50,179,114,243,175,220,140,121, 52, 97,120,175,
-200, 90,110, 14,  3, 44, 27,116,183, 48,229,220, 43,206, 63, 60, 60,124,169,133,133,197,221,105,211,166, 69,204,155, 55, 79,162,
-211,233, 32, 20, 10, 81,147,252, 89, 83,254,167,154, 57,196, 30,148,182,125,148,161,146,120,248,135,202,237, 67, 63,130,189,185,
- 64,124,245,105,169,  2,  4,109,160,147,217,213, 72,147,240,219,196,164,170,164, 86,129,157,100, 97, 17, 45,192,216,248,136,207,
-197,149,154,131, 97,106,166,249, 31,122, 69, 68, 68,136,218,182,109, 11,103,103,103,158,133,133,197,128,191,213,245,252, 47,106,
-134,187, 16, 23,133,153,232,250, 79, 51,199,135, 58, 91,203,246,155, 98,178, 76,232, 62, 31,104,111,111,127,118,229,202,149, 33,
- 10,133,226,130, 41, 38,235,239,112, 61,203,205,149,144, 82,122,173,124,213,  3,  0,205,223, 81,115,201,172, 89,179,198, 77,155,
- 54, 13, 69, 69, 69, 24, 60,120,176, 57,128,159, 76,213, 84, 40, 20,222,245,235,215,223, 26, 24, 24,248, 60, 56, 56, 88, 27, 16,
- 16,160,246,245,245, 77, 12, 10, 10,218, 36,145, 72, 60,255,233,249,243,239,162,249,175, 51, 88,125,234,144, 38,182,142, 46,147,
-127,216,119, 83,106,124,112, 11,183, 62,109,137,216, 47, 58, 65, 26, 23,133,105, 99,190,150,154,155, 91,125,217,187, 14,105, 85,
-147,131,199,197,197, 97,215,174, 93,176,181,181, 37, 27, 54,108, 16,247,238,221,123,164,185,185,121,114, 88, 88,216,  0, 83, 53,
-120, 60,158,113,227,198,141,102,221,186,117,235,103,109,109, 29, 19, 18, 18, 82,155, 97, 24,227,230,205,155,205,250,246,237,219,
- 91,171,213, 62, 12, 13, 13,245,137,142,142, 54,222,188,121, 19, 12, 99, 90,208, 46, 42, 42,202,112,244,232,209, 23, 81, 17, 74,
-233,195,239,191,255,190,223,222,189,123, 21, 22, 22, 22,108, 72, 72, 72,109, 55, 55,183,152, 31,126,248, 97,192,158, 61,123, 20,
-230,230,230,172,137,  5,  1,212,106, 53,164, 82,233, 43, 70,138, 16,  2,149, 74,  5,137, 68,242,138,241, 50, 49, 50, 16,104, 99,
- 99, 19,187, 96,193,130,110,251,246,237,147, 42, 20, 10,132,133,133,249, 91, 90, 90, 62, 90,184,112, 97,247,138,117,166, 34, 20,
- 10,177,125,251,118,217,199, 31,127,220, 85, 44, 22,199,134,133,133,249, 11,133, 66,236,216,177, 67, 54, 96,192,128,206, 50,153,
-236, 97, 72, 72, 72,160, 41, 90,122,189,126,198,205,155, 55,157,206,159, 63,239,228,238,238, 62,102,213,170, 85, 14,  2,129,  0,
-  0, 96, 52, 26, 95,137, 92, 13,232,249, 65,248,184, 25, 43,207,170,212, 26,237,188,169,159, 69, 10,140,104,108, 98,212,110,128,
-185,185,121,242,231,159,127, 62,106,251,246,237, 98, 71, 71, 71, 38, 42, 42, 10,197,197,197,213,190,150,255,127,162, 87,132,  7,
-190,177, 33,  0,175,168, 68,149,109,131,182,159,240, 17,127, 16,141, 60,205,248,103,227,138,237, 41, 67,221,  1,218,  8,179, 35,
-249,213,210, 20,208,  6, 96, 88,159, 19,241,196,182, 73,167,  1,252,164,164, 36,120, 54,136,228, 29,142,131,  3, 37,212, 19, 44,
- 66,171,165,249, 18,  2,129, 96,102,159, 62,125,228, 73, 73, 73,104,218,180,169, 76, 36, 18,205,120, 47, 81,188, 53,190,238, 88,
-231,219, 18, 27,234, 58,225,124,228,223,174,227, 78,184, 11,113, 49, 55, 19, 93,219,177, 99,151,115,189, 14,195,200,218, 65, 30,
-214,118,230,130,253,239, 18,201, 42, 55, 87,103,174, 95,191,110,211,174, 93, 59,204,154, 53,203,206,220,220,252,194,223, 61,146,
-245,178,185, 34,132, 72,203,171,  7, 83,  1,184,190,131,230,178, 89,179,102,141,251,230,155,111,112,237,218, 53, 44, 92,184, 16,
- 29, 58,116,128,149,149, 85,149,229,199,192,129,  3,101, 77,155, 54,141,234,218,181,235,157,241,227,199, 15, 56,116,232,144,219,
-198,141, 27,133,159,126,250,169,184, 79,159, 62,238,227,199,143, 31,212,169, 83,167,251,141, 27, 55,190,222,187,119,111, 73, 53,
-147,198,  7, 32, 42, 95,  4,101, 73, 37,132, 16,194, 39,132,  8,184,  8, 27,103,176,192,167,152, 51,108,226, 92, 73,194,166,197,
-200,220,245, 51,120,  5,153, 16, 20,231, 66,115,233, 48,244,151, 14, 96, 96, 68,132, 84, 74,200,188,154, 28,220,204,204, 12, 66,
-161, 16, 79,158, 60,193,131,  7, 15,208,169, 83, 39,225,138, 21, 43, 44,  3,  3,  3,127,105,218,180,233,157,176,176,176,250,166,
- 24, 22,111,111,111,244,235,215, 79, 52,118,236,216, 58, 18,137, 36,154, 82, 42,240,244,244, 68,223,190,125,133, 83,166, 76,241,
-144, 72, 36, 55, 89,150, 21,202,100,178,183, 70,135,222,164, 43,149, 74,  1, 64,224,227,227,115,107,231,206,157,158, 77,155, 54,
-229,159, 60,121, 18, 69, 69, 69,252,186,117,235,222,217,177, 99,135, 87,147, 38, 77,248,151, 47, 95, 70,105,105, 41, 53, 85, 87,
-169, 84, 66, 34,145,252,201, 96, 41,149, 74,136,197, 98,147,211, 88,110, 46,134,122,121,121,221,220,185,115,167,107,243,230,205,
-121,231,206,157, 67,113,113, 49,220,221,221,111,237,220,185,211,181,105,211,166,188,171, 87,175,162,184,184,216,100, 77,145, 72,
-  4, 15, 15, 15,244,233,211, 71, 48,105,210, 36, 87,129, 64,112, 83, 36, 18,193,221,221, 29,125,250,244, 17, 78,156, 56,209, 85,
- 36, 18, 93, 55,177,202,144, 87,110,180,208,167, 79, 31,185, 76, 38, 67,114,114, 50, 88,150,  5,203,150,121,210,244,236,220,123,
-151,111,222,143,157, 48,162,119,203, 82,141, 70,115,252,220,173,135,  1, 62,238,174,132, 80,143, 42,206,189,126,120,120,248,157,
-200,200,200, 95, 15, 28, 56, 96,249,193,  7, 31,  8,110,222,188,137,231,207,159, 67, 44, 22,195,204,204, 12,124,254, 63,180,163,
-108, 81,128, 13, 88,124,144,148,173, 21,139, 45, 93, 21,102, 78,117,129,231, 23, 80,219, 78, 12, 30,195,147,220,124,166,148,  3,
-244,  3,212,202,177,169,158, 38,251,193,179, 44,173, 88,111, 29,100,230,236, 90, 11,185,185,185,112,171,227,  7,181,200, 78,116,
-229, 73,169, 25, 72, 53, 53,203,  9, 14, 14,110,238,230,230,230,232,225,225,129,156,156, 28,120,123,123,195,204,204,204, 42, 36,
- 36,228,131, 26, 95,131, 77, 30, 98, 20,161, 41,192, 44,130,145,204,134,158,191,  0, 79,178, 27,226,151, 16,193,223,206, 92,237,
-220,229, 98, 83,203, 31, 56,252, 25, 28, 44,197, 88, 63,178,161,181,157,133,184, 70, 38,139, 16, 18,232,224,224,112,230,250,245,
-235,182, 18,137,  4,209,209,209,  8,  8,  8,192,226,197,139,237,172,172,172,254,182, 38,235, 53,115,101, 77, 41, 85,  1, 96,  1,
-244, 71, 13,122,189,150,155,149,159,231,206,157, 59,230,235,175,191,198,149, 43, 87,224,234,234,138,236,236,108, 52,111,222, 60,
- 41, 63, 63,191,210,247, 82, 96, 96,160,235,227,199,143, 83, 39, 76,152,208,112,235,214,173, 82,153, 76,134,130,130,  2,252,250,
-235,175,152, 54,109, 26,  8, 33,160,148, 98,195,134, 13,178,193,131,  7, 55,138,143,143, 79,245,240,240, 48,165,249,  6,  1, 32,
-  1, 32, 43, 95,228,  0,100, 59,118,236,176,232,214,173,155,121,249, 58, 41,  0, 41, 33,132,235,232,245,111, 54, 88, 20,168,239,
-232,233,139,194,147,187, 33,229, 19, 72,121,229, 11,159,128,121,122, 15,110, 18,  1,244,148,  6,214,228,224,102,102,102, 47, 22,
-134, 97,144,158,158, 14,134, 97, 48, 99,198, 12,201,152, 49, 99,234,137, 68,162,171, 45, 90,180, 88, 80,233,  9,148, 71,164,110,
-222,188,  9, 31, 31, 31,242,205, 55,223,152, 71, 70,150,125,197,222,187,119, 15, 94, 94, 94,100,254,252,249,138, 46, 93,186, 16,
-185, 92,110,114,  4,139, 97, 24, 72,165, 82,180,106,213,138,108,220,184,209, 76, 44, 22,227,240,225,195,200,206,206, 70,187,118,
-237,248, 27, 55,110, 52,147, 72, 36,184,112,225,  2, 10, 11, 11, 77,214,173, 42,130, 85,110,234, 76,162, 73,147, 38,235, 29, 29,
- 29,151,110,217,178, 69, 44,149, 74,113,238,220, 57, 20, 20, 20,160, 95,191,126,134,109,219,182, 73,204,205,205,113,245,234, 85,
- 20, 20, 20,212, 40,115,220,188,121, 19,222,222,222,100,250,244,233,210,136,136,  8, 61,  0,220,190,125,187,226, 58, 75,205,205,
-205,151, 52,107,214,108,125,101, 26, 44,203, 34, 61, 61, 29, 49, 49, 49,120,250,244, 41,178,179,179,145,147,147,131,226,226, 98,
- 24, 12,  6,  0,128,172,184,232,240,207, 27, 15,222,145, 75,165,178,240,122, 62,181,174, 71, 63,200,146, 75,165, 50, 31,207, 90,
-117,  9,153,253,198, 11, 27, 17, 17,177,128,199,227, 93,157, 55,111, 94,253,233,211,167,139, 31, 61,122,132,232,232,232, 63,229,
-171,127,164,193, 34,132,128,104,125, 64, 72,195,107, 79, 75,173,155,119,238, 47,196,179, 99,  0,171,  7, 24, 62, 34,235,187,242,
-247,223, 43,117,  0, 69,125,104,224,  7,152,224,216,  9, 33,128,206, 27, 32,161, 39, 30, 27,108,154,246, 24, 41, 76, 77, 77,133,
- 80, 40,132, 88, 44, 70,195,214, 31,241,119,220,209, 59,130,160,  1,116,240, 53, 73,243, 37,196, 98,241,183,159,125,246,153,252,
-101,205,142, 29, 59,202,101, 50,217,204, 26,155,171, 82, 89,  4, 12,116,108, 76,170,210,227,187,195, 25,254,241, 89, 42, 95, 80,
- 58,  1,208,  7,191,171,201,114,119,119,143,172, 91,183,238, 51, 79, 79,207,102,239,100,174, 20,162,171, 59,119,238,114,177,118,
- 43, 51, 87, 48,168,  1,129, 20,142,118,150, 88, 63,190,149,181,157,165,180, 90, 38,171,220, 92,157,190,118,237,154,173, 68, 34,
- 65, 84, 84, 20,132, 66, 33, 36, 18,  9,234,213,171,135,181,107,215,218, 89, 91, 91,255, 45, 76, 22, 33,196,138, 16,210,158, 16,
-210,139, 16,242,209, 75,230,202, 19, 64,107, 66,200,  7,  0, 28,  1,156,167,148,222, 49, 81,179, 25,159,207, 63,220,160, 65,131,
- 52, 62,159,255, 96,254,252,249, 95, 76,153, 50,  5,203,150, 45, 67,100,100,228,211, 41, 83,166, 32, 54, 54,214,160, 84, 42,187,
- 82, 74, 15, 85,166, 85, 82, 82,114, 96,250,244,233, 22, 61,122,244,168,248, 63, 46, 93,186,132,205,155, 55, 67, 46,127,181, 21,
- 68,215,174, 93, 49,116,232, 80, 43,173, 86,251,123,101,154, 14, 14, 14,109,174, 93,187, 22,  0, 64,  8, 64, 92, 97,176,238,223,
-191,111, 89, 84, 84,100,105,102,102,102,233,228,228,164,168, 48, 89, 61,122,244,176, 20,  8,  4,205,192,241,239, 52, 88,  0,160,
-203,203,132, 24, 70, 72,121,  4, 50,222, 75, 38, 11, 44,248,133, 89,213, 44,106,223,108,176, 20, 10,197, 11,163,165, 82,169, 76,
-142,184, 84, 24, 27, 43, 43, 43, 20, 23, 23, 67,175,215,191,120, 56,172,172,172,160,209,104,  0,  0,114,185, 28, 53,140, 96,225,
-202,149, 43,184,124,249, 50,248,124, 62,172,173,173,  1,  0,183,110,221,194,189,123,247, 32, 20, 10, 97,109,109, 93, 45, 93,157,
- 78,247,198,  8,150, 78,167,131, 88, 44,174,150,  9, 84,171,213,244,214,173, 91,184,127,255, 62,196, 98, 49,236,236,236, 32, 18,
-137,144,156,156,140,216,216, 88,136, 68, 34,216,217,217,213,232,254,152,155,155, 35, 63, 63, 31, 70,163,241,197,181,176,176,176,
- 64,105,105, 41, 24,134, 49, 41,157, 44,203, 34, 45, 45, 13,217,217,217, 72, 78, 78, 70, 78, 78,206, 11,147, 85, 81, 69, 88,163,
-140,203, 48, 32,132, 32, 58, 58,154,158, 57,115,  6,197,197,197,127,202, 75, 21, 17,210,127, 28,171,  2, 45,160, 23,180,203, 41,
-209,139,179,117, 66, 11,135,192,182,192,179,163,  0,195,  7, 36, 86,104, 28, 84, 27, 73,249, 70,249,163, 76,173,  4,  4,237,177,
-178,174,149, 73,154, 70,193,  7,217,197,122,113,162,206,206,220,191,126,  8, 50, 51, 51, 33, 22,139, 33, 22,139, 17,218,180, 45,
-158,229, 26,101, 15, 82, 85, 50, 80,180, 51, 73,179,156,134, 13, 27,214,145, 74,165, 17, 13, 27, 54, 36, 47,107, 70, 68, 68,128,
- 97,152,122,193,193,193,126,213, 58,255, 21, 94, 34,232,100,141,193,167, 99, 31,164, 43,157,247,223, 87,215,237,210,253, 35,235,
-101,167,178,252, 31,102,104, 60, 65,245, 19, 65,117, 33, 53, 53, 89, 30, 30, 30, 45,205,204,204, 14,125,251,237,183,158, 98,177,
-248,168,167,167,103,243, 26,149,111, 82,222,154,111,191,232,239, 98, 85, 97,174,244, 74,128, 47,  5,  4, 82,128, 47,133,163,189,
- 45,230, 13,253,192, 90, 38, 17,252, 97,170,166, 84, 42,221,177,114,229, 74,187,215,205, 85,197,210,176, 97, 67,204,152, 49,195,
-206,218,218,122,251, 95,108,174,172, 81,214,174,234, 46,128,223,  1,156,126,201, 92,121,  3,248,163, 60,106, 21, 77, 41, 77, 50,
- 81,179, 73,135, 14, 29,206, 62,125,250,180,211,157, 59,119,156, 50, 50, 50,252, 38, 78,156,136,101,203,150, 97,202,148, 41,219,
- 41,165,117,119,239,222, 29,124,227,198,141,122,148,210, 42, 35, 98, 25, 25, 25, 31, 79,153, 50, 37, 39, 39, 39,  7,  0, 80,175,
- 94, 61, 20, 20, 20, 96,210,164, 73, 24, 55,110, 92, 69,228, 21,148, 82,100,102,102, 98,209,162, 69,153, 25, 25, 25,159, 86,166,
-105, 52, 26,147,119,239,222,221, 72,167,211,185,162,172, 90, 80, 92, 80, 80, 96,158,151,151,167,208,233,116,114,150,101,229,150,
-150,150,102,  0,100,  3,  7, 14,228, 63,120,240,192,223, 96, 48,164,114, 86,228, 95,106,176,120,  4,119,159,223,186,  0,235,192,
-144, 87,162, 87, 50, 30,129,212,220,  2,207,146,147, 32,  4,137,169,238,129, 41,165,175, 24,172,138, 23, 99,122,122, 58,166, 78,
-157,170,220,186,117,235, 61,173, 86, 27,113,225,194,133,105, 85,126,120,  3,176,179,179, 67, 82, 82, 18,253,241,199, 31,139,142,
- 30, 61,106,  0,  0,123,123,123, 36, 39, 39,211,233,211,167, 23,239,218,181,139, 86,199, 96, 49, 12,  3,137, 68,130,115,231,206,
-209,153, 51,103, 22,166,167,167, 83, 27, 27, 27,216,216,216,224,212,169, 83,134,105,211,166, 21,198,199,199,191, 88, 87, 29,131,
- 85, 97, 88, 94, 54, 40,111, 51, 94,149,113,233,210,165,207, 11, 11, 11,199, 79,154, 52, 73,245,240,225, 67,106,103,103,  7, 59,
- 59, 59,108,218,180,137, 63,104,208, 32,213,221,187,119, 95,172,171,  9, 54, 54, 54,136,139,139,163,243,231,207, 87,157, 62,125,
- 90,  0,  0,182,182,182,136,141,141,165,115,230,204, 81, 21, 20, 20,140,191,116,233,210,231, 85, 20, 56,120,250,244,233,139,136,
-149, 90,173, 70, 78, 78, 14,146,147,147, 95, 24, 44,149,220,188,195,151,131,187, 52, 40, 85,169,148,215,239, 61,126, 30,222, 48,
-192,190, 84,165, 82, 62, 78,120, 30, 71,233,204, 55,182,109,187,124,249,242, 52,131,193, 16,113,240,224,193,123,107,215,174, 85,
-230,229,229,189,209,176,255, 35, 13, 22,195, 58,130,208,102, 23, 31,151, 88,126,208,165,175,136,100,220,  0,116, 37,128,216, 10,
- 16, 91,129, 47,183, 65,199,230,193,188, 77,215,138, 28, 65,217, 38, 16,138,171,110,223, 34,160, 14,  0,219,252,100,156,218,170,
- 89,175,209,162,188,188, 60,240,120,188, 23,102, 72, 38,151,163, 77,247,129,204,134, 27, 26, 71,128, 54,  5,225,153,220,102, 70,
- 40, 20, 78, 30, 60,120,176, 48, 63, 63, 31, 12,195,188,208,148, 74,165,232,209,163,135, 88,161, 80, 76, 55,249,220,247,  4,  8,
- 33, 16, 55,  6,232,184, 71, 25,106,231,  3,247, 84,190, 19,191, 95, 47, 13, 12,110,132,225,145,246,210,239, 15,103,  5,222, 73,
- 86,213,  6,140,227, 97,208,134, 86,215,100,121,122,122, 54,151,203,229,135,247,239,223, 47,107,213,170, 21, 38, 77,154, 36,151,
- 72, 36, 71, 61, 60, 60, 90, 84,247, 54,149,150, 24,191,156,179,124, 75,230,221, 37,237,  1, 93,105,153,177,122,105,201, 42, 97,
- 49, 99,253,153, 66,189,158,246, 55, 85, 83,165, 82, 13, 26, 50,100, 72,238, 31,127,252,241, 39,115, 37,145, 72,144,144,144,128,
-239,190,251, 46, 47, 47, 47,239,211,191, 56,151,  6,  3,184, 13, 64, 13,160, 37,  0, 89,121, 79,193,  8,  0,167, 40,165, 70, 74,
-105, 38,165, 52,221, 84, 65, 30,143, 55,101,213,170, 85,124,149, 74,133,161, 67,135, 34, 57, 57, 25,105,105,105,248,250,235,175,
- 19, 88,150, 29, 84,174,121,135, 82, 26,107,138,158, 86,171,125,148,159,159,223,185,125,251,246,  5,249,249,249,168, 95,191, 62,
-186,116,233,  2, 71, 71, 71, 56, 59, 59,163, 91,183,110,168, 91,183, 46,114,115,115,209,191,127,255,188,236,236,236,246,148,210,
- 74,123,161,231,230,230,198,111,223,190, 61,110,244,232,209, 13, 83, 82, 82,252,  1,216, 20, 23, 23,203,139,139,139,197, 90,173,
- 86,106,101,101,101, 21, 28, 28,108, 59,108,216, 48,179,219,183,111,251,167,164,164,148,  0, 72,  2,199,191,211, 96,233,128, 25,
-155,119,111, 82,139,106,121,195,194,183,  1,100, 18,  9,164, 34, 17,164, 86, 54,208,176, 44,214, 37,100, 40, 75, 41,157, 94,221,
-  3, 83, 74, 95,137, 52, 24,141, 70,172, 89,179, 70, 61,111,222,188,130,140,140,140, 17, 23, 46, 92,104,112,243,230,205,187,166,
- 24,161,162,162, 34,236,222,189, 91,181,113,227,198,167, 42,149,170,161, 80, 40,212,107,181, 90,108,223,190, 93,189,116,233,210,
- 68,165, 82, 25, 38, 16,  8,116,213, 49, 47, 21, 17, 44,129, 64,160, 87,171,213, 13,119,236,216, 17,127,232,208, 33,149,185,185,
- 57,  4,  2,129, 94,169, 84,214,219,178,101,203,163, 29, 59,118,168, 20, 10, 69,181,140, 27,203,178,111,172, 34,100, 89,182, 90,
-  6, 11,  0,110,222,188,249,171, 78,167, 11,223,190,125,123,202,250,245,235,213,230,230,230,  0,  0,189, 94, 31,182,121,243,230,
-148,213,171, 87,107,170,211,192,189,188,224,129,209,104,196,150, 45, 91, 52, 59,118,236, 72, 49, 24, 12, 97, 21,235, 54,108,216,
-160,222,178,101, 75,138, 78,167, 11,191,121,243,230,175, 85,105, 25,141, 70, 99, 81, 81, 17,248,124, 62,158, 62,125,170,169,136,
-208, 61,121,242,228,133,193,178,183,181, 14,104, 26, 22,228,183,120,205,238,243,114,177, 88,220, 62, 50,212,255,193,227,164, 20,
- 74, 73, 98, 21,231,126,247,202,149, 43, 13,242,242,242, 70,172, 93,187,182, 96,219,182,109,106,163,209,248,138,201, 18,137, 68,
-255,196,167, 86,  6,  2,233,227, 44,141, 66,194, 24,  8,226,246,149,153, 43,137, 37, 32,177,  2, 36, 86,112,113,113,197,141,  4,
-165,  2, 12, 68, 48,234,237, 77,120, 32,229, 32,144,221,207,132, 66, 32,146,146,140,140,140, 23, 70,168, 98,241,244,246, 71,116,
- 82,137, 25,  8, 21,131,  7,135,106, 60,235,157, 21, 10,  5, 63, 61, 61,253,207,154,158,158, 60,189, 94,223,222,228,115, 79, 51,
- 58,  1,236, 23,113, 25,106,167,189,119, 74,125,199, 47,216, 32,149, 26, 11,128, 91,203, 17, 88,199, 25,227,123,  5,139,190, 57,
-144, 29,120, 51, 81, 89,  7, 60, 58, 28,108,137,201, 95, 23,158,158,158,205,100, 50,217,209,125,251,246,201,100, 50, 25,158, 62,
-125,138,122,245,234, 97,206,156, 57, 50,153, 76,118,196,221,221, 61,178, 58,183,233, 90,  6, 77, 42, 41, 54, 70, 76,222,253, 60,
-227,110,186,225, 21,115,149, 93, 74, 49,228,135,  3,  5,249, 69,234,143,174, 62,215,159,169,198,181,188, 93, 80, 80,208,110,250,
-244,233,185,217,217,217,175,152,171,164,164,164, 10, 35, 16, 73, 41,141,249,139,115,169, 28,101,141,215,125,  1,120,  1,104, 64,
- 41, 53,  0, 40,166,148,214, 40,116, 29, 16, 16,208,208,221,221, 29,171, 87,175,198,186,117,235,242, 23, 47, 94, 12, 74, 41,124,
-124,124,204,107,170,153,153,153,121,227,209,163, 71,237,235,215,175,255,112,197,138, 21, 41, 78, 78, 78,236,176, 97,195, 48,100,
-200, 16,216,217,217, 25,151, 46, 93,250,188,121,243,230,247,227,227,227,219,150,150,150,222, 51,225,254,208,156,156,156, 43,191,
-252,242,203,181,214,173, 91,203,  6, 13, 26,100,183,127,255,126, 27,165, 82,233, 44, 22,139,237,181, 90,173,232,225,195,135,188,
- 61,123,246, 56, 62,120,240, 32, 65,165, 82,221,160,229, 19,251,113,252, 11, 13,214,111, 79,233,149,210,226,130,133,115, 54,172,
- 85, 61, 51, 16, 24,106,  7, 64,109,227,130,155,  5, 42, 76,122,152,162, 52,176,116,229,238,167,244,108, 77, 35, 88, 50,153, 12,
-167, 79,159, 54,126,241,197, 23,234, 27, 55,110,252, 82, 88, 88,232,118,243,230,205,109,166,234,176, 44,203,251,236,179,207, 74,
- 46, 95,190,188, 59, 61, 61, 61, 48, 42, 42,234, 25,203,178,188,  1,  3,  6,148,156, 60,121,242, 15, 66,136,255,173, 91,183, 30,
-215, 32,196, 13,161, 80,  8, 66,  8,110,222,188,153,144,151,151, 23,120,237,218,181, 29,211,166, 77, 43,161,148,242,162,162,162,
-146, 75, 75, 75,235, 95,185,114,101,235,151, 95,126, 89, 66, 41,229,153,170, 91, 97,222, 94, 54, 82, 21,209,172,234, 26, 44,  0,
-136,138,138,138, 41, 40, 40,240,191,113,227,198,209, 97,195,134, 41,203,205,199,195,226,226, 98,191,107,215,174, 29, 30, 52,104,
-144,178, 58,122, 58,157, 14,221,187,119, 87, 94,189,122,245,112,113,113,177,223,205,155, 55, 31, 86,172,187,124,249,242,209,130,
-130,  2,255,168,168, 40, 83, 11,240, 57, 75,151, 46, 77,159, 55,111, 94,122,118,118,246,226, 37, 75,150,100,219,217,217, 65,167,
-211,189, 48, 88, 89, 57,121,103,154,124, 56,250,135,173,191,159,186,185,116,206, 23,173,164, 18,177,104,250,247, 27,206,233,121,
-184,102,162,201,220, 86, 84, 84,228,118,231,206,157, 95,198,143, 31,175, 62,113,226,132, 81, 42,149,194,204,204, 12, 98,241, 63,
-177, 13,169,177,  8, 44, 73,235, 29,106,149,186,116,213,175,154,251,207, 50, 95, 24, 43,136, 45,113, 51,190,  0,223,174,216,205,
-126,215,213,238, 25, 40,146,193,224, 81,213,154,252, 34,176, 36,107, 72, 35, 97,202,111, 63,141,211, 60,123,116,239, 21, 35, 20,
-123,247, 38,150,204, 28,205,206,239, 98,253, 12, 44, 73,  3, 65,172,169,169, 53, 24, 12,189, 22, 44, 88, 80, 26, 31, 31,255,138,
-102, 98, 98, 34,190,255,254,123,149, 70,163,249,200,228,135, 82,204,111, 96,164,212,126,219,213, 92,159, 17,195,  6, 75,165,134,
- 60,224,250,143,128, 64,  6,136, 45, 16,236, 87,  7, 51,134,126, 40,152,184, 39, 35, 16, 96,221,193,  8,253, 77, 77, 39,159,207,
- 63,188, 96,193,  2,153, 84, 42,197,147, 39, 79, 32,145, 72, 32,149, 74, 17, 26, 26,138,101,203,150,201, 68, 34,209,209,138,246,
-157,213, 54, 89, 59,158,100,220, 77, 86,  3,  2,  9,114, 74,129, 33, 63, 28,204,207, 43, 84,245,170,142,185,122,221,100,141, 27,
- 55, 46, 55, 51, 51, 19, 18,137,  4,201,201,201,232,215,175, 95,238,223,196, 92,  1, 64, 41,  0, 23,  0,113,  0,226,  1,220, 33,
-132,136,240, 14,211,179, 61,120,240, 32, 58, 41, 41,  9,159,127,254, 57, 62,249,228, 19,171,143, 63,254, 24,207,158, 61, 67, 92,
- 92,220,237,119, 73,168, 74,165,186,153,146,146, 82,111,220,184,113, 51, 92, 93, 93, 55,218,216,216,156,179,182,182, 62,235,234,
-234,186, 97,218,180,105,223,166,167,167, 55,208,233,116,119,170,113,127, 40,165,244, 73,124,124,252,129, 45, 91,182, 68,141, 27,
- 55, 46,225,227,143, 63, 78, 25, 59,118,108,250, 47,191,252,146,118,251,246,237,199,  5,  5,  5,199,171,138,134,113,252,  3, 48,
-117, 86,232, 94,158,104, 58,184, 14, 57,255,113,109, 20,247,175,141,146,207,188,200,165,143, 60,209,186, 38,179,109, 55,108,216,
-144, 26, 12,  6,122,226,196,  9,218,177, 99,199,210,102,205,154, 93, 10,  9,  9,241,169,201, 12,222,145,145,145,199, 66, 67, 67,
-123,191,190,174, 81,163, 70,125, 95, 94,215,178,101,203,152,150, 45, 91, 22,182,104,209,226,169, 41,233,108,209,162, 69,108,211,
-166, 77, 75, 91,180,104, 17,251,242,250,176,176,176,110,173, 91,183, 62,252,242,186, 70,141, 26,117,125,125,221,219,206,189,109,
-219,182,201,113,113,113,244,249,243,231,180, 83,167, 78,105, 21,235,219,180,105,147,124,239,222, 61,250,248,241, 99,218,161, 67,
-135,180,154,206, 94, 30, 26, 26, 58,180,121,243,230, 87, 94, 75,243,144,215,215, 85,166,217,188,121,243, 43, 97, 97, 97, 67, 94,
- 95, 23, 26, 26, 58,244, 93,103, 89,119,114,114,170, 27, 28, 28,156,181,116,233, 82, 90,187,118,237,172,151,127, 11,140,252,236,
-219,130,162,146,162, 73,115, 86,255,102,231,223,189, 94, 77,102,110, 15,  9,  9,241,105,209,162,197,165, 15, 63,252,176,244,198,
-141, 27,148, 82, 74, 27, 54,108, 72,255, 81,179,214,239,246, 23,210,181,254, 77,233, 26,255,195,177, 51,221, 31,126, 26, 46,215,
- 68,253,212,137,210, 51,147,233,181,213, 67,104,132,167,200,120,121,146, 91, 28, 93,235,119,148,110,168,219,130, 46,175, 35, 50,
- 73,115,157, 87,115,186,214,239,232,131, 25,238, 15,123,132,216,105,119,108, 90, 75,159, 60,121, 66, 15,236,217, 78, 27,215,150,
-149,105,174,241, 63, 65, 87,251,183, 50, 73,243,213,103,190,105, 68, 68, 68,201,111,191,253, 70,159, 60,121, 66, 79,158, 60, 73,
-155, 54,109,170, 12, 14, 14,110,101,242,185,  3,132,174, 14,232,110, 88,229,123,113, 90, 91,179,130, 33,225, 18, 77,255, 96,145,
-182, 91,160, 80,215,206, 91,104,104,226,206, 55, 54,112, 98, 88,127, 59,208,118,190, 82, 13, 93,227,123,129,174,241,111,111,106,
- 58,125,124,124,158,123,120,120,208,183, 45,117,235,214,205,110,217,178, 37,191, 38,247, 61,220,  1,238,109,235,138,211, 79,207,
-105, 77,187,212, 87,228, 54,118,227,183,126,215,188,  4, 32,216,214,214, 54,103,227,198,141,212,193,193, 33, 27, 64,224,223, 34,
-127,150,173,179,  6,208, 13,128, 93,249,255,205,  0,180,  2, 80,251, 29, 52,155,180,107,215, 78, 31, 29, 29, 77,159, 62,125, 74,
-143, 29, 59, 70,155, 54,109,106,  0, 16,249,183,121, 54, 57, 77,110,121,105, 33,255,205,232, 36, 33,164,237,155,  6, 35, 11,  9,
-  9,161,237,219,183, 87,157, 63,127,190, 68,171,213, 14,191,117,235,214,129,119,213,252,111,164,243,191,161,217,186,117,235, 43,
- 12,195,212, 46,239,  2,156,118,234,212,169,134,  0,208,170, 85,171, 43, 60, 30,175,118,185,233, 77, 59,125,250,116,195,127,218,
-185, 87,224,236,236, 92,151, 97,152,227,  0, 52, 41, 41, 41, 47,122, 59,217,  7,118,139,176,182,178,104, 85, 80, 80,120, 59,227,
-254,254,163,239,146,206,208,208,208,174, 98,177,120,109, 68, 68,132,252,204,153, 51,178,168,168, 40,242,143,186,158, 43,188, 68,
- 16,137, 66, 65, 49,245,126,170,210,243,219,131, 57,117, 62,108,211, 84,176,105,223,121,118, 97, 79,251,248, 38, 94,242,  4,  8,
-216, 31, 64, 52, 55,240,105,162,198,100, 77, 41,105,  4,163, 96,234,157,100,165,251,164, 63,242,189,219,126, 52,132,119,112,231,
- 90,246,199,238, 54,241, 77,234,152, 61,  7,197, 15, 16, 43,175,154,172,249,234,115,223, 84, 44, 22, 31,237,223,191,191,217,142,
- 29, 59, 84,106,181,186,115,116,116,244,217,106,157,251,122,191, 90, 48,146,121,160,212,173,234,175, 71, 60,129, 17,243,240, 69,
-236,243,191,195,125,111,236, 72,220,229, 22,226, 67, 74,149, 97,156, 41,145, 43, 83, 52,  9, 33,193, 86, 86, 86, 91,243,243,243,
-251,154, 18,185,250, 95,158, 59, 33,196, 14, 64, 88,121,212,138,  0,136, 49, 53,106, 83,137,102, 51, 30,143, 55,165, 78,157, 58,
-245,159, 62,125,122,223,104, 52,254, 72, 41, 61,247,111,120,119,252, 27, 52,255,105,252, 37,125,216,165, 82,105,244,185,115,231,
-142,  9,133,194,239, 46, 95,190,172,249, 55, 93,240, 51,103,206, 52,121,211,250,179,103,207, 54,249,183, 92,131,180,180,180, 56,
-  0,238,175,175,207,138,217,127, 21,192,213,247,113,140, 91,183,110, 29,136,140,140, 60,113,249,242,229,111,228,114,121,135,127,
-220, 69, 28, 29,175,197, 10,175, 91, 16,137,190, 15,114,145, 77,253,182, 19, 37, 11,142, 95,113, 95,216,211,254,121, 85,230,170,
- 10,205, 27,144,234,191,111,224, 38,155, 58,191, 27,200, 15, 71, 55,185,255,216,221,230,121, 85,230,202, 20,162,162,162, 46,135,
-132,132,116,220,185,115,231,102,181, 90, 61,180, 42,115,245, 70, 20, 76,  6, 74,245, 51,161,231,  5,129, 66, 84, 73,104, 94,  9,
-134,119, 31, 89,200,252,187,220,178,107, 25, 52,  9, 64,224,251,212,164,148,222,  6,224,255,119,204,162,148,210,108,  0,135,223,
-179,230, 37,  0,151,184, 87, 55,  7,103,176,222,194,197,139, 23, 67,184, 75,207,241,223,230,220,185,115, 26,  0,223,150, 47,255,
- 60, 94, 50, 89, 33,181,164,163,255, 24, 33, 85,130,146, 20,  8,216,165,213, 54, 87,111, 48, 89,141,220,165,227,246, 14,151, 42,
- 65,145,  1,138, 37,239, 98,174, 94, 54, 89,  0,106,215, 88,160,215,  3, 29,128,  4, 16,146,136, 89,120,123, 99,197, 89,120, 81,
-143,193,193,193,193,241,175, 49, 88, 28, 28, 28,239,209,100,237,  9,184,137, 28,222, 36, 48,168, 13, 24,146, 80,106,200,192,232,
- 68,237, 59,106, 94, 71, 14, 25, 11, 30,234, 66,100,136, 71,137, 54,  3, 35,222, 65,243,125, 83,102,158,222,110,160,102,114, 89,
-131,131,131,131, 51, 88, 28, 28, 28,239, 66, 89, 84, 39,165,124,249,251,106,114,112,112,112,252,139, 32,  0,218,190,229,  3,209,
-228,198,107,132,144,182, 53,248,  0, 61,197,105,114,154,156, 38,167,201,105,114,154,156,230,191, 75,179, 42,237,127, 76,227,249,
-255,102, 23, 69,112, 93, 88, 57, 77, 78,147,211,228, 52, 57, 77, 78,147,211,252, 23, 46, 12, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-222, 43,127,105, 27, 44,153,109, 93, 39,240,153,250,132,165,126,  0, 64, 25, 18, 11,  3,123, 87,153, 19,151,254,174,218,196,161,
-158,204, 76,192,219, 94,162, 55,126, 76, 51,239, 41,223, 71,122,  9, 33,205, 80, 54,188, 64, 82,121,119, 97, 14, 14, 14, 14, 14,
- 14, 14, 14,211, 13, 86,221, 38, 61, 46,154,201,228,222,  0, 96,100, 41,140, 44, 80,148,159,117, 53,233,238,201, 30,  0,224, 28,
-216,102,175, 88,110, 27, 97,100, 41, 88, 74, 97,100, 41,244, 26,213,147,236,  7,135, 77,154,121,222,204,222,183, 71,219,118,109,
-123,118,238,252,161,111,189,160,122, 94,  0,112,239,254,189,248, 67,135, 14, 63, 50,179,247,253,163, 36,235,209,222,119, 57, 49,
- 51,129,224,219,176, 70,225,237,111,222,188,254, 13,128,175,223,211,245, 18,210, 75,157,182,144,102, 71,218,112, 89,135,131,131,
-131,131,131,131,163,218,  6,203, 76, 38,247, 62,189,111,189,253,222, 75,201,  0,128,182, 13, 29, 49,251,167,141,221,  9, 33,143,
-  0,224,163, 47,127,170,251,237,248,193,184, 18,147,  5, 74, 41,130,189,109,208,237,227, 81, 38, 29, 84,234, 24, 16,214,183, 79,
-159,143, 39, 77,154,216,245,201,147, 39,137, 59,118,236,184,  8,  0,205, 91,180,240,158, 63,127,126,159, 69, 86,214, 98,169, 99,
- 64,170, 42,227,193,205, 26,153, 43, 71, 47, 91,255,192,176, 33, 59,214,253,200,111,213,177,223,231,102,142, 94, 75, 74, 50,226,
-115,106,162, 37,118, 11,172,109, 33, 16,206, 38, 12,195,183,176,247,176,  7,  0,115, 39,255, 35,246, 94,205,140,102,150,246,119,
- 74, 85,170,205, 89, 15,143,173,227, 38,236,228,224,224,224,224,224,224,168,210, 96,  1,128,153,148,143, 71,207, 50,  0,  0,150,
- 82, 96,216,160, 94,200,204,204,168,171, 51,178, 24,216,183,  7,162, 99,211,241, 40, 33, 27,148, 82,212,117,149,153,124, 80, 30,
-216,208,207, 62,255,172,229,241, 19, 39,110,124, 59,253,219, 45,132,148,141,222,189,246,151, 95, 35,102,204,156, 49,244,147, 65,
-159,124,176,103,207,158, 24,  0, 53, 50, 88,140,192,114,233, 15,243,103,153,165,100,171,213,227, 38, 78,230, 77, 24, 63,102, 17,
-128, 65, 53, 49, 87,254,110,174,223, 93, 60,177, 71, 38,147,201,176,110,221, 58, 49,176, 31,253,187,182, 16,117,250,240, 67,248,
-248,  5, 53,249,113,229,142,250, 39, 68,162,207,109,235,126,208, 35, 39,238,100, 58,151,165, 56, 56, 56, 56, 56, 56, 56, 42,109,
-228,110, 52, 82, 60, 74, 72,199,163,132,116,220,136,205,134,142,229,225,167,121, 83,241,195,172,201,200, 85,  2,123,175, 36, 35,
- 46, 33,  3,113,  9, 25,200,201, 47,249,211,254,175,119,181,252,233,123, 89,195,165, 75, 45,126,108,215, 66, 30,105,109,101,101,
-245, 56,102, 75,233,140,  9,153,254,179,199, 37, 11,  5, 18,135, 20, 43,135, 90, 77,118,239,217, 19,224, 96,103, 47, 55, 55,183,
-152,108,237,215,110,189,165, 71,164, 69,101,154,127, 50,133,142,129, 45,187,116,233,212,201,209,193,158, 29,177, 52, 42, 54,192,
-207,199,224, 83,215, 47,210,204,209,183,229,219,246,121,147,166,216, 45,176,182,151,147,195,119,231,143,237,145,169,213,106,220,
-191,127, 31,185,185,185,229,219,  3, 14, 14, 78,112,119,117,198,207, 11, 38,201,102, 77, 29, 21, 34,150,200,246, 19, 66,136,169,
-233,172,  9,156, 38,167,201,105,114,154,156, 38,167,249, 79,213,252, 87, 25,172,248,228, 60, 60,122,150,129, 16, 63, 23,120,121,
- 56,225, 70, 92, 62,182,157, 73,198,250,227, 73, 56,115, 39, 27, 44, 95,129,140, 34,224,113, 98, 38, 30, 39,229,160,170, 74, 50,
-158, 88,208,119,220,184,194, 73,245,  2,138, 26,159, 59, 58, 26, 46,118,143,  3,166, 76, 41, 24,205, 19, 11,250,218, 59, 90,238,
-152, 52,118,196,  0,133, 76, 42,210,106,180,240,244,112,147,140, 28,250,217, 96,161,153,124,135,169, 39, 99,103, 23, 32, 23, 75,
-229, 91,190,251,118,162,100,201,222,199,207, 75,181, 40,253,227, 74,230,211, 73, 83,103, 20,241,  4,210, 95,236,236,  2,228,166,
-232,136,221,  2,107,187,219,216,124,119,233,248, 30,153, 78,167, 65,122,122, 58,180, 90, 45, 12,  6, 67,217,239, 18,  9,196, 18,
-  9,138, 84,  6, 60,203, 80,162,101,243, 38,188,134,193,129,126,118,126, 29,135,115, 89,138,131,131,131,131,131,131,227,173,  6,
-171, 68, 89,250,100,208,136,137, 89, 94,102,233,218,110,145,254,160,160,200, 78, 79,194,131,155,199,240, 36,250, 56,138,114,158,
-  3,160,240,240,116,135, 80,245, 76,187,102,245,170, 44,214,160,126,242, 54,189,110,221,156, 93,159,196,202,153, 31, 23,214,186,
- 22,247, 40,221,118,212,240,141,136,123,148,110,251,227,194, 90,215,158,196,202, 25,153,216,216,100, 80,191,110,164, 91,231, 14,
-152, 50,101, 18,186,117,238,128, 73, 35,250, 16,137, 72,208,216,212,147,209,138, 36,223, 79,253,118,142, 34,163, 64,167,187, 17,
- 87,162,145,201,165,210,203,143, 75,212, 90,200,244, 93,251,142,200,214,  8,249,115, 76, 49, 87, 78,230,230,223, 93, 57,245,187,
-140, 82,138,212,212, 84,104,181, 90,232,245,250, 23,  6,203,210,210, 18,  5,165, 58, 60,207, 82, 34, 49, 83,137,152,196, 34,116,
-236,208, 81,198, 23,136,  6,112, 89,138,131,131,131,131,131,131,227,173,  6, 43,238,202,222,230,183, 78,110,113,200,201,204, 40,
- 52,147,240,193,103,  8, 50, 83,226,177,121,209, 88,236, 94, 49, 17,  5,233,241,160, 20,144, 10,121,208,148,230, 21,166,223,222,
-237,144, 83, 73, 15, 66, 66,244, 31,172, 92,155,224,153,144, 64,205,183,111, 47, 17,  0,192,246,237, 37,130,132,  4,106,190,114,
-109,130,167,136,228,128, 26,141,232,220,237, 35,108,217,180, 14, 17,173,187,225,247, 11,207,161, 84,233, 76,154,255, 76,226, 80,
-215,195,214,209,241,163,177,159,180, 81, 52,170,107, 37,247,113,183,224,137,  4,  2,131,128, 39, 52, 30,188, 89,152,214,190, 75,
-119,190, 76,110,222, 65,226, 80,215,163, 50, 29, 11,129,112,246,229, 19,191,203,120, 60, 30,158, 63,127, 14,173, 86, 11,173, 86,
- 11,141, 70,  3,189, 94, 15,  0, 40, 86,233,145,158,171, 65,114,182, 10,201,217, 42, 60,120, 94, 12,145,220, 18,122,189, 62,136,
-203, 82, 28, 28, 28, 28, 28, 28, 28, 38, 13, 52,154,154,153,  7, 27, 51, 62,236,156, 61, 49, 96,236, 79,  0,  0,163, 81, 15, 74,
-  1,131,145,133, 41,253,231, 40, 21,156,252, 98,164,103,130,135, 39, 41, 28,240,177, 76,  5,  0,  3, 62,150,169, 60, 60, 73,225,
- 23, 35, 61, 19,148, 58, 43,157,193,104,196,229,152, 44,252,184,235, 33,102,108,186,135, 99,183, 76,111, 51,206, 23, 72,199,253,
-176, 96,190,140,207, 35, 36, 38,169,164, 36, 37,215, 80,194, 19,  8,116, 50,153,136,106, 41, 95,147,152,109,204,237,208,123,100,
- 34,143, 39, 24, 85,117, 90, 89, 80, 74,161,209,104,160,213,106,161,211,233, 94, 68,177,  0,160,176, 84,143,244, 60, 53,146,179,
- 85,120,158,173, 66, 74,182, 10,153,249,106,112, 29,  9, 57, 56, 56, 56, 56, 56, 56, 76, 50, 88, 44,128,199, 73, 57, 16,241, 89,
-184,122,120,129,190, 52,129, 61,  5, 96, 48, 86, 62,169,125,  5,251,247,167,165,212,241, 46,101, 39, 79,126, 30, 17, 84,207,230,
-238,200, 17,110,177, 65,245,108,238, 78,158,252, 60,162,142,119, 41,171, 55,138,140,148, 82,176, 20,229, 11,173,150, 97, 33,132,
-215, 56,216,207,157, 63,123,251,227,231,163, 86,197, 61, 18, 10,133,122, 87, 91, 25,113,119,144,241,106,217, 73, 69, 26, 61,163,
-241,173,215, 72, 71,128,134,149,233, 20,234,117, 51,155,181,239,173,212,233, 12,112,115,115,123,197, 92, 85, 84, 17, 22, 42,117,
- 72,207, 87,227,121,182, 18,201,217, 74, 40, 53,  6,220,143, 75,  0, 97,120,247,185, 44,197,193,193,193,193,193,193, 97, 82,  4,
-203,221,213,  1,215,239, 39,193,221, 78,  2, 11,115,  5, 98,227, 83,192, 99,  4, 96,  8,160, 55,152,110,130,168, 78,191,107,241,
- 98,139, 69, 73,  9,198,235,171, 86, 63,125,146,148, 96,188,190,120,177,197, 34,170,211,239,  2,202,122,231,149,153,172, 50,163,
-101,100, 77, 63, 17, 74, 89,123, 59, 75,  9,255,214,211,210, 92,134,225,105,108, 44, 36,172,141,133,152,113,178, 20, 11, 92,109,
-132, 66,145,136,129,163,157,173,  1,148, 58, 84,166,163, 73,142,121,150, 94, 84,244, 77,243,118, 31, 41,  5,  2,  1, 60, 61, 61,
- 95, 84, 19, 86, 24,172,172,236,252, 23, 17,172,244, 60, 13,164, 34,  6,183, 47,159, 86, 26,141,250,205, 92,150,226,224,224,224,
-224,224,224,168,218, 96, 81,192, 76, 38,  1,229, 73,112, 49, 42, 30,190,  1,245,177,233,192, 13,120,215,107, 12,150, 53,192,192,
- 26, 77, 62,216,196,169,202,232,  9, 19, 10,191, 74,207,164, 75,123,244,112, 57,156,158, 73,151, 78,152, 80,248,213,196,169,202,
-232,242, 67,129,101,105,153,209, 42, 31, 33,222, 84,  8,144,150,148, 89, 92,234,233, 40,  7, 79, 32,208,200,197, 66,131,149, 92,
-196,218, 89,136,  4,118,230, 98,145,189,185,136,159,155,151,165,  2, 72, 90, 85, 90,154,228,152,103,207,243,243,191,105,209,177,
-159,210,204, 76,  1, 47, 47, 47,104, 52,154, 23,  6,171,184,164, 20,121, 69, 42, 80, 10,212,117,149, 35, 54,250,146, 49, 55, 43,
-245, 65,126,220,177,117, 92,150,226,224,224,224,224,224,224, 48, 41,130,101,100, 41,108,109,172, 33,145,155, 35, 33, 83,135, 98,
- 98,143,124, 37,133,209, 88,121,  4,139, 16,210,246, 77,235,247,239, 79, 75,217,183, 47,123,253,254,253,105, 41, 47, 59, 57,246,
- 69, 21, 97,249, 95,150,154,172, 73,169,241,232,193,147, 87,242,186,134,219, 89, 49, 60,158, 74, 40, 96, 52,124, 33, 79, 39,228,
- 51,122, 33,159,209, 58,152, 11,120,103, 14,108, 99,  8,161,103, 76,209,212, 36,199, 60, 75,200,202,250,166,117,231,254, 74,123,
-  7,  7,124,242,201, 39,112,115,115,  3,  0,152, 73,  8,108, 69, 74,240,212,105, 56,127, 96, 67,105,108,212,217, 40, 24, 53, 61,
- 94, 30,205,253,109,233,124, 23, 56, 77, 78,147,211,228, 52, 57, 77, 78,243,159,170,249, 79,195,132,201,158, 41,234, 56,201,225,
-237, 34,135, 90,103, 15,181,214,136, 82,181, 17, 69, 74, 29,138,148,122, 36,100, 40,241,248,236,187, 39,132,  2,160, 44, 64, 80,
- 86, 85,  8, 82,102,236, 40, 49,109,255, 82, 65,209,162, 31,231,207,234,183,115,247, 31, 24,243,161,147,219,221,  4,109, 26, 33,
-140,138,225,241,245,214, 10,190,224,105,252,163,244,243, 39,246,132,150,138,148, 67, 76, 77,147, 38, 57,230,153,216, 45,240, 27,
-223,134,173,103,131,130,175, 85, 21,202,167, 54, 13,192,157, 59,119,213,177,241, 25,  6,158,196,242, 46,107,212,109,205,143,227,
-166,202,225,224,224,224,224,224,224,168,134,193, 82,170,148, 79, 62,232, 57,228,197,132,206, 70, 35,  5,203, 82, 24,203, 35, 76,
- 44,165, 48,232, 84, 79,222, 53, 33, 70,150,189,177,122,211,206, 78, 13,130, 27,243,  2,106,153,161, 40, 63, 27, 55,175, 95, 53,
- 80,150,189,106,146, 65, 75, 76,212,152, 57,248,245,233,243, 81,143,157,159,143, 24, 83,212,162, 69, 43,177,141,173,185, 46, 51,
- 59,171,104,219,186, 29,198, 67,127,236, 12,  5,203, 14,164,137,137,154,234,164, 75,147, 28,243, 12,192,128,114,199,222, 26,  8,
-104,169,202,126,220, 89,153, 21,119,134,203, 62, 28, 28, 28, 28, 28, 28, 28, 53, 50, 88,143,175,238,109,254,191, 72, 72, 94, 94,
-230, 39, 91,119,252, 49,111,219,174,  3, 77, 53, 58,157, 11, 11, 94,178, 81,175, 63, 47, 46,206,157, 97,170, 70, 73,102,236,  3,
-226,225, 17,250,235,207,139,198,255,178,114,113, 27,176, 70, 95, 16,146, 64,  8, 61, 83, 34, 84, 14,171,174,185,122,  3, 57,164,
-217,145,118,  0,114,184,172,195,193,193,193,193,193,193, 81, 99,131,245,191, 34, 47,254,122, 49,128, 49,239,170, 83,110,162, 22,
-148, 47,239, 21, 74,233,125,  0,220, 80, 12, 28, 28, 28, 28, 28, 28, 28,149,194,112,151,128,131,131,131,131,131,131,131,227,253,
- 66,  0,188,165, 87,158,233, 51,101,215,164, 55, 65, 85,250,156, 38,167,201,105,114,154,156, 38,167,201,105,254,243, 52,171,210,
-174,142,255,248, 91, 67,203, 71, 76,255,111, 44,  0,218,114,154,156, 38,167,201,105,114,154,156, 38,167,201,105,254,219, 22,174,
-138,144,131,131,131,131,227, 95,135,109,221,174,102,182,117,187,154,153,186,189, 93, 64,111,  7,187,128,222, 14,220,149,227, 48,
- 21, 62,119,  9,222, 29, 66,136, 24,  0, 75, 41,213,253, 85,105,176,178,170,109,110, 80,216,238,101, 88,205, 15,133,201,119, 79,
-190,239,243, 11,  8,  8,  8,  6,128,  7, 15, 30,220,166,148,190,107,111, 76,200, 29,124,251, 91,153, 91, 14,215,177, 90,163,178,
- 84,185,186, 36, 35,110,207,251, 76,179,157, 93,128, 92, 43,150, 46,  4,161, 29, 65,193, 80, 66,206,240,138,245,227, 11, 10,238,
- 20, 86,182, 95,173,110, 11,252, 62,239,243,225,244,245,191, 29,158,247,124,255,180,216,215,127,183,238,184, 66, 49,122, 96,187,
- 41, 43,119,238,255, 62,231,192,228, 18, 46,247, 87,159, 90,205, 62,182, 52,240, 29,121,105,231, 22,229, 86,103, 63, 87,223,136,
- 24,129, 64, 96,167,211,233,178, 82,227,174,  5,153,178,143,155, 95,147,104, 30,143,113, 54, 26,216,148,228, 71, 87, 66,185,171,
- 95, 53, 82,251, 58, 17, 48, 24,190,166,  0,  1,225,255,164,206,125,250, 78, 35, 29, 58, 59, 59, 75, 45, 44, 44, 90,152,155,155,
-187,201,100, 50, 73,126,126,190, 42, 63, 63,255,121, 82, 82,210, 25, 74,169,225,175, 56, 71,187,192,238,211,248, 34,102,102,249,
-191,103,103,199,236, 91, 80,249,246,221,230, 17,134, 76, 43,255,247,130,236,152,253,211,255, 14,247,202,161, 94,207,112, 80,118,
- 60,195,240,154, 24,169, 97,126,214,189,253,171,170,179,127, 68, 68, 68,119,189, 94, 47,174,248,191, 64, 32,208, 92,189,122,117,
- 31,247, 20,252, 69,  6,203, 53,160,183,149,158, 79,103,241,121,204, 71, 44,165,138,244,219,187,229,127,231, 19,116, 15, 31,120,
-139, 97, 24,215,151,215,177, 44,155,146,116,125,203,123, 41,108,  9, 33,174, 63,141, 11,153,146,153,171, 42, 34,132,204,125,155,
-249,112,  8,238,127,133, 48,164, 54, 33,  4, 12, 67,192, 43, 27, 64, 53,237,249,245,173, 13,223,160,233,100, 46,231,215, 45, 42,
- 53,220,167,148, 86,249, 18,146,218,248, 56,203,108, 92,206, 71,118, 31,237,121,235,196, 70,127, 51,  7,191, 54, 37,153,177, 15,
-222,195,185,217,121,121,121,133,213,173, 91,215,102,244,232,209, 66,  0, 88,178,100,137,183,183,183,119,110,124,124,252, 77, 74,
-105,118,141,204,149,189,223, 39,203, 22,205,217,210,177, 99, 39,164,229,148, 98,225,226,149,145,102,142,117,123,191, 47,147, 69,
-156, 67,164,150,114,121,204,151,227,103,184,116,106, 21,198,207, 47,213,225,200,153, 27,  3,246,172,255,161,181,165,101,131,160,
-202, 76, 22,171, 44,156,238, 96, 70, 59,176,202, 66,  0,232,255,250,239, 46,102,250,182,118, 82, 99,  7, 39, 49,255, 54,128, 63,
-170,124,185,132, 13, 58, 46, 16, 10,221,  9, 97,192, 16,128,199, 35, 96,  8,  1, 67,  0,131, 94,155,244,228,226,134,246,127,139,
-130, 58,228,147, 12, 66,136, 13,195,148,165,143, 16,128, 97, 24,240,203, 70,254, 45,122,122,101,163,205,123,200, 79, 22, 65,222,
-150,129, 31, 54,109,182,225,252,179, 60,121,173,150,227, 15, 19,202,172, 74,186,240,211, 29, 83,246,151, 72, 36, 86,  7, 15, 30,
-180,235,208,161,131,133, 67, 80,247,243,166,236, 99, 38,146,  4, 28, 58,116, 64,216,161, 67,251,106,228, 79,223, 15,192, 48, 91,
-  9, 32, 96, 89,186,132,199,210,223, 74,114,227,226,171, 59,152,176,125, 80,247, 57, 32,240, 55,121,  7,138,135, 89,247,247,205,
-168,225,181,229, 73,237,125, 63,149, 74, 36,147,124,124,253,235, 38, 60,139,143, 43, 42, 42, 92,172,202,138, 91, 79, 41,101,171,
- 37,166, 55,124,117,234, 98, 84, 71,190, 64, 64, 58,180,  9,231,  1,120, 39,131,229,224,224,208,125,197,138, 21,117, 34, 34, 34,
-  0,  0,  6,131,193,124,247,238,221,142,115,231,206,149,155,242, 12,189,  9, 23, 23, 23, 23, 11, 11,139, 90, 82,169,212,  5,  0,
- 84, 42, 85,106, 97, 97,225,243,212,212,212,212,170,246,117, 12,238,109,203, 48,152,115,236,143, 95,248,  0,208,190,231,240,121,
-158,145, 95, 89, 17,158, 64,245,166,237,141,  6,173,156, 33,100,252,233,131, 27,  9,  0,180,233, 58,120,170, 93, 64,239,159,179,
- 31,236,206,252, 75, 62,232,123,247,230,217, 62,214,117, 39,148, 76,  8,  9, 13,107,252, 81,183,142,240,247,114, 70,247,126, 35,
- 39,  1,168,150,193,210,235,245,226, 61,123,246,184, 50, 12,195, 51, 24, 12,234, 62,125,250,100,189, 75,218,124,154, 13,186,  2,
- 66,220,116,  6,195,175, 73,215,188,230, 81, 58,147,125, 61,237, 78,  9,252,111, 64,152,161,148,101,147,211,163,119, 52,225, 12,
- 86, 57,182,117,187,154,241,196,194,251,173,154, 55,182,153, 58,178,135,104,205,111, 23,225, 28,220, 39, 53,237,246,111, 46,127,
-215, 19,100, 24,198,117,223,246, 21,246, 50, 17, 15,  0, 80,162, 54,160,231, 39, 85,143,  6,225, 18, 54,224, 28,  8,124, 43,234,
- 80,141, 70,131,132,207, 23,168,  9,  0,144,178,222,  1, 82,169,232,218,250,111, 34, 10,  7,119,169, 61,112,202,207,209,155,  0,
- 88,  2,200,120,227, 67,193, 48,174, 59, 55, 44,177,119,177,145,128,207, 35, 40, 81, 25,208, 99,224,  4,227,155, 12,219,250,111,
- 34,230,124,210,209,163,175,125,135,223,123,  2, 56, 90,233, 11,196, 49,192, 79, 97,235,124,242,163,225,115,156,149, 48,199,183,
-243,150,216, 95, 62,177,251, 98,219,238, 67,116,207, 83, 82,148,  6,157,254, 81,110, 94,250,196,226,180,184,199,166, 22,212,102,
-102,102,117,204,204,204, 26,116,236,216, 81, 50,105,210, 36, 65,100,100,228,139,223,135, 13, 27, 38, 60,119,238,156,211,162, 69,
-139, 58, 57, 59, 59,171, 75, 74, 74,238,148,148,148, 60,165,148,154, 60, 41,165,163,163,221,151, 31,245,232,130,214, 61,191,128,
-145, 37, 24, 54,106, 60,142, 31,253, 99,  4,128,247, 98,176,204,120,204,236,161,163,191,118,105, 17,209,144,191, 96,247, 99, 88,
-202,132,104, 23,222,144, 47, 17,124,229,184,227,215, 69,139,  1,124,246,166,200, 21,171, 44,156, 30,100,171,237,215, 53,162, 54,
- 14,236,208,246,115,109, 59,  5,140,204,226, 69, 36,203,171,227, 24,133,149, 84,186,194,217,146,103, 47, 54,102,175,240,234, 56,
-230, 84,252,209,229,197,149,165, 69, 32, 20,186,175, 95,241,157,143,149, 66,  8, 62, 67,192,227, 17,240,121, 12,212, 90, 35,  6,
-142,156,246,190, 34,140, 60,169,189, 79, 39,  6, 24, 12,  0, 44,176, 81,149,245,248, 72,117,238,  9, 97,120, 54,187, 55, 44,226,
-219, 91,136,193,227, 17,240, 24,128,199, 16, 36,102,170, 48,122,210, 44,139,119, 53,234, 29,155,218,135,157,251,185,101,251,198,
- 65,214,245,119, 93, 37, 22,141, 59,246,181,201, 81,203, 62,221,185,255,108,191, 90, 45, 38, 92,167,148,253, 49,249,226,210, 19,
-149,233,104, 52,154,204,246, 29, 58,154, 19,190, 92,118,106,223,166, 22,124,134, 64,111,164, 48, 24,203,  6, 65,102, 41, 69,217,
-119, 75,217, 71, 12,101, 41,134, 14,253, 28,237, 59,116, 84,178,  6, 54,165, 26,133,198,214, 99,167, 46,219,105,244, 44, 22,173,
- 88, 63,167,180, 48,123,206,179, 88,155, 68,153, 67,221,241,202,204,184,  3,166,159, 56,252,227,174,236,238,177,253,208, 53,  4,
-  5,248,151, 13,212,204, 82,248,186,202,177,253,240, 53,248,249,250,149,165,155,165,168,235,102,134,150, 31, 14,172,225,245,141,
-228,203, 29,252,118,116,237, 53,168, 87,207, 94,253, 97,109,101, 14,173, 78, 83,247,244,241, 35,191,172, 94,177,176, 41, 33,228,
-211,106,153, 67,106,124,241, 94,160, 44,251,206,181, 28,206,206,206,118, 97, 97, 97, 47,254,111, 48, 24,224,233,233,137,212,212,
- 84,223, 26,152, 53,153,179,179,243,135, 11, 23, 46,180,111,213,170,149,192,206,206, 14,  0,144,157,157,237,114,254,252,249,134,
- 13, 27, 54,204, 74, 75, 75, 59,156,153,153,169,124,171,169, 96,213, 66, 30,229,243,196, 98,105,185,175,  5, 51,105,244,199,245,
-237,236,236,222,248,113,156,155,155, 39,154, 57,115,  6,225,243,  5,101,219, 83,202, 80,214,248,214, 57, 70,154, 52,105,210, 85,
-167,211, 73,222,244, 91,142,193,174,147,154, 21,245, 45,123,139,  0,124, 30, 47, 63,237,246, 30, 59,147, 77,123,253,110,237,156,
- 24,193,234, 46,221,186,121,116,239, 20,  9, 39, 59, 11,156,185, 22,135,177,223,252,  4,189,193,184,180, 38,247,135,199,227,241,
-179,178,178, 18,173,172,172, 28,223,195,251,182,246,254,237,203,237,207, 94,188, 53,245,103,241,206,145,117,154, 13,214,151,181,
- 71, 42,155,153,197, 87, 98, 46,104,217,189,173,185,181,139,159,100,221,138,  5,  2, 46,130,245,242,141, 16,241,230, 54,107, 18,
-102, 51,117,220,231,162,185,235,207,227,234,241,195,170,180,219,187,223,139,185, 82,216,251, 70, 16, 30,127, 56,225,241,228,132,
- 33, 34,214,200, 38, 27,180,218,121,202,156,184,244,119,213,102, 89,138,223,175, 84,211,152, 83,234,253,203,207,139,236, 29, 44,
-197, 80,235,140, 24,252,229,183, 88,187,116,142,194,206, 66,  4,141,206,136, 77,  7,110,229,212, 83, 46,161,131, 59,212, 30,248,
-221,250,152, 63,126,220, 26,251, 71,217,179,250,214,140,  7,123, 11, 49,190,219, 25,  7,115,169,  0, 86, 10, 33, 24,230,205,230,
-106,112,151, 50,205,130, 98,173,129, 16, 34,162,148,106,223,104, 36,156,130,154,155,219,185,238,233, 49,116,142, 93, 92, 38,  1,
-133, 14,241,230, 18,124,244,201, 72,203, 58,142, 82,200, 37, 60, 36, 38,167,123,126, 53,121,114,168,196,201, 47, 76,157, 30,251,
-188,170,211,246,240,240,232,217,185,115,103,217,196,137, 19,  5,110,110,110,216,186,251,184,251,  7,189,198,116, 73,205,200,117,
- 99, 41,224, 96,111,157,252,121,223, 78,  7,143, 28, 57,146,148,156,156, 44, 88,184,112, 97,248,222,189,123,  3,170,243, 37,106,
-164, 20,106,141, 17,198,242, 23, 99,118,161,166,  6, 47, 21,194,188,253,203,156,118,107, 31, 25,198, 95,178,239, 41,138,149,  6,
-200, 68,124,196,167,151, 34, 34, 60,140,191,107, 29,105,245,166, 61, 62,239,243,225,116,  7, 51,218,161,107, 68,109,216, 91,201,
-176,225,231,239,112,224,234,179, 14,153, 37,  4,182, 93, 23, 14,119, 18,243, 63,176,147,  9, 87, 68,134,122, 57,182, 14,113,199,
-205, 80, 47,199, 11, 81,143,226,234,245, 89, 60, 58,181, 68,112, 42,239,232,232, 55, 26, 45,134, 48,176, 86,  8,177,254,120, 18,
-100, 18, 62,228, 18, 62,228,226,178,191, 12, 67,222, 41, 95, 75,157,  3,220,120,172,241,115,115,231,128,207,251,245,233,237,252,
-113,191,222, 20, 60,  6,187,127, 63,216,109,219,182,173,233,102,142,190,235,140, 12,111,189, 42,237, 65,114,213,215, 19,176,183,
- 16,225,171,117,247, 97, 46, 21, 64, 33, 19,192, 92, 38, 64,235,250,118, 53, 78, 39, 33,196,106, 68,183, 58,157,238,110,105,219,
-202,183,150,153,207,157,248,194,  7,159,207,187,181,244, 92, 65,171,113, 63, 47,  9,176, 41, 41,208,242,103, 76, 26,202, 79, 73,
- 75,107,181,251,224,249,214,206,141, 62,127,100,208,149,126,157,117,231,183,253,111,210, 75,142,189,210,208, 53,162,183, 68, 87,
-162,191,119,231, 81,138, 87,190, 70,140,152,196, 34,200, 37,124,152, 85, 92, 91,  9, 31,114,137,  0,102, 18, 62,210, 82, 18,144,
- 87,202,187,148,106,195,180,162,231,174, 84,171, 42, 74,173, 51,226,246,179, 18,120,248,  6,195,201,201, 25,218, 78,  3, 60,174,
-159,249,125,191,220,201,127, 65,105,250,195,175, 77,213,217,126,232, 26,230, 46, 88,242, 24,  4, 15,203,223,230,254, 19, 39,140,
-246,249,105,241,138, 87,214,141,252, 98,148, 79, 77,205,181,204,193,119, 91,203, 15, 63,233, 85,175,113, 59, 60, 77, 72,192,209,
-131,183,208,230,131,142,232,212,165, 39,180, 90,205,192,245,107,151,223,  4,176,242, 79,101,174,147,127,179,122, 65,254,219, 92,
-156,157,221, 88,182,108, 14, 88, 74,129,102, 45, 91, 99,242,184,161, 96, 41, 69,131,134,141, 90,119,234, 55,154, 82, 90,102,  4,
-115,114,115, 74, 31,197, 62,104,171,202,140,189,110,242,181, 84,171,245,217,217,217,184,125,251, 54,226,226,226, 16, 19, 19,131,
-220,220, 92, 88, 88, 88, 84,171,138,221,202,202,202, 60, 52, 52,244,227,223,126,251, 77, 98, 97,241, 31,207,175,213,106, 33,147,
-201,208,181,107, 87, 65,179,102,205, 92,  6, 13, 26, 52,200,202,202,106,123,126,126,126,209, 27, 13,211,221, 67,105,142,245,186,
-175,233,212,107,216, 72,  0, 16,138,205,158, 45,251,245,143,152,202,142, 45,148,152,187,183,237,254,153, 23, 40,  5, 33,100, 89,
- 78,236, 31, 25,111,219, 86,167,211, 73,119,237,218,229, 66,  8,121,229,253, 58,123,217,206,166,247,159,100,180, 89, 61,107, 10,
-223,220, 76,130,236,  2, 13,134,143, 28,109,107,178,185,170,215,109, 84, 88,195,134, 43,191,157, 52, 20,114,153, 20, 39,174, 63,
-197,248,105,223, 27,242,114, 50,183,128,144, 37,217, 49,123,223,181,214,226,189, 76,247,230,227, 98,  6, 69,251,  8,201,208, 62,
-145, 18,173,222,136,130, 82, 61, 52, 58, 35,140, 44, 69, 97,169, 30, 15,158, 23,195,214, 92,132,117,248,231, 83, 45,131,197, 23,
-136, 58,143,249,180,147,104,209,246,235,184,122,124,187, 42, 45,122,183,172,226, 55,183,208,126,207,146,111,237,172,253,170, 71,
-169,186,171,165,212, 57,192,141, 79,120,139, 91, 70,182,104, 55,114,212, 40,248,214,113, 21, 26,141, 70,122, 63,238,153,126,211,
-250, 13,159, 90,184,213, 91, 90,148,114,127,122,197,203,180,186,221, 55, 89,150, 77,121, 61, 98,197,178,175,126,205,190, 73,147,
- 16,192,210, 76,132, 53, 71, 19, 64, 41, 64, 64, 97, 33, 23, 96,231,185, 20, 20,230,166,229,212, 87, 46,185,252,121,  7,219,174,
-243,214, 63,216,191,234, 96,102, 20,128, 24, 74,105,230,219, 52,  9, 33,224,243,  8,204,101,  2, 88,200,132,176,148, 11,193, 16,
-242, 86,115,245,237, 47,119, 55,  1,120,244,178,185,122, 89, 83,238,224, 27,104,110,235,190,175,231,136,  5, 86,119,159,235,192,
-231, 17,212,118,148,194, 90, 33,132,214, 64,144,152,173, 43,223,199, 28, 95, 76,156,109, 55,101,194,200, 35,132, 68,214,167,244,
-156,161,178,115, 87, 42,149,162, 79, 62,249, 68,160,215,235,117,131,199,206,107,151,145,149,219,109,233,252,201, 98, 59, 91, 27,
-148,170,245,136,126,152,228,255,253,162,159,107, 31, 62,125,109,223,215, 95,244,216,223,161, 67,  7,139, 93,187,118,177,213,185,
-239,217,153, 57, 63,111,216,182,103,203,146, 69,243,241, 40, 41, 31,235,215,174,  4, 53, 26,214, 84,238,119, 95,213, 92,177, 98,
-133, 67,120,120, 56,115,227,198,141,156,215, 13, 40, 33,144,231, 22,105, 96, 41, 23, 66, 38,230,195,193, 74,  2, 27, 51, 17, 68,
-  2,  6, 12,243,159, 66,228,101,205,245,191, 29,158,199, 42, 11,113, 96,135,182,223,134,159,191,195,103, 95,126,131,251, 57,162,
- 99,140,204, 98,222, 23,253,122, 78,181,147, 26, 59, 56, 91, 50,246,173, 67, 60, 32,151,  8, 49,109,204, 39,104, 20,149,104,159,
- 90,192,126,147,173,226,  5,  3,248,230, 77,233,100,202, 35, 86, 10,153,  0,231, 14,237,200, 42, 45, 46, 40, 36,188,178, 42, 66,
-189, 86,151,100,154,215,255,243,245,148, 59,248, 78, 13,  9,174,255,221,200, 97,159, 51, 77, 35, 26, 81,134, 17, 32,167, 88, 75,
- 40,  5,198,141, 30,129, 47, 70, 12,117, 76, 78,203,154,177,114,229,154,233,102,246,254,115, 75,178, 30,206,170, 76,147, 71, 24,
- 48, 12,129,153,132, 15, 51,105,153, 97, 49,147,240,161,214, 26, 65,  8,120,174, 33,253, 10, 65,  0, 66, 72, 90,242,205, 29,254,
-166,164,211,185, 94,199,211,231,179,132,126,202, 35,234,171, 79, 30, 71,207,187,113,247,249, 13, 74,105, 94,173,150, 19,  6,233,
- 12, 20, 37,106,  3, 18, 50,149, 48,232, 40,249,172,163, 59, 60,123, 17,223,249, 27,162,183, 16, 66,204, 43, 34, 46,175,107,166,
- 92,221,173,182,173,215,179,239,146,229,107,111, 46,250,238, 27, 94, 78,161, 22, 44,165,144,136,120,144,138,248,229, 11, 15,170,
-210, 66,172, 92,253,107,134,  1,164, 39, 61, 87,121,158,255,115,161, 65,  7,244,232,212, 98, 39,  1, 68,132, 17,166, 56,187,123,
-184,183,233,242,169,164, 77,215, 79, 96, 52,104,167,202, 29,252,206,150,102,198,158, 54, 69, 51, 40,192, 31, 32,120,152,117,111,
- 95,207,178,151,100,247, 63,252,124,253,124, 94, 95,231,237,237,235, 99,202,125,175,248,184,144,218,249, 12,243,246,171, 55,121,
-228,183,107, 61, 18,210,149,176,118,243, 65,204,189,219, 56,186,235,231,104, 85,113,254,162,163,  7,254,152, 60,247,135,101, 13,
-186,116,239,131,253,123,119, 77, 36,132,172,162,101,156,122, 41, 58, 53, 96,211,186, 95,220,  4, 34, 49,244,  6, 22,122, 35, 45,
-251,107, 48, 34, 47, 47, 31,122,  3, 11,137, 76,  1,  3, 75,160, 55,178,208, 27, 88,104,180,  6,249,136, 79, 62, 28,  5,224,250,
-155,210,233, 25,254,201, 45, 48,196,181,108,125,217, 58, 17, 99,161,116,114,114,218,  2,  0, 98,177, 24, 98,177, 24, 44,203,226,
- 94, 26, 25,231, 28, 54, 96, 26,104,249,155,157,101, 83,210,163,119,132,190,237,220,221,220,220,186,188,110,174,212,106, 53, 74,
- 74, 74,112,249,230, 93,139,205,187, 79,117, 72, 76,206,168,195, 26,237, 53, 82,199,  6,237,  1,116,121,219,245,204,184,183,111,
- 84,173,200,113,204,196,145,159,120, 47,251,117,207,141,199,199,230, 86, 26, 78,174,221,118,170,118,242,168,254,161, 63, 44,219,
-240, 56,229,252,210,241, 85,221, 35,161, 80, 40,200,206,206,126,241,124,207, 89,241,123,199,231,153, 69,109, 22,125, 55, 93, 24,
-253,172,  4,247, 18, 50, 48,168,109, 45,147,159,119,167,192, 30,190,238,158,110, 75,151,206, 29,139,184, 52, 21, 86,252,126,  3,
-231, 15,111,137,210,169,139, 63,204,138, 57,144, 85,147, 50,228, 93, 13, 86,101,154,103,239,230,160, 68,109,128, 70,107,128,158,
-165, 40, 82,234,145, 85,160, 69,145, 82,135, 18,149,  1,131, 62,168,133,127,  3,213, 50, 88, 70,131,222,213,217,217,  9, 44, 77,
-169,136,112,150, 69, 61,194,251, 41,199, 15,235, 45,117, 14,238, 85,154,118,123,143,201,109,178, 20,246,117,155, 72,165,178,195,
- 63,253,244, 19,250,117,105, 46,125,158,163, 47,185,251, 92,149, 89,170,133,193,222,174,174,104,222,252,239,205,190, 95,248,227,
- 23,135, 14,176,  5,  0,126,124, 99,248, 57,172,255, 45, 30,121,169,141, 21, 33,160, 44,155,146,114,115,123, 40,  0,188, 75, 91,
-171, 18,181, 30, 60,166,172,237, 12, 33,128, 82,109, 64,105,126, 70,238,203,230,234,122,170,227, 83, 30, 47, 91, 71, 41,173,180,
- 10,130, 33, 64,145, 82, 15, 11,153,  0,150,102,  2, 88,200,255, 19,193,122,139,185,138,169, 76, 83,168,211, 37, 27, 13, 90, 53,
- 53, 26,209, 57,204, 14,246,150, 34, 56, 89,137, 33, 22,241,161, 55,  0, 42, 45, 11,181,214,136,196, 44, 21,138, 85, 34,212,143,
-236,235,157,230,116, 77,105,235, 17,182, 41, 39,241,230,240, 74,239,179,209,136,109,123,142,123,167,101,100,119,219,191,101,177,
- 56,171, 72,135, 59,137, 37,200, 42,208,  0,196,  2, 83,191,153, 46,158, 49, 99,102,247,109,191,159, 72,106, 25,238,159, 84,221,
-235, 90,154, 21,187,181,126,211, 15,127,238,220,185,187, 34,230,250, 17, 60,190,125,250,219,146,204,234,181,191,242,246,246, 54,
-252,252,243,207,118,107,215,174,245,182,183,183,127,158,149,149,245,172,162, 58,202, 51, 32, 34,237,212,233,139, 54, 45,154, 54,
-231,167,228,168, 97,163, 16,194,195, 65,142,168,171,103,181, 12, 33,199,222,164, 87, 94, 13,216,223,181,237, 20, 28,184,250,172,
- 67, 76,174,228,220,208,207,  7, 37,157,184,240, 40,119,197,150, 19, 63,184,152,233,111, 75,216,236, 21,183, 66,189, 28,167,142,
-254,  4, 11,150,111,197,249,168, 71, 89,165,140,211,119,233, 26,195,201, 89,125, 39,191, 57,234,203,  0,124, 30,129, 66, 42, 64,
-105,105, 65,225,253, 83,171,234,190,167,103,119,208,137,125, 91,153,188, 98, 61,146,115,212, 36, 45,175, 24, 70,150,194, 82, 38,
-132,129,165, 40,200,203, 33,219,182,110,193,205,155, 87, 25,240,152, 33,  0,102, 85, 17,  9,  1,143, 33, 48,147,  8,202, 34, 64,
-210,178,191,122, 35, 11,159,218,110, 88, 54,103,140,185,173,189,  3,218,245, 28,110,122,132, 77,110,213, 96,243,234,121, 56,119,
-245,118,228,217, 39, 59,194,236,131, 26, 44,119, 13,232,189,136,177,118, 81,107,116, 70, 20, 22,228, 67,164, 77, 70, 35,151,108,
- 88,203,140, 72, 44,114,194,253,140,199,102, 85, 85,103,229,220,251,227,182, 93, 80,143,233,123, 14,158, 89,208,254,131, 72,220,
- 79, 44,130, 84,196,135, 68,196,131, 68,196,131,128, 24,177,120,245, 26,125,126, 97,113,231,156,251,251,114,106,144, 63, 79,  1,
-120,209,230,204,204,161,142,221,214,229,211, 55, 15,157,188,176,125,135, 30,159,146,251, 55,207,126, 13,224,180, 73,101, 38, 75,
- 77, 90,199,178,166,189,219,  8, 33,140,189, 87,232,246,141,155,118,244, 13,240,113, 67,102,129, 30,105,249, 58, 92,140,142,199,
-230,117,211, 11,242, 51,159, 14,128,174,164,132, 37,134,194,227,199, 14, 30,251,114,236,100,  4,  6, 53,240, 40, 74, 41, 50,  7,
- 80,248,202, 49,121,100,237,192,207,135,247,117,112,112, 80,252, 39,130, 69, 81,215, 55,  0,157,186,126,132,227,251,247,226, 65,
-204, 93,176,180,108, 56, 31,150,165, 40,200,207,205, 48,232,181,155,222,154, 62, 30,207,117,227,154, 69,246, 12, 67,160,211,179,
-208, 26, 88, 76,157, 58, 93, 59,118,198,138,102,237,155,214,143,225,129, 45,122,158, 94, 96, 25,245, 40,163, 30, 17, 40,156,  6,
-140,152, 34, 84,107,140, 40, 84,234,113,106,247,178,183, 87, 51,214,105, 16,225,233,223,236,243, 97,223,172, 17,139,121,140, 46,
-176,174,219,179,150,141,  3,147,107, 57,219, 22,207, 95,182,173,209,149,232, 71,157,122,246,236, 41,233, 91,199,159, 56,219, 72,
- 20, 35, 70,141,174,239,232,211,108, 96,198,227, 75, 91,222,250,242,227,139, 11,220, 92,221, 94, 84, 37,218,  7,117,191, 11,192,
-253,181,205,146,178,238,239,171, 15,  0,246, 14,142,106, 34, 16, 23, 87,195,128, 80,  0,152,189,124, 79,167,148,236,146, 94, 21,
-230,234,246,211, 66,136,133, 12,116,122,211,155,198, 25,  9, 29, 55,101,244,103,130,188, 82,  3,206,221,205, 70,204,173,179,212,
-160, 43,250,148, 18,254, 96,187,160,238,  3,  9,224, 73,129,  4,134,224, 23, 45,131, 77,  5,119,246, 21, 86,191,166,167, 44, 61,
-246,  1, 61,155, 16, 30, 58,241,248,194, 48,128,245, 51,232,245,246, 12,143,151,147,113,103, 79,149, 61, 40, 95, 62,163,210,204,
- 56, 44,156, 63,  3,203,214,237, 69, 90,174, 26, 22,198,100,236, 95, 63, 15, 19, 23,108,135, 74, 99,196,191,  1,147, 13,150, 67,
-189,110,141,  0,134,231,104,109,  6,239,218,110, 48,235, 61, 88,234, 26,210,183,148,199, 99,152, 77, 75,191,150,228,170,248,224,
-243,120,165, 38, 23,190, 14,126,225, 10,133,226,200, 31,191,239, 69,157, 90,246,194,109, 23,243, 18,162,159,169, 94,132,116,139,
-178,147, 68,158,230, 74,126,207, 30, 61,100,167,207,156, 29,247, 54,131,197, 35,140,235,178,197, 63,216, 43,164,  2, 16,  2, 20,
-171, 12, 24, 59, 97,202, 59, 95, 24, 10,202,251,114,194, 76,144,114,115, 85, 92,152,135,239,150,109, 42,233,233,114,230, 82,133,
-185, 58,241, 80,250,164, 71,143,214,133,137,137,137,249, 85, 22,140,212,152,210,107,208, 88, 33,195,148, 85, 27, 49,132,128,194,
-152, 89, 19,115,  5,  0,249,249,207,138,164,142,245,123,108, 93, 50,122, 93, 45, 23, 23, 43,133, 76, 66,204,228, 98,226,239,235,
- 37,105,220, 56, 66, 82,203, 43, 80,116,225, 65,  9,158,103,171,240, 44,173, 16, 34,219, 64, 65,223,150,109,177,117,217,148, 78,
-166,156,255,153,171,247,187,172, 90, 52, 93,156, 81,160, 69,236,243, 18,100,228,171,145,158,175, 65, 70,158, 26,102, 82,  1, 34,
-218,246, 20, 31, 61,185,187, 75,203,112,255,229, 53,185,190, 79,227,159,237, 77, 76, 77,255,180,126,195, 70,216,182,121, 99, 99,
-226,234, 42,161, 41, 41,106, 83,247, 95,183,110, 93, 94, 88, 88,152,221,247,223,127, 95,234,235,235, 27,236,235,235, 91, 59, 46,
- 46,238,156,183,183,119,215, 85,203,230,158, 31,251,205, 34,119, 30,209, 91, 52,105,218,140, 39, 17, 18, 92,189,112, 92,179,105,
-221,154, 52, 93, 65,201,228, 74,141,176,204, 98, 94,102,  9,129,157,139, 75,140,153,200,248,  1,159, 41,136,203, 59, 58,122, 11,
-128, 63,188, 58,142, 57,117,246,214,163,184,208,168, 68,251, 51, 81, 79,178,242,148,186,186,241, 71, 39, 84, 90,224,242,  8,129,
-128,199, 64, 33,229,191,136, 88, 58, 52,232,253,132, 18, 98, 87, 17, 41, 37, 40,139,104,145,178,207,150,180,148,168, 93, 38, 52,
-140, 38,148,165,192,163,148, 82,148,168,203, 66,240,174,182, 50,100,103,166, 96,213,242, 77,136,190,117, 19,237, 58,118,197,202,
- 95,183, 97,232,192,222, 85, 94, 87,134, 65, 89,  4,235,165,232,149,153,148, 15,128,160,160, 84,143,223, 47, 37,195,171, 54,  3,
- 82,141,218, 66,133,153, 20,133,197, 42, 48,  2, 51,196, 94,220, 34, 59,122,246,198,180, 89, 63,174,255,170,168, 36,227,121,252,
-131,171,240,181,202, 69,109, 23, 29, 98, 50,204,113, 43,215, 19,190,222,117,192,  8,111,154,164,157, 19, 83,111,225,126,230,247,
-206,161,193,  1, 17,238,246,150, 80,105,141,229, 81, 44, 30, 54,110,216,130,196,132,148,207,115, 98,246, 69,191,143, 66,178, 36,
-243,105,182,196,193,231,139,123,215, 79, 63,235,241,241, 23,112,114,169,213,160, 58,205, 19, 76, 89,103, 52,193, 96, 17, 66, 24,
-107,143,224,205,155,183,238,238, 91,187,150, 35, 78, 94, 79,192,141,184, 92,216,218,218,128, 39,115,132, 79,203,193,150,247,142,
- 45,251, 72,149, 83,178, 89, 32,148, 13,  9,111,220, 20,148, 82, 60,122, 24,147, 87, 88,104,241,167,178, 89,153, 22,123, 27,128,
-249,203,235,100,118,254, 13,204, 44,172,111,107,116, 70,164,166,166,224,242,149,115, 13,203,183, 51, 25,177,144,135, 19,209, 89,
-208,233, 89,232, 12, 44,194, 67,  2,181,  2,145,180,249, 15,235, 14, 55,206,204,204,102,164,102,230,172,133,125, 29,161,181, 62,
- 67,115,231,105,161, 80,167,103, 81,199,185,242,239,114,153,117,157,249, 19, 38,142,245,231,  9,165, 40, 46,213,104,211,211, 82,
- 29,127,217,113,182,228,225,163,  7, 46,158, 30,181,204,231,205,157, 37, 44, 84,  1, 89,133, 26,228, 21,235, 72,159,143, 63,119,
-222,178,126,229,  0,  0, 91,170,145,244,122,187,182,172,209, 91,153,  9, 73,177, 74, 79,179, 11, 53,198, 81, 95,140,173,247, 46,
-121,167,194, 92,253,248,221, 55,194,232,103, 37,184,243,180, 16, 18, 33, 15, 34, 33,  3,173,137,  6,203, 46,160,183,220,206,206,
-114, 64,120,  3, 31, 28,143,206,  6,143,199, 64, 89, 90,168,149,136,205,238,251,249,249, 48,193, 13,130, 16,217,172,  9,226,159,
- 37,250, 30, 63,121,102,201,141,155,209,223,217,  5,245,152,156,125,127,239,202,234,164, 53, 57, 61, 87,150,105,112, 27,107,239,
-104, 27,212,181, 91, 23,113, 45, 23,  7, 98,103,109,  9, 35, 17, 98,196,200, 47,237, 77,206,243,180, 44,122,249,253,220,105,208,
-104,180,176,179, 20,129, 82, 96,195,242, 89,208,106,181,112,182, 17,163,176, 84,207, 25,172, 23, 55,184,126,143,166, 82,177,252,
-196,202,  5,227,152,130, 82, 61, 36, 66, 30,234,212,169,141,209, 99,199,201,218, 52,176,131,138,152,227,247, 29,155,138, 12, 70,
-253, 33, 83,244,100,142, 62,161, 10,185,249,241,205, 91,119,177,182, 54, 54,204,170, 19,217, 79,115,139, 13, 47,134, 56,136,187,
-126,128,189,117,252, 23, 39, 10,114, 76, 34,145,120,107,181, 90,171,170,110,232,134, 19, 73,229,141,115,201,123,185, 48, 12,195,
- 24,127, 89, 62, 23,182,230, 34,104,244, 44,230, 44,217, 82,220,217,238,216,153,151,205, 85, 72, 72, 72, 97,131,  6, 13, 10, 24,
-166,234,225,196,158,223,216,214,228, 13,  5,102,141,204, 85,  5,170,140,187, 55,  1,  4,189,170, 25, 34,176,245,220, 61,177,223,
-128,129,211, 28,  3, 63, 84, 36,164, 23, 66, 72,116,  8,243,119,194,185,227,127,176,201,207, 30,142, 48, 69, 59, 43,183,208,205,
-214,214,  6,209, 79,139,145,154,171, 66, 70,185,185, 74,207,215,160, 88, 85,140,  6, 30,118, 40, 40, 44,113,171,177,129, 37,116,
-223,241,227,199, 63,237,212,173, 47, 70,127, 53,187,227,186, 85,139,238, 74, 29,252,  7,170, 50, 31,222, 48,101,255,221,187,119,
- 27, 61, 60, 60,158,102,103,103, 55,154, 52,105, 82, 81,157, 58,117, 28,231,206,157, 59,172, 78,157, 58,206,173, 91,181, 42,188,
-113,182,241,230,177, 95,205,106, 53,117,204,186,218, 12,195,100, 82,150, 30, 72, 43,213,207,164,217, 15, 84,149,222,167,253,211,
- 98, 73,192,236, 79, 63,104,110,119,192, 90,198,  4,138,169,182, 31,  9,152,189,139, 62,152,169,139, 63,186,188,184, 94,159,197,
-163,211, 10,216,111,212,140,253,119, 85,153,171,178,  8, 22,129,214, 96,132, 66, 42,248, 79,222,164,112, 90,181, 98,177,204,206,
- 66,  4,  1,143,  1,159, 71, 80,164,212, 35,167, 72,135,175, 38,127,101,234, 21,100, 13, 70, 10,149,214,  0,101,249,215, 96,113,
- 81, 14,166,125, 53,  1, 29,187,244,192,144, 17, 19,144,175,  2,110, 61, 43,134, 78,175,175,242,161,224, 17,  2,165,198,128,207,
-218,185, 35,175, 68,135, 82,149,  1, 90,  3, 11,153,136, 15, 62,159,129, 92,194,135,185, 76,  0, 66,168,208,201,201,105, 24,  0,
-  8,  4,  2,245,243,231,207,183, 86,242,  5, 15, 79, 55,  7,168,244, 12, 26,245, 93,132,182, 17,117,113,231,212,122,254,249,107,
-247,106,127, 53,107,  9, 70,245,143,192,158, 88, 47, 88,219,187,195, 76, 46,133,158, 50,  0, 76, 27,  2,132,210,153,172,147, 95,
-207,254,107,126,221,240,104,206,140,169,146,130, 82,  2,177,144,135, 51,167, 79,225,234,245, 91,203,178, 99,246,109,125,159,  5,
-165,128, 50, 14,230,230,230,144,136,120,208,234, 52, 90,147, 35, 15, 44,  5, 40,252,237,235,117,255,163,252,222,251, 27, 89,188,
- 97, 29,173,202, 92, 17, 11,231,160,141,107,214,109, 27,224,236,104,143,189,167,239, 98,227,175, 43, 80, 59,184, 51, 46, 29,222,
-  8, 11,207,198,144,215,106,  6,145, 98,247, 48,134,199,175,247,229,184,175,123,134,132, 69,224,242,197, 51,200,202, 72, 95, 67,
-105,172, 73,109,208,120,  2, 50,166,245,  7, 93,160,214, 26,209,188, 77,103, 28, 59,184,119, 52,202, 59, 79,152,202,235, 38,156,
-101, 97,248,114, 72, 63, 65, 86,129, 86,144, 93,164, 69, 74,182, 18,  9,153, 74,236,223,185,158,154,250,214,102,248,188,176, 22,
-245, 93,  5,195, 22,158, 73,118,115,117,210,  8, 52, 42,105, 92,252, 83,191, 33,159, 14, 16,212,246,246, 99,178, 10, 53,200, 46,
-212, 32,167, 80,131, 18,181,  1,222, 78,181, 24,141,129, 31, 81,221,251,108,103, 41, 17,172, 60,248, 12,230,114,  1,154,248,217,
-212,184, 17, 54,203,178,175,152,171,219,207, 74,113,247, 89, 33,196, 66, 30,196, 66,  6, 98, 33, 15,  6, 35, 53,241, 93,100,232,
- 55,124,112, 95,169, 86, 79,145, 91,168,  5,159, 71,224,104,107, 35,118,115,170,139, 13,139,190,  4,  0, 12,157,178, 10, 67, 62,
-251,  4,190,117,189, 81, 88, 88, 44, 29, 50,114,236, 98,188,161,221,221,219,210,186,109,255,133,128, 91,247,147, 38,126, 58,120,
-144,160, 79,151,230,204,237,167, 69, 72,207,211,224,105,188, 18, 58,125,245, 70,163, 49, 24, 89, 80, 80,108,218,117,  8, 82, 17,
- 31,217,133, 58, 80, 74, 49,111,197,111, 80, 72,  5, 72,207, 47,171,214,231, 12, 86,133,185, 18, 73, 78,108, 89,241,181,244, 76,
- 28,176,236,228, 45,124, 24,238,  4, 33,159,129,216,204, 17,119,158,229,227,212,233,253,197,151,174, 94, 87,131,209, 87,217, 45,
- 74,230,228,219, 80, 46, 53, 63,181,242,151,205,  6, 91,123,123,108,189,152,151,146, 95,106,208,255,167,122, 74, 79,110, 29,255,
-165,182,129,213,119, 80,101, 60,174,242,115,150,165, 84,184, 96,245,126,  0, 20, 44,203,130,178, 44,120, 66,177,220,189,241, 39,
-153,101,122,172,132,207, 99,212, 47, 63,249,148, 53,166, 36, 93,223, 94,105,213, 33,  1, 96, 33, 19, 96,215,249, 84, 20,230,165,
-229,116,182, 59,246,162, 90,240, 88,140,248, 73, 72, 72,112, 97, 88, 88, 88,129, 84, 42,  5,143,199,171,246,133,127, 87,115,245,
-246, 23, 79,148, 30,192,247,206,126, 45,187,118,148,  5,134,139, 24, 62, 66,124,157,112,238,196, 94,246,234,209,245, 61,148,153,
-113,135, 77, 12,111,163, 68,165, 71, 90,174, 26,169,185,106,100,228,171,145,145,167, 65, 70,190, 26,132, 16,168,181,239, 54,124,
-141, 50, 51,238,160,153, 75,224, 26,141, 14, 35, 90,180,235,129,137,179, 86,122,111, 93,243,195, 69,185,189, 79, 88,105,214,227,
-123,166,104, 36, 38, 38,106, 28, 28, 28,162, 10, 10, 10,218, 45, 89,178,164,196,223,223, 95,100,102,102,150, 11, 64,250, 36, 46,
- 78,120,230,200,238,132,236,180,180,225, 58,157,238,166,169,233,242,136, 28, 44,246, 51,207, 27, 86, 75,222,164,125, 29, 71, 25,
-106,201,139,219,251,153,221,249,209,190,205,184,249, 89,167,151,102,165,107, 12, 39,179, 85,188,224,212, 18,129, 73,109,  1, 13,
- 58,109,210,199,195,167,129, 71,  8,116, 26,109, 82, 69,230,178,183, 16, 97,214,182, 88,152, 73,  4, 80, 72,249, 48,147, 10,208,
- 44,192, 26,213,248, 60,160,122, 35, 11,165,198,  8,149,198,  0,181,214,  0, 91, 55, 43,252,186,117, 55,158,103,169,176,255,102,
- 14, 30, 37, 21,195,199, 85, 14, 74,171,142, 59,177,212, 80,218,103,216, 55, 10, 30,195,128, 71,192,248,121,123, 32,175, 68, 11,
- 33,159,129, 72, 36,130, 92,204,135,185, 84,  0,  1, 95,128, 27,119,239, 66,163,209, 32, 60, 60, 92, 82,185,  5, 44,139, 98,249,
-212,118,134, 78,111,192,145, 11, 15,240,221,248,158,248,160, 69, 40,190,226,137, 16,171,105,  8,133,181,  2, 44,195, 64,103, 96,
-161,213, 25,  1, 48,111,141,182,213,170, 85,171,181, 92, 46,151, 43,149,202,226,164,164,164,115,233,177,127, 60,183, 15,236, 62,
-236,216,137, 51, 91, 59,119,252,  0,209,119, 99,176,103,239,129,139, 57, 54,133,147, 42,246,  9, 10, 10,106,108,107,107,107,150,
-155,155, 91,116,239,222,189, 27, 53,201,171,132, 16, 34,119,240, 27, 23,209, 44, 18, 37,  5, 89,200, 76, 78, 56,100,234,190,254,
-238, 10, 76, 24, 63,218,199,183,174,175,143,177,188, 39, 85, 64, 45,  5, 70,140, 28,229,227,229, 83,215,167,162,163,135,127,173,
-202,199,187,148, 59,248,142,250,110,241,234,129,181,220,220,112,244,114, 44, 22,124, 51, 34, 90, 46, 83,120,186, 58, 88, 89, 10,
-  3, 67,113,251,246, 21,216, 67,  4,115,  7, 31,215,126, 93,135,187,182,239,216, 21,247,238,220,194,210,133,115,175,150,242,164,
-243, 77, 73,171,153, 67, 29,187,224,176, 22, 31, 43,172, 29, 80, 80, 88, 12,133,149, 61,252,235,135,125,108,230, 80,103, 74, 73,
-230,211,236,154, 62,235, 44,165,208,232, 40,242, 75,116, 72,206, 86, 33, 49,163,204, 96,177,108, 53,218,252, 80, 16, 51,  9,159,
-111,173,127, 82,235,222,169, 51,212,221,205,129, 44,156,251, 21, 79,135,178,198,226,217,133, 26,100, 23,105,145, 93,168, 69,137,
- 90, 15,107, 57, 31, 44,101,171,253,181,157, 95,162,131,162,188,157,172,145,173,185,  9,152,181,100, 71,147,148,108,101,155, 31,
-231,125, 35,188,147,240,146,185, 18,148, 69,175,196, 66, 30,140,172,105, 17, 44, 30,159, 25,253, 97,155, 70, 72,206, 81,149,245,
- 66,102,  8,188,  3, 27,194, 86,202,162, 77,223,169,  0,128, 46,157,202,134, 33,121,150, 94,138,131,215,210,  1, 64,104,106, 90,
-115,115,139,197,123, 79, 70,143,221,241,235,143, 34, 13, 43,192,218,163, 73, 80,106, 12,144,  8,121, 16, 11,121,144, 10,171,247,
-126, 51, 24,203, 58, 75, 60,207,209, 67,169, 86,163, 72,165,  7,  5,112,227, 73,  9, 84, 90,  3, 10, 75,245,104,236,103,197, 25,
-172, 10,115,181,121,249,215,210,211,113, 20,103,239,228,162, 87,115, 87,228,102,165,224,215, 85,203, 88, 74,  1,177, 68,148, 97,
- 52,176, 71, 85,172, 97,114,193,157,131,133,149, 22, 18,118,  1,245,165, 50,217,153, 31,150,174,213,217, 59,184,176,127, 92, 43,
-200, 42, 84, 26, 95,137, 21, 26, 53, 26,134,178, 84,104,138,185, 42,143, 52,233,102,142,238,  1,150, 82,204, 90,186, 27,243, 39,
-245,133,153,148, 47, 35,132,200, 74,213,  6,140,159,189, 14, 63,125,251,185, 66, 38,230,131, 16, 64,173, 53, 98,196,104,211,162,
-  4, 74,141, 17,165,  5, 25,185,245, 74, 22,191,102,174, 66, 10,195,195,195, 11,172,172,172, 80, 19,131,245, 38,115,229,232,232,
-232, 44,147,201,172,125,124,202,218,186,242,120, 60, 24,141,198,210,199,143, 31,215,104,208,183,162,130,236,125,233,  9,247,194,
-155, 68,126,136,243, 39,246,177, 87,143,172,235, 81,157, 46,230,150, 22,230,201,209, 15,146,252,  9,204,202, 34, 88,229,230, 74,
-171,103,225,238, 32, 67, 74,242,115, 88, 90,152, 37,155,170, 39,115,244,233,192, 80,222,112,150,224, 87,101, 70,236, 17,  0, 40,
- 73,141, 25, 41,179,175,123, 47, 38,230,206,210,206,253, 71,139,218,245, 26, 41, 92,179,224,139,169,  0,250,153,170,155,153,153,
-169,180,179,179,187,234,228,228,212,121,246,236,217, 26,  0, 98,141, 70,195, 12, 30, 60, 88,150,148,148, 52,158, 82,106, 82, 26,
-155,127,182,199,150,136,139, 59,122,249,132,245,119, 87, 20,127,208,170,121,  4, 34,  2,221,144,220, 60,  2,  0,198, 36,149,152,
-249, 54, 27,185,126, 87,109, 59,215, 35,107, 54, 30,156, 63,180,111,219,241,206, 93,102, 47, 78, 59, 56,179,210,136,216,163, 11,
-235,219,191,201,190,243,121, 12, 20, 82,  1,204,164,124, 40,164,  2, 40, 36,  2,232, 13,180, 58, 85,112, 84,111, 96,203, 34, 88,
- 90,  3, 74, 84,  6,156,185,157,137,140, 66, 45, 10,138,117, 80,233,140,160,160,208,233,217,138, 81, 69, 42, 55,171, 87, 54, 89,
- 86,252,219, 53,164, 95,225,178, 57,163,205,127,191,148,242,162,135,158,133, 76,  4,133, 76,  0,128,226,194,133, 11,176,177,169,
-122, 88, 44,150,101,177,231,216, 13, 44,222,116,  6,199, 54, 76,134, 68,200, 67,253,110,179,241,105,247,112,176, 44, 69,252,163,
-152, 76,159,128,  6, 14, 12, 35,  5, 67,  8, 52,122, 22,  0,125,235,245,212,106,181, 54,207,159, 63, 47,242,246,246,118,116,113,
-113,233,197,227,241,168, 24,208,236,219,153,167, 60,125,104,187,172, 84,165, 49,202, 12,133, 27,188,211, 85, 31,250,248,248,128,
- 16, 66,109,109,109,133,103,206,156, 41,169, 87,175,158, 93, 77,158, 35, 66,  8, 35,181,175,187,108,200,200,113,189,188,234,212,
-193,238,237, 27, 64, 41,249,221,212,253,183, 29,188,138,197, 75, 94,237, 49, 56, 98,228, 40,159, 53,171, 87,189,178,110,224,231,
-195,124, 42, 51,120,174, 65,173, 39,251,249,  5,224,106, 76, 10, 22, 78, 31, 25,173,206,122,214, 95,107,102, 51, 92, 87,146, 62,
- 33,184, 97, 40, 28,109,204,145,150,167, 65,215,  1,221,209,180, 89,115,220,187,115, 11,115,191,253,234, 42,148,218,118, 85, 69,
-109,255, 99,132,  4, 35, 90,181,239, 46, 80,105,116, 88,190,112,  6,134, 79,250, 14,141, 91,119, 17,220,191,125,109,  4,128, 57,
-166,158,179, 70,103, 68,171,122,182,101,166, 89,207,226,192, 51, 30,255, 77, 57,144,207, 35, 76,112, 29, 75,168,180,  6, 20, 41,
-245, 85, 68,176, 72, 70, 65,113,169,199,207,243,199,241, 74,213,  6,100, 23,106,145, 85,168, 65, 78,193,127,140, 85, 78,161,  6,
-217,133, 90,  8,248,  4,113,  9,105,224,241, 72,181,219,223,229,151,232,209,168,174, 85,217, 51, 90,195,218,144, 28,131, 93,199,
- 59,113,105,109, 22,206,157, 38,188,147, 88,138,187,207,138,202, 35, 87, 60,136,  5, 12, 68,229,255, 54,154,224,175,236,  3,186,
- 54, 25,216,175, 91,160,185, 92,130,180,184, 98,240,121,101, 67,189, 88,216,187,193, 66,172,198,151, 35,135,193,214,198, 18,207,
-115, 52, 88,182, 55, 14,119, 31, 60,  1,171,170,222,105,255,188,253, 88,143, 65,159,244, 21,243,132, 98,108, 57,148,  0,177,144,
-  7, 62,213, 34,230,218,  5, 77,102, 74,130,174,184,168, 64,206,231, 11, 76, 18, 37,  0,173,136,204,205,159, 53, 21, 59, 55,173,
-194,241,168,172, 23,205,231, 47,253,254, 19,198, 77,155,135,156, 34, 45,  0,242,143, 15, 99,241, 43, 51, 87, 18,145,232,196,166,
-101,211,164,167,227,128,115,119,203,204,149,170, 36,  7, 91,214,175, 45,161, 96,219,102,222,223,111,242, 23,161,220,190,110,144,
- 88, 46, 63, 63,125,222, 50,141,131,139,135,225,200,237,162,220, 98,181,241, 79, 97, 16,161, 76,110,148, 91,216,169, 45,221, 27,
- 46, 22,168,180, 51,178,179, 31,148, 86, 21,105, 98, 41,197,161,235, 25,160,180,236,147,232,183, 11,169,224, 49,101,213,133, 70,
-182,172,250,228,228,237, 44,240, 25, 98,114,151,115, 66,128,223, 78,220,206,  9,122,131,185, 10, 11, 11, 43, 48, 55, 55,135,165,
-165, 37,204,204,204,170, 91, 96,191, 49,114, 37,147,201,172,143, 31, 63, 46, 49, 55, 55,  7,143,199,131, 70,163,193,  7, 31,124,
- 80,163,155, 42,119,240,237,215,184, 77,207,  5, 77, 91,125,136,179,199,255, 96,175, 30,217,216, 83,153, 85,141,241,123,  0,116,
-108, 81,255,224, 15, 63,173,168,253,213,212,233, 98,133,132,143,135, 37, 90, 48,132,192,221, 65,  6, 27, 51, 30,174,158, 57,164,
-238,245, 65,189,131,166,234,213,114,245,216,178,104,249, 26,155,197,223,207,110,103,101, 85,219, 33, 63,255, 89, 17,  0, 40,179,
-226,214,152, 57,250, 62,114,173,117,226,124,131,150, 61,224,224,226,221,169,186,231,155,157,157,157, 25, 24, 24,248, 48, 32, 32,
- 32,180, 87,175, 94,116,193,130,  5, 86, 41, 41, 41,187, 77, 53, 87,192,255,177,119,214,225, 81, 92,251, 27,127,207,250,102,227,
-196, 29, 72,  8,  9, 17,220, 10, 65,131, 59,148,  2, 69, 74,105,145,150, 10, 82,161,180, 72,169, 64, 75,129, 42,180,208,226,238,
-165,184,187, 75,132,  4,136,187,103, 37,155,213,217, 57,191, 63, 32,185,129, 27,217,  0,253,221,123,233,249, 60,207, 60,217, 36,
-179,239,156, 51,115,102,206, 59,223, 99, 64,207, 94,225, 51,236,164,150, 14, 13, 20,130,240, 64, 79,  5, 58,134, 63,108,253, 28,
- 53,160, 51,252,252,253,145,156, 87,222,178,164,156, 23,151, 25,133,129, 63,255,122,231, 90, 35, 87,225,155,156,206, 24, 15, 96,
- 95,189, 43,109,252,171,227,123, 69,244,202,222, 70, 12,254, 97,249,168,151,193, 50,152, 44,208, 25, 44,208, 25, 57,104,141, 22,
-148, 27, 45,224,233,195,123,130, 16,  2, 19,199, 87, 28,178, 94,  9,116,104,224,138,192, 70, 15, 71,189,218,219, 60,156,178,225,
- 97, 19, 33,224,226,226,  2,119,247,186, 27,119, 40,165, 48,154, 30,222,226, 70, 51, 95,217, 68,106, 52,113,160,148,226,222,189,
-196, 15,211, 82, 82,134, 52,  9,110,210, 37,172,121,139,  6, 10,153,  0,  0,106, 52,  3,229,229,229, 22,123,123,123,247,  6, 13,
- 26,  8,178,179,179, 43,251, 61, 54,105,217,157,219,179,123, 23,134, 15, 31, 86,118,247,234,237,202, 17, 85, 58,157,142,116,234,
-212,201,193,207,207, 79, 96, 48, 24,212,245,142, 90,185, 53, 29,234, 23,250,210,151,227, 39, 78,105,218, 61,186, 47, 78,157, 56,
-138,125,187,183,172,215, 22, 36, 30,181, 86, 39, 36, 36,244,223, 70, 17,  6,  5, 55,253,183, 81,132, 13, 27,  7,215,104,176, 28,
- 29,155, 59, 52,111,219,205, 47,173,200,132, 67,135, 14, 66,171,202,251,204,104, 44, 43,135,152,174, 57,176,229,231, 73,111,188,
-191,208,161, 91,215, 40, 56, 59, 40, 32, 18,  9,113,227,218, 37, 44,254,252,147, 75, 40, 55,246,174,235,249, 89,153,223,176, 48,
- 73, 19,255,134,239,249,  7, 69,224,198,229,115, 72,186, 23, 27,119,251,218,165,240, 38,145, 29,224,230, 29,240, 30,  9, 11, 91,
- 76,227,227,235, 92,169,130, 90, 44, 89, 19, 38,207,124,116,253, 31,254,173, 99,203,198, 82,242,228, 13,  0,192,204,153, 44, 27,
- 86, 45, 46,168, 58,138,176, 38, 93,189, 70,185,243,236,229, 59,179,  7,245,142, 18, 20,169,141, 15, 35, 86, 42,227,163,205,128,
-162,138,207,106,  3,130,189,237,144, 20,123,151, 55,107, 85,187,234,119,103,210,252,105,111,189, 99,243, 48,237, 60, 40, 79,107,
- 53,252, 53,166,213, 34,121,117,213,231, 31,147, 59,105, 90,220, 73, 85, 63,108, 18, 20, 11, 31, 26, 43,177,160,210,108, 89,213,
- 74, 38, 16,124, 51,126,100, 31, 20,169, 77,224,121, 64, 36, 20, 60,218, 36,200,208, 16,100,106,202, 81, 84, 90,136,148,180,116,
- 40,243,146, 32, 16,  8,224,234,221, 20,229, 25,214,165, 85, 99,177,107,106,182, 32,104,228,128, 40,225,158, 75,121, 80,200, 68,
- 80, 23,103,226,194,145,109, 58,158,179,172, 50,154,141, 91,221,169, 52, 54, 62,102,135,201,202, 71, 71,161, 90,107,240,144,137,
-133,216,177,238, 39,140,124,109, 90, 69,  4, 18,  0,240,225,220, 69,128,128,160, 84,169,  5, 64,158, 58, 42,250, 63,111,176,196,
-  2,225,177,181, 43, 62,145,199, 23,202,113, 53, 49, 23, 47, 71,249,162, 92, 83,132, 95,127,250,190, 76,111, 54,244, 43,140,217,
- 87,191,112,187, 64,208,103,212,235,179,227,  2,155,134, 25, 78,197,150,165, 42,181,230, 26,251, 49,116,124,249,211,184,235,127,
-253,216, 95,101, 78,126,203,206, 59,220,194,115,220, 55,229,  5,137, 11,171,127, 75,166,210,133,223,239,168,108, 30,252,104,241,
-134,135,159, 45, 22, 88, 40, 15,202,  3,211, 63, 91,  9,142,183,128,183, 88,192, 91, 40,136,217,162,168, 51, 92, 46,151, 28,141,
- 40, 91,230, 88,157,185,114,114,114,130,139,139, 11, 92, 92, 92, 80, 97,136,158,181, 89, 48, 56, 56, 24,118,118,118, 56,119,238,
- 28,108,108,108, 96,107,251,116, 19,228,219,121,132,190,210,190,199,176, 77,221,  7,189, 46, 56,190,231, 87,203,149,211,  7, 94,
-214, 21, 36, 88,109,  2, 44, 22, 11, 49,155,205,232,211,173,117,250,173,196,140,195,159, 47, 92,208,183,109,143, 17,178,151, 66,
-220,161, 51,114,200,206,202,194,165,147,251,244, 77,252, 93,142,116,109,223, 44,221,108, 54,195, 98,177,212, 89,129,235, 13,198,
- 98,161,216,198,101,212,232, 87,101,215,174, 94,221,100,235, 17,178, 69, 32,228,111, 83,139,176, 57, 64, 95,105,222,188, 25, 76,
-102, 30,229,229,154,146,167,201,119,124,124,252,213,229,203,151, 55, 21,139,197,126,219,183,111, 47, 42, 45, 45,173,215,114, 65,
- 71,207, 38,174, 16,145,210,251, 82,222, 52, 38,192, 94,211, 43,163,115, 71,140, 30,216, 25, 91,255, 58,143,211,231, 46, 33,189,
-204,238, 86, 25, 39,218,155,153,158, 99,  8,111,160,222, 53,184, 99, 67,225,142,117,165,187,220,187,207,121,133, 82,217,209,194,
-211,243,181,214, 87,222,128, 70,103,134,131,226,225,124, 77, 21,145, 44, 33, 33, 86, 59, 33,  2,164,156,187,116, 35,162, 77,112,
- 24,110,166,168, 80,160, 52, 64,103,224,192,243, 20, 60, 40, 92,236,165,144, 75,  4,200, 72, 75,  1, 79, 77,169,245,171,103, 80,
-216,111,196, 20,209,195,227,240, 34,177, 88,  4,250,168, 94,180,145, 75,203,220,221,221,173,138, 96,153, 56, 14,195,251,182, 71,
-135,182,205, 49,100,202, 82,  0,192,137,245, 31,195,217, 78,140,157, 59,119, 34,227,252,242,141,129, 47, 77, 59, 26, 27, 19, 55,
- 34,238,230,197, 87,251,181,182,105,233, 41,202,169,177,105,163,172,172,108, 23, 33, 68, 42,145, 72,250,118,233,210,165,193,174,
- 93,187,148,174,174,174,188, 84, 34, 41, 28, 60,104, 32, 47,150, 72, 42,203,206,133, 11, 23,196, 83,166, 76,177, 47, 45, 45,205,
-200,207,207,191, 68, 41, 53,215,254,  2, 24, 26, 13,  1,182,128, 16,185,157,141, 34,189, 99,244,104,239,182, 29,218, 59, 14, 29,
- 62, 18, 50,169, 12,199,142, 30,198, 15,203, 23,111, 47,203,189,251,122,125, 78,229,243, 24, 69,168, 82, 57,106,239,199,223, 46,
- 77, 45, 48, 58,139,157,130, 33,150,217, 79, 33,142,222,223, 11,101,118,243,221, 90, 12,117,216,185,255, 32, 98, 98, 99,209,192,
-198,140,228,164,251,229,177,183,110,254, 82, 78,196, 11,105, 97,124,185,213, 17,230, 98,203,136,142,227,250, 58, 27, 76, 22,156,
- 61,249,151,158,231,248,190,151,206, 28, 76,242,109,218, 86, 30,209,182,167,115,209,190, 53,195,  1,108,173, 75, 39,245,202,198,
-127,235,122, 17,216,254,149,156,131, 71,207,216,121,  5, 52, 17, 18,  8,161,215,149,163, 48, 61,134,211,171,242,202,243, 99,246,
-122, 91,147,190,116, 46,251,179,207,190, 94,249, 86,155, 22,225,182,148, 74, 30,139, 88, 85, 24,171, 34,181, 17,174,246, 82, 24,
-180,165, 72,186,115, 78, 95, 40,206,255,164,246,103,157, 89, 81, 92, 92, 34,173,248,221,166,204,169,161,202, 81, 37,171, 52,129,
- 66,192, 81,229,100,248, 87, 83, 90,137,212, 98, 49, 43,172,185, 61, 29,237,228,136, 73,205,173,236,208, 46, 19, 63,236,123, 37,
- 21, 11, 43,251, 97, 89,121,159,183, 22, 73,237,144, 93,172,  7,  1,  5,111,225,192,153,141,208,168,213,200,206,201, 67,126, 94,
- 62, 52, 26, 37, 20,118,206,136,104,217, 14,246,118,182, 72,184,113, 26,  0,177,234,229, 87,207, 75,130,219,182,105, 35,142, 75,
- 47,131,201,204, 67, 12, 19,206, 31,218,170, 55,155,141,131,242, 99,246,158,172,239,115,152,227,233,241,216,196,244,112, 95, 55,
- 47,114, 43, 73,133,141,171,127,132,241, 81, 36,211,108,182, 32, 54, 67,139,220,146,114,100,101,166, 83,240,150,227,120,193,169,
-209, 96,113, 28, 39,247, 15,104,132,209, 83,198,226,151, 95, 86,226, 94,114,  6,126,251,249,145,185,186,179,231,130,149,134, 34,
-186, 98,174, 12,109, 94,194, 55,175,255,146,154,181,255,102,137, 64,103,172,125,253, 41,185, 91,  0,162, 94,255,238,136, 78, 83,
- 34,181, 24,202, 69,127,110,124,125, 75,117,154, 15,125, 27, 49,126, 57,107, 20,236,108, 68, 32,132,160,162, 89,240,231, 69,147,
-161,144,  9, 65,  8,129,206,192, 97,236,140,101,216,184,108, 38, 40,128, 55,222,154, 85, 94, 83, 58,171, 24, 33, 50,177,111,227,
-193, 95,252, 30,191,239,124,154, 75,242,128,  1, 93, 85,173, 91,183, 86,218,216,216,192,198,198,  6, 14, 14, 14,112,118,118,134,
-147,147, 83,157,121,127,244,187, 71, 93,125,174,  4,  2,  1,108,109,109, 97,103,103,  7, 91, 91,219,127, 51,110, 79,106,254,155,
-185,242,108, 58,178, 93,247, 97, 91,122, 12,158, 36, 56,190,231, 55,254,250,233, 63, 71,234, 10, 18,247, 90,123,141, 30, 53,235,
-220, 30, 62,124,120,228,148, 41, 83, 36,159,188, 53,252,200,145,211, 55,238,237, 62,182,107, 80,137, 82,227, 71, 41,133,147,163,
- 93,230,203,189, 34,255,140,106, 27,146,126,226,196,  9,126,203,150, 45,  6, 66, 72, 76, 93,233, 44, 42, 42, 88,123,226,248,201,
- 37, 81, 93,187, 97,245,186, 45,  3,226,226,239, 14, 72, 74,186, 15,191,128, 64, 52,106, 28,140,114,226,140,147,103,206, 65, 83,
-146,183,214,154,116, 86, 37, 50, 50,210,167, 69,139, 22,190, 74,165, 82, 63,111,222,188, 16, 74,233,222,136,136,136, 54,173, 91,
-183,206,187,121,243,102, 86, 77,195,254,171,106, 94, 92, 57,180, 16,192,250,134,221, 38,110,207, 54, 41,223,  3,176,216, 63,192,
- 31,167,207, 93,194,165,243, 87, 86, 22, 41,252, 23,190, 62,118,226,228,134,131,133,111, 12,238,216, 80,232,238,172,192,230,223,
-190, 19,238,191,148,182, 44,173,216,178,  6,192, 34,107,174, 81,229,195, 90, 99, 66,167,102, 13, 96,182, 80,240,244,161,233,178,
-151,139,171,109, 34,172, 78, 83,100,148,189, 62,117,202,148,164,136,230, 45,223, 31, 59,113,170,164,101,160, 31,174, 62, 80,  2,
-132,160,129,167, 45,114,115,115,113,118,231,111, 92,105,118,194, 74,161,144,255,188, 62,231, 51,235,198,214, 38, 21,159,189,188,
-188, 38,223,138,141,197,233,211,167, 81, 97,172,220,220,220,170, 53, 88, 79,106,150,150,106, 46, 44, 90,186,186,211,155,227,134,
- 96, 96,183,112,156,185,150,  4,227,163,249,150, 42,134,132,167, 92, 90, 37,125,111, 84,160,241,173,225, 77,213, 58,179, 52,237,
-179, 84,213,217,170,147,200, 62,169, 73, 41, 53, 18, 66,246, 39, 38, 38,118,110,209,162, 69,195,131,  7, 15,150,196, 93, 57,242,
-216, 68,119,179,102,205,178,251,229,151, 95, 20,148,210, 11,  6,131, 33,217,170,188, 11,176,249,198,245,235, 46, 38, 51,143,115,
- 87,110, 55,235,217,169, 37,120, 10, 92,187,118, 13,107,126, 95,163,143,185,115,107,169, 54,223,243,243,154, 38,183,173,233,124,
- 90,158, 97, 20, 97,133, 38,165,167, 57, 59,143,208,149, 23,206,157,153, 43,243,110,131,208,254,159, 12,206,190,189,127,176,103,
- 88, 31,184,  6,190,132,156, 59,251,113,225,200,166,131, 60,199,125, 44,231,  5,233,218,194,  4,173,181,247,123,  5, 50, 27,197,
- 59, 97,173,187, 34, 35, 61, 13,169,247, 99,215,235,138,239,231,216,121,134,174,207,201, 74,159,218, 56,188, 19,206, 31,217,250,
-110, 77,  6,171,174, 50,239, 46,215,172, 60,117,254,226,232,236, 29,251, 61, 52,101, 58, 27,145, 72, 80, 46, 19,145,124, 73,121,
-210, 54,107,211, 73,227,227, 77,238, 65, 47, 13, 31, 51,229,211,191,150,125, 61, 87,236,225, 36, 67, 94,169, 30,106,157,  9,154,
-114, 19,  4,132,160,137,183, 45,116, 90, 53, 46, 29,220, 96,182,232,139, 71,209,  7,143, 71,220,170,106,186,133, 15,249,130, 16,
- 76,255,244,211, 57, 16, 74, 29,188, 27,247,252,196, 36,104,236,  9,103, 60, 49,153,121,  3,160,113,207, 79, 96,208,228, 15,250,
-244,211, 57, 33,148,210,158,110,225, 67, 52, 21,107, 17,214,148,247, 98,141,  9,175,118,247,131,137,123, 56,127, 24,199,  3, 22,
-254,225, 11, 63,165,  0,173,165,221,190,170, 38,  5, 36,219,254,186,128,156,124, 37,116, 70, 51, 12, 70, 14, 38,179,  5,  2,161,
- 16, 78,206, 78,  8,110,212, 10, 78, 78,142, 40, 40, 42,194,181, 75,231,113, 57,241, 86, 10,  5,190, 40,106,160,218,100,205, 53,
- 34, 34,219, 38, 30,238,174, 36, 95,109,132,141, 84,136,203, 55, 78,155, 41,176,214, 26,115, 85,157,166,170, 92,185,236,227, 69,
-223,143,249,229,187,249,158,145,141, 29,144, 85,164, 67, 86,161, 30, 26,253,195,247, 27,206,194,195,168, 83, 33,241,218,161, 60,
- 14,229,203,254,185, 17, 44,177,216,112,237, 78,162,236,227,133,223,226,238,131, 20,172, 89,249,163,214, 96, 54, 89,109,174,170,
-227,143,183, 26,109,173,223, 55, 30,205, 91,250,121, 90, 29, 47,220, 79, 52, 11, 82, 30, 60,165,248,243, 74, 94,101,179, 32,255,
-168, 71,229,205, 36,101, 93,133, 70,252,237, 59, 45, 63,172, 48, 66, 63,236,201,190, 44,147, 21,241, 25, 25, 25,165,155, 54,109,
-170, 52, 61, 66,161, 16, 21,163,  7,141, 70, 99,157,163,138,156, 29,164,225,227,250, 53, 28, 85,147,185, 18, 10,133,224,121, 30,
- 14, 14, 14,176,177,177,169,119,211,163,173,123, 72,175,118, 61,134,109,237, 49,228, 13,193,137,189,171,249,235,167,247,191, 92,
- 86,144,184,167,190,215,168,180,180, 52,142, 16,114,127,233,210,165, 45,215,172, 89,211,120,246,236,217,201,171,191,158,250,195,
-195, 55,184,135,203, 34,222,188,121,147, 78,155, 54,205,160,215,235, 83, 74, 75, 75,111, 88,179,200,117,121,126,226,210, 63,126,
- 89, 18,146,153,157,251, 90, 96, 68, 59,184, 53,110,  7,207, 38,237, 81,170, 49,225,234,131, 28, 36,223, 61,129,248, 11, 59,183,
-233, 10, 61,190,170, 79,122, 91,182,108,233, 47, 22,139,  7,  1,  8,177,177,177,105, 72,  8,145,138,197,226, 87,  8, 33,247,  9,
- 33,119, 67, 66, 66, 78,160,134,229,139,170, 35,237,244, 90, 67,195,110, 19,191, 79,215,216,119, 79,206, 43,111,149,174,177,191,
- 89, 46,115,156, 89,112, 98,133,193,163,247,210,101,212, 84, 20,183, 99,157,122,215,230,223,190, 19,142,157, 60,203, 18,171,114,
-126, 79,100, 35, 61,246,245,107,214,143,230, 22, 16,146, 59,123,246,  7,255,154,166,225, 81,228,234,209,148, 13, 57,214,104, 60,
- 90, 79,241, 35, 27,239,240,159, 98,223,155,178,168,121,219, 78,227,186,244, 27, 37,224, 36,118, 56,178,103, 21, 77,185,115,114,
-135,136, 90,230,150, 23, 36,165, 60,235, 67,194,104, 52,214,105,174,170,109,186,117, 81,117,251,235,232,233,215, 14, 28, 62,243,
-117,191, 94,157, 93,126,254,236, 21,124,251,235, 94,216,218,200, 64,121, 11, 70,245,240,127,249,238,150, 62,131,252, 60,228, 62,
-187, 78,101,157,157,190, 60,246,163,242,114,211,189,186,214,206,123,100,152,207,217,219,219, 23,118,238,220,185,131, 76, 38, 35,
- 69, 69, 69, 34,119,119,119,206,209,209,209,152,149,149, 85,110, 48, 24,118, 81, 74,181,245,201,167,201,204, 35, 53, 95,143,125,
-187,119,225,246,149, 19,184,123, 55, 81,115, 55,254,238,143, 68, 68,151,151,229,221,123,170,200, 42, 95,237, 40, 66, 90,239, 81,
-132, 90,161,205, 87, 55, 15,124,219, 45,184,199,187, 29, 93,130, 58,193, 57,224, 97,160, 72,149, 21,139,204,107, 59,246,105,114,
- 36, 35, 41,141,125,234,177,239,222,190,141,131,169, 80,138,139,167,255,  2,229,249,149,  0, 64,121,126,229,205,243,  7,167,182,
-239,255,  6, 26,184, 55,108, 65,  8, 33,245, 93,143, 17,  0,100,  2,147,234,175,117, 95,237, 72, 77, 77, 69, 66, 66,  2, 30, 60,
-120,128,146,146, 18,108, 78, 61,171,170,143, 78, 65,210,197, 99, 30, 77,187,244, 25,243,250,140, 63,135,141, 24, 38,247,111,212,
- 68, 16,226,235,  0, 87, 59, 17, 18, 83,178,145, 20,123,159,127,112,231,172,158,234, 10,134, 22, 61,184, 80,163,225,115, 11, 27,
-233, 33, 16,146,143, 79,236,127,184,182, 96,244,144,215, 67, 62,156, 62,187, 67,  3, 23,231,106,159,227, 37,197,165,210,  5, 11,
-230,133, 84,236, 95,215, 90,132,  2,161, 80, 51,121,234, 59,182,  2, 34, 64,197,233,162, 21,109,100,149, 63, 30,126,144,136, 69,
-117,150,209,137,195,162,192,241, 60,180, 58, 51, 52, 58, 35, 84, 26,  3,114,139,148,136,187,251,  0, 87,206, 29, 70,106,210,125,
- 13,199,113,167, 64,177,187,208, 69,181,237,201,137,117,107, 45,159, 16,250, 55,112,118, 64,154, 82, 15,185, 84,132,156,140, 36,
-206,196,233,159,122,146,245,162, 91,251,115, 61, 34,134,244,158,248,214, 39,135,187,116,137,114,108,222,170,141,194,213,193,  1,
- 18, 17,144,148, 81,128, 59, 55,174,106,211,239,221, 82, 91,204,186,190, 69,177,251,159,121,149,150,255, 89,131,101,178,112,209,
-179, 62, 89,124,212, 98,177,216,136,132, 66,157,153,242,125,159,197, 92,253, 93, 80,202,103,189,245,238,  7,149, 81, 93,  0, 48,
- 91,120,155, 55,222,154,173,171,250,134, 64,204, 22, 69, 69,228,170,142,145,122,194, 66,165, 65, 51,231,151,219,235,151,172,143,
-223,  9, 32,254, 89, 71,246,  1, 64,169,218,120,219,165,215,246, 33,154,114,142,  0,184, 91,141,166,182, 71,143, 30,149,102,235,
- 81,115,157,213, 21,132, 84,174,152,218,125,208,235,130, 19,251,214,240,215, 78,237, 27,249, 52,230,170, 74,  5,102,  2,112,133,
- 16, 18, 59,119,238,220,182, 30, 30, 30, 30,243,230,205,147,171,213,106,241,207, 63,255,172, 47, 42, 42,202, 83,171,213,151, 40,
-181,190,127,194,163, 74,115,162,141, 71,179, 85,100,231,154,222,206,238, 62,125,156, 92,253,154,150, 22,102, 37,169,139,179, 14,
- 19, 30,199, 52,  5,137,151,234,155,214, 91,183,110,101, 68, 70, 70,238, 21, 10,133, 55,  0,184,  2,176,167,148,150,112, 28, 87,
- 42, 22,139,243, 18, 19, 19,235,189, 32,107,218,233,181,134, 46,111,253,190,165,164,156,151, 24,  5,146, 45,105,167,215, 26,  0,
- 32,255,232,236,114,  0,251, 60,186,127, 60,124,255,165,180, 31,226, 74, 29,223, 45, 56,245,213,254,250,234,103,223,220,214,228,
-121,149,127, 93, 78, 92, 22,128,215,108, 61, 66,190,139,185,121,105, 62,161, 16, 91,192,125, 81,158,127,255,250,243,208, 23,139,
-197,250, 54,109,218, 84, 59, 90, 80, 38,147,213, 58,191,214,163,  7,253, 26,210,173,219,186,195, 39,206,189,118,232,216,249,175,
- 59,116,236,236, 34,247,245, 65,128,179,  9,235, 62,104,253,238,137,155,133, 87,  7,127,112,246,151,228, 28,253, 29, 74,169,190,
- 62,105,211,104, 52,247,  8, 33,165,101,101,101, 67, 40,165,153,132, 16,191,210,210,210, 91,102,179, 57,166,222, 70,128,199,171,
- 29, 59,182,219, 76,  8, 17, 81,142,255,230,146, 88,184, 69,159,123, 55,235,105, 12,197, 99,209,213, 70, 14,152, 60,117, 90,112,
- 80,147,166,193, 21,107, 17,134, 55,180,199,216,137,111,  6, 55,108, 28, 28,252,175,245,  9,107,127,161,162, 57, 55,116,196, 35,
-178, 87,226,209,165,159,185, 36, 93,120,203,166,129,175,157,182, 40,173,164, 52,237,250,210,242,  2,143,165, 79,174,208, 80, 95,
- 82, 31,196, 45, 95,179,244,163,217,185,217, 41,107,180,  5,247, 98,  1, 64, 91,112, 47, 86,225,209,244,179,162,188,172,217,197,
-  5,201, 75,159,246, 92,104,181,218,156, 77,155, 54, 57,117,234,212, 73,224,225,225,129,194,194, 66,156, 58,117,138,231,121, 62,
-187,190, 90,249,247,206,158, 34, 65, 65, 13,182,172, 83,125, 35,178,177,239,207, 89,224, 77, 41, 32, 18, 32,215,100, 80, 29, 46,
-116,210,125, 64,239, 92,170,189, 92,242, 22, 66,  5, 84, 80,177,182, 32,207,243,228,219,159, 54,164,  9,197,210,106,155, 84, 45,
-102,163,130,231,121,171,215, 34,204, 23,166,187, 68,152, 67,173, 26,197, 23, 75, 18,234,120, 57,165, 71, 94,234, 55,190, 15,199,
- 89,204,  0,244, 85,182,  2, 74,201, 73, 16,203,209,162,  6,154, 75,245, 49, 85,143,213,243, 38,147, 19,132, 18,216,219,152, 65,
- 64,160, 86, 41,101,110, 22,233,221,103, 41, 75,249,177,251,226, 72,183,110,  1,198,227, 39, 39,156, 57,119,113, 36,229, 45,141,
- 44, 20,  0, 37,169, 70,147,126, 71,129, 67,209,250,167, 77,239,255, 26,132,254,141,243, 81, 88,219, 92,242,223,166, 73,  8,145,
- 60,170,172, 45, 85,151,191,121, 30,233,172,109,109,193,103,201,187,189, 87,179,206, 50,185,226,131,242,114,205,154,242,252,123,
-127, 62,207,243, 73,  8,113,148,201,100,173,236,236,236,196, 69, 69, 69, 87, 40,165,170, 23,241,186, 87, 37,234,245,157,174, 61,
-123,133,207, 56,122, 54,113,197,163,230,195, 74,124, 71, 46,151,143,235,223,125,214,250,221,251,254,109, 20,225,139,144,247,191,
- 75,147,116,235, 38,114, 47,117,120,205, 98,225,191,232, 17,172, 41,207, 75, 73,156,118, 46,166,240, 10,165, 84,243, 44,233,148,
- 74,165, 99, 77, 38,147,141, 68, 34,209, 25,141,198, 77,255, 45,121,119,143, 24,250, 57,  8,154, 89, 45, 66,113,183, 32,118,239,
-188, 58,159, 33, 97, 97, 18, 69, 33,156,203,139, 92,139,235,107,172,254, 35,215,157, 16, 97,100,100,100,148, 68, 34,241,183, 88,
- 44, 10,163,209, 88,174,211,233, 82,211,210,210, 46,214,180, 32,249,223,157, 78,143,200,161,203,197, 98,241,123,  0, 96, 54,155,
-191,207,143,217, 59,163,182,239,214,180,255,255, 75,125, 52,114,164,144,238,216, 97,249, 59,174,145, 79,171,151,149,102, 51,231,
- 88,241,187, 68, 44, 82,101,221,220,233,244,159, 42, 75, 47, 28,244,209,242,  8,127,199,  6, 32,154,105, 50, 77,166,201, 52,171,
-217, 87,192,206, 39,211,252, 79,106,122, 53, 27,232,231,213,108,160,159,181,223,175,110,127,118, 62, 41,216, 86,243, 38, 98, 22,
-147,193, 96,252,  7, 94,236,120,118, 22, 24,255, 73,114,226,255,204,252, 59,247,103, 48,  8,128,232, 26, 30,128, 86,135,254,  8,
- 33,209, 79,241,128, 61,206, 52,153, 38,211,100,154, 76,147,105, 50,205,127,150,102, 93,218, 47, 76,211, 35,107, 34,100,154, 76,
-147,105, 50, 77,166,201, 52,153, 38,107, 34,124,190,155,  0, 12,  6,131,193, 96, 48, 24,140,231, 10, 51, 88, 12,  6,131,193, 96,
- 48, 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6,227,233,
-249, 91,103,114,103, 48, 24, 12,  6,131,193,248, 39,194, 34, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,193, 96,
- 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6,131, 25, 44,  6,131,193, 96, 48, 24, 12,102,176, 24,
- 12,  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96,252,231, 13, 22, 33, 36,154,105, 50, 77,166,201, 52,153, 38,211,
-100,154, 76,147, 25, 44,  6,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,193, 96,
- 48,131,197, 96, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,227, 63,  4,  1, 80,237, 72,  0, 74,233,113,171, 69,
-158, 98, 52, 65, 93,250, 76,147,105, 50, 77,166,201, 52,153, 38,211,124,241, 52,235,210,174,143,255,248,175,134, 82,250,183,109,
-  0,162,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 52,255,105, 27,107, 34,100, 48, 24, 12,  6,131,193,120,206, 48,131,197,
- 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,
-193, 96, 48,158, 30,242,104, 52,  0,131,193, 96, 48, 24, 12,  6,227, 57,193, 34, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24,
- 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6,131, 25, 44,  6,131,193, 96, 48,
- 24, 12,102,176, 24, 12,  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96,252,231, 13, 22, 33, 36,154,105, 50, 77,166,
-201, 52,153, 38,211,100,154, 76,147, 25, 44,  6,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24,
- 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,227, 63,  4,  1, 80,237, 72,  0,
- 74,233,113,171, 69,158, 98, 52, 65, 93,250, 76,147,105, 50, 77,166,201, 52,153, 38,211,124,241, 52,235,210,174,143,255,248,175,
-134, 82,250,183,109,  0,162,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 52,255,105, 27,107, 34,100, 48, 24, 12,  6,131,193,
-120,206, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96,
- 49, 24, 12,  6,131,193, 96, 48,158, 30,242,104, 52,  0,131,193, 96, 48, 24, 12,  6,227, 57,193, 34, 88, 12,  6,131,193, 96, 48,
- 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6,131, 25, 44,
-  6,131,193, 96, 48, 24, 12,102,176, 24, 12,  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96,252,231, 13, 22, 33, 36,
-154,105, 50, 77,166,201, 52,153, 38,211,100,154, 76,147, 25, 44,  6,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48,
- 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,227, 63,  4,
-  1, 80,237, 72,  0, 74,233,113,171, 69,158, 98, 52, 65, 93,250, 76,147,105, 50, 77,166,201, 52,153, 38,211,124,241, 52,235,210,
-174,143,255,248,175,134, 82,250,183,109,  0,162,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 52,255,105, 27,107, 34,100, 48,
- 24, 12,  6,131,193,120,206, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193,
- 96, 48, 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,158, 30,242,104, 52,  0,131,193, 96, 48, 24, 12,  6,227, 57,193, 34, 88, 12,
-  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24,
- 12,  6,131, 25, 44,  6,131,193, 96, 48, 24, 12,102,176, 24, 12,  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96,252,
-231, 13, 22, 33, 36,154,105, 50, 77,166,201, 52,153, 38,211,100,154, 76,147, 25, 44,  6,131,193, 96, 48, 24, 12,  6, 51, 88, 12,
-  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24,
- 12,  6,227, 63,  4,  1, 80,237, 72,  0, 74,233,113,171, 69,158, 98, 52, 65, 93,250, 76,147,105, 50, 77,166,201, 52,153, 38,211,
-124,241, 52,235,210,174,143,255,248,175,134, 82,250,183,109,  0,162,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 52,255,105,
- 27,107, 34,100, 48, 24, 12,  6,131,193,120,206,136,170,251,163,184,253,151,249, 28,199,185,  3,128, 72, 36, 42, 48, 95,253,212,
-171, 54, 17, 63, 47,175,158, 22, 96, 53,  0,  8,129, 55, 51,115,114,142, 85,163,121,140,227, 56,231, 71,154,165,230,171,159,246,
-169, 77, 83,220,238,139, 35,143,237,127,101,110,175,106,226,139, 66,113,187, 47,114,158, 72,171,119, 61,194,119,150,255,143,116,
-254,175,104,254,147,145,116,248, 50,223,108,126, 88,142,196, 98, 81,129,233, 74,237,229, 72,210,254,139,156,199,246,191, 60,215,
-163, 54, 77,133,141,172, 56,200,199,109, 89,109,154,201, 57, 69, 51,181,229,122,151,218, 52,255,103,238, 77, 43,241,244,244,108,
- 35, 16,  8, 62, 37,132, 56, 84,249,243,157,236,236,236,247, 89,169,100, 48, 24, 47,156,193,226, 56,206,253,198,158,249,208, 26,
-128,158,227,191,112, 15, 28,250,235,230,127,219, 71, 95, 42,213,221,223, 27, 41,133,214,217, 70,204, 57,220,191,127,159,  0,128,
-183,183,247,106,  0,254,213,104, 58,223,216, 51, 31,229, 70,160,203,232,133,206,157,253,252, 28,242,132,194, 89, 50, 27,155,238,
-122,189, 62, 28,  0,228,114,121,156, 65,167, 59,229,105,177,124,247,228,254, 53,101,160,106, 90,123,140,251,194, 61,116,232,175,
-239, 90,120, 94,170, 75,222,209,133,215,164,139, 36, 22,227,207,175,229,230, 30,154, 15, 88,172, 57, 33, 85,143,219,117,212, 39,
- 46,254, 94, 94, 61,164,114,121, 11,123,  7,135, 40,158,210,102, 60,207, 19, 11,199,197,107,203,202,206,241, 28,119,219, 98, 46,
-119,185,177,247, 43,190,182,116, 62,153,151,145,128,232,178,167,231,203, 10, 91,219,238,  2,145,232, 37,  0,224, 57,238, 98,185,
- 86,123,170, 67, 94,222, 78,107,242,110,237,249,121,218,253,255,105,152,205,156,123,202,145,249, 48,152,129, 86, 35,190,118,111,
-254,234,250,205,  0, 96, 44,184,237, 81,118,127,127,123,  0,176, 13, 26,120, 69,230,217, 42, 31,  0, 68,233,185,238,247, 14,204,
-133,193, 12, 52, 27,184,208,189, 46,205,137,243,182,187,124, 56,121,184, 12,  0,142,238,250,169,233,201,221, 43,251,  1, 64,143,
-225,211, 14,245, 30, 49,253, 30,  0,124,243,219,110,151,173, 95,191, 82,171,166,117,247,166, 74,162,186,127,160,137, 81,157,235,
-228,103, 43,242,188,127,255,190,160, 62,247,166, 47,224,152, 11,188, 45, 16, 10,163,130,154, 52,105,  5,128, 38, 39, 37,221,180,
-112,220,121, 47,224,231,231, 89,150,132, 66,225,187,217,217,217,131,170,254,205,199,199,135, 21, 72,  6,131,241, 98, 26, 44,  0,
-208, 26,128, 51, 15,128,174, 29,154, 99,242,171,253,237,170,254,111,247,239,139,252,179, 98,143,133,126,181,246, 27, 65,120,120,
- 56,146,147,147,173, 58, 88,185, 17, 56,125, 31,144,233, 83,237, 11,164,210,164,121,159,126,234, 16, 21, 21, 37,242,242,122,248,
- 18, 94, 80, 80,208,225,252,249,243,109, 22, 44, 88, 48, 85,166, 79, 45, 45, 55, 66,115,250,126,221,186, 21,105, 13,111,218, 16,
-159, 78,127,197, 17,  0,150,207,222,217,230,224,197,219, 13, 82, 83, 83,123,126,245,213, 87,197, 62,151, 46,173,108, 96,177,172,
-141, 41, 40,200,180, 38,157,219,142,220,146,  7, 25,143,  5,190, 60,113,226,174,128,128,  0, 59,111,111,111,162, 80, 40, 32, 20,
- 10,161, 86,171,253, 19, 19, 19,251,221,190,125, 91,123,238,242, 62,105,204,237, 17,201, 89,194,150,122,107,242, 46,225,138,228,
-177,193,193,113, 47,247,235,231, 59,112,224, 64,121,163, 70,141,  0,  0,169,169,169,193,127,253,245,215,232,131,  7, 15,206,147,
-112, 69, 92,185, 17,250,186,242, 94,161,  9,  0,114,224, 37, 39,119,247,177, 66,177, 56,156,227, 56,159, 71,209,133,108,139,217,
- 28,167, 44, 40,216,244,228,254,140,127,199, 96,  6,238,230,  2,209, 81,173, 48,110,120,180, 45,  0,124, 52,234,203, 14,233,169,
- 15, 36, 70,163, 17, 77, 67,154,117, 90,244,245,178, 35, 16,  8,176,113,247,241,202,253,173,209,188,115, 55,  5,243, 23, 45, 71,
- 78,204,206, 14, 22,213,131,238, 26,181, 74,  8,  0, 14,142,142,195,119,110,219,114,202, 59,242,229,203, 15,138, 76, 86,105,214,
-118,111, 30,222,246,163, 87, 86,236,169,176, 95,142,254, 33,246,247,247, 71, 76, 76, 76,189,238, 77,168, 18,237,121, 47,175,248,
-239, 62,248,192,179, 75,151, 46,176,179,179,131, 72, 36,  2,199,113,209,231,207,159,143,158, 63,127,254, 52,168, 18,181,214,222,
-155, 86,240,157,183,183,119,247, 33, 35,198,122,117,239, 51, 16,195,251,118, 98,  5,145,193, 96,188,184,  6, 75, 36, 18, 21,244,
-154,240,149,123, 84,251,  8, 92,187,125, 79,149,150,145, 91, 86,241, 63,229,221,221, 77, 71, 71,  7,133,173, 58,248, 23, 12,  6,
-  3, 46, 92,184,128,219,183,111, 35, 53, 53, 21,115,231,206, 53,  8,129, 55,107,208, 44,237, 50,122,161,179,204,144,105,215,218,
- 37,179,209,214,205,167,132, 58,157, 14,167, 79,159, 70,105,105, 41,164, 82, 41,124,125,125,209,185,115,103,209,233,211,167, 27,
-140, 26, 51,214,177,247,208, 73, 41,  6,153, 95,153, 72, 36, 42,173, 49,  3, 34, 81, 65,207,241, 95,184,135,  5, 55, 68, 82, 90,
-142,234,211,175,127, 47,227,121, 42, 42, 79,207, 50,157, 57,115,  6,173, 90,181,194,182,109,219, 92, 74, 75, 75, 63, 91,183,110,
-221,167, 94, 63,174,253, 62, 55, 43,113,118, 45,122,165, 93, 70, 47,116,110,106, 57, 25,176,115,203, 31,146,219,183,111, 75, 86,
-173, 90,133,226,226, 98, 72,165, 82, 56, 57, 57,193,211,211, 19, 77,155, 54, 37,111,191,253,182, 93,247,238,137,248,108,230,164,
-128, 92,167, 33,137, 53,165,179, 66, 83, 98,204, 85,  4, 11,175,  7,173, 94,191, 94,208,174, 93, 59, 82,117, 31,127,127,127,116,
-235,214, 77, 62,108,216,176,160,105,111,191,195, 71, 15,155,146,100,146,122,149,215,165,  9,109,166,141, 75,249, 37,239,232,209,
-163,247, 47, 92,184,208,201,211,211, 19,182,182,182,  0,  0,149, 74,229,155,150,150,214, 97,222,188,121, 35,174,220,217, 38,234,
- 50, 48, 51,  7,182,126,186,218,206,231, 63, 21,177, 88, 84, 80, 17, 53,178,183,181, 41,205,204,202,215,  2,128,209,104,132,209,
-104,132,193, 96,192, 91,211,166,  8,223, 28,209,174, 73, 64,212,187,183, 82,179,243, 75,154, 29,191,220,160,226,187,117,105,138,
-202, 83,149,202,140, 19,111,206,255,224,  3, 79, 15,143,127,181,252,109,220,176, 65, 88, 82, 82, 18, 61,127,254,252, 48,170,232,
-166,108, 54,112,161, 83,109,154,181,222,155,247,254,106,180,104,122,159, 22,191,126,125,  0, 22,139,  5,151, 46, 93,194,217,179,
-103,177,108,217, 50,122,232,208, 33,149,131,173,109,173,247, 38, 84,137,246,157,189,242,  2,151, 44,217, 69,100, 50, 25,246,237,
-219,135,132,132,  4,  8,  4,  2, 52,111,222, 28,227,198,141, 67,116,116,180,231,228,201, 83,104,151,190,163,146,225, 24,162,121,
-150,178, 68,  8, 17,120,121,121,189,251,214,251,159,120, 13, 31,253, 26,126,252,246,115,102,176, 24, 12,198,139, 67,181,189,223,
-  1, 65,227,161,191,110,221,113,157,255,171,241,208, 95,183, 82, 64, 64,  1,129,  3,208, 48, 42, 42,202,172, 84, 42,233,213,171,
- 87,233, 91,111,189,165,253,254,251,239, 79,253,245,215, 95, 59, 57,147,105, 77,171, 22, 45,150, 82, 64, 80,147,102,115, 71, 71,
-199,192,192,192,194,204,204, 76,122,240,224, 65,186, 96,193,  2,186,105,211, 38,122,232,208, 33,122,252,248,113,122,232,208, 33,
-186,117,235, 86,122,231,206, 29,250,224,193,  3, 26, 20, 20, 84,216,220,209,209,177, 22, 77, 33,  5,132, 77,135,174,154,189,235,
-154,121, 97,200,208, 95,103, 80, 64,216,204,195, 35,180, 87,175, 94,150,157, 59,119,210,141, 27, 55,210,245,235,215,211, 59,119,
-238,208,162,162, 34,234, 19, 16, 88, 88,241,189,154,210, 73,  1, 65,171, 86,173, 10,149, 74, 37,245,243,243,163, 82,169,148,122,
-120,120,208,166, 77,155,210, 14, 29, 58,208,126,253,250,209, 87, 95,125,149,126,246,217,103, 84,169, 84,210,128,128,128,252,138,
-239,213,164, 57,208,203,203, 38, 40, 40, 40, 35, 38, 38,134,214,132, 78,167,163, 69, 69, 69,244,228,201,147, 52, 40, 40, 40, 99,
-160,151,151, 77,109,154, 54, 64,235,200,200,200,194,162,162, 34,106, 50,153,104, 70, 70,  6,141,141,141,165,  9,  9,  9, 52, 35,
- 35,131,234,116,186, 74,237,123,247,238,209,192,192,192, 66, 27,160,117,141,154,255,228,173,162, 76, 60,177,249,123,120,244,243,
-244,244,212,237,218,181,139,102,103,103,211,117,235,214, 81,  1,240,229,191,237, 91,139,166, 20,232,221,185,115,103,203,165, 75,
-151,232,173, 91,183,232,199, 31,127, 76,251,244,233, 67,251,246,237, 75,231,207,159, 79,179,178,178,104, 86, 86, 22,237,215,175,
-159, 69, 10,244,174,171,124, 86,119,111, 58,  2,254,  3,  7, 14,212,153, 76, 38,154,156,156, 76,195,195,195,179,132,192, 88, 91,
- 32,172, 43, 32,171,171,124,250,  0,206, 94, 94, 94,185,151, 46, 93,162,187,119,239,166,  1,  1,  1,133, 66, 96,162,  3,208,216,
-  1,104, 44,  4, 38, 54,110,220,184,240,210,165, 75,180,184,184,152,250,251,251,231,250,  0,206, 79, 91,150,  0,  8,188,188,188,
-254,248,226,155,159,104, 98,150,150,126,241,205, 79,212,203,203, 43,131, 82, 74,189,188,188,142,177, 50,201, 54,182,177,237,127,
-125, 19,213,203,140,217,218,126,181,104,209, 34,145, 94,175,199,239,191,255,174, 25, 51,106,212,110, 39, 39, 39, 78, 44, 22,131,
-  8,234, 30,144,168,113,116,124,111,238,156, 57, 78,  6,131,  1,215,175, 95, 71,155, 54,109, 32,147,201, 32,145, 72, 32, 22,139,
- 33, 22,139,225,229,229,133,130,130,  2,132,135,135, 99,234,212,169,142, 63,255,248,227,123, 80,169, 22,213,166,203,243, 84,  4,
-  0, 22,158,151, 54,244,246,158, 28, 26, 25,185,116,218,180,105,  2, 91, 91, 91,232,245,122, 24, 12,  6, 36, 36, 36,192,197,197,
-  5, 10, 27, 27,171,242, 44, 16,  8,  4,118,118,118, 56,121,242, 36,126,251,237, 55,164,166,166, 34, 55, 55, 23,246,246,246,  8,
- 15, 15, 71,179,102,205,208,181,107, 87, 36, 39, 39,131, 16, 66,234,210,139, 23,139,223, 30, 55,122,180,123, 68, 68, 68,181,255,
-215,235,245, 80, 42,149, 80,169, 84,240,240,240, 64,191,126,253,220,255,220,183,239,109,  0,223, 85,183,191, 11,224,233, 27, 28,
-188,255,234,213,171,174,148, 82,108,220,184, 17,101,101,101, 48, 26,141, 16,  8,  4,144,203,229,112,118,118, 70,143, 30, 61,224,
-230,230,134,224,224, 96,108,223,190,221,181, 95,191,126,  7, 92, 10, 10, 90, 23,  3, 57,236,245,162,110,210,243,243,143,246,  6,
- 92,199,190,250,234,161,219,119,238, 68,141, 29, 59, 22,249,249,249,159,136, 63,254, 88,105,  6,150,215,245,253, 16,192,177,129,
-151,215,218, 37, 75,150,  8,242,242,242, 48,107,214,172,162,156,244,244,143, 29,129,115,  0,112,226,240,225,168, 77,155, 54, 45,
-222,184,113,163,235,134, 13, 27,  4,173, 90,181, 90, 27,146,145, 17,158,  8,168,234,147, 78, 13,240,238,138, 21, 43,228,122,189,
- 30,189,122,245, 74,150,167,166,182,224,  0,157,181,223,207,  5,222, 94,246,225,135,158, 50,153, 12,179,102,205, 42, 42, 79, 79,
-143,224,128,194, 42,187,164,185,165,164, 28, 30, 63,126,124,236,157, 59,119, 92,151, 47, 95,238, 57, 98,216,176,183,  1,124,105,
-237, 49,170,118,104,247,242,242, 10, 30, 50, 98,172, 71,211,176, 72,236,222,186, 14,191,172,248,106,173,197, 98,249,213,199,199,
-103,186, 64, 32,248,150,149, 60,  6,131,241, 66, 54, 17,214,132,139,155, 91,155,208,208, 80,156, 57,115,  6,145,145,145, 87,157,
-156,156, 56,137, 76,  6,177, 88, 12,202,243,117,126,223,198,214,182,103,151, 46, 93, 68, 23, 47, 94, 68, 96, 96, 32,108,108,108,
- 42,141, 85,197, 38,145, 72,224,229,229,  5,181, 90,141,168,168, 40,241,218,181,107,123,  2, 88, 84,151,118, 78, 90,162, 29, 82,
-214,190,186,248,187,165,141,219,181,107,  7,149, 74, 13,158,231,161, 80, 40, 96, 52, 26, 33, 18,137, 96, 52, 26,161, 55, 82,181,
- 53,121,181, 88, 44, 22,161, 80,136,192,192, 64,124,245,213, 87,208,235,245,144, 72, 36,  0,  0,181, 90, 13,165, 82,137,216,216,
- 88,164,165,165,129, 62,122, 37,175, 13, 91, 59,187,254,131,  7, 15,150, 86,247, 63,131,193,  0,149, 74,  5,149, 74,  5,165, 82,
-  9,189, 94,143,230,205,155, 75, 79,157, 60,217,191, 38,131,101,144,203, 71,108,216,176,193, 93, 42,149, 66,167,211, 65,163,209,
- 32, 51, 51, 19,233,233,233,250,130,130,  2,206,222,222, 94, 16, 16, 16, 32,144,201,100,178,161, 67,135, 18,181, 90, 13, 66,  8,
-  6, 14, 28,232,178,121,227,198, 87,  0, 44, 99,197,223, 58,142,  2,134,214, 70,227,160,246,237,218,157,188,122,237, 90,171,247,
-222,123, 15,119,238,220, 89,162,216,182,237, 76, 57,112,187,182,239, 38,  3,111, 47,173, 98, 92,104,122,122,164,233,  9,227, 18,
-240,208,184,196, 84, 24,151,145,245, 52, 46,  0, 96,239,232,216,214,203,203, 11,135, 14, 29, 66, 70,106,234, 71,245, 49, 87,  0,
- 32, 16, 10, 59,119,233,210,  5,251,246,237, 67, 86,122,250, 71, 79,152, 43,  0, 64, 33, 80, 40, 74, 78,254,104,237,218,181,127,
-188,254,250,235, 16,138, 68,157,193,113, 86, 31,163,186, 14,237,111,191,247, 17,246,237,218,180, 54, 55, 55,247, 13, 74, 41, 15,
-224, 42, 43,113, 12,  6,227, 69,160, 94,243, 96,121,122,122,250,216,218,218, 34, 39, 39,  7,205, 66, 67, 11,100, 50, 25,164, 98,
- 49,228, 82,169, 85,223,215,235,245,145,158,158,158, 80,169, 84,112,117,117,133, 68, 34,169,220,164, 82,105,229,103,123,123,123,
-  8,  4,  2,248,248,248, 64,175,215, 71,214,165,203, 41,239,187, 31, 94,247,241, 91,127,238,218,208,184, 95,191,254,112,118,110,
-  0, 63, 63, 95,184,187,187,195,198,198,  6,126,126,126,104,210,164,  9, 93,189,122, 53,  4, 14, 77,172,122,128, 87, 53, 77, 34,
-145,  8, 22,139,  5,249,249,249, 72, 76, 76,196,157, 59,119,112,233,210, 37,220,186,117, 11, 26,141,  6, 86,248, 43,104,203,203,
- 91, 84, 23,232, 50, 24, 12, 80, 42,149,149,209, 43,165, 82,137,194,194, 66, 36, 39, 39, 67,173,209,180,172, 73,207,217,197,101,
-120, 68, 68,132, 16,  0,108,108,108,208,178,101, 75,252,250,235,175,220,159,123,247,142, 10,187,116,169,129,223,145, 35, 78,171,
- 87,173, 26,245,242,203, 47, 91, 46, 95,190, 12,181, 90,141,187,119,239,194,205,205, 77, 36,149,203, 95, 97, 69,191,126,220,  0,
-180,174, 26, 77,223,151, 94,122, 41, 69,165, 82,225,219,111,191, 21,136,237,237,127, 91,  8,  8,235,112, 21,157,186,116,233,130,
-253,251,247, 35, 39, 61,253,227,244,106,140, 75, 58, 80,152,145,156,252,241,218,181,107,209,187,119,111, 16,145,168,222, 29,145,
- 58,116,232, 16,193,243, 60, 98, 98, 98,224,  4, 92,169,239,247,131,154, 52,105,101,103,103,135,132,132,  4,216, 62,138,174, 85,
-251,162,  0,156,187,121,243, 38,108,108,108,208, 44, 44,172,117, 61, 15,243,157,183,183,119,238,219,239,125,132,221,135, 47,  0,
-  0,246,237,218,148, 95,197, 92, 49, 24, 12,198, 63,211, 96, 85, 32, 22,139, 33,149,201, 32,149, 74, 31, 26, 35,153,204,234,239,
- 18, 66, 32,151,203, 43, 13, 85, 85, 99, 85,245,179, 66,161,176,202,184,  0,128, 57,239, 66,212, 43, 35, 95,150, 74, 36, 18, 24,
-141,  6, 80, 74, 33,147,201,225,228,228,132,192,192, 64,148,151,107, 49,120,200,112, 67,166, 82,114, 64,226,219,243,206,211,228,
-153,227, 56,104,181, 90,148,150,150,162,164,164,  4,106,181, 26, 58,157, 14, 86,180, 14, 86, 86,181, 25, 25, 25,216,178,101, 11,
-138,139,139,  1, 60,236, 64, 93, 97,170, 42,126,166,164,164, 96,227,198,141, 72, 77, 77,133, 80, 40,180,250,250, 68, 69, 69,225,
-192,129,  3,194,110, 61,123,174, 57, 22, 16,144,115, 44, 32, 32,167, 91,207,158,107,246,239,223, 47,244,241,241, 65, 90, 90, 26,
-174, 95,191,142,210,210, 82, 80, 74,  9, 43,250,245, 39,  9, 40, 45, 47, 41,121,253,147, 79, 62,161,118,118,118,248,118,233,210,
- 22, 95,  2, 99,172, 53, 46,142,181, 24, 23,199,103, 51, 46,160,148,130,231,121, 88, 44,150,167,202, 27, 33,132,136,197,226,250,
-148,103,224,225, 82, 91,214,234, 11, 40,165,239,190,245,254, 39, 94,239,124, 48, 15,167,142, 28,168,248,251,125,102,174, 24, 12,
-198,139, 72,189,154,  8,115,114,114,178,181, 90,109,227,128,128,  0,100,101,101,185,251,251,251,167, 75,197, 98, 72,164, 82,171,
-250, 96,201,229,242,152,252,252,252, 78, 62, 62, 62,224, 56,174,210, 76, 61,217, 68, 88, 17,149,185,123,247, 46,228,114,121,157,
-227,204,  5,150,178,134,225,225,225,149,145, 32, 39, 39, 39, 56, 57, 57, 66, 38,147, 99,241,226,197,252,154,223,126,251, 89, 30,
-254,182,234,253, 73, 31,210, 27, 95,174,121,174, 39,208,218, 10, 73,161, 80,196, 52,106,212,168,163, 66,161,192,238,221,187,145,
-150,150,134,210,210, 82,148,151,151,195, 96, 48,160,188,188, 28, 70,163, 17,114,185, 28, 97, 97, 97,104,208,160,  1,226,226,226,
-106,204,123,105,113,241,238,152,152,152,142,237,218,181,171,140,160,116,239,222,157,116,239,222,221,181,226,247,242,242,114, 20,
- 21, 21,225,234,213,171, 56,126,252, 56,  8, 33,184,127,255,190,197,160,211,109,101, 69,255,233,208,  3, 23,133,107,215,254, 49,
-117,234,212, 73,157, 58,117,130,  5,232,  7, 96,227,127,202,184, 84,112,233,210,165, 88,139,197,210,169,105,211,166, 80,  2,237,
-  1,236,171,151,121,124,240,224, 38,199,113, 61, 91,180,104,129,221, 59,118, 68,  1, 72,171,110, 63, 45, 16,213,170, 85, 43,232,
-116, 58,220,141,143,191, 97,173,185,242,242,242, 90,243,214,251,159, 76, 28, 62,250, 53,236,222,186, 14,251,118,109,202,252,249,
-251, 37,126,148, 82, 19, 43, 85, 12,  6,227, 31,111,176, 74,139,139,111,196,198,198, 54,110,221,186, 53,214,172, 89,211,238,165,
-142, 29,179, 37, 82, 41, 39,149, 72, 32,176,162,  2,209,105,181, 39,206,159, 63,223,190,119,239,222,162,203,151, 47,195,211,211,
-179,210, 96, 85,252, 20,137, 68,160,148, 66,161, 80,224,208,161, 67, 38,157, 86,123,162, 46, 93, 11,103,177,  8, 30, 25, 60, 74,
- 41,148, 74, 37, 36, 18,  9, 86,175, 94,131,117,191,253,246,106, 86,110,238,206,224, 54,206, 31,  0,144,255,199, 42,230,242,242,
-147, 39, 78,156,104, 51,115,230, 76,177,175,175, 47,148, 74, 37, 74, 75, 75, 81, 92, 92, 12,181, 90, 13,181, 90,141,210,210, 82,
- 40,149, 74,200,229,114, 60,120,240,192,172, 47, 47, 63, 89,147,158, 76,175,223, 53, 97,194,132, 15,111,222,188,233, 37, 18,137,
- 96, 54,155,193,243, 60,120,158,135,201,100,194,131,  7, 15, 16, 23, 23,135,132,132,  4,148,148,148, 64, 44, 22, 67, 40, 20,226,
-214,173, 91,165,182,102,243, 14, 86,244,159, 30, 49,176,251,252,249,243,147,198,141, 27,  7,111, 95,223,174,200,202,178,202,184,
-236,173,197,184,168,158,194,184, 60,102,124, 52,154,107, 41, 41, 41,157,186,117,235,  6, 47, 95,223, 37, 97, 89, 89,199,226,235,
-209, 15,203,194,113,231,206,159, 63,223,115,252,248,241, 88,179,102,205, 18,183,148,148,195,133, 79, 52,103,186,  1,110,141,130,
-130,150, 76,156, 56, 17, 71,143, 30,133,133,227,106,140,200, 61,209,161,189,225,144, 17, 99,253, 88,135,118,  6,131,241, 79,162,
- 94, 77,132, 68,171,157, 51,119,238, 92,179, 80, 40,196,240,225,195,237,247,237,223,255,242,173,219,183,  3, 11, 10, 10,156, 44,
- 22, 75,157, 90,246, 42,213,247,139, 22, 45, 82,154,205,102,132,132,132,160,164,164,  4, 22,139,  5, 34,145,  8, 34,145,  8,132,
- 16,  8,  4,  2,216,217,217, 33, 46, 46, 14,219,182,109, 83,219,171, 84,223,215,165,203,243,124,204,158, 61,123, 32, 18,137,168,
- 92, 46,  7, 33,  4, 34,145,  8,171, 87,175, 46,152,147,155,187, 27,  0,132,  2,129, 17,  0,  4,  2, 98, 85,175, 92, 66, 72,157,
-237,147, 82,169, 20,252,195,206,253,117,238,235,102, 54,175, 88,181,106,149,230,254,253,251,208,106,181,149,209,182,178,178,178,
-202, 78,243, 74,165, 18,132, 16,232,245,122,156, 61,123, 86,227,102, 54,175,168, 73,175, 24,200,203,186,127,127,112,187,118,237,
-138, 83, 82, 82,160, 82,169, 16, 19, 19,131,227,199,143, 99,251,246,237, 56,122,244, 40, 30, 60,120,  0,142,227,224,227,227,  3,
- 74, 41,246,238,221,171,226, 52,154,126,197, 64, 30, 43,250, 53,211,208,211,179,167,135,187,123,134,155,171,107, 86, 67, 79,207,
-158, 79,254,223, 17,184,119,239,222, 61,112, 28,135,192,192,192,  6,181,245,195,162, 28,119,254,252,249,243, 24, 63,126, 60,252,
- 26, 55, 94, 28,  0,184, 61,185, 79,  0,224, 22, 16, 20,180,184,194,184, 80,142, 59, 95,223, 52,219,  3, 63,124,240,193,  7, 58,
-137, 68,130,109,219,182,  5,154,155, 52, 73, 16,  1, 99,236,128,208,110,128,164,174,239,123,  1, 63,127,246,217,103,121,132, 16,
-108,218,180,201,213, 49, 40, 40, 86,  4, 76,112,  4, 26, 58,  2, 13, 69,192,  4,199,160,160,216,109,219,182,185,114, 28,135, 25,
- 51,102,228,121,  1, 63,215,164, 39, 20, 10,223,205,201,201, 25,148,157,157,221, 37, 39, 39,199,239,231,239,151,224,212,145,  3,
-248,101,197, 87,107,115,115,115,223,200,207,207,191,154,157,157, 61, 46, 43, 43, 43,150,149, 56,  6,131,241, 34, 66,170,235,231,
- 36,110,255,101, 62, 64,221,187,118,104,142,107,183, 19, 85,174,206, 14, 71, 42,254,167,188,187,187,233,192, 14,158,205,191,253,
-246, 91,136, 68, 34,100,102,102, 34, 62, 62, 30, 14, 14, 14,120,239,189,247, 12,102,131, 97,112,197,122,103,132,144,104, 74,233,
-241, 71,154,199, 56,142,115,150, 25, 50,237, 90, 57,167, 52,222,184,126,173,208,222,222, 30,101,101,101,149,211, 10, 40, 20, 10,
-216,216,216,224,206,157, 59, 24,255,218,235,150, 36,174, 69,229, 68,163, 21,235,157, 85,213,  4, 33, 66,  0,232,231,236,172,184,
- 43,147,205,114,241,240,152,253,206, 59,239,216,116,237,218, 21, 18,137,  4,109,218, 71,229,217,182,156,253,131, 64, 64,184,172,
- 98,245,220,160,134,222,142,241,247,211,  0,144,135,107, 22, 62, 90,139,176,186,116, 70,202,239,  4,110,252,229,115,135,240,240,
-240,135,249, 86, 42,145,159,159,143,130,130,  2, 40,149, 74,104,181, 90,  0,192,241,227,199,113,242,106,138, 58,215,174, 87,114,
- 77,233,252, 87,222,211,236,155,217,220,107,244,195,138,101, 66, 39, 39, 39,228,231,231,163,176,176, 16, 74,165, 18, 58,157, 14,
- 22,139,  5,106,181, 26,251, 15, 28,180, 36, 91, 34, 83, 13,178,134,154,186, 52,161,205,180,105, 80,118,193,167, 85, 88,  0,157,
- 52,105,146,189,131,131,  3,120,158, 71,105,105, 41, 50, 50, 50,144,146,146,130,179,103,207,106, 11,148, 70,104, 93,123,101, 85,
- 76, 52, 90,237,249,124, 94,133,234,127, 81,243, 81, 89,  2,  0,111, 47,175,156,244,244,116,119,139,197,  2, 31, 31, 31, 78, 89,
- 82,178, 88, 10, 28,181,  7,114,  1,208, 34,224,211, 21, 63,252,240,250,144, 33, 67,208,182,109,219,204,188,252,252, 70,213,149,
- 37, 16, 34, 12,  1, 28,203,125,125,227,174, 94,189,234,153,145,145,129,241,227,199, 23,165, 39, 37, 85, 78,211,160,  2,162,  2,
-130,130, 22,111,219,182,205,181,113,227,198,136,140,140,204,147, 87, 76,211, 80,125,249,172,249,222,188,247, 87,163,105,195, 34,
-218,190,245,214, 91,224, 56, 14,103,207,158,197,149, 43, 87,144,158,158,142, 11, 23, 46, 40, 29,108,109, 71,213,118,111, 66,149,
-104,223, 47, 88, 27,184,105,211, 70, 34,145, 72,176,118,237, 90,220,188,121, 19,  0,208,170, 85, 43, 76,156, 56, 17, 28,199, 97,
-236,216,113,244,175, 68,155,202,137, 70,171, 43, 75,190,190,190, 17, 60,207, 47, 37,132, 72, 40,165,109,115,114,114,228, 62, 62,
- 62, 57, 57, 57, 57,126,245,233,115,197,202, 39,211,100,154,255, 28,205, 23,141, 58,215, 34,252, 98, 37, 28, 31, 95,142,227,205,
-156, 61,191,127, 41,234,211,183, 95,232,220, 79,230,  8, 90,181,106,  5, 63, 63, 63,180,106,213, 10, 55,111,222,148, 53,107,214,
-172,174,245,206,202,122, 15,157,148,210,187,119,111,167,183,223,126,219,177,107,215,174, 98,111,239,135,235,234,198,197,197,225,
-208,161, 67,166, 45, 91,182,168,179,165, 81,202, 11,135,126, 47,179,102,189,179, 67,165,165,229,  0, 62,111,110, 52,254,246,217,
-220,185,243,195, 35, 35, 39,189,255,254,251,  2, 59, 91,133,248,203,185,111,200,  1,224,139,159,182, 59, 14,121,249, 85,172,104,
-  2,116, 29, 83,253, 58,111, 85,211,153,149, 91,144, 62,102,226,203, 77,222,126, 99,140,101,208,160, 65,182,118,118,118,240,243,
-243,131,179,179, 51, 82, 83, 83, 17, 19, 19, 67,143, 29, 59, 86,118, 35, 46, 85,188,110,251,209,116,169,157,187, 53,235,  6,106,
-122, 15,153,144, 58, 97,194,  4,231, 97,195,134,217,135,135,135,139,197, 98, 49,228,114, 57,138,139,139,145,153,153,105, 58,125,
-250,116, 89,182,164, 99,233,133,195,235, 52, 86,174, 69,168,235, 50,122,225,131,115,199, 22,204,136,139,137, 25,199,  3, 45, 76,
- 38,147,143,197, 98, 33,  2,129, 32,151,231,249, 24,147, 70,243,135,161,213,130,229,108, 45, 66,235,176, 88, 44, 18,139,197,  2,
-165, 82,137, 99,199,142,137,146,146,146, 62,189,125,251,246,167, 57, 57, 57, 48,155,205, 24, 49, 98,  4, 90,181,106,133, 83,167,
- 78,161, 48, 63,255,207,218,180, 18,  1,149, 44, 43,107,226,155,111,190,121,104,227,198,141,130,219,183,111,187,174, 93,187,246,
-247,234,140,203,184,113,227,248,252,140,140,137,134, 90,230,192,170,227,222, 44, 58,188,237,199,219, 67,135,191, 28,182, 96,222,
-167,226,151, 94,122,  9,174,174,174,136,138,138,130,201,100,114,178,226,222,212,116,233, 59, 42,185, 69,139, 22,182,203,151, 47,
-247,124,253,245,215, 49,125,250,116,  0,128, 78,167,195,209,163, 71, 49, 99,198,140,188, 12, 81,123,237,141, 83,219,106, 45,159,
-143, 34, 83,189,  0,192,199,199,231, 12,128, 46,  0,146, 89,135,118,  6,131,241,143, 54, 88,192,191,214, 59, 59,119, 37, 22, 85,
-151,227,120,136, 91, 60,231, 58, 34,105,234,236, 37,145, 82,104,157,197,196,224,112,235,230, 77,146,146,146, 82,235,193, 42,214,
- 59, 51,200,252,202, 20, 57, 69,237,126, 88,177,226,189, 53,107,214,244,172,152,138, 65, 46,151,199,232,180,218, 19,246, 42,213,
-247,134,198,126, 39,234,187,118,222,157,146,146,124,  0,211, 66, 45,150, 31, 94,155, 52,229, 27,129,157,175,248,147, 47,215,232,
-133,  2,129,241, 65, 78, 33, 86, 52,  1,108,173, 24,240, 88,110,  4, 98,138,221,185,120,116, 75, 92,178,112,225,172, 21,223,125,
-215, 78, 97,103,215,213,204,113,193, 60,207,131, 90, 44,247,117, 58,221, 25,152, 76, 87,179,188, 39,127, 39,181,115,167,214,174,
- 27,104,144, 55,210,120,104,207,180,219,181, 99,199,187,135, 14, 29,250,183,188,123,241,252, 15,201, 14,141,142, 91,147,247,170,
-251,232,129,139, 40, 40,184, 88,227,219,  6,216, 90,132, 86,223, 20, 60, 63,217,217,217,121, 67,207,158, 61,229,209,209,209, 24,
- 48, 96,  0, 94,122,233, 37,240, 60, 15, 74, 41, 52, 26, 13,182,111,223,142,111,190,249,230,126, 35,224,243,186,244, 12,192,  9,
-217,193,131,253, 90,180,104,177,182, 54,227,242,200, 92,213,217,231,176,246,123, 83,118,159,115, 28,156, 54,250,237,175,154, 24,
-213,185, 78, 46, 10,206, 51, 46, 54, 70, 96,237,189,  9,199, 16,141,229,230,246,246, 35,134, 13,123, 91, 40, 18, 69, 61, 26,209,
- 72,239,198,199,223,168, 88,236, 25,173, 38, 30,171, 79, 89,162,244,225,220,115,172, 67, 59,131,193,248,199, 27, 44,145, 72, 84,
- 80, 17,229, 17,137, 68,  5,201,123,167,188, 90,155,136,159,151, 87,207, 71,111,199,168,107, 45,194,138,207,183, 85, 42,205,163,
- 25,218,171,157, 68, 84,252,196,254,245,201, 84, 66, 65, 65, 34,128,129, 64, 58,144,248,176, 59,139,184,221, 23, 31, 85,205, 83,
-141, 39,228,177,227, 74, 74,210,242,243,207,225, 97,115, 78,181,157,113,197,254,146,146,186,210,249,100,222,207,103,102,170, 31,
-229,187,250,188,123,214,157,119, 81, 61,207,143,232, 25,206,231, 63,141,236,162,162,189,  0,236,124, 15, 28,240, 56,124,224,192,
- 43,179,102,206, 28,225,229,237, 29,228,234,234,234,108,111,111, 47,184,124,249,114, 10,167,215,255,208, 18, 88,119,  5, 40,183,
- 70,211,  0,156,  8,201,200,  8, 31, 57,108,216,219, 68, 36,234, 92,213,184, 80,142,187, 16,  8,252,108,176, 98,246,246,122,223,
-155,178,250,223,155, 89, 15,211,241, 37, 56,238, 75,220,185,243,204,247, 38,207,243, 95,248,248,248,104, 88,135,118,  6,131,241,
-143,226,239, 92,135,  7, 64, 52,211,100,154, 47,138,230, 67,143,  2,  7,118, 62,153, 38,211,100,154, 76,243,249,107,254,163,215,
- 34,100, 48,254,225, 47, 35, 22,  0,106,118, 38, 24, 12,  6,131, 81, 23,  4, 64,116, 13,149,137,213,163,  3,  8, 33,209, 79, 81,
- 89, 29,103,154, 76,147,105, 50, 77,166,201, 52,153,230, 63, 75,179, 46,237, 23,102,116, 34,107, 34,100,154, 76,147,105, 50, 77,
-166,201, 52,153, 38,107, 34,124,190,155,  0, 12,  6,131,193,192,194,133, 68,  0, 16,  2, 44, 20,  0, 59,133,192, 72,225,195,223,
-159,158,145, 35, 73,181,147,208,190,251, 46,177,103,103,156,193,120,177, 97,125,176,254,131,120,121,121,249,123,120,120,252, 74,
- 41, 37,  5,  5,  5,147,115,115,115, 51,216, 89,249,239,195,197,197,165, 39,199,113, 80,169, 84, 39, 94,196,252,133, 55, 33,195,
-168,  0,205,254, 21,214, 70, 70,252,125,186,161,186,125,195,130,201,120,144,127,205,165, 69,120,220,141,123, 64,247, 88,123, 44,
- 66,136, 96,104, 63,183,165,  0,176,247, 80,225,236,191, 99, 94, 44,111,111,239,166, 46, 46, 46, 71,132, 66,161,200, 98,177, 76,
-139,137,137, 57, 80,179,  1, 26, 41,  4,  0, 55,155,221,115,156, 26,184,126,252,217, 44, 34, 54, 26,190, 85, 26,244,122,149, 64,
- 36, 74,149, 74, 20,231, 57,129,237,161,172,252,126,241,213,125,127,199,142, 29, 53,174,174, 29, 17, 76,250,133,134,133, 13,106,
- 29,105,147,188,244,251,118, 43,186,  6,186,138, 83, 50,111,217,173,220,144,241,171,155,179,207,160,247,222, 16, 29,144, 81,203,
-184, 37,191,211, 50,118,151, 89,207,215,132, 52, 48,  1,145, 98,153,204,207,194,113, 30,  4,160, 66,145, 40,223,108, 48,100, 74,
-128, 59, 31, 83,170,124,209, 53, 37, 50,153,175,133,227, 60,  0,224,191, 49,157,140, 58, 12, 86, 80, 80,208,117,129, 64,224, 91,
-177,198, 95,213,197,106, 43, 62, 63,249,211, 98,177,100, 37, 36, 36,180,177,246,224,141, 27, 55,118,208,235,245,175, 16, 66, 94,
-  5,  0, 74,233,102,185, 92,190, 61, 37, 37,229,169, 58, 18, 55,110,220,216,129, 82, 58,219,198,198,166,135, 94,175, 15,  7,  0,
-185, 92, 30,167,211,233, 78, 18, 66,150, 62,141, 46, 33, 68,228,229,229, 53,210,214,214,182, 59,199,113,221, 41,165, 68, 36, 18,
-157, 42, 47, 47, 63,153,155,155,187,131, 82,202,213, 87,211,219,219,219,198,197,197,229,203, 38, 77,154,140,121,251,237,183,139,
- 27, 52,104, 16,178,112,225,194,107, 17, 17, 17, 91, 74, 74, 74,230,230,228,228,232,254, 27, 10,  7, 33, 36,200,211,211,115,179,
- 88, 44, 22,102,102,102,118,  7,  0, 63, 63,191, 83, 70,163,209, 82, 80, 80,240, 42,165, 52,169, 62,122,110,110,110,182, 98,177,
-184,131,173,173,109, 27, 91, 91,219, 46, 22,139,165,217,163,245, 19,239,106,181,218,179,102,179,249,186,217,108,190, 92, 88, 88,
-168,253,111,185, 65,  8, 33,246,238,238,238, 27,  9, 33, 32,132,  4, 83, 74, 53, 47,218, 67,128, 10,208, 44, 62, 46, 33,164,210,
- 68,133,135,214,114, 66,224, 95,205,190, 86, 27,172,254, 61,157,250, 14, 26,212, 66,  0,  0, 38,211,181,190,  0, 14, 62,111,115,
-213,191,127,255,139, 63,252,240,131,179, 94,175,199,  7, 31,124,176, 57, 56, 56,248,231,251,247,239,207,169,237,123,246,246,246,
- 51, 62, 95,244,147,226,209,179,204,157,231,121,247,220,220,204,224,196,132,152,190,137,137,177, 95,153,180,123, 46,155,168,112,
-138,178,124,112,130, 53,233,  8, 11, 34,  3,135,140, 28, 54,224,243,207, 23, 96,204,168, 49, 13,227,226,244, 54, 62, 14,201, 82,
-181,201,182,137,171,171,239,224,143, 62, 89, 66, 46, 95, 58, 61,120,199,246, 53, 39, 63,154, 68,122, 48,147,101,213,189, 72,190,
- 16,137, 58, 56,135,134,118, 25,181,119, 47,236,252,252, 68, 34,153, 76,  0,  0,156,193,224, 87,150,153,233,181,109,240,224,246,
- 11,  9, 57, 61,159,210, 43, 76,243,255, 95,147, 97,165,193, 18,  8,  4,190, 55,111,222,116,183,181,181,197, 35,243,  3,139,197,
-  2,139,197, 82,185,168, 48,165,180,242, 39,199,113,232,214,173,155, 85,111,176, 94, 94, 94, 61,  0,188, 22, 17, 17, 49, 98,246,
-236,217,146, 78,157, 58,193, 98,177,224,228,201,147, 81, 43, 86,172,248,209,219,219,123, 55,128,117,185,185,185, 39,172,125,195,
-245,242,242,234, 99,107,107,187,233,211, 79, 63,117,136,138,138, 18,121,121,121,  1,  0, 10, 10, 10, 58,156, 63,127,190,205,130,
-  5, 11,166,121,121,121,141,205,205,205, 61, 98,237,201,241,245,245,141,  8, 14, 14,222,217,175, 95, 63,223, 54,109,218,200,155,
- 54,109, 10, 74, 41,110,221,186,245,122, 98, 98,226,232,131,  7, 15,206,247,245,245,125,217,218,245,212,  8, 33, 36, 40, 40,104,
-130,167,167,231,151, 51,103,206,108, 48,116,232, 80,105,108,108,108,105, 96, 96, 32,217,189,123,183,219,159,127,254, 57,237,151,
- 95,126, 25,217,164, 73,147,185, 73, 73, 73,235,105,117,235, 24, 61, 65,112,112,240,117,129, 64,224,107,141,  1, 38,132,128,227,
- 56,171, 76, 48, 33,164,101,163, 70,141,182,159, 59,119,174, 81, 90, 90,154,101,232,208,161, 27,  0,224,228,201,147,145,102,179,
-153,244,238,221,251, 16, 33,228, 21, 74,233, 45,107,242,238,227,227,211,220,205,205,109,223,208,161, 67, 27,248,251,251, 43,124,
-125,125,137, 92, 46,135, 80, 40, 68, 89, 89,153,119, 98, 98, 98,244,173, 91,183,116, 23, 46, 92, 40,241,241,241, 25,156,157,157,
-125,167, 30, 15,222,151,220,221,221,199,137,197,226,  8,142,227,124,  0, 64, 36, 18,101,155,205,230,216,130,130,130,141,148,210,
-139, 79,123,131,120,120,120,252,248,229,151, 95,186, 22, 20, 20,208,197,139, 23,255,  8, 96,194,139,250, 48,216,188,101,  7,174,
- 95,187,  2,  0, 18, 66,  8,121,178,252, 17, 66, 72,179, 96, 72,222,127,127, 38,218,180,109,143, 87,199,140,172, 83,115,232,  0,
-215,207,165, 66,145, 75,185,209,112,165, 72, 37,216,231,239, 46, 29, 54,118,100,155,100,  0, 56,124, 40,102, 88,251,246, 13,206,
-187, 58,242, 67, 20, 82, 89,123,163,133, 43,222,251, 87,209,188,250,152, 41, 79, 79,207, 35,246,246,246,138,210,210,210,188,226,
-226,226,149,253,251,247,255, 98,249,242,229,206,201,201,201,200,204,204,196,107,175,189,102,151,157,157,253,182,191,191,255,165,
-140,140,140, 26, 35, 89, 26,141,230,251, 47, 23,205,156,103,239,224, 44, 84,216,216,194,206,222,  1,141, 26,  5,163,109,187, 40,
- 68,247, 26,140,228,228,196, 14,219,183,174,185, 41,204,221,249,181, 69,218,234, 11,165,178, 81,141,207,165,240, 16,210,181,194,
- 92,205,155,183,  0,247, 18, 18, 52,105,169,130,119,254,218, 43, 82,244,235, 25, 42, 51,154,202,210, 46, 95, 58,221,168, 67,199,
-110,  0,208,102,199,246, 53, 39, 23,142, 37, 61,231,111,122,241,204,251,243, 52, 87,159,139,197, 19,250, 44, 95,238,222,106,218,
- 52, 73, 89,106,170, 41,121,213,170,242,252,179,103, 45, 34,153,140,250,245,237, 75,220,186,119,151, 79,187,123, 87,114, 97,241,
-226, 46, 95, 73,165,129,159, 24,141,155,152,230,255,159, 38,163,126,  6, 11,182,182,182,216,182,109, 27,196, 98, 49, 68, 34, 17,
-196, 98,113,141,159,253,253,253,173, 49, 65,195,195,195,195,127,154, 57,115,166,199,160, 65,131,224,236,252,248, 42, 27,  3,  7,
- 14, 68,255,254,253, 37, 41, 41, 41,163,119,236,216, 49,122,195,134, 13,121, 94, 94, 94,239,228, 62, 90,176,185,150,202,187,123,
- 96, 96,224,238, 45, 91,182,216,232,116, 58,156, 62,125, 26,165,165,165,144, 74,165,240,245,245, 69,231,206,157, 69,167, 79,159,
-110, 48,122,244,232,221, 62, 62, 62,  3,179,179,179, 79,213,149, 86, 79, 79,207, 54,110,110,110,103,126,251,237, 55,121,104,104,
- 40,121,240,224,  1, 90,180,104,  1,  0, 40, 46, 46,198,192,129,  3,229,195,134, 13, 11,122,235,173,183, 46,123,122,122,118,205,
-203,203,187, 94, 71,222, 91,183,104,209, 98,125,223,190,125,189, 63,254,248, 99,  7, 59, 59, 59,164,165,165,229,122,122,122,  6,
- 87,152,159, 33, 67,134, 72,123,245,234,229,181,114,229,202,239, 15, 30, 60,248,129,151,151,215,132,220,220,220, 27,181,233, 10,
-  4,  2,223, 27, 55,110,184, 43, 20, 10,228,231,231, 99,243,230,205,120,251,237,183, 33, 20, 10, 81, 80, 80,128,237,219,183,227,
-157,119,222,129, 80, 40,132, 74,165,178,202,  4,219,218,218, 70,183,104,209,226,247,147, 39, 79,250, 58, 57, 57,193,219,219, 91,
-240,217,103,159, 69,  4,  6,  6,218, 52,108,216, 80,152,155,155,139,221,187,119,  7,142, 27, 55,110,159, 92, 46,127, 93,175,215,
-215,217,116,230,226,226,242,199,250,245,235,253,111,223,190,141, 85,171, 86,161,164,164,  4, 82,169, 20, 78, 78, 78,240,244,244,
- 68,112,112, 48,153, 54,109,154,162, 71,143, 30,138,  5, 11, 22,252,  1,160,165, 21, 15,221, 22,238,238,238,191,142, 30, 61, 58,
-112,225,194,133, 78,158,158,158,168,120, 33, 80,169, 84,190,105,105,105, 29,230,205,155,247,178,135,135, 71, 74, 65, 65,193, 20,
- 74,233,237,122, 62,212, 91,246,236,217,115,224,208,161, 67,133,185,185,185,216,184,113,227, 64, 66, 72, 75,107, 77,229,255, 26,
-215,175, 93,193,228,183,222, 43,243,246,243,147,252,185,127,235,144,178,178,223,206,219,  9,156, 68,  0, 80,198, 43,185, 78, 29,
-236, 58, 15, 26, 60, 90,210,127,192,208,178,223,126,249,222,206, 26,131, 37, 21,138, 92,182,109,154,154,121,246,194,253,102, 71,
-142,167, 69, 15, 29, 28, 45, 16, 73, 66,130,  0, 96,214,204, 55,165,123,247, 31,255,185, 79,116,195,220, 46,157,130, 51, 71,141,
- 93,229, 87, 31,115, 21, 24, 24,120,250,200,145, 35, 30, 82,169, 20,165,165,165, 46,107,215,174, 93,214,190,125,123, 65, 82, 82,
- 18, 18, 18, 18,144,154,154, 10,149, 74,133,118,237,218,217,197,199,199,175,  4, 80,163,193, 42,212, 13,255, 50,208,189,232,  7,
- 31, 23,231, 70,122,147,202,221,194, 21,135,157, 60,126,187,249,174, 29,229,173,220, 61,125,131, 71,143,158,140,143,230, 44, 17,
-239,217,181,126,222,153,179, 71,  1, 52,170,121,  6,127,138,151, 62,153, 59,  7,106,141,  1, 99,199,188,137,113, 99,222,116,161,
- 48,122, 81,139,222,214,168, 43,117,114,148,196, 29, 88,191,117,199, 48,  0,190, 85, 76,214,  9,102,178,106,230,115,145,168,253,
-192,159,126,114,139,120,227, 13,217,237,133, 11,181, 69,103,207,234,154,244,239, 95,218,106,234, 84,  3,  0,104, 82, 83, 37,247,
-230,207, 87,184,117,233, 98,211,113,246,108,103,139,209,232,185,136,144,118,159, 81,122,181,190,154,141,198,140,177, 44,221,189,
-187,237,229,197,139,187, 97,209, 34, 97,247, 86,173,110,205,253,229,151,236,103,209,124,158,233,204, 57,115,198,160,109,214, 12,
-145, 35, 70, 20,251,184,184, 24,158,103,222,159, 37,157,140,106,234,144,154,130, 36, 33, 33, 33,249,137,137,137,238,187,119,239,
-174,211, 92,137,197, 98,120,121,121, 33, 42, 42,170, 32, 38, 38,198,163,150,135, 98,102,102,102,166, 47,199,113,144, 74,165,181,
- 38, 76,163,209, 32, 38, 38,  6,163, 70,141,202,202,201,201,169,241,193,219,160, 65,  3,123,103,103,231,228, 83,167, 78,185,198,
-197,197,225,250,245,235,  8, 12, 12,132,179,179, 51,196, 98, 49,204,102, 51,212,106, 53, 66, 66, 66, 96, 99, 99,131,254,253,251,
- 23,149,148,148,  4,150,148,148,212,248, 32,107,216,176,161, 76, 44, 22,223,223,181,107,151, 95, 68, 68,  4,174, 94,189, 10, 63,
- 63, 63,120,122,122,  2,  0, 82, 83, 83,113,254,252,121,244,239,223, 31,177,177,177,152, 58,117,106,166,217,108, 14, 78, 75, 75,
- 51,212,216,100, 16, 22,150,187, 99,199,142,172,208,208, 80,189, 86,171, 21,228,231,231,139,207,158, 61,203,105, 52, 26, 59,149,
- 74, 37, 86, 42,149, 98,181, 90, 45,210,106,181, 98,129, 64, 32, 49, 24, 12,226,203,151, 47, 11,139,139,139, 29,106, 59, 79,161,
-161,161,249,  9,  9,  9,238,251,247,239, 71,100,100, 36,118,239,222,141, 89,179,102,225,194,133, 11,240,243,243,195,142, 29, 59,
- 48,123,246,108, 36, 38, 38,194,213,213, 21, 61,122,244,168,245, 26,  1, 64,147, 38, 77, 30,196,196,196,  4, 73, 36, 18, 36, 39,
- 39, 35, 43, 43,171, 98, 61, 59, 20, 22, 22, 34, 41, 41,  9,217,217,217,104,210,164,  9,198,140, 25,147,148,149,149,213,164,174,
-130,214,186,117,235,194, 19, 39, 78,184, 54,111,222, 28,249,249,249,112,114,114,130,163,163, 35,156,156,156, 42, 63,  7,  6,  6,
- 98,230,204,153,104,222,188,121, 65, 90, 90,154, 71, 93,230, 39, 50, 50,242,200,137, 19, 39, 92, 29, 28, 28,144,151,151,  7,181,
- 90, 13,145, 72,  4,133, 66,  1, 87, 87, 87,200,229,114,  0,192,253,251,247, 49, 96,192,128,162,228,228,228, 62,214,154, 35, 66,
-136,192,195,195, 35,225,206,157, 59,193,148, 82,100,100,100, 32, 49, 49, 17,111,189,245,214,125,189, 94, 31,250, 34,173,169, 87,
-165, 95,149,100,194,196,201,146,161,131,135,148,223,186,126,152,183,193, 25,180,107,105,163,  4,128,171,183,116, 78, 58,116, 69,
-203, 54,125,  5,123,247,239, 83,172, 95,247,155, 24, 60, 60, 64,144, 24,127,143, 46,170, 73,123, 96, 31,167,241,179,223,235,219,
-172, 75,167, 46, 34,181,154,122,254,190, 97,117,187,244,148,100, 15,  0,  8,104, 28,152, 63,105,252,155, 87, 29, 28, 72,222,217,
- 11,103,185,165,223, 31,190,123,224,136,114,131, 21,145,229, 64,127,127,255, 75,127,252,241,135,171,155,155, 27, 28, 29, 29,161,
-213,106, 97, 50,153, 16, 31, 31,175,223,182,109,155,217,193,193,193, 62, 47, 47, 15, 74,165, 18, 34,145,  8,151, 46, 93,202,200,
-203,203, 11,120, 82,171,162, 15, 22,  0,188,213,175,153, 56,172, 71,176,179, 68,198,217,216,136,239,121,129, 88,100,132,218,121,
-156, 60,121,169,249,169, 51,231, 94,237, 63,112,148, 91,199,142,221,177,228,171,143,204, 25,121,249,173,148,229,131, 19,170,235,
-131,213, 44,152,244, 24, 58, 98,216,200,207, 63, 95,128,  5,243, 22,226,192,254,189, 42, 59, 91,129,193,193, 73,236,216,165, 67,
- 39,253,204,183,135,100,150,151,101,249, 45,251,121,245,152, 94,125, 70,250,118,232,216, 13,151, 47,157,198,142,237,107,174, 75,
- 44,102,214, 92,248,  4, 11,  9,113,118, 10, 12,156,242,238,253,251,146,219, 11, 22,148,113, 57, 57,165,109,102,204, 40,170,110,
-223,172, 99,199,108,165,222,222, 14,206,131,  7, 55,248, 62, 32,128,154, 11, 10,126,173,174, 15, 81,117,154, 87,189,188,156,246,
-156, 58,213,147, 23,137,186,190, 61,125,186, 77,116,116, 52,212,106, 53, 14, 28, 56,128, 45,155, 55, 27, 60, 61, 60, 98,156,174,
- 93,187, 25,152,155,251,169,181,154,109,102,204, 40,178, 88, 44,100,234, 87, 95,245,186,151,153,217,163,160,184,184, 33,  0,184,
- 59, 58,102, 70,248,250, 94, 95,190,105, 83,226,143,141, 26,241,214,166,115,219,133, 11, 30,135, 10, 11,223,112,114,114,178, 41,
- 44, 42, 18,201,164,210,226, 86, 77,154,236,248,122,250,244,211,198,155, 55, 37,114, 95, 95,  7,199,129,  3,235,157,247, 54, 51,
-102, 20,169,202,203, 69,115,127,248,161, 83, 78,113,113, 67,173,209,216, 68, 85, 86,230,201,153, 76,  2,123, 27,155,226,128, 38,
- 77, 10, 52, 39, 78,228,  6,148,149,189,183, 66,171, 45, 96,165,242, 25, 35, 88,132, 16, 80, 74,173,138, 94,137,197,226,199,250,
-104,213,130, 68, 40, 20,226,234,213,171, 40, 40, 40, 64,100,100, 36, 26, 53,106,244,216, 14,201,201,201, 56,120,240, 32,148, 74,
- 37, 90,183,110, 13,  0,146,218,  4,237,237,237,223,159, 51,103,142,147,193, 96,192,245,235,215,209,166, 77, 27,200,100, 50, 72,
- 36,146,199,204, 95, 65, 65,  1,194,195,195, 49,117,234, 84,199, 31,127,252,241,125,212,178,134, 28,165,116,250,232,209,163,221,
- 35, 34, 34,  0,  0,153,153,153, 21,105,  1,  0,184,185,185,225,214,173, 91,104,211,166, 13, 60, 60, 60,208,175, 95, 63,247,125,
-251,246, 77,  7,176,180,198,140, 75, 36,130,208,208,208,182,143, 34, 68, 16,  8,  4,247, 28, 28, 28,220, 60, 60, 60,108, 29, 28,
- 28,254, 45,143,107,215,174, 85, 74,165, 82,179, 53, 39, 53, 47, 47, 15, 17, 17, 17, 80,169, 84,  0,  0,173, 86,139, 38, 77,154,
- 64,173,126,216,229,204, 96, 48,192,219,219, 27, 58, 93,237, 93,187, 90,180,104,177, 32, 52, 52,180,119,183,110,221,100, 98,177,
- 24,183,111,223, 70,171, 86,173,176,109,219, 54,248,251,251, 67,161, 80,224,254,253,251,136,140,140,196,153, 51,103,224,230,230,
-134,240,240,112, 89,235,214,173,207,149,148,148,156, 74, 75, 75, 91, 80, 75,164, 77, 96,103,103,135, 51,103,206,224,143, 63,254,
- 64,106,106, 42,114,114,114, 96,111,111,143,150, 45, 91, 34, 44, 44, 12, 47,189,244, 18,238,223,191, 15, 82, 71, 97, 34,132,120,
-  6,  7,  7, 31,184,122,245,170, 43,165, 20, 27, 55,110, 68, 89, 89, 25,140, 70, 35,  4,  2,  1,228,114, 57,156,157,157,209,163,
- 71, 15,184,185,185, 33, 56, 56, 24,219,183,111,119,237,215,175,223,193, 71, 17,168,188,186,206,169,179,179,243,123,243,231,207,
-247,115,119,119, 71, 90, 90, 26, 84, 42, 21, 60, 60, 60,208,173, 91, 55,159,227,199,143,191,  7, 96,249,139,242, 16,168,232,208,
- 78,  8, 33,127,238,223, 58,196,223, 75,218,172, 93, 43, 77, 64,204, 13, 81,208,193,227, 15,154, 63, 60, 31,  1,119,218,181,214,
- 36, 93,189,126, 56,253,207,253, 91,175,220,189,135,125,214, 52, 97, 23,169,  4,251,142, 28, 79,139,110, 30, 30, 37,252,225,231,
-249, 67, 38, 79,234, 35,107,224, 28, 69,212,  5,219,113,225, 74, 76,192,103, 11, 62,118, 95,180, 96,241,159, 71,142,167, 89,138,
- 84,130, 47,173, 73,111, 80, 96,131, 31,119,173, 22,185,106,140, 63,227,214, 21, 71, 64,220, 17,141,  3,155, 66,173, 86, 67, 46,
-151,203,199,140, 25, 99,153, 51,103, 78,185,131,131,131, 66, 36, 18,225,214,173, 91,  5,  2,129,160, 79, 93,186,122,119,103,106,
- 49,153, 57, 42, 21,242,148,216,235,136,165, 68, 26, 27,159,130,174, 93,251,229,183,109,211,234,171,197,223, 46,255, 36, 48, 48,
-196,109,204,216, 41,226,165, 75, 63, 93,  5, 32,170, 58,157,187,247,233,201,176, 32, 98,  3, 96,192,231,139, 22, 32, 57,249,190,
-243,228,215,148, 11, 69, 50, 27,239,208,128, 78,246,171,254, 56,213,183, 73,147, 70, 13, 39, 79,124,253,175,223,214,254, 49,160,
-106, 36,107,235,150,223,246, 17, 66,122, 90,115,110,255, 65, 52, 31,119,224,  0,202, 50, 50,204, 37,231,206,233,123,254,244, 83,
- 81,235,241,227,151,155, 57,206,181,162,174,170,248, 73,  8,  1,120,158,136,150, 46, 21, 80,111,111,152,157,156, 94,251, 24,104,
- 90,151,230, 98,179,121,248,208,150, 45,  7,252,190,105, 19,  2,  2,  2, 42, 53, 29, 29, 29, 49,125,250,116, 76,155, 54, 77,118,
-231,206,157,118,  7, 15, 30,108,183,225,231,159, 61, 62,  6,134, 91,147,206,179,183,111, 59,127,248,253,247,115,155, 69, 68,248,
-175,248,233, 39, 89, 69,125,151,150,150, 22,252,211,143, 63,  6,244,136,142,206,255,232,195, 15,215,221,156, 53, 43, 28, 15,151,
-100,171, 81, 51,239,236, 89,227,161,146,146, 55,118,236,220,233, 20, 18,242,176, 27,100, 82, 82,146,251,239,191,255,254,102,143,
-183,223, 30, 59,107,244,232, 79,123, 60,120,160,116, 40, 44,148, 13,252,241, 71,209,214,145, 35,235,212,172, 72, 39,  0,140,152,
- 61,251,253,246,157, 58,133,245, 27, 51,166,129,183,183, 55,177,177,177,129,201,100, 66,126,126,190,115, 98, 98, 98,208,113,165,
- 82,125,244,214,173,141,120,180,136, 59,227, 25, 12, 22,  0, 88, 44, 22,171,204,149, 72, 36,250, 87,225,182,230,160, 34, 17,188,
-189,189, 81, 84, 84,132,216,216, 88,  4,  4,  4,192,108, 54,227,200,145, 35, 80,169, 84, 16,139,197,144, 72, 36, 48,153,234, 94,
- 27,214,214,214, 54,186, 75,151, 46,162,139, 23, 47, 34, 48, 48, 16, 54, 54, 54,149,233,170,216, 36, 18,  9,188,188,188,160, 86,
-171, 17, 21, 21, 37, 94,187,118,109,116,109,  6,203,206,206,174,255,144, 33, 67, 42, 67,108,101,101,101, 16, 10,133,149,102,165,
-172,172, 12, 37, 37, 37, 80, 42,149,208,235,245,104,222,188,185,244,228,201,147,253,107, 51, 88, 85, 41, 47, 47, 47, 43, 40, 40,
-112,138,138,138,114, 94,183,110, 93, 98,199,142, 29, 67,170,254,255,244,233,211,122,189, 94, 47,150, 74,165,117,174,115, 71,  8,
-193,166, 77,155, 42,207,125,118,118, 54, 86,173, 90, 85,249,255,251,247,239,227,135, 31,126,168,156,151,163,182,107, 20, 26, 26,
-218,111,227,198,141,109, 54,108,216, 80, 42, 20, 10,145,152,152,136,205,155, 55,131, 82, 10, 55, 55, 55,148,151,151, 35, 63, 63,
- 31,167, 78,157,  2,199,113,176,179,179,131,143,143,143,124,250,244,233,157, 23, 46, 92, 40,  6,176,160,150,178,100, 17, 10,133,
-  8,  8,  8,192,188,121,243,160,215,235, 33,145, 60,244,149,106,181, 26, 74,165, 18, 55,111,222, 68, 90, 90, 26,234,170, 92,228,
-114,249,203, 27, 54,108,112,151, 74,165,208,233,116,208,104, 52,200,204,204, 68,122,122,186,190,160,160,128,179,183,183, 23,  4,
-  4,  4,  8,100, 50,153,108,232,208,161,164,194,104, 14, 28, 56,208,101,227,198,141,163,234, 50, 71,132, 16,183,102,205,154,125,
-242,230,155,111,202,171,152,110,228,229,229, 97,248,240,225,138,139, 23, 47,206, 33,132,108,166,148, 22,190, 72, 15,  3, 74, 41,
- 45, 43,251,237,252,217,125, 63, 53,139,185, 33, 10, 50, 26, 75, 59,246,234,255,158,  8,  0, 46,158, 89,219, 49,230, 70, 44,108,
-  8,151,126,232,232,210,243,118,118,147,105, 93, 17,192,254, 61,157,250,250,187, 75,135, 13, 29, 28, 45,248,125,195,234,118,147,
- 39,245,145,185, 55, 94, 77,  0,192, 89,226,139,151, 44,179,  4,122,131, 86,254,251,134,213,237,134, 14,238,127, 37, 53, 37,125,
-249,128,104,231, 61,  7, 79, 40, 15,215, 22, 33,244,114, 23,249, 56,219, 23,193,217,190, 21,  2,  2,237,113,243,214, 29,236,219,
-125, 14,193,161,157, 97, 48, 24,192,113,156,237,160, 65,131,202,119,236,216,161, 47, 46, 46,214,152, 76,166,174, 57, 57, 57,247,
-234,202,127, 86, 86, 60, 31,226,217,193, 36,177,145,113, 26,149,164,252,227, 79,119,142,108,221,190,119, 27,103, 47, 31,177,155,
- 45,255,103,247,174, 81,155,183,108,250,117,198,172, 15, 22,161,101,203,142, 29,239, 62, 56, 20,  6, 32,166, 90,211,154, 68, 15,
- 68,  4, 19, 46,249,193,131,  1,233,105,105, 89, 77, 61, 60,141, 73, 74,106,126,239,227,213,189,162,186,190,220, 60,168, 89, 23,
-105, 92,252, 25, 50,243,237, 55,183, 44,251,121,245,152, 10,147,117,246,236,145,174, 11, 22,164, 73,  1, 24, 88,245,244,232,229,
- 84, 38,243,181, 11,  8, 16,165,174, 91,167, 11, 28, 52,168, 20,  0,204, 28,231,122,233,242,101, 71,133, 66,  1, 74, 41,204,102,
-243, 99,125,132, 43,250,  5, 71,119,235,230, 97,141,102,230, 47,191, 52,127,251,237,183,145,151,151,  7,142,227, 32, 22,139,159,
-124,102, 67,163,209, 96,196,136, 17, 88,187,114,101,  7,107, 52, 45, 22, 11,249,240,251,239,231, 78,127,239,189,160,177, 99,199,
- 10,170, 62,123,157,156,156,240,219,234,213,210,117,235,214,249, 46,249,227,143,215,122,201,100,201,117,105,106,194,195,225, 20,
- 19, 99, 83, 97,174,  0, 32, 40, 40,  8,139, 23, 47,150,141, 30, 61, 90, 58, 97,194,132,239,226, 66, 66,190, 95,144,158,254,192,
-165,105, 83,  7,169, 76,230,107,237,249,  4,128, 50,163, 49, 98,254,231,159, 59, 95,185,114,  5, 57, 57, 57, 21,115, 93,129, 16,
-130,200,200, 72, 50,114,228, 72,199, 14,109,218,180, 99, 37,242, 57, 69,176, 44, 22,203, 99, 70,165, 46,131, 85,239,246, 73, 66,
-224,229,229,  5,147,201,132, 53,107,214, 64, 34,145, 84, 86,186,  0, 96, 52, 26,235,212,208,235,245,145,158,158,158, 80,169, 84,
-104,218,180,233, 99,145, 43,137, 68,  2,145, 72,  4,137, 68,  2,153, 76,  6,131,193,  0, 31, 31, 31,232,245,250,200, 58, 12, 80,
- 75,  7,  7,135,202,138,213, 96, 48, 84,154, 43,165, 82,  9,165, 82,  9,163,209,136,210,210, 82,148,149,149, 65,169, 84, 66,163,
-209,180,178, 38,207, 60,207, 35, 54, 54, 54, 41, 36, 36,164,165, 80, 40,132,157,157,157,173, 86,171,173,236, 59, 84, 82, 82,130,
-245,235,215,107,199,143, 31,239,122,229,202, 21,171, 22, 18,126,231,157,119, 32,147,201, 80, 94, 94,142,149, 43, 87,226,221,119,
-223,133, 68, 34,129, 70,163,193,170, 85,171, 48,115,230, 76,136, 68, 34, 24,141, 70,108,219,182,173,230, 72, 70,124,124,234,229,
-203,151, 91,181,110,221,218,121,207,158, 61,133,189,122,245,114,235,211,167, 15,108,108,108,160,211,233, 96, 54,155,209,161, 67,
-  7,132,134,134,162,160,160,  0,135, 14, 29, 42, 10, 14, 14,118,189,114,229, 10,159,151,151,151, 94, 87,229, 93,213, 96, 91, 44,
- 22,228,231,231, 67,169, 84,162,176,176, 16, 57, 57, 57,200,202,202,130, 72, 36, 66, 93, 47,239, 46, 46, 46, 35, 34, 34, 34,132,
-  0, 96, 99, 99,131,150, 45, 91, 98,238,220,185,156, 78,167,123,  5,192,161, 71,187,245, 91,189,122,245,158,243,231,207,139,188,
-189,189,145,144,144,  0, 55, 55, 55,145, 92, 46,175,211, 96,121,122,122,174,253,243,207, 63, 27, 84,152,234,138,178, 90, 94,254,
-240,114, 12, 31, 62,188,193,134, 13, 27,214,  2,232,255,162, 61, 16,236,  4, 78,162,118, 45,109,148,  7,143, 63,104,222,171,255,
-123, 34,175,160,249,  0,128,151,  0,209,177,131,223, 55,239, 31,221,100, 71, 69,191,172,218, 24,218,207,109,233,160, 65, 45,  4,
- 99, 71,182, 73, 22, 73, 66,130, 54,109,248,222,163,129,115,212,191, 30, 18,194,  6,176,181,  1, 66,131, 44,130, 75, 91,147, 61,
-102,190, 23, 98,220,188,238,141,228, 77, 59,174, 71, 75, 36,183,123,  0,152, 89,147,118, 92,162,121,191, 74,219,160,153,163,228,
- 52,129,124, 48, 90,181, 12,134,155,155, 18, 43,127,219,  0, 31,255, 78, 48, 24, 12,112,112,112, 80,  0, 48,153, 76,166, 77,214,
-152, 43,  0, 56,113, 66,201,135,135, 43,141, 66, 13,207,189,253,238,210, 97,189,250, 13, 14,235,209, 35,154, 63,122,236,168,169,
- 83, 43, 83,110,143, 30, 29,243, 79,157, 62,123, 63, 47, 47, 59, 56, 52,180, 57,238, 37,222,234, 11,144, 88,160,250,  2, 27,123,
-159, 30, 14, 10, 34,167,182,109,155,204,235,248,155, 54, 95,124, 25,211,111,192,128,  9, 17, 93,162,186,240,199,142,159, 52, 74,
- 81,116,215,174,243, 75,217, 19, 70,191,178,103,219,238, 61,189, 79,157, 60,208, 68,165,206, 63,240,237,207,148,153,171,170, 47,
-103, 28,231, 33,146,201,  4,133,167, 78,113,145,147, 38, 85,158, 27,133, 66,129,125,251,246, 65, 42,149, 86,110, 18,137,164,242,
-179,135,135,  7,  8,165,130,250,104,230,230,230, 34, 47, 47, 15,142,142,142,112,115,115, 67, 94, 94, 30, 46, 94,188,136,123,247,
-238, 65, 44, 22,163,111,223,190, 16,212, 80,111, 62,169, 57,245,171,175,122, 53,109,214,204,255, 73,115,133,135,  5, 19, 37, 37,
- 37,136,142,142, 22,156, 56,113,194,243,210,131,  7,131,  1,108,170, 85,115,240,224,226,194, 19, 39,170, 61,118, 68, 68,  4,217,
-183,111,159,108,204,232,209, 51, 22,254,248,227,207, 95,254,244, 83,166,133,227, 60,235,147,119, 66,136,128, 16,  2, 63, 63, 63,
-148,148,148,160,172,172,172, 34,224,  0,103,103,103,152,205,102,240, 60, 47,102, 37,210,122,  4,117,153,  1,107,204,149, 88, 44,
-134, 64, 32,120, 42,147, 85, 53, 66,240, 36,214, 24,172,138,202, 79, 46,151, 63,118,131, 85,152,181,170,159, 43,222,118,172, 64,
-168, 86,171,177,107,215,174,202,130,102, 52, 26,161, 82,169,160, 84, 42,161, 82,169,160,215,235,145,154,154,138,173, 91,183, 34,
- 39, 39,  7, 66,161,208,170, 73, 91,147,147,147,175, 55,106,212,168,101, 69,229,221,189,123,119,223,179,103,207,230, 84,156,131,
- 79, 63,253,180,168, 67,135, 14,174, 85, 43,247, 58, 19, 43, 20,226,226,197,139,208,233,116,160,148, 66, 34,145, 32, 49, 49, 17,
- 28,199,129,231,121,136, 68, 34, 20, 22, 22,214, 25,193,138,141,141,157,248,250,235,175,175,152, 52,105,210,169, 15, 63,252,240,
- 88,247,238,221, 51,  9, 33, 48,153, 76,112,112,112,128,167,167, 39, 18, 19, 19,161,215,235,241,254,251,239,103,108,216,176,225,
-248,202,149, 43, 79,173, 89,179,102, 69, 86, 86,214,235,245,185,222, 28,199, 65,171,213,162,180,180, 20, 37, 37, 37, 80,171,213,
-208,235,245, 79, 85,134,162,162,162,112,224,192,  1, 97,207,158, 61,127, 15,  8,  8,200, 11,  8,  8,200,235,217,179,231,239,251,
-247,239, 23,250,248,248, 32, 45, 45, 13,215,175, 95, 71,105,105, 41, 40,165,181, 30, 64, 44, 22,119, 31, 63,126,124,103,127,127,
-127, 98, 50,153, 96, 48, 24, 96, 48, 24, 96, 50,153,192,243, 60,210,210,210,208,172, 89, 51, 65, 64, 64, 64, 71, 66, 72,119,246,
-  8,177, 30,117,193,118,208,242,159, 64, 13, 91,193,171,127,134,246, 41, 39, 35, 41, 45, 45,253,242,173,143, 85,  5, 22,195, 45,
-196,199,156,134,166,220,  7,190,141, 39,226,205,215,187,227,234,229,163, 40, 41, 41, 65,124,124, 60,186,118,237, 42, 33,132,212,
-171, 92, 30, 59,118,217,242,202,184,119, 95,238,222,123,112,155,232,232,254,220,145, 35,199,141, 55,174, 29,185,222, 36,200,185,
-128,242,101,249, 78, 78,138,155, 15, 30,220, 69,112,211, 48,152,204,230, 40, 96, 65,173,229, 41, 41,137, 26,255,250,203,203,242,
-202,164,216,113,125,250,190,214,162,103,207, 62,230, 35,199,254,180,156, 59,181,243,102,159, 62, 65,103,190,254,126,187, 95,137,
- 49, 52, 92,238,224,121,176, 99,103, 69,212,212, 87,253, 39,179,146, 82, 67, 52, 64, 46,231,241,232,185, 88,209,133,165,170,185,
-122,114,179,166, 78,170,170, 89,181, 46, 82, 42,149,184,127,255, 62,190,253,246, 91,220,186,117, 11, 22,203,195,174,118,117,117,
-179,168,170,153,152,145,209,227,221,119,223,149, 85,103,174,138,139,139, 81, 84, 84,132,236,236,108, 12, 28, 56, 80, 82,226,236,
-220,186, 46, 77, 31,119,119,131, 66, 46,207,191,119,239,222,191,165, 87,173, 86, 67, 42,149,226,199,159,126,146, 28, 73, 72,120,
-235,200,201,147,174,245, 57,159, 85,235, 82,119,119,119,  4,  5,  5,161, 85,171, 86,136,140,140,132, 92, 46, 71, 92, 92, 28,126,
-253,245, 87,  8,  9,225, 88, 73,124, 78, 17,172,250, 24,172,250, 24,  2,107,177,166,137, 80, 46,151,199,228,231,231,119,242,241,
-241,  1,199,113,149,102,234,201, 38,194,138,104,199,221,187,119, 33,151,203, 99,106,211, 84, 40, 20, 49, 66,161,176, 99,187,118,
-237,176,123,247,110,156, 58,117, 10, 41, 41, 41, 40, 47, 47,135,193, 96,128, 78,167, 67, 92, 92, 28,120,158, 71, 68, 68,  4, 28,
- 29, 29,161, 80, 40, 98,234, 74,171, 86,171,205, 21,139,197, 33, 54, 54, 54,255,106,238,240,242, 66,113,113, 49,111, 54,155,177,
-126,253,122,181,167,167,167,173,141,141, 13, 42,230, 31,179,198, 92, 22, 20, 20,192,215,215,183,178, 15,150, 70,163,129,187,187,
- 59, 76, 38, 83,101,  4,206,222,222,190, 78,115, 73, 41,213,  3,152, 85, 69,187,237,200,145, 35,183,108,219,182,173,241,241,227,
-199,113,229,202, 21,184,185,185,225,171,175,190, 74, 73, 75, 75, 27, 67, 41,189,246,188,175,185, 53,  6,171,184,184,120, 87, 76,
- 76, 76,199,118,237,218, 85, 22,186,238,221,187,147,238,221,187,187, 86, 13,233, 23, 22, 22,226,234,213,171, 56,126,252, 56,  8,
- 33,184,127,255,190, 69,167,211,109,169,229,216,146,128,128,128,117,115,231,206,181,227, 56,174,178,108,219,216,216, 64, 46,151,
- 67, 34,145, 64, 40, 20, 34, 45, 45, 13, 67,134, 12,113,252,233,167,159,214, 18, 66,130, 40,165,166, 23,229,129, 80,198, 43,185,
-171,183,116, 78,206,206,  1,119, 46,158, 89,219,241,165, 71,207,136,139,103,214,114,206,206,  1,119,174,222,210, 57,117,241, 83,
-114,118,117,232,236, 61, 84, 56,219,100,186,214,247,240,161,152, 97,179,102,190, 41, 13,104, 28,152,127,225, 74, 76,192, 75,150,
- 89,  2, 91, 27, 64,171,  3, 74,148, 64, 66,146,144, 15,104, 28,152,127,237, 70,162,244,187,101,107,  2,203,117,198, 61,  7, 79,
- 40, 15,215,166,157,149,149,165,247,241,241, 25, 58,107,161,226,204,232, 49,238, 82,137,220, 15,154,210, 27,104, 24,224,130, 87,
- 70,132,224,231,223,110,192,193,161,193,195,  8,  6, 33,182,214,230,189,168,168,136,236,218,122,110,210,248,215,222,236,208,167,
-247,  0,238,240,145,191, 68,167,142,238,191,184,246,183, 79,246, 80,161, 86, 65,168,198,198,207,223,247, 78,106,202,189, 49, 93,
-186,244,134,141, 84,209,  4,  8,173,182,192, 86, 14, 28,160,200, 16,  8, 32, 31,255,218,228,151,250,244, 25,204, 29, 57,178, 23,
- 71, 14,110,184, 60,127,126,195,131, 41,217,155, 37,151,174,101,201,135,190, 60,173,244,192,161,187,198, 17,131, 26,221,243,182,
-109,169, 99,213,210, 19, 47,144, 34, 81, 62,103, 48,248,249,246,233, 35, 44, 79, 79, 23,219,121,120,112,  0, 96, 54,155,255,205,
- 84, 85,141, 96,  9,  4,  2, 64, 32,224,173,209,180, 54, 45,229,229,229,224,  1,206, 26,205,194,146,146,134, 79,246, 49, 54,155,
-205, 40, 46, 46,174,220,148, 74, 37,228,114, 57, 74, 31, 77, 26, 90,151,102,151,230,205,215, 47,251,238,187,217,191,173, 94, 45,
-169,106,174, 42, 54,129, 64,128, 57,159,124, 34,153,247,245,215,211,134,139, 68,239,213,231,124, 86,188,172, 11,133, 66,136, 68,
- 34,164,167,167, 35, 35, 35,  3,233,233,233, 72, 79, 79,135,141,141, 13, 40, 33, 60, 43,145,207,193, 96, 85, 92, 60,107, 59,185,
- 91,107,  8, 42,222,  4,158,151,193,210,106,181,199,207,159, 63,223,190,119,239,222,162,203,151, 47,195,211,211,179,210, 96, 85,
-252,172,104,118, 82, 40, 20, 56,116,232,144, 73,171,213,214,186,144,164, 78,167, 59,113,226,196,137, 54, 51,103,206, 20, 79,156,
- 56, 17,241,241,241,152, 50,101, 10,148, 74, 37,212,106, 53,138,139,139, 81, 94, 94,142,246,237,219, 67, 46,151,227,193,131,  7,
-102,157, 78, 87,215, 84,  5,180,160,160,160,204,205,205,205,235,201,127,188,252,242,203, 30,191,252,242, 75,121, 66, 66,130,185,
- 83,167, 78, 14,214, 26,141, 10,182,110,221, 90,105,158,238,221,187,135, 95,126,249,165,178,207,213,141, 27, 55,176,116,233,210,
-202,185,203,234, 25, 85,188, 22, 30, 30,206,153,205,102, 52,105,210,164,162,121, 21, 43, 86,172,224,254, 14,115,101, 45,122,189,
-126,231,132,  9, 19, 62,186,121,243,166,151, 72, 36,170,  8, 93,131,231,121,152, 76, 38, 60,120,240,  0,113,113,113, 72, 72, 72,
- 64, 73, 73, 73,229, 11,192,173, 91,183, 74,205,102,243,246,154,116,221,220,220, 62,253,227,143, 63, 60, 21, 10,197, 99,229, 89,
- 32, 16, 84, 62,116, 36, 18,  9, 10, 11, 11,225,228,228,132,158, 61,123,186,159, 56,113,226, 83,  0,243, 94,132,135,  1, 33,132,
-116,234, 96,215,249,157,105,175,161, 93,107, 77, 82,204,141, 88, 28, 59,248,125,115,224, 97, 39,247,200,214, 17, 73, 87,111,218,
-163, 95,239,217,157, 47, 92,158, 82,107, 39,247, 71,125,168, 14,182,111,223,224,252,222,253,199,127,254,120,230,155, 87, 63, 91,
-240,177,187,222,160,149,135,  6, 89,  4,192, 67,115,117,233,166,173,126,209,130, 55,175, 46, 94,182,158,207, 40, 48,205,184,114,
-165,180,198,209,189, 85, 77,139,179, 29,228,158,126, 51,114, 26,  6,246,104, 20,115, 99, 13, 92, 29, 75, 97,223,164, 19,250,245,
-105,143,227, 39, 98,144,158,173, 71, 65, 65,  1,  0,212, 58,237, 65,194,157, 61,227, 40,161,254,132,146, 12, 34,160,242,113, 19,
-222,136, 26, 48, 96, 48, 61,112, 96, 63,183,119,207,166,243,219, 55,254,176, 83, 32, 17,139,116, 70, 71, 35, 33,122, 21, 47,176,
-143,215,106,139, 31, 62, 60, 37,146,154,151,187,121, 52, 33,107, 88,120,168,231,184,  9, 83, 28,251,247, 27, 66, 15, 30,220,203,
-111,223,182,254,212,246, 53,145,155,120,129, 90,146,155, 89, 46, 83,169,205, 42, 74,164, 78,101,106,190, 60, 63, 57, 72,239, 61,
-224,101, 19,171,150,158,168,  7, 12,134,172,178,204, 76,175,  6, 93,187,202, 30, 44, 88,160,240,104,223, 94, 95,209,133,165, 54,
-131, 37, 20, 10, 65,  1,222, 26, 77,107,211,162,211,233, 64,  9, 49, 63,141, 38,199,113,143,153,171, 10,131,245,232, 89,111, 85,
- 58,191,125,255,253,203,109, 95,123,173,228,210,165, 75, 30, 29, 59,118, 36, 26,141,  6, 26,141,230, 49,147,229,230,230, 70, 26,
-  7,  6, 42,142,228,230,  6,206,179,242,124, 90,147,119,129, 64, 80,227,249,100, 60,133,193,170,136, 96, 89, 99,176,132, 66,161,
- 53,166,192,108, 54,155,225,238,238,142,162,162,162, 26, 43,124,129, 64,  0, 27, 27, 27,104,181, 90,  0,168,117, 36,157, 70,163,
- 89,177,104,209,162,233,221,187,119,119, 13,  9,  9, 65, 97, 97, 33, 60, 60, 60, 32,151,203, 43,251,134, 85,232,197,198,198, 98,
-219,182,109,106,141, 70,179,162,142,124, 47, 95,181,106,213,219,253,251,247,111,224,234,234, 10,103,103,103,220,185,115,  7,206,
-206,206, 80,171,213, 72, 76, 76,132,189,189, 61,  8, 33,208,235,245, 56,123,246,172,134,231,249,229,117,220,152,244,194,133, 11,
- 38,133, 66,113,167,176,176, 80, 88, 82, 82, 34, 42, 45, 45, 21,169,213,106,177, 74,165, 18, 31, 62,124,216,213,209,209,177,252,
-228,201,147,133,254,254,254,194,212,212, 84,161,209,104, 20, 88, 81, 41,226,189,247,222,131, 68, 34,129,193, 96,192,138, 21, 43,
- 48,123,246,236,202, 62, 87,223,124,243, 13,230,206,157, 91, 25, 82,255,243,207, 63,235,107,178, 96, 50,153, 96, 54,155, 97, 54,
-155,173, 50,189,207,130, 53, 70,157, 82,154, 71,  8, 25,216,174, 93,187,163, 59,118,236,112,177,183,183, 71, 90, 90, 26,242,243,
-243,145,159,159,143,194,194, 66,148,149,149,129,227, 56,248,248,248, 32, 63, 63, 31,123,247,238, 85,105, 52,154, 62,181,141, 32,
- 20, 10,133, 19,162,162,162, 68, 79,166,161,226,173,174,194,180,203,100, 50,228,228,228,160,123,247,238,210,211,167, 79, 79,248,
- 95, 55, 88, 21,198,165, 89, 48, 36,131,  6,143,150,180,108,211,183,252,234,245,195,233, 54,132, 75,239, 31,221,100,  7,240,112,
-154,134,171, 55,237,209,178, 77, 95,193,160, 92, 99,123,101,233,111, 45,195,154, 18, 83,109,203,234,  0,128,171, 35, 63,164, 79,
-116,195, 92,  7,  7, 34, 90,180, 96,241,159,191,111, 88,221,238,210,214,127, 77,211,176,104,193,195,105, 26,250, 68, 55,228,226,
- 19,238, 13,  1,176,193, 90,211, 50,112, 96,159,155,127,172,221,134,236,212, 63,189,151,127,110, 35,133,190, 20, 16,135, 32,170,
-131,  3,174,253,156,133,236,236,236, 60,158,231,107,109,198,165,132,250,199,197,199, 54,141, 12, 15,243, 28, 55, 97,178,195,192,
-129, 67,112,224,192, 62,108, 92,191,230,236,136,209,195,127,207, 46, 85, 11,221,197, 10,137,130,242, 82,161,196, 81, 36, 87, 40,
- 10, 76, 57, 57, 15, 31,158, 34,177,  3, 48,146,  7,106,142, 12, 79,157, 60,214,177, 71,244, 16,252,117,112, 31, 54,174,255,237,
-204,103,225, 47,175,105,212,170, 25,105,223,250,219,105,141, 26, 55, 10,208,150,229,171,  5, 68,106,210,235,121,251,111,215,167,
- 45, 75,158, 59, 33,249,102,236,200,239,216, 40,194,199,184,179,177,127,255,118,239, 38, 37, 73,220, 58,119,182,201, 57,117, 74,
- 97,141,193, 18,137, 68,128, 64,192, 89,163, 73,142, 29, 19,  0,168,117,112,149, 68, 34, 65,121,121, 57, 56, 66, 76,214,104,186,
-223,186,149,153,150,150, 22,236,228,228,244,152,185, 42, 41, 41,169,252,172,215,235, 97, 52, 26, 97, 35,151,199, 89,163,153,127,
-246,172,126,238,196,137,243,222,126,235,173, 31,182,110,219, 38,119,116,116,132, 74,165,122,204, 96, 25,141, 70,180,107,223, 94,
-178, 54, 33, 97, 28,128,249,214,156, 79,143,238,221,235,236,239,251,200,176,178, 38,194,250,212,103,117, 53,213, 88, 59,138,176,
-186,138,145, 16, 18,253,196,239,115,251,245,235,167, 79, 73, 73,129,191,191,127,165, 73,169,122, 76,  7,  7,  7, 56, 57, 57, 33,
- 33, 33,  1,107,214,172,209, 17, 66,230,214,166, 89, 82, 82,162,209,235,245,163, 70,143, 30,173,147, 72, 36,  8, 13, 13,173,156,
-255,138,231,121, 72,165, 82,216,218,218, 34, 54, 54, 22, 19, 38, 76, 40,215,235,245,163,158,156,  3,235, 73,205,180,180, 52,149,
- 86,171,125,245,213, 87, 95, 45,191,119,239, 30,162,162,162,112,251,246,109,148,149,149,161,172,172, 12,169,169,169,  8, 11, 11,
-131,209,104,196,206,157, 59,117, 90,173,246,213,180,180, 52, 85,109,154, 26,141,102,208,146, 37, 75,132,  7, 15, 30,108,228,235,
-235, 27,222,182,109,219,144,158, 61,123,  6, 13, 27, 54, 44,160,127,255,254, 94,193,193,193,250, 62,125,250,184,245,235,215,207,
- 77, 40, 20,138,147,146,146,114, 41,165,253,106,211,172,106, 74,238,221,187, 87,217, 36, 40, 18,137, 80, 84, 84, 84, 57,211,126,
-197,195,168, 58,  3, 92,147,102, 85,147, 93, 97,172, 42,140, 86, 93,207,254,234, 52,  9, 33,117, 86, 24, 82,169,180, 34,194, 73,
-235,210,164,148,222,186,123,247,110,175,174, 93,187,222,154, 52,105,146, 38, 47, 47, 15,246,246,246,  8, 12, 12, 68,211,166, 77,
-225,234,234, 10,147,201,132, 61,123,246,104,247,238,221, 27,163, 82,169,186, 63, 57,  7,214,147,154,  2,129, 32,181,186,135,107,
- 69,244,170,194, 96,201,229,114,248,248,248, 84,156,219,212,250,156,207,167,140, 44,253,189,154,143,140, 75,207, 30,125, 26,247,
- 31, 48,212,113,239,254,125,138, 31, 87,174,187,219,101,200,244, 85,174,  1,179,118,187,  6,204,218,221,101,200,244, 85, 63,174,
- 92,119,119,239,254,125,138,254,  3,134, 58,246,236,209,167,113,124, 92, 66,200, 99,235, 18, 86,147, 78,133, 84,214,190, 75,167,
- 96,229,217, 11,103,185,197,203,214, 91, 58,189,212,255,202, 15, 63,172,218,254,195, 15,171,182,119,122,169,255,149,197,203,214,
- 91,206, 94, 56,203,117,233, 20,172, 84, 72,101,237,173,201,251,212,201, 99, 29,  7,244, 31,130,  3,  7,246,112, 91, 54,174,248,
-102,223, 17, 99,215,151, 39,235,243,211, 83,111, 80,148,175,131,155, 67, 12, 50, 50, 50, 84, 28,199,117,175,174,131,123,117,154,
- 83,222, 28, 91,213, 92,157,115,241,140, 90,125,247, 46, 44,199,142,253,105, 62,113,226,166,238,220,173,  2,213,245,248,162,146,
- 98,181, 62, 69,171, 81, 27,121,158,  7,229, 45,194,133, 11, 65,106,187, 70,157, 58,117,195,201,227,155,177,126,221,175, 42,158,
-135,254,229, 29, 59, 44, 35, 71, 46,160,  1, 13, 27,  6,108,218,186,153, 12, 28, 60,212,145,  2,252,160,225, 67,156,182,108,219,
- 66, 26, 55,105,220, 48, 48,240,225,212, 52,255,147,101,233,111,208,156, 79,105,169, 58, 61,253,204,141,159,126, 50,120,140, 26,
-213, 64,234,225,225,  0,158, 39, 21,207,247,154, 54,145, 72,244, 88,196,165, 54, 77,143,  6, 13,178,143, 28, 57,130,144,144, 16,
-248,248,248, 60,214,229,165, 98, 34,109, 87, 87, 87, 28, 59,118, 12, 20,184,110,141,102,152,183,247,141,159,127,250,201,200,243,
- 60, 74, 75, 75,255, 45,122, 85, 90, 90, 10,158,231,113,246,204, 25,163,170,172,108,189,181,121,111,111, 52,150, 13,109,211,230,
-235,241,227,199,155, 82, 83, 83,193,243, 60,170, 70,178, 10, 10, 10,160, 80, 40, 80,174,211,249,121,120,120, 40,172,209, 44, 56,
-124,216, 22,117, 60,215,  5,  2,193, 99, 77,132,127,199,117,255, 71, 69,176, 56,142,131,159,159,223, 99,243,140,  8,  4,130,199,
-182,250,140, 32,204,206,206,222,224,225,225,113,100,220,184,113,243, 90,182,108, 57,117,198,140, 25,194,198,141, 27, 67,165, 82,
-193,217,217, 25,238,238,238, 72, 77, 77,197,153, 51,103, 44, 74,165,114,149,197, 98,249, 60, 63, 63,191,208, 10,221, 83, 62, 62,
- 62,  3,123,247,238,189,237,237,183,223,118,236,218,181,171,216,219,219, 27,  0, 16, 23, 23,135, 67,135, 14,153,182,108,217,162,
-214,235,245,163,172,153,197, 29,  0,114,115,115,143,122,121,121,141,152, 48, 97,194,166, 97,195,134,217,235,245,122,113,106,106,
- 42,140, 70, 35, 56,142, 67, 73, 73,137,233,204,153, 51,101,229,229,229, 99,115,115,115,143, 90,161,119,131, 16, 18,102, 50,153,
- 38,220,188,121,243,203, 17, 35, 70,184,188,244,210, 75, 18,142,227,112,254,252,249,194, 86,173, 90,185,171,213,106,211,133, 11,
- 23,138,245,122,253,220,156,156, 28,171,150,202, 33,132, 64,173, 86,195,213,213, 21,  6,131,  1, 60,207,195,104, 52,194,206,206,
-174,114,121, 35, 74,233, 83,247,145,227, 56, 78,104, 50,153, 48,122,244,104,240, 60,143, 21, 43, 86,128,227,184,122,139,217,217,
-217, 93,143,139,139, 27, 24, 30, 30, 94,105, 90, 42,202,144, 76, 38,131,171,171, 43, 92, 92, 92,112,252,248,113,  8,133,194,235,
- 86, 70,215,110,  3,104, 69,  8,121, 41, 38, 38,102, 60,128,150, 38,147,201,199, 98,177, 16,129, 64,144, 75, 41,189,163, 86,171,
-127,183,118,169,156,130,130,130, 47, 95,123,237,181, 86,155, 55,111,182, 19,137,254,117,107,136, 68, 34,200,100, 50,184,187,187,
-195,209,209, 17,148, 82, 24,141, 70,124,250,233,167,106,173, 86,251,229,139,242, 48,104,211,182, 61,126,251,229,123,187, 19, 39,
-143, 20,222,189,143,125, 85,167, 98,176,  3,112,225,242,148,125,202,210,223, 90,230,100,102,218,181,105,219,222, 42, 77,163,133,
- 43, 30, 53,118,149,223,163,165,114,190, 76, 77, 73, 95,190,121,221, 27,201,  0,240,221,178, 53,129, 25,  5,166, 25,241,  9,247,
-134,172, 92,117,186,189,209,194, 21, 91,163,249, 47,211,178, 73,  5, 10,125,118,118,246, 21, 95, 95,223, 70, 81, 67, 76,115, 67,
-130,200,224,252, 34, 62,155, 16,242, 78,118,118,118,178,181,121,239,220,169, 43, 78, 30,221,130,141,235, 55,169, 41, 47,212,187,
-186,186, 82,  0,184,123,215,149,222,189,171,164, 64,197,124,141, 78, 90, 55, 69,225,231,115,231, 76,157,169,209,104,150,255,252,
-109,237, 19,206, 54,111,209,  1,205, 91,116,192,244,119, 62,113, 12, 11, 15,245,  7,128, 29, 59,168, 37, 34,152,252, 57,239,179,
-  5,131, 63,255,124,  1,212, 26,  3, 62,255,252,225,178, 58,137,177,241,127, 37, 37, 81, 35,171,154, 30,103, 30,199, 93,193,204,
-153,193,229, 37, 37,110,157, 63,250,200, 85,244,237,183,130,234, 58,185, 87, 68,176,170,222,191,214,104, 30, 62,113,226,175, 15,
-102,206,204, 94,250,237,183,125, 22, 47, 89, 98,211,172, 89, 51,228,229,229, 33, 52, 52, 20, 62, 62, 62,184,112,225,  2,142, 28,
- 60,168, 45,211,233,230,122,122,122,174,180, 70,243,199, 45, 91, 18,187,244,232, 81,180, 97,195,  6,239, 30, 61,122, 16,173, 86,
- 11,149, 74,  5,149, 74,  5,131,193,  0,137, 68,130,236,236,108,154,145,153,121, 55, 43, 43,107,149,181,121,183, 20, 22,202,103,
-101,100,100,137,214,173, 91, 50,101,242,228,217, 51,103,205,146,249,250,250, 18,131,193, 80, 25,197, 50,153, 76, 80, 40, 20, 38,
-141, 70,227,  2,160,220, 26, 77,217,159,127,114,197,197,197,112,113,113,169,156,118,169,234,188,130, 90,173, 22,148,178, 73,112,
-235,245,162, 80, 83, 29, 30, 26, 26,122, 93, 36, 18,249, 86,141,102,213,244,179, 74,101,156, 21, 27, 27,219,166,170,195,165,148,
- 86,219,223,201,215,215, 55,144,231,249,175, 94,122,233,165, 17,111,190,249, 38, 57,115,230, 12, 78,158, 60, 73,179,178,178,118,
- 10,  4,130,185, 89, 89, 89,201, 53,189,217,212,164,217,160, 65,  3,123,123,123,251,247,109,109,109,163, 43,166, 98,144,203,229,
- 49, 90,173,246,184, 70,163, 89, 81,211,236,237,181,105, 54,110,220,216,129,231,249,247,108,109,109,123, 21, 21, 21,181,  4,  0,
- 87, 87,215, 91, 90,173,246,152, 64, 32,248,190,166,  5,164,107,211,244,246,246,182,177,179,179,251,178, 65,131,  6,175,190,249,
-230,155, 46,103,206,156,201,189,117,235,150, 68,173, 86,111,230, 56,174,198,197,158,171,211, 12, 11, 11,123,108, 45,194,231,121,
-141,  0,160, 69,139, 22,  7,  6, 13, 26, 52, 96,236,216,177, 48,155,205, 88,185,114, 37,142, 29, 59,246,215,253,251,247,  7,214,
-246,246,249,164,166,167,167,167,171,143,143,207,233,113,227,198,  5, 12, 29, 58, 84,225,224,224,  0,161, 80,  8,173, 86,139,148,
-148, 20,220,185,115,135, 30, 59,118,172, 44, 46, 46, 46, 75,167,211,117,203,203,203, 43,178,246,124, 62,203, 91,242,147,154, 98,
-177,184,171,159,159,223,214,249,243,231,219,247,234,213,203,198,197,197,  5, 66,161, 16,102,179, 25,185,185,185,136,141,141,197,
-145, 35, 71,180, 59,119,238,212, 22, 23, 23,143,166,148,158,249, 79,164,243,121,106,134, 53, 37,159, 61,177,128,115,141,179,179,
-215,182,175, 53,233, 28, 16,237,220,127,196,136,182,209,  0,176,107,215,181,227,127, 29, 47, 61,248,180,233,172, 43,173,214,104,
- 54, 11, 22,206,143,139,143,125,108, 34,202,240,176,136,123,205, 34,135,127, 97,141, 86,197, 76,238, 79,230,189,202,236,248, 85,
-222,  8, 30,111, 78,173, 88, 16,250,147,185,115,240,213,151, 95, 99,223,142, 61,127,197, 39,209,  3,255,203,101,233,239,212,172,
- 88,156, 88,225,229,213,101,139,171,235,156,163,199,143,219, 85,125, 81,171,136, 52, 87,125,153,108,217,178,101,193,173, 91,183,
- 60,172,209, 28,248,227,143, 38,189,189,189,108,241,170, 85, 93,203,141,198,174,179,102,205, 18,221,184,113,  3, 91, 54,109,226,
-116,153,153,155,242, 44,150,247,170,107,253,168, 77, 51,232,131, 15,228, 95,109,222, 60,177, 97,227,198,238, 67,134, 12, 17, 11,
-133, 66,104, 52, 26,228,228,228,224,226,133, 11,198,148,212,212,248,242,242,242,193, 89, 89, 89, 57,214,106, 14,252,241, 71,147,
- 83, 96, 32, 20,110,110,244,194,165, 75,142, 31,206,159, 63,213,211,203,203,177,115, 84,148, 88,161, 80,160,180,180, 20, 25, 25,
- 25, 56,119,238, 92, 65,114,114,178, 55,165,212, 98,141,230,254,152,152,230, 39,175, 92,121,249,195, 15, 63,148,134,132,132,192,
-222,222, 30, 26,141,  6,241,241,241,184,120,241,162, 97,235,214,173, 42,173, 86, 59, 53, 51, 51,115,255,223,117,221,255, 49,  6,
-235,255,235,198,243,244,244,108, 35, 16,  8, 62,123,212, 28,181,168,174, 53,253, 94,164,135,142,151,151,151,191,179,179,243,111,
- 58,157,142, 26, 12,134, 41,185,185,185, 25,255,109,233, 36,132,136,218,180,105,243, 75, 65, 65,193, 75,148, 82, 56, 58, 58, 94,
-140,139,139,123,139, 82,202,213, 87,147, 16, 34,244,244,244,124,201,214,214,182,189,173,173,109, 87,147,201,212,236, 81, 63,188,
-187,229,229,229,103,204,102,243,149,188,188,188,139,148, 82,203,127, 50,239,132, 16, 33,128, 94,222,222,222,111,240, 60,223,132,
- 16,226,100,177, 88, 96, 54,155,149, 60,207, 63, 80,169, 84,107,  0, 28,251, 79,167,243,121,105,134, 55, 33,195,168,  0,205,106,
- 50,  2,143, 25,154, 39,140,  3,225,113, 55,238,  1,221, 99,109, 58,  9, 33,130,161,253,220,150,  2, 15, 71, 26,214,181,228,208,
- 99,  6,203, 10,211, 82,111,115,217, 68,244, 26, 37,212,255,241,135, 34,201,  8,109, 62,108,227,179, 24, 44,107,  9, 15, 33, 93,
- 65,241, 18, 79,113,229,238,125,122,242, 69,125,214, 61, 79,205,175,  9,105,176,163,105,211,139,  2,145,200,147, 16, 34,  0,  0,
- 34, 16,240, 60, 96,129, 64,192, 85,109, 22,172,250, 66, 89,151,166,  9,136, 20,203,100,126, 22,142,243, 40,145, 72,236, 46,216,
-218,182, 54,  0,101,158, 22,203,103,199,139,139, 19,159, 38,157, 38, 32, 82, 40,147,249, 95,176,183, 31,162,116,118,110, 94,106,
- 50,185,  1,160, 54, 54, 54,119,203,202,203,215,167,165,165,253, 92,205,162,234,117,106, 74,100, 50, 95,203,163,145,135,  2,145,
-168,224,136, 76,230, 87,232,230, 54,190, 92,167, 11,144,203,229,102, 74,169,218,100, 50,141,205,200,200, 56, 81,159,188,103,  8,
-133, 97,119,236,237,163, 44, 14, 14, 46,102, 66,108,141, 22,139,201,100, 54,103, 26, 12,134, 24,161, 80,184, 44, 43, 43, 43,233,
-239,188,238, 47, 28, 21,163,205,254,142, 13, 64, 52,211,100,154, 76,147,105, 50, 77,166,201, 52,255,126, 77,119,119,119,133,167,
-167,167, 63,  0,225,255, 98,222, 95,180, 77,196, 44, 38,131,193, 96, 48, 24,255,251,228,231,231,151,163,154, 62, 87,140,255, 80,
- 19, 33,128,232, 26, 34, 91, 86,135,254,158,102, 52,129, 21, 77,  9, 76,147,105, 50, 77,166,201, 52,153, 38,211,124,193, 52,235,
-210,126, 97,154, 30, 89, 19, 33,211,100,154, 76,147,105, 50, 77,166,201, 52, 89, 19,225,243,221,  4, 96,212,228,172, 61,  8, 33,
- 30,207,123, 95,198,139, 93, 22,170,249,174, 15, 33,196,167,158,251,123,177,179,206, 96, 48, 24,255,219,252,191,247,193,170,168,
-168, 40,165,249,207, 99,191,231,253,221, 71,223,255,154, 16,124,248,232,243, 55,148,210, 57,207, 99,223,186,240,246,246,246,107,
-208,160,193,107,174,174,174,157,138,139,139,207,230,230,230,174, 45, 42, 42,202,173,199,247,131,229,114,249, 91,  2,129, 32,  2,
-  0,120,158,143,213,235,245,191,228,228,228,220,127, 14,215,141,  0,152, 44,147,201, 94,113,118,118,110, 82, 82, 82,242,192,104,
- 52,238,  0,240,235,211,204, 58,237,229,229,213,218, 98,177,188,139,135, 35, 89,127, 45, 44, 44,188, 96,237,119, 61, 34,134,110,
-167, 64, 48,  0,  1, 79,248,151,  5, 84,176, 19,  0, 79,128,251,249,177,123, 95,121,206,229,245,169,175,111,125,191, 75,  8, 89,
- 70,128,247, 65, 64,159,181, 44, 49, 24, 12,  6,227,127,200, 96,249,248,248, 76,  0, 48, 27, 15,103,218,254, 46, 59, 59,123,253,
-223, 81, 89, 61,199, 74,109,  5,165,116, 86,253,163, 21,248,144,231,169,  0,  0,  4,  2,242,145,135,135, 71,132, 72, 36, 50, 60,
-185, 47,199,113, 50, 66,208,151,231, 41,121,180,239,135,132,144,239,159,198,216,185,184,184,120,143, 25, 51,102,211,231,159,127,
-110,163, 80, 40,144,145,145, 49,116,206,156, 57,209,222,222,222,227,115,114,114, 50,235,250,126,227,198,141,199, 68, 54,111, 57,
-115,206, 39,159,217,185,185,187,219,114,156,197,148,153,157,165,248,246,235, 69,237, 27, 55,110,252,125, 74, 74,202,150,250, 24,
- 41,145, 72,244,138, 92, 46, 15,210,235,245, 73, 28,199,237, 20, 10,133,125,190,252,242,203,136,254,253,251,203,213,106,181,148,
-227,184, 38, 27, 55,110,156,249,199, 31,127,244, 35,132, 12,169,109,184,125, 69,  4,135, 82,154, 93,229,220,189,117,227,198,141,
- 30, 98,177,152, 60, 90,180,249, 66,109,251, 87,133,  2,193,113,231,119, 68,  2, 64,120,231,145,247,226,206,239,192,163,207,207,
-253,101,224,201,178,224,236,236,188,185,180,180, 52,190, 46, 35, 95,221,119,  9, 33, 63, 80, 74,243,188,189,189, 59,  1,120,235,
-209,174,191,228,228,228, 92, 32,132,120,202,101,178,247,117,122, 61,  1, 64,158,165, 44, 49, 24, 12,  6,227,127, 47,130, 53,231,
-222,189,123,246,148, 82,132,132,132,124, 12,192,106,131,245,100,133, 35, 20, 10, 62,238,213,171,215, 68,153, 76,246, 88,197,108,
- 48, 24,  4,  2,  1,113,183, 88, 30,254,185, 62, 21, 77,197, 49,140, 70,131, 64, 44,150, 66, 40, 20,204,108,217,178,101,191,252,
-252,252, 67, 50,153,236,155,212,212,212,130,167,137,220,172, 95,191,190,149,139,139,203,191, 25,136,226,226, 98, 65,191,126,125,
- 73,125,244, 38, 18, 34, 51,200,100,237, 37,132,120, 89, 56,206,  9,  0, 68, 34, 81,105, 19, 15,143,174,159,206,153, 99,243, 72,
- 23,101,101,101,120,237,181,215, 20, 15, 30, 60, 24, 11,224,171, 58, 34, 87, 77, 91,180,106, 51, 99,203,230, 77,205,212, 37,165,
-250,213,203,127,189,161, 19, 73,202, 27,133,133, 74, 22,125,189,204,249,211,143,102,190,227,237,237,125,171,186,101, 67,158,200,
-171,  0,192,158,247,223,127, 63,124,224,192,129, 82,141, 70, 35,215,233,116, 13, 55,109,218,244,105,155, 54,109,236, 90,182,108,
- 41,221,186,117, 43, 81,169, 84,160,148, 42, 66, 67, 67,233, 43,175,188,162,223,182,109,219,116,  0, 63,212,199, 44,243, 60, 47,
-172,174, 28, 90, 99,174,  9,112, 63,188,243, 72,128,160, 73,220,249, 29,242,240,168,145,122, 80, 60, 32,192,253, 71, 47,  2,159,
-  3, 85,230,117,122,156,187,217,217,217, 79,181,118,224,128,  1,  3,  9,165,116,143,183,183,247,137,162,162, 34,123, 66, 48,186,
- 30,209, 41,226,230,230,246, 14,128, 79, 40,165,239,159, 58,117,170, 35,  0,116,239,222, 93,  2,224,130,163,163, 99, 79,163,193,
- 64,216, 35,137,193, 96, 48,254,129,  6,139, 82, 42,  3,128,115,231,206,129, 82, 42,127,154,160, 64,213, 95,102,205,154,  5, 23,
- 23,151, 39, 77, 11, 78,158, 60, 81,227,119,234,123,140,175,191,254,218,169,160,160, 96,244,239,191,255, 62,212,211,211,243,237,
-188,188,188,195,117,228, 49,159, 16,242,205,163,136,  3,145,203,109, 74, 39, 77,154,116,241,209,255,154,253,249,231,159,246,131,
-  6, 13,210, 16, 66,238,  2,128, 92,110,211, 85, 40, 20, 56, 83, 74, 41,165,248,166, 54, 35, 56,146,144, 64,169, 84,218, 99,202,
-143, 63,114,173,  7, 13, 18,217,186,185, 17,  0, 72, 79, 72,112,253,225,167,159,186, 40, 51, 51,101, 34,123,251,178,252,210, 82,
-227,189,123,247, 32,151,203,137, 64, 32,232, 84, 87,134, 21, 10,197,187,179,102,127,108,171, 46, 81,234,244,106,141, 81,200,153,
- 13,246, 54, 10, 75,126, 94, 65,177,157,141,109,249,228,183,223,149,206,255,100,246,187, 85,162, 38, 53, 49,125,230,204,153,205,
-218,181,107,231,179,125,251,118,162, 82,169, 32, 18,137,236, 90,182,108,137, 54,109,218, 88, 78,158, 60, 73, 26, 53,106,132,136,
-136,  8,156, 63,127, 30, 23, 47, 94, 36,173, 90,181, 82,236,222,189,123, 92,117,  6,171, 58, 83, 61,102,204,152,137, 82,169,148,
-239,218,181, 43,222,120,227, 13, 80, 74,209,170, 85,171, 78,227,198,141,203,213,233,116, 86,153,235,138,102, 64,247,136,161,119,
-  0, 68,130,226, 65, 65,236,222,230, 85,118,105,150,152,152,216,161,180,180,180,178,179, 97,197,194,226, 93,186,116,169, 79,121,
-207, 39,132,124, 51,104,208,192,143,  1,130,232,232,232,178,233,211,167,211,196,196,196,222, 67,135, 14,105,116,255,254,131, 26,
-211,249,100, 57,154, 58,117,154, 86, 44, 22,191,230,237,237, 29, 79,  8, 17,139,197,226,138,115, 36,106,216,176,161, 71,100,100,
-228, 28, 47, 47,175,114,161, 64,160,160,168,187, 44, 49, 24, 12,  6,227,  5, 50, 88,132,144,156,219,183,111, 55, 44, 47, 47,  7,
- 33, 36,199,138, 10,234,120,213, 10, 71, 36, 18,253, 38, 20, 10,166,  0, 64,219,182,237,180, 75,150, 44,169,174, 89,137,111,219,
-182,157, 86, 40, 20,216, 62,172,188,132,191,114, 28,151, 95,157,102, 13, 21,226,183, 82,169,236,  3,  0,196,215,215,175,108,223,
-190,125,252,136, 17, 35,240,237,183,223,202, 62,254,248,227,159, 27, 54,108,216, 61, 45, 45, 45,189,166,116, 62,250,125,142,135,
-135, 71,196,250,245,235, 91, 77,154, 52,233, 98,118,118,246,240, 71,145,145,221,  0, 58, 16, 66,238, 86,253,219,238,221,187, 95,
-154, 48, 97,194,205,252,252,252, 57, 53,105,142, 32, 36, 40, 32, 52,180,199,231,103,207, 82,129,193, 64,138,206,157, 83,151, 20,
- 22,154,146,138,138,108, 55,199,196,140,254,112,225, 66,137,167,143, 15, 46, 28, 61,106,159,167, 84,106,148,229,229,198,212,212,
- 84,222, 98,177,156,176, 34,239,225,110,174,174,138, 95,151,173,188,102, 47, 22,242,238,190, 62, 68,220,160,129, 72,160,112,144,
- 10, 69,  2, 67,163,134,129, 82,  0,225,117, 93, 35,137, 68, 50,174,119,239,222,138,109,219,182,145,136,136,  8, 56, 57, 57,225,
-220,185,115,184,117,235, 22, 74, 75, 75,  5,102,179, 25,109,219,182,197,146, 37, 75,224,239,239, 15,165, 82,137,140,140, 12, 87,
-169, 84,234, 86,203,249, 36, 85,202, 15, 62,250,232, 35,184,185,185,193,108, 54,163,164,164,  4, 22,139,  5,182,182,182,  0,128,
-188,188, 60,236,219,183,183,206,178,100,165, 57, 66,199,142, 29, 43,141,112,213,  8, 86,125, 52,125,124,124,206, 21, 22, 22,141,
-236,209,163,  7, 74, 74, 74,184,  5, 11, 22,160, 69,139, 22,104,218,180,169, 53,101,126,142, 76, 38,251, 35, 32, 32, 96,221,212,
-169, 83, 27, 58, 59, 59,195, 96, 48, 44, 45, 46, 46,198,135, 31,126,  8,  0,104,215,174, 93, 91, 74,233,173, 73,147, 38,161, 97,
-195,134,154,188,188,188,162, 59,119,238, 12, 85, 42,149,119,158, 54,239, 86,158, 31,166,201, 52,153, 38,211,252,175,210,252, 71,
- 27, 44,  0,249, 62, 62, 62, 13,109,108,108,  0,160,222,111,215, 28,199, 77,117,119,119, 23,124,250,233,167,131, 26, 55,110,204,
- 79,159, 62,253, 66,106,106,234, 99, 29,103, 26, 53,106,180,227,167,159,126,234,148,146,146, 82,254,197, 23, 95,252, 89, 80, 80,
- 48,173,158, 23,253, 35, 66,200,114,  0,200,204,204, 44,222,187,119,111,212,217,179,103,191, 94,190,124,185,239,244,233,211,101,
-211,167, 79,255,  8, 64,157,154, 34,145,200, 80, 93,179, 96,117,184,184,184,240,213,245,209,170, 96, 16, 33, 54, 14, 82,105,247,
-207,207,158,165,198,180,180,242,109, 63,255,108,179,234,218,181,121,102, 74,189, 60, 60, 60,132, 93, 59,119, 54,216, 75,165,154,
-252,156, 28,222,217,215,151,164, 36, 37,217,153,133, 66,211,225,195,135,203, 10, 11, 11, 55, 89,145,  4, 53, 79,169,209,206,215,
-223,252,242,208, 94, 17,215,174,220, 74,176,119,119, 21,180,106, 25,209, 60,225, 94,218, 13,240, 22, 19,  0,117, 93, 34,142,142,
-142, 77,139,139,139,161, 86,171,225,230,230,134, 21, 43, 86,192,211,211, 19,229,229,229,136,139,139,163,190,190,190,228,236,217,
-179,240,245,245, 69, 97, 97, 33,140, 70, 35, 52, 26, 77,129,193, 96,208,213,100,120, 69, 34,209, 31,  2,  1,153, 68,  8, 65, 72,
- 72,168,118,249,242,229, 60,165, 20,205,154, 53,195,240,225,195,177,107,215, 46,196,197,197, 85, 68,154,248,160,160, 38, 90,129,
-128,216,  2,224,159, 37,138,195,243, 60,170, 26,225,250,226,237,237,109,  3,224,195,224,224,224, 81,175,190,250, 42, 39,145, 72,
-160,213,106,161,211,233, 16, 27, 27,203, 13, 24, 48,176,108,208,160,129,118,127,253,245, 87,173,233, 52, 24, 12, 73,  1,  1,  1,
- 35,102,204,152,113,244,215, 95,127,117,153, 59,119, 46,120,158,175,220, 56,142,171, 92,148,123,239,222,189,120,240,224,193,156,
-170,230,138,193, 96, 48, 24,255, 12,131,245,204,136,197,226,207,255,250,235,175,222, 95,125,245,149,184,103,207,158,157,188,189,
-189, 95,202,201,201,185,248,168, 82,123,169,127,255,254,157,220,221,221,241,253,247,223, 27,197, 98,241,231, 79,233,172,171, 86,
-118,167, 60, 61, 61,167,239,222,189,123,255,148, 41, 83,224,229,229,213,254,255, 59,207, 14, 50, 89,171, 73, 43, 86,112, 98,179,
- 89,176,245,215, 95,101, 95,157, 56,177, 98,219,246,237,226,118,109,219,130,  2,136,143,139,147,125,243,227,143,178,145,  3,  7,
- 22,196, 61,120,128,195,199,143, 27,149, 37, 37, 57,133,106,245,236,252,252,252, 66, 43,140,235,165,148,212, 20,239,168,174, 29,
-125,206, 92,141,189,245,242,208,254, 61,196, 34,  1,121,144,150,117,221,203,211,213,241,226,249,243, 58,142,227, 46,213,165,163,
-213,106, 83, 57,142,107, 64, 41,117, 59,125,250, 52,220,220,220, 80, 90, 90, 10,179,217, 12,163,209,104, 44, 47, 47,151, 23, 23,
- 23, 67,175,215,195, 96, 48,192,193,193,  1, 49, 49, 49,249, 28,199,157,172, 37,109,111, 16, 66, 22, 80, 74, 17, 31, 31,159, 13,
-  0,126,126,126, 97, 78, 78, 78,199, 42, 22, 80, 62,123,246,108,239,172,172,172,184, 42,145,174, 90, 59,185, 91, 27,193,122, 90,
-188,188,188, 90,203,229,242,111, 62,254,248, 35,239, 22, 45, 90,160,176,176,  8, 60,207,195,206,206, 14, 58,157, 14,246,246,246,
-232,212,169, 83,222,130,  5, 11, 82, 40, 69, 63, 74,105, 94,109,122,233,233,233,121,254,254,254,163,167, 76,153,242, 99,112,112,
-112, 83, 74, 41,130,131,131,209,187,119,111, 28, 58,116,  8,247,238,221, 67, 89, 89, 25,119,245,234,213,213, 57, 57, 57,219,216,
- 99,137,193, 96, 48,152,193,170, 55,217,217,217,217, 62, 62, 62, 27,110,222,188, 57,233,149, 87, 94,193,169, 83,167,230,  2,232,
-  7,  0,114,185,124,238, 43,175,188,130,155, 55,111,226,238,221,187, 27,178,179,179,179,159,199, 49,165, 82,169,214,104, 52,226,
-209, 49, 20,245,172,168,155, 61,106, 26,  4,165,180, 89, 77,127,171, 13,129, 72,228, 21,217,183,175,168,244,214, 45,245,242,243,
-231, 23,109,217,186, 85,220,190, 93, 59,152,204,102,240, 22, 11,252,252,253,209, 35, 58, 90,182, 97,251,118, 91, 78,171,189,240,
-217,123,239, 29, 90,249,218,107,101,151,203,202, 30, 88,147, 70,173, 86,251,195,103,159,124, 20,189,109,251, 46,159,176,208,160,
-  6,135,143,158,186,233,226,226,168,104,218,164,137,173, 82,169,178, 44, 91,250,149,168,172,172,236,199,186,116,116, 58,221,158,
-227,199,143, 15,245,243,243,115,139,141,141,133,209,104,132,197, 98, 65,207,158, 61, 43,250,223,241, 34,145,  8,  9,  9,  9, 48,
-153, 76,  5,247,239,223,207,121,240,224,129, 12,192,226, 58,206,225,147,215,113,210,128,  1,  3, 96, 54,155,209,187,119,111,236,
-221,187,247,117,  0, 51,106,217,255,169, 12, 86,213,235,  4, 43, 59,183,123,123,123,247,106,210,164,201,247, 75,150, 44, 17,248,
-250,250,130,231,121, 56, 59, 59,163,188,188, 28, 69, 69,197,  8, 11, 11,131,159,159, 31, 22, 47, 94, 12,  0, 91,235, 50, 87, 21,
-100,100,100,220,  5,208, 61, 40, 40, 72,170,215,235, 59, 69, 71, 71,111,236,217,179, 39,110,222,188,137,139, 23, 47,246, 32,132,
-228,233,245,122,179,143,143,207, 44,  0, 78,148,210,223,172, 25, 61,202, 96, 48, 24,140,255,113,131, 21, 20, 20,100, 47, 22,139,
-186, 77,155, 54,213,206, 98,225, 33, 22,139,186, 55,108,216,208, 49, 45, 45, 77,245, 20,149,223,247,155, 54,109,122,117,217,178,
-101,178,  1,  3,  6, 52,247,242,242,234, 13,  0, 35, 71,142,108,238,224,224,128, 77,155, 54, 25, 40,165,223, 63,175, 76,114, 28,
- 55,180, 77,155, 54, 40, 41, 41, 65, 90, 90,218,197,250,124,247,207, 63,255,180,  7,208,161,174,191,213,122,124,163,209,217,201,
-199, 71,144,125,234,148,169, 68,173,246,174, 48, 87,  2,129,  0, 37, 37, 37, 72, 79, 75,131,131,189, 61,226, 19, 19,101, 43,223,
-125,119, 91, 64, 68,132,216, 98, 52,186, 88,171, 95, 88, 88,168,245,244,244,156, 56,239,179, 79,247,252,248,211, 79,110, 74,181,
- 58,201,198, 70, 97,144,201, 36,158,243,230,205,181,168, 84,170,  9, 69, 69, 69,101, 86, 72, 45,222,188,121,115,223,190,125,251,
-222,241,247,247,119, 47, 44, 44,244, 84,169, 84,180,164,164,132,224, 97, 95, 42,  2,  0,119,238,220, 65, 90, 90, 26,103,177, 88,
-206,  2,248,156, 82,106,180, 54,173,222,222,222, 46, 29, 59,118, 28,230,238,238, 94,217, 20,217,178,101,203, 97,222,222,222, 95,
-230,228,228, 20, 63,207,194,125,236,216, 49,123, 74,105,  7, 74, 41,250,246,237,107,237,215,222, 26, 56,112,160,128, 16,  2,157,
- 78,  7,153, 76,  6, 91, 91, 59,216,219, 59,160,105,211, 16,100,103,103,163,119,239,222,150,164,164,164, 45, 18,137,228,135,250,
-166, 73,167,211,141,233,212,169,211,194,105,211,166,129,231,121, 12, 25, 50,  4,153,153,153,235, 82, 82, 82,214,248,250,250, 78,
-155, 52,105,146,135,139,139, 11,102,205,154,165,168,106, 58, 25, 12,  6,131,241,  2, 26, 44,111,111,239,104,103,103,231,165, 78,
- 78, 30,118, 71,142, 28, 21,  1, 64,215,174, 93,108,205,102,238,146,183,183,247,199, 57, 57, 57,127,214,231,160, 57, 57, 57,197,
-222,222,222,191, 94,188,120,241,189,225,195,135,227,216,177, 99,159,  0,192,240,225,195,113,241,226, 69,164,164,164,252,250,188,
- 42, 91, 31, 31,159,  9, 93,187,118,125,187, 93,187,118, 56,112,224,  0, 44, 22,203,193,250,124,191,234,136,193,234, 70, 17, 86,
-252,205, 42, 49,161, 16,132, 16, 88, 44, 22, 80,158, 71, 81,113, 49, 18, 18, 19, 81, 90, 90, 10,139,197,  2, 93,121,185, 57,184,
-113, 99,173,202,104,116, 32, 15,231, 26,179,154,188,188,188,244,160,160,160,140,114,189,206,221,197,185,129, 78,161,144, 65,163,
- 41,147,196,220,185, 85,150,149,149,149,100,165,241, 53, 18, 66,186, 30, 58,116,104,158, 80, 40,124,197,199,199,  7, 35, 71,142,
- 36, 61,123,246,132, 84, 42,133, 94,175, 71,105,105, 41,254,252,243, 79,112, 28,215, 24,  0,220,220,220, 60, 26, 54,108,184, 75,
- 32, 16,228,167,164,164, 76,170,235, 24,132,144,241,131,  6, 13, 18, 27,141, 70, 44, 90,180,  8,243,231,207, 71,191,126,253,196,
- 55,110,220, 24, 15, 96,217,243, 42,216, 60,207,163, 87,175, 94, 85, 59,185,223,173,235, 59,221,186,117, 19,  9,133,194,144,160,
-160, 32, 20, 22, 22,162,176,176, 16,110,110,110,240,246,246,134,187,187, 59,150, 45, 91,134, 21, 43, 86, 92,165,148, 46,206,203,
-203, 75,168,111,154,252,252,252,102,189,246,218,107,179, 70,141, 26,  5,141, 70,131,139, 23, 47,162, 83,167, 78, 88,178,100,137,
-239,185,115,231, 22,182,105,211,  6, 18,137,  4,167, 79,159,  6,199,113,169,236,241,196, 96, 48, 24, 47,168,193,242,241,241,105,
-192,243,252,151,  3,  7, 14, 28, 52,108,216, 48, 44, 89,178,184,138, 87, 16, 97,237,218,117,142,187,119,239, 94,229,231,231, 55,
- 76, 40, 20,126,156,150,150,102,117,135,100, 27, 27,155,149,155, 55,111,158,216,177, 99, 71,251,232,232,232, 96,  0,144,201,100,
-252,230,205,155, 53, 54, 54, 54, 43,235,155,145, 39, 39,125,244,242,242,234, 44,149, 74,167, 15, 26, 52,168,243,196,137, 19, 17,
- 23, 23,135,141, 27, 55,222,246,246,246,222, 95, 79,221,187,117,141, 34,172, 43,154, 37,148, 74,139,149,121,121, 78,118,254,254,
- 98, 23, 71,199,156, 83,167, 78,  5,180,111,223, 30,233, 25, 25, 80,150,150, 66,167,211, 33, 46, 46,142, 74, 68,162, 20,145,179,
- 51, 73,191,116,137,  8,165,210,122, 27, 76, 91, 57,  9,254,236,195,201, 13,245,122,125,184, 74,165,226,196, 18,137,216, 70, 74,
-235,213,204, 68, 41, 53,248,251,251, 15,177, 88, 44,174, 70,163,209,236,225,225, 33, 62,126,252, 56,164, 82, 41,  8, 33,136,140,
-140,132, 84, 42, 53,250,250,250,106,  0,192,197,197, 69,176,120,241, 98,241,251,239,191, 31, 87,151,118,235,214,173,197,  1,  1,
-  1,147, 66, 66, 66,112,241,226, 69,196,199,199, 39, 94,190,124, 57,164, 85,171, 86,240,241,241,153,212,186,117,235, 31,111,220,
-184, 97,126, 30,  5,155, 82, 90,239, 78,238,103,206,156,161,222,222,222, 16,  8,  4, 16,  8,  4,224,121, 30,133,133,133,104,220,
-184, 49, 86,174, 92,137, 21, 43, 86,252,146,155,155,251, 84,145,213,160,160, 32,105,139, 22, 45,222, 30, 53,106, 20,146,146,146,
-240,213, 87, 95, 21,228,231,231, 31, 60,122,244,232,248,105,211,166,137, 58,117,234,132,226,226, 98,172, 93,187,214,124,243,230,
-205, 31,114,115,115, 87,178,199, 19,131,193, 96,188,128,  6,203,207,207,111,162, 92, 46, 95, 56,106,212, 40, 81, 72, 72,  8,242,
-243,243,161,209,148, 89, 34, 35, 35, 44,  0,161,118,118,182, 68,161, 80, 96,202,148, 41,104,222,188,121,175,143, 62,250,168,167,
-183,183,247,215, 57, 57, 57, 63, 91,115,224,164,164, 36,141,183,183,247, 15, 51,103,206, 92,114,233,210, 69, 91,  0,184,117,235,
-150, 54, 39, 39,231,139,156,156, 28, 77, 61, 77, 80,197,228,148,196,214,214,246,126,147, 38, 77,204,  3,  6, 12,112, 25, 54,108,
- 24, 92, 93, 93,113,243,230, 77, 44, 94,188,248,166, 86,171, 29,147,150,150,102,254,255, 62,201,156,193,144,119,125,239, 94,251,
-110,175,190,234,240,225,208,161, 95,189,249,230,155, 63,207, 95,176, 64, 28, 20, 24,  8,163,201,132,248,248,120,186,117,203, 22,
-211,150, 37, 75,190,131,173,173,248,210,174, 93, 82,163,209,152, 94,159, 99,248,250,250,118,237,223,183,107,200,210,101, 63, 64,
-175, 43,195,149,139,127,161,180,180, 16,191,254,182, 59,196,215,215,183,107, 86, 86,214, 25,171,211,203,113,129, 59,119,238,  4,
-  0, 72,165, 82,124,254,249,231,240,246,246,134,131,131,  3, 52, 26, 13, 38, 79,158, 44,125,255,253,247,  1,  0,113,113,113,176,
-179,179,179, 54,202,214,127,242,228,201, 78,102,179, 25,135, 14, 29,210, 75, 36,146, 87,143, 30, 61,122,177,121,243,230,242, 46,
- 93,186, 56,109,220,184,113,  0,128,189,207,203, 96, 61,197,119, 44, 62, 62, 62, 41, 71,143, 30,109, 60,114,228, 72, 72, 36, 18,
-148,150,150,194,193,193,  1, 63,253,244, 19,175, 80, 40,214, 62, 67,146,164, 10,133, 66,102,177, 88,176,125,251,118,228,231,231,
- 15,172,232,143, 56,123,246,236, 47, 66, 67, 67,131, 18, 18, 18,146,245,122,253,220,236,236,236,  7,236,209,196, 96, 48, 24, 47,
-168,193,226,121,254,195, 35, 71,142,136, 44, 22, 11, 86,175, 94,141,107,215,174,209,252,252,252,239, 76, 38,211,215, 10,133,130,
- 43, 41, 41,153,253,230,155,111, 78,157, 63,127,190, 32, 42, 42, 10,151, 46, 93, 18, 52,110,220,120, 58,128,159,171, 24,159,232,
-218,230,202, 40, 45, 45, 61,152,151,151,251, 51,207, 63,172, 12,  5,  2, 98, 43,149,202, 14,214, 97,166, 30,211,172,102, 50,203,
-166, 95,127,253,117,129,139,139, 11, 31, 23, 23,135,149, 43, 87, 90,174, 95,191,190,139,231,249, 79,139,138,138,202,173,209,124,
- 30, 84,213,148,114,220,141,141,179,103, 55,107, 61,100,  8, 63,252,141, 55, 12,  2,145,232,173,175,150, 47,255,164, 84,169,244,
-  6, 33,212,213,217, 57,125,205,151, 95, 46,122,169,123,119,125,220,153, 51,242, 91,199,142,137,221,204,230,219,245, 73,103, 86,
- 86,214,153,224, 32,127,172, 91,189, 12, 38,147,  1,185,217, 15,253, 89, 81,177, 10,181,153,171,234, 52,  5,  2,129,242,181,215,
- 94, 83, 24,141, 70, 50,122,244,104,113, 65, 65,  1,130,130,130,  0,  0,106,181, 26,127,253,245, 23, 66, 67, 67,  1,  0, 49, 49,
- 49,149,159,235, 74,167,141,141,205,164, 78,157, 58, 33, 61, 61, 29,241,241,241, 59,115,114,114,242,189,189,189,119,166,167,167,
-143,111,219,182, 45,118,237,218,245,122, 77,  6,171,190,215,200, 26,131, 85, 67,222,223,216,189,123,247,  7,151, 46, 93,234, 59,
-107,214, 44,210,189,123,119,  0, 64, 89, 89, 25,159,155,155,171,121, 26,205,170,105,226, 56, 14,  0, 32,151,203, 53,  0,240,200,
- 76,141,124, 90,205,231, 81, 62,153, 38,211,100,154, 76,243,191, 65,243, 31, 99,176,  0,152, 44, 22, 11,206,156, 57,131,221,187,
-119,115,122,189,126,120, 94, 94,222,245, 42,255,255,194,215,215,119,255,136, 17, 35, 14, 38, 38, 38,138,226,227,227,  1,128,171,
-207,193, 13,  6,131,145, 16, 80,252,107, 50, 74,106, 48, 24,140, 79,115,173,171,254,242,251,239,191, 35, 55, 55,215,144,158,158,
-190,149, 82,186, 42, 55, 55, 55,235, 25, 34, 33,207, 60,138,112, 45,165,134, 87,  9, 57, 62,191,115,231, 94,243,142, 29,147,189,
- 50, 99,134,105,248,168, 81,179, 45, 70,163, 89, 40,145,240, 82, 91, 91,129, 69, 38, 19,199,157, 57, 35,255,126,218,180,  6, 58,
-131,225,240,198,122,116, 28,175, 18,193,194,107,111,204,128,174, 74,  4,235,210,181,123,168,111,  4, 75, 36, 18,249,155,205,102,
- 25,199,113,217, 60,207, 99,252,248,241,224,121, 30, 58,157, 14, 26,141,  6, 37, 37, 37,250,119,222,121, 71,  0,  0, 10,133,  2,
-189,123,247,150, 90,163, 27, 24, 24,216, 72, 44, 22,227,240,225,195, 16,139,197,235,  1, 64, 44, 22,175, 63,118,236,216,248, 49,
- 99,198,192,223,223, 63,140, 16, 66,234, 90, 60,186,114,177,103,130, 38,143,174,126, 19,247,136,161,119,170, 44,246,124,183, 85,
-171, 86,128, 21,253,174,158, 36, 51, 51, 51, 23,192, 12, 95, 95,223,181, 31,124,240,193,135,237,219,183,111,179, 96,193,  2, 16,
- 66,132,207,122,179,241, 60, 15,179,217,252, 76, 83, 72, 48, 24, 12,  6,227,127,223, 96, 45,235,222,189,251, 76, 74,169,136, 16,
-242,237, 19,230,170, 34,106, 18,231,227,227,243, 89,227,198,141, 43, 23,128,174,167,121,201, 39,132, 44, 17,  8,200,135, 15,127,
-175,255,196,146, 85, 52, 62,122,104, 14,196,219,174, 95,191,254, 73,122,122,122, 54,165,148,123,214, 19,244, 60, 70, 17,  2,192,
-102, 74, 83, 71, 19,114,100, 86, 68, 68,116,223,105,211,208,188,111, 95,  7,239,128,  0,139,206,100,226, 99,206,159, 39, 23,119,
-238,148,220, 58,118, 76,172, 51, 24, 14,239,166, 52,163,190,233,204,202,202, 58, 19, 20,232,123,244,229,225,253,123,  7, 54,242,
-  6,  0, 36,167,230,160,168, 68,117,180, 62,230, 10,  0,210,210,210, 12,  0, 12, 94, 94, 94,195,183,111,223,190,243,145,233,169,
- 92,118,  6,128, 65, 36, 18,  5,  3,128, 70,163,  9,216,179,103,207,102,145, 72, 84,167,137,189,123,247,238,154,249,243,231, 79,
- 73, 78, 78,222,154,149,149,149,  8,  0,233,233,233,137, 62, 62, 62,223,228,230,230, 78,205,204,204, 92, 73,173,112, 31, 79, 44,
-246,140,184,243, 59,228,  0, 34, 43, 22,123,126,218,181,  6,159, 56,159,177,  0,198,250,248,248,116,239,211,167,207,116,  0,121,
-207,162,103, 48, 24,204,  6,131,193,204,243,188,216,100, 50, 81,131,193, 96,102,143, 31,  6,131,193,248,  7, 26,172,236,236,236,
-245,176, 98, 49,103,107,247,171,197, 32,205, 33,132,124, 95, 97,150,158, 85,195,100, 50, 61,175,245,219,238, 14, 30, 60,184, 94,
-251,215,181,195, 86, 74,211,223, 37,100,195,129, 31,127,108,121,120,213, 42, 31, 11,199,185, 16,128, 10,165,210, 98,163,209,152,
-230,102, 54,223,174,111,228,170, 42, 73,201, 89,125,  0, 32, 56, 56,152, 62,120,240,  0,148,210,103, 90, 60, 56, 55, 55,247,168,
-175,175,175,187, 72, 36,146, 18,242,152,148,225,145,  9,  3,128, 59,132,144, 48,  0,117, 70,120, 50, 51, 51,151,  3, 88, 94, 77,
- 25, 90,  1, 96,133,181,233,170, 92,236, 25, 16,240,132,127, 57,188,243,200,157,  0,248,138,197,158,159, 39,217,217,217,167,  0,
-156,122, 14,134, 77,223,176, 97,195, 85, 75,150, 44,153,122,251,246,237,223,179,178,178,244,236,241,195, 96, 48, 24,255, 64,131,
-245,255,201,243, 88,212,246,121, 47,140,251, 60,162, 32,213,241,195, 67,  3,117,249,239, 60,159,247,239,223, 39,207, 75,235,145,
- 17,208,215,113,238, 41,234,217, 60,252, 44, 84, 44,246, 92,133,136,255,133,155, 45, 45, 45,237,235,214,173, 91, 47,205,202,202,
- 98,209, 43,  6,131,193,120,193, 17,176, 83,192, 96,252,255,241,188,166,161, 96, 48, 24, 12,198,127, 55,  4, 64,116,117,255,168,
-207,232,  0, 66, 72,116,125, 15, 92,151, 62,211,100,154, 76,147,105, 50, 77,166,201, 52, 95, 60,205,186,180, 95,152,209,137, 85,
- 59, 47, 63,239, 13, 64, 52,211,100,154, 76,147,105, 50, 77,166,201, 52,153,230, 63,109, 99, 77,132, 12,  6,131,193, 96, 48, 24,
-207, 25, 17, 59,  5,213,211,210, 75,184,200,223,215,189, 77,101,148,143,231,  1,  0,252,163, 89,  4, 42,167, 19,224,121, 80, 74,
-145, 83,160,188,113, 39,159,126,246,180,199, 11,241, 33, 13,220,229,242, 21, 60,165,157, 31,253,233,140,170,216, 48, 35, 86, 69,
-149,214,106, 52,243, 36,205,228,  2,124,192, 83, 52,  7,  0,  1,193, 29, 61,143,111,239,230,209,187,207,122, 62,  8, 33, 36,220,
- 13,147,165, 54,138, 81,142, 78,206, 77, 74, 75,139,238,155,244,134, 29,241,133,248,149, 62,197,196, 78, 65, 13, 72,  7,158,226,
- 19,  0,  2,177,  0,223,221, 43,166,167, 88,169, 99, 48, 24,255, 79, 60,235,188,118,150,234, 30,147,207,168,201, 38,200,251, 39,
- 27,172,112,119, 50, 13,  4, 11,  0, 80, 80, 44,140, 43,160,245, 90, 47, 45,220,155, 68,203,133,194, 53,  0,132,122,147,101, 22,
-229,113,182,218,202, 92,128, 46,114,137,240, 59,  0,188,222, 98,153, 20,151, 99,125,123,108,132, 47,233, 43,226,  5, 27,121, 74,
-197, 22,158,174,  7,197,  1, 59,  9, 46, 92,202,162,245, 26, 22,239,239,235,222,102,239,213,220,222,167, 86,190,135,246,205,131,
- 64, 45, 28,192,155,161,136,250,  0, 39,150,143, 71,251,102,254,160,188, 25,224, 57,216,245, 91,138,126, 17,142, 79,125,115,132,
-248,144,  6,  1,174,238,177,171, 87,175,241,244, 14, 12, 35, 60,103, 66,226,213,163, 99,223,255,112, 94,143,  8, 71, 18, 97,141,
-201,106,225, 77,222,  8,106, 28,242,193,140,  5,203,132, 94,222,126,182,188,217,192,229,165,222,109,245,195, 55,243,118,181,240,
- 38,223,221,206,161,107,172, 53, 82, 97,110,152, 34,146, 73, 71,218,200,109,155,148,151,107, 30, 88, 76,230, 29, 17,222,162,190,
-223, 46, 93,209,178, 91,175,254,118, 22, 77,158,192,204, 35,108,251,182,173,  1, 63,254,252, 75,127, 66,200, 96, 74, 41, 95,159,
- 60,243, 20, 31,222,219, 48,185,191, 88, 36, 36,205, 94, 95, 45,196, 83, 78,133, 16,230, 65,198, 16,138,168, 58,159, 92,  4,231,
-226,243,233,150,167, 57, 70, 51, 15,242, 59,161,104, 10,130,157,132, 98,107, 92,  1, 45, 96,143, 14,  6,227,197,194,215,215,247,
- 84, 86, 86, 86,247,231,169,233,237,237,221, 33, 39, 39,231, 50, 59,187,204, 96, 89, 81,251,226,139,184,164, 76,103, 88, 76,  8,
-111, 26,184,  8, 64,189, 12,150, 92, 40, 92,127,237,126,190, 39, 56, 19, 86,127,249,214, 54,163, 25,224,204, 38, 88, 56, 51, 44,
-156, 25, 28,103,130,197,108,  6, 53, 27, 48,239,143, 83,128, 81,131, 54, 17,193,235,  1,120, 89,123, 12, 49, 21,108,188,113,254,
-104,  3, 98, 84, 97,203,202,175,223,201, 44, 44,123,231,248,157,156,162,112, 15, 50, 39,190,  0,107,235, 99,  4, 78,173,122, 15,
-155,246,252,149,245,253,239,218,  4,158, 82, 52,112,176,  9, 25, 59, 48,206,111,195,190, 83,153, 43,214,235, 19,  0,192,209, 86,
- 26, 50,225,206,125,255,103,185,  8,238,114,249,138, 95,127,249,209,211,203,197,134,112, 23, 23,131,179, 88,224, 23, 48, 64, 56,
-103,250, 88,175, 47,150,175, 89, 14,224,181,218,190, 31,234, 65,194,154,  6, 53,155,181,254,175,139,254, 90,117,129,241,232,230,
- 79,146, 96,128,217,211,167,153,120,209,215,203,132,115, 63,122,111,102,168,  7,185,146,144, 79,227,235, 48, 87,130,102,238,216,
-247,245,226,165,205,123,244, 27,104,199,151, 21, 10,245,218,178,166,171,255, 88,179, 32,180,121, 59, 69, 84,132,175,164, 96,199,
- 84,162,211,148,192, 36,144,203,122,132, 71, 59,232,198,141, 54,175, 94,183,105, 58,128, 31,234,245,250, 71,255, 85,246,120,254,
-233,223, 38,  9, 69,212,173,203,167,166, 88,114,174,129, 90,204,128,197, 84,249, 19, 22, 51, 40,255,240,103,251,169,127,  0,192,
- 83, 25, 44,  1, 69,239,227,231,175,121,229,231,229,182, 93,190,244,171, 57, 97,238,228, 16, 44,216,120,183,  4,103,234,107, 44,
- 25, 12,198,127, 47,222,222,222, 92, 78, 78,206,115,109,217,241,241,241,233,159,157,157,125,240, 25,211,245,  1,128, 55, 30,253,
-186, 38, 39, 39,231,219,103, 77, 87,219,182,109,125, 41,165,158,143,158,253,121,215,174, 93,203, 98, 37,224, 63,105,176,  0, 57,
- 40, 15,236, 28, 10,  0, 54,245, 61, 24,  5,228, 32, 66,192,172,197,144,126,189,224,234,238,  9,152,203,  1, 83, 57, 96,214,  1,
-102, 45, 96,214,161, 40, 55, 29, 48,105,129,228, 67,224, 40,149,213, 59, 87,  6, 21,112,111,  7,122,182,242,135,155,163, 28,239,
- 13,  9,115,253,237,240,189, 53,107,142, 38, 70,  3, 24,101, 85, 90, 41, 69,251,200, 38,248,126,141, 54, 97,255,141,130, 62,  0,
- 48,160,165,235,225,246, 97,  1,126, 43,214,235, 19,254,186, 83,210, 23,  0,250, 69, 56, 30,106, 23,226,229,207, 63, 67,116,151,
-167, 52,202,187, 97, 19, 98,185,245, 43,120,117, 22,212,106, 29,178, 82, 55,192,217,167,181,192,194,163,107, 93,223,183, 17,226,
-227,119,231, 46, 17,151,171,243,141,188,169,208,226, 38, 44, 21,138,164, 60, 65,246, 25, 67, 25,175,180,204,152, 60,158,155,245,
-217,151, 31,  3, 24, 91,107, 52,200, 29,211,191,251,110, 69,100,167, 54,161,238,121,187,222, 35,101,165,249,224,132, 10,217,144,
-142,157,224, 20, 28,198,231,159,254,142, 72,  3,163,225,228, 18,136,236,139,155,145,118,121, 55,233,220,106,184,108,237, 22,201,
-184,154, 12, 86,176, 27,233,220,167, 75,187,109,129,254,222, 94,148,242,224,121, 10,202, 91,240,250,203,189, 49,103,123, 50, 44,
- 22, 11, 70,244,233,220,115,201,148, 30,148,231,121, 80,202, 35, 51,175,184,252,228,149,132,158, 73, 37,244,138, 53,145,169, 22,
- 29,186,119,190,115,227,114,168,249,222,159,104, 51,246,235,  4,  2,156,175, 82,230, 58,223, 60,178, 54, 20,248,227,233, 12, 28,
- 33,164,153, 59, 44,105,135, 23,195,191,203,100,225,175, 91, 14,187,169, 10,179, 39,236,218,240,203,203, 43,127,253,117, 19,128,
-169,236, 49,194, 96,188, 24,228,228,228, 60,119,147,117,241,226,197,156,103, 49, 89,109,219,182,237,  2,224,155,156,156,156, 10,
-179,245, 77,251,246,237,231, 85,173,171,170,160,162,148,142,189,118,237,218,217,218, 52,103,206,156,233, 13,160,209,245,235,215,
- 43,142,209,168,109,219,182,141,170,219, 87,161, 80, 88, 90,180,104,145,182,108,217,178, 28, 86, 66,254, 94,131,149,144,177,227,
-189, 86,134,220, 50,  0, 72,176,194,164, 60,214,180,167, 55, 91, 22,175, 91, 48,126,113,120,195,  6,208,104,141, 56,122, 61, 13,
- 22,139, 25, 22,142,123, 20,201,226, 96,225,204,232,211,194, 21, 47,233,167,226,135,  3,137,224, 44,252,215,181,105, 62,137,137,
-242, 99, 90, 70,191,178,157,231,169, 84, 38, 22,168,154,250,185,184,207, 26,209, 66,240,222,144,112,232, 76,220, 43, 97, 30,228,
-100,124, 62, 93,109,149, 38,255,239,115,103,210,234,254,102,225,234,204,123, 45,209,167,246,163,  7,246,114,160,  6, 21,204, 69,
-201,208,148,155,145, 92,108, 70,158, 94,  9, 25,201,181, 74,147,167,104,238,235,227,165,184,176,237,163, 84, 23,161, 90,228, 46,
-228, 36, 82,  1,  7, 11, 79,133, 84, 25,111,104, 16,218, 75, 92,209, 47,171,182,116,218, 40,236,199,119,233, 61,192, 49, 99,243,
-100, 98,211,180, 15,220, 91,249, 33,245,236, 58, 20, 92, 63,128,226,156, 52,226,160, 87,194,195, 37,  8,253,198,142,194,183,163,
-218, 66,163,214, 64,152,155,228, 40, 21,203,156,106,210,164, 22,140,253,110,201,151, 94, 34,161,224,225,249,172,216, 44,102,232,
- 12,  6,192,194, 65, 46,226, 65,104,197,255,204,176,152, 77,138,230,195, 63,122, 11,192,149,186,242, 30,159, 79,183,132,187,147,
- 40,240,230, 80,106,214,129,  0,231,227, 10,104,165,233,  9,243, 32, 99, 90,247,153, 24, 69,  9,206, 61,205, 53,138,112,193,192,
- 54,141,236,108,109,213,  9,200,218,249, 14,146, 32,167, 30,157,222,192,152,215,167, 43,126,251,237,183, 65,132,144,105, 85,251,
-160,253, 29,195,139,153, 38,211,252, 95,213,116,116,116,108,220,176, 97,195,121,102,179,185,139, 68, 34,241, 48,153, 76,224,121,
- 62, 79, 42,149,158, 75, 75, 75,251, 92,165, 82,165,252,183,229,253,208,161, 67, 86,155, 44,107, 52,197, 98, 49, 78,156, 56,241,
-192, 90,147, 85,205,  2,244, 27,119,238,220,137,237,219,183,  3,  0, 78,157, 58,133,224,224, 96,219,234,190,155,153,153,105, 59,
- 98,196,136,141,  0,252,106,211,188,127,255,126,227, 47,191,252, 18, 59,119,238,  4,  0,108,216,176,  1, 77,155, 54,173, 54, 61,
-183,111,223, 22,126,250,233,167,141,  1,228,252,221,215,232,159,110,176,146,253,157,165,173,160,183,  0, 64,114,125, 15, 22,159,
- 71,151,180,240, 18,247, 61,177,243,231, 46,114,137,  0,243, 87,207,202, 44, 44,209,116, 16, 17,240,  0,192, 81,  8,156,237,164,
-151,190,158,208,194,191,180, 76,143,253, 87,179,207,198,229,211,122,133, 66,227,114,232, 49,  0, 78,255,170, 32, 73,211,  9,223,
- 30,219,186,245,227,190,205,103, 12,105,142,125, 23,211,102,  0, 88, 93,103, 33,231,121, 80,158,171,236,212,254,208,201,240,  0,
-207, 61,246,198,192,131, 62,252, 27, 95,191,  8, 86, 55, 66, 68,165,238,232,215, 64, 33,253,105,202,148, 55, 29,204,133,247, 81,
- 98,148, 32,179, 84,143, 60,157, 24,101, 34,119,100, 39,196, 88,  4,  4,199,234,142,178, 64, 77, 57,189,147,179,212, 78, 16,209,
-235, 45, 31,245,225, 79, 74,165,132, 19, 58, 12,251,194,169,232,196,178, 52, 78, 91,168, 37,  4,117, 78,112,233,232,232, 20,172,
- 47, 78, 19,170, 74,139,224,228, 25,142,190,175, 12,196,194,  1, 97,208,168,181, 40, 44,185, 68,155,120, 57,144,244,115,155, 48,
-183, 95, 51, 20,231,231,194, 96,  6,136,214, 80,162, 55,234,203,106, 60,143,  2,252,250,254,236, 15,199,  4,120,185,217, 86, 12,
- 22,160,188,  5, 45,154,  5,162, 87,151,246, 56,118,254,  2,174,197,220,  3,255,104,176,  0,229,121,100, 21,148,230,235, 77,150,
-117,245, 58,161, 22, 14,212,172,175,214,128,225, 41,154,  6, 35, 61,136,194,  2,124,214,161,137,253,164,143,  7,  6,216,219,202,
-  8,244,102, 11,244, 70, 51, 52, 23,126,130, 75,195, 72, 40,228,114,210, 10, 58, 17,  0, 54,121, 40,131, 81,133,145, 35, 71,202,
-243,243,243, 79, 15, 24, 48, 32,172, 87,175, 94,138,168,168, 40,104,181, 90, 28, 61,122, 20, 90,173, 54,192,207,207, 47,224,232,
-209,163,195, 59,116,232, 16,239,235,235,219,109,199,142, 29,245,233, 35, 43,194,191, 58,169,243,  0,184, 71, 75,121,  9,241,176,
-163, 57, 79, 41,181, 60,109,218,165, 82, 41, 46, 93,186,244,220, 35, 89, 87,175, 94,125,240, 52,145, 44,173, 86, 43,241,242,242,
-130,139,139, 11, 44, 22, 11,180, 90, 45,246,238,221, 11,149, 74,  5,158,231, 97, 99, 99,131, 47,190, 91,141,132,155,167,113,229,
-202, 21,168, 84, 42, 73, 93,154, 69, 69, 69, 36, 36, 36,  4,  6,131,  1, 28,199, 65,175,215,227,248,241,227,149,191,139, 68, 34,
-124,184,104, 57,238, 93, 63,141, 91,183,110,161,168,168,136,176, 82,253,247, 27,172,103,198, 98,225,230,252,182,126,235,165, 57,
- 83, 71, 97,250,232,104,191,207,127,222, 29, 29, 95, 72,215,  3, 64,152, 27,153, 48,174,123, 19,127, 39,133, 24, 11, 55, 95,  7,
- 40,157,243,172,199,139, 45,166,247,194, 61,201,140, 61, 87,210, 79,127, 50,170, 21,  2,189, 28,130,131,130,136, 52, 41,201,138,
- 53,255,120, 14,206,118,178,144,  1, 45, 93, 15,131,231,225,100, 47, 11,133,133,131,147,157, 44,164, 95,132,227, 33,  0,112, 82,
- 72, 66,171,139,116,213, 24,238,245,151, 76, 86,200, 68,147,109, 91,123,249,191, 54,168,151, 77,255, 65,195,109,236,196, 28,138,
-175, 28,133, 90,236, 11,115,131,  0, 24,204, 37,200, 74, 73,178,156,184,124, 55,187, 72, 99,152, 85,103, 50, 41,206,102,167, 36,
-186, 53,110,222,203,185,232,192,220,130,198, 19, 55, 55, 18,128, 23,104, 54, 13,203,183,117,111,103,115, 53, 57,165,140,167,255,
- 30,193,121, 18,181, 74,149,102,182,192, 75,103, 17,217, 39,157, 90,139,143,251, 69,162,180,164,  0,122, 19,  7,149,142, 51,121,
- 58,201,101,134,148, 88, 24, 76, 28,140,102, 30, 98, 39, 31, 28,189, 20, 83,196,155,205,135,106,210, 76, 42,162,183,  0,216, 85,
-253, 91,144, 27,105,241,145,131,205, 45,152,117, 72,207,202,193,250,191, 46,181,122,180,223,211,191,157,242,220,195,102,230, 42,
-145, 43, 66, 17,245, 52,157,219,155,121,144,118, 54,114,201,143,223,204,120, 53,172, 99,211,  6, 50, 62,235, 18,  8,111,130,173,
- 69,  4,157,212,  2, 71,191, 64,240, 70, 13, 45,215,235,149,113,255,143, 75,  4, 49, 24,255, 11,132,134,134,122, 58, 58, 58,198,
-205,158, 61,187,193,176, 97,195,176,103,207, 30,168,213,106,172, 91,183, 14, 43, 86,172,192,130,  5, 11, 96, 54,155,241,219,111,
-191, 41,118,237,218,213,238,151, 95,126,201, 10,  8,  8,  8, 79, 79, 79,175,107, 65,117,  2, 64,  6, 64,252,168,238, 34,  0,248,
-131,  7, 15,162,127,255,254, 56,120,240, 32,255,232,111, 22, 66,136,153, 82,106,120, 90,131, 37,149, 74,145,144,144,240, 92, 76,
-150, 88, 44,134,157,157, 29,164, 82, 41, 18, 19, 19,235,109,178, 56,142, 19,102,101,101, 65,165, 82,161,215,160, 65, 88,254,245,
-215,232,222,189, 59,122,245,234,  5, 74, 41,142, 31, 63,142,232, 78, 17, 24, 53,184, 27,238,222,189, 11,179,217,108, 85,122,243,
-242,242,144,159,159,143,190,131,  6, 97,245, 47,191,160,125,251,246,  8,  9,  9,  1,199,113, 56,125,250, 52, 94,238,211,  9,242,
-161,209,184,119,239, 30, 43,212,255, 43,  6, 43,182,128, 94, 14,115, 35,  7, 70,247,105, 55,112, 80,231, 48,172,222,118,226,203,
-176, 48,178, 21,  0, 92,236,101, 95,140,239, 30,136,248,140, 82,156,184,149,115, 32,190,144, 62,151,209, 23,188,  5,174, 46, 14,
- 10, 64, 40,133,206,196,115, 14,201,168,179, 99, 50, 79, 41, 20, 93, 62,194,184, 65,241,126,237,195,252,252, 42, 70, 17,218,245,
- 95,134,  9, 49, 15,252,219,134,120,250,195, 98,  6, 44,102, 56,140,218, 12, 44,178,173, 51, 29,157, 27,203,142,125, 52,107,198,
- 75,253,134,190, 98, 35, 85, 56,194,162,206,132, 57, 47,  6,197,247,207, 66,171,  8, 70, 94,122, 50,182, 31,185,162,186,159, 85,
-172, 22,  8,112, 52, 95,101,248, 32,169,132,150,213,165,171, 55,227,235,121,115,103, 13,216,190,117,155,189, 44,176, 51, 73,250,
-169,191, 74, 42,226,100,110,141, 90, 11,202,229,174,244,171,117,219, 28,180, 70, 44,174, 75,167, 92,171,222,125,252,232,225, 81,
- 77, 26,119,182, 79,189,246, 23,116,122,  3, 12,102, 32,188, 93, 55, 88, 44, 84, 74,  4,132,119, 16, 10, 73, 65,113, 41,136,217,
-146,127,238,118,106,238,249,219,201, 66,131,125,221,218,143, 21, 58, 34,124,119, 80,183,150,128, 89,135,193, 93, 34,177,124,211,
-137,119,  0, 76,124,182,139,252, 48,130, 69,129,206,225,238,100, 21,128,206,215,247,174,  8,109, 51,244,125,212, 39,130, 21,225,
- 70,250, 69,  4,121,175, 93,254,197, 71, 13, 92,124,131,133,132, 55,131,122, 54,  7,212, 89,148,100, 93,130,163, 79,123, 88,188,
- 59,225,183, 31,150,150,241, 60,221,250, 52, 83, 84, 48, 24, 47, 50,122,189,126,247,146, 37, 75, 26, 12, 28, 56, 16,  0, 80, 86,
- 86,134, 75,151, 46, 97,205,154, 53,176,181,125,252, 57,217,191,127,127, 80, 74, 27,204,159, 63,127, 55,128,142, 53,105,118,234,
-212,105,208, 15, 63,252,144,211,178,101,203,228, 71, 38, 75,  2, 64, 16, 27, 27, 43,200,204,204, 36,206,206,206,212,219,219,219,
-156,147,147,195,  3,176,188,254,250,235, 66, 59, 59,187, 38,101,101,101,103,158,214, 96, 73,165,210,231,210, 39, 75, 44, 22,131,
- 16,  2,169, 84, 10,137, 68,130,236,236,236,122,153, 44,142,227, 68,  7, 15, 30,196,245,235,215,177,160,101, 75,204,240,241, 65,
-131,  6, 13,112,250,244,105, 80, 74, 97,107,107,139,146,146, 18,108,221,186, 21, 61,122,244,  0,199,113, 18,107,116,119,238,220,
-137, 27, 55,110, 96, 81,155, 54,152,225,232,  8, 59, 59, 59, 28, 63,254,176,213, 79, 38,147, 33, 61, 61, 29,199,143, 31, 71,183,
-110,221, 88,161,254,187, 13, 86, 55, 66, 68,196,  3,158, 38,163, 14,148,163,  0,129,119, 88, 24,145,196,199, 83, 83,125, 15, 42,
- 16, 96,238, 15,235, 15, 12, 88,246,254, 32, 50,121, 72, 43,239,207,215,158,154,  6,  0,147, 70, 52,245, 81,200, 68,248,126, 95,
- 60, 21,  8, 48,247,121,100, 48, 44,140, 72,  4,  2, 76,235,213, 62,  4, 57, 74, 35,146,114,148, 39,227, 41,181,170, 73,231,196,
-178,113,216,176,255,116,230,138, 13,250,  4, 74, 41,156,236,100, 33, 19,238, 36,249,175, 61,120, 35,227,187,237,250,  4,202, 83,
- 56, 41,196,161, 19,239,118,170,115, 20, 97, 91,127,201,228, 57, 31,125,208,105,200,196,217,114, 46, 97,  7,140, 73, 71,192,155,
-116, 80,155, 36, 80, 10, 61,145,149,145,129,175,126, 59,144,169,214, 26, 71,197, 22,212,207, 88,222, 43,162,101, 97,110,100,216,
- 87, 11, 63, 57,246,245, 23,243,237,116,201,167,203,132,132,211,  9, 27,118, 21,125,177, 96, 25,209, 24,140,175, 36,149, 80, 77,
- 93, 58,  6,123, 44, 94,242,221, 15,  3,222, 28, 59, 60,161,105,112, 87, 23, 75, 78,138,139, 94,173, 46,216,124,248,134,231,163,
- 55, 67,  2,  0, 73, 89,197, 40, 84,105, 57, 11,103, 62, 99, 47,198,231,113,214, 68,  3, 31, 17,232, 65,220,134, 69, 53,127,213,
-205, 94,  2, 93,153, 18,238,246, 98,244,105, 31,244,106,160,  7,249, 40, 57,159, 22, 62,189,193, 50,131,154,117,184,188,184, 71,
- 40,181,152, 67, 97, 49,195,116,103, 99,253, 35, 97,  4, 51,166,119,177,115,112, 54,166, 10,160,181,  5,108, 92, 65, 28,  2,  0,
-199, 70, 68,220,236, 21,228, 36,199,113,239,188, 58,182, 56, 37, 45,235,119, 87, 27,124,203, 30, 33, 12,198,227,164,167,167,143,
-159, 51,103,206,249,246,237,219,123,184,186,186, 34, 50, 50, 18,251,247,239,199,236,217,179, 43,247,105,217,178, 37, 40,165, 40,
- 41, 41,193,146, 37, 75,242,114,114,114,198,215,166, 25, 23, 23,151,176, 97,195,134, 46, 97, 97, 97, 38,137, 68,162,  4, 32, 83,
- 42,149,242,146,146, 18,162,215,235,193,243, 60,239,232,232,104,201,201,201, 49,143, 26, 53,202,112,241,226,197, 32,173, 86,155,
-254, 44, 17,172,182,109,219,198, 42,149, 74,149, 64, 32,120,230, 41, 28, 42,204, 85, 68, 68,132,155, 86,171,229,  1,148, 62,205,
- 20, 14, 28,199,161, 77,155, 54, 56,114,246, 38, 14,158,184,  8,117, 78, 34,166,189, 57, 30,145,145,145, 56,114,228,200, 83, 95,
-179, 22, 45, 90,224,240,241,243, 56,127,253, 54,210,239,221,193, 59,211,222, 68,120,120, 56, 14, 31, 62,204, 10,244,223,109,176,
-154,185,145, 22,222, 77,164, 27,231,247, 11,106, 38,238, 53, 31, 68,108,131, 29,193,135, 59,205,253,234,167,132, 72, 15, 50, 54,
- 38,191,238,209, 94,143, 69,177,242,105, 92,184, 59,217,114,251,110,232,171,131,219,251, 97,245,126,197,103,  0,240, 74, 84, 99,
- 92,189, 95,136, 43,247, 10,182,196, 21,208,184,103,205, 92,164,  7, 81,128, 98,203,146,119,135,116, 11,240,245,196,154, 61,231,
- 65,  8,118, 91, 85,209, 82, 74,219,135,  5, 96,197,134, 39, 71, 12,122,250,127,183, 93,159,112, 36, 86,221, 15,  0,122, 55,179,
- 61,212, 54,200,217,191,174, 72,134,141, 84, 52,165,223,240,113,114,238,222,126, 32,237, 56,  8,103,128,206,196, 35,183, 72,131,
-114, 71, 63,156,190,116, 91,167,210, 27,223,143, 43,120,186,168, 93,124, 33, 77,110,233, 69, 50,202,180, 58, 47,133, 91,144, 94,
- 40,224,249, 50,  3,197,213,248, 52,117, 92, 46, 77,180, 70, 35, 41,137, 26, 59,250,146,168, 85,235,183,207, 19, 75,164,175,  8,
-  9,136,187,147,173,219,170,101,139, 96,111,111,  7,222, 88,246,127,236,157,117,120, 84, 71,219,198,239, 57,235,217,221,184,111,
- 18,136,224,  1,  2, 73,112, 40,161,  4, 45,148, 66,161, 20,104,145,182,120,129, 66,145, 82, 40, 82,156, 22, 43, 69,107, 80,220,
-139,123,112, 77, 32, 33,  9,132, 32,113,119, 91, 61,123,230,251, 35,242,  6,136,108,  2,253,222,190,244,252,174,107,175,100,237,
-222, 57,115,100,238,243,204,204, 51, 64, 97, 58,250, 79, 88,146, 30,150,168,247,  4,128,134,118, 68,249,142,151,120,155,144, 33,
-  9, 23,162,117,115,170,251, 13, 98,192,216, 97, 61, 90,138, 56, 93, 33, 38, 45,223,131,205, 51,251,225,147,174, 77, 68,199,175,
- 69,141,  5,176,176,182,251,154, 26, 89, 80,131, 26,237,102, 95,126, 72,128,171, 20,232,120,119,239,162,198, 64,136,201, 26,126,
-132,136,132,206,164,137, 79, 29,133,152, 75,184,  6, 46,225, 26, 21,184,117,  0,169,243, 14, 33, 78,254,244,167, 21,243, 11,183,
-110,253,229, 12,199, 96, 65,117, 41, 47,120,120,254,173, 80, 74,159, 90, 89, 89,245,236,221,187,247,249,211,167, 79,219, 52,107,
-214, 12,  0, 80, 58, 99,205,223,223, 31, 13, 27, 54, 68,106,106, 42, 62,254,248,227,140,228,228,228,158,148,210, 42,199,244,230,
-231,231, 63,219,191,127,191, 99, 97, 97, 97,203, 57,115,230,164,213,173, 91, 55, 79,163,209,144,156,156, 28,142,101, 89, 88, 91,
- 91, 75, 90,182,108,137,246,237,219, 23,220,184,113,195, 61, 62, 62, 62, 31, 64, 76,109,202,255,249,231,159,227,224,193,226,102,
-226, 77,228,197, 18,139,197,  8, 12, 12,116,185,126,253,122, 34,  0,212, 38, 47, 86,249,230,229,254,253,251,184, 20,146,  0,161,
- 78, 13, 73,122, 18,110, 30,218,143,190, 99,198,131,101,107, 63, 90,225,254,253,251, 56,124,238, 38, 20, 82, 33, 30, 61, 10,199,
-254,253,251, 49,110,220,184,215,210,228,169,198, 96,213,171, 71, 36,210,  2,204,235,225,239, 50,227,163,142,245,  4,134,188, 36,
-112, 70, 14,  2, 17,224, 96,103,129, 63,255,220,229,185,107,207,158, 27, 45, 92, 68,235, 56,150,253, 54, 44,149, 22,213,224,183,
-231,173,218,115,245,163, 63,167,  5,  8,199,245,106,108,  3,  0, 98, 33,131,181,127,133,179,  0,230,189,206, 70,181,115, 37,178,
-  2,  3, 70, 59,217, 90,206,253,230,243,247,108,  2,252, 27,226,210,173,  7, 88,183,255,198,101, 73, 26,182,155,124, 80,115,134,
-151,167,192, 86, 56,139, 16, 92,245,227, 41,141, 70,234, 36, 86, 88, 67, 31,115, 17,208,107,160,209,234, 17,159,105, 68,124,150,
-  6, 66,185, 24,119,163, 18,212,182, 41, 56, 86,219,109, 38,132,144,142, 94, 50,213,119,139,127,116,213,168, 11,216,188,236, 12,
- 86, 44,185, 41,146,155, 73,147,107,162,115, 35,129,106, 58,123,138,253,  0, 78, 32,145,209,162,217, 83, 71, 40, 18, 35, 78,163,
- 62,147,  4, 66, 41,204,154,188,  7,115, 51,129,184,147,135, 56, 14,  0, 60,156, 44, 37,203, 23,124,109, 57,101,230,130,106,199,
-120,121, 19, 34,110,222,202,105, 74,179,186,214,184, 28,252, 16,151,195, 98,195, 47,223,125,212,180, 75,115, 21, 26,186, 90, 77,
-246, 38,100, 89,  4,173,121, 68,180,120,199,176,128, 65, 83, 54,139,208,219,145, 12,105,245,209,156, 10,103, 15, 86,134,  7,192,
- 69, 25, 41,136, 64,  0, 16,166,120, 70, 99,252, 53,  8,173,188,232,174,189,135,139,126,249,101,251,247, 17,233,148,143, 90,241,
-240, 84, 67, 78, 78, 78,168, 92, 46,239,225,227,227,243,199,164, 73,147,204,135, 13, 27,166,250,226,139, 47, 24,  0, 72, 77, 77,
-229,214,172, 89,147,244,211, 79, 63,229,102,100,100,140,212,235,245, 97,166,220,240, 18, 66,174,255,250,235,175,233, 87,174, 92,
-105,218,186,117,107,169,159,159, 31,103,109,109, 45,148, 74,165, 70,157, 78,167,137,138,138, 50, 62,125,250,212, 57, 39, 39, 39,
- 26,192,147,218,116,223,171, 84, 42, 48, 12,179,208,213,213,245,187,164,164,164,102,111, 98, 12, 86,253,250,245, 85,  0,162, 93,
- 92, 92,234,215,180,123,240,149,  6, 91, 40, 68,118,118, 54,138, 82,194, 33, 75,120, 12, 31,  5,  3,111,107, 37, 44, 44, 44, 94,
-203, 12,229,230,230,  2,133,137,184,122,245, 62,192,178,176,180,180,132,165,165, 37,111,176,254, 46,131,213,212,129,140,179,150,
- 96,205,152,247,234,137, 61,234,184, 66,155,112, 23,247,227, 11,240,109,219,214, 17,  2,169,185,102,204,167,253,252,  7, 12,116,
- 71, 64,251, 86,196,195,217,114,242,178, 85, 27, 39, 52,117, 36, 95,135,167,210,181,166,252,112,120, 26,125,214,196,129,252,114,
- 49, 52, 97,172,171, 92, 13,142,163,184, 24,150,140,176,152,236, 95, 34,211,232,179,154,108, 68, 83, 21,  9, 20,130,217, 67, 41,
-149, 89, 42, 20,249, 45, 91, 52,182, 11,108,215,130,233,217,217, 31, 98,  1,112,245,246,125,124,181,234,224, 77,142,163,239,  5,
-155,216, 61, 88, 60, 99,240, 69,227, 84, 60, 99,208,240,194,140, 65, 74, 41, 45,158, 69, 88,245,176, 46,129,128,164, 20,197,222,
-113, 18,217, 54,128,250,201, 69,196,100,115,136, 77,203, 71,158,208,  9,218,196, 68,128,114,113, 65,148,214,250,104,182,179,179,
-115,240,244,110, 88,111,253,182,253,208, 23,229,226, 89,208, 31, 40,200, 78,198,162, 77,127,213,115,117,117,237,156,144,144,112,
-169,  6,102,173,225,249, 99,187, 28, 64,  1,129, 72,138,227, 27,246, 34,195,214, 12,118,114, 49, 56,117, 58,198, 76, 25,102,217,
-171,219, 48, 75,  0,136,125,116, 15,117,229,106,147,116,245,182, 24,240, 81,151, 70, 86, 48,168,177,237,212, 61, 13,  3,244,220,
-126, 38,252, 73,151,198, 86,178,143, 58,214,181, 94,152,148,243, 33,106,153, 12,180, 52,130, 85, 22,209,171,197,236,193,125,148,
- 26,155,216,147, 39,123,174,167, 41,  6,118,243,147,139,133,132,208,130, 68, 80, 51, 59,108,220,182,175, 64, 98,192, 22,254,146,
-193,195, 99, 26, 69, 69, 69,193,132,144,230,211,167, 79, 31, 50,123,246,236,119, 20, 10,133, 39,  0, 20, 22, 22, 62, 51, 24, 12,
-151,  1,236,170,201,108,191, 18,195, 20, 77,  8,121,246,228,201, 19,199, 29, 59,118, 88,  1,144,149,188,173,  1,144,  3, 32,245,
-117,102, 16,150,154, 41,149, 74,245,221,155,170,135, 82, 51,229,226,226, 82,191, 54,223, 23,  8,  4, 70, 66,  8,  8, 33,144, 74,
-165,184,114,229, 10,  6,189,215, 13,145,199,115,208,204, 74,137,214, 35,199, 96,207,217,179, 16,  8,  4, 32,132, 64, 32, 16,212,
-168, 29, 17, 10,133,184,122,245, 42, 62,249,120, 32,164, 66,192,210,210, 18,211,167, 79,199,145, 35, 71, 32, 20,242,171,233,253,
- 61, 17, 44,130,133,103,255, 88, 34,134,209,128,163,127,252,128, 99, 15, 10,116,143,210,241,109,163,116,172,217,143,124, 46,125,
-213,246,177,103,175, 62, 88, 57,106,112, 31,249,187, 93,186,225,221,128, 46,194,166,173, 58,207,  5,176,182, 92, 67, 29, 88, 85,
-174, 12, 35,135,239,183,156,122, 56,102, 79, 80, 20,129, 62, 31,131,187,183,162, 70, 14,223, 87,211,248,191,162,105,105,166,220,
-115,245,198, 13,107,232, 11, 16,115,239,130,204,221,179, 30, 96,212, 35, 58,250, 49,126,218,118,136, 11,186,253,232, 79, 29,139,
- 73, 79,178,104,161,169,154,197,142,138,133,165, 66,210,168, 87, 51,203,147, 28, 40,172,228,226,198,148, 51,194, 74, 46,106,220,
-189,137,226, 36,165,148,154,155,137, 26, 83,163,161, 90, 77,181,142,221,188,237,183, 95,126,252,236,179,207, 20, 25,  9, 41, 72,
-202,123,128,  2,137, 11, 12,114, 55, 60,185,119, 89, 93,164,101,171,109,188,171,170,207,140,140,140,180,224, 91, 89,216,179,105,
- 41, 12, 58, 45,210, 18,138, 61,106, 82, 70, 30, 44,236, 92,110,212, 68, 83,207,114,185,  3,134,141, 22,155,153,195,236,147,  1,
-125, 36, 79, 50,181,240, 85,153, 23, 95,228, 10,210, 17,121,238, 42,  2, 10,139,253,218,211,120,  6,117, 91,168, 76, 42,167,185,
- 76, 60,169,151,159, 11,158,197, 37,227, 74,120,226,182,167,153, 52,201,203,150,108,123,146,148, 51,182, 95,219, 58, 88,125, 36,
-226,203,202, 76, 81,101,154,222,142,100,  8,128,142,197,131,220,213,160, 64, 71,111, 71, 50,196,148,153,131, 21,105, 10,197, 24,
-250,227,201,216, 57,251,238,100,244,155, 49,180,147, 69,251,246,189, 37, 96,117,200, 87,107, 13, 17,217, 52,239,117,246,209,107,
- 68, 39,121, 77, 94,243,127, 82,179,196,236,252, 89,242,120,147,154, 73,120, 41, 47,211,235,110,123,249,238,192,164,164, 36, 97,
- 73,244,170,202, 65,238,213,105,150,239, 14, 76, 76, 76, 60, 81, 18,189,170, 50,138, 85,129,102, 82,155, 54,109,108,250,246,237,
- 11,163,209,136,199,143, 31, 35, 54, 62, 30,129, 99,191,132,149,149, 21, 46,135,134,226,209,163, 71,248,238,187,239,192,113, 28,
-110,222,188,153, 80,157,166, 72, 36,210,183,104,209, 66,252,193,  7, 31,128,101, 89, 60,125,250, 20,137,137,137,248,234,171,175,
- 96,105,105,137,224,224,224, 50, 77,173, 86,139,103,207,158,233,255, 63,142,165,127,143,193,  2,140, 48, 26,144,123,118, 30,214,
- 94,129, 94,111, 64,227,240, 52,250,188,220,251, 27,125,108,201,209,208,  7, 15,159,  5, 95,123, 87,130,180,176,226,239,212,128,
-168, 12,154,220,202, 77,152, 15,125,190,  5,158,158,196,243,212,252,130,168, 12,154, 92,211,141,160,156,145, 64, 95,  4, 36,223,
-197,245,203,151, 16,116,243, 62,238,132, 61, 52, 94, 15,142,218,195,112,248, 62, 34,131, 62,174,177, 38,165, 80,190,183, 26, 35,
-194,162,235,180,106,232, 88,  7, 70, 22,148, 51,192,114,240, 46,140,140,104, 95,167,149,151, 85,157,226,200,149,  1,214,159, 95,
-  0,126,148, 85,169,119, 39, 78,191,165,163,167,244,195,252,156,204,182, 93, 59,183, 83, 88, 54,233,133,140,232, 40, 60,190,127,
- 85, 29,252,224,201,245, 59,113,250,215,138,142,184,184,184,188,211,181,115, 35, 12, 30,243, 13,244, 69,185,120, 26,244, 27, 10,
-178, 82,112,229,134, 18, 15,243,242,218,  1, 48, 57,130,117, 61,214,208, 20,  0, 58,122,136,227,204,161,117,250,180, 79, 95, 72,
-137,  6,156, 54, 15,164, 40,  3, 79, 18,117,185, 31,110,138, 55,  2,128, 92, 74,132, 10,154,107, 97,138,174,119, 93,219,  6,114,
-129,  1,219,207,134,131,227,138,151, 89,226, 56,108,220,126,225,201,216,239, 63,241,133,119, 29,235, 22,132, 16, 82,147,208, 62,
-161,232,116,103,207,130,198,154,243,115,  1, 78,143,171,147,109, 26,119, 90,155,213,169,182,145,176,176, 68,154,  8, 96,108, 19,
- 21,217, 60,121,237,169,185,254,103, 35, 58, 78,251,188,159,  5, 40,191, 48, 58, 15, 15,207,127, 37, 18, 56,102,230,204,153,155,
-  5,  2,129, 61,  0, 66, 41,133, 86,171, 21,110,218,180, 73,196,178, 44, 35, 16,  8,140, 50,153,140, 13, 14, 14, 54,112, 28,151,
-174,215,235,199, 84,167,169,211,233,158,172, 95,191,190,158,193, 96, 40,155,113,168,213,106,241,219,111,191, 65,171,213, 66, 42,
-149, 66,169, 84,226,233,211,167, 32,132,232,141, 70,227, 19,126, 79,188, 73,131, 69,177,160,195, 39,243,230,  1, 32,160,152,255,
-146,185,  2,  0,132,102,210,164,166, 14,228,171,166,173, 58,207, 43,253, 78, 77, 11,160, 49, 26,  7,182,106,222,112, 55,  0,104,
-169,241,147,218,108, 68,158, 86,253, 81,203, 86,237,246,112,148, 10, 89, 74,127, 97, 56, 28,208,176,136, 52,101,230, 92,165,119,
- 30,105, 57,193,165, 11, 56,115,160,255,233, 22, 44, 73,199, 64, 41,165,101,221,130, 63,200,144,145,171,173, 54,143,211,213,103,
-218,110,173,234,136, 71,159,185,118,111,140,209, 72,157,  4,  2,146,162,214,177,155, 95,215, 92,149,220,125, 93,242,118, 32,103,
- 66, 91, 56,118,183,147,151, 68,181,138,128,140, 34,156, 73, 72,203,191, 84, 27,205,236, 66, 67,191,217,107,142,252, 37, 17,  9,
-132,160,180, 56, 17, 40,165,208,232,141, 89,165, 38,204,199,150,168,166, 31,102,119, 11,  4, 36,182, 58,189, 91,143,146, 87, 15,
- 94,118,238,235,240,152,236, 95,158,103,211,  7,  0,240, 60,155, 62,168,111, 75,230, 62, 73,201,255,250, 65,108,246, 15, 53, 29,
- 55, 65,  9,174,180, 26, 60,239,149,215, 94,183, 62, 35,147,232,125,  0,253,155, 58,144,110,131,167,253, 52,141, 16,240,203, 68,
-240,240,252,139, 40,141, 98, 49, 12,179,240, 77,105,150, 70,177,  0, 68,215,224, 59,183,  0, 52,127,147,219, 22, 28, 28,156,  9,
- 32,147,223,203,255, 37,131, 21,158, 70, 55,194,132,197,156, 77,253, 92,165,223, 79,162,231,  0,216,190,206, 70,148,104,216,188,
-201,138,  9, 77,165,115,255,142, 10, 47, 49, 83,127,203, 88,158,136, 52,218,  3,  0, 26, 52,104, 64,163,163,163, 65, 41,125,173,
-236,187,145,233,244, 62, 94, 90,114,161, 34,147, 13,160,147, 41,122, 81, 25,244,123,224,213, 46,224,232, 76,186,  8,192,162, 90,
-109,115, 45, 51,181,155,124,108,165,209,179, 64,245,217,244,121,120,120,222, 78,147,245,166, 53, 95,119,225,103,158,183,192, 96,
-241,252,239,242,248,241, 99,126, 89,  3, 30, 30, 30,158,202, 49,254, 13,154,124,210, 97,158, 23, 96,248, 42,224,225,225,225,225,
-225,225,225,121,179, 16,  0,129, 21, 90,241, 26,204, 14, 32,132,  4,214,216,234, 87,163,207,107,242,154,188, 38,175,201,107,242,
-154,188,230,219,167, 89,157,246, 91, 51, 59,145,150, 27,188,252,166, 31,  0,  2,121, 77, 94,147,215,228, 53,121, 77, 94,147,215,
-228, 53,255,109, 15,190,139,144,135,135,135,135,135,135,135,231, 13,195, 27, 44, 30, 30, 30, 30, 30, 30, 30, 30,222, 96,241,240,
-240,240,240,240,240,240,240,  6,139,135,135,135,135,135,135,135,135, 55, 88, 60, 60, 60, 60, 60, 60, 60, 60, 60,181,135,212,112,
-101, 18, 30, 30, 30, 30, 30, 30, 30, 30,158,106,224, 35, 88, 60, 60, 60, 60, 60, 60, 60, 60,188,193,226,225,225,225,225,225,225,
-225,225, 13, 22, 15, 15, 15, 15, 15, 15, 15, 15,111,176,120,120,120,120,120,120,120,120,120,120,131,197,195,195,195,195,195,195,
-195,195, 27, 44, 30, 30, 30, 30, 30, 30, 30, 30,222, 96,241,240,240,240,240,240,240,240,240,252,247, 13, 22, 33, 36,144,215,228,
- 53,121, 77, 94,147,215,228, 53,121, 77, 94,147, 55, 88, 60, 60, 60, 60, 60, 60, 60, 60, 60,188,193,226,225,225,225,225,225,225,
-225,225, 13, 22, 15, 15, 15, 15, 15, 15, 15, 15,111,176,120,120,120,120,120,120,120,120,120,120,131,197,195,195,195,195,195,195,
-195,243, 95,130,  0,168,112, 38,  0,165,244,156,201, 34,181,152, 77, 80,157, 62,175,201,107,242,154,188, 38,175,201,107,242,154,
-111,159,102,117,218, 53,241, 31,255,104, 40,165,127,219,  3, 64, 32,175,201,107,242,154,188, 38,175,201,107,242,154,188,230,191,
-237,193,119, 17,242,152, 26,165,116, 36,132, 56,242, 53,193,195,195,195,195,195, 83, 61,194, 55, 41,214,152,144, 54, 43,223,169,
- 51,175,247,165,216,158, 38, 52,216, 12,254, 51,  6,140, 43, 14,166, 21,219,226,215, 48,  1,111, 92,147,  7, 32,132, 44, 37,  4,
- 51, 74,254, 95, 65, 41,253,230,109,220,206, 25, 51,102, 12,244,245,109,  5,107, 89, 42, 90,121, 61,  6,178,119,  1,214, 31, 97,
-206,233, 46,104,229,219,  1,151, 67,226,113,249,102, 56,110,108,232,139,207,167,204,131, 70,163, 71, 70, 70, 18,238, 95, 61,181,
-255, 45,218,215,109, 69, 34,209, 71,214,214,214,230,105,105,105,231,  1,252,  5,224,125,  7,  7,135,174,217,217,217,249,  6,131,
- 97, 47,165,244,102,109,180,223,105, 73,102, 74,196,162, 81, 26,189, 97,249,213,123,244,183,  0, 63, 98,203,114, 88, 38, 19, 11,
- 59,105,117,236,138, 43,247,233, 47, 53, 44, 43,121, 41, 26,207,159,235,175,201,187,239,190, 59, 66, 32, 16, 44,  6,  0,163,209,
-248,237,133, 11, 23,254,120, 19,186, 42,149,106,  8,165, 84, 81,178,223, 10,147,146,146,118,153,250, 93, 63, 63,191, 88,  0,117,
- 74,158,198,  5,  7,  7,215, 53,229, 61,158,154,113,247,238, 93, 90,183,110, 93, 52,111,222,252, 81, 74, 74,202, 79,148,210,141,
-124,173,252, 67, 12, 86, 35, 66,234,143,237,221,254,108,247, 15,123, 40, 76, 49, 66, 46, 46, 46,203,236,237,237,199, 21, 21, 21,
-105,  0, 80,129, 64, 64,155, 52,105,  2, 66,  8, 74,175,155, 70,163, 49,253,225,195,135,205, 76, 53, 87,111, 74,179, 97,195,134,
-119, 25,134,113, 45,127,253,174,238,127,142,227, 18, 34, 34, 34,252,171, 43,167,179,179,115, 15,134, 97,102, 85,247, 57,142,227,
-150, 37, 39, 39,159,174,234, 51,205,155, 55, 15, 81, 40, 20,142, 12,195,144,202, 62, 83,190,205, 97, 89,150, 22, 21, 21,165,134,
-135,135,251,214,160, 17,115, 36,  4, 51, 56,142, 50,  0,192, 48,100,166,181,181,245,206,236,236,236,136,210,247, 75,126, 39,181,
- 38,199,139,139,139,203,112,  0, 95,  3,160,  0,126, 76, 76, 76,220, 86,147,239, 55,104,208,224,174, 88, 44,118, 21,  8,  4,228,
-229,125, 82,209,115,142,227,168, 78,167, 75,120,244,232, 81,165,251, 40, 40,232,210,190, 21, 43, 86,132,108,249,245, 23,223, 22,
- 45,  7,130,145,119,129,158, 90, 32, 36, 70,139, 86, 45,  8, 40,199, 65,147,151,  6,142,227, 80,164,209,226,252,161,223, 66,234,
-120,212,243, 69,241, 88,198,183,193, 92,245, 28, 62,124,248,146,229,203,151,219, 73, 36, 18,102,239,222,189,237,190,250,234,171,
- 81,171, 87,175,118,249,232,163,143,204,117, 58, 29, 55,115,230,204,119,  8, 33, 11, 40,165, 71,106,162,221,190, 37,105,219,200,
-195,249,187,137,195,222,197,215, 75,119, 79,236,216,156,100,152, 41,196, 27, 63,236, 84,207,170,169,167, 53, 22,108,190, 62,  9,
-192, 47, 53, 40, 43,113,115,115,107,233,232,232,232,161, 86,171,141,  0,208,180,105, 83, 42, 16,  8, 94,248,156, 94,175,215, 63,
-124,248,240,  4,127,169, 55, 13,129, 64,176,248,212,169, 83,206,148, 82,244,232,209, 99, 49,128, 55, 98,176, 40,165,138,228,228,
-228,210,107,160,162,134, 95,175, 19, 28, 28, 92,106,168,234,212,224, 61,147,105,215,174,157,140,213,235,199, 11, 24,166, 59,  5,
-154,163,248,164, 14, 51,  2,103,133, 66,225,207, 55,110,220,208,188,237,251,254,236,217,179, 24, 61,122, 52,194,194,194, 26,157,
- 56,113, 98,131, 74,165,154,144,156,156,220,133, 82,154,206,159, 25,255, 69,131,213,148, 16,135, 62,126,141,174,140,255,100,160,
-156,219,191,134, 96,196,156, 42,141,144,179,179,243,242, 78,157, 58,141,218,177, 99,135,226,240,225,195, 10,119,119,119,136,197,
- 98,  8,  4,  2,  8,  4,  2, 48, 12,  3,161, 80,136,247,223,127,223,164,134,235,101,205,243,231,207, 43, 26, 54,108,248, 74, 35,
-203, 48, 12,122,245,234, 85,173, 38,195, 48,174, 33, 33, 33, 14, 50,153,172,204,164,112, 28,247,194,163, 92, 63, 52, 88,150, 69,
-167, 78,157, 76,170, 43,134, 97,102, 69, 70, 70,190, 83, 88, 88, 88,101,223,109,137,222,233,106,180, 84,215,174,156,119, 32,250,
-103,  0,155,  5, 42,176,  1, 36,158,  0, 35,173,240,243, 89, 89, 89,232,210,165,139,224,117,246,245,123,239,245, 33,148,210, 67,
- 42,149,234,124, 70, 70,134, 57, 33,248,184,150,145,173,111,162,162,162,204, 41,165,104,212,168,209, 44,  0, 53, 50, 88,  2,129,
-192,245,204,153, 51, 14, 82,169,180,108, 63, 87,246,215,104, 52, 66,175,215,163,103,207,158,108, 53,166, 22, 63,111,254,205, 87,
-163, 53, 64, 67,221, 17, 30, 89,136,147, 39, 15,193,163,208,128, 39, 15, 52,224, 56, 21, 52,249,105,160,148, 66,173,209,161, 69,
-192,135,190, 28,247,246,  4, 77, 44, 45, 45,  7,174, 94,189,218,254,151, 95,126,201,123,244,232,145,126,211,166, 77,246, 99,198,
-140,105,172,215,235, 49,118,236,216,244, 70,141, 26,137, 87,175, 94,109,127,232,208,161, 30,  0,106,100,176,132,  4,223,127,220,
-175, 59, 52,  6,  6,  6,  3,107,239,108,111,254,231,228,225,  1, 34, 74,117,216,126, 36, 24,  6,150,251,173,166,230,170, 87,175,
- 94,117, 55,110,220, 40,140,140,140, 20, 54,105,210,  4, 70,163,177,236,193,113, 28,140, 70,163,201,231, 37,207, 11,231, 22,226,
-227,227, 97,105,105,105, 22, 16, 16,144, 76,  8,153,127,241,226,197, 45,127,199,111,189, 78,100,235, 77,225,231,231,215, 90,200,
- 48,  7,230,206,158,232,228,211,178,165,192,193,209, 30, 81,143,227, 32, 22,112,129,209, 15,163,  2,150,252,176,113,178,159,159,
-223,135,193,193,193,183,223,182,125, 93,119,192, 47, 27, 56, 86, 63,174,248,153, 21,128, 45,200,207,207,199,231,159,127,142, 35,
- 71,142, 52,105,219,182,237, 50,  0,163,248,179,226,191,100,176,188,  9, 81,180,112,119, 10,250,254,235, 49,214,244,228,239, 76,
- 81,102, 26,196, 85, 24, 33, 39, 39,167, 69,157, 58,117,250,100,199,142, 29,214,132, 16,156,157, 56, 10,214,122, 13, 84,223,173,
-128,181,157, 61,116,179, 70,195,220,200,194,231, 98,168,169, 23,219, 87, 52, 31, 61,122,132,236,236,108,216,217,217, 65, 46,151,
- 67, 38,147, 65, 44, 22, 67, 34,145,152,170,  9,153, 76,134,115,231,206, 65, 40, 20, 66, 32, 16, 64, 40, 20,150, 61,202, 63, 23,
-  8,  4,112,116, 52,125,104, 18,199,113,203, 26, 55,110,236, 19, 21, 21,101,145,147,147,131,182,109,219,230, 17, 66, 66,203,221,
-233,249,132,134,134, 90,152,220,216,232,159,161, 32,110, 19,104,246,  1,192,106,  0,140, 22,131,161,129,103, 89,  3, 83,254, 47,
-199,113,181,185,243, 76, 37,132,172,232,219,183,207, 44,128, 32, 48, 48,176, 96,226,196,137,244,209,163, 71,221, 63,248,160,159,
-199,227,199,209, 37,102,143,204, 32,132,172, 53, 53,146, 69, 41,149,  2,192,149, 43, 87, 64, 41,149,213,230,216,147, 74,165,184,
-113,227, 70, 89,132,146, 97, 24, 48, 12,  3,129, 64,128,163,209,118, 40,212, 49, 40, 74,125,128, 47,251,212,129,167,167,231, 43,
-134,251,149,125, 67, 41, 38,140, 25, 21,178,112,249, 26, 95,163,209,136,147, 39, 79, 98,213,170, 85,208,106,181,  8,232,218, 29,
-207,105, 11, 52,243,180,  3,199,113, 80,107,116,  8,189,116, 32, 68, 85,199,211,247,109,185, 24,228,230,230,254,217,176, 97, 67,
- 65,122,122,250,  5,  0,207, 12,  6,195,250, 63,255,252,211,225,179,207, 62, 75,219,177, 99,199, 68,  0,110, 43, 87,174,236, 81,
- 80, 80,176,167, 38,186,157, 90,144,222,254, 45,155,181,173,227,230,134, 75,215,111, 67, 44, 17, 89,141, 31,209,  7, 74,165, 16,
- 63,252,114,156,139, 77,200,154,120,229, 62,221,102,226,185, 73,156,157,157,125,186,119,239,238,182,113,227, 70, 49,  0, 60,120,
-240,  0,105,105,105,176,181,181,133, 76, 38,131, 72, 36, 42,187, 97,227,169,145,209,104,216,165, 75, 23,153,209,104, 68, 97, 97,
- 33, 54,110,220,104,105,102,102,102,217,171, 87,175,121,  0, 76, 54, 88,237,219,183, 79,213,233,116, 14,  0, 32,145, 72,210,174,
- 95,191,238,  8,160,200,195,195,195,172,228, 35,234, 26, 70,182,226,202, 69,167,226,106,240, 94,181,248,251,251,183,106,210,208,
-227,220,210,165,243,149, 57,121, 41,176,180, 76,  5,131, 28,108,217,242, 51,204,204, 44, 48,111,222,108,161,127,155, 54, 46,147,
-191,154,125,206,207,207, 47,240,109, 51, 89, 28,171, 31,215,194,191,125,217,243,109,103,215, 65,107,233,139,196,249,243,177,102,
-205, 26, 52,104,208,160, 53,127,102,252,151, 12, 86,  0, 33, 66, 87, 27,229,209, 13,243, 38,123, 48, 55,142,137,212,113,209, 72,
-210, 24, 97,245,159,147,231, 92,249, 11, 35,  0,198,209,209,113,252,174, 93,187, 44, 74, 27,187, 70,196,  8, 43,232,225,209,180,
- 41,228,150, 86, 72, 97,245,160,  6, 61,196, 34, 81,133, 13,162, 41,154,165, 17, 48,177, 88, 12,177, 88, 92,118,193, 21,139,197,
-213,106,190, 80, 57, 66, 33, 24,134,193,217,179,103,193,178, 44,  6, 14, 28,248,138,185, 18, 10,133, 47,116, 65, 86,167,153,156,
-156,124,218,197,197, 37,148, 82,250,142,209,104,  4, 33, 36, 52, 49, 49,177,115,233,251,206,206,206, 61, 90,180,104, 49,139,227,
-184,101, 38,149,147,205,  4,205,218,  5,243,118, 25,200,187, 97,  7,162,  8,  4, 71,220, 17,246, 56, 25, 23,238,196, 32, 61,187,
- 16,126, 13,237,209,163,125, 61, 24,141, 70,147,183,189, 60, 46, 46, 46, 87,210,211, 51,  6,189,251,238,187,200,202,202, 98,231,
-207,159,143, 22, 45, 90,160, 97,195,134,149,153,167,106, 53,  9, 33, 73,161,161,161,238,106,181, 26,132,144, 36, 19, 12,217,185,
-138,140,240,159,127,254,  9,141,230,213,232,189,117,231, 37,248,122, 64, 93,140,252,114, 27, 86, 60,218,139, 13, 27, 54,224,229,
- 33, 58, 47,107,114, 28,135,133,203,214,248,170,181,186,178,186,210,106,181,184,113,227,  6,180, 69,249,184,184,227,139,178,232,
-165, 90,163,131,171, 79, 55,223,234, 52,223,  4,255, 95,154,148,210, 32,  0, 65,229,234,119,206,142, 29, 59,  6,  1, 56, 72, 41,
-189, 14,224, 58,128,221, 53, 46, 39,193,200,143,  6,124,  0,161,216, 28, 15,163, 19,208,185,157, 47, 28, 29, 28, 16, 26,249,  4,
-177,137, 89,169,132, 96, 68,207, 14,210,101,106,181,110,206,229,123,244,215,234, 52,157,157,157, 61,183,108,217, 34, 42, 31,113,
- 17,  8,  4, 47,156,235,165,175, 85,100,178,254,151,247,209,223,165,233,231,231,215, 48, 32, 32,224,250,162, 69,139,172,226,227,
-227,113,237,218, 53,184,187,187,163,168,168,  8,213, 13,109,123, 89, 83,167,211, 57,148,235,182,115,  0,128,148,148,148,221,248,
- 79, 87, 58,173, 73, 57,171, 26, 87, 85,147, 49, 87, 47,151,179, 94,189,122, 18, 59,107,235,125,203,150, 47, 84, 70, 68, 94, 70,
-203, 22,109,161,180,244,  6,103, 76, 65,102, 86,  1,178,163,147,176,104,209, 10,204,155,255, 45, 86, 44, 95,164, 28, 60,100,228,
-129,118,237,218,213, 47,223, 93,248,191,190,223, 25,161,120,227,253,187,215,199,  1, 64, 94,228, 65, 76, 30,210, 30,249,249,209,
- 24, 59,118, 46, 18, 19, 19,241,248,241,227,224,255,207,114,242,  6,171,156,185,241,151,138,118,238,158, 55,177,181, 52, 38, 76,
-162,125,112,  3, 73, 90,142,254, 17,207, 38,254, 80,197,247,138,138,138,116, 71,142, 28,193,153,  9,163, 80,159,176,176,249,110,
- 37, 28, 93, 92,144, 51,242,125,228, 27,244,168,119,242, 54,164, 74, 37, 36, 10,101,181, 17,135,242,154, 23, 47, 94, 68,120,120,
- 56,132, 66, 33,148, 74, 37,148, 74, 37,164, 82, 41, 36, 18, 73,153,185,170,204, 96, 85,114,240, 64, 32, 16,224,193,131,  7,136,
-141,141,133,149,149, 21,174, 93,187,134,174, 93,187,190, 18,197,170,229,  1, 95, 97, 68,169,100,220,213,105, 83, 53, 32,178,  3,
-108, 62, 65,254, 77, 21, 96, 61, 12,  6, 88,193,104, 52,226, 94,116, 38, 70,127,242, 30,  0, 96,252,156, 77,  8,108,227, 81,102,
- 14, 76, 69,165, 82,153,  1,152,209,160, 65,131,193, 67,135, 14,101,197, 98, 49, 10, 11, 11,161, 86,171,241,224,193,  3,246,189,
-247,250, 20,244,237,219, 71,121,252,248,113,142, 82,172,168,225, 56,172, 84,149, 74,229, 94,210, 13,155, 90,139,227, 15,132, 16,
-236,221,187,183,194,247, 71,172,138,128,176,120,120, 22, 54,110,220,  8,163,209,  8, 74, 41,169,174, 62,191,155, 53, 37,100,242,
-204,133,190, 28,199,161,107,215,174,152, 54,109, 26,158, 62,125,138, 65,131,  6,149, 69,  3, 41,165, 80,107,181, 72, 12, 59, 23,
-226,236,230,225,251,182, 94, 28, 40,165, 39,  0,188,254,248, 37, 10, 23,  7, 39, 55, 48,212,128,164,180, 76,124,240, 94,119,  8,
-196, 74, 60,143,207, 64, 11,111, 47,231,161,239,119,112, 22, 16, 22, 51,150,237, 26, 15,224, 87, 19,206,119, 99,100,100,164,232,
-254,253,251, 16,  8,  4,176,176,176,128, 92, 46, 47, 59,199,203, 27, 46,158,202,233,214,173,219, 24,  0,243, 40,165, 57,  1,  1,
-  1,142,139, 23, 47,182, 78, 76, 76, 68, 68, 68,  4,246,238,221,155,206,178, 44, 11,128, 80, 74, 23,188,129, 99,137, 43, 31,217,
-106,223,190,125,218,245,235,215, 29,  9, 33,133,165,145, 43, 66, 72, 97, 45,162,110,162,188,156,228, 47,173, 21,180,159,144, 49,
-247, 96,243, 10,158,103,179,204, 17, 11,123,199,159,130,131,131, 13, 85,125,215,210,210,242,243,197, 11,167,170,236,236, 56,  4,
-116,126, 23,201,169,122, 44,153, 58, 28,153,153,249,248,117,235, 82,  0, 18,232, 89,  1,222,  9,248, 16, 14, 14, 46,232,212,177,
-147,211,165,171, 87, 38,  0,248,225,109, 57,  6, 98, 15,126, 62,158, 16,242,125,157, 58,117, 46,109, 90,186,180,126,215,174, 93,
-  1,  0,231,207,159,199,111, 67,134, 96, 62,240,233, 58, 66,146, 39,189,165, 19,155,254,177,  6,203, 67,170,188,180,229,171, 65,
-109,109,141, 69, 34,221,213,163, 72,212,114,236, 15,209,250,162, 59, 57,116,200, 15, 21,159, 96,148, 16,194, 17, 66, 56, 79, 79,
- 79, 88, 24, 52,176,162, 58, 56,170, 84, 48,183,177, 69,150,161, 56,114, 37, 81, 40, 32, 81, 40, 77,186, 56,150,215,244,246,246,
- 70,106,106, 42, 36, 18,  9,148, 74, 37,204,205,205, 95, 49, 87,166, 94,112,  9, 33,224, 56, 14, 66,161, 16,161,161,161,232,216,
-177, 35,220,220,220,176,119,239, 94,244,232,209,227,149, 46, 67, 83, 77,219,203,141,121,249,136, 82,233,224,119, 83,  6,183,191,
-128,164, 30, 88,243,143,192,200,187,194,  0, 75,104, 56,167,226,238, 64, 74,113,226,118, 42, 30,197,102,130, 51,114, 53,238, 34,
-116,118,118,246,147,201,100, 43,102,205,154,169,106,209,162,  5,210,211, 51,192,113, 28,148, 74, 37,212,106, 53,204,205,205,209,
-161, 67,135,148,249,243,231, 63,163, 20,189, 40,165, 41,255,141,  3,248,204,153, 51, 47,116, 15,150, 62, 10,147, 19, 48,114,210,
- 14, 72,132, 64,104,104, 40, 26, 55,110, 92,125,184,156,163,152, 52,115,129,175, 70,171,131, 68, 34, 65,251,246,237,209,182,109,
-219,178,113,113,165,  6, 85,175,215,195,104,228,224,228,253,174, 47,121, 11, 47, 10,132,144, 86,  0, 62,179,180,180,116, 47, 42,
- 42, 74, 49, 24, 12,123, 75, 76,127, 15,145, 72,244,145, 92, 46,119,202,205,205,141,  1,240, 43,165,244, 78,117,122,102, 50,153,
-173, 84,102,  1,142,213, 66, 40, 20,194,205,205,  3,212,168, 67,118,158, 26, 35,  6,247, 69, 72,104, 36, 78, 93,188,201, 26, 12,
-220, 58, 83,203,216,176, 97, 67,100,102,102, 66, 32, 16, 64, 46,151, 67,161, 80,160, 81,163, 70,136,143,143, 47, 51, 87,124, 23,
- 97,181, 44, 56,121,242,164,131, 80, 40,116, 50, 26,141,136,139,139, 67,120,120, 56,214,174, 93,155,154,159,159, 31, 16, 28, 28,
- 28, 85, 27, 81,137, 68,146, 86, 26,185,146, 72, 36,105, 85, 69,182, 94,103,204,149,171,171,171,151,139,131,244,236, 31,107, 39,
-214,241,105,217,154, 49, 19, 40,179, 11,159,166,118,188,125,243,102,251, 57,191,238,159,224,234,234,218, 61, 33, 33,225,105,165,
-141, 31,195,244,106,225,219, 82,  8,154,  2,161,164, 35, 86, 44, 31,140,244,140, 60,100,103,229, 67, 44, 86, 64,103, 16,192,200,
- 17,180,239,216,  9,191,111,219,131,166, 77,155,  9,  4, 64,183,183,201, 96,149, 68,128,151, 29, 62,124,184,190, 76, 38,195,226,
-197,139, 97,110,110,142,155,223,127,143,223,196, 98,152,  1,216,168,215,207,  2,192, 27,172,255, 47,131,165,112,108, 52,100,247,
- 39,221, 58,120,123,186, 48,134,189,107,145, 80,196,106,230, 61,210,107, 30,230,211,247, 35, 40,189, 86,149,175, 32,132, 80,177,
- 88, 12,199,153,223,163,110,179,230, 40, 28, 61,  0, 89,  6, 61,188,142,223,132, 84,169,196,195,110,190,160, 58, 29,222,121,152,
-102,170,113,161,132, 16, 10,  0,246,246,246, 16,139,197,144,201,100,144, 74,165,144, 74,165,101,198, 74, 34,145, 64, 34,145,152,
-108,134, 56,142, 67,126,126, 62,158, 63,127,142,209,163, 71, 67, 46,151,163, 36,212,141,186,117,235, 66, 40, 20, 34, 49, 49, 17,
- 23, 46, 92,128,167,167, 39, 36, 18, 73,141,218,218,114, 13,182,143,139,139,203, 37, 66,136,207,221,187,119, 45,252,253,253, 97,
-106,  4,171,184, 53, 20, 67,139,186,224,136,219, 11, 99,173, 12,  6,246,133,109, 41,141,190,152, 24,185,234, 86,191,126,253,181,
-203,151, 47,103, 92, 93, 93,193,113, 28,172,173,173, 81, 84, 84,132,140,140, 76,120,123,123,195,205,205, 13,203,151, 47,  7,128,
-221,255, 45,115,  5, 20,119,  7,151, 26,172,242, 70,107,210,251,117,144,149,165,132, 64,192,148, 25,230,106,247, 57,165, 88,183,
-124, 94,200,208,209,211,124,167,204, 89,  1,141, 86, 15,181, 86,  7,141, 86,  7,141, 86, 95,242, 87,135,210,129,237, 41, 17, 23,
-222,186,  8, 22, 33,164, 79, 96, 96,224,250, 85,171, 86, 57, 57, 57, 57,137,210,211,211,217,159,127,254,185,199,207, 63,255, 28,
- 49, 97,194,  4,239,  9, 19, 38, 88,219,219,219, 11, 83, 82, 82, 12, 83,167, 78,237, 65,  8,153, 69, 41,221, 93,229,245, 66, 97,
-110, 35, 16, 43, 64,136, 16, 86,150,214, 16, 74, 20,224, 88, 33,140, 28, 96, 97,105,143,235, 33,251,113, 45, 44,127, 76, 90, 38,
-246,153,114, 83,213,172, 89, 51, 42, 16,  8, 96,107,107,251, 66,215, 32,  0, 56, 58, 58, 34, 47, 47, 15,  2,129,160,236, 53,158,
-202,175, 65,148, 82, 60,123,246, 12, 69, 69, 69,184,126,253, 58, 14, 28, 56,144,254,178,185, 10, 12, 12,252, 66,169, 84,206, 87,
-171,213, 43, 78,159, 62,189,182, 58,221,146, 49, 87,111,140,138, 82, 49,248,249,249,137,156,108,  5,167,207, 28, 92, 93,215,156,
-187, 71, 16,243, 57,240, 56, 47, 92,121,203,225,157,174,173,222, 99,154,127, 63,217,189,215,236, 31, 79,251,249,249, 53,170, 44,
-146, 69, 41,245, 53, 83, 40,  1,164, 34,248,110, 80,153,185,202,204,202,133, 86, 47,128, 86, 71,160,209, 51,120, 55,176, 39,214,
-111,250, 19,137,169,153, 40,157, 97,248, 54,209,160, 65,  3, 63, 23, 23, 23, 76,153, 50,  5,154, 93,187, 80,  0,160, 15,128,195,
-122, 61,  0,192, 28,152,198,159, 45,255, 79,  6,203,202,169, 81,231, 57, 51, 39,175,233,248, 97, 79, 38,245,139,118,200, 41,208,
-106,103, 68,176, 92, 66, 81,181,230, 10,148, 82,218,184,113, 99, 48, 12,  3,165,165, 21,204, 44, 44,160, 41, 23,185,146, 42,205,
- 65,117, 58,112,122, 29,196, 38, 94, 28, 75, 53, 41,165, 48, 51, 51,131, 88, 44,126,161,107,176,212, 88,213, 36,130,  5,  0, 57,
- 57, 57,216,183,111, 31, 90,183,110, 13,185, 92, 14,161, 80,  8, 31, 31, 31, 68, 70, 70,194,203,203, 11,132, 16, 28, 62,124, 24,
-253,251,247,199,211,167, 79,225,237,237,173,172,141,193, 58,123,246,172,  5,165,244, 29, 74, 41, 50, 50, 50,106,181, 19, 57,142,
- 67, 65, 65,  1,206,156, 57,131,228,228,100, 56, 58, 58, 34, 59, 71, 14, 75, 85,147,226,223, 42,103,178, 76,100,124,159, 62,125,
- 24, 66,  8,212,106, 53,164, 82, 41, 20, 10, 37,204,205, 45,208,176, 97, 35, 36, 38, 38,162,123,247,238,198, 39, 79,158,236, 18,
-139,197,235,106, 90,222,122,245,234,153,231,228,228,188,231,225,225, 33,  6,  0, 51, 51,179, 62,238,238,238,150, 49, 49, 49,185,
- 53, 52,  3,101,198,138, 16, 82, 54,  3,149, 97, 24,  8, 25,  6,206, 78, 14,101,207, 75,182,157, 84, 87,143, 67,190,152,230,203,
- 25,117,216,190,234, 83, 16, 54, 19, 44, 44,161,133, 11, 88,163,160,204,192, 42, 20, 10, 52,237,252,209, 91, 25,193, 18,139,197,
-195,183,110,221,234,242,199, 31,127,228, 28, 57,114, 36,183, 77,155, 54,138, 53,107,214, 56,172, 95,191,190,139, 78,167,195,148,
- 41, 83,210,110,221,186, 85,216,175, 95, 63,203, 45, 91,182,184,212,175, 95,255,125, 84, 48, 46,139, 16,162,  0, 48, 24,192, 39,
-  1,173, 45,133, 57,249,106,112,172, 14,207, 98,158, 35,183, 64,  7,206,168, 71, 92, 66, 18, 10, 52, 70,100,102,229,195,199,183,
-251, 79, 65, 65, 65,223, 18, 66,102, 83, 74,143, 85, 87, 78,163,209,136,155, 55,111,226,218,181,107,184,124,249, 50, 98, 99, 99,
-203,222,179,176,176,192,217,179,103,209,165, 75, 23,254, 10, 95,245, 53,104, 94,247,238,221,231,217,218,218,202,214,173, 91,103,
- 89,183,110, 93,176, 44,171,123, 57,114,229,239,239, 63,103,206,156, 57,206, 31,124,240,193, 68,  0,107,107,251,123,149, 69,182,
- 76,224,149, 84, 12,233,233, 41, 95,252,180,117,184,157, 66, 28,155,132,199, 63,186,148,196, 98,128,162, 60, 32,104, 39, 72,135,
-185,207, 71,  4,142,183, 94,126,100,253, 23,  0, 54, 84, 38,252,228,105, 60, 54,110, 92,143,175,166,140,192,239,191,174,  0,199,
-  9,161, 53,  8, 80,199,163, 45,180,122, 14,132, 17,162,133,175, 63, 46,  6, 93,129,136,  1, 38,143,185,245,214, 29,  7,143, 31,
- 63,190, 29, 27, 27,219,120,238,220,185,248,221,197,  5,230,230,230,152, 58,111,222, 13,150,101,219,243,103,201,255,147,193,242,
-107,232,245,189,165,141,245,168,246,173,154,216, 78,157,248,133,232,105,138,  6, 23, 58,126,147,179,127,249, 76,101, 60, 85, 78,
-136,165, 57,215,106, 18,117, 96, 23, 78, 69,166, 81,  7,143,163,215, 33, 85, 42, 17,213,195, 31, 84,167, 67,135,144, 88, 72,149,
- 74,  8,101,102,181, 57,129, 95,232, 14,124,249, 57,195,152,150,184, 94,175,215, 91,117,235,214, 13, 93,187,118,197,135, 31,126,
- 88, 54,230,170,101,203,150,216,189,123, 55,  6, 12, 24,128,123,247,238,193,217,217, 25,141, 27, 55, 70,227,198,141,113,225,194,
-133, 26,223, 61, 26,141, 70,244,232,209, 35,143, 16, 18, 74, 41,245,185,125,251,182, 69, 77, 53, 74, 27,155, 51,103,206,224,189,
-247,222,131,151,151, 23,130,131,131,113,102,193, 15,144,219,212,  1, 96,  5,206,104,132, 78,167,  3,195, 48,213,142,193, 10,  8,
-  8, 16, 10,  4,130, 70,245,234,213, 67,122,122, 58,210,211,211, 97,111,111, 15,149, 74,  5,  7,  7,  7,172, 90,181, 10,107,214,
-172,185, 77, 41, 93,150,146,146,242,176,166,251, 72,165, 82,  5, 90, 91, 91,255,160, 86,171,197,165,101, 33,132,136,156,157,157,
-111,168, 84,170, 89, 73, 73, 73, 71,107, 98,176,244,122, 61,  8, 33, 56,254, 76,133, 66, 29, 65, 94, 66, 48, 38,191, 95,247,  5,
-195, 37, 18,137, 94, 72,171, 81,185,193,162,216,181,245,199,144, 89,223,124,230,139,172, 29, 96, 51,119,128, 88, 15,193,129,240,
-158,248,243,150, 45,  0,160,161, 19,131, 31, 71, 41,223,218,  8,150, 94,175,223,210,160, 65,  3,232,116,186,243,  0,182,134,134,
-134,246, 79, 78, 78, 94,253,215, 95,127,169,  6, 13, 26,148,116,244,232,209,175,  0, 28, 10, 13, 13, 29,185,120,241,226,174,  6,
-131,161,194,217,101,  2,129,224,247,169, 83,167,  6, 12, 26, 52,136,136, 25,131,238,204,233,109, 66,150, 53,144,233,179,127, 49,
-  6, 93,189,196,176,172,129,124,248,241, 84,238,196,133, 48,102,204,164,149,198,150,109,223,195,131,  7, 15,156,250,244,233,179,
-  8,128, 73,  6, 75, 36, 18,149, 25,232, 10,126,159,239, 34,172,134,243,231,207,111,  6,176, 57, 32, 32, 32, 85,161, 80,160,160,
-160,224,149,115,164, 93,187,118, 50,149, 74, 37, 19,137, 68,104,221,186,181, 77,143, 30, 61,162, 24,134, 89,123,242,228,201, 26,
- 39,161,172, 40,178, 85,219, 52, 13,230,214, 92,159,150,109,155,154, 63, 50,159,111, 46, 19,106,238,185, 71,201, 44,  8,128, 92,
-173,227,179,235,177,131,243, 72,154,180,101,179, 64,119,200, 25, 89,159,202, 12, 22, 33, 36, 36, 47, 39,183, 87, 94,190, 14, 87,
-175, 61,192,199,131,235, 67,171, 39,224, 56,  6,  5,133, 90, 64, 32,  2,  3, 96,200,208,225,160, 68,136,236,140, 20, 16, 32,236,
-109, 59, 14,140, 70,227,172,126,253,250,181, 90,188,120,113,147,169, 83,167,150,238,151,118, 42,149, 42,130,207,131,245,255, 96,
-176, 26,120,185,246,236,220,202,127,210,183,179,191, 53,127,124,251, 50,190, 93,244, 19, 87,223,191, 71,238,178, 93,135,243,115,
-149,117,186, 22, 37, 61,188, 87,211,168,131,136, 53,128,178,122, 72,149,202, 23, 34, 87, 18,133,  2, 34, 51,121,141, 54,130, 16,
-  2, 74,233, 43,221,129,229,205, 85, 77, 46,182, 18,137, 36,231,202,149, 43, 14,  9,  9,  9, 47, 12,104,247,240,240,  0, 33,  4,
-183,110,221,194,205,155, 55,241,241,199, 31, 67, 40, 20, 66, 36, 18, 33, 52, 52, 52,191, 54, 17,172,210, 89,132,206,206,206, 61,
-218,180,105, 83,225,236, 65, 83, 34, 88,113,113,113,240,242,242,130, 86,171,133,181,181, 53,178, 82,158,225,233,227,135, 40,210,
- 26,224,238, 32, 65, 70, 70,  6, 74,243,122, 85,197,165, 75,151,168, 74,165,122, 33,242,147,158,158, 14, 79, 79, 79,108,220,184,
- 17,107,214,172,217,144,156,156, 92,227,187, 88, 23, 23, 23, 27,142,227, 22,247,233,211,167,111,255,254,253,209,163, 71,143, 23,
-222,223,177, 99,135,229,193,131,  7, 55,185,185,185,245, 23,  8,  4,179, 98, 98, 98, 82,171,219,231,  0,240,219,111,197,233,147,
-228,109,231, 97,214, 32,119,124, 50,126, 27,126,252,241, 32,164, 82,233, 11,141,237,194,133, 11,171,175, 71, 74,209,237,195,207,
-125,187,248,232, 96,204, 60, 12,139,246,217,200,187,110,141,220,124, 95,220, 90,213, 27,  0,208,252,179, 99,160,212, 29,  0,222,
-202,  8, 22,165,244, 44,128,179,229, 94,218, 79,  8, 49, 16, 66,134,  2,216, 67, 41, 61, 88,242,250, 47,168, 34, 49,104,219,182,
-109, 91,206,158, 61, 91, 84,154, 54, 67, 85,103, 49,171,215,235, 57,  0,104,228,243,206, 11,125,213,209,209,209,248,241,199, 31,
- 81, 88, 88,  8,113, 13,194,204,129,129,129,101, 99, 34,197, 98, 49,236,236,236,160,215,235,193,178, 44,111,174,106,198,188,222,
-189,123,207,163,148, 82,142,227,230,150,187,217,146, 90, 91, 91, 95,249,233,167,159,108, 89,150,197,180,105,211,172, 50, 51, 51,
-173,198,142, 29, 59, 11, 64,165,  6,171,146, 52, 13,149, 29,111,181, 74,211,192,113,104,168, 84, 90, 32, 19,  9,208,218, 25, 90,
-230,216,178, 89,103,147,191,184,167,138,245,245, 86, 24, 13,158, 76,158, 14,150, 50,115, 80, 74, 27, 86,246,219, 44,199,157,124,
- 24, 17,209,189,142, 91,125,193, 95,199, 46,163, 95,255, 65,208,106, 25,104, 12,  4, 68, 32,  2, 17,136,209,220,199, 23,141,155,
-250,128,  2,136, 10, 15,101,141, 47,158, 27,255,243,212, 29,240,203,  6,215,190, 63,143,  3,128,105,107,207,227,219,239, 87, 99,
-216,135, 61, 48,114,228, 72, 62, 15,214,255,135,193,170, 83,167,142,149,131, 82,254,219,132,207, 70,153,199,222,191,129,132,208,
- 27,184,118, 53, 42,123,231,129, 35,137,121,185,233,159,213,196, 92,149,143, 96,121,237, 56, 14, 23,103,231,178,200, 85,251,224,
- 24, 72,149, 74,  4, 53,119,  1,167,213,162,251,243,188, 26,111, 76, 69, 81, 43,177, 88, 92,171,153,126,165,166,234,229,  1,237,
- 99,198,140,193,214,173, 91,209,161, 67,  7, 52,104,208,160,214,119,202, 47,143,137,170,201,236,193,138,180,234,212,169,131,176,
-176, 48, 88, 90, 90, 98,251,246,237,112,117,117,193,200,158, 94, 16,  8,138,187,182, 24,134, 49,105, 12, 22,165,212,232,226,226,
-242,236,204,153, 51,158,131,  6, 13,130, 88, 44, 70,118,118, 54, 44, 44, 44,176,126,253,122, 78, 46,151,255, 94,211,242,185,185,
-185,141,148,201,100, 11,  6, 15, 30, 44,108,212,168, 17, 82, 83, 83, 97,105,105,201,149, 44,109,  4, 27, 27,107, 78, 46,151, 99,
-204,152, 49,240,241,241,233, 54,115,230,204,174, 42,149,106,105, 82, 82,210,207,213,153,172,221,187,139,123,167, 62, 91,251, 16,
- 58, 93,241, 80,139, 13, 27, 54,192,217,217,249,133,207, 62,121,242,164,250, 89,132, 28,135,179,  7,126,  9, 25, 63,113,176, 47,
-177, 30,130,188,235,214,160,150, 31, 35,181,192, 28, 59, 46,165,225, 82, 72,108, 89,162,209,183, 45,130, 69,  8,233,135,226,161,
- 23, 39, 40,165,135,  8, 33,  3,  1,244, 40,125,142, 26, 38, 22,101, 89,150, 50, 12, 67,226,227,227,245,114,185,156,216,216,216,
-  8,165, 82, 41,180, 90,109,153,209,138,142,142,198,177, 99,199,144,144,144,  0, 27, 27, 27,198,210,210, 18,122,189, 62,219,196,
-187,238, 87,210, 51,148,252, 46,111,174,106, 72, 80, 80,208,102,  0,155, 75,159,191,251,238,187, 35,133, 66,225,183,  0, 44,183,
-108,217, 98,101,101,101, 69,142, 30, 61,106,216,178,101, 75,142, 64, 32,200,  6,176,186, 42,189,138,  6,179,191, 14, 21,165, 98,
-160, 20, 17, 89,185,207,234,138,172, 84,220,125, 13,189, 62, 37,126, 86,227,108, 81,125,123,210,180, 25,250,167, 69, 94, 29,201,
- 62,105,159,158,146,198, 80,208,136,202,116,115,115,115,127,249,125,219,190,233,123,247,252, 86, 71,170,148, 98,204,216,217, 56,
-126,234, 34,  8, 35,194,149,235,183,160,211, 27,145,145,149,139,193, 67,134,193,213,217, 14, 40, 72, 76, 23, 73, 36, 63,191, 77,
-251,254,133, 60, 88,254,237,113,237,224, 74,236,142,170,131,196,239,191,231,243, 96,253,157,  6,203,221,221, 93,170, 16, 97,180,
-141,153,120,198,132,161, 31,216,167, 61,  9, 71, 66,100,  8,  0, 64,171, 85, 27,146,163, 46,181, 48,225,162, 29,248,114,174,140,
-210,174, 27, 27,123,135,178,200, 85,249,217,131,156, 86, 11, 78,175,  3, 42,233,206,169, 76,147, 97,152, 87,140, 85,249, 11,111,
- 77,202, 89, 26, 29,169, 40,193,168,155,155, 27,150, 46, 93,250, 74, 30, 44, 83,202, 89,114,151,214,131, 16,226, 83,106,140, 40,
-165, 62,206,206,206, 61, 76,153, 57, 88,153,102,105,198,234,147, 39, 79, 34, 34, 34,  2,148, 82,244,233,211,  7, 34,145,  8,230,
-230,230,101, 38,171,162, 49, 88, 21,105, 50, 12,243,249,193,131,  7,167,223,184,113,163,231,180,105,211, 72,233, 88,150,130,130,
-  2, 46, 57, 57, 57,191,166,229,228, 56,110,198,233,211,167,133, 70,163, 17, 91,183,110,197,157, 59,119,168, 92, 46, 95, 38, 18,
-137,150,202,229,114,214, 96, 48,124,253,197, 23, 95,140,157, 63,127, 62,211,169, 83, 39,220,184,113,131,241,244,244,156,  8,224,
-231,234,182,253,214,173, 91,197, 93,206, 89,113, 24, 63,107, 15, 20,102, 66, 60,124,248, 16, 89, 89, 89,175, 36, 31,173,190,156,
- 20,190, 93,  6,249,114, 84, 15,189,114, 16, 24,179,119,139,151,202,121,174, 69, 43,159,226,168,163, 58, 47,189,172, 30, 43,138,
- 96, 85, 86,206,215, 52, 63,127,171, 38, 33,164,111,147, 38, 77,190,137,136,136,112,109,222,188,185, 55, 33, 36,160, 89,179,102,
-173,194,194,194, 74,159,139, 40,165,123,107,162,121,231,206,157,253,235,215,175, 31, 59, 98,196,  8, 49,199,113,198,216,216, 88,
-  3,  0,226,228,228, 36,184,115,231, 14,247,215, 95,127, 65,173, 86,195,213,213,149,113,113,113, 33,103,207,158,229, 34, 35, 35,
-111, 81, 74,103,155,186,237,165,145,105,145, 72,  4,129, 64,  0,181, 90,109,146,185,250, 95,220, 71,255,159,154,  2,129, 96,225,
-129,  3,  7, 92,180, 90, 45,196, 98, 49,246,237,219,167,223,182,109, 91, 68,110,110,110,199,224,224, 96,117,109,203, 89,147,  4,
-164,213,105, 22,228,  8,142,159, 58,253,160,149,160,231, 47, 24,159,148,222,177,204,120, 17, 98,115,208,209,187,163,188,117,243,
- 68,243,203, 43,153, 34,104,142, 87,166,249,228,201, 19,157,191,191,255,160,153, 51,230,157, 95,176,104,129,114,238,188,121,184,
-118, 43, 12,153, 57,  5,224,168,  0, 28, 33,248,246,219,185,112,178,179,129,141,196, 80,148, 89, 72,250,191,188,100,206,255,250,
-126,127,157, 60, 88,127, 71, 57,255, 53,  6,203, 92,136,  7, 29,189,189, 92, 58,249, 54,149,  9,141,106, 36, 68, 62, 65, 86,161,
-  6,103,195, 99,115, 24,202,252,254, 58, 63, 42, 16,  8, 96,105,105,  9,177, 88,140,118, 97,137,144,136,197,144, 42,205,  1,160,
- 56,114, 69, 41, 24,137,180,166,  7, 80,133,  6,171,182, 24,141, 70, 56, 58, 58,190,176,236, 74,249,  6,187,212, 40,214, 52, 69,
-  3,195, 48,179,110,220,184, 97, 17, 23, 23,  7, 74, 41, 14, 29, 58,100, 49, 96,192,128, 89,181,137, 94, 81, 74,145,153,153,  9,
-142,227, 32,149, 74,209,179,103, 79,116,234,212,  9,250,146,217, 31,165, 13, 80, 77, 51,185,199,199,199, 39,  3,248,202,213,213,
-245,247,233,211,167,207,104,211,166,141,255,252,249,243, 65,  8,169,109,104, 64,111, 52, 26,113,233,210, 37, 28, 60,120,144,213,
-104, 52,  3, 82, 82, 82,238,150,123,127,145,171,171,235, 95,  3,  6, 12, 56,241,232,209, 35, 97, 68, 68,  4,  0,176,213,137,170,
-213,106, 52,104,208,  0, 44,203, 98,249,120, 55,228,231, 55,  7,203,178, 48, 26,141, 80, 40, 20, 47,228,253, 50,101, 63,113,148,
- 67,200,197,125, 33,117, 91,246,240,173,110,169,156,183, 44,130,213, 51, 34, 34,194,117,232,208,161,105, 97, 97, 97,174,199,142,
- 29,179,234,211,167,143, 98,200,144, 33,105, 97, 97, 97,174,132,144,119,  0,236,173,225,249,243, 13, 33,228,212,146, 37, 75,102,
- 77,154, 52,169,205,136, 17, 35, 68, 34,145,136, 75, 76, 76,100,119,237,218, 69, 26, 52,104,192,136,197, 98,114,250,244,105,238,
-246,237,219, 55, 89,150, 93, 78, 41,189, 82,211,235, 72,169,185,226,199, 92,189, 81,246, 14, 26, 52,104,228,128,  1,  3,204, 90,
-183,110, 45,253,229,151, 95,114,139,138,138, 42, 52, 87, 21, 81,147, 52, 13, 53, 77, 64, 90, 74, 82, 82,210,175, 75, 23, 94,158,
-242, 73,227, 33, 94,159,219,185,227, 92, 97, 26,178,133,  2,198,194,138,129,111, 93,  1,212, 57,207,237,207,223, 58,240, 60, 57,
- 41,169,202,188,106,119,239,222,189,227,231,231, 23,248,201, 39, 35, 15,140,249,236, 11,135,185,223,204, 20,237,255,235,  4,192,
-234,113,251,202, 21, 88,201,  9,101, 11,147, 83, 51,117,228,131,183,113,169,156,216,131,159,143,  7, 48,158, 16,242,241,188,121,
-243,118,141, 31, 63, 30, 28,199, 33, 40, 40,  8, 63,207,156,137,249, 70,227,167,235,  8, 41,154, 68,233,120,254,180,120,131,  6,
- 11, 12,201,191,249, 56,182,224,214,227,216,  2,112,148,114,148,106, 25,  6,241,133,122,253,146,168,167,  9,167, 95,103,159,246,
-236,217,147,121,217,184, 84,  4,203,178,166, 14,174,139, 13, 12, 12,124, 99,154, 28,199, 37,116,236,216,241,149,134,185,178,255,
- 75,116, 19, 76, 10,201,114,220,178,118,237,218,189,242, 90,173,194,187, 28,247,172,107,215,174,250,151, 77, 87, 85,207,141, 70,
- 99,130,169,250,  9,  9,  9, 15,  0, 12,115,113,113,233,210,163, 71,143,137,  0,106,155,142, 97, 85,151, 46, 93,166, 82, 74,133,
-132,144,149, 47,153,171,210,223, 10,119,113,113,153,235,233,233, 89,182,  0,116,117,219, 30, 24, 24,168,175,110,145,231,242,  3,
-160, 57,142, 75,168, 90,147,162, 78,139,238,190,122, 67,177, 73,171,106,169,156,202, 34, 88,255,163,236, 33,132,136,  0,100, 71,
- 68, 68,188, 83, 18,185, 74,120,240,224,193,185,221,187,119, 59,  2,213,167, 79,168,228,  6,224, 10,128, 43,132,144, 78, 27, 54,
-108,248,102,204,152, 49,173, 63,254,248, 99, 97, 64, 64,  0,142, 31, 63,110, 12, 10, 10,186,165, 86,171,151,213,212, 88, 17, 66,
- 10, 94, 62,135,170, 40,195, 91,191, 72,239,155,230,236,217,179, 95,183,107,215,110,238,190,125,251,146,188,188,188,164, 34,145,
- 72,103,170,185,  2,106,150,166,129, 82,202,213,242,216, 98, 29, 29, 29,123,239, 24, 58,254, 72,139,  9, 35, 60,122,118,240,151,
-187,184, 59,184, 60,122,158,129,132,176,115,133, 79,131,214,199, 24, 53, 89,253, 40,165,213,222,168,  5,  7,  7,223,110,215,174,
- 93,253, 13, 91, 54,141, 23, 48, 76,119,214,104,244,153, 58,126, 24, 37, 64, 24,  7,156, 21, 75, 37,111,253, 98,207, 82,177,248,
-211,  9, 19, 38,224,207, 63,255,196,161, 53,107,208, 35, 33,  1,187,197, 98,152,137,197,216,168,215,143,  3,192, 27,172, 55,105,
-176,194, 30, 63,247,251, 59,126, 48, 34, 34,162,221, 63, 93, 51, 34, 34,194,255,239,170,240,215, 25,107, 85, 65, 57,255, 95,166,
-209, 38, 38, 38, 94,  4,112,241, 53,190,191, 13, 38, 44,230,108,234,231,  0,224,225,195,135,111,124,219,169,212,114, 80,220,253,
- 51, 57, 78, 77,222,181, 98, 89, 22,132, 16,104, 52, 26,220,188,121, 19,218,162,124,  4,237, 28, 93,150,201, 29, 20, 72,137,188,
-144,227,228,209,204,234,127,253, 34, 64, 41,189, 12,224,114,137,121,233, 79,  8,233, 13,224, 52,165,116,255, 27,210, 47, 51, 90,
- 91,182,108,153, 66, 41, 69, 94, 94,222,154,154, 26,171,178,107, 83, 88,216,  5,240,252,173,220,184,113, 67,211,181,107,215,223,
- 23, 47, 94,220,150,227,184, 63,222,132,230,107,164,105,168,144,212,212,212,231,132,144, 22,220,247,107, 71,  5, 91,153,191, 71,
- 13, 76, 35, 98, 16, 30, 37,186,204,227, 41, 41, 41,191, 81, 74,141, 53,217,222,146,155,186, 31,255,141,251,251,126, 88, 88, 15,
-  0,232,213,171, 23,212,211,138,211, 94,109,251, 79, 30,172,141,252, 25,241,166, 35, 88, 60, 60,255, 50, 18,163,130,247,  3, 64,
- 74,100,113,251,253,211, 79, 63,  1,  0,122,244,232,241,202,172,199,210,207,164, 60,127,240, 86,213, 65,201,128,246, 67,127,147,
-246, 21,  0, 87,248, 35,237,127,131,243,231,207,191,209,  4,147,111, 58,  1,105,201, 49,101,  4,176,181,228,193, 83, 75, 26, 54,
-108, 72,  0,192,206,206, 14,115,106,176,156, 26, 79,213, 48,124, 21,240,240,240,240,240,240,240,240,188, 89,  8,128,192, 74,238,
- 12, 76,158, 29, 64,  8,  9,172,197,157,199, 57, 94,147,215,228, 53,121, 77, 94,147,215,228, 53,255, 93,154,213,105,191, 53,179,
- 19, 75, 51, 92,255, 29, 15,  0,129,188, 38,175,201,107,242,154,188, 38,175,201,107,242,154,255,182, 71, 21, 99,176,246, 11, 18,
- 19, 97, 33,145,200,197,  0,160,211, 21,233, 93, 92,144,  7, 12, 52,130,135,167, 38, 97, 82, 66, 28, 75,204,124,234,155,252, 44,
- 15, 15, 15, 15, 15,207, 63, 21, 97,101,230, 42, 35, 67,110, 39, 20,102, 55, 52, 26, 53,141,  1, 64, 40,100, 30,102,100, 88, 71,
-217,217,237,207,120,211, 38,171, 87,175, 94,179, 41,165,142, 34,145,232,184,147,147, 83,208,230,205,155, 13,255,102,163,241, 58,
- 38,227,255,195,160,216,218,218,170, 28, 29, 29,135, 90, 89, 89,  5,228,230,230, 94, 73, 73, 73,217,158,153,153,153, 84, 73,121,
-150, 18,130, 25, 37,255,175,160,148,126, 83, 69,217, 77,254,236,203,168, 84,170,  6, 50,153,108, 60,195, 48,205,  0,128,227,184,
-  7, 26,141,102, 67, 82, 82,210,227,127,219, 73,173, 82,169,204, 40,165, 31,136, 68,162,225, 54, 54, 54,173,211,211,211,231, 39,
- 38, 38,174,174,229, 49, 43,  4, 48,205,202,202,234, 99, 43, 43, 43,207,172,172,172,167,121,121,121,123,  1,252, 72, 41,173,246,
- 60, 93, 48, 89,213, 46,160, 71,192,156,160,211, 65,139,230,173, 77,186,241,202,251, 95,171,108,187,119,235, 48, 55,232,232,245,
-133,223,172, 79,204,170, 97,217, 24,252,103, 28, 41, 87,124,216,255,115, 71,232, 58, 56, 56,180, 45, 73,164,202, 48, 12,243, 99,
-106,106,234,197,127,242,113,100,111,111,175,112,114,114, 90, 78,  8,233, 43, 16,  8, 34, 82, 83, 83, 71, 39, 37, 37, 37,188,161,
-107, 33, 83,183,110, 93,243,216,216,216,252,218,166,106,248, 55,210,174, 93,187, 84,189, 94, 95,101,118,124,177, 88,156,118,227,
-198, 13, 71,190,182,254,161,  6, 43, 49, 17, 22, 66, 97,118,195,180,148,176,193, 73,201,161, 31,  1,128,202,217,103,175,131, 83,
-243, 61,137,137, 18,125,171,110,  3,148, 34,185,112,131, 64, 32,106,169,209,105,237, 68, 66, 81,134,158, 53,220, 99,116,116,124,
-242,195,131,113,166,252,112,223,190,125, 27,  2,176,244,245,245,189,163,211,233, 90,175, 94,189,218,249,192,129,  3, 62,193,193,
-193, 67,222,127,255,253,163,148,210,211, 71,143, 30, 85,215,232,164, 13,  8, 16, 58,228,216,124, 42, 16, 10,251,  2,240,161, 20,
-  0, 17,132,114,122,221,137, 52,177,205, 31, 52,184,246,198,173, 93,  3,219,134,132,234,167,139,  8,237,100,160,228, 10, 37,226,
-149, 55, 30,103, 70,213,224,130, 98,146,121,120, 29,147,241,210,119,215, 80, 74,167,189,233,  3,198,201,201,201,110,224,192,129,
- 59, 22, 45, 90,164, 48, 55, 55, 39, 49, 49, 49,253,191,249,230,155, 30, 42,149,234,147,164,164,164,248,151,205, 30, 33,152,193,
-113,148,  1,  0,134, 33, 51, 29, 29, 29,155,  9,133, 66,237,203,186, 44,203, 74,  9, 65, 79,142, 43, 94,206,134, 97,200, 12, 66,
-200, 90, 83,140,162,167,167,231,144,230, 62, 45,167,126, 51,123,174,210,222,193, 65,193,178, 70,125,124, 98,130,124,229,210,239,
-219,120,122,122,174,125,246,236,217,174,154,110, 39, 33,132,184,186,186, 14, 22,137, 68,125,  0, 52, 41,121, 57,210, 96, 48, 28,
- 75, 72, 72,216, 99,106, 67,222,162, 69,139,203, 12,195,184,215,228,183,141, 70, 99, 92,104,104,104,199,218,236, 31, 23, 23,151,
- 65, 46, 46, 46,191,181,109,219, 86,222,178,101, 75,136,197, 98,172, 88,177, 98, 26,170, 89,222,164,212, 72,201,229,242,193, 10,
-133,194,171,160,160,224,137, 90,173, 62, 32,145, 72,  2,215,174, 93,235,214,161, 67,  7,243,212,212, 84, 34, 16,  8, 28,143, 29,
- 59,246,233,186,117,235,122, 16, 66,186, 86,151,103, 40,247,  9,157, 35,237,219,164, 83,238,147,139,115,  0,244,122,101,191,107,
-100,195,169,192,173,143,154,134,196,163,  6, 83,228,  9, 33,140,171,171,235, 90, 71, 71,199,145,106,181, 90, 67,  8,161,132, 16,
-218,188,121,243,210,247,  1,  0, 58,157, 46,251,209,163, 71,141,170,210,242,104,103,115, 87,192,  8, 92, 43,221, 31,156, 49,225,
-249,141,172,215, 78,221, 98, 52, 26,103, 68, 68, 68,244, 22,137, 68,164, 69,139, 22,  2,212, 32,245,137, 74,165,106, 72,  8,249,
-150, 82,122, 39, 57, 57,121, 67,201,146, 86, 93, 40,165,101,215,138,146,116, 42,112,113,113,217, 80,191,126,253,247,163,163,163,
- 55, 38, 38, 38, 46,122, 13,163,190,121,201,146, 37, 31,245,232,209, 67,144,153,153,233,210,189,123,247,157,  0, 58,189, 78, 29,
-248,249,249,137, 82, 82, 82,166,181,104,209,226,203, 86,173, 90, 57,135,135,135,167,168, 84,170,117, 78, 78, 78, 63,  6,  7,  7,
- 87,123,125,246,241,241, 81,  9,133,194,145,  0, 62,  5, 32,160,148,238,  6,240, 71, 72, 72,200,211,127, 67,131,173,215,235, 29,
-206, 45,154, 11, 34, 20, 66,214,177, 43, 56,142, 67,198,202,121, 96,179, 50, 96,183,104, 29, 88,150, 69, 96, 96,160,  3,120,254,
-185,  6, 75, 34,145,139,141, 70, 77,227,164,228,208,143,222,233,252,147, 37,  0, 92,190,244,229, 71, 14, 78, 77, 31, 72, 36,242,
- 40,169,133,236,224,128,190,129, 45,  7,246,233, 76, 92,157, 29,144,144,156,230,248,235,238,211, 61,143,157,190,120, 16,128, 73,
-249,179,242,242,242, 22,215,173, 91,215,254,252,249,243, 49, 18,137,196, 76, 38,147,145, 65,131,  6,153, 13, 25, 50,196,251,194,
-133, 11, 94,167, 78,157, 26,216,175, 95,191, 83, 98,177,248,248,190,125,251,170, 93,159,204,177,121,127,111, 39,161,211,254,126,
- 31,244,114,127,175,155,131,164,174,147, 61, 40, 39,195,195,103,250, 58,103,175,132,244, 60,126,242,244, 12,  7,239,254, 31,166,
- 69, 28, 50,121, 53,244,102,205, 44,173,204,212,116,170,153,152,126,220,179,141,183, 71,223,110,237,137,167,167, 39,162, 30, 69,
-121, 93,188,118,103,100,151,198,230,207,213,122,178, 91,109, 70, 86, 61,120,144,155, 83, 85, 84,169,188,209, 16,  8,152, 89,221,
-186,117, 27, 41,149, 74, 95,184,115,211,106,181, 12,195, 16,  7,163,177,248,229,154,152,140,210,223,208,233,180,140, 72, 36,129,
- 64,192, 76,109,217,178,101,175,212,212,212,147, 82,169,116,197,243,231,207,107,148,119,102, 18, 33,146,108,161,208,143,145, 74,
-157,141, 58,157, 45,  0, 16,137, 36,187,142,173,109,219,239,190,251, 78, 41, 16,  8,144,153,153,  9,141, 70, 67, 62,255,252,115,
-179, 39, 79,158,140,  0,176,176, 58,211,178,109,219, 54, 95, 91, 91,219, 87,238, 88, 51, 51, 51,153, 94,189,122,214, 56,111,167,
- 74,165,106,216,194,215,255,171, 93, 59,119, 52,201,203,202,214,108, 93,189, 57,216, 32,147,107, 61,155, 52, 18,125,191,116,149,
-229,156,153, 83,191, 84,169, 84,247,146,146,146, 76, 54,195,206,206,206,117,220,221,221, 15,206,158, 61,187, 89,199,142, 29, 69,
- 14, 14, 14, 72, 77, 77,197,163, 71,143,154, 93,187,118,237,131,195,135, 15, 79,115,118,118, 30,144,156,156, 92,237,205,  4,165,
-180,193,145,149, 75, 29,164, 54,182,224, 12,  6,216,248,248,150, 37,127, 77,190,120,  6, 70,189, 30,156,193,  0,183,247, 62, 64,
- 73,228, 13,239,190,251,110,173, 82,146,187,186,186,170, 26, 54,108,248,231,172, 89,179,196, 58,157, 14, 33, 33, 33,184,113,227,
-  6,151,150,150,182,172, 58,115, 69,  8, 57, 51,111,222, 60,215,142, 29, 59,154,103,100,100,192,104, 52,218, 29, 62,124,120,188,
-175,175,175,133,155,155,155,100,251,246,237, 40, 40, 40,  0,203,178, 54, 94, 94, 94, 54, 67,134, 12,209,109,223,190,125, 26,128,
-229,149, 69,174,242,158,208, 57, 41,196,171,103, 35,191,225, 72, 33,167,122, 78,237,229,124,210,162, 30, 41,139,100,245,170, 87,
-207,220,171,177, 98,166,210,162,185, 77, 94,226,185,153,189,234,213,219,122,242,201, 19, 83,150, 98, 98, 92, 92, 92,214,246,238,
-221,123,232,198,141, 27,229,145,145,145,242, 38, 77,154,128,227,184,178, 76,254,165, 43, 23,116,234, 84,189, 31, 16, 48,  2,215,
-107,  7,195, 29,204,204,204,202,214,  8, 45,253, 91, 88, 88,136, 30,195,219,254, 29,215,219,154,238,227,  5,215,175, 95, 31,116,
-242,228,201, 97,139, 22, 45,106,  0, 96, 34,199,113,115, 35, 35, 35, 59,  3, 64,147, 38, 77, 36,  0, 46,170, 84,170, 81,227,198,
-141, 27, 55,113,226, 68,124,250,233,167,115,  9, 33,139,107, 19,213, 35,132,  8,154, 54,109,218,187, 71,143, 30,  2,131,193,  0,
- 51, 51, 51,232,245,250,122,175,179,241,222,222,222,226,162,162,162,  3, 11, 23, 46,236,211,175, 95, 63,  8,133, 66,112, 28,231,
-116,249,242,229,165,211,166, 77,107,239,231,231,215,191, 50,147,229,231,231,215, 18,192,194,250,245,235,247, 24, 62,124,184,160,
- 67,135, 14, 40, 40, 40,192,153, 51,103,190, 61,120,240,224,183,126,126,126,215,  1,204, 13, 14, 14, 14,122,219, 27,109,129,210,
- 28,143,  6,116,129, 87,100, 38,  0, 32,101,195, 74,  0,128,197,119, 63,240,142,230,127,193, 96, 85, 71, 81, 81,145,239, 55,147,
- 62,  5,195, 20,183,135,245, 61,235, 96,233,236,209,228,200,177,211,190,213,132, 55, 87, 25,141,198,  6, 54, 54, 54,211, 53, 26,
-141,108,205,154, 53,178,164,164,164,198,251,247,239,167,247,239,223,135, 88, 44,134,165,165, 37,186,118,237, 42,237,217,179,103,
-189,235,215,175,215, 57,120,240, 96,191,247,222,123,239,143,227,199,143, 31,173,202, 92,217,217,219, 95,250, 97,209, 23, 54,205,
- 60,189,160, 55, 24, 16,159,150,  8, 74, 36,112,118, 80,224,147,254, 45,197, 29,253, 37, 94, 63,252,124, 46,200,177, 89,191,119,
- 82, 31, 28,  9,175,110, 27, 59,213, 87,220,238,239, 87,207,175,111, 96,123,166, 65, 35,111,136,101,242,178,247,154,183,244, 69,
-243,150,190,100,244,200,124,207,251,247,239,207, 57,117,233,214,236, 78,245, 21,193, 87,162, 11,171, 90, 24,243,  5,243, 48,109,
-218, 52,216,218,218,190,108, 50,112,225,194,249, 74,191, 99,202,117,177,252,147,165, 75,151, 90,165,165,165,125,252,235,175,191,
-126,224,228,228, 52, 33, 37, 37,229,148, 41, 34,159, 18,226, 14,169,180,235,200, 31,127,228, 90,190,255,190,192,202,201,137,225,
-140, 70,146,240,228,137,221,143,107,214,  4,230,199,199,203,213,230,230,  5,233,185,185,186,168,168, 40,152,153,153, 17,129, 64,
-208,161,  2,115,145, 74,  8, 89,193, 48,100, 38, 33,132,200,100,102,217,159,125,246,217,245,146,247,154, 28, 61,122,212,188,111,
-223,190,249,132,144, 72,  0,144,201,204, 58, 11,  4,140, 53, 45,238,232, 89, 97,138,177,148,203,229,147,166,125, 61, 75,145,151,
-149,163,214, 23, 22, 26,236, 45,148,132, 40,205,  5,121,185,249,249,137,201,233,218,113, 95, 78, 17,204,153, 53,117, 18, 76,204,
- 68,236,236,236, 92,167,113,227,198,183,183,110,221,234, 96,107,107,139,156,156, 28,100,102,102,226,246,237,219,224, 56, 14,189,
-122,245,146,250,250,248,248,254,184,106,213, 13,103,103,231,118,166,152, 44,153,173, 29,246,191,211, 18,  0, 48,232,105,102, 89,
-132,229,228,224, 62,101,159, 25, 18,155, 91,252, 89,153,172,198,203, 47,149,171,239,118, 29, 58,116, 16,  3,192,212,169, 83,243,
- 10, 11, 11,151, 18, 66,118, 38, 37, 37, 37, 86,243,213,105,115,230,204,113,241,244,244,172,187,115,231, 78, 20, 20, 20,  0,128,
-131,167,167, 39, 26, 53,106,100, 12, 10, 10, 66,195,134, 13, 97,110,110,142,203,151, 47,227,230,205,155,240,243,243, 51, 23,139,
-197, 31, 85,102,176,  2,122,  4,204,145,246,109,210,169,145,223,112, 40, 45,156,177,117,215, 30, 60, 10,222,214, 73,171,143,156,
-179,116,162,203, 39,106, 42, 29,225,218,192,124,150,187,127,103,219,250, 77,223, 71, 93,191, 16, 59,141,241,202,179,185, 19,188,
-150,  9,101,154,109,243,126, 72,202,172,204, 92, 57, 57, 57,173,236,213,171,215,160,141, 27, 55, 90,  1, 64, 88, 88, 24, 82, 83,
- 83, 97,111,111, 15,153, 76,  6,145, 72, 84,182,126,168,169,152,153,153, 33, 57, 57,185,108,153, 41,163,209,136,252,252,124, 56,
- 57, 57, 21,187,155,  5,132,153, 55,207,180,174, 44,103,103,231,142,190,190,190, 59, 92, 93, 93,221,202,191,222,163, 71, 15,140,
- 30, 61, 26,148, 82,116,232,208,161,235,232,209,163, 41,165, 20, 28,199, 33, 53, 53,181, 32, 44, 44,172, 91, 98, 98,226,173, 74,
-182, 91,157,146,146,130,113,227,198, 33, 46, 46,110,130, 74,165,138,101, 24, 70, 86,186, 28, 24, 33, 68,162, 82,169, 26, 54,108,
-216,112,237,232,209,163, 17, 19, 19,131,168,168,168,219,181,237, 50,165,148, 26,219,182,109, 27,109, 48, 24,252, 89,150,133, 90,
-173, 70,207,158, 61,101,141, 27, 55, 78, 21,137, 68, 15,115,114,114,134,149, 44,169,101,138, 89, 19, 58, 59, 59, 59,137, 68,162,
-141, 95,124,241, 69,239,246,237,219,227,225,195,135, 56,121,242, 36,250,245,235,135,128,128,  0,204,153, 51,231,189, 57,115,230,
- 76,  3, 80,217,205,192,254,  3,  7, 14,120,184,186,186,150, 45,137,100, 97, 97,129,207, 62,251, 12,159,126,250, 41, 78,156, 56,
-209,126,201,146, 37,  7,  2,  2,  2, 28,130,130,130,216,183,185,209,150,250,183,135, 87,100, 38,158, 54, 41,110, 63, 74,141, 86,
-233,115,184,248,130,231, 31,108,176,116,186, 34,189, 80,200, 60, 84, 57,251,236,189,124,233,203,178, 46, 66,128,121,168,211, 21,
-233,139,195,230, 20,121, 69, 44,204,164, 12, 98, 82,242, 17,254, 52,163,162,147,244,220, 75,198,236,171,117,235,214, 97,197,138,
- 21,189,212,106,117,193,179,103,207,146, 11, 10, 10, 10, 63,249,228, 19, 34, 20, 10,113,237,218, 53, 60,127,254, 28,205,155, 55,
-135,181,181, 53, 58,118,236, 40,238,222,189,187,219,168, 81,163, 62,  1,112,180, 34, 77, 18, 16, 32,116,150,218, 31, 92,185,104,
-176, 13,152, 40, 68,197,229,160,158,107,107,216, 89,185, 33, 49,189,  0,119, 34, 78,224,241,147,227,168,231, 82, 23,163,135,214,
-183, 90,189,249,218, 49,226, 55,166, 94,249,238,194,138,166,132,202,  4,198, 86,243,119,221,135, 49,235,  9,104,110, 28,104,225,
-171,171,196,200,237,220,208,184,157, 35,228, 86,246, 76,216,195,213,173, 42,219,118, 74,105,170, 80, 40,220, 34, 16, 48, 99,  0,
-160, 85,171,214,133,203,151, 47,175,232, 98,205,181,106,213,186, 80, 32, 96, 20,197, 17, 44,193,102,150,101, 83,171, 42,231, 75,
-102,102,165, 68, 34,157, 14,128,184,186,186, 21, 28, 57,114,132,251,240,195, 15,177,114,229, 74,233,172, 89,179,126,118,119,119,
-239, 18, 19, 19, 19, 91,213, 62, 26, 64, 72, 29,151,122,245,186, 47,190,118,141,138, 12,  6,146,117,251,118, 94,126,106,170, 33,
- 49, 63, 95,246, 71, 72,200,192,  9, 51,102,200,156,188,188,112,253,220, 57,243,148,236,236,252,156,162, 34,221,179,103,207,168,
-209,104,188, 82,201,182,127,227,232,232,216,108,219,182,109,190,159,125,246,217,245,196,196,196,  1, 37,221, 24,  7,  1,180, 37,
-132, 68,150,127,237,224,193,131,237,135, 15, 31, 30,146,154,154,250, 77, 85,229, 44, 71, 83,123, 59, 59,249,174,205,219, 67,109,
-204,205, 24,123, 87, 21, 35,178,178, 18,178, 18, 51, 49,  7,168,235,184,121, 40,  0, 52,173,164,206, 94, 94, 52,156,184,187,187,
- 31,252,253,247,223, 29, 68, 34, 17,140, 70, 35,236,237,237,241,252,249,115,228,228,228, 32, 63, 63, 31,207, 30, 70,194,195,205,
- 13,147, 71,127,238,188,224,135, 85,  7,  9, 33,254,229, 27,177, 10, 23,227,214,235, 95,110,112, 42, 91, 32, 28,166,148,179, 50,
- 56,142,123,158,148,148,  4,185, 92,142, 38, 77,154, 40,239,220,185,115, 37, 49, 49, 49,177, 58, 77,153, 76,246, 81,135, 14, 29,
-204,119,237,218,  5, 63, 63, 63, 88, 90, 90, 34, 40, 40,  8, 97, 97, 97,208,235,245, 76, 65, 65,  1,204,205,205,177,108,217, 50,
-212,173, 91, 23,121,121,121,136,139,139,179, 21,137, 68,118,149,105,  6,157, 14, 90,148,251,228,226,156, 20,114,170,231,214, 93,
-123,240,197,144,193,112,162, 79,175, 88,214, 35,139,186,247,237,240, 29, 21,184,245, 81,152,251, 88, 55,104,214, 23, 98,137, 18,
- 19,103, 44, 68,212,131,163,214, 69,249,161, 19,136, 49,222, 13,192,228,151, 53, 73,113,  5, 49, 42,149,234,243,205,155, 55,155,
-151,221,209,151,172, 73, 88,222, 88,149, 62, 42,170,211,202, 22, 76,215,235,245,208,235,245, 48, 26,141,200,200,200, 64,126,126,
- 62,172,172, 74, 18,245,207,  3,  8,  8,161,149,172, 66, 95, 94,147, 97,152, 97,123,246,236,113,147,203,229, 47,127,  6, 37,209,
- 65,200,229,114,112, 28,  7,189, 94, 15,150,101,161,213,106,149,  1,  1,  1,227,  1,220,170, 72, 83, 32, 16, 76, 29, 55,110, 92,
-135, 99,199,142,121, 45, 90,180,  8,122,189,126,101,122,122, 58, 70,143, 30, 13,142,227,208,177, 99,199,182,148,210, 71,147, 39,
- 79,  6,  0,204,159, 63,223, 80, 80, 80, 48,182,182,199,146,163,163,163,119,223,190,125,189,206,159, 63,143, 78,157, 58, 65,171,
-213,226,187,239,190,179, 88,177, 98,133,197,222,189,123,237,151, 46, 93,250, 27,128, 30, 85,105,250,249,249,137, 82, 83, 83,103,
- 14, 27, 54,108, 90, 96, 96,160,101, 92, 92, 28,204,204,204,112,228,200, 17,108,222,188,249,164, 94,175,159,115,224,192,129,197,
- 91,182,108,233,217,175, 95, 63,108,222,188,121, 82,201,176,  8,174,  2, 77,149,155,155, 27, 66, 67, 67, 97,109,109, 13, 59, 59,
- 59,228,230,230,226,230,205,155,184,125,251, 54, 26, 55,110, 12, 66,136,117, 73,155,198,190,206,121, 84, 67, 35,250,255,174, 89,
- 58, 67,141, 43,119,236, 82, 74,139, 55,154,214,190,156,132, 16,161, 74,165,234,103,101,101, 53,129, 82, 42,204,206,206,222, 44,
-151,203,247, 63,121,242, 68,247,255,181,237,255, 10,131,229,226,130,188,140, 12,235, 40,  7,167,230,123, 28,156,154,150,164,170,
-102, 30, 10,  4,214, 81,142,142, 69,121,  0,160,103, 41,174, 63,204, 65,104,116, 10,194,162, 83,160,144, 86,127,215,109,107,107,
-139,246,237,219,227,200,145, 35,136,143,143, 87, 46, 91,182,172,129, 94,175,215,247,237,219, 55,201,221,221, 61,187, 99,199,142,
- 16,137, 68,184,115,231, 14,242,242,242,192, 48, 12,164, 82, 41, 56,142,171,244, 86,212, 33,219,122,248,240,209,205, 61,237,172,
- 24, 28,189,122, 10,109, 27,247,135, 92, 42, 66,122,142, 26,  4,  4, 79,159,159,  3,199, 42,113, 63, 50,  6,237,125,228,120,167,
-181,149,107,193,249,172,209,  0,126, 54,165,130,244,207,130, 32,241, 30,  0,112, 77, 65,179,159,128,203, 75,  4,149, 59,160,144,
- 51, 67, 70, 82, 44, 30, 94,217,  7,170,175,126,168, 24,203,178, 99, 29, 28, 28,152, 57,115,230,244,245,244,244,228, 38, 78,156,
-120,237,249,243,231,131,202,127,198,195,195, 99,223,250,245,235, 59, 60,123,246,172,104,209,162, 69, 71,211,210,210,198,213,240,
-196,156, 73,  8, 89, 13,  0,241,241,241,153,135, 15, 31,238,116,249,242,229,165,171, 87,175,118,157, 56,113,162,116,226,196,137,
- 51,  1,140,171,170, 91, 80, 33,149,  6, 46,190,124,153,178,  9,  9,218, 67,155, 55, 11,214,220,184, 49, 75,207,113,117,236, 29,
- 28,132,  1,157, 58,105,236,172,172, 10, 83, 83, 82, 56, 43,149,138, 60,127,242, 68,201,137, 68,250, 83,167, 78,229,103,101,101,
- 85,186,196,141, 80, 40,212, 86,212, 45, 88,201, 49,194, 85, 52, 70,171, 10,242, 56, 74,245, 86,158,158,180,123,215,118,245,163,
- 31, 61,125, 42,179,178, 18, 52,168,239,209, 40,252,225,243,219,212,200,106,  0,228,153,216,197, 54,120,222,188,121,205, 45, 44,
- 44,192,113, 28, 44, 45, 45,145,158,158, 14,157, 78,135,188,188, 60,232,242,115,161,203,205, 69, 88,236,115,116,  8,  8, 64,247,
-118,109,155, 28, 55, 24,  6,  3,216, 93,149,174,141,143,111, 89,228,106,159,215,127,162,150, 31,199,228,148,153,173, 19,173,235,
- 65,162, 84,160,249,148,111,106,125, 50, 39, 39, 39,135,212,173, 91,247, 68,175, 94,189,122,143, 25, 51,134, 73, 73, 73, 57,229,
-232,232,216, 33, 53, 53, 53,162,170,239, 41,149,202,122,165,134,194,210,210, 18,107,214,172,129,163,163, 35,138,138,138,112,231,
-206, 29,234,234,234, 74, 46, 94,188,  8, 87, 87, 87,100,100,100, 64,175,215,163,176,176, 48, 69,167,211, 85,122,224,151,116,  3,
-246,154,218,203,249,228,163,224,109,157, 92,200,179, 59, 31, 77,235, 28,253, 40,236, 97,220,153,179,215,190,103, 53,178,248,156,
-132,115, 51, 61, 91,133,216, 77,152,190,  0,235, 87,206,195,163, 91,151,179, 28,235,228,253,108, 70,180,127,180,233, 86,101,  4,
- 93,243,240,225, 67,243,251,247,239,131, 16,  2, 75, 75, 75,200,229,242, 10, 77,150,169, 24,141,198,178,191, 25, 25, 25, 72, 79,
- 79,199,147,216, 40, 28,184,176, 13,  6,214, 96,247,123, 27,139, 20, 47,177, 56,212, 46,151,204,206,120, 64, 67,170, 57, 15, 55,
-127,252,241,199,131, 93, 92, 92,204,203,191,222,162, 69, 11, 12, 27, 54, 12,219,183,111,199,221,187,119,203,186, 49, 41,165, 72,
- 79, 79, 79, 54, 26,141,127, 84,166, 25, 23, 23,151,227,234,234,218,243,243,207, 63, 15, 62,116,232,144,197, 15, 63,252,  0,163,
-209,  8,150,101,203,186, 69, 75,255,238,220,185, 19,193,193,193,115, 83, 82, 82, 30,214,230, 56,114,114,114,106,220,183,111,223,
-203, 63,255,252,179, 85, 90, 90, 26, 50, 50, 50, 80, 80, 80,128,194,194, 66, 24,141, 70,120,120,120, 16,150,101, 27, 85,215, 29,
-200, 48,204,145, 11, 23, 46,244,108,208,160,  1,  0,192, 96, 48,224,250,245,235, 24, 61,122,116,166, 92, 46,255, 40, 38, 38,166,
- 80,165, 82,125,123,252,248,241,158, 45, 91,182,132,143,143,143, 83, 90, 90,154, 57,128,220, 74,110, 32, 96, 52, 26,145,158,158,
-142,244,244,116,252,250,235,127,214,113,214,106,181, 37,193,  1, 29,105,213,170,149,199,157, 59,119,158,191,173,141,118,204,159,
- 91, 17, 51,251, 75,184, 95,121,  4,  0,  8,246, 46, 30,114, 85,247, 82,100,241,240,131,225,195,107,164,167, 82,169,108, 41,165,
- 95,  4,  6,  6, 78,233,217,179,167,189, 74,165,130,141,141, 13,194,194,194, 58,156, 62,125,250, 39, 87, 87,215, 77, 70,163,113,
-147, 41,209,122, 30,147,186,  8,  7, 26,237,236,246,103, 36, 38, 74,244, 18,137, 60,170, 52,170, 85,108,174,  6, 26,129, 93, 96,
-245,134,146, 11,  4, 45,121,152,214,173,161, 73,254, 16,156,250, 47, 56,200,251, 97,203,150, 67, 72, 75, 75, 19,175, 89,179,198,
-253,208,161, 67,174,195,134, 13,139,171, 95,191,126,110, 64, 64,  0,182,109,219,  6, 39, 39, 39,104,181, 90,112, 85,136,155,219,
- 24,  7,182,109, 94, 95,240, 56,246,  1,252, 27, 14,132,135,170, 35,158, 38,230, 34, 43, 95,139,204, 92, 53, 26, 53,156,142,212,
-204, 34,228, 22,106, 16,246,104, 39, 92,156, 60, 25,129,232, 73, 79, 83, 13,150,230,254, 14,104,195,246, 64,236,213,  5,146,166,
-131, 33,114,109,135,248,176, 32,220, 59,241, 35, 18,194,175,130,114, 70, 56,186, 55, 49,105,219, 69, 34,209,194,227,199,143,119,
- 95,178,100,137,168,107,215,174, 29, 84, 42, 85,251,164,164,164,235, 37,  7,121,251,222,189,123,119,112,112,112,192,218,181,107,
-117, 34,145,104, 97, 45,239,126,202,119,171, 93,116,114,114,154,120,240,224,193,191,198,140, 25,  3,103,103,231, 54, 85,125, 55,
- 93, 36,106, 49, 98,201, 18, 42, 18,  8,232,241,223,126, 35,179, 79,156, 88,183,253,207, 63, 37, 29, 58,116,  0,  1, 16, 26, 22,
- 38, 91,182,102,141,217,224,126,253,210,162,158, 63,199,153, 11, 23,180,105, 41, 41, 25,233,133,133, 51,222,212,236,162,154,194,
-178,236,141,184,248, 56, 23,255, 54, 45,237, 67, 34,159,133,247,120,183,125,123,134, 97,152, 71, 79, 99,175,219,219, 91,200,175,
- 92,185,172,103, 89,246,134,137,251,167, 79,199,142, 29,133,217,217,217, 80,169, 84, 72, 79, 79, 71, 98, 98, 34, 12,  6,  3, 52,
-185,217,208,231,230,194,144,151,  3, 99, 97,  1,158,221,185, 13,111, 55, 23,233,153,226, 65,240,187,171,187,227,172, 40, 66, 85,
- 62,146, 37, 53, 87, 66,170, 84,190,176, 56,181,137, 23,199,126, 22, 22, 22, 51,243,243,243, 79, 36, 38, 38, 46,210,233,116, 19,
-151, 44, 89,210,106,225,194,133,118,179,102,205,178,152, 49, 99,198, 62,119,119,247,150, 49, 49, 49,149,154,214,130,130,130, 39,
- 44,203,218,  1,112, 56,127,254, 60, 28, 28, 28,144,155,155, 91,188,221, 26,141,174,168,168, 72,150,153,153,  9,173, 86, 11,157,
- 78,  7, 11, 11, 11,220,189,123, 55,155,101,217,191,170, 43,159, 69, 61,178, 72,171,143,156, 99,219, 68,145,164,103,173, 59,167,
-101,113,217,243,126, 72, 90,  8,224,199, 94,245,234,109,213,115,151,159, 61,126,112,212,250,249,157,160,172,164,199,133, 94, 91,
-143, 63,205,175,162, 30, 41, 33,132, 35,132,208,134, 13, 27, 34, 61, 61, 29,  2,129,  0,114,185, 28, 74,165, 18,141, 27, 55, 70,
-124,124,124,173, 13, 22,203,178,101,230,234,236,141, 99,200, 44, 72,198,214,149,187,224,226,228,198,  0,176, 79, 76,137,239, 54,
-106,218,160, 54,158, 29,173,151, 62,187,154, 93,233,184,182,164,164,164,123,  0, 44, 94,188,105,117,233, 98, 99, 99,115, 65,167,
-211, 33, 38, 38,  6,103,206,156,  9, 72, 72, 72,184, 84,147,125,157,144,144,240,212,197,197,165,231,  7, 31,124,176,173,121,243,
-230,245, 40,165,104,220,184, 49,250,245,235,135,  3,  7, 14, 32, 34, 34,  2,121,121,121,220,149, 43, 87,126, 79, 78, 78,174,209,
-128, 28, 66,  8,161,148, 82,103,103,231, 70,125,250,244,185,186,126,253,122,235,140,140, 12,168,213,106, 20, 22, 22, 98,255,254,
-253,232,212,169, 19,108,108,108,112,248,240, 97,182,180, 71,161, 50,115, 69, 41, 61,114,232,208,161,158, 94, 94, 94,120,248,240,
- 33,206,158, 61, 11, 79, 79, 79,136, 68, 34,244,233,211,199,118,207,158, 61, 19,189,189,189, 87,137, 68,162,239,123,247,238, 13,
-163,209,136,187,119,239, 38,199,198,198,230, 87,103,130, 43, 66,173, 86,131, 82, 10,131,193,176,134, 97,152,143,252,252,252,186,
-  7,  7,  7,223,126, 91, 26,106, 87, 87,215,166, 34,145,104,178,181,181, 53, 50, 51, 50,144,203,  1, 89, 89, 89,160,148, 34,151,
- 43, 14, 92, 41, 50,255,211,171,222,160, 65,131,227,106,181,122,118, 66, 66, 66,165,107,121,185,184,184,248,200,229,242, 41,125,
-251,246, 29,246,222,123,239,  9, 12,  6,  3,142, 30, 61,138,245,235,215,163,103,207,158,168, 95,191, 62,102,204,152, 97,169,209,
-104,102,157, 58,117,106,102,147, 38, 77, 78,229,231,231,127, 83,149, 38,143, 73,  6,171,216,100,185,184, 32,187,228,142,198,206,
-198,198,102,189,209,104,236,  2,124,  7,115,161, 37, 30,134,220, 65, 86,166,  0, 90,181, 17, 28, 45, 54, 89, 38,117, 99,168,255,
-130, 69, 67,138,188, 40,  2,131,193,  0, 71, 71, 71, 44, 91,182, 12,185,185,185,194, 81,163, 70,121, 44, 88,176,224,158, 78,167,
- 67, 97, 97, 33,212,106, 53,212,106, 53,140, 70, 99,165,  6, 75, 44,213, 54,175,227,216,  0,249,234,214,144, 75, 37,200,202,211,
- 22,155,171, 28, 13, 14,252,245, 49,180, 69,106, 24,245,122,176, 58,  3,148,142,253, 81,207,187, 11,128,232,102, 38,154,149,226,
-191, 28, 11, 93,244, 89,232,162,207, 66,209,101, 14,142, 44, 25,246,210,137,111,218,228,196,196,196,196, 68, 23, 23,151,237, 33,
- 33, 33,159,125,244,209, 71,184,120,241,226,183, 40,153, 89, 37,147,201,190,253,232,163,143, 16, 18, 18,130,200,200,200,237,149,
-117,237,212, 20,137, 68, 82,168,211,233, 74,187,130,228,213,124,214,165,213,128,  1, 76,110, 72, 72,222,146, 11, 23,230,253,241,
-199, 31,146,119, 58,117,130,193, 80,108,166, 61, 60, 60,208,189, 71, 15,233,142,189,123,149,234,156,156, 59,179, 39, 78,252,107,
-195,240,225,121,183, 11, 10, 30,152, 88,159, 77, 74,186,  6, 65, 41,109, 82,217,107, 53,161,176,176,112,221,236, 89,211,  2,247,
- 31, 56,226, 86,199,205,197,226,244,217, 75,247,165,102, 18,198,203,163,158, 32, 63, 63, 71,184,126,205,143,102,  5,  5,  5, 63,
-153, 40,215,196,206,206, 14, 41, 41, 41,136,142,142,134, 86,171, 45,222,246,162, 66,232,178,115,160,203,205,  2,209,168, 33, 53,
- 26,161,201, 72,133,187,151, 39,240,159, 25,134,213, 53, 96, 21, 26,172,210,191,102, 22, 22, 16, 43, 20, 16,136, 68, 38,143,193,
-114,118,118,246,243,245,245,221,187,101,203, 22,241,212,169, 83,219,184,187,187,175, 79, 73, 73,137,117,117,117,237,186,114,229,
-202,219,139, 23, 47,150, 14, 27, 54,172,209,230,205,155,135,  3,216, 92,233, 77,132, 70,179,247,248,241,227, 67,235,214,173,235,
- 16, 22, 22,  6,141, 70, 83, 58,222, 12,  0,100,165,159,123,244,232,145, 90,163,209,164, 61,120,240, 32, 47, 54, 54, 86,  7, 19,
-102,253,205, 91,155,116, 99,234, 32,215,  1,142, 78, 46, 55,101,102,238, 30,180, 32,164,255,212, 65,174, 43, 87,237, 75,208,156,
-124,242, 36,127,238,  4,175,101,133,249,161, 19,172, 92, 11,126, 62,121,244,105,190, 41,135, 81,201,140, 65,216,218,218, 66, 40,
- 20, 66, 36, 18,161,116, 44,146,163,163, 35,114,115,115,171,236, 34,172,172,241,206,203,203, 67,110,110, 46, 30, 63,127,136,204,
-130,100,156,217,117,  3, 70,163, 17, 26,141,166,216,204, 58,186,226,220,238,219,230,  1,  3, 91,205,182,245, 33, 23, 51, 67,233,
- 29, 83,143, 83,134, 97,166, 12, 24, 48,  0,122,189, 30,253,250,245,195,174, 93,187,166,  0,184, 84,211,227, 61, 49, 49,241, 38,
- 33,164, 65,116,116,180,133,193, 96,120,191,111,223,190,127,244,238,221, 27, 55,110,220,192,249,243,231,  3,116, 58, 93,148,209,
-104, 84, 59, 59, 59, 47,117,118,118,118, 32,132, 44,173,106,130, 71, 73, 42,134, 13, 77,155, 54,125,191, 75,151, 46,247,123,247,
-238,221,108,253,250,245, 86,105,105,105,165,147, 26,144,144,144,128, 19, 39, 78, 36, 31, 61,122, 52,143,227, 56, 91,134, 97,142,
-103,100,100,124, 83, 89,183,160, 94,175, 63,116,244,232,209,158, 94, 94, 94,184,116,233, 18,150, 44, 89,130,230,205,155,227,248,
-241,227,112,119,119, 71,227,198,141, 97, 99, 99, 51, 57, 47, 47,175,221,138, 21, 43,122,251,250,250,226,208,161, 67, 72, 77, 77,
-253,169,170,148, 13, 44,203, 86,107,176,222,125,247,221,209, 83,167, 78, 69,223,190,125,207,248,251,251,183,190,123,247,238,255,
-124,154, 22,149, 74,181, 44, 48, 48,112,102,139, 22, 45,240,231,159,127, 66,227,215,  1,138,223,143,226, 65,159, 14,160,  0, 84,
-191, 31,  1,165, 20,225,253,222,  1,  5,224,209,117, 32,102,206,156,217,187,127,255,254,117, 80,201,240,  8,149, 74,245,195, 39,
-159,124, 50,237,211, 79, 63, 69,112,112, 48, 54,111,222,140,123,247,238,149,181,121,  6,131,  1,145,145,145,136,140,140,132,179,
-179, 51,250,244,233, 67,198,140, 25,211,171, 87,175, 94,246,  0,252,193,243,186,  6,171, 44, 92,108,103,109,109, 29,254,243,207,
- 63,219,182,110,221, 90,192,178, 44, 46,  6,  5, 97,254,119,211,208,171,199,103,208,115,150, 96,117, 98,112, 98,153,105,191, 40,
-237,131,188, 40,  2, 78,220, 27, 58,157, 14, 95,236, 20,193,138,164, 97,205,  8, 71,  0, 32, 26,141,166,204, 88,149,222, 61, 85,
- 21,193,202,207, 85,232, 13,  6,138,164,180, 88, 36, 36,135,195, 66,233,  6, 42,112, 67, 90, 86, 17,  8, 28,193,106,163, 96, 52,
- 20, 27, 32,173, 58,  1, 69, 58,242, 90, 21,102,204,122,117, 54,176,145, 53,125, 76, 37,165,116,237,142, 29, 59,134,174, 90,181,
- 74,250,222,123,239,249, 56, 59, 59,119,  7,128, 65,131,  6,249, 88, 88, 88, 96,199,142, 29, 90, 74,233,218, 55, 24,225,249,192,
-223,223, 31, 89, 89, 89,136,137,137,185, 94,229,182,233,116,182, 74,  7,  7, 65,218,197,139,134,172,252,252, 58,157, 74,204, 21,
-195, 48,200,206,206,198,243,231,207,161, 84, 40,240, 32, 34, 66,250,227,184,113, 59, 26,251,248, 48,165, 51, 12, 77,225,232,209,
-163,230,  0,218, 86,247, 90, 77, 72, 79, 79, 47,116,114,114, 26,249,237,236,217,135,126,250,233, 39,203,212,180,212, 40,169, 68,
-194, 42,149, 50,213,228,201,227,133,121,121,121, 67, 51, 50, 50, 10, 76,213,203,206,206,198,179,103,207, 96,102,102,  6,177, 72,
-  4, 78, 93,  4, 99, 97,  1, 52, 89,233, 16,232,117,144, 24,141,176,145, 75,225,230,232,136, 58,246,118,166,117,221, 93, 60, 83,
- 54,160,189,124,183,224,169,246,141, 32, 85, 42, 32, 85, 42,209,225,112,241, 16, 54,177, 88, 12,172,217, 98, 74, 55,142,157, 74,
-165,250,107,253,250,245,226,204,204, 76,132,135,135,223,143,137,137,201,181,177,177, 49, 23,137, 68,220,227,199,143,207, 61,124,
-248,176,143,167,167, 39, 40,165,213,205,254,250,241,224,193,131,221, 58,118,236,200,122,120,120, 40,210,210,210,234,228,230,230,
-146,228,228, 23,199, 48,223,185,115, 71, 22, 23, 23, 87,200,113,220, 33, 20,231,193,170,246,192,159, 58,200, 85,118, 61,  4,147,
- 58,247,112,111,110, 97,231,131, 44, 54,164,249,205,251,201,147,166, 14,114, 93,183,106, 95,130,198,140,104,255, 32,198,120, 55,
-161, 76,179,205,196,243,135,122,123,123,131, 82,138,219,183,111,227,234,213,171,184,124,249, 50, 98, 99, 99,203, 62, 99,105,105,
-137,179,103,207,162, 75,151, 46, 38, 31, 71, 69, 69, 69,112,118,118,134,181,181, 53, 14, 94,220,142,173, 43,119,149, 13,116, 47,
- 37, 35, 35,  3,114,185, 28,139,191, 94,165, 28, 53, 99,224,247,  0,186,155,162,237,230,230,230,217,161, 67,135,247, 28, 29, 29,
-145,157,157, 13,  7,  7,  7,180,106,213,170,175,163,163,163, 71,106,106,106,173,186,178,116, 58,221,248, 46, 93,186, 44,250,250,
-235,175,193,178, 44, 62,254,248, 99, 60,123,246,108,239,211,167, 79,215,212,173, 91,119,210,132,  9, 19, 28,237,236,236, 48,126,
-252,120,  5,128,  1, 85, 24,172,165, 43, 86,172, 24, 26, 24, 24,200, 24, 12,134,119,206,159, 63,143,152,152, 24,232,116, 58,176,
- 44,139,152,152, 24,204,155, 55, 47, 57, 47, 47,175,115, 66, 66,194,147,234,202,149,146,146, 50,237,240,225,195,189, 27, 54,108,
-136,211,167, 79, 99,236,216,177,199, 45, 44, 44,154,250,248,248,212,169, 83,167, 14,254,250,235, 47,152,153,153,193,217,217,217,
-113,214,172, 89,125,122,244,232,129,115,231,206, 97,225,194,133,199,156,156,156,126,172,206,  4, 11,133, 66, 24, 12, 47,222,208,
- 10,  4,  2,220,187,119, 15,239,190,251, 46,102,206,156,  9,  0, 56,119,238,156, 69,247,238,221, 31,  4,  4,  4, 88,  4,  5,  5,
-105,241, 63,140, 66,161, 24,249,251,239,191, 35, 58, 58, 26, 87,174, 92, 65, 70, 70,  6,116, 58, 29,114, 74,172,168,180, 36,146,
- 69, 93,234,162,253,180,217, 24,210,103,  0,146,147,147,193, 48,140, 93, 21, 55,124,195,102,207,158,141,147, 39, 79, 98,249,242,
-229,200,205,205,173,240,115,102,102,102,104,213,170, 21, 90,182,108,137,103,207,158,  1,128, 29,120,222,156,193,178,182,182, 94,
-179, 97,195,  6,219, 14, 29, 58,  8, 74,204, 14, 90,183,106,133,225, 35, 71,226,236,193, 99,112,104,216, 19, 68,167,  4, 43,151,
-152, 22,193,178,216,134, 76, 67, 38,100, 98, 25,164, 58, 29, 56,206, 12,161,  9,154, 50,215,172, 86,171, 81,106,178, 10, 11, 11,
-161, 80, 40,170, 54, 16, 58, 73,112,228, 51,214, 45, 55,255, 30,110,134,108,135, 65,103, 64,189,134,179,161, 54,216, 66, 97,255,
- 25, 52,186,191, 96,204, 41,158,185, 43,177,  8, 64, 74, 74,  6,  0, 98,106,196,229,213,147, 60,255,213,193,238,156,209,244,188,
-171, 73, 73, 73,153, 42,149,106,243,245,235,215, 39, 15, 24, 48,  0,103,207,158,157, 13,  0,  3,  6, 12,192,245,235,215,241,236,
-217,179,205, 73, 73, 21,207,160,170, 41, 46, 46, 46,195, 59,119,238, 60,161,117,235,214, 56,118,236, 24,140, 70,227,  9, 83,190,
- 39, 16,137, 40, 33,  4,165, 51,156,178,178,179,241,232,209, 35,100,101,102,194,104, 52,162, 72,173,102,155, 54,106,148, 71, 57,
-206,188, 38,229, 41, 63, 99,176,162, 89,132,165,175,213,116, 59, 83, 82, 82, 98,235,213,171, 23, 87, 84, 84,104,111,109,101,157,
- 47,145, 72,140,121,249,249,185,209, 81, 15,117,166, 52, 10,229,136,140,136,136,104,150,144,144,128,184,184, 56,176,133,249, 16,
-104,117, 96,180, 69,232,218,190, 29,204, 64, 33,  3,  7, 17,103,128, 72, 32, 66,126,241,108,187,200,106,143,249,114, 13, 66,169,
-185, 34,132, 64,166, 84, 66,162, 84, 64,106,174,124, 33,162,101,202,196, 47, 51, 51,179,157,155, 55,111,118,118,114,114,194,170,
- 85,171,224,236,236,220, 56, 48, 48,176,168,115,231,206,102,118,118,118,104,216,176, 33,252,253,253,113,241,226, 69, 16, 66,158,
- 84,115,156,179,132,144,238, 87,174, 92,153,118,237,218,181, 65, 42,149,138,124,250,233,167,232,217,179, 39,100, 50, 25,138,138,
-138,144,157,157,141,227,199,143, 19,163,209,232, 91, 98,240,234,186,187,187,239, 34,132, 36, 60,127,254,252,163,151, 53,183,175,
-246, 81,165,101,113,159, 57, 58,185,244,239,220,195,189,249,187, 61,  2,225,217,224, 93,188,219, 35, 14,  0,150,217,  8, 99, 62,
- 94, 57,167,217, 33, 59, 55,155,223,206,156, 58, 59,175, 99,231,119,191,157, 53,198,122,209,178,205,217,213,142,151, 35,132,148,
- 53,182, 12,195, 84, 24,165, 18, 10,133,101,179,205,170,189,105,226,140,  9, 61, 71,180, 43,123,110, 96, 13,118, 46, 78,110, 76,
-105,228, 10,  0,114,115,115, 17, 31, 31, 15,131,193,  0, 91, 91, 91, 24, 12,122,159, 26,116, 63, 78, 26, 60,120, 48,209,104, 52,
-152, 54,109, 26,126,248,225,  7,244,235,215,143,220,186,117,107, 18,128, 41,181,136,104,172,156, 48, 97,194,180,145, 35, 71, 34,
- 39, 39,  7, 23, 46, 92, 64,151, 46, 93,176,113,227, 70,251, 11, 23, 46, 44,105,223,190, 61,  4,  2,  1,206,158, 61, 11,189, 94,
-255,168,202,  6, 64, 40,124, 63, 48, 48,144,137,143,143,135, 88, 44,134,191,191, 63, 18, 18, 18, 80, 84, 84,132,180,180, 52, 44,
- 88,176, 32, 37, 55, 55, 55, 32, 49, 49,241,137,  9,251,133,233,208,161,195,228,250,245,235,227,194,133, 11, 24, 55,110,220, 73,
-133, 66, 49, 32, 51, 51,115,140, 70,163, 89, 55,120,240, 96, 52,110,220, 24, 81, 81, 81,120,239,189,247,208,170, 85, 43, 92,184,
-112,  1, 51,102,204, 56, 46,151,203, 63,172, 38, 15,214,227,160,160,160,102,254,254,254, 40, 42, 42, 66, 94, 94, 30, 68, 34, 17,
-172,172,172, 16, 25, 25,137,  6, 13, 26, 96,230,204,153, 88,181,106, 21,166, 78,157,202,117,239,222,157,213,235,245, 98,137, 68,
-242, 63,223, 72, 23, 22, 22,210,228,228,100, 88, 88, 88, 96,223,190,125,  8, 59,119, 26, 39,190,252, 12,178, 57, 43, 65, 41, 69,
-252,162, 89,232, 58, 99, 14,218,222,127,138,228,228,100,108,219,182, 13, 12,195,148,205,136,173,172,109,203,205,205, 69,203,150,
- 45,113,251,246,109,108,219,182, 13,171, 87,175, 46,139,214,138, 68, 34,  4,  4,  4,160, 91,183,110,120,252,248, 49, 54,111,222,
- 12, 11, 11, 11,222, 49,189,105,131,197,113,220,187,173, 90,181, 18, 20, 20, 20, 64,163,209, 32, 37, 37,  5, 49, 49, 49, 48,147,
-155, 33, 62, 35, 17, 45,124,245, 72,225,242, 16,121, 63,220, 72,  4,162,123,213,221,129,232,116, 58,232,116, 58,132,134,134, 22,
- 79,125,111,176,180,108,160,167,193, 96,128, 86,171,133, 90,173,198,133, 11, 23,168, 84, 42,133, 66,161, 32, 85,245,189,115,172,
-246,228,133,171,247,123, 15,235,223, 69,114, 54,104, 43, 12, 58, 14,121, 26, 11, 20,168,181, 40,208,136,160,149,246,  0, 33, 87,
-192,  8,164,104,223,178, 62, 46, 92,141,210, 24, 13,122,147,210, 21,128, 51, 66,232,236,  3, 54, 57,244, 63, 47,189, 52,155, 80,
- 44, 87,130, 51,214,108, 86,176,153,153,217,198,157, 59,119,142,108,215,174,157,121, 96, 96, 96,  3,  0,144, 74,165,220,206,157,
- 59,243,205,204,204, 54,214,116, 39,190,156,189,221,217,217,185,163, 68, 34,153,216,183,111,223,142, 35, 71,142, 68,120,120, 56,
-254,252,243,207,251, 42,149,170,202, 49, 51,  2,137, 36,179, 32, 45,205, 74,233,225, 33,180, 50, 55, 79, 58,125,250,180,251, 59,
-157, 59, 35, 54, 38,  6, 89, 89, 89, 80,171,213,136,136,140,164, 98,134,137, 35, 22, 22,204,163,144, 16, 70, 32,145,100,214,160,
-156,145,213,205, 34,172,109, 52, 75, 97, 70,234,205,153, 57,198, 83,163,209, 52,203,203,203, 99, 69, 34,145, 72, 46,161,177, 53,
-209, 48, 24, 12,199,174, 92,185,242, 65,135, 14, 29,164, 81,161,247,192,230,230, 66,151,155, 13, 49,103,132,141,111, 11,  8,244,
- 90, 64,103,128, 75, 19, 10, 77,142, 28,215,238, 61, 53, 24, 12,134, 99,166, 26, 44, 70, 32,120,113,220,149,133, 18, 82,115,115,
- 72,148,202, 23, 94, 39,213,244,107, 57, 58, 58,202,123,245,234,213,213,215,183, 56,167,214,202,149, 43,161,215,235, 37,  6,131,
-161,108, 38, 92, 65, 65,  1,246,239,223,143,237,219,183, 95,179,180,180,252,221,132,155,  9,214,213,213,117, 34,199,113, 14, 44,
-203,234,237,237,237,197,123,247,238,133, 76, 38,  3,195, 48,104,217,178, 37,100, 50,153, 86,165, 82,233, 75,202, 96, 88,181,106,
-149,240,179,207, 62, 19, 87,164,215,168,121,227,233,158,172,117,103,153,153,187,135,133,157, 15, 60, 27,188, 11,  0,232,214,103,
- 20, 60,235,215, 65, 94, 70,168,135, 70, 29,211, 95, 44,204,182, 14, 95,151, 24, 97,246, 94,179,145,133,105, 65,143,  1,252, 98,
-210,169,201,113,  8, 12, 12, 68,143, 30, 61,202,186,  3, 29, 28, 28,160,211,233, 96, 52, 26,107, 52,150,173, 52,137,232,130,  5,
-132,193, 60,224,247, 54, 22, 41,  0,236,203,155,171,184,184, 56,196,197,197,149,221,  8,114,212,180, 20, 42, 42,149,202,204,211,
-211,115, 68,179,102,205,112,254,252,121,132,134,134, 38,  6,  5,  5,185,180,110,221, 26,174,174,174, 35, 85, 42,213,236,164,164,
- 36,147, 19, 42,219,219,219, 43, 58,117,234,244,229,200,145, 35,241,240,225, 67,204,154, 53, 43, 51, 57, 57,249,208,209,163, 71,
- 63,255,234,171,175,152,206,157, 59, 35, 45, 45, 13, 27, 55,110, 52,222,190,125,251,  7,107,107,235,133,213,236,247,135, 73, 73,
- 73,174, 26,141,  6, 89, 89, 89, 96, 89, 22, 69, 69, 69, 56,117,234, 20, 78,159, 62,157,154,147,147, 19,144,148,148, 20,109, 74,
-217,234,214,173,107,238,239,239,239,248,248,241, 99,236,218,181, 11,122,189,126, 78, 76, 76,140,222,210,210,114,199,146, 37, 75,
-230, 89, 90, 90,218,  4,  6,  6,162,244,184,253,235,175,191, 48,127,254,252,227,102,102,102,  3, 34, 34, 34,244,213,200,247,255,
-254,251,239,191,183,179,179,251,104,232,208,161,140,191,191, 63,238,222,189, 11,163,209,136,174, 93,187,150,153,171, 83,167, 78,
-237, 60,117,234,212, 64,  0, 98,165, 82, 41,251, 95,143, 94,149,162,209,104, 16, 21, 21,  5, 71, 71, 71,212,111,221, 14, 51, 31,
- 60,199,149,235, 55, 64, 41, 69,199,240,231, 40, 40, 40,196,239,191,255,142,224,224, 96,  8,  4,  2,120,121,121, 85,171,169,215,
-235, 17, 29, 29,141,244,244,116,244,235,215, 15,195,134, 13,195,138, 21, 43,160,215,235,241,237,183,223, 34, 43, 43, 11, 91,182,
-108, 65,116,116, 52,132, 66, 33,148, 74, 37,239,152,222,180,193, 42,233,102,  2,199,113, 72, 76, 76,196,221,187,119,241,252,249,
-115, 40, 20, 10,168, 89, 35,183,241,220, 85,142, 16,113,  2, 71,233, 53,202, 22,103, 17,175,202,137, 27, 12,  6, 34, 20, 10,113,
-253,250,117, 60,125,250, 20,230,245,105,153,185, 42,141, 96, 21, 21, 21, 65, 36, 18, 21,220,184,113, 35, 38, 56, 56,216, 83, 40,
- 20,234, 42,211, 76,179,206,222,118,246,252,185,233,126, 45,189, 27,116,235, 60, 31,199,142,205, 67,118,110, 30,138,116, 34,228,
-171,245, 40, 84, 83,184, 88, 52, 64,107, 31, 31,164,103,233,240, 56, 60, 56, 33, 67,108, 83,109, 31,140,129, 50,185, 59,151,141,
-181,124,127,216, 56,152,185,191,  3,109,248, 62,112,249, 41,224,242,139,187, 77, 36, 10, 11,152,219,185,161,160, 72,131,171, 15,
-158,194, 64,153, 92, 83, 43,253,201,147, 39,249, 42,149,106,221,212,169, 83,151,223,184,113, 93,  1,  0,247,238,221, 43, 76, 74,
- 74, 90,148,148,148,148, 95,147, 29, 88, 46,123, 59, 81, 40, 20,143,235,215,175,111,120,239,189,247,108,251,247,239, 15, 59, 59,
- 59,132,132,132, 96,217,178,101, 33,133,133,133, 67, 98, 98, 98, 12,213,116, 59, 36,  6, 31, 62,108, 17,240,233,167, 86,179,250,
-245, 91, 54,126,252,248,159, 22, 46, 92, 40,174, 87,191, 62, 56,163, 17, 17, 17, 17,116,199,142, 29,236, 47,115,231,174,148, 40,
- 20,194,219, 71,142,136, 88,173, 54,241,191,125, 16,187,186,186,118,238,221,179,115,147, 31, 86,173,131, 70, 93,128, 91,215,143,
- 35, 59, 59, 29,155,183, 28,108,226,234,234,218,217,212,193,196,  9,  9,  9,123, 14, 28, 56, 48,205,199,187,137,175,151,155, 27,
-194, 98,159, 67,194, 25, 33,102, 89,  8,244, 90, 48,172,  6,110,205, 40,  8, 99,142,148,148,124,108, 60,125,225, 65, 66, 66,194,
-158,106, 35,137,189,222,199,144,216, 92, 16, 66,112,166,147, 55,100,230, 74, 72, 20, 10,180, 63,112,169,204, 84,197, 46,253, 26,
- 34,133, 18,214,173,223,169,182,156,169,169,169, 69,245,235,215,191,251,240,225,195, 86,141, 26, 53,194,130,  5, 11, 16, 31, 31,
- 15, 74, 41,210,210,210, 52,233,233,233,137,153,153,153, 49,132,144, 67, 73, 73, 73, 91, 77, 93,138,132,227, 56,135,163, 71,143,
-  2,128, 24,  0,206,159, 63, 15,149, 74,  5, 75, 75, 75,228,229,229,225,211, 79, 63,149,126,247,221,119,  0,128,187,119,239,138,
-204,204,204, 42,213, 10, 11,142,252, 33, 39,159,102,211,130,144,254, 89,108, 72,243,119,123,196,163, 91,159,145, 56,123,236,119,
- 92, 56,125, 14, 54,194,152,231, 80,228,159,204,120,158,145,151, 80,216, 96, 83, 19,191,207,  5,201,133,167, 55, 77,234,103, 45,
-112,118,230,246,205,218, 80,121,226,222,210, 59,112,129, 64, 80, 54,  6,171,116, 64,123, 77,205, 85,121,230,205,163, 28,  1, 33,
- 94, 98,113,104, 98, 74,124, 55,149,163, 43, 82, 83, 83, 17, 31, 31,143,184,184, 56,196,199,199,163,126,253,250,120, 30,251, 20,
- 18,137,248,158,137, 81,240,161,125,251,246, 53,215,233,116, 56,124,248, 48, 75,  8,233,115,244,232,209,187, 45, 90,180, 16,118,
-233,210,197,252,247,223,127, 31, 10, 96,107, 77,238, 37,148, 74,165, 88,175,215,227,143, 63,254, 64, 66, 66, 66,231,148,148,148,
- 72,149, 74,181,105,236,216,177, 27,154, 52,105, 82, 63, 50, 50,242,177, 90,173, 30,159,148,148, 20, 90,157, 88, 78, 78,206,168,
-158, 61,123,238,227, 56,174,110,199,142, 29, 21,243,230,205,179,120,244,232, 17,220,221,221, 65, 41, 13,171,201, 82, 83,177,177,
-177,249, 87,175, 94, 77,109,218,180,169,163,179,179, 51,196, 98,241, 50,103,103,231, 69, 74,165,242,135, 46, 93,186,216,236,216,
-177,  3,167, 79,159,134, 72, 36,194,211,167, 79,147, 30, 62,124,184,198,201,201,105,173, 41, 25,220,131,131,131,159,  1, 24,210,
-186,117,235,249,171, 87,175,158,195, 48,204, 39,103,206,156,129, 72, 36,  2,128, 50,115,229,225,225, 49,124,223,190,125,195,222,
-178,118,218,160,211,233, 96,107,107,139,244,244,116,164,165,165,161, 78,157, 58,104,215,174, 29, 12,  6,  3,142, 28, 59,142, 43,
- 87,174,128, 82, 10, 59, 59, 59, 88, 90, 90,226,254,253,251,  0, 80,213,236, 97,131, 94,175,135,141,141, 13,114,114,114,112,255,
-254,125, 56, 56, 56, 96,234,212,169,208,233,116,216,187,119, 47,238,221,187,  7,134, 97,224,224,224,  0,115,115,115, 83, 52,121,
-106,106,176,  4,  2,193,197,139, 23, 47, 14,244,241,241, 17, 70, 71, 71, 35, 58,186,248,102, 70,173, 86,179, 66,  1,246,167,134,
- 30, 30, 82, 69,227, 31, 88, 62, 87,134, 68, 34,217, 56,112,224,192,241,163, 70,141,194,196,137, 19, 65,  8,193,111,247,116,136,
-139,227, 96, 48, 24,144,154,154,138,176,176, 48,218,170, 85, 43,194,113,156, 62, 32, 32,224,139,224,224,224,214,  2,129, 32,175,
- 50, 77, 26, 20,196, 58, 54,239,255,225,207, 27,183, 94, 26, 49, 98,132, 77,223,126, 63,227, 94,100,  4,114,139,236,  1, 74,225,
- 98,175, 68,235,134, 95, 35, 45, 83,131,211, 39,143,101,115,172,230, 67,250, 96,183,161,170,114,  2, 64,186, 80,237,176,105,251,
-129,149,187,247, 29,252, 98,244,200,161,178,128,192, 79, 33,206,  8,  3,155, 20, 12, 23,239,142,160, 66, 51,220, 14, 14, 65,104,
-116,188,166, 72, 47,216,154, 39, 86, 79,175, 78,179, 60,217,217,217, 39, 82, 82,146,127, 46,157, 28,192, 48, 68, 33,145, 72, 79,
- 84, 99,166,  2, 95,202, 11,244,114,134,248,134, 75,151, 46, 77,179,181,181,229,194,195,195,177,113,227, 70,227,221,187,119, 15,
-112, 28, 55, 39, 35, 35,163,168, 58, 77,123,131,225,254,206, 89,179,188, 91, 15, 24, 64,251,127,241,133,134,145,201,198, 47, 91,
-181,106,118,102,110,174, 11,  0,216, 88, 89,197,111,158, 63,127, 97,175,222,189,243,195,175, 94, 53,187,126,248,176,153,132,101,
-131,171, 43,231,155,160, 42,205,132,132,132, 75, 13,234,213,193, 31, 91, 87, 65,175,215, 34, 57,177, 56,112,149,145,153,139,170,
-204,213, 43,199, 82,241, 44,170,  1,171,215,172,189, 57,238,211, 79,156,222,233, 26,136,184,251,247,160,207, 74,  7, 49,176, 16,
- 17, 33, 10,211,228, 72, 75, 45,192,210, 19,231,210,212, 26,205,128,151, 19, 57, 86, 86,206,178,110, 65, 11,115, 72, 20,197,227,
-174,202, 71,173,196,230, 22, 16, 41,148, 16,136,197, 21, 13,134, 15,172, 32,167,220,135,163, 71,143, 14, 61,113,226,132,245,144,
- 33, 67,240,254,251,239,135,228,228,228,116,201,202,202,202,175,109,125, 50, 12,147,214,187,119,111,  7,157, 78,199, 14, 30, 60,
- 88,152,145,145,129,210, 41,246,  5,  5,  5, 56,121,242, 36, 26, 53, 42,158,157, 31, 30, 30,142,166, 77,155, 86,170,249,249,140,
-176, 68,  0, 11,167, 14,114, 93,121,243,126,242, 36,  0,203, 60,235,187,225,194,233,115,184,114,225,250,172,182,205,184,117,189,
-135,181,250, 94,222,229,163,233, 77,252, 62, 23, 40, 45,156,177,237,224,  1, 65,100,240, 47,139,139,138,194,234,  1,248,186,178,
-114,150,118, 95,191,156,146, 65,173, 86,155,100,174,170, 58,150, 40, 40,181,203, 37,179, 71, 77, 27,212,230,236,174, 91,230, 74,
-165, 18,122,189, 30,148, 82,212,171, 87, 15, 66,145, 16,191, 30,250,169, 48, 39, 39, 99,174, 41,154, 10,133, 98, 98, 64, 64,  0,
-158, 60,121,130,208,208,208,  3, 73, 73, 73,161, 42,149,234,192,179,103,207,  6,183,105,211,  6,123,246,236,153, 88,153,193,170,
- 76,179, 52, 99, 61,165, 20, 70,163, 49, 11,  0,146,146,146,238,155, 18,253,125, 89,179, 36, 89,104,  7,  0,104,210,164, 73,188,
-163,163,163,197,253,251,247,225,236,236, 12,189, 94,223,166, 38,199, 18,165,148, 83,169, 84,107,111,223,190,189,180,101,203,150,
-248,248,227,143,187,221,189,123,183, 91,139, 22, 45,224,229,229,133,107,215,174,225,204,153, 51,127,114, 28, 55, 54, 57, 57, 89,
- 83, 85, 18,212,202,182,253,246,237,219,209,  0, 62,245,243,243,251, 72, 40, 20,194,194,194, 66,144,152,152, 40, 56,115,230, 12,
-  0,140,222,183,111,159,177, 54,251,253,239,184, 46,189, 41, 77, 66,200,183,195,135, 15,223, 52,102,204, 24, 89,155, 54,109, 94,
-136,168,158, 56,113,  2, 28,199,193,214,214, 22,182,182,182,136,142,142,198,161, 67,135,116,185,185,185,107,196, 98,241,178,170,
- 52, 63,253,244,211, 77, 99,198,140,145,181,110,221, 26,185,185,185,101,230,237,216,177, 99, 32,132,192,206,206, 14,182,182,182,
-120,252,248, 49, 14, 29, 58,164,201,206,206, 94,165,211,233, 86,252,157,219,254,175, 51, 88, 89, 89, 89,147,191,249,230,155, 46,
- 95,124,241,133,109, 97, 97,161,192,214,214, 22, 41, 41, 41,236,169, 83,167,178,242,243,243, 39,215,228,199,174, 95,191, 62,161,
- 79,159, 62,107,126,251,237,183, 45, 91,183,110,237, 60,120,240, 96,124,250,222,123, 24,215, 86, 14,173, 86, 11, 66,  8, 78,159,
- 62,253,232,226,197,139,158, 98,177, 88, 59,111,222, 60, 14,192,205,106,239,232,195, 14, 69, 56, 54,239,223,121,221, 79, 27,246,
-251,250,183,173,235,238,225, 46,109,239,106,  9,189,193,136,212,180, 76, 92,186, 30,174,141,138,184,151, 72,245,250, 15,211, 34,
-170,207,226, 14,  0, 17, 17, 84, 15, 96,178,183,183,197,130, 21,155,118,108,220,190,107,127,255,209,195,  6,  8,125, 91,116,197,
-179,235,135,112,249,230,  5, 54, 91, 67, 15,229,139,  4,227, 34,162,243,178,107, 90,241, 90,173, 86, 71,  8, 40,254,147,125,157,
-106,181, 90, 93,109,206,199,242, 79,126,253,245, 87, 36, 39, 39,107, 99, 99, 99,119, 83, 74, 55, 37, 39, 39,155,156, 62, 97, 29,
-165,186,  1,132,156,155,211,177, 99,207, 57,167, 79,203,  6,125,249,165,174,255,135, 31, 78,135, 86,171,135, 68, 66,133, 10,  5,
-  3,169, 84, 20,126,245,170,217,218,113,227,108,136, 78,119,246,119, 74, 77, 14,193,255, 29,179,  8,203, 69,176, 48,226,243,175,
-160, 46, 23,193,186,113, 39, 10, 53,137, 96,  1, 64,114,114,114,156,179,179,115,219, 69,107,215, 29,236,213,182,117,147,  6, 42,
-103,169,173,135, 59,148, 78, 78,200,202,200,192,173,123, 79, 12, 63,157,187,244, 64,173,209, 12, 48, 53, 47, 12,199,113,101,179,
-220,188,191,156,  9, 70, 32, 40, 51,  2,165, 73,  3, 45,252, 59,130,  8,133, 48, 82, 10,189, 94, 95,237, 32,172,164,164,164,  4,
- 23, 23,151, 15,191,252,242,203,243,127,252,241,  7, 19, 16, 16,208,242,175,191,254,122,173, 69,115, 19, 18, 18, 92, 75,186,181,
-242, 44, 44, 44,132, 35, 71,142,132,193, 96, 64, 81, 81, 17,114,115,115,145,153,153,169,157, 50,101,138, 20,  0,196, 98,177,161,
-103,207,158,213, 94, 63, 86,237, 75,208, 76, 29,228,186,206, 70, 24,243,113, 94, 70,168,135,141, 48,230,121,219,102,220,186, 85,
-251, 18, 52, 11,190,178, 90,148, 17,115, 41, 42,185,240,244,166,109,  7, 15,  8,134,247,255,208,232,170,124, 60, 75,230, 64,247,
-191,219,183,218, 70,232,149,164,162,181,141, 92,189, 76,198,  3, 26,226,217,209,122,105,151, 65,173,103, 47,154,182, 74,233,224,
- 96, 15,214,200,226,121,220, 51,252,118,112,125, 97,190, 54,123,113,102,  4,189,107,138,150,167,167,167,135, 64, 32,192,145, 35,
- 71,  0, 96,125,201,203,235, 79,157, 58, 53,120,200,144, 33,168, 91,183,174,183,187,187,187,180,170, 52, 26, 21, 69,239, 12,  6,
-  3,222,244,186,214,132,144,167, 27, 55,110,116,177,177,177, 33, 87,174, 92, 97, 25,134, 57, 90, 83, 13, 39, 39,167, 31,143, 31,
- 63,222,137, 82,218,211,215,215, 23,117,235,214, 45,185,158, 70,224,202,149, 43,187, 18, 19, 19, 71,188,161,197,157, 41, 33,  4,
-121,121,121,165,  3,237,244, 74,165,242,173, 92, 52, 58, 49, 49,113,187,163,163,227,233,249,243,231,127, 87,175, 94,189,177,163,
- 71,143, 22, 52,108,216, 16,185,185,185,176,176,176,128, 74,165, 66, 98, 98, 34,182,111,223,110, 76, 75, 75,251,141, 97,152,  5,
- 73, 73, 73, 73,181,213,180,182,182,134,179,179, 51, 18, 18, 18, 74, 53,183, 24, 12,134,133,233,233,233,169,224,121,179,  6, 43,
- 37, 37, 37,195,201,201,169,233,175,191,254,186,182, 56, 77, 67,113, 84, 43, 63, 63,127,114, 74,241,136,241, 26,113,236,216,177,
- 39,  0,  2,250,244,233, 83,111,255,254,253, 91,118,238,220,217,185, 95,191,126, 24, 60,120, 48, 88,150, 69,175, 94,189, 70,188,
- 28,181, 50,133,212,176, 67, 17, 36, 32,160,233,221, 91,151, 63, 13,185,123,179, 15,165,212,  7,  0, 33, 12,243,159,197,158, 35,
-106,190,216,115, 68, 68, 94, 54,128,143,124, 93, 45,188, 22,175,223,177,213, 76,200,117, 84,179,204, 85,181,150,249, 34, 36, 33,
-175,214, 11,140,150,100, 94, 95,206, 48,100, 70,241,115,211,150,134,169, 68, 99, 38,  0,  8,133,162, 61,119,239,222,157, 29, 27,
- 27,155,104,202, 12,175,138, 56, 72,105,220,167,132,156,153,238,227,211,181,207,148, 41, 34,191,238,221,205,109,220,220, 56, 74,
-169,241,249,173, 91,228,198,145, 35,162, 27, 71,142,200, 12, 90,237,249,125,148,214,104,  6,212,223, 49,139,176, 52,130, 85,207,
-203,245,204,192,  1,189,187,123,121,168,  0,  0, 79,159, 39, 33, 35, 43,247, 76, 77,115, 13,149,154, 44, 66,136,255, 95, 44, 59,
- 88, 36, 18,245, 33, 37,169, 24,104, 45, 22,123, 54, 26,141,  9,109,219, 86,178,121,243,150, 85,102,200, 82, 77,188,240,  6,169,
- 84,170, 79,218,183,111,191, 44, 41, 41,233, 96,122,122,122,225, 27,186, 46,244,218,185,115,231,  9,142,227,204, 94,138,112,229,
- 37, 37, 37,153,151, 52,164,117, 79,157, 58,181,139, 16, 82,173,129, 95,181, 47, 65,179,114, 78,179, 67, 26,117, 76,127,162, 44,
- 58,180,106,109,241,172,150,121,171,115,114,  1,252, 50,169,191, 13, 23, 25,252,203, 10, 23,139,199, 51,214, 30,202,250,173, 58,
- 61,134, 97, 30,183,105,211,166,204,104, 85, 83,255, 73,181,169,128,103, 87,179,151,217,250,144,139,159,205, 28,248,189, 78,175,
-111,193, 16, 80,145, 88,124, 63, 39, 39, 99,174,169,230,170,196, 88,252, 60,109,218,180,201, 79,158, 60,217, 85,154,243, 46, 41,
- 41,233,186, 74,165,250, 49, 46, 46,110, 66,124,124,252,250,248,248,120,147,205,149, 82,169,212,168,213,106,142,101, 89, 70,171,
-213, 66, 34,145,232,223, 84, 99, 80, 88, 88, 56,116,195,134, 13,191, 26, 12,134, 38,132,144,163, 57, 57, 57, 53,206,122, 27, 28,
- 28,108,240,246,246,238,119,252,248,241,201, 15, 30, 60,152,234,232,232,232,152,154,154, 26, 27, 23, 23,183, 52, 37, 37,229,151,
- 55,100,174, 16, 28, 28, 44,245,243,243,211,150,171, 23,139,183,101,188, 85,133,237, 91,106,106, 58,128,137,174,174,174,107,166,
- 79,159,190,184, 69,139, 22,  3, 71,141, 26, 69,228,114, 57,246,238,221,139,152,152,152, 67,148,210,217, 53,233,210,173, 76,211,
-204,204, 12,123,247,238,165, 49, 49, 49,251, 24,134,153,147,148,148,244,175, 88, 72,251,239,128,188,233,187,160,154,134, 79,251,
-244,233, 83, 47, 35, 35, 99,139, 86,171,125,  7, 64, 97,104,104,168,249,127, 59, 36, 91, 21,  1,222,246,138,160,136,234, 27, 50,
- 83, 53, 95, 30,160, 94, 27,205,154,104,152,170, 89,217, 98,207,156, 86,155,100,203,178,119,215, 81,170, 51, 85,211,197,197,101,
- 33, 76,204, 23, 85, 66,100, 98, 98,226,119,181,169,207,  6, 13, 26,208,232,232,104, 80, 74,201,155,220,239,127,199,177,244,111,
-210,220,190,218, 71,213,168,121,227,233, 97,193,145, 63,148,116, 31,150,177, 96,146,141,121,199,119,  3,230, 94,189, 16,244,253,
-188,117, 47,118,113,190, 13,219, 78,  8, 97, 42, 50, 22,165,201, 61,107,170, 89,167, 78,157, 77,190,190,190, 95,132,132,132,252,
- 26, 23, 23, 55,250,159,186,237,132, 16, 82,183,110, 93, 73, 77,162,115,252,121,100,154,166,147,147,147, 63,195, 48,115, 75,110,
- 56, 22, 39, 36, 36,220,126,131,154, 70, 74,233,162,228,228,228,144,255,239,109,255,215, 69,176,254,110, 74, 35, 90,239,191,255,
-190,131, 64, 32,248,199, 47,210,105,138,185,170,105, 20,234,159,160,241, 50, 37,  6,234,250,155,208,122,217, 44,253,157, 60,126,
-252,152,240,167,245, 63,143, 79,191, 10, 77,  2, 48,197,191,130,212, 84, 37,166,106,122,151,247,223,206,109,175, 44,106, 83,219,
-133,152,227,226,226,198,170, 84,170,169, 53,153,125,248, 95,218,110, 10, 64,203, 31,253,111,158,148,148,148,187,  0,250,254,211,
- 53,121,131,245, 15,225,175,191,254, 74,227,119,  7, 15, 15, 15, 79,245,252,211,205, 21, 15, 15, 79,241,  0,233,192, 74,238, 62,
- 76, 14,253, 17, 66,  2,107,113,119,115,142,215,228, 53,121, 77, 94,147,215,228, 53,121,205,127,151,230,191,134,210, 89, 76,127,
-199,  3, 64, 32,175,201,107,242,154,188, 38,175,201,107,242,154,188,230,191,237,193,240, 22,147,231,239,230,167,  1,196,229,167,
-  1,196,229,239,250, 60, 15, 15, 15, 15, 15,207, 63, 13,225,219,182, 65,254,254,254,222,148,210,161,132,144,129, 37, 17,186,253,
-132,144,157,119,239,222, 53, 41,  3,173,153,153, 89,170, 70,163,113,  0,  0,153, 76,150,166,209,104,156,202, 71, 75,129, 87,150,
-200,160,197, 63, 83,249,128, 85, 79, 79,207, 84,173, 86,235, 96, 66, 52,241, 18, 33,228, 50,195, 48,151,106,147, 94,224,221,119,
-223, 29, 33, 16,  8, 22,  3,128,209,104,252,246,194,133, 11,127,252, 93,245, 76,  8,105,227,166,114,250, 93,111,208,179,169,233,
- 89,115, 41,165, 71, 42,250,220,134,190,100,169,144, 96,122,201,255, 43,199, 31,165, 85, 78,253,174,233,231,171, 40,159,191, 72,
- 36,154,232,232,232,216, 43, 33, 33,225, 46,128, 25,148,210,106,143,  1, 43, 23,239, 79, 69, 34,209, 48,131,209,232, 37, 18,  8,
-158, 26, 12,134, 29, 57,137, 17,219,249, 75,  5, 15, 15, 15, 15,207,223,102,176,218, 53,176,109, 72,168,126,186,136,208, 78,  6,
- 74,174, 80, 34, 94,121,227,113,102,212,235, 20, 64,165, 82,185, 17, 66,  2, 40,165, 77, 24,134,  9,227, 56,238, 76, 77, 23, 59,
-246,243,243,115,  3,240, 49,128, 33,109,219,182,109, 54,110,220, 56,212,175, 95, 31, 26,141,  6,183,111,223,158,181, 99,199,142,
- 89,126,126,126, 15,  0,236,  2,176, 59, 56, 56, 56,190, 50, 45,141, 70,227, 80,234,149,  8, 33, 14,  3,  7, 14,188, 93,222, 84,
-149, 44, 46, 75, 40,165, 55,  8, 33,215,141, 70,227,205,125,251,246,197, 55, 38,164,205, 24, 15,241,254,201,207,116,174, 47,107,
-106,181, 90,135, 99, 83, 39,128, 82, 14,154,204, 12,116, 88,182,182,236,189,147, 61,219,130, 49, 26, 32,145,138, 47,  5, 28,189,
-113, 25,192,165,146, 71,141, 17,  8,  4,139, 79,157, 58,229, 76, 41, 69,143, 30, 61, 22,  3,248, 91, 12, 22, 33, 68,218,214,191,
-197,197,163,  7,118,201, 10,178, 82,209,179,223,224, 29,132,144, 17,148,210,  3, 47,152,165,222,196,145,  8, 49,125,220,146,157,
-  2,  0,216, 48,123,232,140, 53, 61,200,186, 41,167,105,138,139,139, 75, 23, 74,233,140, 18,189, 21,137,137,137, 23, 55,244, 38,
-142, 16, 96,230,184, 37, 59,  9,  0,108,156, 61,116,250,134,222,100,237,248, 19, 53,155, 37, 73,  8, 25, 63, 98,196,136,117,139,
- 23, 47, 22, 56, 59, 59, 35, 49, 49,177,167,183,183,119, 67, 66,136, 55,165,180,210,193,193, 54,117,124,246,244,236,217,203,243,
-227, 65,  3,228,246,118,214, 72, 72,206,176,248,115,199,206, 49, 54,117,124,122,101,197,133, 14,230, 47, 23, 60, 60, 60, 60, 60,
-111,204, 96, 53,107,102,105,101,166,166, 83,205,196,244,227,158,109,188, 61,250,118,107, 79, 60, 61, 61, 17,245, 40,202,235,226,
-181, 59, 35,187, 52, 54,127,174,214,147,221,106, 51,178,234,193,131,170,215, 15, 27,225, 75, 12,  6, 99,241,111,138,133, 48, 94,
- 72,119, 61, 20, 24, 24,232, 49,106,212, 40,248,250,250,226,238,221,187, 93,246,237,219, 55,217,205,205,237,142,193, 96, 56, 33,
-149, 74,131,170,203,161,226,231,231,183,204,197,197,101,198,180,105,211,136,191,191, 63,164, 82,105,217,123, 74,165, 18, 93,187,
-118, 69,215,174, 93,145,154,154,218,236,226,197,139,205,118,238,220,185,212,207,207,111, 69,112,112,240, 44, 83, 42,104,238,220,
-185,254, 21,188,124,138, 16,242,132,101,217,123, 62, 62, 62,241,141,  8,169, 63,182,119,251,179,227, 59, 52, 80, 84, 17,157,194,
-157,197,197,171,107,148, 55, 88,180, 40, 31, 34, 11,243, 75, 34,165,242, 21,115,213,132,144, 22,109,173,153,223,127,201, 50,250,
-212,192,100, 33, 62, 62, 30,150,150,150,102,  1,  1,  1,201,132,144,249, 23, 47, 94,220,242,134,143,155, 54,243,167,143, 23,103,
-199,132, 34,229,225, 13, 76, 29,212, 81, 62,229,167,191,190,  7,112,160,106,227,195, 48,127, 60,181,155, 53,  5,152,204,113,220,
-220,200,200,200,206,  0,208,164, 73, 19,  9,128,139,219,162,173,123,143,104,146, 91,235, 52, 11,132, 16,177, 64, 32,248,121,219,
-182,109,159,127,250,233,167,136,141,141,197,213,171, 87,161, 84, 42,177,112,225, 66,247,105,211,166, 45,  5, 48,185,178,200, 85,
-143,158,189, 61, 55,254, 48,199, 59, 63, 43, 87,187,249,231,189,119, 84,205, 26, 49, 83, 38, 77, 48,215,177,122, 39, 43, 23,239,
- 79,249, 72, 22, 15, 15, 15, 15,207, 27, 49, 88,157,234, 43,110,247,247,171,231,215, 55,176, 61,211,160,145, 55,196, 50,121,217,
-123,205, 91,250,162,121, 75, 95, 50,122,100,190,231,253,251,247,231,156,186,116,107,118,167,250,138,224, 43,209,133,173, 43,211,
- 51, 24, 33,220,185,115, 39,  0,224,199,175,135, 10,126,190, 18,229, 81,126,193,216,206,157, 59,163,115,231,206,204,210,165, 75,
-219, 92,188,120,177,205,238,221,187,245, 46, 46, 46,107, 18, 19, 19,247, 85, 81,204, 25,251,246,237, 35,  2,129,  0,  2,129,160,
-210, 15, 57, 58, 58,162, 91,183,110,112,118,118, 38, 95,127,253,245, 12,  0, 21, 26, 44,153, 76,150, 70,  8,113,  0,  0, 27, 27,
- 27,227,252,249,243,239, 81, 90,214,  3, 72, 41,165, 55, 24,134,185,201,113,220,173, 35, 71,142, 36, 52, 37,196,161,143, 95,163,
- 43,227, 63, 25, 40,167,251,215, 84,106, 14,180, 57, 89, 21,190, 46, 81,200, 47, 73, 20,138,203, 82, 51,179, 23,204, 85, 83, 66,
- 92,219, 54,242, 56,179,225,171,161,230, 38, 70,241, 26,118,233,210, 69,102, 52, 26, 81, 88, 88,136,141, 27, 55, 90,154,153,153,
- 89,246,234,213,107, 30,128, 50,131,229, 77, 72,243, 15, 85,130,209,243, 19,217,  9,181, 48, 48, 86,157,218,249,199,252,180,108,
-158,133,127,219, 78,120,124,241, 79,100,101,229, 35, 55,167,  0, 47,103,253,  6,128,241, 39,104,234,134,190,100,229,134,111,134,
-206, 36, 12, 67, 90,244,159,129, 30, 13,233, 36,149, 74, 21, 78,  8, 17,149, 46, 31, 67,  8, 17,186,186,186,170, 26, 54,108,185,
-178, 65,143,198,216,248,237, 39,160,197,139, 52,174, 52, 53,122, 69,  8,113, 48, 55, 55, 63,114,230,204,153, 54,173, 90,181,194,
-205,155, 55,241,236,217, 51,140, 31, 63, 94, 55, 97,194,  4,241,240,225,195,201,212,169, 83,191, 36,132,236,167,148, 94,123,249,
-251, 34,145,104,216, 71,  3, 62,144, 20,228,228,105,116, 90,189,206,198,206,138,211, 22,106,138, 50,178,243, 52,159, 12, 29,166,
-187,119, 55,120, 24,128, 87, 12,214,235,212, 39, 15, 15, 15, 15,207,191,212, 96,201,  4,198, 86,243,119,221,135, 49,235,  9,104,
-110, 28,104, 97,202, 43,159,145,219,185,161,113, 59, 71,200,173,236,153,176,135,171, 91,189, 20,181,169,114,170,102,169,185,218,
- 60, 84,213,180, 48, 59, 89, 12,  0, 10,107,103,253,232, 29,137,225,173, 90,181,130,189,189,189,248,250,245,235, 83,  1,236,171,
- 66,147,232,194,130,241,176, 79,123,212,123,152,  5,185, 92, 14,137, 68,242,194,  7,162,162,162,112,249,242,101,196,197,197,193,
-203,203, 11,120,105, 28, 85,121, 77,181, 90,237,216,179,103,207,160, 21, 43, 86,116,254,241,199, 31, 31,108,219,182,173,115,101,
-221, 74,222,132, 40, 90,184, 59,  5,125,255,245, 24,107,122,242,119,166, 40, 51, 13,226, 74,202,217,126,241, 42,180, 95,188, 10,
-  0,176,215,219, 25, 50, 11,115,200,148,202, 75,129,167,239,190, 18,185,242, 35,196,194,203,217,246,194,250,249,147, 21,184,176,
- 71,130, 47, 22, 86, 89,159,126,126,126, 13,  3,  2,  2,174, 47, 90,180,200, 42, 62, 62, 30,215,174, 93,131,187,187, 59,138,138,
-138, 94, 88,175,204,155, 16,199,214,141,234,158,153, 61,109,164, 37,128,  9,166,236,163, 23, 76,136, 64,240,253, 15,243,103, 88,
- 88, 74, 41,158, 92, 59,132,103, 79,158,227,118,196,115,195,246,179,161, 70,157,193, 56,170,162,250, 28,127,148,126, 51,173,171,
-244,247,187,249, 94, 71,251,116,153,208, 96,209, 16, 71,232,245,250,173,233,233,233, 24, 61,122, 52, 56,142, 67,199,142, 29, 59,
- 80, 74, 19, 39, 77,154,  4, 47, 47, 47,108, 57, 29, 85, 36,204,186, 21,176,227,122,222, 93, 83,142, 37, 66, 72,179,186,117,235,
-158,185,120,241,162,163,139,139, 11,130,130,130,144,146,146,  2, 39, 39, 39, 76,152, 48, 65,178,108,217,178,109,121,121,121,131,
- 22, 47, 94, 44,123,240,224,193,110, 66,136, 91,137,105, 46,211, 52,114, 70,149,167,187, 74,121, 96,247,233,251,214,230,114,212,
-241,114, 19, 11,148, 22, 70, 10, 82, 84,199,217, 94,108,228,140,170, 10,246,255,107,213,167,169,240,154,188, 38,175,201,107,254,
- 27, 52,255, 85,  6,171, 20,253,179, 32, 72,188,  7,  0, 92, 83,208,236, 39,224,242, 18, 65,229, 14, 40,228,204,144,145, 20,139,
-135, 87,246,129,234,171,207,123, 39, 18,128,157, 51, 97,168,208, 74,  6, 72,204,237,245,249,249,249, 80, 40, 20, 40,204, 78, 22,
- 79,251,161, 44,178, 37,190,120,241, 34,130,131,131,161, 82,169, 76, 42, 35,213, 21,247, 34,234,116, 58,232,116, 58,164,244,110,
- 13, 69,219,119,144,253,201,  4,156, 63,127, 30,105,105,105, 16,139,197,144, 72, 36, 96,217,234,147,197, 51, 37,171,198,150, 70,
-173, 42,250, 76,  0, 33, 66, 87, 27,229,209, 13,243, 38,123, 48, 55,142,137,212,113,209, 72,210, 24, 97,101, 66,125, 74,149, 10,
- 72,228,102,151, 36, 74, 69, 69,230, 74,164, 80,202,142,254,190,104,170,147, 32,228,188, 76, 29, 29, 90,102,218,202,211,173, 91,
-183, 49,  0,230, 81, 74,115,  2,  2,  2, 28, 23, 47, 94,108,157,152,152,136,136,136,  8,236,221,187, 55,157, 45,222, 80, 66, 41,
- 93,  0,  0,237,  8,145,213,177,183, 58,189,254,187,201,230,184,184, 71,130,207,106,158, 92,221,178, 73,223,227, 31, 14, 31, 55,
- 97,221,228,190, 40,204, 87, 99,231,217, 16,156, 10,126,242, 62,128,171,148,210, 74, 51,220,255,120, 94, 27,237,226,226,210,245,
-139, 47,190,184,119,240,224, 65,187, 31,126,248,  1, 70,163, 17, 44,203,130,101,217,178,255,141, 70, 35,118,237,218,133,171,119,
- 35, 38, 37, 37,229,153,180,222, 27, 33, 68,229,225,225,113,238,214,173, 91,246,114,185, 28,103,207,158, 69, 78, 78, 78, 89,228,
-106,196,136, 17, 36, 39, 39,231,227,141, 27, 55,126, 24, 19, 19,243,195,149, 43, 87, 50,  1,  8,  0,176, 47,238,115,225, 19,150,
- 53, 52,118,110, 82, 95, 56,168,111,167, 78,  5,153,161, 80,218,250,224,198,253, 39, 71,179,179,115,212, 12, 35,124, 82,254,243,
-111,162, 62,121,120,120,120,120,254,229,  6, 75,115,127,  7,180, 97,123, 32,246,234,  2, 73,211,193, 16,185,182, 67,124, 88, 16,
-238,157,248, 17,  9,225, 87, 65, 57, 35, 28,221,171, 95,106,238,143, 16, 42, 82,169, 84,193, 73, 73, 73,  8,  9,  9,193,147, 39,
- 79, 32,147,201, 94,249,220,249,243,231,  1,  0, 78, 78, 78, 38,109,132,196,191, 61,220,238, 39, 35,190,133, 51,  0,192,237,126,
- 50,  0, 96,233,236,217, 16,139,197, 16,139,197,101,139,194,154, 98,176, 72,201,135,185,226,110, 42, 90,209,251,254, 82,209,206,
-221,243, 38,182,150,198,132, 73,180, 15,110, 32, 73,203,209,163,169,198,227,222,166, 24, 44,185,252,146, 68,169,188, 44, 86, 40,
- 94, 48, 87,  0, 64, 69,162,237,127, 46,152,232,163, 72,125,170,208,220, 57,143,100, 13,167,183,168, 88,102,193,201,147, 39, 29,
-132, 66,161,147,209,104, 68, 92, 92, 28,194,195,195,177,118,237,218,212,252,252,252,128,224,224,224,168,114,229,101, 90,153, 73,
-246,110, 95, 56,217, 83, 24,122, 73,166,125,242,160, 66,211, 86, 21,246,205,251,247,120, 63,160,197,241, 49,159,124,139, 15,122,
-119,199,240,  0,111,250, 60, 41, 75,  3,224, 44,165,212, 88,221,247, 19, 19, 19, 19, 93, 92, 92,186, 13, 24, 48, 96, 71,211,166,
- 77,155, 80, 74,209,184,113, 99,244,235,215, 15,  7, 14, 28, 64, 68, 68,  4,242,243,243,245, 87,174, 92, 89,147,148,148,244,155,
- 41,101, 34,132,200,173,173,173, 79, 93,184,112,193, 94, 46,151,227,204,153, 51, 80,171,213,112,118,118,126, 33,114,181,116,233,
- 82,217,243,231,207,215,159, 62,125,218, 29,  0, 83,209, 66,216,122, 86,187,229,183,109,187,215, 77,253,242, 11,151, 11, 55, 35,
-206,107, 11,242, 45,235,214,141,207,179,183, 86,154, 47, 94,186,188,142,158,213,141,169,184, 62,131,106, 85,159, 60, 60, 60, 60,
- 60,255,114,131, 85,218,197, 68, 57, 22,186,232,179,208, 69,159,133,162,203, 28, 28, 89, 50,236,133,207, 25,141,134, 90, 21, 64,
-163,209, 64,172,180,213,255,248,245, 80, 49,  0,112, 34, 69,217,234,240, 28,103,218,194,235, 53, 89,210,171, 38,  6,171, 68,247,
- 21,243,224, 33, 85, 94,218,242,213,160,182,182,198, 34,145,238,234, 81, 36,106, 57,246,135,104,125,209,157, 28,186, 98,118, 37,
-154,199,186,181,134, 33, 59,  3, 50,115,197,165,158, 23, 31, 84, 56, 91,208, 67,102,113,126,239,212, 33, 29,157,196, 16,235,142,
-239, 67,146,150,211,110,138, 49,252,182,182,146,109,166,148,226,217,179,103, 40, 42, 42,194,245,235,215,113,224,192,129,244,151,
-205, 85, 73,121,131,126,157, 49,172,141, 69,126,138, 88,119,231, 28,146,180,156,182,161, 41,166,202,167,127,  7, 49, 67,206, 16,
- 70, 96,214,187,147, 55,166,124,209, 31,171,127,253,139,213, 57,116,234,179,238,200,137,143, 10,180,250,217,166,152,171,114, 38,
- 43, 20,128,183,187,187,187,148,101,217, 46,125,251,246, 61,209,187,119,111,220,184,113,  3,231,206,157,107,160,215,235,147,  1,
- 64,165, 82, 45,  4,224,200, 48,204,138,132,132,132,167,149,236, 35, 70, 44, 22,239, 62,119,238, 92, 83,149, 74,133,115,231,206,
- 65,173, 86, 99,220,184,113,186,137, 19, 39,138, 71,140, 24, 65,114,115,115,203, 34, 87,215,175, 95,207,172,204, 92,  1, 64, 94,
-194,195,147,214,110, 77,219,119,233,220,174,127,131,  6,245, 45,158,230,231,165,201,229, 50,179,139,151,174,136,111,221,188,181,
- 62, 47, 33,242,118,197,245,121,222,228,250,228,225,225,225,225,225, 13, 86,149, 24,179, 94,109,243,140,108,237,215,105,110, 55,
-243,116,184,153,153, 25, 54,110,220,  8,185, 92, 94, 99,227, 84,116,242, 16,226,199, 15, 45,139, 92,149, 70,178,208,115,196,107,
- 25, 44,142,227,174,  3,120,193,229, 41, 28, 27, 13,217,253, 73,183, 14,222,158, 46,140, 97,239, 90, 36, 20,177,154,121,143,244,
-154,135,249,244,253,136, 10,  6, 79,151, 97,208, 65,166, 40,142, 92, 85,100,174,148, 78, 13, 63,220, 54,164, 75, 64,139, 70,245,
- 24,118,207, 42, 36, 22, 25, 10,102, 69,234,245, 79, 11,233,193, 74, 76,229,188,238,221,187,207,179,181,181,149,173, 91,183,206,
-178,110,221,186, 96, 89, 86,247,178,185, 82, 56, 54, 26,178,103, 68,207, 14, 13,157,172, 25,195,254,159, 16,175, 54, 22,173,125,
-106,216,182,201,  4,115,101,103,169, 60,189,105,201,120, 51,185, 84,  4,141, 70,131,101, 27,246,227,204,181,  7,125,210,195, 14,
-157,  6,112,186,182,251, 91,175,215,127, 30, 24, 24,184,122,250,244,233, 96, 89, 22, 31,127,252, 49, 98, 98, 98,206, 68, 71, 71,
-175,117,117,117,253,122,252,248,241, 42,123,123,123,140, 29, 59, 86, 12, 96, 68, 37, 50,203,119,238,220,217,167, 69,139, 22,184,
-116,233, 18,114,114,114,224,236,236,140,137, 19, 39, 74,150, 46, 93,186, 45, 47, 47,111,208,146, 37, 75,100,207,158, 61,171, 50,
-114, 85,158, 28,154,187,232,151,213, 99,191,110,221,182,  3, 19, 29, 29,197,198,181,238,204,156, 63,119,226,114,182,131,116,219,
- 11,245, 57,178, 87,141,235,147,135,135,135,135,135, 55, 88,213, 70,135,140,249,175, 14,118,231,140, 38,  7, 50, 76, 54, 78, 70,
- 19, 53, 57,173,166, 58,195, 84, 35,131, 85, 50,  6,235, 20,165,244,  5,131,101,229,212,168,243,156,153,147,215,116,252,176, 39,
-147,250, 69, 59,228, 20,104,181, 51, 34, 88, 46,161,168, 26,115,  5,128, 49,234, 47,137, 44, 44, 46,139, 95,154, 45,  8,  0,102,
-142,245, 91,207,250,234,203, 13,239, 14,233, 75,210,199,117, 68,118,142, 90,251,117, 56, 75, 18,213,116, 80,  4,165, 23, 43,210,
- 59,127,254,252,102,  0,155,  3,  2,  2, 82, 21, 10,  5, 10, 10, 10, 94,169,215,210,242,118,248,176, 39,147,250,121, 27,100, 21,
-234,181, 51,194, 89, 36,169,185,221,213,153, 43,123, 43,243,211,155, 22,143,151, 39, 37,196, 64, 44, 22, 67,169, 84,226,236,213,
- 48,164, 63, 56,124,250,117, 14, 56, 87, 87,215,249,147, 38, 77,154, 55, 98,196,  8,100,103,103,227,236,217,179,120,247,221,119,
-241,243,207, 63,215,189,112,225,194,234,246,237,219, 67, 32, 16,224,236,217,179, 48, 24, 12,143, 43,217,159,253, 71,143, 30,253,
-245,135, 31,126,136,219,183,111, 35, 57, 57,249,133,200, 85, 78, 78,206,199, 27, 54,108,248,240,249,243,231,213, 70,174,202,227,
-  2,180,246,172,215, 82,252,205,220, 31,161, 45, 74, 19,166, 39,222,188,116,254, 44,189, 81, 55, 43, 75, 14, 32,183,182,245,201,
-195,195,195,195,195, 27,172, 10,220,139, 17, 66,103, 31,176,201,161,255,121,233,165,217,132, 98,185, 18,156,177,122,227, 50,194,
-151, 24, 70,214,131,112, 85, 47,  6, 98,165,173,190,221,204,211,225,149,125, 86,169, 84,154,218, 69,104, 20,247,254, 80, 80,175,
-199,  7,120,218,220,  9,212,160, 47,139,100, 97,246,236, 23, 76,150, 88, 44,134, 78,167,  3, 42,232,246,123,137, 91,132,144, 24,
-  0, 55, 40,165,212,175,161,215,247, 50,133, 98,164,191, 79, 61,187, 41,227, 63, 23, 61, 79,211,226, 66,199,111,114,246, 47,159,
-169,140,167,202,  9,177, 52,231, 90, 53,134,242, 82,239, 43, 15, 95,137, 92,249, 54,244,250, 86, 38,151,125,209,182, 89, 67,167,
- 89, 83,199,139,158,167,106,201,133,214, 51,242, 14,172,152, 33,127,  6,243,175,227,105,246, 69, 19,182,127, 94,239,222,189,231,
- 81, 74, 41,199,113,115,  1,160,124,121,167, 78,252, 66,244, 52, 69,131,243, 29,191,205, 62,176,124,166,121, 60,170, 46,175,189,
- 79,255, 14,142,214, 22,167, 55, 45,153, 32, 79, 78,140,133, 84, 42,133,185,185, 57,226, 83,115, 33, 18, 10,212,175,115,176,185,
-187,187, 75,219,180,105, 51,115,248,240,225,136,140,140,196,172, 89,179,146,147,146,146, 14, 30, 57,114,100,220,212,169, 83,133,
-157, 59,119, 70, 90, 90, 26, 54,110,220,104,184,125,251,246,146,148,148,148,149, 21, 30,180, 66,225,231,223,127,255, 61, 77, 74,
- 74, 34,207,158, 61,131,179,179, 51,190,252,242, 75,201,146, 37, 75,202,198, 92,213, 36,114, 85, 74, 66, 66,194,165,  6,245,234,
-224,253,147,107,192, 26,180,151,114, 50,227, 46, 63,124,154,125,201, 70, 34,153,214,209,207,167, 86,245,201,195,195,195,195,195,
- 27,172, 87, 48, 80, 38,119,231,178,177,150,239, 15, 27,  7, 51,247,119,160, 13,223,  7, 46, 63,  5, 92,126,177,129,145, 40, 44,
- 96,110,231,134,130, 34, 13,174, 62,120, 10,  3,101,114,171,212, 51, 66,184,232,231,255,204, 22,180,178,178, 66,110,110,238, 11,
-145, 23,185, 92, 14,149, 74,133,188,188, 60,236,223,191, 31,180,154,200, 16,165,244,251,225,195,135,127, 55,126,252,120,166,222,
-144, 81, 40,184,121,229,229,104, 20,204,204,204, 32,147,201,144,144,144,128, 71,143, 30,113,148,210,239,171,137,120,221, 98, 89,
-246,254,238,221,187, 19, 26,120,185,246, 12,104,213,122,210,236,111,102,153, 71, 92, 57,131,185, 75,214,115,245,253,123,228, 46,
-219,117, 56, 63, 87, 89,167,107, 81,210,195,123,213, 85, 50, 33,228,213, 36,162,158,117,222,109,231,219,114,250,220,185,223, 90,
-132, 95, 57,139,239, 86,108,162, 13, 90,  4,230,174, 56,112, 36, 47, 67,238,222, 93,157,250,159, 49, 63, 85, 17, 20, 20,180, 25,
-192,230,210,231, 47,151,119,214,194,181, 92,195, 86, 61,179,151,237, 58, 80,152,103, 94, 39,176,170,242, 58,120, 15,104,239,230,
-108,115,250,167, 69, 99,229, 41,137,113,144, 74,165, 80, 42,149,136, 75,206,193,188, 53,123, 11,245, 28,215,243, 53,143, 55,169,
- 66,161,144,234,245,122,252,241,199, 31, 72, 76, 76,108,151,156,156, 28,231,228,228,180,105,236,216,177,235,154, 52,105,210,248,
-209,163, 71,143, 11, 10, 10, 38,164,164,164, 60,172, 76,196,202,202,170,157,189,189, 61,185,113,227,  6,198,142, 29,171,251,242,
-203, 47,197,195,135, 15, 39,217,217,217,181,138, 92,149,139,174,117,238,247, 94,123,116,232, 54,238,146, 78,147,115,249,249,195,
-109,151, 24,122, 77,230,215,210,167, 86,245,201,195,195,195,195,195, 27,172, 10, 73, 23,170, 29, 54,109, 63,176,114,247,190,131,
- 95,140, 30, 57, 84, 22, 16,248, 41,196, 25, 97, 96,147,130,225,226,221, 17, 84,104,134,219,119, 67, 16,250, 36, 94, 83,164, 23,
-108,205, 19,171,167,191,100, 44,  2,171,202,149,145,155,155, 11,119,119,119,236, 26,215,168,169, 54, 47, 77, 92,  7,  0,147,104,
-169,191, 16,213, 59,252,242,229,203,  5,  0,182, 54,104,208, 96, 95, 85,154, 33, 33, 33, 11, 90,182,108,121,228,155,111,190, 89,
-218,160, 65,131,158,163, 23,254, 12,241,148,225, 80, 71,132, 66, 30, 48,  8, 54, 54, 54,200,204,204,196,237,219,183,145,159,159,
-127,138, 82,250,205,189,123,247,194,170,210,164,148,222,244,241,241, 73,168, 83,167,142,149,131,210,236,183,113,159, 13, 55,143,
- 13,189,137,212,168,251,184,118, 53, 42,123,231,129, 35,137,121,185,233,159, 85,213,184,150,215,100, 24,230,  5,115,213,176,161,
-157, 82, 33,181,222, 62, 97,244, 40,139,184,176,219, 72,139,186,135, 43,215, 30,103,239,218,125, 40, 61, 51, 51,117,100,101,230,
-170,186,250,172,168,188, 55,175, 60,202,222,189,239, 80, 66,126, 97,246,231, 21,149,183,188,166, 82, 33,154,126,228,143, 69,242,
-164,132,216, 50,115, 21,155,156,141,239,214,236, 46, 84,235, 12, 61,211, 67, 15,153, 20,169,169,170,156, 28,199,129,101, 89, 80,
- 74, 33,145, 72,242,  0,160,196, 76,117, 53, 85, 51, 35, 35, 35, 40, 38, 38,166,159, 82,169, 44,139, 92,229,230,230, 14, 90,182,
-108, 89,141, 34, 87, 47,151, 51, 33, 33,225, 82, 61, 79,215,229,201,131,  7,105,157,157,237, 47, 29, 61,121, 39,204, 65,105,246,
-176,182,245,249,166,224, 53,121, 77, 94,147,215,252, 55,104,254,171, 12, 86, 68,  4,213,  3,152,236,237,109,177, 96,197,166, 29,
- 27,183,239,218,223,127,244,176,  1, 66,223, 22, 93,241,236,250, 33, 92,190,121,129,205,214,208, 67,249, 34,193,184,136,232,188,
-236,234,126, 76, 36,  0, 59,116,232, 80, 33,  0, 72,132, 96, 87,245,233, 19,212,180,105,211,142,109, 13,105,226,121,235,138, 35,
- 91, 11, 38, 13, 21,  7,221, 14,218, 39,149, 74, 55, 63,123,246, 44,207,148,141, 40, 49, 76,189, 90,181,106,245,206,215, 95,127,
-189,188,183,135,107,235,254,237,187, 64, 36, 18,225,246,237,219,200,204,204,188,205, 48,204,204,144,144,144,203,166,232,133,133,
-133,101, 52,173,239, 62,217,198, 76, 60,125,194,208,254,246,233, 79, 34,144, 16, 25,  2,  0,208,106,213,134,228,168, 75, 45,106,
- 82,201,165, 11, 55,123,123,123,139,141,218,130, 17, 50,161,197,220,113, 31,247,115,200,124,254, 16,241,225,197,233,158,180,154,
- 34,125,124,212,133,198,181,217,137,238,238,238, 82,133,  8, 99, 42, 44,175, 78, 99, 72,121, 28,217,210, 20,157, 34,173,110,201,
-130,213,219,187, 47,154, 62, 82,106, 97, 97,129,224,  7,209,152,187,106, 87,141,204, 85,117, 80, 74, 97, 48, 24,106, 52,243,179,
-  2,102,182,104,209,162,209,226,197,139, 27,148,140,229,122,173,200, 85,121,158, 60, 75,152, 21, 16, 16,224, 29,253, 40,184,139,
-141,153,120,199,235,212, 39, 15, 15, 15, 15, 15,111,176, 80,181,209,202,203,  6,240,145,175,171,133,215,226,245, 59,182,154,  9,
-185,142,106,150,185,170,214, 50, 95,132, 36,228, 61, 53,245,199,254,  8,161,162,151, 95,243,246,246, 86, 68, 11, 81, 80,250, 60,
- 58, 11, 72, 74, 74, 90, 81,155,141,185,115,231,206,101,  0,109,124,125,125,251,159, 32,100, 54,240, 20,148,210, 37, 33, 33, 33,
-135,106,162, 99, 46,196,131,142,222, 94, 46,157,124,155,202,  4, 70, 53, 18, 34,159, 32,171, 80,131,179,225,177, 57, 12,101,126,
-175,109,101, 51,250,162,251,157,188,235,213,121,199,175,169, 92, 68,116, 72,136,  8, 70,174, 90,135, 51,225,177,185, 32,164,214,
-  3,165,223, 84,121, 83, 66, 15,223,177,247,233, 31, 72,  8, 57, 55,123,226, 16,233,188, 85,187,223,168,185,178,177,177, 41, 74,
- 73, 73,201,212,104, 52,182,169,169,169, 58, 27, 27,155,162, 90,154,180,104, 66, 72,243, 41, 83,166, 44,252,250,235,175,167, 47,
- 95,190, 92, 92,155, 49, 87,149,145,157, 24,123,232,157,166,111,126,255,243,240,240,240,240,240,  6,171, 66, 74,204, 84, 64,128,
-183,189,226,234,163,244,194, 55, 81,128,136,136,136,194, 17,190,164, 44,178, 37, 18,128,125, 93,205, 18, 67,117,168,214,  2, 12,
-201,191,249, 56,182,224,214,227,216,  2,112,148,114,148,106, 25,  6,241,133,122,253,146,168,167,  9,181,159, 69, 71,136,241, 78,
-116,156,250,238,147,120, 13,229, 56,202, 81,170, 35,  4, 41,  6,  3,183,228,193,211,152, 35,255,132,242,166,135, 30,186,230,228,
- 61,160,211,181, 91, 15,166, 22, 22,234,215,167, 71, 28,186,254,166, 14,182,224,224, 96,131,179,179,243,176,190,125,251,142,226,
- 56,110, 83, 98, 98,162,161,182, 90,148, 82, 29,128,153,132,144,131, 97, 97, 97,123,175, 95,191,158,252, 38,204,213,223,186,255,
-121,120,120,120,120,120,131, 85, 21, 65, 17,111,198, 92,149, 82, 81,100,235,191, 73,216,227,231,126,127,135,238,131,199,207,155,
-253, 47,148, 55, 37,226,224, 93,  0, 31,255, 29,101, 77, 78, 78, 62,  3,224,204,155,210,163,148,222, 33,132,120,  0, 16,188, 17,
-115,245, 55,238,127, 30, 30, 30, 30, 30,222, 96,241,240,252,207, 64,139,  7,116,177,124, 77,240,240,240,240,240,252, 83, 32,  0,
-  2, 43,105,180, 76,158, 29, 64,  8,  9,172, 69,163,120,142,215,228, 53,121, 77, 94,243, 45,209, 76,171, 66,243, 65, 53,154,149,
- 69,182, 29,254,135,234,179,101, 37,154,203,171,209,156, 89,197,219,247,248,227,243,237,212,252, 55,221,253,255,109, 15,  0,129,
-188, 38,175,201,107,242,154,255,  2,205,102,124,125,190, 81,205,153,124,125,254,251, 52,223,182,  7,195, 91, 76, 30, 30, 30, 30,
-158,191,173,155,132, 16, 41, 33, 68, 90,219,247,121,120,254, 87,169,241, 24,172,214,173, 91,215,  7,128,219,183,111, 71,255,141,
- 39,228, 68,103,103,231,209, 62, 62, 62, 77,196, 98, 49,147,159,159,191,224,194,133, 11,243, 95,254,220, 59, 77, 69,119,  5, 12,
- 92,203,125, 19, 32,  2,128, 97, 96,164, 72,184,124,191,200,159,223,197,255, 93,156,157,157, 79,203,100,178,186, 28,199,129,229,
- 40,140,172,177,248,175,145,131,193, 72,161,215,105, 98,181,133,185, 61,106,165,221,114, 64, 29,214, 72,151,  1,220,  6,  2,102,
- 28,  5,183,145, 80,102, 28,101,176,129,112, 24, 11,161, 97, 37, 88,209,215, 66,177,240,219,164,224,125,241,111, 67,125,238,223,
-191, 95,240, 58,223, 31, 56,112, 96,133,203, 68,249,250,250, 30,147,201,100,245, 42,251, 94, 81, 81, 81,242,253,251,247,187,188,
-205,199,170,147,147,211, 59, 12,195,252,  4,160,233, 75,111, 61,  4, 48, 57, 41, 41,233,252,235,254, 70,107,185, 92,104, 39, 16,
-140, 17, 17, 50,  3,  0, 12,148,174,200, 48, 26, 55,223, 46, 42,250,199,140, 33,116,112,112,184, 44, 16,  8, 27, 20, 22, 21, 22,
-230,231,229,121,153,155, 91, 60, 53,147,203, 21, 70,214,248, 56, 35, 35,237,157, 26, 94,203,199,  3, 88, 89,242,255,116, 74,233,
-134,154,188,207,195,243, 86, 27, 44, 63, 63,191,134,  0, 58, 19, 66, 58, 83, 74,223,105,220,184,177, 99, 81, 81, 17,252,252,252,
- 82,  9, 33,151, 41,165,151,  0, 92, 10, 14, 14,142,122, 19,  5, 18,  8,  4, 63,172, 93,187,118,218,151, 95,126, 89,182, 72,115,
-104,104,104,197,159,101,224,122,241,232, 57,135, 59, 97, 81,104, 21, 56,176,196, 96, 49, 64, 97, 50,186,116,107, 93,171,223,183,
-177,177, 49,119,112,112, 88, 64,  8, 25,196, 48, 76,181,141, 25,199,113, 70, 74,233,190,180,180,180,121, 89, 89, 89,249, 53,249,
-173, 86,254, 62,134, 98, 71, 88, 17,212,120,231,110,104,149,179, 43, 27, 55,110,124, 87, 32, 16,184,150, 92,156, 94,190,176, 85,
-248,191,209,104, 76,  8, 15, 15,247, 55,181, 46,100,114,249,116,194,  8,  3, 65,185,226, 36,168,132,121, 72, 57,246,156,166,168,
-104,165, 41,219, 43,149, 74,235,  6,135,220,107, 16, 17,245, 20, 94, 30,117,160,211,179,208,233, 89, 28, 57,119, 27, 45, 26,123,
-160,111,239,110,181, 62, 86,140,148, 44,152, 59,121, 88,151,197,107,119,182,250,118,242, 80,197,226,181, 59, 91,125, 59,101,168,
-114,241,186,157,254,223, 78, 25,166, 92,180,110,135,255,156, 41,195, 44, 22,175,219,169,  7,240, 89,109,126,227,179,230,117, 11,
- 25, 35, 91,225,221, 53, 39, 16,106,127, 13,139, 85,252, 55, 78,220, 81,163, 70, 53, 44, 44, 44,140, 24,213,167,245,247, 77,220,
- 29, 43, 28,255,147,147,153,234,240,248,193,237,185, 66,153,194,251,131,233,191, 85,121,126,138,197, 98,207,203,151, 47, 55,224,
- 56, 14, 70,163, 17, 44,203,150,253,213,233,116,248,240,195, 15,223,200,132, 24,127,127,255, 81,148,210,197,197,135, 37, 89,116,
-247,238,221,245,175,113, 35,166, 20, 10,133, 95, 73, 36,146,206, 44,203, 54,  1,  0,145, 72, 20,169,213,106, 47,177, 44,187,154,
- 82, 90, 80, 19, 61,134, 97,214,220,185,115,199, 91,169, 84, 66,175,215,151, 45, 12, 47, 16,  8, 26,183,105,211,230,103,  0, 13,
- 94,119,251,237,  4,130, 49,237, 59,118, 92, 59,106,202, 20, 65,246,157, 59,248,105,235,214, 53,200,206,  6,128,159,171,251,174,
-171,171,235, 93, 66,136,107, 77,126,143, 82,154,144,144,144,224, 95,179,107,176,176, 65,108,124,146, 67, 93, 55, 21,  0, 64, 46,
-151, 43,238, 60,120,238,224,215,212,163,198,145, 43,  0, 43, 41,165,102, 37,245,187,182,125,251,246,237,  8, 33, 44,  0,202,113,
- 28, 67,  8, 25,194,113,156,176,228,243, 43,  9, 33,191, 81, 74,181,124,211,204,243, 86, 27, 44, 63, 63,191, 19,  0, 58, 55,110,
-220,216,172, 91,183,110,240,245,245, 69,221,186,117, 33,147,201,  0,  0, 89, 89, 89,142, 17, 17, 17, 31,221,187,119,239,163, 27,
- 55,110,192,207,207, 79, 13,224,106,112,112,112,133,209,136,192,190,157,190,148, 41,165,235,  0, 32, 61, 33, 51, 57,225, 89,218,
-186,228,228,228,149,148, 82,174,220,  9,233, 53,124,248,240,169,147, 38, 77,194,177, 99,199,176,107,215, 46,104,181, 90,228,231,
-231,227,194,133, 11,149,220, 90,167, 33,251,194, 50, 64,241, 28,136,187,  4,200, 29,  0,133,227,235,220,189, 45, 24, 60,120,240,
- 20,111,111,239,178,172,227,  6,131,  1, 44,203,194, 96, 48, 32, 59, 59, 27, 83,167, 78, 45,189,120,129,227, 56, 92,184,112,225,
-203, 25, 51,102,  0,192, 87, 21,105,118,235, 92,239,174,144, 16, 87,238, 63,166, 44,225,236,229,167,254,  0, 17,220,185,123,159,
- 84,108,190, 90,  8,170,191, 16, 10, 92, 67, 66, 66, 28,196, 98,177, 73,219,198,113, 28,124,125,125, 77,250,172,139,139, 75, 23,
-133,210, 98,215,128, 33,159, 91,183,244,109, 41,114,113,118,134,129,101,241,236,121, 92,235,251,247,130, 91,158, 57,186,231, 11,
- 23, 23,151, 33,137,137,137, 85, 46, 72,109, 52,114,184, 31,241, 24,231,174,222, 67, 95,145, 12,133, 26, 29, 10,213, 58,108,255,
-235, 58, 18,210,114,107,189,159,218,180,105,227, 34, 23,216,183,254,114,212,  7,138, 21, 63,109, 83,124, 57,234,  3,172, 92,191,
-189,228,239, 54,197,151,163,250, 97,229,250, 63,148, 95,142,234,135,181, 27,126,107,219,166, 77, 27,151, 91,183,110, 37, 86,166,
- 87,217, 62, 98,140,172,116,107, 68,162,  0,  0,210, 55,109,130, 33, 45, 13,170,121,243,  0,  0, 95,120,187,152,220,173,209,172,
- 89,179,187, 66,161,176,218,198,145,101,217,132,  7, 15, 30,248,155, 98,174, 88,150,165, 66,161,112,238,213, 29,223,239,239,208,
-178,225, 11,149, 25, 21, 21,101,249,221,119,115,  7,238, 13,206,167, 31,249,153, 71, 28, 94, 57,170, 74,147,197,113, 28,163,213,
-106,241,248,241,227, 10,179,236, 51, 12, 99,172,205,126, 10,  8,  8,144, 22, 22, 22,238, 84, 42,149, 62,133,133,133,163, 40,165,
-223,  5,  5,  5, 57, 50, 12,131,192,192,192,239,252,253,253,159,203,100,178, 13,106,181,250,158, 82,169, 28, 18, 20, 20,100, 82,
-227, 74,  8,121,199,194,194, 98,251,161, 67,135,172,125,125,125,153,140,140, 12,120,120,120, 32, 43, 43,171,245,229,203,151,253,
- 62,251,236,179,207,  8, 33,159, 82, 74, 47,215,160,184,141,228,114, 57, 29, 62,124, 56, 49, 26,255,179,185,191,254,250, 43,252,
-156, 83,235,141,237,169, 40,210,232,104,238,249,199,150, 99,197, 98,241,213,152,152,152, 26, 31,192, 34, 66,102,140,154, 50, 69,
- 32, 78, 78,134, 34, 42, 10,125,  8, 17,110, 41,142,102,253,108,194, 54,187,174, 90,183,210, 65, 34,145,128,101,217, 50, 19, 88,
-122,141, 50, 24, 12,208,235,245, 48, 24, 12, 48, 26,141, 48,232, 13,216,186,233,183, 90,159, 99,114,133, 92,238,228,236,156,106,
- 38, 87,200,223, 68, 99, 35,149, 74,133,219,182,109, 27, 34,145, 72,  0,  0, 58,157, 14,205,154, 53, 35,124, 51,204,243,111,140,
- 96,245, 10, 10, 10,  2,203,178, 48, 55, 55,135, 64, 32,120, 57,186,129,119,222,121,  7,109,218,180, 65, 96, 96, 32, 30, 61,122,
-100,182,124,249,242, 74,195, 17, 67,167,245,129, 91,131, 98,227, 99, 48,112,206,215,142,223, 91,246,235,247,251,237,  1, 76, 43,
- 31, 48, 24, 51,102, 12,201,204,204,196,160, 65,131, 46,107,181,218,247, 41,165,149, 46,151, 99,228,144,208,229,227, 97,224, 40,
- 49, 91,125,107, 43,209,105,212,148, 97, 24,117,105, 23, 97, 45,239,138,  7,169, 84, 42,236,222,189, 27, 58,157,238,149,247, 45,
- 44, 44, 16, 30, 30, 94,222,228,160,101,203,150,  2, 66,200,160,202, 12, 22, 67,136,235,201,160,232,178, 25, 65,131,223,111, 41,
-238,222,185, 94,170,144,145, 80,  0,228,219,111,191, 45, 51,108,  0,176, 96,193,  2,147,203, 43, 22,139,241,232,209, 35,  8,  4,
-  2, 60,233, 80,124,131,221, 44, 36, 30,  2,129,  0,247,125,138,239, 64,219, 71,231, 64, 32, 16, 64,169, 84,154,106,174,  2, 28,
-157, 93, 15,127, 51,111,169,185,198, 64,113,252,194,109,196, 37,157,  5,165, 20,206, 14, 54,104,239,231, 43,106,218,188,133,195,
-175, 63,175, 56,236,226,226,210, 47, 49, 49, 49,168, 50, 45,  3,107, 68,147,  6,158,216,118,232, 50, 22,109, 56,128,204, 60, 53,
-242,139,138,235,181,107, 91,111,252, 82,251, 72,231,202, 70,238,238,110,191,239, 61,133,118,109, 91,225,143,189,167,209,174, 77,
- 43, 20, 63,111,131, 63,246,158, 66,251,118,197,127,155, 54,169, 87, 39, 43, 38,119, 37,170,200,237,245,202, 62,234, 87,188,143,
- 60,  4,226,178,  6, 32,102,220, 56,  0, 40, 51, 88, 53, 58,209,132, 66,215,123,247,238, 57, 84,247,185,150, 45, 91,154, 20,185,
- 98, 89, 22,105,105,105, 36, 39, 39,135, 90, 89, 89, 13, 44,111,178, 74,205,213,158,187,121, 80,223, 92, 79,118,252,117,137, 27,
-246,126,231,136,195, 43, 71,121, 15, 28, 56, 48,178, 34, 93,189, 94,255,188,123,247,238,180,164,225,115,145, 72, 36,226,151, 12,
-152,170, 67,135, 14,175, 24,180,234,186, 14, 11, 11, 11,119,110,217,178,165,127,189,122,245, 48, 96,192,128, 51,222,222,222, 18,
-185, 92,142, 83,167, 78,193,205,205,205,206,220,220,252,196,210,165, 75,177,106,213,170, 58,103,206,156,217,  5,160,191,  9,231,
-104, 96,151, 46, 93,118, 31, 59,118, 76, 38, 22,139,161, 86,171, 17, 30, 30, 14, 75, 75, 75, 72, 36, 18,244,235,215, 79,208,161,
- 67,  7,219,128,128,128,  3,132,144, 33, 53,153,209,164,209,104,232,236,217,179, 33,151,203, 33,151,203,161, 80, 40,160, 80, 40,
- 96, 38,230,200,166,201, 30,102,147,182,228,152,125, 53,111,211,178,237, 27,230, 95,172, 83,167,206,119,113,113,113, 57, 53, 61,
- 22,178,239,220,129, 34, 42, 10,154,187,119,107,124, 28, 89, 42,108, 48,107,214,172,234,142, 53,136,197, 98,180,111,223,190, 90,
-189, 38, 77,154,108, 18,  8,  4,246, 47,154,105, 34,152,251,237, 55,236,131,240, 40,133,222, 72, 21, 26, 45,139, 69, 11,231,178,
-  2,134, 17, 52,107,214,236, 16,165, 52, 61, 60, 60,124,172,  9,209, 51, 45, 33,100, 58,195, 48,107,165, 82,169,208,221,221, 61,
-118,238,220,185, 55,138,187, 26,  0, 74, 41,227,238,238,222,218,204,204,172,174, 86,171,101,  1, 76,231,163, 87, 60,255, 22,131,
-  5,165, 82,137, 59,119,238,128, 16,  2,115,115,115, 88, 88, 88,192,210,210, 18,121,121,121,136,136,136,192,195,135, 15, 17, 19,
- 19,  3, 66,  8,188,188,188, 80,122,226,148, 59,193,202, 46,108, 59,127, 60,  6,153, 82, 10, 66,  0,223,119,125,224,243, 78, 51,
-180,186,253,116,178, 74,165,218,146,148,148,244,152, 16, 34,108,214,172,217,103,109,219,182,197,170, 85,171,160,213,106, 87, 85,
-100,174,202,107, 94, 14, 55,248,  3,128, 74,165,250,250,207, 83, 79,228,159,244,172, 87,148,148,148,244, 67, 77, 43,225,229, 11,
-112, 70, 70,  6, 56,142, 51, 57, 42,148,147,147, 83,165,230,203, 17,129, 69,203, 86, 91,229,231,166,226,251,229,127,194, 96, 48,
- 96,218,180,105,224, 56,174,236, 81,145, 94, 69,229, 44,237,250, 19,  8,  4, 47, 24,224,234,158, 87,165,105,111,111,175,144,202,
-228,187,190,254,246,123,243,208,168,  4, 28,187,112, 27,148, 82, 28,217,242, 29,  0,160,223,232,133, 72, 76,201, 64,  7,191,198,
- 24, 49,118,170,249,234, 37,179,119,217,219,219,215, 75, 79,255, 79,242,217,242,154,  6,150,195,129, 83, 55,144,148, 89,128,225,
-  3,186, 66,163,213, 35, 61, 45,  5,191,253,188,  2,227, 71, 28,128,181,210,204,201,203,203, 43,170,124, 29, 81, 74,137, 88, 44,
-190, 26, 21, 21,245,121,101,229, 52, 24, 12,189,190,153,250,  5,214,110, 61,128,102,245,157,112,244,236,117,248, 55,173,139,147,
- 23,110,163,109,115, 15,156,190, 20,140,182, 62,158,184,116, 51, 28, 83,198,126,138,233,147,175,246,170,201, 62, 90,188,116,181,
- 85,126, 94, 42,142, 45,222,134,180,159,127, 70,236,196,137,104, 93,242,153,219,132, 64,236,234, 10,152, 87, 95,159, 47, 19, 25,
- 25,  9,173, 86, 91,209,221, 61,154, 52,105, 82,237, 62, 42,141, 92,165,166,166,146,212,212, 84, 40, 20, 10, 18, 25,254,192,216,
-164,105,179,129,244,225,254,173,  0, 80, 28,185,202, 67,209,245,117, 80,223,248,  9, 98,143, 80,102,235,194,177,186, 47,190,219,
- 20, 81,174,113,123,161,156,247,239,223, 47,171,159,182,109,219, 62,188,122,245,106,163,210,227,171,164,171, 80,204,178,108,131,
-210,110, 67,150,101,161,213,106, 49,100,200, 16, 65, 85,219,110,102,102,230,227,229,229,133,224,224, 96,140, 29, 59, 86,210,165,
- 75, 23, 68, 71, 71,131, 16,130,145, 35, 71,194,219,219, 27,233,233,233,104,213,170, 21,174, 92,185,210,210,132, 99,222, 92,161,
- 80,252,118,244,232, 81, 25,195, 48,200,207,207,  7,199,113,232,208,161,  3, 24,134,193,131,  7, 15,240,237,183,223,226,224,193,
-131, 56,124,248,176,153,159,159,223,111,132,144, 38,148,210,124, 19,246, 17,213,104, 52, 84, 42,149, 66, 42,149, 66, 38,147, 65,
- 38,147, 65, 34,145, 64,173,103, 48,122,117,172, 86, 32,179,227,154,182,236, 88,111,228,164, 37,204, 15,115, 71, 93,  0,112,164,
- 68,243,129, 41,215, 11,  3,165, 43,214,255,242,203,186,247, 80, 60,193,104, 95,126, 62,103,160,116,133, 41,231, 38,  0, 20,104,
-114, 81,215,203, 21,  7,246, 28,198,135,131, 63,168,208, 92,137, 68, 98,136, 69, 34, 88,216, 40,170,213, 20,137, 68,118, 33, 33,
- 33, 86,229,175, 15, 44,203, 70,126,249,229,151, 94, 31,244,123,207,113,239,193, 99,130, 79,  6,247, 51, 58, 57,218,103,196,199,
-199, 70,  3,176,242,243,243,163,166, 30,243,148,210, 13, 45, 91,182,244, 61,116,232,208,168, 89,179,102,221,253,250,235,175,191,
- 47,255,254,202,149, 43, 23,158, 56,113,162,110,255,254,253,183,223,187,119,111, 67,185,239, 45,127,211,141,221,223,145, 58,128,
-215,228,169,181,193, 42,223,248,228,229,229, 33, 47, 47, 15,241,241,241,216,180,105, 83,201,137, 44,130, 80, 40,132, 80, 40, 44,
- 27,175, 80, 25,231,142, 94,249,  9,192, 79,126,126,126,162,176, 27,251, 78,206,216, 50,169,171,127,160,175, 32,248,124,216, 64,
-  0,139,  0,244, 26, 62,124,184, 29,  0,108,219,182, 45,  3,192,201,255, 70,133, 80, 74,247, 61,126,252,120,138,179,179,115,217,
- 24,148,242,221,132, 44,203, 66, 38,147,161,116,172,138, 86,171,197,206,157, 59, 89, 74,233,190,170,234, 47, 42,252,  2, 30,135,
- 95, 44,254, 30,199,129, 51, 22,127, 95,163,209, 96,254,252,249,229,167,190, 98,220,184,113, 64, 13,214, 66,174, 44,114,213,238,
-113, 54,132, 66, 33,174,120, 22, 59,129,222,233,244,149,177, 90,175,116, 97, 72,100,211,122, 15, 24,102,195, 82, 65,153,185, 42,
-222,134, 98,195, 41, 17, 11, 97, 38, 21, 35,234,105, 28,220, 93,252,208,181,247,  7,214,231,142, 29,152,  6,160,194,176,155,222,
-200,161, 87,128, 31,126,222, 19,132,188,  2, 53,114,179,179,144, 30, 23,137,200,208, 59, 16, 10,133,184,123,247,174,185,133,133,
-165,185,167,167,  7,140, 28,135,107, 55,238,130,130,224,232, 95,135,188,234,122,120,226,255,216,187,234,240, 40,174,246,123,238,
-204,250,110,220,179,  9, 16, 72,136,  2, 81,  8,238,197, 41,238, 20,183,162,133, 34, 69,138,182,184,148,226, 80,164,180,184,187,
- 20,119,146,160, 33, 36, 36,  1, 34, 27,247,108,214,119,230,247, 71,164,129, 70, 54, 41,223, 87,190, 95,247, 60,207, 60,187, 59,
- 51,123,230,206,189,119,238,156,251,222,247,190,247,253,219,216,209,229,  8, 91, 78,179, 32, 31,228,103, 36,128,166,105, 52,245,
-119,  3, 77,211,104, 17,228,  1,154,166,209,188,161, 39, 56, 28, 14, 90, 55,246, 65,221,186,117, 81,236,231, 81,113, 25,253,129,
-168,151, 55, 74,137, 93, 22, 44,  0, 77, 82,210, 95, 95,148, 73, 73, 96, 77,237,170, 90,183, 48,123,246,236,236,164,164, 36,205,
-199,130, 78, 42,149,242,142, 31, 63,110, 81,217, 34,216, 18,137,196,135,195,225,132,103,102,102, 50, 98,177,152, 98, 24, 61,227,
- 93,175, 62,125,231,183,165, 71,139,207, 89,178,100,233,209,254,129,102,125,247, 31, 57,203,242, 92,154, 19,194, 21,232,198,124,
-191,141,207, 17, 74,124, 12,236, 52, 80, 42,149, 10,175, 95,191,174,116, 81,110,150,101, 43,172, 80,114,185,124,120,159, 62,125,
- 46, 79,152, 48, 65, 72,  8,193,237,219,183, 75,  4, 63, 77,211,136,137,137,  1, 69, 81,216,177, 99,  7, 84, 42,213,  4,  3, 44,
-129,211,142, 29, 59,102,206,231,243,145,151,151, 87,242,220,208, 52,141,136,136,  8,172, 89,179,  6,195,134, 13, 67, 92, 92, 28,
-164, 82, 41,102,204,152, 97,178, 98,197,138,105,  0,150, 24,112,235,207,212,106,117,144, 88, 44,134, 80, 40, 68,177,208,  2,128,
-208, 36,251, 23,177,177,177, 13,108,108,108, 28,108,111,158, 61,221,180,205,151,126,214,182,142, 77,138,  5,150,161,136,211,106,
-119,200,228,242,249,253,118,239,182,187,117,250, 52,243,226,244,233,  4,142, 94,191,221,224, 58,164,165,240, 62, 38,  1,129,129,
-129,  8, 13, 13, 69, 96, 96,224,  7,214,108, 62,159, 15, 30,143,  7, 30,143,  7, 27, 75,131, 92, 37, 88,154,166,145,156,156,252,
-193,190,177, 99,199,190, 31, 50,100,136, 29,  0, 36,201, 18,216,111,166, 77, 78, 76, 79, 79,103,237,237, 43,230,244,243,243,187,
- 69, 81,148,203, 71,162,216,114,220,184,113,200,206,206,238, 50, 97,194,132,230,133, 86, 50, 42,113,243,230,205, 67,  1,128,207,
-231, 87,123,  8,218,  8, 35,254,231,  5,150, 33,168, 76, 96, 21, 35, 52, 52, 84,235,228,228,180, 51,234,201,187,118,110,190,174,
- 16, 73,  4, 29,  8, 33, 63, 11,  4,130,233, 95,125,245, 21, 30, 60,120,128, 23, 47, 94,252,242,119,151, 61,105,208,160,193, 37,
-129, 64, 80,171,172, 99, 42,149,234,253,243,231,207,203,244, 21, 75, 77, 77, 93,248,232,209, 35, 84,228,228,222,191,127,255,210,
- 47,163, 18, 39,247,114, 91, 48,134,133, 86,163,133,188, 64,241,231,203,187, 72, 96,201,229,114, 12, 24, 48,224,  3, 11, 86,106,
-106,106,181,238,185, 42,150,171,242, 64,209,116, 71, 95,191,  0,238,181,123,207, 62,120,185,246, 28,183, 12,  2, 30,  7, 98,  1,
- 15, 66,  1, 23, 34,  1, 15,241,137, 41,240,242,170,207,187,121,233,108,199,242,  4,150, 86,199, 96,213, 47,231,  0,  0, 71,206,
- 92, 67, 80,109, 49, 22,207,159,141,126,253,250,129,207, 23,226,216,177, 35, 88,179,121, 31,198,215, 42, 44,170, 70, 13,253,177,
-122,235, 65, 44, 93,178,152, 58,114,248, 72,115,  3, 94,184,224,112, 56,160,105,250, 47,159,197,223, 13,177, 70,178, 12, 11,205,
-199,101,196,176,  0,203,194,249,135, 31,224,252,195, 15,120, 84, 36, 78,125,228,114, 40, 20, 10,160,181,111,149,196,149, 90,173,
-134, 76, 38,211, 60,125,250,212,190,140, 23, 83,138, 90,173,174, 84,208,236,222,189, 59,114,228,200,145, 62, 86, 86, 86,225,207,
-158, 62,213,250,250,249,113, 63,246,193,242,240,240,200, 89,178,100,233,209,161,253,186,245,221,246,221, 64,221,248, 37,191,114,
- 12,113,116, 47, 17,197, 26,205,219,246,237,219, 27, 36,241, 21, 10, 69,114,121,199,130,130,130, 70, 18, 66,126,240,240,240, 16,
-180,105,211,  6,183,110,221,194, 15, 63,252,192,232,116,186,116,  0,104,218,180,169,237,210,165, 75, 73,120,120, 56, 44, 44, 44,
-144,154,154,186, 55, 40, 40,104,105, 69,142,239,124, 62,191,117,195,134, 13, 41,149, 74,245, 23,113,181, 98,197, 10, 12, 26, 52,
-  8, 30, 30, 30, 96, 24,  6,249,249,249,104,211,166, 13,119,227,198,141,173, 13, 17, 88, 20, 69, 77,109,215,174,221, 26, 20,206,
- 34, 44, 45, 28, 95,  1,152, 89,100,221, 78,238,214,103,216,203, 22,237,123,  7,185,212,173,239, 88, 25,167,189,189,253,119, 20,
- 69,245,  7, 64,  3,136,167,172,172,234,218,218,218,218,183,236,214, 13,249,132,208,219, 47, 94, 36, 28,145,200,  4,128, 65, 67,
-141, 74,173, 28,181, 92, 11, 93,249,250, 12,232,137,208,208, 80,244, 29,216, 11, 60, 30, 15, 28, 14, 23, 60, 46, 23, 92, 94,161,
-  5,203,194,198,172, 90,237, 72, 81,231,145,152,155,155,  3, 44, 96,102,110, 94,108,201, 36,  0, 88,138,162,216, 10,234,185,251,
-254, 73, 99,237,120,102,230, 96,116, 90,212,252,178,111, 73,157,142,218,189, 69,  4,134, 17,229,199,189,197,212,235,143,184, 48,
-194,  8,163,192, 50, 12,165,157, 66,203, 66,219,182,109, 39,155,154,154,110, 44,106,120, 17,255, 32, 17,241, 15, 18,225,237, 89,
-175, 89,128, 95, 80,206,160, 65,131, 96,109,109,141,111,191,253,150,  5,240, 75, 85,175, 31, 19,249,210,  4,  0, 43,149, 74,191,
- 45,178,  8,248, 61,122,244,200,246,241,227,199,104,216,176, 97,233,151,  7,154, 55, 47,255,189, 93, 52, 51,238, 27,148,227, 79,
- 85, 77,171, 24, 52, 26, 13, 10, 10, 20, 80,171, 53,208,105, 25,232,116, 58,  4,214, 51,197,175, 59,230, 20,238,211, 21, 91,203,
- 10,173,100,  2,158, 10,173, 26,215,208,130, 80,138,155,247,223, 87,216, 82,150,101,185,162,105, 26,119, 92, 11,255,214, 33, 73,
-107,176,208, 98, 25,189,167,131,189, 61,226, 46, 62,  4,  0,152,136,133,184,180,111, 41, 36,226,194,201, 13, 93,134,205,133, 72,
-192,131, 72,192,133, 70,163,129,189, 93,109,232,244, 90,207,114,133,183, 86,173,174,101,111, 14,199, 46,141,241,244,241,125,124,
- 51,121, 12, 70,142, 28,  5,158,208, 20, 55,111, 94, 71,156, 44, 21,111, 18,178, 48,121,225, 22,104,117, 12, 52, 58, 61, 52, 90,
- 61, 54,236, 61,  7,141,158,173,244, 37,207,227,241, 48, 99,198, 12, 81,121,199, 15, 30, 60,168, 48,188,140,180,144,203, 21, 80,
-169, 84,208,168,117,208,104,117,208,215,225, 97,233,252,193,208,105,116, 40, 24,216,  4, 26,173, 14,204,180, 94,208,168,181,136,
- 23,115,168,230, 13,165, 90,128, 82,220,121,156, 96, 86, 25,127,177, 40,168, 72,128, 25,130, 98,145,229,235,231, 23, 62,188,107,
-163, 21,119,239, 63, 78,187,123,255,241, 95,206,115,173,215, 40,118,252,242,131,115,170, 34,174,128, 15,135, 11,255,102,189,255,
-254,198,141, 27,246, 38, 38, 38,136,140,140,  4, 77,211, 32,132,100,132,134,134,218,  3,192,162, 69,139,210,185, 92,174, 53, 77,
-211,152, 54,109, 26, 56, 28,142,237,215, 95,127,189,  0,192,166, 10, 58,114,222,166,166,166, 31, 88,175,120, 60, 30,230,204,153,
-131,161, 67,135,150,136, 43, 30,143,135,189,123,247, 34, 40, 40,  8,106,181,218,219,144,244, 38, 36, 36, 60,  6,208,194,  0,  1,
- 66,138, 68,121,165,245,147,162,168,225, 79, 39, 76,168,171,124,244,  8, 95, 51,140,143,167,167, 39,148, 74,101,201,113, 55, 55,
-183,154,  9,  9,  9,201, 82,169,244, 55,  0, 91,100, 50,217,147,138,248,180, 74,  6,239, 99, 18,138, 59,171,104,212,168, 81,137,
-197,170,180,245,138,199,227, 65,196, 55,169,114,153, 49, 12,131,220,220, 92,122,239,222,189,117,124,124,234, 17,  0,240,246,174,
- 71,206,157, 59, 95,211,196,196, 36,214,202,202, 74, 83,233, 51,105,102,142,171,163,  6,  0,  0,250,181,237, 84,108,197, 66,200,
-210,185,224,112,185,240,155, 62, 23,192,163,146,243,213,106, 53, 24,134,161, 97,132, 17, 70,129, 85,206,131,175,213, 86,120,124,
-221,186,117,104,208,160, 65,133, 47,160,141, 27, 55, 98,255,254,253,235, 88,150,141,169,234,245,187,181, 11,168,135,245, 39, 94,
-186,122, 20, 54, 10, 75,166,117,167,228,114, 57,238,222,189, 11,115,115,115,188,121, 99, 88,216,174,255, 68,152,  6,150,  5, 52,
- 90, 29,228,  5, 74,168,213,106, 76,155,101,208,204,116,162, 81,231,113,186,118,106, 89,174,120, 40, 30,238,163, 40,170, 82, 31,
-172,202,134,  6, 63,176, 96,104,181, 40,126,117,228, 23, 40,209,118,240,119,120,116,106,  3,  0, 20,138, 43, 33, 23, 34, 62, 15,
- 34, 62,  7, 20,  1,  8,202,231,214, 42,114,191, 92,191,116,214,237,173,191,252,234,220,179,229, 24, 76,158, 52, 25, 28,190, 24,
-150,214,182,208, 49, 44,106, 74,237, 16,157,152,133, 99, 63,207, 42, 26, 21,101,209,114,200, 34,172,155, 63,  6,171, 23, 86,110,
-196,228,112, 56,216,180,105,147,226, 99,171, 85,233, 79,182,242,247,224,159,  2,171, 64,  1,133, 82,133,111,191,219, 98,120, 25,
-117,108, 33, 50,228,228,138,  4, 84,101,  2,172, 44,145,101,200,243,235,215, 19,243,255,201,  6,134, 97, 24,156, 59,119,174,164,
- 60,202, 43, 67, 67,173,173, 12,195,224,253,251,247,120,249,242, 37, 26, 55,110,140,156,156, 28,112, 41, 10, 51,158, 63,135,207,
- 87, 95, 65,205,227,129, 97, 24,240,249,124,140, 27, 55,206,224,252,172,162,114, 44,242, 99,211, 87, 72,238,232,232,184,214,203,
-203,171,110, 76, 86, 22, 66,159, 62, 69,163,177, 99,  1,  0,119,238,220, 41,109,  1,196,224,193,131,249,177,177,177,163, 34, 34,
- 34, 70, 57, 58, 58,174, 75, 74, 74,154, 81,238,243,196,170, 74,124,176,250, 15,238,131,186, 94,117,176,127,207,129,146,227,211,
-103, 78,  5,151,203,  3,151,199,133,133,185, 69,149,111, 45, 55, 55,151,179,118,237, 58,223,224,224,198,162, 33, 95,141,160, 52,
- 58, 22, 75, 87,110,160, 15, 31,248,213,122,223,175,251, 69, 66,161,240, 85,165,101,164,213,252,165,157, 34,132,128,195,229,130,
-195,231,  1, 12,  3,150,101, 37,171, 87,175, 94,242,242,229,203,134, 94, 94, 94, 80,169, 84, 95, 17, 66,194,140,113,176,140,248,
- 87,  9, 44,154,166, 43,181, 78, 81, 20, 85,233, 16,225,244,233,211, 97,106,106, 90,222,139,135,125,254,252,121,120, 82, 82,210,
- 14,150,101,171, 21, 23,231,236, 31, 97, 47, 23,127,211, 43, 15,128,  2,  0, 44, 44, 44,210,219,182,109,155, 15, 64,115,248,240,
-225, 15,206, 85,169, 84,239,203,227,177,179,179, 91,188,106,213,170, 41,157, 59,119,166, 40,138,250, 75,227,254,241,166,213,106,
-113,230,204,153, 41,203,151, 47, 71,121, 86,175,226,151,119,129, 92,  1, 69,145,131,115,244,139,163,134, 54,230,149,158,242,204,
-207,169, 76,203,213, 23, 50, 13,104,154,198,  5,187,194,251,232,146, 86, 57, 23,161,232,200,183,239,227, 27, 57,216, 88, 32, 43,
- 39, 31,  2, 62, 23, 34,193,159,214,124,145,176,208,122, 37, 18,112, 97,105, 97,138,140,140, 20,112,185,220,200, 10,132,195,123,
- 66, 72,139,  1,189,186, 92,166,104,142,176,244, 49,174,200, 76,124,229,238,115,203,148, 76, 57, 74, 27,  3, 24,134,197,148,165,
-123, 12,171,192, 28, 14, 38, 78,156, 88,174,192, 57,125,250,116,149, 45, 88, 10,101, 21,203,200, 64,254,138,134,  0, 43, 59, 94,
- 25,138,103, 23, 74, 36, 18,159, 34,241,101, 48,252,252,252, 46,136,197, 98,131,131, 28, 25, 26,116,148, 16,178,164,109,219,182,
- 63, 56, 59, 59,219, 77,152, 48,129,208, 52,141,160,160, 32,155,239,191,255, 62,167,208, 50,226,109, 90,220,198,172, 95,191, 30,
-175, 94,189, 74, 35,132, 44,173,136,147,207,231, 71,152,155,155,  7,181,105,211,  6, 57, 57, 57,136,143,143,135, 68, 34,129,207,
-218,181,120,254,245,215,240,219,182, 13, 84,219,182, 32,132,128,207,231,227,249,243,231, 16,137, 68, 17,229,241, 57, 57, 57,  5,
-179,133, 78,230,205,240,231,176, 32, 11,224, 46, 33,100, 86, 98, 98,226,195, 50,218, 59, 10,  0,244, 12,195, 86,114,255,131,191,
-251,238, 59, 80, 34, 17, 28,155, 52,129, 34, 38,  6, 26,141,  6,141, 27, 55, 46,177,170, 55,110,220, 24, 52, 77,163,110,221,186,
-176,178,178,194,241,227,199,  7,227,195,153,213, 31, 64,153,175,193,251,152,  4, 52,105,210,164,196, 82,213,181,107,215, 18, 11,
- 22,151,203, 45,177,100, 17,125,229,130,149, 16,194,126,212, 22, 19, 62,159, 39, 24, 54, 98, 20, 53,235,219,111, 24,173, 78,203,
-208, 52,151,250,118,254,114,234,205,235, 23,  2,185, 92, 78,145, 74,122,107, 53,123,244, 67,191,118,133, 70,208, 99,117,109, 65,
- 23,  9,171, 30, 47, 18, 74,202,197,236,236, 31,252, 21, 43, 86,244,245,242,242, 42, 28,110,  7, 56,198, 56, 88, 70,252,155,  4,
- 86,212,211,167, 79,221,235,213,171,135,184,184,184,191,204,108, 43,126,198, 36, 18,  9, 68, 34, 81,177,133, 40,170, 60,178,107,
-215,174,253, 12,224,231,226,223, 82,169,180, 73,155,254,173,239, 53,234,212, 16,191, 47, 63,144,147,148,148,228, 91, 28, 19,139,
- 16, 66,164, 82,233, 80, 46,159, 51,192,181,126,205, 86, 96,152, 85, 87, 79,223, 89, 84,209,141,184,122,212,203,  7,160, 40, 53,
-139,112, 77,117, 50,132, 16,210,175,115,231,206, 84,120,120, 56,  6, 12, 24,128,253,251,247,151,123,238,208,161, 67,113,240,224,
- 65,116,236,216,145, 90,177, 98, 69,191,202,  4, 86,161,117, 68,253, 31, 43,204,178, 44, 87, 31,139,196, 74,133,  0,163,187,250,
-252, 73,168,191,111, 80, 83,238,187,132, 20,  8,249, 28,  8,  5,127,206,216, 23, 21,249, 95,137,  4, 92, 56,216, 90,226,209,189,
- 27, 26,157, 78,123,181, 18,113,241, 30,101,  4,105, 20,152,218, 68,126,209,172,129,101, 89,255, 89,251,221, 87,104,112,104,109,
-165,233,229,114,185,216,189,123,183,162, 60,235,149,161,121, 80,104,101,212,162,160, 64,129,  2,133,242,147,149,137,189,189,189,
-173,157,157,221, 86, 11, 11, 11, 97, 89,  2,234,227,227,127, 71, 92, 21,197,197, 10, 31, 57,114,100,149, 68, 22,159,207,175,125,
-247,238,221,146, 32,163, 21,125,170,213,106,244,239,223,223, 32,203,119, 72, 72,200,238,128,128,128,104, 91, 91,219, 43, 62, 62,
- 62,130,232,232,104, 44, 91,182,140,112,185, 92,179,226,246, 35, 47, 47, 15, 52, 77, 35, 43, 43, 11,132,144,225, 33, 33, 33, 23,
- 43,226, 84,169, 84, 55,111,222,188,233,223,189,123,119, 58, 34, 34,  2, 52, 77, 23,166,171, 73, 19,248,109,219,134, 23,223,124,
-131, 86,239,222, 65,169,209, 64, 40, 20,226,210,165, 75,154,130,130,130,155, 21,220,251,142,251,247,239,215, 19, 10,133,208,104,
- 52, 96, 24,  6, 20, 69, 17, 14,135,211,220,199,199,103, 35,128,134, 31,117,192,236,198, 77, 95,233,169,215,233,244, 73,113,209,
-105,  6, 88,132,176,127,255,126, 52,110,220, 24,173, 90,181, 66, 98, 98, 34, 98, 98, 98,208,165, 75,151,146,115,158, 62,125,138,
-176,176, 48,184,185,185, 85,110,193,163,180,112,243,172, 13, 30,143,  7, 46,151, 11, 30,183,240,179,112, 43,180, 92,241,184, 60,
-112, 57, 92,  8, 69, 66,  3,181,255,135,117,210,188,200,242, 37, 22,139,152,186,117,235,134,191,137,142,241,  1, 11,202,204,204,
-220, 32, 95,219, 98, 62, 66, 72,137,184,226,242,121, 37,150, 44,  0,200,201,201, 81,246,236,217,243, 55,149, 74, 53,  2,159,112,
- 36,197,  8, 35,254, 87,  4, 86,151,209,163, 71,111,235,208,161, 67,187, 25, 51,102,192,196,196,  4, 73, 73, 73, 37, 15, 24,159,
-207, 71,141, 26, 53, 80, 80, 80,128, 91,183,110, 33, 59, 59,251, 26,128,113,134, 94, 56, 41, 41,233,193,155, 39, 81, 25,109,250,
- 54,181,174,215,212,211, 34, 62, 42,161, 49,128,123, 69,226,234,151, 65,211,187,140,104,211,187, 17,120,124, 46,226,223, 36,255,
-215, 50,132,162, 40,154, 16,130,  1,  3,  6, 24,116,254,192,129,  3,113,243,230, 77, 84, 52,156, 88, 98,193, 42, 80, 66,174,248,
-116,157, 51, 66,  8,244,122, 61, 26, 71,102,126, 48, 51,171,216,114, 85, 44, 44, 12,177, 92,149,244,144, 11, 10, 86,223,190,122,
-106,172, 87,125, 63,219,198,254,238,120, 19,155,128, 85,115,199,148, 28,255,118,252, 32,236, 61,116, 26, 78, 14, 54, 80, 22,228,
-225,226,249, 51, 57,185,185,185,171,171,123, 15,251, 78, 22,198,129,108, 49,248,195, 57,  2,  3,190,249,201,160,255,115,185, 92,
-140, 24, 49,162, 92, 11,214,149, 43, 87, 20,134, 12,143,178, 44, 11,141, 90,139,124,185,  2,138,130, 79, 35,176,164, 82,169, 95,
-227,198,141,175,108,223,190,221,218,198,198,  6, 50,153,236,  3,129, 37,149, 74,253,130,131,131,175,108,223,190,221,218,214,214,
- 22,241,241,241,  6,135,  7, 41, 67, 92, 33, 45, 45,141,100,101,101, 49,150,150,150, 85, 18, 89, 20, 69, 65,165, 82,225,213,171,
- 87,134, 62, 35,  6,207,248, 50, 49, 49,217,179,124,249,114, 65,106,106, 42,104,154,198,171, 87,175, 62,168,171,197,219,119,223,
-125,135,185,115,231,110,  5, 80,171, 34, 62,157, 78,183,110,232,208,161,163, 18, 19, 19, 45,237,236,236,144,148,148,  4, 62,159,
- 15,150,101, 65,218,180, 65,139,216, 88,104,244,122,136, 68, 34, 68, 70, 70, 98,199,142, 29,114,149, 74,181,174, 44, 46, 55, 55,
- 55, 62, 69, 81,238, 60, 30, 15, 67,134, 12,249,176, 94,238,219,135, 38,181,178,130,198,126, 33,200,215, 65,168, 74, 17,117,190,
- 64,211, 52, 25,247,237, 42,143,224,150, 93,235,191,126,241, 48, 58, 45, 37,225,110, 37,183,175, 85,171,213,240,242,242,194,227,
-199,143,113,245,234, 85,180,109,219, 22, 45, 91,182,196,141, 27, 55, 16, 18, 18,130,176,176, 48, 16, 66, 96,109,109, 93,236,102,
- 81,161,175,133,186, 64,135, 84, 89,198, 95,172, 85, 31,255,230,241,120, 80, 41, 52,  6,149, 81,105,209, 68,  8,129,149,149,149,
-106,195,250,213,  2, 19, 19, 19, 61,  0,152, 72,196,250,195,251, 54,195,198,218, 74,197, 26,104, 98, 45, 25, 22, 44, 18, 87, 52,
-151,251,129,155,  2,203,178,121,207,158, 61, 27, 75,  8,121, 70,  8, 41,110, 63,140,113,176,140,248,119,  8,172,208,208,208, 88,
-  0,237,  3,  2,  2,  6,223,186,117,107,221,244,233,211,109,155, 55,111,142,204,204, 76,212,170, 85, 11, 82,169, 20,143, 31, 63,
-198,211,167, 79,211, 89,150,157, 17, 18, 18,178,191,140,135,172,125,121,177, 50, 88,150,101,165, 82,233, 17, 85,126,254,215,129,
-173,188,113,237,240,237,229,142,142,142,227,156,156,156,166, 13,159,219, 99, 68,235,158, 13, 17, 25,246, 22, 15, 46, 63, 71, 74,
- 92, 58,134,183,152, 85, 33,231,199, 78,238, 22, 22, 22,163,196, 98, 49, 31,128,166,140, 94,240,  7,179,  8, 75,115, 50, 12,163,
- 87,171,213, 56,116,232,144, 65, 34,235,192,129,  3, 80, 42,149, 96, 24, 70, 95,222,189,235, 25,134,112,184,  2, 72,107,120, 65,
-163,145,131, 97, 12,159, 32,201, 86,146,159, 58,157, 14,139, 23, 47,198,204,153, 51,177,116,105,249,163, 43, 28, 14,  7,155, 55,
-111, 70,101,101,148,153,153,153, 39,149, 74,135, 30,220,245,211,209, 33, 99,166,152, 58, 55,245,197,158,195, 23,160,213,104, 32,
- 16,112, 97,105, 38, 65,221,218,206, 80, 43,229,216,182,105,125,174, 82,161, 24,250,177,239, 89, 69,229,254, 49,134,245,108,137,
- 21, 59, 78,225,246,239,127, 78, 66,108, 49,120, 33,126, 91, 61,  9,  1,  1,187, 43,228,212,235,245,224,112, 56, 56,120,240,160,
-162,172,217,131, 52, 77,131,203,229,150,107,193,250,176,140,244,132,203, 19,162, 70, 45, 31,168, 85,249,159,164,140,172,173,173,
-103,238,218,181,203, 90,169, 84,226,245,235,215,120,245,234, 21,  8, 33, 37, 42,166,248,120, 65, 65,  1, 94,188,120, 81, 44,112,
- 94, 85,229, 57, 42,182, 92,165,165,165,145,164,164, 36,136,197, 98,234,217,179,103, 74, 95, 95,223,240,138,158,239,210,156, 42,
-149,234, 93,187,118,237,202,179, 24, 57,  9,  4,130, 15,102,124, 21,  7, 29,253,120,168,176,172,116, 22, 20, 20, 60, 95,183,110,
- 93,157,134, 13, 27, 98,251,246,237,106, 83, 83, 83,254,244,233,211, 89,154,166,201,134, 13, 27,144,149,149,165,158, 51,103, 14,
-255,246,237,219,144,203,229, 79, 42,187,119,150,101,243,  8, 33, 99,155, 54,109,186,239,226,197,139, 98,119,119,119,228,230,230,
-130,101, 89,236,221,187, 23,147, 38, 77,130, 80, 40, 68,100,100, 36,190,252,242,203,130,130,130,130,177,165, 99, 96,149,230,212,
-233,116,132,203,229,178, 12,195, 96,193,130,  5, 37, 65, 69,139,131,140,138,120,122,236,152,238, 42,153,186, 51, 71, 50,248,251,
-157, 95,  1,128, 94,167,211,191,126,241, 48,122,239,166,239,175,243,120,188, 91,165, 56,235,127, 28, 11,139, 16, 50,239,199, 31,
-127,220,218,172, 89, 51,145,137,137,  9,220,221,221,113,247,238, 93,220,189,123, 23,183,111,223, 46,174,  3,176,178,178, 66,118,
-118, 54,226,227,227, 21,132,144,121, 21,229, 39, 95,204,133,171, 71,237,194,217,130, 69, 22, 43,110,169,217,131,165,173, 89, 60,
- 46,183,210,231,253, 99,247, 14, 43, 43, 43, 93, 96, 96, 64,184, 66,161,160,139,181,148,141,141,205,139,162,115,217, 26, 53,106,
-168, 63,170,242,127,225,140,218,181, 25, 33,203,230, 21, 14, 11, 62,143, 47, 17, 91,215,191,  8,  0,135,199, 67,141,110,125, 74,
-191,  7,182, 16, 66,118, 23,125, 87,149,226,156,253,169, 99, 97, 85,165, 93, 50,114,254, 51,156,255, 38, 11, 22,  0, 32, 44, 44,
-236,247,250,245,235, 95, 88,177, 98,197,138, 19, 39, 78,140,153, 50,101, 10, 49, 51, 51,195,145, 35, 71,216,140,140,140, 61,124,
- 62,127,230,253,251,247,179,170,115,113,150,101,247,220, 56,126,111,194,176, 57, 61,201,244, 13,195,155,135,252,241, 34,162, 65,
- 83,119, 52,104,234,142,144,107,225,216, 52,247,192,126,189, 86,191, 32, 41, 41, 41,174, 18, 42, 85,251,102,158, 31, 59,185, 91,
-223,188,254,135,117, 85,103, 17,178, 44,123,228,196,137, 19, 83,186,116,233, 66, 61,122,244,232, 47, 62, 87,197,203,227, 48, 12,
-131, 43, 87,174, 64,163,209,224,200,145, 35, 76, 69,113,176, 24,176,167,182,109, 89, 61,108,219,174,227,124, 62,143,224,254,173,
- 99,200,201,170,216, 42,199,227,113,241,219,129, 83, 26, 14,135,126, 93, 65, 90,223,135,133,133, 89,175, 90,181,138, 38,132, 96,
-203,150, 45,160, 40,170, 92,135,246, 23, 47, 94, 48, 90,173,182,210,178,146,201,100, 87, 28, 28, 28,  6,110, 89,183,120,111,155,
-142, 61, 44,188,189,124, 56,118,118, 53,193,161,  9,178, 50,210, 17,242,224,182,238,226,185, 83,217, 42,149,106,184, 76, 38,187,
-242,119, 42,224,242,237, 39,203,220,223,103,202,186,202,172, 40, 58,173, 86,203,145, 72, 36,208,233,116,101,134,106,104,219,182,
-173,232,238,221,187, 10,141, 70,  3,154,166, 43, 84, 76, 12,240,201,203, 72,175,215,123,103,101,101, 65, 46,151, 35, 52, 52,148,
-221,180,105, 83, 90,118,118,246,220,210,199, 51, 51, 51,145,151,151,135,144,144, 16,118,251,246,237,105,185,185,185,115,171,146,
-127,197,113,177,178,178,178, 24,177, 88, 76,105,181, 90,173,175,175,175, 80, 34, 49, 44,230, 21,  0, 60,121,242,164, 83,121,199,
-154, 53,107, 22,117,247,238,221,186,122,189,190,244, 26,133, 60,165, 82,233,222,163, 71, 15,142,  1,233, 27,124,249,242,229,223,
-111,223,190,221, 64,165, 82,141, 74, 77, 77,221,  7,160, 38,135,195,193,155, 55,111,210,212,106,117,159,121,243,230,237,145,203,
-229,207, 77, 76, 76,  6, 27,216,110, 92, 36,132, 12,241,246,246,222,189,120,241, 98,147, 86,173, 90,113,164, 82, 41, 26, 54,108,
-136,200,200, 72,156, 59,119, 78,187,101,203, 22,121, 65, 65,193, 72,150,101,175, 84,208,233, 96,  1, 16,157, 78,  7, 62,159, 95,
-178,  9,  4,  2,240,120, 60, 20,168, 41,140, 94, 27,163,208, 65,164, 88,183,104,236, 57, 22, 32,201,241, 49,233,169,201,241, 15,
-  9, 33,183,100, 50, 89, 78,121,150, 49,165, 82,233,207,178, 44, 39, 55, 55,119,131, 74,165, 26, 62,125,250,116,199, 85,171, 86,
-193,215,215, 23,233,233,233,176,178,178,130,163,163, 35,242,243,243, 17, 27, 27,171,215,104, 52,219,244,122,253,146,148,148,148,
- 10,135, 29,179,211,115,225,236, 80,243,  3, 75, 39,203,178, 96,245,128, 86,165,135, 94,195, 66, 77,180,224,114,181, 48,112,  9,
- 45, 86,167,211,161, 91,183,110, 56,123,246, 44,122,246,236,201,  2, 40,215,138,116,246,236,217,202,135,220, 25,  6, 92,  1, 31,
- 28,222,159,195,130,133,214,172,194,125, 20,249, 75,121, 26,173, 86, 70,252, 59,  5, 86,209,139, 57, 27,192,184,134, 13, 27,238,
-155, 60,121,242, 89,134, 97,184, 12,195,116,125,242,228,201,237,191,115,241,164,164,164, 80,169, 84,250,157,189,179,229,138,206,
- 67,155,195,211,191, 22,244, 58, 61,238,158,127,130, 61, 63,158, 60,152, 24,159, 56,188,244, 90,133,229, 63,207,204,245,102, 65,
-158, 20,  0, 94,169,225, 23,166, 58,179,  8, 83, 83, 83, 23, 46, 91,182, 12, 63,252,240, 67,149,103, 17,150,119,206,189,199,137,
-227,154,  4, 57, 58, 15,236,211,182, 35, 69, 40, 86,165, 86, 85,208, 43,  0, 91,236, 21,193,225,208,175,111, 62,136,247, 45,239,
-220,228,228,228,118, 19, 38, 76,248,131,162,168, 90,165, 77,243,229, 65,175,215, 39,101,100,100,116, 48, 36, 31,146,147,147, 47,
- 56, 59, 59,123,220,188,120,234,187, 59, 87,207,183,214,235, 53,110,  4,  4, 60, 30, 47, 90,171,215,221,208,170,213,203, 19, 18,
- 18,178,254,110,  5,252,110, 92, 79,188,151,165,131,195,161, 11,  3,123, 22, 21,247,177,141,211, 17, 16,240, 91,185,255, 19,  8,
-  4, 23,118,239,222,221,109,216,176, 97,164,216,239,140,101,217, 15, 26,244,135, 15, 31, 42,212,106, 53,246,236,217,195,138, 68,
-162, 10,  3,215,126, 88, 70,132, 85, 85,224, 15,101,104, 25,229,231,231,143,236,209,163,199, 94,  0,  2,  0,111,114,114,114,198,
-203,100,178,132,210,199,123,246,236,185, 23,128,128, 16,242,151,227,134,160, 56,100,131,165,165,101,120,145,229, 74, 88, 29, 71,
-247, 10,234, 55, 93,222,240,161, 33, 67,133, 69,107, 11,246, 46,254, 29, 20, 20,180,100,194,132,  9, 37,139, 61,135,133,133,221,
-  1,224, 90,141,206,217, 21, 66, 72,189,  5, 11, 22,124, 35, 20, 10,219, 20, 20, 20,120, 20,  9,186, 72,149, 74,117, 93,161, 80,
-172,103, 89,182,194,216, 82,209,209,209,234, 58,117,234, 68,234,116,186,250,182,182,182,224,112, 56, 37, 34, 11,  0, 30,196, 89,
-133, 36, 38, 38, 54,172,106,218,206,159, 63,239, 98,105,105,217,129, 16,210,151,101, 89,207,188,188, 60,213,247,223,127,127,239,
-230,205,155,185, 17, 17, 17,157, 90,180,104, 65, 28, 28, 28,240,246,237, 91, 54, 63, 63,255, 40, 69, 81,243,100, 50, 89,140,  1,
-247,156,176,103,207,158,170,230, 83,133,245, 73,173, 86,167,221,191,127,223,234,234,213,171,180, 94,175,199,197,139, 23, 75, 58,
-146,101,141,  6,198,196,196, 64,173, 86, 87, 56,134,174,201,201,130,239,212,217, 96,139,102,115, 22,163,102,215, 62, 32, 96,193,
-170,141,122,202,136,127,  7,200,127,100, 26,115, 21, 77,136, 82,169,116,128, 80, 34,152, 88,203,195,209, 87, 22,147, 26,158,151,
- 83,176, 63, 41, 41,105, 59,203,178,250,234,114, 86, 37,208,168,209,204,251,207,112,242,197,102,151,  8,205,171, 85,238,203, 65,
-175,121,175, 46,200,237, 88, 22,103,112,112,176, 19,143,199, 91,173, 82,169, 58, 87, 20,165,157,166,105,157, 72, 36,186,160, 84,
- 42,103,126,188,216,243,255, 98,126, 30, 61,122,180, 76,209,111,232, 44,194,190,125,251,234,171,146, 78, 63, 63,191,235, 98,177,
-184,204,128,154,  5,  5,  5,113, 79,159, 62,237,240, 57,228,103,241,204, 54, 67,124,132, 74,115, 86,103, 22, 97, 57,156, 37, 67,
-132, 46, 46, 46,  2,141, 70, 19,  0,192,  3,128,  5,128, 76,173, 86,123, 49, 45, 45, 45,197,193,193, 33,136,162,168,  5, 69,226,
-117,105,114,114,114,200, 63,249,108, 58, 59, 59, 11,205,204,204, 86, 83, 20,229,104,200,255, 25,134, 81,167,166,166, 78, 79, 79,
- 79, 79, 46,139,179, 94,189,122, 33, 52, 77, 87,186,168,185, 94,175, 79,120,249,242,101, 80,  5,233, 52, 14, 17,254, 11, 57,255,
-149, 22,172,255, 52,100, 50,217, 33,  0,135, 62, 37,103,121,145,218,141,248,124, 80, 44,158,170,131, 34,177, 52,240,223,150,103,
-197,  2,169,140,253,175,  0,144, 79,125, 61, 67,194, 49,124, 14, 96,171,217, 83, 44, 18, 80, 45, 62,101, 90,222,189,123,167,  2,
-112,175,104,251,  0, 69,130,170,251,231,146,111,  9,  9,  9, 74,  0,147, 62, 21, 95, 69,162,201,  8, 35,254,109,160,140, 89, 96,
-132, 17, 70, 24, 97,132, 17, 70, 24,241,105, 65,  0,180, 47,167, 71,104,176,233,143, 16,210,190, 26, 61,206,171, 70, 78, 35,167,
-145,211,200,249,255,132, 51,181,  2,206, 23,149,112,214, 47,231,144,221,255, 80,126,250,151,195,185,178, 18,206,217, 21, 28,126,
- 98,172,159,255, 63, 57,255, 53, 40,118,102,252, 79,108,  0,218, 27, 57,141,156, 70, 78, 35,167,145,211,200,105,228, 52,114,254,
-219, 54,227, 16,161, 17, 70, 24, 97,132, 17, 70, 24, 97,196, 39,134,193,  2,203,196,193,219,219,214,197,111,175, 85, 13,223,103,
- 86, 53,124,159,217,186,248,237, 53,113,240,246,254, 55,102,154, 84, 42, 21, 57, 58, 58, 14,174, 89,179,230, 21,127,127,255, 92,
- 39, 39,167,111,140, 85,169,234,104, 77,  8,103, 32, 33, 19,135, 17, 18, 55,140,144,184,129,132, 76,108, 77,200,255,187,101, 51,
- 22, 79,149, 54,185,125,113,200,133,197, 83,165, 77,202, 60,254,173,212,250,225,149,254, 63, 45,159,228,100,245, 41,174, 71,  8,
- 49,181,183,183,223,225,224,224,240,206,222,222,254,189,189,189,253,110, 66,136,185,177,198, 25, 97,132, 17, 70,252,247, 96,208,
-203,204,170, 86,131,209,222, 94,158, 51,151, 45,154, 75, 28,236,108,196, 58, 61,163,121,251, 46,222,103,225,178, 21, 71,173,106,
- 53, 88,151,249,254,249,174,106,188,  4,136,179,179,243,  0, 46,151,219, 13, 64,177, 80,123,165,213,106,207, 38, 36, 36, 28, 50,
-116, 86,144,175,175,239, 29,154,166,107, 86,229,218, 12,195,188,123,250,244,105,203,234,100,152,147,147, 83, 63, 39, 39,167,221,
-141, 27, 55, 22,251,251,251,131,199,227, 97,213,170, 85, 51,  0,172, 55,248,222, 91,183,230,216,101, 91,125, 69,115, 56,221,  1,
-248,178, 44,  0, 66, 63, 99, 52,234,243,169, 60,171,189,108,232,118,173, 33, 60,142,142,142,115,  9, 33,195, 81, 56,173,124,151,
- 76, 38, 91,253,159,168, 36, 82,169,180,  6, 33,164, 13,203,178, 94, 20, 69, 61,103, 24,230,178, 76, 38,203,248,187,188,246,192,
-184,166,205,155,255, 52,108,198, 12, 90,113,235, 22,126,218,189,123,  3,114,115,  1, 96,115, 85,235, 82,112,176,127, 95, 83, 83,
-116, 35, 64,  0,  8,  8,  5,246, 73,102, 54,117,254,241,227,176, 67,134,196, 82, 43, 15,129,129,129,231,  0, 20, 47, 28,119, 62,
- 52, 52,180,107, 85, 57,114,162,217,249,130,238,222, 45,114,162,175,207,  7,208,249,227,227, 58,165,112, 24, 75,215,232,166, 96,
-195,226,  1,172,253, 59,121, 74,  8, 17,219,218,218, 62, 59,117,234,148,115,163, 70,141, 56,  0, 16, 18, 18,242, 85,183,110,221,
-218, 22,133, 18,200,253, 39, 26,154, 38, 77,154, 88,234,116,186,125, 52, 33,141, 25,134,177,  0,  0,138,162,178,245, 44,251,128,
-195,225, 12,171,110,176, 98, 35,140, 48,194,136,255, 89,129,101, 98,239,229, 83,175,158,247,140,139, 39,246,213,200,206,204, 86,
-254,188,102, 95,168,156,195, 47,112,247,113,231,253,188,126,181,229,196,169,211,167,153,216,123, 61,204, 79,137,  8, 55,244,162,
-142,142,142, 53, 93, 92, 92,142,207,157, 59,183,126,243,230,205,185,118,118,118, 72, 73, 73,193,235,215,175,235,223,189,123,183,
-231,201,147, 39,103, 56, 58, 58,246, 54, 32,130, 59, 36,124, 94,157, 67,171,150, 59,240,205, 45,192,234,117,176,172,239, 95, 56,
-254,201, 48, 72,190,121, 21,122,141,  6, 44,163,135,115,167, 47,139,197, 21,130,131,131,121,213,201, 44,103,103,103,169,135,135,
-199,254, 57,115,230,240,212,106, 53,194,194,194,112,255,254,125, 38, 53, 53,117,133,193,162,162, 65, 47, 31,  7,142,195,209, 30,
- 61, 59,187,116,253,194,142, 95,203,193, 22, 44, 35, 68, 68,172,166,230,149,219, 97,157,206, 93,184, 52,203,206,167, 87,159,212,
-240, 19,207, 43,226,169, 95,191,126, 99,138,162,126, 72, 76, 76, 44, 22, 65,171,130,131,131,191, 47,125,206,199, 26,149, 97, 24,
-112, 56,156,148,130,130,130,  1, 47, 94,188,  8, 43,139,119,120,  0,209,106,245,133,245,130,199,129,254, 90,154,243,137,246,237,
-219,215, 30, 57,114, 36,  2,  2,  2, 16, 18, 18,210,230,200,145, 35, 83,107,212,168,241, 88,171,213,158, 23,  8,  4, 55,138,166,
-165, 87, 25, 60, 96,214,176, 25, 51,104,147,119,239, 96,242,244, 41,134,228,230,114, 86,  2,179,170, 34,176,  2,  3,  3,235,116,
-104, 31,112,180,103,239, 86,222, 14, 14, 62, 60, 46,215,  6, 44,203, 66,171,205,244, 72, 75,123,213,215,220, 28,115, 26, 53,106,
-212,231,209,163, 71,  6, 69,154,109,216,176,161, 61,195, 48,219, 88,150,229, 17, 66, 38,  3,232,114,241,226, 69,232,245,122,116,
-237,218,181, 75, 96, 96, 96, 29,150,101,127, 54, 49, 49, 97, 21, 10,197,168,199,143, 31,167, 84,100,185,202,141,102,231, 39, 19,
-215, 78,158,129,195,144, 76, 46,118,154,222,217,241,130,153, 27, 89,182,240, 39,217,125,  0,232,236,230,102,234,234, 37,153,109,
- 98,214,192, 42, 55,241,234,236,206,110,110, 59, 47, 68, 71,231, 85,167,195, 82, 84, 15, 86,255,250,235,175, 53,130,131,131, 75,
-226,101,249,251,251,211,171, 87,175,118,250,230,155,111, 54,  0, 24, 97,160,168,246,176,182,182,190,196, 48,140,234,229,203,151,
- 30,197,251,237,252,122, 55,181, 54,149,180, 75,203,202,187,149,254,242,228, 77, 67,184,130,130,130, 70,242, 40,106,199,250,  5,
-147,104,175,  6,126, 16,219,218, 66,147, 32,131, 92,175,181,122,240,244,101,215,149,235,119,164,  5,  5,  5,141, 13,  9,  9,217,
-109,108,146,141, 48,194,136,127,141,192, 18,  8,248,115, 22,206,155, 77,178, 51,178, 21,202,220, 60,181, 86,169, 84, 82, 60, 86,
-249, 60, 60, 54,149,226,208,217,223, 76,157, 98, 58,231,187,121,115,  0, 12, 49, 84, 92,121,121,121, 61,218,185,115,167,157,149,
-149, 21,114,114,114,144,145,145,129, 71,143, 30,129,101, 89,116,238,220, 89,224,215,160,126,192,186,245, 27,238, 59, 58, 58, 54,
-169, 76,100,113,184, 28,194, 21,139,113,172, 85,  0, 40, 30, 15,125, 34,146, 10,197,133, 86,131, 11,  3,186,  1,  0,104, 62, 31,
-253,163, 10, 39,249,  8,133,194,106,103, 22,203,178, 77,154, 53,107,198,  3,128,233,211,167,231,202,229,242,229,132,144,223,101,
- 50, 89,162,161,226,202,198,214,246,230,154,101, 99,172,234,215,113,133, 70,171, 69,124,106, 34, 88,194,135,163,157,  4, 67,123,
-249,243,154,  7,241, 93,215,108,190,122,195,190,126,143,150, 41, 47, 78,189, 44, 87, 88, 74, 36,251, 54,108,216,128,195,135, 15,
-  3,  0,174, 95,191, 14,119,119,119, 73,101,105,120,253,250,181,235,240,225,195, 15,  2,168, 91,214,113,173, 30,156,223,127,255,
- 29,  0,176,246,219,193,244,230,219,145,181, 69,162, 63,215, 82,110,213,170, 21, 90,181,106, 69, 45, 95,190, 60,248,250,245,235,
-193,  7, 15, 30,212, 56, 57, 57,109, 72, 76, 76, 60, 82,157, 60, 85,220,186,  5,147,167, 79,129,155, 55,171,252,223,192,192,192,
- 58, 94, 94,214, 15,214,173,253,222,230,204,217,151, 88,179,102, 55,162,163,163,  1,  0,174,174,174, 24, 60,168, 31,247,247,223,
-182,213,155, 51,103,209,189,192,192,192,230,161,161,161,149, 70, 55,103, 24,102,219,183,223,126,251,165,147,147, 19,230,207,159,
- 31, 89,167, 78, 29,152,153,153, 97,251,246,237,176,180,180,132, 86,171,141, 92,181,106, 21, 71, 38,147, 97,227,198,141,191,148,
-178,110,253,  5,173, 59,182,158, 47,232,238,221,194, 51,112, 24, 76,204, 28,177,243,192, 33,188, 14,221,215, 66,165,121, 53,127,
-249, 36,167,161, 10, 86, 48,220,217,221,116,142, 75, 80, 43,235,186,245,190, 68,173,192, 48, 27,165,254,118,236,130,137,174, 43,
- 56, 66,229,190,133,107,254,106, 37, 36,253,142,210,245,115, 35,172, 94, 92, 65,  6,203, 46,100,138,132, 85, 73,252, 43, 61,139,
- 47, 91,182,108, 89, 34,174,222,189,123,  7,149, 74,  5,111,111,111, 74,173, 86, 27, 20,211, 74, 42,149,122,180,108,217,242,206,
-254,253,251,173, 91,180,104,241,193,210, 45, 14,214, 22, 29,111, 30,223, 48,229,135,159,126,243,178,243,233,149, 93, 89, 71, 32,
- 40, 40,104,100,  3, 79,183, 93, 27, 86,125, 79,232,188,120,112, 44,210,  0,125, 58,146, 14,253,  2, 34,182, 66,215,241,211,209,
- 48, 56,152,158,242,205,220, 93, 13, 27, 54,100, 31, 63,126,188,199,216, 44, 27, 97,132, 17,255, 10,129,197,176,140,175,189,157,
-181,104,195,154,189,143,105,141, 90, 45,177, 48, 87,115,205,205, 24, 98,106, 78,107,212,218,252, 90,174,181,248, 12,203,248,150,
- 35, 72,174,126,220,203,118,113,113, 57,190,103,207, 30, 59, 46,151, 11,134, 97, 96,107,107,139,183,111,223, 34, 59, 59, 27,121,
-121,121,136,126,245, 10,181,107,214,192,148,177, 99, 28,151,174, 89,123,156, 16, 18, 84,122,184,240, 99, 78,150, 97,193,232,116,
- 31,247,230,129, 50,150,140, 41,111, 25, 25, 67,167,148, 50, 12,243, 86, 38,147, 65, 44, 22,195,219,219,219,228,241,227,199,183,
- 19,139, 77, 72,149,221,123,235,214, 28, 71,129,237,241,213,203,  6, 88,129,138, 68,100, 92, 54,220,156, 27,193,198,162,  6, 18,
-211,242,241, 56,252, 60,162,162,207,193,205,169, 22,198, 14,174,107,177,126,251,221,179, 36,112,156, 91,233,225,194,210,156,121,
-121,121, 38,181,106,213,130,147,147, 19, 24,134,129, 94,175, 71,120,120, 56,244,122,125,201,239,210,159,123,143, 93,131, 46,247,
- 61,134,125,245, 21, 50, 51, 51, 77, 12,189,247, 98,113,181,125,176,180,158, 60, 43,137,  7,  0, 18, 75, 71,205,216,223, 18, 95,
- 54,108,216, 16,182,182,182,188,123,247,238, 77,  7,112,164,170,249,169,  1, 86,253,180,103,207,198, 33, 57, 57, 20,  0,236, 34,
-132,209, 20, 70,213, 54,168, 46,181,111,239,119,108,195,134,  5, 54,132, 13,135,149,249, 74, 60,122,244, 30, 26, 77, 97, 85,201,
-200, 72,197,228,137,185,224,112, 76,177,118,221, 34,235,254,253,199, 31, 43, 26, 34, 99, 42, 74, 39,203,178,188,107,215,174, 97,
-208,160, 65, 56,120,240, 32,135,166,105, 60,124,248, 16, 34,145,  8, 35, 70,140, 64,189,122,245, 56, 34,145,  8,119,238,220, 65,
-110,110, 46,169, 40,157, 55, 46,221, 88,150, 19,125,125,126, 50,185,216,105,231,129, 67, 24, 51,104,  0, 28,216,152,219,230,110,
-100, 89,135,238,205,190,103,233, 26,221, 36,166,190,150,238,245,187,131,199, 55,193,164, 89, 75, 16,249,226,140,101, 65,222,179,
-137, 68, 31, 95,  3,192,212,143, 57,217, 35,125,245, 27, 15,220, 11,188, 82,243,113, 45,105,224,184,135,  0,158,253, 41,176, 92,
- 57,132,210,155, 23, 91, 47,223,188,121,131,232,232,104,112, 56, 28, 40, 20,138, 15, 22,245, 45,205, 25, 16, 16, 48, 78,175,215,
-127, 15,  0,106,181,122,175,189,189,253,200,159,127,254,217,186,120,  9,162,210,150,171,204,236,220,172,123,143, 95,190,158, 62,
-174,111,235, 91, 15, 94,196, 91,248,245,140,203,126,122, 50,167,172,252,108,210,164,137, 37,159,166,119,252,180,122, 33,209,199,
- 92,131,192,187, 53, 56, 38,238,208,107, 19,161,204,146, 67, 25,155,  4,245,246, 77,112,157,240, 13, 86,175,252,129, 12, 26, 58,
-106,135,155,155,219,241,232, 82, 22,188,255,196,116,111, 35,167,145,211,200,249,121,114,254,235,  4, 22, 33, 84,174, 94,207,  8,
-120,182,118,202, 81,253,219, 53,184,124, 53,228,137,216,198,140,211,177,117, 64,171, 71,207, 99,239, 19,138,104,  9,161, 12,242,
-235,112,118,118, 30,176,112,225,194,  6,102,102,102, 96, 24,  6,230,230,230, 72, 75, 75,131, 90,173, 70, 78, 78, 14, 84,121,185,
-208,228,229,226,105,252, 59, 52,107,213, 26,237,155, 52,246,190,160,213, 14,  0,112,176, 60, 78, 61, 69,179,214,  1,141,208, 47,
- 38,  3,140, 70,141, 35,174,214, 37, 86,171,129,239,178, 65,  8,  1,163, 81,227, 66,112, 93,240, 77, 36,240,155,185,176,218,153,
-149,148,148, 20, 86,171, 86,173, 11,157, 59,119,238, 60,110,220, 56, 42, 57, 57,249,162,189,189,125,179,148,148,148, 74,135, 71,
-237,178, 44,135, 13, 27,219,160,142,141,  5,133, 51,119, 46,162,177, 87, 47,136,  5, 92,164,101, 43, 64, 64, 16,243,246, 42, 24,
-157,  9,158,190,122,135,166,190, 98,180,108,100,225,156,255, 71,230, 88,148, 63, 92, 70,178,178,178,144,154,154, 10,173, 86, 11,
-173, 86,139,190,253,250,225,215,125,251, 32,151,203,161, 80, 40,160, 86,171,161,215,235, 65, 81, 20,174,156, 61,130,248,216, 87,
-104,218,164,  9, 80, 65,196,111, 46, 13,221,218,111,  7,115,  0,128,111,106,171,201,203,203,131, 68, 34,129, 60, 43,137, 55, 99,
- 77,137,101,139,119,253,250,117,132,134,134, 66, 42,149, 26, 84,143,202, 66, 52,176,227,173, 94, 63,191,243,137, 19,118,119, 79,
-156, 96, 30,156, 57,147, 32,200,203,219,110,200,127,131,131,253,251, 78,153,220,213, 83, 36, 20, 33, 33,110,  3,188,188,120,152,
-241,141, 53,150,175, 76,  7,  0, 76,153,236,140,134, 65, 54,200,205, 62, 10, 27, 59, 55,204,152,222,211, 45, 63,159,253, 10,192,
-222,138,235, 59,153,252,236,217,179, 72,123,123,123, 78, 88, 88, 24,248,124, 62, 68, 34, 17, 68, 34, 17,132, 66, 33,146,147,147,
-161, 86,171,113,248,240, 97, 93,209, 16, 98,185, 40, 26,  6,236, 60,189,179,227,133,215,161,251, 90, 56,209,177, 79,251, 76,106,
-254,238,217,131,176,188,203, 87,238, 46,213, 41,133,241,217,  9, 87,103,215,105, 24,102, 51,113,230, 98,108, 90,189, 16,175, 31,
-222,202,180,175,153,187, 89, 68, 84,123,131,191, 40,195, 42,214,122, 49,103,226,130,254,186,113,195,251, 88,156,177,191, 55,238,
- 60,135,164, 37,167,135,174,193,219, 48,133,160,110,192, 80, 15, 87, 74,125,237,218, 53, 81,203,150, 45,161, 84, 22, 46, 25, 71,
-211, 52,246,239,223,207,232,116,186,235,101, 90, 45,181,218,239, 67, 67, 67, 29, 21, 10,  5,  6, 14, 28, 56,101,209,162, 69, 18,
- 46,151, 91,248,124,233,245, 31, 88,174,150,173,255,245,210,180,239, 55, 95,191,116,112,165,116,217,156,145,173,135, 76,250,225,
- 58,128,139,101,241,234,116,186,125, 27, 86,126, 71, 11, 44,180, 32, 13, 59, 64,147,162,192,251,157, 99,160,206, 85,194, 99,233,
- 98,  0,124,168,181, 20,206,245,232, 11,202, 74,138,209, 45,154,113,182,223,186,179, 15, 64, 79, 99,211,108,132, 17, 70,252,255,
-183, 96, 49,204,173, 55,177,239,186,116,104, 31,236,124,246,230,243,199,227, 70,116,237, 72, 81, 20,121, 18,254,254,166, 91, 45,
-  7,155,235, 55,110,177, 12,195,220, 50,228, 98, 92, 46,183, 91,243,230,205, 57, 89, 89, 89,144, 74,165, 72, 75, 75, 67, 98, 98,
- 34,180, 90, 45,148, 57,217, 80,231,229, 66,157,155,  3,189, 60, 15,209, 33,143,224, 85,211, 89,112,181,208,  9,254,160, 33,252,
- 31, 91,168,138, 23,253,  5, 33, 16,152,154, 64, 96, 98, 82,249, 74,240, 31, 65, 42,149,246, 48, 51, 51,155,157,151,151,119, 62,
- 49, 49,113,153, 90,173,158,248,227,143, 63, 62, 94,178,100,137,205,156, 57,115,204,102,205,154,117,196,197,197,197,191, 50, 63,
- 36, 83, 43,125,223,198, 13,234,210, 81,239, 95, 32,200,163, 47,106, 75,155, 35, 38, 49,  7,153,121, 42,100,228, 40,224,233, 49,
- 19, 41, 25,  5,200,145, 43,241,252,245,239,112,114,168, 67,209,220,232, 78, 21,  8, 44,164,164,164,124,112,207,  7, 15, 28, 64,
- 65, 78, 14,220,220,220,224,237,237, 13, 91, 91, 91,188,127,255, 30,119,238,220,193,144,254, 95,130,203,237,131,212,212,212, 10,
-239,119,111, 24,203,149, 74,165,161, 50,153, 12, 97, 97, 97,136,142,142, 46,115, 88,245,143, 63,254, 40,124,241, 58, 56, 24,156,
-151,246,246,246,223, 81, 20,213, 31,  0, 13, 32,158,146, 74,235,218,218,218,218, 55,235,217, 19, 57, 92, 46,253,243,245,235,132,
- 99,110,110,  2, 32,187, 50, 46, 51, 51,116, 13, 10,106,206,207,206,218, 13,160,208, 40, 53,114,132, 45, 58,119,178,  7,161,  4,
-144, 58,154,130, 80,  2, 16,194, 71,129,252, 26,124,234,249,242, 76, 77,143,119,171, 72, 96, 21, 59,180,215,171, 87, 15,227,199,
-143,199,201,147, 39,177,119,239,159,167,247,233,211,  7,189,123,247, 70,126,126, 62,236,237,237, 57, 50,153, 44, 38, 48, 48,176,
- 82,199,119, 51, 55,178, 76,165,121, 53,223,194, 93,146,166,135, 77,211,124,173, 32, 99,225,154,152,133,  0,214,118,118,115,219,
-169, 97,110,197, 70,189, 56, 99,249,246,241,141, 76, 89,148,220,117,231,185,152,114,125,176,110,222,  4, 99,239,123, 83,243,101,
-167, 86,156,158,221,219, 20, 56, 57,219,123,252,188, 89,189, 63,211,201,122,153, 75, 77,231, 33, 11,127,156,173, 25,218,171,133,
-102,246,140,201,220,122, 62,222, 36, 55, 55, 23,135, 14, 29,210, 93,184,112, 33,137, 97,152,105,229,208,210, 69, 66, 11,253,251,
-247,151,136,197, 98,196,199,199,195,203,203, 11, 12, 83,152,183, 73,105, 25,207,239, 62,126, 17, 49,125,124,191, 86,191,159,190,
-254,234,210,141,144, 87, 61, 59, 53,243, 35,132,117, 41, 47,173, 52, 33,141,125,124,125,193,178,137,160,185, 30, 72,216, 63, 18,
-202,140, 60,168,228, 74, 80, 92,  9,212, 90, 26, 26,134, 64,224,219,  8,111, 78,158, 70,221,193,245,192, 33,164,153,177, 89, 54,
-194,  8, 35,254, 63,160, 82,181, 65, 43,213,203,191,157, 61, 31,150,230, 34,243, 70,  1,238, 14,167, 46,222, 12,185,117, 47,228,
-149, 75, 13, 27, 91, 86,171,182, 92,181,110,147, 51, 41, 80, 24,234,228,237,109, 99, 99,  3,141, 70,131, 55,111,222, 32, 33, 33,
-  1, 26,141,  6, 58,185, 28,170,236,108, 40,179,178,160,151,231,129,167,215, 67,145,150, 10, 75, 33, 31,248,115,134, 97, 69,166,
-202, 63,197, 84, 25,130,139, 16,  2,145,153, 25,  4,166,166,160, 56,180,193,153,227,232,232, 24,232,239,239,127,248,218,181,107,
-193,205,155, 55, 95,234,226,226, 98,158,156,156,252, 62, 37, 37,165,221,234,213,171, 85,182,182,182, 24, 50,100,136,167, 86,171,
- 29, 86, 25, 23, 79,160,106, 80,211,222, 29, 53,236,191,132,212,166, 49, 50,115, 85, 72,205, 86, 32, 37,163,  0,135,142, 15,192,
-229,243,  3,241,228,206, 87,120,243,112, 36,210,243,205, 32,180,106,  3,128,173, 95, 17,231,189,123,247,176,109,219, 54,108,219,
-182, 13, 91,183,110,197,166, 77,155,144,149,149,133,250,245,235, 35, 46, 46, 14, 23, 46, 92, 64, 82, 82, 18,108,108,108,240,228,
-201, 19,108,223,190, 29,143, 30, 61,170,114, 37, 81, 42,149,224,153, 88,107,214,126, 59, 24,107,191, 29, 12,134, 43,209,148, 18,
-224,134, 87, 54,138, 26,158,212,179,103,131, 36, 11, 11, 31, 95, 95,223,206,253,251,247,119, 13, 14, 14, 46, 57,238,230,230, 86,
-147,195,225, 36, 75,165,210, 93, 82,169,212,191, 98,229,207,  6, 88, 90,121, 67,173,138, 40, 42, 99, 46,  8, 17,162,237, 23,175,
-208,172, 69,  8, 52, 90, 30, 40, 34,  0, 69,  9,161,211,101,192,204,212, 30, 44, 75,234, 87,146,196, 46, 23, 47, 94,196,182,109,
-219,240,246,237,219, 18, 97,217,173, 91,183,201,131,  6, 13, 58,174,215,235,113,246,236, 89,156, 60,121, 18,181,107,215,134,159,
-159, 31, 52, 26, 77,151,202,238,123,225, 79,178,251,191,175,187, 48,144,171,181,244, 23,138, 92,106, 67,110,210, 99, 98,107, 91,
-  9,  0, 92,136,142,206,179,171,153,187, 66,158,247, 44,206,194, 57,127,101,101, 14,238, 44,187,144,  9,141,138,120,240,251,137,
-139, 57,169, 41, 89,220,128,  6,245, 20,203,151,204,228,185,212,174,187,106,225,236,241, 14,137,185,194,236, 47,166, 92,136, 56,
-126,241, 81,254,208, 17, 99,116,163,198, 78, 82, 94,184,120,229,  4,195, 48, 13,202,155, 65,200, 48, 12,146,146,146,240,242,229,
- 75,196,196,196, 32, 45, 45, 13,233,233,233,200,203,203, 43, 25, 86, 20,231,229,158,219,180,231,204, 83,137, 72, 36, 14,110,224,
- 94,243, 97, 88,120,170, 68, 36, 18,187,215,174,233, 65,200, 98,170, 28, 94, 11,161, 72,  8,128, 32,239,197, 45, 40, 51,243,161,
-200,206,135, 50, 43, 31, 42, 13, 13,165,138,130, 66, 77,193,166, 69,  7,228,203,149, 80,102,100,129, 97, 89, 75, 99,179,108,132,
- 17, 70,252, 43, 44, 88,233,233,145,249,102,182, 62,189,191,153,245,253,133,  3,191,252,108,167, 82, 21,196, 89, 91,154,232, 77,
-196,124,155, 81,227,126, 64, 94,126, 86,175,252, 76,195,103, 61,101,101,101, 33, 54, 54, 22, 34,145,  8, 60, 46, 23,122,133,  2,
-122,133, 28,138,172, 12, 80, 26, 21,120,122, 61,172,196, 34,212,146, 58,192,197,190,114,235,  8,205,232,137,236,202,121, 92, 26,
-218,235, 47,195,130, 23,155,122, 66, 96, 34,129,208,194, 18,205, 78,222, 46, 20, 58, 60, 30,176,176,242, 69,218, 29, 28, 28,108,
-164, 82,233,233, 77,155, 54,241, 50, 50, 50,240,242,229,203,167,239,222,189,203,177,178,178, 50,229,114,185, 76, 84, 84,212,213,
-136,136,136,110,117,234,212,  1,203,178,110,149,241,229,229, 72, 52, 90, 45, 11, 89,234,123, 36, 36,189,132,153, 73, 13,176,116,
- 13,164,102, 22,128,192, 30, 58, 85, 36,244,218, 66,119, 43,149, 34,  1,  5,106,195,214,237,213,104, 52,208,104, 52,208,106,181,
- 80,169, 84, 24, 58,116, 40,238,222,187,135,131, 39,255, 64,108,116, 36, 60,107, 59,224,171,175,134,194,223,223, 31,143, 31, 63,
-174,118, 69,105, 50,251,210, 75,145, 72,132,173, 91,183, 66, 44, 22,127, 32,110, 13, 20,171,107,219,181,107, 87, 55, 82, 46,199,
-203,136,  8, 52,234,215, 15,  0,112,231,206,157,146,115, 20, 10,  5,  6, 15, 30,204,143,141,141, 29, 21, 17, 17, 49,202,209,209,
-113, 93, 82, 82,210,140,242, 56,207,157,187,143,241,227,195,145,150, 86,232,135,125,232, 64,189,146, 99,111, 99, 53,232,212,181,
-112,228,202,194,194,  2,235,214,213, 55, 40,157,122,189, 30, 59,118,236, 40, 25, 22,  4,  0, 14,135,211,108,250,244,233,189,203,
- 58,223,199,199,167, 82,206,233,253,156,133, 79,222,139, 38,154,215,117,169,103,102,227,139, 12,109, 88,253,176,196,164,201,211,
-251, 57,111, 88,119, 36, 65, 41, 34,170,189, 68, 31, 95,131, 35, 84,238, 51, 36,141,209, 23, 54,170, 45, 92, 70,236, 75, 78,203,
-157, 55,105,204, 96,107, 51, 11, 59,249,174, 77,203, 45, 41,154, 98, 79,135,104,178,235,185, 90, 91,244,104,252, 83,254,248,111,
- 22,132,169,117,241,147, 16,127, 58,178,162, 80, 21, 12,195, 64, 38,147, 33, 45, 45, 13,113,113,113, 72, 79, 79, 47,122,246,211,
- 75,134,  8,171,  3, 66,  8,212,113,113, 72, 57,185, 11, 14, 67,134,194, 99,201, 18,232, 25, 14,148,  5,122, 28,109,217, 14,185,
-217, 10,168, 25,  2,139,192,166,232,112,246, 54,  8,163,  7, 30,220, 51,182,202, 70, 24, 97,196,191, 67, 96,  1, 64,110, 90,120,
-140,117, 45, 95,153, 92, 33, 23,219,219,217,170,196, 66,  1,147,147,155, 71,135, 61,127,170,201, 79,122,243,186, 10,215,123, 21,
- 30, 30, 94, 63, 33, 33,  1,113,239,223, 67,167,144,131, 82,169,193, 42, 11,208,190,121, 83,  8,  1,  8, 41,  2, 30,163,  1,135,
-230, 35, 47, 63, 23,  0, 94, 85, 70,202,104,181, 31, 52,234,132, 16, 16,138,130,208,196,  4,124, 83,  9,  4,102,166, 31, 88,180,
- 12,129, 72, 36,250,125,251,246,237,142, 14, 14, 14, 88,183,110, 29, 28, 29, 29,189,218,183,111, 95,208,170, 85, 43,145,141,141,
- 13, 60, 60, 60, 16, 20, 20,132,235,215,175,131, 16, 18, 93, 25,159, 78,205, 15,125, 21,171,171,145,147,247,  4, 15,194,126,133,
- 86,173,133,155,199, 92, 40,180,214,144,216,142,130, 82,125, 26,250,236, 27,  0,  0,190, 89,107, 36, 39,167,  3, 32, 47,170, 82,
-152, 44,203,226,217,179,103, 56,112,234, 38, 28,107,121, 35, 46, 42,  2, 17,215,175,226,174,173, 53, 92,124,234, 65,171,213, 26,
- 44,136, 12, 61,207,208, 23, 48, 33,100,240,152, 49, 99,144,205,225,  0, 93,187,130, 23, 19,  3,141, 70,131,198,141, 27,163, 97,
-195,134,  0,128,198,141, 27,131,166,105,212,173, 91, 23,214,214,214, 56,118,236,216, 96,  0,101, 10, 44,150,144, 39,140, 62,195,
-203,213,213,181, 68, 96,237,251, 53, 13, 97, 33, 95,128,128,143,141,155,254,140,202, 80,179,102, 77, 36, 39,199,130, 16,182,178,
-252, 60,223,181,107,215, 46,150,150,150, 24, 57,114, 36,132, 66, 33,122,245,234,  5,165, 82,217, 31,  0, 86,172, 88,129,239,190,
-251,174,208, 42,181,112, 33, 22, 45, 90,132,130,130,130,114,135,134,127, 93,239, 43, 77,205,100, 70,217, 59, 56,245,106, 99,227,
-210,160,109,199,246,168,227,222, 22,109, 59,198,  1,192,143, 86,156,119,253, 87,207,175,127,194,166,134,213,238,203, 23,175, 44,
-108,222,170,237,188, 57,227, 44,151,173,216,158, 85,169, 79, 99,206,251,189,121,175,249,  3,214,255,188,237,215,245,223,127, 55,
- 85, 24,151,166,206, 74,204, 98,243, 77,  4, 28, 19, 55,123, 98, 50,121,214,210, 88,153, 44,102,  6,226, 47, 70, 26, 82,134, 49,
- 49, 49, 37, 62,123, 74,165, 18,114,185, 28,241,241,241, 37,229,171,144,152,117,154, 52,162,187,159, 92,161, 40,120,248, 60, 42,
-110,254,148, 33, 77,228, 10, 69, 65,212,219,184, 72,150,253,137, 41,167,204,179, 11,228,  5, 86,170, 28, 37,114,158,190,134,117,
-219, 90,208,232,  8, 84,122, 61,178,210,243,160,214,  1, 90,154, 11,231,190, 95, 65, 11, 14,114,211,146, 65, 17, 98,140,135,101,
-132, 17, 70,252,123,  4, 22, 33,132,248, 53,168, 37, 93,189,112,136, 51,163,211,121,166,166,167,232, 56, 28,  1,183,134,185, 34,
-169, 42, 23,211,106,181,103,111,223,190,221,179,121,243,230,130,168,231, 79,161,206,201,129, 58, 39, 27, 92, 70,  7, 43, 81, 16,
- 40,141, 10, 68,173,134,147, 23,  3,101,158,  8,247, 30,189,214,106,181,218,179, 21, 10,  1,176, 44,163, 43, 20, 88,132,162, 62,
- 24, 42, 20,152,155, 66, 96, 98,  2,129,169,105,153, 67,136,229,193,222,222, 94,220,185,115,231,118,  1,  1,  1, 96, 89, 22,171,
- 87,175,134, 70,163,225,107,181,218, 18,139, 81,126,126, 62,142, 30, 61,138, 95,127,253,245,174,185,185,121,165, 83,203, 25,157,
-234,194,181, 59, 79,187, 12,233,213,134,127,229,198, 78,104,213, 12,114,149,102,200, 87,168,144,175,228, 66, 37,232,  8, 66,110,
-131,162,  5,104,234, 95, 23,215,238, 68, 42,245, 90,205,197,170, 10, 33,165, 82,137,248,184,119, 72,136,142,132, 73,110, 50,108,
-205,196, 40,136,137,132,255, 87,195,160, 86,171, 43,189,247,225,  1, 68, 59,189, 62, 56,235, 58, 83,224,153, 88,107,154,204,190,
- 84,110,168,  8, 19, 19,147, 42, 13, 17,166,167,167,227,204,153, 51,104,220,184, 49, 90,181,106,133,196,196, 68,196,196,196,160,
- 75,151, 63, 71,217,158, 62,125,138,176,176, 48,184,185, 85,108, 20,204,205,101,207,103,102,190,233,215,163, 71, 15,222,131,  7,
- 15,192,178, 44,220,221,205, 96,102, 42,  1,161,  4,240,246,182,  3, 80,168,253, 91,183,110, 13,181, 58, 81, 39,151,227,124, 69,
-156,161,161,161, 93,  3,  3,  3,235,104,181,218,200, 86,173, 90,113,222,188,121,131,190,125,251,226,208,161, 67,  0,128, 57,115,
-230, 96,206,156, 57, 31,252, 39, 63, 63, 95, 89, 30,159,103,  3,175,153,117,116,150,173,132, 34,151,218,102, 54,190,168,227,222,
- 22,  0,240, 69,183,145,168, 83,183, 38,114,211,159,213, 86, 42,222,245,226,113,178, 44,159,109, 76, 12, 23,117,173, 63, 66,153,
-122, 35, 10,128, 33,129,123, 89, 69,212,161,148, 56,238,208,195, 39, 79, 95, 24,215,165,219,151, 92,173, 94,167,171, 95,139,107,
-113,228,196,185,212,196,247,113, 63, 33,238,226,139,146,199,164, 98,129,165,207,205,205,133, 68, 34, 65, 76, 76,140,170,123,247,
-238,  2,133, 66,129, 55,111,222,148,  8, 44, 59, 27, 43,159,102, 13,235,123, 45, 91,255,235, 37,137, 64, 32,232,216, 58,200, 59,
- 60,234,125,  2,203,146,119,229,242,178,236,131, 55,175, 94,119,181,115,172, 11,217,205,  7, 16, 55,239,  2,149,138,130, 82,205,
- 64,165,  3,116, 52, 15,230,126,193, 16,185,122,131,  5,240,234,249, 83,232, 88,246,174,177, 89, 54,194,  8, 35,254, 53,  2,203,
-198,198,198, 46, 32, 32,200,109,231, 47,135,193,178, 44, 94,135,173, 65, 86,106,  4, 22,252,120,223,205,217,217,185, 85, 66, 66,
-194, 77, 67,120, 18, 18, 18, 14, 29, 59,118,108,134,175,143, 79, 64,109,103,103, 60,125,247, 22, 60, 86, 15,158, 94, 15, 74,163,
-  2, 71,175,134,115,125, 61, 40, 98,130,164,164, 92,108,191,120,245, 69, 66, 66,194,161, 10, 95, 14,132, 70,141,238,125, 48,232,
-139,174, 96,181, 26, 92,110,225,  3,161,169,  9,  4, 22, 22,104,122,244,  6,  8, 33, 96,117, 90,188, 95,254, 45,184, 18, 19, 88,
- 53,169, 60, 20, 80, 74, 74, 74, 65,221,186,117, 67, 34, 34, 34, 26,122,122,122, 98,241,226,197,136,143,143,  7,203,178, 72, 77,
- 77, 85,166,165,165, 37,102,100,100,188, 35,132,156,144,201,100, 59, 13,137, 20,158,106,153,181,239,202, 31, 87,103,  6,250,251,
-184,127,209,106, 17,206,158, 93,136,172,156, 92, 20,168,185,200, 83,104, 32, 87,176,112, 50,115, 71, 35, 95, 95,164,101,170, 17,
-245, 50, 52, 33,157,103,181,163, 42,214, 43,138,162,240,244,233, 83,184, 74, 77, 17,121,251, 38,108,196, 92,248, 73, 29, 32,109,
-214, 28, 49, 49, 49,134,137, 96, 61, 56,165,103, 11, 90, 88, 88, 32, 39, 39,231,  3, 33, 39, 22,139, 33,149, 74,145,155,155,139,
-163, 71,143,130, 53,236,165,168, 85,171,213,240,242,242,194,227,199,143,113,245,234, 85,180,109,219, 22,173, 90,181,194,179,103,
-207,112,249,242,101,132,133,133,129, 16,  2,107,107,235, 98,223,159,114, 35,218, 63,122,244,244,136,137,  9,153, 59, 98,196,132,
-122, 67,134, 12,193,177, 99,  7, 49,114,132,103,145, 99,187,  0, 95,118,247,196,146,165,143, 17, 28,220, 26,182, 54, 60, 92,185,
-250, 50,150,195, 49,255,213,128,124,252,249,231,159,127,230, 40, 20, 10,228,231,231,195,196,196,  4, 25, 25,133,225,168,202,177,
- 96,149, 27, 88,237,121,232,171, 53,217,121,108, 22,155, 31,214, 43, 83, 23,214,160,109,199,120,124,209,109,  4,174,156,221,131,
-107,151,174,194,138,243,238, 45, 36,121, 23,210,223,166,231, 38,201,221,183,121,  7,142,166, 19,228,151,182, 77,233, 97, 73, 59,
- 58, 50, 71,230,108,201,201,174, 32,157, 44, 33,132,100,134,239, 63,125,130,197,151, 77,155,  4,215,173, 95,211,145,159,149,158,
-202, 30, 61,117,225,133,230,237,177, 51,197,194,202,128, 85, 17,150,108,216,176,225,123,  0, 96, 24,102,239,250,245,235, 71,207,
-156, 57,211, 86, 38,147,149,  8,172,212,244,204,107, 77,187, 78,214,103,100,231,168,119,175,159,213, 87, 36, 20,240,231,175,216,
-125, 67, 75,227, 65,185,141, 11,135, 51,108,238,214,223,210,142, 29,217, 67,219,  8,121,184, 59,103, 33,162,175, 94,135,134,226,
-161,227,229,135, 80,107,244,200, 77,203,192,245, 81, 19, 97,225, 96,137,243,233, 81,250,156,188,220, 97,198,102,217,  8, 35,140,
-248,255,  0,131,166,212,165,167,167,167,222,186,245, 16, 55,206, 46,195,205,179,203,240, 50,236, 41,100,137,106, 36,166, 40, 97,
-102,102,118,191,  2,203, 87,251,143, 95, 10, 74,165,178,247,250, 13, 27,146,197, 18,  9, 90,182,107,  7,  7, 91, 59,136,121, 92,
-208, 58,  6, 52,225, 34, 63,205,  2, 81,207, 21, 88,126,226,108,170, 66,169,236,253,241,203,225, 99,206, 82,251,  1, 66, 32, 50,
- 51,  5,223,196,  4,194,210, 86, 43, 66,192, 51, 53,  3,207,212, 12, 52,143, 95,105, 58,  1,160,160,160,160,207,216,177, 99,179,
-242,242,242, 48,104,208, 32, 60,120,240, 32,236,226,197,139,102, 87,175, 94, 21, 61,127,254,188,174, 76, 38,235,144,152,152,184,
-189, 60,113,245,151,123,191,113, 67,199,234, 52,125, 54,111,221,153,169,208,218,163,123,143,205, 48,227,103, 64,171,211,  3, 44,
- 11, 39, 91, 19, 52,106,246, 45, 82, 85, 77,113,246,204,217, 44, 70,167,236,243,241,146, 57,165, 57, 89,150,101,173,173,173, 63,
-176,202, 81, 20,133, 27, 55,110,160, 95,223, 62,232,216,171, 39,108,107,187,194,174,125, 23,116, 28, 61, 30,219,183,111,  7, 69,
- 81,176,178,178,250,192,162, 81, 94,126, 22, 35, 39, 39,  7, 46, 46, 46,120,184,186, 75,189, 11,211,189,  2,106, 70,255, 28, 32,
-126,178,182,222,181,107,215,176,118,237,218,252,200,200,200,117,238,238,238,223, 86,150,159,132,144,121, 63,254,248,163,226,253,
-251,247, 48, 49, 49,129, 78,167,195,221,187,119,177,101,203, 22,172, 93,187, 22, 97, 97, 97,176,182,182, 70,221,186,117, 65, 81,
- 20,226,226,226, 20,132,144,121, 21,212, 37, 38, 47,143,211,231,242,229, 19, 25,221,187,183,196,238,221,155,224,224,208, 20, 92,
-142,  3, 56, 92, 91, 72, 76,188,176,107,231, 74,116,237, 18,136, 87, 17, 79, 50,243,243, 57,125,110,220,184,161, 51, 32,157,154,
-231,207,159,227,248,241,227, 88,178,100,137,110,241,226,197,200,201,201, 41,177, 96, 21,175,146,190,104,209, 34,  0,128, 74,165,
- 18,148,199, 57,122,214,243,196,153,203, 94, 44, 73, 73, 78,108,124,243,250,253,193,215, 46, 93, 69,108,212, 53, 92,187,116, 21,
-183,175,221,155,147,146,156,216, 56,160,145,  7,175,247,232, 73, 51,247, 29, 63, 70,155,152, 57, 98,223,241, 99,244,160,201,211,
-126,  8,234,216,118,158,  1,101,196,  2, 96,243, 83, 83,190,251,113,205,207,249, 58,141,146, 90,253,211,102,153, 34, 45,105, 30,
-138,167, 86,150, 99,189, 42,205, 25, 19, 19,179,253,237,219,183,210,183,111,223, 74,223,191,127, 63, 47, 49, 49,177,229,242,229,
-203,211,138,  4, 87,161,192,122,121,234,254,171,219,123,126,180,179,177, 20, 53,109, 88,207,115,221,246,163, 55,226,226, 83,126,
- 43,142,129, 85, 86, 58,239,223,191,159,165,210,234,198,126, 59,107, 17,155,157,173,134,231,212, 57,208,  9, 76,160,210,  1, 26,
-134,134,  6, 28,132, 45, 91,  7, 83,107, 83,220,101,179, 88, 21, 77,141,137,254,200,201,191,178,250, 89, 29, 24, 57,141,156, 70,
-206,207,147,243, 95,105,193,114,114,114,106,217,227,203,246,104,221,109, 62, 88,150, 69, 68,232, 42,100,165,189,134,147,131,  0,
- 49,113,185, 77,  0,220, 52,244,130, 73, 73, 73,113,142,142,142,141,151,109,216,120,188, 99,112, 35,111,119, 39, 71,129,133, 75,
- 45, 72,236,236,144,158,158,134,  7, 33,145,218,173,151,175,189, 80, 40,149,  6, 45,149,195, 48, 12,203, 48, 12,120, 60, 30, 88,
-154,134,207,148, 57, 32, 20,  5,138,203, 41,177,236,128, 16,152,  5, 54,  3,225,114,161, 53,208,103, 72, 38,147, 37, 56, 57, 57,
-245,153, 60,121,242, 31,123,247,238,165, 90,183,110,237,127,250,244,105,230,239,100,118,202,243, 19,225,246, 13,122,181,218,248,
-243,150,163,  1, 65,141,107,185,212,118, 17, 52,117, 54,135, 70,171, 71, 74,106,  6,110,222,123,169,138, 12,127,146,200,106, 52,
-125, 82,195,203,143,226, 14,  0, 90,173, 54,206,217,217,217,126,241,226,197,208,233,116,208,233,116,208,235,245, 72, 79, 79,199,
-253,251,247,209,160, 97, 48,188, 71,140, 66, 90, 90, 26, 54,110,220,  8,103,103,103,252,248,227,143,200,203,203,195,173, 91,183,
-202,205, 87, 46, 13,221,224,193, 69,113,176, 56,208,173,235,214,237, 70,189,122,245,154, 55,214,166,242, 22,110, 44,180,108, 77,
- 29, 51,152,119, 35,238,198, 17,129, 64,176, 61, 54, 54,182, 66,127, 33, 55, 55, 55,190, 82,169,244,103, 89,150,206,205,205,221,
-160, 84, 42,135, 79,159, 62,221,113,197,138, 21,112,119,119, 71,122,122, 58, 36, 18,  9,220,221,221,145,151,151,135,216,216, 88,
-189, 70,163,217,166,215,235,151,164,164,164,164, 85,196,253,232,209,163, 55,  1,  1,  1,141, 83, 83,182, 30,159, 48,190,163,187,
- 86, 23,196, 55, 51,107,  1,150,213, 34, 59, 43,  1,192, 51,205,137,147, 87,163,179,179,233,222, 33, 33, 33, 81,  6,245, 56, 40,
-106,252,250,245,235, 81,188, 84, 78, 98, 98, 98,137,233,175, 44, 11,150, 33, 88,119, 36, 65,  9,224,192,234,111,154,126,147,155,
-254,204,221,138,243,238,109,227,250,204,198,117, 71, 18,148,139,191,177, 88,150,254,238,102,100,146,252,210,182,125,199,143,209,
-195,122,245,209, 59,155, 68,205, 17,218,177, 71,219,118,175,212,218,198,250,251,251,215, 32, 36,179, 78,106,198,235,144,145,163,
-199,245, 55,231, 41,206,251, 57,103,184, 81, 53,  3,132, 97, 97, 97,111, 13, 93,211,243,163,186, 31, 41,149, 74, 91,174, 89,179,
-230, 18,128, 15,124,204, 82,211, 51,175, 53,233, 54,137,205,206,206,121,146, 26,126,234,121,101, 92, 33, 33, 33,187,131,130,130,
-240,213,208,145, 59,198,140, 26, 67,215,159, 50, 19,137, 55,174,  1,122, 45,146,111,223,132,200, 68,143,179,233,239,244,  5, 52,
- 53, 54, 36, 36,196, 24,197,221,  8, 35,140,248,119,  9,172,132,132,132,155,110,174,206,151, 35, 35, 91,118,168,233,108, 91,216,
-235,125, 43, 67, 98,138,234,178,161,195,131, 31,139, 44, 66, 72,208, 57,157,110,192,101, 46,183, 27, 41, 10,197,192, 86, 99,177,
-231,130,130,130,148,198,141, 27,151, 19,123,225,199, 50,247,234,245,250,  4, 67,184, 19, 19, 19,111, 72,165,210,161, 77,155, 54,
- 93, 33,147,201,142,167,165,165,201,255,110,134,167, 60, 63, 17, 78, 90,183,174, 23,242,240,214, 87, 97, 33, 15,186,177, 44,235,
- 11,128, 16,138,250,115,177,231,240,202, 23,123, 86, 40, 20,227,230,207,159,191,157,195,225,212, 68, 81,224,208,226, 44,211,104,
- 52,244,238,221,187,133,106,181,154,  6, 64,120, 60,158,206,196,196, 68,121,247,238, 93,157, 94,175,143,211,106,181,227,202,227,
-221, 27,198,114, 63,222,231,227,227, 35,121,195, 65,126,241,239, 12,  5, 32,147,201, 86, 25,114,191,231,207,159,119,177,180,180,
-236, 64,  8,233,203,178,172, 87, 94, 94,158,234,251,239,191,191,119,253,250,245,220,215,175, 95,119,106,209,162,  5,113,112,112,
- 64,108,108, 44,155,159,159,127,148,162,168,121, 50,153, 44,198,208,252, 12, 11, 11,139, 33,132,248,201, 11,216,129,166, 38, 23,
-187, 50, 44,252,  0,150, 16, 66,158,231,231,147,243,142,142,174,191, 93,185,114,196,224,169,112, 69,107, 11,246, 40,254, 29, 24,
- 24,120,254,245,235,215, 93,138, 45, 88, 31,251, 96, 85,  9,226,252,211, 74,197,187, 62,196,164,224,196,186,159, 18,148,  0,176,
-112,125,118, 14,128, 93, 83,122, 89, 49,175, 66,119,173,114, 50,139,154,245,211,137, 76,131,214,228, 11,  8,  8,112,165, 40,106,
-  0,128,250,118,130,236,186,182,252, 28, 61, 33,108, 27, 66, 40, 27,  0,207,124,124,124,206,  2, 72,168, 78, 82,101, 50, 89, 36,
-128, 90, 31,239, 79,125,121,234, 62,128,251, 85,225, 10,  9,  9,217,221,164, 73,147, 83,155,119,108,219, 71, 19,210,152,232,245,
- 22,250,241,131,254, 92,236, 89,192, 31, 22, 98, 92,236,217,  8, 35,140,248, 55, 10, 44,  0,136,142, 73,232,  8,  0,238,238,238,
-236,155, 55,111,192,178, 44,249, 59, 23, 46, 18, 80,  7, 97, 96, 16,209,242,240,226,197,139,128,255,100,  6,201,100,178,  3,  0,
- 14,124, 74, 78,182,112,168,106,119,209, 86, 45, 36, 38, 38, 62,  7, 16,252,223,168, 36,225,225,225,242,225,  1,164,196,178,197,
-165,161, 51,244,191, 29, 58,116,120,175,209,104,174,  2,136, 39,132, 88,  0,200,212,104, 52,151,210,210,210, 82, 28, 28, 28,130,
-222,191,127,191,160,200, 18,185, 52, 57, 57, 57,164,154,117,137,  1,240,123,209,246, 73, 17, 26, 26,218, 85, 42,149,134, 89, 91,
- 91,187, 41,149, 74,190, 82,169,228,149,214,254, 34,145, 40,205, 80, 46, 11, 83,178,151,199,201,178,182, 48, 37,127, 41,119, 43,
- 39, 28, 83,200, 95,120, 90, 57,225, 88, 85,196,165,191,191,255,126,138,162,106,179, 44,107, 15,176,230, 44,139, 52,150,101,211,
- 57, 28, 78, 98,120,120,120,226,231,210,208,220, 47, 20, 80,221,140, 77,174, 17, 70, 24, 97, 20, 88,229, 32, 42, 42,138, 24,179,
-237,223,135,178, 44, 91,134,160, 40,194,253,189,162,237,  3, 20,  9,170,238,159,251,189,203,100,178, 79, 34,226, 71,207,122,158,
-  8, 96, 90, 80, 25,243, 44, 22,110,204,204,  3, 48,179,205,151, 85,227,124,242,228, 73, 28,128, 56, 99, 13, 53,194,  8, 35,140,
-248,188, 64, 25,179,192,  8, 35,140, 48,194,  8, 35,140, 48,226,211,130,  0, 40,115, 38, 64, 85, 86,202,174,206,108,130,202,248,
-141,156, 70, 78, 35,167,145,211,200,105,228, 52,114,254,255,227,252,215,160,120,218,249,127, 98,  3,208,222,200,105,228, 52,114,
- 26, 57,141,156, 70, 78, 35,167,145,243,223,182, 25,135,  8,141, 48,194,  8, 35,140, 48,194,  8, 35, 62, 49,202,117,114,119,117,
-173,225, 67,233,153,102, 44, 75,209, 44,197,106, 73,174,226, 80,116,102,230,  7, 65,  0,107,214,172,105,193,165,208,157,176,172,
-132, 16, 70,207,208,212,221,152,152,248,112, 67, 46,236,227,227,195,  3, 48,156,203,229, 54,215,106,181,142, 28, 14, 39, 73,169,
- 84,222,225,114,185,123,195,195,195, 53,159, 83, 38, 53,111,222,124,208,209,163, 71, 45,186,117,235,166,210,104, 52, 58,129, 64,
-192,249,253,247,223,  5, 35, 70,140,200,190,115,231, 78,181,102, 24,250,251,251,183, 93,189,122,117,157,182,109,219,162,121,243,
-230,242, 46, 93,186,240,130,130,130,120, 51,103,206,140,125,242,228,201,181,170,112,217,219,219,251,112, 56,156, 95,  9, 33, 52,
-203,178, 95, 21,205, 48,252,143,128, 16, 50,  8, 64, 63,  0,142,  0,146,  1, 28,102, 89,246, 64, 53,185, 58,161,208,201,221,183,
-104,215, 51,  0,103, 88,150,189,248, 55,210,215,  9, 64,119,154,166,253,  1, 64,175,215, 63,249, 84,156, 92, 46,215, 15,  0,180,
- 90,237,211, 79,197, 73,  8,241, 43,178, 36, 87,139, 51, 48, 48,240,123, 62,159, 63,  6,  0,212,106,245,110, 19, 19,147,229,101,
-157,119,243,230, 77,117,121,161, 79,124,234, 16, 54,124,150, 87,225,247, 85, 17,  0,128, 74,127,199, 86,115, 22,241,118,111,182,
- 44, 94,140,123, 85,237,201, 51, 82,169,244,235, 46, 93,186,204,190,120,241,226, 15,  9,  9,  9, 59, 96,132, 17, 70, 24,241,185,
- 10, 44, 87,215, 26, 62,125,123,246,254,113,252,184,  9,132,166, 41,188,138,136,224, 76,156,242, 77,  7,111,111,111, 39,137, 82,
-233,205,  2,140, 66, 36,122, 65,211, 84,226,214,205, 63,155,122,122,120,232,245,122,  6,219,182,111,237,236,234, 90, 99,110,101,
- 34,203,206,206,174,142,163,163,227,134, 41, 83,166,216,117,232,208,129,178,183,183, 71, 66, 66,130,217,137, 19, 39,234,254,242,
-203, 47,221,236,236,236,166,165,166,166,198, 86,231,134, 28, 29, 29, 91,216, 89,160,131,137,144,109,135, 92,130,124, 61,254, 72,
- 85,225,114, 82, 82,210,237,234,102,146, 90,173,158, 92, 80, 80, 16,236,237,237,205,110,219,182,141,140, 25, 51,134, 37,132, 16,
-133, 66,177, 23,213, 12,225, 32, 22,139, 55,183,109,219,214,189, 89,179,102, 49,247,238,221,235,194,178,236,249,190,125,251,186,
-138,197,226, 40,  0, 30, 85,225,162,105,122, 79,120,120,184,159, 82,169, 68, 96, 96,224, 47,  0,  2,255, 67,226,234, 23,107,107,
-107,102,235,214,173,219, 27, 52,104,224, 38,151,203, 11, 70,143, 30,221,145, 16,210,150,101,217, 81, 85,224,145,  0,216,104,110,
-110,206, 91,182,108,217,131,214,173, 91,199,241,249,124,113,100,100, 36, 59,101,202,148,145,132,144,190,  0,166,176, 44, 43,175,
- 42,167, 84, 42, 53, 91,185,114,229,235,128,128,128,123,124, 62,159,247,246,237, 91, 76,157, 58,117,252,223,225,244,242,242, 18,
-175, 92,185,242,169,183,183,119,134, 80, 40,228,189,127,255, 30,211,167, 79, 31, 77,211,116, 95,134, 97,170,197,105,103,103, 39,
- 89,190,124,249,243,160,160,160,108,161, 80,200,139,142,142,102,191,249,230,155, 49, 85, 73,103,171, 86,173,  6, 82, 20,181,248,
-214,173, 91,  0,128, 38, 77,154,124,175, 86,171,231,127,124, 30,203,178,104,222,188,185,178, 85,171, 86, 99,110,222,188, 89,102,
- 88,148,125,130, 89,131,  0, 96,230,247, 69,191,139,246,151,245,123,152,106, 85,149,235,188, 79, 29,194,  2,192,196,111,183, 12,
- 45,252, 44,220,191,181, 40,116,239,230, 58,132,173,138,104,115,114,114, 26,215,168, 81,163,239, 30, 62,124,184, 47, 40, 40,104,
-234,142, 29, 59,184,221,186,117, 91, 38,149, 74,221, 58,117,234,212,247,254,253,251,171, 35, 34, 34, 54, 27,155,120, 35,140, 48,
-226,179, 18, 88,148,158,105, 54,126,220,  4, 50, 96,208,192,228,164,148, 84,198,196,212,124,208,225, 35, 71,196, 30, 30, 30,148,
-242,231,159,161, 75, 75,131,126,198,140,166, 55,111,222,212, 78,154, 54, 67,161, 82, 22,236,113,180,183, 19, 31, 58,112,208,225,
-248,177,163,205,  0,132, 87,100,185,114,116,116,220,112,236,216, 49,135, 58,117,234, 64,173, 86, 35, 35, 35,  3, 90,173, 22,189,
-122,245,162, 27, 55,110,236, 48,114,228,200, 13, 62, 62, 62,189,171, 98,201,178,181,181,181,119,175,201, 61,187,112, 90,103,143,
-182,173,  2, 37, 14, 78,181,129,  4,  6,137,177,111, 26, 94,125, 24, 58,165,185,155,115,100, 84,174,186, 91, 90, 90, 90, 74, 85,
- 51, 41, 35, 35, 99,214,184,113,227,142,249,250,250,218, 10,  4,  2, 56, 56, 56,144,209,163, 71,167, 38, 37, 37, 45,254, 27, 98,
-165, 48,175, 41, 74, 95,250,211,208,  5,169, 63,130,179,185,185, 57,204,205,205,  1,192,233,239, 84,136,126,253,250,209,113,113,
-113, 99, 24,134,241, 46,189, 63, 41, 41,201,213,214,214, 54,229,237,219,119,126, 10,181, 38,104,194,164,185,139,  6,244,109,111,
-113,239,222, 61,116,237,218,149, 34,132, 12,170,130, 37,107, 99,112,112,112,212,138, 21, 43,120, 81, 49,111,235, 61,120,252,  4,
- 18, 33, 79,239,236,236, 36,120,246,236, 25,127,229,202,149, 41, 63,252,240,195, 70,  0, 35,171,144,244,141,253,250,245,203,154,
- 54,109, 90, 65,100,244,219,218, 15,195,158,179, 38,  2,158,214,222,222,150,190,119,239, 30,119,243,230,205,100,222,188,121, 85,
-230, 28, 61,122,116,210,180,105,211, 56,105, 25,217,117,147, 83,210, 89, 62,143,214, 88, 88, 88,112,174, 92,185, 66,237,217,179,
- 71, 51,101,202,148, 42,115,118,237,218, 53,101,206,156, 57,220,136,168, 24,215,  7,161,207, 97, 34,224,106, 29, 28,236,232,  7,
- 15, 30,208, 27, 55,110,212, 45, 92,184,208, 32, 78,150,101,183,173, 89,179,  6,167, 78,157,  2,  0, 28, 56,112,  0,174,174,174,
- 31, 12,251, 43,148, 42, 80,  4,120,251,246,173,120,252,248,241,219, 80, 70,220,185,240, 89, 94,216,  7, 96,216,176, 97,201,134,
- 89,161, 86, 85,173, 82,109,247,102,139,133,213,132,  9, 19,202,139,205, 53,212,167, 10, 34,171, 89,179,102,179, 15, 29, 58,100,
-115,228,200,145,111, 79,156, 56, 81,220,105, 17,111,218,180,233,235, 30, 61,122, 96,212,168, 81,179,  1, 24,  5,150, 17, 70, 24,
-241,121,  9, 44,150,165,104,154,166,144,154,146,174,253,162,125,135,145,155,182,108, 17,240,249,124,168,213,106,200,175, 93,  3,
-171, 84,194, 66, 44, 70,151, 46, 93,184,245,235,215, 55, 27, 55,122,244,232,148,100,217,118,154,166, 28, 88,150,162, 43,185,230,
-240, 41, 83,166,216,213,169, 83,231,131,157,122,189, 30,153,153,153, 48, 53, 53, 69,255,254,253,109,246,239,223, 63, 28,128, 65,
-230,126,123,123,123, 23, 15, 87,251,187, 71,119,205,112,180,179,160,128,180,163,192,251, 55,192,239, 66,184,219,213,132,123,155,
-214,146, 30,141, 26,  4,244, 95,189, 59,204,222,222,190, 89, 74, 74,202,187,170,100,210,219,183,111,239, 72,165,210,209, 10,133,
-226, 20,  0,234,238,221,187,108, 92, 92,220,184,228,228,228,247,213,205,120,134, 97,144,157,157, 13,134, 97,232,162,223,197,159,
-255, 88,101,232,215,175, 31, 29, 31, 31, 63,206,219,219,187,238,206,157, 59,145,154,154, 10,145, 72,  4,189, 94,143,166, 77,155,
-214,108,215,174, 93,116, 90, 70,182,165, 86,167, 85, 39, 37, 68, 55, 58,184,227, 93,129,159,187,251,189,195,135, 15, 55,176,182,
-182,238,111,136, 53,143, 16,210,201,212,212,148,243,227,143, 63, 82,166, 22, 14, 93, 27,  5, 75,185,207,195, 95,191,227,  9, 56,
- 76, 78, 78,110,198,211,167, 79, 35, 22, 46, 92,216,226,244,233,211,201,132,144, 78,134, 12,153, 17, 66, 58, 57, 56, 56,152, 78,
-157, 58, 85, 46, 50,181,105,222, 48,216,142,243, 34,252, 77, 34,151, 71,105,155, 53,107,214,230,254,253,251,123,102,204,152,225,
-123,238,220,185,156,170,112,214,173, 91, 87, 52,109,218, 52,218,220,194,166,189,173,131,148,182,181,178,112,  3,128,152,152,152,
-253, 41, 41, 41, 81, 19, 38, 76,104,120,238,220,185,188,170,112,218,216,216,136,231,204,153,195,169,237,234,217,199,213,221,147,
-186,122,227,225,115, 62,159,210, 42, 20,138,204, 87,175, 94,189,153, 61,123,118,208,185,115,231,114, 13,225, 44, 40, 40, 48,117,
-114,114,130,189,189, 61, 24,133,  2, 57, 57, 57, 56,126,252, 56,242,242,242,160,215,235, 33, 18,137,240,195,186,237,136,126,241,
-  0,183,111,223,134, 66,161, 48,253, 20,245,196,103, 85,  4,194,199, 25, 46,174,182, 50,147,134, 86, 32,172, 80, 74,120, 13,197,
-118,111,182,162,225,194, 82,150,171,132, 35, 71,142,216,185,185,185,161,117,235,214,  0,128,145, 35, 71,162,125,251,246, 56,117,
-234, 20, 46, 95,190, 28,215,164, 73,147, 55,241,241,241,107, 19, 19, 19,183, 27,155,122, 35,140, 48,226,191,141, 50,157,220, 89,
- 66,228, 47, 95,189,226,154, 88, 88, 12,221,180,101,139,128,203,229,226,253,251,247,  8, 15, 15, 71,193, 31,127, 64,113,239, 30,
- 82, 82, 82,144,159,159, 15, 91, 91, 91, 44, 95,181, 74,194, 19, 73, 70, 70,189,121, 67,179, 20,171, 45,213,195,254,203, 84, 77,
- 62,159,223,188, 75,151, 46,229, 58,215, 39, 39, 39,163, 67,135, 14, 28, 14,135,211,188,156, 94,251,213,143, 94, 90, 68,106, 75,
-206, 28,217, 49,213,209,142,243, 28,120, 51, 29,200, 11,  3, 88, 21,160, 83,  3,113, 17,192,201,117,112,202,136, 34,  7, 38,247,
-119,112, 18,241,206,144,143,204, 68,149, 77, 41,117,118,118,118,117,117,117,221,213,183,111, 95, 10,  0,154, 55,111, 78, 92, 93,
- 93,119, 56, 59, 59,187, 86, 96, 93,168,144, 83,169, 84, 62,200,202,202, 66,183,110,221,172,155, 54,109,122,181, 91,183,110,214,
-197,251,171,203, 89,  4,235,182,109,219,102,184,186,186, 30,112,113,113, 17, 24, 96,  5, 41,225,140,139,139, 27,227,229,229, 85,
-119,231,206,157, 52, 77,211,216,185,115, 39, 14, 29, 58,132, 59,119,238, 32, 53, 53, 85, 60,125,250,116,139,179, 87, 31, 92,188,
-123,231,209,233, 53,243,191,181,238,213,174,181,171,101, 78, 90,174,149,149, 85, 23,  0, 14,  6,166,179,251,252,249,243,111, 62,
-121, 21, 99, 71,113,184, 60,  1,143, 43,178,181,177,168,229, 96,107, 89,215,201,218,178,174, 41,159,107,145,155,155, 27,123,242,
-228, 73, 29, 74,  5, 33,173,140,115,245,234,213,175, 34, 98,226,173, 41,154,195,229,210, 92,190,133,185,137,245,151,221, 58,180,
-  1,  0, 17, 77,  4,185,185,185,241,251,247,239,175, 18,231,138, 21, 43, 66,147,210,178,236,184, 60, 62, 71,192,227, 10,139, 15,
- 88,154,153,216, 75,  4,  2, 81, 65, 65,193,251, 93,187,118,169,171,200,249,244,101,212,123, 27, 66,129,166, 64,184,150,150,166,
-118,182, 22,166, 14,118,102, 38, 14, 66, 10,194,220,220,220,119,  7, 14, 28,208, 24,202,153,154,154,138,136,136,  8,212,104,216,
- 16, 87,175, 94, 69,205,154, 53,209,191,127,127, 12, 28, 56, 16, 34,145,  8,109,155, 52,192,220,185,115, 17, 29, 29, 93,110,185,
- 23,251, 67, 85,  4,169, 84,122,163, 42,117,  9, 40, 28, 22,172, 72, 92,125,204, 89,214,121, 31,115, 54,107,214,108,246,241,227,
-199,109,214,175, 95,239,255,205, 55,223,196, 28, 63,126, 28,190,190,190,120,245,234, 21,156,156,156,112,240,224, 65, 76,154, 52,
- 41,102,209,162, 69,254, 87,174, 92,145, 74,165,210, 89,213,124,142,170,  4, 35,167,145,211,200,105,132, 65, 22, 44, 45,131, 51,
-147,167, 78,239,126,236,248,113, 49,159,207,199,219,183,111,145,154,154,138,115,103,206,232,207, 55,104, 80, 64,211, 52,219,251,
-216, 49,211,254,  3,  7, 18, 46,151,139,186,117,235,162, 75,151, 46,162,209, 99, 39,164,114,228,138, 67,149, 20,138,157,173,173,
- 45,190,251,238, 59, 44, 95,254,161, 63,238,240,225,195,177, 97,195,  6,152,154,154,130, 16, 98,103,200, 13, 56, 58, 58,246, 27,
- 57,179,141,179, 89, 45,179, 20, 54,108, 31,151,208, 98, 43,208, 98,128,226,  1, 34, 17,160, 85,  3,106, 10,170,199,119, 50,217,
- 54,155,115, 59,  6,228, 57, 37,171, 15,246,  3,112,216,208, 76,178,177,177, 89,112,244,232, 81,219,153, 51,103,178,121,121,121,
- 36, 37, 37,133,157, 61,123,182,237,252,249,243, 23,  0, 24, 86,157,140,151,201,100, 75, 71,142, 28,217,113,247,238,221,246,125,
-250,244, 49, 47,234,129,167,200,100,178,165,127,167, 64,185, 92, 46,125,237,218, 53,171,109,219,182, 13, 92,182,108, 89,189,118,
-237,218, 57,100,103,103,191, 75, 74, 74,234, 91,153,197,141, 97, 24,239,157, 59,119,130,166, 11,141,144, 20, 69,129,207,231,131,
-207,231,195,220,220, 60, 59, 38, 38, 70,239, 98, 47,226,203, 83,146,114, 44, 57,150, 92,226,232, 96,109,225,224,216, 90, 46,151,
-223,  1, 32, 49, 48,137,190,173, 91,183, 14,191,118,255,133,126,194,240,182,117,197, 60,138,107, 42, 18,210, 34, 62,151, 16,150,
-213,107,180,234, 38,155,247, 93,223, 93,187,118,237, 96,  0,  6, 13, 17, 19, 66,252,124,125,125,111,221, 15,139,196,211,151, 49,
-  9,182, 86, 98,235, 78,109,155,121,150, 92,176, 81,227,129,165, 78, 55,104,105, 27, 14,135,227,215,160, 65,131,228,184,164, 76,
-216,217,152,127, 32,164, 45,109,236,218,  3,128, 60, 39,103,179,163,163,163, 71,209,122,144,  6,165, 51, 40, 40, 40,237, 78, 72,
- 36, 28,108,173,172,138,118,155,149, 62, 39, 61, 41,105,155,139,139,139,  7, 33,196,217, 16,206,147, 39, 79, 34, 52, 52, 20, 75,
-235,213,195, 76, 23, 23,216,218,218,226,143, 63,254,  0,203,178, 48, 49, 49, 65,118,118, 54, 14, 31, 62,140,118,237,218,253,237,
-198, 66, 42,149,222,144,201,100,173, 75, 28,211, 63,  1,138, 57, 13,181,142,221,185,115,231,248,145, 35, 71,190,118,115,115,195,
-136, 17, 35, 92,247,236,217, 19,227,233,233,233,218,188,121,115,220,185,115,  7,179,102,205,138, 89,180,104,145,235,240,225,195,
-177,119,239, 94, 36, 38, 38,254,102,108,230,141, 48,194,136,207, 70, 96,197,197,197,101,123,123,123, 59,185,185,185, 81,106,181,
- 26, 57, 57, 57,184,116,225,130,254,224,225,195,231,212,106,245, 20,138,162,120,123,127,253,117,155,131,163, 99,155,222,125,250,
- 16,173, 86,139,246,237,219,243,175, 93,187,102,253, 44, 46, 46,175,162, 11,210, 52, 93, 98, 61,250,250,235,175,177,126,253,122,
-  0,192, 87, 95,125,245,167,192,211,106, 13,246, 69, 18,153, 48, 93, 90,181,175,111, 22, 47,249,217, 76,211, 84,155,239, 18,109,
-250, 64,146, 47, 10,  2,197,231, 64, 36,  4,163, 22,234,162,178,219,135, 68,191,173,237, 35, 82,166,214,110,230, 25,140, 67, 15,
- 78,116,169,138,192, 18,137, 68,141,196, 98, 49, 34, 34, 34, 50,  3,  3,  3,179,205,204,204,204,221,221,221,109, 68, 34, 81,163,
-234,102,124, 74, 74,202, 91, 39, 39,167,150,189,123,247,158, 68, 81, 84,123,134, 97,174,102,100,100,108, 74, 73, 73,121,107,200,
-255,157,156,156, 38,176, 44,187, 16,192,209,226,125,106,181, 26, 20, 69,129,101, 89,116,239,222, 29, 43, 86,172,240,185,122,245,
- 42,110,221,186,101, 53,120,240,224,  7, 82,169, 52,155, 16, 50, 42, 49, 49,177, 92, 43, 89, 70, 70,  6,182,109,219,  6, 14,135,
-  3, 11, 11, 11,152,154,154, 66, 40, 20,162,117,235,214, 41,107,214,172,113, 63,112,224,128, 54, 59, 53,149,136,242,114, 84,196,
-218, 90,  8,105,205, 78, 67,251, 15,120,  0,224,136,161,247,110, 98, 98, 34,226, 67,149, 71,233,149,212,234, 69,155, 57, 98, 30,
-143,  8,121, 28,  8,152,  2,122,238,138,101,172,144,176,220,226, 33, 83, 67, 33, 20, 10,249, 18, 62,171,226, 10, 40,173,152, 98,
- 63,201, 56, 43,135,195, 17,  8,184, 80,148,119,156, 71, 17,154, 16, 34,  2,160,170, 74, 58, 77,248,250,114,207, 23, 82,160, 41,
-138, 18,150,199,217,175, 30, 97,143, 76, 42, 22, 56, 37, 70, 53,232,116, 58, 52,106,212,  8,  7, 79, 93,199,249, 63,238, 33,253,
-253, 51, 76,153, 48, 18,238,238,238,184,116,233, 82,133,105, 42,246,193, 50,160, 83, 80, 40,136,190, 55,175,252,228, 34,191,171,
-202,134,  6, 75,115,250,172,138,168,112,118,162,179,179,243, 88,127,127,255, 97, 39, 78,156, 64,155, 54,109,208,173, 91, 55,120,
-122,122,186, 14, 30, 60, 24,  0,208,178,101, 75, 44, 88,176,192,117,224,192,129, 56,121,242, 36,206,159, 63,143,160,160,160,169,
- 82,169, 52, 85, 38,147,109, 49, 54,247, 70, 24, 97,196, 63, 46,176,  0, 64,160,209,120,170,182,109,131,252,234, 85,240, 47, 95,
-198, 89, 63,191,124,157, 78, 55, 67, 38,147,197,  3,128,189,189,253,180,195, 71,142,220,109,255,199, 31,102,234,136,  8, 56, 63,
-127, 14,142,135,135,191,161, 23, 46,182, 94,169,213,106,  0,192,175,191,254,138,156,156, 28,228,228,228, 64,167, 51,120, 45, 97,
-112,249,104,110,103, 93, 19, 73,136,  2,195,161, 76,222,121, 22, 52, 54, 81,154,202,156,226,236,229, 57, 60, 15, 68, 36,212,147,
- 40,178, 85,141,  9,173,134, 50,189,  0,206,205,221,193, 65,217,195,143,229,129,162,168,226,151, 99,102,104,104,104,247,230,205,
-155,159,  1, 96, 83,188,191,186, 72, 76, 76,124,  3, 96, 74,117,254, 75,211,244,194,219,183,111,219, 29, 62,124,120,210, 79, 63,
-253,196,150, 22, 88,197,223, 57, 28, 14, 88,150,133, 68, 34,  1,135,195,177, 63,121,242,164,253,151, 95,126,185, 25, 64,185,229,
- 36, 22,139, 97,103,103,  7, 62,159, 15, 83, 83, 83,200,115,179, 36, 91,127,156,223, 90,108,105,111, 53,101,234, 12,106,236,216,
-177,225, 27, 54,108,168,225,224,233,233,253,226,197,139,183,189,  6, 12,188,119,234,212, 41, 69, 21, 28,220,159, 69, 68, 68,208,
-238,110, 46, 60, 70,171, 96, 36, 60, 64,248,244, 39,134,111,234,  0, 33, 77,131, 67,192,138,196, 18,187,248,164,164, 56,  0, 73,
-134, 16,178, 44,251,244,221,187,119,196, 89,106,207,201,147, 43,179, 37, 28,134, 31,251,248,209,171, 58, 13, 27,121,  3,128,242,
-241,189, 19,  2,207,122,166,178,220, 60,145,147,147, 83,140, 33,156, 58,157,238,105, 66, 66,  2,177,178,178,226, 70, 69,189,249,
-205,218,204, 84,106,101,111,223, 26,  0,212,153,105,183,136, 66, 41,227,114,185, 78,105, 25, 25, 73, 58,157, 46,206,208,116,198,
-198,198, 18,103,169, 61,231,204,185,243,  7, 29, 36, 98, 71, 11,145,192, 92, 72,129,  8, 89, 38,135,175,211, 37,139,196, 18,105,
- 66, 98, 98, 10,203,178,229,250,  9,110,101, 38, 13, 45,252,246,203,254,143,172, 59,184, 30, 18, 11,115, 90, 15,174, 86,142,  7,
-199, 15,163,247,228,111, 12,122,158, 86, 47, 25,126, 96,245,146,225,229,134,103,248, 72, 16, 65, 54,238,111,182, 60,219,189,111,
-252,133, 83, 86,177,131,123,167, 78,157,230,237,216,177, 67, 92,252,251,213,171, 87,104,222,188,240, 81, 94,188,120, 49, 58,118,
-236,  8, 63, 63, 63,188,122,245, 10,181,106,213,194,241,227,199, 65,211, 52,119,236,216,177,179,  1, 24,  5,150, 17, 70, 24,241,
- 95, 69,185, 10,129, 97, 89, 70,151,153,  9, 86, 85,216,145,230,241,120, 44,203,178, 37,141, 27,151,203, 21,155,155,155, 19,174,
-179, 51,136,160,200,213,135, 16,253, 39,176, 26, 64,175, 55,156, 70,175,  7, 13,162,  1,139, 63, 67,252,200,133,  4, 63,216,180,
-195, 20,201, 55, 72,230,155,151,126,195,129,213, 49,208,163,106,214, 17, 66,  8, 43,151,203,161, 82,169, 44,221,220,220,206, 41,
-149, 74,203,162, 23, 38,251, 79, 21,156, 78,167,139,225,112, 56, 24, 62,124, 56, 80,184,228, 17,212,106, 53,158, 60,121,  2,149,
- 74,  5,181, 90,141,187,119,239, 34, 39, 39,  7,106,181, 26, 87,174, 92, 65,173, 90,181,192,225,112, 28, 43,226,101, 24,  6,182,
-182,182,176,183,183,135, 74,158, 43, 57,182, 99, 67,215, 85,139,190,179, 25,228,198, 82,191,108, 92,203,184,185,185,101,213,175,
- 95,223, 74, 36, 18,101,  5,  6,  6,102,159, 60,121,242,116, 85, 66, 52,  0, 56, 51,103,206, 28,223,224,224, 96, 23, 11, 19,137,
- 70,192,167, 33,208,201, 89,129, 42,131,229, 40,210,217, 90,206, 46, 26, 72, 76, 26,245,233,211, 71, 15,224,140,161,156, 83,166,
- 76,169,233,237,237,109, 99, 97, 38,201,229, 80, 72,228,233,245,137, 89, 33,247,174,  0,  0,207,198, 78,  1,137, 73,163,193,131,
-  7,107,171,194, 57, 99,198, 12, 55, 39, 39, 39,107,138, 34,217, 58,141,230,125, 73,125, 80, 42, 82,104,129, 80, 14,129,176,197,
-168, 81,163,116, 85, 76,167,171,175,175,175,181,165,185, 89, 54,151, 34,113, 60,189, 46, 94,196,234, 19,248, 90, 77,154,192,206,
- 62, 31, 18,147,102,131,  6, 13, 42, 55,157,197,214,171,143, 45, 67, 28, 14,  7,137,137,137, 40,144, 61,  3, 47, 49,  2,126, 38,
- 92, 52,118,176,129, 68, 34,169, 92, 96,141,123, 69,194, 99, 89, 18, 30,203, 18,140,123, 69,202,250, 93,134,200,170,176,238, 87,
-232,215,181,221,251, 70,117, 56,207,159, 63,191,178, 71,143, 30,218,  1,  3,  6,224,202,149, 43, 32,132,224,206,157, 59, 72, 76,
- 76, 68,199,142, 29,193,178, 44,158, 60,121, 82, 34,190,250,246,237,139,110,221,186, 21, 92,188,120,241,  7, 99, 83,111,132, 17,
- 70,124, 54,  2, 75, 43, 16,188,100, 38, 79,134,197,233,211,224, 70, 69,161,111,239,222,102,  2,129, 96,163,163,163, 99,160, 84,
- 42,109, 38, 18,137, 54,207,152, 62,221,212,102,249,114, 72,111,221, 66,242,213,171,208,114,185,143,171,114,113,133, 66, 81, 44,
- 96,160, 42, 18,114, 22, 22, 22, 85, 18, 88,140, 14,247,147,210,162,192,135, 11, 24,176,249, 23,115, 91, 62, 28, 20, 51,223,238,
-108,110, 29,247, 55,114,158,251, 18,219,198,118, 27,107, 53,127, 40, 39,156,124,190,133, 16,178, 68, 25,244, 96,238, 87, 37,157,
- 74,165, 50, 71, 46,151,163,110,221,186,214,161,161,161,110,238,238,238, 86, 69,130,230,209,223,201,124,169, 84,218, 36, 32, 32,
-224, 72, 96, 96,224,219,128,128,128, 35, 82,169,180, 73, 21,254,254,203,227,199,143, 65,211, 52,198,142, 29,139,188,188, 60,104,
- 52, 26,100,100,100, 32, 46, 46, 14,106,181, 26,  9,  9,  9,120,253,250, 53,212,106, 53,222,189,123, 87,146,199, 21, 65,171,213,
-194,212,212, 20,217, 25,169,146, 67, 91,215,118, 93,182,104,158, 40, 39, 58, 20,  9,178, 20, 48,122,133,108,193,130,  5, 49,110,
-110,110,119, 84, 42,149,151, 78,167,235,194,178,236,161, 42,  8, 85, 10,192, 19,119,119,247, 14,107,214,172,105,190, 96,197, 46,
-129, 41,157,199,242, 77,  5, 12,223,148,207,242,189, 26, 99,244,194, 77,194,117,235, 86,223, 15,  9,  9,201, 49,112,102, 30,  5,
-224, 73, 96, 96, 96,147,228,228,228,230,126,126,126,254, 14,117, 61,132,  2, 39,105, 58, 95, 90, 43,131, 85, 20, 92,165,106,214,
-238,190,103,207,158,219,183,110,221, 74,169, 10,167,189,189,125,243,109,219,182,  5,212,172, 89,179,161,208,220, 92,148,159,157,
-189, 67,149,157,185,139,107,227, 32,162,172,109,250, 29, 59,118,236,143,115,231,206,101, 84,133,211,211,211,179,217,242,229,203,
-253,  2,  2,  2,  2, 29, 61, 60,133, 34, 39,231, 52,158, 83,173, 84,145,111,144,144,170,229,218,119,215,174, 93,215,239,222,189,
-155,110,104,192, 81,138,162,192,229,114, 33,145, 72,112,243,230, 77, 12,234,221,  9, 14,118,102,240,240,244, 68,235,113,147,113,
-238,220, 57,240,249,124,252, 93,107,235,199, 48, 68, 16, 85, 85,124, 85,198, 41,147,201,182,132,132,132,252,212,191,127,127,180,
-111,223, 30, 79,159, 62,197,172, 89,179, 98,206,157, 59,  7,  0,120,250,244, 41,150, 45, 91, 22,115,255,254,125,140, 24, 49,  2,
-205,155, 55,199,147, 39, 79,246, 25,131,143, 26, 97,132, 17,159,141,192,114,179,178, 50, 85, 42, 11, 18,110,221,186,165,161, 40,
- 10, 98,177, 24,253,  6, 12,160,126,252,241,199, 22, 61,253,252,174, 13,110,210,228,194,225, 67,135,  2,252,  3,  2, 10,215,219,
-161, 40,156, 58,117, 74,145,147,147,157, 81,179,102, 77, 11, 67, 47,158,150,150, 86,210,251, 86, 40, 20, 96, 89, 22,166,166,166,
- 85, 18, 88,138,124,234,234,237,155,225, 89,172,254,235,184, 46,111,214,107, 86, 36,247, 12,206,102,244,156, 28,189, 22, 57, 10,
- 22,121, 74,112, 30, 82, 86,193,195,221,123,105, 98,219,  7,191,126,248, 54, 44, 67,205,170,171, 52,251, 33, 43, 43,107,222,132,
-  9, 19, 50,236,237,237,137,169,169, 41,236,237,237,169,209,163, 71,167,199,199,199, 47,169,110,198,251,248,248, 12,108,210,164,
-201,153,176,176,176,190,135, 15, 31,118, 57,114,228, 72,223, 38, 77,154,156,241,241,241, 25,104, 32,197,225,149, 43, 87,202,249,
-124, 62, 26, 55,110,140,188,188, 60,168,213,234, 74,183, 74,  5, 43,195, 64, 40, 20,226,200,174, 13, 29,150, 45,154, 39,202,140,
-120,136,103,119,174,224,226, 91, 85,193,194, 21, 63, 61, 16, 10,133,213,186, 95,119, 59, 73,131,  6, 82,211, 87,223,140, 28, 32,
-155, 51,123,182,249,243,231,207,197,211,191,153,198,202,210,178, 89, 97,215,117, 52,213,122,  1,245, 82,105, 67,122,116,107,139,
- 31, 22,207,234,  0,  3,134, 78,125,236, 36, 13,234, 75, 77,195,191, 29, 59, 40,102,202,148, 41,226,149, 43, 87, 22, 52,111,222,
- 60, 59, 39, 39, 71,100,110,239, 24, 32,176,179, 15,150,101,101, 75,154, 54,107,246,100,228,200,145,242,170,114, 46, 88,176, 64,
-114,251,246,109, 65,167, 78,157,242,114,115,115, 37, 66, 19,147, 96,158,153, 69,203,180,156, 28,179,206,157, 59,135,245,239,223,
- 95, 91, 29,206,215,175, 95, 11,154, 54,109,154,151,147,147, 35, 49,179,119,108, 36,180,115,104,145,152,153,101,218,184, 73,147,
-176, 49, 99,198,168, 43,226,236,183,233, 79,113, 34, 22,139, 51,189,189,189, 49,127,254,124, 44, 94,188, 24,253,250,245, 67,236,
-219, 88,180, 26, 49, 22,117,134,143,199,153,251, 15,145,152,152,136,185,115,231,194,221,221, 29, 20, 69, 37,125,202,198,163, 34,
- 65, 84,158, 35,188, 79, 29,114,163, 34, 63,171,202, 68, 86,135, 14, 29, 70,244,232,209,  3,167, 78,157, 42,113,104, 31, 50,100,
-  8,  0,192,223,223, 31, 51,102,204,112, 93,179,102, 77,204,186,117,235,208,164, 73, 19, 56, 59, 59,127,105,108,230,141, 48,194,
-136,127,  2,101,199,193, 50, 19, 13,216,177,101,179,249,164,105, 51,228,222,222,222,150, 14, 14, 14, 32,132,160, 83,167, 78,164,
-201,197,139,166, 92,169, 20,214, 13, 26,148, 44,104,120,251,214, 45, 92,187,118, 77,190,127,247, 47, 78, 35, 71,143,238, 14,148,
-239, 51, 91,122, 88, 45, 35, 35,  3, 14, 14, 14, 37,179,213,100, 50, 25, 28, 28, 28,192,227,241, 64,211, 52,167,104,233,151, 10,
-213,150,131,131,195,175, 43,150,189,156,147,224, 59,163, 78,176,152, 34, 23,228,201,208,179, 44,184, 68, 15, 40, 88,104,245,128,
- 74,203, 34,168, 54,109,245,135, 26,150, 15, 95, 94,142,117,112,112,248,181, 42,153, 20, 19, 19,115,221,209,209,113, 92, 65, 65,
-193, 81,  0,212,131,  7, 15,152,183,111,223, 78, 52,212, 33,189, 44,136, 68,162, 89, 71,143, 30,181, 90,178,100, 73,214,181,107,
-215,114,218,182,109,107,190, 98,197, 10,171,129,  3,  7,206, 66, 25,193, 32,203,120, 17, 41,164, 82,233,190,164,164,164,137, 13,
- 27, 54, 68,102,102, 38, 52, 26, 13, 66, 67, 67,225,238,238,142,144,144, 16,120,120,120,224,241,227,199,240,244,244,132, 94,175,
-135, 82,169,132,222,  0,245, 42,139,127,111, 34, 86,101,153,201, 30, 94, 64,228,243, 80,156,143, 81, 21,172,222,125,232,124,  3,
-255, 32,121,241, 12,195,170,192,211, 94, 82,207,201,206,250,242,138,197,223,219,189,187,126,  8,199,119,111, 98,174,159, 63, 95,
- 95,100,134, 97,205,  6, 76, 29,168,209,194,  5,  4,130,150,205,154,162,187, 85,164,158, 87,  3, 41,127,188,172, 56,146,185,167,
-189,164,158,212,214,250,210,234,229, 75, 76,163, 47,238,197,225,237,235,216,163,191, 30,  8, 80,  2,245,220,220,220,186,211, 52,
-109, 15, 64,161,215,235,163, 97,224, 18, 52,101,113,254,113,246,108,160, 18,168,231,236,236,220,157,203,229,214,  0,160,210,106,
-181,239, 63,  5,103,221,186,117,187, 19, 66,156,  0, 40,139,124,174,170,180, 84, 78,251,246,237, 87,239,218,181,107,186, 74,165,
-178, 42,101,109, 37,167, 78,157,130, 70,163, 33, 60, 30,143,145, 72, 36,136,139,139, 99,  1, 36,177, 44, 59,254, 83, 53, 28,125,
-250,244,193,131,  7, 15, 22,  3, 88, 88,209,121,153,153,153, 28, 43, 43, 43, 93,101,194,203, 80,206,135, 15, 31,174, 28, 51,102,
-204,204,139, 23, 47, 38, 44, 90,180,200,127,248,240,225, 56,121,242, 36,106,214,172,137,215,175, 95, 99,250,244,233, 32,132,184,
-174, 89,179,230,201,193,131,  7, 29,147,147,147,215, 26,155,121, 35,140, 48,226,179,177, 96, 17,134,112,221,235,214,213,171, 11,
-242,247,140, 30, 49,162,224,229,203,151,208,235,245,208,233,116, 80, 62,122,  4,249,197,139,208,235,245, 96, 89, 22, 15, 31, 60,
-192,148,201,147,243,149,  5,249,187,106,215,118, 97,  9,203,150, 76,215, 39,132,180,255,152, 91, 93,202,140,162, 80, 40,160, 80,
- 40,192,225,112, 96,106,106,138,212,212, 84,240,249,124,136, 68, 34,248,249,249, 81,206,206,206,221,254,146,182,143, 56, 67, 67,
- 67,181,200, 85,245, 61, 53,124,106,146,115,129,142, 29,103, 81, 27,181,120,162,146, 89,136, 14,102,  4, 95,250,113, 97,207, 75,
-103,159,237, 29, 36, 35,186,156,190,161,161,161,218,138, 56, 63,134, 84, 42,245,240,241,241,217,210,167, 79, 31, 10,  0, 90,180,
-104, 65,213,171, 87,239,103,169, 84, 90,238,146, 54,149,113, 10,133, 66,  1,  0, 92,189,122, 53,243,246,237,219,157,174, 94,189,
-154, 89,122,191, 33,156, 20, 69,237,216,186,117, 43,196, 98, 49,116, 58, 29,212,106,117,137,255, 85,233, 79,141, 70,  3, 27, 27,
- 27,252,241,199, 31, 96, 24,230, 92,101,233,244,174,239,155,159,195,177, 72,217,119,230, 26, 46,188,211,228, 87, 85, 92,149,230,
-172,235,104,226,233, 96, 99,125,101,245,143, 75,109,179,222,132, 34, 33, 33,129,189,116,241,220,125,  5,203, 38,102,228,176, 63,
-100,230,177, 62,249, 74, 86, 28, 84, 27,241,231,126,158,206,126,219,  4, 58, 16,176, 21,113,214,115, 52,241,116,178,181,190,180,
-118,245,143,166,217,111, 66,145,148,156,140,243,231,206, 60, 81,176,108, 34,203,178, 23, 89,150,157,160,211,233, 26,233,116,186,
- 70, 44,203, 78, 40, 79,180, 84,149, 83,163,209,  4,107, 52,154,224, 79,201,201, 48, 76, 48,195, 48,  6,115,254, 57,131, 16,152,
- 63,127,254,163, 91,183,110,245,127,244,232, 81,187,226,237,197,139, 23,109, 99, 99, 99,219, 38, 36, 36,180,137,157, 37,160,159,
- 63,127,206,121,252,248, 49,247,241,227,199, 53, 67, 66, 66, 46, 26, 90, 63, 43,120, 22, 74,139,252, 69, 50,153,140,148,201, 57,
-238, 21,217,188,230,235,253, 71,142, 28,177,255,100,156,  0, 34, 34, 34, 54,239,218,181,171,150,147,147,147,227,192,129,  3,177,
-119,239, 94,236,218,181, 11, 64, 97, 36,251, 82,150, 43,187,144,144,144, 58,101,  5, 25,173,238,189, 27, 90,231,141,156, 70, 78,
- 35,167, 17,229, 11, 44,194,232,245,122,  6,118,246,118,166,105,169,169,155, 38, 76, 24,159,177,100,201, 18,229,205,155, 55,161,
-142,136,128, 50, 44, 12, 87,174, 92,193,212,169, 83, 11,198,142, 27,151,164, 44,200,223,224, 96,111,103,163,215, 51, 32,132,169,
-208, 66, 66, 81, 84, 76, 84, 84, 84,113,111, 27,155, 54,109,210,105, 52, 26,152,154, 22,  6,153,222,185,115, 39,195,178, 44,218,
-181,107, 39,225,114,185,  6, 45, 65,146,152,152,248, 44, 55, 78,214,241,216,128,241,209,175, 14,157,206,242,205,208, 96,136, 72,
-138,  1,129,128,143,105, 28, 18, 31,254,146,117,111, 75,207,232,130,204,248, 78,137,137,137,207,170,154, 73,246,246,246, 11,127,
-255,253,119,187,208,208, 80, 86,165, 82, 33, 49, 49,145,157, 53,107,150,157,189,189,253,194,234,102, 60,203,178, 36, 59, 59, 27,
-132, 16,166,168,178, 50,197,251, 13,229, 72, 72, 72,120,113,228,200,145, 83,215,175, 95,135,179,179,115,137,200,250, 88, 96,113,
- 56, 28, 16, 66,176,117,235,214,108, 66,200,119,149,241, 10,  4,  2,236, 60,122,241,194,183, 91,143, 31, 62,124,245,209,241,234,
- 90,174,  0,128, 79, 81,139, 86, 46,253,222, 46,253,213,  3,242,226,254, 53,230,208,211,164, 20,157,158,157, 84,230,201,121, 50,
-182,168, 82, 86,236,219, 67,209,139, 86,254,184,196,188,120,248,242,247, 80, 89, 46,209,179,147,255,222,147,240, 63,194,249, 15,
-162,112,166,159,140, 72,165, 82, 28, 59,118,172,202, 62, 88, 62,117,200, 95,156,219,171,203, 41,147,201, 86,125,241,197, 23,178,
- 69,139, 22,109, 81, 42,149,242,162,206,155,102,237,218,181,107, 38, 77,154,148,146,152,152,104,180, 92, 25, 97,132, 17,255, 40,
-202, 28, 34,100,104,234,238,182,237, 91, 59, 31, 58,112,208,129,166, 41,135,216,216,183,143,191, 26, 53, 42,241,214,173, 91, 86,
-220,186,117, 27, 81, 20,197,168,231,204,185,159,159,155,147,249,235,158,221,181,106,215,118,241, 43, 90,236,153,101,104,234,110,
- 69, 23,204,204,204,220, 59,109,218,180, 70,251,246,237,227,173, 90,181, 74,158,152,152,120,249,193,131,  7,157,183,108,217, 34,
-220,185,115,103, 65, 94, 94,222,233,243,231,207,247,104,211,166,141, 78,173, 86, 23, 24,122, 35, 41, 41, 41,225,132, 16,111,106,
-237,174,193,175,183,254,254,  5, 75,147,102, 80,241, 64, 88,221, 93, 74, 39,191,146, 34,147,253,206,178,172,174, 58,153, 36, 18,
-137,252, 68, 34, 17,222,188,121,147,213,168, 81, 35, 53,159,207,231,185,184,184, 88,139, 68, 34,191,191, 33,176,216,172,172, 44,
-176, 44,203,  1, 64, 24,134,225, 20,237,175, 82, 12, 39, 30,143, 55,112,228,200,145,167,182,108,217,210,161,125,251,246,112,117,
-117,133, 86,171,133,135,135,  7,212,106, 53,220,221,221,161, 82,169,176, 97,195,  6,228,231,231, 79, 79, 76, 76,204,170,140, 83,
- 40, 20,130,207,231,195,211,187,126,129, 80, 40, 68,117,197, 21,  0, 72,184,148,235,235,179,187,145,154,145,206, 28,126,154,146,
- 82,160,209,119,140, 74,149,191,252,248,188,  2, 61,228,109, 70, 76, 73,  4,  0, 21,131,252, 10, 57,249,112,141, 60,183, 19, 41,
-169,233, 56, 20,150,148, 45,215, 48,157, 94,151,193, 89,165,116,254,143,112,246,219, 20,129,214, 95, 27,126,238,145,113,159,166,
-161, 40,109, 85, 50, 20,225,177, 44,193,118,111, 22,219, 55,149, 25,227,170, 58,156,165, 58, 85,219,  1,108,  7,  0,103,103,231,
-232, 41, 83,166,204, 76, 76, 76, 92, 95, 20,239,106,161,177,105, 55,194,  8, 35, 62, 75,129, 21, 19, 19, 31,238,234, 90, 99,238,
-241, 99, 71,155,177, 44, 69,179,132,200,  1,234,204,203,151, 47,179, 75,159,231,102,101,101, 58,114,204,200,  1,132, 33, 92, 66,
- 24, 61, 67, 83,119, 99, 98,226,195, 43,105, 24,159, 15, 27, 54,108, 83,155, 54,109, 70,233,245,250, 85, 81, 81, 81,151, 61, 61,
- 61,159,116,234,212,233, 91,157, 78,183, 38, 58, 58,250,178,151,151,215,149, 67,135, 14,205,210,235,245,223, 87, 81,180,232, 80,
-232,255,181,239, 83,102, 18, 69, 81, 75, 88,150, 53, 23,137, 68, 57, 33, 33, 33,  7, 90,182,108, 57,136,101, 89,115,138,162,114,
-170,203,169, 86,171, 39,231,229,229,217, 12, 28, 56, 80, 75,  8,241,236,213,171,215,156,168,168, 40,174, 92, 46,143,169, 10,207,
-187,119,239, 84, 46, 46, 46, 61,190,254,250,235, 93, 60, 30,175, 29, 10, 67, 54,176,165,242,  4, 44,203, 66,175,215,159,150,201,
-100, 21,230, 11,151,203,205,239,220,185,179, 73,165, 86, 41, 62, 63,223,208,244,229,169,245,211,182, 94,123,185, 92,169,101, 89,
- 29,195,142,123,157, 34, 47,115, 10,217,163,215,108, 61,131, 57,149,204,180,141,151,194,151,171,180, 12,163, 99,216,241,229,113,
- 86,  5,255, 43,156,  0, 48,129,218,180, 31,219, 55,149, 56,188, 23, 15, 27,126,252,251, 63,133, 34,139, 19, 11,160,242,197,206,
-139, 44, 86,149,173, 93, 88, 37,206,143, 80, 52, 75,208, 56, 83,208,  8, 35,140,248,188, 80,252,  2,254, 79,108,  0,218, 27, 57,
-141,156, 70, 78, 35,167,145,211,200,105,228, 52,114,254,219, 54,202, 40, 49,141, 48,194,  8, 35,140, 48,194,  8, 35, 62, 45,  8,
-128,246,229, 88,182, 12,142, 21, 85,157,217,  4,149,241, 27, 57,141,156, 70, 78, 35,167,145,211,200,105,228,252,255,199,249,175,
-129,113,136,208,200,105,228, 52,114, 26, 57,141,156, 70, 78, 35,167,113,136,208, 56, 68,104,132, 17, 70, 24, 97,132, 17, 70, 24,
-241, 89,195, 40,176,170,  1, 66,200, 87,132,144,139,132,144, 23,132,144, 75,132,144,175,254,  6,151,136, 16, 50,167, 20,223,  5,
- 66,200, 44, 66,136,192,152,211,159,117, 29,160,141,185, 96, 68,117, 81, 20,188, 56,180,162, 96,197, 70, 24, 97,196,255, 54, 56,
-229, 29,112,115,115,187, 71, 81, 84,157,226, 69, 98,139, 35,163, 23,127,255,248, 55,  0,176, 44, 27, 27, 30, 30,222,180, 60,206,
- 58,117,234,148,112, 22,111,132, 16,104,181, 90, 83,154,166,243,202,226,212,235,245,  9,175, 95,191, 14,250,140, 94,172,251,173,
-172,172,152,109,219,182,109,246,245,245,173,155,151,151, 87, 48,102,204,152, 46,132,144,246, 44,203, 14,173, 34, 87,125, 66,200,
-175, 13, 27, 54, 60, 62,105,210,164, 35, 62, 62, 62,102, 10,133,130,127,224,192,  1,135,109,219,182,221, 38,132,140,100, 89, 54,
-220, 88, 77, 63, 31, 56, 58, 58,  6, 16, 66, 54,185,187,187,  7, 73,165,210,199,  0, 38,202,100,178,167,198,156,249,175, 62,131,
-163,249,124,126, 39,119,119,247, 70, 42,149, 42, 43, 54, 54,246,145, 94,175,255,158,101,217,228, 79,196,111, 14,224,123,129, 64,
- 16,236,230,230, 86, 35, 42, 42, 42, 94,163,209, 60,  4,176,132,101,217,156, 79, 33,174,130,131,131,239,252,248,227,143,214,223,
-125,247,221, 29,169, 84,218, 92, 38,147, 69, 26, 75,214,136,127,  2, 53,107,214,180,144,203,229,187, 56, 28, 78,128, 64, 32,112,
- 48, 49, 49,129,137,137, 73,178, 64, 32,120, 34, 22,139, 71,157, 59,119, 46,219,152, 75,159, 88, 96,209, 52,237,252,232,209, 35,
-187,226,197,151, 25,134,  1,195, 48, 96, 89,182,228,179, 24, 69,113,150,208,166, 77, 27, 77,133, 23,227,112,106,132,134,134,218,
-153,152,252, 25,106, 73,163,209,192,215,215,151,  9, 11, 11,179,251,120, 33, 97,181, 90,141,192,192, 64,246,115,201, 44, 66,200,
- 16,107,107,107,249,251,247,113, 45,149, 42, 77,240,152,201,223,205, 29,210,247, 11,203,187,119,239,162,123,247,238, 52, 33,228,
- 43,150,101,127, 53,144, 75, 68,  8,249,101,238,220,185, 43,185,124,177,221,177,115,119,232, 13, 59,246,191,247,247,168, 77,166,
- 76,153,104, 50,105,210,164,199, 62, 62, 62,187,  9, 33, 45, 88,150, 85, 25,171,234,103, 81,254,156, 26, 53,106,156, 90,190,124,
-185, 83,114, 82, 18,214,173, 95,223, 24,192, 22,  0,141,141,185,243, 95, 43,131, 57,139, 23, 47, 94, 62,120,240, 96,232,245,122,
- 40, 20, 10,233,155, 55,111,234,205,159, 63,191, 23, 33,164, 17,203,178, 49,127,147,223,214,221,221, 61, 98,218,180,105, 86,141,
- 26, 53,  2, 69, 81,200,201,201,145,222,190,125,187,241, 47,191,252,242, 21, 33,196,139,101,217,180,191,115, 13, 75, 75,203,223,
-214,172, 89, 99, 45, 16,  8,176,103,207, 30,235,254,253,251,223,150, 74,165, 45,170, 43,178,  8, 33,148,181,181,245, 20,  0,109,
- 25,134,225,  3,120,152,149,149,181,140,101, 89,141,177,198, 24, 81, 17,108,108,108, 70,231,229,229,109, 22,139,197, 60, 51, 51,
- 51,136,197, 98,112,185, 92,240,249,252,154,150,150,150, 53, 77, 76, 76,186, 12, 26, 52,104,226,129,  3,  7,118, 25,115,235, 19,
- 10, 44,138,162, 32, 18,137,112,248,240, 97,208, 52, 13, 46,151, 11, 46,151, 11, 30,143, 87,230,247,154, 53,107, 26,210, 16,  0,
-  0,206,156, 57,  3, 51, 51, 51,152,155,155,195,203,203, 11,132, 16,  8,  4,  2,252,241,199, 31,224,114,185,224,112, 56,224,114,
-185,  8, 10, 10,250,192, 82,246,223, 64,191,122,132,  5,202, 14,222,216,181,158,  9,186, 79,254,177, 79,129, 82,211, 14,128, 60,
- 59, 43, 43,235,241,241,227, 50,127, 15, 15,222,225,195,135,253,172,172,172,  6,  1, 48,116, 33,233,169,141, 27, 55, 62,205,242,
- 36,246,195,134,143, 24, 54,138, 67,105,190, 26,247,237, 15,241, 73,233,242,177, 99,199, 30, 63,125,250,244,176,141, 27, 55, 70,
- 77,156, 56,113, 10,128, 85,134,166,223,197,197,229, 30, 77,211,197,150, 71,217,155, 55,111,  2, 62,147, 23,163, 20,192,106,  0,
- 90,  0, 43, 89,150,141, 40,117,204,131,199,227,173,210,104, 52,153,  0, 22,178, 44, 27,255, 57, 62, 44, 78, 78, 78, 94, 67,135,
- 14,181,201, 76, 79,199,186,245,235,139,119,  7, 25,178, 40,249,167, 70, 96, 96, 96, 29,161, 80,184, 26, 64,128, 74,165,114,  2,
-  0,145, 72,148,200,178,236,  9,133, 66, 49, 47, 52, 52, 84, 81,205,114,170,  1,160, 30, 10,103, 24,151,  5,118,249,242,229, 81,
-115,230,204,137,249,111,115, 18, 66, 92,236,237,237,127,236,215,175, 31,206,157, 59,135,243,231,207,107, 69, 34, 17,103,248,240,
-225,100,226,196,137,150,211,166, 77,235,  2,224,167,191,153,181, 93, 22, 47, 94,108,229,237,237,141,163, 71,143,226,217,179,103,
- 10,119,119,119, 81,235,214,173,193,225,112,172,230,206,157,219, 25,192,222,191,115,129,172,172,172,101, 75,151, 46,221,183,105,
-211, 38,211,216,216, 88, 44, 89,178,196,102,210,164, 73, 55,165, 82,105, 43, 67, 69, 86,145, 11,193, 20,  0,109,104,154,110, 49,
-124,248,112,221,228,201,147,185, 20, 69,105,215,175, 95,111,251,203, 47,191, 12,176,177,177,  9, 72, 79, 79,207,135, 17,168,192,
-144,160, 97, 24,134, 11, 64,200,178,172,170,178,223,255,159,238,221,218,218,122, 66, 86, 86,214, 22,169, 84, 10, 91, 91,219,146,
-119, 45,195, 48,144,203,229, 80, 40, 20,168, 83,167, 14,207,219,219,123,231,164, 73,147,184,155, 54,109,218,106,172, 49,159, 72,
- 96, 17, 66,192, 48, 12,184, 92,238,  7,  2,171, 88,252,124,252,189,204, 86,243,163,169,154, 20, 69,145,252,252,252, 18,113,101,
-102,102, 86, 98,  9,211,106,181,127,225,213,235,245,160, 40,138,173,136,179,156,180, 79,  0,240,  7,203,178,209,134,100, 66,105,
-206, 35,147,188,176, 79, 48,107, 80,113,200,243, 46,223, 22,126,238,  3,112,245,205,184, 85,171,154, 53,171, 49,101,193,198, 69,
-138, 12, 89,250,220,161,221, 93,220, 29,172, 69,146,236,212, 28, 75, 79,207,238,  0, 82,170,144,206,230, 99,199,142, 61,122,252,
-234, 75,161, 80,200,227,113,104,154,219,188,129,135,117, 13,115,218,220, 20, 48,143,143,137,186,247,213, 87, 95,141,153, 56,113,
-162, 85,177,192, 50,228,222,185, 92,174,243,195,135, 15,237, 56, 28, 14,154, 53,107,166,175,202,189,127, 42,148,195, 57, 63, 37,
- 37,101,160, 82,169, 68, 80, 80,208,151,132,144, 54, 44,203, 62, 33,132, 52,232,209,163,199,237, 35, 71,142,152,134,133,133,161,
-113,227,198, 34,  0,253,255,193,116,254,  5, 82,169,244, 50,128, 47,104,154,134, 90,169, 84,175, 94,251,193, 50,119, 33,165,197,
-213,127, 35,157,254,254,254, 94, 98,177,248,222,218,181,107,205,124,124,124,  8,151,203,133, 78,167, 67, 84, 84, 84,141,253,251,
-247,143,123,252,248,113,231,192,192, 64,159,143, 23, 53, 55,240,222,235,221,190,125, 91,238,234,234, 90,102,221,201,205,205,229,
-120,120,120,180,  2, 16,243, 15,112, 38,164,164,164,244,252,226,139, 47,198, 39, 39, 39, 71,232,116,186,217,  0,234,219,216,216,
-132,245,238,221, 27, 34,145,168,141, 33,  2,171,162, 50,178,179,179,235,209,180,105, 83,108,218,180,  9, 43, 87,174,108,207,178,
-236, 31,132,144,118,185,185,185, 87,191,252,242, 75, 88, 88, 88,244, 44, 75, 96, 85,161, 46,121, 52,106,212,104,231,244,233,211,
- 77,207,157, 59,  7,119,119,119,228,228,228, 96,196,136, 17,118, 27, 55,110,188, 33,149, 74, 91, 23,139,172,242, 56,  9, 33, 62,
-  2,129, 96,239,129,  3,  7, 76, 92, 93, 93, 93,121, 60, 30,229,234,234,138,204,204, 76, 40,149, 74,193, 15, 63,252,208, 64, 36,
- 18, 61,253,233,167,159,246,  2,232,253, 79, 62, 71,132,144, 28,  0,102,  0, 44,170, 50,188, 90,193,189,231,  0, 16,148,106,239,
- 32, 20, 10, 33, 20, 10, 33, 16,  8, 16, 27, 27,123,140,166,233, 17, 69, 29,185, 74, 57,201,159, 61,120, 63, 66,200, 35,154,166,
- 43,252,253,241, 82,102,255, 68,187, 68,  8,113, 38,132,108,  0,208,  6,133,126,212, 55,237,236,236,166, 38, 39, 39,191, 55,148,
- 83, 42,149, 90,231,231,231,255, 36,149, 74, 97,103,103, 87, 44, 54, 17, 20, 20,  4,165, 82,137,151, 47, 95,130, 97, 24, 68, 71,
- 71,195,204,204, 12, 13, 26, 52,248,105,241,226,197, 71, 23, 46, 92,152,241,159,188,247,127,141,192, 42, 86,178, 28, 14,231,  3,
-129,245,241, 86, 44,134,  8, 33,149, 46, 84, 76,  8,161,212,106,117,137,184, 50, 55, 55, 47,249,175, 78,167, 43, 83, 96, 85, 83,
-153,251, 50, 12, 83,135, 16,178,221, 80,145,245, 49,134, 13, 27,246, 23,127,142, 57,115,230, 36,164,167,167, 51,125, 58,250, 73,
- 34, 46,200,146,220, 44, 77, 68,182,166,166,181,133,150, 86, 22,249,249,249,183,  0,152, 84,225, 18, 78,222,222,222,230,155,247,
- 93,144,141,249,102,249,210, 32, 87,107, 51, 95,103, 27, 75,  7,115, 17,223,132, 34,114,161, 78,155, 32,145, 72,124,  0,100, 84,
- 37,221, 20, 69,193,204,204, 12,167, 79,159, 70,177,255,220,103,  2, 75,133, 66,129,172,172, 44,108,219,182,205,108,252,248,241,
-215,  9, 33, 83,123,246,236,185,233,200,145, 35,146,236,236,108,104, 52, 26,  0, 80,124,134,207,201, 82, 75, 75,203,150,109,218,
-180,225, 31, 60,124,152,207,178,172, 28,133,203, 17,229,179,108, 57, 11, 87,255,  7, 33, 20, 10,191, 93,182,108,153,153,143,143,
- 15,201,200,200,  0,195, 48,160, 40, 10, 54, 54, 54,152, 57,115,166,112,254,252,249, 78,175, 95,191,158,139,106, 44, 59,  3,128,
-148, 39,132,  0,192,204,204, 76,135,170, 79,142, 41,147, 83,167,211,145,102,205,154,205, 76, 79, 79,111,160, 80, 40,126, 48,224,
-197,163,  3,112,186,104, 43,110, 83,158, 70, 68, 68, 40,250,247,239, 47,170, 93,187,118,240,223,205, 91, 15, 15,143, 38, 92, 46,
- 23, 15, 31, 62, 84,  1,184, 89,180,251,230,179,103,207, 84,189,123,247, 22,212,168, 81,163,137,161, 92, 82,169,212,195,205,205,
-237,138,141,141,141,168,120,218,118,215,174, 93,185,171, 87,175, 54, 77, 72, 72,128, 70,163,193,156, 57,115,208,173, 91, 55, 88,
- 90, 90, 98,228,200,145,246, 59,118,236,248, 13, 64, 96,  5,109,168,144,207,231,255,250,230,205, 27,119, 71, 71, 71,209,131,  7,
- 15,224,235,235,139,244,244,116, 36, 39, 39, 35, 63, 63, 31,201,201,201, 24, 53,106,148,221,186,117,235,164,159,209, 51,148,205,
-227,241, 32, 22,139, 45,178,179,179,115,254,  6,143,  0,  0,191,180,184, 18,  8,  4, 16,  8,  4,248,216,197,228,255, 35,  8, 33,
- 78,132,144,112, 30,143, 39, 16,139,197, 60,138,162, 32,145, 72, 58,214,168, 81,227,229, 87, 95,125, 85,255,215, 95,127,125,103,
-  8,143, 82,169,252, 85, 36, 18,113,109,109,109,  1,  0, 29, 58,116,192,240,225,195,145,150,150,198,200,100, 50,120,121,121, 81,
- 55,110,220, 64, 74, 74, 10,158, 62,125,138, 70,141, 26,113,173,172,172,126,  5,208,217, 40,155, 62,161,  5,139,195,225,148,108,
-101, 89,174,138,183,143, 29,223,203,227,212,235,245,176,183,183,135, 88, 44,134, 88, 44, 46,237,204,254, 23,126,150,101,171, 53,
- 68, 40,145, 72, 48,120,240, 96,118,235,214,173,227,139, 68,214, 27, 67,255,219,111, 83, 68,137,213,234, 99,248,250,250,222,157,
- 55,111, 94,167, 75,151, 46,101,  5,185,214,230, 72,100,239,243,133,102, 22, 22,112,174,217,245,171,126,  3,238,  1, 56, 80,133,
-100,202, 84, 42, 21,207,205, 89,172,166, 40, 37,169, 41,224,152, 58, 74,120,  2,  7, 75, 75, 39,158, 90,149,106,102,105,201, 47,
- 26, 50,147, 85, 70, 84, 60,121,128, 16,  2, 11, 11, 11,110,209, 39,236,236,236,  4,245,235,215, 79,161, 40, 10, 44,203,202,158,
- 63,127,110,240,112,161,171,171,107,  8, 69, 81,206,132,144, 15, 38, 36,148,222, 24,134, 73,120,249,242,165,161, 19, 16,230,249,
-249,249,181,218,178,101,139,173,187,187, 59,182,109,219,102,118,244,232,209,189,191,253,246, 27,178,179,179,241,238,221, 59,140,
- 26, 53, 42, 23,133,195,136,159, 21,172,172,172,238,244,235,215, 15, 59,119,238,100,139, 58, 17, 18, 66,136,175,185,185,249,235,
-240,240,240,255,186,159, 11, 69, 81, 29,189,188,188, 72, 78, 78, 14, 24,134,  1, 77,211, 37, 29, 33,154,166,241,237,183,223,138,
- 70,141, 26, 53,191, 73,147, 38, 51,185, 92,110,174, 78,167, 59,152,159,159,255,195,139, 23, 47, 62, 43,103,213, 22, 45, 90,124,
- 19, 31, 31,223,173, 86,173, 90,103,254, 70,111,159,109,216,176,161, 26,128,136,166,105,238, 39,120,129,209, 69,237,145,178,120,
-113,120,150,101,117,129,129,129,202,162,151, 59, 93,133,122,243,219,254,253,251,157,157,157,157,161,213,106,161,211,233,144,159,
-159,143, 27, 55,110, 64,165, 82, 65,167,211,193,203,203, 11, 43, 87,174, 84, 78,156, 56, 81,120,232,208,161, 84,133, 66, 49,164,
- 18,218,169, 71,143, 30,149, 56, 58, 58,138, 20, 10,  5, 98, 98, 98, 16, 24, 24,136,188,188, 60,200,229,114, 20, 20, 20, 64,163,
-209, 32, 55, 55,215, 66,175,215,171, 63,155, 23, 13,135,  3,129, 64,  0, 30,143,151, 93,171, 86, 45, 16, 66,132,239,222,189,171,
-206,144,155, 25,128, 92, 46,151,203, 47, 45,172,  4,  2,  1,158, 63,127,126,168, 60,235, 85, 69,245,167, 42,191, 63,  3,129,181,
-129,199,227,  9,172,172,172,120,197,251, 52, 26, 13,207,210,210, 18,181,107,215,222,  4,160,139,129,109,136,191,165,165, 37,  8,
- 33,224,241,120, 24, 51,102, 12, 30, 61,122,116, 34, 33, 33,225,171,212,212, 84, 20, 20, 20,252,106,110,110,222, 43, 53, 53, 21,
-122,189, 30,111,223,190,133,191,191,191,191, 81, 50,125, 98, 11, 86,121,130,234, 99,193,101,136,181, 68,163,209,152,116,237,218,
-149, 41,253,146, 46,250, 31,169, 64, 96, 85,171,130,115,185, 92,211,  9, 19, 38,228,109,221,186,117, 28, 33,100,  7,203,178, 81,
-213,205,164, 51,199, 14,216,175,252,126,206,247, 86,210,218,110,179,103,207,230,244,238,221,251,218,158, 61,123, 26, 90,121,123,
-127,113,253,242,126,251, 77,179,231,158, 60,117,234, 84,129,161, 14,238, 69,184,123,226,196,  9,199,233, 83, 38,242,190,255,118,
-234, 69, 51,119, 27,190,  9,177,146,  8, 85,242, 52, 19,176, 10, 65, 93,175,110,103, 47, 93,138,  7,112,199,128,198,203,249,225,
-195,135,118, 22, 22, 22,  0, 10, 39,  7, 88, 88, 88, 96,235,214,173,150,197,150, 66, 67,134, 11, 63,122,  0,157,195,194,194,236,
- 76, 76, 76, 32,151,203, 75, 94,  8, 44,203,150, 52,150, 45, 91,182,172,202,139, 48,134, 16,210,242,235,175,191,190,181,101,203,
- 22, 91, 55, 55, 55, 44, 93,186, 20, 25, 25, 25,136,139,139,195,144, 33, 67,114, 99, 98, 98,218,148,246,205,250, 28,208,160, 65,
-  3,246,238,221,187,184,120,241, 34,190,252,242, 75,114,234,212, 41,141, 94,175,231, 37, 38, 38, 62,255,167,210,164,211,233, 76,
-121, 60, 94,201,176,122,177,176, 42,222,156,157,157,113,245,234, 85, 78, 65, 65,  1, 39, 61, 61, 93,252,203, 47,191, 76, 14,  9,
-  9,113,  4, 48,232,159,204,203,173, 91,183,214, 26, 51,102, 76, 28,135,195, 97, 59,117,234, 52,244,253,251,247, 61, 29, 29, 29,
-255,184,126,253,250, 90,  0, 85, 14, 87, 80,191,126,253, 16, 14,135,227,204,178, 44,239,228,201,147, 90,189, 94,207,107,208,160,
- 65,202, 71,193, 16,161,211,233, 18, 34, 35, 35,131, 12,225, 19, 10,133,188, 29, 59,118,104,149, 74, 37,207,215,215, 55,165, 20,
- 15,239,212,169, 83, 90,173, 86,203,243,244,244, 12, 49,100,102,115,102,102,230,144,105,211,166,221, 62,124,248,176, 13, 77,211,
-120,255,254, 61, 50, 50, 50, 96, 97, 97,129, 95,127,253, 21,181,107,215,198,149, 43, 87, 50,117, 58,221,232,157, 59,119,206, 87,
- 40, 20, 67, 12,240,193,106, 25, 28, 28, 92, 43, 59, 59, 27, 22, 22, 22,144,203,229,  8,  9,  9,129,143,143, 15,100, 50, 25, 40,
-138,130,133,133,  5,182,108,217, 82, 64,  8,201,252, 28,158, 33,154,166, 75,172, 76,165, 68,145,178, 73,147, 38,184,115,231,206,
-239, 85, 17, 69, 44,203,170,185, 92,238,  7,194,170,248, 59, 77,211, 85, 30,242,208,235,245, 60, 66,136, 63,138,252,  3, 43,251,
-253, 25,160,149, 88, 44,230,149, 81,215,120, 30, 30, 30, 45, 12, 37,225,243,249,214, 34,145,168,144,176, 85, 43,164,166,166,234,
- 93, 93, 93,  7,244,239,223, 95, 11,  0,227,198,141, 27,144,154,154,170,212,233,116, 52, 77,211, 72, 75, 75, 67,237,218,181,173,
-141,146,233, 63, 96,193,170,200,114, 85,218,130, 85, 89, 37,164, 40, 42, 59, 52, 52, 84, 34,145, 72, 74,246,105,181, 90,248,251,
-251, 51, 12,195,144,143,175, 83,156,142,234,130,203,229,154,126,247,221,119,217, 91,182,108,249, 10,192, 60, 67,254,115,100,146,
- 23,246,125, 36,174,182,173, 92,178,233,231,149,203,172,162, 47,238,193,174,141,107,244, 92,190, 73,136,191,191,127,203,156,156,
- 28,149,133, 68,133,228, 12,156, 96, 89,246,183, 42,244, 66, 40,  0,135,238,223,191,255,164, 67,135, 14, 15,118, 31, 58,110, 37,
-139,137,185, 47,200, 77, 79, 50,171,235,206,225, 57,213,234, 37, 87,171,185,189,122,245, 50,  1,176,209,  0, 62,196,197,197,225,
-222,189,123, 48, 51, 51,131,153,153, 25, 44, 44, 44, 74,190, 87, 39, 15,139,135,109,207,158, 61, 11,137, 68,130,162,169,187,144,
- 72, 36,224,243,249, 40, 93,134, 85, 16, 89,145,132,144,169,199,143, 31, 63,184,124,249,114,100,102,102, 66, 46,151, 99,225,194,
-133,136,137,137,153,198,178,236,147,207,233,225,240,245,245,101,239,223,191,143,187,119,239, 66, 46,151,227,231,159,127,134,163,
-163, 99, 91,  0, 11,254,201,116, 49, 12,195, 43,182, 40,150, 22, 86,165,173, 88, 52, 77, 67, 40, 20,194,198,198,  6,115,231,206,
-229,125,249,229,151,221,254,201, 52,175, 90,181,170,238,134, 13, 27,126,217,183,111,223,133, 33, 67,134, 28,126,241,226,197,  8,
-115,115,243,231,215,174, 93, 91, 38, 16,  8,152,106, 90, 69,156,159, 60,121, 98, 87,250,145,103, 24, 70,172,211,233,160,211,233,
-160,213,106, 81, 80, 80,128,246,237,219, 27,204,247,232,209, 35, 49,  0, 44, 88,176,128, 11, 64,204, 48, 12,244,122, 61,138, 57,
- 11, 10, 10,184,237,218,181,115, 54,200, 68, 45,147, 69, 74,165,210, 22,253,251,247,191,119,240,224, 65,203, 90,181,106, 33, 49,
- 49, 17,137,137,137,168, 91,183, 46, 54,110,220, 40,103, 89,182, 89,145,168, 58,101,224,109, 75, 45, 45, 45,185,113,113,113,208,
-233,116,240,247,247,199,150, 45, 91, 48, 96,192,  0,212,175, 95, 31,185,185,185,  8, 15, 15,199,222,189,123, 45,121, 60, 94,159,
-127,250, 25,162, 40,234, 47,226,170,244, 86,205, 14,134,153, 80, 40,204, 21,  8,  4,252, 98,255,171, 71,143, 30, 85,217,122, 85,
-170, 93,122, 82,149,223,255, 36, 76, 77, 77, 97, 98, 98,  2,173,246,195,219,148, 72, 36,168, 91,183,174,193, 60, 38, 38, 38,164,
-216,136,161,213,106,145,148,148,164,127,241,226,133, 62, 32,160,112,144,195,209,209, 81,255,240,225, 67,189, 82,169,164, 77, 77,
- 77, 81, 52, 42, 66, 96,196,167,179, 96, 21, 91, 43, 42,178, 92, 21,127, 47,182, 68, 85,246,176,209, 52,141,139, 23, 47,150, 84,
- 20, 47, 47,175,146,107,125,106,129,101,109,109, 45, 15, 14, 14, 54,139,143,143, 63, 80,157,255, 23,139,171,229, 75, 23, 90,101,
-190,122,128,  4, 89, 18, 50, 83,181,161,119,158,191,189, 12,224, 50,  0, 96,187,247, 13,140,123,101,176,184,242,182, 21,251, 53,
-144,154,158,248,162, 75,183, 26,253,199,126, 67, 77,156, 56,177,241,136, 17, 35, 50,134, 12, 25, 50, 81, 36, 18,121,235,116,186,
-140,179,151, 46, 69,247,234,213,203, 65,167,211, 13,103, 89,214, 16,159,164,132,193,131,  7,243,  8, 33,176,179,179,227,238,219,
-183,207,210,204,204, 12, 35, 70,140,200,122,251,246,173,182,168, 39,150, 82,197,219, 79,104,214,172,217, 95,134,  5,139, 95,236,
-197,150,129, 42,138, 54,255,110,221,186,237, 60,124,248, 48,210,211,211, 33,151,203,193,229,114,177,122,245,106,196,197,197,253,
- 68,  8,121,241,185, 52,102,126,126,126,236,195,135, 15,241,252,249,115,168, 84, 42,140, 30, 61,186,180,143, 97,135,127,122,164,
- 32, 49, 49, 17,251,247,239,  7,195, 48, 24, 50,100,  8,106,213,170, 85, 34,172,146,147,147,177,123,247,110,232,245,122,140, 25,
- 51,  6, 53,107,214,132, 86,171, 21,182,110,221,154,115,227,198, 13,221, 63,145,224,233,211,167, 71,159, 56,113,226, 66,124,124,
-124,231,149, 43, 87,182, 34,132, 48, 51,103,206, 92, 97,102,102,246,183,102, 95,102,229,228,225,245,155,247, 37,  2,232,227,205,
-214,198,170,202,124, 81, 49,241, 37,255,215,235, 75,243,233, 97,109,101, 89, 37,190,164,164,164,130,140,140, 12,249,232,209,163,
- 45,118,238,220, 73,234,214,173,139,216,216, 88,112,185, 92,152,154,154, 22, 68, 68, 68, 84, 53, 52, 67, 98,102,102,166, 59, 77,
-211,188, 55,111,222,192,197,197,  5,193,193,193,248,225,135, 31,144,158,158, 14,157, 78,  7, 59, 59, 59, 70,171,213,134,169,213,
-234, 91,255,244,115, 84,218,202, 84,122,187,123,247,238,239, 52, 77, 83,  0,206,  0,168,146,192,102, 89, 86, 93,179,102,205, 15,
-184,171, 99,189,250, 15, 90,236,254, 99, 51, 19, 61, 60, 60,110, 74, 36,146,110,175, 95,191,254,192,138, 53,120,240, 96,141,155,
-155,219,109, 67,121,204,204,204,178,120, 60,158,181, 82,169,196,253,251,247,225,237,237,205,203,201,201, 89, 78,  8,153, 83,212,
-185, 92,158,146,146,194,147, 74, 11,221,248, 60, 61, 61,145,151,151,151,101,148, 76,159, 88, 96,149,101,185, 42, 75,100,209,116,
-229,174,  9,132, 16, 40, 20, 10, 72, 36,146,146,173,216,207,170, 44,129, 85,228,251, 83,173, 33,194, 34,113, 37, 58,120,240,224,
-239, 27, 55,110,188,107,232,255, 74,251, 96,109, 95,187,116,101,177,184,122,118,247, 10, 78, 69,228,164,207, 90,190,126, 67,117,
- 51,219,199, 86,226,235, 96,111,115, 99,245,143, 75,204,162, 47,238,197,225,237,235,216,103,143, 30, 53, 28,255,232, 81,159,241,
-227,199, 91,  1, 72,  2,144,  8,224, 62,128,159, 12, 20, 87,136,140,140, 44,  9,238, 26, 16, 16, 16,111,105,105,105, 41, 18,137,
- 32,147,201, 84, 79,158, 60,169,150,163,107, 84, 84,212, 39, 13,238, 74,  8,241,232,222,189,251,173, 99,199,142, 73,178,179,179,
-241,254,253,123,204,156, 57, 19,155, 55,111,134,153,153, 25,206,157, 59,103,218,173, 91,183, 27,132,144,166,255,116,112, 85,127,
-127,127,246,241,227,199,120,247,238, 29,116, 58, 29,122,244,232, 81,233,  4,142,255,178,  5,139,157, 54,109, 26,118,238,220,  9,
-154,166,241,213, 87, 95, 33, 55, 55,183,228,184,149,149, 85, 89,199,232,162,231,253, 31, 17, 88, 28, 14,135,189,121,243,230,202,
- 86,173, 90, 33, 62, 62,190,115, 96, 96,224,207, 35, 70,140, 72,252,187,188,150,230,166,240,243,113,133, 74,165,130, 74,165,130,
- 84, 42, 69, 94, 94, 30,162,163,163,161, 82,169, 96,111,103, 81,101,190,128,250,117, 75,248,236,236,236, 32,151,203,241,246,237,
- 91,168,213,106,216,216, 88, 86,165,206,215,232,216,177,227,245,223,127,255,221,250,247,223,127, 87,247,238,221,155,191,100,201,
- 18, 98,102,102,134,212,212, 84, 84,211,189,231,230,157, 59,119,106,181,111,223,222,243,213,171, 87,184,121,243, 38,212,106, 53,
-  2,  2,  2, 16, 21, 21,133, 38, 77,154, 32, 63, 63,255,225,227,199,143, 79,127, 14,117,181,120,248,174,120, 11,  9,  9, 57,196,
-227,241, 88,  0,213,178, 54, 21, 35, 46, 46, 78,224,235,235,171, 18, 10,133,252, 34,177,246,183,248, 62,113, 91,247,183,102, 38,
- 86,  4, 87, 87,215,105,206,206,206,237,  3,  2,  2,240,234,213, 43,158, 64, 32,192,208,161, 67, 53, 93,186,116,209,112, 56, 28,
-131, 39,220,136, 68,162, 87, 38, 38, 38, 45, 85, 42, 21,212,106, 53,174, 92,185,  2,107,107,235, 89,221,187,119,159,154,148,148,
-  4,153, 76,198,231,243,249, 37,254,183,173, 91,183, 70, 70, 70,198, 43,163,100,250, 68,  2,171,184,142, 24, 50, 60,104,168, 15,
- 22, 69, 81, 80,171,213,144, 72, 36, 16,139,197,144, 72, 36, 37,215, 33,132,148, 41,176,170,131, 26, 53,106, 32, 56, 56, 88,116,
-248,240,225,223,214,172, 89,115,175, 58, 28, 71,127,223,239,104,206, 20,212,144, 61, 60,143,200,231,161, 56, 17,158,157, 62,107,
-249,250, 41,221,251, 12, 74,249, 88,144, 29, 25,103, 64,207,195, 78, 82,223,201,222,250,198,218, 85,203,205, 50, 95, 61, 64, 82,
-114, 50,206, 63,124, 28,170, 42,244, 13,251,225, 19, 62,220, 40, 30, 91,255,156, 32, 16,  8,166, 29, 61,122, 84,146,157,157,141,
-152,152, 24, 12, 25, 50, 36,251,221,187,119, 95,247,236,217,115,243,229,203,151, 45, 45, 44, 44,112,249,242,101,211, 26, 53,106,
- 44,  7,208,237, 31,108, 28, 89,189, 94,143,204,204, 66,247,149,102,205,154,125, 86,226, 10,  0, 66, 66, 66,120,221,187,119,255,
-  3, 64,219, 87,175, 94,129, 97,152,123,161,161,161,205,138,143, 87,116,204, 16,253,150,151,151,199, 53, 53, 53, 45,243,101,197,
-227,241,120, 85,181, 56,148,230,188,123,247,238,138,181,107,215,158,152, 49, 99,198,155,191,201, 89,166,  5,171, 91,183,110, 80,
-168, 52, 72, 72,201,129, 94,175,131, 66,147,250,183, 44, 88,221,186,117, 67,129, 82,141,184,164, 76,232,116,122,228, 41,116,134,
-214, 35,241, 23, 95,124,113,233,224,193,131, 14,247,239,223,135, 74,165, 98, 66, 66, 66,222,142, 29, 59,214,108,212,168, 81,214,
-229,133,182, 49,  0, 27,  7, 13, 26,212,247,238,221,187,153,158,158,158, 86, 15, 31, 62, 68,106,106, 42,116, 58, 29,218,182,109,
- 11, 62,159, 31,183,124,249,114, 30, 12,112, 45,248,111,  9, 44,129, 64,128,240,240,240, 98, 97, 53,236, 83,  9, 33, 62,159, 95,
-237, 97,198,255, 85,252,246,219,111,137,123,246,236,241,113,114,114,218, 48,108,216,176, 54, 82,169,148, 18,  8,  4, 55, 57, 28,
-206, 84,  0,239, 13,229,225,241,120, 35, 44, 44, 44,162, 41,138,162, 19, 19, 19,241,230,205, 27,196,198,198,  2,  0,191,160,160,
-  0,118,118,118, 37, 70,147, 65,131,  6,161, 70,141, 26,250,168,168,168, 17, 70,201,244,137, 45, 88, 75,150, 44,193,246,237,219,
- 49,110, 92,197, 42,226,204,153, 51,192, 71, 67,132, 69,203,199, 92, 45,253,242,215,235,245, 88,184,112,225,  7,255, 43, 30,126,
-250,250,235,175, 63,224, 60,121,242,228, 95,134,  8, 63,230, 44, 11,169,169,169,175,142, 28, 57,242,120,213,170, 85, 15, 13,108,
- 12, 75, 56,139,125,176,250, 14, 30,154,180,105,197,247, 47,246,157,185, 86, 63, 73,193, 38,205, 90,190,126,198,199,226,202, 80,
- 78,111,  7, 19,111,103, 59,235,155,107, 86, 45, 55, 47,182,134, 29, 12, 75,206,129,142, 29, 87,149,194, 50,228,222,117, 58, 93,
-130,191,191, 63, 15, 48,108, 88,208, 16,206,106,136,148,191,112,170, 84, 42, 60,120,240,  0,  0, 48,114,228,200,236,119,239,222,
-181,100, 89,246, 37, 33,228, 85,199,142, 29,111, 94,186,116,201,146, 97, 24,160,156,176, 20,255,173,116, 22,229, 27, 56, 28, 14,
-220,221,221,171, 44,174,254, 91,233, 76, 74, 74, 26, 55,126,252,248,237, 42,149,138, 35,151,203,199, 25,122,172,178,116, 30, 57,
-114,228,141,187,187,123, 43,148, 31,138,129, 41,178,176, 86,155,115,195,134, 13,  0,224,249,119, 56,203,179, 96, 29, 58,116,  8,
- 12,195,160,134,131,  5, 84, 42, 21,196, 98,113,149, 56, 63,182, 96, 29, 62,124, 24, 12,195,160,166,163, 21,212,106,117,185,157,
-151,143, 57,173,173,173,215,237,219,183,207, 57, 34, 34,  2,  9,  9,  9, 88,191,126,253,251,180,180,180, 46, 28, 14, 71,240,243,
-207, 63,223,232,218,181,171,189, 78,167, 83, 85,181,220, 89,150, 85, 17, 66, 70, 52,109,218,244,215,101,203,150,197,122,121,121,
-213,108,214,172,153, 69, 70, 70, 70,218,147, 39, 79,222,110,223,190,221, 68,167,211,141, 40,111,232,233,191,249, 28,  1, 64, 98,
- 98,226,105,  0,220,170, 10, 43, 67,210,249,232,209,163,195, 69,220,231, 13,225,254,111,221,251,223,157,153, 88, 89, 58, 71,140,
- 24,145,128,143,226,155, 85, 53,157,151, 47, 95,126, 55,120,240,224,165,245,235,215, 95,100, 98, 98,130,200,200,200,146,176, 72,
-197,117,156, 16,130,126,253,250,225,235,175,191,198,165, 75,151,150,246,237,219,247,221,127, 58, 63,255, 53,  2, 75,175,215,199,
-191,123,247,206,113,223,190,125, 52, 33,  4,191,253,246, 27, 74, 79,217,167,105, 26, 20, 69,129,195, 41,164,120,240,224,129,174,
-178,152, 83,122,189, 62, 62, 36, 36,196,126,239,222,189,220, 98,147,113, 98, 98, 34, 24,134, 97, 82, 82, 82,168,223,127,255,189,
-196, 26,198,225,112,240,224,193,  3,157, 70,163,137,171,234, 77, 69, 70, 70,126,146,222,219,173,151,239,166, 94, 58,127,210,166,
-113,112,139,108, 51, 43,171, 50,187,174,197, 17,223, 43,172,220, 28,234,135,149, 63, 46,177, 40, 22, 87,135,194,146,179,149, 42,
-125,155, 87,105,  5,207, 62,117,129, 62,123,246,172,233,103, 90,215, 22,182,106,213,138,  1, 96,  3, 96,126,241,172,206, 34,145,
-213,184,110,221,186, 51,  0,136,  0, 44,252, 39,173, 87,165, 67,131,124,110,150,171,210,  8, 13, 13,141,  5,208,174,170,199, 42,
- 67,223,190,125, 99, 80, 70,192,207,191,131,255,  4,103, 49, 50,179,115, 17,243, 46, 17,133,206,232, 12,244,239, 83, 74,252,166,
-180, 90, 29, 50,115,171, 20, 70, 14, 89, 57,121,136,126,155, 88,180, 52,152, 30,122,189,172,136,175,208,209,157,205, 42,168,148,
-131,203,229, 54,223,176, 97, 67, 23,138,162,168,  7, 15, 30,168, 86,173, 90, 21,159,150,150,214,131,101,217, 56,  0,144, 74,165,
-173, 79,158, 60,249,155,  1, 33, 25,202,235,248,134, 19, 66,154,204,158, 61,123, 10,128,230,  0,106,  2,136, 67,225,140,227,141,
-159, 89,196,241, 97,255,163,220,213,198,255,202,204,196,223,127,255,125,241,215, 95,127,205,  9, 14, 14,158,219,176, 97, 67,234,
-237,219,183, 72, 77, 77,  5,135,195,129,135,135,  7, 58,116,232,  0, 23, 23, 23,230,220,185,115, 63,246,234,213,107, 49,140,248,
-116,  2, 43, 61, 61,189,227,176, 97,195,174, 80, 20, 85,187,244, 48, 94, 89,159,  0,192, 48,204,187,148,148,148, 10,131,144,165,
-167,167,119, 92,184,112,225, 21, 14,135, 83,187, 84,252, 43, 85, 70, 70,198,215,253,250,245,219,194,229,114,  5,165,173, 93, 12,
-195,188, 79, 74, 74,250,175, 58, 20,127, 28,  7,171, 99,151,158,233,127,151,211,132, 71,185, 69,158,219,137,148,212,116, 28, 10,
- 75,206,202, 83,235, 91, 71,166,201, 95,252,155, 42, 26,203,178,169,  0,190, 46,231,216, 27,  0,227, 62,131, 52,146, 34,145,101,
-156, 45,243, 63,  0,157, 78,151,208,190,109,107,124, 28,150,225,227,223,122,189, 62,193, 80,190,118,109, 90,149,203, 83,252,189,
- 50, 62,154,166,103,  4,  7,  7,211, 51,102,204, 72,185,112,225,194, 31, 89, 89, 89,211, 89,150, 45, 81,102, 69,179,  6,  3,255,
-102, 93, 85,161,112,133,135, 85,198,154,240, 89,182,119,255, 19, 51, 19,183,108,217,178, 96,214,172, 89,123,157,157,157,247, 55,
-111,222,220,211,205,205,205,204,212,212, 20,185,185,185,121, 89, 89, 89,175,207,158, 61, 59,100,216,176, 97,177,198, 18,253,196,
-  2, 43, 45, 45, 77, 14,160,201,167,188, 88, 37,156,181, 62,155, 46,151,106,213,  1,108, 95,245,193, 58,132,197,226,171,204,223,
-149, 72,131, 28,133,110,226,198, 75, 47,215,168,116, 44,163,209, 49, 35, 35, 83,229,225,198,170,247,217, 54,140, 70,113,245, 63,
-130, 23, 47, 94,  4,125,142,124,106,181,122,106,211,166, 77,127,210,235,245,107,181, 90,237, 29, 99, 73, 25,241, 57, 99,213,170,
- 85,177,197,239,229,126,253,250,209,  0,112,228,200, 17,189, 49,103,254,131,  2,235,223,138, 35, 47,255,124,193,126, 44,156, 42,
-251, 93, 30, 94, 39,231,223,252,187, 61, 86, 35,140, 48,226,127, 70,164,199,  1,232, 97,204,  9, 35,254,231,222,127, 70, 97,245,
- 73, 65, 25,179,192,  8, 35,140, 48,194,  8, 35,140, 48,226,211,130,  0,104, 95, 78, 47,204,224,217,  1,132,144,246, 85,189,176,
-  1, 43,134, 27, 57,141,156, 70, 78, 35,167,145,211,200,105,228,252,127,198,249,175, 65,105, 71,206, 79,189,  1,104,111,228, 52,
-114, 26, 57,141,156, 70, 78, 35,167,145,211,200,249,111,219,140, 67,132, 70, 24, 97,132, 17, 70, 24, 97,132, 17,159, 24, 70, 39,
-119, 35,140, 48,194,136, 82,144, 74,165,221,  1, 44, 70,161, 11,197,114,153, 76,118,216,152, 43, 70,252,127,130,173,173,173,196,
-218,218,250, 15,138,162,106,  1, 31,134, 92, 42, 35,184, 55,244,122,125, 82,102,102,102,135,228,228,228,244,255, 38,231,191, 78,
- 96,181,173,107,209,194,181,142,203,239,105,169,233, 97,249,202,220, 81,127,188,206,203,172,206,133,  9, 33,214,124, 62,127,128,
- 68, 34,105,207,178,172, 43, 77,211, 17, 57, 57, 57, 87,181, 90,237, 65,150,101,243,141,143,128, 17,255, 52,252,253,253, 27,240,
-249,252, 89,132,144,198, 58,157,206,153,203,229,202,  0, 60, 84,169, 84,171,195,194,194,194,140, 57,244,255,  3,132, 16,202,209,
-209,241, 39, 11, 11,139,224,236,236,236, 33,  0,230, 70, 70, 70,250, 82, 20,  5, 31, 31,159,185, 82,169, 52,218,204,204,108, 87,
-110,110,238,189,164,164,164,169, 85, 89, 59,206,136,207, 23,110,110,110, 33, 20, 69, 57, 23, 47,201,246,177, 32, 40, 75, 32,176,
- 44, 27, 27, 30, 30, 94,110, 48,103,103,103,103, 87, 51, 51,179, 45,  0, 26,126, 44, 42, 62, 70,209, 48,219,227,220,220,220,175,
- 19, 18, 18,202, 12,196,107,101,101,101,106,103,103,183,152, 16,210,143,162,168, 74, 23,252,101, 24, 70,207,178,236,145,212,212,
-212,133,153,153,153,121,229,157,103,109,109,125,245,214,173, 91, 13,109,108,108, 42, 13, 75,163,211,233,144,152,152,104,219,181,
-107,215, 91,  0,188,254,155,156,255, 58,129,  5,150, 26,186,122,222, 24,167,180,248,104,167,185, 27,142,123,180,240,178,105,125,
- 59, 34, 61,185, 42, 20, 34,145,104,128,175,175,239,198,159,126,250,201,218,197,197,133,136,197, 98, 36, 37, 37,121, 61,121,242,
-164,215,162, 69,139, 22,114,185,220, 17, 90,173,246,202,223,108, 52, 45,172,196,156, 89, 25,114,237,119,198,166,196,136,170,160,
- 95,191,126,116,124,124,252, 34, 27, 27,155,111,231,204,153, 35,168, 93,187, 54, 76, 76, 76,144,154,154, 90,243,205,155, 55, 53,
- 54,111,222,220,189,105,211,166, 63,171,213,234,249,161,161,161, 90, 99,142,253,111,195,209,209,241,167, 83,167, 78, 77,242,244,
-244, 68,203,150, 45,239,249,251,251,155,137,197, 98, 92,188,120, 17,110,110,110,245,204,204,204, 30,110,219,182,141,187,120,241,
- 98,191,227,199,143,  3,192,100, 99,174,253,239,131,162, 40,231,176,176, 48, 59,177, 88, 12,189, 94, 95, 20,189,159,  1,203,178,
- 37,159,165,197,144, 94,175, 71,155, 54,109, 52, 21,113, 10,133,194,205,207,159, 63,111, 95,188,142, 95, 41, 33, 85, 38,100, 50,
- 89,251, 54,109,218,108,  6, 80,102, 64,109, 59, 59,187,197,253,251,247,159, 86,191,126,125,  0, 40, 73,103,241,103,122,122, 58,
- 38, 78,156, 88,114, 13,134, 97,112,235,214,173, 41,223,124,243, 13,  0,124, 83,193,189,215,178,177,177, 33,149, 45,129,183,104,
-209, 34, 44, 90,180,  8, 27, 55,110, 36, 28, 14,199,162,146,252,252,228,156,255, 58,129, 69, 40,114,126,211,182,189,163,166,247,
-111, 76, 86,141,109,225, 62,111,215,141,251,237,235, 88,182,188, 26,155, 21,111,160,184,154, 50,126,252,248, 21, 75,150, 44, 17,
-190,126,253, 26,225,225,225,208,233,116, 48, 53, 53,133,175,175, 47,117,254,252,121,199,169, 83,167, 30,229,243,249, 35,213,106,
-245,241,234,222,152,131, 25,119,181, 68, 64, 13,230,115, 56, 15,213, 58,221,233,207, 49,243, 93, 92, 92, 46,107,181,218,149,137,
-137,137,215,255, 87, 42,140, 84, 42,109,198,231,243, 23,190,123,247,174, 19,203,178,186,255,143, 15, 69, 92, 92,220,146,230,205,
-155, 79, 95,180,104,145,224,237,219,183,136,138,138,130, 76, 38, 67,237,218,181,225,226,226, 66, 54,110,220, 40,252,249,231,159,
- 39, 63,125,250,148, 11, 96,122, 85, 44, 37, 14, 14, 14,163,219,181,107,215,199,198,198,198, 60, 49, 49, 49,231,238,221,187,167,
-146,146,146,118, 84, 55, 47,  9, 33,148,141,141,205,240,110,221,186,245,177,178,178,178, 74, 78, 78,206,186,122,245,234,201,212,
-212,212, 93,127,199,210, 66,  8,113,  4,224, 11,192,186,104, 87,146,139,139,203,203,183,111,223,166,126, 66, 78,153,139,139, 75,
-120,117, 56,109,109,109, 37, 28, 14,231, 48, 33, 68, 90,129,133, 64,166,211,233,250, 23,  5, 56, 46, 23,102,102,102,141,221,221,
-221, 17, 26, 26,138,249,243,231, 91,181,105,211,  6,111,222,188,  1, 33,  4, 51,102,204, 32, 62, 62, 62,220,164,164, 36,  4,  5,
-  5,225,234,213,171, 77, 97, 68, 85,202,252,  8,  0, 11,  0,131, 88,150, 77, 47,181,223,  6,192, 73,  0,169, 44,203,246,254,167,
-210, 39, 18,137,112,240,224, 65,112,185, 92,112,185, 92,100,101,101,193,217,217,185,228, 55,143,199, 43,249, 94,179,102,205, 74,
-249, 24,134,105, 68,211, 52,242,243,243,161,215,235, 75,182,236,236,108,176, 44, 11,129, 64,  0,189,190,112,217,165,226, 99, 12,
-195, 52,170, 32,255,250, 73,165, 82, 28, 56,112,  0,106,181,186,172,186,139, 23, 47,254, 92, 20,132,166,105,248,249,249, 81,132,
-144,126, 21,  9, 44, 66,  8, 11,  0, 99,199,142,  5, 77,211, 37, 75,223, 21,127, 47,222,244,122, 61, 22, 45, 90, 84,232,176, 77,
- 81,149,149,245, 39,231,252,159,175,255, 21,169,235, 54,110,150, 95,183,110,209,120,181, 80,192, 17, 49, 58, 45,244, 58, 45, 24,
-157, 26, 52, 97,208,194,219, 14,  1, 53,133,200,204,202,195,252,253, 79,115,101, 25,202,224,203, 81, 25,145,149, 20,128, 75,112,
-112,112,216,181,107,215, 44,254,248,227, 15, 68, 70, 70,226,135, 31,126,  0,  0, 72, 36, 18, 92,188,120, 17, 52, 77,131, 97, 24,
-116,234,212, 41, 77, 38,147,121,177, 44,155, 89,141,135,186, 86,203,250,206,161,199,191,107,105, 85,111,194,209,247,201, 57,106,
- 87,150,101, 63,187,  0,106, 82,169,148,229,114,185,  5, 58,157,174,251,255,130,200,146, 74,165,205,184, 92,238, 69,157, 78, 39,
-230,114,185,162,119,239,222,169,254,191, 61, 16,254,254,254, 13,172,172,172, 30,156, 56,113, 66,248,232,209, 35,100,101,101, 33,
- 53, 53, 21, 83,166, 76,193,214,173, 91, 81,175, 94, 61, 72, 36, 18,240,249,124, 76,156, 56, 81,145,151,151,215, 58, 36, 36,228,
-177,  1,117,146,110,217,178,229,129,223,126,251,205, 69,167,211, 81,  0,160, 86,171, 17, 31, 31,175,159, 55,111, 94, 92, 72, 72,
-200,160,170,138, 44, 66,  8,213,180,105,211,253,191,253,246,155, 27,159,207,167, 24,134,129, 86,171,197,155, 55,111,244,243,230,
-205,123, 23, 26, 26, 58,184, 58,245,158, 16,226, 47, 22,139,125,190,254,250,235,180, 30, 61,122,104,  0,224,241,227,199,212,179,
-103,207,204,234,212,169,243,126,193,130,  5, 97,213,224, 12, 52, 53, 53,245, 28, 55,110, 92,122,183,110,221,180, 60, 30,143,185,
-123,247, 46, 39, 50, 50,210,204,197,197, 37,102,238,220,185,207,170, 88, 23,207,157, 56,113,162,181, 84, 42,213,  3, 96,139, 27,
-120,138,162,216,162, 79,196,196,196,112,250,246,237,123, 67, 38,147,125, 89, 97,103,204,193,193,219,209,209,241,214,130,  5, 11,
-172,138, 95, 82,165,183,226,178, 90,180,104,145, 38, 41, 41,169,177, 76, 38,123,  2, 35, 12, 45,247,135,  0, 26,  1,120,  9,160,
- 45,203,178,233, 69,226,234, 58,  0, 31,  0,119, 89,150,109,254, 79,164,205,211,211, 51,229,197,139, 23,118,167, 78,157,  2,151,
-203,197,149, 43, 87,176,117,235, 86, 28, 60,120,176, 76,145,229,232,232,136, 22, 45, 90, 36, 60,121,242,164, 70,121,156,110,110,
-110, 57,209,209,209,102, 57, 57, 57,208,235,245,120,248,240, 33,118,237,218,  5, 59, 59, 59,216,216,216,192,214,214, 22,141, 26,
- 53,130, 68, 34, 41, 17, 89,253,250,245,203,141,142,142, 54, 47,139,207,219,219, 91, 54,100,200, 16,199,208,208, 80,104,181,218,
- 50,  5,214,180,105,211, 74, 91,145, 32,145, 72,208,163, 71,143,164, 87,175, 94,149,219,249,168, 87,175, 94,210,203,151, 47, 29,
-158, 61,123,246, 65, 93, 47, 75, 16,209, 52, 13, 83, 83, 83, 52,105,210, 36,229,201,147, 39, 14,255, 77,206,255,215, 22, 44,247,
- 90, 14,243,190, 27,223, 83,  4,189,  6,172, 86,  1,104, 10,  0, 77, 62, 24,117,  1,  8, 79,  4,104, 21,176,226,103, 98,227,176,
- 58,102,203, 79,189,123,213,214,213,182,235,181,152,180,139,229,241, 89, 88, 88, 44,218,182,109,155,197,139, 23, 47, 16, 25, 25,
-137,117,235,214, 97,233,210,165,224,241,120,200,204,204, 68,247,238,221,113,239,222, 61,104, 52, 26,204,159, 63,223,106,246,236,
-217,147, 80,232,108, 90, 69,235, 21,103,235,225,221, 27,173,172,232, 12,140,108, 27, 98,189,249,242,219,175,  1,252,252, 57, 22,
-192,234,213,171,197,179,102,205, 58,227,228,228,244, 89,139, 44,169, 84,218, 76, 36, 18, 93,156, 54,109,154,100,197,138, 21,159,
- 68,172, 58, 59, 59,215,227,112, 56,135,212,106,245,140,164,164,164, 75,213,104,188,107,  7,  7,  7,175,  8, 15, 15, 63,150,159,
-159,127,164,172,115, 76, 76, 76,250,121,122,122,246, 12,  9,  9,153,199,178,236,219,202, 56,  5,  2,193,148,153, 51,103, 10, 19,
- 19, 19,145,157,157, 13, 62,159, 95,178,202, 60, 33,  4,  2,129,  0, 20, 69,129,207,231,227,171,175,190, 18,254,242,203, 47,223,
-  0, 24, 88,105,157,116,112, 24,181,127,255,126, 23,141, 70, 67,201,229,114,240,120, 60,240,120, 60, 52,104,208,128,158, 57,115,
-102,141, 41, 83,166,140,  7,176,169, 42,247,111,105,105, 57,108,255,254,253,110,124, 62,159, 74, 74, 74, 66,179,102,205,240,240,
-225, 67,  4,  7,  7,211,179,102,205,170, 57,105,210,164,177,  0,182, 86,213,202, 36, 22,139,235, 95,191,126, 61,190, 70,141, 26,
- 37,189,175,218,181,107,235,187,118,237,154, 25, 17, 17,225,121,255,254,253,140, 38, 77,154,196, 85,129,211, 73, 44, 22,123,157,
- 63,127, 62,105,201,146, 37,237,182,111,223,222,  3,  0, 26, 53,106,116,122,233,210,165,215, 50, 51, 51,235,221,190,125, 59,179,
- 69,139, 22,  9, 85, 72,170,181,189,189,189,238,235,175,191, 54, 45,239,132,189,123,247,102,  0,176,171,164, 94,119,167, 40,106,
-113,189,122,245,204,218,180,105,131, 91,183,110, 97,242,228,201, 42,173, 86, 27,  5,  0,237,219,183,247, 88,180,104, 17, 63, 52,
- 52, 20, 22, 22, 22,220,164,164,164,221, 82,169,212,232,248,110, 56,122,  0,184,  1,160, 30,128,107,132,144,254,  0,142,  2,240,
-  6, 16,  9,160,239, 63,153, 56,189, 94, 15, 14,135,131,132,132,  4,252,242,203, 47,248,241,199, 31,225,238,238, 14,173, 86, 91,
- 34,176, 56, 28, 14,184, 92, 46,  8, 33,  6, 47,165,165,211,233,240,248,241, 99,236,255,245, 87,204,159, 55, 15,166,166,133,213,
- 84,163,209, 32, 51, 43, 11, 66,161,176,196,130, 85, 17, 88,150, 61,242,230,205,155,105,206,206,206, 31, 12, 13, 22,127, 22,181,
-113, 96, 24,  6, 58,157, 14, 42,149, 10, 59,119,238,212,177, 44,123,164,146,103,178,196,226, 53,109,218, 52,168, 84,127,246,149,
-125,125,125,  1,  0, 46, 46, 46,240,243,243, 43,249, 93,108,161, 50,132,115,103,211,250, 80,148, 58,219,115,209,154,226, 54, 31,
-158,158,158,112,116,116, 52,136,243,255,181,192,138,138, 75, 93, 57,107,241, 79,107, 36,124,154, 59,162,179, 55,164,102, 92, 64,
-100,  5, 94,203,217, 32, 22,181, 10, 43, 64,102, 44,112,121, 54,230,119,200,160,230, 40, 52, 39, 59,187, 89,217, 94,136, 46,215,
-185,174, 81,141, 26, 53,112,251,246,109,212,169, 83,  7, 11, 22, 44,128,151,151, 23, 36, 18,  9, 82, 82, 82, 32,151,203, 33,145,
- 72,144,155,155,139,128,128,  0,218,212,212,180, 77, 85,  5, 22, 33, 36, 96,116,247,224, 70, 28,123,111, 52,107,215, 24,151, 23,
-182,150,236,189,153,248, 29, 33,100,119,233,  5, 87, 63, 23,244,237,219, 23,201,201,201,226, 13, 27, 54, 84, 91,100,185,184,184,
- 92,214,104, 52, 95, 24, 96, 14,191, 30, 29, 29,221,182,186,226,234,204,153, 51, 18, 83, 83, 83,172, 88,177,226, 83,137,171, 59,
- 29, 59,118, 52,187,116,233,210,  9, 71, 71,199, 94, 85, 17, 89,132,144,218,253,250,245, 59,187,107,215, 46,143,182,109,219,234,
-  1,148,217,160,248,248,248,244,185,124,249,114,239,209,163, 71,215, 39,132,116,171, 76,100, 17, 66,154,214,174, 93, 27,241,241,
-241, 72, 73, 73,129, 82,169, 68, 74, 74, 10,  0, 32, 33, 33,  1,206,206,206,176,176,176,128,179,179, 51, 60, 60, 60,  8, 69, 81,
-193,134,164,183, 77,155, 54, 61,  0, 80, 49, 49, 49, 72, 75, 75,131,185,185, 57, 36, 18,  9,156,157,157,209,186,117,107,142,155,
-155, 91,151,170, 10,172,206,157, 59,247, 17,139,197, 84,124,124, 60,222,190,125, 11,149, 74,133,168,168, 40,152,155,155,163, 93,
-187,118, 92, 55, 55,183,110, 85, 21, 88,  0,234,143, 29, 59, 54,165,180,184, 42,134, 68, 34, 33, 30, 30, 30,153,214,214,214,129,
-  0,226,170,194, 57,105,210,164,212,229,203,151,183,188,122,245,234,236,226,157, 87,175, 94,157,  5,  0, 63,253,244,211,109, 91,
- 91,219, 64,  0, 85, 17, 88, 96, 89,150, 25, 61,122,244, 27, 30,143,  7, 62,159, 95,178,  9,  4,  2,112,185, 92,208, 52,109,110,
-  0,205,220,200,200, 72, 95, 19, 19, 19, 68, 70, 70,130,166,105, 16, 66,222,200,100, 50, 95,  0,152, 61,123,118,180, 66,161,112,
- 85, 42,149,232,219,183, 47,233,222,189,123,131,117,235,214,205,  3,240, 89,  8, 44, 66, 72, 67,  0,235,  0,168,  1,204, 99, 89,
-246,225,231,212,190,177, 44,155, 66,  8,105, 93, 74,100, 61,  1, 32, 40, 18, 87,173, 89,150, 77,249,  7,243, 14, 12,195,128,203,
-229, 98,205,154, 53,208,104, 52,248,237,183,223,112,244,232, 81, 80, 20, 85,226,232,110,102,102,134,141, 27, 55,254,197,241,189,
- 50,225,182,119,239, 94,204,158, 53,171, 68, 92,  1,  0,143,199,131,131,189, 61,172,109,108, 16, 19, 19, 83,169,192, 74, 77, 77,
- 93,248,232,209, 35, 84,228,228,222,187,247,159, 35,172,165,157,220, 13, 73, 39, 77,211, 80,169, 84,248,226,139, 63, 95, 31,147,
- 38, 77, 42,249,158,153,153, 89,252, 76,128, 24,120,243, 52, 77, 67,193,  2, 61,133,127,238,235, 50, 99, 70,201,247,244,244,244,
- 42,115,254,191, 20, 88, 45,163, 51, 55,221, 35,240,155, 53,178,221,112,169,141, 25,216,252, 20,240,218, 46,196,243, 76, 49, 54,
-108, 43,124, 23, 78,235, 27,128,250,237,151, 65,189,167,  3, 70,249,235,249,223, 36, 97, 38,128,  5,101,241,217,216,216, 88,235,
-116, 58, 16, 66, 32,145, 72,224,237,237, 13,161, 80,136,180,180, 52, 76,158, 60, 25, 23, 47, 94,132, 70,163,  1,143,199, 67,157,
- 58,117,160,209,104, 92,171, 97,189,218,181,126,245,143, 22, 25, 97,  7, 16, 26,155, 13,177,117, 13,204, 27,212,200,114,209,111,
-143, 22,  2,152,245, 57, 22,130,159,159, 31,150, 44, 89, 34, 94,184,112, 97,181, 68,150, 70,163, 89,202,229,114,155,253,248,227,
-143,162, 65,131,  6,253,229,248,211,167, 79,209,183,111, 95,133, 82,169,252,161,186,226,234,244,233,211, 18, 43, 43, 43,196,199,
-199,227,239, 62, 19,197,226,234,247,223,127, 55,171, 85,171, 22,234,213,171, 39, 92,187,118,173,193, 34,139, 16,226,219,187,119,
-239,227,187,118,237,170, 53, 98,196,136,247, 33, 33, 33, 41,132,144,242,132,184,108,228,200,145,239,247,236,217,227, 65,  8, 57,
- 91,153,200,210,233,116, 53,197, 98, 49,210,210,210, 48,117,234,212, 15, 28, 84,139,135,179,  1, 32, 50, 50, 18,206,206,206, 80,
- 42,149, 78,134,220,179,149,149,149, 37,  0,140, 25, 51,  6,241,241,127,186, 43, 58, 57, 57, 33, 62, 62, 30, 58,157,206,170,170,
-249,104,101,101,101,165,213,106,209,162, 69, 11, 40,149, 74,  0, 64,255,254,253,193,229,114,145,154,154, 10,141, 70, 99, 93,141,
-226,177,233,218,181,171,172,188,131,102,102,102, 26, 75, 75, 75,239, 42,114, 90,119,239,222, 61,113,199,142, 29,127, 25,170,123,
-244,232,209,151, 86, 86, 86, 87,173,172,172, 60,170,145, 86,166,180,160, 42,254,206,231,243,139, 45, 14,  6,245,142, 25,134,193,
-185,115,231, 64,211, 52, 56,156, 63,155,196,  5, 11, 22,140,179,176,176,176,191,117,235, 22,146,147,147, 33,151,203,145,159,159,
-143,186,117,235,214,105,223,190,253,211,228,228,228,119,225,225,225,189,254,105, 35, 56,128, 98,191,176,173,  0,252, 62,183,246,
-173, 72,100,245,  3, 16, 82, 36,174,212,  0,250,252,147,226,170,116,217,115, 56,156,146,231, 92, 40, 20, 34, 32, 32,160, 68, 76,
- 17, 66, 80, 80, 80,  0, 14,135, 83,236, 47,100, 80,227,151,157,157, 13, 71,  7,  7,152,154,154,162,174,187, 59,222, 68, 69,  1,
- 64,201,119,129, 64,  0, 66,  8,116,186,138,189,  2,138,102,  2,126,131, 10,252,169,170, 41, 46,217, 98, 49, 84, 73,251, 15,134,
- 97,138,219,124,246, 83,112,218,216,216, 32, 63, 63,223, 32,206,255,183,  2,107, 49, 33,212,189,186, 86,191,204, 26,222,122,120,
- 11, 15, 75, 40,211,222, 66, 96,106,  3, 98,225,130, 13,219, 46,225,213,187, 66,215,168, 13, 71,195,176,247,187,142,128,200, 10,
-174, 38,145,176,145,136,123,149, 39,176, 50, 51, 51,229, 90,173,214, 74, 36, 18,129,195,225,128,207,231, 35, 35, 35,  3, 11, 22,
- 44,192,225,195,135,225,226,226,  2,189, 94, 15,129, 64,128,212,212, 84,240,120,188, 42,205, 78,228,112, 72,215, 69, 99, 58,215,
-150, 56,184, 35,227,202,210,194,157,246,254, 24,219,157,226,175, 61,254,124, 24, 33,100, 45,203,178,169,159, 91, 33,152,152,152,
-160, 81,163, 70,152, 48, 97,130,120,219,182,109,251,  0, 56, 87,229,255, 50,153,236,174, 84, 42,237, 48,111,222,188,203,137,137,
-137,162,198,141, 27,195,196,196,  4, 38, 38, 38,136,136,136,192,255,177,119,237, 81, 81, 92,121,250,171,170,126,  3,205, 75,161,
- 21, 80, 48,  1,154,230, 49,108,  0, 17,118,112,243, 24, 53,146, 77,102,141,102, 98, 98,226,104, 52,179,192,100, 93,204, 26, 95,
-135,205,104,194, 14,171, 39,103,116, 18, 71,196,179, 74,102,207,  1, 93, 38,232,134, 56,113,  9,230,140,154,241, 57,193, 30, 26,
- 21,232,238,129, 70,  4,177,  5, 58, 60,187,171,155,174,187,127,208,221,211,102,120,116, 35,137,168,245,157,115, 79, 83,221,156,
-175,234,222,170,186,247,171,239,254,238,175,242,243,243,205, 44,203, 62, 63, 25,119, 76, 40, 20,150,102,103,103,251, 74, 36, 18,
-232,116, 58,  4,  7,  7,223, 83, 93,157,226,234,200,145, 35,254, 74,165, 18, 13, 13, 13,200,204,204,196,236,217,179,165,155, 54,
-109,154, 80,100, 57,158,120,126,125,244,232,209, 40,129, 64, 64,125,242,201, 39,243,  0,228,123,178,239,178,178,178,184,138,138,
-138, 95, 81, 20,181,140,140, 17,124, 40, 18,137,218,140, 70, 99,244,156, 57,115,112,232,208, 33,208, 52,141,142,142, 14,108,223,
-190, 29, 69, 69, 69, 88,176, 96,  1,228,114, 57,230,204,153,  3,157, 78,  7,169, 84,218,225,201,190,111,222,188,217,205,113, 92,
-232,201,147, 39, 97, 52, 26, 93,223, 71, 70, 70,162,167,167,  7, 22,139,165,203,219,182,108,107,107,235,  2,160, 80,171,213,104,
-105,105,193,210,165, 75,113,252,248,113,164,165,165,193, 17,143,213, 53,137, 83,100,103, 24,134, 76,208,254, 65, 83,201,233, 24,
-180,188,229,  4, 33,132,184, 11, 42,231,223,206, 34, 16,  8, 60,  9,242,255,165, 74,165,218,249,216, 99,143,197, 23, 20, 20,  8,
- 25,134, 65, 86, 86,150,242,157,119,222, 49, 72,165,210, 25, 91,183,110,245, 25,205, 12,  6,144, 28, 31, 31,239, 59, 13,186, 15,
-119,151,110, 90, 46, 58,161, 40, 42,212,225,248,137,  1, 88, 29,159, 71, 40,138,122,198, 61,240,253,126, 58, 88, 59,119,238, 68,
- 78, 78, 14, 20, 10,  5,182,108,217,  2,129, 64,224, 42, 20, 69,185, 28, 45,111, 16,170, 80,140,251,187, 51,  6,107,130,135,168,
-239, 36, 77,131,167, 98,104,100, 92, 21,120,228,222,125, 23,156, 15,165,192,114,138,171, 45, 63, 93,184, 38, 75,233,143,154, 51,
-127,194,211,143,211,  0, 43, 30,167, 11,181,129, 18,249, 66, 33,167, 35,198,177, 14,213,  6,131, 97,110, 96, 96, 32,172, 86, 43,
-196, 98, 49, 18, 19, 19,113,254,252,121,176, 44, 11,139,197,226,234, 28,175, 94,189, 10,171,213,122,198,139,155,133, 81,200,133,
- 31,110, 46,120, 95, 14,205, 97,  4,250,138,241,116,106, 52, 48, 67,  5,166,187, 17,191,218,248, 66,240, 63,239, 58,182, 23, 30,
-196,203,220, 15,129,165,213,106, 81, 82, 82, 50,104,177, 88,126, 58, 25, 14,167,200, 42, 46, 46,174, 14, 12, 12,148, 61,249,228,
-147,208,104, 52,216,180,105,147,153,101,217,127,156,108,124,151,205,102, 91,251,217,103,159,157,140,142,142,246, 93,184,112,225,
- 93,118,247,100,196, 21,195, 48, 95,173, 91,183, 78, 30, 21, 21,  5,189, 94,143,128,128,  0,248,249,249, 97,222,188,121, 40, 47,
- 47,151,174, 90,181,106, 92,145, 69,  8, 33, 20, 69,229,173, 92,185,178,170,180,180, 52,114,237,218,181,134,202,202,202, 42,  0,
- 99,117, 38,242,229,203,151,191, 80, 90, 90, 26,185,126,253,250, 70,  0,111,147,113, 86,118,112, 28,119, 78,167,211, 61,174, 82,
-169, 40,165, 82,  9,177, 88,140,240,240, 17,147, 42, 57, 57, 25,241,241,241, 16, 10,133,  0,  0,173, 86, 11,  0,151, 60,169,251,
-217,179,103, 63,109,106,106, 90,151,150,150,198,204,154, 53,203, 21, 60, 43, 18,137, 80, 88, 88,104, 53, 24, 12, 39,188,109,207,
- 47,191,252,242,184, 70,163,121, 51, 43, 43, 75, 16, 20, 20,  4,137, 68,130,164,164, 36,132,133,133,161,176,176,208,218,220,220,
-124, 98, 18,167,169, 85,163,209, 72, 99, 99, 99, 71,237,249,101, 50,153, 63,  0,111,157,135, 27,151, 47, 95, 22,103,100,100,124,
-250,249,231,159, 39,186,255,144,158,158,254,169,159,159, 95,  0,128,142, 73, 28, 43,231, 46,168,156,197, 57,101,232,137,192,106,
-111,111,175,154, 53,107,214, 95, 20, 10,197, 31, 19, 18, 18,  2, 52, 26, 13, 10, 10, 10, 68, 22,139,101,110, 77, 77,141,107, 32,
- 30,229, 58,196,192,192,128,108, 26,116, 31,249,  0,246,  0,240,  1,176,101, 26,138, 43,  5, 70,  2,218,227, 48, 50, 45,248,178,
- 67,108, 57, 99,178,238,171,200, 34,132, 64, 40, 20, 34, 46, 46, 14, 27, 55,110,196,174, 93,187,144,151,151,135,216,216, 88,215,
-185,119,  6,185,123,227, 96,137, 68, 34, 40, 20,138,145, 69, 39, 14,247, 10,  0,180, 77, 77, 16,  8,  4,224, 56, 14, 44,203, 78,
-232, 96,133,134,134,238,220,189,123,247,134,236,236,108,250,219, 43,238,156,105, 37,220,139,205,102, 67, 85, 85,213,134,162,162,
- 34,120,226,122, 49, 12,131,228,228,228,187,166,  5,247,237,251,107,164, 66, 74, 74, 10, 22, 47, 94,236,145,104,114,231,140,219,
-241,193, 93,211,130,191, 15,249,107,179,205, 89,253, 51,196,254,242, 35,175, 56, 31, 84,140,186, 70,242, 92, 76, 96,225,150,215,
-126,184, 38, 43, 70,142, 47,206, 92,193,222,223, 55, 55, 24, 58,186,192,117,106,192, 25,175, 35,255,165, 20,196, 71,  5, 35, 62,
- 42, 24,249, 47,165,128,187, 93, 15,210,163,  7,145,  4,226,134,  9,237,227,216,166,187,222,127,255,125, 83,112,112, 48,100, 50,
- 25,196, 98, 49,218,218,218,144,144,144,  0,137, 68,226,122,  2,165,105, 26,  5,  5,  5, 70,163,209,120,192,211,138,248,138,233,
-159,237,250,183,151, 21, 34,169, 31,112,227, 12,252,229,126, 56,244,155, 15,128,254,118,128, 17,225,133, 39,255,142,153, 61, 51,
-240, 25,138,162,148,211,237, 36,232,245,122,108,216,176, 97,208,108, 54,223, 83,160,123,123,123,251, 31,173, 86,235,146,162,162,
-162,161,178,178,178,123, 22, 87, 78, 78,150,101,151,238,217,179,103, 64,167,211,221,147,192, 18,  8,  4, 91,109, 54,155,127, 73,
- 73,  9,151,154,154,106, 95,182,108,153,125,201,146, 37,246,204,204, 76,123, 66, 66,130,125,197,138, 21,118,179,217, 44,241,241,
-241,217, 61, 65,167,120,173,178,178,114,209,250,245,235, 27, 75, 75, 75, 35, 23, 44, 88, 16, 70,  8,249,197,104, 37, 45, 45, 77,
-225, 20, 87, 21, 21, 21, 19,198, 96, 89, 44,150,125,197,197,197,102,231, 42, 23,177, 88,140,144,144, 16,151, 16, 22,137, 68,144,
- 72, 36,176, 90,173,216,191,127,255,208,208,208,208, 94, 79,234,222,213,213,117,120,243,230,205,173,213,213,213,182,222,222, 94,
- 80, 20,133,155, 55,111,162,176,176,208,122,240,224,193,155, 38,147,233,160,183,237,217,219,219, 91,186,121,243,230,150, 19, 39,
- 78,216,104,154, 70, 79, 79, 15,252,253,253, 93,156,125,125,125, 94,115,102,102,102,234, 12,  6,131,255,224,224,224,104,110, 38,
-229,235,235, 59, 31,192,151,222,112,166,164,164,232, 91, 91, 91,229,133,133,133,167, 23, 45, 90,180, 75, 46,151, 55,201,229,242,
-166, 69,139, 22,237,254,232,163,143,254, 32,149, 74,211,  1,120,253,114, 88,154,166, 57,247,126,195, 61,  6, 75, 34,145, 64, 36,
- 18,121,148,166, 34, 32, 32,224,227,226,226,226,128,142,142, 14, 88, 44, 22,168,213,106,168,213,106,180,181,181,185,  6,225, 81,
-222,195,134,193,193, 65,233,253,238, 59,  8, 33,127, 32,132, 36, 19, 66,162,  9, 33,211,113,145,204,239,220,196,213, 83,132, 16,
- 13,128,167, 28,219,137,  0,254,247,126, 58, 88, 78,129, 37, 16,  8,240,234,171,175,226,212,169, 83,136,137,137,113,  5,182,187,
-  7,185,123, 35,  8,134,135,135,145,148,148,  4, 11,203,222, 37,208,  5,  2,  1, 66, 66, 67,161,211,233, 60,114,176, 40,138,250,
- 73,118,118, 54,125,245,234, 85,168, 84, 42,212,214,214,186,138, 90,173, 70, 93, 93, 29,234,235,235,113,237,218, 53,164,166,166,
-194, 96, 48,224,217,103,159,117,166,105, 24,247,210,241,212,109,114,174,  4,244,192,109,250, 46, 56, 31, 62,  7, 43, 34,196,103,
-237, 15,231, 81,248,226,236, 21,124, 88,221,254, 49, 33,164,242,164,166,247,179,156,212, 97, 88, 43, 86, 33,233,165,255, 30,153,
- 22,  4,192,221,174,135,181,226,117, 80, 62, 51,113,169, 83,140, 94,179,109,204,167,102,171,213,122, 49, 40, 40,232,200,225,195,
-135,215,189,241,198, 27, 98,  0,240,241,241,193,219,111,191, 13, 66,  8,196, 98, 49, 24,134, 65,110,110,110,255,237,219,183,247,
- 16, 66,116, 30,222, 40,178,240, 32,113,193,107, 63,255,119, 41,212,  7,  1, 90,132, 59,126, 41, 72,126,118, 29,110, 55,158,  7,
-186,174,  3,140,  8,  7,118,188, 57,243,199,111,125,112, 16,192,194,233,114,  2,234,235,235,241,214, 91,111,221,179,184,250,182,
-147, 85, 94, 94,254, 91,150,101,223,156, 66,206,165, 91,182,108, 57,169, 80, 40, 38, 61, 45, 98, 48, 24, 86, 71, 70, 70,174,155,
-232,198,211,235,245, 19, 78,117, 16, 66,154, 41,138,122,190,165,165,229, 63, 26, 26, 26,142,143,245,127, 13, 13, 13,199, 23, 47,
- 94,204, 92,188,120,113,171, 39,171,  8,107,107,107,107, 51, 50, 50,138,247,238,221,155,155,159,159, 47,147, 72, 36,240,247,247,
- 71, 99, 99,163, 43, 15, 14,203,178,216,182,109,219,144,205,102,251,248,242,229,203,231, 61, 28,  8,135, 41,138,122, 37, 39, 39,
-103,189, 82,169,252, 49,199,113, 51, 88,150,237, 50, 24, 12, 39,250,250,250, 38,149,  7,139, 16,194, 81, 20,181, 42, 55, 55,119,
- 77,108,108,236, 10,171,213, 58,195,110,183,119,181,182,182,126,218,219,219,123,104, 50,156,231,206,157, 51,238,223,191,255, 47,
- 70,163, 81, 21, 17, 17,241,141,159,159, 31,203,178, 44, 35,147,201,252,125,125,125, 83,  0,156,  7,112,205, 27,206,175,191,254,
-250,214,129,  3,  7, 90, 44, 22, 75,220,129,  3,  7,206,250,251,251,159,162, 40,138, 18,137, 68, 65, 50,153,236,105,  0,167,  1,
-104,189, 61, 86,134, 97,198,117,176,224, 97,124, 71, 95, 95,223,197, 29, 59,118,164, 62,241,196, 19, 40, 46, 46,238,246,243,243,
-147,175, 88,177, 66, 96, 50,153,168,241, 28,172,233, 32,176, 30,  0,116, 57, 92,222,127,114,198, 92,185,  5,190,255, 14,128,233,
- 62, 11,212,187,132,212,220,185,115, 93,219,238,197, 45,  6,203, 35,216,237,118,136, 68, 34,  8,  4,  2,204, 14, 11,115,137, 57,
- 66,  8,116, 58, 29,186,187,187, 61, 18, 88, 52, 77, 51, 20, 69, 97,229,202,149, 30,237,247,149, 87, 94,193,233,211,167, 49,209,
-116,162,251,138,191,168,168,168,  9,197,144,227, 88, 60, 94, 69, 24, 17, 17, 49, 37,156, 15,165,192,106, 53,154, 11, 55, 30,188,
-188, 77,127,219, 82,249,247,218,158,141, 59,  0,  2,  4, 85,171,130,169, 37, 11,233, 54, 88, 14,102,129,242, 31, 25,108, 72,127,
-  7, 40, 95,  5, 58, 16,129, 95, 87,235,111,217,136,117, 92,247,193,100, 50,229,239,219,183,143,169,174,174,126,185,168,168, 40,
- 64,165, 82,225,245,215, 95,  7,203,178,168,171,171, 67, 78, 78, 78,183,209,104, 44, 49,153, 76,187, 60,173,196, 76, 63,193,187,
-123,255,101,201, 12,218,214, 15,220,170,  5, 36,  1,152, 25,228,135, 63, 95, 58,  3,220,250, 26, 96, 68,  0, 35, 70,218, 15, 84,
- 72,142,143, 86, 81, 20,149, 69,  8,249,106, 58,156,128, 23, 95,124,113,202,196,149,187, 32,  2,240,216, 84, 30,167, 83,100,173,
- 89,179,230, 36,199,113, 62,147,177,119, 29, 57,153,236, 83,216, 57, 54, 99,130, 41, 95, 71,250,134, 10,111,120,109, 54,219, 54,
-141, 70,131,220,220,220,220,213,171, 87,203,148, 74, 37,162,162,162,208,212,212,132,198,198, 70,148,148,148, 12, 13, 15, 15, 31,
- 50,153, 76,155, 38, 81,255, 18, 71,153,170, 54,224,  0, 28,118,148, 41, 65, 94, 94,222,159,245,122,125, 87, 72, 72,200,  2,145,
- 72,244,  3,140,196,249,220,114,236, 67, 59, 25,206,156,156, 28,181, 94,175,191, 19, 30, 30,158,225,224, 12,  4,112, 19,192,127,
- 77,146,179, 75,173, 86, 71,167,167,167,115,  2,129,128, 56, 28,  6, 34, 20, 10,137, 80, 40, 36,  0, 80, 93, 93, 45,  1, 48, 97,
-204,101, 71, 71,199,191, 30, 59,118, 12, 53, 53, 53, 11,250,251,251, 95,  3,240,219,193,193,193,244,111,190,249,198, 53,  8,143,
-225,118, 74,120,253, 52,225,245,185,108,140,239, 59,  1,100, 77,131,227,195,123,239,189,135,146,146, 18, 76,148,129,188,170,170,
- 10,152, 96,138,208,121,173, 56,197,147,213,106, 69,125,125,189,243,221,123,174,105, 65,103,138,134,225,225,225,113, 51,189,115,
- 28,103,103, 89, 22, 71,143, 30,245, 72,100,149,151,151,195,108, 54,131,227, 56,143,250, 89, 71, 98, 82,116,119,119, 35, 44, 44,
-204,233, 56,187,155, 34, 94,183, 41,195, 48,136,139,139,195,157, 59,119, 48,115,230, 76,  0, 35,211,130, 46,119,111, 96,224,145,
-185,254,199, 77, 52,234,142,167,162,  2,  3,104, 17,117,236, 71, 49,162,167,158, 79,146, 99, 78,136, 31,  4, 98,  9,110,247,218,
-241,149,190, 31,255,115,222,120,131,181,219,159, 63,213,216,163,241,208,117,202,152, 61,123,246,118,187,221,158, 72,211,180, 15,
- 33,164,159, 97,152, 43,237,237,237, 59,  9, 33,245,222, 84, 34, 80,198,104,131,124,153,  0,161, 80, 76,236, 28,  7,128,  6, 40,
-103, 97, 70, 62,233,145,237, 33,179, 85,100, 39, 84,101,167,241,206,250,251,221,248, 74,165,178,122, 96, 96,224,129,203,228,238,
-235,235,251, 11,173, 86,251,208,102,114,119, 98,254,252,249,105, 50,153,108, 59,199,113,243,205,102,243, 44,153, 76,214, 73, 81,
-212,159,250,250,250,254,243,202,149, 43, 23,248,225,243,254, 97, 42, 51,185,143,114,141,191,  0, 96,231,140, 25, 51,148,117,117,
-117, 18,119,  7,203,189,191,244, 38, 47, 18,143,233,135,248,248,248,139,101,101,101,105,115,231,206,165,221,  3,217,105,154,118,
- 37,199,164,105,218,181,178,244,194,133, 11,195,121,121,121,231,213,106,245, 63,140,197, 25, 19, 19, 83, 93, 83, 83,179,216,100,
- 50,253,141,144,114,207,236,238,220, 30, 26, 26,194,187,239,190,251,133, 86,171, 29,245, 85, 57, 42,149,106, 79, 65, 65,193,134,
-231,158,123,142,166,105,250,111, 98,174,156,175,245,113, 22,171,213,138,202,202, 74,174,180,180,244,195,235,215,175,143, 25,131,
-149,146,146,114,163,182,182, 54,194,153, 50, 97,172,226,142,140,140,140,142, 11, 23, 46,132,125,159,156,143,140,192,114,116, 40,
-212, 51, 49,129, 47, 19, 66,253,132,  2,149, 68, 83, 68, 60, 76,208, 72,  1,213, 62,131,146,253, 85,237,237, 67,252,109,203,227,
-161,188, 81, 40,138,230, 95,242,251,104, 33, 38, 38, 70,171,213,106,163,199,185, 38,120,129,245,128,139,244,144,144,144, 83, 52,
- 77, 71, 58, 69,244, 88,159, 14, 55,169,165,179,179,243, 71,157,157,157, 99,230, 83,140,136,136,120, 92, 42,149,254,134,227,184,
-116, 79, 94,246, 76,211,244, 37,179,217,252,243,239,251,101,207,137,137,137,186, 75,151, 46, 61, 46,147,201,238,138, 43,116,214,
-249,219,199,222,220,220,140,229,203,151, 27,212,106,117,212,247,201,249, 72,  9, 44, 30, 60,120,240,120, 84, 16, 30, 30,126,209,
-106,181,170,204,102,179,208, 98,177,  8,135,135,135,239, 26,224,100, 50,153,113,112,112, 48,148,111, 41, 30, 15, 26,194,194,194,
-148,129,129,129,255, 39, 20, 10, 37,163, 61, 56,124, 27,118,187,221,220,213,213,181,180,189,189,189,241,251,228,124,224, 49,218,
- 10,153,169, 42,  0, 22,241,156, 60, 39,207,201,115,242,156, 60, 39,207,201,115, 62,106,133,230,181, 60, 15, 30, 60,120,240,224,
-193,131,199,212,130, 23, 88, 60,120,240,224,193,131,  7, 15, 30,188,192,226,193,131,  7, 15, 30, 60,120,240,224,  5, 22, 15, 30,
- 60,120,240,224,193,131,199, 35,133,255, 31,  0,  6,160,247, 56,137,  5,159,139,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
+137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,
+  0,  0,  2, 88,  0,  0,  2,128,  8,  6,  0,  0,  0, 64, 11,  6,158,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 13,215,  0,  0, 13,
+215,  1, 66, 40,155,120,  0,  0, 10, 79,105, 67, 67, 80, 80,104,111,116,111,115,104,111,112, 32, 73, 67, 67, 32,112,114,111,102,
+105,108,101,  0,  0,120,218,157, 83,103, 84, 83,233, 22, 61,247,222,244, 66, 75,136,128,148, 75,111, 82, 21,  8, 32, 82, 66,139,
+128, 20,145, 38, 42, 33,  9, 16, 74,136, 33,161,217, 21, 81,193, 17, 69, 69,  4, 27,200,160,136,  3,142,142,128,140, 21, 81, 44,
+ 12,138, 10,216,  7,228, 33,162,142,131,163,136,138,202,251,225,123,163,107,214,188,247,230,205,254,181,215, 62,231,172,243,157,
+179,207,  7,192,  8, 12,150, 72, 51, 81, 53,128, 12,169, 66, 30, 17,224,131,199,196,198,225,228, 46, 64,129, 10, 36,112,  0, 16,
+  8,179,100, 33,115,253, 35,  1,  0,248,126, 60, 60, 43, 34,192,  7,190,  0,  1,120,211, 11,  8,  0,192, 77,155,192, 48, 28,135,
+255, 15,234, 66,153, 92,  1,128,132,  1,192,116,145, 56, 75,  8,128, 20,  0, 64,122,142, 66,166,  0, 64, 70,  1,128,157,152, 38,
+ 83,  0,160,  4,  0, 96,203, 99, 98,227,  0, 80, 45,  0, 96, 39,127,230,211,  0,128,157,248,153,123,  1,  0, 91,148, 33, 21,  1,
+160,145,  0, 32, 19,101,136, 68,  0,104, 59,  0,172,207, 86,138, 69,  0, 88, 48,  0, 20,102, 75,196, 57,  0,216, 45,  0, 48, 73,
+ 87,102, 72,  0,176,183,  0,192,206, 16, 11,178,  0,  8, 12,  0, 48, 81,136,133, 41,  0,  4,123,  0, 96,200, 35, 35,120,  0,132,
+153,  0, 20, 70,242, 87, 60,241, 43,174, 16,231, 42,  0,  0,120,153,178, 60,185, 36, 57, 69,129, 91,  8, 45,113,  7, 87, 87, 46,
+ 30, 40,206, 73, 23, 43, 20, 54, 97,  2, 97,154, 64, 46,194,121,153, 25, 50,129, 52, 15,224,243,204,  0,  0,160,145, 21, 17,224,
+131,243,253,120,206, 14,174,206,206, 54,142,182, 14, 95, 45,234,191,  6,255, 34, 98, 98,227,254,229,207,171,112, 64,  0,  0,225,
+116,126,209,254, 44, 47,179, 26,128, 59,  6,128,109,254,162, 37,238,  4,104, 94, 11,160,117,247,139,102,178, 15, 64,181,  0,160,
+233,218, 87,243,112,248,126, 60, 60, 69,161,144,185,217,217,229,228,228,216, 74,196, 66, 91, 97,202, 87,125,254,103,194, 95,192,
+ 87,253,108,249,126, 60,252,247,245,224,190,226, 36,129, 50, 93,129, 71,  4,248,224,194,204,244, 76,165, 28,207,146,  9,132, 98,
+220,230,143, 71,252,183, 11,255,252, 29,211, 34,196, 73, 98,185, 88, 42, 20,227, 81, 18,113,142, 68,154,140,243, 50,165, 34,137,
+ 66,146, 41,197, 37,210,255,100,226,223, 44,251,  3, 62,223, 53,  0,176,106, 62,  1,123,145, 45,168, 93, 99,  3,246, 75, 39, 16,
+ 88,116,192,226,247,  0,  0,242,187,111,193,212, 40,  8,  3,128,104,131,225,207,119,255,239, 63,253, 71,160, 37,  0,128,102, 73,
+146,113,  0,  0, 94, 68, 36, 46, 84,202,179, 63,199,  8,  0,  0, 68,160,129, 42,176, 65, 27,244,193, 24, 44,192,  6, 28,193,  5,
+220,193, 11,252, 96, 54,132, 66, 36,196,194, 66, 16, 66, 10,100,128, 28,114, 96, 41,172,130, 66, 40,134,205,176, 29, 42, 96, 47,
+212, 64, 29, 52,192, 81,104,134,147,112, 14, 46,194, 85,184, 14, 61,112, 15,250, 97,  8,158,193, 40,188,129,  9,  4, 65,200,  8,
+ 19, 97, 33,218,136,  1, 98,138, 88, 35,142,  8, 23,153,133,248, 33,193, 72,  4, 18,139, 36, 32,201,136, 20, 81, 34, 75,145, 53,
+ 72, 49, 82,138, 84, 32, 85, 72, 29,242, 61,114,  2, 57,135, 92, 70,186,145, 59,200,  0, 50,130,252,134,188, 71, 49,148,129,178,
+ 81, 61,212, 12,181, 67,185,168, 55, 26,132, 70,162, 11,208,100,116, 49,154,143, 22,160,155,208,114,180, 26, 61,140, 54,161,231,
+208,171,104, 15,218,143, 62, 67,199, 48,192,232, 24,  7, 51,196,108, 48, 46,198,195, 66,177, 56, 44,  9,147, 99,203,177, 34,172,
+ 12,171,198, 26,176, 86,172,  3,187,137,245, 99,207,177,119,  4, 18,129, 69,192,  9, 54,  4,119, 66, 32, 97, 30, 65, 72, 88, 76,
+ 88, 78,216, 72,168, 32, 28, 36, 52, 17,218,  9, 55,  9,  3,132, 81,194, 39, 34,147,168, 75,180, 38,186, 17,249,196, 24, 98, 50,
+ 49,135, 88, 72, 44, 35,214, 18,143, 19, 47, 16,123,136, 67,196, 55, 36, 18,137, 67, 50, 39,185,144,  2, 73,177,164, 84,210, 18,
+210, 70,210,110, 82, 35,233, 44,169,155, 52, 72, 26, 35,147,201,218,100,107,178,  7, 57,148, 44, 32, 43,200,133,228,157,228,195,
+228, 51,228, 27,228, 33,242, 91, 10,157, 98, 64,113,164,248, 83,226, 40, 82,202,106, 74, 25,229, 16,229, 52,229,  6,101,152, 50,
+ 65, 85,163,154, 82,221,168,161, 84, 17, 53,143, 90, 66,173,161,182, 82,175, 81,135,168, 19, 52,117,154, 57,205,131, 22, 73, 75,
+165,173,162,149,211, 26,104, 23,104,247,105,175,232,116,186, 17,221,149, 30, 78,151,208, 87,210,203,233, 71,232,151,232,  3,244,
+119, 12, 13,134, 21,131,199,136,103, 40, 25,155, 24,  7, 24,103, 25,119, 24,175,152, 76,166, 25,211,139, 25,199, 84, 48, 55, 49,
+235,152,231,153, 15,153,111, 85, 88, 42,182, 42,124, 21,145,202, 10,149, 74,149, 38,149, 27, 42, 47, 84,169,170,166,170,222,170,
+ 11, 85,243, 85,203, 84,143,169, 94, 83,125,174, 70, 85, 51, 83,227,169,  9,212,150,171, 85,170,157, 80,235, 83, 27, 83,103,169,
+ 59,168,135,170,103,168,111, 84, 63,164,126, 89,253,137,  6, 89,195, 76,195, 79, 67,164, 81,160,177, 95,227,188,198, 32, 11, 99,
+ 25,179,120, 44, 33,107, 13,171,134,117,129, 53,196, 38,177,205,217,124,118, 42,187,152,253, 29,187,139, 61,170,169,161, 57, 67,
+ 51, 74, 51, 87,179, 82,243,148,102, 63,  7,227,152,113,248,156,116, 78,  9,231, 40,167,151,243,126,138,222, 20,239, 41,226, 41,
+ 27,166, 52, 76,185, 49,101, 92,107,170,150,151,150, 88,171, 72,171, 81,171, 71,235,189, 54,174,237,167,157,166,189, 69,187, 89,
+251,129, 14, 65,199, 74, 39, 92, 39, 71,103,143,206,  5,157,231, 83,217, 83,221,167, 10,167, 22, 77, 61, 58,245,174, 46,170,107,
+165, 27,161,187, 68,119,191,110,167,238,152,158,190, 94,128,158, 76,111,167,222,121,189,231,250, 28,125, 47,253, 84,253,109,250,
+167,245, 71, 12, 88,  6,179, 12, 36,  6,219, 12,206, 24, 60,197, 53,113,111, 60, 29, 47,199,219,241, 81, 67, 93,195, 64, 67,165,
+ 97,149, 97,151,225,132,145,185,209, 60,163,213, 70,141, 70, 15,140,105,198, 92,227, 36,227,109,198,109,198,163, 38,  6, 38, 33,
+ 38, 75, 77,234, 77,238,154, 82, 77,185,166, 41,166, 59, 76, 59, 76,199,205,204,205,162,205,214,153, 53,155, 61, 49,215, 50,231,
+155,231,155,215,155,223,183, 96, 90,120, 90, 44,182,168,182,184,101, 73,178,228, 90,166, 89,238,182,188,110,133, 90, 57, 89,165,
+ 88, 85, 90, 93,179, 70,173,157,173, 37,214,187,173,187,167, 17,167,185, 78,147, 78,171,158,214,103,195,176,241,182,201,182,169,
+183, 25,176,229,216,  6,219,174,182,109,182,125, 97,103, 98, 23,103,183,197,174,195,238,147,189,147,125,186,125,141,253, 61,  7,
+ 13,135,217, 14,171, 29, 90, 29,126,115,180,114, 20, 58, 86, 58,222,154,206,156,238, 63,125,197,244,150,233, 47,103, 88,207, 16,
+207,216, 51,227,182, 19,203, 41,196,105,157, 83,155,211, 71,103, 23,103,185,115,131,243,136,139,137, 75,130,203, 46,151, 62, 46,
+155, 27,198,221,200,189,228, 74,116,245,113, 93,225,122,210,245,157,155,179,155,194,237,168,219,175,238, 54,238,105,238,135,220,
+159,204, 52,159, 41,158, 89, 51,115,208,195,200, 67,224, 81,229,209, 63, 11,159,149, 48,107,223,172,126, 79, 67, 79,129,103,181,
+231, 35, 47, 99, 47,145, 87,173,215,176,183,165,119,170,247, 97,239, 23, 62,246, 62,114,159,227, 62,227, 60, 55,222, 50,222, 89,
+ 95,204, 55,192,183,200,183,203, 79,195,111,158, 95,133,223, 67,127, 35,255,100,255,122,255,209,  0,167,128, 37,  1,103,  3,137,
+129, 65,129, 91,  2,251,248,122,124, 33,191,142, 63, 58,219,101,246,178,217,237, 65,140,160,185, 65, 21, 65,143,130,173,130,229,
+193,173, 33,104,200,236,144,173, 33,247,231,152,206,145,206,105, 14,133, 80,126,232,214,208,  7, 97,230, 97,139,195,126, 12, 39,
+133,135,133, 87,134, 63,142,112,136, 88, 26,209, 49,151, 53,119,209,220, 67,115,223, 68,250, 68,150, 68,222,155,103, 49, 79, 57,
+175, 45, 74, 53, 42, 62,170, 46,106, 60,218, 55,186, 52,186, 63,198, 46,102, 89,204,213, 88,157, 88, 73,108, 75, 28, 57, 46, 42,
+174, 54,110,108,190,223,252,237,243,135,226,157,226, 11,227,123, 23,152, 47,200, 93,112,121,161,206,194,244,133,167, 22,169, 46,
+ 18, 44, 58,150, 64, 76,136, 78, 56,148,240, 65, 16, 42,168, 22,140, 37,242, 19,119, 37,142, 10,121,194, 29,194,103, 34, 47,209,
+ 54,209,136,216, 67, 92, 42, 30, 78,242, 72, 42, 77,122,146,236,145,188, 53,121, 36,197, 51,165, 44,229,185,132, 39,169,144,188,
+ 76, 13, 76,221,155, 58,158, 22,154,118, 32,109, 50, 61, 58,189, 49,131,146,145,144,113, 66,170, 33, 77,147,182,103,234,103,230,
+102,118,203,172,101,133,178,254,197,110,139,183, 47, 30,149,  7,201,107,179,144,172,  5, 89, 45, 10,182, 66,166,232, 84, 90, 40,
+215, 42,  7,178,103,101, 87,102,191,205,137,202, 57,150,171,158, 43,205,237,204,179,202,219,144, 55,156,239,159,255,237, 18,194,
+ 18,225,146,182,165,134, 75, 87, 45, 29, 88,230,189,172,106, 57,178, 60,113,121,219, 10,227, 21,  5, 43,134, 86,  6,172, 60,184,
+138,182, 42,109,213, 79,171,237, 87,151,174,126,189, 38,122, 77,107,129, 94,193,202,130,193,181,  1,107,235, 11, 85, 10,229,133,
+125,235,220,215,237, 93, 79, 88, 47, 89,223,181, 97,250,134,157, 27, 62, 21,137,138,174, 20,219, 23,151, 21,127,216, 40,220,120,
+229, 27,135,111,202,191,153,220,148,180,169,171,196,185,100,207,102,210,102,233,230,222, 45,158, 91, 14,150,170,151,230,151, 14,
+110, 13,217,218,180, 13,223, 86,180,237,245,246, 69,219, 47,151,205, 40,219,187,131,182, 67,185,163,191, 60,184,188,101,167,201,
+206,205, 59, 63, 84,164, 84,244, 84,250, 84, 54,238,210,221,181, 97,215,248,110,209,238, 27,123,188,246, 52,236,213,219, 91,188,
+247,253, 62,201,190,219, 85,  1, 85, 77,213,102,213,101,251, 73,251,179,247, 63,174,137,170,233,248,150,251,109, 93,173, 78,109,
+113,237,199,  3,210,  3,253,  7, 35, 14,182,215,185,212,213, 29,210, 61, 84, 82,143,214, 43,235, 71, 14,199, 31,190,254,157,239,
+119, 45, 13, 54, 13, 85,141,156,198,226, 35,112, 68,121,228,233,247,  9,223,247, 30, 13, 58,218,118,140,123,172,225,  7,211, 31,
+118, 29,103, 29, 47,106, 66,154,242,154, 70,155, 83,154,251, 91, 98, 91,186, 79,204, 62,209,214,234,222,122,252, 71,219, 31, 15,
+156, 52, 60, 89,121, 74,243, 84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126, 46,249,220, 96,219,162,182,123,
+231, 99,206,223,106, 15,111,239,186, 16,116,225,210, 69,255,139,231, 59,188, 59,206, 92,242,184,116,242,178,219,229, 19, 87,184,
+ 87,154,175, 58, 95,109,234,116,234, 60,254,147,211, 79,199,187,156,187,154,174,185, 92,107,185,238,122,189,181,123,102,247,233,
+ 27,158, 55,206,221,244,189,121,241, 22,255,214,213,158, 57, 61,221,189,243,122,111,247,197,247,245,223, 22,221,126,114, 39,253,
+206,203,187,217,119, 39,238,173,188, 79,188, 95,244, 64,237, 65,217, 67,221,135,213, 63, 91,254,220,216,239,220,127,106,192,119,
+160,243,209,220, 71,247,  6,133,131,207,254,145,245,143, 15, 67,  5,143,153,143,203,134, 13,134,235,158, 56, 62, 57, 57,226, 63,
+114,253,233,252,167, 67,207,100,207, 38,158, 23,254,162,254,203,174, 23, 22, 47,126,248,213,235,215,206,209,152,209,161,151,242,
+151,147,191,109,124,165,253,234,192,235, 25,175,219,198,194,198, 30,190,201,120, 51, 49, 94,244, 86,251,237,193,119,220,119, 29,
+239,163,223, 15, 79,228,124, 32,127, 40,255,104,249,177,245, 83,208,167,251,147, 25,147,147,255,  4,  3,152,243,252, 99, 51, 45,
+219,  0,  0,  0, 32, 99, 72, 82, 77,  0,  0,122, 37,  0,  0,128,131,  0,  0,249,255,  0,  0,128,233,  0,  0,117, 48,  0,  0,234,
+ 96,  0,  0, 58,152,  0,  0, 23,111,146, 95,197, 70,  0,  2,190, 27, 73, 68, 65, 84,120,218,236,157,119,120, 20,197, 31,198,223,
+217,221,235,119,233, 33, 61,144,132, 26,  8, 61,116, 66,111, 34, 77, 69,186, 10, 22, 64,129,159, 32,205,134, 32,130, 93,  1,149,
+174, 34, 32, 34, 72, 85,148, 42,189, 73,239, 61,129, 52,210,235,245,178,243,251, 35,185,243, 18,146,220, 37, 32, 22,230,243, 60,
+251, 92,178,187,247,222,236,236,236,236,187,223, 41, 75, 40,165, 96, 48, 24, 12,  6,131,193, 96, 60, 56, 56,150,  5, 12,  6,131,
+193, 96, 48, 24,255, 34,131, 69,  8,233,198, 52,153, 38,211,100,154, 76,147,105, 50, 77,166,201, 12, 22,131,193, 96, 48, 24, 12,
+  6,131, 25, 44,  6,131,193, 96, 48, 24, 12,102,176, 24, 12,  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96, 48,131,
+197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,198,127,  3,194, 38, 26,101, 48, 24, 12,  6,131,193,120,176,  8,
+229,109,104,214,172,217,207, 10,133,162, 86,121,219,117, 58, 93,234,153, 51,103, 58,179, 44,100, 48, 24, 46,159,228,  8,225,240,
+103,196, 92,  4, 64, 41,123,186, 99, 48, 24,143,162,193,146, 74,165, 81,251,247,239,175, 35,138, 34,108, 54, 27,172, 86,171,227,
+211,100, 50,225,169,167,158, 18, 42,251, 99, 77,154, 52,217,207,113, 92, 68,101,190, 99,179,217,238,156, 61,123,182,125,121,219,
+  3,  3,  3, 15,  3,136, 34,132,216, 43,242, 50, 63,  1,128,227, 28, 45,162, 41,137,137,137,205, 42,210, 36,132, 68, 57,221, 28,
+238,209,178,255,237,174,102,189,122,245, 78,  8,130, 16, 86,250,251,101,253,111,255, 91, 20,197, 91,231,207,159,111,203,138,233,
+195,161, 73,147, 38,251,121,158,175,116,249, 60,115,230, 76,185,229,179, 97,195,134,167, 57,142, 11, 41,235, 28,151,117,206,  1,
+240, 54,155,237,234,217,179,103,219,151,103, 64,130,131,131, 15,  3,136,170,168,236,148, 42,155,  0,144,148,152,152, 24,235,234,
+ 58,170,232, 26, 42,163,204, 87,168,233,108,174, 66, 67, 67, 63,168, 86,173,218, 88,157, 78,103,  0, 64,121,158,167,245,235,215,
+ 47,145, 15, 54,155, 45,227,242,229,203, 13, 89, 73,100, 48, 24,255,105,131, 37,138, 34,103, 52, 26,113,237,218, 53,148, 85,207,
+115, 28,103,171,236,143, 81, 74,235,236, 94,179, 42, 64, 89, 45, 16, 54,139, 25,114,191,106, 14,237,220,203, 23, 32,154,205,176,
+153, 77,240,143,109,109,175,112,209,185,115,103,222,133,108,216,164, 73,147,  2, 60, 60, 60, 96, 48, 24, 96, 48, 24, 96, 52, 26,
+ 97, 48, 24, 96, 50,153, 96, 50,153, 96, 54,155, 97, 54,155, 97,181, 90, 97, 52, 26,113,238,220, 57,155,139, 27, 66,216,132,  9,
+ 19,  2, 60, 61, 61, 29,122,246,197,174,105,215,181, 88, 44, 48, 24, 12,184,112,225, 66,133,154,130, 32,132,157, 58,117, 42, 64,
+ 42,149,130, 82, 10, 81, 20, 65, 41, 45,177,148,166,109,219,182,102, 86, 68, 31, 42,117, 54,125, 52, 55, 64,238,235,  7,209, 98,
+129, 95,147,230,246,114,139,148, 61,219, 97, 51,155, 33, 90, 44,168,209,247, 73,199,250,142, 29, 59,186, 42,159, 53,126,154,241,
+186,183,212,195,  3, 86,131,  1,145,125,158,112,108,184,184,120, 30, 68,139, 25,212, 98, 70,163, 73,111,  1,  0, 50, 51, 51,245,
+209,209,209, 41,  0,  8,128,242, 34, 60, 97,183,110,221, 10,176,167,161, 44,211,239,188, 28, 58,116,  8,195,135, 15,119,117,236,
+ 97,111,190,249,102,128,253, 26, 41, 93,206,173, 86,171,227,211,106,181,194, 96, 48,224,244,233,211,110, 69,174,130,131,131, 63,
+140,139,139, 27,181,122,245,106,245,166, 77,155,212, 17, 17, 17,144, 74,165,224,121, 30, 60,207,131,227, 56,  8,130,128,126,253,
+250, 17, 86,  4, 25, 12,198,127,222, 96,153,205,230,248, 30, 61,122, 80,  0, 48,153, 76,161, 50,153, 76, 90,202,128,133,180,107,
+215,238,106,233,239,185,106, 58, 84, 86, 11,196, 55,145,190,  0,128,167,111,102, 57,110, 12,235,227,154, 56,246, 25,122, 59,175,
+104, 95,165, 18, 28,199, 17, 23, 21, 56,212,106, 53,186,119,239, 14,153, 76,134,216,216, 88, 72, 36,146, 50, 23,169, 84, 10,137,
+ 68,114, 79,244,168, 44, 52, 26, 13,102,205,154,101, 55, 71, 80, 43,228, 24,223, 54, 22, 10, 80, 44,189,112, 29, 38,145, 66, 16,
+  4,199,226,142,166, 84, 42,197,249,243,231, 33,  8,  2,120,158,119,124,218,255,222,178,101, 11,  6, 14, 28,  8, 65, 16,160, 84,
+ 42, 81,124,147,101, 60, 68, 20,126,254, 88,223,161, 41,  0, 96,120, 98,129,163,140,253, 58,184,143, 99,159,103,146,181, 32,132,
+ 64, 42,149,186,119,222, 61, 60,176,109,224, 99,  0,128, 39,175,165, 67, 34,145, 64, 16,  4,156,251,236, 61, 72,100, 50,  8, 82,
+ 41, 26, 77,122, 11,153,153,153,250, 39,158,120,226,160, 66,161,216,238,198,195, 10, 18, 19, 19, 33,  8, 66,185,229,157,227, 56,
+172, 88,177,  2,183,111,223,118,235,216,245,122, 61,222,127,255,125, 16, 66, 74, 92, 47,229,253,237,234,216,  9, 33, 92, 80, 80,
+208,123,113,113,113, 35, 86,175, 94,237, 67,  8,193,151, 95,126,  9,169, 84,138,222,189,123,195,207,207, 15, 59,118,236,128, 84,
+ 42,197,212,169, 83, 89,225, 99, 48, 24,143,134,193, 58,115,230,204, 99,246,191, 91,183,110,125,249,224,193,131,245,156, 66,249,
+176, 90,173, 82,171,213, 90,199,222,108,104,127,242, 29, 58,116,104,133, 79,244, 54,139,249, 30,131, 84, 86, 69,237,206,141,203,
+201, 12, 98,208,160, 65,  0, 80,238,205,198,121,113,227,169, 27, 38,147,  9,130, 32,160,110,120, 53,188,221,179, 41, 90, 82, 11,
+180,133,  4,214, 60, 45,250,107, 44,184, 92,191, 25,150,220,201,192,237,252, 66,  8,130,123,173,165,162, 40,150,107,174,120,158,
+199,162, 69,139, 48,100,200, 16,240, 60, 95,110,190, 48,254, 90,108,102,179,203,114, 88,217,115, 99, 53, 24,138, 34, 75,  2,239,
+ 48, 87, 18,137,  4, 18,185, 28,130, 84, 10, 65, 38, 69,102,102,166,190, 91,183,110, 71,101, 50,217,119,129,129,129, 41, 73, 73,
+ 73, 21,150, 79, 74,105, 73,173, 50, 30, 38,190,253,246, 91,172, 92,185, 18,173, 90,181,114,199, 12,193,100, 50, 65, 42,149,226,
+189,247,222,187,103,251,226,197,139,239, 49, 88, 46,244,  8,  0, 46, 48, 48,240,229, 53,107,214,120,218,127,223,223,223, 31, 18,
+137,  4, 13, 27, 54,132,135,135,  7, 14, 30, 60,  8,155,205,230,246,131, 15,131,193, 96,252,235, 13, 86, 41, 99,192, 25,141, 70,
+ 92,185,114,  5,174,250,165, 82, 74, 43,172, 37,229,126,213, 28,145,171,117, 53,253, 28,235,135, 36,228, 58,110, 92,219, 90,214,
+130, 76,163, 70,236, 59, 31,187,109,134,210,211,211, 29, 79,222,174, 22,119, 42,114,147,201,  4,149, 82,129, 93, 19, 27, 34, 49,
+ 75,134,153, 71,178,241,203,153, 27,144, 72, 36,232, 85,191, 33, 30,147,122,224,173, 26, 50, 76,188,158,  0, 11,165,110,221,192,
+ 40,165,101, 26, 43,251,223,246,166, 18,187,193, 98, 60,124,252,154, 52,119, 68,174, 86,135,123,220, 19,181,  2,128, 45,205, 34,
+ 32,247,208,160,225,255,166,187, 85, 62, 35,251, 60,225,136, 92,253,210, 60, 18,188, 68,  2,137, 76,134,167,207, 39,  3, 40,106,
+ 22,236,220, 48,122, 95, 46, 47, 91, 49, 98,196,136,248,223,127,255, 93,233, 78, 90,203, 50, 88,118,243,243,237,183,223, 98,213,
+170, 85, 16,  4,  1,102,179,217,173,116, 26,141,198,114,141, 83, 85, 34, 88,  0,160,211,233, 76,155, 55,111,198, 23, 95,124,  1,
+ 63, 63, 63,244,232,209,  3,193,193,193, 88,183,110, 29, 40,165, 24, 55,110, 28,148, 74, 37,148, 74, 37, 43,243, 12,  6,227,209,
+ 51, 88,102,179, 57,190, 91,183,110,110,141,248,209,235,245,119, 93, 24,176, 50, 35,  3,206, 81,  1,185,135,  6,114,141,  6,156,
+155,179,116, 89, 44, 22,135, 65,217,185,115, 39,148, 74, 37,122,247,238,125, 95, 17, 44,179,217, 12,153, 84,  2,206, 63, 16,207,
+126,254, 59,178, 10,244,142, 27,218,222, 91,241, 56,149,150,142,137,109,186, 66,173, 76, 71,161,201,228,118,  4,171,180,185, 18,
+  4,  1,131,  6, 13,130,209,104,  4, 33,164, 68,191, 20, 87,102,149,241,215, 81,222, 32,  4, 66,  8, 20,158, 30,144,169,213,224,
+121,222, 45, 45,231,104,147, 32,147, 65, 34,151, 65, 40, 46,135,246,200, 85, 46, 47, 91,145,156,156,124, 20,128,162,101,203,150,
+ 74,119,210,230,108,176,156, 13,144,179,185,226,121, 30, 22,139,197, 45,243, 98, 52, 26, 33,149,254,217, 19,224,206,157, 59, 21,
+ 26, 44, 23,199, 76,  9, 33, 34, 33, 68,140,138,138,114,124, 55, 40, 40,  8,222,222,222, 16, 69, 17,162, 40, 66,161, 80, 64,169,
+ 84,150,248, 93,  6,131,193,120,100, 12,150,115,115,225,131,186,121, 85,116,  3, 83,122,122, 66,170, 86,219, 71, 43, 81,119,204,
+144,189,207,201,216,177, 99, 43,236,151, 98, 55, 98,110,152, 74,112,  2,143,212,160, 72,216,184,  3,127,222, 32,139, 23, 78,144,
+224,118, 80, 61,240, 87, 78, 67, 34,138,110,221,192, 74, 71,176,198,141, 27,135,101,203,150,129,227, 56, 71,158,  8,130,128,218,
+181,107, 35, 62, 62,158,149,206,191,  1, 90, 65, 52,210,190, 94,225,225,  1,153, 70,  3,222,141,190,119,165,205,144, 84, 46,135,
+ 32,147, 66,144, 22, 53, 11,246,237,219,119, 95,110,110,238,138,  6, 13, 26, 92, 71,209, 52,  6,156,187,215,144, 32,  8, 37,140,
+ 79, 89,230, 74, 16,  4, 88,173, 86,183, 31, 42, 74, 27,157, 57,115,230,220,179,239, 83, 79, 61,229,110,  4,139, 18, 66,168, 84,
+ 42, 69,247,238,221,209,168, 81, 35,108,218,180,  9,162, 40,226,149, 87, 94,129, 82,169,196,188,121,243, 96,181, 90,241,225,135,
+ 31,178,  8, 22,131,193,120,244, 12,214,131, 36,247,210,121, 71, 39, 98,231,102,193,223,218,214,131, 92,163,134, 92,163, 65,187,
+ 77,  7, 28, 79,205,120,239, 83,183, 34, 88,118,131,149,149,149, 85,161,185,114, 39,130,229, 48, 88, 50,  1,235,195,114, 64,101,
+ 18,  8, 38, 75,  9,131,197, 11, 18, 36,250, 69,130,147, 72, 33,216,172,110,105, 82, 74,239,105, 18,124,238,185,231, 64,  8,113,
+140,248,106,220,184,177,243,141,134,221,113, 30, 50, 41,123,182, 59, 58,180, 59, 55, 11,254,220,178, 22, 20, 30, 26,200,212,106,
+116,216,122,216, 17,109,196,188,165, 46, 53,175,126,253, 21,206,207,155, 11,137, 76,134, 39, 79,223,118, 68,174,218,214,173,117,
+212,164,246, 92,113,231,206,157,163,  0,184,193,131,  7,123, 55,110,220,216,173,107,210,222,201,190, 60,115,229,108,176, 44, 22,
+139,219,101,222,157,235,195, 30,197,114,163,188,211,232,232,104,112, 28,  7, 79, 79, 79,104, 52, 26,199,  8, 90,133, 66,  1,149,
+ 74,229,232,191,233,238,117,201, 96, 48, 24,255,106,131,213,164, 73,147, 95, 85, 42, 85,164,187, 34,149,153,116,212,185, 19,177,
+221, 92, 17, 66,160,208,104, 32,211,168, 33,247,208,148, 27,229, 42,239, 70, 99,111, 34,228,121,222,113,179,249,238,187,239,160,
+209,104, 48,114,228,200, 74,247,193,178, 63,205,115, 82, 14, 59,228,123,192,203,132, 18,230, 74, 16,  4,240, 18,  9,238,106,130,
+193, 73, 36, 16,172,174,163, 98,132, 16,228,229,229, 65, 16,  4,188,253,246,219,142, 39,118,103,115,197, 58,182,255,253,136, 78,
+102,164, 68, 84,213,195,195, 81, 62,157,215,187,234,147, 72,  8,  1,181, 90, 32,145,203, 33, 41, 30,136,107,143, 92,153,212,158,
+ 43,234,213,171,231,136, 92,169, 84, 42,251,232, 81,151,154, 28,199,149, 40,211, 43, 86,172, 40, 97,174, 74, 71,176,220, 45,243,
+ 82,169, 20,203,150, 45,171,208, 68, 73,165, 82,183, 71, 80,  2, 69,211, 70,236,219,183, 15,167, 78,157,194,216,177, 99,161, 84,
+ 42,177, 96,193,  2, 88,173, 86,204,158, 61, 27, 74,165, 18, 50,153,140, 21, 62,  6,131,241,223, 55, 88, 50,153, 44,242,208,161,
+ 67,142, 73, 70, 43,250, 52,153, 76, 24, 52,104,144,219,145, 48,177,120, 20, 33, 87,106,164,156,220, 83,  3,121,113,211,139,243,
+122,226, 70, 45,110,127,  2,118, 54, 88,239,188,243, 14,  4, 65,192,178,101,203,  0,  0,147, 39, 79,118,187, 15,150, 93, 19, 54,
+130, 36,122, 19, 77, 63, 31,  8,211,106, 11,210, 14,157,133, 32,  8,  8,104,253, 24,196,150,  3,161, 83,106, 32,216,172,110,143,
+ 34,204,206,206, 70,124,124, 60,120,158,199,164, 73,147, 74,204, 85, 84,234,152,177,115,231, 78,214,  7,235,111, 52, 88, 92,113,
+255,170,178,202,103, 41,243,229,186,157,204,102, 45,234,119, 37,253,115,180, 96,110,110,238,138, 59,119,238, 28,  3,192,141, 24,
+ 49,194, 91,165, 82,225,235,175,191,214,  1,144,173, 91,183,206,165,203,178,151,155,242,204, 85, 85,154,  8,237,145, 96,231,126,
+ 93,247,107,176,236,102,144, 16,  2,155,205,  6,165, 82, 89, 34,114,165, 80, 40, 32,151,203, 89,193, 99, 48, 24,143,134,193,226,
+ 56, 14, 70,163, 17,151, 46, 93,114,247,  9,213,237, 73, 71,253,154,183,194,208,219,121, 32,132, 96, 71, 92,  3, 71,179, 75,219,
+159,246, 57, 42,236,219,239, 79,134, 68,173,129, 95, 92,143, 74,221, 24,156, 13, 86,110,110, 46, 36, 18,  9,222,123,239, 61,112,
+ 28,135, 15, 63,252, 16,161,161,161, 72, 77, 77, 69,199,142, 29,221,122,154,231,109, 60,130,159,137,134,234, 57, 47,120, 62,211,
+  1, 62,221,223, 65,178, 73,192, 97,131, 10, 29, 12, 23, 33,219, 49, 31, 38,209,230,150,193, 34,132,192,106,181, 98,223,190,125,
+ 37, 58,178,  3, 69, 77,135,246,233, 46, 44, 22, 11,204,102, 51, 62,252,240, 67, 86, 58,255,  6,194, 31, 31,128,103, 83,116,  0,
+128, 95,157,154,173,219,111, 60,224, 40,159,241,115, 38, 65,162,214,192,167, 69,156, 91,154,245, 95,153,130,250,175, 76, 65,102,
+102,166,190,107,147,  6,251, 11,165,170,111, 27, 54,108, 88, 34,114,165, 80, 40, 72,241,255,196,157,178,196,113, 28,120,158,119,
+152, 43,187,153, 42,203, 96,185,251,  0, 96,177, 88, 32,149, 74,221, 54, 88,238,194,113, 28,158,127,254,121,  4,  7,  7, 59, 34,
+ 87,239,190,251, 46,148, 74, 37, 94,127,253,117, 88, 44, 22,204,159, 63,159, 21, 62,  6,131,241,223, 55, 88, 70,163, 49,161,107,
+215,174, 40,103, 91,168, 92, 46, 47, 17,  6,178, 79, 58, 90,186,169,144, 16,210,141, 82,186,171,172, 27,132,243,104, 44,121,169,
+168,149,212,195, 19, 18,181,  6, 92, 25,209,166,210,154,246, 39,227,210,  6,203,190,228,229,229, 65, 34,145,224,139, 47,190,128,
+167,167,167, 99,180, 94, 69,154,246,  8, 22,207,243,208, 37, 22,224,242,220, 93,144, 41, 14,163, 86,143, 33,  8,150, 40, 33, 61,
+184,  1,122,155,165,194,137, 70,203,210,172, 83,167, 14,102,204,152,113,207,244, 12,229,209,172, 89, 51,151,154,247, 11,211, 44,
+ 91,211,157,242,201,203,229, 46,207,187,125,187, 61,114, 85, 40, 85,125, 27, 31, 31,111,143, 92,121,169, 84, 42, 44, 94,188, 88,
+  7,128,155, 61,123,182,170, 70,141, 26,188, 59,233,228,121, 30,223,125,247,221, 61, 29,218,203, 50, 87,101, 77,251, 81, 86, 58,
+173, 86,235, 61,  6,107,208,160, 65,247,140, 30, 44, 47,130, 85, 86, 58,237,125,213,252,252,252, 28,145, 43,155,205,230, 24, 61,
+104,177, 88, 96,181, 90,203,109,106,101,229,147,105, 50,205, 71, 71,243,145, 48, 88,167, 79,159,238, 85,222, 23,218,181,107,119,
+237,208,161, 67,181,109, 54,155,243, 59, 10,165,  6,131,161, 78,255,254,253, 93, 62, 42,139,162,  8,185, 92, 14, 74, 41,154,190,
+245,  1,  8,185,183,191,149,119,219,174, 32,130,  0,155,205,  6,139,197,226,114,122,  8,189, 94,239,184,153,148,215,193,189,176,
+176,176,194,121,126, 74,223, 20, 12,  6, 67,137, 27, 21,161, 34,110,239,254,241,158,209,132,149,137, 16,  0,128, 66,161, 40,209,
+239,202, 85, 82, 88, 17,125,184,216,167, 84,160,148,162,193,248,105, 69,231,169,184,185,208,110,  2,188, 98,227, 64, 36,  2, 68,
+  0,102,179,217, 85,249, 36,246, 62, 87,148,210,111,250,247,239,127, 21,128, 17,  0,213,104, 52,114,137, 68, 34,  2,200,  6, 64,
+115,114,114,188,146,147,147, 69,131,193, 80,221, 85, 58,247,237,219,135, 27, 55,110,160,121,243,230,142, 87, 54,217,155,221,236,
+ 38,198,217, 96,185, 27,193, 42,107, 78,173,242,102,115,119, 23,158,231,225,229,229,229,152,196, 84, 42,149, 66,165, 82,  1,  0,
+230,207,159,239,200,115,  6,131,193,248,207, 27, 44, 23,  6,137, 47,175,249,208, 85, 83,161,205,102, 75,106,217,178,101,101,127,
+ 47,205,197, 13, 49,105,255,254,253,210,138, 94,242, 92,198, 58,151,154,199,142, 29,147, 86,240,253,178,254, 78,115,117,236,173,
+ 90,181, 42,243,251,229, 97,181, 90,147, 89, 17,125,120, 88,173,214,242,203,231, 59, 31,148,119, 94,211, 92,152,150,235,181,107,
+215, 78,209,104, 52,191,  4,  6,  6,102, 29, 58,116,200,175, 69,139, 22,126,206,251,180,104,209, 34,184,212,215, 76,168, 96,122,
+ 18, 66, 72,210,179,207, 62, 43,117, 81,198, 75,255,159,228,226,161, 34,233,194,133, 11,210,178,180,202,251,164,148, 38,185,145,
+173,183,123,245,234,197, 57,127,183,188,178,111,181, 90, 51, 88, 41,100, 48, 24,143,172,193, 50, 24, 12,137, 93,187,118, 45,179,
+215,172, 78,167,187, 83,209,119, 47, 92,184, 16,251,160, 15, 32, 41, 41,169,237,191, 65,243,175, 56,118,198, 63,255, 28, 93,184,
+112,161,229,131,214,188,115,231, 78,219,127,131, 38,  0, 92,188,120,177, 13, 43, 89, 12,  6,131, 25, 44, 55,112,119, 58,  6,  6,
+131,193, 96, 48, 24,140, 71, 21,142,101,  1,131,193, 96, 48, 24, 12,198,131,133,  0,232, 86,214,134,202,140, 14, 32,132,116,171,
+236, 15,187,210,103,154, 76,147,105, 50, 77,166,201, 52,153,230,127, 79,211,149,246,127,102,116, 34,165,244, 47, 91,  0,116, 99,
+154, 76,147,105, 50, 77,166,201, 52,153, 38,211,124,212, 22,214, 68,200, 96, 48, 24, 12,  6,131,241,128, 17, 88, 22,252, 61, 16,
+ 66,120, 74,169,237,  1, 74,250,  0, 40,239,133,110, 38,  0, 57, 85, 73, 38,  0,105,241, 98,159,168,200,  2,192, 92,188, 80,215,
+ 18,179,184,148, 20,159, 24,106,147,180,160,132, 72, 68, 17,103,170, 87, 15, 63, 13,244, 50,  1,128, 38,168,126,125,141, 90,217,
+205,104, 54, 69,202, 37,178, 75,185,218,194,157,134,180,171,  9,172,132, 48, 24, 15,159,216,216,216, 81,148,210, 57, 69, 85, 20,
+121,239,196,137, 19, 95,178, 92, 97, 48, 30,176,193,170, 85,171,214,  9,142,227,194,236,147, 97, 86, 52,231,142,253,211,102,179,
+ 37, 93,190,124,217,173,161,238,132, 16, 33, 56, 56,248,105,181, 90,221,153,231,249,118,197,223, 63,164,213,106,127, 79, 77, 77,
+ 93, 71, 41,181, 86,229,128,162,162,162, 60, 13,  6,195, 32, 66,200, 48,  0,160,148,126,175, 80, 40,126,188,117,235, 86,126, 21,
+141, 80,173,160,160,160,239, 37, 18,  9,159,152,152,216, 25,  0,194,195,195,127, 55,153, 76,182,244,244,244, 97,148,210, 27,149,
+212,227,164, 82,233,  7,113,113,113,237,  9, 33, 43, 41,165,139, 30,208,185,148,115, 28, 87,166, 49, 17, 69, 49,162, 10,122, 82,
+  0, 94, 95,124,241,133,223,170, 85,171,154, 38, 37, 37, 53,  4,128,176,176,176,243, 35, 70,140, 56, 61,126,252,248, 44,  0,121,
+197, 70,171, 92, 82, 82,124, 98,210,239,222, 26,155,150,126,105, 16,  0,  4,  5, 55,252,145,231, 57,105,104,232,169, 35, 42,255,
+ 97,254,117,235,213, 28,243,195,215, 95, 72, 35, 34,195,177,231,240,169, 38,227,255,247, 70,140, 34,176,238,167,204,100, 61, 60,
+234,212,169,115,130,227,184,176,202,204, 37, 87,252,  6,133,164,139, 23, 47,198,150,167,201,243,124,152,171,185,186, 74,175, 19,
+ 69,241,214,133, 11, 23,202,156, 50,162,110,221,186, 71,120,158,143,116,183, 62,114, 78,103,121, 83,112,212,173, 91,247,  4,207,
+243, 97,174, 52, 75,175, 19, 69,241,214,249,243,231,219,186,171,233, 98, 14,189, 42,165,211, 29,205,138,210,  9,  0,157, 58,117,
+146,107,181,218,239, 53, 26, 77, 99,173, 86, 59,138, 82, 58, 99,239,222,189,129, 28,199,161, 91,183,110, 51, 98, 99, 99,227, 21,
+ 10,197, 66,189, 94,127, 90,163,209, 12,221,187,119,175,145, 93, 49, 12,198,125, 26, 44,142,227,194, 78,157, 58, 21,160, 86,171,
+ 81,108, 84, 96,159,189, 93, 20, 69,136,162,  8, 74,169,227,211,106,181,162, 83,167, 78,110,253,104, 88, 88, 88,195,186,117,235,
+174, 31, 55,110, 92,245,190,125,251,202,  2,  3,  3, 65,  8,193,221,187,119,235,252,242,203, 47,195, 23, 44, 88,240, 78, 88, 88,
+216,192,164,164,164,243,238,154,150,224,224,224,174,  0,158,107,216,176,225,147,147, 39, 79,150,182,107,215, 14, 54,155, 13,123,
+246,236,137,155, 55,111,222, 23, 33, 33, 33, 27,  0,172, 72, 77, 77,221, 77, 41, 21,221,212,109, 26, 25, 25,249,227,129,  3,  7,
+ 34, 19, 18, 18,108,  3,  6, 12, 88,  9,  0,135, 15, 31,110, 44,138, 34,105,215,174,221,175,132,144, 65,148,210,211,149,200,243,
+254,227,199,143, 31, 56,110,220,184,106, 35, 71,142,124,  6,192,162,226,223, 34,197,249, 76, 43,121, 14, 29,145, 43, 74,105, 69,
+211,107,  7, 85, 34,146,165,142,143,143,247,105,219,182,237,203,233,233,233, 19,157,117,211,210,210,112,242,228, 73,243,220,185,
+115, 63, 63,124,248,240,194,200,200,200, 28,  0,218,242,132,168, 77,210, 34, 45,253,210,160, 14,109,190,240,  2,128,117, 91, 94,
+ 30,114,252,116,134,199,207,191, 45, 25, 46, 83, 72,141,171,150,126, 46,173, 93, 43,  2,123, 79, 92,199,177, 75,217,164, 97,251,
+ 62, 66,222,207, 43,187,  3, 88,194, 46,207,135,  3,207,243,161, 39, 78,156,  8, 80,169, 84,101,190,208,189, 84,191, 11, 16, 66,
+ 64, 41, 69, 92, 92, 92, 69,154, 97,167, 78,157, 10, 80, 40, 20,142,186,163,116,157, 97,175, 87, 28,101,133, 82,116,232,208,193,
+ 92, 65,157, 84,227,143, 63,254,  8, 80,169, 84, 14,157,178,210, 87,218,104,116,232,208,161,194,116,158, 60,121,210,145, 78,119,
+ 52, 41,165,104,215,174,157,205,213,177,219,223, 88,225,234,184,237,154,109,218,180,161,149,209,116, 51,157, 21, 62,  0,105,181,
+218,239,215,173, 91,247, 68, 96, 96, 32,250,247,239,191,163, 65,131,  6, 50,149, 74,133,223,126,251, 13,225,225,225,254, 30, 30,
+ 30,219,222,127,255,125,124,250,233,167,213,119,238,220,185,  6,192, 19,236,138, 97, 48,238,223, 96, 65,173, 86, 99,237,218,181,
+142,215,195,216, 95,147, 81,214,223,213,171, 87,119,235,  7,131,130,130, 98, 35, 34, 34,246,109,218,180, 73, 25, 16, 16,224, 88,
+111, 50,153,224,233,233,137,231,158,123, 78,214,189,123,247,218,195,134, 13, 59, 26, 20, 20,212,241,238,221,187, 39, 42,210, 11,
+ 14, 14,126, 50, 38, 38,230,203,137, 19, 39,  6,246,235,215, 15, 62, 62, 62, 37,182,247,233,211,  7,189,123,247,150,222,186,117,
+107,200,186,117,235,134,172, 92,185,242,110,112,112,240,248,212,212,212, 13, 21, 58, 12,181,186, 91,147, 38, 77,190,222,179,103,
+ 79,152,183,183, 55, 66, 66, 66,184,183,223,126,187, 97,205,154, 53,149, 65, 65, 65, 92,106,106, 42, 54,108,216, 80,115,196,136,
+ 17,155, 21, 10,197, 40,131,193,176,219, 13,195, 38,243,245,245,157, 50,122,244,104,191,252,252,124,235,169, 83,167,174,219,215,
+203,229,242, 25,173, 91,183,110, 70,  8, 89, 75, 41, 93, 81,149,200, 21,165, 52, 31,127, 54,229,217,177,216,183,187, 25,201,146,
+157, 57,115,198,183, 77,155, 54, 27,140, 70, 99,179,177, 99,199,222,153, 59,119,174,210,211,211,211, 19,  0,201,207,207,207,153,
+ 53,107,150,105,222,188,121,211,234,215,175,223,245,200,145, 35, 79, 54,105,210,196, 82,108,222,238, 53, 88,132, 56,210,147,152,
+156,129,125,135, 69,217,140,215, 39,135,125, 52, 39,242,246, 31, 23, 19, 69, 65,233,137,173,251, 47, 32, 45,171, 16,191, 30,185,
+136, 32, 63, 15, 34,149, 75, 98,188,195, 98, 58,230, 37, 95,220, 95,  5,195,201,168,  2, 42,149, 10, 91,183,110,189,231, 21, 83,
+101,189,126, 74, 16,  4,120,123,123, 87,248, 54,  2, 66,  8, 20, 10,  5,118,238,220, 89,226,245, 82,101,253,109,255,244,242,242,
+  2,165,180,194, 87, 28, 40, 20, 10, 28, 58,116,  8, 28,199,221,243,253,210,105, 22,  4,  1,106,181, 26,132, 16,206,149,230,254,
+253,251, 93,106,217, 63, 53, 26, 13,  0, 84,248,254, 33,185, 92,142,131,  7, 15,150,123,204,165,255,214, 20,191,239,210,149,230,
+161, 67,135, 74,188,162,171,244,171,187,156,255, 47,126, 56,174, 80, 84,169, 84, 54, 14, 12, 12,196,241,227,199, 49,115,230, 76,
+ 89, 76, 76, 12,174, 95,191, 14, 66,  8, 70,142, 28,137,  6, 13, 26, 32, 53, 53, 21, 13, 26, 52,192,193,131,  7,155,178, 43,133,
+193,120,  0,  6,203,142, 59,230,202,254, 30,177,210, 21, 68,233,161,150, 17, 17, 17,114,141, 70,243,211,214,173, 91,149,126,126,
+127,190, 45,196,104, 52,162,160,160,  0,133,133,133, 40, 40, 40,128,135,135,  7, 22, 46, 92,168, 28, 58,116,232, 79, 17, 17, 17,
+117, 18, 18, 18,140,229,105, 18, 66, 62, 63,115,230, 76,160,213,106,133, 76, 38, 43,215, 44,214,170, 85, 11,227,199,143, 71, 92,
+ 92, 92,208,224,193,131, 63,  7,176,161, 60,205, 98,227,246,213,225,195,135,195,164, 82, 41,174, 93,187,134,164,164, 36,140, 25,
+ 51,166,134, 40,138, 72, 76, 76,196,245,235,215,145,156,156,140,101,203,150,133, 13, 29, 58,116, 33,128,218, 21, 29,123, 49, 47,
+ 78,154, 52,169,142,175,175, 47,247,241,199, 31,231, 21, 22, 22, 46, 45, 94,255,250,252,249,243,135,118,232,208,161,218, 11, 47,
+188,  0, 66,200, 15,148,210,123, 12, 75, 41,205,178, 34, 87, 54,  0,151, 75,125, 45,186, 84,100, 43,  8, 69,239,194,203, 45, 67,
+147,  0,240,234,209,163,199, 36,163,209,216,236,224,193,131, 55,218,181,107, 87,  3, 64, 42,128, 12,  0,240,242,242, 82,127,254,
+249,231,129,125,250,244,185,218,165, 75,151,102, 61,122,244,152,148,145,145, 49,183,120, 59, 45,173, 41,138, 56, 19, 20,220,240,
+199,253, 71,198, 15,218,123,200, 36,157,252,191,119,238, 84, 15,143,200, 59,115, 45,219,118,241, 86,  6, 10,244, 86, 60,209,165,
+ 17,  0,160,117,195,234,248,114,237, 65,188,242,234,155,146, 13, 63,174,124,234,  6,133, 26,192, 47, 21,228,231,125,193, 52,255,
+ 52, 67,162, 40, 66, 34,145,224,177,199, 30,  3, 33,228,158,119,109, 74, 36, 18, 28, 57,114,  4, 93,186,116,129, 68, 34,193,243,
+207, 63,239, 50,157,162, 40, 66, 16,  4,244,232,209,  3, 86,171,245, 30,189,210,102,193,254,142,206,138, 52, 41,165, 16,  4,  1,
+ 28,199,149,105,126, 74, 47,101,153,150,178,142,221,149,150,243,182,178, 94,247, 83, 90,211,158, 78,119,204,149, 93,211,221,116,
+ 10,130,128,182,109,219,226,244,233,211, 21,154, 45,142,227, 92,214,201, 90,173,246,185,254,253,251,239, 24, 59,118,172,  2,  0,
+178,178,178, 28, 47,162,231,121, 30, 87,174, 92,129,201,100,194,234,213,171, 97, 52, 26,199,178,235,136,105,254,149,154,143,140,
+193,178, 87, 18,238, 26, 44,119,222,173, 71, 41, 29,247,250,235,175,  7, 86,100,174, 10, 11, 11,145,146,146,130, 26, 53,106,224,
+233,167,159, 14, 92,185,114,229, 56,  0,159, 84, 32, 43,229,121, 30,199,143, 31, 71,122,122, 58, 26, 53,106,132,200,200,200, 18,
+ 59,220,188,121, 19,219,182,109, 67,110,110, 46,154, 55,111, 14, 20,245, 47, 42,147, 38, 77,154,204,140,142,142,238,209,169, 83,
+ 39,185, 68, 34,193,153, 51,103,208,172, 89, 51,172, 93,187, 22,213,171, 87,135, 74,165,194,213,171, 87,209,168, 81, 35,236,219,
+183, 15,213,170, 85, 67, 76, 76,140,188,121,243,230,  7,178,179,179,127, 79, 72, 72,152, 89, 78,126, 74, 67, 67, 67,223, 24, 61,
+122,180, 44, 37, 37, 69,252,238,187,239, 14, 83, 74, 15, 19, 66,198,188,249,230,155,207,244,236,217,179,218,169, 83,167,242,255,
+248,227,143, 63,202, 50, 87,110, 70,174,172,165,111, 70, 54,155,205,168,215,235, 77, 70,163,209,194,113, 92,  2, 33,196,100,179,
+217,234,148,247, 48,255,220,115,207,213,204,204,204,124,229,213, 87, 95,141, 47, 54, 87, 87, 80,212,177, 29,  0, 96,181, 90,141,
+133,133,133,249,109,218,180,169, 49,116,232,208, 27,107,214,172,121,229,185,231,158, 91,183, 98,197,138, 66,  0,250,210,130,213,
+171,135,159,230,121, 78,170, 45,240,189,181,126,221,242,137,219,182,140, 11, 79, 76, 76,174,237,231, 95, 77, 43,213, 84, 75, 89,
+247,253,183, 39,  0,152, 82, 50,242,113,238,230, 93, 72, 36, 60, 46, 37,230,161, 67,175,167, 37, 55,174,205,105,111, 55, 88,140,
+191, 20,106,127, 57,244,222,189,123, 43,140, 96, 29, 57,114,  4, 18,137,  4, 74,165, 18,107,215,174,173, 80,212,110,  8,236,209,
+ 33, 87, 38,198,213,203,207,237, 38,195,254,  2,246,210,203, 87, 95,125,133, 87, 95,125,181,196,111, 20,107, 18,119,210, 89, 86,
+250,106, 68, 68, 32, 61, 45,173,196, 58, 55, 94,210, 14,155,205,  6,137, 68,130,101,203,150,161, 79,159, 62,248,249,231,159, 43,
+252, 44, 54,182,212,157,116,182,109,219, 22,102,179,217,145,230, 43, 87,174,148,169,187,104, 81,197,221, 59, 99, 99, 99, 71, 17,
+ 66,230,212,173, 91, 87,222,185,115,103,236,223,191, 31,115,230,204, 17,173, 86,107, 38,  0,180,109,219,182,218,196,137, 19,201,
+201,147, 39,161,209,104,144,145,145,177, 34, 54, 54,118, 54,235,248,206, 96, 60,128,  8,150,189,210,117,101,174,236, 79,138,174,
+ 76,150, 70,163,233,221,171, 87, 47,135,185, 49, 24, 12, 14, 99,101, 55, 87,246,255,175, 94,189,138,152,152, 24,169, 70,163,233,
+237,194, 96, 21, 29,136, 32, 32, 36, 36,  4,153,153,153, 56,127,254, 60,106,212,168,  1,139,197,130,237,219,183, 35, 47, 47, 15,
+ 18,137,  4, 82,169, 20,102,115,133, 93, 18, 16, 29, 29,253,216,170, 85,171, 98, 87,174, 92,153, 99,127,130,251,254,251,239, 65,
+ 41, 69,181,106,213,160,211,233,144,150,150,134,223,127,255, 29, 86,171, 21, 26,141,  6,161,161,161,138,113,227,198,181,159, 53,
+107,150,  4,192,204,114,164, 91, 61,245,212, 83,158,158,158,158,248,223,255,254, 71,205,102,243, 39,132,144,214, 79, 62,249,228,
+ 27,227,199,143,247, 77, 72, 72, 48,189,248,226,139, 39,204,102,243,231,197, 55, 19,  9,165,212,226,194,176,150, 27,185,178, 88,
+ 44,246, 60,141, 47, 44, 44,132,191,191,127, 13, 23,125,180,  0, 64,122,232,208,161,182,  0,248,217,179,103, 43, 80,244,  2,107,
+ 71, 26, 76, 38, 19, 10, 11, 11,161,213,106, 45,121,121,121,233, 83,166, 76,177,174, 89,179,134, 47,254,206,165,178, 12, 22,208,
+203,212,160,129, 90, 70, 41,255,230,146, 37, 75, 52, 61,123,246,228, 52, 26, 13, 10, 10, 10, 60,127,253,237, 55, 77,215,206,237,
+163,230,126,240,209, 14,207,176, 70,105,135,206,220, 66,242,221, 60,152, 44, 22, 68,  5,123, 21,197,191, 24,127, 57,197, 29,172,
+ 29, 17, 44,103, 51,177,127,255,126,244,234,213,203,113,173, 75,165, 82,199,126,238,104, 10,130,128, 94,189,122,221, 19,209,217,
+187,119,111,153,209, 38, 87,117,136,179, 25, 42,109,138,202, 50, 94, 28,199,193, 85, 43,179, 61,122, 87,150,201,114,142,226,151,
+ 50,109,174, 30, 38, 33,  8,  2,198,143, 31, 15,137, 68,130,169, 83,167, 66, 16,  4, 52,109,218, 20,130, 32,160, 77,155, 54,144,
+ 72, 36,232,210,165, 75,185,145,182,178,204,165, 32,  8, 56,122,244, 40,154, 53,107,230, 72, 83,211,166, 77,209,162, 69, 11,  8,
+130,128,184,184, 56, 72, 36, 18,244,232,209,195,165,166,189, 67,187, 70,163,193,213,171, 87,193,243, 60,  8, 33, 89, 39, 79,158,
+ 12,  4,128,153, 51,103,102,234,245,122, 63,131,193,128,174, 93,187,162,125,251,246,213,190,255,254,251,183,  1, 48,131,197, 96,
+220,111,  4,203, 94,233,186,107,176, 92, 97, 48, 24,154,216,163, 87,101,153, 43,231, 79,147,201,132,154, 53,107,194, 96, 48, 52,
+169,236,205, 34, 56, 56, 24,102,179, 25,203,151, 47,135, 84, 42,133, 84,250,167,175, 48,153, 42, 14, 14, 93,188,120, 49,254,232,
+209,163,205,154, 55,111,238,179,113,227,198,140,238,221,187, 87,235,217,179, 39,148, 74, 37,244,122, 61, 44, 22, 11, 90,183,110,
+141,232,232,104,164,167,167,227,215, 95,127,205,172, 83,167,142,255,177, 99,199,196,187,119,239,222,174, 64,186,107,215,174, 93,
+ 65,  8,193,175,191,254,154, 69, 41, 61,169, 84, 42, 55,206,157, 59,215,219,100, 50,137,207, 60,243, 76, 98,118,118,246, 20,  0,
+ 22,185, 92,254, 73,207,158, 61, 91,241, 60,191,214,102,179, 85,186, 50, 43,157,183, 90,173, 22, 10,133,194,157, 41, 33, 36,217,
+217,217, 13,  1, 64,173, 86,251,  2,112,140,144,212,235,245, 37, 76,176,201,100, 50,248,250,250,170,  1,160,248, 59,146,114,206,
+ 71, 53,149, 74,181,254,246,237, 91, 30,206,145, 75,111,111,111, 12, 27, 58,148,107,215,182,173,172,113,147, 38, 61,222,250,116,
+229,218, 16, 63, 79, 83, 84,136, 31, 44, 54, 11,118,237,216, 46, 82,209,178,131, 93,162, 15,  7,187,201, 40, 29,193,146, 72, 36,
+216,183,111,223, 61,235,164, 82, 41,182,110,221,234,150, 25,178,155,169,242,154,200, 74,153, 33,226, 78, 84,157,231,121, 44, 91,
+182, 12,162, 40, 98,226,196,137, 37,154, 13,157,245,237,102,199,149,166,253, 59,209,239,136,  0, 76, 72,250, 76,238,248,126,233,
+244, 22,107, 18,119,204,208, 23, 95,124,225, 86,  4,235,241,199, 31,119,203,180, 57, 31,151, 61, 93,167, 79,159, 46, 83,119,201,
+146, 37, 46,251,180,137,162,136, 95,126,249,197, 97, 78,237,188,253,246,219,163, 61, 61, 61, 53,251,247,239,199,221,187,119,161,
+213,106, 81, 88, 88,  8, 31, 31, 31,239,110,221,186,157,185,123,247,110,194,197,139, 23, 89,135,119,  6,163,170, 17, 44,123,165,
+235, 78, 51, 97, 89,237,253,101,232,  9,132, 16, 24, 12,134, 50,141,149,179, 41, 48,155,205,200,202,202,130, 40,138, 85,158,171,
+171,172,138,213,149,193, 58,127,254,252,200, 81,163, 70,165,120,121,121, 53,206,202,202, 74,149,203,229,113,251,247,239, 15, 55,
+155,205,240,244,244,132,167,167, 39,182,109,219,  6,111,111,111,188,250,234,171,119,244,122,253, 97,181, 90, 29,168,215,235,207,
+222,189,123,247,173,114,157,139, 68,210,181, 67,135, 14, 56,121,242, 36,114,115,115,247, 16, 66, 26,191,240,194, 11,221,195,195,
+195,201,156, 57,115, 12, 55,110,220,248, 10, 64,134, 90,173, 94,190,106,213,170,142,205,155, 55,215,140, 24, 49,  2,132,144,175,
+ 41,165,  6,119,143, 89,171,213,150, 48, 86,249,249,249, 40, 40, 40,128, 90,173,182,186,153,103, 18, 20,245,165,178,247,167,114,
+156,155,226,232,149,253,252, 80, 65, 16,104,209, 46, 84, 82,158,158, 90,173,158,189,114,229,202, 18,125,238,236,209,209,180,180,
+ 52,120,122,122,226,237,183,222,146,190,251,218, 11,205,120, 77,224, 17,142, 35, 48,153,105, 46, 21, 77,219,181,105,131, 15,176,
+ 75,244,225, 68,176,236,134,160, 95,191,126,247, 52, 11, 74,165, 82,236,220,185, 19,  3,  6, 12,112, 60,176, 20, 55,181,187,101,
+  8,250,246,237,235,136,  4,109,223,190,189,204,230, 61,123,  4,202, 29, 35,104,223,119,194,132,  9, 16,  4,  1, 95,126,249, 37,
+ 38, 77,154,  4,142,227,240,217,103,159,129,227, 56,204,152, 49,163, 82,245,132,189, 46, 75,248,168,232, 51,108, 82, 62,178, 22,
+  5,  2,  0, 60, 60, 61,237, 59, 86, 74, 83, 16,  4, 71,228,170, 73,147, 38,144, 72, 36,104,211,166, 13,  4, 65,112, 68,174,122,
+247,238,237, 60,173,  2,117, 71, 83, 16,  4, 92,187,118,205,145,230, 54,109,218,148,136, 92,  9,130,224,150, 97, 35,132,188,219,
+165, 75,151, 57, 97, 97, 97,  1, 99,199,142, 37, 60,207, 35, 54, 54,214,127,198,140, 25,121, 18,137, 68, 57,121,242,228,178,174,
+107,  9,128,198,245,235,215, 87,179, 43,135,193,184,143,  8, 86,101, 12,150, 59,149,163, 74,165, 58,151,153,153,217, 70, 46,151,
+151, 48, 87,101, 25, 45,158,231,145,158,158, 14,149, 74,117,238, 65, 30,176,171, 38,194, 98, 51,243,154, 83, 62,180,120,250,233,
+167,215,172, 93,187, 54,106,215,174, 93, 56,118,236, 24,170, 85,171,134,185,115,231,222, 74, 72, 72, 24, 74, 41,253,195,157,223,
+173, 89,179,102,  3,181, 90,141,195,135, 15,  3,192,  1,  0,207,189,242,202, 43,196,106,181, 98,225,194,133, 58,  0, 59,189,188,
+188, 54,252,244,211, 79, 77, 26, 53,106, 36,219,181,107, 87,193,177, 99,199,246,186,105,174,108,162, 40,222, 99,172,156,243,212,
+195,195,195,157,  8,150,197,203,203,235,124,126,126,254,211,122,189, 62, 95, 46,151,123,228,231,231, 27,157,141,149, 93, 95, 16,
+  4,201,181,107,215, 82,  0, 68,121,121,121,157,135, 83, 83, 98,137,  2, 38,  8, 93,187,118,237, 42,148, 62,  7,105,105,105,184,
+123,247, 46,204,102, 51,154, 55,111, 78,120, 98,225,179,239,156, 29,205, 46,201,135, 15,199,113,212,126,173,219, 71,253,149, 53,
+114,112,251,246,237,142,255, 57,142,195,175,191,254,234,150,105,219,185,115,103,133, 29,209, 75,117, 72,119, 25, 10,183,239,191,
+112,225,194,162,215, 81, 20, 71,174, 56,142,195,244,233,211, 33,151,203, 49,103,206, 28, 76,159, 62,189, 68, 84,198, 85,  4, 75,
+ 16,  4, 68, 76,213, 57, 63, 20, 21, 93, 20,197,253,157,  8, 33,206, 38,203,173, 72,155,171, 14,238,238, 68,254,203, 74,167, 66,
+161, 40,183,131,123, 41,205,114,127,224,196,137, 19,223, 52,107,214,236, 70,181,106,213,118,182,105,211, 70,126,226,196,  9,140,
+ 27, 55,142, 24,141, 70,207, 93,187,118, 57,126,183, 44,163,167,213,106,149,236,202, 97, 48,238, 35,130, 85,153, 78,238,238,244,
+ 75,208,235,245,187,247,238,221,219,162,127,255,254, 66, 69,205,131, 90,173, 22,129,129,129,184,121,243,166, 85,175,215,187,156,
+254,192,102,115,127, 66,116, 87,  6,171,140, 60,248, 35, 38, 38,198,106,177, 88, 80,187,118,109,132,134,134,194, 96, 48, 96,222,
+188,121, 86,119,205, 21, 33, 68, 26, 27, 27,203,  3, 64, 78, 78, 14,  0,100,  1,168, 83,167, 78, 29,156, 60,121, 18, 57, 57, 57,
+155,  1,116,123,247,221,119,155,182,106,213, 74,186,118,237, 90,221,216,177, 99, 55, 91, 44,150, 57,238,232,139,162,104,178, 90,
+173,145, 28,199,153,115,115,115,147,157,243, 51, 48, 48,208, 87,173, 86,147,180,180, 52,139, 59,  6,171,113,227,198,199,239,220,
+185,131,217,179,103,103,204,157, 59,183, 78, 65, 65, 65, 78, 94, 94,158,213,217,100, 25, 12,  6,206,223,223, 95,190,104,209, 34,
+ 37,  0, 52,110,220,248,120,121,  6, 75,171,213,134,171, 84, 42,199,255, 70,163, 17,119,239,222,197,221,187,119,145,150,150,134,
+130,130,  2, 68, 69, 69, 65,167,211,213, 96,151,227,223,135,115, 51,153,243,245,237,124,  3,175,204,181,238,172,217,175, 95, 63,
+ 71,223, 45,123, 68,204,190,172, 95,191,190, 68,199,113, 87, 77,111,118,131,181,112,225, 66, 76,152, 48,  1, 10,133,  2,159,127,
+254,121,137, 38,194, 50, 76,  1,113, 39,157,145,211,244,184,187,192, 23, 18,137,  4,126, 99,211, 74, 52,197,149, 49, 26,207, 45,
+ 35, 56,119,238,220,  7,214, 68,104,215,172, 81,163,232, 82, 89,182,108, 25,158,126,250,105, 28, 56,112,160,202, 77,132,145,145,
+145,171,230,207,159, 47,191,120,241, 34,242,243,243,145,145,145,  1,163,209,136,164,164, 36, 71,222,148,133, 78,167, 83,176,171,
+134,193,184, 15,131,229,220,249,211,149,193, 42,238, 32,233,202,  8,124,254,206, 59,239,188,210,190,125,123, 95, 15, 15, 15,164,
+164,164,220, 99,174, 10, 11, 11,161,209,104, 96, 50,153,176,119,239,222,124, 81, 20, 63,119,101, 10, 44, 22, 11,  2,  2,  2,144,
+153,153,  9,177,156,126,209, 28,199, 65,169, 84, 66,171,213,162, 60, 51, 80, 81,  5,108, 54,155, 97,177, 88, 96,177, 88, 42,109,
+210,  0, 40,237, 19,182, 22,255,190, 54, 36, 36,164,166, 66,161, 64,124,124, 60,  0, 92,  3,208,185,103,207,158,146,172,172, 44,
+250,226,139, 47, 30,161,148,142,119, 49,155,189,105,255,254,253,145,  0,160, 84, 42,175,  2, 64, 82, 82,146, 37, 55, 55,183, 68,
+100, 80,165, 82,209,  1,  3,  6,  4, 83, 74,177,127,255,254, 72,169, 84, 74, 81,206,156, 85,  0, 12,155, 55,111,190,232,229,229,
+181,230,131, 15, 62, 24,218,167, 79,159, 11, 13, 27, 54,140,212,106,181,233,122,189, 94,111, 48, 24, 40,207,243, 82, 31, 31, 31,
+197,142, 29, 59,110, 28, 57,114,164,155,167,167,231,154,205,155, 55, 95,  4, 80,102,164, 77,173, 86, 39,233,116,186,  8,141, 70,
+  3,189, 94, 95,194, 92,221,189,123, 23,148, 82,220,186,117, 11, 42,149,234, 14,187, 28,255, 30,156, 35, 46,165, 35, 45,165,215,
+185,107,174,156,205,208,142, 29, 59, 42,156,  3,203, 93, 77,103, 51, 52,105,210, 36, 44, 88,176,224,158,  8,214,156, 57, 69,207,
+ 36,111,189,245,150,203,232,149, 51, 18,137,  4,119, 23,248, 34,104, 66,118,  9, 51,  3,  0,196,158,190, 74, 78,201, 38,  8,  2,
+102,207,158,125, 79,231,115,231, 38, 60,119,141,149,115, 58,211,211,211, 33,  8,  2,124,125,125, 49,108,216, 48,244,232,209,195,
+209,212, 88, 89,221,196,196,196,211,159,126,250,105,245,208,208, 80,172, 93,187,214,164, 86,171,101, 93,186,116,161,185,185,185,
+164,162,  8, 22, 51, 88, 12,134,107, 56,119, 42, 72,119,154,  9,203,170, 36,  9, 33,221,156,255, 79, 72, 72,200,211,106,181,195,
+134, 12, 25,162, 55, 26,141,168, 89,179, 38,228,114, 57, 44, 22, 11, 76, 38, 19,164, 82, 41,130,131,131, 65, 41,197,134, 13, 27,
+244, 58,157,110, 88, 66, 66, 66, 94, 69,154,132,144, 55, 31,123,236, 49, 67,124,124, 60,170, 87,175, 14, 15, 15,143,123, 94, 27,
+225,233,233,  9,111,111,111, 92,190,124, 25,203,151, 47,215, 19, 66,222,172, 72,179, 44,163,105, 55, 86,118,163,229,106,100, 82,
+ 41, 77,181, 61,138,163,211,233,  0,192, 90,189,122,245, 64,  0,184,117,235, 22,  0,220,142,138,138,234, 88,171, 86, 45,114,224,
+192,  1, 80, 74,119,149,101,174, 74,105,102,199,197,197,221,142,139,139, 51,153, 76, 38,169,201,100,146,230,229,229,153,253,253,
+253,  3,252,253,253,253,  3,  3,  3,125,  3,  2,  2,188, 83, 82, 82,172, 86,171, 85,106,179,217,164,113,113,113,166, 86,173, 90,
+221,129,211,108,238,165, 52, 69,  0,249, 75,150, 44,153, 37,145, 72,110,183,109,219, 54,102,218,180,105,  9, 22,139,197, 24, 26,
+ 26,234, 19, 20, 20,164,212,233,116,  5,239,191,255,126,250,130,  5, 11,186, 73, 36,146,219, 75,150, 44,153,  5, 32,191,248,187,
+247,104, 90,173,214,221,187,118,237,178, 90, 44, 22, 36, 39, 39, 35, 37, 37,  5,169,169,169,142, 79,111,111,111, 28, 63,126,220,
+102, 54,155,119, 85, 34, 63, 31,148,177, 96,154,248,179,239, 79, 69,198,202,157,110,  0,165,211,105, 55, 67, 79, 63,253, 52,  6,
+ 15, 30,140, 33, 67,134, 96,216,176, 97, 24, 49, 98, 68,101,166,102, 40,125,189, 59,190, 59,109,218, 52,188,245,214, 91,120,231,
+157,119, 32,151,203,241,246,219,111, 99,230,204,153,152, 57,115,102,105,115, 69, 42, 56,246, 18,245, 92,222,178, 80,232, 86, 68,
+192,180,186, 86, 81, 19, 33,165,127, 46,238,231,167,195, 12,189,253,246,219, 56,114,228,  8,166, 76,153,130, 61,123,246, 96,220,
+184,113,216,182,109, 27, 70,143, 30,141, 95,126,249,197,241, 89,252, 16, 72,221, 73,167, 32,  8,232,216,177, 35,116, 58,157,195,
+192,142, 25, 51,166,132,222,232,209,163,221,202, 79,165, 82, 57,116,243,230,205, 27,151, 47, 95,126, 43, 59, 59,187, 71, 66, 66,
+194, 29,173, 86, 75,242,242,242, 28,231,176,244, 82, 28,137,150,179,235,136,105, 50, 11,117, 31, 17, 44,171,213,138,240,240,240,
+ 18,239,182,226, 56,174,196, 82,153,126,  4,  0,144,154,154,186, 35, 56, 56,248,201, 39,158,120, 98,245,115,207, 61,231, 17, 29,
+ 29, 45,137,136,136,128, 78,167,195,237,219,183,145,144,144, 96,221,179,103, 79,190, 78,167, 27,158,154,154,234,114, 20, 89,114,
+114,242,202,192,192,192,237,195,135, 15,159,209,180,105,211, 49, 19, 39, 78,228,163,162,162,144,151,151,  7, 31, 31, 31,  4,  4,
+  4, 32, 62, 62, 30,251,246,237,179,229,230,230, 46,182,217,108,239,166,165,165,101, 84, 38,147,172, 86, 43,111, 54,155, 49,100,
+200, 16,136,162,136,121,243,230,193,106,181,242,149,144, 48,155,205,102, 10,128,100,102,102,  2,128,206,110,184,174, 95,191, 14,
+  0,119, 34, 34, 34, 52,  0,176,107,215, 46,  2,224,176,187, 15,244,206,145,172,232,232,232,120,123,165,232,124,147,179,111, 47,
+142, 92,185,122, 12, 55, 12, 26, 52, 40, 93,167,211,245,156, 52,105,210,140,133, 11, 23, 14, 93,184,112,225, 61, 59,121,122,122,
+174,249,236,179,207,222, 29, 52,104, 80,122,121,209,171,226,136,221, 91,207, 62,251,236,160,115,231,206,121, 40, 20, 10,104,181,
+ 90,100,101,101,193,108, 54, 35, 42, 42, 10,233,233,233, 88,185,114,101,129, 94,175,159,201, 46,199,191,151,242,140,149,187,125,
+ 44,203,139,226,108,221,186,181,204, 57,166, 42,171, 89,218,100,184, 59, 55,149, 27, 15, 67,101, 78,253, 80,153,122,173, 60,205,
+143, 63,254,216, 49,217,106, 89,145,171,202, 68,176,236,154,190,190,190,  0,138,102,223, 23, 69, 17,143, 63,254,120,149,117,139,
+223, 45,248,164,253,255,216,216,216,119,215,174, 93, 59,135, 82,234,  7, 64,112,206,  3,246, 82,  5,  6,227,  1, 25, 44,155,205,
+150,212,177, 99,199, 18, 21, 91, 69, 47, 85, 45, 54, 34, 73,110,154,172,237, 81, 81, 81, 81,203,150, 45,251,159, 90,173,238,102,
+ 48, 24, 26,  1,128, 66,161, 56,167,213,106,119,113, 28, 55, 63, 53, 53,213,237,151, 51, 23, 27,166,113, 97, 97, 97,243, 70,140,
+ 24, 49,167,109,219,182,  3, 95,124,241, 69, 34,  8,  2,214,173, 91, 71,147,146,146,214,115, 28,247,102, 74, 74,202,205,170,100,
+146, 74,165,186,186,126,253,250,154, 91,183,110,133,197, 98,193,162, 69,139,160, 80, 40,174,186,251,125, 74,105,134, 32,  8,171,
+219,182,109, 59,244,200,145, 35,107, 40,165,231,229,114,249,247,113,113,113,195, 14, 31, 62,252, 35,165,244,146, 32,  8,223,183,
+105,211,102,216,241,227,199, 55, 80, 74,207, 86, 34,121,217,113,113,113, 57,  0,130,172,214,178, 91, 20,227,226,226, 76,  0,238,
+186, 97,174,236,228,143, 26, 53,202, 60,106,212,168,215,  6, 13, 26,180,252,143, 63,254,104,153,155,155,219,  8,  0,188,189,189,
+207,181,104,209,226,248,143, 63,254,120,165, 56,114,101,112,117,236,132,144,  1,141, 26, 53,218,240,222,123,239,169, 99, 98, 98,
+132,218,181,107, 35, 33, 33,  1,231,207,159,183,126,243,205, 55,133,122,189,190, 31,165, 52,135, 93,142,127, 15,246, 38, 66,111,
+111,239, 18, 15, 79,246,161,251,149,105,194, 43, 75,179,244,131, 25,207,243, 21,105,186,116, 53, 26,141,198, 49,106,217,157,174,
+  9, 21,189,123,212,158, 78,187,166,125,113,195, 92, 81, 87,154,197,175,233,169,140, 38,220,209,180, 88, 44, 14, 93, 55, 52, 43,
+245,163, 39, 78,156,248,  6,192, 55,181,107,215,190, 14,160, 22, 51, 85, 12,198, 95, 96,176, 46, 95,190, 28,251, 87,254,240,173,
+ 91,183,242,  1,188, 91,188, 60, 16,146,146,146,110,  2, 24, 20, 20, 20,244,201,225,195,135,223,  6,  0, 81, 20,103,187,122,159,
+161, 43,206,158, 61, 59, 64, 34,145, 44, 92,177, 98, 69, 91, 74, 41,188,188,188, 14, 95,191,126,253,229, 74, 70,193,198, 16, 66,
+ 38,218, 71,  5, 26,141,198, 49,132,144,201,148, 82,173,211,118,199,255,149,132,  2, 48, 82, 74, 67,202,217,110,172,132,185,114,
+ 68,178,  0,152,126,252,241,199, 66,  0,103,240,231, 60, 87,150,226,197,  0,167,102, 65, 23, 55,184,223,  9, 33,181,223,126,251,
+237,185, 60,207,119,213,106,181,161,106,181, 58,209,106,181,238,214,233,116,111, 82, 74,179,216,165,248,247, 97,181, 90,147, 59,
+118,236, 40,148,245,224, 84,209, 13,188,162,  7, 42,155,205,150, 20, 23, 23,135, 42,104, 38, 87,144,212,219,109,218,180,225,220,
+213,178, 99,177, 88,210, 43, 74,103,155, 54,109,202,125,104,172,234,177,183,105,211,166, 82,105, 44,174,171,146, 31,180,166,139,
+252, 44, 23,189, 94,159, 83,173, 90,181, 66,131,193, 32, 49, 26,141,146,210, 17,123,165, 82,153,193,174, 28,  6,163,138,  6,235,
+223, 76,177,161,234,251,160,244,138,251, 67,189,244,  0,116, 12,165,254,215, 86,244,127, 37,249, 43, 34, 64, 34,  0,221,  3,202,
+195, 76,  0, 47,178, 75,238,159,199,249,243,231, 91, 61,104,205,139, 23, 47,198,254,  5,233,108,243,160, 53, 47, 92,184, 16,251,
+168,106, 86, 68,114,114,114, 43,118,101, 48, 24,247,  7,199,178,128,193, 96, 48, 24, 12,  6,227,193, 66,  0,148, 57, 18,160, 50,
+111,202,174,202,104,  2, 87,250, 76,147,105, 50, 77,166,201, 52,153, 38,211,252,239,105,186,210,174,140,255,248, 71, 83,214, 48,
+220,  7,181,  0,232,198, 52,153, 38,211,100,154, 76,147,105, 50, 77,166,249,168, 45,172,137,144,193, 96, 48, 24, 12,  6,227,  1,
+195, 12, 22,131,193, 96, 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,193,120,132, 32,132,144,
+176,176,176,142, 33, 33, 33,109, 30,213, 60, 16, 88, 49, 96, 48, 24, 12,  6,131,241, 32,168, 94,189,186,183,205,102,123, 46, 36,
+ 36,228,229,154, 53,107,214,  4,128,208,208,208,243,148,210,249, 74,165,242,251, 27, 55,110,152, 30, 25,147,201, 94,133,192, 96,
+ 48, 24, 12,  6,227,126,  8,  9,  9,105, 10,224,101,165, 82, 57,188, 85,171, 86,178, 46, 93,186,192,199,199,  7, 86,171, 21,169,
+169,169,248,253,247,223,113,250,244,233,108,139,197,178,208, 98,177, 44,204,200,200, 72, 99,  6,139,193, 96, 48, 24, 12,  6,163,
+ 28,130,131,131, 63,237,213,171,215, 36, 31, 31, 31,212,174, 93, 27, 65, 65, 65, 48, 26,141,208,235,245,160,148, 66, 16,  4, 80,
+ 74, 81, 80, 80,128, 19, 39, 78,224,216,177, 99,214,252,252,252, 53,132,144,249, 41, 41, 41,167,153,193, 98, 48, 24, 12,  6,131,
+193, 40, 69, 72, 72, 72,218,158, 61,123,  2,172, 86, 43, 50, 51, 51, 97, 52, 26,161,211,233, 28,  6,139,231,121, 80, 74, 97,181,
+ 90,  1,  0,162, 40,226,210,165, 75, 56,114,228,  8, 18, 19, 19, 63, 75, 77, 77,125,237,191,152, 47,172,147, 59,131,193, 96, 48,
+ 24,140,251,194,104, 52, 98,213,170, 85,200,204,204, 68,120,120, 56, 66, 67, 67,225,237,237, 13,165, 82,  9,  0, 14,115,  5,  0,
+ 28,199, 33, 38, 38,  6,195,135, 15,  7, 33,100,216,127, 53, 79, 88, 39,119,  6,131,193, 96, 48, 24,247,131,197,100, 50, 33, 54,
+ 54, 22,241,241,241, 56,121,242, 36,154, 53,107,134,250,245,235, 35, 51, 51, 19, 41, 41, 41, 37,118, 62,126,252, 56, 78,157, 58,
+133, 14, 29, 58,252,167, 51,133, 53, 17, 50, 24, 12,  6,131,193,168, 50,161,161,161,207, 84,171, 86,109,209,136, 17, 35,148, 77,
+154, 52, 65, 82, 82, 18,146,147,147,145,147,147,131,166, 77,155, 34, 38, 38,  6, 55,111,222,196,246,237,219,113,234,212, 41,200,
+229,114,132,133,133, 65,179,230,  7,252, 18, 18,156,156,146,146, 18,198, 12, 22,131,193, 96, 48, 24, 12, 70, 41, 66, 66, 66,252,
+  8, 33,111,134,134,134,190, 50,108,216, 48, 73,237,218,181,145,148,148,132,140,140, 12,228,228,228,224,232,209,163,118, 51,134,
+176,176, 48, 36, 36, 36,224,220,185,115,122,163,209, 56, 54, 57, 57,121, 37, 51, 88, 12,  6,131,193, 96, 48, 24,229, 27,173,112,
+  0,179,106,213,170,245,204,211, 79, 63,205,133,132,132, 32, 57, 57, 25,123,246,236, 65,173, 90,181,144,150,150,134, 19, 39, 78,
+216,242,243,243, 23,219,108,182,119,211,210,210, 50,254,171,121,241,151,118,114, 39,132,116, 99,154, 76,147,105, 50, 77,166,201,
+ 52,153,230,163,161,153,146,146,146,152,146,146, 50,242,218,181,107, 49,115,230,204,217,188,104,209, 34,240, 60,143,208,208, 80,
+236,217,179,135,238,222,189,123,125, 97, 97, 97,221,148,148,148,113,255,101,115,  5,176, 78,238, 12,  6,131,193, 96, 48, 30, 48,
+119,239,222,189, 12, 96, 64,104,104,104,171, 11, 23, 46,188,  1,  0,162, 40,206,190,123,247,238,137, 71, 37, 15,152,193, 98, 48,
+ 24, 12,  6,131,241,151,144,156,156,124, 12, 64,223, 71,241,216,217, 60, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,
+131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,241, 72, 65,  0,148, 57, 18,128, 82,186,203,109,145, 42,140, 80,112,165,207, 52,
+153, 38,211,100,154, 76,147,105, 50,205,255,158,166, 43,237,202,248,143,127, 52,148, 82,151, 11,138,231,203,170,236,  2,160, 91,
+ 85,190,199, 52,153, 38,211,100,154, 76,243,225,107, 86,165,174, 47, 75,179,248,225,157,160,168,149,132,179,255,255, 79, 75,231,
+191,229,216, 31, 21,205,255,218, 34,184,112,151,142, 76, 34,132,136,  0, 68,250,  0,102, 38, 37,132,216, 79,192,  3,209, 99,252,
+  5,161,205,162,115, 68,254,244,225,236, 60, 49, 24,255,225,235,253,129,213,245, 78,117,  7,239,116,147,181,  1,176, 17, 66,112,
+ 63,117,201, 95,113, 79,250,167, 31,251,163,172,249,111, 71,168, 40,163,170, 85,171,182, 35, 32, 32,160,115,102,102,166, 88,188,
+ 30,161,161,161,224, 56, 14,130, 32,232,227,227,227, 61, 43,251,131,129,129,129, 95,199,196,196, 60,151,149,149, 37,114, 28,135,
+240,240,112, 16, 66,192,243, 60,120,158,215,223,184,113,195,243,239,206,148,230,205,155,231,152, 76, 38, 77,233,245, 50,153,204,
+112,242,228, 73,143, 71,193, 92,249,251,251, 63, 25, 24, 24,232,157,157,157, 77,  1, 32, 44, 44, 12, 60,207, 23, 21, 26, 65,176,
+222,188,121,115,133,187,122,145,145,145,199,149, 74,165,183, 32,  8,224,121, 30,130, 32, 64,171,213,230, 94,186,116,169,101,241,
+246, 67, 74,165,210,143,231,121,123,217,130,193, 96,200,186,120,241, 98, 59,118,235,251,119,178,126,253,122,190,103,232,243,181,
+  4,170,111,204,113,212, 75, 20, 73,158,149, 40,207,110, 79,254,250,134, 59,223, 31, 56,112,160,237,111,190,  6,170,  3,176, 82,
+ 74, 83,170,240,101,174,140,138,182,151, 13, 24, 92,252,175,129,  3,178,  8,112,173, 46,176,225, 34,160, 47,213,172, 32, 62,236,
+  7,169,234,213,171,207,175, 86,173,218,200,194,194, 66, 29,199,113, 32,132,208,152,152, 24,251, 62, 37, 62, 69, 81, 76,186,112,
+225, 66,172,139,155,172,164,122,245,234,159, 85,171, 86,237, 89,157, 78,167, 35,132,128, 16, 66,  9, 33,104,212,168,209, 61,154,
+ 54,155, 45,233,252,249,243,177, 15, 43,157,127,215,177, 55,108,216,176, 76,205,242,142,189, 44, 77,231,116, 18, 66, 16, 19, 19,
+115,223,233,252, 39,106,254,103, 13, 22,  0, 46, 32, 32, 96,115,203,150, 45, 59,109,217,178,133,187,124,249, 50, 23, 29, 29, 13,
+155,205,  6, 81, 44,186,246,155, 53,107,166,170,236,143,  5,  5,  5,125,215,178,101,203, 33, 91,182,108,225, 54,111,222,204,181,
+104,209,  2,132, 16,216,108, 54,216,108, 54,116,237,218, 85,121,159,149,133, 70, 16,132,137, 50,153,172,163,213,106,173, 15,  0,
+ 18,137,228,146,209,104,220,103,181, 90, 63,167,148, 22,186,163, 99,177, 88, 84, 23, 46, 92,184, 39,111, 90,182,108, 41,171,106,
+218,234,212,169,115,152,227,184,168,178, 46,218,242, 62, 41,165,183, 46, 92,184,208,182, 60,205,122,245,234, 29,230, 56, 46,202,
+190,127, 89, 26,165,215,137,162,120,235,252,249,243,109, 43,170,116,  2,  3,  3,159,106,219,182,173,215, 79, 63,253, 68, 18, 19,
+ 19,137, 82,169,132, 40,138,176,217,108,176, 88, 44,232,210,165, 75,165,230, 79, 83,169, 84,158,187,119,239,174, 21, 16, 16,128,
+244,244,116,100,101,101, 97,244,232,209,215,236,219,149, 74,165,223,239,191,255, 94,199,215,215, 23, 58,157, 14,121,121,121, 24,
+ 54,108,216,191,254,226,234,209,161,230,123,  4,240,181,255,111, 19,145,189,235,224,205,183,238, 87,183, 94,189,122,167,100, 50,
+ 89, 96,121,231,188,172,115,111, 50,153,210, 46, 92,184,208,204,197,245, 19,  1,160, 47,207,243,181,  5, 65,168,  7, 32,194,106,
+181,  6,  2,128, 84, 42, 77,227,121, 62,193, 98,177, 92, 49,153, 76,215,  1,108,165,148, 38,148,167,213, 51,244,249, 90,196,170,
+ 27, 88, 96, 20,123,171,106,126, 80, 87,119,115,250, 85,149, 92,183,173,103,232,243,235,221, 53, 89,127,163,185,138, 12,  9,  9,
+249,184,248,239, 41,148,210,248,251,213,180,  1,131, 41,165, 94,  0,144,151,151,231,149,152,152, 24,180,117,235,214,152,185,115,
+231,118,145, 25, 12, 31,153,128,203, 21,125,191,123,199, 90, 39,  4,142,132,161, 56,  6, 96,165, 98,210,206,125, 55, 31,196,141,
+137, 11, 13, 13,157,223,179,103,207, 17,139, 23, 47, 86, 29, 59,118, 76,213,176, 97, 67,240, 60,111,175, 47, 80, 58,240,208,186,
+117,235, 10,179, 15,128, 16, 18, 18, 50,239,177,199, 30, 27,186,112,225, 66,213,149, 43, 87, 84,145,145,145, 40,190,217,150, 40,
+155,246,117, 77,155, 54,125,216,233,252, 75,143,189, 87,175, 94, 67, 23, 45, 90,164, 58,119,238,156,170,118,237,218,224, 56, 14,
+ 28,199,221,163,199,113, 28, 98, 99, 99,221,210,236,209,163,199,208, 37, 75,150,168, 78,157, 58,165,170, 87,175,158, 35,239,156,
+154,231, 42,157,206,127,184,230,127,207, 96, 17, 66,184,106,213,170,173,138,141,141,237,185,101,203, 22, 30,  0, 78,157, 58,133,
+236,236,108,132,134,134, 66,163,209, 64, 46,151,195, 96, 48, 84, 42,220, 23, 24, 24,248,117,177,185,146,  0,192,134,225,  3,112,
+ 75,  2,140, 79, 55, 65, 42,149,226,230,205,155,224,121,254,126, 66,199, 29, 60, 61, 61, 87,110,220,184,209,167, 89,179,102, 92,
+102,102, 38, 34, 35, 35,145,157,157,221,114,255,254,253,205,159,127,254,249,231,  9, 33,207, 80, 74,247,187,171,185,109,219, 54,
+168,213,106,168, 84, 42,168,213,106,152,205,102, 82,213,244,241, 60, 31,118,236,216,177,  0,141, 70,  3, 81, 20, 29, 75,169,246,
+107,  7,162, 40,162, 67,135, 14,230, 10, 79,158, 32,132, 29, 59,118, 44, 64,169, 84,130, 82, 90, 66,207,102,179, 65, 46,151, 59,
+ 63, 33,194,102,179,161, 77,155, 54,102, 87,145, 43,187,185,  2,128, 53,107,214, 32, 40, 40,  8,  1,  1,  1, 80,171,213, 80, 42,
+149, 85, 57,118,248,249,249,225,149, 87, 94,193,224,193,131,177,122,245,106, 72, 36, 18,231,227,128,175,175, 47,126,251,237, 55,
+120,122,122,162, 70,141, 26, 37,182,255,107, 35,129,128,239,246,253, 55, 29, 17,217,129,125,154,  8,221,226,162, 22, 58, 42,215,
+162,157,168, 88,180, 47, 21,109,182,156,221,135,110,207,112,121, 87,224,184,144, 99,199,142,  5,200,229,114,247,110,238, 54, 27,
+154, 53,107,198,187,184,126,122,199,196,196,108,120,249,229,151,165,181,107,215, 38, 82,169, 20,130, 32, 64, 16,  4,123,121,172,
+ 65, 41,173, 33,138, 98,167,180,180, 52,250,197, 23, 95,124, 68,  8,121,130, 82,186,173,204,178, 73,245,141, 11,140, 98,239,  3,
+167,209,114, 96,183,105,248,109,221,244,150,113, 77, 69,120,168,244, 55,  0,252, 99, 13, 22, 33,196, 83,169, 84,190,189,110,221,
+ 58, 41,  0,116,235,214,237,109, 66,200,171,148,210,252,  7,245, 27, 94, 94, 94,240,242,242, 66,195,134, 13,241,228,147, 79,122,
+ 55,109,218,116,114, 39,163,113,204, 94,160,220,107, 83,224,184,176, 95,127,191, 22, 96,255,127,232,128,230,210,158,157,106,165,
+ 21, 61,136,149,222,155, 66,180,209,164, 93,  7,111,197,186, 56, 86, 46, 40, 40,232,147, 94,189,122, 13, 90,188,120,177,  7,  0,
+124,253,245,215,120,252,241,199, 17, 24, 24,  8,165, 82,  9,153, 76,  6,137, 68,  2,169, 84,234,248,116, 17, 17,226,131,130,130,
+ 62,122,252,241,199,  7, 46, 92,184,208,  3,  0,190,251,238, 59,244,233,211,  7,126,126,126,240,244,244,132, 92, 46,135, 76, 38,
+131, 84, 42, 45, 97,184, 42,147,206, 23,122,116, 65, 77,165, 28,125,222,251,  8, 62, 62, 62,216,253,218,203,144,112, 28,198,109,
+223, 15, 15, 15,143, 10,211, 89,158,230,201,147, 39,145,158,158, 94,230,177, 19, 66, 42,172,251,156,143,189,119,239,222,  3, 23,
+ 45, 90,228, 56,246,158, 61,123,194,207,207, 15, 30, 30, 30,144,203,229,144, 74,165, 37,150,242,242,192, 89,179, 87,175, 94,  3,
+151, 44, 89,226,  1,  0, 43, 86,172, 64,183,110,221,224,227,227,  3, 15, 15, 15, 71, 94, 86,246, 28,253,147, 53,255,147,  6,203,
+222, 55, 42, 32, 32, 96,208,207, 63,255,204, 57,223,  0,229,114,185,227,194,144,201,100,224, 56,174, 50,149, 22,137,137,137,121,
+110,203,150, 45,142, 47,153, 74, 85, 10,114,185,188, 82,154,165,244,187,117,238,220,249,135,159,127,254, 89, 33,149, 74,161,215,
+235,113,225,194,  5,120,121,121, 65, 38,147,161,127,255,254,124,187,118,237,252, 58,117,234,244, 19, 33,100,168, 59, 35, 20, 40,
+165,208,104, 52, 37, 12,214,253, 52, 33,219, 47,208, 45, 91,182,128,231,249, 18,133,204,254,233,252,119, 64, 64,128, 91,186,114,
+185, 28,135, 15, 31,  6,207,243,144, 72, 36, 16,  4,  1, 18,137,  4,191,252,242, 11, 94,123,237, 53,100,102,102,130, 16,  2,137,
+ 68,  2, 15, 15,151,173,155, 36, 48, 48,208,219,110,174,138, 35,128, 80, 42,149,144, 72, 36, 68, 16,  4, 98,111,198, 35,132, 16,
+119,219,212,  5, 65, 64, 66, 66,  2,134, 15, 31,142, 21, 43, 86, 96,246,236,217, 24, 58,116,104,137,237,249,249,249,240,241,241,
+129,143,143, 15, 20, 10, 69,149,203,194, 63,  9,177, 84,238,188, 59,231, 99, 21, 68,138,162, 78, 30, 34, 32,  2, 20, 20, 34, 21,
+145,150,124,  3,159,126,178,128,119,183, 44,201,229,114, 28, 58,116,200, 97,130,  4, 65,  0, 33,  4,206,198,200,190,  4,  5,  5,
+185,212,148, 74,165,179, 54,109,218, 36, 91,189,122, 53,214,174, 93,235,248, 13,181, 90, 13,111,111,111,248,249,249, 57,150,176,
+176, 48,242,205, 55,223, 72, 27, 55,110, 60, 11,192,182,178, 77, 32,245, 82,213,252,160,238,192,110,211,138,204,229, 52,138,156,
+107,115,154,112,185, 51,188,254,193,230, 74,  0,240,250,151, 95,126,233,215,188,121,115,  0,192,151, 95,126,233, 55,106,212,168,
+215,  9, 33,111, 81, 74,173, 85,126,192,  2,214, 18, 66,  6, 23, 71,108, 21,221,187,119,151,125,245,213, 87,168, 87,175, 30, 38,
+ 76,152,224,251,233, 71, 31,245,  5,240, 83,249,101,169,100, 97,250,224,227,249,222,148, 22,149, 31, 42,210, 18,159,217,233,  9,
+120,251,237,247, 92,214,201,  0,184,144,144,144,231,151, 46, 93,234,232, 14,225,227,227, 83,102,221, 36,145, 72, 28, 75,  5,166,
+136, 20, 71,133, 70, 45, 94,188,216,161,233,239,239, 15,169, 84, 90,226,  6,123,251,242, 25,108, 91,254, 62,212,190, 65, 24, 62,
+229,195, 74,167, 51, 76, 46, 67,152, 82,134, 38, 77,154, 64,165, 82,225,164,164,232, 86,230,225,225,225, 50,157,229,105, 58,215,
+203,  0,160,211,233, 28, 81,123,147,201,132,216,216, 88,183,142,125,201,146, 37, 14, 77, 63, 63, 63,199,177,219,211,229, 92,215,
+219, 31, 96, 42,210, 12,  9,  9, 25,181,108,217, 50,135,166,175,175,111,  9, 13,137, 68,130,149, 43, 87,222, 83, 71,220,175,102,
+101,207,123,105,205,132,132,  4,204,157, 59,215, 81, 39,217,163,120,246,174, 70, 11, 22, 44,112,203, 96,255,167, 34, 88,  0, 72,
+102,102,166,120,249,242,101,238,228,201,147,144, 72, 36,  8,  8,  8, 64,139, 22, 45,  0,  0,102,179,217,126,211, 37,245,234,213,
+ 75,227, 56, 14,246,155, 46,199,113,176, 90,173,142,246,100, 39, 35,195,101,103,103,139, 59,119,238,228, 86, 61,209,  3, 38, 10,
+ 52,125,251,125,244,236,211,  7,219, 67,101,224,  1,180,188,156,  9,153, 76, 38,  4,  7,  7, 91,236, 39,193,174,237,220, 55,171,
+180, 57, 34,132,120,168,213,234,111,182,110,221,170,224, 56, 14,  5,  5,  5, 16, 69, 17,237,218,181,  3,199,113, 56,127,254, 60,
+222,124,243, 77,108,216,176,  1,155, 54,109, 82, 54,107,214,236, 27, 66, 72,125, 74,105,129,147,153,218, 85, 86,225,244,240,240,
+128, 74,165,114, 24, 44,251, 49, 23,183,169,151,110,146, 73,190,112,225, 66,243,242, 52,237,145,132,  1,  3,  6, 56,250,156,217,
+205, 80,233, 79,169, 84,138,243,231,207,151,101,250,238,209, 20, 69, 17,237,219,183,183, 55,197, 65,163,209, 96,239,222,189,142,
+237, 77,155, 54,133,201,100,130,191,191, 63, 46, 93,186,228, 82, 51, 35, 35,131,166,164,164,144, 85,171, 86, 65, 34,145,192,207,
+207, 15, 42,149,138,252,244,211, 79,175, 43, 20,138, 48,163,209, 40, 90, 44, 22,132,133,133, 45,168, 81,163,134,253, 28,105,111,
+220,184,225, 87,158, 38,207,243, 80, 40, 20,248,238,187,239, 48,119,238, 92,188,241,198, 27, 37, 46, 44,158,231, 97, 48, 24,224,
+239,239,239, 48, 89,165, 47,188,191, 98,216,238, 95,173, 73, 65,113,225,212,118, 92, 60,183, 11,162, 77,132, 77,164,160,212,  6,
+209, 10,156,220,121,180, 78,234,173,148, 80, 10, 10, 20,247,184,177, 20,106,173,157,252,229,245,  0,108,222,155,105,156,231, 42,
+157,130, 32,192, 98,177, 96,235,214,173,184,113,227,  6,118,236,216,  1,189, 94,239,200,199, 54,109,218, 96,212,168, 81,  8, 10,
+ 10,114,153,159,148,210,239, 18, 19, 19,155,182,111,223,158,228,230,230, 34, 55, 55, 23,122,189, 30, 54,155, 13, 86,171, 21,130,
+ 32, 64,161, 80, 64,169, 84, 34, 48, 48, 16,  6,131,129, 26,141,198,239,202,211, 20, 69,146,167,187, 57,253,234,111,235,166,183,
+ 28, 56,141, 98,253,135,  4,117, 34,228,186,125,103,188, 71,109, 59,246,122,119, 66, 57, 10, 20, 29, 58, 71, 64,109, 54, 91,230,
+ 75,227, 63, 24,247,176,207, 81, 41,198, 76,156, 56,177,190,115,243,244,176, 97,195,112,225,194,133,250,159,127,254,249, 24,  0,
+ 95, 86, 86,211,  7,  8,  5,  0, 43,240, 27,138, 22,172,215,235,201,144,205,155,  7,  0,120,118,211,166, 77, 24, 58,116, 40, 62,
+249,232,163,134,165, 13, 86,137,178, 68, 41, 18,174, 29, 64,194,245,131, 16, 69,234, 20,  5, 47,251,111,234, 94, 58, 73, 97, 97,
+161,225,216,177, 99,154, 21, 43, 86,192,219,219, 27, 81, 81, 81,142, 86,138,210, 55, 88,251,255,174,202,146, 78,167, 51, 92,190,
+124, 89,243,195, 15, 63,192,215,215, 23, 53,106,212,128, 74,165,114,104,202,100, 50, 28,221,190, 17, 99,134,247, 70,102,194, 69,
+204,127,117,144,219,233,124,161,123, 23,132, 43,100, 24, 48,251,  3, 68, 71, 71, 99,253,224,126,224,  8, 48,118,207, 81, 72,165,
+ 82,172,232,221,  1, 50,185, 12, 99,247,252,225, 42,157, 14,205, 19, 39, 78, 64, 20, 69, 68, 68, 68, 64,167,211,193,211,211, 19,
+ 10,133,  2, 18,137,  4, 59,119,238, 68,255,254,253,177,122,245,106,180,105,211,198,229,177, 23, 22, 22, 26,206,157, 59,167,249,
+254,251,239,225,235,235,139,240,240,112,168, 84, 42, 71, 96,194,110,180,120,158, 71, 84, 84, 20,242,242,242, 80,179,102,205, 10,
+ 53,181, 90,173,225,228,201,147,154,239,191,255, 30, 62, 62, 62,  8, 11, 11,115, 68,216,236,166,104,230,204,153, 37, 52,154, 52,
+105,114,223,154,149, 61,239,165, 53,  7, 12, 24,128, 90,181,106,193,211,211, 19,106,181,218,161, 93,145,230,127,218, 96, 81, 74,
+105,241, 40, 10, 68, 71, 71, 35, 59, 59, 27,114,185, 28, 45, 90,180, 64,102,102, 38, 52, 26, 13,164, 82, 41, 40,165, 24, 60,120,
+ 48, 63,101,202,148,128, 98, 83,229,168,240,203,105, 75, 23, 57,142, 67,219,182,109,113,161,184,229,167,103,159, 62,  8, 11, 11,
+131,189, 19,135, 66,161,192,208,161, 67,201,107,175,189, 38,216,163, 23,148, 82,232,245,122, 52,110,220, 88, 89, 65,116,228,213,
+159,126,250,201, 75, 38,147,161,160,160,192,209, 68,198,243, 60, 46, 95,190,140, 79, 62,249,  4,207, 62,251, 44,238,220,185,131,
+144,144, 16, 76,158, 60, 89,243,193,  7, 31,188, 10,224, 93, 87,153,163,209,104, 28,230, 74,165, 82, 97,196,136, 17, 66,187,118,
+237,  2, 52, 26, 13, 60, 60, 60, 96,111,238,179,217,108,104,219,182, 45,113, 21,117, 16, 69, 17,219,183,111,135, 32,  8, 46, 35,
+ 88,197,109,214,110,105, 30, 59,118,204, 97,206,156,159,138,  8, 33,184,112,225,130,195,204, 21, 23,230,138, 52, 41,207,243, 80,
+171,213,  8, 10, 10,130, 82,169,132, 74,165, 34, 91,182,108,121, 43, 34, 34, 34,248,229,151, 95,230,242,243,243,185,216,216, 88,
+244,238,221, 91, 16, 69, 17,102,179, 25, 93,186,116,169, 48, 31, 37, 18,  9,142, 31, 63,142, 15, 62,248,  0,211,166, 77,195,146,
+ 37, 75,208,173, 91,183, 18, 70,129, 16,130,106,213,170,193,211,211,243,191,115,117,137,128,217,106,129,174, 80,239,104,194,181,
+217,108, 56,183,247, 76,157, 91,103,174,197,252,252,195,106,  9,  0, 24,246,110,116,254, 86,240,147, 11,127,172,219,201, 87,122,
+108,111,182,249,152,139,166, 66, 76,152, 48,  1, 51,102,204,192,224,193,131,177,115,231, 78,188,249,230,155,120,254,249,231, 75,
+ 68,176,220,193, 98,177, 44,125,230,153,103, 70,175, 95,191,190,222,180,105,211, 56,123,  4, 75,165, 82,129, 16,  2,131,193,  0,
+163,209,  8,189, 94,143, 43, 87,174,136, 47,190,248,226, 85,147,201,180,180, 60, 61, 43, 81,158, 85,201,117,219,106, 87,231,107,
+105,227, 63,246,104,223, 42, 66, 79,148,205,243, 30,175,221,141,118, 27, 26,225,  3, 74, 65,197,162, 40,159,209,168,197,235, 83,
+ 39,243,127,231,169, 34,132,244,238,222,189,123,143, 57,115,230,220,179,109,206,156, 57,184,116,233, 82, 15, 66, 72, 66,121, 77,
+162,101,225, 13,132, 41,130,130, 62,  3,  0,239,187,119, 39,229,  2, 73,  0, 48,  4,232,105,  3,250,237,220,185, 19,  0, 80,189,
+122,117,136, 64,  3,  2,124,199,  3,107,173,101, 69,  5, 41,133,197, 98,133, 94,111,172,208, 88,217,255,119, 21, 92,182,215,245,
+ 60,207,163, 97,195,134,232,217,179, 39,164, 82, 41, 60, 60, 60, 28,205, 57,101, 69, 49, 92, 52,221, 83,  0, 34, 33,  4, 81, 81,
+ 81,232,209,163,  7,164, 82, 41,212,106,181,195,180,200,100, 50,240, 60,143, 70,237,186, 98,245,202, 57,120,174, 79, 51, 60, 27,
+ 23,136, 13,231,178,220, 74,103,132, 82,134, 26, 42, 57,162,163,163,225,225,225,  1, 66,  0,129,255,179, 62, 85,169,148,144,201,
+101, 21,166,179,180,102, 90, 90, 26,226,227,227, 17, 31, 31, 15,142,227,208,190,125,123, 71,212,229,250,245,235,120,247,221,119,
+ 97, 52, 26,221, 58,118,142,227, 80,187,118,109,116,233,210,  5, 50,153, 12, 42,149,170, 68,211,160, 61, 79, 11, 10, 10, 80,171,
+ 86, 45,108,222,188, 25, 29, 58,116,112,169, 25, 29, 29,141,142, 29, 59, 66, 42,149, 58, 30,164,149, 74,165,227,190, 81,108,238,
+ 28,191,209,172, 89,179, 74,105,238, 56,126,  7,203,119,254, 14,163, 73, 68,190,206, 82,226, 11,193,254,158, 56,248,253, 52,183,
+142,221,174,185,108,217, 50,228,230,230, 58,234, 32,123,  0,198, 30, 60,  9, 15, 15,199,162, 69,139, 30,173, 38, 66,251,109,193,
+238, 42, 67, 67, 67, 97,239,231,161,209,104, 32,147,253,217,199,219,106,181, 98,195,134, 13,  8,  8,  8,112, 44, 94, 94, 94,229,
+ 22,232,234,213,171,131, 82,138,  9, 25, 69,221, 12,126, 11,145, 34,  1,192,227, 25,212, 17,221,177,217,108,248,233,167,159,224,
+108, 96, 60, 60, 60, 42,108, 46,146,201,100,157, 90,180,104,193, 25,141,198,123,204,213,  7, 31,124,128,161, 67,135,162,110,221,
+186, 16, 69, 17,133,133,133,232,220,185,179,100,193,130,  5,157, 42, 99,176, 84,170,162,254,252, 38,147,  9,123,247,238,133,143,
+143, 15,252,252,252,224,235,235, 11, 15, 15, 15, 40, 20, 10, 16, 66, 92, 54,151, 81, 74, 49, 96,192,  0, 71,161,115,142, 90,149,
+ 54, 91,135, 15, 31,118,171,153,140, 82,138, 86,173, 90, 65,173, 86, 67,163,209, 64,163,209, 96,251,246,237,142,237, 45, 91,182,
+132, 40,138,  8,  8,  8,192,145, 35, 71, 92, 86,186, 97, 97, 97,142,253, 37, 18,  9,249,233,167,159, 94,143,140,140, 12, 30, 59,
+118, 44,199,243, 60, 78,157, 58,133,139, 23, 47, 34, 40, 40,200,209, 39,203, 85, 58,181, 90,109,234,130,  5, 11,108, 95,125,245,
+ 21,  0,160, 75,151, 46,200,203,203, 75,119,218,158, 53,124,248,112,199, 40, 69,  0,200,206,206,206,250, 15,248, 43, 88,205, 86,
+232, 12,  6, 20, 22,232, 28,209,160,244,148, 52,239,105,175, 77,148,124, 50,110, 36,  0,224,181,121, 95,162, 96,201,159, 21,216,
+198,215,134,  4, 60,241,233,218,233,  0,250, 87,164,175,211,233, 96, 52, 26, 81,163, 70, 13, 28, 63,126, 28,  5,  5,  5,232,214,
+173, 91,137,  8,169,115,158,186, 56,247, 38, 66, 72,187, 62,125,250,252,241,249,231,159,215,172, 95,191, 62,209,106,181,208,233,
+116,112,254, 60,119,238, 28, 93,179,102,205, 45,157, 78,215,150, 82,106, 42, 79,111,123,242,215, 55,122,134, 62,191,126,255, 89,
+ 89, 31,255,168,171,158,201, 57, 53,173, 89,201,114,109,190,254,138,193, 70, 47,130,218,  0, 27, 68, 80,171,  8, 27, 40,254,206,
+241,219,132,144,176, 58,117,234,188,180,122,245,234, 50,243,139,231,121,172, 94,189, 26,237,219,183,127,137, 16,114,185,162,206,
+253,118,218,  0, 50,131, 68, 50,109,235,143, 63, 22,245,229,234,210,101, 90, 27,139,229,181, 35,128,169, 65,163, 70, 79, 29, 62,
+124,216,203, 94,175,120,121,121,129, 82,202,235,116, 58,175,182,109,219, 62, 85, 86,179, 43, 21,  1,139,197,  2,189,222,136,188,
+188,  2,152,204,150,226, 58, 83,132,205,102, 45,254, 20, 97, 45,174, 71, 37,  2,239,209,169, 77,245,194, 34,163, 69,114,247, 29,
+189, 19, 94, 78, 93, 79,  9, 33,  8, 12, 12,132, 84, 42, 45, 17,101,114, 39,122, 85,  6, 54,123, 93,232,231,231,  7,153, 76,134,
+179,123,127, 70,250,165,131,144, 18, 10,209,102,129,104, 53,195,102, 53,131,231,120, 92,185,153,130,232, 96,151, 99,135, 28,233,
+236,249,246,108,180,110,221, 26,235,  7,247,  3, 33,192,203,123,142, 66, 34,145,224,251,  1, 93, 33,151, 73,241,226,206,163,238,
+166,179,196,177,159, 56,113,  2, 19, 38, 76,192,135, 31,126,  8,165, 82,105,111, 57,193,229,203,151,241,227,143, 63,162,123,247,
+238,110, 31, 59, 33,196,113,236,130, 32, 96,250,244,233, 72, 73, 73,193,188,121,243,208,188,121,115, 72, 36, 18,228,230,230,162,
+109,219,182, 72, 75, 75,115, 59, 63,237,205,120, 50,153,172, 68,180,201,110,252,170,114,142,236,154, 35,  7,  4, 99,203,161, 53,
+ 32, 32, 56,250,253,196, 18,247,162, 69,107, 15, 84, 90,115,198,140, 25, 37,210,249, 40, 70,175,202, 52, 88,148, 82, 26, 26, 26,
+ 10, 81, 20, 75,152,170,210, 29,106,237, 33, 63,231,144, 98,133,125, 16,120, 30,162, 40, 58, 10,  3, 95,198,246, 35, 71,142,220,
+ 99,  2,150, 47, 95, 94,225, 13,220,106,181,214,247,240,240, 40, 17,189,146, 74,165,152, 62,125, 58, 70,140, 24,225, 48, 87, 82,
+169, 20, 43, 86,172, 64,108,108, 44, 76, 38, 83,253,138,210, 42,149, 74,117,141, 26, 53,226,236, 81, 32,165, 82, 73,134, 14, 29,
+202, 91,173, 86, 71,158,216, 23,123,223, 52, 87, 38,195, 30,109,218,177, 99,135, 91, 17, 44,119,251, 32, 81, 74,113,230,204,153,
+ 18,166,205, 62, 10,  6,  0,206,156, 57,227,232,159,229,174,166,205,102,131, 82,169, 36, 82,169,148, 40, 20,138, 48,187,185,226,
+121,222,113,190,157,251,228,185,186, 80,206,158, 61,219,185,162,237,231,206,157,251, 79, 78,199, 32, 66,132,217, 98,129, 94,103,
+ 66, 65,161, 30,179,222,255,182,104,195, 44, 28,  3,112,172,221,152,  9,120,185,103,247, 46,  0,170, 85,210, 16,192,126,  3,251,
+233,167,159, 32,145, 72,176,121,243,102,120,122,122,162, 95,191,126,240,244,244,196,180,105,211, 48,120,240, 96,183, 35, 88,197,
+101, 41,143, 16,210,238,213, 87, 95,253,227,227,143, 63,174, 30, 30, 30, 14,147,201,  4,179,217, 12,147,201,132, 27, 55,110, 96,
+205,154, 53,137, 58,157,174, 29,165, 52,207,149,222,246,228,175,111,252,124,228,245,148,184, 39,159,212, 95, 78,251, 13,119,239,
+102,193,106, 77,134,104,179,194,108, 45, 26,145,108,179, 90, 97,181,218, 32,240,156,231,162,207,167,236, 44,234,240, 79, 76,  3,
+  7, 14,124,236, 33,158, 42,122,237,218,181,172,106,213,170,217, 43, 49, 79,147,201, 68,138, 31,224, 40,  0,123,  7,119, 45, 42,
+232,136,238,204,113, 96,244, 39, 31,126, 24,102,111,190,127,255,195, 15,195, 38, 79,154, 52, 26,192,130, 75,231,206,173, 30, 57,
+114,228,171,235,214,173, 43,241,157,145, 35, 71,226,210,185,115,171,203, 14, 17, 20, 71,176, 12,  6,100,100,229,224,133, 49,111,
+ 57, 66,  7,  0,133,179, 67,165, 69,255, 43,  0, 32, 51,237,  6,198, 79,120, 77, 94,222,  3, 85,131,  6, 13, 32,138, 98,137,104,
+ 72, 21,250, 94, 57, 71,134, 28,251,121,122,122, 66, 42,149,226,198,225,159, 49,105,204, 32,192,102,  6,181,232,  1,179, 14, 48,
+ 23, 66, 52,233, 64,164, 74,192,162,119,169,107, 79,167,167,167,103, 81,159, 80,129,135, 76,250,167,249,115,142, 92,185,115,227,
+ 46,125,236,  9,  9,  9,120,249,229,151, 97, 54,155, 49, 96,192,  0,152, 76, 38, 24, 12,  6,232,245,122, 68, 69, 69, 65,167,211,
+185,125,236,246,123,167, 84, 42,197,196,137, 19, 17, 27, 27,139,119,223,125, 23, 83,167, 78, 69, 84, 84, 20,198,142, 29,139, 53,
+107,214, 32, 38, 38,166, 66, 93,187,102, 81,147,123,145,166,253,120, 75, 55,229,217, 91, 10,220, 61, 71,101,105,218,103, 23, 41,
+125,222,255,247, 76,215, 74,107,126,240,193,  7,200,200,200,184, 39,114,101,255, 59, 52, 52, 20, 11, 23, 46,124, 36, 35, 88,142,
+225,164,246, 27,168,253, 70,238, 92,185,171, 84, 42,108,216,176,161, 68,231,186,138,194,210, 28,199, 65, 20, 69,108,171, 86,244,
+253,222,197,145, 43,231,255,251,246,237,139,200,200,200, 18,209, 43,165, 82, 89, 97,161, 17, 69, 17,183,111,223,198,133, 11, 23,
+208,186,117,107,228,229,229, 65,194,113,120,237,220, 57, 52,120,230, 25,152,164, 82,136,162,  8,153, 76,134,209,163, 71,187,213,
+ 81,253,143, 63,254,240,113,254,191, 65,131,  6, 73,113,113,113,161,199,143, 31,119,116,124, 47,110, 62,115, 24, 13, 55, 47,106,
+ 60,245,212, 83, 37,162, 86,206,230,202,121,249,237,183,223,220,106, 34,164,148, 34, 46, 46,206, 17,189,242,240,240,192,166, 77,
+155, 28,219,237,225,231,192,192, 64,183, 52,237, 79,240,197, 29,219, 97, 52, 26,197,130,130,  2,238,228,201,147,144,201,100,142,
+115,162, 84, 42,161, 80, 40,238,107,112,194,127, 30,155,  8,147,197,  2,189, 94,143,194,194,162, 25, 66,110,156, 47,217,143,217,
+108,172,250,224, 52,123,148,170,160,160,  0,187,119,239,198,198,141, 27,209,188,121,243,123, 58,185, 59, 95,183,110,148,209, 12,
+ 66, 72,251, 41, 83,166, 28,125,239,189,247, 66,124,125,125, 97, 54,155,113,231,206, 29,124,243,205, 55, 41, 58,157,174, 61,165,
+ 52,163, 18,174, 13, 22,139, 21,  6,157, 17,121,249,  5,152, 57,103, 69,185, 85,  4,  0,100,167, 95,193,208,161,195,100, 15,243,
+ 52, 81, 74,147,  1, 60,239,116, 93,173,  2, 96, 15,199,231, 83, 74, 71, 84, 70, 79,  2,116,122,114,224,192, 46, 19, 39, 78,116,
+172,155, 56,113, 34,142, 30, 61,218, 69,178,126,253,  5, 11,176,151, 95,191, 62,230,243,207, 63,119,236,243,249,231,159, 99,195,
+250,245,123,108,192,222,242,234, 14,123, 19, 97, 97,161, 30,158,222,193, 72,142,223,231, 50, 45, 82,222,  0, 42,138, 46, 31,252,
+ 74,247,187, 41, 93, 63, 85,162,252,208, 70,141, 26,217, 91, 23, 32,149, 74,209,176,203, 64,124, 58,127, 41,228, 28,197,147,221,
+ 26,162,154,194,  6, 40,125, 33,237, 48, 13,196,187, 70,241, 67, 71, 83,183, 30, 80,247,191, 53, 25,183,212, 10,188,184,227, 32,
+164, 82, 41,126, 26,220, 27,114,185, 20,207,254,188, 31, 82,169, 20, 63,143,122,  2, 82,153, 20, 61, 23,255,232,214,131,138,253,
+216,111,220,184,129,195,135, 15, 35, 58, 58, 26,215,175, 95,135,115, 63, 91, 74,169,219,166,173, 97,195,134,142,128,132, 68, 34,
+193,221,187,119,209,167, 79, 31,199,  3,254,190,125,251, 48,101,202, 20,140, 26, 53, 10,157, 58,117, 42,179, 95,108,105,205,152,
+152, 24, 71,224,160,180,  9,118,110,182,173,204, 57, 42, 75,211, 81,126,171,120,222,157, 53,223,123,239,189, 50,205,122,101, 52,
+255,211,  6,203,126,129,148,215,238,172, 86,171,241,202, 43,175, 96,198,140, 25,240,247,247,119,217,119,198,238, 92, 43, 98,235,
+214,173,247,172,219,188,121,179,171, 38,194,203, 94, 94, 94,177,157, 59,119, 70, 94, 94, 30, 18, 19, 19,161, 86,171,209,224,211,
+ 79,113,238,229,151,209,100,241, 98,112, 93,186,128, 16,  2,153, 76,134,115,231,206, 65,169, 84, 94,174,108,196,192,195,195,  3,
+ 62, 62, 62,142, 54,117,187,209,114, 50, 88,212, 29, 51,180,109,219,182, 50, 71,232, 84,165, 15,150,189,226, 61,122,244,104,137,
+254, 87,206,205, 28, 71,143, 30,117, 68,176,138,247, 39,174,206, 83,241, 83, 29,181,235,169, 84, 42,248,250,250, 66, 46,151, 59,
+140,149,221, 92,185, 99, 46, 93, 77, 36, 26, 17, 17, 81, 98, 34, 82,137, 68, 82, 98, 34,210,127,123, 19,161, 94,111, 64, 97,129,
+254, 65, 54,105, 21,153,179,226,  1, 39, 27, 54,108, 64,171, 86,173,238, 49, 87,246,168, 99, 21, 12, 71, 18, 33,164,211,252,249,
+243,143,125,246,217,103, 62,133,133,133,248,246,219,111,243, 10, 11, 11, 59, 81, 74,147, 42,165,  5,192, 98, 54, 67,103, 48, 66,
+ 91, 88,148,  7, 55, 47,252,228,210,148,253,155,169,223,168,209,240,111,191,253,246,158,245,223,126,251, 45,174, 95,191, 62, 28,
+231,206,237,109,  9, 44,121,125,218,180,218,205,155, 55, 15,  3,128,215,167, 77, 75,106,  9, 44,169,232, 58, 55, 23, 55, 17, 22,
+ 22, 22, 69, 61, 12,218,204,  7, 83, 78,139, 77, 70,121,125,174,170,114, 67,180,215,183, 82,169, 20, 61,  6,191,128,148, 91, 87,
+ 16,173,206, 68, 53,111, 21,104,126, 50,164, 93,222,193,185,108, 21,230, 45,222, 94,169,116,170,229, 50, 40, 20,114,167, 62, 87,
+ 10,200, 20,114, 71, 58, 21, 74, 37, 36,114, 89,165,143,253,234,213,171, 80, 42,149,176,217,108,247,220,111, 42,123,252,206,198,
+229,243,207, 63,199,148, 41, 83,176, 98,197, 10,156, 59,119, 14, 77,154, 52, 65,183,110,221,144,158,158,142,179,103,207,194,104,
+ 52,186,157, 78,231,126,113, 23, 47, 94,196,175,191,254,138,248,248,120, 36, 38, 38, 86,249,188, 59,107,150, 54, 88, 27,118,157,
+198, 83,221,155, 85, 73,115,230,204,153, 72, 79, 79, 47, 17,185,114,142,110, 62,210, 17, 44,123, 19,147,211, 77,249,158, 40,149,
+ 90,173,118,116,136,244,244,244,116, 25, 25,178, 27,172,184, 91,  5, 37,250,114,217, 35, 89,  0, 48,106,212,168,123, 34, 88,165,
+ 39,167, 43,141,209,104,220,183,111,223,190,166,125,251,246,229, 47, 95,190,236,104,138, 52,181,105,131, 38,139, 23,227,252,196,
+137,232,152,144,  0,131,217, 12,133, 66,129,237,219,183,155,117, 58,221,190, 74, 86, 22,196,217, 96,169,213,106,120,121,121, 57,
+ 12, 70,101, 92,121,121, 79,136,206,255, 87, 38, 34,100,239,115,102, 95,236, 55, 86, 66,  8,244,122,189,163,179,102,101,162, 34,
+ 54,155,205,113,225,217, 59, 40,122,123,123, 59, 42, 13,251,104, 50,119,155, 71, 93, 77, 36,170, 80, 40, 60, 15, 28, 56, 80,203,
+ 62,141, 68,102,102, 38,  6, 15, 30,124,237,223,126,113, 81, 80,152,173, 54, 20,234, 13, 40,212,235, 30,184,254,234,213,171,113,
+227,198, 13,152,205,102,188,255,254,251,247, 24,171,202,116,114, 47,163, 92,221,104,214,172,153,216,171, 87, 47, 28, 61,122, 20,
+114,185,220, 66, 41,173,244,252, 85, 84, 20, 97,182, 90, 97,208,235, 81,168,213, 62, 18, 79,173, 23,207,157,251, 73,173, 86, 15,
+  6,160,201,205,205,229,189,188,188,160, 82,169,160,215,235,243,248,226,145,130, 71,  0,147,183,197,242,225,160, 65,131, 62,  3,
+  0,133,197,242,225, 17,192, 84,209,117,110,177, 22,155,245,  7,152,143,246,122,171,188, 58,169, 42,209,105,251,141, 84, 42,149,
+ 66,224,121,124, 59,119, 50,162,213, 25,104, 22,233,  1, 99,218,117,200, 60,252, 65,188, 35, 48,111,241,118, 92, 74,200,174, 84,
+ 58,135,172, 92,143,240,240,112,108,121,166, 31, 20,114,  5,134,108,216, 13,137, 68,130, 29, 99,  7, 67, 42,147,161,219, 87,223,
+ 87,233,216,181, 90,109,185,145, 42,119, 35, 88,165,143, 93, 34,145,160,105,211,166,168, 83,167, 14,246,238,221,139,102,205,154,
+225,250,245,235,184,126,253, 58, 18, 18, 18,112,238,220, 57,228,228,228, 84,250, 28,173, 93,187, 22,217,217,217,144,201,100,200,
+204,204, 68,124,124,188, 91, 83,177,184, 58,239,118,234, 61, 62, 19,  0, 16, 82,205,171, 82,  6,203, 89,243,163,143, 62,186,199,
+180, 63,138, 45, 29, 66, 57, 38, 64, 95,175, 94, 61,165,115,251, 41,199,113,240,240,240, 32, 83,166, 76,225,139,255,134,151,151,
+ 23,170, 85,171,230, 86,179,155, 68, 34,209,183,108,217, 82,105, 47,128,118,227,164, 86,171,249,169, 83,167,146,229,203,151,151,
+ 27,213,114,209,  7,235,179, 17, 35, 70, 60,159,148,148,228, 19, 16, 16,128,212,212, 84,200,100,178,162,139,162,115,103,196,221,
+186,  5,115, 81,159, 34, 92,189,122, 21, 75,151, 46,213, 26,141,198,207, 42,155, 81, 26,141,  6,126,126,126,142,166, 65,123,  4,
+199,201, 44,210,170, 84,100,165,151,202, 68, 28,236,154,206,  6,203,126, 99, 29, 51,102, 76,  9,179,229,118,129, 16,  4,107,199,
+142, 29,  5,123, 58, 44, 22, 11, 26, 53,106,132,244,244,116, 72, 36, 18,200,100,178, 18,145, 59,119, 12,150,171,137, 68,  5, 65,
+128,201,100, 66,135, 14, 29, 64,  8,193,151, 95,126, 89,165,200,203, 63,206, 96, 89, 69,162,209,248, 33, 36,164, 46,170,  5, 24,
+ 32,138, 15,238,237, 47, 86,171, 21, 99,199,142, 45, 17,177,178,143, 84,180, 55,241, 23, 53, 43, 89,170, 60,105,171,253,186,190,
+159,249,223, 68, 10, 71,211,150, 86,107,248,215,157,195, 26, 53,106,120, 22, 55, 25,150,230,  7, 74,233,175,101,158,155,226, 41,
+ 25,120, 96,246,157, 59,119, 26,122,121,121,161, 71,143, 30,216,186,105,211,150, 31,  0, 71,200, 38, 23, 72,242,185,123,119, 98,
+241,223,201,174,130,122, 69,125,176,140,208,106,245, 15,252, 56,239,247, 65,175,172,  7,106,158,231,177, 97,241,  7,136, 86,165,
+161,105,117, 57, 14, 31, 61,141, 86,225,  0, 76, 85,111,  1,182,247,109, 82,169,148,144,202,228,142,116, 42, 84, 42, 72,164,178,
+ 42, 31,187,115,125, 90,186,190,172, 74,  4,207, 57, 63, 95,120,225,  5, 76,155, 54, 13, 61,122,244,192,245,235,215,177,127,255,
+126, 92,191,126, 29, 19, 38, 76, 64, 76, 76, 12,122,246,236, 89, 41,205,245,235,215, 35, 47, 47, 15, 28,199, 33, 43, 43, 11,122,
+189, 30, 51,102,204,184,239,243,110, 39,126,215,251,  0,128,159,118,158,170,178,230,155,111,190,137,187,119,239,150,136, 92, 61,
+ 42, 81, 43,151,  6,235,234,213,171,101,182,247,197,196,196,164,117,239,222, 61, 32, 53, 53, 21, 26,141,198,165,185, 34,132,116,
+179,207,149,113,225,194,133, 50, 53,107,214,172,105,238,222,189,187, 36, 56, 56,184,196,232, 65,181, 90, 93,226, 98, 45, 75,179,
+184,242, 47, 32,132,188,212,174, 93,187,239,126,251,237, 55, 85,157, 58,117,144,159,159, 15, 74, 41, 86,172, 88,129,113,227,198,
+ 65,161, 80,224,234,213,171,232,215,175,159, 78,167,211,189,228, 60,  7, 86, 89,154,101, 25, 25,142,227, 28,243,195,148, 97,174,
+ 42, 60,118,103,230,207,159,239,152, 11,170, 34,150, 44, 89,  2,148,154, 82,161, 44, 77, 74, 41, 62,249,228,147,  7,166,121,229,
+202,149, 21,206,219, 35, 35, 35,191,124,236,177,199,132,196,196,196, 18,166,202,121, 41,163, 66, 42,161,233,106, 34, 81,158,231,
+ 17, 24, 24,136,247,222,123, 15,126,126,126,  8, 10, 10,186, 39,242,226,234, 28, 85,241,233,253, 47,213,164, 28, 61, 57,255,179,
+153,237,151,124,189, 81, 34,151,  1, 71,246,255,132,252,156,187, 37, 35,176,230, 63,135, 68,203,154,117,133,233,212,110,183,210,
+105, 52, 26,241,209, 71, 31, 97,230,204,153,247,204,129, 83,206,121,191,175, 99,119,199,100,149,165, 41,138, 34, 81,169,125,160,
+ 80,135,160, 65,140, 15, 68, 55,230,234, 20,255,254,243,174, 75, 76, 76,244, 10, 15, 15,199,181,107,215,  8,254,236,143,245,231,
+185,146,201,134,  0,248,181, 34, 77,  2,156, 91,179,102, 77,195, 70,141, 26,225,203, 47,191,  4,128,103,159,219,177, 99,240,211,
+122,189,  1, 40,154,124,180,216,140,185, 76,167,141, 82,162, 84,121, 67,161, 14, 70,131,134,222, 16, 69,247,231, 60,165, 21, 28,
+187,253,230, 87, 58,122, 85,201,137,164,239,209,180, 63, 32,221, 60,242, 11,250,244, 14,195,161, 99,231,177, 59, 81,133, 48, 89,
+ 42, 66,116, 25, 16, 51, 46,227,213,129,205, 48,111,125,209, 77,252,252, 73,215,154,132, 16, 28,122,237, 69,168, 85, 10, 60,185,
+230, 87, 72,165, 82,252,254,234, 51,144, 74,229,232,248, 89, 81,147,236,185, 15,167, 67, 34,151, 35,250,127, 51,221, 74,103,233,
+150, 26,123, 87, 14,231,125, 42,138, 96, 85,116,236,  5,  5,  5,200,205,205,197,119,223,125,135,145, 35, 71, 34, 61, 61, 29,  9,
+  9,  9,184,118,237, 26,126,248,225,  7,199,232,244,202,164,211,110, 94, 38, 77,154,  4, 74, 41, 26, 52,104,128,153, 51,103,162,
+ 77,155, 54,149, 62, 71,165,207,123,105, 92, 69,175, 42,210,156, 55,111, 94,149,202,210, 35, 97,176, 42,122, 42,225, 56, 14,254,
+254,254,142,194,225, 92,240,170,242,164,203,243, 60,172, 86,171,163,227,180,125,  1,128,190,125,251, 98,235,214,173,238,140,140,
+248,141, 16, 50,188,126,253,250,223,204,154, 53, 75,211,177, 99, 71, 33, 36, 36,  4, 45, 90,180,192,213,171, 87,241,203, 47,191,
+ 88, 22, 46, 92,168,213,233,116,163, 40,165, 59,171, 82, 39,219, 95, 61,227,188, 84,  6,155,205,150, 24, 31, 31, 31,252,201, 39,
+159,240, 28,199, 97,222,188,121,206, 47,185,190,167, 16, 30, 61,122,212,234,170, 73,198,106,181, 38,198,199,199,  7,127,250,233,
+167, 60, 33,196,161,233, 60,249,171,115,222,185,163, 89,150,185,180, 15,120, 40,107, 41, 43,237,101,157,227,138, 38, 18, 21,  4,
+  1, 87,175, 94,197,140, 25, 51, 64,  8,193, 79, 63,253,244,159,184,184, 14, 29, 79, 89,222, 54, 54,196,103,200,192, 78,141,  8,
+ 56,152,204,247, 14, 64,227,179,114, 29,230,234,137, 79,215, 98,227,107,131,221, 49, 59, 55,142, 31, 63,238,251,209, 71, 31,  9,
+ 60,207,227,243,207, 63, 47, 49,217,111,233,243,126,236,216, 49,107,149,154,247,138,175,103,179,217, 12,189,190,106, 81, 19,202,
+145,195,243, 62,122,167,251,146,111,183, 74,  8, 49,225,200,190,159,144,151, 91,246,208,116,153, 68,192,170, 53, 91,172,  2,207,
+ 37,254,205,167,110, 73,183,110,221,102,236,218,181, 75,  8, 15, 15,175,178, 72,123, 96,235,130,  5, 11, 30,123,230,153,103,124,
+235,215,175,143,141, 27, 55,  2,128,172,120, 65,241,204,238,191,185,103,146,196,205,159,127,252,206,179, 75,191,221, 42,227,136,
+ 25, 71,246,255,132,188, 82,102,189, 52, 82,169,  4,171,215,108, 54, 11,  2,127,197, 85,189,238, 28,189,186,223, 27,162,115,217,
+107,214,231,121,124,249,203, 82,  4, 52,234,133, 65,125,227,112,240,203,103, 48, 40,218,  0,243,186, 97,104, 56,112, 37, 86,188,
+ 94, 20,189,105,186,254, 13,183,238, 63, 30, 30,106, 71,  7,114,142,227, 32, 87,168, 32,145,255,217,127, 72,166, 82, 65,168, 68,
+ 36,203,126,236, 21, 69,170, 42, 27,193,226, 56, 14,145,145,145,168, 89,179, 38,218,181,107,135,102,205,154,161,115,231,206, 56,
+123,246, 44,206,158, 61,139,  9, 19, 38,148,107,174,220, 57, 71,221,187,119,199,149, 43, 87,238,187,144,151, 62,239, 15,  2,119,
+202,210,203, 47,191, 12,  0,143,110, 31, 44, 87,153,103, 47,144,244,  1,116, 70, 37,132,192,100, 50, 57,154,222,156,231, 85,178,
+119,122,119,115, 62,168,157,132,144,152,183,223,126,123,162, 66,161,232,172,211,233,234,  2,128, 90,173,190,106, 52, 26,127,215,
+235,245,159, 83, 74,115,239, 39,173,206,211, 50,148,113, 28, 21,102, 70, 70, 70, 70,207, 17, 35, 70,236,228, 56, 46,178,162,151,
+243, 58, 61,249, 39,164,165,165, 61,230, 74,115,248,240,225,101,106,150,165,235,142,102, 89,231, 92, 20,197,114,205,149, 59, 21,
+144,171,137, 68, 37, 18,  9,212,106, 53, 54,109,218,  4,127,127,255,255,212,  5,118,248, 68,202, 71, 21,109,239,228, 47,223,  7,
+160,218, 19,159,174,189,179, 55,211, 84,163,147,191,236,246,198,215,  6, 87,175,232, 59, 57, 57, 57, 61, 38, 77,154,244,171, 32,
+  8,145, 21,157,111, 39, 35, 30,159,145,145, 81,233,105, 15, 40,165,184,114,229,138,248,194, 11, 47,100,102,100,100, 60, 93,149,
+227, 31, 63,241,227,207, 22,124,242,170,223,192,254,237, 91,128, 16,152, 76,229,116,234, 37,160,148, 82, 42,240, 92,226, 43,147,
+ 62,125,241,239, 60,103,148,210, 51,132,144,119,107,213,170, 53, 26, 64,121,119,194, 31, 92,233,236,  5,204, 50,163,241,147,216,
+216,216,169,111,188,241,134,119,223,190,125, 17, 30, 30, 94,238,124,129, 21,113,240, 88,210,232, 54,177,193, 97, 79,245,107,223,
+147, 35,132, 26, 77, 70, 23,245,106,113,126, 10,252,149,125, 71, 19, 27,187,138,206,115, 28, 87,233, 46, 10,238,208,117,224, 72,
+116, 29, 56,210, 81,158,118,173,235,132,147, 41, 59,209,156, 75,130,113,105,123, 16, 79,123, 81,231, 93,222, 39, 56,142, 67,191,
+ 21,155, 75,164,179,221,135, 37,163,179,117,199,189, 93,169,123,143,243,224,171,  7,213,  7,139,231,121,100,102,102,226,234,213,
+171, 72, 75, 75,131, 78,167,195,165, 75,151, 96, 54,155,145,147,147,  3,251, 72,195,170,164,243, 65,157,163,191, 83,243, 81,106,
+ 38,172,148,193,178,217,108, 73,174,222,122,110,181, 90, 43, 53,202, 72, 16,  4, 67,251,246,237, 73, 89,163, 13,236,127, 43,149,
+ 74,189,155, 21, 99, 46,128, 25,  0,102, 20,191,111, 10,217,217,217,247,237,  2,109, 54, 91, 74,203,150, 45,249,138, 12,145,205,
+102, 75,115, 97,134,180,  0,218, 60,200,147,247, 87,104,150,113,126,180, 29, 59,118,188,103, 30, 19,231,243,163, 80, 40, 42,236,
+117,235,106, 34, 81,157, 78,151, 58, 98,196,  8,155,115,179,160,243, 68,164,255,105,  8,189,221,123,200,243, 53,246,102,154,106,
+  0,128,221,100,129,210,219,229,125, 37, 37, 37, 69, 15,160,227, 95,157,180, 91,183,110,153, 90,181,106,181,186,160,160,224,101,
+ 74,105,149,123,233, 79,152, 60,239,141,127,219,105,161,148,158,  1, 48,230,126,117, 76,192,229,  6,  6,195,203, 51,223,126,251,
+201,119,222,126,187,142,  8,248,  1, 69,115, 84,241,192,218,202,104, 29, 57,145,250,192,231,  6,179,217,108, 73,109,219,182,173,
+ 84,164,198, 85, 29,111,181, 90, 43,188, 79,172, 65, 56,112,162,114,154,127, 69, 58,157, 53,155, 52,105,130,166, 77,155, 58, 62,
+237,148, 94,239,142,102,243,230,205,209,160, 65,131,114,103,104, 47,221,231,234,239, 62,118,187,166,221,246, 55,109,186,227,129,
+105,222,111, 58, 31, 41,131,101,127,199,224,131,228,226,197,139,127,201,187, 81, 40,125,112, 99,189, 47, 94,188,216,  2,143, 40,
+ 87,174, 92,241,187, 95, 13, 87, 19,137,158, 59,119,174,243,163,154,191,123, 51, 76,207,221,179,174,216,108,253,221,104,181,218,
+234,148,210, 42,245,204, 31, 56,112,160,237, 81, 61,167,160,180,196,196, 83, 23,139, 38, 40,253,238,159,152,212, 11, 23, 46, 60,
+240, 58,253,175,184, 79,252, 21,233,100,199,254,207,215,252,183,195,102,136,100, 48, 24,229, 61,164,216, 88, 46, 48, 24, 12, 70,
+213, 32,  0,186,149, 83,185,186, 61,114,135, 16,210,173, 10,149,247, 46,166,201, 52,153, 38,211,100,154, 76,147,105, 62, 90,154,
+174,180, 31,244,200,225,191,243, 41,245, 47, 91,  0,116, 99,154, 76,147,105, 50, 77,166,201, 52,153, 38,211,124,212, 22,214, 68,
+200, 96, 48, 24, 12,  6,131,241,128, 97,  6,139,193, 96, 48, 24, 12,  6,131, 25, 44,  6,131,193, 96, 48, 24, 12,102,176, 24, 12,
+  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96, 84, 29,242,  0,231,227,100, 48, 24, 12,  6,131,193, 96,128, 69,176,
+ 24, 12,  6,131,193, 96, 48,152,193, 98, 48, 24, 12,  6,131,193, 96,  6,139,193, 96, 48, 24, 12,  6,131, 25, 44,  6,131,193, 96,
+ 48, 24, 12,  6, 51, 88, 12,  6,131,193, 96, 48, 24,204, 96, 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193,
+248, 39, 24, 44, 66, 72, 55,166,201, 52,153, 38,211,100,154, 76,147,105, 50, 77,102,176, 24, 12,  6,131,193, 96, 48, 24,204, 96,
+ 49, 24, 12,  6,131,193, 96, 48,131,197, 96, 48, 24, 12,  6,131,193, 12, 22,131,193, 96, 48, 24, 12,  6,131, 25, 44,  6,131,193,
+ 96, 48, 24,140,191,  9,  2,160,204,145,  0,148,210, 93,110,139, 84, 97, 52,129, 43,125,166,201, 52,153, 38,211,100,154, 76,147,
+105,254,247, 52, 93,105, 87,198,127,252,163,161,148,254,101, 11,128,110, 76,147,105, 50, 77,166,201, 52,153, 38,211,100,154,143,
+218,194,154,  8, 25,174,158, 48,  4, 66,136, 80,213,237, 15, 75,147,193, 96, 48, 24,140,127, 18,236, 38,198,168,200,  8,181,  1,
+208,167,248,239,159, 41,165, 71, 42,179,253, 97,105, 62, 44,154, 55,111,174, 84, 40, 20, 61,246,236,217, 35,187,116,233, 18,254,
+248,227, 15,186,122,245,106,179,193, 96,216,113,242,228, 73, 61, 43, 49,255,126,154, 53,107,214, 19,192,244,226,127, 63, 56,117,
+234,212,246,251,188,134, 72,173, 90,181, 38,200,100,178,222, 82,169, 52,196,106,181, 18,163,209,152,162,215,235,119, 38, 39, 39,
+127, 74, 41, 21,171,160,217,194,223,223,127, 76, 76, 76, 76,157, 91,183,110, 37,222,185,115,103, 21,128,237,  0,122, 86,175, 94,
+125, 68, 84, 84, 84,248,133, 11, 23,174,101,102,102, 46,166,148,254,241,119,165,147,193, 96,  6,203,189,139,143,243,241,241,233,
+174, 84, 42,255, 87, 88, 88,216,212,211,211,243,162,213,106, 93,144,154,154,250, 51,187,240,254,179,230, 74,  0,208,135, 82, 42,
+  1,  0,158,231,251,183,105,211,166,  6, 33, 68, 36,132, 80, 74, 41,225, 56,174,169,205,102,227,138,247,239, 67,  8,249,131, 82,
+106,173,140,102,171, 86,173,194,  5, 65,160,148, 82, 66, 41,229, 56,142,107, 92, 25,205,  7, 69, 76, 76,204, 92, 74,105, 72, 69,
+251,168,213,234,216, 61,123,246,212,219,188,121,179,109,213,170, 85,185, 67,134, 12,209,140, 28, 57, 82,248,246,219,111,191,  2,
+240,191,210,251, 55,104,208,224, 51,142,227,252,221,249,125, 81, 20, 51, 47, 94,188, 56,137,149,188,191,157,233, 47,124,184,175,
+  3,165,192,215,211, 59,114,197,198,165,202, 52,109,218,244,187,  1,  3,  6, 12,169, 91,183,174, 32,138, 34, 44, 22, 11, 76, 38,
+ 83,189, 83,167, 78,117,218,177, 99, 71, 44,128,167, 43,121, 93,246,153, 62,125,250,178,119,223,125,183,154, 68, 34, 33, 22,139,
+165,245,143, 63,254,216,107,204,152, 49,103, 22, 47, 94,220,100,208,160, 65, 30,246,245,239,188,243,206, 99,132,144,137,148,210,
+ 31, 30,118, 58, 25, 12,134, 11,131,229,225,225, 81,187, 90,181,106,175,249,249,249, 61, 22, 27, 27,155,247,210, 75, 47,221,188,
+113,227,198,249,200,200, 72,221,183,223,126, 59,199, 98,177, 44,172, 91,183,238,142,252,252,252, 79,239,222,189,123,169,146, 21,
+ 69,109,  0, 47,  1,120, 12, 64, 24,128, 20,  0,191,  2, 88, 70, 41,189, 82,149,131,  9, 13, 13,109,164, 86,171,167, 18, 66, 90,
+107,181,218, 48,181, 90,157, 66, 41, 61, 86, 80, 80,240,113,106,106,234,169,170,104,134,133,133,213,  4, 48, 94, 16,132, 56,155,
+205, 22,201,243,252,109,155,205,118,192,102,179,125,153,146,146,114,173, 42,154,237,194, 61,250,138, 26,207, 79, 45,188, 50,188,
+208, 96,149,106,228,130, 69, 34, 26, 18, 69,109,238,244, 99,119, 10,127,250, 39, 22, 20,153, 76,198,173, 90,181,170,137, 76, 38,
+  3,  0,152, 76, 38,196,196,196,144,251,209,148, 72, 36,220,167,159,126,218, 76, 16,  4,152,205,102,177,160,160,128, 62,249,228,
+147,127, 75,179, 53, 33, 36,236,228,201,147, 94, 82,169,180,204,237, 54,155, 13,253,250,245,139,148, 74,165, 88,180,104,145, 37,
+ 43, 43,171,233,242,229,203, 79, 45, 92,184,208,127,197,138, 21,  3,203, 50, 88, 28,199,249,151,167,105,179,217, 96, 54,155, 97,
+181, 90, 97, 50,153,208,185,115,103, 86, 27,253, 51,168,  1,  0,219,206, 26,  0,192,247,126,197,148, 74,101,244, 19, 79, 60, 33,
+100,100,100, 64, 34,145,192,108, 54,227,238,221,187,168, 85,171, 22,191,121,243,230,186,149,213,171, 87,175,222,152,247,223,127,
+ 63, 96,219,182,109,230,213,171, 87, 27,187,117,235, 38, 29, 53,106,148,103,135, 14, 29,226,194,194,194,184,111,190,249,198,184,
+107,215, 46,243,240,225,195,229,115,231,206, 13,248,245,215, 95,135,  0,248,225, 97,167,147,193, 96, 84, 96,176, 60, 60, 60,246,
+105, 52,154, 90, 47,190,248,226,149,151, 95,126,121,135, 70,163,177,  1,192,247,223,127, 47,244,239,223, 63,227,201, 39,159, 76,
+215,233,116,252,194,133, 11,171,127,241,197, 23, 59, 61, 60, 60,146, 11, 10, 10, 90,186,113, 35, 35,  0,254,199,113,220,248, 30,
+ 61,122,236,179, 88, 44, 25, 91,182,108, 89,247,196, 19, 79,196, 81, 74,213,123,246,236,249,133, 16,178,  4,192, 39,238, 70,199,
+  8, 33,124, 84, 84,212,204,176,176,176,201,139, 22, 45,146, 71, 69, 69, 65,169, 84,162,160,160,160,250,181,107,215,194,255,247,
+191,255,245,171, 89,179,230,  2, 47, 47,175,183, 78,158, 60,105,113, 83,147,132,132,132,188,234,233,233,249,222,220,185,115, 21,
+245,235,215, 39,106,181, 26,241,241,241, 13,143, 30, 61, 26,179,124,249,242, 81, 97, 97, 97,179,146,147,147,221, 78,103, 39, 66,
+  4, 67,205,106, 59,124,234,181,236,180,120,217,215,196, 95,173,130, 64,  8, 44,102,179, 36, 77,167,143, 26, 55,118,244,186, 54,
+117,130, 14, 21, 72,210,186, 94,188, 72,205,127,147,209,144,  3,  0,165,212, 72,  8,249,153,231,249,254, 50,153,140,235,223,191,
+ 63,118,237,218, 69, 12,  6,131,  0,  0, 10,133,194,218,191,127,127, 40,149, 74,152, 76, 38, 17,192,207,229, 69,154,202,210,148,
+ 72, 36, 92,231,206,157,117,199,143, 31,207,182,107,170, 84, 42, 75,231,206,157,253,100, 50,153,210,106,181,210,138, 52,255, 34,
+ 19,137, 27, 55,110,148, 88, 87, 80, 80,128,140,140, 12,100,101,101,193,100, 50, 33, 55, 55, 23,162, 40, 18,163,209,152, 33,138,
+ 34, 56,174, 40,216, 86,158,166, 84, 42,197,213,171, 87, 75,172,179, 90,173,208,106,181, 48, 26,141, 48,155,205,208,235,245, 74,
+133, 66, 81, 59, 46, 46, 46,  9,192,230,194,194,194, 79,207,156, 57,115,155, 85, 79,127, 11,119,126, 62,109,168, 14,192,  4, 32,
+254,  1, 92, 79, 34,  0, 28, 56,112,  0,105,105,105,200,204,204, 68, 70, 70,  6,194,194,194, 80,149,232,255,149, 43, 87,230, 55,
+109,218,148,156, 57,115,102, 43,128,101,107,215,174,125, 34, 59, 59,123,209,148, 41, 83,124, 63,254,248,227,236,169, 83,167,142,
+  5,176,113,237,218,181, 35, 27, 53,106,212,247,220,185,115,243,254,142,116, 50, 24,140, 10,230,193,162,148,134,212,174, 93, 59,
+251,243,207, 63,175, 55,125,250,116,191,194,194, 66,190, 56, 74,100, 32,132, 80,157, 78,199, 79,155, 54,173,218,  7, 31,124, 80,
+ 79, 46,151,231, 88,173,214,106,101,104,148, 53,212,114,188,167,167,103,191,248,248,248,181,245,234,213,243,125,255,253,247, 79,
+ 43,149, 74, 58,127,254,252,147, 53,107,214, 12,190,125,251,246, 74, 79, 79,207, 46,  0, 38,151,147,174,123, 52, 35, 35, 35,223,
+ 27, 56,112,224,228, 67,135, 14,201, 27, 55,110, 12,141, 70,  3,158,231,225,237,237,141, 86,173, 90,145,253,251,247,203,123,247,
+238, 61, 33, 47, 47,239, 99,119, 53, 67, 66, 66,222,232,213,171,215,156,147, 39, 79, 42,187,118,237, 74,100, 50, 25,114,114,114,
+ 32,151,203,209,186,117,107,178,120,225, 87,202,134, 13,234,191, 19, 22, 22,246,174,187,154,230,218,254, 59,135,188, 50,173,243,
+207,191,110, 39,129,129,129,184,249,201,187, 56,208, 33,  6,215,103, 79, 71,112,112, 48,182,110,251,141,244,125,246,149,246,158,
+150,192, 61,238,106,222, 47,206,154,132,144,151,  1,100,  3,200, 38,132,188, 76, 41, 61, 18, 19, 19,115,242,210,165, 75,136,139,
+139,195,186,117,235, 26, 79,153, 50,229,229, 41, 83,166,188,188,110,221,186,198,113,113,113,184,116,233, 18, 98, 98, 98, 78, 58,
+247,149,114, 71,115,223,190,125,232,210,165, 75,206,186,117,235,162,102,204,152, 49,119,198,140, 25,115,215,174, 93, 91,179, 75,
+151, 46, 57,243,230,205, 51, 86,164,249, 87, 28,187,115,100,201,121, 17,197, 63,239, 45,  1,  1,  1,233, 63,255,252, 51,250,246,
+237,203,  5,  6,  6,166,246,239,223, 95,126,252,248,113, 10,224,231,202,164,211, 96, 48, 64,175,215, 67,171,213,226,206,157, 59,
+202,133, 11, 23,182,159, 60,121,114,173,117,235,214,133, 78,152, 48, 97,172,167,167,231,169, 38, 77,154,212,120,216,199,206, 52,
+  1,142,227,238,  2, 48,  3,208,114, 28,119,251,126, 52,159,122,234,169,134, 17, 17, 17,129, 63, 94,240, 65,142,180, 30, 68,169,
+ 55, 68,169, 55,108,126, 45,112, 67,246, 24, 66, 67, 67,  3,107,212,168,209,166, 50,154,148,210,157,167, 79,159,126,140, 82,186,
+152, 82,106,163,148,174,159, 58,117,234, 11,132,144,159,166, 78,157, 58,154, 82,186,190,120,253,242,179,103,207,246,165,148,254,
+254,119,164,147,149, 37,166,201,168,192, 96, 17, 66, 44, 31,125,244,209,209,175,191,254,122, 87,106,106,106,112, 84, 84,212,227,
+ 79, 60,241, 68,141,188,188, 60,242,196, 19, 79, 68,  6,  7,  7,247,217,183,111, 95,208,192,129,  3,247, 12, 28, 56,240,  8, 33,
+196,101,164,129, 16, 82,147,231,249,137,103,206,156, 57, 88,189,122,117,115, 74, 74,138, 71,211,166, 77, 11,  0,160, 78,157, 58,
+186,172,172, 44,165,151,151, 23,126,251,237,183,227,132,144,151,  8, 33,245, 92,105,  6,  7,  7, 55,243,243,243,251,223,123,239,
+189, 39,231,121,190,204,125,228,114, 57,222,123,239, 61,185,167,167,231,139,161,161,161,173, 93,105,  6,  5,  5,213,247,240,240,
+120,243,139, 47,190, 80, 24,141, 70,152, 76, 38,  4,  6,  6, 66,163,209, 32, 53, 37,  5, 41,  9,241, 72,139,191,133,  9, 47, 60,
+175, 84, 43,149, 19, 67, 66, 66,154,184,210,140,139,240,232,175, 14,107,208,105,220,248,255,225,194,132,145,216, 21, 42, 67,208,
+248,105,104,188,247, 60,194,102,125,138,223,163, 60,113,242,233,238,120,245,213, 73,144,  6, 68,181,109, 27,174, 25,252, 55, 68,
+174, 62,166,148, 42, 41,165, 74, 66,200,252,182,109,219,174, 86, 42,149, 47,191,255,254,251, 61,119,236,216,209,107,255,254,253,
+157,172, 86,171,196,106,181, 74, 14, 28, 56, 16,103, 48, 24,  4,185, 92, 14, 65, 16,168,187,154,109,218,180,249, 78,169, 84,142,
+ 93,180,104, 81,207,223,127,255,125,196,137, 19, 39, 94,177,217,108, 50,155,205, 38, 59,113,226,196,104,189, 94, 47,161,148,218,
+202,211,124,216, 72, 36, 18, 72,165, 82, 40,149, 74, 52,109,218,244,230,154, 53,107, 44,193,193,193,146,101,203,150,249,  4,  6,
+  6,170, 87,172, 88,145,155,155,155,251,161,187,122,102,179, 25, 70,163, 17,122,189, 30,  6,131,  1,135, 15, 31,142, 28, 53,106,
+148, 96, 50,153,108, 35, 70,140,200,182, 88, 44,198,113,227,198,121,106, 52,154,215, 88,245,244,240, 41,142,152, 22,  2,208, 82,
+ 74,141,246,245, 17, 17, 17,242,208,208,208, 70, 17, 17, 17,114,119,181, 10, 11, 11,151,124,246,217,103, 97,156,220, 27,  7, 77,
+189,241,131, 56, 11, 59,188,190, 68,122,141,201,  8,  8,171,133, 94,189,122,  5, 16, 66,190,124,  0,105,222, 76, 41, 29, 72, 41,
+221, 80,149,239,255,213,233,108,209,162, 69, 92,108,108,236,137,230,205,155,167,198,198,198,158,104,209,162, 69,220,253, 30,243,
+211, 49,164,219,136, 38,124,210,192,  6,132,142,104,194, 39, 61, 29, 83,249,185,154, 24,140,191, 26,151,157,220,171, 85,171,102,
+122,227,141, 55,206, 24, 12,134,243,223,125,247, 93,173,225,195,135, 55,173, 81,163,198,213, 39,159,124,242, 23,141, 70, 99,181,
+247,201,113,147,231,123,247,238,189,205,223,223, 31,121,121,121,130,197, 98,225,181, 90, 45, 15,  0,162, 40,194, 96, 48,240,183,
+110,221, 18,140, 70, 35,109,221,186,245,150, 35, 71,142,188,  4, 96, 98, 69,130,106,181,250,229,165, 75,151, 42,202, 51, 87, 54,
+155, 13,  5,  5,  5,176, 90,173,152, 53,107,150, 98,242,228,201,255,  3,112,212,197, 77,117,252,252,249,243,229, 86,171, 21, 28,
+199,129, 82,138, 83,167, 78, 33, 43, 61, 29,134,130,124, 24,243,243, 96,206,207,  3,175, 45,192,136,199,122, 42, 22,111,216, 52,
+  9,192,136,138, 52, 77,114,205,  7,223, 45, 93, 14,155,205,134,212,205, 63,150,185, 79,246,161,189,176, 89, 45,120,255,195,143,
+201,171,207, 15,122, 31,192,218,191,171, 96,200,229,114, 97,213,170, 85, 67,101, 50, 25, 40,165,196,100, 50, 97,199,142, 29,247,
+173,185,114,229,202, 17,118, 77,179,217, 76, 27, 54,108,120, 79,243,154,209,104,164,255,148, 11, 68, 38,147, 65,161, 80,192,108,
+ 54,163,122,245,234,250,126,253,250, 29,158, 63,127,126,117,158,231,213,130, 32,252,150,151,151, 55,247,194,133, 11,183,220,213,
+ 43,238, 60, 12,147,201,  4,189, 94,143, 59,119,238,  4,133,134,134,146, 55,223,124,211,166,211,233,162,150, 47, 95,126,227,199,
+ 31,127, 84,125,241,197, 23, 79,  2, 24,207,170,168,135, 71,173, 90,181,100,158,158,158, 94,213,253,  4,173,132, 71, 97, 58,165,
+ 30, 17, 17, 17, 53, 44, 22,203,147,132,144,214,117,234,212,241,185,126,253,122, 78,104,104,232, 81,142,227,126, 72, 76, 76, 76,
+117, 97,124,136,213,106,197,232,150,185,120,185, 13, 15,139, 37, 15,121,121,121,184,125,251, 54, 46, 94,188,136, 99,199, 46, 84,
+ 41,157,145,145,145,207, 43, 20,138, 30, 50,153, 44,194,102,179,113, 58,157,238,182,209,104,220,149,146,146,178,132, 22, 79, 80,
+ 84, 73,131,246,151,164,211, 73,255,211, 39,158,120, 34,196,203,203, 11,167, 79,159, 14, 57,123,246,236,167,  0, 98,239,235,186,
+ 20,184,111,102,127,242,101,104,176,191, 55, 46, 28,218, 26, 58,111,217,143,223,160,168, 47, 47,131,241,239, 49, 88,118, 20, 10,
+133,109,204,152, 49, 87,183,108,217, 18, 17, 27, 27,123,185,188,206,192, 46,104, 23, 29, 29,125,251,240,225,195,240,245,245, 53,
+ 91, 44, 22,222, 96, 48,112, 82,169,148,102,103,103, 19,189, 94,207,157, 61,123, 86,145,148,148, 36,245,241,241,145,  0,104,230,
+ 70,132,161, 77,100,100,100,217,166,198,100, 66, 97, 97, 33, 10, 10, 10, 96, 52, 26, 17, 24, 24, 72, 56,142,107,229, 50,172,199,
+113,237,235,214,173, 75,114,114,114, 16, 18, 18,130, 67,135, 14,161, 48, 55, 23,134,130,124,152,242,243, 96,206,203,133, 37, 47,
+ 23,185,233, 41,136,  8, 14, 35,197, 83, 11, 84,136,149, 87,214,  8,208,168,113,125,246, 52,180, 56,117, 27, 68, 34,197,241,134,
+193,160,150,162,174, 86, 45,207,165,128, 72,101,184, 60,225, 57,  4, 14,127, 17, 22, 78, 30,250,144,159,220,141,132,144, 41, 28,
+199,205,151,203,229,194,216,177, 99,145,154,154, 90,194,252,140, 29, 59,214,209,231,170, 67,135, 14,  7, 20, 10,133, 53, 35, 35,
+  3, 70,163, 81,226,142,102, 68, 68,196,237,183,222,122,235,184,201,100, 10, 11,  9,  9,241, 54, 26,141,250,186,117,235,134, 40,
+149,202, 64,147,201,100,139,141,141, 93,162, 84, 42, 45,133,133,133,212,106,181,146,127,194,  5, 66,  8,  1, 33,  4, 86,171, 21,
+ 86,171, 21,222,222,222,218,172,172,172, 99, 55,111,222, 28, 90, 21, 61,139,197,  2,139,197,226,136, 98,137,162,136,115,231,206,
+ 65,161, 80, 72, 68, 81,188, 96,179,217, 84, 18,137,  4, 60,207,179, 57,234, 30, 34,205,155, 55,239,212, 56,208,243,179,177, 33,
+ 70,239,154,125,213, 90,149,140,215,126,156,165,140,248,229, 59,237,218, 62,189,  7,123, 76,158, 60,185,134,175,175,175,226,214,
+173, 91,134,121,243,230, 69,110,220,184,145,  0,248,164, 34,205,148,148,148,159, 62,248,224,  3,223, 78,157, 58, 69, 73, 36, 18,
+146,155,155,139,140,140, 12,164,167,167,227,206,157, 59, 52, 33, 33,225,166,213,106, 93, 87,153,116, 54,110,220,120,249,240,225,
+195,159,105,208,160,129,132, 82, 10,179,217, 12,157, 78,215,244,216,177, 99,253, 14, 30, 60, 24,  7,160,210,229, 50, 53, 53,117,
+221,135, 31,126,168,238,216,177, 99, 61,137, 68,194, 61,136,116,150,170,  7, 66, 52, 26, 13,118,237,218,  5,111,111,111,184, 26,
+173,235, 14, 70,139, 24, 26, 20,224,  7,195,161,207, 80,219,183,  6,140, 22, 49,148,149, 98,198,191,214, 96,101,100,100,200,180,
+ 90,173, 32,138, 34,159,151,151,167, 82,169, 84, 86,153, 76,102,170,228,239, 53,232,215,175,223,241, 86,173, 90, 21, 22, 71, 52,
+ 44,  1,  1,  1,230,188,188, 60,136,162,  8, 81, 20,173,158,158,158,133, 22,139,  5, 81, 81, 81, 28,  0,151, 77,132,122,189,190,
+186, 82,169,188,103,189, 78,167,115,152,171,194,194, 66,232,116, 58,120,121,121, 65,171,213,186,188,184,109, 54, 91,132, 74,165,
+ 66, 74, 74, 10,  0,160, 32, 39, 27,198,252,124,152, 10,254, 52, 87,182,220, 28,136,122, 45,188,195,194, 97,181, 90,195, 93,105,
+106,141, 54, 25, 15,138,244,173, 63, 33,240,229, 41,229,238,151,115,112, 47, 60,106, 71, 67,175, 55, 63,244, 57,202, 40,165, 11,
+155, 54,109,218,108,227,198,141,163,146,147,147,239,217, 62, 96,192,  0,140, 31, 63, 30,227,198,141,187,252,248,227,143,159,221,
+186,117, 43, 94,121,229, 21,136,162,216,132, 16,146, 71, 41,253,181, 34,205,233,211,167,159, 72, 76, 76,220,123,237,218,181,177,
+  1,  1,  1,242, 70,141, 26, 93,111,212,168, 17,191,113,227,198,192, 23, 95,124,241,100,175, 94,189, 18,118,239,222,237,187,107,
+215, 46,133, 40,138,205,  9, 33,201,127,247, 60, 88,246, 38, 98,147,201,  4,131,193,  0,179,217, 12,155,205, 70, 42,145,167, 37,
+254, 23, 69,209, 97,214,140, 70, 35, 44, 22, 11,217,185,115,  7,182,110,221,202, 93,186,116, 49,108,250,244,215,145,151,151,  7,
+155,205,198,106,167,135, 64,108,108,236, 99,  2, 21,151, 14, 15,178, 42,134,  6, 90,181, 82, 66, 11,175, 45,125,171, 48,190,134,
+ 70,235,233,207,155, 60,253, 36, 33,211,166, 79, 11,190,121,227,166,241,163,143, 62,186,212,167, 79,159,128, 23, 95,124,177,254,
+182,109,219,226,170, 87,175,254,245,157, 59,119,114,203, 49,230,210, 81,163, 70, 29,243,246,246,174,185,122,245,234,244,228,228,
+100, 31,139,197,162,178, 88, 44,102,131,193,112,195,108, 54, 31, 52,153, 76,187, 82, 83, 83, 79, 86, 38,189, 26,141,166,241,160,
+ 65,131, 36,185,185,185, 40, 30,125,139,244,244,116, 52,107,214,140,223,189,123,119,131,170,228,193,197,139, 23, 63, 11,  9,  9,
+217,187,101,203,150, 30,106,181,186,185, 76, 38, 11, 18, 69,209,166,215,235,211, 12,  6,195,153,170,164,179, 84, 94,164,156, 58,
+117, 42,196,211,211, 19,137,137,137, 32,132,164,220,239,121, 83, 72,185,196, 75,  7,183,132,215,246,141,196,177,163, 71,161,144,
+114,137,172, 52, 51,254, 85,  6,171,160,160, 64, 56,117,234,148, 79, 98, 98,162,198,223,223,223, 80,191,126,253, 60, 66,136,200,
+113, 28, 77, 77, 77,245,141,143,143, 87,248,249,249,105,107,214,172,153,237,230,239, 93,155, 48, 97, 66,220,140, 25, 51, 78,118,
+239,222, 61, 19,  0,114,114,114,144,149,149,133,140,140, 12,152,205,102,164,164,164,112, 39, 78,156,240,253,237,183,223,154,  2,
+112,217,244,162, 84, 42,239, 20, 20, 20,212,245,246,246,118,220,208,236,166,202,217, 96,217,163, 89,106,181,218,229,197,205,113,
+ 92,114,114,114,114, 45,131, 94,143, 59,215,175,195, 88, 80,212, 36,232, 48, 87,121,217, 64, 97,  1,212, 10,  5, 10,178,179,192,
+243,252, 93, 87,154,106, 57,111,178, 88,109,178,106,189,250,  1,164,252,251,179, 87,203,118, 16,235, 53,130, 82,185,222,242,119,
+ 20,  8,142,227,108, 21, 53,251,202,100, 50,  4,  6,  6,138,173, 91,183,198, 43,175,188, 98, 55,  2,132, 16,210,137, 16,114,144,
+ 82, 90, 88,158,166, 40,138,220,165, 75,151,158,184,113,227,  6, 47,145, 72,184, 86,173, 90,197,180,111,223,222, 36,147,201, 32,
+149, 74,133,194,194, 66,143, 93,187,118, 41, 44, 22, 11, 41,214,124,104,243, 96,  1, 69,163,251,202, 48,240,208,106,181,208,235,
+245, 40, 44, 44, 68,110,110,174,160, 84, 42,235,118,232,208,225,168,209,104, 92,103,179,217,190, 57,121,242,100,126,121,154,102,
+179,185,132,217, 18, 69, 17,148, 82,216,108, 54, 88, 44, 22, 72, 36, 18,113,203,150,173,248, 98,225,124,172, 95,187,129,118,235,
+214,141,252,246,219,111, 16, 69, 49,137, 85, 79,127, 61,162, 40,126,250,251,180,167, 20,176,218,180,198,125,107, 10,183,103, 11,
+218,175, 47,252,126, 66, 47,112,249,213,235,163, 81, 68,120, 77,222,203,211,139, 91,177,114,105,214,111,219,246,220, 72, 74, 74,
+202,159, 61,123,118,155,168,168, 40,175,171, 87,175,134,  2,200, 45,199,  8, 69,140, 28, 57,114,100, 78, 78,142,116,217,178,101,
+ 43,146,147,147,247, 81, 74,111,150, 50, 30,205,  8, 33, 31,  3,144,  0,  8,  4, 96,  5,176,147, 82,186,178,  2,179, 34, 18, 66,
+240,251,239,191,223, 51,218, 79,116, 30,145, 81,249, 40, 86, 78,171, 86,173, 26, 95,187,118,109,115, 78, 78,206,234,210,219, 85,
+ 42, 85,191,152,152,152, 33,199,143, 31,127,155, 82,122,163,146, 15,110, 19, 47, 93,186,244,145, 40,138, 53, 56,142,187, 77, 41,
+157,250,  0, 34, 88, 47,204, 91,182,118,153,193,108,171,174,144,242,119,140, 22,241, 69, 86,154, 25,255, 26,131,101,181, 90, 53,
+111,189,245, 86,155, 38, 77,154,164,118,232,208,225,110,100,100,164,206,190,205,195,195, 67,239,231,231,167, 55, 24, 12,202,219,
+183,111,  7,111,218,180,169,142,205,102, 83,185,241,123,123,188,189,189,125, 79,156, 56,225,247,195, 15, 63,212, 62,117,234, 84,
+141, 97,195,134,117, 52,153, 76, 48, 26,141,184,117,235, 86,141,165, 75,151,138, 82,169, 52,151, 16,242,  7,  0,151,143,241, 22,
+139,229,200,181,107,215,234,180,106,213,138, 88, 44, 22,135,161,114, 54, 89,133,133,133,144, 74,165, 72, 73, 73,161,162, 40, 30,
+115, 35,157, 71, 79, 28, 63, 94,171, 97,253,104, 24,243,114,138,205, 85, 30,172,121, 57, 16,243,178,193,105, 11,225,231, 43, 64,
+165,208,224,106, 74, 42,138,211, 90, 33, 18,171, 62, 33, 57, 47,191,110,173,153,159,224,247, 40, 79, 80,139,217,209, 44,  8,192,
+209, 92,216,246,114,  6, 14, 28, 62,  2,193,102, 76,254,167, 22,154,179,103,207,166, 15, 27, 54,236,164, 40,138,205, 80,193, 20,
+  5, 21, 60,133, 23, 20, 22, 22, 34, 51, 51,211,150,149,149,101,  0,128,244,244,244,156, 45, 91,182, 92, 18, 69,177,101, 85, 52,
+ 31,  4, 22,139,229,158,232,147,205,102,131,213,106,133,217,108, 70, 70, 70,134,236,224,193,131, 29,142, 30, 61, 42,189,120,241,
+ 34,142, 30, 61,218,100,211,166, 77,175, 71, 71, 71, 55,186,124,249,242, 93, 87,166,141,148,109,172,121,  0,216,178,241,103, 12,
+ 25, 50,132,100,102,102, 98,211,166, 77, 15,164, 25,133,225, 22, 90, 88,109, 74,211,190, 53,133,175, 93,151, 23, 92,208,241,179,
+ 79,158, 60,185,157, 82, 74,123,247,238,125,182,110,189, 40,127,  0,144,203, 52, 65, 13, 27, 54,236,232,227,227, 35,  3,128,144,
+144,144,230, 22,139,101, 33,128,246,101,137, 14, 24, 48,160,109, 64, 64, 64,211, 95,127,253,245, 76,114,114,242,254,210,230, 10,
+  0,234,214,173, 59,235,252,249,243,143, 73, 36, 18,226, 84, 70, 40,128, 50, 13,214, 83, 79, 61, 85, 55, 44, 44,204,111,219, 53,
+ 47,228, 75,107,129,242,121,128,160,128,205,187, 49,110, 75,235, 35, 40,232,138, 95,173, 90,181,154,220,184,113,227, 76, 37, 35,
+ 76,213,  7, 13, 26,244,203,242,229,203,163,123,245,234, 37,  3,112,143,193,138,142,142,126,114,247,238,221,  3,199,142, 29,219,
+152, 16,210,151, 82,122,221, 93,253,147, 39, 79, 30,  2,208,230, 65,158,180,117, 23,232, 46, 20,207, 89,198, 96,252,235, 12,150,
+217,108,222,121,253,250,245, 22, 79, 61,245, 84,166,179,185,162,148, 58, 42,  3, 47, 47, 47,189,191,191,127,246,153, 51,103,170,
+137,162,184,207,141,223, 91,182,123,247,238,223, 23, 44, 88,176,198,215,215,215, 50, 98,196,  8,110,218,180,105,  7,178,178,178,
+104, 86, 86, 22,190,252,242,203, 14,113,113,113,  7,110,223,190,109, 59,121,242,228, 72,  0,189, 92,214,142, 90,237,194, 87, 94,
+121,101,200,129,  3,  7, 20,246,121,138, 74, 71,175, 44, 22, 11,  4, 65,192,194,133, 11,141, 90,173,118,190, 27,145,140, 37, 95,
+125,245,213,192,165, 95, 44, 80,240,102, 51, 44,185,217,176,230,229,194,150,155, 13, 78,167,133,135,130,160,118,179,106,200, 73,
+150, 99,213,246, 67,122,171,213,250,149, 75,131,101, 40,156, 50,118,244, 75, 63,239,220,243, 59,124,219,119, 65,214,239,191,221,
+ 27, 29,170, 22,  8,147,217,140,247,222,157, 73,137, 62,119,218,223,244, 68,207,155, 76,229,183,252,154, 76, 38,136,162,152,116,
+241,226,197,181,132,144,  2, 66, 72,167,226, 77,123,203,138, 94, 57,107,114, 28, 39,214,175, 95,127, 99, 96, 96,224, 19,  0,180,
+245,235,215,223, 40,151,203,187,152, 76,166, 86,162, 40, 38,157, 62,125,122,  3, 33,228, 46, 33,164, 79,241, 87, 31,234, 60, 88,
+ 22,139,  5, 51,102,204,192,  7, 31,124,128,233,211,167, 59,142,215,222, 76,104, 54,155, 35,119,236,216, 33, 61,116,232, 16,253,
+238,187,239,178,158,126,250,105,239, 97,195,134,121,175, 90,181,106, 34,128,169,229,105, 78,157, 58, 21,139, 23, 47,198,152, 49,
+ 99,238,117, 87, 60, 47, 38, 39, 39,193,100, 54,209,149, 43, 87,166,  8,130,224,243,249,231,159, 43, 39, 79,158, 76, 88,245,244,
+215, 99,179,217,222,108,247,233,166, 87,  9, 81,154,173, 86,235,252,179,103, 79,239,117,122, 16, 80,126,250,201,167,  2,  0,124,
+242,241,167, 18, 74,169,151,125, 98,216,217,179,103, 43, 70,143, 30, 29, 80,158,238,250,245,235,115,103,207,158,237,247,194, 11,
+ 47,244,218,187,119,175,138, 16,178, 13,192, 31,  0, 50,139, 31, 28,253,  1, 28,170, 86,173, 90,240,218,181,107,107,245,232,209,
+ 67,237, 70, 93,247,245,162, 69,139, 34, 62,221,239,129,109,218, 39,144, 40, 62, 13,234, 77,225, 27, 80,128,250,154, 59,232, 28,
+154, 28,178,122,245,234,101,  0,154, 87,194, 92, 53,120,234,169,167, 54, 45, 95,190, 60,242,165,151, 94, 74, 58,116,232, 80, 34,
+ 33,100, 86, 25,187,102, 61,247,220,115,183, 87,172, 88, 81, 75, 20,197,237,132,144, 94,148,210,107,172,  4, 49, 24, 85,139, 96,
+ 61, 79,  8,137,153, 62,125,250, 71, 33, 33, 33,213,103,206,156, 25, 95,191,126,125,173,227,106,203,202,210,236,219,183, 47, 42,
+ 63, 63,191,192,106,181,142,160,148,158, 45,227,226,237,230, 60, 87,  6,165,244, 54, 33,228,163, 38, 77,154, 12,249,241,199, 31,
+247,121,120,120,228, 31, 61,122,212,211,211,211, 51,239,210,165, 75,106,158,231,117,241,241,241,216,177, 99, 71,  7,  0, 95,148,
+245,148, 84, 90, 51, 53, 53,245, 84, 84, 84,212,252,201,147, 39,255,239,237,183,223, 86, 80, 74,161,211,233,144,159,159, 15,163,
+209,  8, 65, 16, 64,  8,193,154, 53,107,140, 70,163,113,105,114,114,242, 81, 87,154, 41, 41, 41, 71,194,195,195,191,153, 63,111,
+222, 11, 47, 14, 25, 44, 67, 94, 22,114, 83,147, 65,116,133,208, 40,229,136,233, 26,  6,109, 22,193,242,125,127,152,178,141,230,
+181,201,201,201,123, 93,105, 30,188, 83,240, 75,155, 58,  1,187,103,207,158,217,245,245,111, 55, 64, 20, 69, 92,126,229, 25,228,
+236,223,  9, 85,253, 70,104,123, 57,  3, 38,147,  9,211,167, 78,  6,175, 75, 59,112,244, 78,225,122, 87,154, 15,  2,103, 77, 66,
+200,203,132,144,103,162,163,163, 49,118,236, 88, 12, 24, 48,160,196,190,155, 54,109,194,162, 69,139, 96, 52, 26,159, 33,132,156,
+162,148, 46, 36,132, 28, 44, 62,183,133,174, 52, 35, 34, 34, 90,196,196,196, 32, 36, 36, 68, 87,108, 46,186, 95,188,120,177,121,
+116,116,116,105,205, 63,138, 53,173, 15,235,216, 41,165, 57,215,175, 95,247,252,248,227,143,137,217,108,198,172, 89,179, 96, 55,
+154,246,150,151, 55,222,120, 35, 68,163,209,224,147, 79, 62, 49,101,102,102,118, 89,180,104,209,158,  5, 11, 22,248,175, 89,179,
+102,168,221, 96,149,210, 76,191,116,233,146,199,226,197,139, 57,171,213,138,207, 62,251,236,158,102,200,137, 19, 39,194,108,182,
+ 64,224,  5,147, 65,111,104,160, 80, 40,110,248,248,248, 40, 69, 81,164, 15,235,216, 31,101,205,179,103,207,238,  4,176,211,157,
+239, 25, 12,  6,100,100,100, 32, 51, 51, 19,197, 93, 18, 72,121,233, 52, 24, 12,167,167, 78,157,122,114,201,146, 37,189, 14, 29,
+ 58, 52,112,255,254,253,189,118,237,218,101,184,125,251,182,213, 98,177,208,224,224, 96,161,125,251,246,138,222,189,123,171,229,
+114, 57,247,230,155,111,102,206,153, 51,199, 31, 64, 86,  5,245, 39, 79, 41,197,107, 29, 10, 48,181, 51, 15,147,201,140,220,220,
+ 92, 36, 39, 39,225,226,197,139, 56,114,228, 50, 40,165, 92, 37,243,115,254,234,213,171,163,100, 50, 25, 89,179,102, 77,245, 53,
+107,214, 76,112,149, 15, 43, 87,174,140, 88,179,102,205,194, 98, 45,145,149, 37,166,201,168,164,193, 42,190,160, 47,  0,232, 69,
+  8,105,255,210, 75, 47,125, 24, 29, 29,109,180, 90,173,146,237,219,183,215,203,204,204,148, 89,173,214,169,148,210,253,149,249,
+ 65, 74,233, 98, 66,  8,250,247,239, 63,181,102,205,154,187, 79,157, 58,213,184, 95,191,126,219, 55,110,220,216,222,106,181,222,
+ 60,127,254,252, 51,  0,230,  3,248,194, 93,205,248,248,248,183,118,237,218,101, 61,122,244,232,107,211,166, 77,147,  7,  4,  4,
+ 16, 31, 31, 31,164,164,164, 32, 41, 41,137,126,251,237,183, 70,163,209,248,133,151,151,215, 91,238,106,202,100,178,215,246,159,
+ 56, 73,174,222,184, 49,242,249,199,122, 40,194,235,212,133,134,212, 69, 65, 86, 38,246,239, 77,195,138, 63,206, 24,210, 12,166,
+239,121,158,119,123, 40,125,232,245,140,158, 59,127, 88,254,235,222,221,123,186,205,253,224, 35, 18, 50,252,  5,168, 35, 34, 33,
+ 70,212,198,190,189,123, 49,103,246, 44,202, 23,166,237,183,220, 72,235,254,176, 11,130,125,206, 42, 81, 20,  5,  0, 80, 42,149,
+ 24, 63,126, 60,156, 95,141,179,104,209, 34,232,245,122,  0, 16,  8, 33, 31, 19, 66,190, 41, 47,106, 85,142,102,245,109,219,182,
+ 85,119,214,140,142,142, 46, 75,211,248,176,143, 63, 45, 45,237,173,231,158,123,238,125,137, 68,226, 93,222, 62,106,181, 26,  5,
+  5,  5,176,217,108, 54, 95, 95,223, 43,246,200,104,121,215,145, 86,171,125,107,204,152, 49,239, 17, 66,202,141,116, 40,149,202,
+219,  7, 15, 30,172, 61,108,216, 48,110,237,218,181,183,134, 14, 29, 42, 63,120,240,160, 13,192,  6, 86, 61,253,179,112, 30,176,
+160,213,106,  1,128, 86,176,239, 29, 66,200,212,147, 39, 79, 42,198,140, 25,211,124,248,240,225,158,157, 59,119,214, 56,239,163,
+215,235,197,173, 91,183,106, 23, 47, 94,156,181,127,255,254, 63, 70,141, 26,245,  4,138,102,144, 47,147,148,148,148, 95,190,248,
+226, 11,175, 78,157, 58,213,177,217,108,142,254, 87, 25, 25, 25, 72, 74, 74, 66, 66, 66,194,109, 81, 20,183, 84,242,176, 94, 25,
+ 54,108,216,182, 21, 43, 86,212,120,233,165,151,146,126,248,225,135, 45,  0,242,202,216, 79,243,228,147, 79,246, 91,177, 98, 69,
+141,209,163, 71,223,  1, 48,129,205,240,206, 96,220,135,193,114,170, 44, 14,  2,104, 67,  8,233,207,243,252,148,194,194,194,207,
+ 40,165,155,239,163,162, 90, 76,  8,217,126,253,250,245, 23,  0,196,126,246,217,103,175,  3, 72, 68, 81,  8,189, 71, 89,253, 21,
+ 92,232,217,  0,188, 29, 26, 26,250,211,172, 89,179, 30,200,187,  8,111,220,184, 97,  2,240, 74, 72, 72,200, 15,239,255,176,254,
+ 45, 74,105, 51,158,138,126, 54,194,229,112, 28,119,218,102,179,205, 73, 74, 74,218, 87, 25,205,117, 69,233,236,209,186,186, 71,
+159,169,163,135,125,100,149, 40, 35, 10, 13, 86,153, 90, 46,152,164, 54,227,109, 78,159,243,230,209,219,133,255,136, 27,171,209,
+104,180, 62,241,196, 19, 95,115, 28, 39,  2,128,205,102, 19,140, 70,227, 72, 84, 98,228,105, 89,154,  3,  6, 12,248,150,231,121,
+107,113,100,136, 51, 26,141,207,223,143,230,131, 34, 51, 51,179, 16,192,184,138,246,137,139,139, 91,245,235,175,191, 14,235,222,
+189,187,237,151, 95,126, 73,127,252,241,199,133, 83,167, 78, 81, 66, 72,153, 79,113,  9,  9,  9, 70,148,243, 70,  2, 59, 77,154,
+ 52,169,241,205, 55,223,156,122,225,133, 23, 60, 23, 46, 92,232,123,252,248,113,219,242,229,203,243, 11, 11, 11, 63,101,213,211,
+ 63, 11,137, 68,  2,149, 74,  5,147,201,132,140,140, 12,184,234, 83, 78, 41,189, 65,  8,121,124,202,148, 41,113, 83,166, 76,121,
+ 60, 44, 44,172, 65,245,234,213,171,115, 28,199,165,166,166,102, 36, 38, 38, 38,152,205,230,221,  0,126,  1, 32,173, 89,179,230,
+105,  0,171,202,211,187,120,241,226,123, 33, 33, 33,191,111,220,184,241,113,185, 92, 94, 95, 38,147,249, 90,173, 86,174,176,176,
+ 48,219,108, 54, 95, 50, 26,141, 63,167,164,164, 28,174,100,221,121,149, 16,210, 89, 16,132, 95,150, 47, 95, 30,157,154,154, 26,
+177,111,223,190,190,165,247,107,222,188,249,138, 21, 43, 86,212, 24, 59,118,236,141, 53,107,214, 84,170, 15, 22,131,193, 12,150,
+123, 23,227,102,  0,155, 31,196, 15, 83, 74,111,  3,120,171,120,121, 32, 36, 39, 39,159,  3, 48,236, 65,102, 80, 74, 74,202, 33,
+  0, 61,129,162,217,156, 19,139,110,154,247,197,209, 59,  5, 63,195,233,245, 42,255,144,167,115, 35, 33,100, 74,241,168, 38,  0,
+152,114,250,244,233,133,165, 34, 82,103,157,183,187,138, 52,149,165,121,230,204,153,210,154,231, 43,163,249,119,146,147,147,243,
+191, 21, 43, 86, 28,127,229,149, 87,228,131,  6, 13,194,229,203,151,241,213, 87, 95, 25,115,114,114,214, 84, 85,243,204,153, 51,
+183,155, 52,105,210,108,217,178,101,175, 45, 93,186,180, 63, 33,132,189,139,240, 31,130,193, 96,184, 57,100,200, 16,112, 28, 71,
+ 40,165,212,106,181, 58,  6, 61, 20,207,103,118,211,141,235,202, 10,224,247,226,197, 21, 31,187, 81, 31, 29,  1,112,228,  1, 95,
+251,119,  8, 33,143, 39, 36, 36,204,189,122,245,234,111,101,237,115,225,194,133, 77, 61,122,244, 80, 29, 57,114,228,141,202,142,
+ 34,100, 48,152,193, 98,184, 36,225,  1,152,171,127, 50,197,253,159,190,177,155,163,202,110,127, 88,154,127, 23, 23, 47, 94,204,
+  1,224,120,101, 72, 84, 84, 20,250,244,233,115,223,186,197,102,106, 60,216,204,237,255, 40,182,108,217,242,216,163,114,172,148,
+210, 59, 21, 61,156,154, 76,166, 45,  0,182,176, 82,193, 96, 48,131,197,168,122, 69,107,188,159,237, 15, 75,147,193, 96, 48, 24,
+140,127, 50,  4, 64,183,114,110,122,110,143, 14, 32,164,242, 47,218,116,165,207, 52,153, 38,211,100,154, 76,147,105, 50,205,255,
+158,166, 43,237,255,204,232, 68, 74,233, 95,182,  0,232,198, 52,153, 38,211,100,154, 76,147,105, 50, 77,166,249,168, 45,236,133,
+178, 12,  6,  3,237,171, 19,239,158, 97,196,167,172,109, 61,195,136, 79,251,234,196,155,229, 18,131,193, 96,184, 15,235,131,197,
+248,215,241,244,211, 79,243,149,217, 63,222,219,155,203, 75,170,254,169, 70, 37,239,171, 51, 24, 63,189,254,203, 27, 95,252, 23,
+242, 33, 56, 56,184,158,167,167,231,  8,  0, 13,116, 58, 93,128, 74,165, 74,  7,112, 49, 63, 63,127, 85,106,106,234, 21,119,117,
+ 58, 69,145,233,  2,143,153, 70, 30,164,115,  4,153,243,123,  2,125,215,190,173,115,  4,153, 33, 74,240,166,  0,208, 78,145,228,
+189,189,241,244, 61,119,117,123,214, 34,  6, 10,200,  9,129,121,251,117,234,120,193,101,175,218,196, 32,210,123,215,247,172, 77,
+ 76,148, 66, 74,  0,227,246, 27, 84,193, 74, 58,131,193,248,207, 27, 44,153, 76, 22, 67, 41, 29, 69,  8,  9, 34,132,220,165,148,
+126, 99, 50,153, 46, 60,106,153, 37,147,201, 98,  8, 33,163, 40,165, 65,148,210,187,132,144,191, 57, 31,  8, 89,255,116, 81, 20,
+114,224, 58,136,  0,165,172, 72,151, 97,174,146,171, 47, 29,217,191,197,115,211, 70,117, 70,179, 65,159, 77, 69, 37, 38,177,253,
+ 39, 66,  8,225,163,162,162, 94,169, 81,163,198,224, 37, 75,150, 72,163,162,162,160, 80, 40,160,215,235,131,111,222,188, 25, 60,
+118,236,216,142, 53,107,214, 92,123,235,214,173,175,138,231,136, 43,223,  4,133, 17, 31, 72, 48,115,239,194,177, 50,  0,232, 56,
+118,209,140,200,208,  0,106,134, 68, 47,133, 69, 25, 46,193,140,125, 11,199,242,197,219,102, 70,134,  6, 16, 51, 36,122, 39,137,
+164,228,228,228,117,101,105, 83, 64,246,243,202, 79,208,239,153,201, 66,104,104,232,107,246,245, 77, 52,132,252,188,106, 30,122,
+ 13,249, 95,137,245, 49, 10,  8, 91, 87,126,130, 62,207, 76, 46,247,109,227,189,234,112, 22, 81,164,229,214, 91, 28, 71,172, 23,
+116,193,211,203,216, 84,102, 58,251, 68, 11,105,102,139,173,204,137, 96,165, 18, 62,253,231,203,214,192,208,208,208,167,  1,132,
+185,171,201, 96, 48, 24, 21, 26,172,136,240,240, 65, 28, 79, 22,152, 45, 54, 31,111,111,111,238,203, 47,191,228,250,246,237,139,
+159,183,110,197,248,241,227, 39,132,134,134,136, 82, 65,200,161,162,117, 66, 66, 98,202,143,238,252,216,147, 79, 62,153,102,177,
+ 88,202,157,213,154,231,249,244, 77,155, 54,  5,222,239, 65,133, 54, 31,148,102, 49,155,203,253, 29, 65,144,164,167,156, 94,231,
+214,239,132,135,135, 12,226,  9,183,192, 98, 19,125,124,124,124,184, 47,190,248,130,235,219,183, 47,182,110,221,138,113,227,198,
+ 77,  8, 11, 13, 21,165, 18, 62, 71,180,209,  9,  9,137,137, 63, 62,188, 83, 71,200,250,245,224, 48,176,232,191,245,235,193, 13,
+ 28, 72, 30,105,147,149,153,153, 73,  0,192,223,223,159,150, 48, 87,253, 90, 60,247,230, 75, 93, 49,103,233,110,232,141,166,213,
+255,246,227,140,138,138,122,229,233,167,159, 30,252,222,123,239, 73, 57,174,168,149, 95,171,213, 66,175,215, 35, 52, 52, 20,123,
+247,238,149,190,245,214, 91,131, 55,109,218,  4,  0, 11, 42,163,205,243, 60,249,125,231,254, 40,223,192, 16, 83,118, 90,138,236,
+249, 94, 13, 72, 89,219,236,235,234,213,171,231, 82,179,154,175,167,241,202,174, 43,181,237,255,143,235, 22,102, 43,103,189, 17,
+128,178, 34, 45, 81,164,194,142, 47,198,150,187,125,204,251,107,109,235,126,249, 83,211, 85, 58,205, 22, 91, 64,121,122, 61,198,
+ 47,178,215, 33, 97, 87,174,184,175,201, 96, 48, 24, 21, 26, 44,194, 97,225,154, 37, 31,251,100,101,231,224,135, 77,219, 17, 29,
+ 29,141,139, 23, 47,162, 94,116, 52,226, 90, 54,225,122,180,109,204,  9,132, 84,123,251,139,149, 11,  1,184,101, 44, 44, 22, 75,
+192,198,141, 27, 65,  8,129,205,102,131,205,102,179, 79,216,135,194,194, 66, 76,152, 48, 33,224, 65, 28,148,197,108, 14,184,249,
+199,  6, 72,120,  2,171,141,194, 98,163, 48, 91, 69,152,173, 20,249, 58, 43,186, 60, 62,204,237,223,225,192, 45,252,246,139, 79,
+124,114,114,115,177,241,215, 93,142,124,136,142,142, 70,151,118, 45,185,167, 31,239,200,169, 21,242,106, 47, 78,123,223,237,124,
+120, 16,172,127,250, 79,115,229,188,110,224, 58,216, 30,165,  2,124,249,242,101,222,104, 52, 14,241,244,244,108, 45,145, 72,  2,
+ 85,222,193, 98,174,180,102,150,150,  4,221, 50,107,101, 29, 70, 13,168,213,235,141, 23, 58, 97,206,210,221,248,118,203, 31, 43,
+188, 66, 19,103,252,155,143, 55, 56, 56,184, 94,141, 26, 53, 74,152, 43,251, 75,205,243,243,243, 81, 80, 80,  0,142,227, 48,117,
+234, 84,233,190,125,251,  6,  7,  7,  7,239,170,168,185,112,123, 18,205,233, 20, 69,102,118,124,121,209,108,158,227, 57,153, 79,
+248,169,217, 31,124,156,175, 86,171,169, 66,161,208, 87,139,136, 57,213,101,220,210,102,148, 82,234, 21, 90,231,143, 37,223,124,
+151,167, 86,171,169, 92, 46,151,191,244,210, 75,110,245,225,212, 27,244,152, 52,105,146, 81,169, 84, 82,133, 66, 65,141,166,162,
+ 89, 57, 12, 70,  3,222,124,243, 77,163, 74,165,162,106,181,154,154,204, 38,183,243,225,214,221,  2, 72,  5, 14, 82,  9, 15,169,
+192, 67, 25, 84, 23,178,194,120,152,205,230, 18,154,238,166,115,207,217,100, 40,101, 18,168,228,  2,106, 71,134, 65, 78,245,247,
+236, 51,118,236, 88,209,203,203,203,172,209,104,164,111,188,241,  6,235,191,202, 96, 48,170,102,176, 76, 22,155, 79,144,159, 55,
+190,253,230, 91, 76,125,125, 54,234,213,171,  7, 74, 41,  8, 33,120,125,198, 44,124,254,238,116, 12,126,172, 35, 44, 86,209,167,
+ 60,141,178,134, 90, 18, 66, 16, 31, 31, 15,131,193,  0,189, 94,239, 88, 98, 98, 98,220, 74,176,187,195, 55, 37, 60,193, 47,167,
+ 10,138,140,149, 69,132,217, 42,194, 98, 21,209, 57,198,163, 82,154, 22,155,232,227,229,161,198,210,197, 11, 49,245,221,143, 75,
+228,195,180, 55,222,194, 87, 31,190,141,137, 99,158,133,201, 98,243,169, 74, 58, 43,  3,211, 44,201,225,195,135,131, 85, 42,213,
+103,195,134, 13, 11,153, 48, 97,130,140, 10,106, 97,251,177,219, 94,159,124,179, 59,196, 96, 50,243,143,183,175,137,231,  7,196,
+ 98,206,178,223,139,205,213,157,151, 34,115,115,197,127,243,177,123,122,122,142, 88,178,100,201, 61,230, 42, 45, 45,141, 43, 44,
+ 44,132,217,108, 22,139,223,151,136,233,211,167, 75,222,122,235,173, 17,132,144,119,139,117,140,101,105,238,189, 69, 63,168, 17,
+ 26, 40,236,219,187,175,230,187,239,127,148, 63, 96,192,128,235, 28,199, 65, 34,145,224, 70,120, 56,125,172, 91,231,203,239,127,
+248,161,241,185,231, 95,186,192,113, 28,120,158,199,213,171, 87,163,  0,168,220, 57,118,  2,208,126,253,250, 57, 52,191,217, 57,
+159,218,215, 15, 25, 50,228,186, 93,243,210,198, 57,212,221,252, 20,120,130, 48,127,245,159,191, 32, 87,  2,197,111,197,116,214,
+116, 55,157,  2,207,161,117,189,226,231,174,208,102, 64,210,193,123,126, 83,161, 80,152,159,122,234,169,235,  9,  9,  9,110, 31,
+ 59,187,222,153, 38,211,100,  6,171, 76,204, 70, 61, 98,170,251, 98,241,167,239, 65,164, 28, 40, 40,168, 72, 65,169, 13,145,254,
+106, 24,117,218, 74,255,160, 40,138,176, 88, 44, 48,155,205, 88,178,100,  9, 10, 11, 11, 33,138, 34,234,215,175, 15,  0,104,222,
+188,185,115, 37,123,231,228,201,147, 53, 92,105,  6, 52, 26,112, 27, 20,213,157,215,189,243,241,215, 56,124,250, 38, 68, 17,144,
+ 43, 85, 24, 56, 98, 52,172, 54, 10,147,165,242,239, 39, 53,234,117,  8,209, 72, 48,111,238, 12, 16, 65,  2,158, 16, 16, 66,192,
+ 17, 17,245, 66,189, 97, 50,232, 30,250,137, 27,184, 14,226,250,245, 37, 71,129, 22,245,195,122,116, 34, 87, 42,149,234,179, 85,
+171, 86,213,104,209,162,  5,  7,  0,199,175,229,200, 63,249,102,119,200,215, 51,159, 32,205,234,  5, 33, 43, 79,143, 57,203,247,
+ 97,207,169,148,223, 74,155,171,127, 49, 13,162,162,162, 74,152,171, 79, 62,249,196,127,225,194,133,161,  0,240,212, 83, 79, 37,
+119,237,218, 53,243,234,213,171,  8, 14, 14, 38,153,153,153,143,  3,248, 95,241,195,205, 20, 74,233,194,178, 68,173, 16, 12,190,
+129, 33, 38,153, 76,  6,137, 68,  2,142,227, 28,139,111, 96,136, 73,237,233, 99, 42,189,222, 93,  8, 33, 37, 52, 75, 60,  8,149,
+179,222,101,197, 85,193,254, 85, 73, 39,207, 17, 39,241,178,187,128,201,100, 50,  8,130, 80,233,180, 50, 24, 12,102,176,238,141,
+ 98, 25,245,  8,243,150, 33, 72, 35,192, 98,177,226,162, 37,  4,  5, 58,  3,204,102, 11,238,152,205,184,117,230, 46,218,181,107,
+135, 39,158,120,194,102, 54,155, 33,149, 74,243, 54,110,220,232,235,202, 96,153,205,102,152,205,102,104,181, 90,172, 94,189, 26,
+130, 32, 56, 94,156,234,252,198,250,182,109,219, 86,119,207, 74,163,250,141,227, 63,193, 67,193,195, 42, 82, 88,173, 20, 86, 17,
+176,218, 40,244,102,138, 39, 70,189,  9,155,141,194, 38, 82,152,172,174,187, 40,149, 48,108,190, 45,208,111,250, 15,  0, 52,142,
+237,158,114,138,169,237,120,200,100, 18,200,100,  2, 12, 58,253,223,112,234, 40, 29, 56,144,136,143,106, 39,119,163,209, 56,116,
+216,176, 97, 33,118,115,  5,  0, 57,249, 70,193, 96, 50,243,205,234,  5,161,251,224,201,216,185,246, 19,252,122,232, 26,124, 52,
+194,254,176,255,134,185,130, 78,167, 11, 80, 40, 20,208,106,181,142,200,213,194,133, 11, 67, 77, 38, 19,  7,  0,130, 32,  9,203,
+ 16, 67, 21, 54, 17,240,242, 76, 69, 78, 78,158, 31,165,148, 20, 27,157,143,  9, 33,223,148, 53,115,190, 20, 22,101, 86, 90,138,
+ 76, 46,151, 27,236,198,132,231,121,112, 28,135,172,180, 20, 25,103, 51,209,210,235, 43,131,243,119,157,141, 87, 89,235,221,170,
+184,120, 82,162,  2, 40, 79,211,221,116, 10,188,211,126,124,217,  6, 75, 46,151, 83,158,231, 43,157, 86,  6,131,193, 12,214,189,
+ 17, 44,189, 30, 22,139, 21, 86,171, 13, 22,171, 13,121,133,122,124,248,225,135,144,203,229, 32,132, 64, 20, 69, 20,191,  0,149,
+179, 88, 44,120,252,241,199,125, 92,253,160,115,191, 43, 74, 41,120,158, 71,171, 86,173,238,217,239,232,209,163,149, 58, 16, 15,
+  5,143,200,110,175,223,179,254,216, 79,239,129, 82,192, 38, 22, 27, 44,179, 27,247, 89, 23,134,173, 73,135,129, 48,153,204, 69,
+ 17, 61, 74,171, 20,201,123, 96, 38,235, 17,235,115,229, 20, 77,232, 54, 97,194,132, 18,119, 66, 31, 79,185, 85, 33,147,218, 78,
+ 93, 78, 37, 59,215,126,194,157,184,148, 34,202, 36,  2, 85,211,187, 81,255,149,227, 86,169, 84,233, 58,157, 46, 88,175,215, 35,
+ 63, 63, 31,249,249,249, 37, 47,104,137,132,188, 52,102,156,191, 68, 42,131,197,108,194,175,171,230,184,212,236, 28, 65,102,132,
+ 75, 48,227,197,199, 98,224, 87,163,193,233, 27,181,106,137,118,131,114,252,183, 85,109,214,125,252, 74,115, 81, 20, 73,222,157,
+179,199, 59, 13,124,249, 24,199,113, 48,153, 76,238, 79,163, 64,  8,185,113,227, 70,148,195, 72, 17, 66,236,235, 47, 95,190, 28,
+101, 55, 68,180,232,205, 18,110,161,241,240,  0, 52,213,  0,185,125,122,174, 63,191,234,172,233,110, 58, 27,212, 12,  1,130, 26,
+  1, 50,175,138,202,156,236,234,213,171, 81, 54,155,141, 77, 33,193, 96, 48,238,207, 96, 25, 13, 58, 88,172, 54, 88, 45, 69,111,
+144, 55,153, 76, 80, 42,149,232,208,161, 67,137,104, 19,165, 20, 59,118,236,128,201,228,186,147,170,213,106,117, 68,176, 68, 81,
+  4,165, 20, 63,252,240,  3, 36, 18,  9,164, 82, 41, 36, 18,  9, 36, 18,137,163, 14,118, 23,171,141,226,141,105,175, 65, 34,112,
+144, 10, 28, 36,  2,129, 84,224, 96,163, 20, 20, 20, 86, 91,209, 98,178,186, 23,200,168,200,176,  1,128,209,100, 41,122,110,166,
+128, 78,167, 99, 37,233, 33,146,153,153, 73,244,122,125,132,183,183,183,147,213,164,168,166,178, 25, 71,246,109,146, 50,242,157,
+ 13, 33, 38,139, 21, 82,129,167, 67,123, 68,167,236,222,184,215, 47,211,152, 75,236,163, 11,255,229, 92,188,113,227, 70,112,120,
+120, 56,242,243,243, 97,181, 90,197,167,158,122, 42, 89, 16, 36, 97,130, 68, 66,250, 12, 25, 39,222,189,155, 98,225, 56, 30,148,
+218,240,216,211, 99,137, 92,161,148,154, 77, 38, 43,128, 41,165,163, 87, 61,195,136,143, 40,193,155,246,169, 24,186,140, 91,218,
+236,177,110,157, 47,219, 71, 17,254,248,209,203,205,119,127,241,162,125, 91,203, 55, 63, 90,126,221,121, 20,161, 59,200,101,114,
+140, 24, 49,194,209,103,233,208,215, 83,138, 12,139, 84,134,126,253,250, 57,214,255, 54, 79,234,182,166,146,183,  2,133,119,  1,
+237,221, 18,235, 37, 18, 73,  9, 77,119, 81, 11, 86,224,238,169, 10,247,153, 62,125, 58,135, 82,125,175, 24, 12,  6,163,106,  6,
+ 75,175,135,213, 98,117,152, 44,179,217, 12,  0,248,244,211, 79,239, 49, 68,148, 82,199,246, 10, 53,141, 70, 68, 69, 69,193,100,
+ 50, 33, 58, 58, 26,148, 82, 12, 25, 50,228,158,253,142, 31, 63, 94,169,  3,177,216, 40,230,126,248,233, 61,235, 15,174,123, 15,
+141,163, 35,209,170,182, 10,  6,139,136, 60,173,245,190, 13, 27,  0,152, 76,102,160,120, 58,124,189, 86,203, 74,210,223,136,197,
+ 98, 65, 78, 78, 14,140,133, 57,214,186, 65, 52,239,133, 62, 53,141, 25,217, 58,129,163,  6,107,152,135,206, 88,152,157,204,171,
+ 84,255,141,251, 98,126,126,254,170,177, 99,199,118,220,191,127,191,148,227, 56,228,231,231,163,115,231,206,153, 25, 98,168,226,
+165, 49,227,252, 83, 82,146,173,158, 74,193, 40,149, 74,144,158,158, 46,118,236, 61, 76, 63,100,212,171, 33,175,190,249,254,146,
+148, 67, 11,239,233,127,165,227, 64,  5,167, 54, 54, 74, 41,253,240,227,143,140, 94,190,  1, 70,129,216,108,206, 77,246,148, 82,
+250,205,138,111, 13,190,213,130,141,114,185, 92, 62,116,232, 80,183,218,223, 12, 70,  3,222,126,251,109,163, 66,161, 40, 49, 90,
+208, 96, 52, 96,238,220,185, 70,141, 70, 67, 85, 42, 21, 53, 91, 92,215, 31, 28, 71,172, 99,222, 95,107,179,215, 53, 78,193, 48,
+  8,130,  0,179,141,104,157, 53,221, 77,167, 59,163,  8, 39, 77,154, 36,250,248,248,152, 61, 61, 61,165,227,199,143,103, 29,177,
+ 24, 12,198,125, 24, 44,157, 22, 22,139,173,184,137,208,234,136, 58,141, 31, 63,254,158,125,119,239,222,237,210, 96,  9,130,144,
+254,194, 11, 47,148,152, 34,129, 82,138, 13, 27, 54,192,222,185,214,110,218,170, 18,193,154,249,214,100,200, 36,124,177, 33, 42,
+ 50, 70, 34,165,216,242,203, 14,108,249,101,135, 99, 95,158,151,164,223,143, 97, 43, 50,138, 22, 80, 90,116,103,210, 23, 50,131,
+245, 48,241,247,247,167, 25, 25, 25,  9,185,185,185,117,213,106, 53,178,178,178,144,157,157,141,220,220, 92,232,243,115,172,106,
+107,174,214,100,205,134, 32,  8,184,155,152,  6,155,205,118,247, 63, 18,189, 66,106,106,234,149,154, 53,107,174,125,227,141, 55,
+134, 76,159, 62, 93, 34,138, 34,174, 94,189, 10, 16, 66, 37, 82, 25,138, 70,234,  9,200,203,203, 23, 85, 26,239, 84, 51,229, 85,
+ 18,169, 12, 28, 47, 45,179, 41,249,224, 29,154,219, 41,130,188,211,241,229, 69,179, 37, 82, 41,241, 10,171,119,236,153,145, 47,
+ 94,176,119, 20,207, 78, 56,115,168,219,171, 95,183,181, 89,173,104,210,182,219,182,103, 70,190,120, 81, 34,145,224,252,249,243,
+ 81,174,162, 57,  4,176, 14,120,110, 42,239,225,161, 46, 28, 52,104,208,117,187,230,141, 95,231, 23, 62, 59,110,  6,  4,169,162,
+112,228,200,145,142,209,133,231,126,122,191,112,192,115, 83,229,  4,229, 55,123, 95,208,  5, 79, 95,247,203,149,218,175,191,254,
+186,113,216,176, 97, 14,205,203,151, 47, 71,245,235,215, 79,245,222,123,239, 25,157, 53,221, 73, 39,224,222, 40, 66,149, 74,101,
+126,230,153,103,174,151, 53, 50,145,193, 96, 48, 42,111,176,172, 86, 88, 45, 69,125,176,204,102, 51,172, 86, 43,150, 46, 93, 90,
+194, 12, 73,165, 82,112, 28,231,210, 96,109,220,184,177,196,228,158,205,155, 55,167,148, 82, 60,245,212, 83,142,230,198,145, 35,
+ 71, 98,244,232,209,149,238, 68,107,177,  1,179,230,124,234,208,233,221, 61, 14,253, 31,235,  8, 42, 22, 25,181,244,243,155, 42,
+229,216, 42, 50,108,142,  8, 22, 40, 64, 41, 10, 11, 10, 88, 73,122,200,152, 76,166, 93, 11, 22, 44,136,120,235,173,183,100,217,
+217,217,200,204,204, 68, 78, 78,142, 99, 41, 44, 44, 68, 80, 80, 16,126,251,237, 55,115,126,126,254,209,255,210,177,223,186,117,
+235,171, 45, 91,182, 96,223,190,125,131,167, 79,159, 46,  9, 10, 10, 34, 94, 94,105,196, 98, 54,  1,160, 52, 35, 35, 67, 84,105,
+188, 83,253,  3,195,238,164,220, 77,143,182,152, 77, 16,109,230,114,123,102,239, 77,160, 31,134,135,  6,242, 71,247, 31,171,249,
+217,188, 47, 10,237,166, 69, 34,145,160, 93,159,145,167,223,252,104, 89,252,130, 47, 22,152, 94,124,233,229,139,149, 25,245,119,
+209, 16,242,250,149, 43, 87,106,207,156, 57,211,232,172,217,253,149,121,107,250,244,233,163,250,248,227,143,141,246,117, 28,199,
+225,201,233, 95,175,137,139,139, 83,213,171, 87,239,186, 43,109,231,209,142,246, 79,251,122,231,117, 15,114, 20,161, 66,161,168,
+210,136, 71,  6,131,193, 12, 86,  9, 36,  2,151,119,237,118,170, 87, 53,181, 18, 86,209,  8,155,169,104,106,  5,155,205,134,151,
+ 94,122,201,177,223,208,161, 67,241,236,179,207,218, 59,148,150,124,130, 37,164,155,171,185, 50, 68, 81,196,193,131,  7, 75,140,
+254,169,168,  2, 43, 79, 83,107,180,225,208,143,239, 66,164,128, 88,228,123, 64, 65,220, 26, 53, 88,150,166, 43,195,166,240,240,
+  1,  7, 10,240,192,205,228,116,  8, 60,151, 87,217, 99,175, 44, 76,243, 79, 77,185, 92,190,230,135, 31,126,232, 29, 23, 23, 87,
+163,113,227,198, 92,118,118, 54, 10, 11, 11, 81, 88, 88,104,143,114,225,210,165, 75,226,237,219,183,147,229,114,249, 15,255,165,
+ 99, 47,126,253,205,130,224,224,224, 93, 51,102,204, 24,145,153,153,249,120, 78, 78,174,223,207,223,206, 70,175,167,199,146,142,
+189,135,106, 77, 84, 80, 36,165,166,213,219,187,237,123,223, 95,215,126,  5,179,201, 52,154,144, 69,151,237,211, 52,148,214, 20,
+ 33,152, 60,188,124, 45, 74,165,146, 58, 27, 20, 65, 16,224,225,229,107,241,246,169,102,114, 54, 52,101,141,164, 43,239,216,203,
+210,180,175,255,167,104, 86,102, 20,161,253,183,216,181,201, 52,153, 38,155, 11,171, 74,  6,139,218,232,132,197, 63, 31, 93, 96,
+177,137, 94,246,117, 13, 26, 52,128,217,108,198,111,191,253,230, 48, 30,130, 32, 56,230,134,113,167, 15, 86, 41,238,116,232,208,
+161,162,169, 24,238,184,119,166,113, 39,182,243,160,234, 21,109,175,108,194, 92, 25,182,101,123,207,255,153,137, 28,151,  7, 74,
+ 39,176,226,244,240,136,142,142,182, 29, 62,124,120,210,216,177, 99, 63,235,218,181,107,104,255,254,253,165,225,225,225,144,203,
+229,184,121,243, 38, 14, 28, 56, 96,190,117,235, 86,178, 78,167,155,212,184,113,227,255,228, 72,203,212,212,212, 43,197,147,136,
+254,207, 62, 21,131, 92,161,148, 14, 29,245,106,152, 99, 20,225,218,175, 96, 52,232,  1, 64,168,104,154,  6, 59, 30, 30, 30, 50,
+251, 40, 60, 65, 16, 28,163,240, 60, 61, 61,101,231,207,159,119,140,  4,172,204, 40,194,135,169, 41,145, 72,170,164,233,206, 40,
+ 66,137, 68, 34,187,116,233, 18, 27, 69,200, 96, 48,238,207, 96,221, 73, 78, 94,  5, 96,149,243,186,199, 31,127,188,176, 95,191,
+126, 74,251,136, 66,251,104, 64,147,201,  4,147,201,  4,133, 66, 81,169,  9,161,220,153, 68,212, 29,210,207,109,170,241, 64,115,
+197, 13,195,150,146,146, 82,131, 21,159,191,151,182,109,219,166, 94,190,124,121,216,206,157, 59,135,238,223,191,191,155, 78,167,
+139, 32,132, 64,169, 84, 38,152, 76,166, 93,114,185,124,205,127,213, 92,149,135,217,108,182, 78,159,245,201,119,188, 32,181,138,
+162,153,152,205,230, 81,112,243,165,238,  0, 48,102,204,152, 50, 71,202, 13, 31, 62,188,202, 35,232, 30,166,102,241,107,113,254,
+146, 81,132,197, 29,219, 89,223, 43,  6,131,113,127,  6,171, 44,116, 58,157, 55, 33, 68, 72, 73, 73,185,103,155, 84, 42,197,237,
+219,183,173,255,133, 76,121,224,134,141,241,151, 17, 29, 29,109, 43,126, 16, 88, 85,250,101,207,143,  2,148, 82, 35, 33,100, 10,
+ 33,228,227,226, 85, 83,110,253, 62,223, 49, 90,144,144,  5,231,156,183, 85, 16,189, 74,170,226,203,139,147, 42,218,246, 79,215,
+148, 74,248,116,167,151, 58,223,179,205,197,111, 38,177, 43,144,193, 96, 60, 16,131,181,119,239, 94, 43,128,202,152,168,244,191,
+ 32,205,233,236,180, 61,218,172, 91,183,206,198,114,161,132,201, 90, 72,  8,249,198,110,184,220,221,230, 76,114,114,242,186,  7,
+157,174,127,131,230,207,151,173,129,127,199,113, 48, 24, 12,102,176, 24, 12,198,191,195,100, 25,171,178,141,193, 96, 48, 24,127,
+ 13,  4, 64,195,114, 42,229,243,110,139, 16,210,176, 10, 55,132,243,255, 32,205,128, 10, 52,119,185,208,236, 86,133,116, 50, 77,
+166,201, 52,153, 38,211,100,154,143,164,166, 43,237,255,204,232, 68, 90, 60, 27,249, 95,177,  0,104,248, 47,209,236,198, 52,153,
+ 38,211,100,154, 76,147,105, 50,205,191, 79,243,191,182,176, 25,243, 24, 12,  6,131,193, 96, 48, 30, 48,101,246,193,170, 22, 51,
+  0, 92,169,121,207, 69, 10,100, 92,216, 84,165,253,  0, 96,214,172, 89,247,101,230,222,121,231, 29,183,222,210, 92,173,225,  0,
+112,110,140, 33, 19,  9,144,113,126,147,219,191, 79,106, 12,120, 11, 34,222, 40,250,  7, 31,209, 59,155,102,178,226, 83, 53,154,
+106,136,191,133, 72,250,120, 40, 36,253, 34, 60, 36,109,110,230, 26, 15,235,204,226, 86, 74, 44,155, 47,230,211, 28,150, 67, 12,
+198, 95,143, 79, 84,187, 97,126,254, 65,163, 69, 74,149,  0, 96, 50, 25, 44,201,137,119,230,211,156,139,107, 75,212,125,190,245,
+  7,  6,133,132,141, 87, 42,212,202,162,234,143,152,178,179,238, 46,204,185,117,232,251,135,149, 86, 82,252,238,180,208,208, 80,
+239, 67,135, 14,213,104,215,174,221,237,228,228,228, 92,231,125,202,218, 70,157, 95,166, 89,134,102, 96, 84,179,103, 60, 52,234,
+151, 13, 70, 99,164,151,167,103,122,118, 86,214,226,212, 91,167,191,178,239, 83,163, 70, 13,207,181,107,215,  6, 15, 29, 58, 52,
+ 37, 62, 62,190,192,149, 38,131,225,210, 96,113,  4, 88,183,110, 45, 40,165,197,147,108, 82, 12, 29, 50,180,204,253,194,229, 41,
+145,162, 40, 62, 11, 96, 56,165,244, 76,138, 37,252,169,170, 36,100,247,238,221,161, 22,139,165,133,213,106,109,  6,160,153, 82,
+165,105, 98, 52, 26,210,  9,232,115,143, 61,246,216,105,119,117, 56, 10, 44,251,118, 37,102,141,233,244, 11,128,222,229, 92, 88,
+179,146,140,161,149, 51, 72, 34,125,243,143,253, 27,228,222, 42,130, 90,205,159,156, 10,224, 31,105,176, 66, 66, 66,148,  0,158,
+227, 56,174,171, 92, 46,175, 99, 48, 24, 18,  0,156, 35,132, 44, 76, 74, 74, 74,169, 98,229,198,197,104, 36,207,171,148,170, 94,
+193,106, 89,179,212,220,252,100,157, 69, 60, 32, 18,243,199,149, 53, 68,181,  8,145,213, 12,247,222,247, 90,255,184,232,198,209,
+ 53, 97,187,176, 31, 38,179,185,223,137, 84, 93,191, 37,167,211, 38,213, 34,164,217, 13, 74, 77,110,166, 43, 24,128, 64, 41, 77,
+  4,128,176,176, 48, 31, 81, 20,227,  0, 52,  1,112,134,227,184,  3, 73, 73, 73,247,101,216,254, 69,154, 33,162, 40,190, 16, 24,
+ 24,248,120, 90, 90,218, 47, 28,199, 45,175,234,249,102, 60, 26,248,250,  5,189,252,229, 55,235, 29,211,214, 83, 81,148, 12,233,
+223,105,  4,128, 18,  6,203,219,219,239,185,111,215,252,170, 36,127,190, 97, 67, 54,110,212,192,209,  0, 30,138,193, 34,132, 16,
+ 74, 41,102,205,154, 69,150, 45, 91, 54,178,122,245,234,181, 41,165, 87,103,206,156, 57,223,121,191,210,219,222,121,231, 29, 90,
+252, 93, 90,150,102, 84, 76,251,205,207, 63, 59,184,211,132,177,207,105, 84, 74, 37,244,122,131,223,162,101, 43, 63,249,106,249,
+170, 62,207, 62,213,173, 23,  0, 44, 93,186,116, 64,120,120,120,132,201,100,138,159, 57,115,230,202,138, 52, 25, 12,183, 12, 86,
+177, 75,199,245,203,103,240,203,207,219,112,252,204, 37,136, 78,197,169, 65,131,  6,106,153, 76, 54, 48, 76,198, 61,215,168, 89,
+155,246,253,158,126,142, 88,136, 10,115, 38, 15,173,244, 60, 88,167, 78,157,146,167,166,166,206,142,172,215,252,213, 78, 61,250,
+115,245,163,235,193,223,207,  7, 34, 39,195,138,223,174,249,237, 93, 50,242, 75,  0,109,220,246, 65,  4,120,113,228, 51,  8,149,
+161,247,143,219,142, 33, 53,215,  6, 66,  0, 66,138, 12, 97,161, 65,196, 27,163,218,191, 83,121,131, 68, 56,111, 21,193,196, 53,
+  6,  0,224,255,137, 39, 51, 56, 56,184,153,159,159,223, 87, 35, 71,142,244,169, 83,167, 78,176, 76, 38, 83, 25, 12,134,218,119,
+238,220,137,252,236,179,207,186,  7,  7,  7,127,144,154,154,186,161, 50,154,209,222,138,234,143,213,171,241,227,180, 49,207,181,
+172, 27, 17, 14,193, 88,  8,209,168, 13,191,125,235, 70,155,185,223,110,120, 49,198, 75, 50,228, 66,158,197,237, 14,137, 10, 15,
+233,155,111, 60, 63, 52,186,150,154,194,116,254, 16, 36, 60, 15,133,167, 15, 90,241, 60, 56, 66,235,191,115, 32,249, 13,  0,239,
+184, 81,233,190, 11,224, 13,  0, 68, 42,149,110,  8, 12, 12,188,218,182,109,219,198,131,  7, 15, 38, 13, 27, 54,196,153, 51,103,
+154,254,252,243,207,163,194,195,195,207, 90, 44,150,223,213,106,245,209, 27, 55,110,184,101,220,106,213,170, 37,211,106,181,173,
+ 37, 18, 73,231,127,178,102, 72, 72,136,210,100, 50, 61, 27, 22, 22,246, 82,191,126,253, 26,245,237,219,151,212,173, 91, 23, 87,
+174, 92,105,254,235,175,191,190,211,164, 73,147,115, 73, 73, 73, 75,101, 50,217,119, 41, 41, 41,110, 77,  2, 60,184, 33,185,178,
+246, 60,173, 87,213,237,165,206,145, 55,  0, 37,165, 52,197,141,125,  3,  1,168, 41,165, 55, 31,182,230, 95,244,160,115,  9,128,
+175,253,165,245, 28,199, 57, 94, 96,239,252,105,255,219,102,179,105,239,220,185, 83,211,133,102, 93, 81, 20,221,110,  9, 32,132,
+208,212,212,212, 43,229,214,241,160, 50,  0,152,251,206,100, 36, 39,222,134,222,160,213,231,230,102,173, 40,189, 95,110, 78,246,
+170, 23,134,247,249,159, 76,166,144,132,134,215,192, 27,179, 62,129, 61,234,245,176,152, 53,107, 22,121,231,157,119,176,116,233,
+210,190,  0,226, 40,165,  7,162,163,163, 23,148,186,103, 57,182,189,243,206, 59,243,103,205,154, 69,  0,148,105,132,170, 69, 53,
+ 25, 49, 98,200,128, 78,175,191,246,178,198,190, 78,169, 84,224,181,255,141,150,233,141,166, 54,139,190, 94,249,210,252, 57,211,
+150,  1,232,  2, 32,150, 82,122,  2,192,202,138, 52, 25, 12,183, 13,150, 72,129, 95,126,222,134,215,166,191,141,111, 86,124,135,
+239, 62, 28, 77, 98, 99, 99, 59, 80, 74,159,139,136,170, 53,240,201, 97,163,149, 17,181, 27,162, 80,244, 68,124,166,136, 83,191,
+175, 65,233, 39, 31, 87,108,223,190, 61,150, 82,124, 59,118,250,103,245, 26, 55,109,129,243,201, 86, 28, 74,180, 65,123,195,  6,
+129,215, 67, 20, 43, 63,196,220,222,236,215,188,121,115, 36,229, 88,113,224,138,  9, 60,  7,112, 92,209, 11, 93,121, 82,197,156,
+ 18, 77,215,102,127,123, 42, 38, 51, 77,  4, 68,211,181,127,218,137, 12, 13, 13,237, 18, 21, 21, 53,239,127,255,251, 95, 80,106,
+106,170,239,241,227,199, 33,151,203,225,227,227, 35,248,249,249,213,155, 62,125,122,222,220,185,115,167,  4,  6,  6,158, 78, 75,
+ 75, 75,112, 71,179,129, 70, 22,221,177, 89,204,225, 25, 51,223,241, 50, 29,251, 21, 57,107,214,129,231, 40,164,106, 13, 66,148,
+ 74, 44,232, 17,225, 59,109, 79,226,134, 70, 74,101,244, 57,189, 62,217, 29,205,240,  0,223, 30,181,235,214, 67,206,198, 47,113,
+ 61,223,136, 35, 25, 70,244,239,216, 18,181,124,149,104, 98,181,193, 79, 33,116,113,101,176,  8, 33, 62,  0,166,153, 76, 38, 78,
+ 42,149, 18,133, 66, 49,112,197,138, 21,123,234,214,173,107,176,239,211,186,117,107,180,110,221,154,104,181,218, 38,135, 14, 29,
+106,178,113,227, 70,115,112,112,240,193,212,212,212,121,229,233, 42,149,170, 59,  6,131, 62, 92,165, 86,155,150, 47, 91,182,187,
+117,235,214, 84, 34,145,224,126, 52,  1, 32, 40, 40,104, 67, 68, 68,132,255,156, 57,115, 10, 90,182,108,249, 64, 52, 35, 35, 35,
+119,196,197,197,117,238,209,163,135,208,174, 93, 59,132,132,132, 56,182,249,251,251, 35, 46, 46,142, 36, 38, 38, 54, 62,112,224,
+192,194, 29, 59,118, 44,136,140,140,252, 61, 62, 62,190,135,171,243, 67,129,186,247,179,189, 20, 60,128,185,132,144,101,148,210,
+ 67, 21,156,207,102,  0,134,  1,248,240,111,210,172, 16,165, 82,153,102, 48, 24,  2,  0, 64,161, 80,164,235,245,122,151,115,103,
+ 17, 66, 52, 31,125,244, 81,128, 84, 42,  5,207,243,176,217,108,142,133, 82, 10, 81, 20, 75,116,134,253,240,195, 15,221,154,219,
+237,238,221,187, 90, 20,141,254,166, 78,139, 88,214,103, 68, 68,132,191, 59,154,201,137,183,225, 97,137,207, 10,244, 80,214,136,
+244,240,158,221,174, 93,187,217,206,219,219, 70,123,  1,200,135, 94,127,247,118,114, 34,252,254,134,186,205,123,217,178,101,207,
+ 46, 93,186,180, 63, 33, 68, 91,156,191,141, 94,125,245,213,223, 75,229,121,163,226, 79,109, 72, 72,200, 94, 66,200,214,208,208,
+208,111,  1,220, 19, 29,246,210,120,140,158, 52,238, 69,205,255,217, 59,239,168, 42,174,181,141, 63,123, 78, 47,244, 94,  5, 20,
+164,  8, 54, 64,196,138,189,196,222,141, 37, 38, 26, 75, 98, 55,150,104,236, 81, 99, 76,108,177, 37,246, 30, 77,236,189,247,138,
+ 21,  4, 20,  5,164,247,126,250, 57,179,191, 63,  0, 47, 26,133,  3,122,111,242,153,249,173, 53, 11,157, 51,243,204,158,153, 61,
+123,158,121,119,  3,128,121,251,179, 48,119,127, 38,190,235,105,133,169,159,200, 49,108, 80,111,249,230,237,191,143,  4,240, 91,
+ 57,237,104, 95, 95, 95, 18, 21, 21,197,153, 43,142, 15, 19,193,186,253,224,  9, 54,111,221,134, 65,131,  6, 35,226,236,134,227,
+157,122, 14,233,216,184, 69,123,232,133,118,136,206, 32, 72,140,163,224,243,244, 96,192,226,197,157, 67,148, 97,152,109,111,104,
+188,115,216,132,227,199,143, 79,170,225, 89,127,201,183,115, 23,243, 30,167,139,176,229,138, 18,  6,117, 62,148, 89,177, 40,206,
+120,138,194,180, 39,200, 75,126,252,136, 97,152,185,198,106,254,245, 28,  0,150, 82, 16, 74, 74,138, 28, 80,252,165,209, 24,140,
+236, 18,170, 45,142,170,233,237,239,159, 43, 50,  0,218,226,168,202,143,253,225,187,153,190, 75,211,201,201,169,157,187,187,251,
+143, 35, 71,142,116,121,244,232,145,153, 66,161, 40,190,117,235,214,165,212,212, 84,123, 27, 27,155,196,254,253,251, 55,177,183,
+183,183,107,209,162,133,236,212,169, 83, 51,  1, 12,175, 76, 51, 64, 46,242,111, 30, 28,112, 99,225,210,159,228, 89,251, 86, 67,
+ 19,251, 16, 55,178,148,120,148,173,164,206,166,121,164,159,175, 21,100, 34, 62, 70,  6,218,155,140, 63, 21,247, 67,233,203,172,
+210,115,247,112,180,175,165, 83, 42,160, 82,234,112,252,121,190,242, 70, 65,190, 29,243,240,101,230,212,174,193, 18, 94,102, 10,
+ 28, 76,  4, 94, 85,189,158,132, 16, 72, 36,111,159, 30,206,194,194,  2,161,161,161,168, 89,179,166,112,224,192,129,173,  1,172,
+120,151,166, 86,171,113,100, 89, 10, 51, 51, 51, 97,155, 54,109,  8, 33,132,190, 57,129,121, 85, 53,  1, 64, 46,151,119,168, 95,
+191, 62,111,247,238,221, 69,105,105,105,241,159,124,242, 73,150, 68, 34, 97,223,216,  6,110,110,110,248,234,171,175,132,195,135,
+ 15,175, 84,211,222,222,190,221,142, 29, 59, 64,  8,121,245,226,126, 19, 55, 55, 55, 56, 56, 56,160,115,231,206,252,222,189,123,
+183,171,232,122,246, 15, 32,209,101,230,169, 95,  0,169,240, 37,210, 47,128, 80,  2,196,188, 25,201,122, 83,147, 82,154, 77,  8,
+ 89, 15,224,  0, 33,164,207,219, 12, 17, 33,164, 41,128,253,  0, 58, 81, 74, 51, 42,187,239,229, 53, 69, 34,145, 80,171,213, 90,
+190,105,124,170,170, 89, 62,226, 19, 30, 30,142,192,192, 64,148,255,171, 82,169, 94,205,189, 74,  8,177, 51, 54,127,242,120, 60,
+252,252,243,207,224,241,120, 16, 10,133, 16,137, 68,111,253, 27, 28, 28, 92,213, 50, 36,145, 16,194,212,168, 81, 99, 26,143,199,
+ 27,174,209,104, 92,196, 98,113,138,193, 96,216,106,101,101,245,125,120,120,184, 14,128,197,219,230,134, 45,175,169, 84, 21, 43,
+ 41,203, 74, 53, 26,149, 78, 42,151,186, 93,187,118,173,246,187,238,185, 90,173, 70,155, 54,109,144, 94, 88,156, 89,182,207,255,
+170,172,187,118,237,154, 91,141, 26, 53,188,  1, 52, 47, 93,117, 57, 57, 57,185, 69,185,255,151,231,114,114,114,114,167,210,127,
+199,188,124,249,210,173,204, 96,149,215,212,104,180, 30, 38, 38,114,  0,192,220,253,153, 80,239,168,  5,241,224,231,248, 60, 68,
+ 13, 83, 83, 83, 24, 12,122,239,  9, 19, 38,108, 67,201, 51,113,135, 82,218, 99,194,132,  9, 62,  0,206,187,185,185, 29,  4,144,
+255,191, 46,231,255, 13,154, 31,165,193, 42,173, 82, 46,171, 90, 38, 44,  5,  6, 14, 24,  8,150,  2, 39, 79,158,  4, 91, 82,118,
+155, 37, 41, 45, 80, 20,103,  3, 62,195,130,207, 35,224,243,  0,128, 32, 59,233,  9, 52,197,217, 87,147, 52,206,113,172, 17,254,
+254,228,201,147,161,238,126,141,126,152,187,112, 25,179,249,178, 18,249, 10, 21,178, 34, 15, 35,245,246,166, 84, 86,175, 61,204,
+ 48,204, 93,134, 97,238, 53,172, 87, 55,218,209,209,177,218,163,118,179, 20, 48,148, 55, 86, 44, 64, 62,178,232,174,139,139, 75,
+ 39, 79, 79,207,197,163, 70,141,114, 11, 15, 15, 55, 45, 44, 44,204, 60,123,246,108,180, 86,171,189,207, 48,204,202,148,148,148,
+150, 59,118,236,144, 77,157, 58,181,189,183,183,183,247,233,211,167, 21,149, 70,174,228,194,122, 67, 62,237,127,163,251,168,113,
+146,200,223,215, 64,252, 36, 28, 27,158,230, 26,238,102, 42,103,170,138,244, 43,164, 50,126,211, 92,181,254,204,148, 16, 39,198,
+ 81, 46,128,171,153, 32,204,216,244,138, 68, 18, 62,229, 75,160,209,232, 81,172, 99, 53,145,153,180,120, 82,203,186, 90, 42,183,
+145,  0,  0,159, 97,248, 70, 60,216,185,132,144, 31, 68, 34,209, 44, 66,  8,237,222,189,123,124,195,134, 13, 85,  0,160, 84, 42,
+161, 86,171, 33, 16,  8,160, 82,169,240,226,197, 11,220,188,121, 19,150,150,150, 85,186,174,185,185,185,112,115,115,131,137,137,
+201,123,107, 26, 12,  6,178,102,205, 26, 81, 68, 68,132,232,143, 63,254, 48,155, 50,101, 74,113, 72, 72, 72,194, 39,159,124,146,
+ 97,102,102,166,127,240,224,  1,110,220,184,129,188,188, 60, 52,106,212,200, 40, 77,141, 70,  3, 62,159, 15,165, 82,  9,177, 88,
+ 12, 62,159, 15,189, 94, 15,150,101, 95,153,174,162,162, 34,228,228,228, 64, 40, 20,226,109, 70,177, 60,101,102,169, 95,  0,161,
+191, 31,191,158,  1,176, 20,154, 66, 29, 52,249, 58,168,203,150, 92, 93,191,137, 63,213,255,253, 49, 37, 85, 40,132,111, 18, 66,
+250,  0,216,255,166,201, 42,103,132,250, 80, 74, 31, 84, 85, 83,171,213, 94, 45, 51, 62, 18,137,196,142,144, 18, 99, 40, 22,139,
+117,106,181,186, 85, 85, 52,  1, 32, 60, 60, 28, 13, 27, 54,228,149,106,150,111,102,195, 86,245,185, 36,132,128,199,227, 65, 44,
+ 22,131, 97, 24,132,132,132,160,119,239,222,240,245,245, 69, 98, 98, 34, 78,159, 62,141,168,168, 40,  8,133,194,215,170, 10,141,
+ 33, 44, 44,140,231,225,225,113,189, 93,187,118,254, 99,199,142,149,184,185,185, 33, 58, 58,186,198,218,181,107,167, 93,189,122,
+181,123, 96, 96, 96, 80,120,120,120,165,105, 78, 75, 73, 90, 61,160,123,216,103,121,185, 57, 59,106,248,154,207, 85,171,213,120,
+242,228,137,209,251,252,175,202,184,166, 77,155, 38, 80, 74,159, 81, 74,175, 16, 66,234, 38, 39, 39,183,112,118,118, 62, 65, 41,
+149,191,113,205,139,147,147,147, 59, 57, 59, 59, 23, 80, 74, 31, 17, 66, 98,  8, 33,  9, 73, 73,127,157,209,200,194,220, 44,179,
+168,168,216,222,196, 68,142,153,221, 45, 32, 30,252, 28, 99, 91,241,160,211,233,240,226, 69, 60, 60,220, 93,201,158,205,135,130,
+  0,220,  1, 16, 28, 30, 30, 14,  0, 65,  0,226, 18, 19, 19, 29,203, 12, 22,  7, 71,149, 35, 88,111,246,  2,180,171,219,  3, 53,
+ 68,188, 94,143, 79,174,184,233,165,165,110,246,254,159,148, 70,162, 75, 34,213,  9, 15, 78,130,101,217,173,233, 70,244,202,187,
+113,227,134, 68,207, 98,243,212,111,231, 51, 27, 46, 40,145,158,150,130,148, 75, 75,161,204,120,178, 69, 42,149, 78,110,211,177,
+ 75, 65,117, 78,164,124,143, 70,103, 97,146,191,133,181,  3,212, 90, 90,106,176, 94, 55, 89, 31, 11, 78, 78, 78, 93, 61, 61, 61,
+231, 31, 62,124,216, 77,169, 84,154, 94,187,118, 45,239,204,153, 51,207,180, 90,237,198,212,212,212,157,165,133,206, 97, 62,159,
+191,  0,  0, 76, 77, 77,249, 60, 30, 79, 90, 81, 35,205,  0,115, 97,195, 97,159, 13,186, 58,105,229,111,146,103,143, 31, 96,229,
+254,227, 16, 27, 52,134,200, 92, 77,143,199,133,186,163,165,155,157,239,236, 36, 75,166,160,174,  2,134,192, 74, 42,116,  8, 37,
+ 68,114,131, 82, 85,101,105,182,113,117, 99,116, 53, 60,112, 69,175,130,137,169, 80,  4,  0,206,181,253,120,247,149, 58, 92,123,
+248,  4, 18,137,165,208,200,151,236,108, 59, 59,187,198,151, 46, 93, 34, 69, 69, 69,170, 71,143, 30,193,202,202, 10,246,246,246,
+ 48, 55, 55,199,147, 39, 79,112,238,220, 57,196,196,196,128, 82,138,122,245,234, 85,233,218,166,167,167,163,160,160,  0, 61,122,
+244,108,157,146,146, 44,177,179,119,208,156, 63,119,246,108,117, 52, 89,150, 37,  0,224,239,239, 15,127,127,127, 65,114,114,178,
+197,209,163, 71, 77, 22, 47, 94,236,100,107,107,123, 71,169, 84,190,102,156,140, 53, 88,  0,160, 82,169,160, 86,171, 33, 20, 10,
+ 33,145, 72, 32, 20, 10, 81, 80, 80,128,244,244,116, 20, 22, 22,190,138,184, 25,171,251,234,211,100,123,179,187,127,205, 28,159,
+217, 85,243, 75,247, 90,169,201, 58, 79,  8, 41,187,191,233,165,127,251, 84, 84,213, 87,137,230,107, 17,150,114, 81, 38, 65,117,
+ 52,  3,  3,  3,203, 52, 94, 43, 37, 36, 18, 73, 70, 89,228, 74, 34,145, 24, 53, 85, 23, 33,  4, 44,203, 66, 40, 20,162, 94,189,
+122,152, 57,115, 38, 34, 35, 35,113,225,194,  5, 56, 58, 58,162,107,215,174, 16,  8,  4,136,143,143,127,173,125,150, 49, 55, 39,
+ 62, 62,126, 90,251,246,237,253, 87,174, 92, 41, 73, 72, 72, 64, 84, 84, 20,204,204,204, 48,127,254,124,241,244,233,211, 61,175,
+ 95,191, 62, 27,192,143,149, 94,195,156, 39,251, 75, 13, 46, 26, 52,104,240, 89,155, 54,109,254, 90,174,218,218,154,239,222,189,
+219,174,204,120,149,223,231,127, 69,114,114,114,222,220,185,115,151,251,250,250,174, 40,173, 22,108, 78, 41,149,167,164,164,132,
+237,223,191,159,  0, 64,159, 62,125,168,147,147,211,197,210,188,241,104,197,138, 21,173,162,162,162,232,220,185,115,223, 90,206,
+165,102,164,174,255,113,213,134,229,115,103, 76, 20,125,211, 89,134,207, 67,212, 96, 89, 22, 60, 30, 15, 43,215,109,214,197, 68,
+ 62,122, 24, 20, 20,116,148, 82,218,163, 52,154, 89,  4, 32,134, 16, 18, 39, 18,137, 82, 94,188,120,193,185,  7,142, 74, 97,202,
+135,199,223,181, 81,198,163,131, 96, 89,214,209,194,214,217,106,228,167, 29,192,178,128,158,  5,244,  6, 10,165,162, 24,105,209,
+ 23, 20, 26,141,198,168,135, 46, 59, 59,123,193,176,  9, 75, 60,239,190,228, 35, 53, 87,131,164,115,243,169, 58, 43,186,119,215,
+174, 93,135,183,105,211,166,160,218, 39, 82,218,243,209, 89,152,228,111,105,227,116,241,187,165,155,112,231,133,  6, 44,253, 79,
+ 36,203,192,  2,236, 71, 18,192,114,118,118,246,178,180,180, 92,118,248,240, 97,119,145, 72,100, 26, 27, 27,107,184,120,241, 98,
+138, 78,167, 91, 91,102,174, 74, 77,216,160,128,128,  0,157, 76, 38,131, 66,161, 80,233,116,186,162,119,153, 43,127,169,212, 37,
+ 48, 32,224,242,164,149,191, 73, 84, 26, 13,242,149,106,216, 58, 58, 24, 30,229, 42,122, 60, 42, 84, 31,125, 21,225, 50, 21, 52,
+  9,170,229,236, 76, 36,166,160,  0,146, 11, 53, 41,198,152, 43,  0,144,155,154, 51, 46, 65, 97,  8, 26,191, 26, 74,158, 57,  5,
+  0, 75, 59, 39,166,213,152,239,209,113,229, 37,168,249,166, 70, 91, 96, 62,159,175,246,242,242, 82,149, 22,170,200,206,206, 70,
+100,100, 36,114,114,114,176,122,245,106, 68, 71, 71,191,122,233, 86,205, 96,188,122,137, 35, 51, 51, 67, 76, 41, 69, 70,122,154,
+168,186,154,101,  6,171,220,189,195,232,209,163,249,197,197,197,146,242,230,170,170,  6,171, 44, 29,148, 82,104, 52, 26,228,231,
+231, 67,163,209,224,217,179,103,175,204, 85,105,  4,173,106,231,175, 41,212,189,117,189, 42, 71,247, 30,213,  9,215,  0,  8,203,
+ 13, 82,104, 95, 93,115,245,134,241,169, 82,244,167,178,  8, 22,222,210,128, 89,169, 84,218, 83, 74, 73,120,120, 56,140,105,127,
+ 85,222, 96,137, 68, 34,244,237,219, 23, 17, 17, 17, 72, 76, 76,  4,159,207,135, 74,165,130, 74,165, 66,163, 70,141, 32, 18,137,
+170, 26,193,162,  2,129, 96,208,216,177, 99, 37,113,113,113,200,202,202,  2,195, 48,208,235,245, 48, 24, 12, 24, 62,124,184, 84,
+ 36, 18, 13, 66, 21, 27, 98,223,191,127,191,195,181,107,215,188,223, 92, 50, 51, 51,243,197, 98,241, 63,178, 12,220,191,127, 63,
+233,211,167, 15,237,211,167, 15, 45, 51, 90,198,146, 25,247,120,253,206, 61,  7,207,204,156,187,180, 40, 43, 59,  7,114,185, 28,
+153, 89,217,248,110,193, 50,221,133,171,183, 47,142, 30,254,105,232,242,229,203,151,  0,136, 41,221, 37,102,197,138, 21, 67, 71,
+140, 24,177,189,108,184,  6, 14, 14,163, 35, 88,101, 85,132,239,248,178,107, 96, 97,227,124, 97,198,162,223, 76, 14, 60,228, 33,
+ 55, 53,  6,170,140, 24,184, 54,236,142,244,152,107,160,  6,221,159,145,145,145,197,149, 29,236,212,169, 83,181, 93,189,131,198,
+215, 15, 12,193,210, 99, 69, 40,138,220,  3, 77,110,220,186, 46, 93,186, 28,124,223, 19, 97, 41, 48,105, 80, 19,127, 75,107,199,
+139,223, 46,249,205,234, 72,132,  0,217, 41, 49,136, 62, 52, 13,  6,237, 95,106,197,142, 87, 85, 95,202,106, 68, 69,121,233,208,
+ 20, 26, 32, 97, 20,146,191,251,198, 37, 39, 39, 63,243,247,247,223,246,235,175,191,142,170, 87,175,158,108,252,248,241, 79, 11,
+ 10, 10, 22,166,164,164,252, 94,238, 69,222,186,102,205,154, 83,230,207,159,239,249,242,229, 75, 92,190,124,249, 25,143,199,187,
+243, 46,205,  8,165, 50,169,174,185,120,237,213, 93, 27,191,225,185,121, 99,239,220,169,250,235,143,159,116,139, 44,212,159,120,
+101,174, 76, 68,190,161,254, 94, 71,191, 30, 59,138, 49,220, 59,137,232,196, 12,164, 22,235,206, 25,157,238, 66,133, 78, 32,150,
+194,196,193, 29,  9, 42, 86,232,226,226,114,123, 68,207,174, 66,134,199,  7,195, 23,226, 69,158,218,232,151,184, 94,175, 23, 63,
+121,242,132,  0,120,205,220,169, 84,170,119, 70,124, 62, 36,198,106,190,173,125, 20,  0,232,116,186,106,107,150,143,216, 84,118,
+ 44,150,101,161, 86, 87,161,175,136, 58,239,237,247, 64,153,165,251, 16,151,173,244,175,232,125,204, 85,153,241, 41,107,128, 46,
+ 22,139, 95,153, 20, 99,163, 76, 21, 68,176,170,245,251,219, 12,186, 80, 40,132,143,143, 15, 46, 95,190, 12, 11, 11, 11,152,152,
+152, 64, 46,151, 67, 34,145,192,194,194,  2, 34,145,  8, 12, 83,165, 33,  2,169, 86,171,173,225,226,226,130,103,207,158, 65, 34,
+145,188, 90,196, 98, 49,124,124,124,160, 80, 40,156,241, 81,197,234,255, 59, 12,237,211,182,251,250, 93,  7,134,236, 61,112,116,
+140, 90,165, 10,240,241,246,162, 81,143,239, 61, 28, 61,124, 80, 71,238,234,112,124, 80,131, 85, 65,161,210,192,194,198,249,194,
+180,239,127, 53,219,119,143, 65, 94,106, 52, 18, 78,126, 91,104,208, 42,114, 89, 86,231,150,251,252, 42,  0,108, 53,242, 75, 62,
+184, 73,235,238,204,197, 40, 13,180,133, 41, 40,136,216, 27, 47, 22,139,167,127,136, 19,113, 21, 37,249, 91, 90, 59, 94,156,190,
+248, 55,171,  3, 15,249,200, 73,137,193,243,227, 51,242, 13, 90, 69,235,240,240,240, 87,227,104,217,251,247,192,231,211,150, 99,
+243, 15, 19,141,214, 30, 44, 18,117,239,239,103,209,101,120,243, 20, 24,136,  1,131,158, 68,117,114,106, 78,186,167, 92,161,135,
+254,206,155, 23, 17, 17,241,189,151,151, 23,163,215,235, 63,215,106,181,115, 83, 82, 82,246,151,139, 92,181,115,115,115, 91,186,
+ 96,193,  2,151,132,132,  4,209,141, 27, 55,114,238,223,191,207, 26, 12,134, 37, 21,105, 62,202, 87, 79, 13, 48, 21,242,188, 92,
+157,198, 62, 75, 74,234,246,184, 64,127,178,236,183,  0,185,200,191,121,125,223,107, 11,230,126,107,170,185,186, 31,197,169,137,
+ 88, 29,158, 86,192, 26,116, 51,140,140,186, 89,185,  9, 41,153, 49,226, 51,182,176,176, 16, 50,145,144, 77,140,126,206, 27,210,
+182,133,225,135,105,147,153,180,180, 52, 40,138,139,249,206,206,206, 86,201,201,201, 57,149, 68,  8,230,  3,104, 93,175, 94, 61,
+180,111,223, 62,126,222,188,121, 81,229,205,199, 63,204, 96,189,245,235, 90,171,213,146,234,106,150,143, 96, 85,102,176,170, 28,
+193, 82, 23,188,221, 72, 41, 50,223,215, 96,189, 36,132,212, 40,251,247,135,184,  7, 42,149,202,174, 92,213, 32, 40,165,213, 14,
+103,149, 70,176,170,253,123,121, 24,134,  1,165, 20, 34,145,  8, 49, 49, 49,112,112,112,128, 94,175,135, 92, 46,135, 76, 38, 67,
+105, 68, 25, 34,145,  8,124, 62,191, 42,201,100, 69, 34,209,203,152,152, 24,111, 75, 75, 75, 24, 12,134,215, 76, 86, 92, 92, 28,
+228,114,121,114, 85, 35, 88, 13, 26, 52, 56, 37,149, 74,221,222, 92,111,107,107,107,254, 79,125,121,149,143, 92,245,233,211,135,
+ 78,152, 48,161,202, 26,171,190,255,102,  7,128, 29, 19, 38, 76,216,182,107,227,241,160,160,160,160, 99,190,190,190,  4,  0,184,
+ 30,131, 28, 31,196, 96,149, 21, 74,101,127,203,218, 51, 57, 11,147, 26, 88, 88, 59, 93,152,178, 96,131,217,174,187, 12,242, 83,
+163,144,114,118, 86, 62,171, 85,180,102, 24, 38, 53,241,250,175,251,  1, 40,238,221,187,119,201,214,191,  7,  8, 41,233,185,247,
+182,145,220, 75, 11,250,134, 62,181,107, 99, 95,132, 30,170,180,135, 96,  8,221,218,182,109, 91,197,251,158, 68, 96, 96,160,191,
+165,181,227,197,169,139,126,181,218,119,159,143,220, 18, 19,152,207,106, 21,173,147,181, 46,175, 13, 82,202, 18, 96,243, 15, 19,
+193, 26, 81, 12, 15, 39,196,146, 39,151,172, 29,210, 62,184,159, 91, 45, 23,176, 84,  7, 86, 72,209,107,170, 13, 63,230,158,226,
+ 96,141,246,188,223,217, 34,118, 76,210,141,191,111,244,241,103,207,158, 45,112,112,112, 56,144,150,150,246,170,117,170,139,139,
+ 75, 39,119,119,247, 69,243,231,207,119, 79, 74, 74, 50,189,127,255,126,193,254,253,251,227, 24,134,153,159,154,154, 90,233,215,
+253,227, 66,237,100,127, 19,209,198,136, 34,253,171, 49,116,234,200,133,245, 62, 27, 50,240, 70,219,129,159, 73,158,159,221,  1,
+171,184, 39, 88,121, 47,221,144, 92,168, 26, 24,165,160,105,198,152, 43,177, 88,188,127,245,254,253,207,234,214,173, 75,138,139,
+139,161,211,233,144,149,149,133, 31,119,238,139,164,148,194,210,210, 18,103,207,158,101,199,143, 31,191,223,217,217,185,207,187,
+ 76, 86,185, 97, 26, 32, 20, 10,137, 84, 42,245,136,143,143,143,119,119,119, 87,189,205,164,136,197,226, 42, 27, 44,169, 84, 10,
+150,125,119, 16,160, 42,154,122,189,158, 24,179,190, 42,154,101,105, 43,107,220,254,230,250, 50,120, 60, 30, 88,150,173,240, 92,
+254,234,222,222, 17,193, 82,100,188,151,193,162,148,186,149,117,164,249,167, 21,132,165,145, 48,  0, 96,223, 53, 20, 67, 85, 34,
+ 88,165,102, 15, 34,145,  8,151, 47, 95, 70,215,174, 93, 65, 41,133, 88, 44,134, 76, 38,131, 68, 34,193,181,107,215, 32, 18,137,
+192,227,241,170, 18,197,162,122,189,126,231, 47,191,252,242,237,226,197,139,165,101,199, 40, 51, 88, 63,253,244,147, 82,173, 86,
+239, 52,198, 96, 17,203, 58,253, 45, 44,173,  6,231,229,101,111,109,226, 99, 81, 97, 47,194,183,237, 83,218, 30,235,191, 78,217,
+ 48, 13,148,210,238,111, 14,197, 80,182,205,132,  9, 19,240,230, 16, 14, 21, 13,211,224,228,228,100,185,113,227,198, 17, 44,203,
+214, 41, 93,245,102,111,193,178,251, 88,246,126, 42,235, 85,248, 90, 47, 66, 14,142, 42, 71,176, 24,  2, 56,242, 95,250, 90, 88,
+187, 92,152,180, 96,131,217,182, 91, 60,228,167, 62, 65,214,133,239,242,169, 94,217, 58, 60, 60,252,190, 93,221, 30,  8,105,218,
+186, 89,219, 79,250,192,254,200, 62,220,185,126, 30, 63,174,222,140,111,198,126, 81,225,135,146,157,157, 53,178,174,171,160,203,
+125,  6, 66,200,189,247, 61,129, 70,141, 26,121, 89, 88, 57, 92,156,178,240, 87,171,221,225,124,228,165,252,199,  4,206, 88,115,
+225,254, 87, 35,134,190,182,189,177,211,227, 12, 22,137,186,251,215,118,217, 52,160, 83, 83, 75,115,162,135, 62, 33, 10, 27, 63,
+235,135,240,174, 90, 52,237,111,142, 70,157, 77,225,217, 64,210,239,248,111, 57,109,156,154,147,225,127,103, 52,171,188,185,114,
+114,114,234,234,226,226, 50,239,216,177, 99,110,122,189,222,244,242,229,203,133,251,247,239,127,174,215,235, 87,165,166,166, 30,
+ 51, 58, 58, 86,164,121,101,174,  2,204,133, 13,135,127, 62,244,234,248, 21,235, 37,145,225,119,176,116,231, 17,152,241,116,134,
+187,105,170,190, 17, 69,255,169, 62,172, 48,163,241,249, 11,118,239,222, 45,247,243,243, 35,217,217,217,175, 34, 45, 90,173, 22,
+249,249,249, 40, 44, 44,132, 90,173, 70, 64, 64,  0, 51,119,238, 92,249,119,223,125,183,  0,192, 24, 99,211,107,107,107, 11,161,
+ 80,  8,173, 86,251,202,164,136, 68, 34, 88, 88, 88, 32, 63, 63, 31,103,206,156, 65,101,131, 83, 10,133,162, 84,134, 33,174, 38,
+166,166, 58,185, 92, 78,229,114,249, 95,182,169,170,102,169,201,201,236,212,169,147,237,252,249,243,  5,129,129,129,175,214,151,
+ 85, 17, 86, 71,147, 82,170,104,223,190,189,108,213,170, 85,112,115,115,131, 70,163,121,205, 72, 49, 12,  3,161, 80,136,196,196,
+ 68, 44, 92,184, 16,148, 82,227, 63,100, 84,185, 58,  4, 12,181,131, 50, 91,  7,101,182, 14,170, 44, 45,138, 51,116,208, 41, 12,
+255,180,  2,172, 58, 13,208,141,136,132,217,189,111,  4,171,172,186, 82, 44, 22, 35, 62, 62, 30,167, 78,157, 66,104,104, 40,204,
+204,204, 80, 92, 92,140, 43, 87,174, 32, 57, 57, 25, 98,177, 24, 60, 30,175, 74,141,220,107,212,168,241,195,237,219,183,187,142,
+ 27, 55,174,206,151, 95,126, 41,245,245,245, 69, 92, 92, 28,150, 47, 95,174,122,244,232, 81,172,165,165,229,124,160,242,121,102,
+157, 93,107,140,223,184,243,168, 96,216,192, 78, 99,129, 98, 24,211,139,240,245,125,254, 55,141,221,223, 49, 76, 67,167,119,108,
+ 94,126,  8,135,215,134,105, 40,207,193,131,  7, 61,156,157,157,125, 81,210, 51, 16,248,107,111,193,242,220,  9, 15, 15, 15,  6,
+215,139,144,227, 67, 24,172,210,  2,122, 98, 72,239,153,102, 91,111,242,145,155, 28,129,252, 43,115, 94,153, 43,160,164,225,187,
+ 93,221, 30, 48,176, 20,173, 59,246, 46, 27, 20,244,205, 66, 38,160,252,184, 85,  2,137,105,128,158, 10,  1,168,160,207,123, 14,
+145, 72,116,191,170,  9,126, 83,147,101,217,201,141,123,207,180,218,126,135,143,252,148, 39,200,188, 56, 59,159,213, 42, 90, 39,
+106, 92,238,127, 53, 98,168, 81,141,218,  9, 33,109,203,198,244, 24, 44, 18,125, 39,224,145, 89,159,180,104, 40,108,214,160, 54,
+228, 25,241, 72, 75, 74,193,222, 39,153, 57,177,185,234,225,215,136, 22,  9,207,213, 27, 59,143,176,178,178,116, 16,160,203, 40,
+107,171,155, 71, 10, 14, 58,183,102,180, 84, 75, 23,167, 92,165,115,223,212,252, 80, 84,166,233,236,236,236,101,106,106,250,227,
+201,147, 39,109, 69, 34,145, 89,100,100,164,225,192,129,  3,137,  6,131,225,167,212,212,212, 61,213,209,244,151, 74, 93,234,120,
+123, 92, 26,255,243, 58, 73, 81,177,  2,197, 26, 45,156, 92,157, 13,151,238, 69,245,142, 40,210, 28, 50, 70,211,222,222,190,213,
+192,129,  3,235,  5,  6,  6, 50,229,205,149, 70,163, 65, 65, 65,  1, 10, 11, 11, 81, 80, 80,128,130,130,  2, 36, 39, 39,163,105,
+211,166,140,175,175,111,128,189,189,125,171,244,244,244, 11,111,106,150, 27,166,225, 91,  0,140, 76, 38,139,185,126,253,186,170,
+119,239,222,144, 74,165, 40, 46, 46,134,139,139, 11, 88,150,197,149, 43, 87, 16, 19, 19,147,  7, 96,119, 90, 90,218,217,138,210,
+169, 84, 42,106, 16, 66,120,102,166,166,109, 59,116,232, 48,112,248,240,225, 22,229,183,175,142, 38,  0,100,102,102,186, 95,190,
+124,249,187,238,221,187,143,237,216,177,163,108,198,140, 25,  2, 15, 15, 15,232,245,122, 82, 93,205,220,220, 92,243,123,247,238,
+ 45,107,214,172,217, 87, 29, 59,118,228, 47, 90,180,  8,230,230,230, 48, 24, 12,144, 74,165, 40, 40, 40,192,252,249,243,113,245,
+234, 85, 61,165,116, 77,126,126,254,148,138, 52, 95, 27,  7,107,210,207,245, 43,202,135,239, 26,  7,235,239,200,243, 74,165,210,
+190,170, 81, 49, 99,210,121,239,222, 61,250,230,120, 88, 21, 69,176,222,166, 89, 22, 93,226,243,249, 72, 75, 75,195,209,163, 71,
+ 95, 27,  3,171,108,121, 87, 21,225, 59,210, 73, 47, 94,188,104, 32,132,132,234,245,250,105, 19, 38, 76, 24,174, 80, 40, 92,228,
+114,121,138, 86,171,221,106, 97, 97, 81, 54, 14,150,176, 50, 77,145, 72, 34, 32, 12,  3,169, 68, 46, 85, 42, 51, 19,222,214,139,
+240,141,107,157, 32, 18,217, 91,151,237,243,191,186,239,111, 12,211,240,218, 80, 12,111,236,243,218, 16, 14,111, 14,211, 80, 94,
+179, 71,143, 30,113,  0,162, 41,165, 12, 33, 36,250,205,222,130,229,100,189,195,195,195,131,131,130,130, 46, 81, 74,101,111,246,
+ 34,252, 59,242,252,199,172,249,175, 49, 88,  0, 36,215,194,159,130, 17,103,160,240,214,143,175,153,171, 87, 79, 58, 11,220,185,
+126, 30, 44, 11,180,104,223,179, 82, 51,163, 87, 23,199, 46,216,251,162,129, 65,163,132,190, 32, 33,166,227, 39,157, 51,222, 39,
+241,182,  1, 61,225, 42,164,242,171,247, 98,193,151,100, 35,239,230, 15,121,196,160,110, 29, 30, 30,254,160,218,153,  6,152,177,
+238,196,126, 33, 49,183,194,195,  9,195,144,146, 87,140, 19, 47,114,127,167, 10,245,152, 29,180,164, 42,208, 37,148, 92,217, 52,
+ 51,109,109,243, 94,230,253,108,156,  5,248,249,155,173,144, 76,183, 22, 54,106,211,226,111,157,163,176,172,225,251,198,141, 27,
+ 71,  7,  6,  6,154,124,253,245,215, 79,243,243,243, 95,107,248, 94, 85, 34,148,202, 36,127, 83,209,186, 11,191,254,252,141,212,
+ 63,  4,251, 23,206, 48, 92,190, 23,221,227,113,161,230,168,177, 26, 98,177, 56,108,204,152, 49,194,226,226,226,191,152,171, 55,
+ 13, 86, 65, 65,  1, 30, 62,124,136, 62,125,250,136,163,162,162,194,  0, 92,120, 71,  4,103,118,233,128,147,124, 27, 27,155,204,
+117,235,214,117,223,190,125,123,175,225,195,135,139,195,194,194, 16, 25, 25,137,219,183,111,171, 53, 26,205,159, 66,161,240, 80,
+124,124,188, 81,173,188, 41,165,  6,  0,167,220,221,221, 47,173, 91,183,174, 59,203,178,175,230,179,124, 15, 77, 29,128,217, 86,
+ 86, 86,203,246,239,223,191,244,252,249,243,  3,135, 12, 25, 34,209,233,116,228, 61, 52,245,  0, 38,216,218,218,206, 58,126,252,
+248,214,211,167, 79,247, 24, 60,120, 48, 51,110,220, 56,172, 94,189, 26,127,252,241,  7,107, 48, 24, 14,  9,  4,130,161,153,153,
+153,149,118, 64,121,109, 28,172, 10,198,185,170,236,119, 35,184,251, 95,200,250,239,173,249,102, 36,172, 97,195,134,246,229,123,
+105,150,255,107,108,  4,139, 16,130,160,160,160,215,254, 95, 54, 36,  3,143,199,123,109,169, 74, 21, 33,  0, 11, 74, 41, 11, 96,
+ 13,128,213,120,125, 20,119, 30,254, 51,210,187, 81, 56,187,186, 33, 57, 17,214, 89,197,170,188,138, 39,123,182,183,118,118,117,
+251, 59,202,181,188,185,115,231, 46,159, 51,103,206,242, 55,135, 98, 40,191,221,155, 67, 56,204,155, 55, 15,239, 26,166, 33, 37,
+ 37, 37,119,238,220,185, 63,  0,128,175,175, 47, 41,173, 22, 12, 66,105,111,193,114,154,219, 80, 50, 85,142,236,203, 47,191, 28,
+  2,224,157,154, 28, 28, 85, 49, 88,223, 22,133,175,212,  1,176, 38,132,204, 72,214,186, 68,254,181, 16,  1,126, 92,189,249,181,
+ 73,161, 43,130,199, 99,102,100, 28, 25,182,138,  2,185, 60,130, 25,239,155,120, 75, 11, 51, 24, 10, 13, 51,139,239,173, 98, 41,
+165, 22,132,144,233,119,239,222,141,124,111,103,110,110,133,194,249,163,241, 71, 68, 10, 77, 43,214,245,220,161,121, 61, 82, 83,
+218,230,170,191, 83,115,178,215,210, 73,112, 96, 66,107,107,114, 44,103,200, 63,226,134, 70, 68, 68, 44,242,242,242,226,173, 95,
+191,254,115,141, 70,243, 90,195,247,106,107, 22,106,166,  6,152, 10,121,190, 30,174, 99,163,226, 19,186, 63, 46, 52,174, 90,176,
+ 28, 34,103,103,231,199, 10,133,  2,132, 16,168,213,234, 87,198,170,176,176, 16,249,249,249,175,254,175,213,106,145,153,153,  9,
+ 15, 15, 15,148, 27, 51,233, 93, 38, 35,181,188, 71,176,180,180, 60,185,106,213,170,129,171, 86,173,106,  3,224,156, 82,169,220,
+157,155,155, 91,173,161, 63, 74,141,206, 94,169, 84,246, 35, 33,196, 89, 44,145,106,174, 94,189,122,226,125, 52,115,114,114, 10,
+  1,140,146, 74,165, 11,126,249,229,151, 85, 18,137, 36, 56, 35, 35,227,189, 52, 75,205, 83,111,107,107,107,167,109,219,182,237,
+219,180,105, 83, 99, 62,159,127,147, 16,210, 55, 47, 47,175,202,147, 61,147,215,191,222,171,252,187, 17,252,241, 95,200,246,239,
+173,105,236,240, 11,198,162,215,235,139,230,204,153,147,241,182,121,  7,203,204, 84,249,117, 90,173,214,168, 97, 78, 28, 28, 28,
+140, 30,139,172,162,161,119,  0,128, 33, 68,  9, 64,250,237,188,101,165, 31,204, 70, 79,246, 12,  2,162,249, 95,150,107,115,230,
+204,161,243,230,205, 35,132,144, 67, 40, 25,143,234,217,155,141,208,203,255, 54,111,222, 60,204,153, 51,135,206,157, 59,183, 82,
+205,168,168, 40, 74,  8, 57,  7, 32, 14, 64,124,121,221,242,235,203,246,169, 72,147,131,163, 82,131,197, 82, 32, 89,235,146,  8,
+ 96, 88,249,117,127,125,193,225, 47,109,174, 42,242, 88, 29, 59,118, 60,  7,192,247, 67, 37, 62, 47, 55, 31,196,170, 97, 66,110,
+110,246,224,140,199,135, 62,136, 38, 11,252, 56,188, 81,216, 55,  0,  8,  5,126,126,211, 92,189,246, 21,116,133, 30,114,108, 74,
+ 22, 55,106,211, 98, 98,233,203,103,209, 63,225,166,190,173,225,251,251,242,182,134,239, 85,120,217,156, 22,139,197,164,176,176,
+ 16, 74,165,242,181,104, 85, 65, 65,  1, 20, 10,  5,138,138,138, 80, 54,181, 71, 81, 81, 17, 76, 76, 76,160,211,233,170,244,165,
+ 88,106, 82,214,  5,  6,  6,110, 44,173, 38,121,111,148, 74,133, 11,  0,  4,  6,  6, 10, 62,156,166, 50,  5, 64,175, 15,169,153,
+157,157,157,  2,160,137,167,167,167,200,216,201,162, 43,138,100, 85,247,119, 35, 88,255, 95,200,242, 59,240, 15, 35, 33, 33,193,
+239, 67,107,166,164,164,196,124, 72,189,236,172,180, 13, 95, 13,235, 51,166,108,210,103, 99, 38,123, 46, 51,102, 57,217,105, 27,
+254, 87,215,178,108,154, 17,  0,212,217,217,121,219,203,151, 47,221,  8, 33,  9,111, 70,146,222,252,109,238,220,185,120,215,152,
+127,229, 53,  1,192,195,195,227, 96, 98, 98,162,147, 80, 40, 76, 45,175,251,230,250,138, 52, 57, 56,222,150,209,254,107, 11,128,
+128,255, 39,154,109, 57, 77, 78,147,211,228, 52, 57, 77, 78,147,211,252,251, 52, 63,182,133,225, 44, 38,  7,  7,  7,  7,  7,  7,
+  7,199,135,133,  0,  8,120, 71,100,235,177,209, 34,132,  4, 84, 35,114,246,248, 31,164,105, 87,129,230,217, 74, 52,219, 86, 35,
+157,156, 38,167,201,105,114,154,156, 38,167,249,175,212,172, 76,251,163,233,157,200, 85, 17,114, 97, 94, 78,147,211,228, 52, 57,
+ 77, 78,147,211,228,170,  8,185, 42, 66, 14, 14, 14, 14, 14, 14, 14,142,127, 52,239, 28,166,161, 87,221,146,238,195,127, 62,226,
+ 58, 76,112,  0, 60, 30,111,113,139, 22, 45,198, 92,189,122,245, 39,157, 78, 55,191, 58, 26,132, 16, 39,123,123,251,239, 41,165,
+ 77,  8, 33, 98, 62,159,255, 36, 61, 61,125,145, 78,167,187, 82,221,116, 17, 66, 92, 29, 28, 28,190,103, 89,182, 49,  0, 33,159,
+207,143, 72, 73, 73, 89, 72, 41,189,249, 30,154,102, 14, 14, 14,173, 88,150,117, 41, 57,117, 94, 70,106,106,234, 21, 74,105, 50,
+151, 19, 56, 56, 56, 56, 56,170,109,176,122,215, 33, 96,  0,212,  9,131,227,188,145,132, 63,103,  3, 77, 44,123,241,160,100, 48,
+ 54, 95,  0, 81,  0,238, 82, 74, 11,222, 39,  1,255, 95, 52,255,233, 16, 66, 24, 11, 11,139,246, 50,153,108,124, 81, 81, 81,  3,
+ 51, 51,179,136,210,233,113,142,150, 14, 74,248, 62,218,118,  3,  7, 14,156,190,113,227, 70,244,235,215,111, 22, 33,100, 57,165,
+180,168, 42, 26,214,214,214,221, 60, 60, 60, 54,172, 90,181,218,182, 89,179,102, 68, 42,149, 34, 42, 42,202,121,204,152,209, 65,
+ 78, 78, 78,123, 83, 82, 82,190,170,106,186,108,109,109,251,214,170, 85,107,213,154, 53,107,108,155, 52,105, 66,  4,  2,  1,194,
+195,195, 93,198,143, 31, 31,226,232,232,184, 53, 53, 53,117,114, 85, 53,173,172,172,252,106,214,172,217,113,237,218,181,178,166,
+ 77,155, 66, 44, 22,227,225,195,135,166, 35, 71,142,116,118,114,114,122,152,146,146,114,166, 42,122,129, 35,239,  9,132, 50, 45,
+ 31,  0,180, 10,161, 62,124, 67, 67,157,177,235,184,226,137,131,131,131,227, 35, 50, 88,125,235, 16, 16,  0,254,205, 48,159,232,
+241, 45, 24,144,  9,  3,201,239,171,127,103,110,183,109,219,214,231,139, 47,190, 32,165, 83, 71,248,237,217,179,167, 55,143,199,
+139,102, 89,246, 22,128,  7,206,206,206,218,178,105,  9,222,164,131, 23,121, 53, 70,214,153,231, 16,  2,168,207, 48, 76, 72,101,
+154,237,106, 65, 75,  8,112,234,217,219, 35,105,237, 61,  9, 64,129, 51, 47,170,166,121, 58,246,227,136,204,153,154,154,122,217,
+218,218, 78,182,182,182,238, 20, 20, 20, 84, 48,106,212,168,248,200,200,200,167, 62, 62, 62,170, 77,155, 54, 45,210,233,116,107,
+107,215,174,125,166,176,176,112,217,123,140,139,229,174,211,233, 16, 29, 29, 13,134, 97,  4,  0, 60,  0, 60,170,130, 65,115,116,
+119,119, 95,127,225,218, 61,187,  2, 13, 15,207, 50, 41,  0,  5, 88,161,  3,214,109,222,107, 57,123,218,216,129,102,102,102, 87,
+ 11, 10, 10,246, 86, 65,211,181, 86,173, 90,171, 30, 63,126,108, 39,145, 72,192,178, 44, 10, 11, 11,225,228,228,132, 77,155, 54,
+ 89,126,243,205, 55,159,203,100,178,203, 10,133,226, 72, 85,140,121,205,154, 53, 59, 70, 70, 70,202,196, 98, 49,209,235,245, 68,
+173, 86,195,213,213,149,238,218,181, 75, 50,110,220,184,250, 98,177,248,165, 90,173,126,106,148,185,250,245,158,160, 32,235, 66,
+ 40, 77, 84,206,  2,  0, 34,145, 46, 12,155,103,117,187, 32,235, 66,163,202,214,  5,254,138, 27,225, 95,114, 38,139,227,127,139,
+163,163, 99,160,165,165,229,254,188,188,188, 75,169,169,169,195, 75,103, 54,120,223,143, 63, 39, 62,159,239, 65, 41,181, 40,253,
+127,158, 94,175,143, 51,102,206,205,119, 97,227,217,170, 43,196,178, 97,160,108,125,  6,  0, 97,152,  7,  6,173, 98, 75, 86,204,
+133, 35,239,165, 41,146,126, 14,208,250, 12,192, 18,134,121,200,234, 21,191,101, 70, 93, 56,193,229, 12,142, 15, 22,193,170, 19,
+  2, 75,  2, 76,155, 49,234, 75,134,207,227,145, 69, 27,126, 29,112,231,250, 17,234, 88,163,254,171, 41, 55,154, 55,111,142,230,
+205,155,147,165, 75,151,250,158, 63,127,222,119,215,174, 93,186,235,215,175,135,  3,216,250, 54, 77, 74,129,150, 29,165, 47,245,
+ 58,165,107,211,118, 82,149,123,227,181,187,154, 52,105,206,138,197, 98, 84,164,121,230,250,245,240,118,181,222,174, 89, 34, 12,
+212,106,192, 63,227,220,208,149,132,117,153,157, 96,172,230,187,210,249,255,204, 92, 93, 50, 53, 53,245, 28, 57,114,228,179,209,
+163, 71, 95,150,203,229, 20,  0, 20, 10,133,184,107,215,174,185, 61,122,244,200, 86, 40, 20, 88,183,110,157,235,170, 85,171,206,
+152,153,153, 37, 23, 20, 20, 52,170, 74, 84, 12,192,156,110,221,186,205,250,250,235,175, 81,163, 70, 13,140, 27, 55, 14, 58,157,
+ 46,156, 16, 50, 27,192, 18, 99,  6,221,179,179,179,155,179, 98,197, 10,187, 98,157,  0,223,109,143, 69, 78, 81,201,128,162, 50,
+ 17,131,175,218, 74, 48,118,236, 56,243,219,183,111, 47,197, 27, 35, 72, 87,132,131,131,195,247,107,214,172,177,149, 72, 36,160,
+148,162,168,168,  8,133,133,133, 40, 42, 42, 66,113,113, 49, 70,143, 30,109, 30, 17, 17,177,  2,192,145, 42,104,182, 90,187,118,
+173, 76, 44, 22,227,204,153, 51,222,106,181,154,167,209,104, 96, 48, 24, 12,181,106,213,138,254,250,235,175,197,143, 31, 63,238,
+  0,192, 40,131,229,152,  6, 65,190, 82,185,230,151, 31,190,177,  5,128,175,167,253,184,  6, 80,134, 80, 35,214, 57,166, 33, 24,
+  0,103,176, 42,206,159, 60,  0, 61,  5,  2, 65, 47, 79, 79,207,160,103,207,158,221,215,235,245,127,  2,248,179,116,122,162,247,
+209,110,227,228,228,244,125, 74, 74,202, 47,148,210, 29,255,150,107,106,103,103,247,231,129,  3,  7, 92,183,111,223,254,217,111,
+191,253,118, 28,239, 49, 74, 62, 33, 68,  0, 32,180, 81,163, 70, 54,189,122,245, 18, 56, 56, 56, 64,161, 80, 32, 54, 54, 86,118,
+246,236, 89, 91,137, 68,146,173, 86,171,111, 84,229, 94,217,120, 55, 53,  1,223,108, 79,104,171,182,205,250,245,238,105,106,111,
+109, 14,165,198,128,103,  9,169, 53, 78, 30, 63,220,210, 41,224,147,235, 90,109,254,128,172,152,107, 69, 85,213,108,213,177, 75,
+179,182,109,218,152,154, 91,152, 35,191, 88,139,231,241,201,110, 23,206, 28,105,238, 24,240,201,101,150,232,  6,167, 63, 58,173,
+224,158, 58,142,170,240,151, 70,238,251, 34,233,219, 30, 20,200, 77,228,111, 21, 48, 55, 55, 71, 88, 88, 24, 22, 45, 90, 36,  0,
+208,248,117, 83,245,159, 97, 19, 24,  0,  6,131,198,113,214, 87, 99, 33,226, 83,241, 39,157, 58, 16, 51, 51, 51,163, 52,121,239,
+208,  4,  0,202,  8, 97,111,165,111, 27,226,173,108,153,254, 96,220,160,  7,151,190, 15,208,168,242,  4,111,106,202,100, 50,120,
+121,121, 97,230,204,153,111, 75,231,  7,239, 18,250,191,208,164,148, 58,249,249,249, 21,174, 88,177,194,123,238,220,185,150, 42,
+149, 74, 14,192,213,179, 78, 35, 23,134, 97, 92, 85, 42,149,217,156, 57,115,108,151, 46, 93,234,109,107,107,155, 71, 41,181,173,
+ 98, 58, 23,172, 89,179,102,246,161, 67,135,152,230,205,155,195,210,210, 18,173, 90,181,194,241,227,199,249, 63,253,244,211, 34,
+  0,179,140, 73, 39,195, 48,205,155, 53,107, 70, 88,150, 34,183, 72,135, 11,139,  3,113,237,199, 96, 40, 52, 44,114,243, 10,160,
+ 82,169, 32,147,201,164,132, 16, 19, 99,207,157,101,217,198, 77,154, 52, 33, 64,201,200,239, 37, 75, 49, 10, 11, 75,254,106, 52,
+ 90,  8,  4,  2, 83, 66,136,184, 10,154, 46, 77,155, 54,  5,  0, 40,149, 74,126,155, 54,109, 72,235,214,173, 73, 97, 97, 33,191,
+108, 26, 31,129, 64, 32, 34,132,240,141,209,212,200,  4,132,165,172,189, 92, 38,181,145,203,164, 54, 44,101,237,  1,192,152,117,
+ 26,153,128,252,157,249,147, 16, 98,203,227,241, 54,123,122,122, 62,225,241,120,219,  8, 33, 14,239,163, 73,  8,  9, 38,132, 44,
+146,201,100,103,253,252,252, 18,229,114,249,121, 66,200, 18, 66, 72,104,117, 52,  9, 33, 34,153, 76,118,126,209,162, 69,251,238,
+223,191,223,239,220,185,115, 30,143, 30, 61,234,189,116,233,210, 61, 38, 38, 38, 87,  8, 33,178,247,121, 54, 61, 60, 60, 54,221,
+186,117, 43,184, 73,147, 38, 27, 43,202, 67, 85,209, 36,132,240,  8, 33, 13, 72,217,252, 56,255,128, 50,164, 60, 46, 46, 46, 78,
+254,254,254,174, 98,177, 24,205,154, 53,  3,165, 52,236, 61, 53, 67, 71,141, 26,229, 48,105,210, 36,193,131,  7, 15,176,113,227,
+ 70, 28, 58,116,  8, 25, 25, 25,232,210,165,139,176,117,235,214, 14, 98,177, 56,180, 74,154,124,179, 61,227, 39, 76,236,248,205,
+184, 17,166, 15, 95,106,177,229,236, 75, 28,188,145,138, 12,133,  8, 93,123, 15, 53,239,208,189,127,  7,145,216,124, 79, 85, 53,
+167, 79,155,214,241,203,207, 63, 53,141, 76,101,113,248,102, 26,110, 70,231, 67, 47,176, 64,231,222,195, 45,235, 55,237,248,  9,
+ 31,130,173,255,132,123,244,177,107,254, 43, 34, 88,115, 54,210,220,249,163,201, 15,139,214,253, 58,139, 33,132,186,212,238, 16,
+233,225,213,184,152,101, 89, 40,149,202,178, 23, 13,148, 74, 37, 18, 18, 18,112,235,214, 45,152,155,155, 87,120,160,147,177, 20,
+ 11,191,250,207,225,242,242,243,225,236,226,  1,153, 76, 86,169,230,137, 10,170,243,248,180, 36, 26, 50,162, 79, 15,254,203,212,
+ 84,254,245,123, 23,  2,247,174,220, 21,232, 90,171, 93, 84,253,176,169,143, 77,204,107, 40, 31, 60,120,128, 27, 55,110, 32, 55,
+ 55, 23,141, 26, 53,250,104,110, 30, 33, 68,183,108,217,178,123, 41, 41, 41,228,234,213,171,245,231,175,216,229,241,168,160, 38,
+ 47,179,136, 10,108, 77, 94,122,248,201,158, 26,242,243,243,227, 38, 79,158,124,193,193,193, 65, 61,118,236,216,150, 70,234, 74,
+  0,248,244,233,211,103,250,152, 49, 99, 16, 27, 27,139, 17, 35, 70, 40,111,223,190,157,221,164, 73, 19,235,223,126,251, 77, 58,
+105,210, 36, 92,186,116,105, 14, 33,228,  0,128, 56, 74,233, 59,231, 82, 99, 89, 86, 36,149, 74,129,130,146, 15, 85,173,190,108,
+110, 90,160,184,184, 24,124,228, 65, 36, 18, 49,  0,108,  1, 24,251,229, 41, 20,139,197,175,204, 85, 82, 70, 33, 18, 50,138, 80,
+ 88,164,134, 82,169,131, 70,  5,136,205,236,121, 64,162, 53,  0, 99, 27,167,243,196, 98, 49,244,122, 61,180, 90, 45, 84, 42, 21,
+ 84, 42, 21,212,106, 53,242,243,243, 81, 88, 88,  8, 62,159, 47,  3, 96,  6, 32,167, 82, 49,145, 84,207, 99,132,139,190, 93,184,
+102, 46,  0,240, 24,225, 34, 19,168, 88, 99,214,241, 68, 82,253,223,152,175,196,182,182,182, 23,246,237,219,231,231,229,229,133,
+184,184, 56,223,190,125,251,134, 16, 66, 26, 80, 74, 21, 85,212,146, 49, 12,243,195,176, 97,195,198, 12, 28, 56,144,212,174, 93,
+ 27,124, 62, 31,122,189,222, 37, 54, 54,182,213,239,191,255, 62,141,207,231,255,102, 48, 24, 38, 27,219,174,143, 16,194,136, 68,
+162,189, 27, 54,108,104, 17, 18, 18,130,109,219,182,225,246,237,219,108,112,112, 48, 51,100,200, 16,184,185,185,133, 12, 25, 50,
+228, 32, 33,164,115,117, 34, 89,132, 16,183, 65,131,  6,185,242,120, 60, 52,105,210, 68,120,253,250,245,134,  0,174,191,231, 53,
+ 53,113,113,113,185, 20, 22, 22,214,224,236,217,179,247,  8, 33, 97, 85,105,199,232,228,228,212,221,222,222,126,169,169,169,169,
+165,177,251, 20, 21, 21, 41,210,211,211,167, 36, 39, 39, 27, 53, 31, 41,165,180,113, 64, 64,  0,146,147,147,225,233,233,  9,161,
+ 80, 24,234,236,236, 60,146, 82,218,145,101,217,153, 85,105, 98, 64,  8,113, 10, 13, 13,181,  9, 11, 11, 35, 75,150, 44,  1,  0,
+  8,  4,  2, 24, 12,  6, 48, 12,  3,129, 64,  0, 95, 95, 95,242,226,197, 11, 43, 66,136,147, 49,213,133, 54,158,173,186, 54,105,
+211,177, 89,139,144,122,204, 79,251,159,193,192, 26,192, 35,122,240,  9, 11, 86, 39,134, 88,200, 67,109,255, 32, 94,116,196,195,
+ 16, 27,239,118, 93,179, 98,206, 28, 49, 70,179, 99,215,110,205,253,124,106, 51, 43, 15, 62, 71, 94,242, 19, 67,114,212,229, 44,
+134,199,192, 47,176,181, 77,237, 58, 13,120, 13, 66,194,  4, 41,113, 17,173,172,188, 90,182,205,121,118,137, 51, 21, 28, 85, 55,
+ 88,132, 16, 74, 41,125,245,101, 53,123, 29,157,109, 99, 73,220, 35, 31, 63,100, 18,211, 52,197, 15, 31, 62,132,181,181, 53,236,
+236,236, 96,102,102,134,232,232,104,156, 61,123, 22, 49, 49, 49,160,148,162, 65,131,  6, 85, 58,112,122, 90, 26,178,115, 10,223,
+ 91,243, 68, 44,197,130,209, 37,201,174,225,232,136, 26,142,142,252,172,220, 60,220,120,248,200,239,200,111,109,125,210,153,145,
+ 91,148, 74,229,171,237,117,186,143,175,214,197,222,222, 94,255,213, 87, 95,231,124,185, 54,174,214,128,214, 78,188,238,161, 14,
+ 56,120, 61,149,183,231, 34,143,206,254,162, 94,230,179,103, 79,141, 62,105,145, 72,244,125,167, 78,157,190,161,148, 10,198,143,
+ 31, 15,  0, 24, 58,116,104,193,205,155, 55,107, 83, 74, 51,  8, 33, 78, 95,124,241,197,211, 11, 23, 46,200, 38, 78,156,200,211,
+235,245,145,124, 62,159, 18, 66,230, 83, 74,231,190, 53,147,241,249,247, 31, 60,120,224, 14, 19, 55,216,152,242,208, 97,214, 61,
+  0,128,137, 24,200, 76, 75,194,173, 71, 23, 97,109,109,109,222,188,121,243, 40, 47, 47, 47,117,106,106,234,248,226,226,226,173,
+ 21,102, 92, 62, 63, 34, 60, 60,220,197,197,197,165,196, 96,101, 41,177,229,  6,  3,133, 90, 10, 64, 10,194,202, 97,102,231,110,
+ 90, 91, 91,240,192,214,214, 86,171,209,104,166, 23, 20, 20, 84, 88,213,195,227,241, 50, 30, 63,126,108,234,234,234, 10,  0,186,
+131,  7, 15,242, 53, 26, 13, 40,165,134, 99,199,142,117, 76, 76, 76,108,224,225,225,193,184,184,184, 76,247,242,242, 82, 38, 39,
+ 39,143, 80, 42,149,239,172, 66, 57, 57,206, 83,219,114,238,197,181,121,113,137,191,  3,128,115,136, 95,206,209,185, 13, 53, 45,
+231, 22, 85,186,238,228, 56, 79, 45,198,254,109,237,  4,135,125,251,237,183,126, 86, 86, 86, 24, 53,106, 20,230,205,155,135,217,
+179,103,123,141, 26, 53,234, 75,  0,203,171,240,146,149, 58, 56, 56,220, 89,185,114,165,111,211,166, 77,113,252,248,113,236,222,
+189, 27, 47, 94,188,208,123,120,120,240, 67, 66, 66, 48,103,206, 28,116,232,208, 97,196,216,177, 99, 91, 18, 66, 26, 26,105, 58,
+ 62,159, 51,103, 78,247,102,205,154,225,179,207, 62, 83, 95,188,120,177, 31,128,211,103,206,156,105,125,233,210,165,253, 59,119,
+238,148, 46, 90,180,168,237,164, 73,147, 70,  1, 88, 93,141,243,239,209,162, 69, 11,  0, 64,179,102,205,176,116,233,210, 14,239,
+ 99,176,  8, 33, 34,107,107,235, 99,219,182,109,107,224,237,237,141,193,131,  7, 55,236,215,175,223, 49, 66, 72, 59, 74,169, 81,
+243, 70, 58, 58, 58,254,176, 97,195,  6, 79,169, 84,106,244,113, 53, 26,141,213,200,145, 35,151,  0, 48,202, 96,177, 44,219, 56,
+ 32, 32,  0,  7, 15, 30,196,200,145, 35,225,231,231, 87,175, 65,131,  6,235,  7, 13, 26,132, 81,163, 70,181,177,181,181,181, 47,
+157, 92,188,242, 23, 11,159,239,209,165, 75, 23,193,159,127,254,  9,  0,104,209,162,  5,218,182,109,139,199,143, 31,227,234,213,
+171,224,241,120,144,203,229,104,218,180,169, 40, 37, 37,197,  3, 64,165,  6,139, 17,203,134,117,239,210,217,244,240,205, 84, 24,
+ 88, 61,130, 60,205, 16,226,107,135,232,164,  2,132, 63, 73,130, 65, 35,132,153,149, 53, 66, 91,182,183, 74, 75,126, 49, 12,198,
+ 52, 15, 16,203,134,245,234,254,137,201,225, 27, 41,200, 75,137,162,207,110, 31, 56,175, 83, 21,143,  0,128,187,231,246,172,119,
+176,150,182,171, 29, 24,196, 11,107,215,205,242,207,221,105,195,  0,112,  6,139,227,253, 34, 88,101,100,231, 65,105,237,224,135,
+196,180,251, 37,255,207,206, 70,118,118, 54,106,214,172,137, 85,171, 86,189,182,173, 74,165,170, 86,  2,254, 27,154, 54,150, 22,
+232,214,170, 37,239,113,244, 58,158,146, 85,126, 16,205,127, 42,165,147,150, 50,  9, 89, 58,139,204,124,173,176,127, 43, 87, 42,
+224, 49, 24,208,170,  6,249,229, 72,130, 48,163, 88, 96,193, 48, 76,  2,203, 86,222,145,144, 16, 34,232,222,189,251, 55,123,247,
+238, 21, 68, 69, 69,161, 86,173, 90,208,106,181,184,121,243,102, 18,165, 52,163,244,120, 41, 60, 30, 47,133,101, 89,175,250,245,
+235, 99,241,226,197,240,245,245, 37,157, 59,119,158, 86,106,178,254,114,160,148,148,148, 69, 95,127,253,117,139, 95,183,236,177,
+ 30,220,152,160,176, 80, 13,133, 66,129,232,199,119, 80,156, 94,140,245,235, 55, 64, 38,147, 17,  0,194,180,180, 52,225,164, 73,
+ 19, 55,186,184,184,116, 73, 74, 74,234,245,174,180,166,164,164, 44, 28, 59,118,108,200,246,237,219, 45, 75,218, 93, 41, 81,168,
+ 20,227,214,207, 37, 17,202,144, 73,183,241,219,175, 27,153,186,238,114,235,194,194, 66,140, 24, 49, 98,165,163,163, 99,211,212,
+212,212,145,239,210, 76, 77, 77,189, 50, 98,196,  8,231,223,127,255, 93,226,229,229, 21,147,159,159,143,156,156, 28,102,231,206,
+157, 99, 29, 29, 29,205, 15, 30, 60, 68,228,114, 57,  0,240,226,227,227,133, 95,127,253,213, 94,  7,  7,135,157,105,105,105,159,
+189,235,222,  0, 80, 19,130, 84, 39,167,154,158,138, 27,204, 92, 39, 39,213,213,139,115,146,183, 19,130,212,146,109, 64, 29, 55,
+ 56, 14,122,185, 77,220, 76,173,102, 87,164,165, 37,196, 80, 10,138, 57,127, 95, 39, 12, 27, 27,155,177,221,187,119,199,146, 37,
+ 75,112,228,200,145, 73, 86, 86, 86, 63,207,155, 55, 15, 78, 78, 78, 95, 19, 66, 86, 84, 97,178,219, 31,151, 47, 95,238,235,235,
+235,139,161, 67,135,106,206,158, 61,251, 45,128,131,  0, 18,174, 92,185, 82, 99,235,214,173, 93,247,238,221,187,100,229,202,149,
+146,213,171, 87,123,246,238,221,123,  5,128, 47,140,248,160,152, 56,112,224, 64, 44, 91,182, 12, 23, 47, 94,236, 77, 41, 61, 94,
+246,189, 69,  8,233,186,104,209,162,115,179,102,205,194,242,229,203,199, 87,213, 96, 17, 66, 76,252,252,252,190,235,216,177, 35,
+174, 92,185,130,230,205,155, 35, 52, 52,116, 18, 33,100, 21,165, 52,171, 26,230,138, 49, 49, 49,217,187,101,203,150,230,238,238,
+238, 88,184,112, 33,190,249,230, 27,108,218,180,169,249,224,193,131,247, 18, 66,122, 25,211,203,215,196,196,196, 68, 42,149, 98,
+201,146, 37,244,229,203,151,185, 70, 24, 50,203,239,190,251,142,152, 87, 86,181,240,159,  8,153, 84, 44, 22, 55,241,241,241,193,
+ 79, 63,253,132, 43, 87,174, 96,220,184,113,240,241,241, 65, 82, 82, 18,186,117,235, 38,123,250,244,105, 31,  0, 91,140, 44,151,
+204,173,173,173,145,145,145,  1,129, 64,128,166, 77,155,226,224,193,131, 80,171,213,176,179,179, 67, 94, 94,222,171,218,  4, 62,
+159,111,110,100,105, 23, 96, 99,101,142,140,136,100,240,161, 71, 96,109, 27, 92,120,156, 13,173,142,133,157,181,  5,210, 50,210,
+209, 56,192,  5, 26, 77, 13, 80,202, 26, 53, 19,136,136,199,  4,138, 37, 82,228, 20,102, 33,249,201,197,108,173, 65, 61, 50,239,
+197,213, 68,  0,176,170,213, 98,228,221,171,103,238,246,253,164,133, 93, 81,177, 43,  8,101, 27,129,131,163, 10, 84, 58,208,232,
+219, 94,204,229, 35, 66,101,104,181,218,247, 74,200,127, 67,243,109,252, 55, 52,255,  1, 38,139,117,182,228,231,203, 37,140,254,
+ 76,120,134, 65,167, 55,224,212,221, 52,131, 76, 76,244,150, 98, 77,  1,203,178,148, 16, 66,141,208,209,157, 58,117,106,219,184,
+113,227,240,243,207, 63,227,233,211,167, 16, 10,133,  8,  8,  8,112, 44,107, 31, 69,  8, 49, 15, 12, 12,180, 99, 24,  6,209,209,
+209,248,233,167,159,240,249,231,159,211,235,215,175,111,122,215,139,130, 82,122, 63, 53, 53,117,195,148,241, 35,243, 24, 69, 34,
+228, 52, 11,218,156,167, 96,149,153,248,118,206, 34,196,101,179,184,247,162, 16,247, 94, 20, 34, 75, 35,199, 79,191,108,230,249,
+251,251,119, 21,  8,  4, 29, 42, 72,235,205,212,212,212,109, 19, 39, 78,204,203,200,200,120,101,156,181,122, 22, 90,253,235,201,
+ 48, 53, 53,197,250,245,235, 45, 92, 93, 93,251,  8,  4,130, 86, 21,104, 38,167,164,164, 60, 26, 51,102,140, 58, 53, 53, 21,249,
+249,249, 56,125,250,116, 59, 23, 23, 23,243,185,139,150,147,184,108,250, 42,157, 69,196, 26,155,119,254,201,171, 93,187,246,167,
+  2,129, 32,180,226,151,151,179,167,159, 95,173,125, 55,111,222,252,204,211,211,115, 76,153,177,162, 20, 20,  0, 60, 60, 60, 70,
+133,135,135,127,222,160, 65,157,125,246,246, 14, 62,127,103, 94, 34,132,180,234,223,191,191, 15,203,178,216,183,111,223, 35, 74,
+233,242,  3,  7, 14,220, 81,171,213, 24, 48, 96,128,  7,128,142, 70,234,  4,127,250,233,167, 99,154, 55,111,142,  9, 19, 38,104,
+207,158, 61, 27, 72, 41,253,153, 82, 26, 79, 75, 72,160,148,174,186,116,233, 82,253,177, 99,199,170, 27, 53,106,132,207, 62,251,
+236,115, 66, 72,243, 74,116,155, 12, 28, 56,208,151,101, 89,236,217,179,231, 97, 57,115, 85,118, 15,207,239,223,191,255,166, 70,
+163,193,160, 65,131,106, 18, 66, 90, 87,225,220,133, 98,177,120,223,130,  5, 11, 44,146,147,147, 49,100,200, 16,117,116,116, 52,
+230,206,157, 43, 53, 55, 55, 63, 94, 81, 27,193,119,  6, 72,196,226, 95,215,173, 91,215,189,110,221,186, 24, 61,122,180,102,237,
+218,181,227,198,140, 25,163,  9, 12, 12,196,154, 53,107,186,139, 68,162, 95,171, 20,249, 79, 79,207,187,120,241,162,117,101, 75,
+ 90, 90, 90,186,145,209,111,153,151,151,215,141,218,181,107, 23,248,249,249,  5,233,245,122, 60,125,250,244,249, 31,127,252,193,
+250,248,248, 96,235,214,173, 88,191,126, 61,218,180,105,  3,134, 97,250, 84, 37,173,197,197,197,144, 72, 36, 16, 10,133,  8, 15,
+ 15,135, 90,173,134, 76, 38,131, 68, 34,  1,143,199,131,133,133,  5, 76, 77, 77,  1,128, 26,119,127, 64, 11, 20, 58,  8,  4, 12,
+248, 12,139,168,132,124,104,117, 44, 36, 66, 30,  4,124,  2, 80, 22, 22,114,  1, 36, 34, 30, 24, 66, 88, 35, 53,145, 95,172,133,
+ 72,200, 64, 32, 20, 17, 70,111,120, 21, 34,100,248,  6,169, 84, 42, 34, 54,102, 98, 72,132,220,152,220, 28, 31, 56,130,  5,  0,
+  6,195, 95,123,233,190, 45, 10,164,209,104,222, 43, 33,255, 13,205,119,132,205, 63,170, 27, 88, 80, 80,192,191,113,227,134,169,
+ 80, 40, 20,119,111, 16,146,181,244,247,167,182,243,118,198, 64,204,  7,233,228, 79,211, 79, 28, 63, 34, 42, 44, 44,180,241,241,
+241,201, 54,242, 62,140, 32,132, 44,  4, 80,135,207,231, 31,221,178,101, 11,217,177, 99,135,229,192,129,  3, 99,  9, 33,201,254,
+254,254,110, 91,182,108, 49,  3,128, 85,171, 86,209,189,123,247,118,  0, 16, 65, 41, 77,171, 72, 55, 53, 53,117,150, 88, 44,190,
+ 30, 29, 29,189, 74, 32, 16, 88,152,153,153, 89, 94,186,116,137,164,231,107,241,221,246, 23,175,122, 22,202,197, 60,204,232,101,
+135, 97,195, 62,231, 71, 70, 70,254,  8,224,212,187, 52,147,147,147, 39,201,100,178, 75,143, 30, 61, 90,110,234, 92,207,202, 38,
+116,146, 89,235, 25, 37,213,143, 14,150, 34, 48,165,101, 98, 94, 94, 30,178,178,178, 48,105,210, 36,139,201,147, 39, 79,  5,112,
+161,130,116,158, 22,139,197,  9, 17, 17, 17,237,249,124,190,216,196,196,164,193,141, 27, 55,200,203, 60, 29,102,108,125,142, 66,
+ 85, 73,109,171,169, 68,128,121,  3, 93, 48,118,236, 88,126,108,108,236, 15,  0,154,189, 77,207,217,217,217,203,207,207,111,223,
+174, 93,187,252, 86,172, 88,145,243,236,217,179, 98, 39, 39,167,121,111,108,166, 94,188,120,113,246,246,237,219,189,135, 12, 25,
+178,207,193,193,161,223,123, 12,169,241, 94,152,153,153, 45, 25, 57,114, 36,246,238,221,139,220,220,220, 21,165,121,108,249,174,
+ 93,187,246,140, 24, 49,  2,219,183,111, 95, 66,  8, 57,105, 68, 20,171,211,128,  1,  3,112,226,196,  9,156, 59,119,238, 59, 74,
+105,228, 59, 76,237, 83, 66,200,180, 67,135, 14,173, 28, 56,112, 32, 54,111,222,220, 17, 64, 69,  3,207,182,235,208,161,  3,142,
+ 31, 63,142,236,236,236, 53,111,219, 32, 47, 47,111,237,225,195,135, 27,119,232,208,  1,139, 23, 47,110,  7,224,188, 17,230,202,
+215,220,220,124,203,202,149, 43,131,235,214,173,139, 79, 63,253, 84,165,213,106, 59,126,243,205, 55, 71,118,239,222,109,186,109,
+219,182,160, 47,191,252,242, 22, 33,100,184,177,131,216,242,120,188, 69,171, 87,175,254, 34, 44, 44, 12,147, 38, 77,210,159, 58,
+117,170, 27,165,244, 52, 33, 36,118,234,212,169,199,126,250,233, 39,222,178,101,203,190,224,241,120,153,  6,131,225,219,191,229,
+ 11,155, 97, 22,204,159, 63,191,113,139, 22, 45,144,144,144,128,123,247,238, 65,175,215,111,191,123,247,238,229, 22, 45, 90, 44,
+208,106,181, 71, 36, 18,201, 80, 19, 19, 19,127,127,127,255,214,246,246,246,178,244,244,116,133, 17,215, 51, 47, 54, 54, 86,110,
+103,103,  7,129, 64,128,135, 15, 31,194,206,174,100,202,215,140,140, 12,  4,  4,  4,128,199,227, 33, 47, 47, 15,  0,242,141, 51,
+ 67,204,163,216,248,148,154, 86,166,114,192, 32,193,253,232, 36,216,218, 88,194, 64, 24,164,165,165,162,129,143, 11,  8, 33,200,
+203, 78,  3, 33,196,168,185,116, 13,148, 13,127,153,146,225,108,109, 42, 70,221,198,237,173,111,156,204,220, 97, 94,171,217,151,
+124, 30,225,137, 37,102, 27,190,248,236, 51, 27,150,165,200,203, 78,  7,159, 97,110,115,150,129,227,131, 26, 44,150,101, 33,149,
+ 74, 95,139, 48,189, 25,  5,146, 74,165, 80,171,213, 85, 58,176, 84, 42,133, 86,143, 15,170,105,204, 49, 63,180,230,223,137, 94,
+175, 55,157, 60,121,114, 72, 72, 72, 72,114,155, 54,109,226,188,189,173, 18,187, 52,150,218,172,220,116,160, 65,231,150,117,239,
+229,229,100,100,189, 48, 51, 83,199,199,199,219,253,246,219,111, 33, 58,157, 78,102,100, 68,236, 37,128,151,132,144,181, 29, 59,
+118,252,170,111,223,190,136,140,140,180, 83, 40, 20,118, 50, 89,137,196,142, 29, 59,176,119,239,222,159, 41,165, 70, 15,188,169,
+ 86,171, 79,  2,240, 36,132, 88,212,168, 81, 35,221,202,202, 74,152, 90, 84,252,170,103,161,144,207,160,233, 55,119,144,155, 87,
+  0, 27, 27, 27,152,154,154,122, 84,166, 89, 58,206,213, 17,175,118, 83,235, 41, 31,109,184,184,117,203, 22,115,  0,224, 49,  4,
+182,230, 66,228,229,229, 33, 51, 51, 19, 89, 89, 89, 96, 24,  6,122,189,222,207,136,116, 62,  5,240,148, 16,226,212,186,117,235,
+  5,166,166,166, 96,115,138,145, 91,164,125,173, 10,178,168, 72,  1,119,119,119,152,154,154,190,181, 58,194,202,202,202, 84, 44,
+ 22,111,221,184,113,163,175,169,169, 41,111,196,136, 17, 22, 35, 70,140,104,246, 46, 51, 38,147,201,120,155, 55,111,174,221,160,
+ 65,131, 45,238,238,238,237,226,227,227,243,255, 87,121,169,116,200,131, 81, 83,166, 76,  9,146, 72, 36,248,229,151, 95, 94,  0,
+216, 89,250,243,190,181,107,215,206, 30, 56,112,160,207,184,113,227,252,103,205,154, 53,169,180,170,240,157, 99, 36,  9,133,194,
+ 64, 63, 63, 63, 28, 56,112,  0,  0, 14, 84,114,248,253,215,175, 95, 95,217,165, 75, 23, 72, 36,146,224, 74,182,245,112,117,117,
+197,161, 67,135,  0,224,254, 59,182,185, 31, 29, 29,141, 94,189,122,129, 16,226, 97,196,185,119,111,223,190,253,254,197,139, 23,
+243, 77, 77, 77,241,197, 23, 95,104,110,221,186,213,153, 82,122,153, 16,210,106,208,160, 65,151,118,238,220, 41,191,116,233,146,
+239,247,223,127,127,157,199,227, 45, 50, 24, 12,179, 42,209,252,124,225,194,133, 51,122,244,232,129,121,243,230,209,223,127,255,
+253, 83, 74,233,233,210,231,235, 20, 33,100,136,165,165,229,206,153, 51,103,146,252,252,252, 25,132,144, 36, 74,233,186, 10,242,
+121,190,193, 96,112, 80, 40, 20, 70,125, 33, 26,187,189,181,181,117,167, 22, 45, 90,224,199, 31,127,196,184,113,227,176,117,235,
+ 86, 10,224,104,106,106,234, 67,  0, 45, 74, 34,176, 78,166,225,225,225,254,205,155, 55, 23, 62,122,244,232, 19,  0,191, 27, 81,
+ 54,197, 95,184,112,193,174,115,231,206, 66,153, 76,  6,131,193,128,236,236,108,168, 84, 42,  4,  4,  4,160,113,227,198,200,200,
+200,192,209,163, 71,181,121,121,121,241, 70,149,119,154,226,109,103,142,253,217,170,235,128,145,230, 82, 33, 15,  6,157,  8,233,
+233,153, 40, 52,232, 17,232,231,134,230, 13,106, 32, 33, 93,137, 83, 71,255,204, 45, 44, 84,108, 51, 70, 83,167, 86,108, 57,123,
+242, 72,203,230,157,  6,153,203,125,252,225,225, 56,174,193,221,235,103,207, 72, 68,  2, 50,104, 96, 63,139,166, 13,189,240,240,
+ 69,  1, 78, 28, 61,144,155, 95, 80,176,  5, 28, 28,213, 49, 88,229, 27,184,151, 35, 99,210,164, 73,118,147, 39, 79,134,153,153,
+ 25,178,179,179,161,211,233, 94, 69,155,196, 98, 49, 44, 44, 44,144,157,157,141, 61,123,246,  0, 64, 70,197, 95,116,162,212,133,
+107, 86,187, 18,158, 92, 35,150,202,168,149,236,253, 53,  1, 64,163,227,103,172,219,243,135, 85,167, 22,161,252, 26,142,142,111,
+ 11,211, 87, 89,243,255,  3, 90,173,246,116, 92, 92, 92,240,128,  1,  3, 50, 93, 93, 93,149, 42,149, 10, 74,165,178,240,232,238,
+149,181,156,205, 70,191, 96, 24,134,154,154,154,178,118,118,118,249,231,206,157,179,211,235,245, 23,171,120,136, 73,253,250,245,
+ 99,206,158, 61, 59,106,204,152, 49,196,203,203, 11,225,225,225,248,229,151, 95,232,182,109,219, 86,  2,152, 94,205,164, 23,169,
+213,234,215, 34, 32,229,123, 22, 22, 21, 21, 65,163, 76,135,174, 10, 61, 18, 98,207,254, 24, 93,179,102, 77,157,191,219,127,134,
+ 19,201,205,205, 69,102, 86,214, 43,131,149,153,153,  9,  0, 85,  9, 97, 22,252, 53,157,255,169,121, 40, 46, 46,134, 74,145,  6,
+131,193,240, 86,205,156,156,156, 66, 39, 39,167,213,171, 86,173,250,105,193,130,  5,118,203,151, 47,207,137,138,138, 42, 96, 24,
+ 70,245,198, 71,140,196,211,211,211,116,217,178,101,246,171, 86,173,202, 97, 89,118,245,255,216, 92,245,168, 91,183,238,214, 78,
+157, 58,153,142, 25, 51,  6,171, 86,173, 66,106,106,234,116, 74,169,190,180,108, 96,  9, 33, 83,215,172, 89,115,116,218,180,105,
+208,106,181,203,142, 31, 63, 62,143, 16, 50,138, 82,186,243,109,154,182,182,182, 46,124, 62, 31,247,238,221, 43,160,148, 62,175,
+196,208,167,121,123,123,167, 19, 66,236, 29, 29, 29,107, 85,180,173,149,149,149,167,169,169, 41,146,147,147,  1, 32,238, 29,155,
+197,167,164,164, 80,145, 72, 68,156,156,156,188, 42, 59,127, 75, 75,203,169, 27, 55,110,228, 95,184,112,  1,115,230,204, 73, 74,
+ 72, 72, 24, 68, 41,189, 82,154,182,123,132,144,230,173, 90,181,218, 61,109,218, 52,239, 31,126,248,129, 68, 71, 71,143,198, 59,
+134, 40, 41,195,205,205,109,212,231,159,127,142,213,171, 87, 99,195,134, 13,163, 41,165,251,222, 56,231,221,132, 16, 75,107,107,
+235,213, 35, 71,142,196,150, 45, 91,  6,  1, 88, 87, 65,180,118, 90,255,254,253,103,231,228,228, 44, 50,230,158, 26,179,189,179,
+179,115,171,214,173, 91,123,170, 84, 42,236,219,183,239,249,254,253,251,115, 13,  6,195,158, 82,115, 85, 62,127, 28, 60,121,242,
+228,236,169, 83,167,226,194,133, 11, 91,156,156,156,120, 41, 41, 41,187, 43,185,167, 41, 18,137, 36,235,225,195,135, 14,190,190,
+190,140,163,163, 35, 26, 53,106,  4, 11, 11, 11,240,120, 60,100,100,100,224,242,229,203,108,108,108,108,150,177,  3,142,102,197,
+ 92, 56,226, 80,183,243,181,123,183, 46,183,247,111,216, 84,224,108, 99,133, 80,127,103, 88,152,  8, 65,  0, 36,100, 40,113,254,
+252, 25, 93, 92,220,243, 27,198,244, 32, 44,211,116,170,247,201,117, 11,187, 26,237,235, 52,104,202,175,229, 83, 27,237, 91,212,
+183,180,148, 11,193, 82,138,135, 47,242,113,230,244, 73, 93, 74, 82,226,  5,174,  7, 33,199,135,142, 96,205,221,176, 97, 67,211,
+ 77,155, 54,117,153, 52,105,146,233,208,161, 67, 33,149, 74, 81, 92, 92, 12, 87, 87, 87,232,245,122, 28, 63,126, 28,247,238,221,
+ 43,100, 89,246, 40,128,107,111, 60,152,  1,229,199,173,154,177, 74, 81,163,100,240,202,226,166,243, 54,212,251, 32,154,  0,112,
+253,133,222,217, 41, 53,107,110,118,238,241,137,110,206,142,194, 14,205, 26,243,109, 44, 75,122, 51, 27,169,217,246, 67,143,233,
+241,191,208,212,235,245, 95, 16, 66,252,167, 78,157,186,212,217,217,217,105,222,188,121, 47,235,212,169,163, 44, 40, 40,160, 26,
+141,134,205,202,202,146,237,219,183,207, 35, 59, 59,187, 80,167,211, 13,161,148, 62,172, 74, 58, 41,165, 90,  0, 99,  8, 33,135,
+243,243,243, 79,125,243,205, 55,248,254,251,239,113,228,200,145,230,148,210,107,213, 61,119, 74,169,222,195,195, 35,239,254,253,
+251,246, 34,235,218,176,183, 16,162,227,119, 37,193,  8, 83, 49,129,178,184, 16, 81,143, 31,162,160,160,224,110, 21, 52, 53,206,
+206,206,249,233,233,233, 54,246,246,246, 37,230, 42, 51,243,149,185,202,201,201, 65,118,118, 54, 45,127,239,141,208, 44,246,244,
+244, 84, 68, 69, 69,137,120, 50, 87, 56, 88,138, 81, 82,  5, 73, 97,107,202, 71,113,113, 33,158,220,188,129,252,252,252,139,239,
+210, 76, 73, 73,217,227,228,228,  4,  0, 63,205,158, 61,219,166, 99,199,142,207,110,223,190,221,178,252,113,  2,  3,  3, 15,206,
+155, 55,239,147,239,191,255, 62,107,235,214,173,211, 82, 83, 83,119,252, 47,243,146,181,181,245,228, 99,199,142,153,106,181, 90,
+172, 90,181, 10, 63,255,252,243, 38, 74,233, 31,111, 92,139, 99, 60, 30,111, 13,195, 48, 95,125,253,245,215, 24, 57,114,164, 44,
+ 40, 40,104, 82,185, 40,215,107,154,201,201,201,179,  2,  3,  3,103,103,100,100, 24,101,  8,158, 62,125,250,101, 96, 96,224,172,
+140,140,140,165, 21,157,187, 92, 46,151, 27, 12,  6,196,197,197,229, 82, 74,243,223,113,223, 84,181,107,215, 78, 54, 24, 12, 46,
+ 50,153,204,170,178,252,153,155,155,187, 40, 40, 40,104,110,122,122,250,105,  0, 11,223, 28,114,132, 82,250,128, 16,226, 63,126,
+252,248,177, 75,150, 44,233,149,150,150,182,167, 50,205,132,132,132, 69,173, 90,181,250, 46, 38, 38,102, 43,165,116,195, 59,210,
+249, 11, 33, 68,187, 99,199,142,209,113,113,113,139, 43,210, 76, 73, 73, 57, 10,224,168,177,247,247, 93,219,151,215,100, 24,102,
+234,140, 25, 51,152,157, 59,119,  2,192,178,164,164,164, 13,239, 48,107, 15,157,157,157,183,  5,  5,  5, 13, 93,183,110,157,164,
+ 77,155, 54, 35,  1,236,174, 44,127,170,213,234,155,215,175, 95,111, 28, 31, 31,111,211,170, 85, 43, 33,  0, 20, 20, 20, 32, 47,
+ 47, 15, 71,143, 30,213,198,198,198,102, 21, 23, 23,223,172, 74, 25,162,215, 20, 12,188,126,254,208,238,248,167,143, 67,195, 58,
+118,183,212,104, 93, 32,206,230, 33, 47, 59, 13, 39,143,254,153, 27, 23,247,252,134, 66,145, 55,176, 42,154, 90,117,254,128, 27,
+ 23, 14,239, 73,138,139,106,220,162, 85,103, 75,149,198, 13, 98, 33,131,236,244,100,156, 60,118, 40, 39, 46,238,197, 21,149, 78,
+253,217,223, 85,206,255,155, 52, 63, 58,104, 89,107,219, 10, 22,  0, 34,  0,159,152,154,154,174,154, 51,103,206,134, 91,183,110,
+109,232,210,165,203,  6,145, 72,180, 10,192, 39,  0, 68,239,216, 47,224,127,169,217,177, 17, 76, 63,239,198,108, 94, 48,154,175,
+ 61,184,220, 71, 55,127, 20,168,145,154,109,141,185, 14, 85, 89,254,215,154,  0,154,  9,  4,130, 27,117,235,214,189, 96,106,106,
+154,233,238,238,126, 69, 32, 16,220,  6,208,226,125,211,  9,192,166,127,255,254,108, 97, 97, 33,237,215,175, 31,  5, 96,254,190,
+154, 98,177,184,117, 88, 88,152,238,101,106, 46,189,242, 32,145, 30,189, 20, 73,119, 29,185, 65, 55,236, 62, 69,151,175,217, 76,
+235,213,171,167,  1,224, 86, 21, 77,145, 72,212, 49, 44, 44, 44, 47, 43, 43,139, 70, 71, 71,211,203,151, 47,211,253,251,247,211,
+ 13, 27, 54,208,181,107,215, 82, 39, 39,167,108,  0, 78, 85,209,148, 74,165,221, 59,118,236,168, 79,206, 44,162, 55, 35,211,232,
+217, 91,207,233,193,115, 15,233,158,163, 55,232,166, 29,127, 80, 95, 95, 95, 21,  0,251,202, 52, 29, 29, 29,251,247,235,215,239,
+153,183,183,247,250, 55,127,243,242,242, 90,211,175, 95,191,  4, 39, 39,167, 33,127, 71, 94,  2,208,209,217,217, 57, 90, 40, 20,
+ 30,  3, 48,164,146,253,  6,240,249,252, 35, 14, 14, 14,119,  0,244,252, 95,231,121,  0, 93,236,236,236,110,  2,232, 86,201,126,
+101,219,245,248, 24,159,247, 15,161,233,228,228,212,218,213,213,245,178,147,147,211,204,202,246,243,243,243, 19, 58, 56, 56, 44,
+112,118,118, 62,238,232,232,216,166, 42,233,  4,224,100, 98, 98,210,204,196,196,164,171,137,137, 73, 87, 11, 11,139,102,229,159,
+195,234,156,187,117,237,182, 93,107, 52,236,118,208,181,254, 39,  9, 53, 26,116, 73,240,  8,236,126,208,186,118,219,174,239,171,
+233, 22,216,253, 80,141,  6, 93, 94,214,104,208, 53,190,102,112,247,131, 54, 62,109, 59,125,108,247,253,159,172,249,177, 45, 70,
+111,216,167,164,229,138,  9,128,  1, 12,195,252,  2, 96,  0,  0,147, 74,110, 64,128, 17, 55,233,131,107,118,108,  9,231, 49,125,
+120,199,167,127, 38,200, 52, 82,243,163,201,208,  0,186,243,249,252,235,  0,186,127,200,116,154,153,153,109,236,219,183,175, 65,
+ 32, 16,172,254, 80,154,214,214,214, 63,133,134,134,106, 87,174, 92, 73, 15, 28, 56, 64, 55,108,216, 64,199,142, 29, 75,  3,  2,
+  2,212, 86, 86, 86,159, 85, 71,211,193,193, 97, 97,221,186,117,115,118,236,216, 65,247,236,217, 67, 87,175, 94, 77,231,206,157,
+203,214,168, 81, 35,211,202,202,170, 91,117, 52,237,236,236,126,109,214,172,153,246,215, 95,127,165,103,206,156,161,187,118,237,
+162,147, 39, 79,166,126,126,126, 42,185, 92,222,219, 88,205, 90,181,106,137,222,245, 91,195,134, 13,  5, 92,129,203,105,114,154,
+156, 38,103,176, 62,158,133,111,108,164,107, 95, 36, 69,239, 58,164,136,  0,123,254,120,194,238,239,229,  7,253, 31,145,239, 63,
+ 86, 79,205,154, 53,139,  8, 33,123,158, 63,127,190,223,205,205, 77, 31, 31, 31,255,222,154, 39, 46,210,228,246, 30,164,243,153,
+120,  3, 31,128,222,248, 97,123, 62,138,136,228, 33,  0,135, 62,180,110,126,126,254,112, 66,200, 56, 74,169,242, 67,105,102,101,
+101, 77, 38,132,236,120,254,252,249, 50,185, 92,222,192, 96, 48,232, 84, 42,213,213,204,204,204, 73,148,210,196,234,104,166,166,
+166,206, 34,132, 28,152, 62,125,250,116,  0,245,  8, 33, 26,157, 78,119, 61, 35, 35, 99, 62,165, 52,181, 58,154,233,233,233, 95,
+ 10,133,194,205,177,177,177,139,165, 82,105, 61,150,101, 53, 10,133,226, 98, 86, 86,214, 68, 74,105,186,177, 58,177,177,177,239,
+108,255, 21, 30, 30,206,205, 59,200,193,193,193,241, 47,106,131,245, 26,127, 68, 82,244,170, 75,208, 51,  0,250, 63, 30,125, 24,
+211,242,252,249,171,246,175, 31,116,106,144,211,113,244,131,107,114,213,201, 31,206, 92,149,211,124,  8,160,205,  7,214,188, 15,
+160,239,135,212,212,106,181,183,  0,132,113,185,128,131,131,131,131,227,131, 27, 44,  0,248,243, 17,229,174, 26,  7,  7,  7,  7,
+  7,  7,  7, 71,  5, 16,  0,  1,239,136,  2, 60, 54, 90,132,144,128,170, 30,184, 50,253,255,177,166, 93,  5,154,103, 43,209,108,
+ 91,141,116,114,154,156, 38,167,201,105,114,154,156,230,191, 82,179, 50,237,143,166,119,226,127,181,  5,189, 17, 13,210,255, 33,
+154, 92, 67, 69, 78,147,211,228, 52, 57, 77, 78,147,211,228, 26,185,127,176,133,155, 96,137,131,131,131,131,131,131,131,227,  3,
+195, 25, 44, 14, 14, 14, 14, 14, 14, 14, 14,206, 96,113,112,112,112,112,112,112,112,112,  6,139,131,131,131,131,131,131,131,131,
+ 51, 88, 31, 16,187,255, 39,154, 28, 28, 28, 28, 28, 28, 28, 28, 31, 12,242,111, 26,229,156,131,131,131,131,131,131,131,227,127,
+  1, 87, 69,200,193,193,193,193,193,193,193,193, 25, 44, 14, 14, 14, 14, 14, 14, 14, 14,206, 96,113,112,112,112,112,112,112,112,
+112,  6,139,131,131,131,131,131,131,131,131,131, 51, 88, 28, 28, 28, 28, 28, 28, 28, 28,156,193,226,224,224,224,224,224,224,224,
+224, 12, 22,  7,  7,  7,  7,  7,  7,  7,  7,199,223,111,176,  8, 33,109, 57, 77, 78,147,211,228, 52, 57, 77, 78,147,211,228, 52,
+ 57,131,197,193,193,193,193,193,193,193,193,193, 25, 44, 14, 14, 14, 14, 14, 14, 14, 14,206, 96,113,112,112,112,112,112,112,112,
+112,  6,139,131,131,131,131,131,131,131,131,131, 51, 88, 28, 28, 28, 28, 28, 28, 28, 28,127, 19,  4,192, 91,123,  2, 80, 74,207,
+ 26, 45, 82,141,222,  4,149,233,115,154,156, 38,167,201,105,114,154,156, 38,167,249,241,105, 86,166, 93, 21,255,241,143,134, 82,
+250, 95, 91,  0,180,229, 52, 57, 77, 78,147,211,228, 52, 57, 77, 78,147,211,252,183, 45,124, 46,136,199,193,241,255,156,253,132,
+135, 92, 31, 15, 80,234,  4,158, 40, 21,169,143,158, 99, 14,101,223, 91, 51,189,142, 27,164, 58,123,232, 37,153, 72,127,248,226,
+189, 53, 57, 56, 56, 56,254, 69,112,  6,139,131,227,255, 59,153,190,222,224, 99, 49, 24, 56,130,106, 99, 97, 91,103, 49,128,199,
+239,173, 41,100, 23,194,192,184,128,106, 99, 96,231,179,  4, 64, 36,119,177, 57, 56, 56, 56,140,227,111,105,228, 30, 28, 28, 28,
+ 30, 28, 28,188, 32, 44, 44, 76,204,221,  2,142,255, 22, 97, 97, 97,226,224,224,224,  5, 33, 33, 33,225, 31,237, 73,238,168, 43,
+  3, 99,232,164,209,177,206, 39, 31,229,217, 41,212,  6,111, 48,250,206,216,236,109,242, 94,154,124,210, 94,165,101,107,236,188,
+173,176, 47,214,232,253, 64,241,126,154,165,  4,  4,  4, 88, 52,106,212,232,100,131,  6, 13,108,184, 28,202,193,193,193, 25,172,
+ 15, 12,203,178, 13,237,236,236, 38, 41,149,202,132,160,160,160,110,255,166, 11,222,184,113,227,235,161,161,161,233, 77,154, 52,
+ 73,111,210,164,201,189,202,214,127,140, 56, 57, 57,121,215,173, 91, 55,193,223,223, 63,166,252,122,187,250,189,154,248,181, 24,
+ 58,199,198,191, 71,203,247, 61, 70, 80, 80, 80, 55,149, 74,149, 80,163, 70,141,137,122,189,190,225, 71,123, 49, 85,172, 61, 24,
+ 94,171,136, 84,133, 44,181, 64,103, 31, 30,175, 48,  5,120, 97,208,192,177,218,154,249,172, 61, 64, 91, 63, 72, 82,202,175,231,
+216,218, 95,121,174, 54,  3,195,180,130,138, 56,188,111,114, 69, 34,209,104, 74,105, 59,129, 64, 48,129, 43,126,255,221, 16, 66,
+  2,  8, 33,221,  8, 33,193, 31, 80,243,  7, 95, 95,223,100, 66,200,120,238, 10,115,252,191, 49, 88,125,107,146,166,159,214, 34,
+151,250,215, 36,133,  3,106,145,162, 33,181,200,213, 62, 53, 73,235,234, 30,248,143, 63,254,144,110,223,190,221,174, 78,157, 58,
+123, 66, 66, 66,174,  6,  5,  5,213,174,142, 78,112,112,240,201,224,224,224,190,111,174, 11, 10, 10,234, 95,126, 93,163, 70,141,
+ 34, 26, 53,106,148, 31, 28, 28,252,220, 24,221,192,192,192,103, 65, 65, 65,197,193,193,193,207,222,120,113,247,111,212,168,209,
+201, 55,142,215,247,205,117,239,130,199,227,185, 28, 57,114,196,238,216,177, 99,118,124, 62,223,254,213,141, 96,152,183,174,175,
+198,245, 24, 17, 28, 28,124,253,141,115, 25,254,230,186, 74,204,201,245,192,192,192,225,111,232, 94, 15, 14, 14, 30,241, 33,204,
+ 85,139, 22, 45,174,222,191,127,191,134,169,169,169, 69,249,223, 28,172, 45, 58, 92, 63,186,102,210,103,125,219,143,182,171,211,
+179,110, 53,141, 85,237,198,141, 27, 95,245,244,244,220,179,120,241, 98,187, 57,115,230,200, 62,218,167,119,127, 29, 33,  8,219,
+130,165,212,246, 73,178,202,246,147,110,125,249,247, 19,149,182, 58,131,193, 10,224,133, 97,171,187,184, 90,154,124, 93,115,150,
+ 82,251,115,241,  2,219, 86,253,198,242,206,199,243,109,117,  6,131, 53, 24,180,172,150,230,127,242,161,128,199,227, 77, 26, 57,
+114, 36, 67,  8,249,218,211,211, 83,244,111, 42,108, 67,156,137,115, 27, 47,254,237, 64, 39,210,244,  3, 26, 10,127,185, 92,126,
+151, 16,226,253,255,204, 92, 53,  4, 32,163,148, 30,  6, 96, 79,  8,225,127,  0,205,229,243,231,207,159, 26, 17, 17,225, 84,179,
+102,205,121,132, 16, 30,247,138,231,248,199, 27,172,  1, 53,201, 92,123,  7,231,211, 51,151,239,106,177,241,210, 11,147,181, 71,
+239,203, 39, 78, 91,212,212,193,218,246,200,160, 90,228,135,119,237, 87, 81, 87, 75,145, 72,132, 23, 47, 94, 96,213,170, 85,146,
+185,115,231, 54, 49, 55, 55,127, 24, 18, 18,178,162, 78,157, 58,242,138,210,242,166, 38,165,180,169, 64, 32,216, 24, 18, 18,178,
+165,172,192, 38,132, 52, 21,139,197,191,134,132,132,236, 40,171,134, 12, 12, 12,172,121,251,246,109, 51, 66,136,189, 49,233,108,
+212,168,145,227,221,187,119,101, 64, 73, 36, 32, 44, 44, 76,220,168, 81,163,237,206,206,206, 27,  0, 52,  5,  0, 79, 79, 79, 81,
+ 72, 72,200, 22, 87, 87,215,223,  8,121,189,208,124,215,185, 19, 66, 96, 97, 97,129, 93,187,118,129,199,227,253,101,253,142, 29,
+ 59, 64,  8,169,242,245,172, 83,167,142, 60, 56, 56,248, 15, 71, 71,199, 21, 44,203,134,  2, 64,221,186,117,101,141, 26, 53,218,
+239,226,226,178,178,108,157, 49,154,148,210, 80,161, 80,184,162, 81,163, 70,251,235,214,173, 43,  3,  0,150,101, 67,249,124,254,
+242,224,224,224, 63,170,114,143, 26, 54,108, 56,178, 94,189,122, 41,245,234,213, 75,241,241,241,249,222,222,222,254,226,234,213,
+171,173,203,159,123, 89,228, 42, 61, 35, 59,247,250,157,136,232, 73, 35,251,132,213,112,181, 31,100, 81,191,135,185, 49,231, 94,
+118,254, 33, 33, 33, 43,204,205,205, 31,206,152, 49, 35,116,225,194,133, 18,173, 86, 11,161, 80,136,234,228,207,234,242, 63,213,
+204, 34,118,160,180,109,116,154, 82,226,238, 23, 36,183, 11,234, 13, 59, 51,129,248,198,243, 98, 83, 16,180,129, 86,102, 91, 45,
+ 77,194,111, 19,145,172,148, 90,250,119,150,  5,135,182,  0, 99, 93, 91,124, 49,166,216, 12, 12, 83, 61,205,255,208, 39, 52, 52,
+ 84,212,182,109, 91, 56, 57, 57,241,204,205,205,  7,253,163,174,231,127, 81, 51,196,153, 56,155,154,136,110,253, 52,103, 98,144,
+147,149,236,144, 49, 38,203,136,238,243,254,118,118,118, 23,214,172, 89, 19,104,106,106,122,217, 24,147,245, 79,184,158,165,230,
+ 74, 72, 41,189, 89,186, 42, 18, 64,243,247,212, 92, 62,119,238,220,  9, 51,102,204, 64, 65, 65,  1,134, 13, 27,102,  6,224, 39,
+ 99, 53, 77, 77, 77,189,234,213,171,183,195,223,223,255,101,131,  6, 13, 52,117,234,212, 81,249,248,248,196,  7,  4,  4,108,149,
+ 72, 36, 30, 31,123,254,252,167,104,254,235, 12, 86,191, 90,164,137,141,131,243,212, 31, 14,222,145, 26, 34,239,226,238,103, 45,
+ 17,245, 85,103, 72, 99,194, 49, 99,220,183, 82, 51, 51,203,175,251,214, 34,173,170,115,240,152,152, 24,236,221,187, 23, 54, 54,
+ 54,100,243,230,205,226,190,125,251,142, 54, 51, 51, 75, 12, 14, 14, 30,100,172,  6,143,199, 51,108,217,178,197,164,123,247,238,
+  3,172,172,172, 34,  2,  3,  3,107, 50, 12, 99,216,182,109,155, 73,255,254,253,251,106, 52,154, 39, 65, 65, 65,181,239,221,187,
+103,184,115,231, 14, 24,198,184,160, 93,120,120,184,254,196,137, 19,175,162, 34,148,210, 39, 75,150, 44, 25,112,224,192,  1, 83,
+115,115,115, 54, 48, 48,176,166,171,171,107,196, 15, 63,252, 48,104,255,254,253,166,102,102,102,172,145,  5,  1, 84, 42, 21,164,
+ 82,233,107, 70,138, 16,  2,165, 82,  9,137, 68,242,154,241, 50, 50, 50,224,111,109,109, 29,181,120,241,226,238,  7, 15, 30,148,
+154,154,154, 34, 56, 56,216,207,194,194, 34,122,233,210,165, 61,202,214, 25,139, 80, 40,196,174, 93,187,100,159,126,250,105, 55,
+177, 88, 28, 21, 28, 28,236, 39, 20, 10,177,123,247,110,217,160, 65,131,186,200,100,178, 39,129,129,129,254,198,104,233,116,186,
+217,119,238,220,113,188,116,233,146,163,155,155,219,184,181,107,215,218, 11,  4,  2,  0,128,193, 96,120, 45,114, 53,168, 87,187,
+144,  9,179,215, 92, 80,170,212,154,133,211, 63, 15, 19, 24,208,216,200,168,221, 32, 51, 51,179,196, 47,190,248, 98,204,174, 93,
+187,196, 14, 14, 14, 76,120,120, 56, 10, 11, 11,171,124, 45,255,255, 68,175,  8, 15,124, 67, 67,  0,158,225,241, 74,155,250,109,
+  7,243, 17,123,  4,141, 60, 76,248, 23, 98, 10,237, 40, 67,221,  0,218,  8,243,194,248, 85,210, 20,208,250, 96,216,218,167, 99,
+137, 77,147,206,131,248,  9,  9,  9,240,168, 31,198, 59, 22,  3,123, 74,168,  7, 88,  4, 85, 73,179, 28,  2,129, 96, 78,191,126,
+253,228,  9,  9,  9,104,218,180,169, 76, 36, 18,205,254, 32, 81,188,245, 62,110,216,232,211, 18,155,189, 29,113, 41,236, 31,215,
+113, 39,196,153, 56,155,153,136,110,238,222,189,215,169,110,199, 47,201,134,161,238, 86,182,102,130, 67,239, 19,201, 42, 53, 87,
+231,111,221,186,101,221,190,125,123,204,157, 59,215,214,204,204,236,242, 63, 61,146, 85,222, 92, 17, 66,164,165,213,131,201,  0,
+ 92,222, 67,115,229,220,185,115, 39,204,156, 57, 19, 55,111,222,196,210,165, 75,209,177, 99, 71, 88, 90, 90, 86, 90,126, 12, 25,
+ 50, 68,214,180,105,211,240,110,221,186, 61,152, 56,113,226,160,163, 71,143,186,110,217,178, 69,248,217,103,159,137,251,245,235,
+231, 54,113,226,196,161,157, 59,119,126,220,184,113,227, 91,125,251,246,149, 84, 49,105,124,  0,162,210, 69, 80,146, 84, 66,  8,
+ 33,124, 66,136,128,139,176,113,  6, 11,124,138,249, 95, 78, 94, 32,137,219,250, 51,210,247,254,  2, 94, 94, 58,  4,133,217, 80,
+ 95, 61,  6,221,213,195, 24, 18, 26, 42,149, 18,178,176, 58,  7, 55, 49, 49,129, 80, 40,196,179,103,207, 16, 25, 25,137,206,157,
+ 59, 11, 87,175, 94,109,225,239,239,255,107,211,166, 77, 31,  4,  7,  7,215, 51,198,176,120,121,121, 97,192,128,  1,162,241,227,
+199,215,146, 72, 36,247, 40,165,  2, 15, 15, 15,244,239,223, 95, 56,109,218, 52,119,137, 68,114,135,101, 89,161, 76, 38,123,103,
+116,232,109,186, 82,169, 20,  0,  4,181,107,215,190,187,103,207, 30,143,166, 77,155,242,207,156, 57,131,130,130,  2,190,183,183,
+247,131,221,187,119,123, 54,105,210,132,127,237,218, 53, 20, 23, 23, 83, 99,117, 21, 10,  5, 36, 18,201, 95, 12,150, 66,161,128,
+ 88, 44, 54, 58,141,165,230, 98,132,167,167,231,157, 61,123,246,184, 52,111,222,156,119,241,226, 69, 20, 22, 22,194,205,205,237,
+238,158, 61,123, 92,154, 54,109,202,187,113,227,  6, 10, 11, 11,141,214, 20,137, 68,112,119,119, 71,191,126,253,  4, 83,166, 76,
+113, 17,  8,  4,119, 68, 34, 17,220,220,220,208,175, 95, 63,225,228,201,147, 93, 68, 34,209, 45, 35,171, 12,121,165, 70, 11,253,
+250,245,147,203,100, 50, 36, 38, 38,130,101, 89,176,108,137, 39, 77,205,204,126,116,237,206,227,168, 73,163,250,182, 44, 86,171,
+213,167, 46,222,125, 82,167,182,155, 11, 33,212,189,146,115,175, 23, 18, 18,242, 32, 44, 44,236,183,195,135, 15, 91,180,107,215,
+ 78,112,231,206, 29,188,124,249, 18, 98,177, 24, 38, 38, 38,224,243, 63,210,142,178,  5,117,172,193,162, 93, 66,166, 70, 44,182,
+112, 49, 53,113,244,  6, 94, 94, 70, 77, 91, 49,120, 12, 79,114,231,133, 66, 14,208,118,168,145,101, 93, 53, 77,182,221,139, 12,
+141, 88,103, 21, 96,226,228, 82,  3,217,217,217,112,173,229, 11,149,200, 86,116,253, 89,177,  9, 72, 21, 53, 75,105,208,160, 65,
+115, 87, 87, 87,  7,119,119,119,100,101,101,193,203,203, 11, 38, 38, 38,150,129,129,129,237,170,125, 13,182,186,139, 81,128,166,
+  0,179, 12,  6, 50, 15, 58,254, 98, 60,203,108,136, 95,  3,  5,255, 56,115,181,103,175,179,117, 13, 63,224,216,231,176,183, 16,
+ 99,211,232,134, 86,182,230,226,106,153, 44, 66,136,191,189,189,253,249, 91,183,110,217, 72, 36, 18,220,187,119, 15,117,234,212,
+193,207, 63,255,108,107,105,105,249,143, 53, 89,111,152, 43, 43, 74,169, 18,  0, 11, 96, 32,170,209,235,181,212,172,252,178, 96,
+193,130,113,223,126,251, 45,174, 95,191, 14, 23, 23, 23,100,102,102,162,121,243,230,  9,185,185,185, 21,190,151,252,253,253, 93,
+158, 62,125,154, 60,105,210,164,134, 59,118,236,144,202,100, 50,228,229,229,225,183,223,126,195,140, 25, 51, 64,  8,  1,165, 20,
+155, 55,111,150, 13, 27, 54,172, 81,108,108,108,178,187,187,187, 49,205, 55,  8,  0,  9,  0, 89,233, 34,  7, 32,219,189,123,183,
+121,247,238,221,205, 74,215, 73,  1, 72,  9, 33, 92, 71,175,127,179,193,162, 64, 61,  7, 15, 31,228,159,217,  7, 41,159, 64,202,
+ 43, 93,248,  4,204,243, 71,112,149,  8,160,163,212,191, 58,  7, 55, 49, 49,121,181, 48, 12,131,212,212, 84, 48, 12,131,217,179,
+103, 75,198,141, 27, 87, 87, 36, 18,221,104,209,162,197,226, 10, 79,160, 52, 34,117,231,206, 29,212,174, 93,155,204,156, 57,211,
+ 44, 44,172,228, 43,246,209,163, 71,240,244,244, 36,139, 22, 45, 50,237,218,181, 43,145,203,229, 70, 71,176, 24,134,129, 84, 42,
+ 69,171, 86,173,200,150, 45, 91, 76,196, 98, 49,142, 29, 59,134,204,204, 76,180,111,223,158,191,101,203, 22, 19,137, 68,130,203,
+151, 47, 35, 63, 63,223,104,221,202, 34, 88,165,166,206, 40,154, 52,105,178,201,193,193, 97,197,246,237,219,197, 82,169, 20, 23,
+ 47, 94, 68, 94, 94, 30,  6, 12, 24,160,223,185,115,167,196,204,204, 12, 55,110,220, 64, 94, 94, 94,181, 50,199,157, 59,119,224,
+229,229, 69,102,205,154, 37, 13, 13, 13,213,  1,192,253,251,247,203,174,179,212,204,204,108,121,179,102,205, 54, 85,164,193,178,
+ 44, 82, 83, 83, 17, 17, 17,129,231,207,159, 35, 51, 51, 19, 89, 89, 89, 40, 44, 44,132, 94,175,  7,  0,200, 10, 11,142,253,178,
+229,200,  3,185, 84, 42, 11,169, 91,187,198,173,123,145, 25,114,169, 84, 86,219,163,134, 55, 33,243,222,122, 97, 67, 67, 67, 23,
+243,120,188, 27, 11, 23, 46,172, 55,107,214, 44,113,116,116, 52,238,221,187,247,151,124,245, 81, 26, 44, 66,  8,136,166, 54,  8,
+105,120,243,121,177, 85,243, 46,  3,133,120,113, 18, 96,117,  0,195, 71, 88, 61, 23,254,161, 71,197,246,160,168,  7, 53,124,  1,
+ 35, 28, 59, 33,  4,208,122,  1, 36,232,244, 83,189,117,211,158,163,133,201,201,201, 16, 10,133, 16,139,197,104,216,186, 55,127,
+247,  3,157,  3,  8,234, 67, 11, 31,163, 52,203, 33, 22,139,191,251,252,243,207,229,229, 53, 59,117,234, 36,151,201,100,115,170,
+109,174,138,101,161,208,211,241, 17,201, 10,247,239,143,165,249,197,102, 40,125, 64,233, 36, 64,215,224,125, 77,150,155,155, 91,
+152,183,183,247, 11, 15, 15,143,102,239,101,174, 76, 69, 55,246,236,217,235,108,229, 90, 98,174,160, 87,  1,  2, 41, 28,108, 45,
+176,105, 98, 43, 43, 91, 11,105,149, 76, 86,169,185, 58,119,243,230, 77, 27,137, 68,130,240,240,112,  8,133, 66, 72, 36, 18,212,
+173, 91, 23, 27, 54,108,176,181,178,178,250, 71,152, 44, 66,136, 37, 33,164,  3, 33,164, 15, 33,164,119, 57,115,229,  1,160, 53,
+ 33,164, 29,  0,  7,  0,151, 40,165, 15,140,212,108,198,231,243,143,213,175, 95, 63,133,207,231, 71, 46, 90,180,232,171,105,211,
+166, 97,229,202,149,  8, 11, 11,123, 62,109,218, 52, 68, 69, 69,233, 21, 10, 69, 55, 74,233,209,138,180,138,138,138, 14,207,154,
+ 53,203,188,103,207,158,101,255,199,213,171, 87,177,109,219, 54,200,229,175,183,130,232,214,173, 27, 70,140, 24, 97,169,209,104,
+254,168, 72,211,222,222,190,205,205,155, 55,235,  0, 16,  2, 16,151, 25,172,199,143, 31, 91, 20, 20, 20, 88,152,152,152, 88, 56,
+ 58, 58,154,150,153,172,158, 61,123, 90,  8,  4,130,102,224,248,119, 26, 44,  0,208,230,164, 67, 12,  3,164, 60,  2, 25,175,156,
+201,  2, 11,126,126, 70, 21,139,218,183, 27, 44, 83, 83,211, 87, 70, 75,169, 84, 26, 29,113, 41, 51, 54,150,150,150, 40, 44, 44,
+132, 78,167,123,245,112, 88, 90, 90, 66,173, 86,  3,  0,228,114, 57,170, 25,193,194,245,235,215,113,237,218, 53,240,249,124, 88,
+ 89, 89,  1,  0,238,222,189,139, 71,143, 30, 65, 40, 20,194,202,202,170, 74,186, 90,173,246,173, 17, 44,173, 86, 11,177, 88, 92,
+ 37, 19,168, 82,169,232,221,187,119,241,248,241, 99,136,197, 98,216,218,218, 66, 36, 18, 33, 49, 49, 17, 81, 81, 81, 16,137, 68,
+176,181,181,173,214,253, 49, 51, 51, 67,110,110, 46, 12,  6,195,171,107, 97,110,110,142,226,226, 98, 48, 12, 99, 84, 58, 89,150,
+ 69, 74, 74, 10, 50, 51, 51,145,152,152,136,172,172,172, 87, 38,171,172,138,176, 90, 25,151, 97, 64,  8,193,189,123,247,232,249,
+243,231, 81, 88, 88,248,151,188, 84, 22, 33,253,232, 88,235,111, 14,157,160,125, 86,145, 78,156,169, 21,154,219,251,183,  5, 94,
+156,  0, 24, 62, 32,177, 68,227,128,154, 72,200, 53,200,163,211, 53, 18, 16,116,192, 26,111, 75,163, 52, 13,130,118,153,133, 58,
+113,188,214,214,204,175, 94, 32,210,211,211, 33, 22,139, 33, 22,139, 17,212,180, 45, 94,100, 27,100,145,201, 74, 25, 40,218, 27,
+165, 89, 74,195,134, 13,107, 73,165,210,208,134, 13, 27,146,242,154,161,161,161, 96, 24,166,110,131,  6, 13,124,171,116,254,171,
+ 61, 69,208,202, 26,131, 79,199, 71,166, 42,156, 14, 61, 86,121,119,237,209,219,106,229,217, 12,191, 39,105,106, 15, 80,221,100,
+ 80,109, 96,117, 77,150,187,187,123, 75, 19, 19,147,163,223,125,247,157,135, 88, 44, 62,225,225,225,209,188, 90,229,155,148,183,
+254,187,175,  6, 58, 91,150,153, 43,157,  2,224, 75,  1,129, 20,224, 75,225, 96,103,131,133, 35,218, 89,201, 36,130, 63,141,213,
+148, 74,165,187,215,172, 89, 99,251,166,185, 42, 91, 26, 54,108,136,217,179,103,219, 90, 89, 89,237,250,155,205,149, 21, 74,218,
+ 85, 61,  4,240,  7,128,115,229,204,149, 23,128, 63, 75,163, 86,247, 40,165,  9, 70,106, 54,233,216,177,227,133,231,207,159,119,
+126,240,224,129, 99, 90, 90,154,239,228,201,147,177,114,229, 74, 76,155, 54,109, 23,165,212,123,223,190,125, 13,110,223,190, 93,
+151, 82, 90,105, 68, 44, 45, 45,237,211,105,211,166,101,101,101,101,  1,  0,234,214,173,139,188,188, 60, 76,153, 50,  5, 19, 38,
+ 76, 40,139,188,130, 82,138,244,244,116, 44, 91,182, 44, 61, 45, 45,237,179,138, 52, 13,  6, 67,226,190,125,251, 26,105,181, 90,
+ 23,148, 84, 11,138,243,242,242,204,114,114,114, 76,181, 90,173,156,101, 89,185,133,133,133,  9,  0,217,144, 33, 67,248,145,145,
+145,126,122,189, 62,153,179, 34,255, 82,131,197, 35,120,248,242,238,101, 88,249,  7,190, 22,189,146,241,  8,164,102,230,120,145,
+152,  0, 33, 72, 68, 85, 15, 76, 41,125,205, 96,149,189, 24, 83, 83, 83, 49,125,250,116,197,142, 29, 59, 30,105, 52,154,208,203,
+151, 47,207,168,244,195, 27,128,173,173, 45, 18, 18, 18,232,143, 63,254, 88,112,226,196,  9, 61,  0,216,217,217, 33, 49, 49,145,
+206,154, 53,171,112,239,222,189,180, 42,  6,139, 97, 24, 72, 36, 18, 92,188,120,145,206,153, 51, 39, 63, 53, 53,149, 90, 91, 91,
+195,218,218, 26,103,207,158,213,207,152, 49, 35, 63, 54, 54,246,213,186,170, 24,172, 50,195, 82,222,160,188,203,120, 85,196,213,
+171, 87,191,200,207,207,159, 56,101,202, 20,229,147, 39, 79,168,173,173, 45,108,109,109,177,117,235, 86,254,208,161, 67,149, 15,
+ 31, 62,124,181,174, 58, 88, 91, 91, 35, 38, 38,134, 46, 90,180, 72,121,238,220, 57,  1,  0,216,216,216, 32, 42, 42,138,206,159,
+ 63, 95,153,151,151, 55,241,234,213,171, 95, 84, 82,224,224,249,243,231,175, 34, 86, 42,149, 10, 89, 89, 89, 72, 76, 76,124,101,
+176,148,114,179,142, 95, 15,235, 90,191, 88,169, 84,220,122,244,244,101, 72,195, 58,118,197, 74,165,226,105,220,203, 24, 74,231,
+188,181,109,219,181,107,215,102,232,245,250,208, 35, 71,142, 60,218,176, 97,131, 34, 39, 39,231,173,134,253,163, 52, 88, 12,235,
+  0, 66,155, 93,121, 90,100,209,174,107,127, 17, 73,187, 13,104,139,  0,177, 37, 32,182,  4, 95,110,141, 78,205, 27,240,182,222,
+ 44,112,  0,101,155, 64, 40,174,188,125,139,128,218,  3,108,243, 51, 49, 42,203,102,125,198,138,114,114,114,192,227,241, 94,153,
+ 33,153, 92,142, 54, 61,134, 48,155,111,171, 29,  0,218, 20,132,103,116,155, 25,161, 80, 56,117,216,176, 97,194,220,220, 92, 48,
+ 12,243, 74, 83, 42,149,162,103,207,158, 98, 83, 83,211, 89, 70,159,251,254, 58, 66,  8,196,141,  1, 58, 33, 58, 77,229,116,248,
+145,210,103,242,146, 77, 82,255,  6,141, 48, 50,204, 78,186,228, 88,134,255,131, 68,101, 77,192, 48, 17,122, 77, 80, 85, 77,150,
+135,135, 71,115,185, 92,126,236,208,161, 67,178, 86,173, 90, 97,202,148, 41,114,137, 68,114,194,221,221,189, 69, 85,111, 83,113,
+145,225,235,249,171,182,167, 63, 92,222,  1,208, 22,151, 24,171,114, 75, 70, 17,139,217,155,206,231,235,116,116,160,177,154, 74,
+165,114,232,240,225,195,179,255,252,243,207,191,152, 43,137, 68,130,184,184, 56,124,255,253,247, 57, 57, 57, 57,159,253,205,185,
+180,  1,128,251,  0, 84,  0, 90,  2,144,149,246, 20, 12,  5,112,150, 82,106,160,148,166, 83, 74, 83,141, 21,228,241,120,211,214,
+174, 93,203, 87, 42,149, 24, 49, 98,  4, 18, 19, 19,145,146,146,130,111,191,253, 54,142,101,217,161,165,154, 15, 40,165, 81,198,
+232,105, 52,154,232,220,220,220, 46, 29, 58,116,200,203,205,205, 69,189,122,245,208,181,107, 87, 56, 56, 56,192,201,201,  9,221,
+187,119,135,183,183, 55,178,179,179, 49,112,224,192,156,204,204,204, 14,148,210, 10,123,161,103,103,103,199,238,218,181, 43,102,
+236,216,177, 13,147,146,146,252,  0, 88, 23, 22, 22,202, 11, 11, 11,197, 26,141, 70,106,105,105,105,217,160, 65,  3,155, 47,191,
+252,210,228,254,253,251,126, 73, 73, 73, 69,  0, 18,192,241,239, 52, 88, 90, 96,246,182,125, 91, 85,162, 26, 94, 48,247,169, 15,
+153, 68,  2,169, 72,  4,169,165, 53,212, 44,139,141,113,105,138, 98, 74,103, 85,245,192,148,210,215, 34, 13,  6,131,  1,235,215,
+175, 87, 45, 92,184, 48, 47, 45, 45,109,212,229,203,151,235,223,185,115,231,161, 49, 70,168,160,160,  0,251,246,237, 83,110,217,
+178,229,185, 82,169,108, 40, 20, 10,117, 26,141,  6,187,118,237, 82,173, 88,177, 34, 94,161, 80,  4, 11,  4,  2,109, 85,204, 75,
+ 89,  4, 75, 32, 16,232, 84, 42, 85,195,221,187,119,199, 30, 61,122, 84,105,102,102,  6,129, 64,160, 83, 40, 20,117,183,111,223,
+ 30,189,123,247,110,165,169,169,105,149,140, 27,203,178,111,173, 34,100, 89,182, 74,  6, 11,  0,238,220,185,243,155, 86,171, 13,
+217,181,107, 87,210,166, 77,155, 84,102,102,102,  0,  0,157, 78, 23,188,109,219,182,164,117,235,214,169,171,210,192,189,180,224,
+129,193, 96,192,246,237,219,213,187,119,239, 78,210,235,245,193,101,235, 54,111,222,172,218,190,125,123,146, 86,171, 13,185,115,
+231,206,111,149,105, 25, 12,  6, 67, 65, 65,  1,248,124, 62,158, 63,127,174, 46,139,208, 61,123,246,236,149,193,178,179,177,170,
+211, 52, 56,192,247,231,245,251, 46,201,197, 98,113,135,176, 32,191,200,167,  9, 73,148,146,248, 74,206,253,225,245,235,215,235,
+231,228,228,140,218,176, 97, 67,222,206,157, 59, 85,  6,131,225, 53,147, 37, 18,137, 62,198,167, 86,  6,  2,233,211, 12,181,169,
+132,209, 19,196, 28, 44, 49, 87, 18, 11, 64, 98,  9, 72, 44,225,236,236,130,219,113, 10, 83, 48, 16,193,160,179, 51,226,129,148,
+131, 64,246, 56, 29,166,  2,145,148,164,165,165,189, 50, 66,101,139,135,151, 31,238, 37, 20,153,128, 80, 49,120,176,175,194,179,
+222,197,212,212,148,159,154,154,250, 87, 77, 15, 15,158, 78,167,235, 96,244,185,167, 24, 28,  1,246,171,152, 52,149,227,129,  7,
+197, 62, 19, 23,111,150, 74, 13,121,192,221, 85,240,175,229,132,137,125, 26,136,102, 30,206,244,191, 19,175,168,  5, 30, 29,  9,
+182,200,232,175, 11, 15, 15,143,102, 50,153,236,196,193,131,  7,101, 50,153, 12,207,159, 63, 71,221,186,117, 49,127,254,124,153,
+ 76, 38, 59,238,230,230, 22, 86,149,219,116, 51,141, 38, 20, 21, 26, 66,167,238,123,153,246, 48, 85,255,154,185,202, 44,166, 24,
+254,195,225,188,220,  2, 85,239, 27, 47,117,231,171,112, 45,239,231,229,229,181,159, 53,107, 86,118,102,102,230,107,230, 42, 33,
+ 33,161,204,  8,132, 81, 74, 35,254,230, 92, 42, 71, 73,227,117, 31,  0,158,  0,234, 83, 74,245,  0, 10, 41,165,213, 10, 93,215,
+169, 83,167,161,155,155, 27,214,173, 91,135,141, 27, 55,230,254,252,243,207,160,148,162,118,237,218,102,213,213, 76, 79, 79,191,
+ 29, 29, 29,221,161, 94,189,122, 79, 86,175, 94,157,228,232,232,200,126,249,229,151, 24, 62,124, 56,108,109,109, 13, 43, 86,172,
+120,217,188,121,243,199,177,177,177,109,139,139,139, 31, 25,113,127,104, 86, 86,214,245, 95,127,253,245,102,235,214,173,101, 67,
+135, 14,181, 61,116,232,144,181, 66,161,112, 18,139,197,118, 26,141, 70,244,228,201, 19,222,254,253,251, 29, 34, 35, 35,227,148,
+ 74,229,109, 90, 58,177, 31,199,191,208, 96,253,254,156, 94, 47, 46,204, 91, 58,127,243,  6,229, 11, 61,129,190,102, 29,168,172,
+157,113, 39, 79,137, 41, 79,146, 20,122,150,174,217,247,156, 94,168,110,  4, 75, 38,147,225,220,185,115,134,175,190,250, 74,117,
+251,246,237, 95,243,243,243, 93,239,220,185,179,211, 88, 29,150,101,121,159,127,254,121,209,181,107,215,246,165,166,166,250,135,
+135,135,191, 96, 89,150, 55,104,208,160,162, 51,103,206,252, 73,  8,241,187,123,247,238,211,106,132,184, 33, 20, 10, 65,  8,193,
+157, 59,119,226,114,114,114,252,111,222,188,185,123,198,140, 25, 69,148, 82, 94,120,120,120, 98,113,113,113,189,235,215,175,239,
+248,250,235,175,139, 40,165, 60, 99,117,203,204, 91,121, 35, 85, 22,205,170,170,193,  2,128,240,240,240,136,188,188, 60,191,219,
+183,111,159,248,242,203, 47, 21,165,230,227, 73, 97, 97,161,239,205,155, 55,143, 13, 29, 58, 84, 81, 21, 61,173, 86,139, 30, 61,
+122, 40,110,220,184,113,172,176,176,208,247,206,157, 59, 79,202,214, 93,187,118,237, 68, 94, 94,158, 95,120,120,184,177,  5,248,
+252, 21, 43, 86,164, 46, 92,184, 48, 53, 51, 51,243,231,229,203,151,103,218,218,218, 66,171,213,190, 50, 88, 25, 89, 57,231,155,
+124, 50,246,135, 29,127,156,189,179, 98,254, 87,173,164, 18,177,104,214,146,205, 23,117, 60,220, 52,210,100,238, 44, 40, 40,112,
+125,240,224,193,175, 19, 39, 78, 84,157, 62,125,218, 32,149, 74, 97, 98, 98,  2,177,248, 99,108, 67,106, 40,  0, 75, 82,250,  6,
+ 89, 38,175, 88,251,155,250,241,139,244, 87,198, 10, 98, 11,220,137,205,195,119,171,247,177,223,119,179,125,  1,138, 68, 48,136,
+174, 92,147, 95,  0,150,100, 12,111, 36, 76,250,253,167,  9,234, 23,209,143, 94, 51, 66, 81, 15,239, 96,249,156,177,236,162,174,
+ 86, 47,192,146, 20, 16, 68, 25,155, 90,189, 94,223,103,241,226,197,197,177,177,177,175,105,198,199,199, 99,201,146, 37, 74,181,
+ 90,221,219,232,135, 82,204,175,111,160,212,110,231,141,236,218,163,190, 28, 38,149,234,115,128, 91, 63,  2,  2, 25, 32, 54, 71,
+  3,223, 90,152, 61,226, 19,193,228,253,105,254,  0,235,  6, 70,232,103,108, 58,249,124,254,177,197,139, 23,203,164, 82, 41,158,
+ 61,123,  6,137, 68,  2,169, 84,138,160,160, 32,172, 92,185, 82, 38, 18,137, 78,148,181,239,172,178,201,218,253, 44,237, 97,162,
+ 10, 16, 72,144, 85, 12, 12,255,225, 72,110, 78,190,178, 79, 85,204,213,155, 38,107,194,132,  9,217,233,233,233,144, 72, 36, 72,
+ 76, 76,196,128,  1,  3,178,255, 33,230, 10,  0,138,  1, 56,  3,136,  1, 16, 11,224,  1, 33, 68,132,247,152,158, 45, 50, 50,242,
+ 94, 66, 66,  2,190,248,226, 11, 12, 30, 60,216,242,211, 79, 63,197,139, 23, 47, 16, 19, 19,115,255,125, 18,170, 84, 42,239, 36,
+ 37, 37,213,157, 48, 97,194,108, 23, 23,151, 45,214,214,214, 23,173,172,172, 46,184,184,184,108,158, 49, 99,198,119,169,169,169,
+245,181, 90,237,131, 42,220, 31, 74, 41,125, 22, 27, 27,123,120,251,246,237,225, 19, 38, 76,136,251,244,211, 79,147,198,143, 31,
+159,250,235,175,191,166,220,191,127,255,105, 94, 94,222,169,202,162, 97, 28, 31,  1,198,206, 10,221,199,  3, 77,135,213, 34,151,
+ 62,173,137,194,129, 53, 81,244,185, 39,185,218,219,  3,173,171, 51,219,118,195,134, 13,169, 94,175,167,167, 79,159,166,157, 58,
+117, 42,110,214,172,217,213,192,192,192,218,213,153,193, 59, 44, 44,236,100, 80, 80, 80,223, 55,215, 53,106,212,168,127,249,117,
+ 45, 91,182,140,104,217,178,101,126,139, 22, 45,158, 27,147,206, 22, 45, 90, 68, 53,109,218,180,184, 69,139, 22, 81,229,215,  7,
+  7,  7,119,111,221,186,245,177,242,235, 26, 53,106,212,237,205,117,239, 58,247,182,109,219, 38,198,196,196,208,151, 47, 95,210,
+206,157, 59,167,148,173,111,211,166, 77,226,163, 71,143,232,211,167, 79,105,199,142, 29, 83,170, 59,123,121, 80, 80,208,136,230,
+205,155, 95,127, 35,205,195,223, 92, 87,145,102,243,230,205,175,  7,  7,  7, 15,127,115, 93, 80, 80,208,136,247,157,101,221,209,
+209,209,187, 65,131,  6, 25, 43, 86,172,160, 53,107,214,204, 40,255,155,127,216,231,223,229, 21, 20, 21, 76,153,191,238,119, 91,
+191, 30,117,171, 51,115,123, 96, 96, 96,237, 22, 45, 90, 92,253,228,147, 79,138,111,223,190, 77, 41,165,180, 97,195,134,244,163,
+154,181,126,159,159,144,110,240,107, 74,215,251, 29,139,154,227,246,228,179, 16,185, 58,252,167,206,148,158,159, 74,111,174, 27,
+ 78, 67, 61, 68,134,107, 83, 92, 99,232,  6,223, 19,116,179,119, 11,186,170,150,200, 40,205,141,158,205,233,  6,223, 19,145,179,
+221,158,244, 12,180,213,236,222,186,129, 62,123,246,140, 30,222,191,139, 54,174, 41, 43,209, 92,239,119,154,174,243,107,101,148,
+230,235,207,124,211,208,208,208,162,223,127,255,157, 62,123,246,140,158, 57,115,134, 54,109,218, 84,209,160, 65,131, 86, 70,159,
+ 59, 64,232,186, 58, 61,244,107,125,174,204,104,107,146, 55, 60, 68,162, 30,216, 64,164,233,238, 47,212,182,247, 18,234,155,184,
+241, 13,245, 29, 25,214,207, 22,180,189,143, 84, 77,215,251, 92,166,235,253, 58, 24,155,206,218,181,107,191,116,119,119,167,239,
+ 90,188,189,189, 51, 91,182,108,201,175,206,125, 15,177,135, 91, 91,111,113,234,185,249,173,105,215,122,166,217,141, 93,249,173,
+223, 55, 47,  1,104, 96, 99, 99,147,181,101,203, 22,106,111,111,159,  9,192,255, 31,145, 63, 75,214, 89,  1,232, 14,192,182,244,
+255, 38,  0, 90,  1,168,249, 30,154, 77,218,183,111,175,187,119,239, 30,125,254,252, 57, 61,121,242, 36,109,218,180,169, 30, 64,
+216, 63,230,217,228, 52,185,165,220, 66,254,155,209, 73, 66, 72,219,183, 13, 70, 22, 24, 24, 72, 59,116,232,160,188,116,233, 82,
+145, 70,163, 25,121,247,238,221,195,239,171,249,223, 72,231,127, 67,179,117,235,214,215, 25,134,169, 89,218,  5, 56,229,236,217,
+179, 13,  1,160, 85,171, 86,215,121, 60, 94,205, 82,211,155,114,238,220,185,134, 31,219,185,151,225,228,228,228,205, 48,204, 41,
+  0,234,164,164,164, 87,189,157,236,252,187,135, 90, 89,154,183,202,203,203,191,159,246,248,208,137,247, 73,103, 80, 80, 80, 55,
+177, 88,188, 33, 52, 52, 84,126,254,252,121, 89,120,120, 56,249,168,174,231,106, 79, 17, 68,162, 32, 80, 76,127,156,172,240,248,
+238, 72, 86,173, 79,218, 52, 21,108, 61,120,137, 93,218,203, 46,182,137,167, 60, 14,  2,246,  7, 16,245,109,124, 22,175, 54, 90,
+ 83, 74, 26,193, 32,152,254, 32, 81,225, 54,229,207, 92,175,182,189,135,243,142,236,217,192,254,216,195, 58,182, 73, 45,147,151,
+160,248,  1, 98,197, 13,163, 53, 95,127,238,155,138,197,226, 19,  3,  7, 14, 52,217,189,123,183, 82,165, 82,117,185,119,239,222,
+133, 42,157,251, 38,223, 26, 48,144,133,160,212,181,242,175, 71, 60,131,  1, 11,241, 85,212,203,127,194,125,111,236, 64,220,228,
+230,226,163, 10,165,126,130, 49,145, 43, 99, 52,  9, 33, 13, 44, 45, 45,119,228,230,230,246, 55, 38,114,245,191, 60,119, 66,136,
+ 45,128,224,210,168, 21,  1, 16, 97,108,212,166,  2,205,102, 60, 30,111, 90,173, 90,181,234, 61,127,254,252,177,193, 96,248,145,
+ 82,122,241,223,240,238,248, 55,104,126,108,252, 45,125,216,165, 82,233,189,139, 23, 47,158, 20, 10,133,223, 95,187,118, 77,253,
+111,186,224,231,207,159,111,242,182,245, 23, 46, 92,104,242,111,185,  6, 41, 41, 41, 49,  0,220,222, 92,159, 17,113,232,  6,128,
+ 27, 31,226, 24,119,239,222, 61, 28, 22, 22,118,250,218,181,107, 51,229,114,121,199,143,238, 34,142,141,213, 96,181,231, 93,136,
+ 68, 75,  2,156,101,211,191,235, 76,201,226, 83,215,221,150,246,178,123, 89,153,185,170, 68,243, 54,164,186, 37,245, 93,101,211,
+ 23,117,  7,249,225,196, 86,183, 31,123, 88,191,172,204, 92, 25, 67,120,120,248,181,192,192,192, 78,123,246,236,217,166, 82,169,
+ 70, 84,102,174,222,138, 41,147,134, 98,221, 28,232,120,  1,160, 16, 85, 16,154, 87,128,225, 61, 70,  6,210,255, 41,183,236,102,
+ 26, 77,  0,224,255, 33, 53, 41,165,247,  1,248,253, 19,179, 40,165, 52, 19,192,177, 15,172,121, 21,192, 85,238,213,205,193, 25,
+172,119,112,229,202,149, 64,238,210,115,252,183,185,120,241,162, 26,192,119,165,203,199, 71, 57,147, 21, 88, 67, 58,246,207, 81,
+ 82,  5, 40, 73,130,128, 93, 81,101,115,245, 22,147,213,200, 77, 58,225,192, 72,169,  2, 20,105,160, 88,254, 62,230,170,188,201,
+  2, 80,179,218,  2,125, 34,181,  0,226, 64, 72, 60,230,226,221,141, 21,231,226, 85, 61,  6,  7,  7,  7,199,191,198, 96,113,112,
+112,124, 64,147,181,191,206, 29,100,241,166,128, 65, 77, 64,159,128, 98,125, 26,198,198,107,222, 83,243, 22,178,200,120,240,224,
+ 13,145, 62, 22, 69,154, 52,140,122, 15,205, 15, 77,137,121,122,183,129,154,195,101, 13, 14, 14, 14,206, 96,113,112,112,188, 15,
+ 37, 81,157,164,210,229,159,171,201,193,193,193,241, 47,130,  0,104,251,142, 15, 68,163, 27,175, 17, 66,218, 86,227,  3,244, 44,
+167,201,105,114,154,156, 38,167,201,105,114,154,255, 46,205,202,180, 63,154,198,243,255,205, 46,138,224,186,176,114,154,156, 38,
+167,201,105,114,154,156, 38,167,249, 47, 92, 24,112,112,112,112,112,112,112,112,112,124, 80,254,214, 54, 88, 50, 27,111, 71,240,
+153,122,132,165,190,  0, 64, 25, 18,  5, 61,251, 80,145, 21,147,250,190,218,196,190,174,204, 68,192,219, 85,164, 51,124, 74,211,
+ 31, 41, 62, 68,122,  9, 33,205, 80, 50,188, 64, 66,105,119, 97,227,246,179,241, 54,177, 55, 55,105,175,209,104,189, 68, 66,126,
+106,122,161,230, 15,154, 25, 89,204,101, 63, 14, 14, 14, 14, 14,142,127,153,193,242,110,210,243,138,137, 76,238,  5,  0,  6,150,
+194,192,  2,  5,185, 25, 55, 18, 30,158,233,  9,  0, 78,254,109, 14,136,229, 54,161,  6,150,130,165, 20,  6,150, 66,167, 86, 62,
+203,140, 60,102,212,204,243, 38,118, 62, 61,219,182,111,219,171, 75,151, 79,124,234,  6,212,245,  4,128, 71,143, 31,197, 30, 61,
+122, 44,218,196,206,231,207,162,140,232,  3,239,115, 98, 38,  2,193,119,193,141, 66, 58,220,185,115,107, 38,128,111, 63,208,245,
+ 18,210,171,157,183,147,102,199,219, 84,101, 39,123,115,147,246, 61, 58,183,247,157, 50, 97, 20, 25,254,205, 98,151,194, 43, 23,
+ 38,201, 29,235, 22, 82,170,190,174, 76,127,118,143, 82,202,114, 89,145,131,131,131,131,131,227, 95, 96,176, 76,100,114,175,115,
+  7, 55,217, 29,184,154,  8,  0,104,219,208,  1,243,126,218,210,131, 16, 18, 13,  0,189,191,254,201,251,187,137,195,112, 61, 34,
+  3,148, 82, 52,240,178, 70,247, 79,199, 24,117, 80,169, 67,157,224,254,253,250,125, 58,101,202,228,110,207,158, 61,139,223,189,
+123,247, 21,  0,104,222,162,133,215,162, 69,139,250, 45,179,180, 18, 75, 29,234, 36, 43,211, 34,239, 84,203, 92, 57,120,218,248,
+249,  7, 15,223,189,241, 71,126,171, 78,  3,190, 48,113,240, 92, 94,148, 22,155, 85, 29, 45,177,171,127, 77,115,129,112, 30, 97,
+ 24,190,185,157,187, 29,  0,152, 57,250, 29,183,243,108,102, 48,177,176,123, 80,172, 84,110,203,120,114,114, 99, 69, 19,118,106,
+ 52, 90,175,  9, 95,127, 78,238, 63,207, 70, 77,255,102,204,170,197, 51,193,234,245,102, 19,103,204,111,127,235, 22,  0,224, 46,
+151, 21, 57, 56, 56, 56, 56, 56,254,  5,  6, 11,  0, 76,164,124, 68,191, 72,  3,  0, 88, 72,129, 47,135,246, 65,122,122,154,183,
+214,192, 98, 72,255,158,184, 23,149,138,232,184, 76, 80, 74,225,237, 34, 51,250,160, 60,176, 65,159,127,241,121,203, 83,167, 79,
+223,254,110,214,119,219,  9, 41, 25,189,123,195,175,191,133,206,158, 51,123,196,224,161,131,219,237,223,191, 63,  2, 64,181, 12,
+ 22, 35,176, 88,241,195,162,185, 38, 73,153, 42,213,132,201, 83,121,147, 38,142, 91,  6, 96,104,117,204,149,159,171,203,247, 87,
+ 78,239,151,201,100, 50,108,220,184, 81, 12, 28,194,192,110, 45, 68,157, 63,249,  4,181,125,  3,154,252,184,102,119,189,211, 34,
+209, 23, 54,222,237,122,102,197,156,121,107,213,166, 72, 36,124, 54,119,201, 47,190,212,194,151,204, 28,217,  9,117,106, 57, 34,
+ 57, 51, 31, 45,218,119,231,221,190,125,183,  9,103,176, 56, 56, 56, 56, 56, 56, 62, 46, 42,108,228,110, 48, 80, 68,199,165, 34,
+ 58, 46, 21,183,163, 50,161,101,121,248,105,225,116,252, 48,119, 42,178, 21,192,129,235,137,136,137, 75, 67, 76, 92, 26,178,114,
+139,254,178,255,155, 93, 45,127, 90, 34,107,184, 98,133,249,143,237, 91,200,195,172, 44, 45, 45,159, 70,108, 47,158, 61, 41,221,
+111,222,132, 68,161, 64, 98,159,100,105, 95,163,201,190,253,251,235,216,219,218,201,205,204,204,167, 90,249,182,223,100,225, 30,
+102, 94,145,230, 95, 76,161,131,127,203,174, 93, 59,119,118,176,183, 99, 71,173,  8,143,170,227, 91, 91, 95,219,219, 55,204,196,
+193,167,229,187,246,121,155,166,216,213,191,166,167,163,253,247,151, 78,238,151,169, 84, 42, 60,126,252, 24,217,217,217,165,219,
+  3,246,246,142,112,115,113,194, 47,139,167,200,230, 78, 31, 19, 40,150,200, 14, 17, 66,200,219, 52,211,243,139, 78, 31, 59,113,
+ 38,253,216,158, 95, 88,  0,200,204, 45,198,133, 59,207,112,247, 73, 98,149,110,214,127,163,235, 42,167,201,105,114,154,156, 38,
+167,201,105,254, 19, 52, 63, 54, 42,140, 96,197, 38,230, 32,250, 69, 26,  6,119,  9,130,139,179, 35,110,199,228, 34,191, 88,135,
+188, 98, 45,242,138,181, 96,249,166, 72, 43,200, 67, 65, 78, 58,158, 38,100,161,178,137, 41,120, 98, 65,255,  9, 19,242,167, 20,
+ 45,172,157,122,241,196, 88, 56,219, 62,173, 51,109, 90, 94,187, 21, 43,204, 53,118, 14, 22,126,163,135, 15,233,112,232,192, 31,
+ 68,163,214,192,195,221, 85,210,188, 93,247, 97,191,109,217,233,  0,160,147, 49, 39, 99,107, 91, 71, 46, 54, 49,217,254,253,119,
+147, 37,139,127,143,142, 47,214,160,248,207,235,233,207,167, 76,159,109, 54,242,179,126,191,218,218,214,105,144,105, 68,227,114,
+177,171,127, 77, 55,107,235,239,175,158,218, 47,211,106,213, 72, 77, 77,133, 70,163,129, 94,175, 47,249, 93, 34,129, 88, 34, 65,
+129, 82,143,172,124, 53, 90, 54,111,194,107,120,234,170,175, 86,171, 29,  9, 96,253, 95, 50, 98, 86, 76,145,169,115,128,252,248,
+161,189,204,158, 51,247, 97, 33,151,226,250,189,103,184,123,249,184,129, 82,245,245,178,237, 76,157,106,123,  3,146, 83, 32, 68,
+252,106,103,194, 38, 21, 38, 61, 10,226,178, 42,  7,  7,  7,  7,  7,199, 71, 96,176,138, 20,197,207,134,142,154, 12, 79, 59,  7,
+243,238, 97,126,162,240,216, 60,100,166, 38,224, 89,204, 99, 40, 84, 58,  8, 45,107,  2, 18,  7,184,123,184, 33, 42,233,154,102,
+253,186,219,249,172, 94,245,236, 93,122,221,187, 59,185, 56,218,202,153, 31,151,214,184, 25, 19,157, 27,184,107,214, 22,124,250,
+169,137,205,143, 75,107,220,140,127, 46,103,100, 98, 67,147,161,  3,186, 19,232, 20,152, 54,109, 10,186,119,233,136,207,135,245,
+ 35, 59,119,255,222,216,216,147,209,136, 36, 75,102,127, 55,223, 52, 45, 79,171,189, 29, 83,164,150,201,165,210,107, 79,139,138,
+253, 61, 44,165,221,250,143, 42, 56,184,123,205,124,  0,147, 42, 51, 87,142,102,102,223, 95, 63,251,135,140, 82,138,228,228,100,
+104,181, 90,232,116,186, 87,  6,203,194,194,  2,121,197, 90,104, 50, 20,200,200, 83, 67,111, 96,209,169, 99, 39,217,221,123,145,
+131,222,102,176,  0,128,101,  9,171,215,107,113,224,244, 93, 36,222,217, 71,  9, 17,190,106,228, 94,102,174, 28, 28,106, 92,238,
+210,107,136,173, 72, 82, 82,221, 90, 88,172,198,182,245, 75,185, 92,202,193,193,193,193,193,241,177, 24,172,152,235,  7,154,  3,
+ 64, 96,219, 33,233, 38, 18,190, 29,159, 33, 72, 79,138,197,182,101,227,193,178, 20,157, 71,252,  8, 83, 15,  7, 72,133, 60,168,
+139,115,242, 83,239,239,179,175,232, 64,132,232,218,173,217,144,236, 49,102,116, 45,179, 93,187,138,  4,  0,176,107, 87,145, 96,
+244, 40, 87,179,181, 27,226, 60,154,180,105,  9,106, 48,160, 75,247,222,232, 63,160, 63,226,211, 20,248,227,242, 75, 40,148, 90,
+163,230, 63,147,216,123,187, 59,185,122,245, 30, 63,184,141, 41,159, 71, 72,109, 55,115, 94, 98,166, 78,207,227,  9, 12, 71,238,
+228,167,244,234,218,195,230,204,145,157, 29, 37,246,222,171, 85,233, 49,241,239,210, 49, 23,  8,231, 93, 59,253,135,140,199,227,
+ 33, 33, 33,  1, 90,173,246,213,162,211,233, 74,140,143, 82,135,212,108, 53,132, 58, 37, 50,242,212,200, 45,214,194,209,204,  2,
+ 58,157, 46,224, 93,186,  6, 86,125,164,107,207,193, 93,193, 80,134,165,244,160, 42,237,209,171, 52,148,153,171,142,221, 63,181,
+189, 28, 30,139,103,119, 79,228, 82, 86, 95,114, 48,194,114, 83,149,112,112,112,112,112,112,252, 63,195,168,129, 70,147,211,115,
+ 96,109,194,135,173,147,  7,  6,141,255,169,196, 48, 24,116,160, 20,208, 27, 88, 24, 51,103, 61,165,130, 51, 95,141,246,136,115,
+247, 32,249,131, 62,149, 41,  1, 96,208,167, 50,165,187,  7,201,255,106,180, 71,156, 66,107,169,213, 27, 12,184, 22,145,129, 31,
+247, 62,193,236,173,143,112,242,174,241,195, 97,241,  5,210,  9, 63, 44, 94, 36,227,243,  8,137, 72, 40, 42, 74,202,214, 23,241,
+  4,  2,173, 76, 38,162, 26,202, 87,199,103, 26,178, 59,246, 29, 29,207,227,  9,198, 84,158, 86, 22,148, 82,168,213,106,104, 52,
+ 26,104,181, 90,104, 52,154, 87,  6, 43,191, 88,135,212, 28, 21, 18, 51,149,120,153,169, 68, 82,166, 18,233,185, 42,188,171, 35,
+161,169, 83,109,111,107, 11,171, 11,214,150,166,211,173,204,204,166, 90,152, 88, 92, 44,169, 14,124,221, 92,221,140, 72, 65,236,
+253,179,233,  6,173,162, 95, 97,242,  3,251,194,228,  7,246, 92,245, 32,  7,  7,  7,  7,  7,199, 71,104,176, 88,  0, 79, 19,178,
+ 32,226,179,112,113,247,  4, 45, 55,129, 61,  5,160, 55, 84, 60,169,125, 25,135, 14,165, 36,213,242, 42,102,167, 78,125, 25, 26,
+ 80,215,250,225,232, 81,174, 81,  1,117,173, 31, 78,157,250, 50,180,150, 87, 49,171, 51,136, 12,148, 82,176, 20,165, 11,  5, 53,
+198,185,149, 66,  8,175,113,  3, 95, 55,254,188, 93, 79, 95,142, 89, 27, 19, 45, 20, 10,117, 46, 54, 50,226,102, 47,227,213,176,
+149,138,212, 58, 70,237, 83,183,145,150,  0, 13, 43,210,201,215,105,231, 52,235,208, 87,161,213,234,225,234,234,250,154,185, 42,
+171, 34,204, 87,104,145,154,171,194,203, 76,  5, 18, 51, 21, 80,168,245,120, 28, 19,  7,194,240, 30,191, 77,211,204,212,234,212,
+177,131,251,106,212,247,171,101, 87,199,219,221,110,227,214,237, 53, 36, 18,139, 83,166, 78,181,189,107,120,248,132,223, 58,251,
+187,237,205,136, 20, 36, 68,223, 77,211,171, 11,118, 23,167, 71,157,227,178, 38,  7,  7,  7,  7,  7,199, 71,108,176,  0,192,205,
+197, 30,183, 30, 39,192,205, 86,  2,115, 51, 83, 68,197, 38,129,199,  8,192, 16, 64,167, 55,222,  4, 81,173,110,239,207, 63,155,
+ 47, 75,136, 51,220, 90,187,238,249,179,132, 56,195,173,159,127, 54, 95, 70,181,186,189, 64, 73,239,188, 18,147, 85, 98,180, 12,
+ 85, 24,126,147, 82,214,206,214, 66,194,191,251,188, 56,155, 97,120,106,107,115,  9,107,109, 46,102, 28, 45,196,  2, 23,107,161,
+ 80, 36, 98,224, 96,107,163,  7,165, 21, 86,101,170, 19, 35, 94,164, 22, 20,204,108,222,190,183, 66, 32, 16,192,195,195,  3, 26,
+141,230,181, 70,238, 25,153,185,175, 34, 88,169, 57,106, 72, 69, 12,238, 95, 59,167, 48, 24,116,219,222,166,201, 19,  8,205,109,
+108,172,241,237,130,159, 49,117,206,207, 72, 46,224, 67, 40, 22, 59,184,123,248, 63, 24, 58,102,150,236,235, 13,207, 48,180,133,
+ 57, 20, 89,177,201,138,116,201,116, 46, 91,114,112,112,112,112,112,252,255,166,242,169,114, 40, 96, 34,147,128,242, 36,184, 18,
+ 30, 11,159, 58,245,176,245,240,109,120,213,109,140,212, 66, 61,170, 50,157,225,228,233,138,123,  0,238,117,239,238,228,210,179,
+167,115, 59, 74,  5,103,214,174,207, 79,  2,128, 77, 71,122,129,  2, 96, 89, 90, 98,180, 74, 71,136, 55, 22,  2,164, 36,164, 23,
+154,122, 56,200, 17,153,164, 85,203,197, 66,198, 82, 46,226,217,154,139,132, 66, 62, 31,  6, 74,212,217, 57, 25,133,  0, 73,169,
+ 76, 75,157, 24,241, 66,236,234, 63,179, 69,167,  1,223, 95, 57,249,187,204,211,211, 19,247,239,223,127,101,176, 10,139,138,145,
+ 83,160,132,204, 10,240,118,145,227, 73,248, 21, 67,118, 70,114,100,110,204,201,141,111,211, 99, 89,240, 84, 90,  3, 30, 60,207,
+ 71, 94,177, 14,121, 69, 90, 52,109,213, 85,216,180,109, 55, 92,126,156,133,220,124,  5,230,110,249,179,192, 64,117,253, 41,141,
+212,113,217,146,131,131,131,131,131,227,255, 55, 70,185, 35,  3, 75, 97, 99,109,  5,137,220, 12,113,233, 90, 20, 18, 59,228, 42,
+ 40, 12,134,138, 35, 88,132,144,182,111, 91,127,232, 80, 74,210,193,131,153,155, 14, 29, 74, 73, 42,239,228,216, 87, 85,132,165,
+127, 89,106,180, 38,165,134, 19, 71,206, 92,207,233, 22, 98,107,201,240,120, 74,161,128, 81,243,133, 60,173,144,207,232,132,124,
+ 70, 99,111, 38,224,157, 63,188,147, 33,132,158, 55, 70, 83,157, 24,241, 34, 46, 35, 99,102,235, 46,  3, 21,118,246,246, 24, 60,
+120, 48, 92, 93, 93,  1,  0, 38, 18,  2, 27,145,  2, 60, 85, 10, 46, 29,222, 92, 28, 21,126, 33, 28,  6,117,207,242,163,185,191,
+166, 73, 41,155,149,167,134, 82,163, 71,110,145, 22,185,197, 90,232,109, 67,113,240,122, 10,178,242, 53,136,189,190, 93,161, 86,
+228, 78, 80,165, 63,141,171,208, 68,190,227,220,223,  7, 78,147,211,228, 52, 57, 77, 78,147,211,252, 39,104,126,108, 24, 49,217,
+ 51, 69, 45, 71, 57,188,156,229, 80,105,237,160,210, 24, 80,172, 50,160, 64,161, 69,129, 66,135,184, 52,  5,158, 94,120,255,132,
+ 80,  0,148,  5,  8, 74,170, 10, 65, 74,140, 29, 37,198,237, 95, 44, 40, 88,246,227,162,185,  3,246,236,251, 19,227, 62,113,116,
+125, 24,167, 73, 33,132, 81, 50, 60,190,206,202,148, 47,120, 30, 27,157,122,233,244,254,160, 98,145, 98,184,177,105, 42,139,100,
+249, 52,108, 61, 15, 20,124,141, 50, 95, 62,189,105, 29, 60,120,240, 80, 21, 21,155,166,231, 73, 44, 30,178,  6,237,142,220,152,
+138,167,202, 97,132,146, 39, 55,195, 31, 53,150, 90,187,161, 72,169, 67,161, 82,  7,133,186, 36, 26,246,242,254, 33, 77, 94,114,
+212,239,133,201, 15,182,114,217,145,131,131,131,131,131,227, 95, 98,176, 20, 74,197,179,118,189,134,191,154,208,217, 96,160, 96,
+ 89, 10, 67,105,132,137,165, 20,122,173,242,217,251, 38,196,192,178,183,215,109,221,211,185,126,131,198,188, 58, 53, 76, 80,144,
+155,137, 59,183,110,232, 41,203,222, 48,202,160,197,199,171, 77,236,125,251,245,235,221,115,207, 23,163,198, 21,180,104,209, 74,
+108,109, 99,166, 77,207,204, 40,216,185,113,183,225,232,159,123,130,192,178, 67,104,124,188,186, 42,233, 82, 39, 70,188,  0, 48,
+168,212,177,183,  6,234,180, 84,102, 62,237,162,200,136, 57,111,172, 70, 86,114, 98,175,159,126, 88, 24,223,109,208, 87, 34, 75,
+123, 79,104,116, 60,164,167,167,227,249,237,  3,170,162,148,136,131, 69,201, 15,134,115, 89,145,131,131,131,131,131,227, 95,100,
+176,158,222, 40, 25, 15,235,191, 77, 78, 78,250,224, 29,187,255, 92,184,115,239,225,166,106,173,214,153,  5, 47,209,160,211, 93,
+ 18, 23,102,207, 54, 86,163, 40, 61, 42,146,184,187,  7,253,246,203,178,137,191,174,249,185, 13, 88,131, 15,  8,137, 35,132,158,
+ 47, 18, 42,190,172,170,185,122,155, 87, 34,205,142,183,  7, 80,165,137,163, 21, 89, 81,105, 38,246,181, 92,119,255,186,244, 71,
+134,225,181, 55, 24, 88,  1,107,208, 61, 51,104, 85, 63, 40, 51,163, 15,211,170,116,151,228,224,224,224,224,224,224,248,255,111,
+176,254, 87,228,196,222, 42,  4, 48,238,125,117, 74, 77,212,226,210,229,131, 66, 41,125, 12,224,113,117,246, 45, 74,127,158,137,
+106, 76, 56,205,193,193,193,193,193,193,241,255, 15,134,187,  4, 28, 28, 28, 28, 28, 28, 28, 28, 31, 22,  2,224, 29,189,242,140,
+159, 41,187, 58,189,  9, 42,211,231, 52, 57, 77, 78,147,211,228, 52, 57, 77, 78,243,227,211,172, 76,187, 42,254,227, 31, 13, 45,
+ 29, 49,253,191,177,  0,104,203,105,114,154,156, 38,167,201,105,114,154,156, 38,167,249,111, 91,184, 42, 66, 14, 14, 14, 14,142,
+127, 29, 54,222,221, 76,108,188,187,153, 24,187,189,109,157,190,246,182,117,250,218,115, 87,142,195, 88,248,220, 37,120,127,  8,
+ 33, 98,  0, 44,165, 84,251,119,165,193,210,178,166,153,222,212,230,  0,195,170,127,200, 79,124,120,230, 67,159, 95,157, 58,117,
+ 26,  0, 64,100,100,228,125, 74,233,251,246,198,132,220,222,103,160,165,153,197, 72, 45,171, 49, 40,138, 21,235,138,210, 98,246,
+127,200, 52,219,218,214,145,107,196,210,165, 32,180, 19, 40, 24, 74,200,121, 94,161,110, 98, 94,222,131,252,138,246,171,209,125,
+177,239, 23,253, 62,153,181,233,247, 99, 11, 95, 30,154, 17,245,230,239, 86,157, 86,155,142, 29,210,126,218,154, 61,135,150,100,
+ 29,158, 90,196,229,254,170, 83,163,217,167, 22,122,190,  3, 47,229,226,178,236,170,236,231,226, 19, 26, 33, 16,  8,108,181, 90,
+109, 70,114,204,205,  0, 99,246,113,245,109,114,143,199, 99,156, 12,122, 54, 41, 49,250, 58, 55,113,186, 17, 72,237,106,133, 66,
+175,255,150,  2,  4,132,255,147, 42,251,249,123,141,116,232,228,228, 36, 53, 55, 55,111, 97,102,102,230, 42,147,201, 36,185,185,
+185,202,220,220,220,151,  9,  9,  9,231, 41,165,250,191,227, 28,109,253,123,204,224,139,152, 57,165,255,158,151, 25,113,112,113,
+197,219,119, 95, 72, 24, 50,163,244,223,139, 51, 35, 14,205,250, 39,220, 43,251,186,189, 66, 64,217,137, 12,195,107, 98,160,250,
+ 69, 25,143, 14,173,173,202,254,161,161,161, 61,116, 58,157,184,236,255,  2,129, 64,125,227,198,141,131,220, 83,240, 55, 25, 44,
+151, 58,125, 45,117,124, 58,151,207, 99,122,179,148,154,166,222,223, 39,255, 39,159,160, 91,200,144,187, 12,195,184,148, 95,199,
+178,108, 82,194,173,237, 31,164,176, 37,132,184,252, 52, 33,112, 90,122,182,178,128, 16,178,224, 93,230,195,190,193,192,235,132,
+ 33, 53,  9, 33, 96, 24,  2, 94,201,  0,170, 41, 47,111,237,104,248, 22, 77, 71, 51, 57,223,187,160, 88,255,152, 82, 90,233, 75,
+ 72,106, 93,219, 73,102,237,124, 41,172,199, 88,143,187,167,183,248,153,216,251,182, 41, 74,143,138,252,  0,231,102,235,233,233,
+ 25,236,237,237,109, 61,118,236, 88, 33,  0, 44, 95,190,220,203,203,203, 43, 59, 54, 54,246, 14,165, 52,179, 90,230,202,206,119,
+240,202,101,243,183,119,234,212, 25, 41, 89,197, 88,250,243,154, 48, 19,  7,239,190, 31,202,100, 17,167, 64,169,133, 92, 30,241,
+245,196,217,206,157, 91,  5,243,115,139,181, 56,126,254,246,160,253,155,126,104,109, 97, 81, 63,160, 34,147,197, 42,242,103,217,
+155,208,142,172, 34, 31,  0,  6,190,249,187,179,137,174,173,173,212,208,209, 81,204,191, 15,224,207, 74, 95, 46,193, 67, 79,  9,
+132, 66, 55, 66, 24, 48,  4,224,241,  8, 24, 66,192, 16, 64,175,211, 36, 60,187,178,185,195, 63,162,160, 14, 28,156, 70,  8,177,
+102,152,146,244, 17,  2, 48, 12,  3,126,201,200,191,  5,207,175,111,177,254,  0,249,201, 60,192,203,194,255,147,166,205, 54, 95,
+122,145, 35,175,209,114,226, 49, 66,153,181,  9,151,127,122, 96,204,254, 18,137,196,242,200,145, 35,182, 29, 59,118, 52,183, 15,
+232,113,201,152,125, 76, 68,146, 58, 71,143, 30, 22,118,236,216,161, 10,249,211,167, 29, 24,102,  7,  1,  4, 44, 75,151,243, 88,
+250,123, 81,118, 76,108, 85,135, 83,177, 11,232, 49, 31,  4,126, 70,239, 64,241, 36,227,241,193,217,213,188,182, 60,169,157,207,
+103, 82,137,100, 74,109, 31, 63,239,184, 23,177, 49,  5,  5,249, 63, 43, 51, 98, 54, 81, 74,217, 42,137,233,244,223,156,189, 18,
+222,137, 47, 16,144,142,109, 66,120,  0,222,203, 96,217,219,219,247, 88,189,122,117,173,208,208, 80,  0,128, 94,175, 55,219,183,
+111,159,195,130,  5, 11,228,198, 60, 67,111,195,217,217,217,217,220,220,188,134, 84, 42,117,  6,  0,165, 82,153,156,159,159,255,
+ 50, 57, 57, 57,185,178,125, 29, 26,244,181, 97, 24,204, 63,249,231,175,124,  0,232,208,107,228, 66,143,176,111, 44,  9, 79,160,
+124,219,246,  6,189, 70,206, 16, 50,241,220,145, 45,  4,  0,218,116, 27, 54,221,182, 78,223, 95, 50, 35,247,165,255, 45, 31,244,
+125,251,242,108,158,106,123, 16, 74, 38,  5,  6,  5, 55,238,221,189, 19,252, 60,157,208, 99,192,232, 41,  0,170,100,176,116, 58,
+157,120,255,254,253, 46, 12,195,240,244,122,189,170, 95,191,126, 25,239,147,182,218,205,134, 94,  7, 33,174, 90,189,254,183,132,
+155,158, 11, 41,157,195,190,153,118,199, 56,254, 76, 16,102,  4,101,217,196,212,123,187,155,112,  6,171, 20, 27,239,110, 38, 60,
+177,240,113,171,230,141,173,167,143,238, 41, 90,255,251, 21, 56, 53,232,151,156,114,255,119,231,127,234,  9, 50, 12,227,114,112,
+215,106, 59,153,136,  7,  0, 40, 82,233,209,107,112,229,163, 65, 56,  7, 15,186,  8,  2,159,178, 58, 84,131, 65, 47,225,243,  5,
+ 42,  2,  0,164,164,119,128, 84, 42,186,185,105,102,104,254,176,174, 53,135, 76,251,229,222, 86,  0, 22,  0,210,222,250, 80, 48,
+140,203,158,205,203,237,156,173, 37,224,243,  8,138,148,122,244, 28, 50,201,240, 54,195,182,105,102,232,252,193,157,220,251,219,
+117,252,163, 23,128, 19, 21,190, 64, 28,234,248,154,218, 56,157,233, 61,114,190,147,  2,102,248,110,225,114,187,107,167,247, 93,
+105,219, 99,184,246,101, 82,146, 66,175,213, 69,103,231,164, 78, 46, 76,137,121,106,108, 65,109, 98, 98, 82,203,196,196,164,126,
+167, 78,157, 36, 83,166, 76, 17,132,133,133,189,250,253,203, 47,191, 20, 94,188,120,209,113,217,178,101,157,157,156,156, 84, 69,
+ 69, 69, 15,138,138,138,158, 83, 74, 13,198,222, 19,  7,  7,219,175,123,247,236,138,214,189,190,130,129, 37,248,114,204, 68,156,
+ 58,241,231, 40,  0, 31,196, 96,153,240,152,121, 35,198,126,235,220, 34,180, 33,127,241,190,167,176,144,  9,209, 62,164, 33, 95,
+ 34,248,198, 97,247,111,203,126,  6,240,249,219, 34, 87,172, 34,127, 86,128,141,102, 64,183,208,154, 56,188, 91, 51,192,165,237,
+ 52, 48, 50,243, 87,145, 44,207, 78,227, 76, 45,165,210,213, 78, 22, 60, 59,177, 33,115,181,103,167,113,103, 99, 79,172, 42,172,
+ 40, 45,  2,161,208,109,211,234,239,107, 91,154, 10,193,103,  8,120, 60,  2, 62,143,129, 74, 99,192,144,209, 51, 62, 84,132,145,
+ 39,181,171,221,153,  1,134,  1,  0, 11,108, 81,102, 60, 61, 94,149,123, 66, 24,158,245,190,205,203,248,118,230, 98,240,120,  4,
+ 60,  6,224, 49,  4,241,233, 74,140,157, 50,215,252,125,141,122,167,166,118,193, 23,127,105,217,161,113,128, 85,189,189, 55,136,
+121,227, 78,253,173,179, 84,178,207,246, 28,186, 48,160, 70,139, 73,183, 40,101,127, 76,188,178,226,116, 69, 58,106,181, 58,189,
+ 67,199, 78,102,132, 47,151,157, 61,184,181,  5,159, 33,208, 25, 40,244,134,146, 65,144, 89, 74, 81,242,221, 82,242, 17, 67, 89,
+138, 17, 35,190, 64,135,142,157, 20,172,158, 77,170, 66,161,177,227,228,217,107,182,106, 29,139,101,171, 55,205, 47,206,207,156,
+255, 34,202, 58, 94,102,239, 61, 81,145, 30,115,216,248, 19,135, 95,204,245,125, 61,119, 29,189,137,128, 58,126, 37,  3, 53,179,
+ 20, 62, 46,114,236, 58,118, 19,190, 62,190, 37,233,102, 41,188, 93, 77,208,242,147, 33,213,188,190, 97,124,185,189,239,238,110,
+125,134,246,233,213,103, 32,172, 44,205,160,209,170,189,207,157, 58,254,235,186,213, 75,155, 18, 66, 62,171,146, 57,164,134, 87,
+239,  5,202,178,239, 93,203,225,228,228,100, 27, 28, 28,252,234,255,122,189, 30, 30, 30, 30, 72, 78, 78,246,169,134, 89,147, 57,
+ 57, 57,125,178,116,233, 82,187, 86,173, 90,  9,108,109,109,  1,  0,153,153,153,206,151, 46, 93,106,216,176, 97,195,140,148,148,
+148, 99,233,233,233,138,119,154, 10, 86, 37,228, 81, 62, 79, 44,150,150,250, 90, 48, 83,198,126, 90,207,214,214,246,173, 31,199,
+217,217, 57,162, 57,115,102, 19, 62, 95, 80,178, 61,165, 12,101, 13,239,156, 99,164, 73,147, 38,221,180, 90,173,228,109,191,101,
+233,109, 59,171, 88, 81,255,146,183,  8,192,231,241,114, 83,238,239,183, 53,218,180,215,235,222,222,145, 17,172,235,218,189,187,
+123,143,206, 97,112,180, 53,199,249,155, 49, 24, 63,243, 39,232,244,134, 21,213,185, 63, 60, 30,143,159,145,145, 17,111,105,105,
+233,240,  1,222,183, 53, 15,237, 90,101,119,225,202,221,233,191,136,247,140,174,213,108,152,174,164, 61, 82,201,204, 44, 62, 18,
+ 51, 65,203, 30,109,205,172,156,125, 37, 27, 87, 47, 22,112, 17,172,242, 55, 66,196, 91,208,172, 73,176,245,244,  9, 95,136, 22,
+108,186,132, 27,167,142, 41, 83,238,239,251, 32,230,202,212,206, 39,148,240,248, 35,  9,143, 39, 39, 12, 17,177,  6, 54, 81,175,
+209, 44, 84,100,197,164,190,175, 54,203, 82,252,113,189,138,198,156, 82,175, 95,127, 89,102,103,111, 33,134, 74,107,192,176,175,
+191,195,134, 21,243, 77,109,205, 69, 80,107, 13,216,122,248,110, 86, 93,197,114, 58,172, 99,205, 33,223,111,138,248,243,199, 29,
+ 81,127,150, 60,171,239,204,120,176, 51, 23,227,251, 61, 49, 48,147, 10, 96,105, 42,  4,195,188,221, 92, 13,235, 90,162,153, 87,
+168,209, 19, 66, 68,148, 82,205, 91,141,132, 99, 64,115, 51, 91,151,253, 61, 71,204,183,141, 73, 39,160,208, 34,214, 76,130,222,
+131, 71, 91,212,114,144, 66, 46,225, 33, 62, 49,213,227,155,169, 83,131, 36,142,190,193,170,212,168,151,149,157,182,187,187,123,
+175, 46, 93,186,200, 38, 79,158, 44,112,117,117,197,142,125,167,220,218,245, 25,215, 53, 57, 45,219,149,165,128,189,157, 85,226,
+ 23,253, 59, 31, 57,126,252,120, 66, 98, 98,162, 96,233,210,165, 33,  7, 14, 28,168, 83,149, 47, 81,  3,165, 80,169, 13, 48,148,
+190, 24, 51,243,213,213,120,169, 16,230,221, 95,230,180,123,135,176, 96,254,242,131,207, 81,168,208, 67, 38,226, 35, 54,181, 24,
+161, 33,193,252,189, 27, 73,171,183,237,241, 69,191, 79,102,217,155,208,142,221, 66,107,194,206, 82,134,205,191,124,143,195, 55,
+ 94,116, 76, 47, 34,176,233,182,116,164,163,152,223,206, 86, 38, 92, 29, 22,228,233,208, 58,208, 13,119,130, 60, 29, 46,135, 71,
+199,212,237,247,243,216,228, 34,193,217,156, 19, 99,223,106,180, 24,194,192,202, 84,136, 77,167, 18, 32,147,240, 33,151,240, 33,
+ 23,151,252,101, 24,242, 94,249, 90,234, 84,199,149,199, 26,190, 48,115,170,243,197,128,126,125,157, 62, 29,208,151,130,199, 96,
+223, 31, 71,186,239,220,185, 35,213,196,193,103,163,129,225,109, 82,166, 68, 38, 86,126, 61,  1, 59,115, 17,190,217,248, 24,102,
+ 82,  1, 76,101,  2,152,201,  4,104, 93,207,182,218,233, 36,132, 88,142,234, 94,171,243,195,237,109, 91,249,212, 48,169,253, 32,
+ 54, 63,242,139,133,119, 87, 92,204,107, 53,225,151,229,117,172,139,242, 52,252,217, 83, 70,240,147, 82, 82, 90,237, 59,114,169,
+181, 83,163, 47,162,245,218,226,111, 51, 30,252,126,232,109,122,137, 81,215, 27,186,132,246,149,104,139,116,143, 30, 68, 39,121,
+230,170,197,136,136, 47,128, 92,194,135, 73,217,181,149,240, 33,151,  8, 96, 34,225, 35, 37, 41, 14, 57,197,188,171,201,214, 76,
+ 43,122,241,122,149,170,162, 84, 90,  3,238,191, 40,130,187, 79,  3, 56, 58, 58, 65,211,121,144,251,173,243,127, 28,146, 59,250,
+ 45, 46, 78,125,242,173,177, 58,187,142,222,196,130,197,203,159,130,224, 73,233,219,220,111,242,164,177,181,127,250,121,245,107,
+235, 70,127, 53,166,118,117,205,181,204,222,103,103,203, 79,  6,247,169,219,184, 61,158,199,197,225,196,145,187,104,211,174, 19,
+ 58,119,237,  5,141, 70, 61,100,211,134, 85,119,  0,172,249, 75,153,235,232,215,172,110,128,223, 78,103, 39, 39, 87,150, 45,153,
+  3,150, 82,160, 89,203,214,152, 58, 97,  4, 88, 74, 81,191, 97,163,214,157,  7,140,165,148,150, 24,193,172,236,172,226,232,168,
+200,182,202,244,168, 91, 70, 95, 75,149, 74,151,153,153,137,251,247,239, 35, 38, 38,  6, 17, 17, 17,200,206,206,134,185,185,121,
+149,170,216, 45, 45, 45,205,130,130,130, 62,253,253,247,223, 37,230,230,255,241,252, 26,141,  6, 50,153, 12,221,186,117, 19, 52,
+107,214,204,121,232,208,161, 67, 45, 45, 45,119,229,230,230, 22,188,213, 48, 61, 60,154,226, 80,183,199,250,206,125,190, 28, 13,
+  0, 66,177,201,139,149,191,253, 25, 81,209,177,133, 18, 51,183,182, 61, 62,247,  4,165, 32,132,172,204,138,250, 51,237, 93,219,
+106,181, 90,233,222,189,123,157,  9, 33,175,189, 95,231,173,220,211,244,241,179,180, 54,235,230, 78,227,155,153, 72,144,153,167,
+198,200,209, 99,109,140, 54, 87,117,187,143,  9,110,216,112,205,119, 83, 70, 64, 46,147,226,244,173,231,152, 56, 99,137, 62, 39,
+ 43,125, 59,  8, 89,158, 25,113,224,125,107, 45, 62,200,128,215,181,157, 77, 96,218, 33, 84, 50,162, 95,152, 68,163, 51, 32,175,
+ 88,  7,181,214,  0,  3, 75,145, 95,172, 67,228,203, 66,216,152,137,176, 17, 31, 63, 85, 50, 88,124,129,168,203,184,207, 58,139,
+150,237,186,133, 27,167,118, 41, 83,238,237,147,149,253,230, 26, 52,224, 69,226,221, 61, 53, 95,247, 40,149,119,181,148, 58,213,
+113,229, 19,222,207, 45,195, 90,180, 31, 61,102, 12,124,106,185,  8, 13,  6,  3,125, 28,243, 66,183,117,211,230,207,204, 93,235,
+174, 40, 72,122, 60,171,236,101, 90,213,238,155, 44,203, 38,189, 25,177, 98,217,215,191,102,223,166, 73,  8, 96, 97, 34,194,250,
+ 19,113,160, 20, 32,160, 48,151, 11,176,231, 98, 18,242,179, 83,178,234, 41,150, 95,251,162,163, 77,183,133,155, 34, 15,173, 61,
+146, 30, 14, 32,130, 82,154,254, 46, 77, 66,  8,248, 60,  2, 51,153,  0,230, 50, 33, 44,228, 66, 48,132,188,211, 92,125,247,235,
+195,173,  0,162,203,155,171,242,154,114,123, 31,127, 51, 27,183,131,189, 70, 45,182,124,248, 82, 11, 62,143,160,166,131, 20, 86,
+166, 66,104,244,  4,241,153,218,210,125,204,240,213,228,121,182,211, 38,141, 62, 78, 72, 88, 61, 74, 47,234, 43, 58,119,133, 66,
+ 33, 26, 60,120,176, 64,167,211,105,135,141, 95,216, 62, 45, 35,187,251,138, 69, 83,197,182, 54,214, 40, 86,233,112,239, 73,130,
+223,146,101,191,212, 60,118,238,230,193,111,191,234,121,168, 99,199,142,230,123,247,238,101,171,114,223, 51,211,179,126,217,188,
+115,255,246,229,203, 22, 33, 58, 33, 23,155, 54,172,  1, 53,232,215, 87,236,119, 95,215, 92,189,122,181,125, 72, 72,  8,115,251,
+246,237,172, 55, 13, 40, 33,144,103, 23,168, 97, 33, 23, 66, 38,230,195,222, 82,  2,107, 19, 17, 68,  2,  6, 12,243,159, 66,164,
+188,230,166,223,143, 45,100, 21,249, 56,188, 91, 51, 96,243, 47,223,227,243,175,103,226,113,150,232, 36, 35, 51, 95,248,213,128,
+ 94,211,109,165,134,142, 78, 22,140, 93,235, 64,119,200, 37, 66,204, 24, 55, 24,141,194,227,237,146,243,216,153,153, 74, 94,  3,
+  0, 51,223,150, 78,166, 52, 98,101, 42, 19,224,226,209,221, 25,197,133,121,249,132, 87, 82, 69,168,211,104, 19,140,243,250,127,
+189,158,114,123,159,233,129, 13,234,125, 63,250,203, 47,152,166,161,141, 40,195,  8,144, 85,168, 33,148,  2, 19,198,142,194, 87,
+163, 70, 56, 36,166,100,204, 94,179,102,253, 44, 19, 59,191,  5, 69, 25, 79,230, 86,164,201, 35, 12, 24,134,192, 68,194,135,137,
+180,196,176,152, 72,248, 80,105, 12, 32,  4, 60,151,192,  1,249, 32,  0, 33, 36, 37,241,206,110, 63, 99,210,233, 84,183,211,185,
+ 75, 25, 66, 95,197,113,213,141,103, 79,239, 45,188,253,240,229,109, 74,105, 78,141,150,147,134,106,245, 20, 69, 42, 61,226,210,
+ 21,208,107, 41,249,188,147, 27, 60,250, 16,159, 69,155,239,109, 39,132,152,149, 69, 92,222,212, 76,186,177, 79,101, 83,183, 87,
+255,229,171, 54,220, 89,246,253, 76, 94, 86,190,  6, 44,165,144,136,120,144,138,248,165, 11, 15,202,226,124,172, 89,247, 91,154,
+ 30,164, 23,189, 88,113,158,255,107,161, 65,  7,245,236,220, 98, 15,  1, 68,132, 17, 38, 57,185,185,187,181,233,250,153,164, 77,
+183,193, 48,232, 53,211,229,246,190, 23,138,211,163,206, 25,163, 25, 80,199, 15, 32,120,146,241,232, 96,175,146,151,100,143, 63,
+125,125,124,107,191,185,206,203,203,167,182, 49,247,189,236,227, 66,106, 91,251, 75, 47,223,186, 83, 71,127,183,193, 61, 46, 85,
+  1, 43,215,218,136,120,116, 31, 39,246,254,114, 79, 89,152,187,236,196,225, 63,167, 46,248, 97,101,253,174, 61,250,225,208,129,
+189,147,  9, 33,107,105,  9,103,203, 69,167,  6,109,221,248,171,171, 64, 36,134, 78,207, 66,103,160, 37,127,245,  6,228,228,228,
+ 66,167,103, 33,145,153, 66,207, 18,232, 12, 44,116,122, 22,106,141, 94, 62,106,240, 39, 99,  0,220,122, 91, 58, 61, 66,  6,223,
+  5, 67, 92, 74,214,151,172, 19, 49,230, 10, 71, 71,199,237,  0, 32, 22,139, 33, 22,139,193,178, 44, 30,165,144,  9, 78,193,131,
+102,128,150,190,217, 89, 54, 41,245,222,238,160,119,157,187,171,171,107,215, 55,205,149, 74,165, 66, 81, 81, 17,174,221,121,104,
+190,109,223,217,142,241,137,105,181, 88,131,157, 90,234, 80,191,  3,128,174,239,186,158,105,143, 14,142,169, 17, 54,129,153, 60,
+122,176,215,202,223,246,223,126,122,114, 65,133,225,228,154,109,167,107,166,142, 25, 24,244,195,202,205, 79,147, 46,173,152, 88,
+217, 61, 18, 10,133,130,204,204,204, 87,207,247,252,213,127,116,122,153, 94,208,102,217,247,179,132,247, 94, 20,225, 81, 92, 26,
+134,182,173, 97,244,243,238,232,223,211,199,205,195,117,197,138,  5,227, 17,147,162,196,234, 63,110,227,210,177,237,225, 90, 85,
+225, 39, 25, 17,135, 51,170, 83,134,188,175,193,170, 72,243,194,195, 44, 20,169,244, 80,107,244,208,177, 20,  5, 10, 29, 50,242,
+ 52, 40, 80,104, 81,164,212, 99,104,187, 26,248, 55, 80, 37,131,101,208,235, 92,156,156, 28,193,210,164,178,  8,103, 73,212, 35,
+100,128, 98,226,151,125,165, 78, 13,250, 20,167,220,223,111,116,155, 44, 83, 59,239, 38, 82,169,236,216, 79, 63,253,132,  1, 93,
+155, 75, 95,102,233,138, 30,190, 84,166, 23,107,160,183,179,245, 22, 45, 92,180,196,100,201,210, 31,191, 58,122,152,205,  3,240,
+227, 91,195,207,193,  3,239,242, 72,185, 54, 86,132,128,178,108, 82,210,157, 93, 65,  0,240, 62,109,173,138, 84, 58,240,152,146,
+182, 51,132,  0, 10,149, 30,197,185,105,217,229,205,213,173,100,135,231, 60, 94,166,150, 82, 90, 97, 21,  4, 67,128,  2,133, 14,
+230, 50,  1, 44, 76,  4, 48,151,255, 39,130,245, 14,115, 21, 81,145,166, 80,171, 77, 52,232, 53, 42,106, 48,160, 75,176, 45,236,
+ 44, 68,112,180, 20, 67, 44,226, 67,167,  7,148, 26, 22, 42,141,  1,241, 25, 74, 20, 42, 69,168, 23,214,223, 43,197,241,166,194,
+198, 61,120,107, 86,252,157,145, 21,222,103,131,  1, 59,247,159,242, 74, 73,203,236,126,104,251,207,226,140,  2, 45, 30,196, 23,
+ 33, 35, 79, 13, 16,115, 76,159, 57, 75, 60,123,246,156, 30, 59,255, 56,157,208, 50,196, 47,161,170,215,181, 56, 35,106, 71,189,
+166,159,252,210,165, 75, 15,211,136, 91,199,241,244,254,185,239,138,210,171,214,254,202,203,203, 75,255,203, 47,191,216,110,216,
+176,193,203,206,206,238,101, 70, 70,198,139,178,234, 40,143, 58,161, 41,103,207, 93,177,110,209,180, 57, 63, 41, 75,  5,107, 83,
+ 33,220,237,229,  8,191,113, 65,195, 16,114,242,109,122,165,213,128,  3, 93,218, 78,195,225, 27, 47, 58, 70,100, 75, 46,142,248,
+ 98,104,194,233,203,209,217,171,183,159,254,193,217, 68,119, 95,194,102,174,190, 27,228,233, 48,125,236, 96, 44, 94,181,  3,151,
+194,163, 51,138, 25,199,239, 83,213,250, 51,115,251, 79,125,123,212,151,  1,248, 60,  2, 83,169,  0,197,197,121,249,143,207,174,
+245,254, 64,207,238,208,211,  7,119, 48, 57,133, 58, 36,102,169, 72, 74, 78, 33, 12, 44,133,133, 76,  8, 61, 75,145,151,147, 69,
+118,238,216,142, 59,119,110, 48,224, 49,195,  1,204,173, 36, 18,  2, 30, 67, 96, 34, 17,148, 68,128,164, 37,127,117,  6, 22,181,
+107,186, 98,229,252,113,102, 54,118,246,104,223,107,164,241, 17, 54,185,101,253,109,235, 22,226,226,141,251, 97, 23,158,237, 14,
+182, 11,168,191,202,165, 78,223,101,140,149,179, 74,173, 53, 32, 63, 47, 23, 34, 77, 34, 26, 57,103,194, 74,102, 64,124,129, 35,
+ 30,167, 61, 53,169,172, 58, 43,235,209,159,247,109,  3,122,206,218,127,228,252,226, 14,237,194,240, 56,190,  0, 82, 17, 31, 18,
+ 17, 15, 18, 17, 15,  2, 98,192,207,235,214,235,114,243, 11,187,100, 61, 62,152, 85,141,252,121, 22,192,171, 54,103, 38,246,181,
+108,119,172,154,181,109,196,212,165, 29, 58,246,252,140, 60,190,115,225, 91,  0,231,140, 42, 51, 89,106,212, 58,150, 53,238,221,
+ 70,  8, 97,236, 60,131,118,109,217,186,187,127,157,218,174, 72,207,211, 33, 37, 87,139, 43,247, 98,177,109,227,172,188,220,244,
+231,131,160, 45, 42, 98,137, 62,255,212,201, 35, 39,191, 30, 63, 21,254,  1,245,221, 11,146, 10,204,  0,228,191,118, 76, 30,217,
+ 48,228,139,145,253,237,237,237, 77,255, 19,193,162,240,246,169,131,206,221,122,227,212,161,  3,136,140,120,  8,150,150, 12,231,
+195,178, 20,121,185,217,105,122,157,102,235, 59,211,199,227,185,108, 89,191,204,142, 97,  8,180, 58, 22, 26, 61,139,233,211,103,
+105,198,207, 94,221,172, 67,211,122, 17, 60,176,  5, 47, 83,243, 44,194,163,211,234, 18,129,169,227,160, 81,211,132, 42,181,  1,
+249, 10, 29,206,238, 91,249,238,106,198, 90,245, 67, 61,252,154,125,241,229,204,245, 98, 49,143,209,250,123,187,190,104,217,216,
+ 63,177,134,147, 77,225,162,149, 59, 27, 93,191, 23,221,185, 87,175, 94,146,254,181,252,136,147,181,196,116,212,152,177,245, 28,
+106, 55, 27,146,246,244,234,246,119,190,252,248,226, 60, 87, 23,215, 87, 85,137,118,  1, 61, 30,  2,112,123, 99,179,132,140,199,
+  7,235,  1,128,157,189,131,138,  8,196,133, 85, 48, 32, 20,  0,230,173,218,223, 57, 41,179,168, 79,153,185,186,255, 60, 31, 98,
+ 33,  3,173,206,248,166,113,  6, 66, 39, 76, 27,251,185, 32,167, 88,143,139, 15, 51, 17,113,247,  2,213,107, 11, 62,163,132, 63,
+204, 54,160,199, 16,  2,120, 80, 32,142, 33,248, 85,195, 96,107,222,131,131,249, 85,175,233, 41, 73,143, 93,157, 94, 77,  8, 15,
+157,121,124, 97, 48,192,250,234,117, 58, 59,134,199,203, 74,123,176,191,210, 30,148,229,207,168, 56, 61,  6, 75, 23,205,198,202,
+141,  7,144,146,173,130,185, 33, 17,135, 54, 45,196,228,197,187,160, 84, 27,240,111,192,104,131,101, 95,183,123, 35,128,225, 57,
+ 88,153,192,171,166, 43, 76,250, 14,147,186,  4,246, 47,230,241, 24,102,235,138,111, 37,217, 74, 62,248, 60, 94,177,209,133,175,
+189,111,136,169,169,233,241, 63,255, 56,128, 90, 53,236,132, 59,175,228,196,221,123,161,124, 21,210, 45,200, 76, 16,121,152, 41,
+248,189,122,246,148,157, 59,127, 97,194,187, 12, 22,143, 48, 46, 43,127,254,193,206, 84, 42,  0, 33, 64,161, 82,143,241,147,166,
+189,247,133,161,160,188,175, 39,205,  1, 41, 53, 87,133,249, 57,248,126,229,214,162, 94,206,231,175,150,153,171,211, 79,164,207,
+122,246,108,157, 31, 31, 31,159, 91,105,193, 72, 13, 73,125,134,142, 23, 50, 76, 73,181, 17, 67,  8, 40, 12,233,213, 49, 87,  0,
+144,155,251,162, 64,234, 80,175,231,142,229, 99, 55,214,112,118,182, 52,149, 73,136,137, 92, 76,252,124, 60, 37,141, 27,135, 74,
+106,120,250,139, 46, 71, 22,225,101,166, 18, 47, 82,242, 33,178,241, 23,244,111,217, 22, 59, 86, 78,235,108,204,249,159,191,241,
+184,235,218,101,179,196,105,121, 26, 68,189, 44, 66, 90,174, 10,169,185,106,164,229,168, 96, 34, 21, 32,180,109, 47,241,137, 51,
+251,186,182, 12,241, 91, 85,157,235,251, 60,246,197,129,248,228,212,207,234, 53,108,132,157,219,182, 52, 38, 46, 46, 18,154,148,
+164, 50,118,255,141, 27, 55,230,  4,  7,  7,219, 46, 89,178,164,216,199,199,167,129,143,143, 79,205,152,152,152,139, 94, 94, 94,
+221,214,174, 92,112,105,252,204,101,110, 60,162, 51,111,210,180, 25, 79, 34, 36,184,113,249,148,122,235,198,245, 41,218,188,162,
+169, 21, 26, 97,153,249,194,244, 34,  2, 91,103,231,  8, 19,145,161, 29,159,201,139,201, 57, 49,118, 59,128, 63, 61, 59,141, 59,
+123,225,110,116, 76, 80,120,188,221,249,240,103, 25, 57, 10,173,119,236,137, 73, 21, 22,184, 60, 66, 32,224, 49, 48,149,242, 95,
+ 69, 44,237,235,247,125, 70,  9,177, 45,139,148, 18,148, 68,180, 72,201,103, 75, 74, 82,248, 94, 35, 26, 70, 19,202, 82, 32, 58,
+169, 24, 69,170,146, 16,188,139,141, 12,153,233, 73, 88,187,106, 43,238,221,189,131,246,157,186, 97,205,111, 59, 49, 98, 72,223,
+ 74,175, 43,195,160, 36,130, 85, 46,122,101, 34,229,  3, 32,200, 43,214,225,143,171,137,240,172,201,128, 84,161,182,208,212, 68,
+138,252, 66, 37, 24,129,  9,162,174,108,151,157,184,112,123,198,220, 31, 55,125, 83, 80,148,246, 50, 54,242,  6,124, 44,179, 81,
+211, 89,139,136, 52, 51,220,205,246,128,143, 87, 45, 48,194, 59, 70,105,103, 69,212, 93,122,136,249,163, 75, 80,131, 58,161,110,
+118, 22, 80,106, 12,165, 81, 44, 30,182,108,222,142,248,184,164, 47,178, 34, 14,222,251, 16,133,100, 81,250,243, 76,137,125,237,
+175, 30,221, 58,247,162,231,167, 95,193,209,185, 70,253,170, 52, 79, 48,102,157,193,  8,131, 69,  8, 97,172,220, 27,108,219,182,
+ 99, 95,255,154, 53, 28,112,230, 86, 28,110,199,100,195,198,198, 26, 60,153,  3,106,183, 28,102,241,232,228,202,222,202,172,162,
+109,  2,161,108,120, 72,227,166,160,148, 34,250, 73, 68, 78,126,190,249, 95,202,102, 69, 74,212,125,  0,102,229,215,201,108,253,
+234,155,152, 91,221, 87,107, 13, 72, 78, 78,194,181,235, 23, 27,150,110,103, 52, 98, 33, 15,167,239,101, 64,171, 99,161,213,179,
+  8,  9,244,215,  8, 68,210,230, 63,108, 60,214, 56, 61, 61,147,145,154,152,177,230,118,181,132, 86,186, 52,245,131,231,249, 66,
+173,142, 69, 45,167,138,191,203,101, 86,181, 22, 77,154, 60,222,143, 39,148,162,176, 88,173, 73, 77, 73,118,248,117,247,133,162,
+ 39,209,145,206, 30,238, 53,204, 22, 46,152, 43,204, 87,  2, 25,249,106,228, 20,106, 73,191, 79,191,112,218,190,105,205, 32,  0,
+219,171,144,244,186,123,183,175,215, 89,154,  8, 73,161, 82, 71, 51,243,213,134, 49, 95,141,175,251, 62,121,167,204, 92,253,248,
+253, 76,225,189, 23, 69,120,240, 60, 31, 18, 33, 15, 34, 33,  3,141,145,  6,203,182, 78, 95,185,173,173,197,160,144,250,181,113,
+234, 94, 38,120, 60,  6,138,226,124,141, 68,108,242,216,215,183, 54,211,160,126,  0,194,154, 53, 65,236,139,120,159, 83,103,206,
+ 47,191,125,231,222,247,182,  1, 61,167,102, 62, 62,176,166, 42,105, 77, 76,205,150,165,235, 93,199,219, 57,216,  4,116,235,222,
+ 85, 92,195,217,158,216, 90, 89,192, 64,132, 24, 53,250,107, 59,163,243, 60, 45,137, 94, 46, 89, 48,  3,106,181,  6,182, 22, 34,
+ 80, 10,108, 94, 53, 23, 26,141,  6, 78,214, 98,228, 23,235, 56,131,245,234,  6,215,235,217, 84, 42,150,159, 94,179,120,  2,147,
+ 87,172,131, 68,200, 67,173, 90, 53, 49,118,252,  4, 89,155,250,182, 80, 18, 51,252,177,123,107,129,222,160, 59,106,140,158,204,
+161,118,144,169,220,236,212,182, 29,123, 89, 27,107,107,102,237,233,204,231,217,133,250, 87, 67, 28,196,220, 58,204,222, 61,245,
+171, 35,  5, 57, 41,145, 72,188, 52, 26,141,101,101, 55,116,243,233,132,210,198,185,228,131, 92, 24,134, 97, 12,191,174, 90,  0,
+ 27, 51, 17,212, 58, 22,243,151,111, 47,236, 98,123,242,124,121,115, 21, 24, 24,152, 95,191,126,253, 60,134,169,124, 56,177,151,
+183,119, 54,121, 75,129, 89, 45,115, 85,134, 50,237,225, 29,  0,  1,175,107,  6, 10,108, 60,246, 77, 30, 48,104,200, 12,  7,255,
+ 79, 76,227, 82,243, 33, 36, 90,  4,251, 57,226,226,169, 63,217,196, 23, 79, 70, 25,163,157,145,157,239,106, 99, 99,141,123,207,
+ 11,145,156,173, 68, 90,169,185, 74,205, 85,163, 80, 89,136,250,238,182,200,203, 47,114,173,182,129, 37,244,224,169, 83,167, 62,
+235,220,189, 63,198,126, 51,175,211,198,181,203, 30, 74,237,253,134, 40,211,159,220, 54,102,255,125,251,246, 25,220,221,221,159,
+103,102,102, 54,154, 50,101, 74, 65,173, 90,181, 28, 22, 44, 88,240,101,173, 90,181,156, 90,183,106,149,127,251, 66,227,109,227,
+191,153,219,106,250,184,141, 53, 25,134, 73,167, 44, 61,156, 82,172,155, 67, 51, 35,149, 21,222,167, 67, 51,162, 72,157,121,159,
+181,107,110,123,216, 74,198,248,139,169,102,  0,169, 51,111, 47,141,156,163,141, 61,177,170,176,110,191,159,199,166,228,177, 51,
+ 85,140,221,247,149,153,171,146,  8, 22,129, 70,111,128,169, 84,240,159,188, 73,225,184,118,245,207, 50, 91,115, 17,  4, 60,  6,
+124, 30, 65,129, 66,135,172,  2, 45,190,153,250,141,177, 87,144,213, 27, 40,148, 26, 61, 20,165, 95,131,133,  5, 89,152,241,205,
+ 36,116,234,218, 19,195, 71, 77, 66,174, 18,184,251,162, 16, 90,157,174,210,135,130, 71,  8, 20,106, 61, 62,111,239,134,156, 34,
+ 45,138,149,122,104,244, 44,100, 34, 62,248,124,  6,114,  9, 31,102, 50,  1,  8,161, 66, 71, 71,199, 47,  1, 64, 32, 16,168, 94,
+190,124,185,163,130, 47,120,120,184,218, 67,169, 99,208,168,255, 50,180, 13,245,198,131,179,155,248,151,110, 62,170,249,205,220,
+229, 24, 51, 48, 20,251,163, 60, 97,101,231,  6, 19,185, 20, 58,202,  0, 48,110,  8, 16, 74,231,176,142,190,189,  6,174,255,109,
+115,244,252,217,211, 37,121,197,  4, 98, 33, 15,231,207,157,197,141, 91,119, 87,102, 70, 28,220,241, 33, 11, 74,  1,101,236,205,
+204,204, 32, 17,241,160,209,170, 53, 70, 71, 30, 88, 10, 80,248,217,213,237,241,103,233,189,247, 51,176,120,203, 58, 90,153,185,
+ 34,230, 78,  1, 91,214,111,220, 57,200,201,193, 14,  7,206, 61,196,150,223, 86,163,102,131, 46,184,122,108, 11,204, 61, 26, 67,
+ 94,163, 25, 68,166,251,190,100,120,252,186, 95, 79,248,182, 87, 96,112, 40,174, 93, 57,143,140,180,212,245,148, 70, 25,213,  6,
+141, 39, 32,227, 90,183,235, 10,149,198,128,230,109,186,224,228,145,  3, 99, 81,218,121,194, 88,222, 52,225, 44, 11,253,215,195,
+  7,  8, 50,242, 52,130,204,  2, 13,146, 50, 21,136, 75, 87,224,208,158, 77,212,216,183, 54,195,231,  5,183,168,231, 34,248,114,
+233,249, 68, 87, 23, 71,181, 64,173,148,198,196, 62,247, 29,254,217, 32, 65, 77, 47, 95, 38, 35, 95,141,204,124, 53,178,242,213,
+ 40, 82,233,225,229, 88,131, 81,235,249,161, 85,189,207,182, 22, 18,193,154, 35, 47, 96, 38, 23,160,137,175,117,181, 27, 97,179,
+ 44,251,154,185,186,255,162, 24, 15, 95,228, 67, 44,228, 65, 44,100, 32, 22,242,160, 55, 80, 35,223, 69,250,  1, 35,135,245,151,
+106,116, 20,217,249, 26,240,121,  4, 14, 54,214, 98, 87, 71,111,108, 94,246, 53,  0, 96,196,180,181, 24,254,249, 96,248,120,123,
+ 33, 63,191, 80, 58,124,244,248,159,241,150,118,119,239, 74,235,206, 67,151,235,220,125,156, 48,249,179, 97, 67,  5,253,186, 54,
+103,238, 63, 47, 64,106,142, 26,207, 99, 21,208,234,170, 54, 26,141,222,192,130,130, 98,235,222,163,144,138,248,200,204,215,130,
+ 82,138,133,171,127,135,169, 84,128,212,220,146,106,125,206, 96,149,153, 43,145,228,244,246,213,223, 74,207,199,  0, 43,207,220,
+197, 39, 33,142, 16,242, 25,136, 77, 28,240,224, 69, 46,206,158, 59, 84,120,245,198, 45, 21, 24, 93,165,221,162,100,142, 62, 13,
+229, 82,179,179,107,126,221,166,183,177,179,195,142, 43, 57, 73,185,197,122,221,127,170,167,116,228,238,169, 95,107,234, 89, 93,
+ 71,101,218,211, 74, 63,103, 89, 74,133,139,215, 29,  2, 64,193,178, 44, 40,203,130, 39, 20,203,221, 26, 15, 78, 47,209, 99, 37,
+124, 30,163, 42,255,228, 83,214,144,148,112,107, 87,133, 85,135,  4,128,185, 76,128,189,151,146,145,159,147,146,213,197,246,228,
+171,106,193,147, 17,226,103,129,129, 13,242,131,131,131,243,164, 82, 41,120, 60, 94,149, 47,252,251,154,171,119,191,120,194,117,
+  0,150, 56,249,182,236,214, 73,230, 31, 34, 98,248,  8,244,113,196,197,211,  7,216, 27, 39, 54,245, 84,164,199, 28, 51, 50,188,
+141, 34,165, 14, 41,217, 42, 36,103,171,144,150,171, 66, 90,142, 26,105,185, 42, 16, 66,160,210,188,223,240, 53,138,244,152, 35,
+ 38,206,254,235,213, 90,140,106,209,190, 39, 38,207, 93,227,181, 99,253, 15, 87,228,118,181,131,139, 51,158, 62, 50, 70, 35, 62,
+ 62, 94,109,111,111, 31,158,151,151,215,126,249,242,229, 69,126,126,126, 34, 19, 19,147,108,  0,210,103, 49, 49,194,243,199,247,
+197,101,166,164,140,212,106,181,119,140, 77,151,123,216, 48,177,239,255,177,119,214,225, 81, 92,251, 27,127,103, 93,226,196, 29,
+136,144, 64,130,  4,151,160,193,221, 10, 20, 41,165, 69, 90, 42, 72, 91, 40, 45, 82, 10,133,150, 34, 53,104,161,197, 29,138, 21,
+119, 11, 30,136, 64,  8, 16,119,221,205,102,125,103,230,252,254,128,228,166,220,200,134,210,223,189,151,158,207,243,204,147, 77,
+ 50,243,206, 57,179,103,230,188,243, 61,102, 95, 60,217,207,166, 67,239,  0, 15, 37,252,108, 52,189, 67,109,239,126,227,214,227,
+195,165,249,103, 86,231,231, 24,217, 83,  5,122, 97,139,172, 50,177, 85,125,  1, 89,179, 41,237,245, 41,115, 33,100, 24,152,141,
+166,180,242,194,229,230, 32,197,194,109, 15, 96, 43, 23,195, 78, 33,130,173, 66,140, 78, 77,234,161, 14,175,  7,196,194,241,208,
+ 25, 57,232,141, 44, 12, 38, 22, 46,190, 78, 88,191,117, 15,210,243,245, 56,120,179, 16,137,105, 26,  4,251,216,128,144,218,227,
+ 78, 60, 97,181,175, 77,158,103, 39, 20,  8, 32,100, 32,  8, 13,170,143,226, 50, 19, 36, 34,  1,164, 82, 41,108,100, 34,216, 43,
+196, 16,139,196,184,113,239, 30,140, 70, 35,218,182,109, 43,175,217,  2, 62,141, 98,  5, 55,244,130,217,194,226,232,197,  4, 44,
+153, 49, 12, 61, 59,183,194, 71, 66, 41, 30, 24, 35, 96, 87,207, 14,188, 64,  0, 51,203,195,100,230,  0,  8,170,141,182,249,249,
+249,117,183,177,177,177,209,233,116,154,180,180,180,243, 57, 15,246,167,187,133, 13,153,124,252,228,217,173,  3,250,246,196,157,
+123,241,216,251,251,161, 75,133,206,234,217,229,199,132,135,135,183,115,113,113,177, 45, 42, 42, 42,141,141,141,189,241, 34,101,
+149, 97, 24,198,198, 61,244,195,246,157,186,162, 76,149,143,188,140,148, 35,214, 30,219,216,223, 14, 51,103,188, 23, 28,210, 40,
+ 36,152,123, 54,146,170,137,159, 29,166, 78,123, 39, 56, 48,184, 81,112,249, 64,143,198,126, 53,207,119,105,227, 30,242,206,146,
+149,107,199,251,249,250,226,216,149,  7,248,106,222,212, 59, 54, 74,187,  6, 62,238, 78,142,146,176, 86,136,137,185, 10, 55, 72,
+ 97,239, 30,236, 51,122,208, 20,159,222,125,  7, 33,246,238, 45,172,254,122,113,180, 86,168, 88,106, 77, 90,109,221,  3, 92, 91,
+180,238,252,186, 93, 61,119,168,212, 26,216, 57,185,161,113,179,214,175,219,186,  7,124,242,108,177,250, 23, 51, 27,132,192,104,
+ 38, 40, 41, 51, 35,163, 64,143,212,220,167,  6,139,231,235,208,231,135,128,177,149,139, 68,245, 44,143,252, 98, 79,159, 37,254,
+190,238,204,215,139, 63, 18,154,241,180,179,120,129,218,136,130, 82, 19, 10,212, 38,148, 25, 44,168,103, 35,  2, 79,248, 58,191,
+109,151,148,153, 97,247,172,159, 44,199,191,184,  9, 88,184,106, 71,135,204,  2, 93,143,111,190,156, 39,185,155, 82,201, 92,137,
+159, 70,175,100, 18, 33, 56,222,186,  8,150, 80, 36,120,175,127,143, 54,200, 40,212, 63, 29,133, 44, 96, 16, 20, 22,  1, 23,  5,
+143, 30,163,230,  0,  0,  6,246,123, 58, 13, 73,114,142, 22,135,175,229,  0,128,196,218,180, 22, 21,105,100,191,159,186,243,193,
+142,245,223, 72,141,188, 24, 63, 31, 75,131,206,200, 66, 46, 17, 66, 38, 17, 66, 33,169, 91,253,198,114, 79,  7, 75,164, 23, 90,
+160, 51, 24, 80,170,183,128,  0,184,241,168, 12,122, 19, 11,181,214,130,118,161, 78,212, 96,149,155,171,205,223,125,170, 56,243,
+144,224,220,221, 34,140,136,244, 65, 81,126, 38,214,255,180,134, 39,  4,144,201,165,185, 28,203, 31,211,243,236,199,170,187,135,
+213, 53, 62, 36, 92,155, 52, 83, 40,149,103,151,175,254,217,236,230,238,205,239,191,166,202, 87,235,184, 63,197, 10, 57,163, 81,
+ 64,120, 34,177,198, 92, 61,139, 52,153, 23,188, 55, 20, 60, 33, 88,184,122, 15,150,206, 30,  5, 91,133, 72,201, 48,140, 82,107,
+ 96, 49, 99,209,  6,124,251,249, 36, 59,165, 76,  4,134,  1, 12, 38, 14, 83,223,179, 46, 74,160, 51,114,208,170,114,139,154,150,
+173,124,206, 92,181, 84,183,109,219, 86,229,228,228,132, 23, 49, 88, 85,153, 43, 15, 15, 15, 47,165, 82, 89, 47, 56,248,105, 95,
+ 87,161, 80,  8,142,227,180, 73, 73, 73, 47, 52,233, 91,169,170,224, 64, 78, 74,108,219, 14, 93,251,227,194,201,  3,124,244,209,
+ 13, 67,235, 50,196,220,209,193, 62,227, 78, 66, 90, 99,  6,182, 79, 35, 88,207,204,149,201,194,195,223, 93,137,204,140,116, 56,
+ 58,216,102, 88,171,167,244,  8,238, 35, 32,194, 41, 60,131,245,186,220,  7, 71,  1,160, 44, 43,126,154,210,173, 81,108,124,252,
+221,213,  3,198,188, 39,237, 53, 98,154,100,221, 87,239,206,  1, 48,218, 90,221,188,188, 60,157,171,171,107,180,167,167,231,128,
+ 69,139, 22, 25,  1,200,140, 70,163, 96,226,196,137,202,180,180,180, 25,132, 16,171,210, 24,249,230, 94, 23, 70,166,233, 27, 24,
+220,122,140,191,157,166,103,183,200,246,104, 31,230,139,140,200,246,  0,240,126, 90,153,109, 72,167,105,191,238,106,232,234,115,
+116,221,198,195, 75,223, 30, 21, 53,195,107,224,162,149,217,135, 23,212, 24, 17, 75,188,248,107,239,170,236,187, 72, 40,128,157,
+ 66, 12, 91,133,  8,118, 10, 49,236,228, 98, 88, 88, 82,151, 38, 56, 98, 97,249,167, 17, 44, 19,139, 50, 61,139,179, 49,121,200,
+ 85,155,160,210,152,161, 55,115, 32, 32, 48, 91,248,242, 89, 69,106, 54,171, 87, 55, 57,150,127,246,105, 57, 90,189,230,139,247,
+236,247, 93,206,172, 24,161,231,160,148,194, 78, 41,  6, 64,112,241,226, 69, 56, 59,215, 62, 45, 22,207,243,216,123,252,  6, 86,
+110, 58,139,227,191,125, 12,185, 68,136,102,131, 23,225,141, 33,109,193,243,  4,143, 19,227,243,130,155, 52,119, 23,  8, 20, 16,
+ 48, 12,140, 22, 30,  0,169,246,122,154, 76, 38,231,244,244,244,210,160,160, 32, 15,111,111,239, 17, 66,161,144,200,  0,227,129,
+157,197,186, 51, 71,182, 43,181,122, 35,167,100,213,191,  5,229,232,251,  7,  7,  7,131, 97, 24,226,226,226, 34, 57,123,246,108,
+ 89,211,166, 77, 93, 95,228, 62, 98, 24, 70,160,112,107,180,230,173,105, 31,142,  8, 12,  8,192,158,237,191,129, 16,102,159,181,
+199,111, 59, 28,141,149,171,254, 60, 98,112,234,180,119,130,215,173,253,233, 79,127, 27, 63,105,114,112, 77,  6,207, 39,188,251,
+199,161,161, 77, 16, 29,159,137,175, 63,155,118,199,144,159, 60,198,100,235, 60,197, 92,150, 51,179, 69, 68, 43,120, 56,219, 35,
+187,216,136, 65, 99,135,160, 99,167, 72,196,222,189,133,197,159,127, 20, 13,157,169, 87,109, 81,219,127, 25, 33,241,212,110,189,
+135,136,245, 70, 51,190,251,122, 62,166,204, 94,130,118,221,  7,138,227, 98,174, 77,  5,240,133,181,121, 54,154, 57,116,107,234,
+242,212, 52, 91,120, 28, 74, 22,138,170, 42,129, 34, 33, 35,104, 17,224,  8,189,137, 69,169,206, 82, 75,  4,139,201, 85,105,180,
+245,127, 88,250,161, 80,107, 96, 81,160, 54, 33, 95,109, 68,161,234, 95,198,170, 80,109, 68,129,218,  4,177,136,193,195,148,108,
+  8,133, 76,157,251,223,149,148, 89,208,166,145,211,211,123,244,  5, 91, 67, 10, 89,215,190,119, 31,102,247,248,122,241, 92,201,
+221, 84, 45,238, 37,151, 62,139, 92,  9, 33, 19, 11, 32,125,246,153,179,194, 95,185, 53, 25,212, 97,252,232,193, 97,246, 54,114,
+100, 63,212, 64, 36,124, 58,213,139,131,155, 47, 28,100,  6, 76,159, 54, 25, 46,206,142, 72, 47, 52, 98,205,239, 15,113, 47,225,
+ 17,120,125,221,178,253,195,246,227, 67, 39,140, 27, 37, 19, 74,100,216,114, 36,  5, 50,137, 16, 34, 98, 66,252,181,139,198,188,
+204, 20,179,166, 84,101, 35, 18,137,173, 18,101,  0, 82, 30,153, 91,186,112, 14,118,110,250,  9, 39,110,231, 87,116,159,191,188,
+239, 91,124, 56,247, 75, 20,150,154,  0, 48,175,124, 24, 75, 84,147,185,146, 75,165, 39, 55,173,153,171, 56,243, 16, 56,127,239,
+169,185,210,151, 21, 98,203,175, 63,151, 17,240, 81,121,113,  7,173,126, 35,180,113,107, 20, 46,179,177,185,240,217,151,107,140,
+238,222,245,217,163, 49,165, 69, 26,  3,247,111, 97, 16,137,210,134,179,113,112, 53, 56,250, 71,172, 20,235, 77,243, 11, 10, 18,
+180,181, 69,154,120, 66,112,228,122, 46,  8,121,250, 74,180,251, 98, 22,132,130,167,205,133, 28,255,180,249,228, 84, 76, 62, 68,
+  2,198,234, 33,231, 12,  3,236, 62, 25, 83, 24, 94,133,185,106,221,186,181,202,222,222, 30,142,142,142,176,181,181,173,235,  3,
+187,202,200,149, 82,169,172,119,226,196,  9,185,189,189, 61,132, 66, 33,140, 70, 35,122,246,236,249, 66, 95,170,141,123,200,232,
+118, 61,134,125,213,177, 91,127,156, 59,177,159,143, 62,186,113,152, 46,191, 14,243,247,  0,232,219,185,217,225,229,223,126,223,
+240,163, 57,159,201,236,228, 34,220, 47, 51, 65,192, 48,240,119, 87,194,217, 86,136,232,179, 71, 12, 35,122, 54, 61,108,173,158,
+159, 79,253, 45, 43,190, 91,231,188,114,217,162, 94, 78, 78, 13,221, 75, 74,146, 75,  1, 64,151,255,112,157,173, 71, 72,162,143,
+223,201, 11,205,187, 12,133,187,119, 80,191,186,230,183,160,160, 32, 47, 44, 44,236,126,147, 38, 77, 90,141, 24, 49,130,124,245,
+213, 87, 78,153,153,153,123,172, 53, 87,  0,208,163,103,216, 12, 91, 41,215,174,158, 82, 16, 22,224,161, 68,251,176,167,173,159,
+163,250,119,130,175,159, 31,158,228,234, 90, 20,235,120,113,153, 73, 24,240,227,207,247,110, 54,112, 17,190,205,234, 77,  9,  0,
+ 14,214,185,210,198,191, 58,190,151, 71,175,236, 20, 98,240, 79,203, 71,157, 12,150,209,204, 65,111,228,160, 55,177,208,154, 56,
+232, 76, 28,120,242,244,158, 96, 24,  6,102,150, 47, 63,101,157, 18,104, 95,207,  5,  1, 13,158,142,122,181, 83, 60,157,178,225,
+105, 19, 33,224,236,236, 12, 55,183,218, 27,119,  8, 33, 48,153,159,222,226, 38, 11, 95,209, 68,106, 50,179, 32,132,224,225,195,
+196,143, 83,147,147,  7,  7,  5,  7,117,110,210,172,121, 61,165, 76,  0,  0,213,154,  1,157, 78,199,217,217,217,185,213,171, 87,
+ 79,144,149,149, 85,209,239, 49,168, 69, 55,246,247,253,251, 48,108,216,208,178,251, 55,238, 86,140,168,210,235,245, 76,199,142,
+ 29,237,125,125,125,  5, 70,163,177,180,206, 81, 43,215, 70, 67,124, 67, 59, 44, 25, 63,113, 74,163,110, 81,125,112,238,204, 73,
+ 28,220,191, 99,179, 54, 63,241,164,181, 58, 33, 33,161,255, 54,138, 48, 48,184,209,191,141, 34,172,223, 48,184, 90,131,229,224,
+208,204,190, 89,235,174,190,169,133,102, 28, 59,118, 20, 90,117,238,231, 38, 83,153, 14, 98,178,225,200,142, 31, 39,189,245,225,
+ 34,251,174, 93, 34,225,100,175,132, 72, 36,196,237,155,209, 88,246,197,167,209,208,153,122,213,246,252,172,200,111,147, 38,146,
+ 32,191,250, 31,248,  5,134,227,246,181, 75,120,252, 48, 46,254,238,205,232,176,160,166,237,224,234,229,255,  1,211,164,201, 50,
+146,144, 80,235, 74, 21,132,227, 50, 39, 76,158,249,236,251,127,250,183,246, 45, 26, 74,153,231,111,  0,  0, 22,214,204,109, 89,
+183, 44,191,242, 40,194,234,116, 13, 26,213,222,139,215,238,205, 30,216, 43, 82, 80, 88,106,122, 26,177, 82,155,158,109, 70, 20,
+150,127, 46, 53, 34,216,203, 22,143,227,238,243, 22,173,122, 95,221,238, 76,146, 55,237,157,247, 20, 79,211,206,131,240,164, 70,
+195, 95,109, 90, 57,201,235,235,190,152,195,220, 75,213,226, 94, 74,233,211, 38, 65,177,240,169,177, 18, 11, 42,204,150, 85,173,
+100,  2,193,215,227, 71,246, 70, 97,169, 25, 60, 15,136,132,130,103,155,  4,233, 26,  6, 25, 26, 29, 10, 75, 10,144,156,154,  6,
+ 85,238, 99,  8,  4,  2,184,120, 53,130, 46,221,186,180,106, 56,219, 70, 22, 14,129, 35,251, 71, 10,127,143,206,133, 82, 38, 66,
+105, 81,  6,174,156,216,165,231, 89,110,157,201, 98,218,233, 70,164,113,  9,177,123,204, 86, 62, 58, 10, 74,181, 70,119,153, 88,
+136, 61,155,126,192,200, 55,166,149, 71, 32,  1,  0, 31,207, 91, 12,  8, 24,148,168,180,  0,152, 23,142,138,254,207, 27, 44,177,
+ 64,120,106,227,234, 79,229,  9,  5,114,220, 72,204,193,136, 72, 31,232, 52,133,248,249,135, 53,101,  6,139,177,111, 65,236,193,
+186,133,219,  5,130,222,163,222,156, 29, 31,208,168,137,241, 92, 92, 89,138, 74,107,169,182, 31, 67,251, 17,159,197,223,250,227,
+251,126,106,203,147,119,108,189,194, 56,158,101,191,214,229, 39, 46,170,250, 45,153, 72, 23,173,217, 83,209, 60,248,201,178, 45,
+ 79, 63,115, 28, 56,194,131,240,192,244,207,215,130,229, 57,240, 28,  7,158, 35, 96, 44,156,178,214,112,185, 92,114, 50,188,108,
+165, 67, 85,230,202,209,209, 17,206,206,206,112,118,118, 70,185, 33,250,171,205,130,193,193,193,176,181,181,197,165, 75,151,160,
+ 80, 40, 96, 99,243, 98, 19,228,219,186,135,190,214,182,251,208,109,221,  6,190, 41, 56,253,251,207,220,245,243, 71, 70,232,243,
+ 31, 88,109,  2, 56,142, 99, 44, 22, 11,122,119,109,153, 22,147,152,126,252,139, 69, 11,251,180,238, 62, 92,214, 33,196, 13,122,
+ 19,139,172,204, 76, 68,159, 61,104,  8,242,115, 62,209,165,109,227, 52,139,197,  2,142,227,106,173,192, 13, 70, 83,145, 80,172,
+112, 30, 53,250,117,217,205, 27, 55,182,217,184,135,236, 16,  8,249,187,132, 19, 54,  3,200,107,205,154, 53,134,217,194, 67,167,
+211, 20,191, 72,190, 19, 18, 18,110,172, 90,181,170,145, 88, 44,246,221,189,123,119, 97, 73, 73, 73,157,150, 11, 58,121, 49,113,
+181,136, 41, 73,146,242,230, 49,254,118,154,158,233,157,218, 99,244,128, 78,216,249,199,101,156,191, 20,141,180, 50,219,152, 50,
+ 86,116, 32, 35, 45,219, 24, 86,175,116,223,160,246,245,133,123, 54,149,236,115,235, 54,247, 53, 66,100, 39, 11,206, 47,208, 90,
+ 95,121,  3, 26,189,  5,246,202,167,243, 53,149, 71,178,132, 12, 99,181, 19, 98,128,228, 75,209,183,195, 91,  5, 55,193,157,100,
+ 53,242, 85, 70,232,141, 44,120,158,128,  7,129,179,157, 20,114,137,  0,233,169,201,224,137, 57,165,110,245, 12, 10,250, 14,159,
+ 34,122,122, 30, 94, 36, 22,139, 64,158,213,139, 10,185,180,204,205,205,205,170,  8,150,153,101, 49,172, 79, 91,180,107,221, 12,
+131,167,172,  0,  0,156,217, 60,  7, 78,182, 98,236,221,187, 23,233,151, 87,109, 13,232, 48,237,100, 92,108,252,240,248, 59, 87,
+ 95,239,219, 82,209,194, 67,148, 93,109,211, 70, 89, 89,217, 62,134, 97,164, 18,137,164, 79,231,206,157,235,237,219,183, 79,229,
+226,226,194, 75, 37,146,130, 65,  3,  7,240, 98,137,164,162,236, 92,185,114, 69, 60,101,202, 20,187,146,146,146,244,188,188,188,
+104, 66,136,165,230, 23,192,208, 40,  8,176,  3, 12, 35,183, 85, 40,211,218, 71,141,246,106,221,174,173,195,144, 97, 35, 33,147,
+202,112,234,228,113,124,183,106,217,238,178,156,251,111,214,229, 82,190,140, 81,132,106,181,131, 54, 41,225,110, 73, 74,190,201,
+ 73,236, 24, 12,177,204,110, 10,227,224,181, 70, 40,179, 93,224,218,124,136,253,222, 67, 71, 17, 27, 23,135,122, 10, 11,158, 60,
+ 78,210,197,197,220,249, 73,199,136, 23,145,130,  4,157,213, 17,230, 34,110,120,251,113,125,156,140,102, 14, 23,207,254, 97,224,
+ 89,190, 79,244,133,163,143,125, 26,181,150,135,183,238,225, 84,120,112,195, 48,  0, 59,107,211, 73,185,190,245,223,186, 94,  4,
+180,125, 45,251,232,201, 11,182,158,254, 65, 66,  6, 66, 24,244, 58, 20,164,197,178,  6,117,174, 46, 47,246,128,151, 53,233, 75,
+ 99,179, 62,255,252,171,181,239,180,106, 30,102, 67,136,228, 79, 17,171,114, 99, 85, 88,106,130,139,157, 20, 70,109,  9, 30,223,
+187,100, 40, 16,231,125, 90,243,179,206,162, 44, 42, 42,150,150,255,174, 40,115,172,175,118, 80,203, 42, 76,160, 16,112, 80, 59,
+ 26,255,213,148, 86, 44,229, 56,139,210,154,219,211,193, 86,142,216,148,156,138, 14,237, 50,241,211,190, 87, 82,177,176,162, 31,
+150,149,247,121, 75,145,212, 22, 89, 69,  6, 48, 32,224, 57, 22,172,197,  4, 77,105, 41,178,178,115,145,151,155,  7,141, 70,  5,
+165,173, 19,194, 91,180,129,157,173, 13, 30,220, 62, 15,128,177,234,229,215,192, 75,130, 91,183,106, 37,142, 79, 43,131,217,194,
+ 67, 12, 51, 46, 31,219,105,176, 88, 76,  3,243, 98, 15,156,173,235,115,152,229,201,233,184,196,180, 48, 31, 87, 79, 38,230,177,
+ 26, 91,215,127, 15,211,179, 72,166,197,194, 33, 46, 93,139,156, 98, 29, 50, 51,210,  8,120,238, 52, 94,113,170, 53, 88, 44,203,
+202,253,252, 27, 96,244,148,177,248,233,167,181,120,248, 36, 29,191,252,248,204, 92,221,251,253,138,149,134, 34,170,124,174, 12,
+109,238,131,175,223,252, 41, 37,243,208,157, 98,129,222, 84,243,250, 83,114, 87,127, 68,190,249,237,  9,189,166, 88,202, 25,117,
+162,195, 91,223,220, 81,149,230, 83,223,198,152,150,204, 26,  5, 91,133,  8, 12,195,160,188, 89,240,199,197,147,161,148,  9,193,
+ 48, 12,244, 70, 22, 99,103,172,196,214,149, 51, 65,  0,188,245,206, 44, 93,117,233,172,100,132,152,137,125, 26, 14,250,242,215,
+132,131,151, 83,157,159,244,239,223, 69,221,178,101, 75,149, 66,161,128, 66,161,128,189,189, 61,156,156,156,224,232,232, 88,107,
+222,159,253,238, 94, 91,159, 43,129, 64,  0, 27, 27, 27,216,218,218,194,198,198,230,223,140,219,243,154,255,102,174, 60, 26,141,
+108,211,109,232,142,238,131, 38,  9, 78,255,254, 11,127,235,252,225,145,250,252,196,  3,214,126, 71,207,154,117,238, 14, 27, 54,
+172,233,148, 41, 83, 36,159,190, 51,236,196,137,243,183, 31,238, 63,181,111, 96,177, 74,227, 75,  8,129,163,131,109,198,136,158,
+ 77, 15, 71,182, 14, 73, 59,115,230, 12,191, 99,199, 14, 35,195, 48,177,181,165,179,176, 48,127,227,153,211,103,151, 71,118,233,
+138,245,155,118,244,143, 79,184,223,255,241,227, 36,248,250,  7,160, 65,195, 96,232, 24, 39,156,189,112,  9,154,226,220,141,214,
+164,179, 50, 77,155, 54,245,110,222,188,185,143, 74,165, 50,204,159, 63, 63,132, 16,114, 32, 60, 60,188, 85,203,150, 45,115,239,
+220,185,147, 89,221,176,255,202,154, 87,215, 14, 41,  0,176,185,126,215,137,187,179,204,170, 15,  0, 44,243,243,247,195,249, 75,
+209,136,190,124,125,109,161,210,111,209,155, 99, 39, 78,174, 63, 72,248,214,160,246,245,133,110, 78, 74,108,255,229, 91,225,161,
+232,212,149,169, 69,220,  6,  0,139,173,249,142, 42, 30,214, 26, 51, 58, 54,174,  7, 11, 71,192,147,167,166,203, 78, 46,174,178,
+137,176, 42, 77,145, 73,246,230,212, 41, 83, 30,135, 55,107,241,225,216,137, 83, 37, 45,  2,124,113,227,145, 10, 96, 24,212,243,
+176, 65, 78, 78, 14, 46,238,253,133, 45,201,122,176, 86, 40,228,191,168,203,245,204,188,189, 51,168,252,179,167,167,231,228,152,
+184, 56,156, 63,127, 30,229,198,202,213,213,181, 74,131,245,188,102, 73,137,230,202,226, 21,235, 59,190, 61,110, 48,  6,116, 13,
+195,133,155,143, 97,122, 54,223, 82,249,144,240,228,232,117,210, 15, 70,  5,152,222, 25,214,168, 84,111,145,166,126,158,162,190,
+ 88,121, 18,217,231, 53,  9, 33, 38,134, 97, 14, 37, 38, 38,118,106,222,188,121,253,163, 71,143, 22,199, 95, 63,241,167,137,238,
+102,205,154,101,251,211, 79, 63, 41,  9, 33, 87,140, 70,227, 19,171,242, 46,192,246,219,183,110, 57,155, 45, 60, 46, 93,191,219,
+184, 71,199, 22,224,  9,112,243,230, 77,108,248,117,131, 33,246, 94,204, 10,109,158,199, 23,213, 77,110, 91,221,245,228,254,194,
+ 40,194,114, 77, 66,206,179,182,238,161,107,175, 92,186, 48, 79,230,213, 10,161,253, 62, 29,148,117,247,208, 32,143, 38,189,225,
+ 18,208,  1,217,247, 14,225,202,137,109, 71,121,150,157, 35,231,  5,105,218,130,  7, 90,107,239,247,114,100, 10,229,123, 77, 90,
+118, 65,122, 90, 42, 82,146,226, 54,235,139,146,178,109, 61, 66, 55,103,103,166, 77,109, 24,214, 17,151, 79,236,124,191, 58,131,
+ 85, 91,153,119,147,107,214,158,187,124,117,116,214,158, 67,238,154, 50,189, 66, 36, 18,232,100, 34, 38, 79,162,123,188,203,218,
+116,146,132,  4,179, 91, 96,135, 97, 99,166,124,246,199,202,175,230,137,221, 29,101,200, 45, 49,160, 84,111,134, 70,103,134,128,
+ 97, 16,228,101,  3,189,182, 20,209, 71,183, 88, 56, 67,209, 40,242,232,207, 17,183,202,154,174, 97,131,191,100, 24, 76,255,236,
+179,185, 16, 74,237,189, 26,246,248,212, 44,104,232,  1, 39, 60, 55,153,121, 61,160, 97,143, 79, 97,212,228, 13,252,236,179,185,
+ 33,132,144, 30,174, 97,131, 53,229,107, 17, 86,151,247, 34,141, 25,175,119,243,133,153,125, 58,127, 24,203,  3, 28,255,244,133,
+159, 16,128,212,208,110, 95, 89,147,  0,146, 93,127, 92, 65,118,158, 10,122,147,  5, 70, 19, 11,179,133,131, 64, 40,132,163,147,
+ 35,130, 27, 68,192,209,209,  1,249,133,133,184, 25,125, 25,215, 18, 99,146,  9,240,101, 97, 61,245, 54,107,190, 35, 70,100, 19,
+228,238,230,194,228,149,154,160,144, 10,113,237,246,121, 11,  1, 54, 90, 99,174,170,210, 84,235, 84, 43,231, 44, 94, 51,230,167,
+111, 23,120, 52,109,104,143,204, 66, 61, 50, 11, 12,208, 24,158,190,223,176, 28, 15,147, 94,141,196,155,199,114, 89,232, 86,254,
+115, 35, 88, 98,177,241,230,189, 68,217,156, 69,223,224,254,163,100,108, 88,251,189,214,104, 49, 91,109,174,170,226,183,119, 26,
+236,172,219, 17,207,230, 45,253, 34,181,150, 23,238,231,154,  5,  9, 15,158, 16, 28,190,158, 91,209, 44,200, 63,235, 81,121,231,
+177,170,182, 66, 35,254,230,189, 22, 31,151, 27,161,239,126,207,186, 38,147, 21,242,233,233,233, 37,219,182,109,171, 48, 61, 66,
+161, 16,229,163,  7, 77, 38, 83,173,163,138,156,236,165, 97,227,250,214, 31, 85,157,185, 18, 10,133,224,121, 30,246,246,246, 80,
+ 40, 20,117,110,122,180,113, 11,233,217,166,251,208,157,221,  7,191, 37, 56,115, 96, 61,127,235,252,161, 17,101,249,137,191,215,
+245, 59, 42, 41, 41,137,103, 24, 38,105,197,138, 21, 45, 54,108,216,208,112,246,236,217, 79,214,127, 53,245,187,167,111,112, 79,
+151, 69,188,115,231, 14,153, 54,109,154,209, 96, 48, 36,151,148,148,220,182,102,145,107, 93, 94,226,138,223,126, 90, 30,146,145,
+149,243, 70, 64,120, 27,184, 54,108,  3,143,160,182, 40,209,152,113,227, 81, 54,158,220, 63,131,132, 43,123,119,233, 11,220,151,
+214, 37,189, 45, 90,180,240, 19,139,197,  3,  1,132, 40, 20,138,250, 12,195, 72,197, 98,241,107, 12,195, 36, 49, 12,115, 63, 36,
+ 36,228, 12,170, 89,190,168, 42, 82,207,111, 52,214,239, 58,113, 77,154,198,174,219,147, 92, 93, 68,154,198,238,142, 78,230, 48,
+ 51,255,204,106,163,123,175, 21, 43,137,185, 48,126,207,166,210,125,219,127,249, 86, 56,118,242, 44, 46, 78,237,244,129, 72, 33,
+ 61,245,213, 27,214,143,230, 22, 48, 76,206,236,217, 31,253,107,154,134,103,145,171,103, 83, 54,100, 91,163,241,108, 61,197, 79,
+ 20, 94, 97, 63,196,125, 48,101,113,179,214, 29,199,117,238, 59, 74,192, 74,108,113,226,247,117, 36,249,222,217, 61, 34,194,205,
+211,229, 63, 78,254,171, 15,  9,147,201, 84,171,185,170,178,233,214, 89,221,245,143,147,231,223, 56,114,252,194, 87,125,123,118,
+114,254,241,243,215,240,205,207,  7, 96,163,144,129,240, 28, 70,117,247, 27,113,127, 71,239,129,190,238,114,239,125,231, 50, 47,
+ 78, 95, 21,247,137, 78,103,126, 88,219,218,121,207, 12,243, 37, 59, 59,187,130, 78,157, 58,181,147,201,100, 76, 97, 97,161,200,
+205,205,141,117,112,112, 48,101,102,102,234,140, 70,227, 62, 66,136,182, 46,249, 52, 91,120,164,228, 25,112,112,255, 62,220,189,
+126,  6,247,239, 39,106,238, 39,220,255,158, 17,145, 85,101,185, 15, 95, 40,178,202, 87, 57,138,144,212,121, 20,161, 86,168, 88,
+122,231,200, 55, 93,131,187,191,223,222, 57,176, 35,156,252,159,  6,138,212,153,113,200,184,185,231,160, 38, 91, 50,146,144,184,
+ 23, 30,251,238,229,211, 48,152,  8,165,184,122,254, 15, 16,158, 95, 11,  0,132,231,215,222,185,124,116,106,219,126,111,161,158,
+ 91,253,230, 12,195, 48,117, 93,143, 17,  0,100,  2,179,250,143, 77, 75,247,164,164,164,224,193,131,  7,120,244,232, 17,138,139,
+139,177, 61,229,162,186, 46, 58,249,143,175,158,114,111,212,185,247,152, 55,103, 28, 30, 58,124,168,220,175, 65,144, 32,196,199,
+ 30, 46,182, 34, 36, 38,103,225,113, 92, 18,255,232,222, 69,  3,209,231, 15, 41,124,116,165, 90,195,231,218,100,164,187, 64,200,
+204, 57,115,232,233,218,130, 81,131,223, 12,249,120,250,236,118,245,156,157,170,124,142, 23, 23,149, 72, 23, 46,156, 31, 82,190,
+127,109,107, 17, 10,132, 66,205,228,169,239,217,  8, 24,  1,202, 47, 23, 41,111, 35,171,248,241,244,131, 68, 44,170,181,140, 78,
+ 28, 26,  9,150,231,161,213, 91,160,209,155,160,214, 24,145, 83,168, 66,252,253, 71,184,126,233, 56, 82, 30, 39,105, 88,150, 61,
+  7,130,253,  5,206,234, 93,207, 79,172, 91, 99,249,132,208,175,158,147, 61, 82, 85,  6,200,165, 34,100,167, 63,102,205,172,225,
+133, 39, 89, 47,140, 57,148,227, 30, 62,184,215,196,119, 62, 61,222,185,115,164, 67,179,136, 86, 74, 23,123,123, 72, 68,192,227,
+244,124,220,187,125, 67,155,246, 48,166,148,179,232,251, 20,198, 29,250,203,171,180,252,207, 26, 44, 51,199, 70,205,250,116,217,
+ 73,142,227, 20, 34,161, 80,111, 33,124,159,191, 98,174,254, 46,  8,225, 51,223,121,255,163,138,168, 46,  0, 88, 56, 94,241,214,
+ 59,179,245,149,223, 16, 24, 11,167, 44,143, 92,213, 50, 82, 79, 88,160, 50,106,230,254,116,119,243,242,205,  9,123,  1, 36,252,
+213,145,125,  0, 80, 82,106,186,235,220,115,247, 96,141,142,101,  0,220,175, 66, 83,219,189,123,247, 10,179,245,172,185,206,234,
+ 10, 66, 42, 87, 78,237, 54,240, 77,193,153,131, 27,248,155,231, 14,142,124, 17,115, 85,169,  2, 51,  3,184,206, 48, 76,220,188,
+121,243, 90,187,187,187,187,207,159, 63, 95, 94, 90, 90, 42,254,241,199, 31, 13,133,133,133,185,165,165,165,209,132, 88,223, 63,
+225, 89,165, 57, 81,225,222,120, 29,179,119, 67, 47, 39, 55,239,222,142, 46,190,141, 74, 10, 50, 31,151, 22,101, 30,103,120,156,
+210,228, 39, 70,215, 53,173, 49, 49, 49,233, 77,155, 54, 61, 32, 20, 10,111,  3,112,  1, 96, 71,  8, 41,102, 89,182, 68, 44, 22,
+231, 38, 38, 38,214,121, 65,214,212,243, 27,141,157,223,249,117, 71,177,142,151,152,  4,146, 29,169,231, 55, 26,  1, 32,239,228,
+108, 29,128,131,238,221,230, 12, 59, 20,157,250, 93,124,137,195,251,249,231,150, 30,170,171,126,214,157, 93, 65, 47,171,252,235,
+179,227, 51,  1,188, 97,227, 30,242,109,236,157,232,  5, 12,129,152,  3,251,165, 46, 47,233,214,203,208, 23,139,197,134, 86,173,
+ 90, 85, 57, 90, 80, 38,147,213, 56,191,214,179,  7,253,  6,166,107,215, 77,199,207, 92,122,227,216,169,203, 95,181,107,223,201,
+ 89,238,227, 13,127, 39, 51, 54,125,212,242,253, 51,119, 10,110, 12,250,232,226, 79, 79,178, 13,247,  8, 33,134,186,164, 77,163,
+209, 60,100, 24,166,164,172,172,108, 48, 33, 36,131, 97, 24,223,146,146,146, 24,139,197, 18, 91,103, 35,192,227,245,246,237,219,
+108,103, 24, 70, 68, 88,254,235,104,177,112,135, 33,231,126,230,139, 24,138, 63, 69, 87, 27,216, 99,242,212,105,193,129, 65,141,
+130,203,215, 34, 12,171,111,135,177, 19,223, 14,174,223, 48, 56,248, 95,235, 19,214,252, 66, 69,178,111,235, 25,247,166, 61, 19,
+ 79,174,248,220,249,241,149,119, 20,245,124,108,181,133,169,197, 37,169,183, 86,232,242,221, 87, 60,191, 66, 67, 93, 73,121, 20,
+191,106,195,138, 79,102,231,100, 37,111,208,230, 63,140,  3,  0,109,254,195, 56,165,123,163,207, 11,115, 51,103, 23,229, 63, 89,
+241,162,215, 66,171,213,102,111,219,182,205,177, 99,199,142,  2,119,119,119, 20, 20, 20,224,220,185,115, 60,207,243, 89,117,213,
+202,123,120,241, 28, 19, 24, 88,111,199, 38,245,215, 34,133, 93, 63,150,131, 23, 33,128, 72,128, 28,179, 81,125,188,192, 81,255,
+ 17,185, 23, 93,115,185,228, 57,134,  8,136,160,124,109, 65,158,231,153,111,126,216,146, 42, 20, 75,171,108, 82,229, 44, 38, 37,
+207,243, 86,175, 69,152, 39, 76,115, 14,183,132, 90, 53,138, 47,142,121, 80,203,203, 41, 57,209,161,239,248,222, 44,203, 89,  0,
+ 24, 42,109,249,132, 48,103,193,112, 39, 11,235,105,162,235, 98,170,254, 84,207,155,205,142, 16, 74, 96,167,176,128,  1,131, 82,
+181, 74,230,202, 73,239,255,149,178,148, 23,119, 48,158,233,218,213,223,116,250,236,132, 11,151,174,142, 36, 60,215,128, 35,  0,
+  8,147, 98, 50, 27,246,228,219, 23,110,126,209,244,254,175,193,144,191,113, 62, 10,107,155, 75,254,219, 52, 25,134,145, 60,171,
+172,185,202,203,223,188,140,116,214,180,182,224, 95,201,187,157,103,227, 78, 50,185,242, 35,157, 78,179, 65,151,247,240,240,203,
+188,158, 12,195, 56,200,100,178,  8, 91, 91, 91,113, 97, 97,225,117, 66,136,250, 85,252,222, 43, 19,249,230, 94,151, 30, 61,195,
+102,156,188,152,184,250, 89,243, 97,  5, 62, 35, 87,201,199,245,235, 54,107,243,254,131,255, 54,138,240, 85,200,251,223,165,201,
+116,237, 42,114, 43,177,127,131,227,248, 47,187,  7,107,116,185,201,137,211, 46,197, 22, 92, 39,132,104,254, 74, 58,165, 82,233,
+ 88,179,217,172,144, 72, 36,122,147,201,180,237,191, 37,239,110,225, 67,190,  0,131,198, 86,139, 16,220,207,143, 59, 48,191,214,
+103, 72,147, 38, 18,101,  1,156,116,133, 46, 69,117, 53, 86,255,145,239,157, 97,132, 77,155, 54,141,148, 72, 36,126, 28,199, 41,
+ 77, 38,147, 78,175,215,167,164,166,166, 94,173,110, 65,242,191, 59,157,238, 77,135,172, 18,139,197, 31,  0,128,197, 98, 89,147,
+ 23,123, 96, 70, 77,199, 86,183,255,255, 75,125, 52,114,164,144,236,217,195,253, 29,223,145,119,196,  8,149,197,194, 58,148,255,
+ 46, 17,139,212,153,119,246, 58,254,167,202,210, 43,  7,121,182, 60,194,223,177,  1,136,162,154, 84,147,106, 82,205, 42,246, 21,
+208,235, 73, 53,255,147,154,158,141,  7,248,122, 54, 30,224,107,237,241, 85,237, 79,175, 39,  1,221,170,223, 68,212, 98, 82, 40,
+148,255,192,139, 29, 79,175,  2,229, 63, 73,118,194,225,140,191,115,127, 10,133,  1, 16, 85,205,  3,208,234,208, 31,195, 48, 81,
+ 47,240,128, 61, 77, 53,169, 38,213,164,154, 84,147,106, 82,205,127,150,102,109,218,175, 76,211, 35,109, 34,164,154, 84,147,106,
+ 82, 77,170, 73, 53,169, 38,109, 34,124,185,155,  0, 20, 10,133, 66,161, 80, 40,148,151, 10, 53, 88, 20, 10,133, 66,161, 80, 40,
+212, 96, 81, 40, 20, 10,133, 66,161, 80,131, 69,161, 80, 40, 20, 10,133, 66, 13, 22,133, 66,161, 80, 40, 20, 10,229,197,249, 91,
+103,114,167, 80, 40, 20, 10,133, 66,249, 39, 66, 35, 88, 20, 10,133, 66,161, 80, 40,212, 96, 81, 40, 20, 10,133, 66,161, 80,131,
+ 69,161, 80, 40, 20, 10,133, 66, 13, 22,133, 66,161, 80, 40, 20, 10,133, 26, 44, 10,133, 66,161, 80, 40, 20,106,176, 40, 20, 10,
+133, 66,161, 80,168,193,162, 80, 40, 20, 10,133, 66,161,252,231, 13, 22,195, 48, 81, 84,147,106, 82, 77,170, 73, 53,169, 38,213,
+164,154,212, 96, 81, 40, 20, 10,133, 66,161, 80,168,193,162, 80, 40, 20, 10,133, 66,161,  6,139, 66,161, 80, 40, 20, 10,133, 26,
+ 44, 10,133, 66,161, 80, 40, 20, 10, 53, 88, 20, 10,133, 66,161, 80, 40,255, 33, 24,  0, 85,142,  4, 32,132,156,182, 90,228,  5,
+ 70, 19,212,166, 79, 53,169, 38,213,164,154, 84,147,106, 82,205, 87, 79,179, 54,237,186,248,143,255,106,  8, 33,127,219,  6, 32,
+138,106, 82, 77,170, 73, 53,169, 38,213,164,154, 84,243,159,182,209, 38, 66, 10,133, 66,161, 80, 40,148,151, 12, 53, 88, 20, 10,
+133, 66,161, 80, 40,212, 96, 81, 40, 20, 10,133, 66,161, 80,131, 69,161, 80, 40, 20, 10,133, 66, 13, 22,133, 66,161, 80, 40, 20,
+ 10,229,197, 97,158,141,  6,160, 80, 40, 20, 10,133, 66,161,188, 36,104,  4,139, 66,161, 80, 40, 20, 10,133, 26, 44, 10,133, 66,
+161, 80, 40, 20,106,176, 40, 20, 10,133, 66,161, 80,168,193,162, 80, 40, 20, 10,133, 66,161, 80,131, 69,161, 80, 40, 20, 10,133,
+ 66, 13, 22,133, 66,161, 80, 40, 20, 10, 53, 88, 20, 10,133, 66,161, 80, 40,148,255,188,193, 98, 24, 38,138,106, 82, 77,170, 73,
+ 53,169, 38,213,164,154, 84,147, 26, 44, 10,133, 66,161, 80, 40, 20, 10, 53, 88, 20, 10,133, 66,161, 80, 40,212, 96, 81, 40, 20,
+ 10,133, 66,161, 80,131, 69,161, 80, 40, 20, 10,133, 66,161,  6,139, 66,161, 80, 40, 20, 10,229, 63,  4,  3,160,202,145,  0,132,
+144,211, 86,139,188,192,104,130,218,244,169, 38,213,164,154, 84,147,106, 82, 77,170,249,234,105,214,166, 93, 23,255,241, 95, 13,
+ 33,228,111,219,  0, 68, 81, 77,170, 73, 53,169, 38,213,164,154, 84,147,106,254,211, 54,218, 68, 72,161, 80, 40, 20, 10,133,242,
+146,161,  6,139, 66,161, 80, 40, 20, 10,133, 26, 44, 10,133, 66,161, 80, 40, 20,106,176, 40, 20, 10,133, 66,161, 80,168,193,162,
+ 80, 40, 20, 10,133, 66,161,188, 56,204,179,209,  0, 20, 10,133, 66,161, 80, 40,148,151,  4,141, 96, 81, 40, 20, 10,133, 66,161,
+ 80,131, 69,161, 80, 40, 20, 10,133, 66, 13, 22,133, 66,161, 80, 40, 20, 10, 53, 88, 20, 10,133, 66,161, 80, 40, 20,106,176, 40,
+ 20, 10,133, 66,161, 80,168,193,162, 80, 40, 20, 10,133, 66,161,  6,139, 66,161, 80, 40, 20, 10,133,242,159, 55, 88, 12,195, 68,
+ 81, 77,170, 73, 53,169, 38,213,164,154, 84,147,106, 82,131, 69,161, 80, 40, 20, 10,133, 66,161,  6,139, 66,161, 80, 40, 20, 10,
+133, 26, 44, 10,133, 66,161, 80, 40, 20,106,176, 40, 20, 10,133, 66,161, 80, 40,212, 96, 81, 40, 20, 10,133, 66,161,252,135, 96,
+  0, 84, 57, 18,128, 16,114,218,106,145, 23, 24, 77, 80,155, 62,213,164,154, 84,147,106, 82, 77,170, 73, 53, 95, 61,205,218,180,
+235,226, 63,254,171, 33,132,252,109, 27,128, 40,170, 73, 53,169, 38,213,164,154, 84,147,106, 82,205,127,218, 70,155,  8, 41, 20,
+ 10,133, 66,161, 80, 94, 50,212, 96, 81, 40, 20, 10,133, 66,161, 80,131, 69,161, 80, 40, 20, 10,133, 66, 13, 22,133, 66,161, 80,
+ 40, 20, 10, 53, 88, 20, 10,133, 66,161, 80, 40,148, 23,135,121, 54, 26,128, 66,161, 80, 40, 20, 10,133,242,146,160, 17, 44, 10,
+133, 66,161, 80, 40, 20,106,176, 40, 20, 10,133, 66,161, 80,168,193,162, 80, 40, 20, 10,133, 66,161,  6,139, 66,161, 80, 40, 20,
+ 10,133, 66, 13, 22,133, 66,161, 80, 40, 20, 10, 53, 88, 20, 10,133, 66,161, 80, 40,212, 96, 81, 40, 20, 10,133, 66,161, 80,254,
+243,  6,139, 97,152, 40,170, 73, 53,169, 38,213,164,154, 84,147,106, 82, 77,106,176, 40, 20, 10,133, 66,161, 80, 40,212, 96, 81,
+ 40, 20, 10,133, 66,161, 80,131, 69,161, 80, 40, 20, 10,133, 66, 13, 22,133, 66,161, 80, 40, 20, 10,133, 26, 44, 10,133, 66,161,
+ 80, 40,148,255, 16, 12,128, 42, 71,  2, 16, 66, 78, 91, 45,242,  2,163,  9,106,211,167,154, 84,147,106, 82, 77,170, 73, 53,169,
+230,171,167, 89,155,118, 93,252,199,127, 53,132,144,191,109,  3, 16, 69, 53,169, 38,213,164,154, 84,147,106, 82, 77,170,249, 79,
+219,104, 19, 33,133, 66,161, 80, 40, 20,202, 75, 70, 84,213, 31,197,109,151,228,177, 44,235,  6,  0, 34,145, 40,223,114,227, 51,
+207,154, 68,124, 61, 61,123,112,192,122,  0, 16,  2,111,103,100,103,159,170, 66,243, 20,203,178, 78,207, 52, 75, 44, 55, 62,235,
+ 93,147,166,184,205,151, 39,254,180,255,245,121, 61,171,136, 47, 10,197,109,190,204,126, 46,173, 94,117,  8,223,113,255, 31,233,
+252, 95,209,252, 39, 35,105,183, 36,207, 98,121, 90,142,196, 98, 81,190,249,122,205,229, 72,210,246,203,236, 63,237,127,109,158,
+123, 77,154, 74,133,172, 40,208,219,117,101, 77,154, 79,178, 11,103,106,117,  6,231,154, 52,255,103,238, 77, 43,241,240,240,104,
+ 37, 16,  8, 62, 99, 24,198,190,210,159,239,101,101,101,125, 72, 75, 37,133, 66,121,229, 12, 22,203,178,110,183,127, 95,  0,173,
+ 17,232, 49,254, 75,183,128, 33, 63,111,255,183,125, 12, 37, 82,125,210,129,166, 82,104,157, 20, 98,214, 62, 41, 41,137,  1,  0,
+ 47, 47,175,245,  0,252,170,208,116,186,253,251,  2,232, 76, 64,231,209,139,156, 58,249,250,218,231, 10,133,179,100, 10, 69, 55,
+131,193, 16,  6,  0,114,185, 60,222,168,215,159,243,224,184,111,159,223,191,186, 12, 84, 78,107,247,113, 95,186,133, 14,249,249,
+125,142,231,165,250, 39,123, 58,243,154, 52,145,132, 51,253,248, 70, 78,206,177,  5,  0,103,205,  5,169,124,222, 46,163, 62,117,
+246,243,244,236, 46,149,203,155,219,217,219, 71,242,132, 52,230,121,158,225, 88, 54, 65, 91, 86,118,137,103,217,187,156, 69,231,
+124,251,192, 82,190,166,116, 62,159,151,145,128,232,154,135,199,  8,165,141, 77, 55,129, 72,212,  1,  0,120,150,189,170,211,106,
+207,181,203,205,221,107, 77,222,173,189, 62, 47,186,255, 63, 13,139,133,117, 75, 62,177,  0, 70, 11, 16, 49,252, 43,183,102,175,
+111,222, 14,  0,166,252,187,238,101, 73,135,218,  2,128, 77,224,128,235, 50,143,136, 60,  0, 16,165,229,184, 61, 60, 50, 15, 70,
+ 11,208,120,192, 34,183,218, 52, 39,206,223,237,252,241,228, 97, 50,  0, 56,185,239,135, 70,103,247,175,237, 11,  0,221,135, 77,
+ 59,214,107,248,244,135,  0,240,245, 47,251,157,119,126,245, 90,141,154,214,221,155,106,137, 58,233, 72,144,169, 52,199,209,215,
+ 70,228,145,148,148, 36,168,203,189,233,  3, 56,228,  0,239, 10,132,194,200,192,160,160,  8,  0,228,201,227,199,119, 56,150,189,
+236,  9,252,248, 50,203,146, 80, 40,124, 63, 43, 43,107, 96,229,191,121,123,123,211,  2, 73,161, 80, 94, 77,131,  5,  0, 90, 35,
+112,225, 17,208,165, 93, 51, 76,126,189,159,109,229,255,237,255,117,177, 95,102,220,169,208,165, 27,191, 22,132,133,133,225,201,
+147, 39, 86,157, 76,103,  2,206, 39,  1, 50, 67,138, 93,190, 84,250,120,254,103,159,217, 71, 70, 70,138, 60, 61,159,190,132,231,
+231,231,183,187,124,249,114,171,133, 11, 23, 78,149, 25, 82, 74,116, 38,104,206, 39,213,174, 91,158,214,176, 70,245,241,217,244,
+215, 28,  0, 96,213,236,189,173,142, 94,189, 91, 47, 37, 37,165,199,210,165, 75,139,188,163,163,215,214,227,184,141,177,249,249,
+ 25,214,164,115,215,137, 24,121,160,233, 84,192,136,137, 19,247,249,251,251,219,122,121,121, 49, 74,165, 18, 66,161, 16,165,165,
+165,126,137,137,137,125,239,222,189,171,189,116,237,160, 52,246,238,240, 39,153,194, 22,  6,107,242, 46, 97, 11,229,113,193,193,
+241, 35,250,246,245, 25, 48, 96,128,188, 65,131,  6,  0,128,148,148,148,224, 63,254,248, 99,244,209,163, 71,231, 75,216, 66, 86,
+103,130,161,182,188,151,107,  2,128, 28,232,224,232,230, 54, 86, 40, 22,135,177, 44,235,253, 44,186,144,197, 89, 44,241,170,252,
+252,109,207,239, 79,249,119,140, 22,224,126, 14, 16, 21, 25,129,113,195,162,108,  0,224,147, 81, 75,218,165,165, 60,146,152, 76,
+ 38, 52, 10,105,220,113,241, 87, 43, 79, 64, 32,192,214,253,167, 43,246,183, 70,243,222,253,100, 44, 88,188, 10,217,177,123,219,
+113,234, 71,221, 52,165,106, 33,  0,216, 59, 56, 12,219,187,107,199, 57,175,166, 35,174, 61, 42, 52, 91,165, 89,211,189,121,124,
+215,247,158,153,113,231,154,252,116,242, 55,177,159,159, 31, 98, 99, 99,235,116,111, 66,157,104,199,123,122, 38,124,251,209, 71,
+ 30,157, 59,119,134,173,173, 45, 68, 34, 17, 88,150,141,186,124,249,114,212,130,  5, 11,166, 65,157,168,181,246,222,180,130,111,
+189,188,188,186, 13, 30, 62,214,179, 91,239,  1, 24,214,167, 35, 45,136, 20, 10,229,213, 53, 88, 34,145, 40,191,231,132,165,110,
+145,109,195,113,243,238, 67,117,106,122, 78, 89,249,255, 84,247,247, 55, 26, 29, 21,216,100,221,209, 63, 96, 52, 26,113,229,202,
+ 21,220,189,123, 23, 41, 41, 41,152, 55,111,158, 81,  8,188, 93,141,102, 73,231,209,139,156,100,198, 12,219,150,206, 25, 13,118,
+110, 63, 39,212,235,245, 56,127,254, 60, 74, 74, 74, 32,149, 74,225,227,227,131, 78,157, 58,137,206,159, 63, 95,111,212,152,177,
+ 14,189,134, 76, 74, 54,202,124,203, 68, 34, 81, 73,181, 25, 16,137,242,123,140,255,210,173, 73,112,125, 60, 78,205, 86,127,246,
+213,175,101, 60, 79, 68,186,180, 76,243,133, 11, 23, 16, 17, 17,129, 93,187,118, 57,151,148,148,124,190,105,211,166,207, 60,191,
+223,184, 38, 39, 51,113,118, 13,122, 37,157, 71, 47,114,106,196,157,245,223,187,227, 55,201,221,187,119, 37,235,214,173, 67, 81,
+ 81, 17,164, 82, 41, 28, 29, 29,225,225,225,129, 70,141, 26, 49,239,190,251,174,109,183,110,137,248,124,230, 36,255, 28,199,193,
+137,213,165,179, 92, 83, 98,202, 81,  6, 11,111,  5,174,223,188, 89,208,166, 77, 27,166,242, 62,126,126,126,232,218,181,171,124,
+232,208,161,129,211,222,125,143,143, 26, 58,229,177, 89,234,169,171, 77, 19,218, 12,133,179, 46,218, 43,106,244,232, 67,139, 22,
+ 45,114,244,240,240,128,141,141, 13,  0, 64,173, 86,251,164,166,166,182,155, 63,127,254,240,235,247,118,137, 58, 15,200,200,134,
+141,175,190,166,235,249, 79, 69, 44, 22,229,151, 71,141,236,108, 20, 37, 25,153,121, 90,  0, 48,153, 76, 48,153, 76, 48, 26,141,
+120,103,218, 20,225,219,195,219,  4,249, 71,190, 31,147,146,149, 87,220,248,244,181,122,229,199,214,166, 41,210,165,168, 84,233,
+103,222, 94,240,209, 71, 30,238,238,255,106,249,219,186,101,139,176,184,184, 56,106,193,130,  5, 77,136,178,171,170,241,128, 69,
+142, 53,105,214,120,111, 62,252,163,193,226,233,189,155,255,252,213, 17,112, 28,135,232,232,104, 92,188,120, 17, 43, 87,174, 36,
+199,142, 29, 83,219,219,216,212,120,111, 66,157,104,215,201, 51, 55, 96,249,242,125,140, 76, 38,195,193,131,  7,241,224,193,  3,
+  8,  4,  2, 52,107,214, 12,227,198,141, 67, 84, 84,148,199,228,201, 83, 72,231, 62,163,158,192, 33, 68,243, 87,202, 18,195, 48,
+  2, 79, 79,207,247,223,249,240, 83,207, 97,163,223,192,247,223,124, 65, 13, 22,133, 66,121,117,168,178,247, 59, 32,104, 56,228,
+231,157,123,110,241,127, 52, 28,242,243, 78,  2,  8,  8, 32,176,  7,234, 71, 70, 70, 90, 84, 42, 21,185,113,227,  6,121,231,157,
+119,180,107,214,172, 57,247,199, 31,127,236,101,205,230, 13, 17,205,155,175, 32,128,160, 58,205,102, 14, 14, 14,  1,  1,  1,  5,
+ 25, 25, 25,228,232,209,163,100,225,194,133,100,219,182,109,228,216,177, 99,228,244,233,211,228,216,177, 99,100,231,206,157,228,
+222,189,123,228,209,163, 71, 36, 48, 48,176,160,153,131,131, 67, 13,154, 66,  2,  8, 27, 13, 89, 55,123,223, 77,203,162,144, 33,
+ 63,207, 32,128,176,177,187,123,104,207,158, 61,185,189,123,247,146,173, 91,183,146,205,155, 55,147,123,247,238,145,194,194, 66,
+226,237, 31, 80, 80,126, 92,117,233, 36,128, 32, 34, 34,162, 64,165, 82, 17, 95, 95, 95, 34,149, 74,137,187,187, 59,105,212,168,
+ 17,105,215,174, 29,233,219,183, 47,121,253,245,215,201,231,159,127, 78, 84, 42, 21,241,247,247,207, 43, 63,174, 58,205,  1,158,
+158,138,192,192,192,244,216,216, 88, 82, 29,122,189,158, 20, 22, 22,146,179,103,207,146,192,192,192,244,  1,158,158,138,154, 52,
+ 21, 64,203,166, 77,155, 22, 20, 22, 22, 18,179,217, 76,210,211,211, 73, 92, 92, 28,121,240,224,  1, 73, 79, 79, 39,122,189,190,
+ 66,251,225,195,135, 36, 32, 32,160, 64,  1,180,172, 86,243,159,188,149,151,137,231, 54, 63,119,247,190, 30, 30, 30,250,125,251,
+246,145,172,172, 44,178,105,211, 38, 34,  0,150,252,219,190, 53,104, 74,129, 94,157, 58,117,226,162,163,163, 73, 76, 76, 12,153,
+ 51,103, 14,233,221,187, 55,233,211,167, 15, 89,176, 96,  1,201,204,204, 36,153,153,153,164,111,223,190,156, 20,232, 85, 91,249,
+172,234,222,116,  0,252,  6, 12, 24,160, 55,155,205,228,201,147, 39, 36, 44, 44, 44, 83,  8,140,181,  1,154,116,  1,100,181,149,
+ 79,111,192,201,211,211, 51, 39, 58, 58,154,236,223,191,159,248,251,251, 23,  8,129,137,246, 64, 67,123,160,161, 16,152,216,176,
+ 97,195,130,232,232,104, 82, 84, 84, 68,252,252,252,114,188,  1,167, 23, 45, 75,  0,  4,158,158,158,191,125,249,245, 15, 36, 49,
+ 83, 75,190,252,250,  7,226,233,233,153, 78,  8, 33,158,158,158,167,104,153,164, 27,221,232,246,191,190,137,234,100,198,108,108,
+150, 46, 94,188, 88,100, 48, 24,240,235,175,191,106,198,140, 26,181,223,209,209,145, 21,139,197, 96,  4,181, 15, 72,212, 56, 56,
+124, 48,111,238, 92, 71,163,209,136, 91,183,110,161, 85,171, 86,144,201,100,144, 72, 36, 16,139,197, 16,139,197,240,244,244, 68,
+126,126, 62,194,194,194, 48,117,234, 84,135, 31,191,255,254,  3,168,213,139,107,210,229,121, 34,  2,  0,142,231,165,245,189,188,
+ 38,135, 54,109,186, 98,218,180,105,  2, 27, 27, 27, 24, 12,  6, 24,141, 70, 60,120,240,  0,206,206,206, 80, 42, 20, 86,229, 89,
+ 32, 16,  8,108,109,109,113,246,236, 89,252,242,203, 47, 72, 73, 73, 65, 78, 78, 14,236,236,236, 16, 22, 22,134,198,141, 27,163,
+ 75,151, 46,120,242,228,  9, 24,134, 97,106,211, 75, 16,139,223, 29, 55,122,180, 91,120,120,120,149,255, 55, 24, 12, 80,169, 84,
+ 80,171,213,112,119,119, 71,223,190,125,221, 14, 31, 60,248, 46,128,111,171,218,223, 25,240,240,  9, 14, 62,116,227,198, 13, 23,
+ 66,  8,182,110,221,138,178,178, 50,152, 76, 38,  8,  4,  2,200,229,114, 56, 57, 57,161,123,247,238,112,117,117, 69,112,112, 48,
+118,239,222,237,210,183,111,223, 35,206,249,249, 45,139,128,108,250,122, 81, 59,105,121,121, 39,123,  1, 46, 99, 95,127,253,216,
+221,123,247, 34,199,142, 29,139,188,188,188, 79,197,115,230,168, 44,192,170,218,142, 15,  1, 28,234,121,122,110, 92,190,124,185,
+ 32, 55, 55, 23,179,102,205, 42,204, 78, 75,155,227,  0, 92,  2,128, 51,199,143, 71,110,219,182,109,217,214,173, 91, 93,182,108,
+217, 34,136,136,136,216, 24,146,158, 30,150,  8,168,235,146, 78, 13,240,254,234,213,171,229,  6,131,  1, 61,123,246,124, 34, 79,
+ 73,105,206,  2,122,107,143,207,  1,222, 93,249,241,199, 30, 50,153, 12,179,102,205, 42,212,165,165,133,179, 64, 65,165, 93, 82,
+ 93,147,147,143,143, 31, 63, 62,238,222,189,123, 46,171, 86,173,242, 24, 62,116,232,187,  0,150, 88,123,142,202, 29,218, 61, 61,
+ 61,131,  7, 15, 31,235,222,168, 73, 83,236,223,185,  9, 63,173, 94,186,145,227,184,159,189,189,189,167, 11,  4,130,111,104,201,
+163, 80, 40,175,100, 19, 97,117, 56,187,186,182, 10, 13, 13,197,133, 11, 23,208,180,105,211, 27,142,142,142,172, 68, 38,131, 88,
+ 44,  6,225,249, 90,143, 87,216,216,244,232,220,185,179,232,234,213,171,  8,  8,  8,128, 66,161,168, 48, 86,229,155, 68, 34,129,
+167,167, 39, 74, 75, 75, 17, 25, 25, 41,222,184,113, 99, 15,  0,139,107,211,206, 78, 77,180, 69,242,198,215,151,125,187,162, 97,
+155, 54,109,160, 86,151,130,231,121, 40,149, 74,152, 76, 38,136, 68, 34,152, 76, 38, 24, 76,164,212,154,188,114, 28,199,  9,133,
+ 66,  4,  4,  4, 96,233,210,165, 48, 24, 12,144, 72, 36,  0,128,210,210, 82,168, 84, 42,196,197,197, 33, 53, 53, 21,228,217, 43,
+121, 77,216,216,218,246, 27, 52,104,144,180,170,255, 25,141, 70,168,213,106,168,213,106,168, 84, 42, 24, 12,  6, 52,107,214, 76,
+122,238,236,217,126,213, 25, 44,163, 92, 62,124,203,150, 45,110, 82,169, 20,122,189, 30, 26,141,  6, 25, 25, 25, 72, 75, 75, 51,
+228,231,231,179,118,118,118,  2,127,127,127,129, 76, 38,147, 13, 25, 50,132, 41, 45, 45,  5,195, 48, 24, 48, 96,128,243,246,173,
+ 91, 95,  3,176,146, 22,127,235, 56,  9, 24, 91,154, 76,  3,219,182,105,115,246,198,205,155, 17, 31,124,240,  1,238,221,187,183,
+ 92,185,107,215,  5, 29,112,183,166, 99,159,  0,239,174,168,100, 92, 72, 90, 90, 83,243,115,198,197,255,169,113,137, 45, 55, 46,
+ 35,235,104, 92,  0,192,206,193,161,181,167,167, 39,142, 29, 59,134,244,148,148, 79,234, 98,174,  0, 64, 32, 20,118,234,220,185,
+ 51, 14, 30, 60,136,204,180,180, 79,158, 51, 87,  0,128,  2,160, 64,244,228,201, 39, 27, 55,110,252,237,205, 55,223,132, 80, 36,
+234,  4,150,181,250, 28, 85,117,104,127,247,131, 79,112,112,223,182,141, 57, 57, 57,111, 17, 66,120,  0, 55,104,137,163, 80, 40,
+175,  2,117,154,  7,203,195,195,195,219,198,198,  6,217,217,217,104, 28, 26,154, 47,147,201, 32, 21,139, 33,151, 74,173, 58,222,
+ 96, 48, 52,245,240,240,128, 90,173,134,139,139, 11, 36, 18, 73,197, 38,149, 74, 43, 62,219,217,217, 65, 32, 16,192,219,219, 27,
+  6,131,161,105,109,186,172, 42,201,237,248,166, 57,239, 28,222,183,165, 97,223,190,253,224,228, 84, 15,190,190, 62,112,115,115,
+131, 66,161,128,175,175, 47,130,130,130,200,250,245,235, 33,176, 15,178,234,  1, 94,217, 52,137, 68, 34,112, 28,135,188,188, 60,
+ 36, 38, 38,226,222,189,123,136,142,142, 70, 76, 76, 12, 52, 26, 13,172,240, 87,208,234,116,205,171, 10,116, 25,141, 70,168, 84,
+170,138,232,149, 74,165, 66, 65, 65,  1,158, 60,121,130, 82,141,166, 69,117,122, 78,206,206,195,194,195,195,133,  0,160, 80, 40,
+208,162, 69, 11,252,252,243,207,236,225,  3,  7, 70, 53,137,142,174,231,123,226,132,227,250,117,235, 70,141, 24, 49,130,187,118,
+237, 26, 74, 75, 75,113,255,254,125,184,186,186,138,164,114,249,107,180,232,215,141,219,128,214, 69,163,233,211,161, 67,135,100,
+181, 90,141,111,190,249, 70, 32,182,179,251,101, 17, 32,172,197, 85,116,236,220,185, 51, 14, 29, 58,132,236,180,180, 57,105, 85,
+ 24,151, 52,160, 32,253,201,147, 57, 27, 55,110, 68,175, 94,189,192,136, 68,117,238,136,212,174, 93,187,112,158,231, 17, 27, 27,
+ 11, 71,224,122, 93,143, 15, 12, 10,138,176,181,181,197,131,  7, 15, 96,243, 44,186, 86,229,139,  2,112,233,206,157, 59, 80, 40,
+ 20,104,220,164, 73,203, 58,158,230, 91, 47, 47,175,156,119, 63,248,  4,251,143, 95,  1,  0, 28,220,183, 45,175,146,185,162, 80,
+ 40,148,127,166,193, 42, 71, 44, 22, 67, 42,147, 65, 42,149, 62, 53, 70, 50,153,213,199, 50, 12,  3,185, 92, 94, 97,168, 42, 27,
+171,202,159,149, 74,165, 85,198,  5,  0, 44,185, 87, 34, 95, 27, 57, 66, 42,145, 72, 96, 50, 25, 65,  8,129, 76, 38,135,163,163,
+ 35,  2,  2,  2,160,211,105, 49,104,240, 48, 99,134, 74,114, 68,226,211,227,222,139,228,153,101, 89,104,181, 90,148,148,148,160,
+184,184, 24,165,165,165,208,235,245,176,162,117,176,162,170, 77, 79, 79,199,142, 29, 59, 80, 84, 84,  4,224,105,  7,234,114, 83,
+ 85,254, 51, 57, 57, 25, 91,183,110, 69, 74, 74, 10,132, 66,161,213,223, 79,100,100, 36,142, 28, 57, 34,236,218,163,199,134, 83,
+254,254,217,167,252,253,179,187,246,232,177,225,208,161, 67, 66,111,111,111,164,166,166,226,214,173, 91, 40, 41, 41,  1, 33,132,
+161, 69,191,238, 60,  6, 74,116,197,197,111,126,250,233,167,196,214,214, 22,223,172, 88,209,124,  9, 48,198, 90,227,226, 80,131,
+113,113,248,107,198,  5,132, 16,240, 60, 15,142,227, 94, 40,111, 12,195, 48, 98,177,184, 46,229, 25,120,186,212,150,181,250,  2,
+ 66,200,251,239,124,248,169,231,123, 31,205,199,185, 19, 71,202,255,158, 68,205, 21,133, 66,121, 21,169, 83, 19, 97,118,118,118,
+150, 86,171,109,232,239,239,143,204,204, 76, 55, 63, 63,191, 52,169, 88, 12,137, 84,106, 85, 31, 44,185, 92, 30,155,151,151,215,
+209,219,219, 27, 44,203, 86,152,169,231,155,  8,203,163, 50,247,239,223,135, 92, 46,175,117,156,185,128, 43,171, 31, 22, 22, 86,
+ 17,  9,114,116,116,132,163,163,  3,100, 50, 57,150, 45, 91,198,111,248,229,151, 31,229, 97,239,170, 63,156,244, 49,185,189,100,
+195, 75,189,128,214, 86, 72, 74,165, 50,182, 65,131,  6,237,149, 74, 37,246,239,223,143,212,212, 84,148,148,148, 64,167,211,193,
+104, 52, 66,167,211,193,100, 50, 65, 46,151,163, 73,147, 38,168, 87,175, 30,226,227,227,171,205,123, 73, 81,209,254,216,216,216,
+246,109,218,180,169,136,160,116,235,214,141,233,214,173,155, 75,249,239, 58,157, 14,133,133,133,184,113,227,  6, 78,159, 62, 13,
+134, 97,144,148,148,196, 25,245,250,157,180,232,191, 24,  6,224,170,112,227,198,223,166, 78,157, 58,169, 99,199,142,224,128,190,
+  0,182,254,167,140, 75, 57,209,209,209,113, 28,199,117,108,212,168, 17, 84, 64, 91,  0,  7,235,100, 30, 31, 61,186,195,178,108,
+143,230,205,155, 99,255,158, 61,145,  0, 82,171,218, 79, 11, 68, 70, 68, 68, 64,175,215,227,126, 66,194,109,107,205,149,167,167,
+231,134,119, 62,252,116,226,176,209,111, 96,255,206, 77, 56,184,111, 91,198,143,107,150,251, 18, 66,204,180, 84, 81, 40,148,127,
+188,193, 42, 41, 42,186, 29, 23, 23,215,176,101,203,150,216,176, 97, 67,155, 14,237,219,103, 73,164, 82, 86, 42,145, 64, 96, 69,
+  5,162,215,106,207, 92,190,124,185,109,175, 94,189, 68,215,174, 93,131,135,135, 71,133,193, 42,255, 41, 18,137, 64,  8,129, 82,
+169,196,177, 99,199,204,122,173,246, 76,109,186, 28,203,113,130,103,  6,143, 16,  2,149, 74,  5,137, 68,130,245,235, 55, 96,211,
+ 47,191,188,158,153,147,179, 55,184,149,211, 71,  0,228,255,177,138, 89,167, 59,123,230,204,153, 86, 51,103,206, 20,251,248,248,
+ 64,165, 82,161,164,164,  4, 69, 69, 69, 40, 45, 45, 69,105,105, 41, 74, 74, 74,160, 82,169, 32,151,203,241,232,209, 35,139, 65,
+167, 59, 91,157,158,204, 96,216, 55, 97,194,132,143,239,220,185,227, 41, 18,137, 96,177, 88,192,243, 60,120,158,135,217,108,198,
+163, 71,143, 16, 31, 31,143,  7, 15, 30,160,184,184, 24, 98,177, 24, 66,161, 16, 49, 49, 49, 37, 54, 22,203, 30, 90,244, 95, 28,
+ 49,176,255,242,229,203,147,198,141, 27,  7, 47, 31,159, 46,200,204,180,202,184, 28,168,193,184,168, 95,192,184,252,201,248,104,
+ 52, 55,147,147,147, 59,118,237,218, 21,158, 62, 62,203,155,100,102,158, 74,168, 67, 63, 44,142,101, 47, 93,190,124,185,199,248,
+241,227,177, 97,195,134,229,174,201,201,199, 11,158,107,206,116,  5, 92, 27,  4,  6, 46,159, 56,113, 34, 78,158, 60,  9,142,101,
+171,141,200, 61,215,161,189,254,224,225, 99,125,105,135,118, 10,133,242, 79,162, 78, 77,132,140, 86, 59,119,222,188,121, 22,161,
+ 80,136, 97,195,134,217, 29, 60,116,104, 68,204,221,187,  1,249,249,249,142, 28,199,213,170,101,167, 86,175, 89,188,120,177,202,
+ 98,177, 32, 36, 36,  4,197,197,197,224, 56, 14, 34,145,  8, 34,145,  8, 12,195, 64, 32, 16,192,214,214, 22,241,241,241,216,181,
+107, 87,169,157, 90,189,166, 54, 93,158,231, 99,127,255,253,119,136, 68, 34, 34,151,203,193, 48, 12, 68, 34, 17,214,175, 95,159,
+ 63, 55, 39,103, 63,  0,  8,  5,  2, 19,  0,  8,  4,140, 85,189,114, 25,134,169,181,125, 82, 42,149,130,127,218,185,191,214,125,
+ 93, 45,150,213,235,214,173,211, 36, 37, 37, 65,171,213, 86, 68,219,202,202,202, 42, 58,205,171, 84, 42, 48, 12,  3,131,193,128,
+139, 23, 47,106, 92, 45,150,213,213,233, 21,  1,185,153, 73, 73,131,218,180,105, 83,148,156,156, 12,181, 90,141,216,216, 88,156,
+ 62,125, 26,187,119,239,198,201,147, 39,241,232,209, 35,176, 44, 11,111,111,111, 16, 66,112,224,192,  1, 53,171,209,244, 45,  2,
+114,105,209,175,158,250, 30, 30, 61,220,221,220,210, 93, 93, 92, 50,235,123,120,244,120,254,255, 14,192,195,135, 15, 31,130,101,
+ 89,  4,  4,  4,212,171,169, 31, 22, 97,217,203,151, 47, 95,198,248,241,227,225,219,176,225, 50,127,192,245,249,125,252,  1, 87,
+255,192,192,101,229,198,133,176,236,229,186,166,217, 14,248,238,163,143, 62,210, 75, 36, 18,236,218,181, 43,192, 18, 20,244, 64,
+  4,140,177,  5, 66,187,  2,146,218,142,247,  4,126,252,252,243,207,115, 25,134,193,182,109,219, 92, 28,  2,  3,227, 68,192,  4,
+  7,160,190,  3, 80, 95,  4, 76,112,  8, 12,140,219,181,107,151, 11,203,178,152, 49, 99, 70,174, 39,240, 99,117,122, 66,161,240,
+253,236,236,236,129, 89, 89, 89,157,179,179,179,125,127, 92,179, 28,231, 78, 28,193, 79,171,151,110,204,201,201,121, 43, 47, 47,
+239, 70, 86, 86,214,184,204,204,204, 56, 90,226, 40, 20,202,171,  8, 83, 85, 63, 39,113,219, 37,121,  0,113,235,210,174, 25,110,
+222, 77, 84,187, 56,217,159, 40,255,159,234,254,254, 70,  3,218,121, 52,251,230,155,111, 32, 18,137,144,145,145,129,132,132,  4,
+216,219,219,227,131, 15, 62, 48, 90,140,198, 65,229,235,157, 49, 12, 19, 69,  8, 57,253, 76,243, 20,203,178, 78, 50, 99,134,109,
+132, 83,114,195,173,155, 55, 10,237,236,236, 80, 86, 86, 86, 49,173,128, 82,169,132, 66,161,192,189,123,247, 48,254,141, 55,185,
+199,108,243,138,137, 70,203,215, 59,171,172,  9,134, 17,  2, 64, 95, 39, 39,229,125,153,108,150,179,187,251,236,247,222,123, 79,
+209,165, 75, 23, 72, 36, 18,180,106, 27,153,107,211, 98,246,119,  2,  1,195,102, 22,149,206, 11,172,239,229,144,144,148, 10,128,
+121,186,102,225,179,181,  8,171, 74,103, 83,249,189,128,173, 63,125, 97, 31, 22, 22,246, 52,223, 42, 21,242,242,242,144,159,159,
+ 15,149, 74,  5,173, 86, 11,  0, 56,125,250, 52,206,222, 72, 46,205,177,237,249,164,186,116,254, 43,239,169,118,141, 21, 15, 27,
+124,183,122,165,208,209,209, 17,121,121,121, 40, 40, 40,128, 74,165,130, 94,175,  7,199,113, 40, 45, 45,197,161, 35, 71,185, 39,
+ 92,211, 20,163,172,190,166, 54, 77,104, 51, 20,245,202,174,120, 71, 52,241, 39,147, 38, 77,178,179,183,183,  7,207,243, 40, 41,
+ 41, 65,122,122, 58,146,147,147,113,241,226, 69,109,190,202,  4,173, 75,207,204,242,137, 70,171,188,158, 47,171, 80,253, 47,106,
+ 62, 43, 75,  0,224,229,233,153,157,150,150,230,198,113, 28,188,189,189, 89, 85,113,241, 50, 41,112,210, 14,200,  1, 64, 10,129,
+207, 86,127,247,221,155,131,  7, 15, 70,235,214,173, 51,114,243,242, 26, 84, 85,150,192, 48,194, 16,192, 65,231,227, 19,127,227,
+198, 13,143,244,244,116,140, 31, 63,190, 48,237,241,227,138,105, 26,212, 64,164,127, 96,224,178, 93,187,118,185, 52,108,216, 16,
+ 77,155, 54,205,149,151, 79,211, 80,117,249,172,254,222,124,248, 71,131,105, 67,195, 91,191,243,206, 59, 96, 89, 22, 23, 47, 94,
+196,245,235,215,145,150,150,134, 43, 87,174,168,236,109,108, 70,213,116,111, 66,157,104,215, 55, 88, 27,176,109,219, 86, 70, 34,
+145, 96,227,198,141,184,115,231, 14,  0, 32, 34, 34,  2, 19, 39, 78,  4,203,178, 24, 59,118, 28,249, 35, 81, 81, 49,209,104, 85,
+101,201,199,199, 39,156,231,249, 21, 12,195, 72,  8, 33,173,179,179,179,229,222,222,222,217,217,217,217,190,117,233,115, 69,203,
+ 39,213,164,154,255, 28,205, 87,141, 90,215, 34,252,114, 45, 28,254,188, 28,199,219,217,191,255,186, 68,212,187, 79,223,208,121,
+159,206, 21, 68, 68, 68,192,215,215, 23, 17, 17, 17,184,115,231,142,172,113,227,198,181,173,119, 86,214,107,200,164,228, 94,189,
+122, 57,190,251,238,187, 14, 93,186,116, 17,123,121, 61, 93, 87, 55, 62, 62, 30,199,142, 29, 51,239,216,177,163, 52, 75, 26,169,
+186,114,236,215, 50,107,214, 59, 59, 86, 82,162,  3,240, 69, 51,147,233,151,207,231,205, 91, 16,214,180,233,164, 15, 63,252, 80,
+ 96,107,163, 20, 47,153,247,150, 28,  0,190,252, 97,183,195,224, 17,175, 99,117, 16,208,101, 76,213,235,188, 85, 78,103,102, 78,
+126,218,152,137, 35,130,222,125,107, 12, 55,112,224, 64, 27, 91, 91, 91,248,250,250,194,201,201,  9, 41, 41, 41,136,141,141, 37,
+167, 78,157, 42,187, 29,159, 34,222,180,251,100,154,212,214,205,154,117,  3, 53,189,  6, 79, 72,153, 48, 97,130,211,208,161, 67,
+237,194,194,194,196, 98,177, 24,114,185, 28, 69, 69, 69,200,200,200, 48,159, 63,127,190, 44, 75,210,190,228,202,241, 77, 26, 43,
+215, 34,212,119, 30,189,232,209,165, 83, 11,103,196,199,198,142,227,129,230,102,179,217,155,227, 56, 70, 32, 16,228,240, 60, 31,
+107,214,104,126, 51, 70, 44, 92, 69,215, 34,180, 14,142,227, 36, 28,199, 65,165, 82,225,212,169, 83,162,199,143, 31,127,118,247,
+238,221,207,178,179,179, 97,177, 88, 48,124,248,112, 68, 68, 68,224,220,185,115, 40,200,203, 59, 92,147, 86, 34,160,150,101,102,
+ 78,124,251,237,183,143,109,221,186, 85,112,247,238, 93,151,141, 27, 55,254, 90,149,113, 25, 55,110, 28,159,151,158, 62,209, 88,
+195, 28, 88,181,220,155,133,199,119,125,127,119,200,176, 17, 77, 22,206,255, 76,220,161, 67,  7,184,184,184, 32, 50, 50, 18,102,
+179,217,209,138,123, 83,211,185,207,168, 39,205,155, 55,183, 89,181,106,149,199,155,111,190,137,233,211,167,  3,  0,244,122, 61,
+ 78,158, 60,137, 25, 51,102,228,166,139,218,106,111,159,219, 85, 99,249,124, 22,153,234,  9,  0,222,222,222, 23,  0,116,  6,240,
+132,118,104,167, 80, 40,255,104,131,  5,252,107,189,179, 75,215,227, 80,121, 57,142,167,184, 38,176, 46,195, 31, 79,157,189,188,
+169, 20, 90, 39, 49, 99,180,143,185,115,135, 73, 78, 78,174,241,100,229,235,157, 25,101,190,101,202,236,194, 54,223,173, 94,253,
+193,134, 13, 27,122,148, 79,197, 32,151,203, 99,245, 90,237, 25, 59,181,122,141,177,161,239,153,186,174,157,119,175,184, 56, 15,
+192,180, 80,142,251,238,141, 73, 83,190, 22,216,250,136, 63, 93,178,193, 32, 20,  8, 76,143,178, 11,176, 58,  8,176,177, 98,192,
+163,206,  4,196, 22,185,177,  9,232,154,184,124,209,162, 89,171,191,253,182,141,210,214,182,139,133,101,131,121,158,  7,225,184,
+ 36,189, 94,127,  1,102,243,141, 76,175,201,223, 74,109,221,136,181,235,  6, 26,229, 13, 52,238,218, 11,109,246,237,217,243,254,
+177, 99,199,254, 45,239,158, 60,255,221, 19,251,  6,167,173,201,123,229,125, 12,192, 85,228,231, 95,173,246,109,  3,116, 45, 66,
+171,111, 10,158,159,236,228,228,180,165, 71,143, 30,242,168,168, 40,244,239,223, 31, 29, 58,116,  0,207,243, 32,132, 64,163,209,
+ 96,247,238,221,248,250,235,175,147, 26,  0, 95,212,166,103,  4,206,200,142, 30,237,219,188,121,243,141, 53, 25,151,103,230,170,
+214, 62,135, 53,223,155,178, 36,214, 97, 80,234,232,119,151,  6,153, 74,115, 28,157,149,172, 71,124, 92,172,192,218,123, 19, 14,
+ 33, 26,238,206,238,182,195,135, 14,125, 87, 40, 18, 69, 62, 27,209, 72,238, 39, 36,220, 46, 95,236, 25, 17, 19, 79,213,165, 44,
+ 17,242,116,238, 57,218,161,157, 66,161,252,227, 13,150, 72, 36,202, 47,143,242,136, 68,162,252, 39,  7,166,188, 94,147,136,175,
+167,103,143,103,111,199,168,109, 45,194,242,207,119,213,106,205,179, 25,218,171,156, 68, 84,252,220,254,117,201,212,131,252,252,
+ 68,  0,  3,128, 52, 32,241,105,119, 22,113,155, 47, 63,169,156,167,106, 47,200,159,206, 43, 41, 78,205,203,187,132,167,205, 57,
+ 85,118,198, 21,251, 73,138,107, 75,231,243,121,191,156,145, 81,250, 44,223, 85,231,221,163,246,188,139,234,120,125, 68,127,225,
+122,254,211,200, 42, 44, 60,  0,192,214,231,200, 17,247,227, 71,142,188, 54,107,230,204,225,158, 94, 94,129, 46, 46, 46, 78,118,
+118,118,130,107,215,174, 37,179,  6,195,119, 45,128, 77,215,  1,157, 53,154, 70,224, 76, 72,122,122,216,200,161, 67,223,101, 68,
+162, 78,149,141, 11, 97,217, 43,  1,192,143, 70, 43,102,111,175,243,189, 41,171,251,189,153,249, 52, 29, 75,192,178, 75,112,239,
+222, 95,190, 55,121,158,255,210,219,219, 91, 67, 59,180, 83, 40,148,127, 20,127,231, 58, 60,  0,162,168, 38,213,124, 85, 52,159,
+122, 20,216,211,235, 73, 53,169, 38,213,164,154, 47, 95,243, 31,189, 22, 33,133,242, 15,127, 25,225,  0,148,210, 43, 65,161, 80,
+ 40,148,218, 96,  0, 68, 85, 83,153, 88, 61, 58,128, 97,152,168, 23,168,172, 78, 83, 77,170, 73, 53,169, 38,213,164,154, 84,243,
+159,165, 89,155,246, 43, 51, 58,145, 54, 17, 82, 77,170, 73, 53,169, 38,213,164,154, 84,147, 54, 17,190,220, 77,  0, 10,133, 66,
+161, 96,209, 34, 70,  0, 48, 12,176, 72,  0,236, 21,  2, 35,133, 79,127,127,113, 70,142,100,170,156,132,246,253,247, 25, 59,122,
+197, 41,148, 87, 27,218,  7,235, 63,136,167,167,167,159,187,187,251,207,132, 16, 38, 63, 63,127,114, 78, 78, 78, 58,189, 42,255,
+125, 56, 59, 59,247, 96, 89, 22,106,181,250,204,171,152,191,176, 32,102, 40, 17,160,241,191,194,218, 72, 79, 72, 34, 91,170,218,
+183, 73, 48, 51, 30,204,191,230,210, 98,120,220,143,127, 68,126,183,246, 92, 12,195,  8,134,244,117, 93,  1,  0,  7,142, 21,204,
+254, 59,230,197,242,242,242,106,228,236,236,124, 66, 40, 20,138, 56,142,155, 22, 27, 27,123,164,122,  3, 52, 82,  8,  0,174,138,
+253,115, 29,235,185,204,249,124, 22, 35, 54, 25,191, 81, 25, 13,  6,181, 64, 36, 74,145, 74,148,151, 89,129,205,177,204,188,190,
+  9, 85, 29,191,103,207,158,106, 87,215, 14, 15,102,250,134, 54,105, 50,176,101, 83,197,147, 21,107,218,172,238, 18,224, 34, 78,
+206,136,177, 93,187, 37,253,103, 87, 39,239,129, 31,188, 37, 58, 34, 35,220,184,229,191,146, 50,122,151, 89,207, 87, 12, 83,207,
+ 12, 52, 21,203,100,190, 28,203,186, 51,  0, 17,138, 68,121, 22,163, 49, 67,  2,220,155, 67,136,234, 85,215,148,200,100, 62, 28,
+203,186,  3,192,127, 99, 58, 41,181, 24,172,192,192,192, 91,  2,129,192,167,124,141,191,202,139,213,150,127,126,254, 39,199,113,
+153, 15, 30, 60,104,101,237,201, 27, 54,108,104,111, 48, 24, 94, 99, 24,230,117,  0, 32,132,108,151,203,229,187,147,147,147, 95,
+168, 35,113,195,134, 13,237,  9, 33,179, 21, 10, 69,119,131,193, 16,  6,  0,114,185, 60, 94,175,215,159,101, 24,102,197,139,232,
+ 50, 12, 35,242,244,244, 28,105, 99, 99,211,141,101,217,110,132, 16, 70, 36, 18,157,211,233,116,103,115,114,114,246, 16, 66,216,
+186,106,122,121,121, 41,156,157,157,151,  4,  5,  5,141,121,247,221,119,139,234,213,171, 23,178,104,209,162,155,225,225,225, 59,
+138,139,139,231,101,103,103,235,255, 27, 10,  7,195, 48,129, 30, 30, 30,219,197, 98,177, 48, 35, 35,163, 27,  0,248,250,250,158,
+ 51,153, 76, 92,126,126,254,235,132,144,199,117,209,115,117,117,181, 17,139,197,237,108,108,108, 90,217,216,216,116,230, 56,174,
+241,179,245, 19,239,107,181,218,139, 22,139,229,150,197, 98,185, 86, 80, 80,160,253,111,185, 65, 24,134,177,115,115,115,219,202,
+ 48, 12, 24,134,  9, 38,132,104, 94,181,135,  0, 17,160,113, 66,252,131,144, 10, 19, 21, 22, 90,195,  5,129, 95, 21,251, 90,109,
+176,250,245,112,236, 51,112, 96,115,  1,  0,152,205, 55,251,  0, 56,250,178,205, 85,191,126,253,174,126,247,221,119, 78,  6,131,
+  1, 31,125,244,209,246,224,224,224, 31,147,146,146,230,214,116,156,157,157,221,140, 47, 22,255,160,124,246, 44,115,227,121,222,
+ 45, 39, 39, 35, 56,241, 65,108,159,196,196,184,165,102,237,239,215,204, 68, 56, 69,165, 27,244,192,154,116, 52,  9,100,  6, 12,
+ 30, 57,180,255, 23, 95, 44,196,152, 81, 99,234,199,199, 27, 20,222,246, 79,164,165,102,155, 32, 23, 23,159, 65,159,124,186,156,
+185, 22,125,126,208,158,221, 27,206,126, 50,137,233, 78, 77,150, 85,247, 34,243,165, 72,212,206, 41, 52,180,243,168,  3,  7, 96,
+235,235, 43, 18,201,100,  2,  0, 96,141, 70,223,178,140, 12,207, 93,131,  6,181, 93,196, 48,231, 23, 16,114,157,106,254,255,107,
+ 82,172, 52, 88,  2,129,192,231,206,157, 59,110, 54, 54, 54,120,102,126,192,113, 28, 56,142,171, 88, 84,152, 16, 82,241,147,101,
+ 89,116,237,218,213,170, 55, 88, 79, 79,207,238,  0,222,  8, 15, 15, 31, 62,123,246,108, 73,199,142, 29,193,113, 28,206,158, 61,
+ 27,185,122,245,234,239,189,188,188,246,  3,216,148,147,147,115,198,218, 55, 92, 79, 79,207,222, 54, 54, 54,219, 62,251,236, 51,
+251,200,200, 72,145,167,167, 39,  0, 32, 63, 63,191,221,229,203,151, 91, 45, 92,184,112,154,167,167,231,216,156,156,156, 19,214,
+ 94, 28, 31, 31,159,240,224,224,224,189,125,251,246,245,105,213,170,149,188, 81,163, 70, 32,132, 32, 38, 38,230,205,196,196,196,
+209, 71,143, 30, 93,224,227,227, 51,194,218,245,212, 24,134, 97,  2,  3,  3, 39,120,120,120, 44,153, 57,115,102,189, 33, 67,134,
+ 72,227,226,226, 74,  2,  2,  2,152,253,251,247,187, 30, 62,124,120,218, 79, 63,253, 52, 50, 40, 40,104,222,227,199,143, 55,147,
+170,214, 49,122,142,224,224,224, 91,  2,129,192,199, 26,  3,204, 48, 12, 88,150,181,202,  4, 51, 12,211,162, 65,131,  6,187, 47,
+ 93,186,212, 32, 53, 53,149, 27, 50,100,200, 22,  0, 56,123,246,108, 83,139,197,194,244,234,213,235, 24,195, 48,175, 17, 66, 98,
+172,201,187,183,183,119, 51, 87, 87,215,131, 67,134, 12,169,231,231,231,167,244,241,241, 97,228,114, 57,132, 66, 33,202,202,202,
+188, 18, 19, 19,163, 98, 98, 98,244, 87,174, 92, 41,246,246,246, 30,148,149,149,117,175, 14, 15,222, 14,110,110,110,227,196, 98,
+113, 56,203,178,222,  0, 32, 18,137,178, 44, 22, 75, 92,126,126,254, 86, 66,200,213, 23,189, 65,220,221,221,191, 95,178,100,137,
+ 75,126,126, 62, 89,182,108,217,247,  0, 38,188,170, 15,131,237, 59,246,224,214,205,235,  0, 32, 97, 24,134,121,190,252, 49, 12,
+195, 52, 14,134,228,195, 15,103,162, 85,235,182,120,125,204,200, 90, 53,135,244,119,249, 66, 42, 20, 57,235, 76,198,235,133,106,
+193, 65, 63, 55,233,208,177, 35, 91, 61,  1,128,227,199, 98,135,182,109, 91,239,178,139,  3, 63, 88, 41,149,181, 53,113,108,209,
+129, 63, 10,231,215,197, 76,121,120,120,156,176,179,179, 83,150,148,148,228, 22, 21, 21,173,237,215,175,223,151,171, 86,173,114,
+122,242,228,  9, 50, 50, 50,240,198, 27,111,216,102,101,101,189,235,231,231, 23,157,158,158, 94,109, 36, 75,163,209,172, 89,178,
+120,230,124, 59,123, 39,161, 82, 97,  3, 91, 59,123, 52,104, 16,140,214,109, 34, 17,213,115, 16,158, 60, 73,108,183,123,231,134,
+ 59,194,156,189, 95,113,210,136, 47, 85,170,  6,213, 62,151,194, 66,152, 46,229,230,106,254,252,133,120,248,224,129, 38, 53, 69,
+240,222, 31,  7, 68,202,190, 61, 66,101, 38,115, 89,234,181,232,243, 13,218,181,239, 10,  0,173,246,236,222,112,118,209, 88,166,
+199,130,109,175,158,121,127,153,230,234, 11,177,120, 66,239, 85,171,220, 34,166, 77,147,148,165,164,152,159,172, 91,167,203,187,
+120,145, 19,201,100,196,183, 79, 31,198,181, 91, 55,249,180,251,247, 37, 87,150, 45,235,188, 84, 42, 13,248,212,100,218, 70, 53,
+255,255, 52, 41,117, 51, 88,176,177,177,193,174, 93,187, 32, 22,139, 33, 18,137, 32, 22,139,171,253,236,231,231,103,141,  9, 26,
+ 22, 22, 22,246,195,204,153, 51,221,  7, 14, 28,  8, 39,167, 63,175,178, 49, 96,192,  0,244,235,215, 79,146,156,156, 60,122,207,
+158, 61,163,183,108,217,146,235,233,233,249, 94,206,179,  5,155,107,168,188,187,  5,  4,  4,236,223,177, 99,135, 66,175,215,227,
+252,249,243, 40, 41, 41,129, 84, 42,133,143,143, 15, 58,117,234, 36, 58,127,254,124,189,209,163, 71,239,247,246,246, 30,144,149,
+149,117,174,182,180,122,120,120,180,114,117,117,189,240,203, 47,191,200, 67, 67, 67,153, 71,143, 30,161,121,243,230,  0,128,162,
+162, 34, 12, 24, 48, 64, 62,116,232,208,192,119,222,121,231,154,135,135, 71,151,220,220,220, 91,181,228,189,101,243,230,205, 55,
+247,233,211,199,107,206,156, 57,246,182,182,182, 72, 77, 77,205,241,240,240,  8, 46, 55, 63,131,  7, 15,150,246,236,217,211,115,
+237,218,181,107,142, 30, 61,250,145,167,167,231,132,156,156,156,219, 53,233, 10,  4,  2,159,219,183,111,187, 41,149, 74,228,229,
+229, 97,251,246,237,120,247,221,119, 33, 20, 10,145,159,159,143,221,187,119,227,189,247,222,131, 80, 40,132, 90,173,182,202,  4,
+219,216,216, 68, 53,111,222,252,215,179,103,207,250, 56, 58, 58,194,203,203, 75,240,249,231,159,135,  7,  4,  4, 40,234,215,175,
+ 47,204,201,201,193,254,253,251,  3,198,141, 27,119, 80, 46,151,191,105, 48, 24,106,109, 58,115,118,118,254,109,243,230,205,126,
+119,239,222,197,186,117,235, 80, 92, 92, 12,169, 84, 10, 71, 71, 71,120,120,120, 32, 56, 56,152,153, 54,109,154,178,123,247,238,
+202,133, 11, 23,254,  6,160,133, 21, 15,221,230,110,110,110, 63,143, 30, 61, 58, 96,209,162, 69,142, 30, 30, 30, 40,127, 33, 80,
+171,213, 62,169,169,169,237,230,207,159, 63,194,221,221, 61, 57, 63, 63,127, 10, 33,228,110, 29, 31,234, 45,122,244,232, 49, 96,
+200,144, 33,194,156,156, 28,108,221,186,117,  0,195, 48, 45,172, 53,149,255,107,220,186,121, 29,147,223,249,160,204,203,215, 87,
+114,248,208,206,193,101,101,191, 92,182, 21, 56,138,  0,160,140, 87,177, 29,219,217,118, 26, 56,104,180,164, 95,255, 33,101,191,
+252,180,198,214, 26,131, 37, 21,138,156,119,109,155,154,113,241, 74, 82,227, 19,167, 83,163,134, 12,138, 18,136, 36, 33,129,  0,
+ 48,107,230,219,210,  3,135, 78,255,216, 59,170,126, 78,231,142,193, 25,163,198,174,243,173,139,185, 10,  8,  8, 56,127,226,196,
+  9,119,169, 84,138,146,146, 18,231,141, 27, 55,174,108,219,182,173,224,241,227,199,120,240,224,  1, 82, 82, 82,160, 86,171,209,
+166, 77, 27,219,132,132,132,181,  0,170, 53, 88,  5,250, 97, 75,  2,220, 10,191,243,118,118,106, 96, 48,171,221, 56,182,168,201,
+217,211,119,155,237,219,163,139,112,243,240,  9, 30, 61,122, 50, 62,153,187, 92,252,251,190,205,243, 47, 92, 60,  9,160, 65,245,
+ 51,248, 19,116,248,116,222, 92,148,106,140, 24, 59,230,109,140, 27,243,182, 51,129,201,147,112,  6, 27,147,190,196,209, 65, 18,
+127,100,243,206, 61, 67,  1,248, 84, 50, 89,103,168,201,170,158, 47, 68,162,182,  3,126,248,193, 53,252,173,183,100,119, 23, 45,
+210, 22, 94,188,168, 15,234,215,175, 36, 98,234, 84, 35,  0,104, 82, 82, 36, 15, 23, 44, 80,186,118,238,172,104, 63,123,182, 19,
+103, 50,121, 44,102,152, 54,159, 19,114,163,174,154, 13,198,140,225, 86,236,223,223,250,218,178,101, 93,177,120,177,176, 91, 68,
+ 68,204,188,159,126,202,250, 43,154, 47, 51,157,217, 23, 46, 24,181,141, 27,163,233,240,225, 69,222,206,206,198,151,153,247,191,
+146, 78, 74, 21,117, 72,117, 65,146,144,144,144,188,196,196, 68,183,253,251,247,215,106,174,196, 98, 49, 60, 61, 61, 17, 25, 25,
+153, 31, 27, 27,235, 94,195, 67, 49, 35, 35, 35,195,135,101, 89, 72,165,210, 26, 19,166,209,104, 16, 27, 27,139, 81,163, 70,101,
+102,103,103, 87,251,224,173, 87,175,158,157,147,147,211,147,115,231,206,185,196,199,199,227,214,173, 91,  8,  8,  8,128,147,147,
+ 19,196, 98, 49, 44, 22, 11, 74, 75, 75, 17, 18, 18,  2,133, 66,129,126,253,250, 21, 22, 23, 23,  7, 20, 23, 23, 87,251, 32,171,
+ 95,191,190, 76, 44, 22, 39,237,219,183,207, 55, 60, 60, 28, 55,110,220,128,175,175, 47, 60, 60, 60,  0,  0, 41, 41, 41,184,124,
+249, 50,250,245,235,135,184,184, 56, 76,157, 58, 53,195, 98,177,  4,167,166,166, 26,171,109, 50,104,210, 36,103,207,158, 61,153,
+161,161,161,  6,173, 86, 43,200,203,203, 19, 95,188,120,145,213,104, 52,182,106,181, 90,172, 82,169,196,165,165,165, 34,173, 86,
+ 43, 22,  8,  4, 18,163,209, 40,190,118,237,154,176,168,168,200,190,166,235, 20, 26, 26,154,247,224,193,  3,183, 67,135, 14,161,
+105,211,166,216,191,127, 63,102,205,154,133, 43, 87,174,192,215,215, 23,123,246,236,193,236,217,179,145,152,152,  8, 23, 23, 23,
+116,239,222,189,198,239,  8,  0,130,130,130, 30,197,198,198,  6, 74, 36, 18, 60,121,242,  4,153,153,153,229,235,217,161,160,160,
+  0,143, 31, 63, 70, 86, 86, 22,130,130,130, 48,102,204,152,199,153,153,153, 65,181, 21,180,150, 45, 91, 22,156, 57,115,198,165,
+ 89,179,102,200,203,203,131,163,163, 35, 28, 28, 28,224,232,232, 88,241, 57, 32, 32,  0, 51,103,206, 68,179,102,205,242, 83, 83,
+ 83,221,107, 51, 63, 77,155, 54, 61,113,230,204, 25, 23,123,123,123,228,230,230,162,180,180, 20, 34,145,  8, 74,165, 18, 46, 46,
+ 46,144,203,229,  0,128,164,164, 36,244,239,223,191,240,201,147, 39,189,173, 53, 71, 12,195,  8,220,221,221, 31,220,187,119, 47,
+152, 16,130,244,244,116, 36, 38, 38,226,157,119,222, 73, 50, 24, 12,161,175,210,154,122,149,250, 85, 73, 38, 76,156, 44, 25, 50,
+104,176, 46,230,214,113, 94,129, 11,104,211, 66,161,  2,128, 27, 49,122, 71, 61,186,160, 69,171, 62,130,  3,135, 14, 42, 55,111,
+250, 69, 12, 30,238, 96,144,152,240,144, 44,174, 78,123, 64,111,199,241,179, 63,232,211,184,115,199,206,162,210, 82,226,241,235,
+150,245,109,210,146,159,184,  3,128,127,195,128,188, 73,227,223,190, 97,111,207,228, 94,188,114,145, 93,177,230,248,253, 35, 39,
+ 84, 91,172,136, 44,  7,248,249,249, 69,255,246,219,111, 46,174,174,174,112,112,112,128, 86,171,133,217,108, 70, 66, 66,130, 97,
+215,174, 93, 22,123,123,123,187,220,220, 92,168, 84, 42,136, 68, 34, 68, 71, 71,167,231,230,230,250, 63,175, 85,222,  7, 11,  0,
+222,233,219, 88,220,164,123,176,147, 68,198, 42, 20,226,135,158, 96, 56, 25, 67,108,221,207,158,141,110,118,238,194,165,215,251,
+ 13, 24,229,218,190,125, 55, 44, 95,250,137, 37, 61, 55, 47, 66,165, 27,244,160,170, 62, 88,141,131,153,238, 67,134, 15, 29,249,
+197, 23, 11,177,112,254, 34, 28, 57,116, 64,109,107, 35, 48,218, 59,138, 29, 58,183,235,104,152,249,238,224, 12, 93, 89,166,239,
+202, 31,215,143,233,217,123,164, 79,187,246, 93,113, 45,250, 60,246,236,222,112, 75,194, 89,104,115,225,115, 44, 98, 24, 39,199,
+128,128, 41,239, 39, 37, 73,238, 46, 92, 88,198,102,103,151,180,154, 49,163,176,170,125, 51, 79,157,178,145,122,121,217, 59, 13,
+ 26, 84,111,141,191, 63,177,228,231,255, 92, 85, 31,162,170, 52,111,120,122, 58,254,126,238, 92, 15, 94, 36,234,242,238,244,233,
+138,168,168, 40,148,150,150,226,200,145, 35,216,177,125,187,209,195,221, 61,214,241,230,205, 59,  1, 57, 57,159, 89,171,217,106,
+198,140, 66,142,227,152,169, 75,151,246,124,152,145,209, 61,191,168,168, 62,  0,184, 57, 56,100,132,251,248,220, 90,181,109, 91,
+226,247, 13, 26,240,214,166,115,215,149, 43,238,199, 10, 10,222,114,116,116, 84, 20, 20, 22,138,100, 82,105, 81, 68, 80,208,158,
+175,166, 79, 63,111,186,115, 71, 34,247,241,177,119, 24, 48,160,206,121,111, 53, 99, 70,161, 90,167, 19,205,251,238,187,142,217,
+ 69, 69,245,181, 38, 83,144,186,172,204,131, 53,155,  5,118, 10, 69,145,127, 80, 80,190,230,204,153, 28,255,178,178, 15, 86,107,
+181,249,180, 84,254,197,  8, 22,195, 48, 32,132, 88, 21,189, 18,139,197,127,234,163, 85,  3, 18,161, 80,136, 27, 55,110, 32, 63,
+ 63, 31, 77,155, 54, 69,131,  6, 13,254,180,195,147, 39, 79,112,244,232, 81,168, 84, 42,180,108,217, 18,  0, 36, 53,  9,218,217,
+217,125, 56,119,238, 92, 71,163,209,136, 91,183,110,161, 85,171, 86,144,201,100,144, 72, 36,127, 50,127,249,249,249,  8, 11, 11,
+195,212,169, 83, 29,190,255,254,251, 15, 81,195, 26,114,132,144,233,163, 71,143,118, 11, 15, 15,  7,  0,100,100,100,148,167,  5,
+  0,224,234,234,138,152,152, 24,180,106,213, 10,238,238,238,232,219,183,175,219,193,131,  7,167,  3, 88, 81,109,198, 37, 18, 65,
+104,104,104,235,103, 17, 34,  8,  4,130,135,246,246,246,174,238,238,238, 54,246,246,246,255,150,199,141, 27, 55,170,164, 82,169,
+197,154,139,154,155,155,139,240,240,112,168,213,106,  0,128, 86,171, 69, 80, 80, 16, 74, 75,159,118, 57, 51, 26,141,240,242,242,
+130, 94, 95,115,215,174,230,205,155, 47, 12, 13, 13,237,213,181,107, 87,153, 88, 44,198,221,187,119, 17, 17, 17,129, 93,187,118,
+193,207,207, 15, 74,165, 18, 73, 73, 73,104,218,180, 41, 46, 92,184,  0, 87, 87, 87,132,133,133,201, 90,182,108,121,169,184,184,
+248, 92,106,106,234,194, 26, 34,109,  2, 91, 91, 91, 92,184,112,  1,191,253,246, 27, 82, 82, 82,144,157,157, 13, 59, 59, 59,180,
+104,209,  2, 77,154, 52, 65,135, 14, 29,144,148,148,  4,166,150,194,196, 48,140, 71,112,112,240,145, 27, 55,110,184, 16, 66,176,
+117,235, 86,148,149,149,193,100, 50, 65, 32, 16, 64, 46,151,195,201,201,  9,221,187,119,135,171,171, 43,130,131,131,177,123,247,
+110,151,190,125,251, 30,125, 22,129,202,173,237,154, 58, 57, 57,125,176, 96,193,  2, 95, 55, 55, 55,164,166,166, 66,173, 86,195,
+221,221, 29, 93,187,118,245, 62,125,250,244,  7,  0, 86,189, 42, 15,129,242, 14,237, 12,195, 48,135, 15,237, 28,236,231, 41,109,
+220, 38, 66,227, 31,123, 91, 20,120,244,244,163,102, 79,175,135,255,189, 54, 45, 53,143,111,220, 58,158,118,248,208,206,235,247,
+ 31,226,160, 53, 77,216,133,106,193,193, 19,167, 83,163,154,133, 69, 10,191,251,113,193,224,201,147,122,203,234, 57, 69, 50,165,
+249,187,113,229,122,172,255,231, 11,231,184, 45, 94,184,236,240,137,211,169, 92,161, 90,176,196,154,244,  6,  6,212,251,126,223,
+122,145,139,198,244, 35, 98,174, 59,  0,226,246,104, 24,208,  8,165,165,165,144,203,229,242, 49, 99,198,112,115,231,206,213,217,
+219,219, 43, 69, 34, 17, 98, 98, 98,242,  5,  2, 65,239,218,116, 13,110, 78,132, 51, 91, 88, 34, 21,242,132,177,211, 51, 92,177,
+ 52, 46, 33, 25, 93,186,244,205,107,221, 42, 98,233,178,111, 86,125, 26, 16, 16,226, 58,102,236, 20,241,138, 21,159,173,  3, 16,
+ 89,149,206,253, 36,114,182, 73, 32,163,  0,208,255,139,197, 11,241,228, 73,146,211,228, 55, 84,139, 68, 50,133, 87,168,127, 71,
+187,117,191,157,235, 19, 20,212,160,254,228,137,111,254,241,203,198,223,250, 87,142,100,237,220,241,203, 65,134, 97,122, 88,115,
+109,255, 65, 52, 27,119,228,  8,202,210,211, 45,197,151, 46, 25,122,252,240, 67, 97,203,241,227, 87, 89, 88,214,165,188,174, 42,
+255,201, 48, 12,192,243,140,104,197, 10,  1,241,242,130,197,209,241,141, 57, 64,163,218, 52,151, 89, 44,195,134,180,104,209,255,
+215,109,219,224,239,239, 95,161,233,224,224,128,233,211,167, 99,218,180,105,178,123,247,238,181, 57,122,244,104,155, 45, 63,254,
+232, 62,  7, 24,102, 77, 58, 47,222,189,235,244,241,154, 53,243, 26,135,135,251,173,254,225,  7, 89,121,125,151,154,154, 26,252,
+195,247,223,251,119,143,138,202,251,228,227,143, 55,221,153, 53, 43, 12, 79,151,100,171, 86, 51,247,226, 69,211,177,226,226,183,
+246,236,221,235, 24, 18,242,180, 27,228,227,199,143,221,126,253,245,215,183,187,191,251,238,216, 89,163, 71,127,214,253,209, 35,
+149,125, 65,129,108,192,247,223,139,118,142, 28, 89,171,102,121, 58,  1, 96,248,236,217, 31,182,237,216,177, 73,223, 49, 99,234,
+121,121,121, 49, 10,133,  2,102,179, 25,121,121,121, 78,137,137,137,129,167, 85,170,210,147, 49, 49, 91,241,108, 17,119,202, 95,
+ 48, 88,  0,192,113,156, 85,230, 74, 36, 18,253,171,112, 91,115, 82,145,  8, 94, 94, 94, 40, 44, 44, 68, 92, 92, 28,252,253,253,
+ 97,177, 88,112,226,196,  9,168,213,106,136,197, 98, 72, 36, 18,152,205,181,175, 13,107, 99, 99, 19,213,185,115,103,209,213,171,
+ 87, 17, 16, 16,  0,133, 66, 81,145,174,242, 77, 34,145,192,211,211, 19,165,165,165,136,140,140, 20,111,220,184, 49,170, 38,131,
+101,107,107,219,111,240,224,193, 21, 33,182,178,178, 50,  8,133,194, 10,179, 82, 86, 86,134,226,226, 98,168, 84, 42, 24, 12,  6,
+ 52,107,214, 76,122,246,236,217,126, 53, 25,172,202,232,116,186,178,252,252,124,199,200,200, 72,167, 77,155, 54, 37,182,111,223,
+ 62,164,242,255,207,159, 63,111, 48, 24, 12, 98,169, 84, 90,235, 58,119, 12,195, 96,219,182,109, 21,215, 62, 43, 43, 11,235,214,
+173,171,248,127, 82, 82, 18,190,251,238,187,138,121, 57,106,250,142, 66, 67, 67,251,110,221,186,181,213,150, 45, 91, 74,132, 66,
+ 33, 18, 19, 19,177,125,251,118, 16, 66,224,234,234, 10,157, 78,135,188,188, 60,156, 59,119, 14, 44,203,194,214,214, 22,222,222,
+222,242,233,211,167,119, 90,180,104,145, 24,192,194, 26,202, 18, 39, 20, 10,225,239,239,143,249,243,231,195, 96, 48, 64, 34,121,
+234, 43, 75, 75, 75,161, 82,169,112,231,206, 29,164,166,166,162,182,202, 69, 46,151,143,216,178,101,139,155, 84, 42,133, 94,175,
+135, 70,163, 65, 70, 70,  6,210,210,210, 12,249,249,249,172,157,157,157,192,223,223, 95, 32,147,201,100, 67,134, 12, 97,202,141,
+230,128,  1,  3,156,183,110,221, 58,170, 54,115,196, 48,140,107,227,198,141, 63,125,251,237,183,229,149, 76, 55,114,115,115, 49,
+108,216, 48,229,213,171, 87,231, 50, 12,179,157, 16, 82,240, 42, 61, 12,  8, 33,164,172,236,151,203, 23, 15,254,208, 56,246,182,
+ 40,208,100, 42,105,223,179,223,  7, 34,  0,184,122, 97, 99,251,216,219,113, 80, 48,108,218,177,147, 43, 46,219,218, 78, 38,181,
+ 69,  0,251,245,112,236,227,231, 38, 29, 58,100, 80,148,224,215, 45,235,219, 76,158,212, 91,230,214,112, 61,  3,  0, 78, 18, 31,
+116,224,102,  9, 12, 70,173,252,215, 45,235,219, 12, 25,212,239,122, 74,114,218,170,254, 81, 78,191, 31, 61,163, 58, 94, 83,132,
+208,211, 77,228,237,100, 87,  8, 39,187,  8,248,  7,216,225, 78,204, 61, 28,220,127,  9,193,161,157, 96, 52, 26,193,178,172,205,
+192,129,  3,117,123,246,236, 49, 20, 21, 21,105,204,102,115,151,236,236,236,135,181,229, 63, 51, 51,129, 15,241,104,103,150, 40,
+100,172, 70, 45,209,205,249,108,239,200,150,109,123,181,114,242,244, 22,187,218,240,135,187,117,137,220,190, 99,219,207, 51,102,
+125,180, 24, 45, 90,180,111,127,255,209,177, 38,  0, 98,171, 52,173,143,201,145,240, 96,134,125,242,232, 81,255,180,212,212,204,
+ 70,238, 30,166,199, 42, 98,249, 96,206,250,158,145, 93, 70, 52, 11,108,220, 89, 26,159,112,129,153,249,238,219, 59, 86,254,184,
+126, 76,185,201,186,120,241, 68,151,133, 11, 83,165,  0,140,180,122,122,246,114, 42,147,249,216,250,251,139, 82, 54,109,210,  7,
+ 12, 28, 88,  2,  0, 22,150,117,137,190,118,205, 65,169, 84,130, 16,  2,139,197,242,167, 62,194,229,253,130,163,186,118,117,183,
+ 70, 51,227,167,159,154,189,251,238,187,200,205,205,  5,203,178, 16,139,197,207, 63,179,161,209,104, 48,124,248,112,108, 92,187,
+182,157, 53,154, 28,199, 49, 31,175, 89, 51,111,250,  7, 31,  4,142, 29, 59, 86, 80,249,217,235,232,232,136, 95,214,175,151,110,
+218,180,201,103,249,111,191,189,209, 83, 38,123, 82,155,166, 38, 44, 12,142,177,177,138,114,115,  5,  0,129,129,129, 88,182,108,
+153,108,244,232,209,210,  9, 19, 38,124, 27, 31, 18,178,102, 97, 90,218, 35,231, 70,141,236,165, 50,153,143,181,215, 19,  0,202,
+ 76,166,240,  5, 95,124,225,116,253,250,117,100,103,103,151,207,117,  5,134, 97,208,180,105, 83,102,228,200,145, 14,237, 90,181,
+106, 67, 75,228, 75,138, 96,113, 28,247, 39,163, 82,155,193,170,115,251, 36,195,192,211,211, 19,102,179, 25, 27, 54,108,128, 68,
+ 34,169,168,116,  1,192,100, 50,213,170, 97, 48, 24,154,122,120,120, 64,173, 86,163, 81,163, 70,127,138, 92, 73, 36, 18,136, 68,
+ 34, 72, 36, 18,200,100, 50, 24,141, 70,120,123,123,195, 96, 48, 52,173,197,  0,181,176,183,183,175,168, 88,141, 70, 99,133,185,
+ 82,169, 84, 80,169, 84, 48,153, 76, 40, 41, 41, 65, 89, 89, 25, 84, 42, 21, 52, 26, 77,132, 53,121,230,121, 30,113,113,113,143,
+ 67, 66, 66, 90,  8,133, 66,216,218,218,218,104,181,218,138,190, 67,197,197,197,216,188,121,179,118,252,248,241, 46,215,175, 95,
+183,106, 33,225,247,222,123, 15, 50,153, 12, 58,157, 14,107,215,174,197,251,239,191, 15,137, 68,  2,141, 70,131,117,235,214, 97,
+230,204,153, 16,137, 68, 48,153, 76,216,181,107, 87,245,145,140,132,132,148,107,215,174, 69,180,108,217,210,233,247,223,127, 47,
+232,217,179,167,107,239,222,189,161, 80, 40,160,215,235, 97,177, 88,208,174, 93, 59,132,134,134, 34, 63, 63, 31,199,142, 29, 43,
+ 12, 14, 14,118,185,126,253, 58,159,155,155,155, 86, 91,229, 93,217, 96,115, 28,135,188,188, 60,168, 84, 42, 20, 20, 20, 32, 59,
+ 59, 27,153,153,153, 16,137, 68,168,237,229,221,217,217,121,120,120,120,184, 16,  0, 20, 10,  5, 90,180,104,129,121,243,230,177,
+122,189,254, 53,  0,199,158,237,214,119,253,250,245,191, 95,190,124, 89,228,229,229,133,  7, 15, 30,192,213,213, 85, 36,151,203,
+107, 53, 88, 30, 30, 30, 27, 15, 31, 62, 92,175,220, 84,151,151, 85,157,238,233,215, 49,108,216,176,122, 91,182,108,217,  8,160,
+223,171,246, 64,176, 21, 56,138,218,180, 80,168,142,158,126,212,172,103,191, 15, 68,158,129, 11,  0,  0, 29,  0,209,169,163,107,
+154,245,139, 10,218, 83,222, 47,171, 38,134,244,117, 93, 49,112, 96,115,193,216,145,173,158,136, 36, 33,129,219,182,172,113,175,
+231, 20,249,175,135,132,176, 30,108, 20, 64,104, 32, 39,136,222,249,196,125,230,  7, 33,166,237,155,222,122,178,109,207,173, 40,
+137,228,110,119,  0, 51,171,211,142, 79,180, 28, 82,107,235, 53,118,144,156,103, 32, 31,132,136, 22,193,112,117, 85, 97,237, 47,
+ 91,224,237,215, 17, 70,163, 17,246,246,246, 74,  0,102,179,217,188,205, 26,115,  5,  0,103,206,168,248,176, 48,149, 73,168,225,
+217,119,223, 95, 49,180,103,223, 65, 77,186,119,143,226, 79,158, 58,105,238, 24, 97,206,233,222,189,125,222,185,243, 23,147,114,
+115,179,130, 67, 67,155,225, 97, 98, 76, 31,128,137,  3,170, 46,176,113, 73,228,120, 96, 32,115,110,215,174,201,188,158,191,163,
+248,114, 73,108,223,254,253, 39,132,119,142,236,204,159, 58,125,214, 36, 69,225,125,219, 78, 29,178, 38,140,126,237,247, 93,251,
+127,239,117,238,236,145, 32,117,105,222,145,111,126, 36,212, 92, 85,126, 57, 99, 89,119,145, 76, 38, 40, 56,119,142,109, 58,105,
+ 82,197,181, 81, 42,149, 56,120,240, 32,164, 82,105,197, 38,145, 72, 42, 62,187,187,187,131, 33, 68, 80, 23,205,156,156, 28,228,
+230,230,194,193,193,  1,174,174,174,200,205,205,197,213,171, 87,241,240,225, 67,136,197, 98,244,233,211,  7,130,106,234,205,231,
+ 53,167, 46, 93,218,179, 81,227,198,126,207,155, 43, 60, 45,152, 40, 46, 46, 70, 84, 84,148,224,204,153, 51, 30,209,143, 30, 13,
+  2,176,173, 70,205, 65,131,138, 10,206,156,169,242,220,225,225,225,204,193,131,  7,101, 99, 70,143,158,177,232,251,239,127, 92,
+242,195, 15, 25, 28,203,122,212, 37,239, 12,195,  8, 24,134,129,175,175, 47,138,139,139, 81, 86, 86, 86, 30,112,128,147,147, 19,
+ 44, 22, 11,120,158, 23,211, 18,105, 61,130,218,204,128, 53,230, 74, 44, 22, 67, 32, 16,188,144,201,170, 28, 33,120, 30,107, 12,
+ 86,121,229, 39,151,203,255,116,131,149,155,181,202,159,203,223,118,172, 64, 88, 90, 90,138,125,251,246, 85, 20, 52,147,201,  4,
+181, 90, 13,149, 74,  5,181, 90, 13,131,193,128,148,148, 20,236,220,185, 19,217,217,217, 16, 10,133, 86, 77,218,250,228,201,147,
+ 91, 13, 26, 52,104, 81, 94,121,119,235,214,205,231,226,197,139,217,229,215,224,179,207, 62, 43,108,215,174,157, 75,229,202,189,
+214,196, 10,133,184,122,245, 42,244,122, 61,  8, 33,144, 72, 36, 72, 76, 76,  4,203,178,224,121, 30, 34,145,  8,  5,  5,  5,181,
+ 70,176,226,226,226, 38,190,249,230,155,171, 39, 77,154,116,238,227,143, 63, 62,213,173, 91,183, 12,134, 97, 96, 54,155, 97,111,
+111, 15, 15, 15, 15, 36, 38, 38,194, 96, 48,224,195, 15, 63, 76,223,178,101,203,233,181,107,215,158,219,176, 97,195,234,204,204,
+204, 55,235,242,125,179, 44, 11,173, 86,139,146,146, 18, 20, 23, 23,163,180,180, 20,  6,131,225,133,202, 80,100,100, 36,142, 28,
+ 57, 34,236,209,163,199,175,254,254,254,185,254,254,254,185, 61,122,244,248,245,208,161, 67, 66,111,111,111,164,166,166,226,214,
+173, 91, 40, 41, 41,  1, 33,164,198, 19,136,197,226,110,227,199,143,239,228,231,231,199,152,205,102, 24,141, 70, 24,141, 70,152,
+205,102,240, 60,143,212,212, 84, 52,110,220, 88,224,239,239,223,158, 97,152,110,244, 17, 98, 61,165,249,187, 65,116, 63,128, 24,
+119,130, 47,253, 17,218, 23,156,140,164,164,164,100,201, 59,115,212,249,156, 49,  6,  9,177,231,161,209,121,195,167,225, 68,188,
+253,102, 55,220,184,118, 18,197,197,197, 72, 72, 72, 64,151, 46, 93, 36, 12,195,212,169, 92,158, 58,117,141,123,109,220,251, 35,
+186,245, 26,212, 42, 42,170, 31,123,226,196,105,211,237,155, 39,110,  5,  5, 58,229, 19,190, 44,207,209, 81,121,231,209,163,251,
+  8,110,212,  4,102,139, 37, 18, 88, 88, 99,121,122,252,152,152,254,248,195,147,123,109, 82,220,184,222,125,222,104,222,163, 71,
+111,203,137, 83,135,185, 75,231,246,222,233,221, 59,240,194, 87,107,118,251, 22,155, 66,195,228,246, 30, 71,219,119, 82, 70, 78,
+125,221,111, 50, 45, 41,213, 68,  3,228,114, 30,207,158,139,229, 93, 88, 42,155,171,231, 55,107,234,164,202,154,149,235, 34,149,
+ 74,133,164,164, 36,124,243,205, 55,136,137,137,  1,199, 61,237,106, 87, 91, 55,139,202,154,137,233,233,221,223,127,255,125, 89,
+ 85,230,170,168,168,  8,133,133,133,200,202,202,194,128,  1,  3, 36,197, 78, 78, 45,107,211,244,118,115, 51, 42,229,242,188,135,
+ 15, 31,254, 91,122, 75, 75, 75, 33,149, 74,241,253, 15, 63, 72, 78, 60,120,240,206,137,179,103, 93,234,114, 61, 43,215,165,110,
+110,110,  8, 12, 12, 68, 68, 68,  4,154, 54,109, 10,185, 92,142,248,248,120,252,252,243,207, 16, 50, 12, 75, 75,226, 75,138, 96,
+213,197, 96,213,197, 16, 88,139, 53, 77,132,114,185, 60, 54, 47, 47,175,163,183,183, 55, 88,150,173, 48, 83,207, 55, 17,150, 71,
+ 59,238,223,191, 15,185, 92, 30, 91,147,166, 82,169,140, 21, 10,133,237,219,180,105,131,253,251,247,227,220,185,115, 72, 78, 78,
+134, 78,167,131,209,104,132, 94,175, 71,124,124, 60,120,158, 71,120,120, 56, 28, 28, 28,160, 84, 42, 99,107, 75,171, 86,171,205,
+ 17,139,197, 33, 10,133,226, 95,205, 29,158,158, 40, 42, 42,226, 45, 22, 11, 54,111,222, 92,234,225,225, 97,163, 80, 40, 80, 62,
+255,152, 53,230, 50, 63, 63, 31, 62, 62, 62, 21,125,176, 52, 26, 13,220,220,220, 96, 54,155, 43, 34,112,118,118,118,181,154, 75,
+ 66,136,  1,192,172, 74,218,173, 71,142, 28,185, 99,215,174, 93, 13, 79,159, 62,141,235,215,175,195,213,213, 21, 75,151, 46, 77,
+ 78, 77, 77, 29, 67,  8,185,249,178,191,115,107, 12, 86, 81, 81,209,190,216,216,216,246,109,218,180,169, 40,116,221,186,117, 99,
+186,117,235,230, 82, 57,164, 95, 80, 80,128, 27, 55,110,224,244,233,211, 96, 24,  6, 73, 73, 73,156, 94,175,223, 81,195,185, 37,
+254,254,254,155,230,205,155,103,203,178,108, 69,217, 86, 40, 20,144,203,229,144, 72, 36, 16, 10,133, 72, 77, 77,197,224,193,131,
+ 29,126,248,225,135,141, 12,195,  4, 18, 66,204,175,202,  3,161,140, 87,177, 55, 98,244,142, 78, 78,254,247,174, 94,216,216,190,
+195,179,103,196,213, 11, 27, 89, 39, 39,255,123, 55, 98,244,142,157,125, 85,172,109, 45, 58,  7,142, 21,204, 54,155,111,246, 57,
+126, 44,118,232,172,153,111, 75,253, 27,  6,228, 93,185, 30,235,223,129,155, 37,176, 81,  0, 90, 61, 80,172,  2, 30, 60, 22,242,
+254, 13,  3,242,110,222, 78,148,126,187,114, 67,128, 78,111,250,253,232, 25,213,241,154,180, 51, 51, 51, 13,222,222,222, 67,102,
+ 45, 82, 94, 24, 61,198, 77, 42,145,251, 66, 83,114, 27,245,253,157,241,218,240, 16,252,248,203,109,216,219,215,123, 26,193, 96,
+ 24, 27,107,243, 94, 88, 88,200,236,219,121,105,210,248, 55,222,110,215,187, 87,127,246,248,137, 63, 68,231, 78, 30,186,186,241,
+151, 79,127, 39, 66,173,146, 33, 26,133,175,159,207,189,148,228,135, 99, 58,119,238,  5,133, 84, 25,  4,132, 86, 89, 96, 43,  6,
+ 14, 16,164, 11,  4,144,143,127, 99,114,135,222,189,  7,177, 39, 78, 28,192,137,163, 91,174, 45, 88, 80,255,104,114,214,118, 73,
+244,205, 76,249,144, 17,211, 74,142, 28,187,111, 26, 62,176,193, 67, 47,155, 22,122, 90, 45, 61,247,  2, 41, 18,229,177, 70,163,
+175, 79,239,222, 66, 93, 90,154,216,214,221,157,  5,  0,139,197,242,111,166,170,114,  4, 75, 32, 16,  0,  2,  1,111,141,166,181,
+105,209,233,116,224,  1,214, 26,205,130,226,226,250,207,247, 49,182, 88, 44, 40, 42, 42,170,216, 84, 42, 21,228,114, 57, 74,158,
+ 77, 26, 90,155,102,231,102,205, 54,175,252,246,219,217,191,172, 95, 47,169,108,174,202, 55,129, 64,128,185,159,126, 42,153,255,
+213, 87,211,134,137, 68, 31,212,229,122,150,191,172, 11,133, 66,136, 68, 34,164,165,165, 33, 61, 61, 29,105,105,105, 72, 75, 75,
+131, 66,161,  0, 97, 24,158,150,200,151, 96,176,202,191, 60,107, 59,185, 91,107,  8,202,223,  4, 94,150,193,210,106,181,167, 47,
+ 95,190,220,182, 87,175, 94,162,107,215,174,193,195,195,163,194, 96,149,255, 44,111,118, 82, 42,149, 56,118,236,152, 89,171,213,
+214,184,144,164, 94,175, 63,115,230,204,153, 86, 51,103,206, 20, 79,156, 56, 17,  9,  9,  9,152, 50,101, 10, 84, 42, 21, 74, 75,
+ 75, 81, 84, 84,  4,157, 78,135,182,109,219, 66, 46,151,227,209,163, 71, 22,189, 94, 95,219, 84,  5, 36, 63, 63,191,204,213,213,
+213,243,249,127,140, 24, 49,194,253,167,159,126,210, 61,120,240,192,210,177, 99, 71,123,107,141, 70, 57, 59,119,238,172, 48, 79,
+ 15, 31, 62,196, 79, 63,253, 84,209,231,234,246,237,219, 88,177, 98, 69,197,220,101,117,140, 42,222, 12, 11, 11, 99, 45, 22, 11,
+130,130,130,202,155, 87,177,122,245,106,246,239, 48, 87,214, 98, 48, 24,246, 78,152, 48,225,147, 59,119,238,120,138, 68,162,242,
+208, 53,120,158,135,217,108,198,163, 71,143, 16, 31, 31,143,  7, 15, 30,160,184,184,184,226,  5, 32, 38, 38,166,196, 98,177,236,
+174, 78,215,213,213,245,179,223,126,251,205, 67,169, 84,254,169, 60, 11,  4,130,138,135,142, 68, 34, 65, 65, 65,  1, 28, 29, 29,
+209,163, 71, 15,183, 51,103,206,124,  6, 96,254,171,240, 48, 96, 24,134,233,216,206,182,211,123,211,222, 64,155,150,154,199,177,
+183,227,112,234,232,154,102,192,211, 78,238, 77, 91,134, 63,190,113,199, 14,125,123,205,238,116,229,218,148, 26, 59,185, 63,235,
+ 67,117,180,109,219,122,151, 15, 28, 58,253,227,156,153,111,223,248,124,225, 28, 55,131, 81, 43, 15, 13,228,  4,192, 83,115, 21,
+125,199,198,176,120,225,219, 55,150,173,220,204,167,231,155,103, 92,191, 94, 82,237,232,222,202,166,197,201, 22,114, 15,223, 25,
+217,245,  3,186, 55,136,189,189,  1, 46, 14, 37,176, 11,234,136,190,189,219,226,244,153, 88,164,101, 25,144,159,159, 15,  0, 53,
+ 78,123,240,224,222,239,227,  8, 67,252, 24,194,164, 51,  2, 34, 31, 55,225,173,200,254,253,  7,145, 35, 71, 14,177,  7,126,223,
+118,121,247,214,239,246, 10, 36, 98,145,222,228, 96, 98, 24,131,154, 23,216, 37,104,181, 69, 79, 31,158, 18, 73,245,203,221, 60,
+155,144,181, 73, 88,168,199,184,  9, 83, 28,250,245, 29, 76,142, 30, 61,192,239,222,181,249,220,238, 13, 77,183,241,130, 82, 73,
+ 78,134, 78,166, 46,181,168,  9, 35,117, 44, 43,229,117,121, 79,  2, 13, 94,253, 71,152,105,181,244, 92, 61, 96, 52,102,150,101,
+100,120,214,235,210, 69,246,104,225, 66,165,123,219,182,134,242, 46, 44, 53, 25, 44,161, 80,  8,  2,240,214,104, 90,155, 22,189,
+ 94, 15,194, 48,150, 23,209,100, 89,246, 79,230,170,220, 96, 61,123,214, 91,149,206,111, 62,252,240, 90,235, 55,222, 40,142,142,
+142,118,111,223,190, 61,163,209,104,160,209,104,254,100,178, 92, 93, 93,153,134,  1,  1,202, 19, 57, 57,  1,243,173,188,158,214,
+228, 93, 32, 16, 84,123, 61, 41, 47, 96,176,202, 35, 88,214, 24, 44,161, 80,104,141, 41,176, 88, 44, 22,184,185,185,161,176,176,
+176,218, 10, 95, 32, 16, 64,161, 80, 64,171,213,  2, 64,141, 35,233, 52, 26,205,234,197,139, 23, 79,239,214,173,155, 75, 72, 72,
+  8, 10, 10, 10,224,238,238, 14,185, 92, 94,209, 55,172, 92, 47, 46, 46, 14,187,118,237, 42,213,104, 52,171,107,201,247,170,117,
+235,214,189,219,175, 95,191,122, 46, 46, 46,112,114,114,194,189,123,247,224,228,228,132,210,210, 82, 36, 38, 38,194,206,206, 14,
+ 12,195,192, 96, 48,224,226,197,139, 26,158,231, 87,213,114, 99,146, 43, 87,174,152,149, 74,229,189,130,130,  2, 97,113,113,177,
+168,164,164, 68, 84, 90, 90, 42, 86,171,213,226,227,199,143,187, 56, 56, 56,232,206,158, 61, 91,224,231,231, 39, 76, 73, 73, 17,
+154, 76, 38,129, 21,149, 34, 62,248,224,  3, 72, 36, 18, 24,141, 70,172, 94,189, 26,179,103,207,174,232,115,245,245,215, 95, 99,
+222,188,121, 21, 33,245,195,135, 15,215,213,100,193,108, 54,195, 98,177,192, 98,177, 88,101,122,255, 10,214, 24,117, 66, 72, 46,
+195, 48,  3,218,180,105,115,114,207,158, 61,206,118,118,118, 72, 77, 77, 69, 94, 94, 30,242,242,242, 80, 80, 80,128,178,178, 50,
+176, 44, 11,111,111,111,228,229,229,225,192,129,  3,106,141, 70,211,187,166, 17,132, 66,161,112, 66,100,100,164,232,249, 52,148,
+191,213,149,155,118,153, 76,134,236,236,108,116,235,214, 77,122,254,252,249,  9,255,235,  6,171,220,184, 52, 14,134,100,224,160,
+209,146, 22,173,250,232,110,220, 58,158,166, 96,216,180,126, 81, 65,123,128,167,211, 52,220,184, 99,135, 22,173,250,  8,  6,230,
+152,218,170, 74,126,105,209,164, 17, 99,174,105, 89, 29,  0,112,113,224,  7,247,142,170,159, 99,111,207,136, 22, 47, 92,118,248,
+215, 45,235,219, 68,239,252,215, 52, 13,139, 23, 62,157,166,161,119, 84,125, 54,225,193,195,193,  0,182, 88,107, 90,  6, 12,232,
+125,231,183,141,187,144,149,114,216,107,213, 23, 10, 41, 12, 37,128, 56,  4,145,237,236,113,243,199, 76,100,101,101,229,242, 60,
+ 95, 99, 51, 46, 97,136, 95,124, 66, 92,163,166, 97, 77, 60,198, 77,152,108, 63, 96,192, 96, 28, 57,114, 16, 91, 55,111,184, 56,
+124,244,176, 95,179, 74, 74,133,110, 98,165, 68, 73,120,169, 80,226, 32,146, 43,149,249,230,236,236,167, 15, 79,145,216, 30, 24,
+201,  3,213, 71,134,167, 78, 30,235,208, 61,106, 48,254, 56,122, 16, 91, 55,255,114,225,243,176, 17, 27, 26, 68, 52,102,218,182,
+252,102, 90,131,134, 13,252,181,101,121,165,  2, 70,106, 54, 24,120,187,111, 54,167,174,124, 50,111,194,147, 59,113, 35,191,165,
+163,  8,255,196,189,173,253,250,181,121,255,241, 99,137,107,167, 78,138,236,115,231,148,214, 24, 44,145, 72,  4,  8,  4,172, 53,
+154,204,169, 83,  2,  0, 53, 14,174,146, 72, 36,208,233,116, 96, 25,198,108,141,166, 91, 76, 76, 70,106,106,106,176,163,163,227,
+159,204, 85,113,113,113,197,103,131,193,  0,147,201,  4,133, 92, 30,111,141,102,222,197,139,134,121, 19, 39,206,127,247,157,119,
+190,219,185,107,151,220,193,193,  1,106,181,250, 79,  6,203,100, 50,161, 77,219,182,146,141, 15, 30,140,  3,176,192,154,235,233,
+222,173, 91,173,253,125,159, 25, 86,218, 68, 88,151,250,172,182,166, 26,107, 71, 17, 86, 85, 49, 50, 12, 19,245,220,239,243,250,
+246,237,107, 72, 78, 78,134,159,159, 95,133, 73,169,124, 78,123,123,123, 56, 58, 58,226,193,131,  7,216,176, 97,131,158, 97,152,
+121, 53,105, 22, 23, 23,107, 12,  6,195,168,209,163, 71,235, 37, 18,  9, 66, 67, 67, 43,230,191,226,121, 30, 82,169, 20, 54, 54,
+ 54,136,139,139,195,132,  9, 19,116,  6,131, 97,212,243,115, 96, 61,175,153,154,154,170,214,106,181,175,191,254,250,235,186,135,
+ 15, 31, 34, 50, 50, 18,119,239,222, 69, 89, 89, 25,202,202,202,144,146,146,130, 38, 77,154,192,100, 50, 97,239,222,189,122,173,
+ 86,251,122,106,106,170,186, 38, 77,141, 70, 51,112,249,242,229,194,163, 71,143, 54,240,241,241,  9,107,221,186,117, 72,143, 30,
+ 61,  2,135, 14, 29,234,223,175, 95, 63,207,224,224, 96, 67,239,222,189, 93,251,246,237,235, 42, 20, 10,197,143, 31, 63,206, 33,
+132,244,173, 73,179,178, 41,121,248,240, 97, 69,147,160, 72, 36, 66, 97, 97, 97,197, 76,251,229, 15,163,170, 12,112,117,154,149,
+ 77,118,185,177, 42, 55, 90,181, 61,251,171,210,100, 24,166,214, 10, 67, 42,149,150, 71, 56, 73,109,154,132,144,152,251,247,239,
+247,236,210,165, 75,204,164, 73,147, 52,185,185,185,176,179,179, 67, 64, 64,  0, 26, 53,106,  4, 23, 23, 23,152,205,102,252,254,
+251,239,218,  3,  7, 14,196,170,213,234,110,207,207,129,245,188,166, 64, 32, 72,169,234,225, 90, 30,189, 42, 55, 88,114,185, 28,
+222,222,222,229,215, 54,165, 46,215,243,  5, 35, 75,127,175,230, 51,227,210,163,123,239,134,253,250, 15,113, 56,112,232,160,242,
+251,181,155,238,119, 30, 60,125,157,139,255,172,253, 46,254,179,246,119, 30, 60,125,221,247,107, 55,221, 63,112,232,160,178, 95,
+255, 33, 14, 61,186,247,110,152, 16,255, 32,228, 79,235, 18, 86,145, 78,165, 84,214,182,115,199, 96,213,197, 43, 23,217,101, 43,
+ 55,115, 29, 59,244,187,254,221,119,235,118,127,247,221,186,221, 29, 59,244,187,190,108,229,102,238,226,149,139,108,231,142,193,
+ 42,165, 84,214,214,154,188, 79,157, 60,214,161,127,191,193, 56,114,228,119,118,199,214,213, 95, 31, 60, 97,234, 50, 98,178, 33,
+ 47, 45,229, 54,129,110, 19, 92,237, 99,145,158,158,174,102, 89,182, 91, 85, 29,220,171,210,156,242,246,216,202,230,234,146,179,
+ 71,228,250,251,247,193,157, 58,117,216,114,230,204, 29,253,165,152,124,245,173,132,194,226,162, 82, 67,178, 86, 83,106,226,121,
+ 30,132,231,132,139, 22,129,169,233, 59,234,216,177, 43,206,158,222,142,205,155,126, 86,243, 60, 12, 35,246,236,225, 70,142, 92,
+ 72,252,235,215,247,223,182,115, 59, 51, 96,208, 16,  7,  2,240,  3,135, 13,118,220,177,107,  7,211, 48,168, 97,253,128,128,167,
+ 83,211,252, 79,150,165,191, 65,115,  1, 33, 37,165,105,105, 23,110,255,240,131,209,125,212,168,122, 82,119,119,123,240, 60, 83,
+254,124,175,110, 19,137, 68,127,138,184,212,164,233, 94,175, 94,214,137, 19, 39, 16, 18, 18,  2,111,111,239, 63,117,121, 41,159,
+ 72,219,197,197,  5,167, 78,157,  2,  1,110, 89,163,217,196,203,235,246,143, 63,252, 96,226,121, 30, 37, 37, 37,255, 22,189, 42,
+ 41, 41,  1,207,243,184,120,225,130, 73, 93, 86,182,217,218,188,183, 53,153,202,134,180,106,245,213,248,241,227,205, 41, 41, 41,
+224,121, 30,149, 35, 89,249,249,249, 80, 42,149,208,233,245,190,238,238,238, 74,107, 52,243,143, 31,183, 65, 45,207,117,129, 64,
+240,167, 38,194,191,227,123,255, 71, 69,176, 88,150,133,175,175,239,159,230, 25, 17,  8,  4,127,218,234, 50,130, 48, 43, 43,107,
+139,187,187,251,137,113,227,198,205,111,209,162,197,212, 25, 51,102,  8, 27, 54,108,  8,181, 90, 13, 39, 39, 39,184,185,185, 33,
+ 37, 37,  5, 23, 46, 92,224, 84, 42,213, 58,142,227,190,200,203,203, 43,176, 66,247,156,183,183,247,128, 94,189,122,237,122,247,
+221,119, 29,186,116,233, 34,246,242,242,  2,  0,196,199,199,227,216,177, 99,230, 29, 59,118,148, 26, 12,134, 81,214,204,226, 14,
+  0, 57, 57, 57, 39, 61, 61, 61,135, 79,152, 48, 97,219,208,161, 67,237, 12,  6,131, 56, 37, 37,  5, 38,147,  9, 44,203,162,184,
+184,216,124,225,194,133, 50,157, 78, 55, 54, 39, 39,231,164, 21,122,183, 25,134,105, 98, 54,155, 39,220,185,115,103,201,240,225,
+195,157, 59,116,232, 32, 97, 89, 22,151, 47, 95, 46,136,136,136,112, 43, 45, 45, 53, 95,185,114,165,200, 96, 48,204,203,206,206,
+182,106,169, 28,134, 97, 80, 90, 90, 10, 23, 23, 23, 24,141, 70,240, 60, 15,147,201,  4, 91, 91,219,138,229,141,  8, 33, 47,220,
+ 71,142,101, 89,161,217,108,198,232,209,163,193,243, 60, 86,175, 94, 13,150,101,235, 44,102,107,107,123, 43, 62, 62,126, 64, 88,
+ 88, 88,133,105, 41, 47, 67, 50,153, 12, 46, 46, 46,112,118,118,198,233,211,167, 33, 20, 10,111, 89, 25, 93,187, 11, 32,130, 97,
+152, 14,177,177,177,227,  1,180, 48,155,205,222, 28,199, 49,  2,129, 32,135, 16,114,175,180,180,244, 87,107,151,202,201,207,207,
+ 95,242,198, 27,111, 68,108,223,190,221, 86, 36,250,215,173, 33, 18,137, 32,147,201,224,230,230,  6,  7,  7,  7, 16, 66, 96, 50,
+153,240,217,103,159,149,106,181,218, 37,175,202,195,160, 85,235,182,248,229,167, 53,182,103,206,158, 40,184,159,132,131,149,167,
+ 98,176,  5,112,229,218,148,131,170,146, 95, 90,100,103,100,216,182,106,221,214, 42, 77, 19,199, 22,141, 26,187,206,247,217, 82,
+ 57, 75, 82,146,211, 86,109,223,244,214, 19,  0,248,118,229,134,128,244,124,243,140,132,  7, 15,  7,175, 93,119,190,173,137, 99,
+139,172,209,252,151,105,217,166,  6,129, 33, 43, 43,235,186,143,143, 79,131,200,193,230,121, 33,129,204,160,188, 66, 62,139, 97,
+152,247,178,178,178,158, 88,155,247, 78, 29,187,224,236,201, 29,216,186,121, 91, 41,225,133,  6, 23, 23, 23,  2,  0,247,239,187,
+144,251,247, 85,  4, 40,159,175,209, 81,235,170, 44,248, 98,222,220,169, 51, 53, 26,205,170, 31,191,169,121,194,217,102,205,219,
+161, 89,243,118,152,254,222,167, 14, 77,194, 66,253,  0, 96,207, 30,194,133,  7, 51,135,231,127,190,112,208, 23, 95, 44, 68,169,
+198,136, 47,190,120,186,172, 78, 98, 92,194, 31,143, 31, 19, 19,173,154,254,204,124,150,189,142,153, 51,131,117,197,197,174,157,
+ 62,249,196, 69,244,205, 55,130,170, 58,185,151, 71,176, 42,223,191,214,104, 30, 63,115,230,143,143,102,206,204, 90,241,205, 55,
+189,151, 45, 95,174,104,220,184, 49,114,115,115, 17, 26, 26, 10,111,111,111, 92,185,114,  5, 39,142, 30,213,150,233,245,243, 60,
+ 60, 60,214, 90,163,249,253,142, 29,137,157,187,119, 47,220,178,101,139, 87,247,238,221, 25,173, 86, 11,181, 90, 13,181, 90, 13,
+163,209,  8,137, 68,130,172,172, 44,146,158,145,113, 63, 51, 51,115,157,181,121,231, 10, 10,228,179,210,211, 51, 69,155, 54, 45,
+159, 50,121,242,236,153,179,102,201,124,124,124, 24,163,209, 88, 17,197, 50,155,205, 80, 42,149,102,141, 70,227, 12, 64,103,141,
+166,236,240, 97,182,168,168,  8,206,206,206, 21,211, 46, 85,158, 87, 80,171,213,130, 16, 58,  9,110,157, 94, 20,170,171,195, 67,
+ 67, 67,111,137, 68, 34,159,202,209,172,234,126, 86,170,140, 51,227,226,226, 90, 85,118,184,132,144, 42,251, 59,249,248,248,  4,
+240, 60,191,180, 67,135, 14,195,223,126,251,109,230,194,133, 11, 56,123,246, 44,201,204,204,220, 43, 16,  8,230,101,102,102, 62,
+169,238,205,166, 58,205,122,245,234,217,217,217,217,125,104, 99, 99, 19, 85, 62, 21,131, 92, 46,143,213,106,181,167, 53, 26,205,
+234,234,102,111,175, 73,179, 97,195,134,246, 60,207,127, 96, 99, 99,211,179,176,176,176,  5,  0,184,184,184,196,104,181,218, 83,
+  2,129, 96, 77,117, 11, 72,215,164,233,229,229,165,176,181,181, 93, 82,175, 94,189,215,223,126,251,109,231, 11, 23, 46,228,196,
+196,196, 72, 74, 75, 75,183,179, 44, 91,237, 98,207, 85,105, 54,105,210,228, 79,107, 17,190,204,239,  8,  0,154, 55,111,126,100,
+224,192,129,253,199,142, 29, 11,139,197,130,181,107,215,226,212,169, 83,127, 36, 37, 37, 13,168,233,237,243,121, 77, 15, 15, 15,
+ 23,111,111,239,243,227,198,141,243, 31, 50,100,136,210,222,222, 30, 66,161, 16, 90,173, 22,201,201,201,184,119,239, 30, 57,117,
+234, 84, 89,124,124,124,166, 94,175,239,154,155,155, 91,104,237,245,252, 43,111,201,207,107,138,197,226, 46,190,190,190, 59, 23,
+ 44, 88, 96,215,179,103, 79,133,179,179, 51,132, 66, 33, 44, 22, 11,114,114,114, 16, 23, 23,135, 19, 39, 78,104,247,238,221,171,
+ 45, 42, 42, 26, 77,  8,185,240,159, 72,231,203,212,108,210,136,249,252,185,  5,156,171,157,157,189,166,125,173, 73,103,255, 40,
+167,126,195,135,183,142,  2,128,125,251,110,158,254,227,116,201,209, 23, 77,103,109,105,181, 70,179,113,176,112, 65,124, 66,220,
+159, 38,162, 12,107, 18,254,176,113,211, 97, 95, 90,163, 85, 62,147,251,243,121,175, 52, 59,126,165, 55,130, 63, 55,167,150, 47,
+  8,253,233,188,185, 88,186,228, 43, 28,220,243,251, 31,  9,143,201,145,255,229,178,244,119,106,150, 47, 78,172,244,244,236,188,
+195,197,101,238,201,211,167,109, 43,191,168,149, 71,154, 43,191, 76,182,104,209, 34, 63, 38, 38,198,221, 26,205,  1,223,127,111,
+ 54,216,217,201,150,173, 91,215, 69,103, 50,117,153, 53,107,150,232,246,237,219,216,177,109, 27,171,207,200,216,150,203,113, 31,
+ 84,213,250, 81,147,102,224, 71, 31,201,151,110,223, 62,177,126,195,134,110,131,  7, 15, 22, 11,133, 66,104, 52, 26,100,103,103,
+227,234,149, 43,166,228,148,148,  4,157, 78, 55, 40, 51, 51, 51,219, 90,205,  1,223,127,111,118, 12,  8,128,210,213,149, 92,137,
+142,118,248,120,193,130,169, 30,158,158, 14,157, 34, 35,197, 74,165, 18, 37, 37, 37, 72, 79, 79,199,165, 75,151,242,159, 60,121,
+226, 69,  8,225,172,209, 60, 20, 27,219,236,236,245,235, 35, 62,254,248, 99,105, 72, 72,  8,236,236,236,160,209,104,144,144,144,
+128,171, 87,175, 26,119,238,220,169,214,106,181, 83, 51, 50, 50, 14,253, 93,223,251, 63,198, 96,253,127,221,120, 30, 30, 30,173,
+  4,  2,193,231,207,154,163, 22,215,182,166,223,171,244,208,241,244,244,244,115,114,114,250, 69,175,215, 19,163,209, 56, 37, 39,
+ 39, 39,253,191, 45,157, 12,195,136, 90,181,106,245, 83,126,126,126,  7, 66,  8, 28, 28, 28,174,198,199,199,191, 67,  8, 97,235,
+170,201, 48,140,208,195,195,163,131,141,141, 77, 91, 27, 27,155, 46,102,179,185,241,179,126,120,247,117, 58,221,  5,139,197,114,
+ 61, 55, 55,247, 42, 33,132,251, 79,230,157, 97, 24, 33,128,158, 94, 94, 94,111,241, 60, 31,196, 48,140, 35,199,113,176, 88, 44,
+ 42,158,231, 31,169,213,234, 13,  0, 78,253,167,211,249,178, 52,195,130,152,161, 68,128,198,213, 25,129, 63, 25,154,231,140,  3,
+195,227,126,252, 35,242,187,181,233,100, 24, 70, 48,164,175,235, 10,224,233, 72,195,218,150, 28,250,147,193,178,194,180,212,217,
+ 92,  6,137,222, 32, 12,241,251,243, 67,145, 73, 15,109, 54,116,235, 95, 49, 88,214, 18, 22,194,116,  1, 65,  7,158,224,250,253,
+ 36,114,246, 85,125,214,189, 76,205,175, 24,166,222,158, 70,141,174, 10, 68, 34, 15,134, 97,  4,  0,192,  8,  4, 60, 15,112, 16,
+  8,216,202,205,130,149, 95, 40,107,211, 52,  3, 77,197, 50,153, 47,199,178,238,197, 18,137,237, 21, 27,155,150, 70,160,204,131,
+227, 62, 63, 93, 84,148,248, 34,233, 52,  3, 77,133, 50,153,223, 21, 59,187,193, 42, 39,167,102, 37,102,179, 43,  0,162, 80, 40,
+238,151,233,116,155, 83, 83, 83,127,172, 98, 81,245, 90, 53, 37, 50,153, 15,247,108,228,161, 64, 36,202, 63, 33,147,249, 22,184,
+186,142,215,233,245,254,114,185,220, 66,  8, 41, 53,155,205, 99,211,211,211,207,212, 37,239,233, 66, 97,147,123,118,118,145,156,
+189,189,179,133, 97,108, 76, 28,103, 54, 91, 44, 25, 70,163, 49, 86, 40, 20,174,204,204,204,124,252,119,126,239,175, 28,229,163,
+205,254,142, 13, 64, 20,213,164,154, 84,147,106, 82, 77,170, 73, 53,255,126, 77, 55, 55, 55,165,135,135,135, 31,  0,225,255, 98,
+222, 95,181, 77, 68, 45, 38,133, 66,161, 80, 40,255,251,228,229,229,233, 80, 69,159, 43,202,127,168,137, 16, 64, 84, 53,145, 45,
+171, 67,127, 47, 50,154,192,138,166,  4,170, 73, 53,169, 38,213,164,154, 84,147,106,190, 98,154,181,105,191, 50, 77,143,180,137,
+144,106, 82, 77,170, 73, 53,169, 38,213,164,154,180,137,240,229,110,  2, 80,170,115,214,238, 12,195,184,191,236,125, 41,175,118,
+ 89,168,226, 88,111,134, 97,188,235,184,191, 39,189,234, 20, 10,133,242,191,205,255,123, 31,172,242,138,138, 16,146,247, 50,246,
+123,217,199, 62, 59,254, 43,134,193,199,207, 62,127, 77,  8,153,251, 50,246,173, 13, 47, 47, 47,223,122,245,234,189,225,226,226,
+210,177,168,168,232, 98, 78, 78,206,198,194,194,194,156, 58, 28, 31, 44,151,203,223, 17,  8,  4,225,  0,192,243,124,156,193, 96,
+248, 41, 59, 59, 59,233, 37,124,111, 12,128,201, 50,153,236, 53, 39, 39,167,160,226,226,226, 71, 38,147,105, 15,128,159, 95,100,
+214,105, 79, 79,207,150, 28,199,189,143,167, 35, 89,127, 46, 40, 40,184, 98,237,177,238,225, 67,118, 19, 32, 24,128,128,103,248,
+ 17,  2, 34,216, 11,128,103,128,164,188,184,  3,175,189,228,242,250,194,223,111, 93,143,101, 24,102, 37,  3,124,  8,  6,228,175,
+150, 37, 10,133, 66,161,252, 15, 25, 44,111,111,239,  9,  0,102,227,233, 76,219,223,102,101,101,109,254, 59, 42,171,151, 88,169,
+173, 38,132,204,170,123,180,  2, 31,243, 60, 17,  0,128, 64,192,124,226,238,238, 30, 46, 18,137,140,207,239,203,178,172,140, 97,
+208,135,231,  9,243,108,223,143, 25,134, 89,243, 34,198,206,217,217,217,107,204,152, 49,219,190,248,226, 11,133, 82,169, 68,122,
+122,250,144,185,115,231, 70,121,121,121,141,207,206,206,206,168,237,248,134, 13, 27,142,105,218,172,197,204,185,159,126,110,235,
+234,230,102,195,178,156, 57, 35, 43, 83,249,205, 87,139,219, 54,108,216,112, 77,114,114,242,142,186, 24, 41,145, 72,244,154, 92,
+ 46, 15, 52, 24, 12,143, 89,150,221, 43, 20, 10,123, 47, 89,178, 36,188, 95,191,126,242,210,210, 82, 41,203,178, 65, 91,183,110,
+157,249,219,111,191,245,101, 24,102,112, 77,195,237,203, 35, 56,132,144,172, 74,215,238,157,219,183,111,119, 23,139,197,204,179,
+ 69,155,175,212,180,127,101,  8, 16, 28,127,121, 79, 83,  0,  8,235, 52,242, 97,252,229, 61,120,246,249,165,191, 12, 60, 95, 22,
+156,156,156,182,151,148,148, 36,212,102,228,171, 58,150, 97,152,239,  8, 33,185, 94, 94, 94, 29,  1,188,243,108,215,159,178,179,
+179,175, 48, 12,227, 33,151,201, 62,212, 27, 12, 12,  0,230,175,148, 37, 10,133, 66,161,252,239, 69,176,230, 62,124,248,208,142,
+ 16,130,144,144,144, 57,  0,172, 54, 88,207, 87, 56, 66,161, 96, 78,207,158, 61, 39,202,100,178, 63, 85,204, 70,163, 81, 32, 16,
+ 48,110, 28,247,244,207,117,169,104,202,207, 97, 50, 25,  5, 98,177, 20, 66,161, 96,102,139, 22, 45,250,230,229,229, 29,147,201,
+100, 95,167,164,164,228,191, 72,228,102,243,230,205, 17,206,206,206,255,102, 32,138,138,138,  4,125,251,246, 97,234,162, 55,145,
+ 97,100, 70,153,172,173,132, 97, 60, 57,150,117,  4,  0,145, 72, 84, 18,228,238,222,229,179,185,115, 21,207,116, 81, 86, 86,134,
+ 55,222,120, 67,249,232,209,163,177,  0,150,214, 18,185,106,212, 60,162,213,140, 29,219,183, 53, 46, 45, 46, 49,172, 95,245,243,
+109,189, 72,162,107,208, 36, 84,178,248,171,149, 78,159,125, 50,243, 61, 47, 47,175,152,170,150, 13,121, 46,175,  2,  0,191,127,
+248,225,135, 97,  3,  6, 12,144,106, 52, 26,185, 94,175,175,191,109,219,182,207, 90,181,106,101,219,162, 69, 11,233,206,157, 59,
+ 25,181, 90, 13, 66,136, 50, 52, 52,148,188,246,218,107,134, 93,187,118, 77,  7,240, 93, 93,204, 50,207,243,194,170,202,161, 53,
+230,154,  1,146,194, 58,141,  4, 24,  4,197, 95,222, 35, 15,139, 28,105,  0,193, 35,  6, 72,122,246, 34,240,  5, 80,105, 94,167,
+ 63,115, 63, 43, 43,235,133,214, 14,236,223,127,  0, 67,  8,249,221,203,203,235, 76, 97, 97,161, 29,195, 96,116, 29,162, 83,140,
+171,171,235,123,  0, 62, 37,132,124,120,238,220,185,246,  0,208,173, 91, 55,  9,128, 43, 14, 14, 14, 61, 76, 70, 35, 67, 31, 73,
+ 20, 10,133,242, 15, 52, 88,132, 16, 25,  0, 92,186,116,  9,132, 16,249,139,  4,  5, 42,255, 50,107,214, 44, 56, 59, 59, 63,111,
+ 90,112,246,236,153,106,143,169,235, 57,190,250,234, 43,199,252,252,252,209,191,254,250,235, 16, 15, 15,143,119,115,115,115,143,
+215,146,199, 60,134, 97,190,126, 22,113, 96,228,114, 69,201,164, 73,147,174, 62,251, 95,227,195,135, 15,219, 13, 28, 56, 80,195,
+ 48,204,125,  0,144,203, 21, 93,132, 66,129, 19, 33,132, 16,130,175,107, 50,130, 35, 25, 38, 64, 42,149,118,159,242,253,247,108,
+203,129,  3, 69, 54,174,174, 12,  0,164, 61,120,224,242,221, 15, 63,116, 86,101,100,200, 68,118,118,101,121, 37, 37,166,135, 15,
+ 31, 66, 46,151, 51,  2,129,160, 99,109, 25, 86, 42,149,239,207,154, 61,199,166,180, 88,165, 55,148,106, 76, 66,214, 98,180, 83,
+ 40,185,188,220,252, 34, 91,133,141,110,242,187,239, 75, 23,124, 58,251,253, 74, 81,147,234,152, 62,115,230,204,198,109,218,180,
+241,222,189,123, 55,163, 86,171, 33, 18,137,108, 91,180,104,129, 86,173, 90,113,103,207,158,101, 26, 52,104,128,240,240,112, 92,
+190,124, 25, 87,175, 94,101, 34, 34, 34,148,251,247,239, 31, 87,149,193,170,202, 84,143, 25, 51,102,162, 84, 42,229,187,116,233,
+130,183,222,122, 11,132, 16, 68, 68, 68,116, 28, 55,110, 92,142, 94,175,183,202, 92,151, 55,  3,186,133, 15,185,  7,160, 41,  8,
+ 30,229,199, 29,104, 86,105,151,198,137,137,137,237, 74, 74, 74, 42, 58, 27,150, 47, 44,222,185,115,231,186,148,247, 60,134, 97,
+190, 30, 56,112,192, 28,128, 65, 84, 84, 84,217,244,233,211, 73, 98, 98, 98,175, 33, 67,  6, 55, 72, 74,122, 84,109, 58,159, 47,
+ 71, 83,167, 78,211,138,197,226, 55,188,188,188, 18, 24,134, 17,139,197,226,242,107, 36,170, 95,191,190,123,211,166, 77,231,122,
+122,122,234,132,  2,129,146,160,246,178, 68,161, 80, 40,148, 87,200, 96, 49, 12,147,125,247,238,221,250, 58,157, 14, 12,195,100,
+ 91, 81, 65,157,174, 92,225,136, 68,162, 95,132, 66,193, 20,  0,104,221,186,141,118,249,242,229, 85, 53, 43,241,173, 91,183,209,
+ 10,133,  2,155,167,149,151,240,103,150,101,243,170,210,172,166, 66,252, 70, 42,149,125,  4,128,241,241,241, 45, 59,120,240, 32,
+ 63,124,248,112,124,243,205, 55,178, 57,115,230,252, 88,191,126,253,110,169,169,169,105,213,165,243,217,239,115,221,221,221,195,
+ 55,111,222, 28, 49,105,210,164,171, 89, 89, 89,195,158, 69, 70,246,  3,104,199, 48,204,253,202,127,219,191,127,127,135,  9, 19,
+ 38,220,201,203,203,155, 91,157,230,112,134,  9,244, 15, 13,237,254,197,197,139, 68, 96, 52, 50,133,151, 46,149, 22, 23, 20,152,
+ 31, 23, 22,218,108,143,141, 29,253,241,162, 69, 18, 15,111,111, 92, 57,121,210, 46, 87,165,210,168,116, 58, 83, 74, 74, 10,207,
+113,220, 25, 43,242, 30,230,234,226,162,252,121,229,218,155,118, 98, 33,239,230,227,205,136,235,213, 19,  9,148,246, 82,161, 72,
+ 96,108, 80, 63, 64, 10, 32,172,182,239, 72, 34,145,140,235,213,171,151,114,215,174, 93, 76,120,120, 56, 28, 29, 29,113,233,210,
+ 37,196,196,196,160,164,164, 68, 96,177, 88,208,186,117,107, 44, 95,190, 28,126,126,126, 80,169, 84, 72, 79, 79,119,145, 74,165,
+174, 53, 92, 79,166, 82,249,193, 39,159,124,  2, 87, 87, 87, 88, 44, 22, 20, 23, 23,131,227, 56,216,216,216,  0,  0,114,115,115,
+113,240,224,129, 90,203,146,149,230,  8,237,219,183,175, 48,194,149, 35, 88,117,209,244,246,246,190, 84, 80, 80, 56,178,123,247,
+238, 40, 46, 46,102, 23, 46, 92,136,230,205,155,163, 81,163, 70,214,148,249,185, 50,153,236, 55,127,127,255, 77, 83,167, 78,173,
+239,228,228,  4,163,209,184,162,168,168,  8, 31,127,252, 49,  0,160, 77,155, 54,173,  9, 33, 49,147, 38, 77, 66,253,250,245, 53,
+185,185,185,133,247,238,221, 27,162, 82,169,238,189,104,222,173,188, 62, 84,147,106, 82, 77,170,249, 95,165,249,143, 54, 88,  0,
+242,188,189,189,235, 43, 20, 10,  0,168,243,219, 53,203,178, 83,221,220,220,  4,159,125,246,217,192,134, 13, 27,242,211,167, 79,
+191,146,146,146,242,167,142, 51, 13, 26, 52,216,243,195, 15, 63,116, 76, 78, 78,214,125,249,229,151,135,243,243,243,167,213,241,
+ 75,255,132, 97,152, 85,  0,144,145,145, 81,116,224,192,129,200,139, 23, 47,126,181,106,213, 42,159,233,211,167,203,166, 79,159,
+254,  9,128, 90, 53, 69, 34,145,177,170,102,193,170,112,118,118,230,171,234,163, 85,206, 64,134, 81,216, 75,165,221,190,184,120,
+145,152, 82, 83,117,187,126,252, 81,177,238,230,205,249, 22, 66, 60,221,221,221,133, 93, 58,117, 50,218, 73,165,154,188,236,108,
+222,201,199,135, 73,126,252,216,214, 34, 20,154,143, 31, 63, 94, 86, 80, 80,176,205,138, 36,148,242,132,152,108,125,252, 44, 35,
+134,244, 12,191,121, 61,230,129,157,155,139, 32,162, 69,120,179,  7, 15, 83,111,131,231,204,  0, 74,107, 19,113,112,112,104, 84,
+ 84, 84,132,210,210, 82,184,186,186, 98,245,234,213,240,240,240,128, 78,167, 67,124,124, 60,241,241,241, 97, 46, 94,188,  8, 31,
+ 31, 31, 20, 20, 20,192,100, 50, 65,163,209,228, 27,141, 70,125,117,134, 87, 36, 18,253, 38, 16, 48,147, 24,134, 65, 72, 72,168,
+118,213,170, 85, 60, 33,  4,141, 27, 55,198,176, 97,195,176,111,223, 62,196,199,199,151, 71,154,248,192,192, 32,173, 64,192,216,
+  0,224,255, 74, 20,135,231,121, 84, 54,194,117,197,203,203, 75,  1,224,227,224,224,224, 81,175,191,254, 58, 43,145, 72,160,213,
+106,161,215,235, 17, 23, 23,199,246,239, 63,160,108,224,192,  1,182,127,252,241, 71,141,233, 52, 26,141,143,253,253,253,135,207,
+152, 49,227,228,207, 63,255,236, 60,111,222, 60,240, 60, 95,177,177, 44, 91,177, 40,247,129,  3,  7,240,232,209,163,185,149,205,
+ 21,133, 66,161, 80,254, 25,  6,235, 47, 35, 22,139,191,248,227,143, 63,122, 45, 93,186, 84,220,163, 71,143,142, 94, 94, 94, 29,
+178,179,179,175, 62,171,212, 58,244,235,215,175,163,155,155, 27,214,172, 89, 99, 18,139,197, 95,188,160,179,174, 92,217,157,243,
+240,240,152,190,127,255,254, 67, 83,166, 76,129,167,167,103,219,255,239, 60,219,203,100, 17,147, 86,175,102,197, 22,139, 96,231,
+207, 63,203,150,158, 57,179,122,215,238,221,226, 54,173, 91,131,  0, 72,136,143,151,125,253,253,247,178,145,  3,  6,228,199, 63,
+122,132,227,167, 79,155, 84,197,197,217,  5,165,165,179,243,242,242, 10,172, 48,174,209,201, 41,201, 94,145, 93,218,123, 95,184,
+ 17, 23, 51, 98, 72,191,238, 98,145,128,121,148,154,121,203,211,195,197,225,234,229,203,122,150,101,163,107,211,209,106,181, 41,
+ 44,203,214, 35,132,184,158, 63,127, 30,174,174,174, 40, 41, 41,129,197, 98,129,201,100, 50,233,116, 58,121, 81, 81, 17, 12,  6,
+  3,140, 70, 35,236,237,237, 17, 27, 27,155,199,178,236,217, 26,210,246, 22,195, 48, 11,  9, 33, 72, 72, 72,200,  2,  0, 95, 95,
+223, 38,142,142,142,167,202, 23, 80,190,120,241, 98,175,204,204,204,248, 74,145,174, 26, 59,185, 91, 27,193,122, 81, 60, 61, 61,
+ 91,202,229,242,175,231,204,249,196,171,121,243,230, 40, 40, 40,  4,207,243,176,181,181,133, 94,175,135,157,157, 29, 58,118,236,
+152,187,112,225,194,100, 66,208,151, 16,146, 91,147, 94, 90, 90, 90,174,159,159,223,232, 41, 83,166,124, 31, 28, 28,220,136, 16,
+130,224,224, 96,244,234,213, 11,199,142, 29,195,195,135, 15, 81, 86, 86,198,222,184,113, 99,125,118,118,246, 46,250, 88,162, 80,
+ 40, 20,106,176,234, 76, 86, 86, 86,150,183,183,247,150, 59,119,238, 76,122,237,181,215,112,238,220,185,121,  0,250,  2,128, 92,
+ 46,159,247,218,107,175,225,206,157, 59,184,127,255,254,150,172,172,172,172,151,113, 78,169, 84,170, 53,153, 76,120,118, 14,101,
+ 29, 43,234,198,207,154,  6, 65,  8,105, 92,221,223,106, 66, 32, 18,121, 54,237,211, 71, 84, 18, 19, 83,186,234,242,229,197, 59,
+118,238, 20,183,109,211,  6,102,139,  5, 60,199,193,215,207, 15,221,163,162,100, 91,118,239,182, 97,181,218, 43,159,127,240,193,
+177,181,111,188, 81,118,173,172,236,145, 53,105,212,106,181,223,125,254,233, 39, 81,187,118,239,243,110, 18, 26, 88,239,248,201,
+115,119,156,157, 29,148,141,130,130,108, 84, 42, 53,183,114,197, 82, 81, 89, 89,217,247,181,233,232,245,250,223, 79,159, 62, 61,
+196,215,215,215, 53, 46, 46, 14, 38,147,  9, 28,199,161, 71,143, 30,229,253,239,120,145, 72,132,  7, 15, 30,192,108, 54,231, 39,
+ 37, 37,101, 63,122,244, 72,  6, 96, 89, 45,215,240,249,239,113, 82,255,254,253, 97,177, 88,208,171, 87, 47, 28, 56,112,224, 77,
+  0, 51,106,216,255,133, 12, 86,229,239,  9, 86,118,110,247,242,242,234, 25, 20, 20,180,102,249,242,229,  2, 31, 31, 31,240, 60,
+ 15, 39, 39, 39,232,116, 58, 20, 22, 22,161, 73,147, 38,240,245,245,197,178,101,203,  0, 96,103,109,230,170,156,244,244,244,251,
+  0,186,  5,  6,  6, 74, 13,  6, 67,199,168,168,168,173, 61,122,244,192,157, 59,119,112,245,234,213,238, 12,195,228, 26, 12,  6,
+139,183,183,247, 44,  0,142,132,144, 95,172, 25, 61, 74,161, 80, 40,148,255,113,131, 21, 24, 24,104, 39, 22,139,186, 78,155, 54,
+213,150,227,120,136,197,162,110,245,235,215,119, 72, 77, 77, 85,191, 64,229,183,102,219,182,109,175,175, 92,185, 82,214,191,127,
+255,102,158,158,158,189,  0, 96,228,200,145,205,236,237,237,177,109,219, 54, 35, 33,100,205,203,202, 36,203,178, 67, 90,181,106,
+133,226,226, 98,164,166,166, 94,173,203,177,135, 15, 31,182,  3,208,174,182,191,213,120,126,147,201,201,209,219, 91,144,117,238,
+156,185,184,180,212,171,220, 92,  9,  4,  2, 20, 23, 23, 35, 45, 53, 21,246,118,118, 72, 72, 76,148,173,125,255,253, 93,254,225,
+225, 98,206,100,114,182, 86,191,160,160, 64,235,225,225, 49,113,254,231,159,253,254,253, 15, 63,184,170, 74, 75, 31, 43, 20, 74,
+163, 76, 38,241,152, 63,127, 30,167, 86,171, 39, 20, 22, 22,150, 89, 33,181,108,251,246,237,125,250,244,233,115,207,207,207,207,
+173,160,160,192, 67,173, 86,147,226,226, 98,  6, 79,251, 82, 49,  0,112,239,222, 61,164,166,166,178, 28,199, 93,  4,240,  5, 33,
+196,100,109, 90,189,188,188,156,219,183,111, 63,212,205,205,173,162, 41,178, 69,139, 22, 67,189,188,188,150,100,103,103, 23,189,
+204,194,125,234,212, 41, 59, 66, 72, 59, 66,  8,250,244,233, 99,237, 97,239, 12, 24, 48, 64,192, 48, 12,244,122, 61,100, 50, 25,
+108,108,108, 97,103,103,143, 70,141, 66,144,149,149,133, 94,189,122,113,143, 31, 63,222, 33,145, 72,190,171,107,154,244,122,253,
+152,142, 29, 59, 46,154, 54,109, 26,120,158,199,224,193,131,145,145,145,177, 41, 57, 57,121,131,143,143,207,180, 73,147, 38,185,
+ 59, 59, 59, 99,214,172, 89,202,202,166,147, 66,161, 80, 40,175,160,193,242,242,242,138,114,114,114, 90,225,232,232,110,123,226,
+196, 73, 17,  0,116,233,210,217,198, 98, 97,163,189,188,188,230,100,103,103, 31,174,203, 73,179,179,179,139,188,188,188,126,190,
+122,245,234,  7,195,134, 13,195,169, 83,167, 62,  5,128, 97,195,134,225,234,213,171, 72, 78, 78,254,249,101, 85,182,222,222,222,
+ 19,186,116,233,242,110,155, 54,109,112,228,200, 17,112, 28,119,180, 46,199, 87, 30, 49, 88,213, 40,194,242,191, 89, 37, 38, 20,
+130, 97, 24,112, 28,  7,194,243, 40, 44, 42,194,131,196, 68,148,148,148,128,227, 56,232,117, 58, 75,112,195,134, 90,181,201,100,
+207, 60,157,107,204,106,114,115,115,211,  2,  3,  3,211,117,  6,189,155,179, 83, 61,189, 82, 41,131, 70, 83, 38,137,189, 23, 83,
+150,153,153,249,216, 74,227,107, 98, 24,166,203,177, 99,199,230, 11,133,194,215,188,189,189, 49,114,228, 72,166, 71,143, 30,144,
+ 74,165, 48, 24, 12, 40, 41, 41,193,225,195,135,193,178,108, 67,  0,112,117,117,117,175, 95,191,254, 62,129, 64,144,151,156,156,
+ 60,169,182,115, 48, 12, 51,126,224,192,129, 98,147,201,132,197,139, 23, 99,193,130,  5,232,219,183,175,248,246,237,219,227,  1,
+172,124, 89,  5,155,231,121,244,236,217,179,114, 39,247,251,181, 29,211,181,107, 87,145, 80, 40, 12,  9, 12, 12, 68, 65, 65,  1,
+ 10, 10, 10,224,234,234, 10, 47, 47, 47,184,185,185, 97,229,202,149, 88,189,122,245, 13, 66,200,178,220,220,220,  7,117, 77,147,
+175,175,239,172, 55,222,120, 99,214,168, 81,163,160,209,104,112,245,234, 85,116,236,216, 17,203,151, 47,247,185,116,233,210,162,
+ 86,173, 90, 65, 34,145,224,252,249,243, 96, 89, 54,133, 62,158, 40, 20, 10,229, 21, 53, 88,222,222,222,245,120,158, 95, 50, 96,
+192,128,129, 67,135, 14,197,242,229,203, 42,121,  5, 17, 54,110,220,228,176,127,255,254,117,190,190,190, 67,133, 66,225,156,212,
+212, 84,171, 59, 36, 43, 20,138,181,219,183,111,159,216,190,125,123,187,168,168,168, 96,  0,144,201,100,252,246,237,219, 53, 10,
+133, 98,109, 93, 51,242,252,164,143,158,158,158,157,164, 82,233,244,129,  3,  7,118,154, 56,113, 34,226,227,227,177,117,235,214,
+187, 94, 94, 94,135,234,168,123,191,182, 81,132,181, 69,179,132, 82,105,145, 42, 55,215,209,214,207, 79,236,236,224,144,125,238,
+220, 57,255,182,109,219, 34, 45, 61, 29,170,146, 18,232,245,122,196,199,199, 19,137, 72,148, 44,114,114, 98,210,162,163, 25,161,
+ 84, 90,103,131,105, 35,103,130, 63,255,120,114,125,131,193, 16,166, 86,171, 89,177, 68, 34, 86, 72, 73,157,154,153,  8, 33, 70,
+ 63, 63,191,193, 28,199,185,152, 76, 38,139,187,187,187,248,244,233,211,144, 74,165, 96, 24,  6, 77,155, 54,133, 84, 42, 53,249,
+248,248,104,  0,192,217,217, 89,176,108,217, 50,241,135, 31,126, 24, 95,155,118,203,150, 45,197,254,254,254,147, 66, 66, 66,112,
+245,234, 85, 36, 36, 36, 36, 94,187,118, 45, 36, 34, 34,  2,222,222,222,147, 90,182,108,249,253,237,219,183, 45, 47,163, 96, 19,
+ 66,234,220,201,253,194,133, 11,196,203,203, 11,  2,129,  0,  2,129,  0, 60,207,163,160,160,  0, 13, 27, 54,196,218,181,107,177,
+122,245,234,159,114,114,114, 94, 40,178, 26, 24, 24, 40,109,222,188,249,187,163, 70,141,194,227,199,143,177,116,233,210,252,188,
+188,188,163, 39, 79,158, 28, 63,109,218, 52, 81,199,142, 29, 81, 84, 84,132,141, 27, 55, 90,238,220,185,243, 93, 78, 78,206, 90,
+250,120,162, 80, 40,148, 87,208, 96,249,250,250, 78,148,203,229,139, 70,141, 26, 37, 10,  9,  9, 65, 94, 94, 30, 52,154, 50,174,
+105,211,112, 14, 96,136,173,173, 13,163, 84, 42, 49,101,202, 20, 52,107,214,172,231, 39,159,124,210,195,203,203,235,171,236,236,
+236, 31,173, 57,241,227,199,143, 53, 94, 94, 94,223,205,156, 57,115,121,116,244, 85, 27,  0,136,137,137,209,102,103,103,127,153,
+157,157,173,169,163,  9, 42,159,156,146,177,177,177, 73, 10, 10, 10,178,244,239,223,223,121,232,208,161,112,113,113,193,157, 59,
+119,176,108,217,178, 59, 90,173,118, 76,106,106,170,229,255,251, 34,179, 70, 99,238,173,  3,  7,236,186,190,254,186,253,199, 67,
+134, 44,125,251,237,183,127, 92,176,112,161, 56, 48, 32,  0, 38,179, 25,  9,  9,  9,100,231,142, 29,230, 29,203,151,127, 11, 27,
+ 27,113,244,190,125, 82,147,201,148, 86,151,115,248,248,248,116,233,215,167, 75,200,138,149,223,193,160, 47,195,245,171,127,160,
+164,164,  0, 63,255,178, 63,196,199,199,167, 75,102,102,230,  5,171,211,203,178,  1,123,247,238,  5,  0, 72,165, 82,124,241,197,
+ 23,240,242,242,130,189,189, 61, 52, 26, 13, 38, 79,158, 44,253,240,195, 15,  1,  0,241,241,241,176,181,181,181, 54,202,214,111,
+242,228,201,142, 22,139,  5,199,142, 29, 51, 72, 36,146,215, 79,158, 60,121,181, 89,179,102,242,206,157, 59, 59,110,221,186,181,
+ 63,128,  3, 47,203, 96,189,192, 49,156,183,183,119,242,201,147, 39, 27,142, 28, 57, 18, 18,137,  4, 37, 37, 37,176,183,183,199,
+ 15, 63,252,192, 43,149,202,141,127, 33, 73, 82,165, 82, 41,227, 56, 14,187,119,239, 70, 94, 94,222,128,242,254,136,179,103,207,
+254, 50, 52, 52, 52,240,193,131,  7, 79, 12,  6,195,188,172,172,172, 71,244,209, 68,161, 80, 40,175,168,193,226,121,254,227, 19,
+ 39, 78,136, 56,142,195,250,245,235,113,243,230, 77,146,151,151,247,173,217,108,254, 74,169, 84,178,197,197,197,179,223,126,251,
+237,169, 11, 22, 44, 16, 68, 70, 70, 34, 58, 58, 90,208,176, 97,195,233,  0,126,172,100,124,162,106,154, 43,163,164,164,228,104,
+110,110,206,143, 60,255,180, 50, 20,  8, 24, 27,169, 84,118,180, 22, 51,245, 39,205, 42, 38,179,108,244,213, 87, 95,229, 59, 59,
+ 59,243,241,241,241, 88,187,118, 45,119,235,214,173,125, 60,207,127, 86, 88, 88,168,179, 70,243,101, 80, 89, 83,202,178,183,183,
+206,158,221,184,229,224,193,252,176,183,222, 50, 10, 68,162,119,150,174, 90,245,105,137, 74,229,  5,134, 33, 46, 78, 78,105, 27,
+150, 44, 89,220,161, 91, 55, 67,252,133, 11,242,152, 83,167,196,174, 22,203,221,186,164, 51, 51, 51,243, 66,112,160, 31, 54,173,
+ 95,  9,179,217,136,156,172,167,254,172,176, 72,141,154,204, 85, 85,154,  2,129, 64,245,198, 27,111, 40, 77, 38, 19, 51,122,244,
+104,113,126,126, 62,  2,  3,  3,  1,  0,165,165,165,248,227,143, 63, 16, 26, 26, 10,  0,136,141,141,173,248, 92, 91, 58, 21, 10,
+197,164,142, 29, 59, 34, 45, 45, 13,  9,  9,  9,123,179,179,179,243,188,188,188,246,166,165,165,141,111,221,186, 53,246,237,219,
+247,102,117,  6,171,174,223,145, 53,  6,171,154,188,191,181,127,255,254,143,162,163,163,251,204,154, 53,139,233,214,173, 27,  0,
+160,172,172,140,207,201,201,209,188,136,102,229, 52,177, 44, 11,  0,144,203,229, 26,  0,120,102,166, 70,190,168,230,203, 40,159,
+ 84,147,106, 82, 77,170,249,223,160,249,143, 49, 88,  0,204, 28,199,225,194,133, 11,216,191,127, 63,107, 48, 24,134,229,230,230,
+222,170,244,255, 47,125,124,124, 14, 13, 31, 62,252,104, 98, 98,162, 40, 33, 33,  1,  0,216,186,156,220,104, 52,154, 24,  6,  4,
+255,154,140,146, 24,141, 70,211,139,124,215,149,127,249,245,215, 95,145,147,147, 99, 76, 75, 75,219, 73,  8, 89,151,147,147,147,
+249, 23, 34, 33,127,121, 20,225, 70, 66,140,175, 51,204,233,  5,157, 58,245,156,127,234,148,236,181, 25, 51,204,195, 70,141,154,
+205,153, 76, 22,161, 68,194, 75,109,108,  4,156, 76, 38,142,191,112, 65,190,102,218,180,122,122,163,241,248,214, 58,116, 28,175,
+ 20,193,194, 27,111,205,128,190, 82,  4, 43,250,230, 67,212, 53,130, 37, 18,137,252, 44, 22,139,140,101,217, 44,158,231, 49,126,
+252,120,240, 60, 15,189, 94, 15,141, 70,131,226,226, 98,195,123,239,189, 39,  0,  0,165, 82,137, 94,189,122, 73,173,209, 13,  8,
+  8,104, 32, 22,139,113,252,248,113,136,197,226,205,  0, 32, 22,139, 55,159, 58,117,106,252,152, 49, 99,224,231,231,215,132, 97,
+ 24,166,182,197,163, 43, 22,123,102, 16,244,236,219, 15,114, 11, 31,114,175,210, 98,207,247, 35, 34, 34,  0, 43,250, 93, 61, 79,
+ 70, 70, 70, 14,128, 25, 62, 62, 62, 27, 63,250,232,163,143,219,182,109,219,106,225,194,133, 96, 24, 70,248, 87,111, 54,158,231,
+ 97,177, 88,254,210, 20, 18, 20, 10,133, 66,249,223, 55, 88, 43,187,117,235, 54,147, 16, 34, 98, 24,230,155,231,204, 85,121,212,
+ 36,222,219,219,251,243,134, 13, 27, 86, 44,  0, 93, 71,243,146,199, 48,204,114,129,128,249,248,233,239,117,159, 88,178,146,198,
+ 39, 79,205,129,120,215,173, 91,183, 62, 77, 75, 75,203, 34,132,176,127,245,  2,189,140, 81,132,  0,176,157,144,148,209, 12,115,
+ 98, 86,120,120, 84,159,105,211,208,172, 79, 31,123, 47,127,127, 78,111, 54,243,177,151, 47, 51, 87,247,238,149,196,156, 58, 37,
+214, 27,141,199,247, 19,146, 94,215,116,102,102,102, 94,  8, 12,240, 57, 57, 98, 88,191, 94,  1, 13,188,  0,  0, 79, 82,178, 81,
+ 88,172, 62, 89, 23,115,  5,  0,169,169,169, 70,  0, 70, 79, 79,207, 97,187,119,239,222,251,204,244, 84, 44, 59,  3,192, 40, 18,
+137,130,  1, 64,163,209,248,255,254,251,239,219, 69, 34, 81,173, 38,246,254,253,251, 27, 22, 44, 88, 48,229,201,147, 39, 59, 51,
+ 51, 51, 19,  1, 32, 45, 45, 45,209,219,219,251,235,156,156,156,169, 25, 25, 25,107,137, 21,238,227,185,197,158, 17,127,121,143,
+ 28, 64,211,242,197,158, 95,116,173,193,231,174,103, 28,128,177,222,222,222,221,122,247,238, 61, 29, 64,238, 95,209, 51, 26,141,
+ 22,163,209,104,225,121, 94,108, 54,155,137,209,104,180,208,199, 15,133, 66,161,252,  3, 13, 86, 86, 86,214,102, 88,177,152,179,
+181,251,213, 96,144,230, 50, 12,179,166,220, 44,253, 85, 13,179,217,252,178,214,111,187, 63,104,208,160, 58,237, 95,219, 14, 59,
+  9, 73,123,159, 97,182, 28,249,254,251, 22,199,215,173,243,230, 88,214,153,  1,136, 80, 42, 45, 50,153, 76,169,174, 22,203,221,
+186, 70,174, 42,243,248, 73,102,111,  0,  8, 14, 14, 38,143, 30, 61,  2, 33,228, 47, 45, 30,156,147,147,115,210,199,199,199, 77,
+ 36, 18, 73, 25,230, 79, 82,198,103, 38, 12,  0,238, 49, 12,211,  4, 64,173, 17,158,140,140,140, 85,  0, 86, 85, 81,134, 86,  3,
+ 88,109,109,186, 42, 22,123,  6,  4, 60,195,143,  8,235, 52,114, 47,  0,190,124,177,231,151, 73, 86, 86,214, 57,  0,231, 94,130,
+ 97, 51,212,175, 95,127,221,242,229,203,167,222,189,123,247,215,204,204, 76,  3,125,252, 80, 40, 20,202, 63,208, 96,253,127,242,
+ 50, 22,181,125,217, 11,227,190,140, 40, 72, 85,124,247,212, 64, 93,251, 59,175,103, 82, 82, 18,243,178,180,158, 25,  1, 67, 45,
+215,158,160,142,205,195,127,133,242,197,158, 43, 17,254,191,112,179,165,166,166,126,213,178,101,203, 21,153,153,153, 52,122, 69,
+161, 80, 40,175, 56,  2,122,  9, 40,148,255, 63, 94,214, 52, 20, 20, 10,133, 66,249,239,134,  1, 16, 85,213, 63,234, 50, 58,128,
+ 97,152,168,186,158,184, 54,125,170, 73, 53,169, 38,213,164,154, 84,147,106,190,122,154,181,105,191, 50,163, 19, 43,119, 94,126,
+217, 27,128, 40,170, 73, 53,169, 38,213,164,154, 84,147,106, 82,205,127,218, 70,155,  8, 41, 20, 10,133, 66,161, 80, 94, 50, 34,
+122,  9,170,166,133,167,112,177,159,143, 91,171,138, 40, 31,207,  3,  0,248,103,179,  8, 84, 76, 39,192,243, 32,132, 32, 59, 95,
+117,251, 94, 30,249,252, 69,207, 23,226,205,212,115,147,203, 87,243,132,116,122,246,167, 11,234, 34,227,140, 56, 53, 81, 89,171,
+209,216,131,105, 44, 23,224, 35,158,160, 25,  0,  8, 24,220, 51,240,248,230,126, 46,185,255, 87,175,  7,195, 48, 76,152, 43, 38,
+ 75, 21,202, 81, 14,142, 78, 65, 37, 37,133, 73,102,131,113, 79, 66,  1,126, 38, 47, 48,177, 83, 96, 61,166, 29, 79,240, 41,  0,
+129, 88,128,111, 31, 22,145,115,180,212, 81, 40,148,255, 39,254,234,188,118, 92, 85,143,201,191,168, 73, 39,200,251, 39, 27,172,
+ 48, 55,102, 26, 24, 44,  4, 64, 64,176, 40, 62,159,212,105,189,180, 48, 47, 38, 74, 46, 20,110,  0, 32, 52,152,185, 89,132,199,
+197, 42, 43,115,  1, 58,203, 37,194,111,  1,240,  6,142,155, 20,159,109,125,123,108,184, 15,211, 71,196, 11,182,242,132,136, 57,
+158,108,  6,193, 17, 91,  9,174, 68,103,146, 58, 13,139,247,243,113,107,117,224, 70, 78,175,115,107, 63, 64,219,102,129, 32, 28,
+ 11,240, 22, 40, 35, 63,194,153, 85,227,209,182,177, 31,  8,111,  1,120, 22,182,125, 87,160,111,184,195, 11,223, 28, 33,222, 76,
+ 61,127, 23,183,184,245,235, 55,120,120,  5, 52, 97,120,214,140,196, 27, 39,199,126,248,241,252,238,225, 14, 76,184, 53, 38,171,
+185, 23,243, 86, 96,195,144,143,102, 44, 92, 41,244,244,242,181,225, 45, 70, 54, 55,229,126,196,119, 95,207,223,215,220,139,249,
+246,110, 54,217, 96,173,145,106,226,138, 41, 34,153,116,164, 66,110, 19,164,211,105, 30,113,102,203,158,112, 47, 81,159,111, 86,
+172,110,209,181,103, 63, 91, 78,147, 43,176,240,104,178,123,215, 78,255,239,127,252,169, 31,195, 48,131,  8, 33,124, 93,242,204,
+ 19,124,252,112,203,228,126, 98,145,144,105,252,230,122, 33, 94,112, 42,132, 38,238,204, 24,134, 32,178,214, 39, 23,131, 75,  9,
+121,100,199,139,156,163,177, 59,243, 43, 67,208,  8, 12,246, 50,  4, 59,227,243, 73, 62,125,116, 80, 40,175, 22, 62, 62, 62,231,
+ 50, 51, 51,187,189, 76, 77, 47, 47,175,118,217,217,217,215,232,213,165,  6,203,138,218, 23, 95,198, 63,206,112,  2,103, 70, 88,
+163,128,197,  0,234,100,176,228, 66,225,230,155, 73,121, 30, 96,205, 88,191,228,157, 93, 38, 11,192, 90,204,224, 88, 11, 56,214,
+  2,150, 53,131,179, 88, 64, 44, 70,204,255,237, 28, 96,210,160, 85,120,240,102,  0,158,214,158, 67, 76,  4, 91,111, 95, 62, 89,
+143, 49,169,177, 99,237, 87,239,101, 20,148,189,119,250, 94,118, 97,152, 59, 51, 55, 33, 31, 27,235, 98,  4,206,173,251,  0,219,
+126,255, 35,115,205,175,218,  7, 60, 33,168,103,175,  8, 25, 59, 32,222,119,203,193,115, 25,171, 55, 27, 30,  0,128,131,141, 52,
+100,194,189, 36,191,191,242, 37,184,201,229,171,127,254,233,123, 15, 79,103,  5,195, 94, 93,  6,150,227,224,235,223, 95, 56,119,
+250, 88,207, 47, 87,109, 88,  5,224,141,154,142, 15,117,103,154, 52, 10,108, 60,107,243, 31, 87,253,180,165,249,166,147,219, 63,
+125, 12, 35, 44, 30,222,141,197,139,191, 90, 41,156,247,201,  7, 51, 67,221,153,235, 15,242, 72, 66, 45,230, 74,208,216, 13,  7,
+191, 90,182,162, 89,247,190,  3,108,249,178,  2,161, 65, 91,214,104,253,111, 27, 22,134, 54,107,163,140, 12,247,145,228,239,153,
+202,232, 53,197, 48, 11,228,178,238, 97, 81,246,250,113,163, 45,235, 55,109,155, 14,224,187, 58,189,254,145,127,149, 61,158,127,
+241,183, 73,134, 32, 50,230,218,185, 41, 92,246, 77, 16,206,  2,112,230,138,159,224, 44, 32,252,211,159,109,167,254,  6,  0, 47,
+100,176,  4,  4,189, 78, 95,190,233,153,151,155,211,122,213,138,165,115,155,184, 49,199,192, 97,235,253, 98, 92,168,171,177,164,
+ 80, 40,255,189,120,121,121,177,217,217,217, 47,181,101,199,219,219,187, 95, 86, 86,214,209,191,152,174,143,  0,188,245,236,215,
+ 13,217,217,217,223,252,213,116,181,110,221,218,135, 16,226,241,236,217,159,123,243,230,205, 76, 90,  2,254,147,  6, 11,144,131,
+240,192,222, 33,  0,160,168,235,201,  8, 32,  7, 35,  4, 44, 90, 12,238,219, 19, 46,110, 30,128, 69,  7,152,117,128, 69, 15, 88,
+180,128, 69,143,194,156, 52,192,172,  5,158, 28,  3, 75,136,172,206,185, 50,170,129,135,123,208, 35,194, 15,174, 14,114,124, 48,
+184,137,203, 47,199, 31,110,216,112, 50, 49, 10,192, 40,171,210, 74,  8,218, 54, 13,194,154, 13,218,  7,135,110,231,247,  6,128,
+254, 45, 92,142,183,109,226,239,187,122,179,225,193, 31,247,138,251,  0, 64,223,112,135, 99,109, 66, 60,253,248,191, 16,221,229,
+  9,137,244,170, 31,196,112, 49, 63,131, 47,205, 68,105,169, 30,153, 41, 91,224,228,221, 82,192,241,232, 82,219,241, 10, 33,230,
+188, 63,111,185, 88, 87,154,103,226,205,  5,156,171,176, 68, 40,146,242, 12,178, 46, 24,203,120, 21, 55, 99,242,120,118,214,231,
+ 75,230,  0, 24, 91, 99, 52,200, 13,211,191,253,118,117,211,142,173, 66,221,114,247,125,192,148,149,228,129, 21, 42,101,131,219,
+119,132, 99,112, 19, 62,239,252,183,140, 52, 32, 10,142,206,  1,200,186,186, 29,169,215,246, 51,157, 34,134,201, 54,238,144,140,
+171,206, 96,  5,187, 50,157,122,119,110,179, 43,192,207,203,147, 16, 30, 60, 79, 64,120, 14,111,142,232,133,185,187,159,128,227,
+ 56, 12,239,221,169,199,242, 41,221,  9,207,243, 32,132, 71, 70,110,145,238,236,245,  7, 61, 30, 23,147,235,214, 68,166,154,183,
+235,214,233,222,237,107,161,150,135,135,209,106,236, 87, 15, 24,224,114,165, 50,215,233,206,137,141,161,192,111, 47,102,224, 24,
+134,105,236,  6, 46,245,248, 50,248,117,158, 44,252,121,199,113, 87,117, 65,214,132,125, 91,126, 26,177,246,231,159,183,  1,152,
+ 74, 31, 35, 20,202,171, 65,118,118,246, 75, 55, 89, 87,175, 94,205,254, 43, 38,171,117,235,214,157,  1,124,157,157,157, 93,110,
+182,190,110,219,182,237,252,202,117, 85, 37,212,132,144,177, 55,111,222,188, 88,147,230,204,153, 51,189,  0, 52,184,117,235, 86,
+249, 57, 26,180,110,221,186, 65, 85,251, 42,149, 74,174,121,243,230,169, 43, 87,174,204,166, 37,228,239, 53, 88, 15,210,247,124,
+ 16, 97,204, 41,  3,128,  7, 86,152,148, 63, 53,237, 25, 44,220,178, 77, 11,199, 47, 11,171, 95, 15, 26,173,  9, 39,111,165,130,
+227, 44,224, 88,246, 89, 36,139,  5,199, 90,208,187,185, 11, 58, 24,166,226,187, 35,137, 96, 57,254,171,154, 52,159,199, 76,248,
+ 49, 45,162, 94,219,205,243, 68, 42, 19, 11,212,141,124,157,221,102, 13,111, 46,248, 96,112, 24,244,102,246,181, 38,238,204,217,
+132, 60,178,222, 42, 77,254,223,231,206, 36, 85,253,141, 99,107,205,123, 13,209,167,182,163,  7,244,180, 39, 70, 53, 44,133, 79,
+160,209, 89,240,164,200,130, 92,131, 10, 50, 38,199, 42, 77,158,160,153,143,183,167,242,202,174, 79, 82,156,133,165, 34, 55, 33,
+ 43,145, 10, 88,112, 60, 17, 18, 85,130,177, 94,104, 79,113,121,191,172,154,210,169, 80,218,141,239,220,171,191, 67,250,246,201,
+140,162, 81,111,184, 69,248, 34,229,226, 38,228,223, 58,130,162,236, 84,198,222,160,130,187,115, 32,250,142, 29,133,111, 70,181,
+134,166, 84,  3, 97,206, 99,  7,169, 88,230, 88,157, 38,225, 48,246,219,229, 75, 60, 69, 66,193,211,235, 89,190,113, 22,232,141,
+ 70,128, 99, 33, 23,241, 96, 72,249,255, 44,224, 44,102,101,179, 97,159,188,  3,224,122,109,121, 79,200, 35, 59,194,220,152, 72,
+240,150, 80, 98,209,131,  1, 46,199,231,147, 10,211,211,196,157, 25,211,178,247,196, 72,194,224,210,139,124, 71,225,206, 24,208,
+170,129,173,141, 77,233,  3,100,238,125, 15,143, 33, 39,238, 29,223,194,152, 55,167, 43,127,249,229,151,129, 12,195, 76,171,220,
+  7,237,239, 24, 94, 76, 53,169,230,255,170,166,131,131, 67,195,250,245,235,207,183, 88, 44,157, 37, 18,137,187,217,108,  6,207,
+243,185, 82,169,244, 82,106,106,234, 23,106,181, 58,249,191, 45,239,199,142, 29,179,218,100, 89,163, 41, 22,139,113,230,204,153,
+ 71,214,154,172, 42, 22,160,223,186,119,239, 94,236,222,189, 27,  0,112,238,220, 57,  4,  7,  7,219, 84,117,108, 70, 70,134,205,
+240,225,195,183,  2,240,173, 73, 51, 41, 41,169,225,146, 37, 75,176,119,239, 94,  0,192,150, 45, 91,208,168, 81,163, 42,211,115,
+247,238, 93,225,103,159,125,214, 16, 64,246,223,253, 29,253,211, 13,214, 19, 63, 39,105,  4, 12, 28,  0, 60,169,235,201, 18,114,
+201,242,230,158,226, 62,103,246,254,216, 89, 46, 17, 96,193,250, 89, 25,  5,197,154,118, 34,  6, 60,  0,176,  4,  2, 39, 91,105,
+244, 87, 19,154,251,149,148, 25,112,232, 70,214,197,248, 60, 82,167, 80,104,124, 54, 57,  5,192,241, 95, 21, 36,211,104,194, 55,
+167,118,238,156,211,167,217,140,193,205,112,240,106,234, 12,  0,235,107, 45,228, 60, 15,194,179, 21,157,218,159, 58, 25, 30,224,
+217, 63,189, 49,240, 32, 79,255,198,215, 45,130,213,149, 97, 68, 37,110,232, 91, 79, 41,253, 97,202,148,183,237, 45,  5, 73, 40,
+ 54, 73,144, 81, 98, 64,174, 94,140, 50,145, 27,178, 30,196,114,  2,  6,167,106,143,178,160,148,176,  6, 71, 39,169,173, 32,188,
+231, 59,222,165,199, 63, 45,145, 50,172,208,126,232,151,142,133,103, 86,166,178,218,  2, 45,195,160,214,  9, 46, 29, 28, 28,131,
+ 13, 69,169, 66,117, 73, 33, 28, 61,194,208,231,181,  1, 88,212,191,  9, 52,165, 90, 20, 20, 71,147, 32, 79,123, 38,237,210, 54,
+204,235,219, 24, 69,121, 57, 48, 90,  0, 70,107, 44, 54,152, 12,101,213, 94, 71,  1,126,254,112,246,199, 99,252, 61, 93,109,202,
+  7, 11, 16,158, 67,243,198,  1,232,217,185, 45, 78, 93,190,130,155,177, 15,193, 63, 27, 44, 64,120, 30,153,249, 37,121,  6, 51,
+183,169, 78, 23,148, 99, 65, 44,134, 42, 13, 24, 94,160,105,176,169, 59,163,228,128,207,219,  5,217, 77,154, 51,192,223,206, 70,
+198,192, 96,225, 96, 48, 89,160,185,242,  3,156,235, 55,133, 82, 46,103, 34,160, 23,  1,160,147,135, 82, 40,149, 24, 57,114,164,
+ 60, 47, 47,239,124,255,254,253,155,244,236,217, 83, 25, 25, 25,  9,173, 86,139,147, 39, 79, 66,171,213,250,251,250,250,250,159,
+ 60,121,114, 88,187,118,237, 18,124,124,124,186,238,217,179,167, 46,125,100, 69,248, 87, 39,117, 30,  0,251,108, 41, 47, 33,158,
+118, 52,231,  9, 33,220,139,166, 93, 42,149, 34, 58, 58,250,165, 71,178,110,220,184,241,232, 69, 34, 89, 90,173, 86,226,233,233,
+  9,103,103,103,112, 28,  7,173, 86,139,  3,  7, 14, 64,173, 86,131,231,121, 40, 20, 10,124,249,237,122, 60,184,115, 30,215,175,
+ 95,135, 90,173,150,212,166, 89, 88, 88,200,132,132,132,192,104, 52,130,101, 89, 24, 12,  6,156, 62,125,186,226,119,145, 72,132,
+143, 23,175,194,195, 91,231, 17, 19, 19,131,194,194, 66,134,150,234,191,223, 96,253,101, 56,142,157,251,203,230,157,209,115,167,
+142,194,244,209, 81,190, 95,252,184, 63, 42,161,128,108,  6,128, 38,174,204,132,113,221,130,252, 28,149, 98, 44,218,126, 11, 32,
+100,238, 95, 61, 95, 92, 17,121, 24,230,193,204,248,253,250,255,177,119,222, 97, 81, 29,109, 27,191,231,108,103,119,233,125,  1,
+ 65, 80, 17, 81, 81,192,174, 17, 21,187,198,104, 52, 70,141, 45,177, 27, 53, 26, 75,140, 70, 99,236, 38,182, 24,141,154,166,177,
+183, 24,123,199,  6, 54, 84, 80, 80, 20,145,186,244, 94,182,239,153,239, 15,202,171,134,178,160,249,222,188,230,252,174,107, 47,
+216,118,239,156, 57,101,238,243,204,204, 51,  9, 33,243,135,250,195,203,217,162, 81,131,  6, 68, 20, 27,107,194,154,127,172,  1,
+214,114,113,227,190, 45,237, 78,131,101, 97,101, 46,246,129,209,  0, 43,185,184,113,239,102,150,167,  0,192, 74, 42,244,169, 44,
+210, 85,101,184,183,158,112,188, 84,204, 31, 47, 11,112,174, 55,186,127,119,179, 62,253,  7,153,201,  5,  6,100,223, 60,139,  2,
+129, 43,244, 54,238,208,232,115,144, 28, 23,107,188,112, 35, 58, 37,171, 80, 51,171,198, 98, 82, 92, 73,137,123,108,239,233,215,
+221, 58,235,248,151, 25,158, 99,118,215,103,192, 50,133,187,  6,166,203, 28, 90,155,221,122, 22, 87,196,210,191, 70,112, 94,165,
+ 32, 63, 63, 94,111,132,179,202,200, 55,143,189,244, 43,230,245,110,142,220,156, 12,168,117,  6,228,171, 12, 58, 39, 43,137, 88,
+ 19,247,  0, 26,157,  1, 90, 61, 11,129,149, 11,206,134, 69,102,177,122,253,169,170, 52, 99,179,232, 61,  0,242, 23, 95,107, 96,
+ 79, 90,204,181, 48,187,  7,189, 10,  9,201, 74,236, 56, 17,230, 95,246,185,186,223,157,178,134,210,110,230, 23, 34, 87,132,162,
+ 83, 93,  6,183, 55,113, 36,173,205, 36,194,239, 87,127, 54,220,183,157,183,141,152, 77, 14,  3, 97,117,144, 25,249, 80,137,140,
+176,116,243,  2,171, 45,164, 37,106,117,222,195,255,199, 37,130, 56, 56,254, 23,240,241,241,113,178,180,180,124,248,249,231,159,
+219, 12, 28, 56, 16, 71,142, 28, 65, 65, 65,  1,126,251,237, 55,172, 95,191, 30,139, 23, 47,134, 94,175,199,182,109,219,164,135,
+ 14, 29,106,189,121,243,230,100,119,119,247,166,  9,  9,  9, 53, 45,168, 78,  0,136,  1,  8,202,218, 46,  2,128, 61,121,242, 36,
+250,244,233,131,147, 39, 79,178,101,175, 25,  9, 33,122, 74,169,166,174,  6, 75, 36, 18,225,209,163, 71,111,196,100,  9,  4,  2,
+200,229,114,136, 68, 34, 60,126,252,184,214, 38,203, 96, 48,240,146,147,147,145,159,159,143,238,253,251, 99,221,138, 21,232,210,
+165, 11,186,119,239, 14, 74, 41,206,159, 63,143,224, 14,205, 48,244,221, 32, 68, 71, 71, 67,175,215,155, 84,222,180,180, 52,164,
+167,167,163, 87,255,254,216,190,121, 51,218,180,105,131,198,141, 27,195, 96, 48, 32, 36, 36,  4,131,123,118,128,228,189, 96,196,
+196,196,112,  7,245,255,138,193,122,144, 65,111,248,218,147,227, 31,246,108,221,175,127, 71, 95,108,223,119, 97,153,175, 47,217,
+ 11,  0,182,230,226,165, 35,187,120, 33, 42, 49, 23, 23,238, 41,143, 71,101,210, 55, 50,251,130, 53,194,206,214, 66, 10,240, 68,
+ 80,233, 88,131,197, 51,212, 56, 48,153,165, 20,210,119,230,226,163,254, 81,110,109,124,221,220,202,103, 17,202,251,172,197,168,
+200,167,245, 90, 53,118,170,  7,163, 30, 48,234, 97, 49,116, 55,240,141,172,198,114,116,244, 20,159,155, 59,235,179,246,189,223,
+251,192, 76, 36,181,132,177, 32,  9,250,180, 72,100, 63,185,130, 98,105, 35,164, 37, 60,195,254, 51, 55,243,159, 36,103, 23, 48,
+ 12,206,166,231,107,102,199,230,208,162,154,116,213,122,172,248,234,203, 89,125,247,239,221,103, 46,246,234, 72, 98, 55,245,201,
+ 23,241, 13, 98,251,250,  1, 76,137,196,142, 46,255,109,159, 69,177, 22, 43,107,210, 41, 41, 46, 56,124,254,236,233,161, 13, 61,
+ 59,154, 63,191,125,  2, 42,181,  6, 26, 61,208,180,117, 16,140, 70, 42, 34, 12, 97, 45,120, 60,146,145,157, 11,162, 55,166, 95,
+189,255, 60,245,218,253,103, 60,141,121,205,218, 47, 29,116,132, 55,173,127, 80, 75, 64,175,194,187,239, 52,199,186, 93, 23, 62,
+  5, 48,230,245,118,114,105,  4,139,  2, 29,155, 58,144, 31,  1,116,188,243,199,122,159,192,247,102,160, 54, 17,172,102,246,164,
+119,179,  6,138, 95,215, 45,157,107, 99,235,218,136, 71, 88, 61,168,147, 31, 80,144, 76, 73,114, 24, 44, 93,218,192,168,232,128,
+109, 27,191, 45, 98, 89,186,183, 46, 41, 42, 56, 56,222,102,212,106,245,225, 85,171, 86,217,244,235,215, 15,  0, 80, 84, 84,132,
+176,176, 48,252,244,211, 79,144,201, 94,190, 78,246,233,211,  7,148, 82,155, 69,139, 22, 29,  6,208,174, 42,205, 14, 29, 58,244,
+223,184,113,163,178,101,203,150,207,202, 76,150, 16,  0,243,224,193,  3, 38, 41, 41,137, 88, 91, 91, 83,133, 66,161, 87, 42,149,
+ 44,  0,227,216,177, 99,121,114,185,188, 97, 81, 81,209,229,186, 26, 44,145, 72,244, 70,198,100,  9,  4,  2, 16, 66, 32, 18,137,
+ 32, 20, 10,145,146,146, 82, 43,147,101, 48, 24,248, 39, 79,158,196,157, 59,119,176,184,101, 75,124,230,226,  2, 27, 27, 27,132,
+132,132,128, 82, 10,153, 76,134,156,156, 28,236,221,187, 23, 93,187,118,133,193, 96, 16,154,162,123,240,224, 65,132,135,135,227,
+155,192, 64,124,102,105,  9,185, 92,142,243,231, 75,123,253,196, 98, 49, 18, 18, 18,112,254,252,121,  4,  5,  5,113,  7,245,223,
+109,176,130,  8,225, 19, 71, 56,233,180, 42, 80,  3,  5,  8, 20,190,190, 68, 24, 21, 69,117,181,253, 81,134,193,151, 27,119, 28,
+239,187,118, 70,127, 50,126,128,191, 98,201,175,151, 38,  1,192,199,239,123,187, 72,197,124,108, 56, 26, 69, 25,  6, 95,190,137,
+ 13,244,245, 37, 66,134,193,164,238,109, 26, 67,153,167, 69,172, 50,239, 98, 20,165, 38,117,233, 92, 88,251, 17,118,254, 25,146,
+180,126,167,250, 17,165, 20, 86,114,113,227, 81, 17,177,245,126, 61, 25,158,248,221,126,245, 35,202, 82, 88, 73,  5, 62, 99,162,
+ 59,212, 56,139,176, 85, 61,225,248, 47,230,206,238, 48, 96,204,231, 18,195,163,  3,208,198,158,  1,171, 83,161, 64, 39, 68, 30,
+207,  9,201,137,137, 88,190,237,120, 82, 65,177,118,232,131,140,218, 25,203,152, 44, 90,228,107, 79,  6, 46,255,122,254,185, 21,
+ 75, 23,201, 85,207, 66,138,120,196,160,226,121,116,230, 47, 93,188,150, 20,106,180, 31,196,230,208,194,154,116, 52,230, 88,185,
+234,187,141,125,199,141, 24,244,200,187, 81,103, 91,163, 50,206, 86, 93, 80,144,177,251,116,184, 83,217,157, 33,  1,128,216,228,
+108,100,230, 23, 27,140,  6,253,101,115,  1,150, 60, 52, 37, 26, 88,134,151, 35,177, 31,216,201,111,184,189,185, 16,170,162, 60,
+ 56,152, 11,208,179, 77,131,225, 94,142,100,238,179,116,154, 89,119,131,165,  7,213,171,112, 99,101, 87, 31,106,212,251,192,168,
+135, 46,226,247,218, 71,194,  8, 62,155,250,142,220,194, 90,251,156, 65,177, 12, 48,179,  3,177,112,  7, 44,235, 19, 65,147, 15,
+160,124,246,208,240,233,240, 17,217,113,241,201, 63,219,153, 97, 13,119,  9,225,224,120,153,132,132,132,145, 95,124,241,197,181,
+ 54,109,218, 56,218,217,217,161,121,243,230,248,243,207, 63,241,249,231,159, 87,124,166,101,203,150,160,148, 34, 39, 39,  7,171,
+ 86,173, 74, 83, 42,149, 35,171,211,124,248,240,225,163,157, 59,119,190,227,235,235,171, 19, 10,133,121,  0,196,121,121,121,146,
+156,156, 28,162, 86,171,193,178, 44,107,105,105,105, 84, 42,149,250,161, 67,135,106, 66, 67, 67, 27, 20, 23, 23, 39,188, 78,  4,
+171, 85,171, 86, 15,242,242,242,242, 25,134,121,237, 20, 14,229,230,170, 89,179,102,246,197,197,197, 44,128,220,186,164,112, 48,
+ 24, 12,  8, 12, 12,196,153, 43,119,113,242, 66, 40, 10,148,143, 49,105,220, 72, 52,111,222, 28,103,206,156,169,243, 62,107,209,
+162,  5, 78,159,191,134,107,119,238, 35, 33, 38,  2,159, 78, 26,135,166, 77,155,226,244,233,211,220,  1,253,119, 27,172, 38,246,
+164,133,162,161,232,247, 69,189, 27, 52, 17,116, 95,  4, 34, 48,195,129, 70,167, 59,124,185,124,211,163,230,142,100, 68,100,122,
+205,179,189, 94,138, 98,165,211,135, 77, 29,200,158,251,209, 62,195,223,109,227,134,237,127, 74, 23,  2,192,  7,157, 60,113,235,
+ 73, 38,110,198,100,236,121,152, 65, 31,190,238,198, 53,119, 36, 82, 80,236, 89, 53,109, 64,144,187,171, 19,126, 58,114, 13,132,
+224,176, 73, 13, 45,165,180,141,175, 59,214,239,124,117,198,160, 83,189,239,246,171, 31,157,121, 80,208, 27,  0,122, 52,145,157,
+106,213,192,186, 94, 77,145, 12, 51, 17,127, 66,239, 65, 31, 73, 12, 49,127,  2,241,231, 65, 12, 26,168,116, 44, 82,179, 10, 81,
+ 98,233,134,144,176,251,170,124,181,118,198,195,140,186, 69,237,162, 50,233,179,150,206, 36,177,168, 88,229, 44,181,111,160,230,
+ 49, 44, 91,164,161,184, 21, 21, 95,240, 48,149, 62, 54, 69, 35, 54,150,106,219,185,146, 78, 63,238,216,255,149, 64, 40,250,128,
+ 71, 64, 28,172,100,246, 63,174,253,  6,230,230,114,176,218, 34,160, 56, 19,  3,167, 44,207,140, 76,209,121,  2,128,183, 29,145,
+191,227, 37,220,193,103, 72,242,197,167,218,  5, 53,253,  6,209, 99,226,136,158, 45,  5,172,182, 24,211, 86,237,195,214,185,  3,
+240, 81,183, 38,130, 19,215, 99, 38,  2, 88, 82,215,125, 77,141,  6, 80,189, 10,237,230, 95,121, 68,128,107, 20,232,120,103,255,
+ 82, 31,224,174,201, 26,  1,132,  8,248,206,164,137, 95, 61,153,144, 77,190, 14, 54,249, 58,229,185,117,  0,169,247, 14, 33, 78,
+129,244,251,213,139,139,183,111,255,233, 44,203,224,235,154, 82, 94,112,112,252, 91,161,148, 62,179,178,178,234,213,167, 79,159,
+ 11,103,206,156,177,105,214,172, 25,  0,160,124,198, 90, 96, 96, 32,188,189,189,145,158,158,142, 15, 63,252, 48, 43, 53, 53,181,
+ 23,165,180,218, 49,189,133,133,133,113,  7, 15, 30,116, 44, 46, 46,110,185, 96,193,130, 12,119,119,247,  2,181, 90, 77,242,242,
+242, 88,131,193,  0,107,107,107, 81,203,150, 45,209,190,125,251,162,176,176, 48,143,164,164,164, 66,  0,241,117, 41,255, 39,159,
+124,130,195,135, 75,155,137, 55,145, 23, 75, 40, 20, 34, 56, 56,216, 37, 52, 52, 52,  5,  0,234,146, 23,235,197,230,229,254,253,
+251,184,124, 55, 25,124,173, 10,162, 76, 37,110, 28, 57,136,254, 19, 38,195, 96,168,251,104,133,251,247,239,227,143,243, 55, 32,
+ 19,243,241,248,241, 67, 28, 60,120, 16,147, 38, 77,122, 45, 77,142, 26, 12, 86,131,  6, 68, 36, 46,194,162,158,129, 46,115, 62,
+232,216,128,167, 47, 80,130, 53,178,224,  9,  0,  7, 59, 11,252,254,251, 30,207, 61,251,246,133,181,112, 17,108,100, 13,134, 47,
+ 35,211,105, 73, 45,126,123,209,218,125,215, 62,248,125, 86, 16,127, 82,111, 31, 27,  0, 16,242, 25,108,248,243,161,  1,192,162,
+215,217,168,118,174, 68, 82,164,199,120, 39, 91,203,133, 95,124,210,215, 38, 40,208, 27,151,111, 62,192,198,131, 97, 87, 68, 25,
+216,105,242, 65,205,234, 95,157,  2, 91,233, 44, 66,176, 53,143,167, 52, 26,169,147, 80,102, 13, 93,252, 37, 64,167,134, 90,163,
+ 67, 82,182, 17, 73, 57,106,240,165, 66,220,137, 73, 86,217,166,225,120, 93,183,153, 16, 66, 58,122, 73, 20, 95, 45,251,206, 85,
+173, 42, 50, 20,228,102, 25,132,162, 27,  2,169,153, 56,181, 54, 58, 97,201, 84,221,217, 83, 24,  0,176, 60,145,132,150,204,159,
+ 57, 90,150, 18,117,  6, 13, 25, 37,  8,165, 48,107,210, 23,230,102, 60, 97,167,250,194, 68,  0,168,239,100, 41, 90,245,245,231,
+150, 51,230,126, 93,227, 24, 47, 95, 66,132,205, 91, 57,205,104,230,110,141, 43,225,143,112, 37, 50,225,225,149, 59,143,155,118,
+105,174,128,183,171,213,116, 95, 66, 86, 70,209,218, 71, 68, 75,119,140,  1,208,171, 43,102, 17,250, 58,146, 97,173, 62, 88, 80,
+233,236,193,170,168, 15,176, 49, 70, 10,194,227,  1,132, 41,157,209,152,116, 29,124, 43, 47,186,103,255, 31, 37, 63,253,180,243,
+155,168, 76,202, 69,173, 56, 56,106, 32, 47, 47, 47, 66, 42,149,246,244,243,243,251,109,218,180,105,230, 35, 70,140, 80,140, 27,
+ 55,142,  1,128,244,244,116,118,253,250,245,202,239,191,255, 62, 63, 43, 43,107,140, 78,167,139, 52,229,134,151, 16, 18,250,243,
+207, 63,103, 94,189,122,181,105,235,214,173,197,  1,  1,  1,172,181,181, 53, 95, 44, 22, 27,181, 90,173, 58, 38, 38,198,248,236,
+217, 51,231,188,188,188,167,  0, 98,235,210,125,175, 80, 40,192, 48,204, 18, 87, 87,215,175,148, 74,101,179, 55, 49,  6,171, 97,
+195,134, 10,  0, 79, 93, 92, 92, 26,214,182,123,240, 47, 13, 54,159,143,220,220, 92,148,164, 61,132, 36,249,  9,252,100, 12,124,
+173,229,176,176,176,120, 45, 51,148,159,159, 15, 20,167,224,218,181,251,128,193,  0, 75, 75, 75, 88, 90, 90,114,  6,235,239, 50,
+ 88, 77, 29,200, 36,107, 17,214, 79,232,219, 64, 88,191,158, 43, 52,201,119,112, 63,169,  8, 95,182,109, 29,197, 19,155,171, 39,
+140, 28, 16, 56,104,176,  7,130,218,183, 34,245,157, 45,167,175, 92,187,101, 74, 83, 71,242,249,195,116,186,193,148, 31,126,152,
+ 65,227,154, 56,144,159, 46, 69, 36, 79,116,149,170,192,178, 20,151, 34, 83, 17, 25,159,251, 83,116,  6,141,171,205, 70, 52, 85,
+144, 96, 62,152,125,148, 82,137,165, 76, 86,216,178,133,143, 93,112,187, 22, 76,175,206,129, 16,242,128,107,183,238,227,179,181,
+135,111,176, 44,237, 27,110, 98,247, 96,233,140,193,151,141, 83,233,140, 65,253, 75, 51,  6, 41,165,180,116, 22, 97,245,195,186,
+120, 60,146, 86,146,112,219, 73, 96,219,  8,170,216, 75,136,207,101,145,144, 81,136,  2,190, 19, 52, 41, 41,  0,101, 19, 67, 40,
+173,243,209,108,103,103,231,224,233,235,221, 96,211,142,131,208,149,228, 35, 46,228, 55, 20,229,166, 98,233,143,127, 54,112,117,
+117,237,156,156,156,124,185, 22,102,205,251,194,241, 61, 14,160,  0, 79, 32,198,137,205,251,145,101,107,  6, 59,169, 16,172, 42,
+ 19, 19,102,140,176,236,221,125,132, 37,  0, 36, 60,190,  7,119,169,202, 36, 93,157, 45,  6,125,208,165,177, 21,244, 42,236, 56,
+125, 79,205,  0,189,118,158,125, 24,219,197,199, 74,242, 65, 71,119,235, 37,202,188,247, 81,199,100,160,229, 17,172,138,136, 94,
+ 29,102, 15, 30,160,212,216,196,158,196,238, 11,205,144, 13,238, 30, 32, 21,242,  9,161, 69, 41,160,102,118,216,178,227, 64,145,
+ 72,143,109,220, 37,131,131,195, 52, 74, 74, 74,194,  9, 33,205,103,207,158, 61,108,254,252,249,239,200,100, 50, 79,  0, 40, 46,
+ 46,142,211,235,245, 87,  0,236,169,205,108,191, 50,195,244,148, 16, 18, 23, 27, 27,235,184,107,215, 46, 43,  0,146,178,183,213,
+  0,242,  0,164,191,206, 12,194,114, 51,165, 80, 40,190,122, 83,245, 80,110,166, 92, 92, 92, 26,214,229,251, 60, 30,207, 72,  8,
+  1, 33,  4, 98,177, 24, 87,175, 94,197,144,190,221, 17,125, 34, 15,205,172,228,104, 61,102,  2,246,157, 59,  7, 30,143,  7, 66,
+  8,120, 60, 94,173,218, 17, 62,159,143,107,215,174,225,163, 15,  7, 67,204,  7, 44, 45, 45, 49,123,246,108, 28, 61,122, 20,124,
+ 62,183,154,222,223, 19,193, 34, 88,114,238,183,229, 66, 24,245, 56,246,219,183, 56,254,160, 72,251, 56, 19, 95, 54,206,196,250,
+131, 40,100, 51,215,238,156,120,238,218,131, 53, 99,135,246,147,118,237,210, 29, 93,131,186,240,155,182,234,188, 16,192,134, 23,
+ 26,234,224,234,114,101, 24, 89,124,179,237,244,163,  9,251, 66, 98,  8,116,133, 24,218,163, 21, 53,178,248,166,134,198,255, 47,
+154,150,102,242,125,215,194,194,172,161, 43, 66,252,189,139, 18, 15,207,  6,128, 81,135,167, 79,159,224,251, 29, 71,216,144, 91,
+143,127,215, 26, 48, 45, 54,135, 22,155,170, 89,234,168, 12,176,148,137, 26,247,110,102,121,138,  5,133,149, 84,232, 67, 89, 35,
+172,164,  2,159, 30, 77,100,167, 40,165,212,220, 76,224, 67,141,250, 26, 53, 85, 90,195,214, 29,191,252,244,221,199, 31,127, 44,
+203, 74, 78,131,178,224,  1,138, 68, 46,208, 75,221, 16,123,239,138,170, 68, 99,168,177,241,174,174, 62,179,178,178, 50,194,111,
+230, 96,223,143, 43,160,215,106,144,145, 92,234, 81,149, 89,  5,176,176,115,  9,171,141,166,206,192,230, 15, 26, 49, 94,104,102,
+ 14,179,143,  6,245, 19,197,102,107,224,175, 48, 47,189,200, 21,101, 34,250,252, 53,  4, 21,151,250,181,103, 73, 12,220, 91, 40,
+ 76, 42,167,185, 68, 56,173,119,128, 11,226, 18, 83,113,245, 97,202,142,103,217, 84,233,101, 75,118,196, 42,243, 38, 14,104, 91,
+ 15,235,142, 70,125, 90,149, 41,170, 74,211,215,145, 12,  3,208,177,116,144,187, 10, 20,232,232,235, 72,134,153, 50,115,176, 50,
+ 77,190, 16,195,191, 59,149,176,224,192,237,172,  1,115,134,119,178,104,223,190,143,  8,  6, 45, 10, 85, 26,125, 84, 46, 45,120,
+157,125,244, 26,209, 73, 78,147,211,252,159,212, 44, 51, 59,191,151, 61,222,164,166, 18,175,228,101,122,221,109,127,177, 59, 80,
+169, 84,242,203,162, 87,213, 14,114,175, 73,243,197,238,192,148,148,148,147,101,209,171,106,163, 88,149,104, 42,219,180,105, 99,
+211,191,127,127, 24,141, 70, 60,121,242,  4,  9, 73, 73,  8,158,248, 41,172,172,172,112, 37, 34,  2,143, 31, 63,198, 87, 95,125,
+  5,150,101,113,227,198,141,228,154, 52,  5,  2,129,174, 69,139, 22,194,247,222,123, 15,  6,131,  1,207,158, 61, 67, 74, 74, 10,
+ 62,251,236, 51, 88, 90, 90, 34, 60, 60,188, 66, 83,163,209, 32, 46, 46, 78,247,255,113, 44,253,123, 12, 22, 96,132, 81,143,252,
+115,139,176,225, 42,116, 58, 61,124, 30,102,208,231, 47,188,191,197,207,150, 28,139,120,240, 40, 46,252,122, 87, 17, 50, 34, 75,
+191, 83, 11, 98,178,104,106, 43, 55,126, 33,116,133, 22,120,118, 10,207,211, 11,139, 98,178,104,106,109, 55,130,178, 70,  2, 93,
+  9,144,122,  7,161, 87, 46, 35,228,198,125,220,142,124,100, 12, 13,143,217,199,176,248, 38, 42,139, 62,169,181, 38,165,144,247,
+ 93,135,209,145, 79,235,181,242,118,172,  7,163,  1,148,213,195,114,232, 30,140,137,106, 95,175,149,151, 85,189,210,200,149, 30,
+214,159, 92,  4,190,147, 84,171,119, 59, 81,183,173,163,167,248,253,194,188,236,182,221, 58,183,147, 89, 54,233,141,172,167, 49,
+120,114,255,154, 42,252, 65,108,232,237, 68,221,107, 69, 71, 92, 92, 92,222,233,214,185, 49,134, 78,248,  2,186,146,124, 60, 11,
+249,  5, 69, 57,105,184, 26, 38,199,163,130,130,118,  0, 76,142, 96,133, 38,232,155,  2, 64,199,250,194, 68,115,104,156, 70,246,
+235, 15, 49, 81,131,213, 20,128,148,100, 33, 54, 69,155,255,254,143, 73, 70,  0,144,138,  9, 95, 70,243, 45, 76,209,245,117,183,
+109, 36,229,233,177,243,220, 67,176,108,233, 50, 75, 44,139, 45, 59, 47,198, 78,252,230, 35,127,248,214,179,110, 65,  8, 33,181,
+  9,237, 19,138, 78,183,247,125,237,163,190,176, 16, 96,117,184, 54,221,198,167,211,134,156, 78,117,141,132, 69,166,208, 20,  0,
+ 19,155, 40,200,214,233, 27, 78, 47, 12, 60, 23,213,113,214, 39,  3, 44, 64,185,133,209, 57, 56, 56,254, 43,145,192,  9,115,231,
+206,221,202,227,241,236,  1, 16, 74, 41, 52, 26, 13,255,199, 31,127, 20, 24, 12,  6,134,199,227, 25, 37, 18,137, 33, 60, 60, 92,
+207,178,108,166, 78,167,155, 80,147,166, 86,171,141,221,180,105, 83,  3,189, 94, 95, 49,227, 80,163,209,224,151, 95,126,129, 70,
+163,129, 88, 44,134, 92, 46,199,179,103,207, 64,  8,209, 25,141,198, 88,110, 79,188, 73,131, 69,241,117,135,143, 22, 45,  2, 64,
+ 64,177,248, 21,115,  5,  0,136,200,166,202,166, 14,228,179,166,173, 58, 47, 42,255, 78,109, 11,160, 54, 26,  7,183,106,238,189,
+ 23,  0, 52,212,248, 81, 93, 54,162, 64,163,250,160,101,171,118,251, 88, 74,249,  6, 74,127, 98, 88, 28, 82, 27, 16,109,202,204,
+185, 42,239, 60, 50,242,194,203, 23,112,102, 65,255,211, 45, 88,150,142,129, 82, 74, 43,186,  5,191,149, 32, 43, 95, 83, 99, 30,
+167,107,113,154,238,173,234,  9,199,159,189,126,111,130,209, 72,157,120, 60,146,166,210, 26,182,190,174,185, 42,187,251,186,236,
+235, 64,206, 70,180,112,236, 97, 39, 45,139,106,149,  0, 89, 37, 56,155,156, 81,120,185, 46,154,185,197,250,  1,243,215, 31,253,
+ 83, 36,224,241, 65,105,105, 34, 80, 74,161,214, 25,115,202, 77,152,159, 45, 81,204,254,195,176,151,199, 35,  9, 53,233,221,124,
+156,186,110,232,202,243,159, 63,140,207,253,233,121, 46,125,  0,  0,207,115,233,131,134,182,100, 97,108, 90,225,231, 15, 18,114,
+191,173,237,184,  9, 74,112,181,213,208, 69,127,121,237,117,235, 51, 90, 73,239,  3, 24,216,212,129,116, 31, 58,235,251, 89,132,
+128, 91, 38,130,131,227, 95, 68,121, 20,139, 97,152, 37,111, 74,179, 60,138,  5,224,105, 45,190,115, 19, 64,243, 55,185,109,225,
+225,225,217,  0,178,185,189,252, 95, 50, 88, 15, 51,232, 22,152,176,152,179,169,159,171,242,251, 74,122, 30,128,237,235,108, 68,
+153,134,205,155,172,152,136,116,186,240,239,168,240, 50, 51,245,183,140,229,137,202,160, 61,  1,160, 81,163, 70,244,233,211,167,
+160,148,190, 86,246,221,232, 76,122, 31,175, 44,185, 80,153,201,  6,208,201, 20,189,152, 44,250, 13,240,215, 46,224,167,217,116,
+ 41,128,165,117,218,230, 58,102,106, 55,249,216,202,160,231,128,154,179,233,115,112,112,188,157, 38,235, 77,107,190,238,194,207,
+ 28,111,129,193,226,248,223,229,201,147, 39,220,178,  6, 28, 28, 28, 28, 85, 99,252, 27, 52,185,164,195, 28, 47,193,112, 85,192,
+193,193,193,193,193,193,193,241,102, 33,  0,130, 43,181,226,181,152, 29, 64,  8,  9,174,181,213,175, 65,159,211,228, 52, 57, 77,
+ 78,147,211,228, 52, 57,205,183, 79,179, 38,237,183,102,118, 34,125, 97,240,242,155,126,  0,  8,230, 52, 57, 77, 78,147,211,228,
+ 52, 57, 77, 78,147,211,252,183, 61,184, 46, 66, 14, 14, 14, 14, 14, 14, 14,142, 55, 12,103,176, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56,131,197,193,193,193,193,193,193,193,193, 25, 44, 14, 14, 14, 14, 14, 14, 14, 14,206, 96,113,112,112,112,112,112,112,112,112,
+212, 29, 82,203,149, 73, 56, 56, 56, 56, 56, 56, 56, 56, 56,106,128,139, 96,113,112,112,112,112,112,112,112,112,  6,139,131,131,
+131,131,131,131,131,131, 51, 88, 28, 28, 28, 28, 28, 28, 28, 28,156,193,226,224,224,224,224,224,224,224,224,224, 12, 22,  7,  7,
+  7,  7,  7,  7,  7,  7,103,176, 56, 56, 56, 56, 56, 56, 56, 56, 56,131,197,193,193,193,193,193,193,193,193,241,223, 55, 88,132,
+144, 96, 78,147,211,228, 52, 57, 77, 78,147,211,228, 52, 57, 77,206, 96,113,112,112,112,112,112,112,112,112,112,  6,139,131,131,
+131,131,131,131,131,131, 51, 88, 28, 28, 28, 28, 28, 28, 28, 28,156,193,226,224,224,224,224,224,224,224,224,224, 12, 22,  7,  7,
+  7,  7,  7,  7,  7,199,127,  9,  2,160,210,153,  0,148,210,243, 38,139,212, 97, 54, 65, 77,250,156, 38,167,201,105,114,154,156,
+ 38,167,201,105,190,125,154, 53,105,215,198,127,252,163,161,148,254,109, 15,  0,193,156, 38,167,201,105,114,154,156, 38,167,201,
+105,114,154,255,182,  7,215, 69,200, 97,106,148,210,145, 16,226,200,213,  4,  7,  7,  7,  7,  7, 71,205,240,223,164,152, 15, 33,
+109,214,188, 83,111, 81,159,203,  9,189, 76,104,176, 25,252,103, 12, 24, 91, 26, 76, 43,181,197,175, 97,  2,222,184, 38,  7, 64,
+  8, 89, 65,  8,230,148,253,191,154, 82,250,197,219,184,157,115,230,204, 25,236,239,223, 10,214,146,116,180,242,122,  2,228,238,
+  1,172, 63,192,130, 51, 93,208,202,191,  3,174,220, 77,194,149, 27, 15, 17,182,185, 63, 62,153,177,  8,106,181, 14, 89, 89, 74,
+220,191,118,250,224, 91,180,175,219, 10,  4,130, 15,172,173,173,205, 51, 50, 50, 46,  0,248, 19,192,187, 14, 14, 14,221,114,115,
+115, 11,245,122,253,126, 74,233,141,186,104,191,211,146,204, 21,  9,  5, 99,213, 58,253,170,107,247,232, 47, 65,  1,196,214,192,
+ 98,165, 68,200,239,164,209, 26, 86, 95,189, 79,127,170,101, 89,201, 43,209,248, 90,159,235,  7,  9,225,153,250,217, 63,172,173,
+189, 45,228,242, 11, 18, 30,239,121, 74, 73,201,136,193, 25, 25, 73,131, 41, 53,190, 77,231, 64,215,174, 93, 71,243,120,188,101,
+  0, 96, 52, 26,191,188,120,241,226,111,111, 66, 87,161, 80, 12,163,148,202,202,246, 91,177, 82,169,220, 99,234,119,  3,  2,  2,
+ 18,  0,212, 43,123,154, 24, 30, 30,238,110,202,123, 28,181,227,206,157, 59,212,221,221, 29,205,155, 55,127,156,150,150,246, 61,
+165,116, 11, 87, 43,255, 16,131,213,152,144,134, 19,251,180, 63,215,227,253,158, 50, 83,140,144,139,139,203, 74,123,123,251, 73,
+ 37, 37, 37,106,  0,148,199,227,209, 38, 77,154,128, 16,130,242,235,166,209,104,204,124,244,232, 81, 51, 83,205,213,155,210,244,
+246,246,190,195, 48,140,235,139,215,239,154,254,103, 89, 54, 57, 42, 42, 42,176,166,114, 58, 59, 59,247,100, 24,102, 94, 77,159,
+ 99, 89,118,101,106,106,234,153,234, 62,211,188,121,243,187, 50,153,204,145, 97, 24, 82,213,103, 94,108,115, 12,  6,  3, 45, 41,
+ 41, 73,127,248,240,161,127, 45, 26, 49, 71, 66, 48,135,101, 41,  3,  0, 12, 67,230, 90, 91, 91,239,206,205,205,141, 42,127,191,
+236,119,210,107,115,188,184,184,184,140,  2,240, 57,  0, 10,224,187,148,148,148, 29,181,249,126,163, 70,141,238,  8,133, 66, 87,
+ 30,143, 71, 94,221, 39,149, 61,103, 89,150,106,181,218,228,199,143, 31, 87,185,143, 66, 66, 46, 31, 88,189,122,245,221,109, 63,
+255,228,223,162,229, 96, 48,210, 46,208, 81, 11,220,141,215,160, 85, 11,  2,202,178, 80, 23,100,128,101, 89,148,168, 53,184,112,
+228,151,187,245,234, 55,240, 71,233, 88,198,183,193, 92,245, 26, 53,106,212,242, 85,171, 86,217,137, 68, 34,102,255,254,253,237,
+ 62,251,236,179,177,235,214,173,115,249,224,131, 15,204,181, 90, 45, 59,119,238,220,119,  8, 33, 95, 83, 74,143,214, 70,187,125,
+ 75,210,182,113,125,231,175,166,142,232,138,207, 87,236,157,218,177, 57,201, 50,147,  9,183,188,223,169,129, 85, 83, 79,107,124,
+189, 53,116, 26,128,159,106, 81, 86,226,230,230,214,210,209,209,177,190, 74,165, 50,  2, 64,211,166, 77, 41,143,247,178, 95,210,
+233,116,186, 71,143, 30,157,124,221,186,249, 92, 34,105,211, 73, 38, 61,247,197,196,113,102,185, 89, 89,142, 91, 15, 30,142, 56,
+232,224,224, 55, 24,136,127,155, 26,  4, 30,143,183,236,244,233,211,206,148, 82,244,236,217,115, 25,128, 55, 98,176, 40,165,178,
+212,212,212,242,107,160,172,150, 95,175, 23, 30, 30, 94,110,168,234,213,226, 61,147,105,215,174,157,196,160,211, 77,230, 49, 76,
+ 15, 10, 52, 71,233, 73, 29,105,  4,206,241,249,252, 31,194,194,194,212,111,187, 25, 56,119,238, 28,198,143, 31,143,200,200,200,
+198, 39, 79,158,220,172, 80, 40,166,164,166,166,118,161,148,102,114, 86,233,191,104,176,154, 18,226,208, 47,160,241,213,201, 31,
+ 13,150,178,  7,215, 19,140, 94, 80,173, 17,114,118,118, 94,213,169, 83,167,177,187,118,237,146,253,241,199, 31, 50, 15, 15, 15,
+  8,133, 66,240,120, 60,240,120, 60, 48, 12,  3, 62,159,143,119,223,125,215,164,134,235, 85,205, 11, 23, 46,200,188,189,189,255,
+210,200, 50, 12,131,222,189,123,215,168,201, 48,140,235,221,187,119, 29, 36, 18, 73,133, 73, 97, 89,246,165,199, 11,253,208, 48,
+ 24, 12,232,212,169,147, 73,117,197, 48,204,188,232,232,232,119,138,139,139,171,237,187, 45,211, 59, 83,131,150,226,250,213, 11,
+ 14, 68, 23,  7, 24,114, 64,121, 54,128,200, 19, 96,196,149,126, 62, 39, 39,  7, 93,186,116,225,189,206,190,238,219,183, 31,161,
+148, 30, 81, 40, 20, 23,178,178,178,204,  9,193,135,117,140,108,125, 17, 19, 19, 99, 78, 41, 69,227,198,141,231,  1,168,149,193,
+226,241,120,174,103,207,158,117, 16,139,197, 21,251,185,170,191, 70,163, 17, 58,157, 14,189,122,245, 50,212, 96,106,241,195,214,
+ 95,252,213, 26, 61,212,212,  3, 15,163,139,113,234,212, 17,212, 47,214, 35,246,129, 26, 44,171,128,186, 48,  3,148, 82,168,212,
+ 90,180,  8,122,223,159,101,223,158,  0,169,165,165,229,224,117,235,214,217,255,244,211, 79,  5,143, 31, 63,214,253,248,227,143,
+246, 19, 38, 76,240,209,233,116,152, 56,113, 98,102,227,198,141,133,235,214,173,179, 63,114,228, 72, 79,  0,181, 50, 88,124,130,
+111, 62, 28,208,  3,106, 61,  3,189,222, 96,239,108,111,254,251,244, 81, 65,  2, 74,181,216,121, 52, 28,122,  3,251, 75,109,205,
+ 85,239,222,189,221,183,108,217,194,143,142,142,230, 55,105,210,  4, 70,163,177,226,193,178, 44,140, 70,163,201,231,101,117,140,
+  5,188,157,172,173,207,181,233,211,215,204, 73, 38,133,248,249, 83,244,183,150,153,159, 76,205,218,  5,160,253,219,214, 40,240,
+120, 60, 36, 37, 37,193,210,210,210, 44, 40, 40, 40,149, 16,178,248,210,165, 75,219,254,142,223,122,157,200,214,155, 34, 32, 32,
+160, 53,159, 97, 14, 45,156, 63,213,201,175,101, 75,158,131,163, 61, 98,158, 36, 66,200, 99,131,159, 62,138,  9, 90,254,237,150,
+233,  1,  1,  1,239,135,135,135,223,122,219,246,181,251,160,159, 54,179,  6,221,164,210,103, 86,  0,182,161,176,176, 16,159,124,
+242,  9,142, 30, 61,218,164,109,219,182, 43, 75, 79,  1,142,255,138,193,242, 37, 68,214,194,195, 41,228,155,207, 39, 88,211, 83,
+191, 50, 37,217, 25, 16, 86, 99,132,156,156,156,150,118,234,212,233,163, 93,187,118, 89, 19, 66,112,110,234, 88, 88,235,212, 80,
+124,181, 26,214,118,246,208,206, 27, 15,115,163,  1,126,151, 34, 76,189,216,254, 69,243,241,227,199,200,205,205,133,157,157, 29,
+164, 82, 41, 36, 18,  9,132, 66, 33, 68, 34,145,169,154,144, 72, 36, 56,127,254, 60,248,124, 62,120, 60, 30,248,124,126,197,227,
+197,231, 60, 30, 15,142,142,166, 15, 77, 98, 89,118,165,143,143,143, 95, 76, 76,140, 69, 94, 94, 30,218,182,109, 91, 64,  8,137,
+120,225, 78,207, 47, 34, 34,194,194,228,198, 70, 23,135,162,196, 31, 65,115, 15,  1, 86,131, 96,180, 24, 10, 53, 60, 43, 26,152,
+ 23,255,178, 44, 91,151, 59,207,116, 66,200,234,254,253,251,205,  3,  8,130,131,131,139,166, 78,157, 74, 31, 63,126,220,227,189,
+247,  6,212,127,242,228,105,153,217, 35,115,  8, 33, 27, 76,141,100, 81, 74,197,  0,112,245,234, 85, 80, 74, 37,117, 57,246,196,
+ 98, 49,194,194,194, 42, 34,148, 12,195,128, 97, 24,240,120, 60, 28,123,106,135, 98, 45,131,146,244,  7,248,180, 95, 61,120,122,
+122,254,197,112,255,101,223, 80,138, 41, 19,198,222, 93,178,106,189,191,209,104,196,169, 83,167,176,118,237, 90,104, 52, 26,  4,
+117,235,129,231,180,  5,154,121,218,129,101, 89,168,212, 90, 68, 92, 62,116, 87, 81,207,211,255,109,185, 24,228,231,231,255,238,
+237,237,205,203,204,204,188,  8, 32, 78,175,215,111,250,253,247,223, 29, 62,254,248,227,140, 93,187,118, 77,  5,224,182,102,205,
+154,158, 69, 69, 69,251,106,163,219,169,  5,233, 19,216,178, 89,219,122,110,110,184, 28,122, 11, 66,145,192,106,242,232,126,144,
+203,249,248,246,167, 19,108, 66,114,206,212,171,247,233, 14, 19,207, 77,226,236,236,236,215,163, 71, 15,183, 45, 91,182,  8,  1,
+224,193,131,  7,200,200,200,128,173,173, 45, 36, 18,  9,  4,  2, 65,197, 13,219, 27, 49, 87,118,118, 55, 15, 30, 60,104,  6,189,
+ 30,155,190, 93,141,126,170,124,152, 17, 64, 11, 82,255,109,106, 12,  2,  2,  2,188,187,116,233, 34, 49, 26,141, 40, 46, 46,198,
+150, 45, 91, 44,205,204,204, 44,123,247,238,189,  8,128,201,  6,171,125,251,246,233, 90,173,214,  1,  0, 68, 34, 81, 70,104,104,
+168, 35,128,146,250,245,235,155,149,125, 68, 85,203,200, 86,226, 11,209,169,196, 90,188, 87, 35,129,129,129,173,154,120,215, 63,
+191, 98,197, 98,121, 94, 65, 26, 44, 45,211,193, 32, 15,219,182,253,  0, 51, 51, 11, 44, 90, 52,159, 31,216,166,141,203,244,207,
+230,159, 15,  8,  8,  8,126,219, 76, 22,107,208, 77,106, 17,248,159,123,132, 29,231, 54, 66, 99,233,143,148,197,139,177,126,253,
+122, 52,106,212,168, 53,103,147,254, 75,  6, 43,136, 16,190,171,141,252,216,230, 69,211,235, 51, 97,199,  5,170,196,167, 80,170,
+141,176,250,207,201,115,254,197, 11, 35,  0,198,209,209,113,242,158, 61,123, 44,202, 27,187,198,196,  8, 43,232, 80,191,105, 83,
+ 72, 45,173,144,102,208,129,234,117, 16, 10,  4,149, 54,136,166,104,150, 71,192,132, 66, 33,132, 66, 97,197,  5, 87, 40, 20,214,
+168,249, 82,229,240,249, 96, 24,  6,231,206,157,131,193, 96,192,224,193,131,255, 98,174,248,124,254, 75, 93,144, 53,105,166,166,
+166,158,113,113,113,137,160,148,190, 99, 52, 26, 65,  8,137, 72, 73, 73,233, 92,254,190,179,179,115,207, 22, 45, 90,204, 99, 89,
+118,165, 73,229, 52,100,131,230,236,129,121,187, 44, 20,132,217,129,200,130,193, 18, 15, 68, 62, 73,197,197,219,241,200,204, 45,
+ 70,128,183, 61,122,182,111,  0,163,209,104,242,182,191,136,139,139,203,213,204,204,172, 33, 93,187,118, 69, 78, 78,142, 97,241,
+226,197,104,209,162,  5,188,189,189,171, 50, 79, 53,106, 18, 66,148, 17, 17, 17, 30, 42,149, 10,132, 16,165,  9,134,236,124,101,
+ 70,248,247,223,127,135, 90,253,215,232,189,117,231,229,248,124,144, 59,198,124,186,  3,171, 31,239,199,230,205,155,241,234, 16,
+157, 87, 53, 89,150,197,146,149,235,253, 85, 26,109, 69, 93,105, 52, 26,132,133,133, 65, 83, 82,136, 75,187,198, 85, 68, 47, 85,
+106, 45, 92,253,186,251,215,164,249, 38,248,255,210,164,148,134,  0,  8,121,161,126, 23,236,218,181,107,  8,128,195,148,210, 80,
+  0,161,  0,246,214,186,156,  4, 99, 62, 24,244, 30,248, 66,115, 60,122,154,140,206,237,252,225,232,224,128,136,232, 88, 36,164,
+228,164, 19,130,209,189, 58,136, 87,170, 84,218,  5, 87,238,209,159,107,210,116,118,118,246,220,182,109,155,224,197,136, 11,143,
+199,123,233, 92, 47,127,173, 50,147,101,106,125,142,  5,188, 93,172,173,111, 30,253,242, 75, 89,218,175,191, 34,191, 99, 71,  8,
+ 90,183,197,246,115,167,145,153,171, 82,107,141,108,183,183, 97,191,151,155,171,160,160,160,208,165, 75,151, 90, 37, 37, 37,225,
+250,245,235,240,240,240, 64, 73, 73,  9,106, 26,218,246,170,166, 86,171,117,120,161,219,206,  1,  0,210,210,210,246,226, 63, 93,
+233,180, 54,229,172,110, 92, 85,109,198, 92,189, 90,206,  6, 13, 26,136,236,172,173, 15,172, 92,181, 68, 30, 21,125,  5, 45, 91,
+180,133,220,210, 23,172, 49, 13,217, 57, 69,200,125,170,196,210,165,171,177,104,241,151, 88,189,106,169,124,232,176, 49,135,218,
+181,107,215,240,197,238,194,255,245,253,206,240,133, 91,238,223,  9,157,  4,  0,  5,209,135, 49,125, 88,123, 20, 22, 62,197,196,
+137, 11,145,146,146,130, 39, 79,158,132,255,127,150,147, 51, 88, 47,152,155, 64,177, 96,247,222, 69, 83, 91,139,227, 35, 69,154,
+  7, 97, 80,106, 88,250, 91,146, 33,229,219,106,190, 87, 82, 82,162, 61,122,244, 40,206, 78, 25,139,134,196,  0,155,175,214,192,
+209,197,  5,121, 99,222, 69,161, 94,135,  6,167,110, 65, 44,151, 67, 36,147,215, 24,113,120, 81,243,210,165, 75,120,248,240, 33,
+248,124, 62,228,114, 57,228,114, 57,196, 98, 49, 68, 34, 81,133,185,170,202, 96, 85,113,240,128,199,227,225,193,131,  7, 72, 72,
+ 72,128,149,149, 21,174, 95,191,142,110,221,186,253, 37,138, 85,199,  3,190,210,136, 82,217,184,171, 51,166,106, 64, 96,  7,216,
+124,132,194, 27, 10,192,122,  4,244,176,130,209,104,196,189,167,217, 24,255, 81, 95,  0,192,228,  5, 63, 34,184, 77,253, 10,115,
+ 80,139,240,189, 25,128, 57,141, 26, 53, 26, 58,124,248,112,131, 80, 40, 68,113,113, 49, 84, 42, 21, 30, 60,120, 96,232,219,183,
+ 95, 81,255,254,253,228, 39, 78,156, 96, 41,197,234, 90,142,195, 74, 87, 40, 20, 30,101,221,176,233,117, 56,254, 64,  8,193,254,
+253,251, 43,125,127,244,218, 40,240, 75,135,103, 97,203,150, 45, 48, 26,141,160,148,146,154,234,243,171,121, 51,238, 78,159,187,
+196,159,101, 89,116,235,214, 13,179,102,205,194,179,103,207, 48,100,200,144,138,104, 32,165, 20, 42,141,  6, 41,145,231,239, 58,
+187,213,247,127, 91, 47, 14,148,210,147,  0, 78,190,190, 16, 92, 28,156,220,192, 80, 61,148, 25,217,120,175,111, 15,240,132,114,
+ 60, 79,202, 66, 11, 95, 47,231,225,239,118,112,230, 17,  3,230,172,220, 51, 25,192,207, 38,156,239,198,232,232,104,193,253,251,
+247,193,227,241, 96, 97, 97,  1,169, 84, 90,113,142,191,104,184, 94, 39,114,229, 98,109,125,243,207, 69,139,100, 13,175, 95, 71,
+195,131,  7,177,236,202, 21,168,122,247,198,190, 71, 79,212, 40, 41,  9,254, 86,173,142,249, 95,222,191,221,187,119,159,  0, 96,
+ 17,165, 52, 47, 40, 40,200,113,217,178,101,214, 41, 41, 41,136,138,138,194,254,253,251, 51, 13,  6,131,  1,  0,161,148,126,253,
+  6,142, 37,246,197,200, 86,251,246,237, 51, 66, 67, 67, 29,  9, 33,197,229,145, 43, 66, 72,113, 29,162,110,130,130,188,212, 79,
+173,101,116,  0,159, 49,175,111, 40, 40,122,158,107, 96,142, 90,216, 59,126, 31, 30, 30,174,175,238,187,150,150,150,159, 44, 91,
+ 50, 83, 97,103,199, 34,168,115, 87,164,166,235,176,124,230, 40,100,103, 23,226,231,237, 43,  0,136,160, 51,240,240, 78,208,251,
+112,112,112, 65,167,142,157,156, 46, 95,187, 58,  5,192,183,111,203, 57,158,112,248,147,201,132,144,111,234,213,171,119,249,199,
+ 21, 43, 26,118,235, 86,122,207,112,225,194,  5,252, 50,108, 24, 22,  3, 35, 55, 18,146, 58,237, 45,157,216,244,143, 53, 88,245,
+197,242,203,219, 62, 27,210,214,214, 88, 34,208, 94, 59,134, 20, 13,107,248,246,169,174,228,118, 30, 29,246,109,229, 39, 24, 37,
+132,176,132, 16,214,211,211, 19, 22,122, 53,172,168, 22,142, 10,  5,204,109,108,145,163, 47,141, 92,137,100, 50,136,100,114,147,
+ 46,142, 47,106,250,250,250, 34, 61, 61, 29, 34,145,  8,114,185, 28,230,230,230,127, 49, 87,166, 94,112,  9, 33, 96, 89, 22,124,
+ 62, 31, 17, 17, 17,232,216,177, 35,220,220,220,176,127,255,126,244,236,217,243, 47, 93,134,166,154,182, 87, 27,243, 23, 35, 74,
+229,131,223, 77, 25,220,254, 18,162,  6, 48,152,127,  0, 70,218, 13,122, 88, 66,205, 58,149,118,  7, 82,138,147,183,210,241, 56,
+ 33, 27,172,145,173,117, 23,161,179,179,115,128, 68, 34, 89, 61,111,222, 92, 69,139, 22, 45,144,153,153,  5,150,101, 33,151,203,
+161, 82,169, 96,110,110,142, 14, 29, 58,164, 45, 94,188, 56,142, 82,244,166,148,166,253, 55, 14,224,179,103,207,190,212, 61, 88,
+254, 40, 78, 77,198,152,105,187, 32,226,  3, 17, 17, 17,240,241,241,169, 57, 92,206, 82, 76,155,251,181,191, 90,163,133, 72, 36,
+ 66,251,246,237,209,182,109,219,138,113,113,229,  6, 85,167,211,193,104,100,225,228,219,213,159,188,133, 23,  5, 66, 72, 43,  0,
+ 31, 91, 90, 90,122,148,148,148,164,233,245,250,253,101,166,191,167, 64, 32,248, 64, 42,149, 58,229,231,231,199,  3,248,153, 82,
+122,187, 38, 61, 51,137,196, 86, 44,177,  0,107,208,128,207,231,195,205,173, 62,168, 81,139,220,  2, 21, 70, 15,237,143,187, 17,
+209, 56,125,233,134, 65,175,103, 55,154, 90, 70,111,111,111,100,103,103,131,199,227, 65, 42,149, 66, 38,147,161,113,227,198, 72,
+ 74, 74,170, 48, 87,117,237, 34, 44, 51, 87, 55,202,205, 21, 61,120, 16, 49, 50, 25, 60, 37, 18,124,249,235,175,197,185,  5,  5,
+109,126,  1, 98,222,130, 93,253,245,169, 83,167, 28,248,124,190,147,209,104, 68, 98, 98, 34, 30, 62,124,136, 13, 27, 54,164, 23,
+ 22, 22,  6,133,135,135,215,105, 27, 69, 34, 81, 70,121,228, 74, 36, 18,101, 84, 23,217,122,157, 49, 87,174,174,174, 94, 46, 14,
+226,115,191,109,152, 90,207,175,101,107,198,140, 39,207, 45,126,150,222,241,214,141, 27,237, 23,252,124,112,138,171,171,107,143,
+228,228,228,103, 85, 54,126, 12,211,187,133,127, 75, 62,104, 26,248,162,142, 88,189,106, 40, 50,179, 10,144,155, 83,  8,161, 80,
+  6,173,158,  7, 35, 75,208,190, 99, 39,252,186, 99, 31,154, 54,109,198,227,  1,221,223, 38,131, 85, 22,  1, 94,249,199, 31,127,
+ 52,148, 72, 36, 88,182,108, 25,204,205,205,113,227,155,111,240,139, 80,  8, 51,  0, 91,116,186,121,  0, 56,131,245,255,101,176,
+100,142,141,135,237,253,168,123,  7, 95, 79, 23, 70,191,127,  3,146, 75, 12,234, 69,143,117,234, 71,133,244,221, 40, 74,175, 87,
+231, 43,  8, 33, 84, 40, 20,194,113,238, 55,112,111,214, 28,197,227,  7, 33, 71,175,131,215,137, 27, 16,203,229,120,212,221, 31,
+ 84,171,197, 59,143, 50, 76, 53, 46,148, 16, 66,  1,192,222,222, 30, 66,161, 16, 18,137,  4, 98,177, 24, 98,177,184,194, 88,137,
+ 68, 34,136, 68, 34,147,205, 16,203,178, 40, 44, 44,196,243,231,207, 49,126,252,120, 72,165, 82,148,133,186,225,238,238, 14, 62,
+159,143,148,148, 20, 92,188,120, 17,158,158,158, 16,137, 68,181,106,107, 95,104,176,253, 92, 92, 92, 46, 19, 66,252,238,220,185,
+ 99, 17, 24, 24,  8, 83, 35, 88,165,173,161, 16, 26,184,131, 37,110, 47,141,181,210,235, 13, 47,109, 75,121,244,197,196,200, 85,
+247,134, 13, 27,110, 88,181,106, 21,227,234,234, 10,150,101, 97,109,109,141,146,146, 18,100,101,101,195,215,215, 23,110,110,110,
+ 88,181,106, 21,  0,236,253,111,153, 43,160,180, 59,184,220, 96,189,104,180,166,189, 91, 15, 57, 57,114,240,120, 76,133, 97,174,
+113,159, 83,138,141,171, 22,221, 29, 62,126,150,255,140,  5,171,161,214,232,160,210,104,161,214,104,161,214,232,202,254,106, 81,
+ 62,176, 61, 45,234,226, 91, 23,193, 34,132,244, 11, 14, 14,222,180,118,237, 90, 39, 39, 39, 39, 65,102,102,166,225,135, 31,126,
+232,249,195, 15, 63, 68, 77,153, 50,197,119,202,148, 41,214,246,246,246,252,180,180, 52,253,204,153, 51,123, 18, 66,230, 81, 74,
+247, 86,123,189,144,153,219,240,132, 50, 16,194,135,149,165, 53,248, 34, 25, 88,  3, 31, 70, 22,176,176,180, 71,232,221,131,184,
+ 30, 89, 56, 33, 35, 27,  7, 76,185,169,106,214,172, 25,229,241,120,176,181,181,125,169,107, 16,  0, 28, 29, 29, 81, 80, 80,  0,
+ 30,143, 87,241, 90, 93,204,213,177, 69,139,228, 13,202,205,149, 84,138,  8, 79, 79, 44, 75, 72,200,203, 42, 40,232,248,150,152,
+171,138, 27,135,184,184, 56,148,148,148, 32, 52, 52, 20,135, 14, 29,202,124,213, 92,  5,  7,  7,143,147,203,229,139, 85, 42,213,
+234, 51,103,206,108,168, 73,183,108,204,213, 27,163,178, 84, 12,  1,  1,  1,  2, 39, 91,222,153,179,135,215,185,155,179,247,  8,
+226, 63,  1,158, 20, 60,148,223,116,120,167, 91,171,190, 76,243,111,166,123,244,158,255,221,153,128,128,128,198, 85, 69,178, 40,
+165,254,102, 50, 57,128,116,132,223,  9,169, 48, 87,217, 57,249,208,232,120,208,104,  9,212, 58,  6, 93,131,123, 97,211,143,191,
+ 35, 37, 61, 27,229, 51, 12,223, 38, 26, 53,106, 20,224,226,226,130, 25, 51,102, 64,189,103, 15,138,  0,244,  3,240,135, 78,  7,
+  0, 48,  7,102,113, 86,233,255,201, 96, 89, 57, 53,238,188, 96,238,244,245, 29,223,239,197,164,143,107,135,188, 34,141,102, 78,
+148,129, 77, 46,169,209, 92,129, 82, 74,125,124,124,192, 48, 12,228,150, 86, 48,179,176,128,250,133,200,149, 88,110, 14,170,213,
+130,213,105, 33, 52,241,226, 88,174, 73, 41,133,153,153, 25,132, 66,225, 75, 93,131,229,198,170, 54, 17, 44,  0,200,203,203,195,
+129,  3,  7,208,186,117,107, 72,165, 82,240,249,124,248,249,249, 33, 58, 58, 26, 94, 94, 94, 32,132,224,143, 63,254,192,192,129,
+  3,241,236,217, 51,248,250,250,202,235, 98,176,206,157, 59,103, 65, 41,125,135, 82,138,172,172,172, 58,237, 68,150,101, 81, 84,
+ 84,132,179,103,207, 34, 53, 53, 21,142,142,142,200,205,147,194, 82,209,164,244,183, 94, 48, 89, 38, 50,185, 95,191,126, 12, 33,
+  4, 42,149, 10, 98,177, 24, 50,153, 28,230,230, 22,240,246,110,140,148,148, 20,244,232,209,195, 24, 27, 27,187, 71, 40, 20,110,
+172,109,121, 27, 52,104, 96,158,151,151,215,183,126,253,250, 66,  0, 48, 51, 51,235,231,225,225, 97, 25, 31, 31,159, 95, 75, 51,
+ 80, 97,172,  8, 33, 21, 51, 80, 25,134,  1,159, 97,224,236,228, 80,241,188,108,219, 73, 77,245, 56,108,220, 44,127,214,168,197,
+206,181, 35, 65, 12,217, 48,192, 18, 26,184,192, 96,228, 85, 24, 88,153, 76,134,166,157, 63,120, 43, 35, 88, 66,161,112,212,246,
+237,219, 93,126,251,237,183,188,163, 71,143,230,183,105,211, 70,182,126,253,122,135, 77,155, 54,117,209,106,181,152, 49, 99, 70,
+198,205,155, 55,139,  7, 12, 24, 96,185,109,219, 54,151,134, 13, 27,190,139, 74,198,101, 17, 66,100,  0,134,  2,248, 40,168,181,
+ 37, 63,175, 80,  5,214,160, 69, 92,252,115,228, 23,105,193, 26,117, 72, 76, 86,162, 72,109, 68,118, 78, 33,252,252,123,124, 31,
+ 18, 18,242, 37, 33,100, 62,165,244,120, 77,229, 52, 26,141,184,113,227,  6,174, 95,191,142, 43, 87,174, 32, 33, 33,161,226, 61,
+ 11, 11, 11,156, 59,119, 14, 93,186,116,121,163,230, 42,241, 45, 50, 87,101,215,160, 69, 61,122,244, 88,100,107,107, 43,217,184,
+113,163,165,187,187, 59, 12,  6,131,246,213,200, 85, 96, 96,224,130,  5, 11, 22, 56,191,247,222,123, 83,  1,108,168,235,239, 85,
+ 21,217, 50,129,191,164, 98,200,204, 76, 27,247,253,246, 81,118, 50, 97,130, 18, 79,190,115, 41,139,197,  0, 37,  5, 64,200,110,
+144, 14, 11,159,143, 14,158,108,189,234,232,166,113,  0, 54, 87, 37, 28,251, 44,  9, 91,182,108,194,103, 51, 70,227,215,159, 87,
+131,101,249,208,232,121,168, 87,191, 45, 52, 58, 22,132,225,163,133,127, 32, 46,133, 92,133,128,  1,166, 79,184,249,214,153,128,
+ 39, 79,158,220, 74, 72, 72,240, 89,184,112, 33,126,117,113,129,185,185, 57,102, 46, 90, 20,102, 48, 24,222,186, 25,178,255, 88,
+131, 21,224,237,245,141,165,141,245,216,246,173,154,216,206,156, 58, 78,240, 44, 77,141,139, 29,191,200, 59,184,106,174, 60,137,
+202,167, 36,208,188,235,181,137, 58, 24,150,204, 68,182, 81,139,250,199, 66, 33,150,203, 17,211, 51, 16, 84,171, 69,135,187,  9,
+ 16,203,229,224, 75,204,234,114,  2,191,212, 29,248,234,115,134, 49, 45,113,189, 78,167,179,234,222,189, 59,186,117,235,134,247,
+223,127,191, 98,204, 85,203,150, 45,177,119,239, 94, 12, 26, 52,  8,247,238,221,131,179,179, 51,124,124,124,224,227,227,131,139,
+ 23, 47,214,250,238,209,104, 52,162,103,207,158,  5,132,144,  8, 74,169,223,173, 91,183, 44,106,171, 81,222,216,156, 61,123, 22,
+125,251,246,133,151,151, 23,194,195,195,113,246,235,111, 33,181,169,  7,192, 10,172,209,  8,173, 86, 11,134, 97,106, 28,131, 21,
+ 20, 20,196,231,241,120,141, 27, 52,104,128,204,204, 76,100,102,102,194,222,222, 30, 10,133,  2, 14, 14, 14, 88,187,118, 45,214,
+175, 95,127,139, 82,186, 50, 45, 45,237, 81,109,247,145, 66,161,  8,182,182,182,254, 86,165, 82,  9,203,203, 66,  8, 17, 56, 59,
+ 59,135, 41, 20,138,121, 74,165,242, 88,109, 12,150, 78,167,  3, 33,  4, 39,226, 20, 40,214, 18, 20, 36,135, 99,250,187,238, 47,
+ 25, 46,129, 64,240, 82, 90,141,170, 13, 22,197,158,237,223,221,157,247,197,199,254,200,217,  5, 67,246, 46, 16,235, 97, 56,244,
+176, 23,126,191,105, 11,  0,240,118, 98,240,221, 88,249, 91, 27,193,210,233,116,219, 26, 53,106,  4,173, 86,123,  1,192,246,136,
+136,136,129,169,169,169,235,254,252,243, 79,197,144, 33, 67,148,199,142, 29,251, 12,192,145,136,136,136, 49,203,150, 45,235,166,
+215,235,183, 85,209,237,240,235,204,153, 51,131,134, 12, 25, 66,132,140, 94,123,246,204, 14,190,193,160, 39,179,231,255,100, 12,
+185,118,153, 49, 24,244,228,253, 15,103,178, 39, 47, 70, 50, 19,166,173, 49,182,108,219, 23, 15, 30, 60,112,234,215,175,223, 82,
+  0, 38, 25, 44,129, 64, 80, 97,160, 43,249,253, 90,117, 17,126, 12,120,185, 90, 91,223, 56,182,120,177,220,235,218,181,151,205,
+ 85, 98,226, 91,103,174,  0,224,194,133, 11, 91,  1,108, 13, 10, 10, 74,151,201,100, 40, 42, 42,250,203, 57,210,174, 93, 59,137,
+ 66,161,144,  8,  4,  2,180,110,221,218,166,103,207,158, 49, 12,195,108, 56,117,234, 84,173,147, 80, 86, 22,217,170,107,154,  6,
+115,107,182, 95,203,182, 77,205, 31,155, 47, 54,151,240,213,247, 60, 98, 36, 22,  4, 64,190,198, 49, 46, 52, 97,104,  1,201, 16,
+183,108, 22,236,  1, 41, 35,233, 87,149,193, 34,132,220, 45,200,203,239, 93, 80,168,197,181,235, 15,240,225,208,134,208,232,  8,
+ 88,150, 65, 81,177,  6,224,  9,192,  0, 24, 54,124, 20, 40,225, 35, 55, 43, 13,  4,136,124,219, 76,128,209,104,156, 55, 96,192,
+128, 86,203,150, 45,107, 50,115,230,204,242,253,210, 78,161, 80, 68,113,121,176,254, 31, 12, 86, 35, 47,215, 94,157, 91,  5, 78,
+251,114,254,151,230, 79,110, 93,193,151, 75,191,103, 27,  6,246,204, 95,185,231,143,194,124,121,189,110, 37,202, 71,247,106, 27,
+117, 16, 24,244,160,  6, 29,196,114,249, 75,145, 43,145, 76,  6,129,153,180, 86, 27, 65,  8,  1,165,244, 47,221,129, 47,154,171,
+218, 92,108, 69, 34, 81,222,213,171, 87, 29,146,147,147, 95, 26,208, 94,191,126,125, 16, 66,112,243,230, 77,220,184,113,  3, 31,
+126,248, 33,248,124, 62,  4,  2,  1, 34, 34, 34, 10,235, 18,193, 42,159, 69,232,236,236,220,179, 77,155, 54,149,206, 30, 52, 37,
+130,149,152,152,  8, 47, 47, 47,104, 52, 26, 88, 91, 91, 35, 39, 45, 14,207,158, 60, 66,137, 70, 15, 15,  7, 17,178,178,178, 80,
+158,215,171, 58, 46, 95,190, 76, 21, 10,197, 75,145,159,204,204, 76,120,122,122, 98,203,150, 45, 88,191,126,253,230,212,212,212,
+ 90,223,197,186,184,184,216,176, 44,187,172, 95,191,126,253,  7, 14, 28,136,158, 61,123,190,244,254,174, 93,187, 44, 15, 31, 62,
+252,163,155,155,219, 64, 30,143, 55, 47, 62, 62, 62,189,166,125, 14,  0,191,252, 82,154, 62, 73,218,118, 17,230, 13,241,192, 71,
+147,119,224,187,239, 14, 67, 44, 22,191,212,216, 46, 89,178,164,230,122,164, 20,221,223,255,196,191,139,159, 22,198,236, 63, 96,
+209, 62, 23,  5,161,214,200, 47,244,199,205,181,125,  0,  0,205, 63, 62, 14, 74, 61,  0,224,173,140, 96, 81, 74,207,  1, 56,247,
+194, 75,  7,  9, 33,122, 66,200,112,  0,251, 40,165,135,203, 94,255,  9,213, 36,  6,109,219,182,109,203,249,243,231, 11,202,211,
+102, 40,234, 45, 51,232,116, 58, 22,  0, 26,251,189,243, 82, 95,245,211,167, 79,241,221,119,223,161,184,184, 24,194, 90,132,153,
+131,131,131, 43,198, 68, 10,133, 66,216,217,217, 65,167,211,193, 96, 48,212,122,252,149,157,171,235,247,119,174, 95, 55,138,126,
+216,160,162,  7, 15,154,197,152,153,189,213,230,234, 21, 22,245,233,211,103, 17,165,148,178, 44,187,240,133,155, 45,177,181,181,
+245,213,239,191,255,222,214, 96, 48, 96,214,172, 89, 86,217,217,217, 86, 19, 39, 78,156,  7,160, 74,131, 85, 69,154,134,170,142,
+183, 58,165,105, 96, 89,120,203,229, 22,200, 70, 50, 52,118,250,150,121,182,134,156,115,169,227,238, 41, 18,252,125,101, 70,189,
+ 39, 83,160,133,165,196, 28,148, 82,239,170,126,219,192,178,167, 30, 69, 69,245,168,231,214,144,247,231,241, 43, 24, 48,112,  8,
+ 52, 26,  6,106, 61,  1,225,  9, 64,120, 66, 52,247,243,135, 79, 83, 63, 80,  0, 49, 15, 35, 12,198,151,207,141,255,121,220,  7,
+253,180,217,181,255, 15,147,  0, 96,214,134, 11,248,242,155,117, 24,241,126, 79,140, 25, 51,134,203,131,245,255, 97,176,234,213,
+171,103,229, 32,151,254, 50,229,227,177,230,  9,247,195,144, 28, 17,134,235,215, 98,114,119, 31, 58,154, 82,144,159,249,113,109,
+204,213,139, 17, 44,175, 93, 39,224,226,236, 92, 17,185,106, 31, 30, 15,177, 92,142,144,230, 46, 96, 53, 26,244,120, 94, 80,235,
+141,169, 44,106, 37, 20, 10,235, 52,211,175,220, 84,189, 58,160,125,194,132,  9,216,190,125, 59, 58,116,232,128, 70,141, 26,213,
+250, 78,249, 69, 83,244,226,152,168,218,204, 30,172, 76,171, 94,189,122,136,140,140,132,165,165, 37,118,238,220,  9, 87, 87, 23,
+140,233,229,  5, 30,175,180,107,139, 97, 24,147,198, 96, 81, 74,141, 46, 46, 46,113,103,207,158,245, 28, 50,100,  8,132, 66, 33,
+114,115,115, 97, 97, 97,129, 77,155, 54,177, 82,169,244,215,218,150,207,205,205,109,140, 68, 34,249,122,232,208,161,252,198,141,
+ 27, 35, 61, 61, 29,150,150,150,108,217,210, 70,176,177,177,102,165, 82, 41, 38, 76,152,  0, 63, 63,191,238,115,231,206,237,166,
+ 80, 40, 86, 40,149,202, 31,106, 50, 89,123,247,150,246, 78,125,188,225, 17,180,218,210,161, 22,155, 55,111,134,179,179,243,203,
+ 93,  1,177,177, 53,207, 34,100, 89,156, 59,244,211,221,201, 83,135,250, 19,235, 97, 40,  8,181,  6,181,252, 16,233, 69,230,216,
+117, 57,  3,151,239, 38, 84, 36, 26,125,219, 34, 88,132,144,  1, 40, 29,122,113,146, 82,122,132, 16, 50, 24, 64,207,242,231,168,
+101, 98, 81,131,193, 64, 25,134, 33, 73, 73, 73, 58,169, 84, 74,108,108,108,248, 98,177, 24, 26,141,166,194,104, 61,125,250, 20,
+199,143, 31, 71,114,114, 50,108,108,108, 24, 75, 75, 75,232,116,186, 92, 19,239,186,255,146,158,161,236,119,107,125, 62,142,  6,
+154,109, 94, 60,223, 67,197,207,181,204, 26,211, 21,236,189,235,170,200, 76,141,217,191,196, 92, 33, 36, 36,100, 43,128,173,229,
+207,187,118,237, 58,134,207,231,127,  9,192,114,219,182,109, 86, 86, 86, 86,228,216,177, 99,250,109,219,182,229,241,120,188, 92,
+  0,235,170,211,171,108, 48,251,235, 80, 89, 42,  6, 74, 17,149,147, 31,231, 46,176, 82,176,247,213, 52,116, 70,210, 60,159, 92,
+ 65, 67,123,210,180, 25,  6,102, 68, 95, 27, 99,136,109,159,153,150,193, 80,208,168,170,116,243,243,243,127,250,117,199,129,217,
+251,247,253, 82, 79, 44, 23, 99,194,196,249, 56,113,250, 18,  8, 35,192,213,208,155,208,234,140,200,202,201,199,208, 97, 35,224,
+234,108,  7, 20,165,100, 10, 68,162, 31,222,166,125,255, 82, 30,172,192,246,184,126,120, 13,246,198,212, 67,202, 55,223,112,121,
+176,254, 78,131,229,225,225, 33,150,  9, 48,222,198, 76, 56,103,202,240,247,236, 51, 98, 31, 34, 57,250, 46,  0, 64,163, 81,233,
+ 83, 99, 46,183, 48,225,162, 29,252,106,174,140,242,174, 27, 27,123,135,138,200,213,139,179,  7, 89,141,  6,172, 78, 11, 84,209,
+157, 83,149, 38,195, 48,127, 49, 86, 47, 94,120,107, 83,206,242,232, 72,101,  9, 70,221,220,220,176, 98,197,138,191,228,193, 50,
+165,156,101,119,105, 61,  9, 33,126,229,198,136, 82,234,231,236,236,220,211,148,153,131, 85,105,150,103,172, 62,117,234, 20,162,
+162,162, 64, 41, 69,191,126,253, 32, 16,  8, 96,110,110, 94, 97,178, 42, 27,131, 85,153, 38,195, 48,159, 28, 62,124,120,118, 88,
+ 88, 88,175, 89,179,102,145,242,177, 44, 69, 69, 69,108,106,106,106, 97,109,203,201,178,236,156, 51,103,206,240,141, 70, 35,182,
+111,223,142,219,183,111, 83,169, 84,186, 82, 32, 16,172,144, 74,165,  6,189, 94,255,249,184,113,227, 38, 46, 94,188,152,233,212,
+169, 19,194,194,194, 24, 79, 79,207,169,  0,126,168,105,219,111,222,188, 89,218,229,156,147,136,201,243,246, 65,102,198,199,163,
+ 71,143,144,147,147,243,151,228,163, 53,151,147,194,191,203, 16,127,150,234,160,147, 15,  1, 99,214,181,116,169,156,231, 26,180,
+242, 43,141, 58,170, 10, 50, 43,234,177,178,  8, 86, 85,229,124, 77,243,243,183,106, 18, 66,250, 55,105,210,228,139,168,168, 40,
+215,230,205,155,251, 18, 66,130,154, 53,107,214, 42, 50, 50,178,252,185,128, 82,186,191, 54,154,183,111,223, 62,184,105,211,166,
+137,163, 71,143, 22,178, 44,107, 76, 72, 72,208,  3, 32, 78, 78, 78,188,219,183,111,179,127,254,249, 39, 84, 42, 21, 92, 93, 93,
+ 25, 23, 23, 23,114,238,220, 57, 54, 58, 58,250, 38,165,116,190,169,219, 94, 30,153, 22,  8,  4,224,241,120, 80,169, 84, 38,153,
+171, 87, 53,221, 27,121, 45,239,220,222,195, 45, 75, 25,129,132,132,120, 36,  6, 54,212,111,222,124,188, 86,230,234,127,113,191,
+ 87,115,115,185,228,208,161, 67, 46, 26,141,  6, 66,161, 16,  7, 14, 28,208,237,216,177, 35, 42, 63, 63,191, 99,120,120,184,170,
+174,229,172, 77,  2,210,154, 52,139,242,120, 39, 78,159,121,208,138,215,235, 39, 76, 86,102,118,172, 48, 94,132,216, 28,118,244,
+237, 40,109,221, 60,197,252,202, 26,166,  4,234, 19, 85,105,198,198,198,106,  3,  3,  3,135,204,157,179,232,194,215, 75,191,150,
+ 47, 92,180,  8,215,111, 70, 34, 59,175,  8, 44,229,129, 37,  4, 95,126,185, 16, 78,118, 54,176, 17,233, 75,178,139,201,192, 87,
+151,204,249, 95,223,239,175,147,  7,235,239, 40,231,191,198, 96,153,243,241,160,163,175,151, 75, 39,255,166, 18,190, 81,133,228,
+232, 88,228, 20,171,113,238, 97, 66, 30, 67,153, 95, 95,231, 71,121, 60, 30, 44, 45, 45, 33, 20, 10,209, 46, 50,  5, 34,161, 16,
+ 98,185, 57,  0,148, 70,174, 40,  5, 35, 18,215,246,  0,170,212, 96,213, 21,163,209,  8, 71, 71,199,151,150, 93,121,177,193, 46,
+ 55,138,181, 77,209,192, 48,204,188,176,176, 48,139,196,196, 68, 80, 74,113,228,200, 17,139, 65,131,  6,205,171, 75,244,138, 82,
+138,236,236,108,176, 44, 11,177, 88,140, 94,189,122,161, 83,167, 78,208,149,205,254, 40,111,128,106,155,201, 61, 41, 41, 41, 21,
+192,103,174,174,174,191,206,158, 61,123, 78,155, 54,109,  2, 23, 47, 94, 12, 82,139,133,113, 95, 65,103, 52, 26,113,249,242,101,
+ 28, 62,124,216,160, 86,171,  7,165,165,165,221,121,225,253,165,174,174,174,127, 14, 26, 52,232,228,227,199,143,249, 81, 81, 81,
+  0, 96,168, 73, 84,165, 82,161, 81,163, 70, 48, 24, 12, 88, 53,217, 13,133,133,205, 97, 48, 24, 96, 52, 26, 33,147,201, 94,202,
+251,101,202,126, 98, 41,139,187,151, 14,220,117,111,217,211,191,166,165,114,222,178,  8, 86,175,168,168, 40,215,225,195,135,103,
+ 68, 70, 70,186, 30, 63,126,220,170, 95,191,126,178, 97,195,134,101, 68, 70, 70,186, 18, 66,222,  1,176,191,150,231,207, 23,132,
+144,211,203,151, 47,159, 55,109,218,180, 54,163, 71,143, 22,  8,  4,  2, 54, 37, 37,197,176,103,207, 30,210,168, 81, 35, 70, 40,
+ 20,146, 51,103,206,176,183,110,221,186, 97, 48, 24, 86, 81, 74,175,214,246, 58, 82,110,174,234, 26, 73, 94,  7,140,106,156,152,
+220,113,255,146, 53,140,160,137,179,238,216,169,155, 73,119,239, 60,127,  6,157,113,198, 47,192,179,127,105,187,176,127,200,144,
+ 33, 99,  6, 13, 26,100,214,186,117,107,241, 79, 63,253,148, 95, 82, 82, 82,169,185,170,140,218,164,105,168,109,  2,210,114,148,
+ 74,229,207, 43,150, 92,153,241,145,207, 48,175, 79,236, 60,112,190, 56,  3,185,124, 30, 99, 97,197,192,223,157,  7, 85,222,115,
+251, 11, 55, 15, 61, 79, 85, 42,171,205,171,118,231,206,157,219,  1,  1,  1,193, 31,125, 52,230,208,132,143,199, 57, 44,252, 98,
+174,224,224,159, 39,  1,131, 14,183,174, 94,133,149,148, 80, 67,113,106,122,182,150,188,247, 54, 46,149,147,112,248,147,201,  0,
+ 38, 19, 66, 62, 92,180,104,209,158,201,147, 39,131,101, 89,132,132,132,224,135,185,115,177,216,104, 28,185,145,144,146,105,148,
+ 78,230,236,210, 27, 52, 88, 96, 72,225,141, 39,  9, 69, 55,159, 36, 20,129,165,148,165, 84,195, 48, 72, 42,214,233,150,199, 60,
+ 75, 62,243, 58,251,180, 87,175, 94,204,171,198,165,138,110,  6, 83,  7,215, 37,  4,  7,  7,191, 49, 77,150,101,147, 59,118,236,
+248,151,134,185,170,255,203,116,147, 77, 10,201,178,236,202,118,237,218,253,229,181, 58,133,119, 89, 54,174, 91,183,110,186, 87,
+ 77, 87,117,207,141, 70, 99,178,169,250,201,201,201, 15,  0,140,112,113,113,233,210,179,103,207,169,  0,234,154,142, 97,109,151,
+ 46, 93,102, 82, 74,249,132,144, 53,175,152,171,242,223,122,232,226,226,178,208,211,211,179, 98,  1,232,154,182, 61, 56, 56, 88,
+ 87,211, 34,207, 47, 14,128,102, 89, 54,185,122, 77,138,122, 45,122,248,235,244,165, 38,173,186,165,114,170,138, 96,253,143,178,
+143, 16, 34,  0,144, 27, 21, 21,245, 78, 89,228, 42,249,193,131,  7,231,247,238,221,235,  8,212,156, 62,161,138, 27,128,171,  0,
+174, 18, 66, 58,109,222,188,249,139,  9, 19, 38,180,254,240,195, 15,249, 65, 65, 65, 56,113,226,132, 49, 36, 36,228,166, 74,165,
+ 90, 89, 91, 99, 69,  8, 41,122,245, 28,170,166, 12,213, 46,210,235,205, 48,155, 86,  8,132,146,113,  7, 46, 23, 93, 22,146, 80,
+163,202, 48,255, 55,224,193,191,185, 81, 56,119,238,220,231,237,218,181, 91,120,224,192,  1,165,151,151,151, 88, 32, 16,104, 77,
+ 53, 87, 64,237,210, 52, 80, 74,217, 58, 30, 91,  6, 71, 71,199, 62,187,134, 79, 62,218, 98,202,232,250,189, 58,  4, 74, 93, 60,
+ 28, 92, 30, 63,207, 66,114,228,249,226,103, 33,155,226,141,234,156,  1,148,210, 26,111,212,194,195,195,111,181,107,215,174,225,
+230,109, 63, 78,230, 49, 76, 15,131,209,232, 55,115,242,  8, 74,128, 72, 22, 56, 39, 20,139,222,250,197,158,197, 66,225,200, 41,
+ 83,166,224,247,223,127,199,145,245,235,209, 51, 57, 25,123,133, 66,152,  9,133,216,162,211, 77,  2,192, 25,172, 55,105,176, 34,
+159, 60, 15,248, 59,126, 48, 42, 42,170,221, 63, 93, 51, 42, 42, 42,240,239,170,240,215, 25,107, 85, 73, 57,255, 95,166,209,166,
+164,164, 92,  2,112,233, 53,190,191,  3, 38, 44,230,108,234,231,  0,224,209,163, 71,111,124,219,169,216,114, 72,226,253,179,121,
+ 78, 77,186, 90, 25, 12,  6, 16, 66,160, 86,171,113,227,198, 13,104, 74, 10, 17,178,123,124, 69, 38,119, 80, 32, 45,250, 98,158,
+ 83,253,102, 86,255,235, 23,  1, 74,233, 21,  0, 87,202,204,203, 64, 66, 72, 31,  0,103, 40,165,  7,223,144,126,133,209,218,182,
+109,219, 12, 74, 41, 10, 10, 10,214,215,214, 88, 85, 92,155, 34, 35, 47,190,169,109,143,103,217,139, 11, 75, 74,186,102,179,236,
+140,159, 13,181, 91,112,252,109, 38, 44, 44, 76,221,173, 91,183, 95,151, 45, 91,214,150,101,217,223,222,132,230,107,164,105,168,
+148,244,244,244,231,132,144, 22,236, 55, 27,198,134, 91,153,247,165,122,166, 49,209,243,143, 17,109,246,137,180,180,180, 95, 40,
+165,198,218,108,111,217, 77,221,119,255,198,253,125, 63, 50,178, 39,  0,244,238,221, 27,170, 89,165,105,175,118,252, 39, 15,214,
+ 22,238,140,120,211, 17, 44, 14,142,127, 25, 41, 49,225,  7,  1, 32, 45,186,180,253,254,254,251,239,  1,  0, 61,123,246,252,203,
+172,199,242,207,164, 61,127,187,130, 29,101,  3,218,143,252, 77,218, 87,  1, 92,253, 39,109,111,  8,165,253,184, 35,191,114, 46,
+ 92,184,240, 70, 19, 76,190,233,  4,164,101,199,148, 17,192,246,178,  7, 71, 29,241,246,246, 38,  0, 96,103,103,135,  5,181, 88,
+ 78,141,163,122, 24,174, 10, 56, 56, 56, 56, 56, 56, 56, 56,222, 44,  4, 64,112, 21,119,  6, 38,207, 14, 32,132,  4,215,225,206,
+227, 60,167,201,105,114,154,156, 38,167,201,105,114,154,255, 46,205,154,180,223,154,217,137,229, 25,174,255,142,  7,128, 96, 78,
+147,211,228, 52, 57, 77, 78,147,211,228, 52, 57,205,127,219,163,154, 49, 88,  7,121, 41, 41,176, 16,137,164, 66,  0,208,106, 75,
+116, 46, 46, 40,  0,  6, 27,193,193, 81,155, 48, 41, 33,142,101,102, 62,253, 77,126,150,131,131,131,131,131,227,159, 10,191, 42,
+115,149,149, 37,181,227,243,115,189,141, 70,181, 15,  0,240,249,204,163,172, 44,235, 24, 59,187,131, 89,111,218,100,245,238,221,
+123, 62,165,212, 81, 32, 16,156,112,114,114, 10,217,186,117,171,254,223,108, 52, 94,199,100,252,127, 24, 20, 91, 91, 91,133,163,
+163,227,112, 43, 43,171,160,252,252,252,171,105,105,105, 59,179,179,179,149, 85,148,103,  5, 33,152, 83,246,255,106, 74,233, 23,
+213,148,221,228,207,190,138, 66,161,104, 36,145, 72, 38, 51, 12,211, 12,  0, 88,150,125,160, 86,171, 55, 43,149,202, 39,255,182,
+147, 90,161, 80,152, 81, 74,223, 19,  8,  4,163,108,108,108, 90,103,102,102, 46, 78, 73, 73, 89, 87,199, 99,150, 15, 96,150,149,
+149,213,135, 86, 86, 86,158, 57, 57, 57,207, 10, 10, 10,246,  3,248,142, 82, 90,227,121,250,245,116, 69,187,160,158, 65, 11, 66,
+206,132, 44, 93,180, 65, 25,246,151,247, 63, 87,216,246,232,222, 97, 97,200,177,208, 37, 95,108, 74,201,169,101,217, 24,252,103,
+ 28, 41, 91,122,216,255,115, 71,232, 58, 56, 56,180, 45, 75,164,202, 48, 12,243, 93,122,122,250,165,127,242,113,100,111,111, 47,
+115,114,114, 90, 69,  8,233,207,227,241,162,210,211,211,199, 43,149,202,228, 55,116, 45,100,220,221,221,205, 19, 18, 18, 10,235,
+154,170,225,223, 72,187,118,237,210,117, 58, 93,181,217,241,133, 66, 97, 70, 88, 88,152, 35, 87, 91,255, 80,131,149,146,  2, 11,
+ 62, 63,215, 59, 35, 45,114,168, 50, 53,226,  3,  0, 80, 56,251,237,119,112,106,190, 47, 37, 69,164,107,213,125,144, 92, 32,229,
+111,230,241,  4, 45,213, 90,141,157,128, 47,200,210, 25,244,247, 24, 45,157,156,250,232,112,162, 41, 63,220,191,127,127,111,  0,
+150,254,254,254,183,181, 90,109,235,117,235,214, 57, 31, 58,116,200, 47, 60, 60,124,216,187,239,190,123,140, 82,122,230,216,177,
+ 99,170, 90,157,180, 65, 65,124,135, 60,155,145, 60, 62,191, 63,  0, 63, 74,  1, 16, 94,  4,171,211,158,204, 16,218,252, 70,195,
+235,110,220,218, 53,178,245, 38, 84, 55, 91, 64,104, 39, 61, 37, 87, 41, 17,174,  9,123,146, 29, 83,139, 11,138, 73,230,225,117,
+ 76,198, 43,223, 93, 79, 41,157,245,166, 15, 24, 39, 39, 39,187,193,131,  7,239, 90,186,116,169,204,220,220,156,196,199,199, 15,
+252,226,139, 47,122, 42, 20,138,143,148, 74,101,210,171,102,143, 16,204, 97, 89,202,  0,  0,195,144,185,142,142,142,205,248,124,
+190,230, 85, 93,131,193, 32, 38,  4,189, 88,182,116, 57, 27,134, 33,115,  8, 33, 27, 76, 49,138,158,158,158,195,154,251,181,156,
+249,197,252,133,114,123,  7,  7,153,193, 96,212, 37,165, 36, 75,215,172,248,166,141,167,167,231,134,184,184,184, 61,181,221, 78,
+ 66,  8,113,117,117, 29, 42, 16,  8,250,  1,104, 82,246,114,180, 94,175, 63,158,156,156,188,207,212,134,188, 69,139, 22, 87, 24,
+134,241,168,205,111, 27,141,198,196,136,136,136,142,117,217, 63, 46, 46, 46, 67, 92, 92, 92,126,105,219,182,173,180,101,203,150,
+ 16, 10,133, 88,189,122,245, 44,212,176,188, 73,185,145,146, 74,165, 67,101, 50,153, 87, 81, 81, 81,172, 74,165, 58, 36, 18,137,
+130, 55,108,216,224,214,161, 67,  7,243,244,244,116,194,227,241, 28,143, 31, 63, 62,114,227,198,141, 61,  9, 33,221,106,202, 51,
+148, 31, 75, 23,136,251, 55,233,148, 31,123,105,  1,128,222,127,217,239,106,201, 40,202,115,235,167,162,119,147, 80,139, 41,242,
+132, 16,198,213,213,117,131,163,163,227, 24,149, 74,165, 38,132, 80, 66,  8,109,222,188,121,249,251,  0,  0,173, 86,155,251,248,
+241,227,198,213,105,213,111,103,115,135,199,240, 92,171,220, 31,172, 49,249,121, 88,206,107,167,110, 49, 26,141,115,162,162,162,
+250,  8,  4,  2,210,162, 69, 11, 30,106,145,250, 68,161, 80,120, 19, 66,190,164,148,222, 78, 77, 77,221, 92,182,164, 85, 23, 74,
+105,197,181,162, 44,157, 10, 92, 92, 92, 54, 55,108,216,240,221,167, 79,159,110, 73, 73, 73, 89,250, 26, 70,125,235,242,229,203,
+ 63,232,217,179, 39, 47, 59, 59,219,165, 71,143, 30,187,  1,116,122,157, 58,  8,  8,  8, 16,164,165,165,205,106,209,162,197,167,
+173, 90,181,114,126,248,240, 97,154, 66,161,216,232,228,228,244, 93,120,120,120,141,215,103, 63, 63, 63,  5,159,207, 31,  3, 96,
+ 36,  0, 30,165,116, 47,128,223,238,222,189,251,175, 72, 10,171,211,233, 28,206, 47, 93,  8,194,231, 67,210,177, 27, 88,150, 69,
+214,154, 69, 48,228,100,193,110,233, 70, 24, 12,  6,  4,  7,  7, 59,128,227,159,107,176, 68, 34,169,208,104, 84,251, 40, 83, 35,
+ 62,120,167,243,247,150,  0,112,229,242,167, 31, 56, 56, 53,125, 32, 18, 73, 99,196, 22,146,195,131,250,  7,183, 28,220,175, 51,
+113,117,118, 64,114,106,134,227,207,123,207,244, 58,126,230,210, 97,  0, 38,229,207, 42, 40, 40, 88,230,238,238,110,127,225,194,
+133,120,145, 72,100, 38,145, 72,200,144, 33, 67,204,134, 13, 27,230,123,241,226, 69,175,211,167, 79, 15, 30, 48, 96,192,105,161,
+ 80,120,226,192,129,  3, 53,174, 79,230,216,124,160,175, 19,223,233,224,128,247,122,123,244,237,238, 32,114,119,178,  7,101, 37,
+120, 20,167,171,119,238,234,221, 94, 39, 78,157,153,227,224, 59,240,253,140,168, 35, 38,175,134,222,172,153,165,149,153,138,206,
+ 52, 19,210, 15,123,181,241,173,223,191,123,123,226,233,233,137,152,199, 49, 94,151,174,223, 30,211,197,199,252,185, 74, 71,246,
+170,204,200,218,  7, 15,242,243,170,139, 42,189,104, 52,120, 60,102, 94,247,238,221,199,136,197,226,151,238,220, 52, 26, 13,195,
+ 48,196,193,104, 44,125,185, 54, 38,163,252, 55,180, 90, 13, 35, 16,136,192,227, 49, 51, 91,182,108,217, 59, 61, 61,253,148, 88,
+ 44, 94,253,252,249,243, 90,229,157,153, 70,136, 40,151,207, 15, 96,196, 98,103,163, 86,107, 11,  0, 68, 36,202,173,103,107,219,
+246,171,175,190,146,243,120, 60,100,103,103, 67,173, 86,147, 79, 62,249,196, 44, 54, 54,118, 52,128, 37, 53,153,150, 29, 59,118,
+248,219,218,218,254,229,142, 53, 59, 59,155,233,221,187, 87,173,243,118, 42, 20, 10,239, 22,254,129,159,237,217,189,171, 73, 65,
+ 78,174,122,251,186,173,225,122,137, 84,227,217,164,177,224,155, 21,107, 45, 23,204,157,249,169, 66,161,184,167, 84, 42, 77, 54,
+195,206,206,206,245, 60, 60, 60, 14,207,159, 63,191, 89,199,142, 29,  5, 14, 14, 14, 72, 79, 79,199,227,199,143,155, 93,191,126,
+253,189, 63,254,248, 99,150,179,179,243,160,212,212,212, 26,111, 38, 40,165,141,142,174, 89,225, 32,182,177,  5,171,215,195,198,
+207,191, 34,249,107,234,165,179, 48,234,116, 96,245,122,184,245,125, 15,101,145, 55,116,237,218,181, 78, 25,243, 93, 93, 93, 21,
+222,222,222,191,207,155, 55, 79,168,213,106,113,247,238, 93,132,133,133,177, 25, 25, 25, 43,107, 50, 87,132,144,179,139, 22, 45,
+114,237,216,177,163,121, 86, 86, 22,140, 70,163,221, 31,127,252, 49,217,223,223,223,194,205,205, 77,180,115,231, 78, 20, 21, 21,
+193, 96, 48,216,120,121,121,217, 12, 27, 54, 76,187,115,231,206, 89,  0, 86, 85, 21,185, 42,136,165, 11,210,136, 87,175,198,  1,
+163,144, 70, 78,247,154,217,219,249,148, 69,  3, 82, 17,201,234,221,160,129,185,151,143,108,174,220,162,185, 77, 65,202,249,185,
+189, 27, 52,216,126, 42, 54,214,148,165,152, 24, 23, 23,151, 13,125,250,244, 25,190,101,203, 22,105,116,116,180,180, 73,147, 38,
+ 96, 89,182, 34,147,127,249,202,  5,157, 58,213,236,  7,120, 12,207,245,250,225,135, 14,102,102,102, 21,107,132,150,255, 45, 46,
+ 46, 70,207, 81,109,255,142,235,109,109,247,241,215,161,161,161, 67, 78,157, 58, 53, 98,233,210,165,141,  0, 76,101, 89,118, 97,
+116,116,116,103,  0,104,210,164,137,  8,192, 37,133, 66, 49,118,210,164, 73,147,166, 78,157,138,145, 35, 71, 46, 36,132, 44,171,
+ 75, 84,143, 16,194,107,218,180,105,159,158, 61,123,242,244,122, 61,204,204,204,160,211,233, 26,188,206,198,251,250,250, 10, 75,
+ 74, 74, 14, 45, 89,178,164,223,128,  1,  3,192,231,243,193,178,172,211,149, 43, 87, 86,204,154, 53,171,125, 64, 64,192,192,170,
+ 76, 86, 64, 64, 64, 75,  0, 75, 26, 54,108,216,115,212,168, 81,188, 14, 29, 58,160,168,168,  8,103,207,158,253,242,240,225,195,
+ 95,  6,  4,  4,132,  2, 88, 24, 30, 30, 30,242,182, 55,218, 60,185, 57, 30, 15,234,  2,175,232,108,  0, 64,218,230, 53,  0,  0,
+139,175,190,229, 28,205,255,130,193,170,137,146,146, 18,255, 47,166,141,  4,195,148,182,135, 13, 61,235, 97,197,252,241,228,232,
+241, 51,254, 53,132, 55,215, 26,141,198, 70, 54, 54, 54,179,213,106,181,100,253,250,245, 18,165, 82,233,115,240,224, 65,122,255,
+254,125,  8,133, 66, 88, 90, 90,162, 91,183,110,226, 94,189,122, 53,  8, 13, 13,173,119,248,240,225,  1,125,251,246,253,237,196,
+137, 19,199,170, 51, 87,118,246,246,151,191, 93, 58,206,166,153,167, 23,116,122, 61,146, 50, 82, 64,137,  8,206, 14, 50,124, 52,
+176,165,176, 99,160,200,235,219, 31,206,135, 56, 54, 27,240, 78,250,131,163, 15,107,218,198, 78, 13,101,183,  6,  6, 52,  8,232,
+ 31,220,158,105,212,216, 23, 66,137,180,226,189,230, 45,253,209,188,165, 63, 25, 63,166,208,243,254,253,251, 11, 78, 95,190, 57,
+191, 83, 67, 89,248,213,167,197,213, 45,140,249,146,121,152, 53,107, 22,108,109,109, 95, 53, 25,184,120,241, 66,149,223, 49,229,
+186,248,226,147, 21, 43, 86, 88,101,100,100,124,248,243,207, 63,191,231,228,228, 52, 37, 45, 45,237,180, 41, 34, 35,  9,241,128,
+ 88,220,109,204,119,223,177, 45,223,125,151,103,229,228,196,176, 70, 35, 73,142,141,181,251,110,253,250,224,194,164, 36,169,202,
+220,188, 40, 51, 63, 95, 27, 19, 19,  3, 51, 51, 51,194,227,241, 58, 84, 98, 46,210,  9, 33,171, 25,134,204, 37,132, 16,137,196,
+ 44,247,227,143, 63, 14, 45,123,175,201,177, 99,199,204,251,247,239, 95, 72,  8,137,  6,  0,137,196,172, 51,143,199, 88,211,210,
+142,158,213,166, 24, 75,169, 84, 58,109,214,231,243,100,  5, 57,121, 42, 93,113,177,222,222, 66, 78,136,220,156, 87,144, 95, 88,
+152,146,154,169,153,244,233, 12,222,130,121, 51,167,193,196, 76,196,206,206,206,245,124,124,124,110,109,223,190,221,193,214,214,
+ 22,121,121,121,200,206,206,198,173, 91,183,192,178, 44,122,247,238, 45,246,247,243,243,255,110,237,218, 48,103,103,231,118,166,
+152, 44,137,173, 29, 14,190,211, 18,  0, 48,228, 89,118, 69,132,229,212,208,255,164, 96, 26,150,144, 95,250, 89,137,164,214,203,
+ 47,189, 80,223,237, 58,116,232, 32,  4,128,153, 51,103, 22, 20, 23, 23,175, 32,132,236, 86, 42,149, 41, 53,124,117,214,130,  5,
+ 11, 92, 60, 61, 61,221,119,239,222,141,162,162, 34,  0,112,240,244,244, 68,227,198,141,141, 33, 33, 33,240,246,246,134,185,185,
+ 57,174, 92,185,130, 27, 55,110, 32, 32, 32,192, 92, 40, 20,126, 80,149,193, 10,234, 25,180, 64,220,191, 73,167,198,  1,163, 32,
+183,112,198,246, 61,251,240, 56,124, 71, 39,141, 46,122,193,138,169, 46, 31,169,168,120,180,107, 35,243,121, 30,129,157,109, 27,
+ 54,125, 23,238,  1,119,237,212,198,171,113, 11,167,120,173,228, 75,212, 59, 22,125,171,204,174,202, 92, 57, 57, 57,173,233,221,
+187,247,144, 45, 91,182, 88,  1, 64,100,100, 36,210,211,211, 97,111,111, 15,137, 68,  2,129, 64, 80,177,126,168,169,152,153,153,
+ 33, 53, 53,181, 98,153, 41,163,209,136,194,194, 66, 56, 57, 57,149,186,155,175,  9,179,104,145,105, 93, 89,206,206,206, 29,253,
+253,253,119,185,186,186,186,189,248,122,207,158, 61, 49,126,252,120, 80, 74,209,161, 67,135,110,227,199,143,167,148, 82,176, 44,
+139,244,244,244,162,200,200,200,238, 41, 41, 41, 55,171,216,110, 85, 90, 90, 26, 38, 77,154,132,196,196,196, 41, 10,133, 34,129,
+ 97, 24, 73,249,114, 96,132, 16,145, 66,161,240,246,246,246,222, 48,126,252,120,196,199,199, 35, 38, 38,230, 86, 93,187, 76, 41,
+165,198,182,109,219, 62,213,235,245,129,  6,131,  1, 42,149, 10,189,122,245,146,248,248,248,164, 11,  4,130, 71,121,121,121, 35,
+202,150,212, 50,197,172,241,157,157,157,157,  4,  2,193,150,113,227,198,245,105,223,190, 61, 30, 61,122,132, 83,167, 78, 97,192,
+128,  1,  8, 10, 10,194,130,  5, 11,250, 46, 88,176, 96, 22,128,170,110,  6, 14, 30, 58,116,168,190,171,171,107,197,146, 72, 22,
+ 22, 22,248,248,227,143, 49,114,228, 72,156, 60,121,178,253,242,229,203, 15,  5,  5,  5, 57,132,132,132, 24,222,230, 70, 91, 28,
+216, 30, 94,209,217,120,214,164,180,253, 40, 55, 90,229,207,225,226, 15,142,127,176,193,210,106, 75,116,124, 62,243, 72,225,236,
+183,255,202,229, 79, 43,186,  8,  1,230,145, 86, 91,162, 43, 13,155, 83, 20,148, 24, 96, 38,102, 16,159, 86,136,135,207,178, 42,
+ 59, 73,207,191, 98,204, 62,219,184,113, 35, 86,175, 94,221, 91,165, 82, 21,197,197,197,165, 22, 21, 21, 21,127,244,209, 71,132,
+207,231,227,250,245,235,120,254,252, 57,154, 55,111, 14,107,107,107,116,236,216, 81,216,163, 71, 15,183,177, 99,199,126,  4,224,
+ 88,101,154, 36, 40,136,239, 44,182, 63,188,102,233, 80, 27, 48, 49,136, 73,204, 67,  3,215,214,176,179,114, 67, 74,102, 17,110,
+ 71,157,196,147,216, 19,104,224,226,142,241,195, 27, 90,173,219,122,253, 56,  9,152,208,224,197,238,194,202,166,132, 74,120,198,
+ 86,139,247,220,135, 49, 39, 22, 52, 63, 17,180,248,175,171,196, 72,237,220,224,211,206, 17, 82, 43,123, 38,242,209,186, 86, 85,
+109, 59,165, 52,157,207,231,111,227,241,152,  9,  0,208,170, 85,235,226, 85,171, 86, 85,118,177,102, 91,181,106, 93,204,227, 49,
+178,210,  8, 22,111,171,193, 96, 72,175,174,156,175,152,153, 53, 34,145,120, 54,  0,226,234,234, 86,116,244,232, 81,246,253,247,
+223,199,154, 53,107,196,243,230,205,251,193,195,195,163, 75,124,124,124, 66,117,251,104, 16, 33,245, 92, 26, 52,232,177,236,250,
+117, 42,208,235, 73,206,173, 91,  5,133,233,233,250,148,194, 66,201,111,119,239, 14,158, 50,103,142,196,201,203, 11,161,231,207,
+155,167,229,230, 22,230,149,148,104,227,226,226,168,209,104,188, 90,197,182,127,225,232,232,216,108,199,142, 29,254, 31,127,252,
+113,104, 74, 74,202,160,178,110,140,195,  0,218, 18, 66,162, 95,124,237,240,225,195,237, 71,141, 26,117, 55, 61, 61,253,139,234,
+202,249,  2, 77,237,237,236,164,123,182,238,140,176, 49, 55, 99,236, 93, 21,140,192,202,138,111, 16,153,  9, 89, 64, 85,207,173,
+190, 12, 64,211, 42,234,236,213, 69,195,137,135,135,199,225, 95,127,253,213, 65, 32, 16,192,104, 52,194,222,222, 30,207,159, 63,
+ 71, 94, 94, 30, 10, 11, 11, 17,247, 40, 26,245,221,220, 48,125,252, 39,206, 95,127,187,246, 48, 33, 36,240,197, 70,172,210,197,
+184,117,186, 87, 27,156,170, 22,  8,135, 41,229,172, 10,150,101,159, 43,149, 74, 72,165, 82, 52,105,210, 68,126,251,246,237,171,
+ 41, 41, 41, 41, 53,105, 74, 36,146, 15, 58,116,232, 96,190,103,207, 30,  4,  4,  4,192,210,210, 18, 33, 33, 33,136,140,140,132,
+ 78,167, 99,138,138,138, 96,110,110,142,149, 43, 87,194,221,221, 29,  5,  5,  5, 72, 76, 76,180, 21,  8,  4,118, 85,105,134,156,
+  9, 89,154, 31,123,105, 65, 26, 57,221,107,251,158,125, 24, 55,108, 40,156,232,179,171,150, 13,200,210, 30,253, 59,124, 69,121,
+110,253,100,230,126,214,141,154,245,135, 80, 36,199,212, 57, 75, 16,243,224,152,117, 73, 97,196, 20, 98, 76,114,  3, 48,253, 85,
+ 77, 82, 90, 65,140, 66,161,248,100,235,214,173,230, 21,119,244,101,107, 18,190,104,172,202, 31,149,213,105, 85, 11,166,235,116,
+ 58,232,116, 58, 24,141, 70,100,101,101,161,176,176, 16, 86, 86,101,137,250, 23,  1,  4,132,208, 42, 86,161,127, 81,147, 97,152,
+ 17,251,246,237,115,147, 74,165,175,126,  6,101,209, 65, 72,165, 82,176, 44, 11,157, 78,  7,131,193,  0,141, 70, 35, 15, 10, 10,
+154, 12,224,102,101,154, 60, 30,111,230,164, 73,147, 58, 28, 63,126,220,107,233,210,165,208,233,116,107, 50, 51, 51, 49,126,252,
+120,176, 44,139,142, 29, 59,182,165,148, 62,158, 62,125, 58,  0, 96,241,226,197,250,162,162,162,137,117, 61,150, 28, 29, 29,125,
+251,247,239,239,117,225,194,  5,116,234,212,  9, 26,141,  6, 95,125,245,149,197,234,213,171, 45,246,239,223,111,191, 98,197,138,
+ 95,  0,244,172, 78, 51, 32, 32, 64,144,158,158, 62,119,196,136, 17,179,130,131,131, 45, 19, 19, 19, 97,102,102,134,163, 71,143,
+ 98,235,214,173,167,116, 58,221,130, 67,135, 14, 45,219,182,109, 91,175,  1,  3,  6, 96,235,214,173,211,202,134, 69,176,149,104,
+ 42,220,220,220, 16, 17, 17,  1,107,107,107,216,217,217, 33, 63, 63, 31, 55,110,220,192,173, 91,183,224,227,227,  3, 66,136,117,
+ 89,155,102,120,157,243,168,150, 70,244,255, 93,179,124,134, 26,251,194,177, 75, 41, 45,221,104, 90,247,114, 18, 66,248, 10,133,
+ 98,128,149,149,213, 20, 74, 41, 63, 55, 55,119,171, 84, 42, 61, 24, 27, 27,171,253,255,218,246,127,133,193,114,113, 65, 65, 86,
+150,117,140,131, 83,243,125, 14, 78, 77,203, 82, 85, 51,143,120, 60,235, 24, 71,199,146,  2,  0,208, 25, 40, 66, 31,229, 33,226,
+105, 26, 34,159,166, 65, 38,174,249,174,219,214,214, 22,237,219,183,199,209,163, 71,145,148,148, 36, 95,185,114,101, 35,157, 78,
+167,235,223,191,191,210,195,195, 35,183, 99,199,142, 16,  8,  4,184,125,251, 54, 10, 10, 10,192, 48, 12,196, 98, 49, 88,150,173,
+242, 86,212, 33,215,122,212,168,241,205, 61,237,172, 24, 28,187,118, 26,109,125,  6, 66, 42, 22, 32, 51, 79,  5,  2,130,103,207,
+207,131, 53,200,113, 63, 58, 30,237,253,164,120,167,181,149,107,209,133,156,241,  0,126, 48,165,130,116,113, 33, 16,249, 14,  2,
+216,166,160,185,177, 96, 11, 82, 64,165, 14, 40,102,205,144,165, 76,192,163,171,  7, 64,117, 53, 15, 21, 51, 24, 12, 19, 29, 28,
+ 28,152,  5, 11, 22,244,247,244,244,100,167, 78,157,122,253,249,243,231, 67, 94,252, 76,253,250,245, 15,108,218,180,169, 67, 92,
+ 92, 92,201,210,165, 75,143,101,100,100, 76,170,229,137, 57,151, 16,178, 14,  0,146,146,146,178,255,248,227,143, 78, 87,174, 92,
+ 89,177,110,221, 58,215,169, 83,167,138,167, 78,157, 58, 23,192,164,234,186,  5,101, 98,113,240,178, 43, 87,168, 33, 57, 89,115,
+100,235, 86,222,250,176,176,121, 58,150,173,103,239,224,192, 15,234,212, 73,109,103,101, 85,156,158,150,198, 90, 41, 20,228,121,
+108,172,156, 21,  8,116,167, 79,159, 46,204,201,201,169,114,153, 17, 62,159,175,169,172, 91,176,138, 99,132,173,108,140, 86, 53,
+ 20,176,148,234,172, 60, 61,105,143,110,237, 26, 62,125,252,236,153,196,202,138,215,168, 97,253,198, 15, 31, 61,191, 69,141,  6,
+ 53,128,  2, 19,187,216,134, 46, 90,180,168,185,133,133,  5, 88,150,133,165,165, 37, 50, 51, 51,161,213,106, 81, 80, 80,  0,109,
+ 97, 62,180,249,249,136, 76,120,142, 14, 65, 65,232,209,174,109,147, 19,122,253, 80,  0,123,171,211,181,241,243,175,136, 92, 29,
+240,250, 79,212,242,195,248,188, 10,179,117,178,117,  3,136,228, 50, 52,159,241, 69,157, 79,230,212,212,212,187,238,238,238, 39,
+123,247,238,221,103,194,132,  9, 76, 90, 90,218,105, 71, 71,199, 14,233,233,233, 81,213,125, 79, 46,151, 55, 40, 55, 20,150,150,
+150, 88,191,126, 61, 28, 29, 29, 81, 82, 82,130,219,183,111, 83, 87, 87, 87,114,233,210, 37,184,186,186, 34, 43, 43, 11, 58,157,
+ 14,197,197,197,105, 90,173,182,202,  3,191,172, 27,176,247,204,222,206,167, 30,135,239,232,228, 66,226,110,127, 48,171,243,211,
+199,145,143, 18,207,158,187,254,141, 65, 45, 73,202, 75, 62, 63,215,179,213, 93,187, 41,179,191,198,166, 53,139,240,248,230,149,
+ 28,199,122,  5, 63,152, 17,205,111,109,186, 87, 27, 65, 87, 63,122,244,200,252,254,253,251, 32,132,192,210,210, 18, 82,169,180,
+ 82,147,101, 42, 70,163,177,226,111, 86, 86, 22, 50, 51, 51, 17,155, 16,131, 67, 23,119, 64,111,208,219,253,218,198, 34,205, 75,
+ 40,140,176,203, 39,243,179, 30,208,187, 53,156,135, 91, 63,252,240,195,161, 46, 46, 46,230, 47,190,222,162, 69, 11,140, 24, 49,
+  2, 59,119,238,196,157, 59,119, 42,186, 49, 41,165,200,204,204, 76, 53, 26,141,191, 85,165,153,152,152,152,231,234,234,218,235,
+147, 79, 62,  9, 63,114,228,136,197,183,223,126, 11,163,209,  8,131,193, 80,209, 45, 90,254,119,247,238,221,  8, 15, 15, 95,152,
+150,150,246,168, 46,199,145,147,147,147, 79,255,254,253,175,252,240,195, 15, 86, 25, 25, 25,200,202,202, 66, 81, 81, 17,138,139,
+139, 97, 52, 26, 81,191,126,125, 98, 48, 24, 26,215,212, 29,200, 48,204,209,139, 23, 47,246,106,212,168, 17,  0, 64,175,215, 35,
+ 52, 52, 20,227,199,143,207,150, 74,165, 31,196,199,199, 23, 43, 20,138, 47, 79,156, 56,209,171,101,203,150,240,243,243,115,202,
+200,200, 48,  7,144, 95,197, 13,  4,140, 70, 35, 50, 51, 51,145,153,153,137,159,127,254,207, 58,206, 26,141,166, 44, 56,160, 37,
+173, 90,181,170,127,251,246,237,231,111,107,163, 29,255,251,118,196,207,255, 20, 30, 87, 31,  3,  0,194,125, 75,135, 92,185, 95,
+142, 46, 29,126, 48,106, 84,173,244, 20, 10,133, 45,165,116, 92,112,112,240,140, 94,189,122,217, 43, 20, 10,216,216,216, 32, 50,
+ 50,178,195,153, 51,103,190,119,117,117,253,209,104, 52,254,104, 74,180,158,195,164, 46,194,193, 70, 59,187,131, 89, 41, 41, 34,
+157, 72, 36,141, 41,143,106,149,154,171,193, 70, 96, 15, 12, 58,125,217,  5,130,150, 61, 76,235,214, 80,167,190, 15, 86,245, 39,
+ 28,164,  3,176,109,219, 17,100,100,100,  8,215,175, 95,239,113,228,200, 17,215, 17, 35, 70, 36, 54,108,216, 48, 63, 40, 40,  8,
+ 59,118,236,128,147,147, 19, 52, 26, 13,216,106,196,205,109,140,131,219, 54,111,200,123,146,240,  0,129,222,131, 81, 95,209, 17,
+207, 82,242,145, 83,168, 65,118,190, 10,141,189,103, 35, 61,187,  4,249,197,106, 68, 62,222, 13, 23, 39, 79,134, 39,136,237,101,
+170,193, 82,223,223,  5, 77,228, 62,  8,189,186, 64,212,116, 40,  4,174,237,144, 20, 25,130,123, 39,191, 67,242,195,107,160,172,
+ 17,142, 30, 77, 76,218,118,129, 64,176,228,196,137, 19, 61,150, 47, 95, 46,232,214,173, 91,  7,133, 66,209, 94,169, 84,134,150,
+ 29,228,237,251,244,233,211,193,193,193,  1, 27, 54,108,208, 10,  4,130, 37,117,188,251,121,177, 91,237,146,147,147,211,212,195,
+135, 15,255, 57, 97,194,  4, 56, 59, 59,183,169,238,187,153,  2, 65,139,209,203,151, 83,  1,143, 71, 79,252,242, 11,153,127,242,
+228,198,157,191,255, 46,234,208,161,  3,  8,128,136,200, 72,201,202,245,235,205,134, 14, 24,144, 17,243,252, 57,206, 94,188,168,
+201, 72, 75,203,202, 44, 46,158,243,166,102, 23,213, 22,131,193, 16,150,152,148,232, 18,216,166,165,253,221,232,184,135, 61,187,
+182,111,207, 48, 12,243,248, 89, 66,168,189,189,133,244,234,213, 43, 58,131,193, 16,102,226,254,233,215,177, 99, 71,126,110,110,
+ 46, 20, 10,  5, 50, 51, 51,145,146,146,  2,189, 94, 15,117,126, 46,116,249,249,208, 23,228,193, 88, 92,132,184,219,183,224,235,
+230, 34, 62, 91, 58,  8,126,111, 77,119,156,149, 69,168, 94,140,100,137,205,229, 16,203,229, 47, 45, 78,109,226,197,113,128,133,
+133,197,220,194,194,194,147, 41, 41, 41, 75,181, 90,237,212,229,203,151,183, 90,178,100,137,221,188,121,243, 44,230,204,153,115,
+192,195,195,163,101,124,124,124,149,166,181,168,168, 40,214, 96, 48,216,  1,112,184,112,225,  2, 28, 28, 28,144,159,159, 95,186,
+221,106,181,182,164,164, 68,146,157,157, 13,141, 70,  3,173, 86, 11, 11, 11, 11,220,185,115, 39,215, 96, 48,252, 89, 83,249, 44,
+ 26,144,165, 26, 93,244,  2,219, 38, 50,165,206, 96,221, 57, 35,135,205, 93,244,173,114,  9,128,239,122, 55,104,176, 93,199, 94,
+137,123,242,224,152,245,243,219, 33, 57,202, 39,197, 94,219, 79, 60, 43,172,166, 30, 41, 33,132, 37,132, 80,111,111,111,100,102,
+102,130,199,227, 65, 42,149, 66, 46,151,195,199,199,  7, 73, 73, 73,117, 54, 88,  6,131,161,194, 92,157, 11, 59,142,236,162, 84,
+108, 95,179,  7, 46, 78,110, 12,  0,251,148,180,164,238, 99,103, 13,105,227,217,209,122, 69,220,181,220, 42,199,181, 41,149,202,
+123,  0, 44, 94,190,105,117,233, 98, 99, 99,115, 81,171,213, 34, 62, 62, 30,103,207,158, 13, 74, 78, 78,190, 92,155,125,157,156,
+156,252,204,197,197,165,215,123,239,189,183,163,121,243,230, 13, 40,165,240,241,241,193,128,  1,  3,112,232,208, 33, 68, 69, 69,
+161,160,160,128,189,122,245,234,175,169,169,169,181, 26,144, 67,  8, 33,148, 82,234,236,236,220,184, 95,191,126,215, 54,109,218,
+100,157,149,149,  5,149, 74,133,226,226, 98, 28, 60,120, 16,157, 58,117,130,141,141, 13,254,248,227, 15, 67,121,143, 66, 85,230,
+138, 82,122,244,200,145, 35,189,188,188,188,240,232,209, 35,156, 59,119, 14,158,158,158, 16,  8,  4,232,215,175,159,237,190,125,
+251,166,250,250,250,174, 21,  8,  4,223,244,233,211,  7, 70,163, 17,119,238,220, 73, 77, 72, 72, 40,172,201,  4, 87,134, 74,165,
+  2,165, 20,122,189,126, 61,195, 48, 31,  4,  4,  4,244,  8, 15, 15,191,245,182, 52,212,174,174,174, 77,  5,  2,193,116,107,107,
+107,100,103,101, 33,159,  5,114,114,114, 64, 41, 69, 62, 91, 26,184,146,101,255,167, 87,189, 81,163, 70, 39, 84, 42,213,252,228,
+228,228, 42,215,242,114,113,113,241,147, 74,165, 51,250,247,239, 63,162,111,223,190, 60,189, 94,143, 99,199,142, 97,211,166, 77,
+232,213,171, 23, 26, 54,108,136, 57,115,230, 88,170,213,234,121,167, 79,159,158,219,164, 73,147,211,133,133,133, 95, 84,167,201,
+ 97,146,193, 42, 53, 89, 46, 46,200, 45,187,163,177,179,177,177,217,100, 52, 26,187,  0, 95,193,156,111,137, 71,119,111, 35, 39,
+155,  7,141,202,  8,150,150,154, 44,147,186, 49, 84,127,194,194,155,162, 32,134, 64,175,215,195,209,209, 17, 43, 87,174, 68,126,
+126, 62,127,236,216,177,245,191,254,250,235,123, 90,173, 22,197,197,197, 80,169, 84, 80,169, 84, 48, 26,141, 85, 26, 44,161, 88,
+211,188,158, 99, 35, 20,170, 90, 67, 42, 22, 33,167, 64, 83,106,174,242,212, 56,244,231,135,208,148,168, 96,212,233, 96,208,234,
+ 33,119, 28,136,  6,190, 93,  0, 60,109,102,162, 89, 41,253,203, 26,160,125,122, 14,218,167,231, 32,235,178,  0, 71,151,143,120,
+229,196, 55,109,114, 98, 74, 74, 74,138,139,139,203,206,187,119,239,126,252,193,  7, 31,224,210,165, 75, 95,162,108,102,149, 68,
+ 34,249,242,131, 15, 62,192,221,187,119, 17, 29, 29,189,179,170,174,157,218, 34, 18,137,138,181, 90,109,121, 87,144,180,134,207,
+186,180, 26, 52,136,201,191,123,183, 96,249,197,139,139,126,251,237, 55,209, 59,157, 58, 65,175, 47, 53,211,245,235,215, 71,143,
+158, 61,197,187,246,239,151,171,242,242,110,207,159, 58,245,207,205,163, 70, 21,220, 42, 42,122, 96, 98,125, 54, 41,235, 26,  4,
+165,180, 73, 85,175,213,134,226,226,226,141,243,231,205, 10, 62,120,232,168, 91, 61, 55, 23,139, 51,231, 46,223, 23,155,137, 24,
+175,250, 13,120,133,133,121,252, 77,235,191, 51, 43, 42, 42,250,222, 68,185, 38,118,118,118, 72, 75, 75,195,211,167, 79,161,209,
+104, 74,183,189,164, 24,218,220, 60,104,243,115, 64,212, 42,136,141, 70,168,179,210,225,225,229,  9,252,103,134, 97, 77, 13, 88,
+165,  6,171,252,175,153,133,  5,132, 50, 25,120,  2,129,201, 99,176,156,157,157,  3,252,253,253,247,111,219,182, 77, 56,115,230,
+204, 54, 30, 30, 30,155,210,210,210, 18, 92, 93, 93,187,173, 89,179,230,214,178,101,203,196, 35, 70,140,104,188,117,235,214, 81,
+  0,182, 86,121, 19,161, 86,239, 63,113,226,196,112,119,119,119,135,200,200, 72,168,213,234,242,241,102,  0, 32, 41,255,220,227,
+199,143, 85,106,181, 58,227,193,131,  7,  5,  9,  9,  9, 90,152, 48,235,111,209,  6,101,216,204, 33,174,131, 28,157, 92,110, 72,
+204, 60,234,211,162,187,  3,103, 14,113, 93,179,246, 64,178,250, 84,108,108,225,194, 41, 94, 43,139, 11, 35,166, 88,185, 22,253,
+112,234,216,179, 66, 83, 14,163,178, 25,131,176,181,181,  5,159,207,135, 64, 32, 64,249, 88, 36, 71, 71, 71,228,231,231, 87,219,
+ 69, 88, 85,227, 93, 80, 80,128,252,252,124, 60,121,254,  8,217, 69,169, 56,187, 39, 12, 70,163, 17,106,181,186,212,204, 58,186,
+226,252,222, 91,230, 65,131, 91,205,183,245, 35,151,178, 35,232,109, 83,143, 83,134, 97,102, 12, 26, 52,  8, 58,157, 14,  3,  6,
+ 12,192,158, 61,123,102,  0,184, 92,219,227, 61, 37, 37,229,  6, 33,164,209,211,167, 79, 45,244,122,253,187,253,251,247,255,173,
+ 79,159, 62,  8, 11, 11,195,133, 11, 23,130,180, 90,109,140,209,104, 84, 57, 59, 59,175,112,118,118,118, 32,132,172,168,110,130,
+ 71, 89, 42,134,205, 77,155, 54,125,183, 75,151, 46,247,251,244,233,211,108,211,166, 77, 86, 25, 25, 25,229,147, 26,144,156,156,
+140,147, 39, 79,166, 30, 59,118,172,128,101, 89, 91,134, 97, 78,100,101,101,125, 81, 85,183,160, 78,167, 59,114,236,216,177, 94,
+ 94, 94, 94,184,124,249, 50,150, 47, 95,142,230,205,155,227,196,137, 19,240,240,240,128,143,143, 15,108,108,108,166, 23, 20, 20,
+180, 91,189,122,117, 31,127,127,127, 28, 57,114,  4,233,233,233,223, 87,151,178,193, 96, 48,212,104,176,186,118,237, 58,126,230,
+204,153,232,223,191,255,217,192,192,192,214,119,238,220,249,159, 79,211,162, 80, 40, 86,  6,  7,  7,207,109,209,162,  5,126,255,
+253,119,168,  3, 58, 64,246,235, 49, 60,232,215,  1, 20,128,226,215,163,160,148,226,225,128,119, 64,  1,212,239, 54, 24,115,231,
+206,237, 51,112,224,192,122,168, 98,120,132, 66,161,248,246,163,143, 62,154, 53,114,228, 72,132,135,135, 99,235,214,173,184,119,
+239, 94, 69,155,167,215,235, 17, 29, 29,141,232,232,104, 56, 59, 59,163, 95,191,126,100,194,132,  9,189,123,247,238,109, 15, 32,
+ 16, 28,175,107,176, 42,194,197,118,214,214,214, 15,127,248,225,  7,219,214,173, 91,243, 12,  6,  3, 46,133,132, 96,241, 87,179,
+208,187,231,199,208,177,150, 48,104,133, 96,133, 18,211,126, 81,220, 15,  5, 49,  4,172,176, 15,180, 90, 45,198,237, 22,192,138,
+100, 96,253,104, 71,  0, 32,106,181,186,194, 88,149,223, 61, 85, 23,193, 42,204,151,233,244,122, 10,101, 70,  2,146, 83, 31,194,
+ 66,238,  6,202,115, 67, 70, 78,  9,  8, 28, 97,208,196,192,168, 47, 53, 64, 26, 85, 50, 74,180,228,181, 42,204,152,243,215,217,
+192, 70,131,233, 99, 42, 41,165, 27,118,237,218, 53,124,237,218,181,226,190,125,251,250, 57, 59, 59,247,  0,128, 33, 67,134,248,
+ 89, 88, 88, 96,215,174, 93, 26, 74,233,134, 55, 24,225,121, 47, 48, 48, 16, 57, 57, 57,136,143,143, 15,173,118,219,180, 90, 91,
+185,131,  3, 47,227,210, 37,125, 78, 97, 97,189, 78,101,230,138, 97, 24,228,230,230,226,249,243,231,144,203,100,120, 16, 21, 37,
+254,110,210,164, 93, 62,126,126, 76,249, 12, 67, 83, 56,118,236,152, 57,128,182, 53,189, 86, 27, 50, 51, 51,139,157,156,156,198,
+124, 57,127,254,145,239,191,255,222, 50, 61, 35, 61, 70, 44, 18, 25,228,114,137, 98,250,244,201,252,130,130,130,225, 89, 89, 89,
+ 69,166,234,229,230,230, 34, 46, 46, 14,102,102,102, 16, 10,  4, 96, 85, 37, 48, 22, 23, 65,157,147,  9,158, 78, 11,145,209,  8,
+ 27,169, 24,110,142,142,168,103,111,103, 90,215,221,165,179, 21,  3,218, 95,236, 22, 60,221,190, 49,196,114, 25,196,114, 57, 58,
+252, 81, 58,132, 77, 40, 20,  2,235,183,153,210,141, 99,167, 80, 40,254,220,180,105,147, 48, 59, 59, 27, 15, 31, 62,188, 31, 31,
+ 31,159,111, 99, 99, 99, 46, 16,  8,216, 39, 79,158,156,127,244,232, 81, 63, 79, 79, 79, 80, 74,107,154,253,245,221,225,195,135,
+187,119,236,216,209, 80,191,126,125, 89, 70, 70, 70,189,252,252,124,146,154,250,242, 24,230,219,183,111, 75, 18, 19, 19,139, 89,
+150, 61,130,210, 60, 88, 53, 30,248, 51,135,184, 74, 66,239, 98, 90,231,158, 30,205, 45,236,252,144, 99,184,219,252,198,253,212,
+105, 51,135,184,110, 92,123, 32, 89,109, 70, 52,191, 17, 99,146, 27, 95,162,222, 97,226,249, 67,125,125,125, 65, 41,197,173, 91,
+183,112,237,218, 53, 92,185,114,  5,  9,  9,  9, 21,159,177,180,180,196,185,115,231,208,165, 75, 23,147,143,163,146,146, 18, 56,
+ 59, 59,195,218,218, 26,135, 47,237,196,246, 53,123, 42,  6,186,151,147,149,149,  5,169, 84,138,101,159,175,149,143,157, 51,248,
+ 27,  0, 61, 76,209,118,115,115,243,236,208,161, 67, 95, 71, 71, 71,228,230,230,194,193,193,  1,173, 90,181,234,239,232,232, 88,
+ 63, 61, 61,189, 78, 93, 89, 90,173,118,114,151, 46, 93,150,126,254,249,231, 48, 24, 12,248,240,195, 15, 17, 23, 23,183,255,217,
+179,103,235,221,221,221,167, 77,153, 50,197,209,206,206, 14,147, 39, 79,150,  1, 24, 84,141,193, 90,177,122,245,234,225,193,193,
+193,140, 94,175,127,231,194,133, 11,136,143,143,135, 86,171,133,193, 96, 64,124,124, 60, 22, 45, 90,148, 90, 80, 80,208, 57, 57,
+ 57, 57,182,166,114,165,165,165,205,250,227,143, 63,250,120,123,123,227,204,153, 51,152, 56,113,226,  9, 11, 11,139,166,126,126,
+126,245,234,213,171,135, 63,255,252, 19,102,102,102,112,118,118,118,156, 55,111, 94,191,158, 61,123,226,252,249,243, 88,178,100,
+201,113, 39, 39,167,239,106, 50,193,124, 62, 31,122,253,203, 55,180, 60, 30, 15,247,238,221, 67,215,174, 93, 49,119,238, 92,  0,
+192,249,243,231, 45,122,244,232,241, 32, 40, 40,200, 34, 36, 36, 68,131,255, 97,100, 50,217,152, 95,127,253, 21, 79,159, 62,197,
+213,171, 87,145,149,149,  5,173, 86,139,188, 50, 43, 42, 46,139,100, 81, 23,119,180,159, 53, 31,195,250, 13, 66,106,106, 42, 24,
+134,177,171,230,134,111,196,252,249,243,113,234,212, 41,172, 90,181, 10,249,249,249,149,126,206,204,204, 12,173, 90,181, 66,203,
+150, 45, 17, 23, 23,  7,  0,118,224,120,115,  6,203,218,218,122,253,230,205,155,109, 59,116,232,192, 43, 51, 59,104,221,170, 21,
+ 70,141, 25,131,115,135,143,195,193,187, 23,136, 86, 14,131, 84,100, 90,  4,203, 98,  7,178,245,217,144,  8, 37, 16,107,181, 96,
+ 89, 51, 68, 36,171, 43, 92,179, 74,165, 66,185,201, 42, 46, 46,134, 76, 38,171,222, 64,104, 69,225,209,113,  6,183,252,194,123,
+184,113,119, 39,244, 90, 61, 26,120,207,135, 74,111, 11,153,253,199, 80,107,255,132, 49,175,116,230,174,200, 34,  8,105,105, 89,
+  0,136,169, 17,151,191,158,228,133,127, 29,236,206, 26, 77,207,187,170, 84, 42,179, 21, 10,197,214,208,208,208,233,131,  6, 13,
+194,185,115,231,230,  3,192,160, 65,131, 16, 26, 26,138,184,184,184,173, 74,101,229, 51,168,106,139,139,139,203,168,206,157, 59,
+ 79,105,221,186, 53,142, 31, 63, 14,163,209,120,210,148,239,241,  4,  2, 74,  8, 65,249, 12,167,156,220, 92, 60,126,252, 24, 57,
+217,217, 48, 26,141, 40, 81,169, 12, 77, 27, 55, 46,160, 44,107, 94,155,242,188, 56, 99,176,178, 89,132,229,175,213,118, 59,211,
+210,210, 18, 26, 52,104,144, 88, 82, 82,108,111,109,101, 93, 40, 18,137,140,  5,133,133,249, 79, 99, 30,105, 77,105, 20, 94, 32,
+ 58, 42, 42,170, 89,114,114, 50, 18, 19, 19, 97, 40, 46,  4, 79,163,  5,163, 41, 65,183,246,237, 96,  6, 10,  9, 88,  8, 88, 61,
+  4, 60,  1, 10, 75,103,219, 69,215,120,204,191,208, 32,148,155, 43, 66,  8, 36,114, 57, 68,114, 25,196,230,242,151, 34, 90,166,
+ 76,252, 50, 51, 51,219,189,117,235, 86,103, 39, 39, 39,172, 93,187, 22,206,206,206, 62,193,193,193, 37,157, 59,119, 54,179,179,
+179,131,183,183, 55,  2,  3,  3,113,233,210, 37, 16, 66, 98,107, 56,206, 13,132,144, 30, 87,175, 94,157,117,253,250,245, 33, 10,
+133,130,140, 28, 57, 18,189,122,245,130, 68, 34, 65, 73, 73,  9,114,115,115,113,226,196,  9, 98, 52, 26,253,203, 12,158,187,135,
+135,199, 30, 66, 72,242,243,231,207, 63,120, 85,115,231, 58, 63, 69, 70, 14,251,177,163,147,203,192,206, 61, 61,154,119,237, 25,
+ 12,207, 70, 93,209,181,103, 34,  0,172,180,225,199,127,184,102, 65,179, 35,118,110, 54,191,156, 61,125,110, 81,199,206, 93,191,
+156, 55,193,122,233,202,173,185, 53,142,151, 35,132, 84, 52,182, 12,195, 84, 26,165,226,243,249, 21,179,205,106,188,105, 98,141,
+201,189, 70,183,171,120,174, 55,232,237, 92,156,220,152,242,200, 21,  0,228,231,231, 35, 41, 41,  9,122,189, 30,182,182,182,208,
+235,117,126,181,232,126,156, 54,116,232, 80,162, 86,171, 49,107,214, 44,124,251,237,183, 24, 48, 96,  0,185,121,243,230, 52,  0,
+ 51,234, 16,209, 88, 51,101,202,148, 89, 99,198,140, 65, 94, 94, 30, 46, 94,188,136, 46, 93,186, 96,203,150, 45,246, 23, 47, 94,
+ 92,222,190,125,123,240,120, 60,156, 59,119, 14, 58,157,238,113,181, 13,  0,159,255,110,112,112, 48,147,148,148,  4,161, 80,136,
+192,192, 64, 36, 39, 39,163,164,164,  4, 25, 25, 25,248,250,235,175,211,242,243,243,131, 82, 82, 82, 98, 77,216, 47, 76,135, 14,
+ 29,166, 55,108,216, 16, 23, 47, 94,196,164, 73,147, 78,201,100,178, 65,217,217,217, 19,212,106,245,198,161, 67,135,194,199,199,
+  7, 49, 49, 49,232,219,183, 47, 90,181,106,133,139, 23, 47, 98,206,156, 57, 39,164, 82,233,251, 53,228,193,122, 18, 18, 18,210,
+ 44, 48, 48, 16, 37, 37, 37, 40, 40, 40,128, 64, 32,128,149,149, 21,162,163,163,209,168, 81, 35,204,157, 59, 23,107,215,174,197,
+204,153, 51,217, 30, 61,122, 24,116, 58,157, 80, 36, 18,253,207, 55,210,197,197,197, 52, 53, 53, 21, 22, 22, 22, 56,112,224,  0,
+ 34,207,159,193,201, 79, 63,134,100,193, 26, 80, 74,145,180,116, 30,186,205, 89,128,182,247,159, 33, 53, 53, 21, 59,118,236,  0,
+195, 48, 21, 51, 98,171,106,219,242,243,243,209,178,101, 75,220,186,117, 11, 59,118,236,192,186,117,235, 42,162,181,  2,129,  0,
+ 65, 65, 65,232,222,189, 59,158, 60,121,130,173, 91,183,194,194,194,130,115, 76,111,218, 96,177, 44,219,181, 85,171, 86,188,162,
+162, 34,168,213,106,164,165,165, 33, 62, 62, 30,102, 82, 51, 36,101,165,160,133,191, 14,105,108,  1,162,239, 63, 52, 18,158,224,
+ 94, 77,119, 32, 90,173, 22, 90,173, 22, 17, 17, 17,165, 83,223, 27,173,168, 24,232,169,215,235,161,209,104,160, 82,169,112,241,
+226, 69, 42, 22,139, 33,147,201, 72,117,125,239,172, 65,115,234,226,181,251,125, 70, 12,236, 34, 58, 23,178, 29,122, 45,139,  2,
+181,  5,138, 84, 26, 20,169,  5,208,136,123,130,144,171, 96,120, 98,180,111,217, 16, 23,175,197,168,141,122,157, 73,233, 10,192,
+ 26,193,119,246,131, 33, 53,226, 63, 47,189, 50,155, 80, 40,149,131, 53,214,110, 86,176,153,153,217,150,221,187,119,143,105,215,
+174,157,121,112,112,112, 35,  0, 16,139,197,236,238,221,187, 11,205,204,204,182,212,118, 39,190,154,189,221,217,217,185,163, 72,
+ 36,154,218,191,127,255,142, 99,198,140,193,195,135, 15,241,251,239,191,223, 87, 40, 20,213,142,153,225,137, 68,217, 69, 25, 25,
+ 86,242,250,245,249, 86,230,230,202, 51,103,206,120,188,211,185, 51, 18,226,227,145,147,147,  3,149, 74,133,168,232,104, 42,100,
+152, 68, 98, 97,193, 60,190,123,151,225,137, 68,217,181, 40,103,116, 77,179,  8,235, 26,205,146,153,145,  6, 11,230, 78,240, 84,
+171,213,205, 10, 10, 10, 12,  2,129, 64, 32, 21,209,132,218,104,232,245,250,227, 87,175, 94,125,175, 67,135, 14,226,152,136,123,
+ 48,228,231, 67,155,159, 11, 33,107,132,141,127, 11,240,116, 26, 64,171,135, 75, 19, 10,117,158, 20,215,239, 61,211,235,245,250,
+227,166, 26, 44,134,199,123,121,220,149,133, 28, 98,115,115,136,228,242,151, 94, 39, 53,244,107, 57, 58, 58, 74,123,247,238,221,
+205,223,191, 52,167,214,154, 53,107,160,211,233, 68,122,189,190, 98, 38, 92, 81, 81, 17, 14, 30, 60,136,157, 59,119, 94,183,180,
+180,252,213,132,155,  9,131,171,171,235, 84,150,101, 29, 12,  6,131,206,222,222, 94,184,127,255,126, 72, 36, 18, 48, 12,131,150,
+ 45, 91, 66, 34,145,104, 20, 10,133,174,172, 12,250,181,107,215,242, 63,254,248, 99, 97,101,122,141,155,251,204,246, 52, 88,119,
+150,152,121,212,183,176,243,131,103,163,174,  0,128,238,253,198,194,179, 97, 61, 20,100, 69,212, 87,171,226,  7, 10,249,185,214,
+ 15, 55,166, 68,153,245,109, 54,166, 56, 35,228,  9,128,159, 76, 58, 53, 89, 22,193,193,193,232,217,179,103, 69,119,160,131,131,
+  3,180, 90, 45,140, 70, 99,173,198,178,149, 39, 17,253,250,107,194, 96, 17,240,107, 27,139, 52,  0,246, 47,154,171,196,196, 68,
+ 36, 38, 38, 86,220,  8,178,212,180, 20, 42, 10,133,194,204,211,211,115,116,179,102,205,112,225,194,  5, 68, 68, 68,164,132,132,
+132,184,180,110,221, 26,174,174,174, 99, 20, 10,197,124,165, 82,105,114, 66,101,123,123,123, 89,167, 78,157, 62, 29, 51,102, 12,
+ 30, 61,122,132,121,243,230,101,167,166,166, 30, 57,118,236,216, 39,159,125,246, 25,211,185,115,103,100,100,100, 96,203,150, 45,
+198, 91,183,110,125,107,109,109,189,164,134,253,254, 72,169, 84,186,170,213,106,228,228,228,192, 96, 48,160,164,164,  4,167, 79,
+159,198,153, 51,103,210,243,242,242,130,148, 74,229, 83, 83,202,230,238,238,110, 30, 24, 24,232,248,228,201, 19,236,217,179,  7,
+ 58,157,110, 65,124,124,188,206,210,210,114,215,242,229,203, 23, 89, 90, 90,218,  4,  7,  7,163,252,184,253,243,207, 63,177,120,
+241,226, 19,102,102,102,131,162,162,162,116, 53,200, 15,252,230,155,111,190,177,179,179,251, 96,248,240,225, 76, 96, 96, 32,238,
+220,185,  3,163,209,136,110,221,186, 85,152,171,211,167, 79,239, 62,125,250,244, 96,  0, 66,185, 92, 46,249, 95,143, 94,149,163,
+ 86,171, 17, 19, 19,  3, 71, 71, 71, 52,108,221, 14,115, 31, 60,199,213,208, 48, 80, 74,209,241,225,115, 20, 21, 21,227,215, 95,
+127, 69,120,120, 56,120, 60, 30,188,188,188,106,212,212,233,116,120,250,244, 41, 50, 51, 51, 49, 96,192,  0,140, 24, 49,  2,171,
+ 87,175,134, 78,167,195,151, 95,126,137,156,156, 28,108,219,182, 13, 79,159, 62,  5,159,207,135, 92, 46,231, 28,211,155, 54, 88,
+101,221, 76, 96, 89, 22, 41, 41, 41,184,115,231, 14,158, 63,127, 14,153, 76,  6,149,193,200,110, 57,127,141, 37, 68,152,204, 82,
+122,157, 26, 74,179,136, 87,231,196,245,122, 61,225,243,249,  8, 13, 13,197,179,103,207, 96,222,144, 86,152,171,242,  8, 86, 73,
+ 73,  9,  4,  2, 65, 81, 88, 88, 88,124,120,120,184, 39,159,207,215, 86,165,153, 97,157,187,227,220,133,243,179,  3, 90,250, 54,
+234,222,121, 49,142, 31, 95,132,220,252,  2,148,104,  5, 40, 84,233, 80,172,162,112,177,104,132,214,126,126,200,204,209,226,201,
+195,240,228, 44,161, 77,141,125, 48,122,202,228,239, 94, 57,209,242,221, 17,147, 96,230,241, 14, 52, 15, 15,128, 45, 76,  3, 91,
+ 88,218,109, 34,146, 89,192,220,206, 13, 69, 37,106, 92,123,240, 12,122,202,228,155, 90,233,177,177,177,133, 10,133, 98,227,204,
+153, 51, 87,133,133,133,202,  0,224,222,189,123,197, 74,165,114,169, 82,169, 44,172,205, 14,124, 33,123, 59,145,201,100, 79, 26,
+ 54,108,168,239,219,183,175,237,192,129,  3, 97,103,103,135,187,119,239, 98,229,202,149,119,139,139,139,135,197,199,199,235,107,
+232,118, 72,  9,255,227, 15,139,160,145, 35,173,230, 13, 24,176,114,242,228,201,223, 47, 89,178, 68,216,160, 97, 67,176, 70, 35,
+162,162,162,232,174, 93,187, 12, 63, 45, 92,184, 70, 36,147,241,111, 29, 61, 42, 48,104, 52, 41,255,237,131,216,213,213,181,115,
+159, 94,157,155,124,187,118, 35,212,170, 34,220, 12, 61,129,220,220, 76,108,221,118,184,137,171,171,107,103, 83,  7, 19, 39, 39,
+ 39,239, 59,116,232,208, 44, 63,223, 38,254, 94,110,110,136, 76,120, 14, 17,107,132,208, 96,  0, 79,167,  1, 99, 80,195,173, 25,
+  5, 97,204,145,150, 86,136, 45,103, 46, 62, 72, 78, 78,222, 87, 99, 36,177,247,187, 24,150,144, 15, 66,  8,206,118,242,133,196,
+ 92, 14,145, 76,134,246,135, 46, 87,152,170,132, 21,159, 67, 32,147,195,186,245, 59, 53,150, 51, 61, 61,189,164, 97,195,134,119,
+ 30, 61,122,212,170,113,227,198,248,250,235,175,145,148,148,  4, 74, 41, 50, 50, 50,212,153,153,153, 41,217,217,217,241,132,144,
+ 35, 74,165,114,187,169, 75,145,176, 44,235,112,236,216, 49,  0, 16,  2,192,133, 11, 23,160, 80, 40, 96,105,105,137,130,130,  2,
+140, 28, 57, 82,252,213, 87, 95,  1,  0,238,220,185, 35, 48, 51, 51,171, 82, 43, 50, 60,250,219,188, 66,154, 75,139,238, 14,204,
+ 49,220,109,222,181,103, 18,186,247, 27,131,115,199,127,197,197, 51,231, 97,195,143,127, 14, 89,225,169,172,231, 89,  5,201,197,
+141,126,108, 18,240,  9, 47,181,248,204,143,211,  6, 88,243,156,157,217,  3,243, 54, 87,157,184,183,252, 14,156,199,227, 85,140,
+193, 42, 31,208, 94, 91,115,245, 34,139, 22, 81,150,128, 16, 47,161, 48, 34, 37, 45,169,187,194,209, 21,233,233,233, 72, 74, 74,
+ 66, 98, 98, 34,146,146,146,208,176, 97, 67, 60, 79,120,  6,145, 72,120,207,196, 40,248,240,254,253,251,155,107,181, 90,252,241,
+199, 31,  6, 66, 72,191, 99,199,142,221,105,209,162,  5,191, 75,151, 46,230,191,254,250,235,112,  0,219,107,115, 47, 33,151,203,
+133, 58,157, 14,191,253,246, 27,146,147,147, 59,167,165,165, 69, 43, 20,138, 31, 39, 78,156,184,185, 73,147, 38, 13,163,163,163,
+159,168, 84,170,201, 74,165, 50,162, 38,177,188,188,188,177,189,122,245, 58,192,178,172,123,199,142, 29,101,139, 22, 45,178,120,
+252,248, 49, 60, 60, 60, 64, 41,141,172,205, 82, 83,  9,  9,  9,133,215,174, 93, 75,111,218,180,169,163,179,179, 51,132, 66,225,
+ 74,103,103,231,165,114,185,252,219, 46, 93,186,216,236,218,181, 11,103,206,156,129, 64, 32,192,179,103,207,148,143, 30, 61, 90,
+239,228,228,180,193,148, 12,238,225,225,225,113,  0,134,181,110,221,122,241,186,117,235, 22, 48, 12,243,209,217,179,103, 33, 16,
+  8,  0,160,194, 92,213,175, 95,127,212,129,  3,  7, 70,188,101,237,180, 94,171,213,194,214,214, 22,153,153,153,200,200,200, 64,
+189,122,245,208,174, 93, 59,232,245,122, 28, 61,126,  2, 87,175, 94,  5,165, 20,118,118,118,176,180,180,196,253,251,247,  1,160,
+186,217,195,122,157, 78,  7, 27, 27, 27,228,229,229,225,254,253,251,112,112,112,192,204,153, 51,161,213,106,177,127,255,126,220,
+187,119, 15, 12,195,192,193,193,  1,230,230,230,166,104,114,212,214, 96,241,120,188, 75,151, 46, 93, 26,236,231,231,199,127,250,
+244, 41,158, 62, 45,189,153, 81,169, 84,  6, 62, 15,  7,211, 35,254, 24, 86, 77,227, 31,252, 98,174, 12,145, 72,180,101,240,224,
+193,147,199,142, 29,139,169, 83,167,130, 16,130, 95,238,105,145,152,200, 66,175,215, 35, 61, 61, 29,145,145,145,180, 85,171, 86,
+132,101, 89, 93, 80, 80,208,184,240,240,240,214, 60, 30,175,160, 42, 77, 26, 18, 98,112,108, 62,240,253, 31,182,108,191, 60,122,
+244,104,155,254,  3,126,192,189,232, 40,228,151,216,  3,148,194,197, 94,142,214,222,159, 35, 35, 91,141, 51,167,142,231,178,  6,
+245,251,244,193, 94,125,117,229,  4,128, 76,190,202,225,199,157,135,214,236, 61,112,120,220,248, 49,195, 37, 65,193, 35, 33,204,
+138,132, 65, 25, 14, 23,223,142,160,124, 51,220, 10,191,139,136,167, 73,234, 18, 29,111,123,129, 80, 53,187, 38,205, 23,201,205,
+205, 61,153,150,150,250, 67,249,228,  0,134, 33, 50,145, 72,124,178,  6, 51, 21,252, 74, 94,160, 87, 51,196,123,175, 88,177, 34,
+195,214,214,150,125,248,240, 33,182,108,217, 98,188,115,231,206, 33,150,101, 23,100,101,101,149,212,164,105,175,215,223,223, 61,
+111,158,111,235, 65,131,232,192,113,227,212,140, 68, 50,121,229,218,181,243,179,243,243, 93,  0,192,198,202, 42,105,235,226,197,
+ 75,122,247,233, 83,248,240,218, 53,179,208, 63,254, 48, 19, 25, 12,225, 53,149,243, 77, 80,157,102,114,114,242,229, 70, 13,234,
+225,183,237,107,161,211,105,144,154, 82, 26,184,202,202,206, 71,117,230,234, 47,199, 82,233, 44,170, 65,235,214,111,184, 49,105,
+228, 71, 78,239,116, 11, 70,226,253,123,208,229,100,130,232, 13, 16, 16, 62,138, 51,164,200, 72, 47,194,138,147,231, 51, 84,106,
+245,160, 87, 19, 57, 86, 85,206,138,110, 65, 11,115,136,100,165,227,174, 94,140, 90,  9,205, 45, 32,144,201,193, 19, 10, 43, 27,
+ 12, 31, 92, 73, 78,185,247,199,143, 31, 31,113,242,228, 73,235, 97,195,134,225,221,119,223,189,155,151,151,215, 37, 39, 39,167,
+176,174,245,201, 48, 76, 70,159, 62,125, 28,180, 90,173, 97,232,208,161,252,172,172, 44,148, 79,177, 47, 42, 42,194,169, 83,167,
+208,184,113,233,236,252,135, 15, 31,162,105,211,166, 85,106,126, 50, 39, 50,  5,192,146,153, 67, 92,215,220,184,159, 58, 13,192,
+ 74,207,134,110,184,120,230, 60,174, 94, 12,157,215,182, 25,187,177,207,136, 86,223, 72,187,124, 48,187, 73,192, 39, 60,185,133,
+ 51,118, 28, 62,196,139, 14,255,105, 89, 73, 73,100,  3,  0,159, 87, 85,206,242,238,235, 87, 83, 50,168, 84, 42,147,204, 85,117,
+199, 18,  5,165,118,249,100,254,216, 89, 67,218,156,219,115,211, 92, 46,151, 67,167,211,129, 82,138,  6, 13, 26,128, 47,224,227,
+231, 35,223, 23,231,229,101, 45, 52, 69, 83, 38,147, 77, 13, 10, 10, 66,108,108, 44, 34, 34, 34, 14, 41,149,202,  8,133, 66,113,
+ 40, 46, 46,110,104,155, 54,109,176,111,223,190,169, 85, 25,172,170, 52,203, 51,214, 83, 74, 97, 52, 26,115,  0, 64,169, 84,222,
+ 55, 37,250,251,170,102, 89,178,208, 14,  0,208,164, 73,147, 36, 71, 71, 71,139,251,247,239,195,217,217, 25, 58,157,174, 77,109,
+142, 37, 74, 41,171, 80, 40, 54,220,186,117,107, 69,203,150, 45,241,225,135, 31,118,191,115,231, 78,247, 22, 45, 90,192,203,203,
+ 11,215,175, 95,199,217,179,103,127,103, 89,118, 98,106,106,170,186,186, 36,168, 85,109,251,173, 91,183,158,  2, 24, 25, 16, 16,
+240,  1,159,207,135,133,133,  5, 47, 37, 37,133,119,246,236, 89,  0, 24,127,224,192,  1, 99, 93,246,251,223,113, 93,122, 83,154,
+132,144, 47, 71,141, 26,245,227,132,  9, 19, 36,109,218,180,121, 41,162,122,242,228, 73,176, 44, 11, 91, 91, 91,216,218,218,226,
+233,211,167, 56,114,228,136, 54, 63, 63,127,189, 80, 40, 92, 89,157,230,200,145, 35,127,156, 48, 97,130,164,117,235,214,200,207,
+207,175, 48,111,199,143, 31,  7, 33,  4,118,118,118,176,181,181,197,147, 39, 79,112,228,200, 17,117,110,110,238, 90,173, 86,187,
+250,239,220,246,127,157,193,202,201,201,153,254,197, 23, 95,116, 25, 55,110,156,109,113,113, 49,207,214,214, 22,105,105,105,134,
+211,167, 79,231, 20, 22, 22, 78,175,205,143,133,134,134, 78,233,215,175,223,250, 95,126,249,101,219,246,237,219, 59, 15, 29, 58,
+ 20, 35,251,246,197,164,182, 82,104, 52, 26, 16, 66,112,230,204,153,199,151, 46, 93,242, 20, 10,133,154, 69,139, 22,177,  0,110,
+212,120, 71, 31,121, 36,202,177,249,192,206, 27,191,223,124,208, 63,176,173,187, 71,125, 15,113,123, 87, 75,232,244, 70,164,103,
+100,227,114,232, 67, 77, 76,212,189, 20,170,211,189,159, 17, 85,115, 22,119,  0,136,138,162, 58,  0,211,125,125, 45,190, 94,253,
+227,174, 45, 59,247, 28, 28, 56,126,196, 32,190,127,139,110,136, 11, 61,130, 43, 55, 46, 26,114,213,244, 72,161,128, 55, 41,234,
+105, 65,110,109, 43, 94,163,209,104,  9,  1,197,127,178,175, 83,141, 70,163,173,203,249,248,226,147,159,127,254, 25,169,169,169,
+154,132,132,132,189,148,210, 31, 83, 83, 83, 77, 78,159,176,145, 82,237, 32, 66,206, 47,232,216,177,215,130, 51,103, 36, 67, 62,
+253, 84, 59,240,253,247,103, 67,163,209, 65, 36,162,124,153,140,129, 88, 44,120,120,237,154,217,134, 73,147,108,136, 86,123,238,
+ 87, 74, 77, 14,193,255, 29,179,  8, 95,136, 96, 97,244, 39,159, 65,245, 66,  4, 43,236,118, 12,106, 19,193,  2,128,212,212,212,
+ 68,103,103,231,182, 75, 55,108, 60,220,187,109,235, 38,141, 20,206, 98,219,250, 30,144, 59, 57, 33, 39, 43, 11, 55,239,197,234,
+191, 63,127,249,129, 74,173, 30,100,106, 94, 24,150,101, 43,102,185,249,126, 58, 23, 12,143, 87, 97,  4,202,147,  6, 90,  4,118,
+  4,225,243, 97,164, 20, 58,157,174,198, 65, 88, 74,165, 50,217,197,197,229,253, 79, 63,253,244,194,111,191,253,198,  4,  5,  5,
+181,252,243,207, 63, 95,107,209,220,228,228,100,215,178,110,173,  2, 11, 11, 11,254,152, 49, 99,160,215,235, 81, 82, 82,130,252,
+252,124,100,103,103,107,102,204,152, 33,  6,  0,161, 80,168,239,213,171, 87,141,215,143,181,  7,146,213, 51,135,184,110,180,225,
+199,127, 88,144, 21, 81,223,134, 31,255,188,109, 51,118,227,218,  3,201,234,175, 63,179, 90,154, 21,127, 57, 38,181,248,204,143,
+ 59, 14, 31,226,141, 26,248,190,209, 85,254,100,158,196,129, 30,236,218,191,198, 70,232, 47, 73, 69,235, 26,185,122,149,172,  7,
+244,174,103, 71,235, 21, 93,134,180,158,191,116,214, 90,185,131,131, 61, 12, 70,  3,158, 39,198,225,151,195,155,138, 11, 53,185,
+203,178,163,232, 29, 83,180, 60, 61, 61,235,243,120, 60, 28, 61,122, 20,  0, 54,149,189,188,233,244,233,211, 67,135, 13, 27,  6,
+119,119,119, 95, 15, 15, 15,113,117,105, 52, 42,139,222,233,245,122,188,233,117,173,  9, 33,207,182,108,217,226, 98, 99, 99, 67,
+174, 94,189,106, 96, 24,230, 88,109, 53,156,156,156,190, 59,113,226, 68, 39, 74,105, 47,127,127,127,184,187,187,151, 93, 79,163,
+112,245,234,213, 61, 41, 41, 41,163,223,208,226,206,148, 16,130,130,130,130,242,129,118, 58,185, 92,254, 86, 46, 26,157,146,146,
+178,211,209,209,241,204,226,197,139,191,106,208,160,193,196,241,227,199,243,188,189,189,145,159,159, 15, 11, 11, 11, 40, 20, 10,
+164,164,164, 96,231,206,157,198,140,140,140, 95, 24,134,249, 90,169, 84, 42,235,170,105,109,109, 13,103,103,103, 36, 39, 39,151,
+107,110,211,235,245, 75, 50, 51, 51,211,193,241,102, 13, 86, 90, 90, 90,150,147,147, 83,211,159,127,254,121, 67,105,154,134,210,
+168, 86, 97, 97,225,244,180,210, 17,227,181,226,248,241,227,177,  0,130,250,245,235,215,224,224,193,131,219,118,239,222,221,121,
+192,128,  1, 24, 58,116, 40, 12,  6,  3,122,247,238, 61,250,213,168,149, 41,164, 71, 30,137, 34, 65, 65, 77,239,220,188, 50,242,
+238,157, 27,253, 40,165,126,  0,  8, 97,152,255, 44,246, 28, 85,251,197,158,163,162, 10,114,  1,124,224,239,106,225,181,108,211,
+174,237,102,124,182,163,202,192, 92, 83,105,152,113,119,147, 11,234,188,192,104, 89,230,245, 85, 12, 67,230,148, 62, 55,109,105,
+152, 42, 52,230,  2,  0,159, 47,216,119,231,206,157,249,  9,  9,  9, 41,166,204,240,170,140,195,148, 38,142, 36,228,236,108, 63,
+191,110,253,102,204, 16,  4,244,232, 97,110,227,230,198, 82, 74,141,207,111,222, 36, 97, 71,143, 10,194,142, 30,149,232, 53,154,
+ 11,  7, 40,173,213, 12,168,191, 99, 22, 97,121,  4,171,129,151,235,217,193,131,250,244,240,170,175,  0,  0, 60,123,174, 68, 86,
+ 78,254,217,218,230, 26, 42, 55, 89,132,144,192, 63, 13,134,161,  2,129,160, 31, 41, 75,197, 64,235,176,216,179,209,104, 76,110,
+219,182,138,205, 91,180,178, 42, 67,150,110,226,133, 55, 68,161, 80,124,212,190,125,251,149, 74,165,242,112,102,102,102,241, 27,
+186, 46,244,222,189,123,247, 73,150,101,205, 94,137,112, 21, 40,149, 74,243,178,134,212,253,244,233,211,123,  8, 33, 53, 26,248,
+181,  7,146,213,107, 22, 52, 59,162, 86,197, 15, 36,242,146, 35,107, 55,148,206,106, 89,180, 46, 47, 31,192, 79,211,  6,218,176,
+209,225, 63,173,118,177,120, 50,103,195,145,156, 95,106,210, 99, 24,230, 73,155, 54,109, 42,140, 86, 13,245,175,172, 75,  5,196,
+ 93,203, 93,105,235, 71, 46,125, 60,119,240, 55, 90,157,174,  5, 67, 64,  5, 66,225,253,188,188,172,133,166,154,171, 50, 99,241,
+195,172, 89,179,166,199,198,198,238, 41,207,121,167, 84, 42, 67, 21, 10,197,119,137,137,137, 83,146,146,146, 54, 37, 37, 37,153,
+108,174,228,114,185, 90,165, 82,177,  6,131,129,209,104, 52, 16,137, 68,186, 55,213, 24, 20, 23, 23, 15,223,188,121,243,207,122,
+189,190,  9, 33,228, 88, 94, 94, 94,173,179,222,134,135,135,235,125,125,125,  7,156, 56,113, 98,250,131,  7, 15,102, 58, 58, 58,
+ 58,166,167,167, 39, 36, 38, 38,174, 72, 75, 75,251,233, 13,153, 43,132,135,135,139,  3,  2,  2, 52, 47,212,139,197,219, 50,222,
+170,210,246, 45, 61, 61, 19,192, 84, 87, 87,215,245,179,103,207, 94,214,162, 69,139,193, 99,199,142, 37, 82,169, 20,251,247,239,
+ 71,124,124,252, 17, 74,233,252,218,116,233, 86,165,105,102,102,134,253,251,247,211,248,248,248,  3, 12,195, 44, 80, 42,149,255,
+138,133,180,255, 14,200,155,190, 11,170,109,248,180, 95,191,126, 13,178,178,178,182,105, 52,154,119,  0, 20, 71, 68, 68,152,255,
+183, 67,178,213, 17,228,107, 47, 11,137,170,185, 33, 51, 85,243,213,  1,234,117,209,172,141,134,169,154, 85, 45,246,204,106, 52,
+ 74, 91,131,225,206, 70, 74,181,166,106,186,184,184, 44,129,137,249,162,202,136, 78, 73, 73,249,170, 46,245,217,168, 81, 35,250,
+244,233, 83, 80, 74,201,155,220,239,127,199,177,244,111,210,220,185,206, 79,209,184,185,207,236,200,240,232,111,203,186, 15, 43,
+248,122,154,141,121,199,174, 65, 11,175, 93, 12,249,102,209,198,151,187, 56,223,134,109, 39,132, 48,149, 25,139,242,228,158,181,
+213,172, 87,175,222,143,254,254,254,227,238,222,189,251,115, 98, 98,226,248,127,234,182, 19, 66,136,187,187,187,168, 54,209, 57,
+238, 60, 50, 77,211,201,201, 41,144, 97,152,133,101, 55, 28,203,146,147,147,111,189, 65, 77, 35,165,116,105,106,106,234,221,255,
+239,109,255,215, 69,176,254,110,202, 35, 90,239,190,251,174,  3,143,199,251,199, 47,210,105,138,185,170,109, 20,234,159,160,241,
+ 42,101,  6, 42,244, 77,104,189,106,150,254, 78,158, 60,121, 66,184,211,250,159,199,200,207, 34,148,  0,102,  4, 86,146,154,170,
+204, 84,205,238,242,238,219,185,237, 85, 69,109,234,186, 16,115, 98, 98,226, 68,133, 66, 49,179, 54,179, 15,255, 75,219, 77,  1,
+104,184,163,255,205,147,150,150,118,  7, 64,255,127,186, 38,103,176,254, 33,252,249,231,159, 25,220,238,224,224,224,224,168,153,
+127,186,185,226,224,224, 40, 29, 32, 29, 92,197,221,135,201,161, 63, 66, 72,112, 29,238,110,206,115,154,156, 38,167,201,105,114,
+154,156, 38,167,249,239,210,252,215, 80, 62,139,233,239,120,  0,  8,230, 52, 57, 77, 78,147,211,228, 52, 57, 77, 78,147,211,252,
+183, 61, 24,206, 98,114,252,221,124, 63,136,184,124, 63,136,184,252, 93,159,231,224,224,224,224,224,248,167,193,127,219, 54, 40,
+ 48, 48,208,151, 82, 58,156, 16, 50,184, 44, 66,119,144, 16,178,251,206,157, 59, 38,101,160, 53, 51, 51, 75, 87,171,213, 14,  0,
+ 32,145, 72, 50,212,106,181,211,139,209, 82,224, 47, 75,100,208,210,159,169,122,192,170,167,167,103,186, 70,163,113, 48, 33,154,
+120,153, 16,114,133, 97,152,203,117, 73, 47,208,181,107,215,209, 60, 30,111, 25,  0, 24,141,198, 47, 47, 94,188,248,219,223, 85,
+207,132,144, 54,110, 10,167, 95,117,122,157, 33, 61, 51,103, 33,165,244,104,101,159,219,220,159,172,224, 19,204, 46,251,127,205,
+228, 99,180,218,169,223,181,253,124, 53,229, 11, 20,  8,  4, 83, 29, 29, 29,123, 39, 39, 39,223,  1, 48,135, 82, 90,227, 49, 96,
+229,226, 59, 82, 32, 16,140,208, 27,141, 94,  2, 30,239,153, 94,175,223,149,151, 18,181,147,187, 84,112,112,112,112,112,252,109,
+  6,171, 93, 35, 91,111, 66,117,179,  5,132,118,210, 83,114,149, 18,225,154,176, 39,217, 49,175, 83,  0,133, 66,225, 70,  8,  9,
+162,148, 54, 97, 24, 38,146,101,217,179,181, 93,236, 56, 32, 32,192, 13,192,135,  0,134,181,109,219,182,217,164, 73,147,208,176,
+ 97, 67,168,213,106,220,186,117,107,222,174, 93,187,230,  5,  4,  4, 60,  0,176,  7,192,222,240,240,240,164,170,180,212,106,181,
+ 67,185, 87, 34,132, 56, 12, 30, 60,248,214,139,166,170,108,113, 89, 66, 41, 13, 35,132,132, 26,141,198, 27,  7, 14, 28, 72,242,
+ 33,164,205,132,250,194,131,211,227,180,174,175,106,106, 52, 26,135,227, 51,167,128, 82, 22,234,236, 44,116, 88,185,161,226,189,
+ 83,189,218,130, 49,234, 33, 18, 11, 47,  7, 29, 11,187,  2,224,114,217,163,214,240,120,188,101,167, 79,159,118,166,148,162,103,
+207,158,203,  0,252, 45,  6,139, 16, 34,110, 27,216,226,210,177, 67,123, 36, 69, 57,233,232, 53, 96,232, 46, 66,200,104, 74,233,
+161,151,204, 82, 31,226, 72,248,152, 61,105,249,110, 30,  0,108,158, 63,124,206,250,158,100,227,140, 51, 52,205,197,197,165, 11,
+165,116, 78,153,222,234,148,148,148, 75,155,251, 16, 71,240, 48,119,210,242,221,  4,  0,182,204, 31, 62,123,115, 31,178, 97,242,
+201,218,205,146, 36,132, 76, 30, 61,122,244,198,101,203,150,241,156,157,157,145,146,146,210,203,215,215,215,155, 16,226, 75, 41,
+173,114,112,176, 77, 61,191,125,189,122,245,246,252,112,200, 32,169,189,157, 53,146, 83,179, 44,126,223,181,123,130, 77, 61,191,
+222, 57,137, 17, 67,185,203,  5,  7,  7,  7,  7,199, 27, 51, 88,205,154, 89, 90,153,169,232, 76, 51, 33,253,176, 87, 27,223,250,
+253,187,183, 39,158,158,158,136,121, 28,227,117,233,250,237, 49, 93,124,204,159,171,116,100,175,202,140,172,125,240,160,250,245,
+195, 70,251, 19,189,222, 88,250,155, 66, 62,140, 23, 51, 93,143,  4,  7,  7,215, 31, 59,118, 44,252,253,253,113,231,206,157, 46,
+  7, 14, 28,152,238,230,230,118, 91,175,215,159, 20,139,197, 33, 53,229, 80,  9,  8,  8, 88,233,226,226, 50,103,214,172, 89, 36,
+ 48, 48, 16, 98,177,184,226, 61,185, 92,142,110,221,186,161, 91,183,110, 72, 79, 79,111,118,233,210,165,102,187,119,239, 94, 17,
+ 16, 16,176, 58, 60, 60,124,158, 41, 21,180,112,225,194,192, 74, 94, 62, 77,  8,137, 53, 24, 12,247,252,252,252,146, 26, 19,210,
+112, 98,159,246,231, 38,119,104, 36,171, 38, 58,133,219,203, 74, 87,215,120,209, 96,209,146, 66,  8, 44,204, 47, 11,228,242,191,
+152,171, 38,132,180,104,107,205,252,250, 83,142,209,175, 22, 38, 11, 73, 73, 73,176,180,180, 52, 11, 10, 10, 74, 37,132, 44,190,
+116,233,210,182, 55,124,220,180, 89, 60,123,178, 48, 55, 62,  2,105,143,194, 48,115, 72, 71,233,140,239,255,252,  6,192,161,234,
+141, 15,195,252,246,204,110,222, 12, 96, 58,203,178, 11,163,163,163, 59,  3, 64,147, 38, 77, 68,  0, 46,237,120,106,221,103,116,
+147,252, 58,167, 89, 32,132,  8,121, 60,222, 15, 59,118,236,248,100,228,200,145, 72, 72, 72,192,181,107,215, 32,151,203,177,100,
+201, 18,143, 89,179,102,173,  0, 48,189,170,200, 85,207, 94,125, 60,183,124,187,192,183, 48, 39, 95,179,245,135,253,183, 21,205,
+ 26, 51, 51,166, 77, 49,215, 26,116, 78, 86, 46,190, 35,185, 72, 22,  7,  7,  7,  7,199, 27, 49, 88,157, 26,202,110, 13, 12,104,
+ 16,208, 63,184, 61,211,168,177, 47,132, 18,105,197,123,205, 91,250,163,121, 75,127, 50,126, 76,161,231,253,251,247, 23,156,190,
+124,115,126,167,134,178,240,171, 79,139, 91, 87,165,167, 55,130,191,123,247,110,  0,192,119,159, 15,231,253,112, 53,166,254,139,
+ 11,198,118,238,220, 25,157, 59,119,102, 86,172, 88,209,230,210,165, 75,109,246,238,221,171,115,113,113, 89,159,146,146,114,160,
+154, 98,206, 57,112,224,  0,225,241,120,224,241,120, 85,126,200,209,209, 17,221,187,119,135,179,179, 51,249,252,243,207,231,  0,
+168,212, 96, 73, 36,146, 12, 66,136,  3,  0,216,216,216, 24, 23, 47, 94,124,143,210,138, 30, 64, 74, 41, 13, 99, 24,230,  6,203,
+178, 55,143, 30, 61,154,220,148, 16,135,126,  1,141,175, 78,254,104,176,148, 30, 92, 95,165, 57,208,228,229, 84,250,186, 72, 38,
+189, 44,146,201,174,136,205,204, 94, 50, 87, 77,  9,113,109,219,184,254,217,205,159, 13, 55, 55, 49,138,231,221,165, 75, 23,137,
+209,104, 68,113,113, 49,182,108,217, 98,105,102,102,102,217,187,119,239, 69,  0, 42, 12,150, 47, 33,205,223, 87,240,198, 47, 78,
+ 49, 76,169,131,129,177,234,212, 46, 48,254,251,149,139, 44,  2,219,118,194,147, 75,191, 35, 39,167, 16,249,121, 69,120, 53,235,
+ 55,  0, 76, 62, 73,211, 55,247, 39,107, 54,127, 49,124, 46, 97, 24,210, 98,224, 28,244,244,166,211, 20, 10,197, 67, 66,136,160,
+124,249, 24, 66,  8,223,213,213, 85,225,237,221,114, 77,163,158, 62,216,242,229, 71,160,165,139, 52,174, 49, 53,122, 69,  8,113,
+ 48, 55, 55, 63,122,246,236,217, 54,173, 90,181,194,141, 27, 55, 16, 23, 23,135,201,147, 39,107,167, 76,153, 34, 28, 53,106, 20,
+153, 57,115,230,167,132,144,131,148,210,235,175,126, 95, 32, 16,140,248, 96,208,123,162,162,188,  2,181, 86,163,211,218,216, 89,
+177,154, 98,117, 73, 86,110,129,250,163,225, 35,180,247,238,132,143,  0,240, 23,131,245, 58,245,201,193,193,193,193,241, 47, 53,
+ 88, 18,158,177,213,226, 61,247, 97,204,137,  5,205, 79,  4, 45, 78,251,203,103,164,118,110,240,105,231,  8,169,149, 61, 19,249,
+104, 93,171, 87,162, 54,213, 78,213, 44, 55, 87, 91,135, 43,154, 22,231,166, 10,  1, 64,102,237,172, 27,191, 43,229, 97,171, 86,
+173, 96,111,111, 47, 12, 13, 13,157,  9,224, 64, 53,154, 68, 27, 25,142, 71,253,218,163,193,163, 28, 72,165, 82,136, 68,162,151,
+ 62, 16, 19, 19,131, 43, 87,174, 32, 49, 49, 17, 94, 94, 94,192, 43,227,168, 94,212, 84,169, 84,142,189,122,245, 10, 89,189,122,
+117,231,239,190,251,238,193,142, 29, 59, 58, 87,213,173,228, 75,136,172,133,135, 83,200, 55,159, 79,176,166,167,126,101, 74,178,
+ 51, 32,172,162,156,237,151,173, 69,251,101,107,  1,  0,251,125,157, 33,177, 48,135, 68, 46,191, 28,124,230,206, 95, 34, 87,  1,
+132, 88,120, 57,219, 94,220,180,120,186, 12, 23,247,137, 48,110, 73,181,245, 25, 16, 16,224, 29, 20, 20, 20,186,116,233, 82,171,
+164,164, 36, 92,191,126, 29, 30, 30, 30, 40, 41, 41,121,105,189, 50, 95, 66, 28, 91, 55,118, 63, 59,127,214, 24, 75,  0, 83, 76,
+217, 71, 47,153, 16, 30,239,155,111, 23,207,177,176, 20, 83,196, 94, 63,130,184,216,231,184, 21,245, 92,191,243, 92,132, 81,171,
+ 55,142,173,172, 62, 39, 31,163, 95,204,234, 38,254,245, 78,161,215,177,126, 93,166, 52, 90, 58,204, 17, 58,157,110,123,102,102,
+ 38,198,143, 31, 15,150,101,209,177, 99,199, 14,148,210,148,105,211,166,193,203,203, 11,219,206,196,148,240,115,110,  6,237, 10,
+ 45,184, 99,202,177, 68,  8,105,230,238,238,126,246,210,165, 75,142, 46, 46, 46,  8,  9,  9, 65, 90, 90, 26,156,156,156, 48,101,
+202, 20,209,202,149, 43,119, 20, 20, 20, 12, 89,182,108,153,228,193,131,  7,123,  9, 33,110,101,166,185, 66,211,200, 26, 21,158,
+ 30, 10,249,161,189,103,238, 91,155, 75, 81,207,203, 77,200,147, 91, 24, 41, 72, 73, 61,103,123,161,145, 53, 42, 42,217,255,175,
+ 85,159,166,194,105,114,154,156, 38,167,249,111,208,252, 87, 25,172,114,116,113, 33, 16,249, 14,  2,216,166,160,185,177, 96, 11,
+ 82, 64,165, 14, 40,102,205,144,165, 76,192,163,171,  7, 64,117, 53,231,189, 19,240, 96, 88, 48,101, 56,223, 74,  2,136,204,237,
+117,133,133,133,144,201,100, 40,206, 77, 21,206,250,182, 34,178, 37,188,116,233, 18,194,195,195,161, 80, 40, 76, 42, 35,213,150,
+246, 34,106,181, 90,104,181, 90,164,245,105, 13, 89,219,119,144,251,209, 20, 92,184,112,  1, 25, 25, 25, 16, 10,133, 16,137, 68,
+ 48, 24,106, 78, 22,207,148,173, 26, 91, 30,181,170,236, 51, 65,132,240, 93,109,228,199, 54, 47,154, 94,159,  9, 59, 46, 80, 37,
+ 62,133, 82,109,132,149,  9,245, 41,150,203, 32,146,154, 93, 22,201,101,149,153, 43,129, 76, 46, 57,246,235,210,153, 78,188,187,
+ 23, 36,170,167, 17, 21,166,237, 69,186,119,239, 62,  1,192, 34, 74,105, 94, 80, 80,144,227,178,101,203,172, 83, 82, 82, 16, 21,
+ 21,133,253,251,247,103, 26, 74, 55,148, 80, 74,191,  6,128,118,132, 72,234,217, 91,157,217,244,213,116,115, 92,218, 39,194,199,
+181, 79,174,110,217,164,255,137,247, 71, 77,154,178,113,122,127, 20, 23,170,176,251,220, 93,156, 14,143,125, 23,192, 53, 74,105,
+149, 25,238,191,187,160,121,234,226,226,210,109,220,184,113,247, 14, 31, 62,108,247,237,183,223,194,104, 52,194, 96, 48,192, 96,
+ 48, 84,252,111, 52, 26,177,103,207, 30, 92,187, 19, 53, 77,169, 44, 48,105,189, 55, 66,136,162,126,253,250,231,111,222,188,105,
+ 47,149, 74,113,238,220, 57,228,229,229, 85, 68,174, 70,143, 30, 77,242,242,242, 62,220,178,101,203,251,241,241,241,223, 94,189,
+122, 53, 27,  0, 15,128,225,229,125,206,143, 53, 24,244, 62,206, 77, 26,242,135,244,239,212,169, 40, 59,  2,114, 91, 63,132,221,
+143, 61,150,155,155,167, 98, 24,126,236,139,159,127, 19,245,201,193,193,193,193,241, 47, 55, 88,234,251,187,160,137,220,  7,161,
+ 87, 23,136,154, 14,133,192,181, 29,146, 34, 67,112,239,228,119, 72,126,120, 13,148, 53,194,209,163,230,165,230,126,187, 75,  5,
+ 10,133, 34, 92,169, 84,226,238,221,187,136,141,141,133, 68, 34,249,203,231, 46, 92,184,  0,  0,112,114,114, 50,105, 35, 68,129,
+237,225,118, 63, 21, 73, 45,156,  1,  0,110,247, 83,  1,  0, 43,230,207,135, 80, 40,132, 80, 40,172, 88, 20,214, 20,131, 69,202,
+ 62,204,150,118, 83,209,202,222, 15, 20, 11,118,239, 93, 52,181,181, 56, 62, 82,164,121, 16,  6,165,134,165,199,210,141, 39,124,
+ 77, 49, 88, 82,233,101,145, 92,126, 69, 40,147,189,100,174,  0,128, 10,  4, 59,127,255,122,170,159, 44,253,153, 76,125,251,  2,
+ 82,213,172,206,162,114,153,175, 79,157, 58,229,192,231,243,157,140, 70, 35, 18, 19, 19,241,240,225, 67,108,216,176, 33,189,176,
+176, 48, 40, 60, 60, 60,230,133,242, 50,173,204, 68,251,119, 46,153,238,201,143,184, 44,209,196, 62,168,212,180, 85,135,125,243,
+129, 61,223, 13,106,113, 98,194, 71, 95,226,189, 62, 61, 48, 42,200,151, 62, 87,230,168,  1,156,163,148, 26,107,250,126, 74, 74,
+ 74,138,139,139, 75,247, 65,131,  6,237,106,218,180,105, 19, 74, 41,124,124,124, 48, 96,192,  0, 28, 58,116,  8, 81, 81, 81, 40,
+ 44, 44,212, 93,189,122,117,189, 82,169,252,197,148, 50, 17, 66,164,214,214,214,167, 47, 94,188,104, 47,149, 74,113,246,236, 89,
+168, 84, 42, 56, 59, 59,191, 20,185, 90,177, 98,133,228,249,243,231,155,206,156, 57,227,  1,128,169,108, 33,108,157, 65,179,237,
+151, 29,123, 55,206,252,116,156,203,197, 27, 81, 23, 52, 69,133,150,238,238, 73,  5,246,214,114,243,101, 43, 86,213,211, 25,180,
+ 19, 42,175,207,144, 58,213, 39,  7,  7,  7,  7,199,191,220, 96,149,119, 49, 81,214,  0,237,211,115,208, 62, 61,  7, 89,151,  5,
+ 56,186,124,196, 75,159, 51, 26,245,117, 42,128, 90,173,134, 80,110,171,251,238,243,225, 66,  0, 96,  5,178,138,213,225, 89,214,
+180,133,215,107,179,164, 87,109, 12, 86,153,238, 95,204, 67,125,177,252,242,182,207,134,180,181, 53,150,  8,180,215,142, 33, 69,
+195, 26,190,125,170, 43,185,157, 71, 87,207,175, 66,243,120,247,214,208,231,102, 65, 98, 46,187,220,235,210,131, 74,103, 11,214,
+151, 88, 92,216, 63,115, 88, 71, 39, 33,132,218, 19,  7,160,212,176,154, 31,227,245,191,108,168, 98,155, 41,165,136,139,139, 67,
+ 73, 73,  9, 66, 67, 67,113,232,208,161,204, 87,205, 85, 89,121, 67,126,158, 51,162,141, 69, 97,154, 80,123,251, 60,148, 26, 86,
+227,109,138,169,242, 27,216, 65,200,144,179,132,225,153,245,233,228,139, 25,227,  6, 98,221,207,127, 26,180, 14,157,250,109, 60,
+122,242,131, 34,141,110,190, 41,230,234,  5,147, 21,  1,192,215,195,195, 67,108, 48, 24,186,244,239,223,255,100,159, 62,125, 16,
+ 22, 22,134,243,231,207, 55,210,233,116,169,  0,160, 80, 40,150,  0,112,100, 24,102,117,114,114,242,179, 42,246, 17, 35, 20, 10,
+247,158, 63,127,190,169, 66,161,192,249,243,231,161, 82,169, 48,105,210, 36,237,212,169, 83,133,163, 71,143, 38,249,249,249, 21,
+145,171,208,208,208,236,170,204, 21,  0, 20, 36, 63, 58,101,237,214,180,125,151,206,237,  6, 54,106,212,208,226, 89, 97, 65,134,
+ 84, 42, 49,187,116,249,170,240,230,141,155,155, 10,146,163,111, 85, 94,159, 23, 76,174, 79, 14, 14, 14, 14, 14,206, 96, 85,139,
+ 49,231,175,109,158,209, 80,247,117,154,219,205, 61,243,208,204,204, 12, 91,182,108,129, 84, 42,173,181,113, 42, 57,117,  4, 73,
+147,135, 87, 68,174,202, 35, 89,232, 53,250,181, 12, 22,203,178,161,  0, 94,114,121, 50,199,198,195,246,126,212,189,131,175,167,
+ 11,163,223,191,  1,201, 37,  6,245,162,199, 58,245,163, 66,250,110, 84, 37,131,167, 43,208,107, 33,145,149, 70,174, 42, 51, 87,
+114, 39,239,247,119, 12,235, 18,212,162,113,  3,198,176,111, 45, 82, 74,244, 69,243,162,117,186,103,197,244,112, 21,166,114, 81,
+143, 30, 61, 22,217,218,218, 74, 54,110,220,104,233,238,238, 14,131,193,160,125,213, 92,201, 28, 27, 15,219, 55,186, 87,  7,111,
+ 39,107, 70,127,240,123, 36,169,140, 37, 27,158,233,119,252,104,130,185,178,179,148,159,249,113,249,100, 51,169, 88,  0,181, 90,
+141,149,155, 15,226,236,245,  7,253, 50, 35,143,156,  1,112,166,174,251, 91,167,211,125, 18, 28, 28,188,110,246,236,217, 48, 24,
+ 12,248,240,195, 15, 17, 31, 31,127,246,233,211,167, 27, 92, 93, 93, 63,159, 60,121,178,194,222,222, 30, 19, 39, 78, 20,  2, 24,
+ 93,133,204,170,221,187,119,247,107,209,162,  5, 46, 95,190,140,188,188, 60, 56, 59, 59, 99,234,212,169,162, 21, 43, 86,236, 40,
+ 40, 40, 24,178,124,249,114, 73, 92, 92, 92,181,145,171, 23,201,163,249, 75,127, 90, 55,241,243,214,109, 59, 48, 79,159,198, 24,
+ 18, 91,119,102, 46,156, 63,121, 37,215, 65,188,227,165,250, 28,211,187,214,245,201,193,193,193,193,193, 25,172, 26,163, 67,198,
+194,191, 14,118,103,141, 38,  7, 50, 76, 54, 78, 70, 19, 53, 89,141,186, 38,195, 84, 43,131, 85, 54,  6,235, 52,165,244, 37,131,
+101,229,212,184,243,130,185,211,215,119,124,191, 23,147, 62,174, 29,242,138, 52,154, 57, 81,  6, 54,185,164,  6,115,  5,128, 49,
+234, 46, 11, 44, 44,174,  8, 95,153, 45,  8,  0,102,142, 13, 91,207,251,236,211,205, 93,135,245, 39,153,147, 58, 34, 55, 79,165,
+249,252,161,129,164,168,232,144, 40, 74, 47, 85,166,119,225,194,133,173,  0,182,  6,  5,  5,165,203,100, 50, 20, 21, 21,253,165,
+ 94,203,203,219,225,253, 94, 76,250, 39,109,144, 83,172,211,204,121,104,128, 82,197,238,173,201, 92,217, 91,153,159,249,113,217,
+100,169, 50, 57, 30, 66,161, 16,114,185, 28,231,174, 69, 34,243,193, 31,103, 94,231,128,115,117,117, 93, 60,109,218,180, 69,163,
+ 71,143, 70,110,110, 46,206,157, 59,135,174, 93,187,226,135, 31,126,112,191,120,241,226,186,246,237,219,131,199,227,225,220,185,
+115,208,235,245, 79,170,216,159,  3,199,143, 31,255,249,251,239,191,143, 91,183,110, 33, 53, 53,245,165,200, 85, 94, 94,222,135,
+155, 55,111,126,255,249,243,231, 53, 70,174, 94,196,  5,104,237,217,160,165,240,139,133,223, 65, 83,146,193,207, 76,185,113,249,
+194, 57, 26,230,158,147, 35,  5,144, 95,215,250,228,224,224,224,224,224, 12, 86, 37,238,197,  8,190,179, 31, 12,169, 17,255,121,
+233,149,217,132, 66,169, 28,172,177,102,227, 50,218,159,232,199, 52,  0,127,109,111,  6, 66,185,173,174,221,220, 51, 15,171,250,
+172, 92, 46, 55,181,139,208, 40,236,243, 62,175, 65,207,247,240,172,185, 19,168, 94, 87, 17,201,194,252,249, 47,153, 44,161, 80,
+  8,173, 86, 11, 84,210,237,247, 10, 55,  9, 33,241,  0,194, 40,165, 52,192,219,235, 27,137, 76, 54, 38,208,175,129,221,140,201,
+159,  8,158,103,104,112,177,227, 23,121,  7, 87,205,149, 39, 81,249,148,  4,154,119,189,  6, 67,121,185,207,213, 71,127,137, 92,
+249,123,123,125, 41,145, 74,198,181,109,230,237, 52,111,230,100,193,243,116, 13,185,216,122, 78,193,161,213,115,164,113, 48,255,
+ 60,137,230, 94, 50, 97,251, 23,245,233,211,103, 17,165,148,178, 44,187, 16,  0, 94, 44,239,204,169,227,  4,207,210,212,184,208,
+241,203,220, 67,171,230,154, 39,161,250,242,218,251, 13,236,224,104,109,113,230,199,229, 83,164,169, 41,  9, 16,139,197, 48, 55,
+ 55, 71, 82,122, 62,  4,124,158,234,117, 14, 54, 15, 15, 15,113,155, 54,109,230,142, 26, 53, 10,209,209,209,152, 55,111, 94,170,
+ 82,169, 60,124,244,232,209, 73, 51,103,206,228,119,238,220, 25, 25, 25, 25,216,178,101,139,254,214,173, 91,203,211,210,210,214,
+ 84,122,208,242,249,159,124,243,205, 55, 84,169, 84,146,184,184, 56, 56, 59, 59,227,211, 79, 63, 21, 45, 95,190,188, 98,204, 85,
+109, 34, 87,229, 36, 39, 39, 95,110,212,160, 30,222, 61,181, 30,  6,189,230,114, 94,118,226,149, 71,207,114, 47,219,136, 68,179,
+ 58,  6,248,213,169, 62, 57, 56, 56, 56, 56, 56,131,245, 23,244,148,201,223,189,114,162,229,187, 35, 38,193,204,227, 29,104, 30,
+ 30,  0, 91,152,  6,182,176,212,192,136,100, 22, 48,183,115, 67, 81,137, 26,215, 30, 60,131,158, 50,249,213,234, 25,193, 95,250,
+195,127,102, 11, 90, 89, 89, 33, 63, 63,255,165,200,139, 84, 42,133, 66,161, 64, 65, 65,  1, 14, 30, 60,  8, 90, 67,100,136, 82,
+250,205,168, 81,163,190,154, 60,121, 50,211, 96,216, 88, 20,221,184,250,106, 52, 10,102,102,102,144, 72, 36, 72, 78, 78,198,227,
+199,143, 89, 74,233, 55, 53, 68,188,110, 26, 12,134,251,123,247,238, 77,110,228,229,218, 43,168, 85,235,105,243,191,152,103, 30,
+117,245, 44, 22, 46,223,196, 54, 12,236,153,191,114,207, 31,133,249,242,122,221, 74,148,143,238,213, 84,201,132,144,191, 38, 17,
+245,172,215,181,157,127,203,217, 11, 23,126,105,241,240,234, 57,124,181,250, 71,218,168, 69,112,254,234, 67, 71, 11,178,164, 30,
+ 61, 84,233,255, 25,243, 83, 29, 33, 33, 33, 91,  1,108, 45,127,254,106,121,231, 45,217,192,122,183,234,149,187,114,207,161,226,
+  2,243,122,193,213,149,215,193,119, 80,123, 55,103,155, 51,223, 47,157, 40, 77, 75, 73,132, 88, 44,134, 92, 46, 71, 98,106, 30,
+ 22,173,223, 95,172, 99,217, 94,175,121,188,137,101, 50,153, 88,167,211,225,183,223,126, 67, 74, 74, 74,187,212,212,212, 68, 39,
+ 39,167, 31, 39, 78,156,184,177, 73,147, 38, 62,143, 31, 63,126, 82, 84, 84, 52, 37, 45, 45,237, 81, 85, 34, 86, 86, 86,237,236,
+237,237, 73, 88, 88, 24, 38, 78,156,168,253,244,211, 79,133,163, 70,141, 34,185,185,185,117,138, 92,189, 16, 93,235, 60,160,111,
+123,116,232, 62,233,178, 86,157,119,229,249,163, 29,151, 25,122, 93, 18,208,210,175, 78,245,201,193,193,193,193,193, 25,172, 74,
+201,228,171, 28,126,220,121,104,205,222,  3,135,199,141, 31, 51, 92, 18, 20, 60, 18,194,172, 72, 24,148,225,112,241,237,  8,202,
+ 55,195,173, 59,119, 17, 17,155,164, 46,209,241,182, 23,  8, 85,179, 95, 49, 22,193,213,229,202,200,207,207,135,135,135,  7,246,
+ 76,106,220, 84, 83,144, 33,172,  7,128, 73,177,212, 93,140,233,243,240,202,149, 43, 69,  0,182, 55,106,212,232, 64,117,154,119,
+239,222,253,186,101,203,150, 71,191,248,226,139, 21,141, 26, 53,234, 53,126,201, 15, 16,206, 24,  5, 85, 84,  4,164, 65, 67, 96,
+ 99, 99,131,236,236,108,220,186,117, 11,133,133,133,167, 41,165, 95,220,187,119, 47,178, 58, 77, 74,233, 13, 63, 63,191,228,122,
+245,234, 89, 57,200,205,126,153,244,241, 40,243,132,136, 27, 72,143,185,143,235,215, 98,114,119, 31, 58,154, 82,144,159,249,113,
+117,141,235,139,154, 12,195,188,100,174,188,189,237,228, 50,177,245,206, 41,227,199, 90, 36, 70,222, 66, 70,204, 61, 92,189,254,
+ 36,119,207,222, 35,153,217,217,233, 99,170, 50, 87, 53,213,103,101,229,189,113,245,113,238,222,  3, 71,146, 11,139,115, 63,169,
+172,188, 47,106,202,101,130,217, 71,127, 91, 42, 85, 38, 39, 84,152,171,132,212, 92,124,181,126,111,177, 74,171,239,149, 25,113,
+196,164, 72, 77,117,229,100, 89, 22,  6,131,  1,148, 82,136, 68,162,  2,  0, 40, 51, 83,221, 76,213,204,202,202, 10,137,143,143,
+ 31, 32,151,203, 43, 34, 87,249,249,249, 67, 86,174, 92, 89,171,200,213,171,229, 76, 78, 78,190,220,192,211,117, 85,234,208, 33,
+ 26,103,103,251,203,199, 78,221,142,116,144,155, 61,170,107,125,190, 41, 56, 77, 78,147,211,228, 52,255, 13,154,255, 42,131, 21,
+ 21, 69,117,  0,166,251,250, 90,124,189,250,199, 93, 91,118,238, 57, 56,112,252,136, 65,124,255, 22,221, 16, 23,122,  4, 87,110,
+ 92, 52,228,170,233,145, 66,  1,111, 82,212,211,130,220,154,126, 76,192,131, 97,248,240,225,124,  0, 16,241, 97, 88,219,175, 95,
+ 72,211,166, 77, 59,182,213,103,  8, 23,109, 44,141,108,125, 61,109,184, 48,228, 86,200,  1,177, 88,188, 53, 46, 46,174,192,148,
+141, 40, 51, 76,189, 91,181,106,245,206,231,159,127,190,170, 79,125,215,214,  3,219,119,129, 64, 32,192,173, 91,183,144,157,157,
+125,139, 97,152,185,119,239,222,189, 98,138, 94,100,100,100, 86,211,134, 30,211,109,204,132,179,167, 12, 31,104,159, 25, 27,133,
+228,232,187,  0,  0,141, 70,165, 79,141,185,220,162, 54,149, 92,190,112,179,175,175,175,208,168, 41, 26, 45,225, 91, 44,156,244,
+225,  0,135,236,231,143,144,244,176, 52,221,147, 70, 93,162, 75,138,185,232, 83,151,157,232,225,225, 33,150,  9, 48,161,210,242,
+106,213,250,180, 39,209, 45, 77,209, 41,209,104,151,127,189,110,103,143,165,179,199,136, 45, 44, 44, 16,254,224, 41, 22,174,221,
+ 83, 43,115, 85, 19,148, 82,232,245,250, 90,205,252,172,132,185, 45, 90,180,104,188,108,217,178, 70,101, 99,185, 94, 43,114,245,
+ 34,177,113,201,243,130,130,130,124,159, 62, 14,239, 98, 99, 38,220,245, 58,245,201,193,193,193,193,193, 25, 44, 84,111,180, 10,
+114,  1,124,224,239,106,225,181,108,211,174,237,102,124,182,163,202,192, 92, 83,105,152,113,119,147, 11,158,153,250, 99,191,221,
+165,130, 87, 95,243,245,245,149, 61,229,163,168,252,249,211, 28, 64,169, 84,174,174,203,198,220,190,125,251, 10,128, 54,254,254,
+254,  3, 79, 18, 50, 31,120,  6, 74,233,242,187,119,239, 30,169,141,142, 57, 31, 15, 58,250,122,185,116,242,111, 42,225, 25, 85,
+ 72,142,142, 69, 78,177, 26,231, 30, 38,228, 49,148,249,181,174,149,205,232, 74,238,119,242,109, 80,239,157,128,166, 82,  1,209,
+ 34, 57, 42, 28,249, 42, 45,206, 62, 76,200,  7, 33,117, 30, 40,253,166,202,155, 22,241,199,109,123,191,129,193,132,144,243,243,
+167, 14, 19, 47, 90,187,247,141,154, 43, 27, 27,155,146,180,180,180,108,181, 90,109,155,158,158,174,181,177,177, 41,169,163, 73,
+123, 74,  8,105, 62, 99,198,140, 37,159,127,254,249,236, 85,171, 86,  9,235, 50,230,170, 42,114, 83, 18,142,188,211,244,205,239,
+127, 14, 14, 14, 14, 14,206, 96, 85, 74,153,153, 10, 10,242,181,151, 93,123,156, 89,252, 38, 10, 16, 21, 21, 85, 60,218,159, 84,
+ 68,182,  4, 60, 24, 94, 87,179,204, 80, 29,169,179,  0, 67, 10,111, 60, 73, 40,186,249, 36,161,  8, 44,165, 44,165, 26,134, 65,
+ 82,177, 78,183, 60,230, 89,114,221,103,209, 17, 98,188,253, 52, 81,117, 39, 54, 73, 77, 89,150,178,148,106,  9, 65,154, 94,207,
+ 46,127,240, 44,254,232, 63,161,188,153, 17, 71,174, 59,249, 14,234,116,253,230,131,153,197,197,186, 77,153, 81, 71, 66,223,212,
+193, 22, 30, 30,174,119,118,118, 30,209,191,127,255,177, 44,203,254,152,146,146,162,175,171, 22,165, 84, 11, 96, 46, 33,228,112,
+100,100,228,254,208,208,208,212, 55, 97,174,254,214,253,207,193,193,193,193,193, 25,172,234,  8,137,122, 51,230,170,156,202, 34,
+ 91,255, 77, 34,159, 60, 15,248, 59,116, 31, 60,121,222,236,127,161,188,105, 81,135,239,  0,248,240,239, 40,107,106,106,234, 89,
+  0,103,223,148, 30,165,244, 54, 33,164, 62,  0,222, 27, 49, 87,127,227,254,231,224,224,224,224,224, 12, 22,  7,199,255, 12,180,
+116, 64,151,129,171,  9, 14, 14, 14, 14,142,127, 10,  4, 64,112, 21,141,150,201,179,  3,  8, 33,193,117,104, 20,207,115,154,156,
+ 38,167,201,105,190, 37,154, 25,213,104, 62,168, 65,179,170,200,182,195,255, 80,125,182,172, 66,115, 85, 13,154,115,171,121,251,
+ 30,119,124,190,157,154,255,166,187,255,191,237,  1, 32,152,211,228, 52, 57, 77, 78,243, 95,160,217,140,171,207, 55,170, 57,151,
+171,207,127,159,230,219,246, 96, 56,139,201,193,193,193,193,241,183,117,147, 16, 34, 38,132,136,235,250, 62,  7,199,255, 42,181,
+ 30,131,213,186,117,235,134,  0,112,235,214,173,167,127,227,  9, 57,213,217,217,121,188,159,159, 95, 19,161, 80,200, 20, 22, 22,
+126,125,241,226,197,197,175,126,238,157,166,130, 59, 60,  6,174, 47,124, 19, 32, 60,128, 97, 96,164, 72,190,114,191, 36,144,219,
+197,255, 93,156,157,157,207, 72, 36, 18,119,150,101, 97, 96, 41,140,  6, 99,233, 95, 35, 11,189,145, 66,167, 85, 39,104,138,243,
+123,214, 73,187,229,160,122,  6, 35, 93,  9,176,155,  9,152, 73, 20,236, 22, 66,153, 73,148,193,102,194, 98, 34,248,250, 53, 48,
+  8, 62,231, 11,249, 95, 42,195, 15, 36,189, 13,245,121,240,224, 65,222,235,124,127,240,224,193,149, 46, 19,229,239,239,127, 92,
+ 34,145, 52,168,234,123, 37, 37, 37,169,247,239,223,239,242, 54, 31,171, 78, 78, 78,239, 48, 12,243, 61,128,166,175,188,245,  8,
+192,116,165, 82,121,225,117,127,163,181, 84,202,183,227,241, 38,  8,  8,153,  3,  0,122, 74, 87,103, 25,141, 91,111,149,148,252,
+ 99,198, 16, 58, 56, 56, 92,225,241,248,141,138, 75,138,139, 11, 11, 10,188,204,205, 45,158,153, 73,165, 50,163,193,248, 36, 43,
+ 43,227,157, 90, 94,203, 39,  3, 88, 83,246,255,108, 74,233,230,218,188,207,193,241, 86, 27,172,128,128,  0,111,  0,157,  9, 33,
+157, 41,165,239,248,248,248, 56,150,148,148, 32, 32, 32, 32,157, 16,114,133, 82,122, 25,192,229,240,240,240,152, 55, 81, 32, 30,
+143,247,237,134, 13, 27,102,125,250,233,167, 21,139, 52, 71, 68, 68, 84,254, 89,  6,174,151,142,157,119,184, 29, 25,131, 86,193,
+131,203, 12, 22,  3, 20,167,162, 75,247,214,117,250,125, 27, 27, 27,115,  7,  7,135,175,  9, 33, 67, 24,134,169,177, 49, 99, 89,
+214, 72, 41, 61,144,145,145,177, 40, 39, 39,167,176, 54,191,213, 42,208, 79, 95,234,  8, 43,131, 26,111,223,137,168,118,118,165,
+143,143,207, 29, 30,143,231, 90,118,113,122,245,194, 86,233,255, 70,163, 49,249,225,195,135,129,166,214,133, 68, 42,157, 77, 24,
+126, 48, 40, 91,154,  4,149, 48,143, 40,107, 56,175, 46, 41, 89, 99,202,246,138,197, 98,247,240,187,247, 26, 69,197, 60,131, 87,
+253,122,208,234, 12,208,234, 12, 56,122,254, 22, 90,248,212, 71,255, 62,221,235,124,172, 24, 41,249,122,225,244, 17, 93,150,109,
+216,221,234,203,233,195,101,203, 54,236,110,245,229,140,225,242,101, 27,119,  7,126, 57, 99,132,124,233,198, 93,129, 11,102,140,
+176, 88,182,113,183, 14,192,199,117,249,141,143,155,187, 23, 51, 70, 67,165,119,215, 44,143,175,249, 57, 50, 65,246,223, 56,113,
+199,142, 29,235, 93, 92, 92, 28, 53,182, 95,235,111,154,120, 56, 86, 58,254, 39, 47, 59,221,225,201,131, 91, 11,249, 18,153,239,
+123,179,127,169,246,252, 20, 10,133,158, 87,174, 92,105,196,178, 44,140, 70, 35, 12,  6, 67,197, 95,173, 86,139,247,223,127,255,
+141, 76,136,  9, 12, 12, 28, 75, 41, 93, 86,122, 88,146,165,119,238,220,217,244, 26, 55, 98,114, 62,159,255,153, 72, 36,234,108,
+ 48, 24,154,  0,128, 64, 32,136,214,104, 52,151, 13,  6,195, 58, 74,105, 81,109,244, 24,134, 89,127,251,246,109, 95,185, 92, 14,
+157, 78, 87,177, 48, 60,143,199,243,105,211,166,205, 15,  0, 26,189,238,246,219,241,120, 19,218,119,236,184, 97,236,140, 25,188,
+220,219,183,241,253,246,237,235,145,155, 11,  0, 63,212,244, 93, 87, 87,215, 59,132, 16,215,218,252, 30,165, 52, 57, 57, 57, 57,
+176,118,215, 96,126,163,132, 36,165,131,187,155,  2,  0, 32,149, 74,101,183, 31, 60,119,  8,104, 90,191,214,145, 43,  0,107, 40,
+165,102,101,245,187,161,125,251,246,237,  8, 33,  6,  0,148,101, 89,134, 16, 50,140,101, 89,126,217,231,215, 16, 66,126,161,148,
+106,184,166,153,227,173, 54, 88,  1,  1,  1, 39,  1,116,246,241,241, 49,235,222,189, 59,252,253,253,225,238,238, 14,137, 68,  2,
+  0,200,201,201,113,140,138,138,250,224,222,189,123, 31,132,133,133, 33, 32, 32, 64,  5,224, 90,120,120,120,165,209,136,224,254,
+157, 62,149,200,197, 27,  1, 32, 51, 57, 59, 53, 57, 46, 99, 99,106,106,234, 26, 74, 41,251,194,  9,233, 53,106,212,168,153,211,
+166, 77,195,241,227,199,177,103,207, 30,104, 52, 26, 20, 22, 22,226,226,197,139, 85,220, 90,103, 32,247,226, 74, 64,246, 28, 72,
+188, 12, 72, 29,  0,153,227,235,220,189,125, 61,116,232,208, 25,255,199,222,117,135, 69,113,181,223,115,103,182, 23,122, 95, 80,
+ 81, 16, 21, 84,164, 40,246, 30,187, 81, 99,139,189,151, 88,163,137, 49,198,196,154,216, 75,140, 93, 99,141,189,247, 22,123, 23,
+176, 34,130,130, 74, 89,122,103,217, 58, 59,243,251,131, 18, 36,148,133,248,125,201,247,203,158,231,153,103,119,103,102,207,220,
+185,115,231,222,115,223,251,222,247,250,248,248, 20, 69, 29, 55, 24, 12, 96, 24,  6,  6,131,  1, 25, 25, 25,152, 49, 99, 70, 97,
+229,  5,150,101,113,245,234,213, 41,179,102,205,  2,128, 47, 75,227,252,164,141,103, 48,143, 16, 55,246, 15, 81, 22,119,249,102,
+ 84, 32, 64,232, 71,193, 79, 72,233,226,171, 17, 93,113, 69, 72,187,133,134,134, 58, 10,  4,  2,147,238,141,101, 89,248,251,251,
+155,116,174,171,171,107, 59,153,220,114,255,103,131,198,216,248,249,251,241, 93, 93, 92, 96, 96, 24, 68,191,141,105,242,228,113,
+136,223,165,211,  7,199,186,186,186, 14,138,143,143, 47,119, 65,106,163,145,197,147,176, 72, 92,185,253, 24, 61,249, 98,168, 52,
+ 58,168,212, 58,236, 57,117, 23,113,201, 89, 85,126, 78, 65, 65, 65,174, 82,218,161,201,148, 81,189,101,203,127,217, 45,155, 50,
+170, 55, 86,172,223, 83,240,185, 91, 54,101, 84, 47,172, 88,191, 75, 62,101, 84, 47,252,188,113, 71,211,160,160, 32,215,  7, 15,
+ 30,196,151,197, 87,214, 51,162,140,140,104, 91, 88, 60, 13,  0, 41,155, 55,195,144,156, 12,197,188,121,  0,128,177, 62,174, 38,
+ 15,107, 52,104,208, 32,152,199,227, 85,216, 56, 50, 12, 19,247,252,249,243, 64, 83,196, 21,195, 48, 28,143,199,251,254,246,111,
+139,142,180,240,171,243, 65,102, 70, 68, 68, 88,253,240,195,247,253, 14,133,228,112,  3,  2, 44,194, 78,172, 24, 85,174,200, 98,
+ 89,150,210,106,181,136,140,140, 44, 53,202, 62, 69, 81,198,170, 60,167,182,109,219,138, 84, 42,213, 62,185, 92,238,171, 82,169,
+ 70,113, 28,247,195,245,235,215,157, 40,138, 66,199,142, 29,127,  8, 12, 12,124, 43, 22,139, 55,170,213,234,199,114,185,124,208,
+245,235,215, 77,106, 92,  9, 33,173, 45, 45, 45,247, 28, 63,126,220,198,223,223,159, 74, 77, 77, 69,205,154, 53,145,158,158,222,
+228,230,205,155,  1,163, 71,143, 30, 77,  8, 25,198,113,220,205, 74, 36,183,174, 84, 42,229,134, 15, 31, 78,140,198, 63,110,247,
+215, 95,127, 69,128, 75,146,231,132, 46,178, 60,141,142,203,250, 61,210,106,130, 64, 32,184,253,238,221,187, 74, 23, 96, 62, 33,
+179, 70, 77,159, 78, 11, 18, 18, 32,139,136, 64, 15, 66,120, 91,243,173, 89, 27, 76,184,103,183,213,235, 86, 56, 10,133, 66, 48,
+ 12, 83, 36,  2, 11,235, 40,131,193,  0,189, 94, 15,131,193,  0,163,209,  8,131,222,128,109,155,119, 84,249, 29,147,202,164, 82,
+103, 23,151, 36,137, 84, 38,253, 24,141,141, 72, 36,226,237,222,189,123,144, 80, 40,  4,  0,232,116, 58, 52,104,208,128,152,155,
+ 97, 51,254,141, 22,172,174,215,175, 95,  7,195, 48,176,176,176,  0, 77,211, 37,173, 27,104,221,186, 53,130,130,130,208,177, 99,
+ 71,188,122,245, 74,178,108,217,178, 50,205, 17,131,103,246, 64, 53,175,124,225, 99, 48,176, 46,119,206, 62, 94,250,235,162, 35,
+ 14,  0,102, 22, 55, 24,140, 31, 63,158,164,165,165,161,127,255,254, 55,181, 90,237,167, 28,199,149,185, 92,142,145, 69, 92,187,
+207,135,128,229,136,100,205,131,109, 68,167, 81,115, 20, 69,169, 11,135,  8,171,216, 43,238,175, 80, 40,112,224,192,  1,232,116,
+186, 63, 29,183,180,180,196,139, 23, 47,138,139, 28,248,249,249,209,132,144,254,101,  9, 44,138, 16,183,243,215, 95, 23,205,  8,
+ 26,248,169,159,160, 83, 27,207, 36, 30, 37,228,  0,144,239,190,251,174, 72,176,  1,192,130,  5, 11, 76, 78,175, 64, 32,192,171,
+ 87,175, 64,211, 52,222,180,200,239, 96, 55,  8,141,  5, 77,211,120,226,155,223,  3,109,254, 58, 19, 52, 77, 67, 46,151,155, 42,
+174,218, 58,185,184,157,248,118,222, 18, 11,141,129,195,217,171, 15, 17,163,188, 12,142,227,224,226,104,139,230,  1,254,252,250,
+ 13, 27, 57,254,186, 97,249,  9, 87, 87,215, 94,241,241,241,215,203,226, 50, 48, 70,120,123,213,194,238,227, 55,177,120,227, 81,
+164,101,171,145,147,151,159,175, 29,154,250, 96,123,213, 45,157, 43,234,186,187, 87,219,121,232,  2,154, 53,109,140, 93,135, 46,
+162, 89, 80, 99,228,255, 14,194,174, 67, 23,208,188, 89,254,103,125,111,207,234,233,239,178, 86,160,156,216, 94,127,122, 70,189,
+242,159, 81, 77, 90, 80,212,  0,188,155, 56, 17,  0,138,  4, 86,165, 94, 52, 30,207,237,241,227,199,142, 21,157,231,231,231,103,
+146,229,138, 97, 24, 36, 39, 39,147,204,204, 76,206,218,218,186, 95,113,145, 85, 40,174, 14,  6,103, 67,125,127, 61,249,237,212,
+ 13,118,200,167,109,194, 78,172, 24,229,211,175, 95,191,151,165,241,234,245,250,183,157, 58,117,226, 10, 26, 62, 87,161, 80, 40,
+ 40, 33,192, 20, 45, 90,180,248,147, 64,171,104,232, 80,165, 82,237,219,186,117,107, 31, 79, 79, 79,124,246,217,103,151,124,124,
+124,132, 82,169, 20, 23, 46, 92, 64,181,106,213,236, 45, 44, 44,206, 45, 89,178,  4,171, 87,175,174,126,233,210,165,253,  0,250,
+152,240,142,118,108,215,174,221,129, 51,103,206,136,  5,  2,  1,212,106, 53, 94,188,120,  1, 43, 43, 43,  8,133, 66,244,234,213,
+139,110,209,162,133, 93,219,182,109,143, 18, 66,  6, 85,102, 70,147, 70,163,225,230,204,153,  3,169, 84, 10,169, 84, 10,153, 76,
+  6,153, 76,  6,137,128, 37,155,167,213,148, 76,221,154, 41,249,114,222,230,165,123, 54,206,191, 86,189,122,245, 31, 98, 98, 98,
+ 50, 43, 91, 22, 50, 30, 61,130, 44, 34,  2,154,224,224, 74,151, 35, 43,153, 45,102,207,158, 93, 81, 89,131, 64, 32, 64,243,230,
+205, 43,228,243,246,246,222, 76,211,180,195,135, 98,154,208,223,127,247, 45,243,252, 69,132, 76,111,228,100, 26, 45,131,197, 11,
+191,103,104,138,162, 27, 52,104,112,156,227,184,148, 23, 47, 94, 76, 48,193,122,166, 37,132,124, 77, 81,212,207, 34,145,136,231,
+238,238,254,254,251,239,191,191,151, 63,212,  0,112, 28, 71,185,187,187, 55,145, 72, 36, 53,180, 90, 45,  3,224,107,179,245,202,
+140,127,139,192,130, 92, 46,199,163, 71,143, 64,  8,129,133,133,  5, 44, 45, 45, 97,101,101,133,236,236,108,132,133,133, 33, 60,
+ 60, 28,239,222,189,  3, 33,  4, 30, 30, 30, 40,124,113,138,189, 96, 69, 21,219,190, 85,103, 32,150,139, 64,  8,224,223,222, 23,
+190,173, 27,160,241,195,168,105, 10,133, 98,171, 82,169,140, 36,132,240, 26, 52,104, 48,186,105,211,166, 88,189,122, 53,180, 90,
+237,234,210,196, 85,113,206,155, 47, 12,129,  0,160, 80, 40,190,218,123,225,141,116,104, 23,207, 60,165, 82,185,178,178,153, 80,
+178,  2, 78, 77, 77,  5,203,178, 38, 91,133, 50, 51, 51,203,229, 44,105, 17, 88,188,116,141,117, 78, 86, 18, 22, 45,219, 11,131,
+193,128,153, 51,103,130,101,217,162,173, 52,190,210,210, 89, 56,244, 71,211,244,  7,  2,184,162,223,229,113, 58, 56, 56,200, 68,
+ 98,233,254,175,190, 91,100,241, 52, 34, 14,103,174, 62,  4,199,113, 56,185,245,  7,  0, 64,175,113, 11, 17,159,152,138, 22,  1,
+245, 48, 98,194, 12,139, 53, 63,205,217,239,224,224,224,153,146,242, 71,240,217,226,156,  6,134,197,209, 11,247,160, 76,203,197,
+240,207, 58, 64,163,213, 35, 37, 57, 17, 59, 54, 44,199, 23, 35,142,194, 70, 46,113,246,240,240,136, 40,158, 71, 28,199, 17,129,
+ 64,112, 59, 34, 34, 98, 76, 89,233, 52, 24, 12, 93,191,157, 49, 22, 63,111, 59,138,  6,181,157,113,250,242, 93,  4,214,175,129,
+243, 87, 31,162,105,195,154,184,120, 35,  4, 77,125,107,225,198,253, 23,152, 62, 97, 24,190,158,118,187,107,101,158,209,143, 75,
+214, 88,231,100, 39,225,204,143,187,145,188, 97,  3,222, 79,158,140, 38,  5,231, 60, 36,  4,  2, 55, 55,192,162,226,252, 44,137,
+151, 47, 95, 66,171,213,150,214,187,135,183,183,119,133,207,168,208,114,149,148,148, 68,146,146,146, 32,147,201,200,203, 23,207,
+141,222,245, 27,244,227,194,143,108,  3,128,124,203, 85, 54,242,238,174,131,250,222, 47, 16,212,124, 74,109, 91, 56, 65, 55,246,
+135,205, 97,197, 26,183, 15,210,249,228,201,147,162,252,105,218,180,105,248,237,219,183,235, 22,150,175,130,161, 66,  1,195, 48,
+ 94,133,195,134, 12,195, 64,171,213, 98,208,160, 65,116,121,247, 46,145, 72,124, 61, 60, 60, 16, 18, 18,130,  9, 19, 38,  8,219,
+181,107,135,215,175, 95,131, 16,130,145, 35, 71,194,199,199,  7, 41, 41, 41,104,220,184, 49,110,221,186,229,103, 66,153,183,144,
+201,100, 59, 78,159, 62, 45,166, 40, 10, 57, 57, 57, 96, 89, 22, 45, 90,180,  0, 69, 81,120,254,252, 57,190,251,238, 59, 28, 59,
+118, 12, 39, 78,156,144,  4,  4,  4,236, 32,132,120,115, 28,151, 99,194, 51,226, 52, 26, 13, 39, 18,137, 32, 18,137, 32, 22,139,
+ 33, 22,139, 33, 20, 10,161,214, 83, 24,183,230,189,150, 22,219,179,245,253, 90,122,142,156,250, 19,181,242,251, 81, 87,  1,156,
+ 44,224,124,110, 74,125, 97,224,184,229,235,183,111, 95,215, 29,249, 19,140, 14,231,228,176,  6,142, 91,110,202,187,  9,  0,185,
+154, 44,212,240,112,195,209,131, 39,208,119, 96,239, 82,197, 21,159, 47,128,128,207,135,165,173,172, 66, 78, 62,159,111, 31, 26,
+ 26,106, 93,188,126, 96, 24,230,229,148, 41, 83, 60,122,247,234,238,116,232,216, 25,122,232,192, 94, 70,103, 39,135,212,216,216,
+247,175,  1, 88,  7,  4,  4,112,166,150,121,142,227, 54,250,249,249,249, 31, 63,126,124,212,236,217,179,131,191,250,234,171, 69,
+197,143,175, 88,177, 98,225,185,115,231,106,244,233,211,103,207,227,199,143, 55, 22,251,223,178,143,221,216,253, 39, 66,  7,152,
+ 57,205,168,178,192, 42,222,248,100,103,103, 35, 59, 59, 27,177,177,177,216,188,121,115,193,139,204,  7,143,199,  3,143,199, 43,
+242, 87, 40, 11, 87, 78,223,250,  5,192, 47,  1,  1,  1,252,103,247, 14,159,159,181,117,106,135,192,142,254,116,200,239,207,250,
+  1, 88, 12,160,235,240,225,195,237,  1, 96,247,238,221,169,  0,206,255, 29, 25,194,113,220,225,200,200,200,233, 46, 46, 46, 69,
+ 62, 40,197,135,  9, 25,134,129, 88, 44, 70,161,175,138, 86,171,197,190,125,251, 24,142,227, 14,151,151,127, 17, 47,174, 34,242,
+197,181,252,255,177, 44, 88, 99,254,255, 53, 26, 13,230,207,159, 95,124,234, 43, 38, 78,156,  8, 84, 98, 45,228,178, 44, 87,205,
+ 34, 51,192,227,241,112,171, 86,190, 18,232,150,194,253,201, 87,235, 79, 67, 24, 66,241,204,110,159, 13,177,101, 56,186, 72, 92,
+229,223, 67,190,224, 20, 10,120,144,136,  4,136,136,138,129,187,107,  0, 58,116,235,109,115,229,204,209,153,  0, 74, 53,187,233,
+141, 44,186,182, 13,192,134,131,215,145,157,171, 70, 86, 70, 58, 82, 98, 94,226,229,211, 71,224,241,120,  8, 14, 14,182,176,180,
+180,178,168, 85,171, 38,140, 44,139, 59,247,130,193,129,224,244,169,227, 30, 53,106,214,194,251,183,209, 99,202, 16,182,188, 22,
+129, 62,200, 77,139,  3, 77,211,104,238,231,  9,154,166,209, 42,176, 14,104,154, 70,203,198,117,193,227,241,208,182,169, 15,106,
+215,174,141, 66, 63,143,242,159,209,239,136,124,113,189,152,216,229,192,  1,208, 39, 36,252,185,161, 76, 72,  0,103,225, 88,217,
+178,133,111,190,249, 38, 51, 33, 33, 65, 95, 82,208, 41, 20, 10,193,177, 99,199,172, 43, 90,  4, 91, 38,147,249,240,120,188,176,
+244,244,116, 86, 42,149, 82, 44,107,100,189,235, 55,160,111,255,182,232, 72,225, 57, 11, 23, 46, 58, 50, 32,192,178,223,222,195,
+103, 56,129,123, 75, 66,248, 34,102,236, 15,155,133, 60,177,204,199,196, 78,  3,165,213,106,241,234,213,171, 10, 23,229,230, 56,
+174,220,  2,165, 82,169, 70,244,237,219,247,210,196,137, 19,197,132, 16,220,186,117,171, 72,240,211, 52,141,168,168, 40, 80, 20,
+133,173, 91,183, 66,171,213, 78, 52,193, 18, 56,253,232,209,163, 86, 66,161, 16, 57, 57, 57, 69,239, 13, 77,211,  8, 15, 15,199,
+202,149, 43, 49,124,248,112,196,196,196, 64,161, 80, 96,230,204,153,242,165, 75,151, 78,  7,176,208,132, 91,127,170,211,233,  2,
+165, 82, 41,196, 98, 49, 10,133, 22,  0,132, 36, 56, 61,143,142,142,110,104,111,111,239,236,112,227,204,169,230,237, 62,109,100,
+231,224,210,172, 80, 96,153,138, 24,131, 97,171, 82,165,154,219,127,199, 14,199,155,167, 78,177,207, 79,157,138,227, 25,141, 91,
+ 76, 46, 67,  6, 10,239,163,226, 16, 16, 16,128,144,144, 16,  4,  4,  4,124, 96,205, 22, 10,133, 16,  8,  4, 16,  8,  4,176,183,
+ 49,201, 85,130,163,105, 26,137,137,137, 31,236, 27, 55,110,220,251, 33, 67,134, 56,  2, 64,130, 50,142,251,114,250,148,248,212,
+212, 84,206,201,169,124,206, 70,141, 26,221,164, 40,202,189,132, 40,182, 25, 63,126, 60, 50, 51, 51,187, 77,156, 56,177,101,190,
+149,140,138,223,176, 97,195, 80,  0, 16, 10,133, 85, 30,130, 54,195,140,255,121,129,101, 10, 42, 18, 88,133,  8,  9,  9, 49,184,
+186,186,110,139,124,252,174,131,167,175,  7, 36, 50, 81, 39, 66,200, 47, 34,145,104,198,176, 97,195,112,255,254,125, 60,127,254,
+252,215,191,186,236, 73,195,134, 13, 47,138, 68,162, 26,165, 29,211,106,181,239,159, 61,123, 86,170,175, 88,114,114,242,188,135,
+ 15, 31,162, 60, 39,247,  1,  3,  6, 20,111,140,138,156,220,203,172,193, 88, 14,  6,189,  1,170, 60,245, 31,141,119,129,192, 82,
+169, 84, 24, 56,112,224,  7, 22,172,228,228,228, 42,221,115,101, 44, 87,101,129,162,233,206,190,141,252,249, 87,239, 62,253,160,
+113,237, 61,126, 49, 68,  2, 30,164, 34,  1,196, 34, 62, 36, 34,  1, 98,227,147, 80,175, 94,  3,193,141,139,103, 58,151, 37,176,
+ 12, 12,139,229,191,158,  5,  0, 28, 62,125, 21,129, 53,165, 88, 48,247, 27,244,239,223, 31, 66,161, 24, 71,143, 30,198,202, 13,
+187, 49,161, 70,254,163,106,210,216, 15, 43, 54, 29,192,162,133, 11,168,195,135, 14,183, 52,161,193,  5,143,199,  3, 77,211,127,
+250, 44,252,110,138, 53,146, 99, 57,232, 75, 62, 35,150,  3, 56, 14,110, 63,254,  8,183, 31,127,196,195,  2,113,234,163, 82, 65,
+173, 86,  3,109,125, 43, 37,174,116, 58, 29,148, 74,165,254,201,147, 39, 78,165, 52, 76, 73, 58,157,174, 66, 65,179, 99,199,142,
+136, 81,163, 70,249,216,218,218,134, 61,125,242,196,224,219,168, 17,191,164, 15, 86,157, 58,117,178, 22, 46, 92,116,100,104,255,
+ 30,253, 54,127,251, 57, 51, 97,225, 30,158, 41,142,238, 69,162, 88,175,127,219,177, 99, 71,147, 36,190, 90,173, 78, 44,235, 88,
+ 96, 96,224, 40, 66,200,143,117,234,212, 17,181,107,215, 14, 55,111,222,196,143, 63,254,200, 50, 12,147, 10,  0,205,155, 55,119,
+ 88,180,104, 17,  9, 11, 11,131,181,181, 53,146,147,147,119,  5,  6,  6, 46, 42,207,241, 93, 40, 20,182,109,220,184, 49,165,213,
+106,255, 36,174,150, 46, 93,138, 65,131,  6,161, 78,157, 58, 96, 89, 22,185,185,185,104,215,174, 29,127,221,186,117,109, 77, 17,
+ 88, 20, 69, 77,235,208,161,195, 74,228,207, 34, 44, 46, 28, 95,  2,248,186,192,186,157,216,163,239,240, 23,173, 58,126, 22,232,
+ 94,187,129, 75, 69,156, 78, 78, 78,223, 82, 20, 53,  0,  0, 13, 32,150,178,181,173,237,224,224,224,212,186, 71, 15,228, 18, 66,
+111,185,112,129,240, 36, 18, 57,  0,147,134, 26, 53,  6, 21,106,120,228,187,242,245, 29,216, 27, 33, 33, 33,232,247,121, 31,  8,
+  4,  2,240,120,124,  8,248,124,240,  5,249, 22, 44,107,123,203, 42,213, 35,  5,157, 71, 98,101,101,  5,112,128,165,149, 85,161,
+ 37,147,  0,224, 40,138,226,202, 41,231, 94,123, 39,143,115, 20, 88, 90,129,101, 12,168,254,105,191,162, 50, 29,185, 99,163,  4,
+ 44, 43,201,141,121,139,105,215, 30,242, 97,134, 25,102,129,101, 26,138, 59,133,150,134,246,237,219, 79,177,176,176, 88, 87, 80,
+241, 34,246,126, 60, 98,239,199,195,187,110,253, 22,254,141,  2,179,  6, 13, 26,  4, 59, 59, 59,124,245,213, 87, 28,128, 95, 43,
+123,253,168,136, 23,114,  0,156, 66,161,248,170,192, 34,208,232,225,195,135, 14,143, 30, 61, 66,227,198,141,139, 55, 30,104,217,
+178,236,118,187, 96,102,220,151, 40,195,159,170,138, 86, 49,232,245,122,228,229,169,161,211,233,193, 24, 88, 48, 12,131,128,250,
+ 22,216,179,117,118,254, 62,166,208, 90,150,111, 37, 19,  9,180,104,211,180,154,  1,132, 82,223,184,247,190,220,154,178, 52,203,
+ 21, 77,211,184,237,145,255,183, 78,  9,  6,147,133, 22,199, 26,235, 58, 59, 57, 33,230,194,  3,  0,128, 92, 42,198,197,221,139,
+ 32,147,230, 79,110,232, 54,124, 14, 36, 34,  1, 36, 34, 62,244,122, 61,156, 28,107,130, 49, 26,234,150, 41,188, 13, 58, 93, 13,
+ 39, 43,184,116,107,138, 39,143,238,225,203, 41, 99, 49,106,212,104,  8,196, 22,184,113,227, 26, 98,148,201,120, 29,151,129, 41,
+243, 54,194,192,176,208, 51, 70,232, 13, 70,172,221,117, 22,122, 35, 87, 97, 35, 47, 16,  8, 48,115,230, 76, 73, 89,199, 15, 28,
+ 56,160, 54,253, 25, 25,160, 82,169,161,213,106,161,215, 49,208, 27, 24, 24,107,  9,176,104,238, 96, 48,122,  6,121,159, 55,131,
+222,192,128,157,222,  7,122,157,  1,177, 82, 30,213,178,177,194,  0, 80,234,219,143,226, 44, 43,226, 47, 20,  5,229,  9, 48, 83,
+ 80, 40,178,124, 27, 53, 10, 27,209,189,201,210, 59,247, 30,165,220,185,247,232, 79,231,121,212,111, 18, 61, 97,201,129,217,149,
+ 17, 87,192,135,195,133,127,177,220,255,112,253,250,117, 39,185, 92,142,136,136,  8,208, 52, 13, 66, 72, 90, 72, 72,136, 19,  0,
+204,159, 63, 63,149,207,231,219,209, 52,141,233,211,167,131,199,227, 57,124,241,197, 23,223,  3, 88, 95, 78, 71,206,219,194,194,
+226,  3,235,149, 64, 32,192,236,217,179, 49,116,232,208, 34,113, 37, 16,  8,176,107,215, 46,  4,  6,  6, 66,167,211,121,155,146,
+222,184,184,184, 71,  0, 90,153, 32, 64, 72,129, 40,175,176,124, 82, 20, 53,226,201,196,137,181, 53, 15, 31,226, 11,150,245,169,
+ 91,183, 46, 52, 26, 77,209,113, 79, 79,207,234,113,113,113,137, 10,133,226, 55,  0, 27,149, 74,229,227,242,248, 12, 26, 22,239,
+163,226, 10, 59,171,104,210,164, 73,145,197,170,184,245, 74, 32, 16, 64, 34,148, 87,250,153,177, 44,139,236,236,108,122,215,174,
+ 93,181,124,124,234, 19,  0,240,246,174, 79,206,158, 61, 87, 93, 46,151, 71,219,218,218,234, 43,124, 39, 45,173,112,101,244, 64,
+  0, 64,255,246, 93, 10,173, 88,  8, 94, 52,  7, 60, 62, 31,141,102,204,  1,240,176,232,124,157, 78,  7,150,101,105,152, 97,134,
+ 89, 96,149,241,226, 27, 12,229, 30, 95,189,122, 53, 26, 54,108, 88,110,  3,180,110,221, 58,236,221,187,119, 53,199,113, 81,149,
+189,126,143, 14,254,245,177,230,248, 11,143, 58,249,149,194,194,233, 61, 41,149, 74,133, 59,119,238,192,202,202, 10,175, 95,155,
+ 22,182,235, 63, 17,166,129,227,  0,189,129,129, 42, 79,  3,157, 78,135,233,179, 76,154,153, 78,244,186, 28, 94,247, 46,173,203,
+ 20, 15,133,195,125, 20, 69, 85,232,131, 85,209,208,224,  7, 22, 12,131,  1,133, 77, 71,110,158,  6,237,  7,127,139,135, 39,215,
+  2, 64,190,184, 18,243, 33, 17, 10, 32, 17,242, 64, 17,128,160,108,110,131, 58,251,211, 53,139,102,221,218,244,235, 30,183,222,
+173,199, 98,202,228, 41,224,  9,165,176,177,115,  0,195,114,168,174,112,196,155,248, 12, 28,253,101, 86,193,168, 40,135,214, 67,
+230, 99,245,220,177, 88, 49,175, 98, 35, 38,143,199,195,250,245,235,213, 37,173, 86,197, 63,185,138,219,193, 63,  4, 86,158, 26,
+106,141, 22, 95,125,187,209,244,103,212,185,149,196,148,147,203, 19, 80, 21,  9,176,210, 68,150, 41,239,111,163,222,152,251,119,
+ 86, 48, 44,203,226,236,217,179, 69,207,163,172,103,104,170,181,149,101, 89,188,127,255, 30, 47, 94,188, 64,211,166, 77,145,149,
+149,  5, 62, 69, 97,230,179,103,240, 25, 54, 12, 58,129,  0, 44,203, 66, 40, 20, 98,252,248,241, 38,231,103, 37,149, 99,129, 31,
+155,177, 92,114, 23, 23,151, 85,245,234,213,171, 29,149,145,129,144, 39, 79,208,100,220, 56,  0,192,237,219,183,139, 91,  0, 49,
+120,240, 96, 97,116,116,244,232,240,240,240,209, 46, 46, 46,171, 19, 18, 18,102,150,249, 62,113,218, 34, 31,172,  1,131,251,162,
+118,189, 90,216,187,115,127,209,241, 25, 95, 79,  3,159, 47,  0, 95,192,135,181,149,117,165,111, 45, 59, 59,155,183,106,213,106,
+223,160,160,166,146, 33,195, 70, 82,122,134,195,162,101,107,233, 67,251,247,216,237,222,179, 87, 34, 22,139, 95, 86,248,140, 12,
+250, 63,213, 83,132, 16,240,248,124,240,132,  2,128,101,193,113,156,108,197,138, 21, 11, 95,188,120,209,184, 94,189,122,208,106,
+181,195,  8, 33,161,230, 56, 88,102,252,171,  4, 22, 77,211, 21, 90,167, 40,138,170,112,136,112,198,140, 25,176,176,176, 40,171,
+225,225,158, 61,123, 22,150,144,144,176,149,227,184, 42,197,197, 57,243,123,232,139,  5, 95,246,201,  1,160,  6,  0,107,107,235,
+212,246,237,219,231,  2,208, 31, 58,116,232,131,115,181, 90,237,251,178,120, 28, 29, 29, 23, 44, 95,190,124,106,215,174, 93, 41,
+138,162,254, 84,185,151,220, 12,  6,  3, 78,159, 62, 61,117,201,146, 37, 40,203,234, 85,216,120,231,169,212, 80, 23, 56, 56,191,
+121,126,196,212,202,188,194, 83,158, 54,114, 45,213,114,245,137, 82, 15,154,166,113,222, 49,255, 62,186,165, 84,204, 69, 40, 58,
+226,237,251,216, 38,206,246,214,200,200,202,133, 72,200,135, 68,244,135, 53, 95, 34,206,183, 94, 73, 68,124,216, 88, 91, 32, 45,
+ 45,  9,124, 62, 63,162, 28,225,240,158, 16,210,106, 96,159,110,151, 40,154, 39, 46,126,140, 47,177,148, 94,190,243,204, 38, 41,
+ 93,133,226,198,  0,150,229, 48,117,209, 78,211, 10, 48,143,135, 73,147, 38,149, 41,112, 78,157, 58, 85,105, 11,150, 90, 83,201,
+103,100, 34,127,121, 67,128, 21, 29,175,  8,133,179, 11,101, 50,153, 79,129,248, 50, 25,141, 26, 53, 58, 47,149, 74, 77, 14,114,
+100,106,208, 81, 66,200,194,246,237,219,255,232,230,230,230, 56,113,226, 68, 66,211, 52,  2,  3,  3,237,127,248,225,135,172,124,
+203,136,183, 69, 97, 29,179,102,205, 26,188,124,249, 50,133, 16,178,168, 60, 78,161, 80, 24,110,101,101, 21,216,174, 93, 59,100,
+101,101, 33, 54, 54, 22, 50,153, 12, 62,171, 86,225,217, 23, 95,160,209,230,205,160,218,183,  7, 33,  4, 66,161, 16,207,158, 61,
+131, 68, 34,  9, 47,139,207,213,213, 53,136,203,119, 50,111,129, 63,134,  5, 57,  0,119,  8, 33,179,226,227,227, 31,148, 82,223,
+ 81,  0, 96,100, 89,174,130,251, 31,252,237,183,223,130,146, 72,224,210,172, 25,212, 81, 81,208,235,245,104,218,180,105,145, 85,
+189,105,211,166,160,105, 26,181,107,215,134,173,173, 45,142, 29, 59, 54, 24, 31,206,172,254,  0,154, 92, 61,222, 71,197,161, 89,
+179,102, 69,150,170,238,221,187, 23, 89,176,248,124,126,145, 37,139, 24, 43, 22,172,132, 16,174, 68, 93, 76,132, 66,129,104,248,
+200,209,212,172,175,190,100, 13,140,129,165,105, 62,245,213,220, 37,212,235, 87,207, 69, 42,149,138, 34, 21,244,214,170,247,234,
+143,254, 29,242,141,160, 71,107, 59,128, 46, 16, 86,189,158,199, 21, 61, 23,203, 51,191, 11,151, 46, 93,218,175, 94,189,122,249,
+195,237,  0,207, 28,  7,203,140,127,147,192,138,124,242,228,137, 87,253,250,245, 17, 19, 19,243,167,153,109,133,239,152, 76, 38,
+131, 68, 34, 41,180, 16, 69,150, 69,118,245,234,213, 95,  0,252, 82,248, 91,161, 80, 52,107, 55,160,237,221, 38, 93, 26, 99,223,
+146,253, 89,  9,  9,  9,190,133, 49,177,  8, 33, 68,161, 80, 12,229, 11,121,  3, 61, 26, 84,111,  3,150, 93,126,229,212,237,249,
+229,221,136, 71,157,250,185,  0,212,197,102, 17,174,172, 74,134, 16, 66,250,119,237,218,149, 10, 11, 11,195,192,129,  3,177,119,
+239,222, 50,207, 29, 58,116, 40, 14, 28, 56,128,206,157, 59, 83, 75,151, 46,237, 95,145,192,202,183,142,232,254, 99, 15,179, 52,
+203, 85, 73,145, 88,161, 16, 96,153, 43,207, 30,135,248,249,  6, 54,231,191,139, 75,130, 88,200,131, 88,244,199,140,125, 73,129,
+255,149, 68,196,135,179,131, 13, 30,222,189,174,103, 24,195,149, 10,196,197,123,148, 18,164, 81,100, 97, 31,241, 73,139,134, 54,
+165,253,103,213,183,195,208,240,224,170, 10,211,203,231,243,177, 99,199, 14,117, 89,214, 43, 83,243, 32,223,202,104, 64, 94,158,
+ 26,121,106,205, 71,123, 38, 78, 78, 78, 14,142,142,142,155,172,173,173,197,165,  9,168,146,199,255,138,184, 42,136,139, 21, 54,
+106,212,168, 74,137, 44,161, 80, 88,243,206,157, 59, 69, 65, 70,203,251,212,233,116, 24, 48, 96,128, 73,150,239,224,224,224, 29,
+254,254,254,111, 28, 28, 28, 46,251,248,248,136,222,188,121,131,197,139, 23, 19, 62,159,111, 89, 88,127,228,228,228,128,166,105,
+100,100,100,128, 16, 50, 34, 56, 56,248, 66,121,156, 90,173,246,198,141, 27, 55,252,122,246,236, 73,135,135,135,131,166,233,252,
+116, 53,107,134, 70,155, 55,227,249,151, 95,162,205,187,119,208,232,245, 16,139,197,184,120,241,162, 62, 47, 47,239, 70, 57,247,
+190,245,222,189,123,245,197, 98, 49,244,122, 61, 88,150,  5, 69, 81,132,199,227,181,244,241,241, 89,  7,160,113,137, 14,152,227,
+248, 25,203,234, 26, 25,198,152, 16,243, 38,197,  4,139, 16,246,238,221,139,166, 77,155,162, 77,155, 54,136,143,143, 71, 84, 84,
+ 20,186,117,235, 86,116,206,147, 39, 79, 16, 26, 26, 10, 79, 79,207,138, 45,120,148,  1,158,117,107, 66, 32, 16,128,207,231, 67,
+192,207,255,204,223,242, 45, 87,  2,190,  0,124, 30, 31, 98,137,216, 68,237,255, 97,153,180, 42,176,124, 73,165, 18,182,118,237,
+218, 97,175,223, 68,249,128,  3,101,105,105,101,146,175,109, 33, 31, 33,164, 72, 92,241,133,130, 34, 75, 22,  0,100,101,101,105,
+122,247,238,253,155, 86,171, 29,137,143, 56,146, 98,134, 25,255, 43,  2,171,219,152, 49, 99, 54,119,234,212,169,195,204,153, 51,
+ 33,151,203,145,144,144, 80,244,130,  9,133, 66, 84,171, 86, 13,121,121,121,184,121,243, 38, 50, 51, 51,175,  2, 24,111,234,133,
+ 19, 18, 18,238,191,126, 28,153,214,174, 95,115,187,250,205,235, 90,199, 70,198, 53,  5,112,183, 64, 92,253, 58,104, 70,183,145,
+237, 62,107,  2,129,144,143,216,215,137,255,181, 12,161, 40,138, 38,132, 96,224,192,129, 38,157,255,249,231,159,227,198,141, 27,
+ 40,111, 56,177,200,130,149,167,129, 74,253,241, 58,103,132, 16, 24,141, 70, 52,141, 72,255, 96,102, 86,161,229,170, 80, 88,152,
+ 98,185, 42,234, 33,231,229,173,184,117,229,228,184,122, 13, 26, 57, 52,245,243,194,235,232, 56, 44,159, 51,182,232,248, 87, 19,
+  6, 97,215,193, 83,112,117,182,135, 38, 47,  7, 23,206,157,206,202,206,206, 94, 81,213,123,216,125, 34, 63, 14,100,171,193, 31,
+206, 17, 24,248,229,207, 38,253,159,207,231, 99,228,200,145,101, 90,176, 46, 95,190,172, 54,101,120,148,227, 56,232,117,  6,228,
+170,212, 80,231,125, 28,129,165, 80, 40, 26, 53,109,218,244,242,150, 45, 91,236,236,237,237,161, 84, 42, 63, 16, 88, 10,133,162,
+ 81, 80, 80,208,229, 45, 91,182,216, 57, 56, 56, 32, 54, 54,214,228,240, 32,165,136, 43,164,164,164,144,140,140, 12,214,198,198,
+166, 82, 34,139,162, 40,104,181, 90,188,124,249,210,212,119,196,228, 25, 95,114,185,124,231,146, 37, 75, 68,201,201,201,160,105,
+ 26, 47, 95,190,252,160,172, 22,110,223,126,251, 45,230,204,153,179,  9, 64,141,242,248, 24,134, 89, 61,116,232,208,209,241,241,
+241, 54,142,142,142, 72, 72, 72,128, 80, 40,  4,199,113, 32,237,218,161, 85,116, 52,244, 70, 35, 36, 18,  9, 34, 34, 34,176,117,
+235, 86,149, 86,171, 93, 93, 26,151,167,167,167,144,162, 40, 47,129, 64,128, 33, 67,134,124, 88, 46,119,239, 70,179, 26, 25,129,
+227, 62, 17,229, 50, 16,107,147, 36, 93,207,211, 52, 77,198,127,181,188, 78, 80,235,238, 13, 94, 61,127,240, 38, 37, 41,238, 78,
+  5,183,111,208,233,116,168, 87,175, 30, 30, 61,122,132, 43, 87,174,160,125,251,246,104,221,186, 53,174, 95,191,142,224,224, 96,
+132,134,134,130, 16,  2, 59, 59,187, 66, 55,139,114,125, 45,116,121, 12,146,149,105,127,178, 86,149,252, 45, 16,  8,160, 85,235,
+ 77,122, 70,197, 69, 19, 33,  4,182,182,182,218,181,107, 86,136,228,114,185, 17,  0,228, 50,169,241,208,238, 13,176,183,179,213,
+114, 38,154, 88,139,134,  5, 11,196, 21,205,231,127,224,166,192,113, 92,206,211,167, 79,199, 17, 66,158, 18, 66, 10,235, 15,115,
+ 28, 44, 51,254, 29,  2, 43, 36, 36, 36, 26, 64, 71,127,127,255,193, 55,111,222, 92, 61, 99,198, 12,135,150, 45, 91, 34, 61, 61,
+ 29, 53,106,212,128, 66,161,192,163, 71,143,240,228,201,147, 84,142,227,102,  6,  7,  7,239, 45,229, 37,235, 88, 86,172, 12,142,
+227, 56,133, 66,113, 88,155,155,251, 69, 64, 27,111, 92, 61,116,107,137,139,139,203,120, 87, 87,215,233, 35,230,244, 26,217,182,
+119, 99, 68,132,190,197,253, 75,207,144, 20,147,138, 17,173,102,149,203, 89,210,201,221,218,218,122,180, 84, 42, 21,  2,208,151,
+210, 11,254, 96, 22, 97,113, 78,150,101,141, 58,157, 14,  7, 15, 30, 52, 73,100,237,223,191, 31, 26,141,  6, 44,203, 26,203,186,
+119, 35,203, 18, 30, 95,  4, 69,181,122,208,235, 85, 96, 89,211, 39, 72,114, 21,228, 39,195, 48, 88,176, 96,  1,190,254,250,107,
+ 44, 90, 84,246,232, 10,143,199,195,134, 13, 27, 80,209, 51, 74, 79, 79,207, 81, 40, 20, 67, 15,108,255,249,200,144,177, 83, 45,
+220,154,251, 98,231,161,243, 48,232,245, 16,137,248,176,177,148,161,118, 77, 55,232, 52, 42,108, 94,191, 38, 91,163, 86, 15, 45,
+233,123, 86,222,115, 47,137,225,189, 91, 99,233,214,147,184,181,239,143, 73,136,173,  6,207,195,111, 43, 38,195,223,127, 71,185,
+156, 70,163, 17, 60, 30, 15,  7, 14, 28, 80,151, 54,123,144,166,105,240,249,252, 50, 45, 88, 31, 62, 35, 35,225, 11,196,168, 86,
+195,  7, 58,109,238, 71,121, 70,118,118,118, 95,111,223,190,221, 78,163,209,224,213,171, 87,120,249,242, 37,  8, 33, 69, 42,166,
+240,120, 94, 94, 30,158, 63,127, 94, 40,112, 94, 86,230, 61, 42,180, 92,165,164,164,144,132,132,  4, 72,165, 82,234,233,211,167,
+ 26, 95, 95,223,176,242,222,239,226,156, 90,173,246, 93,135, 14, 29,202,178, 24,185,138, 68,162, 15,102,124, 21,  6, 29, 45, 57,
+ 84, 88, 90, 58,243,242,242,158,173, 94,189,186, 86,227,198,141,177,101,203, 22,157,133,133,133,112,198,140, 25, 28, 77,211,100,
+237,218,181,200,200,200,208,205,158, 61, 91,120,235,214, 45,168, 84,170,199, 21,221, 59,199,113, 57,132,144,113,205,155, 55,223,
+125,225,194,  5,169,151,151, 23,178,179,179,193,113, 28,118,237,218,133,201,147, 39, 67, 44, 22, 35, 34, 34,  2,159,126,250,105,
+ 94, 94, 94,222,184,226, 49,176,138,115, 50, 12, 67,248,124, 62,199,178, 44,190,255,254,251,162,160,162,133, 65, 70, 37,  2, 35,
+182,206,240,144, 77,219,150, 37, 27,252,195,182, 97,  0, 96,100, 24,227,171,231, 15,222,236, 90,255,195, 53,129, 64,112,179, 24,
+103,131,146,177,176,  8, 33,223,253,244,211, 79,155, 90,180,104, 33,145,203,229,240,242,242,194,157, 59,119,112,231,206, 29,220,
+186,117,171,176, 12,192,214,214, 22,153,153,153,136,141,141, 85, 19, 66,190, 43, 47, 63,133, 82, 62, 60,234,212,204,159, 45, 88,
+ 96,177,226, 23,155, 61, 88,220,154, 37,224,243, 43,124,223, 75,186,119,216,218,218, 50,  1,  1,254, 97,106,181,154, 46,212, 82,
+246,246,246,207, 11,206,229,170, 85,171,166, 43, 81,228,255,196, 25,185,125,  3,130, 23,127,151, 63, 44,248, 44,182, 72,108, 93,
+251,196, 31, 60,129,  0,213,122,244, 45,222, 14,108, 36,132,236, 40,248,174, 45,198,249,205,199,142,133, 85,153,122,201,204,249,
+247,112,254,155, 44, 88,  0,128,208,208,208,125, 13, 26, 52, 56,191,116,233,210,165,199,143, 31, 31, 59,117,234, 84, 98,105,105,
+137,195,135, 15,115,105,105,105, 59,133, 66,225,215,247,238,221,203,168,202,197, 57,142,219,121,253,216,221,137,195,103,247, 38,
+ 51,214,142,104, 25,252,251,243,240,134,205,189,208,176,185, 23,130,175,134, 97,253,156,253,123,141,  6,227,247,  9,  9,  9, 49,
+ 21, 80,105, 59,182,168, 91,210,201,221,238,198,181,223,237, 42, 59,139,144,227,184,195,199,143, 31,159,218,173, 91, 55,234,225,
+195,135,127,242,185, 42, 92, 30,135,101, 89, 92,190,124, 25,122,189, 30,135, 15, 31,102,203,139,131,197,130, 59,185,121,227,138,
+225,155,183, 31, 19, 10,  5,  4,247,110, 30, 69, 86, 70,249, 86, 57,129,128,143,223,246,159,212,243,120,244,171,114,210,250, 62,
+ 52, 52,212,110,249,242,229, 52, 33,  4, 27, 55,110,  4, 69, 81,101, 58,180, 63,127,254,156, 53, 24, 12, 21, 62, 43,165, 82,121,
+217,217,217,249,243,141,171, 23,236,106,215,185,151,181,119, 61, 31,158,163, 99,117,240,104,130,140,180, 84,  4,223,191,197, 92,
+ 56,123, 50, 83,171,213,142, 80, 42,149,151,255, 74,  1, 92,178,229, 68,169,251,251, 78, 93, 93,145, 21,133, 49, 24, 12, 60,153,
+ 76,  6,134, 97, 74, 13,213,208,190,125,123,201,157, 59,119,212,122,189, 30, 52, 77,151,171,152, 88,224,163, 63, 35,163,209,232,
+157,145,145,  1,149, 74,133,144,144, 16,110,253,250,245, 41,153,153,153,115,138, 31, 79, 79, 79, 71, 78, 78, 14,130,131,131,185,
+ 45, 91,182,164,100,103,103,207,169, 76,254, 21,198,197,202,200,200, 96,165, 82, 41,101, 48, 24, 12,190,190,190, 98,153,204,180,
+152, 87,  0,240,248,241,227, 46,101, 29,107,209,162, 69,228,157, 59,119,106, 27,141,198,226,107, 20, 10, 52, 26,141, 87,175, 94,
+189,120, 38,164,111,240,165, 75,151,246,221,186,117,171,161, 86,171, 29,157,156,156,188, 27, 64,117, 30,143,135,215,175, 95,167,
+232,116,186,190,223,125,247,221, 78,149, 74,245, 76, 46,151, 15, 54,177,222,184, 64,  8, 25,226,237,237,189, 99,193,130,  5,242,
+ 54,109,218,240, 20, 10,  5, 26, 55,110,140,136,136,  8,156, 61,123,214,176,113,227, 70, 85, 94, 94,222, 40,142,227, 46,151,211,
+233,224,  0, 16,134, 97, 32, 20, 10,139, 54,145, 72,  4,129, 64,128, 60, 29,133, 49,171,162,212, 12, 36,234,213,243,199,157,229,
+  0,146, 24, 27,149,154,156, 24,251,128, 16,114, 83,169, 84,102,149,101, 25,211,104, 52,126, 28,199,241,178,179,179,215,106,181,
+218, 17, 51,102,204,112, 89,190,124, 57,124,125,125,145,154,154, 10, 91, 91, 91,184,184,184, 32, 55, 55, 23,209,209,209, 70,189,
+ 94,191,217,104, 52, 46, 76, 74, 74, 42,119,216, 49, 51, 53, 27,110,206,213, 63,176,116,114, 28,  7,206,  8, 24,180, 70, 24,245,
+ 28,116,196,  0, 62,223,  0, 19,151,208,226, 24,134, 65,143, 30, 61,112,230,204, 25,244,238,221,155,  3, 80,166, 21,233,204,153,
+ 51, 21, 15,185,179, 44,248, 34, 33,120,130, 63,134,  5,243,173, 89,249,251, 40,242,167,231,105,182, 90,153,241,239, 20, 88,  5,
+ 13,115, 38,128,241,141, 27, 55,222, 61,101,202,148, 51, 44,203,242, 89,150,237,254,248,241,227, 91,127,229,226,  9,  9,  9, 33,
+ 10,133,226, 91, 39, 55,155,165, 93,135,182, 68, 93,191, 26, 48, 50, 70,220, 57,247, 24, 59,127, 58,113, 32, 62, 54,126, 68,241,
+181, 10,203,126,159,217,107, 45,  2,235, 82,  0,  4,197,134, 95,216,170,204, 34, 76, 78, 78,158,183,120,241, 98,252,248,227,143,
+149,158, 69, 88,214, 57,119, 31,197,143,111, 22,232,226,246,121,223,246,157, 41, 66,113, 90,157,182,156, 94,  1,184, 66,175,  8,
+ 30,143,126,117,227,126,172,111, 89,231, 38, 38, 38,118,152, 56,113,226,239, 20, 69,213, 40,110,154, 47, 11, 70,163, 49, 33, 45,
+ 45,173,147, 41,249,144,152,152,120,222,205,205,173,206,141, 11, 39,191,189,125,229, 92, 91,163, 81,239, 73, 64, 32, 16,  8,222,
+ 24,140,204,117,131, 78,183, 36, 46, 46, 46,227,175, 22,192,111,199,247,198,123,101, 42,120, 60, 58, 63,176,103,193,227, 62,186,
+110,  6,252,253,127, 43,243,127, 34,145,232,252,142, 29, 59,122, 12, 31, 62,156, 20,250,157,113, 28,247, 65,133,254,224,193,  3,
+181, 78,167,195,206,157, 59, 57,137, 68, 82,110,224,218, 15,159, 17,225,180,229,248, 67,153,250,140,114,115,115, 71,245,234,213,
+107, 23,  0, 17,128,215, 89, 89, 89, 19,148, 74,101, 92,241,227,189,123,247,222,  5, 64, 68,  8,249,211,113, 83, 80, 24,178,193,
+198,198, 38,172,192,114, 37,174,138,163,123, 57,229,155, 46,107,248,208,148,161,194,130,181,  5, 63, 43,252, 29, 24, 24,184,112,
+226,196,137, 69,139, 61,135,134,134,222,  6,224, 81,133,206,217,101, 66, 72,253,239,191,255,254, 75,177, 88,220, 46, 47, 47,175,
+ 78,129,160,139,208,106,181,215,212,106,245, 26,142,227,202,141, 45,245,230,205, 27, 93,173, 90,181, 34, 24,134,105,224,224,224,
+  0, 30,143, 87, 36,178,  0,224,126,140,109,112,124,124,124,227,202,166,237,220,185,115,238, 54, 54, 54,157,  8, 33,253, 56,142,
+171,155,147,147,163,253,225,135, 31,238,222,184,113, 35, 59, 60, 60,188, 75,171, 86,173,136,179,179, 51,222,190,125,203,229,230,
+230, 30,161, 40,234, 59,165, 82, 25,101,194, 61,199,237,220,185,179,178,249, 84,110,121,210,233,116, 41,247,238,221,179,189,114,
+229, 10,109, 52, 26,113,225,194,133,162,142,100,105,163,129, 81, 81, 81,208,233,116,229,142,161,235,179, 50,224, 59,237, 27,112,
+  5,179, 57, 11, 81,189,123, 95, 16,112,224,116,102, 61,101,198,191,  3,228, 63, 50,141,185,146, 38, 68,133, 66, 49, 80, 44, 19,
+ 77,170, 81,199,197, 87, 25,149, 28,150,147,149,183, 55, 33, 33, 97, 11,199,113,198,170,114, 86, 38,208,168,217,204,251,247,112,
+ 10,165,150, 23,  9, 45,168, 81,102,227, 96,212,191,215,229,101,119, 46,141, 51, 40, 40,200, 85, 32, 16,172,208,106,181, 93,203,
+139,210, 78,211, 52, 35,145, 72,206,107, 52,154,175, 75, 46,246,252,191,152,159, 71,142, 28, 41, 85,244,155, 58,139,176, 95,191,
+126,198,202,164,179, 81,163, 70,215,164, 82,105,169,  1, 53,243,242,242, 98,158, 60,121,210,233,159,144,159,133, 51,219, 76,241,
+ 17, 42,206, 89,149, 89,132,101,112, 22, 13, 17,186,187,187,139,244,122,189, 63,128, 58,  0,172,  1,164, 27, 12,134, 11, 41, 41,
+ 41, 73,206,206,206,129, 20, 69,125, 95, 32, 94, 23, 37, 38, 38,  6,255,157,239,166,155,155,155,216,210,210,114,  5, 69, 81, 46,
+166,252,159,101, 89, 93,114,114,242,140,212,212,212,196,210, 56,235,215,175, 31, 76,211,116,133,139,154, 27,141,198,184, 23, 47,
+ 94,  4,150,147, 78,243, 16,225,191,144,243, 95,105,193,250, 79, 67,169, 84, 30,  4,112,240, 99,114,150, 21,169,221,140,127, 14,
+ 10,197, 83, 85, 80, 32,150, 62,255,183,229, 89,161, 64, 42,101,255, 75,  0,228, 99, 95,207,148,112, 12,255,  4,112, 85,236, 41,
+ 22,  8,168, 86, 31, 51, 45,239,222,189,211,  2,184, 91,176,125,128,  2, 65,213,243,159,146,111,113,113,113, 26,  0,147, 63, 22,
+ 95,121,162,201, 12, 51,254,109,160,204, 89, 96,134, 25,102,152, 97,134, 25,102,152,241,113, 65,  0,116, 44,163, 71,104,178,233,
+143, 16,210,177, 10, 61,206, 43,102, 78, 51,167,153,211,204,249,255,132, 51,185, 28,206,231, 21,112, 54, 40,227,144,227,255, 80,
+126,250,149,193,185,172,  2,206,111,202, 57,252,216, 92, 62,255,127,114,254,107, 80,232,204,248,159,216,  0,116, 52,115,154, 57,
+205,156,102, 78, 51,167,153,211,204,105,230,252,183,109,230, 33, 66, 51,204, 48,195, 12, 51,204, 48,195,140,143, 12,147,  5,150,
+220,217,219,219,193,189,209, 46,219,106,190, 79,109,171,249, 62,117,112,111,180, 75,238,236,237,253,111,204, 52,133, 66, 33,113,
+113,113, 25, 92,189,122,245,203,126,126,126,217,174,174,174, 95,154,139, 82,229,209,150, 16,222,231,132, 76, 26, 78, 72,204,112,
+ 66, 98, 62, 39,100, 82, 91, 66,254,223, 45,155,177, 96,154,162,217,173, 11, 67,206, 47,152,166,104, 86,234,241,175, 20,118, 15,
+ 46, 15,248,121,201,100, 87,219,143,113, 61, 66,136,133,147,147,211, 86,103,103,231,119, 78, 78, 78,239,157,156,156,118, 16, 66,
+172,204, 37,206, 12, 51,204, 48,227,191,  7,147, 26, 51,219, 26, 13,199,120,215,171,251,245,226,249,115,136,179,163,189,148, 49,
+178,250,183,239, 98,125,230, 45, 94,122,196,182, 70,195,213,233,239,159,109,175, 66, 35, 64,220,220,220,  6,242,249,252, 30,  0,
+ 10,133,218, 75,131,193,112, 38, 46, 46,238,160,169,179,130,124,125,125,111,211, 52, 93,189, 50,215,102, 89,246,221,147, 39, 79,
+ 90, 87, 37,195, 92, 93, 93,251,187,186,186,238,104,218,180,169,212,207,207, 15,  2,129,  0,203,151, 47,159,  9, 96,141,201,247,
+222,182, 45,207, 49,211,118, 24,205,227,245,  4,224,203,113,  0,  8,253,148,213,235,206, 37, 11,108,119,113, 33, 91, 12,166,240,
+184,184,184,204, 33,132,140, 64,254,180,242,237, 74,165,114,197,127,162,144, 40, 20,138,106,132,144,118, 28,199,213,163, 40,234,
+ 25,203,178,151,148, 74,101,218, 95,229,117,  2,198, 55,111,217,242,231,225, 51,103,210,234,155, 55,241,243,142, 29,107,145,157,
+ 13,  0, 27, 42, 91,150,130,130,252,250, 89, 88,160,  7,  1,252, 65, 64, 40,112,143,211, 51,169,115,143, 30,133, 30, 52, 37,150,
+ 90, 89,  8,  8,  8, 56, 11,160,112,225,184,115, 33, 33, 33,221, 43,203,145,245,134,155, 43,234,233,221, 42,235,205,181,185,  0,
+186,150, 60,206,104,196,195, 57,186, 90, 15, 53, 23, 26, 11, 96,213, 95,201, 83, 66,136,212,193,193,225,233,201,147, 39,221,154,
+ 52,105,194,  3,128,224,224,224, 97, 61,122,244,104, 95, 16, 74, 32,251,239,168,104,154, 53,107,102,195, 48,204,110,154,144,166,
+ 44,203, 90,  3,  0, 69, 81,153, 70,142,187,207,227,241,134, 87, 53, 88,177, 25,102,152, 97,198,255,172,192,146, 59,213,243,169,
+ 95,223,123,230,133,227,187,171,101,166,103,106,126, 89,185, 59, 68,197, 19,230,121,249,120,  9,126, 89,179,194,102,210,180, 25,
+211,229, 78,245, 30,228, 38,133,135,153,122, 81, 23, 23,151,234,238,238,238,199,230,204,153,211,160,101,203,150,124, 71, 71, 71,
+ 36, 37, 37,225,213,171, 87, 13,238,220,185,211,251,196,137, 19, 51, 93, 92, 92, 62, 51, 33,130, 59,100, 66, 65,173,131,203,151,
+ 56, 11,173,172,193, 25, 25,216, 52,240,203, 31,255,100, 89, 36,222,184,  2,163, 94, 15,142, 53,194,173,203,167,133,226, 10, 65,
+ 65, 65,130,170,100,150,155,155,155,162, 78,157, 58,123,103,207,158, 45,208,233,116,  8, 13, 13,197,189,123,247,216,228,228,228,
+165, 38,139,138,134,125,124,156,121,206, 71,122,245,238,234,222,253, 19, 71, 97, 13,103,  7,112,172, 24,225,209,250,234,151,111,
+133,118, 57,123,254,226, 44, 71,159, 62,125,147,195,142, 63, 43,143,167, 65,131,  6, 77, 41,138,250, 49, 62, 62,190, 80,  4, 45,
+ 15, 10, 10,250,161,248, 57, 37, 53, 42,203,178,224,241,120, 73,121,121,121,  3,159, 63,127, 30, 90, 26,239,  8,127, 98, 48, 24,
+243,203,133,128,  7,227,213, 20,183,227, 29, 59,118,172, 57,106,212, 40,248,251,251, 35, 56, 56,184,221,225,195,135,167, 85,171,
+ 86,237,145,193, 96, 56, 39, 18,137,174, 23, 76, 75,175, 52,  4,192,172,225, 51,103,210,242,119,239, 32,127,242,  4, 67,178,179,
+121,203,128, 89,149, 17, 88,  1,  1,  1,181, 58,117,244, 63,210,251,179, 54,222,206,206, 62,  2, 62,223, 30, 28,199,193, 96, 72,
+175,147,146,242,178,159,149, 21,102, 55,105,210,164,239,195,135, 15, 77,138, 52,219,184,113, 99, 39,150,101, 55,115, 28, 39, 32,
+132, 76,  1,208,237,194,133, 11, 48, 26,141,232,222,189,123,183,128,128,128, 90, 28,199,253, 34,151,203, 57,181, 90, 61,250,209,
+163, 71, 73,229, 89,174,178,223,112,115, 19,137, 71,151,186,  1,195,145, 72, 46,116,153,209,213,229,188,165, 39, 89, 60,239,103,
+229, 61,  0,232,234,233,105,225, 81, 79,246,141,220,178,161,109,118,252,149,111,186,122,122,110, 59,255,230, 77, 78, 85, 58, 44,
+  5,229, 96,197,158, 61,123,170,  5,  5,  5, 21,197,203,242,243,243,163, 87,172, 88,225,250,229,151, 95,174,  5, 48,210, 68, 81,
+ 93,199,206,206,238, 34,203,178,218, 23, 47, 94,212, 41,220,239,216,232,179,230,118, 22,178, 14, 41, 25, 57, 55, 83, 95,156,184,
+ 97, 10, 87, 96, 96,224, 40,  1, 69,109, 93,243,253,100,186, 94,195, 70,144, 58, 56, 64, 31,167,132,202,104,176,189,255,228, 69,
+247,101,107,182,166,  4,  6,  6,142, 11, 14, 14,222, 97,174,146,205, 48,195,140,127,141,192, 18,137,132,179,231,125,247, 13,201,
+ 76,203, 84,107,178,115,116,  6,141, 70, 67,  9, 56,205,179,176,232,100,138, 71,103,126, 57,109,170,197,236,111,191,155, 13, 96,
+136,169,226,170, 94,189,122, 15,183,109,219,230,104,107,107,139,172,172, 44,164,165,165,225,225,195,135,224, 56, 14, 93,187,118,
+ 21, 53,106,216,192,127,245,154,181,247, 92, 92, 92,154, 85, 36,178,120,124, 30,225, 75,165, 56,218,198, 31,148, 64,128,190,225,
+  9,249,226,194,160,199,249,129, 61,  0,  0,180, 80,136,  1,145,249,147,124,196, 98,113,149, 51,139,227,184,102, 45, 90,180, 16,
+  0,192,140, 25, 51,178, 85, 42,213, 18, 66,200, 62,165, 82, 25,111,170,184,178,119,112,184,177,114,241, 88,219,  6,181, 60,160,
+ 55, 24, 16,155, 28, 15,142,  8,225,226, 40,195,208, 62,126,130,150,129, 66,143,149, 27,174, 92,119,106,208,171,117,210,243,147,
+ 47,202, 20,150, 50,217,238,181,107,215,226,208,161, 67,  0,128,107,215,174,193,203,203, 75, 86, 81, 26, 94,189,122,229, 49, 98,
+196,136,  3,  0,106,151,118,220, 96,  4,111,223,190,125,  0,128, 85, 95, 13,166, 55,220,138,168, 41,145,252,177,150,114,155, 54,
+109,208,166, 77, 27,106,201,146, 37, 65,215,174, 93, 11, 58,112,224,128,222,213,213,117,109,124,124,252,225,170,228,169,250,230,
+ 77,200,159, 60,  1,110,220,168,244,127,  3,  2,  2,106,213,171,103,119,127,245,170, 31,236, 79,159,121,129,149, 43,119,224,205,
+155, 55,  0,  0, 15, 15, 15, 12, 30,212,159,191,239,183,205,245,103,207,158,127, 55, 32, 32,160,101, 72, 72, 72,133,209,205, 89,
+150,221,252,213, 87, 95,125,234,234,234,138,185,115,231, 70,212,170, 85, 11,150,150,150,216,178,101, 11,108,108,108, 96, 48, 24,
+ 34,150, 47, 95,206, 83, 42,149, 88,183,110,221,175,197,172, 91,127, 66,219,206,109,231,138,122,122,183,170, 27, 48, 28,114, 75,
+ 23,108,219,127, 16,175, 66,118,183,210,234, 95,206, 93, 50,217,117,168,154, 19,141,112,243,178,152,237, 30,216,198,174,118,253,
+ 79, 81, 35, 32,212, 94, 99,188, 21,253,253, 36,143,165, 60,177,102,247,188,149,127,182, 18,146,254, 71,232,  6,217,225,182,207,
+ 47, 35,141,227,230,177,  5,194,170, 40,254,149,145,195,167,173, 91,183, 46, 18, 87,239,222,189,131, 86,171,133,183,183, 55,165,
+211,233, 76,138,105,165, 80, 40,234,180,110,221,250,246,222,189,123,237, 90,181,106,245,193,210, 45,206,118,214,157,111, 28, 91,
+ 59,245,199,159,127,171,231,232,211, 39,179,162,142, 64, 96, 96,224,168,134,117, 61,183,175, 93,254,  3,161,115, 98,193,179, 78,
+  1,140,169, 72, 56,248, 43,136,212, 22,221, 39,204, 64,227,160, 32,122,234,151,115,182, 55,110,220,152,123,244,232,209, 78,115,
+181,108,134, 25,102,252, 43,  4, 22,203,177,190, 78,142,118,146,181, 43,119, 61,162,245, 58,157,204,218, 74,199,183,178,100,137,
+133, 21,173,215, 25,114,107,120,212, 16,178, 28,235, 91,134, 32,185, 82,178,151,237,238,238,126,108,231,206,157,142,124, 62, 31,
+ 44,203,194,193,193,  1,111,223,190, 69,102,102, 38,114,114,114,240,230,229, 75,212,172, 94, 13, 83,199,141,117, 89,180,114,213,
+ 49, 66, 72, 96,241,225,194,146,156, 28,203,129,101,152,146,189,121,160,148, 37, 99,202, 90, 70,198,212, 41,165, 44,203,190, 85,
+ 42,149,144, 74,165,240,246,246,150, 63,122,244,232, 86,124,161,  9,169,162,123,111,219,150,231, 34,114, 56,182, 98,241, 64, 91,
+ 80, 17,136,136,201,132,167, 91, 19,216, 91, 87, 67,124, 74, 46, 30,133,157, 67,228,155,179,240,116,173,129,113,131,107, 91,175,
+217,114,231, 12,  9, 24,239, 89,124,184,176, 56,103, 78, 78,142,188, 70,141, 26,112,117,117,  5,203,178, 48, 26,141,  8, 11, 11,
+131,209,104, 44,250, 93,252,115,215,209,171, 96,178,223, 99,248,176, 97, 72, 79, 79,151,155,122,239,133,226,106,203, 96, 69,125,
+ 85, 70,130,  0,  0,100, 54, 46,250,113,191,197,191,104,220,184, 49, 28, 28, 28,  4,119,239,222,157,  1,224,112,101,243, 83, 15,
+ 44,255,121,231,206,117, 67,178,178, 40,  0,216, 78,  8,171,207,143,170,109, 82, 89,234,216,177,209,209,181,107,191,183, 39, 92,
+ 24,108,173,150,225,225,195,247,208,235,243,139, 74, 90, 90, 50,166, 76,202,  6,143,103,129, 85,171,231,219, 13, 24, 48,225,104,
+193, 16, 25, 91, 94, 58, 57,142, 19, 92,189,122, 21,131,  6, 13,194,129,  3,  7,120, 52, 77,227,193,131,  7,144, 72, 36, 24, 57,
+114, 36,234,215,175,207,147, 72, 36,184,125,251, 54,178,179,179, 73,121,233,188,126,241,250,226,172, 55,215,230, 38,146, 11, 93,
+182,237, 63,136,177,131,  6,194,153,139,186,101,229, 73, 22,119,234,217,226,  7,142,174,214, 67,102,225,107,227,213,160, 39,  4,
+ 66, 57, 38,207, 90,136,136,231,167,109,242,114,158, 78, 34,198,216,106,  0,166,149,228,228, 14,247, 51,174,219,127, 55,224,114,
+245, 71, 53, 20,  1,227, 31,  0,120,250,135,192,242,224, 17,202,104, 85,104,189,124,253,250, 53,222,188,121,  3, 30,143,  7,181,
+ 90,253,193,162,190,197, 57,253,253,253,199, 27,141,198, 31,  0, 64,167,211,237,114,114,114, 26,245,203, 47,191,216, 21, 46, 65,
+ 84,220,114,149,158,153,157,113,247,209,139, 87, 51,198,247,107,123,243,254,243, 88,235, 70,189, 99, 50,159,156,200, 42, 45, 63,
+155, 53,107,102, 35,164,233,173, 63,175,152, 71,140, 81, 87, 33,242,110, 11,158,220, 11, 70, 67, 60, 52, 25, 42,104,162, 19,160,
+219,178, 30, 30, 19,191,196,138,101, 63,146, 65, 67, 71,111,245,244,244, 60,246,166,152,  5,239, 63, 49,221,219,204,105,230, 52,
+115,254, 51, 57,255,117,  2,139, 16, 42,219,104,100, 69,  2,  7, 71,205,232,  1, 29, 26, 94,186, 18,252, 88,106,111,201,235,220,
+214,191,205,195,103,209,247,  8, 69, 12,132, 80, 38,249,117,184,185,185, 13,156, 55,111, 94, 67, 75, 75, 75,176, 44, 11, 43, 43,
+ 43,164,164,164, 64,167,211, 33, 43, 43, 11,218,156,108,232,115,178,241, 36,246, 29, 90,180,105,139,142,205,154,122,159, 55, 24,
+  6,  2, 56, 80, 22,167,145,162, 57, 59,255, 38,232, 31,149,  6, 86,175,195, 97, 15,187, 34,171,213,231,239, 50, 65,  8,  1,171,
+215,225,124, 80,109,  8,229, 50, 52,250,122, 94,149, 51, 43, 33, 33, 33,180, 70,141, 26,231,187,118,237,218,117,252,248,241, 84,
+ 98, 98,226,  5, 39, 39,167, 22, 73, 73, 73, 21, 14,143, 58,102,216, 12, 31, 62,174, 97, 45,123,107, 10,167,111, 95, 64,211,122,
+125, 32, 21,241,145,146,169,  6,  1, 65,212,219, 43, 96, 25, 57,158,188,124,135,230,190, 82,180,110, 98,237,150,251,123,250, 56,
+148, 61, 92, 70, 50, 50, 50,144,156,156, 12,131,193,  0,131,193,128,126,253,251, 99,207,238,221, 80,169, 84, 80,171,213,208,233,
+116, 48, 26,141,160, 40, 10,151,207, 28, 70,108,244, 75, 52,111,214, 12, 40, 39,226, 55,159,  6,179,234,171,193, 60,  0, 16, 90,
+ 56,232,115,114,114, 32,147,201,160,202, 72, 16,204, 92, 89,100,217, 18, 92,187,118, 13, 33, 33, 33, 80, 40, 20, 38,149,163,210,
+240,  6,216,250,214,104,156,219,245,248,113,199, 59,199,143,179,247, 79,159,142, 19,229,228,108, 49,229,191, 65, 65,126,253,166,
+ 78,233, 94, 87, 34,150, 32, 46,102, 45,234,213, 19, 96,230,151,118, 88,178, 44, 21,  0, 48,117,138, 27, 26,  7,218, 35, 59,243,
+  8,236, 29, 61, 49,115, 70,111,207,220, 92,110, 24,128, 93,229,151,119, 50,229,233,211,167, 17, 78, 78, 78,188,208,208, 80,  8,
+133, 66, 72, 36, 18, 72, 36, 18,136,197, 98, 36, 38, 38, 66,167,211,225,208,161, 67, 76,193, 16, 98,153, 40, 24,  6,236, 58,163,
+171,203,249, 87, 33,187, 91,185,210,209, 79,250, 78,110,249,238,233,253,208,156, 75,151,239, 44, 98, 52,226,216,204,184, 43,223,
+212,106, 28,106, 63,233,235,  5, 88,191, 98, 30, 94, 61,184,153,238, 84, 61,123,131,132,104,119,  5,125, 82,138, 85,172,237,  2,
+222,164,239,  7, 48,227, 71,244,181, 62,237,116,119,252, 57, 30, 73, 73, 76, 13, 89,137,183,161,106, 81,109,255,161,117, 60, 40,
+221,213,171, 87, 37,173, 91,183,134, 70,147,191,100, 28, 77,211,216,187,119, 47,203, 48,204,181, 82,173,150,  6,195, 15, 33, 33,
+ 33, 46,106,181, 26,159,127,254,249,212,249,243,231,203,248,124,126,254,251,101, 52,126, 96,185, 90,188,102,207,197,233, 63,108,
+184,118,241,192, 50,197,226,217,163,218, 14,153,252,227, 53,  0, 23, 74,227,101, 24,102,247,218,101,223,210, 34,107,  3, 72,227,
+ 78,208, 39,169,241,126,219, 88,232,178, 53,168,179,104,  1,  0, 33,116,  6, 10,103,123,245,  3,101,171,192,152, 86, 45,120, 91,
+110,222,222, 13,160,183,185,106, 54,195, 12, 51,254,255, 91,176, 88,246,230,235,232,119,221, 58,117, 12,114, 59,115,227,217,163,
+241, 35,187,119,166, 40,138, 60, 14,123,127,195,179,134,179,253,181,235, 55, 57,150,101,111,154,114, 49, 62,159,223,163,101,203,
+150,188,140,140, 12, 40, 20, 10,164,164,164, 32, 62, 62, 30,  6,131,  1,154,172, 76,232,114,178,161,203,206,130, 81,149,131, 55,
+193, 15, 81,175,186,155,232, 74,190, 19,252,  1, 83,248, 75, 90,168, 10, 23,253,  5, 33, 16, 89,200, 33,146,203, 43, 94,  9,190,
+  4, 20, 10, 69, 47, 75, 75,203,111,114,114,114,206,197,199,199, 47,214,233,116,147,126,250,233,167, 71, 11, 23, 46,180,159, 61,
+123,182,229,172, 89,179, 14,187,187,187,251, 85,228,135,100, 97,107,236,215,180, 97,109, 58,242,253,115,  4,214,233,135,154,138,
+150,136,138,207, 66,122,142, 22,105, 89,106,212,173,243, 53,146,210,242,144,165,210,224,217,171,125,112,117,174, 69,209,252, 55,
+ 93,202, 17, 88, 72, 74, 74,250,224,158, 15,236,223,143,188,172, 44,120,122,122,194,219,219, 27, 14, 14, 14,120,255,254, 61,110,
+223,190,141, 33,  3, 62,  5,159,223, 23,201,201,201,229,222,239,174, 80,142,175, 80, 40, 66,148, 74, 37, 66, 67, 67,241,230,205,
+155, 82,135, 85,127,255,253,247,252,134,215,217,217,228,188,116,114,114,250,150,162,168,  1,  0,104,  0,177,148, 66, 81,219,193,
+193,193,169, 69,239,222,200,226,243,233, 95,174, 93, 35, 60, 43, 43, 57,128,204,138,184, 44, 45,209, 61, 48,176,165, 48, 51, 99,
+  7,128,124,163,212,168,145, 14,232,218,197,  9,132, 18, 65,225, 98,  1, 66,137, 64,136, 16,121,170,171,240,169,239, 43,176,176,
+ 56,214,163, 60,129, 85,232,208, 94,191,126,125, 76,152, 48,  1, 39, 78,156,192,174, 93,127,156,222,183,111, 95,124,246,217,103,
+200,205,205,133,147,147, 19, 79,169, 84, 70,  5,  4,  4, 84,232,248,110,233, 73, 22,107,245, 47,231, 90,123,201, 82,140,176,111,
+158,107, 16,165,205, 91, 25, 53, 15,192,170,174,158,158,219,244,236,205,232,200,231,167,109,222, 62,186,158,174,140, 84,121,108,
+ 59, 27, 85,166, 15,214,141, 27, 96,157,124,111,232, 63,237,210,134,215,187,103,187, 60, 87, 55,167, 58,191,108,208,237, 77,119,
+181, 91,236, 94,221,109,200,188,159,190,209, 15,237,211, 74,255,205,204, 41,252,250, 62,222, 36, 59, 59, 27,  7, 15, 30,100,206,
+159, 63,159,192,178,236,244, 50,104,233,  2,161,133,  1,  3,  6,200,164, 82, 41, 98, 99, 99, 81,175, 94, 61,176,108,126,222, 38,
+164,164, 61,187,243,232,121,248,140,  9,253,219,236, 59,117,237,229,197,235,193, 47,123,119,105,209,136, 16,206,189,172,180,210,
+132, 52,245,241,245,  5,199,197,131,230,215, 65,220,222, 81,208,164,229, 64,171,210,128,226,203,160, 51,208,208,179,  4, 34,223,
+ 38,120,125,226, 20,106, 15,174, 15, 30, 33, 45,204,213,178, 25,102,152,241,255,  1, 21,170, 13, 90,163, 91,242,213, 55,115, 97,
+ 99, 37,177,106,226,239,229,124,242,194,141,224,155,119,131, 95,186, 87,179,119,224, 12, 58,155,229,171,215,187,145, 60,181,169,
+ 78,222,222,246,246,246,208,235,245,120,253,250, 53,226,226,226,160,215,235,193,168, 84,208,102,102, 66,147,145,  1,163, 42,  7,
+  2,163, 17,234,148,100,216,136,133,192, 31, 51, 12,203, 51, 85,254, 33,166, 74, 17, 92,132, 16, 72, 44, 45, 33,178,176,  0,197,
+163, 77,206, 28, 23, 23,151,  0, 63, 63,191, 67, 87,175, 94, 13,106,217,178,229, 34,119,119,119,171,196,196,196,247, 73, 73, 73,
+ 29, 86,172, 88,161,117,112,112,192,144, 33, 67,234, 26, 12,134,225, 21,113,  9, 68,218,134,213,157,188, 80,205,233, 83, 40,236,
+155, 34, 61, 91,139,228, 76, 53,146,210,242,112,240,216, 64, 92, 58,247, 57, 30,223, 30,134,215, 15, 70, 33, 53,215, 18, 98,219,
+118,  0,184,  6,229,113,222,189,123, 23,155, 55,111,198,230,205,155,177,105,211, 38,172, 95,191, 30, 25, 25, 25,104,208,160,  1,
+ 98, 98, 98,112,254,252,121, 36, 36, 36,192,222,222, 30,143, 31, 63,198,150, 45, 91,240,240,225,195, 74, 23, 18,141, 70,  3,129,
+220, 78,191,234,171,193, 88,245,213, 96,176,124,153,190,152,  0, 55,189,176, 81,212,136,132,222,189, 27, 38, 88, 91,251,248,250,
+250,118, 29, 48, 96,128, 71, 80, 80, 80,209,113, 79, 79,207,234, 60, 30, 47, 81,161, 80,108, 87, 40, 20,126,229, 43,127,206,223,
+198,214, 27, 58,109,120,193, 51,230,131, 16, 49,218,127,242, 18, 45, 90,  5, 67,111, 16,128, 34, 34, 80,148, 24, 12,147,  6, 75,
+ 11, 39,112, 28,105, 80, 65, 18,187, 93,184,112,  1,155, 55,111,198,219,183,111,139,132,101,143, 30, 61,166, 12, 26, 52,232,152,
+209,104,196,153, 51,103,112,226,196,  9,212,172, 89, 19,141, 26, 53,130, 94,175,239, 86,209,125,207,251, 89,121,111,223,234,243,
+159,243, 13, 54,126, 98,137,123, 77,168,228,189, 38,181,117,144,  1,192,249, 55,111,114, 28,171,103, 47, 85,229, 60,141,177,118,
+203, 93, 86,145,131, 59,199,205, 99, 67, 34,195,239,239, 59,126, 33, 43, 57, 41,131,239,223,176,190,122,201,194,175,  5,238, 53,
+107, 47,159,247,205,  4,231,248,108,113,230, 39, 83,207,135, 31,187,240, 48,119,232,200,177,204,232,113,147, 53,231, 47, 92, 62,
+206,178,108,195,178,102, 16,178, 44,139,132,132,  4,188,120,241,  2, 81, 81, 81, 72, 73, 73, 65,106,106, 42,114,114,114,138,134,
+ 21,165, 57,217,103,215,239, 60,253, 68, 38,145, 72,131, 26,122, 85,127, 16, 26,150, 44,147, 72,164, 94, 53,171,215, 33,100,  1,
+ 85,  6,175,181, 88, 34,  6, 64,144,243,252, 38, 52,233,185, 80,103,230, 66,147,145, 11,173,158,134, 70, 75, 65,173,163, 96,223,
+170, 19,114, 85, 26,104,210, 50,192,114,156,141,185, 90, 54,195, 12, 51,254, 21, 22,172,212,212,136, 92, 75,  7,159,207,190,156,
+245,195,249,253,191,254,226,168,213,230,197,216,217,200,141,114,169,208,126,244,248, 31,145,147,155,209, 39, 55,221,244, 89, 79,
+ 25, 25, 25,136,142,142,134, 68, 34,129,128,207,135, 81,173,134, 81,173,130, 58, 35, 13,148, 94, 11,129,209,  8, 91,169,  4, 53,
+ 20,206,112,119,170,216, 58, 66,179, 70,162,188,124, 14, 23,135,246,249,211,176,224,133,230,117, 33,146,203, 32,182,182, 65,139,
+ 19,183,242,133,142, 64,  0,204,171,120,145,118,103,103,103,123,133, 66,113,106,253,250,245,130,180,180, 52,188,120,241,226,201,
+187,119,239,178,108,109,109, 45,248,124, 62, 27, 25, 25,121, 37, 60, 60,188, 71,173, 90,181,192,113,156,103, 69,124, 57, 89, 50,
+189,193,192, 65,153,252, 30,113,  9, 47, 96, 41,175,  6,142,174,134,228,244, 60, 16, 56,129,209, 70,192,104,200,119,183,210,170,
+227,144,167, 51,109,221, 94,189, 94, 15,189, 94, 15,131,193,  0,173, 86,139,161, 67,135,226,206,221,187, 56,112,226,119, 68,191,
+137, 64,221,154,206, 24, 54,108, 40,252,252,252,240,232,209,163, 42, 23,148,102,223, 92,124, 33,145, 72,176,105,211, 38, 72,165,
+210, 15,196,173,137, 98,117, 85,135, 14, 29,106, 71,168, 84,120, 17, 30,142, 38,253,251,  3,  0,110,223,190, 93,116,142, 90,173,
+198,224,193,131,133,209,209,209,163,195,195,195, 71,187,184,184,172, 78, 72, 72,152, 89, 22,231,217,179,247, 48, 97, 66, 24, 82,
+ 82,242,253,176, 15,238,175, 95,116,236,109,180, 30, 93,186,231,143, 92, 89, 91, 91, 99,245,234,  6, 38,165,211,104, 52, 98,235,
+214,173, 69,195,130,  0,192,227,241, 90,204,152, 49,227,179,210,206,247,241,241,169,144,115, 70,127, 55,241,227,247,146, 73, 86,
+181,221,235, 91,218,251, 34,205, 16,218, 32, 52, 62, 97,202,140,254,110,107, 87, 31,142,211, 72,136,118, 23, 49,198, 86,227,137,
+ 53,187, 77, 73,227,155,243,235,116,214,238, 35,119, 39,166,100,127, 55,121,236, 96, 59, 75,107, 71,213,246,245, 75,108, 40,154,
+226, 78,  5,235, 51,235,123,216, 89,247,106,250,115,238,132, 47,191, 15,213, 49,177,147, 17,123, 42,162,188, 80, 21, 44,203, 66,
+169, 84, 34, 37, 37,  5, 49, 49, 49, 72, 77, 77, 45,120,247, 83,139,134,  8,171,  2, 66,  8,116, 49, 49, 72, 58,177, 29,206, 67,
+134,162,206,194,133, 48,178, 60,104,242,140, 56,210,186,  3,178, 51,213,208,177,  4,214,  1,205,209,233,204, 45, 16,214,  8,220,
+191,107,174,149,205, 48,195,140,127,135,192,  2,128,236,148,176, 40,187, 26,190, 74,149, 90, 37,117,114,116,208, 74,197, 34, 54,
+ 43, 59,135, 14,125,246, 68,159,155,240,250, 85, 37,174,247, 50, 44, 44,172, 65, 92, 92, 28, 98,222,191,  7,163, 86,129,210,234,
+192,105,242,208,177,101,115,136,  1,136, 41,  2,  1,171,  7,143, 22, 34, 39, 55, 27,  0, 94, 86, 68,202, 26, 12, 31, 84,234,132,
+ 16, 16,138,130, 88, 46,135,208, 66,  6,145,165,197,  7, 22, 45, 83, 32,145, 72,246,109,217,178,197,197,217,217, 25,171, 87,175,
+134,139,139, 75,189,142, 29, 59,230,181,105,211, 70, 98,111,111,143, 58,117,234, 32, 48, 48, 16,215,174, 93,  3, 33,228, 77, 69,
+124,140, 78, 24,242, 50,154,169,150,149,243, 24,247, 67,247,192,160, 51,192,179,206, 28,168, 13,118,144, 57,140,134, 70,119, 10,
+198,204,235,  0,  0,161,101, 91, 36, 38,166,  2, 32,207, 43,243, 48, 57,142,195,211,167, 79,177,255,228, 13,184,212,240, 70, 76,
+100, 56,194,175, 93,193, 29,  7, 59,184,251,212,135,193, 96, 48, 89, 16,153,122,158,169, 13, 48, 33,100,240,216,177, 99,145,201,
+227,  1,221,187, 67, 16, 21,  5,189, 94,143,166, 77,155,162,113,227,198,  0,128,166, 77,155,130,166,105,212,174, 93, 27,118,118,
+118, 56,122,244,232, 96,  0,165, 10, 44,142,144,199,172, 49,173,158,135,135, 71,145,192,218,189, 39,  5,161,193,159,128, 64,136,
+117,235,255,136,202, 80,189,122,117, 36, 38, 70,131, 16,174,162,252, 60,215,189,123,247,110, 54, 54, 54, 24, 53,106, 20,196, 98,
+ 49,250,244,233,  3,141, 70, 51,  0,  0,150, 46, 93,138,111,191,253, 54,223, 42, 53,111, 30,230,207,159,143,188,188,188, 50,135,
+134,247,172,241, 85, 36,167,179,163,157,156, 93,251,180,179,119,111,216,190,115, 71,212,242,106,143,246,157, 99,  0,224, 39, 91,
+222,187,  1, 43,230, 54, 56,110, 95,205,118,199,165, 11,151,231,181,108,211,254,187,217,227,109, 22, 47,221,146, 81,161, 79, 99,
+214,251, 93, 57,175,132,  3,215,252,178,121,207,154, 31,190,157, 38,142, 73,209,101,196,103,112,185,114, 17, 79,238,233, 68,228,
+ 83,102, 45,138, 86, 42,163,102, 34,246, 66,132, 41,207, 48, 42, 42,170,200,103, 79,163,209, 64,165, 82, 33, 54, 54,182,232,249,
+170,101,150, 93, 38,143,236,217, 72,165, 86,231, 61,120, 22, 25, 51,119,234,144,102, 42,181, 58, 47,242,109, 76,  4,199,253,204,
+150,241,204, 51,243, 84,121,182,218, 44, 13,178,158,188,130, 93,251, 26,208, 51,  4, 90,163, 17, 25,169, 57,208, 49,128,129,230,
+195,173,223, 48, 24,192, 67,118, 74, 34, 40, 66,204,241,176,204, 48,195,140,127,143,192, 34,132,144, 70, 13,107, 40, 86,204, 27,
+226,198, 50, 76,221,228,212, 36,134,199, 19,241,171, 89,169, 19, 42,115, 49,131,193,112,230,214,173, 91,189, 91,182,108, 41,138,
+124,246,  4,186,172, 44,232,178, 50,193,103, 25,216, 74,  2, 65,233,181, 32, 58, 29, 92,235,177,208,228, 72,112,247,225, 43,131,
+193, 96, 56, 83,174, 16,  0,199,177, 76,190,192, 34, 20,245,193, 80,161,200,202,  2, 34,185, 28, 34, 11,139, 82,135, 16,203,130,
+147,147,147,180,107,215,174, 29,252,253,253,193,113, 28, 86,172, 88,  1,189, 94, 47, 52, 24, 12, 69, 22,163,220,220, 92, 28, 57,
+114,  4,123,246,236,185, 99,101,101, 85,225,212,114,150,209,158,191,122,251, 73,183, 33,125,218,  9, 47, 95,223,  6,131,142, 69,
+182,198, 18,185,106, 45,114, 53,124,104, 69,157, 65,200, 45, 80,180,  8,205,253,106,227,234,237,  8,141,209,160,191, 80, 89, 33,
+164,209,104, 16, 27,243, 14,113,111, 34, 32,207, 78,132,131,165, 20,121, 81, 17,240, 27, 54, 28, 58,157,174,194,123, 31,225, 79,
+ 12, 51, 26,128,183,186, 43,  5,129,220, 78,223,236,155,139,101,134,138,144,203,229,149, 26, 34, 76, 77, 77,197,233,211,167,209,
+180,105, 83,180,105,211,  6,241,241,241,136,138,138, 66,183,110,127,140,178, 61,121,242,  4,161,161,161,240,244, 44,223, 40,152,
+157,205,157, 75, 79,127,221,191, 87,175, 94,130,251,247,239,131,227, 56,120,121, 89,194,210, 66,  6, 66,137,224,237,237,  8, 32,
+ 95,251,183,109,219, 22, 58, 93, 60,163, 82,225, 92,121,156, 33, 33, 33,221,  3,  2,  2,106, 25, 12,134,136, 54,109,218,240, 94,
+191,126,141,126,253,250,225,224,193,131,  0,128,217,179,103, 99,246,236,217, 31,252, 39, 55, 55, 87, 83, 22, 95,221,134,245,190,
+174,197,216,180, 17, 75,220,107, 90,218,251,162,150, 87,123,  0,192, 39, 61, 70,161, 86,237,234,200, 78,125, 90, 83,163,126,215,
+ 71,192,203,176,121,186, 46, 62, 76,210,189,193, 72, 77,242,245, 72,  0,166,  4,238,229,212,145,  7,147, 98,248, 67, 15,157, 56,
+117,126,124,183, 30,159,242, 13, 70,134,105, 80,131,111,125,248,248,217,228,248,247, 49, 63, 35,230,194,243,162,215,164,124,129,
+101,204,206,206,134, 76, 38, 67, 84, 84,148,182,103,207,158, 34,181, 90,141,215,175, 95, 23,  9, 44, 71,123, 91,159, 22,141, 27,
+212, 91,188,102,207, 69,153, 72, 36,234,220, 54,208, 59, 44,242,125, 28,199,145,119,101,242,114,220,253,215, 47, 95,117,119,116,
+169, 13,229,141,251,144,182,236,  6,173,150,130, 70,199, 66,203,  0, 12, 45,128, 85,163, 32, 72, 60,188,193,  1,120,249,236,  9,
+ 24,142,187, 99,174,150,205, 48,195,140,127,141,192,178,183,183,119,244,247, 15,244,220,246,235, 33,112, 28,135, 87,161, 43,145,
+145, 28,142,239,127,186,231,233,230,230,214, 38, 46, 46,238,134, 41, 60,113,113,113,  7,143, 30, 61, 58,211,215,199,199,191,166,
+155, 27,158,188,123, 11,  1,103,132,192,104,  4,165,215,130,103,212,193,173,129, 17, 20,145, 35, 33, 33, 27, 91, 46, 92,121, 30,
+ 23, 23,119,176,220,198,129,208,168,214,179, 47,  6,125,210, 29,156, 65,143, 75,173,124, 32,182,144, 67,100,109,141,230, 71,174,
+131, 16,  2,142, 49,224,253,146,175,192,151,201, 97,219,172,226, 80, 64, 73, 73, 73,121,181,107,215, 14, 14, 15, 15,111, 92,183,
+110, 93, 44, 88,176,  0,177,177,177,224, 56, 14,201,201,201,154,148,148,148,248,180,180,180,119,132,144,227, 74,165,114,155, 41,
+145,194,147,109, 50,118, 95,254,253,202,215,  1,126, 62, 94,159,180,153,143, 51,103,230, 33, 35, 43, 27,121, 58, 62,114,212,122,
+168,212, 28, 92, 45,189,208,196,215, 23, 41,233, 58, 68,190,  8,137, 75, 21,216,110,173,140,245,138,162, 40, 60,121,242,  4, 30,
+ 10, 11, 68,220,186,  1,123, 41, 31,141, 20,206, 80,180,104,137,168,168, 40,211, 68,176, 17,188,226,179,  5,173,173,173,145,149,
+149,245,129,144,147, 74,165, 80, 40, 20,200,206,206,198,145, 35, 71,192,153,214, 40, 26,116, 58, 29,234,213,171,135, 71,143, 30,
+225,202,149, 43,104,223,190, 61,218,180,105,131,167, 79,159,226,210,165, 75,  8, 13, 13,  5, 33,  4,118,118,118,133,190, 63,101,
+ 70,180,127,248,240,201, 97,185,156,204, 25, 57,114, 98,253, 33, 67,134,224,232,209,  3, 24, 53,178,110,129, 99,187,  8,159,246,
+172,139,133,139, 30, 33, 40,168, 45, 28,236,  5,184,124,229, 69, 52,143,103,181,199,132,124,252,229,151, 95,126,225,169,213,106,
+228,230,230, 66, 46,151, 35, 45, 45, 63, 28, 85, 25, 22,172, 50,  3,171, 61, 11,121,185, 50, 51,135,203,224,114, 67,251,164, 51,
+161, 13,219,119,142,197, 39, 61, 70,226,242,153,157,184,122,241, 10,108,121,239,222, 66,150,115, 62,245,109,106,118,130,202,107,
+179,119,192, 24, 58, 78,117,113,243,212, 94, 54,180,139, 11,123,120,246,198,172,204,114,210,201, 17, 66, 72,122,216,222, 83,199,
+ 57,124,218,188, 89, 80,237,  6,213, 93,132, 25,169,201,220,145,147,231,159,235,223, 30, 61, 93, 40,172, 76, 88, 21, 97,225,218,
+181,107,127,  0,  0,150,101,119,173, 89,179,102,204,215, 95,127,237,160, 84, 42,139,  4, 86,114,106,250,213,230,221,167, 24,211,
+ 50,179,116, 59,214,204,234, 39, 17,139,132,115,151,238,184,110,160,113,191,204,202,133,199, 27, 62,103,211,111, 41, 71, 15,239,
+164,237,197,  2,220,153, 61, 15,111,174, 92,131,158, 18,160,243,165,  7,208,233,141,200, 78, 73,195,181,209,147, 96,237,108,131,
+115,169,145,198,172,156,236,225,230,106,217, 12, 51,204,248,255,  0,147,166,212,165,166,166, 38,223,188,249,  0,215,207, 44,198,
+141, 51,139,241, 34,244,  9,148,241, 58,196, 39,105, 96,105,105,121,175, 28,203, 87,199,146,141,130, 70,163,249,108,205,218,181,
+137, 82,153, 12,173, 59,116,128,179,131, 35,164,  2, 62,104,134,  5, 77,248,200, 77,177, 70,228, 51, 53,150, 28, 63,147,172,214,
+104, 62, 43,217, 56,148,228, 44,182, 31, 32,  4, 18, 75, 11,  8,229,114,136,139, 91,173,  8,129,192,194, 18,  2, 11, 75,208,  2,
+ 97,133,233,  4,128,188,188,188,190,227,198,141,203,200,201,201,193,160, 65,131,112,255,254,253,208, 11, 23, 46, 88, 94,185,114,
+ 69,242,236,217,179,218, 74,165,178, 83,124,124,252,150,178,196,213,159,238,253,250,117,134, 99,244,125, 55,108,218,150,174, 54,
+ 56,161,103,175, 13,176, 20,166,193,192, 24,  1,142,131,171,131, 28, 77, 90,124,133,100,109,115,156, 57,125, 38,131,101, 52,125,
+ 75, 46,153, 83,156,147,227, 56,206,206,206,238,  3,171, 28, 69, 81,184,126,253, 58,250,247,235,139,206,125,122,195,161,166,  7,
+ 28, 59,118, 67,231, 49, 19,176,101,203, 22, 80, 20,  5, 91, 91,219, 15, 44, 26,101,229,103, 33,178,178,178,224,238,238,142,  7,
+ 43,186,213, 63, 63,163,158,127,245, 55,191,248, 75, 31,175,170,127,245,234, 85,172, 90,181, 42, 55, 34, 34, 98,181,151,151,215,
+ 87, 21,229, 39, 33,228,187,159,126,250, 73,253,254,253,123,200,229,114, 48, 12,131, 59,119,238, 96,227,198,141, 88,181,106, 21,
+ 66, 67, 67, 97,103,103,135,218,181,107,131,162, 40,196,196,196,168,  9, 33,223,149, 83,150,216,156, 28, 94,223, 75,151,142,167,
+245,236,217, 26, 59,118,172,135,179,115,115,240,121,206,224,241, 29, 32,147,215,195,246,109,203,208,189, 91,  0, 94,134, 63, 78,
+207,205,229,245,189,126,253, 58, 99, 66, 58,245,207,158, 61,195,177, 99,199,176,112,225, 66,102,193,130,  5,200,202,202, 42,178,
+ 96, 21,174,146, 62,127,254,124,  0,128, 86,171, 21,149,197, 57,102,214,179,248,175, 23, 63, 95,152,148, 24,223,244,198,181,123,
+131,175, 94,188,130,232,200,171,184,122,241, 10,110, 93,189, 59, 59, 41, 49,190,169,127,147, 58,130,207,198, 76,254,122,247,177,
+163,180,220,210,  5,187,143, 29,165,  7, 77,153,254, 99, 96,231,246,223,153,240,140, 56,  0, 92,110,114,210,183, 63,173,252, 37,
+151,209,107,168, 21, 63,111, 80,170, 83, 18,190, 67,225,212,202, 50,172, 87,197, 57,163,162,162,182,188,125,251, 86,241,246,237,
+ 91,197,251,247,239,191,139,143,143,111,189,100,201,146,148,  2,193,149, 47,176, 94,156,188,247,242,214,206,159, 28,237,109, 36,
+205, 27,215,175,187,122,203,145,235, 49,177, 73,191, 21,198,192, 42, 45,157,247,238,221,203,208, 26,152,113, 95,205,154,207,101,
+102,234, 80,119,218,108, 48, 34, 57,180, 12,160,103,105,232,193, 67,232,226,213,176,176,179,192, 29, 46,131,211,210,212,216, 55,
+ 37,156,252, 43, 42,159, 85,129,153,211,204,105,230,252,103,114,254, 43, 45, 88,174,174,174,173,123,125,218, 17,109,123,204,  5,
+199,113,  8, 15, 89,142,140,148, 87,112,117, 22, 33, 42, 38,187, 25,128, 27,166, 94, 48, 33, 33, 33,198,197,197,165,233,226,181,
+235,142,117, 14,106,226,237,229,234, 34,178,118,175,  1,153,163, 35, 82, 83, 83,112, 63, 56,194,176,233,210,213,231,106,141,198,
+164,165,114, 88,150,229, 88,150,133, 64, 32,  0, 71,211,240,153, 58, 27,132,162, 64,241,121, 69,150, 29, 16,  2,203,128, 22, 32,
+124, 62, 12, 38,250, 12, 41,149,202, 56, 87, 87,215,190, 83,166, 76,249,125,215,174, 93, 84,219,182,109,253, 78,157, 58,197,254,
+149,204, 78,122,118, 60,204,169, 97,159, 54,235,126,217,120,196, 63,176,105, 13,247,154,238,162,230,110, 86,208, 27,140, 72, 74,
+ 78,195,141,187, 47,180, 17, 97,143,227, 57,189,190,111,114, 88,217, 81,220,  1,192, 96, 48,196,184,185,185, 57, 45, 88,176,  0,
+ 12,195,128, 97, 24, 24,141, 70,164,166,166,226,222,189,123,104,216, 56,  8,222, 35, 71, 35, 37, 37,  5,235,214,173,131,155,155,
+ 27,126,250,233, 39,228,228,228,224,230,205,155,101,230, 43,159,  6, 51,120,112, 65, 28, 44, 30,152,213, 61,122, 92,175, 95,191,
+126,203,166,134,100,193,188,117,249,150,173,105, 99,  7, 11,174,199, 92, 63, 44, 18,137,182, 68, 71, 71,151,235, 47,228,233,233,
+ 41,212,104, 52,126, 28,199,209,217,217,217,107, 53, 26,205,136, 25, 51,102,184, 44, 93,186, 20, 94, 94, 94, 72, 77, 77,133, 76,
+ 38,131,151,151, 23,114,114,114, 16, 29, 29,109,212,235,245,155,141, 70,227,194,164,164,164,148,242,184, 31, 62,124,248,218,223,
+223,191,105,114,210,166, 99, 19, 39,116,246, 50, 48,129, 66, 75,203, 86,224, 56,  3, 50, 51,226,  0, 60,213, 31, 63,113,229, 77,
+102, 38,253, 89,112,112,112,164, 73, 61, 14,138,154,176,102,205, 26, 20, 46,149, 19, 31, 31, 95,100,250, 43,205,130,101, 10, 86,
+ 31,142,211,  0,216,191,226,203,230, 95,102,167, 62,245,178,229,189,123,219,180,  1,187,110,245,225, 56,205,130, 47,173, 23,167,
+190,187, 17,145,160,186,184,121,247,177,163,244,240, 62,125,141,110,242,200,217, 98, 71,238, 72,251,158, 21, 90,219, 56, 63, 63,
+191,106,132,164,215, 74, 78,123, 21, 60,106,204,248,  1, 86,  2,245,185, 70,110,105,158, 84,117,127,113,104,104,232, 91, 83,215,
+244, 44, 81,246, 35, 20, 10, 69,235,149, 43, 87, 94,  4,240,129,143, 89,114,106,250,213,102, 61, 38,115,153,153, 89,143,147,195,
+ 78, 62,171,136, 43, 56, 56,120, 71, 96, 96, 32,134, 13, 29,181,117,236,232,177,116,131,169, 95, 35,254,250, 85,192,104, 64,226,
+173, 27,144,200,141, 56,147,250,206,152, 71, 83,227,130,131,131,205, 81,220,205, 48,195,140,127,151,192,138,139,139,187,225,233,
+225,118, 41, 34,162,117,167,234,110, 14,249,189,222,183, 74,196, 39,105, 47,153, 58, 60, 88, 82,100, 17, 66,  2,207, 50,204,192,
+ 75,124,126, 15, 82, 16,138,129,171,194, 98,207,121,121,121, 73, 77,155, 54, 45, 35,246,194, 79,165,238, 53, 26,141,113,166,112,
+199,199,199, 95, 87, 40, 20, 67,155, 55,111,190, 84,169, 84, 30, 75, 73, 73, 81,253,213, 12, 79,122,118, 60,140,180,109, 91, 63,
+248,193,205, 97,161,193,247,123,112, 28,231, 11,128, 16,138,250, 99,177,231,176,138, 23,123, 86,171,213,227,231,206,157,187,133,
+199,227, 85, 71, 65,224,208,194, 44,211,235,245,244,142, 29, 59,196, 58,157,142,  6, 64,  4,  2,  1, 35,151,203, 53,119,238,220,
+ 97,140, 70, 99,140,193, 96, 24, 95, 22,239,174, 80,142, 95,114,159,143,143,143,236, 53, 15,185,133,191,211,212,128, 82,169, 92,
+110,202,253,158, 59,119,206,221,198,198,166, 19, 33,164, 31,199,113,245,114,114,114,180, 63,252,240,195,221,107,215,174,101,191,
+122,245,170, 75,171, 86,173,136,179,179, 51,162,163,163,185,220,220,220, 35, 20, 69,125,167, 84, 42,163, 76,205,207,208,208,208,
+ 40, 66, 72, 35, 85, 30,247,185,133,252, 66,119,150, 67, 35,128, 35,132,144,103,185,185,228,156,139,139,199,111,151, 47, 31, 54,
+121, 42, 92,193,218,130,189, 10,127,  7,  4,  4,156,123,245,234, 85,183, 66, 11, 86, 73, 31,172, 74, 65,154,123, 74,163,126,215,
+151,200,243,142,175,254, 57, 78,  3,  0,243,214,100,102,  1,216, 62,181,143, 45,251, 50,100,251,114, 87,203,200, 89, 63, 31, 79,
+ 55,105, 77, 62,127,127,127, 15,138,162,  6,  2,104,224, 40,202,172,237, 32,204, 50, 18,194,181, 35,132,178,  7,240,212,199,199,
+231, 12,128,184,170, 36, 85,169, 84, 70,  0,168, 81,114,127,242,139,147,247,  0,220,171, 12, 87,112,112,240,142,102,205,154,157,
+220,176,117,243,110,154,144,166,196,104,180, 54, 78, 24,244,199, 98,207, 34,225,240, 96,243, 98,207,102,152, 97,198,191, 81, 96,
+  1,192,155,168,184,206,  0,224,229,229,197,189,126,253, 26, 28,199,145,191,114,225,  2,  1,117,  0, 38,  6, 17, 45, 11,207,159,
+ 63,247,255, 79,102,144, 82,169,220, 15, 96,255,199,228,228,242,135,170,118, 20,108, 85, 66,124,124,252, 51,  0, 65,255,141, 66,
+ 18, 22, 22,166, 26,225, 79,138, 44, 91,124, 26,140,169,255,237,212,169,211,123,189, 94,127,  5, 64, 44, 33,196, 26, 64,186, 94,
+175,191,152,146,146,146,228,236,236, 28,248,254,253,251,239, 11, 44,145,139, 18, 19, 19,131,171, 88,150, 88,  0,251, 10,182,143,
+138,144,144,144,238, 10,133, 34,212,206,206,206, 83,163,209,  8, 53, 26,141,160,184,246,151, 72, 36, 41,166,114, 89, 91,144, 93,
+  2, 94,134,157,181,  5,249,211,115,183,117,197, 81,181,234,121, 93, 91, 87, 28,173,140,184,244,243,243,219, 75, 81, 84, 77,142,
+227,156,  0,206,138,227,144,194,113, 92, 42,143,199,139, 15, 11, 11,139,255,167, 84, 52,247,242,  5, 84, 15,115,149,107,134, 25,
+102,152,  5, 86, 25,136,140,140, 36,230,108,251,247,161, 52,203,150, 41, 40,136,112,127,183, 96,251,  0,  5,130,170,231, 63,253,
+222,149, 74,229, 71, 17,241, 99,102, 61,139,  7, 48, 61,176,148,121, 22,243,214,165,231,  0,248,186,221,167,149,227,124,252,248,
+113, 12,128, 24,115,  9, 53,195, 12, 51,204,248,103,129, 50,103,129, 25,102,152, 97,134, 25,102,152, 97,198,199,  5,  1, 80,234,
+ 76,128,202,172,148, 93,149,217,  4, 21,241,155, 57,205,156,102, 78, 51,167,153,211,204,105,230,252,255,199,249,175, 65,225,180,
+243,255,196,  6,160,163,153,211,204,105,230, 52,115,154, 57,205,156,102, 78, 51,231,191,109, 51, 15, 17,154, 97,134, 25,102,152,
+ 97,134, 25,102,124,100,148,233,228,238,225, 81,205,135, 50,178, 45, 56,142,162, 57,138, 51,144,108,245,193, 55,233,233, 31,  4,
+  1,172, 94,189,186, 53,159, 66, 79,194,113, 50, 66, 88, 35, 75, 83,119,162,162, 98,195, 76,185,176,143,143,143,  0,192,  8, 62,
+159,223,210, 96, 48,184,240,120,188,  4,141, 70,115,155,207,231,239, 10, 11, 11,211,255,147, 50,169,101,203,150,131,142, 28, 57,
+ 98,221,163, 71, 15,173, 94,175,103, 68, 34, 17,111,223,190,125,162,145, 35, 71,102,222,190,125,187, 74, 51, 12,253,252,252,218,
+175, 88,177,162, 86,251,246,237,209,178,101, 75, 85,183,110,221,  4,129,129,129,130,175,191,254, 58,250,241,227,199, 87, 43,195,
+229,228,228,228,195,227,241,246, 16, 66,104,142,227,134, 21,204, 48,252,143,128, 16, 50,  8, 64,127,  0, 46,  0, 18,  1, 28,226,
+ 56,110,127, 21,185,186, 32,223,201,221,183, 96,215, 83,  0,167, 57,142,187,240, 23,210,215,  5, 64, 79,154,166,253,  0,192,104,
+ 52, 62,254, 88,156,124, 62,191, 17,  0, 24, 12,134, 39, 31,139,147, 16,210,168,192,146, 92, 37,206,128,128,128, 31,132, 66,225,
+ 88,  0,208,233,116, 59,228,114,249,146,210,206,187,113,227,134,174,172,208, 39, 62,181,  8, 23, 54,171, 94,254,247,229,225,  0,
+128, 10,127, 71, 87,113, 22,241, 22,111,174, 52, 94,140,127, 89,229,201, 51, 10,133,226,139,110,221,186,125,115,225,194,133, 31,
+227,226,226,182, 86,246,255, 71,142, 28,161, 77, 57,239,243, 89,219,123,200,229, 54,223,231,102,103, 45, 61,176,114,212,241,194,
+253,253,250,245, 51,194, 12, 51,204, 48,195, 20,129,229,225, 81,205,167, 95,239,207,126,154, 48,126, 34,161,105, 10, 47,195,195,
+121,147,166,126,217,201,219,219,219, 85,166,209,120,115,  0,171,150, 72,158,211, 52, 21,191,105,195, 47, 22,117,235,212, 49, 26,
+141, 44, 54,111,217,212,213,195,163,218,156,138, 68,150,163,163, 99, 45, 23, 23,151,181, 83,167, 78,117,236,212,169, 19,229,228,
+228,132,184,184, 56,203,227,199,143,215,254,245,215, 95,123, 56, 58, 58, 78, 79, 78, 78,142,174,202, 13,185,184,184,180,114,180,
+ 70, 39,185,152,235,128,108,130, 92, 35,126, 79,214,226, 82, 66, 66,194,173,170,102,146, 78,167,155,146,151,151, 23,228,237,237,
+205,109,222,188,153,140, 29, 59,150, 35,132, 16,181, 90,189, 11, 85, 12,225, 32,149, 74, 55,180,111,223,222,171, 69,139, 22, 81,
+119,239,222,237,198,113,220,185,126,253,250,121, 72,165,210, 72,  0,117, 42,195, 69,211,244,206,176,176,176, 70, 26,141,  6,  1,
+  1,  1,191,  2,  8,248, 15,137,171, 95,237,236,236,216, 77,155, 54,109,105,216,176,161,167, 74,165,202, 27, 51,102, 76,103, 66,
+ 72,123,142,227, 70, 87,130, 71,  6, 96,157,149,149,149, 96,241,226,197,247,219,182,109, 27, 35, 20, 10,165, 17, 17, 17,220,212,
+169, 83, 71, 17, 66,250,  1,152,202,113,156,170,178,156, 10,133,194,114,217,178,101,175,252,253,253,239, 10,133, 66,193,219,183,
+111, 49,109,218,180,  9,127,133,179, 94,189,122,210,101,203,150, 61,241,246,246, 78, 19,139,197,130,247,239,223, 99,198,140, 25,
+ 99,104,154,238,199,178,108,149, 56, 29, 29, 29,101, 75,150, 44,121, 22, 24, 24,152, 41, 22,139,  5,111,222,188,225,190,252,242,
+203,177,149, 73,103,155, 54,109, 62,167, 40,106,193,205,155, 55,  1,  0,205,154, 53,251, 65,167,211,205, 45,121, 30,199,113,104,
+217,178,165,166, 77,155, 54, 99,111,220,184, 81,106, 88,148,221,162, 89,131,  0,224,235, 31, 10,126, 23,236, 47,237,247,112,237,
+242, 74,151,121,159, 90,132,  3,128, 73, 95,109, 28,154,255,153,191,127, 83, 65,232,222, 13,181,  8, 87, 25,209,230,234,234, 58,
+190, 73,147, 38,223, 62,120,240, 96,119, 96, 96,224,180,173, 91,183,242,123,244,232,177, 88,161, 80,120,118,233,210,165,223,189,
+123,247, 86,132,135,135,111,248,152,229,223,217,185,218,250, 85, 63,111, 85, 76,159, 60,122, 41,128,227,230,230,195, 12, 51,204,
+168,180,192,162,140,108,139,  9,227, 39,146,129,131, 62, 79, 76, 72, 74,102,229, 22, 86,131, 14, 29, 62, 44,173, 83,167, 14,165,
+249,229, 23, 48, 41, 41, 48,206,156,217,252,198,141, 27,134,201,211,103,170,181,154,188,157, 46, 78,142,210,131,251, 15, 56, 31,
+ 59,122,164,  5,128,176,242, 44, 87, 46, 46, 46,107,143, 30, 61,234, 92,171, 86, 45,232,116, 58,164,165,165,193, 96, 48,160, 79,
+159, 62,116,211,166, 77,157, 71,141, 26,181,214,199,199,231,179,202, 88,178, 28, 28, 28,156,188,170,243,207,204,155,222,181, 78,
+251, 54,  1, 50,103,215,154, 64, 28,139,248,232,215,141,175, 60,  8,153,218,210,211, 45, 34, 50, 91,215, 35, 37, 37, 37,169,178,
+153,148,150,150, 54,107,252,248,241, 71,125,125,125, 29, 68, 34, 17,156,157,157,201,152, 49, 99,146, 19, 18, 18, 22,252,  5,177,
+146,159,215, 20,101, 44,254,105,234,130,212, 37,224,102,101,101,  5, 43, 43, 43,  0,112,253, 43,  5,162,127,255,254,116, 76, 76,
+204, 88,150,101,189,139,239, 79, 72, 72,240,112,112,112, 72,122,251,246, 93, 35,181, 78, 31, 56,113,242,156,249,  3,251,117,180,
+190,123,247, 46,186,119,239, 78, 17, 66,  6, 85,194,146,181, 46, 40, 40, 40,114,233,210,165,130,200,168,183,245,239, 63,122, 12,
+153, 88, 96,116,115,115, 21, 61,125,250, 84,184,108,217,178,164, 31,127,252,113, 29,128, 81,149, 72,250,186,254,253,251,103, 76,
+159, 62, 61, 47,226,205,219,154, 15, 66,159,113,114,145,192,224,228,228, 64,223,189,123,151,191, 97,195,  6,242,221,119,223, 85,
+154,115,204,152, 49,  9,211,167, 79,231,165,164,101,214, 78, 76, 74,229,132,  2, 90,111,109,109,205,187,124,249, 50,181,115,231,
+ 78,253,212,169, 83, 43,205,217,189,123,247,164,217,179,103,243,195, 35,163, 60,238,135, 60,131, 92,196, 55, 56, 59, 59,210,247,
+239,223,167,215,173, 91,199,204,155, 55,207, 36, 78,142,227, 54,175, 92,185, 18, 39, 79,158,  4,  0,236,223,191, 31, 30, 30, 30,
+ 31, 12,251,171, 53, 90, 80,  4,120,251,246,173,116,194,132,  9,155, 81, 74,220,185,176, 89,245,176, 27,192,240,225,195, 19, 77,
+179, 66, 45,175, 92,161,218,226,205, 21, 10,171,137, 19, 39,150, 21,155,107,168, 79, 37, 68, 86,139, 22, 45,190, 57,120,240,160,
+253,225,195,135,191, 58,126,252,120, 97,167, 69,186,126,253,250, 47,122,245,234,133,209,163, 71,127,  3,224,163, 10, 44,161, 64,
+ 36, 34, 20,129, 68, 44,181, 52, 55, 29,102,152, 97, 70,149,  4, 22,199, 81, 52, 77, 83, 72, 78, 74, 53,124,210,177,211,168,245,
+ 27, 55,138,132, 66, 33,116, 58, 29, 84, 87,175,130,211,104, 96, 45,149,162, 91,183,110,252,  6, 13, 26, 88,142, 31, 51,102, 76,
+ 82,162,114, 11, 77, 83,206, 28, 71, 85,100,110, 31, 49,117,234, 84,199, 90,181,106,125,176,211,104, 52, 34, 61, 61, 29, 22, 22,
+ 22, 24, 48, 96,128,253,222,189,123, 71,  0, 48,201,220,239,228,228,228, 94,199,195,233,206,145,237, 51, 93, 28,173, 41, 32,229,
+  8,240,254, 53,176, 79, 12, 47,199,234,240,106,215, 86,214,171, 73, 67,255,  1, 43,118,132, 58, 57, 57,181, 72, 74, 74,122, 87,
+153, 76,122,251,246,237,109,133, 66, 49, 70,173, 86,159,  4, 64,221,185,115,135,139,137,137, 25,159,152,152,248,190,170, 25,207,
+178, 44, 50, 51, 51,193,178, 44, 93,240,187,240,243,111, 43, 12,253,251,247,167, 99, 99, 99,199,123,123,123,215,222,182,109, 27,
+146,147,147, 33,145, 72, 96, 52, 26,209,188,121,243,234, 29, 58,116,120,147,146,150,105, 99, 96, 12,186,132,184, 55, 77, 14,108,
+125,151,215,200,203,235,238,161, 67,135, 26,218,217,217, 13, 48,197,154, 71,  8,233, 98, 97, 97,193,251,233,167,159, 40, 11,107,
+231,238, 77,130, 20,252,103, 97,175,222,  9, 68, 60, 54, 43, 43, 59,237,201,147, 39,225,243,230,205,107,117,234,212,169, 68, 66,
+ 72, 23, 83,134,204,  8, 33, 93,156,157,157, 45,166, 77,155,166,146, 88,216,183,108, 28,228,200,123, 30,246, 58,158, 47,160, 12,
+ 45, 90,180,104,119,239,222,189,157, 51,103,206,244, 61,123,246,108, 86,101, 56,107,215,174, 45,153, 62,125, 58,109,101,109,223,
+209,193, 89, 65, 59,216, 90,123,  2, 64, 84, 84,212,222,164,164,164,200,137, 19, 39, 54, 62,123,246,108, 78,101, 56,237,237,237,
+165,179,103,207,230,213,244,168,219,215,195,171, 46,117,229,250,131,103, 66, 33,101, 80,171,213,233, 47, 95,190,124,253,205, 55,
+223,  4,158, 61,123, 54,219, 20,206,188,188, 60, 11, 87, 87, 87, 56, 57, 57,129, 85,171,145,149,149,133, 99,199,142, 33, 39, 39,
+  7, 70,163, 17, 18,137,  4, 63,174,222,130, 55,207,239,227,214,173, 91, 80,171,213, 22, 31,163,156,248, 44, 15, 71,216,120,211,
+197,213, 38,118,242,208,114,132, 21,138,  9,175,161,216,226,205,149, 55, 92, 88,204,114, 21,119,248,240, 97, 71, 79, 79, 79,180,
+109,219, 22,  0, 48,106,212, 40,116,236,216, 17, 39, 79,158,196,165, 75,151, 98,154, 53,107,246, 58, 54, 54,118, 85,124,124,252,
+150,143,113,223, 70,206,168,  7,  0,145, 88, 36, 10, 15, 15, 39,245,234,213,227,204, 77,136, 25,102,152, 81, 22, 74,117,114,231,
+  8, 81,189,120,249,146, 47,183,182, 30,186,126,227, 70, 17,159,207,199,251,247,239, 17, 22, 22,134,188,223,127,135,250,238, 93,
+ 36, 37, 37, 33, 55, 55, 23, 14, 14, 14, 88,178,124,185, 76, 32,145,141,138,124,253,154,230, 40,206, 80,172,135,253,167,169,154,
+ 66,161,176,101,183,110,221,202,116,174, 79, 76, 76, 68,167, 78,157,120, 60, 30,175,101, 25,189,246, 43, 37, 26, 45,162,112, 32,
+167, 15,111,157,230,226,200,123,  6,188,158,  1,228,132,  2,156, 22, 96,116, 64, 76, 56,112, 98, 53, 92,211, 34,201,254, 41,  3,
+156, 93, 37,130,211,164,132,153,168,162, 41,165,110,110,110, 30, 30, 30, 30,219,251,245,235, 71,  1, 64,203,150, 45,137,135,135,
+199, 86, 55, 55, 55,143,114,172, 11,229,114,106, 52,154,251, 25, 25, 25,232,209,163,135, 93,243,230,205,175,244,232,209,195,174,
+112,127, 85, 57, 11, 96,215,190,125,251, 52, 15, 15,143,253,238,238,238, 34, 19,172, 32, 69,156, 49, 49, 49, 99,235,213,171, 87,
+123,219,182,109, 52, 77,211,216,182,109, 27, 14, 30, 60,136,219,183,111, 35, 57, 57, 89, 58, 99,198, 12,235, 51, 87,238, 95,184,
+115,251,225,169,149,115,191,178,235,211,161,173,135, 77, 86, 74,182,173,173,109, 55,  0,206, 38,166,179,231,220,185,115,111, 60,
+126, 25,229, 72,241,248,  2,145,128, 47,113,176,183,174,225,236, 96, 83,219,213,206,166,182,133,144,111,157,157,157, 29,125,226,
+196,  9,  6,197,130,144, 86,196,185, 98,197,138,151,225, 81,177,118, 20,205,227,243,105,190,208,218, 74,110,247,105,143, 78,237,
+  0, 64, 66, 19, 81,118,118,118,236,222,189,123, 43,197,185,116,233,210,144,132,148, 12, 71,190, 64,200, 19,  9,248,226,194,  3,
+ 54,150,114, 39,153, 72, 36,201,203,203,123,191,125,251,118, 93, 37, 57,159,188,136,124,111, 79, 40,208, 20,  8,223,198,198,194,
+209,193,218,194,217,209, 82,238, 44,166, 32,206,206,206,126,183,127,255,126,189,169,156,201,201,201,  8, 15, 15, 71,181,198,141,
+113,229,202, 21, 84,175, 94, 29,  3,  6, 12,192,231,159,127, 14,137, 68,130,246,205, 26, 98,206,156, 57,120,243,230, 77,153,207,
+189,208, 31,170, 60, 40, 20,138,235,149, 41, 75, 64,254,176, 96,121,226,170, 36,103,105,231,149,228,108,209,162,197, 55,199,142,
+ 29,179, 95,179,102,141,223,151, 95,126, 25,117,236,216, 49,248,250,250,226,229,203,151,112,117,117,197,129,  3,  7, 48,121,242,
+228,168,249,243,231,251, 93,190,124, 89,161, 80, 40,102,153,250, 30, 13, 27, 54,172,101,255,254,253,111,245,239,223,255,241,192,
+129,  3,183,142, 31, 63, 94,241,129, 21, 87, 25, 23,172,211,233,208,200,191,177,116,209,175, 15,134, 84,225,221,172, 20,204,156,
+102,206,127, 27,231,191, 66, 96, 25, 88,156,158, 50,109, 70,222,238,221,187,165, 66,161, 16,239,223,191, 71, 98, 98, 34,142, 31,
+ 61,106, 28,220,176, 97,206, 48, 63,191,236,227, 71,143,114,122,189, 30, 28,199,161,118,237,218,232,214,173,155,100,204,184,137,
+201, 36, 91,125,176,130,135,226,232,224,224, 80,180,104,238,  7,166,173, 17, 35,192, 48, 12, 44, 44, 44, 64,  8,113, 52,229,  6,
+ 92, 92, 92,250,143,250,186,131,155,101, 13,203, 36, 46,113,119, 58,104, 49,192,179,  0,120,150,128,196, 18, 16,203,  0,129, 24,
+218, 71,183,211, 57,180,120,215,217,191,191,171,139,139, 75,255,202,100,146,189,189,253,247, 71,142, 28,113,120,250,244, 41,151,
+147,147,131,164,164, 36,238,155,111,190,113,176,183,183,255,190,170, 25,175, 84, 42, 23,141, 26, 53, 42,169,111,223,190, 86,187,
+119,239,174,214,183,111, 95,171, 81,163, 70, 37, 41,149,202, 69,127,229,129,242,249,124,250,234,213,171,182, 95,125,245,213,231,
+  6,131, 33,184, 67,135, 14,105,254,254,254,193,206,206,206, 53, 76,176,170,121, 23,138, 43,  0,160, 40, 10, 66,161, 16, 66,161,
+ 16, 86, 86, 86,153, 81, 81, 81, 70,119, 39,137, 80,204,228, 26,109,120, 20,191,166,139,179,157,181,179, 75, 91,149, 74,117, 27,
+ 64,130,137, 73,244,109,219,182,173,152, 97,105,227,196, 17,237,107, 79, 30,217,190,230,182,165, 19,125, 55,252, 52,177,254,202,
+133, 19, 90, 45,253, 97,244, 48,194, 48, 57, 53,107,214,244,192, 31,206,239, 21, 89,134, 26,249,250,250,138, 56,240,241,228, 69,
+ 84,220,219,152,248,236, 46,237, 91,212, 45,186, 96,147,166,159, 59, 58, 58,126,234,225,225,209, 17, 64,103,147, 76,187, 60, 94,
+163,134, 13, 27, 74,120,124, 17, 28,237,173, 60, 44,228,178,162,161, 87, 27,123,199,142,206,110,110,163,121, 64,154,139,139,139,
+ 27,143,199,107,100,106, 58,  3,  3,  3,197, 44,  4,112,118,176,181,117,176,183,177,236,214,161,165, 79,139, 86,205, 27,250, 55,
+111,217,206,191, 89,139,145,148,209,152,225,238,238,238, 90,232,252, 94, 17, 78,156, 56,129,117,235,214,161,101,253,250,112,119,
+119,135,131,131,  3,126,255,253,119,252,254,251,239,144,203,229,200,204,204,196,166, 77,155,112,241,226,197,191, 92, 89, 20, 10,
+162, 34,199,244,143,128,146, 34,171, 34,177,119,251,246,237, 99,135, 15, 31,134,167,167, 39, 70,142, 28,233,177,115,231,206,168,
+168,168, 40,200,229,114, 60,121,242,  4, 95,127,253,117,212,252,249,243, 61, 70,140, 24,129,  3,  7, 14, 32, 62, 62,254, 55, 83,
+210, 49,112,224,192, 73,126,126,126, 87, 19, 19, 19,155,165,167,167, 55, 56,118,236,216,168, 62,125,250, 68, 15, 26, 52,168, 67,
+145,  5,203, 96,216,119,246,212, 81,116,255,244, 51,212,173,223, 96,243,136, 57,123, 27,154,155, 16, 51,204, 48,163,204,118,164,
+180,157, 49, 49, 49,153,222,222,222,174,158,158,158,148, 78,167, 67, 86, 86, 22, 46,158, 63,111, 60,112,232,208, 89,157, 78, 55,
+149,162, 40,193,174, 61,123, 54, 59,187,184,180,251,172,111, 95, 98, 48, 24,208,177, 99, 71,225,213,171, 87,237,158,198,196,228,
+148,119, 65,154,166,139,172, 71, 95,124,241,  5,214,172, 89, 83,216,123,252, 67,224, 25, 12, 38,251, 34, 73,228,108,183, 54, 29,
+ 27, 88,198,202,126,177,212, 55, 55,228,186,191,177,184, 47,203,149,  4,130, 18,242, 32, 17,131,213,137,153,200,204,142,193,111,
+222,214,244,145,104,146,107,182,168, 27,132,131,247,143,119,  3,112,200,212, 76,146, 72, 36, 77,164, 82, 41,194,195,195,211,  3,
+  2,  2, 50, 45, 45, 45,173,188,188,188,236, 37, 18, 73,147,170,102,124, 82, 82,210, 91, 87, 87,215,214,159,125,246,217,100,138,
+162, 58,178, 44,123, 37, 45, 45,109,125, 82, 82,210, 91, 83,254,239,234,234, 58,145,227,184,121,  0,142, 20,238,211,233,116,160,
+ 40, 10, 28,199,161,103,207,158, 88,186,116,169,207,149, 43, 87,112,243,230, 77,219,193,131,  7,223, 87, 40, 20,153,132,144,209,
+241,241,241,101, 90,201,210,210,210,176,121,243,102,240,120, 60, 88, 91, 91,195,194,194,  2, 98,177, 24,109,219,182, 77, 90,185,
+114,165,215,254,253,251, 13,153,201,201, 68,146,147,165, 37,118,118, 98, 40,170,119, 25, 58, 96,224,125,  0,135, 77,189,119,185,
+ 92, 46, 17, 66,155, 67, 25, 53,212,138,249, 27,120, 82,129,128,136,  5, 60,136,216, 60,122,206,210,197,156,152,112,252,194, 33,
+ 83, 83, 33, 22,139,133, 50, 33,167,229,139, 40,131,148,226, 62,202, 56, 43,143,199, 19,137,248, 80,151,117, 92, 64, 17,154, 16,
+ 34,  1,160,173, 76, 58,229, 66, 99,153,231,139, 41,208, 20, 69,137,203,226,236, 95,159,112,135, 39, 23, 10,156, 34,163, 26, 24,
+134, 65,147, 38, 77,112,224,228, 53,156,251,253, 46, 82,223, 63,197,212,137,163,224,229,229, 85,161,184, 42,244,193, 50,161, 83,
+  0,133, 66,113, 93,249,131, 85,197, 39, 23,248, 93, 85, 52, 52, 88,156,211,103,121,120,185,179, 19,221,220,220,198,249,249,249,
+ 13, 63,126,252, 56,218,181,107,135, 30, 61,122,160,110,221,186, 30,131,  7, 15,  6,  0,180,110,221, 26,223,127,255,189,199,231,
+159,127,142, 19, 39, 78,224,220,185,115,  8, 12, 12,156,166, 80, 40,146,149, 74,229,198,114,196,213,252, 49, 99,198,204, 93,191,
+126, 61,248,252,252, 21,161,122,247,238, 93, 88, 63,238,232,223,191,127, 90,225,185,135,183,199,221,173,229,225,213,124,210,212,
+175,132,147, 39, 12,155, 13,224,115,115, 51, 98,134, 25,102,152, 44,176,  0, 64,164,215,215,213,110,222, 12,213,149, 43, 16, 94,
+186,132, 51,141, 26,229, 50, 12, 51, 83,169, 84,198,  2,128,147,147,211,244, 67,135, 15,223,233,248,251,239,150,186,240,112,184,
+ 61,123,  6, 94,157, 58,126,166, 94,120,201,146, 37, 69,162,  0,  0,246,236,217,131,172,172, 44,100,101,101,129, 97, 76, 94, 75,
+ 24,124, 33, 90, 58,218, 85, 71,  2, 34,193,242, 40,249,187,186,121, 77,229, 26, 11,165,107,140,147, 42, 75, 80,  7,225,113,245,
+101,234, 76,109, 83, 66,235,160, 73,205,131, 91, 75, 47,240, 80,250,240, 99,153,102, 62,138, 42,108, 28,211, 67, 66, 66,122,182,
+108,217,242, 52,  0,251,194,253, 85, 69,124,124,252,107,  0, 83,171,242, 95,154,166,231,221,186,117,203,241,208,161, 67,147,127,
+254,249,103,174,184,192, 42,252,206,227,241,192,113, 28,100, 50, 25,120, 60,158,211,137, 19, 39,156, 62,253,244,211, 13,  0,202,
+124, 78, 82,169, 20,142,142,142, 16, 10,133,176,176,176,128, 42, 59, 67,182,233,167,185,109,165, 54, 78,182, 83,167,205,164,198,
+141, 27, 23,182,118,237,218,106,206,117,235,122, 63,127,254,252,109,159,129,159,223, 61,121,242,164,186, 18, 14,238, 79,195,195,
+195,105, 47, 79,119,  1,107, 80,179, 50,  1, 32,126,242, 51, 43,180,112,134,152,166,193, 35,224, 36, 82,153, 99,108, 66, 66,140,
+169, 86, 49,142,227,158,188,123,247,142,184, 41,156,120, 57, 42, 77,166,140,199, 10,163, 31, 61,124, 89,171,113, 19,111,  0,208,
+ 60,186,123, 92, 84,183,190,133, 50, 59, 71,226,234,234, 26,101, 10, 39,195, 48, 79,226,226,226,136,173,173, 45, 63, 50,242,245,
+111,118,150, 22, 10, 91, 39,167,182,  0,160, 75, 79,185, 73,212, 26, 37,159,207,119, 77, 73, 75, 75, 96, 24, 38,198,212,116, 70,
+ 71, 71, 19, 55,133, 19,239,244,217,115,  7,156,101, 82, 23,107,137,200, 74, 76,129,136, 57, 54, 75,200, 48,137, 18,169, 76, 17,
+ 23, 31,159,196,113, 92,153,126,130,155,216,201, 67,243,191,253,186,183,132,117,  7,215,130,163, 97, 69, 27,193, 55,168,112,255,
+216, 33,124, 54,229, 75,147,222,167, 21, 11, 71,236, 95,177,112, 68,153,225, 25, 74,  8, 34, 40,199,255,197,154,103,139,247,245,
+ 63,113, 42,203,119,112,239,210,165,203,119, 91,183,110,149, 22,254,126,249,242, 37, 90,182,204,127,149, 23, 44, 88,128,206,157,
+ 59,163, 81,163, 70,120,249,242, 37,106,212,168,129, 99,199,142,129,166,105,254,184,113,227,190,  1,176,177, 28,203,109,207, 45,
+ 91, 62,116,211,210,235,245, 96, 24,  6,  6,131,193,133, 97, 24,151,194, 78,223,207, 63,175, 75,189,116,241, 12,190,153,179,  0,
+142, 14,206,126,230, 38,196, 12, 51,204, 40, 83, 59,148, 89,233,112, 28,203,164,167,131,211,230,119,164,  5,  2,  1,199,113, 92,
+ 81,229,198,231,243,165, 86, 86, 86,132,239,230,  6, 34, 42,112,245, 33,228, 47,199,131,225,241,120, 48, 26, 77,167, 49, 26, 65,
+131,232,193,225, 15,127, 83,149,152,224, 71,251, 14,152, 42,251, 18,137, 66,171,226, 45, 28, 56,134,133, 17,149,179,142, 16, 66,
+ 56,149, 74,  5,173, 86,107,227,233,233,121, 86,163,209,216, 20, 52,152,127,155,147, 43,195, 48, 81, 60, 30, 15, 35, 70,140,  0,
+242,151, 60,130, 78,167,195,227,199,143,161,213,106,161,211,233,112,231,206, 29,100,101,101, 65,167,211,225,242,229,203,168, 81,
+163,  6,120, 60,158, 75,121,188, 44,203,194,193,193,  1, 78, 78, 78,208,170,178,101, 71,183,174,237,190,124,254,183,246,131, 60,
+ 57,234,215,117,171, 88, 79, 79,207,140,  6, 13, 26,216, 74, 36,146,140,128,128,128,204, 19, 39, 78,156,170, 76,136,  6,  0,167,
+103,207,158,237, 27, 20, 20,228,110, 45,151,233, 69, 66, 26, 34, 70,197,137,180,105, 28, 79,157,202,213,112,115,215, 67, 38,111,
+210,183,111, 95, 35,128,211,166,114, 78,157, 58,181,186,183,183,183,189,181,165, 44,155, 71, 33, 94, 96, 52,198,103,  4,223,189,
+ 12,  0,  2,123, 71, 53,100,242, 38,131,  7, 15, 54, 84,134,115,230,204,153,158,174,174,174,118, 20, 69, 50, 25,189,254,125, 81,
+121,208,168,147,104,145, 88,  5,145,184,213,232,209,163,153, 74,166,211,195,215,215,215,206,198,202, 50,147, 79,145, 24,129,145,
+137,149,112,198, 56,161, 65,159, 34,114,116,202,133, 76,222, 98,208,160, 65,101,166,179,208,122, 85,210, 50,196,227,241, 16, 31,
+ 31,143, 60,229, 83,  8,226,195,209, 72,206, 71, 83,103,123,200,100,178,138,  5,214,248,151, 36, 44,154, 35, 97,209, 28,193,248,
+151,164,180,223,165,136,172,114,203,126,185, 67,125, 91,188,175, 87,133,243,220,185,115,203,122,245,234,101, 24, 56,112, 32, 46,
+ 95,190, 12, 66,  8,110,223,190,141,248,248,120,116,238,220, 25, 28,199,225,241,227,199, 69,226,171, 95,191,126,232,209,163, 71,
+222,133, 11, 23,126, 52,181,112,110,221,186, 21, 12,195,128,207,231, 67, 34,145,192,210,210, 18,182,182,182,112,114,114,122,227,
+232,232,248,124,201,230, 19,175, 59,117,238,129,244,180, 84, 36,167, 36, 62, 54, 55, 33,102,152, 97, 70,165,  5,150, 65, 36,122,
+193, 78,153,  2,235, 83,167,192,143,140, 68,191,207, 62,179, 20,137, 68,235, 92, 92, 92,  2, 20, 10, 69, 11,137, 68,178, 97,230,
+140, 25, 22,246, 75,150, 64,113,243, 38, 18,175, 92,129,129,207,127, 84,153,139,171,213,234, 66,  1,  3,109,129,144,179,182,182,
+174,148,192, 98, 25,220, 75, 72,137,132, 16,238, 96,193,229, 94,200,110,253, 96, 80,212, 92,199, 51,217,181,188, 94,171,  4, 94,
+ 11, 29,154, 58,174,171,209,242,129,138,240,114,133,214, 98, 40,227,149, 48,130,189, 87,153,116,106, 52,154, 44,149, 74,133,218,
+181,107,219,133,132,132,120,122,121,121,217, 22,  8,154,135,127, 37,243, 21, 10, 69, 51,127,127,255,195,  1,  1,  1,111,253,253,
+253, 15, 43, 20,138,102,149,248,251,175,143, 30, 61,  2, 77,211, 24, 55,110, 28,114,114,114,160,215,235,145,150,150,134,152,152,
+ 24,232,116, 58,196,197,197,225,213,171, 87,208,233,116,120,247,238, 93, 81, 30,151,  7,131,193,  0, 11, 11, 11,100,166, 37,203,
+ 14,110, 90,213,125,241,252,239, 36, 89,111, 66, 16,167, 76,  2,107, 84, 43,191,255,254,251, 40, 79, 79,207,219, 90,173,182, 30,
+195, 48,221, 56,142, 59, 88,  9,161, 74,  1,120,236,229,229,213,105,229,202,149, 45,191, 95,186, 93,100, 65,231,112, 66, 11, 17,
+ 43,180, 16,114,194,122, 77, 49,102,222,122,241,234,213, 43,238,  5,  7,  7,103,153, 56, 51,143,  2,240, 56, 32, 32,160, 89, 98,
+ 98, 98,203, 70,141, 26,249, 57,215,174, 35, 22,185, 42, 82,133,138, 26,105,156, 58,239, 10, 85,189,102,207,157, 59,119,222,186,
+121,243,102, 82,101, 56,157,156,156, 90,110,222,188,217,191,122,245,234,141,197, 86, 86,146,220,204,204,173,218,204,244,237,124,
+123,103,  9,101,103,223,255,232,209,163,191,159, 61,123, 54,173, 50,156,117,235,214,109,177,100,201,146, 70,254,254,254,  1, 46,
+117,234,138, 37,174,110, 41,  2,215, 26,201, 18,223, 64, 49, 85,195,163,223,246,237,219,175,221,185,115, 39,213,212,128,163, 20,
+ 69,129,207,231, 67, 38,147,225,198,141, 27, 24,244, 89, 23, 56, 59, 90,162, 78,221,186,104, 59,126, 10,206,158, 61, 11,161, 80,
+136,191,106,109, 45,  9, 83,  4, 81,101,197, 87, 69,156, 74,165,114, 99,112,112,240,207,  3,  6, 12, 64,199,142, 29,241,228,201,
+ 19,204,154, 53, 43,234,236,217,179,  0,128, 39, 79,158, 96,241,226,197, 81,247,238,221,195,200,145, 35,209,178,101, 75, 60,126,
+252,120,119,101,130,143,142, 26, 53, 10,  6,131,  1,185,185,185, 72, 79, 79,199,153, 51,103,208,168, 81, 35, 78, 42,149,126, 70,
+ 87,235,244, 99,255, 49,115,154, 55,240,245,195,134,117, 43,117, 66, 30,127,169,185,  9, 49,195, 12, 51, 42, 37,176, 60,109,109,
+ 45, 52,154,188,184,155, 55,111,234, 41,138,130, 84, 42, 69,255,129,  3,169,159,126,250,169, 85,239, 70,141,174, 14,110,214,236,
+252,161,131,  7,253,253,252,253,243,215,219,161, 40,156, 60,121, 82,157,149,149,153, 86,189,122,117,107, 83, 47,158,146,146, 82,
+212,251, 86,171,213,224, 56, 14, 22, 22, 22,149, 18, 88,234, 92,234,202,173, 27, 97, 25,156,241,139,152,110,175,215,232,151, 38,
+246, 14,202,100,141,188, 44,163,  1, 89,106, 14, 57, 26,240, 30, 80,182, 65, 35,188,250,232,163, 59,  6,189,122,240, 54, 52, 77,
+199,233, 42, 53,251, 33, 35, 35,227,187,137, 19, 39,166, 57, 57, 57, 17, 11, 11, 11, 56, 57, 57, 81, 99,198,140, 73,141,141,141,
+ 93, 88,213,140,247,241,241,249,188, 89,179,102,167, 67, 67, 67,251, 29, 58,116,200,253,240,225,195,253,154, 53,107,118,218,199,
+199,199, 84,159,142, 67,203,150, 45, 83,  9,133, 66, 52,109,218, 20, 57, 57, 57,208,233,116, 21,110, 21, 10, 86,150,133, 88, 44,
+198,225,237,107, 59, 45,158,255,157, 36, 61,252,  1,158,222,190,140, 11,111,181,121,243,150,254,124, 95, 44, 22, 87,233,126,189,
+ 28,101, 13, 27, 42, 44, 94,126, 57,106,160,114,246, 55,223, 88, 61,123,246, 76, 58,227,203,233,156, 50, 37,147, 19,119, 95, 77,
+ 83,109,191,167, 94,104,236, 73,175, 30,237,241,227,130, 89,157, 96,194,208,169,143,163,172, 97,  3,133, 69,216, 87,227,  6, 69,
+ 77,157, 58, 85,186,108,217,178,188,150, 45, 91,102,102,101,101, 73,172,156, 92,252, 69,142, 78, 65,202,140, 76, 89,243, 22, 45,
+ 30,143, 26, 53, 74, 85, 89,206,239,191,255, 94,118,235,214, 45, 81,151, 46, 93,114,178,179,179,101, 98,185, 60, 72, 96,105,221,
+ 58, 37, 43,203,178,107,215,174,161,  3,  6, 12, 48, 84,133,243,213,171, 87,162,230,205,155,231,100,101,101,201, 44,157, 92,154,
+136, 29,157, 91,197,167,103, 88, 52,109,214, 44,116,236,216,177,186,242, 56,251,175,255, 67,156, 72,165,210,116,111,111,111,204,
+157, 59, 23, 11, 22, 44, 64,255,254,253, 17,253, 54, 26,109, 70,142, 67,173, 17, 19,112,250,222,  3,196,199,199, 99,206,156, 57,
+240,242,242,  2, 69, 81,  9, 31,179,242, 40, 79, 16,149,229,  8,239, 83,139, 92, 47,207,207,170, 34,145,213,169, 83,167,145,189,
+122,245,194,201,147, 39, 49,107,214,172,168,249,243,231,123, 12, 25,146, 63,161,207,207,207, 15, 51,103,206,244, 88,185,114,101,
+212,234,213,171,209,172, 89, 51,184,185,185,125, 90,  9,171, 48,118,236,216,  1,134, 97, 32,151,203, 97,107,107,139, 30, 61,122,
+224,249,243,231, 19,118,238,220, 25, 78,243,249,131,187,127,218, 23,103, 79, 29,195,171, 23,207, 39,236,250,105,232, 51,115, 19,
+ 98,134, 25,102,148,133,210,227, 96, 89, 74,  6,110,221,184,193,106,242,244,153, 42,111,111,111, 27,103,103,103, 16, 66,208,165,
+ 75, 23,210,236,194,  5, 11,190, 66,  1,187,134, 13,139, 22, 52,188,117,243, 38,174, 94,189,170,218,187,227, 87,215, 81, 99,198,
+244,  4,202,246,153, 45, 62,172,150,150,150,  6,103,103,231,162,217,106, 74,165, 18,206,206,206, 16,  8,  4,160,105,154, 87,176,
+244, 75,185,106,203,217,217,121,207,210,197, 47,102,199,249,206,172, 21, 36,165,200,121, 85, 34,140, 28,  7, 62, 49,  2,106, 14,
+  6, 35,160, 53,112,  8,172, 73,219,254,174,131,205,131, 23,151,162,157,157,157,247, 84, 38,147,162,162,162,174,185,184,184,140,
+207,203,203, 59,  2,128,186,127,255, 62,251,246,237,219, 73,166, 58,164,151,  6,137, 68, 50,235,200,145, 35,182, 11, 23, 46,204,
+184,122,245,106, 86,251,246,237,173,150, 46, 93,106,251,249,231,159,207, 66, 41,193, 32, 75,105,136,212, 10,133, 98,119, 66, 66,
+194,164,198,141, 27, 35, 61, 61, 29,122,189, 30, 33, 33, 33,240,242,242, 66,112,112, 48,234,212,169,131, 71,143, 30,161,110,221,
+186, 48, 26,141,208,104, 52, 48,154,160, 94,149,177,239,229, 82,109,134,165,242,193,121, 68, 60, 11,193,185, 40,109,222,138, 29,
+  7,207, 53,244, 11, 84, 21,206, 48,172, 12,234, 58,201,234,187, 58,218, 93, 90,186,224,  7,199,119,215, 14,226,216,142,245,236,
+181,115,231, 26, 72, 44, 49,188,197,192,105,159,235, 13,112,  7,129,168,117,139,230,232,105, 27, 97, 20, 84, 67,210,239, 47,202,
+143,100, 94,215, 73, 86, 95,225, 96,119,113,197,146,133, 22,111, 46,236,194,161, 45,171,185, 35,123,246,251,107,128,250,158,158,
+158, 61,105,154,118,  2,160, 54, 26,141,111, 96,226, 18, 52,165,113,254,126,230, 76,128,  6,168,239,230,230,214,147,207,231, 87,
+  3,160, 53, 24, 12,239, 63,  6,103,237,218,181,123, 18, 66, 92,  1,104, 10,124,174, 42,181, 84, 78,199,142, 29, 87,108,223,190,
+125,134, 86,171,181, 45,102,109, 37, 39, 79,158,132, 94,175, 39,  2,129,128,149,201,100,136,137,137,225,  0, 36,112, 28, 55,225,
+ 99, 85, 28,125,251,246,197,253,251,247, 23,  0,152, 87,222,121,233,233,233, 60, 91, 91, 91,166, 34,225,101, 42,231,131,  7, 15,
+150,141, 29, 59,246,235, 11, 23, 46,196,205,159, 63,223,111,196,136, 17, 56,113,226,  4,170, 87,175,142, 87,175, 94, 97,198,140,
+ 25, 32,132,120,172, 92,185,242,241,129,  3,  7, 92, 18, 19, 19, 87,153,114, 63, 70,163, 17, 12,195, 96,208,160, 65, 48, 24, 12,
+ 72, 73, 73, 65, 68, 68,  4,110,221,186,133,  9, 19, 38,136,  1,192, 69,225, 22, 40, 20, 10,241, 36,244, 81,222,247,163,131,126,
+ 51, 55, 31,102,152, 97, 70,165, 45, 88,132, 37,124,175,218,181,141,186,188,220,157, 99, 70,142,204,123,241,226, 69, 81,  5,164,
+121,248, 16,170, 11, 23, 96, 52, 26,193,113, 28, 30,220,191,143,169, 83,166,228,106,242,114,183,215,172,233,206, 17,142,147, 21,
+241, 16,210,177, 36,183,174,152, 25, 69,173, 86, 67,173, 86,131,199,227,193,194,194,  2,201,201,201, 16, 10,133,144, 72, 36,104,
+212,168, 17,229,230,230,214,227, 79,105, 43,193, 25, 18, 18, 98, 64,182,182,223,201, 17,211, 18,220,242, 24,110,188,117, 77,212,
+ 16, 72,138,102, 33, 58, 91, 18,124,218,136, 15, 39, 65, 42,247,116,215, 32, 37, 97,178,250,133,132,132, 24,202,227, 44,  9,133,
+ 66, 81,199,199,199,103, 99,223,190,125, 41,  0,104,213,170, 21, 85,191,126,253, 95, 20, 10, 69,153, 75,218, 84,196, 41, 22,139,
+ 69,  0,112,229,202,149,244, 91,183,110,117,185,114,229, 74,122,241,253,166,112, 82, 20,181,117,211,166, 77,144, 74,165, 96, 24,
+  6, 58,157,174,200,255,170,248,167, 94,175,135,189,189, 61,126,255,253,119,176, 44,123,182,162,116,122, 55,240,205,205,226, 89,
+ 39,237, 62,125, 21,231,223,233,115, 43, 43,174,138,115,214,118,145,215,117,182,183,187,188,226,167, 69, 14, 25,175, 67, 16, 23,
+ 23,199, 93,188,112,246,158,154,227,226,211,178,184, 31,211,115, 56,159, 92, 13, 39, 13,172,137,216,179,191,204,224,190,106,  6,
+  6,  4, 92,121,156,245, 93,228,117, 93, 29,236, 46,174, 90,241,147, 69,230,235, 16, 36, 36, 38,226,220,217,211,143,213, 28, 23,
+207,113,220,  5,142,227, 38, 50, 12,211,132, 97,152, 38, 28,199, 77, 44, 75,180, 84,150, 83,175,215,  7,233,245,250,160,143,201,
+201,178,108, 16,203,178, 38,115,254, 49,131, 16,152, 59,119,238,195,155, 55,111, 14,120,248,240, 97,135,194,237,249,243,231,237,
+163,163,163,219,199,197,197,181,139,158, 37,162,159, 61,123,198,123,244,232, 17,255,209,163, 71,213,131,131,131, 47,152, 90, 62,
+203,121, 23,138,139,252,249, 74,165,146,148,202, 57,254, 37,217,176,242,139,189,135, 15, 31,118,250,104,156,  0,194,195,195, 55,
+108,223,190,189,134,171,171,171,203,231,159,127,142, 93,187,118, 97,251,246,237,  0,242, 35,217, 23,179, 92, 57,  6,  7,  7,215,
+ 42, 45,200,104,105,247,110, 48, 24,192, 48, 12,246,239,223, 15,134, 97,224,224,224,  0, 31, 31, 31, 76,154, 52,233,218,152, 49,
+ 99, 54,  2,  0, 77,104,  1,  0,104, 53, 90,109,201, 32,163, 85,205, 79, 83,223, 35, 51,167,153,243,223,192,249,239, 16, 88,132,
+ 53, 26,141, 44, 28,157, 28, 45, 82,146,147,215, 79,156, 56, 33,109,225,194,133,154, 27, 55,110, 64, 23, 30, 14, 77,104, 40, 46,
+ 95,190,140,105,211,166,229,141, 27, 63, 62, 65,147,151,187,214,217,201,209,222,104,100, 65,  8, 91,174,133,132,162,168,168,200,
+200,200,194,222, 54,214,175, 95,207,232,245,122, 88, 88,228,  7,153,222,182,109, 27,203,113, 28, 58,116,232, 32,227,243,249, 38,
+ 45, 65, 18, 31, 31,255, 52, 59, 70,217,249,232,192,  9,111, 94, 30, 60,149,225,155,166,199, 16,137,  2,  3,  3,  0, 31,139, 24,
+196, 63,248, 53,227,238,198,222,111,242,210, 99,187,196,199,199, 63,173,108, 38, 57, 57, 57,205,219,183,111,159, 99, 72, 72,  8,
+167,213,106, 17, 31, 31,207,205,154, 53,203,209,201,201,105, 94, 85, 51,158,227, 56,146,153,153,  9, 66,  8, 91, 80, 88,217,194,
+253,166,114,196,197,197, 61, 63,124,248,240,201,107,215,174,193,205,205,173, 72,100,149, 20, 88, 60, 30, 15,132, 16,108,218,180,
+ 41,147, 16,242,109, 69,188, 34,145,  8,219,142, 92, 56,255,213,166, 99,135, 14, 93,121,120,172,170,150, 43,  0, 16, 82,212,252,
+101,139,126,112, 76,125,121,159, 60,191,119,149, 61,248, 36, 33,137, 49,114,147, 75, 61, 57, 71,201, 21, 20,202,242,125,123, 40,
+122,254,178,159, 22, 90, 21, 14, 95,238, 11, 81,102, 19, 35, 55,229,175,189,  9,255, 35,156,127, 35,242,103,250, 41,137, 66,161,
+192,209,163, 71, 43,237,131,229, 83,139,252,201,185,189,170,156, 74,165,114,249, 39,159,124,162,156, 63,127,254, 70,141, 70,163,
+ 42,232,188,233, 87,173, 90,181,114,242,228,201, 73,241,241,241,171, 76,126, 76, 20,181,167, 83,167, 78,220,205,155, 55,209,187,
+119,111, 24, 12,  6,196,198,198, 98,219,182,109, 96, 24, 38,187, 67,135, 14, 44,  0,168, 53,121,217, 28,203, 65,167,215,106, 97,
+134, 25,102,152, 81,  1, 74, 29, 34,100,105,234,206,230, 45,155,186, 30,220,127,192,153,166, 41,231,232,232,183,143,134,141, 30,
+ 29,127,243,230, 77, 91,126,237,218, 77, 40,138, 98,117,179,103,223,203,205,206, 74,223,179,115, 71,141,154, 53,221, 27, 21, 44,
+246,204,177, 52,117,167,188, 11,166,167,167,239,154, 62,125,122,147,221,187,119, 11,150, 47, 95,174,138,143,143,191,116,255,254,
+253,174, 27, 55,110, 20,111,219,182, 45, 47, 39, 39,231,212,185,115,231,122,181,107,215,142,209,233,116,121,166,222, 72, 82, 82,
+ 82, 24, 33,196,155, 90,181,125,240,171, 77,251, 62,225,104,210,  2, 90,  1,  8,199,220,161, 24,213,229, 36,165,114, 31,199,113,
+ 76, 85, 50, 73, 34,145, 52,146, 72, 36,120,253,250,117, 70,147, 38, 77,116, 66,161, 80,224,238,238,110, 39,145, 72, 26, 85, 53,
+227, 57,142,227, 50, 50, 50,192,113, 28, 15,  0, 97, 89,150, 87,176,191, 82, 49,156,  4,  2,193,231,163, 70,141, 58,185,113,227,
+198, 78, 29, 59,118,132,135,135,  7, 12,  6,  3,234,212,169,  3,157, 78,  7, 47, 47, 47,104,181, 90,172, 93,187, 22,185,185,185,
+ 51,226,227,227, 51, 42,226, 20,139,197, 16, 10,133,168,235,221, 32, 79, 44, 22,163,170,226, 10,  0,100,124,202,227,213,153, 29,
+ 72, 78, 75,101, 15, 61, 73, 74,202,211, 27, 59, 71, 38,171, 94,148, 60, 47,207,  8, 85,187,145, 83,227,  1, 64,203, 34,183, 92,
+ 78, 33, 60, 34,206,110, 67, 82,114, 42, 14,134, 38,100,170,244,108,151, 87,165,112, 86, 42,157,255, 35,156,253,215,135,163,237,
+ 23,166,159,123,120,252,199,169, 40,138, 91,149, 76, 69, 88, 52, 71,176,197,155,195,150,245,165,198,184,170, 10,103,177, 78,213,
+ 22,  0, 91,  0,192,205,205,237,205,212,169, 83,191,142,143,143, 95, 83, 16,239,170, 82, 29,159,131,  7, 15,174, 29, 53,106,212,
+133,158, 61,123,126,195,178,172,111,177, 30,122,180,163,163, 99, 81, 14,166, 36, 37,206, 30, 63,122,208,236,220,220,140, 69, 48,
+195, 12, 51,204,168,138,192,138,138,138, 13,243,240,168, 54,231,216,209, 35, 45, 56,142,162, 57, 66, 84,  0,117,250,197,139, 23,
+153,197,207,243,180,181,181, 24, 53,118,212, 64,194, 18, 62, 33,172,145,165,169, 59, 81, 81,177, 97, 21, 84,140,207,134, 15, 31,
+190,190, 93,187,118,163,141, 70,227,242,200,200,200, 75,117,235,214,125,220,165, 75,151,175, 24,134, 89,249,230,205,155, 75,245,
+234,213,187,124,240,224,193, 89, 70,163,241,135, 74,138, 22,  6,249,254, 95,187, 63,102, 38, 81, 20,181,144,227, 56, 43,137, 68,
+146, 21, 28, 28,188,191,117,235,214,131, 56,142,179,162, 40, 42,171,170,156, 58,157,110, 74, 78, 78,142,253,231,159,127,110, 32,
+132,212,237,211,167,207,236,200,200, 72,190, 74,165,138,170, 12,207,187,119,239,180,238,238,238,189,190,248,226,139,237,  2,129,
+160,  3,242, 67, 54,112,197,242,  4, 28,199,193,104, 52,158, 82, 42,149,229,230, 11,159,207,207,237,218,181,171,188, 66,171,148,
+ 80,152,107,106,250,114,116,198,233,155,174,190, 88,162, 49,112, 28,195,114,227, 95, 37,169, 74,157, 66,246,240, 21, 87,223,100,
+ 78, 13, 59,125,221,197,176, 37, 90,  3,203, 50, 44, 55,161, 44,206,202,224,127,133, 19,  0, 38, 82,235,247, 98,203,250, 34,135,
+247,194, 97,195,146,191,255, 83, 40,176, 56,113,  0, 42, 94,236,188,192, 98, 85,209,218,133,149,226, 44,129,130, 89,130, 91,255,
+202, 61,237,216,177, 35, 18, 21, 44,176,125, 96,229,168,227,  0,142,155,155, 13, 51,204, 48,195, 84, 81,242, 31,219,  0,116, 52,
+115,154, 57,205,156,102, 78, 51,167,153,211,204,105,230,252,183,109,148, 89, 98,154, 97,134, 25,102,152, 97,134, 25,102,124, 92,
+ 16,  0, 29,203,176,108,153, 28, 43,170, 42,179,  9, 42,226, 55,115,154, 57,205,156,102, 78, 51,167,153,211,204,249,255,143,243,
+ 95,  3,243, 16,161,153,211,204,105,230, 52,115,154, 57,205,156,102, 78,243, 16,161,121,136,208, 12, 51,204, 48,195, 12, 51,204,
+ 48,227, 31, 13,179,192,170,  2,  8, 33,195,  8, 33, 23,  8, 33,207,  9, 33, 23,  9, 33,195,254,  2,151,132, 16, 50,187, 24,223,
+121, 66,200, 44, 66,136,200,156,211,255,232, 50, 64,155,115,193,140,170,162, 32,120,113, 72,121,193,138,205, 48,195,140,255,109,
+240,202, 58,224,233,233,121,151,162,168, 90,133,139,196, 22, 70, 70, 47,252, 94,242, 55,  0,112, 28, 23, 29, 22, 22,214,188, 44,
+206, 90,181,106, 21,113, 22,110,132, 16, 24, 12,  6, 11,154,166,115, 74,227, 52, 26,141,113,175, 94,189, 10,252,  7, 53,172,123,
+109,109,109,217,205,155, 55,111,240,245,245,173,157,147,147,147, 55,118,236,216,110,132,144,142, 28,199, 13,173, 36, 87,  3, 66,
+200,158,198,141, 27, 31,155, 60,121,242, 97, 31, 31, 31, 75,181, 90, 45,220,191,127,191,243,230,205,155,111, 17, 66, 70,113, 28,
+ 23,102, 46,166,255, 28,184,184,184,248, 19, 66,214,123,121,121,  5, 42, 20,138, 71,  0, 38, 41,149,202, 39,230,156,249,175,190,
+131, 99,132, 66, 97, 23, 47, 47,175, 38, 90,173, 54, 35, 58, 58,250,161,209,104,252,129,227,184,196,143,196,111,  5,224,  7,145,
+ 72, 20,228,233,233, 89, 45, 50, 50, 50, 86,175,215, 63,  0,176,144,227,184,172,143, 33,174,130,130,130,110,255,244,211, 79,118,
+223,126,251,237,109,133, 66,209, 82,169, 84, 70,152,159,172, 25,127,  7,170, 87,175,110,173, 82,169,182,243,120, 60,127,145, 72,
+228, 44,151,203, 33,151,203, 19, 69, 34,209, 99,169, 84, 58,250,236,217,179,153,230, 92,250,200,  2,139,166,105,183,135, 15, 31,
+ 58, 22, 46,190,204,178, 44, 88,150,  5,199,113, 69,159,133, 40,136,179,132,118,237,218,233,203,189, 24,143, 87, 45, 36, 36,196,
+ 81, 46,255, 35,212,146, 94,175,135,175,175, 47, 27, 26, 26,234, 88,114, 33, 97,157, 78,135,128,128,  0,238,159,146, 89,132,144,
+ 33,118,118,118,170,247,239, 99, 90,107,180,250,160,177, 83,190,157, 51,164,223, 39, 54,119,238,220, 65,207,158, 61,105, 66,200,
+ 48,142,227,246,152,200, 37, 33,132,252, 58,103,206,156,101,124,161,212,241,232,217,219,244,218,173,123,223,251,213,169, 73,166,
+ 78,157, 36,159, 60,121,242, 35, 31, 31,159, 29,132,144, 86, 28,199,153, 35, 71,255, 51,158, 63,175, 90,181,106, 39,151, 44, 89,
+226,154,152,144,128,213,107,214, 52,  5,176, 17, 64, 83,115,238,252,215,158,193,236,  5, 11, 22, 44, 25, 60,120, 48,140, 70, 35,
+212,106,181,226,245,235,215,245,231,206,157,219,135, 16,210,132,227,184,168,191,200,239,224,229,229, 21, 62,125,250,116,219, 38,
+ 77,154,128,162, 40,100,101,101, 41,110,221,186,213,244,215, 95,127, 29, 70,  8,169,199,113, 92,202, 95,185,134,141,141,205,111,
+ 43, 87,174,180, 19,137, 68,216,185,115,167,221,128,  1,  3,110, 41, 20,138, 86, 85, 21, 89,132, 16,202,206,206,110, 42,128,246,
+ 44,203, 10,  1, 60,200,200,200, 88,204,113,156,222, 92, 98,204, 40, 15,246,246,246, 99,114,114,114, 54, 72,165, 82,129,165,165,
+ 37,164, 82, 41,248,124, 62,132, 66, 97,117, 27, 27,155,234,114,185,188,219,160, 65,131, 38,237,223,191,127,187, 57,183, 62,162,
+192,162, 40, 10, 18,137,  4,135, 14, 29,  2, 77,211,224,243,249,224,243,249, 16,  8,  4,165,126,175, 94,189,186, 41, 21,  1,  0,
+224,244,233,211,176,180,180,132,149,149, 21,234,213,171,  7, 66,  8, 68, 34, 17,126,255,253,119,240,249,124,240,120, 60,240,249,
+124,  4,  6,  6,126, 96, 41,251,111,160,127,125,194,  1,165,  7,111,236, 94, 95,142,158, 83,126,234,155,167,209,119,  0,160,202,
+204,200,200,120,116,236,152,210,175, 78, 29,193,161, 67,135, 26,217,218,218, 14,  2, 96,234, 66,210,211,154, 54,109,122,138, 19,
+200,156,134,143, 24, 57,124, 52,143,210, 15, 27,255,213,143,177,  9,169,170,113,227,198, 29, 59,117,234,212,240,117,235,214, 69,
+ 78,154, 52,105, 42,128,229,166,166,223,221,221,253, 46, 77,211,133,150, 71,229,235,215,175,253,255, 33, 13,163,  2,192, 10,  0,
+  6,  0,203, 56,142, 11, 47,118,172,142, 64, 32, 88,174,215,235,211,  1,204,227, 56, 46,246,159,248,178,184,186,186,214, 27, 58,
+116,168,125,122,106, 42, 86,175, 89, 83,184, 59,208,148, 69,201, 63, 54,  2,  2,  2,106,137,197,226, 21,  0,252,181, 90,173, 43,
+  0, 72, 36,146,120,142,227,142,171,213,234,239, 66, 66, 66,212, 85,124, 78,213,  0,212, 71,254, 12,227,210,192, 45, 89,178, 36,
+114,246,236,217, 81,255,109, 78, 66,136,187,147,147,211, 79,253,251,247,199,217,179,103,113,238,220, 57,131, 68, 34,225,141, 24,
+ 49,130, 76,154, 52,201,102,250,244,233,221,  0,252,252, 23,179,182,219,130,  5, 11,108,189,189,189,113,228,200, 17, 60,125,250,
+ 84,237,229,229, 37,105,219,182, 45,120, 60,158,237,156, 57,115,186,  2,216,245, 87, 46,144,145,145,177,120,209,162, 69,187,215,
+175, 95,111, 17, 29, 29,141,133, 11, 23,218, 79,158, 60,249,134, 66,161,104, 99,170,200, 42,112, 33,152, 10,160, 29, 77,211,173,
+ 70,140, 24,193, 76,153, 50,133, 79, 81,148, 97,205,154, 53, 14,191,254,250,235, 64,123,123,123,255,212,212,212, 92,152,129,114,
+ 12,  9,122,150,101,249,  0,196, 28,199,105, 43,250,253,255,233,222,237,236,236, 38,102,100,100,108, 84, 40, 20,112,112,112, 40,
+106,107, 89,150,133, 74,165,130, 90,173, 70,173, 90,181,  4,222,222,222,219, 38, 79,158,204, 95,191,126,253, 38,115,137,249, 72,
+  2,139, 16,  2,150,101,193,231,243, 63, 16, 88,133,226,167,228,247, 82,107,205, 18, 83, 53, 41,138, 34,185,185,185, 69,226,202,
+210,210,178,200, 18,102, 48, 24,254,196,107, 52, 26, 65, 81, 20, 87, 30,103, 25,105,159,  8,224,119,142,227,222,152,146,  9,197,
+ 57, 15, 79,174,135,221,162, 89,131, 10, 67,158,119,251, 42,255,115, 55,128, 43,175,199, 47, 95,222,162, 69,181,169,223,175,155,
+175, 78, 83,166,206, 25,218,211,221,203,217, 78, 34,203, 76,206,178,169, 91,183, 39,128,164, 74,164,179,229,184,113,227,142, 28,
+187,242, 66, 44, 22, 11,  4, 60,154,230,183,108, 88,199,174,154, 21,109,101,  1, 88,197, 70, 69,222, 29, 54,108,216,216, 73,147,
+ 38,217, 22, 10, 44, 83,238,157,207,231,187, 61,120,240,192,145,199,227,161, 69,139, 22,198,202,220,251,199, 66, 25,156,115,147,
+146,146, 62,215,104, 52,  8, 12, 12,252,148, 16,210,142,227,184,199,132,144,134,189,122,245,186,117,248,240, 97,139,208,208, 80,
+ 52,109,218, 84,  2, 96,192,223,152,206, 63, 65,161, 80, 92,  2,240,  9, 77,211,208,105, 52,186, 21,171, 62, 88,230, 46,184,184,
+184,250,111,164,211,207,207,175,158, 84, 42,189,187,106,213, 42, 75, 31, 31, 31,194,231,243,193, 48, 12, 34, 35, 35,171,237,221,
+187,119,252,163, 71,143,186,  6,  4,  4,248,148, 92,212,220,196,123,175,127,235,214, 45,149,135,135, 71,169,101, 39, 59, 59,155,
+ 87,167, 78,157, 54,  0,162,254,  6,206,184,164,164,164,222,159,124,242,201,132,196,196,196,112,134, 97,190,  1,208,192,222,222,
+ 62,244,179,207, 62,131, 68, 34,105,103,138,192, 42,239, 25, 57, 58, 58,246,106,222,188, 57,214,175, 95,143,101,203,150,117,228,
+ 56,238,119, 66, 72,135,236,236,236, 43,159,126,250, 41,172,173,173,123,151, 38,176, 42, 81,150,234, 52,105,210,100,219,140, 25,
+ 51, 44,206,158, 61, 11, 47, 47, 47,100,101,101, 97,228,200,145,142,235,214,173,187,174, 80, 40,218, 22,138,172,178, 56,  9, 33,
+ 62, 34,145,104,215,254,253,251,229, 30, 30, 30, 30,  2,129,128,242,240,240, 64,122,122, 58, 52, 26,141,232,199, 31,127,108, 40,
+145, 72,158,252,252,243,207,187,  0,124,246,119,190, 71,132,144, 44,  0,150,  0,172, 43, 51,188, 90,206,189,103,  1, 16, 21,171,
+239, 32, 22,139, 33, 22,139, 33, 18,137, 16, 29, 29,125,148,166,233,145,  5, 29,185, 10, 57,201, 31, 61,248, 70,132,144,135, 52,
+ 77,151,251,187,228, 82,102,127, 71,189, 68,  8,113, 35,132,172,  5,208, 14,249,126,212, 55, 28, 29, 29,167, 37, 38, 38,190, 55,
+149, 83,161, 80,216,229,230,230,254,172, 80, 40,224,232,232, 88, 40, 54, 17, 24, 24,  8,141, 70,131, 23, 47, 94,128,101, 89,188,
+121,243,  6,150,150,150,104,216,176,225,207, 11, 22, 44, 56, 50,111,222,188,180,255,228,189,255,107,  4, 86,161,146,229,241,120,
+ 31,  8,172,146, 91,161, 24, 34,132, 84,184, 80, 49, 33,132,210,233,116, 69,226,202,202,202,170,232,191, 12,195,148, 42,176,170,
+168,204,125, 89,150,173, 69,  8,217, 98,170,200, 42,137,225,195,135,255,201,159, 99,246,236,217,113,169,169,169,108,223,206,141,
+100,225,231,149,  9,158, 54,114,137,131,133, 69, 77,177,141,173,117,110,110,238, 77,  0,242, 74, 92,194,213,219,219,219,106,195,
+238,243,202,177, 95, 46, 89, 20,232, 97,103,233,235,102,111,227,108, 37, 17,202, 41,162, 18, 51,134, 56,153, 76,230,  3, 32,173,
+ 50,233,166, 40, 10,150,150,150, 56,117,234, 20, 10,253,231,254, 33,176, 81,171,213,200,200,200,192,230,205,155, 45, 39, 76,152,
+112,141, 16, 50,173,119,239,222,235, 15, 31, 62, 44,203,204,204,132, 94,175,  7,  0,245, 63,240, 61, 89,100, 99, 99,211,186, 93,
+187,118,194,  3,135, 14,  9, 57,142, 83, 33,127, 57,162, 92,142, 43, 99,225,234,255, 32,196, 98,241, 87,139, 23, 47,182,244,241,
+241, 33,105,105,105, 96, 89, 22, 20, 69,193,222,222, 30, 95,127,253,181,120,238,220,185,174,175, 94,189,154,131, 42, 44, 59,  3,
+128,148, 37,132,  0,192,210,210,146, 65,229, 39,199,148,202,201, 48, 12,105,209,162,197,215,169,169,169, 13,213,106,245,143, 38,
+ 52, 60, 12,128, 83,  5, 91, 97,157,242, 36, 60, 60, 92, 61, 96,192,  0, 73,205,154, 53,131,254,106,222,214,169, 83,167, 25,159,
+207,199,131,  7, 15,180,  0,110, 20,236,190,241,244,233, 83,237,103,159,125, 38,170, 86,173, 90, 51, 83,185, 20, 10, 69, 29, 79,
+ 79,207,203,246,246,246,146,194,105,219,221,187,119,231,175, 88,177,194, 34, 46, 46, 14,122,189, 30,179,103,207, 70,143, 30, 61,
+ 96, 99, 99,131, 81,163, 70, 57,109,221,186,245, 55,  0,  1,229,212,161, 98,161, 80,184,231,245,235,215, 94, 46, 46, 46,146,251,
+247,239,195,215,215, 23,169,169,169, 72, 76, 76, 68,110,110, 46, 18, 19, 19, 49,122,244,104,199,213,171, 87, 43,254, 65,239, 80,
+166, 64, 32,128, 84, 42,181,206,204,204,204,250, 11, 60, 34,  0,194,226,226, 74, 36, 18, 65, 36, 18,161,164,139,201,255, 71, 16,
+ 66, 92,  9, 33, 97,  2,129, 64, 36,149, 74,  5, 20, 69, 65, 38,147,117,174, 86,173,218,139, 97,195,134, 53,216,179,103,207, 59,
+ 83,120, 52, 26,205, 30,137, 68,194,119,112,112,  0,  0,116,234,212,  9, 35, 70,140, 64, 74, 74, 10,171, 84, 42, 81,175, 94, 61,
+234,250,245,235, 72, 74, 74,194,147, 39, 79,208,164, 73, 19,190,173,173,237, 30,  0, 93,205,178,233, 35, 90,176,120, 60, 94,209,
+ 86,154,229,170,112, 43,233,248, 94, 22,167,209,104,132,147,147, 19,164, 82, 41,164, 82,105,113,103,246, 63,241,115, 28, 87,165,
+ 33, 66,153, 76,134,193,131,  7,115,155, 54,109,154, 80, 32,178, 94,155,250,223,254,235,195,139,172, 86, 37,225,235,235,123,231,
+187,239,190,235,114,241,226,197,140, 64,143,154, 60,153,242,125,174,216,210,218, 26,110,213,187, 15,235, 63,240, 46,128,253,149,
+ 72,166, 82,171,213, 10, 60,221,164, 58,138,210,144,234, 34,158,133,139, 76, 32,114,182,177,113, 21,232,180,201,150, 54, 54,194,
+130, 33, 51,101, 69, 68,133,147,  7,  8, 33,176,182,182,230, 23,124,194,209,209, 81,212,160, 65,131, 36,138,162,192,113,156,242,
+217,179,103, 38, 15, 23,122,120,120,  4, 83, 20,229, 70,  8,249, 96, 66, 66,241,141,101,217,184, 23, 47, 94,152, 58,  1,225,187,
+ 70,141, 26,181,217,184,113,163,131,151,151, 23, 54,111,222,108,121,228,200,145, 93,191,253,246, 27, 50, 51, 51,241,238,221, 59,
+140, 30, 61, 58, 27,249,195,136,255, 40,216,218,218,222,238,223,191, 63,182,109,219,198, 21,116, 34,100,132, 16, 95, 43, 43,171,
+ 87, 97, 97, 97,255,117, 63, 23,138,162, 58,215,171, 87,143,100,101,101,129,101, 89,208, 52, 93,212, 17,162,105, 26, 95,125,245,
+149,100,244,232,209,115,155, 53,107,246, 53,159,207,207,102, 24,230, 64,110,110,238,143,207,159, 63,255, 71, 57,171,182,106,213,
+234,203,216,216,216, 30, 53,106,212, 56,253, 23,122,251, 92,227,198,141,117,  0, 36, 52, 77,243, 63, 66,  3, 70, 23,212, 71,154,
+194,197,225, 57,142, 99,  2,  2,  2, 52,  5,141, 59, 93,137,114,243,219,222,189,123,221,220,220,220, 96, 48, 24,192, 48, 12,114,
+115,115,113,253,250,117,104,181, 90, 48, 12,131,122,245,234, 97,217,178,101,154, 73,147, 38,137, 15, 30, 60,152,172, 86,171,135,
+ 84, 64, 59,237,200,145, 35, 50, 23, 23, 23,137, 90,173, 70, 84, 84, 20,  2,  2,  2,144,147,147,  3,149, 74,133,188,188, 60,232,
+245,122,100,103,103, 91, 27,141, 70,221, 63,166,161,225,241, 32, 18,137, 32, 16,  8, 50,107,212,168,  1, 66,136,248,221,187,119,
+ 85, 25,114,179,  4,144,205,231,243,133,197,133,149, 72, 36,194,179,103,207, 14,150,101,189, 42,175,252, 84,230,247, 63, 64, 96,
+173, 21,  8,  4, 34, 91, 91, 91, 65,225, 62,189, 94, 47,176,177,177, 65,205,154, 53,215,  3,232,102, 98, 29,226,103, 99, 99,  3,
+ 66,  8,  4,  2,  1,198,142, 29,139,135, 15, 31, 30,143,139,139, 27,150,156,156,140,188,188,188, 61, 86, 86, 86,125,146,147,147,
+ 97, 52, 26,241,246,237, 91,248,249,249,249,153, 37,211, 71,182, 96,149, 37,168, 74, 10, 46, 83,172, 37,122,189, 94,222,189,123,
+119,182,120, 35, 93,240, 63, 82,142,192,170, 82,  1,231,243,249, 22, 19, 39, 78,204,217,180,105,211,120, 66,200, 86,142,227, 34,
+171,154, 73,167,143,238,119, 90,246,195,236, 31,108, 21, 53, 61,191,249,230, 27,222,103,159,125,118,117,231,206,157,141,109,189,
+189, 63,185,118,105,175,211,250,111,230,156, 56,121,242,100,158,169, 14,238,  5,184,115,252,248,113,151, 25, 83, 39,  9,126,248,
+106,218,  5, 75, 47,123,161,156,216,202,196, 90, 85,138, 28,156, 90, 84,187, 94,143, 51, 23, 47,198,  2,184,109, 66,229,229,246,
+224,193,  3, 71,107,107,107,  0,249,147,  3,172,173,173,177,105,211, 38,155, 66, 75,161, 41,195,133, 37, 94, 64,183,208,208, 80,
+ 71,185, 92, 14,149, 74, 85,212, 32,112, 28, 87, 84, 89,182,110,221,186, 50, 13, 97, 20, 33,164,245, 23, 95,124,113,115,227,198,
+141, 14,158,158,158, 88,180,104, 17,210,210,210, 16, 19, 19,131, 33, 67,134,100, 71, 69, 69,181, 43,238,155,245, 79, 64,195,134,
+ 13,185, 59,119,238,224,194,133, 11,248,244,211, 79,201,201,147, 39,245, 70,163, 81, 16, 31, 31,255,236,239, 74, 19,195, 48, 22,
+  2,129,160,104, 88,189, 80, 88, 21,110,110,110,110,184,114,229, 10, 47, 47, 47,143,151,154,154, 42,253,245,215, 95,167,  4,  7,
+  7,187,  0, 24,244,119,230,229,166, 77,155,106,140, 29, 59, 54,134,199,227,113, 93,186,116, 25,250,254,253,251,222, 46, 46, 46,
+191, 95,187,118,109, 21,128, 74,135, 43,104,208,160, 65, 48,143,199,115,227, 56, 78,112,226,196,  9,131,209,104, 20, 52,108,216,
+ 48,169, 68, 48, 68, 48, 12, 19, 23, 17, 17, 17,104, 10,159, 88, 44, 22,108,221,186,213,160,209,104,  4,190,190,190, 73,197,120,
+  4, 39, 79,158, 52, 24, 12,  6, 65,221,186,117,131, 77,153,217,156,158,158, 62,100,250,244,233,183, 14, 29, 58,100, 79,211, 52,
+222,191,127,143,180,180, 52, 88, 91, 91, 99,207,158, 61,168, 89,179, 38, 46, 95,190,156,206, 48,204,152,109,219,182,205, 85,171,
+213, 67, 76,240,193,106, 29, 20, 20, 84, 35, 51, 51, 19,214,214,214, 80,169, 84,  8, 14, 14,134,143,143, 15,148, 74, 37, 40,138,
+130,181,181, 53, 54,110,220,152, 71,  8, 73,255, 39,188, 67, 52, 77, 23, 89,153,138,137, 34, 77,179,102,205,112,251,246,237,125,
+149, 17, 69, 28,199,233,248,124,254,  7,194,170,240, 59, 77,211,149, 30,242, 48, 26,141,  2, 66,136, 31, 10,252,  3, 43,250,253,
+ 15, 64, 27,169, 84, 42, 40,165,172,  9,234,212,169,211,202, 84, 18,161, 80,104, 39,145, 72,242,  9,219,180, 65,114,114,178,209,
+195,195, 99,224,128,  1,  3, 12,  0, 48,126,252,248,129,201,201,201, 26,134, 97,104,154,166,145,146,146,130,154, 53,107,218,153,
+ 37,211,127,192,130, 85,158,229,170,184,  5,171,162, 66, 72, 81, 84,102, 72, 72,136, 76, 38,147, 21,237, 51, 24, 12,240,243,243,
+ 99, 89,150, 37, 37,175, 83,152,142,170,130,207,231, 91,124,251,237,183,153, 27, 55,110, 28,  6,224, 59, 83,254,115,120,114, 61,
+236, 46, 33,174, 54, 47, 91,184,254,151,101,139,109,223, 92,216,137,237,235, 86, 26,249, 66,121,176,159,159, 95,235,172,172, 44,
+173,181, 76,139,196, 52, 28,231, 56,238,183, 74,244, 66, 40,  0,  7,239,221,187,247,184, 83,167, 78,247,119, 28, 60,102,171,140,
+138,186, 39,202, 78, 77,176,172,237,197, 19,184,214,232,163,210,233,248,125,250,244,145,  3, 88,103,  2, 31, 98, 98, 98,112,247,
+238, 93, 88, 90, 90,194,210,210, 18,214,214,214, 69,223,171,146,135,133,195,182,103,206,156,129, 76, 38, 67,193,212, 93,200,100,
+ 50,  8,133, 66, 20,127,134,149, 16, 89, 17,132,144,105,199,142, 29, 59,176,100,201, 18,164,167,167, 67,165, 82, 97,222,188,121,
+136,138,138,154,206,113,220,227,127,210,203,225,235,235,203,221,187,119, 15,119,238,220,129, 74,165,194, 47,191,252,  2, 23, 23,
+151,246,  0,190,255, 59,211,197,178,172,160,208,162, 88, 92, 88, 21,183, 98,209, 52, 13,177, 88, 12,123,123,123,204,153, 51, 71,
+240,233,167,159,246,248, 59,211,188,124,249,242,218,107,215,174,253,117,247,238,221,231,135, 12, 25,114,232,249,243,231, 35,173,
+172,172,158, 93,189,122,117,177, 72, 36, 98,171,104, 21,113,123,252,248,177, 99,241, 87,158,101, 89, 41,195, 48, 96, 24,  6,  6,
+131,  1,121,121,121,232,216,177,163,201,124, 15, 31, 62,148,  2,192,247,223,127,207,  7, 32,101, 89, 22, 70,163, 17,133,156,121,
+121,121,252, 14, 29, 58,184,153,100,162, 86, 42, 35, 20, 10, 69,171,  1,  3,  6,220, 61,112,224,128, 77,141, 26, 53, 16, 31, 31,
+143,248,248,120,212,174, 93, 27,235,214,173, 83,113, 28,215,162, 64, 84,157, 52,241,182, 21, 54, 54, 54,252,152,152, 24, 48, 12,
+  3, 63, 63, 63,108,220,184, 17,  3,  7, 14, 68,131,  6, 13,144,157,157,141,176,176, 48,236,218,181,203, 70, 32, 16,244,253,187,
+223, 33,138,162,254, 36,174,138,111, 85,236, 96, 88,138,197,226,108,145, 72, 36, 44,244,191,122,248,240, 97,165,173, 87,197,234,
+165,199,149,249,253,119,194,194,194,  2,114,185, 28,  6,195,135,183, 41,147,201, 80,187,118,109,147,121,228,114, 57, 41, 52, 98,
+ 24, 12,  6, 36, 36, 36, 24,159, 63,127,110,244,247,207, 31,228,112,113,113, 49, 62,120,240,192,168,209,104,104, 11, 11, 11, 20,
+140,138, 16,152,241,241, 44, 88,133,214,138,242, 44, 87,133,223, 11, 45, 81, 21,189,108, 52, 77,227,194,133, 11, 69,  5,165, 94,
+189,122, 69,215,250,216,  2,203,206,206, 78, 21, 20, 20,100, 25, 27, 27,187,191, 42,255, 47, 20, 87, 75, 22,205,179, 77,127,121,
+ 31,113,202,  4,164, 39, 27, 66,110, 63,123,123,  9,192, 37,  0,192, 22,239,235, 24,255,210,100,113,229,237, 32,109,212, 80, 97,
+113,252,147,110, 61,170, 13, 24,247, 37, 53,105,210,164,166, 35, 71,142, 76, 27, 50,100,200, 36,137, 68,226,205, 48, 76,218,153,
+139, 23,223,244,233,211,199,153, 97,152, 17, 28,199,153,226,147, 20, 55,120,240, 96,  1, 33,  4,142,142,142,252,221,187,119,219,
+ 88, 90, 90, 98,228,200,145, 25,111,223,190, 53, 20,244,196,146, 42,121,251,113, 45, 90,180,248,211,176, 96, 97,195, 94,104, 25,
+168,164,104,243,235,209,163,199,182, 67,135, 14, 33, 53, 53, 21, 42,149, 10,124, 62, 31, 43, 86,172, 64, 76, 76,204,207,132,144,
+231,255,148,202,172, 81,163, 70,220,131,  7, 15,240,236,217, 51,104,181, 90,140, 25, 51,166,184,143, 97,167,191,123,164, 32, 62,
+ 62, 30,123,247,238,  5,203,178, 24, 50,100,  8,106,212,168, 81, 36,172, 18, 19, 19,177, 99,199, 14, 24,141, 70,140, 29, 59, 22,
+213,171, 87,135,193, 96, 16,183,109,219,150,119,253,250,117,230,239, 72,240,140, 25, 51,222, 28, 63,126,252,124,108,108,108,215,
+101,203,150,181, 33,132,176, 95,127,253,245, 82, 75, 75,203,191, 52,251, 50, 35, 43,  7,175, 94,191, 47, 18, 64, 37, 55,  7,123,
+219, 74,243, 69, 70,197, 22,253,223,104, 44,206,103,132,157,173, 77,165,248, 18, 18, 18,242,210,210,210, 84, 99,198,140,177,222,
+182,109, 27,169, 93,187, 54,162,163,163,193,231,243, 97, 97, 97,145, 23, 30, 30, 94,217,208, 12,241,233,233,233, 94, 52, 77, 11,
+ 94,191,126, 13,119,119,119,  4,  5,  5,225,199, 31,127, 68,106,106, 42, 24,134,129,163,163, 35,107, 48, 24, 66,117, 58,221,205,
+191,251, 61, 42,110,101, 42,190,221,185,115,103, 31, 77,211, 20,128,211,  0, 42, 37,176, 57,142,211, 85,175, 94,253,  3,238,170,
+ 88,175,254,131, 22,187,255,216,204,196, 58,117,234,220,144,201,100, 61, 94,189,122,245,129, 21,107,240,224,193,122, 79, 79,207,
+ 91,166,242, 88, 90, 90,102,  8,  4,  2, 59,141, 70,131,123,247,238,193,219,219, 91,144,149,149,181,132, 16, 50,187,160,115,185,
+ 36, 41, 41, 73,160, 80,228,187,241,213,173, 91, 23, 57, 57, 57, 25,102,201,244,145,  5, 86,105,150,171,210, 68, 22, 77, 87,236,
+154, 64,  8,129, 90,173,134, 76, 38, 43,218, 10,253,172, 74, 19, 88,  5,190, 63, 85, 26, 34, 44, 16, 87,146,  3,  7, 14,236, 91,
+183,110,221, 29, 83,255, 87,220,  7,107,203,170, 69,203, 10,197,213,211, 59,151,113, 50, 60, 43,117,214,146, 53,107,171,154,217,
+ 62, 14, 50, 95,103, 39,251,235, 43,126, 90,104,249,230,194, 46, 28,218,178,154,123,250,240, 97,227,  9, 15, 31,246,157, 48, 97,
+130, 45,128,  4,  0,241,  0,238,  1,248,217, 68,113,133,136,136,136,162,224,174,254,254,254,177, 54, 54, 54, 54, 18,137,  4, 74,
+165, 82,251,248,241,227, 42, 57,186, 70, 70, 70,126,212,224,174,132,144, 58, 61,123,246,188,121,244,232, 81, 89,102,102, 38,222,
+191,127,143,175,191,254, 26, 27, 54,108,128,165,165, 37,206,158, 61,107,209,163, 71,143,235,132,144,230,127,119,112, 85, 63, 63,
+ 63,238,209,163, 71,120,247,238, 29, 24,134, 65,175, 94,189, 42,156,192,241, 95,182, 96,113,211,167, 79,199,182,109,219, 64,211,
+ 52,134, 13, 27,134,236,236,236,162,227,182,182,182,165, 29,163, 11,222,247,191, 69, 96,241,120, 60,238,198,141, 27,203,218,180,
+105,131,216,216,216,174,  1,  1,  1,191,140, 28, 57, 50,254,175,242,218, 88, 89,160,145,143,  7,180, 90, 45,180, 90, 45, 20, 10,
+  5,114,114,114,240,230,205, 27,104,181, 90, 56, 57, 90, 87,154,207,191, 65,237, 34, 62, 71, 71, 71,168, 84, 42,188,125,251, 22,
+ 58,157, 14,246,246, 54,149, 41,243,213, 58,119,238,124,109,223,190,125,118,251,246,237,211,125,246,217,103,194,133, 11, 23, 18,
+ 75, 75, 75, 36, 39, 39,163,138,238, 61, 55,110,223,190, 93,163, 99,199,142,117, 95,190,124,137, 27, 55,110, 64,167,211,193,223,
+223, 31,145,145,145,104,214,172, 25,114,115,115, 31, 60,122,244,232,212, 63,161,172, 22, 14,223, 21,110,193,193,193,  7,  5,  2,
+  1,  7,160, 74,214,166, 66,196,196,196,136,124,125,125,181, 98,177, 88, 88, 32,214,254, 18,223, 71,174,235,254,210,204,196,242,
+224,225,225, 49,221,205,205,173,163,191,191, 63, 94,190,124, 41, 16,137, 68, 24, 58,116,168,190, 91,183,110,122, 30,143,103,242,
+132, 27,137, 68,242, 82, 46,151,183,214,106,181,208,233,116,184,124,249, 50,236,236,236,102,245,236,217,115, 90, 66, 66,  2,148,
+ 74,165, 80, 40, 20, 22,249,223,182,109,219, 22,105,105,105, 47,205,146,233, 35,  9,172,194, 50, 98,202,240,160,169, 62, 88, 20,
+ 69, 65,167,211, 65, 38,147, 65, 42,149, 66, 38,147, 21, 93,135, 16, 82,170,192,170, 10,170, 85,171,134,160,160, 32,201,161, 67,
+135,126, 91,185,114,229,221,170,112, 28,217,183,215,197,138,205,171,166,124,112, 14, 17,207, 66,112, 60, 44, 51,117,214,146, 53,
+ 83,123,246, 29,148, 84, 82,144, 29, 30,111, 66,207,195, 81,214,192,213,201,238,250,170,229, 75, 44,211, 95,222, 71, 66, 98, 34,
+206, 61,120, 20,162,205,247, 13,251,241, 35,190,220, 40, 28, 91,255, 39, 65, 36, 18, 77, 63,114,228,136, 44, 51, 51, 19, 81, 81,
+ 81, 24, 50,100, 72,230,187,119,239,190,232,221,187,247,134, 75,151, 46,217, 88, 91, 91,227,210,165, 75, 22,213,170, 85, 91,  2,
+160,199,223, 88, 57,114, 70,163, 17,233,233,249,238, 43, 45, 90,180,248, 71,137, 43,  0,  8, 14, 14, 22,244,236,217,243,119,  0,
+237, 95,190,124,  9,150,101,239,134,132,132,180, 40, 60, 94,222, 49, 83,244, 91, 78, 78, 14,223,194,194,162,212,198, 74, 32, 16,
+  8, 42,107,113, 40,206,121,231,206,157,165,171, 86,173, 58, 62,115,230,204,215,127,145,179, 84, 11, 86,143, 30, 61,160,214,234,
+ 17,151,148,  5,163,145,129, 90,159,252,151, 44, 88, 61,122,244, 64,158, 70,135,152,132,116, 48,140, 17, 57,106,198,212,114, 36,
+253,228,147, 79, 46, 30, 56,112,192,249,222,189,123,208,106,181,108,112,112,240,219,113,227,198, 89,142, 30, 61,218,174,172,208,
+ 54, 38, 96,221,160, 65,131,250,221,185,115, 39,189,110,221,186,182, 15, 30, 60, 64,114,114, 50, 24,134, 65,251,246,237, 33, 20,
+ 10, 99,150, 44, 89, 34,128,  9,174,  5,255, 45,129, 37, 18,137, 16, 22, 22, 86, 40,172,134,127, 44, 33, 36, 20, 10,171, 60,204,
+248,191,138,223,126,251, 45,126,231,206,157, 62,174,174,174,107,135, 15, 31,222, 78,161, 80, 80, 34,145,232,  6,143,199,155,  6,
+224,189,169, 60,  2,129, 96,164,181,181,245, 27,138,162,232,248,248,120,188,126,253, 26,209,209,209,  0, 32,204,203,203,131,163,
+163, 99,145,209,100,208,160, 65,168, 86,173,154, 49, 50, 50,114,164, 89, 50,125,100, 11,214,194,133, 11,177,101,203, 22,140, 31,
+ 95,190,138, 56,125,250, 52, 80, 98,136,176, 96,249,152, 43,197, 27,127,163,209,136,121,243,230,125,240,191,194,225,167, 47,190,
+248,226,  3,206, 19, 39, 78,252,105,136,176, 36,103,105, 72, 78, 78,126,121,248,240,225, 71,203,151, 47,127, 96, 98,101, 88,196,
+ 89,232,131,213,111,240,208,132,245, 75,127,120,190,251,244,213,  6,  9,106, 46, 97,214,146, 53, 51, 75,138, 43, 83, 57,189,157,
+229,222,110,142,118, 55, 86, 46, 95, 98, 85,104, 13, 59, 16,154,152,  5,134, 27, 95,153,135,101,202,189, 51, 12, 19,231,231,231,
+ 39,  0, 76, 27, 22, 52,133,179, 10, 34,229, 79,156, 90,173, 22,247,239,223,  7,  0,140, 26, 53, 42,243,221,187,119,173, 57,142,
+123, 65,  8,121,217,185,115,231, 27, 23, 47, 94,180, 97, 89, 22, 40, 35, 44,197,127, 43,157,  5,249,  6, 30,143,  7, 47, 47,175,
+ 74,139,171,255, 86, 58, 19, 18, 18,198, 79,152, 48, 97,139, 86,171,229,169, 84,170,241,166, 30,171, 40,157,135, 15, 31,126,237,
+229,229,213,  6,101,135, 98, 96, 11, 44,172, 85,230, 92,187,118, 45,  0,212,253, 43,156,101, 89,176, 14, 30, 60,  8,150,101, 81,
+205,217, 26, 90,173, 22, 82,169,180, 82,156, 37, 45, 88,135, 14, 29,  2,203,178,168,238, 98, 11,157, 78, 87,102,231,165, 36,167,
+157,157,221,234,221,187,119,187,133,135,135, 35, 46, 46, 14,107,214,172,121,159,146,146,210,141,199,227,137,126,249,229,151,235,
+221,187,119,119, 98, 24, 70, 91,217,231,206,113,156,150, 16, 50,178,121,243,230,123, 22, 47, 94, 28, 93,175, 94,189,234, 45, 90,
+180,176, 78, 75, 75, 75,121,252,248,241,219, 45, 91,182,200, 25,134, 25, 89,214,208,211,127,243, 61,  2,128,248,248,248, 83,  0,
+248,149, 21, 86,166,164,243,225,195,135,135, 10,184,207,153,194,253,223,186,247,191, 58, 51,177,162,116,142, 28, 57, 50, 14, 37,
+226,155, 85, 54,157,151, 46, 93,122, 55,120,240,224, 69, 13, 26, 52,152, 47,151,203, 17, 17, 17, 81, 20, 22,169,176,140, 19, 66,
+208,191,127,127,124,241,197, 23,184,120,241,226,162,126,253,250,189,251, 79,231,231,191, 70, 96, 25,141,198,216,119,239,222,185,
+236,222,189,155, 38,132,224,183,223,126, 67,241, 41,251, 52, 77,131,162, 40,240,120,249, 20,247,239,223,103, 42,138, 57,101, 52,
+ 26, 99,131,131,131,157,118,237,218,197, 47, 52, 25,199,199,199,131,101, 89, 54, 41, 41,137,218,183,111, 95,145, 53,140,199,227,
+225,254,253,251,140, 94,175,143,169,236, 77, 69, 68, 68,124,148,222,219,205, 23,239,166, 93, 60,119,194,190,105, 80,171, 76, 75,
+ 91,219, 82,187,174,133, 17,223,203, 45,220, 60,234,199,101, 63, 45,180, 46, 20, 87,  7, 67, 19, 51, 53, 90, 99,187,151, 41,121,
+ 79, 63,246,  3,125,250,244,105,243,127,104, 89,155,215,166, 77, 27, 22,128, 61,128,185,133,179, 58, 11, 68, 86,211,218,181,107,
+207,  4, 32,  1, 48,239,239,180, 94, 21, 15, 13,242, 79,179, 92, 21, 71, 72, 72, 72, 52,128, 14,149, 61, 86, 17,250,245,235, 23,
+133, 82,  2,126,254, 21,252, 39, 56, 11,145,158,153,141,168,119,241,200,119, 70,103, 97,124,159, 84,228, 55,101, 48, 48, 72,207,
+174, 84, 24, 57,100,100,229,224,205,219,248,130,165,193,140, 48, 26,149,  5,124,249,142,238, 92, 70, 94,133, 28,124, 62,191,229,
+218,181,107,187, 81, 20, 69,221,191,127, 95,187,124,249,242,216,148,148,148, 94, 28,199,197,  0,128, 66,161,104,123,226,196,137,
+223, 76,  8,201, 80, 86,199, 55,140, 16,210,236,155,111,190,153, 10,160, 37,128,234,  0, 98,144, 63,227,120,221, 63, 44,226,248,
+240,255, 81,238, 42,227,127,101,102,226,190,125,251, 22,124,241,197, 23,188,160,160,160, 57,141, 27, 55,166,222,190,125,139,228,
+228,100,240,120, 60,212,169, 83,  7,157, 58,117,130,187,187, 59,123,246,236,217,159,250,244,233,179,  0,102,124, 60,129,149,154,
+154,218,121,248,240,225,151, 41,138,170, 89,124, 24,175,180, 79,  0, 96, 89,246, 93, 82, 82, 82,185, 65,200, 82, 83, 83, 59,207,
+155, 55,239, 50,143,199,171, 89, 44,254,149, 54, 45, 45,237,139,254,253,251,111,228,243,249,162,226,214, 46,150,101,223, 39, 36,
+ 36,252, 87, 29,138, 75,198,193,234,220,173,119,234, 95,229,148, 11, 40,207,136,179,219,144,148,156,138,131,161,137, 25, 57, 58,
+ 99,219,136, 20,213,243,127, 83, 65,227, 56, 46, 25,192, 23,101, 28,123, 13, 96,252, 63, 32,141,164, 64,100,153,103,203,252, 15,
+128, 97,152,184,142,237,219,162,100, 88,134,146,191,141, 70, 99,156,169,124, 29,218,181, 41,147,167,240,123, 69,124, 52, 77,207,
+ 12, 10, 10,162,103,206,156,153,116,254,252,249,223, 51, 50, 50,102,112, 28, 87,164,204, 10,102, 13,  6,252,197,178,170, 69,254,
+ 10, 15,203,205, 37,225, 31, 89,223,253, 79,204, 76,220,184,113,227,247,179,102,205,218,229,230,230,182,183,101,203,150,117, 61,
+ 61, 61, 45, 45, 44, 44,144,157,157,157,147,145,145,241,234,204,153, 51, 67,134, 15, 31, 30,109,126,162, 31, 89, 96,165,164,164,
+168,  0, 52,251,152, 23,171,128,179,198, 63,166,203,165, 93,190, 31, 91,150,127,176, 14, 97,161,248, 42,245,119,  5,210, 32, 75,
+205, 76, 90,119,241,197, 74, 45,195,177,122,134, 29, 21,145,172, 10, 51, 23,189,127,108,197,104, 22, 87,255, 35,120,254,252,121,
+224, 63,145, 79,167,211, 77,107,222,188,249,207, 70,163,113,149,193, 96,184,109,126, 82,102,252,147,177,124,249,242,232,194,118,
+185,127,255,254, 52,  0, 28, 62,124,216,104,206,153,255,160,192,250,183,226,240,139, 63, 26,216,146,194,169,162,223,101,225, 85,
+ 98,238,141,191,218, 99, 53,195, 12, 51,254,103, 68,122, 12,128, 94,230,156, 48,227,127,174,253, 51, 11,171,143, 10,202,156,  5,
+102,152, 97,134, 25,102,152, 97,134, 25, 31, 23,  4, 64,199, 50,122, 97, 38,207, 14, 32,132,116,172,236,133, 77, 88, 49,220,204,
+105,230, 52,115,154, 57,205,156,102, 78, 51,231,255, 51,206,127, 13,138, 59,114,126,236, 13, 64, 71, 51,167,153,211,204,105,230,
+ 52,115,154, 57,205,156,102,206,127,219,102, 30, 34, 52,195, 12, 51,204, 48,195, 12, 51,204,248,200, 48, 59,185,155, 97,134, 25,
+102, 20,131, 66,161,232,  9, 96,  1,242, 93, 40,150, 40,149,202, 67,230, 92, 49,227,255, 19, 28, 28, 28,100,118,118,118,191, 83,
+ 20, 85,  3,248, 48,228, 82, 41,193,189, 97, 52, 26, 19,210,211,211, 59, 37, 38, 38,166,254, 55, 57,255,117,  2,171,125,109,235,
+ 86, 30,181,220,247,165, 36,167,134,230,106,178, 71,255,254, 42, 39,189, 42, 23, 38,132,216,  9,133,194,129, 50,153,172, 35,199,
+113, 30, 52, 77,135,103,101,101, 93, 49, 24, 12,  7, 56,142,203, 53,191,  2,102,252,221,240,243,243,107, 40, 20, 10,103, 17, 66,
+154, 50, 12,227,198,231,243,149,  0, 30,104,181,218, 21,161,161,161,161,230, 28,250,255,  1, 66,  8,229,226,226,242,179,181,181,
+117, 80,102,102,230, 16,  0,115, 34, 34, 34,124, 41,138,130,143,143,207, 28,133, 66,241,198,210,210,114,123,118,118,246,221,132,
+132,132,105,149, 89, 59,206,140,127, 46, 60, 61, 61,131, 41,138,114, 43, 92,146,173,164, 32, 40, 77, 32,112, 28, 23, 29, 22, 22,
+ 86,102, 48,103, 55, 55, 55, 15, 75, 75,203,141,  0, 26,151, 20, 21, 37, 81, 48,204,246, 40, 59, 59,251,139,184,184,184, 82,  3,
+241,218,218,218, 90, 56, 58, 58, 46, 32,132,244,167, 40,170,194,  5,127, 89,150, 53,114, 28,119, 56, 57, 57,121, 94,122,122,122,
+ 78, 89,231,217,217,217, 93,185,121,243,102, 99,123,123,251, 10,195,210, 48, 12,131,248,248,120,135,238,221,187,223,  4, 80,239,
+191,201,249,175, 19, 88,224,168,161, 43,190, 27,235,154, 18,251,198,117,206,218, 99,117, 90,213,179,111,123, 43, 60, 53,177, 50,
+ 20, 18,137,100,160,175,175,239,186,159,127,254,217,206,221,221,157, 72,165, 82, 36, 36, 36,212,123,252,248,113,159,249,243,231,
+207,227,243,249, 35, 13,  6,195,229,191, 88,105, 90,219, 74,121,179,210, 84,134,111,205, 85,137, 25,149, 65,255,254,253,233,216,
+216,216,249,246,246,246, 95,205,158, 61, 91, 84,179,102, 77,200,229,114, 36, 39, 39, 87,127,253,250,117,181, 13, 27, 54,244,108,
+222,188,249, 47, 58,157,110,110, 72, 72,136,193,156, 99,255,219,112,113,113,249,249,228,201,147,147,235,214,173,139,214,173, 91,
+223,245,243,243,179,148, 74,165,184,112,225,  2, 60, 61, 61,235, 91, 90, 90, 62,216,188,121, 51,127,193,130,  5,141,142, 29, 59,
+  6,  0, 83,204,185,246,191, 15,138,162,220, 66, 67, 67, 29,165, 82, 41,140, 70, 99, 65,244,126, 22, 28,199, 21,125, 22, 23, 67,
+ 70,163, 17,237,218,181,211,151,199, 41, 22,139, 55, 60,123,246,172, 99,225, 58,126,197,132, 84,169, 80, 42,149, 29,219,181,107,
+183,  1, 64,169,  1,181, 29, 29, 29, 23, 12, 24, 48, 96,122,131,  6, 13,  0,160, 40,157,133,159,169,169,169,152, 52,105, 82,209,
+ 53, 88,150,197,205,155, 55,167,126,249,229,151,  0,240,101, 57,247, 94,195,222,222,158, 84,180,  4,222,252,249,243, 49,127,254,
+124,172, 91,183,142,240,120, 60,235, 10,242,243,163,115,254,235,  4, 22,161,200,185,245,155,119,141,158, 49,160, 41, 89, 62,174,
+149,215,119,219,175,223,235, 88,203,166,245,149,232,140, 88, 19,197,213,212,  9, 19, 38, 44, 93,184,112,161,248,213,171, 87,  8,
+ 11, 11,  3,195, 48,176,176,176,128,175,175, 47,117,238,220, 57,151,105,211,166, 29, 17, 10,133,163,116, 58,221,177,170,222,152,
+179, 37,127,133, 76, 68, 13, 22,242,120, 15,116, 12,115,234,159,152,249,238,238,238,151, 12,  6,195,178,248,248,248,107,255, 43,
+  5, 70,161, 80,180, 16, 10,133,243,222,189,123,215,133,227, 56,230,255,227, 75, 17, 19, 19,179,176,101,203,150, 51,230,207,159,
+ 47,122,251,246, 45, 34, 35, 35,161, 84, 42, 81,179,102, 77,184,187,187,147,117,235,214,137,127,249,229,151, 41, 79,158, 60,225,
+  3,152, 81, 25, 75,137,179,179,243,152, 14, 29, 58,244,181,183,183,183,138,143,143,207,186,115,231,206,201,132,132,132,173, 85,
+205, 75, 66,  8,101,111,111, 63,162, 71,143, 30,125,109,109,109,109, 19, 19, 19, 51,174, 92,185,114, 34, 57, 57,121,251, 95,177,
+180, 16, 66, 92,  0,248,  2,176, 43,216,149,224,238,238,254,226,237,219,183,201, 31,145, 83,233,238,238, 30, 86, 21, 78,  7,  7,
+  7, 25,143,199, 59, 68,  8, 81,148, 99, 33, 80, 50, 12, 51,160, 32,192,113,153,176,180,180,108,234,229,229,133,144,144, 16,204,
+157,251,127,236, 93,123, 92, 84, 85, 30,255,158,123,231,197,188, 96, 24, 64, 96, 24,  5,149, 55,152,138,  6,152,226,170,169,105,
+202, 90,138,149,181,165,105,166,100, 46,110,  9,169,176,226, 35,205, 30,102,143, 13,113, 85,220,245, 85,150, 86,102, 25,161,109,
+186,105,226, 11,197,215,240, 88, 69,112, 16, 70, 30, 34,143,153,185, 51,115,239,254,  1, 51,226,198, 99,134,220, 36,155,239,231,
+115, 62,115,239,157,225,203,185,231,156,251, 59,223,251, 59,191,115, 78,170,114,228,200,145, 40, 44, 44,  4, 33,  4,175,188,242,
+ 10,137,136,136,224,151,151,151, 99,240,224,193,200,201,201,121,  8, 78, 56, 82,231,187,  0, 40,  0, 76,227, 56,238, 70,171,235,
+158,  0, 62,  7, 80,201,113,220,228,123,149, 63,177, 88,140,157, 59,119,130,207,231,131,207,231,163,166,166,  6,106,181,218,118,
+ 46, 16,  8,108,199,189,122,245,234,148,143,101,217,104,154,166, 81, 95, 95, 15,139,197, 98, 75,181,181,181,224, 56, 14, 34,145,
+  8, 22, 75,243,182, 75,214,239, 88,150,141,238,160,252,166,170, 84, 42,236,216,177,  3, 70,163,177,173,182,139,252,252,219,155,
+130,208, 52,141,  1,  3,  6, 80,132,144,169, 29,  9, 44, 66,  8,  7,  0,179,103,207,  6, 77,211,182,173,239,172,199,214,100,177,
+ 88,144,158,158,222, 28,176, 77, 81,157,213,245, 93,231,252,205,183,255,142,212,245,200, 64,247,196, 17,113,177,111,185,136,120,
+ 98,214,108,130,197,108,  2,107, 54,130, 38, 44,226,194,123, 32,170,151, 11,170,107,110, 33,117,107, 94,157,182, 74, 31,147, 93,
+ 80,165,233,164,  2,  2, 98, 98, 98, 78, 29, 60,120, 80,113,224,192,  1,104, 52, 26,188,254,250,235,  0,  0,169, 84,138,253,251,
+247,131,166,105,176, 44,139,113,227,198,233,180, 90,109, 24,199,113,213, 93,120,168,253,135,247, 83,159,220,189,104,184, 50,114,
+238,167, 37,215,111, 26,251,114, 28,215,237, 22, 80, 83,169, 84, 28,159,207,111, 52,155,205,241,191,  5,145,165, 82,169,134,242,
+249,252,253,102,179, 89,194,231,243,197, 87,174, 92, 49,220,111, 15,196,192,129,  3, 31, 80, 42,149, 63,237,217,179,199, 37, 55,
+ 55, 23, 53, 53, 53,168,172,172,196,252,249,243,145,145,145,129,200,200, 72, 72,165, 82,  8,133, 66,188,244,210, 75, 77,183,110,
+221, 26,113,226,196,137,227,118,180, 73,122,248,240,225, 59,182,109,219, 22, 96, 54,155, 41,  0, 48, 26,141, 40, 45, 45,181, 44,
+ 89,178,228,234,137, 19, 39,166, 57, 42,178,  8, 33,212, 67, 15, 61,180,117,219,182,109,129, 66,161,144, 98, 89, 22, 38,147,  9,
+133,133,133,150, 37, 75,150, 92, 57,121,242,228,211, 93,105,247,132,144,129, 18,137, 36, 34, 49, 49, 81, 55,105,210, 36,  6,  0,
+142, 31, 63, 78,157, 57,115,198,181, 79,159, 62, 37,105,105,105,167,186,192, 57, 72, 46,151,135,190,248,226,139, 55, 38, 78,156,
+104, 18,  8,  4,236,143, 63,254,200,211,104, 52,174,  1,  1,  1,197,139, 23, 47, 62,227, 96, 91,220,183,103,207,158, 17, 42,149,
+202,  2,128,179, 26,120,138,162,184,150, 79, 20, 23, 23,243, 18, 18, 18,254,165,213,106,255,216,225,203,152,143, 79,184,175,175,
+239,161,180,180, 52,165,181,147,106,157,172,117,149,158,158,206,148,151,151,199,106,181,218,211,112,194,222,122, 63,  6, 32, 26,
+192, 57,  0,163, 56,142,187,209, 34,174,190,  7, 16,  1,224, 71,142,227,134,221,139,188,133,134,134, 86,228,231,231,247,248,226,
+139, 47,192,231,243,241,221,119,223, 33, 35, 35,  3, 59,119,238,108, 83,100,249,250,250, 34, 46, 46,174,236,244,233,211, 61,219,
+227, 12, 12, 12,188, 89, 84, 84,228,122,243,230, 77, 88, 44, 22, 28, 59,118, 12, 27, 55,110, 68,143, 30, 61,224,233,233,  9, 47,
+ 47, 47, 68, 71, 71, 67, 42,149,218, 68,214,212,169, 83,235,138,138,138,220,218,226, 11, 15, 15,215, 62,243,204, 51,190, 39, 79,
+158,132,201,100,106, 83, 96, 37, 37, 37,181,246, 34, 65, 42,149, 98,210,164, 73,229, 23, 46, 92,104,247,229, 35, 50, 50,178,252,
+220,185,115, 62,103,206,156,185,163,173,183, 37,136,104,154,134, 92, 46,199,144, 33, 67, 42, 78,159, 62,237,243,107,114,222,215,
+ 30,172, 96,127,159, 37,139,230, 60, 38,134,133,  1,103,106,  2,152, 70,128,169,  7,107,108,  4, 17,136,  1, 83, 19,148,194,106,
+188,255, 92, 31,215,213, 95, 92,185, 48,170,175,215,132,131,197,186,253,237,241, 41, 20,138,244,245,235,215, 43,242,243,243,161,
+209,104,176,118,237, 90,172, 88,177,  2,  2,129,  0,213,213,213,136,143,143,199,145, 35, 71,192, 48, 12, 82, 83, 83,149, 41, 41,
+ 41,243,208, 28,108,234,160,247,138,151,241,201,230,247,149, 74,186, 10,207,143, 58,225,241,183,236,203,137,  0, 62,232,142, 21,
+240,214, 91,111, 73,146,147,147,247,250,249,249,117,107,145,165, 82,169,134,138,197,226,253, 73, 73, 73,210, 55,222,120,227,174,
+136, 85,181, 90, 29,201,227,241, 62, 54, 26,141,175,148,151,151,127,219,  5,227,221, 59, 38, 38,230,141,243,231,207,127, 86, 95,
+ 95,191,171,173,223,200,100,178,169,161,161,161,143,157, 56,113, 98,  9,199,113,151, 59,227, 20,137, 68,243, 23, 46, 92,232,114,
+237,218, 53,212,214,214, 66, 40, 20,218,118,153, 39,132, 64, 36, 18,129,162, 40,  8,133, 66, 60,251,236,179, 46,155, 54,109, 90,
+  0,224,169, 78,219,164,143,207,204,173, 91,183,  6, 48, 12, 67, 53, 52, 52, 64, 32, 16, 64, 32, 16,224,129,  7, 30,160, 23, 46,
+ 92,216,115,254,252,249,115,  0,124,232,200,253,187,187,187, 63,183,117,235,214, 64,161, 80, 72,149,151,151, 99,232,208,161, 56,
+118,236, 24, 98, 98, 98,232,228,228,228, 94,243,230,205,155, 13, 32,195, 81, 47,147, 68, 34,233,247,253,247,223,151,246,236,217,
+211,246,246,213,187,119,111,203,132,  9, 19,170, 47, 94,188, 24,122,244,232,209,170, 33, 67,134, 92,117,128,211, 79, 34,145,132,
+125,253,245,215,229,203,151, 47,127, 56, 51, 51,115, 18,  0, 68, 71, 71,127,185, 98,197,138,131,213,213,213,145,135, 15, 31,174,
+142,139,139, 43,115, 32,171, 30,222,222,222,230,196,196, 68,121,123, 63,216,178,101, 75, 21,128, 30,157,180,235,120,138,162,150,
+ 69, 70, 70,186,142, 28, 57, 18,135, 14, 29,194,203, 47,191,108, 48,153, 76,  5,  0, 48,122,244,232,144,244,244,116,225,201,147,
+ 39,161, 80, 40,248,229,229,229,155, 85, 42,149, 51,240,221,126, 76,  2,240, 47,  0,145,  0, 14, 18, 66,158,  0,240, 41,128,112,
+  0, 26,  0,  9,247, 50,115, 22,139,  5, 60, 30, 15,101,101,101,216,180,105, 19, 86,173, 90,133,224,224, 96,152, 76, 38,155,192,
+226,241,120,224,243,249, 32,132,216,189,149,150,217,108,198,241,227,199,177,245,159,255, 68,234,146, 37,144,203,155,155, 41,195,
+ 48,168,174,169,129,139,139,139,205,131,213, 17, 56,142,219, 85, 88, 88,152,164, 86,171,239, 24, 26,180,126,182,216, 56,176, 44,
+ 11,179,217, 12,131,193,128,191,255,253,239,102,142,227,118,117,242, 76,218, 60, 94, 73, 73, 73, 48, 24,110,191, 43,247,239,223,
+ 31,  0, 16, 16, 16,128,  1,  3,  6,216,206,173, 30, 42,123, 56,255,254, 80, 63, 52,181,250,117,104,250,219, 86,155,143,208,208,
+ 80,248,250,250,218,197,121, 95, 11,172,130,171,149,107,146,151,189,247,182, 84, 72,243,103,140, 15,135,202,149, 15,136,149, 16,
+ 12, 79,  1, 81,248, 55, 55,128,234,255,  0,217, 41, 72, 29, 91, 69,189,214,196,124, 62, 62, 80,233,245, 77, 81,187,193,117,209,
+ 61,123,246,196,225,195,135,209,167, 79, 31,164,165,165, 33, 44, 44, 12, 82,169, 20, 21, 21, 21,104,104,104,128, 84, 42, 69, 93,
+ 93, 29,162,162,162,104,185, 92, 62,210, 81,129, 69,  8,137,154, 21, 31, 19,205,243, 14,199,208,135, 99,145,189,116,132,116,203,
+ 15,215, 22, 17, 66, 54,183,222,112,181,187, 32, 33, 33,  1,215,175, 95,151,172, 91,183,174,203, 34, 43, 32, 32, 32,155, 97,152,
+ 49,118,184,195,191, 47, 42, 42, 26,213, 85,113,181,119,239, 94,169, 92, 46,199, 27,111,188,113,183,196,213,191, 31,121,228, 17,
+215,111,191,253,118,143,175,175,239,227,142,136, 44, 66, 72,239,169, 83,167,126,181,113,227,198,144, 81,163, 70, 89,  0,180,105,
+ 80, 34, 34, 34,166,100,103,103, 79,158, 53,107, 86, 63, 66,200,196,206, 68, 22, 33,228,161,222,189,123,163,180,180, 20, 21, 21,
+ 21,208,235,245,168,168,168,  0,  0,148,149,149, 65,173, 86, 67,161, 80, 64,173, 86, 35, 36, 36,132, 80, 20, 21, 99, 79,126, 71,
+142, 28, 57,  9,  0, 85, 92, 92, 12,157, 78,  7, 55, 55, 55, 72,165, 82,168,213,106,140, 24, 49,130, 23, 24, 24,248,168,163,  2,
+107,252,248,241, 83, 36, 18,  9, 85, 90, 90,138,203,151, 47,195, 96, 48,160,160,160,  0,110,110,110,120,248,225,135,249,129,129,
+129, 19, 29, 21, 88,  0,250,205,158, 61,187,162,181,184,178, 66, 42,149,146,144,144,144,106, 15, 15,143, 65,  0,174, 58,194, 57,
+111,222,188,202,213,171, 87, 15,207,201,201, 73,177, 94,204,201,201, 73,  6,128,247,222,123,239,176,151,151,215, 32,  0,142,  8,
+ 44,112, 28,199,206,154, 53,171, 80, 32, 16, 64, 40, 20,218,146, 72, 36,  2,159,207,  7, 77,211,110,118,208, 44,214,104, 52,253,
+101, 50, 25, 52, 26, 13,104,154,  6, 33,164, 80,171,213,246,  7,128,148,148,148,162,166,166,166,190,122,189, 30,  9,  9,  9, 36,
+ 62, 62,254,129,181,107,215, 46,  1,208, 45,  4, 22, 33,228, 65,  0,107,  1, 24,  1, 44,225, 56,238, 88,119,178,111, 28,199, 85,
+ 16, 66, 70,180, 18, 89,167,  1,136, 90,196,213,  8,142,227, 42,238, 97,217,129,101, 89,240,249,124,188,253,246,219, 96, 24,  6,
+219,182,109,195,167,159,126, 10,138,162,108,129,238,174,174,174,120,255,253,247,127, 22,248,222,153,112,219,178,101, 11, 82,146,
+147,109,226, 10,  0,  4,  2,  1,124,188,189,225,225,233,137,226,226,226, 78,  5, 86,101,101,229,210,220,220, 92,116, 20,228, 62,
+121,242,237, 17,214,214, 65,238,246,228,147,166,105, 24, 12,  6,140, 25,115,187,251,152, 55,111,158,237,184,186,186,218,250, 76,
+128,216,121,243, 52, 77,163,137,  3, 30,115,185,125,237,209, 87, 94,177, 29,223,184,113,195, 97,206,251, 82, 96, 13, 47,170,254,
+240,  8,193,128,228,231, 31,158,174,242,116,  5, 87, 95,  1,193,168,165, 56, 91, 45,193,186,245,205,125, 97, 82, 66, 20,250,141,
+ 94,  9, 99,214, 88,204, 28,104, 17, 46, 40,199, 66,  0,105,109,241,121,122,122,122,152,205,102, 16, 66, 32,149, 74, 17, 30, 30,
+ 14, 23, 23, 23,232,116, 58,188,252,242,203,216,191,127, 63, 24,134,129, 64, 32, 64,159, 62,125,192, 48, 76,223, 46,120,175, 54,
+190,251,214, 42, 69,213,169, 29, 56,249,159, 90, 72, 60,122, 98,201,180,104,247,244,109,185, 75,  1, 36,119,199, 74, 24, 48, 96,
+  0,150, 47, 95, 46, 89,186,116,105,151, 68, 22,195, 48, 43,248,124,254,208, 85,171, 86,137,167, 77,155,246,179,239,243,242,242,
+144,144,144,208,164,215,235, 95,239,170,184,250,242,203, 47,165, 74,165, 18,165,165,165,248,165,207,132, 85, 92,109,223,190,221,
+213,223,223, 31,145,145,145, 46,239,188,243,142,221, 34,139, 16,210,127,242,228,201,187, 55,110,220,232, 63, 99,198,140,146, 19,
+ 39, 78, 84, 16, 66,218, 19,226,218,231,159,127,190, 36, 43, 43, 43,132, 16,242, 85,103, 34,203,108, 54,247,146, 72, 36,208,233,
+116,248,243,159,255,124, 71,128,170,117, 56, 27,  0, 52, 26, 13,212,106, 53,244,122,189,159, 61,247,172, 84, 42,221,  1,224,133,
+ 23, 94, 64,105,233,237,112, 69, 63, 63, 63,148,150,150,194,108, 54, 43, 29, 45, 71,165, 82,169, 52,153, 76,136,139,139,131, 94,
+175,  7,  0, 60,241,196, 19,224,243,249,168,172,172,  4,195, 48, 30, 93,168, 30,207,  9, 19, 38,104,219,251,210,213,213,149,113,
+119,119, 15,119,144,211, 35, 62, 62,254,218,134, 13, 27,126, 54, 84,151,155,155,251, 71,165, 82,153,163, 84, 42, 67,186,144, 87,
+182,181,160,178, 30, 11,133, 66,171,199,193,174,183, 99,150,101,177,111,223, 62,208, 52, 13, 30,239,182, 73, 76, 75, 75,123, 81,
+161, 80,120, 31, 58,116,  8,215,175, 95, 71, 67, 67,  3,234,235,235, 17, 20, 20,212,103,244,232,209,121,215,175, 95,191,114,254,
+252,249,199,239,181, 19, 28,128, 53, 46, 44,  3,192,128,238,102,223, 90, 68,214, 84,  0, 39, 90,196,149, 17,192,148,123, 41,174,
+ 90,215, 61,143,199,179, 61,231, 46, 46, 46,136,138,138,178,137, 41, 66,  8, 26, 27, 27,193,227,241,172,241, 66,118, 25,191,218,
+218, 90,248,250,248, 64, 46,151, 35, 40, 56, 24,133,  5,  5,  0, 96, 59, 22,137, 68, 32,132,192,108,238, 56, 42,160,101, 38,224,
+  2,116, 16, 79,213, 69,113,201, 89,197, 80, 39,246, 31, 44,203, 90,109, 62,119, 55, 56, 61, 61, 61, 81, 95, 95,111, 23,231,125,
+ 43,176,150, 17, 66, 29,  9, 82,110, 74,158, 62, 98,122, 92,136, 59,244,186,203, 16,201, 61, 65, 20,  1, 88,183,254, 91, 92,184,
+210, 28, 26,181,238,211, 83,216,178,232, 17, 64,172, 68, 95,153,  6,158, 82,201,227,237,  9,172,234,234,234,  6,147,201,164, 20,
+139,197,224,241,120, 16, 10,133,168,170,170, 66, 90, 90, 26, 62,249,228, 19,  4,  4,  4,192, 98,177, 64, 36, 18,161,178,178, 18,
+  2,129,192,161,217,137, 60, 30,153,144,254,194,248,222, 82,159, 96, 84,125,183,162,249,162,247, 64,204,142,167,132,239,236, 62,
+251, 28, 33,228, 29,142,227, 42,187, 91, 37,200,100, 50, 68, 71, 71, 99,238,220,185,146,245,235,215,255,  3,128,218,145,191,215,
+106,181, 63,170, 84,170,177, 75,150, 44,201,190,118,237,154, 56, 54, 54, 22, 50,153, 12, 50,153, 12, 23, 47, 94, 68, 82, 82,146,
+222,104, 52, 78,236,138,119,140,207,231,103,141, 31, 63, 94, 42, 18,137, 80, 84, 84,  4,165, 82,249,139,238,213, 42,174,118,238,
+220,233, 26, 18, 18,130, 75,151, 46, 97,200,144, 33,240,245,245,117,121,245,213, 87, 59, 21, 89, 45,111, 60,239,125,252,241,199,
+  1, 60, 30,143,124,246,217,103,189,  1, 36,217,243,191,183,111,223, 30,186,107,215,174,181,132,144,199,184,118,130, 15,  5,  2,
+ 65,153, 78,167, 11,236,217,179, 39, 54,109,218,  4,138,162, 80, 94, 94,142,197,139, 23, 99,245,234,213,136,137,137,129, 92, 46,
+ 71,207,158, 61, 81, 84, 84,  4, 23, 23,151,114,123,254,247,181,107,215,170, 89,150,237,177,127,255,126,232,116, 58,219,117,127,
+127,127,212,212,212,192, 96, 48, 84, 57, 90,150,101,101,101, 85,  0,188,243,242,242,112,229,202, 21,140, 27, 55, 14,159,127,254,
+ 57,  6, 15, 30,140,150,120,172,170, 46, 84,145,133,166,105,174,147,242,119,191,155,156, 45,157,150,163,156,224, 56,142,107, 45,
+168,172,199,214,196,227,241,236,  9,242, 95, 21, 22, 22,182,172, 79,159, 62,225,169,169,169,124,154,166, 49,108,216,176,144,133,
+ 11, 23,150,184,184,184,120,188,246,218,107,146,182,156,193,  0,250,135,135,135, 75,187,129,249,104,237,165,235,150,147, 78,  8,
+ 33, 61, 90, 60,126, 66,  0, 76,203,231, 78, 66,200,168,214,129,239,247,210,131,181,108,217, 50,204,153, 51,  7,222,222,222, 72,
+ 73, 73,  1,143,199,179, 37, 66,136,205,163,229,  8,122,120,123,119,248,189, 53,  6,171,147,151,168,255,203, 50, 13,246,138,161,
+230,126,149,103,151,247,238,255,193,121, 95, 10, 44,171,184, 74,121, 46,110,250,176, 16, 87,228, 28, 58,129,145,125, 41,192, 40,
+236,192,132,154, 64,  4, 82,120,203, 41,117,  7,174,195,188,146,146,146, 94, 10,133,  2, 12,195, 64, 40, 20, 34, 50, 50, 18, 71,
+143, 30,133,209,104,132,193, 96,176, 25,199,243,231,207,131, 97,152, 67, 14, 60, 44,180,183,156,255,126,114,234, 10, 57,242, 55,
+ 67, 33, 21, 98,228,160, 64,192, 35, 12,116,181,  6,107, 23,196, 43, 95, 92,179,103, 29,236,136,151,185, 23,  2,171,176,176, 16,
+153,153,153,141,  6,131,225,185,174,112, 88, 69, 86, 70, 70, 70,182, 66,161, 16,255,225, 15,127, 64,126,126, 62, 94,125,245, 85,
+189,209,104,156,208,213,248, 46,147,201, 52,227,171,175,190,218, 31, 24, 24, 40,141,139,139,187,195,221,221, 21,113, 69,211,244,
+191,103,206,156, 41, 15,  8,  8, 64,113,113, 49,220,220,220, 32,147,201,208,187,119,111,236,216,177,195,229,233,167,159,238, 80,
+100,113, 28,199, 17, 66, 18,159,124,242,201,189, 89, 89, 89,254, 51,102,204, 40,217,189,123,247, 94,  0,237, 25, 19,249,228,201,
+147,227,179,178,178,252,103,205,154,165,  1,240, 23,174,131,153, 29, 44,203, 30, 41, 42, 42,234, 27, 22, 22, 70, 66, 66, 66, 32,
+ 20, 10,225,231,215,236,164,234,223,191, 63,194,195,195,193,231,243,  1,  0,133,133,133,  0,144,107,207,189, 31, 62,124,248,203,
+130,130,130,153,131,  7, 15,166,125,124,124,108,193,179,  2,129,  0, 43, 87,174,100, 74, 74, 74,246, 57, 90,158,  7, 15, 30,252,
+ 60, 63, 63,255,133, 97,195,134,241,220,221,221, 33, 18,137,208,175, 95, 63,168, 84, 42,172, 92,185,146,185,124,249,242,190, 46,
+ 84,211,213,252,252,124,151,224,224,224, 54, 45,191, 88, 44,118,  5,224,168,231,161,244,248,241,227,194,216,216,216, 47,191,249,
+230,155,200,214, 95, 68, 71, 71,127, 41,147,201,220,  0,148,119, 33,175,108,107, 65,101, 77,214, 33, 67,123,  4,150, 86,171,221,
+235,227,227,243, 31,111,111,239, 31, 35, 34, 34,220,242,243,243,145,154,154, 42, 48, 24, 12,189,114,114,114,108, 29,113, 27,237,
+ 16, 13, 13, 13,226,110, 96, 62,146,  0,188, 11, 64,  2, 32,165, 27,138, 43,111, 52,  7,180,135,162,121, 88,240,137, 22,177,101,
+141,201,186,167, 34,139,227, 56,240,249,124,132,134,134, 98,193,130,  5, 88,179,102, 13, 18, 19, 19, 17, 28, 28,108,171,123,107,
+144,187, 35, 30, 44,129, 64,  0,111,111,239,230, 73, 39, 45,222, 43,  0, 40, 44, 40,  0,143,199,  3,203,178, 48, 26,141,157,122,
+176,122,244,232,177,236,205, 55,223,156, 63,126,252,120,234,127,103,220, 89,151,149,104,157, 76, 38, 19,246,238,221, 59,127,245,
+234,213,176,199,235, 69,211, 52,250,247,239,127,199,176,224,135, 31,222,142, 84,136,138,138,194,152, 49, 99,236, 18, 77,173, 57,
+ 67,211,223,190, 99, 88,240,107,175,219,197,214,243,217,217,  8, 94,245,129, 67,156,191, 85,180, 57, 71,242, 72,144, 98,101,202,
+ 51, 67,167, 15, 11,146,227,187, 67,167,177,238,235,203,151, 74,202,171,192, 86,228,131,213, 93, 68, 82, 66, 20,194,  3,148,  8,
+ 15, 80, 34, 41, 33, 10,108,229, 57,112, 53,197,224, 68, 10,148,214, 66,219,129,219,116,205,138, 21, 43,106,149, 74, 37,196, 98,
+ 49,132, 66, 33,202,202,202, 16, 17, 17,  1,145, 72,100,123,  3,165, 40, 10,169,169,169, 58,157, 78,183,222,222, 27,145, 10,169,
+217,107, 94,121,194, 91,224, 34,  3, 74, 15,193, 85, 46,195,166,191,189, 13,212,107,  1, 90,128,248, 63, 12,160,125, 61, 21,163,
+  8, 33, 33,221,173, 18,138,139,139, 49,127,254,252, 70,189, 94,255,139,  2,221,181, 90,237,143, 12,195,140, 93,189,122,117,211,
+246,237,219,127,177,184,178,114, 26,141,198,113,239,190,251,110, 67, 81, 81,209, 47, 18, 88, 60, 30,239, 53,147,201,228,154,153,
+153,201, 14, 26, 52,200,242,216, 99,143, 89,198,142, 29,107, 25, 50,100,136, 37, 34, 34,194, 50,101,202, 20,139, 94,175, 23, 73,
+ 36,146, 55, 59, 49,138, 23,118,239,222, 61,122,214,172, 89,154,172,172, 44,255,152,152, 24, 21,199,113, 75,219, 74,131,  7, 15,
+246,182,138,171, 93,187,118,117, 26,131,101, 48, 24, 62,204,200,200,208, 91,103,185,  8,133, 66,120,121,121,217,132,176, 64, 32,
+128, 72, 36,  2,195, 48,248,232,163,143,154,154,154,154,214,217,115,239, 85, 85, 85,155,147,147,147,175,102,103,103,155,234,234,
+234, 64,  8,193,181,107,215,176,114,229, 74,102,195,134, 13,215,106,107,107, 55, 56, 90,158,117,117,117, 89,201,201,201, 87,246,
+237,219,103,162, 40, 10, 53, 53, 53,112,117,117,181,113,222,186,117,203, 97,206, 33, 67,134, 20,149,148,148,184, 54, 54, 54,182,
+229,205, 36, 82,169,244, 65,  0,  7, 29,225,140,138,138, 42,190,122,245,170,124,229,202,149, 63,140, 30, 61,122,141, 92, 46, 47,
+144,203,229,  5,163, 71,143,126,243,131, 15, 62,248,151,139,139, 75, 52,  0,135, 55,135,165, 40,138,109,109, 55, 90,199, 96,137,
+ 68, 34,  8,  4,  2,187,150,169,112,115,115,219,146,145,145,225, 86, 94, 94, 14,131,193,128,188,188, 60,228,229,229,161,172,172,
+204,214,  9,183,177, 15, 27, 26, 27, 27, 93,238,181,237,224, 56,238, 95, 28,199,245,231, 56, 46,144,227,184,238, 56, 73,230,211,
+ 86,226,106,  4,199,113,249,  0, 70,180,156, 71,  2,248,226, 94,122,176,172,  2,139,199,227, 97,218,180,105, 56,112,224,  0,130,
+130,130,108,129,237,173,131,220, 29, 17,  4,102,179, 25,253,250,245,131,193,104,188, 67,160,243,120, 60,120,245,232,129,162,162,
+ 34,187, 60, 88,132,144,169,227,199,143,167,206,159, 63,143,176,176, 48,156, 58,117,202,150,242,242,242,112,246,236, 89,156, 59,
+119, 14, 23, 46, 92,192,160, 65,131, 80, 82, 82,130, 71, 30,121,196,186, 76, 67,135, 77,199, 94,111,147,117, 38,160, 29,222,166,
+255,  7,231,253,231,193, 82,123, 73,102, 12,237, 77,240,221,225,211,120, 63, 91,187,133,227,184,221,251,243,235,190,154, 51,200,
+ 12,102,215,211,232,151,240,207,230, 97, 65,  0,108,229, 57, 48,187,254,  4, 34,241, 68,110,133, 16,117,122, 83,187,111,205, 12,
+195, 28,115,119,119,223,185,121,243,230,153,207, 63,255,188, 16,  0, 36, 18,  9,254,242,151,191,128,227, 56,  8,133, 66,208, 52,
+141,185,115,231,214, 87, 86, 86,190,203,113, 92,145,157, 15,138,216,207, 93,152,250,204, 75,105, 46,200,219,  0, 80,  2,220,144,
+ 69,161,255, 35, 51, 81,169, 57, 10, 84, 93,  4,104,  1,214,167,191,224,249,199,121,111,111,  0, 16,215, 93, 42,224,220,185,115,
+152, 55,111,222, 47, 22, 87,255,235,201,218,177, 99,199, 63,140, 70,227, 11,119,145,115, 92, 74, 74,202,126,111,111,239, 46, 15,
+139,148,148,148, 60,235,239,239, 63,179,179,  7,175,184,184,184,211,161, 14,142,227, 46, 19, 66, 38, 94,185,114,229,245, 75,151,
+ 46,125,222,222,239, 46, 93,186,244,249,152, 49, 99,232, 99,199,142,189,102,207, 44,194, 83,167, 78,157,138,141,141,205, 88,183,
+110,221,220,164,164, 36,177, 72, 36,130,171,171, 43, 52, 26,141,109, 29, 28,163,209,136, 69,139, 22, 53,153, 76,166, 45,199,143,
+ 31, 63,106,103, 71,104, 38,132, 60, 53,103,206,156, 89, 33, 33, 33,127,100, 89,214,195,104, 52, 86,149,148,148,236,187,117,235,
+ 86,151,214,193,226, 56,142, 37,132, 60, 61,119,238,220,233,193,193,193, 83, 24,134,241,176, 88, 44, 85, 87,175, 94,253,178,174,
+174,110, 83, 87, 56,143, 28, 57,162,251,232,163,143,254,163,211,233,194,212,106,245, 77,153, 76,102, 52, 26,141,180, 88, 44,118,
+149, 74,165, 81,  0,142,  2,184,224,  8,231,201,147, 39,175,175, 95,191,254,138,193, 96,  8, 93,191,126,253, 97, 87, 87,215,  3,
+132, 16, 34, 16,  8,220,197, 98,241, 72,  0, 63,  0, 40,116, 52,175, 52, 77,119,232,193,130,157,241, 29,183,110,221, 58,150,158,
+158, 62,104,224,192,129,200,200,200,168,150,201,100,242, 41, 83,166,240,106,107,107, 73, 71, 30,172,238, 32,176,126,  3,168,106,
+241,242, 78,178,198, 92,181, 10,124,255, 20, 64,237, 61, 22,168,119,  8,169, 94,189,122,217,206, 91,167, 86, 49, 88,118,193, 98,
+177, 64, 32, 16,128,199,227,193, 87,165,178,137, 57,142,227, 80, 84, 84,132,234,234,106,187,  4, 22, 69, 81, 52, 33,  4, 79, 62,
+249,164, 93,255,247,169,167,158,194, 15, 63,252,128,206,134, 19, 91,207,248, 11,  8,  8,232, 84, 12,181,228,197,238, 89,132,106,
+181,250,174,112,222,151,  2,235,170, 78,191,114,193,134,227,139,138, 43, 13,187, 31, 42,172, 89,144, 14,112,128,123,118,152,146,
+140,141,163,202, 96,216, 48, 12,196,181,185,179,225,234,203, 65,164,222, 40,135, 26,239,101, 23, 95, 55,113, 76,135,222,135,218,
+218,218,164, 15, 63,252,144,206,206,206,126, 98,245,234,213,110, 97, 97, 97,248,211,159,254,  4,163,209,136,179,103,207, 98,206,
+156, 57,213, 58,157, 46,179,182,182,118,141,189, 55,225, 41,227,253,117,221,203, 99, 61, 40, 83, 61,112,253, 20, 32,114,131,167,
+187, 12,103,114, 15,  1,215, 79,  2,180,  0,160,133, 24,252, 64, 24,250,135,  7,134, 17, 66,134,113, 28,247,239,238, 80,  1,143,
+ 63,254,248, 93, 19, 87,173,  5, 17,128, 62,119, 51,159, 86,145, 53,125,250,244,253, 44,203, 74,186,226,222,109, 89,147,201,114,
+ 23,141,227,101,116, 50,228,219,178,124,195, 46, 71,120, 77, 38,211,162,252,252,124,204,157, 59,119,238,179,207, 62, 43, 14,  9,
+  9, 65, 64, 64,  0, 10, 10, 10,160,209,104,144,153,153,217,100, 54,155, 55,213,214,214,190,218,133,251,207,108, 73,119,171, 12,
+ 88,  0,155, 91,210, 93, 65, 98, 98,226,153,226,226,226, 42, 47, 47,175, 24,129, 64,240,  0,154,227,124,174,183,252,143,194,174,
+112,206,153, 51, 39,175,184,184,248,134,159,159, 95,108, 11,167,  2,192, 53,  0, 27,187,200, 89,149,151,151, 23, 24, 29, 29,205,
+242,120, 60,174,197,195,192,241,249,124,142,207,231,115,  0,144,157,157, 45,  2,208,105,204,101,121,121,249,159,247,236,217,131,
+156,156,156,152,250,250,250,103,  0,252,163,177,177, 49,250,230,205,155,182, 78,184, 29,111,167,200,169,159, 58,109,159,143,181,
+115,189,  2,192,176,110,144, 63, 44, 95,190, 28,153,153,153,232,108,  5,242,189,123,247,  2,157, 12, 17, 90,219,138, 85, 60, 49,
+ 12,131,115,231,206, 89,247,222,179, 13, 11, 90,151,104, 48,155,205, 29,174,244,206,178,172,197,104, 52,226,227,143, 63,182, 75,
+100,237,216,177,  3,122,189, 30, 44,203,218,101,103, 91, 22, 38, 69,117,117, 53, 84, 42,149,213,227,220,218, 41,226,112,153,210,
+ 52,141,208,208, 80,220,184,113,  3,158,158,158,  0,154,135,  5,109,222,189,134,134,223, 77,251,239,112,161,209,214, 24, 17,160,
+112,163,  4,100,207,195, 65,130, 17, 19,251,201,209,211, 75,  6,158, 80,132,202, 58, 11,254, 93, 92,143, 79,142,234, 74,141, 22,
+203,196,  3,154,154,124, 59,189, 78,177,190,190,190,139, 45, 22, 75, 36, 69, 81, 18,142,227,234,105,154, 62,173,213,106,151,113,
+ 28,119,206,145,155, 80,136,233, 66,119, 41,237,198,231, 11, 57, 11,203,  2,160,  0, 98, 77,116,243, 39,213,124,222,164,103,  4,
+ 22,142,236,174,208,221,152,117,175, 11, 63, 36, 36, 36,187,161,161,225, 55,183,146,187, 84, 42, 93, 90, 88, 88,120,223,174,228,
+110,197,131, 15, 62, 56, 88, 44, 22, 47,102, 89,246, 65,189, 94,239, 35, 22,139, 43,  8, 33, 39,110,221,186,245,198,233,211,167,
+127,114,118,159,247, 14,119,115, 37,247, 54,218,120, 60,128,101, 30, 30, 30, 33,103,207,158, 21,181,246, 96,181,182,151,142,172,
+139,228, 68,247, 67,120,120,248,177,237,219,183, 15,238,213,171, 23,213, 58,144,157,162, 40,219,226,152, 20, 69,217,102,150,254,
+244,211, 79,230,196,196,196,163,121,121,121,195,219,227, 12, 10, 10,202,206,201,201, 25, 83, 91, 91,251, 51, 33,213,122,101,119,
+235,121, 83, 83, 19,254,250,215,191,126, 87, 88, 88,216,230, 86, 57, 97, 97, 97,239,166,166,166,206,127,244,209, 71, 41,138,162,
+126, 22,115,101,221,214,199,154, 24,134,193,238,221,187,217,172,172,172,247, 47, 94,188,216,110, 12, 86, 84, 84, 84,233,169, 83,
+167,212,214, 37, 19,218, 75,173, 17, 27, 27, 91,254,211, 79, 63,169,126, 77,206,223,141,192,106, 49, 40,100, 84,144,226,  9,142,
+ 35, 83,  9, 72, 63,138,112, 66, 51,  7, 13,  1,178, 37,141,162,143,246,106,181, 77,206,199,214,137,251,242, 65, 33,132,114,110,
+242,251,251, 66, 80, 80, 80, 97, 97, 97, 97, 96,  7,109,194, 41,176,126,227, 34,221,203,203,235,  0, 69, 81,254, 86, 17,221,222,
+103,139, 55,233, 74, 69, 69,197,195, 21, 21, 21,237,174,167,168, 86,171,251,186,184,184,252,141,101,217,104,123, 54,123,166, 40,
+ 42, 87,175,215,191,244,107,111,246, 28, 25, 25, 89,148,155,155,219, 87, 44, 22,223, 17, 87,104,189,231,255,205,251,229,203,151,
+ 49,121,242,228,146,188,188,188,128, 95,147,243,119, 37,176,156,112,194,  9, 39,126, 47,240,243,243, 59,198, 48, 76,152, 94,175,
+231, 27, 12,  6,190,217,108,190,163,131, 19,139,197,186,198,198,198, 30,206,146,114,226,183,  6,149, 74, 21,162, 80, 40,190,229,
+243,249,162,182, 94, 28,254, 23, 22,139, 69, 95, 85, 85, 53, 78,171,213,106,126, 77,206,223, 60,218,154, 33,115,183, 18,128,209,
+ 78, 78, 39,167,147,211,201,233,228,116,114, 58, 57,157,156,191,183, 68, 57,181,188, 19, 78, 56,225,132, 19, 78, 56,225,196,221,
+133, 83, 96, 57,225,132, 19, 78, 56,225,132, 19, 78, 56,  5,150, 19, 78, 56,225,132, 19, 78, 56,225,132, 83, 96, 57,225,132, 19,
+ 78, 56,225,132, 19, 78,252,174,240,223,  1,  0, 29, 13,182,141,194,138,  6,132,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
   0};
 
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 010101a1a80..f16fc9ebe05 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -101,7 +101,7 @@ DEF_ICON(ICON_RENDER_REGION)
 DEF_ICON(ICON_BORDER_RECT)
 DEF_ICON(ICON_BORDER_LASSO)
 DEF_ICON(ICON_FREEZE)
-DEF_ICON(ICON_BLANK031)
+DEF_ICON(ICON_STYLUS_PRESSURE)
 DEF_ICON(ICON_BLANK032)
 DEF_ICON(ICON_BLANK033)
 DEF_ICON(ICON_BLANK034)
@@ -241,7 +241,7 @@ DEF_ICON(ICON_BLANK080F)
 DEF_ICON(ICON_BOIDS)
 DEF_ICON(ICON_STRANDS)
 DEF_ICON(ICON_LIBRARY_DATA_INDIRECT)
-DEF_ICON(ICON_BLANK082)
+DEF_ICON(ICON_GREASEPENCIL)
 DEF_ICON(ICON_BLANK083)
 DEF_ICON(ICON_BLANK084)
 DEF_ICON(ICON_GROUP_BONE)
@@ -538,7 +538,7 @@ DEF_ICON(ICON_MOD_CLOTH)
 DEF_ICON(ICON_MOD_EXPLODE)
 DEF_ICON(ICON_MOD_FLUIDSIM)
 DEF_ICON(ICON_MOD_MULTIRES)
-DEF_ICON(ICON_BLANK157)
+DEF_ICON(ICON_MOD_SMOKE)
 DEF_ICON(ICON_BLANK158)
 DEF_ICON(ICON_BLANK159)
 DEF_ICON(ICON_BLANK160)
@@ -686,10 +686,10 @@ DEF_ICON(ICON_BLANK231)
 DEF_ICON(ICON_BLANK232)
 DEF_ICON(ICON_BLANK233)
 DEF_ICON(ICON_BLANK234)
-DEF_ICON(ICON_BLANK235)
-DEF_ICON(ICON_BLANK236)
-DEF_ICON(ICON_BLANK237)
-DEF_ICON(ICON_BLANK238)
+DEF_ICON(ICON_UV_VERTEXSEL)
+DEF_ICON(ICON_UV_EDGESEL)
+DEF_ICON(ICON_UV_FACESEL)
+DEF_ICON(ICON_UV_ISLANDSEL)
 DEF_ICON(ICON_BLANK239)
 DEF_ICON(ICON_BLANK240)
 DEF_ICON(ICON_BLANK241)
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 2eb070e0e6d..21fccdc65f8 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -521,13 +521,13 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
 		uiBlockBeginAlign(block);
 		uiDefButF(block, COL, B_VPCOLSLI, "",					0,yco,200,19, brush->rgb, 0, 0, 0, 0, "");
 		uiDefButF(block, NUMSLI, evt_nop, "Opacity ",		0,yco-20,180,19, &brush->alpha, 0.0, 1.0, 0, 0, "The amount of pressure on the brush");
-		uiDefButBitS(block, TOG|BIT, BRUSH_ALPHA_PRESSURE, evt_nop, "P",	180,yco-20,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
+		uiDefIconButBitS(block, TOG|BIT, BRUSH_ALPHA_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE,	180,yco-20,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
 		uiDefButI(block, NUMSLI, evt_nop, "Size ",		0,yco-40,180,19, &brush->size, 1, 200, 0, 0, "The size of the brush");
-		uiDefButBitS(block, TOG|BIT, BRUSH_SIZE_PRESSURE, evt_nop, "P",	180,yco-40,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
+		uiDefIconButBitS(block, TOG|BIT, BRUSH_SIZE_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE,	180,yco-40,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
 		uiDefButF(block, NUMSLI, evt_nop, "Falloff ",		0,yco-60,180,19, &brush->innerradius, 0.0, 1.0, 0, 0, "The fall off radius of the brush");
-		uiDefButBitS(block, TOG|BIT, BRUSH_RAD_PRESSURE, evt_nop, "P",	180,yco-60,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
+		uiDefIconButBitS(block, TOG|BIT, BRUSH_RAD_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE,	180,yco-60,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
 		uiDefButF(block, NUMSLI, evt_nop, "Spacing ",0,yco-80,180,19, &brush->spacing, 1.0, 100.0, 0, 0, "Repeating paint on %% of brush diameter");
-		uiDefButBitS(block, TOG|BIT, BRUSH_SPACING_PRESSURE, evt_nop, "P",	180,yco-80,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
+		uiDefIconButBitS(block, TOG|BIT, BRUSH_SPACING_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE,	180,yco-80,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
 		uiBlockEndAlign(block);
 		
 		yco -= 110;
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 9c453ac44df..448a2046855 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -166,18 +166,22 @@ void rna_def_brush(BlenderRNA *brna)
 	
 	prop= RNA_def_property(srna, "strength_pressure", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ALPHA_PRESSURE);
+	RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
 	RNA_def_property_ui_text(prop, "Strength Pressure", "Enable tablet pressure sensitivity for strength.");
 	
 	prop= RNA_def_property(srna, "size_pressure", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SIZE_PRESSURE);
+	RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
 	RNA_def_property_ui_text(prop, "Size Pressure", "Enable tablet pressure sensitivity for size.");
 	
 	prop= RNA_def_property(srna, "falloff_pressure", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_RAD_PRESSURE);
+	RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
 	RNA_def_property_ui_text(prop, "Falloff Pressure", "Enable tablet pressure sensitivity for falloff.");
 	
 	prop= RNA_def_property(srna, "spacing_pressure", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SPACING_PRESSURE);
+	RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
 	RNA_def_property_ui_text(prop, "Spacing Pressure", "Enable tablet pressure sensitivity for spacing.");
 
 	prop= RNA_def_property(srna, "rake", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 5caa868fd2e..72e77e93607 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -223,7 +223,7 @@ void rna_def_gpencil_data(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "GreasePencil", "ID");
 	RNA_def_struct_sdna(srna, "bGPdata");
 	RNA_def_struct_ui_text(srna, "Grease Pencil", "Freehand annotation sketchbook.");
-	RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); // XXX: ICON_GPENCIL!!!
+	RNA_def_struct_ui_icon(srna, ICON_GREASEPENCIL);
 	
 	/* Layers */
 	prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index f8c8ddb9431..295cb460f5b 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -75,7 +75,7 @@ EnumPropertyItem modifier_type_items[] ={
 	{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
 	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
 	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
-	{eModifierType_Smoke, "SMOKE", 0, "Smoke", ""},
+	{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
 	{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
 	{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
 	{0, NULL, 0, NULL, NULL}};
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 935bf8ccc3f..bd29443646d 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -394,10 +394,10 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem uv_select_mode_items[] = {
-		{UV_SELECT_VERTEX, "VERTEX", ICON_VERTEXSEL, "Vertex", "Vertex selection mode."},
-		{UV_SELECT_EDGE, "EDGE", ICON_EDGESEL, "Edge", "Edge selection mode."},
-		{UV_SELECT_FACE, "FACE", ICON_FACESEL, "Face", "Face selection mode."},
-		{UV_SELECT_ISLAND, "ISLAND", ICON_LINKEDSEL, "Island", "Island selection mode."},
+		{UV_SELECT_VERTEX, "VERTEX", ICON_UV_VERTEXSEL, "Vertex", "Vertex selection mode."},
+		{UV_SELECT_EDGE, "EDGE", ICON_UV_EDGESEL, "Edge", "Edge selection mode."},
+		{UV_SELECT_FACE, "FACE", ICON_UV_FACESEL, "Face", "Face selection mode."},
+		{UV_SELECT_ISLAND, "ISLAND", ICON_UV_ISLANDSEL, "Island", "Island selection mode."},
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem mesh_select_mode_items[] = {

From a83aa92e80aace4509ab26a98d805c3cb2b2683e Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Mon, 7 Sep 2009 11:05:16 +0000
Subject: [PATCH 466/577] 2.5 - Armature/Pose Bugfixes:

* Added missing prototype from arithb

* Added define for Axis-Angle rotations. This has not yet been hooked up for actual usage yet, since there are some issues regarding evaluation which I'd like to investigate further first.

* Editing numbuttons for posechannel transforms now updates in realtime. Sending ND_POSE|ND_TRANSFORM was causing confusion for the listeners (which only check for either/or)

* Partial fix for axis drawing on bones. Now the axes are drawn at the tips of the bones again, but unfortunately the texts aren't (since they only use the object matrix, they get drawn at the origin).
---
 source/blender/blenlib/BLI_arithb.h           |  1 +
 .../editors/space_view3d/drawarmature.c       |  4 +-
 source/blender/makesdna/DNA_action_types.h    |  5 ++
 source/blender/makesrna/intern/rna_pose.c     | 58 ++++++++++---------
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 6deb6edf9fb..71604758b80 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -377,6 +377,7 @@ void Vec2Copyf(float *v1, float *v2);
 void Vec2Lerpf(float *target, float *a, float *b, float t);
 
 void AxisAngleToQuat(float *q, float *axis, float angle);
+void QuatToAxisAngle(float *q, float *axis, float *angle);
 void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3]);
 void vectoquat(float *vec, short axis, short upflag, float *q);
 
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index a5718386554..fa810677fe8 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -1816,7 +1816,7 @@ static void draw_pose_channels(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ba
 						if ( (arm->flag & ARM_DRAWAXES) && (arm->flag & ARM_POSEMODE) ) {
 							glPushMatrix();
 							glMultMatrixf(pchan->pose_mat);
-							//glTranslatef(0.0f, pchan->bone->length, 0.0f);
+							glTranslatef(0.0f, pchan->bone->length, 0.0f);
 							drawaxes(0.25f*pchan->bone->length, 0, OB_ARROWS);
 							glPopMatrix();
 						}
@@ -2000,7 +2000,7 @@ static void draw_ebones(View3D *v3d, RegionView3D *rv3d, Object *ob, int dt)
 						if (arm->flag & ARM_DRAWAXES) {
 							glPushMatrix();
 							set_matrix_editbone(eBone);
-							//glTranslatef(0.0f, eBone->length, 0.0f);
+							glTranslatef(0.0f, eBone->length, 0.0f);
 							drawaxes(eBone->length*0.25f, 0, OB_ARROWS);
 							glPopMatrix();
 						}
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 474d5a4217f..318204e3dd8 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -206,6 +206,11 @@ typedef enum ePchan_RotMode {
 	PCHAN_ROT_YZX,
 	PCHAN_ROT_ZXY,
 	PCHAN_ROT_ZYX,
+	/* NOTE: space is reserved here for 18 other possible 
+	 * euler rotation orders not implemented 
+	 */
+		/* axis angle rotations */
+	PCHAN_ROT_AXISANGLE = -1
 } ePchan_RotMode;
 
 /* Pose ------------------------------------ */
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index c5297f7b7fa..6c2018c61f4 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -137,7 +137,7 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 	/* check if any change - if so, need to convert data */
 	// TODO: this needs to be generalised at some point to work for objects too...
 	if (value > 0) { /* to euler */
-		if (pchan->rotmode < 0) { // FIXME: need a define for this
+		if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
 			/* axis-angle to euler */
 			float m[3][3];
 			
@@ -154,7 +154,7 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 		/* else { no conversion needed } */
 	}
 	else if (value == PCHAN_ROT_QUAT) { /* to quat */
-		if (pchan->rotmode < 0) { // FIXME: need a define for this
+		if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
 			/* axis angle to quat */
 			float q[4];
 			
@@ -169,13 +169,13 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 		/* else { no conversion needed } */
 	}
 	else { /* to axis-angle */
-		if (pchan->rotmode > 0) { // FIXME: need a define for this
+		if (pchan->rotmode > 0) {
 			/* euler to axis angle */
 			float q[4];
 			
 			/* convert to temp quat, then to axis angle (since stored in same var) */
 			EulOToQuat(pchan->eul, pchan->rotmode, q);
-			QuatToAxisAngle(q, &pchan->quat[1], pchan->quat[0]);
+			QuatToAxisAngle(q, &pchan->quat[1], &pchan->quat[0]);
 		}
 		else if (pchan->rotmode == PCHAN_ROT_QUAT) {
 			/* quat to axis angle */
@@ -183,7 +183,7 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 			
 			/* copy to temp var first, since quats and axis-angle are stored in same place */
 			QuatCopy(q, pchan->quat);
-			QuatToAxisAngle(q, &pchan->quat[1], pchan->quat[0]);
+			QuatToAxisAngle(q, &pchan->quat[1], &pchan->quat[0]);
 		}
 	}
 	
@@ -420,6 +420,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 		{PCHAN_ROT_YZX, "YZX", 0, "YZX Euler", "YZX Rotation Order. Prone to Gimbal Lock"},
 		{PCHAN_ROT_ZXY, "ZXY", 0, "ZXY Euler", "ZXY Rotation Order. Prone to Gimbal Lock"},
 		{PCHAN_ROT_ZYX, "ZYX", 0, "ZYX Euler", "ZYX Rotation Order. Prone to Gimbal Lock"},
+		//{PCHAN_ROT_AXISANGLE, "AXIS_ANGLE", 0, "Axis Angle", "Axis Angle (W+XYZ). Defines a rotation around some axis defined by 3D-Vector."},
 		{0, NULL, 0, NULL, NULL}};
 	
 	StructRNA *srna;
@@ -479,30 +480,30 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "loc");
 	RNA_def_property_ui_text(prop, "Location", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ);
 	RNA_def_property_float_sdna(prop, NULL, "size");
 	RNA_def_property_ui_text(prop, "Scale", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_QUATERNION);
 	RNA_def_property_float_sdna(prop, NULL, "quat");
 	RNA_def_property_ui_text(prop, "Rotation", "Rotation in Quaternions.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
 	
 	prop= RNA_def_property(srna, "euler_rotation", PROP_FLOAT, PROP_EULER);
 	RNA_def_property_float_sdna(prop, NULL, "eul");
 	RNA_def_property_float_funcs(prop, "rna_PoseChannel_euler_rotation_get", "rna_PoseChannel_euler_rotation_set", NULL);
 	RNA_def_property_ui_text(prop, "Rotation (Euler)", "Rotation in Eulers.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
 	
 	prop= RNA_def_property(srna, "rotation_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "rotmode");
 	RNA_def_property_enum_items(prop, prop_rotmode_items);
 	RNA_def_property_enum_funcs(prop, NULL, "rna_PoseChannel_rotation_mode_set", NULL);
 	RNA_def_property_ui_text(prop, "Rotation Mode", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	/* These three matrix properties await an implementation of the PROP_MATRIX subtype, which currently doesn't exist. */
 /*	prop= RNA_def_property(srna, "channel_matrix", PROP_FLOAT, PROP_MATRIX);
@@ -535,97 +536,97 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_boolean_funcs(prop,  "rna_PoseChannel_has_ik_get", NULL);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Has IK", "Is part of an IK chain.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_dof_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF);
 	RNA_def_property_ui_text(prop, "IK X DoF", "Allow movement around the X axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_dof_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF);
 	RNA_def_property_ui_text(prop, "IK Y DoF", "Allow movement around the Y axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_dof_z", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_ZDOF);
 	RNA_def_property_ui_text(prop, "IK Z DoF", "Allow movement around the Z axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_limit_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_XLIMIT);
 	RNA_def_property_ui_text(prop, "IK X Limit", "Limit movement around the X axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_limit_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_YLIMIT);
 	RNA_def_property_ui_text(prop, "IK Y Limit", "Limit movement around the Y axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_limit_z", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_ZLIMIT);
 	RNA_def_property_ui_text(prop, "IK Z Limit", "Limit movement around the Z axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 	
 	prop= RNA_def_property(srna, "ik_min_x", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmin[0]");
 	RNA_def_property_range(prop, -180.0f, 0.0f);
 	RNA_def_property_ui_text(prop, "IK X Minimum", "Minimum angles for IK Limit");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_max_x", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmax[0]");
 	RNA_def_property_range(prop, 0.0f, 180.0f);
 	RNA_def_property_ui_text(prop, "IK X Maximum", "Maximum angles for IK Limit");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_min_y", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmin[1]");
 	RNA_def_property_range(prop, -180.0f, 0.0f);
 	RNA_def_property_ui_text(prop, "IK Y Minimum", "Minimum angles for IK Limit");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_max_y", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmax[1]");
 	RNA_def_property_range(prop, 0.0f, 180.0f);
 	RNA_def_property_ui_text(prop, "IK Y Maximum", "Maximum angles for IK Limit");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_min_z", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmin[2]");
 	RNA_def_property_range(prop, -180.0f, 0.0f);
 	RNA_def_property_ui_text(prop, "IK Z Minimum", "Minimum angles for IK Limit");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_max_z", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "limitmax[2]");
 	RNA_def_property_range(prop, 0.0f, 180.0f);
 	RNA_def_property_ui_text(prop, "IK Z Maximum", "Maximum angles for IK Limit");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_stiffness_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "stiffness[0]");
 	RNA_def_property_range(prop, 0.0f, 0.99f);
 	RNA_def_property_ui_text(prop, "IK X Stiffness", "IK stiffness around the X axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_stiffness_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "stiffness[1]");
 	RNA_def_property_range(prop, 0.0f, 0.99f);
 	RNA_def_property_ui_text(prop, "IK Y Stiffness", "IK stiffness around the Y axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_stiffness_z", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "stiffness[2]");
 	RNA_def_property_range(prop, 0.0f, 0.99f);
 	RNA_def_property_ui_text(prop, "IK Z Stiffness", "IK stiffness around the Z axis.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "ik_stretch", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "ikstretch");
 	RNA_def_property_range(prop, 0.0f,1.0f);
 	RNA_def_property_ui_text(prop, "IK Stretch", "Allow scaling of the bone for IK.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_POSE|ND_TRANSFORM, "rna_Pose_update");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 	
 	/* custom bone shapes */
 	prop= RNA_def_property(srna, "custom_shape", PROP_POINTER, PROP_NONE);
@@ -655,16 +656,19 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_LOCX);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Lock Location", "Lock editing of location in the interface.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTX);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation in the interface.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "lock_scale", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_SCALEX);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Lock Scale", "Lock editing of scale in the interface.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 }
 
 static void rna_def_pose(BlenderRNA *brna)

From fcf1040473da1f9b4bf9df5662b763cd7e2f616a Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Mon, 7 Sep 2009 11:51:19 +0000
Subject: [PATCH 467/577] 2.5: * New Smoke Modifier icon was missing in the
 Smoke RNA struct.

---
 source/blender/makesrna/intern/rna_modifier.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 295cb460f5b..28223d2f80b 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -1568,6 +1568,7 @@ static void rna_def_modifier_smoke(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "SmokeModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Smoke Modifier", "Smoke simulation modifier.");
 	RNA_def_struct_sdna(srna, "SmokeModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_SMOKE);
 	
 	prop= RNA_def_property(srna, "domain_settings", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "domain");

From f4f51efa5106d53a4aacf145d644934f6ccd6f65 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Mon, 7 Sep 2009 11:59:05 +0000
Subject: [PATCH 468/577] 2.5: * Use new Pressure Size Icons, old ones were
 still defined in the py file.

---
 release/ui/space_view3d_toolbar.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 8a42d9683f8..43772f7a072 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -333,12 +333,12 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 				
 			row = col.row(align=True)
 			row.itemR(brush, "size", slider=True)
-			row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "size_pressure", toggle=True, text="")
 			
 			if brush.sculpt_tool != 'GRAB':
 				row = col.row(align=True)
 				row.itemR(brush, "strength", slider=True)
-				row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+				row.itemR(brush, "strength_pressure", text="")
 			
 				col = layout.column()
 
@@ -367,11 +367,11 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 
 			row = col.row(align=True)
 			row.itemR(brush, "size", slider=True)
-			row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "size_pressure", toggle=True, text="")
 			
 			row = col.row(align=True)
 			row.itemR(brush, "strength", slider=True)
-			row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "strength_pressure", toggle=True, text="")
 			
 			col.itemR(brush, "blend")
 		
@@ -383,11 +383,11 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			col = layout.column()
 			row = col.row(align=True)
 			row.itemR(brush, "size", slider=True)
-			row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "size_pressure", toggle=True, text="")
 			
 			row = col.row(align=True)
 			row.itemR(brush, "strength", slider=True)
-			row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "strength_pressure", toggle=True, text="")
 		
 		# Vertex Paint Mode #
 		
@@ -397,11 +397,11 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			
 			row = col.row(align=True)
 			row.itemR(brush, "size", slider=True)
-			row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "size_pressure", toggle=True, text="")
 			
 			row = col.row(align=True)
 			row.itemR(brush, "strength", slider=True)
-			row.itemR(brush, "strength_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "strength_pressure", toggle=True, text="")
 
 class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 	__label__ = "Stroke"
@@ -443,7 +443,7 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel):
 		row.active = brush.space
 		row.itemR(brush, "spacing", text="Distance", slider=True)
 		if texture_paint:
-			row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")	
+			row.itemR(brush, "spacing_pressure", toggle=True, text="")	
 
 class VIEW3D_PT_tools_brush_curve(PaintPanel):
 	__label__ = "Curve"
@@ -573,8 +573,7 @@ class VIEW3D_PT_tools_texturepaint(View3DPanel):
 		col = split.column()
 		col.active = (ipaint.use_normal_falloff and use_projection)
 		col.itemR(ipaint, "normal_angle", text="")
-		
-		
+
 		split = layout.split(percentage=0.7)
 		
 		col = split.column(align=False)
@@ -584,8 +583,7 @@ class VIEW3D_PT_tools_texturepaint(View3DPanel):
 		col = split.column(align=False)
 		col.active = (use_projection and ipaint.use_stencil_layer)
 		col.itemR(ipaint, "invert_stencil", text="Inv")
-		
-		
+
 		col = layout.column()
 		sub = col.column()
 		sub.active = (settings.tool == 'CLONE')

From 70c4898db8b870a853a1c0dec4c47b34c75b3148 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Mon, 7 Sep 2009 14:58:08 +0000
Subject: [PATCH 469/577] 2.5: * Fixed a Typo in Particle Effector Panel.
 Reported by Jack*RED on graphicall. Thanks!

---
 source/blender/makesrna/intern/rna_particle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 71b953effdf..719e6f43eed 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -1749,7 +1749,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "effector_weight[6]");
 	RNA_def_property_range(prop, -200.0f, 200.0f);
 	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
-	RNA_def_property_ui_text(prop, "Magnetic", "Texture effector weight.");
+	RNA_def_property_ui_text(prop, "Texture", "Texture effector weight.");
 	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	prop= RNA_def_property(srna, "eweight_harmonic", PROP_FLOAT, PROP_NONE);

From 4c859897f623f8996b5aa239bd6cbfd290204672 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 7 Sep 2009 15:02:43 +0000
Subject: [PATCH 470/577] - crash fix for setting a curve smooth operator -
 added curve attribute use_twist_correction - added nurb attribute type  -
 NURBS, POLY, BEZIER - renamed a number of curve attributes with the use_
 prefix. - UI layout adjustments to only show buttons that are needed and
 reflect internals for nurbs. ... Note that many of the buttons only apply to
 NURBS, and all the "V" buttons only apply to surfaces, remove when not
 needed.

---
 release/ui/buttons_data_curve.py            | 109 ++++++++++++++------
 source/blender/editors/object/object_edit.c |   1 -
 source/blender/makesrna/intern/rna_curve.c  |  46 +++++++--
 3 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index ced3c6597e0..46311493ad3 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -6,6 +6,13 @@ class DataButtonsPanel(bpy.types.Panel):
 	__region_type__ = 'WINDOW'
 	__context__ = "data"
 	
+	def poll(self, context):
+		return (context.object and context.object.type in ('CURVE', 'SURFACE') and context.curve)
+		
+class DataButtonsPanelCurve(DataButtonsPanel):
+	'''
+	Same as above but for curves only
+	'''
 	def poll(self, context):
 		return (context.object and context.object.type == 'CURVE' and context.curve)
 
@@ -37,17 +44,24 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 		ob = context.object
 		curve = context.curve
 		space = context.space_data
+		is_surf = (ob.type == 'SURFACE')
 
-		layout.itemR(curve, "curve_2d")			
+		row = layout.row()
+		row.itemR(curve, "curve_2d")			
+		row.itemR(curve, "use_twist_correction")
+		
 							
 		split = layout.split()
 		
 		col = split.column()
-		sub = col.column()
-		sub.active = curve.curve_2d
-		sub.itemL(text="Caps:")
-		sub.itemR(curve, "front")
-		sub.itemR(curve, "back")
+		
+		if not is_surf:
+			sub = col.column()
+			sub.active = curve.curve_2d
+			sub.itemL(text="Caps:")
+			row = sub.row()
+			row.itemR(curve, "front")
+			row.itemR(curve, "back")
 			
 		col.itemL(text="Textures:")
 #		col.itemR(curve, "uv_orco")
@@ -58,23 +72,26 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 		sub = col.column(align=True)
 		sub.itemR(curve, "resolution_u", text="Preview U")
 		sub.itemR(curve, "render_resolution_u", text="Render U")
-		sub = col.column(align=True)
-		sub.itemR(curve, "resolution_v", text="Preview V")
-		sub.itemR(curve, "render_resolution_v", text="Render V")
+		
+		if is_surf:
+			sub = col.column(align=True)
+			sub.itemR(curve, "resolution_v", text="Preview V")
+			sub.itemR(curve, "render_resolution_v", text="Render V")
+		
 
 #		col.itemL(text="Display:")
 #		col.itemL(text="HANDLES")
 #		col.itemL(text="NORMALS")
 #		col.itemR(curve, "vertex_normal_flip")
 
-class DATA_PT_geometry_curve(DataButtonsPanel):
+class DATA_PT_geometry_curve(DataButtonsPanelCurve):
 	__label__ = "Geometry "
 
 	def draw(self, context):
 		layout = self.layout
 		
 		curve = context.curve
-
+		
 		split = layout.split()
 	
 		col = split.column()
@@ -88,31 +105,32 @@ class DATA_PT_geometry_curve(DataButtonsPanel):
 		col.itemR(curve, "bevel_depth", text="Depth")
 		col.itemR(curve, "bevel_resolution", text="Resolution")
 		col.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
+
 	
-class DATA_PT_pathanim(DataButtonsPanel):
+class DATA_PT_pathanim(DataButtonsPanelCurve):
 	__label__ = "Path Animation"
 	
 	def draw_header(self, context):
 		curve = context.curve
 
-		self.layout.itemR(curve, "path", text="")
+		self.layout.itemR(curve, "use_path", text="")
 
 	def draw(self, context):
 		layout = self.layout
 		
 		curve = context.curve
 		
-		layout.active = curve.path	
+		layout.active = curve.use_path	
 		
 		split = layout.split()		
 		
 		col = split.column()
 		col.itemR(curve, "path_length", text="Frames")
-		col.itemR(curve, "follow")
+		col.itemR(curve, "use_path_follow")
 
 		col = split.column()
-		col.itemR(curve, "stretch")
-		col.itemR(curve, "offset_path_distance", text="Offset Children")
+		col.itemR(curve, "use_stretch")
+		col.itemR(curve, "use_time_offset", text="Offset Children")
 	
 class DATA_PT_current_curve(DataButtonsPanel):
 	__label__ = "Current Curve"
@@ -120,33 +138,56 @@ class DATA_PT_current_curve(DataButtonsPanel):
 	def draw(self, context):
 		layout = self.layout
 		
+		ob = context.object
 		currentcurve = context.curve.curves[0] # XXX
-
+		is_surf = (ob.type == 'SURFACE')
+		
 		split = layout.split()
-	
-		col = split.column()
-		col.itemL(text="Cyclic:")
-		col.itemR(currentcurve, "cyclic_u", text="U")
-		col.itemR(currentcurve, "cyclic_v", text="V")
-		col.itemL(text="Order:")
-		col.itemR(currentcurve, "order_u", text="U")
-		col.itemR(currentcurve, "order_v", text="V")
-		col.itemL(text="Endpoints:")
-		col.itemR(currentcurve, "endpoint_u", text="U")
-		col.itemR(currentcurve, "endpoint_v", text="V")
 		
 		col = split.column()
-		col.itemL(text="Bezier:")
-		col.itemR(currentcurve, "bezier_u", text="U")
-		col.itemR(currentcurve, "bezier_v", text="V")
+		col.itemL(text="Cyclic:")
+		if currentcurve.type == 'NURBS':
+			col.itemL(text="Bezier:")
+			col.itemL(text="Endpoint:")
+			col.itemL(text="Order:")
 		col.itemL(text="Resolution:")
+		
+		
+		col = split.column()
+		col.itemR(currentcurve, "cyclic_u", text="U")
+		
+		if currentcurve.type == 'NURBS':
+			sub = col.column()
+			sub.active = (not currentcurve.cyclic_u)
+			sub.itemR(currentcurve, "bezier_u", text="U")
+			sub.itemR(currentcurve, "endpoint_u", text="U")
+			
+			sub = col.column()
+			sub.itemR(currentcurve, "order_u", text="U")
 		col.itemR(currentcurve, "resolution_u", text="U")
-		col.itemR(currentcurve, "resolution_v", text="V")
+		
+		if is_surf:
+			col = split.column()
+			col.itemR(currentcurve, "cyclic_v", text="V")
+			
+			# its a surface, assume its a nurb.
+			sub = col.column()
+			sub.active = (not currentcurve.cyclic_v)
+			sub.itemR(currentcurve, "bezier_v", text="V")
+			sub.itemR(currentcurve, "endpoint_v", text="V")
+			sub = col.column()
+			sub.itemR(currentcurve, "resolution_v", text="V")
+			sub.itemR(currentcurve, "order_v", text="V")
+		
+		
+		split = layout.split()
+		col = split.column()
 		col.itemL(text="Interpolation:")
 		col.itemR(currentcurve, "tilt_interpolation", text="Tilt")
-		col.itemR(currentcurve, "radius_interpolation", text="Tilt")
+		col.itemR(currentcurve, "radius_interpolation", text="Radius")
 		col.itemR(currentcurve, "smooth")
 		
+		
 bpy.types.register(DATA_PT_context_curve)
 bpy.types.register(DATA_PT_shape_curve)
 bpy.types.register(DATA_PT_geometry_curve)
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index a5d365cafd4..d226834bc21 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -6816,7 +6816,6 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 			for(nu=cu->nurb.first; nu; nu=nu->next) {
 				if(!clear) nu->flag |= ME_SMOOTH;
 				else nu->flag &= ~ME_SMOOTH;
-				nu= nu->next;
 			}
 
 			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index d19a2289490..8c805c11f78 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -148,6 +148,20 @@ static int rna_Nurb_length(PointerRNA *ptr)
 	return nu->pntsv>0 ? nu->pntsu*nu->pntsv : nu->pntsu;
 }
 
+/* grr! mixing CU_2D with type is dodgy */
+static int rna_Nurb_type_get(PointerRNA *ptr)
+{
+	Nurb *nu= (Nurb*)ptr->data;
+	return nu->type & 7;
+}
+
+static void rna_Nurb_type_set(PointerRNA *ptr, int value)
+{
+	Nurb *nu= (Nurb*)ptr->data;
+	nu->type &= CU_2D;
+	nu->type |= value;
+}
+
 static void rna_BPoint_array_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	Nurb *nu= (Nurb*)ptr->data;
@@ -161,7 +175,6 @@ static void rna_Curve_update_data(bContext *C, PointerRNA *ptr)
 	DAG_id_flush_update(id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
-
 #else
 
 static void rna_def_bpoint(BlenderRNA *brna)
@@ -203,7 +216,7 @@ static void rna_def_bpoint(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Weight", "Softbody goal weight");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
-	prop= RNA_def_property(srna, "bevel_radius", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "radius");
 	/*RNA_def_property_range(prop, 0.0f, 1.0f);*/
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -297,7 +310,7 @@ static void rna_def_beztriple(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Weight", "Softbody goal weight");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
-	prop= RNA_def_property(srna, "bevel_radius", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "radius");
 	/*RNA_def_property_range(prop, 0.0f, 1.0f);*/
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -317,22 +330,22 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna)
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	/* flags */
-	prop= RNA_def_property(srna, "path", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_path", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_PATH);
 	RNA_def_property_ui_text(prop, "Path", "Enable the curve to become a translation path.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
-	prop= RNA_def_property(srna, "follow", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_path_follow", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_FOLLOW);
 	RNA_def_property_ui_text(prop, "Follow", "Make curve path children to rotate along the path.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
-	prop= RNA_def_property(srna, "stretch", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_stretch", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_STRETCH);
 	RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: makes deformed child to stretch along entire path.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
-	prop= RNA_def_property(srna, "offset_path_distance", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_time_offset", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_OFFS_PATHDIST);
 	RNA_def_property_ui_text(prop, "Offset Path Distance", "Children will use TimeOffs value as path distance offset.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
@@ -677,6 +690,11 @@ static void rna_def_curve(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Back", "Draw filled back for extruded/beveled curves.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
+	prop= RNA_def_property(srna, "use_twist_correction", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_NO_TWIST);
+	RNA_def_property_ui_text(prop, "Minimal Twist", "Correct for twisting.");
+	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+
 	prop= RNA_def_property(srna, "retopo", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_RETOPO);
 	RNA_def_property_ui_text(prop, "Retopo", "Turn on the re-topology tool.");
@@ -685,6 +703,14 @@ static void rna_def_curve(BlenderRNA *brna)
 
 static void rna_def_curve_nurb(BlenderRNA *brna)
 {
+	static EnumPropertyItem curve_type_items[] = {
+		{CU_POLY, "POLY", 0, "Poly", ""},
+		{CU_BEZIER, "BEZIER", 0, "Bezier", ""},
+		{CU_BSPLINE, "BSPLINE", 0, "BSpline", ""},
+		{CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
+		{CU_NURBS, "NURBS", 0, "Ease", ""},
+		{0, NULL, 0, NULL, NULL}};
+
 	static EnumPropertyItem spline_interpolation_items[] = {
 		{BEZT_IPO_CONST, "LINEAR", 0, "Linear", ""},
 		{BEZT_IPO_LIN, "CARDINAL", 0, "Cardinal", ""},
@@ -722,6 +748,12 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Radius Interpolation", "The type of radius interpolation for Bezier curves.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
+	// XXX - switching type probably needs comprehensive recalc of data like in 2.4x
+	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, curve_type_items);
+	RNA_def_property_enum_funcs(prop, "rna_Nurb_type_get", "rna_Nurb_type_set", NULL);
+	RNA_def_property_ui_text(prop, "Type", "The interpolation type for this curve element.");
+	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
 	prop= RNA_def_property(srna, "point_count_u", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* editing this needs knot recalc*/

From 01eaf4fd5f674858281a253e0a0150d3f44ee325 Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Mon, 7 Sep 2009 18:44:01 +0000
Subject: [PATCH 471/577] 2.5 MSVC 9 projectfiles * maintenance

---
 projectfiles_vc9/blender/blender.vcproj          |  2 +-
 .../blender/blenlib/BLI_blenlib.vcproj           | 16 ----------------
 .../blender/makesrna/RNA_makesrna.vcproj         |  4 ++++
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/projectfiles_vc9/blender/blender.vcproj b/projectfiles_vc9/blender/blender.vcproj
index 56913cb8160..e6a5c483f7a 100644
--- a/projectfiles_vc9/blender/blender.vcproj
+++ b/projectfiles_vc9/blender/blender.vcproj
@@ -201,7 +201,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.lib ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.exp ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.ilk ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\python31_d.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\python31.zip ..\..\..\install\msvc_9d\python31_d.zip&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\zlib.pyd ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\wrap_oal.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\OpenAL32.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sndfile\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender MKDIR ..\..\..\install\msvc_9d\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\..\install\msvc_9d\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\scripts MKDIR ..\..\..\install\msvc_9d\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\..\install\msvc_9d\.blender\scripts /E&#x0D;&#x0A;ECHO Copying python ui scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\ui MKDIR ..\..\..\install\msvc_9d\.blender\ui&#x0D;&#x0A;XCOPY /Y ..\..\release\ui ..\..\..\install\msvc_9d\.blender\ui /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\..\install\msvc_9d /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
+				CommandLine="ECHO Moving libraries and export definitions...&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.lib ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.exp ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;MOVE /Y ..\..\bin\debug\blender.ilk ..\..\..\build\msvc_9\libs\debug&#x0D;&#x0A;ECHO Copying required 3rd party dlls...&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\python\lib\python31_d.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\python31.zip ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\release\zlib.pyd ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\wrap_oal.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\openal\lib\OpenAL32.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;XCOPY /Y ..\..\..\lib\windows\sndfile\lib\*.dll ..\..\..\install\msvc_9d&#x0D;&#x0A;ECHO Copying language folder&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender MKDIR ..\..\..\install\msvc_9d\.blender&#x0D;&#x0A;XCOPY /Y ..\..\bin\.blender ..\..\..\install\msvc_9d\.blender /E&#x0D;&#x0A;ECHO Copying python scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\scripts MKDIR ..\..\..\install\msvc_9d\.blender\scripts&#x0D;&#x0A;XCOPY /Y ..\..\release\scripts ..\..\..\install\msvc_9d\.blender\scripts /E&#x0D;&#x0A;ECHO Copying python ui scripts&#x0D;&#x0A;IF NOT EXIST ..\..\..\install\msvc_9d\.blender\ui MKDIR ..\..\..\install\msvc_9d\.blender\ui&#x0D;&#x0A;XCOPY /Y ..\..\release\ui ..\..\..\install\msvc_9d\.blender\ui /E&#x0D;&#x0A;ECHO Copying manuals/text&#x0D;&#x0A;XCOPY/Y ..\..\release\text ..\..\..\install\msvc_9d /E&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
index 75bd6686d01..a6630c81aca 100644
--- a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
@@ -566,10 +566,6 @@
 				RelativePath="..\..\..\source\blender\blenlib\intern\listbase.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenlib\intern\matrixops.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\noise.c"
 				>
@@ -606,10 +602,6 @@
 				RelativePath="..\..\..\source\blender\blenlib\intern\util.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenlib\intern\vectorops.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\voxel.c"
 				>
@@ -735,14 +727,6 @@
 				RelativePath="..\..\..\source\blender\blenlib\BLI_winstuff.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenlib\MTC_matrixops.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenlib\MTC_vectorops.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\PIL_dynlib.h"
 				>
diff --git a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
index 9ed358efc0b..8dd1982deca 100644
--- a/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
+++ b/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
@@ -802,6 +802,10 @@
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_space.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesrna\intern\rna_test.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesrna\intern\rna_text.c"
 				>

From 0ab2f675c364f2ca1212b0453bf2ffdce5ebb9ea Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Mon, 7 Sep 2009 22:26:23 +0000
Subject: [PATCH 472/577] Fix bug in Mathutil with matrix/matrix and
 matrix/vector multiplication order.

MathUtil matrix type follows Blender convention of column
major storage.  This means that the elements on one column
are contiguous in memory. Vectors are one dimensional
arrays that can be considered in row or in column but
the Blender convention is column so vector should only
be considered as row. This means that the only logical
multiplication operation between matrix and vector is
matrix * vector.

This convention is respected in all parts of MathUtil
except in matrix/matrix and matrix/vector multiplication
where the row major convention is assumed, which in the
and is equivalent to reversing the order of multiplication.

This is clearly a bug and must be corrected but the side
effect is that it will break all scripts using these
operations. Script writers who care about the correctness
of the matrix operations have already implemented work around:

1) change order of matrix/vector multiplication.
vec2 = vec1 * mat1

This must be changed to the normal order:
vec2 = mat1 * vec1

2) change order of matrix/matrix multiplication
(with matl a local transform in matw reference)
mat3 = matl * matw

This must be changed to the normal order:
mat3 = matw * matl

3) transpose before an after the multiplication
matl.transpose()
matw.transpose()
mat3 = matw * matl
mat3.transpose()

This must be changed to:
mat3 = matw * matl;
---
 source/blender/python/generic/matrix.c | 29 +++++++++++++-------------
 source/blender/python/generic/vector.c | 16 +++++++-------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/source/blender/python/generic/matrix.c b/source/blender/python/generic/matrix.c
index be3e704460a..37d06d0b531 100644
--- a/source/blender/python/generic/matrix.c
+++ b/source/blender/python/generic/matrix.c
@@ -933,21 +933,21 @@ static PyObject *Matrix_mul(PyObject * m1, PyObject * m2)
 	}
 
 	if(mat1 && mat2) { /*MATRIX * MATRIX*/
-		if(mat1->colSize != mat2->rowSize){
+		if(mat1->rowSize != mat2->colSize){
 			PyErr_SetString(PyExc_AttributeError,"Matrix multiplication: matrix A rowsize must equal matrix B colsize");
 			return NULL;
 		}
-		for(x = 0; x < mat1->rowSize; x++) {
-			for(y = 0; y < mat2->colSize; y++) {
-				for(z = 0; z < mat1->colSize; z++) {
-					dot += (mat1->matrix[x][z] * mat2->matrix[z][y]);
+		for(x = 0; x < mat2->rowSize; x++) {
+			for(y = 0; y < mat1->colSize; y++) {
+				for(z = 0; z < mat1->rowSize; z++) {
+					dot += (mat1->matrix[z][y] * mat2->matrix[x][z]);
 				}
-				mat[((x * mat1->rowSize) + y)] = (float)dot;
+				mat[((x * mat1->colSize) + y)] = (float)dot;
 				dot = 0.0f;
 			}
 		}
 		
-		return newMatrixObject(mat, mat1->rowSize, mat2->colSize, Py_NEW, NULL);
+		return newMatrixObject(mat, mat2->rowSize, mat1->colSize, Py_NEW, NULL);
 	}
 	
 	if(mat1==NULL){
@@ -1288,9 +1288,9 @@ PyObject *newMatrixObject_cb(PyObject *cb_user, int rowSize, int colSize, int cb
 
 //----------------column_vector_multiplication (internal)---------
 //COLUMN VECTOR Multiplication (Matrix X Vector)
-// [1][2][3]   [a]
-// [4][5][6] * [b]
-// [7][8][9]   [c]
+// [1][4][7]   [a]
+// [2][5][8] * [b]
+// [3][6][9]   [c]
 //vector/matrix multiplication IS NOT COMMUTATIVE!!!!
 static PyObject *column_vector_multiplication(MatrixObject * mat, VectorObject* vec)
 {
@@ -1312,11 +1312,12 @@ static PyObject *column_vector_multiplication(MatrixObject * mat, VectorObject*
 
 	for(x = 0; x < vec->size; x++){
 		vecCopy[x] = vec->vec[x];
-		}
+	}
+	vecNew[3] = 1.0f;
 
-	for(x = 0; x < mat->rowSize; x++) {
-		for(y = 0; y < mat->colSize; y++) {
-			dot += mat->matrix[x][y] * vecCopy[y];
+	for(x = 0; x < mat->colSize; z++) {
+		for(y = 0; y < mat->rowSize; y++) {
+			dot += mat->matrix[y][x] * vecCopy[y];
 		}
 		vecNew[z++] = (float)dot;
 		dot = 0.0f;
diff --git a/source/blender/python/generic/vector.c b/source/blender/python/generic/vector.c
index c4a8a37ee05..46a0df4ae4d 100644
--- a/source/blender/python/generic/vector.c
+++ b/source/blender/python/generic/vector.c
@@ -1955,9 +1955,9 @@ PyObject *newVectorObject_cb(PyObject *cb_user, int size, int cb_type, int cb_su
 
 //-----------------row_vector_multiplication (internal)-----------
 //ROW VECTOR Multiplication - Vector X Matrix
-//[x][y][z] *  [1][2][3]
-//             [4][5][6]
-//             [7][8][9]
+//[x][y][z] *  [1][4][7]
+//             [2][5][8]
+//             [3][6][9]
 //vector/matrix multiplication IS NOT COMMUTATIVE!!!!
 static PyObject *row_vector_multiplication(VectorObject* vec, MatrixObject * mat)
 {
@@ -1966,7 +1966,7 @@ static PyObject *row_vector_multiplication(VectorObject* vec, MatrixObject * mat
 	int x, y, z = 0, vec_size = vec->size;
 
 	if(mat->colSize != vec_size){
-		if(mat->rowSize == 4 && vec_size != 3){
+		if(mat->colSize == 4 && vec_size != 3){
 			PyErr_SetString(PyExc_AttributeError, "vector * matrix: matrix column size and the vector size must be the same");
 			return NULL;
 		}else{
@@ -1980,11 +1980,11 @@ static PyObject *row_vector_multiplication(VectorObject* vec, MatrixObject * mat
 	for(x = 0; x < vec_size; x++){
 		vecCopy[x] = vec->vec[x];
 	}
-
+	vecNew[3] = 1.0f;
 	//muliplication
-	for(x = 0; x < mat->colSize; x++) {
-		for(y = 0; y < mat->rowSize; y++) {
-			dot += mat->matrix[y][x] * vecCopy[y];
+	for(x = 0; x < mat->rowSize; x++) {
+		for(y = 0; y < mat->colSize; y++) {
+			dot += mat->matrix[x][y] * vecCopy[y];
 		}
 		vecNew[z++] = (float)dot;
 		dot = 0.0f;

From 8b6b31b41fc6ed07036ea30153131e6824fc7c7e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 8 Sep 2009 00:23:33 +0000
Subject: [PATCH 473/577] Made Nurb->type only store the type rather then
 mixing the type with flags. moved CU_2D to Nurb->flag in do_versions This
 made simple type checks confusing to read.

many... if( (nu->type & 7)==CU_BEZIER)
replaced with ... if(nu->type == CU_BEZIER)

made setting rna curve_2d clamp the Z values. still more RNA/UI changes to do.
---
 source/blender/blenkernel/BKE_curve.h         |  2 +-
 source/blender/blenkernel/intern/anim.c       |  4 +-
 source/blender/blenkernel/intern/curve.c      | 39 ++++----
 source/blender/blenkernel/intern/displist.c   |  6 +-
 source/blender/blenkernel/intern/font.c       |  3 +-
 source/blender/blenkernel/intern/object.c     |  2 +-
 source/blender/blenlib/intern/freetypefont.c  |  3 +-
 source/blender/blenloader/intern/readfile.c   | 11 +++
 source/blender/blenloader/intern/writefile.c  |  2 +-
 source/blender/editors/curve/editcurve.c      | 98 +++++++++----------
 source/blender/editors/object/object_edit.c   | 22 ++---
 .../blender/editors/space_info/info_stats.c   |  2 +-
 .../blender/editors/space_view3d/drawobject.c | 12 +--
 .../editors/space_view3d/view3d_buttons.c     |  4 +-
 .../editors/space_view3d/view3d_snap.c        |  4 +-
 .../editors/transform/transform_conversions.c |  4 +-
 .../editors/transform/transform_manipulator.c |  2 +-
 .../transform/transform_orientations.c        |  2 +-
 source/blender/makesdna/DNA_curve_types.h     |  5 +-
 source/blender/makesrna/intern/rna_curve.c    | 36 +++++--
 20 files changed, 145 insertions(+), 118 deletions(-)

diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index e5a8df1a932..b9f3ee2dd6e 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -47,7 +47,7 @@ struct BevList;
 #define SEGMENTSU(nu)	    ( ((nu)->flagu & CU_CYCLIC) ? (nu)->pntsu : (nu)->pntsu-1 )
 #define SEGMENTSV(nu)	    ( ((nu)->flagv & CU_CYCLIC) ? (nu)->pntsv : (nu)->pntsv-1 )
 
-#define CU_DO_TILT(cu, nu) (((nu->type & CU_2D) && (cu->flag & CU_3D)==0) ? 0 : 1)
+#define CU_DO_TILT(cu, nu) (((nu->flag & CU_2D) && (cu->flag & CU_3D)==0) ? 0 : 1)
 #define CU_DO_RADIUS(cu, nu) ((CU_DO_TILT(cu, nu) || cu->bevobj || cu->ext1!=0.0 || cu->ext2!=0.0) ? 1:0)
 
 
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 6c1b8eb9000..eb74dc1fbfc 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -271,8 +271,8 @@ int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK
 	nu= cu->nurb.first;
 
 	/* make sure that first and last frame are included in the vectors here  */
-	if((nu->type & 7)==CU_POLY) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
-	else if((nu->type & 7)==CU_BEZIER) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
+	if(nu->type == CU_POLY) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
+	else if(nu->type == CU_BEZIER) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
 	else if(s0==s1 || p2==p3) set_four_ipo(1.0f-fac, data, KEY_CARDINAL);
 	else set_four_ipo(1.0f-fac, data, KEY_BSPLINE);
 
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index ca0d4a5fdc3..58ff601e7f7 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -470,8 +470,11 @@ void test2DNurb(Nurb *nu)
 	BezTriple *bezt;
 	BPoint *bp;
 	int a;
+	
+	if((nu->flag & CU_2D)==0)
+		return;
 
-	if( nu->type== CU_BEZIER+CU_2D ) {
+	if(nu->type == CU_BEZIER) {
 		a= nu->pntsu;
 		bezt= nu->bezt;
 		while(a--) {
@@ -481,7 +484,7 @@ void test2DNurb(Nurb *nu)
 			bezt++;
 		}
 	}
-	else if(nu->type & CU_2D) {
+	else {
 		a= nu->pntsu*nu->pntsv;
 		bp= nu->bp;
 		while(a--) {
@@ -497,7 +500,7 @@ void minmaxNurb(Nurb *nu, float *min, float *max)
 	BPoint *bp;
 	int a;
 
-	if( (nu->type & 7)==CU_BEZIER ) {
+	if(nu->type == CU_BEZIER) {
 		a= nu->pntsu;
 		bezt= nu->bezt;
 		while(a--) {
@@ -594,7 +597,7 @@ static void makecyclicknots(float *knots, short pnts, short order)
 
 void makeknots(Nurb *nu, short uv)
 {
-	if( (nu->type & 7)==CU_NURBS ) {
+	if(nu->type == CU_NURBS) {
 		if(uv == 1) {
 			if(nu->knotsu) MEM_freeN(nu->knotsu);
 			if(check_valid_nurb_u(nu)) {
@@ -1587,7 +1590,7 @@ void makeBevelList(Object *ob)
 			else
 				resolu= nu->resolu;
 			
-			if((nu->type & 7)==CU_POLY) {
+			if(nu->type == CU_POLY) {
 				len= nu->pntsu;
 				bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList2");
 				BLI_addtail(&(cu->bev), bl);
@@ -1610,7 +1613,7 @@ void makeBevelList(Object *ob)
 					bp++;
 				}
 			}
-			else if((nu->type & 7)==CU_BEZIER) {
+			else if(nu->type == CU_BEZIER) {
 	
 				len= resolu*(nu->pntsu+ (nu->flagu & CU_CYCLIC) -1)+1;	/* in case last point is not cyclic */
 				bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelBPoints");
@@ -1718,7 +1721,7 @@ void makeBevelList(Object *ob)
 					bl->nr++;
 				}
 			}
-			else if((nu->type & 7)==CU_NURBS) {
+			else if(nu->type == CU_NURBS) {
 				if(nu->pntsv==1) {
 					len= (resolu*SEGMENTSU(nu));
 					
@@ -2311,7 +2314,7 @@ void calchandlesNurb(Nurb *nu) /* first, if needed, set handle flags */
 	BezTriple *bezt, *prev, *next;
 	short a;
 
-	if((nu->type & 7)!=CU_BEZIER) return;
+	if(nu->type != CU_BEZIER) return;
 	if(nu->pntsu<2) return;
 	
 	a= nu->pntsu;
@@ -2346,7 +2349,7 @@ void testhandlesNurb(Nurb *nu)
 	BezTriple *bezt;
 	short flag, a;
 
-	if((nu->type & 7)!=CU_BEZIER) return;
+	if(nu->type != CU_BEZIER) return;
 
 	bezt= nu->bezt;
 	a= nu->pntsu;
@@ -2474,7 +2477,7 @@ void sethandlesNurb(ListBase *editnurb, short code)
 	if(code==1 || code==2) {
 		nu= editnurb->first;
 		while(nu) {
-			if( (nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
@@ -2504,7 +2507,7 @@ void sethandlesNurb(ListBase *editnurb, short code)
 		} else {
 			/* Toggle */
 			while(nu) {
-				if( (nu->type & 7)==CU_BEZIER) {
+				if(nu->type == CU_BEZIER) {
 					bezt= nu->bezt;
 					a= nu->pntsu;
 					while(a--) {
@@ -2521,7 +2524,7 @@ void sethandlesNurb(ListBase *editnurb, short code)
 		}
 		nu= editnurb->first;
 		while(nu) {
-			if( (nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
@@ -2569,7 +2572,7 @@ void switchdirectionNurb(Nurb *nu)
 
 	if(nu->pntsu==1 && nu->pntsv==1) return;
 
-	if((nu->type & 7)==CU_BEZIER) {
+	if(nu->type == CU_BEZIER) {
 		a= nu->pntsu;
 		bezt1= nu->bezt;
 		bezt2= bezt1+(a-1);
@@ -2608,7 +2611,7 @@ void switchdirectionNurb(Nurb *nu)
 			bp1++; 
 			bp2--;
 		}
-		if((nu->type & 7)==CU_NURBS) {
+		if(nu->type == CU_NURBS) {
 			/* inverse knots */
 			a= KNOTSU(nu);
 			fp1= nu->knotsu;
@@ -2671,7 +2674,7 @@ float (*curve_getVertexCos(Curve *cu, ListBase *lb, int *numVerts_r))[3]
 
 	co = cos[0];
 	for (nu=lb->first; nu; nu=nu->next) {
-		if ((nu->type & 7)==CU_BEZIER) {
+		if (nu->type == CU_BEZIER) {
 			BezTriple *bezt = nu->bezt;
 
 			for (i=0; i<nu->pntsu; i++,bezt++) {
@@ -2698,7 +2701,7 @@ void curve_applyVertexCos(Curve *cu, ListBase *lb, float (*vertexCos)[3])
 	int i;
 
 	for (nu=lb->first; nu; nu=nu->next) {
-		if ((nu->type & 7)==CU_BEZIER) {
+		if (nu->type == CU_BEZIER) {
 			BezTriple *bezt = nu->bezt;
 
 			for (i=0; i<nu->pntsu; i++,bezt++) {
@@ -2720,7 +2723,7 @@ int check_valid_nurb_u( struct Nurb *nu )
 {
 	if (nu==NULL)						return 0;
 	if (nu->pntsu <= 1)					return 0;
-	if ((nu->type & 7)!=CU_NURBS)		return 1; /* not a nurb, lets assume its valid */
+	if (nu->type != CU_NURBS)			return 1; /* not a nurb, lets assume its valid */
 	
 	if (nu->pntsu < nu->orderu)			return 0;
 	if (((nu->flag & CU_CYCLIC)==0) && ((nu->flagu>>1) & 2)) { /* Bezier U Endpoints */
@@ -2734,7 +2737,7 @@ int check_valid_nurb_v( struct Nurb *nu)
 {
 	if (nu==NULL)						return 0;
 	if (nu->pntsv <= 1)					return 0;
-	if ((nu->type & 7)!=CU_NURBS)		return 1; /* not a nurb, lets assume its valid */
+	if (nu->type != CU_NURBS)			return 1; /* not a nurb, lets assume its valid */
 	
 	if (nu->pntsv < nu->orderv)			return 0;
 	if (((nu->flag & CU_CYCLIC)==0) && ((nu->flagv>>1) & 2)) { /* Bezier V Endpoints */
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 069129c15da..de85b0a33f6 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -834,7 +834,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 				resolu= nu->resolu;
 			
 			if(!check_valid_nurb_u(nu));
-			else if((nu->type & 7)==CU_BEZIER) {
+			else if(nu->type == CU_BEZIER) {
 				
 				/* count */
 				len= 0;
@@ -902,7 +902,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 					bezt++;
 				}
 			}
-			else if((nu->type & 7)==CU_NURBS) {
+			else if(nu->type == CU_NURBS) {
 				len= (resolu*SEGMENTSU(nu));
 				
 				dl= MEM_callocN(sizeof(DispList), "makeDispListsurf");
@@ -919,7 +919,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 				else dl->type= DL_SEGM;
 				makeNurbcurve(nu, data, NULL, NULL, resolu);
 			}
-			else if((nu->type & 7)==CU_POLY) {
+			else if(nu->type == CU_POLY) {
 				len= nu->pntsu;
 				dl= MEM_callocN(sizeof(DispList), "makeDispListpoly");
 				dl->verts= MEM_callocN(len*3*sizeof(float), "dlverts");
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 70901778585..5ce021e3931 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -462,7 +462,7 @@ static void build_underline(Curve *cu, float x1, float y1, float x2, float y2, i
 	nu2->resolu= cu->resolu;
 	nu2->bezt = NULL;
 	nu2->knotsu = nu2->knotsv = NULL;
-	nu2->flag= 0;
+	nu2->flag= CU_2D;
 	nu2->charidx = charidx+1000;
 	if (mat_nr > 0) nu2->mat_nr= mat_nr-1;
 	nu2->pntsu = 4;
@@ -495,7 +495,6 @@ static void build_underline(Curve *cu, float x1, float y1, float x2, float y2, i
 	nu2->bp[3].vec[2] = 0;	
 	nu2->bp[3].vec[3] = 1.0;	
 	
-	nu2->type = CU_2D;
 	BLI_addtail(&(cu->nurb), nu2);	
 
 }
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 9a137bdb7e6..f10226f6f6b 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1807,7 +1807,7 @@ static void give_parvert(Object *par, int nr, float *vec)
 		
 		count= 0;
 		while(nu && !found) {
-			if((nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index bde4b561f26..985700efda1 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -146,9 +146,10 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
 			bezt = (BezTriple*)MEM_callocN((onpoints[j])* sizeof(BezTriple),"objfnt_bezt") ;
 			BLI_addtail(&che->nurbsbase, nu);
 
-			nu->type= CU_BEZIER+CU_2D;
+			nu->type= CU_BEZIER;
 			nu->pntsu = onpoints[j];
 			nu->resolu= 8;
+			nu->flag= CU_2D;
 			nu->flagu= CU_CYCLIC;
 			nu->bezt = bezt;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0c4835a79b7..db97657a2ee 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9219,6 +9219,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		Material *ma;
 		Camera *cam;
 		Mesh *me;
+		Curve *cu;
 		Scene *sce;
 		Tex *tx;
 		ParticleSettings *part;
@@ -9365,6 +9366,16 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 			//BLI_freelistN(&pidlist);
 		}
+
+		/* type was a mixed flag & enum. move the 2d flag elsewhere */
+		for(cu = main->curve.first; cu; cu= cu->id.next) {
+			Nurb *nu;
+
+			for(nu= cu->nurb.first; nu; nu= nu->next) {
+				nu->flag |= (nu->type & CU_2D);
+				nu->type &= CU_TYPE;
+			}
+		}
 	}
 
 	if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 1)) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index a22e4f66c8d..46cc62fff1c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1358,7 +1358,7 @@ static void write_curves(WriteData *wd, ListBase *idbase)
 				}
 				nu= cu->nurb.first;
 				while(nu) {
-					if( (nu->type & 7)==CU_BEZIER)
+					if(nu->type == CU_BEZIER)
 						writestruct(wd, DATA, "BezTriple", nu->pntsu, nu->bezt);
 					else {
 						writestruct(wd, DATA, "BPoint", nu->pntsu*nu->pntsv, nu->bp);
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 4246c889de0..871f00a585c 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -194,7 +194,7 @@ int isNurbsel(Nurb *nu)
 	BPoint *bp;
 	int a;
 
-	if((nu->type & 7)==CU_BEZIER) {
+	if(nu->type == CU_BEZIER) {
 		bezt= nu->bezt;
 		a= nu->pntsu;
 		while(a--) {
@@ -219,7 +219,7 @@ int isNurbsel_count(Nurb *nu)
 	BPoint *bp;
 	int a, sel=0;
 
-	if((nu->type & 7)==CU_BEZIER) {
+	if(nu->type == CU_BEZIER) {
 		bezt= nu->bezt;
 		a= nu->pntsu;
 		while(a--) {
@@ -247,7 +247,7 @@ void printknots(Object *obedit)
 	int a, num;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if(isNurbsel(nu) &&  (nu->type & 7)==CU_NURBS) {
+		if(isNurbsel(nu) &&  nu->type == CU_NURBS) {
 			if(nu->knotsu) {
 				num= KNOTSU(nu);
 				for(a=0;a<num;a++) printf("knotu %d: %f\n", a, nu->knotsu[a]);
@@ -300,7 +300,7 @@ void load_editNurb(Object *obedit)
 				newnu= duplicateNurb(nu);
 				BLI_addtail(&(cu->nurb), newnu);
 				
-				if((nu->type & 7)==CU_NURBS) {
+				if(nu->type == CU_NURBS) {
 					clamp_nurb_order_u(nu);
 				}
 			}
@@ -484,7 +484,7 @@ static void setflagsNurb(ListBase *editnurb, short flag)
 	int a;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if( (nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			a= nu->pntsu;
 			bezt= nu->bezt;
 			while(a--) {
@@ -511,7 +511,7 @@ static void rotateflagNurb(ListBase *editnurb, short flag, float *cent, float ro
 	int a;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_NURBS) {
+		if(nu->type == CU_NURBS) {
 			bp= nu->bp;
 			a= nu->pntsu*nu->pntsv;
 
@@ -540,7 +540,7 @@ static void translateflagNurb(ListBase *editnurb, short flag, float *vec)
 	int a;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if( (nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			a= nu->pntsu;
 			bezt= nu->bezt;
 			while(a--) {
@@ -570,7 +570,7 @@ static void weightflagNurb(ListBase *editnurb, short flag, float w, int mode)	/*
 	int a;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_NURBS) {
+		if(nu->type == CU_NURBS) {
 			a= nu->pntsu*nu->pntsv;
 			bp= nu->bp;
 			while(a--) {
@@ -834,7 +834,7 @@ static void adduplicateflagNurb(Object *obedit, short flag)
 
 	nu= editnurb->last;
 	while(nu) {
-		if( (nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			for(a=0; a<nu->pntsu; a++) {
 				enda= -1;
@@ -1381,7 +1381,7 @@ static void select_adjacent_cp(ListBase *editnurb, short next, short cont, short
 	
 	for(nu= editnurb->first; nu; nu= nu->next) {
 		lastsel=0;
-		if((nu->type & 7)==CU_BEZIER) {			
+		if(nu->type == CU_BEZIER) {			
 			a= nu->pntsu;
 			bezt= nu->bezt;
 			if(next < 0) bezt= (nu->bezt + (a-1));
@@ -1447,7 +1447,7 @@ void selectend_nurb(Object *obedit, short selfirst, short doswap, short selstatu
 	
 	for(nu= editnurb->first; nu; nu= nu->next) {
 		sel= 0;
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			a= nu->pntsu;
 			
 			/* which point? */
@@ -1546,7 +1546,7 @@ static short nurb_has_selected_cps(ListBase *editnurb)
 	int a;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			a= nu->pntsu;
 			bezt= nu->bezt;
 			while(a--) {
@@ -1616,7 +1616,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 	int a, sel, invert= RNA_boolean_get(op->ptr, "unselected");
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			sel= 0;
@@ -1690,7 +1690,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
 		nu->hide= 0;
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
@@ -1746,7 +1746,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
 	int a;
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
@@ -1814,7 +1814,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
 		amount= 0;
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
         /* 
            Insert a point into a 2D Bezier curve. 
            Endpoints are preserved. Otherwise, all selected and inserted points are 
@@ -1895,7 +1895,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 
 				calchandlesNurb(nu);
 			}
-		} /* End of 'if((nu->type & 7)==CU_BEZIER)' */
+		} /* End of 'if(nu->type == CU_BEZIER)' */
 		else if (nu->pntsv==1) {
         /* 
            All flat lines (ie. co-planar), except flat Nurbs. Flat NURB curves 
@@ -1964,7 +1964,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 				}
 			}
 		} /* End of 'else if(nu->pntsv==1)' */
-		else if((nu->type & 7)==CU_NURBS) {
+		else if(nu->type == CU_NURBS) {
         /* This is a very strange test ... */
         /** 
            Subdivide NURB surfaces - nzc 30-5-'00 -
@@ -2163,7 +2163,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 			MEM_freeN(usel); 
 			MEM_freeN(vsel);
 
-		} /* End of 'if((nu->type & 7)==CU_NURBS)'  */
+		} /* End of 'if(nu->type == CU_NURBS)'  */
 	}
 
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -2256,7 +2256,7 @@ static void findselectedNurbvert(ListBase *editnurb, Nurb **nu, BezTriple **bezt
 	*bezt= 0;
 	*bp= 0;
 	for(nu1= editnurb->first; nu1; nu1= nu1->next) {
-		if((nu1->type & 7)==CU_BEZIER) {
+		if(nu1->type == CU_BEZIER) {
 			bezt1= nu1->bezt;
 			a= nu1->pntsu;
 			while(a--) {
@@ -2313,7 +2313,7 @@ static int convertspline(short type, Nurb *nu)
 	BPoint *bp;
 	int a, c, nr;
 
-	if((nu->type & 7)==CU_POLY) {
+	if(nu->type == CU_POLY) {
 		if(type==CU_BEZIER) {			    /* to Bezier with vecthandles  */
 			nr= nu->pntsu;
 			bezt =
@@ -2333,13 +2333,11 @@ static int convertspline(short type, Nurb *nu)
 			MEM_freeN(nu->bp);
 			nu->bp= 0;
 			nu->pntsu= nr;
-			nu->type &= ~7;
-			nu->type |= CU_BEZIER;
+			nu->type = CU_BEZIER;
 			calchandlesNurb(nu);
 		}
 		else if(type==CU_NURBS) {
-			nu->type &= ~7;
-			nu->type |= CU_NURBS;
+			nu->type = CU_NURBS;
 			nu->orderu= 4;
 			nu->flagu &= CU_CYCLIC; /* disable all flags except for cyclic */
 			nu->flagu += 4;
@@ -2352,7 +2350,7 @@ static int convertspline(short type, Nurb *nu)
 			}
 		}
 	}
-	else if((nu->type & 7)==CU_BEZIER) {	/* Bezier */
+	else if(nu->type == CU_BEZIER) {	/* Bezier */
 		if(type==0 || type==4) {	    /* to Poly or Nurb */
 			nr= 3*nu->pntsu;
 			nu->bp = MEM_callocN(nr * sizeof(BPoint), "setsplinetype");
@@ -2390,8 +2388,7 @@ static int convertspline(short type, Nurb *nu)
 			nu->pntsv= 1;
 			nu->orderu= 4;
 			nu->orderv= 1;
-			nu->type &= ~7;
-			nu->type+= type;
+			nu->type |= type;
 			if(nu->flagu & CU_CYCLIC) c= nu->orderu-1; 
 			else c= 0;
 			if(type== 4) {
@@ -2401,9 +2398,9 @@ static int convertspline(short type, Nurb *nu)
 			}
 		}
 	}
-	else if((nu->type & 7)==CU_NURBS) {
-		if(type==0) {			/* to Poly */
-			nu->type &= ~7;
+	else if(nu->type == CU_NURBS) {
+		if(type==CU_POLY) {
+			nu->type = CU_POLY;
 			if(nu->knotsu) MEM_freeN(nu->knotsu); /* python created nurbs have a knotsu of zero */
 			nu->knotsu= NULL;
 			if(nu->knotsv) MEM_freeN(nu->knotsv);
@@ -2438,8 +2435,7 @@ static int convertspline(short type, Nurb *nu)
 				MEM_freeN(nu->knotsu);
 				nu->knotsu= NULL;
 				nu->pntsu= nr;
-				nu->type &= ~7;
-				nu->type |= CU_BEZIER;
+				nu->type = CU_BEZIER;
 			}
 		}
 	}
@@ -2799,7 +2795,7 @@ static void merge_2_nurb(wmOperator *op, ListBase *editnurb, Nurb *nu1, Nurb *nu
 		}
 	}
 
-	if((nu1->type & 7)==CU_NURBS) {
+	if(nu1->type == CU_NURBS) {
 		/* merge knots */
 		makeknots(nu1, 1);
 	
@@ -2903,7 +2899,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 	/* find both nurbs and points, nu1 will be put behind nu2 */
 	for(nu= editnurb->first; nu; nu= nu->next) {
 		if((nu->flagu & CU_CYCLIC)==0) {    /* not cyclic */
-			if( (nu->type & 7)==CU_BEZIER ) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				if(nu1==0) {
 					if( BEZSELECTED_HIDDENHANDLES(bezt) ) nu1= nu;
@@ -2960,7 +2956,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 
 	if((nu1 && nu2) && (nu1!=nu2)) {
 		if( nu1->type==nu2->type) {
-			if((nu1->type & 7)==CU_BEZIER) {
+			if(nu1->type == CU_BEZIER) {
 				bezt =
 					(BezTriple*)MEM_mallocN((nu1->pntsu+nu2->pntsu) * sizeof(BezTriple), "addsegmentN");
 				memcpy(bezt, nu2->bezt, nu2->pntsu*sizeof(BezTriple));
@@ -2986,7 +2982,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 				BLI_remlink(editnurb, nu2);
 
 				/* now join the knots */
-				if((nu1->type & 7)==CU_NURBS) {
+				if(nu1->type == CU_NURBS) {
 					if(nu1->knotsu==NULL) {
 						makeknots(nu1, 1);
 					}
@@ -3266,7 +3262,7 @@ static int addvert_Nurb(bContext *C, short mode, float location[3])
 	findselectedNurbvert(editnurb, &nu, &bezt, &bp);
 	if(bezt==0 && bp==0) return OPERATOR_CANCELLED;
 
-	if((nu->type & 7)==CU_BEZIER) {
+	if(nu->type == CU_BEZIER) {
 		/* which bezpoint? */
 		if(bezt== nu->bezt) {   /* first */
 			BEZ_DESEL(bezt);
@@ -3485,7 +3481,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 
 	for(nu= editnurb->first; nu; nu= nu->next) {
 		if( nu->pntsu>1 || nu->pntsv>1) {
-			if( (nu->type & 7)==CU_POLY ) {
+			if(nu->type == CU_POLY) {
 				a= nu->pntsu;
 				bp= nu->bp;
 				while(a--) {
@@ -3496,7 +3492,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 					bp++;
 				}
 			}
-			else if( (nu->type & 7)==CU_BEZIER ) {
+			else if(nu->type == CU_BEZIER) {
 				a= nu->pntsu;
 				bezt= nu->bezt;
 				while(a--) {
@@ -3508,7 +3504,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 				}
 				calchandlesNurb(nu);
 			}
-			else if(nu->pntsv==1 && (nu->type & 7)==CU_NURBS) {
+			else if(nu->pntsv==1 && nu->type == CU_NURBS) {
 				if (nu->knotsu) { /* if check_valid_nurb_u fails the knotsu can be NULL */
 					a= nu->pntsu;
 					bp= nu->bp;
@@ -3959,7 +3955,7 @@ static int select_less_exec(bContext *C, wmOperator *op)
 		for(nu= editnurb->first; nu; nu= nu->next) {
 			lastsel=0;
 			/* check what type of curve/nurb it is */
-			if((nu->type & 7)==CU_BEZIER) {			
+			if(nu->type == CU_BEZIER) {			
 				a= nu->pntsu;
 				bezt= nu->bezt;
 				while(a--) {
@@ -4105,7 +4101,7 @@ static int select_random_exec(bContext *C, wmOperator *op)
 	
 	/* select elements */
 	for(i=1, nu= editnurb->first; nu; nu= nu->next) {	
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
@@ -4249,7 +4245,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 		nu= editnurb->first;
 		while(nu) {
 			next= nu->next;
-			if( (nu->type & 7)==CU_BEZIER ) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				if(a) {
@@ -4285,7 +4281,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 			/* Never allow the order to exceed the number of points
 			- note, this is ok but changes unselected nurbs, disable for now */
 			/*
-			if ((nu!= NULL) && ((nu->type & 7)==CU_NURBS)) {
+			if ((nu!= NULL) && (nu->type == CU_NURBS)) {
 				clamp_nurb_order_u(nu);
 			}
 			*/
@@ -4296,7 +4292,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 		while(nu) {
 			next= nu->next;
 			type= 0;
-			if( (nu->type & 7)==CU_BEZIER ) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				for(a=0;a<nu->pntsu;a++) {
 					if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
@@ -4339,7 +4335,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 					/* Never allow the order to exceed the number of points\
 					- note, this is ok but changes unselected nurbs, disable for now */
 					/*
-					if ((nu->type & 7)==CU_NURBS) {
+					if (nu->type == CU_NURBS) {
 						clamp_nurb_order_u(nu);
 					}*/
 				}
@@ -4356,7 +4352,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 		nu1= 0;
 		while(nu) {
 			next= nu->next;
-			if( (nu->type & 7)==CU_BEZIER ) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				for(a=0; a<nu->pntsu-1; a++) {
 					if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
@@ -4730,7 +4726,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 	/* these types call this function to return a Nurb */
 	if (stype!=CU_PRIM_TUBE && stype!=CU_PRIM_DONUT) {
 		nu = (Nurb*)MEM_callocN(sizeof(Nurb), "addNurbprim");
-		nu->type= type;
+		nu->type= cutype;
 		nu->resolu= 4;
 		nu->resolv= 4;
 	}
@@ -4743,6 +4739,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 			rename_id((ID *)obedit->data, "Curve");
 		}
 		if(cutype==CU_BEZIER) {
+			nu->flag= CU_2D;
 			nu->pntsu= 2;
 			nu->bezt =
 				(BezTriple*)MEM_callocN(2 * sizeof(BezTriple), "addNurbprim1");
@@ -4851,6 +4848,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 			rename_id((ID *)obedit->data, "CurveCircle");
 		}
 		if(cutype==CU_BEZIER) {
+			nu->flag= CU_2D;
 			nu->pntsu= 4;
 			nu->bezt= callocstructN(BezTriple, 4, "addNurbprim1");
 			nu->flagu= CU_CYCLIC;
@@ -5077,7 +5075,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 	}
 	
 	/* always do: */
-	nu->flag= CU_SMOOTH;
+	nu->flag |= CU_SMOOTH;
 	
 	test2DNurb(nu);
 	
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index d226834bc21..9ef250d7963 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -406,11 +406,11 @@ void OBJECT_OT_mesh_add(wmOperatorType *ot)
 }
 
 static EnumPropertyItem prop_curve_types[] = {
-	{CU_BEZIER|CU_2D|CU_PRIM_CURVE, "BEZIER_CURVE", ICON_CURVE_BEZCURVE, "Bezier Curve", ""},
-	{CU_BEZIER|CU_2D|CU_PRIM_CIRCLE, "BEZIER_CIRCLE", ICON_CURVE_BEZCIRCLE, "Bezier Circle", ""},
-	{CU_NURBS|CU_2D|CU_PRIM_CURVE, "NURBS_CURVE", ICON_CURVE_NCURVE, "NURBS Curve", ""},
-	{CU_NURBS|CU_2D|CU_PRIM_CIRCLE, "NURBS_CIRCLE", ICON_CURVE_NCIRCLE, "NURBS Circle", ""},
-	{CU_NURBS|CU_2D|CU_PRIM_PATH, "PATH", ICON_CURVE_PATH, "Path", ""},
+	{CU_BEZIER|CU_PRIM_CURVE, "BEZIER_CURVE", ICON_CURVE_BEZCURVE, "Bezier Curve", ""},
+	{CU_BEZIER|CU_PRIM_CIRCLE, "BEZIER_CIRCLE", ICON_CURVE_BEZCIRCLE, "Bezier Circle", ""},
+	{CU_NURBS|CU_PRIM_CURVE, "NURBS_CURVE", ICON_CURVE_NCURVE, "NURBS Curve", ""},
+	{CU_NURBS|CU_PRIM_CIRCLE, "NURBS_CIRCLE", ICON_CURVE_NCIRCLE, "NURBS Circle", ""},
+	{CU_NURBS|CU_PRIM_PATH, "PATH", ICON_CURVE_PATH, "Path", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -1064,7 +1064,7 @@ static int return_editcurve_indexar(Object *obedit, int *tot, int **indexar, flo
 	int *index, a, nr, totvert=0;
 	
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
@@ -1091,7 +1091,7 @@ static int return_editcurve_indexar(Object *obedit, int *tot, int **indexar, flo
 	cent[0]= cent[1]= cent[2]= 0.0;
 	
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
@@ -1200,7 +1200,7 @@ static void select_editcurve_hook(Object *obedit, HookModifierData *hmd)
 	int index=0, a, nr=0;
 	
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
@@ -2795,7 +2795,7 @@ void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
 
 		nu= editnurb->first;
 		while(nu) {
-			if((nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
@@ -3705,7 +3705,7 @@ static int object_center_set_exec(bContext *C, wmOperator *op)
 					
 					nu= nu1;
 					while(nu) {
-						if( (nu->type & 7)==CU_BEZIER) {
+						if(nu->type == CU_BEZIER) {
 							a= nu->pntsu;
 							while (a--) {
 								VecSubf(nu->bezt[a].vec[0], nu->bezt[a].vec[0], cent);
@@ -5742,7 +5742,7 @@ static void apply_objects_internal(Scene *scene, View3D *v3d, int apply_scale, i
 				
 				nu= cu->nurb.first;
 				while(nu) {
-					if( (nu->type & 7)==CU_BEZIER) {
+					if(nu->type == CU_BEZIER) {
 						a= nu->pntsu;
 						bezt= nu->bezt;
 						while(a--) {
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index 2d14fbc515e..7acebbdb72e 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -193,7 +193,7 @@ static void stats_object_edit(Object *obedit, SceneStats *stats)
 		int a;
 
 		for(nu=cu->editnurb->first; nu; nu=nu->next) {
-			if((nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 3b6ca455b48..220952d190f 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1392,7 +1392,7 @@ void nurbs_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, Nurb
 	int i;
 
 	for (nu= cu->editnurb->first; nu; nu=nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			for (i=0; i<nu->pntsu; i++) {
 				BezTriple *bezt = &nu->bezt[i];
 
@@ -3888,7 +3888,7 @@ static void tekenhandlesN(Nurb *nu, short sel)
 	
 	glBegin(GL_LINES); 
 	
-	if( (nu->type & 7)==CU_BEZIER) {
+	if(nu->type == CU_BEZIER) {
 		if(sel) col= nurbcol+4;
 		else col= nurbcol;
 
@@ -3945,7 +3945,7 @@ static void tekenvertsN(Nurb *nu, short sel)
 	
 	bglBegin(GL_POINTS);
 	
-	if((nu->type & 7)==CU_BEZIER) {
+	if(nu->type == CU_BEZIER) {
 
 		bezt= nu->bezt;
 		a= nu->pntsu;
@@ -3986,7 +3986,7 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 	nu= nurb;
 	while(nu) {
 		if(nu->hide==0) {
-			switch(nu->type & 7) {
+			switch(nu->type) {
 			case CU_POLY:
 				cpack(nurbcol[3]);
 				bp= nu->bp;
@@ -4094,7 +4094,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	
 	/* first non-selected handles */
 	for(nu=nurb; nu; nu=nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			tekenhandlesN(nu, 0);
 		}
 	}
@@ -4102,7 +4102,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	draw_editnurb(ob, nurb, 1);
 	/* selected handles */
 	for(nu=nurb; nu; nu=nu->next) {
-		if((nu->type & 7)==1) tekenhandlesN(nu, 1);
+		if(nu->type == CU_BEZIER) tekenhandlesN(nu, 1);
 		tekenvertsN(nu, 0);
 	}
 	
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 39e90a37b3f..2bef37e43e6 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -226,7 +226,7 @@ static void v3d_editvertex_buts(const bContext *C, uiBlock *block, View3D *v3d,
 		
 		nu= cu->editnurb->first;
 		while(nu) {
-			if((nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
@@ -409,7 +409,7 @@ static void v3d_editvertex_buts(const bContext *C, uiBlock *block, View3D *v3d,
 			
 			nu= cu->editnurb->first;
 			while(nu) {
-				if((nu->type & 7)==CU_BEZIER) {
+				if(nu->type == CU_BEZIER) {
 					bezt= nu->bezt;
 					a= nu->pntsu;
 					while(a--) {
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 73b70ccb532..b4b54cd1d88 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -302,7 +302,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode)
 		int totmalloc= 0;
 		
 		for(nu= cu->editnurb->first; nu; nu= nu->next) {
-			if((nu->type & 7)==CU_BEZIER)
+			if(nu->type == CU_BEZIER)
 				totmalloc += 3*nu->pntsu;
 			else
 				totmalloc += nu->pntsu*nu->pntsv;
@@ -311,7 +311,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode)
 
 		nu= cu->editnurb->first;
 		while(nu) {
-			if((nu->type & 7)==CU_BEZIER) {
+			if(nu->type == CU_BEZIER) {
 				a= nu->pntsu;
 				bezt= nu->bezt;
 				while(a--) {
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 3f32b707043..d86eddd0a64 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1373,7 +1373,7 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 
 	/* count total of vertices, check identical as in 2nd loop for making transdata! */
 	for(nu= cu->editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
 				if(bezt->hide==0) {
 					if (G.f & G_HIDDENHANDLES) {
@@ -1409,7 +1409,7 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 
     td = t->data;
 	for(nu= cu->editnurb->first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
+		if(nu->type == CU_BEZIER) {
 			TransData *head, *tail;
 			head = tail = td;
 			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index e4ec43a8f38..9fa20c2d674 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -252,7 +252,7 @@ int calc_manipulator_stats(const bContext *C)
 
 			nu= cu->editnurb->first;
 			while(nu) {
-				if((nu->type & 7)==CU_BEZIER) {
+				if(nu->type == CU_BEZIER) {
 					bezt= nu->bezt;
 					a= nu->pntsu;
 					while(a--) {
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 8f9d6108e37..9416425704f 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -744,7 +744,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 			for (nu = cu->editnurb->first; nu; nu = nu->next)
 			{
 				/* only bezier has a normal */
-				if((nu->type & 7) == CU_BEZIER)
+				if(nu->type == CU_BEZIER)
 				{
 					bezt= nu->bezt;
 					a= nu->pntsu;
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 0466ea148fd..8cf9fbbaf40 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -236,6 +236,7 @@ typedef struct Curve {
 
 /* flag (nurb) */
 #define CU_SMOOTH		1
+#define CU_2D			8 /* moved from type since 2.4x */
 
 /* type (nurb) */
 #define CU_POLY			0
@@ -243,9 +244,7 @@ typedef struct Curve {
 #define CU_BSPLINE		2
 #define CU_CARDINAL		3
 #define CU_NURBS		4
-#define CU_TYPE			7
-
-#define CU_2D			8
+#define CU_TYPE			(CU_POLY|CU_BEZIER|CU_BSPLINE|CU_CARDINAL|CU_NURBS)
 
 		/* only for adding */
 #define CU_PRIMITIVE	0xF00
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 8c805c11f78..7de5976e12c 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -142,24 +142,39 @@ static void rna_Curve_material_index_range(PointerRNA *ptr, int *min, int *max)
 	*max= cu->totcol-1;
 }
 
+static void rna_Curve_2d_set(PointerRNA *ptr, int value)
+{
+	Curve *cu= (Curve*)ptr->id.data;
+	Nurb *nu;
+
+	if(value) {
+		cu->flag &= ~CU_3D;
+		for(nu= cu->nurb.first; nu; nu= nu->next) {
+			nu->flag |= CU_2D;
+			test2DNurb(nu);
+		}
+	}
+	else {
+		cu->flag |=  CU_3D;
+		for(nu= cu->nurb.first; nu; nu= nu->next) {
+			nu->flag &= ~CU_2D;
+		}
+	}
+}
+
+
+
 static int rna_Nurb_length(PointerRNA *ptr)
 {
 	Nurb *nu= (Nurb*)ptr->data;
 	return nu->pntsv>0 ? nu->pntsu*nu->pntsv : nu->pntsu;
 }
 
-/* grr! mixing CU_2D with type is dodgy */
-static int rna_Nurb_type_get(PointerRNA *ptr)
-{
-	Nurb *nu= (Nurb*)ptr->data;
-	return nu->type & 7;
-}
-
 static void rna_Nurb_type_set(PointerRNA *ptr, int value)
 {
 	Nurb *nu= (Nurb*)ptr->data;
-	nu->type &= CU_2D;
-	nu->type |= value;
+	nu->type = value;
+	// XXX - TODO change datatypes
 }
 
 static void rna_BPoint_array_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
@@ -677,6 +692,7 @@ static void rna_def_curve(BlenderRNA *brna)
 	/* Flags */
 	prop= RNA_def_property(srna, "curve_2d", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CU_3D);
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_Curve_2d_set");
 	RNA_def_property_ui_text(prop, "2D Curve", "Define curve in two dimensions only. Note that fill only works when this is enabled.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
@@ -751,7 +767,7 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 	// XXX - switching type probably needs comprehensive recalc of data like in 2.4x
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, curve_type_items);
-	RNA_def_property_enum_funcs(prop, "rna_Nurb_type_get", "rna_Nurb_type_set", NULL);
+	RNA_def_property_enum_funcs(prop, NULL, "rna_Nurb_type_set", NULL);
 	RNA_def_property_ui_text(prop, "Type", "The interpolation type for this curve element.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 

From 00838f05d23cbd2dfefeab10d9d5345bbad25ea6 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 8 Sep 2009 01:18:06 +0000
Subject: [PATCH 474/577] use pure py classes instead of a mix of rna stuff for
 ui. fix a couple of bugs

---
 release/io/netrender/__init__.py  |  8 +++
 release/io/netrender/master.py    |  6 +-
 release/io/netrender/operators.py | 53 ++++++++---------
 release/io/netrender/slave.py     |  5 +-
 release/io/netrender/ui.py        | 96 ++++++++++---------------------
 5 files changed, 72 insertions(+), 96 deletions(-)

diff --git a/release/io/netrender/__init__.py b/release/io/netrender/__init__.py
index e0de2726a55..1eb91abb938 100644
--- a/release/io/netrender/__init__.py
+++ b/release/io/netrender/__init__.py
@@ -7,3 +7,11 @@ import slave
 import master
 import utils
 import ui
+
+# store temp data in bpy module
+
+import bpy
+
+bpy.data.netrender_jobs = []
+bpy.data.netrender_slaves = []
+bpy.data.netrender_blacklist = []
\ No newline at end of file
diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
index 6f360a4e7a9..4afda9ac67b 100644
--- a/release/io/netrender/master.py
+++ b/release/io/netrender/master.py
@@ -155,11 +155,11 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 						
 						if not frame:
 							# no such frame
-							self.send_heat(http.client.NOT_FOUND)
+							self.send_heat(http.client.NO_CONTENT)
 							return
 				else:
 					# no such job id
-					self.send_head(http.client.NOT_FOUND)
+					self.send_head(http.client.NO_CONTENT)
 					return
 			
 			self.send_head()
@@ -453,6 +453,8 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 					
 					buf = self.rfile.read(length)
 					
+					# add same temp file + renames as slave
+					
 					f = open(file_path, "wb")
 					f.write(buf)
 					f.close()
diff --git a/release/io/netrender/operators.py b/release/io/netrender/operators.py
index a1208aa1b46..30631b3b23d 100644
--- a/release/io/netrender/operators.py
+++ b/release/io/netrender/operators.py
@@ -61,18 +61,17 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
 			
 			while(len(netsettings.jobs) > 0):
 				netsettings.jobs.remove(0)
-				
+			
+			bpy.data.netrender_jobs = []
+			
 			for j in jobs:
+				bpy.data.netrender_jobs.append(j)
 				netsettings.jobs.add()
 				job = netsettings.jobs[-1]
 				
-				job_results = j.framesStatus()
+				j.results = j.framesStatus() # cache frame status
 				
-				job.id = j.id
 				job.name = j.name
-				job.length = len(j)
-				job.done = job_results[DONE]
-				job.error = job_results[ERROR]
 		
 		return ('FINISHED',)
 	
@@ -97,15 +96,13 @@ class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
 		
 		if netsettings.active_slave_index >= 0:
 			
-			slave = netrender.slaves[netsettings.active_slave_index]
+			# deal with data
+			slave = bpy.data.netrender_slaves.pop(netsettings.active_slave_index)
+			bpy.data.netrender_blacklist.append(slave)
 			
+			# deal with rna
 			netsettings.slaves_blacklist.add()
-			
-			netsettings.slaves_blacklist[-1].id = slave.id
 			netsettings.slaves_blacklist[-1].name = slave.name
-			netsettings.slaves_blacklist[-1].address = slave.address
-			netsettings.slaves_blacklist[-1].last_seen = slave.last_seen
-			netsettings.slaves_blacklist[-1].stats = slave.stats
 			
 			netsettings.slaves.remove(netsettings.active_slave_index)
 			netsettings.active_slave_index = -1
@@ -133,15 +130,13 @@ class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
 		
 		if netsettings.active_blacklisted_slave_index >= 0:
 			
-			slave = netsettings.slaves_blacklist[netsettings.active_blacklisted_slave_index]
+			# deal with data
+			slave = bpy.data.netrender_blacklist.pop(netsettings.active_blacklisted_slave_index)
+			bpy.data.netrender_slaves.append(slave)
 			
+			# deal with rna
 			netsettings.slaves.add()
-			
-			netsettings.slaves[-1].id = slave.id
 			netsettings.slaves[-1].name = slave.name
-			netsettings.slaves[-1].address = slave.address
-			netsettings.slaves[-1].last_seen = slave.last_seen
-			netsettings.slaves[-1].stats = slave.stats
 			
 			netsettings.slaves_blacklist.remove(netsettings.active_blacklisted_slave_index)
 			netsettings.active_blacklisted_slave_index = -1
@@ -180,19 +175,21 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
 			while(len(netsettings.slaves) > 0):
 				netsettings.slaves.remove(0)
 			
+			bpy.data.netrender_slaves = []
+			
 			for s in slaves:
-				for slave in netsettings.slaves_blacklist:
+				for i in range(len(bpy.data.netrender_blacklist)):
+					slave = bpy.data.netrender_blacklist[i]
 					if slave.id == s.id:
+						bpy.data.netrender_blacklist[i] = s
+						netsettings.slaves_blacklist[i].name = s.name
 						break
+				else:
+					bpy.data.netrender_slaves.append(s)
 					
-				netsettings.slaves.add()
-				slave = netsettings.slaves[-1]
-				
-				slave.id = s.id
-				slave.name = s.name
-				slave.stats = s.stats
-				slave.address = s.address[0]
-				slave.last_seen = time.ctime(s.last_seen)
+					netsettings.slaves.add()
+					slave = netsettings.slaves[-1]
+					slave.name = s.name
 		
 		return ('FINISHED',)
 	
@@ -218,7 +215,7 @@ class RENDER_OT_netclientcancel(bpy.types.Operator):
 		conn = clientConnection(context.scene)
 		
 		if conn:
-			job = netsettings.jobs[netsettings.active_job_index]
+			job = bpy.data.netrender_jobs[netsettings.active_job_index]
 			
 			conn.request("POST", "cancel", headers={"job-id":job.id})
 			
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
index 3d7153a0c54..8cbfd4ea11f 100644
--- a/release/io/netrender/slave.py
+++ b/release/io/netrender/slave.py
@@ -30,13 +30,14 @@ def testFile(conn, JOB_PREFIX, file_path, main_path = None):
 	job_full_path = prefixPath(JOB_PREFIX, file_path, main_path)
 	
 	if not os.path.exists(job_full_path):
+		temp_path = JOB_PREFIX + "slave.temp.blend"
 		conn.request("GET", "file", headers={"job-id": job.id, "slave-id":slave_id, "job-file":file_path})
 		response = conn.getresponse()
 		
 		if response.status != http.client.OK:
 			return None # file for job not returned by server, need to return an error code to server
 		
-		f = open(job_full_path, "wb")
+		f = open(temp_path, "wb")
 		buf = response.read(1024)
 		
 		while buf:
@@ -45,6 +46,8 @@ def testFile(conn, JOB_PREFIX, file_path, main_path = None):
 		
 		f.close()
 		
+		os.renames(temp_path, job_full_path)
+		
 	return job_full_path
 
 
diff --git a/release/io/netrender/ui.py b/release/io/netrender/ui.py
index f8179fedbda..8faabe6ff2d 100644
--- a/release/io/netrender/ui.py
+++ b/release/io/netrender/ui.py
@@ -6,6 +6,8 @@ import subprocess, shutil, time, hashlib
 import netrender.slave as slave
 import netrender.master as master
 
+from netrender.utils import *
+
 VERSION = b"0.3"
 
 PATH_PREFIX = "/tmp/"
@@ -69,10 +71,10 @@ class SCENE_PT_network_slaves(RenderButtonsPanel):
 		layout = self.layout
 		
 		scene = context.scene
-		netrender = scene.network_render
+		netsettings = scene.network_render
 
 		row = layout.row()
-		row.template_list(netrender, "slaves", netrender, "active_slave_index", rows=2)
+		row.template_list(netsettings, "slaves", netsettings, "active_slave_index", rows=2)
 
 		col = row.column()
 
@@ -80,14 +82,18 @@ class SCENE_PT_network_slaves(RenderButtonsPanel):
 		subcol.itemO("render.netclientslaves", icon="ICON_FILE_REFRESH", text="")
 		subcol.itemO("render.netclientblacklistslave", icon="ICON_ZOOMOUT", text="")
 		
-		if netrender.active_slave_index >= 0 and len(netrender.slaves) > 0:
+		if len(bpy.data.netrender_slaves) == 0 and len(netsettings.slaves) > 0:
+			while(len(netsettings.slaves) > 0):
+				netsettings.slaves.remove(0)
+		
+		if netsettings.active_slave_index >= 0 and len(netsettings.slaves) > 0:
 			layout.itemS()
 			
-			slave = netrender.slaves[netrender.active_slave_index]
+			slave = bpy.data.netrender_slaves[netsettings.active_slave_index]
 
 			layout.itemL(text="Name: " + slave.name)
-			layout.itemL(text="Address: " + slave.address)
-			layout.itemL(text="Seen: " + slave.last_seen)
+			layout.itemL(text="Address: " + slave.address[0])
+			layout.itemL(text="Seen: " + time.ctime(slave.last_seen))
 			layout.itemL(text="Stats: " + slave.stats)
 
 bpy.types.register(SCENE_PT_network_slaves)
@@ -104,26 +110,29 @@ class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel):
 		layout = self.layout
 		
 		scene = context.scene
-		netrender = scene.network_render
+		netsettings = scene.network_render
 
 		row = layout.row()
-		row.template_list(netrender, "slaves_blacklist", netrender, "active_blacklisted_slave_index", rows=2)
+		row.template_list(netsettings, "slaves_blacklist", netsettings, "active_blacklisted_slave_index", rows=2)
 
 		col = row.column()
 
 		subcol = col.column(align=True)
 		subcol.itemO("render.netclientwhitelistslave", icon="ICON_ZOOMOUT", text="")
 
+		if len(bpy.data.netrender_blacklist) == 0 and len(netsettings.slaves_blacklist) > 0:
+			while(len(netsettings.slaves_blacklist) > 0):
+				netsettings.slaves_blacklist.remove(0)
 		
-		if netrender.active_blacklisted_slave_index >= 0 and len(netrender.slaves_blacklist) > 0:
+		if netsettings.active_blacklisted_slave_index >= 0 and len(netsettings.slaves_blacklist) > 0:
 			layout.itemS()
 			
-			slave = netrender.slaves_blacklist[netrender.active_blacklisted_slave_index]
+			slave = bpy.data.netrender_blacklist[netsettings.active_blacklisted_slave_index]
 
 			layout.itemL(text="Name: " + slave.name)
-			layout.itemL(text="Address: " + slave.address)
+			layout.itemL(text="Address: " + slave.address[0])
 			layout.itemL(text="Seen: " + slave.last_seen)
-			layout.itemL(text="Stats: " + slave.stats)
+			layout.itemL(text="Stats: " + time.ctime(slave.stats))
 			
 bpy.types.register(SCENE_PT_network_slaves_blacklist)
 
@@ -139,10 +148,10 @@ class SCENE_PT_network_jobs(RenderButtonsPanel):
 		layout = self.layout
 		
 		scene = context.scene
-		netrender = scene.network_render
+		netsettings = scene.network_render
 
 		row = layout.row()
-		row.template_list(netrender, "jobs", netrender, "active_job_index", rows=2)
+		row.template_list(netsettings, "jobs", netsettings, "active_job_index", rows=2)
 
 		col = row.column()
 
@@ -150,16 +159,19 @@ class SCENE_PT_network_jobs(RenderButtonsPanel):
 		subcol.itemO("render.netclientstatus", icon="ICON_FILE_REFRESH", text="")
 		subcol.itemO("render.netclientcancel", icon="ICON_ZOOMOUT", text="")
 
+		if len(bpy.data.netrender_jobs) == 0 and len(netsettings.jobs) > 0:
+			while(len(netsettings.jobs) > 0):
+				netsettings.jobs.remove(0)
 		
-		if netrender.active_job_index >= 0 and len(netrender.jobs) > 0:
+		if netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0:
 			layout.itemS()
 			
-			job = netrender.jobs[netrender.active_job_index]
+			job = bpy.data.netrender_jobs[netsettings.active_job_index]
 
 			layout.itemL(text="Name: %s" % job.name)
-			layout.itemL(text="Length: %04i" % job.length)
-			layout.itemL(text="Done: %04i" % job.done)
-			layout.itemL(text="Error: %04i" % job.error)
+			layout.itemL(text="Length: %04i" % len(job))
+			layout.itemL(text="Done: %04i" % job.results[DONE])
+			layout.itemL(text="Error: %04i" % job.results[ERROR])
 			
 bpy.types.register(SCENE_PT_network_jobs)
 
@@ -264,54 +276,8 @@ NetRenderSlave.StringProperty( attr="name",
 				maxlen = 64,
 				default = "")
 
-NetRenderSlave.StringProperty( attr="address",
-				name="Address of the slave",
-				description="",
-				maxlen = 64,
-				default = "")
-
-NetRenderSlave.StringProperty( attr="last_seen",
-				name="Last time slave was seen by server",
-				description="",
-				maxlen = 64,
-				default = "")
-
-NetRenderSlave.StringProperty( attr="stats",
-				name="Hardware stats of the slave",
-				description="",
-				maxlen = 128,
-				default = "")
-
-NetRenderJob.StringProperty( attr="id",
-				name="ID of the job",
-				description="",
-				maxlen = 64,
-				default = "")
-
-
 NetRenderJob.StringProperty( attr="name",
 				name="Name of the job",
 				description="",
 				maxlen = 128,
 				default = "")
-
-NetRenderJob.IntProperty( attr="length",
-				name="Number of frames",
-				description="",
-				default = 0,
-				min= 0,
-				max=65535)
-
-NetRenderJob.IntProperty( attr="done",
-				name="Number of frames rendered",
-				description="",
-				default = 0,
-				min= 0,
-				max=65535)
-
-NetRenderJob.IntProperty( attr="error",
-				name="Number of frames in error",
-				description="",
-				default = 0,
-				min= 0,
-				max=65535)

From 6808e15c8d20819deddd6b175668d11a6c6f454d Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 8 Sep 2009 02:09:14 +0000
Subject: [PATCH 475/577] 2.5 - Mode Switching Bugfixes

This commit some of the many bugs here (it's still not perfect now, but much better than it was):
* Moving in/out of Object, Edit, and Pose Modes for Armatures should now work smoothly. Operators should work nicely in the appropriate modes now (select linked might be a bit tempermental still, since it uses mouse-position).

* Fixed the 'mysterious' memory leaks when changing modes. These were only caused when using the mode switching menu in the 3D-View.

* Went through bullet-proofing some of the operator calling functions against NULL operator id-name strings.
---
 release/ui/space_view3d.py                    |  1 +
 source/blender/editors/armature/poseobject.c  |  7 ++-
 source/blender/editors/object/object_edit.c   |  4 +-
 .../editors/space_view3d/view3d_header.c      | 11 ++++-
 .../windowmanager/intern/wm_operators.c       | 46 +++++++++++--------
 5 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index ae1edc0295b..4281ff2ccab 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -186,6 +186,7 @@ class VIEW3D_MT_select_POSE(bpy.types.Menu):
 		layout.itemO("pose.select_all_toggle", text="Select/Deselect All")
 		layout.itemO("pose.select_inverse", text="Inverse")
 		layout.itemO("pose.select_constraint_target", text="Constraint Target")
+		layout.itemO("pose.select_linked", text="Linked")
 		
 		layout.itemS()
 		
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 2673640b213..a4a518bc003 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -125,9 +125,8 @@ void ED_armature_enter_posemode(bContext *C, Base *base)
 	
 	switch (ob->type){
 		case OB_ARMATURE:
-			
+			ob->restore_mode = ob->mode;
 			ob->mode |= OB_MODE_POSE;
-			base->flag= ob->flag;
 			
 			WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_POSE, NULL);
 			
@@ -136,7 +135,7 @@ void ED_armature_enter_posemode(bContext *C, Base *base)
 			return;
 	}
 
-	ED_object_toggle_modes(C, ob->mode);
+	//ED_object_toggle_modes(C, ob->mode);
 }
 
 void ED_armature_exit_posemode(bContext *C, Base *base)
@@ -144,8 +143,8 @@ void ED_armature_exit_posemode(bContext *C, Base *base)
 	if(base) {
 		Object *ob= base->object;
 		
+		ob->restore_mode = ob->mode;
 		ob->mode &= ~OB_MODE_POSE;
-		base->flag= ob->flag;
 		
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
 	}	
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 9ef250d7963..9e61bbd3fb5 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -7247,7 +7247,7 @@ static EnumPropertyItem *object_mode_set_itemsf(bContext *C, PointerRNA *ptr, in
 
 static const char *object_mode_op_string(int mode)
 {
-	if(mode == OB_MODE_EDIT)
+	if(mode & OB_MODE_EDIT)
 		return "OBJECT_OT_editmode_toggle";
 	if(mode == OB_MODE_SCULPT)
 		return "SCULPT_OT_sculptmode_toggle";
@@ -7333,6 +7333,8 @@ void ED_object_toggle_modes(bContext *C, int mode)
 		WM_operator_name_call(C, "PAINT_OT_texture_paint_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 	if(mode & OB_MODE_PARTICLE_EDIT)
 		WM_operator_name_call(C, "PARTICLE_OT_particle_edit_toggle", WM_OP_EXEC_REGION_WIN, NULL);
+	if(mode & OB_MODE_POSE)
+		WM_operator_name_call(C, "OBJECT_OT_posemode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 }
 
 /* game property ops */
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 45b0ea41215..a633969d557 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -1551,12 +1551,18 @@ static char *view3d_modeselect_pup(Scene *scene)
 	if(ob==NULL) return string;
 	
 	/* if active object is editable */
-	if ( ((ob->type == OB_MESH) || (ob->type == OB_ARMATURE)
+	if ( ((ob->type == OB_MESH)
 		|| (ob->type == OB_CURVE) || (ob->type == OB_SURF) || (ob->type == OB_FONT)
 		|| (ob->type == OB_MBALL) || (ob->type == OB_LATTICE))) {
 		
 		str += sprintf(str, formatstr, "Edit Mode", OB_MODE_EDIT, ICON_EDITMODE_HLT);
 	}
+	else if (ob->type == OB_ARMATURE) {
+		if (ob->mode & OB_MODE_POSE)
+			str += sprintf(str, formatstr, "Edit Mode", OB_MODE_EDIT|OB_MODE_POSE, ICON_EDITMODE_HLT);
+		else
+			str += sprintf(str, formatstr, "Edit Mode", OB_MODE_EDIT, ICON_EDITMODE_HLT);
+	}
 
 	if (ob->type == OB_MESH) {
 
@@ -1715,6 +1721,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 		WM_operator_properties_create(&props_ptr, "OBJECT_OT_mode_set");
 		RNA_enum_set(&props_ptr, "mode", v3d->modeselect);
 		WM_operator_name_call(C, "OBJECT_OT_mode_set", WM_OP_EXEC_REGION_WIN, &props_ptr);
+		WM_operator_properties_free(&props_ptr);
 		break;		
 	case B_AROUND:
 // XXX		handle_view3d_around(); /* copies to other 3d windows */
@@ -2179,7 +2186,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 		uiDefIconBut(block, BUT, B_VIEWRENDER, ICON_SCENE, xco,yco,XIC,YIC, NULL, 0, 1.0, 0, 0, "Render this window (Ctrl Click for anim)");
 		
 		if (ob && (ob->mode & OB_MODE_POSE)) {
-			xco+= XIC;
+			xco+= XIC*2;
 			uiBlockBeginAlign(block);
 			
 			uiDefIconButO(block, BUT, "POSE_OT_copy", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco,yco,XIC,YIC, NULL);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index b51fcfddc47..c7011777dbf 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -91,10 +91,12 @@ wmOperatorType *WM_operatortype_find(const char *idname, int quiet)
 	
 	char idname_bl[OP_MAX_TYPENAME]; // XXX, needed to support python style names without the _OT_ syntax
 	WM_operator_bl_idname(idname_bl, idname);
-
-	for(ot= global_ops.first; ot; ot= ot->next) {
-		if(strncmp(ot->idname, idname_bl, OP_MAX_TYPENAME)==0)
-		   return ot;
+	
+	if (idname_bl[0]) {
+		for(ot= global_ops.first; ot; ot= ot->next) {
+			if(strncmp(ot->idname, idname_bl, OP_MAX_TYPENAME)==0)
+			   return ot;
+		}
 	}
 	
 	if(!quiet)
@@ -109,10 +111,12 @@ wmOperatorType *WM_operatortype_exists(const char *idname)
 	
 	char idname_bl[OP_MAX_TYPENAME]; // XXX, needed to support python style names without the _OT_ syntax
 	WM_operator_bl_idname(idname_bl, idname);
-
-	for(ot= global_ops.first; ot; ot= ot->next) {
-		if(strncmp(ot->idname, idname_bl, OP_MAX_TYPENAME)==0)
-		   return ot;
+	
+	if(idname_bl[0]) {
+		for(ot= global_ops.first; ot; ot= ot->next) {
+			if(strncmp(ot->idname, idname_bl, OP_MAX_TYPENAME)==0)
+			   return ot;
+		}
 	}
 	return NULL;
 }
@@ -322,21 +326,25 @@ void WM_operator_py_idname(char *to, const char *from)
 /* some.op -> SOME_OT_op */
 void WM_operator_bl_idname(char *to, const char *from)
 {
-	char *sep= strchr(from, '.');
+	if (from) {
+		char *sep= strchr(from, '.');
 
-	if(sep) {
-		int i, ofs= (sep-from);
+		if(sep) {
+			int i, ofs= (sep-from);
 
-		for(i=0; i<ofs; i++)
-			to[i]= toupper(from[i]);
+			for(i=0; i<ofs; i++)
+				to[i]= toupper(from[i]);
 
-		BLI_strncpy(to+ofs, "_OT_", OP_MAX_TYPENAME);
-		BLI_strncpy(to+(ofs+4), sep+1, OP_MAX_TYPENAME);
-	}
-	else {
-		/* should not happen but support just incase */
-		BLI_strncpy(to, from, OP_MAX_TYPENAME);
+			BLI_strncpy(to+ofs, "_OT_", OP_MAX_TYPENAME);
+			BLI_strncpy(to+(ofs+4), sep+1, OP_MAX_TYPENAME);
+		}
+		else {
+			/* should not happen but support just incase */
+			BLI_strncpy(to, from, OP_MAX_TYPENAME);
+		}
 	}
+	else
+		to[0]= 0;
 }
 
 /* print a string representation of the operator, with the args that it runs 

From fab4bf0816834744664858cdcca96792a6225ca3 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 8 Sep 2009 03:29:28 +0000
Subject: [PATCH 476/577] Re-commit previous brush ui changes.

Strangely seemed to get reverted in jahka's rev. 22861
---
 release/ui/space_view3d_toolbar.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 43772f7a072..63eceb66ff6 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -357,10 +357,8 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 			col = layout.column(align=True)
 			col.item_enumR(settings, "tool", 'DRAW')
 			col.item_enumR(settings, "tool", 'SOFTEN')
-			if settings.use_projection:
-				col.item_enumR(settings, "tool", 'CLONE')
-			else:
-				col.item_enumR(settings, "tool", 'SMEAR')
+			col.item_enumR(settings, "tool", 'CLONE')
+			col.item_enumR(settings, "tool", 'SMEAR')
 				
 			col = layout.column()
 			col.itemR(brush, "color", text="")
@@ -546,9 +544,17 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel):
 
 # ********** default tools for texturepaint ****************
 
-class VIEW3D_PT_tools_texturepaint(View3DPanel):
-	__context__ = "texturepaint"
-	__label__ = "Options"
+class VIEW3D_PT_tools_projectpaint(View3DPanel):
+	__context__ = "projectpaint"
+	__label__ = "Project Paint"
+
+	def poll(self, context): 	 
+		return context.tool_settings.image_paint.tool != 'SMEAR' 	 
+
+	def draw_header(self, context): 	 
+		layout = self.layout 	 
+		ipaint = context.tool_settings.image_paint 	 
+		layout.itemR(ipaint, "use_projection", text="")
 
 	def draw(self, context):
 		layout = self.layout
@@ -558,7 +564,6 @@ class VIEW3D_PT_tools_texturepaint(View3DPanel):
 		use_projection= ipaint.use_projection
 		
 		col = layout.column()
-		col.itemR(ipaint, "use_projection")
 		sub = col.column()
 		sub.active = use_projection
 		sub.itemR(ipaint, "use_occlude")
@@ -670,5 +675,5 @@ bpy.types.register(VIEW3D_PT_tools_brush_curve)
 bpy.types.register(VIEW3D_PT_sculpt_options)
 bpy.types.register(VIEW3D_PT_tools_vertexpaint)
 bpy.types.register(VIEW3D_PT_tools_weightpaint)
-bpy.types.register(VIEW3D_PT_tools_texturepaint)
+bpy.types.register(VIEW3D_PT_tools_projectpaint)
 bpy.types.register(VIEW3D_PT_tools_particlemode)

From 1d0a567023d89b4e397800eeb164512b40336184 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 8 Sep 2009 07:35:07 +0000
Subject: [PATCH 477/577] Curve/Surface Editing

- rename "Nurb" to "Spline" in RNA, eg. bpy.data.curves[0].splines[2].type == 'NURBS'
  from a user perspective spline is a more generic term while Nurb is misleading when used for beziers and poly lines.

- added curve.active_spline property so the python UI can display the last selected curve.

- set the active spline when entering editmode (uses first selected spline)

- added back Hide Handles as a curve property (removed the global flag), access from the view panel in editmode.

- added hide normal option for curve, normal size access for curve and mesh display.

- changing orderU/V, endpoints, cyclic, bezierU/V now work in editmode and calls update functions.

- entering editmode was crashing with text objects

- curve.switch_direction() crashed (own fault from last commit)

- Tkey for tilt was overridden by Toolbar, made Tilt Ctrl+T.

- OBJECT_OT_mode_set check for compatible modes before running - so curves dont try go into paint mode with V key for eg.
---
 release/ui/buttons_data_curve.py              |  69 +++++++-----
 release/ui/space_view3d.py                    |  24 ++++
 release/ui/space_view3d_toolbar.py            |   1 +
 source/blender/blenkernel/BKE_global.h        |   1 -
 source/blender/editors/curve/curve_ops.c      |   2 +-
 source/blender/editors/curve/editcurve.c      |  94 ++++++++++------
 source/blender/editors/include/ED_anim_api.h  |   3 -
 source/blender/editors/object/object_edit.c   |  44 +++++++-
 .../blender/editors/space_info/info_stats.c   |   2 +-
 .../blender/editors/space_view3d/drawobject.c |  28 +++--
 .../editors/space_view3d/view3d_select.c      |  17 ++-
 .../editors/transform/transform_conversions.c |  17 +--
 .../editors/transform/transform_manipulator.c |   2 +-
 source/blender/makesdna/DNA_curve_types.h     |  14 ++-
 source/blender/makesrna/intern/rna_curve.c    | 104 +++++++++++++++---
 source/blender/makesrna/intern/rna_scene.c    |   7 ++
 16 files changed, 310 insertions(+), 119 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 46311493ad3..95f9a98da74 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -15,6 +15,14 @@ class DataButtonsPanelCurve(DataButtonsPanel):
 	'''
 	def poll(self, context):
 		return (context.object and context.object.type == 'CURVE' and context.curve)
+		
+class DataButtonsPanelActive(DataButtonsPanel):
+	'''
+	Same as above but for curves only
+	'''
+	def poll(self, context):
+		curve = context.curve
+		return (curve and curve.active_spline)
 
 class DATA_PT_context_curve(DataButtonsPanel):
 	__show_header__ = False
@@ -46,11 +54,11 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 		space = context.space_data
 		is_surf = (ob.type == 'SURFACE')
 
-		row = layout.row()
-		row.itemR(curve, "curve_2d")			
-		row.itemR(curve, "use_twist_correction")
+		if not is_surf:
+			row = layout.row()
+			row.itemR(curve, "curve_2d")			
+			row.itemR(curve, "use_twist_correction")
 		
-							
 		split = layout.split()
 		
 		col = split.column()
@@ -132,64 +140,71 @@ class DATA_PT_pathanim(DataButtonsPanelCurve):
 		col.itemR(curve, "use_stretch")
 		col.itemR(curve, "use_time_offset", text="Offset Children")
 	
-class DATA_PT_current_curve(DataButtonsPanel):
-	__label__ = "Current Curve"
+class DATA_PT_active_spline(DataButtonsPanelActive):
+	__label__ = "Active Spline"
 
 	def draw(self, context):
 		layout = self.layout
 		
 		ob = context.object
-		currentcurve = context.curve.curves[0] # XXX
+		curve = context.curve
+		act_spline = curve.active_spline
 		is_surf = (ob.type == 'SURFACE')
 		
 		split = layout.split()
 		
 		col = split.column()
 		col.itemL(text="Cyclic:")
-		if currentcurve.type == 'NURBS':
+		if act_spline.type == 'NURBS':
 			col.itemL(text="Bezier:")
 			col.itemL(text="Endpoint:")
 			col.itemL(text="Order:")
 		col.itemL(text="Resolution:")
 		
-		
 		col = split.column()
-		col.itemR(currentcurve, "cyclic_u", text="U")
+		col.itemR(act_spline, "cyclic_u", text="U")
 		
-		if currentcurve.type == 'NURBS':
+		if act_spline.type == 'NURBS':
 			sub = col.column()
-			sub.active = (not currentcurve.cyclic_u)
-			sub.itemR(currentcurve, "bezier_u", text="U")
-			sub.itemR(currentcurve, "endpoint_u", text="U")
+			sub.active = (not act_spline.cyclic_u)
+			sub.itemR(act_spline, "bezier_u", text="U")
+			sub.itemR(act_spline, "endpoint_u", text="U")
 			
 			sub = col.column()
-			sub.itemR(currentcurve, "order_u", text="U")
-		col.itemR(currentcurve, "resolution_u", text="U")
+			sub.itemR(act_spline, "order_u", text="U")
+		col.itemR(act_spline, "resolution_u", text="U")
 		
 		if is_surf:
 			col = split.column()
-			col.itemR(currentcurve, "cyclic_v", text="V")
+			col.itemR(act_spline, "cyclic_v", text="V")
 			
 			# its a surface, assume its a nurb.
 			sub = col.column()
-			sub.active = (not currentcurve.cyclic_v)
-			sub.itemR(currentcurve, "bezier_v", text="V")
-			sub.itemR(currentcurve, "endpoint_v", text="V")
+			sub.active = (not act_spline.cyclic_v)
+			sub.itemR(act_spline, "bezier_v", text="V")
+			sub.itemR(act_spline, "endpoint_v", text="V")
 			sub = col.column()
-			sub.itemR(currentcurve, "resolution_v", text="V")
-			sub.itemR(currentcurve, "order_v", text="V")
+			sub.itemR(act_spline, "order_v", text="V")
+			sub.itemR(act_spline, "resolution_v", text="V")
+
+		
+		if not is_surf:
+			split = layout.split()
+			col = split.column()
+			col.active = (not curve.curve_2d)
+			
+			col.itemL(text="Interpolation:")
+			col.itemR(act_spline, "tilt_interpolation", text="Tilt")
+			col.itemR(act_spline, "radius_interpolation", text="Radius")
 		
 		
 		split = layout.split()
 		col = split.column()
-		col.itemL(text="Interpolation:")
-		col.itemR(currentcurve, "tilt_interpolation", text="Tilt")
-		col.itemR(currentcurve, "radius_interpolation", text="Radius")
-		col.itemR(currentcurve, "smooth")
+		col.itemR(act_spline, "smooth")
 		
 		
 bpy.types.register(DATA_PT_context_curve)
 bpy.types.register(DATA_PT_shape_curve)
 bpy.types.register(DATA_PT_geometry_curve)
 bpy.types.register(DATA_PT_pathanim)
-bpy.types.register(DATA_PT_current_curve)
+bpy.types.register(DATA_PT_active_spline)
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 4281ff2ccab..bc133cbff48 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -1209,12 +1209,35 @@ class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
 		col.itemL(text="Normals:")
 		col.itemR(mesh, "draw_normals", text="Face")
 		col.itemR(mesh, "draw_vertex_normals", text="Vertex")
+		col.itemR(context.scene.tool_settings, "normal_size", text="Normal Size")
 		
 		col.itemS()
 		col.itemL(text="Numerics:")
 		col.itemR(mesh, "draw_edge_lenght")
 		col.itemR(mesh, "draw_edge_angle")
 		col.itemR(mesh, "draw_face_area")
+
+
+class VIEW3D_PT_3dview_curvedisplay(bpy.types.Panel):
+	__space_type__ = 'VIEW_3D'
+	__region_type__ = 'UI'
+	__label__ = "Curve Display"
+
+	def poll(self, context):
+		editmesh = context.mode == 'EDIT_CURVE'
+		return (editmesh)
+
+	def draw(self, context):
+		layout = self.layout
+
+		curve = context.active_object.data
+		
+		col = layout.column()
+		col.itemL(text="Overlays:")
+		col.itemR(curve, "draw_handles", text="Handles")
+		col.itemR(curve, "draw_normals", text="Normals")
+		col.itemR(context.scene.tool_settings, "normal_size", text="Normal Size")
+		
 	
 class VIEW3D_PT_background_image(bpy.types.Panel):
 	__space_type__ = 'VIEW_3D'
@@ -1326,4 +1349,5 @@ bpy.types.register(VIEW3D_MT_edit_ARMATURE_roll)
 bpy.types.register(VIEW3D_PT_3dview_properties) # Panels
 bpy.types.register(VIEW3D_PT_3dview_display)
 bpy.types.register(VIEW3D_PT_3dview_meshdisplay)
+bpy.types.register(VIEW3D_PT_3dview_curvedisplay)
 bpy.types.register(VIEW3D_PT_background_image)
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 63eceb66ff6..73f97dec750 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -107,6 +107,7 @@ class VIEW3D_PT_tools_curveedit(View3DPanel):
 		col.itemO("curve.delete")
 		col.itemO("curve.cyclic_toggle")
 		col.itemO("curve.switch_direction")
+		col.itemO("curve.spline_type_set")
 		
 		layout.itemL(text="Modeling:")
 
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 6323258ff43..5d0b89220d5 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -119,7 +119,6 @@ typedef struct Global {
 #define G_GREASEPENCIL 	(1 << 17)
 
 /* #define G_AUTOMATKEYS	(1 << 30)   also removed */
-#define G_HIDDENHANDLES (1 << 31) /* used for curves only */
 
 /* G.fileflags */
 
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index d3bcdcb69bb..a242e424aa0 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -233,7 +233,7 @@ void ED_keymap_curve(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "CURVE_OT_delete", DELKEY, KM_PRESS, 0, 0);
 
 	WM_keymap_add_item(keymap, "CURVE_OT_tilt_clear", TKEY, KM_PRESS, KM_ALT, 0);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TFM_OT_transform", TKEY, KM_PRESS, 0, 0)->ptr, "mode", TFM_TILT);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TFM_OT_transform", TKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", TFM_TILT);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", 1);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, 0, 0)->ptr, "type", 3);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", VKEY, KM_PRESS, 0, 0)->ptr, "type", 2);
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 871f00a585c..e346ccafde3 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -86,9 +86,6 @@
 /* still need to eradicate a few :( */
 #define callocstructN(x,y,name) (x*)MEM_callocN((y)* sizeof(x),name)
 
-/* for curve objects in editmode that can have hidden handles  */
-#define BEZSELECTED_HIDDENHANDLES(bezt)   ((G.f & G_HIDDENHANDLES) ? (bezt)->f2 & SELECT : BEZSELECTED(bezt))
-
 float nurbcircle[8][2]= {
 	{0.0, -1.0}, {-1.0, -1.0}, {-1.0, 0.0}, {-1.0,  1.0},
 	{0.0,  1.0}, { 1.0,  1.0}, { 1.0, 0.0}, { 1.0, -1.0}
@@ -213,7 +210,7 @@ int isNurbsel(Nurb *nu)
 	return 0;
 }
 
-int isNurbsel_count(Nurb *nu)
+int isNurbsel_count(Curve *cu, Nurb *nu)
 {
 	BezTriple *bezt;
 	BPoint *bp;
@@ -223,7 +220,7 @@ int isNurbsel_count(Nurb *nu)
 		bezt= nu->bezt;
 		a= nu->pntsu;
 		while(a--) {
-			if (BEZSELECTED_HIDDENHANDLES(bezt)) sel++;
+			if (BEZSELECTED_HIDDENHANDLES(cu, bezt)) sel++;
 			bezt++;
 		}
 	}
@@ -269,6 +266,8 @@ void load_editNurb(Object *obedit)
 
 	if(obedit==NULL) return;
 
+	set_actNurb(obedit, NULL);
+
 	if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
 		Curve *cu= obedit->data;
 		Nurb *nu, *newnu;
@@ -314,11 +313,13 @@ void load_editNurb(Object *obedit)
 void make_editNurb(Object *obedit)
 {
 	ListBase *editnurb= curve_get_editcurve(obedit);
-	Nurb *nu, *newnu;
+	Nurb *nu, *newnu, *nu_act= NULL;
 	KeyBlock *actkey;
 
 	if(obedit==NULL) return;
 
+	set_actNurb(obedit, NULL);
+
 	if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
 		Curve *cu= obedit->data;
 		
@@ -334,6 +335,12 @@ void make_editNurb(Object *obedit)
 			newnu= duplicateNurb(nu);
 			test2DNurb(newnu);	// after join, or any other creation of curve
 			BLI_addtail(editnurb, newnu);
+
+			if (nu_act == NULL && isNurbsel(nu)) {
+				nu_act= newnu;
+				set_actNurb(obedit, newnu);
+			}
+
 			nu= nu->next;
 		}
 		
@@ -343,8 +350,6 @@ void make_editNurb(Object *obedit)
 			key_to_curve(actkey, cu, editnurb);
 		}
 	}
-	
-	set_actNurb(obedit, NULL);
 }
 
 void free_editNurb(Object *obedit)
@@ -1609,6 +1614,7 @@ void CURVE_OT_select_all_toggle(wmOperatorType *ot)
 static int hide_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
 	BPoint *bp;
@@ -1621,11 +1627,11 @@ static int hide_exec(bContext *C, wmOperator *op)
 			a= nu->pntsu;
 			sel= 0;
 			while(a--) {
-				if(invert == 0 && BEZSELECTED_HIDDENHANDLES(bezt)) {
+				if(invert == 0 && BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
 					select_beztriple(bezt, DESELECT, 1, HIDDEN);
 					bezt->hide= 1;
 				}
-				else if(invert && !BEZSELECTED_HIDDENHANDLES(bezt)) {
+				else if(invert && !BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
 					select_beztriple(bezt, DESELECT, 1, HIDDEN);
 					bezt->hide= 1;
 				}
@@ -1739,6 +1745,7 @@ void CURVE_OT_reveal(wmOperatorType *ot)
 static int select_inverse_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
 	BPoint *bp;
@@ -1752,7 +1759,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
 			while(a--) {
 				if(bezt->hide==0) {
 					bezt->f2 ^= SELECT; /* always do the center point */
-					if ((G.f & G_HIDDENHANDLES)==0) {
+					if((cu->drawflag & CU_HIDE_HANDLES)==0) {
 						bezt->f1 ^= SELECT;
 						bezt->f3 ^= SELECT;
 					}
@@ -1803,6 +1810,7 @@ void CURVE_OT_select_inverse(wmOperatorType *ot)
 static int subdivide_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
 	BezTriple *prevbezt, *bezt, *beztnew, *beztn;
@@ -1832,7 +1840,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 				bezt= prevbezt+1;
 			}
 			while(a--) {
-				if( BEZSELECTED_HIDDENHANDLES(prevbezt) && BEZSELECTED_HIDDENHANDLES(bezt) ) amount++;
+				if( BEZSELECTED_HIDDENHANDLES(cu, prevbezt) && BEZSELECTED_HIDDENHANDLES(cu, bezt) ) amount++;
 				prevbezt= bezt;
 				bezt++;
 			}
@@ -1856,7 +1864,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 					memcpy(beztn, prevbezt, sizeof(BezTriple));
 					beztn++;
 
-					if( BEZSELECTED_HIDDENHANDLES(prevbezt) && BEZSELECTED_HIDDENHANDLES(bezt) ) {
+					if( BEZSELECTED_HIDDENHANDLES(cu, prevbezt) && BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 						memcpy(beztn, bezt, sizeof(BezTriple));
 						
 						/* midpoint subdividing */
@@ -2351,14 +2359,14 @@ static int convertspline(short type, Nurb *nu)
 		}
 	}
 	else if(nu->type == CU_BEZIER) {	/* Bezier */
-		if(type==0 || type==4) {	    /* to Poly or Nurb */
+		if(type==CU_POLY || type==CU_NURBS) {
 			nr= 3*nu->pntsu;
 			nu->bp = MEM_callocN(nr * sizeof(BPoint), "setsplinetype");
 			a= nu->pntsu;
 			bezt= nu->bezt;
 			bp= nu->bp;
 			while(a--) {
-				if(type==0 && bezt->h1==HD_VECT && bezt->h2==HD_VECT) {
+				if(type==CU_POLY && bezt->h1==HD_VECT && bezt->h2==HD_VECT) {
 					/* vector handle becomes 1 poly vertice */
 					VECCOPY(bp->vec, bezt->vec[1]);
 					bp->vec[3]= 1.0;
@@ -2383,15 +2391,15 @@ static int convertspline(short type, Nurb *nu)
 				bezt++;
 			}
 			MEM_freeN(nu->bezt); 
-			nu->bezt= 0;
+			nu->bezt= NULL;
 			nu->pntsu= nr;
 			nu->pntsv= 1;
 			nu->orderu= 4;
 			nu->orderv= 1;
-			nu->type |= type;
+			nu->type = type;
 			if(nu->flagu & CU_CYCLIC) c= nu->orderu-1; 
 			else c= 0;
-			if(type== 4) {
+			if(type== CU_NURBS) {
 				nu->flagu &= CU_CYCLIC; /* disable all flags except for cyclic */
 				nu->flagu += 4;
 				makeknots(nu, 1);
@@ -2464,7 +2472,15 @@ static int set_spline_type_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	return (changed)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
+	if(changed) {
+		DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
 }
 
 void CURVE_OT_spline_type_set(wmOperatorType *ot)
@@ -2472,8 +2488,8 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot)
 	static EnumPropertyItem type_items[]= {
 		{CU_POLY, "POLY", 0, "Poly", ""},
 		{CU_BEZIER, "BEZIER", 0, "Bezier", ""},
-		{CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
-		{CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""},
+//		{CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
+//		{CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""},
 		{CU_NURBS, "NURBS", 0, "NURBS", ""},
 		{0, NULL, 0, NULL, NULL}};
 
@@ -2483,6 +2499,7 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= set_spline_type_exec;
+	ot->invoke= WM_menu_invoke;
 	ot->poll= ED_operator_editcurve;
 	
 	/* flags */
@@ -2866,6 +2883,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 {
 	/* joins 2 curves */
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu, *nu1=0, *nu2=0;
 	BezTriple *bezt;
@@ -2881,8 +2899,8 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 		if( isNurbsel(nu) ) {
 		
 			if(nu->pntsu>1 && nu->pntsv>1) break;
-			if(isNurbsel_count(nu)>1) break;
-			if(isNurbsel_count(nu)==1) {
+			if(isNurbsel_count(cu, nu)>1) break;
+			if(isNurbsel_count(cu, nu)==1) {
 				/* only 1 selected, not first or last, a little complex, but intuitive */
 				if(nu->pntsv==1) {
 					if( (nu->bp->f1 & SELECT) || ((nu->bp+nu->pntsu-1)->f1 & SELECT));
@@ -2902,23 +2920,23 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				if(nu1==0) {
-					if( BEZSELECTED_HIDDENHANDLES(bezt) ) nu1= nu;
+					if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) nu1= nu;
 					else {
 						bezt= bezt+(nu->pntsu-1);
-						if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
+						if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 							nu1= nu;
 							switchdirectionNurb(nu);
 						}
 					}
 				}
 				else if(nu2==0) {
-					if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
+					if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 						nu2= nu;
 						switchdirectionNurb(nu);
 					}
 					else {
 						bezt= bezt+(nu->pntsu-1);
-						if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
+						if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 							nu2= nu;
 						}
 					}
@@ -3039,8 +3057,8 @@ void CURVE_OT_make_segment(wmOperatorType *ot)
 void mouse_nurb(bContext *C, short mval[2], int extend)
 {
 	Object *obedit= CTX_data_edit_object(C); 
-	ListBase *editnurb= curve_get_editcurve(obedit);
 	Curve *cu= obedit->data;
+	ListBase *editnurb= curve_get_editcurve(obedit);
 	ViewContext vc;
 	Nurb *nu;
 	BezTriple *bezt=0;
@@ -3417,12 +3435,13 @@ void CURVE_OT_vertex_add(wmOperatorType *ot)
 static int extrude_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
 	
 	/* first test: curve? */
 	for(nu= editnurb->first; nu; nu= nu->next)
-		if(nu->pntsv==1 && isNurbsel_count(nu)==1)
+		if(nu->pntsv==1 && isNurbsel_count(cu, nu)==1)
 			break;
 
 	if(obedit->type==OB_CURVE || nu) {
@@ -3473,6 +3492,7 @@ void CURVE_OT_extrude(wmOperatorType *ot)
 static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
 	BezTriple *bezt;
@@ -3496,7 +3516,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 				a= nu->pntsu;
 				bezt= nu->bezt;
 				while(a--) {
-					if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
+					if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 						nu->flagu ^= CU_CYCLIC;
 						break;
 					}
@@ -3674,8 +3694,8 @@ void CURVE_OT_select_linked(wmOperatorType *ot)
 static int select_row_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
-	ListBase *editnurb= curve_get_editcurve(obedit);
 	Curve *cu= obedit->data;
+	ListBase *editnurb= curve_get_editcurve(obedit);
 	static BPoint *last=0;
 	static int direction=0;
 	Nurb *nu;
@@ -4224,6 +4244,7 @@ void CURVE_OT_duplicate(wmOperatorType *ot)
 static int delete_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu, *next, *nu1;
 	BezTriple *bezt, *bezt1, *bezt2;
@@ -4250,7 +4271,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 				a= nu->pntsu;
 				if(a) {
 					while(a) {
-						if( BEZSELECTED_HIDDENHANDLES(bezt) );
+						if( BEZSELECTED_HIDDENHANDLES(cu, bezt) );
 						else break;
 						a--;
 						bezt++;
@@ -4295,7 +4316,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				for(a=0;a<nu->pntsu;a++) {
-					if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
+					if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 						memmove(bezt, bezt+1, (nu->pntsu-a-1)*sizeof(BezTriple));
 						nu->pntsu--;
 						a--;
@@ -4355,7 +4376,7 @@ static int delete_exec(bContext *C, wmOperator *op)
 			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				for(a=0; a<nu->pntsu-1; a++) {
-					if( BEZSELECTED_HIDDENHANDLES(bezt) ) {
+					if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
 						bezt1= bezt;
 						bezt2= bezt+1;
 						if( (bezt2->f1 & SELECT) || (bezt2->f2 & SELECT) || (bezt2->f3 & SELECT) ) ;
@@ -4706,7 +4727,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 		cent[2]-= obedit->obmat[3][2];
 		
 		if(rv3d) {
-			if (!(newname) || U.flag & USER_ADD_VIEWALIGNED || !rv3d)
+			if (!(newname) || U.flag & USER_ADD_VIEWALIGNED)
 				Mat3CpyMat4(imat, rv3d->viewmat);
 			else
 				Mat3One(imat);
@@ -5087,6 +5108,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 static int clear_tilt_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
+	Curve *cu= obedit->data;
 	ListBase *editnurb= curve_get_editcurve(obedit);
 	Nurb *nu;
 	BezTriple *bezt;
@@ -5098,7 +5120,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *op)
 			bezt= nu->bezt;
 			a= nu->pntsu;
 			while(a--) {
-				if(BEZSELECTED_HIDDENHANDLES(bezt)) bezt->alfa= 0.0;
+				if(BEZSELECTED_HIDDENHANDLES(cu, bezt)) bezt->alfa= 0.0;
 				bezt++;
 			}
 		}
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index af37cd87254..799829a6e87 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -433,9 +433,6 @@ void ED_nla_postop_refresh(bAnimContext *ac);
 
 /* ------------- Utility macros ----------------------- */
 
-/* checks if the given BezTriple is selected */
-#define BEZSELECTED(bezt) (((bezt)->f2 & SELECT) || ((bezt)->f1 & SELECT) || ((bezt)->f3 & SELECT))
-
 /* provide access to Keyframe Type info in BezTriple
  * NOTE: this is so that we can change it from being stored in 'hide'
  */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 9e61bbd3fb5..31a604a79df 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2756,13 +2756,12 @@ void OBJECT_OT_slowparent_clear(wmOperatorType *ot)
 }
 /* ******************** **************** */
 
-// XXX
-#define BEZSELECTED_HIDDENHANDLES(bezt)   ((G.f & G_HIDDENHANDLES) ? (bezt)->f2 & SELECT : BEZSELECTED(bezt))
 /* only in edit mode */
 void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
 {
 	EditVert *eve;
 	Base *base;
+	Curve *cu= obedit->data;
 	Nurb *nu;
 	BezTriple *bezt;
 	BPoint *bp;
@@ -2799,7 +2798,7 @@ void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
-					if(BEZSELECTED_HIDDENHANDLES(bezt)) {
+					if(BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
 						if(v1==0) v1= nr;
 						else if(v2==0) v2= nr;
 						else if(v3==0) v3= nr;
@@ -7264,6 +7263,43 @@ static const char *object_mode_op_string(int mode)
 	return NULL;
 }
 
+/* checks the mode to be set is compatible with the object
+ * should be made into a generic function */
+static int object_mode_set_compat(bContext *C, wmOperator *op, Object *ob)
+{
+	ObjectMode mode = RNA_enum_get(op->ptr, "mode");
+
+	if(ob) {
+		switch(ob->type) {
+		case OB_EMPTY:
+		case OB_LAMP:
+		case OB_CAMERA:
+			if(mode & OB_MODE_OBJECT)
+				return 1;
+			return 0;
+		case OB_MESH:
+			if(mode & (	OB_MODE_OBJECT|OB_MODE_EDIT|OB_MODE_SCULPT|OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT|OB_MODE_PARTICLE_EDIT))
+				return 1;
+			return 0;
+		case OB_CURVE:
+		case OB_SURF:
+		case OB_FONT:
+		case OB_MBALL:
+			if(mode & (OB_MODE_OBJECT|OB_MODE_EDIT))
+				return 1;
+			return 0;
+		case OB_LATTICE:
+			if(mode & (OB_MODE_OBJECT|OB_MODE_EDIT|OB_MODE_WEIGHT_PAINT))
+				return 1;
+		case OB_ARMATURE:
+			if(mode & (OB_MODE_OBJECT|OB_MODE_EDIT|OB_MODE_POSE))
+				return 1;
+		}
+	}
+
+	return 0;
+}
+
 static int object_mode_set_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_active_object(C);
@@ -7271,7 +7307,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 	ObjectMode restore_mode = ob->mode;
 	int toggle = RNA_boolean_get(op->ptr, "toggle");
 
-	if(!ob)
+	if(!ob || !object_mode_set_compat(C, op, ob))
 		return OPERATOR_CANCELLED;
 
 	/* Exit current mode if it's not the mode we're setting */
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index 7acebbdb72e..60cac0a00fa 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -184,7 +184,7 @@ static void stats_object_edit(Object *obedit, SceneStats *stats)
 			stats->totvert+=2;
 		}
 	}
-	else if ELEM3(obedit->type, OB_CURVE, OB_SURF, OB_FONT) {
+	else if ELEM(obedit->type, OB_CURVE, OB_SURF) { /* OB_FONT has no cu->editnurb */
 		/* Curve Edit */
 		Curve *cu= obedit->data;
 		Nurb *nu;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 220952d190f..001021e8d4b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1397,7 +1397,8 @@ void nurbs_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, Nurb
 				BezTriple *bezt = &nu->bezt[i];
 
 				if(bezt->hide==0) {
-					if (G.f & G_HIDDENHANDLES) {
+					
+					if(cu->drawflag & CU_HIDE_HANDLES) {
 						view3d_project_short_clip(vc->ar, bezt->vec[1], s);
 						if (s[0] != IS_CLIPPED)
 							func(userData, nu, NULL, bezt, 1, s[0], s[1]);
@@ -2797,7 +2798,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 		if(solid) {
 			dl= lb->first;
 			if(dl==NULL) return 1;
-			
+
 			if(dl->nors==0) addnormalsDispList(ob, lb);
 			index3_nors_incr= 0;
 			
@@ -2838,7 +2839,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 		}
 		break;
 	case OB_SURF:
-	
+
 		lb= &((Curve *)ob->data)->disp;
 		
 		if(solid) {
@@ -3877,14 +3878,14 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 unsigned int nurbcol[8]= {
 	0, 0x9090, 0x409030, 0x603080, 0, 0x40fff0, 0x40c033, 0xA090F0 };
 
-static void tekenhandlesN(Nurb *nu, short sel)
+static void tekenhandlesN(Nurb *nu, short sel, short hide_handles)
 {
 	BezTriple *bezt;
 	float *fp;
 	unsigned int *col;
 	int a;
 	
-	if(nu->hide || (G.f & G_HIDDENHANDLES)) return;
+	if(nu->hide || hide_handles) return;
 	
 	glBegin(GL_LINES); 
 	
@@ -3928,7 +3929,7 @@ static void tekenhandlesN(Nurb *nu, short sel)
 	glEnd();
 }
 
-static void tekenvertsN(Nurb *nu, short sel)
+static void tekenvertsN(Nurb *nu, short sel, short hide_handles)
 {
 	BezTriple *bezt;
 	BPoint *bp;
@@ -3951,7 +3952,7 @@ static void tekenvertsN(Nurb *nu, short sel)
 		a= nu->pntsu;
 		while(a--) {
 			if(bezt->hide==0) {
-				if (G.f & G_HIDDENHANDLES) {
+				if (hide_handles) {
 					if((bezt->f2 & SELECT)==sel) bglVertex3fv(bezt->vec[1]);
 				} else {
 					if((bezt->f1 & SELECT)==sel) bglVertex3fv(bezt->vec[0]);
@@ -4083,6 +4084,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	Curve *cu = ob->data;
 	Nurb *nu;
 	BevList *bl;
+	short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
 
 // XXX	retopo_matrix_update(v3d);
 
@@ -4095,22 +4097,24 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	/* first non-selected handles */
 	for(nu=nurb; nu; nu=nu->next) {
 		if(nu->type == CU_BEZIER) {
-			tekenhandlesN(nu, 0);
+			tekenhandlesN(nu, 0, hide_handles);
 		}
 	}
 	draw_editnurb(ob, nurb, 0);
 	draw_editnurb(ob, nurb, 1);
 	/* selected handles */
 	for(nu=nurb; nu; nu=nu->next) {
-		if(nu->type == CU_BEZIER) tekenhandlesN(nu, 1);
-		tekenvertsN(nu, 0);
+		if(nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES)==0)
+			tekenhandlesN(nu, 1, hide_handles);
+		tekenvertsN(nu, 0, hide_handles);
 	}
 	
 	if(v3d->zbuf) glEnable(GL_DEPTH_TEST);
 
 	/*	direction vectors for 3d curve paths
 		when at its lowest, dont render normals */
-	if(cu->flag & CU_3D && ts->normalsize > 0.0015) {
+	if(cu->flag & CU_3D && ts->normalsize > 0.0015 && (cu->drawflag & CU_HIDE_NORMALS)==0) {
+
 		UI_ThemeColor(TH_WIRE);
 		for (bl=cu->bev.first,nu=nurb; nu && bl; bl=bl->next,nu=nu->next) {
 			BevPoint *bevp= (BevPoint *)(bl+1);		
@@ -4145,7 +4149,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	if(v3d->zbuf) glDisable(GL_DEPTH_TEST);
 	
 	for(nu=nurb; nu; nu=nu->next) {
-		tekenvertsN(nu, 1);
+		tekenvertsN(nu, 1, hide_handles);
 	}
 	
 	if(v3d->zbuf) glEnable(GL_DEPTH_TEST); 
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 42954e09060..a7696d9fe31 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -549,13 +549,15 @@ static void do_lasso_select_mesh_uv(short mcords[][2], short moves, short select
 
 static void do_lasso_select_curve__doSelect(void *userData, Nurb *nu, BPoint *bp, BezTriple *bezt, int beztindex, int x, int y)
 {
-	struct { short (*mcords)[2]; short moves; short select; } *data = userData;
-
+	struct { ViewContext vc; short (*mcords)[2]; short moves; short select; } *data = userData;
+	
 	if (lasso_inside(data->mcords, data->moves, x, y)) {
 		if (bp) {
 			bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
 		} else {
-			if (G.f & G_HIDDENHANDLES) {
+			Curve *cu= data->vc.obedit->data;
+			
+			if (cu->drawflag & CU_HIDE_HANDLES) {
 				/* can only be beztindex==0 here since handles are hidden */
 				bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
 			} else {
@@ -573,9 +575,10 @@ static void do_lasso_select_curve__doSelect(void *userData, Nurb *nu, BPoint *bp
 
 static void do_lasso_select_curve(ViewContext *vc, short mcords[][2], short moves, short select)
 {
-	struct { short (*mcords)[2]; short moves; short select; } data;
+	struct { ViewContext vc; short (*mcords)[2]; short moves; short select; } data;
 
 	/* set vc->editnurb */
+	data.vc = *vc;
 	data.mcords = mcords;
 	data.moves = moves;
 	data.select = select;
@@ -1196,7 +1199,9 @@ static void do_nurbs_box_select__doSelect(void *userData, Nurb *nu, BPoint *bp,
 		if (bp) {
 			bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
 		} else {
-			if (G.f & G_HIDDENHANDLES) {
+			Curve *cu= data->vc.obedit->data;
+			
+			if (cu->drawflag & CU_HIDE_HANDLES) {
 				/* can only be beztindex==0 here since handles are hidden */
 				bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
 			} else {
@@ -1215,7 +1220,7 @@ static void do_nurbs_box_select(ViewContext *vc, rcti *rect, int select)
 {
 	struct { ViewContext vc; rcti *rect; int select; } data;
 	
-	data.vc= *vc;
+	data.vc = *vc;
 	data.rect = rect;
 	data.select = select;
 
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index d86eddd0a64..504563b797b 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1367,7 +1367,8 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 	int a;
 	int count=0, countsel=0;
 	int propmode = t->flag & T_PROP_EDIT;
-
+	short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
+	
 	/* to be sure */
 	if(cu->editnurb==NULL) return;
 
@@ -1376,7 +1377,7 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 		if(nu->type == CU_BEZIER) {
 			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
 				if(bezt->hide==0) {
-					if (G.f & G_HIDDENHANDLES) {
+					if (hide_handles) {
 						if(bezt->f2 & SELECT) countsel+=3;
 						if(propmode) count+= 3;
 					} else {
@@ -1417,13 +1418,13 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 					TransDataCurveHandleFlags *hdata = NULL;
 
 					if(		propmode ||
-							((bezt->f2 & SELECT) && (G.f & G_HIDDENHANDLES)) ||
-							((bezt->f1 & SELECT) && (G.f & G_HIDDENHANDLES)==0)
+							((bezt->f2 & SELECT) && hide_handles) ||
+							((bezt->f1 & SELECT) && hide_handles == 0)
 					  ) {
 						VECCOPY(td->iloc, bezt->vec[0]);
 						td->loc= bezt->vec[0];
 						VECCOPY(td->center, bezt->vec[1]);
-						if (G.f & G_HIDDENHANDLES) {
+						if (hide_handles) {
 							if(bezt->f2 & SELECT) td->flag= TD_SELECTED;
 							else td->flag= 0;
 						} else {
@@ -1478,13 +1479,13 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 						tail++;
 					}
 					if(		propmode ||
-							((bezt->f2 & SELECT) && (G.f & G_HIDDENHANDLES)) ||
-							((bezt->f3 & SELECT) && (G.f & G_HIDDENHANDLES)==0)
+							((bezt->f2 & SELECT) && hide_handles) ||
+							((bezt->f3 & SELECT) && hide_handles == 0)
 					  ) {
 						VECCOPY(td->iloc, bezt->vec[2]);
 						td->loc= bezt->vec[2];
 						VECCOPY(td->center, bezt->vec[1]);
-						if (G.f & G_HIDDENHANDLES) {
+						if (hide_handles) {
 							if(bezt->f2 & SELECT) td->flag= TD_SELECTED;
 							else td->flag= 0;
 						} else {
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 9fa20c2d674..93bc02d7180 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -260,7 +260,7 @@ int calc_manipulator_stats(const bContext *C)
 						 * if handles are hidden then only check the center points.
 						 * If 2 or more are selected then only use the center point too.
 						 */
-						if (G.f & G_HIDDENHANDLES) {
+						if (cu->drawflag & CU_HIDE_HANDLES) {
 							if (bezt->f2 & SELECT) {
 								calc_tw_center(scene, bezt->vec[1]);
 								totsel++;
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 8cf9fbbaf40..fe601eefa32 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -145,7 +145,7 @@ typedef struct Curve {
 	
 	struct BoundBox *bb;
 	
-	ListBase nurb;		/* actual data */
+	ListBase nurb;		/* actual data, called splines in rna */
 	ListBase disp;
 	
 	ListBase *editnurb;	/* edited data, not in file, use pointer so we can check for it */
@@ -163,7 +163,9 @@ typedef struct Curve {
 	float size[3];
 	float rot[3];
 
-	int texflag;
+	int texflag; /* keep an int because of give_obdata_texspace() */
+
+	short drawflag, pad[3];
 
 	short pathlen, totcol;
 	short flag, bevresol;
@@ -211,6 +213,10 @@ typedef struct Curve {
 /* texflag */
 #define CU_AUTOSPACE	1
 
+/* drawflag */
+#define CU_HIDE_HANDLES	(1 << 0)
+#define CU_HIDE_NORMALS	(1 << 1)
+
 /* flag */
 #define CU_3D			1
 #define CU_FRONT		2
@@ -289,6 +295,10 @@ typedef enum eBezTriple_KeyframeType {
 	BEZT_KEYTYPE_BREAKDOWN,		/* 'breakdown' keyframe */
 } eBezTriple_KeyframeType;
 
+/* checks if the given BezTriple is selected */
+#define BEZSELECTED(bezt) (((bezt)->f2 & SELECT) || ((bezt)->f1 & SELECT) || ((bezt)->f3 & SELECT))
+#define BEZSELECTED_HIDDENHANDLES(cu, bezt)   (((cu)->drawflag & CU_HIDE_HANDLES) ? (bezt)->f2 & SELECT : BEZSELECTED(bezt))
+
 /* *************** CHARINFO **************** */
 
 /* flag */
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 7de5976e12c..3fbdf7aaf7d 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -35,6 +35,8 @@
 
 #include "BKE_font.h"
 
+#include "WM_types.h"
+
 EnumPropertyItem beztriple_handle_type_items[] = {
 		{HD_FREE, "FREE", 0, "Free", ""},
 		{HD_AUTO, "AUTO", 0, "Auto", ""},
@@ -63,7 +65,6 @@ EnumPropertyItem beztriple_keyframe_type_items[] = {
 #include "BKE_main.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 StructRNA *rna_Curve_refine(PointerRNA *ptr)
 {
@@ -75,6 +76,22 @@ StructRNA *rna_Curve_refine(PointerRNA *ptr)
 	else return &RNA_Curve;
 }
 
+
+static PointerRNA rna_Curve_active_nurb_get(PointerRNA *ptr)
+{
+	Curve *cu= (Curve*)ptr->data;
+	Nurb *nu= NULL;
+
+	if(cu->editnurb)
+		nu = BLI_findlink(cu->editnurb, cu->actnu);
+
+	if(nu)
+		return rna_pointer_inherit_refine(ptr, &RNA_Nurb, nu);
+
+	return rna_pointer_inherit_refine(ptr, NULL, NULL);
+}
+
+
 static void rna_BezTriple_handle1_get(PointerRNA *ptr, float *values)
 {
 	BezTriple *bt= (BezTriple*)ptr->data;
@@ -145,18 +162,22 @@ static void rna_Curve_material_index_range(PointerRNA *ptr, int *min, int *max)
 static void rna_Curve_2d_set(PointerRNA *ptr, int value)
 {
 	Curve *cu= (Curve*)ptr->id.data;
-	Nurb *nu;
+	Nurb *nu= cu->editnurb ? cu->editnurb->first : cu->nurb.first;
 
 	if(value) {
 		cu->flag &= ~CU_3D;
-		for(nu= cu->nurb.first; nu; nu= nu->next) {
+		for( ; nu; nu= nu->next) {
 			nu->flag |= CU_2D;
 			test2DNurb(nu);
+
+			/* since the handles are moved they need to be auto-located again */
+			if(nu->type == CU_BEZIER)
+				calchandlesNurb(nu);
 		}
 	}
 	else {
 		cu->flag |=  CU_3D;
-		for(nu= cu->nurb.first; nu; nu= nu->next) {
+		for( ; nu; nu= nu->next) {
 			nu->flag &= ~CU_2D;
 		}
 	}
@@ -190,6 +211,39 @@ static void rna_Curve_update_data(bContext *C, PointerRNA *ptr)
 	DAG_id_flush_update(id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
 }
+
+static void rna_Nurb_update_handle_data(bContext *C, PointerRNA *ptr)
+{
+	Nurb *nu= (Nurb*)ptr->data;
+
+	if(nu->type == CU_BEZIER)
+		calchandlesNurb(nu);
+
+	rna_Curve_update_data(C, ptr);
+}
+
+static void rna_Nurb_update_knot_u(bContext *C, PointerRNA *ptr)
+{
+	Nurb *nu= (Nurb*)ptr->data;
+
+	clamp_nurb_order_u(nu);
+	makeknots(nu, 1);
+
+	rna_Curve_update_data(C, ptr);
+}
+
+static void rna_Nurb_update_knot_v(bContext *C, PointerRNA *ptr)
+{
+	Nurb *nu= (Nurb*)ptr->data;
+
+	clamp_nurb_order_v(nu);
+	makeknots(nu, 2);
+
+	rna_Curve_update_data(C, ptr);
+}
+
+
+
 #else
 
 static void rna_def_bpoint(BlenderRNA *brna)
@@ -615,10 +669,26 @@ static void rna_def_curve(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "key");
 	RNA_def_property_ui_text(prop, "Shape Keys", "");
 
-	prop= RNA_def_property(srna, "curves", PROP_COLLECTION, PROP_NONE);
+	prop= RNA_def_property(srna, "splines", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "nurb", NULL);
 	RNA_def_property_struct_type(prop, "Nurb");
-	RNA_def_property_ui_text(prop, "Curves", "Collection of curves in this curve data object.");
+	RNA_def_property_ui_text(prop, "Splines", "Collection of splines in this curve data object.");
+
+	prop= RNA_def_property(srna, "active_spline", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "Nurb");
+	RNA_def_property_pointer_funcs(prop, "rna_Curve_active_nurb_get", NULL, NULL);
+	RNA_def_property_ui_text(prop, "Active Spline", "The active editmode spline");
+
+
+	prop= RNA_def_property(srna, "draw_handles", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "drawflag", CU_HIDE_HANDLES);
+	RNA_def_property_ui_text(prop, "Draw Handles", "Display bezier handles in editmode.");
+	RNA_def_property_update(prop, NC_GEOM|ND_DATA, NULL);
+
+	prop= RNA_def_property(srna, "draw_normals", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "drawflag", CU_HIDE_NORMALS);
+	RNA_def_property_ui_text(prop, "Draw Normals", "Display 3D curve normals in editmode.");
+	RNA_def_property_update(prop, NC_GEOM|ND_DATA, NULL);
 
 	rna_def_path(brna, srna);
 	
@@ -738,18 +808,18 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	srna= RNA_def_struct(brna, "Nurb", NULL);
-	RNA_def_struct_ui_text(srna, "Nurb", "Element of a curve, either Nurb, Bezier or Polyline or a character with text objects.");
+	RNA_def_struct_ui_text(srna, "Spline", "Element of a curve, either Nurbs, Bezier or Polyline or a character with text objects.");
 
 	prop= RNA_def_property(srna, "points", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "bp", NULL);
 	RNA_def_property_struct_type(prop, "CurvePoint");
 	RNA_def_property_collection_funcs(prop, "rna_BPoint_array_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_Nurb_length", 0, 0, 0, 0);
-	RNA_def_property_ui_text(prop, "Points", "Collection of points for Poly and Nurbs curves.");
+	RNA_def_property_ui_text(prop, "Points", "Collection of points that make up this poly or nurbs spline.");
 
 	prop= RNA_def_property(srna, "bezier_points", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_struct_type(prop, "BezierCurvePoint");
 	RNA_def_property_collection_sdna(prop, NULL, "bezt", "pntsu");
-	RNA_def_property_ui_text(prop, "Bezier Points", "Collection of points bezier curves only.");
+	RNA_def_property_ui_text(prop, "Bezier Points", "Collection of points for bezier curves only.");
 
 	
 	prop= RNA_def_property(srna, "tilt_interpolation", PROP_ENUM, PROP_NONE);
@@ -787,14 +857,14 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "order_u", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "orderu");
 	RNA_def_property_range(prop, 2, 6);
-	RNA_def_property_ui_text(prop, "Order U", "Nurbs order in the U direction (For curves and surfaces), Higher values let points influence a greater area");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_ui_text(prop, "Order U", "Nurbs order in the U direction (For splines and surfaces), Higher values let points influence a greater area");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_u");
 
 	prop= RNA_def_property(srna, "order_v", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "orderv");
 	RNA_def_property_range(prop, 2, 6);
 	RNA_def_property_ui_text(prop, "Order V", "Nurbs order in the V direction (For surfaces only), Higher values let points influence a greater area");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v");
 
 
 	prop= RNA_def_property(srna, "resolution_u", PROP_INT, PROP_NONE);
@@ -812,7 +882,7 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "cyclic_u", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flagu", CU_CYCLIC);
 	RNA_def_property_ui_text(prop, "Cyclic U", "Make this curve or surface a closed loop in the U direction.");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_handle_data"); /* only needed for cyclic_u because cyclic_v cant do bezier */
 
 	prop= RNA_def_property(srna, "cyclic_v", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flagv", CU_CYCLIC);
@@ -824,22 +894,22 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "endpoint_u", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flagu", 2);
 	RNA_def_property_ui_text(prop, "Endpoint U", "Make this nurbs curve or surface meet the endpoints in the U direction (Cyclic U must be disabled).");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_u");
 
 	prop= RNA_def_property(srna, "endpoint_v", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flagv", 2);
 	RNA_def_property_ui_text(prop, "Endpoint V", "Make this nurbs surface meet the endpoints in the V direction (Cyclic V must be disabled).");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v");
 
 	prop= RNA_def_property(srna, "bezier_u", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flagu", 4);
 	RNA_def_property_ui_text(prop, "Bezier U", "Make this nurbs curve or surface act like a bezier spline in the U direction (Order U must be 3 or 4, Cyclic U must be disabled).");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_u");
 
 	prop= RNA_def_property(srna, "bezier_v", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flagv", 4);
 	RNA_def_property_ui_text(prop, "Bezier V", "Make this nurbs surface act like a bezier spline in the V direction (Order V must be 3 or 4, Cyclic V must be disabled).");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v");
 
 
 	prop= RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index bd29443646d..f196001cc9d 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -458,6 +458,13 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Proportional Editing Falloff", "Falloff type for proportional editing mode.");
 
+	prop= RNA_def_property(srna, "normal_size", PROP_FLOAT, PROP_DISTANCE);
+	RNA_def_property_float_sdna(prop, NULL, "normalsize");
+	RNA_def_property_ui_text(prop, "Normal Size", "Display size for normals in the 3D view.");
+	RNA_def_property_range(prop, 0.00001, 1000.0);
+	RNA_def_property_ui_range(prop, 0.01, 10.0, 0.1, 2);
+	RNA_def_property_update(prop, NC_GEOM|ND_DATA, NULL);
+
 	prop= RNA_def_property(srna, "automerge_editing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "automerge", 0);
 	RNA_def_property_ui_text(prop, "AutoMerge Editing", "Automatically merge vertices moved to the same location.");

From b9816c98bc0ffaa4992362aca0239c0f6832eccd Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 8 Sep 2009 08:15:56 +0000
Subject: [PATCH 478/577] * Volume render weaks/fixes/etc from Alfredo, after
 code review

- General correctness tweaks
- Light cache is enabled for all objects now
- Metaballs now give density info, for smooth falloff
---
 .../render/intern/source/convertblender.c     |  11 +-
 .../render/intern/source/volume_precache.c    |   6 +-
 .../blender/render/intern/source/volumetric.c | 160 ++++++++++++------
 3 files changed, 117 insertions(+), 60 deletions(-)

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 73ff826994a..99825c0c2ff 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3078,9 +3078,6 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 				}
 				need_nmap_tangent= 1;
 			}
-			
-			if (ma->material_type == MA_TYPE_VOLUME)
-				add_volume(re, obr, ma);
 		}
 	}
 
@@ -4273,7 +4270,7 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject *
 	ObjectRen *obr;
 	ObjectInstanceRen *obi;
 	ParticleSystem *psys;
-	int show_emitter, allow_render= 1, index, psysindex;
+	int show_emitter, allow_render= 1, index, psysindex, i;
 
 	index= (dob)? dob->index: 0;
 
@@ -4309,6 +4306,12 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject *
 		}
 		else
 			find_dupli_instances(re, obr);
+			
+		for (i=1; i<=ob->totcol; i++) {
+			Material* ma = give_render_material(re, ob, i);
+			if (ma && ma->material_type == MA_TYPE_VOLUME)
+				add_volume(re, obr, ma);
+		}
 	}
 
 	/* and one render object per particle system */
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index d5a54759332..15d8643fea4 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -430,13 +430,13 @@ static void *vol_precache_part(void *data)
 	const float stepsize = vol_get_stepsize(shi, STEPSIZE_VIEW);
 
 	for (z= pa->minz; z < pa->maxz; z++) {
-		co[2] = pa->bbmin[2] + (pa->voxel[2] * z);
+		co[2] = pa->bbmin[2] + (pa->voxel[2] * (z + 0.5f));
 		
 		for (y= pa->miny; y < pa->maxy; y++) {
-			co[1] = pa->bbmin[1] + (pa->voxel[1] * y);
+			co[1] = pa->bbmin[1] + (pa->voxel[1] * (y + 0.5f));
 			
 			for (x=pa->minx; x < pa->maxx; x++) {
-				co[0] = pa->bbmin[0] + (pa->voxel[0] * x);
+				co[0] = pa->bbmin[0] + (pa->voxel[0] * (x + 0.5f));
 				
 				// don't bother if the point is not inside the volume mesh
 				if (!point_inside_obi(tree, obi, co)) {
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 4fa31674bbe..bc425c8a1a3 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -44,6 +44,7 @@
 #include "DNA_material_types.h"
 #include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
+#include "DNA_meta_types.h"
 
 #include "BKE_global.h"
 
@@ -64,6 +65,11 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+/* luminance rec. 709 */
+inline float luminance(float* col)
+{
+	return (0.212671f*col[0] + 0.71516f*col[1] + 0.072169f*col[2]);
+}
 
 /* tracing */
 
@@ -211,13 +217,66 @@ static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, fl
 	scatter_col[2] = voxel_sample_trilinear(vp->data_b, vp->res, sample_co);
 }
 
+/* Meta object density, brute force for now 
+ * (might be good enough anyway, don't need huge number of metaobs to model volumetric objects */
+static float metadensity(Object* ob, float* co)
+{
+	float mat[4][4], imat[4][4], dens = 0.f;
+	MetaBall* mb = (MetaBall*)ob->data;
+	MetaElem* ml;
+	
+	/* transform co to meta-element */
+	float tco[3] = {co[0], co[1], co[2]};
+	Mat4MulMat4(mat, ob->obmat, R.viewmat);
+	Mat4Invert(imat, mat);
+	Mat4MulVecfl(imat, tco);
+	
+	for (ml = mb->elems.first; ml; ml=ml->next) {
+		float bmat[3][3], dist2;
+		
+		/* element rotation transform */
+		float tp[3] = {ml->x - tco[0], ml->y - tco[1], ml->z - tco[2]};
+		QuatToMat3(ml->quat, bmat);
+		Mat3Transp(bmat);	// rot.only, so inverse == transpose
+		Mat3MulVecfl(bmat, tp);
+		
+		/* MB_BALL default */
+		switch (ml->type) {
+			case MB_ELIPSOID:
+				tp[0] /= ml->expx, tp[1] /= ml->expy, tp[2] /= ml->expz;
+				break;
+			case MB_CUBE:
+				tp[2] = (tp[2] > ml->expz) ? (tp[2] - ml->expz) : ((tp[2] < -ml->expz) ? (tp[2] + ml->expz) : 0.f);
+				// no break, xy as plane
+			case MB_PLANE:
+				tp[1] = (tp[1] > ml->expy) ? (tp[1] - ml->expy) : ((tp[1] < -ml->expy) ? (tp[1] + ml->expy) : 0.f);
+				// no break, x as tube
+			case MB_TUBE:
+				tp[0] = (tp[0] > ml->expx) ? (tp[0] - ml->expx) : ((tp[0] < -ml->expx) ? (tp[0] + ml->expx) : 0.f);
+		}
+		
+		/* ml->rad2 is not set */
+		dist2 = 1.f - ((tp[0]*tp[0] + tp[1]*tp[1] + tp[2]*tp[2]) / (ml->rad*ml->rad));
+		if (dist2 > 0.f)
+			dens += (ml->flag & MB_NEGATIVE) ? -ml->s*dist2*dist2*dist2 : ml->s*dist2*dist2*dist2;
+	}
+	
+	dens -= mb->thresh;
+	return (dens < 0.f) ? 0.f : dens;
+}
+
 float vol_get_density(struct ShadeInput *shi, float *co)
 {
 	float density = shi->mat->vol.density;
 	float density_scale = shi->mat->vol.density_scale;
-	float col[3] = {0.0, 0.0, 0.0};
+		
+	do_volume_tex(shi, co, MAP_DENSITY, NULL, &density);
 	
-	do_volume_tex(shi, co, MAP_DENSITY, col, &density);
+	// if meta-object, modulate by metadensity without increasing it
+	if (shi->obi->obr->ob->type == OB_MBALL) {
+		const float md = metadensity(shi->obi->obr->ob, co);
+		if (md < 1.f) density *= md;
+ 	}
 	
 	return density * density_scale;
 }
@@ -260,7 +319,6 @@ void vol_get_absorption(ShadeInput *shi, float *absorb_col, float *co)
 	absorb_col[2] = (1.0f - absorb_col[2]) * absorption;
 }
 
-
 /* phase function - determines in which directions the light 
  * is scattered in the volume relative to incoming direction 
  * and view direction */
@@ -298,70 +356,66 @@ float vol_get_phasefunc(ShadeInput *shi, short phasefunc_type, float g, float *w
 	}
 }
 
-/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
- * Used in the relationship Transmittance = e^(-attenuation)
- */
-void vol_get_attenuation_seg(ShadeInput *shi, float *transmission, float stepsize, float *co, float density)
+/* Compute transmittance = e^(-attenuation) */
+void vol_get_transmittance_seg(ShadeInput *shi, float *tr, float stepsize, float *co, float density)
 {
 	/* input density = density at co */
 	float tau[3] = {0.f, 0.f, 0.f};
-	float absorb_col[3];
+	float absorb[3];
+	const float scatter_dens = vol_get_scattering_fac(shi, co) * density * stepsize;
 
-	vol_get_absorption(shi, absorb_col, co);
+	vol_get_absorption(shi, absorb, co);
 	
 	/* homogenous volume within the sampled distance */
-	tau[0] = stepsize * density * absorb_col[0];
-	tau[1] = stepsize * density * absorb_col[1];
-	tau[2] = stepsize * density * absorb_col[2];
+	tau[0] += scatter_dens * absorb[0];
+	tau[1] += scatter_dens * absorb[1];
+	tau[2] += scatter_dens * absorb[2];
 	
-	transmission[0] *= exp(-tau[0]);
-	transmission[1] *= exp(-tau[1]);
-	transmission[2] *= exp(-tau[2]);
+	tr[0] *= exp(-tau[0]);
+	tr[1] *= exp(-tau[1]);
+	tr[2] *= exp(-tau[2]);
 }
 
-/* Compute attenuation, otherwise known as 'optical thickness', extinction, or tau.
- * Used in the relationship Transmittance = e^(-attenuation)
- */
-void vol_get_attenuation(ShadeInput *shi, float *transmission, float *co, float *endco, float density, float stepsize)
+/* Compute transmittance = e^(-attenuation) */
+static void vol_get_transmittance(ShadeInput *shi, float *tr, float *co, float *endco)
 {
-	/* input density = density at co */
+	float p[3] = {co[0], co[1], co[2]};
+	float step_vec[3] = {endco[0] - co[0], endco[1] - co[1], endco[2] - co[2]};
+	//const float ambtau = -logf(shi->mat->vol.depth_cutoff);	// never zero
 	float tau[3] = {0.f, 0.f, 0.f};
-	float absorb_col[3];
-	int s, nsteps;
-	float step_vec[3], step_sta[3], step_end[3];
-	const float dist = VecLenf(co, endco);
 
-	vol_get_absorption(shi, absorb_col, co);
+	float t0 = 0.f;
+	float t1 = Normalize(step_vec);
+	float pt0 = t0;
+	
+	t0 += shi->mat->vol.shade_stepsize * ((shi->mat->vol.stepsize_type == MA_VOL_STEP_CONSTANT) ? 0.5f : BLI_thread_frand(shi->thread));
+	p[0] += t0 * step_vec[0];
+	p[1] += t0 * step_vec[1];
+	p[2] += t0 * step_vec[2];
+	VecMulf(step_vec, shi->mat->vol.shade_stepsize);
 
-	nsteps = (int)((dist / stepsize) + 0.5);
-	
-	VecSubf(step_vec, endco, co);
-	VecMulf(step_vec, 1.0f / nsteps);
-	
-	VecCopyf(step_sta, co);
-	VecAddf(step_end, step_sta, step_vec);
-	
-	for (s = 0;  s < nsteps; s++) {
-		if (s > 0)
-			density = vol_get_density(shi, step_sta);
+	for (; t0 < t1; pt0 = t0, t0 += shi->mat->vol.shade_stepsize) {
+		float absorb[3];
+		const float d = vol_get_density(shi, p);
+		const float stepd = (t0 - pt0) * d;
+		const float scatter_dens = vol_get_scattering_fac(shi, p) * stepd;
+		vol_get_absorption(shi, absorb, p);
 		
-		tau[0] += stepsize * density;
-		tau[1] += stepsize * density;
-		tau[2] += stepsize * density;
+		tau[0] += scatter_dens * absorb[0];
+		tau[1] += scatter_dens * absorb[1];
+		tau[2] += scatter_dens * absorb[2];
 		
-		if (s < nsteps-1) {
-			VecCopyf(step_sta, step_end);
-			VecAddf(step_end, step_end, step_vec);
-		}
+		//if (luminance(tau) >= ambtau) break;
+		VecAddf(p, p, step_vec);
 	}
-	VecMulVecf(tau, tau, absorb_col);
 	
-	transmission[0] *= exp(-tau[0]);
-	transmission[1] *= exp(-tau[1]);
-	transmission[2] *= exp(-tau[2]);
+	/* return transmittance */
+	tr[0] = expf(-tau[0]);
+	tr[1] = expf(-tau[1]);
+	tr[2] = expf(-tau[2]);
 }
 
-void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *lacol, float stepsize, float density)
+void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *lacol)
 {
 	float visifac, lv[3], lampdist;
 	float tr[3]={1.0,1.0,1.0};
@@ -383,7 +437,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
 	}
 
-	VecMulf(lacol, visifac*lar->energy);
+	VecMulf(lacol, visifac);
 
 	if (ELEM(lar->type, LA_SUN, LA_HEMI))
 		VECCOPY(lv, lar->vec);
@@ -411,7 +465,7 @@ void vol_shade_one_lamp(struct ShadeInput *shi, float *co, LampRen *lar, float *
 			} else
 				atten_co = hitco;
 			
-			vol_get_attenuation(shi, tr, co, atten_co, density, shade_stepsize);
+			vol_get_transmittance(shi, tr, co, atten_co);
 			
 			VecMulVecf(lacol, lacol, tr);
 		}
@@ -445,7 +499,7 @@ void vol_get_scattering(ShadeInput *shi, float *scatter_col, float *co, float st
 		lar= go->lampren;
 		
 		if (lar) {
-			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
+			vol_shade_one_lamp(shi, co, lar, lacol);
 			VecAddf(scatter_col, scatter_col, lacol);
 		}
 	}
@@ -490,7 +544,7 @@ static void volumeintegrate(struct ShadeInput *shi, float *col, float *co, float
 		if (density > 0.01f) {
 		
 			/* transmittance component (alpha) */
-			vol_get_attenuation_seg(shi, tr, stepsize, co, density);
+			vol_get_transmittance_seg(shi, tr, stepsize, co, density);
 
 			step_mid[0] = step_sta[0] + (stepvec[0] * 0.5);
 			step_mid[1] = step_sta[1] + (stepvec[1] * 0.5);
@@ -654,7 +708,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 	}
 	
 	density = vol_get_density(shi, startco);
-	vol_get_attenuation(shi, tr, startco, endco, density, shade_stepsize);
+	vol_get_transmittance(shi, tr, startco, endco);
 	
 	VecCopyf(shr->combined, tr);
 	shr->combined[3] = 1.0f -(0.2126*tr[0] + 0.7152*tr[1] + 0.0722*tr[2]);

From 5ce8b1f70476626aae9a5a818398cf9e55a679af Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Tue, 8 Sep 2009 09:41:15 +0000
Subject: [PATCH 479/577] 2.5 - FollowPath Constraint + File Loading Bugfix

* Added a new option ('Fixed Position') for Follow Path constraint which allows you to constrain an object/bone to some fixed position along the curve. Unlike the default mode of operation, this doesn't depend on time unless you explicitly animate the offset percentage parameter associated with this.

* Made old (pre 2.5) files saved with armatures in pose mode load in pose mode again.
---
 release/ui/buttons_object_constraint.py       | 14 ++++++++---
 source/blender/blenkernel/intern/constraint.c | 23 +++++++++++++------
 source/blender/blenloader/intern/readfile.c   |  6 +++++
 .../blender/makesdna/DNA_constraint_types.h   |  7 +++++-
 .../blender/makesrna/intern/rna_constraint.c  | 16 +++++++++++--
 5 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/release/ui/buttons_object_constraint.py b/release/ui/buttons_object_constraint.py
index cdc18e3545c..ff3231a9d61 100644
--- a/release/ui/buttons_object_constraint.py
+++ b/release/ui/buttons_object_constraint.py
@@ -121,9 +121,17 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 	def FOLLOW_PATH(self, layout, con):
 		self.target_template(layout, con)
 		
-		row = layout.row()
-		row.itemR(con, "curve_follow")
-		row.itemR(con, "offset")
+		split = layout.split()
+		
+		col = split.column()
+		col.itemR(con, "curve_follow")
+		
+		col = split.column()
+		col.itemR(con, "fixed_position")
+		if con.fixed_position:
+			col.itemR(con, "offset_percentage", text="Offset")
+		else:
+			col.itemR(con, "offset")
 		
 		row = layout.row()
 		row.itemL(text="Forward:")
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 0f7767a1808..dfbcc51a93c 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1178,17 +1178,26 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 			makeDispListCurveTypes(cob->scene, ct->tar, 0);
 		
 		if (cu->path && cu->path->data) {
-			curvetime= bsystem_time(cob->scene, ct->tar, (float)ctime, 0.0) - data->offset;
-			
-#if 0 // XXX old animation system
-			if (calc_ipo_spec(cu->ipo, CU_SPEED, &curvetime)==0) {
-				curvetime /= cu->pathlen;
+			if ((data->followflag & FOLLOWPATH_STATIC) == 0) { 
+				/* animated position along curve depending on time */
+				curvetime= bsystem_time(cob->scene, ct->tar, ctime, 0.0) - data->offset;
+				
+				/* ctime is now a proper var setting of Curve which gets set by Animato like any other var that's animated,
+				 * but this will only work if it actually is animated... 
+				 *
+				 * we firstly calculate the modulus of cu->ctime/cu->pathlen to clamp ctime within the 0.0 to 1.0 times pathlen
+				 * range, then divide this (the modulus) by pathlen to get a value between 0.0 and 1.0
+				 */
+				curvetime= fmod(cu->ctime, cu->pathlen) / cu->pathlen;
 				CLAMP(curvetime, 0.0, 1.0);
 			}
-#endif // XXX old animation system
+			else {
+				/* fixed position along curve */
+				curvetime= data->offset; // XXX might need a more sensible value
+			}
 			
 			if ( where_on_path(ct->tar, curvetime, vec, dir) ) {
-				if (data->followflag) {
+				if (data->followflag & FOLLOWPATH_FOLLOW) {
 					vectoquat(dir, (short) data->trackflag, (short) data->upflag, quat);
 					
 					Normalize(dir);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index db97657a2ee..618e587d674 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9596,6 +9596,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 	if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 2)) {
 		Scene *sce;
+		Object *ob;
 
 		for(sce = main->scene.first; sce; sce = sce->id.next) {
 			if(fd->fileflags & G_FILE_ENABLE_ALL_FRAMES)
@@ -9628,6 +9629,11 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 			sce->gm.flag |= GAME_DISPLAY_LISTS;
 		}
+		
+		for(ob = main->object.first; ob; ob = ob->id.next) {
+			if(ob->flag & 8192) // OB_POSEMODE = 8192
+				ob->mode |= OB_MODE_POSE;
+		}
 	}
 
 	/* put 2.50 compatibility code here until next subversion bump */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 6fab633b192..a92dc836197 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -64,7 +64,8 @@ typedef struct bConstraint {
 	float		enforce;	/* 	Amount of influence exherted by constraint (0.0-1.0) */
 	float		headtail;	/*	Point along subtarget bone where the actual target is. 0=head (default for all), 1=tail*/
 	int			pad;
-	struct Ipo *ipo;		/* local influence ipo or driver */
+	
+	struct Ipo *ipo;		/* local influence ipo or driver */ // XXX depreceated for 2.5... old animation system hack
 } bConstraint;
 
 
@@ -449,6 +450,10 @@ typedef enum B_CONSTRAINTCHANNEL_FLAG {
 #define TRACK_nY	0x04
 #define TRACK_nZ	0x05
 
+/* FollowPath flags */
+#define FOLLOWPATH_FOLLOW	0x01
+#define FOLLOWPATH_STATIC	0x02
+
 /* bTrackToConstraint->flags */
 #define TARGET_Z_UP 0x01
 
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index c09a71f752a..83f3042d8ee 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -871,9 +871,15 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update");
 
 	prop= RNA_def_property(srna, "offset", PROP_INT, PROP_TIME);
-	RNA_def_property_range(prop, -300000.0, 300000.f);
+	RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
 	RNA_def_property_ui_text(prop, "Offset", "Offset from the position corresponding to the time frame.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
+	
+	prop= RNA_def_property(srna, "offset_percentage", PROP_FLOAT, PROP_PERCENTAGE);
+	RNA_def_property_float_sdna(prop, NULL, "offset"); // XXX we might be better with another var or some hackery?
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Offset Percentage", "Percentage value defining target position along length of bone.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
 
 	prop= RNA_def_property(srna, "forward", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "trackflag");
@@ -888,8 +894,14 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
 
 	prop= RNA_def_property(srna, "curve_follow", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "followflag", 1);
+	RNA_def_property_boolean_sdna(prop, NULL, "followflag", FOLLOWPATH_FOLLOW);
 	RNA_def_property_ui_text(prop, "Follow Curve", "Object will follow the heading and banking of the curve.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
+	
+		// TODO: do we need to do some special trickery to get offset sane for this?
+	prop= RNA_def_property(srna, "fixed_position", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "followflag", FOLLOWPATH_STATIC);
+	RNA_def_property_ui_text(prop, "Fixed Position", "Object will stay locked to a single point somewhere along the length of the curve regardless of time.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
 }
 

From 31fec003a1ff611433992c4c7ebc03867afb8d0b Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Tue, 8 Sep 2009 11:14:36 +0000
Subject: [PATCH 480/577] Fix row/column order in matrix printout function.

---
 source/blender/python/generic/matrix.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/blender/python/generic/matrix.c b/source/blender/python/generic/matrix.c
index 37d06d0b531..edb6fb7af63 100644
--- a/source/blender/python/generic/matrix.c
+++ b/source/blender/python/generic/matrix.c
@@ -598,18 +598,18 @@ static PyObject *Matrix_repr(MatrixObject * self)
 		return NULL;
 	
 	BLI_strncpy(str,"",1024);
-	for(x = 0; x < self->rowSize; x++){
+	for(x = 0; x < self->colSize; x++){
 		sprintf(buffer, "[");
 		strcat(str,buffer);
-		for(y = 0; y < (self->colSize - 1); y++) {
-			sprintf(buffer, "%.6f, ", self->matrix[x][y]);
+		for(y = 0; y < (self->rowSize - 1); y++) {
+			sprintf(buffer, "%.6f, ", self->matrix[y][x]);
 			strcat(str,buffer);
 		}
-		if(x < (self->rowSize-1)){
-			sprintf(buffer, "%.6f](matrix [row %d])\n", self->matrix[x][y], x);
+		if(x < (self->colSize-1)){
+			sprintf(buffer, "%.6f](matrix [row %d])\n", self->matrix[y][x], x);
 			strcat(str,buffer);
 		}else{
-			sprintf(buffer, "%.6f](matrix [row %d])", self->matrix[x][y], x);
+			sprintf(buffer, "%.6f](matrix [row %d])", self->matrix[y][x], x);
 			strcat(str,buffer);
 		}
 	}
@@ -703,7 +703,7 @@ static int Matrix_ass_item(MatrixObject * self, int i, PyObject * ob)
 		return -1;
 	
 	if(i >= self->rowSize || i < 0){
-		PyErr_SetString(PyExc_TypeError, "matrix[attribute] = x: bad row\n");
+		PyErr_SetString(PyExc_TypeError, "matrix[attribute] = x: bad column\n");
 		return -1;
 	}
 

From ee78c63beea4e68a4211f218c67357610003e488 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Tue, 8 Sep 2009 11:31:15 +0000
Subject: [PATCH 481/577] Text UI

*Added Text Boxes panel, currently only shows the first textbox. Needs operators for adding/removing
*Added Bold/Italic/Underline items
*Cleaned up some font UI layout.
---
 release/ui/buttons_data_text.py            | 74 ++++++++++++++--------
 source/blender/makesrna/intern/rna_curve.c |  6 +-
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index aabf218122f..4db5803c4eb 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -38,7 +38,6 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		curve = context.curve
 		space = context.space_data
 
-
 		layout.itemR(curve, "curve_2d")			
 							
 		split = layout.split()
@@ -76,13 +75,15 @@ class DATA_PT_geometry_text(DataButtonsPanel):
 		col.itemL(text="Modification:")
 		col.itemR(curve, "width")
 		col.itemR(curve, "extrude")
-		col.itemR(curve, "taper_object")
+		col.itemL(text="Taper Object:")
+		col.itemR(curve, "taper_object", text="")
 		
 		col = split.column()
 		col.itemL(text="Bevel:")
 		col.itemR(curve, "bevel_depth", text="Depth")
 		col.itemR(curve, "bevel_resolution", text="Resolution")
-		col.itemR(curve, "bevel_object")
+		col.itemL(text="Bevel Object:")
+		col.itemR(curve, "bevel_object", text="")
 
 class DATA_PT_font(DataButtonsPanel):
 	__label__ = "Font"
@@ -91,27 +92,39 @@ class DATA_PT_font(DataButtonsPanel):
 		layout = self.layout
 		
 		text = context.curve
-
+		char = context.curve.edit_format
+		
 		layout.itemR(text, "font")
 		
+		row = layout.row()
+		row.itemR(text, "text_size", text="Size")	
+		row.itemR(text, "shear")
+			
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="Object Font:")
+		col.itemR(text, "family", text="")
+		
+		col = split.column()
+		col.itemL(text="Text on Curve:")
+		col.itemR(text, "text_on_curve", text="")
+		
 		split = layout.split()
 		
-		col = split.column()	
-	#	col.itemR(text, "style")
-	#	col.itemR(text, "bold")
-	#	col.itemR(text, "italic")
-	#	col.itemR(text, "underline")
-	# 	ToDo: These settings are in a sub struct (Edit Format). 
-		col.itemR(text, "text_size")		
-		col.itemR(text, "shear")
-
 		col = split.column()
-		col.itemR(text, "text_on_curve")
-		col.itemR(text, "family")
+		col.itemL(text="Character:")
+		col.itemR(char, "bold")
+		col.itemR(char, "italic")
+		col.itemR(char, "underline")
+#		col.itemR(char, "style")
+#		col.itemR(char, "wrap")
+
+		col = split.column(align=True)
 		col.itemL(text="Underline:")
 		col.itemR(text, "ul_position", text="Position")
-		col.itemR(text, "ul_height", text="Height")
-	#	col.itemR(text, "edit_format")
+		col.itemR(text, "ul_height", text="Thickness")
+		
 
 class DATA_PT_paragraph(DataButtonsPanel):
 	__label__ = "Paragraph"
@@ -136,21 +149,32 @@ class DATA_PT_paragraph(DataButtonsPanel):
 		col.itemL(text="Offset:")
 		col.itemR(text, "offset_x", text="X")
 		col.itemR(text, "offset_y", text="Y")
-		#col.itemR(text, "wrap")
 
-"""		
+
 class DATA_PT_textboxes(DataButtonsPanel):
-		__label__ = "Text Boxes"
+	__label__ = "Text Boxes"
 
-		def draw(self, context):
-			layout = self.layout
+	def draw(self, context):
+		layout = self.layout
 			
-			text = context.curve
-"""
+		text = context.curve
+		box = context.curve.textbox
+		
+		split = layout.box().split()
+		
+		col = split.column(align=True)
+		col.itemL(text="Dimensions:")
+		col.itemR(box, "width", text="Width")
+		col.itemR(box, "height", text="Height")
+		
+		col = split.column(align=True)	
+		col.itemL(text="Offset:")
+		col.itemR(box, "x", text="X")
+		col.itemR(box, "y", text="Y")
 
 bpy.types.register(DATA_PT_context_text)	
 bpy.types.register(DATA_PT_shape_text)	
 bpy.types.register(DATA_PT_geometry_text)
 bpy.types.register(DATA_PT_font)
 bpy.types.register(DATA_PT_paragraph)
-#bpy.types.register(DATA_PT_textboxes)
+bpy.types.register(DATA_PT_textboxes)
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 3fbdf7aaf7d..0a796bd431d 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -500,13 +500,13 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna)
 	prop= RNA_def_property(srna, "ul_position", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "ulpos");
 	RNA_def_property_range(prop, -0.2f, 0.8f);
-	RNA_def_property_ui_text(prop, "Underline position", "Vertical position of underline");
+	RNA_def_property_ui_text(prop, "Underline Position", "Vertical position of underline");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	prop= RNA_def_property(srna, "ul_height", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "ulheight");
 	RNA_def_property_range(prop, -0.2f, 0.8f);
-	RNA_def_property_ui_text(prop, "Underline thickness", "");
+	RNA_def_property_ui_text(prop, "Underline Thickness", "");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	prop= RNA_def_property(srna, "active_textbox", PROP_INT, PROP_NONE);
@@ -518,7 +518,7 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna)
 	/* strings */
 	prop= RNA_def_property(srna, "family", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_maxlength(prop, 21);
-	RNA_def_property_ui_text(prop, "Family", "Blender uses font from selfmade objects.");
+	RNA_def_property_ui_text(prop, "Object Font", "Use Blender Objects as font characters. Give font objects a common name followed by the character it represents, eg. familya, familyb etc, and turn on Verts Duplication");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	prop= RNA_def_property(srna, "str", PROP_STRING, PROP_NONE);

From e6965c46fc1305a37a2778fb1746216f3d482295 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 8 Sep 2009 22:46:14 +0000
Subject: [PATCH 482/577] patch from Maurice & Patsoko on blenderartist for
 win32 registry support, moved "import winreg" inline, (so other OS's don't
 import it), untested but should be ok.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--- From the thread
It's the version of r23036 + winreg patch from Maurice.

About the registry keys:
 - I have povray 3.6 and 3.7b34 installed on vista32.
 - In the registry, I have 3 choices : ' CurrentVersion ', ' v3.6 ', and ' v3.7'.
 - I've modified Maurice's patch by replacing CurrentVersion by v3.6. We have the benefit to have the keys for each version so I prefer use them rather than the 'floating-key-about-which-is-the current-version'. I found more secure like that.
---
 release/io/engine_render_pov.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py
index 02b8aab4c42..22cf1a36dbb 100644
--- a/release/io/engine_render_pov.py
+++ b/release/io/engine_render_pov.py
@@ -740,10 +740,13 @@ class PovrayRender(bpy.types.RenderEngine):
 		pov_binary = "povray"
 		
 		if sys.platform=='win32':
+			import winreg
+			regKey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, 'Software\\POV-Ray\\v3.6\\Windows')
+			
 			if bitness == 64:
-				pov_binary = "pvengine64"
+				pov_binary = winreg.QueryValueEx(regKey, 'Home')[0] + '\\bin\\pvengine64'
 			else:
-				pov_binary = "pvengine"
+				pov_binary = winreg.QueryValueEx(regKey, 'Home')[0] + '\\bin\\pvengine'
 			
 		if 1:
 			self.process = subprocess.Popen([pov_binary, self.temp_file_ini]) # stdout=subprocess.PIPE, stderr=subprocess.PIPE

From 850abb3580f97f44562b081bf115c845abf31ca1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 9 Sep 2009 00:10:12 +0000
Subject: [PATCH 483/577] curve.textboxes collection access for the UI + minor
 UI tweaks for poly curves

---
 release/ui/buttons_data_curve.py           | 107 ++++++++++++---------
 release/ui/buttons_data_text.py            |  43 +++++----
 source/blender/makesrna/intern/rna_curve.c |  23 +++--
 3 files changed, 97 insertions(+), 76 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 95f9a98da74..1124dfd1ae8 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -15,7 +15,7 @@ class DataButtonsPanelCurve(DataButtonsPanel):
 	'''
 	def poll(self, context):
 		return (context.object and context.object.type == 'CURVE' and context.curve)
-		
+
 class DataButtonsPanelActive(DataButtonsPanel):
 	'''
 	Same as above but for curves only
@@ -80,7 +80,7 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 		sub = col.column(align=True)
 		sub.itemR(curve, "resolution_u", text="Preview U")
 		sub.itemR(curve, "render_resolution_u", text="Render U")
-		
+
 		if is_surf:
 			sub = col.column(align=True)
 			sub.itemR(curve, "resolution_v", text="Preview V")
@@ -150,59 +150,70 @@ class DATA_PT_active_spline(DataButtonsPanelActive):
 		curve = context.curve
 		act_spline = curve.active_spline
 		is_surf = (ob.type == 'SURFACE')
+		is_poly = (act_spline.type == 'POLY')
 		
 		split = layout.split()
 		
-		col = split.column()
-		col.itemL(text="Cyclic:")
-		if act_spline.type == 'NURBS':
-			col.itemL(text="Bezier:")
-			col.itemL(text="Endpoint:")
-			col.itemL(text="Order:")
-		col.itemL(text="Resolution:")
-		
-		col = split.column()
-		col.itemR(act_spline, "cyclic_u", text="U")
-		
-		if act_spline.type == 'NURBS':
-			sub = col.column()
-			sub.active = (not act_spline.cyclic_u)
-			sub.itemR(act_spline, "bezier_u", text="U")
-			sub.itemR(act_spline, "endpoint_u", text="U")
-			
-			sub = col.column()
-			sub.itemR(act_spline, "order_u", text="U")
-		col.itemR(act_spline, "resolution_u", text="U")
-		
-		if is_surf:
+		if is_poly:
+			# These settings are below but its easier to have 
+			# poly's set aside since they use so few settings
 			col = split.column()
-			col.itemR(act_spline, "cyclic_v", text="V")
-			
-			# its a surface, assume its a nurb.
-			sub = col.column()
-			sub.active = (not act_spline.cyclic_v)
-			sub.itemR(act_spline, "bezier_v", text="V")
-			sub.itemR(act_spline, "endpoint_v", text="V")
-			sub = col.column()
-			sub.itemR(act_spline, "order_v", text="V")
-			sub.itemR(act_spline, "resolution_v", text="V")
-
+			col.itemL(text="Cyclic:")
+			col.itemR(act_spline, "smooth")
+			col = split.column()
+			col.itemR(act_spline, "cyclic_u", text="U")
 		
-		if not is_surf:
+		else:
+			col = split.column()
+			col.itemL(text="Cyclic:")
+			if act_spline.type == 'NURBS':
+				col.itemL(text="Bezier:")
+				col.itemL(text="Endpoint:")
+				col.itemL(text="Order:")
+			
+			col.itemL(text="Resolution:")
+					
+			col = split.column()
+			col.itemR(act_spline, "cyclic_u", text="U")
+			
+			if act_spline.type == 'NURBS':
+				sub = col.column()
+				# sub.active = (not act_spline.cyclic_u)
+				sub.itemR(act_spline, "bezier_u", text="U")
+				sub.itemR(act_spline, "endpoint_u", text="U")
+				
+				sub = col.column()
+				sub.itemR(act_spline, "order_u", text="U")
+			col.itemR(act_spline, "resolution_u", text="U")
+			
+			if is_surf:
+				col = split.column()
+				col.itemR(act_spline, "cyclic_v", text="V")
+				
+				# its a surface, assume its a nurb.
+				sub = col.column()
+				sub.active = (not act_spline.cyclic_v)
+				sub.itemR(act_spline, "bezier_v", text="V")
+				sub.itemR(act_spline, "endpoint_v", text="V")
+				sub = col.column()
+				sub.itemR(act_spline, "order_v", text="V")
+				sub.itemR(act_spline, "resolution_v", text="V")
+
+			
+			if not is_surf:
+				split = layout.split()
+				col = split.column()
+				col.active = (not curve.curve_2d)
+				
+				col.itemL(text="Interpolation:")
+				col.itemR(act_spline, "tilt_interpolation", text="Tilt")
+				col.itemR(act_spline, "radius_interpolation", text="Radius")
+			
 			split = layout.split()
 			col = split.column()
-			col.active = (not curve.curve_2d)
-			
-			col.itemL(text="Interpolation:")
-			col.itemR(act_spline, "tilt_interpolation", text="Tilt")
-			col.itemR(act_spline, "radius_interpolation", text="Radius")
-		
-		
-		split = layout.split()
-		col = split.column()
-		col.itemR(act_spline, "smooth")
-		
-		
+			col.itemR(act_spline, "smooth")
+
+
 bpy.types.register(DATA_PT_context_curve)
 bpy.types.register(DATA_PT_shape_curve)
 bpy.types.register(DATA_PT_geometry_curve)
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 4db5803c4eb..d0e7ea09a92 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -44,8 +44,10 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		
 		col = split.column()
 		col.itemL(text="Caps:")
-		col.itemR(curve, "front")
-		col.itemR(curve, "back")
+		row = col.row()
+		row .itemR(curve, "front")
+		row .itemR(curve, "back")
+		# col = split.column()
 		col.itemL(text="Textures:")
 		col.itemR(curve, "uv_orco")
 		col.itemR(curve, "auto_texspace")
@@ -55,11 +57,12 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		sub = col.column(align=True)
 		sub.itemR(curve, "resolution_u", text="Preview U")
 		sub.itemR(curve, "render_resolution_u", text="Render U")
+		
+		# resolution_v is not used for text
+		
 		sub = col.column(align=True)
-		sub.itemR(curve, "resolution_v", text="Preview V")
-		sub.itemR(curve, "render_resolution_v", text="Render V")
 		col.itemL(text="Display:")
-		col.itemR(curve, "fast")
+		col.itemR(curve, "fast", text="Fast Editing")
 
 class DATA_PT_geometry_text(DataButtonsPanel):
 	__label__ = "Geometry"
@@ -93,19 +96,19 @@ class DATA_PT_font(DataButtonsPanel):
 		
 		text = context.curve
 		char = context.curve.edit_format
-		
+
 		layout.itemR(text, "font")
 		
 		row = layout.row()
 		row.itemR(text, "text_size", text="Size")	
 		row.itemR(text, "shear")
-			
+		
 		split = layout.split()
 		
-		col = split.column()
+		col = split.column()	
 		col.itemL(text="Object Font:")
 		col.itemR(text, "family", text="")
-		
+
 		col = split.column()
 		col.itemL(text="Text on Curve:")
 		col.itemR(text, "text_on_curve", text="")
@@ -158,19 +161,19 @@ class DATA_PT_textboxes(DataButtonsPanel):
 		layout = self.layout
 			
 		text = context.curve
-		box = context.curve.textbox
 		
-		split = layout.box().split()
+		for box in text.textboxes:
+			split = layout.box().split()
+			
+			col = split.column(align=True)
+			col.itemL(text="Dimensions:")
+			col.itemR(box, "width", text="Width")
+			col.itemR(box, "height", text="Height")
 		
-		col = split.column(align=True)
-		col.itemL(text="Dimensions:")
-		col.itemR(box, "width", text="Width")
-		col.itemR(box, "height", text="Height")
-		
-		col = split.column(align=True)	
-		col.itemL(text="Offset:")
-		col.itemR(box, "x", text="X")
-		col.itemR(box, "y", text="Y")
+			col = split.column(align=True)	
+			col.itemL(text="Offset:")
+			col.itemR(box, "x", text="X")
+			col.itemR(box, "y", text="Y")
 
 bpy.types.register(DATA_PT_context_text)	
 bpy.types.register(DATA_PT_shape_text)	
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 0a796bd431d..91628bab376 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -159,6 +159,14 @@ static void rna_Curve_material_index_range(PointerRNA *ptr, int *min, int *max)
 	*max= cu->totcol-1;
 }
 
+static void rna_Curve_active_textbox_index_range(PointerRNA *ptr, int *min, int *max)
+{
+	Curve *cu= (Curve*)ptr->id.data;
+	*min= 0;
+	*max= cu->totbox-1;
+}
+
+
 static void rna_Curve_2d_set(PointerRNA *ptr, int value)
 {
 	Curve *cu= (Curve*)ptr->id.data;
@@ -509,11 +517,15 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Underline Thickness", "");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
+	prop= RNA_def_property(srna, "textboxes", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "tb", "totbox");
+	RNA_def_property_struct_type(prop, "TextBox");
+	RNA_def_property_ui_text(prop, "Textboxes", "");
+
 	prop= RNA_def_property(srna, "active_textbox", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "actbox");
-	RNA_def_property_range(prop, 0, 100);
 	RNA_def_property_ui_text(prop, "The active text box", "");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	RNA_def_property_int_funcs(prop, NULL, NULL, "rna_Curve_active_textbox_index_range");
 	
 	/* strings */
 	prop= RNA_def_property(srna, "family", PROP_STRING, PROP_NONE);
@@ -539,12 +551,7 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "vfont");
 	RNA_def_property_ui_text(prop, "Font", "");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
-	
-	prop= RNA_def_property(srna, "textbox", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "tb");
-	RNA_def_property_ui_text(prop, "Textbox", "");
-	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
-	
+
 	prop= RNA_def_property(srna, "edit_format", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "curinfo");
 	RNA_def_property_ui_text(prop, "Edit Format", "Editing settings character formatting.");

From 2e851fdc67a0613cb17436cfe28ebd69fff8c9c2 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 9 Sep 2009 02:25:14 +0000
Subject: [PATCH 484/577] frame range restrictions for dependencies, so slaves
 only receive point cache files for the frames that they need to render
 (supports step > 1, of course)

---
 release/io/netrender/client.py    | 104 ++++++++++++++++++++++++++++++
 release/io/netrender/master.py    |   6 +-
 release/io/netrender/model.py     |   7 +-
 release/io/netrender/operators.py |   3 +-
 release/io/netrender/slave.py     |   5 +-
 release/io/netrender/utils.py     |  75 +--------------------
 6 files changed, 120 insertions(+), 80 deletions(-)

diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
index 59cb19c2075..da27a8ecc57 100644
--- a/release/io/netrender/client.py
+++ b/release/io/netrender/client.py
@@ -7,6 +7,110 @@ import netrender.slave as slave
 import netrender.master as master
 from netrender.utils import *
 
+
+def clientSendJob(conn, scene, anim = False, chunks = 5):
+	netsettings = scene.network_render
+	job = netrender.model.RenderJob()
+	
+	if anim:
+		for f in range(scene.start_frame, scene.end_frame + 1):
+			job.addFrame(f)
+	else:
+		job.addFrame(scene.current_frame)
+	
+	filename = bpy.data.filename
+	job.addFile(filename)
+	
+	job_name = netsettings.job_name
+	path, name = os.path.split(filename)
+	if job_name == "[default]":
+		job_name = name
+	
+	for lib in bpy.data.libraries:
+		lib_path = lib.filename
+		
+		if lib_path.startswith("//"):
+			lib_path = path + os.sep + lib_path[2:]
+			
+		job.addFile(lib_path)
+	
+	root, ext = os.path.splitext(name)
+	cache_path = path + os.sep + "blendcache_" + root + os.sep # need an API call for that
+	
+	print("cache:", cache_path)
+	
+	if os.path.exists(cache_path):
+		caches = {}
+		pattern = re.compile("([a-zA-Z0-9]+)_([0-9]+)_[0-9]+\.bphys")
+		for cache_file in sorted(os.listdir(cache_path)):
+			match = pattern.match(cache_file)
+			
+			if match:
+				cache_id = match.groups()[0]
+				cache_frame = int(match.groups()[1])
+					
+				cache_files = caches.get(cache_id, [])
+				cache_files.append((cache_frame, cache_file))
+				caches[cache_id] = cache_files
+				
+		for cache in caches.values():
+			cache.sort()
+			
+			if len(cache) == 1:
+				cache_frame, cache_file = cache[0]
+				job.addFile(cache_path + cache_file, cache_frame, cache_frame)
+			else:
+				for i in range(len(cache)):
+					current_item = cache[i]
+					next_item = cache[i+1] if i + 1 < len(cache) else None
+					previous_item = cache[i - 1] if i > 0 else None
+					
+					current_frame, current_file = current_item
+					
+					if  not next_item and not previous_item:
+						job.addFile(cache_path + current_file, current_frame, current_frame)
+					elif next_item and not previous_item:
+						next_frame = next_item[0]
+						job.addFile(cache_path + current_file, current_frame, next_frame - 1)
+					elif not next_item and previous_item:
+						previous_frame = previous_item[0]
+						job.addFile(cache_path + current_file, previous_frame + 1, current_frame)
+					else:
+						next_frame = next_item[0]
+						previous_frame = previous_item[0]
+						job.addFile(cache_path + current_file, previous_frame + 1, next_frame - 1)
+		
+	print(job.files)
+	
+	job.name = job_name
+	
+	for slave in scene.network_render.slaves_blacklist:
+		job.blacklist.append(slave.id)
+	
+	job.chunks = netsettings.chunks
+	job.priority = netsettings.priority
+	
+	# try to send path first
+	conn.request("POST", "job", repr(job.serialize()))
+	response = conn.getresponse()
+	
+	job_id = response.getheader("job-id")
+	
+	# if not ACCEPTED (but not processed), send files
+	if response.status == http.client.ACCEPTED:
+		for filepath in job.files:
+			f = open(filepath, "rb")
+			conn.request("PUT", "file", f, headers={"job-id": job_id, "job-file": filepath})
+			f.close()
+			response = conn.getresponse()
+	
+	# server will reply with NOT_FOUD until all files are found
+	
+	return job_id
+
+def clientRequestResult(conn, scene, job_id):
+	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(scene.current_frame)})
+
 class NetworkRenderEngine(bpy.types.RenderEngine):
 	__idname__ = 'NET_RENDER'
 	__label__ = "Network Render"
diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
index 4afda9ac67b..d938c59a2ec 100644
--- a/release/io/netrender/master.py
+++ b/release/io/netrender/master.py
@@ -10,8 +10,10 @@ JOB_PAUSED = 1 # paused by user
 JOB_QUEUED = 2 # ready to be dispatched
 
 class MRenderFile:
-	def __init__(self, filepath):
+	def __init__(self, filepath, start, end):
 		self.filepath = filepath
+		self.start = start
+		self.end = end
 		self.found = False
 	
 	def test(self):
@@ -55,7 +57,7 @@ class MRenderJob(netrender.model.RenderJob):
 	
 		# special server properties
 		self.save_path = ""
-		self.files_map = {path: MRenderFile(path) for path in files}
+		self.files_map = {path: MRenderFile(path, start, end) for path, start, end in files}
 		self.status = JOB_WAITING
 	
 	def save(self):
diff --git a/release/io/netrender/model.py b/release/io/netrender/model.py
index 8b919b1fa36..7803ad034a7 100644
--- a/release/io/netrender/model.py
+++ b/release/io/netrender/model.py
@@ -62,6 +62,9 @@ class RenderJob:
 		self.blacklist = []
 		self.last_dispatched = 0.0
 	
+	def addFile(self, file_path, start=-1, end=-1):
+		self.files.append((file_path, start, end))
+	
 	def addFrame(self, frame_number):
 		frame = RenderFrame(frame_number)
 		self.frames.append(frame)
@@ -98,10 +101,12 @@ class RenderJob:
 			return None
 		
 	def serialize(self, frames = None):
+		min_frame = min((f.number for f in frames)) if frames else -1
+		max_frame = max((f.number for f in frames)) if frames else -1
 		return 	{
 							"id": self.id,
 							"name": self.name,
-							"files": self.files,
+							"files": [f for f in self.files if f[1] == -1 or not frames or (f[1] <= min_frame <= f[2] or f[1] <= max_frame <= f[2])],
 							"frames": [f.serialize() for f in self.frames if not frames or f in frames],
 							"chunks": self.chunks,
 							"priority": self.priority,
diff --git a/release/io/netrender/operators.py b/release/io/netrender/operators.py
index 30631b3b23d..1c6d89c0043 100644
--- a/release/io/netrender/operators.py
+++ b/release/io/netrender/operators.py
@@ -3,6 +3,7 @@ import sys, os
 import http, http.client, http.server, urllib
 
 from netrender.utils import *
+import netrender.client as client
 import netrender.model
 
 class RENDER_OT_netclientsend(bpy.types.Operator):
@@ -27,7 +28,7 @@ class RENDER_OT_netclientsend(bpy.types.Operator):
 		
 		if conn:
 			# Sending file
-			scene.network_render.job_id = clientSendJob(conn, scene, True)
+			scene.network_render.job_id = client.clientSendJob(conn, scene, True)
 		
 		return ('FINISHED',)
 	
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
index 8cbfd4ea11f..0435ba3f8cb 100644
--- a/release/io/netrender/slave.py
+++ b/release/io/netrender/slave.py
@@ -83,7 +83,7 @@ def render_slave(engine, scene):
 				if not os.path.exists(JOB_PREFIX):
 					os.mkdir(JOB_PREFIX)
 				
-				job_path = job.files[0]
+				job_path = job.files[0][0] # data in files have format (path, start, end)
 				main_path, main_file = os.path.split(job_path)
 				
 				job_full_path = testFile(conn, JOB_PREFIX, job_path)
@@ -91,7 +91,8 @@ def render_slave(engine, scene):
 				print("File:", main_file, "and %i other files" % (len(job.files) - 1,))
 				engine.update_stats("", "Render File", main_file, "for job", job.id)
 				
-				for file_path in job.files[1:]:
+				for file_path, start, end in job.files[1:]:
+					print("\t", file_path)
 					testFile(conn, JOB_PREFIX, file_path, main_path)
 				
 				frame_args = []
diff --git a/release/io/netrender/utils.py b/release/io/netrender/utils.py
index 62571011bc1..d1b383f7a97 100644
--- a/release/io/netrender/utils.py
+++ b/release/io/netrender/utils.py
@@ -6,7 +6,7 @@ import subprocess, shutil, time, hashlib
 
 import netrender.model
 
-VERSION = b"0.3"
+VERSION = b"0.5"
 
 QUEUED = 0
 DISPATCHED = 1
@@ -41,79 +41,6 @@ def clientVerifyVersion(conn):
 	
 	return True
 
-def clientSendJob(conn, scene, anim = False, chunks = 5):
-	netsettings = scene.network_render
-	job = netrender.model.RenderJob()
-	
-	if anim:
-		for f in range(scene.start_frame, scene.end_frame + 1):
-			job.addFrame(f)
-	else:
-		job.addFrame(scene.current_frame)
-	
-	filename = bpy.data.filename
-	job.files.append(filename)
-	
-	job_name = netsettings.job_name
-	path, name = os.path.split(filename)
-	if job_name == "[default]":
-		job_name = name
-	
-	for lib in bpy.data.libraries:
-		lib_path = lib.filename
-		
-		if lib_path.startswith("//"):
-			lib_path = path + os.sep + lib_path[2:]
-			
-		job.files.append(lib_path)
-	
-	root, ext = os.path.splitext(name)
-	cache_path = path + os.sep + "blendcache_" + root + os.sep # need an API call for that
-	
-	print("cache:", cache_path)
-	
-	if os.path.exists(cache_path):
-		pattern = re.compile("[a-zA-Z0-9]+_([0-9]+)_[0-9]+\.bphys")
-		for cache_name in sorted(os.listdir(cache_path)):
-			match = pattern.match(cache_name)
-			
-			if match:
-				print("Frame:", int(match.groups()[0]), cache_name)
-			
-			job.files.append(cache_path + cache_name)
-		
-	#print(job.files)
-	
-	job.name = job_name
-	
-	for slave in scene.network_render.slaves_blacklist:
-		job.blacklist.append(slave.id)
-	
-	job.chunks = netsettings.chunks
-	job.priority = netsettings.priority
-	
-	# try to send path first
-	conn.request("POST", "job", repr(job.serialize()))
-	response = conn.getresponse()
-	
-	job_id = response.getheader("job-id")
-	
-	# if not ACCEPTED (but not processed), send files
-	if response.status == http.client.ACCEPTED:
-		for filepath in job.files:
-			f = open(filepath, "rb")
-			conn.request("PUT", "file", f, headers={"job-id": job_id, "job-file": filepath})
-			f.close()
-			response = conn.getresponse()
-	
-	# server will reply with NOT_FOUD until all files are found
-	
-	return job_id
-
-def clientRequestResult(conn, scene, job_id):
-	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(scene.current_frame)})
-
-
 def prefixPath(prefix_directory, file_path, prefix_path):
 	if os.path.isabs(file_path):
 		# if an absolute path, make sure path exists, if it doesn't, use relative local path

From c29780c12a2eeb53e905c5a5c38a4a5c226738a3 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Wed, 9 Sep 2009 07:52:44 +0000
Subject: [PATCH 485/577] * Temporary fix to get fluid sim (and fluid control)
 working properly (without animated parameters). This just fills the fluid sim
 animation channels with default values for now, but will need to be updated
 to new animation system.

---
 source/blender/editors/physics/ed_fluidsim.c | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/source/blender/editors/physics/ed_fluidsim.c b/source/blender/editors/physics/ed_fluidsim.c
index 907d3f99f77..093fa3f0a49 100644
--- a/source/blender/editors/physics/ed_fluidsim.c
+++ b/source/blender/editors/physics/ed_fluidsim.c
@@ -200,6 +200,28 @@ static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char
 static void fluidsimInitChannel(Scene *scene, float **setchannel, int size, float *time, 
 		int *icuIds, float *defaults, Ipo* ipo, int entries) 
 {
+
+	int i, j;
+	char *cstr = NULL;
+	float *channel = NULL;
+	
+	cstr = "fluidsiminit_channelfloat";
+	if(entries>1) cstr = "fluidsiminit_channelvec";
+	channel = MEM_callocN( size* (entries+1)* sizeof(float), cstr );
+	
+	/* defaults  for now */
+	for(j=0; j<entries; j++) {
+		for(i=1; i<=size; i++) {
+			channel[(i-1)*(entries+1) + j] = defaults[j];
+		}	
+	}
+	
+	for(i=1; i<=size; i++) {
+		channel[(i-1)*(entries+1) + entries] = time[i];
+	}
+
+	*setchannel = channel;
+
 #if 0
 	/* goes away completely */
 	int i,j;

From b9f1117336e17438cab1db6174f7cf66eebc6b3e Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 11:05:10 +0000
Subject: [PATCH 486/577] 2.5: use bone groups icon in UI.

---
 source/blender/makesrna/intern/rna_pose.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 6c2018c61f4..7d7f37a8f43 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -386,6 +386,7 @@ static void rna_def_bone_group(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "BoneGroup", NULL);
 	RNA_def_struct_sdna(srna, "bActionGroup");
 	RNA_def_struct_ui_text(srna, "Bone Group", "Groups of Pose Channels (Bones).");
+	RNA_def_struct_ui_icon(srna, ICON_GROUP_BONE);
 	
 	/* name */
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);

From 8878c30b9b032f1a630c13c5ebb260cb9029ce3c Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 11:10:28 +0000
Subject: [PATCH 487/577] 2.5: WM_menu_invoke now uses the first enum property
 it can find, if no enum property named "type" is available.

---
 .../blender/windowmanager/intern/wm_operators.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index c7011777dbf..ca2fbe23c3e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -448,13 +448,24 @@ void WM_operator_properties_free(PointerRNA *ptr)
 /* ************ default op callbacks, exported *********** */
 
 /* invoke callback, uses enum property named "type" */
-/* only weak thing is the fixed property name... */
 int WM_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	PropertyRNA *prop= RNA_struct_find_property(op->ptr, "type");
+	PropertyRNA *prop;
 	uiPopupMenu *pup;
 	uiLayout *layout;
 
+	prop= RNA_struct_find_property(op->ptr, "type");
+
+	if(!prop) {
+		RNA_STRUCT_BEGIN(op->ptr, findprop) {
+			if(RNA_property_type(findprop) == PROP_ENUM) {
+				prop= findprop;
+				break;
+			}
+		}
+		RNA_STRUCT_END;
+	}
+
 	if(prop==NULL) {
 		printf("WM_menu_invoke: %s has no \"type\" enum property\n", op->type->idname);
 	}
@@ -464,7 +475,7 @@ int WM_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	else {
 		pup= uiPupMenuBegin(C, op->type->name, 0);
 		layout= uiPupMenuLayout(pup);
-		uiItemsEnumO(layout, op->type->idname, "type");
+		uiItemsEnumO(layout, op->type->idname, (char*)RNA_property_identifier(prop));
 		uiPupMenuEnd(C, pup);
 	}
 

From 3daa283604930167be0bc2dad5d1684a871ca254 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 11:52:56 +0000
Subject: [PATCH 488/577] 2.5: Object module

* Split object_edit.c into multiple files:
  object_add.c, object_edit.c, object_hook.c, object_relations.c,
  object_select.c, object_transform.c.
* Rename files to have consistent object_ and mball_ prefix:
  object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c.
* Added operators:
  * vertex group menu and set active
  * apply location, rotation, scale, visual transform (location is new)
  * make local
  * make vertex parent
  * move to layer
  * convert to curve/mesh (not finished yet)
* Many small fixes for marked issues, but still much code to be cleaned
  up here...
---
 .../blender/editors/ED_editors.vcproj         |   14 +-
 release/ui/space_info.py                      |   16 +-
 source/blender/blenkernel/BKE_animsys.h       |    3 +
 source/blender/blenkernel/intern/anim_sys.c   |   26 +
 source/blender/blenkernel/intern/library.c    |    5 +-
 source/blender/blenlib/intern/util.c          |    5 -
 .../blender/editors/armature/editarmature.c   |   46 +-
 .../editors/armature/editarmature_retarget.c  |    4 +-
 .../blender/editors/armature/meshlaplacian.c  |   24 +-
 source/blender/editors/armature/poseobject.c  |    2 +-
 source/blender/editors/include/ED_armature.h  |    4 +-
 source/blender/editors/include/ED_mball.h     |    6 +
 source/blender/editors/include/ED_mesh.h      |   22 +-
 source/blender/editors/include/ED_object.h    |    7 +-
 .../metaball/{editmball.c => mball_edit.c}    |    0
 source/blender/editors/object/object_add.c    | 1451 +++++
 .../{editconstraint.c => object_constraint.c} |    6 +-
 source/blender/editors/object/object_edit.c   | 5328 +----------------
 .../object/{editgroup.c => object_group.c}    |  191 +-
 source/blender/editors/object/object_hook.c   |  608 ++
 source/blender/editors/object/object_intern.h |   73 +-
 .../{editlattice.c => object_lattice.c}       |    6 -
 .../blender/editors/object/object_modifier.c  |   52 -
 source/blender/editors/object/object_ops.c    |   46 +-
 .../blender/editors/object/object_relations.c | 1766 ++++++
 source/blender/editors/object/object_select.c |  974 +++
 .../object/{editkey.c => object_shapekey.c}   |    0
 .../blender/editors/object/object_transform.c |  926 +++
 source/blender/editors/object/object_vgroup.c | 1473 +++--
 .../blender/editors/screen/screen_context.c   |    6 +
 .../editors/sculpt_paint/paint_vertex.c       |   52 +-
 .../editors/space_buttons/buttons_ops.c       |  127 -
 .../blender/editors/space_view3d/drawobject.c |    2 +-
 .../editors/space_view3d/view3d_buttons.c     |    2 +-
 source/blender/editors/util/undo.c            |    1 +
 source/blender/makesrna/RNA_enum_types.h      |    2 +
 source/blender/makesrna/intern/rna_object.c   |   16 +
 .../windowmanager/intern/wm_event_system.c    |    2 +-
 38 files changed, 6844 insertions(+), 6450 deletions(-)
 rename source/blender/editors/metaball/{editmball.c => mball_edit.c} (100%)
 create mode 100644 source/blender/editors/object/object_add.c
 rename source/blender/editors/object/{editconstraint.c => object_constraint.c} (99%)
 rename source/blender/editors/object/{editgroup.c => object_group.c} (60%)
 create mode 100644 source/blender/editors/object/object_hook.c
 rename source/blender/editors/object/{editlattice.c => object_lattice.c} (98%)
 create mode 100644 source/blender/editors/object/object_relations.c
 create mode 100644 source/blender/editors/object/object_select.c
 rename source/blender/editors/object/{editkey.c => object_shapekey.c} (100%)
 create mode 100644 source/blender/editors/object/object_transform.c

diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj
index 9f2fc769e49..db0b851fd74 100644
--- a/projectfiles_vc9/blender/editors/ED_editors.vcproj
+++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj
@@ -1075,19 +1075,19 @@
 			Name="object"
 			>
 			<File
-				RelativePath="..\..\..\source\blender\editors\object\editconstraint.c"
+				RelativePath="..\..\..\source\blender\editors\object\object_constraint.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\object\editgroup.c"
+				RelativePath="..\..\..\source\blender\editors\object\object_group.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\object\editkey.c"
+				RelativePath="..\..\..\source\blender\editors\object\object_shapekey.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\object\editlattice.c"
+				RelativePath="..\..\..\source\blender\editors\object\object_lattice.c"
 				>
 			</File>
 			<File
@@ -1110,6 +1110,10 @@
 				RelativePath="..\..\..\source\blender\editors\object\object_vgroup.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_hook.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="transform"
@@ -1479,7 +1483,7 @@
 			Name="metaball"
 			>
 			<File
-				RelativePath="..\..\..\source\blender\editors\metaball\editmball.c"
+				RelativePath="..\..\..\source\blender\editors\metaball\mball_edit.c"
 				>
 			</File>
 			<File
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 79937816791..97243f857a6 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -117,22 +117,22 @@ class INFO_MT_add(bpy.types.Menu):
 
 		layout.operator_context = "EXEC_SCREEN"
 
-		layout.item_menu_enumO( "object.mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH')
-		layout.item_menu_enumO( "object.curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE')
-		layout.item_menu_enumO( "object.surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE')
-		layout.item_menu_enumO( "object.metaball_add", "type", 'META', icon='ICON_OUTLINER_OB_META')
+		layout.item_menu_enumO("object.mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH')
+		layout.item_menu_enumO("object.curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE')
+		layout.item_menu_enumO("object.surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE')
+		layout.item_menu_enumO("object.metaball_add", "type", 'META', icon='ICON_OUTLINER_OB_META')
 		layout.itemO("object.text_add", text="Text", icon='ICON_OUTLINER_OB_FONT')
 
 		layout.itemS()
 
 		layout.itemO("object.armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE')
-		layout.item_enumO("object.object_add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE')
-		layout.item_enumO("object.object_add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY')
+		layout.item_enumO("object.add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE')
+		layout.item_enumO("object.add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY')
 
 		layout.itemS()
 
-		layout.item_enumO("object.object_add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA')
-		layout.item_enumO("object.object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
+		layout.item_enumO("object.add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA')
+		layout.item_enumO("object.add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP')
 
 class INFO_MT_game(bpy.types.Menu):
 	__space_type__ = 'INFO'
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index cabbaa7aa0f..cc5b4dfdcaf 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -55,6 +55,9 @@ void BKE_free_animdata(struct ID *id);
 /* Copy AnimData */
 struct AnimData *BKE_copy_animdata(struct AnimData *adt);
 
+/* Make Local */
+void BKE_animdata_make_local(struct AnimData *adt);
+
 /* ************************************* */
 /* KeyingSets API */
 
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index b7cc98063ed..0e8450025da 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -204,6 +204,32 @@ AnimData *BKE_copy_animdata (AnimData *adt)
 	return dadt;
 }
 
+/* Make Local -------------------------------------------- */
+
+static void make_local_strips(ListBase *strips)
+{
+	NlaStrip *strip;
+
+	for(strip=strips->first; strip; strip=strip->next) {
+		if(strip->act) make_local_action(strip->act);
+		if(strip->remap && strip->remap->target) make_local_action(strip->remap->target);
+
+		make_local_strips(&strip->strips);
+	}
+}
+
+void BKE_animdata_make_local(AnimData *adt)
+{
+	NlaTrack *nlt;
+
+	if(adt->action) make_local_action(adt->action);
+	if(adt->tmpact) make_local_action(adt->tmpact);
+	if(adt->remap && adt->remap->target) make_local_action(adt->remap->target);
+
+	for(nlt=adt->nla_tracks.first; nlt; nlt=nlt->next) 
+		make_local_strips(&nlt->strips);
+}
+
 /* *********************************** */ 
 /* KeyingSet API */
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index f15552ab40c..02d92a62b59 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -194,7 +194,10 @@ int id_make_local(ID *id, int test)
 		case ID_WV:
 			return 0; /* deprecated */
 		case ID_LT:
-			if(!test) make_local_lattice((Lattice*)id);
+			if(!test) {
+				make_local_lattice((Lattice*)id);
+				make_local_key(((Lattice*)id)->key);
+			}
 			return 1;
 		case ID_LA:
 			if(!test) make_local_lamp((Lamp*)id);
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index acf236d382b..c7bb7a54457 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -77,11 +77,6 @@
 
 #include "BLI_winstuff.h"
 
-/* for duplicate_defgroup */
-#if !(defined vsnprintf)
-#define vsnprintf _vsnprintf
-#endif
-
 #endif
 
 
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 65051c384b3..4f5d8872384 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -239,7 +239,7 @@ static void fix_bonelist_roll (ListBase *bonelist, ListBase *editbonelist)
 }
 
 /* put EditMode back in Object */
-void ED_armature_from_edit(Scene *scene, Object *obedit)
+void ED_armature_from_edit(Object *obedit)
 {
 	bArmature *arm= obedit->data;
 	EditBone *eBone, *neBone;
@@ -343,21 +343,19 @@ void ED_armature_from_edit(Scene *scene, Object *obedit)
 	DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 }
 
-
-
-void apply_rot_armature (Scene *scene, Object *ob, float mat[3][3])
+void ED_armature_apply_transform(Object *ob, float mat[4][4])
 {
 	EditBone *ebone;
 	bArmature *arm= ob->data;
-	float scale = Mat3ToScalef(mat);	/* store the scale of the matrix here to use on envelopes */
+	float scale = Mat4ToScalef(mat);	/* store the scale of the matrix here to use on envelopes */
 	
 	/* Put the armature into editmode */
 	ED_armature_to_edit(ob);
 
 	/* Do the rotations */
 	for (ebone = arm->edbo->first; ebone; ebone=ebone->next){
-		Mat3MulVecfl(mat, ebone->head);
-		Mat3MulVecfl(mat, ebone->tail);
+		Mat4MulVecfl(mat, ebone->head);
+		Mat4MulVecfl(mat, ebone->tail);
 		
 		ebone->rad_head	*= scale;
 		ebone->rad_tail	*= scale;
@@ -365,7 +363,7 @@ void apply_rot_armature (Scene *scene, Object *ob, float mat[3][3])
 	}
 	
 	/* Turn the list into an armature */
-	ED_armature_from_edit(scene, ob);
+	ED_armature_from_edit(ob);
 	ED_armature_edit_free(ob);
 }
 
@@ -411,7 +409,7 @@ void docenter_armature (Scene *scene, View3D *v3d, Object *ob, int centermode)
 	}
 	
 	/* Turn the list into an armature */
-	ED_armature_from_edit(scene, ob);
+	ED_armature_from_edit(ob);
 	
 	/* Adjust object location for new centerpoint */
 	if(centermode && obedit==NULL) {
@@ -557,7 +555,7 @@ static int apply_armature_pose2bones_exec (bContext *C, wmOperator *op)
 	}
 	
 	/* convert editbones back to bones */
-	ED_armature_from_edit(scene, ob);
+	ED_armature_from_edit(ob);
 	
 	/* flush positions of posebones */
 	where_is_pose(scene, ob);
@@ -791,7 +789,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
 	
 	DAG_scene_sort(scene);	// because we removed object(s)
 
-	ED_armature_from_edit(scene, ob);
+	ED_armature_from_edit(ob);
 	ED_armature_edit_free(ob);
 
 	WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
@@ -994,7 +992,7 @@ static void separate_armature_bones (Scene *scene, Object *ob, short sel)
 	}
 	
 	/* exit editmode (recalculates pchans too) */
-	ED_armature_from_edit(scene, ob);
+	ED_armature_from_edit(ob);
 	ED_armature_edit_free(ob);
 }
 
@@ -1037,7 +1035,7 @@ static int separate_armature_exec (bContext *C, wmOperator *op)
 	oldob->mode &= ~OB_MODE_POSE;
 	//oldbase->flag &= ~OB_POSEMODE;
 	
-	ED_armature_from_edit(scene, obedit);
+	ED_armature_from_edit(obedit);
 	ED_armature_edit_free(obedit);
 	
 	/* 2) duplicate base */
@@ -4334,7 +4332,7 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
 		/* in weightpaint we select the associated vertex group too */
 		if (ob->mode & OB_MODE_WEIGHT_PAINT) {
 			if (nearBone->flag & BONE_ACTIVE) {
-				vertexgroup_select_by_name(OBACT, nearBone->name);
+				ED_vgroup_select_by_name(OBACT, nearBone->name);
 				DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 			}
 		}
@@ -4445,7 +4443,7 @@ static int bone_skinnable(Object *ob, Bone *bone, void *datap)
     return 0;
 }
 
-static int add_defgroup_unique_bone(Object *ob, Bone *bone, void *data) 
+static int ED_vgroup_add_unique_bone(Object *ob, Bone *bone, void *data) 
 {
     /* This group creates a vertex group to ob that has the
       * same name as bone (provided the bone is skinnable). 
@@ -4453,7 +4451,7 @@ static int add_defgroup_unique_bone(Object *ob, Bone *bone, void *data)
       */
 	if (!(bone->flag & BONE_NO_DEFORM)) {
 		if (!get_named_vertexgroup(ob,bone->name)) {
-			add_defgroup_name(ob, bone->name);
+			ED_vgroup_add_name(ob, bone->name);
 			return 1;
 		}
     }
@@ -4497,7 +4495,7 @@ static int dgroup_skinnable(Object *ob, Bone *bone, void *datap)
 				segments = 1;
 			
 			if (!(defgroup = get_named_vertexgroup(ob, bone->name)))
-				defgroup = add_defgroup_name(ob, bone->name);
+				defgroup = ED_vgroup_add_name(ob, bone->name);
 			
 			if (data->list != NULL) {
 				hgroup = (bDeformGroup ***) &data->list;
@@ -4548,17 +4546,17 @@ static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], i
 			
 			/* add the vert to the deform group if weight!=0.0 */
 			if (distance!=0.0)
-				add_vert_to_defgroup (ob, dgroup, i, distance, WEIGHT_REPLACE);
+				ED_vgroup_vert_add (ob, dgroup, i, distance, WEIGHT_REPLACE);
 			else
-				remove_vert_defgroup (ob, dgroup, i);
+				ED_vgroup_vert_remove (ob, dgroup, i);
 			
 			/* do same for mirror */
 			if (dgroupflip && dgroupflip[j] && iflip >= 0) {
 				if (distance!=0.0)
-					add_vert_to_defgroup (ob, dgroupflip[j], iflip, distance,
+					ED_vgroup_vert_add (ob, dgroupflip[j], iflip, distance,
 						WEIGHT_REPLACE);
 				else
-					remove_vert_defgroup (ob, dgroupflip[j], iflip);
+					ED_vgroup_vert_remove (ob, dgroupflip[j], iflip);
 			}
 		}
 	}
@@ -4748,10 +4746,10 @@ void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int mod
 		/* Traverse the bone list, trying to create empty vertex 
 		 * groups cooresponding to the bone.
 		 */
-		bone_looper(ob, arm->bonebase.first, NULL, add_defgroup_unique_bone);
+		bone_looper(ob, arm->bonebase.first, NULL, ED_vgroup_add_unique_bone);
 
 		if (ob->type == OB_MESH)
-			create_dverts(ob->data);
+			ED_vgroup_data_create(ob->data);
 	}
 	else if(mode == ARM_GROUPS_ENVELOPE || mode == ARM_GROUPS_AUTO) {
 		/* Traverse the bone list, trying to create vertex groups 
@@ -5659,7 +5657,7 @@ void generateSkeletonFromReebGraph(Scene *scene, ReebGraph *rg)
 	
 	if (obedit != NULL)
 	{
-		ED_armature_from_edit(scene, obedit);
+		ED_armature_from_edit(obedit);
 		ED_armature_edit_free(obedit);
 	}
 	
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c
index 1d87ca8a6df..16e78f7c8d1 100644
--- a/source/blender/editors/armature/editarmature_retarget.c
+++ b/source/blender/editors/armature/editarmature_retarget.c
@@ -2732,7 +2732,7 @@ static void adjustGraphs(bContext *C, RigGraph *rigg)
 
 	/* Turn the list into an armature */
 	arm->edbo = rigg->editbones;
-	ED_armature_from_edit(scene, rigg->ob);
+	ED_armature_from_edit(rigg->ob);
 	
 	ED_undo_push(C, "Retarget Skeleton");
 }
@@ -2762,7 +2762,7 @@ static void retargetGraphs(bContext *C, RigGraph *rigg)
 
 	/* Turn the list into an armature */
 	arm->edbo = rigg->editbones;
-	ED_armature_from_edit(scene, rigg->ob);
+	ED_armature_from_edit(rigg->ob);
 }
 
 char *RIG_nameBone(RigGraph *rg, int arc_index, int bone_index)
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 1b167518a5a..a6c94bee5b1 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -672,9 +672,9 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numbones,
 		/* clear weights */
 		if(bbone && firstsegment) {
 			for(a=0; a<me->totvert; a++) {
-				remove_vert_defgroup(ob, dgrouplist[j], a);
+				ED_vgroup_vert_remove(ob, dgrouplist[j], a);
 				if(vertsflipped && dgroupflip[j] && vertsflipped[a] >= 0)
-					remove_vert_defgroup(ob, dgroupflip[j], vertsflipped[a]);
+					ED_vgroup_vert_remove(ob, dgroupflip[j], vertsflipped[a]);
 			}
 		}
 
@@ -694,32 +694,32 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numbones,
 				
 				if(bbone) {
 					if(solution > 0.0f)
-						add_vert_to_defgroup(ob, dgrouplist[j], a, solution,
+						ED_vgroup_vert_add(ob, dgrouplist[j], a, solution,
 							WEIGHT_ADD);
 				}
 				else {
 					weight= heat_limit_weight(solution);
 					if(weight > 0.0f)
-						add_vert_to_defgroup(ob, dgrouplist[j], a, weight,
+						ED_vgroup_vert_add(ob, dgrouplist[j], a, weight,
 							WEIGHT_REPLACE);
 					else
-						remove_vert_defgroup(ob, dgrouplist[j], a);
+						ED_vgroup_vert_remove(ob, dgrouplist[j], a);
 				}
 
 				/* do same for mirror */
 				if(vertsflipped && dgroupflip[j] && vertsflipped[a] >= 0) {
 					if(bbone) {
 						if(solution > 0.0f)
-							add_vert_to_defgroup(ob, dgroupflip[j], vertsflipped[a],
+							ED_vgroup_vert_add(ob, dgroupflip[j], vertsflipped[a],
 								solution, WEIGHT_ADD);
 					}
 					else {
 						weight= heat_limit_weight(solution);
 						if(weight > 0.0f)
-							add_vert_to_defgroup(ob, dgroupflip[j], vertsflipped[a],
+							ED_vgroup_vert_add(ob, dgroupflip[j], vertsflipped[a],
 								weight, WEIGHT_REPLACE);
 						else
-							remove_vert_defgroup(ob, dgroupflip[j], vertsflipped[a]);
+							ED_vgroup_vert_remove(ob, dgroupflip[j], vertsflipped[a]);
 					}
 				}
 			}
@@ -734,16 +734,16 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numbones,
 		/* remove too small vertex weights */
 		if(bbone && lastsegment) {
 			for(a=0; a<me->totvert; a++) {
-				weight= get_vert_defgroup(ob, dgrouplist[j], a);
+				weight= ED_vgroup_vert_weight(ob, dgrouplist[j], a);
 				weight= heat_limit_weight(weight);
 				if(weight <= 0.0f)
-					remove_vert_defgroup(ob, dgrouplist[j], a);
+					ED_vgroup_vert_remove(ob, dgrouplist[j], a);
 
 				if(vertsflipped && dgroupflip[j] && vertsflipped[a] >= 0) {
-					weight= get_vert_defgroup(ob, dgroupflip[j], vertsflipped[a]);
+					weight= ED_vgroup_vert_weight(ob, dgroupflip[j], vertsflipped[a]);
 					weight= heat_limit_weight(weight);
 					if(weight <= 0.0f)
-						remove_vert_defgroup(ob, dgroupflip[j], vertsflipped[a]);
+						ED_vgroup_vert_remove(ob, dgroupflip[j], vertsflipped[a]);
 				}
 			}
 		}
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index a4a518bc003..0ae92de4407 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -1673,7 +1673,7 @@ void pose_activate_flipped_bone(Scene *scene)
 			
 				/* in weightpaint we select the associated vertex group too */
 				if(ob->mode & OB_MODE_WEIGHT_PAINT) {
-					vertexgroup_select_by_name(OBACT, name);
+					ED_vgroup_select_by_name(OBACT, name);
 					DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 				}
 				
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 738cbf094cb..8bdfe41ef80 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -95,7 +95,7 @@ void ED_operatortypes_armature(void);
 void ED_keymap_armature(struct wmWindowManager *wm);
 
 /* editarmature.c */
-void ED_armature_from_edit(struct Scene *scene, struct Object *obedit);
+void ED_armature_from_edit(struct Object *obedit);
 void ED_armature_to_edit(struct Object *ob);
 void ED_armature_edit_free(struct Object *ob);
 void ED_armature_edit_remake(struct Object *obedit);
@@ -116,6 +116,8 @@ void transform_armature_mirror_update(struct Object *obedit);
 void clear_armature(struct Scene *scene, struct Object *ob, char mode);
 void docenter_armature (struct Scene *scene, struct View3D *v3d, struct Object *ob, int centermode);
 
+void ED_armature_apply_transform(struct Object *ob, float mat[4][4]);
+
 #define ARM_GROUPS_NAME		1
 #define ARM_GROUPS_ENVELOPE	2
 #define ARM_GROUPS_AUTO		3
diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h
index adb50867bf9..49c1d856a27 100644
--- a/source/blender/editors/include/ED_mball.h
+++ b/source/blender/editors/include/ED_mball.h
@@ -26,6 +26,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+struct bContext;
+struct Object;
+struct wmWindowManager;
+
 void ED_operatortypes_metaball(void);
 void ED_keymap_metaball(struct wmWindowManager *wm);
 
@@ -37,3 +41,5 @@ void free_editMball(struct Object *obedit);
 void make_editMball(struct Object *obedit);
 void load_editMball(struct Object *obedit);
 
+void undo_push_mball(struct bContext *C, char *name);
+
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 0face00f82b..a2dba89ec20 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -157,25 +157,23 @@ void		EM_deselect_by_material(struct EditMesh *em, int index);
 /* editface.c */
 struct MTFace	*EM_get_active_mtface(struct EditMesh *em, struct EditFace **act_efa, struct MCol **mcol, int sloppy);
 
-/* editdeform.c XXX rename functions? */
+/* object_vgroup.c */
 
 #define WEIGHT_REPLACE 1
 #define WEIGHT_ADD 2
 #define WEIGHT_SUBTRACT 3
 
-void		add_defgroup (Object *ob);
-void		create_dverts(struct ID *id);
-float		get_vert_defgroup (Object *ob, struct bDeformGroup *dg, int vertnum);
-void		remove_vert_defgroup (Object *ob, struct bDeformGroup *dg, int vertnum);
-void		remove_verts_defgroup (Object *obedit, int allverts);
-void		vertexgroup_select_by_name(Object *ob, char *name);
-void		add_vert_to_defgroup (Object *ob, struct bDeformGroup *dg, int vertnum, 
-                           float weight, int assignmode);
+struct bDeformGroup		*ED_vgroup_add(struct Object *ob);
+struct bDeformGroup		*ED_vgroup_add_name(struct Object *ob, char *name);
+void					ED_vgroup_select_by_name(struct Object *ob, char *name);
+void					ED_vgroup_data_create(struct ID *id);
 
-struct bDeformGroup		*add_defgroup_name (Object *ob, char *name);
-struct MDeformWeight	*verify_defweight (struct MDeformVert *dv, int defgroup);
-struct MDeformWeight	*get_defweight (struct MDeformVert *dv, int defgroup);
+void		ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum,  float weight, int assignmode);
+void		ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum);
+float		ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum);
 
+struct MDeformWeight	*ED_vgroup_weight_verify(struct MDeformVert *dv, int defgroup);
+struct MDeformWeight	*ED_vgroup_weight_get(struct MDeformVert *dv, int defgroup);
 
 #endif /* ED_MESH_H */
 
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index d31f85d08ea..67dc6dada5f 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -89,14 +89,11 @@ void object_test_constraints(struct Object *ob);
 void ED_object_constraint_rename(struct Object *ob, struct bConstraint *con, char *oldname);
 void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con);
 
-/* editlattice.c */
+/* object_lattice.c */
 void mouse_lattice(struct bContext *C, short mval[2], int extend);
 void undo_push_lattice(struct bContext *C, char *name);
 
-/* editmball.c */
-void undo_push_mball(struct bContext *C, char *name);
-
-/* editkey.c */
+/* object_shapekey.c */
 void insert_shapekey(struct Scene *scene, struct Object *ob);
 void delete_key(struct Scene *scene, struct Object *ob);
 void key_to_mesh(struct KeyBlock *kb, struct Mesh *me);
diff --git a/source/blender/editors/metaball/editmball.c b/source/blender/editors/metaball/mball_edit.c
similarity index 100%
rename from source/blender/editors/metaball/editmball.c
rename to source/blender/editors/metaball/mball_edit.c
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
new file mode 100644
index 00000000000..eaf7d41b9fe
--- /dev/null
+++ b/source/blender/editors/object/object_add.c
@@ -0,0 +1,1451 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, 2002-2008 full recode
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_action_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_group_types.h"
+#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_object_fluidsim.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_vfont_types.h"
+
+#include "BLI_arithb.h"
+#include "BLI_listbase.h"
+
+#include "BKE_anim.h"
+#include "BKE_armature.h"
+#include "BKE_constraint.h"
+#include "BKE_context.h"
+#include "BKE_curve.h"
+#include "BKE_customdata.h"
+#include "BKE_depsgraph.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_displist.h"
+#include "BKE_global.h"
+#include "BKE_group.h"
+#include "BKE_lattice.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_material.h"
+#include "BKE_mball.h"
+#include "BKE_mesh.h"
+#include "BKE_modifier.h"
+#include "BKE_object.h"
+#include "BKE_particle.h"
+#include "BKE_report.h"
+#include "BKE_sca.h"
+#include "BKE_scene.h"
+#include "BKE_texture.h"
+#include "BKE_utildefines.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_anim_api.h"
+#include "ED_armature.h"
+#include "ED_curve.h"
+#include "ED_mball.h"
+#include "ED_mesh.h"
+#include "ED_object.h"
+#include "ED_screen.h"
+#include "ED_transform.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "object_intern.h"
+
+/************************** Exported *****************************/
+
+void ED_object_base_init_from_view(bContext *C, Base *base)
+{
+	View3D *v3d= CTX_wm_view3d(C);
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= base->object;
+	
+	if (scene==NULL)
+		return;
+	
+	if (v3d==NULL) {
+		base->lay = scene->lay;
+		VECCOPY(ob->loc, scene->cursor);
+	} 
+	else {
+		if (v3d->localview) {
+			base->lay= ob->lay= v3d->layact | v3d->lay;
+			VECCOPY(ob->loc, v3d->cursor);
+		} 
+		else {
+			base->lay= ob->lay= v3d->layact;
+			VECCOPY(ob->loc, scene->cursor);
+		}
+		
+		if (U.flag & USER_ADD_VIEWALIGNED) {
+			ARegion *ar= CTX_wm_region(C);
+			if(ar) {
+				RegionView3D *rv3d= ar->regiondata;
+				
+				rv3d->viewquat[0]= -rv3d->viewquat[0];
+				QuatToEul(rv3d->viewquat, ob->rot);
+				rv3d->viewquat[0]= -rv3d->viewquat[0];
+			}
+		}
+	}
+	where_is_object(scene, ob);
+}
+
+/********************* Add Object Operator ********************/
+
+void add_object_draw(Scene *scene, View3D *v3d, int type)	/* for toolbox or menus, only non-editmode stuff */
+{
+	/* keep here to get things compile, remove later */
+}
+
+/* for object add primitive operators */
+static Object *object_add_type(bContext *C, int type)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob;
+	
+	/* for as long scene has editmode... */
+	if (CTX_data_edit_object(C)) 
+		ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* freedata, and undo */
+	
+	/* deselects all, sets scene->basact */
+	ob= add_object(scene, type);
+	/* editor level activate, notifiers */
+	ED_base_object_activate(C, BASACT);
+
+	/* more editor stuff */
+	ED_object_base_init_from_view(C, BASACT);
+
+	DAG_scene_sort(scene);
+
+	return ob;
+}
+
+/* for object add operator */
+static int object_add_exec(bContext *C, wmOperator *op)
+{
+	object_add_type(C, RNA_int_get(op->ptr, "type"));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Object";
+	ot->description = "Add an object to the scene.";
+	ot->idname= "OBJECT_OT_add";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_add_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", object_type_items, 0, "Type", "");
+}
+
+/* ***************** add primitives *************** */
+/* ******  work both in and outside editmode ****** */
+
+static EnumPropertyItem prop_mesh_types[] = {
+	{0, "PLANE", ICON_MESH_PLANE, "Plane", ""},
+	{1, "CUBE", ICON_MESH_CUBE, "Cube", ""},
+	{2, "CIRCLE", ICON_MESH_CIRCLE, "Circle", ""},
+	{3, "UVSPHERE", ICON_MESH_UVSPHERE, "UVsphere", ""},
+	{4, "ICOSPHERE", ICON_MESH_ICOSPHERE, "Icosphere", ""},
+	{5, "CYLINDER", ICON_MESH_TUBE, "Cylinder", ""},
+	{6, "CONE", ICON_MESH_CONE, "Cone", ""},
+	{0, "", 0, NULL, NULL},
+	{7, "GRID", ICON_MESH_GRID, "Grid", ""},
+	{8, "MONKEY", ICON_MESH_MONKEY, "Monkey", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int object_add_mesh_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	int newob= 0;
+	
+	if(obedit==NULL || obedit->type!=OB_MESH) {
+		object_add_type(C, OB_MESH);
+		ED_object_enter_editmode(C, EM_DO_UNDO);
+		newob = 1;
+	}
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+
+	switch(RNA_enum_get(op->ptr, "type")) {
+		case 0:
+			WM_operator_name_call(C, "MESH_OT_primitive_plane_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 1:
+			WM_operator_name_call(C, "MESH_OT_primitive_cube_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 2:
+			WM_operator_name_call(C, "MESH_OT_primitive_circle_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 3:
+			WM_operator_name_call(C, "MESH_OT_primitive_uv_sphere_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 4:
+			WM_operator_name_call(C, "MESH_OT_primitive_ico_sphere_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 5:
+			WM_operator_name_call(C, "MESH_OT_primitive_cylinder_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 6:
+			WM_operator_name_call(C, "MESH_OT_primitive_cone_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 7:
+			WM_operator_name_call(C, "MESH_OT_primitive_grid_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+		case 8:
+			WM_operator_name_call(C, "MESH_OT_primitive_monkey_add", WM_OP_INVOKE_REGION_WIN, NULL);
+			break;
+	}
+	/* userdef */
+	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
+		ED_object_exit_editmode(C, EM_FREEDATA);
+	}
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
+	
+	return OPERATOR_FINISHED;
+}
+
+
+void OBJECT_OT_mesh_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Mesh";
+	ot->description = "Add a mesh object to the scene.";
+	ot->idname= "OBJECT_OT_mesh_add";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_add_mesh_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags: no register or undo, this operator calls operators */
+	ot->flag= 0; //OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_mesh_types, 0, "Primitive", "");
+}
+
+static EnumPropertyItem prop_curve_types[] = {
+	{CU_BEZIER|CU_PRIM_CURVE, "BEZIER_CURVE", ICON_CURVE_BEZCURVE, "Bezier Curve", ""},
+	{CU_BEZIER|CU_PRIM_CIRCLE, "BEZIER_CIRCLE", ICON_CURVE_BEZCIRCLE, "Bezier Circle", ""},
+	{CU_NURBS|CU_PRIM_CURVE, "NURBS_CURVE", ICON_CURVE_NCURVE, "NURBS Curve", ""},
+	{CU_NURBS|CU_PRIM_CIRCLE, "NURBS_CIRCLE", ICON_CURVE_NCIRCLE, "NURBS Circle", ""},
+	{CU_NURBS|CU_PRIM_PATH, "PATH", ICON_CURVE_PATH, "Path", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int object_add_curve_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	ListBase *editnurb;
+	Nurb *nu;
+	int newob= 0;
+	
+	if(obedit==NULL || obedit->type!=OB_CURVE) {
+		object_add_type(C, OB_CURVE);
+		ED_object_enter_editmode(C, 0);
+		newob = 1;
+	}
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+	
+	obedit= CTX_data_edit_object(C);
+	nu= add_nurbs_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
+	editnurb= curve_get_editcurve(obedit);
+	BLI_addtail(editnurb, nu);
+	
+	/* userdef */
+	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
+		ED_object_enter_editmode(C, 0);
+		ED_object_exit_editmode(C, EM_FREEDATA);
+	}
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
+	
+	return OPERATOR_FINISHED;
+}
+
+static int object_add_curve_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	uiPopupMenu *pup;
+	uiLayout *layout;
+
+	pup= uiPupMenuBegin(C, op->type->name, 0);
+	layout= uiPupMenuLayout(pup);
+	if(!obedit || obedit->type == OB_CURVE)
+		uiItemsEnumO(layout, op->type->idname, "type");
+	else
+		uiItemsEnumO(layout, "OBJECT_OT_surface_add", "type");
+	uiPupMenuEnd(C, pup);
+
+	return OPERATOR_CANCELLED;
+}
+
+void OBJECT_OT_curve_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Curve";
+	ot->description = "Add a curve object to the scene.";
+	ot->idname= "OBJECT_OT_curve_add";
+	
+	/* api callbacks */
+	ot->invoke= object_add_curve_invoke;
+	ot->exec= object_add_curve_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_curve_types, 0, "Primitive", "");
+}
+
+static EnumPropertyItem prop_surface_types[]= {
+	{CU_PRIM_CURVE|CU_NURBS, "NURBS_CURVE", ICON_SURFACE_NCURVE, "NURBS Curve", ""},
+	{CU_PRIM_CIRCLE|CU_NURBS, "NURBS_CIRCLE", ICON_SURFACE_NCIRCLE, "NURBS Circle", ""},
+	{CU_PRIM_PATCH|CU_NURBS, "NURBS_SURFACE", ICON_SURFACE_NSURFACE, "NURBS Surface", ""},
+	{CU_PRIM_TUBE|CU_NURBS, "NURBS_TUBE", ICON_SURFACE_NTUBE, "NURBS Tube", ""},
+	{CU_PRIM_SPHERE|CU_NURBS, "NURBS_SPHERE", ICON_SURFACE_NSPHERE, "NURBS Sphere", ""},
+	{CU_PRIM_DONUT|CU_NURBS, "NURBS_DONUT", ICON_SURFACE_NDONUT, "NURBS Donut", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int object_add_surface_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	ListBase *editnurb;
+	Nurb *nu;
+	int newob= 0;
+	
+	if(obedit==NULL || obedit->type!=OB_SURF) {
+		object_add_type(C, OB_SURF);
+		ED_object_enter_editmode(C, 0);
+		newob = 1;
+	}
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+	
+	obedit= CTX_data_edit_object(C);
+	nu= add_nurbs_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
+	editnurb= curve_get_editcurve(obedit);
+	BLI_addtail(editnurb, nu);
+	
+	/* userdef */
+	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
+		ED_object_exit_editmode(C, EM_FREEDATA);
+	}
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_surface_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Surface";
+	ot->description = "Add a surface object to the scene.";
+	ot->idname= "OBJECT_OT_surface_add";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_add_surface_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_surface_types, 0, "Primitive", "");
+}
+
+static EnumPropertyItem prop_metaball_types[]= {
+	{MB_BALL, "MBALL_BALL", ICON_META_BALL, "Meta Ball", ""},
+	{MB_TUBE, "MBALL_TUBE", ICON_META_TUBE, "Meta Tube", ""},
+	{MB_PLANE, "MBALL_PLANE", ICON_META_PLANE, "Meta Plane", ""},
+	{MB_CUBE, "MBALL_CUBE", ICON_META_CUBE, "Meta Cube", ""},
+	{MB_ELIPSOID, "MBALL_ELLIPSOID", ICON_META_ELLIPSOID, "Meta Ellipsoid", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int object_metaball_add_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	MetaBall *mball;
+	MetaElem *elem;
+	int newob= 0;
+	
+	if(obedit==NULL || obedit->type!=OB_MBALL) {
+		object_add_type(C, OB_MBALL);
+		ED_object_enter_editmode(C, 0);
+		newob = 1;
+	}
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+	
+	obedit= CTX_data_edit_object(C);
+	elem= (MetaElem*)add_metaball_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
+	mball= (MetaBall*)obedit->data;
+	BLI_addtail(mball->editelems, elem);
+	
+	/* userdef */
+	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
+		ED_object_exit_editmode(C, EM_FREEDATA);
+	}
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
+	
+	return OPERATOR_FINISHED;
+}
+
+static int object_metaball_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	uiPopupMenu *pup;
+	uiLayout *layout;
+
+	pup= uiPupMenuBegin(C, op->type->name, 0);
+	layout= uiPupMenuLayout(pup);
+	if(!obedit || obedit->type == OB_MBALL)
+		uiItemsEnumO(layout, op->type->idname, "type");
+	else
+		uiItemsEnumO(layout, "OBJECT_OT_metaball_add", "type");
+	uiPupMenuEnd(C, pup);
+
+	return OPERATOR_CANCELLED;
+}
+
+void OBJECT_OT_metaball_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Metaball";
+	ot->description= "Add an metaball object to the scene.";
+	ot->idname= "OBJECT_OT_metaball_add";
+
+	/* api callbacks */
+	ot->invoke= object_metaball_add_invoke;
+	ot->exec= object_metaball_add_exec;
+	ot->poll= ED_operator_scene_editable;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_metaball_types, 0, "Primitive", "");
+}
+static int object_add_text_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	
+	if(obedit && obedit->type==OB_FONT)
+		return OPERATOR_CANCELLED;
+
+	object_add_type(C, OB_FONT);
+	obedit= CTX_data_active_object(C);
+
+	if(U.flag & USER_ADD_EDITMODE)
+		ED_object_enter_editmode(C, 0);
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_text_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Text";
+	ot->description = "Add a text object to the scene";
+	ot->idname= "OBJECT_OT_text_add";
+	
+	/* api callbacks */
+	ot->exec= object_add_text_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int object_armature_add_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	View3D *v3d= CTX_wm_view3d(C);
+	RegionView3D *rv3d= NULL;
+	int newob= 0;
+	
+	if ((obedit==NULL) || (obedit->type != OB_ARMATURE)) {
+		object_add_type(C, OB_ARMATURE);
+		ED_object_enter_editmode(C, 0);
+		newob = 1;
+	}
+	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+	
+	if(v3d) 
+		rv3d= CTX_wm_region(C)->regiondata;
+	
+	/* v3d and rv3d are allowed to be NULL */
+	add_primitive_bone(CTX_data_scene(C), v3d, rv3d);
+
+	/* userdef */
+	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
+		ED_object_exit_editmode(C, EM_FREEDATA);
+	}
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_armature_add(wmOperatorType *ot)
+{	
+	/* identifiers */
+	ot->name= "Add Armature";
+	ot->description = "Add an armature object to the scene.";
+	ot->idname= "OBJECT_OT_armature_add";
+	
+	/* api callbacks */
+	ot->exec= object_armature_add_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int object_primitive_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	uiPopupMenu *pup= uiPupMenuBegin(C, "Add Object", 0);
+	uiLayout *layout= uiPupMenuLayout(pup);
+	
+	uiItemMenuEnumO(layout, "Mesh", ICON_OUTLINER_OB_MESH, "OBJECT_OT_mesh_add", "type");
+	uiItemMenuEnumO(layout, "Curve", ICON_OUTLINER_OB_CURVE, "OBJECT_OT_curve_add", "type");
+	uiItemMenuEnumO(layout, "Surface", ICON_OUTLINER_OB_SURFACE, "OBJECT_OT_surface_add", "type");
+	uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_META, "OBJECT_OT_metaball_add", "type");
+	uiItemO(layout, "Text", ICON_OUTLINER_OB_FONT, "OBJECT_OT_text_add");
+	uiItemS(layout);
+	uiItemO(layout, "Armature", ICON_OUTLINER_OB_ARMATURE, "OBJECT_OT_armature_add");
+	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_LATTICE, "OBJECT_OT_add", "type", OB_LATTICE);
+	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_EMPTY, "OBJECT_OT_add", "type", OB_EMPTY);
+	uiItemS(layout);
+	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_CAMERA, "OBJECT_OT_add", "type", OB_CAMERA);
+	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_LAMP, "OBJECT_OT_add", "type", OB_LAMP);
+	
+	uiPupMenuEnd(C, pup);
+	
+	/* this operator is only for a menu, not used further */
+	return OPERATOR_CANCELLED;
+}
+
+/* only used as menu */
+void OBJECT_OT_primitive_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Primitive";
+	ot->description = "Add a primitive object.";
+	ot->idname= "OBJECT_OT_primitive_add";
+	
+	/* api callbacks */
+	ot->invoke= object_primitive_add_invoke;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= 0;
+}
+
+/**************************** Delete Object *************************/
+
+/* remove base from a specific scene */
+/* note: now unlinks constraints as well */
+void ED_base_object_free_and_unlink(Scene *scene, Base *base)
+{
+	BLI_remlink(&scene->base, base);
+	free_libblock_us(&G.main->object, base->object);
+	if(scene->basact==base) scene->basact= NULL;
+	MEM_freeN(base);
+}
+
+static int object_delete_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	int islamp= 0;
+	
+	if(CTX_data_edit_object(C)) 
+		return OPERATOR_CANCELLED;
+	
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+
+		if(base->object->type==OB_LAMP) islamp= 1;
+		
+		/* remove from current scene only */
+		ED_base_object_free_and_unlink(scene, base);
+	}
+	CTX_DATA_END;
+
+	if(islamp) reshadeall_displist(scene);	/* only frees displist */
+	
+	DAG_scene_sort(scene);
+	ED_anim_dag_flush_update(C);
+	
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_delete(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Delete";
+	ot->description = "Delete selected objects.";
+	ot->idname= "OBJECT_OT_delete";
+	
+	/* api callbacks */
+	ot->invoke= WM_operator_confirm;
+	ot->exec= object_delete_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/**************************** Copy Utilities ******************************/
+
+static void copy_object__forwardModifierLinks(void *userData, Object *ob,
+                                              ID **idpoin)
+{
+	/* this is copied from ID_NEW; it might be better to have a macro */
+	if(*idpoin && (*idpoin)->newid) *idpoin = (*idpoin)->newid;
+}
+
+/* after copying objects, copied data should get new pointers */
+static void copy_object_set_idnew(bContext *C, int dupflag)
+{
+	Object *ob;
+	Material *ma, *mao;
+	ID *id;
+#if 0 // XXX old animation system
+	Ipo *ipo;
+	bActionStrip *strip;
+#endif // XXX old animation system
+	int a;
+	
+	/* XXX check object pointers */
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		ob= base->object;
+		relink_constraints(&ob->constraints);
+		if (ob->pose){
+			bPoseChannel *chan;
+			for (chan = ob->pose->chanbase.first; chan; chan=chan->next){
+				relink_constraints(&chan->constraints);
+			}
+		}
+		modifiers_foreachIDLink(ob, copy_object__forwardModifierLinks, NULL);
+		ID_NEW(ob->parent);
+		ID_NEW(ob->track);
+		ID_NEW(ob->proxy);
+		ID_NEW(ob->proxy_group);
+		
+#if 0 // XXX old animation system
+		for(strip= ob->nlastrips.first; strip; strip= strip->next) {
+			bActionModifier *amod;
+			for(amod= strip->modifiers.first; amod; amod= amod->next)
+				ID_NEW(amod->ob);
+		}
+#endif // XXX old animation system
+	}
+	CTX_DATA_END;
+	
+	/* materials */
+	if( dupflag & USER_DUP_MAT) {
+		mao= G.main->mat.first;
+		while(mao) {
+			if(mao->id.newid) {
+				
+				ma= (Material *)mao->id.newid;
+				
+				if(dupflag & USER_DUP_TEX) {
+					for(a=0; a<MAX_MTEX; a++) {
+						if(ma->mtex[a]) {
+							id= (ID *)ma->mtex[a]->tex;
+							if(id) {
+								ID_NEW_US(ma->mtex[a]->tex)
+								else ma->mtex[a]->tex= copy_texture(ma->mtex[a]->tex);
+								id->us--;
+							}
+						}
+					}
+				}
+#if 0 // XXX old animation system
+				id= (ID *)ma->ipo;
+				if(id) {
+					ID_NEW_US(ma->ipo)
+					else ma->ipo= copy_ipo(ma->ipo);
+					id->us--;
+				}
+#endif // XXX old animation system
+			}
+			mao= mao->id.next;
+		}
+	}
+	
+#if 0 // XXX old animation system
+	/* lamps */
+	if( dupflag & USER_DUP_IPO) {
+		Lamp *la= G.main->lamp.first;
+		while(la) {
+			if(la->id.newid) {
+				Lamp *lan= (Lamp *)la->id.newid;
+				id= (ID *)lan->ipo;
+				if(id) {
+					ID_NEW_US(lan->ipo)
+					else lan->ipo= copy_ipo(lan->ipo);
+					id->us--;
+				}
+			}
+			la= la->id.next;
+		}
+	}
+	
+	/* ipos */
+	ipo= G.main->ipo.first;
+	while(ipo) {
+		if(ipo->id.lib==NULL && ipo->id.newid) {
+			Ipo *ipon= (Ipo *)ipo->id.newid;
+			IpoCurve *icu;
+			for(icu= ipon->curve.first; icu; icu= icu->next) {
+				if(icu->driver) {
+					ID_NEW(icu->driver->ob);
+				}
+			}
+		}
+		ipo= ipo->id.next;
+	}
+#endif // XXX old animation system
+	
+	set_sca_new_poins();
+	
+	clear_id_newpoins();
+}
+
+/********************* Make Duplicates Real ************************/
+
+static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base)
+{
+	Base *basen;
+	Object *ob;
+	ListBase *lb;
+	DupliObject *dob;
+	
+	if(!base && !(base = BASACT))
+		return;
+	
+	if(!(base->object->transflag & OB_DUPLI))
+		return;
+	
+	lb= object_duplilist(scene, base->object);
+	
+	for(dob= lb->first; dob; dob= dob->next) {
+		ob= copy_object(dob->ob);
+		/* font duplis can have a totcol without material, we get them from parent
+		* should be implemented better...
+		*/
+		if(ob->mat==NULL) ob->totcol= 0;
+		
+		basen= MEM_dupallocN(base);
+		basen->flag &= ~OB_FROMDUPLI;
+		BLI_addhead(&scene->base, basen);	/* addhead: othwise eternal loop */
+		basen->object= ob;
+		ob->ipo= NULL;		/* make sure apply works */
+		ob->parent= ob->track= NULL;
+		ob->disp.first= ob->disp.last= NULL;
+		ob->transflag &= ~OB_DUPLI;	
+		
+		Mat4CpyMat4(ob->obmat, dob->mat);
+		ED_object_apply_obmat(ob);
+	}
+	
+	copy_object_set_idnew(C, 0);
+	
+	free_object_duplilist(lb);
+	
+	base->object->transflag &= ~OB_DUPLI;	
+}
+
+static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	
+	clear_id_newpoins();
+		
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		make_object_duplilist_real(C, scene, base);
+	}
+	CTX_DATA_END;
+
+	DAG_scene_sort(scene);
+	ED_anim_dag_flush_update(C);	
+	WM_event_add_notifier(C, NC_SCENE, scene);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_duplicates_make_real(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Make Duplicates Real";
+	ot->description = "Make dupli objects attached to this object real.";
+	ot->idname= "OBJECT_OT_duplicates_make_real";
+	
+	/* api callbacks */
+	ot->invoke= WM_operator_confirm;
+	ot->exec= object_duplicates_make_real_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/**************************** Convert **************************/
+
+static EnumPropertyItem convert_target_items[]= {
+	{OB_CURVE, "CURVE", 0, "Curve", ""},
+	{OB_MESH, "MESH", 0, "Mesh", ""},
+	{0, NULL, 0, NULL, NULL}};
+
+static void curvetomesh(Scene *scene, Object *ob) 
+{
+	Curve *cu= ob->data;
+	
+	if(cu->disp.first==0)
+		makeDispListCurveTypes(scene, ob, 0); /* force creation */
+
+	nurbs_to_mesh(ob); /* also does users */
+
+	if(ob->type == OB_MESH)
+		object_free_modifiers(ob);
+}
+
+static int convert_poll(bContext *C)
+{
+	Object *obact= CTX_data_active_object(C);
+	Scene *scene= CTX_data_scene(C);
+
+	return (!scene->id.lib && obact && scene->obedit != obact && (obact->flag & SELECT));
+}
+
+static int convert_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Base *basen=NULL, *basact, *basedel=NULL;
+	Object *ob, *ob1, *obact= CTX_data_active_object(C);
+	DerivedMesh *dm;
+	Curve *cu;
+	Nurb *nu;
+	MetaBall *mb;
+	Mesh *me;
+	int target= RNA_enum_get(op->ptr, "target");
+	int keep_original= RNA_boolean_get(op->ptr, "keep_original");
+	int a;
+	
+	/* don't forget multiple users! */
+
+	/* reset flags */
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		ob= base->object;
+		ob->flag &= ~OB_DONE;
+	}
+	CTX_DATA_END;
+
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		ob= base->object;
+		
+		if(ob->flag & OB_DONE)
+			continue;
+		else if(ob->type==OB_MESH && ob->modifiers.first) { /* converting a mesh with no modifiers causes a segfault */
+			ob->flag |= OB_DONE;
+			basedel = base;
+
+			ob1= copy_object(ob);
+			ob1->recalc |= OB_RECALC;
+
+			basen= MEM_mallocN(sizeof(Base), "duplibase");
+			*basen= *base;
+			BLI_addhead(&scene->base, basen);	/* addhead: otherwise eternal loop */
+			basen->object= ob1;
+			basen->flag |= SELECT;
+			base->flag &= ~SELECT;
+			ob->flag &= ~SELECT;
+
+			/* decrement original mesh's usage count  */
+			me= ob1->data;
+			me->id.us--;
+
+			/* make a new copy of the mesh */
+			ob1->data= copy_mesh(me);
+
+			/* make new mesh data from the original copy */
+			dm= mesh_get_derived_final(scene, ob1, CD_MASK_MESH);
+			/* dm= mesh_create_derived_no_deform(ob1, NULL);	this was called original (instead of get_derived). man o man why! (ton) */
+			
+			DM_to_mesh(dm, ob1->data);
+
+			dm->release(dm);
+			object_free_modifiers(ob1);	/* after derivedmesh calls! */
+		}
+		else if(ob->type==OB_FONT) {
+			ob->flag |= OB_DONE;
+
+			ob->type= OB_CURVE;
+			cu= ob->data;
+
+			if(cu->vfont) {
+				cu->vfont->id.us--;
+				cu->vfont= 0;
+			}
+			if(cu->vfontb) {
+				cu->vfontb->id.us--;
+				cu->vfontb= 0;
+			}
+			if(cu->vfonti) {
+				cu->vfonti->id.us--;
+				cu->vfonti= 0;
+			}
+			if(cu->vfontbi) {
+				cu->vfontbi->id.us--;
+				cu->vfontbi= 0;
+			}					
+			/* other users */
+			if(cu->id.us>1) {
+				for(ob1= G.main->object.first; ob1; ob1=ob1->id.next) {
+					if(ob1->data==cu) {
+						ob1->type= OB_CURVE;
+						ob1->recalc |= OB_RECALC;
+					}
+				}
+			}
+
+			for(nu=cu->nurb.first; nu; nu=nu->next)
+				nu->charidx= 0;
+
+			if(target == OB_MESH)
+				curvetomesh(scene, ob);
+		}
+		else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+			ob->flag |= OB_DONE;
+
+			if(target == OB_MESH)
+				curvetomesh(scene, ob);
+		}
+		else if(ob->type==OB_MBALL) {
+			ob= find_basis_mball(scene, ob);
+			
+			if(ob->disp.first && !(ob->flag & OB_DONE)) {
+				ob->flag |= OB_DONE;
+				basedel = base;
+
+				ob1= copy_object(ob);
+				ob1->recalc |= OB_RECALC;
+
+				basen= MEM_mallocN(sizeof(Base), "duplibase");
+				*basen= *base;
+				BLI_addhead(&scene->base, basen);	/* addhead: otherwise eternal loop */
+				basen->object= ob1;
+				basen->flag |= SELECT;
+				basedel->flag &= ~SELECT;
+				ob->flag &= ~SELECT;
+				
+				mb= ob1->data;
+				mb->id.us--;
+				
+				ob1->data= add_mesh("Mesh");
+				ob1->type= OB_MESH;
+				
+				me= ob1->data;
+				me->totcol= mb->totcol;
+				if(ob1->totcol) {
+					me->mat= MEM_dupallocN(mb->mat);
+					for(a=0; a<ob1->totcol; a++) id_us_plus((ID *)me->mat[a]);
+				}
+				
+				mball_to_mesh(&ob->disp, ob1->data);
+				
+				/* So we can see the wireframe */
+				BASACT= basen; // XXX hm
+			}
+			else
+				continue;
+		}
+		else
+			continue;
+
+		/* If the original object is active then make this object active */
+		if(basen) {
+			if(ob == obact) {
+				ED_base_object_activate(C, basen);
+				basact = basen;
+			}
+
+			basen= NULL;
+		}
+
+		/* delete original if needed */
+		if(basedel) {
+			if(!keep_original)
+				ED_base_object_free_and_unlink(scene, basedel);	
+
+			basedel = NULL;
+		}
+	}
+	CTX_DATA_END;
+	
+	/* delete object should renew depsgraph */
+	if(!keep_original)
+		DAG_scene_sort(scene);
+
+	/* texspace and normals */
+	if(!basen) BASACT= NULL; // XXX base;
+
+// XXX	ED_object_enter_editmode(C, 0);
+// XXX	exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR); /* freedata, but no undo */
+	BASACT= basact;
+
+	DAG_scene_sort(scene);
+	WM_event_add_notifier(C, NC_SCENE, scene);
+
+	return OPERATOR_FINISHED;
+}
+
+static int convert_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Object *obact= CTX_data_active_object(C);
+	uiPopupMenu *pup;
+	uiLayout *layout;
+	char *title;
+
+	if(obact->type==OB_FONT) {
+		pup= uiPupMenuBegin(C, "Convert Font to", 0);
+		layout= uiPupMenuLayout(pup);
+
+		uiItemEnumO(layout, "Curve", 0, op->type->idname, "target", OB_CURVE);
+	}
+	else {
+		if(obact->type == OB_MBALL)
+			title= "Convert Metaball to";
+		else if(obact->type == OB_CURVE)
+			title= "Convert Curve to";
+		else if(obact->type == OB_SURF)
+			title= "Convert Nurbs Surface to";
+		else if(obact->type == OB_MESH)
+			title= "Convert Modifiers to";
+		else
+			return OPERATOR_CANCELLED;
+
+		pup= uiPupMenuBegin(C, title, 0);
+		layout= uiPupMenuLayout(pup);
+	}
+
+	uiItemBooleanO(layout, "Mesh (keep original)", 0, op->type->idname, "keep_original", 1);
+	uiItemBooleanO(layout, "Mesh (delete original)", 0, op->type->idname, "keep_original", 0);
+
+	uiPupMenuEnd(C, pup);
+
+	return OPERATOR_CANCELLED;
+}
+
+void OBJECT_OT_convert(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Convert";
+	ot->description = "Convert selected objects to another type.";
+	ot->idname= "OBJECT_OT_convert";
+	
+	/* api callbacks */
+	ot->invoke= convert_invoke;
+	ot->exec= convert_exec;
+	ot->poll= convert_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_enum(ot->srna, "target", convert_target_items, OB_MESH, "Target", "Type of object to convert to.");
+	RNA_def_boolean(ot->srna, "keep_original", 0, "Keep Original", "Keep original objects instead of replacing them.");
+}
+
+/************************** Add Duplicate **********************/
+
+/* 
+	dupflag: a flag made from constants declared in DNA_userdef_types.h
+	The flag tells adduplicate() weather to copy data linked to the object, or to reference the existing data.
+	U.dupflag for default operations or you can construct a flag as python does
+	if the dupflag is 0 then no data will be copied (linked duplicate) */
+
+/* used below, assumes id.new is correct */
+/* leaves selection of base/object unaltered */
+static Base *object_add_duplicate_internal(Scene *scene, Base *base, int dupflag)
+{
+	Base *basen= NULL;
+	Material ***matarar;
+	Object *ob, *obn;
+	ID *id;
+	int a, didit;
+
+	ob= base->object;
+	if(ob->mode & OB_MODE_POSE) {
+		; /* nothing? */
+	}
+	else {
+		obn= copy_object(ob);
+		obn->recalc |= OB_RECALC;
+		
+		basen= MEM_mallocN(sizeof(Base), "duplibase");
+		*basen= *base;
+		BLI_addhead(&scene->base, basen);	/* addhead: prevent eternal loop */
+		basen->object= obn;
+		
+		if(basen->flag & OB_FROMGROUP) {
+			Group *group;
+			for(group= G.main->group.first; group; group= group->id.next) {
+				if(object_in_group(ob, group))
+					add_to_group(group, obn);
+			}
+			obn->flag |= OB_FROMGROUP; /* this flag is unset with copy_object() */
+		}
+		
+		/* duplicates using userflags */
+#if 0 // XXX old animation system				
+		if(dupflag & USER_DUP_IPO) {
+			bConstraintChannel *chan;
+			id= (ID *)obn->ipo;
+			
+			if(id) {
+				ID_NEW_US( obn->ipo)
+				else obn->ipo= copy_ipo(obn->ipo);
+				id->us--;
+			}
+			/* Handle constraint ipos */
+			for (chan=obn->constraintChannels.first; chan; chan=chan->next){
+				id= (ID *)chan->ipo;
+				if(id) {
+					ID_NEW_US( chan->ipo)
+					else chan->ipo= copy_ipo(chan->ipo);
+					id->us--;
+				}
+			}
+		}
+		if(dupflag & USER_DUP_ACT){ /* Not buttons in the UI to modify this, add later? */
+			id= (ID *)obn->action;
+			if (id){
+				ID_NEW_US(obn->action)
+				else{
+					obn->action= copy_action(obn->action);
+				}
+				id->us--;
+			}
+		}
+#endif // XXX old animation system
+		if(dupflag & USER_DUP_MAT) {
+			for(a=0; a<obn->totcol; a++) {
+				id= (ID *)obn->mat[a];
+				if(id) {
+					ID_NEW_US(obn->mat[a])
+					else obn->mat[a]= copy_material(obn->mat[a]);
+					id->us--;
+				}
+			}
+		}
+		if(dupflag & USER_DUP_PSYS) {
+			ParticleSystem *psys;
+			for(psys=obn->particlesystem.first; psys; psys=psys->next) {
+				id= (ID*) psys->part;
+				if(id) {
+					ID_NEW_US(psys->part)
+					else psys->part= psys_copy_settings(psys->part);
+					id->us--;
+				}
+			}
+		}
+		
+		id= obn->data;
+		didit= 0;
+		
+		switch(obn->type) {
+			case OB_MESH:
+				if(dupflag & USER_DUP_MESH) {
+					ID_NEW_US2( obn->data )
+					else {
+						obn->data= copy_mesh(obn->data);
+						
+						if(obn->fluidsimSettings) {
+							obn->fluidsimSettings->orgMesh = (Mesh *)obn->data;
+						}
+						
+						didit= 1;
+					}
+					id->us--;
+				}
+				break;
+			case OB_CURVE:
+				if(dupflag & USER_DUP_CURVE) {
+					ID_NEW_US2(obn->data )
+					else {
+						obn->data= copy_curve(obn->data);
+						didit= 1;
+					}
+					id->us--;
+				}
+				break;
+			case OB_SURF:
+				if(dupflag & USER_DUP_SURF) {
+					ID_NEW_US2( obn->data )
+					else {
+						obn->data= copy_curve(obn->data);
+						didit= 1;
+					}
+					id->us--;
+				}
+				break;
+			case OB_FONT:
+				if(dupflag & USER_DUP_FONT) {
+					ID_NEW_US2( obn->data )
+					else {
+						obn->data= copy_curve(obn->data);
+						didit= 1;
+					}
+					id->us--;
+				}
+				break;
+			case OB_MBALL:
+				if(dupflag & USER_DUP_MBALL) {
+					ID_NEW_US2(obn->data )
+					else {
+						obn->data= copy_mball(obn->data);
+						didit= 1;
+					}
+					id->us--;
+				}
+				break;
+			case OB_LAMP:
+				if(dupflag & USER_DUP_LAMP) {
+					ID_NEW_US2(obn->data )
+					else obn->data= copy_lamp(obn->data);
+					id->us--;
+				}
+				break;
+				
+			case OB_ARMATURE:
+				obn->recalc |= OB_RECALC_DATA;
+				if(obn->pose) obn->pose->flag |= POSE_RECALC;
+					
+					if(dupflag & USER_DUP_ARM) {
+						ID_NEW_US2(obn->data )
+						else {
+							obn->data= copy_armature(obn->data);
+							armature_rebuild_pose(obn, obn->data);
+							didit= 1;
+						}
+						id->us--;
+					}
+						
+						break;
+				
+			case OB_LATTICE:
+				if(dupflag!=0) {
+					ID_NEW_US2(obn->data )
+					else obn->data= copy_lattice(obn->data);
+					id->us--;
+				}
+				break;
+			case OB_CAMERA:
+				if(dupflag!=0) {
+					ID_NEW_US2(obn->data )
+					else obn->data= copy_camera(obn->data);
+					id->us--;
+				}
+				break;
+		}
+		
+		if(dupflag & USER_DUP_MAT) {
+			matarar= give_matarar(obn);
+			if(didit && matarar) {
+				for(a=0; a<obn->totcol; a++) {
+					id= (ID *)(*matarar)[a];
+					if(id) {
+						ID_NEW_US( (*matarar)[a] )
+						else (*matarar)[a]= copy_material((*matarar)[a]);
+						
+						id->us--;
+					}
+				}
+			}
+		}
+	}
+	return basen;
+}
+
+/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */
+/* leaves selection of base/object unaltered */
+Base *ED_object_add_duplicate(Scene *scene, Base *base, int dupflag)
+{
+	Base *basen;
+
+	clear_id_newpoins();
+	clear_sca_new_poins();	/* sensor/contr/act */
+	
+	basen= object_add_duplicate_internal(scene, base, dupflag);
+	
+	DAG_scene_sort(scene);
+	
+	return basen;
+}
+
+/* contextual operator dupli */
+static int duplicate_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	int linked= RNA_boolean_get(op->ptr, "linked");
+	int dupflag= (linked)? 0: U.dupflag;
+	
+	clear_id_newpoins();
+	clear_sca_new_poins();	/* sensor/contr/act */
+	
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		Base *basen= object_add_duplicate_internal(scene, base, dupflag);
+		
+		/* note that this is safe to do with this context iterator,
+		   the list is made in advance */
+		ED_base_object_select(base, BA_DESELECT);
+
+		/* new object becomes active */
+		if(BASACT==base)
+			ED_base_object_activate(C, basen);
+		
+	}
+	CTX_DATA_END;
+
+	copy_object_set_idnew(C, dupflag);
+
+	DAG_scene_sort(scene);
+	ED_anim_dag_flush_update(C);	
+
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_duplicate(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Duplicate";
+	ot->description = "Duplicate selected objects.";
+	ot->idname= "OBJECT_OT_duplicate";
+	
+	/* api callbacks */
+	ot->exec= duplicate_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* to give to transform */
+	RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data.");
+	RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+}
+
+/**************************** Join *************************/
+
+static int join_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_active_object(C);
+
+	if(scene->obedit) {
+		BKE_report(op->reports, RPT_ERROR, "This data does not support joining in editmode.");
+		return OPERATOR_CANCELLED;
+	}
+	else if(!ob) {
+		BKE_report(op->reports, RPT_ERROR, "Can't join unless there is an active object.");
+		return OPERATOR_CANCELLED;
+	}
+	else if(object_data_is_libdata(ob)) {
+		BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata.");
+		return OPERATOR_CANCELLED;
+	}
+
+	if(ob->type == OB_MESH)
+		return join_mesh_exec(C, op);
+	else if(ELEM(ob->type, OB_CURVE, OB_SURF))
+		return join_curve_exec(C, op);
+	else if(ob->type == OB_ARMATURE)
+		return join_armature_exec(C, op);
+
+	BKE_report(op->reports, RPT_ERROR, "This object type doesn't support joining.");
+
+	return OPERATOR_CANCELLED;
+}
+
+void OBJECT_OT_join(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Join";
+	ot->description = "Join selected objects into active object.";
+	ot->idname= "OBJECT_OT_join";
+	
+	/* api callbacks */
+	ot->exec= join_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
diff --git a/source/blender/editors/object/editconstraint.c b/source/blender/editors/object/object_constraint.c
similarity index 99%
rename from source/blender/editors/object/editconstraint.c
rename to source/blender/editors/object/object_constraint.c
index c1b1062bfc4..9b073ed5878 100644
--- a/source/blender/editors/object/editconstraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -76,9 +76,6 @@
 
 #include "object_intern.h"
 
-/* XXX */
-static int pupmenu() {return 0;}
-
 /* -------------- Get Active Constraint Data ---------------------- */
 
 /* if object in posemode, active bone constraints, else object constraints */
@@ -1107,7 +1104,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 #ifndef DISABLE_PYTHON
 			/* popup a list of usable scripts */
 			menustr = buildmenu_pyconstraints(NULL, &scriptint);
-			scriptint = pupmenu(menustr);
+			// XXX scriptint = pupmenu(menustr);
 			MEM_freeN(menustr);
 			
 			/* only add constraint if a script was chosen */
@@ -1416,3 +1413,4 @@ void POSE_OT_ik_clear(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
+
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 31a604a79df..daa63da03db 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -145,8 +145,6 @@
 static void error() {}
 static void waitcursor(int val) {}
 static int pupmenu(const char *msg) {return 0;}
-static int pupmenu_col(const char *msg, int val) {return 0;}
-static int okee(const char *msg) {return 0;}
 
 /* port over here */
 static bContext *C;
@@ -156,982 +154,6 @@ static void error_libdata() {}
 
 /* --------------------------------- */
 
-/* simple API for object selection, rather than just using the flag
- * this takes into account the 'restrict selection in 3d view' flag.
- * deselect works always, the restriction just prevents selection */
-
-/* Note: send a NC_SCENE|ND_OB_SELECT notifier yourself! */
-
-void ED_base_object_select(Base *base, short mode)
-{
-	if (base) {
-		if (mode==BA_SELECT) {
-			if (!(base->object->restrictflag & OB_RESTRICT_SELECT))
-				if (mode==BA_SELECT) base->flag |= SELECT;
-		}
-		else if (mode==BA_DESELECT) {
-			base->flag &= ~SELECT;
-		}
-		base->object->flag= base->flag;
-	}
-}
-
-/* also to set active NULL */
-void ED_base_object_activate(bContext *C, Base *base)
-{
-	Scene *scene= CTX_data_scene(C);
-	Base *tbase;
-	
-	/* sets scene->basact */
-	BASACT= base;
-	
-	if(base) {
-		
-		/* XXX old signals, remember to handle notifiers now! */
-		//		select_actionchannel_by_name(base->object->action, "Object", 1);
-		
-		/* disable temporal locks */
-		for(tbase=FIRSTBASE; tbase; tbase= tbase->next) {
-			if(base!=tbase && (tbase->object->shapeflag & OB_SHAPE_TEMPLOCK)) {
-				tbase->object->shapeflag &= ~OB_SHAPE_TEMPLOCK;
-				DAG_id_flush_update(&tbase->object->id, OB_RECALC_DATA);
-			}
-		}
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
-	}
-	else
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, NULL);
-}
-
-
-/* exported */
-void ED_object_base_init_from_view(bContext *C, Base *base)
-{
-	View3D *v3d= CTX_wm_view3d(C);
-	Scene *scene= CTX_data_scene(C);
-	Object *ob= base->object;
-	
-	if (scene==NULL)
-		return;
-	
-	if (v3d==NULL) {
-		base->lay = scene->lay;
-		VECCOPY(ob->loc, scene->cursor);
-	} 
-	else {
-		if (v3d->localview) {
-			base->lay= ob->lay= v3d->layact | v3d->lay;
-			VECCOPY(ob->loc, v3d->cursor);
-		} 
-		else {
-			base->lay= ob->lay= v3d->layact;
-			VECCOPY(ob->loc, scene->cursor);
-		}
-		
-		if (U.flag & USER_ADD_VIEWALIGNED) {
-			ARegion *ar= CTX_wm_region(C);
-			if(ar) {
-				RegionView3D *rv3d= ar->regiondata;
-				
-				rv3d->viewquat[0]= -rv3d->viewquat[0];
-				QuatToEul(rv3d->viewquat, ob->rot);
-				rv3d->viewquat[0]= -rv3d->viewquat[0];
-			}
-		}
-	}
-	where_is_object(scene, ob);
-}
-
-/* ******************* add object operator ****************** */
-
-static EnumPropertyItem prop_object_types[] = {
-	{OB_MESH, "MESH", 0, "Mesh", ""},
-	{OB_CURVE, "CURVE", 0, "Curve", ""},
-	{OB_SURF, "SURFACE", 0, "Surface", ""},
-	{OB_MBALL, "META", 0, "Meta", ""},
-	{OB_FONT, "TEXT", 0, "Text", ""},
-	{0, "", 0, NULL, NULL},
-	{OB_ARMATURE, "ARMATURE", 0, "Armature", ""},
-	{OB_LATTICE, "LATTICE", 0, "Lattice", ""},
-	{OB_EMPTY, "EMPTY", 0, "Empty", ""},
-	{0, "", 0, NULL, NULL},
-	{OB_CAMERA, "CAMERA", 0, "Camera", ""},
-	{OB_LAMP, "LAMP", 0, "Lamp", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-
-
-void add_object_draw(Scene *scene, View3D *v3d, int type)	/* for toolbox or menus, only non-editmode stuff */
-{
-	/* keep here to get things compile, remove later */
-}
-
-/* for object add primitive operators */
-static Object *object_add_type(bContext *C, int type)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *ob;
-	
-	/* for as long scene has editmode... */
-	if (CTX_data_edit_object(C)) 
-		ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* freedata, and undo */
-	
-	/* deselects all, sets scene->basact */
-	ob= add_object(scene, type);
-	/* editor level activate, notifiers */
-	ED_base_object_activate(C, BASACT);
-
-	/* more editor stuff */
-	ED_object_base_init_from_view(C, BASACT);
-
-	DAG_scene_sort(scene);
-
-	return ob;
-}
-
-/* for object add operator */
-static int object_add_exec(bContext *C, wmOperator *op)
-{
-	object_add_type(C, RNA_int_get(op->ptr, "type"));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_object_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Object";
-	ot->description = "Add an object to the scene.";
-	ot->idname= "OBJECT_OT_object_add";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_add_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_object_types, 0, "Type", "");
-}
-
-/* ***************** add primitives *************** */
-/* ******  work both in and outside editmode ****** */
-
-static EnumPropertyItem prop_mesh_types[] = {
-	{0, "PLANE", ICON_MESH_PLANE, "Plane", ""},
-	{1, "CUBE", ICON_MESH_CUBE, "Cube", ""},
-	{2, "CIRCLE", ICON_MESH_CIRCLE, "Circle", ""},
-	{3, "UVSPHERE", ICON_MESH_UVSPHERE, "UVsphere", ""},
-	{4, "ICOSPHERE", ICON_MESH_ICOSPHERE, "Icosphere", ""},
-	{5, "CYLINDER", ICON_MESH_TUBE, "Cylinder", ""},
-	{6, "CONE", ICON_MESH_CONE, "Cone", ""},
-	{0, "", 0, NULL, NULL},
-	{7, "GRID", ICON_MESH_GRID, "Grid", ""},
-	{8, "MONKEY", ICON_MESH_MONKEY, "Monkey", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int object_add_mesh_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	int newob= 0;
-	
-	if(obedit==NULL || obedit->type!=OB_MESH) {
-		object_add_type(C, OB_MESH);
-		ED_object_enter_editmode(C, EM_DO_UNDO);
-		newob = 1;
-	}
-	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-
-	switch(RNA_enum_get(op->ptr, "type")) {
-		case 0:
-			WM_operator_name_call(C, "MESH_OT_primitive_plane_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 1:
-			WM_operator_name_call(C, "MESH_OT_primitive_cube_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 2:
-			WM_operator_name_call(C, "MESH_OT_primitive_circle_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 3:
-			WM_operator_name_call(C, "MESH_OT_primitive_uv_sphere_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 4:
-			WM_operator_name_call(C, "MESH_OT_primitive_ico_sphere_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 5:
-			WM_operator_name_call(C, "MESH_OT_primitive_cylinder_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 6:
-			WM_operator_name_call(C, "MESH_OT_primitive_cone_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 7:
-			WM_operator_name_call(C, "MESH_OT_primitive_grid_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-		case 8:
-			WM_operator_name_call(C, "MESH_OT_primitive_monkey_add", WM_OP_INVOKE_REGION_WIN, NULL);
-			break;
-	}
-	/* userdef */
-	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_exit_editmode(C, EM_FREEDATA);
-	}
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
-	
-	return OPERATOR_FINISHED;
-}
-
-
-void OBJECT_OT_mesh_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Mesh";
-	ot->description = "Add a mesh object to the scene.";
-	ot->idname= "OBJECT_OT_mesh_add";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_add_mesh_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags: no register or undo, this operator calls operators */
-	ot->flag= 0; //OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_mesh_types, 0, "Primitive", "");
-}
-
-static EnumPropertyItem prop_curve_types[] = {
-	{CU_BEZIER|CU_PRIM_CURVE, "BEZIER_CURVE", ICON_CURVE_BEZCURVE, "Bezier Curve", ""},
-	{CU_BEZIER|CU_PRIM_CIRCLE, "BEZIER_CIRCLE", ICON_CURVE_BEZCIRCLE, "Bezier Circle", ""},
-	{CU_NURBS|CU_PRIM_CURVE, "NURBS_CURVE", ICON_CURVE_NCURVE, "NURBS Curve", ""},
-	{CU_NURBS|CU_PRIM_CIRCLE, "NURBS_CIRCLE", ICON_CURVE_NCIRCLE, "NURBS Circle", ""},
-	{CU_NURBS|CU_PRIM_PATH, "PATH", ICON_CURVE_PATH, "Path", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int object_add_curve_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	ListBase *editnurb;
-	Nurb *nu;
-	int newob= 0;
-	
-	if(obedit==NULL || obedit->type!=OB_CURVE) {
-		object_add_type(C, OB_CURVE);
-		ED_object_enter_editmode(C, 0);
-		newob = 1;
-	}
-	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-	
-	obedit= CTX_data_edit_object(C);
-	nu= add_nurbs_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
-	editnurb= curve_get_editcurve(obedit);
-	BLI_addtail(editnurb, nu);
-	
-	/* userdef */
-	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_exit_editmode(C, EM_FREEDATA);
-	}
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
-	
-	return OPERATOR_FINISHED;
-}
-
-static int object_add_curve_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	uiPopupMenu *pup;
-	uiLayout *layout;
-
-	pup= uiPupMenuBegin(C, op->type->name, 0);
-	layout= uiPupMenuLayout(pup);
-	if(!obedit || obedit->type == OB_CURVE)
-		uiItemsEnumO(layout, op->type->idname, "type");
-	else
-		uiItemsEnumO(layout, "OBJECT_OT_surface_add", "type");
-	uiPupMenuEnd(C, pup);
-
-	return OPERATOR_CANCELLED;
-}
-
-void OBJECT_OT_curve_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Curve";
-	ot->description = "Add a curve object to the scene.";
-	ot->idname= "OBJECT_OT_curve_add";
-	
-	/* api callbacks */
-	ot->invoke= object_add_curve_invoke;
-	ot->exec= object_add_curve_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_curve_types, 0, "Primitive", "");
-}
-
-static EnumPropertyItem prop_surface_types[]= {
-	{CU_PRIM_CURVE|CU_NURBS, "NURBS_CURVE", ICON_SURFACE_NCURVE, "NURBS Curve", ""},
-	{CU_PRIM_CIRCLE|CU_NURBS, "NURBS_CIRCLE", ICON_SURFACE_NCIRCLE, "NURBS Circle", ""},
-	{CU_PRIM_PATCH|CU_NURBS, "NURBS_SURFACE", ICON_SURFACE_NSURFACE, "NURBS Surface", ""},
-	{CU_PRIM_TUBE|CU_NURBS, "NURBS_TUBE", ICON_SURFACE_NTUBE, "NURBS Tube", ""},
-	{CU_PRIM_SPHERE|CU_NURBS, "NURBS_SPHERE", ICON_SURFACE_NSPHERE, "NURBS Sphere", ""},
-	{CU_PRIM_DONUT|CU_NURBS, "NURBS_DONUT", ICON_SURFACE_NDONUT, "NURBS Donut", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int object_add_surface_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	ListBase *editnurb;
-	Nurb *nu;
-	int newob= 0;
-	
-	if(obedit==NULL || obedit->type!=OB_SURF) {
-		object_add_type(C, OB_SURF);
-		ED_object_enter_editmode(C, 0);
-		newob = 1;
-	}
-	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-	
-	obedit= CTX_data_edit_object(C);
-	nu= add_nurbs_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
-	editnurb= curve_get_editcurve(obedit);
-	BLI_addtail(editnurb, nu);
-	
-	/* userdef */
-	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_exit_editmode(C, EM_FREEDATA);
-	}
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_surface_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Surface";
-	ot->description = "Add a surface object to the scene.";
-	ot->idname= "OBJECT_OT_surface_add";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_add_surface_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_surface_types, 0, "Primitive", "");
-}
-
-static EnumPropertyItem prop_metaball_types[]= {
-	{MB_BALL, "MBALL_BALL", ICON_META_BALL, "Meta Ball", ""},
-	{MB_TUBE, "MBALL_TUBE", ICON_META_TUBE, "Meta Tube", ""},
-	{MB_PLANE, "MBALL_PLANE", ICON_META_PLANE, "Meta Plane", ""},
-	{MB_CUBE, "MBALL_CUBE", ICON_META_CUBE, "Meta Cube", ""},
-	{MB_ELIPSOID, "MBALL_ELLIPSOID", ICON_META_ELLIPSOID, "Meta Ellipsoid", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int object_metaball_add_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	MetaBall *mball;
-	MetaElem *elem;
-	int newob= 0;
-	
-	if(obedit==NULL || obedit->type!=OB_MBALL) {
-		object_add_type(C, OB_MBALL);
-		ED_object_enter_editmode(C, 0);
-		newob = 1;
-	}
-	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-	
-	obedit= CTX_data_edit_object(C);
-	elem= (MetaElem*)add_metaball_primitive(C, RNA_enum_get(op->ptr, "type"), newob);
-	mball= (MetaBall*)obedit->data;
-	BLI_addtail(mball->editelems, elem);
-	
-	/* userdef */
-	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_exit_editmode(C, EM_FREEDATA);
-	}
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
-	
-	return OPERATOR_FINISHED;
-}
-
-static int object_metaball_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	uiPopupMenu *pup;
-	uiLayout *layout;
-
-	pup= uiPupMenuBegin(C, op->type->name, 0);
-	layout= uiPupMenuLayout(pup);
-	if(!obedit || obedit->type == OB_MBALL)
-		uiItemsEnumO(layout, op->type->idname, "type");
-	else
-		uiItemsEnumO(layout, "OBJECT_OT_metaball_add", "type");
-	uiPupMenuEnd(C, pup);
-
-	return OPERATOR_CANCELLED;
-}
-
-void OBJECT_OT_metaball_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Metaball";
-	ot->description= "Add an metaball object to the scene.";
-	ot->idname= "OBJECT_OT_metaball_add";
-
-	/* api callbacks */
-	ot->invoke= object_metaball_add_invoke;
-	ot->exec= object_metaball_add_exec;
-	ot->poll= ED_operator_scene_editable;
-
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_metaball_types, 0, "Primitive", "");
-}
-static int object_add_text_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	
-	if(obedit && obedit->type==OB_FONT)
-		return OPERATOR_CANCELLED;
-
-	object_add_type(C, OB_FONT);
-	obedit= CTX_data_active_object(C);
-
-	if(U.flag & USER_ADD_EDITMODE)
-		ED_object_enter_editmode(C, 0);
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_text_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Text";
-	ot->description = "Add a text object to the scene";
-	ot->idname= "OBJECT_OT_text_add";
-	
-	/* api callbacks */
-	ot->exec= object_add_text_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-static int object_armature_add_exec(bContext *C, wmOperator *op)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	View3D *v3d= CTX_wm_view3d(C);
-	RegionView3D *rv3d= NULL;
-	int newob= 0;
-	
-	if ((obedit==NULL) || (obedit->type != OB_ARMATURE)) {
-		object_add_type(C, OB_ARMATURE);
-		ED_object_enter_editmode(C, 0);
-		newob = 1;
-	}
-	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-	
-	if(v3d) 
-		rv3d= CTX_wm_region(C)->regiondata;
-	
-	/* v3d and rv3d are allowed to be NULL */
-	add_primitive_bone(CTX_data_scene(C), v3d, rv3d);
-
-	/* userdef */
-	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_exit_editmode(C, EM_FREEDATA);
-	}
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_armature_add(wmOperatorType *ot)
-{	
-	/* identifiers */
-	ot->name= "Add Armature";
-	ot->description = "Add an armature object to the scene.";
-	ot->idname= "OBJECT_OT_armature_add";
-	
-	/* api callbacks */
-	ot->exec= object_armature_add_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-static int object_primitive_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	uiPopupMenu *pup= uiPupMenuBegin(C, "Add Object", 0);
-	uiLayout *layout= uiPupMenuLayout(pup);
-	
-	uiItemMenuEnumO(layout, "Mesh", ICON_OUTLINER_OB_MESH, "OBJECT_OT_mesh_add", "type");
-	uiItemMenuEnumO(layout, "Curve", ICON_OUTLINER_OB_CURVE, "OBJECT_OT_curve_add", "type");
-	uiItemMenuEnumO(layout, "Surface", ICON_OUTLINER_OB_SURFACE, "OBJECT_OT_surface_add", "type");
-	uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_META, "OBJECT_OT_metaball_add", "type");
-	uiItemO(layout, "Text", ICON_OUTLINER_OB_FONT, "OBJECT_OT_text_add");
-	uiItemS(layout);
-	uiItemO(layout, "Armature", ICON_OUTLINER_OB_ARMATURE, "OBJECT_OT_armature_add");
-	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_LATTICE, "OBJECT_OT_object_add", "type", OB_LATTICE);
-	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_EMPTY, "OBJECT_OT_object_add", "type", OB_EMPTY);
-	uiItemS(layout);
-	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_CAMERA, "OBJECT_OT_object_add", "type", OB_CAMERA);
-	uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_LAMP, "OBJECT_OT_object_add", "type", OB_LAMP);
-	
-	uiPupMenuEnd(C, pup);
-	
-	/* this operator is only for a menu, not used further */
-	return OPERATOR_CANCELLED;
-}
-
-/* only used as menu */
-void OBJECT_OT_primitive_add(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Add Primitive";
-	ot->description = "Add a primitive object.";
-	ot->idname= "OBJECT_OT_primitive_add";
-	
-	/* api callbacks */
-	ot->invoke= object_primitive_add_invoke;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= 0;
-}
-
-
-/* ******************************* */
-
-/* remove base from a specific scene */
-/* note: now unlinks constraints as well */
-void ED_base_object_free_and_unlink(Scene *scene, Base *base)
-{
-	BLI_remlink(&scene->base, base);
-	free_libblock_us(&G.main->object, base->object);
-	if(scene->basact==base) scene->basact= NULL;
-	MEM_freeN(base);
-}
-
-static int object_delete_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	int islamp= 0;
-	
-	if(CTX_data_edit_object(C)) 
-		return OPERATOR_CANCELLED;
-	
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-
-		if(base->object->type==OB_LAMP) islamp= 1;
-		
-		/* remove from current scene only */
-		ED_base_object_free_and_unlink(scene, base);
-	}
-	CTX_DATA_END;
-
-	if(islamp) reshadeall_displist(scene);	/* only frees displist */
-	
-	DAG_scene_sort(scene);
-	ED_anim_dag_flush_update(C);
-	
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_delete(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Delete";
-	ot->description = "Delete selected objects.";
-	ot->idname= "OBJECT_OT_delete";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_delete_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-}
-
-
-static void single_object_users__forwardModifierLinks(void *userData, Object *ob, Object **obpoin)
-{
-	ID_NEW(*obpoin);
-}
-
-static void copy_object__forwardModifierLinks(void *userData, Object *ob,
-                                              ID **idpoin)
-{
-	/* this is copied from ID_NEW; it might be better to have a macro */
-	if(*idpoin && (*idpoin)->newid) *idpoin = (*idpoin)->newid;
-}
-
-
-/* after copying objects, copied data should get new pointers */
-static void copy_object_set_idnew(Scene *scene, View3D *v3d, int dupflag)
-{
-	Base *base;
-	Object *ob;
-	Material *ma, *mao;
-	ID *id;
-#if 0 // XXX old animation system
-	Ipo *ipo;
-	bActionStrip *strip;
-#endif // XXX old animation system
-	int a;
-	
-	/* XXX check object pointers */
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB_BGMODE(v3d, base)) {
-			ob= base->object;
-			relink_constraints(&ob->constraints);
-			if (ob->pose){
-				bPoseChannel *chan;
-				for (chan = ob->pose->chanbase.first; chan; chan=chan->next){
-					relink_constraints(&chan->constraints);
-				}
-			}
-			modifiers_foreachIDLink(ob, copy_object__forwardModifierLinks, NULL);
-			ID_NEW(ob->parent);
-			ID_NEW(ob->track);
-			ID_NEW(ob->proxy);
-			ID_NEW(ob->proxy_group);
-			
-#if 0 // XXX old animation system
-			for(strip= ob->nlastrips.first; strip; strip= strip->next) {
-				bActionModifier *amod;
-				for(amod= strip->modifiers.first; amod; amod= amod->next)
-					ID_NEW(amod->ob);
-			}
-#endif // XXX old animation system
-		}
-	}
-	
-	/* materials */
-	if( dupflag & USER_DUP_MAT) {
-		mao= G.main->mat.first;
-		while(mao) {
-			if(mao->id.newid) {
-				
-				ma= (Material *)mao->id.newid;
-				
-				if(dupflag & USER_DUP_TEX) {
-					for(a=0; a<MAX_MTEX; a++) {
-						if(ma->mtex[a]) {
-							id= (ID *)ma->mtex[a]->tex;
-							if(id) {
-								ID_NEW_US(ma->mtex[a]->tex)
-								else ma->mtex[a]->tex= copy_texture(ma->mtex[a]->tex);
-								id->us--;
-							}
-						}
-					}
-				}
-#if 0 // XXX old animation system
-				id= (ID *)ma->ipo;
-				if(id) {
-					ID_NEW_US(ma->ipo)
-					else ma->ipo= copy_ipo(ma->ipo);
-					id->us--;
-				}
-#endif // XXX old animation system
-			}
-			mao= mao->id.next;
-		}
-	}
-	
-#if 0 // XXX old animation system
-	/* lamps */
-	if( dupflag & USER_DUP_IPO) {
-		Lamp *la= G.main->lamp.first;
-		while(la) {
-			if(la->id.newid) {
-				Lamp *lan= (Lamp *)la->id.newid;
-				id= (ID *)lan->ipo;
-				if(id) {
-					ID_NEW_US(lan->ipo)
-					else lan->ipo= copy_ipo(lan->ipo);
-					id->us--;
-				}
-			}
-			la= la->id.next;
-		}
-	}
-	
-	/* ipos */
-	ipo= G.main->ipo.first;
-	while(ipo) {
-		if(ipo->id.lib==NULL && ipo->id.newid) {
-			Ipo *ipon= (Ipo *)ipo->id.newid;
-			IpoCurve *icu;
-			for(icu= ipon->curve.first; icu; icu= icu->next) {
-				if(icu->driver) {
-					ID_NEW(icu->driver->ob);
-				}
-			}
-		}
-		ipo= ipo->id.next;
-	}
-#endif // XXX old animation system
-	
-	set_sca_new_poins();
-	
-	clear_id_newpoins();
-	
-}
-
-static int return_editmesh_indexar(EditMesh *em, int *tot, int **indexar, float *cent)
-{
-	EditVert *eve;
-	int *index, nr, totvert=0;
-	
-	for(eve= em->verts.first; eve; eve= eve->next) {
-		if(eve->f & SELECT) totvert++;
-	}
-	if(totvert==0) return 0;
-	
-	*indexar= index= MEM_mallocN(4*totvert, "hook indexar");
-	*tot= totvert;
-	nr= 0;
-	cent[0]= cent[1]= cent[2]= 0.0;
-	
-	for(eve= em->verts.first; eve; eve= eve->next) {
-		if(eve->f & SELECT) {
-			*index= nr; index++;
-			VecAddf(cent, cent, eve->co);
-		}
-		nr++;
-	}
-	
-	VecMulf(cent, 1.0f/(float)totvert);
-	
-	return totvert;
-}
-
-static int return_editmesh_vgroup(Object *obedit, EditMesh *em, char *name, float *cent)
-{
-	MDeformVert *dvert;
-	EditVert *eve;
-	int i, totvert=0;
-	
-	cent[0]= cent[1]= cent[2]= 0.0;
-	
-	if(obedit->actdef) {
-		
-		/* find the vertices */
-		for(eve= em->verts.first; eve; eve= eve->next) {
-			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
-
-			if(dvert) {
-				for(i=0; i<dvert->totweight; i++){
-					if(dvert->dw[i].def_nr == (obedit->actdef-1)) {
-						totvert++;
-						VecAddf(cent, cent, eve->co);
-					}
-				}
-			}
-		}
-		if(totvert) {
-			bDeformGroup *defGroup = BLI_findlink(&obedit->defbase, obedit->actdef-1);
-			strcpy(name, defGroup->name);
-			VecMulf(cent, 1.0f/(float)totvert);
-			return 1;
-		}
-	}
-	
-	return 0;
-}	
-
-static void select_editmesh_hook(Object *ob, HookModifierData *hmd)
-{
-	Mesh *me= ob->data;
-	EditMesh *em= BKE_mesh_get_editmesh(me);
-	EditVert *eve;
-	int index=0, nr=0;
-	
-	if (hmd->indexar == NULL)
-		return;
-	
-	for(eve= em->verts.first; eve; eve= eve->next, nr++) {
-		if(nr==hmd->indexar[index]) {
-			eve->f |= SELECT;
-			if(index < hmd->totindex-1) index++;
-		}
-	}
-	EM_select_flush(em);
-
-	BKE_mesh_end_editmesh(me, em);
-}
-
-static int return_editlattice_indexar(Lattice *editlatt, int *tot, int **indexar, float *cent)
-{
-	BPoint *bp;
-	int *index, nr, totvert=0, a;
-	
-	/* count */
-	a= editlatt->pntsu*editlatt->pntsv*editlatt->pntsw;
-	bp= editlatt->def;
-	while(a--) {
-		if(bp->f1 & SELECT) {
-			if(bp->hide==0) totvert++;
-		}
-		bp++;
-	}
-
-	if(totvert==0) return 0;
-	
-	*indexar= index= MEM_mallocN(4*totvert, "hook indexar");
-	*tot= totvert;
-	nr= 0;
-	cent[0]= cent[1]= cent[2]= 0.0;
-	
-	a= editlatt->pntsu*editlatt->pntsv*editlatt->pntsw;
-	bp= editlatt->def;
-	while(a--) {
-		if(bp->f1 & SELECT) {
-			if(bp->hide==0) {
-				*index= nr; index++;
-				VecAddf(cent, cent, bp->vec);
-			}
-		}
-		bp++;
-		nr++;
-	}
-	
-	VecMulf(cent, 1.0f/(float)totvert);
-	
-	return totvert;
-}
-
-static void select_editlattice_hook(Object *obedit, HookModifierData *hmd)
-{
-	Lattice *lt= obedit->data;
-	BPoint *bp;
-	int index=0, nr=0, a;
-	
-	/* count */
-	a= lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
-	bp= lt->editlatt->def;
-	while(a--) {
-		if(hmd->indexar[index]==nr) {
-			bp->f1 |= SELECT;
-			if(index < hmd->totindex-1) index++;
-		}
-		nr++;
-		bp++;
-	}
-}
-
-static int return_editcurve_indexar(Object *obedit, int *tot, int **indexar, float *cent)
-{
-	ListBase *editnurb= curve_get_editcurve(obedit);
-	Nurb *nu;
-	BPoint *bp;
-	BezTriple *bezt;
-	int *index, a, nr, totvert=0;
-	
-	for(nu= editnurb->first; nu; nu= nu->next) {
-		if(nu->type == CU_BEZIER) {
-			bezt= nu->bezt;
-			a= nu->pntsu;
-			while(a--) {
-				if(bezt->f1 & SELECT) totvert++;
-				if(bezt->f2 & SELECT) totvert++;
-				if(bezt->f3 & SELECT) totvert++;
-				bezt++;
-			}
-		}
-		else {
-			bp= nu->bp;
-			a= nu->pntsu*nu->pntsv;
-			while(a--) {
-				if(bp->f1 & SELECT) totvert++;
-				bp++;
-			}
-		}
-	}
-	if(totvert==0) return 0;
-	
-	*indexar= index= MEM_mallocN(4*totvert, "hook indexar");
-	*tot= totvert;
-	nr= 0;
-	cent[0]= cent[1]= cent[2]= 0.0;
-	
-	for(nu= editnurb->first; nu; nu= nu->next) {
-		if(nu->type == CU_BEZIER) {
-			bezt= nu->bezt;
-			a= nu->pntsu;
-			while(a--) {
-				if(bezt->f1 & SELECT) {
-					*index= nr; index++;
-					VecAddf(cent, cent, bezt->vec[0]);
-				}
-				nr++;
-				if(bezt->f2 & SELECT) {
-					*index= nr; index++;
-					VecAddf(cent, cent, bezt->vec[1]);
-				}
-				nr++;
-				if(bezt->f3 & SELECT) {
-					*index= nr; index++;
-					VecAddf(cent, cent, bezt->vec[2]);
-				}
-				nr++;
-				bezt++;
-			}
-		}
-		else {
-			bp= nu->bp;
-			a= nu->pntsu*nu->pntsv;
-			while(a--) {
-				if(bp->f1 & SELECT) {
-					*index= nr; index++;
-					VecAddf(cent, cent, bp->vec);
-				}
-				nr++;
-				bp++;
-			}
-		}
-	}
-	
-	VecMulf(cent, 1.0f/(float)totvert);
-	
-	return totvert;
-}
-
 void ED_object_apply_obmat(Object *ob)
 {
 	float mat[3][3], imat[3][3], tmat[3][3];
@@ -1156,1432 +178,6 @@ void ED_object_apply_obmat(Object *ob)
 	
 }
 
-int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
-{
-	*indexar= NULL;
-	*tot= 0;
-	name[0]= 0;
-	
-	switch(obedit->type) {
-		case OB_MESH:
-		{
-			Mesh *me= obedit->data;
-			EditMesh *em = BKE_mesh_get_editmesh(me);
-
-			/* check selected vertices first */
-			if( return_editmesh_indexar(em, tot, indexar, cent_r)) {
-				BKE_mesh_end_editmesh(me, em);
-				return 1;
-			} else {
-				int ret = return_editmesh_vgroup(obedit, em, name, cent_r);
-				BKE_mesh_end_editmesh(me, em);
-				return ret;
-			}
-		}
-		case OB_CURVE:
-		case OB_SURF:
-			return return_editcurve_indexar(obedit, tot, indexar, cent_r);
-		case OB_LATTICE:
-		{
-			Lattice *lt= obedit->data;
-			return return_editlattice_indexar(lt->editlatt, tot, indexar, cent_r);
-		}
-		default:
-			return 0;
-	}
-}
-
-static void select_editcurve_hook(Object *obedit, HookModifierData *hmd)
-{
-	ListBase *editnurb= curve_get_editcurve(obedit);
-	Nurb *nu;
-	BPoint *bp;
-	BezTriple *bezt;
-	int index=0, a, nr=0;
-	
-	for(nu= editnurb->first; nu; nu= nu->next) {
-		if(nu->type == CU_BEZIER) {
-			bezt= nu->bezt;
-			a= nu->pntsu;
-			while(a--) {
-				if(nr == hmd->indexar[index]) {
-					bezt->f1 |= SELECT;
-					if(index<hmd->totindex-1) index++;
-				}
-				nr++;
-				if(nr == hmd->indexar[index]) {
-					bezt->f2 |= SELECT;
-					if(index<hmd->totindex-1) index++;
-				}
-				nr++;
-				if(nr == hmd->indexar[index]) {
-					bezt->f3 |= SELECT;
-					if(index<hmd->totindex-1) index++;
-				}
-				nr++;
-				
-				bezt++;
-			}
-		}
-		else {
-			bp= nu->bp;
-			a= nu->pntsu*nu->pntsv;
-			while(a--) {
-				if(nr == hmd->indexar[index]) {
-					bp->f1 |= SELECT;
-					if(index<hmd->totindex-1) index++;
-				}
-				nr++;
-				bp++;
-			}
-		}
-	}
-}
-
-void object_hook_select(Object *ob, HookModifierData *hmd) 
-{
-	if(ob->type==OB_MESH) select_editmesh_hook(ob, hmd);
-	else if(ob->type==OB_LATTICE) select_editlattice_hook(ob, hmd);
-	else if(ob->type==OB_CURVE) select_editcurve_hook(ob, hmd);
-	else if(ob->type==OB_SURF) select_editcurve_hook(ob, hmd);
-}
-
-
-void add_hook(Scene *scene, View3D *v3d, int mode)
-{
-	ModifierData *md = NULL;
-	HookModifierData *hmd = NULL;
-	Object *ob=NULL;
-	Object *obedit= scene->obedit;  // XXX get from context
-	
-	if(obedit==NULL) return;
-	
-	/* preconditions */
-	if(mode==2) { /* selected object */
-		Base *base;
-		for(base= FIRSTBASE; base; base= base->next) {
-			if(TESTBASELIB(v3d, base)) {
-				if(base!=BASACT) {
-					ob= base->object;
-					break;
-				}
-			}
-		}
-		if(ob==NULL) {
-			error("Requires selected Object");
-			return;
-		}
-	}
-	else if(mode!=1) {
-		int maxlen=0, a, nr;
-		char *cp;
-		
-		/* make pupmenu with hooks */
-		for(md=obedit->modifiers.first; md; md= md->next) {
-			if (md->type==eModifierType_Hook) 
-				maxlen+=32;
-		}
-		
-		if(maxlen==0) {
-			error("Object has no hooks yet");
-			return;
-		}
-		
-		cp= MEM_callocN(maxlen+32, "temp string");
-		if(mode==3) strcpy(cp, "Remove %t|");
-		else if(mode==4) strcpy(cp, "Reassign %t|");
-		else if(mode==5) strcpy(cp, "Select %t|");
-		else if(mode==6) strcpy(cp, "Clear Offset %t|");
-		
-		for(md=obedit->modifiers.first; md; md= md->next) {
-			if (md->type==eModifierType_Hook) {
-				strcat(cp, md->name);
-				strcat(cp, " |");
-			}
-		}
-		
-		nr= pupmenu(cp);
-		MEM_freeN(cp);
-		
-		if(nr<1) return;
-		
-		a= 1;
-		for(md=obedit->modifiers.first; md; md=md->next) {
-			if (md->type==eModifierType_Hook) {
-				if(a==nr) break;
-				a++;
-			}
-		}
-		
-		hmd = (HookModifierData*) md;
-		ob= hmd->object;
-	}
-
-	/* do it, new hooks or reassign */
-	if(mode==1 || mode==2 || mode==4) {
-		float cent[3];
-		int tot, ok, *indexar;
-		char name[32];
-		
-		ok = object_hook_index_array(obedit, &tot, &indexar, name, cent);
-		
-		if(ok==0) {
-			error("Requires selected vertices or active Vertex Group");
-		}
-		else {
-			
-			if(mode==1) {
-				Base *base= BASACT, *newbase;
-				
-				ob= add_object(scene, OB_EMPTY);
-				/* set layers OK */
-				newbase= BASACT;
-				newbase->lay= base->lay;
-				ob->lay= newbase->lay;
-				
-				/* transform cent to global coords for loc */
-				VecMat4MulVecfl(ob->loc, obedit->obmat, cent);
-				
-				/* restore, add_object sets active */
-				BASACT= base;
-			}
-			/* if mode is 2 or 4, ob has been set */
-			
-			/* new hook */
-			if(mode==1 || mode==2) {
-				ModifierData *md = obedit->modifiers.first;
-				
-				while (md && modifierType_getInfo(md->type)->type==eModifierTypeType_OnlyDeform) {
-					md = md->next;
-				}
-				
-				hmd = (HookModifierData*) modifier_new(eModifierType_Hook);
-				BLI_insertlinkbefore(&obedit->modifiers, md, hmd);
-				sprintf(hmd->modifier.name, "Hook-%s", ob->id.name+2);
-			}
-			else if (hmd->indexar) MEM_freeN(hmd->indexar); /* reassign, hook was set */
-		
-			hmd->object= ob;
-			hmd->indexar= indexar;
-			VECCOPY(hmd->cent, cent);
-			hmd->totindex= tot;
-			BLI_strncpy(hmd->name, name, 32);
-			
-			// TODO: need to take into account bone targets here too now...
-			if(mode==1 || mode==2) {
-				/* matrix calculus */
-				/* vert x (obmat x hook->imat) x hook->obmat x ob->imat */
-				/*        (parentinv         )                          */
-				
-				where_is_object(scene, ob);
-				
-				Mat4Invert(ob->imat, ob->obmat);
-				/* apparently this call goes from right to left... */
-				Mat4MulSerie(hmd->parentinv, ob->imat, obedit->obmat, NULL, 
-							 NULL, NULL, NULL, NULL, NULL);
-			}
-		}
-	}
-	else if(mode==3) { /* remove */
-		BLI_remlink(&obedit->modifiers, md);
-		modifier_free(md);
-	}
-	else if(mode==5) { /* select */
-		// FIXME: this is now OBJECT_OT_hook_select
-		object_hook_select(obedit, hmd);
-	}
-	else if(mode==6) { /* clear offset */
-		// FIXME: this is now OBJECT_OT_hook_reset operator
-		where_is_object(scene, ob);	/* ob is hook->parent */
-
-		Mat4Invert(ob->imat, ob->obmat);
-		/* this call goes from right to left... */
-		Mat4MulSerie(hmd->parentinv, ob->imat, obedit->obmat, NULL, 
-					 NULL, NULL, NULL, NULL, NULL);
-	}
-
-	DAG_scene_sort(scene);
-}
-
-void add_hook_menu(Scene *scene, View3D *v3d)
-{
-	Object *obedit= scene->obedit;  // XXX get from context
-	int mode;
-	
-	if(obedit==NULL) return;
-	
-	if(modifiers_findByType(obedit, eModifierType_Hook))
-		mode= pupmenu("Hooks %t|Add, To New Empty %x1|Add, To Selected Object %x2|Remove... %x3|Reassign... %x4|Select... %x5|Clear Offset...%x6");
-	else
-		mode= pupmenu("Hooks %t|Add, New Empty %x1|Add, To Selected Object %x2");
-
-	if(mode<1) return;
-		
-	/* do operations */
-	add_hook(scene, v3d, mode);
-}
-
-
-
-/* use this when the loc/size/rot of the parent has changed but the children should stay in the same place
- * apply-size-rot or object center for eg */
-static void ignore_parent_tx(Scene *scene, Object *ob ) 
-{
-	Object workob;
-	Object *ob_child;
-	
-	/* a change was made, adjust the children to compensate */
-	for (ob_child=G.main->object.first; ob_child; ob_child=ob_child->id.next) {
-		if (ob_child->parent == ob) {
-			ED_object_apply_obmat(ob_child);
-			what_does_parent(scene, ob_child, &workob);
-			Mat4Invert(ob_child->parentinv, workob.obmat);
-		}
-	}
-}
-
-/* ******************** clear parent operator ******************* */
-
-static EnumPropertyItem prop_clear_parent_types[] = {
-	{0, "CLEAR", 0, "Clear Parent", ""},
-	{1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""},
-	{2, "CLEAR_INVERSE", 0, "Clear Parent Inverse", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-/* note, poll should check for editable scene */
-static int parent_clear_exec(bContext *C, wmOperator *op)
-{
-	int type= RNA_enum_get(op->ptr, "type");
-	
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-
-		if(type == 0) {
-			ob->parent= NULL;
-		}			
-		else if(type == 1) {
-			ob->parent= NULL;
-			ob->track= NULL;
-			ED_object_apply_obmat(ob);
-		}
-		else if(type == 2)
-			Mat4One(ob->parentinv);
-
-		ob->recalc |= OB_RECALC;
-	}
-	CTX_DATA_END;
-	
-	DAG_scene_sort(CTX_data_scene(C));
-	ED_anim_dag_flush_update(C);
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_parent_clear(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Clear Parent";
-	ot->description = "Clear the object's parenting.";
-	ot->idname= "OBJECT_OT_parent_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= parent_clear_exec;
-	
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", "");
-}
-
-/* ******************** clear track operator ******************* */
-
-
-static EnumPropertyItem prop_clear_track_types[] = {
-	{0, "CLEAR", 0, "Clear Track", ""},
-	{1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-/* note, poll should check for editable scene */
-static int object_track_clear_exec(bContext *C, wmOperator *op)
-{
-	int type= RNA_enum_get(op->ptr, "type");
-
-	if(CTX_data_edit_object(C)) {
-		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
-		return OPERATOR_CANCELLED;
-	}
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-		ob->track= NULL;
-		ob->recalc |= OB_RECALC;
-		
-		if(type == 1)
-			ED_object_apply_obmat(ob);
-	}
-	CTX_DATA_END;
-
-	DAG_scene_sort(CTX_data_scene(C));
-	ED_anim_dag_flush_update(C);
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_track_clear(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Clear track";
-	ot->description = "Clear tracking constraint or flag from object.";
-	ot->idname= "OBJECT_OT_track_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_track_clear_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", "");
-}
-
-/* *****************Selection Operators******************* */
-static EnumPropertyItem prop_select_types[] = {
-	{0, "EXCLUSIVE", 0, "Exclusive", ""},
-	{1, "EXTEND", 0, "Extend", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-/* ****** Select by Type ****** */
-
-static int object_select_by_type_exec(bContext *C, wmOperator *op)
-{
-	short obtype, seltype;
-	
-	obtype = RNA_enum_get(op->ptr, "type");
-	seltype = RNA_enum_get(op->ptr, "seltype");
-		
-	if (seltype == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if(base->object->type==obtype) {
-			ED_base_object_select(base, BA_SELECT);
-		}
-	}
-	CTX_DATA_END;
-	
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_by_type(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Select By Type";
-	ot->description = "Select all visible objects that are of a type.";
-	ot->idname= "OBJECT_OT_select_by_type";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_select_by_type_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "seltype", prop_select_types, 0, "Selection", "Extend selection or clear selection then select");
-	RNA_def_enum(ot->srna, "type", prop_object_types, 1, "Type", "");
-
-}
-/* ****** selection by links *******/
-
-static EnumPropertyItem prop_select_linked_types[] = {
-	{1, "IPO", 0, "Object IPO", ""}, // XXX depreceated animation system stuff...
-	{2, "OBDATA", 0, "Ob Data", ""},
-	{3, "MATERIAL", 0, "Material", ""},
-	{4, "TEXTURE", 0, "Texture", ""},
-	{5, "DUPGROUP", 0, "Dupligroup", ""},
-	{6, "PARTICLE", 0, "Particle System", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int object_select_linked_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *ob;
-	void *obdata = NULL;
-	Material *mat = NULL, *mat1;
-	Tex *tex=0;
-	int a, b;
-	int nr = RNA_enum_get(op->ptr, "type");
-	short changed = 0, seltype;
-	/* events (nr):
-	 * Object Ipo: 1
-	 * ObData: 2
-	 * Current Material: 3
-	 * Current Texture: 4
-	 * DupliGroup: 5
-	 * PSys: 6
-	 */
-
-	seltype = RNA_enum_get(op->ptr, "seltype");
-	
-	if (seltype == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-	
-	ob= OBACT;
-	if(ob==0){ 
-		BKE_report(op->reports, RPT_ERROR, "No Active Object");
-		return OPERATOR_CANCELLED;
-	}
-	
-	if(nr==1) {	
-			// XXX old animation system
-		//ipo= ob->ipo;
-		//if(ipo==0) return OPERATOR_CANCELLED;
-		return OPERATOR_CANCELLED;
-	}
-	else if(nr==2) {
-		if(ob->data==0) return OPERATOR_CANCELLED;
-		obdata= ob->data;
-	}
-	else if(nr==3 || nr==4) {
-		mat= give_current_material(ob, ob->actcol);
-		if(mat==0) return OPERATOR_CANCELLED;
-		if(nr==4) {
-			if(mat->mtex[ (int)mat->texact ]) tex= mat->mtex[ (int)mat->texact ]->tex;
-			if(tex==0) return OPERATOR_CANCELLED;
-		}
-	}
-	else if(nr==5) {
-		if(ob->dup_group==NULL) return OPERATOR_CANCELLED;
-	}
-	else if(nr==6) {
-		if(ob->particlesystem.first==NULL) return OPERATOR_CANCELLED;
-	}
-	else return OPERATOR_CANCELLED;
-	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if(nr==1) {
-				// XXX old animation system
-			//if(base->object->ipo==ipo) base->flag |= SELECT;
-			//changed = 1;
-		}
-		else if(nr==2) {
-			if(base->object->data==obdata) base->flag |= SELECT;
-			changed = 1;
-		}
-		else if(nr==3 || nr==4) {
-			ob= base->object;
-			
-			for(a=1; a<=ob->totcol; a++) {
-				mat1= give_current_material(ob, a);
-				if(nr==3) {
-					if(mat1==mat) base->flag |= SELECT;
-					changed = 1;
-				}
-				else if(mat1 && nr==4) {
-					for(b=0; b<MAX_MTEX; b++) {
-						if(mat1->mtex[b]) {
-							if(tex==mat1->mtex[b]->tex) {
-								base->flag |= SELECT;
-								changed = 1;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-		else if(nr==5) {
-			if(base->object->dup_group==ob->dup_group) {
-				 base->flag |= SELECT;
-				 changed = 1;
-			}
-		}
-		else if(nr==6) {
-			/* loop through other, then actives particles*/
-			ParticleSystem *psys;
-			ParticleSystem *psys_act;
-			
-			for(psys=base->object->particlesystem.first; psys; psys=psys->next) {
-				for(psys_act=ob->particlesystem.first; psys_act; psys_act=psys_act->next) {
-					if (psys->part == psys_act->part) {
-						base->flag |= SELECT;
-						changed = 1;
-						break;
-					}
-				}
-				
-				if (base->flag & SELECT) {
-					break;
-				}
-			}
-		}
-		base->object->flag= base->flag;
-	}
-	CTX_DATA_END;
-	
-	if (changed) {
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-		return OPERATOR_FINISHED;
-	}
-	
-	return OPERATOR_CANCELLED;
-}
-
-void OBJECT_OT_select_linked(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Select Linked";
-	ot->description = "Select all visible objects that are linked.";
-	ot->idname= "OBJECT_OT_select_linked";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_select_linked_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_select_linked_types, 0, "Type", "");
-	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
-
-}
-
-/* ****** selection grouped *******/
-
-static EnumPropertyItem prop_select_grouped_types[] = {
-	{1, "CHILDREN_RECURSIVE", 0, "Children", ""}, // XXX depreceated animation system stuff...
-	{2, "CHILDREN", 0, "Immediate Children", ""},
-	{3, "PARENT", 0, "Parent", ""},
-	{4, "SIBLINGS", 0, "Siblings", "Shared Parent"},
-	{5, "TYPE", 0, "Type", "Shared object type"},
-	{6, "LAYER", 0, "Layer", "Shared layers"},
-	{7, "GROUP", 0, "Group", "Shared group"},
-	{8, "HOOK", 0, "Hook", ""},
-	{9, "PASS", 0, "Pass", "Render pass Index"},
-	{10, "COLOR", 0, "Color", "Object Color"},
-	{11, "PROPERTIES", 0, "Properties", "Game Properties"},
-	{0, NULL, 0, NULL, NULL}
-};
-
-
-static short select_grouped_children(bContext *C, Object *ob, int recursive)
-{
-	short changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if (ob == base->object->parent) {
-			if (!(base->flag & SELECT)) {
-				ED_base_object_select(base, BA_SELECT);
-				changed = 1;
-			}
-
-			if (recursive)
-				changed |= select_grouped_children(C, base->object, 1);
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static short select_grouped_parent(bContext *C)	/* Makes parent active and de-selected OBACT */
-{
-	Scene *scene= CTX_data_scene(C);
-	View3D *v3d= CTX_wm_view3d(C);
-
-	short changed = 0;
-	Base *baspar, *basact= CTX_data_active_base(C);
-
-	if (!basact || !(basact->object->parent)) return 0; /* we know OBACT is valid */
-
-	baspar= object_in_scene(basact->object->parent, scene);
-
-	/* can be NULL if parent in other scene */
-	if(baspar && BASE_SELECTABLE(v3d, baspar)) {
-		ED_base_object_select(basact, BA_DESELECT);
-		ED_base_object_select(baspar, BA_SELECT);
-		ED_base_object_activate(C, baspar);
-		changed = 1;
-	}
-	return changed;
-}
-
-
-#define GROUP_MENU_MAX	24
-static short select_grouped_group(bContext *C, Object *ob)	/* Select objects in the same group as the active */
-{
-	short changed = 0;
-	Group *group, *ob_groups[GROUP_MENU_MAX];
-	//char str[10 + (24*GROUP_MENU_MAX)];
-	//char *p = str;
-	int group_count=0; //, menu, i;
-
-	for (	group=G.main->group.first;
-			group && group_count < GROUP_MENU_MAX;
-			group=group->id.next
-		) {
-		if (object_in_group (ob, group)) {
-			ob_groups[group_count] = group;
-			group_count++;
-		}
-	}
-
-	if (!group_count)
-		return 0;
-
-	else if (group_count == 1) {
-		group = ob_groups[0];
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-			if (!(base->flag & SELECT) && object_in_group(base->object, group)) {
-				ED_base_object_select(base, BA_SELECT);
-				changed = 1;
-			}
-		}
-		CTX_DATA_END;
-		return changed;
-	}
-#if 0 // XXX hows this work in 2.5?
-	/* build the menu. */
-	p += sprintf(str, "Groups%%t");
-	for (i=0; i<group_count; i++) {
-		group = ob_groups[i];
-		p += sprintf (p, "|%s%%x%i", group->id.name+2, i);
-	}
-
-	menu = pupmenu (str);
-	if (menu == -1)
-		return 0;
-
-	group = ob_groups[menu];
-	for (base= FIRSTBASE; base; base= base->next) {
-		if (!(base->flag & SELECT) && object_in_group(base->object, group)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-#endif
-	return changed;
-}
-
-static short select_grouped_object_hooks(bContext *C, Object *ob)
-{
-	Scene *scene= CTX_data_scene(C);
-	View3D *v3d= CTX_wm_view3d(C);
-
-	short changed = 0;
-	Base *base;
-	ModifierData *md;
-	HookModifierData *hmd;
-
-	for (md = ob->modifiers.first; md; md=md->next) {
-		if (md->type==eModifierType_Hook) {
-			hmd= (HookModifierData*) md;
-			if (hmd->object && !(hmd->object->flag & SELECT)) {
-				base= object_in_scene(hmd->object, scene);
-				if (base && (BASE_SELECTABLE(v3d, base))) {
-					ED_base_object_select(base, BA_SELECT);
-					changed = 1;
-				}
-			}
-		}
-	}
-	return changed;
-}
-
-/* Select objects woth the same parent as the active (siblings),
- * parent can be NULL also */
-static short select_grouped_siblings(bContext *C, Object *ob)
-{
-	short changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if ((base->object->parent==ob->parent)  && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static short select_grouped_type(bContext *C, Object *ob)
-{
-	short changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if ((base->object->type == ob->type) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static short select_grouped_layer(bContext *C, Object *ob)
-{
-	char changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if ((base->lay & ob->lay) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static short select_grouped_index_object(bContext *C, Object *ob)
-{
-	char changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static short select_grouped_color(bContext *C, Object *ob)
-{
-	char changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if (!(base->flag & SELECT) && (FloatCompare(base->object->col, ob->col, 0.005f))) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static short objects_share_gameprop(Object *a, Object *b)
-{
-	bProperty *prop;
-	/*make a copy of all its properties*/
-
-	for( prop= a->prop.first; prop; prop = prop->next ) {
-		if ( get_ob_property(b, prop->name) )
-			return 1;
-	}
-	return 0;
-}
-
-static short select_grouped_gameprops(bContext *C, Object *ob)
-{
-	char changed = 0;
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		if (!(base->flag & SELECT) && (objects_share_gameprop(base->object, ob))) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
-
-static int object_select_grouped_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *ob;
-	int nr = RNA_enum_get(op->ptr, "type");
-	short changed = 0, seltype;
-
-	seltype = RNA_enum_get(op->ptr, "seltype");
-	
-	if (seltype == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-	
-	ob= OBACT;
-	if(ob==0){ 
-		BKE_report(op->reports, RPT_ERROR, "No Active Object");
-		return OPERATOR_CANCELLED;
-	}
-	
-	if(nr==1)		changed = select_grouped_children(C, ob, 1);
-	else if(nr==2)	changed = select_grouped_children(C, ob, 0);
-	else if(nr==3)	changed = select_grouped_parent(C);
-	else if(nr==4)	changed = select_grouped_siblings(C, ob);
-	else if(nr==5)	changed = select_grouped_type(C, ob);
-	else if(nr==6)	changed = select_grouped_layer(C, ob);
-	else if(nr==7)	changed = select_grouped_group(C, ob);
-	else if(nr==8)	changed = select_grouped_object_hooks(C, ob);
-	else if(nr==9)	changed = select_grouped_index_object(C, ob);
-	else if(nr==10)	changed = select_grouped_color(C, ob);
-	else if(nr==11)	changed = select_grouped_gameprops(C, ob);
-	
-	if (changed) {
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-		return OPERATOR_FINISHED;
-	}
-	
-	return OPERATOR_CANCELLED;
-}
-
-void OBJECT_OT_select_grouped(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Select Grouped";
-	ot->description = "Select all visible objects grouped by various properties.";
-	ot->idname= "OBJECT_OT_select_grouped";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_select_grouped_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", "");
-	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
-
-}
-
-/* ****** selection by layer *******/
-
-static int object_select_by_layer_exec(bContext *C, wmOperator *op)
-{
-	unsigned int layernum;
-	short seltype;
-	
-	seltype = RNA_enum_get(op->ptr, "seltype");
-	layernum = RNA_int_get(op->ptr, "layer");
-	
-	if (seltype == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-		
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if(base->lay == (1<< (layernum -1)))
-			ED_base_object_select(base, BA_SELECT);
-	}
-	CTX_DATA_END;
-	
-	/* undo? */
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_by_layer(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "select by layer";
-	ot->description = "Select all visible objects on a layer.";
-	ot->idname= "OBJECT_OT_select_by_layer";
-	
-	/* api callbacks */
-	/*ot->invoke = XXX - need a int grid popup*/
-	ot->exec= object_select_by_layer_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_int(ot->srna, "layer", 1, 1, 20, "Layer", "", 1, 20);
-	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
-}
-
-/* ****** invert selection *******/
-static int object_select_inverse_exec(bContext *C, wmOperator *op)
-{
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if (base->flag & SELECT)
-			ED_base_object_select(base, BA_DESELECT);
-		else
-			ED_base_object_select(base, BA_SELECT);
-	}
-	CTX_DATA_END;
-	
-	/* undo? */
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_inverse(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Select Inverse";
-	ot->description = "Invert selection of all visible objects.";
-	ot->idname= "OBJECT_OT_select_inverse";
-	
-	/* api callbacks */
-	ot->exec= object_select_inverse_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-}
-/* ****** (de)select All *******/
-
-static int object_select_de_select_all_exec(bContext *C, wmOperator *op)
-{
-	
-	int a=0, ok=0; 
-	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if (base->flag & SELECT) {
-			ok= a= 1;
-			break;
-		}
-		else ok=1;
-	}
-	CTX_DATA_END;
-	
-	if (!ok) return OPERATOR_PASS_THROUGH;
-	
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if (a) ED_base_object_select(base, BA_DESELECT);
-		else ED_base_object_select(base, BA_SELECT);
-	}
-	CTX_DATA_END;
-	
-	/* undo? */
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_all_toggle(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "deselect all";
-	ot->description = "(de)select all visible objects in scene.";
-	ot->idname= "OBJECT_OT_select_all_toggle";
-	
-	/* api callbacks */
-	ot->exec= object_select_de_select_all_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-}
-/* ****** select mirror *******/
-/* finds the best possible flipped name. For renaming; check for unique names afterwards */
-/* if strip_number: removes number extensions */
-void object_flip_name (char *name)
-{
-	int     len;
-	char    prefix[128]={""};   /* The part before the facing */
-	char    suffix[128]={""};   /* The part after the facing */
-	char    replace[128]={""};  /* The replacement string */
-	char    number[128]={""};   /* The number extension string */
-	char    *index=NULL;
-
-	len= strlen(name);
-	if(len<3) return; // we don't do names like .R or .L
-
-	/* We first check the case with a .### extension, let's find the last period */
-	if(isdigit(name[len-1])) {
-		index= strrchr(name, '.'); // last occurrance
-		if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever!
-			strcpy(number, index);
-			*index= 0;
-			len= strlen(name);
-		}
-	}
-
-	strcpy (prefix, name);
-
-#define IS_SEPARATOR(a) ((a)=='.' || (a)==' ' || (a)=='-' || (a)=='_')
-
-	/* first case; separator . - _ with extensions r R l L  */
-	if( IS_SEPARATOR(name[len-2]) ) {
-		switch(name[len-1]) {
-			case 'l':
-				prefix[len-1]= 0;
-				strcpy(replace, "r");
-				break;
-			case 'r':
-				prefix[len-1]= 0;
-				strcpy(replace, "l");
-				break;
-			case 'L':
-				prefix[len-1]= 0;
-				strcpy(replace, "R");
-				break;
-			case 'R':
-				prefix[len-1]= 0;
-				strcpy(replace, "L");
-				break;
-		}
-	}
-	/* case; beginning with r R l L , with separator after it */
-	else if( IS_SEPARATOR(name[1]) ) {
-		switch(name[0]) {
-			case 'l':
-				strcpy(replace, "r");
-				strcpy(suffix, name+1);
-				prefix[0]= 0;
-				break;
-			case 'r':
-				strcpy(replace, "l");
-				strcpy(suffix, name+1);
-				prefix[0]= 0;
-				break;
-			case 'L':
-				strcpy(replace, "R");
-				strcpy(suffix, name+1);
-				prefix[0]= 0;
-				break;
-			case 'R':
-				strcpy(replace, "L");
-				strcpy(suffix, name+1);
-				prefix[0]= 0;
-				break;
-		}
-	}
-	else if(len > 5) {
-		/* hrms, why test for a separator? lets do the rule 'ultimate left or right' */
-		index = BLI_strcasestr(prefix, "right");
-		if (index==prefix || index==prefix+len-5) {
-			if(index[0]=='r') 
-				strcpy (replace, "left");
-			else {
-				if(index[1]=='I') 
-					strcpy (replace, "LEFT");
-				else
-					strcpy (replace, "Left");
-			}
-			*index= 0;
-			strcpy (suffix, index+5);
-		}
-		else {
-			index = BLI_strcasestr(prefix, "left");
-			if (index==prefix || index==prefix+len-4) {
-				if(index[0]=='l') 
-					strcpy (replace, "right");
-				else {
-					if(index[1]=='E') 
-						strcpy (replace, "RIGHT");
-					else
-						strcpy (replace, "Right");
-				}
-				*index= 0;
-				strcpy (suffix, index+4);
-			}
-		}
-	}
-
-#undef IS_SEPARATOR
-
-	sprintf (name, "%s%s%s%s", prefix, replace, suffix, number);
-}
-
-static int object_select_mirror_exec(bContext *C, wmOperator *op)
-{
-	char tmpname[32];
-	short seltype;
-	
-	seltype = RNA_enum_get(op->ptr, "seltype");
-	
-	CTX_DATA_BEGIN(C, Base*, primbase, selected_bases) {
-
-		strcpy(tmpname, primbase->object->id.name+2);
-		object_flip_name(tmpname);
-		
-		CTX_DATA_BEGIN(C, Base*, secbase, visible_bases) {
-			if(!strcmp(secbase->object->id.name+2, tmpname)) {
-				ED_base_object_select(secbase, BA_SELECT);
-			}
-		}
-		CTX_DATA_END;
-		
-		if (seltype == 0) ED_base_object_select(primbase, BA_DESELECT);
-		
-	}
-	CTX_DATA_END;
-	
-	/* undo? */
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_mirror(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Select Mirror";
-	ot->description = "Select the Mirror objects of the selected object eg. L.sword -> R.sword";
-	ot->idname= "OBJECT_OT_select_mirror";
-	
-	/* api callbacks */
-	ot->exec= object_select_mirror_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
-}
-/* ****** random selection *******/
-
-static int object_select_random_exec(bContext *C, wmOperator *op)
-{	
-	float percent;
-	short seltype;
-	
-	seltype = RNA_enum_get(op->ptr, "seltype");
-	
-	if (seltype == 0) {
-		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-	percent = RNA_float_get(op->ptr, "percent");
-		
-	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
-		if (BLI_frand() < percent) {
-				ED_base_object_select(base, BA_SELECT);
-		}
-	}
-	CTX_DATA_END;
-	
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_random(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Random select";
-	ot->description = "Set select on random visible objects.";
-	ot->idname= "OBJECT_OT_select_random";
-	
-	/* api callbacks */
-	/*ot->invoke= object_select_random_invoke XXX - need a number popup ;*/
-	ot->exec = object_select_random_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "percentage of objects to randomly select", 0.0001f, 1.0f);
-	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
-}
-
-/* ******** Clear object Translation *********** */
-
-static int object_location_clear_exec(bContext *C, wmOperator *op)
-{
-	int armature_clear= 0;
-
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-		if(!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
-			if ((ob->protectflag & OB_LOCK_LOCX)==0)
-				ob->loc[0]= ob->dloc[0]= 0.0f;
-			if ((ob->protectflag & OB_LOCK_LOCY)==0)
-				ob->loc[1]= ob->dloc[1]= 0.0f;
-			if ((ob->protectflag & OB_LOCK_LOCZ)==0)
-				ob->loc[2]= ob->dloc[2]= 0.0f;
-		}
-		ob->recalc |= OB_RECALC_OB;
-	}
-	CTX_DATA_END;
-
-	if(armature_clear==0) /* in this case flush was done */
-		ED_anim_dag_flush_update(C);	
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
-	
-	return OPERATOR_FINISHED;
-}
-
-
-void OBJECT_OT_location_clear(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Clear Location";
-	ot->description = "Clear the object's location.";
-	ot->idname= "OBJECT_OT_location_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_location_clear_exec;
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-static int object_rotation_clear_exec(bContext *C, wmOperator *op)
-{
-	int armature_clear= 0;
-
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-		if(!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
-			/* eulers can only get cleared if they are not protected */
-			if ((ob->protectflag & OB_LOCK_ROTX)==0)
-				ob->rot[0]= ob->drot[0]= 0.0f;
-			if ((ob->protectflag & OB_LOCK_ROTY)==0)
-				ob->rot[1]= ob->drot[1]= 0.0f;
-			if ((ob->protectflag & OB_LOCK_ROTZ)==0)
-				ob->rot[2]= ob->drot[2]= 0.0f;
-		}
-		ob->recalc |= OB_RECALC_OB;
-	}
-	CTX_DATA_END;
-
-	if(armature_clear==0) /* in this case flush was done */
-		ED_anim_dag_flush_update(C);	
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
-	
-	return OPERATOR_FINISHED;
-}
-
-
-void OBJECT_OT_rotation_clear(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Clear Rotation";
-	ot->description = "Clear the object's rotation.";
-	ot->idname= "OBJECT_OT_rotation_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_rotation_clear_exec;
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-static int object_scale_clear_exec(bContext *C, wmOperator *op)
-{
-	int armature_clear= 0;
-
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-		if(!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
-			if ((ob->protectflag & OB_LOCK_SCALEX)==0) {
-				ob->dsize[0]= 0.0f;
-				ob->size[0]= 1.0f;
-			}
-			if ((ob->protectflag & OB_LOCK_SCALEY)==0) {
-				ob->dsize[1]= 0.0f;
-				ob->size[1]= 1.0f;
-			}
-			if ((ob->protectflag & OB_LOCK_SCALEZ)==0) {
-				ob->dsize[2]= 0.0f;
-				ob->size[2]= 1.0f;
-			}
-		}
-		ob->recalc |= OB_RECALC_OB;
-	}
-	CTX_DATA_END;
-	
-	if(armature_clear==0) /* in this case flush was done */
-		ED_anim_dag_flush_update(C);	
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_scale_clear(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Clear Scale";
-	ot->description = "Clear the object's scale.";
-	ot->idname= "OBJECT_OT_scale_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_scale_clear_exec;
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-static int object_origin_clear_exec(bContext *C, wmOperator *op)
-{
-	float *v1, *v3, mat[3][3];
-	int armature_clear= 0;
-
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-		if(ob->parent) {
-			v1= ob->loc;
-			v3= ob->parentinv[3];
-			
-			Mat3CpyMat4(mat, ob->parentinv);
-			VECCOPY(v3, v1);
-			v3[0]= -v3[0];
-			v3[1]= -v3[1];
-			v3[2]= -v3[2];
-			Mat3MulVecfl(mat, v3);
-		}
-		ob->recalc |= OB_RECALC_OB;
-	}
-	CTX_DATA_END;
-
-	if(armature_clear==0) /* in this case flush was done */
-		ED_anim_dag_flush_update(C);	
-	
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_origin_clear(wmOperatorType *ot)
-{
-
-	/* identifiers */
-	ot->name= "Clear Origin";
-	ot->description = "Clear the object's origin.";
-	ot->idname= "OBJECT_OT_origin_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_origin_clear_exec;
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
 /* ********* clear/set restrict view *********/
 static int object_restrictview_clear_exec(bContext *C, wmOperator *op)
 {
@@ -2678,1150 +274,8 @@ void OBJECT_OT_restrictview_set(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects.");
 	
 }
-/* ************* Slow Parent ******************* */
-static int object_slowparent_set_exec(bContext *C, wmOperator *op)
-{
-
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-		
-		if(base->object->parent) base->object->partype |= PARSLOW;
-		base->object->recalc |= OB_RECALC_OB;
-		
-	}
-	CTX_DATA_END;
-
-	ED_anim_dag_flush_update(C);	
-	
-	WM_event_add_notifier(C, NC_SCENE, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_slowparent_set(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Set Slow Parent";
-	ot->description = "Set the object's slow parent.";
-	ot->idname= "OBJECT_OT_slow_parent_set";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_slowparent_set_exec;
-	ot->poll= ED_operator_view3d_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-static int object_slowparent_clear_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-		if(base->object->parent) {
-			if(base->object->partype & PARSLOW) {
-				base->object->partype -= PARSLOW;
-				where_is_object(scene, base->object);
-				base->object->partype |= PARSLOW;
-				base->object->recalc |= OB_RECALC_OB;
-			}
-		}
-		
-	}
-	CTX_DATA_END;
-
-	ED_anim_dag_flush_update(C);	
-	
-	WM_event_add_notifier(C, NC_SCENE, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_slowparent_clear(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Clear Slow Parent";
-	ot->description = "Clear the object's slow parent.";
-	ot->idname= "OBJECT_OT_slow_parent_clear";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_slowparent_clear_exec;
-	ot->poll= ED_operator_view3d_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-/* ******************** **************** */
-
-/* only in edit mode */
-void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
-{
-	EditVert *eve;
-	Base *base;
-	Curve *cu= obedit->data;
-	Nurb *nu;
-	BezTriple *bezt;
-	BPoint *bp;
-	Object *par, *ob;
-	int a, v1=0, v2=0, v3=0, v4=0, nr=1;
-	
-	/* we need 1 to 3 selected vertices */
-	
-	if(obedit->type==OB_MESH) {
-		Mesh *me= obedit->data;
-		EditMesh *em = BKE_mesh_get_editmesh(me);
-
-		eve= em->verts.first;
-		while(eve) {
-			if(eve->f & 1) {
-				if(v1==0) v1= nr;
-				else if(v2==0) v2= nr;
-				else if(v3==0) v3= nr;
-				else if(v4==0) v4= nr;
-				else break;
-			}
-			nr++;
-			eve= eve->next;
-		}
-
-		BKE_mesh_end_editmesh(me, em);
-	}
-	else if(ELEM(obedit->type, OB_SURF, OB_CURVE)) {
-		ListBase *editnurb= curve_get_editcurve(obedit);
-
-		nu= editnurb->first;
-		while(nu) {
-			if(nu->type == CU_BEZIER) {
-				bezt= nu->bezt;
-				a= nu->pntsu;
-				while(a--) {
-					if(BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
-						if(v1==0) v1= nr;
-						else if(v2==0) v2= nr;
-						else if(v3==0) v3= nr;
-						else if(v4==0) v4= nr;
-						else break;
-					}
-					nr++;
-					bezt++;
-				}
-			}
-			else {
-				bp= nu->bp;
-				a= nu->pntsu*nu->pntsv;
-				while(a--) {
-					if(bp->f1 & SELECT) {
-						if(v1==0) v1= nr;
-						else if(v2==0) v2= nr;
-						else if(v3==0) v3= nr;
-						else if(v4==0) v4= nr;
-						else break;
-					}
-					nr++;
-					bp++;
-				}
-			}
-			nu= nu->next;
-		}
-	}
-	else if(obedit->type==OB_LATTICE) {
-		Lattice *lt= obedit->data;
-		
-		a= lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
-		bp= lt->editlatt->def;
-		while(a--) {
-			if(bp->f1 & SELECT) {
-				if(v1==0) v1= nr;
-				else if(v2==0) v2= nr;
-				else if(v3==0) v3= nr;
-				else if(v4==0) v4= nr;
-				else break;
-			}
-			nr++;
-			bp++;
-		}
-	}
-	
-	if(v4 || !((v1 && v2==0 && v3==0) || (v1 && v2 && v3)) ) {
-		error("Select either 1 or 3 vertices to parent to");
-		return;
-	}
-	
-	if(okee("Make vertex parent")==0) return;
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			if(base!=BASACT) {
-				
-				ob= base->object;
-				ob->recalc |= OB_RECALC;
-				par= BASACT->object->parent;
-				
-				while(par) {
-					if(par==ob) break;
-					par= par->parent;
-				}
-				if(par) {
-					error("Loop in parents");
-				}
-				else {
-					Object workob;
-					
-					ob->parent= BASACT->object;
-					if(v3) {
-						ob->partype= PARVERT3;
-						ob->par1= v1-1;
-						ob->par2= v2-1;
-						ob->par3= v3-1;
-
-						/* inverse parent matrix */
-						what_does_parent(scene, ob, &workob);
-						Mat4Invert(ob->parentinv, workob.obmat);
-					}
-					else {
-						ob->partype= PARVERT1;
-						ob->par1= v1-1;
-
-						/* inverse parent matrix */
-						what_does_parent(scene, ob, &workob);
-						Mat4Invert(ob->parentinv, workob.obmat);
-					}
-				}
-			}
-		}
-	}
-	
-	DAG_scene_sort(scene);
-}
 
 
-/* ******************** make proxy operator *********************** */
-
-/* present menu listing the possible objects within the group to proxify */
-static void proxy_group_objects_menu (bContext *C, wmOperator *op, Object *ob, Group *group)
-{
-	uiPopupMenu *pup;
-	uiLayout *layout;
-	GroupObject *go;
-	int len=0;
-	
-	/* check if there are any objects within the group to assign for */
-	for (go= group->gobject.first; go; go= go->next) {
-		if (go->ob) len++;
-	}
-	if (len==0) return;
-	
-	/* now create the menu to draw */
-	pup= uiPupMenuBegin(C, "Make Proxy For:", 0);
-	layout= uiPupMenuLayout(pup);
-	
-	for (go= group->gobject.first; go; go= go->next) {
-		if (go->ob) {
-			PointerRNA props_ptr;
-			
-			/* create operator menu item with relevant properties filled in */
-			props_ptr= uiItemFullO(layout, go->ob->id.name+2, 0, op->idname, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
-			RNA_string_set(&props_ptr, "object", go->ob->id.name+2);
-			RNA_string_set(&props_ptr, "group_object", go->ob->id.name+2);
-		}
-	}
-	
-	/* display the menu, and be done */
-	uiPupMenuEnd(C, pup);
-}
-
-/* set the object to proxify */
-static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *ob= CTX_data_active_object(C);
-	
-	/* sanity checks */
-	if (!scene || scene->id.lib || !ob)
-		return OPERATOR_CANCELLED;
-		
-	/* Get object to work on - use a menu if we need to... */
-	if (ob->dup_group && ob->dup_group->id.lib) {
-		/* gives menu with list of objects in group */
-		proxy_group_objects_menu(C, op, ob, ob->dup_group);
-	}
-	else if (ob->id.lib) {
-		uiPopupMenu *pup= uiPupMenuBegin(C, "OK?", ICON_QUESTION);
-		uiLayout *layout= uiPupMenuLayout(pup);
-		PointerRNA props_ptr;
-		
-		/* create operator menu item with relevant properties filled in */
-		props_ptr= uiItemFullO(layout, op->type->name, 0, op->idname, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
-		RNA_string_set(&props_ptr, "object", ob->id.name+2);
-		
-		/* present the menu and be done... */
-		uiPupMenuEnd(C, pup);
-	}
-	else {
-		/* error.. cannot continue */
-		BKE_report(op->reports, RPT_ERROR, "Can only make proxy for a referenced object or group");
-	}
-	
-	/* this invoke just calls another instance of this operator... */
-	return OPERATOR_CANCELLED;
-}
-
-static int make_proxy_exec (bContext *C, wmOperator *op)
-{
-	Object *ob=NULL, *gob=NULL;
-	Scene *scene= CTX_data_scene(C);
-	char ob_name[21], gob_name[21];
-	
-	/* get object and group object
-	 *	- firstly names
-	 *	- then pointers from context 
-	 */
-	RNA_string_get(op->ptr, "object", ob_name);
-	RNA_string_get(op->ptr, "group_object", gob_name);
-	
-	if (gob_name[0]) {
-		Group *group;
-		GroupObject *go;
-		
-		/* active object is group object... */
-		// FIXME: we should get the nominated name instead
-		gob= CTX_data_active_object(C);
-		group= gob->dup_group;
-		
-		/* find the object to affect */
-		for (go= group->gobject.first; go; go= go->next) {
-			if ((go->ob) && strcmp(go->ob->id.name+2, gob_name)==0) {
-				ob= go->ob;
-				break;
-			}
-		}
-	}
-	else {
-		/* just use the active object for now */
-		// FIXME: we should get the nominated name instead
-		ob= CTX_data_active_object(C);
-	}
-	
-	if (ob) {
-		Object *newob;
-		Base *newbase, *oldbase= BASACT;
-		char name[32];
-		
-		/* Add new object for the proxy */
-		newob= add_object(scene, OB_EMPTY);
-		if (gob)
-			strcpy(name, gob->id.name+2);
-		else
-			strcpy(name, ob->id.name+2);
-		strcat(name, "_proxy");
-		rename_id(&newob->id, name);
-		
-		/* set layers OK */
-		newbase= BASACT;	/* add_object sets active... */
-		newbase->lay= oldbase->lay;
-		newob->lay= newbase->lay;
-		
-		/* remove base, leave user count of object, it gets linked in object_make_proxy */
-		if (gob==NULL) {
-			BLI_remlink(&scene->base, oldbase);
-			MEM_freeN(oldbase);
-		}
-		
-		object_make_proxy(newob, ob, gob);
-		
-		/* depsgraph flushes are needed for the new data */
-		DAG_scene_sort(scene);
-		DAG_id_flush_update(&newob->id, OB_RECALC);
-		
-		WM_event_add_notifier(C, NC_OBJECT, NULL);
-	}
-	else {
-		BKE_report(op->reports, RPT_ERROR, "No object to make proxy for");
-		return OPERATOR_CANCELLED;
-	}
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_proxy_make (wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Make Proxy";
-	ot->idname= "OBJECT_OT_proxy_make";
-	ot->description= "Add empty object to become local replacement data of a library-linked object";
-	
-	/* callbacks */
-	ot->invoke= make_proxy_invoke;
-	ot->exec= make_proxy_exec;
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	/* properties */
-	RNA_def_string(ot->srna, "object", "", 19, "Proxy Object", "Name of lib-linked/grouped object to make a proxy for.");
-	RNA_def_string(ot->srna, "group_object", "", 19, "Group Object", "Name of group instancer (if applicable).");
-}
-
-/* ******************** make parent operator *********************** */
-
-#define PAR_OBJECT				0
-#define PAR_ARMATURE			1
-#define PAR_ARMATURE_NAME		2
-#define PAR_ARMATURE_ENVELOPE	3
-#define PAR_ARMATURE_AUTO		4
-#define PAR_BONE				5
-#define PAR_CURVE				6
-#define PAR_FOLLOW				7
-#define PAR_PATH_CONST			8
-#define PAR_LATTICE				9
-#define PAR_VERTEX				10
-#define PAR_TRIA				11
-
-static EnumPropertyItem prop_make_parent_types[] = {
-	{PAR_OBJECT, "OBJECT", 0, "Object", ""},
-	{PAR_ARMATURE, "ARMATURE", 0, "Armature Deform", ""},
-	{PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, "   With Empty Groups", ""},
-	{PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, "   With Automatic Weights", ""},
-	{PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, "   With Envelope Weights", ""},
-	{PAR_BONE, "BONE", 0, "Bone", ""},
-	{PAR_CURVE, "CURVE", 0, "Curve Deform", ""},
-	{PAR_FOLLOW, "FOLLOW", 0, "Follow Path", ""},
-	{PAR_PATH_CONST, "PATH_CONST", 0, "Path Constraint", ""},
-	{PAR_LATTICE, "LATTICE", 0, "Lattice Deform", ""},
-	{PAR_VERTEX, "VERTEX", 0, "Vertex", ""},
-	{PAR_TRIA, "TRIA", 0, "Triangle", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int test_parent_loop(Object *par, Object *ob)
-{
-	/* test if 'ob' is a parent somewhere in par's parents */
-	
-	if(par == NULL) return 0;
-	if(ob == par) return 1;
-	
-	return test_parent_loop(par->parent, ob);
-}
-
-void ED_object_parent(Object *ob, Object *par, int type, const char *substr)
-{
-	if(!par || test_parent_loop(par, ob)) {
-		ob->parent= NULL;
-		ob->partype= PAROBJECT;
-		ob->parsubstr[0]= 0;
-		return;
-	}
-
-	/* this could use some more checks */
-
-	ob->parent= par;
-	ob->partype &= ~PARTYPE;
-	ob->partype |= type;
-	BLI_strncpy(ob->parsubstr, substr, sizeof(ob->parsubstr));
-}
-
-static int parent_set_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *par= CTX_data_active_object(C);
-	bPoseChannel *pchan= NULL;
-	int partype= RNA_enum_get(op->ptr, "type");
-	int pararm= ELEM4(partype, PAR_ARMATURE, PAR_ARMATURE_NAME, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO);
-	
-	par->recalc |= OB_RECALC_OB;
-	
-	/* preconditions */
-	if(partype==PAR_FOLLOW || partype==PAR_PATH_CONST) {
-		if(par->type!=OB_CURVE)
-			return OPERATOR_CANCELLED;
-		else {
-			Curve *cu= par->data;
-			
-			if((cu->flag & CU_PATH)==0) {
-				cu->flag |= CU_PATH|CU_FOLLOW;
-				makeDispListCurveTypes(scene, par, 0);  /* force creation of path data */
-			}
-			else cu->flag |= CU_FOLLOW;
-			
-			/* fall back on regular parenting now */
-			partype= PAR_OBJECT;
-		}		
-	}
-	else if(partype==PAR_BONE) {
-		pchan= get_active_posechannel(par);
-		
-		if(pchan==NULL) {
-			error("No active Bone");
-			return OPERATOR_CANCELLED;
-		}
-	}
-	
-	/* context itterator */
-	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-		
-		if(ob!=par) {
-			
-			if( test_parent_loop(par, ob) ) {
-				error("Loop in parents");
-			}
-			else {
-				Object workob;
-				
-				/* apply transformation of previous parenting */
-				ED_object_apply_obmat(ob);
-				
-				ob->parent= par;
-				
-				/* handle types */
-				if (pchan)
-					strcpy (ob->parsubstr, pchan->name);
-				else
-					ob->parsubstr[0]= 0;
-				
-				/* constraint */
-				if(partype==PAR_PATH_CONST) {
-					bConstraint *con;
-					bFollowPathConstraint *data;
-					float cmat[4][4], vec[3];
-					
-					con = add_new_constraint(CONSTRAINT_TYPE_FOLLOWPATH);
-					strcpy (con->name, "AutoPath");
-					
-					data = con->data;
-					data->tar = par;
-					
-					add_constraint_to_object(con, ob);
-					
-					get_constraint_target_matrix(con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra - give_timeoffset(ob));
-					VecSubf(vec, ob->obmat[3], cmat[3]);
-					
-					ob->loc[0] = vec[0];
-					ob->loc[1] = vec[1];
-				}
-				else if(pararm && ob->type==OB_MESH && par->type == OB_ARMATURE) {
-					if(partype == PAR_ARMATURE_NAME)
-						create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_NAME);
-					else if(partype == PAR_ARMATURE_ENVELOPE)
-						create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_ENVELOPE);
-					else if(partype == PAR_ARMATURE_AUTO)
-						create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_AUTO);
-					
-					/* get corrected inverse */
-					ob->partype= PAROBJECT;
-					what_does_parent(scene, ob, &workob);
-					
-					ob->partype= PARSKEL;
-
-					Mat4Invert(ob->parentinv, workob.obmat);
-				}
-				else {
-					/* calculate inverse parent matrix */
-					what_does_parent(scene, ob, &workob);
-					Mat4Invert(ob->parentinv, workob.obmat);
-				}
-				
-				ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA;
-				
-				if( ELEM(partype, PAR_CURVE, PAR_LATTICE) || pararm )
-					ob->partype= PARSKEL; /* note, dna define, not operator property */
-				else
-					ob->partype= PAROBJECT;	/* note, dna define, not operator property */
-			}
-		}
-	}
-	CTX_DATA_END;
-	
-	DAG_scene_sort(CTX_data_scene(C));
-	ED_anim_dag_flush_update(C);
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
-	
-	return OPERATOR_FINISHED;
-}
-
-static int parent_set_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *ob= CTX_data_active_object(C);
-	uiPopupMenu *pup= uiPupMenuBegin(C, "Set Parent To", 0);
-	uiLayout *layout= uiPupMenuLayout(pup);
-	
-	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
-	uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_OBJECT);
-	
-	/* ob becomes parent, make the associated menus */
-	if(ob->type==OB_ARMATURE) {
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE);
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE_NAME);
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE_ENVELOPE);
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE_AUTO);
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_BONE);
-	}
-	else if(ob->type==OB_CURVE) {
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_CURVE);
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_FOLLOW);
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_PATH_CONST);
-	}
-	else if(ob->type == OB_LATTICE) {
-		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_LATTICE);
-	}
-	
-	uiPupMenuEnd(C, pup);
-	
-	return OPERATOR_CANCELLED;
-}
-
-
-void OBJECT_OT_parent_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Make Parent";
-	ot->description = "Set the object's parenting.";
-	ot->idname= "OBJECT_OT_parent_set";
-	
-	/* api callbacks */
-	ot->invoke= parent_set_invoke;
-	ot->exec= parent_set_exec;
-	
-	ot->poll= ED_operator_object_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", "");
-}
-
-/* *** make track ***** */
-static EnumPropertyItem prop_make_track_types[] = {
-	{1, "TRACKTO", 0, "TrackTo Constraint", ""},
-	{2, "LOCKTRACK", 0, "LockTrack Constraint", ""},
-	{3, "OLDTRACK", 0, "Old Track", ""},
-	{0, NULL, 0, NULL, NULL}
-};
-
-static int track_set_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	int type= RNA_enum_get(op->ptr, "type");
-		
-	if(type == 1) {
-		bConstraint *con;
-		bTrackToConstraint *data;
-
-		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-			if(base!=BASACT) {
-				con = add_new_constraint(CONSTRAINT_TYPE_TRACKTO);
-				strcpy (con->name, "AutoTrack");
-
-				data = con->data;
-				data->tar = BASACT->object;
-				base->object->recalc |= OB_RECALC;
-				
-				/* Lamp and Camera track differently by default */
-				if (base->object->type == OB_LAMP || base->object->type == OB_CAMERA) {
-					data->reserved1 = TRACK_nZ;
-					data->reserved2 = UP_Y;
-				}
-
-				add_constraint_to_object(con, base->object);
-			}
-		}
-		CTX_DATA_END;
-	}
-	else if(type == 2) {
-		bConstraint *con;
-		bLockTrackConstraint *data;
-
-		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-			if(base!=BASACT) {
-				con = add_new_constraint(CONSTRAINT_TYPE_LOCKTRACK);
-				strcpy (con->name, "AutoTrack");
-
-				data = con->data;
-				data->tar = BASACT->object;
-				base->object->recalc |= OB_RECALC;
-				
-				/* Lamp and Camera track differently by default */
-				if (base->object->type == OB_LAMP || base->object->type == OB_CAMERA) {
-					data->trackflag = TRACK_nZ;
-					data->lockflag = LOCK_Y;
-				}
-
-				add_constraint_to_object(con, base->object);
-			}
-		}
-		CTX_DATA_END;
-	}
-	else {
-		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-			if(base!=BASACT) {
-				base->object->track= BASACT->object;
-				base->object->recalc |= OB_RECALC;
-			}
-		}
-		CTX_DATA_END;
-	}
-	DAG_scene_sort(CTX_data_scene(C));
-	ED_anim_dag_flush_update(C);	
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_track_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Make Track";
-	ot->description = "Make the object track another object, either by constraint or old way or locked track.";
-	ot->idname= "OBJECT_OT_track_set";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= track_set_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", "");
-}
-
-/* ************* Make Dupli Real ********* */
-static void make_object_duplilist_real(Scene *scene, View3D *v3d, Base *base)
-{
-	Base *basen;
-	Object *ob;
-	ListBase *lb;
-	DupliObject *dob;
-	
-	if(!base && !(base = BASACT))
-		return;
-	
-	if(!(base->object->transflag & OB_DUPLI))
-		return;
-	
-	lb= object_duplilist(scene, base->object);
-	
-	for(dob= lb->first; dob; dob= dob->next) {
-		ob= copy_object(dob->ob);
-		/* font duplis can have a totcol without material, we get them from parent
-		* should be implemented better...
-		*/
-		if(ob->mat==NULL) ob->totcol= 0;
-		
-		basen= MEM_dupallocN(base);
-		basen->flag &= ~OB_FROMDUPLI;
-		BLI_addhead(&scene->base, basen);	/* addhead: othwise eternal loop */
-		basen->object= ob;
-		ob->ipo= NULL;		/* make sure apply works */
-		ob->parent= ob->track= NULL;
-		ob->disp.first= ob->disp.last= NULL;
-		ob->transflag &= ~OB_DUPLI;	
-		
-		Mat4CpyMat4(ob->obmat, dob->mat);
-		ED_object_apply_obmat(ob);
-	}
-	
-	copy_object_set_idnew(scene, v3d, 0);
-	
-	free_object_duplilist(lb);
-	
-	base->object->transflag &= ~OB_DUPLI;	
-}
-
-
-static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	
-	clear_id_newpoins();
-		
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-		make_object_duplilist_real(scene, v3d, base);
-	}
-	CTX_DATA_END;
-
-	DAG_scene_sort(CTX_data_scene(C));
-	ED_anim_dag_flush_update(C);	
-	WM_event_add_notifier(C, NC_SCENE, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_duplicates_make_real(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Make Duplicates Real";
-	ot->description = "Make dupli objects attached to this object real.";
-	ot->idname= "OBJECT_OT_duplicates_make_real";
-	
-	/* api callbacks */
-	ot->invoke= WM_operator_confirm;
-	ot->exec= object_duplicates_make_real_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-/* ******************* Set Object Center ********************** */
-
-static EnumPropertyItem prop_set_center_types[] = {
-	{0, "CENTER", 0, "ObData to Center", "Move object data around Object center"},
-	{1, "CENTERNEW", 0, "Center New", "Move Object center to center of object data"},
-	{2, "CENTERCURSOR", 0, "Center Cursor", "Move Object Center to position of the 3d cursor"},
-	{0, NULL, 0, NULL, NULL}
-};
-
-/* 0 == do center, 1 == center new, 2 == center cursor */
-static int object_center_set_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	Object *obedit= CTX_data_edit_object(C);
-	Object *ob;
-	Mesh *me, *tme;
-	Curve *cu;
-/*	BezTriple *bezt;
-	BPoint *bp; */
-	Nurb *nu, *nu1;
-	EditVert *eve;
-	float cent[3], centn[3], min[3], max[3], omat[3][3];
-	int a, total= 0;
-	int centermode = RNA_enum_get(op->ptr, "type");
-	
-	/* keep track of what is changed */
-	int tot_change=0, tot_lib_error=0, tot_multiuser_arm_error=0;
-	MVert *mvert;
-
-	if(scene->id.lib || v3d==NULL){
-		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed on Lib data");
-		 return OPERATOR_CANCELLED;
-	}
-	if (obedit && centermode > 0) {
-		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
-		return OPERATOR_CANCELLED;
-	}	
-	cent[0]= cent[1]= cent[2]= 0.0;	
-	
-	if(obedit) {
-
-		INIT_MINMAX(min, max);
-	
-		if(obedit->type==OB_MESH) {
-			Mesh *me= obedit->data;
-			EditMesh *em = BKE_mesh_get_editmesh(me);
-
-			for(eve= em->verts.first; eve; eve= eve->next) {
-				if(v3d->around==V3D_CENTROID) {
-					total++;
-					VECADD(cent, cent, eve->co);
-				}
-				else {
-					DO_MINMAX(eve->co, min, max);
-				}
-			}
-			
-			if(v3d->around==V3D_CENTROID) {
-				VecMulf(cent, 1.0f/(float)total);
-			}
-			else {
-				cent[0]= (min[0]+max[0])/2.0f;
-				cent[1]= (min[1]+max[1])/2.0f;
-				cent[2]= (min[2]+max[2])/2.0f;
-			}
-			
-			for(eve= em->verts.first; eve; eve= eve->next) {
-				VecSubf(eve->co, eve->co, cent);			
-			}
-			
-			recalc_editnormals(em);
-			tot_change++;
-			DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-			BKE_mesh_end_editmesh(me, em);
-		}
-	}
-	
-	/* reset flags */
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-			base->object->flag &= ~OB_DONE;
-	}
-	CTX_DATA_END;
-	
-	for (me= G.main->mesh.first; me; me= me->id.next) {
-		me->flag &= ~ME_ISDONE;
-	}
-	
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-		if((base->object->flag & OB_DONE)==0) {
-			base->object->flag |= OB_DONE;
-				
-			if(obedit==NULL && (me=get_mesh(base->object)) ) {
-				if (me->id.lib) {
-					tot_lib_error++;
-				} else {
-					if(centermode==2) {
-						VECCOPY(cent, give_cursor(scene, v3d));
-						Mat4Invert(base->object->imat, base->object->obmat);
-						Mat4MulVecfl(base->object->imat, cent);
-					} else {
-						INIT_MINMAX(min, max);
-						mvert= me->mvert;
-						for(a=0; a<me->totvert; a++, mvert++) {
-							DO_MINMAX(mvert->co, min, max);
-						}
-					
-						cent[0]= (min[0]+max[0])/2.0f;
-						cent[1]= (min[1]+max[1])/2.0f;
-						cent[2]= (min[2]+max[2])/2.0f;
-					}
-
-					mvert= me->mvert;
-					for(a=0; a<me->totvert; a++, mvert++) {
-						VecSubf(mvert->co, mvert->co, cent);
-					}
-					
-					if (me->key) {
-						KeyBlock *kb;
-						for (kb=me->key->block.first; kb; kb=kb->next) {
-							float *fp= kb->data;
-							
-							for (a=0; a<kb->totelem; a++, fp+=3) {
-								VecSubf(fp, fp, cent);
-							}
-						}
-					}
-						
-					me->flag |= ME_ISDONE;
-						
-					if(centermode) {
-						Mat3CpyMat4(omat, base->object->obmat);
-						
-						VECCOPY(centn, cent);
-						Mat3MulVecfl(omat, centn);
-						base->object->loc[0]+= centn[0];
-						base->object->loc[1]+= centn[1];
-						base->object->loc[2]+= centn[2];
-						
-						where_is_object(scene, base->object);
-						ignore_parent_tx(scene, base->object);
-						
-						/* other users? */
-						CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-							ob = base->object;
-							if((ob->flag & OB_DONE)==0) {
-								tme= get_mesh(ob);
-								
-								if(tme==me) {
-									
-									ob->flag |= OB_DONE;
-									ob->recalc= OB_RECALC_OB|OB_RECALC_DATA;
-
-									Mat3CpyMat4(omat, ob->obmat);
-									VECCOPY(centn, cent);
-									Mat3MulVecfl(omat, centn);
-									ob->loc[0]+= centn[0];
-									ob->loc[1]+= centn[1];
-									ob->loc[2]+= centn[2];
-									
-									where_is_object(scene, ob);
-									ignore_parent_tx(scene, ob);
-									
-									if(tme && (tme->flag & ME_ISDONE)==0) {
-										mvert= tme->mvert;
-										for(a=0; a<tme->totvert; a++, mvert++) {
-											VecSubf(mvert->co, mvert->co, cent);
-										}
-										
-										if (tme->key) {
-											KeyBlock *kb;
-											for (kb=tme->key->block.first; kb; kb=kb->next) {
-												float *fp= kb->data;
-												
-												for (a=0; a<kb->totelem; a++, fp+=3) {
-													VecSubf(fp, fp, cent);
-												}
-											}
-										}
-										
-										tme->flag |= ME_ISDONE;
-									}
-								}
-							}
-							
-							ob= ob->id.next;
-						}
-						CTX_DATA_END;
-					}
-					tot_change++;
-				}
-			}
-			else if (ELEM(base->object->type, OB_CURVE, OB_SURF)) {
-				
-				/* weak code here... (ton) */
-				if(obedit==base->object) {
-					ListBase *editnurb= curve_get_editcurve(obedit);
-
-					nu1= editnurb->first;
-					cu= obedit->data;
-				}
-				else {
-					cu= base->object->data;
-					nu1= cu->nurb.first;
-				}
-				
-				if (cu->id.lib) {
-					tot_lib_error++;
-				} else {
-					if(centermode==2) {
-						VECCOPY(cent, give_cursor(scene, v3d));
-						Mat4Invert(base->object->imat, base->object->obmat);
-						Mat4MulVecfl(base->object->imat, cent);
-
-						/* don't allow Z change if curve is 2D */
-						if( !( cu->flag & CU_3D ) )
-							cent[2] = 0.0;
-					} 
-					else {
-						INIT_MINMAX(min, max);
-						
-						nu= nu1;
-						while(nu) {
-							minmaxNurb(nu, min, max);
-							nu= nu->next;
-						}
-						
-						cent[0]= (min[0]+max[0])/2.0f;
-						cent[1]= (min[1]+max[1])/2.0f;
-						cent[2]= (min[2]+max[2])/2.0f;
-					}
-					
-					nu= nu1;
-					while(nu) {
-						if(nu->type == CU_BEZIER) {
-							a= nu->pntsu;
-							while (a--) {
-								VecSubf(nu->bezt[a].vec[0], nu->bezt[a].vec[0], cent);
-								VecSubf(nu->bezt[a].vec[1], nu->bezt[a].vec[1], cent);
-								VecSubf(nu->bezt[a].vec[2], nu->bezt[a].vec[2], cent);
-							}
-						}
-						else {
-							a= nu->pntsu*nu->pntsv;
-							while (a--)
-								VecSubf(nu->bp[a].vec, nu->bp[a].vec, cent);
-						}
-						nu= nu->next;
-					}
-			
-					if(centermode && obedit==0) {
-						Mat3CpyMat4(omat, base->object->obmat);
-						
-						Mat3MulVecfl(omat, cent);
-						base->object->loc[0]+= cent[0];
-						base->object->loc[1]+= cent[1];
-						base->object->loc[2]+= cent[2];
-						
-						where_is_object(scene, base->object);
-						ignore_parent_tx(scene, base->object);
-					}
-					
-					tot_change++;
-					if(obedit) {
-						if (centermode==0) {
-							DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
-						}
-						break;
-					}
-				}
-			}
-			else if(base->object->type==OB_FONT) {
-				/* get from bb */
-				
-				cu= base->object->data;
-				
-				if(cu->bb==0) {
-					/* do nothing*/
-				} else if (cu->id.lib) {
-					tot_lib_error++;
-				} else {
-					cu->xof= -0.5f*( cu->bb->vec[4][0] - cu->bb->vec[0][0]);
-					cu->yof= -0.5f -0.5f*( cu->bb->vec[0][1] - cu->bb->vec[2][1]);	/* extra 0.5 is the height o above line */
-					
-					/* not really ok, do this better once! */
-					cu->xof /= cu->fsize;
-					cu->yof /= cu->fsize;
-
-					tot_change++;
-				}
-			}
-			else if(base->object->type==OB_ARMATURE) {
-				bArmature *arm = base->object->data;
-				
-				if (arm->id.lib) {
-					tot_lib_error++;
-				} else if(arm->id.us>1) {
-					/*error("Can't apply to a multi user armature");
-					return;*/
-					tot_multiuser_arm_error++;
-				} else {
-					/* Function to recenter armatures in editarmature.c 
-					 * Bone + object locations are handled there.
-					 */
-					docenter_armature(scene, v3d, base->object, centermode);
-					tot_change++;
-					
-					where_is_object(scene, base->object);
-					ignore_parent_tx(scene, base->object);
-					
-					if(obedit) 
-						break;
-				}
-			}
-			base->object->recalc= OB_RECALC_OB|OB_RECALC_DATA;
-		}
-	}
-	CTX_DATA_END;
-	
-	if (tot_change) {
-		ED_anim_dag_flush_update(C);
-	}
-	
-	/* Warn if any errors occured */
-	if (tot_lib_error+tot_multiuser_arm_error) {
-		BKE_reportf(op->reports, RPT_WARNING, "%i Object(s) Not Centered, %i Changed:",tot_lib_error+tot_multiuser_arm_error, tot_change);		
-		if (tot_lib_error)
-			BKE_reportf(op->reports, RPT_WARNING, "|%i linked library objects",tot_lib_error);
-		if (tot_multiuser_arm_error)
-			BKE_reportf(op->reports, RPT_WARNING, "|%i multiuser armature object(s)",tot_multiuser_arm_error);
-	}
-	
-	return OPERATOR_FINISHED;
-}
-void OBJECT_OT_center_set(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Set Center";
-	ot->description = "Set the object's center, by either moving the data, or set to center of data, or use 3d cursor";
-	ot->idname= "OBJECT_OT_center_set";
-	
-	/* api callbacks */
-	ot->invoke= WM_menu_invoke;
-	ot->exec= object_center_set_exec;
-	
-	ot->poll= ED_operator_view3d_active;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", "");
-}
 /* ******************* toggle editmode operator  ***************** */
 
 void ED_object_exit_editmode(bContext *C, int flag)
@@ -3857,7 +311,7 @@ void ED_object_exit_editmode(bContext *C, int flag)
 			mesh_octree_table(obedit, NULL, NULL, 'e');
 	}
 	else if (obedit->type==OB_ARMATURE) {	
-		ED_armature_from_edit(scene, obedit);
+		ED_armature_from_edit(obedit);
 		if(freedata)
 			ED_armature_edit_free(obedit);
 	}
@@ -4095,57 +549,6 @@ void check_editmode(int type)
 
 // XXX	ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* freedata, and undo */
 }
-void movetolayer(Scene *scene, View3D *v3d)
-{
-	Base *base;
-	unsigned int lay= 0, local;
-	int islamp= 0;
-	
-	if(scene->id.lib) return;
-
-	for(base= FIRSTBASE; base; base= base->next) {
-		if (TESTBASE(v3d, base)) lay |= base->lay;
-	}
-	if(lay==0) return;
-	lay &= 0xFFFFFF;
-	
-	if(lay==0) return;
-	
-	if(v3d->localview) {
-		/* now we can move out of localview. */
-		if (!okee("Move from localview")) return;
-		for(base= FIRSTBASE; base; base= base->next) {
-			if (TESTBASE(v3d, base)) {
-				lay= base->lay & ~v3d->lay;
-				base->lay= lay;
-				base->object->lay= lay;
-				base->object->flag &= ~SELECT;
-				base->flag &= ~SELECT;
-				if(base->object->type==OB_LAMP) islamp= 1;
-			}
-		}
-	} else {
-// XXX		if( movetolayer_buts(&lay, NULL)==0 ) return;
-		
-		/* normal non localview operation */
-		for(base= FIRSTBASE; base; base= base->next) {
-			if (TESTBASE(v3d, base)) {
-				/* upper byte is used for local view */
-				local= base->lay & 0xFF000000;  
-				base->lay= lay + local;
-				base->object->lay= lay;
-				if(base->object->type==OB_LAMP) islamp= 1;
-			}
-		}
-	}
-	if(islamp) reshadeall_displist(scene);	/* only frees */
-	
-	/* warning, active object may be hidden now */
-	
-	DAG_scene_sort(scene);
-	
-}
-
 
 #if 0
 // XXX should be in view3d?
@@ -4503,241 +906,6 @@ void special_editmenu(Scene *scene, View3D *v3d)
 
 }
 
-static void curvetomesh(Scene *scene, Object *ob) 
-{
-	Curve *cu;
-	DispList *dl;
-	
-	ob->flag |= OB_DONE;
-	cu= ob->data;
-	
-	dl= cu->disp.first;
-	if(dl==0) makeDispListCurveTypes(scene, ob, 0);		/* force creation */
-
-	nurbs_to_mesh(ob); /* also does users */
-	if (ob->type != OB_MESH) {
-		error("can't convert curve to mesh");
-	} else {
-		object_free_modifiers(ob);
-	}
-}
-
-void convertmenu(Scene *scene, View3D *v3d)
-{
-	Base *base, *basen=NULL, *basact, *basedel=NULL;
-	Object *obact, *ob, *ob1;
-	Object *obedit= NULL; // XXX
-	Curve *cu;
-	Nurb *nu;
-	MetaBall *mb;
-	Mesh *me;
-	int ok=0, nr = 0, a;
-	
-	if(scene->id.lib) return;
-
-	obact= OBACT;
-	if (obact == NULL) return;
-	if(!obact->flag & SELECT) return;
-	if(obedit) return;
-	
-	basact= BASACT;	/* will be restored */
-		
-	if(obact->type==OB_FONT) {
-		nr= pupmenu("Convert Font to%t|Curve%x1|Curve (Single filling group)%x2|Mesh%x3");
-		if(nr>0) ok= 1;
-	}
-	else if(obact->type==OB_MBALL) {
-		nr= pupmenu("Convert Metaball to%t|Mesh (keep original)%x1|Mesh (Delete Original)%x2");
-		if(nr>0) ok= 1;
-	}
-	else if(obact->type==OB_CURVE) {
-		nr= pupmenu("Convert Curve to%t|Mesh");
-		if(nr>0) ok= 1;
-	}
-	else if(obact->type==OB_SURF) {
-		nr= pupmenu("Convert Nurbs Surface to%t|Mesh");
-		if(nr>0) ok= 1;
-	}
-	else if(obact->type==OB_MESH) {
-		nr= pupmenu("Convert Modifiers to%t|Mesh (Keep Original)%x1|Mesh (Delete Original)%x2");
-		if(nr>0) ok= 1;
-	}
-	if(ok==0) return;
-
-	/* don't forget multiple users! */
-
-	/* reset flags */
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			base->object->flag &= ~OB_DONE;
-		}
-	}
-
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			
-			ob= base->object;
-			
-			if(ob->flag & OB_DONE);
-			else if(ob->type==OB_MESH && ob->modifiers.first) { /* converting a mesh with no modifiers causes a segfault */
-				DerivedMesh *dm;
-				
-				basedel = base;
-
-				ob->flag |= OB_DONE;
-
-				ob1= copy_object(ob);
-				ob1->recalc |= OB_RECALC;
-
-				basen= MEM_mallocN(sizeof(Base), "duplibase");
-				*basen= *base;
-				BLI_addhead(&scene->base, basen);	/* addhead: otherwise eternal loop */
-				basen->object= ob1;
-				basen->flag |= SELECT;
-				base->flag &= ~SELECT;
-				ob->flag &= ~SELECT;
-
-				/* decrement original mesh's usage count  */
-				me= ob1->data;
-				me->id.us--;
-
-				/* make a new copy of the mesh */
-				ob1->data= copy_mesh(me);
-
-				/* make new mesh data from the original copy */
-				dm= mesh_get_derived_final(scene, ob1, CD_MASK_MESH);
-				/* dm= mesh_create_derived_no_deform(ob1, NULL);	this was called original (instead of get_derived). man o man why! (ton) */
-				
-				DM_to_mesh(dm, ob1->data);
-
-				dm->release(dm);
-				object_free_modifiers(ob1);	/* after derivedmesh calls! */
-				
-				/* If the original object is active then make this object active */
-				if (ob == obact) {
-					// XXX ED_base_object_activate(C, basen);
-					basact = basen;
-				}
-			}
-			else if(ob->type==OB_FONT) {
-				ob->flag |= OB_DONE;
-
-				ob->type= OB_CURVE;
-				cu= ob->data;
-
-				if(cu->vfont) {
-					cu->vfont->id.us--;
-					cu->vfont= 0;
-				}
-				if(cu->vfontb) {
-					cu->vfontb->id.us--;
-					cu->vfontb= 0;
-				}
-				if(cu->vfonti) {
-					cu->vfonti->id.us--;
-					cu->vfonti= 0;
-				}
-				if(cu->vfontbi) {
-					cu->vfontbi->id.us--;
-					cu->vfontbi= 0;
-				}					
-				/* other users */
-				if(cu->id.us>1) {
-					ob1= G.main->object.first;
-					while(ob1) {
-						if(ob1->data==cu) {
-							ob1->type= OB_CURVE;
-							ob1->recalc |= OB_RECALC;
-						}
-						ob1= ob1->id.next;
-					}
-				}
-				if (nr==2 || nr==3) {
-					nu= cu->nurb.first;
-					while(nu) {
-						nu->charidx= 0;
-						nu= nu->next;
-					}					
-				}
-				if (nr==3) {
-					curvetomesh(scene, ob);
-				}
-			}
-			else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
-				if(nr==1) {
-					curvetomesh(scene, ob);
- 				}
-			}
-			else if(ob->type==OB_MBALL) {
-			
-				if(nr==1 || nr == 2) {
-					ob= find_basis_mball(scene, ob);
-					
-					if(ob->disp.first && !(ob->flag&OB_DONE)) {
-						basedel = base;
-					
-						ob->flag |= OB_DONE;
-
-						ob1= copy_object(ob);
-						ob1->recalc |= OB_RECALC;
-
-						basen= MEM_mallocN(sizeof(Base), "duplibase");
-						*basen= *base;
-						BLI_addhead(&scene->base, basen);	/* addhead: othwise eternal loop */
-						basen->object= ob1;
-						basen->flag |= SELECT;
-						basedel->flag &= ~SELECT;
-						ob->flag &= ~SELECT;
-						
-						mb= ob1->data;
-						mb->id.us--;
-						
-						ob1->data= add_mesh("Mesh");
-						ob1->type= OB_MESH;
-						
-						me= ob1->data;
-						me->totcol= mb->totcol;
-						if(ob1->totcol) {
-							me->mat= MEM_dupallocN(mb->mat);
-							for(a=0; a<ob1->totcol; a++) id_us_plus((ID *)me->mat[a]);
-						}
-						
-						mball_to_mesh(&ob->disp, ob1->data);
-						
-						/* So we can see the wireframe */
-						BASACT= basen;
-						
-						/* If the original object is active then make this object active */
-						if (ob == obact) {
-							// XXX ED_base_object_activate(C, basen);
-							basact = basen;
-						}
-						
-					}
-				}
-			}
-		}
-		if(basedel != NULL && nr == 2) {
-			ED_base_object_free_and_unlink(scene, basedel);	
-		}
-		basedel = NULL;				
-	}
-	
-	/* delete object should renew depsgraph */
-	if(nr==2)
-		DAG_scene_sort(scene);
-
-	/* texspace and normals */
-	if(!basen) BASACT= base;
-
-// XXX	ED_object_enter_editmode(C, 0);
-// XXX	exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR); /* freedata, but no undo */
-	BASACT= basact;
-
-
-	DAG_scene_sort(scene);
-}
-
 /* Change subdivision or particle properties of mesh object ob, if level==-1
  * then toggle subsurf, else set to level set allows to toggle multiple
  * selections */
@@ -5415,1379 +1583,6 @@ void copy_attr_menu(Scene *scene, View3D *v3d)
 	copy_attr(scene, v3d, event);
 }
 
-
-void link_to_scene(unsigned short nr)
-{
-#if 0
-	Scene *sce= (Scene*) BLI_findlink(&G.main->scene, G.curscreen->scenenr-1);
-	Base *base, *nbase;
-	
-	if(sce==0) return;
-	if(sce->id.lib) return;
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASE(v3d, base)) {
-			
-			nbase= MEM_mallocN( sizeof(Base), "newbase");
-			*nbase= *base;
-			BLI_addhead( &(sce->base), nbase);
-			id_us_plus((ID *)base->object);
-		}
-	}
-#endif
-}
-
-
-void make_links(Scene *scene, View3D *v3d, short event)
-{
-	Object *ob, *obt;
-	Base *base, *nbase, *sbase;
-	Scene *sce = NULL;
-	ID *id;
-	int a;
-	short nr=0;
-	char *strp;
-
-	if(!(ob=OBACT)) return;
-
-	if(event==1) {
-		IDnames_to_pupstring(&strp, NULL, NULL, &(G.main->scene), 0, &nr);
-		
-		if(nr == -2) {
-			MEM_freeN(strp);
-
-// XXX			activate_databrowse((ID *)scene, ID_SCE, 0, B_INFOSCE, &(G.curscreen->scenenr), link_to_scene );
-			
-			return;			
-		}
-		else {
-			event= pupmenu_col(strp, 20);
-			MEM_freeN(strp);
-		
-			if(event<= 0) return;
-		
-			nr= 1;
-			sce= G.main->scene.first;
-			while(sce) {
-				if(nr==event) break;
-				nr++;
-				sce= sce->id.next;
-			}
-			if(sce==scene) {
-				error("This is the current scene");
-				return;
-			}
-			if(sce==0 || sce->id.lib) return;
-			
-			/* remember: is needed below */
-			event= 1;
-		}
-	}
-
-	/* All non group linking */
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(event==1 || base != BASACT) {
-			
-			obt= base->object;
-
-			if(TESTBASE(v3d, base)) {
-				
-				if(event==1) {		/* to scene */
-					
-					/* test if already linked */
-					sbase= sce->base.first;
-					while(sbase) {
-						if(sbase->object==base->object) break;
-						sbase= sbase->next;
-					}
-					if(sbase) {	/* remove */
-						continue;
-					}
-					
-					nbase= MEM_mallocN( sizeof(Base), "newbase");
-					*nbase= *base;
-					BLI_addhead( &(sce->base), nbase);
-					id_us_plus((ID *)base->object);
-				}
-			}
-			if(TESTBASELIB(v3d, base)) {
-				if(event==2 || event==5) {  /* obdata */
-					if(ob->type==obt->type) {
-						
-							id= obt->data;
-							id->us--;
-							
-							id= ob->data;
-							id_us_plus(id);
-							obt->data= id;
-							
-							/* if amount of material indices changed: */
-							test_object_materials(obt->data);
-
-							obt->recalc |= OB_RECALC_DATA;
-						}
-					}
-				else if(event==4) {  /* ob ipo */
-#if 0 // XXX old animation system
-					if(obt->ipo) obt->ipo->id.us--;
-					obt->ipo= ob->ipo;
-					if(obt->ipo) {
-						id_us_plus((ID *)obt->ipo);
-						do_ob_ipo(scene, obt);
-					}
-#endif // XXX old animation system
-				}
-				else if(event==6) {
-					if(ob->dup_group) ob->dup_group->id.us--;
-					obt->dup_group= ob->dup_group;
-					if(obt->dup_group) {
-						id_us_plus((ID *)obt->dup_group);
-						obt->transflag |= OB_DUPLIGROUP;
-					}
-				}
-				else if(event==3) {  /* materials */
-					
-					/* new approach, using functions from kernel */
-					for(a=0; a<ob->totcol; a++) {
-						Material *ma= give_current_material(ob, a+1);
-						assign_material(obt, ma, a+1);	/* also works with ma==NULL */
-					}
-				}
-			}
-		}
-	}
-	
-	ED_anim_dag_flush_update(C);	
-
-}
-
-void make_links_menu(Scene *scene, View3D *v3d)
-{
-	Object *ob;
-	short event=0;
-	char str[140];
-	
-	if(!(ob=OBACT)) return;
-	
-	strcpy(str, "Make Links %t|To Scene...%x1|%l|Object Ipo%x4");
-	
-	if(ob->type==OB_MESH)
-		strcat(str, "|Mesh Data%x2|Materials%x3");
-	else if(ob->type==OB_CURVE)
-		strcat(str, "|Curve Data%x2|Materials%x3");
-	else if(ob->type==OB_FONT)
-		strcat(str, "|Text Data%x2|Materials%x3");
-	else if(ob->type==OB_SURF)
-		strcat(str, "|Surface Data%x2|Materials%x3");
-	else if(ob->type==OB_MBALL)
-		strcat(str, "|Materials%x3");
-	else if(ob->type==OB_CAMERA)
-		strcat(str, "|Camera Data%x2");
-	else if(ob->type==OB_LAMP)
-		strcat(str, "|Lamp Data%x2");
-	else if(ob->type==OB_LATTICE)
-		strcat(str, "|Lattice Data%x2");
-	else if(ob->type==OB_ARMATURE)
-		strcat(str, "|Armature Data%x2");
-	
-	event= pupmenu(str);
-	
-	if(event<= 0) return;
-	
-	make_links(scene, v3d, event);
-}
-
-static void apply_objects_internal(Scene *scene, View3D *v3d, int apply_scale, int apply_rot )
-{
-	Base *base, *basact;
-	Object *ob;
-	bArmature *arm;
-	Mesh *me;
-	Curve *cu;
-	Nurb *nu;
-	BPoint *bp;
-	BezTriple *bezt;
-	MVert *mvert;
-	float mat[3][3];
-	int a, change = 0;
-	
-	if (!apply_scale && !apply_rot) {
-		/* do nothing? */
-		error("Nothing to do!");
-		return;
-	}
-	/* first check if we can execute */
-	for (base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			ob= base->object;
-			if(ob->type==OB_MESH) {
-				me= ob->data;
-				
-				if(me->id.us>1) {
-					error("Can't apply to a multi user mesh, doing nothing.");
-					return;
-				}
-			}
-			else if (ob->type==OB_ARMATURE) {
-				arm= ob->data;
-				
-				if(arm->id.us>1) {
-					error("Can't apply to a multi user armature, doing nothing.");
-					return;
-				}
-			}
-			else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
-				cu= ob->data;
-				
-				if(cu->id.us>1) {
-					error("Can't apply to a multi user curve, doing nothing.");
-					return;
-				}
-				if(cu->key) {
-					error("Can't apply to a curve with vertex keys, doing nothing.");
-					return;
-				}
-			}
-		}
-	}
-	
-	/* now execute */
-	basact= BASACT;
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			ob= base->object;
-			
-			if(ob->type==OB_MESH) {
-				/* calculate matrix */
-				if (apply_scale && apply_rot)
-					object_to_mat3(ob, mat);
-				else if (apply_scale)
-					object_scale_to_mat3(ob, mat);
-				else
-					object_rot_to_mat3(ob, mat);
-				
-				/* get object data */
-				me= ob->data;
-				
-				/* adjust data */
-				mvert= me->mvert;
-				for(a=0; a<me->totvert; a++, mvert++) {
-					Mat3MulVecfl(mat, mvert->co);
-				}
-				
-				if (me->key) {
-					KeyBlock *kb;
-					
-					for (kb=me->key->block.first; kb; kb=kb->next) {
-						float *fp= kb->data;
-						
-						for (a=0; a<kb->totelem; a++, fp+=3)
-							Mat3MulVecfl(mat, fp);
-					}
-				}
-				
-				/* adjust transforms */
-				if (apply_scale)
-					ob->size[0]= ob->size[1]= ob->size[2]= 1.0f;
-				if (apply_rot)
-					ob->rot[0]= ob->rot[1]= ob->rot[2]= 0.0f;
-				/*QuatOne(ob->quat);*/ /* Quats arnt used yet */
-				
-				where_is_object(scene, ob);
-				
-				/* texspace and normals */
-				BASACT= base;
-// XXX				ED_object_enter_editmode(C, 0);
-// XXX				ED_object_exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR); /* freedata, but no undo */
-				BASACT= basact;
-				
-				change = 1;
-			}
-			else if (ob->type==OB_ARMATURE) {
-				if (apply_scale && apply_rot)
-					object_to_mat3(ob, mat);
-				else if (apply_scale)
-					object_scale_to_mat3(ob, mat);
-				else
-					object_rot_to_mat3(ob, mat);
-				arm= ob->data;
-				
-				/* see checks above */
-// XXX				apply_rot_armature(ob, mat);
-				
-				/* Reset the object's transforms */
-				if (apply_scale)
-					ob->size[0]= ob->size[1]= ob->size[2]= 1.0;
-				if (apply_rot)
-					ob->rot[0]= ob->rot[1]= ob->rot[2]= 0.0;
-				/*QuatOne(ob->quat); (not used anymore)*/
-				
-				where_is_object(scene, ob);
-				
-				change = 1;
-			}
-			else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
-				float scale;
-				if (apply_scale && apply_rot)
-					object_to_mat3(ob, mat);
-				else if (apply_scale)
-					object_scale_to_mat3(ob, mat);
-				else
-					object_rot_to_mat3(ob, mat);
-				scale = Mat3ToScalef(mat);
-				cu= ob->data;
-				
-				/* see checks above */
-				
-				nu= cu->nurb.first;
-				while(nu) {
-					if(nu->type == CU_BEZIER) {
-						a= nu->pntsu;
-						bezt= nu->bezt;
-						while(a--) {
-							Mat3MulVecfl(mat, bezt->vec[0]);
-							Mat3MulVecfl(mat, bezt->vec[1]);
-							Mat3MulVecfl(mat, bezt->vec[2]);
-							bezt->radius *= scale;
-							bezt++;
-						}
-					}
-					else {
-						a= nu->pntsu*nu->pntsv;
-						bp= nu->bp;
-						while(a--) {
-							Mat3MulVecfl(mat, bp->vec);
-							bp++;
-						}
-					}
-					nu= nu->next;
-				}
-				if (apply_scale)
-					ob->size[0]= ob->size[1]= ob->size[2]= 1.0;
-				if (apply_rot)
-					ob->rot[0]= ob->rot[1]= ob->rot[2]= 0.0;
-				/*QuatOne(ob->quat); (quats arnt used anymore)*/
-				
-				where_is_object(scene, ob);
-				
-				/* texspace and normals */
-				BASACT= base;
-// XXX				ED_object_enter_editmode(C, 0);
-// XXX				ED_object_exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR); /* freedata, but no undo */
-				BASACT= basact;
-				
-				change = 1;
-			} else {
-				continue;
-			}
-			
-			ignore_parent_tx(scene, ob);
-		}
-	}
-	if (change) {
-	}
-}
-
-void apply_objects_locrot(Scene *scene, View3D *v3d)
-{
-	apply_objects_internal(scene, v3d, 1, 1);
-}
-
-void apply_objects_scale(Scene *scene, View3D *v3d)
-{
-	apply_objects_internal(scene, v3d, 1, 0);
-}
-
-void apply_objects_rot(Scene *scene, View3D *v3d)
-{
-	apply_objects_internal(scene, v3d, 0, 1);
-}
-
-void apply_objects_visual_tx( Scene *scene, View3D *v3d )
-{
-	Base *base;
-	Object *ob;
-	int change = 0;
-	
-	for (base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			ob= base->object;
-			where_is_object(scene, ob);
-			VECCOPY(ob->loc, ob->obmat[3]);
-			Mat4ToSize(ob->obmat, ob->size);
-			Mat4ToEul(ob->obmat, ob->rot);
-			
-			where_is_object(scene, ob);
-			
-			change = 1;
-		}
-	}
-	if (change) {
-	}
-}
-
-/* ************************************** */
-
-
-void single_object_users(Scene *scene, View3D *v3d, int flag)	
-{
-	Base *base;
-	Object *ob, *obn;
-	
-	clear_sca_new_poins();	/* sensor/contr/act */
-
-	/* duplicate (must set newid) */
-	for(base= FIRSTBASE; base; base= base->next) {
-		ob= base->object;
-		
-		if( (base->flag & flag)==flag ) {
-			if(ob->id.lib==NULL && ob->id.us>1) {
-				/* base gets copy of object */
-				obn= copy_object(ob);
-				base->object= obn;
-				ob->id.us--;
-			}
-		}
-	}
-	
-	ID_NEW(scene->camera);
-	if(v3d) ID_NEW(v3d->camera);
-	
-	/* object pointers */
-	for(base= FIRSTBASE; base; base= base->next) {
-		ob= base->object;
-		if(ob->id.lib==NULL) {
-			relink_constraints(&base->object->constraints);
-			if (base->object->pose){
-				bPoseChannel *chan;
-				for (chan = base->object->pose->chanbase.first; chan; chan=chan->next){
-					relink_constraints(&chan->constraints);
-				}
-			}
-			modifiers_foreachObjectLink(base->object, single_object_users__forwardModifierLinks, NULL);
-			
-			ID_NEW(ob->parent);
-			ID_NEW(ob->track);
-		}
-	}
-
-	set_sca_new_poins();
-}
-
-void new_id_matar(Material **matar, int totcol)
-{
-	ID *id;
-	int a;
-	
-	for(a=0; a<totcol; a++) {
-		id= (ID *)matar[a];
-		if(id && id->lib==0) {
-			if(id->newid) {
-				matar[a]= (Material *)id->newid;
-				id_us_plus(id->newid);
-				id->us--;
-			}
-			else if(id->us>1) {
-				matar[a]= copy_material(matar[a]);
-				id->us--;
-				id->newid= (ID *)matar[a];
-			}
-		}
-	}
-}
-
-void single_obdata_users(Scene *scene, int flag)
-{
-	Object *ob;
-	Lamp *la;
-	Curve *cu;
-	//Camera *cam;
-	Base *base;
-	Mesh *me;
-	ID *id;
-	int a;
-
-	for(base= FIRSTBASE; base; base= base->next) {
-		ob= base->object;
-		if(ob->id.lib==NULL && (base->flag & flag)==flag ) {
-			id= ob->data;
-			
-			if(id && id->us>1 && id->lib==0) {
-				ob->recalc= OB_RECALC_DATA;
-				
-				switch(ob->type) {
-				case OB_LAMP:
-					if(id && id->us>1 && id->lib==NULL) {
-						ob->data= la= copy_lamp(ob->data);
-						for(a=0; a<MAX_MTEX; a++) {
-							if(la->mtex[a]) {
-								ID_NEW(la->mtex[a]->object);
-							}
-						}
-					}
-					break;
-				case OB_CAMERA:
-					ob->data= copy_camera(ob->data);
-					break;
-				case OB_MESH:
-					me= ob->data= copy_mesh(ob->data);
-					//if(me && me->key)
-					//	ipo_idnew(me->key->ipo);	/* drivers */
-					break;
-				case OB_MBALL:
-					ob->data= copy_mball(ob->data);
-					break;
-				case OB_CURVE:
-				case OB_SURF:
-				case OB_FONT:
-					ob->data= cu= copy_curve(ob->data);
-					ID_NEW(cu->bevobj);
-					ID_NEW(cu->taperobj);
-					break;
-				case OB_LATTICE:
-					ob->data= copy_lattice(ob->data);
-					break;
-				case OB_ARMATURE:
-					ob->recalc |= OB_RECALC_DATA;
-					ob->data= copy_armature(ob->data);
-					armature_rebuild_pose(ob, ob->data);
-					break;
-				default:
-					printf("ERROR single_obdata_users: %s\n", id->name);
-					error("Read console");
-					return;
-				}
-				
-				id->us--;
-				id->newid= ob->data;
-				
-			}
-			
-#if 0 // XXX old animation system
-			id= (ID *)ob->action;
-			if (id && id->us>1 && id->lib==NULL){
-				if(id->newid){
-					ob->action= (bAction *)id->newid;
-					id_us_plus(id->newid);
-				}
-				else {
-					ob->action= copy_action(ob->action);
-					id->us--;
-					id->newid=(ID *)ob->action;
-				}
-			}
-			id= (ID *)ob->ipo;
-			if(id && id->us>1 && id->lib==NULL) {
-				if(id->newid) {
-					ob->ipo= (Ipo *)id->newid;
-					id_us_plus(id->newid);
-				}
-				else {
-					ob->ipo= copy_ipo(ob->ipo);
-					id->us--;
-					id->newid= (ID *)ob->ipo;
-				}
-				ipo_idnew(ob->ipo);	/* drivers */
-			}
-			/* other ipos */
-			switch(ob->type) {
-			case OB_LAMP:
-				la= ob->data;
-				if(la->ipo && la->ipo->id.us>1) {
-					la->ipo->id.us--;
-					la->ipo= copy_ipo(la->ipo);
-					ipo_idnew(la->ipo);	/* drivers */
-				}
-				break;
-			case OB_CAMERA:
-				cam= ob->data;
-				if(cam->ipo && cam->ipo->id.us>1) {
-					cam->ipo->id.us--;
-					cam->ipo= copy_ipo(cam->ipo);
-					ipo_idnew(cam->ipo);	/* drivers */
-				}
-				break;
-			}
-#endif // XXX old animation system
-		}
-	}
-	
-	me= G.main->mesh.first;
-	while(me) {
-		ID_NEW(me->texcomesh);
-		me= me->id.next;
-	}
-}
-
-void single_ipo_users(Scene *scene, int flag)
-{
-#if 0 // XXX old animation system
-	Object *ob;
-	Base *base;
-	ID *id;
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		ob= base->object;
-		if(ob->id.lib==NULL && (flag==0 || (base->flag & SELECT)) ) {
-			ob->recalc= OB_RECALC_DATA;
-			
-			id= (ID *)ob->ipo;
-			if(id && id->us>1 && id->lib==NULL) {
-				ob->ipo= copy_ipo(ob->ipo);
-				id->us--;
-				ipo_idnew(ob->ipo);	/* drivers */
-			}
-		}
-	}
-#endif // XXX old animation system
-}
-
-void single_mat_users(Scene *scene, int flag)
-{
-	Object *ob;
-	Base *base;
-	Material *ma, *man;
-	Tex *tex;
-	int a, b;
-	
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		ob= base->object;
-		if(ob->id.lib==NULL && (flag==0 || (base->flag & SELECT)) ) {
-	
-			for(a=1; a<=ob->totcol; a++) {
-				ma= give_current_material(ob, a);
-				if(ma) {
-					/* do not test for LIB_NEW: this functions guaranteed delivers single_users! */
-					
-					if(ma->id.us>1) {
-						man= copy_material(ma);
-					
-						man->id.us= 0;
-						assign_material(ob, man, a);
-	
-#if 0 // XXX old animation system						
-						if(ma->ipo) {
-							man->ipo= copy_ipo(ma->ipo);
-							ma->ipo->id.us--;
-							ipo_idnew(ma->ipo);	/* drivers */
-						}
-#endif // XXX old animation system
-						
-						for(b=0; b<MAX_MTEX; b++) {
-							if(ma->mtex[b] && ma->mtex[b]->tex) {
-								tex= ma->mtex[b]->tex;
-								if(tex->id.us>1) {
-									ma->mtex[b]->tex= copy_texture(tex);
-									tex->id.us--;
-								}
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-}
-
-void do_single_tex_user(Tex **from)
-{
-	Tex *tex, *texn;
-	
-	tex= *from;
-	if(tex==0) return;
-	
-	if(tex->id.newid) {
-		*from= (Tex *)tex->id.newid;
-		id_us_plus(tex->id.newid);
-		tex->id.us--;
-	}
-	else if(tex->id.us>1) {
-		texn= copy_texture(tex);
-		tex->id.newid= (ID *)texn;
-		tex->id.us--;
-		*from= texn;
-	}
-	
-}
-
-void single_tex_users_expand()
-{
-	/* only when 'parent' blocks are LIB_NEW */
-	Material *ma;
-	Lamp *la;
-	World *wo;
-	int b;
-		
-	ma= G.main->mat.first;
-	while(ma) {
-		if(ma->id.flag & LIB_NEW) {
-			for(b=0; b<MAX_MTEX; b++) {
-				if(ma->mtex[b] && ma->mtex[b]->tex) {
-					do_single_tex_user( &(ma->mtex[b]->tex) );
-				}
-			}
-		}
-		ma= ma->id.next;
-	}
-
-	la= G.main->lamp.first;
-	while(la) {
-		if(la->id.flag & LIB_NEW) {
-			for(b=0; b<MAX_MTEX; b++) {
-				if(la->mtex[b] && la->mtex[b]->tex) {
-					do_single_tex_user( &(la->mtex[b]->tex) );
-				}
-			}
-		}
-		la= la->id.next;
-	}
-	wo= G.main->world.first;
-	while(wo) {
-		if(wo->id.flag & LIB_NEW) {
-			for(b=0; b<MAX_MTEX; b++) {
-				if(wo->mtex[b] && wo->mtex[b]->tex) {
-					do_single_tex_user( &(wo->mtex[b]->tex) );
-				}
-			}
-		}
-		wo= wo->id.next;
-	}
-}
-
-void single_mat_users_expand(void)
-{
-	/* only when 'parent' blocks are LIB_NEW */
-
-	Object *ob;
-	Mesh *me;
-	Curve *cu;
-	MetaBall *mb;
-	Material *ma;
-	int a;
-	
-	ob= G.main->object.first;
-	while(ob) {
-		if(ob->id.flag & LIB_NEW) {
-			new_id_matar(ob->mat, ob->totcol);
-		}
-		ob= ob->id.next;
-	}
-
-	me= G.main->mesh.first;
-	while(me) {
-		if(me->id.flag & LIB_NEW) {
-			new_id_matar(me->mat, me->totcol);
-		}
-		me= me->id.next;
-	}
-
-	cu= G.main->curve.first;
-	while(cu) {
-		if(cu->id.flag & LIB_NEW) {
-			new_id_matar(cu->mat, cu->totcol);
-		}
-		cu= cu->id.next;
-	}
-
-	mb= G.main->mball.first;
-	while(mb) {
-		if(mb->id.flag & LIB_NEW) {
-			new_id_matar(mb->mat, mb->totcol);
-		}
-		mb= mb->id.next;
-	}
-
-	/* material imats  */
-	ma= G.main->mat.first;
-	while(ma) {
-		if(ma->id.flag & LIB_NEW) {
-			for(a=0; a<MAX_MTEX; a++) {
-				if(ma->mtex[a]) {
-					ID_NEW(ma->mtex[a]->object);
-				}
-			}
-		}
-		ma= ma->id.next;
-	}
-}
-
-void single_user(Scene *scene, View3D *v3d)
-{
-	int nr;
-	
-	if(scene->id.lib) return;
-
-	clear_id_newpoins();
-	
-	nr= pupmenu("Make Single User%t|Object|Object & ObData|Object & ObData & Materials+Tex|Materials+Tex|Ipos");
-	if(nr>0) {
-	
-		if(nr==1) single_object_users(scene, v3d, 1);
-	
-		else if(nr==2) {
-			single_object_users(scene, v3d, 1);
-			single_obdata_users(scene, 1);
-		}
-		else if(nr==3) {
-			single_object_users(scene, v3d, 1);
-			single_obdata_users(scene, 1);
-			single_mat_users(scene, 1); /* also tex */
-			
-		}
-		else if(nr==4) {
-			single_mat_users(scene, 1);
-		}
-		else if(nr==5) {
-			single_ipo_users(scene, 1);
-		}
-		
-		
-		clear_id_newpoins();
-
-	}
-}
-
-/* used for copying scenes */
-void ED_object_single_users(Scene *scene, int full)
-{
-    single_object_users(scene, NULL, 0);
-
-    if(full) {
-        single_obdata_users(scene, 0);
-        single_mat_users_expand();
-        single_tex_users_expand();
-    }
-
-	clear_id_newpoins();
-}
-
-/* ************************************************************* */
-
-/* helper for below, ma was checked to be not NULL */
-static void make_local_makelocalmaterial(Material *ma)
-{
-	//ID *id;
-	int b;
-	
-	make_local_material(ma);
-	
-	for(b=0; b<MAX_MTEX; b++) {
-		if(ma->mtex[b] && ma->mtex[b]->tex) {
-			make_local_texture(ma->mtex[b]->tex);
-		}
-	}
-	
-#if 0 // XXX old animation system
-	id= (ID *)ma->ipo;
-	if(id && id->lib) make_local_ipo(ma->ipo);
-#endif // XXX old animation system	
-	
-	/* nodetree? XXX */
-}
-
-void make_local(Scene *scene, View3D *v3d, int mode)
-{
-	Base *base;
-	Object *ob;
-	//bActionStrip *strip;
-	ParticleSystem *psys;
-	Material *ma, ***matarar;
-	Lamp *la;
-	Curve *cu;
-	ID *id;
-	int a, b;
-	
-	/* WATCH: the function new_id(..) re-inserts the id block!!! */
-	if(scene->id.lib) return;
-	
-	if(mode==3) {
-		all_local(NULL, 0);	/* NULL is all libs */
-		return;
-	}
-	else if(mode<1) return;
-
-	clear_id_newpoins();
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		if( TESTBASE(v3d, base) ) {
-			ob= base->object;
-			if(ob->id.lib) {
-				make_local_object(ob);
-			}
-		}
-	}
-	
-	/* maybe object pointers */
-	for(base= FIRSTBASE; base; base= base->next) {
-		if( TESTBASE(v3d, base) ) {
-			ob= base->object;
-			if(ob->id.lib==NULL) {
-				ID_NEW(ob->parent);
-				ID_NEW(ob->track);
-			}
-		}
-	}
-
-	for(base= FIRSTBASE; base; base= base->next) {
-		if( TESTBASE(v3d, base) ) {
-			ob= base->object;
-			id= ob->data;
-			
-			if(id && mode>1) {
-				
-				switch(ob->type) {
-				case OB_LAMP:
-					make_local_lamp((Lamp *)id);
-					
-					la= ob->data;
-#if 0 // XXX old animation system
-					id= (ID *)la->ipo;
-					if(id && id->lib) make_local_ipo(la->ipo);
-#endif // XXX old animation system
-					break;
-				case OB_CAMERA:
-					make_local_camera((Camera *)id);
-					break;
-				case OB_MESH:
-					make_local_mesh((Mesh *)id);
-					make_local_key( ((Mesh *)id)->key );
-					break;
-				case OB_MBALL:
-					make_local_mball((MetaBall *)id);
-					break;
-				case OB_CURVE:
-				case OB_SURF:
-				case OB_FONT:
-					cu= (Curve *)id;
-					make_local_curve(cu);
-#if 0 // XXX old animation system
-					id= (ID *)cu->ipo;
-					if(id && id->lib) make_local_ipo(cu->ipo);
-#endif // XXX old animation system
-					make_local_key( cu->key );
-					break;
-				case OB_LATTICE:
-					make_local_lattice((Lattice *)id);
-					make_local_key( ((Lattice *)id)->key );
-					break;
-				case OB_ARMATURE:
-					make_local_armature ((bArmature *)id);
-					break;
-				}
-
-				for(psys=ob->particlesystem.first; psys; psys=psys->next)
-					make_local_particlesettings(psys->part);
-			}
-			
-#if 0 // XXX old animation system
-			id= (ID *)ob->ipo;
-			if(id && id->lib) make_local_ipo(ob->ipo);
-
-			id= (ID *)ob->action;
-			if(id && id->lib) make_local_action(ob->action);
-			
-			for(strip=ob->nlastrips.first; strip; strip=strip->next) {
-				if(strip->act && strip->act->id.lib)
-					make_local_action(strip->act);
-			}
-#endif // XXX old animation system
-		}
-	}
-
-	if(mode>1) {
-		for(base= FIRSTBASE; base; base= base->next) {
-			if( TESTBASE(v3d, base) ) {
-				ob= base->object;
-				if(ob->type==OB_LAMP) {
-					la= ob->data;
-					for(b=0; b<MAX_MTEX; b++) {
-						if(la->mtex[b] && la->mtex[b]->tex) {
-							make_local_texture(la->mtex[b]->tex);
-						}
-					}
-				}
-				else {
-					
-					for(a=0; a<ob->totcol; a++) {
-						ma= ob->mat[a];
-						if(ma)
-							make_local_makelocalmaterial(ma);
-					}
-					
-					matarar= (Material ***)give_matarar(ob);
-					if (matarar) {
-						for(a=0; a<ob->totcol; a++) {
-							ma= (*matarar)[a];
-							if(ma)
-								make_local_makelocalmaterial(ma);
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
-
-void make_local_menu(Scene *scene, View3D *v3d)
-{
-	int mode;
-	
-	/* If you modify this menu, please remember to update view3d_edit_object_makelocalmenu
-	* in header_view3d.c and the menu in toolbox.c
-	*/
-	
-	if(scene->id.lib) return;
-	
-	mode = pupmenu("Make Local%t|Selected Objects %x1|Selected Objects and Data %x2|All %x3");
-	
-	if (mode <= 0) return;
-	
-	make_local(scene, v3d, mode);
-}
-
-/* ************************ ADD DUPLICATE ******************** */
-
-/* 
-	dupflag: a flag made from constants declared in DNA_userdef_types.h
-	The flag tells adduplicate() weather to copy data linked to the object, or to reference the existing data.
-	U.dupflag for default operations or you can construct a flag as python does
-	if the dupflag is 0 then no data will be copied (linked duplicate) */
-
-/* used below, assumes id.new is correct */
-/* leaves selection of base/object unaltered */
-static Base *object_add_duplicate_internal(Scene *scene, Base *base, int dupflag)
-{
-	Base *basen= NULL;
-	Material ***matarar;
-	Object *ob, *obn;
-	ID *id;
-	int a, didit;
-
-	ob= base->object;
-	if(ob->mode & OB_MODE_POSE) {
-		; /* nothing? */
-	}
-	else {
-		obn= copy_object(ob);
-		obn->recalc |= OB_RECALC;
-		
-		basen= MEM_mallocN(sizeof(Base), "duplibase");
-		*basen= *base;
-		BLI_addhead(&scene->base, basen);	/* addhead: prevent eternal loop */
-		basen->object= obn;
-		
-		if(basen->flag & OB_FROMGROUP) {
-			Group *group;
-			for(group= G.main->group.first; group; group= group->id.next) {
-				if(object_in_group(ob, group))
-					add_to_group(group, obn);
-			}
-			obn->flag |= OB_FROMGROUP; /* this flag is unset with copy_object() */
-		}
-		
-		/* duplicates using userflags */
-#if 0 // XXX old animation system				
-		if(dupflag & USER_DUP_IPO) {
-			bConstraintChannel *chan;
-			id= (ID *)obn->ipo;
-			
-			if(id) {
-				ID_NEW_US( obn->ipo)
-				else obn->ipo= copy_ipo(obn->ipo);
-				id->us--;
-			}
-			/* Handle constraint ipos */
-			for (chan=obn->constraintChannels.first; chan; chan=chan->next){
-				id= (ID *)chan->ipo;
-				if(id) {
-					ID_NEW_US( chan->ipo)
-					else chan->ipo= copy_ipo(chan->ipo);
-					id->us--;
-				}
-			}
-		}
-		if(dupflag & USER_DUP_ACT){ /* Not buttons in the UI to modify this, add later? */
-			id= (ID *)obn->action;
-			if (id){
-				ID_NEW_US(obn->action)
-				else{
-					obn->action= copy_action(obn->action);
-				}
-				id->us--;
-			}
-		}
-#endif // XXX old animation system
-		if(dupflag & USER_DUP_MAT) {
-			for(a=0; a<obn->totcol; a++) {
-				id= (ID *)obn->mat[a];
-				if(id) {
-					ID_NEW_US(obn->mat[a])
-					else obn->mat[a]= copy_material(obn->mat[a]);
-					id->us--;
-				}
-			}
-		}
-		if(dupflag & USER_DUP_PSYS) {
-			ParticleSystem *psys;
-			for(psys=obn->particlesystem.first; psys; psys=psys->next) {
-				id= (ID*) psys->part;
-				if(id) {
-					ID_NEW_US(psys->part)
-					else psys->part= psys_copy_settings(psys->part);
-					id->us--;
-				}
-			}
-		}
-		
-		id= obn->data;
-		didit= 0;
-		
-		switch(obn->type) {
-			case OB_MESH:
-				if(dupflag & USER_DUP_MESH) {
-					ID_NEW_US2( obn->data )
-					else {
-						obn->data= copy_mesh(obn->data);
-						
-						if(obn->fluidsimSettings) {
-							obn->fluidsimSettings->orgMesh = (Mesh *)obn->data;
-						}
-						
-						didit= 1;
-					}
-					id->us--;
-				}
-				break;
-			case OB_CURVE:
-				if(dupflag & USER_DUP_CURVE) {
-					ID_NEW_US2(obn->data )
-					else {
-						obn->data= copy_curve(obn->data);
-						didit= 1;
-					}
-					id->us--;
-				}
-				break;
-			case OB_SURF:
-				if(dupflag & USER_DUP_SURF) {
-					ID_NEW_US2( obn->data )
-					else {
-						obn->data= copy_curve(obn->data);
-						didit= 1;
-					}
-					id->us--;
-				}
-				break;
-			case OB_FONT:
-				if(dupflag & USER_DUP_FONT) {
-					ID_NEW_US2( obn->data )
-					else {
-						obn->data= copy_curve(obn->data);
-						didit= 1;
-					}
-					id->us--;
-				}
-				break;
-			case OB_MBALL:
-				if(dupflag & USER_DUP_MBALL) {
-					ID_NEW_US2(obn->data )
-					else {
-						obn->data= copy_mball(obn->data);
-						didit= 1;
-					}
-					id->us--;
-				}
-				break;
-			case OB_LAMP:
-				if(dupflag & USER_DUP_LAMP) {
-					ID_NEW_US2(obn->data )
-					else obn->data= copy_lamp(obn->data);
-					id->us--;
-				}
-				break;
-				
-			case OB_ARMATURE:
-				obn->recalc |= OB_RECALC_DATA;
-				if(obn->pose) obn->pose->flag |= POSE_RECALC;
-					
-					if(dupflag & USER_DUP_ARM) {
-						ID_NEW_US2(obn->data )
-						else {
-							obn->data= copy_armature(obn->data);
-							armature_rebuild_pose(obn, obn->data);
-							didit= 1;
-						}
-						id->us--;
-					}
-						
-						break;
-				
-			case OB_LATTICE:
-				if(dupflag!=0) {
-					ID_NEW_US2(obn->data )
-					else obn->data= copy_lattice(obn->data);
-					id->us--;
-				}
-				break;
-			case OB_CAMERA:
-				if(dupflag!=0) {
-					ID_NEW_US2(obn->data )
-					else obn->data= copy_camera(obn->data);
-					id->us--;
-				}
-				break;
-		}
-		
-		if(dupflag & USER_DUP_MAT) {
-			matarar= give_matarar(obn);
-			if(didit && matarar) {
-				for(a=0; a<obn->totcol; a++) {
-					id= (ID *)(*matarar)[a];
-					if(id) {
-						ID_NEW_US( (*matarar)[a] )
-						else (*matarar)[a]= copy_material((*matarar)[a]);
-						
-						id->us--;
-					}
-				}
-			}
-		}
-	}
-	return basen;
-}
-
-/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */
-/* leaves selection of base/object unaltered */
-Base *ED_object_add_duplicate(Scene *scene, Base *base, int dupflag)
-{
-	Base *basen;
-
-	clear_id_newpoins();
-	clear_sca_new_poins();	/* sensor/contr/act */
-	
-	basen= object_add_duplicate_internal(scene, base, dupflag);
-	
-	DAG_scene_sort(scene);
-	
-	return basen;
-}
-
-/* contextual operator dupli */
-static int duplicate_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	View3D *v3d= CTX_wm_view3d(C);
-	int linked= RNA_boolean_get(op->ptr, "linked");
-	int dupflag= (linked)? 0: U.dupflag;
-	
-	clear_id_newpoins();
-	clear_sca_new_poins();	/* sensor/contr/act */
-	
-	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-		Base *basen= object_add_duplicate_internal(scene, base, dupflag);
-		
-		/* XXX context conflict maybe, itterator could solve this? */
-		ED_base_object_select(base, BA_DESELECT);
-		/* new object becomes active */
-		if(BASACT==base)
-			ED_base_object_activate(C, basen);
-		
-	}
-	CTX_DATA_END;
-
-	/* XXX fix this for context */
-	copy_object_set_idnew(scene, v3d, dupflag);
-
-	DAG_scene_sort(scene);
-	ED_anim_dag_flush_update(C);	
-
-	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
-
-	return OPERATOR_FINISHED;
-}
-
-static int duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	duplicate_exec(C, op);
-	
-//	RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
-//	WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
-
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_duplicate(wmOperatorType *ot)
-{
-	
-	/* identifiers */
-	ot->name= "Duplicate";
-	ot->description = "Duplicate selected objects.";
-	ot->idname= "OBJECT_OT_duplicate";
-	
-	/* api callbacks */
-	ot->invoke= duplicate_invoke;
-	ot->exec= duplicate_exec;
-	
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	/* to give to transform */
-	RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data.");
-	RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
-}
-
-/* ************************** JOIN *********************** */
-
-static int join_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *ob= CTX_data_active_object(C);
-
-	if(scene->obedit) {
-		BKE_report(op->reports, RPT_ERROR, "This data does not support joining in editmode.");
-		return OPERATOR_CANCELLED;
-	}
-	else if(!ob) {
-		BKE_report(op->reports, RPT_ERROR, "Can't join unless there is an active object.");
-		return OPERATOR_CANCELLED;
-	}
-	else if(object_data_is_libdata(ob)) {
-		BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata.");
-		return OPERATOR_CANCELLED;
-	}
-
-	if(ob->type == OB_MESH)
-		return join_mesh_exec(C, op);
-	else if(ELEM(ob->type, OB_CURVE, OB_SURF))
-		return join_curve_exec(C, op);
-	else if(ob->type == OB_ARMATURE)
-		return join_armature_exec(C, op);
-
-	BKE_report(op->reports, RPT_ERROR, "This object type doesn't support joining.");
-
-	return OPERATOR_CANCELLED;
-}
-
-void OBJECT_OT_join(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Join";
-	ot->description = "Join selected objects into active object.";
-	ot->idname= "OBJECT_OT_join";
-	
-	/* api callbacks */
-	ot->exec= join_exec;
-	ot->poll= ED_operator_scene_editable;
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
 /********************** Smooth/Flat *********************/
 
 static int shade_smooth_exec(bContext *C, wmOperator *op)
@@ -7095,124 +1890,6 @@ void rand_timeoffs(Scene *scene, View3D *v3d)
 
 }
 
-
-void texspace_edit(Scene *scene, View3D *v3d)
-{
-	Base *base;
-	int nr=0;
-	
-	/* first test if from visible and selected objects
-	 * texspacedraw is set:
-	 */
-	
-	if(scene->obedit) return; // XXX get from context
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			break;
-		}
-	}
-
-	if(base==0) {
-		return;
-	}
-	
-	nr= pupmenu("Texture Space %t|Grab/Move%x1|Size%x2");
-	if(nr<1) return;
-	
-	for(base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			base->object->dtx |= OB_TEXSPACE;
-		}
-	}
-	
-
-	if(nr==1) {
-// XXX		initTransform(TFM_TRANSLATION, CTX_TEXTURE);
-// XXX		Transform();
-	}
-	else if(nr==2) {
-// XXX		initTransform(TFM_RESIZE, CTX_TEXTURE);
-// XXX		Transform();
-	}
-	else if(nr==3) {
-// XXX		initTransform(TFM_ROTATION, CTX_TEXTURE);
-// XXX		Transform();
-	}
-}
-
-/* ******************************************************************** */
-/* Mirror function in Edit Mode */
-
-void mirrormenu(void)
-{
-// XXX		initTransform(TFM_MIRROR, CTX_NO_PET);
-// XXX		Transform();
-}
-
-void hookmenu(Scene *scene, View3D *v3d)
-{
-	/* only called in object mode */
-	short event, changed=0;
-	Object *ob;
-	Base *base;
-	ModifierData *md;
-	HookModifierData *hmd;
-	
-	event= pupmenu("Modify Hooks for Selected...%t|Reset Offset%x1|Recenter at Cursor%x2");
-	if (event==-1) return;
-	if (event==2 && !(v3d)) {
-		error("Cannot perform this operation without a 3d view");
-		return;
-	}
-	
-	for (base= FIRSTBASE; base; base= base->next) {
-		if(TESTBASELIB(v3d, base)) {
-			for (md = base->object->modifiers.first; md; md=md->next) {
-				if (md->type==eModifierType_Hook) {
-					ob = base->object;
-					hmd = (HookModifierData*) md;
-					
-					/*
-					 * Copied from modifiers_cursorHookCenter and
-					 * modifiers_clearHookOffset, should consolidate
-					 * */
-					
-					if (event==1) {
-						if(hmd->object) {
-							Mat4Invert(hmd->object->imat, hmd->object->obmat);
-							Mat4MulSerie(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
-							
-							changed= 1;
-							DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-						}
-					} else {
-						float *curs = give_cursor(scene, v3d);
-						float bmat[3][3], imat[3][3];
-						
-						where_is_object(scene, ob);
-					
-						Mat3CpyMat4(bmat, ob->obmat);
-						Mat3Inv(imat, bmat);
-				
-						curs= give_cursor(scene, v3d);
-						hmd->cent[0]= curs[0]-ob->obmat[3][0];
-						hmd->cent[1]= curs[1]-ob->obmat[3][1];
-						hmd->cent[2]= curs[2]-ob->obmat[3][2];
-						Mat3MulVecfl(imat, hmd->cent);
-						
-						changed= 1;
-						DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-					} 
-				}
-			}
-		}
-	}
-	
-	if (changed) {
-	}	
-}
-
 static EnumPropertyItem *object_mode_set_itemsf(bContext *C, PointerRNA *ptr, int *free)
 {	
 	EnumPropertyItem *input = object_mode_items;
@@ -7373,7 +2050,7 @@ void ED_object_toggle_modes(bContext *C, int mode)
 		WM_operator_name_call(C, "OBJECT_OT_posemode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 }
 
-/* game property ops */
+/************************ Game Properties ***********************/
 
 static int game_property_new(bContext *C, wmOperator *op)
 {
@@ -7441,3 +2118,4 @@ void OBJECT_OT_game_property_remove(wmOperatorType *ot)
 
 	RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Property index to remove ", 0, INT_MAX);
 }
+
diff --git a/source/blender/editors/object/editgroup.c b/source/blender/editors/object/object_group.c
similarity index 60%
rename from source/blender/editors/object/editgroup.c
rename to source/blender/editors/object/object_group.c
index 9a184892e71..c83f3022c7c 100644
--- a/source/blender/editors/object/editgroup.c
+++ b/source/blender/editors/object/object_group.c
@@ -32,28 +32,20 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
 
 #include "DNA_group_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_view3d_types.h"
 
-#include "BKE_depsgraph.h"
-#include "BKE_group.h"
-#include "BKE_global.h"
 #include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_global.h"
+#include "BKE_group.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
+#include "BKE_scene.h"
 
-#include "ED_view3d.h"
-#include "ED_space_api.h"
 #include "ED_screen.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -63,6 +55,8 @@
 
 #include "object_intern.h"
 
+/********************* 3d view operators ***********************/
+
 static int objects_add_active_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
@@ -70,13 +64,12 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 	Group *group;
 	int ok = 0;
 	
-	if (!ob) return OPERATOR_CANCELLED;
+	if(!ob) return OPERATOR_CANCELLED;
 	
 	/* linking to same group requires its own loop so we can avoid
 	   looking up the active objects groups each time */
 
-	group= G.main->group.first;
-	while(group) {
+	for(group= G.main->group.first; group; group=group->id.next) {
 		if(object_in_group(ob, group)) {
 			/* Assign groups to selected objects */
 			CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
@@ -89,22 +82,18 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 			}
 			CTX_DATA_END;
 		}
-		group= group->id.next;
 	}
 	
-	if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+	if(!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
 	
-	DAG_scene_sort(CTX_data_scene(C));
-
+	DAG_scene_sort(scene);
 	WM_event_add_notifier(C, NC_GROUP|NA_EDITED, NULL);
 	
 	return OPERATOR_FINISHED;
-
 }
 
 void GROUP_OT_objects_add_active(wmOperatorType *ot)
 {
-	
 	/* identifiers */
 	ot->name= "Add Selected To Active Group";
 	ot->description = "Add the object to an object group that contains the active object.";
@@ -125,13 +114,12 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
 	Group *group;
 	int ok = 0;
 	
-	if (!ob) return OPERATOR_CANCELLED;
+	if(!ob) return OPERATOR_CANCELLED;
 	
 	/* linking to same group requires its own loop so we can avoid
 	   looking up the active objects groups each time */
 
-	group= G.main->group.first;
-	while(group) {
+	for(group= G.main->group.first; group; group=group->id.next) {
 		if(object_in_group(ob, group)) {
 			/* Assign groups to selected objects */
 			CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
@@ -144,22 +132,18 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
 			}
 			CTX_DATA_END;
 		}
-		group= group->id.next;
 	}
 	
-	if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+	if(!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
 	
-	DAG_scene_sort(CTX_data_scene(C));
-
+	DAG_scene_sort(scene);
 	WM_event_add_notifier(C, NC_GROUP|NA_EDITED, NULL);
 	
 	return OPERATOR_FINISHED;
-
 }
 
 void GROUP_OT_objects_remove_active(wmOperatorType *ot)
 {
-	
 	/* identifiers */
 	ot->name= "Remove Selected From Active Group";
 	ot->description = "Remove the object from an object group that contains the active object.";
@@ -173,39 +157,37 @@ void GROUP_OT_objects_remove_active(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int group_remove_exec(bContext *C, wmOperator *op)
+static int group_objects_remove_exec(bContext *C, wmOperator *op)
 {
+	Scene *scene= CTX_data_scene(C);
 	Group *group= NULL;
 
 	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
 		group = NULL;
-		while( (group = find_group(base->object, group)) ) {
+		while((group = find_group(base->object, group)))
 			rem_from_group(group, base->object);
-		}
+
 		base->object->flag &= ~OB_FROMGROUP;
 		base->flag &= ~OB_FROMGROUP;
 		base->object->recalc= OB_RECALC_OB;
 	}
 	CTX_DATA_END;
 
-	DAG_scene_sort(CTX_data_scene(C));
-
+	DAG_scene_sort(scene);
 	WM_event_add_notifier(C, NC_GROUP|NA_EDITED, NULL);
 	
 	return OPERATOR_FINISHED;
-
 }
 
 void GROUP_OT_objects_remove(wmOperatorType *ot)
 {
-	
 	/* identifiers */
 	ot->name= "Remove From Groups";
 	ot->description = "Remove selected objects from all groups.";
 	ot->idname= "GROUP_OT_objects_remove";
 	
 	/* api callbacks */
-	ot->exec= group_remove_exec;	
+	ot->exec= group_objects_remove_exec;	
 	ot->poll= ED_operator_scene_editable;
 	
 	/* flags */
@@ -214,6 +196,7 @@ void GROUP_OT_objects_remove(wmOperatorType *ot)
 
 static int group_create_exec(bContext *C, wmOperator *op)
 {
+	Scene *scene= CTX_data_scene(C);
 	Group *group= NULL;
 	char gid[32]; //group id
 	
@@ -229,17 +212,14 @@ static int group_create_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	DAG_scene_sort(CTX_data_scene(C));
-
+	DAG_scene_sort(scene);
 	WM_event_add_notifier(C, NC_GROUP|NA_EDITED, NULL);
 	
 	return OPERATOR_FINISHED;
-
 }
 
 void GROUP_OT_group_create(wmOperatorType *ot)
 {
-	
 	/* identifiers */
 	ot->name= "Create New Group";
 	ot->description = "Create an object group.";
@@ -255,3 +235,130 @@ void GROUP_OT_group_create(wmOperatorType *ot)
 	RNA_def_string(ot->srna, "GID", "Group", 32, "Name", "Name of the new group");
 }
 
+/****************** properties window operators *********************/
+
+static int group_add_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain= CTX_data_main(C);
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	Base *base;
+	Group *group;
+	int value= RNA_enum_get(op->ptr, "group");
+
+	if(!ob)
+		return OPERATOR_CANCELLED;
+	
+	base= object_in_scene(ob, scene);
+	if(!base)
+		return OPERATOR_CANCELLED;
+	
+	if(value == -1)
+		group= add_group( "Group" );
+	else
+		group= BLI_findlink(&bmain->group, value);
+
+	if(group) {
+		add_to_group(group, ob);
+		ob->flag |= OB_FROMGROUP;
+		base->flag |= OB_FROMGROUP;
+	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+	
+	return OPERATOR_FINISHED;
+}
+
+static EnumPropertyItem group_items[]= {
+	{-1, "ADD_NEW", 0, "Add New Group", ""},
+	{0, NULL, 0, NULL, NULL}};
+
+static EnumPropertyItem *group_itemf(bContext *C, PointerRNA *ptr, int *free)
+{	
+	EnumPropertyItem tmp = {0, "", 0, "", ""};
+	EnumPropertyItem *item= NULL;
+	Main *bmain;
+	Group *group;
+	int a, totitem= 0;
+	
+	if(!C) /* needed for docs */
+		return group_items;
+	
+	RNA_enum_items_add_value(&item, &totitem, group_items, -1);
+
+	bmain= CTX_data_main(C);
+	if(bmain->group.first)
+		RNA_enum_item_add_separator(&item, &totitem);
+
+	for(a=0, group=bmain->group.first; group; group=group->id.next, a++) {
+		tmp.value= a;
+		tmp.identifier= group->id.name+2;
+		tmp.name= group->id.name+2;
+		RNA_enum_item_add(&item, &totitem, &tmp);
+	}
+
+	RNA_enum_item_end(&item, &totitem);
+
+	*free= 1;
+
+	return item;
+}
+
+void OBJECT_OT_group_add(wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+
+	/* identifiers */
+	ot->name= "Add Group";
+	ot->idname= "OBJECT_OT_group_add";
+	
+	/* api callbacks */
+	ot->exec= group_add_exec;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	prop= RNA_def_enum(ot->srna, "group", group_items, -1, "Group", "Group to add object to.");
+	RNA_def_enum_funcs(prop, group_itemf);
+}
+
+static int group_remove_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	Group *group= CTX_data_pointer_get_type(C, "group", &RNA_Group).data;
+	Base *base;
+
+	if(!ob || !group)
+		return OPERATOR_CANCELLED;
+
+	base= object_in_scene(ob, scene);
+	if(!base)
+		return OPERATOR_CANCELLED;
+
+	rem_from_group(group, ob);
+
+	if(find_group(ob, NULL) == NULL) {
+		ob->flag &= ~OB_FROMGROUP;
+		base->flag &= ~OB_FROMGROUP;
+	}
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_group_remove(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Remove Group";
+	ot->idname= "OBJECT_OT_group_remove";
+	
+	/* api callbacks */
+	ot->exec= group_remove_exec;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
new file mode 100644
index 00000000000..ab7bcbc989d
--- /dev/null
+++ b/source/blender/editors/object/object_hook.c
@@ -0,0 +1,608 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, 2002-2008 full recode
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_arithb.h"
+#include "BLI_editVert.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+
+#include "DNA_curve_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BKE_customdata.h"
+#include "BKE_depsgraph.h"
+#include "BKE_mesh.h"
+#include "BKE_modifier.h"
+#include "BKE_object.h"
+
+#include "ED_curve.h"
+#include "ED_mesh.h"
+#include "ED_object.h"
+#include "ED_view3d.h"
+
+#include "object_intern.h"
+
+/* XXX operators for this are not implemented yet */
+
+static int return_editmesh_indexar(EditMesh *em, int *tot, int **indexar, float *cent)
+{
+	EditVert *eve;
+	int *index, nr, totvert=0;
+	
+	for(eve= em->verts.first; eve; eve= eve->next) {
+		if(eve->f & SELECT) totvert++;
+	}
+	if(totvert==0) return 0;
+	
+	*indexar= index= MEM_mallocN(4*totvert, "hook indexar");
+	*tot= totvert;
+	nr= 0;
+	cent[0]= cent[1]= cent[2]= 0.0;
+	
+	for(eve= em->verts.first; eve; eve= eve->next) {
+		if(eve->f & SELECT) {
+			*index= nr; index++;
+			VecAddf(cent, cent, eve->co);
+		}
+		nr++;
+	}
+	
+	VecMulf(cent, 1.0f/(float)totvert);
+	
+	return totvert;
+}
+
+static int return_editmesh_vgroup(Object *obedit, EditMesh *em, char *name, float *cent)
+{
+	MDeformVert *dvert;
+	EditVert *eve;
+	int i, totvert=0;
+	
+	cent[0]= cent[1]= cent[2]= 0.0;
+	
+	if(obedit->actdef) {
+		
+		/* find the vertices */
+		for(eve= em->verts.first; eve; eve= eve->next) {
+			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
+
+			if(dvert) {
+				for(i=0; i<dvert->totweight; i++){
+					if(dvert->dw[i].def_nr == (obedit->actdef-1)) {
+						totvert++;
+						VecAddf(cent, cent, eve->co);
+					}
+				}
+			}
+		}
+		if(totvert) {
+			bDeformGroup *defGroup = BLI_findlink(&obedit->defbase, obedit->actdef-1);
+			strcpy(name, defGroup->name);
+			VecMulf(cent, 1.0f/(float)totvert);
+			return 1;
+		}
+	}
+	
+	return 0;
+}	
+
+static void select_editmesh_hook(Object *ob, HookModifierData *hmd)
+{
+	Mesh *me= ob->data;
+	EditMesh *em= BKE_mesh_get_editmesh(me);
+	EditVert *eve;
+	int index=0, nr=0;
+	
+	if (hmd->indexar == NULL)
+		return;
+	
+	for(eve= em->verts.first; eve; eve= eve->next, nr++) {
+		if(nr==hmd->indexar[index]) {
+			eve->f |= SELECT;
+			if(index < hmd->totindex-1) index++;
+		}
+	}
+	EM_select_flush(em);
+
+	BKE_mesh_end_editmesh(me, em);
+}
+
+static int return_editlattice_indexar(Lattice *editlatt, int *tot, int **indexar, float *cent)
+{
+	BPoint *bp;
+	int *index, nr, totvert=0, a;
+	
+	/* count */
+	a= editlatt->pntsu*editlatt->pntsv*editlatt->pntsw;
+	bp= editlatt->def;
+	while(a--) {
+		if(bp->f1 & SELECT) {
+			if(bp->hide==0) totvert++;
+		}
+		bp++;
+	}
+
+	if(totvert==0) return 0;
+	
+	*indexar= index= MEM_mallocN(4*totvert, "hook indexar");
+	*tot= totvert;
+	nr= 0;
+	cent[0]= cent[1]= cent[2]= 0.0;
+	
+	a= editlatt->pntsu*editlatt->pntsv*editlatt->pntsw;
+	bp= editlatt->def;
+	while(a--) {
+		if(bp->f1 & SELECT) {
+			if(bp->hide==0) {
+				*index= nr; index++;
+				VecAddf(cent, cent, bp->vec);
+			}
+		}
+		bp++;
+		nr++;
+	}
+	
+	VecMulf(cent, 1.0f/(float)totvert);
+	
+	return totvert;
+}
+
+static void select_editlattice_hook(Object *obedit, HookModifierData *hmd)
+{
+	Lattice *lt= obedit->data;
+	BPoint *bp;
+	int index=0, nr=0, a;
+	
+	/* count */
+	a= lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
+	bp= lt->editlatt->def;
+	while(a--) {
+		if(hmd->indexar[index]==nr) {
+			bp->f1 |= SELECT;
+			if(index < hmd->totindex-1) index++;
+		}
+		nr++;
+		bp++;
+	}
+}
+
+static int return_editcurve_indexar(Object *obedit, int *tot, int **indexar, float *cent)
+{
+	ListBase *editnurb= curve_get_editcurve(obedit);
+	Nurb *nu;
+	BPoint *bp;
+	BezTriple *bezt;
+	int *index, a, nr, totvert=0;
+	
+	for(nu= editnurb->first; nu; nu= nu->next) {
+		if(nu->type == CU_BEZIER) {
+			bezt= nu->bezt;
+			a= nu->pntsu;
+			while(a--) {
+				if(bezt->f1 & SELECT) totvert++;
+				if(bezt->f2 & SELECT) totvert++;
+				if(bezt->f3 & SELECT) totvert++;
+				bezt++;
+			}
+		}
+		else {
+			bp= nu->bp;
+			a= nu->pntsu*nu->pntsv;
+			while(a--) {
+				if(bp->f1 & SELECT) totvert++;
+				bp++;
+			}
+		}
+	}
+	if(totvert==0) return 0;
+	
+	*indexar= index= MEM_mallocN(4*totvert, "hook indexar");
+	*tot= totvert;
+	nr= 0;
+	cent[0]= cent[1]= cent[2]= 0.0;
+	
+	for(nu= editnurb->first; nu; nu= nu->next) {
+		if(nu->type == CU_BEZIER) {
+			bezt= nu->bezt;
+			a= nu->pntsu;
+			while(a--) {
+				if(bezt->f1 & SELECT) {
+					*index= nr; index++;
+					VecAddf(cent, cent, bezt->vec[0]);
+				}
+				nr++;
+				if(bezt->f2 & SELECT) {
+					*index= nr; index++;
+					VecAddf(cent, cent, bezt->vec[1]);
+				}
+				nr++;
+				if(bezt->f3 & SELECT) {
+					*index= nr; index++;
+					VecAddf(cent, cent, bezt->vec[2]);
+				}
+				nr++;
+				bezt++;
+			}
+		}
+		else {
+			bp= nu->bp;
+			a= nu->pntsu*nu->pntsv;
+			while(a--) {
+				if(bp->f1 & SELECT) {
+					*index= nr; index++;
+					VecAddf(cent, cent, bp->vec);
+				}
+				nr++;
+				bp++;
+			}
+		}
+	}
+	
+	VecMulf(cent, 1.0f/(float)totvert);
+	
+	return totvert;
+}
+
+int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
+{
+	*indexar= NULL;
+	*tot= 0;
+	name[0]= 0;
+	
+	switch(obedit->type) {
+		case OB_MESH:
+		{
+			Mesh *me= obedit->data;
+			EditMesh *em = BKE_mesh_get_editmesh(me);
+
+			/* check selected vertices first */
+			if( return_editmesh_indexar(em, tot, indexar, cent_r)) {
+				BKE_mesh_end_editmesh(me, em);
+				return 1;
+			} else {
+				int ret = return_editmesh_vgroup(obedit, em, name, cent_r);
+				BKE_mesh_end_editmesh(me, em);
+				return ret;
+			}
+		}
+		case OB_CURVE:
+		case OB_SURF:
+			return return_editcurve_indexar(obedit, tot, indexar, cent_r);
+		case OB_LATTICE:
+		{
+			Lattice *lt= obedit->data;
+			return return_editlattice_indexar(lt->editlatt, tot, indexar, cent_r);
+		}
+		default:
+			return 0;
+	}
+}
+
+static void select_editcurve_hook(Object *obedit, HookModifierData *hmd)
+{
+	ListBase *editnurb= curve_get_editcurve(obedit);
+	Nurb *nu;
+	BPoint *bp;
+	BezTriple *bezt;
+	int index=0, a, nr=0;
+	
+	for(nu= editnurb->first; nu; nu= nu->next) {
+		if(nu->type == CU_BEZIER) {
+			bezt= nu->bezt;
+			a= nu->pntsu;
+			while(a--) {
+				if(nr == hmd->indexar[index]) {
+					bezt->f1 |= SELECT;
+					if(index<hmd->totindex-1) index++;
+				}
+				nr++;
+				if(nr == hmd->indexar[index]) {
+					bezt->f2 |= SELECT;
+					if(index<hmd->totindex-1) index++;
+				}
+				nr++;
+				if(nr == hmd->indexar[index]) {
+					bezt->f3 |= SELECT;
+					if(index<hmd->totindex-1) index++;
+				}
+				nr++;
+				
+				bezt++;
+			}
+		}
+		else {
+			bp= nu->bp;
+			a= nu->pntsu*nu->pntsv;
+			while(a--) {
+				if(nr == hmd->indexar[index]) {
+					bp->f1 |= SELECT;
+					if(index<hmd->totindex-1) index++;
+				}
+				nr++;
+				bp++;
+			}
+		}
+	}
+}
+
+void object_hook_select(Object *ob, HookModifierData *hmd) 
+{
+	if(ob->type==OB_MESH) select_editmesh_hook(ob, hmd);
+	else if(ob->type==OB_LATTICE) select_editlattice_hook(ob, hmd);
+	else if(ob->type==OB_CURVE) select_editcurve_hook(ob, hmd);
+	else if(ob->type==OB_SURF) select_editcurve_hook(ob, hmd);
+}
+
+
+void add_hook(Scene *scene, View3D *v3d, int mode)
+{
+	ModifierData *md = NULL;
+	HookModifierData *hmd = NULL;
+	Object *ob=NULL;
+	Object *obedit= scene->obedit;  // XXX get from context
+	
+	if(obedit==NULL) return;
+	
+	/* preconditions */
+	if(mode==2) { /* selected object */
+		Base *base;
+		for(base= FIRSTBASE; base; base= base->next) {
+			if(TESTBASELIB(v3d, base)) {
+				if(base!=BASACT) {
+					ob= base->object;
+					break;
+				}
+			}
+		}
+		if(ob==NULL) {
+			// XXX error("Requires selected Object");
+			return;
+		}
+	}
+	else if(mode!=1) {
+		int maxlen=0, a, nr;
+		char *cp;
+		
+		/* make pupmenu with hooks */
+		for(md=obedit->modifiers.first; md; md= md->next) {
+			if (md->type==eModifierType_Hook) 
+				maxlen+=32;
+		}
+		
+		if(maxlen==0) {
+			// XXX error("Object has no hooks yet");
+			return;
+		}
+		
+		cp= MEM_callocN(maxlen+32, "temp string");
+		if(mode==3) strcpy(cp, "Remove %t|");
+		else if(mode==4) strcpy(cp, "Reassign %t|");
+		else if(mode==5) strcpy(cp, "Select %t|");
+		else if(mode==6) strcpy(cp, "Clear Offset %t|");
+		
+		for(md=obedit->modifiers.first; md; md= md->next) {
+			if (md->type==eModifierType_Hook) {
+				strcat(cp, md->name);
+				strcat(cp, " |");
+			}
+		}
+		
+		nr= 0; // XXX pupmenu(cp);
+		MEM_freeN(cp);
+		
+		if(nr<1) return;
+		
+		a= 1;
+		for(md=obedit->modifiers.first; md; md=md->next) {
+			if (md->type==eModifierType_Hook) {
+				if(a==nr) break;
+				a++;
+			}
+		}
+		
+		hmd = (HookModifierData*) md;
+		ob= hmd->object;
+	}
+
+	/* do it, new hooks or reassign */
+	if(mode==1 || mode==2 || mode==4) {
+		float cent[3];
+		int tot, ok, *indexar;
+		char name[32];
+		
+		ok = object_hook_index_array(obedit, &tot, &indexar, name, cent);
+		
+		if(ok==0) {
+			// XXX error("Requires selected vertices or active Vertex Group");
+		}
+		else {
+			
+			if(mode==1) {
+				Base *base= BASACT, *newbase;
+				
+				ob= add_object(scene, OB_EMPTY);
+				/* set layers OK */
+				newbase= BASACT;
+				newbase->lay= base->lay;
+				ob->lay= newbase->lay;
+				
+				/* transform cent to global coords for loc */
+				VecMat4MulVecfl(ob->loc, obedit->obmat, cent);
+				
+				/* restore, add_object sets active */
+				BASACT= base;
+			}
+			/* if mode is 2 or 4, ob has been set */
+			
+			/* new hook */
+			if(mode==1 || mode==2) {
+				ModifierData *md = obedit->modifiers.first;
+				
+				while (md && modifierType_getInfo(md->type)->type==eModifierTypeType_OnlyDeform) {
+					md = md->next;
+				}
+				
+				hmd = (HookModifierData*) modifier_new(eModifierType_Hook);
+				BLI_insertlinkbefore(&obedit->modifiers, md, hmd);
+				sprintf(hmd->modifier.name, "Hook-%s", ob->id.name+2);
+			}
+			else if (hmd->indexar) MEM_freeN(hmd->indexar); /* reassign, hook was set */
+		
+			hmd->object= ob;
+			hmd->indexar= indexar;
+			VecCopyf(hmd->cent, cent);
+			hmd->totindex= tot;
+			BLI_strncpy(hmd->name, name, 32);
+			
+			// TODO: need to take into account bone targets here too now...
+			if(mode==1 || mode==2) {
+				/* matrix calculus */
+				/* vert x (obmat x hook->imat) x hook->obmat x ob->imat */
+				/*        (parentinv         )                          */
+				
+				where_is_object(scene, ob);
+				
+				Mat4Invert(ob->imat, ob->obmat);
+				/* apparently this call goes from right to left... */
+				Mat4MulSerie(hmd->parentinv, ob->imat, obedit->obmat, NULL, 
+							 NULL, NULL, NULL, NULL, NULL);
+			}
+		}
+	}
+	else if(mode==3) { /* remove */
+		BLI_remlink(&obedit->modifiers, md);
+		modifier_free(md);
+	}
+	else if(mode==5) { /* select */
+		// FIXME: this is now OBJECT_OT_hook_select
+		object_hook_select(obedit, hmd);
+	}
+	else if(mode==6) { /* clear offset */
+		// FIXME: this is now OBJECT_OT_hook_reset operator
+		where_is_object(scene, ob);	/* ob is hook->parent */
+
+		Mat4Invert(ob->imat, ob->obmat);
+		/* this call goes from right to left... */
+		Mat4MulSerie(hmd->parentinv, ob->imat, obedit->obmat, NULL, 
+					 NULL, NULL, NULL, NULL, NULL);
+	}
+
+	DAG_scene_sort(scene);
+}
+
+void add_hook_menu(Scene *scene, View3D *v3d)
+{
+	Object *obedit= scene->obedit;  // XXX get from context
+	int mode;
+	
+	if(obedit==NULL) return;
+	
+	if(modifiers_findByType(obedit, eModifierType_Hook))
+		mode= 0; // XXX pupmenu("Hooks %t|Add, To New Empty %x1|Add, To Selected Object %x2|Remove... %x3|Reassign... %x4|Select... %x5|Clear Offset...%x6");
+	else
+		mode= 0; // XXX pupmenu("Hooks %t|Add, New Empty %x1|Add, To Selected Object %x2");
+
+	if(mode<1) return;
+		
+	/* do operations */
+	add_hook(scene, v3d, mode);
+}
+
+void hookmenu(Scene *scene, View3D *v3d)
+{
+	/* only called in object mode */
+	short event, changed=0;
+	Object *ob;
+	Base *base;
+	ModifierData *md;
+	HookModifierData *hmd;
+	
+	event= 0; // XXX pupmenu("Modify Hooks for Selected...%t|Reset Offset%x1|Recenter at Cursor%x2");
+	if (event==-1) return;
+	if (event==2 && !(v3d)) {
+		// XXX error("Cannot perform this operation without a 3d view");
+		return;
+	}
+	
+	for (base= FIRSTBASE; base; base= base->next) {
+		if(TESTBASELIB(v3d, base)) {
+			for (md = base->object->modifiers.first; md; md=md->next) {
+				if (md->type==eModifierType_Hook) {
+					ob = base->object;
+					hmd = (HookModifierData*) md;
+					
+					/*
+					 * Copied from modifiers_cursorHookCenter and
+					 * modifiers_clearHookOffset, should consolidate
+					 * */
+					
+					if (event==1) {
+						if(hmd->object) {
+							Mat4Invert(hmd->object->imat, hmd->object->obmat);
+							Mat4MulSerie(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL);
+							
+							changed= 1;
+							DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+						}
+					} else {
+						float *curs = give_cursor(scene, v3d);
+						float bmat[3][3], imat[3][3];
+						
+						where_is_object(scene, ob);
+					
+						Mat3CpyMat4(bmat, ob->obmat);
+						Mat3Inv(imat, bmat);
+				
+						curs= give_cursor(scene, v3d);
+						hmd->cent[0]= curs[0]-ob->obmat[3][0];
+						hmd->cent[1]= curs[1]-ob->obmat[3][1];
+						hmd->cent[2]= curs[2]-ob->obmat[3][2];
+						Mat3MulVecfl(imat, hmd->cent);
+						
+						changed= 1;
+						DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+					} 
+				}
+			}
+		}
+	}
+	
+	if (changed) {
+	}	
+}
+
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 8eaa388cdf0..7d52e9c7c56 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -38,15 +38,39 @@ struct HookModifierData;
 
 /* internal exports only */
 
+/* object_transform.c */
+void OBJECT_OT_location_clear(struct wmOperatorType *ot);
+void OBJECT_OT_rotation_clear(struct wmOperatorType *ot);
+void OBJECT_OT_scale_clear(struct wmOperatorType *ot);
+void OBJECT_OT_origin_clear(struct wmOperatorType *ot);
+void OBJECT_OT_visual_transform_apply(struct wmOperatorType *ot);
+void OBJECT_OT_location_apply(struct wmOperatorType *ot);
+void OBJECT_OT_scale_apply(struct wmOperatorType *ot);
+void OBJECT_OT_rotation_apply(struct wmOperatorType *ot);
+void OBJECT_OT_center_set(struct wmOperatorType *ot);
+
+/* object_relations.c */
+void OBJECT_OT_parent_set(struct wmOperatorType *ot);
+void OBJECT_OT_parent_clear(struct wmOperatorType *ot);
+void OBJECT_OT_vertex_parent_set(struct wmOperatorType *ot);
+void OBJECT_OT_track_set(struct wmOperatorType *ot);
+void OBJECT_OT_track_clear(struct wmOperatorType *ot);
+void OBJECT_OT_slow_parent_set(struct wmOperatorType *ot);
+void OBJECT_OT_slow_parent_clear(struct wmOperatorType *ot);
+void OBJECT_OT_make_local(struct wmOperatorType *ot);
+void OBJECT_OT_move_to_layer(struct wmOperatorType *ot);
 
 /* object_edit.c */
 void OBJECT_OT_mode_set(struct wmOperatorType *ot);
 void OBJECT_OT_editmode_toggle(struct wmOperatorType *ot);
 void OBJECT_OT_posemode_toggle(struct wmOperatorType *ot);
-void OBJECT_OT_parent_set(struct wmOperatorType *ot);
-void OBJECT_OT_parent_clear(struct wmOperatorType *ot);
-void OBJECT_OT_track_set(struct wmOperatorType *ot);
-void OBJECT_OT_track_clear(struct wmOperatorType *ot);
+void OBJECT_OT_restrictview_set(struct wmOperatorType *ot);
+void OBJECT_OT_restrictview_clear(struct wmOperatorType *ot);
+void OBJECT_OT_proxy_make(struct wmOperatorType *ot);
+void OBJECT_OT_shade_smooth(struct wmOperatorType *ot);
+void OBJECT_OT_shade_flat(struct wmOperatorType *ot);
+
+/* object_select.c */
 void OBJECT_OT_select_all_toggle(struct wmOperatorType *ot);
 void OBJECT_OT_select_inverse(struct wmOperatorType *ot);
 void OBJECT_OT_select_random(struct wmOperatorType *ot);
@@ -55,37 +79,28 @@ void OBJECT_OT_select_by_layer(struct wmOperatorType *ot);
 void OBJECT_OT_select_linked(struct wmOperatorType *ot);
 void OBJECT_OT_select_grouped(struct wmOperatorType *ot);
 void OBJECT_OT_select_mirror(struct wmOperatorType *ot);
-void OBJECT_OT_location_clear(struct wmOperatorType *ot);
-void OBJECT_OT_rotation_clear(struct wmOperatorType *ot);
-void OBJECT_OT_scale_clear(struct wmOperatorType *ot);
-void OBJECT_OT_origin_clear(struct wmOperatorType *ot);
-void OBJECT_OT_restrictview_set(struct wmOperatorType *ot);
-void OBJECT_OT_restrictview_clear(struct wmOperatorType *ot);
-void OBJECT_OT_slowparent_set(struct wmOperatorType *ot);
-void OBJECT_OT_slowparent_clear(struct wmOperatorType *ot);
-void OBJECT_OT_center_set(struct wmOperatorType *ot);
-void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot);
-void OBJECT_OT_object_add(struct wmOperatorType *ot);
-void OBJECT_OT_duplicate(struct wmOperatorType *ot);
-void OBJECT_OT_delete(struct wmOperatorType *ot);
-void OBJECT_OT_join(struct wmOperatorType *ot);
-void OBJECT_OT_proxy_make(struct wmOperatorType *ot);
-void OBJECT_OT_shade_smooth(struct wmOperatorType *ot);
-void OBJECT_OT_shade_flat(struct wmOperatorType *ot);
 
+/* object_add.c */
+void OBJECT_OT_add(struct wmOperatorType *ot);
 void OBJECT_OT_mesh_add(struct wmOperatorType *ot);
 void OBJECT_OT_curve_add(struct wmOperatorType *ot);
 void OBJECT_OT_surface_add(struct wmOperatorType *ot);
-void OBJECT_OT_metaball_add(wmOperatorType *ot);
+void OBJECT_OT_metaball_add(struct wmOperatorType *ot);
 void OBJECT_OT_text_add(struct wmOperatorType *ot);
 void OBJECT_OT_armature_add(struct wmOperatorType *ot);
-	/* only used as menu */
-void OBJECT_OT_primitive_add(struct wmOperatorType *ot);
+void OBJECT_OT_primitive_add(struct wmOperatorType *ot); /* only used as menu */
 
+void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot);
+void OBJECT_OT_duplicate(struct wmOperatorType *ot);
+void OBJECT_OT_delete(struct wmOperatorType *ot);
+void OBJECT_OT_join(struct wmOperatorType *ot);
+void OBJECT_OT_convert(struct wmOperatorType *ot);
+
+/* object_hook.c */
 int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r);
 void object_hook_select(Object *obedit, struct HookModifierData *hmd);
 
-/* editlattice.c */
+/* object_lattice.c */
 void free_editLatt(Object *ob);
 void make_editLatt(Object *obedit);
 void load_editLatt(Object *obedit);
@@ -94,7 +109,7 @@ void remake_editLatt(Object *obedit);
 void LATTICE_OT_select_all_toggle(struct wmOperatorType *ot);
 void LATTICE_OT_make_regular(struct wmOperatorType *ot);
 
-/* editgroup.c */
+/* object_group.c */
 void GROUP_OT_group_create(struct wmOperatorType *ot);
 void GROUP_OT_objects_remove(struct wmOperatorType *ot);
 void GROUP_OT_objects_add_active(struct wmOperatorType *ot);
@@ -117,7 +132,7 @@ void OBJECT_OT_hook_select(struct wmOperatorType *ot);
 void OBJECT_OT_hook_assign(struct wmOperatorType *ot);
 void OBJECT_OT_explode_refresh(struct wmOperatorType *ot);
 
-/* editconstraint.c */
+/* object_constraint.c */
 void OBJECT_OT_constraint_add(struct wmOperatorType *ot);
 void OBJECT_OT_constraint_add_with_targets(struct wmOperatorType *ot);
 void POSE_OT_constraint_add(struct wmOperatorType *ot);
@@ -148,11 +163,13 @@ void OBJECT_OT_vertex_group_select(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_deselect(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_copy_to_linked(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_copy(struct wmOperatorType *ot);
+void OBJECT_OT_vertex_group_menu(struct wmOperatorType *ot);
+void OBJECT_OT_vertex_group_set_active(struct wmOperatorType *ot);
 
 void OBJECT_OT_game_property_new(struct wmOperatorType *ot);
 void OBJECT_OT_game_property_remove(struct wmOperatorType *ot);
 
-/* editkey.c */
+/* object_shapekey.c */
 void OBJECT_OT_shape_key_add(struct wmOperatorType *ot);
 void OBJECT_OT_shape_key_remove(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/object/editlattice.c b/source/blender/editors/object/object_lattice.c
similarity index 98%
rename from source/blender/editors/object/editlattice.c
rename to source/blender/editors/object/object_lattice.c
index 3ec1f3af014..b35d3908b43 100644
--- a/source/blender/editors/object/editlattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -31,21 +31,15 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_arithb.h"
-
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_view3d_types.h"
 
-#include "BKE_armature.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
-#include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index aecb778db06..cc8cc420bf7 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -809,58 +809,6 @@ void OBJECT_OT_meshdeform_bind(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-#if 0
-typedef struct MenuEntry {
-	char *name;
-	int ID;
-} MenuEntry;
-
-static int menuEntry_compare_names(const void *entry1, const void *entry2)
-{
-	return strcmp(((MenuEntry *)entry1)->name, ((MenuEntry *)entry2)->name);
-}
-
-static uiBlock *modifiers_add_menu(void *ob_v)
-{
-	Object *ob = ob_v;
-	uiBlock *block;
-	int i, yco=0;
-	int numEntries = 0;
-	MenuEntry entries[NUM_MODIFIER_TYPES];
-	
-	block= uiNewBlock(&curarea->uiblocks, "modifier_add_menu",
-	                  UI_EMBOSSP, UI_HELV, curarea->win);
-	uiBlockSetButmFunc(block, modifiers_add, ob);
-
-	for (i=eModifierType_None+1; i<NUM_MODIFIER_TYPES; i++) {
-		ModifierTypeInfo *mti = modifierType_getInfo(i);
-
-		/* Only allow adding through appropriate other interfaces */
-		if(ELEM(i, eModifierType_ParticleSystem, eModifierType_Surface)) continue;
-
-		if((mti->flags&eModifierTypeFlag_AcceptsCVs) ||
-		   (ob->type==OB_MESH && (mti->flags&eModifierTypeFlag_AcceptsMesh))) {
-			entries[numEntries].name = mti->name;
-			entries[numEntries].ID = i;
-
-			++numEntries;
-		}
-	}
-
-	qsort(entries, numEntries, sizeof(*entries), menuEntry_compare_names);
-
-
-	for(i = 0; i < numEntries; ++i)
-		uiDefBut(block, BUTM, B_MODIFIER_RECALC, entries[i].name,
-		         0, yco -= 20, 160, 19, NULL, 0, 0, 1, entries[i].ID, "");
-
-	uiTextBoundsBlock(block, 50);
-	uiBlockSetDirection(block, UI_DOWN);
-
-	return block;
-}
-#endif
-
 /******************** hook operators ************************/
 
 static int hook_poll(bContext *C)
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 09a27e9e613..bb8c5dc292e 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -64,14 +64,36 @@
 void ED_operatortypes_object(void)
 {
 	wmOperatorType *ot;
+
+	WM_operatortype_append(OBJECT_OT_location_clear);
+	WM_operatortype_append(OBJECT_OT_rotation_clear);
+	WM_operatortype_append(OBJECT_OT_scale_clear);
+	WM_operatortype_append(OBJECT_OT_origin_clear);
+	WM_operatortype_append(OBJECT_OT_visual_transform_apply);
+	WM_operatortype_append(OBJECT_OT_location_apply);
+	WM_operatortype_append(OBJECT_OT_scale_apply);
+	WM_operatortype_append(OBJECT_OT_rotation_apply);
+	WM_operatortype_append(OBJECT_OT_center_set);
 	
 	WM_operatortype_append(OBJECT_OT_mode_set);
 	WM_operatortype_append(OBJECT_OT_editmode_toggle);
 	WM_operatortype_append(OBJECT_OT_posemode_toggle);
+	WM_operatortype_append(OBJECT_OT_proxy_make);
+	WM_operatortype_append(OBJECT_OT_restrictview_clear);
+	WM_operatortype_append(OBJECT_OT_restrictview_set);
+	WM_operatortype_append(OBJECT_OT_shade_smooth);
+	WM_operatortype_append(OBJECT_OT_shade_flat);
+
 	WM_operatortype_append(OBJECT_OT_parent_set);
 	WM_operatortype_append(OBJECT_OT_parent_clear);
+	WM_operatortype_append(OBJECT_OT_vertex_parent_set);
 	WM_operatortype_append(OBJECT_OT_track_set);
 	WM_operatortype_append(OBJECT_OT_track_clear);
+	WM_operatortype_append(OBJECT_OT_slow_parent_set);
+	WM_operatortype_append(OBJECT_OT_slow_parent_clear);
+	WM_operatortype_append(OBJECT_OT_make_local);
+	WM_operatortype_append(OBJECT_OT_move_to_layer);
+
 	WM_operatortype_append(OBJECT_OT_select_inverse);
 	WM_operatortype_append(OBJECT_OT_select_random);
 	WM_operatortype_append(OBJECT_OT_select_all_toggle);
@@ -80,21 +102,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_select_linked);
 	WM_operatortype_append(OBJECT_OT_select_grouped);
 	WM_operatortype_append(OBJECT_OT_select_mirror);
-	WM_operatortype_append(OBJECT_OT_location_clear);
-	WM_operatortype_append(OBJECT_OT_rotation_clear);
-	WM_operatortype_append(OBJECT_OT_scale_clear);
-	WM_operatortype_append(OBJECT_OT_origin_clear);
-	WM_operatortype_append(OBJECT_OT_restrictview_clear);
-	WM_operatortype_append(OBJECT_OT_restrictview_set);
-	WM_operatortype_append(OBJECT_OT_slowparent_set);
-	WM_operatortype_append(OBJECT_OT_slowparent_clear);
-	WM_operatortype_append(OBJECT_OT_center_set);
-	WM_operatortype_append(OBJECT_OT_duplicates_make_real);
-	WM_operatortype_append(OBJECT_OT_duplicate);
-	WM_operatortype_append(OBJECT_OT_join);
-	WM_operatortype_append(OBJECT_OT_proxy_make);
-	WM_operatortype_append(OBJECT_OT_shade_smooth);
-	WM_operatortype_append(OBJECT_OT_shade_flat);
+
 	WM_operatortype_append(GROUP_OT_group_create);
 	WM_operatortype_append(GROUP_OT_objects_remove);
 	WM_operatortype_append(GROUP_OT_objects_add_active);
@@ -106,10 +114,14 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_text_add);
 	WM_operatortype_append(OBJECT_OT_surface_add);
 	WM_operatortype_append(OBJECT_OT_armature_add);
-	WM_operatortype_append(OBJECT_OT_object_add);
+	WM_operatortype_append(OBJECT_OT_add);
 	WM_operatortype_append(OBJECT_OT_primitive_add);
 	WM_operatortype_append(OBJECT_OT_mesh_add);
 	WM_operatortype_append(OBJECT_OT_metaball_add);
+	WM_operatortype_append(OBJECT_OT_duplicates_make_real);
+	WM_operatortype_append(OBJECT_OT_duplicate);
+	WM_operatortype_append(OBJECT_OT_join);
+	WM_operatortype_append(OBJECT_OT_convert);
 
 	WM_operatortype_append(OBJECT_OT_modifier_add);
 	WM_operatortype_append(OBJECT_OT_modifier_remove);
@@ -151,6 +163,8 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_vertex_group_deselect);
 	WM_operatortype_append(OBJECT_OT_vertex_group_copy_to_linked);
 	WM_operatortype_append(OBJECT_OT_vertex_group_copy);
+	WM_operatortype_append(OBJECT_OT_vertex_group_menu);
+	WM_operatortype_append(OBJECT_OT_vertex_group_set_active);
 
 	WM_operatortype_append(OBJECT_OT_game_property_new);
 	WM_operatortype_append(OBJECT_OT_game_property_remove);
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
new file mode 100644
index 00000000000..6fe01cced74
--- /dev/null
+++ b/source/blender/editors/object/object_relations.c
@@ -0,0 +1,1766 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, 2002-2008 full recode
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_anim_types.h"
+#include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_constraint_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_group_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_object_types.h"
+#include "DNA_particle_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
+
+#include "BLI_arithb.h"
+#include "BLI_editVert.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+
+#include "BKE_action.h"
+#include "BKE_animsys.h"
+#include "BKE_armature.h"
+#include "BKE_context.h"
+#include "BKE_constraint.h"
+#include "BKE_curve.h"
+#include "BKE_depsgraph.h"
+#include "BKE_displist.h"
+#include "BKE_global.h"
+#include "BKE_lattice.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_material.h"
+#include "BKE_mball.h"
+#include "BKE_mesh.h"
+#include "BKE_modifier.h"
+#include "BKE_object.h"
+#include "BKE_report.h"
+#include "BKE_sca.h"
+#include "BKE_texture.h"
+#include "BKE_utildefines.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "ED_anim_api.h"
+#include "ED_armature.h"
+#include "ED_curve.h"
+#include "ED_object.h"
+#include "ED_screen.h"
+
+#include "object_intern.h"
+
+/* ************* XXX **************** */
+static int pupmenu(const char *msg) {return 0;}
+static int pupmenu_col(const char *msg, int val) {return 0;}
+
+/*********************** Make Vertex Parent Operator ************************/
+
+static int vertex_parent_set_poll(bContext *C)
+{
+	return ED_operator_editmesh(C) || ED_operator_editsurfcurve(C) || ED_operator_editlattice(C);
+}
+
+static int vertex_parent_set_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *obedit= CTX_data_edit_object(C);
+	EditVert *eve;
+	Curve *cu;
+	Nurb *nu;
+	BezTriple *bezt;
+	BPoint *bp;
+	Object *par;
+	int a, v1=0, v2=0, v3=0, v4=0, nr=1;
+	
+	/* we need 1 to 3 selected vertices */
+	
+	if(obedit->type==OB_MESH) {
+		Mesh *me= obedit->data;
+		EditMesh *em = BKE_mesh_get_editmesh(me);
+
+		eve= em->verts.first;
+		while(eve) {
+			if(eve->f & 1) {
+				if(v1==0) v1= nr;
+				else if(v2==0) v2= nr;
+				else if(v3==0) v3= nr;
+				else if(v4==0) v4= nr;
+				else break;
+			}
+			nr++;
+			eve= eve->next;
+		}
+
+		BKE_mesh_end_editmesh(me, em);
+	}
+	else if(ELEM(obedit->type, OB_SURF, OB_CURVE)) {
+		ListBase *editnurb= curve_get_editcurve(obedit);
+		
+		cu= obedit->data;
+
+		nu= editnurb->first;
+		while(nu) {
+			if(nu->type == CU_BEZIER) {
+				bezt= nu->bezt;
+				a= nu->pntsu;
+				while(a--) {
+					if(BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
+						if(v1==0) v1= nr;
+						else if(v2==0) v2= nr;
+						else if(v3==0) v3= nr;
+						else if(v4==0) v4= nr;
+						else break;
+					}
+					nr++;
+					bezt++;
+				}
+			}
+			else {
+				bp= nu->bp;
+				a= nu->pntsu*nu->pntsv;
+				while(a--) {
+					if(bp->f1 & SELECT) {
+						if(v1==0) v1= nr;
+						else if(v2==0) v2= nr;
+						else if(v3==0) v3= nr;
+						else if(v4==0) v4= nr;
+						else break;
+					}
+					nr++;
+					bp++;
+				}
+			}
+			nu= nu->next;
+		}
+	}
+	else if(obedit->type==OB_LATTICE) {
+		Lattice *lt= obedit->data;
+		
+		a= lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
+		bp= lt->editlatt->def;
+		while(a--) {
+			if(bp->f1 & SELECT) {
+				if(v1==0) v1= nr;
+				else if(v2==0) v2= nr;
+				else if(v3==0) v3= nr;
+				else if(v4==0) v4= nr;
+				else break;
+			}
+			nr++;
+			bp++;
+		}
+	}
+	
+	if(v4 || !((v1 && v2==0 && v3==0) || (v1 && v2 && v3)) ) {
+		BKE_report(op->reports, RPT_ERROR, "Select either 1 or 3 vertices to parent to");
+		return OPERATOR_CANCELLED;
+	}
+	
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(ob != obedit) {
+			ob->recalc |= OB_RECALC;
+			par= obedit->parent;
+			
+			while(par) {
+				if(par==ob) break;
+				par= par->parent;
+			}
+			if(par) {
+				BKE_report(op->reports, RPT_ERROR, "Loop in parents");
+			}
+			else {
+				Object workob;
+				
+				ob->parent= BASACT->object;
+				if(v3) {
+					ob->partype= PARVERT3;
+					ob->par1= v1-1;
+					ob->par2= v2-1;
+					ob->par3= v3-1;
+
+					/* inverse parent matrix */
+					what_does_parent(scene, ob, &workob);
+					Mat4Invert(ob->parentinv, workob.obmat);
+				}
+				else {
+					ob->partype= PARVERT1;
+					ob->par1= v1-1;
+
+					/* inverse parent matrix */
+					what_does_parent(scene, ob, &workob);
+					Mat4Invert(ob->parentinv, workob.obmat);
+				}
+			}
+		}
+	}
+	CTX_DATA_END;
+	
+	DAG_scene_sort(scene);
+
+	WM_event_add_notifier(C, NC_OBJECT, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_vertex_parent_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Make Vertex Parent";
+	ot->description = "Parent selected objects to the selected vertices.";
+	ot->idname= "OBJECT_OT_vertex_parent_set";
+	
+	/* api callbacks */
+	ot->poll= vertex_parent_set_poll;
+	ot->exec= vertex_parent_set_exec;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/********************** Make Proxy Operator *************************/
+
+/* present menu listing the possible objects within the group to proxify */
+static void proxy_group_objects_menu (bContext *C, wmOperator *op, Object *ob, Group *group)
+{
+	uiPopupMenu *pup;
+	uiLayout *layout;
+	GroupObject *go;
+	int len=0;
+	
+	/* check if there are any objects within the group to assign for */
+	for (go= group->gobject.first; go; go= go->next) {
+		if (go->ob) len++;
+	}
+	if (len==0) return;
+	
+	/* now create the menu to draw */
+	pup= uiPupMenuBegin(C, "Make Proxy For:", 0);
+	layout= uiPupMenuLayout(pup);
+	
+	for (go= group->gobject.first; go; go= go->next) {
+		if (go->ob) {
+			PointerRNA props_ptr;
+			
+			/* create operator menu item with relevant properties filled in */
+			props_ptr= uiItemFullO(layout, go->ob->id.name+2, 0, op->idname, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+			RNA_string_set(&props_ptr, "object", go->ob->id.name+2);
+			RNA_string_set(&props_ptr, "group_object", go->ob->id.name+2);
+		}
+	}
+	
+	/* display the menu, and be done */
+	uiPupMenuEnd(C, pup);
+}
+
+/* set the object to proxify */
+static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_active_object(C);
+	
+	/* sanity checks */
+	if (!scene || scene->id.lib || !ob)
+		return OPERATOR_CANCELLED;
+		
+	/* Get object to work on - use a menu if we need to... */
+	if (ob->dup_group && ob->dup_group->id.lib) {
+		/* gives menu with list of objects in group */
+		proxy_group_objects_menu(C, op, ob, ob->dup_group);
+	}
+	else if (ob->id.lib) {
+		uiPopupMenu *pup= uiPupMenuBegin(C, "OK?", ICON_QUESTION);
+		uiLayout *layout= uiPupMenuLayout(pup);
+		PointerRNA props_ptr;
+		
+		/* create operator menu item with relevant properties filled in */
+		props_ptr= uiItemFullO(layout, op->type->name, 0, op->idname, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+		RNA_string_set(&props_ptr, "object", ob->id.name+2);
+		
+		/* present the menu and be done... */
+		uiPupMenuEnd(C, pup);
+	}
+	else {
+		/* error.. cannot continue */
+		BKE_report(op->reports, RPT_ERROR, "Can only make proxy for a referenced object or group");
+	}
+	
+	/* this invoke just calls another instance of this operator... */
+	return OPERATOR_CANCELLED;
+}
+
+static int make_proxy_exec (bContext *C, wmOperator *op)
+{
+	Object *ob=NULL, *gob=NULL;
+	Scene *scene= CTX_data_scene(C);
+	char ob_name[21], gob_name[21];
+	
+	/* get object and group object
+	 *	- firstly names
+	 *	- then pointers from context 
+	 */
+	RNA_string_get(op->ptr, "object", ob_name);
+	RNA_string_get(op->ptr, "group_object", gob_name);
+	
+	if (gob_name[0]) {
+		Group *group;
+		GroupObject *go;
+		
+		/* active object is group object... */
+		// FIXME: we should get the nominated name instead
+		gob= CTX_data_active_object(C);
+		group= gob->dup_group;
+		
+		/* find the object to affect */
+		for (go= group->gobject.first; go; go= go->next) {
+			if ((go->ob) && strcmp(go->ob->id.name+2, gob_name)==0) {
+				ob= go->ob;
+				break;
+			}
+		}
+	}
+	else {
+		/* just use the active object for now */
+		// FIXME: we should get the nominated name instead
+		ob= CTX_data_active_object(C);
+	}
+	
+	if (ob) {
+		Object *newob;
+		Base *newbase, *oldbase= BASACT;
+		char name[32];
+		
+		/* Add new object for the proxy */
+		newob= add_object(scene, OB_EMPTY);
+		if (gob)
+			strcpy(name, gob->id.name+2);
+		else
+			strcpy(name, ob->id.name+2);
+		strcat(name, "_proxy");
+		rename_id(&newob->id, name);
+		
+		/* set layers OK */
+		newbase= BASACT;	/* add_object sets active... */
+		newbase->lay= oldbase->lay;
+		newob->lay= newbase->lay;
+		
+		/* remove base, leave user count of object, it gets linked in object_make_proxy */
+		if (gob==NULL) {
+			BLI_remlink(&scene->base, oldbase);
+			MEM_freeN(oldbase);
+		}
+		
+		object_make_proxy(newob, ob, gob);
+		
+		/* depsgraph flushes are needed for the new data */
+		DAG_scene_sort(scene);
+		DAG_id_flush_update(&newob->id, OB_RECALC);
+		
+		WM_event_add_notifier(C, NC_OBJECT, NULL);
+	}
+	else {
+		BKE_report(op->reports, RPT_ERROR, "No object to make proxy for");
+		return OPERATOR_CANCELLED;
+	}
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_proxy_make (wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Make Proxy";
+	ot->idname= "OBJECT_OT_proxy_make";
+	ot->description= "Add empty object to become local replacement data of a library-linked object";
+	
+	/* callbacks */
+	ot->invoke= make_proxy_invoke;
+	ot->exec= make_proxy_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_string(ot->srna, "object", "", 19, "Proxy Object", "Name of lib-linked/grouped object to make a proxy for.");
+	RNA_def_string(ot->srna, "group_object", "", 19, "Group Object", "Name of group instancer (if applicable).");
+}
+
+/********************** Clear Parent Operator ******************* */
+
+static EnumPropertyItem prop_clear_parent_types[] = {
+	{0, "CLEAR", 0, "Clear Parent", ""},
+	{1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""},
+	{2, "CLEAR_INVERSE", 0, "Clear Parent Inverse", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+/* note, poll should check for editable scene */
+static int parent_clear_exec(bContext *C, wmOperator *op)
+{
+	int type= RNA_enum_get(op->ptr, "type");
+	
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+
+		if(type == 0) {
+			ob->parent= NULL;
+		}			
+		else if(type == 1) {
+			ob->parent= NULL;
+			ob->track= NULL;
+			ED_object_apply_obmat(ob);
+		}
+		else if(type == 2)
+			Mat4One(ob->parentinv);
+
+		ob->recalc |= OB_RECALC;
+	}
+	CTX_DATA_END;
+	
+	DAG_scene_sort(CTX_data_scene(C));
+	ED_anim_dag_flush_update(C);
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_parent_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Clear Parent";
+	ot->description = "Clear the object's parenting.";
+	ot->idname= "OBJECT_OT_parent_clear";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= parent_clear_exec;
+	
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", "");
+}
+
+/* ******************** Make Parent Operator *********************** */
+
+#define PAR_OBJECT				0
+#define PAR_ARMATURE			1
+#define PAR_ARMATURE_NAME		2
+#define PAR_ARMATURE_ENVELOPE	3
+#define PAR_ARMATURE_AUTO		4
+#define PAR_BONE				5
+#define PAR_CURVE				6
+#define PAR_FOLLOW				7
+#define PAR_PATH_CONST			8
+#define PAR_LATTICE				9
+#define PAR_VERTEX				10
+#define PAR_TRIA				11
+
+static EnumPropertyItem prop_make_parent_types[] = {
+	{PAR_OBJECT, "OBJECT", 0, "Object", ""},
+	{PAR_ARMATURE, "ARMATURE", 0, "Armature Deform", ""},
+	{PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, "   With Empty Groups", ""},
+	{PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, "   With Automatic Weights", ""},
+	{PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, "   With Envelope Weights", ""},
+	{PAR_BONE, "BONE", 0, "Bone", ""},
+	{PAR_CURVE, "CURVE", 0, "Curve Deform", ""},
+	{PAR_FOLLOW, "FOLLOW", 0, "Follow Path", ""},
+	{PAR_PATH_CONST, "PATH_CONST", 0, "Path Constraint", ""},
+	{PAR_LATTICE, "LATTICE", 0, "Lattice Deform", ""},
+	{PAR_VERTEX, "VERTEX", 0, "Vertex", ""},
+	{PAR_TRIA, "TRIA", 0, "Triangle", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int test_parent_loop(Object *par, Object *ob)
+{
+	/* test if 'ob' is a parent somewhere in par's parents */
+	
+	if(par == NULL) return 0;
+	if(ob == par) return 1;
+	
+	return test_parent_loop(par->parent, ob);
+}
+
+void ED_object_parent(Object *ob, Object *par, int type, const char *substr)
+{
+	if(!par || test_parent_loop(par, ob)) {
+		ob->parent= NULL;
+		ob->partype= PAROBJECT;
+		ob->parsubstr[0]= 0;
+		return;
+	}
+
+	/* this could use some more checks */
+
+	ob->parent= par;
+	ob->partype &= ~PARTYPE;
+	ob->partype |= type;
+	BLI_strncpy(ob->parsubstr, substr, sizeof(ob->parsubstr));
+}
+
+static int parent_set_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *par= CTX_data_active_object(C);
+	bPoseChannel *pchan= NULL;
+	int partype= RNA_enum_get(op->ptr, "type");
+	int pararm= ELEM4(partype, PAR_ARMATURE, PAR_ARMATURE_NAME, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO);
+	
+	par->recalc |= OB_RECALC_OB;
+	
+	/* preconditions */
+	if(partype==PAR_FOLLOW || partype==PAR_PATH_CONST) {
+		if(par->type!=OB_CURVE)
+			return OPERATOR_CANCELLED;
+		else {
+			Curve *cu= par->data;
+			
+			if((cu->flag & CU_PATH)==0) {
+				cu->flag |= CU_PATH|CU_FOLLOW;
+				makeDispListCurveTypes(scene, par, 0);  /* force creation of path data */
+			}
+			else cu->flag |= CU_FOLLOW;
+			
+			/* fall back on regular parenting now */
+			partype= PAR_OBJECT;
+		}		
+	}
+	else if(partype==PAR_BONE) {
+		pchan= get_active_posechannel(par);
+		
+		if(pchan==NULL) {
+			BKE_report(op->reports, RPT_ERROR, "No active Bone");
+			return OPERATOR_CANCELLED;
+		}
+	}
+	
+	/* context itterator */
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		
+		if(ob!=par) {
+			
+			if( test_parent_loop(par, ob) ) {
+				BKE_report(op->reports, RPT_ERROR, "Loop in parents");
+			}
+			else {
+				Object workob;
+				
+				/* apply transformation of previous parenting */
+				ED_object_apply_obmat(ob);
+				
+				ob->parent= par;
+				
+				/* handle types */
+				if (pchan)
+					strcpy (ob->parsubstr, pchan->name);
+				else
+					ob->parsubstr[0]= 0;
+				
+				/* constraint */
+				if(partype==PAR_PATH_CONST) {
+					bConstraint *con;
+					bFollowPathConstraint *data;
+					float cmat[4][4], vec[3];
+					
+					con = add_new_constraint(CONSTRAINT_TYPE_FOLLOWPATH);
+					strcpy (con->name, "AutoPath");
+					
+					data = con->data;
+					data->tar = par;
+					
+					add_constraint_to_object(con, ob);
+					
+					get_constraint_target_matrix(con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra - give_timeoffset(ob));
+					VecSubf(vec, ob->obmat[3], cmat[3]);
+					
+					ob->loc[0] = vec[0];
+					ob->loc[1] = vec[1];
+				}
+				else if(pararm && ob->type==OB_MESH && par->type == OB_ARMATURE) {
+					if(partype == PAR_ARMATURE_NAME)
+						create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_NAME);
+					else if(partype == PAR_ARMATURE_ENVELOPE)
+						create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_ENVELOPE);
+					else if(partype == PAR_ARMATURE_AUTO)
+						create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_AUTO);
+					
+					/* get corrected inverse */
+					ob->partype= PAROBJECT;
+					what_does_parent(scene, ob, &workob);
+					
+					ob->partype= PARSKEL;
+
+					Mat4Invert(ob->parentinv, workob.obmat);
+				}
+				else {
+					/* calculate inverse parent matrix */
+					what_does_parent(scene, ob, &workob);
+					Mat4Invert(ob->parentinv, workob.obmat);
+				}
+				
+				ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA;
+				
+				if( ELEM(partype, PAR_CURVE, PAR_LATTICE) || pararm )
+					ob->partype= PARSKEL; /* note, dna define, not operator property */
+				else
+					ob->partype= PAROBJECT;	/* note, dna define, not operator property */
+			}
+		}
+	}
+	CTX_DATA_END;
+	
+	DAG_scene_sort(CTX_data_scene(C));
+	ED_anim_dag_flush_update(C);
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	
+	return OPERATOR_FINISHED;
+}
+
+static int parent_set_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Object *ob= CTX_data_active_object(C);
+	uiPopupMenu *pup= uiPupMenuBegin(C, "Set Parent To", 0);
+	uiLayout *layout= uiPupMenuLayout(pup);
+	
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
+	uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_OBJECT);
+	
+	/* ob becomes parent, make the associated menus */
+	if(ob->type==OB_ARMATURE) {
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE);
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE_NAME);
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE_ENVELOPE);
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_ARMATURE_AUTO);
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_BONE);
+	}
+	else if(ob->type==OB_CURVE) {
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_CURVE);
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_FOLLOW);
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_PATH_CONST);
+	}
+	else if(ob->type == OB_LATTICE) {
+		uiItemEnumO(layout, NULL, 0, "OBJECT_OT_parent_set", "type", PAR_LATTICE);
+	}
+	
+	uiPupMenuEnd(C, pup);
+	
+	return OPERATOR_CANCELLED;
+}
+
+
+void OBJECT_OT_parent_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Make Parent";
+	ot->description = "Set the object's parenting.";
+	ot->idname= "OBJECT_OT_parent_set";
+	
+	/* api callbacks */
+	ot->invoke= parent_set_invoke;
+	ot->exec= parent_set_exec;
+	
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", "");
+}
+
+/************************ Clear Slow Parent Operator *********************/
+
+static int object_slow_parent_clear_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(ob->parent) {
+			if(ob->partype & PARSLOW) {
+				ob->partype -= PARSLOW;
+				where_is_object(scene, ob);
+				ob->partype |= PARSLOW;
+				ob->recalc |= OB_RECALC_OB;
+			}
+		}
+	}
+	CTX_DATA_END;
+
+	ED_anim_dag_flush_update(C);	
+	WM_event_add_notifier(C, NC_SCENE, scene);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_slow_parent_clear(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Clear Slow Parent";
+	ot->description = "Clear the object's slow parent.";
+	ot->idname= "OBJECT_OT_slow_parent_clear";
+	
+	/* api callbacks */
+	ot->invoke= WM_operator_confirm;
+	ot->exec= object_slow_parent_clear_exec;
+	ot->poll= ED_operator_view3d_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/********************** Make Slow Parent Operator *********************/
+
+static int object_slow_parent_set_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(ob->parent)
+			ob->partype |= PARSLOW;
+
+		ob->recalc |= OB_RECALC_OB;
+		
+	}
+	CTX_DATA_END;
+
+	ED_anim_dag_flush_update(C);	
+	WM_event_add_notifier(C, NC_SCENE, scene);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_slow_parent_set(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Set Slow Parent";
+	ot->description = "Set the object's slow parent.";
+	ot->idname= "OBJECT_OT_slow_parent_set";
+	
+	/* api callbacks */
+	ot->invoke= WM_operator_confirm;
+	ot->exec= object_slow_parent_set_exec;
+	ot->poll= ED_operator_view3d_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/* ******************** Clear Track Operator ******************* */
+
+static EnumPropertyItem prop_clear_track_types[] = {
+	{0, "CLEAR", 0, "Clear Track", ""},
+	{1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+/* note, poll should check for editable scene */
+static int object_track_clear_exec(bContext *C, wmOperator *op)
+{
+	int type= RNA_enum_get(op->ptr, "type");
+
+	if(CTX_data_edit_object(C)) {
+		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
+		return OPERATOR_CANCELLED;
+	}
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		ob->track= NULL;
+		ob->recalc |= OB_RECALC;
+		
+		if(type == 1)
+			ED_object_apply_obmat(ob);
+	}
+	CTX_DATA_END;
+
+	DAG_scene_sort(CTX_data_scene(C));
+	ED_anim_dag_flush_update(C);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_track_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Clear track";
+	ot->description = "Clear tracking constraint or flag from object.";
+	ot->idname= "OBJECT_OT_track_clear";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_track_clear_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", "");
+}
+
+/************************** Make Track Operator *****************************/
+
+static EnumPropertyItem prop_make_track_types[] = {
+	{1, "TRACKTO", 0, "TrackTo Constraint", ""},
+	{2, "LOCKTRACK", 0, "LockTrack Constraint", ""},
+	{3, "OLDTRACK", 0, "Old Track", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int track_set_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	int type= RNA_enum_get(op->ptr, "type");
+		
+	if(type == 1) {
+		bConstraint *con;
+		bTrackToConstraint *data;
+
+		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			if(base!=BASACT) {
+				con = add_new_constraint(CONSTRAINT_TYPE_TRACKTO);
+				strcpy (con->name, "AutoTrack");
+
+				data = con->data;
+				data->tar = BASACT->object;
+				base->object->recalc |= OB_RECALC;
+				
+				/* Lamp and Camera track differently by default */
+				if (base->object->type == OB_LAMP || base->object->type == OB_CAMERA) {
+					data->reserved1 = TRACK_nZ;
+					data->reserved2 = UP_Y;
+				}
+
+				add_constraint_to_object(con, base->object);
+			}
+		}
+		CTX_DATA_END;
+	}
+	else if(type == 2) {
+		bConstraint *con;
+		bLockTrackConstraint *data;
+
+		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			if(base!=BASACT) {
+				con = add_new_constraint(CONSTRAINT_TYPE_LOCKTRACK);
+				strcpy (con->name, "AutoTrack");
+
+				data = con->data;
+				data->tar = BASACT->object;
+				base->object->recalc |= OB_RECALC;
+				
+				/* Lamp and Camera track differently by default */
+				if (base->object->type == OB_LAMP || base->object->type == OB_CAMERA) {
+					data->trackflag = TRACK_nZ;
+					data->lockflag = LOCK_Y;
+				}
+
+				add_constraint_to_object(con, base->object);
+			}
+		}
+		CTX_DATA_END;
+	}
+	else {
+		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			if(base!=BASACT) {
+				base->object->track= BASACT->object;
+				base->object->recalc |= OB_RECALC;
+			}
+		}
+		CTX_DATA_END;
+	}
+	DAG_scene_sort(CTX_data_scene(C));
+	ED_anim_dag_flush_update(C);	
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_track_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Make Track";
+	ot->description = "Make the object track another object, either by constraint or old way or locked track.";
+	ot->idname= "OBJECT_OT_track_set";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= track_set_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", "");
+}
+
+/************************** Move to Layer Operator *****************************/
+
+static unsigned int move_to_layer_init(bContext *C, wmOperator *op)
+{
+	int values[20], a;
+	unsigned int lay= 0;
+
+	if(!RNA_property_is_set(op->ptr, "layer")) {
+		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			lay |= base->lay;
+		}
+		CTX_DATA_END;
+
+		for(a=0; a<20; a++)
+			values[a]= (lay & (1<<a));
+		
+		RNA_boolean_set_array(op->ptr, "layer", values);
+	}
+	else {
+		RNA_boolean_get_array(op->ptr, "layer", values);
+
+		for(a=0; a<20; a++)
+			if(values[a])
+				lay |= (1 << a);
+	}
+
+	return lay;
+}
+
+static int move_to_layer_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	move_to_layer_init(C, op);
+	return WM_operator_props_popup(C, op, event);
+}
+
+static int move_to_layer_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	View3D *v3d= CTX_wm_view3d(C);
+	unsigned int lay, local;
+	int islamp= 0;
+	
+	lay= move_to_layer_init(C, op);
+	lay &= 0xFFFFFF;
+
+	if(lay==0) return OPERATOR_CANCELLED;
+	
+	if(v3d && v3d->localview) {
+		/* now we can move out of localview. */
+		// XXX if (!okee("Move from localview")) return;
+		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			lay= base->lay & ~v3d->lay;
+			base->lay= lay;
+			base->object->lay= lay;
+			base->object->flag &= ~SELECT;
+			base->flag &= ~SELECT;
+			if(base->object->type==OB_LAMP) islamp= 1;
+		}
+		CTX_DATA_END;
+	}
+	else {
+		/* normal non localview operation */
+		CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			/* upper byte is used for local view */
+			local= base->lay & 0xFF000000;  
+			base->lay= lay + local;
+			base->object->lay= lay;
+			if(base->object->type==OB_LAMP) islamp= 1;
+		}
+		CTX_DATA_END;
+	}
+
+	if(islamp) reshadeall_displist(scene);	/* only frees */
+	
+	/* warning, active object may be hidden now */
+	
+	WM_event_add_notifier(C, NC_SCENE, scene);
+	DAG_scene_sort(scene);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_move_to_layer(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Move to Layer";
+	ot->description = "Move the object to different layers.";
+	ot->idname= "OBJECT_OT_move_to_layer";
+	
+	/* api callbacks */
+	ot->invoke= move_to_layer_invoke;
+	ot->exec= move_to_layer_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_boolean_array(ot->srna, "layer", 20, NULL, "Layer", "");
+	/* XXX boolean layer subtype, behavior */
+}
+
+/************************** Link to Scene Operator *****************************/
+
+void link_to_scene(unsigned short nr)
+{
+#if 0
+	Scene *sce= (Scene*) BLI_findlink(&G.main->scene, G.curscreen->scenenr-1);
+	Base *base, *nbase;
+	
+	if(sce==0) return;
+	if(sce->id.lib) return;
+	
+	for(base= FIRSTBASE; base; base= base->next) {
+		if(TESTBASE(v3d, base)) {
+			
+			nbase= MEM_mallocN( sizeof(Base), "newbase");
+			*nbase= *base;
+			BLI_addhead( &(sce->base), nbase);
+			id_us_plus((ID *)base->object);
+		}
+	}
+#endif
+}
+
+
+void make_links(bContext *C, wmOperator *op, Scene *scene, View3D *v3d, short event)
+{
+	Object *ob, *obt;
+	Base *base, *nbase, *sbase;
+	Scene *sce = NULL;
+	ID *id;
+	int a;
+	short nr=0;
+	char *strp;
+
+	if(!(ob=OBACT)) return;
+
+	if(event==1) {
+		IDnames_to_pupstring(&strp, NULL, NULL, &(G.main->scene), 0, &nr);
+		
+		if(nr == -2) {
+			MEM_freeN(strp);
+
+// XXX			activate_databrowse((ID *)scene, ID_SCE, 0, B_INFOSCE, &(G.curscreen->scenenr), link_to_scene );
+			
+			return;			
+		}
+		else {
+			event= pupmenu_col(strp, 20);
+			MEM_freeN(strp);
+		
+			if(event<= 0) return;
+		
+			nr= 1;
+			sce= G.main->scene.first;
+			while(sce) {
+				if(nr==event) break;
+				nr++;
+				sce= sce->id.next;
+			}
+			if(sce==scene) {
+				BKE_report(op->reports, RPT_ERROR, "This is the current scene");
+				return;
+			}
+			if(sce==0 || sce->id.lib) return;
+			
+			/* remember: is needed below */
+			event= 1;
+		}
+	}
+
+	/* All non group linking */
+	for(base= FIRSTBASE; base; base= base->next) {
+		if(event==1 || base != BASACT) {
+			
+			obt= base->object;
+
+			if(TESTBASE(v3d, base)) {
+				
+				if(event==1) {		/* to scene */
+					
+					/* test if already linked */
+					sbase= sce->base.first;
+					while(sbase) {
+						if(sbase->object==base->object) break;
+						sbase= sbase->next;
+					}
+					if(sbase) {	/* remove */
+						continue;
+					}
+					
+					nbase= MEM_mallocN( sizeof(Base), "newbase");
+					*nbase= *base;
+					BLI_addhead( &(sce->base), nbase);
+					id_us_plus((ID *)base->object);
+				}
+			}
+			if(TESTBASELIB(v3d, base)) {
+				if(event==2 || event==5) {  /* obdata */
+					if(ob->type==obt->type) {
+						
+							id= obt->data;
+							id->us--;
+							
+							id= ob->data;
+							id_us_plus(id);
+							obt->data= id;
+							
+							/* if amount of material indices changed: */
+							test_object_materials(obt->data);
+
+							obt->recalc |= OB_RECALC_DATA;
+						}
+					}
+				else if(event==4) {  /* ob ipo */
+#if 0 // XXX old animation system
+					if(obt->ipo) obt->ipo->id.us--;
+					obt->ipo= ob->ipo;
+					if(obt->ipo) {
+						id_us_plus((ID *)obt->ipo);
+						do_ob_ipo(scene, obt);
+					}
+#endif // XXX old animation system
+				}
+				else if(event==6) {
+					if(ob->dup_group) ob->dup_group->id.us--;
+					obt->dup_group= ob->dup_group;
+					if(obt->dup_group) {
+						id_us_plus((ID *)obt->dup_group);
+						obt->transflag |= OB_DUPLIGROUP;
+					}
+				}
+				else if(event==3) {  /* materials */
+					
+					/* new approach, using functions from kernel */
+					for(a=0; a<ob->totcol; a++) {
+						Material *ma= give_current_material(ob, a+1);
+						assign_material(obt, ma, a+1);	/* also works with ma==NULL */
+					}
+				}
+			}
+		}
+	}
+	
+	ED_anim_dag_flush_update(C);	
+
+}
+
+void make_links_menu(bContext *C, Scene *scene, View3D *v3d)
+{
+	Object *ob;
+	short event=0;
+	char str[140];
+	
+	if(!(ob=OBACT)) return;
+	
+	strcpy(str, "Make Links %t|To Scene...%x1|%l|Object Ipo%x4");
+	
+	if(ob->type==OB_MESH)
+		strcat(str, "|Mesh Data%x2|Materials%x3");
+	else if(ob->type==OB_CURVE)
+		strcat(str, "|Curve Data%x2|Materials%x3");
+	else if(ob->type==OB_FONT)
+		strcat(str, "|Text Data%x2|Materials%x3");
+	else if(ob->type==OB_SURF)
+		strcat(str, "|Surface Data%x2|Materials%x3");
+	else if(ob->type==OB_MBALL)
+		strcat(str, "|Materials%x3");
+	else if(ob->type==OB_CAMERA)
+		strcat(str, "|Camera Data%x2");
+	else if(ob->type==OB_LAMP)
+		strcat(str, "|Lamp Data%x2");
+	else if(ob->type==OB_LATTICE)
+		strcat(str, "|Lattice Data%x2");
+	else if(ob->type==OB_ARMATURE)
+		strcat(str, "|Armature Data%x2");
+	
+	event= pupmenu(str);
+	
+	if(event<= 0) return;
+	
+	make_links(C, NULL, scene, v3d, event);
+}
+
+/**************************** Make Single User ********************************/
+
+static void single_object_users__forwardModifierLinks(void *userData, Object *ob, Object **obpoin)
+{
+	ID_NEW(*obpoin);
+}
+
+void single_object_users(Scene *scene, View3D *v3d, int flag)	
+{
+	Base *base;
+	Object *ob, *obn;
+	
+	clear_sca_new_poins();	/* sensor/contr/act */
+
+	/* duplicate (must set newid) */
+	for(base= FIRSTBASE; base; base= base->next) {
+		ob= base->object;
+		
+		if( (base->flag & flag)==flag ) {
+			if(ob->id.lib==NULL && ob->id.us>1) {
+				/* base gets copy of object */
+				obn= copy_object(ob);
+				base->object= obn;
+				ob->id.us--;
+			}
+		}
+	}
+	
+	ID_NEW(scene->camera);
+	if(v3d) ID_NEW(v3d->camera);
+	
+	/* object pointers */
+	for(base= FIRSTBASE; base; base= base->next) {
+		ob= base->object;
+		if(ob->id.lib==NULL) {
+			relink_constraints(&base->object->constraints);
+			if (base->object->pose){
+				bPoseChannel *chan;
+				for (chan = base->object->pose->chanbase.first; chan; chan=chan->next){
+					relink_constraints(&chan->constraints);
+				}
+			}
+			modifiers_foreachObjectLink(base->object, single_object_users__forwardModifierLinks, NULL);
+			
+			ID_NEW(ob->parent);
+			ID_NEW(ob->track);
+		}
+	}
+
+	set_sca_new_poins();
+}
+
+void new_id_matar(Material **matar, int totcol)
+{
+	ID *id;
+	int a;
+	
+	for(a=0; a<totcol; a++) {
+		id= (ID *)matar[a];
+		if(id && id->lib==0) {
+			if(id->newid) {
+				matar[a]= (Material *)id->newid;
+				id_us_plus(id->newid);
+				id->us--;
+			}
+			else if(id->us>1) {
+				matar[a]= copy_material(matar[a]);
+				id->us--;
+				id->newid= (ID *)matar[a];
+			}
+		}
+	}
+}
+
+void single_obdata_users(Scene *scene, int flag)
+{
+	Object *ob;
+	Lamp *la;
+	Curve *cu;
+	//Camera *cam;
+	Base *base;
+	Mesh *me;
+	ID *id;
+	int a;
+
+	for(base= FIRSTBASE; base; base= base->next) {
+		ob= base->object;
+		if(ob->id.lib==NULL && (base->flag & flag)==flag ) {
+			id= ob->data;
+			
+			if(id && id->us>1 && id->lib==0) {
+				ob->recalc= OB_RECALC_DATA;
+				
+				switch(ob->type) {
+				case OB_LAMP:
+					if(id && id->us>1 && id->lib==NULL) {
+						ob->data= la= copy_lamp(ob->data);
+						for(a=0; a<MAX_MTEX; a++) {
+							if(la->mtex[a]) {
+								ID_NEW(la->mtex[a]->object);
+							}
+						}
+					}
+					break;
+				case OB_CAMERA:
+					ob->data= copy_camera(ob->data);
+					break;
+				case OB_MESH:
+					me= ob->data= copy_mesh(ob->data);
+					//if(me && me->key)
+					//	ipo_idnew(me->key->ipo);	/* drivers */
+					break;
+				case OB_MBALL:
+					ob->data= copy_mball(ob->data);
+					break;
+				case OB_CURVE:
+				case OB_SURF:
+				case OB_FONT:
+					ob->data= cu= copy_curve(ob->data);
+					ID_NEW(cu->bevobj);
+					ID_NEW(cu->taperobj);
+					break;
+				case OB_LATTICE:
+					ob->data= copy_lattice(ob->data);
+					break;
+				case OB_ARMATURE:
+					ob->recalc |= OB_RECALC_DATA;
+					ob->data= copy_armature(ob->data);
+					armature_rebuild_pose(ob, ob->data);
+					break;
+				default:
+					printf("ERROR single_obdata_users: can't copy %s\n", id->name);
+					return;
+				}
+				
+				id->us--;
+				id->newid= ob->data;
+				
+			}
+			
+#if 0 // XXX old animation system
+			id= (ID *)ob->action;
+			if (id && id->us>1 && id->lib==NULL){
+				if(id->newid){
+					ob->action= (bAction *)id->newid;
+					id_us_plus(id->newid);
+				}
+				else {
+					ob->action= copy_action(ob->action);
+					id->us--;
+					id->newid=(ID *)ob->action;
+				}
+			}
+			id= (ID *)ob->ipo;
+			if(id && id->us>1 && id->lib==NULL) {
+				if(id->newid) {
+					ob->ipo= (Ipo *)id->newid;
+					id_us_plus(id->newid);
+				}
+				else {
+					ob->ipo= copy_ipo(ob->ipo);
+					id->us--;
+					id->newid= (ID *)ob->ipo;
+				}
+				ipo_idnew(ob->ipo);	/* drivers */
+			}
+			/* other ipos */
+			switch(ob->type) {
+			case OB_LAMP:
+				la= ob->data;
+				if(la->ipo && la->ipo->id.us>1) {
+					la->ipo->id.us--;
+					la->ipo= copy_ipo(la->ipo);
+					ipo_idnew(la->ipo);	/* drivers */
+				}
+				break;
+			case OB_CAMERA:
+				cam= ob->data;
+				if(cam->ipo && cam->ipo->id.us>1) {
+					cam->ipo->id.us--;
+					cam->ipo= copy_ipo(cam->ipo);
+					ipo_idnew(cam->ipo);	/* drivers */
+				}
+				break;
+			}
+#endif // XXX old animation system
+		}
+	}
+	
+	me= G.main->mesh.first;
+	while(me) {
+		ID_NEW(me->texcomesh);
+		me= me->id.next;
+	}
+}
+
+void single_ipo_users(Scene *scene, int flag)
+{
+#if 0 // XXX old animation system
+	Object *ob;
+	Base *base;
+	ID *id;
+	
+	for(base= FIRSTBASE; base; base= base->next) {
+		ob= base->object;
+		if(ob->id.lib==NULL && (flag==0 || (base->flag & SELECT)) ) {
+			ob->recalc= OB_RECALC_DATA;
+			
+			id= (ID *)ob->ipo;
+			if(id && id->us>1 && id->lib==NULL) {
+				ob->ipo= copy_ipo(ob->ipo);
+				id->us--;
+				ipo_idnew(ob->ipo);	/* drivers */
+			}
+		}
+	}
+#endif // XXX old animation system
+}
+
+void single_mat_users(Scene *scene, int flag)
+{
+	Object *ob;
+	Base *base;
+	Material *ma, *man;
+	Tex *tex;
+	int a, b;
+	
+	for(base= FIRSTBASE; base; base= base->next) {
+		ob= base->object;
+		if(ob->id.lib==NULL && (flag==0 || (base->flag & SELECT)) ) {
+	
+			for(a=1; a<=ob->totcol; a++) {
+				ma= give_current_material(ob, a);
+				if(ma) {
+					/* do not test for LIB_NEW: this functions guaranteed delivers single_users! */
+					
+					if(ma->id.us>1) {
+						man= copy_material(ma);
+					
+						man->id.us= 0;
+						assign_material(ob, man, a);
+	
+#if 0 // XXX old animation system						
+						if(ma->ipo) {
+							man->ipo= copy_ipo(ma->ipo);
+							ma->ipo->id.us--;
+							ipo_idnew(ma->ipo);	/* drivers */
+						}
+#endif // XXX old animation system
+						
+						for(b=0; b<MAX_MTEX; b++) {
+							if(ma->mtex[b] && ma->mtex[b]->tex) {
+								tex= ma->mtex[b]->tex;
+								if(tex->id.us>1) {
+									ma->mtex[b]->tex= copy_texture(tex);
+									tex->id.us--;
+								}
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+}
+
+void do_single_tex_user(Tex **from)
+{
+	Tex *tex, *texn;
+	
+	tex= *from;
+	if(tex==0) return;
+	
+	if(tex->id.newid) {
+		*from= (Tex *)tex->id.newid;
+		id_us_plus(tex->id.newid);
+		tex->id.us--;
+	}
+	else if(tex->id.us>1) {
+		texn= copy_texture(tex);
+		tex->id.newid= (ID *)texn;
+		tex->id.us--;
+		*from= texn;
+	}
+}
+
+void single_tex_users_expand()
+{
+	/* only when 'parent' blocks are LIB_NEW */
+	Main *bmain= G.main;
+	Material *ma;
+	Lamp *la;
+	World *wo;
+	int b;
+		
+	for(ma= bmain->mat.first; ma; ma=ma->id.next) {
+		if(ma->id.flag & LIB_NEW) {
+			for(b=0; b<MAX_MTEX; b++) {
+				if(ma->mtex[b] && ma->mtex[b]->tex) {
+					do_single_tex_user( &(ma->mtex[b]->tex) );
+				}
+			}
+		}
+	}
+
+	for(la= bmain->lamp.first; la; la=la->id.next) {
+		if(la->id.flag & LIB_NEW) {
+			for(b=0; b<MAX_MTEX; b++) {
+				if(la->mtex[b] && la->mtex[b]->tex) {
+					do_single_tex_user( &(la->mtex[b]->tex) );
+				}
+			}
+		}
+	}
+
+	for(wo= bmain->world.first; wo; wo=wo->id.next) {
+		if(wo->id.flag & LIB_NEW) {
+			for(b=0; b<MAX_MTEX; b++) {
+				if(wo->mtex[b] && wo->mtex[b]->tex) {
+					do_single_tex_user( &(wo->mtex[b]->tex) );
+				}
+			}
+		}
+	}
+}
+
+static void single_mat_users_expand(void)
+{
+	/* only when 'parent' blocks are LIB_NEW */
+	Main *bmain= G.main;
+	Object *ob;
+	Mesh *me;
+	Curve *cu;
+	MetaBall *mb;
+	Material *ma;
+	int a;
+	
+	for(ob=bmain->object.first; ob; ob=ob->id.next)
+		if(ob->id.flag & LIB_NEW)
+			new_id_matar(ob->mat, ob->totcol);
+
+	for(me=bmain->mesh.first; me; me=me->id.next)
+		if(me->id.flag & LIB_NEW)
+			new_id_matar(me->mat, me->totcol);
+
+	for(cu=bmain->curve.first; cu; cu=cu->id.next)
+		if(cu->id.flag & LIB_NEW)
+			new_id_matar(cu->mat, cu->totcol);
+
+	for(mb=bmain->mball.first; mb; mb=mb->id.next)
+		if(mb->id.flag & LIB_NEW)
+			new_id_matar(mb->mat, mb->totcol);
+
+	/* material imats  */
+	for(ma=bmain->mat.first; ma; ma=ma->id.next)
+		if(ma->id.flag & LIB_NEW)
+			for(a=0; a<MAX_MTEX; a++)
+				if(ma->mtex[a])
+					ID_NEW(ma->mtex[a]->object);
+}
+
+void single_user(Scene *scene, View3D *v3d)
+{
+	int nr;
+	
+	if(scene->id.lib) return;
+
+	clear_id_newpoins();
+	
+	nr= pupmenu("Make Single User%t|Object|Object & ObData|Object & ObData & Materials+Tex|Materials+Tex|Ipos");
+	if(nr>0) {
+	
+		if(nr==1) single_object_users(scene, v3d, 1);
+	
+		else if(nr==2) {
+			single_object_users(scene, v3d, 1);
+			single_obdata_users(scene, 1);
+		}
+		else if(nr==3) {
+			single_object_users(scene, v3d, 1);
+			single_obdata_users(scene, 1);
+			single_mat_users(scene, 1); /* also tex */
+			
+		}
+		else if(nr==4) {
+			single_mat_users(scene, 1);
+		}
+		else if(nr==5) {
+			single_ipo_users(scene, 1);
+		}
+		
+		
+		clear_id_newpoins();
+
+	}
+}
+
+/* used for copying scenes */
+void ED_object_single_users(Scene *scene, int full)
+{
+    single_object_users(scene, NULL, 0);
+
+    if(full) {
+        single_obdata_users(scene, 0);
+        single_mat_users_expand();
+        single_tex_users_expand();
+    }
+
+	clear_id_newpoins();
+}
+
+/******************************* Make Local ***********************************/
+
+/* helper for below, ma was checked to be not NULL */
+static void make_local_makelocalmaterial(Material *ma)
+{
+	AnimData *adt;
+	int b;
+	
+	id_make_local(&ma->id, 0);
+	
+	for(b=0; b<MAX_MTEX; b++)
+		if(ma->mtex[b] && ma->mtex[b]->tex)
+			id_make_local(&ma->mtex[b]->tex->id, 0);
+	
+	adt= BKE_animdata_from_id(&ma->id);
+	if(adt) BKE_animdata_make_local(adt);
+
+	/* nodetree? XXX */
+}
+
+static int make_local_exec(bContext *C, wmOperator *op)
+{
+	AnimData *adt;
+	ParticleSystem *psys;
+	Material *ma, ***matarar;
+	Lamp *la;
+	ID *id;
+	int a, b, mode= RNA_boolean_get(op->ptr, "type");
+	
+	if(mode==3) {
+		all_local(NULL, 0);	/* NULL is all libs */
+		WM_event_add_notifier(C, NC_WINDOW, NULL);
+		return OPERATOR_FINISHED;
+	}
+
+	clear_id_newpoins();
+	
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(ob->id.lib)
+			id_make_local(&ob->id, 0);
+	}
+	CTX_DATA_END;
+	
+	/* maybe object pointers */
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(ob->id.lib==NULL) {
+			ID_NEW(ob->parent);
+			ID_NEW(ob->track);
+		}
+	}
+	CTX_DATA_END;
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		id= ob->data;
+			
+		if(id && mode>1) {
+			id_make_local(id, 0);
+			adt= BKE_animdata_from_id(id);
+			if(adt) BKE_animdata_make_local(adt);
+		}
+
+		for(psys=ob->particlesystem.first; psys; psys=psys->next)
+			id_make_local(&psys->part->id, 0);
+
+		adt= BKE_animdata_from_id(&ob->id);
+		if(adt) BKE_animdata_make_local(adt);
+	}
+	CTX_DATA_END;
+
+	if(mode>1) {
+		CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+			if(ob->type==OB_LAMP) {
+				la= ob->data;
+
+				for(b=0; b<MAX_MTEX; b++)
+					if(la->mtex[b] && la->mtex[b]->tex)
+						id_make_local(&la->mtex[b]->tex->id, 0);
+			}
+			else {
+				for(a=0; a<ob->totcol; a++) {
+					ma= ob->mat[a];
+					if(ma)
+						make_local_makelocalmaterial(ma);
+				}
+				
+				matarar= (Material ***)give_matarar(ob);
+				if(matarar) {
+					for(a=0; a<ob->totcol; a++) {
+						ma= (*matarar)[a];
+						if(ma)
+							make_local_makelocalmaterial(ma);
+					}
+				}
+			}
+		}
+		CTX_DATA_END;
+	}
+
+	WM_event_add_notifier(C, NC_WINDOW, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_make_local(wmOperatorType *ot)
+{
+	static EnumPropertyItem type_items[]= {
+		{1, "SELECTED_OBJECTS", 0, "Selected Objects", ""},
+		{2, "SELECTED_OBJECTS_DATA", 0, "Selected Objects and Data", ""},
+		{3, "ALL", 0, "All", ""},
+		{0, NULL, 0, NULL, NULL}};
+
+	/* identifiers */
+	ot->name= "Make Local";
+	ot->description = "Make library linked datablocks local to this file.";
+	ot->idname= "OBJECT_OT_make_local";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= make_local_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
+}
+
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
new file mode 100644
index 00000000000..50ba4ab2934
--- /dev/null
+++ b/source/blender/editors/object/object_select.c
@@ -0,0 +1,974 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, 2002-2008 full recode
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "DNA_group_types.h"
+#include "DNA_material_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+#include "DNA_property_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_texture_types.h"
+
+#include "BLI_arithb.h"
+#include "BLI_listbase.h"
+#include "BLI_rand.h"
+#include "BLI_string.h"
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_global.h"
+#include "BKE_group.h"
+#include "BKE_main.h"
+#include "BKE_material.h"
+#include "BKE_particle.h"
+#include "BKE_property.h"
+#include "BKE_report.h"
+#include "BKE_scene.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_object.h"
+#include "ED_screen.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "object_intern.h"
+
+/************************ Exported **************************/
+
+/* simple API for object selection, rather than just using the flag
+ * this takes into account the 'restrict selection in 3d view' flag.
+ * deselect works always, the restriction just prevents selection */
+
+/* Note: send a NC_SCENE|ND_OB_SELECT notifier yourself! */
+
+void ED_base_object_select(Base *base, short mode)
+{
+	if (base) {
+		if (mode==BA_SELECT) {
+			if (!(base->object->restrictflag & OB_RESTRICT_SELECT))
+				if (mode==BA_SELECT) base->flag |= SELECT;
+		}
+		else if (mode==BA_DESELECT) {
+			base->flag &= ~SELECT;
+		}
+		base->object->flag= base->flag;
+	}
+}
+
+/* also to set active NULL */
+void ED_base_object_activate(bContext *C, Base *base)
+{
+	Scene *scene= CTX_data_scene(C);
+	Base *tbase;
+	
+	/* sets scene->basact */
+	BASACT= base;
+	
+	if(base) {
+		
+		/* XXX old signals, remember to handle notifiers now! */
+		//		select_actionchannel_by_name(base->object->action, "Object", 1);
+		
+		/* disable temporal locks */
+		for(tbase=FIRSTBASE; tbase; tbase= tbase->next) {
+			if(base!=tbase && (tbase->object->shapeflag & OB_SHAPE_TEMPLOCK)) {
+				tbase->object->shapeflag &= ~OB_SHAPE_TEMPLOCK;
+				DAG_id_flush_update(&tbase->object->id, OB_RECALC_DATA);
+			}
+		}
+		WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
+	}
+	else
+		WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, NULL);
+}
+
+/********************** Selection Operators **********************/
+
+static EnumPropertyItem prop_select_types[] = {
+	{0, "EXCLUSIVE", 0, "Exclusive", ""},
+	{1, "EXTEND", 0, "Extend", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+/************************ Select by Type *************************/
+
+static int object_select_by_type_exec(bContext *C, wmOperator *op)
+{
+	short obtype, seltype;
+	
+	obtype = RNA_enum_get(op->ptr, "type");
+	seltype = RNA_enum_get(op->ptr, "seltype");
+		
+	if (seltype == 0) {
+		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+			ED_base_object_select(base, BA_DESELECT);
+		}
+		CTX_DATA_END;
+	}
+	
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if(base->object->type==obtype) {
+			ED_base_object_select(base, BA_SELECT);
+		}
+	}
+	CTX_DATA_END;
+	
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_by_type(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Select By Type";
+	ot->description = "Select all visible objects that are of a type.";
+	ot->idname= "OBJECT_OT_select_by_type";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_select_by_type_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 0, "Selection", "Extend selection or clear selection then select");
+	RNA_def_enum(ot->srna, "type", object_type_items, 1, "Type", "");
+
+}
+
+/*********************** Selection by Links *********************/
+
+static EnumPropertyItem prop_select_linked_types[] = {
+	{1, "IPO", 0, "Object IPO", ""}, // XXX depreceated animation system stuff...
+	{2, "OBDATA", 0, "Ob Data", ""},
+	{3, "MATERIAL", 0, "Material", ""},
+	{4, "TEXTURE", 0, "Texture", ""},
+	{5, "DUPGROUP", 0, "Dupligroup", ""},
+	{6, "PARTICLE", 0, "Particle System", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int object_select_linked_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob;
+	void *obdata = NULL;
+	Material *mat = NULL, *mat1;
+	Tex *tex=0;
+	int a, b;
+	int nr = RNA_enum_get(op->ptr, "type");
+	short changed = 0, seltype;
+	/* events (nr):
+	 * Object Ipo: 1
+	 * ObData: 2
+	 * Current Material: 3
+	 * Current Texture: 4
+	 * DupliGroup: 5
+	 * PSys: 6
+	 */
+
+	seltype = RNA_enum_get(op->ptr, "seltype");
+	
+	if (seltype == 0) {
+		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+			ED_base_object_select(base, BA_DESELECT);
+		}
+		CTX_DATA_END;
+	}
+	
+	ob= OBACT;
+	if(ob==0){ 
+		BKE_report(op->reports, RPT_ERROR, "No Active Object");
+		return OPERATOR_CANCELLED;
+	}
+	
+	if(nr==1) {	
+			// XXX old animation system
+		//ipo= ob->ipo;
+		//if(ipo==0) return OPERATOR_CANCELLED;
+		return OPERATOR_CANCELLED;
+	}
+	else if(nr==2) {
+		if(ob->data==0) return OPERATOR_CANCELLED;
+		obdata= ob->data;
+	}
+	else if(nr==3 || nr==4) {
+		mat= give_current_material(ob, ob->actcol);
+		if(mat==0) return OPERATOR_CANCELLED;
+		if(nr==4) {
+			if(mat->mtex[ (int)mat->texact ]) tex= mat->mtex[ (int)mat->texact ]->tex;
+			if(tex==0) return OPERATOR_CANCELLED;
+		}
+	}
+	else if(nr==5) {
+		if(ob->dup_group==NULL) return OPERATOR_CANCELLED;
+	}
+	else if(nr==6) {
+		if(ob->particlesystem.first==NULL) return OPERATOR_CANCELLED;
+	}
+	else return OPERATOR_CANCELLED;
+	
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if(nr==1) {
+				// XXX old animation system
+			//if(base->object->ipo==ipo) base->flag |= SELECT;
+			//changed = 1;
+		}
+		else if(nr==2) {
+			if(base->object->data==obdata) base->flag |= SELECT;
+			changed = 1;
+		}
+		else if(nr==3 || nr==4) {
+			ob= base->object;
+			
+			for(a=1; a<=ob->totcol; a++) {
+				mat1= give_current_material(ob, a);
+				if(nr==3) {
+					if(mat1==mat) base->flag |= SELECT;
+					changed = 1;
+				}
+				else if(mat1 && nr==4) {
+					for(b=0; b<MAX_MTEX; b++) {
+						if(mat1->mtex[b]) {
+							if(tex==mat1->mtex[b]->tex) {
+								base->flag |= SELECT;
+								changed = 1;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		else if(nr==5) {
+			if(base->object->dup_group==ob->dup_group) {
+				 base->flag |= SELECT;
+				 changed = 1;
+			}
+		}
+		else if(nr==6) {
+			/* loop through other, then actives particles*/
+			ParticleSystem *psys;
+			ParticleSystem *psys_act;
+			
+			for(psys=base->object->particlesystem.first; psys; psys=psys->next) {
+				for(psys_act=ob->particlesystem.first; psys_act; psys_act=psys_act->next) {
+					if (psys->part == psys_act->part) {
+						base->flag |= SELECT;
+						changed = 1;
+						break;
+					}
+				}
+				
+				if (base->flag & SELECT) {
+					break;
+				}
+			}
+		}
+		base->object->flag= base->flag;
+	}
+	CTX_DATA_END;
+	
+	if (changed) {
+		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+		return OPERATOR_FINISHED;
+	}
+	
+	return OPERATOR_CANCELLED;
+}
+
+void OBJECT_OT_select_linked(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Select Linked";
+	ot->description = "Select all visible objects that are linked.";
+	ot->idname= "OBJECT_OT_select_linked";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_select_linked_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_select_linked_types, 0, "Type", "");
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
+
+}
+
+/*********************** Selected Grouped ********************/
+
+static EnumPropertyItem prop_select_grouped_types[] = {
+	{1, "CHILDREN_RECURSIVE", 0, "Children", ""},
+	{2, "CHILDREN", 0, "Immediate Children", ""},
+	{3, "PARENT", 0, "Parent", ""},
+	{4, "SIBLINGS", 0, "Siblings", "Shared Parent"},
+	{5, "TYPE", 0, "Type", "Shared object type"},
+	{6, "LAYER", 0, "Layer", "Shared layers"},
+	{7, "GROUP", 0, "Group", "Shared group"},
+	{8, "HOOK", 0, "Hook", ""},
+	{9, "PASS", 0, "Pass", "Render pass Index"},
+	{10, "COLOR", 0, "Color", "Object Color"},
+	{11, "PROPERTIES", 0, "Properties", "Game Properties"},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static short select_grouped_children(bContext *C, Object *ob, int recursive)
+{
+	short changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if (ob == base->object->parent) {
+			if (!(base->flag & SELECT)) {
+				ED_base_object_select(base, BA_SELECT);
+				changed = 1;
+			}
+
+			if (recursive)
+				changed |= select_grouped_children(C, base->object, 1);
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static short select_grouped_parent(bContext *C)	/* Makes parent active and de-selected OBACT */
+{
+	Scene *scene= CTX_data_scene(C);
+	View3D *v3d= CTX_wm_view3d(C);
+
+	short changed = 0;
+	Base *baspar, *basact= CTX_data_active_base(C);
+
+	if (!basact || !(basact->object->parent)) return 0; /* we know OBACT is valid */
+
+	baspar= object_in_scene(basact->object->parent, scene);
+
+	/* can be NULL if parent in other scene */
+	if(baspar && BASE_SELECTABLE(v3d, baspar)) {
+		ED_base_object_select(basact, BA_DESELECT);
+		ED_base_object_select(baspar, BA_SELECT);
+		ED_base_object_activate(C, baspar);
+		changed = 1;
+	}
+	return changed;
+}
+
+
+#define GROUP_MENU_MAX	24
+static short select_grouped_group(bContext *C, Object *ob)	/* Select objects in the same group as the active */
+{
+	short changed = 0;
+	Group *group, *ob_groups[GROUP_MENU_MAX];
+	//char str[10 + (24*GROUP_MENU_MAX)];
+	//char *p = str;
+	int group_count=0; //, menu, i;
+
+	for (	group=G.main->group.first;
+			group && group_count < GROUP_MENU_MAX;
+			group=group->id.next
+		) {
+		if (object_in_group (ob, group)) {
+			ob_groups[group_count] = group;
+			group_count++;
+		}
+	}
+
+	if (!group_count)
+		return 0;
+
+	else if (group_count == 1) {
+		group = ob_groups[0];
+		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+			if (!(base->flag & SELECT) && object_in_group(base->object, group)) {
+				ED_base_object_select(base, BA_SELECT);
+				changed = 1;
+			}
+		}
+		CTX_DATA_END;
+		return changed;
+	}
+#if 0 // XXX hows this work in 2.5?
+	/* build the menu. */
+	p += sprintf(str, "Groups%%t");
+	for (i=0; i<group_count; i++) {
+		group = ob_groups[i];
+		p += sprintf (p, "|%s%%x%i", group->id.name+2, i);
+	}
+
+	menu = pupmenu (str);
+	if (menu == -1)
+		return 0;
+
+	group = ob_groups[menu];
+	for (base= FIRSTBASE; base; base= base->next) {
+		if (!(base->flag & SELECT) && object_in_group(base->object, group)) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+#endif
+	return changed;
+}
+
+static short select_grouped_object_hooks(bContext *C, Object *ob)
+{
+	Scene *scene= CTX_data_scene(C);
+	View3D *v3d= CTX_wm_view3d(C);
+
+	short changed = 0;
+	Base *base;
+	ModifierData *md;
+	HookModifierData *hmd;
+
+	for (md = ob->modifiers.first; md; md=md->next) {
+		if (md->type==eModifierType_Hook) {
+			hmd= (HookModifierData*) md;
+			if (hmd->object && !(hmd->object->flag & SELECT)) {
+				base= object_in_scene(hmd->object, scene);
+				if (base && (BASE_SELECTABLE(v3d, base))) {
+					ED_base_object_select(base, BA_SELECT);
+					changed = 1;
+				}
+			}
+		}
+	}
+	return changed;
+}
+
+/* Select objects woth the same parent as the active (siblings),
+ * parent can be NULL also */
+static short select_grouped_siblings(bContext *C, Object *ob)
+{
+	short changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if ((base->object->parent==ob->parent)  && !(base->flag & SELECT)) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static short select_grouped_type(bContext *C, Object *ob)
+{
+	short changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if ((base->object->type == ob->type) && !(base->flag & SELECT)) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static short select_grouped_layer(bContext *C, Object *ob)
+{
+	char changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if ((base->lay & ob->lay) && !(base->flag & SELECT)) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static short select_grouped_index_object(bContext *C, Object *ob)
+{
+	char changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static short select_grouped_color(bContext *C, Object *ob)
+{
+	char changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if (!(base->flag & SELECT) && (FloatCompare(base->object->col, ob->col, 0.005f))) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static short objects_share_gameprop(Object *a, Object *b)
+{
+	bProperty *prop;
+	/*make a copy of all its properties*/
+
+	for( prop= a->prop.first; prop; prop = prop->next ) {
+		if ( get_ob_property(b, prop->name) )
+			return 1;
+	}
+	return 0;
+}
+
+static short select_grouped_gameprops(bContext *C, Object *ob)
+{
+	char changed = 0;
+
+	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		if (!(base->flag & SELECT) && (objects_share_gameprop(base->object, ob))) {
+			ED_base_object_select(base, BA_SELECT);
+			changed = 1;
+		}
+	}
+	CTX_DATA_END;
+	return changed;
+}
+
+static int object_select_grouped_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob;
+	int nr = RNA_enum_get(op->ptr, "type");
+	short changed = 0, seltype;
+
+	seltype = RNA_enum_get(op->ptr, "seltype");
+	
+	if (seltype == 0) {
+		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+			ED_base_object_select(base, BA_DESELECT);
+		}
+		CTX_DATA_END;
+	}
+	
+	ob= OBACT;
+	if(ob==0){ 
+		BKE_report(op->reports, RPT_ERROR, "No Active Object");
+		return OPERATOR_CANCELLED;
+	}
+	
+	if(nr==1)		changed = select_grouped_children(C, ob, 1);
+	else if(nr==2)	changed = select_grouped_children(C, ob, 0);
+	else if(nr==3)	changed = select_grouped_parent(C);
+	else if(nr==4)	changed = select_grouped_siblings(C, ob);
+	else if(nr==5)	changed = select_grouped_type(C, ob);
+	else if(nr==6)	changed = select_grouped_layer(C, ob);
+	else if(nr==7)	changed = select_grouped_group(C, ob);
+	else if(nr==8)	changed = select_grouped_object_hooks(C, ob);
+	else if(nr==9)	changed = select_grouped_index_object(C, ob);
+	else if(nr==10)	changed = select_grouped_color(C, ob);
+	else if(nr==11)	changed = select_grouped_gameprops(C, ob);
+	
+	if (changed) {
+		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+		return OPERATOR_FINISHED;
+	}
+	
+	return OPERATOR_CANCELLED;
+}
+
+void OBJECT_OT_select_grouped(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Select Grouped";
+	ot->description = "Select all visible objects grouped by various properties.";
+	ot->idname= "OBJECT_OT_select_grouped";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_select_grouped_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", "");
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
+}
+
+/************************* Select by Layer **********************/
+
+static int object_select_by_layer_exec(bContext *C, wmOperator *op)
+{
+	unsigned int layernum;
+	short seltype;
+	
+	seltype = RNA_enum_get(op->ptr, "seltype");
+	layernum = RNA_int_get(op->ptr, "layer");
+	
+	if (seltype == 0) {
+		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+			ED_base_object_select(base, BA_DESELECT);
+		}
+		CTX_DATA_END;
+	}
+		
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if(base->lay == (1<< (layernum -1)))
+			ED_base_object_select(base, BA_SELECT);
+	}
+	CTX_DATA_END;
+	
+	/* undo? */
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_by_layer(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "select by layer";
+	ot->description = "Select all visible objects on a layer.";
+	ot->idname= "OBJECT_OT_select_by_layer";
+	
+	/* api callbacks */
+	/*ot->invoke = XXX - need a int grid popup*/
+	ot->exec= object_select_by_layer_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_int(ot->srna, "layer", 1, 1, 20, "Layer", "", 1, 20);
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
+}
+
+/************************** Select Inverse *************************/
+
+static int object_select_inverse_exec(bContext *C, wmOperator *op)
+{
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if (base->flag & SELECT)
+			ED_base_object_select(base, BA_DESELECT);
+		else
+			ED_base_object_select(base, BA_SELECT);
+	}
+	CTX_DATA_END;
+	
+	/* undo? */
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_inverse(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Select Inverse";
+	ot->description = "Invert selection of all visible objects.";
+	ot->idname= "OBJECT_OT_select_inverse";
+	
+	/* api callbacks */
+	ot->exec= object_select_inverse_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+}
+
+/**************************** (De)select All ****************************/
+
+static int object_select_de_select_all_exec(bContext *C, wmOperator *op)
+{
+	
+	int a=0, ok=0; 
+	
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if (base->flag & SELECT) {
+			ok= a= 1;
+			break;
+		}
+		else ok=1;
+	}
+	CTX_DATA_END;
+	
+	if (!ok) return OPERATOR_PASS_THROUGH;
+	
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if (a) ED_base_object_select(base, BA_DESELECT);
+		else ED_base_object_select(base, BA_SELECT);
+	}
+	CTX_DATA_END;
+	
+	/* undo? */
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_all_toggle(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "deselect all";
+	ot->description = "(de)select all visible objects in scene.";
+	ot->idname= "OBJECT_OT_select_all_toggle";
+	
+	/* api callbacks */
+	ot->exec= object_select_de_select_all_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+}
+
+/**************************** Select Mirror ****************************/
+
+/* finds the best possible flipped name. For renaming; check for unique names afterwards */
+/* if strip_number: removes number extensions */
+void object_flip_name (char *name)
+{
+	int     len;
+	char    prefix[128]={""};   /* The part before the facing */
+	char    suffix[128]={""};   /* The part after the facing */
+	char    replace[128]={""};  /* The replacement string */
+	char    number[128]={""};   /* The number extension string */
+	char    *index=NULL;
+
+	len= strlen(name);
+	if(len<3) return; // we don't do names like .R or .L
+
+	/* We first check the case with a .### extension, let's find the last period */
+	if(isdigit(name[len-1])) {
+		index= strrchr(name, '.'); // last occurrance
+		if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever!
+			strcpy(number, index);
+			*index= 0;
+			len= strlen(name);
+		}
+	}
+
+	strcpy (prefix, name);
+
+#define IS_SEPARATOR(a) ((a)=='.' || (a)==' ' || (a)=='-' || (a)=='_')
+
+	/* first case; separator . - _ with extensions r R l L  */
+	if( IS_SEPARATOR(name[len-2]) ) {
+		switch(name[len-1]) {
+			case 'l':
+				prefix[len-1]= 0;
+				strcpy(replace, "r");
+				break;
+			case 'r':
+				prefix[len-1]= 0;
+				strcpy(replace, "l");
+				break;
+			case 'L':
+				prefix[len-1]= 0;
+				strcpy(replace, "R");
+				break;
+			case 'R':
+				prefix[len-1]= 0;
+				strcpy(replace, "L");
+				break;
+		}
+	}
+	/* case; beginning with r R l L , with separator after it */
+	else if( IS_SEPARATOR(name[1]) ) {
+		switch(name[0]) {
+			case 'l':
+				strcpy(replace, "r");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+			case 'r':
+				strcpy(replace, "l");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+			case 'L':
+				strcpy(replace, "R");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+			case 'R':
+				strcpy(replace, "L");
+				strcpy(suffix, name+1);
+				prefix[0]= 0;
+				break;
+		}
+	}
+	else if(len > 5) {
+		/* hrms, why test for a separator? lets do the rule 'ultimate left or right' */
+		index = BLI_strcasestr(prefix, "right");
+		if (index==prefix || index==prefix+len-5) {
+			if(index[0]=='r') 
+				strcpy (replace, "left");
+			else {
+				if(index[1]=='I') 
+					strcpy (replace, "LEFT");
+				else
+					strcpy (replace, "Left");
+			}
+			*index= 0;
+			strcpy (suffix, index+5);
+		}
+		else {
+			index = BLI_strcasestr(prefix, "left");
+			if (index==prefix || index==prefix+len-4) {
+				if(index[0]=='l') 
+					strcpy (replace, "right");
+				else {
+					if(index[1]=='E') 
+						strcpy (replace, "RIGHT");
+					else
+						strcpy (replace, "Right");
+				}
+				*index= 0;
+				strcpy (suffix, index+4);
+			}
+		}
+	}
+
+#undef IS_SEPARATOR
+
+	sprintf (name, "%s%s%s%s", prefix, replace, suffix, number);
+}
+
+static int object_select_mirror_exec(bContext *C, wmOperator *op)
+{
+	char tmpname[32];
+	short seltype;
+	
+	seltype = RNA_enum_get(op->ptr, "seltype");
+	
+	CTX_DATA_BEGIN(C, Base*, primbase, selected_bases) {
+
+		strcpy(tmpname, primbase->object->id.name+2);
+		object_flip_name(tmpname);
+		
+		CTX_DATA_BEGIN(C, Base*, secbase, visible_bases) {
+			if(!strcmp(secbase->object->id.name+2, tmpname)) {
+				ED_base_object_select(secbase, BA_SELECT);
+			}
+		}
+		CTX_DATA_END;
+		
+		if (seltype == 0) ED_base_object_select(primbase, BA_DESELECT);
+		
+	}
+	CTX_DATA_END;
+	
+	/* undo? */
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_mirror(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Select Mirror";
+	ot->description = "Select the Mirror objects of the selected object eg. L.sword -> R.sword";
+	ot->idname= "OBJECT_OT_select_mirror";
+	
+	/* api callbacks */
+	ot->exec= object_select_mirror_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
+}
+
+/**************************** Select Random ****************************/
+
+static int object_select_random_exec(bContext *C, wmOperator *op)
+{	
+	float percent;
+	short seltype;
+	
+	seltype = RNA_enum_get(op->ptr, "seltype");
+	
+	if (seltype == 0) {
+		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+			ED_base_object_select(base, BA_DESELECT);
+		}
+		CTX_DATA_END;
+	}
+	percent = RNA_float_get(op->ptr, "percent");
+		
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		if (BLI_frand() < percent) {
+				ED_base_object_select(base, BA_SELECT);
+		}
+	}
+	CTX_DATA_END;
+	
+	WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_select_random(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Random select";
+	ot->description = "Set select on random visible objects.";
+	ot->idname= "OBJECT_OT_select_random";
+	
+	/* api callbacks */
+	/*ot->invoke= object_select_random_invoke XXX - need a number popup ;*/
+	ot->exec = object_select_random_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "percentage of objects to randomly select", 0.0001f, 1.0f);
+	RNA_def_enum(ot->srna, "seltype", prop_select_types, 1, "Selection", "Extend selection or clear selection then select");
+}
+
+
diff --git a/source/blender/editors/object/editkey.c b/source/blender/editors/object/object_shapekey.c
similarity index 100%
rename from source/blender/editors/object/editkey.c
rename to source/blender/editors/object/object_shapekey.c
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
new file mode 100644
index 00000000000..2b207f2f27c
--- /dev/null
+++ b/source/blender/editors/object/object_transform.c
@@ -0,0 +1,926 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, 2002-2008 full recode
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "DNA_armature_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BLI_arithb.h"
+#include "BLI_editVert.h"
+#include "BLI_listbase.h"
+
+#include "BKE_context.h"
+#include "BKE_curve.h"
+#include "BKE_depsgraph.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_mesh.h"
+#include "BKE_object.h"
+#include "BKE_report.h"
+#include "BKE_utildefines.h"
+
+#include "RNA_define.h"
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_anim_api.h"
+#include "ED_armature.h"
+#include "ED_curve.h"
+#include "ED_mesh.h"
+#include "ED_object.h"
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
+#include "object_intern.h"
+
+/*************************** Clear Transformation ****************************/
+
+static int object_location_clear_exec(bContext *C, wmOperator *op)
+{
+	int armature_clear= 0;
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
+			if((ob->protectflag & OB_LOCK_LOCX)==0)
+				ob->loc[0]= ob->dloc[0]= 0.0f;
+			if((ob->protectflag & OB_LOCK_LOCY)==0)
+				ob->loc[1]= ob->dloc[1]= 0.0f;
+			if((ob->protectflag & OB_LOCK_LOCZ)==0)
+				ob->loc[2]= ob->dloc[2]= 0.0f;
+		}
+		ob->recalc |= OB_RECALC_OB;
+	}
+	CTX_DATA_END;
+
+	if(armature_clear==0) /* in this case flush was done */
+		ED_anim_dag_flush_update(C);	
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_location_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Clear Location";
+	ot->description = "Clear the object's location.";
+	ot->idname= "OBJECT_OT_location_clear";
+	
+	/* api callbacks */
+	ot->exec= object_location_clear_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int object_rotation_clear_exec(bContext *C, wmOperator *op)
+{
+	int armature_clear= 0;
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
+			/* eulers can only get cleared if they are not protected */
+			if((ob->protectflag & OB_LOCK_ROTX)==0)
+				ob->rot[0]= ob->drot[0]= 0.0f;
+			if((ob->protectflag & OB_LOCK_ROTY)==0)
+				ob->rot[1]= ob->drot[1]= 0.0f;
+			if((ob->protectflag & OB_LOCK_ROTZ)==0)
+				ob->rot[2]= ob->drot[2]= 0.0f;
+		}
+		ob->recalc |= OB_RECALC_OB;
+	}
+	CTX_DATA_END;
+
+	if(armature_clear==0) /* in this case flush was done */
+		ED_anim_dag_flush_update(C);	
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_rotation_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Clear Rotation";
+	ot->description = "Clear the object's rotation.";
+	ot->idname= "OBJECT_OT_rotation_clear";
+	
+	/* api callbacks */
+	ot->exec= object_rotation_clear_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int object_scale_clear_exec(bContext *C, wmOperator *op)
+{
+	int armature_clear= 0;
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(!(ob->mode & OB_MODE_WEIGHT_PAINT)) {
+			if((ob->protectflag & OB_LOCK_SCALEX)==0) {
+				ob->dsize[0]= 0.0f;
+				ob->size[0]= 1.0f;
+			}
+			if((ob->protectflag & OB_LOCK_SCALEY)==0) {
+				ob->dsize[1]= 0.0f;
+				ob->size[1]= 1.0f;
+			}
+			if((ob->protectflag & OB_LOCK_SCALEZ)==0) {
+				ob->dsize[2]= 0.0f;
+				ob->size[2]= 1.0f;
+			}
+		}
+		ob->recalc |= OB_RECALC_OB;
+	}
+	CTX_DATA_END;
+	
+	if(armature_clear==0) /* in this case flush was done */
+		ED_anim_dag_flush_update(C);	
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_scale_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Clear Scale";
+	ot->description = "Clear the object's scale.";
+	ot->idname= "OBJECT_OT_scale_clear";
+	
+	/* api callbacks */
+	ot->exec= object_scale_clear_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int object_origin_clear_exec(bContext *C, wmOperator *op)
+{
+	float *v1, *v3, mat[3][3];
+	int armature_clear= 0;
+
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		if(ob->parent) {
+			v1= ob->loc;
+			v3= ob->parentinv[3];
+			
+			Mat3CpyMat4(mat, ob->parentinv);
+			VECCOPY(v3, v1);
+			v3[0]= -v3[0];
+			v3[1]= -v3[1];
+			v3[2]= -v3[2];
+			Mat3MulVecfl(mat, v3);
+		}
+		ob->recalc |= OB_RECALC_OB;
+	}
+	CTX_DATA_END;
+
+	if(armature_clear==0) /* in this case flush was done */
+		ED_anim_dag_flush_update(C);	
+	
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_origin_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Clear Origin";
+	ot->description = "Clear the object's origin.";
+	ot->idname= "OBJECT_OT_origin_clear";
+	
+	/* api callbacks */
+	ot->exec= object_origin_clear_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/*************************** Apply Transformation ****************************/
+
+/* use this when the loc/size/rot of the parent has changed but the children
+ * should stay in the same place, e.g. for apply-size-rot or object center */
+static void ignore_parent_tx(Main *bmain, Scene *scene, Object *ob ) 
+{
+	Object workob;
+	Object *ob_child;
+	
+	/* a change was made, adjust the children to compensate */
+	for(ob_child=bmain->object.first; ob_child; ob_child=ob_child->id.next) {
+		if(ob_child->parent == ob) {
+			ED_object_apply_obmat(ob_child);
+			what_does_parent(scene, ob_child, &workob);
+			Mat4Invert(ob_child->parentinv, workob.obmat);
+		}
+	}
+}
+
+static int apply_objects_internal(bContext *C, ReportList *reports, int apply_loc, int apply_scale, int apply_rot)
+{
+	Main *bmain= CTX_data_main(C);
+	Scene *scene= CTX_data_scene(C);
+	Object *ob;
+	bArmature *arm;
+	Mesh *me;
+	Curve *cu;
+	Nurb *nu;
+	BPoint *bp;
+	BezTriple *bezt;
+	MVert *mvert;
+	float rsmat[3][3], tmat[3][3], obmat[3][3], iobmat[3][3], mat[4][4], scale;
+	int a, change = 0;
+	
+	/* first check if we can execute */
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		ob= base->object;
+
+		if(ob->type==OB_MESH) {
+			me= ob->data;
+			
+			if(me->id.us>1) {
+				BKE_report(reports, RPT_ERROR, "Can't apply to a multi user mesh, doing nothing.");
+				return OPERATOR_CANCELLED;
+			}
+		}
+		else if(ob->type==OB_ARMATURE) {
+			arm= ob->data;
+			
+			if(arm->id.us>1) {
+				BKE_report(reports, RPT_ERROR, "Can't apply to a multi user armature, doing nothing.");
+				return OPERATOR_CANCELLED;
+			}
+		}
+		else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+			cu= ob->data;
+			
+			if(cu->id.us>1) {
+				BKE_report(reports, RPT_ERROR, "Can't apply to a multi user curve, doing nothing.");
+				return OPERATOR_CANCELLED;
+			}
+			if(cu->key) {
+				BKE_report(reports, RPT_ERROR, "Can't apply to a curve with vertex keys, doing nothing.");
+				return OPERATOR_CANCELLED;
+			}
+		}
+	}
+	CTX_DATA_END;
+	
+	/* now execute */
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		ob= base->object;
+
+		/* calculate rotation/scale matrix */
+		if(apply_scale && apply_rot)
+			object_to_mat3(ob, rsmat);
+		else if(apply_scale)
+			object_scale_to_mat3(ob, rsmat);
+		else if(apply_rot)
+			object_rot_to_mat3(ob, rsmat);
+		else
+			Mat3One(rsmat);
+
+		Mat4CpyMat3(mat, rsmat);
+
+		/* calculate translation */
+		if(apply_loc) {
+			VecCopyf(mat[3], ob->loc);
+
+			if(!(apply_scale && apply_rot)) {
+				/* correct for scale and rotation that is still applied */
+				object_to_mat3(ob, obmat);
+				Mat3Inv(iobmat, obmat);
+				Mat3MulMat3(tmat, rsmat, iobmat);
+				Mat3MulVecfl(tmat, mat[3]);
+			}
+		}
+
+		/* apply to object data */
+		if(ob->type==OB_MESH) {
+			me= ob->data;
+			
+			/* adjust data */
+			mvert= me->mvert;
+			for(a=0; a<me->totvert; a++, mvert++)
+				Mat4MulVecfl(mat, mvert->co);
+			
+			if(me->key) {
+				KeyBlock *kb;
+				
+				for(kb=me->key->block.first; kb; kb=kb->next) {
+					float *fp= kb->data;
+					
+					for(a=0; a<kb->totelem; a++, fp+=3)
+						Mat4MulVecfl(mat, fp);
+				}
+			}
+			
+			/* update normals */
+			mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
+		}
+		else if (ob->type==OB_ARMATURE) {
+			ED_armature_apply_transform(ob, mat);
+		}
+		else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+			cu= ob->data;
+
+			scale = Mat3ToScalef(rsmat);
+			
+			for(nu=cu->nurb.first; nu; nu=nu->next) {
+				if(nu->type == CU_BEZIER) {
+					a= nu->pntsu;
+					for(bezt= nu->bezt; a--; bezt++) {
+						Mat4MulVecfl(mat, bezt->vec[0]);
+						Mat4MulVecfl(mat, bezt->vec[1]);
+						Mat4MulVecfl(mat, bezt->vec[2]);
+						bezt->radius *= scale;
+						bezt++;
+					}
+				}
+				else {
+					a= nu->pntsu*nu->pntsv;
+					for(bp= nu->bp; a--; bp++)
+						Mat4MulVecfl(mat, bp->vec);
+				}
+			}
+		}
+		else
+			continue;
+
+		if(apply_loc)
+			ob->loc[0]= ob->loc[1]= ob->loc[2]= 0.0f;
+		if(apply_scale)
+			ob->size[0]= ob->size[1]= ob->size[2]= 1.0f;
+		if(apply_rot)
+			ob->rot[0]= ob->rot[1]= ob->rot[2]= 0.0f;
+
+		where_is_object(scene, ob);
+		ignore_parent_tx(bmain, scene, ob);
+
+		DAG_id_flush_update(&ob->id, OB_RECALC_OB|OB_RECALC_DATA);
+
+		change = 1;
+	}
+	CTX_DATA_END;
+
+	if(!change)
+		return OPERATOR_CANCELLED;
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	return OPERATOR_FINISHED;
+}
+
+static int visual_transform_apply_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	int change = 0;
+	
+	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+		where_is_object(scene, ob);
+
+		VECCOPY(ob->loc, ob->obmat[3]);
+		Mat4ToSize(ob->obmat, ob->size);
+		Mat4ToEul(ob->obmat, ob->rot);
+		
+		where_is_object(scene, ob);
+		
+		change = 1;
+	}
+	CTX_DATA_END;
+
+	if(!change)
+		return OPERATOR_CANCELLED;
+
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_visual_transform_apply(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Apply Visual Transform";
+	ot->description = "Apply the object's visual transformation to its data.";
+	ot->idname= "OBJECT_OT_visual_transform_apply";
+	
+	/* api callbacks */
+	ot->exec= visual_transform_apply_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int location_apply_exec(bContext *C, wmOperator *op)
+{
+	return apply_objects_internal(C, op->reports, 1, 0, 0);
+}
+
+void OBJECT_OT_location_apply(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Apply Location";
+	ot->description = "Apply the object's location to its data.";
+	ot->idname= "OBJECT_OT_location_apply";
+	
+	/* api callbacks */
+	ot->exec= location_apply_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int scale_apply_exec(bContext *C, wmOperator *op)
+{
+	return apply_objects_internal(C, op->reports, 0, 1, 0);
+}
+
+void OBJECT_OT_scale_apply(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Apply Scale";
+	ot->description = "Apply the object's scale to its data.";
+	ot->idname= "OBJECT_OT_scale_apply";
+	
+	/* api callbacks */
+	ot->exec= scale_apply_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+static int rotation_apply_exec(bContext *C, wmOperator *op)
+{
+	return apply_objects_internal(C, op->reports, 0, 0, 1);
+}
+
+void OBJECT_OT_rotation_apply(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Apply Rotation";
+	ot->description = "Apply the object's rotation to its data.";
+	ot->idname= "OBJECT_OT_rotation_apply";
+	
+	/* api callbacks */
+	ot->exec= rotation_apply_exec;
+	ot->poll= ED_operator_object_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/************************ Texture Space Transform ****************************/
+
+void texspace_edit(Scene *scene, View3D *v3d)
+{
+	Base *base;
+	int nr=0;
+	
+	/* first test if from visible and selected objects
+	 * texspacedraw is set:
+	 */
+	
+	if(scene->obedit) return; // XXX get from context
+	
+	for(base= FIRSTBASE; base; base= base->next) {
+		if(TESTBASELIB(v3d, base)) {
+			break;
+		}
+	}
+
+	if(base==0) {
+		return;
+	}
+	
+	nr= 0; // XXX pupmenu("Texture Space %t|Grab/Move%x1|Size%x2");
+	if(nr<1) return;
+	
+	for(base= FIRSTBASE; base; base= base->next) {
+		if(TESTBASELIB(v3d, base)) {
+			base->object->dtx |= OB_TEXSPACE;
+		}
+	}
+	
+
+	if(nr==1) {
+// XXX		initTransform(TFM_TRANSLATION, CTX_TEXTURE);
+// XXX		Transform();
+	}
+	else if(nr==2) {
+// XXX		initTransform(TFM_RESIZE, CTX_TEXTURE);
+// XXX		Transform();
+	}
+	else if(nr==3) {
+// XXX		initTransform(TFM_ROTATION, CTX_TEXTURE);
+// XXX		Transform();
+	}
+}
+
+/************************ Mirror Menu ****************************/
+
+void mirrormenu(void)
+{
+// XXX		initTransform(TFM_MIRROR, CTX_NO_PET);
+// XXX		Transform();
+}
+
+/********************* Set Object Center ************************/
+
+static EnumPropertyItem prop_set_center_types[] = {
+	{0, "CENTER", 0, "ObData to Center", "Move object data around Object center"},
+	{1, "CENTERNEW", 0, "Center New", "Move Object center to center of object data"},
+	{2, "CENTERCURSOR", 0, "Center Cursor", "Move Object Center to position of the 3d cursor"},
+	{0, NULL, 0, NULL, NULL}
+};
+
+/* 0 == do center, 1 == center new, 2 == center cursor */
+static int object_center_set_exec(bContext *C, wmOperator *op)
+{
+	Main *bmain= CTX_data_main(C);
+	Scene *scene= CTX_data_scene(C);
+	ScrArea *sa= CTX_wm_area(C);
+	View3D *v3d= sa->spacedata.first;
+	Object *obedit= CTX_data_edit_object(C);
+	Object *ob;
+	Mesh *me, *tme;
+	Curve *cu;
+/*	BezTriple *bezt;
+	BPoint *bp; */
+	Nurb *nu, *nu1;
+	EditVert *eve;
+	float cent[3], centn[3], min[3], max[3], omat[3][3];
+	int a, total= 0;
+	int centermode = RNA_enum_get(op->ptr, "type");
+	
+	/* keep track of what is changed */
+	int tot_change=0, tot_lib_error=0, tot_multiuser_arm_error=0;
+	MVert *mvert;
+
+	if(scene->id.lib || v3d==NULL){
+		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed on Lib data");
+		 return OPERATOR_CANCELLED;
+	}
+	if (obedit && centermode > 0) {
+		BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
+		return OPERATOR_CANCELLED;
+	}	
+	cent[0]= cent[1]= cent[2]= 0.0;	
+	
+	if(obedit) {
+
+		INIT_MINMAX(min, max);
+	
+		if(obedit->type==OB_MESH) {
+			Mesh *me= obedit->data;
+			EditMesh *em = BKE_mesh_get_editmesh(me);
+
+			for(eve= em->verts.first; eve; eve= eve->next) {
+				if(v3d->around==V3D_CENTROID) {
+					total++;
+					VECADD(cent, cent, eve->co);
+				}
+				else {
+					DO_MINMAX(eve->co, min, max);
+				}
+			}
+			
+			if(v3d->around==V3D_CENTROID) {
+				VecMulf(cent, 1.0f/(float)total);
+			}
+			else {
+				cent[0]= (min[0]+max[0])/2.0f;
+				cent[1]= (min[1]+max[1])/2.0f;
+				cent[2]= (min[2]+max[2])/2.0f;
+			}
+			
+			for(eve= em->verts.first; eve; eve= eve->next) {
+				VecSubf(eve->co, eve->co, cent);			
+			}
+			
+			recalc_editnormals(em);
+			tot_change++;
+			DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+			BKE_mesh_end_editmesh(me, em);
+		}
+	}
+	
+	/* reset flags */
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+			base->object->flag &= ~OB_DONE;
+	}
+	CTX_DATA_END;
+	
+	for (me= G.main->mesh.first; me; me= me->id.next) {
+		me->flag &= ~ME_ISDONE;
+	}
+	
+	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+		if((base->object->flag & OB_DONE)==0) {
+			base->object->flag |= OB_DONE;
+				
+			if(obedit==NULL && (me=get_mesh(base->object)) ) {
+				if (me->id.lib) {
+					tot_lib_error++;
+				} else {
+					if(centermode==2) {
+						VECCOPY(cent, give_cursor(scene, v3d));
+						Mat4Invert(base->object->imat, base->object->obmat);
+						Mat4MulVecfl(base->object->imat, cent);
+					} else {
+						INIT_MINMAX(min, max);
+						mvert= me->mvert;
+						for(a=0; a<me->totvert; a++, mvert++) {
+							DO_MINMAX(mvert->co, min, max);
+						}
+					
+						cent[0]= (min[0]+max[0])/2.0f;
+						cent[1]= (min[1]+max[1])/2.0f;
+						cent[2]= (min[2]+max[2])/2.0f;
+					}
+
+					mvert= me->mvert;
+					for(a=0; a<me->totvert; a++, mvert++) {
+						VecSubf(mvert->co, mvert->co, cent);
+					}
+					
+					if (me->key) {
+						KeyBlock *kb;
+						for (kb=me->key->block.first; kb; kb=kb->next) {
+							float *fp= kb->data;
+							
+							for (a=0; a<kb->totelem; a++, fp+=3) {
+								VecSubf(fp, fp, cent);
+							}
+						}
+					}
+						
+					me->flag |= ME_ISDONE;
+						
+					if(centermode) {
+						Mat3CpyMat4(omat, base->object->obmat);
+						
+						VECCOPY(centn, cent);
+						Mat3MulVecfl(omat, centn);
+						base->object->loc[0]+= centn[0];
+						base->object->loc[1]+= centn[1];
+						base->object->loc[2]+= centn[2];
+						
+						where_is_object(scene, base->object);
+						ignore_parent_tx(bmain, scene, base->object);
+						
+						/* other users? */
+						CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+							ob = base->object;
+							if((ob->flag & OB_DONE)==0) {
+								tme= get_mesh(ob);
+								
+								if(tme==me) {
+									
+									ob->flag |= OB_DONE;
+									ob->recalc= OB_RECALC_OB|OB_RECALC_DATA;
+
+									Mat3CpyMat4(omat, ob->obmat);
+									VECCOPY(centn, cent);
+									Mat3MulVecfl(omat, centn);
+									ob->loc[0]+= centn[0];
+									ob->loc[1]+= centn[1];
+									ob->loc[2]+= centn[2];
+									
+									where_is_object(scene, ob);
+									ignore_parent_tx(bmain, scene, ob);
+									
+									if(tme && (tme->flag & ME_ISDONE)==0) {
+										mvert= tme->mvert;
+										for(a=0; a<tme->totvert; a++, mvert++) {
+											VecSubf(mvert->co, mvert->co, cent);
+										}
+										
+										if (tme->key) {
+											KeyBlock *kb;
+											for (kb=tme->key->block.first; kb; kb=kb->next) {
+												float *fp= kb->data;
+												
+												for (a=0; a<kb->totelem; a++, fp+=3) {
+													VecSubf(fp, fp, cent);
+												}
+											}
+										}
+										
+										tme->flag |= ME_ISDONE;
+									}
+								}
+							}
+							
+							ob= ob->id.next;
+						}
+						CTX_DATA_END;
+					}
+					tot_change++;
+				}
+			}
+			else if (ELEM(base->object->type, OB_CURVE, OB_SURF)) {
+				
+				/* weak code here... (ton) */
+				if(obedit==base->object) {
+					ListBase *editnurb= curve_get_editcurve(obedit);
+
+					nu1= editnurb->first;
+					cu= obedit->data;
+				}
+				else {
+					cu= base->object->data;
+					nu1= cu->nurb.first;
+				}
+				
+				if (cu->id.lib) {
+					tot_lib_error++;
+				} else {
+					if(centermode==2) {
+						VECCOPY(cent, give_cursor(scene, v3d));
+						Mat4Invert(base->object->imat, base->object->obmat);
+						Mat4MulVecfl(base->object->imat, cent);
+
+						/* don't allow Z change if curve is 2D */
+						if( !( cu->flag & CU_3D ) )
+							cent[2] = 0.0;
+					} 
+					else {
+						INIT_MINMAX(min, max);
+						
+						nu= nu1;
+						while(nu) {
+							minmaxNurb(nu, min, max);
+							nu= nu->next;
+						}
+						
+						cent[0]= (min[0]+max[0])/2.0f;
+						cent[1]= (min[1]+max[1])/2.0f;
+						cent[2]= (min[2]+max[2])/2.0f;
+					}
+					
+					nu= nu1;
+					while(nu) {
+						if(nu->type == CU_BEZIER) {
+							a= nu->pntsu;
+							while (a--) {
+								VecSubf(nu->bezt[a].vec[0], nu->bezt[a].vec[0], cent);
+								VecSubf(nu->bezt[a].vec[1], nu->bezt[a].vec[1], cent);
+								VecSubf(nu->bezt[a].vec[2], nu->bezt[a].vec[2], cent);
+							}
+						}
+						else {
+							a= nu->pntsu*nu->pntsv;
+							while (a--)
+								VecSubf(nu->bp[a].vec, nu->bp[a].vec, cent);
+						}
+						nu= nu->next;
+					}
+			
+					if(centermode && obedit==0) {
+						Mat3CpyMat4(omat, base->object->obmat);
+						
+						Mat3MulVecfl(omat, cent);
+						base->object->loc[0]+= cent[0];
+						base->object->loc[1]+= cent[1];
+						base->object->loc[2]+= cent[2];
+						
+						where_is_object(scene, base->object);
+						ignore_parent_tx(bmain, scene, base->object);
+					}
+					
+					tot_change++;
+					if(obedit) {
+						if (centermode==0) {
+							DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
+						}
+						break;
+					}
+				}
+			}
+			else if(base->object->type==OB_FONT) {
+				/* get from bb */
+				
+				cu= base->object->data;
+				
+				if(cu->bb==0) {
+					/* do nothing*/
+				} else if (cu->id.lib) {
+					tot_lib_error++;
+				} else {
+					cu->xof= -0.5f*( cu->bb->vec[4][0] - cu->bb->vec[0][0]);
+					cu->yof= -0.5f -0.5f*( cu->bb->vec[0][1] - cu->bb->vec[2][1]);	/* extra 0.5 is the height o above line */
+					
+					/* not really ok, do this better once! */
+					cu->xof /= cu->fsize;
+					cu->yof /= cu->fsize;
+
+					tot_change++;
+				}
+			}
+			else if(base->object->type==OB_ARMATURE) {
+				bArmature *arm = base->object->data;
+				
+				if (arm->id.lib) {
+					tot_lib_error++;
+				} else if(arm->id.us>1) {
+					/*BKE_report(op->reports, RPT_ERROR, "Can't apply to a multi user armature");
+					return;*/
+					tot_multiuser_arm_error++;
+				} else {
+					/* Function to recenter armatures in editarmature.c 
+					 * Bone + object locations are handled there.
+					 */
+					docenter_armature(scene, v3d, base->object, centermode);
+					tot_change++;
+					
+					where_is_object(scene, base->object);
+					ignore_parent_tx(bmain, scene, base->object);
+					
+					if(obedit) 
+						break;
+				}
+			}
+			base->object->recalc= OB_RECALC_OB|OB_RECALC_DATA;
+		}
+	}
+	CTX_DATA_END;
+	
+	if (tot_change) {
+		ED_anim_dag_flush_update(C);
+	}
+	
+	/* Warn if any errors occured */
+	if (tot_lib_error+tot_multiuser_arm_error) {
+		BKE_reportf(op->reports, RPT_WARNING, "%i Object(s) Not Centered, %i Changed:",tot_lib_error+tot_multiuser_arm_error, tot_change);		
+		if (tot_lib_error)
+			BKE_reportf(op->reports, RPT_WARNING, "|%i linked library objects",tot_lib_error);
+		if (tot_multiuser_arm_error)
+			BKE_reportf(op->reports, RPT_WARNING, "|%i multiuser armature object(s)",tot_multiuser_arm_error);
+	}
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_center_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Set Center";
+	ot->description = "Set the object's center, by either moving the data, or set to center of data, or use 3d cursor";
+	ot->idname= "OBJECT_OT_center_set";
+	
+	/* api callbacks */
+	ot->invoke= WM_menu_invoke;
+	ot->exec= object_center_set_exec;
+	
+	ot->poll= ED_operator_view3d_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", "");
+}
+
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 1660160b56c..6808b10b49d 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -25,8 +25,6 @@
  * Contributor(s): none yet.
  *
  * ***** END GPL LICENSE BLOCK *****
- * Creator-specific support for vertex deformation groups
- * Added: apply deform function (ton)
  */
 
 #include <string.h>
@@ -61,6 +59,7 @@
 #include "BKE_utildefines.h"
 
 #include "RNA_access.h"
+#include "RNA_define.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -68,49 +67,412 @@
 #include "ED_mesh.h"
 #include "ED_view3d.h"
 
+#include "UI_interface.h"
+
 #include "object_intern.h"
 
-/* XXX */
-static void BIF_undo_push() {}
-static void error() {}
+/************************ Exported Functions **********************/
 
-static Lattice *def_get_lattice(Object *ob)
+static Lattice *vgroup_edit_lattice(Object *ob)
 {
 	if(ob->type==OB_LATTICE) {
 		Lattice *lt= ob->data;
-		if(lt->editlatt)
-			return lt->editlatt;
-		return lt;
+		return (lt->editlatt)? lt->editlatt: lt;
 	}
+
 	return NULL;
 }
 
-/* only in editmode */
-void sel_verts_defgroup (Object *obedit, int select)
+/* check if deform vertex has defgroup index */
+MDeformWeight *ED_vgroup_weight_get(MDeformVert *dv, int defgroup)
 {
-	EditVert *eve;
-	Object *ob;
 	int i;
-	MDeformVert *dvert;
+	
+	if(!dv || defgroup<0)
+		return NULL;
+	
+	for(i=0; i<dv->totweight; i++)
+		if(dv->dw[i].def_nr == defgroup)
+			return dv->dw+i;
 
-	ob= obedit;
+	return NULL;
+}
 
-	if (!ob)
+/* Ensures that mv has a deform weight entry for the specified defweight group */
+/* Note this function is mirrored in editmesh_tools.c, for use for editvertices */
+MDeformWeight *ED_vgroup_weight_verify(MDeformVert *dv, int defgroup)
+{
+	MDeformWeight *newdw;
+
+	/* do this check always, this function is used to check for it */
+	if(!dv || defgroup<0)
+		return NULL;
+	
+	newdw = ED_vgroup_weight_get(dv, defgroup);
+	if(newdw)
+		return newdw;
+	
+	newdw = MEM_callocN(sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight");
+	if(dv->dw) {
+		memcpy(newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight);
+		MEM_freeN(dv->dw);
+	}
+	dv->dw=newdw;
+	
+	dv->dw[dv->totweight].weight=0.0f;
+	dv->dw[dv->totweight].def_nr=defgroup;
+	/* Group index */
+	
+	dv->totweight++;
+
+	return dv->dw+(dv->totweight-1);
+}
+
+bDeformGroup *ED_vgroup_add_name(Object *ob, char *name)
+{
+	bDeformGroup *defgroup;
+	
+	if(!ob)
+		return NULL;
+	
+	defgroup = MEM_callocN(sizeof(bDeformGroup), "add deformGroup");
+
+	BLI_strncpy(defgroup->name, name, 32);
+
+	BLI_addtail(&ob->defbase, defgroup);
+	unique_vertexgroup_name(defgroup, ob);
+
+	ob->actdef = BLI_countlist(&ob->defbase);
+
+	return defgroup;
+}
+
+bDeformGroup *ED_vgroup_add(Object *ob) 
+{
+	return ED_vgroup_add_name(ob, "Group");
+}
+
+void ED_vgroup_data_create(ID *id)
+{
+	/* create deform verts */
+
+	if(GS(id->name)==ID_ME) {
+		Mesh *me= (Mesh *)id;
+		me->dvert= CustomData_add_layer(&me->vdata, CD_MDEFORMVERT, CD_CALLOC, NULL, me->totvert);
+	}
+	else if(GS(id->name)==ID_LT) {
+		Lattice *lt= (Lattice *)id;
+		lt->dvert= MEM_callocN(sizeof(MDeformVert)*lt->pntsu*lt->pntsv*lt->pntsw, "lattice deformVert");
+	}
+}
+
+/* for mesh in object mode
+   lattice can be in editmode */
+void ED_vgroup_nr_vert_remove(Object *ob, int def_nr, int vertnum)
+{
+	/* This routine removes the vertex from the deform
+	 * group with number def_nr.
+	 *
+	 * This routine is meant to be fast, so it is the
+	 * responsibility of the calling routine to:
+	 *   a) test whether ob is non-NULL
+	 *   b) test whether ob is a mesh
+	 *   c) calculate def_nr
+	 */
+
+	MDeformWeight *newdw;
+	MDeformVert *dvert= NULL;
+	int i;
+
+	/* get the deform vertices corresponding to the
+	 * vertnum
+	 */
+	if(ob->type==OB_MESH) {
+		if(((Mesh*)ob->data)->dvert)
+			dvert = ((Mesh*)ob->data)->dvert + vertnum;
+	}
+	else if(ob->type==OB_LATTICE) {
+		Lattice *lt= vgroup_edit_lattice(ob);
+		
+		if(lt->dvert)
+			dvert = lt->dvert + vertnum;
+	}
+	
+	if(dvert==NULL)
+		return;
+	
+	/* for all of the deform weights in the
+	 * deform vert
+	 */
+	for(i=dvert->totweight - 1 ; i>=0 ; i--){
+
+		/* if the def_nr is the same as the one
+		 * for our weight group then remove it
+		 * from this deform vert.
+		 */
+		if(dvert->dw[i].def_nr == def_nr) {
+			dvert->totweight--;
+        
+			/* if there are still other deform weights
+			 * attached to this vert then remove this
+			 * deform weight, and reshuffle the others
+			 */
+			if(dvert->totweight) {
+				newdw = MEM_mallocN(sizeof(MDeformWeight)*(dvert->totweight), 
+									 "deformWeight");
+				if(dvert->dw){
+					memcpy(newdw, dvert->dw, sizeof(MDeformWeight)*i);
+					memcpy(newdw+i, dvert->dw+i+1, 
+							sizeof(MDeformWeight)*(dvert->totweight-i));
+					MEM_freeN(dvert->dw);
+				}
+				dvert->dw=newdw;
+			}
+			/* if there are no other deform weights
+			 * left then just remove the deform weight
+			 */
+			else {
+				MEM_freeN(dvert->dw);
+				dvert->dw = NULL;
+				break;
+			}
+		}
+	}
+
+}
+
+/* for Mesh in Object mode */
+/* allows editmode for Lattice */
+void ED_vgroup_nr_vert_add(Object *ob, int def_nr, int vertnum, float weight, int assignmode)
+{
+	/* add the vert to the deform group with the
+	 * specified number
+	 */
+	MDeformVert *dv= NULL;
+	MDeformWeight *newdw;
+	int	i;
+
+	/* get the vert */
+	if(ob->type==OB_MESH) {
+		if(((Mesh*)ob->data)->dvert)
+			dv = ((Mesh*)ob->data)->dvert + vertnum;
+	}
+	else if(ob->type==OB_LATTICE) {
+		Lattice *lt= vgroup_edit_lattice(ob);
+		
+		if(lt->dvert)
+			dv = lt->dvert + vertnum;
+	}
+	
+	if(dv==NULL)
+		return;
+	
+	/* Lets first check to see if this vert is
+	 * already in the weight group -- if so
+	 * lets update it
+	 */
+	for(i=0; i<dv->totweight; i++){
+		
+		/* if this weight cooresponds to the
+		 * deform group, then add it using
+		 * the assign mode provided
+		 */
+		if(dv->dw[i].def_nr == def_nr){
+			
+			switch(assignmode) {
+			case WEIGHT_REPLACE:
+				dv->dw[i].weight=weight;
+				break;
+			case WEIGHT_ADD:
+				dv->dw[i].weight+=weight;
+				if(dv->dw[i].weight >= 1.0)
+					dv->dw[i].weight = 1.0;
+				break;
+			case WEIGHT_SUBTRACT:
+				dv->dw[i].weight-=weight;
+				/* if the weight is zero or less then
+				 * remove the vert from the deform group
+				 */
+				if(dv->dw[i].weight <= 0.0)
+					ED_vgroup_nr_vert_remove(ob, def_nr, vertnum);
+				break;
+			}
+			return;
+		}
+	}
+
+	/* if the vert wasn't in the deform group then
+	 * we must take a different form of action ...
+	 */
+
+	switch(assignmode) {
+	case WEIGHT_SUBTRACT:
+		/* if we are subtracting then we don't
+		 * need to do anything
+		 */
 		return;
 
-	switch (ob->type){
-	case OB_MESH:
-	{
+	case WEIGHT_REPLACE:
+	case WEIGHT_ADD:
+		/* if we are doing an additive assignment, then
+		 * we need to create the deform weight
+		 */
+		newdw = MEM_callocN(sizeof(MDeformWeight)*(dv->totweight+1), 
+							 "deformWeight");
+		if(dv->dw){
+			memcpy(newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight);
+			MEM_freeN(dv->dw);
+		}
+		dv->dw=newdw;
+    
+		dv->dw[dv->totweight].weight=weight;
+		dv->dw[dv->totweight].def_nr=def_nr;
+    
+		dv->totweight++;
+		break;
+	}
+}
+
+/* called while not in editmode */
+void ED_vgroup_vert_add(Object *ob, bDeformGroup *dg, int vertnum, float weight, int assignmode)
+{
+	/* add the vert to the deform group with the
+	 * specified assign mode
+	 */
+	int	def_nr;
+
+	/* get the deform group number, exit if
+	 * it can't be found
+	 */
+	def_nr = get_defgroup_num(ob, dg);
+	if(def_nr < 0) return;
+
+	/* if there's no deform verts then
+	 * create some
+	 */
+	if(ob->type==OB_MESH) {
+		if(!((Mesh*)ob->data)->dvert)
+			ED_vgroup_data_create(ob->data);
+	}
+	else if(ob->type==OB_LATTICE) {
+		if(!((Lattice*)ob->data)->dvert)
+			ED_vgroup_data_create(ob->data);
+	}
+
+	/* call another function to do the work
+	 */
+	ED_vgroup_nr_vert_add(ob, def_nr, vertnum, weight, assignmode);
+}
+
+/* mesh object mode, lattice can be in editmode */
+void ED_vgroup_vert_remove(Object *ob, bDeformGroup	*dg, int vertnum)
+{
+	/* This routine removes the vertex from the specified
+	 * deform group.
+	 */
+
+	int def_nr;
+
+	/* if the object is NULL abort
+	 */
+	if(!ob)
+		return;
+
+	/* get the deform number that cooresponds
+	 * to this deform group, and abort if it
+	 * can not be found.
+	 */
+	def_nr = get_defgroup_num(ob, dg);
+	if(def_nr < 0) return;
+
+	/* call another routine to do the work
+	 */
+	ED_vgroup_nr_vert_remove(ob, def_nr, vertnum);
+}
+
+static float get_vert_def_nr(Object *ob, int def_nr, int vertnum)
+{
+	MDeformVert *dvert= NULL;
+	EditVert *eve;
+	Mesh *me;
+	int i;
+
+	/* get the deform vertices corresponding to the vertnum */
+	if(ob->type==OB_MESH) {
+		me= ob->data;
+
+		if(me->edit_mesh) {
+			eve= BLI_findlink(&me->edit_mesh->verts, vertnum);
+			if(!eve) return 0.0f;
+			dvert= CustomData_em_get(&me->edit_mesh->vdata, eve->data, CD_MDEFORMVERT);
+		}
+		else
+			dvert = me->dvert + vertnum;
+	}
+	else if(ob->type==OB_LATTICE) {
+		Lattice *lt= vgroup_edit_lattice(ob);
+		
+		if(lt->dvert)
+			dvert = lt->dvert + vertnum;
+	}
+	
+	if(dvert==NULL)
+		return 0.0f;
+	
+	for(i=dvert->totweight-1 ; i>=0 ; i--)
+		if(dvert->dw[i].def_nr == def_nr)
+			return dvert->dw[i].weight;
+
+	return 0.0f;
+}
+
+float ED_vgroup_vert_weight(Object *ob, bDeformGroup *dg, int vertnum)
+{
+	int def_nr;
+
+	if(!ob) return 0.0f;
+
+	def_nr = get_defgroup_num(ob, dg);
+	if(def_nr < 0) return 0.0f;
+
+	return get_vert_def_nr(ob, def_nr, vertnum);
+}
+
+void ED_vgroup_select_by_name(Object *ob, char *name)
+{
+	bDeformGroup *curdef;
+	int actdef= 1;
+	
+	for(curdef = ob->defbase.first; curdef; curdef=curdef->next, actdef++){
+		if(!strcmp(curdef->name, name)) {
+			ob->actdef= actdef;
+			return;
+		}
+	}
+
+	ob->actdef=0;	// this signals on painting to create a new one, if a bone in posemode is selected */
+}
+
+/********************** Operator Implementations *********************/
+
+/* only in editmode */
+static void vgroup_select_verts(Object *ob, int select)
+{
+	EditVert *eve;
+	MDeformVert *dvert;
+	int i;
+
+	if(ob->type == OB_MESH) {
 		Mesh *me= ob->data;
 		EditMesh *em = BKE_mesh_get_editmesh(me);
 
-		for (eve=em->verts.first; eve; eve=eve->next){
+		for(eve=em->verts.first; eve; eve=eve->next){
 			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
 
-			if (dvert && dvert->totweight){
-				for (i=0; i<dvert->totweight; i++){
-					if (dvert->dw[i].def_nr == (ob->actdef-1)){
-						if (select) eve->f |= SELECT;
+			if(dvert && dvert->totweight){
+				for(i=0; i<dvert->totweight; i++){
+					if(dvert->dw[i].def_nr == (ob->actdef-1)){
+						if(select) eve->f |= SELECT;
 						else eve->f &= ~SELECT;
 						
 						break;
@@ -124,10 +486,8 @@ void sel_verts_defgroup (Object *obedit, int select)
 
 		BKE_mesh_end_editmesh(me, em);
 	}
-		break;
-	case OB_LATTICE:
-	{
-		Lattice *lt= def_get_lattice(ob);
+	else if(ob->type == OB_LATTICE) {
+		Lattice *lt= vgroup_edit_lattice(ob);
 		
 		if(lt->dvert) {
 			BPoint *bp;
@@ -137,8 +497,8 @@ void sel_verts_defgroup (Object *obedit, int select)
 
 			tot= lt->pntsu*lt->pntsv*lt->pntsw;
 			for(a=0, bp= lt->def; a<tot; a++, bp++, dvert++) {
-				for (i=0; i<dvert->totweight; i++){
-					if (dvert->dw[i].def_nr == (ob->actdef-1)) {
+				for(i=0; i<dvert->totweight; i++){
+					if(dvert->dw[i].def_nr == (ob->actdef-1)) {
 						if(select) bp->f1 |= SELECT;
 						else bp->f1 &= ~SELECT;
 						
@@ -148,85 +508,9 @@ void sel_verts_defgroup (Object *obedit, int select)
 			}
 		}
 	}
-		break;
-		
-	default:
-		break;
-	}
 }
 
-/* check if deform vertex has defgroup index */
-MDeformWeight *get_defweight (MDeformVert *dv, int defgroup)
-{
-	int i;
-	
-	if (!dv || defgroup<0)
-		return NULL;
-	
-	for (i=0; i<dv->totweight; i++){
-		if (dv->dw[i].def_nr == defgroup)
-			return dv->dw+i;
-	}
-	return NULL;
-}
-
-/* Ensures that mv has a deform weight entry for
-   the specified defweight group */
-/* Note this function is mirrored in editmesh_tools.c, for use for editvertices */
-MDeformWeight *verify_defweight (MDeformVert *dv, int defgroup)
-{
-	MDeformWeight *newdw;
-
-	/* do this check always, this function is used to check for it */
-	if (!dv || defgroup<0)
-		return NULL;
-	
-	newdw = get_defweight (dv, defgroup);
-	if (newdw)
-		return newdw;
-	
-	newdw = MEM_callocN (sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight");
-	if (dv->dw){
-		memcpy (newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight);
-		MEM_freeN (dv->dw);
-	}
-	dv->dw=newdw;
-	
-	dv->dw[dv->totweight].weight=0.0f;
-	dv->dw[dv->totweight].def_nr=defgroup;
-	/* Group index */
-	
-	dv->totweight++;
-
-	return dv->dw+(dv->totweight-1);
-}
-
-bDeformGroup *add_defgroup_name (Object *ob, char *name)
-{
-	bDeformGroup	*defgroup;
-	
-	if (!ob)
-		return NULL;
-	
-	defgroup = MEM_callocN (sizeof(bDeformGroup), "add deformGroup");
-
-	BLI_strncpy (defgroup->name, name, 32);
-
-	BLI_addtail(&ob->defbase, defgroup);
-	unique_vertexgroup_name(defgroup, ob);
-
-	ob->actdef = BLI_countlist(&ob->defbase);
-
-	return defgroup;
-}
-
-void add_defgroup (Object *ob) 
-{
-	add_defgroup_name (ob, "Group");
-}
-
-
-void duplicate_defgroup ( Object *ob )
+static void vgroup_duplicate(Object *ob)
 {
 	bDeformGroup *dg, *cdg;
 	char name[32], s[32];
@@ -234,64 +518,62 @@ void duplicate_defgroup ( Object *ob )
 	MDeformVert *dvert, *dvert_array=NULL;
 	int i, idg, icdg, dvert_tot=0;
 
-	if (ob->type != OB_MESH && ob->type != OB_LATTICE)
-		return;
-
-	dg = BLI_findlink (&ob->defbase, (ob->actdef-1));
-	if (!dg)
+	dg = BLI_findlink(&ob->defbase, (ob->actdef-1));
+	if(!dg)
 		return;
 	
-	if (strstr(dg->name, "_copy")) {
-		BLI_strncpy (name, dg->name, 32); /* will be renamed _copy.001... etc */
-	} else {
-		BLI_snprintf (name, 32, "%s_copy", dg->name);
-		while (get_named_vertexgroup (ob, name)) {
-			if ((strlen (name) + 6) > 32) {
-				error ("Error: the name for the new group is > 32 characters");
+	if(strstr(dg->name, "_copy")) {
+		BLI_strncpy(name, dg->name, 32); /* will be renamed _copy.001... etc */
+	}
+	else {
+		BLI_snprintf(name, 32, "%s_copy", dg->name);
+		while(get_named_vertexgroup(ob, name)) {
+			if((strlen(name) + 6) > 32) {
+				printf("Internal error: the name for the new vertex group is > 32 characters");
 				return;
 			}
-			strcpy (s, name);
-			BLI_snprintf (name, 32, "%s_copy", s);
+			strcpy(s, name);
+			BLI_snprintf(name, 32, "%s_copy", s);
 		}
 	}		
 
-	cdg = copy_defgroup (dg);
-	strcpy (cdg->name, name);
+	cdg = copy_defgroup(dg);
+	strcpy(cdg->name, name);
 	unique_vertexgroup_name(cdg, ob);
 	
-	BLI_addtail (&ob->defbase, cdg);
+	BLI_addtail(&ob->defbase, cdg);
 
 	idg = (ob->actdef-1);
-	ob->actdef = BLI_countlist (&ob->defbase);
+	ob->actdef = BLI_countlist(&ob->defbase);
 	icdg = (ob->actdef-1);
 
 	if(ob->type == OB_MESH) {
-		Mesh *me = get_mesh (ob);
+		Mesh *me = get_mesh(ob);
 		dvert_array= me->dvert;
 		dvert_tot= me->totvert;
 	}
-	else if (ob->type == OB_LATTICE) {
+	else if(ob->type == OB_LATTICE) {
 		Lattice *lt= (Lattice *)ob->data;
 		dvert_array= lt->dvert;
 		dvert_tot= lt->pntsu*lt->pntsv*lt->pntsw;
 	}
 	
-	if (!dvert_array)
+	if(!dvert_array)
 		return;
 
-	for (i = 0; i < dvert_tot; i++) {
+	for(i = 0; i < dvert_tot; i++) {
 		dvert = dvert_array+i;
-		org = get_defweight (dvert, idg);
-		if (org) {
+		org = ED_vgroup_weight_get(dvert, idg);
+		if(org) {
 			float weight = org->weight;
-			/* verify_defweight re-allocs org so need to store the weight first */
-			cpy = verify_defweight (dvert, icdg);
+			/* ED_vgroup_weight_verify re-allocs org so need to store the weight first */
+			cpy = ED_vgroup_weight_verify(dvert, icdg);
 			cpy->weight = weight;
 		}
 	}
 }
 
-static void del_defgroup_update_users(Object *ob, int id)
+static void vgroup_delete_update_users(Object *ob, int id)
 {
 	ExplodeModifierData *emd;
 	ModifierData *md;
@@ -351,77 +633,134 @@ static void del_defgroup_update_users(Object *ob, int id)
 	}
 }
 
-void del_defgroup_in_object_mode ( Object *ob )
+static void vgroup_delete_object_mode(Object *ob)
 {
 	bDeformGroup *dg;
 	MDeformVert *dvert, *dvert_array=NULL;
 	int i, e, dvert_tot=0;
 
-	if ((!ob) || (ob->type != OB_MESH && ob->type != OB_LATTICE))
-		return;
-
 	if(ob->type == OB_MESH) {
-		Mesh *me = get_mesh (ob);
+		Mesh *me = get_mesh(ob);
 		dvert_array= me->dvert;
 		dvert_tot= me->totvert;
 	}
-	else if (ob->type == OB_LATTICE) {
+	else if(ob->type == OB_LATTICE) {
 		Lattice *lt= (Lattice *)ob->data;
 		dvert_array= lt->dvert;
 		dvert_tot= lt->pntsu*lt->pntsv*lt->pntsw;
 	}
 	
-	dg = BLI_findlink (&ob->defbase, (ob->actdef-1));
-	if (!dg)
+	dg = BLI_findlink(&ob->defbase, (ob->actdef-1));
+	if(!dg)
 		return;
 	
-	if (dvert_array) {
-		for (i = 0; i < dvert_tot; i++) {
+	if(dvert_array) {
+		for(i = 0; i < dvert_tot; i++) {
 			dvert = dvert_array + i;
-			if (dvert) {
-				if (get_defweight (dvert, (ob->actdef-1)))
-					remove_vert_defgroup (ob, dg, i);
+			if(dvert) {
+				if(ED_vgroup_weight_get(dvert, (ob->actdef-1)))
+					ED_vgroup_vert_remove(ob, dg, i);
 			}
 		}
 
-		for (i = 0; i < dvert_tot; i++) {
+		for(i = 0; i < dvert_tot; i++) {
 			dvert = dvert_array+i;
-			if (dvert) {
-				for (e = 0; e < dvert->totweight; e++) {
-					if (dvert->dw[e].def_nr > (ob->actdef-1))
+			if(dvert) {
+				for(e = 0; e < dvert->totweight; e++) {
+					if(dvert->dw[e].def_nr > (ob->actdef-1))
 						dvert->dw[e].def_nr--;
 				}
 			}
 		}
 	}
 
-	del_defgroup_update_users(ob, ob->actdef);
+	vgroup_delete_update_users(ob, ob->actdef);
 
 	/* Update the active deform index if necessary */
-	if (ob->actdef == BLI_countlist(&ob->defbase))
+	if(ob->actdef == BLI_countlist(&ob->defbase))
 		ob->actdef--;
   
 	/* Remove the group */
-	BLI_freelinkN (&ob->defbase, dg);
+	BLI_freelinkN(&ob->defbase, dg);
 }
 
-void del_defgroup (Object *ob)
+/* only in editmode */
+/* removes from active defgroup, if allverts==0 only selected vertices */
+static void vgroup_active_remove_verts(Object *ob, int allverts)
 {
-	bDeformGroup	*defgroup;
-	int				i;
+	EditVert *eve;
+	MDeformVert *dvert;
+	MDeformWeight *newdw;
+	bDeformGroup *dg, *eg;
+	int	i;
 
-	if (!ob)
+	dg=BLI_findlink(&ob->defbase, ob->actdef-1);
+	if(!dg)
 		return;
 
-	if (!ob->actdef)
+	if(ob->type == OB_MESH) {
+		Mesh *me= ob->data;
+		EditMesh *em = BKE_mesh_get_editmesh(me);
+
+		for(eve=em->verts.first; eve; eve=eve->next){
+			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
+		
+			if(dvert && dvert->dw && ((eve->f & 1) || allverts)){
+				for(i=0; i<dvert->totweight; i++){
+					/* Find group */
+					eg = BLI_findlink(&ob->defbase, dvert->dw[i].def_nr);
+					if(eg == dg){
+						dvert->totweight--;
+						if(dvert->totweight){
+							newdw = MEM_mallocN(sizeof(MDeformWeight)*(dvert->totweight), "deformWeight");
+							
+							if(dvert->dw){
+								memcpy(newdw, dvert->dw, sizeof(MDeformWeight)*i);
+								memcpy(newdw+i, dvert->dw+i+1, sizeof(MDeformWeight)*(dvert->totweight-i));
+								MEM_freeN(dvert->dw);
+							}
+							dvert->dw=newdw;
+						}
+						else{
+							MEM_freeN(dvert->dw);
+							dvert->dw=NULL;
+							break;
+						}
+					}
+				}
+			}
+		}
+		BKE_mesh_end_editmesh(me, em);
+	}
+	else if(ob->type == OB_LATTICE) {
+		Lattice *lt= vgroup_edit_lattice(ob);
+		
+		if(lt->dvert) {
+			BPoint *bp;
+			int a, tot= lt->pntsu*lt->pntsv*lt->pntsw;
+				
+			for(a=0, bp= lt->def; a<tot; a++, bp++) {
+				if(allverts || (bp->f1 & SELECT))
+					ED_vgroup_vert_remove(ob, dg, a);
+			}
+		}
+	}
+}
+
+static void vgroup_delete_edit_mode(Object *ob)
+{
+	bDeformGroup *defgroup;
+	int i;
+
+	if(!ob->actdef)
 		return;
 
 	defgroup = BLI_findlink(&ob->defbase, ob->actdef-1);
-	if (!defgroup)
+	if(!defgroup)
 		return;
 
 	/* Make sure that no verts are using this group */
-	remove_verts_defgroup(ob, 1);
+	vgroup_active_remove_verts(ob, 1);
 
 	/* Make sure that any verts with higher indices are adjusted accordingly */
 	if(ob->type==OB_MESH) {
@@ -430,37 +769,37 @@ void del_defgroup (Object *ob)
 		EditVert *eve;
 		MDeformVert *dvert;
 		
-		for (eve=em->verts.first; eve; eve=eve->next){
+		for(eve=em->verts.first; eve; eve=eve->next){
 			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
 
-			if (dvert)
-				for (i=0; i<dvert->totweight; i++)
-					if (dvert->dw[i].def_nr > (ob->actdef-1))
+			if(dvert)
+				for(i=0; i<dvert->totweight; i++)
+					if(dvert->dw[i].def_nr > (ob->actdef-1))
 						dvert->dw[i].def_nr--;
 		}
 		BKE_mesh_end_editmesh(me, em);
 	}
 	else if(ob->type==OB_LATTICE) {
-		Lattice *lt= def_get_lattice(ob);
+		Lattice *lt= vgroup_edit_lattice(ob);
 		BPoint *bp;
 		MDeformVert *dvert= lt->dvert;
 		int a, tot;
 		
-		if (dvert) {
+		if(dvert) {
 			tot= lt->pntsu*lt->pntsv*lt->pntsw;
 			for(a=0, bp= lt->def; a<tot; a++, bp++, dvert++) {
-				for (i=0; i<dvert->totweight; i++){
-					if (dvert->dw[i].def_nr > (ob->actdef-1))
+				for(i=0; i<dvert->totweight; i++){
+					if(dvert->dw[i].def_nr > (ob->actdef-1))
 						dvert->dw[i].def_nr--;
 				}
 			}
 		}
 	}
 
-	del_defgroup_update_users(ob, ob->actdef);
+	vgroup_delete_update_users(ob, ob->actdef);
 
 	/* Update the active deform index if necessary */
-	if (ob->actdef==BLI_countlist(&ob->defbase))
+	if(ob->actdef==BLI_countlist(&ob->defbase))
 		ob->actdef--;
 	
 	/* Remove the group */
@@ -474,8 +813,8 @@ void del_defgroup (Object *ob)
 			me->dvert= NULL;
 		}
 		else if(ob->type==OB_LATTICE) {
-			Lattice *lt= def_get_lattice(ob);
-			if (lt->dvert) {
+			Lattice *lt= vgroup_edit_lattice(ob);
+			if(lt->dvert) {
 				MEM_freeN(lt->dvert);
 				lt->dvert= NULL;
 			}
@@ -483,21 +822,35 @@ void del_defgroup (Object *ob)
 	}
 }
 
-void del_all_defgroups (Object *ob)
+static int vgroup_object_in_edit_mode(Object *ob)
 {
-	/* Sanity check */
-	if (ob == NULL)
-		return;
+	if(ob->type == OB_MESH)
+		return (((Mesh*)ob->data)->edit_mesh != NULL);
+	else if(ob->type == OB_LATTICE)
+		return (((Lattice*)ob->data)->editlatt != NULL);
 	
+	return 0;
+}
+
+static void vgroup_delete(Object *ob)
+{
+	if(vgroup_object_in_edit_mode(ob))
+		vgroup_delete_edit_mode(ob);
+	else
+		vgroup_delete_object_mode(ob);
+}
+
+static void vgroup_delete_all(Object *ob)
+{
 	/* Remove all DVerts */
-	if (ob->type==OB_MESH) {
+	if(ob->type==OB_MESH) {
 		Mesh *me= ob->data;
 		CustomData_free_layer_active(&me->vdata, CD_MDEFORMVERT, me->totvert);
 		me->dvert= NULL;
 	}
 	else if(ob->type==OB_LATTICE) {
-		Lattice *lt= def_get_lattice(ob);
-		if (lt->dvert) {
+		Lattice *lt= vgroup_edit_lattice(ob);
+		if(lt->dvert) {
 			MEM_freeN(lt->dvert);
 			lt->dvert= NULL;
 		}
@@ -510,223 +863,8 @@ void del_all_defgroups (Object *ob)
 	ob->actdef= 0;
 }
 
-void create_dverts(ID *id)
-{
-	/* create deform verts
-	 */
-
-	if( GS(id->name)==ID_ME) {
-		Mesh *me= (Mesh *)id;
-		me->dvert= CustomData_add_layer(&me->vdata, CD_MDEFORMVERT, CD_CALLOC, NULL, me->totvert);
-	}
-	else if( GS(id->name)==ID_LT) {
-		Lattice *lt= (Lattice *)id;
-		lt->dvert= MEM_callocN(sizeof(MDeformVert)*lt->pntsu*lt->pntsv*lt->pntsw, "lattice deformVert");
-	}
-}
-
-/* for mesh in object mode
-   lattice can be in editmode */
-void remove_vert_def_nr (Object *ob, int def_nr, int vertnum)
-{
-	/* This routine removes the vertex from the deform
-	 * group with number def_nr.
-	 *
-	 * This routine is meant to be fast, so it is the
-	 * responsibility of the calling routine to:
-	 *   a) test whether ob is non-NULL
-	 *   b) test whether ob is a mesh
-	 *   c) calculate def_nr
-	 */
-
-	MDeformWeight *newdw;
-	MDeformVert *dvert= NULL;
-	int i;
-
-	/* get the deform vertices corresponding to the
-	 * vertnum
-	 */
-	if(ob->type==OB_MESH) {
-		if( ((Mesh*)ob->data)->dvert )
-			dvert = ((Mesh*)ob->data)->dvert + vertnum;
-	}
-	else if(ob->type==OB_LATTICE) {
-		Lattice *lt= def_get_lattice(ob);
-		
-		if(lt->dvert)
-			dvert = lt->dvert + vertnum;
-	}
-	
-	if(dvert==NULL)
-		return;
-	
-	/* for all of the deform weights in the
-	 * deform vert
-	 */
-	for (i=dvert->totweight - 1 ; i>=0 ; i--){
-
-		/* if the def_nr is the same as the one
-		 * for our weight group then remove it
-		 * from this deform vert.
-		 */
-		if (dvert->dw[i].def_nr == def_nr) {
-			dvert->totweight--;
-        
-			/* if there are still other deform weights
-			 * attached to this vert then remove this
-			 * deform weight, and reshuffle the others
-			 */
-			if (dvert->totweight) {
-				newdw = MEM_mallocN (sizeof(MDeformWeight)*(dvert->totweight), 
-									 "deformWeight");
-				if (dvert->dw){
-					memcpy (newdw, dvert->dw, sizeof(MDeformWeight)*i);
-					memcpy (newdw+i, dvert->dw+i+1, 
-							sizeof(MDeformWeight)*(dvert->totweight-i));
-					MEM_freeN (dvert->dw);
-				}
-				dvert->dw=newdw;
-			}
-			/* if there are no other deform weights
-			 * left then just remove the deform weight
-			 */
-			else {
-				MEM_freeN (dvert->dw);
-				dvert->dw = NULL;
-				break;
-			}
-		}
-	}
-
-}
-
-/* for Mesh in Object mode */
-/* allows editmode for Lattice */
-void add_vert_defnr (Object *ob, int def_nr, int vertnum, 
-                           float weight, int assignmode)
-{
-	/* add the vert to the deform group with the
-	 * specified number
-	 */
-	MDeformVert *dv= NULL;
-	MDeformWeight *newdw;
-	int	i;
-
-	/* get the vert */
-	if(ob->type==OB_MESH) {
-		if(((Mesh*)ob->data)->dvert)
-			dv = ((Mesh*)ob->data)->dvert + vertnum;
-	}
-	else if(ob->type==OB_LATTICE) {
-		Lattice *lt= def_get_lattice(ob);
-		
-		if(lt->dvert)
-			dv = lt->dvert + vertnum;
-	}
-	
-	if(dv==NULL)
-		return;
-	
-	/* Lets first check to see if this vert is
-	 * already in the weight group -- if so
-	 * lets update it
-	 */
-	for (i=0; i<dv->totweight; i++){
-		
-		/* if this weight cooresponds to the
-		 * deform group, then add it using
-		 * the assign mode provided
-		 */
-		if (dv->dw[i].def_nr == def_nr){
-			
-			switch (assignmode) {
-			case WEIGHT_REPLACE:
-				dv->dw[i].weight=weight;
-				break;
-			case WEIGHT_ADD:
-				dv->dw[i].weight+=weight;
-				if (dv->dw[i].weight >= 1.0)
-					dv->dw[i].weight = 1.0;
-				break;
-			case WEIGHT_SUBTRACT:
-				dv->dw[i].weight-=weight;
-				/* if the weight is zero or less then
-				 * remove the vert from the deform group
-				 */
-				if (dv->dw[i].weight <= 0.0)
-					remove_vert_def_nr(ob, def_nr, vertnum);
-				break;
-			}
-			return;
-		}
-	}
-
-	/* if the vert wasn't in the deform group then
-	 * we must take a different form of action ...
-	 */
-
-	switch (assignmode) {
-	case WEIGHT_SUBTRACT:
-		/* if we are subtracting then we don't
-		 * need to do anything
-		 */
-		return;
-
-	case WEIGHT_REPLACE:
-	case WEIGHT_ADD:
-		/* if we are doing an additive assignment, then
-		 * we need to create the deform weight
-		 */
-		newdw = MEM_callocN (sizeof(MDeformWeight)*(dv->totweight+1), 
-							 "deformWeight");
-		if (dv->dw){
-			memcpy (newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight);
-			MEM_freeN (dv->dw);
-		}
-		dv->dw=newdw;
-    
-		dv->dw[dv->totweight].weight=weight;
-		dv->dw[dv->totweight].def_nr=def_nr;
-    
-		dv->totweight++;
-		break;
-	}
-}
-
-/* called while not in editmode */
-void add_vert_to_defgroup (Object *ob, bDeformGroup *dg, int vertnum, 
-                           float weight, int assignmode)
-{
-	/* add the vert to the deform group with the
-	 * specified assign mode
-	 */
-	int	def_nr;
-
-	/* get the deform group number, exit if
-	 * it can't be found
-	 */
-	def_nr = get_defgroup_num(ob, dg);
-	if (def_nr < 0) return;
-
-	/* if there's no deform verts then
-	 * create some
-	 */
-	if(ob->type==OB_MESH) {
-		if (!((Mesh*)ob->data)->dvert)
-			create_dverts(ob->data);
-	}
-	else if(ob->type==OB_LATTICE) {
-		if (!((Lattice*)ob->data)->dvert)
-			create_dverts(ob->data);
-	}
-
-	/* call another function to do the work
-	 */
-	add_vert_defnr (ob, def_nr, vertnum, weight, assignmode);
-}
-
-/* Only available in editmode */
-void assign_verts_defgroup (Object *ob, float weight)
+/* only in editmode */
+static void vgroup_assign_verts(Object *ob, float weight)
 {
 	EditVert *eve;
 	bDeformGroup *dg, *eg;
@@ -734,48 +872,39 @@ void assign_verts_defgroup (Object *ob, float weight)
 	MDeformVert *dvert;
 	int	i, done;
 
-	if (!ob)
-		return;
-
 	dg=BLI_findlink(&ob->defbase, ob->actdef-1);
-	if (!dg){
-		error ("No vertex group is active");
-		return;
-	}
 
-	switch (ob->type){
-	case OB_MESH:
-	{
+	if(ob->type == OB_MESH) {
 		Mesh *me= ob->data;
 		EditMesh *em = BKE_mesh_get_editmesh(me);
 
-		if (!CustomData_has_layer(&em->vdata, CD_MDEFORMVERT))
+		if(!CustomData_has_layer(&em->vdata, CD_MDEFORMVERT))
 			EM_add_data_layer(em, &em->vdata, CD_MDEFORMVERT);
 
 		/* Go through the list of editverts and assign them */
-		for (eve=em->verts.first; eve; eve=eve->next){
+		for(eve=em->verts.first; eve; eve=eve->next){
 			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
 
-			if (dvert && (eve->f & 1)){
+			if(dvert && (eve->f & 1)){
 				done=0;
 				/* See if this vert already has a reference to this group */
 				/*		If so: Change its weight */
 				done=0;
-				for (i=0; i<dvert->totweight; i++){
-					eg = BLI_findlink (&ob->defbase, dvert->dw[i].def_nr);
+				for(i=0; i<dvert->totweight; i++){
+					eg = BLI_findlink(&ob->defbase, dvert->dw[i].def_nr);
 					/* Find the actual group */
-					if (eg==dg){
+					if(eg==dg){
 						dvert->dw[i].weight= weight;
 						done=1;
 						break;
 					}
 			 	}
 				/*		If not: Add the group and set its weight */
-				if (!done){
-					newdw = MEM_callocN (sizeof(MDeformWeight)*(dvert->totweight+1), "deformWeight");
-					if (dvert->dw){
-						memcpy (newdw, dvert->dw, sizeof(MDeformWeight)*dvert->totweight);
-						MEM_freeN (dvert->dw);
+				if(!done){
+					newdw = MEM_callocN(sizeof(MDeformWeight)*(dvert->totweight+1), "deformWeight");
+					if(dvert->dw){
+						memcpy(newdw, dvert->dw, sizeof(MDeformWeight)*dvert->totweight);
+						MEM_freeN(dvert->dw);
 					}
 					dvert->dw=newdw;
 
@@ -789,331 +918,69 @@ void assign_verts_defgroup (Object *ob, float weight)
 		}
 		BKE_mesh_end_editmesh(me, em);
 	}
-		break;
-	case OB_LATTICE:
-		{
-			Lattice *lt= def_get_lattice(ob);
-			BPoint *bp;
-			int a, tot;
-			
-			if(lt->dvert==NULL)
-				create_dverts(&lt->id);
-			
-			tot= lt->pntsu*lt->pntsv*lt->pntsw;
-			for(a=0, bp= lt->def; a<tot; a++, bp++) {
-				if(bp->f1 & SELECT)
-					add_vert_defnr (ob, ob->actdef-1, a, weight, WEIGHT_REPLACE);
-			}
-		}
-		break;
-	default:
-		printf ("Assigning deformation groups to unknown object type\n");
-		break;
-	}
-
-}
-
-/* mesh object mode, lattice can be in editmode */
-void remove_vert_defgroup (Object *ob, bDeformGroup	*dg, int vertnum)
-{
-	/* This routine removes the vertex from the specified
-	 * deform group.
-	 */
-
-	int def_nr;
-
-	/* if the object is NULL abort
-	 */
-	if (!ob)
-		return;
-
-	/* get the deform number that cooresponds
-	 * to this deform group, and abort if it
-	 * can not be found.
-	 */
-	def_nr = get_defgroup_num(ob, dg);
-	if (def_nr < 0) return;
-
-	/* call another routine to do the work
-	 */
-	remove_vert_def_nr (ob, def_nr, vertnum);
-}
-
-/* for mesh in object mode lattice can be in editmode */
-static float get_vert_def_nr (Object *ob, int def_nr, int vertnum)
-{
-	MDeformVert *dvert= NULL;
-	int i;
-
-	/* get the deform vertices corresponding to the
-	 * vertnum
-	 */
-	if(ob->type==OB_MESH) {
-		if( ((Mesh*)ob->data)->dvert )
-			dvert = ((Mesh*)ob->data)->dvert + vertnum;
-	}
-	else if(ob->type==OB_LATTICE) {
-		Lattice *lt= def_get_lattice(ob);
+	else if(ob->type == OB_LATTICE) {
+		Lattice *lt= vgroup_edit_lattice(ob);
+		BPoint *bp;
+		int a, tot;
 		
-		if(lt->dvert)
-			dvert = lt->dvert + vertnum;
-	}
-	
-	if(dvert==NULL)
-		return 0.0f;
-	
-	for(i=dvert->totweight-1 ; i>=0 ; i--)
-		if(dvert->dw[i].def_nr == def_nr)
-			return dvert->dw[i].weight;
-
-	return 0.0f;
-}
-
-/* mesh object mode, lattice can be in editmode */
-float get_vert_defgroup (Object *ob, bDeformGroup *dg, int vertnum)
-{
-	int def_nr;
-
-	if(!ob)
-		return 0.0f;
-
-	def_nr = get_defgroup_num(ob, dg);
-	if(def_nr < 0) return 0.0f;
-
-	return get_vert_def_nr (ob, def_nr, vertnum);
-}
-
-/* Only available in editmode */
-/* removes from active defgroup, if allverts==0 only selected vertices */
-void remove_verts_defgroup (Object *ob, int allverts)
-{
-	EditVert *eve;
-	MDeformVert *dvert;
-	MDeformWeight *newdw;
-	bDeformGroup *dg, *eg;
-	int	i;
-
-	if (!ob)
-		return;
-
-	dg=BLI_findlink(&ob->defbase, ob->actdef-1);
-	if (!dg){
-		error ("No vertex group is active");
-		return;
-	}
-
-	switch (ob->type){
-	case OB_MESH:
-	{
-		Mesh *me= ob->data;
-		EditMesh *em = BKE_mesh_get_editmesh(me);
-
-		for (eve=em->verts.first; eve; eve=eve->next){
-			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
+		if(lt->dvert==NULL)
+			ED_vgroup_data_create(&lt->id);
 		
-			if (dvert && dvert->dw && ((eve->f & 1) || allverts)){
-				for (i=0; i<dvert->totweight; i++){
-					/* Find group */
-					eg = BLI_findlink (&ob->defbase, dvert->dw[i].def_nr);
-					if (eg == dg){
-						dvert->totweight--;
-						if (dvert->totweight){
-							newdw = MEM_mallocN (sizeof(MDeformWeight)*(dvert->totweight), "deformWeight");
-							
-							if (dvert->dw){
-								memcpy (newdw, dvert->dw, sizeof(MDeformWeight)*i);
-								memcpy (newdw+i, dvert->dw+i+1, sizeof(MDeformWeight)*(dvert->totweight-i));
-								MEM_freeN (dvert->dw);
-							}
-							dvert->dw=newdw;
-						}
-						else{
-							MEM_freeN (dvert->dw);
-							dvert->dw=NULL;
-							break;
-						}
-					}
-				}
-			}
-		}
-		BKE_mesh_end_editmesh(me, em);
-	}
-		break;
-	case OB_LATTICE:
-	{
-		Lattice *lt= def_get_lattice(ob);
-		
-		if(lt->dvert) {
-			BPoint *bp;
-			int a, tot= lt->pntsu*lt->pntsv*lt->pntsw;
-				
-			for(a=0, bp= lt->def; a<tot; a++, bp++) {
-				if(allverts || (bp->f1 & SELECT))
-					remove_vert_defgroup (ob, dg, a);
-			}
+		tot= lt->pntsu*lt->pntsv*lt->pntsw;
+		for(a=0, bp= lt->def; a<tot; a++, bp++) {
+			if(bp->f1 & SELECT)
+				ED_vgroup_nr_vert_add(ob, ob->actdef-1, a, weight, WEIGHT_REPLACE);
 		}
 	}
-		break;
-		
-	default:
-		printf ("Removing deformation groups from unknown object type\n");
-		break;
-	}
 }
 
-/* Only available in editmode */
+/* only in editmode */
 /* removes from all defgroup, if allverts==0 only selected vertices */
-void remove_verts_defgroups(Object *ob, int allverts)
+static void vgroup_remove_verts(Object *ob, int allverts)
 {
 	int actdef, defCount;
-
-	if (ob == NULL) return;
 	
 	actdef= ob->actdef;
 	defCount= BLI_countlist(&ob->defbase);
 	
-	if (defCount == 0) {
-		error("Object has no vertex groups");
+	if(defCount == 0)
 		return;
-	}
 	
-	/* To prevent code redundancy, we just use remove_verts_defgroup, but that
+	/* To prevent code redundancy, we just use vgroup_active_remove_verts, but that
 	 * only operates on the active vgroup. So we iterate through all groups, by changing
 	 * active group index
 	 */
-	for (ob->actdef= 1; ob->actdef <= defCount; ob->actdef++)
-		remove_verts_defgroup(ob, allverts);
+	for(ob->actdef= 1; ob->actdef <= defCount; ob->actdef++)
+		vgroup_active_remove_verts(ob, allverts);
 		
 	ob->actdef= actdef;
 }
 
-void vertexgroup_select_by_name(Object *ob, char *name)
-{
-	bDeformGroup *curdef;
-	int actdef= 1;
-	
-	if(ob==NULL) return;
-	
-	for (curdef = ob->defbase.first; curdef; curdef=curdef->next, actdef++){
-		if (!strcmp(curdef->name, name)) {
-			ob->actdef= actdef;
-			return;
-		}
-	}
-	ob->actdef=0;	// this signals on painting to create a new one, if a bone in posemode is selected */
-}
-
-/* This function provides a shortcut for adding/removing verts from 
- * vertex groups. It is called by the Ctrl-G hotkey in EditMode for Meshes
- * and Lattices. (currently only restricted to those two)
- * It is only responsible for 
- */
-void vgroup_assign_with_menu(Scene *scene, Object *ob)
-{
-	VPaint *wp= scene->toolsettings->wpaint;
-	int defCount;
-	int mode= 0;
-	
-	/* prevent crashes */
-	if (wp==NULL || ob==NULL) return;
-	
-	defCount= BLI_countlist(&ob->defbase);
-	
-	/* give user choices of adding to current/new or removing from current */
-// XXX	if (defCount && ob->actdef)
-//		mode = pupmenu("Vertex Groups %t|Add Selected to New Group %x1|Add Selected to Active Group %x2|Remove Selected from Active Group %x3|Remove Selected from All Groups %x4");
-//	else
-//		mode= pupmenu("Vertex Groups %t|Add Selected to New Group %x1");
-	
-	/* handle choices */
-	switch (mode) {
-		case 1: /* add to new group */
-			add_defgroup(ob);
-			assign_verts_defgroup(ob, paint_brush(&wp->paint)->alpha);
-			BIF_undo_push("Assign to vertex group");
-			break;
-		case 2: /* add to current group */
-			assign_verts_defgroup(ob, paint_brush(&wp->paint)->alpha);
-			BIF_undo_push("Assign to vertex group");
-			break;
-		case 3:	/* remove from current group */
-			remove_verts_defgroup(ob, 0);
-			BIF_undo_push("Remove from vertex group");
-			break;
-		case 4: /* remove from all groups */
-			remove_verts_defgroups(ob, 0);
-			BIF_undo_push("Remove from all vertex groups");
-			break;
-	}
-}
-
-/* This function provides a shortcut for commonly used vertex group 
- * functions - change weight (not implemented), change active group, delete active group,
- * when Ctrl-Shift-G is used in EditMode, for Meshes and Lattices (only for now).
- */
-void vgroup_operation_with_menu(Object *ob)
-{
-	int defCount;
-	int mode= 0;
-	
-	/* prevent crashes and useless cases */
-	if (ob==NULL) return;
-	
-	defCount= BLI_countlist(&ob->defbase);
-	if (defCount == 0) return;
-	
-	/* give user choices of adding to current/new or removing from current */
-// XXX	if (ob->actdef)
-//		mode = pupmenu("Vertex Groups %t|Change Active Group%x1|Delete Active Group%x2|Delete All Groups%x3");
-//	else
-//		mode= pupmenu("Vertex Groups %t|Change Active Group%x1|Delete All Groups%x3");
-	
-	/* handle choices */
-	switch (mode) {
-		case 1: /* change active group*/
-			{
-				char *menustr= NULL; // XXX get_vertexgroup_menustr(ob);
-				short nr;
-				
-				if (menustr) {
-					nr= 1; // pupmenu(menustr); // XXX
-					
-					if ((nr >= 1) && (nr <= defCount)) 
-						ob->actdef= nr;
-						
-					MEM_freeN(menustr);
-				}
-			}
-			break;
-		case 2: /* delete active group  */
-			{
-				del_defgroup(ob);
-				BIF_undo_push("Delete vertex group");
-			}
-			break;
-		case 3: /* delete all groups */
-			{
-				del_all_defgroups(ob);
-				BIF_undo_push("Delete all vertex groups");
-			}
-			break;
-	}
-}
-
 /********************** vertex group operators *********************/
 
 static int vertex_group_poll(bContext *C)
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 	ID *data= (ob)? ob->data: NULL;
-	return (ob && !ob->id.lib && data && !data->lib);
+	return (ob && !ob->id.lib && ELEM(ob->type, OB_MESH, OB_LATTICE) && data && !data->lib);
+}
+
+static int vertex_group_poll_edit(bContext *C)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	ID *data= (ob)? ob->data: NULL;
+
+	if(!(ob && !ob->id.lib && data && !data->lib))
+		return 0;
+
+	return vgroup_object_in_edit_mode(ob);
 }
 
 static int vertex_group_add_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 
-	add_defgroup(ob);
+	ED_vgroup_add(ob);
 	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
@@ -1138,16 +1005,13 @@ void OBJECT_OT_vertex_group_add(wmOperatorType *ot)
 static int vertex_group_remove_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Scene *scene= CTX_data_scene(C);
 
-	if(scene->obedit == ob) {
-		del_defgroup(ob);
-	}
-	else {
-		del_defgroup_in_object_mode(ob);
-		DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
-	}
+	if(RNA_boolean_get(op->ptr, "all"))
+		vgroup_delete_all(ob);
+	else
+		vgroup_delete(ob);
 
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
@@ -1166,6 +1030,9 @@ void OBJECT_OT_vertex_group_remove(wmOperatorType *ot)
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "all", 0, "All", "Remove from all vertex groups.");
 }
 
 static int vertex_group_assign_exec(bContext *C, wmOperator *op)
@@ -1173,7 +1040,10 @@ static int vertex_group_assign_exec(bContext *C, wmOperator *op)
 	ToolSettings *ts= CTX_data_tool_settings(C);
 	Object *ob= CTX_data_edit_object(C);
 
-	assign_verts_defgroup(ob, ts->vgroup_weight);
+	if(RNA_boolean_get(op->ptr, "new"))
+		ED_vgroup_add(ob);
+
+	vgroup_assign_verts(ob, ts->vgroup_weight);
 	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 	
@@ -1187,21 +1057,24 @@ void OBJECT_OT_vertex_group_assign(wmOperatorType *ot)
 	ot->idname= "OBJECT_OT_vertex_group_assign";
 	
 	/* api callbacks */
-	ot->poll= vertex_group_poll;
+	ot->poll= vertex_group_poll_edit;
 	ot->exec= vertex_group_assign_exec;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "new", 0, "New", "Assign vertex to new vertex group.");
 }
 
 static int vertex_group_remove_from_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_edit_object(C);
 
-	remove_verts_defgroup(ob, 0);
+	vgroup_remove_verts(ob, 0);
 	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-	
+
 	return OPERATOR_FINISHED;
 }
 
@@ -1210,13 +1083,16 @@ void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Remove from Vertex Group";
 	ot->idname= "OBJECT_OT_vertex_group_remove_from";
-	
+
 	/* api callbacks */
-	ot->poll= vertex_group_poll;
+	ot->poll= vertex_group_poll_edit;
 	ot->exec= vertex_group_remove_from_exec;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "all", 0, "All", "Remove from all vertex groups.");
 }
 
 static int vertex_group_select_exec(bContext *C, wmOperator *op)
@@ -1226,7 +1102,7 @@ static int vertex_group_select_exec(bContext *C, wmOperator *op)
 	if(!ob || ob->id.lib)
 		return OPERATOR_CANCELLED;
 
-	sel_verts_defgroup(ob, 1);
+	vgroup_select_verts(ob, 1);
 	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, ob->data);
 
 	return OPERATOR_FINISHED;
@@ -1237,9 +1113,9 @@ void OBJECT_OT_vertex_group_select(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select Vertex Group";
 	ot->idname= "OBJECT_OT_vertex_group_select";
-	
+
 	/* api callbacks */
-	ot->poll= vertex_group_poll;
+	ot->poll= vertex_group_poll_edit;
 	ot->exec= vertex_group_select_exec;
 
 	/* flags */
@@ -1250,7 +1126,7 @@ static int vertex_group_deselect_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_edit_object(C);
 
-	sel_verts_defgroup(ob, 0);
+	vgroup_select_verts(ob, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, ob->data);
 
 	return OPERATOR_FINISHED;
@@ -1261,9 +1137,9 @@ void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Deselect Vertex Group";
 	ot->idname= "OBJECT_OT_vertex_group_deselect";
-	
+
 	/* api callbacks */
-	ot->poll= vertex_group_poll;
+	ot->poll= vertex_group_poll_edit;
 	ot->exec= vertex_group_deselect_exec;
 
 	/* flags */
@@ -1274,11 +1150,11 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *op)
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 
-	duplicate_defgroup(ob);
+	vgroup_duplicate(ob);
 	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-	
+
 	return OPERATOR_FINISHED;
 }
 
@@ -1287,7 +1163,7 @@ void OBJECT_OT_vertex_group_copy(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Copy Vertex Group";
 	ot->idname= "OBJECT_OT_vertex_group_copy";
-	
+
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_copy_exec;
@@ -1300,25 +1176,25 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-    Base *base;
+	Base *base;
 	int retval= OPERATOR_CANCELLED;
 
-    for(base=scene->base.first; base; base= base->next) {
-        if(base->object->type==ob->type) {
-            if(base->object!=ob && base->object->data==ob->data) {
-                BLI_freelistN(&base->object->defbase);
-                BLI_duplicatelist(&base->object->defbase, &ob->defbase);
-                base->object->actdef= ob->actdef;
+	for(base=scene->base.first; base; base= base->next) {
+		if(base->object->type==ob->type) {
+			if(base->object!=ob && base->object->data==ob->data) {
+				BLI_freelistN(&base->object->defbase);
+				BLI_duplicatelist(&base->object->defbase, &ob->defbase);
+				base->object->actdef= ob->actdef;
 
-                DAG_id_flush_update(&base->object->id, OB_RECALC_DATA);
+				DAG_id_flush_update(&base->object->id, OB_RECALC_DATA);
 				WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, base->object);
 				WM_event_add_notifier(C, NC_GEOM|ND_DATA, base->object->data);
 
 				retval = OPERATOR_FINISHED;
-            }
-        }
-    }
-	
+			}
+		}
+	}
+
 	return retval;
 }
 
@@ -1327,7 +1203,7 @@ void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Copy Vertex Group to Linked";
 	ot->idname= "OBJECT_OT_vertex_group_copy_to_linked";
-	
+
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
 	ot->exec= vertex_group_copy_to_linked_exec;
@@ -1336,3 +1212,110 @@ void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
+static EnumPropertyItem vgroup_items[]= {
+	{0, NULL, 0, NULL, NULL}};
+
+static int set_active_group_exec(bContext *C, wmOperator *op)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	int nr= RNA_enum_get(op->ptr, "group");
+
+	ob->actdef= nr+1;
+
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+
+	return OPERATOR_FINISHED;
+}
+
+static EnumPropertyItem *vgroup_itemf(bContext *C, PointerRNA *ptr, int *free)
+{	
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	EnumPropertyItem tmp = {0, "", 0, "", ""};
+	EnumPropertyItem *item= NULL;
+	bDeformGroup *def;
+	int a, totitem= 0;
+	
+	if(!C) /* needed for docs */
+		return vgroup_items;
+	
+	for(a=0, def=ob->defbase.first; def; def=def->next, a++) {
+		tmp.value= a;
+		tmp.identifier= def->name;
+		tmp.name= def->name;
+		RNA_enum_item_add(&item, &totitem, &tmp);
+	}
+
+	RNA_enum_item_end(&item, &totitem);
+
+	*free= 1;
+
+	return item;
+}
+
+void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+
+	/* identifiers */
+	ot->name= "Set Active Vertex Group";
+	ot->idname= "OBJECT_OT_vertex_group_set_active";
+
+	/* api callbacks */
+	ot->poll= vertex_group_poll;
+	ot->exec= set_active_group_exec;
+	ot->invoke= WM_menu_invoke;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active.");
+	RNA_def_enum_funcs(prop, vgroup_itemf);
+}
+
+static int vertex_group_menu_exec(bContext *C, wmOperator *op)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	uiPopupMenu *pup;
+	uiLayout *layout;
+
+	pup= uiPupMenuBegin(C, "Vertex Groups", 0);
+	layout= uiPupMenuLayout(pup);
+	uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_REGION_WIN);
+
+	if(vgroup_object_in_edit_mode(ob)) {
+		uiItemBooleanO(layout, "Assign to New Group", 0, "OBJECT_OT_vertex_group_assign", "new", 1);
+
+		if(BLI_countlist(&ob->defbase) && ob->actdef) {
+			uiItemO(layout, "Assign to Group", 0, "OBJECT_OT_vertex_group_assign");
+			uiItemO(layout, "Remove from Group", 0, "OBJECT_OT_vertex_group_remove_from");
+			uiItemBooleanO(layout, "Remove from All", 0, "OBJECT_OT_vertex_group_remove_from", "all", 1);
+		}
+	}
+
+	if(BLI_countlist(&ob->defbase) && ob->actdef) {
+		if(vgroup_object_in_edit_mode(ob))
+			uiItemS(layout);
+
+		uiItemO(layout, "Set Active Group", 0, "OBJECT_OT_vertex_group_set_active");
+		uiItemO(layout, "Remove Group", 0, "OBJECT_OT_vertex_group_remove");
+		uiItemBooleanO(layout, "Remove All Groups", 0, "OBJECT_OT_vertex_group_remove", "all", 1);
+	}
+
+	uiPupMenuEnd(C, pup);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_vertex_group_menu(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Vertex Group Menu";
+	ot->idname= "OBJECT_OT_vertex_group_menu";
+
+	/* api callbacks */
+	ot->poll= vertex_group_poll;
+	ot->exec= vertex_group_menu_exec;
+}
+
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 1e36a32b9e1..17c51a7b7d3 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -108,6 +108,12 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 
 		return 1;
 	}
+	else if(CTX_data_equals(member, "object")) {
+		if(scene->basact)
+			CTX_data_id_pointer_set(result, &scene->basact->object->id);
+
+		return 1;
+	}
 	else if(CTX_data_equals(member, "edit_object")) {
 		/* convenience for now, 1 object per scene in editmode */
 		if(scene->obedit)
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 73589371c4f..25ff57ca87f 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -408,8 +408,8 @@ void clear_wpaint_selectedfaces(Scene *scene)
 				if (!strcmp(curdef->name, name))
 					break;
 			if(curdef==NULL) {
-				int olddef= ob->actdef;	/* tsk, add_defgroup sets the active defgroup */
-				curdef= add_defgroup_name (ob, name);
+				int olddef= ob->actdef;	/* tsk, ED_vgroup_add sets the active defgroup */
+				curdef= ED_vgroup_add_name (ob, name);
 				ob->actdef= olddef;
 			}
 			
@@ -431,9 +431,9 @@ void clear_wpaint_selectedfaces(Scene *scene)
 			faceverts[3]= mface->v4;
 			for (i=0; i<3 || faceverts[i]; i++) {
 				if(!((me->dvert+faceverts[i])->flag)) {
-					dw= verify_defweight(me->dvert+faceverts[i], vgroup);
+					dw= ED_vgroup_weight_verify(me->dvert+faceverts[i], vgroup);
 					if(dw) {
-						uw= verify_defweight(wp->wpaint_prev+faceverts[i], vgroup);
+						uw= ED_vgroup_weight_verify(wp->wpaint_prev+faceverts[i], vgroup);
 						uw->weight= dw->weight; /* set the undo weight */
 						dw->weight= paintweight;
 						
@@ -442,11 +442,11 @@ void clear_wpaint_selectedfaces(Scene *scene)
 							if(j>=0) {
 								/* copy, not paint again */
 								if(vgroup_mirror != -1) {
-									dw= verify_defweight(me->dvert+j, vgroup_mirror);
-									uw= verify_defweight(wp->wpaint_prev+j, vgroup_mirror);
+									dw= ED_vgroup_weight_verify(me->dvert+j, vgroup_mirror);
+									uw= ED_vgroup_weight_verify(wp->wpaint_prev+j, vgroup_mirror);
 								} else {
-									dw= verify_defweight(me->dvert+j, vgroup);
-									uw= verify_defweight(wp->wpaint_prev+j, vgroup);
+									dw= ED_vgroup_weight_verify(me->dvert+j, vgroup);
+									uw= ED_vgroup_weight_verify(wp->wpaint_prev+j, vgroup);
 								}
 								uw->weight= dw->weight; /* set the undo weight */
 								dw->weight= paintweight;
@@ -963,20 +963,20 @@ void sample_wpaint(Scene *scene, ARegion *ar, View3D *v3d, int mode)
 				
 				fac= MIN4(w1, w2, w3, w4);
 				if(w1==fac) {
-					dw= get_defweight(me->dvert+mface->v1, ob->actdef-1);
+					dw= ED_vgroup_weight_get(me->dvert+mface->v1, ob->actdef-1);
 					if(dw) ts->vgroup_weight= dw->weight; else ts->vgroup_weight= 0.0f;
 				}
 				else if(w2==fac) {
-					dw= get_defweight(me->dvert+mface->v2, ob->actdef-1);
+					dw= ED_vgroup_weight_get(me->dvert+mface->v2, ob->actdef-1);
 					if(dw) ts->vgroup_weight= dw->weight; else ts->vgroup_weight= 0.0f;
 				}
 				else if(w3==fac) {
-					dw= get_defweight(me->dvert+mface->v3, ob->actdef-1);
+					dw= ED_vgroup_weight_get(me->dvert+mface->v3, ob->actdef-1);
 					if(dw) ts->vgroup_weight= dw->weight; else ts->vgroup_weight= 0.0f;
 				}
 				else if(w4==fac) {
 					if(mface->v4) {
-						dw= get_defweight(me->dvert+mface->v4, ob->actdef-1);
+						dw= ED_vgroup_weight_get(me->dvert+mface->v4, ob->actdef-1);
 						if(dw) ts->vgroup_weight= dw->weight; else ts->vgroup_weight= 0.0f;
 					}
 				}
@@ -995,12 +995,12 @@ static void do_weight_paint_vertex(VPaint *wp, Object *ob, int index, int alpha,
 	int vgroup= ob->actdef-1;
 	
 	if(wp->flag & VP_ONLYVGROUP) {
-		dw= get_defweight(me->dvert+index, vgroup);
-		uw= get_defweight(wp->wpaint_prev+index, vgroup);
+		dw= ED_vgroup_weight_get(me->dvert+index, vgroup);
+		uw= ED_vgroup_weight_get(wp->wpaint_prev+index, vgroup);
 	}
 	else {
-		dw= verify_defweight(me->dvert+index, vgroup);
-		uw= verify_defweight(wp->wpaint_prev+index, vgroup);
+		dw= ED_vgroup_weight_verify(me->dvert+index, vgroup);
+		uw= ED_vgroup_weight_verify(wp->wpaint_prev+index, vgroup);
 	}
 	if(dw==NULL || uw==NULL)
 		return;
@@ -1012,9 +1012,9 @@ static void do_weight_paint_vertex(VPaint *wp, Object *ob, int index, int alpha,
 		if(j>=0) {
 			/* copy, not paint again */
 			if(vgroup_mirror != -1)
-				uw= verify_defweight(me->dvert+j, vgroup_mirror);
+				uw= ED_vgroup_weight_verify(me->dvert+j, vgroup_mirror);
 			else
-				uw= verify_defweight(me->dvert+j, vgroup);
+				uw= ED_vgroup_weight_verify(me->dvert+j, vgroup);
 				
 			uw->weight= dw->weight;
 		}
@@ -1070,7 +1070,7 @@ static int set_wpaint(bContext *C, wmOperator *op)		/* toggle */
 				if(pchan->bone->flag & BONE_ACTIVE)
 					break;
 				if(pchan)
-					vertexgroup_select_by_name(ob, pchan->name);
+					ED_vgroup_select_by_name(ob, pchan->name);
 		}
 	}
 	else {
@@ -1222,7 +1222,7 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, wmEvent *event)
 	
 	/* if nothing was added yet, we make dverts and a vertex deform group */
 	if (!me->dvert)
-		create_dverts(&me->id);
+		ED_vgroup_data_create(&me->id);
 	
 	/* make mode data storage */
 	wpd= MEM_callocN(sizeof(struct WPaintData), "WPaintData");
@@ -1256,14 +1256,14 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, wmEvent *event)
 			if(pchan) {
 				bDeformGroup *dg= get_named_vertexgroup(ob, pchan->name);
 				if(dg==NULL)
-					dg= add_defgroup_name(ob, pchan->name);	/* sets actdef */
+					dg= ED_vgroup_add_name(ob, pchan->name);	/* sets actdef */
 				else
 					ob->actdef= get_defgroup_num(ob, dg);
 			}
 		}
 	}
 	if(ob->defbase.first==NULL) {
-		add_defgroup(ob);
+		ED_vgroup_add(ob);
 	}	
 	
 	//	if(ob->lay & v3d->lay); else error("Active object is not in this layer");
@@ -1288,8 +1288,8 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, wmEvent *event)
 				if (!strcmp(curdef->name, name))
 					break;
 			if(curdef==NULL) {
-				int olddef= ob->actdef;	/* tsk, add_defgroup sets the active defgroup */
-				curdef= add_defgroup_name (ob, name);
+				int olddef= ob->actdef;	/* tsk, ED_vgroup_add sets the active defgroup */
+				curdef= ED_vgroup_add_name (ob, name);
 				ob->actdef= olddef;
 			}
 			
@@ -1381,10 +1381,10 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 			if(mface->v4) (me->dvert+mface->v4)->flag= 1;
 					
 			if(wp->mode==VP_BLUR) {
-				MDeformWeight *dw, *(*dw_func)(MDeformVert *, int) = verify_defweight;
+				MDeformWeight *dw, *(*dw_func)(MDeformVert *, int) = ED_vgroup_weight_verify;
 						
 				if(wp->flag & VP_ONLYVGROUP)
-					dw_func= get_defweight;
+					dw_func= ED_vgroup_weight_get;
 						
 				dw= dw_func(me->dvert+mface->v1, ob->actdef-1);
 				if(dw) {paintweight+= dw->weight; totw++;}
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 1567f393d87..0df6f6250ff 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -85,133 +85,6 @@
 #include "buttons_intern.h"	// own include
 
 
-/********************** group operators *********************/
-
-static int group_add_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
-	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Base *base;
-	Group *group;
-	int value= RNA_enum_get(op->ptr, "group");
-
-	if(!ob)
-		return OPERATOR_CANCELLED;
-	
-	base= object_in_scene(ob, scene);
-	if(!base)
-		return OPERATOR_CANCELLED;
-	
-	if(value == -1)
-		group= add_group( "Group" );
-	else
-		group= BLI_findlink(&bmain->group, value);
-
-	if(group) {
-		add_to_group(group, ob);
-		ob->flag |= OB_FROMGROUP;
-		base->flag |= OB_FROMGROUP;
-	}
-
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
-	
-	return OPERATOR_FINISHED;
-}
-
-static EnumPropertyItem group_items[]= {
-	{-1, "ADD_NEW", 0, "Add New Group", ""},
-	{0, NULL, 0, NULL, NULL}};
-
-static EnumPropertyItem *group_itemf(bContext *C, PointerRNA *ptr, int *free)
-{	
-	EnumPropertyItem tmp = {0, "", 0, "", ""};
-	EnumPropertyItem *item= NULL;
-	Main *bmain;
-	Group *group;
-	int a, totitem= 0;
-	
-	if(!C) /* needed for docs */
-		return group_items;
-	
-	RNA_enum_items_add_value(&item, &totitem, group_items, -1);
-
-	bmain= CTX_data_main(C);
-	if(bmain->group.first)
-		RNA_enum_item_add_separator(&item, &totitem);
-
-	for(a=0, group=bmain->group.first; group; group=group->id.next, a++) {
-		tmp.value= a;
-		tmp.identifier= group->id.name+2;
-		tmp.name= group->id.name+2;
-		RNA_enum_item_add(&item, &totitem, &tmp);
-	}
-
-	RNA_enum_item_end(&item, &totitem);
-
-	*free= 1;
-
-	return item;
-}
-
-void OBJECT_OT_group_add(wmOperatorType *ot)
-{
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->name= "Add Group";
-	ot->idname= "OBJECT_OT_group_add";
-	
-	/* api callbacks */
-	ot->exec= group_add_exec;
-
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-
-	/* properties */
-	prop= RNA_def_enum(ot->srna, "group", group_items, -1, "Group", "Group to add object to.");
-	RNA_def_enum_funcs(prop, group_itemf);
-}
-
-static int group_remove_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene= CTX_data_scene(C);
-	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
-	Group *group= CTX_data_pointer_get_type(C, "group", &RNA_Group).data;
-	Base *base;
-
-	if(!ob || !group)
-		return OPERATOR_CANCELLED;
-
-	base= object_in_scene(ob, scene);
-	if(!base)
-		return OPERATOR_CANCELLED;
-
-	rem_from_group(group, ob);
-
-	if(find_group(ob, NULL) == NULL) {
-		ob->flag &= ~OB_FROMGROUP;
-		base->flag &= ~OB_FROMGROUP;
-	}
-
-	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_group_remove(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Remove Group";
-	ot->idname= "OBJECT_OT_group_remove";
-	
-	/* api callbacks */
-	ot->exec= group_remove_exec;
-
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
 /********************** material slot operators *********************/
 
 static int material_slot_add_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 001021e8d4b..20cab3b8aeb 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1198,7 +1198,7 @@ static void drawlattice__point(Lattice *lt, DispList *dl, int u, int v, int w, i
 
 	if(use_wcol) {
 		float col[3];
-		MDeformWeight *mdw= get_defweight (lt->dvert+index, use_wcol-1);
+		MDeformWeight *mdw= ED_vgroup_weight_get (lt->dvert+index, use_wcol-1);
 		
 		weight_to_rgb(mdw?mdw->weight:0.0f, col, col+1, col+2);
 		glColor3fv(col);
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 2bef37e43e6..06320f871da 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -899,7 +899,7 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 				Mesh *me= ob->data;
 				int a;
 				for(a=0; a<me->totvert; a++)
-					remove_vert_defgroup (ob, defGroup, a);
+					ED_vgroup_vert_remove (ob, defGroup, a);
 				DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 			}
 		}
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index 41159397634..d26f7a7a484 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -58,6 +58,7 @@
 #include "ED_armature.h"
 #include "ED_particle.h"
 #include "ED_curve.h"
+#include "ED_mball.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_screen.h"
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index a59fc8716ec..ccf4b7a2db3 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -56,6 +56,8 @@ extern EnumPropertyItem brush_sculpt_tool_items[];
 
 extern EnumPropertyItem unpack_method_items[];
 
+extern EnumPropertyItem object_type_items[];
+
 #endif /* RNA_ENUM_TYPES */
 
 
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 50ccbc86719..f81b314de6f 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -64,6 +64,22 @@ static EnumPropertyItem parent_type_items[] = {
 	{PARBONE, "BONE", 0, "Bone", ""},
 	{0, NULL, 0, NULL, NULL}};
 
+EnumPropertyItem object_type_items[] = {
+	{OB_MESH, "MESH", 0, "Mesh", ""},
+	{OB_CURVE, "CURVE", 0, "Curve", ""},
+	{OB_SURF, "SURFACE", 0, "Surface", ""},
+	{OB_MBALL, "META", 0, "Meta", ""},
+	{OB_FONT, "TEXT", 0, "Text", ""},
+	{0, "", 0, NULL, NULL},
+	{OB_ARMATURE, "ARMATURE", 0, "Armature", ""},
+	{OB_LATTICE, "LATTICE", 0, "Lattice", ""},
+	{OB_EMPTY, "EMPTY", 0, "Empty", ""},
+	{0, "", 0, NULL, NULL},
+	{OB_CAMERA, "CAMERA", 0, "Camera", ""},
+	{OB_LAMP, "LAMP", 0, "Lamp", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
 #ifdef RNA_RUNTIME
 
 #include "DNA_key_types.h"
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index c2c90f055b0..3c03d24ca93 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -177,7 +177,7 @@ void wm_event_do_notifiers(bContext *C)
 						do_anim= 1;
 				}
 			}
-			if(ELEM3(note->category, NC_SCENE, NC_OBJECT, NC_GEOM)) {
+			if(ELEM4(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_SCENE)) {
 				ED_info_stats_clear(CTX_data_scene(C));
 				WM_event_add_notifier(C, NC_SPACE|ND_SPACE_INFO, NULL);
 			}

From 11c5cb452c32cc7dded241d71518d200edecb0b1 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Wed, 9 Sep 2009 15:45:12 +0000
Subject: [PATCH 489/577] Keyboard shortcuts

Moved to modern OS standards for opening, saving, copying, pasting, cutting (text), new document, undo and redo.
For Mac users, Cmd is used in addition to the Ctrl-based shortcuts.

These changes are made according to an agreement among developers on IRC.
---
 .../blender/editors/gpencil/gpencil_buttons.c |  2 +-
 source/blender/editors/screen/screen_ops.c    |  6 +---
 .../blender/editors/space_text/space_text.c   | 32 +++++++++++--------
 .../windowmanager/intern/wm_operators.c       | 25 ++++++---------
 4 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 1036b4ccd8f..b25de4d5f1d 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -215,7 +215,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
 		/* onion-skinning */
 		subcol= uiLayoutColumn(col, 1);
 			uiItemR(subcol, "Onion Skinning", 0, &ptr, "use_onion_skinning", 0);
-			uiItemR(subcol, "GStep", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep)
+			uiItemR(subcol, "Frames", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep)
 		
 		/* additional options... */
 		subcol= uiLayoutColumn(col, 1);
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index cb874ec1447..5403317042f 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3328,7 +3328,7 @@ void ED_keymap_screen(wmWindowManager *wm)
 	
 	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);
 	
@@ -3347,11 +3347,7 @@ void ED_keymap_screen(wmWindowManager *wm)
 						  
 	/* render */
 	WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
-//	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL, 0);
-//	WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY, 0);
 	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, KM_CTRL, 0)->ptr, "animation", 1);
-//	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "animation", 1);
-//	RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY|KM_SHIFT, 0)->ptr, "animation", 1);
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY, KM_PRESS, 0, 0);
 	
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index 0d08490cfb0..1e37c2d6cb7 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -220,40 +220,44 @@ static void text_keymap(struct wmWindowManager *wm)
 
 	WM_keymap_add_item(keymap, "TEXT_OT_run_script", PKEY, KM_PRESS, KM_ALT, 0);
 
-	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_ALT, 0);
+
 	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_ALT, 0);
 
 	if(U.uiflag & USER_MMB_PASTE) // XXX not dynamic
 		RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_paste", MIDDLEMOUSE, KM_PRESS, 0, 0)->ptr, "selection", 1);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_jump", JKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_ALT, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_to_3d_object", MKEY, KM_PRESS, KM_ALT, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
 
 	WM_keymap_add_item(keymap, "TEXT_OT_indent", TABKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_unindent", TABKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_uncomment", DKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", HOMEKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_BEGIN);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", ENDKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_END);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", EKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_END);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", EKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "type", LINE_END);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", ENDKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_END);
@@ -268,8 +272,8 @@ static void text_keymap(struct wmWindowManager *wm)
 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", HOMEKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", ENDKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_END);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_CHAR);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_CHAR);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", PREV_WORD);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index ca2fbe23c3e..0036db3824b 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1918,22 +1918,17 @@ void wm_window_keymap(wmWindowManager *wm)
 	
 	/* note, this doesn't replace existing keymap items */
 	WM_keymap_verify_item(keymap, "WM_OT_window_duplicate", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
-//	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_read_homefile", XKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0); 
 	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
-//	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", F1KEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);
-//	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);
-//	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", F2KEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
 

From d4a69283a60ae8f9e834f48ef7c2f3f68b51b73d Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 17:34:14 +0000
Subject: [PATCH 490/577] 2.5: fix for recent file operator opening wrong item.

---
 source/blender/windowmanager/intern/wm_operators.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0036db3824b..8cf47f0c682 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -803,7 +803,7 @@ static int recentfile_exec(bContext *C, wmOperator *op)
 			WM_read_file(C, G.sce, op->reports);
 		}
 		else {
-			struct RecentFile *recent = BLI_findlink(&(G.recent_files), event-2);
+			struct RecentFile *recent = BLI_findlink(&(G.recent_files), event-1);
 			if(recent) {
 				WM_event_add_notifier(C, NC_WINDOW, NULL);
 				WM_read_file(C, recent->filename, op->reports);
@@ -831,11 +831,11 @@ static EnumPropertyItem *open_recentfile_itemf(bContext *C, PointerRNA *ptr, int
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
 	EnumPropertyItem *item= NULL;
 	struct RecentFile *recent;
-	int totitem= 0, i, ofs= 0;
+	int totitem= 0, i;
 
 	/* dynamically construct enum */
 	for(recent = G.recent_files.first, i=0; (i<U.recent_files) && (recent); recent = recent->next, i++) {
-		tmp.value= i+ofs+1;
+		tmp.value= i+1;
 		tmp.identifier= recent->filename;
 		tmp.name= recent->filename;
 		RNA_enum_item_add(&item, &totitem, &tmp);

From 9e7c4ce806b8d6dc532c40d5aeaa15dc708e2a10 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 17:39:19 +0000
Subject: [PATCH 491/577] 2.5: Layer Buttons

* Added RNA subtype for layers.
* Shift-click works again.
* uiItemR can now also handle armature/bone layers.
* Also makes Move to Layer popup work as expected.
---
 release/ui/buttons_data_armature.py           |  4 +-
 release/ui/buttons_data_bone.py               |  2 +-
 .../editors/interface/interface_layout.c      | 60 ++++++++++++++-----
 .../blender/editors/object/object_relations.c |  3 +-
 source/blender/makesrna/RNA_define.h          |  2 +
 source/blender/makesrna/RNA_types.h           |  4 ++
 source/blender/makesrna/intern/makesrna.c     |  2 +
 source/blender/makesrna/intern/rna_armature.c |  6 +-
 source/blender/makesrna/intern/rna_define.c   | 28 +++++++++
 source/blender/makesrna/intern/rna_group.c    |  2 +-
 source/blender/makesrna/intern/rna_object.c   |  2 +-
 source/blender/makesrna/intern/rna_rna.c      |  2 +
 source/blender/makesrna/intern/rna_scene.c    | 14 +----
 .../windowmanager/intern/wm_operators.c       |  4 +-
 14 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index ff0cc531c67..5924a2eb4ea 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -42,9 +42,9 @@ class DATA_PT_skeleton(DataButtonsPanel):
 
 		col = split.column()
 		col.itemL(text="Layers:")
-		col.template_layers(arm, "layer")
+		col.itemR(arm, "layer", text="")
 		col.itemL(text="Protected Layers:")
-		col.template_layers(arm, "layer_protection")
+		col.itemR(arm, "layer_protection", text="")
 		col.itemL(text="Edit Options:")
 		col.itemR(arm, "x_axis_mirror")
 		col.itemR(arm, "auto_ik")
diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 276ca066af5..0d379a4788f 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -98,7 +98,7 @@ class BONE_PT_bone(BoneButtonsPanel):
 		row.itemR(bone, "connected")
 		
 		col.itemL(text="Layers:")
-		col.template_layers(bone, "layer")
+		col.itemR(bone, "layer", text="")
 		
 		col = split.column()
 		col.itemL(text="Inherit:")
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index a52afcb1a92..04d575d96d4 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -310,6 +310,30 @@ static uiLayout *ui_item_local_sublayout(uiLayout *test, uiLayout *layout, int a
 	return sub;
 }
 
+static void ui_layer_but_cb(bContext *C, void *arg_but, void *arg_index)
+{
+	wmWindow *win= CTX_wm_window(C);
+	uiBut *but= arg_but, *cbut;
+	PointerRNA *ptr= &but->rnapoin;
+	PropertyRNA *prop= but->rnaprop;
+	int i, index= GET_INT_FROM_POINTER(arg_index);
+	int shift= win->eventstate->shift;
+	int len= RNA_property_array_length(ptr, prop);
+
+	if(!shift) {
+		RNA_property_boolean_set_index(ptr, prop, index, 1);
+
+		for(i=0; i<len; i++)
+			if(i != index)
+				RNA_property_boolean_set_index(ptr, prop, i, 0);
+
+		RNA_property_update(C, ptr, prop);
+
+		for(cbut=but->block->buttons.first; cbut; cbut=cbut->next)
+			ui_check_but(cbut);
+	}
+}
+
 /* create buttons for an item with an RNA array */
 static void ui_item_array(uiLayout *layout, uiBlock *block, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int len, int x, int y, int w, int h, int expand, int slider)
 {
@@ -318,7 +342,7 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, char *name, int icon
 	PropertyType type;
 	PropertySubType subtype;
 	uiLayout *sub;
-	int a;
+	int a, b;
 
 	/* retrieve type and subtype */
 	type= RNA_property_type(prop);
@@ -332,9 +356,11 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, char *name, int icon
 		uiDefBut(block, LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 
 	/* create buttons */
-	if(type == PROP_BOOLEAN && len == 20) {
+	if(type == PROP_BOOLEAN && ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER)) {
 		/* special check for layer layout */
 		int butw, buth, unit;
+		int cols= (len >= 20)? 2: 1;
+		int colbuts= len/(2*cols);
 
 		uiBlockSetCurLayout(block, uiLayoutFree(layout, 0));
 
@@ -342,21 +368,23 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, char *name, int icon
 		butw= unit;
 		buth= unit;
 
-		uiBlockBeginAlign(block);
-		for(a=0; a<5; a++)
-			uiDefAutoButR(block, ptr, prop, a, "", ICON_BLANK1, x + butw*a, y+buth, butw, buth);
-		for(a=0; a<5; a++)
-			uiDefAutoButR(block, ptr, prop, a+10, "", ICON_BLANK1, x + butw*a, y, butw, buth);
-		uiBlockEndAlign(block);
+		for(b=0; b<cols; b++) {
+			uiBlockBeginAlign(block);
 
-		x += 5*butw + style->buttonspacex;
+			for(a=0; a<colbuts; a++) {
+				but= uiDefAutoButR(block, ptr, prop, a+b*colbuts, "", ICON_BLANK1, x + butw*a, y+buth, butw, buth);
+				if(subtype == PROP_LAYER_MEMBER)
+					uiButSetFunc(but, ui_layer_but_cb, but, SET_INT_IN_POINTER(a+b*colbuts));
+			}
+			for(a=0; a<colbuts; a++) {
+				but= uiDefAutoButR(block, ptr, prop, a+len/2+b*colbuts, "", ICON_BLANK1, x + butw*a, y, butw, buth);
+				if(subtype == PROP_LAYER_MEMBER)
+					uiButSetFunc(but, ui_layer_but_cb, but, SET_INT_IN_POINTER(a+len/2+b*colbuts));
+			}
+			uiBlockEndAlign(block);
 
-		uiBlockBeginAlign(block);
-		for(a=0; a<5; a++)
-			uiDefAutoButR(block, ptr, prop, a+5, "", ICON_BLANK1, x + butw*a, y+buth, butw, buth);
-		for(a=0; a<5; a++)
-			uiDefAutoButR(block, ptr, prop, a+15, "", ICON_BLANK1, x + butw*a, y, butw, buth);
-		uiBlockEndAlign(block);
+			x += colbuts*butw + style->buttonspacex;
+		}
 	}
 	else if(subtype == PROP_MATRIX) {
 		/* matrix layout */
@@ -784,7 +812,7 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA
 		if(!name[0] && icon == 0)
 			h= 0;
 
-		if(type == PROP_BOOLEAN && len == 20)
+		if(ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER))
 			h += 2*UI_UNIT_Y;
 		else if(subtype == PROP_MATRIX)
 			h += ceil(sqrt(len))*UI_UNIT_Y;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 6fe01cced74..12cb2b95e06 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1037,8 +1037,7 @@ void OBJECT_OT_move_to_layer(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* properties */
-	RNA_def_boolean_array(ot->srna, "layer", 20, NULL, "Layer", "");
-	/* XXX boolean layer subtype, behavior */
+	RNA_def_boolean_layer_member(ot->srna, "layer", 20, NULL, "Layer", "");
 }
 
 /************************** Link to Scene Operator *****************************/
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h
index 1c6837bbcc8..03b12da1629 100644
--- a/source/blender/makesrna/RNA_define.h
+++ b/source/blender/makesrna/RNA_define.h
@@ -72,6 +72,8 @@ typedef void StructOrFunctionRNA;
 
 PropertyRNA *RNA_def_boolean(StructOrFunctionRNA *cont, const char *identifier, int default_value, const char *ui_name, const char *ui_description);
 PropertyRNA *RNA_def_boolean_array(StructOrFunctionRNA *cont, const char *identifier, int len, int *default_value, const char *ui_name, const char *ui_description);
+PropertyRNA *RNA_def_boolean_layer(StructOrFunctionRNA *cont, const char *identifier, int len, int *default_value, const char *ui_name, const char *ui_description);
+PropertyRNA *RNA_def_boolean_layer_member(StructOrFunctionRNA *cont, const char *identifier, int len, int *default_value, const char *ui_name, const char *ui_description);
 PropertyRNA *RNA_def_boolean_vector(StructOrFunctionRNA *cont, const char *identifier, int len, int *default_value, const char *ui_name, const char *ui_description);
 
 PropertyRNA *RNA_def_int(StructOrFunctionRNA *cont, const char *identifier, int default_value, int hardmin, int hardmax, const char *ui_name, const char *ui_description, int softmin, int softmax);
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index b57cbc3aa2c..c6fed5cd8e6 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -111,6 +111,10 @@ typedef enum PropertySubType {
 
 	/* pointers */
 	PROP_NEVER_NULL = 30,
+
+	/* booleans */
+	PROP_LAYER = 40,
+	PROP_LAYER_MEMBER = 41
 } PropertySubType;
 
 typedef enum PropertyFlag {
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 907eba4018f..cbfd7d326de 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1394,6 +1394,8 @@ static const char *rna_property_subtypename(PropertyType type)
 		case PROP_XYZ: return "PROP_XYZ";
 		case PROP_RGB: return "PROP_RGB";
 		case PROP_NEVER_NULL: return "PROP_NEVER_NULL";
+		case PROP_LAYER: return "PROP_LAYER";
+		case PROP_LAYER_MEMBER: return "PROP_LAYER_MEMBER";
 		default: {
 			/* incase we dont have a type preset that includes the subtype */
 			if(RNA_SUBTYPE_UNIT(type)) {
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index 3f4b75508fe..57eb3c1de4a 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -325,7 +325,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone)
 	RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
 
 	/* flags */
-	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_LAYER_MEMBER);
 	RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
 	RNA_def_property_array(prop, 16);
 	if(editbone) RNA_def_property_boolean_funcs(prop, "rna_EditBone_layer_get", "rna_EditBone_layer_set");
@@ -569,7 +569,7 @@ void rna_def_armature(BlenderRNA *brna)
 	
 	/* Boolean values */
 		/* layer */
-	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_LAYER_MEMBER);
 	RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
 	RNA_def_property_array(prop, 16);
 	RNA_def_property_ui_text(prop, "Visible Layers", "Armature layer visibility.");
@@ -578,7 +578,7 @@ void rna_def_armature(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
 	
 		/* layer protection */
-	prop= RNA_def_property(srna, "layer_protection", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "layer_protection", PROP_BOOLEAN, PROP_LAYER);
 	RNA_def_property_boolean_sdna(prop, NULL, "layer_protected", 1);
 	RNA_def_property_array(prop, 16);
 	RNA_def_property_ui_text(prop, "Layer Proxy Protection", "Protected layers in Proxy Instances are restored to Proxy settings on file reload and undo.");	
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index e415304ab6c..00cfb17dc84 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -1953,6 +1953,34 @@ PropertyRNA *RNA_def_boolean_array(StructOrFunctionRNA *cont_, const char *ident
 	return prop;
 }
 
+PropertyRNA *RNA_def_boolean_layer(StructOrFunctionRNA *cont_, const char *identifier, int len, int *default_value, 
+	const char *ui_name, const char *ui_description)
+{
+	ContainerRNA *cont= cont_;
+	PropertyRNA *prop;
+	
+	prop= RNA_def_property(cont, identifier, PROP_BOOLEAN, PROP_LAYER);
+	if(len != 0) RNA_def_property_array(prop, len);
+	if(default_value) RNA_def_property_boolean_array_default(prop, default_value);
+	RNA_def_property_ui_text(prop, ui_name, ui_description);
+
+	return prop;
+}
+
+PropertyRNA *RNA_def_boolean_layer_member(StructOrFunctionRNA *cont_, const char *identifier, int len, int *default_value, 
+	const char *ui_name, const char *ui_description)
+{
+	ContainerRNA *cont= cont_;
+	PropertyRNA *prop;
+	
+	prop= RNA_def_property(cont, identifier, PROP_BOOLEAN, PROP_LAYER_MEMBER);
+	if(len != 0) RNA_def_property_array(prop, len);
+	if(default_value) RNA_def_property_boolean_array_default(prop, default_value);
+	RNA_def_property_ui_text(prop, ui_name, ui_description);
+
+	return prop;
+}
+
 PropertyRNA *RNA_def_boolean_vector(StructOrFunctionRNA *cont_, const char *identifier, int len, int *default_value, 
 	const char *ui_name, const char *ui_description)
 {
diff --git a/source/blender/makesrna/intern/rna_group.c b/source/blender/makesrna/intern/rna_group.c
index 18c04fbfb50..31bc6ccc74b 100644
--- a/source/blender/makesrna/intern/rna_group.c
+++ b/source/blender/makesrna/intern/rna_group.c
@@ -63,7 +63,7 @@ void RNA_def_group(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Objects", "A collection of this groups objects.");
 	RNA_def_property_collection_funcs(prop, 0, 0, 0, "rna_Group_objects_get", 0, 0, 0, 0, 0);
 	
-	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_LAYER);
 	RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_ui_text(prop, "Dupli Layers", "Layers visible when this groups is instanced as a dupli.");	
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index f81b314de6f..ce65ef4d450 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1073,7 +1073,7 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Mode", "Object interaction mode.");
 
-	prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER_MEMBER);
 	RNA_def_property_boolean_sdna(prop, NULL, "lay", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_ui_text(prop, "Layers", "Layers the object is on.");
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 57ed5ccef39..b1644405ff3 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -798,6 +798,8 @@ static void rna_def_property(BlenderRNA *brna)
 		{PROP_XYZ, "XYZ", 0, "XYZ", ""},
 		{PROP_RGB, "RGB", 0, "RGB", ""},
 		{PROP_NEVER_NULL, "NEVER_NULL", 0, "Never Null", ""},
+		{PROP_LAYER, "LAYER", 0, "Layer", ""},
+		{PROP_LAYER_MEMBER, "LAYER_MEMBERSHIP", 0, "Layer Membership", ""},
 		{0, NULL, 0, NULL, NULL}};
 	static EnumPropertyItem unit_items[] = {
 		{PROP_UNIT_NONE, "NONE", 0, "None", ""},
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index f196001cc9d..965796c6d5b 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -363,12 +363,6 @@ static void rna_SceneRenderLayer_layer_set(PointerRNA *ptr, const int *values)
 	rl->lay= layer_set(rl->lay, values);
 }
 
-static void rna_SceneRenderLayer_zmask_layer_set(PointerRNA *ptr, const int *values)
-{
-	SceneRenderLayer *rl= (SceneRenderLayer*)ptr->data;
-	rl->lay_zmask= layer_set(rl->lay_zmask, values);
-}
-
 static void rna_SceneRenderLayer_pass_update(bContext *C, PointerRNA *ptr)
 {
 	Scene *scene= (Scene*)ptr->id.data;
@@ -597,7 +591,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene)
 	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
 	/* layers */
-	prop= RNA_def_property(srna, "visible_layers", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "visible_layers", PROP_BOOLEAN, PROP_LAYER_MEMBER);
 	RNA_def_property_boolean_sdna(prop, NULL, "lay", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_ui_text(prop, "Visible Layers", "Scene layers included in this render layer.");
@@ -606,12 +600,10 @@ void rna_def_render_layer_common(StructRNA *srna, int scene)
 	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
-	prop= RNA_def_property(srna, "zmask_layers", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "zmask_layers", PROP_BOOLEAN, PROP_LAYER);
 	RNA_def_property_boolean_sdna(prop, NULL, "lay_zmask", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_ui_text(prop, "Zmask Layers", "Zmask scene layers.");
-	if(scene) RNA_def_property_boolean_funcs(prop, NULL, "rna_SceneRenderLayer_zmask_layer_set");
-	else RNA_def_property_boolean_funcs(prop, NULL, "rna_RenderLayer_zmask_layer_set");
 	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
@@ -1940,7 +1932,7 @@ void RNA_def_scene(BlenderRNA *brna)
 	RNA_def_property_collection_funcs(prop, 0, 0, 0, "rna_Scene_objects_get", 0, 0, 0, 0, 0);
 
 	/* Layers */
-	prop= RNA_def_property(srna, "visible_layers", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "visible_layers", PROP_BOOLEAN, PROP_LAYER_MEMBER);
 	RNA_def_property_boolean_sdna(prop, NULL, "lay", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_ui_text(prop, "Visible Layers", "Layers visible when rendering the scene.");
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 8cf47f0c682..7152d5bcfa2 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -531,7 +531,7 @@ int WM_operator_winactive(bContext *C)
 }
 
 /* op->invoke */
-static void redo_cb(bContext *C, void *arg_op, void *arg2)
+static void redo_cb(bContext *C, void *arg_op, int event)
 {
 	wmOperator *lastop= arg_op;
 	
@@ -553,7 +553,7 @@ static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op)
 	block= uiBeginBlock(C, ar, "redo_popup", UI_EMBOSS);
 	uiBlockClearFlag(block, UI_BLOCK_LOOP);
 	uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN|UI_BLOCK_RET_1);
-	uiBlockSetFunc(block, redo_cb, arg_op, NULL);
+	uiBlockSetHandleFunc(block, redo_cb, arg_op);
 
 	if(!op->properties) {
 		IDPropertyTemplate val = {0};

From 4cb53d91ea1843dc0cb2c1d4c846e5a1974a20eb Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 18:09:03 +0000
Subject: [PATCH 492/577] Small code cleanup related to curves, to avoid
 cryptic names:

renamed set_four_ipo -> key_curve_position_weights
renamed set_afgeleide_four_ipo -> key_curve_tangent_weights
added key_curve_normal_weights
---
 source/blender/blenkernel/BKE_key.h          |   5 +-
 source/blender/blenkernel/intern/anim.c      |  10 +-
 source/blender/blenkernel/intern/curve.c     |   4 +-
 source/blender/blenkernel/intern/key.c       | 117 +++++++++++--------
 source/blender/blenkernel/intern/lattice.c   |   6 +-
 source/blender/blenkernel/intern/object.c    |   2 +-
 source/blender/blenkernel/intern/particle.c  |   6 +-
 source/blender/blenkernel/intern/texture.c   |   4 +-
 source/blender/blenloader/intern/readfile.c  |   1 -
 source/blender/render/intern/source/strand.c |   4 +-
 10 files changed, 92 insertions(+), 67 deletions(-)

diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index faf8692b89a..94a7a7482e4 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -51,8 +51,9 @@ struct Key *copy_key(struct Key *key);
 void make_local_key(struct Key *key);
 void sort_keys(struct Key *key);
 
-void set_four_ipo(float d, float *data, int type);
-void set_afgeleide_four_ipo(float d, float *data, int type);
+void key_curve_position_weights(float t, float *data, int type);
+void key_curve_tangent_weights(float t, float *data, int type);
+void key_curve_normal_weights(float t, float *data, int type);
 
 /* only exported to curve.c! */
 void cp_cu_key(struct Curve *cu, struct KeyBlock *kb, int start, int end);
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index ffb7ff51b87..e75b31dd892 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -253,7 +253,7 @@ int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK
 	/* note, commented out for follow constraint */
 	//if(cu->flag & CU_FOLLOW) {
 		
-		set_afgeleide_four_ipo(1.0f-fac, data, KEY_BSPLINE);
+		key_curve_tangent_weights(1.0f-fac, data, KEY_BSPLINE);
 		
 		dir[0]= data[0]*p0[0] + data[1]*p1[0] + data[2]*p2[0] + data[3]*p3[0] ;
 		dir[1]= data[0]*p0[1] + data[1]*p1[1] + data[2]*p2[1] + data[3]*p3[1] ;
@@ -268,10 +268,10 @@ int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK
 	nu= cu->nurb.first;
 
 	/* make sure that first and last frame are included in the vectors here  */
-	if((nu->type & 7)==CU_POLY) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
-	else if((nu->type & 7)==CU_BEZIER) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
-	else if(s0==s1 || p2==p3) set_four_ipo(1.0f-fac, data, KEY_CARDINAL);
-	else set_four_ipo(1.0f-fac, data, KEY_BSPLINE);
+	if((nu->type & 7)==CU_POLY) key_curve_position_weights(1.0f-fac, data, KEY_LINEAR);
+	else if((nu->type & 7)==CU_BEZIER) key_curve_position_weights(1.0f-fac, data, KEY_LINEAR);
+	else if(s0==s1 || p2==p3) key_curve_position_weights(1.0f-fac, data, KEY_CARDINAL);
+	else key_curve_position_weights(1.0f-fac, data, KEY_BSPLINE);
 
 	vec[0]= data[0]*p0[0] + data[1]*p1[0] + data[2]*p2[0] + data[3]*p3[0] ;
 	vec[1]= data[0]*p0[1] + data[1]*p1[1] + data[2]*p2[1] + data[3]*p3[1] ;
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index a1ad5347f7e..86cfe9d4c6f 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1476,7 +1476,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
 			if (nu->tilt_interp==3) { /* May as well support for tilt also 2.47 ease interp */
 				tilt_array[a] = prevbezt->alfa + (bezt->alfa - prevbezt->alfa)*(3.0f*fac*fac - 2.0f*fac*fac*fac);
 			} else {
-				set_four_ipo(fac, t, nu->tilt_interp);
+				key_curve_position_weights(fac, t, nu->tilt_interp);
 				tilt_array[a]= t[0]*pprev->alfa + t[1]*prevbezt->alfa + t[2]*bezt->alfa + t[3]*next->alfa;
 			}
 		}
@@ -1491,7 +1491,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
 				
 				/* reuse interpolation from tilt if we can */
 				if (tilt_array==NULL || nu->tilt_interp != nu->radius_interp) {
-					set_four_ipo(fac, t, nu->radius_interp);
+					key_curve_position_weights(fac, t, nu->radius_interp);
 				}
 				radius_array[a]= t[0]*pprev->radius + t[1]*prevbezt->radius + t[2]*bezt->radius + t[3]*next->radius;
 			}
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 755a41ec4b2..70136afc321 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -258,66 +258,91 @@ void sort_keys(Key *key)
 
 /**************** do the key ****************/
 
-
-void set_four_ipo(float d, float *data, int type)
+void key_curve_position_weights(float t, float *data, int type)
 {
-	float d2, d3, fc;
+	float t2, t3, fc;
 	
 	if(type==KEY_LINEAR) {
-		data[0]= 0.0f;
-		data[1]= 1.0f-d;
-		data[2]= d;
-		data[3]= 0.0f;
+		data[0]=		  0.0f;
+		data[1]= -t		+ 1.0f;
+		data[2]= t;
+		data[3]= 		  0.0f;
 	}
-	else {
-		d2= d*d;
-		d3= d2*d;
+	else if(type==KEY_CARDINAL) {
+		t2= t*t;
+		t3= t2*t;
+		fc= 0.71f;
 		
-		if(type==KEY_CARDINAL) {
+		data[0]= -fc*t3			+ 2.0f*fc*t2		- fc*t;
+		data[1]= (2.0f-fc)*t3	+ (fc-3.0f)*t2					+ 1.0f;
+		data[2]= (fc-2.0f)*t3	+ (3.0f-2.0f*fc)*t2	+ fc*t;
+		data[3]= fc*t3			- fc*t2;
+	}
+	else if(type==KEY_BSPLINE) {
+		t2= t*t;
+		t3= t2*t;
 
-			fc= 0.71f;
-			
-			data[0]= -fc*d3		+2.0f*fc*d2		-fc*d;
-			data[1]= (2.0f-fc)*d3	+(fc-3.0f)*d2				+1.0f;
-			data[2]= (fc-2.0f)*d3	+(3.0f-2.0f*fc)*d2 +fc*d;
-			data[3]= fc*d3			-fc*d2;
-		}
-		else if(type==KEY_BSPLINE) {
-
-			data[0]= -0.16666666f*d3	+0.5f*d2	-0.5f*d	+0.16666666f;
-			data[1]= 0.5f*d3		-d2				+0.6666666f;
-			data[2]= -0.5f*d3		+0.5f*d2	+0.5f*d	+0.16666666f;
-			data[3]= 0.16666666f*d3			;
-		}
+		data[0]= -0.16666666f*t3	+ 0.5f*t2	- 0.5f*t	+ 0.16666666f;
+		data[1]= 0.5f*t3			- t2					+ 0.6666666f;
+		data[2]= -0.5f*t3			+ 0.5f*t2	+ 0.5f*t	+ 0.16666666f;
+		data[3]= 0.16666666f*t3;
 	}
 }
 
-void set_afgeleide_four_ipo(float d, float *data, int type)
+/* first derivative */
+void key_curve_tangent_weights(float t, float *data, int type)
 {
-	float d2, fc;
+	float t2, fc;
 	
 	if(type==KEY_LINEAR) {
-
+		data[0]= 0.0f;
+		data[1]= -1.0f;
+		data[2]= 1.0f;
+		data[3]= 0.0f;
 	}
-	else {
-		d2= d*d;
+	else if(type==KEY_CARDINAL) {
+		t2= t*t;
+		fc= 0.71f;
 		
-		if(type==KEY_CARDINAL) {
+		data[0]= -3.0f*fc*t2		+4.0f*fc*t				- fc;
+		data[1]= 3.0f*(2.0f-fc)*t2	+2.0f*(fc-3.0f)*t;
+		data[2]= 3.0f*(fc-2.0f)*t2	+2.0f*(3.0f-2.0f*fc)*t	+ fc;
+		data[3]= 3.0f*fc*t2			-2.0f*fc*t;
+	}
+	else if(type==KEY_BSPLINE) {
+		t2= t*t;
 
-			fc= 0.71f;
-			
-			data[0]= -3.0f*fc*d2		+4.0f*fc*d		-fc;
-			data[1]= 3.0f*(2.0f-fc)*d2	+2.0f*(fc-3.0f)*d;
-			data[2]= 3.0f*(fc-2.0f)*d2	+2.0f*(3.0f-2.0f*fc)*d +fc;
-			data[3]= 3.0f*fc*d2			-2.0f*fc*d;
-		}
-		else if(type==KEY_BSPLINE) {
+		data[0]= -0.5f*t2	+ t			- 0.5f;
+		data[1]= 1.5f*t2	- 2.0f*t;
+		data[2]= -1.5f*t2	+ t			+ 0.5f;
+		data[3]= 0.5f*t2;
+	}
+}
 
-			data[0]= -0.16666666f*3.0f*d2	+d	-0.5f;
-			data[1]= 1.5f*d2		-2.0f*d;
-			data[2]= -1.5f*d2		+d	+0.5f;
-			data[3]= 0.16666666f*3.0f*d2			;
-		}
+/* second derivative */
+void key_curve_normal_weights(float t, float *data, int type)
+{
+	float fc;
+	
+	if(type==KEY_LINEAR) {
+		data[0]= 0.0f;
+		data[1]= 0.0f;
+		data[2]= 0.0f;
+		data[3]= 0.0f;
+	}
+	else if(type==KEY_CARDINAL) {
+		fc= 0.71f;
+		
+		data[0]= -6.0f*fc*t			+ 4.0f*fc;
+		data[1]= 6.0f*(2.0f-fc)*t	+ 2.0f*(fc-3.0f);
+		data[2]= 6.0f*(fc-2.0f)*t	+ 2.0f*(3.0f-2.0f*fc);
+		data[3]= 6.0f*fc*t			- 2.0f*fc;
+	}
+	else if(type==KEY_BSPLINE) {
+		data[0]= -1.0f*t	+ 1.0f;
+		data[1]= 3.0f*t		- 2.0f;
+		data[2]= -3.0f*t	+ 1.0f;
+		data[3]= 1.0f*t;
 	}
 }
 
@@ -428,10 +453,10 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
 
 	/* interpolation */
 	
-	set_four_ipo(d, t, k[1]->type);
+	key_curve_position_weights(d, t, k[1]->type);
 
 	if(k[1]->type != k[2]->type) {
-		set_four_ipo(d, fval, k[2]->type);
+		key_curve_position_weights(d, fval, k[2]->type);
 		
 		temp= 1.0f-d;
 		t[0]= temp*t[0]+ d*fval[0];
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 6614c657647..07973d0de57 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -367,7 +367,7 @@ void calc_latt_deform(float *co, float weight)
 		u= (vec[0]-lt->fu)/lt->du;
 		ui= (int)floor(u);
 		u -= ui;
-		set_four_ipo(u, tu, lt->typeu);
+		key_curve_position_weights(u, tu, lt->typeu);
 	}
 	else {
 		tu[0]= tu[2]= tu[3]= 0.0; tu[1]= 1.0;
@@ -378,7 +378,7 @@ void calc_latt_deform(float *co, float weight)
 		v= (vec[1]-lt->fv)/lt->dv;
 		vi= (int)floor(v);
 		v -= vi;
-		set_four_ipo(v, tv, lt->typev);
+		key_curve_position_weights(v, tv, lt->typev);
 	}
 	else {
 		tv[0]= tv[2]= tv[3]= 0.0; tv[1]= 1.0;
@@ -389,7 +389,7 @@ void calc_latt_deform(float *co, float weight)
 		w= (vec[2]-lt->fw)/lt->dw;
 		wi= (int)floor(w);
 		w -= wi;
-		set_four_ipo(w, tw, lt->typew);
+		key_curve_position_weights(w, tw, lt->typew);
 	}
 	else {
 		tw[0]= tw[2]= tw[3]= 0.0; tw[1]= 1.0;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index ec068c35c11..572c217e919 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2312,7 +2312,7 @@ void object_handle_update(Object *ob)
 		
 		if(ob->recalc & OB_RECALC_DATA) {
 			
-			// printf("recalcdata %s\n", ob->id.name+2);
+			printf("recalc data %s\n", ob->id.name);
 			
 			/* includes all keys and modifiers */
 			if(ob->type==OB_MESH) {
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index b5b2c07af9c..e8a84ccceb5 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -873,7 +873,7 @@ static void interpolate_particle(short type, ParticleKey keys[4], float dt, Part
 		VecfCubicInterpol(keys[1].co, keys[1].vel, keys[2].co, keys[2].vel, dt, result->co, result->vel);
 	}
 	else {
-		set_four_ipo(dt, t, type);
+		key_curve_position_weights(dt, t, type);
 
 		weighted_particle_vector(keys[0].co, keys[1].co, keys[2].co, keys[3].co, t, result->co);
 
@@ -881,12 +881,12 @@ static void interpolate_particle(short type, ParticleKey keys[4], float dt, Part
 			float temp[3];
 
 			if(dt>0.999f){
-				set_four_ipo(dt-0.001f, t, type);
+				key_curve_position_weights(dt-0.001f, t, type);
 				weighted_particle_vector(keys[0].co, keys[1].co, keys[2].co, keys[3].co, t, temp);
 				VECSUB(result->vel, result->co, temp);
 			}
 			else{
-				set_four_ipo(dt+0.001f, t, type);
+				key_curve_position_weights(dt+0.001f, t, type);
 				weighted_particle_vector(keys[0].co, keys[1].co, keys[2].co, keys[3].co, t, temp);
 				VECSUB(result->vel, temp, result->co);
 			}
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index be005af7827..f2c2498b39f 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -368,9 +368,9 @@ int do_colorband(ColorBand *coba, float in, float out[4])
 					CLAMP(fac, 0.0f, 1.0f);
 					
 					if(coba->ipotype==3)
-						set_four_ipo(fac, t, KEY_CARDINAL);
+						key_curve_position_weights(fac, t, KEY_CARDINAL);
 					else
-						set_four_ipo(fac, t, KEY_BSPLINE);
+						key_curve_position_weights(fac, t, KEY_BSPLINE);
 
 					out[0]= t[3]*cbd3->r +t[2]*cbd2->r +t[1]*cbd1->r +t[0]*cbd0->r;
 					out[1]= t[3]*cbd3->g +t[2]*cbd2->g +t[1]*cbd1->g +t[0]*cbd0->g;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4e5789d87e8..61192ee0882 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -127,7 +127,6 @@
 #include "BKE_global.h" // for G
 #include "BKE_group.h"
 #include "BKE_image.h"
-#include "BKE_key.h" //void set_four_ipo
 #include "BKE_lattice.h"
 #include "BKE_library.h" // for wich_libbase
 #include "BKE_main.h" // for Main
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c
index 05e36160f0e..88c275d0997 100644
--- a/source/blender/render/intern/source/strand.c
+++ b/source/blender/render/intern/source/strand.c
@@ -122,14 +122,14 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint)
 			spoint->dtstrandco *= 0.5f;
 	}
 	else {
-		set_four_ipo(t, data, type);
+		key_curve_position_weights(t, data, type);
 		spoint->co[0]= data[0]*p[0][0] + data[1]*p[1][0] + data[2]*p[2][0] + data[3]*p[3][0];
 		spoint->co[1]= data[0]*p[0][1] + data[1]*p[1][1] + data[2]*p[2][1] + data[3]*p[3][1];
 		spoint->co[2]= data[0]*p[0][2] + data[1]*p[1][2] + data[2]*p[2][2] + data[3]*p[3][2];
 		spoint->strandco= (1.0f-t)*sseg->v[1]->strandco + t*sseg->v[2]->strandco;
 	}
 
-	set_afgeleide_four_ipo(t, data, type);
+	key_curve_tangent_weights(t, data, type);
 	spoint->dtco[0]= data[0]*p[0][0] + data[1]*p[1][0] + data[2]*p[2][0] + data[3]*p[3][0];
 	spoint->dtco[1]= data[0]*p[0][1] + data[1]*p[1][1] + data[2]*p[2][1] + data[3]*p[3][1];
 	spoint->dtco[2]= data[0]*p[0][2] + data[1]*p[1][2] + data[2]*p[2][2] + data[3]*p[3][2];

From ace94617c73651e78a8d65cbca83400f867a961e Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Wed, 9 Sep 2009 18:18:09 +0000
Subject: [PATCH 493/577] 2.5 MSVC projectfiles * small maintenance for split
 files in editors/object

---
 .../blender/editors/ED_editors.vcproj         | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj
index db0b851fd74..5a6519d3d35 100644
--- a/projectfiles_vc9/blender/editors/ED_editors.vcproj
+++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj
@@ -1074,30 +1074,34 @@
 		<Filter
 			Name="object"
 			>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_add.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\object\object_constraint.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\editors\object\object_group.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\editors\object\object_shapekey.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\editors\object\object_lattice.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\object\object_edit.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_group.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_hook.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\object\object_intern.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_lattice.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\object\object_modifier.c"
 				>
@@ -1107,11 +1111,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\object\object_vgroup.c"
+				RelativePath="..\..\..\source\blender\editors\object\object_relations.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\object\object_hook.c"
+				RelativePath="..\..\..\source\blender\editors\object\object_select.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_shapekey.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_transform.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\editors\object\object_vgroup.c"
 				>
 			</File>
 		</Filter>

From 8e2d86169599d652170ebe8b2564650f00f70077 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Wed, 9 Sep 2009 18:39:40 +0000
Subject: [PATCH 494/577] Smoke: * Enable cache for high res + new preview *
 Bugfix for smoke banding (in cooperation with N_T)

Hint: Work-in-progress regarding collision objects so can be broken, didn't test

Hint2: jahka enabled a general particle panel but
* bake button doesn't work
* step is not supported for cloth
* several other things there ;)
---
 intern/smoke/extern/smoke_API.h               |   6 +-
 intern/smoke/intern/FLUID_3D.cpp              | 120 +--
 intern/smoke/intern/FLUID_3D_STATIC.cpp       | 158 +--
 intern/smoke/intern/WTURBULENCE.cpp           | 594 +++++------
 intern/smoke/intern/WTURBULENCE.h             |  37 +-
 intern/smoke/intern/smoke_API.cpp             |  13 +-
 release/ui/buttons_physics_smoke.py           |  82 +-
 source/blender/blenkernel/BKE_pointcache.h    |   1 +
 source/blender/blenkernel/BKE_smoke.h         |   4 +-
 source/blender/blenkernel/intern/pointcache.c |  73 +-
 source/blender/blenkernel/intern/smoke.c      | 970 +++++++++---------
 source/blender/blenloader/intern/readfile.c   |   4 +-
 .../blender/editors/space_view3d/drawobject.c |  59 +-
 .../blender/editors/space_view3d/drawvolume.c |  48 +-
 .../editors/space_view3d/view3d_intern.h      |   2 +-
 source/blender/gpu/CMakeLists.txt             |   2 +-
 source/blender/gpu/GPU_draw.h                 |   2 +-
 source/blender/gpu/intern/gpu_draw.c          |  16 +-
 source/blender/gpu/intern/gpu_extensions.c    |  12 +-
 source/blender/makesdna/DNA_smoke_types.h     |  28 +-
 source/blender/makesrna/intern/rna_smoke.c    | 110 +-
 21 files changed, 1184 insertions(+), 1157 deletions(-)

diff --git a/intern/smoke/extern/smoke_API.h b/intern/smoke/extern/smoke_API.h
index 1a3edce2344..5607df70cf3 100644
--- a/intern/smoke/extern/smoke_API.h
+++ b/intern/smoke/extern/smoke_API.h
@@ -63,11 +63,11 @@ void smoke_turbulence_free(struct WTURBULENCE *wt);
 void smoke_turbulence_step(struct WTURBULENCE *wt, struct FLUID_3D *fluid);
 
 float *smoke_turbulence_get_density(struct WTURBULENCE *wt);
-void smoke_turbulence_get_res(struct WTURBULENCE *wt, unsigned int *res);
+void smoke_turbulence_get_res(struct WTURBULENCE *wt, int *res);
 void smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type);
-void smoke_turbulence_initBlenderRNA(struct WTURBULENCE *wt, float *strength);
+void smoke_initWaveletBlenderRNA(struct WTURBULENCE *wt, float *strength);
 
-void smoke_turbulence_dissolve(struct WTURBULENCE *wt, int speed, int log);
+void smoke_dissolve_wavelet(struct WTURBULENCE *wt, int speed, int log);
 
 // export
 void smoke_turbulence_export(struct WTURBULENCE *wt, float **dens, float **densold, float **tcu, float **tcv, float **tcw);
diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 89dd893198b..7574a0ec16e 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -27,9 +27,9 @@
 #include <zlib.h>
 
 // boundary conditions of the fluid domain
-#define DOMAIN_BC_FRONT  1
-#define DOMAIN_BC_TOP    0
-#define DOMAIN_BC_LEFT   1
+#define DOMAIN_BC_FRONT  0 // z
+#define DOMAIN_BC_TOP    1 // y
+#define DOMAIN_BC_LEFT   1 // x
 #define DOMAIN_BC_BACK   DOMAIN_BC_FRONT
 #define DOMAIN_BC_BOTTOM DOMAIN_BC_TOP
 #define DOMAIN_BC_RIGHT  DOMAIN_BC_LEFT
@@ -111,47 +111,42 @@ FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
 	}
 
 	// set side obstacles
-  size_t index;
-  for (int y = 0; y < _yRes; y++) // z
-    for (int x = 0; x < _xRes; x++)
-    {
-      // front slab
-      index = x + y * _xRes;
-      if(DOMAIN_BC_BOTTOM==1) _obstacles[index] = 1;
+	int index;
+	for (int y = 0; y < _yRes; y++)
+	for (int x = 0; x < _xRes; x++)
+	{
+		// front slab
+		index = x + y * _xRes;
+		if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
 
-      // back slab
-      index += _totalCells - _slabSize;
-      if(DOMAIN_BC_TOP==1) _obstacles[index] = 1;
-    }
-  for (int z = 0; z < _zRes; z++) // y
-    for (int x = 0; x < _xRes; x++)
-    {
-      // bottom slab
-      index = x + z * _slabSize;
-      if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
+		// back slab
+		index += _totalCells - _slabSize;
+		if(DOMAIN_BC_BACK==1) _obstacles[index] = 1;
+	}
 
-      // top slab
-      index += _slabSize - _xRes;
-      if(DOMAIN_BC_BACK==1) _obstacles[index] = 1;
-    }
-  for (int z = 0; z < _zRes; z++) // x
-    for (int y = 0; y < _yRes; y++)
-    {
-      // left slab
-      index = y * _xRes + z * _slabSize;
-      if(DOMAIN_BC_LEFT==1) _obstacles[index] = 1;
+	for (int z = 0; z < _zRes; z++)
+	for (int x = 0; x < _xRes; x++)
+	{
+		// bottom slab
+		index = x + z * _slabSize;
+		if(DOMAIN_BC_BOTTOM==1) _obstacles[index] = 1;
 
-      // right slab
-      index += _xRes - 1;
-      if(DOMAIN_BC_RIGHT==1) _obstacles[index] = 1;
-    }
+		// top slab
+		index += _slabSize - _xRes;
+		if(DOMAIN_BC_TOP==1) _obstacles[index] = 1;
+	}
 
-	/*
-	SPHERE *obsSphere = NULL;
-	obsSphere = new SPHERE(0.375,0.5,0.375, 0.1); // for 4 to 3 domain
-	addObstacle(obsSphere);
-	delete obsSphere;
-	*/
+	for (int z = 0; z < _zRes; z++)
+	for (int y = 0; y < _yRes; y++)
+	{
+		// left slab
+		index = y * _xRes + z * _slabSize;
+		if(DOMAIN_BC_LEFT==1) _obstacles[index] = 1;
+
+		// right slab
+		index += _xRes - 1;
+		if(DOMAIN_BC_RIGHT==1) _obstacles[index] = 1;
+	}
 }
 
 FLUID_3D::~FLUID_3D()
@@ -191,7 +186,7 @@ void FLUID_3D::step()
 	for (int i = 0; i < _totalCells; i++)
 	{
 		_xForce[i] = _yForce[i] = _zForce[i] = 0.0f;
-		_obstacles[i] &= ~2;
+		// _obstacles[i] &= ~2;
 	}
 
 	wipeBoundaries();
@@ -232,7 +227,8 @@ void FLUID_3D::step()
 	_totalTime += _dt;
 	_totalSteps++;	
 
-	memset(_obstacles, 0, sizeof(unsigned char)*_xRes*_yRes*_zRes);
+	// todo xxx dg: only clear obstacles, not boundaries
+	// memset(_obstacles, 0, sizeof(unsigned char)*_xRes*_yRes*_zRes);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -270,7 +266,7 @@ void FLUID_3D::artificialDamping(float* field) {
 //////////////////////////////////////////////////////////////////////
 void FLUID_3D::copyBorderAll(float* field)
 {
-	size_t index;
+	int index;
 	for (int y = 0; y < _yRes; y++)
 		for (int x = 0; x < _xRes; x++)
 		{
@@ -350,14 +346,14 @@ void FLUID_3D::project()
 
 	// copy out the boundaries
 	if(DOMAIN_BC_LEFT == 0)  setNeumannX(_xVelocity, _res);
-	else setZeroX(_xVelocity, _res);
+	else setZeroX(_xVelocity, _res); 
 
-	if(DOMAIN_BC_TOP == 0)   setNeumannZ(_zVelocity, _res);
+	if(DOMAIN_BC_TOP == 0)   setNeumannY(_yVelocity, _res);
+	else setZeroY(_yVelocity, _res); 
+
+	if(DOMAIN_BC_FRONT == 0) setNeumannZ(_zVelocity, _res);
 	else setZeroZ(_zVelocity, _res);
 
-	if(DOMAIN_BC_FRONT == 0) setNeumannY(_yVelocity, _res);
-	else setZeroY(_yVelocity, _res);
-
 	// calculate divergence
 	index = _slabSize + _xRes + 1;
 	for (z = 1; z < _zRes - 1; z++, index += 2 * _xRes)
@@ -400,12 +396,16 @@ void FLUID_3D::project()
 		for (y = 1; y < _yRes - 1; y++, index += 2)
 			for (x = 1; x < _xRes - 1; x++, index++)
 			{
-				if(!_obstacles[index])
+				// if(!_obstacles[index])
 				{
 					_xVelocity[index] -= 0.5f * (_pressure[index + 1]     - _pressure[index - 1]) * invDx;
 					_yVelocity[index] -= 0.5f * (_pressure[index + _xRes]  - _pressure[index - _xRes]) * invDx;
 					_zVelocity[index] -= 0.5f * (_pressure[index + _slabSize] - _pressure[index - _slabSize]) * invDx;
-				}
+				}/*
+				else
+				{
+					_xVelocity[index] = _yVelocity[index] = _zVelocity[index] = 0.0f;
+				}*/
 			}
 
 	if (_pressure) delete[] _pressure;
@@ -669,14 +669,14 @@ void FLUID_3D::advectMacCormack()
 	Vec3Int res = Vec3Int(_xRes,_yRes,_zRes);
 
 	if(DOMAIN_BC_LEFT == 0) copyBorderX(_xVelocity, res);
-	else setZeroX(_xVelocity, res);
+	else setZeroX(_xVelocity, res); 
 
-	if(DOMAIN_BC_TOP == 0) copyBorderZ(_zVelocity, res);
+	if(DOMAIN_BC_TOP == 0) copyBorderY(_yVelocity, res);
+	else setZeroY(_yVelocity, res); 
+
+	if(DOMAIN_BC_FRONT == 0) copyBorderZ(_zVelocity, res);
 	else setZeroZ(_zVelocity, res);
 
-	if(DOMAIN_BC_FRONT == 0) copyBorderY(_yVelocity, res);
-	else setZeroY(_yVelocity, res);
-
 	SWAP_POINTERS(_xVelocity, _xVelocityOld);
 	SWAP_POINTERS(_yVelocity, _yVelocityOld);
 	SWAP_POINTERS(_zVelocity, _zVelocityOld);
@@ -698,14 +698,14 @@ void FLUID_3D::advectMacCormack()
 	advectFieldMacCormack(dt0, _xVelocityOld, _yVelocityOld, _zVelocityOld, _zVelocityOld, _zVelocity, t1,t2, res, _obstacles);
 
 	if(DOMAIN_BC_LEFT == 0) copyBorderX(_xVelocity, res);
-	else setZeroX(_xVelocity, res);
+	else setZeroX(_xVelocity, res); 
 
-	if(DOMAIN_BC_TOP == 0) copyBorderZ(_zVelocity, res);
+	if(DOMAIN_BC_TOP == 0) copyBorderY(_yVelocity, res);
+	else setZeroY(_yVelocity, res); 
+
+	if(DOMAIN_BC_FRONT == 0) copyBorderZ(_zVelocity, res);
 	else setZeroZ(_zVelocity, res);
 
-	if(DOMAIN_BC_FRONT == 0) copyBorderY(_yVelocity, res);
-	else setZeroY(_yVelocity, res);
-
 	setZeroBorder(_density, res);
 	setZeroBorder(_heat, res);
 
diff --git a/intern/smoke/intern/FLUID_3D_STATIC.cpp b/intern/smoke/intern/FLUID_3D_STATIC.cpp
index 4474129beea..4909c071c3d 100644
--- a/intern/smoke/intern/FLUID_3D_STATIC.cpp
+++ b/intern/smoke/intern/FLUID_3D_STATIC.cpp
@@ -80,7 +80,7 @@ void FLUID_3D::addSmokeTestCase(float* field, Vec3Int res, float value)
 void FLUID_3D::setNeumannX(float* field, Vec3Int res)
 {
 	const int slabSize = res[0] * res[1];
-	size_t index;
+	int index;
 	for (int z = 0; z < res[2]; z++)
 		for (int y = 0; y < res[1]; y++)
 		{
@@ -92,6 +92,18 @@ void FLUID_3D::setNeumannX(float* field, Vec3Int res)
 			index += res[0] - 1;
 			field[index] = field[index - 2];
 		}
+
+	// fix, force top slab to only allow outwards flux
+	for (int y = 0; y < res[1]; y++)
+		for (int z = 0; z < res[2]; z++)
+		{
+			// top slab
+			int index = y * res[0] + z * slabSize;
+			index += res[0] - 1;
+			if(field[index]<0.) field[index] = 0.;
+			index -= 1;
+			if(field[index]<0.) field[index] = 0.;
+		}
  }
 
 //////////////////////////////////////////////////////////////////////
@@ -100,18 +112,31 @@ void FLUID_3D::setNeumannX(float* field, Vec3Int res)
 void FLUID_3D::setNeumannY(float* field, Vec3Int res)
 {
 	const int slabSize = res[0] * res[1];
-	size_t index;
+	int index;
 	for (int z = 0; z < res[2]; z++)
 		for (int x = 0; x < res[0]; x++)
 		{
-			// front slab
+			// bottom slab
 			index = x + z * slabSize;
 			field[index] = field[index + 2 * res[0]];
 
-			// back slab
+			// top slab
 			index += slabSize - res[0];
 			field[index] = field[index - 2 * res[0]];
 		}
+
+	// fix, force top slab to only allow outwards flux
+	for (int z = 0; z < res[2]; z++)
+		for (int x = 0; x < res[0]; x++)
+		{
+			// top slab
+			int index = x + z * slabSize;
+			index += slabSize - res[0];
+			if(field[index]<0.) field[index] = 0.;
+			index -= res[0];
+			if(field[index]<0.) field[index] = 0.;
+		}
+		
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -121,15 +146,15 @@ void FLUID_3D::setNeumannZ(float* field, Vec3Int res)
 {
 	const int slabSize = res[0] * res[1];
 	const int totalCells = res[0] * res[1] * res[2];
-	size_t index;
+	int index;
 	for (int y = 0; y < res[1]; y++)
 		for (int x = 0; x < res[0]; x++)
 		{
-			// bottom slab
+			// front slab
 			index = x + y * res[0];
 			field[index] = field[index + 2 * slabSize];
 
-			// top slab
+			// back slab
 			index += totalCells - slabSize;
 			field[index] = field[index - 2 * slabSize];
 		}
@@ -139,11 +164,11 @@ void FLUID_3D::setNeumannZ(float* field, Vec3Int res)
 		for (int x = 0; x < res[0]; x++)
 		{
 			// top slab
-			index = x + y * res[0];
+			int index = x + y * res[0];
 			index += totalCells - slabSize;
-			if(field[index]<0.) field[index] = 0.0f;
+			if(field[index]<0.) field[index] = 0.;
 			index -= slabSize;
-			if(field[index]<0.) field[index] = 0.0f;
+			if(field[index]<0.) field[index] = 0.;
 		}
 		
 }
@@ -231,13 +256,14 @@ void FLUID_3D::copyBorderX(float* field, Vec3Int res)
 void FLUID_3D::copyBorderY(float* field, Vec3Int res)
 {
 	const int slabSize = res[0] * res[1];
+	const int totalCells = res[0] * res[1] * res[2];
 	int index;
 	for (int z = 0; z < res[2]; z++)
 		for (int x = 0; x < res[0]; x++)
 		{
 			// bottom slab
 			index = x + z * slabSize;
-			field[index] = field[index + res[0]];
+			field[index] = field[index + res[0]]; 
 			// top slab
 			index += slabSize - res[0];
 			field[index] = field[index - res[0]];
@@ -253,7 +279,7 @@ void FLUID_3D::copyBorderZ(float* field, Vec3Int res)
 		{
 			// front slab
 			index = x + y * res[0];
-			field[index] = field[index + slabSize];
+			field[index] = field[index + slabSize]; 
 			// back slab
 			index += totalCells - slabSize;
 			field[index] = field[index - slabSize];
@@ -269,18 +295,21 @@ void FLUID_3D::advectFieldSemiLagrange(const float dt, const float* velx, const
 	const int xres = res[0];
 	const int yres = res[1];
 	const int zres = res[2];
+	static int hits = 0;
+	static int total = 0;
 	const int slabSize = res[0] * res[1];
 
 	// scale dt up to grid resolution
-#if PARALLEL==1
-#pragma omp parallel for schedule(static)
+#if PARALLEL==1 && !_WIN32
+#pragma omp parallel
+#pragma omp for  schedule(static)
 #endif
 	for (int z = 0; z < zres; z++)
 		for (int y = 0; y < yres; y++)
 			for (int x = 0; x < xres; x++)
 			{
 				const int index = x + y * xres + z * xres*yres;
-
+				
         // backtrace
 				float xTrace = x - dt * velx[index];
 				float yTrace = y - dt * vely[index];
@@ -337,8 +366,8 @@ void FLUID_3D::advectFieldSemiLagrange(const float dt, const float* velx, const
 //
 // comments are the pseudocode from selle's paper
 //////////////////////////////////////////////////////////////////////
-void FLUID_3D::advectFieldMacCormack(const float dt, const float* xVelocity, const float* yVelocity, const float* zVelocity,
-		float* oldField, float* newField, float* temp1, float* temp2, Vec3Int res, const unsigned char* obstacles)
+void FLUID_3D::advectFieldMacCormack(const float dt, const float* xVelocity, const float* yVelocity, const float* zVelocity, 
+				float* oldField, float* newField, float* temp1, float* temp2, Vec3Int res, const unsigned char* obstacles)
 {
 	float* phiHatN  = temp1;
 	float* phiHatN1 = temp2;
@@ -359,7 +388,7 @@ void FLUID_3D::advectFieldMacCormack(const float dt, const float* xVelocity, con
 	advectFieldSemiLagrange( -1.0*dt, xVelocity, yVelocity, zVelocity, phiHatN1, phiHatN, res);
 
 	// phiN1 = phiHatN1 + (phiN - phiHatN) / 2
-	const int border = 0;
+	const int border = 0; 
 	for (int z = border; z < sz-border; z++)
 		for (int y = border; y < sy-border; y++)
 			for (int x = border; x < sx-border; x++) {
@@ -376,7 +405,7 @@ void FLUID_3D::advectFieldMacCormack(const float dt, const float* xVelocity, con
 
 	// if the error estimate was bad, revert to first order
 	clampOutsideRays(dt, xVelocity, yVelocity, zVelocity, oldField, newField, res, obstacles, phiHatN1);
-}
+} 
 
 
 //////////////////////////////////////////////////////////////////////
@@ -454,17 +483,18 @@ void FLUID_3D::clampExtrema(const float dt, const float* velx, const float* vely
 }
 
 //////////////////////////////////////////////////////////////////////
-// Reverts any backtraces that go into boundaries back to first
+// Reverts any backtraces that go into boundaries back to first 
 // order -- in this case the error correction term was totally
 // incorrect
 //////////////////////////////////////////////////////////////////////
-void FLUID_3D::clampOutsideRays(const float dt, const float* velx, const float* vely, const float* velz,
-		float* oldField, float* newField, Vec3Int res, const unsigned char* obstacles, const float *oldAdvection)
+void FLUID_3D::clampOutsideRays(const float dt, const float* velx, const float* vely,  const float* velz,
+				float* oldField, float* newField, Vec3Int res, const unsigned char* obstacles, const float *oldAdvection)
 {
 	const int sx= res[0];
 	const int sy= res[1];
 	const int sz= res[2];
 	const int slabSize = res[0] * res[1];
+
 	for (int z = 1; z < sz-1; z++)
 		for (int y = 1; y < sy-1; y++)
 			for (int x = 1; x < sx-1; x++)
@@ -479,7 +509,7 @@ void FLUID_3D::clampOutsideRays(const float dt, const float* velx, const float*
 				float zTrace    = z - dt * velz[index];
 
 				// see if it goes outside the boundaries
-				bool hasObstacle =
+				bool hasObstacle = 
 					(zTrace < 1.0f)    || (zTrace > sz - 2.0f) ||
 					(yTrace < 1.0f)    || (yTrace > sy - 2.0f) ||
 					(xTrace < 1.0f)    || (xTrace > sx - 2.0f) ||
@@ -515,7 +545,7 @@ void FLUID_3D::clampOutsideRays(const float dt, const float* velx, const float*
 				int z0 = (int)zBackward;
 				int z1 = z0 + 1;
 				if(obstacles && !hasObstacle) {
-					hasObstacle = hasObstacle ||
+					hasObstacle = hasObstacle || 
 						obstacles[x0 + y0 * sx + z0*slabSize] ||
 						obstacles[x0 + y1 * sx + z0*slabSize] ||
 						obstacles[x1 + y0 * sx + z0*slabSize] ||
@@ -535,7 +565,7 @@ void FLUID_3D::clampOutsideRays(const float dt, const float* velx, const float*
 				z0 = (int)zTrace;
 				z1 = z0 + 1;
 				if(obstacles && !hasObstacle) {
-					hasObstacle = hasObstacle ||
+					hasObstacle = hasObstacle || 
 						obstacles[x0 + y0 * sx + z0*slabSize] ||
 						obstacles[x0 + y1 * sx + z0*slabSize] ||
 						obstacles[x1 + y0 * sx + z0*slabSize] ||
@@ -577,84 +607,8 @@ void FLUID_3D::clampOutsideRays(const float dt, const float* velx, const float*
 						u1 * (s0 * (t0 * oldField[i001] +
 									t1 * oldField[i011]) +
 								s1 * (t0 * oldField[i101] +
-									t1 * oldField[i111]));
+									t1 * oldField[i111])); 
 				}
 			} // xyz
 }
 
-//////////////////////////////////////////////////////////////////////
-// image output
-//////////////////////////////////////////////////////////////////////
-/*
-void FLUID_3D::writeImageSliceXY(const float *field, Vec3Int res, int slice, string prefix, int picCnt, float scale) {
-  writeProjectedIntern(field, res, 0,1, prefix, picCnt, scale);
-}
-void FLUID_3D::writeImageSliceYZ(const float *field, Vec3Int res, int slice, string prefix, int picCnt, float scale) {
-  writeProjectedIntern(field, res, 1,2, prefix, picCnt, scale);
-}
-void FLUID_3D::writeImageSliceXZ(const float *field, Vec3Int res, int slice, string prefix, int picCnt, float scale) {
-  writeProjectedIntern(field, res, 0,2, prefix, picCnt, scale);
-}
-*/
-
-//////////////////////////////////////////////////////////////////////
-// Helper function for projecting densities along a dimension
-//////////////////////////////////////////////////////////////////////
-/*
-static int getOtherDir(int dir1, int dir2) {
-	switch(dir1) {
-		case 0:
-			switch(dir2) {
-				case 1: return 2;
-				case 2: return 1; }
-			break;
-		case 1:
-			switch(dir2) {
-				case 0: return 2;
-				case 2: return 0; }
-			break;
-		case 2:
-			switch(dir2) {
-				case 0: return 1;
-				case 1: return 0; }
-			break;
-		default:
-			return 0;
-	}
-	return 0;
-}
-*/
-
-//////////////////////////////////////////////////////////////////////
-// average densities along third spatial direction
-//////////////////////////////////////////////////////////////////////
-/*
-void FLUID_3D::writeProjectedIntern(const float *field, Vec3Int res,
-		int dir1, int dir2, string prefix, int picCnt, float scale) {
-	const int nitems = res[dir1]*res[dir2];
-	const int otherDir = getOtherDir(dir1,dir2);
-	float *buf = new float[nitems];
-	Vec3Int min = Vec3Int(0);
-	Vec3Int max = res;
-
-	min[otherDir] = 0;
-	max[otherDir] = res[otherDir];
-	float div = 1./(float)MIN3V(res); // normalize for shorter sides, old: res[otherDir];
-	div *= 4.; //slightly increase contrast
-	for(int i=0; i<nitems; i++) buf[i] = 0.;
-
-	Vec3Int cnt = 0;
-	for (cnt[2] = min[2]; cnt[2] < max[2]; cnt[2]++) {
-		for (cnt[1] = min[1]; cnt[1] < max[1]; cnt[1]++)
-			for (cnt[0] = min[0]; cnt[0] < max[0]; cnt[0]++)
-			{
-				const int index = cnt[0] + cnt[1] * res[0] + cnt[2] * res[0]*res[1];
-				const int bufindex = cnt[dir1] + cnt[dir2] * res[dir1];
-				buf[bufindex] += field[index] * scale *div;
-			}
-	}
-	// IMAGE::dumpNumberedPNG(picCnt, prefix, buf, res[dir1], res[dir2]);
-	delete[] buf;
-}
-*/
-
diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index dd092d4f0cc..a1b2aaf30f2 100644
--- a/intern/smoke/intern/WTURBULENCE.cpp
+++ b/intern/smoke/intern/WTURBULENCE.cpp
@@ -92,10 +92,6 @@ WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int no
 	_tcW = new float[_totalCellsSm];
 	_tcTemp = new float[_totalCellsSm];
 	
-	// allocate & init energy terms
-	_energy = new float[_totalCellsSm];
-	_highFreqEnergy = new float[_totalCellsSm];
-	
 	// map all 
 	const float dx = 1./(float)(_resSm[0]);
 	const float dy = 1./(float)(_resSm[1]);
@@ -109,15 +105,8 @@ WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int no
 		_tcV[index] = y*dy;
 		_tcW[index] = z*dz;
 		_tcTemp[index] = 0.;
-		_energy[index] = 0.;
 		}
 	
-	// allocate eigenvalue arrays
-	_eigMin = new float[_totalCellsSm];
-	_eigMax = new float[_totalCellsSm];
-	for(int i=0; i < _totalCellsSm; i++) 
-		_eigMin[i] = _eigMax[i] =  0.;
-	
 	// noise tiles
 	_noiseTile = new float[noiseTileSize * noiseTileSize * noiseTileSize];
 	/*
@@ -143,12 +132,7 @@ WTURBULENCE::~WTURBULENCE() {
   delete[] _tcW;
   delete[] _tcTemp;
 
-  delete[] _eigMin;
-  delete[] _eigMax;
   delete[] _noiseTile;
-
-  delete[] _energy;
-  delete[] _highFreqEnergy;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -293,34 +277,34 @@ static float minDz(int x, int y, int z, float* input, Vec3Int res)
 // handle texture coordinates (advection, reset, eigenvalues), 
 // Beware -- uses big density maccormack as temporary arrays
 ////////////////////////////////////////////////////////////////////// 
-void WTURBULENCE::advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel, float *_tempBig1, float *_tempBig2) {
+void WTURBULENCE::advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel, float *tempBig1, float *tempBig2) {
   // advection
   SWAP_POINTERS(_tcTemp, _tcU);
   FLUID_3D::copyBorderX(_tcTemp, _resSm);
   FLUID_3D::copyBorderY(_tcTemp, _resSm);
   FLUID_3D::copyBorderZ(_tcTemp, _resSm);
   FLUID_3D::advectFieldMacCormack(dtOrg, xvel, yvel, zvel, 
-      _tcTemp, _tcU, _tempBig1, _tempBig2, _resSm, NULL);
+      _tcTemp, _tcU, tempBig1, tempBig2, _resSm, NULL);
 
   SWAP_POINTERS(_tcTemp, _tcV);
   FLUID_3D::copyBorderX(_tcTemp, _resSm);
   FLUID_3D::copyBorderY(_tcTemp, _resSm);
   FLUID_3D::copyBorderZ(_tcTemp, _resSm);
   FLUID_3D::advectFieldMacCormack(dtOrg, xvel, yvel, zvel, 
-      _tcTemp, _tcV, _tempBig1, _tempBig2, _resSm, NULL);
+      _tcTemp, _tcV, tempBig1, tempBig2, _resSm, NULL);
 
   SWAP_POINTERS(_tcTemp, _tcW);
   FLUID_3D::copyBorderX(_tcTemp, _resSm);
   FLUID_3D::copyBorderY(_tcTemp, _resSm);
   FLUID_3D::copyBorderZ(_tcTemp, _resSm);
   FLUID_3D::advectFieldMacCormack(dtOrg, xvel, yvel, zvel, 
-      _tcTemp, _tcW, _tempBig1, _tempBig2, _resSm, NULL);
+      _tcTemp, _tcW, tempBig1, tempBig2, _resSm, NULL);
 }
 
 //////////////////////////////////////////////////////////////////////
 // Compute the eigenvalues of the advected texture
 ////////////////////////////////////////////////////////////////////// 
-void WTURBULENCE::computeEigenvalues() {
+void WTURBULENCE::computeEigenvalues(float *_eigMin, float *_eigMax) {
   // stats
   float maxeig = -1.;
   float mineig = 10.;
@@ -365,7 +349,7 @@ void WTURBULENCE::computeEigenvalues() {
 //////////////////////////////////////////////////////////////////////
 // advect & reset texture coordinates based on eigenvalues
 ////////////////////////////////////////////////////////////////////// 
-void WTURBULENCE::resetTextureCoordinates() 
+void WTURBULENCE::resetTextureCoordinates(float *_eigMin, float *_eigMax) 
 {
   // allowed deformation of the textures
   const float limit = 2.f;
@@ -396,7 +380,7 @@ void WTURBULENCE::resetTextureCoordinates()
 // Compute the highest frequency component of the wavelet
 // decomposition
 //////////////////////////////////////////////////////////////////////
-void WTURBULENCE::decomposeEnergy()
+void WTURBULENCE::decomposeEnergy(float *_energy, float *_highFreqEnergy)
 {
   // do the decomposition -- the goal here is to have
   // the energy with the high frequency component stomped out
@@ -432,7 +416,7 @@ void WTURBULENCE::decomposeEnergy()
 // compute velocity from energies and march into obstacles
 // for wavelet decomposition
 ////////////////////////////////////////////////////////////////////// 
-void WTURBULENCE::computeEnergy(float* xvel, float* yvel, float* zvel, unsigned char *obstacles) 
+void WTURBULENCE::computeEnergy(float *_energy, float* xvel, float* yvel, float* zvel, unsigned char *obstacles) 
 {
   // compute everywhere
   for (int x = 0; x < _totalCellsSm; x++) 
@@ -491,7 +475,7 @@ void WTURBULENCE::computeEnergy(float* xvel, float* yvel, float* zvel, unsigned
             }
             if (valid > 0)
             {
-              _energy[index] = sum / valid;
+              _energy[index] = sum / (float)valid;
               obstacles[index] = MARCHED;
             }
           }
@@ -516,9 +500,9 @@ void WTURBULENCE::computeEnergy(float* xvel, float* yvel, float* zvel, unsigned
 Vec3 WTURBULENCE::WVelocity(Vec3 orgPos)
 {
   // arbitrarily offset evaluation points
-  const Vec3 p1 = orgPos + Vec3(NOISE_TILE_SIZE/2,0,0);
-  const Vec3 p2 = orgPos + Vec3(0,NOISE_TILE_SIZE/2,0);
-  const Vec3 p3 = orgPos + Vec3(0,0,NOISE_TILE_SIZE/2);
+  const Vec3 p1 = orgPos + Vec3(NOISE_TILE_SIZE/2.0,0,0);
+  const Vec3 p2 = orgPos + Vec3(0,NOISE_TILE_SIZE/2.0,0);
+  const Vec3 p3 = orgPos + Vec3(0,0,NOISE_TILE_SIZE/2.0);
 
   const float f1y = WNoiseDy(p1, _noiseTile);
   const float f1z = WNoiseDz(p1, _noiseTile);
@@ -542,9 +526,9 @@ Vec3 WTURBULENCE::WVelocity(Vec3 orgPos)
 Vec3 WTURBULENCE::WVelocityWithJacobian(Vec3 orgPos, float* xUnwarped, float* yUnwarped, float* zUnwarped)
 {
   // arbitrarily offset evaluation points
-  const Vec3 p1 = orgPos + Vec3(NOISE_TILE_SIZE/2,0,0);
-  const Vec3 p2 = orgPos + Vec3(0,NOISE_TILE_SIZE/2,0);
-  const Vec3 p3 = orgPos + Vec3(0,0,NOISE_TILE_SIZE/2);
+  const Vec3 p1 = orgPos + Vec3(NOISE_TILE_SIZE/2.0,0,0);
+  const Vec3 p2 = orgPos + Vec3(0,NOISE_TILE_SIZE/2.0,0);
+  const Vec3 p3 = orgPos + Vec3(0,0,NOISE_TILE_SIZE/2.0);
 
   Vec3 final;
   final[0] = WNoiseDx(p1, _noiseTile);
@@ -575,44 +559,40 @@ Vec3 WTURBULENCE::WVelocityWithJacobian(Vec3 orgPos, float* xUnwarped, float* yU
   return ret;
 }
 
+
 //////////////////////////////////////////////////////////////////////
 // perform an actual noise advection step
 //////////////////////////////////////////////////////////////////////
 void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel, float* zvel, unsigned char *obstacles) 
 {
-  // big velocity macCormack fields
-	float* _bigUx;
-	float* _bigUy;
-	float* _bigUz;
+	// enlarge timestep to match grid
+	const float dt = dtOrg * _amplify;
+	const float invAmp = 1.0f / _amplify;
+  	float *tempBig1 = new float[_totalCellsBig];
+	float *tempBig2 = new float[_totalCellsBig];
+	float *bigUx = new float[_totalCellsBig];
+	float *bigUy = new float[_totalCellsBig];
+	float *bigUz = new float[_totalCellsBig]; 
+	float *_energy = new float[_totalCellsSm];
+	float *highFreqEnergy = new float[_totalCellsSm];
+	float *eigMin  = new float[_totalCellsSm];
+	float *eigMax  = new float[_totalCellsSm];
 
-	// temp arrays for BFECC and MacCormack - they have more convenient
-	// names in the actual implementations
-	float* _tempBig1;
-	float* _tempBig2;
+	memset(tempBig1, 0, sizeof(float)*_totalCellsBig);
+	memset(tempBig2, 0, sizeof(float)*_totalCellsBig);
+	memset(highFreqEnergy, 0, sizeof(float)*_totalCellsSm);
+	memset(eigMin, 0, sizeof(float)*_totalCellsSm);
+	memset(eigMax, 0, sizeof(float)*_totalCellsSm);
 
-	// allocate high resolution velocity field. Note that this is only
-	// necessary because we use MacCormack advection. For semi-Lagrangian
-	// advection, these arrays are not necessary.
-	_tempBig1 = new float[_totalCellsBig];
-	_tempBig2 = new float[_totalCellsBig];
-
-  // enlarge timestep to match grid
-  const float dt = dtOrg * _amplify;
-  const float invAmp = 1.0f / _amplify;
-
-  _bigUx = new float[_totalCellsBig];
-  _bigUy = new float[_totalCellsBig];
-  _bigUz = new float[_totalCellsBig]; 
-
-  // prepare textures
-  advectTextureCoordinates(dtOrg, xvel,yvel,zvel, _tempBig1, _tempBig2);
+  	// prepare textures
+	advectTextureCoordinates(dtOrg, xvel,yvel,zvel, tempBig1, tempBig2);
 
   // compute eigenvalues of the texture coordinates
-  computeEigenvalues();
+  computeEigenvalues(eigMin, eigMax);
 
   // do wavelet decomposition of energy
-  computeEnergy(xvel, yvel, zvel, obstacles);
-  decomposeEnergy();
+  computeEnergy(_energy, xvel, yvel, zvel, obstacles);
+  decomposeEnergy(_energy, highFreqEnergy);
 
   // zero out coefficients inside of the obstacle
   for (int x = 0; x < _totalCellsSm; x++)
@@ -647,7 +627,7 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
 
         // retrieve wavelet energy at highest frequency
         float energy = INTERPOLATE::lerp3d(
-            _highFreqEnergy, posSm[0],posSm[1],posSm[2], _xResSm, _yResSm, _zResSm);
+            highFreqEnergy, posSm[0],posSm[1],posSm[2], _xResSm, _yResSm, _zResSm);
 
         // base amplitude for octave 0
         float coefficient = sqrtf(2.0f * fabs(energy));
@@ -656,8 +636,8 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
         // add noise to velocity, but only if the turbulence is
         // sufficiently undeformed, and the energy is large enough
         // to make a difference
-        const bool addNoise = _eigMax[indexSmall] < 2. && 
-                              _eigMin[indexSmall] > 0.5;
+        const bool addNoise = eigMax[indexSmall] < 2. && 
+                              eigMin[indexSmall] > 0.5;
         if (addNoise && amplitude > _cullingThreshold) {
           // base amplitude for octave 0
           float amplitudeScaled = amplitude;
@@ -679,21 +659,21 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
         // If you wanted to save memory, you would instead perform a 
         // semi-Lagrangian backtrace for the current grid cell here. Then
         // you could just throw the velocity away.
-        _bigUx[index] = vel[0];
-        _bigUy[index] = vel[1];
-        _bigUz[index] = vel[2];
+        bigUx[index] = vel[0];
+        bigUy[index] = vel[1];
+        bigUz[index] = vel[2];
 
         // compute the velocity magnitude for substepping later
-        const float velMag = _bigUx[index] * _bigUx[index] + 
-                             _bigUy[index] * _bigUy[index] + 
-                             _bigUz[index] * _bigUz[index];
+        const float velMag = bigUx[index] * bigUx[index] + 
+                             bigUy[index] * bigUy[index] + 
+                             bigUz[index] * bigUz[index];
         if (velMag > maxVelocity) maxVelocity = velMag;
 
         // zero out velocity inside obstacles
         float obsCheck = INTERPOLATE::lerp3dToFloat(
             obstacles, posSm[0], posSm[1], posSm[2], _xResSm, _yResSm, _zResSm); 
         if (obsCheck > 0.95) 
-          _bigUx[index] = _bigUy[index] = _bigUz[index] = 0.;
+          bigUx[index] = bigUy[index] = bigUz[index] = 0.;
       }
 
   // prepare density for an advection
@@ -701,24 +681,23 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
 
   // based on the maximum velocity present, see if we need to substep,
   // but cap the maximum number of substeps to 5
-  const int maxSubSteps = 25;
-  const int maxVel = 5;
+  const int maxSubSteps = 5; 
   maxVelocity = sqrt(maxVelocity) * dt;
-  int totalSubsteps = (int)(maxVelocity / (float)maxVel);
+  int totalSubsteps = (int)(maxVelocity / (float)maxSubSteps);
   totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
   totalSubsteps = (totalSubsteps > maxSubSteps) ? maxSubSteps : totalSubsteps;
   const float dtSubdiv = dt / (float)totalSubsteps;
 
   // set boundaries of big velocity grid
-  FLUID_3D::setZeroX(_bigUx, _resBig); 
-  FLUID_3D::setZeroY(_bigUy, _resBig); 
-  FLUID_3D::setZeroZ(_bigUz, _resBig);
+  FLUID_3D::setZeroX(bigUx, _resBig); 
+  FLUID_3D::setZeroY(bigUy, _resBig); 
+  FLUID_3D::setZeroZ(bigUz, _resBig);
 
   // do the MacCormack advection, with substepping if necessary
   for(int substep = 0; substep < totalSubsteps; substep++)
   {
-    FLUID_3D::advectFieldMacCormack(dtSubdiv, _bigUx, _bigUy, _bigUz, 
-        _densityBigOld, _densityBig, _tempBig1, _tempBig2, _resBig, NULL);
+    FLUID_3D::advectFieldMacCormack(dtSubdiv, bigUx, bigUy, bigUz, 
+        _densityBigOld, _densityBig, tempBig1, tempBig2, _resBig, NULL);
 
     if (substep < totalSubsteps - 1) 
       SWAP_POINTERS(_densityBig, _densityBigOld);
@@ -730,25 +709,21 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
   // reset texture coordinates now in preparation for next timestep
   // Shouldn't do this before generating the noise because then the 
   // eigenvalues stored do not reflect the underlying texture coordinates
-  resetTextureCoordinates();
+  resetTextureCoordinates(eigMin, eigMax);
   
-  // output files
-  /*
-  string prefix = string("./amplified.preview/density_bigxy_");
-  FLUID_3D::writeImageSliceXY(_densityBig, _resBig, _resBig[2]/2, prefix, _totalStepsBig, 1.0f);
-  //string df3Prefix = string("./df3/density_big_");
-  //IMAGE::dumpDF3(_totalStepsBig, df3Prefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
-  string pbrtPrefix = string("./pbrt/density_big_");
-  IMAGE::dumpPBRT(_totalStepsBig, pbrtPrefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
-	*/
+  delete[] tempBig1;
+  delete[] tempBig2;
+  delete[] bigUx;
+  delete[] bigUy;
+  delete[] bigUz;
+  delete[] _energy;
+  delete[] highFreqEnergy;
+
+  delete[] eigMin;
+  delete[] eigMax;
+  
+
   _totalStepsBig++;
-
-  	delete[] _bigUx;
-	delete[] _bigUy;
-	delete[] _bigUz;
-
-	delete[] _tempBig1;
-    delete[] _tempBig2;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -757,257 +732,258 @@ void WTURBULENCE::stepTurbulenceReadable(float dtOrg, float* xvel, float* yvel,
 //////////////////////////////////////////////////////////////////////
 void WTURBULENCE::stepTurbulenceFull(float dtOrg, float* xvel, float* yvel, float* zvel, unsigned char *obstacles)
 {
-	// big velocity macCormack fields
-	float* _bigUx;
-	float* _bigUy;
-	float* _bigUz;
-
-	// temp arrays for BFECC and MacCormack - they have more convenient
-	// names in the actual implementations
-	float* _tempBig1;
-	float* _tempBig2;
-
-	// allocate high resolution velocity field. Note that this is only
-	// necessary because we use MacCormack advection. For semi-Lagrangian
-	// advection, these arrays are not necessary.
-	_tempBig1 = new float[_totalCellsBig];
-	_tempBig2 = new float[_totalCellsBig];
-
 	// enlarge timestep to match grid
 	const float dt = dtOrg * _amplify;
 	const float invAmp = 1.0f / _amplify;
+	float *tempBig1 = new float[_totalCellsBig];
+	float *tempBig2 = new float[_totalCellsBig];
+	float *bigUx = new float[_totalCellsBig];
+	float *bigUy = new float[_totalCellsBig];
+	float *bigUz = new float[_totalCellsBig]; 
+	float *_energy = new float[_totalCellsSm];
+	float *highFreqEnergy = new float[_totalCellsSm];
+	float *eigMin  = new float[_totalCellsSm];
+	float *eigMax  = new float[_totalCellsSm];
 
-	_bigUx = new float[_totalCellsBig];
-	_bigUy = new float[_totalCellsBig];
-	_bigUz = new float[_totalCellsBig]; 
+	memset(highFreqEnergy, 0, sizeof(float)*_totalCellsSm);
+	memset(eigMin, 0, sizeof(float)*_totalCellsSm);
+	memset(eigMax, 0, sizeof(float)*_totalCellsSm);
 
 	// prepare textures
-	advectTextureCoordinates(dtOrg, xvel,yvel,zvel, _tempBig1, _tempBig2);
+	advectTextureCoordinates(dtOrg, xvel,yvel,zvel, tempBig1, tempBig2);
 
 	// do wavelet decomposition of energy
-	computeEnergy(xvel, yvel, zvel, obstacles);
-	decomposeEnergy();
+	computeEnergy(_energy, xvel, yvel, zvel, obstacles);
 
-	// zero out coefficients inside of the obstacle
 	for (int x = 0; x < _totalCellsSm; x++)
 		if (obstacles[x]) _energy[x] = 0.f;
 
-	// parallel region setup
-	float maxVelMagThreads[8] = { -1., -1., -1., -1., -1., -1., -1., -1. };
+	decomposeEnergy(_energy, highFreqEnergy);
 
-	#if PARALLEL==1
-		#pragma omp parallel
-	#endif
-	  { float maxVelMag1 = 0.;
-	#if PARALLEL==1
-		const int id  = omp_get_thread_num(); /*, num = omp_get_num_threads(); */
-	#endif
+	// zero out coefficients inside of the obstacle
+	for (int x = 0; x < _totalCellsSm; x++)
+		if (obstacles[x]) highFreqEnergy[x] = 0.f;
 
-	// vector noise main loop
-	#if PARALLEL==1
-	#pragma omp for  schedule(static)
-	#endif
-	for (int zSmall = 0; zSmall < _zResSm; zSmall++) 
-	for (int ySmall = 0; ySmall < _yResSm; ySmall++) 
-	for (int xSmall = 0; xSmall < _xResSm; xSmall++)
-	{
-		const int indexSmall = xSmall + ySmall * _xResSm + zSmall * _slabSizeSm;
+	Vec3Int ressm(_xResSm, _yResSm, _zResSm);
+	FLUID_3D::setNeumannX(highFreqEnergy, ressm);
+	FLUID_3D::setNeumannY(highFreqEnergy, ressm);
+	FLUID_3D::setNeumannZ(highFreqEnergy, ressm);
 
-		// compute jacobian
-		float jacobian[3][3] = {
-		  { minDx(xSmall, ySmall, zSmall, _tcU, _resSm), minDx(xSmall, ySmall, zSmall, _tcV, _resSm), minDx(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
-		  { minDy(xSmall, ySmall, zSmall, _tcU, _resSm), minDy(xSmall, ySmall, zSmall, _tcV, _resSm), minDy(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
-		  { minDz(xSmall, ySmall, zSmall, _tcU, _resSm), minDz(xSmall, ySmall, zSmall, _tcV, _resSm), minDz(xSmall, ySmall, zSmall, _tcW, _resSm) }
-		};
+  // parallel region setup
+  float maxVelMagThreads[8] = { -1., -1., -1., -1., -1., -1., -1., -1. };
+#if PARALLEL==1
+#pragma omp parallel
+#endif
+  { float maxVelMag1 = 0.;
+#if PARALLEL==1
+    const int id  = omp_get_thread_num(); /*, num = omp_get_num_threads(); */
+#endif
 
-		// get LU factorization of texture jacobian and apply 
-		// it to unit vectors
-		JAMA::LU<float> LU = computeLU3x3(jacobian);
-		float xUnwarped[] = {1.0f, 0.0f, 0.0f};
-		float yUnwarped[] = {0.0f, 1.0f, 0.0f};
-		float zUnwarped[] = {0.0f, 0.0f, 1.0f};
-		float xWarped[] = {1.0f, 0.0f, 0.0f};
-		float yWarped[] = {0.0f, 1.0f, 0.0f};
-		float zWarped[] = {0.0f, 0.0f, 1.0f};
-		bool nonSingular = LU.isNonsingular();
+  // vector noise main loop
+#if PARALLEL==1
+#pragma omp for  schedule(static)
+#endif
+  for (int zSmall = 0; zSmall < _zResSm; zSmall++) 
+  for (int ySmall = 0; ySmall < _yResSm; ySmall++) 
+  for (int xSmall = 0; xSmall < _xResSm; xSmall++)
+  {
+    const int indexSmall = xSmall + ySmall * _xResSm + zSmall * _slabSizeSm;
 
-		#if 0
-			// UNUSED
-			float eigMax = 10.0f;
-			float eigMin = 0.1f;
-		#endif
+    // compute jacobian
+    float jacobian[3][3] = {
+      { minDx(xSmall, ySmall, zSmall, _tcU, _resSm), minDx(xSmall, ySmall, zSmall, _tcV, _resSm), minDx(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
+      { minDy(xSmall, ySmall, zSmall, _tcU, _resSm), minDy(xSmall, ySmall, zSmall, _tcV, _resSm), minDy(xSmall, ySmall, zSmall, _tcW, _resSm) } ,
+      { minDz(xSmall, ySmall, zSmall, _tcU, _resSm), minDz(xSmall, ySmall, zSmall, _tcV, _resSm), minDz(xSmall, ySmall, zSmall, _tcW, _resSm) }
+    };
 
-		if (nonSingular)
-		{
-			solveLU3x3(LU, xUnwarped, xWarped);
-			solveLU3x3(LU, yUnwarped, yWarped);
-			solveLU3x3(LU, zUnwarped, zWarped);
+    // get LU factorization of texture jacobian and apply 
+    // it to unit vectors
+    JAMA::LU<float> LU = computeLU3x3(jacobian);
+    float xUnwarped[] = {1.0f, 0.0f, 0.0f};
+    float yUnwarped[] = {0.0f, 1.0f, 0.0f};
+    float zUnwarped[] = {0.0f, 0.0f, 1.0f};
+    float xWarped[] = {1.0f, 0.0f, 0.0f};
+    float yWarped[] = {0.0f, 1.0f, 0.0f};
+    float zWarped[] = {0.0f, 0.0f, 1.0f};
+    bool nonSingular = LU.isNonsingular();
+#if 0
+	// UNUSED
+    float eigMax = 10.0f;
+    float eigMin = 0.1f;
+#endif
+    if (nonSingular)
+    {
+      solveLU3x3(LU, xUnwarped, xWarped);
+      solveLU3x3(LU, yUnwarped, yWarped);
+      solveLU3x3(LU, zUnwarped, zWarped);
 
-			// compute the eigenvalues while we have the Jacobian available
-			Vec3 eigenvalues = Vec3(1.);
-			computeEigenvalues3x3( &eigenvalues[0], jacobian);
-			_eigMax[indexSmall] = MAX3V(eigenvalues);
-			_eigMin[indexSmall] = MIN3V(eigenvalues);
-		}
+      // compute the eigenvalues while we have the Jacobian available
+      Vec3 eigenvalues = Vec3(1.);
+      computeEigenvalues3x3( &eigenvalues[0], jacobian);
+      eigMax[indexSmall] = MAX3V(eigenvalues);
+      eigMin[indexSmall] = MIN3V(eigenvalues);
+    }
+    
+    // make sure to skip one on the beginning and end
+    int xStart = (xSmall == 0) ? 1 : 0;
+    int xEnd   = (xSmall == _xResSm - 1) ? _amplify - 1 : _amplify;
+    int yStart = (ySmall == 0) ? 1 : 0;
+    int yEnd   = (ySmall == _yResSm - 1) ? _amplify - 1 : _amplify;
+    int zStart = (zSmall == 0) ? 1 : 0;
+    int zEnd   = (zSmall == _zResSm - 1) ? _amplify - 1 : _amplify;
+      
+    for (int zBig = zStart; zBig < zEnd; zBig++) 
+    for (int yBig = yStart; yBig < yEnd; yBig++) 
+    for (int xBig = xStart; xBig < xEnd; xBig++)
+    {
+      const int x = xSmall * _amplify + xBig;
+      const int y = ySmall * _amplify + yBig;
+      const int z = zSmall * _amplify + zBig;
+      
+      // get unit position for both fine and coarse grid
+      const Vec3 pos = Vec3(x,y,z);
+      const Vec3 posSm = pos * invAmp;
+      
+      // get grid index for both fine and coarse grid
+      const int index = x + y *_xResBig + z *_slabSizeBig;
+      
+      // get a linearly interpolated velocity and texcoords
+      // from the coarse grid
+      Vec3 vel = INTERPOLATE::lerp3dVec( xvel,yvel,zvel, 
+          posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
+      Vec3 uvw = INTERPOLATE::lerp3dVec( _tcU,_tcV,_tcW, 
+          posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
 
-		// make sure to skip one on the beginning and end
-		int xStart = (xSmall == 0) ? 1 : 0;
-		int xEnd   = (xSmall == _xResSm - 1) ? _amplify - 1 : _amplify;
-		int yStart = (ySmall == 0) ? 1 : 0;
-		int yEnd   = (ySmall == _yResSm - 1) ? _amplify - 1 : _amplify;
-		int zStart = (zSmall == 0) ? 1 : 0;
-		int zEnd   = (zSmall == _zResSm - 1) ? _amplify - 1 : _amplify;
-		  
-		for (int zBig = zStart; zBig < zEnd; zBig++) 
-		for (int yBig = yStart; yBig < yEnd; yBig++) 
-		for (int xBig = xStart; xBig < xEnd; xBig++)
-		{
-			const int x = xSmall * _amplify + xBig;
-			const int y = ySmall * _amplify + yBig;
-			const int z = zSmall * _amplify + zBig;
+      // multiply the texture coordinate by _resSm so that turbulence
+      // synthesis begins at the first octave that the coarse grid 
+      // cannot capture
+      Vec3 texCoord = Vec3(uvw[0] * _resSm[0], 
+                           uvw[1] * _resSm[1],
+                           uvw[2] * _resSm[2]); 
 
-			// get unit position for both fine and coarse grid
-			const Vec3 pos = Vec3(x,y,z);
-			const Vec3 posSm = pos * invAmp;
+      // retrieve wavelet energy at highest frequency
+      float energy = INTERPOLATE::lerp3d(
+          highFreqEnergy, posSm[0],posSm[1],posSm[2], _xResSm, _yResSm, _zResSm);
 
-			// get grid index for both fine and coarse grid
-			const int index = x + y *_xResBig + z *_slabSizeBig;
+      // base amplitude for octave 0
+      float coefficient = sqrtf(2.0f * fabs(energy));
+      const float amplitude = *_strength * fabs(0.5 * coefficient) * persistence;
 
-			// get a linearly interpolated velocity and texcoords
-			// from the coarse grid
-			Vec3 vel = INTERPOLATE::lerp3dVec( xvel,yvel,zvel, 
-			  posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
-			Vec3 uvw = INTERPOLATE::lerp3dVec( _tcU,_tcV,_tcW, 
-			  posSm[0], posSm[1], posSm[2], _xResSm,_yResSm,_zResSm);
+      // add noise to velocity, but only if the turbulence is
+      // sufficiently undeformed, and the energy is large enough
+      // to make a difference
+      const bool addNoise = eigMax[indexSmall] < 2. && 
+                            eigMin[indexSmall] > 0.5;
+      if (addNoise && amplitude > _cullingThreshold) {
+        // base amplitude for octave 0
+        float amplitudeScaled = amplitude;
 
-			// multiply the texture coordinate by _resSm so that turbulence
-			// synthesis begins at the first octave that the coarse grid 
-			// cannot capture
-			Vec3 texCoord = Vec3(uvw[0] * _resSm[0], 
-							   uvw[1] * _resSm[1],
-							   uvw[2] * _resSm[2]); 
+        for (int octave = 0; octave < _octaves; octave++)
+        {
+          // multiply the vector noise times the maximum allowed
+          // noise amplitude at this octave, and add it to the total
+          vel += WVelocityWithJacobian(texCoord, &xUnwarped[0], &yUnwarped[0], &zUnwarped[0]) * amplitudeScaled;
 
-			// retrieve wavelet energy at highest frequency
-			float energy = INTERPOLATE::lerp3d(
-			  _highFreqEnergy, posSm[0],posSm[1],posSm[2], _xResSm, _yResSm, _zResSm);
+          // scale coefficient for next octave
+          amplitudeScaled *= persistence;
+          texCoord *= 2.0f;
+        }
+      }
 
-			// base amplitude for octave 0
-			float coefficient = sqrtf(2.0f * fabs(energy));
-			const float amplitude = *_strength * fabs(0.5 * coefficient) * persistence;
+      // Store velocity + turbulence in big grid for maccormack step
+      //
+      // If you wanted to save memory, you would instead perform a 
+      // semi-Lagrangian backtrace for the current grid cell here. Then
+      // you could just throw the velocity away.
+      bigUx[index] = vel[0];
+      bigUy[index] = vel[1];
+      bigUz[index] = vel[2];
 
-			// add noise to velocity, but only if the turbulence is
-			// sufficiently undeformed, and the energy is large enough
-			// to make a difference
-			const bool addNoise = _eigMax[indexSmall] < 2. && 
-								_eigMin[indexSmall] > 0.5;
+      // compute the velocity magnitude for substepping later
+      const float velMag = bigUx[index] * bigUx[index] + 
+                           bigUy[index] * bigUy[index] + 
+                           bigUz[index] * bigUz[index];
+      if (velMag > maxVelMag1) maxVelMag1 = velMag;
 
-			if (addNoise && amplitude > _cullingThreshold) {
-				// base amplitude for octave 0
-				float amplitudeScaled = amplitude;
+      // zero out velocity inside obstacles
+      float obsCheck = INTERPOLATE::lerp3dToFloat(
+          obstacles, posSm[0], posSm[1], posSm[2], _xResSm, _yResSm, _zResSm); 
+      if (obsCheck > 0.95) 
+        bigUx[index] = bigUy[index] = bigUz[index] = 0.;
+    } // xyz
 
-				for (int octave = 0; octave < _octaves; octave++)
-				{
-					// multiply the vector noise times the maximum allowed
-					// noise amplitude at this octave, and add it to the total
-					vel += WVelocityWithJacobian(texCoord, &xUnwarped[0], &yUnwarped[0], &zUnwarped[0]) * amplitudeScaled;
+#if PARALLEL==1
+    maxVelMagThreads[id] = maxVelMag1;
+#else
+    maxVelMagThreads[0] = maxVelMag1;
+#endif
+  }
+  } // omp
+  
+  // compute maximum over threads
+  float maxVelMag = maxVelMagThreads[0];
+#if PARALLEL==1
+  for (int i = 1; i < 8; i++) 
+    if (maxVelMag < maxVelMagThreads[i]) 
+      maxVelMag = maxVelMagThreads[i];
+#endif
 
-					// scale coefficient for next octave
-					amplitudeScaled *= persistence;
-					texCoord *= 2.0f;
-				}
-			}
+  // prepare density for an advection
+  SWAP_POINTERS(_densityBig, _densityBigOld);
 
-			// Store velocity + turbulence in big grid for maccormack step
-			//
-			// If you wanted to save memory, you would instead perform a 
-			// semi-Lagrangian backtrace for the current grid cell here. Then
-			// you could just throw the velocity away.
-			_bigUx[index] = vel[0];
-			_bigUy[index] = vel[1];
-			_bigUz[index] = vel[2];
+  // based on the maximum velocity present, see if we need to substep,
+  // but cap the maximum number of substeps to 5
+  const int maxSubSteps = 25;
+  const int maxVel = 5;
+  maxVelMag = sqrt(maxVelMag) * dt;
+  int totalSubsteps = (int)(maxVelMag / (float)maxVel);
+  totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
+  // printf("totalSubsteps: %d\n", totalSubsteps);
+  totalSubsteps = (totalSubsteps > maxSubSteps) ? maxSubSteps : totalSubsteps;
+  const float dtSubdiv = dt / (float)totalSubsteps;
 
-			// compute the velocity magnitude for substepping later
-			const float velMag = _bigUx[index] * _bigUx[index] + 
-							   _bigUy[index] * _bigUy[index] + 
-							   _bigUz[index] * _bigUz[index];
-			if (velMag > maxVelMag1) maxVelMag1 = velMag;
+  // set boundaries of big velocity grid
+  FLUID_3D::setZeroX(bigUx, _resBig); 
+  FLUID_3D::setZeroY(bigUy, _resBig); 
+  FLUID_3D::setZeroZ(bigUz, _resBig);
 
-			// zero out velocity inside obstacles
-			float obsCheck = INTERPOLATE::lerp3dToFloat(
-			  obstacles, posSm[0], posSm[1], posSm[2], _xResSm, _yResSm, _zResSm); 
+  // do the MacCormack advection, with substepping if necessary
+  for(int substep = 0; substep < totalSubsteps; substep++)
+  {
+    FLUID_3D::advectFieldMacCormack(dtSubdiv, bigUx, bigUy, bigUz, 
+        _densityBigOld, _densityBig, tempBig1, tempBig2, _resBig, NULL);
 
-			if (obsCheck > 0.95) 
-				_bigUx[index] = _bigUy[index] = _bigUz[index] = 0.;
-		} // xyz
+    if (substep < totalSubsteps - 1) 
+      SWAP_POINTERS(_densityBig, _densityBigOld);
+  } // substep
 
-		#if PARALLEL==1
-		maxVelMagThreads[id] = maxVelMag1;
-		#else
-		maxVelMagThreads[0] = maxVelMag1;
-		#endif
-		}
-	} // omp
+  delete[] tempBig1;
+  delete[] tempBig2;
+  delete[] bigUx;
+  delete[] bigUy;
+  delete[] bigUz;
+  delete[] _energy;
+  delete[] highFreqEnergy;
+  
+  // wipe the density borders
+  FLUID_3D::setZeroBorder(_densityBig, _resBig);
+    
+  // reset texture coordinates now in preparation for next timestep
+  // Shouldn't do this before generating the noise because then the 
+  // eigenvalues stored do not reflect the underlying texture coordinates
+  resetTextureCoordinates(eigMin, eigMax);
 
-	// compute maximum over threads
-	float maxVelMag = maxVelMagThreads[0];
-	#if PARALLEL==1
-	for (int i = 1; i < 8; i++) 
-	if (maxVelMag < maxVelMagThreads[i]) 
-	  maxVelMag = maxVelMagThreads[i];
-	#endif
-
-	// prepare density for an advection
-	SWAP_POINTERS(_densityBig, _densityBigOld);
-
-	// based on the maximum velocity present, see if we need to substep,
-	// but cap the maximum number of substeps to 5
-	const int maxSubSteps = 25;
-	const int maxVel = 5;
-	maxVelMag = sqrt(maxVelMag) * dt;
-	int totalSubsteps = (int)(maxVelMag / (float)maxVel);
-	totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
-	// printf("totalSubsteps: %d\n", totalSubsteps);
-	totalSubsteps = (totalSubsteps > maxSubSteps) ? maxSubSteps : totalSubsteps;
-	const float dtSubdiv = dt / (float)totalSubsteps;
-
-	// set boundaries of big velocity grid
-	FLUID_3D::setZeroX(_bigUx, _resBig); 
-	FLUID_3D::setZeroY(_bigUy, _resBig); 
-	FLUID_3D::setZeroZ(_bigUz, _resBig);
-
-	// do the MacCormack advection, with substepping if necessary
-	for(int substep = 0; substep < totalSubsteps; substep++)
-	{
-	FLUID_3D::advectFieldMacCormack(dtSubdiv, _bigUx, _bigUy, _bigUz, 
-		_densityBigOld, _densityBig, _tempBig1, _tempBig2, _resBig, NULL);
-
-	if (substep < totalSubsteps - 1) 
-	  SWAP_POINTERS(_densityBig, _densityBigOld);
-	} // substep
-
-	// wipe the density borders
-	FLUID_3D::setZeroBorder(_densityBig, _resBig);
-
-	// reset texture coordinates now in preparation for next timestep
-	// Shouldn't do this before generating the noise because then the 
-	// eigenvalues stored do not reflect the underlying texture coordinates
-	resetTextureCoordinates();
-
-	// output files
-	// string prefix = string("./amplified.preview/density_bigxy_");
-	// FLUID_3D::writeImageSliceXY(_densityBig, _resBig, _resBig[2]/2, prefix, _totalStepsBig, 1.0f);
-	//string df3prefix = string("./df3/density_big_");
-	//IMAGE::dumpDF3(_totalStepsBig, df3prefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
-	// string pbrtPrefix = string("./pbrt/density_big_");
-	// IMAGE::dumpPBRT(_totalStepsBig, pbrtPrefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
-
-	_totalStepsBig++;
-
-	delete[] _bigUx;
-	delete[] _bigUy;
-	delete[] _bigUz;
-
-	delete[] _tempBig1;
-	delete[] _tempBig2;
+  delete[] eigMin;
+  delete[] eigMax;
+  
+  // output files
+  // string prefix = string("./amplified.preview/density_bigxy_");
+  // FLUID_3D::writeImageSliceXY(_densityBig, _resBig, _resBig[2]/2, prefix, _totalStepsBig, 1.0f);
+  //string df3prefix = string("./df3/density_big_");
+  //IMAGE::dumpDF3(_totalStepsBig, df3prefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
+  // string pbrtPrefix = string("./pbrt/density_big_");
+  // IMAGE::dumpPBRT(_totalStepsBig, pbrtPrefix, _densityBig, _resBig[0],_resBig[1],_resBig[2]);
+  
+  _totalStepsBig++;
 }
 
diff --git a/intern/smoke/intern/WTURBULENCE.h b/intern/smoke/intern/WTURBULENCE.h
index c21e002ad48..0aa978e9e52 100644
--- a/intern/smoke/intern/WTURBULENCE.h
+++ b/intern/smoke/intern/WTURBULENCE.h
@@ -49,10 +49,10 @@ class WTURBULENCE
 		void stepTurbulenceFull(float dt, float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
 	
 		// texcoord functions
-		void advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel, float *_tempBig1, float *_tempBig2);
-		void resetTextureCoordinates();
+		void advectTextureCoordinates(float dtOrg, float* xvel, float* yvel, float* zvel, float *tempBig1, float *tempBig2);
+		void resetTextureCoordinates(float *_eigMin, float *_eigMax);
 
-		void computeEnergy(float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
+		void computeEnergy(float *energy, float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
 
 		// evaluate wavelet noise function
 		Vec3 WVelocity(Vec3 p);
@@ -63,8 +63,6 @@ class WTURBULENCE
 		inline float* getArrayTcU() { return _tcU; }
 		inline float* getArrayTcV() { return _tcV; }
 		inline float* getArrayTcW() { return _tcW; }
-		inline float* getArrayEigMin() { return _eigMin; }
-		inline float* getArrayEigMax() { return _eigMax; }
 
 		inline Vec3Int getResSm() { return _resSm; } // small resolution
 		inline Vec3Int getResBig() { return _resBig; }
@@ -81,15 +79,15 @@ class WTURBULENCE
 		
 		// noise settings
 		float _cullingThreshold;
-		float _noiseStrength;
-		float _noiseSizeScale;
-		bool _uvwAdvection;
-		bool _uvwReset;
-		float _noiseTimeanimSpeed;
-		int _dumpInterval;
-		int _noiseControlType;
+		// float _noiseStrength;
+		// float _noiseSizeScale;
+		// bool _uvwAdvection;
+		// bool _uvwReset;
+		// float _noiseTimeanimSpeed;
+		// int _dumpInterval;
+		// nt _noiseControlType;
 		// debug, scale density for projections output images
-		float _outputScale;
+		// float _outputScale;
 
 		// noise resolution
 		int _xResBig;
@@ -117,24 +115,15 @@ class WTURBULENCE
 		float* _tcW;
 		float* _tcTemp;
 
-		float* _eigMin; // no save -dg
-		float* _eigMax; // no save -dg
-
-		// wavelet decomposition of velocity energies
-		float* _energy; // no save -dg
-
 		// noise data
 		float* _noiseTile;
 		//float* _noiseTileExt;
 
 		// step counter
 		int _totalStepsBig;
-
-		// highest frequency component of wavelet decomposition
-		float* _highFreqEnergy; // no save -dg
 		
-		void computeEigenvalues();
-		void decomposeEnergy();
+		void computeEigenvalues(float *_eigMin, float *_eigMax);
+		void decomposeEnergy(float *energy, float *_highFreqEnergy);
 };
 
 #endif // WTURBULENCE_H
diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 5a016b51bbe..058831dddbb 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -137,7 +137,7 @@ extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log)
 	}
 }
 
-extern "C" void smoke_turbulence_dissolve(WTURBULENCE *wt, int speed, int log)
+extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log)
 {
 	float *density = wt->getDensityBig();
 	Vec3Int r = wt->getResBig();
@@ -172,7 +172,7 @@ extern "C" void smoke_turbulence_dissolve(WTURBULENCE *wt, int speed, int log)
 	}
 }
 
-extern "C" void smoke_turbulence_initBlenderRNA(WTURBULENCE *wt, float *strength)
+extern "C" void smoke_initWaveletBlenderRNA(WTURBULENCE *wt, float *strength)
 {
 	wt->initBlenderRNA(strength);
 }
@@ -241,13 +241,14 @@ extern "C" float *smoke_turbulence_get_density(WTURBULENCE *wt)
 	return wt ? wt->getDensityBig() : NULL;
 }
 
-extern "C" void smoke_turbulence_get_res(WTURBULENCE *wt, unsigned int *res)
+extern "C" void smoke_turbulence_get_res(WTURBULENCE *wt, int *res)
 {
 	if(wt)
 	{
-		res[0] = wt->_resBig[0];
-		res[1] = wt->_resBig[1];
-		res[2] = wt->_resBig[2];
+		Vec3Int r = wt->getResBig();
+		res[0] = r[0];
+		res[1] = r[1];
+		res[2] = r[2];
 	}
 }
 
diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index c87f71bff42..83c1ffc2e9a 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -3,11 +3,6 @@ import bpy
 
 from buttons_particle import point_cache_ui
 
-def smoke_panel_enabled_low(smd):
-	if smd.smoke_type == 'TYPE_DOMAIN':
-		return smd.domain.point_cache.baked==False
-	return True
-
 class PhysicButtonsPanel(bpy.types.Panel):
 	__space_type__ = 'PROPERTIES'
 	__region_type__ = 'WINDOW'
@@ -45,8 +40,6 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
 			split.itemL()
 
 		if md:
-		
-			# layout.enabled = smoke_panel_enabled(md)
 			layout.itemR(md, "smoke_type", expand=True)
 		
 			if md.smoke_type == 'TYPE_DOMAIN':
@@ -66,7 +59,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
 				col.itemR(domain, "dissolve_smoke", text="Dissolve")
 				sub = col.column()
 				sub.active = domain.dissolve_smoke
-				sub.itemR(domain, "dissolve_speed", text="Speed")
+				sub.itemR(domain, "dissolve_speed", text="Time")
 				sub.itemR(domain, "dissolve_smoke_log", text="Slow")
 				
 			elif md.smoke_type == 'TYPE_FLOW':
@@ -90,14 +83,17 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
 					
 			#elif md.smoke_type == 'TYPE_COLL':
 			#	layout.itemS()
-					
+
 class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 	__label__ = "Smoke Groups"
 	__default_closed__ = True
 	
 	def poll(self, context):
 		md = context.smoke
-		return md and (md.smoke_type == 'TYPE_DOMAIN')
+		if md:
+				return (md.smoke_type == 'TYPE_DOMAIN')
+		
+		return False
 
 	def draw(self, context):
 		layout = self.layout
@@ -116,7 +112,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 		col = split.column()
 		col.itemL(text="Collision Group:")
 		col.itemR(group, "coll_group", text="")
-		
+
 class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 	__label__ = "Smoke Cache"
 	__default_closed__ = True
@@ -129,7 +125,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
 		layout = self.layout
 
 		md = context.smoke.domain_settings
-		cache = md.point_cache
+		cache = md.point_cache_low
 			
 		point_cache_ui(self, cache, cache.baked==False, 0, 1)
 					
@@ -152,7 +148,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 		md = context.smoke.domain_settings
 
 		split = layout.split()
-			
+
 		col = split.column()
 		col.itemL(text="Resolution:")
 		col.itemR(md, "amplify", text="Divisions")
@@ -161,66 +157,26 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 		col.itemL(text="Noise Method:")
 		col.row().itemR(md, "noise_type", text="")
 		col.itemR(md, "strength")
-		col.itemR(md, "show_highres")
+		sub.itemR(md, "viewhighres")
 		
 class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
-	__label__ = "Smoke Cache"
+	__label__ = "Smoke High Resolution Cache"
 	__default_closed__ = True
 
 	def poll(self, context):
-		return (context.smoke)
+		md = context.smoke
+		return md and (md.smoke_type == 'TYPE_DOMAIN') and md.domain_settings.highres
 
 	def draw(self, context):
 		layout = self.layout
 
-		md = context.smoke
-
-		cache = md.point_cache
+		md = context.smoke.domain_settings
+		cache = md.point_cache_high
 			
-		layout.set_context_pointer("PointCache", cache)
-			
-		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
-		col = row.column(align=True)
-		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-			
-		row = layout.row()
-		row.itemR(cache, "name")
-			
-		row = layout.row()
-		row.itemR(cache, "start_frame")
-		row.itemR(cache, "end_frame")
-			
-		row = layout.row()
-			
-		if cache.baked == True:
-			row.itemO("ptcache.free_bake", text="Free Bake")
-		else:
-			row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-			
-		subrow = row.row()
-		subrow.enabled = cache.frames_skipped or cache.outdated
-		subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
-				
-		row = layout.row()
-		#row.enabled = smoke_panel_enabled(psys)
-		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		
-		row = layout.row()
-		#row.enabled = smoke_panel_enabled(psys)
-			
-		layout.itemL(text=cache.info)
-			
-		layout.itemS()
-			
-		row = layout.row()
-		row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-		row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-		layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
-
+		point_cache_ui(self, cache, cache.baked==False, 0, 1)
+					
 bpy.types.register(PHYSICS_PT_smoke)
 bpy.types.register(PHYSICS_PT_smoke_cache)
+bpy.types.register(PHYSICS_PT_smoke_highres)
 bpy.types.register(PHYSICS_PT_smoke_groups)
-#bpy.types.register(PHYSICS_PT_smoke_highres)
-#bpy.types.register(PHYSICS_PT_smoke_cache_highres)
+bpy.types.register(PHYSICS_PT_smoke_cache_highres)
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index b7ab07b0f91..5ae10d736fd 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -232,6 +232,7 @@ void BKE_ptcache_id_from_softbody(PTCacheID *pid, struct Object *ob, struct Soft
 void BKE_ptcache_id_from_particles(PTCacheID *pid, struct Object *ob, struct ParticleSystem *psys);
 void BKE_ptcache_id_from_cloth(PTCacheID *pid, struct Object *ob, struct ClothModifierData *clmd);
 void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd);
+void BKE_ptcache_id_from_smoke_turbulence(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd);
 
 void BKE_ptcache_ids_from_object(struct ListBase *lb, struct Object *ob);
 
diff --git a/source/blender/blenkernel/BKE_smoke.h b/source/blender/blenkernel/BKE_smoke.h
index fddcf0fea83..0f8e9c5edf5 100644
--- a/source/blender/blenkernel/BKE_smoke.h
+++ b/source/blender/blenkernel/BKE_smoke.h
@@ -32,13 +32,15 @@
 #ifndef BKE_SMOKE_H_
 #define BKE_SMOKE_H_
 
-typedef int (*bresenham_callback) (float *input, int res[3], int *pixel, float *tRay);
+typedef float (*bresenham_callback) (float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
 
 void smokeModifier_do(struct SmokeModifierData *smd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int isFinalCalc);
 
 void smokeModifier_free (struct SmokeModifierData *smd);
 void smokeModifier_reset(struct SmokeModifierData *smd);
+void smokeModifier_reset_turbulence(struct SmokeModifierData *smd);
 void smokeModifier_createType(struct SmokeModifierData *smd);
 
+long long smoke_get_mem_req(int xres, int yres, int zres, int amplify);
 
 #endif /* BKE_SMOKE_H_ */
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 912acc4786f..1ab1daf1782 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -471,6 +471,19 @@ static int ptcache_totpoint_smoke(void *smoke_v)
 		return 0;
 }
 
+/* Smoke functions */
+static int ptcache_totpoint_smoke_turbulence(void *smoke_v)
+{
+	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
+	SmokeDomainSettings *sds = smd->domain;
+	
+	if(sds->wt) {
+		return sds->res_wt[0]*sds->res_wt[1]*sds->res_wt[2];
+	}
+	else
+		return 0;
+}
+
 // forward decleration
 static int ptcache_file_write(PTCacheFile *pf, void *f, size_t tot, int size);
 
@@ -521,7 +534,7 @@ static int ptcache_compress_write(PTCacheFile *pf, unsigned char *in, unsigned i
 }
 
 static int ptcache_write_smoke(PTCacheFile *pf, void *smoke_v)
-{
+{	
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
 	
@@ -535,7 +548,7 @@ static int ptcache_write_smoke(PTCacheFile *pf, void *smoke_v)
 
 		smoke_export(sds->fluid, &dt, &dx, &dens, &densold, &heat, &heatold, &vx, &vy, &vz, &vxold, &vyold, &vzold, &obstacles);
 
-		ptcache_compress_write(pf, (unsigned char *)sds->view3d, in_len*4, out, mode);
+		ptcache_compress_write(pf, (unsigned char *)sds->shadow, in_len, out, mode);
 		ptcache_compress_write(pf, (unsigned char *)dens, in_len, out, mode);
 		ptcache_compress_write(pf, (unsigned char *)densold, in_len, out, mode);	
 		ptcache_compress_write(pf, (unsigned char *)heat, in_len, out, mode);
@@ -554,36 +567,36 @@ static int ptcache_write_smoke(PTCacheFile *pf, void *smoke_v)
 		
 		return 1;
 	}
-
 	return 0;
 }
 
-/*
 static int ptcache_write_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
 	
 	if(sds->wt) {
-		unsigned int res_big[3];
-		size_t res = sds->res[0]*sds->res[1]*sds->res[2];
+		unsigned int res_big_array[3];
+		unsigned int res_big;
+		unsigned int res = sds->res[0]*sds->res[1]*sds->res[2];
 		float *dens, *densold, *tcu, *tcv, *tcw;
 		unsigned int in_len = sizeof(float)*(unsigned int)res;
-		unsigned int in_len_big = sizeof(float) * (unsigned int)res_big;
+		unsigned int in_len_big;
 		unsigned char *out;
 		int mode;
 
-		smoke_turbulence_get_res(sds->wt, res_big);
-		mode = res_big[0]*res_big[1]*res_big[2] >= 1000000 ? 2 : 1;
+		smoke_turbulence_get_res(sds->wt, res_big_array);
+		res_big = res_big_array[0]*res_big_array[1]*res_big_array[2];
+		mode =  res_big >= 1000000 ? 2 : 1;
+		in_len_big = sizeof(float) * (unsigned int)res_big;
 
 		smoke_turbulence_export(sds->wt, &dens, &densold, &tcu, &tcv, &tcw);
 
 		out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len_big), "pointcache_lzo_buffer");
-
 		ptcache_compress_write(pf, (unsigned char *)dens, in_len_big, out, mode);
 		ptcache_compress_write(pf, (unsigned char *)densold, in_len_big, out, mode);	
-
 		MEM_freeN(out);
+
 		out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len), "pointcache_lzo_buffer");
 		ptcache_compress_write(pf, (unsigned char *)tcu, in_len, out, mode);
 		ptcache_compress_write(pf, (unsigned char *)tcv, in_len, out, mode);
@@ -594,7 +607,6 @@ static int ptcache_write_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 	}
 	return 0;
 }
-*/
 
 // forward decleration
 static int ptcache_file_read(PTCacheFile *pf, void *f, size_t tot, int size);
@@ -649,7 +661,7 @@ static void ptcache_read_smoke(PTCacheFile *pf, void *smoke_v)
 		
 		smoke_export(sds->fluid, &dt, &dx, &dens, &densold, &heat, &heatold, &vx, &vy, &vz, &vxold, &vyold, &vzold, &obstacles);
 
-		ptcache_compress_read(pf, (unsigned char *)sds->view3d, out_len*4);
+		ptcache_compress_read(pf, (unsigned char *)sds->shadow, out_len);
 		ptcache_compress_read(pf, (unsigned char*)dens, out_len);
 		ptcache_compress_read(pf, (unsigned char*)densold, out_len);
 		ptcache_compress_read(pf, (unsigned char*)heat, out_len);
@@ -666,26 +678,32 @@ static void ptcache_read_smoke(PTCacheFile *pf, void *smoke_v)
 	}
 }
 
-/*
 static void ptcache_read_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
 	SmokeDomainSettings *sds = smd->domain;
 	
 	if(sds->fluid) {
-		unsigned int res[3];
+		unsigned int res = sds->res[0]*sds->res[1]*sds->res[2];
+		unsigned int res_big, res_big_array[3];
 		float *dens, *densold, *tcu, *tcv, *tcw;
 		unsigned int out_len = sizeof(float)*(unsigned int)res;
+		unsigned int out_len_big;
 
-		smoke_turbulence_get_res(sds->wt, res);
+		smoke_turbulence_get_res(sds->wt, res_big_array);
+		res_big = res_big_array[0]*res_big_array[1]*res_big_array[2];
+		out_len_big = sizeof(float) * (unsigned int)res_big;
 
 		smoke_turbulence_export(sds->wt, &dens, &densold, &tcu, &tcv, &tcw);
 
-		ptcache_compress_read(pf, (unsigned char*)dens, out_len);
-		
+		ptcache_compress_read(pf, (unsigned char*)dens, out_len_big);
+		ptcache_compress_read(pf, (unsigned char*)densold, out_len_big);
+
+		ptcache_compress_read(pf, (unsigned char*)tcu, out_len);
+		ptcache_compress_read(pf, (unsigned char*)tcv, out_len);
+		ptcache_compress_read(pf, (unsigned char*)tcw, out_len);		
 	}
 }
-*/
 
 void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd)
 {
@@ -716,7 +734,7 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeMo
 	pid->write_header= ptcache_write_basic_header;
 	pid->read_header= ptcache_read_basic_header;
 
-	pid->data_types= (1<<BPHYS_DATA_LOCATION); // bogus values tot make pointcache happy
+	pid->data_types= (1<<BPHYS_DATA_LOCATION); // bogus values to make pointcache happy
 	pid->info_types= 0;
 }
 
@@ -736,13 +754,13 @@ void BKE_ptcache_id_from_smoke_turbulence(PTCacheID *pid, struct Object *ob, str
 	pid->cache_ptr= &sds->point_cache[1];
 	pid->ptcaches= &sds->ptcaches[1];
 
-	pid->totpoint= pid->totwrite= ptcache_totpoint_smoke;
+	pid->totpoint= pid->totwrite= ptcache_totpoint_smoke_turbulence;
 
 	pid->write_elem= NULL;
 	pid->read_elem= NULL;
 
-	pid->read_stream = ptcache_read_smoke;
-	pid->write_stream = ptcache_write_smoke;
+	pid->read_stream = ptcache_read_smoke_turbulence;
+	pid->write_stream = ptcache_write_smoke_turbulence;
 	
 	pid->interpolate_elem= NULL;
 
@@ -820,6 +838,10 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob)
 				pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
 				BKE_ptcache_id_from_smoke(pid, ob, (SmokeModifierData*)md);
 				BLI_addtail(lb, pid);
+
+				pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
+				BKE_ptcache_id_from_smoke_turbulence(pid, ob, (SmokeModifierData*)md);
+				BLI_addtail(lb, pid);
 			}
 		}
 	}
@@ -1824,6 +1846,8 @@ int BKE_ptcache_id_reset(Scene *scene, PTCacheID *pid, int mode)
 			psys_reset(pid->calldata, PSYS_RESET_DEPSGRAPH);
 		else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
 			smokeModifier_reset(pid->calldata);
+		else if(pid->type == PTCACHE_TYPE_SMOKE_HIGHRES)
+			smokeModifier_reset(pid->calldata);
 	}
 	if(clear)
 		BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
@@ -1878,6 +1902,9 @@ int BKE_ptcache_object_reset(Scene *scene, Object *ob, int mode)
 			{
 				BKE_ptcache_id_from_smoke(&pid, ob, (SmokeModifierData*)md);
 				reset |= BKE_ptcache_id_reset(scene, &pid, mode);
+
+				BKE_ptcache_id_from_smoke_turbulence(&pid, ob, (SmokeModifierData*)md);
+				reset |= BKE_ptcache_id_reset(scene, &pid, mode);
 			}
 		}
 	}
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 223d48012df..026ccf4fc7d 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -92,10 +92,10 @@ static void tend ( void )
 {
 	QueryPerformanceCounter ( &liCurrentTime );
 }
-//static double tval()
-//{
-//	return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
-//}
+static double tval()
+{
+	return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
+}
 #else
 #include <sys/time.h>
 static struct timeval _tstart, _tend;
@@ -125,7 +125,6 @@ struct SmokeModifierData;
 // forward declerations
 static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);
 void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
-void smoke_prepare_View(SmokeModifierData *smd, float framenr, float *light, int have_light);
 
 #define TRI_UVOFFSET (1./4.)
 
@@ -167,6 +166,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		// calc other res with max_res provided
 		VECSUB(size, max, min);
 
+		// prevent crash when initializing a plane as domain
 		if((size[0] < FLT_EPSILON) || (size[1] < FLT_EPSILON) || (size[2] < FLT_EPSILON))
 			return 0;
 
@@ -215,22 +215,28 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		// dt max is 0.1
 		smd->domain->fluid = smoke_init(smd->domain->res, smd->domain->p0, 0.1);
 		smd->time = scene->r.cfra;
-		smd->domain->firstframe = smd->time;
 
-		if(!smd->domain->wt && (smd->domain->flags & MOD_SMOKE_HIGHRES))
+		if(smd->domain->flags & MOD_SMOKE_HIGHRES)
 		{
-			smd->domain->wt = smoke_turbulence_init(smd->domain->res,  smd->domain->amplify + 1, smd->domain->noise);
-			smoke_turbulence_initBlenderRNA(smd->domain->wt, &smd->domain->strength);
+			smd->domain->wt = smoke_turbulence_init(smd->domain->res, smd->domain->amplify + 1, smd->domain->noise);
+			smd->domain->res_wt[0] = smd->domain->res[0] * (smd->domain->amplify + 1);
+			smd->domain->res_wt[1] = smd->domain->res[1] * (smd->domain->amplify + 1);			
+			smd->domain->res_wt[2] = smd->domain->res[2] * (smd->domain->amplify + 1);			
+			smd->domain->dx_wt = smd->domain->dx / (smd->domain->amplify + 1);		
+			printf("smd->domain->amplify: %d\n",  smd->domain->amplify);
+			printf("(smd->domain->flags & MOD_SMOKE_HIGHRES)\n");
 		}
 
-		if(!smd->domain->view3d)
-		{
-			// TVox is for transparency
-			smd->domain->view3d = MEM_callocN(sizeof(float)*smd->domain->res[0]*smd->domain->res[1]*smd->domain->res[2]*4, "Smoke_tVox");
-		}
+		if(!smd->domain->shadow)
+			smd->domain->shadow = MEM_callocN(sizeof(float) * smd->domain->res[0] * smd->domain->res[1] * smd->domain->res[2], "SmokeDomainShadow");
 
 		smoke_initBlenderRNA(smd->domain->fluid, &(smd->domain->alpha), &(smd->domain->beta));
 
+		if(smd->domain->wt)	
+		{
+			smoke_initWaveletBlenderRNA(smd->domain->wt, &(smd->domain->strength));
+			printf("smoke_initWaveletBlenderRNA\n");
+		}
 		return 1;
 	}
 	else if((smd->type & MOD_SMOKE_TYPE_FLOW) && smd->flow)
@@ -270,13 +276,11 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 			SmokeCollSettings *scs = smd->coll;
 			MVert *mvert = dm->getVertArray(dm);
 			MFace *mface = dm->getFaceArray(dm);
-			size_t i = 0;
-			int divs = 0;
+			int i = 0, divs = 0;
 			int *tridivs = NULL;
 			float cell_len = 1.0 / 50.0; // for res = 50
-			size_t newdivs = 0;
-			//size_t max_points = 0;
-			size_t quads = 0, facecounter = 0;
+			int newdivs = 0;
+			int quads = 0, facecounter = 0;
 
 			// copy obmat
 			Mat4CpyMat4(scs->mat, ob->obmat);
@@ -314,7 +318,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 				int again = 0;
 				do
 				{
-					size_t j, k;
+					int j, k;
 					int divs1 = tridivs[3 * facecounter + 0];
 					int divs2 = tridivs[3 * facecounter + 1];
 					//int divs3 = tridivs[3 * facecounter + 2];
@@ -521,10 +525,10 @@ void smokeModifier_freeDomain(SmokeModifierData *smd)
 {
 	if(smd->domain)
 	{
-		// free visualisation buffers
-		if(smd->domain->view3d)
-			MEM_freeN(smd->domain->view3d);
-		
+		if(smd->domain->shadow)
+				MEM_freeN(smd->domain->shadow);
+			smd->domain->shadow = NULL;
+
 		if(smd->domain->fluid)
 			smoke_free(smd->domain->fluid);
 
@@ -583,41 +587,46 @@ void smokeModifier_freeCollision(SmokeModifierData *smd)
 	}
 }
 
+void smokeModifier_reset_turbulence(struct SmokeModifierData *smd)
+{
+	if(smd && smd->domain && smd->domain->wt)
+	{
+		smoke_turbulence_free(smd->domain->wt);
+		smd->domain->wt = NULL;
+	}
+
+	smd->domain->point_cache[1]->flag &= ~PTCACHE_SIMULATION_VALID;
+	smd->domain->point_cache[1]->flag |= PTCACHE_OUTDATED;
+	smd->domain->point_cache[1]->simframe= 0;
+	smd->domain->point_cache[1]->last_exact= 0;
+}
+
 void smokeModifier_reset(struct SmokeModifierData *smd)
 {
 	if(smd)
 	{
 		if(smd->domain)
 		{
-			if(smd->domain->view3d)
-				MEM_freeN(smd->domain->view3d);
-			smd->domain->view3d = NULL;
-
-			smd->domain->tex = NULL;
+			if(smd->domain->shadow)
+				MEM_freeN(smd->domain->shadow);
+			smd->domain->shadow = NULL;
 
 			if(smd->domain->fluid)
 			{
 				smoke_free(smd->domain->fluid);
 				smd->domain->fluid = NULL;
 			}
-
-			if(smd->domain->wt)
-			{
-				smoke_turbulence_free(smd->domain->wt);
-				smd->domain->wt = NULL;
-			}
-		
+					
 			smd->domain->point_cache[0]->flag &= ~PTCACHE_SIMULATION_VALID;
 			smd->domain->point_cache[0]->flag |= PTCACHE_OUTDATED;
 			smd->domain->point_cache[0]->simframe= 0;
 			smd->domain->point_cache[0]->last_exact= 0;
 
-			smd->domain->point_cache[1]->flag &= ~PTCACHE_SIMULATION_VALID;
-			smd->domain->point_cache[1]->flag |= PTCACHE_OUTDATED;
-			smd->domain->point_cache[1]->simframe= 0;
-			smd->domain->point_cache[1]->last_exact= 0;
+			smokeModifier_reset_turbulence(smd);
 
-			// printf("reset_domain\n");
+			smd->time = -1;
+
+			// printf("reset domain end\n");
 		}
 		else if(smd->flow)
 		{
@@ -685,22 +694,21 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 
 			/* set some standard values */
 			smd->domain->fluid = NULL;
+			smd->domain->wt = NULL;			
 			smd->domain->eff_group = NULL;
 			smd->domain->fluid_group = NULL;
 			smd->domain->coll_group = NULL;
 			smd->domain->maxres = 32;
+			smd->domain->amplify = 1;			
+			smd->domain->omega = 1.0;			
 			smd->domain->alpha = -0.001;
 			smd->domain->beta = 0.1;
 			smd->domain->flags = MOD_SMOKE_DISSOLVE_LOG;
-			smd->domain->diss_speed = 5;
-			smd->domain->strength = 2.0f;
-			smd->domain->amplify = 1;
+			smd->domain->strength = 2.0;
 			smd->domain->noise = MOD_SMOKE_NOISEWAVE;
-			smd->domain->wt = NULL;
-
+			smd->domain->diss_speed = 5;
 			// init 3dview buffer
-			smd->domain->view3d = NULL;
-			smd->domain->tex = NULL;
+			smd->domain->viewsettings = 0;
 		}
 		else if(smd->type & MOD_SMOKE_TYPE_FLOW)
 		{
@@ -734,9 +742,314 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 	}
 }
 
-// forward declaration
-void smoke_simulate_domain(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm);
+// forward decleration
+void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct);
+static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
+static int get_lamp(Scene *scene, float *light)
+{	
+	Base *base_tmp = NULL;	
+	for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 	
+	{		
+		if(base_tmp->object->type == OB_LAMP) 		
+		{			
+			Lamp *la = (Lamp *)base_tmp->object->data;	
 
+			if(la->type == LA_LOCAL)			
+			{				
+				VECCOPY(light, base_tmp->object->obmat[3]);				
+				return 1;			
+			}		
+		}	
+	}	
+	return 0;
+}
+
+static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd)
+{
+	SmokeDomainSettings *sds = smd->domain;
+	GroupObject *go = NULL;			
+	Base *base = NULL;	
+
+	// do flows and fluids
+	if(1)			
+	{				
+		Object *otherobj = NULL;				
+		ModifierData *md = NULL;
+		if(sds->fluid_group) // we use groups since we have 2 domains
+			go = sds->fluid_group->gobject.first;				
+		else					
+			base = scene->base.first;
+		while(base || go)
+		{					
+			otherobj = NULL;
+			if(sds->fluid_group) 
+			{
+				if(go->ob)							
+					otherobj = go->ob;					
+			}					
+			else						
+				otherobj = base->object;
+			if(!otherobj)
+			{
+				if(sds->fluid_group)
+					go = go->next;
+				else
+					base= base->next;
+
+				continue;
+			}
+
+			md = modifiers_findByType(otherobj, eModifierType_Smoke);
+			
+			// check for active smoke modifier
+			if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
+			{
+				SmokeModifierData *smd2 = (SmokeModifierData *)md;
+				
+				// check for initialized smoke object
+				if((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow)						
+				{
+					// we got nice flow object
+					SmokeFlowSettings *sfs = smd2->flow;
+					
+					if(sfs->psys && sfs->psys->part && sfs->psys->part->type==PART_EMITTER) // is particle system selected
+					{
+						ParticleSystem *psys = sfs->psys;
+						ParticleSettings *part=psys->part;
+						ParticleData *pa = NULL;								
+						int p = 0;								
+						float *density = smoke_get_density(sds->fluid);								
+						float *bigdensity = smoke_turbulence_get_density(sds->wt);								
+						float *heat = smoke_get_heat(sds->fluid);								
+						float *velocity_x = smoke_get_velocity_x(sds->fluid);								
+						float *velocity_y = smoke_get_velocity_y(sds->fluid);								
+						float *velocity_z = smoke_get_velocity_z(sds->fluid);								
+						unsigned char *obstacle = smoke_get_obstacle(sds->fluid);								
+						int bigres[3];	
+														
+						// mostly copied from particle code								
+						for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++)								
+						{									
+							int cell[3];									
+							size_t i = 0;									
+							size_t index = 0;									
+							int badcell = 0;																		
+							if(pa->alive == PARS_KILLED) continue;									
+							else if(pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN)==0) continue;									
+							else if(pa->alive == PARS_DEAD && (part->flag & PART_DIED)==0) continue;									
+							else if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;																		
+							// VECCOPY(pos, pa->state.co);									
+							// Mat4MulVecfl (ob->imat, pos);																		
+							// 1. get corresponding cell									
+							get_cell(smd->domain->p0, smd->domain->res, smd->domain->dx, pa->state.co, cell, 0);																	
+							// check if cell is valid (in the domain boundary)									
+							for(i = 0; i < 3; i++)									
+							{										
+								if((cell[i] > sds->res[i] - 1) || (cell[i] < 0))										
+								{											
+									badcell = 1;											
+									break;										
+								}									
+							}																			
+							if(badcell)										
+								continue;																		
+							// 2. set cell values (heat, density and velocity)									
+							index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);																		
+							if(!(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) && !(obstacle[index] & 2)) // this is inflow									
+							{										
+								// heat[index] += sfs->temp * 0.1;										
+								// density[index] += sfs->density * 0.1;
+								heat[index] = sfs->temp;
+								density[index] = sfs->density;
+
+								/*
+								velocity_x[index] = pa->state.vel[0];
+								velocity_y[index] = pa->state.vel[1];
+								velocity_z[index] = pa->state.vel[2];										
+								*/										
+								
+								// obstacle[index] |= 2;
+								// we need different handling for the high-res feature
+								if(bigdensity)
+								{
+									// init all surrounding cells according to amplification, too
+									int i, j, k;
+
+									smoke_turbulence_get_res(smd->domain->wt, bigres);
+
+									for(i = 0; i < smd->domain->amplify + 1; i++)
+										for(j = 0; j < smd->domain->amplify + 1; j++)
+											for(k = 0; k < smd->domain->amplify + 1; k++)													
+											{														
+												index = smoke_get_index((smd->domain->amplify + 1)* cell[0] + i, bigres[0], (smd->domain->amplify + 1)* cell[1] + j, bigres[1], (smd->domain->amplify + 1)* cell[2] + k);														
+												bigdensity[index] = sfs->density;													
+											}										
+								}									
+							}									
+							else if(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) // outflow									
+							{										
+								heat[index] = 0.f;										
+								density[index] = 0.f;										
+								velocity_x[index] = 0.f;										
+								velocity_y[index] = 0.f;										
+								velocity_z[index] = 0.f;
+								// we need different handling for the high-res feature
+								if(bigdensity)
+								{
+									// init all surrounding cells according to amplification, too											
+									int i, j, k;
+									smoke_turbulence_get_res(smd->domain->wt, bigres);
+
+									for(i = 0; i < smd->domain->amplify + 1; i++)
+										for(j = 0; j < smd->domain->amplify + 1; j++)
+											for(k = 0; k < smd->domain->amplify + 1; k++)
+											{														
+												index = smoke_get_index((smd->domain->amplify + 1)* cell[0] + i, bigres[0], (smd->domain->amplify + 1)* cell[1] + j, bigres[1], (smd->domain->amplify + 1)* cell[2] + k);														
+												bigdensity[index] = 0.f;													
+											}										
+								}									
+							}	// particles loop							
+					}							
+				}							
+				else							
+				{								
+					/*								
+					for()								
+					{									
+						// no psys									
+						BVHTreeNearest nearest;
+						nearest.index = -1;
+						nearest.dist = FLT_MAX;
+
+						BLI_bvhtree_find_nearest(sfs->bvh->tree, pco, &nearest, sfs->bvh->nearest_callback, sfs->bvh);
+					}*/							
+				}						
+			}						
+		}
+			if(sds->fluid_group)
+				go = go->next;
+			else
+				base= base->next;
+		}
+	}
+
+	// do effectors
+	/*
+	if(sds->eff_group)
+	{
+		for(go = sds->eff_group->gobject.first; go; go = go->next) 
+		{
+			if(go->ob)
+			{
+				if(ob->pd)
+				{
+					
+				}					
+			}
+		}
+	}
+	*/
+
+	// do collisions	
+	if(1)
+	{
+		Object *otherobj = NULL;
+		ModifierData *md = NULL;
+
+		if(sds->coll_group) // we use groups since we have 2 domains
+			go = sds->coll_group->gobject.first;
+		else
+			base = scene->base.first;
+
+		while(base || go)
+		{
+			otherobj = NULL;
+			if(sds->coll_group) 
+			{						
+				if(go->ob)							
+					otherobj = go->ob;					
+			}					
+			else						
+				otherobj = base->object;					
+			if(!otherobj)					
+			{						
+				if(sds->coll_group)							
+					go = go->next;						
+				else							
+					base= base->next;						
+				continue;					
+			}			
+			md = modifiers_findByType(otherobj, eModifierType_Smoke);
+			
+			// check for active smoke modifier
+			if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))					
+			{
+				SmokeModifierData *smd2 = (SmokeModifierData *)md;
+
+				if((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll)
+				{
+					// we got nice collision object
+					SmokeCollSettings *scs = smd2->coll;
+					size_t i, j;
+					unsigned char *obstacles = smoke_get_obstacle(smd->domain->fluid);
+
+					for(i = 0; i < scs->numpoints; i++)
+					{
+						int badcell = 0;
+						size_t index = 0;
+						int cell[3];
+
+						// 1. get corresponding cell
+						get_cell(smd->domain->p0, smd->domain->res, smd->domain->dx, &scs->points[3 * i], cell, 0);
+					
+						// check if cell is valid (in the domain boundary)
+						for(j = 0; j < 3; j++)
+							if((cell[j] > sds->res[j] - 1) || (cell[j] < 0))
+							{
+								badcell = 1;
+								break;
+							}
+																
+							if(badcell)									
+								continue;
+						// 2. set cell values (heat, density and velocity)
+						index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
+														
+						// printf("cell[0]: %d, cell[1]: %d, cell[2]: %d\n", cell[0], cell[1], cell[2]);								
+						// printf("res[0]: %d, res[1]: %d, res[2]: %d, index: %d\n\n", sds->res[0], sds->res[1], sds->res[2], index);																	
+						obstacles[index] = 1;
+						// for moving gobstacles								
+						/*
+						const LbmFloat maxVelVal = 0.1666;
+						const LbmFloat maxusqr = maxVelVal*maxVelVal*3. *1.5;
+
+						LbmVec objvel = vec2L((mMOIVertices[n]-mMOIVerticesOld[n]) /dvec); 
+						{ 								
+						const LbmFloat usqr = (objvel[0]*objvel[0]+objvel[1]*objvel[1]+objvel[2]*objvel[2])*1.5; 								
+						USQRMAXCHECK(usqr, objvel[0],objvel[1],objvel[2], mMaxVlen, mMxvx,mMxvy,mMxvz); 								
+						if(usqr>maxusqr) { 									
+						// cutoff at maxVelVal 									
+						for(int jj=0; jj<3; jj++) { 										
+						if(objvel[jj]>0.) objvel[jj] =  maxVelVal;  										
+						if(objvel[jj]<0.) objvel[jj] = -maxVelVal; 									
+						} 								
+						} 
+						} 								
+						const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); 								
+						const LbmVec oldov=objvel; // debug								
+						objvel = vec2L((*pNormals)[n]) *dp;								
+						*/
+					}
+				}
+			}
+
+			if(sds->coll_group)
+				go = go->next;
+			else
+				base= base->next;
+		}
+	}
+}
 void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm, int useRenderParams, int isFinalCalc)
 {	
 	if((smd->type & MOD_SMOKE_TYPE_FLOW))
@@ -788,16 +1101,15 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 	}
 	else if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 	{
-		PointCache *cache;
+		PointCache *cache = NULL;
 		PTCacheID pid;
+		PointCache *cache_wt = NULL;
+		PTCacheID pid_wt;
 		float timescale;
-		int cache_result = 0;
-		int startframe, endframe, framenr;
+		int cache_result = 0, cache_result_wt = 0;
+		int startframe, endframe, framenr, badloading = 0;
 		SmokeDomainSettings *sds = smd->domain;
-		float light[3] = {0.0,0.0,0.0};
-		int have_lamp = 0;
-
-		// printf("smd->type & MOD_SMOKE_TYPE_DOMAIN\n");
+		float light[3];	
 
 		framenr = scene->r.cfra;
 
@@ -806,51 +1118,26 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		BKE_ptcache_id_from_smoke(&pid, ob, smd);
 		BKE_ptcache_id_time(&pid, scene, framenr, &startframe, &endframe, &timescale);
 
+		cache_wt = sds->point_cache[1];
+		BKE_ptcache_id_from_smoke_turbulence(&pid_wt, ob, smd);
+
 		/* handle continuous simulation with the play button */
 		if(BKE_ptcache_get_continue_physics()) 
 		{
-			cache->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache->simframe= 0;
-			cache->last_exact= 0;
-
-			if(!smokeModifier_init(smd, ob, scene, dm))
-				return;
-
-			if(!smd->domain->fluid)
-				return;
-
-			smoke_simulate_domain(smd, scene, ob, dm);
-
-			{
-				Base *base_tmp = NULL;
-
-				for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
-				{
-					if(base_tmp->object->type == OB_LAMP) 
-					{
-						Lamp *la = (Lamp *)base_tmp->object->data;
-						
-						if(la->type == LA_LOCAL)
-						{
-							VECCOPY(light, base_tmp->object->obmat[3]);
-							have_lamp = 1;
-							break;
-						}
-					}
-				}
-			}
-
-			smoke_prepare_View(smd, (float)framenr, light, have_lamp);
-
+			// TODO
 			return;
 		}
-		
+
 		if(framenr < startframe)
 		{
 			cache->flag &= ~PTCACHE_SIMULATION_VALID;
 			cache->simframe= 0;
 			cache->last_exact= 0;
 
+			cache_wt->flag &= ~PTCACHE_SIMULATION_VALID;
+			cache_wt->simframe= 0;
+			cache_wt->last_exact= 0;
+
 			// we got back in time, reset smoke in this case (TODO: use cache later)
 			// smd->time = scene->r.cfra;
 			// smokeModifier_reset(smd);
@@ -860,14 +1147,25 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		else if(framenr > endframe) 
 		{
 			framenr = endframe;
+
+			// we load last valid frame here 
+			// and don't update the smd->time variable later
+			badloading = 1;
 		}
 
 		if(!(cache->flag & PTCACHE_SIMULATION_VALID))
 		{
-			// printf("reseting\n");
 			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
 		}
-	
+		if(!(cache_wt->flag & PTCACHE_SIMULATION_VALID))
+		{
+			BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_OUTDATED);
+		}
+
+		if(smd->time == -1 && framenr!= startframe)
+			return;
+		
+
 		if(!smokeModifier_init(smd, ob, scene, dm))
 			return;
 
@@ -875,7 +1173,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 				return;
 
 		/* try to read from cache */
-		cache_result = BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
+		cache_result =  BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
 		// printf("cache_result: %d\n", cache_result);
 
 		if(cache_result == PTCACHE_READ_EXACT) 
@@ -886,419 +1184,150 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 			cache->simframe= framenr;
 			sds->v3dnum = framenr;
 
+			if(!badloading)
+				smd->time = scene->r.cfra;
+
+			// check for wt cache
+			if(sds->wt)
+			{
+				cache_result_wt = BKE_ptcache_read_cache(&pid_wt, (float)framenr, scene->r.frs_sec);
+				// printf("cache_result_wt: %d\n", cache_result_wt);
+
+				// error handling
+				if(cache_result_wt == PTCACHE_READ_EXACT) 
+				{
+					cache_wt->flag |= PTCACHE_SIMULATION_VALID;
+					cache_wt->simframe= framenr;
+				}
+				else if(cache_result_wt==PTCACHE_READ_OLD) 
+				{
+					BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_FREE);
+					cache_wt->flag |= PTCACHE_SIMULATION_VALID;
+				}
+				else if(ob->id.lib || (cache_wt->flag & PTCACHE_BAKED)) 
+				{
+					// if baked and nothing in cache, do nothing 
+					cache_wt->flag &= ~PTCACHE_SIMULATION_VALID;
+					cache_wt->simframe= 0;
+					cache_wt->last_exact= 0;
+				}
+			}
+
 			// printf("PTCACHE_READ_EXACT\n");
 			return;
 		}
 		else if(cache_result==PTCACHE_READ_OLD) 
 		{
 			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_FREE);
-
-			// printf("PTCACHE_READ_OLD\n");
-
 			cache->flag |= PTCACHE_SIMULATION_VALID;
+
+			BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_FREE);
+			cache_wt->flag |= PTCACHE_SIMULATION_VALID;
 		}
 		else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) 
 		{
-			/* if baked and nothing in cache, do nothing */
+			// if baked and nothing in cache, do nothing 
 			cache->flag &= ~PTCACHE_SIMULATION_VALID;
 			cache->simframe= 0;
 			cache->last_exact= 0;
 
+			cache_wt->flag &= ~PTCACHE_SIMULATION_VALID;
+			cache_wt->simframe= 0;
+			cache_wt->last_exact= 0;
+		
 			// printf("PTCACHE_BAKED\n");
 			return;
 		}
-		else if((cache_result==0) && (startframe!=framenr) && !(cache->flag & PTCACHE_SIMULATION_VALID))
+		/*
+		else if((cache_result==0) && ((startframe!=framenr) && !(cache->flag & PTCACHE_SIMULATION_VALID || (framenr == smd->time))))
 		{
 			cache->flag &= ~PTCACHE_SIMULATION_VALID;
 			cache->simframe= 0;
 			cache->last_exact= 0;
 
 			return;
-		}
-		
+		}*/
+
+		// printf("framenr: %d, time: %f\n", framenr, smd->time);
+
 		/* do simulation */
 
 		// low res
 		cache->flag |= PTCACHE_SIMULATION_VALID;
 		cache->simframe= framenr;
 
-		smoke_simulate_domain(smd, scene, ob, dm);
-
 		if(sds->wt)
-			smoke_turbulence_step(sds->wt, sds->fluid);
-
 		{
-			Base *base_tmp = NULL;
+			cache_wt->flag |= PTCACHE_SIMULATION_VALID;
+			cache_wt->simframe= framenr;
+		}
+				
+		tstart();	
 
-			for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
-			{
-				if(base_tmp->object->type == OB_LAMP) 
-				{
-					Lamp *la = (Lamp *)base_tmp->object->data;
-					
-					if(la->type == LA_LOCAL)
-					{
-						VECCOPY(light, base_tmp->object->obmat[3]);
-						have_lamp = 1;
-						break;
-					}
-				}
-			}
+		if(sds->flags & MOD_SMOKE_DISSOLVE)			
+		{				
+			smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);								
 		}
 
-		smoke_prepare_View(smd, (float)framenr, light, have_lamp);
+		smoke_calc_domain(scene, ob, smd);
+		
+		// set new time
+		smd->time = scene->r.cfra;
 
+		// frame 1 is start, don't simulate anything
+		if(smd->time == 1)
+		{
+			// set new time
+			smd->time = scene->r.cfra;
+
+			BKE_ptcache_write_cache(&pid, framenr);
+			if(sds->wt)
+				BKE_ptcache_write_cache(&pid_wt, framenr);
+
+			if(get_lamp(scene, light))
+				smoke_calc_transparency(sds->shadow, smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp, -7.0*sds->dx);
+
+			return;
+		}
+
+		// simulate the actual smoke (c++ code in intern/smoke)
+		smoke_step(sds->fluid, smd->time);
 		BKE_ptcache_write_cache(&pid, framenr);
 
-		// printf("Writing cache_low, %d\n", framenr);
-	
+		if(sds->wt)
+		{
+
+			if(sds->flags & MOD_SMOKE_DISSOLVE)							
+				smoke_dissolve_wavelet(sds->wt, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
+
+			smoke_turbulence_step(sds->wt, sds->fluid);
+			BKE_ptcache_write_cache(&pid_wt, framenr);
+		}
+
+		if(get_lamp(scene, light))
+			smoke_calc_transparency(sds->shadow, smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp, -7.0*sds->dx);
 
 		tend();
 		// printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
 	}
 }
 
-void smoke_simulate_domain(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm)
-{
-	GroupObject *go = NULL;
-	Base *base = NULL;
-	SmokeDomainSettings *sds = smd->domain;
-	
-	tstart();
-	
-	if(sds->flags & MOD_SMOKE_DISSOLVE)
-		smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
-
-	// do flows and fluids
-	if(1)
-	{
-		Object *otherobj = NULL;
-		ModifierData *md = NULL;
-
-		if(sds->fluid_group) // we use groups since we have 2 domains
-			go = sds->fluid_group->gobject.first;
-		else
-			base = scene->base.first;
-
-		while(base || go)
-		{
-			otherobj = NULL;
-
-			if(sds->fluid_group) 
-			{
-				if(go->ob)
-					otherobj = go->ob;
-			}
-			else
-				otherobj = base->object;
-
-			if(!otherobj)
-			{
-				if(sds->fluid_group)
-					go = go->next;
-				else
-					base= base->next;
-
-				continue;
-			}
-
-			md = modifiers_findByType(otherobj, eModifierType_Smoke);
-			
-			// check for active smoke modifier
-			if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
-			{
-				SmokeModifierData *smd2 = (SmokeModifierData *)md;
-				
-				// check for initialized smoke object
-				if((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow)
-				{
-					// we got nice flow object
-					SmokeFlowSettings *sfs = smd2->flow;
-					
-					if(sfs->psys && sfs->psys->part && sfs->psys->part->type==PART_EMITTER) // is particle system selected
-					{
-						ParticleSystem *psys = sfs->psys;
-						ParticleSettings *part=psys->part;
-						ParticleData *pa = NULL;
-						int p = 0;
-						float *density = smoke_get_density(sds->fluid);
-						// float *bigdensity = smoke_turbulence_get_density(sds->wt);
-						float *heat = smoke_get_heat(sds->fluid);
-						float *velocity_x = smoke_get_velocity_x(sds->fluid);
-						float *velocity_y = smoke_get_velocity_y(sds->fluid);
-						float *velocity_z = smoke_get_velocity_z(sds->fluid);
-						unsigned char *obstacle = smoke_get_obstacle(sds->fluid);
-
-						// debug printf("found flow psys\n");
-						
-						// mostly copied from particle code
-						for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++)
-						{
-							int cell[3];
-							size_t i = 0;
-							size_t index = 0;
-							int badcell = 0;
-							
-							if(pa->alive == PARS_KILLED) continue;
-							else if(pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN)==0) continue;
-							else if(pa->alive == PARS_DEAD && (part->flag & PART_DIED)==0) continue;
-							else if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;
-							
-							// VECCOPY(pos, pa->state.co);
-							// Mat4MulVecfl (ob->imat, pos);
-							
-							// 1. get corresponding cell
-							get_cell(sds->p0, sds->res, sds->dx, pa->state.co, cell, 0);
-						
-							// check if cell is valid (in the domain boundary)
-							for(i = 0; i < 3; i++)
-							{
-								if((cell[i] > sds->res[i] - 1) || (cell[i] < 0))
-								{
-									badcell = 1;
-									break;
-								}
-							}
-								
-							if(badcell)
-								continue;
-							
-							// 2. set cell values (heat, density and velocity)
-							index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
-							
-							if(!(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) && !(obstacle[index] & 2)) // this is inflow
-							{
-								// heat[index] += sfs->temp * 0.1;
-								// density[index] += sfs->density * 0.1;
-
-								heat[index] = sfs->temp;
-								density[index] = sfs->density;
-
-								/*
-								velocity_x[index] = pa->state.vel[0];
-								velocity_y[index] = pa->state.vel[1];
-								velocity_z[index] = pa->state.vel[2];
-								*/
-								obstacle[index] |= 2;
-							}
-							else if(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) // outflow
-							{
-								heat[index] = 0.f;
-								density[index] = 0.f;
-								velocity_x[index] = 0.f;
-								velocity_y[index] = 0.f;
-								velocity_z[index] = 0.f;
-							}
-						}
-					}
-					else
-					{
-						/*
-						for()
-						{
-							// no psys
-							BVHTreeNearest nearest;
-
-							nearest.index = -1;
-							nearest.dist = FLT_MAX;
-
-							BLI_bvhtree_find_nearest(sfs->bvh->tree, pco, &nearest, sfs->bvh->nearest_callback, sfs->bvh);
-						}*/
-					}
-				}	
-			}
-
-			if(sds->fluid_group)
-				go = go->next;
-			else
-				base= base->next;
-		}
-	}
-
-	// do effectors
-	/*
-	if(sds->eff_group)
-	{
-		for(go = sds->eff_group->gobject.first; go; go = go->next) 
-		{
-			if(go->ob)
-			{
-				if(ob->pd)
-				{
-					
-				}
-			}
-		}
-	}
-	*/
-
-	// do collisions	
-	if(1)
-	{
-		Object *otherobj = NULL;
-		ModifierData *md = NULL;
-
-		if(sds->coll_group) // we use groups since we have 2 domains
-			go = sds->coll_group->gobject.first;
-		else
-			base = scene->base.first;
-
-		while(base || go)
-		{
-			otherobj = NULL;
-
-			if(sds->coll_group) 
-			{
-				if(go->ob)
-					otherobj = go->ob;
-			}
-			else
-				otherobj = base->object;
-
-			if(!otherobj)
-			{
-				if(sds->coll_group)
-					go = go->next;
-				else
-					base= base->next;
-
-				continue;
-			}
-	
-			md = modifiers_findByType(otherobj, eModifierType_Smoke);
-			
-			// check for active smoke modifier
-			if(md && md->mode & (eModifierMode_Realtime | eModifierMode_Render))
-			{
-				SmokeModifierData *smd2 = (SmokeModifierData *)md;
-
-				if((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll)
-				{
-					// we got nice collision object
-					SmokeCollSettings *scs = smd2->coll;
-					size_t i, j;
-					unsigned char *obstacles = smoke_get_obstacle(smd->domain->fluid);
-
-					for(i = 0; i < scs->numpoints; i++)
-					{
-						int badcell = 0;
-						size_t index = 0;
-						int cell[3];
-
-						// 1. get corresponding cell
-						get_cell(sds->p0, sds->res, sds->dx, &scs->points[3 * i], cell, 0);
-					
-						// check if cell is valid (in the domain boundary)
-						for(j = 0; j < 3; j++)
-							if((cell[j] > sds->res[j] - 1) || (cell[j] < 0))
-							{
-								badcell = 1;
-								break;
-							}
-								
-						if(badcell)
-							continue;
-
-						// 2. set cell values (heat, density and velocity)
-						index = smoke_get_index(cell[0], sds->res[0], cell[1], sds->res[1], cell[2]);
-						
-						// printf("cell[0]: %d, cell[1]: %d, cell[2]: %d\n", cell[0], cell[1], cell[2]);
-						// printf("res[0]: %d, res[1]: %d, res[2]: %d, index: %d\n\n", sds->res[0], sds->res[1], sds->res[2], index);
-							
-						obstacles[index] = 1;
-
-						// for moving gobstacles
-						/*
-						const LbmFloat maxVelVal = 0.1666;
-						const LbmFloat maxusqr = maxVelVal*maxVelVal*3. *1.5;
-
-						LbmVec objvel = vec2L((mMOIVertices[n]-mMOIVerticesOld[n]) /dvec); { 
-						const LbmFloat usqr = (objvel[0]*objvel[0]+objvel[1]*objvel[1]+objvel[2]*objvel[2])*1.5; 
-						USQRMAXCHECK(usqr, objvel[0],objvel[1],objvel[2], mMaxVlen, mMxvx,mMxvy,mMxvz); 
-						if(usqr>maxusqr) { 
-							// cutoff at maxVelVal 
-							for(int jj=0; jj<3; jj++) { 
-								if(objvel[jj]>0.) objvel[jj] =  maxVelVal;  
-								if(objvel[jj]<0.) objvel[jj] = -maxVelVal; 
-							} 
-						} } 
-
-						const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); 
-						const LbmVec oldov=objvel; // debug
-						objvel = vec2L((*pNormals)[n]) *dp;
-						*/
-					}
-				}
-			}
-
-			if(sds->coll_group)
-				go = go->next;
-			else
-				base= base->next;
-		}
-	}
-	
-	// set new time
-	smd->time = scene->r.cfra;
-
-	// simulate the actual smoke (c++ code in intern/smoke)
-	smoke_step(sds->fluid, smd->time);
-}
-
-static int calc_voxel_transp(float *input, int res[3], int *pixel, float *tRay)
+static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct)
 {
 	const size_t index = smoke_get_index(pixel[0], res[0], pixel[1], res[1], pixel[2]);
 
 	// T_ray *= T_vox
-	*tRay *= input[index*4];
+	*tRay *= exp(input[index]*correct);
+	
+	if(result[index] < 0.0f)	
+	{
+#pragma omp critical		
+		result[index] = *tRay;	
+	}	
 
 	return *tRay;
 }
 
-// forward decleration
-void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb);
-
-// update necessary information for 3dview
-void smoke_prepare_View(SmokeModifierData *smd, float framenr, float *light, int have_light)
-{
-	float *density = NULL;
-	int x, y, z;
-	size_t cells, i;
-	SmokeDomainSettings *sds = smd->domain;
-
-	// update 3dview
-	density = smoke_get_density(smd->domain->fluid);
-	for(x = 0; x < smd->domain->res[0]; x++)
-		for(y = 0; y < smd->domain->res[1]; y++)
-			for(z = 0; z < smd->domain->res[2]; z++)
-			{
-				size_t index;
-
-				index = smoke_get_index(x, smd->domain->res[0], y, smd->domain->res[1], z);
-				// Transparency computation
-				// formula taken from "Visual Simulation of Smoke" / Fedkiw et al. pg. 4
-				// T_vox = exp(-C_ext * h)
-				// C_ext/sigma_t = density * C_ext
-				smd->domain->view3d[index * 4] = smd->domain->view3d[index * 4 + 1] = 
-				smd->domain->view3d[index * 4 + 2] = exp(-density[index] * 7.0 * smd->domain->dx);
-				smd->domain->view3d[index * 4 + 3] = 1.0 - smd->domain->view3d[index * 4];
-				
-			}
-
-	if(have_light)
-	{
-		smoke_calc_transparency(sds->view3d, sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp);
-
-		cells = smd->domain->res[0]*smd->domain->res[1]*smd->domain->res[2];
-		for(i = 0; i < cells; i++)
-		{
-			smd->domain->view3d[i * 4] = smd->domain->view3d[i * 4 + 1] = 
-			smd->domain->view3d[i * 4 + 2] = smd->domain->view3d[i * 4 + 1] * smd->domain->view3d[i * 4 + 0];
-		}
-	}
-	smd->domain->v3dnum = framenr;
-}
-
 long long smoke_get_mem_req(int xres, int yres, int zres, int amplify)
 {
 	  int totalCells = xres * yres * zres;
@@ -1317,7 +1346,7 @@ long long smoke_get_mem_req(int xres, int yres, int zres, int amplify)
 	  return totalMB;
 }
 
-static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, float *tRay, bresenham_callback cb, float *input, int res[3])
+static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, float *tRay, bresenham_callback cb, float *result, float *input, int res[3], float correct)
 {
     int dx, dy, dz, i, l, m, n, x_inc, y_inc, z_inc, err_1, err_2, dx2, dy2, dz2;
     int pixel[3];
@@ -1344,8 +1373,8 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f
         err_1 = dy2 - l;
         err_2 = dz2 - l;
         for (i = 0; i < l; i++) {
-        	if(cb(input, res, pixel, tRay) < 0.0)
-        		return;
+        	if(cb(result, input, res, pixel, tRay, correct) <= FLT_EPSILON)
+        		break;
             if (err_1 > 0) {
                 pixel[1] += y_inc;
                 err_1 -= dx2;
@@ -1362,8 +1391,8 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f
         err_1 = dx2 - m;
         err_2 = dz2 - m;
         for (i = 0; i < m; i++) {
-        	if(cb(input, res, pixel, tRay) < 0.0f)
-        		return;
+        	if(cb(result, input, res, pixel, tRay, correct) <= FLT_EPSILON)
+        		break;
             if (err_1 > 0) {
                 pixel[0] += x_inc;
                 err_1 -= dy2;
@@ -1380,8 +1409,8 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f
         err_1 = dy2 - n;
         err_2 = dx2 - n;
         for (i = 0; i < n; i++) {
-        	if(cb(input, res, pixel, tRay) < 0.0f)
-        		return;
+        	if(cb(result, input, res, pixel, tRay, correct) <= FLT_EPSILON)
+        		break;
             if (err_1 > 0) {
                 pixel[1] += y_inc;
                 err_1 -= dz2;
@@ -1395,7 +1424,7 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f
             pixel[2] += z_inc;
         }
     }
-    cb(input, res, pixel, tRay);
+    cb(result, input, res, pixel, tRay, correct);
 }
 
 static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct)
@@ -1419,12 +1448,12 @@ static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int
 	}
 }
 
-void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb)
+void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct)
 {
 	int x, y, z;
 	float bv[6];
 
-	// x
+	memset(result, -1, sizeof(float)*res[0]*res[1]*res[2]);	// x
 	bv[0] = p0[0];
 	bv[1] = p1[0];
 	// y
@@ -1434,7 +1463,7 @@ void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], fl
 	bv[4] = p0[2];
 	bv[5] = p1[2];
 
-// #pragma omp parallel for schedule(static) private(y, z)
+#pragma omp parallel for schedule(static) private(y, z)
 	for(x = 0; x < res[0]; x++)
 		for(y = 0; y < res[1]; y++)
 			for(z = 0; z < res[2]; z++)
@@ -1447,6 +1476,8 @@ void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], fl
 
 				index = smoke_get_index(x, res[0], y, res[1], z);
 
+				if(result[index] >= 0.0f)					
+					continue;								
 				voxelCenter[0] = p0[0] + dx *  x + dx * 0.5;
 				voxelCenter[1] = p0[1] + dx *  y + dx * 0.5;
 				voxelCenter[2] = p0[2] + dx *  z + dx * 0.5;
@@ -1463,10 +1494,11 @@ void smoke_calc_transparency(float *result, float *p0, float *p1, int res[3], fl
 					get_cell(p0, res, dx, light, cell, 1);
 				}
 
-				bresenham_linie_3D(cell[0], cell[1], cell[2], x, y, z, &tRay, cb, result, res);
+				bresenham_linie_3D(cell[0], cell[1], cell[2], x, y, z, &tRay, cb, result, input, res, correct);
 
 				// convention -> from a RGBA float array, use G value for tRay
-				result[index*4 + 1] = tRay;
+// #pragma omp critical
+				result[index] = tRay;			
 			}
 }
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 618e587d674..b6fc9f7af12 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3685,8 +3685,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 				smd->domain->smd = smd;
 
 				smd->domain->fluid = NULL;
-				smd->domain->view3d = NULL;
-				smd->domain->tex = NULL;
+				// smd->domain->view3d = NULL;
+				// smd->domain->tex = NULL;
 
 				direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]));
 				direct_link_pointcache_list(fd, &(smd->domain->ptcaches[1]), &(smd->domain->point_cache[1]));
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 20cab3b8aeb..7ed029f3eaf 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5310,13 +5310,60 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* draw code for smoke */
+	if((md = modifiers_findByType(ob, eModifierType_Smoke)))
 	{
-		md = modifiers_findByType(ob, eModifierType_Smoke);
-		if (md) {
-			SmokeModifierData *smd = (SmokeModifierData *)md;
-			if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && smd->domain->fluid) {
-				GPU_create_smoke(smd);
-				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res);
+		SmokeModifierData *smd = (SmokeModifierData *)md;
+
+		// draw collision objects
+		if((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll)
+		{
+			/*SmokeCollSettings *scs = smd->coll;
+			if(scs->points)
+			{
+				size_t i;
+
+				wmLoadMatrix(rv3d->viewmat);
+
+				if(col || (ob->flag & SELECT)) cpack(0xFFFFFF);	
+				glDepthMask(GL_FALSE);
+				glEnable(GL_BLEND);
+				
+
+				// glPointSize(3.0);
+				bglBegin(GL_POINTS);
+
+				for(i = 0; i < scs->numpoints; i++)
+				{
+					bglVertex3fv(&scs->points[3*i]);
+				}
+
+				bglEnd();
+				glPointSize(1.0);
+
+				wmMultMatrix(ob->obmat);
+				glDisable(GL_BLEND);
+				glDepthMask(GL_TRUE);
+				if(col) cpack(col);
+				
+			}
+			*/
+		}
+
+		// only draw domains
+		if(smd->domain && smd->domain->fluid)
+		{
+			if(!smd->domain->wt || !(smd->domain->viewsettings & MOD_SMOKE_VIEW_SHOWBIG))
+			{
+				smd->domain->tex = NULL;
+				GPU_create_smoke(smd, 0);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res, smd->domain->dx, smd->domain->tex_shadow);
+				GPU_free_smoke(smd);
+			}
+			else if(smd->domain->wt || (smd->domain->viewsettings & MOD_SMOKE_VIEW_SHOWBIG))
+			{
+				smd->domain->tex = NULL;
+				GPU_create_smoke(smd, 1);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res_wt, smd->domain->dx_wt, smd->domain->tex_shadow);
 				GPU_free_smoke(smd);
 			}
 		}
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 342acfe92b3..c8eda10566c 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -191,7 +191,7 @@ static int larger_pow2(int n)
 	return n*2;
 }
 
-void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, int res[3])
+void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, int res[3], float dx, GPUTexture *tex_shadow)
 {
 	Object *ob = base->object;
 	RegionView3D *rv3d= ar->regiondata;
@@ -204,6 +204,27 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 	float cor[3] = {1.,1.,1.};
 	int gl_depth = 0, gl_blend = 0;
 
+	/* Fragment program to calculate the 3dview of smoke */
+	/* using 2 textures, density and shadow */
+	const char *text = "!!ARBfp1.0\n"
+					"PARAM dx = program.local[0];\n"
+					"PARAM darkness = program.local[1];\n"
+					"PARAM f = {1.442695041, 1.442695041, 1.442695041, 0.01};\n"
+					"TEMP temp, shadow, value;\n"
+					"TEX temp, fragment.texcoord[0], texture[0], 3D;\n"
+					"TEX shadow, fragment.texcoord[0], texture[1], 3D;\n"
+					"MUL value, temp, darkness;\n"
+					"MUL value, value, dx;\n"
+					"MUL value, value, f;\n"
+					"EX2 temp, -value.r;\n"
+					"SUB temp.a, 1.0, temp.r;\n"
+					"MUL temp.r, temp.r, shadow.r;\n"
+					"MUL temp.g, temp.g, shadow.r;\n"
+					"MUL temp.b, temp.b, shadow.r;\n"
+					"MOV result.color, temp;\n"
+					"END\n";
+	unsigned int prog;
+
 	glGetBooleanv(GL_BLEND, (GLboolean *)&gl_blend);
 	glGetBooleanv(GL_DEPTH_TEST, (GLboolean *)&gl_depth);
 
@@ -234,7 +255,23 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		}
 	}
 
+	if(GLEW_ARB_fragment_program)
+	{
+		glGenProgramsARB(1, &prog);
+		glEnable(GL_FRAGMENT_PROGRAM_ARB);
+
+		glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, prog);
+		glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(text), text);
+
+		// cell spacing
+		glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 0, dx, dx, dx, 1.0);
+		// custom parameter for smoke style (higher = thicker)
+		glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 1, 7.0, 7.0, 7.0, 1.0);
+	}
+
 	GPU_texture_bind(tex, 0);
+	if(tex_shadow)
+		GPU_texture_bind(tex_shadow, 1);
 
 	if (!GLEW_ARB_texture_non_power_of_two) {
 		cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
@@ -289,8 +326,17 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		n++;
 	}
 
+	if(tex_shadow)
+		GPU_texture_unbind(tex_shadow);
 	GPU_texture_unbind(tex);
 
+	if(GLEW_ARB_fragment_program)
+	{
+		glDisable(GL_FRAGMENT_PROGRAM_ARB);
+		glDeleteProgramsARB(1, &prog);
+	}
+
+
 	MEM_freeN(points);
 
 	if(!gl_blend)
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index e5e85cf9d16..00b0b5c4fd1 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -157,7 +157,7 @@ ARegion *view3d_has_buttons_region(ScrArea *sa);
 ARegion *view3d_has_tools_region(ScrArea *sa);
 
 /* draw_volume.c */
-void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, int res[3]);
+void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, int res[3], float dx, struct GPUTexture *tex_shadow);
 
 
 #endif /* ED_VIEW3D_INTERN_H */
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 85f4233a251..279596e5ad7 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -28,7 +28,7 @@ FILE(GLOB SRC intern/*.c)
 
 SET(INC 
 	. ../blenlib ../blenkernel ../makesdna ../include
-	../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
+	../../../extern/glew/include ../../../intern/guardedalloc ../../../intern/smoke/extern ../imbuf)
 
 BLENDERLIB(bf_gpu "${SRC}" "${INC}")
 
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 00d0e3131e5..fabe1420e83 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -115,7 +115,7 @@ void GPU_free_images(void);
 
 /* smoke drawing functions */
 void GPU_free_smoke(struct SmokeModifierData *smd);
-void GPU_create_smoke(struct SmokeModifierData *smd);
+void GPU_create_smoke(struct SmokeModifierData *smd, int highres);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index a81c7e03455..75e8073aafd 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -64,6 +64,8 @@
 #include "GPU_material.h"
 #include "GPU_draw.h"
 
+#include "smoke_API.h"
+
 /* These are some obscure rendering functions shared between the
  * game engine and the blender, in this module to avoid duplicaten
  * and abstract them away from the rest a bit */
@@ -754,13 +756,21 @@ void GPU_free_smoke(SmokeModifierData *smd)
 		if(smd->domain->tex)
 	 		GPU_texture_free(smd->domain->tex);
 		smd->domain->tex = NULL;
+
+		if(smd->domain->tex_shadow)
+	 		GPU_texture_free(smd->domain->tex_shadow);
+		smd->domain->tex_shadow = NULL;
 	}
 }
 
-void GPU_create_smoke(SmokeModifierData *smd)
+void GPU_create_smoke(SmokeModifierData *smd, int highres)
 {
-	if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && !smd->domain->tex)
-		smd->domain->tex = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smd->domain->view3d);
+	if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && !smd->domain->tex && !highres)
+		smd->domain->tex = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smoke_get_density(smd->domain->fluid));
+	else if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && !smd->domain->tex && highres)
+		smd->domain->tex = GPU_texture_create_3D(smd->domain->res_wt[0], smd->domain->res_wt[1], smd->domain->res_wt[2], smoke_turbulence_get_density(smd->domain->wt));
+
+	smd->domain->tex_shadow = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smd->domain->shadow);
 }
 
 void GPU_free_image(Image *ima)
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 850b46dc28c..d7b54e425fd 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -346,17 +346,17 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, float *fpixels)
 	tex->number = 0;
 	glBindTexture(tex->target, tex->bindcode);
 
-	type = GL_UNSIGNED_BYTE;
-	format = GL_RGBA;
-	internalformat = GL_RGBA8;
+	type = GL_FLOAT; // GL_UNSIGNED_BYTE
+	format = GL_RED;
+	internalformat = GL_RED;
 
-	if (fpixels)
-		pixels = GPU_texture_convert_pixels(w*h*depth, fpixels);
+	//if (fpixels)
+	//	pixels = GPU_texture_convert_pixels(w*h*depth, fpixels);
 
 	glTexImage3D(tex->target, 0, internalformat, tex->w, tex->h, tex->depth, 0, format, type, 0);
 
 	if (fpixels) {
-		glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format, type, pixels);
+		glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format, type, fpixels);
 	}
 
 	glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 7c6c7fab9e4..4e4714cdaa1 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -38,9 +38,8 @@
 #define MOD_SMOKE_NOISEWAVE (1<<0)
 #define MOD_SMOKE_NOISEFFT (1<<1)
 #define MOD_SMOKE_NOISECURL (1<<2)
-
 /* viewsettings */
-#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */
+#define MOD_SMOKE_VIEW_SHOWBIG (1<<0)
 
 typedef struct SmokeDomainSettings {
 	struct SmokeModifierData *smd; /* for fast RNA access */
@@ -48,35 +47,34 @@ typedef struct SmokeDomainSettings {
 	struct Group *fluid_group;
 	struct Group *eff_group; // effector group for e.g. wind force
 	struct Group *coll_group; // collision objects group
+	struct WTURBULENCE *wt; // WTURBULENCE object, if active
 	struct GPUTexture *tex;
-	float *view3d; /* voxel data for display */
-	unsigned int v3dnum; /* number of frame in view3d buffer */
+	struct GPUTexture *tex_wt;
+	struct GPUTexture *tex_shadow;
+	float *shadow;
 	float p0[3]; /* start point of BB */
 	float p1[3]; /* end point of BB */
 	float dx; /* edge length of one cell */
-	float firstframe;
-	float lastframe;
+	float omega; /* smoke color - from 0 to 1 */
 	float temp; /* fluid temperature */
 	float tempAmb; /* ambient temperature */
 	float alpha;
 	float beta;
 	int res[3]; /* domain resolution */
+	int amplify; /* wavelet amplification */
 	int maxres; /* longest axis on the BB gets this resolution assigned */
 	int flags; /* show up-res or low res, etc */
+	int pad; 
 	int viewsettings;
+	short noise; /* noise type: wave, curl, anisotropic */
 	short diss_percent; 
-	short pad;
 	int diss_speed;/* in frames */
-	struct PointCache *point_cache[2];	/* definition is in DNA_object_force.h */
-	struct ListBase ptcaches[2];
-	struct WTURBULENCE *wt; // WTURBULENCE object, if active
-	int pad3;
 	float strength;
 	int res_wt[3];
-	int maxres_wt;
-	short noise; /* noise type: wave, curl, anisotropic */
-	short pad2;
-	int amplify;
+	float dx_wt;
+	int v3dnum;
+	struct PointCache *point_cache[2];	/* definition is in DNA_object_force.h */
+	struct ListBase ptcaches[2];
 } SmokeDomainSettings;
 
 
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index b3192b110f4..943129c7169 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -46,7 +46,6 @@
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
 
 #include "ED_object.h"
 
@@ -79,15 +78,6 @@ static void rna_Smoke_reset_dependancy(bContext *C, PointerRNA *ptr)
 	rna_Smoke_dependency_update(C, ptr);
 }
 
-#if 0
-static void rna_Smoke_redraw(bContext *C, PointerRNA *ptr)
-{
-	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
-
-	settings->flags |= MOD_SMOKE_VIEW_REDRAWNICE;
-}
-#endif
-
 static char *rna_SmokeDomainSettings_path(PointerRNA *ptr)
 {
 	SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
@@ -139,6 +129,29 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Max Res", "Maximal resolution used in the fluid domain.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
+	prop= RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "amplify");
+	RNA_def_property_range(prop, 1, 10);
+	RNA_def_property_ui_range(prop, 1, 10, 1, 0);
+	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+
+	prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES);
+	RNA_def_property_ui_text(prop, "High res", "Enable high resolution (using amplification).");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+
+	prop= RNA_def_property(srna, "viewhighres", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_VIEW_SHOWBIG);
+	RNA_def_property_ui_text(prop, "Show High Resolution", "Show high resolution (using amplification).");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
+
+	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "noise");
+	RNA_def_property_enum_items(prop, prop_noise_type_items);
+	RNA_def_property_ui_text(prop, "Noise Method", "Noise method which is used for creating the high resolution");
+	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
+
 	prop= RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "alpha");
 	RNA_def_property_range(prop, -5.0, 5.0);
@@ -174,51 +187,6 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Effector Group", "Limit effectors to this group.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_dependancy");
 
-	prop= RNA_def_property(srna, "dissolve_speed", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "diss_speed");
-	RNA_def_property_range(prop, 1.0, 100.0);
-	RNA_def_property_ui_range(prop, 1.0, 1000.0, 1, 0);
-	RNA_def_property_ui_text(prop, "Dissolve Speed", "Dissolve Speed");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES);
-	RNA_def_property_ui_text(prop, "High Resolution Smoke", "Enable high resolution smoke");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
-
-	prop= RNA_def_property(srna, "dissolve_smoke", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE);
-	RNA_def_property_ui_text(prop, "Dissolve Smoke", "Enable smoke to disappear over time.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "dissolve_smoke_log", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE_LOG);
-	RNA_def_property_ui_text(prop, "Logarithmic dissolve", "Using 1/x ");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NEVER_NULL);
-	RNA_def_property_pointer_sdna(prop, NULL, "point_cache[0]");
-	RNA_def_property_struct_type(prop, "PointCache");
-	RNA_def_property_ui_text(prop, "Point Cache", "");
-
-	prop= RNA_def_property(srna, "show_highres", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_SHOWHIGHRES);
-	RNA_def_property_ui_text(prop, "High res", "Show high resolution (using amplification).");
-	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
-
-	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "noise");
-	RNA_def_property_enum_items(prop, prop_noise_type_items);
-	RNA_def_property_ui_text(prop, "Noise Method", "Noise method which is used for creating the high resolution");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
-	prop= RNA_def_property(srna, "amplify", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "amplify");
-	RNA_def_property_range(prop, 1, 10);
-	RNA_def_property_ui_range(prop, 1, 10, 1, 0);
-	RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
-
 	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "strength");
 	RNA_def_property_range(prop, 1.0, 10.0);
@@ -226,9 +194,29 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Strength", "Strength of wavelet noise");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset");
 
-	prop= RNA_def_property(srna, "point_cache_turbulence", PROP_POINTER, PROP_NEVER_NULL);
+	prop= RNA_def_property(srna, "dissolve_speed", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "diss_speed");
+	RNA_def_property_range(prop, 1.0, 100.0);
+	RNA_def_property_ui_range(prop, 1.0, 1000.0, 1, 0);
+	RNA_def_property_ui_text(prop, "Dissolve Speed", "Dissolve Speed");
+	RNA_def_property_update(prop, 0, NULL);
+
+	prop= RNA_def_property(srna, "dissolve_smoke", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE);
+	RNA_def_property_ui_text(prop, "Dissolve Smoke", "Enable smoke to disappear over time.");
+	RNA_def_property_update(prop, 0, NULL);
+
+	prop= RNA_def_property(srna, "dissolve_smoke_log", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE_LOG);
+	RNA_def_property_ui_text(prop, "Logarithmic dissolve", "Using 1/x ");
+	RNA_def_property_update(prop, 0, NULL);
+
+	prop= RNA_def_property(srna, "point_cache_low", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "point_cache[0]");
+	RNA_def_property_ui_text(prop, "Point Cache", "");
+
+	prop= RNA_def_property(srna, "point_cache_high", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "point_cache[1]");
-	RNA_def_property_struct_type(prop, "PointCache");
 	RNA_def_property_ui_text(prop, "Point Cache", "");
 }
 
@@ -247,26 +235,26 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.001, 1);
 	RNA_def_property_ui_range(prop, 0.001, 1.0, 1.0, 4);
 	RNA_def_property_ui_text(prop, "Density", "");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, 0, NULL); // NC_OBJECT|ND_MODIFIER
 
 	prop= RNA_def_property(srna, "temperature", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "temp");
 	RNA_def_property_range(prop, -10, 10);
 	RNA_def_property_ui_range(prop, -10, 10, 1, 1);
 	RNA_def_property_ui_text(prop, "Temp. Diff.", "Temperature difference to ambientt temperature.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, 0, NULL);
 	
 	prop= RNA_def_property(srna, "psys", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "psys");
 	RNA_def_property_struct_type(prop, "ParticleSystem");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Particle Systems", "Particle systems emitted from the object.");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_dependancy");
+	RNA_def_property_update(prop, 0, "rna_Smoke_reset_dependancy");
 
 	prop= RNA_def_property(srna, "outflow", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "type", MOD_SMOKE_FLOW_TYPE_OUTFLOW);
 	RNA_def_property_ui_text(prop, "Outflow", "Deletes smoke from simulation");
-	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL);
+	RNA_def_property_update(prop, 0, NULL);
 }
 
 static void rna_def_smoke_coll_settings(BlenderRNA *brna)

From 939b72247d536de0f09b526403c91cb7044cccca Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Wed, 9 Sep 2009 19:31:43 +0000
Subject: [PATCH 495/577] 2.5: * Scons compile fix for recent smoke commit.

---
 source/blender/gpu/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index e55fbe973f8..7e700c177e4 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -4,7 +4,7 @@ Import ('env')
 sources = env.Glob('intern/*.c')
 
 incs = '../blenlib ../blenkernel ../makesdna ../include'
-incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
+incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf .'
 
 incs += ' ' + env['BF_OPENGL_INC']
 

From 297a53ebf833ebee7de8bd66a11d7cfe19f3ea8e Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 19:40:46 +0000
Subject: [PATCH 496/577] RNA: multidimensional & dyanmic array changes

* Disable setting array length of dynamic array for now, this was not
  implemented correct, and it's not really needed now.
* Allow all dimensions to be dynamic size, not just the first.
* Change storage of multidimensional to be simpler.
* Rename API functions to be more compact.
* Fix some bugs in the implementation.
* RenderLayer.rect and RenderPass.rect use a multidimensional
  dynamic array now.
---
 source/blender/makesrna/RNA_access.h          |   5 +-
 source/blender/makesrna/RNA_define.h          |   8 +-
 source/blender/makesrna/intern/makesrna.c     | 236 ++++++++-------
 source/blender/makesrna/intern/rna_access.c   | 275 +++++++++++-------
 source/blender/makesrna/intern/rna_define.c   | 116 +++++---
 .../makesrna/intern/rna_internal_types.h      |  19 +-
 source/blender/makesrna/intern/rna_mesh.c     |  54 +---
 source/blender/makesrna/intern/rna_object.c   |   4 +-
 source/blender/makesrna/intern/rna_render.c   |  70 +++--
 source/blender/makesrna/intern/rna_rna.c      |   2 +-
 source/blender/python/intern/bpy_array.c      |  69 ++---
 source/blender/python/intern/bpy_rna.c        |   8 +-
 12 files changed, 482 insertions(+), 384 deletions(-)

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 4107c1346e5..05f39d73842 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -586,10 +586,9 @@ PropertyUnit RNA_property_unit(PropertyRNA *prop);
 int RNA_property_flag(PropertyRNA *prop);
 
 int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop);
-int RNA_property_multidimensional_array_length(PointerRNA *ptr, PropertyRNA *prop, int dimension);
-int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length);
+int RNA_property_multi_array_length(PointerRNA *ptr, PropertyRNA *prop, int dimension);
+int RNA_property_array_dimension(PointerRNA *ptr, PropertyRNA *prop, int length[]);
 char RNA_property_array_item_char(PropertyRNA *prop, int index);
-unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dim_size[]);
 
 int RNA_property_string_maxlength(PropertyRNA *prop);
 
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h
index 03b12da1629..42c5343dbff 100644
--- a/source/blender/makesrna/RNA_define.h
+++ b/source/blender/makesrna/RNA_define.h
@@ -90,7 +90,7 @@ void RNA_def_enum_funcs(PropertyRNA *prop, EnumPropertyItemFunc itemfunc);
 PropertyRNA *RNA_def_float(StructOrFunctionRNA *cont, const char *identifier, float default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_vector(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_color(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
-PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int len, int rowsize, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
+PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int rows, int columns, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_rotation(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value,
 	float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax);
 PropertyRNA *RNA_def_float_array(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value,
@@ -128,8 +128,8 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
 
 void RNA_def_property_flag(PropertyRNA *prop, int flag);
 void RNA_def_property_clear_flag(PropertyRNA *prop, int flag);
-void RNA_def_property_array(PropertyRNA *prop, int arraylength);
-void RNA_def_property_multidimensional_array(PropertyRNA *prop, int arraylength, unsigned short arraydimension, unsigned short dimsize[]);
+void RNA_def_property_array(PropertyRNA *prop, int length);
+void RNA_def_property_multi_array(PropertyRNA *prop, int dimension, int length[]);
 void RNA_def_property_range(PropertyRNA *prop, double min, double max);
 
 void RNA_def_property_enum_items(PropertyRNA *prop, const EnumPropertyItem *item);
@@ -153,7 +153,7 @@ void RNA_def_property_ui_icon(PropertyRNA *prop, int icon, int consecutive);
 void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *updatefunc);
 void RNA_def_property_editable_func(PropertyRNA *prop, const char *editable);
 
-void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength, const char *setlength);
+void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength);
 void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const char *set);
 void RNA_def_property_int_funcs(PropertyRNA *prop, const char *get, const char *set, const char *range);
 void RNA_def_property_float_funcs(PropertyRNA *prop, const char *get, const char *set, const char *range);
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index cbfd7d326de..a3c4af26478 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -306,11 +306,10 @@ static void rna_int_print(FILE *f, int num)
 static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *dp, const char *manualfunc)
 {
 	char *func;
-	int i;
 
 	if(prop->flag & PROP_IDPROPERTY)
 		return NULL;
-	
+
 	if(!manualfunc) {
 		if(!dp->dnastructname || !dp->dnaname) {
 			fprintf(stderr, "rna_def_property_get_func: %s.%s has no valid dna info.\n", srna->identifier, prop->identifier);
@@ -373,8 +372,11 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 			break;
 		}
 		default:
-			if(prop->arraylength) {
-				fprintf(f, "void %s(PointerRNA *ptr, %s values[%d])\n", func, rna_type_type(prop), prop->arraylength);
+			if(prop->arraydimension) {
+				if(prop->flag & PROP_DYNAMIC)
+					fprintf(f, "void %s(PointerRNA *ptr, %s values[])\n", func, rna_type_type(prop));
+				else
+					fprintf(f, "void %s(PointerRNA *ptr, %s values[%d])\n", func, rna_type_type(prop), prop->totarraylength);
 				fprintf(f, "{\n");
 
 				if(manualfunc) {
@@ -383,27 +385,38 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 				else {
 					rna_print_data_get(f, dp);
 
-					for(i=0; i<prop->arraylength; i++) {
-						if(dp->dnaarraylength == 1) {
-							if(prop->type == PROP_BOOLEAN && dp->booleanbit)
-								fprintf(f, "	values[%d]= (%s(data->%s & (%d<<%d)) != 0);\n", i, (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit, i);
-							else
-								fprintf(f, "	values[%d]= (%s)%s((&data->%s)[%d]);\n", i, rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname, i);
-						}
-						else {
-							if(prop->type == PROP_BOOLEAN && dp->booleanbit) {
-								fprintf(f, "	values[%d]= (%s(data->%s[%d] & ", i, (dp->booleannegative)? "!": "", dp->dnaname, i);
-								rna_int_print(f, dp->booleanbit);
-								fprintf(f, ") != 0);\n");
-							}
-							else if(rna_color_quantize(prop, dp))
-								fprintf(f, "	values[%d]= (%s)(data->%s[%d]*(1.0f/255.0f));\n", i, rna_type_type(prop), dp->dnaname, i);
-							else if(dp->dnatype)
-								fprintf(f, "	values[%d]= (%s)%s(((%s*)data->%s)[%d]);\n", i, rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnatype, dp->dnaname, i);
-							else
-								fprintf(f, "	values[%d]= (%s)%s((data->%s)[%d]);\n", i, rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname, i);
-						}
+					if(prop->flag & PROP_DYNAMIC) {
+						char *lenfunc= rna_alloc_function_name(srna->identifier, prop->identifier, "get_length");
+						fprintf(f, "	int i, arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
+						fprintf(f, "	int len= %s(ptr, arraylen);\n\n", lenfunc);
+						fprintf(f, "	for(i=0; i<len; i++) {\n");
+						MEM_freeN(lenfunc);
 					}
+					else {
+						fprintf(f, "	int i;\n\n");
+						fprintf(f, "	for(i=0; i<%d; i++) {\n", prop->totarraylength);
+					}
+
+					if(dp->dnaarraylength == 1) {
+						if(prop->type == PROP_BOOLEAN && dp->booleanbit)
+							fprintf(f, "		values[i]= (%s(data->%s & (%d<<i)) != 0);\n", (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
+						else
+							fprintf(f, "		values[i]= (%s)%s((&data->%s)[i]);\n", rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname);
+					}
+					else {
+						if(prop->type == PROP_BOOLEAN && dp->booleanbit) {
+							fprintf(f, "		values[i]= (%s(data->%s[i] & ", (dp->booleannegative)? "!": "", dp->dnaname);
+							rna_int_print(f, dp->booleanbit);
+							fprintf(f, ") != 0);\n");
+						}
+						else if(rna_color_quantize(prop, dp))
+							fprintf(f, "		values[i]= (%s)(data->%s[i]*(1.0f/255.0f));\n", rna_type_type(prop), dp->dnaname);
+						else if(dp->dnatype)
+							fprintf(f, "		values[i]= (%s)%s(((%s*)data->%s)[i]);\n", rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnatype, dp->dnaname);
+						else
+							fprintf(f, "		values[i]= (%s)%s((data->%s)[i]);\n", rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname);
+					}
+					fprintf(f, "	}\n");
 				}
 				fprintf(f, "}\n\n");
 			}
@@ -438,13 +451,13 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 	return func;
 }
 
-static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array, int i)
+static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array)
 {
 	if(prop->type == PROP_INT) {
 		IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
 
 		if(iprop->hardmin != INT_MIN || iprop->hardmax != INT_MAX) {
-			if(array) fprintf(f, "CLAMPIS(values[%d], ", i);
+			if(array) fprintf(f, "CLAMPIS(values[i], ");
 			else fprintf(f, "CLAMPIS(value, ");
 			rna_int_print(f, iprop->hardmin); fprintf(f, ", ");
 			rna_int_print(f, iprop->hardmax); fprintf(f, ");\n");
@@ -455,7 +468,7 @@ static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array, int i)
 		FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
 
 		if(fprop->hardmin != -FLT_MAX || fprop->hardmax != FLT_MAX) {
-			if(array) fprintf(f, "CLAMPIS(values[%d], ", i);
+			if(array) fprintf(f, "CLAMPIS(values[i], ");
 			else fprintf(f, "CLAMPIS(value, ");
 			rna_float_print(f, fprop->hardmin); fprintf(f, ", ");
 			rna_float_print(f, fprop->hardmax); fprintf(f, ");\n");
@@ -464,7 +477,7 @@ static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array, int i)
 	}
 
 	if(array)
-		fprintf(f, "values[%d];\n", i);
+		fprintf(f, "values[i];\n");
 	else
 		fprintf(f, "value;\n");
 }
@@ -472,7 +485,6 @@ static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array, int i)
 static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *dp, char *manualfunc)
 {
 	char *func;
-	int i;
 
 	if(!(prop->flag & PROP_EDITABLE))
 		return NULL;
@@ -532,8 +544,11 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 			break;
 		}
 		default:
-			if(prop->arraylength) {
-				fprintf(f, "void %s(PointerRNA *ptr, const %s values[%d])\n", func, rna_type_type(prop), prop->arraylength);
+			if(prop->arraydimension) {
+				if(prop->flag & PROP_DYNAMIC)
+					fprintf(f, "void %s(PointerRNA *ptr, const %s values[])\n", func, rna_type_type(prop));
+				else
+					fprintf(f, "void %s(PointerRNA *ptr, const %s values[%d])\n", func, rna_type_type(prop), prop->totarraylength);
 				fprintf(f, "{\n");
 
 				if(manualfunc) {
@@ -542,38 +557,49 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 				else {
 					rna_print_data_get(f, dp);
 
-					for(i=0; i<prop->arraylength; i++) {
-						if(dp->dnaarraylength == 1) {
-							if(prop->type == PROP_BOOLEAN && dp->booleanbit) {
-								fprintf(f, "	if(%svalues[%d]) data->%s |= (%d<<%d);\n", (dp->booleannegative)? "!": "", i, dp->dnaname, dp->booleanbit, i);
-								fprintf(f, "	else data->%s &= ~(%d<<%d);\n", dp->dnaname, dp->booleanbit, i);
-							}
-							else {
-								fprintf(f, "	(&data->%s)[%d]= %s", dp->dnaname, i, (dp->booleannegative)? "!": "");
-								rna_clamp_value(f, prop, 1, i);
-							}
+					if(prop->flag & PROP_DYNAMIC) {
+						char *lenfunc= rna_alloc_function_name(srna->identifier, prop->identifier, "set_length");
+						fprintf(f, "	int i, arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
+						fprintf(f, "	int len= %s(ptr, arraylen);\n\n", lenfunc);
+						fprintf(f, "	for(i=0; i<len; i++) {\n");
+						MEM_freeN(lenfunc);
+					}
+					else {
+						fprintf(f, "	int i;\n\n");
+						fprintf(f, "	for(i=0; i<%d; i++) {\n", prop->totarraylength);
+					}
+
+					if(dp->dnaarraylength == 1) {
+						if(prop->type == PROP_BOOLEAN && dp->booleanbit) {
+							fprintf(f, "		if(%svalues[i]) data->%s |= (%d<<i);\n", (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
+							fprintf(f, "		else data->%s &= ~(%d<<i);\n", dp->dnaname, dp->booleanbit);
 						}
 						else {
-							if(prop->type == PROP_BOOLEAN && dp->booleanbit) {
-								fprintf(f, "	if(%svalues[%d]) data->%s[%d] |= ", (dp->booleannegative)? "!": "", i, dp->dnaname, i);
-								rna_int_print(f, dp->booleanbit);
-								fprintf(f, ";\n");
-								fprintf(f, "	else data->%s[%d] &= ~", dp->dnaname, i);
-								rna_int_print(f, dp->booleanbit);
-								fprintf(f, ";\n");
-							}
-							else if(rna_color_quantize(prop, dp)) {
-								fprintf(f, "	data->%s[%d]= FTOCHAR(values[%d]);\n", dp->dnaname, i, i);
-							}
-							else {
-								if(dp->dnatype)
-									fprintf(f, "	((%s*)data->%s)[%d]= %s", dp->dnatype, dp->dnaname, i, (dp->booleannegative)? "!": "");
-								else
-									fprintf(f, "	(data->%s)[%d]= %s", dp->dnaname, i, (dp->booleannegative)? "!": "");
-								rna_clamp_value(f, prop, 1, i);
-							}
+							fprintf(f, "		(&data->%s)[i]= %s", dp->dnaname, (dp->booleannegative)? "!": "");
+							rna_clamp_value(f, prop, 1);
 						}
 					}
+					else {
+						if(prop->type == PROP_BOOLEAN && dp->booleanbit) {
+							fprintf(f, "		if(%svalues[i]) data->%s[i] |= ", (dp->booleannegative)? "!": "", dp->dnaname);
+							rna_int_print(f, dp->booleanbit);
+							fprintf(f, ";\n");
+							fprintf(f, "		else data->%s[i] &= ~", dp->dnaname);
+							rna_int_print(f, dp->booleanbit);
+							fprintf(f, ";\n");
+						}
+						else if(rna_color_quantize(prop, dp)) {
+							fprintf(f, "		data->%s[i]= FTOCHAR(values[i]);\n", dp->dnaname);
+						}
+						else {
+							if(dp->dnatype)
+								fprintf(f, "		((%s*)data->%s)[i]= %s", dp->dnatype, dp->dnaname, (dp->booleannegative)? "!": "");
+							else
+								fprintf(f, "		(data->%s)[i]= %s", dp->dnaname, (dp->booleannegative)? "!": "");
+							rna_clamp_value(f, prop, 1);
+						}
+					}
+					fprintf(f, "	}\n");
 				}
 				fprintf(f, "}\n\n");
 			}
@@ -602,7 +628,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 					}
 					else {
 						fprintf(f, "	data->%s= %s", dp->dnaname, (dp->booleannegative)? "!": "");
-						rna_clamp_value(f, prop, 0, 0);
+						rna_clamp_value(f, prop, 0);
 					}
 				}
 				fprintf(f, "}\n\n");
@@ -819,7 +845,7 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
 		case PROP_BOOLEAN: {
 			BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 
-			if(!prop->arraylength) {
+			if(!prop->arraydimension) {
 				if(!bprop->get && !bprop->set && !dp->booleanbit)
 					rna_set_raw_property(dp, prop);
 
@@ -835,7 +861,7 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
 		case PROP_INT: {
 			IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
 
-			if(!prop->arraylength) {
+			if(!prop->arraydimension) {
 				if(!iprop->get && !iprop->set)
 					rna_set_raw_property(dp, prop);
 
@@ -854,7 +880,7 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
 		case PROP_FLOAT: {
 			FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
 
-			if(!prop->arraylength) {
+			if(!prop->arraydimension) {
 				if(!fprop->get && !fprop->set)
 					rna_set_raw_property(dp, prop);
 
@@ -953,23 +979,23 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR
 	switch(prop->type) {
 		case PROP_BOOLEAN:
 		case PROP_INT: {
-			if(!prop->arraylength) {
+			if(!prop->arraydimension) {
 				fprintf(f, "int %sget(PointerRNA *ptr);\n", func);
 				//fprintf(f, "void %sset(PointerRNA *ptr, int value);\n", func);
 			}
 			else {
-				fprintf(f, "void %sget(PointerRNA *ptr, int values[%d]);\n", func, prop->arraylength);
+				fprintf(f, "void %sget(PointerRNA *ptr, int values[%d]);\n", func, prop->totarraylength);
 				//fprintf(f, "void %sset(PointerRNA *ptr, const int values[%d]);\n", func, prop->arraylength);
 			}
 			break;
 		}
 		case PROP_FLOAT: {
-			if(!prop->arraylength) {
+			if(!prop->arraydimension) {
 				fprintf(f, "float %sget(PointerRNA *ptr);\n", func);
 				//fprintf(f, "void %sset(PointerRNA *ptr, float value);\n", func);
 			}
 			else {
-				fprintf(f, "void %sget(PointerRNA *ptr, float values[%d]);\n", func, prop->arraylength);
+				fprintf(f, "void %sget(PointerRNA *ptr, float values[%d]);\n", func, prop->totarraylength);
 				//fprintf(f, "void %sset(PointerRNA *ptr, const float values[%d]);\n", func, prop->arraylength);
 			}
 			break;
@@ -1043,24 +1069,24 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property
 
 	switch(prop->type) {
 		case PROP_BOOLEAN: {
-			if(!prop->arraylength)
+			if(!prop->arraydimension)
 				fprintf(f, "\tbool %s(void);", prop->identifier);
 			else
-				fprintf(f, "\tArray<int, %d> %s(void);", prop->arraylength, prop->identifier);
+				fprintf(f, "\tArray<int, %d> %s(void);", prop->totarraylength, prop->identifier);
 			break;
 		}
 		case PROP_INT: {
-			if(!prop->arraylength)
+			if(!prop->arraydimension)
 				fprintf(f, "\tint %s(void);", prop->identifier);
 			else
-				fprintf(f, "\tArray<int, %d> %s(void);", prop->arraylength, prop->identifier);
+				fprintf(f, "\tArray<int, %d> %s(void);", prop->totarraylength, prop->identifier);
 			break;
 		}
 		case PROP_FLOAT: {
-			if(!prop->arraylength)
+			if(!prop->arraydimension)
 				fprintf(f, "\tfloat %s(void);", prop->identifier);
 			else
-				fprintf(f, "\tArray<float, %d> %s(void);", prop->arraylength, prop->identifier);
+				fprintf(f, "\tArray<float, %d> %s(void);", prop->totarraylength, prop->identifier);
 			break;
 		}
 		case PROP_ENUM: {
@@ -1118,24 +1144,24 @@ static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDe
 
 	switch(prop->type) {
 		case PROP_BOOLEAN: {
-			if(!prop->arraylength)
+			if(!prop->arraydimension)
 				fprintf(f, "\tBOOLEAN_PROPERTY(%s, %s)", srna->identifier, prop->identifier);
 			else
-				fprintf(f, "\tBOOLEAN_ARRAY_PROPERTY(%s, %d, %s)", srna->identifier, prop->arraylength, prop->identifier);
+				fprintf(f, "\tBOOLEAN_ARRAY_PROPERTY(%s, %d, %s)", srna->identifier, prop->totarraylength, prop->identifier);
 			break;
 		}
 		case PROP_INT: {
-			if(!prop->arraylength)
+			if(!prop->arraydimension)
 				fprintf(f, "\tINT_PROPERTY(%s, %s)", srna->identifier, prop->identifier);
 			else
-				fprintf(f, "\tINT_ARRAY_PROPERTY(%s, %d, %s)", srna->identifier, prop->arraylength, prop->identifier);
+				fprintf(f, "\tINT_ARRAY_PROPERTY(%s, %d, %s)", srna->identifier, prop->totarraylength, prop->identifier);
 			break;
 		}
 		case PROP_FLOAT: {
-			if(!prop->arraylength)
+			if(!prop->arraydimension)
 				fprintf(f, "\tFLOAT_PROPERTY(%s, %s)", srna->identifier, prop->identifier);
 			else
-				fprintf(f, "\tFLOAT_ARRAY_PROPERTY(%s, %d, %s)", srna->identifier, prop->arraylength, prop->identifier);
+				fprintf(f, "\tFLOAT_ARRAY_PROPERTY(%s, %d, %s)", srna->identifier, prop->totarraylength, prop->identifier);
 			break;
 		}
 		case PROP_ENUM: {
@@ -1198,7 +1224,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 
 	dparm= dfunc->cont.properties.first;
 	for(; dparm; dparm= dparm->next) {
-		if(dparm->prop->arraylength > 0)
+		if(dparm->prop->arraydimension)
 			ptrstr= "*";
 		else if(dparm->prop==func->ret)
 			ptrstr= ((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR))? "*": "";
@@ -1225,7 +1251,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 	for(; dparm; dparm= dparm->next) {
 		if(dparm->prop==func->ret) 
 			fprintf(f, "\t_retdata= _data;\n");
-		else if(dparm->prop->arraylength)
+		else if(dparm->prop->arraydimension)
 			fprintf(f, "\t%s= ((%s%s*)_data);\n", dparm->prop->identifier, rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop));
 		else if(dparm->prop->type == PROP_POINTER) {
 			if(dparm->prop->flag & PROP_RNAPTR)
@@ -1280,7 +1306,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 
 		if(func->ret) {
 			dparm= rna_find_parameter_def(func->ret);
-			ptrstr= (((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR)) || (dparm->prop->arraylength > 0))? "*": "";
+			ptrstr= (((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR)) || (dparm->prop->arraydimension))? "*": "";
 			fprintf(f, "\t*((%s%s%s*)_retdata)= %s;\n", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), ptrstr, func->ret->identifier);
 		}
 	}
@@ -1522,7 +1548,7 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
 	/* return type */
 	for(dparm= dfunc->cont.properties.first; dparm; dparm= dparm->next) {
 		if(dparm->prop==func->ret) {
-			if(dparm->prop->arraylength)
+			if(dparm->prop->arraydimension)
 				fprintf(f, "XXX no array return types yet"); /* XXX not supported */
 			else if(dparm->prop->type == PROP_POINTER && !(dparm->prop->flag & PROP_RNAPTR))
 				fprintf(f, "%s%s *", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop));
@@ -1569,8 +1595,8 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
 		if(!first) fprintf(f, ", ");
 		first= 0;
 
-		if(dparm->prop->arraylength)
-			fprintf(f, "%s%s %s[%d]", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), dparm->prop->identifier, dparm->prop->arraylength);
+		if(dparm->prop->arraydimension)
+			fprintf(f, "%s%s %s[%d]", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), dparm->prop->identifier, dparm->prop->totarraylength);
 		else if(dparm->prop->type == PROP_POINTER)
 			fprintf(f, "%s%s *%s", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), dparm->prop->identifier);
 		else
@@ -1653,15 +1679,15 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 				unsigned int i;
 
-				if(prop->arraylength) {
-					fprintf(f, "static int rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->arraylength);
+				if(prop->arraydimension) {
+					fprintf(f, "static int rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->totarraylength);
 
-					for(i=0; i<prop->arraylength; i++) {
+					for(i=0; i<prop->totarraylength; i++) {
 						if(bprop->defaultarray)
 							fprintf(f, "%d", bprop->defaultarray[i]);
 						else
 							fprintf(f, "%d", bprop->defaultvalue);
-						if(i != prop->arraylength-1)
+						if(i != prop->totarraylength-1)
 							fprintf(f, ", ");
 					}
 
@@ -1673,15 +1699,15 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
 				unsigned int i;
 
-				if(prop->arraylength) {
-					fprintf(f, "static int rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->arraylength);
+				if(prop->arraydimension) {
+					fprintf(f, "static int rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->totarraylength);
 
-					for(i=0; i<prop->arraylength; i++) {
+					for(i=0; i<prop->totarraylength; i++) {
 						if(iprop->defaultarray)
 							fprintf(f, "%d", iprop->defaultarray[i]);
 						else
 							fprintf(f, "%d", iprop->defaultvalue);
-						if(i != prop->arraylength-1)
+						if(i != prop->totarraylength-1)
 							fprintf(f, ", ");
 					}
 
@@ -1693,15 +1719,15 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
 				unsigned int i;
 
-				if(prop->arraylength) {
-					fprintf(f, "static float rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->arraylength);
+				if(prop->arraydimension) {
+					fprintf(f, "static float rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->totarraylength);
 
-					for(i=0; i<prop->arraylength; i++) {
+					for(i=0; i<prop->totarraylength; i++) {
 						if(fprop->defaultarray)
 							rna_float_print(f, fprop->defaultarray[i]);
 						else
 							rna_float_print(f, fprop->defaultvalue);
-						if(i != prop->arraylength-1)
+						if(i != prop->totarraylength-1)
 							fprintf(f, ", ");
 					}
 
@@ -1725,15 +1751,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 	rna_print_c_string(f, prop->name); fprintf(f, ",\n\t");
 	rna_print_c_string(f, prop->description); fprintf(f, ",\n\t");
 	fprintf(f, "%d,\n", prop->icon);
-	fprintf(f, "\t%s, %s|%s, %d,\n", rna_property_typename(prop->type), rna_property_subtypename(prop->subtype), rna_property_subtype_unit(prop->subtype), prop->arraylength);
-	{
-		int i;
-		int tot= sizeof(prop->dimsize) / sizeof(prop->dimsize[0]);
-		fprintf(f, "\t%s, %s, %d, {", rna_function_string(prop->getlength), rna_function_string(prop->setlength), (int)prop->arraydimension);
-		for(i= 0; i < tot; i++) {
-			fprintf(f, i == tot - 1 ? "%d},\n" : "%d, ", (int)prop->dimsize[i]);
-		}
-	}
+	fprintf(f, "\t%s, %s|%s, %s, %d, {%d, %d, %d}, %d,\n", rna_property_typename(prop->type), rna_property_subtypename(prop->subtype), rna_property_subtype_unit(prop->subtype), rna_function_string(prop->getlength), prop->arraydimension, prop->arraylength[0], prop->arraylength[1], prop->arraylength[2], prop->totarraylength);
 	fprintf(f, "\t%s, %d, %s,\n", rna_function_string(prop->update), prop->noteflag, rna_function_string(prop->editable));
 
 	if(prop->flag & PROP_RAW_ACCESS) rna_set_raw_offset(f, srna, prop);
@@ -1744,7 +1762,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 			case PROP_BOOLEAN: {
 				BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 				fprintf(f, "\t%s, %s, %s, %s, %d, ", rna_function_string(bprop->get), rna_function_string(bprop->set), rna_function_string(bprop->getarray), rna_function_string(bprop->setarray), bprop->defaultvalue);
-				if(prop->arraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+				if(prop->arraydimension) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
 				else fprintf(f, "NULL\n");
 				break;
 			}
@@ -1757,7 +1775,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				rna_int_print(f, iprop->hardmax); fprintf(f, ", ");
 				rna_int_print(f, iprop->step); fprintf(f, ", ");
 				rna_int_print(f, iprop->defaultvalue); fprintf(f, ", ");
-				if(prop->arraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+				if(prop->arraydimension) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
 				else fprintf(f, "NULL\n");
 				break;
 			 }
@@ -1771,7 +1789,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				rna_float_print(f, fprop->step); fprintf(f, ", ");
 				rna_int_print(f, (int)fprop->precision); fprintf(f, ", ");
 				rna_float_print(f, fprop->defaultvalue); fprintf(f, ", ");
-				if(prop->arraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+				if(prop->arraydimension) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
 				else fprintf(f, "NULL\n");
 				break;
 			 }
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index f37fa01480c..417ace6a455 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -209,7 +209,41 @@ static IDProperty *rna_idproperty_find(PointerRNA *ptr, const char *name)
 	return NULL;
 }
 
-static int rna_idproperty_verify_valid(PropertyRNA *prop, IDProperty *idprop)
+static int rna_ensure_property_array_length(PointerRNA *ptr, PropertyRNA *prop)
+{
+	if(prop->magic == RNA_MAGIC) {
+		int arraylen[RNA_MAX_ARRAY_DIMENSION];
+		return (prop->getlength)? prop->getlength(ptr, arraylen): prop->totarraylength;
+	}
+	else {
+		IDProperty *idprop= (IDProperty*)prop;
+
+		if(idprop->type == IDP_ARRAY)
+			return idprop->len;
+		else
+			return 0;
+	}
+}
+
+static void rna_ensure_property_multi_array_length(PointerRNA *ptr, PropertyRNA *prop, int length[])
+{
+	if(prop->magic == RNA_MAGIC) {
+		if(prop->getlength)
+			prop->getlength(ptr, length);
+		else
+			memcpy(length, prop->arraylength, prop->arraydimension*sizeof(int));
+	}
+	else {
+		IDProperty *idprop= (IDProperty*)prop;
+
+		if(idprop->type == IDP_ARRAY)
+			length[0]= idprop->len;
+		else
+			length[0]= 0;
+	}
+}
+
+static int rna_idproperty_verify_valid(PointerRNA *ptr, PropertyRNA *prop, IDProperty *idprop)
 {
 	/* this verifies if the idproperty actually matches the property
 	 * description and otherwise removes it. this is to ensure that
@@ -222,7 +256,7 @@ static int rna_idproperty_verify_valid(PropertyRNA *prop, IDProperty *idprop)
 				return 0;
 			break;
 		case IDP_ARRAY:
-			if(prop->arraylength != idprop->len)
+			if(rna_ensure_property_array_length(ptr, prop) != idprop->len)
 				return 0;
 
 			if(idprop->subtype == IDP_FLOAT && prop->type != PROP_FLOAT)
@@ -283,7 +317,7 @@ IDProperty *rna_idproperty_check(PropertyRNA **prop, PointerRNA *ptr)
 		if((*prop)->flag & PROP_IDPROPERTY) {
 			IDProperty *idprop= rna_idproperty_find(ptr, (*prop)->identifier);
 
-			if(idprop && !rna_idproperty_verify_valid(*prop, idprop)) {
+			if(idprop && !rna_idproperty_verify_valid(ptr, *prop, idprop)) {
 				IDProperty *group= RNA_struct_idproperties(ptr, 0);
 
 				IDP_RemFromGroup(group, idprop);
@@ -310,7 +344,7 @@ IDProperty *rna_idproperty_check(PropertyRNA **prop, PointerRNA *ptr)
 	}
 }
 
-PropertyRNA *rna_ensure_property(PropertyRNA *prop)
+static PropertyRNA *rna_ensure_property(PropertyRNA *prop)
 {
 	/* the quick version if we don't need the idproperty */
 
@@ -327,7 +361,7 @@ PropertyRNA *rna_ensure_property(PropertyRNA *prop)
 	}
 }
 
-const char *rna_ensure_property_identifier(PropertyRNA *prop)
+static const char *rna_ensure_property_identifier(PropertyRNA *prop)
 {
 	if(prop->magic == RNA_MAGIC)
 		return prop->identifier;
@@ -335,7 +369,7 @@ const char *rna_ensure_property_identifier(PropertyRNA *prop)
 		return ((IDProperty*)prop)->name;
 }
 
-const char *rna_ensure_property_name(PropertyRNA *prop)
+static const char *rna_ensure_property_name(PropertyRNA *prop)
 {
 	if(prop->magic == RNA_MAGIC)
 		return prop->name;
@@ -343,21 +377,6 @@ const char *rna_ensure_property_name(PropertyRNA *prop)
 		return ((IDProperty*)prop)->name;
 }
 
-int rna_ensure_property_array_length(PointerRNA *ptr, PropertyRNA *prop)
-{
-	if(prop->magic == RNA_MAGIC) {
-		return prop->getlength ? prop->getlength(ptr) : prop->arraylength;
-	}
-	else {
-		IDProperty *idprop= (IDProperty*)prop;
-
-		if(idprop->type == IDP_ARRAY)
-			return idprop->len;
-		else
-			return 0;
-	}
-}
-
 /* Structs */
 
 const char *RNA_struct_identifier(StructRNA *type)
@@ -555,51 +574,25 @@ int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop)
 	return rna_ensure_property_array_length(ptr, prop);
 }
 
-int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length)
-{
-	/* length 0 is not allowed */
-	if (!length)
-		return 0;
-
-	if (prop->getlength) {
-		if (prop->setlength)
-			return prop->setlength(ptr, length);
-		else
-			/* length cannot be changed */
-			return 0;
-	}
-	else
-		prop->arraylength= length; /* function parameters only? */
-
-	return 1;
-}
-
 /* used by BPY to make an array from the python object */
-unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dimsize[])
+int RNA_property_array_dimension(PointerRNA *ptr, PropertyRNA *prop, int length[])
 {
-	if (dimsize && prop->arraydimension > 1) {
-		memcpy(dimsize, prop->dimsize, sizeof(prop->dimsize[0]) * (prop->arraydimension - 1));
-	}
-	return prop->arraydimension;
+	PropertyRNA *rprop= rna_ensure_property(prop);
+
+	if(length && rprop->arraydimension > 1)
+		rna_ensure_property_multi_array_length(ptr, prop, length);
+
+	return rprop->arraydimension;
 }
 
 /* Return the size of Nth dimension. */
-int RNA_property_multidimensional_array_length(PointerRNA *ptr, PropertyRNA *prop, int dim)
+int RNA_property_multi_array_length(PointerRNA *ptr, PropertyRNA *prop, int dim)
 {
-	unsigned short i;
-	int len;
+	int len[RNA_MAX_ARRAY_DIMENSION];
 
-	if (dim == 0) {
-		len= RNA_property_array_length(ptr, prop);
+	rna_ensure_property_multi_array_length(ptr, prop, len);
 
-		for (i= 0; i < prop->arraydimension - 1; i++)
-			len /= prop->dimsize[i];
-	}
-	else {
-		len= prop->dimsize[dim - 1];
-	}
-
-	return len;
+	return len[dim];
 }
 
 char RNA_property_array_item_char(PropertyRNA *prop, int index)
@@ -902,27 +895,40 @@ void RNA_property_boolean_get_array(PointerRNA *ptr, PropertyRNA *prop, int *val
 	IDProperty *idprop;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
-		if(prop->arraylength == 0)
+		if(prop->arraydimension == 0)
 			values[0]= RNA_property_boolean_get(ptr, prop);
 		else
 			memcpy(values, IDP_Array(idprop), sizeof(int)*idprop->len);
 	}
-	else if(prop->arraylength == 0)
+	else if(prop->arraydimension == 0)
 		values[0]= RNA_property_boolean_get(ptr, prop);
 	else if(bprop->getarray)
 		bprop->getarray(ptr, values);
 	else if(bprop->defaultarray)
-		memcpy(values, bprop->defaultarray, sizeof(int)*prop->arraylength);
+		memcpy(values, bprop->defaultarray, sizeof(int)*prop->totarraylength);
 	else
-		memset(values, 0, sizeof(int)*prop->arraylength);
+		memset(values, 0, sizeof(int)*prop->totarraylength);
 }
 
 int RNA_property_boolean_get_index(PointerRNA *ptr, PropertyRNA *prop, int index)
 {
-	int tmp[RNA_MAX_ARRAY];
+	int tmp[RNA_MAX_ARRAY_LENGTH];
+	int len= rna_ensure_property_array_length(ptr, prop);
 
-	RNA_property_boolean_get_array(ptr, prop, tmp);
-	return tmp[index];
+	if(len <= RNA_MAX_ARRAY_LENGTH) {
+		RNA_property_boolean_get_array(ptr, prop, tmp);
+		return tmp[index];
+	}
+	else {
+		int *tmparray, value;
+
+		tmparray= MEM_callocN(sizeof(int)*len, "RNA_property_boolean_get_index");
+		RNA_property_boolean_get_array(ptr, prop, tmparray);
+		value= tmparray[index];
+		MEM_freeN(tmparray);
+
+		return value;
+	}
 }
 
 void RNA_property_boolean_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *values)
@@ -931,12 +937,12 @@ void RNA_property_boolean_set_array(PointerRNA *ptr, PropertyRNA *prop, const in
 	IDProperty *idprop;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
-		if(prop->arraylength == 0)
+		if(prop->arraydimension == 0)
 			IDP_Int(idprop)= values[0];
 		else
 			memcpy(IDP_Array(idprop), values, sizeof(int)*idprop->len);
 	}
-	else if(prop->arraylength == 0)
+	else if(prop->arraydimension == 0)
 		RNA_property_boolean_set(ptr, prop, values[0]);
 	else if(bprop->setarray)
 		bprop->setarray(ptr, values);
@@ -944,7 +950,7 @@ void RNA_property_boolean_set_array(PointerRNA *ptr, PropertyRNA *prop, const in
 		IDPropertyTemplate val = {0};
 		IDProperty *group;
 
-		val.array.len= prop->arraylength;
+		val.array.len= prop->totarraylength;
 		val.array.type= IDP_INT;
 
 		group= RNA_struct_idproperties(ptr, 1);
@@ -958,11 +964,23 @@ void RNA_property_boolean_set_array(PointerRNA *ptr, PropertyRNA *prop, const in
 
 void RNA_property_boolean_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, int value)
 {
-	int tmp[RNA_MAX_ARRAY];
+	int tmp[RNA_MAX_ARRAY_LENGTH];
+	int len= rna_ensure_property_array_length(ptr, prop);
 
-	RNA_property_boolean_get_array(ptr, prop, tmp);
-	tmp[index]= value;
-	RNA_property_boolean_set_array(ptr, prop, tmp);
+	if(len <= RNA_MAX_ARRAY_LENGTH) {
+		RNA_property_boolean_get_array(ptr, prop, tmp);
+		tmp[index]= value;
+		RNA_property_boolean_set_array(ptr, prop, tmp);
+	}
+	else {
+		int *tmparray;
+
+		tmparray= MEM_callocN(sizeof(int)*len, "RNA_property_boolean_get_index");
+		RNA_property_boolean_get_array(ptr, prop, tmparray);
+		tmparray[index]= value;
+		RNA_property_boolean_set_array(ptr, prop, tmparray);
+		MEM_freeN(tmparray);
+	}
 }
 
 int RNA_property_int_get(PointerRNA *ptr, PropertyRNA *prop)
@@ -1005,27 +1023,40 @@ void RNA_property_int_get_array(PointerRNA *ptr, PropertyRNA *prop, int *values)
 	IDProperty *idprop;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
-		if(prop->arraylength == 0)
+		if(prop->arraydimension == 0)
 			values[0]= RNA_property_int_get(ptr, prop);
 		else
 			memcpy(values, IDP_Array(idprop), sizeof(int)*idprop->len);
 	}
-	else if(prop->arraylength == 0)
+	else if(prop->arraydimension == 0)
 		values[0]= RNA_property_int_get(ptr, prop);
 	else if(iprop->getarray)
 		iprop->getarray(ptr, values);
 	else if(iprop->defaultarray)
-		memcpy(values, iprop->defaultarray, sizeof(int)*prop->arraylength);
+		memcpy(values, iprop->defaultarray, sizeof(int)*prop->totarraylength);
 	else
-		memset(values, 0, sizeof(int)*prop->arraylength);
+		memset(values, 0, sizeof(int)*prop->totarraylength);
 }
 
 int RNA_property_int_get_index(PointerRNA *ptr, PropertyRNA *prop, int index)
 {
-	int tmp[RNA_MAX_ARRAY];
+	int tmp[RNA_MAX_ARRAY_LENGTH];
+	int len= rna_ensure_property_array_length(ptr, prop);
 
-	RNA_property_int_get_array(ptr, prop, tmp);
-	return tmp[index];
+	if(len <= RNA_MAX_ARRAY_LENGTH) {
+		RNA_property_int_get_array(ptr, prop, tmp);
+		return tmp[index];
+	}
+	else {
+		int *tmparray, value;
+
+		tmparray= MEM_callocN(sizeof(int)*len, "RNA_property_int_get_index");
+		RNA_property_int_get_array(ptr, prop, tmparray);
+		value= tmparray[index];
+		MEM_freeN(tmparray);
+
+		return value;
+	}
 }
 
 void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *values)
@@ -1034,12 +1065,12 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v
 	IDProperty *idprop;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
-		if(prop->arraylength == 0)
+		if(prop->arraydimension == 0)
 			IDP_Int(idprop)= values[0];
 		else
 			memcpy(IDP_Array(idprop), values, sizeof(int)*idprop->len);\
 	}
-	else if(prop->arraylength == 0)
+	else if(prop->arraydimension == 0)
 		RNA_property_int_set(ptr, prop, values[0]);
 	else if(iprop->setarray)
 		iprop->setarray(ptr, values);
@@ -1047,7 +1078,7 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v
 		IDPropertyTemplate val = {0};
 		IDProperty *group;
 
-		val.array.len= prop->arraylength;
+		val.array.len= prop->totarraylength;
 		val.array.type= IDP_INT;
 
 		group= RNA_struct_idproperties(ptr, 1);
@@ -1061,11 +1092,23 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v
 
 void RNA_property_int_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, int value)
 {
-	int tmp[RNA_MAX_ARRAY];
+	int tmp[RNA_MAX_ARRAY_LENGTH];
+	int len= rna_ensure_property_array_length(ptr, prop);
 
-	RNA_property_int_get_array(ptr, prop, tmp);
-	tmp[index]= value;
-	RNA_property_int_set_array(ptr, prop, tmp);
+	if(len <= RNA_MAX_ARRAY_LENGTH) {
+		RNA_property_int_get_array(ptr, prop, tmp);
+		tmp[index]= value;
+		RNA_property_int_set_array(ptr, prop, tmp);
+	}
+	else {
+		int *tmparray;
+
+		tmparray= MEM_callocN(sizeof(int)*len, "RNA_property_int_get_index");
+		RNA_property_int_get_array(ptr, prop, tmparray);
+		tmparray[index]= value;
+		RNA_property_int_set_array(ptr, prop, tmparray);
+		MEM_freeN(tmparray);
+	}
 }
 
 float RNA_property_float_get(PointerRNA *ptr, PropertyRNA *prop)
@@ -1118,7 +1161,7 @@ void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *val
 	int i;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
-		if(prop->arraylength == 0)
+		if(prop->arraydimension == 0)
 			values[0]= RNA_property_float_get(ptr, prop);
 		else if(idprop->subtype == IDP_FLOAT) {
 			memcpy(values, IDP_Array(idprop), sizeof(float)*idprop->len);
@@ -1128,22 +1171,36 @@ void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *val
 				values[i]=  (float)(((double*)IDP_Array(idprop))[i]);
 		}
 	}
-	else if(prop->arraylength == 0)
+	else if(prop->arraydimension == 0)
 		values[0]= RNA_property_float_get(ptr, prop);
 	else if(fprop->getarray)
 		fprop->getarray(ptr, values);
 	else if(fprop->defaultarray)
-		memcpy(values, fprop->defaultarray, sizeof(float)*prop->arraylength);
+		memcpy(values, fprop->defaultarray, sizeof(float)*prop->totarraylength);
 	else
-		memset(values, 0, sizeof(float)*prop->arraylength);
+		memset(values, 0, sizeof(float)*prop->totarraylength);
 }
 
 float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index)
 {
-	float tmp[RNA_MAX_ARRAY];
+	float tmp[RNA_MAX_ARRAY_LENGTH];
+	int len= rna_ensure_property_array_length(ptr, prop);
+
+	if(len <= RNA_MAX_ARRAY_LENGTH) {
+		RNA_property_float_get_array(ptr, prop, tmp);
+		return tmp[index];
+	}
+	else {
+		float *tmparray, value;
+
+		tmparray= MEM_callocN(sizeof(float)*len, "RNA_property_float_get_index");
+		RNA_property_float_get_array(ptr, prop, tmparray);
+		value= tmparray[index];
+		MEM_freeN(tmparray);
+
+		return value;
+	}
 
-	RNA_property_float_get_array(ptr, prop, tmp);
-	return tmp[index];
 }
 
 void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const float *values)
@@ -1153,7 +1210,7 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa
 	int i;
 
 	if((idprop=rna_idproperty_check(&prop, ptr))) {
-		if(prop->arraylength == 0)
+		if(prop->arraydimension == 0)
 			IDP_Double(idprop)= values[0];
 		else if(idprop->subtype == IDP_FLOAT) {
 			memcpy(IDP_Array(idprop), values, sizeof(float)*idprop->len);
@@ -1163,7 +1220,7 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa
 				((double*)IDP_Array(idprop))[i]= values[i];
 		}
 	}
-	else if(prop->arraylength == 0)
+	else if(prop->arraydimension == 0)
 		RNA_property_float_set(ptr, prop, values[0]);
 	else if(fprop->setarray) {
 		fprop->setarray(ptr, values);
@@ -1172,7 +1229,7 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa
 		IDPropertyTemplate val = {0};
 		IDProperty *group;
 
-		val.array.len= prop->arraylength;
+		val.array.len= prop->totarraylength;
 		val.array.type= IDP_FLOAT;
 
 		group= RNA_struct_idproperties(ptr, 1);
@@ -1186,11 +1243,23 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa
 
 void RNA_property_float_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, float value)
 {
-	float tmp[RNA_MAX_ARRAY];
+	float tmp[RNA_MAX_ARRAY_LENGTH];
+	int len= rna_ensure_property_array_length(ptr, prop);
 
-	RNA_property_float_get_array(ptr, prop, tmp);
-	tmp[index]= value;
-	RNA_property_float_set_array(ptr, prop, tmp);
+	if(len <= RNA_MAX_ARRAY_LENGTH) {
+		RNA_property_float_get_array(ptr, prop, tmp);
+		tmp[index]= value;
+		RNA_property_float_set_array(ptr, prop, tmp);
+	}
+	else {
+		float *tmparray;
+
+		tmparray= MEM_callocN(sizeof(float)*len, "RNA_property_float_get_index");
+		RNA_property_float_get_array(ptr, prop, tmparray);
+		tmparray[index]= value;
+		RNA_property_float_set_array(ptr, prop, tmparray);
+		MEM_freeN(tmparray);
+	}
 }
 
 void RNA_property_string_get(PointerRNA *ptr, PropertyRNA *prop, char *value)
@@ -2912,15 +2981,15 @@ ParameterList *RNA_parameter_list_create(ParameterList *parms, PointerRNA *ptr,
 		if(!(parm->flag & PROP_REQUIRED)) {
 			switch(parm->type) {
 				case PROP_BOOLEAN:
-					if(parm->arraylength) memcpy(data, &((BooleanPropertyRNA*)parm)->defaultarray, size);
+					if(parm->arraydimension) memcpy(data, &((BooleanPropertyRNA*)parm)->defaultarray, size);
 					else memcpy(data, &((BooleanPropertyRNA*)parm)->defaultvalue, size);
 					break;
 				case PROP_INT:
-					if(parm->arraylength) memcpy(data, &((IntPropertyRNA*)parm)->defaultarray, size);
+					if(parm->arraydimension) memcpy(data, &((IntPropertyRNA*)parm)->defaultarray, size);
 					else memcpy(data, &((IntPropertyRNA*)parm)->defaultvalue, size);
 					break;
 				case PROP_FLOAT:
-					if(parm->arraylength) memcpy(data, &((FloatPropertyRNA*)parm)->defaultarray, size);
+					if(parm->arraydimension) memcpy(data, &((FloatPropertyRNA*)parm)->defaultarray, size);
 					else memcpy(data, &((FloatPropertyRNA*)parm)->defaultvalue, size);
 					break;
 				case PROP_ENUM:
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 00cfb17dc84..8d05cbde74c 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -1001,18 +1001,18 @@ void RNA_def_property_clear_flag(PropertyRNA *prop, int flag)
 	prop->flag &= ~flag;
 }
 
-void RNA_def_property_array(PropertyRNA *prop, int arraylength)
+void RNA_def_property_array(PropertyRNA *prop, int length)
 {
 	StructRNA *srna= DefRNA.laststruct;
 
-	if(arraylength<0) {
+	if(length<0) {
 		fprintf(stderr, "RNA_def_property_array: %s.%s, array length must be zero of greater.\n", srna->identifier, prop->identifier);
 		DefRNA.error= 1;
 		return;
 	}
 
-	if(arraylength>RNA_MAX_ARRAY) {
-		fprintf(stderr, "RNA_def_property_array: %s.%s, array length must be smaller than %d.\n", srna->identifier, prop->identifier, RNA_MAX_ARRAY);
+	if(length>RNA_MAX_ARRAY_LENGTH) {
+		fprintf(stderr, "RNA_def_property_array: %s.%s, array length must be smaller than %d.\n", srna->identifier, prop->identifier, RNA_MAX_ARRAY_LENGTH);
 		DefRNA.error= 1;
 		return;
 	}
@@ -1021,35 +1021,53 @@ void RNA_def_property_array(PropertyRNA *prop, int arraylength)
 		case PROP_BOOLEAN:
 		case PROP_INT:
 		case PROP_FLOAT:
-			prop->arraylength= arraylength;
+			prop->arraylength[0]= length;
+			prop->totarraylength= length;
+			prop->arraydimension= 1;
 			break;
 		default:
 			fprintf(stderr, "RNA_def_property_array: %s.%s, only boolean/int/float can be array.\n", srna->identifier, prop->identifier);
 			DefRNA.error= 1;
 			break;
 	}
-
-	prop->arraydimension= 1;
 }
 
-void RNA_def_property_multidimensional_array(PropertyRNA *prop, int arraylength, unsigned short dimension, unsigned short dimsize[])
+void RNA_def_property_multi_array(PropertyRNA *prop, int dimension, int length[])
 {
 	StructRNA *srna= DefRNA.laststruct;
+	int i;
 	
 	if (dimension < 1 || dimension > RNA_MAX_ARRAY_DIMENSION) {
-		fprintf(stderr, "RNA_def_property_multidimensional_array: %s.%s, array dimension must be between 1 and %d.\n", srna->identifier, prop->identifier, RNA_MAX_ARRAY_DIMENSION);
+		fprintf(stderr, "RNA_def_property_multi_array: %s.%s, array dimension must be between 1 and %d.\n", srna->identifier, prop->identifier, RNA_MAX_ARRAY_DIMENSION);
 		DefRNA.error= 1;
 		return;
 	}
 
-	RNA_def_property_array(prop, arraylength);
+	switch(prop->type) {
+		case PROP_BOOLEAN:
+		case PROP_INT:
+		case PROP_FLOAT:
+			break;
+		default:
+			fprintf(stderr, "RNA_def_property_multi_array: %s.%s, only boolean/int/float can be array.\n", srna->identifier, prop->identifier);
+			DefRNA.error= 1;
+			break;
+	}
 
 	prop->arraydimension= dimension;
+	prop->totarraylength= 0;
 
-	/* TODO make sure dimsize values are sane  */
+	if(length) {
+		memcpy(prop->arraylength, length, sizeof(int)*dimension);
 
-	if (dimension > 1)
-		memcpy(prop->dimsize, dimsize, sizeof(dimsize[0]) * (dimension - 1));
+		prop->totarraylength= length[0];
+		for(i=1; i<dimension; i++)
+			prop->totarraylength *= length[i];
+	}
+	else
+		memset(prop->arraylength, 0, sizeof(prop->arraylength));
+
+	/* TODO make sure arraylength values are sane  */
 }
 
 void RNA_def_property_ui_text(PropertyRNA *prop, const char *name, const char *description)
@@ -1422,10 +1440,15 @@ static PropertyDefRNA *rna_def_property_sdna(PropertyRNA *prop, const char *stru
 		}
 	}
 
-	if(smember.arraylength > 1)
-		prop->arraylength= smember.arraylength;
-	else
-		prop->arraylength= 0;
+	if(smember.arraylength > 1) {
+		prop->arraylength[0]= smember.arraylength;
+		prop->totarraylength= smember.arraylength;
+		prop->arraydimension= 1;
+	}
+	else {
+		prop->arraydimension= 0;
+		prop->totarraylength= 0;
+	}
 	
 	dp->dnastructname= structname;
 	dp->dnastructfromname= ds->dnafromname;
@@ -1545,8 +1568,10 @@ void RNA_def_property_enum_sdna(PropertyRNA *prop, const char *structname, const
 	}
 
 	if((dp=rna_def_property_sdna(prop, structname, propname))) {
-		if(prop->arraylength) {
-			prop->arraylength= 0;
+		if(prop->arraydimension) {
+			prop->arraydimension= 0;
+			prop->totarraylength= 0;
+
 			if(!DefRNA.silent) {
 				fprintf(stderr, "RNA_def_property_enum_sdna: %s.%s, array not supported for enum type.\n", structname, propname);
 				DefRNA.error= 1;
@@ -1585,9 +1610,10 @@ void RNA_def_property_string_sdna(PropertyRNA *prop, const char *structname, con
 	}
 
 	if((dp=rna_def_property_sdna(prop, structname, propname))) {
-		if(prop->arraylength) {
-			sprop->maxlength= prop->arraylength;
-			prop->arraylength= 0;
+		if(prop->arraydimension) {
+			sprop->maxlength= prop->totarraylength;
+			prop->arraydimension= 0;
+			prop->totarraylength= 0;
 		}
 	}
 }
@@ -1609,8 +1635,10 @@ void RNA_def_property_pointer_sdna(PropertyRNA *prop, const char *structname, co
 	}
 
 	if((dp=rna_def_property_sdna(prop, structname, propname))) {
-		if(prop->arraylength) {
-			prop->arraylength= 0;
+		if(prop->arraydimension) {
+			prop->arraydimension= 0;
+			prop->totarraylength= 0;
+
 			if(!DefRNA.silent) {
 				fprintf(stderr, "RNA_def_property_pointer_sdna: %s.%s, array not supported for pointer type.\n", structname, propname);
 				DefRNA.error= 1;
@@ -1637,8 +1665,9 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
 	}
 
 	if((dp=rna_def_property_sdna(prop, structname, propname))) {
-		if(prop->arraylength && !lengthpropname) {
-			prop->arraylength= 0;
+		if(prop->arraydimension && !lengthpropname) {
+			prop->arraydimension= 0;
+			prop->totarraylength= 0;
 
 			if(!DefRNA.silent) {
 				fprintf(stderr, "RNA_def_property_collection_sdna: %s.%s, array of collections not supported.\n", structname, propname);
@@ -1662,8 +1691,9 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
 
 		if(lengthpropname[0] == 0 || rna_find_sdna_member(DefRNA.sdna, structname, lengthpropname, &smember)) {
 			if(lengthpropname[0] == 0) {
-				dp->dnalengthfixed= prop->arraylength;
-				prop->arraylength= 0;
+				dp->dnalengthfixed= prop->totarraylength;
+				prop->arraydimension= 0;
+				prop->totarraylength= 0;
 			}
 			else {
 				dp->dnalengthstructname= structname;
@@ -1710,7 +1740,7 @@ void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *func)
 	prop->update= (UpdateFunc)func;
 }
 
-void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength, const char *setlength)
+void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength)
 {
 	if(!DefRNA.preprocess) {
 		fprintf(stderr, "RNA_def_property_*_funcs: only during preprocessing.\n");
@@ -1724,7 +1754,6 @@ void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getleng
 	}
 
 	if(getlength) prop->getlength= (PropArrayLengthGetFunc)getlength;
-	if(setlength) prop->setlength= (PropArrayLengthSetFunc)setlength;
 }
 
 void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const char *set)
@@ -1740,7 +1769,7 @@ void RNA_def_property_boolean_funcs(PropertyRNA *prop, const char *get, const ch
 		case PROP_BOOLEAN: {
 			BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 
-			if(prop->arraylength) {
+			if(prop->arraydimension) {
 				if(get) bprop->getarray= (PropBooleanArrayGetFunc)get;
 				if(set) bprop->setarray= (PropBooleanArraySetFunc)set;
 			}
@@ -1770,7 +1799,7 @@ void RNA_def_property_int_funcs(PropertyRNA *prop, const char *get, const char *
 		case PROP_INT: {
 			IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
 
-			if(prop->arraylength) {
+			if(prop->arraydimension) {
 				if(get) iprop->getarray= (PropIntArrayGetFunc)get;
 				if(set) iprop->setarray= (PropIntArraySetFunc)set;
 			}
@@ -1801,7 +1830,7 @@ void RNA_def_property_float_funcs(PropertyRNA *prop, const char *get, const char
 		case PROP_FLOAT: {
 			FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
 
-			if(prop->arraylength) {
+			if(prop->arraydimension) {
 				if(get) fprop->getarray= (PropFloatArrayGetFunc)get;
 				if(set) fprop->setarray= (PropFloatArraySetFunc)set;
 			}
@@ -2152,15 +2181,15 @@ PropertyRNA *RNA_def_float_color(StructOrFunctionRNA *cont_, const char *identif
 }
 
 
-PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont_, const char *identifier, int len, int rowsize, const float *default_value, 
+PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont_, const char *identifier, int rows, int columns, const float *default_value, 
 	float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax)
 {
 	ContainerRNA *cont= cont_;
 	PropertyRNA *prop;
-	unsigned short dimsize[1]= {rowsize};
+	int length[2]= {rows, columns};
 	
 	prop= RNA_def_property(cont, identifier, PROP_FLOAT, PROP_MATRIX);
-	if(len != 0) RNA_def_property_multidimensional_array(prop, len, 2, dimsize);
+	RNA_def_property_multi_array(prop, 2, length);
 	if(default_value) RNA_def_property_float_array_default(prop, default_value);
 	if(hardmin != hardmax) RNA_def_property_range(prop, hardmin, hardmax);
 	RNA_def_property_ui_text(prop, ui_name, ui_description);
@@ -2357,10 +2386,9 @@ void RNA_def_function_ui_description(FunctionRNA *func, const char *description)
 int rna_parameter_size(PropertyRNA *parm)
 {
 	PropertyType ptype= parm->type;
-	int len= parm->arraylength;
+	int len= parm->totarraylength; /* only supports fixed length at the moment */
 
 	if(len > 0) {
-
 		if (parm->flag & PROP_DYNAMIC)
 			return sizeof(void *);
 
@@ -2508,8 +2536,8 @@ void RNA_def_property_duplicate_pointers(PropertyRNA *prop)
 			BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 
 			if(bprop->defaultarray) {
-				iarray= MEM_callocN(sizeof(int)*prop->arraylength, "RNA_def_property_store");
-				memcpy(iarray, bprop->defaultarray, sizeof(int)*prop->arraylength);
+				iarray= MEM_callocN(sizeof(int)*prop->totarraylength, "RNA_def_property_store");
+				memcpy(iarray, bprop->defaultarray, sizeof(int)*prop->totarraylength);
 				bprop->defaultarray= iarray;
 			}
 			break;
@@ -2518,8 +2546,8 @@ void RNA_def_property_duplicate_pointers(PropertyRNA *prop)
 			IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
 
 			if(iprop->defaultarray) {
-				iarray= MEM_callocN(sizeof(int)*prop->arraylength, "RNA_def_property_store");
-				memcpy(iarray, iprop->defaultarray, sizeof(int)*prop->arraylength);
+				iarray= MEM_callocN(sizeof(int)*prop->totarraylength, "RNA_def_property_store");
+				memcpy(iarray, iprop->defaultarray, sizeof(int)*prop->totarraylength);
 				iprop->defaultarray= iarray;
 			}
 			break;
@@ -2544,8 +2572,8 @@ void RNA_def_property_duplicate_pointers(PropertyRNA *prop)
 			FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
 
 			if(fprop->defaultarray) {
-				farray= MEM_callocN(sizeof(float)*prop->arraylength, "RNA_def_property_store");
-				memcpy(farray, fprop->defaultarray, sizeof(float)*prop->arraylength);
+				farray= MEM_callocN(sizeof(float)*prop->totarraylength, "RNA_def_property_store");
+				memcpy(farray, fprop->defaultarray, sizeof(float)*prop->totarraylength);
 				fprop->defaultarray= farray;
 			}
 			break;
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h
index 2bd89dbd3bf..645bc50ed89 100644
--- a/source/blender/makesrna/intern/rna_internal_types.h
+++ b/source/blender/makesrna/intern/rna_internal_types.h
@@ -40,9 +40,9 @@ struct IDProperty;
 struct GHash;
 
 #ifdef UNIT_TEST
-#define RNA_MAX_ARRAY 64
+#define RNA_MAX_ARRAY_LENGTH 64
 #else
-#define RNA_MAX_ARRAY 32
+#define RNA_MAX_ARRAY_LENGTH 32
 #endif
 
 #define RNA_MAX_ARRAY_DIMENSION 3
@@ -55,8 +55,7 @@ typedef struct IDProperty* (*IDPropertiesFunc)(struct PointerRNA *ptr, int creat
 typedef struct StructRNA *(*StructRefineFunc)(struct PointerRNA *ptr);
 typedef char *(*StructPathFunc)(struct PointerRNA *ptr);
 
-typedef int (*PropArrayLengthGetFunc)(struct PointerRNA *ptr);
-typedef int (*PropArrayLengthSetFunc)(struct PointerRNA *ptr, int length);
+typedef int (*PropArrayLengthGetFunc)(struct PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION]);
 typedef int (*PropBooleanGetFunc)(struct PointerRNA *ptr);
 typedef void (*PropBooleanSetFunc)(struct PointerRNA *ptr, int value);
 typedef void (*PropBooleanArrayGetFunc)(struct PointerRNA *ptr, int *values);
@@ -137,15 +136,13 @@ struct PropertyRNA {
 	PropertyType type;
 	/* subtype, 'interpretation' of the property */
 	PropertySubType subtype;
-	/* if an array this is > 0, specifying the length */
-	unsigned int arraylength;
 	/* if non-NULL, overrides arraylength. Must not return 0? */
 	PropArrayLengthGetFunc getlength;
-	/* if NULL, length cannot be changed by a user */
-	PropArrayLengthSetFunc setlength;
-	unsigned short arraydimension;
-	/* dimension sizes for dimensions greater than 1, first dimension size is not specified */
-	unsigned short dimsize[RNA_MAX_ARRAY_DIMENSION - 1];
+	/* dimension of array */
+	unsigned int arraydimension;
+	/* array lengths lengths for all dimensions (when arraydimension > 0) */
+	unsigned int arraylength[RNA_MAX_ARRAY_DIMENSION];
+	unsigned int totarraylength;
 	
 	/* callback for updates on change */
 	UpdateFunc update;
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index efd0046d827..78fb8ede3ee 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -423,14 +423,11 @@ static int rna_CustomDataData_numverts(PointerRNA *ptr, int type)
     return 0;
 }
 
-static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr)
+static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
 {
-    return rna_CustomDataData_numverts(ptr, CD_MTFACE) * 2;
-}
-
-static int rna_MeshTextureFace_uv_set_length(PointerRNA *ptr, int length)
-{
-    return length == rna_MeshTextureFace_uv_get_length(ptr);
+	length[0]= rna_CustomDataData_numverts(ptr, CD_MTFACE);
+	length[1]= 2;
+    return length[0]*length[1];
 }
 
 static void rna_MeshTextureFace_uv_get(PointerRNA *ptr, float *values)
@@ -711,35 +708,22 @@ static void rna_TextureFace_image_set(PointerRNA *ptr, PointerRNA value)
 	tf->tpage= (struct Image*)id;
 }
 
-static int rna_MeshFace_verts_get_length(PointerRNA *ptr)
+static int rna_MeshFace_verts_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
 {
 	MFace *face= (MFace*)ptr->data;
-	if(face)
-		return face->v4 ? 4 : 3;
-	else
-		return 4; // XXX rna_raw_access wants the length of a dummy face. this needs fixing. - Campbell
-}
 
-static int rna_MeshFace_verts_set_length(PointerRNA *ptr, int length)
-{
-	MFace *face= (MFace*)ptr->data;
-	if (length == 3) {
-		face->v4= 0;
-	}
-	else if(length == 4) {
-		face->v4= 1;
-	}
+	if(face)
+		length[0]= (face->v4)? 4: 3;
 	else
-		return 0;
-	
-	return 1;
+		length[0]= 4; // XXX rna_raw_access wants the length of a dummy face. this needs fixing. - Campbell
+
+	return length[0];
 }
 
 static void rna_MeshFace_verts_get(PointerRNA *ptr, int *values)
 {
 	MFace *face= (MFace*)ptr->data;
-	int verts[4] = {face->v1, face->v2, face->v3, face->v4};
-	memcpy(values, verts, (face->v4 ? 4 : 3) * sizeof(int));
+	memcpy(values, &face->v1, (face->v4 ? 4 : 3) * sizeof(int));
 }
 
 static void rna_MeshFace_verts_set(PointerRNA *ptr, const int *values)
@@ -982,19 +966,11 @@ static void rna_def_mface(BlenderRNA *brna)
 	RNA_def_struct_path_func(srna, "rna_MeshFace_path");
 	RNA_def_struct_ui_icon(srna, ICON_FACESEL);
 
-	/*
-	// XXX allows creating invalid meshes
-	prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
-	RNA_def_property_int_sdna(prop, NULL, "v1");
-	RNA_def_property_array(prop, 4);
-	RNA_def_property_ui_text(prop, "Vertices", "Vertex indices");
-	*/
-
 	// XXX allows creating invalid meshes
 	prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_flag(prop, PROP_DYNAMIC);
-	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshFace_verts_get_length", "rna_MeshFace_verts_set_length");
+	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshFace_verts_get_length");
 	RNA_def_property_int_funcs(prop, "rna_MeshFace_verts_get", "rna_MeshFace_verts_set", NULL);
 	RNA_def_property_ui_text(prop, "Vertices", "Vertex indices");
 
@@ -1037,7 +1013,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 		{TF_ALPHA, "ALPHA", 0, "Alpha", "Render polygon transparent, depending on alpha channel of the texture"},
 		{TF_CLIP, "CLIPALPHA", 0, "Clip Alpha", "Use the images alpha values clipped with no blending (binary alpha)"},
 		{0, NULL, 0, NULL, NULL}};
-	unsigned short uv_dim[1]= {2};
+	int uv_dim[]= {4, 2};
 
 	srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL);
 	RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock.");
@@ -1183,9 +1159,9 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
 	prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_multidimensional_array(prop, 4 * 2, 2, uv_dim);
+	RNA_def_property_multi_array(prop, 2, uv_dim);
 	RNA_def_property_flag(prop, PROP_DYNAMIC);
-	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length", "rna_MeshTextureFace_uv_set_length");
+	RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length");
 	RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv_get", "rna_MeshTextureFace_uv_set", NULL);
 	RNA_def_property_ui_text(prop, "UV", "");
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index ce65ef4d450..3d43dfdfc2c 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1046,7 +1046,7 @@ static void rna_def_object(BlenderRNA *brna)
 		{OB_DUPLIGROUP, "GROUP", 0, "Group", "Enable group instancing."},
 		{0, NULL, 0, NULL, NULL}};
 
-	unsigned short matrix_dimsize[]= {4};
+	int matrix_dimsize[]= {4, 4};
 
 	srna= RNA_def_struct(brna, "Object", "ID");
 	RNA_def_struct_ui_text(srna, "Object", "Object datablock defining an object in a scene..");
@@ -1210,7 +1210,7 @@ static void rna_def_object(BlenderRNA *brna)
 	/* matrix */
 	prop= RNA_def_property(srna, "matrix", PROP_FLOAT, PROP_MATRIX);
 	RNA_def_property_float_sdna(prop, NULL, "obmat");
-	RNA_def_property_multidimensional_array(prop, 16, 2, matrix_dimsize);
+	RNA_def_property_multi_array(prop, 2, matrix_dimsize);
 	RNA_def_property_ui_text(prop, "Matrix", "Transformation matrix.");
 
 	/* collections */
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 9137e596da1..a67831715a2 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -170,40 +170,51 @@ static void rna_RenderLayer_passes_begin(CollectionPropertyIterator *iter, Point
 	rna_iterator_listbase_begin(iter, &rl->passes, NULL);
 }
 
-static float rna_RenderValue_value_get(PointerRNA *ptr)
-{
-	return *(float*)ptr->data;
-}
-
-static void rna_RenderValue_value_set(PointerRNA *ptr, float value)
-{
-	*(float*)ptr->data= value;
-}
-
-static void rna_RenderLayer_rect_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+static int rna_RenderLayer_rect_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
 {
 	RenderLayer *rl= (RenderLayer*)ptr->data;
-	rna_iterator_array_begin(iter, (void*)rl->rectf, sizeof(float), rl->rectx*rl->recty*4, 0, NULL);
+
+	length[0]= rl->rectx*rl->recty;
+	length[1]= 4;
+
+	return length[0]*length[1];
 }
 
-static int rna_RenderLayer_rect_length(PointerRNA *ptr)
+static void rna_RenderLayer_rect_get(PointerRNA *ptr, float *values)
 {
 	RenderLayer *rl= (RenderLayer*)ptr->data;
-	return rl->rectx*rl->recty*4;
+	memcpy(values, rl->rectf, sizeof(float)*rl->rectx*rl->recty*4);
 }
 
-static void rna_RenderPass_rect_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+static void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values)
+{
+	RenderLayer *rl= (RenderLayer*)ptr->data;
+	memcpy(rl->rectf, values, sizeof(float)*rl->rectx*rl->recty*4);
+}
+
+static int rna_RenderPass_rect_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
 {
 	RenderPass *rpass= (RenderPass*)ptr->data;
-	rna_iterator_array_begin(iter, (void*)rpass->rect, sizeof(float), rpass->rectx*rpass->recty*rpass->channels, 0, NULL);
+
+	length[0]= rpass->rectx*rpass->recty;
+	length[1]= rpass->channels;
+
+	return length[0]*length[1];
 }
 
-static int rna_RenderPass_rect_length(PointerRNA *ptr)
+static void rna_RenderPass_rect_get(PointerRNA *ptr, float *values)
 {
 	RenderPass *rpass= (RenderPass*)ptr->data;
-	return rpass->rectx*rpass->recty*rpass->channels;
+	printf("rect get\n");
+	memcpy(values, rpass->rect, sizeof(float)*rpass->rectx*rpass->recty*rpass->channels);
 }
 
+static void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values)
+{
+	RenderPass *rpass= (RenderPass*)ptr->data;
+	printf("rect set\n");
+	memcpy(rpass->rect, values, sizeof(float)*rpass->rectx*rpass->recty*rpass->channels);
+}
 
 #else // RNA_RUNTIME
 
@@ -324,16 +335,11 @@ static void rna_def_render_layer(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "RenderPass");
 	RNA_def_property_collection_funcs(prop, "rna_RenderLayer_passes_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0, 0);
 
-	prop= RNA_def_property(srna, "rect", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_struct_type(prop, "RenderValue");
-	RNA_def_property_collection_funcs(prop, "rna_RenderLayer_rect_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_RenderLayer_rect_length", 0, 0, 0, 0);
-
-	/* value */
-	srna= RNA_def_struct(brna, "RenderValue", NULL);
-	RNA_def_struct_ui_text(srna, "Render Value", "");
-
-	prop= RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_funcs(prop, "rna_RenderValue_value_get", "rna_RenderValue_value_set", NULL);
+	prop= RNA_def_property(srna, "rect", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_multi_array(prop, 2, NULL);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_RenderLayer_rect_get_length");
+	RNA_def_property_float_funcs(prop, "rna_RenderLayer_rect_get", "rna_RenderLayer_rect_set", NULL);
 
 	RNA_define_verify_sdna(1);
 }
@@ -383,9 +389,11 @@ static void rna_def_render_pass(BlenderRNA *brna)
 	RNA_def_property_enum_items(prop, pass_type_items);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
-	prop= RNA_def_property(srna, "rect", PROP_COLLECTION, PROP_NONE);
-	RNA_def_property_struct_type(prop, "RenderValue");
-	RNA_def_property_collection_funcs(prop, "rna_RenderPass_rect_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_RenderPass_rect_length", 0, 0, 0, 0);
+	prop= RNA_def_property(srna, "rect", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_multi_array(prop, 2, NULL);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_RenderPass_rect_get_length");
+	RNA_def_property_float_funcs(prop, "rna_RenderPass_rect_get", "rna_RenderPass_rect_set", NULL);
 
 	RNA_define_verify_sdna(1);
 }
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index b1644405ff3..8df6398f1f4 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -430,7 +430,7 @@ static int rna_Property_array_length_get(PointerRNA *ptr)
 {
 	PropertyRNA *prop= (PropertyRNA*)ptr->data;
 	rna_idproperty_check(&prop, ptr);
-	return prop->arraylength;
+	return prop->totarraylength;
 }
 
 static int rna_Property_registered_get(PointerRNA *ptr)
diff --git a/source/blender/python/intern/bpy_array.c b/source/blender/python/intern/bpy_array.c
index 9db4b20d011..f11c95e7ed5 100644
--- a/source/blender/python/intern/bpy_array.c
+++ b/source/blender/python/intern/bpy_array.c
@@ -36,9 +36,6 @@
 
 #define MAX_ARRAY_DIMENSION 10
 
-/* convenient way to access array dimension size */
-#define DIMSIZE(a) (dimsize[a - 1])
-
 typedef void (*ItemConvertFunc)(PyObject *, char *);
 typedef int  (*ItemTypeCheckFunc)(PyObject *);
 typedef void (*RNA_SetArrayFunc)(PointerRNA *, PropertyRNA *, const char *);
@@ -59,7 +56,7 @@ typedef void (*RNA_SetIndexFunc)(PointerRNA *, PropertyRNA *, int index, void *)
 
 /* arr[3]=x, self->arraydim is 0, lvalue_dim is 1 */
 /* Ensures that a python sequence has expected number of items/sub-items and items are of desired type. */
-static int validate_array_type(PyObject *seq, unsigned short dim, unsigned short totdim, unsigned short dimsize[],
+static int validate_array_type(PyObject *seq, int dim, int totdim, int dimsize[],
 							   ItemTypeCheckFunc check_item_type, const char *item_type_str, const char *error_prefix)
 {
 	int i;
@@ -79,13 +76,13 @@ static int validate_array_type(PyObject *seq, unsigned short dim, unsigned short
 				ok= 0;
 			}
 			/* arr[3][4][5]
-			   DIMSIZE(1)=4
-			   DIMSIZE(2)=5
+			   dimsize[1]=4
+			   dimsize[2]=5
 		   
 			   dim=0 */
-			else if (PySequence_Length(item) != DIMSIZE(dim + 1)) {
-				/* BLI_snprintf(error_str, error_str_size, "sequences of dimension %d should contain %d items", (int)dim + 1, (int)DIMSIZE(dim + 1)); */
-				PyErr_Format(PyExc_ValueError, "%s sequences of dimension %d should contain %d items", error_prefix, (int)dim + 1, (int)DIMSIZE(dim + 1));
+			else if (PySequence_Length(item) != dimsize[dim + 1]) {
+				/* BLI_snprintf(error_str, error_str_size, "sequences of dimension %d should contain %d items", (int)dim + 1, (int)dimsize[dim + 1]); */
+				PyErr_Format(PyExc_ValueError, "%s sequences of dimension %d should contain %d items", error_prefix, (int)dim + 1, (int)dimsize[dim + 1]);
 				ok= 0;
 			}
 			else if (!validate_array_type(item, dim + 1, totdim, dimsize, check_item_type, item_type_str, error_prefix)) {
@@ -140,23 +137,28 @@ static int count_items(PyObject *seq)
 /* Modifies property array length if needed and PROP_DYNAMIC flag is set. */
 static int validate_array_length(PyObject *rvalue, PointerRNA *ptr, PropertyRNA *prop, int lvalue_dim, int *totitem, const char *error_prefix)
 {
-	unsigned short dimsize[MAX_ARRAY_DIMENSION];
+	int dimsize[MAX_ARRAY_DIMENSION];
 	int tot, totdim, len;
 
 	tot= count_items(rvalue);
-	totdim= RNA_property_array_dimension(prop, dimsize);
+	totdim= RNA_property_array_dimension(ptr, prop, dimsize);
 
 	if ((RNA_property_flag(prop) & PROP_DYNAMIC) && lvalue_dim == 0) {
-		/* length is flexible */
 		if (RNA_property_array_length(ptr, prop) != tot) {
+#if 0
+			/* length is flexible */
 			if (!RNA_property_dynamic_array_set_length(ptr, prop, tot)) {
 				/* BLI_snprintf(error_str, error_str_size, "%s.%s: array length cannot be changed to %d", RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), tot); */
 				PyErr_Format(PyExc_ValueError, "%s %s.%s: array length cannot be changed to %d", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), tot);
 				return 0;
 			}
-
-			len= tot;
+#else
+			PyErr_Format(PyExc_ValueError, "%s %s.%s: array length cannot be changed to %d", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), tot);
+			return 0;
+#endif
 		}
+
+		len= tot;
 	}
 	else {
 		/* length is a constraint */
@@ -173,8 +175,8 @@ static int validate_array_length(PyObject *rvalue, PointerRNA *ptr, PropertyRNA
 
 			   arr[2] = x
 			   dimsize={4, 5}
-			   DIMSIZE(1) = 4
-			   DIMSIZE(2) = 5
+			   dimsize[1] = 4
+			   dimsize[2] = 5
 			   lvalue_dim=0, totdim=3
 
 			   arr[2][3] = x
@@ -183,7 +185,7 @@ static int validate_array_length(PyObject *rvalue, PointerRNA *ptr, PropertyRNA
 			   arr[2][3][4] = x
 			   lvalue_dim=2 */
 			for (i= lvalue_dim; i < totdim; i++)
-				len *= DIMSIZE(i);
+				len *= dimsize[i];
 		}
 
 		if (tot != len) {
@@ -200,8 +202,8 @@ static int validate_array_length(PyObject *rvalue, PointerRNA *ptr, PropertyRNA
 
 static int validate_array(PyObject *rvalue, PointerRNA *ptr, PropertyRNA *prop, int lvalue_dim, ItemTypeCheckFunc check_item_type, const char *item_type_str, int *totitem, const char *error_prefix)
 {
-	unsigned short dimsize[MAX_ARRAY_DIMENSION];
-	int totdim= RNA_property_array_dimension(prop, dimsize);
+	int dimsize[MAX_ARRAY_DIMENSION];
+	int totdim= RNA_property_array_dimension(ptr, prop, dimsize);
 
 	/* validate type first because length validation may modify property array length */
 
@@ -211,10 +213,10 @@ static int validate_array(PyObject *rvalue, PointerRNA *ptr, PropertyRNA *prop,
 	return validate_array_length(rvalue, ptr, prop, lvalue_dim, totitem, error_prefix);
 }
 
-static char *copy_values(PyObject *seq, PointerRNA *ptr, PropertyRNA *prop, unsigned short dim, char *data, unsigned int item_size, int *index, ItemConvertFunc convert_item, RNA_SetIndexFunc rna_set_index)
+static char *copy_values(PyObject *seq, PointerRNA *ptr, PropertyRNA *prop, int dim, char *data, unsigned int item_size, int *index, ItemConvertFunc convert_item, RNA_SetIndexFunc rna_set_index)
 {
 	unsigned int i;
-	int totdim= RNA_property_array_dimension(prop, NULL);
+	int totdim= RNA_property_array_dimension(ptr, prop, NULL);
 
 	for (i= 0; i < PySequence_Length(seq); i++) {
 		PyObject *item= PySequence_GetItem(seq, i);
@@ -244,14 +246,15 @@ static char *copy_values(PyObject *seq, PointerRNA *ptr, PropertyRNA *prop, unsi
 
 static int py_to_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *param_data, ItemTypeCheckFunc check_item_type, const char *item_type_str, int item_size, ItemConvertFunc convert_item, RNA_SetArrayFunc rna_set_array, const char *error_prefix)
 {
-	unsigned short totdim, dim_size[MAX_ARRAY_DIMENSION];
+	int totdim, dim_size[MAX_ARRAY_DIMENSION];
 	int totitem;
 	char *data= NULL;
 
-	totdim= RNA_property_array_dimension(prop, dim_size);
+	totdim= RNA_property_array_dimension(ptr, prop, dim_size);
 
-	if (!validate_array(py, ptr, prop, 0, check_item_type, item_type_str, &totitem, error_prefix))
+	if (!validate_array(py, ptr, prop, 0, check_item_type, item_type_str, &totitem, error_prefix)) {
 		return 0;
+	}
 
 	if (totitem) {
 		if (!param_data || RNA_property_flag(prop) & PROP_DYNAMIC)
@@ -279,10 +282,10 @@ static int py_to_array(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, char *p
 
 static int py_to_array_index(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, int lvalue_dim, int arrayoffset, int index, ItemTypeCheckFunc check_item_type, const char *item_type_str, ItemConvertFunc convert_item, RNA_SetIndexFunc rna_set_index, const char *error_prefix)
 {
-	unsigned short totdim, dimsize[MAX_ARRAY_DIMENSION];
+	int totdim, dimsize[MAX_ARRAY_DIMENSION];
 	int totitem, i;
 
-	totdim= RNA_property_array_dimension(prop, dimsize);
+	totdim= RNA_property_array_dimension(ptr, prop, dimsize);
 
 	/* convert index */
 
@@ -297,7 +300,7 @@ static int py_to_array_index(PyObject *py, PointerRNA *ptr, PropertyRNA *prop, i
 	lvalue_dim++;
 
 	for (i= lvalue_dim; i < totdim; i++)
-		index *= DIMSIZE(i);
+		index *= dimsize[i];
 
 	index += arrayoffset;
 
@@ -428,9 +431,9 @@ static PyObject *pyrna_py_from_array_internal(PointerRNA *ptr, PropertyRNA *prop
 {
 	PyObject *tuple;
 	int i, len;
-	int totdim= RNA_property_array_dimension(prop, NULL);
+	int totdim= RNA_property_array_dimension(ptr, prop, NULL);
 
-	len= RNA_property_multidimensional_array_length(ptr, prop, dim);
+	len= RNA_property_multi_array_length(ptr, prop, dim);
 
 	tuple= PyTuple_New(len);
 
@@ -459,11 +462,11 @@ static PyObject *pyrna_py_from_array_internal(PointerRNA *ptr, PropertyRNA *prop
 PyObject *pyrna_py_from_array_index(BPy_PropertyRNA *self, int index)
 {
 	int totdim, i, len;
-	unsigned short dimsize[MAX_ARRAY_DIMENSION];
+	int dimsize[MAX_ARRAY_DIMENSION];
 	BPy_PropertyRNA *ret= NULL;
 
 	/* just in case check */
-	len= RNA_property_multidimensional_array_length(&self->ptr, self->prop, self->arraydim);
+	len= RNA_property_multi_array_length(&self->ptr, self->prop, self->arraydim);
 	if (index >= len || index < 0) {
 		/* this shouldn't happen because higher level funcs must check for invalid index */
 		if (G.f & G_DEBUG) printf("pyrna_py_from_array_index: invalid index %d for array with length=%d\n", index, len);
@@ -472,7 +475,7 @@ PyObject *pyrna_py_from_array_index(BPy_PropertyRNA *self, int index)
 		return NULL;
 	}
 
-	totdim= RNA_property_array_dimension(self->prop, dimsize);
+	totdim= RNA_property_array_dimension(&self->ptr, self->prop, dimsize);
 
 	if (self->arraydim + 1 < totdim) {
 		ret= (BPy_PropertyRNA*)pyrna_prop_CreatePyObject(&self->ptr, self->prop);
@@ -487,7 +490,7 @@ PyObject *pyrna_py_from_array_index(BPy_PropertyRNA *self, int index)
 		   index = offset + 3 * 5 */
 
 		for (i= self->arraydim + 1; i < totdim; i++)
-			index *= DIMSIZE(i);
+			index *= dimsize[i];
 
 		ret->arrayoffset= self->arrayoffset + index;
 	}
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index f2ffd5e0358..dd6bc35fc0a 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -141,7 +141,7 @@ PyObject *pyrna_math_object_from_array(PointerRNA *ptr, PropertyRNA *prop)
 	len= RNA_property_array_length(ptr, prop);
 	type= RNA_property_type(prop);
 	subtype= RNA_property_subtype(prop);
-	totdim= RNA_property_array_dimension(prop, NULL);
+	totdim= RNA_property_array_dimension(ptr, prop, NULL);
 
 	if (type != PROP_FLOAT) return NULL;
 
@@ -748,7 +748,7 @@ static int pyrna_py_to_prop_index(BPy_PropertyRNA *self, int index, PyObject *va
 	PropertyRNA *prop= self->prop;
 	int type = RNA_property_type(prop);
 
-	totdim= RNA_property_array_dimension(prop, NULL);
+	totdim= RNA_property_array_dimension(ptr, prop, NULL);
 
 	if (totdim > 1) {
 		/* char error_str[512]; */
@@ -807,8 +807,8 @@ static int pyrna_py_to_prop_index(BPy_PropertyRNA *self, int index, PyObject *va
 //---------------sequence-------------------------------------------
 static int pyrna_prop_array_length(BPy_PropertyRNA *self)
 {
-	if (RNA_property_array_dimension(self->prop, NULL) > 1)
-		return RNA_property_multidimensional_array_length(&self->ptr, self->prop, self->arraydim);
+	if (RNA_property_array_dimension(&self->ptr, self->prop, NULL) > 1)
+		return RNA_property_multi_array_length(&self->ptr, self->prop, self->arraydim);
 	else
 		return RNA_property_array_length(&self->ptr, self->prop);
 }

From ceaae73d5ee108728af65669193f595e7c14f10c Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 19:42:53 +0000
Subject: [PATCH 497/577] 2.5: fix compilation of smoke commit for Makesfiles
 as well.

---
 source/blender/gpu/intern/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/gpu/intern/Makefile b/source/blender/gpu/intern/Makefile
index 3a3ac20ff6c..2637bff44ac 100644
--- a/source/blender/gpu/intern/Makefile
+++ b/source/blender/gpu/intern/Makefile
@@ -47,6 +47,7 @@ CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../makesdna
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I$(NAN_SMOKE)/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I../

From a3a414a63103be1d9886a53ce70ba2b5ddd7f564 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Wed, 9 Sep 2009 19:43:05 +0000
Subject: [PATCH 498/577] Keyboard shortcuts

Made Mac-specific keys only appear on the Mac. This has the added benefit that it shows the Mac key shortcuts in menus.
---
 source/blender/editors/screen/screen_ops.c    | 17 ++++++---
 .../editors/space_console/space_console.c     | 13 ++++---
 .../blender/editors/space_text/space_text.c   | 35 ++++++++++---------
 source/blender/makesrna/intern/rna_wm.c       |  8 ++---
 .../windowmanager/intern/wm_operators.c       | 26 ++++++++------
 5 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 5403317042f..75da8f5fe06 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3327,8 +3327,11 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_foursplit", SKEY, KM_PRESS, KM_CTRL|KM_ALT|KM_SHIFT, 0);
 	
 	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
+	#ifdef __APPLE__
+	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);
+	#endif
 	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);
 	
@@ -3340,10 +3343,13 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "FILE_OT_cancel", ESCKEY, KM_PRESS, 0, 0);
 	
 	/* undo */
-	WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_CTRL, 0);
+	#ifdef __APPLE__
 	WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	#endif
+	WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	
 						  
 	/* render */
 	WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
@@ -3352,8 +3358,11 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY, KM_PRESS, 0, 0);
 	
 	/* user prefs */
-	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_CTRL, 0);
+	#ifdef __APPLE__
 	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_OSKEY, 0);
+	#endif
+	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_CTRL, 0);
+	
 	
 	/* Anim Playback ------------------------------------------------ */
 	keymap= WM_keymap_listbase(wm, "Frames", 0, 0);
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index 7e0dfe94432..dfaaa269970 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -233,14 +233,13 @@ void console_keymap(struct wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Console", SPACE_CONSOLE, 0);
 	
-	/*
+	#ifdef __APPLE__
 	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", LEFTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
-	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", ENDKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_END);
-	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
-	
-	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", EKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_END);
-	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", EKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "type", LINE_END);
-	*/
+	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_END);
+	#endif
+
+	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_END);
 	
 	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", HOMEKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", ENDKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_END);
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index 1e37c2d6cb7..1f919fc9cd7 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -210,34 +210,38 @@ static void text_keymap(struct wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Text", SPACE_TEXT, 0);
 	
+	#ifdef __APPLE__
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+	WM_keymap_add_item(keymap, "TEXT_OT_save", SKEY, KM_PRESS, KM_ALT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_save_as", SKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0); 
+	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_OSKEY, 0);
+	#endif
+	
 	WM_keymap_add_item(keymap, "TEXT_OT_new", NKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_open", OKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_reload", RKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_save", SKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_save", SKEY, KM_PRESS, KM_ALT|KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_save_as", SKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_save_as", SKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_OSKEY, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_run_script", PKEY, KM_PRESS, KM_ALT, 0);
-
-
+	
 	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
-	WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
-	WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
-	WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_ALT, 0);
 
 	if(U.uiflag & USER_MMB_PASTE) // XXX not dynamic
 		RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_paste", MIDDLEMOUSE, KM_PRESS, 0, 0)->ptr, "selection", 1);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_jump", JKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	
 	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_CTRL, 0);
@@ -246,17 +250,16 @@ static void text_keymap(struct wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "TEXT_OT_to_3d_object", MKEY, KM_PRESS, KM_ALT, 0);
 
 	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
+	
 
 	WM_keymap_add_item(keymap, "TEXT_OT_indent", TABKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_unindent", TABKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_uncomment", DKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", HOMEKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_BEGIN);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
+	
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", ENDKEY, KM_PRESS, 0, 0)->ptr, "type", LINE_END);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", EKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_END);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", EKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "type", LINE_END);
@@ -272,8 +275,6 @@ static void text_keymap(struct wmWindowManager *wm)
 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", HOMEKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_BEGIN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", ENDKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_END);
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
-	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception 
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_CHAR);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_CHAR);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", PREV_WORD);
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 148af2c28e9..af3ac4a0a82 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -377,22 +377,22 @@ static void rna_def_event(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "shift", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shift", 1);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Shift", "True when the shift key is held.");
+	RNA_def_property_ui_text(prop, "Shift", "True when the Shift key is held.");
 	
 	prop= RNA_def_property(srna, "ctrl", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "ctrl", 1);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Ctrl", "True when the shift key is held.");
+	RNA_def_property_ui_text(prop, "Ctrl", "True when the Ctrl key is held.");
 	
 	prop= RNA_def_property(srna, "alt", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "alt", 1);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Alt", "True when the shift key is held.");
+	RNA_def_property_ui_text(prop, "Alt", "True when the Alt/Option key is held.");
 	
 	prop= RNA_def_property(srna, "oskey", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "oskey", 1);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "OS Key", "True when the shift key is held.");
+	RNA_def_property_ui_text(prop, "OS Key", "True when the Cmd key is held.");
 }
 
 static void rna_def_window(BlenderRNA *brna)
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 7152d5bcfa2..0913d58258f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -531,7 +531,7 @@ int WM_operator_winactive(bContext *C)
 }
 
 /* op->invoke */
-static void redo_cb(bContext *C, void *arg_op, int event)
+static void redo_cb(bContext *C, void *arg_op, void *arg2)
 {
 	wmOperator *lastop= arg_op;
 	
@@ -553,7 +553,7 @@ static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op)
 	block= uiBeginBlock(C, ar, "redo_popup", UI_EMBOSS);
 	uiBlockClearFlag(block, UI_BLOCK_LOOP);
 	uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN|UI_BLOCK_RET_1);
-	uiBlockSetHandleFunc(block, redo_cb, arg_op);
+	uiBlockSetFunc(block, redo_cb, arg_op, NULL);
 
 	if(!op->properties) {
 		IDPropertyTemplate val = {0};
@@ -803,7 +803,7 @@ static int recentfile_exec(bContext *C, wmOperator *op)
 			WM_read_file(C, G.sce, op->reports);
 		}
 		else {
-			struct RecentFile *recent = BLI_findlink(&(G.recent_files), event-1);
+			struct RecentFile *recent = BLI_findlink(&(G.recent_files), event-2);
 			if(recent) {
 				WM_event_add_notifier(C, NC_WINDOW, NULL);
 				WM_read_file(C, recent->filename, op->reports);
@@ -831,11 +831,11 @@ static EnumPropertyItem *open_recentfile_itemf(bContext *C, PointerRNA *ptr, int
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
 	EnumPropertyItem *item= NULL;
 	struct RecentFile *recent;
-	int totitem= 0, i;
+	int totitem= 0, i, ofs= 0;
 
 	/* dynamically construct enum */
 	for(recent = G.recent_files.first, i=0; (i<U.recent_files) && (recent); recent = recent->next, i++) {
-		tmp.value= i+1;
+		tmp.value= i+ofs+1;
 		tmp.identifier= recent->filename;
 		tmp.name= recent->filename;
 		RNA_enum_item_add(&item, &totitem, &tmp);
@@ -1918,19 +1918,23 @@ void wm_window_keymap(wmWindowManager *wm)
 	
 	/* note, this doesn't replace existing keymap items */
 	WM_keymap_verify_item(keymap, "WM_OT_window_duplicate", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+	#ifdef __APPLE__
+	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_OSKEY, 0);
+	#endif
 	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0); 
 	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception 
 	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);//Mac Exception 
+
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
 
 	/* debug/testing */
 	WM_keymap_verify_item(keymap, "WM_OT_ten_timer", TKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);

From b1bbfda8a55ca5cf41319ca8a65993cd154fab01 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 19:43:42 +0000
Subject: [PATCH 499/577] 2.5: small text tweak for empty object buttons.

---
 release/ui/buttons_data_empty.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/ui/buttons_data_empty.py b/release/ui/buttons_data_empty.py
index 98c9b88e9f5..c07f3136fae 100644
--- a/release/ui/buttons_data_empty.py
+++ b/release/ui/buttons_data_empty.py
@@ -17,7 +17,7 @@ class DATA_PT_empty(DataButtonsPanel):
 		
 		ob = context.object
 
-		layout.itemR(ob, "empty_draw_type")
-		layout.itemR(ob, "empty_draw_size")
+		layout.itemR(ob, "empty_draw_type", text="Draw Type")
+		layout.itemR(ob, "empty_draw_size", text="Draw Size")
 		
 bpy.types.register(DATA_PT_empty)

From 2fabd68deb4840ac2112f467d2eaa7efa95fd9da Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Wed, 9 Sep 2009 19:52:10 +0000
Subject: [PATCH 500/577] * Small code cleanup.

---
 release/ui/buttons_physics_smoke.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index 83c1ffc2e9a..8d86a6ef2d6 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -90,10 +90,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 	
 	def poll(self, context):
 		md = context.smoke
-		if md:
-				return (md.smoke_type == 'TYPE_DOMAIN')
-		
-		return False
+		return md and (md.smoke_type == 'TYPE_DOMAIN')
 
 	def draw(self, context):
 		layout = self.layout

From 25f4fe5d13c76fa8604931f4f61044c26cc29795 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 9 Sep 2009 19:59:52 +0000
Subject: [PATCH 501/577] RNA: fix for last commit, 0 size arrays are not very
 useful..

---
 source/blender/makesrna/intern/makesrna.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index a3c4af26478..d0c7824dc9d 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1679,7 +1679,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 				unsigned int i;
 
-				if(prop->arraydimension) {
+				if(prop->arraydimension && prop->totarraylength) {
 					fprintf(f, "static int rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->totarraylength);
 
 					for(i=0; i<prop->totarraylength; i++) {
@@ -1699,7 +1699,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
 				unsigned int i;
 
-				if(prop->arraydimension) {
+				if(prop->arraydimension && prop->totarraylength) {
 					fprintf(f, "static int rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->totarraylength);
 
 					for(i=0; i<prop->totarraylength; i++) {
@@ -1719,7 +1719,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop;
 				unsigned int i;
 
-				if(prop->arraydimension) {
+				if(prop->arraydimension && prop->totarraylength) {
 					fprintf(f, "static float rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier, prop->totarraylength);
 
 					for(i=0; i<prop->totarraylength; i++) {
@@ -1762,7 +1762,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 			case PROP_BOOLEAN: {
 				BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
 				fprintf(f, "\t%s, %s, %s, %s, %d, ", rna_function_string(bprop->get), rna_function_string(bprop->set), rna_function_string(bprop->getarray), rna_function_string(bprop->setarray), bprop->defaultvalue);
-				if(prop->arraydimension) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+				if(prop->arraydimension && prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
 				else fprintf(f, "NULL\n");
 				break;
 			}
@@ -1775,7 +1775,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				rna_int_print(f, iprop->hardmax); fprintf(f, ", ");
 				rna_int_print(f, iprop->step); fprintf(f, ", ");
 				rna_int_print(f, iprop->defaultvalue); fprintf(f, ", ");
-				if(prop->arraydimension) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+				if(prop->arraydimension && prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
 				else fprintf(f, "NULL\n");
 				break;
 			 }
@@ -1789,7 +1789,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
 				rna_float_print(f, fprop->step); fprintf(f, ", ");
 				rna_int_print(f, (int)fprop->precision); fprintf(f, ", ");
 				rna_float_print(f, fprop->defaultvalue); fprintf(f, ", ");
-				if(prop->arraydimension) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+				if(prop->arraydimension && prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
 				else fprintf(f, "NULL\n");
 				break;
 			 }

From 434af76286152c001d9df0d6da8048fb6da85696 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 9 Sep 2009 20:56:49 +0000
Subject: [PATCH 502/577] support for external images, blacklisting slaves on
 errors and proper job termination on cancel

---
 release/io/netrender/client.py | 18 ++++++++++--
 release/io/netrender/master.py | 54 ++++++++++++++++++++--------------
 release/io/netrender/slave.py  |  3 ++
 3 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
index da27a8ecc57..0c60bd1603c 100644
--- a/release/io/netrender/client.py
+++ b/release/io/netrender/client.py
@@ -26,6 +26,9 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 	if job_name == "[default]":
 		job_name = name
 	
+	###########################
+	# LIBRARIES
+	###########################
 	for lib in bpy.data.libraries:
 		lib_path = lib.filename
 		
@@ -34,11 +37,13 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 			
 		job.addFile(lib_path)
 	
+	###########################
+	# POINT CACHES
+	###########################
+	
 	root, ext = os.path.splitext(name)
 	cache_path = path + os.sep + "blendcache_" + root + os.sep # need an API call for that
 	
-	print("cache:", cache_path)
-	
 	if os.path.exists(cache_path):
 		caches = {}
 		pattern = re.compile("([a-zA-Z0-9]+)_([0-9]+)_[0-9]+\.bphys")
@@ -80,7 +85,14 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 						previous_frame = previous_item[0]
 						job.addFile(cache_path + current_file, previous_frame + 1, next_frame - 1)
 		
-	print(job.files)
+	###########################
+	# IMAGES
+	###########################
+	for image in bpy.data.images:
+		if image.source == "FILE" and not image.packed_file:
+			job.addFile(image.filename)
+	
+	# print(job.files)
 	
 	job.name = job_name
 	
diff --git a/release/io/netrender/master.py b/release/io/netrender/master.py
index d938c59a2ec..78e9243bc9d 100644
--- a/release/io/netrender/master.py
+++ b/release/io/netrender/master.py
@@ -477,33 +477,43 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
 			print("writing result file")
 			self.server.stats("", "Receiving render result")
 			
-			job_id = self.headers['job-id']
+			slave_id = self.headers['slave-id']
 			
-			job = self.server.getJobByID(job_id)
+			slave = self.server.updateSlave(slave_id)
 			
-			if job:
-				job_frame = int(self.headers['job-frame'])
-				job_result = int(self.headers['job-result'])
-				job_time = float(self.headers['job-time'])
+			if slave: # only if slave id is valid
+				job_id = self.headers['job-id']
 				
-				if job_result == DONE:
-					length = int(self.headers['content-length'])
-					buf = self.rfile.read(length)
-					f = open(job.save_path + "%04d" % job_frame + ".exr", 'wb')
-					f.write(buf)
-					f.close()
-					
-					del buf
-					
 				job = self.server.getJobByID(job_id)
-				frame = job[job_frame]
-				frame.status = job_result
-				frame.time = job_time
-		
-				self.server.updateSlave(self.headers['slave-id'])
 				
-				self.send_head()
-			else: # job not found
+				if job:
+					job_frame = int(self.headers['job-frame'])
+					job_result = int(self.headers['job-result'])
+					job_time = float(self.headers['job-time'])
+					
+					frame = job[job_frame]
+					
+					if job_result == DONE:
+						length = int(self.headers['content-length'])
+						buf = self.rfile.read(length)
+						f = open(job.save_path + "%04d" % job_frame + ".exr", 'wb')
+						f.write(buf)
+						f.close()
+						
+						del buf
+					elif job_result == ERROR:
+						# blacklist slave on this job on error
+						job.blacklist.append(slave.id)
+						
+					frame.status = job_result
+					frame.time = job_time
+			
+					self.server.updateSlave(self.headers['slave-id'])
+					
+					self.send_head()
+				else: # job not found
+					self.send_head(http.client.NO_CONTENT)
+			else: # invalid slave id
 				self.send_head(http.client.NO_CONTENT)
 		# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 		elif self.path == "log":
diff --git a/release/io/netrender/slave.py b/release/io/netrender/slave.py
index 0435ba3f8cb..c12c846231d 100644
--- a/release/io/netrender/slave.py
+++ b/release/io/netrender/slave.py
@@ -119,6 +119,9 @@ def render_slave(engine, scene):
 							run_t = current_t
 				
 				if cancelled:
+					# kill process if needed
+					if process.poll() == None:
+						process.terminate()
 					continue # to next frame
 				
 				total_t = time.time() - start_t

From aec894939f3cb18c30a01bf97a6512cabcb32a4b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 9 Sep 2009 23:11:43 +0000
Subject: [PATCH 503/577] - off by 1 error with console command line memory
 re-allocation. - documenting vgroups crashed.

---
 source/blender/editors/object/object_vgroup.c      | 4 ++--
 source/blender/editors/space_console/console_ops.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 6808b10b49d..2b17a6cbe54 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1230,13 +1230,13 @@ static int set_active_group_exec(bContext *C, wmOperator *op)
 
 static EnumPropertyItem *vgroup_itemf(bContext *C, PointerRNA *ptr, int *free)
 {	
-	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+	Object *ob;
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
 	EnumPropertyItem *item= NULL;
 	bDeformGroup *def;
 	int a, totitem= 0;
 	
-	if(!C) /* needed for docs */
+	if(!C || !(ob = CTX_data_pointer_get_type(C, "object", &RNA_Object).data)) /* needed for docs */
 		return vgroup_items;
 	
 	for(a=0, def=ob->defbase.first; def; def=def->next, a++) {
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index 3d0d284b501..2120b97becf 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -190,7 +190,7 @@ ConsoleLine *console_history_verify(const bContext *C)
 static void console_line_verify_length(ConsoleLine *ci, int len)
 {
 	/* resize the buffer if needed */
-	if(len > ci->len_alloc) {
+	if(len >= ci->len_alloc) {
 		int new_len= len * 2; /* new length */
 		char *new_line= MEM_callocN(new_len, "console line");
 		memcpy(new_line, ci->line, ci->len);

From e8b3f86bcb53ddef442e15f350fafb762a143400 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Wed, 9 Sep 2009 23:52:48 +0000
Subject: [PATCH 504/577] Smoke: * Bugfix for non-working high res display *
 Bugfix for smoke disappearing on 2nd frame

---
 release/ui/buttons_physics_smoke.py           | 9 ++++++---
 source/blender/blenkernel/intern/pointcache.c | 2 +-
 source/blender/blenkernel/intern/smoke.c      | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py
index 8d86a6ef2d6..6aee152e92a 100644
--- a/release/ui/buttons_physics_smoke.py
+++ b/release/ui/buttons_physics_smoke.py
@@ -90,7 +90,10 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
 	
 	def poll(self, context):
 		md = context.smoke
-		return md and (md.smoke_type == 'TYPE_DOMAIN')
+		if md:
+				return (md.smoke_type == 'TYPE_DOMAIN')
+		
+		return False
 
 	def draw(self, context):
 		layout = self.layout
@@ -145,7 +148,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 		md = context.smoke.domain_settings
 
 		split = layout.split()
-
+			
 		col = split.column()
 		col.itemL(text="Resolution:")
 		col.itemR(md, "amplify", text="Divisions")
@@ -154,7 +157,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
 		col.itemL(text="Noise Method:")
 		col.row().itemR(md, "noise_type", text="")
 		col.itemR(md, "strength")
-		sub.itemR(md, "viewhighres")
+		col.itemR(md, "viewhighres")
 		
 class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
 	__label__ = "Smoke High Resolution Cache"
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 1ab1daf1782..5a14277d63b 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1847,7 +1847,7 @@ int BKE_ptcache_id_reset(Scene *scene, PTCacheID *pid, int mode)
 		else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
 			smokeModifier_reset(pid->calldata);
 		else if(pid->type == PTCACHE_TYPE_SMOKE_HIGHRES)
-			smokeModifier_reset(pid->calldata);
+			smokeModifier_reset_turbulence(pid->calldata);
 	}
 	if(clear)
 		BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 026ccf4fc7d..fe5541211ce 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1157,14 +1157,13 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		{
 			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
 		}
-		if(!(cache_wt->flag & PTCACHE_SIMULATION_VALID))
+		if(sds->wt && !(cache_wt->flag & PTCACHE_SIMULATION_VALID))
 		{
 			BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_OUTDATED);
 		}
 
 		if(smd->time == -1 && framenr!= startframe)
 			return;
-		
 
 		if(!smokeModifier_init(smd, ob, scene, dm))
 			return;
@@ -1287,6 +1286,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 			if(get_lamp(scene, light))
 				smoke_calc_transparency(sds->shadow, smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp, -7.0*sds->dx);
 
+			// printf("smd->time: %f\n", smd->time);
 			return;
 		}
 

From abe48562b8b8940dbb81914f96323b90d99b4802 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Thu, 10 Sep 2009 00:32:59 +0000
Subject: [PATCH 505/577] Remove smoke from COMLIB, already in PULIB.

---
 source/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/Makefile b/source/Makefile
index d9acd4bf059..dab037d1749 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -113,7 +113,6 @@ COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a
 COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
 COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
 COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
-COMLIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a 
 
 ifeq ($(WITH_FFMPEG),true)
     COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a

From b74eaeba73d4c659208e4f8398291da1dd38cd0b Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Thu, 10 Sep 2009 01:14:21 +0000
Subject: [PATCH 506/577] 2.5 Node RNA:

* Added Property ranges for Nodes.
---
 source/blender/makesrna/intern/rna_nodetree.c | 84 +++++++++++++++++--
 1 file changed, 79 insertions(+), 5 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 9062cec3828..b3046ad1364 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -396,6 +396,7 @@ static void def_cmp_alpha_over(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "premul", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "x");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Premul", "Mix Factor");
 }
 
@@ -419,38 +420,46 @@ static void def_cmp_blur(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "sizex", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sizex");
+	RNA_def_property_range(prop, 0, 256);
 	RNA_def_property_ui_text(prop, "Size X", "");
 	
 	prop = RNA_def_property(srna, "sizey", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sizey");
+	RNA_def_property_range(prop, 1, 256);
 	RNA_def_property_ui_text(prop, "Size Y", "");
 	
 	prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "samples");
+	RNA_def_property_range(prop, 1, 256);
 	RNA_def_property_ui_text(prop, "Samples", "");
 	
 	prop = RNA_def_property(srna, "max_speed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "maxspeed");
+	RNA_def_property_range(prop, 1, 1024);
 	RNA_def_property_ui_text(prop, "Max Speed", "");
 	
 	prop = RNA_def_property(srna, "min_speed", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "minspeed");
+	RNA_def_property_range(prop, 1, 1024);
 	RNA_def_property_ui_text(prop, "Min Speed", "");
-	
+
 	prop = RNA_def_property(srna, "relative", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "relative", 1);
 	RNA_def_property_ui_text(prop, "Relative", "");
 	
 	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac");
+	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Factor", "");
 	
 	prop = RNA_def_property(srna, "factor_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "percentx");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Relative Size X", "");
 	
 	prop = RNA_def_property(srna, "factor_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "percenty");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Relative Size Y", "");
 	
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
@@ -506,10 +515,12 @@ static void def_cmp_map_value(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "loc");
+	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Offset", "");
 	
 	prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "size");
+	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Size", "");
 	
 	prop = RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE);
@@ -522,10 +533,12 @@ static void def_cmp_map_value(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min");
+	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Minimum", "");
 	
 	prop = RNA_def_property(srna, "max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max");
+	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Maximum", "");
 }
 
@@ -580,14 +593,17 @@ static void def_cmp_image(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "frames", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "frames");
+	RNA_def_property_range(prop, 1, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Frames", "Number of images used in animation");
 	
 	prop = RNA_def_property(srna, "start", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sfra");
+	RNA_def_property_range(prop, 1, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Start Frame", "");
 	
 	prop = RNA_def_property(srna, "offset", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "offset");
+	RNA_def_property_range(prop, -MAXFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Offset", "Offsets the number of the frame to use in the animation");
 	
 	prop = RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE);
@@ -604,6 +620,7 @@ static void def_cmp_image(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "layer", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "layer");
+	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "Layer", "");
 	
 	/* } */
@@ -692,10 +709,12 @@ static void def_cmp_output_file(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "start", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sfra");
+	RNA_def_property_range(prop, 1, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Start Frame", "");
 	
 	prop = RNA_def_property(srna, "end", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "efra");
+	RNA_def_property_range(prop, 1, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "End Frame", "");
 }
 
@@ -748,18 +767,22 @@ static void def_cmp_diff_matte(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "tolerance1", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Channel 1 Tolerance", "");
 	
 	prop = RNA_def_property(srna, "tolerance2", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Channel 2 Tolerance", "");
 	
 	prop = RNA_def_property(srna, "tolerance3", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t3");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Channel 3 Tolerance", "");
 	
 	prop = RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fstrength");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Falloff", "");
 }
 
@@ -783,6 +806,7 @@ static void def_cmp_color_spill(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 0.0f, 0.5f);
 	RNA_def_property_ui_text(prop, "Amount", "How much the selected channel is affected by");
 }
 
@@ -794,22 +818,27 @@ static void def_cmp_chroma(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "acceptance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 1.0f, 80.0f);
 	RNA_def_property_ui_text(prop, "Acceptance", "Tolerance for a color to be considered a keying color");
 	
 	prop = RNA_def_property(srna, "cutoff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
+	RNA_def_property_range(prop, 0.0f, 30.0f);
 	RNA_def_property_ui_text(prop, "Cutoff", "Tolerance below which colors will be considered as exact matches");
 
 	prop = RNA_def_property(srna, "lift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fsize");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Lift", "Alpha lift");
 	
 	prop = RNA_def_property(srna, "gain", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fstrength");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Gain", "Alpha gain");
 	
 	prop = RNA_def_property(srna, "shadow_adjust", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t3");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Shadow Adjust", "Adjusts the brightness of any shadows captured");
 	
 	/* TODO: 
@@ -844,10 +873,12 @@ static void def_cmp_channel_matte(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "high", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "High", "Values higher than this setting are 100% opaque");
 	
 	prop = RNA_def_property(srna, "low", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Low", "Values lower than this setting are 100% keyed");
 	
 	/* TODO:
@@ -889,8 +920,9 @@ static void def_cmp_splitviewer(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Axis", "");
 	
 	/* TODO: percentage */
-	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "custom1");
+	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Factor", "");
 }
 
@@ -900,6 +932,7 @@ static void def_cmp_id_mask(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "index", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
+	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "Index", "Pass index number to convert to alpha");
 }
 
@@ -908,8 +941,9 @@ static void def_cmp_map_uv(StructRNA *srna)
 	PropertyRNA *prop;
 	
 	/* TODO: percentage */
-	prop = RNA_def_property(srna, "alpha", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "alpha", PROP_INT, PROP_PERCENTAGE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
+	RNA_def_property_range(prop, 0, 100);
 	RNA_def_property_ui_text(prop, "Alpha", "");
 }
 
@@ -938,6 +972,7 @@ static void def_cmp_defocus(StructRNA *srna)
 	/* TODO: angle in degrees */		
 	prop = RNA_def_property(srna, "angle", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "rotation");
+	RNA_def_property_range(prop, 0, 90);
 	RNA_def_property_ui_text(prop, "Angle", "Bokeh shape rotation offset in degrees");
 	
 	prop = RNA_def_property(srna, "gamma_correction", PROP_BOOLEAN, PROP_NONE);
@@ -947,14 +982,17 @@ static void def_cmp_defocus(StructRNA *srna)
 	/* TODO */
 	prop = RNA_def_property(srna, "f_stop", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fstop");
+	RNA_def_property_range(prop, 0.0f, 128.0f);
 	RNA_def_property_ui_text(prop, "fStop", "Amount of focal blur, 128=infinity=perfect focus, half the value doubles the blur radius");
 	
 	prop = RNA_def_property(srna, "max_blur", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "maxblur");
+	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Max Blur", "blur limit, maximum CoC radius, 0=no limit");
 	
 	prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "bthresh");
+	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Threshold", "CoC radius threshold, prevents background bleed on in-focus midground, 0=off");
 	
 	prop = RNA_def_property(srna, "preview", PROP_BOOLEAN, PROP_NONE);
@@ -963,6 +1001,7 @@ static void def_cmp_defocus(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "samples");
+	RNA_def_property_range(prop, 16, 256);
 	RNA_def_property_ui_text(prop, "Samples", "Number of samples (16=grainy, higher=less noise)");
 	
 	prop = RNA_def_property(srna, "use_zbuffer", PROP_BOOLEAN, PROP_NONE);
@@ -971,6 +1010,7 @@ static void def_cmp_defocus(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "z_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "scale");
+	RNA_def_property_range(prop, 0.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Z-Scale", "Scales the Z input when not using a zbuffer, controls maximum blur designated by the color white or input value 1");
 }
 
@@ -982,10 +1022,12 @@ static void def_cmp_luma_matte(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "high", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "High", "Values higher than this setting are 100% opaque");
 	
 	prop = RNA_def_property(srna, "low", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Low", "Values lower than this setting are 100% keyed");
 	
 	/* TODO: keep low less than high */
@@ -1017,18 +1059,22 @@ static void def_cmp_crop(StructRNA *srna)
 
 	prop = RNA_def_property(srna, "x1", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "x1");
+	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "X1", "");
 	
 	prop = RNA_def_property(srna, "x2", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "x2");
+	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "X2", "");
 	
 	prop = RNA_def_property(srna, "y1", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "y1");
+	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "Y1", "");
 	
 	prop = RNA_def_property(srna, "y2", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "y2");
+	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "Y2", "");
 }
 
@@ -1040,6 +1086,7 @@ static void def_cmp_dblur(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "iter");
+	RNA_def_property_range(prop, 1, 128);
 	RNA_def_property_ui_text(prop, "Iterations", "");
 	
 	prop = RNA_def_property(srna, "wrap", PROP_BOOLEAN, PROP_NONE);
@@ -1048,26 +1095,32 @@ static void def_cmp_dblur(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "center_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "center_x");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Center X", "");
 	
 	prop = RNA_def_property(srna, "center_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "center_y");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Center Y", "");
 	
 	prop = RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "distance");
+	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Distance", "");
 	
 	prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "angle");
+	RNA_def_property_range(prop, 0.0f, 360.0f);
 	RNA_def_property_ui_text(prop, "Angle", "");
 	
 	prop = RNA_def_property(srna, "spin", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "spin");
+	RNA_def_property_range(prop, -360.0f, 360.0f);
 	RNA_def_property_ui_text(prop, "Spin", "");
 	
 	prop = RNA_def_property(srna, "zoom", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "zoom");
+	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Zoom", "");
 }
 
@@ -1079,16 +1132,18 @@ static void def_cmp_bilateral_blur(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "iter");
+	RNA_def_property_range(prop, 1, 128);
 	RNA_def_property_ui_text(prop, "Iterations", "");
 	
 	prop = RNA_def_property(srna, "sigma_color", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "sigma_color");
+	RNA_def_property_range(prop, 0.01f, 3.0f);
 	RNA_def_property_ui_text(prop, "Color Sigma", "");
 	
 	prop = RNA_def_property(srna, "sigma_space", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "sigma_space");
-	RNA_def_property_ui_text(prop, "Space Sigma", "");
-	
+	RNA_def_property_range(prop, 0.01f, 30.0f);
+	RNA_def_property_ui_text(prop, "Space Sigma", "");	
 }
 
 static void def_cmp_premul_key(StructRNA *srna)
@@ -1141,30 +1196,37 @@ static void def_cmp_glare(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "iter");
+	RNA_def_property_range(prop, 2, 5);
 	RNA_def_property_ui_text(prop, "Iterations", "");
 	
 	prop = RNA_def_property(srna, "color_modulation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "colmod");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Color Modulation", "");
 	
 	prop = RNA_def_property(srna, "mix", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "mix");
+	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Mix", "-1 is original image only, 0 is exact 50/50 mix, 1 is processed image only");
 	
 	prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "threshold");
+	RNA_def_property_range(prop, 0.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Threshold", "The glare filter will only be applied to pixels brighter than this value");
 	
 	prop = RNA_def_property(srna, "streaks", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "angle");
+	RNA_def_property_range(prop, 2, 16);
 	RNA_def_property_ui_text(prop, "Streaks", "Total number of streaks");
 	
 	prop = RNA_def_property(srna, "angle_offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "angle_ofs");
+	RNA_def_property_range(prop, 0.0f, 180.0f);
 	RNA_def_property_ui_text(prop, "Angle Offset", "Streak angle offset in degrees");
 	
 	prop = RNA_def_property(srna, "fade", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fade");
+	RNA_def_property_range(prop, 0.75f, 1.0f);
 	RNA_def_property_ui_text(prop, "Fade", "Streak fade-out factor");
 	
 	prop = RNA_def_property(srna, "rotate_45", PROP_BOOLEAN, PROP_NONE);
@@ -1173,6 +1235,7 @@ static void def_cmp_glare(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "size");
+	RNA_def_property_range(prop, 6, 9);
 	RNA_def_property_ui_text(prop, "Size", "Glow/glare size (not actual size; relative to initial size of bright area of pixels)");
 	
 	/* TODO */
@@ -1199,32 +1262,39 @@ static void def_cmp_tonemap(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "key", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "key");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Key", "The value the average luminance is mapped to");
 	
 	prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "offset");
+	RNA_def_property_range(prop, 0.001f, 10.0f);
 	RNA_def_property_ui_text(prop, "Offset", "Normally always 1, but can be used as an extra control to alter the brightness curve");
 	
 	prop = RNA_def_property(srna, "gamma", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "gamma");
+	RNA_def_property_range(prop, 0.001f, 3.0f);
 	RNA_def_property_ui_text(prop, "Gamma", "If not used, set to 1");
 	
 	/* TODO: } else { */
 	
 	prop = RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "f");
+	RNA_def_property_range(prop, -8.0f, 8.0f);
 	RNA_def_property_ui_text(prop, "Intensity", "If less than zero, darkens image; otherwise, makes it brighter");
 	
 	prop = RNA_def_property(srna, "contrast", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "m");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Contrast", "Set to 0 to use estimate from input image");
 	
 	prop = RNA_def_property(srna, "adaptation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "a");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Adaptation", "If 0, global; if 1, based on pixel intensity");
 	
 	prop = RNA_def_property(srna, "correction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "c");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Color Correction", "If 0, same for all channels; if 1, each independent");
 }
 
@@ -1280,18 +1350,22 @@ static void def_tex_bricks(StructRNA *srna)
 
 	prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "custom3");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Offset Amount", "");
 	
 	prop = RNA_def_property(srna, "offset_frequency", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
+	RNA_def_property_range(prop, 2, 99);
 	RNA_def_property_ui_text(prop, "Offset Frequency", "Offset every N rows");
 	
 	prop = RNA_def_property(srna, "squash", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "custom4");
+	RNA_def_property_range(prop, 0.0f, 99.0f);
 	RNA_def_property_ui_text(prop, "Squash Amount", "");
 	
 	prop = RNA_def_property(srna, "squash_frequency", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom2");
+	RNA_def_property_range(prop, 2, 99);
 	RNA_def_property_ui_text(prop, "Squash Frequency", "Squash every N rows");
 }
 

From d6a706dee9b59e32ca9c60645680ea4170e6c1d4 Mon Sep 17 00:00:00 2001
From: Robert Holcomb <bob_holcomb@hotmail.com>
Date: Thu, 10 Sep 2009 01:55:10 +0000
Subject: [PATCH 507/577] Inno installer script to build windows installer. 
 First draft-still needs some work.  Creates a baseline functional installer
 from a build.  Requires Inno and Inno ISTool

---
 release/windows/inno/blender.iss   |  92 +++++++++++++++++++++++++++++
 release/windows/inno/copyright.txt |  56 ++++++++++++++++++
 release/windows/inno/header.bmp    | Bin 0 -> 25818 bytes
 release/windows/inno/installer.bmp | Bin 0 -> 154542 bytes
 release/windows/inno/installer.ico | Bin 0 -> 25214 bytes
 5 files changed, 148 insertions(+)
 create mode 100644 release/windows/inno/blender.iss
 create mode 100644 release/windows/inno/copyright.txt
 create mode 100644 release/windows/inno/header.bmp
 create mode 100644 release/windows/inno/installer.bmp
 create mode 100644 release/windows/inno/installer.ico

diff --git a/release/windows/inno/blender.iss b/release/windows/inno/blender.iss
new file mode 100644
index 00000000000..5faf5b47406
--- /dev/null
+++ b/release/windows/inno/blender.iss
@@ -0,0 +1,92 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+
+[Setup]
+#define VERSION "2.49b"
+
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{C45CB76D-AD5F-49CC-86DE-72B168A6A888}
+AppName=Blender
+AppVerName=Blender {#VERSION}
+AppPublisher=Blender Foundation
+AppPublisherURL=http://www.blender.org
+AppSupportURL=http://www.blender.org
+AppUpdatesURL=http://www.blender.org
+DefaultDirName={pf}\Blender
+DefaultGroupName=Blender Foundation
+AllowNoIcons=true
+LicenseFile=.\copyright.txt
+OutputBaseFilename=blender-{#VERSION}
+Compression=lzma
+SolidCompression=true
+ChangesAssociations=true
+WizardImageFile=.\installer.bmp
+WizardSmallImageFile=.\header.bmp
+SetupIconFile=.\installer.ico
+MinVersion=,5.01.2600sp1
+PrivilegesRequired=none
+AllowRootDirectory=true
+ShowLanguageDialog=auto
+
+[Dirs]
+Name: {userdocs}\Blender; Flags: uninsneveruninstall; Tasks: ; Languages: 
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: ..\..\..\..\build\bin\release\blender.exe; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\blender.html; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\BlenderQuickStart.pdf; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\copyright.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\GPL-license.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\Python-license.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\release_249.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\*.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\plugins\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\..\build\bin\release\.blender\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: {group}\Blender; Filename: {app}\blender.exe
+Name: {group}\ReleaseNotes; Filename: {app}\release_249.txt
+Name: {group}\Blender.org; Filename: {app}\blender.html
+Name: {group}\Copyright; Filename: {app}\copyright.txt
+Name: {group}\GPL; Filename: {app}\GPL-license.txt
+Name: {group}\Uninstall; Filename: {uninstallexe}; Tasks: ; Languages: 
+Name: {commondesktop}\Blender; Filename: {app}\blender.exe; Tasks: desktopicon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Blender; Filename: {app}\blender.exe; Tasks: quicklaunchicon
+
+[Registry]
+Root: HKCR; Subkey: .blend; ValueType: string; ValueName: ; ValueData: BlenderFile; Flags: uninsdeletevalue
+Root: HKCR; Subkey: BlenderFile; ValueType: string; ValueName: ; ValueData: Blender File; Flags: uninsdeletekey
+Root: HKCR; Subkey: BlenderFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\blender.exe,0
+Root: HKCR; Subkey: BlenderFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\blender.exe"" ""%1"""
+
+[Run]
+Filename: {app}\blender.exe; Description: {cm:LaunchProgram,Blender}; Flags: nowait postinstall skipifsilent
+
+
+[_ISToolDownload]
+
+[UninstallDelete]
+Name: {app}\blender.exe; Type: files
+Name: {app}\*.dll; Type: files
+Name: {app}\blender.html; Type: files; Tasks: ; Languages: 
+Name: {app}\BlenderQuickStart.pdf; Type: files
+Name: {app}\copyright.txt; Type: files
+Name: {app}\GPL-license.txt; Type: files
+Name: {app}\Python-license.txt; Type: files
+Name: {app}\release_249.txt; Type: files
+Name: {app}\.blender\*; Type: filesandordirs
+Name: {app}\plugins\*; Type: filesandordirs
+Name: {app}\.blender; Type: dirifempty
+Name: {app}\plugins; Type: dirifempty
+Name: {app}; Type: dirifempty
diff --git a/release/windows/inno/copyright.txt b/release/windows/inno/copyright.txt
new file mode 100644
index 00000000000..4e67c2561d3
--- /dev/null
+++ b/release/windows/inno/copyright.txt
@@ -0,0 +1,56 @@
+BLENDER CREATOR LICENSE AGREEMENT
+
+IMPORTANT: PLEASE READ CAREFULLY BEFORE USING THE BLENDER CREATOR SOFTWARE. 
+
+This License Agreement for the Blender Creator software ("License Agreement") is an agreement between NaN Technologies B.V., Meerenakkerplein 11, 5652 BJ Eindhoven, the Netherlands ("NaN") and you (either an individual or a legal entity) ("You") with respect to the software product which this License Agreement accompanies (the "Software"). 
+
+By installing, copying or otherwise using the Software, You agree to be bound by the terms of this License Agreement. If You do not agree to the terms of this License Agreement do not install or use the Software.
+
+
+1. Grant of License
+
+Subject to the provisions of this License Agreement, NaN grants You a limited, non-exclusive, personal, non-sublicenseable, non-transferable, revocable license to use the Software at any computer You own or use. 
+
+2. License Restrictions
+
+Except as expressly provided under this License Agreement, or without prior written consent from NaN, or without permission by law, You may not: (a) remove or alter any proprietary, copyright or trademark notices in or on the Software; (b) modify, decompile, disassemble or reverse-engineer the Software; (c) sublicense, rent, lease, lend, assign or otherwise transfer rights to the Software.
+
+3. Permitted copying and electronic distribution of Software
+
+You are hereby granted permission to copy and distribute the Software without written agreement from NaN, only for non-commercial purposes.  Distributing the Software within a restricted non-public environment, such as using a local network in a company or a local network of a university, is considered a 'non-commercial purpose'. This entire License Agreement must appear in and/or accompany all copies of the Software.
+Distributing the Software 'bundled' in with ANY product is considered to be a 'commercial purpose'. 
+
+4. Intellectual Property Rights and Ownership
+
+Title and ownership to all rights, including intellectual property rights, in and to the Software shall at all times solely and exclusively remain with NaN. The Software is protected by national and international (copyright) laws and treaties. All rights not expressly granted herein are reserved to NaN.
+
+5. Disclaimer of Warranties
+
+NaN provides you with the Software "as is" and with all faults. NaN explicitly disclaims all warranties and guarantees and does not make any representations with respect to the Software, whether express, implied, or statutory, including, but not limited to any (if any) warranties of or related to: fitness for a particular purpose, title, non-infringement, lack of viruses, accuracy or completeness of responses, results, lack of negligence or lack of workmanlike effort, and correspondence to description. The entire risk arising out of use or performance of the Software remains with You.
+
+6. Limitation of Liability
+
+In no event shall NaN or its employees, agents or suppliers be liable for any direct, indirect, consequential, incidental, special, punitive, or other damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, claims of third parties, damages as a result of injury to any person, or any other loss) arising out of or in connection with the license granted under this License Agreement or the use of or inability to use the Software, even if NaN has been advised of the possibility of such damages. 
+ 
+7. User warning and indemnification
+
+WARNING: use of the Software and use of any works that are (partially) created with the Software (the "Works") may cause physical or psychological reactions from You or from third parties, which may result in damages, injuries, losses and/or other negative consequences. You acknowledge that NaN can not be held liable for any such damages, injuries, losses and/or other negative consequences. You acknowledge that it is your obligation to investigate, prevent and/or minimize such reactions prior to having third parties use the Works.
+
+You shall indemnify and hold harmless NaN from and against all actions, claims, demands, proceedings, losses, damages, costs, charges and expenses, including but not limited to legal fees and expenses, arising out of or in connection with (i) the use of the Software by You and (ii) the use of any Works created with the Software by You or any third parties.
+
+8. Term and Termination
+
+This License Agreement and the license granted hereunder is effective until terminated. This License Agreement shall terminate automatically and forthwith if You fail to comply with the terms of this License Agreement. Upon termination, You shall cease the use of the Software, remove the Software from (the memory of) your computer and destroy all copies of the Software.
+
+9. Entire Agreement
+
+This License Agreement is the entire agreement between NaN and You in respect of the subject matter of the License Agreement. This License Agreement supersedes all prior written or oral agreements, proposals or understandings, and any other communications between NaN and You relating to the subject matter of this License Agreement.
+
+10. Enforceability
+
+If any provision of this License Agreement is held to be unenforceable by a court of competent jurisdiction for any reason, such provision shall be adapted or amended only to the extent necessary to make it enforceable, and the remainder of the License Agreement shall remain in effect.
+
+11. Governing law and disputes
+
+This License Agreement and all disputes arising from it will be governed by the laws of The Netherlands. All disputes arising in connection with this Agreement that cannot be settled amicably shall be brought before the competent court in Amsterdam, the Netherlands, to which jurisdiction NaN and You hereby irrevocably consent.
+
diff --git a/release/windows/inno/header.bmp b/release/windows/inno/header.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..b631ba73933924c2bfea42197c02c4e2b0fdcf47
GIT binary patch
literal 25818
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

literal 0
HcmV?d00001

diff --git a/release/windows/inno/installer.bmp b/release/windows/inno/installer.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..10fb01454a4d2d41e2069d6d0025f26c7f77cc85
GIT binary patch
literal 154542
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%0D7=
z*aLt2-Zm$2Prc8cM!!9<32~jbX0s`9PlF#Z%@4$wMgKeVtyON+ffuspkH7r|T7L0x
zy(dkV4)>?_TF*UoUUUdr_+kI;=5#Y#l!mMAt3CDr1nl$f=xl2k9uo%+WFP(RTPkah
zuP6i;{-Mri4_*Ks77tbLO%K}^_y2H%_B8nJsdU}5(wBmsc<{A>EKbnhpb<}s2cZ|>
z!@L0BJ<9Uazx(B5bbIgi3_S?LvzxO!PyJf(&We~dR~~;9s1gi-EKZNzBy;0nt{$5S
zq}Y{k6u$>x8Nc$8aeRU6hgo}p>oecrIa}v8TkAGm<vdY*`eWv0eEsd8QpKMdm;F(@
z(0YEVfhOOCflvSK_b;z}$*+EeMrQJ*l(4J&1e5aH|Mt?>Pd@q={EeQmhV%FUalFy<
z`UL0s?|!-Sv$QRLffQn%g1km{x$~dn3>_Vi=Yq(;gLlp0dpJRR;I*W{Xhsk`QtK$V
z@ZYf697gZ+oG1dF@2_;@E#(I95k~*tD6N0^_4}v*u!9@2hadiT^KFqgr+Dj<ysnft
z>V5ardhL;yS%3b?$2d^kc)l@U4;XJezw@ftV4))xPQlipB6GC-^6e|UkiWw#;f2zR
z8O%O9EeINGaKnJbQ{%+|xVA3MMd!=%5;pO0_&|=qhO+#+x^cYG1FsN{bAtZ%{&Ekx
zeQ+1Q$BXh4ynknbecm4{u3gMmd&{F?uAV$rPZq7Kh|^cV-)LQe9pkLBEm71ynqfAY
zVLF_SyGixs@rNa0Z%9J-4FvskAmFD1UjH=U`A^Wx&B^T3{rcnYv*n+{O01u?C7MRJ
zzv#u*GtKl}GV&R&nP4y50ddzFO#$q`cdw1NC+x#JfVUm*4?7mx<M+L@p<+9H@%0aw
z)0xvWdJxPPnCLg&p$Fgb8t;Q3^1r{mK7?5k?KqeJ?fdt{`NlhM`>)=){`m3`>n!T(
zi{F1V-yVf0Z4Slz|99_Rn_!;{`th&d8*A{sztZ<DGf$y~y!NLT_UFC!Bd=v8R+w`Y
z<+i9WcuZdC-{S8^ef@=I&G7qQJylhnMK?a<^`^4)<6l2(iTFFDSyR9sRi*tG&;PLV
z0&Yz5W?CZHL5;=_?#};LyhhJwmsD~%7^O>&Gm4mq)|E!;NH6GU6agDY>U7%wWWfEO
zI-P$aI`<C<x?Fxj7JHDzr109~p9atW^!@cw_T_#3?GK%6U*P@Uz4Str#@sq~>njYu
zq`^<w6Kae~RAVgCe*Fi{sQ>qOwwlBKFZ{fC69Aj}Pz<7$i2wfE54PE-7{B!uJG7Z>
z!3yn<ifiQQj@KA9E4@@0cmKnP;D-Dk>`>ZJmT9~W-qRlcli$2|uPgay7(vJ`X`u;h
z!s){|Uwwvk)OX)~!>*<<QqY1~Sl#IP*S*GrC@W6==Gk2;GNF_e6I}1zuLLpklm4Gb
z10>kBG5lg!5oH?llRjAO$C47M_3bxbps)jW>StQM`mcNa+3$ZNi993@J17Z1Gzg8<
zk%UpeA`RD(gdBtp2EWxGcwjL2;9%&%PN$#1Xjse!<gfdyxY4H6cmJ~$<<3upE19mm
z=eSP74qhmGsgu9(Mbh94qygKG^QJV(r|k0WhabM5;CP`1?zp@YkU_qC=7ixGqIe1{
z&QbP}C#=^d<$vtC$awwXgBGTS<L!O4F4=i8Z1CA1ekY3kdkhL>4oWm?I0E?Fk@)|<
ze|u3B`#-S@Z+>g^|LD!o=}kYhLtmzDA6hbWI+JzY*;LK8hO%C(n>=58iiOTNq#3-%
zRF2}njA)vm@ps~0>-ptp&)eev0nd(~7m2qn$wh!46ZE9*AI#Ao$kB%m=IV=ckBRdP
z26K=0XC0m3dOh7zH;4TVJG9@w`xk3Cp6;73KI;oP&=c@RSKu36{tSL^bYau~jZW`<
zT|Nl*lLlaOFE#q?6FL0@=yE2<X@EQZL}NEBX2D>0`$@0cKVt74Y5n)#X=?T3fB!DB
zn=XE0M6)wE+_A2GZr{kBDborZ!xO7(_I<#~QCs{^@Kfwqyc6IZz}wQDvJWRN=!`mm
zYJiEJo%G>#-})<F<9);0m3`P9eg3<D6Gs0JJU;AL=!m($+PmZRd$$%?ujv^>nT44b
z&Fq*!p>URlJeE>^doVA|3d7KX;xk<H`r2&1J(~4eRe9za{uFB%&D5A}uMSu4ybLzL
zDHWcPy!M0F_!Hqdtk?W-N<}OWcED>u^3b#UQq6g~HNg-68@62F?*P8`u)8<E{`@&i
zZ1>vR>A6?rwO8oz&+Q&R6P^E=(Cw!}w|^G869V_2w!8fd?TFjme@4UE=_l|SR%+CZ
zV%Bl87-gK@WJ>yCsox)d@ecc>pM3TMZ~hBZZ1!3=JC<Rwc4b9VdDVo*Yn)E9Ua%JL
zHk#hF5ER>g{EC_KaQ(!YtMQsmnDLwRG0I0DYSv~={(DAhop5bo_s@QFiVK7AP^gx-
zrkkH^C@`7g-PY9bl)Z>CW40&!<GrPh`}muc%bnoCTA#Yf0|(;m<wyMOZ=T)8N*-S0
z^|VI){qKJHWcO1j%55+Uvo-wVU%iL3Hgtnc;=B{=E8pq-=%N@)?*Fg7Gmo>Xy7IlR
zty5*)>n*5zs|o}O66RtkYp{x;s3`?1nbbynO7MvRJ_13SFbR|e)L=oCg;c-+#h_6W
zlW2^Ioi<LHG)ZfsiHVwaig8Y2T0s<o$?N|9);j0Z1?{}NPp99f|9E`XXJ?;t_c?d?
zuHV{guYD@=VLIa&Zo1w&=a@UU&;8jwyZzny7>|5&hkllG<rQ~*?)>K;{Wji+@fp6-
zaaw%C_je8**w=GvvFvoLq-R!1_smRJV;bAqnAzH#+1eBthfSHwnlkVufL}E;-Pb5}
zqh%*9)@I-qar(^Q*vE@*`Bdri58fHSJF8}jVAU#mD|5~=Rmnbm-G1MxWMaB;U8UpT
zM>xv(YF})vb9^lBxQW+QXbBgOJgYQ5p0Bx<-~7()^Im=Cr+npozkT7ycl7kmPk<7j
zq}gx2_S`QX*z2r!T$tMbhu8TT5ukw1JMK4+e>eW{RPJwXspW2bup8D^P+GZt>nHgz
zdW$*7+;~a#%TN7?dHjzD_aph9b90=+ZCxKDA-uEq9Q+EYGV&`OvtN4RL6vCUc;(T%
zca!t;Nw^6E(Dff){+FJ4IXDI*kD40(<)8Tv+627B$S1%5<rkm$0e#^<PhP~VLE4E-
z-d`*_^!C0j(+W0EEud|iK0sDGV9RtJ%II)t)>@NlotoM-y})&?(0$Z29UbBcA#Mcz
z@uJ<cGX}l*v9D~8e=)Y6=kBz4-p@MBq8l!I>*?1*0X}xmb$lcJ;779N+rj0D?}n-P
z7ruXpWwrYZ5#!7&_U}Kac|4o-HWu1vlF<db78Um`Nbws=w&z$bbn7MtKYI67A?pRl
zzy0R#Np!cLZ^QoQF?|=NzjyP7C%^Y4{u9PGZI}vZF60hRJ*52n%WX3Wu)5(~-Hq9E
z_h&|2v+P5BY)3%Yf9R_njC|vzCwDC#!n?=;NI2*H-A+Etg#)-&CoTWv4!-94_O(m3
z=3;d=m)YSXKfCAJCx7te2X0t%#s50qLEm^u)q95zJ@?ap<XZ0L?nj>#rRTf>_g()F
zykqu1=x?Y<VC%4QYbz3K{m|OAl{(a!D(h4x_RK1}s!3sd&uK-dTamoEKZa|{KFtuL
z?%8H&+|*6`K=;CT-gwnN!0T`QdF>Yu5VTnldrsvcoiknE2*WrD=RaM&7)JUfqg5o|
ziy!1$S1t6C7g*2TrR>gFt4zu?5x#}3uetE@^Zv&dE~zGj0)-!t8*&GtB{U!WYMbAO
zAc;H~yko)fZ@sSd`_upYja|0fV>}n~Dp%?9GhiM3==RI}UGDq*svFi!y>Z>tf4X`J
z6EwdzMGq!Z!Y_Ts?_E<){mlmx^RNGGncs@r5;}C}vyS<~B~{80EDyhb?@9(!4*h1|
zd<b$Ye^ahvFz=4-T~qnSOHVQEr6(WM6U!T>k`ml;`CL9fx23Sd(%#=OZeM!x(Up_)
zR!)+wnw-CCl59n3u55hnstHlQ^tctJ$6Y)=_u|rAA#PIW7Ide~8JoUE8Fim7Elb*`
zMYs*RNBG-6Q~T;K9`p}DtiJgN2T9dfg1IWeO%R6ucWr^pFhbwY?!ErTbyK#VpS*lt
zaK-t@-?VYY&+pso>kiWJ_OHL=%X99)g*>?O{O`gg8@k5HrNOh0`Q>+RX8NY!NiFMZ
z+s^#QD;GX|=Z<)l${U5Ot(M}fIl1q5FZ}Sft}ktwb@h^AR4I2Y8q8zi_wM;Dk<-5d
zE%OK;#y<}q_o*M=ao6V-+{j-9tgg7N>x_rLv4gxT9!!Un`^g`C_5K^ye7$$>9o=Vr
z``YD144mQ0#l_tgXPmWPLV4t_ou9t`vy-X&QF6KFGb3;7`s7dU+C}2(1NeRX-T4^w
z(f%!$Hf^6j_&Z;?B>PS2-@bMAvhlgg#zjUyw$kY2xZEY9gXQCLW#e;q&&oh~&rGon
zJKhJhi`rWb{S1f9-Ls2sId9xgZ|Q#Z@rMrl{*~;H@zAdhvp<ELJ&Oi6B4vTben&iv
zuk)|3KKIJ6e)8sP&&LlO9y<KLd+vINbzGF#zjboUn|*hOqUKs>O~fNCJbwQT@!dYK
zBi2#fEN1N^`3+GSj7X?LrXP5Vtdmqk|F3pQ4j(-5xrK#3r)0DCTN0}ezWpXUFMrKO
z37?j5%_UhM=imPD@(Zi02K9r6>9|0L;0Cn$z>=}S;xVBu9UEZMbwhf0V`g_#M#PUY
zcL1l1#v=##;-@CO@$ApD-#xp}qh;&9cz|sSkHfSUli%8P&%1>B?2&PwA}T9!Jj6gN
z!K=LV%?q#Hzwdx%YX2wJpUOehTR#2)Yp!Ti_`i?bwVhft;g=u$&DVZ?)T{s1hlk#N
zi;voAQTqP9M^Cl?`FFoz)p^9~<zr>eloknRTL^k|uoxSqc6WVdcSC4LgLdxV&K5QO
z*~QP?{}unhZ|wi`Po8`4;b-1^_*of!^0Z&P_@^H}{T>B0TZ@J9ob@s&dEkVHRY=``
z{LEn<Mfm<xhrjgDp|xK+;2YT>_F0}~JB#<<{Qihl)oV{bN;0-{(FwP1IgP^9U;f2j
zdg`HjuU~ur-nHMm<<fWeAMqgTU%v2f@+w8JyRTWiXXT{J{yy*C>zDsc?it_YzCGJk
zmnE2^S4`Ag98(t4EV5xAX*=tY!BzF?JxxU+aZ|T6-e?+cF4}XH8U0)5o&2XmDsKGp
zrT0F0#s1oMCS~;Kt0a--kps56SR>Pq@%f4jvBQxqPA&l}*Wv)gZ5CEOm=2FFth)KY
z@An-Y0hlOXc>Fu>?E6Fft^b>MApZJuKY#tXNB>rzleF`JJzXu;sr8k~H76(5lqJAT
z-o;#uU0iw`^Ri@)icQEdZutW-yrBpaYYfVD)`^rZ$@}^EOnv6grKgfX@cFO1|KNm6
z-gMCHhWJ_-SZ;ANc8F1dMf7J_soXCyA%~!e1Gqu&x87w>?f?Hf>KAzBsYh>Fb2iK5
zO;Zb6Y6@DaWgDtetg4(ldARaz=T2+fowB!rTWdh+)MfTG7CCP8-fuI~S7A)+O+}pC
zd-lZl4k=}N{KfYgy7uu<88wr?X#0+O6=(2R9XWtlqi(Y9um7a~L6P@(wBgXf$lm2m
z|2r64C;!jvkMHsz?F&ylaL3oSEb43+<aLr(ql~&+s!}m@`iOnwDQeeQg!hG5xZoPE
zwU{8*%7oaWH$Y`T$C`?+Y|O~K(_FNxsc6^C;-??@ntL5jdv3V(0L8ISU-!1z{)Osr
z=x5Z4&S=2G>-I0Z;q5bb><4$GcTEATvv}#3FNPB|-|_obZQe7t^18Vd*PUGvwr5xD
zKC5E)9BaKZr{e0fDy}|LcIBDnN7xx<I;4&5r~!WHulmUFO!<|cDC@T~qMN+`a<2VE
z+2=kUTHnXYcEtA4G7e?D${6g-vYls^@0?>cw_@kqid}B!RO~X_8MS?L%XyU+>;1&|
z_J$IK+&V?3Dw%au3ad$NtW0iztkqJG_Ue;0i4)i<tw4Njd19@_dCvIcF07_#K=%vT
zL=9^w@0>AkXMNgjS7WBHk!ouC^K&P^`SSB|kU9LPfBS2Ur-=FY;I9tzbQx=BSfg$_
zOxYcGzH{J@VaollFFt$AMYFo66>P(%6m(Umw$&71UDXAhRVi6z)OyEGwpS$E%grj1
zZRH<iWzorsR2!BxroAk>HtQq<IN!!g*0z<WG^`?}ckwe}n_^7c<m9GFiA|Fet&={$
zIKQbpxv4_7xiYn-x?pp4YD<m4ZSJ=eC_|f)+FT<8=w|xWW*pKNcXb?hYjp|(dOvr_
zPNa}>98-DR0XN*QG*Mp(&FKSCx5!Q(sCLG{T@9HKaYKea*4H4=ef1E}+;qXT-#qdi
z--V2!{~tSd|NJn4+RI{quGzA${<3|yKGeT>eE!GxT{CAAh$GNq-Bl%nvVc}3VeK9L
z@}cRxC>Ur#nJjCYl+^ER6hy?JsD)|vAtTFD@M65%rIQlbhny5&?rC?{OW8Il**Y=N
zZxa%mCdxRo$zQ?&IOJnM+@V(`ouCs3y3C5(YO@WOaIb*4Ie^-!@_~@JbEg&eWNQ`N
zt#(?b<Zb1IJj!Sk%}Cz*Y6tesNcYVcs7^hdbYGoy8q&KOEMhlPPb=EhXx3B&Wf`5O
zqMfsfZ(I4vAAP>_vD>ft*&WwDdfPR09=m<_V_ysH@o#+IXLfvmsv6tSP-frLb8-@L
zs^~1!Vh{Q8O;=n#qsUe4tt4#ba5tA3JMc|T2o`7z8RugQf9KLf%lO2)arqmpZL!0a
zaXRU?aeRWyeX#QtjtPPi4)#mNCt9Np=jk(MQ>m^!$~cMfYWNoMRpWKu-w3ahlayOv
zA+}Ve+Nx4*)v30c0@>7pwke^tPb+AjUO?N1aUNqw1K~%KkHzjv7kY~W{q2<0hAIp4
zCTi&#aHv&+HHZZ5nMJZ@P+Dt;JDM^(n*F7cU8fG(Ijdyn%o5tZS;g75y*bl2vv_+`
zh7RpLz5n24F-j;ro5W(uA6_DEGeNJs>Ft-JM^^U#?v*>%pWj(+fm*Rz)-EAiur;9Y
z-N=s#3w}?2Ni+SncG88@GD)vWL2$$|CM7j&d}95$d~D^YJh#=O)mc9_-;KjHWAbne
zjKLetCB&UOm&##q3{Em8Y|R092}g4J4B$f1pD6PSL+JLB?qKHrrU9s)?^T&1u!}fW
zV+L-AKDD47n>GOA9n%N2hb9M*8?ck*@{eW#c|yO1+Be@QP@Jzy_SUC+8`8av>E5Qa
zBfbibP{vL*qjP%yA;hu1nMEPunIY@m=1gx>rn@oS-H=w>n7+Ju&~Kl49L@5e>4IzD
z=8*%QMP!a9Cx`gn?;ec*D)Yt19=d8yRrq~z_1G%(JIFlrl_y)u64=H`iS^_2Lo-11
z*O{#xo40;KVtr|1&G`JajA7)2#73NiPHAG}gv9ExV!C2fZfr|O1j|PR7mvzaJt}Y6
zNx`xa!HSW&nEL}R!Fc+#va#wjk{0gXaUa;=LBst-8V`wYnxGDCj2@4bZ<w$0k?_y(
z3sxEQDJiMDrl2EIbjS39uIU40wS`-!7k1aDyX(?jb%kB^Y0h-jrMK48$~x-`JL(4D
z7@f6+?hn?6e$w4ApoiV<I<??7=%R*!8+q=SnX#9In7#yShJGRL`rY1`5o@e5Bi2}b
z=89QE_r3lSte<=R&xCG6tTc>jIq6v(w;%rM?#mhnhe3=uR+ZXPSwI5QQjy$HmcX3v
zx=D$3AS1DykgxuP#G2Cl6=QN&1CAC1WAavv&Rsb=4~T$UHZoW?Dp)!yST;If06xI@
z(8jC7g|w^2=B*l&ckyUlvV3F+9rVkAep0Y%R306Gt{SZ%;7p}@(|CLccg2S>`BFXo
zF>;BPu@=lD^e%t2jOvLtM1U~ncz_}tm5I1oWUi<#>zq~~n_{i?yK4&pjrBHUWJW6d
z@l9?z;}m#qp}ue%t+@ehcQl~8F|(~fuVS!cOpoE)F|&BbtYRp~G`W>-Xs<e7e@E_M
zCf3|)YeVMOByaXdeEdx=DH(-Oo;v<@v~P9z;JaV%T;5uh+E|g;Sdmm)u6A=ps?|WR
zpPaxz4BVCD^FX$0T%K%f-o;~b1!#0GDBYHi3fz`Ld1P=Auto+;Mg)sa3Kox$EgB*8
z7mW<KcGdVigpb>xcXbRsCwWOu659yL+`~Rf_YMxQZgl>-QTeoJ*{wf5k5jaldC;~#
zzM(_s9%XS+Hb@$u(gZ|ECyh7On<^5UDoNf*+Ks!R@2Dx*ieRUy?FL+3VNYFQZ+#YV
zn>yhog$h}*GZGXdg6g~A!XXj3Dbv$bysaU#L)<f43GY0<f)_Ppj60W?$eK$Srtu95
z+S>>zj92T5)_4xFTUY;myp8qSxBkrki$WZ?UwY!F*DPoP@rLrmhLaO4|HYKlkrkr0
zV)Is&=8;1xjbuZ1oDAH6UO7%O1mY4y375rAlh$m}aFJbjQm}BiKs#&D$HeKl<Ou?@
zv3aY<=dGWdzp*T_eo{W61LJW0gnT6Ld_7!v*w>j4>pajE!wo&Uc9aBa&(LT+RZzsv
zG6tY=58z7J$kwz}WGQFHvO=qj6uHXgs^liDGC@mUR-J6GPGN-i5V~Y;QN2E`@ar;+
zlqj7>h8~Ie#s#LC&boBx3?zxD4Luzr&KO)m?on?>r;$ir(%W3z)0pXDjJ$=3pb+=)
z$e>nJN#VD)E<gCbt%t|Hc~eKj5F{+bWeHXUYbGaFmgX%R6Y$H^vH>TiV{(^{4lW*>
z%NYz^$0}YjDhLhMXcoR;1@5q5;fd-m86I4CVsPQmVDX27g`8x-hjfxLYKMh~OHT^i
z(646d(YY8NwQd4)y)5KDDStJ-=f08MTC#^r5aivM(-qH2=iqBuy%q?QWnd*~<h-&z
zvWSSdbC<4dZAii<)(|H(HL|qQc!XPhv-X-)$CLsY=%*KKtu?(j6r$oD<zNctAdaV9
z=yc2|#3XQ^-)jp&%o$#C?x3fm3vG^&oZ*XOkSai5DH(IRjPso2R^EE*c=e}h9=ZLx
zeZPH$XW*ax(Y?2>IfvY1GmAu9Fj53q&m%Mj9pyS!5F=Ycu8S9}Qe~EM1<UZ!I%3BM
zTx`*avIS9x{$ewAjIwiIVlDytezP;q9qkLfO&ow;htknLsz?5l^9cnjQGFJ7So@*S
zV<dr=F0L<Ch@b^MQ${NbMgsNZ#AXssvJqzLEa*;L1sNY!mLQCW#EooBKXibY`;-((
zJJ6jws_(83^$vQ0<7vZsvN#!V5jaU5CV`XP0j>_!3-mUEb~6Ed5Z2qIRTT~+z81+L
z%d>4AqMYt-D(*48i+df}pb|*Dj?chSA}ks>Yp)E*X({a{oH(JIwZHGJFE-7FvDcZ>
zM#RP1h>NxNIXu!F`hVC)+(GZ5Kpiu=ff-qPIDL-_JUtNo@rJ%EE8ru1=#LFeDIYd2
zZ?$C?3KVcBt7K^~A%DZ91P1pQJ=`}_Qj6$|wc%EZ?$FDb!4qK&2fAhHPBy!3hj?V+
z`RS6pR1byvLc%X?CxII1q|iKTijbi>vjlM6jZDoftOn6;Ya~w_)OY%jowJAZojRDl
z&+o2u)Q#97?(072OZA-86rdnL{ts?e5EvcTwHF6eEj09$eSp5EjJj^V2Xpq{Nvjm7
zEz!~}Jlw)Ek$ISj8qm>6)Gb5T5%lm(bdr|{@(YKWSwHlIXuP~7cBiNlbN9qAo=V`}
zkA8A~OF8MK&GnO6EQme^X!!=SKYcsHOB~_`aA#qtWuQ3#hoWC*8Cp3xsur8d)&T9s
z+^w{Y8C=}MNN#W;tBgG&>z!;jpud@4zK$nO3)n0JG|)x4S*&dqHsv-K_p<0db<mDk
zp|tx<;C(!2KD(d0vhn6Hk}I&A&+ynPr99fsdTv!B&uPeLvZyT-al~#l0SDbrTs2-5
z`XEl8Muvvc1$|_&@WX<B;qYMo&|v-$wF?N>Ck7W-tEqXIW@<<5hjEY(BY^n^Ox-Jd
zOgPeAB6bx<Mz|$>62c?JF7(ktfR3YAvS%@$fbR=NkNgCGCIYGZgADXCa|XqH%+kfy
z@<c0qD-x<d*!1nJ!5!NNaChjnN6=TLWxA|oN~)ulI6R=ML5nhx(z+>a0w*jh74M!|
z0(A5acl|-Z>4U+I%+dJHj}F=S(V?`QQJlv;h~yUMk+!T!GXgttiuN-+^S7V@dYj^j
z_P%F_(iIs@=~VnE_^_Mf&{s^%U1r<v?81xqh+zJ(VE&0BKJSDa(9>QpRNQHC0HtS$
z*BqdqW_0N2X*C_dl;99KfJcTSe8a|EG+e7W49cJ<yt~qAwO)feEBY)4fWGJX@P(bw
z1I`j`B0xyr9l*pMN*>~lp0+eE%n~Ugne((-W*$%Cn`@GrPDx}NXD|ixX(^AQl6h^x
z+Om8(TSb0LO`?S{Q^QvUy-v_sDT8cllb{pZds($n7d?Ft#KnD91bw!1AKWLU58d@K
z<9@0^*Fw)ScG_lJtiin@jo9%t(EBX!p@0P-?@PcJcdG$P@>c8xI$|e_lhP;WEgPq2
zEf$Rm4el2V3+4^ZIj2N+-k==%5`MN33L+Ewthpfc1j8L_InD;nH^TJ5BYZTi3;l56
zma%^K4z1O2#62=k^Azwsq+5nh%y;grrs-qUj$HNd6?e=3CHB(LaG3rq5pStTv?B28
zgpsxK=`>B*o2Mi>Dd_4X+r+&<GYI#YsAOaH<h<3B^468-Z>UU=EVb4oF<hdfw!p;>
zcSldG?mM-l@3a!yURg2i&eJ09iuQwcoI0p)wzMz#YjP+4YjrQNn>k!0PoBWvED%_r
z-%f6?JkTb3TejnMs{JB!(>v%9yKmaEEz8r<h+WV}O6C&#Nx{4!M!Y!Z9J6yva?S<)
z2|4EtmIKfU+acx*r0#_MNbK1`fPN@>=Z>^p`0?cK0m0(D^bY!nxB|ZCbspqh>``tn
zy_3e1%aPF;0!3_aS0q||L0zrIwX|=GeQ}Q{XLDa)rf@+^nF8)y+j>d@zWidYXrzs8
zs!3qf096~rs5_0;@|K0Izx(P5asZ+Cuw(84dNMke(q8oT`iT;93-S)pOXZ;79@cP5
z0KJ_e4D`)*G^@7b^E>qEs3v2M1bTF>nT47#lD9e!D+1Pi3iX!Yx#WF{hx<{}x<5*{
zfaP|U(&rZCV4!#IKz9SW902-56#QNFiu^FOe2+GyPbZ6P_B{UnzQ=jE%S`54KSrh?
zZ^HNa9m(rwce5WKvfvZ+C;?+e<`7Q+y+hX+<cUrv$T$gZu386u76{J0I<aX=qHS8r
zZDDb+_=I4|iNTU#)(%yR1BCTJUpsiRF(Lob@&wjaktAVgt4va-?P48QJD`WE9jiHF
zzSibcSqE%Wft@@pO%<JrE0uHa#DyKz@yzJ3@Mok~-9s0$4HVUK>kG->h~Dr8JrN$4
z@KOL9K-v%Dy!{1};(T?Ah!p2?JYNTHa=8T~0?@nIAwDM~?y?dY0Uy;9^FuT36Zw6{
zXVMqzh<oS&6y-c;vjsx-+TXb|j80shr5|(eN6(B8@uRrg{O)p-<V*8b8AoTQ9L!cL
z_y7id&Wo?D{pnDF#MYZUk$`s?L!3wN^N!0oCokum<8tODau%k8#aL0W{DffnkYG8`
zX@{y4)&tqxiT38S!>A1!RR-FtlI@jAJz!w;x2k4au&s7LFIhbqxJo(&pzLm>q*KWD
zN>6=Z59J+NoMC3<2~>D^sX-^jy)i8N!~q2E?UvOmv1eb8jDn>iDgAWQyFpj9pXOV5
zn%T)l2=Y8Bt!W+N!-5Nj2lIxC?^)@bIcc?+Ll<|1Kgi-gGk&Cf7rSTsn&L6zDDK{Y
zdkoz>ab@6rFS*houId4jA8jS0Xq(2fde^&%Gr1e?Z0;gkp3fxP!i>yMp)K!JKmE#n
z*5G#HjK|Ic^pQ3{5nvZ2g9XPM`gE|QI9M{sxJT$$4pTLldLWg5=!d(p{s;lvG&~|w
zndEtr&MC64sgl1^!7O7op{B=l&{e0H5JI0-6h?riG~8uP@&pC^DAb41-f99QZ!UTG
zI(L$J;(WN8GrcR5uk<G^^_b;FB=Do8bfBL*Bxmm6oU<}HXABIX&q4Jj`8ht<Lm#~l
z&N(*<^~&_f^M}c8LgEqbu*eg!hNdiv+i?JA<rvn8BHSGMU{wo&4t*-aWc5}VR&m(2
z17heX9rT1Rpwp`3ahu7yCdqHYG8UiTJT2K;o!D5F;Ojf<xp_HmF>zNqtsBtYK)(d;
zSc!zcVn{B;v9%wzO`mw*XKdn9dqRWafA~ySMY5wR)o}_1Uc$cUw@15m9s!sOdg}&i
zE?~J=Pw+2P?q^|Nkst0zK7tPSZ1gtEYi|yj^B4w_SE#q$Iu(elaL0Ei&LaU^zA4CK
zJW?yMj|}FY6wDc%a|XoIGSIu&oqOEI={?*vzq>KZ$K0*dL-YtWeiTZ!*nnt%YqOMs
zzt#L{K@VToc-Yz$4}FI&?ql^NFs*L@N#n4FxJ#bazLB@C`t=q0JddO=Zru6$(2rTu
ziE(=;#!V+CuFmnn!h&E?L9lpWup|>KA7u0g2dj<y#!(5kOUEU!Q1Z562YMbT>hPz<
zDD$#mhn*tps-e!G>{8-apxIxNFW5G{p!Xx`?ahkwf*$v?w$a6%8jhJsUI_!$A>5nk
zn;Z`x=xk&!kHVk|wtQvH?>u5%om^8c?(DqypTjV-!yV|&$z$t|JNC5Hv7z3Lehi(C
zxD)D4@(T5q+9|tZjsU#}c`x*3qmLy&x}SS2UbzA2Ee`afkGRL^#eHlpl%2RbMjZ5^
zWplSwO_5vyKN+)jzOlyPOL)hK=MLQiyF*_H?&E_+7{uM+o(@)&<gPj)Z}rf;wZrn)
zos_>}bYdeiH|Qbv(gctEb(W<%%Tt}v!<>Rn*hlr1+Q{o+YaaPq(XYE!xgXrIUi98r
zDDGk{AL!S<i=9n&o~&rH-Bl8MRfN=n7|ByF;xEuU3H}X*?R5iW1iGnuLT_Vr0`AQ0
z{NUnFm>m<$A0EsZl+&0zcFM8GHoPBwaSm}lOzjMJIKO*JKU~CpEucBwxcBSb{w{;?
zjyYo2ySR^)`6K<__m`Z0NZi5#gG0UB^Z#7p+^I22^0X0jEu|;s(H^Dc_|QSq#-QVQ
z9Nf-2y9GM7Y+$e~En8j`tQeHLVsP%tAws|5!--2rCoUZ$$pgKuG^y4e&1#>R6!bEI
z_L$EWk2ZHePmzrdYkVvDb{laCzivQpQz0he9})3BCi+=Lq5Nm!1{UWHJ(5>;*F;5#
zGGJjx{Qza`Qx)pl>j!kW-nE3Muw&e-;I52r>A2|c9LEL=M+fH(Q=A8S)!*ev^##YC
zWtqGa_v{X(6XDNgA<xR4f}WW}hkJ+~?jy~Rxk2~8#OaUl9_OQ0#K(p70UG*)PXRWw
S`-~v;5p;349NxLd(ElBW2mX=(

literal 0
HcmV?d00001

diff --git a/release/windows/inno/installer.ico b/release/windows/inno/installer.ico
new file mode 100644
index 0000000000000000000000000000000000000000..922c9d472d9f2bc9fe7af5474217e1a4af5faec0
GIT binary patch
literal 25214
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
bWR6SaS3XPRTwkUV`9<8|b_hYMmdO7P6G#4Z

literal 0
HcmV?d00001


From 2fc4ee354574d52200544eec00aed95442cf4d04 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 10 Sep 2009 02:57:25 +0000
Subject: [PATCH 508/577] Curve cleanup

Renamed BevPoint's members
* x,y,z -> vec[3]; compatible with other functions.
* f1 -> split_tag; used by displist to set the splitting flag.
* f2 -> dupe_tag; used in curve.c to remove duplicates.

BevList
* flag -> dupe_nr; was being used as a counter for duplicate points.

* use arithb.c functions where possible.

* arrays for coords, tilt and radius were being allocated, then copied into the BevPoint's, now write directly into the values without allocing/freeing arrays.
---
 source/blender/blenkernel/BKE_curve.h         |   2 +-
 source/blender/blenkernel/intern/anim.c       |  28 +--
 source/blender/blenkernel/intern/armature.c   |   8 +-
 source/blender/blenkernel/intern/colortools.c |   4 +-
 source/blender/blenkernel/intern/curve.c      | 225 +++++++-----------
 source/blender/blenkernel/intern/displist.c   |  40 ++--
 source/blender/makesdna/DNA_curve_types.h     |   6 +-
 source/blender/python/api2_2x/Geometry.c      |   2 +-
 source/blender/src/drawipo.c                  |   4 +-
 source/blender/src/drawobject.c               |   6 +-
 10 files changed, 127 insertions(+), 198 deletions(-)

diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 79f4708fd41..2aa8e35391f 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -70,7 +70,7 @@ void minmaxNurb( struct Nurb *nu, float *min, float *max);
 void makeknots( struct Nurb *nu, short uv);
 
 void makeNurbfaces(struct Nurb *nu, float *coord_array, int rowstride);
-void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, int resolu);
+void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, int resolu, int stride);
 void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int it, int stride);
 float *make_orco_curve( struct Object *ob);
 float *make_orco_surf( struct Object *ob);
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index e75b31dd892..2e08763821f 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -86,11 +86,11 @@ void free_path(Path *path)
 void calc_curvepath(Object *ob)
 {
 	BevList *bl;
-	BevPoint *bevp, *bevpn, *bevpfirst, *bevplast, *tempbevp;
+	BevPoint *bevp, *bevpn, *bevpfirst, *bevplast;
 	Curve *cu;
 	Nurb *nu;
 	Path *path;
-	float *fp, *dist, *maxdist, x, y, z;
+	float *fp, *dist, *maxdist, xyz[3];
 	float fac, d=0, fac1, fac2;
 	int a, tot, cycl=0;
 	float *ft;
@@ -129,19 +129,12 @@ void calc_curvepath(Object *ob)
 	*fp= 0;
 	for(a=0; a<tot; a++) {
 		fp++;
-		if(cycl && a==tot-1) {
-			x= bevpfirst->x - bevp->x;
-			y= bevpfirst->y - bevp->y;
-			z= bevpfirst->z - bevp->z;
-		}
-		else {
-                        tempbevp = bevp+1;
-			x= (tempbevp)->x - bevp->x;
-			y= (tempbevp)->y - bevp->y;
-			z= (tempbevp)->z - bevp->z;
-		}
-		*fp= *(fp-1)+ (float)sqrt(x*x+y*y+z*z);
+		if(cycl && a==tot-1)
+			VecSubf(xyz, bevpfirst->vec, bevp->vec);
+		else
+			VecSubf(xyz, (bevp+1)->vec, bevp->vec);
 		
+		*fp= *(fp-1)+VecLength(xyz);
 		bevp++;
 	}
 	
@@ -178,14 +171,11 @@ void calc_curvepath(Object *ob)
 		fac2= *(fp)-d;
 		fac1= fac2/fac1;
 		fac2= 1.0f-fac1;
-
-		ft[0]= fac1*bevp->x+ fac2*(bevpn)->x;
-		ft[1]= fac1*bevp->y+ fac2*(bevpn)->y;
-		ft[2]= fac1*bevp->z+ fac2*(bevpn)->z;
+		
+		VecLerpf(ft, bevp->vec, bevpn->vec, fac2);
 		ft[3]= fac1*bevp->alfa+ fac2*(bevpn)->alfa;
 		
 		ft+= 4;
-
 	}
 	
 	MEM_freeN(dist);
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 1577eb4f850..9a73b3355ce 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -654,10 +654,10 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 	if(bone->segments > MAX_BBONE_SUBDIV)
 		bone->segments= MAX_BBONE_SUBDIV;
 	
-	forward_diff_bezier(0.0, h1[0],		h2[0],			0.0,		data[0],	MAX_BBONE_SUBDIV, 4);
-	forward_diff_bezier(0.0, h1[1],		length + h2[1],	length,		data[0]+1,	MAX_BBONE_SUBDIV, 4);
-	forward_diff_bezier(0.0, h1[2],		h2[2],			0.0,		data[0]+2,	MAX_BBONE_SUBDIV, 4);
-	forward_diff_bezier(roll1, roll1 + 0.390464f*(roll2-roll1), roll2 - 0.390464f*(roll2-roll1),	roll2,	data[0]+3,	MAX_BBONE_SUBDIV, 4);
+	forward_diff_bezier(0.0, h1[0],		h2[0],			0.0,		data[0],	MAX_BBONE_SUBDIV, 4*sizeof(float));
+	forward_diff_bezier(0.0, h1[1],		length + h2[1],	length,		data[0]+1,	MAX_BBONE_SUBDIV, 4*sizeof(float));
+	forward_diff_bezier(0.0, h1[2],		h2[2],			0.0,		data[0]+2,	MAX_BBONE_SUBDIV, 4*sizeof(float));
+	forward_diff_bezier(roll1, roll1 + 0.390464f*(roll2-roll1), roll2 - 0.390464f*(roll2-roll1),	roll2,	data[0]+3,	MAX_BBONE_SUBDIV, 4*sizeof(float));
 	
 	equalize_bezier(data[0], bone->segments);	// note: does stride 4!
 	
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 1bc34aea9a1..96ff3264822 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -413,8 +413,8 @@ static void curvemap_make_table(CurveMap *cuma, rctf *clipr)
 	
 	for(a=0; a<cuma->totpoint-1; a++, fp += 2*CM_RESOL) {
 		correct_bezpart(bezt[a].vec[1], bezt[a].vec[2], bezt[a+1].vec[0], bezt[a+1].vec[1]);
-		forward_diff_bezier(bezt[a].vec[1][0], bezt[a].vec[2][0], bezt[a+1].vec[0][0], bezt[a+1].vec[1][0], fp, CM_RESOL-1, 2);	
-		forward_diff_bezier(bezt[a].vec[1][1], bezt[a].vec[2][1], bezt[a+1].vec[0][1], bezt[a+1].vec[1][1], fp+1, CM_RESOL-1, 2);
+		forward_diff_bezier(bezt[a].vec[1][0], bezt[a].vec[2][0], bezt[a+1].vec[0][0], bezt[a+1].vec[1][0], fp, CM_RESOL-1, 2*sizeof(float));	
+		forward_diff_bezier(bezt[a].vec[1][1], bezt[a].vec[2][1], bezt[a+1].vec[0][1], bezt[a+1].vec[1][1], fp+1, CM_RESOL-1, 2*sizeof(float));
 	}
 	
 	/* store first and last handle for extrapolation, unit length */
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 86cfe9d4c6f..4d10308be20 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -64,7 +64,6 @@
 #include "BKE_library.h"  
 #include "BKE_key.h"  
 
-
 /* globals */
 
 extern ListBase editNurb;  /* editcurve.c */
@@ -813,7 +812,7 @@ void makeNurbfaces(Nurb *nu, float *coord_array, int rowstride)
 	MEM_freeN(jend);
 }
 
-void makeNurbcurve(Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, int resolu)
+void makeNurbcurve(Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, int resolu, int stride)
 /* coord_array has to be 3*4*pntsu*resolu in size and zero-ed
  * tilt_array and radius_array will be written to if valid */
 {
@@ -897,10 +896,10 @@ void makeNurbcurve(Nurb *nu, float *coord_array, float *tilt_array, float *radiu
 			}
 		}
 
-		coord_fp+= 3;
+		coord_fp = (float *)(((char *)coord_fp) + stride);
 		
-		if (tilt_fp) tilt_fp++;
-		if (radius_fp) radius_fp++;
+		if (tilt_fp)	tilt_fp = (float *)(((char *)tilt_fp) + stride);
+		if (radius_fp)	radius_fp = (float *)(((char *)radius_fp) + stride);
 		
 		u+= ustep;
 	}
@@ -931,7 +930,7 @@ void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int i
   
   	for(a=0; a<=it; a++) {
 		*p= q0;
-		p+= stride;
+		p = (float *)(((char *)p)+stride);
 		q0+= q1;
  		q1+= q2;
  		q2+= q3;
@@ -1350,8 +1349,8 @@ static short bevelinside(BevList *bl1,BevList *bl2)
 	/* take first vertex of possible hole */
 
 	bevp= (BevPoint *)(bl2+1);
-	hvec1[0]= bevp->x; 
-	hvec1[1]= bevp->y; 
+	hvec1[0]= bevp->vec[0]; 
+	hvec1[1]= bevp->vec[1]; 
 	hvec1[2]= 0.0;
 	VECCOPY(hvec2,hvec1);
 	hvec2[0]+=1000;
@@ -1364,16 +1363,16 @@ static short bevelinside(BevList *bl1,BevList *bl2)
 	prevbevp= bevp+(nr-1);
 
 	while(nr--) {
-		min= prevbevp->y;
-		max= bevp->y;
+		min= prevbevp->vec[0];
+		max= bevp->vec[1];
 		if(max<min) {
 			min= max;
-			max= prevbevp->y;
+			max= prevbevp->vec[1];
 		}
 		if(min!=max) {
 			if(min<=hvec1[1] && max>=hvec1[1]) {
 				/* there's a transition, calc intersection point */
-				mode= cu_isectLL(&(prevbevp->x),&(bevp->x),hvec1,hvec2,0,1,&lab,&mu,vec);
+				mode= cu_isectLL(prevbevp->vec, bevp->vec, hvec1, hvec2, 0, 1, &lab, &mu, vec);
 				/* if lab==0.0 or lab==1.0 then the edge intersects exactly a transition
 			           only allow for one situation: we choose lab= 1.0
 				 */
@@ -1446,12 +1445,15 @@ static void calc_bevel_sin_cos(float x1, float y1, float x2, float y2, float *si
 
 }
 
-static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *tilt_array, float *radius_array, int resolu)
+static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *tilt_array, float *radius_array, int resolu, int stride)
 {
 	BezTriple *pprev, *next, *last;
 	float fac, dfac, t[4];
 	int a;
 	
+	if(tilt_array==NULL && radius_array==NULL)
+		return;
+	
 	last= nu->bezt+(nu->pntsu-1);
 	
 	/* returns a point */
@@ -1474,11 +1476,13 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
 	for(a=0; a<resolu; a++, fac+= dfac) {
 		if (tilt_array) {
 			if (nu->tilt_interp==3) { /* May as well support for tilt also 2.47 ease interp */
-				tilt_array[a] = prevbezt->alfa + (bezt->alfa - prevbezt->alfa)*(3.0f*fac*fac - 2.0f*fac*fac*fac);
+				*tilt_array = prevbezt->alfa + (bezt->alfa - prevbezt->alfa)*(3.0f*fac*fac - 2.0f*fac*fac*fac);
 			} else {
 				key_curve_position_weights(fac, t, nu->tilt_interp);
-				tilt_array[a]= t[0]*pprev->alfa + t[1]*prevbezt->alfa + t[2]*bezt->alfa + t[3]*next->alfa;
+				*tilt_array= t[0]*pprev->alfa + t[1]*prevbezt->alfa + t[2]*bezt->alfa + t[3]*next->alfa;
 			}
+			
+			tilt_array = (float *)(((char *)tilt_array) + stride); 
 		}
 		
 		if (radius_array) {
@@ -1486,15 +1490,17 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
 				/* Support 2.47 ease interp
 				 * Note! - this only takes the 2 points into account,
 				 * giving much more localized results to changes in radius, sometimes you want that */
-				radius_array[a] = prevbezt->radius + (bezt->radius - prevbezt->radius)*(3.0f*fac*fac - 2.0f*fac*fac*fac);
+				*radius_array = prevbezt->radius + (bezt->radius - prevbezt->radius)*(3.0f*fac*fac - 2.0f*fac*fac*fac);
 			} else {
 				
 				/* reuse interpolation from tilt if we can */
 				if (tilt_array==NULL || nu->tilt_interp != nu->radius_interp) {
 					key_curve_position_weights(fac, t, nu->radius_interp);
 				}
-				radius_array[a]= t[0]*pprev->radius + t[1]*prevbezt->radius + t[2]*bezt->radius + t[3]*next->radius;
+				*radius_array= t[0]*pprev->radius + t[1]*prevbezt->radius + t[2]*bezt->radius + t[3]*next->radius;
 			}
+			
+			radius_array = (float *)(((char *)radius_array) + stride); 
 		}
 	}
 }
@@ -1514,8 +1520,6 @@ void makeBevelList(Object *ob)
 	BevList *bl, *blnew, *blnext;
 	BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0;
 	float min, inp, x1, x2, y1, y2, vec[3], vec_prev[3], q[4], quat[4], quat_prev[4], cross[3];
-	float *coord_array, *tilt_array=NULL, *radius_array=NULL, *coord_fp, *tilt_fp=NULL, *radius_fp=NULL;
-	float *v1, *v2;
 	struct bevelsort *sortdata, *sd, *sd1;
 	int a, b, nr, poly, resolu, len=0;
 	int do_tilt, do_radius;
@@ -1558,17 +1562,15 @@ void makeBevelList(Object *ob)
 				if(nu->flagu & CU_CYCLIC) bl->poly= 0;
 				else bl->poly= -1;
 				bl->nr= len;
-				bl->flag= 0;
+				bl->dupe_nr= 0;
 				bevp= (BevPoint *)(bl+1);
 				bp= nu->bp;
 	
 				while(len--) {
-					bevp->x= bp->vec[0];
-					bevp->y= bp->vec[1];
-					bevp->z= bp->vec[2];
+					VECCOPY(bevp->vec, bp->vec);
 					bevp->alfa= bp->alfa;
 					bevp->radius= bp->radius;
-					bevp->f1= SELECT;
+					bevp->split_tag= TRUE;
 					bevp++;
 					bp++;
 				}
@@ -1594,88 +1596,52 @@ void makeBevelList(Object *ob)
 					bezt++;
 				}
 				
-				coord_array= coord_fp= MEM_mallocN(3*sizeof(float)*(resolu+1), "makeBevelCoords");
-				
-				if(do_tilt)
-					tilt_array= tilt_fp= MEM_callocN(sizeof(float)*(resolu+1), "makeBevelTilt");
-				
-				if (do_radius)
-					radius_array= radius_fp= MEM_callocN(sizeof(float)*(resolu+1), "nakeBevelRadius");
-				
 				while(a--) {
 					if(prevbezt->h2==HD_VECT && bezt->h1==HD_VECT) {
-	
-						bevp->x= prevbezt->vec[1][0];
-						bevp->y= prevbezt->vec[1][1];
-						bevp->z= prevbezt->vec[1][2];
+
+						VECCOPY(bevp->vec, prevbezt->vec[1]);
 						bevp->alfa= prevbezt->alfa;
 						bevp->radius= prevbezt->radius;
-						bevp->f1= SELECT;
-						bevp->f2= 0;
+						bevp->split_tag= TRUE;
+						bevp->dupe_tag= FALSE;
 						bevp++;
 						bl->nr++;
-						bl->flag= 1;
+						bl->dupe_nr= 1;
 					}
 					else {
-						v1= prevbezt->vec[1];
-						v2= bezt->vec[0];
-						
 						/* always do all three, to prevent data hanging around */
-						forward_diff_bezier(v1[0], v1[3], v2[0], v2[3], coord_array, resolu, 3);
-						forward_diff_bezier(v1[1], v1[4], v2[1], v2[4], coord_array+1, resolu, 3);
-						forward_diff_bezier(v1[2], v1[5], v2[2], v2[5], coord_array+2, resolu, 3);
+						int j;
 						
-						if (do_tilt || do_radius)
-							alfa_bezpart(prevbezt, bezt, nu, tilt_array, radius_array, resolu);
+						/* BevPoint must stay aligned to 4 so sizeof(BevPoint)/sizeof(float) works */
+						for(j=0; j<3; j++) {
+							forward_diff_bezier(	prevbezt->vec[1][j],	prevbezt->vec[2][j],
+													bezt->vec[0][j],		bezt->vec[1][j],
+													&(bevp->vec[j]), resolu, sizeof(BevPoint));
+						}
+						
+						/* if both arrays are NULL do nothiong */
+						alfa_bezpart(	prevbezt, bezt, nu,
+										 do_tilt	? &bevp->alfa : NULL,
+										 do_radius	? &bevp->radius : NULL,
+										 resolu, sizeof(BevPoint));
 						
 						/* indicate with handlecodes double points */
 						if(prevbezt->h1==prevbezt->h2) {
-							if(prevbezt->h1==0 || prevbezt->h1==HD_VECT) bevp->f1= SELECT;
+							if(prevbezt->h1==0 || prevbezt->h1==HD_VECT) bevp->split_tag= TRUE;
 						}
 						else {
-							if(prevbezt->h1==0 || prevbezt->h1==HD_VECT) bevp->f1= SELECT;
-							else if(prevbezt->h2==0 || prevbezt->h2==HD_VECT) bevp->f1= SELECT;
-						}
-						
-						nr= resolu;
-						
-						coord_fp = coord_array;
-						tilt_fp = tilt_array;
-						radius_fp = radius_array;
-						
-						while(nr--) {
-							bevp->x= coord_fp[0]; 
-							bevp->y= coord_fp[1];
-							bevp->z= coord_fp[2];
-							coord_fp+=3;
-							
-							if (do_tilt) {
-								bevp->alfa= *tilt_fp;
-								tilt_fp++;
-							}
-							
-							if (do_radius) {
-								bevp->radius= *radius_fp;
-								radius_fp++;
-							}
-							bevp++;
+							if(prevbezt->h1==0 || prevbezt->h1==HD_VECT) bevp->split_tag= TRUE;
+							else if(prevbezt->h2==0 || prevbezt->h2==HD_VECT) bevp->split_tag= TRUE;
 						}
 						bl->nr+= resolu;
-	
+						bevp+= resolu;
 					}
 					prevbezt= bezt;
 					bezt++;
 				}
 				
-				MEM_freeN(coord_array);
-				if (do_tilt)	MEM_freeN(tilt_array);
-				if (do_radius)	MEM_freeN(radius_array);
-				coord_array = tilt_array = radius_array = NULL;
-				
 				if((nu->flagu & CU_CYCLIC)==0) {	    /* not cyclic: endpoint */
-					bevp->x= prevbezt->vec[1][0];
-					bevp->y= prevbezt->vec[1][1];
-					bevp->z= prevbezt->vec[1][2];
+					VECCOPY(bevp->vec, prevbezt->vec[1]);
 					bevp->alfa= prevbezt->alfa;
 					bevp->radius= prevbezt->radius;
 					bl->nr++;
@@ -1688,45 +1654,15 @@ void makeBevelList(Object *ob)
 					bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList3");
 					BLI_addtail(&(cu->bev), bl);
 					bl->nr= len;
-					bl->flag= 0;
+					bl->dupe_nr= 0;
 					if(nu->flagu & CU_CYCLIC) bl->poly= 0;
 					else bl->poly= -1;
 					bevp= (BevPoint *)(bl+1);
-	
-					coord_array= coord_fp= MEM_callocN(3*sizeof(float)*len, "makeBevelCoords");    /* has to be zero-ed */
 					
-					if(do_tilt)
-						tilt_array= tilt_fp= MEM_callocN(sizeof(float)*len, "makeBevelTilt");
-					
-					if (do_radius)
-						radius_array= radius_fp= MEM_callocN(sizeof(float)*len, "nakeBevelRadius");
-					
-					makeNurbcurve(nu, coord_array, tilt_array, radius_array, resolu);
-					
-					while(len--) {
-						bevp->x= coord_fp[0]; 
-						bevp->y= coord_fp[1];
-						bevp->z= coord_fp[2];
-						coord_fp+=3;
-						
-						if (do_tilt) {
-							bevp->alfa= *tilt_fp;
-							tilt_fp++;
-						}
-						
-						if (do_radius) {
-							bevp->radius= *radius_fp;
-							radius_fp++;
-						}
-						
-						
-						bevp->f1= bevp->f2= 0;
-						bevp++;
-					}
-					MEM_freeN(coord_array);
-					if (do_tilt)	MEM_freeN(tilt_array);
-					if (do_radius)	MEM_freeN(radius_array);
-					coord_array = tilt_array = radius_array = NULL;
+					makeNurbcurve(	nu, &bevp->vec[0],
+									do_tilt		? &bevp->alfa : NULL,
+									do_radius	? &bevp->radius : NULL,
+									resolu, sizeof(BevPoint));
 				}
 			}
 		}
@@ -1742,11 +1678,11 @@ void makeBevelList(Object *ob)
 			bevp0= bevp1+(nr-1);
 			nr--;
 			while(nr--) {
-				if( fabs(bevp0->x-bevp1->x)<0.00001 ) {
-					if( fabs(bevp0->y-bevp1->y)<0.00001 ) {
-						if( fabs(bevp0->z-bevp1->z)<0.00001 ) {
-							bevp0->f2= SELECT;
-							bl->flag++;
+				if( fabs(bevp0->vec[0]-bevp1->vec[0])<0.00001 ) {
+					if( fabs(bevp0->vec[1]-bevp1->vec[1])<0.00001 ) {
+						if( fabs(bevp0->vec[2]-bevp1->vec[2])<0.00001 ) {
+							bevp0->dupe_tag= TRUE;
+							bl->dupe_nr++;
 						}
 					}
 				}
@@ -1759,8 +1695,8 @@ void makeBevelList(Object *ob)
 	bl= cu->bev.first;
 	while(bl) {
 		blnext= bl->next;
-		if(bl->nr && bl->flag) {
-			nr= bl->nr- bl->flag+1;	/* +1 because vectorbezier sets flag too */
+		if(bl->nr && bl->dupe_nr) {
+			nr= bl->nr- bl->dupe_nr+1;	/* +1 because vectorbezier sets flag too */
 			blnew= MEM_mallocN(sizeof(BevList)+nr*sizeof(BevPoint), "makeBevelList4");
 			memcpy(blnew, bl, sizeof(BevList));
 			blnew->nr= 0;
@@ -1770,7 +1706,7 @@ void makeBevelList(Object *ob)
 			bevp1= (BevPoint *)(blnew+1);
 			nr= bl->nr;
 			while(nr--) {
-				if(bevp0->f2==0) {
+				if(bevp0->dupe_tag==0) {
 					memcpy(bevp1, bevp0, sizeof(BevPoint));
 					bevp1++;
 					blnew->nr++;
@@ -1778,7 +1714,7 @@ void makeBevelList(Object *ob)
 				bevp0++;
 			}
 			MEM_freeN(bl);
-			blnew->flag= 0;
+			blnew->dupe_nr= 0;
 		}
 		bl= blnext;
 	}
@@ -1807,8 +1743,8 @@ void makeBevelList(Object *ob)
 				bevp= (BevPoint *)(bl+1);
 				nr= bl->nr;
 				while(nr--) {
-					if(min>bevp->x) {
-						min= bevp->x;
+					if(min>bevp->vec[0]) {
+						min= bevp->vec[0];
 						bevp1= bevp;
 					}
 					bevp++;
@@ -1823,8 +1759,7 @@ void makeBevelList(Object *ob)
 				if(bevp1== bevp) bevp2= (BevPoint *)(bl+1);
 				else bevp2= bevp1+1;
 
-				inp= (bevp1->x- bevp0->x)*(bevp0->y- bevp2->y)
-				    +(bevp0->y- bevp1->y)*(bevp0->x- bevp2->x);
+				inp= (bevp1->vec[0]- bevp0->vec[0]) * (bevp0->vec[1]- bevp2->vec[1]) + (bevp0->vec[1]- bevp1->vec[1]) * (bevp0->vec[0]- bevp2->vec[0]);
 
 				if(inp>0.0) sd->dir= 1;
 				else sd->dir= 0;
@@ -1879,8 +1814,8 @@ void makeBevelList(Object *ob)
 			bevp2= (BevPoint *)(bl+1);
 			bevp1= bevp2+1;
 
-			x1= bevp1->x- bevp2->x;
-			y1= bevp1->y- bevp2->y;
+			x1= bevp1->vec[0]- bevp2->vec[0];
+			y1= bevp1->vec[1]- bevp2->vec[1];
 
 			calc_bevel_sin_cos(x1, y1, -x1, -y1, &(bevp1->sina), &(bevp1->cosa));
 			bevp2->sina= bevp1->sina;
@@ -1889,7 +1824,7 @@ void makeBevelList(Object *ob)
 			if(cu->flag & CU_3D) {	/* 3D */
 				float quat[4], q[4];
 			
-				VecSubf(vec, &bevp1->x, &bevp2->x);
+				VecSubf(vec, bevp1->vec, bevp2->vec);
 				
 				vectoquat(vec, 5, 1, quat);
 				
@@ -1924,7 +1859,7 @@ void makeBevelList(Object *ob)
 				while(nr--) {
 	
 					/* Normalizes */
-					VecBisect3(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+					VecBisect3(vec, bevp0->vec, bevp1->vec, bevp2->vec);
 
 					if(bl->nr==nr+1) { /* first time */
 						vectoquat(vec, 5, 1, quat);
@@ -1976,7 +1911,7 @@ void makeBevelList(Object *ob)
 			nr= bl->nr;
 			while(nr--) {
 
-				VecBisect3(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+				VecBisect3(vec, bevp0->vec, bevp1->vec, bevp2->vec);
 
 				quat_tmp1= (float *)bevp1->mat;
 				quat_tmp2= quat_tmp1+4;
@@ -1989,10 +1924,10 @@ void makeBevelList(Object *ob)
 				QuatToMat3(quat, bevp1->mat);
 				
 				/* generic */
-				x1= bevp1->x- bevp0->x;
-				x2= bevp1->x- bevp2->x;
-				y1= bevp1->y- bevp0->y;
-				y2= bevp1->y- bevp2->y;
+				x1= bevp1->vec[0]- bevp0->vec[0];
+				x2= bevp1->vec[0]- bevp2->vec[0];
+				y1= bevp1->vec[1]- bevp0->vec[1];
+				y2= bevp1->vec[1]- bevp2->vec[1];
 			
 				calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
 				
@@ -2014,7 +1949,7 @@ void makeBevelList(Object *ob)
 				if(cu->flag & CU_3D) {	/* 3D */
 
 					/* Normalizes */
-					VecBisect3(vec, &bevp0->x, &bevp1->x, &bevp2->x);
+					VecBisect3(vec, bevp0->vec, bevp1->vec, bevp2->vec);
 
 					if(bl->nr==nr+1 || !(cu->flag & CU_NO_TWIST)) { /* first time */
 						vectoquat(vec, 5, 1, quat);
@@ -2039,10 +1974,10 @@ void makeBevelList(Object *ob)
 					QuatToMat3(quat, bevp1->mat);
 				}
 
-				x1= bevp1->x- bevp0->x;
-				x2= bevp1->x- bevp2->x;
-				y1= bevp1->y- bevp0->y;
-				y2= bevp1->y- bevp2->y;
+				x1= bevp1->vec[0]- bevp0->vec[0];
+				x2= bevp1->vec[0]- bevp2->vec[0];
+				y1= bevp1->vec[1]- bevp0->vec[1];
+				y2= bevp1->vec[1]- bevp2->vec[1];
 
 				calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
 
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index afc769b0966..c55dc8addb1 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -804,7 +804,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 	DispList *dl;
 	BezTriple *bezt, *prevbezt;
 	BPoint *bp;
-	float *data, *v1, *v2;
+	float *data;
 	int a, len, resolu;
 	
 	nu= nubase->first;
@@ -869,11 +869,15 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 						data+= 3;
 					}
 					else {
-						v1= prevbezt->vec[1];
-						v2= bezt->vec[0];
-						forward_diff_bezier(v1[0], v1[3], v2[0], v2[3], data, resolu, 3);
-						forward_diff_bezier(v1[1], v1[4], v2[1], v2[4], data+1, resolu, 3);
-						forward_diff_bezier(v1[2], v1[5], v2[2], v2[5], data+2, resolu, 3);
+						int j;
+						for(j=0; j<3; j++) {
+							forward_diff_bezier(	prevbezt->vec[1][j],
+													prevbezt->vec[2][j],
+													bezt->vec[0][j],
+													bezt->vec[1][j],
+													data+j, resolu, 3*sizeof(float));
+						}
+						
 						data+= 3*resolu;
 					}
 					
@@ -900,7 +904,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 				data= dl->verts;
 				if(nu->flagu & CU_CYCLIC) dl->type= DL_POLY;
 				else dl->type= DL_SEGM;
-				makeNurbcurve(nu, data, NULL, NULL, resolu);
+				makeNurbcurve(nu, data, NULL, NULL, resolu, 3*sizeof(float));
 			}
 			else if((nu->type & 7)==CU_POLY) {
 				len= nu->pntsu;
@@ -1397,7 +1401,7 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender, int forOrco
 				if(nu->flagu & CU_CYCLIC) dl->type= DL_POLY;
 				else dl->type= DL_SEGM;
 				
-				makeNurbcurve(nu, data, NULL, NULL, nu->resolu);
+				makeNurbcurve(nu, data, NULL, NULL, nu->resolu, 3*sizeof(float));
 			}
 			else {
 				len= (nu->pntsu*nu->resolu) * (nu->pntsv*nu->resolv);
@@ -1508,9 +1512,9 @@ void makeDispListCurveTypes(Object *ob, int forOrco)
 						bevp= (BevPoint *)(bl+1);
 						data= dl->verts;
 						while(a--) {
-							data[0]= bevp->x+widfac*bevp->sina;
-							data[1]= bevp->y+widfac*bevp->cosa;
-							data[2]= bevp->z;
+							data[0]= bevp->vec[0]+widfac*bevp->sina;
+							data[1]= bevp->vec[1]+widfac*bevp->cosa;
+							data[2]= bevp->vec[2];
 							bevp++;
 							data+=3;
 						}
@@ -1550,7 +1554,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco)
 									fac = calc_taper(cu->taperobj, a, bl->nr);
 								}
 								
-								if (bevp->f1) {
+								if (bevp->split_tag) {
 									dl->bevelSplitFlag[a>>5] |= 1<<(a&0x1F);
 								}
 	
@@ -1566,14 +1570,14 @@ void makeDispListCurveTypes(Object *ob, int forOrco)
 										
 										Mat3MulVecfl(bevp->mat, vec);
 										
-										data[0]= bevp->x+ fac*vec[0];
-										data[1]= bevp->y+ fac*vec[1];
-										data[2]= bevp->z+ fac*vec[2];
+										data[0]= bevp->vec[0] + fac*vec[0];
+										data[1]= bevp->vec[1] + fac*vec[1];
+										data[2]= bevp->vec[2] + fac*vec[2];
 									}
 									else {
-										data[0]= bevp->x+ fac*(widfac+fp1[1])*bevp->sina;
-										data[1]= bevp->y+ fac*(widfac+fp1[1])*bevp->cosa;
-										data[2]= bevp->z+ fac*fp1[2];
+										data[0]= bevp->vec[0] + fac*(widfac+fp1[1])*bevp->sina;
+										data[1]= bevp->vec[1] + fac*(widfac+fp1[1])*bevp->cosa;
+										data[2]= bevp->vec[2] + fac*fp1[2];
 									}
 								}
 							}
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 60dba9ce018..65d8cc6fbc6 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -60,7 +60,7 @@ typedef struct Path {
 #
 typedef struct BevList {
 	struct BevList *next, *prev;
-	int nr, flag;
+	int nr, dupe_nr;
 	short poly, hole;
 } BevList;
 
@@ -68,8 +68,8 @@ typedef struct BevList {
 #
 #
 typedef struct BevPoint {
-	float x, y, z, alfa, radius, sina, cosa, mat[3][3];
-	short f1, f2;
+	float vec[3], mat[3][3], alfa, radius, sina, cosa;
+	short split_tag, dupe_tag;
 } BevPoint;
 
 /* Keyframes on IPO curves and Points on Bezier Curves/Paths are generally BezTriples */
diff --git a/source/blender/python/api2_2x/Geometry.c b/source/blender/python/api2_2x/Geometry.c
index e5679ea6ed7..4297453c91e 100644
--- a/source/blender/python/api2_2x/Geometry.c
+++ b/source/blender/python/api2_2x/Geometry.c
@@ -509,7 +509,7 @@ static PyObject *M_Geometry_BezierInterp( PyObject * self, PyObject * args )
 	
 	coord_array = MEM_callocN(dims * (resolu) * sizeof(float), "BezierInterp");
 	for(i=0; i<dims; i++) {
-		forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i, resolu-1, dims);
+		forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i, resolu-1, dims*sizeof(float));
 	}
 	
 	list= PyList_New(resolu);
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index 973782d7463..bc762bdb1a8 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -1514,8 +1514,8 @@ static void draw_ipocurves(int sel)
 									
 									correct_bezpart(v1, v2, v3, v4);
 									
-									forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, 3);
-									forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, 3);
+									forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, 3*sizeof(float));
+									forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, 3*sizeof(float));
 									
 									fp= data;
 									while(resol--) {
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index fddbadac22d..22a9f277433 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -3949,9 +3949,9 @@ static void drawnurb(Base *base, Nurb *nurb, int dt)
 				dz = fac*bevp->mat[2][2];
 
 				glBegin(GL_LINE_STRIP);
-				glVertex3f(bevp->x - ox - dx, bevp->y - oy - dy, bevp->z - oz - dz);
-				glVertex3f(bevp->x, bevp->y, bevp->z);
-				glVertex3f(bevp->x + ox - dx, bevp->y + oy - dy, bevp->z + oz - dz);
+				glVertex3f(bevp->vec[0] - ox - dx, bevp->vec[1] - oy - dy, bevp->vec[2] - oz - dz);
+				glVertex3fv(bevp->vec);
+				glVertex3f(bevp->vec[0] + ox - dx, bevp->vec[1] + oy - dy, bevp->vec[2] + oz - dz);
 				glEnd();
 				
 				bevp += skip+1;

From dac27004b863da96c57b071fc0479680e06a9725 Mon Sep 17 00:00:00 2001
From: Robert Holcomb <bob_holcomb@hotmail.com>
Date: Thu, 10 Sep 2009 03:00:50 +0000
Subject: [PATCH 509/577] committing patch #19252-Soft/Linear Light blend
 modes+Darken mode bug fix

---
 source/blender/blenkernel/intern/material.c   | 51 +++++++++++++++----
 source/blender/editors/space_node/drawnode.c  |  2 +-
 source/blender/makesdna/DNA_material_types.h  |  2 +
 source/blender/makesdna/DNA_texture_types.h   |  2 +
 source/blender/makesrna/intern/rna_material.c |  2 +
 source/blender/makesrna/intern/rna_texture.c  |  2 +
 source/blender/render/intern/source/texture.c | 25 ++++++++-
 7 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 53de570b55e..e6f9ac2f404 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1031,15 +1031,15 @@ void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col)
 			}
 				break;
 		case MA_RAMP_DARK:
-			tmp= fac*col[0];
-			if(tmp < *r) *r= tmp; 
-				if(g) {
-					tmp= fac*col[1];
-					if(tmp < *g) *g= tmp; 
-					tmp= fac*col[2];
-					if(tmp < *b) *b= tmp; 
-				}
-					break;
+            tmp=col[0]+((1-col[0])*facm); 
+            if(tmp < *r) *r= tmp; 
+            if(g) { 
+                tmp=col[1]+((1-col[1])*facm); 
+                if(tmp < *g) *g= tmp; 
+                tmp=col[2]+((1-col[2])*facm); 
+                if(tmp < *b) *b= tmp; 
+            } 
+                break; 
 		case MA_RAMP_LIGHT:
 			tmp= fac*col[0];
 			if(tmp > *r) *r= tmp; 
@@ -1169,8 +1169,37 @@ void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col)
 				}
 			}
 				break;
-	}
-	
+        case MA_RAMP_SOFT: 
+            if (g){ 
+                float scr, scg, scb; 
+                 
+                /* first calculate non-fac based Screen mix */ 
+                scr = 1.0 - ((1.0 - col[0])) * (1.0 - *r); 
+                scg = 1.0 - ((1.0 - col[1])) * (1.0 - *g); 
+                scb = 1.0 - ((1.0 - col[2])) * (1.0 - *b); 
+                 
+                *r = facm*(*r) + fac*(((1.0 - *r) * col[0] * (*r)) + (*r * scr)); 
+                *g = facm*(*g) + fac*(((1.0 - *g) * col[1] * (*g)) + (*g * scg)); 
+                *b = facm*(*b) + fac*(((1.0 - *b) * col[2] * (*b)) + (*b * scb)); 
+            } 
+                break; 
+        case MA_RAMP_LINEAR: 
+            if (col[0] > 0.5)  
+                *r = *r + fac*(2*(col[0]-0.5)); 
+            else  
+                *r = *r + fac*(2*(col[0]) - 1); 
+            if (g){ 
+                if (col[1] > 0.5)  
+                    *g = *g + fac*(2*(col[1]-0.5)); 
+                else  
+                    *g = *g + fac*(2*(col[1]) -1); 
+                if (col[2] > 0.5)  
+                    *b = *b + fac*(2*(col[2]-0.5)); 
+                else  
+                    *b = *b + fac*(2*(col[2]) - 1); 
+            } 
+                break; 
+	}	
 }
 
 
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 2f64108384e..7617f328fd9 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -247,7 +247,7 @@ static int node_buts_mix_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
 		
 		/* blend type */
 		uiBlockBeginAlign(block);
-		bt=uiDefButS(block, MENU, B_NODE_EXEC, "Mix %x0|Add %x1|Subtract %x3|Multiply %x2|Screen %x4|Overlay %x9|Divide %x5|Difference %x6|Darken %x7|Lighten %x8|Dodge %x10|Burn %x11|Color %x15|Value %x14|Saturation %x13|Hue %x12",
+		bt=uiDefButS(block, MENU, B_NODE_EXEC, "Mix %x0|Add %x1|Subtract %x3|Multiply %x2|Screen %x4|Overlay %x9|Divide %x5|Difference %x6|Darken %x7|Lighten %x8|Dodge %x10|Burn %x11|Color %x15|Value %x14|Saturation %x13|Hue %x12|Soft Light %x16|Linear Light %x17", 
 					 (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin -(a_but?20:0), 20, 
 					 &node->custom1, 0, 0, 0, 0, "");
 		uiButSetFunc(bt, node_but_title_cb, node, bt);
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index f268c117065..55e3c9107e4 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -279,6 +279,8 @@ typedef struct Material {
 #define MA_RAMP_SAT			13
 #define MA_RAMP_VAL			14
 #define MA_RAMP_COLOR		15
+#define MA_RAMP_SOFT        16 
+#define MA_RAMP_LINEAR      17 
 
 /* texco */
 #define TEXCO_ORCO		1
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 4df63ee9cd9..c13c0522004 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -448,6 +448,8 @@ typedef struct TexMapping {
 #define MTEX_BLEND_VAL		12
 #define MTEX_BLEND_COLOR	13
 #define MTEX_NUM_BLENDTYPES	14
+#define MTEX_SOFT_LIGHT     15 
+#define MTEX_LIN_LIGHT      16
 
 /* brush_map_mode */
 #define MTEX_MAP_MODE_FIXED    0
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 651aeae217e..cd1159bc138 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -616,6 +616,8 @@ static void rna_def_material_colors(StructRNA *srna)
 		{MA_RAMP_SAT, "SATURATION", 0, "Saturation", ""},
 		{MA_RAMP_VAL, "VALUE", 0, "Value", ""},
 		{MA_RAMP_COLOR, "COLOR", 0, "Color", ""},
+        {MA_RAMP_SOFT, "SOFT LIGHT", 0, "Soft Light", ""}, 
+        {MA_RAMP_LINEAR, "LINEAR LIGHT", 0, "Linear Light", ""}, 
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_ramp_input_items[] = {
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index b11e5c6c12f..f6835f3e7b5 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -374,6 +374,8 @@ static void rna_def_mtex(BlenderRNA *brna)
 		{MTEX_BLEND_SAT, "SATURATION", 0, "Saturation", ""},
 		{MTEX_BLEND_VAL, "VALUE", 0, "Value", ""},
 		{MTEX_BLEND_COLOR, "COLOR", 0, "Color", ""},
+        {MTEX_SOFT_LIGHT, "SOFT LIGHT", 0, "Soft Light", ""}, 
+        {MTEX_LIN_LIGHT    , "LINEAR LIGHT", 0, "Linear Light", ""}, 
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_map_mode_items[] = {
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 4d4a2c04808..2d2c01e0bf1 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1455,12 +1455,22 @@ void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg
 		VECCOPY(in, out);
 		ramp_blend(MA_RAMP_COLOR, in, in+1, in+2, fact, tex);
 		break;
+    case MTEX_SOFT_LIGHT: 
+        fact*= facg; 
+        VECCOPY(in, out); 
+        ramp_blend(MA_RAMP_SOFT, in, in+1, in+2, fact, tex); 
+        break; 
+    case MTEX_LIN_LIGHT: 
+        fact*= facg; 
+        VECCOPY(in, out); 
+        ramp_blend(MA_RAMP_LINEAR, in, in+1, in+2, fact, tex); 
+        break; 
 	}
 }
 
 float texture_value_blend(float tex, float out, float fact, float facg, int blendtype, int flip)
 {
-	float in=0.0, facm, col;
+	float in=0.0, facm, col, scf;
 	
 	fact*= facg;
 	facm= 1.0-fact;
@@ -1505,6 +1515,19 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen
 		col= fact*tex;
 		if(col > out) in= col; else in= out;
 		break;
+
+    case MTEX_SOFT_LIGHT: 
+        col= fact*tex; 
+        scf=1.0 - (1.0 - tex) * (1.0 - out); 
+        in= facm*out + fact * ((1.0 - out) * tex * out) + (out * scf); 
+        break;       
+
+    case MTEX_LIN_LIGHT: 
+        if (tex > 0.5) 
+            in = out + fact*(2*(tex - 0.5)); 
+        else 
+            in = out + fact*(2*tex - 1); 
+        break;
 	}
 	
 	return in;

From fa4ee2be849b6236d61e482106ed9e20f20f21de Mon Sep 17 00:00:00 2001
From: Robert Holcomb <bob_holcomb@hotmail.com>
Date: Thu, 10 Sep 2009 04:12:22 +0000
Subject: [PATCH 510/577] Added Levels Node (histogram, with mean/std deviation
 outputs) Added RGB space distance matte Node Added HSV color matte Node

Fixed Image difference matte Node to use image differences instead of RGB space distance
Fixed luminance node for low end values being read wrong
Fixed CMP_util copy/swap functions not accounting for all channels
Fixed UI for difference matte Node

Added RNA for new nodes
---
 source/blender/blenkernel/BKE_node.h          |   7 +-
 source/blender/blenkernel/intern/node.c       |   9 +-
 source/blender/editors/space_node/drawnode.c  | 121 +++++--
 source/blender/makesrna/intern/rna_nodetree.c |  60 ++--
 .../makesrna/intern/rna_nodetree_types.h      |   5 +-
 source/blender/nodes/CMP_node.h               |   7 +-
 .../nodes/intern/CMP_nodes/CMP_channelMatte.c |   4 +-
 .../nodes/intern/CMP_nodes/CMP_chromaMatte.c  |   4 +-
 .../nodes/intern/CMP_nodes/CMP_colorMatte.c   | 132 +++++++
 .../nodes/intern/CMP_nodes/CMP_diffMatte.c    | 174 +++------
 .../intern/CMP_nodes/CMP_distanceMatte.c      | 145 ++++++++
 .../nodes/intern/CMP_nodes/CMP_levels.c       | 337 ++++++++++++++++++
 .../nodes/intern/CMP_nodes/CMP_lummaMatte.c   |   2 +-
 source/blender/nodes/intern/CMP_util.c        |  26 +-
 source/blender/nodes/intern/CMP_util.h        |   5 +-
 15 files changed, 839 insertions(+), 199 deletions(-)
 create mode 100644 source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
 create mode 100644 source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
 create mode 100644 source/blender/nodes/intern/CMP_nodes/CMP_levels.c

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 40afa1dba36..cbb37918d04 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -25,7 +25,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -325,7 +325,7 @@ void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
 #define CMP_NODE_COMBYUVA	234
 #define CMP_NODE_DIFF_MATTE	235
 #define CMP_NODE_COLOR_SPILL	236
-#define CMP_NODE_CHROMA		237
+#define CMP_NODE_CHROMA_MATTE	237
 #define CMP_NODE_CHANNEL_MATTE	238
 #define CMP_NODE_FLIP		239
 #define CMP_NODE_SPLITVIEWER	240
@@ -345,6 +345,9 @@ void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
 #define CMP_NODE_DBLUR		254
 #define CMP_NODE_BILATERALBLUR  255
 #define CMP_NODE_PREMULKEY  256
+#define CMP_NODE_DIST_MATTE	257
+#define CMP_NODE_VIEW_LEVELS    258
+#define CMP_NODE_COLOR_MATTE 259
 
 #define CMP_NODE_GLARE		301
 #define CMP_NODE_TONEMAP	302
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index bd6919dc115..90ea53d4364 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -2597,7 +2597,7 @@ void ntreeLocalMerge(bNodeTree *localtree, bNodeTree *ntree)
 				if(outsocket_exists(lnode->new_node, lsock->new_sock)) {
 					lsock->new_sock->ns.data= lsock->ns.data;
 					lsock->ns.data= NULL;
-					lsock->new_sock= NULL;
+						lsock->new_sock= NULL;
 				}
 			}
 		}
@@ -2932,6 +2932,7 @@ static void registerCompositNodes(ListBase *ntypelist)
 	nodeRegisterType(ntypelist, &cmp_node_viewer);
 	nodeRegisterType(ntypelist, &cmp_node_splitviewer);
 	nodeRegisterType(ntypelist, &cmp_node_output_file);
+	nodeRegisterType(ntypelist, &cmp_node_view_levels);
 	
 	nodeRegisterType(ntypelist, &cmp_node_curve_rgb);
 	nodeRegisterType(ntypelist, &cmp_node_mix_rgb);
@@ -2971,7 +2972,9 @@ static void registerCompositNodes(ListBase *ntypelist)
 	nodeRegisterType(ntypelist, &cmp_node_premulkey);
 	
 	nodeRegisterType(ntypelist, &cmp_node_diff_matte);
-	nodeRegisterType(ntypelist, &cmp_node_chroma);
+	nodeRegisterType(ntypelist, &cmp_node_distance_matte);
+	nodeRegisterType(ntypelist, &cmp_node_chroma_matte);
+	nodeRegisterType(ntypelist, &cmp_node_color_matte);
 	nodeRegisterType(ntypelist, &cmp_node_channel_matte);
 	nodeRegisterType(ntypelist, &cmp_node_color_spill);
 	nodeRegisterType(ntypelist, &cmp_node_luma_matte);
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 7617f328fd9..98de32a105a 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): David Millan Escriva, Juho Vepsäläinen
+ * Contributor(s): David Millan Escriva, Juho Vepsäläinen, Bob Holcomb
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -1647,45 +1647,35 @@ static int node_composit_buts_dilateerode(uiBlock *block, bNodeTree *ntree, bNod
 static int node_composit_buts_diff_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
 {
 	if(block) {
-		short sx= (butr->xmax-butr->xmin)/4;
-		short dx= (butr->xmax-butr->xmin)/3;
 		NodeChroma *c= node->storage;
 		
 		uiBlockBeginAlign(block);
-		/*color space selectors*/
-		uiDefButS(block, ROW,B_NODE_EXEC,"RGB",
-							butr->xmin,butr->ymin+60,sx,20,
-							&node->custom1,1,1, 0, 0, "RGB Color Space");
-		uiDefButS(block, ROW,B_NODE_EXEC,"HSV",
-							butr->xmin+sx,butr->ymin+60,sx,20,
-							&node->custom1,1,2, 0, 0, "HSV Color Space");
-		uiDefButS(block, ROW,B_NODE_EXEC,"YUV",
-							butr->xmin+2*sx,butr->ymin+60,sx,20,
-							&node->custom1,1,3, 0, 0, "YUV Color Space");
-					uiDefButS(block, ROW,B_NODE_EXEC,"YCC",
-							butr->xmin+3*sx,butr->ymin+60,sx,20,
-							&node->custom1,1,4, 0, 0, "YCbCr Color Space");
-		/*channel tolorences*/
-		uiDefButF(block, NUM, B_NODE_EXEC, " ",
-							butr->xmin, butr->ymin+40, dx, 20,
-							&c->t1, 0.0f, 1.0f, 100, 0, "Channel 1 Tolerance");
-		uiDefButF(block, NUM, B_NODE_EXEC, " ",
-							butr->xmin+dx, butr->ymin+40, dx, 20,
-							&c->t2, 0.0f, 1.0f, 100, 0, "Channel 2 Tolorence");
-		uiDefButF(block, NUM, B_NODE_EXEC, " ",
-							butr->xmin+2*dx, butr->ymin+40, dx, 20,
-							&c->t3, 0.0f, 1.0f, 100, 0, "Channel 3 Tolorence");
-		/*falloff parameters*/
-		/*
-		uiDefButF(block, NUMSLI, B_NODE_EXEC, "Falloff Size ",
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "Tolerance: ", 
 			butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
-			&c->fsize, 0.0f, 1.0f, 100, 0, "");
-		*/
-		uiDefButF(block, NUMSLI, B_NODE_EXEC, "Falloff: ",
-			butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
-			&c->fstrength, 0.0f, 1.0f, 100, 0, "");
+			&c->t1, 0.0f, 1.0f, 100, 0, "Color differences below this threshold are keyed.");
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "Falloff: ", 
+			butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
+			&c->t2, 0.0f, 1.0f, 100, 0, "Color differences below this additional threshold are partially keyed.");
+      uiBlockEndAlign(block);
 	}
-	return 80;
+	return 40;
+}
+
+static int node_composit_buts_distance_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		NodeChroma *c= node->storage;
+		
+		uiBlockBeginAlign(block);
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "Tolerance: ", 
+			butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
+			&c->t1, 0.0f, 1.0f, 100, 0, "Color distances below this threshold are keyed.");
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "Falloff: ", 
+			butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
+			&c->t2, 0.0f, 1.0f, 100, 0, "Color distances below this additional threshold are partially keyed.");
+       uiBlockEndAlign(block);
+	}
+	return 40;
 }
 
 static int node_composit_buts_color_spill(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
@@ -1717,6 +1707,7 @@ static int node_composit_buts_chroma_matte(uiBlock *block, bNodeTree *ntree, bNo
 	if(block) {
 		short dx=(butr->xmax-butr->xmin)/2;
 		NodeChroma *c= node->storage;
+
 		uiBlockBeginAlign(block);
 
 		uiDefButF(block, NUMSLI, B_NODE_EXEC, "Acceptance ",
@@ -1736,6 +1727,7 @@ static int node_composit_buts_chroma_matte(uiBlock *block, bNodeTree *ntree, bNo
 		uiDefButF(block, NUMSLI, B_NODE_EXEC, "Shadow Adjust ",
 			butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
 			&c->t3, 0.0f, 1.0f, 100, 0, "Adjusts the brightness of any shadows captured");
+		uiBlockEndAlign(block);
 
 		if(c->t2 > c->t1)
 			c->t2=c->t1;
@@ -1743,6 +1735,28 @@ static int node_composit_buts_chroma_matte(uiBlock *block, bNodeTree *ntree, bNo
 	return 80;
 }
 
+static int node_composit_buts_color_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		NodeChroma *c= node->storage;
+		uiBlockBeginAlign(block);
+
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "H: ",
+			butr->xmin, butr->ymin+40, butr->xmax-butr->xmin, 20,
+			&c->t1, 0.0f, 0.25f, 100, 0, "Hue tolerance for colors to be considered a keying color");
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "S: ",
+			butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
+			&c->t2, 0.0f, 1.0f, 100, 0, "Saturation Tolerance for the color");
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "V: ",
+			butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
+			&c->t3, 0.0f, 1.0f, 100, 0, "Value Tolerance for the color");
+
+		uiBlockEndAlign(block);
+	}
+	return 60;
+}
+
+
 static int node_composit_buts_channel_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
 {
 	if(block) {
@@ -1977,6 +1991,29 @@ static int node_composit_buts_premulkey(uiBlock *block, bNodeTree *ntree, bNode
 	return 20;
 }
 
+static int node_composit_buts_view_levels(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		short sx= (butr->xmax-butr->xmin)/5;
+	
+		/*color space selectors*/
+		uiBlockBeginAlign(block);
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"C",
+			butr->xmin,butr->ymin,sx,20,&node->custom1,1,1, 0, 0, "Combined RGB");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"R",
+			butr->xmin+sx,butr->ymin,sx,20,&node->custom1,1,2, 0, 0, "Red Channel");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"G",
+			butr->xmin+2*sx,butr->ymin,sx,20,&node->custom1,1,3, 0, 0, "Green Channel");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"B",
+			butr->xmin+3*sx,butr->ymin,sx,20,&node->custom1,1,4, 0, 0, "Blue Channel");
+      uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"L",
+			butr->xmin+4*sx,butr->ymin,sx,20,&node->custom1,1,5, 0, 0, "Luminenc Channel");
+		uiBlockEndAlign(block);
+	}
+	return 20;
+}
+
+
 /* only once called */
 static void node_composit_set_butfunc(bNodeType *ntype)
 {
@@ -2070,17 +2107,22 @@ static void node_composit_set_butfunc(bNodeType *ntype)
 			break;
 		case CMP_NODE_OUTPUT_FILE:
 			ntype->butfunc= node_composit_buts_file_output;
-			break;
-	
+			break;	
 		case CMP_NODE_DIFF_MATTE:
 			ntype->butfunc=node_composit_buts_diff_matte;
 			break;
+		case CMP_NODE_DIST_MATTE:
+			ntype->butfunc=node_composit_buts_distance_matte;
+			break;
 		case CMP_NODE_COLOR_SPILL:
 			ntype->butfunc=node_composit_buts_color_spill;
 			break;
-		case CMP_NODE_CHROMA:
+		case CMP_NODE_CHROMA_MATTE:
 			ntype->butfunc=node_composit_buts_chroma_matte;
 			break;
+		case CMP_NODE_COLOR_MATTE:
+			ntype->butfunc=node_composit_buts_color_matte;
+			break;
 		case CMP_NODE_SCALE:
 			ntype->butfunc= node_composit_buts_scale;
 			break;
@@ -2105,6 +2147,9 @@ static void node_composit_set_butfunc(bNodeType *ntype)
 		case CMP_NODE_PREMULKEY:
 			ntype->butfunc= node_composit_buts_premulkey;
 			break;
+      case CMP_NODE_VIEW_LEVELS:
+			ntype->butfunc=node_composit_buts_view_levels;
+ 			break;
 		default:
 			ntype->butfunc= NULL;
 	}
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index b3046ad1364..3fd358a1c16 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -747,43 +747,63 @@ static void def_cmp_scale(StructRNA *srna)
 static void def_cmp_diff_matte(StructRNA *srna)
 {
 	PropertyRNA *prop;
+
+	RNA_def_struct_sdna_from(srna, "NodeChroma", "storage");
+
+	/* TODO: nicer wrapping for tolerances */	
 	
-	static EnumPropertyItem color_space_items[] = {
-		{1, "RGB", 0, "RGB",   ""},
-		{2, "HSV", 0, "HSV",   ""},
-		{3, "YUV", 0, "YUV",   ""},
-		{4, "YCC", 0, "YCbCr", ""},
-		{0, NULL, 0, NULL, NULL}
-	};
+	prop = RNA_def_property(srna, "tolerance", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Tolerance", "Color distances below this threshold are keyed.");
 	
-	prop = RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "custom1");
-	RNA_def_property_enum_items(prop, color_space_items);
-	RNA_def_property_ui_text(prop, "Color Space", "");
+	prop = RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "t2");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Falloff", "Color distances below this additional threshold are partially keyed.");
+}
+
+static void def_cmp_color_matte(StructRNA *srna)
+{
+	PropertyRNA *prop;
 	
 	RNA_def_struct_sdna_from(srna, "NodeChroma", "storage");
 	
 	/* TODO: nicer wrapping for tolerances */
 	
-	prop = RNA_def_property(srna, "tolerance1", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "h", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Channel 1 Tolerance", "");
+	RNA_def_property_ui_text(prop, "H", "Hue tolerance for colors to be considered a keying color");
 	
-	prop = RNA_def_property(srna, "tolerance2", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "s", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Channel 2 Tolerance", "");
+	RNA_def_property_ui_text(prop, "S", "Saturation Tolerance for the color");
 	
-	prop = RNA_def_property(srna, "tolerance3", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "v", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t3");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Channel 3 Tolerance", "");
+	RNA_def_property_ui_text(prop, "V", "Value Tolerance for the color");
+}
+
+static void def_cmp_distance_matte(StructRNA *srna)
+{
+	PropertyRNA *prop;
+	
+	RNA_def_struct_sdna_from(srna, "NodeChroma", "storage");
+	
+	/* TODO: nicer wrapping for tolerances */
+	
+	prop = RNA_def_property(srna, "tolerance", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "t1");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Tolerance", "Color distances below this threshold are keyed.");
 	
 	prop = RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_float_sdna(prop, NULL, "fstrength");
+	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
-	RNA_def_property_ui_text(prop, "Falloff", "");
+	RNA_def_property_ui_text(prop, "Falloff", "Color distances below this additional threshold are partially keyed.");
 }
 
 static void def_cmp_color_spill(StructRNA *srna)
@@ -810,7 +830,7 @@ static void def_cmp_color_spill(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Amount", "How much the selected channel is affected by");
 }
 
-static void def_cmp_chroma(StructRNA *srna)
+static void def_cmp_chroma_matte(StructRNA *srna)
 {
 	PropertyRNA *prop;
 	
diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h
index 47a7be163b1..be4f131a6d6 100644
--- a/source/blender/makesrna/intern/rna_nodetree_types.h
+++ b/source/blender/makesrna/intern/rna_nodetree_types.h
@@ -82,7 +82,7 @@ DefNode( CompositorNode, CMP_NODE_SEPYUVA,        0,                      "SEPYU
 DefNode( CompositorNode, CMP_NODE_COMBYUVA,       0,                      "COMBYUVA",       CombYUVA,         "Combine YUVA",      ""              )
 DefNode( CompositorNode, CMP_NODE_DIFF_MATTE,     def_cmp_diff_matte,     "DIFF_MATTE",     DiffMatte,        "Difference Key",    ""              )
 DefNode( CompositorNode, CMP_NODE_COLOR_SPILL,    def_cmp_color_spill,    "COLOR_SPILL",    ColorSpill,       "Color Spill",       ""              )
-DefNode( CompositorNode, CMP_NODE_CHROMA,         def_cmp_chroma,         "CHROMA",         Chroma,           "Chroma Key",        ""              )
+DefNode( CompositorNode, CMP_NODE_CHROMA_MATTE,   def_cmp_chroma_matte,   "CHROMA_MATTE",   ChromaMatte,      "Chroma Key",        ""              )
 DefNode( CompositorNode, CMP_NODE_CHANNEL_MATTE,  def_cmp_channel_matte,  "CHANNEL_MATTE",  ChannelMatte,     "Channel Key",       ""              )
 DefNode( CompositorNode, CMP_NODE_FLIP,           def_cmp_flip,           "FLIP",           Flip,             "Flip",              ""              )
 DefNode( CompositorNode, CMP_NODE_SPLITVIEWER,    def_cmp_splitviewer,    "SPLITVIEWER",    SplitViewer,      "Split Viewer",      ""              )
@@ -104,6 +104,9 @@ DefNode( CompositorNode, CMP_NODE_PREMULKEY,      def_cmp_premul_key,     "PREMU
 DefNode( CompositorNode, CMP_NODE_GLARE,          def_cmp_glare,          "GLARE",          Glare,            "Glare",             ""              )
 DefNode( CompositorNode, CMP_NODE_TONEMAP,        def_cmp_tonemap,        "TONEMAP",        Tonemap,          "Tonemap",           ""              )
 DefNode( CompositorNode, CMP_NODE_LENSDIST,       def_cmp_lensdist,       "LENSDIST",       Lensdist,         "Lensdist",          ""              )
+DefNode( CompositorNode, CMP_NODE_VIEW_LEVELS,    0,                      "LEVELS",         Levels,           "Levels",            ""              )
+DefNode( CompositorNode, CMP_NODE_COLOR_MATTE,    def_cmp_color_matte,    "COLOR_MATTE",    ColorMatte,       "Color Matte",       ""              )
+DefNode( CompositorNode, CMP_NODE_DIST_MATTE,     def_cmp_distance_matte, "DISTANCE_MATTE", DistanceMatte,    "Distance Matte",    ""              )
                                                                                                                                                    
 DefNode( TextureNode,    TEX_NODE_OUTPUT,         def_tex_output,         "OUTPUT",         Output,           "Output",            ""              )
 DefNode( TextureNode,    TEX_NODE_CHECKER,        0,                      "CHECKER",        Checker,          "Checker",           ""              )
diff --git a/source/blender/nodes/CMP_node.h b/source/blender/nodes/CMP_node.h
index 020bbdebfa2..041bf1c8361 100644
--- a/source/blender/nodes/CMP_node.h
+++ b/source/blender/nodes/CMP_node.h
@@ -25,7 +25,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -49,6 +49,7 @@ extern bNodeType cmp_node_composite;
 extern bNodeType cmp_node_viewer;
 extern bNodeType cmp_node_splitviewer;
 extern bNodeType cmp_node_output_file;
+extern bNodeType cmp_node_view_levels;
 
 extern bNodeType cmp_node_curve_rgb;
 extern bNodeType cmp_node_mix_rgb;
@@ -88,7 +89,9 @@ extern bNodeType cmp_node_combycca;
 extern bNodeType cmp_node_premulkey;
 
 extern bNodeType cmp_node_diff_matte;
-extern bNodeType cmp_node_chroma;
+extern bNodeType cmp_node_distance_matte;
+extern bNodeType cmp_node_chroma_matte;
+extern bNodeType cmp_node_color_matte;
 extern bNodeType cmp_node_channel_matte;
 extern bNodeType cmp_node_color_spill;
 extern bNodeType cmp_node_luma_matte; 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
index d0cc4e5b88d..b0a2531ac1f 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -180,7 +180,7 @@ static void node_composit_init_channel_matte(bNode *node)
 {
    NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
    node->storage=c;
-   c->t1= 0.0f;
+   c->t1= 1.0f;
    c->t2= 0.0f;
    c->t3= 0.0f;
    c->fsize= 0.0f;
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
index 6a40018e659..28b81fe9f47 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
@@ -172,9 +172,9 @@ static void node_composit_init_chroma_matte(bNode *node)
    c->fstrength= 1.0f;
 };
 
-bNodeType cmp_node_chroma={
+bNodeType cmp_node_chroma_matte={
 	/* *next,*prev */	NULL, NULL,
-	/* type code   */	CMP_NODE_CHROMA,
+	/* type code   */	CMP_NODE_CHROMA_MATTE,
 	/* name        */	"Chroma Key",
 	/* width+range */	200, 80, 300,
 	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
new file mode 100644
index 00000000000..0a4d3fceff9
--- /dev/null
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
@@ -0,0 +1,132 @@
+/**
+ * $Id: CMP_colorMatte.c 12931 2007-12-17 18:20:48Z theeth $
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2006 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Bob Holcomb
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../CMP_util.h"
+
+/* ******************* Color Key ********************************************************** */
+static bNodeSocketType cmp_node_color_in[]={
+	{SOCK_RGBA,1,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{SOCK_RGBA,1,"Key Color", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{-1,0,""}
+};
+
+static bNodeSocketType cmp_node_color_out[]={
+	{SOCK_RGBA,0,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{SOCK_VALUE,0,"Matte",0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{-1,0,""}
+};
+
+static void do_color_key(bNode *node, float *out, float *in)
+{
+	NodeChroma *c;
+	c=node->storage;
+
+
+   VECCOPY(out, in);
+
+   if(fabs(in[0]-c->key[0]) < c->t1 &&
+      fabs(in[1]-c->key[1]) < c->t2 &&
+      fabs(in[2]-c->key[2]) < c->t3) 
+   {
+      out[3]=0.0; /*make transparent*/
+   }
+
+	else { /*pixel is outside key color */
+		out[3]=in[3]; /* make pixel just as transparent as it was before */
+	}
+}
+
+static void node_composit_exec_color_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
+{
+	CompBuf *cbuf;
+	CompBuf *colorbuf;
+	NodeChroma *c;
+	
+	if(in[0]->hasinput==0) return;
+	if(in[0]->data==NULL) return;
+	if(out[0]->hasoutput==0 && out[1]->hasoutput==0) return;
+	
+	cbuf= typecheck_compbuf(in[0]->data, CB_RGBA);
+	
+	colorbuf= dupalloc_compbuf(cbuf);
+	
+	c=node->storage;
+	
+	/*convert rgbbuf to hsv*/
+	composit1_pixel_processor(node, colorbuf, cbuf, in[0]->vec, do_rgba_to_hsva, CB_RGBA);
+	
+   /*convert key to hsv*/
+	do_rgba_to_hsva(node, c->key, in[1]->vec);
+	
+
+	/*per pixel color key*/
+	composit1_pixel_processor(node, colorbuf, colorbuf, in[0]->vec, do_color_key, CB_RGBA);
+	
+	/*convert back*/
+	composit1_pixel_processor(node, colorbuf, colorbuf, in[0]->vec, do_hsva_to_rgba, CB_RGBA);
+	
+	out[0]->data= colorbuf;
+	if(out[1]->hasoutput)
+		out[1]->data= valbuf_from_rgbabuf(colorbuf, CHAN_A);
+	
+	generate_preview(node, colorbuf);
+
+	if(cbuf!=in[0]->data)
+		free_compbuf(cbuf);
+};
+
+static void node_composit_init_color_matte(bNode *node)
+{
+   NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node color");
+   node->storage= c;
+   c->t1= 0.01f;
+   c->t2= 0.1f;
+   c->t3= 0.1f;
+   c->fsize= 0.0f;
+   c->fstrength= 1.0f;
+};
+
+bNodeType cmp_node_color_matte={
+	/* *next,*prev */	NULL, NULL,
+	/* type code   */	CMP_NODE_COLOR_MATTE,
+	/* name        */	"Color Key",
+	/* width+range */	200, 80, 300,
+	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+	/* input sock  */	cmp_node_color_in,
+	/* output sock */	cmp_node_color_out,
+	/* storage     */	"NodeChroma",
+	/* execfunc    */	node_composit_exec_color_matte,
+	/* butfunc     */	NULL,
+	/* initfunc    */	node_composit_init_color_matte,
+	/* freestoragefunc    */	node_free_standard_storage,
+	/* copystoragefunc    */	node_copy_standard_storage,
+	/* id          */	NULL
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
index ade2111f246..68a1bcd5471 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -31,8 +31,8 @@
 
 /* ******************* channel Difference Matte ********************************* */
 static bNodeSocketType cmp_node_diff_matte_in[]={
-	{SOCK_RGBA,1,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{SOCK_RGBA,1,"Key Color", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{SOCK_RGBA,1,"Image 1", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{SOCK_RGBA,1,"Image 2", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
 	{-1,0,""}
 };
 
@@ -44,157 +44,85 @@ static bNodeSocketType cmp_node_diff_matte_out[]={
 
 /* note, keyvals is passed on from caller as stack array */
 /* might have been nicer as temp struct though... */
-static void do_diff_matte(bNode *node, float *colorbuf, float *inbuf, float *keyvals)
+static void do_diff_matte(bNode *node, float *colorbuf, float *imbuf1, float *imbuf2)
 {
 	NodeChroma *c= (NodeChroma *)node->storage;
-	float *keymin= keyvals;
-	float *keymax= keyvals+3;
-	float *key=    keyvals+6;
-	float tolerance= keyvals[9];
-	float distance, alpha;
+	float tolerence=c->t1;
+   float falloff=c->t2;
+	float difference;
+   float alpha;
 	
-	/*process the pixel if it is close to the key or already transparent*/
-	if(((colorbuf[0]>keymin[0] && colorbuf[0]<keymax[0]) &&
-		(colorbuf[1]>keymin[1] && colorbuf[1]<keymax[1]) &&
-		(colorbuf[2]>keymin[2] && colorbuf[2]<keymax[2])) || inbuf[3]<1.0f) {
-		
-		/*true distance from key*/
-		distance= sqrt((colorbuf[0]-key[0])*(colorbuf[0]-key[0])+
-					  (colorbuf[1]-key[1])*(colorbuf[1]-key[1])+
-					  (colorbuf[2]-key[2])*(colorbuf[2]-key[2]));
-		
-		/*is it less transparent than the prevous pixel*/
-		alpha= distance/tolerance;
-		if(alpha > inbuf[3]) alpha= inbuf[3];
-		if(alpha > c->fstrength) alpha= 0.0f;
-		
-		/*clamp*/
-		if (alpha>1.0f) alpha=1.0f;
-		if (alpha<0.0f) alpha=0.0f;
-		
-		/*premultiplied picture*/
-		colorbuf[3]= alpha;
+   difference=fabs(imbuf2[0]-imbuf1[0])+
+               fabs(imbuf2[1]-imbuf1[1])+
+               fabs(imbuf2[2]-imbuf1[2]);
+
+   /*average together the distances*/
+   difference=difference/3.0;
+
+   VECCOPY(colorbuf, imbuf1);
+
+   /*make 100% transparent*/
+	if(difference < tolerence){
+      colorbuf[3]=0.0;
 	}
+   /*in the falloff region, make partially transparent */
+   else if(difference < falloff+tolerence){
+      difference=difference-tolerence;
+      alpha=difference/falloff;
+      /*only change if more transparent than before */
+      if(alpha < imbuf1[3]) {      
+         colorbuf[3]=alpha;
+      }
+      else { /* leave as before */
+         colorbuf[3]=imbuf1[3];
+      }
+   }
 	else {
 		/*foreground object*/
-		colorbuf[3]= inbuf[3];
+		colorbuf[3]= imbuf1[3];
 	}
 }
 
 static void node_composit_exec_diff_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	/*
-	Losely based on the Sequencer chroma key plug-in, but enhanced to work in other color spaces and
-	uses a differnt difference function (suggested in forums of vfxtalk.com).
-	*/
-	CompBuf *workbuf;
-	CompBuf *inbuf;
+	CompBuf *outbuf;
+	CompBuf *imbuf1;
+   CompBuf *imbuf2;
 	NodeChroma *c;
-	float keyvals[10];
-	float *keymin= keyvals;
-	float *keymax= keyvals+3;
-	float *key=    keyvals+6;
-	float *tolerance= keyvals+9;
-	float t[3];
 	
 	/*is anything connected?*/
 	if(out[0]->hasoutput==0 && out[1]->hasoutput==0) return;
 	/*must have an image imput*/
 	if(in[0]->data==NULL) return;
+   if(in[1]->data==NULL) return;
 	
-	inbuf=typecheck_compbuf(in[0]->data, CB_RGBA);
+	imbuf1=typecheck_compbuf(in[0]->data, CB_RGBA);
+   imbuf2=typecheck_compbuf(in[1]->data, CB_RGBA);
 	
 	c=node->storage;
-	workbuf=dupalloc_compbuf(inbuf);
-	
-	/*use the input color*/
-	key[0]= in[1]->vec[0];
-	key[1]= in[1]->vec[1];
-	key[2]= in[1]->vec[2];
-	
-	/*get the tolerances from the UI*/
-	t[0]=c->t1;
-	t[1]=c->t2;
-	t[2]=c->t3;
-	
-	/*convert to colorspace*/
-	switch(node->custom1) {
-		case 1: /*RGB*/
-				break;
-		case 2: /*HSV*/
-		/*convert the key (in place)*/
-			rgb_to_hsv(key[0], key[1], key[2], &key[0], &key[1], &key[2]);
-			composit1_pixel_processor(node, workbuf, inbuf, in[1]->vec, do_rgba_to_hsva, CB_RGBA);
-			break;
-		case 3: /*YUV*/
-			rgb_to_yuv(key[0], key[1], key[2], &key[0], &key[1], &key[2]);
-			composit1_pixel_processor(node, workbuf, inbuf, in[1]->vec, do_rgba_to_yuva, CB_RGBA);
-			break;
-		case 4: /*YCC*/
-			rgb_to_ycc(key[0], key[1], key[2], &key[0], &key[1], &key[2]);
-			composit1_pixel_processor(node, workbuf, inbuf, in[1]->vec, do_rgba_to_ycca, CB_RGBA);
-			/*account for ycc is on a 0..255 scale*/
-			t[0]= c->t1*255.0;
-			t[1]= c->t2*255.0;
-			t[2]= c->t3*255.0;
-			break;
-		default:
-				break;
-	}
-	
-	/*find min/max tolerances*/
-	keymin[0]= key[0]-t[0];
-	keymin[1]= key[1]-t[1];
-	keymin[2]= key[2]-t[2];
-	keymax[0]= key[0]+t[0];
-	keymax[1]= key[1]+t[1];
-	keymax[2]= key[2]+t[2];
-	
-	/*tolerance*/
-	*tolerance= sqrt((t[0])*(t[0])+
-					(t[1])*(t[1])+
-					(t[2])*(t[2]));
+	outbuf=dupalloc_compbuf(imbuf1);
 	
 	/* note, processor gets a keyvals array passed on as buffer constant */
-	composit2_pixel_processor(node, workbuf, workbuf, in[0]->vec, NULL, keyvals, do_diff_matte, CB_RGBA, CB_VAL);
+	composit2_pixel_processor(node, outbuf, imbuf1, in[0]->vec, imbuf2, in[1]->vec, do_diff_matte, CB_RGBA, CB_RGBA);
 	
-	/*convert back to RGB colorspace*/
-	switch(node->custom1) {
-		case 1: /*RGB*/
-			composit1_pixel_processor(node, workbuf, workbuf, in[1]->vec, do_copy_rgba, CB_RGBA);
-			break;
-		case 2: /*HSV*/
-			composit1_pixel_processor(node, workbuf, workbuf, in[1]->vec, do_hsva_to_rgba, CB_RGBA);
-			break;
-		case 3: /*YUV*/
-			composit1_pixel_processor(node, workbuf, workbuf, in[1]->vec, do_yuva_to_rgba, CB_RGBA);
-			break;
-		case 4: /*YCC*/
-			composit1_pixel_processor(node, workbuf, workbuf, in[1]->vec, do_ycca_to_rgba, CB_RGBA);
-			break;
-		default:
-			break;
-	}
-	
-	out[0]->data=workbuf;
+	out[0]->data=outbuf;
 	if(out[1]->hasoutput)
-		out[1]->data=valbuf_from_rgbabuf(workbuf, CHAN_A);
-	generate_preview(node, workbuf);
+		out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A);
+	generate_preview(node, outbuf);
 
-	if(inbuf!=in[0]->data)
-		free_compbuf(inbuf);
+	if(imbuf1!=in[0]->data)
+		free_compbuf(imbuf1);
+
+	if(imbuf2!=in[1]->data)
+		free_compbuf(imbuf2);
 }
 
 static void node_composit_init_diff_matte(bNode *node)
 {
    NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
    node->storage= c;
-   c->t1= 0.01f;
-   c->t2= 0.01f;
-   c->t3= 0.01f;
-   c->fsize= 0.0f;
-   c->fstrength= 0.0f;
-   node->custom1= 1; /* RGB */
+   c->t1= 0.1f;
+   c->t2= 0.1f;
 }
 
 bNodeType cmp_node_diff_matte={
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
new file mode 100644
index 00000000000..921ac869cb8
--- /dev/null
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
@@ -0,0 +1,145 @@
+/**
+ * $Id: CMP_diffMatte.c 12931 2007-12-17 18:20:48Z theeth $
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2006 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Bob Holcomb
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../CMP_util.h"
+
+/* ******************* channel Distance Matte ********************************* */
+static bNodeSocketType cmp_node_distance_matte_in[]={
+	{SOCK_RGBA,1,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{SOCK_RGBA,1,"Key Color", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{-1,0,""}
+};
+
+static bNodeSocketType cmp_node_distance_matte_out[]={
+	{SOCK_RGBA,0,"Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{SOCK_VALUE,0,"Matte",0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{-1,0,""}
+};
+
+/* note, keyvals is passed on from caller as stack array */
+/* might have been nicer as temp struct though... */
+static void do_distance_matte(bNode *node, float *out, float *in)
+{
+	NodeChroma *c= (NodeChroma *)node->storage;
+	float tolerence=c->t1;
+   float falloff=c->t2;
+	float distance;
+   float alpha;
+   
+   distance=sqrt((c->key[0]-in[0])*(c->key[0]-in[0]) +
+                  (c->key[1]-in[1])*(c->key[1]-in[1]) +
+                  (c->key[2]-in[2])*(c->key[2]-in[2]));
+
+   VECCOPY(out, in);
+
+   /*make 100% transparent */
+   if(distance < tolerence) {
+      out[3]=0.0;
+   }
+   /*in the falloff region, make partially transparent */
+   else if(distance < falloff+tolerence){
+      distance=distance-tolerence;
+      alpha=distance/falloff;
+       /*only change if more transparent than before */
+      if(alpha < in[3]) {
+         out[3]=alpha;
+      }
+      else { /* leave as before */
+         out[3]=in[3];
+      }
+   }
+   else {
+      out[3]=in[3];
+   }
+}
+
+static void node_composit_exec_distance_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
+{
+	/*
+	Losely based on the Sequencer chroma key plug-in, but enhanced to work in other color spaces and
+	uses a differnt difference function (suggested in forums of vfxtalk.com).
+	*/
+	CompBuf *workbuf;
+	CompBuf *inbuf;
+	NodeChroma *c;
+	
+	/*is anything connected?*/
+	if(out[0]->hasoutput==0 && out[1]->hasoutput==0) return;
+	/*must have an image imput*/
+	if(in[0]->data==NULL) return;
+	
+	inbuf=typecheck_compbuf(in[0]->data, CB_RGBA);
+	
+	c=node->storage;
+	workbuf=dupalloc_compbuf(inbuf);
+	
+	/*use the input color*/
+	c->key[0]= in[1]->vec[0];
+	c->key[1]= in[1]->vec[1];
+	c->key[2]= in[1]->vec[2];
+	
+	/* note, processor gets a keyvals array passed on as buffer constant */
+	composit1_pixel_processor(node, workbuf, workbuf, in[0]->vec, do_distance_matte, CB_RGBA);
+	
+	
+	out[0]->data=workbuf;
+	if(out[1]->hasoutput)
+		out[1]->data=valbuf_from_rgbabuf(workbuf, CHAN_A);
+	generate_preview(node, workbuf);
+
+	if(inbuf!=in[0]->data)
+		free_compbuf(inbuf);
+}
+
+static void node_composit_init_distance_matte(bNode *node)
+{
+   NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
+   node->storage= c;
+   c->t1= 0.1f;
+   c->t2= 0.1f;
+}
+
+bNodeType cmp_node_distance_matte={
+	/* *next,*prev */	NULL, NULL,
+	/* type code   */	CMP_NODE_DIST_MATTE,
+	/* name        */	"Distance Key",
+	/* width+range */	200, 80, 250,
+	/* class+opts  */	NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS,
+	/* input sock  */	cmp_node_distance_matte_in,
+	/* output sock */	cmp_node_distance_matte_out,
+	/* storage     */	"NodeChroma",
+	/* execfunc    */	node_composit_exec_distance_matte,
+	/* butfunc     */	NULL,
+	/* initfunc    */	node_composit_init_distance_matte,
+	/* freestoragefunc    */	node_free_standard_storage,
+	/* copystoragefunc    */	node_copy_standard_storage,
+	/* id          */	NULL
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_levels.c b/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
new file mode 100644
index 00000000000..414c535789e
--- /dev/null
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
@@ -0,0 +1,337 @@
+/**
+ * $Id: CMP_levels.c 12931 2007-12-17 18:20:48Z theeth $
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2006 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Bob Holcomb.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../CMP_util.h"
+
+
+/* **************** LEVELS ******************** */
+static bNodeSocketType cmp_node_view_levels_in[]= {
+	{	SOCK_RGBA, 1, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	-1, 0, ""	}
+};
+
+static bNodeSocketType cmp_node_view_levels_out[]={
+	{SOCK_VALUE, 0,"Mean",0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{SOCK_VALUE, 0,"Std Dev",0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{-1,0,""}
+};
+
+static void rgb_tobw(float r, float g, float b, float* out)
+{
+	*out= r*0.35f + g*0.45f + b*0.2f;
+}
+
+static void fill_bins(bNode* node, CompBuf* in, int* bins)
+{
+	float value[4];
+    int ivalue;
+	int x,y;
+
+	/*fill bins */
+	for(y=0; y<in->y; y++) {
+		for(x=0; x<in->x; x++) {
+
+			/* get the pixel */
+			qd_getPixel(in, x, y, value);
+
+			if(value[3] > 0.0) { /* don't count transparent pixels */
+				switch(node->custom1) {
+					case 1: { /* all colors */
+						rgb_tobw(value[0],value[1],value[2], &value[0]);
+						value[0]=value[0]*255; /* scale to 0-255 range */
+						ivalue=(int)value[0];
+						break;
+					}
+					case 2: { /* red channel */
+						value[0]=value[0]*255; /* scale to 0-255 range */
+						ivalue=(int)value[0];
+						break;
+					}
+					case 3:  { /* green channel */
+						value[1]=value[1]*255; /* scale to 0-255 range */
+						ivalue=(int)value[1];
+						break;
+					}
+					case 4: /*blue channel */
+					{
+						value[2]=value[2]*255; /* scale to 0-255 range */
+						ivalue=(int)value[2];
+						break;
+					}
+					case 5: /* luminence */
+					{
+						rgb_to_yuv(value[0],value[1],value[2], &value[0], &value[1], &value[2]);
+						value[0]=value[0]*255; /* scale to 0-255 range */
+						ivalue=(int)value[0];
+						break;
+					}
+				} /*end switch */
+
+				/*clip*/
+				if(ivalue<0) ivalue=0;
+				if(ivalue>255) ivalue=255;
+
+				/*put in the correct bin*/
+				bins[ivalue]+=1;
+			} /*end if alpha */
+		}
+	}	
+}
+
+static float brightness_mean(bNode* node, CompBuf* in)
+{
+	float sum=0.0;
+	int numPixels=0.0;
+	int x,y;
+	float value[4];
+
+	for(x=0; x< in->x; x++) {
+		for(y=0; y < in->y; y++) {
+			
+			/* get the pixel */
+			qd_getPixel(in, x, y, value);
+
+			if(value[3] > 0.0) { /* don't count transparent pixels */
+				numPixels++;
+				switch(node->custom1)
+				{
+				case 1:
+					{
+						rgb_tobw(value[0],value[1],value[2], &value[0]);
+						sum+=value[0];
+						break;
+					}
+				case 2:
+					{
+						sum+=value[0];
+						break;
+					}
+				case 3:
+					{
+						sum+=value[1];
+						break;
+					}
+				case 4:
+					{
+						sum+=value[2];
+						break;
+					}
+				case 5:
+					{
+						rgb_to_yuv(value[0],value[1],value[2], &value[0], &value[1], &value[2]);
+						sum+=value[0];
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return sum/numPixels;
+}
+
+static float brightness_standard_deviation(bNode* node, CompBuf* in, float mean)
+{
+	float sum=0.0;
+	int numPixels=0.0;
+	int x,y;
+	float value[4];
+
+	for(x=0; x< in->x; x++) {
+		for(y=0; y < in->y; y++) {
+			
+			/* get the pixel */
+			qd_getPixel(in, x, y, value);
+
+			if(value[3] > 0.0) { /* don't count transparent pixels */
+				numPixels++;
+				switch(node->custom1)
+				{
+				case 1:
+					{
+						rgb_tobw(value[0],value[1],value[2], &value[0]);
+						sum+=(value[0]-mean)*(value[0]-mean);
+						break;
+					}
+				case 2:
+					{
+						sum+=value[0];
+						sum+=(value[0]-mean)*(value[0]-mean);
+						break;
+					}
+				case 3:
+					{
+						sum+=value[1];
+						sum+=(value[1]-mean)*(value[1]-mean);
+						break;
+					}
+				case 4:
+					{
+						sum+=value[2];
+						sum+=(value[2]-mean)*(value[2]-mean);
+						break;
+					}
+				case 5:
+					{
+						rgb_to_yuv(value[0],value[1],value[2], &value[0], &value[1], &value[2]);
+						sum+=(value[0]-mean)*(value[0]-mean);
+						break;
+					}
+				}
+			}
+		}
+	}
+
+
+	return sqrt(sum/(float)(numPixels-1));
+}
+
+static void draw_histogram(bNode *node, CompBuf *out, int* bins)
+{
+	int x,y;
+	float color[4]; 
+	float value;
+	int max;
+
+	/* find max value */
+	max=0;
+	for(x=0; x<256; x++) {
+		if(bins[x]>max) max=bins[x];
+	}
+
+	/*draw histogram in buffer */
+	for(x=0; x<out->x; x++) {
+		for(y=0;y<out->y; y++) {
+
+			/* get normalized value (0..255) */
+			value=((float)bins[x]/(float)max)*255.0; 
+
+			if(y < (int)value) { /*if the y value is below the height of the bar for this line then draw with the color */
+				switch (node->custom1) {
+					case 1: { /* draw in black */
+						color[0]=0.0; color[1]=0.0; color[2]=0.0; color[3]=1.0;
+						break;
+					}
+					case 2: { /* draw in red */
+						color[0]=1.0; color[1]=0.0; color[2]=0.0; color[3]=1.0;
+						break;
+					}
+					case 3: { /* draw in green */
+						color[0]=0.0; color[1]=1.0; color[2]=0.0; color[3]=1.0;
+						break;
+					}
+					case 4: { /* draw in blue */
+						color[0]=0.0; color[1]=0.0; color[2]=1.0; color[3]=1.0;
+						break;
+					}
+					case 5: { /* draw in white */
+						color[0]=1.0; color[1]=1.0; color[2]=1.0; color[3]=1.0;
+						break;
+					}
+				}
+			}
+			else{
+				color[0]=0.8; color[1]=0.8; color[2]=0.8; color[3]=1.0;
+			}
+
+			/* set the color */
+			qd_setPixel(out, x, y, color);
+		}
+	}
+}
+
+static void node_composit_exec_view_levels(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
+{
+	CompBuf* cbuf;
+	CompBuf* histogram;
+	float mean, std_dev;
+	int bins[256];
+	int x;
+
+	if(in[0]->hasinput==0)  return;
+	if(in[0]->data==NULL) return;
+
+	histogram=alloc_compbuf(256, 256, CB_RGBA, 1);	
+	cbuf=typecheck_compbuf(in[0]->data, CB_RGBA);	
+		
+	/*initalize bins*/
+	for(x=0; x<256; x++) {
+		bins[x]=0;
+	}
+	
+	/*fill bins */
+	fill_bins(node, in[0]->data, bins);
+
+	/* draw the histogram chart */
+	draw_histogram(node, histogram, bins);
+
+	/* calculate the average brightness and contrast */
+	mean=brightness_mean(node, in[0]->data);
+	std_dev=brightness_standard_deviation(node, in[0]->data, mean);
+
+	/*  Printf debuging ;) 
+	printf("Mean: %f\n", mean);
+	printf("Std Dev: %f\n", std_dev);
+	*/
+
+	if(out[0]->hasoutput)
+			out[0]->vec[0]= mean;
+	if(out[1]->hasoutput)
+			out[1]->vec[0]= std_dev;
+
+	generate_preview(node, histogram);
+
+	if(cbuf!=in[0]->data)
+		free_compbuf(cbuf);
+	free_compbuf(histogram);
+}
+
+static void node_composit_init_view_levels(bNode* node)
+{
+   node->custom1=1; /*All channels*/
+}
+
+bNodeType cmp_node_view_levels= {
+	/* *next,*prev */	NULL, NULL,
+	/* type code   */	CMP_NODE_VIEW_LEVELS,
+	/* name        */	"Levels",
+	/* widthrange */	140, 100, 320,
+	/* classopts  */	NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW,
+	/* input sock  */	cmp_node_view_levels_in,
+	/* output sock */	cmp_node_view_levels_out,
+	/* storage     */	"ImageUser",
+	/* execfunc    */	node_composit_exec_view_levels,
+	/* butfunc     */	NULL,
+	/* initfunc    */	node_composit_init_view_levels,
+	/* freestoragefunc    */	node_free_standard_storage,
+	/* copystoragefunc    */	node_copy_standard_storage,
+	/* id          */	NULL
+	
+};
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
index 9aebd999b29..350def76736 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb .
  *
  * ***** END GPL LICENSE BLOCK *****
  */
diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c
index f9805645115..b396d5549d7 100644
--- a/source/blender/nodes/intern/CMP_util.c
+++ b/source/blender/nodes/intern/CMP_util.c
@@ -1104,9 +1104,23 @@ void qd_getPixel(CompBuf* src, int x, int y, float* col)
 {
 	if ((x >= 0) && (x < src->x) && (y >= 0) && (y < src->y)) {
 		float* bc = &src->rect[(x + y*src->x)*src->type];
-		col[0] = bc[0], col[1] = bc[1], col[2] = bc[2];
+		switch(src->type){
+			/* these fallthrough to get all the channels */
+			case CB_RGBA: col[3]=bc[3]; 
+			case CB_VEC3: col[2]=bc[2];
+			case CB_VEC2: col[1]=bc[1];
+			case CB_VAL: col[0]=bc[0];
+		}
+	}
+	else {
+		switch(src->type){
+			/* these fallthrough to get all the channels */
+			case CB_RGBA: col[3]=0.0; 
+			case CB_VEC3: col[2]=0.0; 
+			case CB_VEC2: col[1]=0.0; 
+			case CB_VAL: col[0]=0.0; 
+		}
 	}
-	else col[0] = col[1] = col[2] = 0.f;
 }
 
 // sets pixel (x, y) to color col
@@ -1114,7 +1128,13 @@ void qd_setPixel(CompBuf* src, int x, int y, float* col)
 {
 	if ((x >= 0) && (x < src->x) && (y >= 0) && (y < src->y)) {
 		float* bc = &src->rect[(x + y*src->x)*src->type];
-		bc[0] = col[0], bc[1] = col[1], bc[2] = col[2];
+		switch(src->type){
+			/* these fallthrough to get all the channels */
+			case CB_RGBA: bc[3]=col[3]; 
+			case CB_VEC3: bc[2]=col[2];
+			case CB_VEC2: bc[1]=col[1];
+			case CB_VAL: bc[0]=col[0];
+		}
 	}
 }
 
diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h
index 19e41f5c118..2a2dc97ed73 100644
--- a/source/blender/nodes/intern/CMP_util.h
+++ b/source/blender/nodes/intern/CMP_util.h
@@ -168,7 +168,7 @@ typedef float fRGB[4];
 /* clear color */
 #define fRGB_clear(c) { c[0]=c[1]=c[2]=0.f; }
 /* copy c2 to c1 */
-#define fRGB_copy(c1, c2) { c1[0]=c2[0];  c1[1]=c2[1];  c1[2]=c2[2]; }
+#define fRGB_copy(c1, c2) { c1[0]=c2[0];  c1[1]=c2[1];  c1[2]=c2[2]; c1[3]=c2[3]; }
 /* add c2 to c1 */
 #define fRGB_add(c1, c2) { c1[0]+=c2[0];  c1[1]+=c2[1];  c1[2]+=c2[2]; }
 /* subtract c2 from c1 */
@@ -186,7 +186,8 @@ typedef float fRGB[4];
 /* swap colors c1 & c2 */
 #define fRGB_swap(c1, c2) { float _t=c1[0];  c1[0]=c2[0];  c2[0]=_t;\
                                   _t=c1[1];  c1[1]=c2[1];  c2[1]=_t;\
-                                  _t=c1[2];  c1[2]=c2[2];  c2[2]=_t; }
+                                  _t=c1[2];  c1[2]=c2[2];  c2[2]=_t;\
+								  _t=c1[3];  c1[3]=c2[3];  c3[3]=_t;}
 
 void qd_getPixel(CompBuf* src, int x, int y, float* col);
 void qd_setPixel(CompBuf* src, int x, int y, float* col);

From 96de4cd9a82d69b576e2829f4c867b656d6fc049 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Thu, 10 Sep 2009 10:35:51 +0000
Subject: [PATCH 511/577] Smoke: * Bugfix for loading saved files

---
 source/blender/blenloader/intern/readfile.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b6fc9f7af12..37031f4f82a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3685,8 +3685,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 				smd->domain->smd = smd;
 
 				smd->domain->fluid = NULL;
-				// smd->domain->view3d = NULL;
-				// smd->domain->tex = NULL;
+				smd->domain->wt = NULL;
+				smd->domain->shadow = NULL;
+				smd->domain->tex = NULL;
+				smd->domain->tex_shadow = NULL;
+				smd->domain->tex_wt = NULL;
 
 				direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]));
 				direct_link_pointcache_list(fd, &(smd->domain->ptcaches[1]), &(smd->domain->point_cache[1]));

From 15d77f17a40398a63f95e16607deb81257c02698 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 10 Sep 2009 11:04:53 +0000
Subject: [PATCH 512/577] 2.5: UV Edit

* Make mirror operator and menus work.
* Added TFM_OT_mirror transform operator specific for mirror.
* Assign image from image space when unwrapping in 3d view.
---
 source/blender/editors/transform/transform.c  | 20 ++++++---
 .../blender/editors/transform/transform_ops.c | 25 ++++++++++-
 source/blender/editors/uvedit/uvedit_ops.c    | 45 -------------------
 .../editors/uvedit/uvedit_unwrap_ops.c        | 33 ++++++++++++--
 source/blender/makesrna/intern/rna_access.c   |  2 +-
 5 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 1f568be3e10..f049566d640 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1257,13 +1257,16 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 	int constraint_axis[3] = {0, 0, 0};
 	int proportional = 0;
 
-	if (t->flag & T_AUTOVALUES)
+	if (RNA_struct_find_property(op->ptr, "value"))
 	{
-		RNA_float_set_array(op->ptr, "value", t->auto_values);
-	}
-	else
-	{
-		RNA_float_set_array(op->ptr, "value", t->values);
+		if (t->flag & T_AUTOVALUES)
+		{
+			RNA_float_set_array(op->ptr, "value", t->auto_values);
+		}
+		else
+		{
+			RNA_float_set_array(op->ptr, "value", t->values);
+		}
 	}
 
 	/* XXX convert stupid flag to enum */
@@ -4145,7 +4148,10 @@ int Mirror(TransInfo *t, short mval[2])
 
 		recalcData(t);
 
-		ED_area_headerprint(t->sa, "Select a mirror axis (X, Y, Z)");
+		if(t->flag & T_2D_EDIT)
+			ED_area_headerprint(t->sa, "Select a mirror axis (X, Y)");
+		else
+			ED_area_headerprint(t->sa, "Select a mirror axis (X, Y, Z)");
 	}
 
 	return 1;
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 08d22faf7e7..4ae0bca3284 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -98,6 +98,7 @@ char OP_WARP[] = "TFM_OT_warp";
 char OP_SHRINK_FATTEN[] = "TFM_OT_shrink_fatten";
 char OP_TILT[] = "TFM_OT_tilt";
 char OP_TRACKBALL[] = "TFM_OT_trackball";
+char OP_MIRROR[] = "TFM_OT_mirror";
 
 
 TransformModeItem transform_modes[] =
@@ -111,6 +112,7 @@ TransformModeItem transform_modes[] =
 	{OP_SHRINK_FATTEN, TFM_SHRINKFATTEN},
 	{OP_TILT, TFM_TILT},
 	{OP_TRACKBALL, TFM_TRACKBALL},
+	{OP_MIRROR, TFM_MIRROR},
 	{NULL, 0}
 };
 
@@ -528,6 +530,25 @@ void TFM_OT_tosphere(struct wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
 }
 
+void TFM_OT_mirror(struct wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name   = "Mirror";
+	ot->description= "Mirror selected vertices around one or more axes.";
+	ot->idname = OP_MIRROR;
+	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+
+	/* api callbacks */
+	ot->invoke = transform_invoke;
+	ot->exec   = transform_exec;
+	ot->modal  = transform_modal;
+	ot->cancel  = transform_cancel;
+	ot->poll   = ED_operator_areaactive;
+
+	Properties_Proportional(ot);
+	Properties_Constraints(ot);
+}
+
 void TFM_OT_transform(struct wmOperatorType *ot)
 {
 	static EnumPropertyItem transform_mode_types[] = {
@@ -595,6 +616,7 @@ void transform_operatortypes(void)
 	WM_operatortype_append(TFM_OT_shrink_fatten);
 	WM_operatortype_append(TFM_OT_tilt);
 	WM_operatortype_append(TFM_OT_trackball);
+	WM_operatortype_append(TFM_OT_mirror);
 
 	WM_operatortype_append(TFM_OT_select_orientation);
 }
@@ -699,8 +721,7 @@ void transform_keymap_for_space(struct wmWindowManager *wm, struct ListBase *key
 
 			km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
 
-			km = WM_keymap_add_item(keymap, "TFM_OT_transform", MKEY, KM_PRESS, 0, 0);
-			RNA_int_set(km->ptr, "mode", TFM_MIRROR);
+			km = WM_keymap_add_item(keymap, "TFM_OT_mirror", MKEY, KM_PRESS, 0, 0);
 			break;
 		default:
 			break;
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index a44421e8145..9051300e117 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -942,50 +942,6 @@ static void select_linked(Scene *scene, Image *ima, EditMesh *em, float limit[2]
 	EM_free_uv_vert_map(vmap);
 }
 
-/* ******************** mirror operator **************** */
-
-static int mirror_exec(bContext *C, wmOperator *op)
-{
-	float mat[3][3];
-	int axis;
-	
-	Mat3One(mat);
-	axis= RNA_enum_get(op->ptr, "axis");
-
-	if(axis == 'x') {
-		/* XXX initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-		BIF_setSingleAxisConstraint(mat[0], " on X axis");
-		Transform(); */
-	}
-	else {
-		/* XXX initTransform(TFM_MIRROR, CTX_NO_PET|CTX_AUTOCONFIRM);
-		BIF_setSingleAxisConstraint(mat[1], " on Y axis");
-		Transform(); */
-	}
-
-	return OPERATOR_FINISHED;
-}
-
-void UV_OT_mirror(wmOperatorType *ot)
-{
-	static EnumPropertyItem axis_items[] = {
-		{'x', "MIRROR_X", 0, "Mirror X", "Mirror UVs over X axis."},
-		{'y', "MIRROR_Y", 0, "Mirror Y", "Mirror UVs over Y axis."},
-		{0, NULL, 0, NULL, NULL}};
-
-	/* identifiers */
-	ot->name= "Mirror";
-	ot->idname= "UV_OT_mirror";
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-	
-	/* api callbacks */
-	ot->exec= mirror_exec;
-	ot->poll= ED_operator_uvedit;
-
-	/* properties */
-	RNA_def_enum(ot->srna, "axis", axis_items, 'x', "Axis", "Axis to mirror UV locations over.");
-}
-
 /* ******************** align operator **************** */
 
 static void weld_align_uv(bContext *C, int tool)
@@ -3092,7 +3048,6 @@ void ED_operatortypes_uvedit(void)
 	WM_operatortype_append(UV_OT_snap_selection);
 
 	WM_operatortype_append(UV_OT_align);
-	WM_operatortype_append(UV_OT_mirror);
 	WM_operatortype_append(UV_OT_stitch);
 	WM_operatortype_append(UV_OT_weld);
 	WM_operatortype_append(UV_OT_pin);
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index c18c9f8e022..b20d390fb4d 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -44,6 +44,7 @@
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
+#include "BKE_image.h"
 #include "BKE_mesh.h"
 #include "BKE_utildefines.h"
 
@@ -75,6 +76,11 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
 	EditFace *efa;
 	MTFace *tf;
+	Image *ima;
+	bScreen *sc;
+	ScrArea *sa;
+	SpaceLink *slink;
+	SpaceImage *sima;
 
 	if(ED_uvedit_test(obedit)) {
 		BKE_mesh_end_editmesh(obedit->data, em);
@@ -88,10 +94,31 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
 		BKE_mesh_end_editmesh(obedit->data, em);
 		return 0;
 	}
+
+	ima= CTX_data_edit_image(C);
+
+	if(!ima) {
+		/* no image in context in the 3d view, we find first image window .. */
+		sc= CTX_wm_screen(C);
+
+		for(sa=sc->areabase.first; sa; sa=sa->next) {
+			slink= sa->spacedata.first;
+			if(slink->spacetype == SPACE_IMAGE) {
+				sima= (SpaceImage*)slink;
+
+				ima= sima->image;
+				if(ima) {
+					if(ima->type==IMA_TYPE_R_RESULT || ima->type==IMA_TYPE_COMPOSITE)
+						ima= NULL;
+					else
+						break;
+				}
+			}
+		}
+	}
 	
-	// XXX this image is not in context in 3d view .. only
-	// way to get would be to find the first image window?
-	ED_uvedit_assign_image(scene, obedit, CTX_data_edit_image(C), NULL);
+	if(ima)
+		ED_uvedit_assign_image(scene, obedit, ima, NULL);
 	
 	/* select new UV's */
 	for(efa=em->faces.first; efa; efa=efa->next) {
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 417ace6a455..e4bda24cf20 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -2748,7 +2748,7 @@ int RNA_property_is_set(PointerRNA *ptr, const char *name)
 		return (rna_idproperty_find(ptr, name) != NULL);
 	}
 	else {
-		printf("RNA_property_is_set: %s.%s not found.\n", ptr->type->identifier, name);
+		// printf("RNA_property_is_set: %s.%s not found.\n", ptr->type->identifier, name);
 		return 0;
 	}
 }

From cfb6f35f9fd2905b7d51b78258f98ab45d2c5ced Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 10 Sep 2009 14:20:21 +0000
Subject: [PATCH 513/577] UI:

* layout.itemR now has icon_only option to show only icon
  in e.g. enums buttons, for uv editor header.
* Automatic key shortcuts in menus now show the shortcut even if
  operator properties don't match. Not sure this will work well
  everywhere, but seems to be working ok for now.
* Open recent now show shorter filenames instead of the whole
  file path.
* Tweak object Duplicate menu item.
---
 release/ui/space_image.py                     | 18 +++++----
 release/ui/space_view3d.py                    |  2 +-
 source/blender/blenlib/BLI_fileops.h          |  1 +
 source/blender/blenlib/intern/fileops.c       | 25 ++++++++++++
 source/blender/editors/include/UI_interface.h |  1 +
 .../editors/interface/interface_layout.c      | 31 +++++++-------
 .../editors/interface/interface_utils.c       |  7 +++-
 source/blender/editors/object/object_add.c    |  2 +-
 source/blender/editors/object/object_ops.c    |  2 +-
 .../blender/windowmanager/intern/wm_keymap.c  | 40 +++++++++++++------
 .../windowmanager/intern/wm_operators.c       |  2 +-
 11 files changed, 91 insertions(+), 40 deletions(-)

diff --git a/release/ui/space_image.py b/release/ui/space_image.py
index 3f82727da47..0d0fd86ef8c 100644
--- a/release/ui/space_image.py
+++ b/release/ui/space_image.py
@@ -126,9 +126,9 @@ class IMAGE_MT_uvs_transform(bpy.types.Menu):
 	def draw(self, context):
 		layout = self.layout
 
-		layout.item_enumO("tfm.transform", "mode", 'TRANSLATION')
-		layout.item_enumO("tfm.transform", "mode", 'ROTATION')
-		layout.item_enumO("tfm.transform", "mode", 'RESIZE')
+		layout.itemO("tfm.translate")
+		layout.itemO("tfm.rotate")
+		layout.itemO("tfm.resize")
 
 class IMAGE_MT_uvs_mirror(bpy.types.Menu):
 	__space_type__ = 'IMAGE_EDITOR'
@@ -136,9 +136,13 @@ class IMAGE_MT_uvs_mirror(bpy.types.Menu):
 
 	def draw(self, context):
 		layout = self.layout
+		layout.operator_context = "EXEC_REGION_WIN"
 
-		layout.item_enumO("uv.mirror", "axis", 'MIRROR_X') # "X Axis", M, 
-		layout.item_enumO("uv.mirror", "axis", 'MIRROR_Y') # "Y Axis", M, 
+		props= layout.itemO("tfm.mirror", text="X Axis", properties=True)
+		props.constraint_axis[0]= True
+
+		props= layout.itemO("tfm.mirror", text="Y Axis", properties=True)
+		props.constraint_axis[1]= True
 
 class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
 	__space_type__ = 'IMAGE_EDITOR'
@@ -233,14 +237,14 @@ class IMAGE_HT_header(bpy.types.Header):
 		if show_uvedit:
 			uvedit = sima.uv_editor
 
-			layout.itemR(uvedit, "pivot", text="")
+			layout.itemR(uvedit, "pivot", text="", icon_only=True)
 			layout.itemR(settings, "uv_sync_selection", text="")
 
 			if settings.uv_sync_selection:
 				layout.itemR(settings, "mesh_selection_mode", text="", expand=True)
 			else:
 				layout.itemR(settings, "uv_selection_mode", text="", expand=True)
-				layout.itemR(uvedit, "sticky_selection_mode", text="")
+				layout.itemR(uvedit, "sticky_selection_mode", text="", icon_only=True)
 			pass
 
 			row = layout.row(align=True)
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index bc133cbff48..df6579542d4 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -410,7 +410,7 @@ class VIEW3D_MT_OBJECT(bpy.types.Menu):
 		
 		layout.itemS()
 		
-		layout.itemO("object.duplicate")
+		layout.itemO("object.duplicate_move")
 		layout.item_booleanO("object.duplicate", "linked", True, text="Duplicate Linked")
 		layout.itemO("object.delete", text="Delete...")
 		layout.itemO("object.proxy_make", text="Make Proxy...")
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
index 0c1cdbc4d3a..b79920b188b 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
@@ -54,6 +54,7 @@ char *BLI_last_slash(const char *string);
 int	  BLI_add_slash(char *string);
 void  BLI_del_slash(char *string);
 char *first_slash(char *string);
+const char *BLI_short_filename(const char *string);
 
 /* only for the sane unix world: direct calls to system functions :( */
 #ifndef WIN32
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index e7dc9b0eb1f..15277c438f4 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -84,6 +84,31 @@ char *BLI_last_slash(const char *string) {
 	else return lfslash;
 }
 
+static const char *last_slash_len(const char *string, int len) {
+	int a;
+
+	for(a=len-1; a>=0; a--)
+		if(string[a] == '/' || string[a] == '\\')
+			return &string[a];
+	
+	return NULL;
+}
+
+const char *BLI_short_filename(const char *string) {
+	const char *ls, *lls;
+	
+	ls= last_slash_len(string, strlen(string));
+	if(!ls)
+		return string;
+	
+	lls= last_slash_len(string, ls-string);
+
+	if(lls)
+		return lls+1;
+	else
+		return ls+1;
+}
+
 /* adds a slash if there isnt one there alredy */
 int BLI_add_slash(char *string) {
 	int len = strlen(string);
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index e2338078a8a..b45ab2d4997 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -589,6 +589,7 @@ void UI_exit(void);
 #define UI_ITEM_R_EXPAND		2
 #define UI_ITEM_R_SLIDER		4
 #define UI_ITEM_R_TOGGLE		8
+#define UI_ITEM_R_ICON_ONLY		16
 
 uiLayout *uiBlockLayout(uiBlock *block, int dir, int type, int x, int y, int size, int em, struct uiStyle *style);
 void uiBlockSetCurLayout(uiBlock *block, uiLayout *layout);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 04d575d96d4..bf449dba597 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -443,7 +443,7 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, char *name, int icon
 	uiBlockSetCurLayout(block, layout);
 }
 
-static void ui_item_enum_row(uiLayout *layout, uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, char *uiname, int x, int y, int w, int h)
+static void ui_item_enum_row(uiLayout *layout, uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, char *uiname, int x, int y, int w, int h, int icon_only)
 {
 	EnumPropertyItem *item;
 	const char *identifier;
@@ -463,7 +463,7 @@ static void ui_item_enum_row(uiLayout *layout, uiBlock *block, PointerRNA *ptr,
 		value= item[a].value;
 		itemw= ui_text_icon_width(block->curlayout, name, icon, 0);
 
-		if(icon && strcmp(name, "") != 0)
+		if(icon && strcmp(name, "") != 0 && !icon_only)
 			uiDefIconTextButR(block, ROW, 0, icon, name, 0, 0, itemw, h, ptr, identifier, -1, 0, value, -1, -1, NULL);
 		else if(icon)
 			uiDefIconButR(block, ROW, 0, icon, 0, 0, itemw, h, ptr, identifier, -1, 0, value, -1, -1, NULL);
@@ -477,7 +477,7 @@ static void ui_item_enum_row(uiLayout *layout, uiBlock *block, PointerRNA *ptr,
 }
 
 /* create label + button for RNA property */
-static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int x, int y, int w, int h)
+static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int x, int y, int w, int h, int icon_only)
 {
 	uiLayout *sub;
 	uiBut *but;
@@ -506,7 +506,7 @@ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, char *name, i
 		but= uiDefIconButO(block, BUT, "BUTTONS_OT_file_browse", WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, "Browse for file or directory.");
 	}
 	else
-		but= uiDefAutoButR(block, ptr, prop, index, "", icon, x, y, w, h);
+		but= uiDefAutoButR(block, ptr, prop, index, (icon_only)? "": NULL, icon, x, y, w, h);
 
 	uiBlockSetCurLayout(block, layout);
 	return but;
@@ -788,7 +788,7 @@ void uiItemO(uiLayout *layout, char *name, int icon, char *opname)
 
 /* RNA property items */
 
-static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int *r_w, int *r_h)
+static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int icon_only, int *r_w, int *r_h)
 {
 	PropertyType type;
 	PropertySubType subtype;
@@ -799,9 +799,9 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA
 	subtype= RNA_property_subtype(prop);
 	len= RNA_property_array_length(ptr, prop);
 
-	if(ELEM3(type, PROP_STRING, PROP_POINTER, PROP_ENUM) && !name[0])
+	if(ELEM3(type, PROP_STRING, PROP_POINTER, PROP_ENUM) && !name[0] && !icon_only)
 		name= "non-empty text";
-	else if(type == PROP_BOOLEAN && !name[0])
+	else if(type == PROP_BOOLEAN && !name[0] && !icon_only)
 		icon= ICON_DOT;
 
 	w= ui_text_icon_width(layout, name, icon, 0);
@@ -823,7 +823,7 @@ static void ui_item_rna_size(uiLayout *layout, char *name, int icon, PointerRNA
 		if(type == PROP_BOOLEAN && strcmp(name, "") != 0)
 			w += UI_UNIT_X/5;
 		else if(type == PROP_ENUM)
-			w += UI_UNIT_X/2;
+			w += UI_UNIT_X/4;
 		else if(type == PROP_FLOAT || type == PROP_INT)
 			w += UI_UNIT_X*3;
 	}
@@ -838,7 +838,7 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 	uiBut *but;
 	PropertyType type;
 	char namestr[UI_MAX_NAME_STR];
-	int len, w, h, slider, toggle, expand;
+	int len, w, h, slider, toggle, expand, icon_only;
 
 	if(!ptr->data || !prop)
 		return;
@@ -872,9 +872,10 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 	slider= (flag & UI_ITEM_R_SLIDER);
 	toggle= (flag & UI_ITEM_R_TOGGLE);
 	expand= (flag & UI_ITEM_R_EXPAND);
+	icon_only= (flag & UI_ITEM_R_ICON_ONLY);
 
 	/* get size */
-	ui_item_rna_size(layout, name, icon, ptr, prop, index, &w, &h);
+	ui_item_rna_size(layout, name, icon, ptr, prop, index, icon_only, &w, &h);
 
 	/* array property */
 	if(index == RNA_NO_INDEX && len > 0)
@@ -883,7 +884,7 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 	else if(type == PROP_ENUM && index == RNA_ENUM_VALUE) {
 		char *identifier= (char*)RNA_property_identifier(prop);
 
-		if(icon && strcmp(name, "") != 0)
+		if(icon && strcmp(name, "") != 0 && !icon_only)
 			uiDefIconTextButR(block, ROW, 0, icon, name, 0, 0, w, h, ptr, identifier, -1, 0, value, -1, -1, NULL);
 		else if(icon)
 			uiDefIconButR(block, ROW, 0, icon, 0, 0, w, h, ptr, identifier, -1, 0, value, -1, -1, NULL);
@@ -892,10 +893,10 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
 	}
 	/* expanded enum */
 	else if(type == PROP_ENUM && expand)
-		ui_item_enum_row(layout, block, ptr, prop, name, 0, 0, w, h);
+		ui_item_enum_row(layout, block, ptr, prop, name, 0, 0, w, h, icon_only);
 	/* property with separate label */
 	else if(type == PROP_ENUM || type == PROP_STRING || type == PROP_POINTER) {
-		but= ui_item_with_label(layout, block, name, icon, ptr, prop, index, 0, 0, w, h);
+		but= ui_item_with_label(layout, block, name, icon, ptr, prop, index, 0, 0, w, h, icon_only);
 		ui_but_add_search(but, ptr, prop, NULL, NULL);
 	}
 	/* single button */
@@ -1160,8 +1161,8 @@ void uiItemPointerR(uiLayout *layout, char *name, int icon, struct PointerRNA *p
 	/* create button */
 	block= uiLayoutGetBlock(layout);
 
-	ui_item_rna_size(layout, name, icon, ptr, prop, 0, &w, &h);
-	but= ui_item_with_label(layout, block, name, icon, ptr, prop, 0, 0, 0, w, h);
+	ui_item_rna_size(layout, name, icon, ptr, prop, 0, 0, &w, &h);
+	but= ui_item_with_label(layout, block, name, icon, ptr, prop, 0, 0, 0, w, h, 0);
 
 	ui_but_add_search(but, ptr, prop, searchptr, searchprop);
 }
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 5b44f6544d1..63f81c9e46c 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -108,7 +108,12 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 				but= uiDefButR(block, NUM, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
 			break;
 		case PROP_ENUM:
-			but= uiDefButR(block, MENU, 0, NULL, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
+			if(icon && name && strcmp(name, "") == 0)
+				but= uiDefIconButR(block, MENU, 0, icon, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
+			else if(icon)
+				but= uiDefIconTextButR(block, MENU, 0, icon, NULL, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
+			else
+				but= uiDefButR(block, MENU, 0, NULL, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
 			break;
 		case PROP_STRING:
 			if(icon && name && strcmp(name, "") == 0)
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index eaf7d41b9fe..f4c8c63c480 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1122,7 +1122,7 @@ void OBJECT_OT_convert(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "keep_original", 0, "Keep Original", "Keep original objects instead of replacing them.");
 }
 
-/************************** Add Duplicate **********************/
+/**************************** Duplicate ************************/
 
 /* 
 	dupflag: a flag made from constants declared in DNA_userdef_types.h
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index bb8c5dc292e..ddcecdeb1f1 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -176,7 +176,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(LATTICE_OT_make_regular);
 	
 	/* macros */
-	ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Add Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
+	ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
 	if(ot) {
 		WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate");
 		WM_operatortype_macro_define(ot, "TFM_OT_translate");
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index ad0dd786791..5566aeba260 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -242,33 +242,41 @@ static char *wm_keymap_item_to_string(wmKeymapItem *kmi, char *str, int len)
 	return str;
 }
 
-static wmKeymapItem *wm_keymap_item_find_handlers(ListBase *handlers, const char *opname, int opcontext, IDProperty *properties)
+static wmKeymapItem *wm_keymap_item_find_handlers(ListBase *handlers, const char *opname, int opcontext, IDProperty *properties, int compare_props)
 {
 	wmEventHandler *handler;
 	wmKeymapItem *kmi;
 
 	/* find keymap item in handlers */
-	for(handler=handlers->first; handler; handler=handler->next)
-		if(handler->keymap)
-			for(kmi=handler->keymap->first; kmi; kmi=kmi->next)
-				if(strcmp(kmi->idname, opname) == 0 && WM_key_event_string(kmi->type)[0])
-					if(kmi->ptr && IDP_EqualsProperties(properties, kmi->ptr->data))
+	for(handler=handlers->first; handler; handler=handler->next) {
+		if(handler->keymap) {
+			for(kmi=handler->keymap->first; kmi; kmi=kmi->next) {
+				if(strcmp(kmi->idname, opname) == 0 && WM_key_event_string(kmi->type)[0]) {
+					if(compare_props) {
+						if(kmi->ptr && IDP_EqualsProperties(properties, kmi->ptr->data))
+							return kmi;
+					}
+					else
 						return kmi;
+				}
+			}
+		}
+	}
 	
 	return NULL;
 }
 
-static wmKeymapItem *wm_keymap_item_find(const bContext *C, const char *opname, int opcontext, IDProperty *properties)
+static wmKeymapItem *wm_keymap_item_find(const bContext *C, const char *opname, int opcontext, IDProperty *properties, int compare_props)
 {
 	wmKeymapItem *found= NULL;
 
 	/* look into multiple handler lists to find the item */
 	if(CTX_wm_window(C))
-		found= wm_keymap_item_find_handlers(&CTX_wm_window(C)->handlers, opname, opcontext, properties);
+		found= wm_keymap_item_find_handlers(&CTX_wm_window(C)->handlers, opname, opcontext, properties, compare_props);
 	
 
 	if(CTX_wm_area(C) && found==NULL)
-		found= wm_keymap_item_find_handlers(&CTX_wm_area(C)->handlers, opname, opcontext, properties);
+		found= wm_keymap_item_find_handlers(&CTX_wm_area(C)->handlers, opname, opcontext, properties, compare_props);
 
 	if(found==NULL) {
 		if(ELEM(opcontext, WM_OP_EXEC_REGION_WIN, WM_OP_INVOKE_REGION_WIN)) {
@@ -279,12 +287,12 @@ static wmKeymapItem *wm_keymap_item_find(const bContext *C, const char *opname,
 						break;
 
 				if(ar)
-					found= wm_keymap_item_find_handlers(&ar->handlers, opname, opcontext, properties);
+					found= wm_keymap_item_find_handlers(&ar->handlers, opname, opcontext, properties, compare_props);
 			}
 		}
 		else {
 			if(CTX_wm_region(C))
-				found= wm_keymap_item_find_handlers(&CTX_wm_region(C)->handlers, opname, opcontext, properties);
+				found= wm_keymap_item_find_handlers(&CTX_wm_region(C)->handlers, opname, opcontext, properties, compare_props);
 		}
 	}
 	
@@ -293,7 +301,10 @@ static wmKeymapItem *wm_keymap_item_find(const bContext *C, const char *opname,
 
 char *WM_key_event_operator_string(const bContext *C, const char *opname, int opcontext, IDProperty *properties, char *str, int len)
 {
-	wmKeymapItem *found= wm_keymap_item_find(C, opname, opcontext, properties);
+	wmKeymapItem *found= wm_keymap_item_find(C, opname, opcontext, properties, 1);
+
+	if(!found)
+		found= wm_keymap_item_find(C, opname, opcontext, properties, 0);
 	
 	if(found) {
 		wm_keymap_item_to_string(found, str, len);
@@ -306,7 +317,10 @@ char *WM_key_event_operator_string(const bContext *C, const char *opname, int op
 /* searches context and changes keymap item, if found */
 void WM_key_event_operator_change(const bContext *C, const char *opname, int opcontext, IDProperty *properties, short key, short modifier)
 {
-	wmKeymapItem *found= wm_keymap_item_find(C, opname, opcontext, properties);
+	wmKeymapItem *found= wm_keymap_item_find(C, opname, opcontext, properties, 1);
+
+	if(!found)
+		found= wm_keymap_item_find(C, opname, opcontext, properties, 0);
 
 	if(found) {
 		keymap_event_set(found, key, KM_PRESS, modifier, 0);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0913d58258f..6debe5a8825 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -837,7 +837,7 @@ static EnumPropertyItem *open_recentfile_itemf(bContext *C, PointerRNA *ptr, int
 	for(recent = G.recent_files.first, i=0; (i<U.recent_files) && (recent); recent = recent->next, i++) {
 		tmp.value= i+ofs+1;
 		tmp.identifier= recent->filename;
-		tmp.name= recent->filename;
+		tmp.name= BLI_short_filename(recent->filename);
 		RNA_enum_item_add(&item, &totitem, &tmp);
 	}
 

From bfe57bb0850a8cd19274a0b97e95ec4bae802360 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Thu, 10 Sep 2009 18:58:31 +0000
Subject: [PATCH 514/577] Added repeat operations to the toolbar.

---
 release/ui/space_view3d_toolbar.py | 72 +++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 73f97dec750..9dd2df14492 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -40,6 +40,13 @@ class VIEW3D_PT_tools_objectmode(View3DPanel):
 		col = layout.column(align=True)
 		col.itemO("anim.insert_keyframe_menu", text="Insert")
 		col.itemO("anim.delete_keyframe_v3d", text="Remove")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_mesh ****************
 
@@ -83,6 +90,13 @@ class VIEW3D_PT_tools_meshedit(View3DPanel):
 		col.itemO("uv.mapping_menu", text="Unwrap")
 		col.itemO("mesh.uvs_rotate")
 		col.itemO("mesh.uvs_mirror")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_curve ****************
 
@@ -114,6 +128,13 @@ class VIEW3D_PT_tools_curveedit(View3DPanel):
 		col = layout.column(align=True)
 		col.itemO("curve.extrude")
 		col.itemO("curve.subdivide")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_surface ****************
 
@@ -144,6 +165,13 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel):
 		col = layout.column(align=True)
 		col.itemO("curve.extrude")
 		col.itemO("curve.subdivide")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_text ****************
 
@@ -153,14 +181,26 @@ class VIEW3D_PT_tools_textedit(View3DPanel):
 
 	def draw(self, context):
 		layout = self.layout
-
+		
+		layout.itemL(text="Text Edit:")
+		
 		col = layout.column(align=True)
 		col.itemO("font.text_copy", text="Copy")
+		col.itemO("font.text_cut", text="Cut")
 		col.itemO("font.text_paste", text="Paste")
 		
-		col = layout.column()
+		layout.itemL(text="Style:")
+		
+		col = layout.column(align=True)
 		col.itemO("font.case_set")
 		col.itemO("font.style_toggle")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_armature ****************
 
@@ -187,6 +227,13 @@ class VIEW3D_PT_tools_armatureedit(View3DPanel):
 		
 		layout.itemL(text="Modeling:")
 		layout.itemO("armature.extrude")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_mball ****************
 
@@ -203,6 +250,13 @@ class VIEW3D_PT_tools_mballedit(View3DPanel):
 		col.itemO("tfm.translate")
 		col.itemO("tfm.rotate")
 		col.itemO("tfm.resize", text="Scale")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for editmode_lattice ****************
 
@@ -219,6 +273,13 @@ class VIEW3D_PT_tools_latticeedit(View3DPanel):
 		col.itemO("tfm.translate")
 		col.itemO("tfm.rotate")
 		col.itemO("tfm.resize", text="Scale")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for posemode ****************
 
@@ -259,6 +320,13 @@ class VIEW3D_PT_tools_posemode(View3DPanel):
 		col = layout.column(align=True)
 		col.itemO("poselib.pose_add", text="Add")
 		col.itemO("poselib.pose_remove", text="Remove")
+		
+		layout.itemL(text="Repeat:")
+		
+		col = layout.column(align=True)
+		col.itemO("screen.repeat_last")
+		col.itemO("screen.repeat_history", text="History...")
+		col.itemO("screen.redo_last", text="Tweak...")
 
 # ********** default tools for paint modes ****************
 

From e19537efccce4a8fd15f5b2b2baa51c4edef3b4e Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Thu, 10 Sep 2009 20:31:15 +0000
Subject: [PATCH 515/577] SVN maintenance.

---
 source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c    | 2 +-
 source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c | 2 +-
 source/blender/nodes/intern/CMP_nodes/CMP_levels.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
index 0a4d3fceff9..470d04d9dcc 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
@@ -1,5 +1,5 @@
 /**
- * $Id: CMP_colorMatte.c 12931 2007-12-17 18:20:48Z theeth $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
index 921ac869cb8..f24aedd6661 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
@@ -1,5 +1,5 @@
 /**
- * $Id: CMP_diffMatte.c 12931 2007-12-17 18:20:48Z theeth $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_levels.c b/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
index 414c535789e..28b769a8a97 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
@@ -1,5 +1,5 @@
 /**
- * $Id: CMP_levels.c 12931 2007-12-17 18:20:48Z theeth $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *

From fcc5884c252ae10b07a6f8c5e1c5990e9aa4e7c5 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 10 Sep 2009 20:41:18 +0000
Subject: [PATCH 516/577] operator to fetch frames from a job in the list,
 decorator for rna registration

---
 release/io/netrender/client.py    | 13 +++----
 release/io/netrender/operators.py | 61 ++++++++++++++++++++++++++++---
 release/io/netrender/ui.py        | 19 ++++------
 release/io/netrender/utils.py     |  8 ++++
 4 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
index 0c60bd1603c..bcfff8f5db5 100644
--- a/release/io/netrender/client.py
+++ b/release/io/netrender/client.py
@@ -120,9 +120,10 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 	
 	return job_id
 
-def clientRequestResult(conn, scene, job_id):
-	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(scene.current_frame)})
+def requestResult(conn, job_id, frame):
+	conn.request("GET", "render", headers={"job-id": job_id, "job-frame":str(frame)})
 
+@rnaType
 class NetworkRenderEngine(bpy.types.RenderEngine):
 	__idname__ = 'NET_RENDER'
 	__label__ = "Network Render"
@@ -164,17 +165,17 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			
 			self.update_stats("", "Network render waiting for results")
 			
-			clientRequestResult(conn, scene, job_id)
+			requestResult(conn, job_id, scene.current_frame)
 			response = conn.getresponse()
 			
 			if response.status == http.client.NO_CONTENT:
 				netsettings.job_id = clientSendJob(conn, scene)
-				clientRequestResult(conn, scene, job_id)
+				requestResult(conn, job_id, scene.current_frame)
 			
 			while response.status == http.client.ACCEPTED and not self.test_break():
 				print("waiting")
 				time.sleep(1)
-				clientRequestResult(conn, scene, job_id)
+				requestResult(conn, job_id, scene.current_frame)
 				response = conn.getresponse()
 	
 			if response.status != http.client.OK:
@@ -200,5 +201,3 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
 			
 			conn.close()
 
-bpy.types.register(NetworkRenderEngine)
-
diff --git a/release/io/netrender/operators.py b/release/io/netrender/operators.py
index 1c6d89c0043..ccecef670d4 100644
--- a/release/io/netrender/operators.py
+++ b/release/io/netrender/operators.py
@@ -6,6 +6,7 @@ from netrender.utils import *
 import netrender.client as client
 import netrender.model
 
+@rnaOperator
 class RENDER_OT_netclientsend(bpy.types.Operator):
 	'''
 	Operator documentation text, will be used for the operator tooltip and python docs.
@@ -35,6 +36,7 @@ class RENDER_OT_netclientsend(bpy.types.Operator):
 	def invoke(self, context, event):
 		return self.execute(context)
 
+@rnaOperator
 class RENDER_OT_netclientstatus(bpy.types.Operator):
 	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
 	__idname__ = "render.netclientstatus"
@@ -79,6 +81,7 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
 	def invoke(self, context, event):
 		return self.execute(context)
 
+@rnaOperator
 class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
 	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
 	__idname__ = "render.netclientblacklistslave"
@@ -113,6 +116,7 @@ class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
 	def invoke(self, context, event):
 		return self.execute(context)
 
+@rnaOperator
 class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
 	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
 	__idname__ = "render.netclientwhitelistslave"
@@ -148,6 +152,7 @@ class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
 		return self.execute(context)
 
 
+@rnaOperator
 class RENDER_OT_netclientslaves(bpy.types.Operator):
 	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
 	__idname__ = "render.netclientslaves"
@@ -197,6 +202,7 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
 	def invoke(self, context, event):
 		return self.execute(context)
 
+@rnaOperator
 class RENDER_OT_netclientcancel(bpy.types.Operator):
 	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
 	__idname__ = "render.netclientcancel"
@@ -228,9 +234,52 @@ class RENDER_OT_netclientcancel(bpy.types.Operator):
 	def invoke(self, context, event):
 		return self.execute(context)
 	
-bpy.ops.add(RENDER_OT_netclientsend)
-bpy.ops.add(RENDER_OT_netclientstatus)
-bpy.ops.add(RENDER_OT_netclientslaves)
-bpy.ops.add(RENDER_OT_netclientblacklistslave)
-bpy.ops.add(RENDER_OT_netclientwhitelistslave)
-bpy.ops.add(RENDER_OT_netclientcancel)
\ No newline at end of file
+@rnaOperator
+class netclientdownload(bpy.types.Operator):
+	'''Operator documentation text, will be used for the operator tooltip and python docs.'''
+	__idname__ = "render.netclientdownload"
+	__label__ = "Net Render Client Download"
+	
+	# List of operator properties, the attributes will be assigned
+	# to the class instance from the operator settings before calling.
+	
+	__props__ = []
+	
+	def poll(self, context):
+		netsettings = context.scene.network_render
+		return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
+		
+	def execute(self, context):
+		netsettings = context.scene.network_render
+		rd = context.scene.render_data
+		
+		conn = clientConnection(context.scene)
+		
+		if conn:
+			job = bpy.data.netrender_jobs[netsettings.active_job_index]
+			
+			for frame in job.frames:
+				client.requestResult(conn, job.id, frame.number)
+				response = conn.getresponse()
+		
+				if response.status != http.client.OK:
+					print("missing", frame.number)
+					continue
+				
+				print("got back", frame.number)
+				
+				f = open(netsettings.path + "%06d" % frame.number + ".exr", "wb")
+				buf = response.read(1024)
+				
+				while buf:
+					f.write(buf)
+					buf = response.read(1024)
+				
+				f.close()
+			
+			conn.close()
+		
+		return ('FINISHED',)
+	
+	def invoke(self, context, event):
+		return self.execute(context)
\ No newline at end of file
diff --git a/release/io/netrender/ui.py b/release/io/netrender/ui.py
index 8faabe6ff2d..12ac10b551f 100644
--- a/release/io/netrender/ui.py
+++ b/release/io/netrender/ui.py
@@ -28,6 +28,7 @@ class RenderButtonsPanel(bpy.types.Panel):
 		return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
 
 # Setting panel, use in the scene for now.
+@rnaType
 class SCENE_PT_network_settings(RenderButtonsPanel):
 	__label__ = "Network Settings"
 	COMPAT_ENGINES = set(['NET_RENDER'])
@@ -57,8 +58,8 @@ class SCENE_PT_network_settings(RenderButtonsPanel):
 			col.itemR(scene.network_render, "priority")
 			col.itemR(scene.network_render, "job_name")
 			col.itemO("render.netclientsend", text="send job to server")
-bpy.types.register(SCENE_PT_network_settings)
 
+@rnaType
 class SCENE_PT_network_slaves(RenderButtonsPanel):
 	__label__ = "Slaves Status"
 	COMPAT_ENGINES = set(['NET_RENDER'])
@@ -96,8 +97,7 @@ class SCENE_PT_network_slaves(RenderButtonsPanel):
 			layout.itemL(text="Seen: " + time.ctime(slave.last_seen))
 			layout.itemL(text="Stats: " + slave.stats)
 
-bpy.types.register(SCENE_PT_network_slaves)
-
+@rnaType
 class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel):
 	__label__ = "Slaves Blacklist"
 	COMPAT_ENGINES = set(['NET_RENDER'])
@@ -133,9 +133,8 @@ class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel):
 			layout.itemL(text="Address: " + slave.address[0])
 			layout.itemL(text="Seen: " + slave.last_seen)
 			layout.itemL(text="Stats: " + time.ctime(slave.stats))
-			
-bpy.types.register(SCENE_PT_network_slaves_blacklist)
 
+@rnaType
 class SCENE_PT_network_jobs(RenderButtonsPanel):
 	__label__ = "Jobs"
 	COMPAT_ENGINES = set(['NET_RENDER'])
@@ -158,6 +157,7 @@ class SCENE_PT_network_jobs(RenderButtonsPanel):
 		subcol = col.column(align=True)
 		subcol.itemO("render.netclientstatus", icon="ICON_FILE_REFRESH", text="")
 		subcol.itemO("render.netclientcancel", icon="ICON_ZOOMOUT", text="")
+		subcol.itemO("render.netclientdownload", icon='ICON_RENDER_ANIMATION', text="")
 
 		if len(bpy.data.netrender_jobs) == 0 and len(netsettings.jobs) > 0:
 			while(len(netsettings.jobs) > 0):
@@ -172,22 +172,19 @@ class SCENE_PT_network_jobs(RenderButtonsPanel):
 			layout.itemL(text="Length: %04i" % len(job))
 			layout.itemL(text="Done: %04i" % job.results[DONE])
 			layout.itemL(text="Error: %04i" % job.results[ERROR])
-			
-bpy.types.register(SCENE_PT_network_jobs)
 
+@rnaType
 class NetRenderSettings(bpy.types.IDPropertyGroup):
 	pass
 
+@rnaType
 class NetRenderSlave(bpy.types.IDPropertyGroup):
 	pass
 
+@rnaType
 class NetRenderJob(bpy.types.IDPropertyGroup):
 	pass
 
-bpy.types.register(NetRenderSettings)
-bpy.types.register(NetRenderSlave)
-bpy.types.register(NetRenderJob)
-
 bpy.types.Scene.PointerProperty(attr="network_render", type=NetRenderSettings, name="Network Render", description="Network Render Settings")
 
 NetRenderSettings.StringProperty( attr="server_address",
diff --git a/release/io/netrender/utils.py b/release/io/netrender/utils.py
index d1b383f7a97..db6646e6916 100644
--- a/release/io/netrender/utils.py
+++ b/release/io/netrender/utils.py
@@ -13,6 +13,14 @@ DISPATCHED = 1
 DONE = 2
 ERROR = 3
 
+def rnaType(rna_type):
+	bpy.types.register(rna_type)
+	return rna_type
+
+def rnaOperator(rna_op):
+	bpy.ops.add(rna_op)
+	return rna_op
+
 def clientConnection(scene):
 		netrender = scene.network_render
 		

From e9587a89faf33aa0c1383b59f006be4cc7443a5a Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Thu, 10 Sep 2009 22:32:33 +0000
Subject: [PATCH 517/577] Hair dynamics with cloth simulation - Hair dynamics
 have their own panel in particle settings with the settings from cloth panel
 that apply to hair. - Basic internal friction force to quickly emulate self
 collisions and volume preservation. (Still very early code, but gives some
 idea of what's possible). - Softbody simulation is no longer used for hair. 
 * Old files with sb dynamics should just load the hair without dynamics so
 new dynamics can be applied. 	* Invasion of particles exceptions in sb code
 is finally over. - Collisions with other objects are disabled for now and
 will be worked out in the future.

Other changes/fixes:
- Particle mode editing flag wasn't saved properly.
- Some old files with edited hair didn't load correctly.
- Disabled delete & specials menu in particle mode for non-hair editing.
- Fixed yet one more cloth & softbody pointcache update issue.
- Disconnect/connect hair now uses only the deformed mesh so it works correctly also for subsurfed emitters.
- Hair editing now updates correctly with a moving emitter.
---
 release/ui/buttons_particle.py                |  54 ++-
 source/blender/blenkernel/BKE_cloth.h         |   3 +-
 source/blender/blenkernel/BKE_particle.h      |   2 +-
 source/blender/blenkernel/intern/cloth.c      |  45 +--
 source/blender/blenkernel/intern/implicit.c   |  88 ++++-
 source/blender/blenkernel/intern/object.c     |   7 +-
 source/blender/blenkernel/intern/particle.c   | 205 ++++++------
 .../blenkernel/intern/particle_system.c       | 305 ++++++++++-------
 source/blender/blenkernel/intern/pointcache.c |  33 +-
 source/blender/blenkernel/intern/softbody.c   | 307 ++++--------------
 source/blender/blenloader/intern/readfile.c   |  32 +-
 source/blender/blenloader/intern/writefile.c  |   9 +-
 source/blender/editors/physics/editparticle.c |  48 ++-
 .../editors/space_buttons/buttons_ops.c       |  26 +-
 .../blender/editors/space_view3d/drawobject.c |   6 +
 source/blender/makesdna/DNA_cloth_types.h     |   2 +-
 source/blender/makesdna/DNA_object_force.h    |   2 -
 source/blender/makesdna/DNA_particle_types.h  |  15 +-
 source/blender/makesrna/intern/rna_cloth.c    |  10 +-
 source/blender/makesrna/intern/rna_particle.c |  39 ++-
 20 files changed, 670 insertions(+), 568 deletions(-)

diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index b0051453b29..1d496e19121 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -154,8 +154,10 @@ class PARTICLE_PT_particles(ParticleButtonsPanel):
 					if psys.edited==True:
 						if psys.global_hair:
 							layout.itemO("particle.connect_hair")
+							layout.itemL(text="Hair is disconnected.")
 						else:
 							layout.itemO("particle.disconnect_hair")
+							layout.itemL(text="")
 				elif part.type=='REACTOR':
 					split.enabled = particle_panel_enabled(psys)
 					split.itemR(psys, "reactor_target_object")
@@ -212,6 +214,53 @@ class PARTICLE_PT_emission(ParticleButtonsPanel):
 			elif part.distribution=='GRID':
 				row.itemR(part, "grid_resolution")
 
+class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel):
+	__label__ = "Hair dynamics"
+	__default_closed__ = True
+	
+	def poll(self, context):
+		psys = context.particle_system
+		if psys==None:	return False
+		if psys.settings==None:  return False
+		return psys.settings.type == 'HAIR'
+		
+	def draw_header(self, context):
+		#cloth = context.cloth.collision_settings
+		
+		#self.layout.active = cloth_panel_enabled(context.cloth)
+		#self.layout.itemR(cloth, "enable_collision", text="")
+		psys = context.particle_system
+		self.layout.itemR(psys, "hair_dynamics", text="")
+		
+	def draw(self, context):
+		layout = self.layout
+
+		psys = context.particle_system
+		part = psys.settings
+		cloth = psys.cloth.settings
+		
+		layout.enabled = psys.hair_dynamics
+		
+		split = layout.split()
+			
+		col = split.column()
+		col.itemL(text="Quality:")
+		col.itemR(cloth, "quality", text="Steps",slider=True)
+		col.itemL(text="Gravity:")
+		col.itemR(cloth, "gravity", text="")
+		
+		col = split.column()
+		col.itemL(text="Material:")
+		sub = col.column(align=True)
+		sub.itemR(cloth, "pin_stiffness", text="Stiffness")
+		sub.itemR(cloth, "mass")
+		col.itemL(text="Damping:")
+		sub = col.column(align=True)
+		sub.itemR(cloth, "spring_damping", text="Spring")
+		sub.itemR(cloth, "air_damping", text="Air")
+		
+		layout.itemR(cloth, "internal_friction", slider="True")
+				
 class PARTICLE_PT_cache(ParticleButtonsPanel):
 	__label__ = "Cache"
 	__default_closed__ = True
@@ -223,14 +272,14 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
 		phystype = psys.settings.physics_type
 		if phystype == 'NO' or phystype == 'KEYED':
 			return False
-		return psys.settings.type in ('EMITTER', 'REACTOR')
+		return psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.hair_dynamics)
 
 	def draw(self, context):
 		layout = self.layout
 
 		psys = context.particle_system
 		
-		point_cache_ui(self, psys.point_cache, particle_panel_enabled(psys), 1, 0)
+		point_cache_ui(self, psys.point_cache, particle_panel_enabled(psys), not psys.hair_dynamics, 0)
 
 class PARTICLE_PT_initial(ParticleButtonsPanel):
 	__label__ = "Velocity"
@@ -897,6 +946,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel):
 		#row.itemR(psys, "vertex_group_field_negate", text="")
 		
 bpy.types.register(PARTICLE_PT_particles)
+bpy.types.register(PARTICLE_PT_hair_dynamics)
 bpy.types.register(PARTICLE_PT_cache)
 bpy.types.register(PARTICLE_PT_emission)
 bpy.types.register(PARTICLE_PT_initial)
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index bc4585106e6..e5b3adbd0c0 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -176,7 +176,8 @@ typedef enum
 	CLOTH_SIMSETTINGS_FLAG_GOAL = ( 1 << 3 ), 	// we have goals enabled
 	CLOTH_SIMSETTINGS_FLAG_TEARING = ( 1 << 4 ),// true if tearing is enabled
 	CLOTH_SIMSETTINGS_FLAG_SCALING = ( 1 << 8 ), /* is advanced scaling active? */
-	CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12)	/* edit cache in editmode */
+	CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12),	/* edit cache in editmode */
+	CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS = (1 << 13) /* don't allow spring compression */
 } CLOTH_SIMSETTINGS_FLAGS;
 
 /* COLLISION FLAGS */
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 15896477a6a..c22778f5a30 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -208,7 +208,7 @@ void psys_free_boid_rules(struct ListBase *list);
 void psys_free_settings(struct ParticleSettings *part);
 void free_child_path_cache(struct ParticleSystem *psys);
 void psys_free_path_cache(struct ParticleSystem *psys, struct PTCacheEdit *edit);
-void free_hair(struct ParticleSystem *psys, int softbody);
+void free_hair(struct Object *ob, struct ParticleSystem *psys, int dynamics);
 void free_keyed_keys(struct ParticleSystem *psys);
 void psys_free_particles(struct ParticleSystem *psys);
 void psys_free(struct Object * ob, struct ParticleSystem * psys);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 8be8df8e63b..d25c329f49f 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -496,9 +496,11 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob,
 	if(!do_init_cloth(ob, clmd, result, framenr))
 		return result;
 
-	if(framenr == startframe && cache->flag & PTCACHE_REDO_NEEDED) {
+	if(framenr == startframe) {
 		BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+		do_init_cloth(ob, clmd, result, framenr);
 		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
 		cache->flag &= ~PTCACHE_REDO_NEEDED;
 		return result;
 	}
@@ -530,36 +532,25 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob,
 		return result;
 	}
 
-	if(framenr == startframe) {
-		implicit_set_positions(clmd);
+	/* if on second frame, write cache for first frame */
+	if(cache->simframe == startframe && (cache->flag & PTCACHE_OUTDATED || cache->last_exact==0))
+		BKE_ptcache_write_cache(&pid, startframe);
 
-		cache->simframe= framenr;
-		cache->flag |= PTCACHE_SIMULATION_VALID;
+	clmd->sim_parms->timescale *= framenr - cache->simframe;
 
-		/* don't write cache on first frame, but on second frame write
-		 * cache for frame 1 and 2 */
+	/* do simulation */
+	cache->flag |= PTCACHE_SIMULATION_VALID;
+	cache->simframe= framenr;
+
+	if(!do_step_cloth(ob, clmd, result, framenr)) {
+		cache->flag &= ~PTCACHE_SIMULATION_VALID;
+		cache->simframe= 0;
+		cache->last_exact= 0;
 	}
-	else {
-		/* if on second frame, write cache for first frame */
-		if(cache->simframe == startframe && (cache->flag & PTCACHE_OUTDATED || cache->last_exact==0))
-			BKE_ptcache_write_cache(&pid, startframe);
+	else
+		BKE_ptcache_write_cache(&pid, framenr);
 
-		clmd->sim_parms->timescale *= framenr - cache->simframe;
-
-		/* do simulation */
-		cache->flag |= PTCACHE_SIMULATION_VALID;
-		cache->simframe= framenr;
-
-		if(!do_step_cloth(ob, clmd, result, framenr)) {
-			cache->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache->simframe= 0;
-			cache->last_exact= 0;
-		}
-		else
-			BKE_ptcache_write_cache(&pid, framenr);
-
-		cloth_to_object (ob, clmd, result);
-	}
+	cloth_to_object (ob, clmd, result);
 
 	return result;
 }
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index fc5213d5532..0bce71b57eb 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -1183,7 +1183,8 @@ DO_INLINE void dfdx_spring(float to[3][3],  float dir[3],float length,float L,fl
 	//return  ( (I-outerprod(dir,dir))*Min(1.0f,rest/length) - I) * -k;
 	mul_fvectorT_fvector(to, dir, dir);
 	sub_fmatrix_fmatrix(to, I, to);
-	mul_fmatrix_S(to, (((L/length)> 1.0f) ? (1.0f): (L/length))); 
+
+	mul_fmatrix_S(to, (L/length)); 
 	sub_fmatrix_fmatrix(to, to, I);
 	mul_fmatrix_S(to, -k);
 }
@@ -1218,6 +1219,8 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
 	float nulldfdx[3][3]={ {0,0,0}, {0,0,0}, {0,0,0}};
 	
 	float scaling = 0.0;
+
+	int no_compress = clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS;
 	
 	VECCOPY(s->f, nullf);
 	cp_fmatrix(s->dfdx, nulldfdx);
@@ -1254,7 +1257,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
 	// calculate force of structural + shear springs
 	if((s->type & CLOTH_SPRING_TYPE_STRUCTURAL) || (s->type & CLOTH_SPRING_TYPE_SHEAR))
 	{
-		if(length > L) // only on elonglation
+		if(length > L || no_compress)
 		{
 			s->flags |= CLOTH_SPRING_FLAG_NEEDED;
 			
@@ -1393,6 +1396,84 @@ float calculateVertexWindForce(float wind[3], float vertexnormal[3])
 	return (INPR(wind, vertexnormal));
 }
 
+typedef struct HairGridVert {
+	float velocity[3];
+	float density;
+} HairGridVert;
+/* Smoothing of hair velocities:
+ * adapted from
+		Volumetric Methods for Simulation and Rendering of Hair
+		by Lena Petrovic, Mark Henne and John Anderson
+ *		Pixar Technical Memo #06-08, Pixar Animation Studios
+ */
+static void hair_velocity_smoothing(float smoothfac, lfVector *lF, lfVector *lX, lfVector *lV, int numverts)
+{
+	/* TODO: this is an initial implementation and should be made much better in due time */
+
+	/* 10x10x10 grid gives nice initial results */
+	HairGridVert grid[10][10][10];
+	float gmin[3], gmax[3], density;
+	int	v = 0;
+	int	i = 0;
+	int	j = 0;
+	int	k = 0;
+	lfVector temp;
+
+	INIT_MINMAX(gmin, gmax);
+
+	for(i = 0; i < numverts; i++)
+		DO_MINMAX(lX[i], gmin, gmax);
+
+	/* initialize grid */
+	for(i = 0; i < 10; i++) {
+		for(j = 0; j < 10; j++) {
+			for(k = 0; k < 10; k++) {
+				grid[i][j][k].velocity[0] = 0.0f;
+				grid[i][j][k].velocity[1] = 0.0f;
+				grid[i][j][k].velocity[2] = 0.0f;
+				grid[i][j][k].density = 0.0f;
+			}
+		}
+	}
+
+	/* gather velocities & density */
+	for(v = 0; v < numverts; v++) {
+		i = (int)( (lX[v][0] - gmin[0]) / (gmax[0] - gmin[0]) * 9.99f );
+		j = (int)( (lX[v][1] - gmin[1]) / (gmax[1] - gmin[1]) * 9.99f );
+		k = (int)( (lX[v][2] - gmin[2]) / (gmax[2] - gmin[2]) * 9.99f );
+
+		grid[i][j][k].velocity[0] += lV[v][0];
+		grid[i][j][k].velocity[1] += lV[v][1];
+		grid[i][j][k].velocity[2] += lV[v][2];
+		grid[i][j][k].density += 1.0f;
+	}
+
+	/* divide velocity with density */
+	for(i = 0; i < 10; i++) {
+		for(j = 0; j < 10; j++) {
+			for(k = 0; k < 10; k++) {
+				density = grid[i][j][k].density;
+				if(density > 0.0f) {
+					grid[i][j][k].velocity[0] /= density;
+					grid[i][j][k].velocity[1] /= density;
+					grid[i][j][k].velocity[2] /= density;
+				}
+			}
+		}
+	}
+
+	/* calculate forces */
+	for(v = 0; v < numverts; v++) {
+		i = (int)( (lX[v][0] - gmin[0]) / (gmax[0] - gmin[0]) * 9.99f );
+		j = (int)( (lX[v][1] - gmin[1]) / (gmax[1] - gmin[1]) * 9.99f );
+		k = (int)( (lX[v][2] - gmin[2]) / (gmax[2] - gmin[2]) * 9.99f );
+
+		/* 2.0f is an experimental value that seems to give good results */
+		lF[v][0] += 2.0f * smoothfac * (grid[i][j][k].velocity[0] - lV[v][0]);
+		lF[v][1] += 2.0f * smoothfac * (grid[i][j][k].velocity[1] - lV[v][1]);
+		lF[v][2] += 2.0f * smoothfac * (grid[i][j][k].velocity[2] - lV[v][2]);
+	}
+}
 static void cloth_calc_force(ClothModifierData *clmd, float frame, lfVector *lF, lfVector *lX, lfVector *lV, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, ListBase *effectors, float time, fmatrix3x3 *M)
 {
 	/* Collect forces and derivatives:  F,dFdX,dFdV */
@@ -1416,6 +1497,9 @@ static void cloth_calc_force(ClothModifierData *clmd, float frame, lfVector *lF,
 
 	init_lfvector(lF, gravity, numverts);
 	
+	if(clmd->sim_parms->velocity_smooth > 0.0f)
+		hair_velocity_smoothing(clmd->sim_parms->velocity_smooth, lF, lX, lV, numverts);
+
 	/* multiply lF with mass matrix
 	// force = mass * acceleration (in this case: gravity)
 	*/
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f10226f6f6b..a0004aaae49 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1113,9 +1113,10 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys)
 		}
 	}
 
-	if(psys->soft) {
-		psysn->soft= copy_softbody(psys->soft);
-		psysn->soft->particles = psysn;
+	if(psys->clmd) {
+		ClothModifierData *nclmd = modifier_new(eModifierType_Cloth);
+		modifier_copyData((ModifierData*)psys->clmd, (ModifierData*)nclmd);
+		psys->hair_in_dm = psys->hair_out_dm = NULL;
 	}
 
 	BLI_duplicatelist(&psysn->targets, &psys->targets);
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 0ba2f357a1f..3b2125a7973 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -366,7 +366,7 @@ void psys_free_settings(ParticleSettings *part)
 	boid_free_settings(part->boids);
 }
 
-void free_hair(ParticleSystem *psys, int softbody)
+void free_hair(Object *ob, ParticleSystem *psys, int dynamics)
 {
 	PARTICLE_P;
 
@@ -382,10 +382,28 @@ void free_hair(ParticleSystem *psys, int softbody)
 
 	psys->flag &= ~PSYS_HAIR_DONE;
 
-	if(softbody && psys->soft) {
-		sbFree(psys->soft);
-		psys->soft = NULL;
+	if(psys->clmd) {
+		if(dynamics) {
+			BKE_ptcache_free_list(&psys->ptcaches);
+			psys->clmd->point_cache = psys->pointcache = NULL;
+			psys->clmd->ptcaches.first = psys->clmd->ptcaches.first = NULL;
+
+			modifier_free((ModifierData*)psys->clmd);
+			
+			psys->clmd = NULL;
+		}
+		else {
+			cloth_free_modifier(ob, psys->clmd);
+		}
 	}
+
+	if(psys->hair_in_dm)
+		psys->hair_in_dm->release(psys->hair_in_dm);
+	psys->hair_in_dm = NULL;
+
+	if(psys->hair_out_dm)
+		psys->hair_out_dm->release(psys->hair_out_dm);
+	psys->hair_out_dm = NULL;
 }
 void free_keyed_keys(ParticleSystem *psys)
 {
@@ -468,6 +486,8 @@ void psys_free(Object *ob, ParticleSystem * psys)
 		
 		psys_free_path_cache(psys, NULL);
 
+		free_hair(ob, psys, 1);
+
 		psys_free_particles(psys);
 
 		if(psys->edit && psys->free_edit)
@@ -976,11 +996,11 @@ void psys_interpolate_particle(short type, ParticleKey keys[4], float dt, Partic
 typedef struct ParticleInterpolationData {
 	HairKey *hkey[2];
 
+	DerivedMesh *dm;
+	MVert *mvert[2];
+
 	int keyed;
 	ParticleKey *kkey[2];
-	
-	SoftBody *soft;
-	BodyPoint *bp[2];
 
 	PointCache *cache;
 
@@ -1049,12 +1069,12 @@ static void init_particle_interpolation(Object *ob, ParticleSystem *psys, Partic
 
 		pind->birthtime = key->time;
 		pind->dietime = (key + pa->totkey - 1)->time;
-	}
 
-	//if(pind->soft) {
-	//	pind->bp[0] = pind->soft->bpoint + pa->bpi;
-	//	pind->bp[1] = pind->soft->bpoint + pa->bpi + 1;
-	//}
+		if(pind->dm) {
+			pind->mvert[0] = CDDM_get_vert(pind->dm, pa->hair_index);
+			pind->mvert[1] = pind->mvert[0] + 1;
+		}
+	}
 }
 static void edit_to_particle(ParticleKey *key, PTCacheEditKey *ekey)
 {
@@ -1069,9 +1089,10 @@ static void hair_to_particle(ParticleKey *key, HairKey *hkey)
 	VECCOPY(key->co, hkey->co);
 	key->time = hkey->time;
 }
-static void bp_to_particle(ParticleKey *key, BodyPoint *bp, HairKey *hkey)
+
+static void mvert_to_particle(ParticleKey *key, MVert *mvert, HairKey *hkey)
 {
-	VECCOPY(key->co, bp->pos);
+	VECCOPY(key->co, mvert->co);
 	key->time = hkey->time;
 }
 
@@ -1145,7 +1166,7 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 
 		while(pind->hkey[1]->time < real_t) {
 			pind->hkey[1]++;
-			pind->bp[1]++;
+			pind->mvert[1]++;
 		}
 
 		pind->hkey[0] = pind->hkey[1] - 1;
@@ -1156,10 +1177,10 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 		edit_to_particle(keys + 1, pind->ekey[0]);
 		edit_to_particle(keys + 2, pind->ekey[1]);
 	}
-	else if(pind->soft) {
-		pind->bp[0] = pind->bp[1] - 1;
-		bp_to_particle(keys + 1, pind->bp[0], pind->hkey[0]);
-		bp_to_particle(keys + 2, pind->bp[1], pind->hkey[1]);
+	else if(pind->dm) {
+		pind->mvert[0] = pind->mvert[1] - 1;
+		mvert_to_particle(keys + 1, pind->mvert[0], pind->hkey[0]);
+		mvert_to_particle(keys + 2, pind->mvert[1], pind->hkey[1]);
 	}
 	else if(pind->keyed) {
 		memcpy(keys + 1, pind->kkey[0], sizeof(ParticleKey));
@@ -1181,11 +1202,11 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 			else
 				edit_to_particle(keys, pind->ekey[0]);
 		}
-		else if(pind->soft) {
+		else if(pind->dm) {
 			if(pind->hkey[0] != pa->hair)
-				bp_to_particle(keys, pind->bp[0] - 1, pind->hkey[0] - 1);
+				mvert_to_particle(keys, pind->mvert[0] - 1, pind->hkey[0] - 1);
 			else
-				bp_to_particle(keys, pind->bp[0], pind->hkey[0]);
+				mvert_to_particle(keys, pind->mvert[0], pind->hkey[0]);
 		}
 		else {
 			if(pind->hkey[0] != pa->hair)
@@ -1200,11 +1221,11 @@ static void do_particle_interpolation(ParticleSystem *psys, int p, ParticleData
 			else
 				edit_to_particle(keys + 3, pind->ekey[1]);
 		}
-		else if(pind->soft) {
+		else if(pind->dm) {
 			if(pind->hkey[1] != pa->hair + pa->totkey - 1)
-				bp_to_particle(keys + 3, pind->bp[1] + 1, pind->hkey[1] + 1);
+				mvert_to_particle(keys + 3, pind->mvert[1] + 1, pind->hkey[1] + 1);
 			else
-				bp_to_particle(keys + 3, pind->bp[1], pind->hkey[1]);
+				mvert_to_particle(keys + 3, pind->mvert[1], pind->hkey[1]);
 		}
 		else {
 			if(pind->hkey[1] != pa->hair + pa->totkey - 1)
@@ -2110,7 +2131,11 @@ float *psys_cache_vgroup(DerivedMesh *dm, ParticleSystem *psys, int vgroup)
 {
 	float *vg=0;
 
-	if(psys->vgroup[vgroup]){
+	if(vgroup < 0) {
+		/* hair dynamics pinning vgroup */
+
+	}
+	else if(psys->vgroup[vgroup]){
 		MDeformVert *dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
 		if(dvert){
 			int totvert=dm->getNumVerts(dm), i;
@@ -2639,12 +2664,11 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
 	ParticleSettings *part = psys->part;
 	ParticleEditSettings *pset = &scene->toolsettings->particle;
+
+	DerivedMesh *hair_dm = psys->hair_out_dm;
 	
 	ParticleData *pa = psys->particles;
 	ParticleKey result;
-
-	SoftBody *soft = NULL;
-	BodyPoint *bp[2] = {NULL, NULL};
 	
 	Material *ma;
 	ParticleInterpolationData pind;
@@ -2663,7 +2687,7 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	int keyed, baked;
 
 	/* we don't have anything valid to create paths from so let's quit here */
-	if(!(psys->flag & PSYS_HAIR_DONE) && !(psys->flag & PSYS_KEYED) && !(psys->pointcache->flag & PTCACHE_BAKED))
+	if((psys->flag & PSYS_HAIR_DONE || psys->flag & PSYS_KEYED || psys->pointcache->flag & PTCACHE_BAKED)==0)
 		return;
 
 	if(psys_in_edit_mode(scene, psys))
@@ -2673,24 +2697,18 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 	BLI_srandom(psys->seed);
 
 	keyed = psys->flag & PSYS_KEYED;
-	baked = psys->pointcache->flag & PTCACHE_BAKED;
+	baked = !hair_dm && psys->pointcache->flag & PTCACHE_BAKED;
 
 	/* clear out old and create new empty path cache */
 	psys_free_path_cache(psys, psys->edit);
 	cache= psys->pathcache= psys_alloc_path_cache_buffers(&psys->pathcachebufs, totpart, steps+1);
 
-	if(psys->soft && psys->softflag & OB_SB_ENABLE) {
-		soft = psys->soft;
-		if(!soft->bpoint)
-			soft= NULL;
-	}
-
 	psys->lattice = psys_get_lattice(scene, ob, psys);
 	ma= give_current_material(ob, psys->part->omat);
 	if(ma && (psys->part->draw & PART_DRAW_MAT_COL))
 		VECCOPY(col, &ma->r)
 
-	if(psys->part->from!=PART_FROM_PARTICLE) {
+	if(psys->part->from!=PART_FROM_PARTICLE && !(psys->flag & PSYS_GLOBAL_HAIR)) {
 		if(!(psys->part->flag & PART_CHILD_EFFECT))
 			vg_effector = psys_cache_vgroup(psmd->dm, psys, PSYS_VG_EFFECTOR);
 		
@@ -2700,11 +2718,8 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 
 	/*---first main loop: create all actual particles' paths---*/
 	for(i=0; i<totpart; i++, pa++){
-		if(pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST) {
-			if(soft)
-				bp[0] += pa->totkey; /* TODO use of initialized value? */
+		if(pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST)
 			continue;
-		}
 
 		if(!psys->totchild) {
 			BLI_srandom(psys->seed + i);
@@ -2715,9 +2730,9 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 
 		pind.keyed = keyed;
 		pind.cache = baked ? psys->pointcache : NULL;
-		pind.soft = soft;
 		pind.epoint = NULL;
 		pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE);
+		pind.dm = hair_dm;
 
 		memset(cache[i], 0, sizeof(*cache[i])*(steps+1));
 
@@ -2759,10 +2774,12 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 
 			do_particle_interpolation(psys, i, pa, t, frs_sec, &pind, &result);
 
-			 /* keyed, baked and softbody are allready in global space */
-			if(!keyed && !baked && !soft && !(psys->flag & PSYS_GLOBAL_HAIR)) {
+			/* dynamic hair is in object space */
+			/* keyed and baked are allready in global space */
+			if(hair_dm)
+				Mat4MulVecfl(ob->obmat, result.co);
+			else if(!keyed && !baked && !(psys->flag & PSYS_GLOBAL_HAIR))
 				Mat4MulVecfl(hairmat, result.co);
-			}
 
 			VECCOPY(ca->co, result.co);
 			VECCOPY(ca->col, col);
@@ -2778,64 +2795,66 @@ void psys_cache_paths(Scene *scene, Object *ob, ParticleSystem *psys, float cfra
 			effector*= psys_particle_value_from_verts(psmd->dm,psys->part->from,pa,vg_effector);
 
 		for(k=0, ca=cache[i]; k<=steps; k++, ca++) {
+			if(!(psys->flag & PSYS_GLOBAL_HAIR)) {
 			/* apply effectors */
-			if(!(psys->part->flag & PART_CHILD_EFFECT) && k)
-				do_path_effectors(scene, ob, psys, i, ca, k, steps, cache[i]->co, effector, dfra, cfra, &length, vec);
+				if(!(psys->part->flag & PART_CHILD_EFFECT) && k)
+					do_path_effectors(scene, ob, psys, i, ca, k, steps, cache[i]->co, effector, dfra, cfra, &length, vec);
 
-			/* apply guide curves to path data */
-			if(psys->effectors.first && (psys->part->flag & PART_CHILD_EFFECT)==0)
-				/* ca is safe to cast, since only co and vel are used */
-				do_guide(scene, (ParticleKey*)ca, i, (float)k/(float)steps, &psys->effectors);
+				/* apply guide curves to path data */
+				if(psys->effectors.first && (psys->part->flag & PART_CHILD_EFFECT)==0)
+					/* ca is safe to cast, since only co and vel are used */
+					do_guide(scene, (ParticleKey*)ca, i, (float)k/(float)steps, &psys->effectors);
 
-			/* apply lattice */
-			if(psys->lattice)
-				calc_latt_deform(psys->lattice, ca->co, 1.0f);
+				/* apply lattice */
+				if(psys->lattice)
+					calc_latt_deform(psys->lattice, ca->co, 1.0f);
 
-			/* figure out rotation */
-			
-			if(k) {
-				float cosangle, angle, tangent[3], normal[3], q[4];
+				/* figure out rotation */
+				
+				if(k) {
+					float cosangle, angle, tangent[3], normal[3], q[4];
 
-				if(k == 1) {
-					/* calculate initial tangent for incremental rotations */
-					VECSUB(tangent, ca->co, (ca - 1)->co);
-					VECCOPY(prev_tangent, tangent);
-					Normalize(prev_tangent);
+					if(k == 1) {
+						/* calculate initial tangent for incremental rotations */
+						VECSUB(tangent, ca->co, (ca - 1)->co);
+						VECCOPY(prev_tangent, tangent);
+						Normalize(prev_tangent);
 
-					/* First rotation is based on emitting face orientation.		*/
-					/* This is way better than having flipping rotations resulting	*/
-					/* from using a global axis as a rotation pole (vec_to_quat()). */
-					/* It's not an ideal solution though since it disregards the	*/
-					/* initial tangent, but taking that in to account will allow	*/
-					/* the possibility of flipping again. -jahka					*/
-					Mat3ToQuat_is_ok(rotmat, (ca-1)->rot);
-				}
-				else {
-					VECSUB(tangent, ca->co, (ca - 1)->co);
-					Normalize(tangent);
-
-					cosangle= Inpf(tangent, prev_tangent);
-
-					/* note we do the comparison on cosangle instead of
-					* angle, since floating point accuracy makes it give
-					* different results across platforms */
-					if(cosangle > 0.999999f) {
-						QUATCOPY((ca - 1)->rot, (ca - 2)->rot);
+						/* First rotation is based on emitting face orientation.		*/
+						/* This is way better than having flipping rotations resulting	*/
+						/* from using a global axis as a rotation pole (vec_to_quat()). */
+						/* It's not an ideal solution though since it disregards the	*/
+						/* initial tangent, but taking that in to account will allow	*/
+						/* the possibility of flipping again. -jahka					*/
+						Mat3ToQuat_is_ok(rotmat, (ca-1)->rot);
 					}
 					else {
-						angle= saacos(cosangle);
-						Crossf(normal, prev_tangent, tangent);
-						VecRotToQuat(normal, angle, q);
-						QuatMul((ca - 1)->rot, q, (ca - 2)->rot);
+						VECSUB(tangent, ca->co, (ca - 1)->co);
+						Normalize(tangent);
+
+						cosangle= Inpf(tangent, prev_tangent);
+
+						/* note we do the comparison on cosangle instead of
+						* angle, since floating point accuracy makes it give
+						* different results across platforms */
+						if(cosangle > 0.999999f) {
+							QUATCOPY((ca - 1)->rot, (ca - 2)->rot);
+						}
+						else {
+							angle= saacos(cosangle);
+							Crossf(normal, prev_tangent, tangent);
+							VecRotToQuat(normal, angle, q);
+							QuatMul((ca - 1)->rot, q, (ca - 2)->rot);
+						}
+
+						VECCOPY(prev_tangent, tangent);
 					}
 
-					VECCOPY(prev_tangent, tangent);
+					if(k == steps)
+						QUATCOPY(ca->rot, (ca - 1)->rot);
 				}
 
-				if(k == steps)
-					QUATCOPY(ca->rot, (ca - 1)->rot);
 			}
-
 			
 			/* set velocity */
 
@@ -2913,9 +2932,9 @@ void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cf
 
 		pind.keyed = 0;
 		pind.cache = NULL;
-		pind.soft = NULL;
 		pind.epoint = point;
 		pind.bspline = psys ? (psys->part->flag & PART_HAIR_BSPLINE) : 0;
+		pind.dm = NULL;
 
 		memset(cache[i], 0, sizeof(*cache[i])*(steps+1));
 
@@ -3783,8 +3802,8 @@ void psys_get_particle_on_path(Scene *scene, Object *ob, ParticleSystem *psys, i
 		pa = psys->particles + p;
 		pind.keyed = keyed;
 		pind.cache = cached ? psys->pointcache : NULL;
-		pind.soft = NULL;
 		pind.epoint = NULL;
+		pind.dm = psys->hair_out_dm;
 		init_particle_interpolation(ob, psys, pa, &pind);
 		do_particle_interpolation(psys, p, pa, t, frs_sec, &pind, state);
 
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 1931b89af38..88b85bcfa29 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -73,7 +73,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_object.h"
 #include "BKE_material.h"
-#include "BKE_softbody.h"
+#include "BKE_cloth.h"
 #include "BKE_depsgraph.h"
 #include "BKE_lattice.h"
 #include "BKE_pointcache.h"
@@ -126,7 +126,7 @@ void psys_reset(ParticleSystem *psys, int mode)
 	PARTICLE_P;
 
 	if(ELEM(mode, PSYS_RESET_ALL, PSYS_RESET_DEPSGRAPH)) {
-		if(mode == PSYS_RESET_ALL || !(part->type == PART_HAIR && (psys->edit && psys->edit->edited))) {
+		if(mode == PSYS_RESET_ALL || !(psys->flag & PSYS_EDITED)) {
 			psys_free_particles(psys);
 
 			psys->totpart= 0;
@@ -3432,6 +3432,190 @@ static void deflect_particle(Scene *scene, Object *pob, ParticleSystemModifierDa
 /************************************************/
 /*			Hair								*/
 /************************************************/
+/* check if path cache or children need updating and do it if needed */
+static void psys_update_path_cache(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
+{
+	ParticleSettings *part=psys->part;
+	ParticleEditSettings *pset=&scene->toolsettings->particle;
+	int distr=0,alloc=0,skip=0;
+
+	if((psys->part->childtype && psys->totchild != get_psys_tot_child(scene, psys)) || psys->recalc&PSYS_RECALC_RESET)
+		alloc=1;
+
+	if(alloc || psys->recalc&PSYS_RECALC_CHILD || (psys->vgroup[PSYS_VG_DENSITY] && (ob && ob->mode & OB_MODE_WEIGHT_PAINT)))
+		distr=1;
+
+	if(distr){
+		if(alloc)
+			realloc_particles(ob,psys,psys->totpart);
+
+		if(get_psys_tot_child(scene, psys)) {
+			/* don't generate children while computing the hair keys */
+			if(!(psys->part->type == PART_HAIR) || (psys->flag & PSYS_HAIR_DONE)) {
+				distribute_particles(scene, ob, psys, PART_FROM_CHILD);
+
+				if(part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES && part->parents!=0.0)
+					psys_find_parents(ob,psmd,psys);
+			}
+		}
+	}
+
+	if((part->type==PART_HAIR || psys->flag&PSYS_KEYED || psys->pointcache->flag & PTCACHE_BAKED)==0)
+		skip = 1; /* only hair, keyed and baked stuff can have paths */
+	else if(part->ren_as != PART_DRAW_PATH)
+		skip = 1; /* particle visualization must be set as path */
+	else if(!psys->renderdata) {
+		if(part->draw_as != PART_DRAW_REND)
+			skip = 1; /* draw visualization */
+		else if(psys->pointcache->flag & PTCACHE_BAKING)
+			skip = 1; /* no need to cache paths while baking dynamics */
+		else if(psys_in_edit_mode(scene, psys)) {
+			if((pset->flag & PE_DRAW_PART)==0)
+				skip = 1;
+			else if(part->childtype==0 && (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED)==0)
+				skip = 1; /* in edit mode paths are needed for child particles and dynamic hair */
+		}
+	}
+
+	if(!skip) {
+		psys_cache_paths(scene, ob, psys, cfra);
+
+		/* for render, child particle paths are computed on the fly */
+		if(part->childtype) {
+			if(!psys->totchild)
+				skip = 1;
+			else if((psys->part->type == PART_HAIR && psys->flag & PSYS_HAIR_DONE)==0)
+				skip = 1;
+
+			if(!skip)
+				psys_cache_child_paths(scene, ob, psys, cfra, 0);
+		}
+	}
+	else if(psys->pathcache)
+		psys_free_path_cache(psys, NULL);
+}
+
+static void do_hair_dynamics(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd)
+{
+	DerivedMesh *dm = psys->hair_in_dm;
+	MVert *mvert = NULL;
+	MEdge *medge = NULL;
+	MDeformVert *dvert = NULL;
+	HairKey *key;
+	PARTICLE_P;
+	int totpoint = 0;
+	int totedge;
+	int k;
+	float hairmat[4][4];
+
+	if(!psys->clmd) {
+		psys->clmd = (ClothModifierData*)modifier_new(eModifierType_Cloth);
+		psys->clmd->sim_parms->goalspring = 0.0f;
+		psys->clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_GOAL|CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS;
+		psys->clmd->coll_parms->flags &= ~CLOTH_COLLSETTINGS_FLAG_SELF;
+	}
+
+	/* create a dm from hair vertices */
+	LOOP_PARTICLES
+		totpoint += pa->totkey;
+
+	totedge = totpoint - psys->totpart;
+
+	if(dm && (totpoint != dm->getNumVerts(dm) || totedge != dm->getNumEdges(dm))) {
+		dm->release(dm);
+		dm = psys->hair_in_dm = NULL;
+	}
+
+	if(!dm) {
+		dm = psys->hair_in_dm = CDDM_new(totpoint, totedge, 0);
+		DM_add_vert_layer(dm, CD_MDEFORMVERT, CD_CALLOC, NULL);
+	}
+
+	mvert = CDDM_get_verts(dm);
+	medge = CDDM_get_edges(dm);
+	dvert = DM_get_vert_data_layer(dm, CD_MDEFORMVERT);
+
+	psys->clmd->sim_parms->vgroup_mass = 1;
+
+	/* make vgroup for pin roots etc.. */
+	psys->particles->hair_index = 0;
+	LOOP_PARTICLES {
+		if(p)
+			pa->hair_index = (pa-1)->hair_index + (pa-1)->totkey;
+
+		psys_mat_hair_to_object(ob, psmd->dm, psys->part->from, pa, hairmat);
+
+		for(k=0, key=pa->hair; k<pa->totkey; k++,key++) {
+			VECCOPY(mvert->co, key->co);
+			Mat4MulVecfl(hairmat, mvert->co);
+			mvert++;
+			
+			if(k) {
+				medge->v1 = pa->hair_index + k - 1;
+				medge->v2 = pa->hair_index + k;
+				medge++;
+			}
+
+			if(dvert) {
+				if(!dvert->totweight) {
+					dvert->dw = MEM_callocN (sizeof(MDeformWeight), "deformWeight");
+					dvert->totweight = 1;
+				}
+
+				/* no special reason for the 0.5 */
+				/* just seems like a nice value from experiments */
+				dvert->dw->weight = k ? 0.5f : 1.0f;
+				dvert++;
+			}
+		}
+	}
+
+	if(psys->hair_out_dm)
+		psys->hair_out_dm->release(psys->hair_out_dm);
+
+	psys->clmd->point_cache = psys->pointcache;
+
+	psys->hair_out_dm = clothModifier_do(psys->clmd, scene, ob, dm, 0, 0);
+}
+static void hair_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
+{
+	ParticleSettings *part = psys->part;
+	PARTICLE_P;
+	float disp = (float)get_current_display_percentage(psys)/100.0f;
+
+	BLI_srandom(psys->seed);
+
+	LOOP_PARTICLES {
+		if(BLI_frand() > disp)
+			pa->flag |= PARS_NO_DISP;
+		else
+			pa->flag &= ~PARS_NO_DISP;
+	}
+
+	if(psys->recalc & PSYS_RECALC_RESET) {
+		/* need this for changing subsurf levels */
+		psys_calc_dmcache(ob, psmd->dm, psys);
+
+		if(psys->clmd)
+			cloth_free_modifier(ob, psys->clmd);
+	}
+
+	if(psys->effectors.first)
+		psys_end_effectors(psys);
+
+	/* dynamics with cloth simulation */
+	if(psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS)
+		do_hair_dynamics(scene, ob, psys, psmd);
+
+	psys_init_effectors(scene, ob, part->eff_group, psys);
+	if(psys->effectors.first)
+		precalc_effectors(scene, ob,psys,psmd,cfra);
+
+	psys_update_path_cache(scene, ob,psmd,psys,cfra);
+
+	psys->flag |= PSYS_HAIR_UPDATED;
+}
+
 static void save_hair(Scene *scene, Object *ob, ParticleSystem *psys, ParticleSystemModifierData *psmd, float cfra){
 	HairKey *key, *root;
 	PARTICLE_P;
@@ -3692,79 +3876,6 @@ static void dynamics_step(Scene *scene, Object *ob, ParticleSystem *psys, Partic
 		BLI_kdtree_free(tree);
 }
 
-/* check if path cache or children need updating and do it if needed */
-static void psys_update_path_cache(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
-{
-	ParticleSettings *part=psys->part;
-	ParticleEditSettings *pset=&scene->toolsettings->particle;
-	int distr=0,alloc=0;
-
-	if((psys->part->childtype && psys->totchild != get_psys_tot_child(scene, psys)) || psys->recalc&PSYS_RECALC_RESET)
-		alloc=1;
-
-	if(alloc || psys->recalc&PSYS_RECALC_CHILD || (psys->vgroup[PSYS_VG_DENSITY] && (ob && ob->mode & OB_MODE_WEIGHT_PAINT)))
-		distr=1;
-
-	if(distr){
-		if(alloc)
-			realloc_particles(ob,psys,psys->totpart);
-
-		if(get_psys_tot_child(scene, psys)) {
-			/* don't generate children while computing the hair keys */
-			if(!(psys->part->type == PART_HAIR) || (psys->flag & PSYS_HAIR_DONE)) {
-				distribute_particles(scene, ob, psys, PART_FROM_CHILD);
-
-				if(part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES && part->parents!=0.0)
-					psys_find_parents(ob,psmd,psys);
-			}
-		}
-	}
-
-	if((part->type==PART_HAIR || psys->flag&PSYS_KEYED || psys->pointcache->flag & PTCACHE_BAKED) && ( psys_in_edit_mode(scene, psys) || (part->type==PART_HAIR 
-		|| (part->ren_as == PART_DRAW_PATH && (part->draw_as == PART_DRAW_REND || psys->renderdata))))){
-
-		psys_cache_paths(scene, ob, psys, cfra);
-
-		/* for render, child particle paths are computed on the fly */
-		if(part->childtype) {
-			if(((psys->totchild!=0)) || (psys_in_edit_mode(scene, psys) && (pset->flag&PE_DRAW_PART)))
-				if(!(psys->part->type == PART_HAIR) || (psys->flag & PSYS_HAIR_DONE))
-					psys_cache_child_paths(scene, ob, psys, cfra, 0);
-		}
-	}
-	else if(psys->pathcache)
-		psys_free_path_cache(psys, NULL);
-}
-
-static void hair_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
-{
-	ParticleSettings *part = psys->part;
-	PARTICLE_P;
-	float disp = (float)get_current_display_percentage(psys)/100.0f;
-
-	BLI_srandom(psys->seed);
-
-	LOOP_PARTICLES {
-		if(BLI_frand() > disp)
-			pa->flag |= PARS_NO_DISP;
-		else
-			pa->flag &= ~PARS_NO_DISP;
-	}
-
-	if(psys->recalc & PSYS_RECALC_RESET)
-		/* need this for changing subsurf levels */
-		psys_calc_dmcache(ob, psmd->dm, psys);
-
-	if(psys->effectors.first)
-		psys_end_effectors(psys);
-
-	psys_init_effectors(scene, ob, part->eff_group, psys);
-	if(psys->effectors.first)
-		precalc_effectors(scene, ob,psys,psmd,cfra);
-
-	psys_update_path_cache(scene, ob,psmd,psys,cfra);
-}
-
 /* updates cached particles' alive & other flags etc..*/
 static void cached_step(Scene *scene, Object *ob, ParticleSystemModifierData *psmd, ParticleSystem *psys, float cfra)
 {
@@ -3889,14 +4000,12 @@ static void psys_changed_type(Object *ob, ParticleSystem *psys)
 		BKE_ptcache_id_clear(&pid, PTCACHE_CLEAR_ALL, 0);
 	}
 	else {
-		free_hair(psys, 1);
+		free_hair(ob, psys, 1);
 
 		CLAMP(part->path_start, 0.0f, MAX2(100.0f, part->end + part->lifetime));
 		CLAMP(part->path_end, 0.0f, MAX2(100.0f, part->end + part->lifetime));
 	}
 
-	psys->softflag= 0;
-
 	psys_reset(psys, PSYS_RESET_ALL);
 }
 void psys_check_boid_data(ParticleSystem *psys)
@@ -4082,7 +4191,7 @@ static void system_step(Scene *scene, Object *ob, ParticleSystem *psys, Particle
 	framedelta= framenr - cache->simframe;
 
 	/* set suitable cache range automatically */
-	if((cache->flag & (PTCACHE_BAKING|PTCACHE_BAKED))==0)
+	if((cache->flag & (PTCACHE_BAKING|PTCACHE_BAKED))==0 && !(psys->flag & PSYS_HAIR_DYNAMICS))
 		psys_get_pointcache_start_end(scene, psys, &cache->startframe, &cache->endframe);
 
 	BKE_ptcache_id_from_particles(&pid, ob, psys);
@@ -4307,39 +4416,9 @@ static void system_step(Scene *scene, Object *ob, ParticleSystem *psys, Particle
 	}
 }
 
-static void psys_to_softbody(Scene *scene, Object *ob, ParticleSystem *psys)
-{
-	SoftBody *sb;
-	short softflag; 
-
-	if(!(psys->softflag & OB_SB_ENABLE))
-		return;
-
-	/* let's replace the object's own softbody with the particle softbody */
-	/* a temporary solution before cloth simulation is implemented, jahka */
-
-	/* save these */
-	sb= ob->soft;
-	softflag= ob->softflag;
-
-	/* swich to new ones */
-	ob->soft= psys->soft;
-	ob->softflag= psys->softflag;
-
-	/* do softbody */
-	sbObjectStep(scene, ob, (float)scene->r.cfra, NULL, psys_count_keys(psys));
-
-	/* return things back to normal */
-	psys->soft= ob->soft;
-	psys->softflag= ob->softflag;
-	
-	ob->soft= sb;
-	ob->softflag= softflag;
-}
-
 static int hair_needs_recalc(ParticleSystem *psys)
 {
-	if((!psys->edit || !psys->edit->edited) &&
+	if(!(psys->flag & PSYS_EDITED) && (!psys->edit || !psys->edit->edited) &&
 		((psys->flag & PSYS_HAIR_DONE)==0 || psys->recalc & PSYS_RECALC_RESET)) {
 		return 1;
 	}
@@ -4380,7 +4459,7 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
 		float hcfra=0.0f;
 		int i;
 
-		free_hair(psys, 0);
+		free_hair(ob, psys, 0);
 
 		/* first step is negative so particles get killed and reset */
 		psys->cfra= 1.0f;
@@ -4394,10 +4473,6 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
 		psys->flag |= PSYS_HAIR_DONE;
 	}
 
-	/* handle softbody hair */
-	if(psys->part->type==PART_HAIR && psys->soft)
-		psys_to_softbody(scene, ob, psys);
-
 	/* the main particle system step */
 	system_step(scene, ob, psys, psmd, cfra);
 
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 5a14277d63b..f351f8a4335 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -382,8 +382,6 @@ static int ptcache_totpoint_cloth(void *cloth_v)
 /* Creating ID's */
 void BKE_ptcache_id_from_softbody(PTCacheID *pid, Object *ob, SoftBody *sb)
 {
-	ParticleSystemModifierData *psmd;
-
 	memset(pid, 0, sizeof(PTCacheID));
 
 	pid->ob= ob;
@@ -406,12 +404,7 @@ void BKE_ptcache_id_from_softbody(PTCacheID *pid, Object *ob, SoftBody *sb)
 	pid->data_types= (1<<BPHYS_DATA_LOCATION) | (1<<BPHYS_DATA_VELOCITY);
 	pid->info_types= 0;
 
-	if(sb->particles) {
-		psmd= psys_get_modifier(ob, sb->particles);
-		// pid->stack_index= modifiers_indexInObject(ob, (ModifierData*)psmd);  XXX TODO - get other index DG
-	}
-	else 
-		pid->stack_index = pid->cache->index;
+	pid->stack_index = pid->cache->index;
 }
 
 void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *psys)
@@ -426,7 +419,8 @@ void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *p
 	pid->cache_ptr= &psys->pointcache;
 	pid->ptcaches= &psys->ptcaches;
 
-	pid->flag |= PTCACHE_VEL_PER_SEC;
+	if(psys->part->type != PART_HAIR)
+		pid->flag |= PTCACHE_VEL_PER_SEC;
 
 	pid->write_elem= ptcache_write_particle;
 	pid->write_stream = NULL;
@@ -816,12 +810,6 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob)
 			pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
 			BKE_ptcache_id_from_particles(pid, ob, psys);
 			BLI_addtail(lb, pid);
-
-			if(psys->soft) {
-				pid= MEM_callocN(sizeof(PTCacheID), "PTCacheID");
-				BKE_ptcache_id_from_softbody(pid, ob, psys->soft);
-				BLI_addtail(lb, pid);
-			}
 		}
 	}
 
@@ -1828,9 +1816,10 @@ int BKE_ptcache_id_reset(Scene *scene, PTCacheID *pid, int mode)
 	else if(mode == PTCACHE_RESET_OUTDATED) {
 		reset = 1;
 
-		if(cache->flag & PTCACHE_OUTDATED)
-			if(!(cache->flag & PTCACHE_BAKED))
-				clear= 1;
+		if(cache->flag & PTCACHE_OUTDATED && !(cache->flag & PTCACHE_BAKED)) {
+			clear= 1;
+			cache->flag &= ~PTCACHE_OUTDATED;
+		}
 	}
 
 	if(reset) {
@@ -1873,10 +1862,10 @@ int BKE_ptcache_object_reset(Scene *scene, Object *ob, int mode)
 	}
 
 	for(psys=ob->particlesystem.first; psys; psys=psys->next) {
-		/* Baked softbody hair has to be checked first, because we don't want to reset */
-		/* particles or softbody in that case -jahka */
-		if(psys->soft) {
-			BKE_ptcache_id_from_softbody(&pid, ob, psys->soft);
+		/* Baked cloth hair has to be checked first, because we don't want to reset */
+		/* particles or cloth in that case -jahka */
+		if(psys->clmd) {
+			BKE_ptcache_id_from_cloth(&pid, ob, psys->clmd);
 			if(mode == PSYS_RESET_ALL || !(psys->part->type == PART_HAIR && (pid.cache->flag & PTCACHE_BAKED))) 
 				reset |= BKE_ptcache_id_reset(scene, &pid, mode);
 			else
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index fdbfe154fae..450a64d72eb 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -58,7 +58,6 @@ variables on the UI for now
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"	/* here is the softbody struct */
-#include "DNA_particle_types.h"
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -76,7 +75,6 @@ variables on the UI for now
 #include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_object.h"
-#include "BKE_particle.h"
 #include "BKE_softbody.h"
 #include "BKE_utildefines.h"
 #include "BKE_DerivedMesh.h"
@@ -494,32 +492,21 @@ static void ccd_build_deflector_hash(Scene *scene, Object *vertexowner, GHash *h
 	while (base) {
 		/*Only proceed for mesh object in same layer */
 		if(base->object->type==OB_MESH && (base->lay & vertexowner->lay)) {
-			int particles=0;
 			ob= base->object;
 			if((vertexowner) && (ob == vertexowner)) {
-				if(vertexowner->soft->particles){
-					particles=1;
-				}
-				else {
-					/* if vertexowner is given  we don't want to check collision with owner object */ 
-					base = base->next;
-					continue;				
-				}
+				/* if vertexowner is given  we don't want to check collision with owner object */ 
+				base = base->next;
+				continue;
 			}
 
 			/*+++ only with deflecting set */
 			if(ob->pd && ob->pd->deflect && BLI_ghash_lookup(hash, ob) == 0) {
 				DerivedMesh *dm= NULL;
 
-				if(particles) {
-					dm = psys_get_modifier(ob,psys_get_current(ob))->dm;
-				}
-				else {
-					if(ob->softflag & OB_SB_COLLFINAL) /* so maybe someone wants overkill to collide with subsurfed */
-						dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
-					else
-						dm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
-				}
+				if(ob->softflag & OB_SB_COLLFINAL) /* so maybe someone wants overkill to collide with subsurfed */
+					dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
+				else
+					dm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
 
 				if(dm){
 					ccd_Mesh *ccdmesh = ccd_mesh_make(ob, dm);
@@ -3571,107 +3558,6 @@ static void curve_surf_to_softbody(Scene *scene, Object *ob)
 	}
 }
 
-
-static void springs_from_particles(Object *ob)
-{
-	ParticleSystem *psys;
-	ParticleSystemModifierData *psmd=0;
-	ParticleData *pa=0;
-	HairKey *key=0;
-	SoftBody *sb;
-	BodyPoint *bp;
-	BodySpring *bs;
-	int a,k;
-	float hairmat[4][4];
-
-	if(ob && ob->soft && ob->soft->particles) { 	
-		psys= ob->soft->particles;
-		sb= ob->soft;	
-		psmd = psys_get_modifier(ob, psys);
-
-		bp= sb->bpoint;
-		for(a=0, pa=psys->particles; a<psys->totpart; a++, pa++) {
-			for(k=0, key=pa->hair; k<pa->totkey; k++, bp++, key++) {
-				VECCOPY(bp->origS, key->co);
-
-				psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
-
-				Mat4MulVecfl(hairmat, bp->origS);
-			}
-		}
-
-		for(a=0, bs=sb->bspring; a<sb->totspring; a++, bs++)
-			bs->len= VecLenf(sb->bpoint[bs->v1].origS, sb->bpoint[bs->v2].origS);
-	}
-}
-
-static void particles_to_softbody(Scene *scene, Object *ob)
-{
-	SoftBody *sb;
-	BodyPoint *bp;
-	BodySpring *bs;
-	ParticleData *pa;
-	HairKey *key;
-	ParticleSystem *psys= ob->soft->particles;
-	float goalfac;
-	int a, k, curpoint;
-	int totpoint= psys_count_keys(psys);
-	int totedge= totpoint-psys->totpart;
-	
-	/* renew ends with ob->soft with points and edges, also checks & makes ob->soft */
-	renew_softbody(scene, ob, totpoint, totedge);
-
-	/* find first BodyPoint index for each particle */
-	if(psys->totpart > 0) {
-//		psys->particles->bpi = 0;
-//		for(a=1, pa=psys->particles+1; a<psys->totpart; a++, pa++)
-//			pa->bpi = (pa-1)->bpi + (pa-1)->totkey;
-	}
-
-	/* we always make body points */
-	sb= ob->soft;	
-	bp= sb->bpoint;
-	bs= sb->bspring;
-	goalfac= ABS(sb->maxgoal - sb->mingoal);
-
-	if((ob->softflag & OB_SB_GOAL)) {
-		for(a=0, pa=psys->particles; a<psys->totpart; a++, pa++) {
-			for(k=0, key=pa->hair; k<pa->totkey; k++,bp++,key++) {
-				if(k) {
-					bp->goal= key->weight;
-					bp->goal= sb->mingoal + bp->goal*goalfac;
-					bp->goal= (float)pow(bp->goal, 4.0f);
-				}
-				else{
-					/* hair roots are allways fixed fully to goal */
-					bp->goal= 1.0f;
-				}
-			}
-		}
-	}
-
-	bp= sb->bpoint;
-	curpoint=0;
-	for(a=0, pa=psys->particles; a<psys->totpart; a++, curpoint++, pa++) {
-		for(k=0; k<pa->totkey-1; k++,bs++,curpoint++) {
-			bs->v1=curpoint;
-			bs->v2=curpoint+1;
-			bs->strength= 1.0;
-			bs->order=1;
-		}
-	}
-	
-	build_bps_springlist(ob); /* scan for springs attached to bodypoints ONCE */
-	/* insert *other second order* springs if desired */
-	if(sb->secondspring > 0.0000001f) {
-		add_2nd_order_springs(ob,sb->secondspring*10.0); /* exploits the the first run of build_bps_springlist(ob);*/
-		build_bps_springlist(ob); /* yes we need to do it again*/
-	}
-	springs_from_particles(ob); /* write the 'rest'-lenght of the springs */
-    if(ob->softflag & OB_SB_SELF)
-		calculate_collision_balls(ob);
-}
-
 /* copies softbody result back in object */
 static void softbody_to_object(Object *ob, float (*vertexCos)[3], int numVerts, int local)
 {
@@ -3795,44 +3681,16 @@ void sbSetInterruptCallBack(int (*f)(void))
 
 static void softbody_update_positions(Object *ob, SoftBody *sb, float (*vertexCos)[3], int numVerts)
 {
-	ParticleSystemModifierData *psmd= NULL;
-	ParticleData *pa= NULL;
-	HairKey *key= NULL;
 	BodyPoint *bp;
-	float hairmat[4][4];
 	int a;
 
-	/* update the vertex locations */
-	if(sb->particles && sb->particles->totpart>0) {
-		psmd= psys_get_modifier(ob,sb->particles);
-
-		pa= sb->particles->particles;
-		key= pa->hair;
-
-		psys_mat_hair_to_global(ob, psmd->dm, sb->particles->part->from, pa, hairmat);
-	}
-
 	for(a=0,bp=sb->bpoint; a<numVerts; a++, bp++) {
 		/* store where goals are now */ 
 		VECCOPY(bp->origS, bp->origE);
 		/* copy the position of the goals at desired end time */
-		if(sb->particles) {
-			if(key == pa->hair + pa->totkey) {
-				pa++;
-				key = pa->hair;
-
-				psys_mat_hair_to_global(ob, psmd->dm, sb->particles->part->from, pa, hairmat);
-			}
-			VECCOPY(bp->origE, key->co);
-			Mat4MulVecfl(hairmat,bp->origE);
-
-			key++;
-		}
-		else{
-			VECCOPY(bp->origE, vertexCos[a]);
-			/* vertexCos came from local world, go global */
-			Mat4MulVecfl(ob->obmat, bp->origE);
-		}
+		VECCOPY(bp->origE, vertexCos[a]);
+		/* vertexCos came from local world, go global */
+		Mat4MulVecfl(ob->obmat, bp->origE);
 		/* just to be save give bp->origT a defined value
 		will be calulated in interpolate_exciter()*/
 		VECCOPY(bp->origT, bp->origE); 
@@ -3841,37 +3699,12 @@ static void softbody_update_positions(Object *ob, SoftBody *sb, float (*vertexCo
 
 static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int numVerts)
 {
-	ParticleSystemModifierData *psmd= NULL;
-	HairKey *key= NULL;
-	ParticleData *pa= NULL;
 	BodyPoint *bp;
-	float hairmat[4][4];
 	int a;
 
-	if(sb->particles && sb->particles->totpart>0) {
-		psmd= psys_get_modifier(ob, sb->particles);
-		pa= sb->particles->particles;
-		key= pa->hair;
-
-		psys_mat_hair_to_global(ob, psmd->dm, sb->particles->part->from, pa, hairmat);
-	}
-
 	for(a=0,bp=sb->bpoint; a<numVerts; a++, bp++) {
-		if(sb->particles) {
-			if(key == pa->hair + pa->totkey) {
-				pa++;
-				key = pa->hair;
-
-				psys_mat_hair_to_global(ob, psmd->dm, sb->particles->part->from, pa, hairmat);
-			}
-			VECCOPY(bp->pos, key->co);
-			Mat4MulVecfl(hairmat, bp->pos);
-			key++;
-		}
-		else {
-			VECCOPY(bp->pos, vertexCos[a]);
-			Mat4MulVecfl(ob->obmat, bp->pos);  /* yep, sofbody is global coords*/
-		}
+		VECCOPY(bp->pos, vertexCos[a]);
+		Mat4MulVecfl(ob->obmat, bp->pos);  /* yep, sofbody is global coords*/
 		VECCOPY(bp->origS, bp->pos);
 		VECCOPY(bp->origE, bp->pos);
 		VECCOPY(bp->origT, bp->pos);
@@ -3900,20 +3733,18 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int
 	sb_new_scratch(sb); /* make a new */
 	sb->scratch->needstobuildcollider=1; 
 
-	if((sb->particles)==0) {
-		/* copy some info to scratch */
-		switch(ob->type) {
-		case OB_MESH:
-			if (ob->softflag & OB_SB_FACECOLL) mesh_faces_to_scratch(ob);
-			break;
-		case OB_LATTICE:
-			break;
-		case OB_CURVE:
-		case OB_SURF:
-			break;
-		default:
-			break;
-		}
+	/* copy some info to scratch */
+	switch(ob->type) {
+	case OB_MESH:
+		if (ob->softflag & OB_SB_FACECOLL) mesh_faces_to_scratch(ob);
+		break;
+	case OB_LATTICE:
+		break;
+	case OB_CURVE:
+	case OB_SURF:
+		break;
+	default:
+		break;
 	}
 }
 
@@ -4049,8 +3880,6 @@ static void softbody_step(Scene *scene, Object *ob, SoftBody *sb, float dtime)
 /* simulates one step. framenr is in frames */
 void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], int numVerts)
 {
-	ParticleSystemModifierData *psmd=0;
-	ParticleData *pa=0;
 	SoftBody *sb= ob->soft;
 	PointCache *cache;
 	PTCacheID pid;
@@ -4091,25 +3920,20 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 	if(sb->bpoint == NULL ||
 	   ((ob->softflag & OB_SB_EDGES) && !ob->soft->bspring && object_has_edges(ob))) {
 
-		if(sb->particles){
-			particles_to_softbody(scene, ob);
-		}
-		else {
-			switch(ob->type) {
-				case OB_MESH:
-					mesh_to_softbody(scene, ob);
-					break;
-				case OB_LATTICE:
-					lattice_to_softbody(scene, ob);
-					break;
-				case OB_CURVE:
-				case OB_SURF:
-					curve_surf_to_softbody(scene, ob);
-					break;
-				default:
-					renew_softbody(scene, ob, numVerts, 0);
-					break;
-			}
+		switch(ob->type) {
+			case OB_MESH:
+				mesh_to_softbody(scene, ob);
+				break;
+			case OB_LATTICE:
+				lattice_to_softbody(scene, ob);
+				break;
+			case OB_CURVE:
+			case OB_SURF:
+				curve_surf_to_softbody(scene, ob);
+				break;
+			default:
+				renew_softbody(scene, ob, numVerts, 0);
+				break;
 		}
 
 		softbody_update_positions(ob, sb, vertexCos, numVerts);
@@ -4127,8 +3951,7 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 		softbody_update_positions(ob, sb, vertexCos, numVerts);
 		softbody_step(scene, ob, sb, dtime);
 
-		if(sb->particles==0)
-			softbody_to_object(ob, vertexCos, numVerts, 0);
+		softbody_to_object(ob, vertexCos, numVerts, 0);
 
 		return;
 	}
@@ -4136,14 +3959,14 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 	/* still no points? go away */
 	if(sb->totpoint==0) return;
 
-	if(sb->particles){
-		psmd= psys_get_modifier(ob, sb->particles);
-		pa= sb->particles->particles;
-	}
-
-	if(framenr == startframe && cache->flag & PTCACHE_REDO_NEEDED) {
+	if(framenr == startframe) {
 		BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+
+		/* first frame, no simulation to do, just set the positions */
+		softbody_update_positions(ob, sb, vertexCos, numVerts);
+
 		cache->simframe= framenr;
+		cache->flag |= PTCACHE_SIMULATION_VALID;
 		cache->flag &= ~PTCACHE_REDO_NEEDED;
 		return;
 	}
@@ -4152,8 +3975,7 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 	cache_result = BKE_ptcache_read_cache(&pid, framenr, scene->r.frs_sec);
 
 	if(cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED) {
-		if(sb->particles==0)
-			softbody_to_object(ob, vertexCos, numVerts, sb->local);
+		softbody_to_object(ob, vertexCos, numVerts, sb->local);
 
 		cache->simframe= framenr;
 		cache->flag |= PTCACHE_SIMULATION_VALID;
@@ -4174,36 +3996,23 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
 		return;
 	}
 
-	if(framenr == startframe) {
-		/* first frame, no simulation to do, just set the positions */
-		softbody_update_positions(ob, sb, vertexCos, numVerts);
+	/* if on second frame, write cache for first frame */
+	if(cache->simframe == startframe && (cache->flag & PTCACHE_OUTDATED || cache->last_exact==0))
+		BKE_ptcache_write_cache(&pid, startframe);
 
-		cache->simframe= framenr;
-		cache->flag |= PTCACHE_SIMULATION_VALID;
+	softbody_update_positions(ob, sb, vertexCos, numVerts);
 
-		/* don't write cache on first frame, but on second frame write
-		 * cache for frame 1 and 2 */
-	}
-	else {
-		/* if on second frame, write cache for first frame */
-		if(cache->simframe == startframe && (cache->flag & PTCACHE_OUTDATED || cache->last_exact==0))
-			BKE_ptcache_write_cache(&pid, startframe);
+	/* checking time: */
+	dtime = framedelta*timescale;
 
-		softbody_update_positions(ob, sb, vertexCos, numVerts);
+	softbody_step(scene, ob, sb, dtime);
 
-		/* checking time: */
-		dtime = framedelta*timescale;
+	softbody_to_object(ob, vertexCos, numVerts, 0);
 
-		softbody_step(scene, ob, sb, dtime);
+	/* do simulation */
+	cache->simframe= framenr;
+	cache->flag |= PTCACHE_SIMULATION_VALID;
 
-		if(sb->particles==0)
-			softbody_to_object(ob, vertexCos, numVerts, 0);
-
-		/* do simulation */
-		cache->simframe= framenr;
-		cache->flag |= PTCACHE_SIMULATION_VALID;
-
-		BKE_ptcache_write_cache(&pid, framenr);
-	}
+	BKE_ptcache_write_cache(&pid, framenr);
 }
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 37031f4f82a..5b45a4219c7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3114,17 +3114,6 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
 		psys->child=newdataadr(fd,psys->child);
 		psys->effectors.first=psys->effectors.last=0;
 
-		psys->soft= newdataadr(fd, psys->soft);
-		if(psys->soft) {
-			SoftBody *sb = psys->soft;
-			sb->particles = psys;
-			sb->bpoint= NULL;	// init pointers so it gets rebuilt nicely
-			sb->bspring= NULL;
-			sb->scratch= NULL;
-
-			direct_link_pointcache_list(fd, &sb->ptcaches, &sb->pointcache);
-		}
-
 		link_list(fd, &psys->targets);
 
 		psys->edit = NULL;
@@ -3137,6 +3126,23 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
 
 		direct_link_pointcache_list(fd, &psys->ptcaches, &psys->pointcache);
 
+		if(psys->clmd) {
+			psys->clmd = newdataadr(fd, psys->clmd);
+			psys->clmd->clothObject = NULL;
+			
+			psys->clmd->sim_parms= newdataadr(fd, psys->clmd->sim_parms);
+			psys->clmd->coll_parms= newdataadr(fd, psys->clmd->coll_parms);
+			
+			if(psys->clmd->sim_parms) {
+				if(psys->clmd->sim_parms->presets > 10)
+					psys->clmd->sim_parms->presets = 0;
+			}
+
+			psys->hair_in_dm = psys->hair_out_dm = NULL;
+
+			psys->clmd->point_cache = psys->pointcache;
+		}
+
 		psys->tree = NULL;
 	}
 	return;
@@ -8342,8 +8348,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ob->soft->pointcache= BKE_ptcache_add(&ob->soft->ptcaches);
 
 			for(psys=ob->particlesystem.first; psys; psys=psys->next) {
-				if(psys->soft && !psys->soft->pointcache)
-					psys->soft->pointcache= BKE_ptcache_add(&psys->soft->ptcaches);
+				//if(psys->soft && !psys->soft->pointcache)
+				//	psys->soft->pointcache= BKE_ptcache_add(&psys->soft->ptcaches);
 				if(!psys->pointcache)
 					psys->pointcache= BKE_ptcache_add(&psys->ptcaches);
 			}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 46cc62fff1c..98db27182ab 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -660,8 +660,13 @@ static void write_particlesystems(WriteData *wd, ListBase *particles)
 			writestruct(wd, DATA, "ParticleTarget", 1, pt);
 
 		if(psys->child) writestruct(wd, DATA, "ChildParticle", psys->totchild ,psys->child);
-		writestruct(wd, DATA, "SoftBody", 1, psys->soft);
-		if(psys->soft) write_pointcaches(wd, &psys->soft->ptcaches);
+
+		if(psys->clmd) {
+			writestruct(wd, DATA, "ClothModifierData", 1, psys->clmd);
+			writestruct(wd, DATA, "ClothSimSettings", 1, psys->clmd->sim_parms);
+			writestruct(wd, DATA, "ClothCollSettings", 1, psys->clmd->coll_parms);
+		}
+		
 		write_pointcaches(wd, &psys->ptcaches);
 	}
 }
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 0f5e677b912..5acdcb40613 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -120,6 +120,20 @@ static int PE_poll(bContext *C)
 	return (edit && (ob->mode & OB_MODE_PARTICLE_EDIT));
 }
 
+static int PE_hair_poll(bContext *C)
+{
+	Scene *scene= CTX_data_scene(C);
+	Object *ob= CTX_data_active_object(C);
+	PTCacheEdit *edit;
+
+	if(!scene || !ob)
+		return 0;
+	
+	edit= PE_get_current(scene, ob);
+
+	return (edit && edit->psys && (ob->mode & OB_MODE_PARTICLE_EDIT));
+}
+
 static int PE_poll_3dview(bContext *C)
 {
 	return PE_poll(C) && CTX_wm_area(C)->spacetype == SPACE_VIEW3D &&
@@ -169,6 +183,8 @@ int PE_start_edit(PTCacheEdit *edit)
 {
 	if(edit) {
 		edit->edited = 1;
+		if(edit->psys)
+			edit->psys->flag |= PSYS_EDITED;
 		return 1;
 	}
 
@@ -218,9 +234,16 @@ PTCacheEdit *PE_get_current(Scene *scene, Object *ob)
 
 			if(psys->flag & PSYS_CURRENT) {
 				if(psys->part && psys->part->type == PART_HAIR) {
-					if(!psys->edit && psys->flag & PSYS_HAIR_DONE)
-						PE_create_particle_edit(scene, ob, NULL, psys);
-					edit = psys->edit;
+					if(psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED) {
+						if(!psys->pointcache->edit)
+							PE_create_particle_edit(scene, ob, pid->cache, NULL);
+						edit = pid->cache->edit;
+					}
+					else {
+						if(!psys->edit && psys->flag & PSYS_HAIR_DONE)
+							PE_create_particle_edit(scene, ob, NULL, psys);
+						edit = psys->edit;
+					}
 				}
 				else {
 					if(pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit)
@@ -2387,7 +2410,7 @@ void PARTICLE_OT_delete(wmOperatorType *ot)
 	/* api callbacks */
 	ot->exec= delete_exec;
 	ot->invoke= WM_menu_invoke;
-	ot->poll= PE_poll;
+	ot->poll= PE_hair_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -3858,6 +3881,7 @@ static int clear_edited_exec(bContext *C, wmOperator *op)
 
 			psys->recalc |= PSYS_RECALC_RESET;
 			psys->flag &= ~PSYS_GLOBAL_HAIR;
+			psys->flag &= ~PSYS_EDITED;
 
 			psys_reset(psys, PSYS_RESET_DEPSGRAPH);
 			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
@@ -3894,15 +3918,13 @@ static int specials_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	pup= uiPupMenuBegin(C, "Specials", 0);
 	layout= uiPupMenuLayout(pup);
 
-	if(edit->psys) {
-		uiItemO(layout, NULL, 0, "PARTICLE_OT_rekey");
-		if(pset->selectmode & SCE_SELECT_POINT) {
-			uiItemO(layout, NULL, 0, "PARTICLE_OT_subdivide");
-			uiItemO(layout, NULL, 0, "PARTICLE_OT_select_first");
-			uiItemO(layout, NULL, 0, "PARTICLE_OT_select_last");
-		}
-		uiItemO(layout, NULL, 0, "PARTICLE_OT_remove_doubles");
+	uiItemO(layout, NULL, 0, "PARTICLE_OT_rekey");
+	if(pset->selectmode & SCE_SELECT_POINT) {
+		uiItemO(layout, NULL, 0, "PARTICLE_OT_subdivide");
+		uiItemO(layout, NULL, 0, "PARTICLE_OT_select_first");
+		uiItemO(layout, NULL, 0, "PARTICLE_OT_select_last");
 	}
+	uiItemO(layout, NULL, 0, "PARTICLE_OT_remove_doubles");
 
 	uiPupMenuEnd(C, pup);
 
@@ -3917,7 +3939,7 @@ void PARTICLE_OT_specials_menu(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->invoke= specials_menu_invoke;
-	ot->poll= PE_poll;
+	ot->poll= PE_hair_poll;
 }
 
 /**************************** registration **********************************/
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 0df6f6250ff..bc9b05dc12e 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -54,6 +54,7 @@
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
+#include "BKE_modifier.h"
 #include "BKE_node.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
@@ -728,6 +729,7 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	PTCacheEdit *edit = psys->edit;
 	PTCacheEditPoint *point = edit ? edit->points : NULL;
 	PTCacheEditKey *ekey = NULL;
+	DerivedMesh *dm = NULL;
 	HairKey *key;
 	int i, k;
 	float hairmat[4][4];
@@ -738,13 +740,18 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	if(!psys->part || psys->part->type != PART_HAIR)
 		return;
 
+	if(psmd->dm->deformedOnly)
+		dm= psmd->dm;
+	else
+		dm= mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
+
 	for(i=0; i<psys->totpart; i++,pa++) {
 		if(point) {
 			ekey = point->keys;
 			point++;
 		}
 
-		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
+		psys_mat_hair_to_global(ob, dm, psys->part->from, pa, hairmat);
 
 		for(k=0,key=pa->hair; k<pa->totkey; k++,key++) {
 			Mat4MulVecfl(hairmat,key->co);
@@ -758,6 +765,9 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 
 	psys_free_path_cache(psys, psys->edit);
 
+	if(!psmd->dm->deformedOnly)
+		dm->release(dm);
+
 	psys->flag |= PSYS_GLOBAL_HAIR;
 
 	PE_update_object(scene, ob, 0);
@@ -814,8 +824,8 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	BVHTreeFromMesh bvhtree;
 	BVHTreeNearest nearest;
 	MFace *mface;
-	DerivedMesh *dm = CDDM_copy(psmd->dm);
-	int numverts = dm->getNumVerts (dm);
+	DerivedMesh *dm = NULL;
+	int numverts;
 	int i, k;
 	float hairmat[4][4], imat[4][4];
 	float v[4][3], vec[3];
@@ -823,6 +833,13 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	if(!psys || !psys->part || psys->part->type != PART_HAIR)
 		return;
 
+	if(psmd->dm->deformedOnly)
+		dm= psmd->dm;
+	else
+		dm= mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
+
+	numverts = dm->getNumVerts (dm);
+
 	memset( &bvhtree, 0, sizeof(bvhtree) );
 
 	/* convert to global coordinates */
@@ -881,7 +898,8 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	}
 
 	free_bvhtree_from_mesh(&bvhtree);
-	dm->release(dm);
+	if(!psmd->dm->deformedOnly)
+		dm->release(dm);
 
 	psys_free_path_cache(psys, psys->edit);
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 7ed029f3eaf..aa9c28dbef2 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3727,6 +3727,12 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 	float nosel_col[3];
 	float *pathcol = NULL, *pcol;
 
+
+	if(edit->psys && edit->psys->flag & PSYS_HAIR_UPDATED) {
+		PE_update_object(scene, ob, 0);
+		edit->psys->flag &= ~PSYS_HAIR_UPDATED;
+	}
+
 	/* create path and child path cache if it doesn't exist already */
 	if(edit->pathcache==0)
 		psys_cache_edit_paths(scene, ob, edit, CFRA);
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index 33984582d7f..5cfecf7cc01 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -68,6 +68,7 @@ typedef struct ClothSimSettings
 	float	defgoal;
 	float	goalspring;
 	float	goalfrict;
+	float	velocity_smooth; /* smoothing of velocities for hair */
 	int 	stepsPerFrame;	/* Number of time steps per frame.		*/
 	int	flags;		/* flags, see CSIMSETT_FLAGS enum above.	*/
 	int	preroll;	/* How many frames of simulation to do before we start.	*/
@@ -78,7 +79,6 @@ typedef struct ClothSimSettings
 	short	vgroup_struct;  /* vertex group for scaling structural stiffness */
 	short	presets; /* used for presets on GUI */
  	short 	pad;
-	int		pad2;
 } ClothSimSettings;
 
 
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index 5696f82ab0d..986a75f1a96 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -184,8 +184,6 @@ typedef struct BulletSoftBody {
 
 
 typedef struct SoftBody {
-	struct ParticleSystem *particles;	/* particlesystem softbody */
-
 	/* dynamic data */
 	int totpoint, totspring;
 	struct BodyPoint *bpoint;		/* not saved in file */
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index d4dc3df0965..6a0a0e1d912 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -105,7 +105,7 @@ typedef struct ParticleData {
 	short flag;
 	short alive;			/* the life state of a particle */
 	short loop;				/* how many times particle life has looped */
-	short rt;
+	short hair_index;
 } ParticleData;
 
 typedef struct ParticleSettings {
@@ -202,7 +202,8 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 	struct ParticleCacheKey **childcache;	/* child cache (runtime) */
 	ListBase pathcachebufs, childcachebufs;	/* buffers for the above */
 
-	struct SoftBody *soft;					/* hair softbody */
+	struct ClothModifierData *clmd;					/* cloth simulation for hair */
+	struct DerivedMesh *hair_in_dm, *hair_out_dm;	/* input/output for cloth simulation */
 
 	struct Object *target_ob;
 	struct Object *lattice;
@@ -216,9 +217,9 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 	
 	float imat[4][4];	/* used for duplicators */
 	float cfra, tree_frame;
-	int seed;
+	int seed, rt;
 	int flag, totpart, totchild, totcached, totchildcache;
-	short recalc, target_psys, totkeyed, softflag, bakespace, rt2;
+	short recalc, target_psys, totkeyed, bakespace;
 
 	char bb_uvname[3][32];					/* billboard uv name */
 
@@ -411,16 +412,16 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 /* psys->flag */
 #define PSYS_CURRENT		1
 #define PSYS_GLOBAL_HAIR	2
-//#define PSYS_BAKE_UI		4
+#define PSYS_HAIR_DYNAMICS	4
 #define	PSYS_KEYED_TIMING	8
 #define PSYS_ENABLED		16	/* deprecated */
-//#define PSYS_FIRST_KEYED	32
+#define PSYS_HAIR_UPDATED	32  /* signal for updating hair particle mode */
 #define PSYS_DRAWING		64
 //#define PSYS_SOFT_BAKE		128
 #define PSYS_DELETE			256	/* remove particlesystem as soon as possible */
 #define PSYS_HAIR_DONE		512
 #define PSYS_KEYED			1024
-//#define PSYS_EDITED			2048
+#define PSYS_EDITED			2048
 //#define PSYS_PROTECT_CACHE	4096
 #define PSYS_DISABLED		8192
 
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index 38086502d6f..22cc2e2c9c3 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -152,7 +152,7 @@ static char *rna_ClothSettings_path(PointerRNA *ptr)
 	Object *ob= (Object*)ptr->id.data;
 	ModifierData *md= modifiers_findByType(ob, eModifierType_Cloth);
 
-	return BLI_sprintfN("modifiers[%s].settings", md->name);
+	return md ? BLI_sprintfN("modifiers[%s].settings", md->name) : NULL;
 }
 
 static char *rna_ClothCollisionSettings_path(PointerRNA *ptr)
@@ -160,7 +160,7 @@ static char *rna_ClothCollisionSettings_path(PointerRNA *ptr)
 	Object *ob= (Object*)ptr->id.data;
 	ModifierData *md= modifiers_findByType(ob, eModifierType_Cloth);
 
-	return BLI_sprintfN("modifiers[%s].collision_settings", md->name);
+	return md ? BLI_sprintfN("modifiers[%s].collision_settings", md->name) : NULL;
 }
 
 #else
@@ -207,6 +207,12 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Goal Damping", "Goal (vertex target position) friction.");
 	RNA_def_property_update(prop, 0, "rna_cloth_update");
 
+	prop= RNA_def_property(srna, "internal_friction", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "velocity_smooth");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Internal Friction", "");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
+
 	/* mass */
 
 	prop= RNA_def_property(srna, "mass", PROP_FLOAT, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 719e6f43eed..e6f0a462f03 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -33,6 +33,7 @@
 
 #include "rna_internal.h"
 
+#include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_object_force.h"
 #include "DNA_object_types.h"
@@ -96,7 +97,9 @@ EnumPropertyItem part_hair_ren_as_items[] = {
 #ifdef RNA_RUNTIME
 
 #include "BKE_context.h"
+#include "BKE_cloth.h"
 #include "BKE_depsgraph.h"
+#include "BKE_modifier.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
@@ -249,6 +252,21 @@ static void rna_Particle_redo_child(bContext *C, PointerRNA *ptr)
 
 	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
 }
+static void rna_Particle_hair_dynamics(bContext *C, PointerRNA *ptr)
+{
+	Scene *scene = CTX_data_scene(C);
+	ParticleSystem *psys = (ParticleSystem*)ptr->data;
+	
+	if(psys && !psys->clmd) {
+		psys->clmd = (ClothModifierData*)modifier_new(eModifierType_Cloth);
+		psys->clmd->sim_parms->goalspring = 0.0f;
+		psys->clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_GOAL|CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS;
+		psys->clmd->coll_parms->flags &= ~CLOTH_COLLSETTINGS_FLAG_SELF;
+		rna_Particle_redo(C, ptr);
+	}
+	else
+		WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, NULL);
+}
 static PointerRNA rna_particle_settings_get(PointerRNA *ptr)
 {
 	Object *ob= (Object*)ptr->id.data;
@@ -467,7 +485,7 @@ static int rna_ParticleSystem_edited_get(PointerRNA *ptr)
 	ParticleSystem *psys= (ParticleSystem*)ptr->data;
 
 	if(psys->part && psys->part->type==PART_HAIR)
-		return (psys->edit && psys->edit->edited);
+		return (psys->flag & PSYS_EDITED || (psys->edit && psys->edit->edited));
 	else
 		return (psys->pointcache->edit && psys->pointcache->edit->edited);
 }
@@ -1876,19 +1894,22 @@ static void rna_def_particle_system(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 
 	/* hair */
-	prop= RNA_def_property(srna, "softbody", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "soft");
-	RNA_def_property_ui_text(prop, "Soft Body", "Soft body settings for hair physics simulation.");
-
-	prop= RNA_def_property(srna, "use_softbody", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "softflag", OB_SB_ENABLE);
-	RNA_def_property_ui_text(prop, "Use Soft Body", "Enable use of soft body for hair physics simulation.");
-
 	prop= RNA_def_property(srna, "global_hair", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_GLOBAL_HAIR);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Global Hair", "Hair keys are in global coordinate space");
 
+	prop= RNA_def_property(srna, "hair_dynamics", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_HAIR_DYNAMICS);
+	RNA_def_property_ui_text(prop, "Hair Dynamics", "Enable hair dynamics using cloth simulation.");
+	RNA_def_property_update(prop, 0, "rna_Particle_hair_dynamics");
+
+	prop= RNA_def_property(srna, "cloth", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "clmd");
+	RNA_def_property_struct_type(prop, "ClothModifier");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Cloth", "Cloth dynamics for hair");
+
 	/* reactor */
 	prop= RNA_def_property(srna, "reactor_target_object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "target_ob");

From d1314c3db541a8919eb8414d1718bdee273a8a9f Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Thu, 10 Sep 2009 23:46:42 +0000
Subject: [PATCH 518/577] * we currently can have *four* different sound
 devices, instead of 3.

---
 intern/audaspace/intern/AUD_C-API.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index 7a624aa53fd..45faebc7e97 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -67,7 +67,7 @@ typedef AUD_ReadDevice AUD_Device;
 #endif
 
 static AUD_IDevice* AUD_device = NULL;
-static int AUD_available_devices[3];
+static int AUD_available_devices[4];
 static AUD_I3DDevice* AUD_3ddevice = NULL;
 
 int AUD_init(AUD_DeviceType device, AUD_Specs specs, int buffersize)

From 71907c7e4c7c20575edcb50ec29025284a9f9bed Mon Sep 17 00:00:00 2001
From: Janne Karhu <jhkarh@gmail.com>
Date: Fri, 11 Sep 2009 00:23:08 +0000
Subject: [PATCH 519/577] Disconnect hair was using wrong derived mesh for the
 space conversion.

---
 source/blender/editors/space_buttons/buttons_ops.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index bc9b05dc12e..176611377eb 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -729,7 +729,6 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	PTCacheEdit *edit = psys->edit;
 	PTCacheEditPoint *point = edit ? edit->points : NULL;
 	PTCacheEditKey *ekey = NULL;
-	DerivedMesh *dm = NULL;
 	HairKey *key;
 	int i, k;
 	float hairmat[4][4];
@@ -740,18 +739,13 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 	if(!psys->part || psys->part->type != PART_HAIR)
 		return;
 
-	if(psmd->dm->deformedOnly)
-		dm= psmd->dm;
-	else
-		dm= mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
-
 	for(i=0; i<psys->totpart; i++,pa++) {
 		if(point) {
 			ekey = point->keys;
 			point++;
 		}
 
-		psys_mat_hair_to_global(ob, dm, psys->part->from, pa, hairmat);
+		psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa, hairmat);
 
 		for(k=0,key=pa->hair; k<pa->totkey; k++,key++) {
 			Mat4MulVecfl(hairmat,key->co);
@@ -765,9 +759,6 @@ static void disconnect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 
 	psys_free_path_cache(psys, psys->edit);
 
-	if(!psmd->dm->deformedOnly)
-		dm->release(dm);
-
 	psys->flag |= PSYS_GLOBAL_HAIR;
 
 	PE_update_object(scene, ob, 0);

From fc11700628b56d77cfd57c35c04e07e00d46b10e Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 11 Sep 2009 00:49:54 +0000
Subject: [PATCH 520/577] 2.5 - Bugfix for curve-following animation not
 working

Optimisation for not working with AnimData when there were no actions meant that the special hack to set this value didn't get set.
---
 source/blender/blenkernel/intern/anim_sys.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 0e8450025da..2d6a97c48ae 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1450,7 +1450,6 @@ void BKE_animsys_evaluate_animdata (ID *id, AnimData *adt, float ctime, short re
  * 'local' (i.e. belonging in the nearest ID-block that setting is related to, not a
  * standard 'root') block are overridden by a larger 'user'
  */
-// FIXME?: we currently go over entire 'main' database...
 void BKE_animsys_evaluate_all_animation (Main *main, float ctime)
 {
 	ID *id;
@@ -1474,8 +1473,11 @@ void BKE_animsys_evaluate_all_animation (Main *main, float ctime)
 	 * when there are no actions, don't go over database and loop over heaps of datablocks, 
 	 * which should ultimately be empty, since it is not possible for now to have any animation 
 	 * without some actions, and drivers wouldn't get affected by any state changes
+	 *
+	 * however, if there are some curves, we will need to make sure that their 'ctime' property gets
+	 * set correctly, so this optimisation must be skipped in that case...
 	 */
-	if (main->action.first == NULL) {
+	if ((main->action.first == NULL) && (main->curve.first == NULL)) {
 		if (G.f & G_DEBUG)
 			printf("\tNo Actions, so no animation needs to be evaluated...\n");
 			
@@ -1509,6 +1511,7 @@ void BKE_animsys_evaluate_all_animation (Main *main, float ctime)
 		 * value of the curve gets set in case there's no animation for that
 		 *	- it needs to be set before animation is evaluated just so that 
 		 *	  animation can successfully override...
+		 *	- it shouldn't get set when calculating drivers...
 		 */
 	for (id= main->curve.first; id; id= id->next) {
 		AnimData *adt= BKE_animdata_from_id(id);

From 40576677b1dff5373d5b673b599ea9beb094b1ea Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 11 Sep 2009 09:09:54 +0000
Subject: [PATCH 521/577] 2.5: Two Bugfixes

* Mesh Deform modifier now correctly shows Bind/Unbind buttons. Previously, only Bind got shown...

* Selecting keyframes in the Graph Editor using Border Select now allows the keyframes to be editable afterwards. Previously, the curves weren't getting selected afterwards, therefore, the poll operators would skip those curves.
---
 release/ui/buttons_data_modifier.py               | 11 +++++++----
 source/blender/editors/space_graph/graph_select.c |  9 ++++++++-
 source/blender/makesrna/intern/rna_modifier.c     | 12 +++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py
index 2835f55f71a..754e8ce106e 100644
--- a/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@ -242,10 +242,13 @@ class DATA_PT_modifiers(DataButtonsPanel):
 
 		layout.itemS()
 		
-		layout.itemO("object.meshdeform_bind", text="Bind")
-		row = layout.row()
-		row.itemR(md, "precision")
-		row.itemR(md, "dynamic")
+		if md.is_bound:
+			layout.itemO("object.meshdeform_bind", text="Unbind")
+		else:
+			layout.itemO("object.meshdeform_bind", text="Bind")
+			row = layout.row()
+			row.itemR(md, "precision")
+			row.itemR(md, "dynamic")
 		
 	def MIRROR(self, layout, ob, md):
 		layout.itemR(md, "merge_limit")
diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index 43f35862315..728c9310a47 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -234,6 +234,7 @@ static void borderselect_graphkeys (bAnimContext *ac, rcti rect, short mode, sho
 	/* loop over data, doing border select */
 	for (ale= anim_data.first; ale; ale= ale->next) {
 		AnimData *adt= ANIM_nla_mapping_get(ac, ale);
+		FCurve *fcu= (FCurve *)ale->key_data;
 		
 		/* set horizontal range (if applicable) */
 		if (mode != BEZT_OK_VALUERANGE) {
@@ -253,7 +254,13 @@ static void borderselect_graphkeys (bAnimContext *ac, rcti rect, short mode, sho
 		}
 		
 		/* select keyframes that are in the appropriate places */
-		ANIM_fcurve_keys_bezier_loop(&bed, ale->key_data, ok_cb, select_cb, NULL);
+		ANIM_fcurve_keys_bezier_loop(&bed, fcu, ok_cb, select_cb, NULL);
+		
+		/* select the curve too 
+		 * NOTE: this should really only happen if the curve got touched...
+		 */
+		if (selectmode == SELECT_ADD)
+			fcu->flag |= FCURVE_SELECTED;
 	}
 	
 	/* cleanup */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 28223d2f80b..32e34559f1f 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -384,6 +384,11 @@ static void rna_ArrayModifier_curve_set(PointerRNA *ptr, PointerRNA value)
 	modifier_object_set(&((ArrayModifierData*)ptr->data)->curve_ob, OB_CURVE, value);
 }
 
+static int rna_MeshDeformModifier_is_bound_get(PointerRNA *ptr)
+{
+	return (((MeshDeformModifierData*)ptr->data)->bindcos != NULL);
+}
+
 static PointerRNA rna_SoftBodyModifier_settings_get(PointerRNA *ptr)
 {
 	Object *ob= (Object*)ptr->id.data;
@@ -1368,7 +1373,12 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna)
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_MeshDeformModifier_object_set", NULL);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
-
+	
+	prop= RNA_def_property(srna, "is_bound", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_funcs(prop, "rna_MeshDeformModifier_is_bound_get", NULL);
+	RNA_def_property_ui_text(prop, "Bound", "Whether geometry has been bound to control cage.");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	
 	prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_INVERT_VGROUP);
 	RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence.");

From d5009eb1423c3c0359cbc85c7346412c597b8663 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 11 Sep 2009 12:05:09 +0000
Subject: [PATCH 522/577] 2.5 Rotations: As a experiment, enabling Axis-Angle
 for Bones

The support for this is really quite hacky, and I might disable this later if we cannot get some parts to work nicely.

Some notes:
* This is currently stored in the same variable that quaternions are stored in, since they both have 4 components. However, in RNA, I've added 2 properties specially for this.
* There are some shearing issues using certain axes - i.e. (1,1,0) - that will need to be checked on.
* Transform code is really quite temporary for this. Just a quick demo of what can be done...
---
 release/ui/buttons_data_bone.py               |  4 +
 source/blender/blenkernel/intern/armature.c   |  8 +-
 source/blender/editors/transform/transform.c  | 11 ++-
 .../editors/transform/transform_conversions.c |  4 +-
 source/blender/makesrna/intern/rna_pose.c     | 74 +++++++++++++++++--
 .../blender/windowmanager/intern/wm_files.c   |  2 +-
 6 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 0d379a4788f..5aac44bbc94 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -58,6 +58,10 @@ class BONE_PT_transform(BoneButtonsPanel):
 			col = row.column()
 			if pchan.rotation_mode == 'QUATERNION':
 				col.itemR(pchan, "rotation", text="Rotation")
+			elif pchan.rotation_mode == 'AXIS_ANGLE':
+				col.itemL(text="Rotation")
+				col.itemR(pchan, "rotation_angle", text="Angle")
+				col.itemR(pchan, "rotation_axis", text="Axis")
 			else:
 				col.itemR(pchan, "euler_rotation", text="Rotation")
 
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 95c4c2966c6..0c18817f8be 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1986,11 +1986,15 @@ void chan_calc_mat(bPoseChannel *chan)
 	/* get scaling matrix */
 	SizeToMat3(chan->size, smat);
 	
-	/* rotations may either be quats or eulers (no rotation modes for now...) */
+	/* rotations may either be quats, eulers (with various rotation orders), or axis-angle */
 	if (chan->rotmode > 0) {
-		/* euler rotations (will cause gimble lock... no rotation order to solve that yet) */
+		/* euler rotations (will cause gimble lock, but this can be alleviated a bit with rotation orders) */
 		EulOToMat3(chan->eul, chan->rotmode, rmat);
 	}
+	else if (chan->rotmode == PCHAN_ROT_AXISANGLE) {
+		/* axis-angle - stored in quaternion data, but not really that great for 3D-changing orientations */
+		VecRotToMat3(&chan->quat[1], chan->quat[0], rmat);
+	}
 	else {
 		/* quats are normalised before use to eliminate scaling issues */
 		NormalQuat(chan->quat);
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index f049566d640..ac5d688cd1c 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2663,7 +2663,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 
 		/* rotation */
 		if ((t->flag & T_V3D_ALIGN)==0) { // align mode doesn't rotate objects itself
-			/* euler or quaternion? */
+			/* euler or quaternion/axis-angle? */
 			if (td->flag & TD_USEQUAT) {
 				Mat3MulSerie(fmat, td->mtx, mat, td->smtx, 0, 0, 0, 0, 0);
 
@@ -2672,6 +2672,15 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				QuatMul(td->ext->quat, quat, td->ext->iquat);
 				/* this function works on end result */
 				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
+				
+				/* if axis-angle, we now convert the quat representation to axis-angle again
+				 * 	- this means that the math above is not totally correct, but it works well enough so far...
+				 */
+				if (td->rotOrder == PCHAN_ROT_AXISANGLE) {	
+					/* make temp copy (since stored in same place) */
+					QuatCopy(quat, td->ext->quat);
+					QuatToAxisAngle(quat, &td->ext->quat[1], &td->ext->quat[0]); 
+				}
 			}
 			else { 
 				float eulmat[3][3];
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 504563b797b..7a37ffdeeca 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -552,8 +552,9 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 
 	td->ob = ob;
 	td->flag = TD_SELECTED;
-	if (pchan->rotmode == PCHAN_ROT_QUAT)
+	if ((pchan->rotmode == PCHAN_ROT_QUAT) || (pchan->rotmode == PCHAN_ROT_AXISANGLE)) 
 	{
+		// XXX: for now, axis-angle will be treated like for quats (the only difference is the normalisation)
 		td->flag |= TD_USEQUAT;
 	}
 	if (bone->flag & BONE_HINGE_CHILD_TRANSFORM)
@@ -587,6 +588,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		td->ext->quat= pchan->quat;
 		
 		QUATCOPY(td->ext->iquat, pchan->quat);
+		td->rotOrder= pchan->rotmode;
 	}
 	
 
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 7d7f37a8f43..0a88b084307 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -110,26 +110,64 @@ IDProperty *rna_PoseChannel_idproperties(PointerRNA *ptr, int create)
 	return pchan->prop;
 }
 
+/* rotation - euler angles */
 static void rna_PoseChannel_euler_rotation_get(PointerRNA *ptr, float *value)
 {
 	bPoseChannel *pchan= ptr->data;
-
-	if(pchan->rotmode == PCHAN_ROT_QUAT)
+	
+	if(pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+		float m[3][3];
+		
+		/* go through a 3x3 matrix */
+		VecRotToMat3(&pchan->quat[1], pchan->quat[0], m);
+		Mat3ToEul(m, value);
+	}
+	else if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers when using axis-angle... */
 		QuatToEul(pchan->quat, value);
 	else
 		VECCOPY(value, pchan->eul);
 }
 
+/* rotation - euler angles */
 static void rna_PoseChannel_euler_rotation_set(PointerRNA *ptr, const float *value)
 {
 	bPoseChannel *pchan= ptr->data;
-
-	if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers when using quats... */
+	
+	if(pchan->rotmode == PCHAN_ROT_AXISANGLE) { /* default XYZ eulers when using axis-angle... */
+		float q[4];
+		
+		/* convert to temp quat, then to axis angle (since stored in same var) */
+		EulToQuat((float *)value, q);
+		QuatToAxisAngle(q, &pchan->quat[1], &pchan->quat[0]);
+	}
+	else if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers when using quats... */
 		EulToQuat((float*)value, pchan->quat);
 	else
 		VECCOPY(pchan->eul, value);
 }
 
+/* rotation - axis angle only */
+static void rna_PoseChannel_rotation_axis_get(PointerRNA *ptr, float *value)
+{
+	bPoseChannel *pchan= ptr->data;
+	
+	if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+		/* axis is stord in quat for now */
+		VecCopyf(value, &pchan->quat[1]);
+	}
+}
+
+/* rotation - axis angle only */
+static void rna_PoseChannel_rotation_axis_set(PointerRNA *ptr, const float *value)
+{
+	bPoseChannel *pchan= ptr->data;
+	
+	if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+		/* axis is stored in quat for now */
+		VecCopyf(&pchan->quat[1], (float *)value);
+	}
+}
+
 static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 {
 	bPoseChannel *pchan= ptr->data;
@@ -185,6 +223,12 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 			QuatCopy(q, pchan->quat);
 			QuatToAxisAngle(q, &pchan->quat[1], &pchan->quat[0]);
 		}
+		
+		/* when converting to axis-angle, we need a special exception for the case when there is no axis */
+		if (IS_EQ(pchan->quat[1], pchan->quat[2]) && IS_EQ(pchan->quat[2], pchan->quat[3])) {
+			/* for now, rotate around y-axis then (so that it simply becomes the roll) */
+			pchan->quat[2]= 1.0f;
+		}
 	}
 	
 	/* finally, set the new rotation type */
@@ -421,7 +465,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 		{PCHAN_ROT_YZX, "YZX", 0, "YZX Euler", "YZX Rotation Order. Prone to Gimbal Lock"},
 		{PCHAN_ROT_ZXY, "ZXY", 0, "ZXY Euler", "ZXY Rotation Order. Prone to Gimbal Lock"},
 		{PCHAN_ROT_ZYX, "ZYX", 0, "ZYX Euler", "ZYX Rotation Order. Prone to Gimbal Lock"},
-		//{PCHAN_ROT_AXISANGLE, "AXIS_ANGLE", 0, "Axis Angle", "Axis Angle (W+XYZ). Defines a rotation around some axis defined by 3D-Vector."},
+		{PCHAN_ROT_AXISANGLE, "AXIS_ANGLE", 0, "Axis Angle", "Axis Angle (W+XYZ). Defines a rotation around some axis defined by 3D-Vector."},
 		{0, NULL, 0, NULL, NULL}};
 	
 	StructRNA *srna;
@@ -493,6 +537,18 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Rotation", "Rotation in Quaternions.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
 	
+	prop= RNA_def_property(srna, "rotation_angle", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "quat[0]");
+	RNA_def_property_ui_text(prop, "Rotation Angle", "Angle of Rotation for Axis-Angle rotation representation.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
+	
+	prop= RNA_def_property(srna, "rotation_axis", PROP_FLOAT, PROP_XYZ);
+	RNA_def_property_float_sdna(prop, NULL, "quat");
+	RNA_def_property_float_funcs(prop, "rna_PoseChannel_rotation_axis_get", "rna_PoseChannel_rotation_axis_set", NULL);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Rotation Axis", "Axis for Axis-Angle rotation representation.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Pose_update");
+	
 	prop= RNA_def_property(srna, "euler_rotation", PROP_FLOAT, PROP_EULER);
 	RNA_def_property_float_sdna(prop, NULL, "eul");
 	RNA_def_property_float_funcs(prop, "rna_PoseChannel_euler_rotation_get", "rna_PoseChannel_euler_rotation_set", NULL);
@@ -662,8 +718,14 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTX);
 	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation in the interface.");
+	RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation (with three components) in the interface.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
+	
+	//prop= RNA_def_property(srna, "lock_rotation_4d", PROP_BOOLEAN, PROP_XYZ);
+	//RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTW);
+	//RNA_def_property_array(prop, 4);
+	//RNA_def_property_ui_text(prop, "Lock Rotation (4D)", "Lock editing of rotations (with four components) in the interface.");
+	//RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "lock_scale", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_SCALEX);
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index a6e38a61e0f..9694a8fa1c6 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -281,7 +281,7 @@ void WM_read_file(bContext *C, char *name, ReportList *reports)
 
 
 /* called on startup,  (context entirely filled with NULLs) */
-/* or called for 'Erase All' */
+/* or called for 'New File' */
 /* op can be NULL */
 int WM_read_homefile(bContext *C, wmOperator *op)
 {

From baf12d3d1712235f94bf7db27aed21421d74efea Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 11 Sep 2009 12:44:09 +0000
Subject: [PATCH 523/577] 2.5 - Rotation work (axis angle bugfixes + cleanups)

* Made transform work better with axis-angle
* Corrected the rotation-type handling code in a few places
---
 .../blender/editors/armature/editarmature.c   | 12 +++++++++
 source/blender/editors/armature/poselib.c     | 16 +++--------
 source/blender/editors/armature/poseobject.c  | 14 +++++++---
 .../editors/space_view3d/view3d_buttons.c     | 26 +++++++++++++++---
 source/blender/editors/transform/transform.c  | 27 +++++++++++++------
 .../editors/transform/transform_conversions.c |  3 +--
 6 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 4f5d8872384..3b6c9e9d13d 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -4856,9 +4856,13 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
 				QUATCOPY(quat1, pchan->quat);
 				QuatToEul(pchan->quat, oldeul);
 			}
+			else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+				continue; // XXX
+			}
 			else {
 				VECCOPY(oldeul, pchan->eul);
 			}
+			
 			eul[0]= eul[1]= eul[2]= 0.0f;
 			
 			if (pchan->protectflag & OB_LOCK_ROTX)
@@ -4875,6 +4879,9 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
 					QuatMulf(pchan->quat, -1.0f);
 				}
 			}
+			else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+				// TODO...
+			}
 			else {
 				VECCOPY(pchan->eul, eul);
 			}
@@ -4884,6 +4891,11 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
 				pchan->quat[1]=pchan->quat[2]=pchan->quat[3]= 0.0f; 
 				pchan->quat[0]= 1.0f;
 			}
+			else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+				/* by default, make rotation of 0 radians around y-axis (roll) */
+				pchan->quat[0]=pchan->quat[1]=pchan->quat[3]= 0.0f;
+				pchan->quat[2]= 1.0f;
+			}
 			else {
 				pchan->eul[0]= pchan->eul[1]= pchan->eul[2]= 0.0f;
 			}
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c
index 56d714fd058..46d08afa656 100644
--- a/source/blender/editors/armature/poselib.c
+++ b/source/blender/editors/armature/poselib.c
@@ -278,8 +278,7 @@ void poselib_validate_act (bAction *act)
 /* ************************************************************* */
 
 /* Pointers to the builtin KeyingSets that we want to use */
-static KeyingSet *poselib_ks_locrotscale = NULL;		/* quaternion rotations */
-static KeyingSet *poselib_ks_locrotscale2 = NULL;		/* euler rotations */		// XXX FIXME...
+static KeyingSet *poselib_ks_locrotscale = NULL;		/* the only keyingset we'll need*/
 static short poselib_ks_need_init= 1;					/* have the above been obtained yet? */
 
 /* Make sure the builtin KeyingSets are initialised properly 
@@ -290,13 +289,9 @@ static void poselib_get_builtin_keyingsets (void)
 	/* only if we haven't got these yet */
 	// FIXME: this assumes that we will always get the builtin sets... 
 	if (poselib_ks_need_init) {
-		/* LocRotScale (quaternions) */
+		/* LocRotScale (quaternions or eulers depending on context) */
 		poselib_ks_locrotscale= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
 		
-		/* LocRotScale (euler) */
-		//ks_locrotscale2= ANIM_builtin_keyingset_get_named(ks_locrotscale, "LocRotScale");
-		poselib_ks_locrotscale2= poselib_ks_locrotscale; // FIXME: for now, just use the same one...
-		
 		/* clear flag requesting init */
 		poselib_ks_need_init= 0;
 	}
@@ -410,11 +405,8 @@ static int poselib_add_exec (bContext *C, wmOperator *op)
 				/* init cks for this PoseChannel, then use the relative KeyingSets to keyframe it */
 				cks.pchan= pchan;
 				
-				/* KeyingSet to use depends on rotation mode  */
-				if (pchan->rotmode)
-					modify_keyframes(C, &dsources, act, poselib_ks_locrotscale2, MODIFYKEY_MODE_INSERT, (float)frame);
-				else
-					modify_keyframes(C, &dsources, act, poselib_ks_locrotscale, MODIFYKEY_MODE_INSERT, (float)frame);
+				/* KeyingSet to use depends on rotation mode (but that's handled by the templates code)  */
+				modify_keyframes(C, &dsources, act, poselib_ks_locrotscale, MODIFYKEY_MODE_INSERT, (float)frame);
 			}
 		}
 	}
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 0ae92de4407..9a404e24e12 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -812,10 +812,17 @@ void pose_copy_menu(Scene *scene)
 						
 						armature_mat_pose_to_bone(pchan, pchanact->pose_mat, delta_mat);
 						
-						if (pchan->rotmode > 0) 
-							Mat4ToEulO(delta_mat, pchan->eul, pchan->rotmode);
-						else
+						if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+							float tmp_quat[4];
+							
+							/* need to convert to quat first (in temp var)... */
+							Mat4ToQuat(delta_mat, tmp_quat);
+							QuatToAxisAngle(tmp_quat, &pchan->quat[1], &pchan->quat[0]);
+						}
+						else if (pchan->rotmode == PCHAN_ROT_QUAT)
 							Mat4ToQuat(delta_mat, pchan->quat);
+						else
+							Mat4ToEulO(delta_mat, pchan->eul, pchan->rotmode);
 					}
 						break;
 					case 11: /* Visual Size */
@@ -991,6 +998,7 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 				pchan->flag= chan->flag;
 				
 				/* check if rotation modes are compatible (i.e. do they need any conversions) */
+				// FIXME: add axis-angle here too...
 				if (pchan->rotmode == chan->rotmode) {
 					/* copy the type of rotation in use */
 					if (pchan->rotmode > 0) {
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 06320f871da..d78928921e5 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -511,8 +511,17 @@ static void v3d_posearmature_buts(uiBlock *block, View3D *v3d, Object *ob, float
 		but= uiDefBut(block, TEX, B_NOP, "Bone:",				160, 140, 140, 19, bone->name, 1, 31, 0, 0, "");
 	uiButSetFunc(but, validate_bonebutton_cb, bone, NULL);
 	uiButSetCompleteFunc(but, autocomplete_bone, (void *)ob);
-
-	QuatToEulO(pchan->quat, tfp->ob_eul, pchan->rotmode); // XXX?
+	
+	if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+		float quat[4];
+		/* convert to euler, passing through quats... */
+		AxisAngleToQuat(quat, &pchan->quat[1], pchan->quat[0]);
+		QuatToEul(quat, tfp->ob_eul);
+	}
+	else if (pchan->rotmode == PCHAN_ROT_QUAT)
+		QuatToEul(pchan->quat, tfp->ob_eul);
+	else
+		VecCopyf(tfp->ob_eul, pchan->eul);
 	tfp->ob_eul[0]*= 180.0/M_PI;
 	tfp->ob_eul[1]*= 180.0/M_PI;
 	tfp->ob_eul[2]*= 180.0/M_PI;
@@ -841,7 +850,18 @@ static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 			eul[0]= M_PI*tfp->ob_eul[0]/180.0;
 			eul[1]= M_PI*tfp->ob_eul[1]/180.0;
 			eul[2]= M_PI*tfp->ob_eul[2]/180.0;
-			EulOToQuat(eul, pchan->rotmode, pchan->quat); // xxx?
+			
+			if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+				float quat[4];
+				/* convert to axis-angle, passing through quats  */
+				EulToQuat(eul, quat);
+				QuatToAxisAngle(quat, &pchan->quat[1], &pchan->quat[0]);
+			}
+			else if (pchan->rotmode == PCHAN_ROT_QUAT)
+				EulToQuat(eul, pchan->quat);
+			else
+				VecCopyf(pchan->eul, eul);
+			
 		}
 		/* no break, pass on */
 	case B_ARMATUREPANEL2:
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index ac5d688cd1c..6405e87c4c0 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2673,14 +2673,25 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				/* this function works on end result */
 				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
 				
-				/* if axis-angle, we now convert the quat representation to axis-angle again
-				 * 	- this means that the math above is not totally correct, but it works well enough so far...
-				 */
-				if (td->rotOrder == PCHAN_ROT_AXISANGLE) {	
-					/* make temp copy (since stored in same place) */
-					QuatCopy(quat, td->ext->quat);
-					QuatToAxisAngle(quat, &td->ext->quat[1], &td->ext->quat[0]); 
-				}
+			}
+			else if (td->rotOrder == PCHAN_ROT_AXISANGLE) {
+				/* calculate effect based on quats */
+				float iquat[4];
+				
+				/* td->ext->(i)quat is in axis-angle form, not quats! */
+				AxisAngleToQuat(iquat, &td->ext->iquat[1], td->ext->iquat[0]);
+				
+				Mat3MulSerie(fmat, td->mtx, mat, td->smtx, 0, 0, 0, 0, 0);
+				Mat3ToQuat(fmat, quat);	// Actual transform
+				
+				QuatMul(td->ext->quat, quat, iquat);
+				
+				/* this function works on end result */
+				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
+				
+				/* make temp copy (since stored in same place) */
+				QuatCopy(quat, td->ext->quat);
+				QuatToAxisAngle(quat, &td->ext->quat[1], &td->ext->quat[0]); 
 			}
 			else { 
 				float eulmat[3][3];
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 7a37ffdeeca..e0d058f160f 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -552,9 +552,8 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 
 	td->ob = ob;
 	td->flag = TD_SELECTED;
-	if ((pchan->rotmode == PCHAN_ROT_QUAT) || (pchan->rotmode == PCHAN_ROT_AXISANGLE)) 
+	if (pchan->rotmode == PCHAN_ROT_QUAT) 
 	{
-		// XXX: for now, axis-angle will be treated like for quats (the only difference is the normalisation)
 		td->flag |= TD_USEQUAT;
 	}
 	if (bone->flag & BONE_HINGE_CHILD_TRANSFORM)

From 4908a84825cc4e0dc8f931ce4a13edf84b230232 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Fri, 11 Sep 2009 14:31:05 +0000
Subject: [PATCH 524/577] Added in runtime path for python since were using a
 dynamic lib. (for Makefiles on linux)

Kent
---
 source/nan_link.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/nan_link.mk b/source/nan_link.mk
index 7211ba21e48..52e5c5de9ed 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -97,7 +97,7 @@ ifeq ($(OS),linux)
     COMMENT = "MESA 3.1"
     LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread
-    LLIBS += -lpython$(NAN_PYTHON_VERSION)
+    LLIBS += -L$(NAN_PYTHON)/lib -Wl,-rpath -Wl,$(NAN_PYTHON)/lib -lpython$(NAN_PYTHON_VERSION)
     LOPTS = -export-dynamic
     DADD = -lGL -lGLU
     SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a

From 042d3e595693ce0c280b46d13db921afbcf105a4 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 11 Sep 2009 14:56:54 +0000
Subject: [PATCH 525/577] 2.5: fix for merge, forward_diff_bezier needed to be
 updated.

---
 source/blender/editors/interface/interface_widgets.c | 4 ++--
 source/blender/editors/space_graph/graph_draw.c      | 4 ++--
 source/blender/editors/space_node/drawnode.c         | 4 ++--
 source/blender/python/generic/Geometry.c             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index f0085f71373..2385b5ad15c 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1647,8 +1647,8 @@ static int ui_link_bezier_points(rcti *rect, float coord_array[][2], int resol)
 	vec[2][0]= vec[3][0]-dist;
 	vec[2][1]= vec[3][1];
 	
-	forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, 2);
-	forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, 2);
+	forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
+	forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
 	
 	return 1;
 }
diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index f3aa0fac42b..9ae7e8263ee 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -675,8 +675,8 @@ static void draw_fcurve_curve_bezts (FCurve *fcu, View2D *v2d, View2DGrid *grid)
 				
 				correct_bezpart(v1, v2, v3, v4);
 				
-				forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, 3);
-				forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, 3);
+				forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, sizeof(float)*3);
+				forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, sizeof(float)*3);
 				
 				for (fp= data; resol; resol--, fp+= 3)
 					glVertex2fv(fp);
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 98de32a105a..05adb5b75ca 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -2598,8 +2598,8 @@ int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, floa
 	else {
 		
 		/* always do all three, to prevent data hanging around */
-		forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, 2);
-		forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, 2);
+		forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
+		forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
 		
 		return 1;
 	}
diff --git a/source/blender/python/generic/Geometry.c b/source/blender/python/generic/Geometry.c
index 70295d1c2d9..f7b7ee866f0 100644
--- a/source/blender/python/generic/Geometry.c
+++ b/source/blender/python/generic/Geometry.c
@@ -523,7 +523,7 @@ static PyObject *M_Geometry_BezierInterp( PyObject * self, PyObject * args )
 	
 	coord_array = MEM_callocN(dims * (resolu) * sizeof(float), "BezierInterp");
 	for(i=0; i<dims; i++) {
-		forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i, resolu-1, dims);
+		forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i, resolu-1, sizeof(float)*dims);
 	}
 	
 	list= PyList_New(resolu);

From ee768ada680ce0a8aa184c882005c0ef1c0140fb Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 11 Sep 2009 15:35:30 +0000
Subject: [PATCH 526/577] curve twist * added new twist method - "Tangent",
 suggested by Martin.   the nice thing about this is its stable no matter how
 you rotate the data, rotation is local to each segment. * added smooth option
 that smooths the twisting (before applying user twist), to workaround Z-Up
 and Tangent's ugly curve twisting. Id prefer not to have this however it
 makes tangent much nicer. Possibly tangent can be improved some other way and
 this can be removed.   A smooth value of 1.0 will iterate over and smooth the
 twisting by the resolution value of the spline. * Minimum-Twist method now
 corrects for cyclic twist by taking the roll difference between first and
 last, then increasingly counter rotate each segment over the entire curve.
 Previously it calculated from both directions and blended them.

details
* BevPoints use quats rather then 3x3 matrix.
* added BevPoint direction "dir" and tangent "tan" used only for 3D curves.
* don't calculate BevPoint->cosa, BevPoint->sina for 3D curves.
* split bevel tilt calculation into functions.
* nurbs curves currently don't generate tangents and wont work with tangent twist method.
* some of the use of quats should be optimized.
* smoothing is not animation safe, the higher the smoothing the higher the likelyhood of flipping.
---
 release/ui/buttons_data_curve.py              |   8 +-
 source/blender/blenkernel/BKE_utildefines.h   |   1 +
 source/blender/blenkernel/intern/curve.c      | 607 +++++++++++++-----
 source/blender/blenkernel/intern/displist.c   |   2 +-
 .../blender/editors/space_view3d/drawobject.c |  22 +-
 source/blender/makesdna/DNA_curve_types.h     |  16 +-
 source/blender/makesrna/intern/rna_curve.c    |  24 +-
 7 files changed, 480 insertions(+), 200 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 1124dfd1ae8..010acd1479d 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -56,8 +56,7 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 
 		if not is_surf:
 			row = layout.row()
-			row.itemR(curve, "curve_2d")			
-			row.itemR(curve, "use_twist_correction")
+			row.itemR(curve, "curve_2d")
 		
 		split = layout.split()
 		
@@ -86,6 +85,11 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 			sub.itemR(curve, "resolution_v", text="Preview V")
 			sub.itemR(curve, "render_resolution_v", text="Render V")
 		
+		# XXX - put somewhere nicer.
+		row= layout.row()
+		row.itemR(curve, "twist_mode")
+		row.itemR(curve, "twist_smooth") # XXX - may not be kept
+
 
 #		col.itemL(text="Display:")
 #		col.itemL(text="HANDLES")
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index 76e0da98f69..4d43518901e 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -107,6 +107,7 @@
 #define VECSUB(v1,v2,v3) 	{*(v1)= *(v2) - *(v3); *(v1+1)= *(v2+1) - *(v3+1); *(v1+2)= *(v2+2) - *(v3+2);}
 #define VECSUB2D(v1,v2,v3) 	{*(v1)= *(v2) - *(v3); *(v1+1)= *(v2+1) - *(v3+1);}
 #define VECADDFAC(v1,v2,v3,fac) {*(v1)= *(v2) + *(v3)*(fac); *(v1+1)= *(v2+1) + *(v3+1)*(fac); *(v1+2)= *(v2+2) + *(v3+2)*(fac);}
+#define VECSUBFAC(v1,v2,v3,fac) {*(v1)= *(v2) - *(v3)*(fac); *(v1+1)= *(v2+1) - *(v3+1)*(fac); *(v1+2)= *(v2+2) - *(v3+2)*(fac);}
 #define QUATADDFAC(v1,v2,v3,fac) {*(v1)= *(v2) + *(v3)*(fac); *(v1+1)= *(v2+1) + *(v3+1)*(fac); *(v1+2)= *(v2+2) + *(v3+2)*(fac); *(v1+3)= *(v2+3) + *(v3+3)*(fac);}
 
 #define INPR(v1, v2)		( (v1)[0]*(v2)[0] + (v1)[1]*(v2)[1] + (v1)[2]*(v2)[2] )
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 802809b11e5..2b8c91fcbed 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -975,7 +975,26 @@ void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int i
  		q1+= q2;
  		q2+= q3;
  	}
-}	
+}
+
+void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float *p3, float *p, int it, int stride)
+{
+	/* note that these are not purpendicular to the curve
+	 * they need to be rotated for this,
+	 *
+	 * This could also be optimized like forward_diff_bezier */
+	int a;
+  	for(a=0; a<=it; a++) {
+		float t = (float)a / (float)it;
+
+		int i;
+		for(i=0; i<3; i++) {
+			p[i]= (-6*t + 6)*p0[i] + (18*t - 12)*p1[i] + (-18*t + 6)*p2[i] + (6*t)*p3[i];
+		}
+		Normalize(p);
+		p = (float *)(((char *)p)+stride);
+ 	}
+}
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
@@ -1545,6 +1564,348 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
 	}
 }
 
+/* make_bevel_list_3D_* funcs, at a minimum these must
+ * fill in the bezp->quat and bezp->dir values */
+
+/* correct non-cyclic cases by copying direction and rotation
+ * values onto the first & last end-points */
+static void bevel_list_cyclic_fix(BevList *bl)
+{
+	BevPoint *bevp, *bevp1;
+
+	bevp= (BevPoint *)(bl+1);
+	bevp1= bevp+1;
+	QUATCOPY(bevp->quat, bevp1->quat);
+	VECCOPY(bevp->dir, bevp1->dir);
+	VECCOPY(bevp->tan, bevp1->tan);
+	bevp= (BevPoint *)(bl+1);
+	bevp+= (bl->nr-1);
+	bevp1= bevp-1;
+	QUATCOPY(bevp->quat, bevp1->quat);
+	VECCOPY(bevp->dir, bevp1->dir);
+	VECCOPY(bevp->tan, bevp1->tan);
+}
+/* utility for make_bevel_list_3D_* funcs */
+static void bevel_list_calc_bisect(BevList *bl)
+{
+	BevPoint *bevp2, *bevp1, *bevp0;
+	int nr;
+
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	nr= bl->nr;
+	while(nr--) {
+		/* totally simple */
+		VecBisect3(bevp1->dir, bevp0->vec, bevp1->vec, bevp2->vec);
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+}
+static void bevel_list_flip_tangents(BevList *bl)
+{
+	BevPoint *bevp2, *bevp1, *bevp0;
+	int nr;
+
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	nr= bl->nr;
+	while(nr--) {
+		if(VecAngle2(bevp0->tan, bevp1->tan) > 90)
+			VecNegf(bevp1->tan);
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+}
+/* apply user tilt */
+static void bevel_list_apply_tilt(BevList *bl)
+{
+	BevPoint *bevp2, *bevp1, *bevp0;
+	int nr;
+	float q[4];
+
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	nr= bl->nr;
+	while(nr--) {
+		AxisAngleToQuat(q, bevp1->dir, bevp1->alfa);
+		QuatMul(bevp1->quat, q, bevp1->quat);
+		NormalQuat(bevp1->quat);
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+}
+/* smooth quats, this function should be optimized, it can get slow with many iterations. */
+static void bevel_list_smooth(BevList *bl, int smooth_iter)
+{
+	BevPoint *bevp2, *bevp1, *bevp0;
+	int nr;
+
+	float q[4];
+	float bevp0_quat[4];
+	int a;
+
+	for(a=0; a < smooth_iter; a++) {
+
+		bevp2= (BevPoint *)(bl+1);
+		bevp1= bevp2+(bl->nr-1);
+		bevp0= bevp1-1;
+
+		nr= bl->nr;
+
+		if(bl->poly== -1) { /* check its not cyclic */
+			/* skip the first point */
+			bevp0= bevp1;
+			bevp1= bevp2;
+			bevp2++;
+			nr--;
+
+			bevp0= bevp1;
+			bevp1= bevp2;
+			bevp2++;
+			nr--;
+
+		}
+
+		QUATCOPY(bevp0_quat, bevp0->quat);
+
+		while(nr--) {
+			/* interpolate quats */
+			float zaxis[3] = {0,0,1}, cross[3], q2[4];
+			QuatInterpol(q, bevp0_quat, bevp2->quat, 0.5);
+			NormalQuat(q);
+
+			QuatMulVecf(q, zaxis);
+			Crossf(cross, zaxis, bevp1->dir);
+			AxisAngleToQuat(q2, cross, NormalizedVecAngle2(zaxis, bevp1->dir));
+			NormalQuat(q2);
+
+			QUATCOPY(bevp0_quat, bevp1->quat);
+			QuatMul(q, q2, q);
+			QuatInterpol(bevp1->quat, bevp1->quat, q, 0.5);
+			NormalQuat(bevp1->quat);
+
+
+			bevp0= bevp1;
+			bevp1= bevp2;
+			bevp2++;
+		}
+	}
+}
+
+static void make_bevel_list_3D_zup(BevList *bl)
+{
+	BevPoint *bevp2, *bevp1, *bevp0; /* standard for all make_bevel_list_3D_* funcs */
+	int nr;
+
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	nr= bl->nr;
+	while(nr--) {
+		/* totally simple */
+		VecBisect3(bevp1->dir, bevp0->vec, bevp1->vec, bevp2->vec);
+		vectoquat(bevp1->dir, 5, 1, bevp1->quat);
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+}
+
+static void make_bevel_list_3D_minimum_twist(BevList *bl)
+{
+	BevPoint *bevp2, *bevp1, *bevp0; /* standard for all make_bevel_list_3D_* funcs */
+	int nr;
+	float q[4];
+
+	float cross_tmp[3];
+
+	bevel_list_calc_bisect(bl);
+
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	nr= bl->nr;
+	while(nr--) {
+
+		if(nr+4 > bl->nr) { /* first time and second time, otherwise first point adjusts last */
+			vectoquat(bevp1->dir, 5, 1, bevp1->quat);
+		}
+		else {
+			float angle= NormalizedVecAngle2(bevp0->dir, bevp1->dir);
+
+			if(angle > 0.0f) { /* otherwise we can keep as is */
+				Crossf(cross_tmp, bevp0->dir, bevp1->dir);
+				AxisAngleToQuat(q, cross_tmp, angle);
+				QuatMul(bevp1->quat, q, bevp0->quat);
+			}
+			else {
+				QUATCOPY(bevp1->quat, bevp0->quat);
+			}
+		}
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+
+	if(bl->poly != -1) { /* check for cyclic */
+
+		/* Need to correct for the start/end points not matching
+		 * do this by calculating the tilt angle difference, then apply
+		 * the rotation gradually over the entire curve
+		 *
+		 * note that the split is between last and second last, rather then first/last as youd expect.
+		 *
+		 * real order is like this
+		 * 0,1,2,3,4 --> 1,2,3,4,0
+		 *
+		 * this is why we compare last with second last
+		 * */
+		float vec_1[3]= {0,1,0}, vec_2[3]= {0,1,0}, angle, ang_fac, cross_tmp[3];
+
+		BevPoint *bevp_first;
+		BevPoint *bevp_last;
+
+
+		bevp_first= (BevPoint *)(bl+1);
+		bevp_first+= bl->nr-1;
+		bevp_last = bevp_first;
+		bevp_last--;
+
+		/* quats and vec's are normalized, should not need to re-normalize */
+		QuatMulVecf(bevp_first->quat, vec_1);
+		QuatMulVecf(bevp_last->quat, vec_2);
+		Normalize(vec_1);
+		Normalize(vec_2);
+
+		/* align the vector, can avoid this and it looks 98% OK but
+		 * better to align the angle quat roll's before comparing */
+		{
+			Crossf(cross_tmp, bevp_last->dir, bevp_first->dir);
+			angle = NormalizedVecAngle2(bevp_first->dir, bevp_last->dir);
+			AxisAngleToQuat(q, cross_tmp, angle);
+			QuatMulVecf(q, vec_2);
+		}
+
+		angle= NormalizedVecAngle2(vec_1, vec_2);
+
+		/* flip rotation if needs be */
+		Crossf(cross_tmp, vec_1, vec_2);
+		Normalize(cross_tmp);
+		if(NormalizedVecAngle2(bevp_first->dir, cross_tmp) < 90/(180.0/M_PI))
+			angle = -angle;
+
+		bevp2= (BevPoint *)(bl+1);
+		bevp1= bevp2+(bl->nr-1);
+		bevp0= bevp1-1;
+
+		nr= bl->nr;
+		while(nr--) {
+			ang_fac= angle * (1.0f-((float)nr/bl->nr)); /* also works */
+
+			AxisAngleToQuat(q, bevp1->dir, ang_fac);
+			QuatMul(bevp1->quat, q, bevp1->quat);
+
+			bevp0= bevp1;
+			bevp1= bevp2;
+			bevp2++;
+		}
+	}
+}
+
+static void make_bevel_list_3D_tangent(BevList *bl)
+{
+	BevPoint *bevp2, *bevp1, *bevp0; /* standard for all make_bevel_list_3D_* funcs */
+	int nr;
+
+	float bevp0_tan[3], cross_tmp[3];
+
+	bevel_list_calc_bisect(bl);
+	if(bl->poly== -1) /* check its not cyclic */
+		bevel_list_cyclic_fix(bl); // XXX - run this now so tangents will be right before doing the flipping
+	bevel_list_flip_tangents(bl);
+
+	/* correct the tangents */
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	nr= bl->nr;
+	while(nr--) {
+
+		Crossf(cross_tmp, bevp1->tan, bevp1->dir);
+		Crossf(bevp1->tan, cross_tmp, bevp1->dir);
+		Normalize(bevp1->tan);
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+
+
+	/* now for the real twist calc */
+	bevp2= (BevPoint *)(bl+1);
+	bevp1= bevp2+(bl->nr-1);
+	bevp0= bevp1-1;
+
+	VECCOPY(bevp0_tan, bevp0->tan);
+
+	nr= bl->nr;
+	while(nr--) {
+
+		/* make perpendicular, modify tan in place, is ok */
+		float cross_tmp[3];
+		float zero[3] = {0,0,0};
+
+		Crossf(cross_tmp, bevp1->tan, bevp1->dir);
+		Normalize(cross_tmp);
+		triatoquat(zero, cross_tmp, bevp1->tan, bevp1->quat); /* XXX - could be faster */
+
+		bevp0= bevp1;
+		bevp1= bevp2;
+		bevp2++;
+	}
+}
+
+void make_bevel_list_3D(BevList *bl, int smooth_iter, int twist_mode)
+{
+	switch(twist_mode) {
+	case CU_TWIST_TANGENT:
+		make_bevel_list_3D_tangent(bl);
+		break;
+	case CU_TWIST_MINIMUM:
+		make_bevel_list_3D_minimum_twist(bl);
+		break;
+	default: /* CU_TWIST_Z_UP default, pre 2.49c */
+		make_bevel_list_3D_zup(bl);
+	}
+
+	if(bl->poly== -1) /* check its not cyclic */
+		bevel_list_cyclic_fix(bl);
+
+	if(smooth_iter)
+		bevel_list_smooth(bl, smooth_iter);
+
+	bevel_list_apply_tilt(bl);
+}
+
+
+
 void makeBevelList(Object *ob)
 {
 	/*
@@ -1559,7 +1920,7 @@ void makeBevelList(Object *ob)
 	BPoint *bp;
 	BevList *bl, *blnew, *blnext;
 	BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0;
-	float min, inp, x1, x2, y1, y2, vec[3], vec_prev[3], q[4], quat[4], quat_prev[4], cross[3];
+	float min, inp, x1, x2, y1, y2;
 	struct bevelsort *sortdata, *sd, *sd1;
 	int a, b, nr, poly, resolu, len=0;
 	int do_tilt, do_radius;
@@ -1664,7 +2025,15 @@ void makeBevelList(Object *ob)
 										 do_tilt	? &bevp->alfa : NULL,
 										 do_radius	? &bevp->radius : NULL,
 										 resolu, sizeof(BevPoint));
+
 						
+						if(cu->twist_mode==CU_TWIST_TANGENT) {
+							forward_diff_bezier_cotangent(
+													prevbezt->vec[1],	prevbezt->vec[2],
+													bezt->vec[0],		bezt->vec[1],
+													bevp->tan, resolu, sizeof(BevPoint));
+						}
+
 						/* indicate with handlecodes double points */
 						if(prevbezt->h1==prevbezt->h2) {
 							if(prevbezt->h1==0 || prevbezt->h1==HD_VECT) bevp->split_tag= TRUE;
@@ -1843,208 +2212,90 @@ void makeBevelList(Object *ob)
 		MEM_freeN(sortdata);
 	}
 
-	/* STEP 4: COSINES */
-	bl= cu->bev.first;
-	while(bl) {
-	
-		if(bl->nr < 2) {
-			/* do nothing */
-		}
-		else if(bl->nr==2) {	/* 2 pnt, treat separate */
-			bevp2= (BevPoint *)(bl+1);
-			bevp1= bevp2+1;
+	/* STEP 4: 2D-COSINES or 3D ORIENTATION */
+	if((cu->flag & CU_3D)==0) { /* 3D */
+		bl= cu->bev.first;
+		while(bl) {
 
-			x1= bevp1->vec[0]- bevp2->vec[0];
-			y1= bevp1->vec[1]- bevp2->vec[1];
-
-			calc_bevel_sin_cos(x1, y1, -x1, -y1, &(bevp1->sina), &(bevp1->cosa));
-			bevp2->sina= bevp1->sina;
-			bevp2->cosa= bevp1->cosa;
-
-			if(cu->flag & CU_3D) {	/* 3D */
-				float quat[4], q[4];
-			
-				VecSubf(vec, bevp1->vec, bevp2->vec);
-				
-				vectoquat(vec, 5, 1, quat);
-				
-				AxisAngleToQuat(q, vec, bevp1->alfa);
-				QuatMul(quat, q, quat);
-				
-				QuatToMat3(quat, bevp1->mat);
-				Mat3CpyMat3(bevp2->mat, bevp1->mat);
+			if(bl->nr < 2) {
+				/* do nothing */
 			}
+			else if(bl->nr==2) {	/* 2 pnt, treat separate */
+				bevp2= (BevPoint *)(bl+1);
+				bevp1= bevp2+1;
 
-		}	/* this has to be >2 points */
-		else if(cu->flag & CU_NO_TWIST && cu->flag & CU_3D && bl->poly != -1) {
-
-			/* Special case, cyclic curve with no twist. tricky... */
-
-			float quat[4], q[4], cross[3];
-
-			/* correcting a cyclic curve is more complicated, need to be corrected from both ends */
-			float *quat_tmp1, *quat_tmp2; /* store a quat in the matrix temporarily */
-			int iter_dir;
-			BevPoint *bevp_start= (BevPoint *)(bl+1);
-
-			/* loop over the points twice, once up, once back, accumulate the quat rotations
-			 * in both directions, then blend them in the 3rd loop and apply the tilt */
-			for(iter_dir = 0; iter_dir < 2; iter_dir++) {
+				x1= bevp1->vec[0]- bevp2->vec[0];
+				y1= bevp1->vec[1]- bevp2->vec[1];
 
+				calc_bevel_sin_cos(x1, y1, -x1, -y1, &(bevp1->sina), &(bevp1->cosa));
+				bevp2->sina= bevp1->sina;
+				bevp2->cosa= bevp1->cosa;
+			}
+			else {
 				bevp2= (BevPoint *)(bl+1);
 				bevp1= bevp2+(bl->nr-1);
 				bevp0= bevp1-1;
 
 				nr= bl->nr;
 				while(nr--) {
-	
-					/* Normalizes */
-					VecBisect3(vec, bevp0->vec, bevp1->vec, bevp2->vec);
+					x1= bevp1->vec[0]- bevp0->vec[0];
+					x2= bevp1->vec[0]- bevp2->vec[0];
+					y1= bevp1->vec[1]- bevp0->vec[1];
+					y2= bevp1->vec[1]- bevp2->vec[1];
 
-					if(bl->nr==nr+1) { /* first time */
-						vectoquat(vec, 5, 1, quat);
-					}
-					else {
-						float angle = NormalizedVecAngle2(vec_prev, vec);
-					
-						if(angle > 0.0f) { /* otherwise we can keep as is */
-							Crossf(cross, vec_prev, vec);
-							AxisAngleToQuat(q, cross, angle);
-							QuatMul(quat, q, quat_prev);
-						}
-						else {
-							QUATCOPY(quat, quat_prev);
-						}
-					}
-					QUATCOPY(quat_prev, quat); /* quat_prev can't have the tilt applied */
-					VECCOPY(vec_prev, vec);
+					calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
 
-					if(iter_dir==0) { /* up, first time */
-						quat_tmp1= (float *)bevp1->mat;
-
-						bevp0= bevp1;
-						bevp1= bevp2;
-						bevp2++;
-					}
-					else { /* down second time */
-						quat_tmp1= ((float *)bevp1->mat)+4;
-
-						bevp2= bevp1;
-						bevp1= bevp0;
-						bevp0--;
-
-						/* wrap around */
-						if (bevp0 < bevp_start)
-							bevp0= bevp_start+(bl->nr-1);
-					}
-
-					QUATCOPY(quat_tmp1, quat);
-				}
-			}
-
-			/* Now interpolate the 2 quats and apply tilt */
-
-			bevp2= (BevPoint *)(bl+1);
-			bevp1= bevp2+(bl->nr-1);
-			bevp0= bevp1-1;
-
-			nr= bl->nr;
-			while(nr--) {
-
-				VecBisect3(vec, bevp0->vec, bevp1->vec, bevp2->vec);
-
-				quat_tmp1= (float *)bevp1->mat;
-				quat_tmp2= quat_tmp1+4;
-
-				/* blend the 2 rotations gathered from both directions */
-				QuatInterpol(quat, quat_tmp1, quat_tmp2, 1.0 - (((float)nr)/bl->nr));
-
-				AxisAngleToQuat(q, vec, bevp1->alfa);
-				QuatMul(quat, q, quat);
-				QuatToMat3(quat, bevp1->mat);
-				
-				/* generic */
-				x1= bevp1->vec[0]- bevp0->vec[0];
-				x2= bevp1->vec[0]- bevp2->vec[0];
-				y1= bevp1->vec[1]- bevp0->vec[1];
-				y2= bevp1->vec[1]- bevp2->vec[1];
-			
-				calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
-				
-				bevp0= bevp1;
-				bevp1= bevp2;
-				bevp2++;
-			}
-		}
-		else {
-			/* Any curve with 3 or more points */
-
-			bevp2= (BevPoint *)(bl+1);
-			bevp1= bevp2+(bl->nr-1);
-			bevp0= bevp1-1;
-
-			nr= bl->nr;
-			while(nr--) {
-
-				if(cu->flag & CU_3D) {	/* 3D */
-
-					/* Normalizes */
-					VecBisect3(vec, bevp0->vec, bevp1->vec, bevp2->vec);
-
-					if(bl->nr==nr+1 || !(cu->flag & CU_NO_TWIST)) { /* first time */
-						vectoquat(vec, 5, 1, quat);
-					}
-					else {
-						float angle = NormalizedVecAngle2(vec_prev, vec);
-
-						if(angle > 0.0f) { /* otherwise we can keep as is */
-							Crossf(cross, vec_prev, vec);
-							AxisAngleToQuat(q, cross, angle);
-							QuatMul(quat, q, quat_prev);
-						}
-						else {
-							QUATCOPY(quat, quat_prev);
-						}
-					}
-					QUATCOPY(quat_prev, quat); /* quat_prev can't have the tilt applied */
-					VECCOPY(vec_prev, vec);
-					
-					AxisAngleToQuat(q, vec, bevp1->alfa);
-					QuatMul(quat, q, quat);
-					QuatToMat3(quat, bevp1->mat);
+					bevp0= bevp1;
+					bevp1= bevp2;
+					bevp2++;
 				}
 
-				x1= bevp1->vec[0]- bevp0->vec[0];
-				x2= bevp1->vec[0]- bevp2->vec[0];
-				y1= bevp1->vec[1]- bevp0->vec[1];
-				y2= bevp1->vec[1]- bevp2->vec[1];
-
-				calc_bevel_sin_cos(x1, y1, x2, y2, &(bevp1->sina), &(bevp1->cosa));
-
-
-				bevp0= bevp1;
-				bevp1= bevp2;
-				bevp2++;
-			}
-
-			/* correct non-cyclic cases */
-			if(bl->poly== -1) {
-				if(bl->nr>2) {
+				/* correct non-cyclic cases */
+				if(bl->poly== -1) {
 					bevp= (BevPoint *)(bl+1);
 					bevp1= bevp+1;
 					bevp->sina= bevp1->sina;
 					bevp->cosa= bevp1->cosa;
-					Mat3CpyMat3(bevp->mat, bevp1->mat);
 					bevp= (BevPoint *)(bl+1);
 					bevp+= (bl->nr-1);
 					bevp1= bevp-1;
 					bevp->sina= bevp1->sina;
 					bevp->cosa= bevp1->cosa;
-					Mat3CpyMat3(bevp->mat, bevp1->mat);
 				}
 			}
+			bl= bl->next;
+		}
+	}
+	else { /* 3D Curves */
+		bl= cu->bev.first;
+		while(bl) {
+
+			if(bl->nr < 2) {
+				/* do nothing */
+			}
+			else if(bl->nr==2) {	/* 2 pnt, treat separate */
+				float q[4];
+
+				bevp2= (BevPoint *)(bl+1);
+				bevp1= bevp2+1;
+
+				/* simple quat/dir */
+				VecSubf(bevp1->dir, bevp1->vec, bevp2->vec);
+				Normalize(bevp1->dir);
+				
+				vectoquat(bevp1->dir, 5, 1, bevp1->quat);
+				
+				AxisAngleToQuat(q, bevp1->dir, bevp1->alfa);
+				QuatMul(bevp1->quat, q, bevp1->quat);
+				NormalQuat(bevp1->quat);
+				VECCOPY(bevp2->dir, bevp1->dir);
+				QUATCOPY(bevp2->quat, bevp1->quat);
+			}
+			else {
+				make_bevel_list_3D(bl, (int)(resolu*cu->twist_smooth), cu->twist_mode);
+			}
+			bl= bl->next;
 		}
-		bl= bl->next;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 99baa17b582..d87dbc833c5 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1599,7 +1599,7 @@ void makeDispListCurveTypes(Scene *scene, Object *ob, int forOrco)
 										vec[1]= fp1[2];
 										vec[2]= 0.0;
 										
-										Mat3MulVecfl(bevp->mat, vec);
+										QuatMulVecf(bevp->quat, vec);
 										
 										data[0]= bevp->vec[0] + fac*vec[0];
 										data[1]= bevp->vec[1] + fac*vec[1];
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 53fd6972641..69bc8e1f67e 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -4129,21 +4129,21 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 			
 			while (nr-->0) { /* accounts for empty bevel lists */
 				float fac= bevp->radius * ts->normalsize;
-				float ox,oy,oz; // Offset perpendicular to the curve
-				float dx,dy,dz; // Delta along the curve
+				float vec_a[3] = { fac,0, 0}; // Offset perpendicular to the curve
+				float vec_b[3] = {-fac,0, 0}; // Delta along the curve
+
+				QuatMulVecf(bevp->quat, vec_a);
+				QuatMulVecf(bevp->quat, vec_b);
+				VecAddf(vec_a, vec_a, bevp->vec);
+				VecAddf(vec_b, vec_b, bevp->vec);
 				
-				ox = fac*bevp->mat[0][0];
-				oy = fac*bevp->mat[0][1];
-				oz = fac*bevp->mat[0][2];
-			
-				dx = fac*bevp->mat[2][0];
-				dy = fac*bevp->mat[2][1];
-				dz = fac*bevp->mat[2][2];
+				VECSUBFAC(vec_a, vec_a, bevp->dir, fac);
+				VECSUBFAC(vec_b, vec_b, bevp->dir, fac);
 
 				glBegin(GL_LINE_STRIP);
-				glVertex3f(bevp->vec[0] - ox - dx, bevp->vec[1] - oy - dy, bevp->vec[2] - oz - dz);
+				glVertex3fv(vec_a);
 				glVertex3fv(bevp->vec);
-				glVertex3f(bevp->vec[0] + ox - dx, bevp->vec[1] + oy - dy, bevp->vec[2] + oz - dz);
+				glVertex3fv(vec_b);
 				glEnd();
 				
 				bevp += skip+1;
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 3a7cf874dbd..013491187ae 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -71,7 +71,9 @@ typedef struct BevList {
 #
 #
 typedef struct BevPoint {
-	float vec[3], mat[3][3], alfa, radius, sina, cosa;
+	float vec[3], alfa, radius;
+	float sina, cosa;				/* 2D Only */
+	float dir[3], tan[3], quat[4];	/* 3D Only */
 	short split_tag, dupe_tag;
 } BevPoint;
 
@@ -165,7 +167,8 @@ typedef struct Curve {
 
 	int texflag; /* keep an int because of give_obdata_texspace() */
 
-	short drawflag, pad[3];
+	short drawflag, twist_mode,  pad[2];
+	float twist_smooth, pad2;
 
 	short pathlen, totcol;
 	short flag, bevresol;
@@ -174,7 +177,7 @@ typedef struct Curve {
 	/* default */
 	short resolu, resolv;
 	short resolu_ren, resolv_ren;
-	
+
 	/* edit, index in nurb list */
 	int actnu;
 	/* edit, last selected bpoint */
@@ -231,7 +234,12 @@ typedef struct Curve {
 #define CU_RETOPO               1024
 #define CU_DS_EXPAND	2048
 
-#define CU_NO_TWIST		4096
+/* twist mode */
+#define CU_TWIST_Z_UP			0
+// #define CU_TWIST_Y_UP			1 // not used yet
+// #define CU_TWIST_X_UP			2
+#define CU_TWIST_MINIMUM		3
+#define CU_TWIST_TANGENT		4
 
 /* spacemode */
 #define CU_LEFT			0
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 91628bab376..d09546231d5 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -664,6 +664,12 @@ static void rna_def_curve(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 	
+	static EnumPropertyItem curve_twist_mode_items[] = {
+			{CU_TWIST_Z_UP, "Z_UP", 0, "Z-Up", "Use Z-Up axis to calculate the curve twist at each point"},
+			{CU_TWIST_MINIMUM, "MINIMUM", 0, "Minimum", "Use the least twist over the entire curve"},
+			{CU_TWIST_TANGENT, "TANGENT", 0, "Tangent", "Use the tangent to calculate twist"},
+			{0, NULL, 0, NULL, NULL}};
+
 	srna= RNA_def_struct(brna, "Curve", "ID");
 	RNA_def_struct_ui_text(srna, "Curve", "Curve datablock storing curves, splines and NURBS.");
 	RNA_def_struct_ui_icon(srna, ICON_CURVE_DATA);
@@ -782,12 +788,22 @@ static void rna_def_curve(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_BACK);
 	RNA_def_property_ui_text(prop, "Back", "Draw filled back for extruded/beveled curves.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
-	
-	prop= RNA_def_property(srna, "use_twist_correction", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_NO_TWIST);
-	RNA_def_property_ui_text(prop, "Minimal Twist", "Correct for twisting.");
+
+	prop= RNA_def_property(srna, "twist_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "twist_mode");
+	RNA_def_property_enum_items(prop, curve_twist_mode_items);
+	RNA_def_property_ui_text(prop, "Twist Method", "The type of tilt calculation for 3D Curves.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
+	// XXX - would be nice to have a better way to do this, only add for testing.
+	prop= RNA_def_property(srna, "twist_smooth", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "twist_smooth");
+	RNA_def_property_ui_range(prop, 0, 100.0, 0.1, 0);
+	RNA_def_property_ui_text(prop, "Twist Smooth", "Smoothing iteration for tangents");
+	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+
+
+
 	prop= RNA_def_property(srna, "retopo", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_RETOPO);
 	RNA_def_property_ui_text(prop, "Retopo", "Turn on the re-topology tool.");

From 6c3c748daa9b53cd6f36809b856dcccb24e8afaf Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 11 Sep 2009 18:31:51 +0000
Subject: [PATCH 527/577] client code wasn't modified to follow changes in the
 model

---
 release/io/netrender/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/io/netrender/client.py b/release/io/netrender/client.py
index bcfff8f5db5..d059387cfcf 100644
--- a/release/io/netrender/client.py
+++ b/release/io/netrender/client.py
@@ -110,7 +110,7 @@ def clientSendJob(conn, scene, anim = False, chunks = 5):
 	
 	# if not ACCEPTED (but not processed), send files
 	if response.status == http.client.ACCEPTED:
-		for filepath in job.files:
+		for filepath, start, end in job.files:
 			f = open(filepath, "rb")
 			conn.request("PUT", "file", f, headers={"job-id": job_id, "job-file": filepath})
 			f.close()

From 16547da5a98651c99f7bda088144292d4eba3904 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 11 Sep 2009 20:06:09 +0000
Subject: [PATCH 528/577] 2.5, Fix for bug #19296: render window escape
 incorrectly opens file browser.

---
 source/blender/editors/screen/area.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 9a116bf95c0..2cdb75e28e3 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1034,7 +1034,12 @@ void ED_area_prevspace(bContext *C)
 		}
 #endif
 
-		ED_area_newspace(C, sa, sl->next->spacetype);
+		/* workaround for case of double prevspace, render window
+		   with a file browser on top of it */
+		if(sl->next->spacetype == SPACE_FILE && sl->next->next)
+			ED_area_newspace(C, sa, sl->next->next->spacetype);
+		else
+			ED_area_newspace(C, sa, sl->next->spacetype);
 	}
 	else {
 		ED_area_newspace(C, sa, SPACE_INFO);

From f0eb02a36b5a04d18a1a587b1e36419daa6a6f23 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Fri, 11 Sep 2009 21:02:31 +0000
Subject: [PATCH 529/577] 2.5 Revert some changes from commit 23090. Make sure
 you update SVN before you commit!!

---
 source/blender/windowmanager/intern/wm_operators.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 6debe5a8825..77f4fe25606 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -803,7 +803,7 @@ static int recentfile_exec(bContext *C, wmOperator *op)
 			WM_read_file(C, G.sce, op->reports);
 		}
 		else {
-			struct RecentFile *recent = BLI_findlink(&(G.recent_files), event-2);
+			struct RecentFile *recent = BLI_findlink(&(G.recent_files), event-1);
 			if(recent) {
 				WM_event_add_notifier(C, NC_WINDOW, NULL);
 				WM_read_file(C, recent->filename, op->reports);
@@ -831,11 +831,11 @@ static EnumPropertyItem *open_recentfile_itemf(bContext *C, PointerRNA *ptr, int
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
 	EnumPropertyItem *item= NULL;
 	struct RecentFile *recent;
-	int totitem= 0, i, ofs= 0;
+	int totitem= 0, i;
 
 	/* dynamically construct enum */
 	for(recent = G.recent_files.first, i=0; (i<U.recent_files) && (recent); recent = recent->next, i++) {
-		tmp.value= i+ofs+1;
+		tmp.value= i+1;
 		tmp.identifier= recent->filename;
 		tmp.name= BLI_short_filename(recent->filename);
 		RNA_enum_item_add(&item, &totitem, &tmp);

From 83074d0b3758c1b2d2811974726d4dd33f3034da Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 12 Sep 2009 05:06:28 +0000
Subject: [PATCH 530/577] 2.5 - More work on Axis-Angle Rotations

* Added a few new methods for axis-angle conversions, and used these instead of manually performing those steps elsewhere
* Axis-angles to other representations now get their axes normalised to make sure that odd scaling doesn't occur.
* Made a few more tools work with axis-angles properly
---
 source/blender/blenkernel/intern/armature.c   |  2 +-
 source/blender/blenlib/BLI_arithb.h           | 21 +++--
 source/blender/blenlib/intern/arithb.c        | 89 ++++++++++++++++++-
 source/blender/editors/animation/keyingsets.c |  2 +-
 .../blender/editors/armature/editarmature.c   |  1 +
 source/blender/editors/armature/poseobject.c  | 29 +++++-
 source/blender/editors/transform/transform.c  | 12 +--
 .../editors/transform/transform_conversions.c |  4 +
 source/blender/makesrna/intern/rna_pose.c     | 36 ++------
 9 files changed, 149 insertions(+), 47 deletions(-)

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 0c18817f8be..c880925aa94 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1993,7 +1993,7 @@ void chan_calc_mat(bPoseChannel *chan)
 	}
 	else if (chan->rotmode == PCHAN_ROT_AXISANGLE) {
 		/* axis-angle - stored in quaternion data, but not really that great for 3D-changing orientations */
-		VecRotToMat3(&chan->quat[1], chan->quat[0], rmat);
+		AxisAngleToMat3(&chan->quat[1], chan->quat[0], rmat);
 	}
 	else {
 		/* quats are normalised before use to eliminate scaling issues */
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 71604758b80..8eb4d5972e3 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -342,8 +342,6 @@ void Mat4AddMat4(float m1[][4], float m2[][4], float m3[][4]);
 
 void VecUpMat3old(float *vec, float mat[][3], short axis);
 void VecUpMat3(float *vec, float mat[][3], short axis);
-void VecRotToMat3(float *vec, float phi, float mat[][3]);
-void VecRotToMat4(float *vec, float phi, float mat[][4]);
 
 void VecCopyf(float *v1, float *v2);
 int VecLen(int *v1, int *v2);
@@ -376,10 +374,23 @@ void Vec2Subf(float *v, float *v1, float *v2);
 void Vec2Copyf(float *v1, float *v2);
 void Vec2Lerpf(float *target, float *a, float *b, float t);
 
-void AxisAngleToQuat(float *q, float *axis, float angle);
-void QuatToAxisAngle(float *q, float *axis, float *angle);
+void AxisAngleToQuat(float q[4], float axis[3], float angle);
+void QuatToAxisAngle(float q[4], float axis[3], float *angle);
+void AxisAngleToEulO(float axis[3], float angle, float eul[3], short order);
+void EulOToAxisAngle(float eul[3], short order, float axis[3], float *angle);
+void AxisAngleToMat3(float axis[3], float angle, float mat[3][3]);
+void AxisAngleToMat4(float axis[3], float angle, float mat[4][4]);
+void Mat3ToAxisAngle(float mat[3][3], float axis[3], float *angle);
+void Mat4ToAxisAngle(float mat[4][4], float axis[3], float *angle);
+
+void Mat3ToVecRot(float mat[3][3], float axis[3], float *angle);
+void Mat4ToVecRot(float mat[4][4], float axis[3], float *angle);
+void VecRotToMat3(float *vec, float phi, float mat[][3]);
+void VecRotToMat4(float *vec, float phi, float mat[][4]);
+
 void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3]);
 void vectoquat(float *vec, short axis, short upflag, float *q);
+void Mat3ToQuat_is_ok(float wmat[][3], float *q);
 
 void VecReflect(float *out, float *v1, float *v2);
 void VecBisect3(float *v, float *v1, float *v2, float *v3);
@@ -460,8 +471,6 @@ void VecStar(float mat[][3],float *vec);
 
 short EenheidsMat(float mat[][3]);
 
-void Mat3ToQuat_is_ok(float wmat[][3], float *q);
-
 void i_ortho(float left, float right, float bottom, float top, float nearClip, float farClip, float matrix[][4]);
 void i_polarview(float dist, float azimuth, float incidence, float twist, float Vm[][4]);
 void i_translate(float Tx, float Ty, float Tz, float mat[][4]);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 96056ba7783..1839380f953 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -3278,7 +3278,7 @@ void Mat3ToCompatibleEul(float mat[][3], float *eul, float *oldrot)
 /* ************ AXIS ANGLE *************** */
 
 /* Axis angle to Quaternions */
-void AxisAngleToQuat(float *q, float *axis, float angle)
+void AxisAngleToQuat(float q[4], float axis[3], float angle)
 {
 	float nor[3];
 	float si;
@@ -3315,6 +3315,90 @@ void QuatToAxisAngle(float q[4], float axis[3], float *angle)
 	axis[2]= q[3] / si;
 }
 
+/* Axis Angle to Euler Rotation */
+void AxisAngleToEulO(float axis[3], float angle, float eul[3], short order)
+{
+	float q[4];
+	
+	/* use quaternions as intermediate representation for now... */
+	AxisAngleToQuat(q, axis, angle);
+	QuatToEulO(q, eul, order);
+}
+
+/* Euler Rotation to Axis Angle */
+void EulOToAxisAngle(float eul[3], short order, float axis[3], float *angle)
+{
+	float q[4];
+	
+	/* use quaternions as intermediate representation for now... */
+	EulOToQuat(eul, order, q);
+	QuatToAxisAngle(q, axis, angle);
+}
+
+/* axis angle to 3x3 matrix - safer version (normalisation of axis performed) */
+void AxisAngleToMat3(float axis[3], float angle, float mat[3][3])
+{
+	float nor[3];
+	
+	/* normalise the axis first (to remove unwanted scaling) */
+	VecCopyf(nor, axis);
+	Normalize(nor);
+	
+	/* now convert this to a 3x3 matrix */
+	VecRotToMat3(nor, angle, mat);
+}
+
+/* axis angle to 4x4 matrix - safer version (normalisation of axis performed) */
+void AxisAngleToMat4(float axis[3], float angle, float mat[4][4])
+{
+	float nor[3];
+	
+	/* normalise the axis first (to remove unwanted scaling) */
+	VecCopyf(nor, axis);
+	Normalize(nor);
+	
+	/* now convert this to a 4x4 matrix */
+	VecRotToMat4(nor, angle, mat);
+}
+
+/* 3x3 matrix to axis angle (alias around the other call) */
+void Mat3ToAxisAngle(float mat[3][3], float axis[3], float *angle)
+{
+	/* note different order of calling args... */
+	Mat3ToVecRot(axis, angle, mat);
+}
+
+/* 4x4 matrix to axis angle (alias around the other call) */
+void Mat4ToAxisAngle(float mat[4][4], float axis[3], float *angle)
+{
+	/* note different order of calling args... */
+	Mat4ToVecRot(axis, angle, mat);
+}
+
+/* ************ AXIS ANGLE (unchecked) *************** */
+
+/* 3x3 matrix to axis angle */
+void Mat3ToVecRot(float mat[3][3], float axis[3], float *angle)
+{
+	float q[4];
+	
+	/* use quaternions as intermediate representation */
+	// TODO: it would be nicer to go straight there...
+	Mat3ToQuat(mat, q);
+	QuatToAxisAngle(q, axis, angle);
+}
+
+/* 4x4 matrix to axis angle */
+void Mat4ToVecRot(float mat[4][4], float axis[3], float *angle)
+{
+	float q[4];
+	
+	/* use quaternions as intermediate representation */
+	// TODO: it would be nicer to go straight there...
+	Mat4ToQuat(mat, q);
+	QuatToAxisAngle(q, axis, angle);
+}
+
 /* axis angle to 3x3 matrix */
 void VecRotToMat3(float *vec, float phi, float mat[][3])
 {
@@ -3339,7 +3423,6 @@ void VecRotToMat3(float *vec, float phi, float mat[][3])
 	mat[2][0]= vz*vx*(1.0f-co)+vy*si;
 	mat[2][1]= vy*vz*(1.0f-co)-vx*si;
 	mat[2][2]= vz2+co*(1.0f-vz2);
-	
 }
 
 /* axis angle to 4x4 matrix */
@@ -3374,6 +3457,8 @@ void VecRotToQuat(float *vec, float phi, float *quat)
 	}
 }
 
+/* ************ VECTORS *************** */
+
 /* Returns a vector bisecting the angle at v2 formed by v1, v2 and v3 */
 void VecBisect3(float *out, float *v1, float *v2, float *v3)
 {
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 2639d49b5be..60efcce4e73 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -1177,7 +1177,7 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet *
 						/* if this path is exactly "rotation", and the rotation mode is set to eulers,
 						 * use "euler_rotation" instead so that rotations will be keyed correctly
 						 */
-						if (strcmp(ksp->rna_path, "rotation")==0 && (cks->pchan->rotmode))
+						if (strcmp(ksp->rna_path, "rotation")==0 && (cks->pchan->rotmode > 0))
 							BLI_dynstr_append(pathds, "euler_rotation");
 						else
 							BLI_dynstr_append(pathds, ksp->rna_path);
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 3b6c9e9d13d..e2293b65878 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -4865,6 +4865,7 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
 			
 			eul[0]= eul[1]= eul[2]= 0.0f;
 			
+			// TODO: for 4 channel rotations, we need special flags for those too...
 			if (pchan->protectflag & OB_LOCK_ROTX)
 				eul[0]= oldeul[0];
 			if (pchan->protectflag & OB_LOCK_ROTY)
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 9a404e24e12..b473b9ee226 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -1009,12 +1009,25 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 					}
 				}
 				else if (pchan->rotmode > 0) {
-					/* quat to euler */
-					QuatToEulO(chan->quat, pchan->eul, pchan->rotmode);
+					/* quat/axis-angle to euler */
+					if (chan->rotmode == PCHAN_ROT_AXISANGLE)
+						AxisAngleToEulO(&chan->quat[1], chan->quat[0], pchan->eul, pchan->rotmode);
+					else
+						QuatToEulO(chan->quat, pchan->eul, pchan->rotmode);
+				}
+				else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+					/* quat/euler to axis angle */
+					if (chan->rotmode > 0)
+						EulOToAxisAngle(chan->eul, chan->rotmode, &pchan->quat[1], &pchan->quat[0]);
+					else	
+						QuatToAxisAngle(chan->quat, &pchan->quat[1], &pchan->quat[0]);
 				}
 				else {
-					/* euler to quat */
-					EulOToQuat(chan->eul, chan->rotmode, pchan->quat);
+					/* euler/axis-angle to quat */
+					if (chan->rotmode > 0)
+						EulOToQuat(chan->eul, chan->rotmode, pchan->quat);
+					else
+						AxisAngleToQuat(pchan->quat, &chan->quat[1], chan->quat[0]);
 				}
 				
 				/* paste flipped pose? */
@@ -1026,6 +1039,14 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 						pchan->eul[1] *= -1;
 						pchan->eul[2] *= -1;
 					}
+					else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+						float eul[3];
+						
+						AxisAngleToEulO(&pchan->quat[1], pchan->quat[0], eul, EULER_ORDER_DEFAULT);
+						eul[1]*= -1;
+						eul[2]*= -1;
+						EulOToAxisAngle(eul, EULER_ORDER_DEFAULT, &pchan->quat[1], &pchan->quat[0]);
+					}
 					else {
 						float eul[3];
 						
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 6405e87c4c0..467f5c59e3d 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1614,7 +1614,8 @@ static void protectedQuaternionBits(short protectflag, float *quat, float *oldqu
 {
 	/* quaternions get limited with euler... */
 	/* this function only does the delta rotation */
-
+	
+	// FIXME: need special checks for quality here...
 	if(protectflag) {
 		float eul[3], oldeul[3], quat1[4];
 
@@ -2686,12 +2687,13 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				
 				QuatMul(td->ext->quat, quat, iquat);
 				
-				/* this function works on end result */
-				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
-				
 				/* make temp copy (since stored in same place) */
-				QuatCopy(quat, td->ext->quat);
+				QuatCopy(quat, td->ext->quat); // this is just a 4d vector copying function
 				QuatToAxisAngle(quat, &td->ext->quat[1], &td->ext->quat[0]); 
+				
+				/* this function works on end result */
+				// TODO: we really need a specialised version of this for axis-angle that doesn't try to do quats...
+				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
 			}
 			else { 
 				float eulmat[3][3];
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index e0d058f160f..6386c0d4eb7 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -509,6 +509,8 @@ static short apply_targetless_ik(Object *ob)
 					/* rotation */
 					if (parchan->rotmode > 0) 
 						Mat3ToEulO(rmat3, parchan->eul, parchan->rotmode);
+					else if (parchan->rotmode == PCHAN_ROT_AXISANGLE)
+						Mat3ToAxisAngle(rmat3, &parchan->quat[1], &parchan->quat[0]);
 					else
 						Mat3ToQuat(rmat3, parchan->quat);
 					
@@ -517,6 +519,8 @@ static short apply_targetless_ik(Object *ob)
 					if (data->flag & CONSTRAINT_IK_STRETCH) {
 						if (parchan->rotmode > 0)
 							EulOToMat3(parchan->eul, parchan->rotmode, qrmat);
+						else if (parchan->rotmode == PCHAN_ROT_AXISANGLE)
+							AxisAngleToMat3(&parchan->quat[1], parchan->quat[0], qrmat);
 						else
 							QuatToMat3(parchan->quat, qrmat);
 						
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 0a88b084307..d143c94ebb1 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -115,14 +115,9 @@ static void rna_PoseChannel_euler_rotation_get(PointerRNA *ptr, float *value)
 {
 	bPoseChannel *pchan= ptr->data;
 	
-	if(pchan->rotmode == PCHAN_ROT_AXISANGLE) {
-		float m[3][3];
-		
-		/* go through a 3x3 matrix */
-		VecRotToMat3(&pchan->quat[1], pchan->quat[0], m);
-		Mat3ToEul(m, value);
-	}
-	else if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers when using axis-angle... */
+	if(pchan->rotmode == PCHAN_ROT_AXISANGLE) /* default XYZ eulers */
+		AxisAngleToEulO(&pchan->quat[1], pchan->quat[0], value, EULER_ORDER_DEFAULT);
+	else if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers  */
 		QuatToEul(pchan->quat, value);
 	else
 		VECCOPY(value, pchan->eul);
@@ -133,14 +128,9 @@ static void rna_PoseChannel_euler_rotation_set(PointerRNA *ptr, const float *val
 {
 	bPoseChannel *pchan= ptr->data;
 	
-	if(pchan->rotmode == PCHAN_ROT_AXISANGLE) { /* default XYZ eulers when using axis-angle... */
-		float q[4];
-		
-		/* convert to temp quat, then to axis angle (since stored in same var) */
-		EulToQuat((float *)value, q);
-		QuatToAxisAngle(q, &pchan->quat[1], &pchan->quat[0]);
-	}
-	else if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers when using quats... */
+	if(pchan->rotmode == PCHAN_ROT_AXISANGLE) /* default XYZ eulers */
+		EulOToAxisAngle((float *)value, EULER_ORDER_DEFAULT, &pchan->quat[1], &pchan->quat[0]);
+	else if(pchan->rotmode == PCHAN_ROT_QUAT) /* default XYZ eulers */
 		EulToQuat((float*)value, pchan->quat);
 	else
 		VECCOPY(pchan->eul, value);
@@ -177,13 +167,7 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 	if (value > 0) { /* to euler */
 		if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
 			/* axis-angle to euler */
-			float m[3][3];
-			
-			/* convert to 3x3 matrix, then to euler 
-			 *	- axis angle is stored in quats
-			 */
-			VecRotToMat3(&pchan->quat[1], pchan->quat[0], m);
-			Mat3ToEulO(m, pchan->eul, value);
+			AxisAngleToEulO(&pchan->quat[1], pchan->quat[0], pchan->eul, value);
 		}
 		else if (pchan->rotmode == PCHAN_ROT_QUAT) {
 			/* quat to euler */
@@ -209,11 +193,7 @@ static void rna_PoseChannel_rotation_mode_set(PointerRNA *ptr, int value)
 	else { /* to axis-angle */
 		if (pchan->rotmode > 0) {
 			/* euler to axis angle */
-			float q[4];
-			
-			/* convert to temp quat, then to axis angle (since stored in same var) */
-			EulOToQuat(pchan->eul, pchan->rotmode, q);
-			QuatToAxisAngle(q, &pchan->quat[1], &pchan->quat[0]);
+			EulOToAxisAngle(pchan->eul, pchan->rotmode, &pchan->quat[1], &pchan->quat[0]);
 		}
 		else if (pchan->rotmode == PCHAN_ROT_QUAT) {
 			/* quat to axis angle */

From 3a9d99e3e86a44ee7c9abf144c7b03fe246adc37 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 12 Sep 2009 10:21:55 +0000
Subject: [PATCH 531/577] Rotation Math:

Replaced a few function calls with inlined code for nicer performance.
---
 source/blender/blenlib/intern/arithb.c | 52 ++++++++++++++++++--------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 1839380f953..dc7f908123f 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -3338,44 +3338,66 @@ void EulOToAxisAngle(float eul[3], short order, float axis[3], float *angle)
 /* axis angle to 3x3 matrix - safer version (normalisation of axis performed) */
 void AxisAngleToMat3(float axis[3], float angle, float mat[3][3])
 {
-	float nor[3];
+	float nor[3], nsi[3], co, si, ico;
 	
 	/* normalise the axis first (to remove unwanted scaling) */
 	VecCopyf(nor, axis);
 	Normalize(nor);
 	
 	/* now convert this to a 3x3 matrix */
-	VecRotToMat3(nor, angle, mat);
+	co= (float)cos(angle);		
+	si= (float)sin(angle);
+	
+	ico= (1.0f - co);
+	nsi[0]= nor[0]*si;
+	nsi[1]= nor[1]*si;
+	nsi[2]= nor[2]*si;
+	
+	mat[0][0] = ((nor[0] * nor[0]) * ico) + co;
+	mat[0][1] = ((nor[0] * nor[1]) * ico) + nsi[2];
+	mat[0][2] = ((nor[0] * nor[2]) * ico) - nsi[1];
+	mat[1][0] = ((nor[0] * nor[1]) * ico) - nsi[2];
+	mat[1][1] = ((nor[1] * nor[1]) * ico) + co;
+	mat[1][2] = ((nor[1] * nor[2]) * ico) + nsi[0];
+	mat[2][0] = ((nor[0] * nor[2]) * ico) + nsi[1];
+	mat[2][1] = ((nor[1] * nor[2]) * ico) - nsi[0];
+	mat[2][2] = ((nor[2] * nor[2]) * ico) + co;
 }
 
 /* axis angle to 4x4 matrix - safer version (normalisation of axis performed) */
 void AxisAngleToMat4(float axis[3], float angle, float mat[4][4])
 {
-	float nor[3];
+	float tmat[3][3];
 	
-	/* normalise the axis first (to remove unwanted scaling) */
-	VecCopyf(nor, axis);
-	Normalize(nor);
-	
-	/* now convert this to a 4x4 matrix */
-	VecRotToMat4(nor, angle, mat);
+	AxisAngleToMat3(axis, angle, mat);
+	Mat4One(mat);
+	Mat4CpyMat3(mat, tmat);
 }
 
-/* 3x3 matrix to axis angle (alias around the other call) */
+/* 3x3 matrix to axis angle (see Mat4ToVecRot too) */
 void Mat3ToAxisAngle(float mat[3][3], float axis[3], float *angle)
 {
-	/* note different order of calling args... */
-	Mat3ToVecRot(axis, angle, mat);
+	float q[4];
+	
+	/* use quaternions as intermediate representation */
+	// TODO: it would be nicer to go straight there...
+	Mat3ToQuat(mat, q);
+	QuatToAxisAngle(q, axis, angle);
 }
 
-/* 4x4 matrix to axis angle (alias around the other call) */
+/* 4x4 matrix to axis angle (see Mat4ToVecRot too) */
 void Mat4ToAxisAngle(float mat[4][4], float axis[3], float *angle)
 {
-	/* note different order of calling args... */
-	Mat4ToVecRot(axis, angle, mat);
+	float q[4];
+	
+	/* use quaternions as intermediate representation */
+	// TODO: it would be nicer to go straight there...
+	Mat4ToQuat(mat, q);
+	QuatToAxisAngle(q, axis, angle);
 }
 
 /* ************ AXIS ANGLE (unchecked) *************** */
+// TODO: the following calls should probably be depreceated sometime
 
 /* 3x3 matrix to axis angle */
 void Mat3ToVecRot(float mat[3][3], float axis[3], float *angle)

From ad43aaf881652a10a47a850277bfe3d376a82433 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sat, 12 Sep 2009 12:30:23 +0000
Subject: [PATCH 532/577] 2.5 - Rotation Locking for Bones

* Added Transform Locks panel. The layout for rotation I'm not satisfied with yet, though it is the best alternative so far.

* Rotations can now be locked per-component for quats/axis-angle instead of going through eulers. This is currently enabled by the checkbox for the 'label' of the Lock Rotation column.
- The naming of the property in RNA + the way this is presented in the UI can get some work done.
- The setting for the 'w' component for quats/axis-angle is currently a separate flag in RNA, since I can't figure out how to lump this in under the 'lock_rotation' property instead (i.e. getting that to be either 3 or 4 components, depending on whether per-component locking is enabled).
- Editing values directly should not be possible when these locks are set...

* Fixed some tools which made use of this
---
 release/ui/buttons_data_bone.py               |  30 +++++
 .../blender/editors/armature/editarmature.c   |  80 +++++++-----
 source/blender/editors/armature/poseobject.c  |   1 -
 source/blender/editors/transform/transform.c  | 123 ++++++++++++++----
 source/blender/makesdna/DNA_object_types.h    |   2 +
 source/blender/makesrna/intern/rna_pose.c     |  17 ++-
 6 files changed, 186 insertions(+), 67 deletions(-)

diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 5aac44bbc94..a0121821e55 100644
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -71,6 +71,35 @@ class BONE_PT_transform(BoneButtonsPanel):
 				col = layout.column(align=True)
 				col.itemL(text="Euler:")
 				col.row().itemR(pchan, "euler_rotation", text="")
+				
+class BONE_PT_transform_locks(BoneButtonsPanel):
+	__label__ = "Transform Locks"
+	
+	def poll(self, context):
+		return context.bone
+	
+	def draw(self, context):
+		layout = self.layout
+		
+		ob = context.object
+		bone = context.bone
+		pchan = ob.pose.pose_channels[context.bone.name]
+		
+		row = layout.row()
+		col = row.column()
+		col.itemR(pchan, "lock_location")
+		col.active = not (bone.parent and bone.connected)
+		
+		col = row.column()
+		if pchan.rotation_mode in ('QUATERNION', 'AXIS_ANGLE'):
+			col.itemR(pchan, "lock_rotations_4d", text="Lock Rotation")
+			if pchan.lock_rotations_4d:
+				col.itemR(pchan, "lock_rotation_w", text="W")
+			col.itemR(pchan, "lock_rotation", text="")
+		else:
+			col.itemR(pchan, "lock_rotation", text="Rotation")
+		
+		row.column().itemR(pchan, "lock_scale")
 
 class BONE_PT_bone(BoneButtonsPanel):
 	__label__ = "Bone"
@@ -243,6 +272,7 @@ class BONE_PT_deform(BoneButtonsPanel):
 
 bpy.types.register(BONE_PT_context_bone)
 bpy.types.register(BONE_PT_transform)
+bpy.types.register(BONE_PT_transform_locks)
 bpy.types.register(BONE_PT_bone)
 bpy.types.register(BONE_PT_deform)
 bpy.types.register(BONE_PT_inverse_kinematics)
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index e2293b65878..7d196d23c98 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -4849,42 +4849,56 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
 	
 	/* only clear those channels that are not locked */
 	CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pchans) {
-		if (pchan->protectflag & (OB_LOCK_ROTX|OB_LOCK_ROTY|OB_LOCK_ROTZ)) {
-			float eul[3], oldeul[3], quat1[4];
-			
-			if (pchan->rotmode == PCHAN_ROT_QUAT) {
-				QUATCOPY(quat1, pchan->quat);
-				QuatToEul(pchan->quat, oldeul);
-			}
-			else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
-				continue; // XXX
+		if (pchan->protectflag & (OB_LOCK_ROTX|OB_LOCK_ROTY|OB_LOCK_ROTZ|OB_LOCK_ROTW)) {
+			/* check if convert to eulers for locking... */
+			if (pchan->protectflag & OB_LOCK_ROT4D) {
+				/* perform clamping on a component by component basis */
+				if ((pchan->protectflag & OB_LOCK_ROTW) == 0)
+					pchan->quat[0]= (pchan->rotmode == PCHAN_ROT_AXISANGLE) ? 0.0f : 1.0f;
+				if ((pchan->protectflag & OB_LOCK_ROTX) == 0)
+					pchan->quat[1]= 0.0f;
+				if ((pchan->protectflag & OB_LOCK_ROTY) == 0)
+					pchan->quat[2]= 0.0f;
+				if ((pchan->protectflag & OB_LOCK_ROTZ) == 0)
+					pchan->quat[3]= 0.0f;
 			}
 			else {
-				VECCOPY(oldeul, pchan->eul);
-			}
-			
-			eul[0]= eul[1]= eul[2]= 0.0f;
-			
-			// TODO: for 4 channel rotations, we need special flags for those too...
-			if (pchan->protectflag & OB_LOCK_ROTX)
-				eul[0]= oldeul[0];
-			if (pchan->protectflag & OB_LOCK_ROTY)
-				eul[1]= oldeul[1];
-			if (pchan->protectflag & OB_LOCK_ROTZ)
-				eul[2]= oldeul[2];
-			
-			if (pchan->rotmode == PCHAN_ROT_QUAT) {
-				EulToQuat(eul, pchan->quat);
-				/* quaternions flip w sign to accumulate rotations correctly */
-				if ((quat1[0]<0.0f && pchan->quat[0]>0.0f) || (quat1[0]>0.0f && pchan->quat[0]<0.0f)) {
-					QuatMulf(pchan->quat, -1.0f);
+				/* perform clamping using euler form (3-components) */
+				float eul[3], oldeul[3], quat1[4];
+				
+				if (pchan->rotmode == PCHAN_ROT_QUAT) {
+					QUATCOPY(quat1, pchan->quat);
+					QuatToEul(pchan->quat, oldeul);
+				}
+				else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+					AxisAngleToEulO(&pchan->quat[1], pchan->quat[0], oldeul, EULER_ORDER_DEFAULT);
+				}
+				else {
+					VECCOPY(oldeul, pchan->eul);
+				}
+				
+				eul[0]= eul[1]= eul[2]= 0.0f;
+				
+				if (pchan->protectflag & OB_LOCK_ROTX)
+					eul[0]= oldeul[0];
+				if (pchan->protectflag & OB_LOCK_ROTY)
+					eul[1]= oldeul[1];
+				if (pchan->protectflag & OB_LOCK_ROTZ)
+					eul[2]= oldeul[2];
+				
+				if (pchan->rotmode == PCHAN_ROT_QUAT) {
+					EulToQuat(eul, pchan->quat);
+					/* quaternions flip w sign to accumulate rotations correctly */
+					if ((quat1[0]<0.0f && pchan->quat[0]>0.0f) || (quat1[0]>0.0f && pchan->quat[0]<0.0f)) {
+						QuatMulf(pchan->quat, -1.0f);
+					}
+				}
+				else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
+					AxisAngleToEulO(&pchan->quat[1], pchan->quat[0], oldeul, EULER_ORDER_DEFAULT);
+				}
+				else {
+					VECCOPY(pchan->eul, eul);
 				}
-			}
-			else if (pchan->rotmode == PCHAN_ROT_AXISANGLE) {
-				// TODO...
-			}
-			else {
-				VECCOPY(pchan->eul, eul);
 			}
 		}						
 		else { 
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index b473b9ee226..7d7f54309a8 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -998,7 +998,6 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 				pchan->flag= chan->flag;
 				
 				/* check if rotation modes are compatible (i.e. do they need any conversions) */
-				// FIXME: add axis-angle here too...
 				if (pchan->rotmode == chan->rotmode) {
 					/* copy the type of rotation in use */
 					if (pchan->rotmode > 0) {
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 467f5c59e3d..e877f1fecae 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1610,29 +1610,88 @@ static void protectedRotateBits(short protectflag, float *eul, float *oldeul)
 		eul[2]= oldeul[2];
 }
 
+
+/* this function only does the delta rotation */
+/* axis-angle is usually internally stored as quats... */
+static void protectedAxisAngleBits(short protectflag, float *quat, float *oldquat)
+{
+	/* check that protection flags are set */
+	if ((protectflag & (OB_LOCK_ROTX|OB_LOCK_ROTY|OB_LOCK_ROTZ|OB_LOCK_ROTW)) == 0)
+		return;
+	
+	if (protectflag & OB_LOCK_ROT4D) {
+		/* axis-angle getting limited as 4D entities that they are... */
+		if (protectflag & OB_LOCK_ROTW)
+			quat[0]= oldquat[0];
+		if (protectflag & OB_LOCK_ROTX)
+			quat[1]= oldquat[1];
+		if (protectflag & OB_LOCK_ROTY)
+			quat[2]= oldquat[2];
+		if (protectflag & OB_LOCK_ROTZ)
+			quat[3]= oldquat[3];
+	}
+	else {
+		/* axis-angle get limited with euler... */
+		float eul[3], oldeul[3], quat1[4];
+		
+		QUATCOPY(quat1, quat);
+		AxisAngleToEulO(quat+1, quat[0], eul, EULER_ORDER_DEFAULT);
+		AxisAngleToEulO(oldquat+1, oldquat[0], oldeul, EULER_ORDER_DEFAULT);
+		
+		if (protectflag & OB_LOCK_ROTX)
+			eul[0]= oldeul[0];
+		if (protectflag & OB_LOCK_ROTY)
+			eul[1]= oldeul[1];
+		if (protectflag & OB_LOCK_ROTZ)
+			eul[2]= oldeul[2];
+		
+		EulOToAxisAngle(eul, EULER_ORDER_DEFAULT, quat+1, quat);
+		
+		/* when converting to axis-angle, we need a special exception for the case when there is no axis */
+		if (IS_EQ(quat[1], quat[2]) && IS_EQ(quat[2], quat[3])) {
+			/* for now, rotate around y-axis then (so that it simply becomes the roll) */
+			quat[2]= 1.0f;
+		}
+	}
+}
+
+/* this function only does the delta rotation */
 static void protectedQuaternionBits(short protectflag, float *quat, float *oldquat)
 {
-	/* quaternions get limited with euler... */
-	/* this function only does the delta rotation */
+	/* check that protection flags are set */
+	if ((protectflag & (OB_LOCK_ROTX|OB_LOCK_ROTY|OB_LOCK_ROTZ|OB_LOCK_ROTW)) == 0)
+		return;
 	
-	// FIXME: need special checks for quality here...
-	if(protectflag) {
+	if (protectflag & OB_LOCK_ROT4D) {
+		/* quaternions getting limited as 4D entities that they are... */
+		if (protectflag & OB_LOCK_ROTW)
+			quat[0]= oldquat[0];
+		if (protectflag & OB_LOCK_ROTX)
+			quat[1]= oldquat[1];
+		if (protectflag & OB_LOCK_ROTY)
+			quat[2]= oldquat[2];
+		if (protectflag & OB_LOCK_ROTZ)
+			quat[3]= oldquat[3];
+	}
+	else {
+		/* quaternions get limited with euler... (compatability mode) */
 		float eul[3], oldeul[3], quat1[4];
-
+		
 		QUATCOPY(quat1, quat);
 		QuatToEul(quat, eul);
 		QuatToEul(oldquat, oldeul);
-
-		if(protectflag & OB_LOCK_ROTX)
+		
+		if (protectflag & OB_LOCK_ROTX)
 			eul[0]= oldeul[0];
-		if(protectflag & OB_LOCK_ROTY)
+		if (protectflag & OB_LOCK_ROTY)
 			eul[1]= oldeul[1];
-		if(protectflag & OB_LOCK_ROTZ)
+		if (protectflag & OB_LOCK_ROTZ)
 			eul[2]= oldeul[2];
-
+		
 		EulToQuat(eul, quat);
+		
 		/* quaternions flip w sign to accumulate rotations correctly */
-		if( (quat1[0]<0.0f && quat[0]>0.0f) || (quat1[0]>0.0f && quat[0]<0.0f) ) {
+		if ( (quat1[0]<0.0f && quat[0]>0.0f) || (quat1[0]>0.0f && quat[0]<0.0f) ) {
 			QuatMulf(quat, -1.0f);
 		}
 	}
@@ -1733,17 +1792,24 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 			else
 				return;
 		}
-		else if (td->tdi) {
+		else if (td->tdi) { // XXX depreceated
 			/* ipo-keys eulers */
 			TransDataIpokey *tdi= td->tdi;
 			float eul[3];
-
+			
 			eul[0]= tdi->rotx[0];
 			eul[1]= tdi->roty[0];
 			eul[2]= tdi->rotz[0];
-
+			
 			EulOToMat4(eul, td->rotOrder, cob.matrix);
 		}
+		else if (td->rotOrder == PCHAN_ROT_AXISANGLE) {
+			/* axis angle */
+			if (td->ext)
+				AxisAngleToMat4(&td->ext->quat[1], td->ext->quat[0], cob.matrix);
+			else
+				return;
+		}
 		else {
 			/* eulers */
 			if (td->ext)
@@ -1751,22 +1817,22 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 			else
 				return;
 		}
-
+		
 		/* Evaluate valid constraints */
 		for (con= td->con; con; con= con->next) {
 			/* only consider constraint if enabled */
 			if (con->flag & CONSTRAINT_DISABLE) continue;
 			if (con->enforce == 0.0f) continue;
-
+			
 			/* we're only interested in Limit-Rotation constraints */
 			if (con->type == CONSTRAINT_TYPE_ROTLIMIT) {
 				bRotLimitConstraint *data= con->data;
 				float tmat[4][4];
-
+				
 				/* only use it if it's tagged for this purpose */
 				if ((data->flag2 & LIMIT_TRANSFORM)==0)
 					continue;
-
+				
 				/* do space conversions */
 				if (con->ownspace == CONSTRAINT_SPACE_WORLD) {
 					/* just multiply by td->mtx (this should be ok) */
@@ -1777,10 +1843,10 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 					/* skip... incompatable spacetype */
 					continue;
 				}
-
+				
 				/* do constraint */
 				cti->evaluate_constraint(con, &cob, NULL);
-
+				
 				/* convert spaces again */
 				if (con->ownspace == CONSTRAINT_SPACE_WORLD) {
 					/* just multiply by td->mtx (this should be ok) */
@@ -1789,7 +1855,7 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 				}
 			}
 		}
-
+		
 		/* copy results from cob->matrix */
 		if (td->flag & TD_USEQUAT) {
 			/* quats */
@@ -1799,13 +1865,17 @@ static void constraintRotLim(TransInfo *t, TransData *td)
 			/* ipo-keys eulers */
 			TransDataIpokey *tdi= td->tdi;
 			float eul[3];
-
+			
 			Mat4ToEulO(cob.matrix, eul, td->rotOrder);
-
+			
 			tdi->rotx[0]= eul[0];
 			tdi->roty[0]= eul[1];
 			tdi->rotz[0]= eul[2];
 		}
+		else if (td->rotOrder == PCHAN_ROT_AXISANGLE) {
+			/* axis angle */
+			Mat4ToAxisAngle(cob.matrix, &td->ext->quat[1], &td->ext->quat[0]);
+		}
 		else {
 			/* eulers */
 			Mat4ToEulO(cob.matrix, td->ext->rot, td->rotOrder);
@@ -2688,12 +2758,11 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				QuatMul(td->ext->quat, quat, iquat);
 				
 				/* make temp copy (since stored in same place) */
-				QuatCopy(quat, td->ext->quat); // this is just a 4d vector copying function
+				QUATCOPY(quat, td->ext->quat); // this is just a 4d vector copying macro
 				QuatToAxisAngle(quat, &td->ext->quat[1], &td->ext->quat[0]); 
 				
 				/* this function works on end result */
-				// TODO: we really need a specialised version of this for axis-angle that doesn't try to do quats...
-				protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
+				protectedAxisAngleBits(td->protectflag, td->ext->quat, td->ext->iquat);
 			}
 			else { 
 				float eulmat[3][3];
@@ -2714,7 +2783,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				protectedRotateBits(td->protectflag, eul, td->ext->irot);
 				VECCOPY(td->ext->rot, eul);
 			}
-
+			
 			constraintRotLim(t, td);
 		}
 	}
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index d1e70c16408..a89f8e1fb2e 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -515,6 +515,8 @@ extern Object workob;
 #define OB_LOCK_SCALEY	128
 #define OB_LOCK_SCALEZ	256
 #define OB_LOCK_SCALE	448
+#define OB_LOCK_ROTW	512
+#define OB_LOCK_ROT4D	1024
 
 /* ob->mode */
 typedef enum ObjectMode {
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index d143c94ebb1..3a03e7a624d 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -698,14 +698,19 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTX);
 	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation (with three components) in the interface.");
+	RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation in the interface.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 	
-	//prop= RNA_def_property(srna, "lock_rotation_4d", PROP_BOOLEAN, PROP_XYZ);
-	//RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTW);
-	//RNA_def_property_array(prop, 4);
-	//RNA_def_property_ui_text(prop, "Lock Rotation (4D)", "Lock editing of rotations (with four components) in the interface.");
-	//RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
+		// XXX this is sub-optimal - it really should be included above, but due to technical reasons we can't do this!
+	prop= RNA_def_property(srna, "lock_rotation_w", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTW);
+	RNA_def_property_ui_text(prop, "Lock Rotation (4D Angle)", "Lock editing of 'angle' component of four-component rotations in the interface.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
+		// XXX this needs a better name
+	prop= RNA_def_property(srna, "lock_rotations_4d", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROT4D);
+	RNA_def_property_ui_text(prop, "Lock Rotations (4D)", "Lock editing of four component rotations by components (instead of as Eulers).");
+	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update");
 
 	prop= RNA_def_property(srna, "lock_scale", PROP_BOOLEAN, PROP_XYZ);
 	RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_SCALEX);

From 0bc8fd08e79d18507851714a15a18dc1054a4e3a Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sat, 12 Sep 2009 12:34:33 +0000
Subject: [PATCH 533/577] Blender 2.5 MSVC 9 projectfiles * maintenance: **
 nodes/intern/CMP_nodes/CMP_colorMatte.c **
 nodes/intern/CMP_nodes/CMP_distanceMatte.c **
 nodes/intern/CMP_nodes/CMP_levels.c * smoke include dir added to GL_gpu
 library

---
 projectfiles_vc9/blender/gpu/BL_gpu.vcproj  | 12 ++++++------
 projectfiles_vc9/blender/nodes/nodes.vcproj | 12 ++++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/projectfiles_vc9/blender/gpu/BL_gpu.vcproj b/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
index eb404e27f24..1daf345f638 100644
--- a/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
+++ b/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -193,7 +193,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -343,7 +343,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\smoke\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc9/blender/nodes/nodes.vcproj b/projectfiles_vc9/blender/nodes/nodes.vcproj
index 68bf0feac73..ca997306f04 100644
--- a/projectfiles_vc9/blender/nodes/nodes.vcproj
+++ b/projectfiles_vc9/blender/nodes/nodes.vcproj
@@ -348,6 +348,10 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_chromaMatte.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_colorMatte.c"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_colorSpill.c"
 					>
@@ -384,6 +388,10 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_displace.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_distanceMatte.c"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_filter.c"
 					>
@@ -420,6 +428,10 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_lensdist.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_levels.c"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_lummaMatte.c"
 					>

From 2ca79ec1def97a24e64722613edc6fb5fb714314 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Sat, 12 Sep 2009 12:54:43 +0000
Subject: [PATCH 534/577] 2.5 Notifier:

* Added a general Refresh Tag for the Property-Buttons area, needed if more than 1 property window with the same content is open. Not all RNA properties have a ND_ Notifier yet, so i guess this is the best solution for now.
---
 source/blender/editors/space_buttons/space_buttons.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 385f55b71c1..d4ad77daca7 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -319,6 +319,9 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 	/* context changes */
 	switch(wmn->category) {
 		case NC_SCENE:
+			/* lazy general redraw tag here, in case more than 1 propertie window is opened 
+			Not all RNA props have a ND_sub notifier(yet) */
+			ED_area_tag_redraw(sa);
 			switch(wmn->data) {
 				case ND_FRAME:
 				case ND_MODE:
@@ -333,10 +336,14 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 			}
 			break;
 		case NC_OBJECT:
+			ED_area_tag_redraw(sa);
+			/* lazy general redraw tag here, in case more than 1 propertie window is opened 
+			Not all RNA props have a ND_ notifier(yet) */
 			switch(wmn->data) {
 				case ND_TRANSFORM:
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
+				case ND_MODIFIER:
 				case ND_CONSTRAINT:
 					ED_area_tag_redraw(sa);
 					break;
@@ -356,7 +363,6 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 			break;
 		case NC_MATERIAL:
 			ED_area_tag_redraw(sa);
-			
 			switch(wmn->data) {
 				case ND_SHADING:
 				case ND_SHADING_DRAW:

From e271b033400c89d6f218a30043737b11785309c4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 Sep 2009 13:25:38 +0000
Subject: [PATCH 535/577] simple error in recent arithb.c commit, have
 Mathutils.RotationMatrix use AxisAngleToMat3

---
 source/blender/blenlib/intern/arithb.c    |  2 +-
 source/blender/python/generic/Mathutils.c | 38 ++---------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index dc7f908123f..f0dba4255ad 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -3369,7 +3369,7 @@ void AxisAngleToMat4(float axis[3], float angle, float mat[4][4])
 {
 	float tmat[3][3];
 	
-	AxisAngleToMat3(axis, angle, mat);
+	AxisAngleToMat3(axis, angle, tmat);
 	Mat4One(mat);
 	Mat4CpyMat3(mat, tmat);
 }
diff --git a/source/blender/python/generic/Mathutils.c b/source/blender/python/generic/Mathutils.c
index f53fd66ba99..32262276d0a 100644
--- a/source/blender/python/generic/Mathutils.c
+++ b/source/blender/python/generic/Mathutils.c
@@ -353,7 +353,7 @@ static PyObject *M_Mathutils_RotationMatrix(PyObject * self, PyObject * args)
 	VectorObject *vec = NULL;
 	char *axis = NULL;
 	int matSize;
-	float angle = 0.0f, norm = 0.0f, cosAngle = 0.0f, sinAngle = 0.0f;
+	float angle = 0.0f;
 	float mat[16] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
 		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f};
 
@@ -437,40 +437,8 @@ static PyObject *M_Mathutils_RotationMatrix(PyObject * self, PyObject * args)
 		mat[8] = 1.0f;
 	} else if((strcmp(axis, "r") == 0) || (strcmp(axis, "R") == 0)) {
 		//arbitrary rotation
-		//normalize arbitrary axis
-		norm = (float) sqrt(vec->vec[0] * vec->vec[0] +
-				       vec->vec[1] * vec->vec[1] +
-				       vec->vec[2] * vec->vec[2]);
-		vec->vec[0] /= norm;
-		vec->vec[1] /= norm;
-		vec->vec[2] /= norm;
-		
-		if (isnan(vec->vec[0]) || isnan(vec->vec[1]) || isnan(vec->vec[2])) {
-			/* zero length vector, return an identity matrix, could also return an error */
-			mat[0]= mat[4] = mat[8] = 1.0f;
-		} else {	
-			/* create matrix */
-			cosAngle = (float) cos(angle);
-			sinAngle = (float) sin(angle);
-			mat[0] = ((vec->vec[0] * vec->vec[0]) * (1 - cosAngle)) +
-				cosAngle;
-			mat[1] = ((vec->vec[0] * vec->vec[1]) * (1 - cosAngle)) +
-				(vec->vec[2] * sinAngle);
-			mat[2] = ((vec->vec[0] * vec->vec[2]) * (1 - cosAngle)) -
-				(vec->vec[1] * sinAngle);
-			mat[3] = ((vec->vec[0] * vec->vec[1]) * (1 - cosAngle)) -
-				(vec->vec[2] * sinAngle);
-			mat[4] = ((vec->vec[1] * vec->vec[1]) * (1 - cosAngle)) +
-				cosAngle;
-			mat[5] = ((vec->vec[1] * vec->vec[2]) * (1 - cosAngle)) +
-				(vec->vec[0] * sinAngle);
-			mat[6] = ((vec->vec[0] * vec->vec[2]) * (1 - cosAngle)) +
-				(vec->vec[1] * sinAngle);
-			mat[7] = ((vec->vec[1] * vec->vec[2]) * (1 - cosAngle)) -
-				(vec->vec[0] * sinAngle);
-			mat[8] = ((vec->vec[2] * vec->vec[2]) * (1 - cosAngle)) +
-				cosAngle;
-		}
+		AxisAngleToMat3(vec->vec, angle, (float *)mat);
+
 	} else {
 		PyErr_SetString(PyExc_AttributeError, "Mathutils.RotationMatrix(): unrecognizable axis of rotation type - expected x,y,z or r\n");
 		return NULL;

From 3f9d3b2a0b61fee0b51b3b867033b5488c17cc35 Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Sat, 12 Sep 2009 13:27:26 +0000
Subject: [PATCH 536/577] commit of mempool 64-bit fix for 2.5-er, trunk as
 well

---
 source/blender/blenlib/intern/BLI_mempool.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
index 7ac7b8b1791..485ba7cbd08 100644
--- a/source/blender/blenlib/intern/BLI_mempool.c
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -56,7 +56,10 @@ BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk)
 	BLI_freenode *lasttail = NULL, *curnode = NULL;
 	int i,j, maxchunks;
 	char *addr;
-
+	
+	if (esize < sizeof(void*))
+		esize = sizeof(void*);
+	
 	/*allocate the pool structure*/
 	pool = MEM_mallocN(sizeof(BLI_mempool),"memory pool");
 	pool->esize = esize;

From d16bde417fb985eb348cdbf2314e324fa9d098a9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 Sep 2009 14:12:37 +0000
Subject: [PATCH 537/577] new struct PathPoint for each path element (replaces
 float[4]), Paths now store radius and quaternion Added optional quat and
 radius args to anim.c's where_on_path(...), currently unused.

also cleanup some warnings.
---
 source/blender/blenkernel/BKE_anim.h          |  2 +-
 source/blender/blenkernel/intern/anim.c       | 64 +++++++++++++------
 source/blender/blenkernel/intern/constraint.c |  8 +--
 source/blender/blenkernel/intern/font.c       |  4 +-
 source/blender/blenkernel/intern/lattice.c    | 14 ++--
 source/blender/blenkernel/intern/object.c     |  4 +-
 source/blender/blenkernel/intern/particle.c   |  5 +-
 .../blenkernel/intern/particle_system.c       |  2 +-
 source/blender/blenkernel/intern/smoke.c      |  1 +
 source/blender/blenlib/BLI_arithb.h           |  2 +-
 source/blender/blenlib/intern/arithb.c        | 16 ++---
 .../blender/editors/space_view3d/drawobject.c |  4 +-
 source/blender/makesdna/DNA_curve_types.h     | 11 +++-
 13 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index 5ea511738ad..4b1e758da54 100644
--- a/source/blender/blenkernel/BKE_anim.h
+++ b/source/blender/blenkernel/BKE_anim.h
@@ -51,7 +51,7 @@ typedef struct DupliObject {
 void free_path(struct Path *path);
 void calc_curvepath(struct Object *ob);
 int interval_test(int min, int max, int p1, int cycl);
-int where_on_path(struct Object *ob, float ctime, float *vec, float *dir);
+int where_on_path(struct Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius);
 
 struct ListBase *object_duplilist(struct Scene *sce, struct Object *ob);
 void free_object_duplilist(struct ListBase *lb);
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 4b1cc36edeb..8cb88cdb786 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -87,15 +87,16 @@ void free_path(Path *path)
 void calc_curvepath(Object *ob)
 {
 	BevList *bl;
-	BevPoint *bevp, *bevpn, *bevpfirst, *bevplast, *tempbevp;
+	BevPoint *bevp, *bevpn, *bevpfirst, *bevplast;
+	PathPoint *pp;
 	Curve *cu;
 	Nurb *nu;
 	Path *path;
 	float *fp, *dist, *maxdist, xyz[3];
 	float fac, d=0, fac1, fac2;
 	int a, tot, cycl=0;
-	float *ft;
 	
+
 	/* in a path vertices are with equal differences: path->len = number of verts */
 	/* NOW WITH BEVELCURVE!!! */
 	
@@ -145,7 +146,7 @@ void calc_curvepath(Object *ob)
 
 		/* the path verts  in path->data */
 		/* now also with TILT value */
-	ft= path->data = (float *)MEM_callocN(16*path->len, "pathdata");
+	pp= path->data = (PathPoint *)MEM_callocN(sizeof(PathPoint)*4*path->len, "pathdata"); // XXX - why *4? - in 2.4x each element was 4 and the size was 16, so better leave for now - Campbell
 	
 	bevp= bevpfirst;
 	bevpn= bevp+1;
@@ -175,10 +176,13 @@ void calc_curvepath(Object *ob)
 		fac1= fac2/fac1;
 		fac2= 1.0f-fac1;
 
-		VecLerpf(ft, bevp->vec, bevpn->vec, fac2);
-		ft[3]= fac1*bevp->alfa+ fac2*(bevpn)->alfa;
+		VecLerpf(pp->vec, bevp->vec, bevpn->vec, fac2);
+		pp->vec[3]= fac1*bevp->alfa + fac2*bevpn->alfa;
+		pp->radius= fac1*bevp->radius + fac2*bevpn->radius;
+		QuatInterpol(pp->quat, bevp->quat, bevpn->quat, fac2);
+		NormalQuat(pp->quat);
 		
-		ft+= 4;
+		pp++;
 	}
 	
 	MEM_freeN(dist);
@@ -202,13 +206,14 @@ int interval_test(int min, int max, int p1, int cycl)
 
 /* warning, *vec needs FOUR items! */
 /* ctime is normalized range <0-1> */
-int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK */
+int where_on_path(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius)	/* returns OK */
 {
 	Curve *cu;
 	Nurb *nu;
 	BevList *bl;
 	Path *path;
-	float *fp, *p0, *p1, *p2, *p3, fac;
+	PathPoint *pp, *p0, *p1, *p2, *p3;
+	float fac;
 	float data[4];
 	int cycl=0, s0, s1, s2, s3;
 
@@ -219,7 +224,7 @@ int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK
 		return 0;
 	}
 	path= cu->path;
-	fp= path->data;
+	pp= path->data;
 	
 	/* test for cyclic */
 	bl= cu->bev.first;
@@ -238,19 +243,19 @@ int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK
 	s2= interval_test(0, path->len-1-cycl, s1+1, cycl);
 	s3= interval_test(0, path->len-1-cycl, s1+2, cycl);
 
-	p0= fp + 4*s0;
-	p1= fp + 4*s1;
-	p2= fp + 4*s2;
-	p3= fp + 4*s3;
+	p0= pp + s0;
+	p1= pp + s1;
+	p2= pp + s2;
+	p3= pp + s3;
 
 	/* note, commented out for follow constraint */
 	//if(cu->flag & CU_FOLLOW) {
 		
 		key_curve_tangent_weights(1.0f-fac, data, KEY_BSPLINE);
 		
-		dir[0]= data[0]*p0[0] + data[1]*p1[0] + data[2]*p2[0] + data[3]*p3[0] ;
-		dir[1]= data[0]*p0[1] + data[1]*p1[1] + data[2]*p2[1] + data[3]*p3[1] ;
-		dir[2]= data[0]*p0[2] + data[1]*p1[2] + data[2]*p2[2] + data[3]*p3[2] ;
+		dir[0]= data[0]*p0->vec[0] + data[1]*p1->vec[0] + data[2]*p2->vec[0] + data[3]*p3->vec[0] ;
+		dir[1]= data[0]*p0->vec[1] + data[1]*p1->vec[1] + data[2]*p2->vec[1] + data[3]*p3->vec[1] ;
+		dir[2]= data[0]*p0->vec[2] + data[1]*p1->vec[2] + data[2]*p2->vec[2] + data[3]*p3->vec[2] ;
 		
 		/* make compatible with vectoquat */
 		dir[0]= -dir[0];
@@ -266,11 +271,30 @@ int where_on_path(Object *ob, float ctime, float *vec, float *dir)	/* returns OK
 	else if(s0==s1 || p2==p3) key_curve_position_weights(1.0f-fac, data, KEY_CARDINAL);
 	else key_curve_position_weights(1.0f-fac, data, KEY_BSPLINE);
 
-	vec[0]= data[0]*p0[0] + data[1]*p1[0] + data[2]*p2[0] + data[3]*p3[0] ;
-	vec[1]= data[0]*p0[1] + data[1]*p1[1] + data[2]*p2[1] + data[3]*p3[1] ;
-	vec[2]= data[0]*p0[2] + data[1]*p1[2] + data[2]*p2[2] + data[3]*p3[2] ;
+	vec[0]= data[0]*p0->vec[0] + data[1]*p1->vec[0] + data[2]*p2->vec[0] + data[3]*p3->vec[0] ; /* X */
+	vec[1]= data[0]*p0->vec[1] + data[1]*p1->vec[1] + data[2]*p2->vec[1] + data[3]*p3->vec[1] ; /* Y */
+	vec[2]= data[0]*p0->vec[2] + data[1]*p1->vec[2] + data[2]*p2->vec[2] + data[3]*p3->vec[2] ; /* Z */
+	vec[3]= data[0]*p0->vec[3] + data[1]*p1->vec[3] + data[2]*p2->vec[3] + data[3]*p3->vec[3] ; /* Tilt, should not be needed since we have quat still used */
+	/* Need to verify the quat interpolation is correct - XXX */
 
-	vec[3]= data[0]*p0[3] + data[1]*p1[3] + data[2]*p2[3] + data[3]*p3[3] ;
+	if (quat) {
+		float totfac, q1[4], q2[4];
+
+		totfac= data[0]+data[1];
+		QuatInterpol(q1, p0->quat, p1->quat, data[0] / totfac);
+		NormalQuat(q1);
+
+		totfac= data[2]+data[3];
+		QuatInterpol(q2, p2->quat, p3->quat, data[2] / totfac);
+		NormalQuat(q2);
+
+		totfac = data[0]+data[1]+data[2]+data[3];
+		QuatInterpol(quat, q1, q2, (data[0]+data[1]) / totfac);
+		NormalQuat(quat);
+	}
+
+	if(radius)
+		*radius= data[0]*p0->radius + data[1]*p1->radius + data[2]*p2->radius + data[3]*p3->radius;
 
 	return 1;
 }
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index dfbcc51a93c..6ab9f5844b1 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1174,7 +1174,7 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 		 */
 		
 		/* only happens on reload file, but violates depsgraph still... fix! */
-		if (cu->path==NULL || cu->path->data==NULL) 
+		if (cu->path==NULL || cu->path->data==NULL)
 			makeDispListCurveTypes(cob->scene, ct->tar, 0);
 		
 		if (cu->path && cu->path->data) {
@@ -1196,7 +1196,7 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 				curvetime= data->offset; // XXX might need a more sensible value
 			}
 			
-			if ( where_on_path(ct->tar, curvetime, vec, dir) ) {
+			if ( where_on_path(ct->tar, curvetime, vec, dir, NULL, NULL) ) {
 				if (data->followflag & FOLLOWPATH_FOLLOW) {
 					vectoquat(dir, (short) data->trackflag, (short) data->upflag, quat);
 					
@@ -2864,7 +2864,7 @@ static void clampto_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstrain
 		 */
 		
 		/* only happens on reload file, but violates depsgraph still... fix! */
-		if (cu->path==NULL || cu->path->data==NULL) 
+		if (cu->path==NULL || cu->path->data==NULL)
 			makeDispListCurveTypes(cob->scene, ct->tar, 0);
 	}
 	
@@ -2975,7 +2975,7 @@ static void clampto_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 			}
 			
 			/* 3. position on curve */
-			if (where_on_path(ct->tar, curvetime, vec, dir) ) {
+			if (where_on_path(ct->tar, curvetime, vec, dir, NULL, NULL) ) {
 				Mat4One(totmat);
 				VECCOPY(totmat[3], vec);
 				
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 5ce021e3931..411b2448dea 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1039,8 +1039,8 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode)
 
 				/* calc the right loc AND the right rot separately */
 				/* vec, tvec need 4 items */
-				where_on_path(cu->textoncurve, ctime, vec, tvec);
-				where_on_path(cu->textoncurve, ctime+dtime, tvec, rotvec);
+				where_on_path(cu->textoncurve, ctime, vec, tvec, NULL, NULL);
+				where_on_path(cu->textoncurve, ctime+dtime, tvec, rotvec, NULL, NULL);
 				
 				VecMulf(vec, sizefac);
 				
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 801511de532..e2c2723d036 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -472,7 +472,7 @@ static void init_curve_deform(Object *par, Object *ob, CurveDeform *cd, int dloc
 }
 
 /* this makes sure we can extend for non-cyclic. *vec needs 4 items! */
-static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)	/* returns OK */
+static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius)	/* returns OK */
 {
 	Curve *cu= ob->data;
 	BevList *bl;
@@ -490,21 +490,25 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)
 	else ctime1= ctime;
 	
 	/* vec needs 4 items */
-	if(where_on_path(ob, ctime1, vec, dir)) {
+	if(where_on_path(ob, ctime1, vec, dir, quat, radius)) {
 		
 		if(cycl==0) {
 			Path *path= cu->path;
 			float dvec[3];
 			
 			if(ctime < 0.0) {
-				VecSubf(dvec, path->data+4, path->data);
+				VecSubf(dvec, path->data[1].vec, path->data[0].vec);
 				VecMulf(dvec, ctime*(float)path->len);
 				VECADD(vec, vec, dvec);
+				if(quat) QUATCOPY(quat, path->data[0].quat);
+				if(radius) *radius= path->data[0].radius;
 			}
 			else if(ctime > 1.0) {
-				VecSubf(dvec, path->data+4*path->len-4, path->data+4*path->len-8);
+				VecSubf(dvec, path->data[path->len-1].vec, path->data[path->len-2].vec);
 				VecMulf(dvec, (ctime-1.0)*(float)path->len);
 				VECADD(vec, vec, dvec);
+				if(quat) QUATCOPY(quat, path->data[path->len-1].quat);
+				if(radius) *radius= path->data[path->len-1].radius;
 			}
 		}
 		return 1;
@@ -575,7 +579,7 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
 	}
 #endif // XXX old animation system
 	
-	if( where_on_path_deform(par, fac, loc, dir)) {	/* returns OK */
+	if( where_on_path_deform(par, fac, loc, dir, NULL, NULL)) {	/* returns OK */
 		float q[4], mat[3][3], quat[4];
 		
 		if(cd->no_rot_axis)	/* set by caller */
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index a0004aaae49..f04512cffc9 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1114,7 +1114,7 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys)
 	}
 
 	if(psys->clmd) {
-		ClothModifierData *nclmd = modifier_new(eModifierType_Cloth);
+		ClothModifierData *nclmd = (ClothModifierData *)modifier_new(eModifierType_Cloth);
 		modifier_copyData((ModifierData*)psys->clmd, (ModifierData*)nclmd);
 		psys->hair_in_dm = psys->hair_out_dm = NULL;
 	}
@@ -1694,7 +1694,7 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[][4])
 	
 	
 	/* vec: 4 items! */
- 	if( where_on_path(par, ctime, vec, dir) ) {
+ 	if( where_on_path(par, ctime, vec, dir, NULL, NULL) ) {
 
 		if(cu->flag & CU_FOLLOW) {
 			vectoquat(dir, ob->trackflag, ob->upflag, quat);
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 964201ccb26..404203c4508 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -60,6 +60,7 @@
 #include "BKE_anim.h"
 
 #include "BKE_boids.h"
+#include "BKE_cloth.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_lattice.h"
@@ -1974,9 +1975,9 @@ int do_guide(Scene *scene, ParticleKey *state, int pa_num, float time, ListBase
 					}
 
 					if(pd->flag & PFIELD_GUIDE_PATH_ADD)
-						where_on_path(eob, f_force*guidetime, guidevec, guidedir);
+						where_on_path(eob, f_force*guidetime, guidevec, guidedir, NULL, NULL);
 					else
-						where_on_path(eob, guidetime, guidevec, guidedir);
+						where_on_path(eob, guidetime, guidevec, guidedir, NULL, NULL);
 
 					Mat4MulVecfl(ec->ob->obmat,guidevec);
 					Mat4Mul3Vecfl(ec->ob->obmat,guidedir);
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 88b85bcfa29..3796e3e0ba5 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2536,7 +2536,7 @@ static void precalc_effectors(Scene *scene, Object *ob, ParticleSystem *psys, Pa
 			&& part->phystype!=PART_PHYS_BOIDS) {
 			float vec[4];
 
-			where_on_path(ec->ob, 0.0, vec, vec2);
+			where_on_path(ec->ob, 0.0, vec, vec2, NULL, NULL);
 
 			Mat4MulVecfl(ec->ob->obmat,vec);
 			Mat4Mul3Vecfl(ec->ob->obmat,vec2);
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index fe5541211ce..af79fd74ae8 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -38,6 +38,7 @@
 #include <float.h>
 #include <math.h>
 #include "stdio.h"
+#include "string.h" /* memset */
 
 #include "BLI_linklist.h"
 #include "BLI_rand.h"
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 8eb4d5972e3..40076755fa0 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -299,7 +299,7 @@ void Mat3MulMat3(float *m1, float *m3, float *m2);
 #endif
 void Mat4MulMat34(float (*m1)[4], float (*m3)[3], float (*m2)[4]);
 void Mat4CpyMat4(float m1[][4], float m2[][4]);
-void Mat4SwapMat4(float *m1, float *m2);
+void Mat4SwapMat4(float m1[][4], float m2[][4]);
 void Mat3CpyMat3(float m1[][3], float m2[][3]);
 
 void Mat3MulSerie(float answ[][3],
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index f0dba4255ad..9a05cd75ad0 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -614,17 +614,17 @@ void Mat4CpyMat4(float m1[][4], float m2[][4])
 	memcpy(m1, m2, 4*4*sizeof(float));
 }
 
-void Mat4SwapMat4(float *m1, float *m2)
+void Mat4SwapMat4(float m1[][4], float m2[][4])
 {
 	float t;
-	int i;
+	int i, j;
 
-	for(i=0;i<16;i++) {
-		t= *m1;
-		*m1= *m2;
-		*m2= t;
-		m1++; 
-		m2++;
+	for(i = 0; i < 4; i++) {
+		for (j = 0; j < 4; j++) {
+			t        = m1[i][j];
+			m1[i][j] = m2[i][j];
+			m2[i][j] = t;
+		}
 	}
 }
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 69bc8e1f67e..e886bbbd5f2 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -4546,13 +4546,13 @@ static void draw_forcefield(Scene *scene, Object *ob)
 
 			/*path end*/
 			setlinestyle(3);
-			where_on_path(ob, 1.0f, guidevec1, guidevec2);
+			where_on_path(ob, 1.0f, guidevec1, guidevec2, NULL, NULL);
 			UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
 			drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
 
 			/*path beginning*/
 			setlinestyle(0);
-			where_on_path(ob, 0.0f, guidevec1, guidevec2);
+			where_on_path(ob, 0.0f, guidevec1, guidevec2, NULL, NULL);
 			UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
 			drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
 			
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 013491187ae..8473f91a7f7 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -49,12 +49,21 @@ struct AnimData;
 struct SelBox;
 struct EditFont;
 
+/* These two Lines with # tell makesdna this struct can be excluded. */
+#
+#
+typedef struct PathPoint {
+	float vec[4]; /* grr, cant get rid of tilt yet */
+	float quat[4];
+	float radius;
+} PathPoint;
+
 /* These two Lines with # tell makesdna this struct can be excluded. */
 #
 #
 typedef struct Path {
 	int len;
-	float *data;
+	struct PathPoint *data;
 	float totdist;
 } Path;
 

From f130f16fef38d40ee492ccb4ff1ad0708329ae3c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 Sep 2009 16:25:49 +0000
Subject: [PATCH 538/577] Use curve radius for paths - use_radius option, off
 by default for 2.4x files, on by default on new curves. - curve deform
 modifiers (think tentacles) - follow path (parent mode and constraint) -
 curve guides - added back Alt+S to scale point radius - Mat3Scale and
 Mat4Scale arithb.c functions to make a new uniform scale matrix.

- TODO, effectors, looks like they have no way to scale from the radius yet.
---
 release/ui/buttons_data_curve.py              |  1 +
 release/ui/buttons_object_constraint.py       |  7 ++--
 source/blender/blenkernel/intern/constraint.c | 33 +++++++++++++------
 source/blender/blenkernel/intern/curve.c      |  2 +-
 source/blender/blenkernel/intern/lattice.c    | 13 ++++++--
 source/blender/blenkernel/intern/object.c     | 11 +++++--
 source/blender/blenkernel/intern/particle.c   | 16 +++++----
 .../blenkernel/intern/particle_system.c       |  6 ++--
 source/blender/blenlib/BLI_arithb.h           |  3 ++
 source/blender/blenlib/intern/arithb.c        | 20 +++++++++++
 source/blender/editors/curve/curve_ops.c      |  1 +
 .../blender/makesdna/DNA_constraint_types.h   |  1 +
 source/blender/makesdna/DNA_curve_types.h     |  1 +
 .../blender/makesrna/intern/rna_constraint.c  |  9 +++--
 source/blender/makesrna/intern/rna_curve.c    |  5 +++
 15 files changed, 99 insertions(+), 30 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 010acd1479d..1a5e56b02a4 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -142,6 +142,7 @@ class DATA_PT_pathanim(DataButtonsPanelCurve):
 
 		col = split.column()
 		col.itemR(curve, "use_stretch")
+		col.itemR(curve, "use_radius")
 		col.itemR(curve, "use_time_offset", text="Offset Children")
 	
 class DATA_PT_active_spline(DataButtonsPanelActive):
diff --git a/release/ui/buttons_object_constraint.py b/release/ui/buttons_object_constraint.py
index ff3231a9d61..c8f7e467a18 100644
--- a/release/ui/buttons_object_constraint.py
+++ b/release/ui/buttons_object_constraint.py
@@ -124,11 +124,12 @@ class ConstraintButtonsPanel(bpy.types.Panel):
 		split = layout.split()
 		
 		col = split.column()
-		col.itemR(con, "curve_follow")
+		col.itemR(con, "use_curve_follow")
+		col.itemR(con, "use_curve_radius")
 		
 		col = split.column()
-		col.itemR(con, "fixed_position")
-		if con.fixed_position:
+		col.itemR(con, "use_fixed_position")
+		if con.use_fixed_position:
 			col.itemR(con, "offset_percentage", text="Offset")
 		else:
 			col.itemR(con, "offset")
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 6ab9f5844b1..e5c0b3947de 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1162,7 +1162,7 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 	
 	if (VALID_CONS_TARGET(ct)) {
 		Curve *cu= ct->tar->data;
-		float q[4], vec[4], dir[3], quat[4], x1;
+		float q[4], vec[4], dir[3], quat[4], radius, x1;
 		float totmat[4][4];
 		float curvetime;
 		
@@ -1196,7 +1196,7 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 				curvetime= data->offset; // XXX might need a more sensible value
 			}
 			
-			if ( where_on_path(ct->tar, curvetime, vec, dir, NULL, NULL) ) {
+			if ( where_on_path(ct->tar, curvetime, vec, dir, NULL, &radius) ) {
 				if (data->followflag & FOLLOWPATH_FOLLOW) {
 					vectoquat(dir, (short) data->trackflag, (short) data->upflag, quat);
 					
@@ -1210,6 +1210,14 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 					
 					QuatToMat4(quat, totmat);
 				}
+
+				if (data->followflag & FOLLOWPATH_RADIUS) {
+					float tmat[4][4], rmat[4][4];
+					Mat4Scale(tmat, radius);
+					Mat4MulMat4(rmat, totmat, tmat);
+					Mat4CpyMat4(totmat, rmat);
+				}
+
 				VECCOPY(totmat[3], vec);
 				
 				Mat4MulSerie(ct->matrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1227,7 +1235,8 @@ static void followpath_evaluate (bConstraint *con, bConstraintOb *cob, ListBase
 	/* only evaluate if there is a target */
 	if (VALID_CONS_TARGET(ct)) {
 		float obmat[4][4];
-		float size[3], obsize[3];
+		float size[3];
+		bFollowPathConstraint *data= con->data;
 		
 		/* get Object local transform (loc/rot/size) to determine transformation from path */
 		//object_to_mat4(ob, obmat);
@@ -1240,13 +1249,17 @@ static void followpath_evaluate (bConstraint *con, bConstraintOb *cob, ListBase
 		Mat4MulSerie(cob->matrix, ct->matrix, obmat, NULL, NULL, NULL, NULL, NULL, NULL);
 		
 		/* un-apply scaling caused by path */
-		Mat4ToSize(cob->matrix, obsize);
-		if (obsize[0])
-			VecMulf(cob->matrix[0], size[0] / obsize[0]);
-		if (obsize[1])
-			VecMulf(cob->matrix[1], size[1] / obsize[1]);
-		if (obsize[2])
-			VecMulf(cob->matrix[2], size[2] / obsize[2]);
+		if ((data->followflag & FOLLOWPATH_RADIUS)==0) { /* XXX - assume that scale correction means that radius will have some scale error in it - Campbell */
+			float obsize[3];
+
+			Mat4ToSize(cob->matrix, obsize);
+			if (obsize[0])
+				VecMulf(cob->matrix[0], size[0] / obsize[0]);
+			if (obsize[1])
+				VecMulf(cob->matrix[1], size[1] / obsize[1]);
+			if (obsize[2])
+				VecMulf(cob->matrix[2], size[2] / obsize[2]);
+		}
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 2b8c91fcbed..eec3cb73d8a 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -136,7 +136,7 @@ Curve *add_curve(char *name, int type)
 	cu= alloc_libblock(&G.main->curve, ID_CU, name);
 	
 	cu->size[0]= cu->size[1]= cu->size[2]= 1.0;
-	cu->flag= CU_FRONT+CU_BACK;
+	cu->flag= CU_FRONT|CU_BACK|CU_PATH_RADIUS;
 	cu->pathlen= 100;
 	cu->resolu= cu->resolv= 12;
 	cu->width= 1.0;
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index e2c2723d036..730a12bea09 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -524,7 +524,7 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir,
 static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, CurveDeform *cd, float *quatp)
 {
 	Curve *cu= par->data;
-	float fac, loc[4], dir[3], cent[3];
+	float fac, loc[4], dir[3], cent[3], radius;
 	short upflag, index;
 	
 	if(axis==MOD_CURVE_POSX || axis==MOD_CURVE_NEGX) {
@@ -579,7 +579,7 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
 	}
 #endif // XXX old animation system
 	
-	if( where_on_path_deform(par, fac, loc, dir, NULL, NULL)) {	/* returns OK */
+	if( where_on_path_deform(par, fac, loc, dir, NULL, &radius)) {	/* returns OK */
 		float q[4], mat[3][3], quat[4];
 		
 		if(cd->no_rot_axis)	/* set by caller */
@@ -599,7 +599,14 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
 			QuatMul(quat, q, quat);
 		}		
 		QuatToMat3(quat, mat);
-	
+
+		if(cu->flag & CU_PATH_RADIUS) {
+			float tmat[3][3], rmat[3][3];
+			Mat3Scale(tmat, radius);
+			Mat3MulMat3(rmat, mat, tmat);
+			Mat3CpyMat3(mat, rmat);
+		}
+
 		/* local rotation */
 		Mat3MulVecfl(mat, cent);
 		
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f04512cffc9..8fe7beeb247 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1646,7 +1646,7 @@ int enable_cu_speed= 1;
 static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[][4])
 {
 	Curve *cu;
-	float q[4], vec[4], dir[3], quat[4], x1, ctime;
+	float q[4], vec[4], dir[3], quat[4], radius, x1, ctime;
 	float timeoffs = 0.0, sf_orig = 0.0;
 	
 	Mat4One(mat);
@@ -1694,7 +1694,7 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[][4])
 	
 	
 	/* vec: 4 items! */
- 	if( where_on_path(par, ctime, vec, dir, NULL, NULL) ) {
+ 	if( where_on_path(par, ctime, vec, dir, NULL, &radius) ) {
 
 		if(cu->flag & CU_FOLLOW) {
 			vectoquat(dir, ob->trackflag, ob->upflag, quat);
@@ -1711,6 +1711,13 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[][4])
 			QuatToMat4(quat, mat);
 		}
 		
+		if(cu->flag & CU_PATH_RADIUS) {
+			float tmat[4][4], rmat[4][4];
+			Mat4Scale(tmat, radius);
+			Mat4MulMat4(rmat, mat, tmat);
+			Mat4CpyMat4(mat, rmat);
+		}
+
 		VECCOPY(mat[3], vec);
 		
 	}
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 404203c4508..2d3e3210afc 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1932,7 +1932,7 @@ int do_guide(Scene *scene, ParticleKey *state, int pa_num, float time, ListBase
 	ParticleKey key, par;
 
 	float effect[3]={0.0,0.0,0.0}, distance, f_force, mindist, totforce=0.0;
-	float guidevec[4], guidedir[3], rot2[4], temp[3], angle, pa_loc[3], pa_zero[3]={0.0f,0.0f,0.0f};
+	float guidevec[4], guidedir[3], rot2[4], radius, temp[3], angle, pa_loc[3], pa_zero[3]={0.0f,0.0f,0.0f};
 	float veffect[3]={0.0,0.0,0.0}, guidetime;
 
 	effect[0]=effect[1]=effect[2]=0.0;
@@ -1975,9 +1975,9 @@ int do_guide(Scene *scene, ParticleKey *state, int pa_num, float time, ListBase
 					}
 
 					if(pd->flag & PFIELD_GUIDE_PATH_ADD)
-						where_on_path(eob, f_force*guidetime, guidevec, guidedir, NULL, NULL);
+						where_on_path(eob, f_force*guidetime, guidevec, guidedir, NULL, &radius);
 					else
-						where_on_path(eob, guidetime, guidevec, guidedir, NULL, NULL);
+						where_on_path(eob, guidetime, guidevec, guidedir, NULL, &radius);
 
 					Mat4MulVecfl(ec->ob->obmat,guidevec);
 					Mat4Mul3Vecfl(ec->ob->obmat,guidedir);
@@ -2007,10 +2007,12 @@ int do_guide(Scene *scene, ParticleKey *state, int pa_num, float time, ListBase
 					/* curve taper */
 					if(cu->taperobj)
 						VecMulf(pa_loc, calc_taper(scene, cu->taperobj, (int)(f_force*guidetime*100.0), 100));
-					/* TODO */
-					//else{
-					///* curve size*/
-					//}
+
+					else{ /* curve size*/
+						if(cu->flag & CU_PATH_RADIUS) {
+							VecMulf(pa_loc, radius);
+						}
+					}
 					par.co[0]=par.co[1]=par.co[2]=0.0f;
 					VECCOPY(key.co,pa_loc);
 					do_prekink(&key, &par, 0, guidetime, pd->kink_freq, pd->kink_shape, pd->kink_amp, pd->kink, pd->kink_axis, 0);
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 3796e3e0ba5..fb12cfe3147 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2526,7 +2526,7 @@ static void precalc_effectors(Scene *scene, Object *ob, ParticleSystem *psys, Pa
 	ParticleSettings *part=psys->part;
 	PARTICLE_P;
 	int totpart;
-	float vec2[3],loc[3],*co=0;
+	float vec2[3],loc[3],radius,*co=0;
 	
 	for(ec= lb->first; ec; ec= ec->next) {
 		PartDeflect *pd= ec->ob->pd;
@@ -2536,7 +2536,7 @@ static void precalc_effectors(Scene *scene, Object *ob, ParticleSystem *psys, Pa
 			&& part->phystype!=PART_PHYS_BOIDS) {
 			float vec[4];
 
-			where_on_path(ec->ob, 0.0, vec, vec2, NULL, NULL);
+			where_on_path(ec->ob, 0.0, vec, vec2, NULL, &radius);
 
 			Mat4MulVecfl(ec->ob->obmat,vec);
 			Mat4Mul3Vecfl(ec->ob->obmat,vec2);
@@ -2544,6 +2544,8 @@ static void precalc_effectors(Scene *scene, Object *ob, ParticleSystem *psys, Pa
 			QUATCOPY(ec->firstloc,vec);
 			VECCOPY(ec->firstdir,vec2);
 
+			/* TODO - use 'radius' to adjust the effector */
+
 			totpart=psys->totpart;
 
 			if(totpart){
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 40076755fa0..c2d707f60f0 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -320,6 +320,9 @@ void Mat3Clr(float *m);
 void Mat3One(float m[][3]);
 void Mat4One(float m[][4]);
 
+void Mat3Scale(float m[][3], float scale);
+void Mat4Scale(float m[][4], float scale);
+
 void Mat3Ortho(float mat[][3]);
 void Mat4Ortho(float mat[][4]);
 
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 9a05cd75ad0..9e769e19674 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -854,6 +854,26 @@ void Mat3One(float m[][3])
 	m[2][0]= m[2][1]= 0.0;
 }
 
+void Mat4Scale(float m[][4], float scale)
+{
+
+	m[0][0]= m[1][1]= m[2][2]= scale;
+	m[3][3]= 1.0;
+	m[0][1]= m[0][2]= m[0][3]= 0.0;
+	m[1][0]= m[1][2]= m[1][3]= 0.0;
+	m[2][0]= m[2][1]= m[2][3]= 0.0;
+	m[3][0]= m[3][1]= m[3][2]= 0.0;
+}
+
+void Mat3Scale(float m[][3], float scale)
+{
+
+	m[0][0]= m[1][1]= m[2][2]= scale;
+	m[0][1]= m[0][2]= 0.0;
+	m[1][0]= m[1][2]= 0.0;
+	m[2][0]= m[2][1]= 0.0;
+}
+
 void Mat4MulVec( float mat[][4], int *vec)
 {
 	int x,y;
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index a242e424aa0..8a90dace40b 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -234,6 +234,7 @@ void ED_keymap_curve(wmWindowManager *wm)
 
 	WM_keymap_add_item(keymap, "CURVE_OT_tilt_clear", TKEY, KM_PRESS, KM_ALT, 0);
 	RNA_enum_set(WM_keymap_add_item(keymap, "TFM_OT_transform", TKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", TFM_TILT);
+	RNA_enum_set(WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", TFM_CURVE_SHRINKFATTEN);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", 1);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, 0, 0)->ptr, "type", 3);
 	RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", VKEY, KM_PRESS, 0, 0)->ptr, "type", 2);
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index a92dc836197..70430af3fc8 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -453,6 +453,7 @@ typedef enum B_CONSTRAINTCHANNEL_FLAG {
 /* FollowPath flags */
 #define FOLLOWPATH_FOLLOW	0x01
 #define FOLLOWPATH_STATIC	0x02
+#define FOLLOWPATH_RADIUS	0x04
 
 /* bTrackToConstraint->flags */
 #define TARGET_Z_UP 0x01
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 8473f91a7f7..109a9528de2 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -242,6 +242,7 @@ typedef struct Curve {
 #define CU_FAST			512 /* Font: no filling inside editmode */
 #define CU_RETOPO               1024
 #define CU_DS_EXPAND	2048
+#define CU_PATH_RADIUS	4096 /* make use of the path radius if this is enabled (default for new curves) */
 
 /* twist mode */
 #define CU_TWIST_Z_UP			0
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index 83f3042d8ee..815023ee315 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -893,16 +893,21 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Up Axis", "Axis that points upward.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
 
-	prop= RNA_def_property(srna, "curve_follow", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_curve_follow", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "followflag", FOLLOWPATH_FOLLOW);
 	RNA_def_property_ui_text(prop, "Follow Curve", "Object will follow the heading and banking of the curve.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
 	
 		// TODO: do we need to do some special trickery to get offset sane for this?
-	prop= RNA_def_property(srna, "fixed_position", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_fixed_position", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "followflag", FOLLOWPATH_STATIC);
 	RNA_def_property_ui_text(prop, "Fixed Position", "Object will stay locked to a single point somewhere along the length of the curve regardless of time.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
+
+	prop= RNA_def_property(srna, "use_curve_radius", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "followflag", FOLLOWPATH_RADIUS);
+	RNA_def_property_ui_text(prop, "Curve Radius", "Objects scale by the curve radius.");
+	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
 }
 
 static void rna_def_constraint_stretch_to(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index d09546231d5..da4abe81f24 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -426,6 +426,11 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_OFFS_PATHDIST);
 	RNA_def_property_ui_text(prop, "Offset Path Distance", "Children will use TimeOffs value as path distance offset.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+
+	prop= RNA_def_property(srna, "use_radius", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_PATH_RADIUS);
+	RNA_def_property_ui_text(prop, "Radius", "Option for paths: apply the curve radius with path following it and deforming.");
+	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 }
 
 static void rna_def_nurbs(BlenderRNA *brna, StructRNA *srna)

From f9eb93bc7bd8351864cc4787953e2faf7d4cfd30 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 Sep 2009 17:16:12 +0000
Subject: [PATCH 539/577] many docstrings from Ron Walker and Luca (mindrones
 on IRC), only did a spot check on these, may need adjusting later.

---
 source/blender/editors/curve/editfont.c       |  17 +++
 source/blender/editors/metaball/mball_edit.c  |   7 +
 .../blender/editors/object/object_lattice.c   |   2 +
 .../blender/editors/sculpt_paint/paint_ops.c  |   1 +
 .../editors/sculpt_paint/paint_utils.c        |   1 +
 .../editors/space_buttons/buttons_ops.c       |  29 +++-
 .../editors/space_sequencer/sequencer_add.c   |   2 +-
 .../space_sequencer/sequencer_buttons.c       |   1 +
 .../editors/space_sequencer/sequencer_edit.c  |  52 +++++---
 .../space_sequencer/sequencer_select.c        |  20 ++-
 source/blender/editors/space_text/text_ops.c  | 124 +++++++++---------
 source/blender/editors/space_time/time_ops.c  |   2 +
 .../editors/space_view3d/view3d_buttons.c     |   2 +-
 .../editors/space_view3d/view3d_view.c        |   1 +
 .../editors/uvedit/uvedit_unwrap_ops.c        |   1 +
 source/blender/windowmanager/intern/wm_jobs.c |   1 +
 .../windowmanager/intern/wm_operators.c       |  26 +++-
 17 files changed, 191 insertions(+), 98 deletions(-)

diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index ae34f30a4f1..a9736f3f88d 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -317,6 +317,7 @@ void FONT_OT_insert_lorem(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Insert Lorem";
+    ot->description= "Insert placeholder text.";
 	ot->idname= "FONT_OT_insert_lorem";
 	
 	/* api callbacks */
@@ -404,6 +405,7 @@ void FONT_OT_file_paste(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste File";
+    ot->description= "Paste contents from file.";
 	ot->idname= "FONT_OT_file_paste";
 	
 	/* api callbacks */
@@ -452,6 +454,7 @@ void FONT_OT_buffer_paste(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste Buffer";
+    ot->description= "Paste text from OS buffer.";
 	ot->idname= "FONT_OT_buffer_paste";
 	
 	/* api callbacks */
@@ -648,6 +651,7 @@ void FONT_OT_style_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Style";
+    ot->description= "Set font style.";
 	ot->idname= "FONT_OT_style_set";
 	
 	/* api callbacks */
@@ -685,6 +689,7 @@ void FONT_OT_style_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Toggle Style";
+    ot->description= "Toggle font style.";
 	ot->idname= "FONT_OT_style_toggle";
 	
 	/* api callbacks */
@@ -727,6 +732,7 @@ void FONT_OT_text_copy(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Copy Text";
+    ot->description= "Copy selected text to clipboard.";
 	ot->idname= "FONT_OT_text_copy";
 	
 	/* api callbacks */
@@ -757,6 +763,7 @@ void FONT_OT_text_cut(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Cut Text";
+    ot->description= "Cut selected text to clipboard.";
 	ot->idname= "FONT_OT_text_cut";
 	
 	/* api callbacks */
@@ -814,6 +821,7 @@ void FONT_OT_text_paste(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste Text";
+    ot->description= "Paste text from clipboard.";
 	ot->idname= "FONT_OT_text_paste";
 	
 	/* api callbacks */
@@ -949,6 +957,7 @@ void FONT_OT_move(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Cursor";
+    ot->description= "Move cursor to position type.";
 	ot->idname= "FONT_OT_move";
 	
 	/* api callbacks */
@@ -975,6 +984,7 @@ void FONT_OT_move_select(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Select";
+    ot->description= "Make selection from current cursor position to new cursor position type.";
 	ot->idname= "FONT_OT_move_select";
 	
 	/* api callbacks */
@@ -1016,6 +1026,7 @@ void FONT_OT_change_spacing(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Change Spacing";
+    ot->description= "Change font spacing.";
 	ot->idname= "FONT_OT_change_spacing";
 	
 	/* api callbacks */
@@ -1060,6 +1071,7 @@ void FONT_OT_change_character(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Change Character";
+    ot->description= "Change font character code.";
 	ot->idname= "FONT_OT_change_character";
 	
 	/* api callbacks */
@@ -1102,6 +1114,7 @@ void FONT_OT_line_break(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Line Break";
+    ot->description= "Insert line break at cursor position.";
 	ot->idname= "FONT_OT_line_break";
 	
 	/* api callbacks */
@@ -1191,6 +1204,7 @@ void FONT_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete";
+    ot->description= "Delete text by cursor position.";
 	ot->idname= "FONT_OT_delete";
 	
 	/* api callbacks */
@@ -1332,6 +1346,7 @@ void FONT_OT_text_insert(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Insert Text";
+    ot->description= "Insert text at cursor position.";
 	ot->idname= "FONT_OT_text_insert";
 	
 	/* api callbacks */
@@ -1467,6 +1482,7 @@ void FONT_OT_case_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Case";
+    ot->description= "Set font case.";
 	ot->idname= "FONT_OT_case_set";
 	
 	/* api callbacks */
@@ -1509,6 +1525,7 @@ void FONT_OT_case_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Toggle Case";
+    ot->description= "Toggle font case.";
 	ot->idname= "FONT_OT_case_toggle";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index 9ab985fb3fb..6ad7fbabfcb 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -223,6 +223,7 @@ void MBALL_OT_select_deselect_all_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select/Deselect All";
+    ot->description= "(de)select all metaelements.";
 	ot->idname= "MBALL_OT_select_deselect_all_metaelems";
 
 	/* callback functions */
@@ -261,6 +262,7 @@ void MBALL_OT_select_inverse_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Inverse";
+    ot->description= "Select inverse of (un)selected metaelements.";
 	ot->idname= "MBALL_OT_select_inverse_metaelems";
 
 	/* callback functions */
@@ -306,6 +308,7 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Random...";
+    ot->description= "Randomly select metaelements.";
 	ot->idname= "MBALL_OT_select_random_metaelems";
 	
 	/* callback functions */
@@ -364,6 +367,7 @@ void MBALL_OT_duplicate_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Duplicate";
+    ot->description= "Delete selected metaelement(s).";
 	ot->idname= "MBALL_OT_duplicate_metaelems";
 
 	/* callback functions */
@@ -409,6 +413,7 @@ void MBALL_OT_delete_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete";
+    ot->description= "Delete selected metaelement(s).";
 	ot->idname= "MBALL_OT_delete_metaelems";
 
 	/* callback functions */
@@ -458,6 +463,7 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Hide";
+    ot->description= "Hide (un)selected metaelement(s).";
 	ot->idname= "MBALL_OT_hide_metaelems";
 
 	/* callback functions */
@@ -498,6 +504,7 @@ void MBALL_OT_reveal_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Reveal";
+    ot->description= "Reveal all hidden metaelements.";
 	ot->idname= "MBALL_OT_reveal_metaelems";
 	
 	/* callback functions */
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index b35d3908b43..bd8171e8593 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -206,6 +206,7 @@ void LATTICE_OT_select_all_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select or Deselect All";
+    ot->description= "Toggle (de)select all UVW control points.";
 	ot->idname= "LATTICE_OT_select_all_toggle";
 	
 	/* api callbacks */
@@ -251,6 +252,7 @@ void LATTICE_OT_make_regular(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Make Regular";
+    ot->description= "Set UVW control points a uniform distance apart.";
 	ot->idname= "LATTICE_OT_make_regular";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index c38b36007e9..19b46f5a941 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -66,6 +66,7 @@ void BRUSH_OT_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Brush";
+    ot->description= "Add brush by mode type.";
 	ot->idname= "BRUSH_OT_add";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c
index 23bc119afb4..13fbd2179b8 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_utils.c
@@ -214,6 +214,7 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot)
 		{0, NULL, 0, NULL, NULL}};
 
 	ot->name= "Preset";
+    ot->description= "Set brush shape.";
 	ot->idname= "BRUSH_OT_curve_preset";
 
 	ot->exec= brush_curve_preset_exec;
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 176611377eb..481c2d6cfc3 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -106,6 +106,7 @@ void OBJECT_OT_material_slot_add(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Add Material Slot";
 	ot->idname= "OBJECT_OT_material_slot_add";
+	ot->description="Add a new material slot or duplicate the selected one.";
 	
 	/* api callbacks */
 	ot->exec= material_slot_add_exec;
@@ -132,6 +133,7 @@ void OBJECT_OT_material_slot_remove(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Remove Material Slot";
 	ot->idname= "OBJECT_OT_material_slot_remove";
+	ot->description="Remove the selected material slot.";
 	
 	/* api callbacks */
 	ot->exec= material_slot_remove_exec;
@@ -190,6 +192,7 @@ void OBJECT_OT_material_slot_assign(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Assign Material Slot";
 	ot->idname= "OBJECT_OT_material_slot_assign";
+	ot->description="Assign the material in the selected material slot to the selected vertices.";
 	
 	/* api callbacks */
 	ot->exec= material_slot_assign_exec;
@@ -273,6 +276,7 @@ void OBJECT_OT_material_slot_select(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select Material Slot";
 	ot->idname= "OBJECT_OT_material_slot_select";
+	ot->description="Select vertices assigned to the selected material slot.";
 	
 	/* api callbacks */
 	ot->exec= material_slot_select_exec;
@@ -291,6 +295,7 @@ void OBJECT_OT_material_slot_deselect(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Deselect Material Slot";
 	ot->idname= "OBJECT_OT_material_slot_deselect";
+	ot->description="Deselect vertices assigned to the selected material slot.";
 	
 	/* api callbacks */
 	ot->exec= material_slot_deselect_exec;
@@ -338,6 +343,7 @@ void MATERIAL_OT_new(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "New Material";
 	ot->idname= "MATERIAL_OT_new";
+	ot->description="Add a new material.";
 	
 	/* api callbacks */
 	ot->exec= new_material_exec;
@@ -390,6 +396,7 @@ void TEXTURE_OT_new(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "New Texture";
 	ot->idname= "TEXTURE_OT_new";
+	ot->description="Add a new texture.";
 	
 	/* api callbacks */
 	ot->exec= new_texture_exec;
@@ -426,6 +433,7 @@ void WORLD_OT_new(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "New World";
 	ot->idname= "WORLD_OT_new";
+	ot->description= "Add a new world.";
 	
 	/* api callbacks */
 	ot->exec= new_world_exec;
@@ -457,6 +465,7 @@ void OBJECT_OT_particle_system_add(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Add Particle System Slot";
 	ot->idname= "OBJECT_OT_particle_system_add";
+	ot->description="Add a particle system.";
 	
 	/* api callbacks */
 	ot->exec= particle_system_add_exec;
@@ -484,6 +493,7 @@ void OBJECT_OT_particle_system_remove(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Remove Particle System Slot";
 	ot->idname= "OBJECT_OT_particle_system_remove";
+	ot->description="Remove the selected particle system.";
 	
 	/* api callbacks */
 	ot->exec= particle_system_remove_exec;
@@ -541,6 +551,7 @@ void PARTICLE_OT_new(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "New Particle Settings";
 	ot->idname= "PARTICLE_OT_new";
+	ot->description="Add new particle settings.";
 	
 	/* api callbacks */
 	ot->exec= new_particle_settings_exec;
@@ -588,6 +599,7 @@ void PARTICLE_OT_new_target(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "New Particle Target";
 	ot->idname= "PARTICLE_OT_new_target";
+	ot->description="Add a new particle target.";
 	
 	/* api callbacks */
 	ot->exec= new_particle_target_exec;
@@ -635,6 +647,7 @@ void PARTICLE_OT_remove_target(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Remove Particle Target";
 	ot->idname= "PARTICLE_OT_remove_target";
+	ot->description="Remove the selected particle target.";
 	
 	/* api callbacks */
 	ot->exec= remove_particle_target_exec;
@@ -673,9 +686,9 @@ static int target_move_up_exec(bContext *C, wmOperator *op)
 void PARTICLE_OT_target_move_up(wmOperatorType *ot)
 {
 	ot->name= "Move Up Target";
-	ot->description= "Move particle target up in the list.";
 	ot->idname= "PARTICLE_OT_target_move_up";
-
+	ot->description= "Move particle target up in the list.";
+	
 	ot->exec= target_move_up_exec;
 	
 	/* flags */
@@ -711,9 +724,9 @@ static int target_move_down_exec(bContext *C, wmOperator *op)
 void PARTICLE_OT_target_move_down(wmOperatorType *ot)
 {
 	ot->name= "Move Down Target";
-	ot->description= "Move particle target down in the list.";
 	ot->idname= "PARTICLE_OT_target_move_down";
-
+	ot->description= "Move particle target down in the list.";
+	
 	ot->exec= target_move_down_exec;
 	
 	/* flags */
@@ -795,7 +808,7 @@ void PARTICLE_OT_disconnect_hair(wmOperatorType *ot)
 	ot->name= "Disconnect Hair";
 	ot->description= "Disconnect hair from the emitter mesh.";
 	ot->idname= "PARTICLE_OT_disconnect_hair";
-
+	
 	ot->exec= disconnect_hair_exec;
 	
 	/* flags */
@@ -930,7 +943,7 @@ void PARTICLE_OT_connect_hair(wmOperatorType *ot)
 	ot->name= "Connect Hair";
 	ot->description= "Connect hair to the emitter mesh.";
 	ot->idname= "PARTICLE_OT_connect_hair";
-
+	
 	ot->exec= connect_hair_exec;
 	
 	/* flags */
@@ -958,6 +971,7 @@ void SCENE_OT_render_layer_add(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Add Render Layer";
 	ot->idname= "SCENE_OT_render_layer_add";
+	ot->description="Add a render layer.";
 	
 	/* api callbacks */
 	ot->exec= render_layer_add_exec;
@@ -1003,6 +1017,7 @@ void SCENE_OT_render_layer_remove(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Remove Render Layer";
 	ot->idname= "SCENE_OT_render_layer_remove";
+	ot->description="Remove the selected render layer.";
 	
 	/* api callbacks */
 	ot->exec= render_layer_remove_exec;
@@ -1036,6 +1051,7 @@ void BUTTONS_OT_toolbox(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Toolbox";
 	ot->idname= "BUTTONS_OT_toolbox";
+	ot->description="Toolbar panel? DOC_BROKEN";
 	
 	/* api callbacks */
 	ot->invoke= toolbox_invoke;
@@ -1104,6 +1120,7 @@ void BUTTONS_OT_file_browse(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "File Browse";
 	ot->idname= "BUTTONS_OT_file_browse";
+	ot->description="Open a file browser.";
 	
 	/* api callbacks */
 	ot->invoke= file_browse_invoke;
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index e6d50976957..8a1b3bf3465 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -662,7 +662,7 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Add Effect Strip";
 	ot->idname= "SEQUENCER_OT_effect_strip_add";
-	ot->description= "Add an effect to the sequencer, most are applied ontop of existing strips";
+	ot->description= "Add an effect to the sequencer, most are applied on top of existing strips";
 
 	/* api callbacks */
 	ot->invoke= sequencer_add_effect_strip_invoke;
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c
index cc4f5cf5ce3..789843f5490 100644
--- a/source/blender/editors/space_sequencer/sequencer_buttons.c
+++ b/source/blender/editors/space_sequencer/sequencer_buttons.c
@@ -126,6 +126,7 @@ void SEQUENCER_OT_properties(wmOperatorType *ot)
 {
 	ot->name= "Properties";
 	ot->idname= "SEQUENCER_OT_properties";
+	ot->description= "Open sequencer properties panel.";
 	
 	ot->exec= sequencer_properties;
 	ot->poll= ED_operator_sequencer_active;
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 1555784f470..4e71e4883d1 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1461,7 +1461,8 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Snap strips";
 	ot->idname= "SEQUENCER_OT_snap";
-
+	ot->description="Frame where selected strips will be snapped.";
+	
 	/* api callbacks */
 	ot->invoke= sequencer_snap_invoke;
 	ot->exec= sequencer_snap_exec;
@@ -1471,7 +1472,7 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will snaped", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will be snapped", INT_MIN, INT_MAX);
 }
 
 /* mute operator */
@@ -1514,7 +1515,8 @@ void SEQUENCER_OT_mute(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Mute Strips";
 	ot->idname= "SEQUENCER_OT_mute";
-
+	ot->description="Mute selected strips.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_mute_exec;
 
@@ -1567,7 +1569,8 @@ void SEQUENCER_OT_unmute(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "UnMute Strips";
 	ot->idname= "SEQUENCER_OT_unmute";
-
+	ot->description="UnMute unselected rather than selected strips.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_unmute_exec;
 
@@ -1606,7 +1609,8 @@ void SEQUENCER_OT_lock(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Lock Strips";
 	ot->idname= "SEQUENCER_OT_lock";
-
+	ot->description="Lock the active strip so that it can't be transformed.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_lock_exec;
 
@@ -1642,7 +1646,8 @@ void SEQUENCER_OT_unlock(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "UnLock Strips";
 	ot->idname= "SEQUENCER_OT_unlock";
-
+	ot->description="Unlock the active strip so that it can't be transformed.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_unlock_exec;
 
@@ -1678,7 +1683,8 @@ void SEQUENCER_OT_reload(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Reload Strips";
 	ot->idname= "SEQUENCER_OT_reload";
-
+	ot->description="Reload strips in the sequencer.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_reload_exec;
 
@@ -1709,7 +1715,8 @@ void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Refresh Sequencer";
 	ot->idname= "SEQUENCER_OT_refresh_all";
-
+	ot->description="Refresh the sequencer editor.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_refresh_all_exec;
 
@@ -1806,7 +1813,8 @@ void SEQUENCER_OT_cut(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Cut Strips";
 	ot->idname= "SEQUENCER_OT_cut";
-
+	ot->description="Cut the selected strips.";
+	
 	/* api callbacks */
 	ot->invoke= sequencer_cut_invoke;
 	ot->exec= sequencer_cut_exec;
@@ -1817,7 +1825,7 @@ void SEQUENCER_OT_cut(struct wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will be cut", INT_MIN, INT_MAX);
-	RNA_def_enum(ot->srna, "type", prop_cut_types, SEQ_CUT_SOFT, "Type", "the type of cut operation to perform on strips");
+	RNA_def_enum(ot->srna, "type", prop_cut_types, SEQ_CUT_SOFT, "Type", "The type of cut operation to perform on strips");
 	RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side that remains selected after cutting");
 }
 
@@ -1856,7 +1864,8 @@ void SEQUENCER_OT_duplicate(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Duplicate";
 	ot->idname= "SEQUENCER_OT_duplicate";
-
+	ot->description="Duplicate the selected strips.";
+	
 	/* api callbacks */
 	ot->invoke= sequencer_add_duplicate_invoke;
 	ot->exec= sequencer_add_duplicate_exec;
@@ -1938,7 +1947,8 @@ void SEQUENCER_OT_delete(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Erase Strips";
 	ot->idname= "SEQUENCER_OT_delete";
-
+	ot->description="Erase selected strips from the sequencer.";
+	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
 	ot->exec= sequencer_delete_exec;
@@ -2031,7 +2041,8 @@ void SEQUENCER_OT_images_separate(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Separate Images";
 	ot->idname= "SEQUENCER_OT_images_separate";
-
+	ot->description="On image sequences strips, it return a strip for each image.";
+	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
 	ot->exec= sequencer_separate_images_exec;
@@ -2103,7 +2114,8 @@ void SEQUENCER_OT_meta_toggle(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Toggle Meta Strip";
 	ot->idname= "SEQUENCER_OT_meta_toggle";
-
+	ot->description="Toggle a metastrip (to edit enclosed strips).";
+	
 	/* api callbacks */
 	ot->exec= sequencer_meta_toggle_exec;
 
@@ -2207,7 +2219,8 @@ void SEQUENCER_OT_meta_make(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Make Meta Strip";
 	ot->idname= "SEQUENCER_OT_meta_make";
-
+	ot->description="Group selected strips into a metastrip.";
+	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
 	ot->exec= sequencer_meta_make_exec;
@@ -2276,7 +2289,8 @@ void SEQUENCER_OT_meta_separate(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "UnMeta Strip";
 	ot->idname= "SEQUENCER_OT_meta_separate";
-
+	ot->description="Put the contents of a metastrip back in the sequencer.";
+	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
 	ot->exec= sequencer_meta_separate_exec;
@@ -2342,7 +2356,8 @@ void SEQUENCER_OT_view_all(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "View All";
 	ot->idname= "SEQUENCER_OT_view_all";
-
+	ot->description="View all the strips in the sequencer.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_view_all_exec;
 
@@ -2422,7 +2437,8 @@ void SEQUENCER_OT_view_selected(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "View Selected";
 	ot->idname= "SEQUENCER_OT_view_selected";
-
+	ot->description="Zoom the sequencer on the selected strips.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_view_selected_exec;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index dda5837e5f5..747e1609213 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -232,7 +232,8 @@ void SEQUENCER_OT_select_all_toggle(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "(De)Select All";
 	ot->idname= "SEQUENCER_OT_select_all_toggle";
-
+	ot->description="Select or deselect all strips.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_deselect_exec;
 
@@ -272,7 +273,8 @@ void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select Inverse";
 	ot->idname= "SEQUENCER_OT_select_inverse";
-
+	ot->description="Select unselected strips.";
+	
 	/* api callbacks */
 	ot->exec= sequencer_select_inverse_exec;
 
@@ -448,6 +450,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Activate/Select";
 	ot->idname= "SEQUENCER_OT_select";
+	ot->description="Select a strip (last selected becomes the \"active strip\").";
 	
 	/* api callbacks */
 	ot->invoke= sequencer_select_invoke;
@@ -533,6 +536,7 @@ void SEQUENCER_OT_select_more(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select More";
 	ot->idname= "SEQUENCER_OT_select_more";
+	ot->description="DOC_BROKEN";
 	
 	/* api callbacks */
 	ot->exec= sequencer_select_more_exec;
@@ -562,6 +566,7 @@ void SEQUENCER_OT_select_less(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select less";
 	ot->idname= "SEQUENCER_OT_select_less";
+	ot->description="DOC_BROKEN";
 	
 	/* api callbacks */
 	ot->exec= sequencer_select_less_exec;
@@ -616,6 +621,7 @@ void SEQUENCER_OT_select_linked_pick(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select pick linked";
 	ot->idname= "SEQUENCER_OT_select_linked_pick";
+	ot->description="DOC_BROKEN";
 	
 	/* api callbacks */
 	ot->invoke= sequencer_select_linked_pick_invoke;
@@ -650,7 +656,8 @@ void SEQUENCER_OT_select_linked(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select linked";
 	ot->idname= "SEQUENCER_OT_select_linked";
-
+	ot->description="DOC_BROKEN";
+	
 	/* api callbacks */
 	ot->exec= sequencer_select_linked_exec;
 	ot->poll= ED_operator_sequencer_active;
@@ -701,7 +708,8 @@ void SEQUENCER_OT_select_handles(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select Handles";
 	ot->idname= "SEQUENCER_OT_select_handles";
-
+	ot->description="DOC_BROKEN";
+	
 	/* api callbacks */
 	ot->exec= sequencer_select_handles_exec;
 	ot->poll= ED_operator_sequencer_active;
@@ -737,7 +745,8 @@ void SEQUENCER_OT_select_active_side(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Select Active Side";
 	ot->idname= "SEQUENCER_OT_select_active_side";
-
+	ot->description="DOC_BROKEN";
+	
 	/* api callbacks */
 	ot->exec= sequencer_select_active_side_exec;
 	ot->poll= ED_operator_sequencer_active;
@@ -799,6 +808,7 @@ void SEQUENCER_OT_select_border(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Border Select";
 	ot->idname= "SEQUENCER_OT_select_border";
+	ot->description="Enable border select mode.";
 	
 	/* api callbacks */
 	ot->invoke= WM_border_select_invoke;
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 7751355a14d..3411d9114df 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -176,9 +176,9 @@ void TEXT_OT_new(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "New";
-    ot->description= "Create a new text data block.";
 	ot->idname= "TEXT_OT_new";
-
+	ot->description= "Create a new text data block.";
+	
 	/* api callbacks */
 	ot->exec= new_exec;
 	ot->poll= text_new_poll;
@@ -224,8 +224,8 @@ void TEXT_OT_open(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Open";
-    ot->description= "Open a new text data block.";
 	ot->idname= "TEXT_OT_open";
+	ot->description= "Open a new text data block.";
 
 	/* api callbacks */
 	ot->exec= open_exec;
@@ -262,9 +262,9 @@ void TEXT_OT_reload(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Reload";
-    ot->description= "Reload active text data block from its file.";
 	ot->idname= "TEXT_OT_reload";
-
+	ot->description= "Reload active text data block from its file.";
+	
 	/* api callbacks */
 	ot->exec= reload_exec;
 	ot->invoke= WM_operator_confirm;
@@ -302,9 +302,9 @@ void TEXT_OT_unlink(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Unlink";
-    ot->description= "Unlink active text data block.";
 	ot->idname= "TEXT_OT_unlink";
-
+	ot->description= "Unlink active text data block.";
+	
 	/* api callbacks */
 	ot->exec= unlink_exec;
 	ot->invoke= WM_operator_confirm;
@@ -333,8 +333,8 @@ void TEXT_OT_make_internal(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Make Internal";
-    ot->description= "Make active text file internal.";
 	ot->idname= "TEXT_OT_make_internal";
+	ot->description= "Make active text file internal.";
 
 	/* api callbacks */
 	ot->exec= make_internal_exec;
@@ -402,8 +402,8 @@ void TEXT_OT_save(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Save";
-    ot->description= "Save active text data block.";
 	ot->idname= "TEXT_OT_save";
+	ot->description= "Save active text data block.";
 
 	/* api callbacks */
 	ot->exec= save_exec;
@@ -458,9 +458,9 @@ void TEXT_OT_save_as(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Save As";
-    ot->description= "Save active text file with options.";
 	ot->idname= "TEXT_OT_save_as";
-
+	ot->description= "Save active text file with options.";
+	
 	/* api callbacks */
 	ot->exec= save_as_exec;
 	ot->invoke= save_as_invoke;
@@ -496,9 +496,9 @@ void TEXT_OT_run_script(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Run Script";
-    ot->description= "Run active script.";
 	ot->idname= "TEXT_OT_run_script";
-
+	ot->description= "Run active script.";
+	
 	/* api callbacks */
 	ot->exec= run_script_exec;
 	ot->poll= text_edit_poll;
@@ -552,9 +552,9 @@ void TEXT_OT_refresh_pyconstraints(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Refresh PyConstraints";
-    ot->description= "Refresh all pyconstraints.";
 	ot->idname= "TEXT_OT_refresh_pyconstraints";
-
+	ot->description= "Refresh all pyconstraints.";
+	
 	/* api callbacks */
 	ot->exec= refresh_pyconstraints_exec;
 	ot->poll= text_edit_poll;
@@ -674,9 +674,9 @@ void TEXT_OT_paste(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste";
-    ot->description= "Paste text from clipboard.";
 	ot->idname= "TEXT_OT_paste";
-
+	ot->description= "Paste text from clipboard.";
+	
 	/* api callbacks */
 	ot->exec= paste_exec;
 	ot->poll= text_edit_poll;
@@ -715,8 +715,8 @@ void TEXT_OT_copy(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Copy";
-    ot->description= "Copy selected text to clipboard.";
 	ot->idname= "TEXT_OT_copy";
+	ot->description= "Copy selected text to clipboard.";
 
 	/* api callbacks */
 	ot->exec= copy_exec;
@@ -746,9 +746,9 @@ void TEXT_OT_cut(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Cut";
-    ot->description= "Cut selected text to clipboard.";
 	ot->idname= "TEXT_OT_cut";
-
+	ot->description= "Cut selected text to clipboard.";
+	
 	/* api callbacks */
 	ot->exec= cut_exec;
 	ot->poll= text_edit_poll;
@@ -782,9 +782,9 @@ void TEXT_OT_indent(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Indent";
-    ot->description= "Indent selected text.";
 	ot->idname= "TEXT_OT_indent";
-
+	ot->description= "Indent selected text.";
+	
 	/* api callbacks */
 	ot->exec= indent_exec;
 	ot->poll= text_edit_poll;
@@ -818,9 +818,9 @@ void TEXT_OT_unindent(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Unindent";
-    ot->description= "Unindent selected text.";
 	ot->idname= "TEXT_OT_unindent";
-
+	ot->description= "Unindent selected text.";
+	
 	/* api callbacks */
 	ot->exec= unindent_exec;
 	ot->poll= text_edit_poll;
@@ -859,9 +859,9 @@ void TEXT_OT_line_break(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Line Break";
-    ot->description= "Insert line break at cursor position.";
 	ot->idname= "TEXT_OT_line_break";
-
+	ot->description= "Insert line break at cursor position.";
+	
 	/* api callbacks */
 	ot->exec= line_break_exec;
 	ot->poll= text_edit_poll;
@@ -892,9 +892,9 @@ void TEXT_OT_comment(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Comment";
-    ot->description= "Convert selected text to comment.";
 	ot->idname= "TEXT_OT_comment";
-
+	ot->description= "Convert selected text to comment.";
+	
 	/* api callbacks */
 	ot->exec= comment_exec;
 	ot->poll= text_edit_poll;
@@ -926,9 +926,9 @@ void TEXT_OT_uncomment(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Uncomment";
-    ot->description= "Convert selected comment to text.";
 	ot->idname= "TEXT_OT_uncomment";
-
+	ot->description= "Convert selected comment to text.";
+	
 	/* api callbacks */
 	ot->exec= uncomment_exec;
 	ot->poll= text_edit_poll;
@@ -1068,9 +1068,9 @@ void TEXT_OT_convert_whitespace(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Convert Whitespace";
-    ot->description= "Convert whitespaces by type.";
 	ot->idname= "TEXT_OT_convert_whitespace";
-
+	ot->description= "Convert whitespaces by type.";
+	
 	/* api callbacks */
 	ot->exec= convert_whitespace_exec;
 	ot->poll= text_edit_poll;
@@ -1099,9 +1099,9 @@ void TEXT_OT_select_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select All";
-    ot->description= "Select all text.";
 	ot->idname= "TEXT_OT_select_all";
-
+	ot->description= "Select all text.";
+	
 	/* api callbacks */
 	ot->exec= select_all_exec;
 	ot->poll= text_edit_poll;
@@ -1127,9 +1127,9 @@ void TEXT_OT_select_line(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select Line";
-    ot->description= "Select text by line.";
 	ot->idname= "TEXT_OT_select_line";
-
+	ot->description= "Select text by line.";
+	
 	/* api clinebacks */
 	ot->exec= select_line_exec;
 	ot->poll= text_edit_poll;
@@ -1165,9 +1165,9 @@ void TEXT_OT_previous_marker(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Previous Marker";
-    ot->description= "Move to previous marker.";
 	ot->idname= "TEXT_OT_previous_marker";
-
+	ot->description= "Move to previous marker.";
+	
 	/* api callbacks */
 	ot->exec= previous_marker_exec;
 	ot->poll= text_edit_poll;
@@ -1203,9 +1203,9 @@ void TEXT_OT_next_marker(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Next Marker";
-    ot->description= "Move to next marker";
 	ot->idname= "TEXT_OT_next_marker";
-
+	ot->description= "Move to next marker";
+	
 	/* api callbacks */
 	ot->exec= next_marker_exec;
 	ot->poll= text_edit_poll;
@@ -1231,9 +1231,9 @@ void TEXT_OT_markers_clear(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clear All Markers";
-    ot->description= "Clear all markers.";
 	ot->idname= "TEXT_OT_markers_clear";
-
+	ot->description= "Clear all markers.";
+	
 	/* api callbacks */
 	ot->exec= clear_all_markers_exec;
 	ot->poll= text_edit_poll;
@@ -1515,8 +1515,8 @@ void TEXT_OT_move(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Cursor";
-    ot->description= "Move cursor to position type.";
 	ot->idname= "TEXT_OT_move";
+	ot->description= "Move cursor to position type.";
 	
 	/* api callbacks */
 	ot->exec= move_exec;
@@ -1542,8 +1542,8 @@ void TEXT_OT_move_select(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Select";
-    ot->description= "Make selection from current cursor position to new cursor position type.";
 	ot->idname= "TEXT_OT_move_select";
+	ot->description= "Make selection from current cursor position to new cursor position type.";
 	
 	/* api callbacks */
 	ot->exec= move_select_exec;
@@ -1582,9 +1582,9 @@ void TEXT_OT_jump(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Jump";
-    ot->description= "Jump cursor to line.";
 	ot->idname= "TEXT_OT_jump";
-
+	ot->description= "Jump cursor to line.";
+	
 	/* api callbacks */
 	ot->exec= jump_exec;
 	ot->poll= text_edit_poll;
@@ -1635,8 +1635,8 @@ void TEXT_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete";
-    ot->description= "Delete text by cursor position.";
 	ot->idname= "TEXT_OT_delete";
+	ot->description= "Delete text by cursor position.";
 	
 	/* api callbacks */
 	ot->exec= delete_exec;
@@ -1665,6 +1665,7 @@ void TEXT_OT_overwrite_toggle(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Toggle Overwrite";
 	ot->idname= "TEXT_OT_overwrite_toggle";
+	ot->description= "Toggle overwrite while typing.";
 	
 	/* api callbacks */
 	ot->exec= toggle_overwrite_exec;
@@ -1819,8 +1820,8 @@ void TEXT_OT_scroll(wmOperatorType *ot)
     /*don't really see the difference between this and
       scroll_bar. Both do basically the same thing (aside 
       from keymaps).*/
-    ot->description= "Scroll text screen.";
 	ot->idname= "TEXT_OT_scroll";
+	ot->description= "Scroll text screen.";
 	
 	/* api callbacks */
 	ot->exec= scroll_exec;
@@ -1871,8 +1872,8 @@ void TEXT_OT_scroll_bar(wmOperatorType *ot)
     /*don't really see the difference between this and
       scroll. Both do basically the same thing (aside 
       from keymaps).*/
-    ot->description= "Scroll text screen.";
 	ot->idname= "TEXT_OT_scroll_bar";
+	ot->description= "Scroll text screen.";
 	
 	/* api callbacks */
 	ot->invoke= scroll_bar_invoke;
@@ -2147,8 +2148,8 @@ void TEXT_OT_cursor_set(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Cursor";
-    ot->description= "Set cursor selection.";
 	ot->idname= "TEXT_OT_cursor_set";
+	ot->description= "Set cursor selection.";
 	
 	/* api callbacks */
 	ot->invoke= set_cursor_invoke;
@@ -2204,6 +2205,7 @@ void TEXT_OT_line_number(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Line Number";
 	ot->idname= "TEXT_OT_line_number";
+	ot->description= "The current line number.";
 	
 	/* api callbacks */
 	ot->invoke= line_number_invoke;
@@ -2271,8 +2273,8 @@ void TEXT_OT_insert(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Insert";
-    ot->description= "Insert text at cursor position.";
 	ot->idname= "TEXT_OT_insert";
+	ot->description= "Insert text at cursor position.";
 	
 	/* api callbacks */
 	ot->exec= insert_exec;
@@ -2376,9 +2378,9 @@ void TEXT_OT_find(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Find";
-    ot->description= "Find specified text.";
 	ot->idname= "TEXT_OT_find";
-
+	ot->description= "Find specified text.";
+	
 	/* api callbacks */
 	ot->exec= find_exec;
 	ot->poll= text_space_edit_poll;
@@ -2395,8 +2397,8 @@ void TEXT_OT_replace(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Replace";
-    ot->description= "Replace text with specified text.";
 	ot->idname= "TEXT_OT_replace";
+	ot->description= "Replace text with the specified text.";
 
 	/* api callbacks */
 	ot->exec= replace_exec;
@@ -2414,9 +2416,9 @@ void TEXT_OT_mark_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Mark All";
-    ot->description= "Mark all specified text.";
 	ot->idname= "TEXT_OT_mark_all";
-
+	ot->description= "Mark all specified text.";
+	
 	/* api callbacks */
 	ot->exec= mark_all_exec;
 	ot->poll= text_space_edit_poll;
@@ -2444,9 +2446,9 @@ void TEXT_OT_find_set_selected(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Find Set Selected";
-    ot->description= "Find specified text and set as selected.";
 	ot->idname= "TEXT_OT_find_set_selected";
-
+	ot->description= "Find specified text and set as selected.";
+	
 	/* api callbacks */
 	ot->exec= find_set_selected_exec;
 	ot->poll= text_space_edit_poll;
@@ -2471,9 +2473,9 @@ void TEXT_OT_replace_set_selected(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Replace Set Selected";
-    ot->description= "Replace text with specified text and set as selected.";
 	ot->idname= "TEXT_OT_replace_set_selected";
-
+	ot->description= "Replace text with specified text and set as selected.";
+	
 	/* api callbacks */
 	ot->exec= replace_set_selected_exec;
 	ot->poll= text_space_edit_poll;
@@ -2634,8 +2636,8 @@ void TEXT_OT_to_3d_object(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "To 3D Object";
-    ot->description= "Create 3d text object from active text data block.";
 	ot->idname= "TEXT_OT_to_3d_object";
+	ot->description= "Create 3d text object from active text data block.";
 	
 	/* api callbacks */
 	ot->exec= to_3d_object_exec;
diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c
index b47afaf0cde..a833cca095c 100644
--- a/source/blender/editors/space_time/time_ops.c
+++ b/source/blender/editors/space_time/time_ops.c
@@ -84,6 +84,7 @@ void TIME_OT_start_frame_set (wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Set Start Frame";
 	ot->idname= "TIME_OT_start_frame_set";
+	ot->description="Set the start frame.";
 	
 	/* api callbacks */
 	ot->exec= time_set_sfra_exec;
@@ -122,6 +123,7 @@ void TIME_OT_end_frame_set (wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Set End Frame";
 	ot->idname= "TIME_OT_end_frame_set";
+	ot->description="Set the end frame.";
 	
 	/* api callbacks */
 	ot->exec= time_set_efra_exec;
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index d78928921e5..54a8c375e69 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -1471,7 +1471,7 @@ static int view3d_properties(bContext *C, wmOperator *op)
 void VIEW3D_OT_properties(wmOperatorType *ot)
 {
 	ot->name= "Properties";
-	ot->description= "Display the properties panel.";
+	ot->description= "Toggles the properties panel display.";
 	ot->idname= "VIEW3D_OT_properties";
 	
 	ot->exec= view3d_properties;
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 808d1635b37..7831d604ddf 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -376,6 +376,7 @@ void VIEW3D_OT_smoothview(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Smooth View";
 	ot->idname= "VIEW3D_OT_smoothview";
+	ot->description="The time to animate the change of view (in milliseconds)";
 	
 	/* api callbacks */
 	ot->invoke= view3d_smoothview_invoke;
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index b20d390fb4d..ccdc51430bc 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -412,6 +412,7 @@ void UV_OT_minimize_stretch(wmOperatorType *ot)
 	ot->name= "Minimize Stretch";
 	ot->idname= "UV_OT_minimize_stretch";
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->description="DOC_BROKEN";
 	
 	/* api callbacks */
 	ot->exec= minimize_stretch_exec;
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index 0fd658dbb64..bef3268920d 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -373,6 +373,7 @@ void WM_OT_jobs_timer(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Jobs timer";
 	ot->idname= "WM_OT_jobs_timer";
+	ot->description="Jobs timer operator.";
 	
 	/* api callbacks */
 	ot->invoke= wm_jobs_timer;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 77f4fe25606..37cd424ac18 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -646,6 +646,7 @@ static void WM_OT_debug_menu(wmOperatorType *ot)
 {
 	ot->name= "Debug Menu";
 	ot->idname= "WM_OT_debug_menu";
+	ot->description= "Open a popup to set the debug level.";
 	
 	ot->invoke= wm_debug_menu_invoke;
 	ot->exec= wm_debug_menu_exec;
@@ -760,7 +761,8 @@ static void WM_OT_window_duplicate(wmOperatorType *ot)
 {
 	ot->name= "Duplicate Window";
 	ot->idname= "WM_OT_window_duplicate";
-	
+	ot->description="Duplicate the current Blender window.";
+		
 	ot->exec= wm_window_duplicate_op;
 	ot->poll= WM_operator_winactive;
 }
@@ -769,7 +771,8 @@ static void WM_OT_save_homefile(wmOperatorType *ot)
 {
 	ot->name= "Save User Settings";
 	ot->idname= "WM_OT_save_homefile";
-	
+	ot->description="Make the current file the default .blend file.";
+		
 	ot->invoke= WM_operator_confirm;
 	ot->exec= WM_write_homefile;
 	ot->poll= WM_operator_winactive;
@@ -779,6 +782,7 @@ static void WM_OT_read_homefile(wmOperatorType *ot)
 {
 	ot->name= "Reload Start-Up File";
 	ot->idname= "WM_OT_read_homefile";
+	ot->description="Open the default file (doesn't save the current file).";
 	
 	ot->invoke= WM_operator_confirm;
 	ot->exec= WM_read_homefile;
@@ -855,6 +859,7 @@ static void WM_OT_open_recentfile(wmOperatorType *ot)
 
 	ot->name= "Open Recent File";
 	ot->idname= "WM_OT_open_recentfile";
+	ot->description="Open recent files list.";
 	
 	ot->invoke= wm_recentfile_invoke;
 	ot->exec= recentfile_exec;
@@ -919,6 +924,7 @@ static void WM_OT_open_mainfile(wmOperatorType *ot)
 {
 	ot->name= "Open Blender File";
 	ot->idname= "WM_OT_open_mainfile";
+	ot->description="Open a Blender file.";
 	
 	ot->invoke= wm_open_mainfile_invoke;
 	ot->exec= wm_open_mainfile_exec;
@@ -957,6 +963,7 @@ static void WM_OT_recover_last_session(wmOperatorType *ot)
 {
 	ot->name= "Recover Last Session";
 	ot->idname= "WM_OT_recover_last_session";
+	ot->description="Open the last closed file (\"quit.blend\").";
 	
 	ot->exec= wm_recover_last_session_exec;
 	ot->poll= WM_operator_winactive;
@@ -1014,6 +1021,7 @@ static void WM_OT_save_as_mainfile(wmOperatorType *ot)
 {
 	ot->name= "Save As Blender File";
 	ot->idname= "WM_OT_save_as_mainfile";
+	ot->description="Save the current file in the desired location.";
 	
 	ot->invoke= wm_save_as_mainfile_invoke;
 	ot->exec= wm_save_as_mainfile_exec;
@@ -1043,6 +1051,7 @@ static void WM_OT_save_mainfile(wmOperatorType *ot)
 {
 	ot->name= "Save Blender File";
 	ot->idname= "WM_OT_save_mainfile";
+	ot->description="Save the current Blender file.";
 	
 	ot->invoke= wm_save_mainfile_invoke;
 	ot->exec= wm_save_as_mainfile_exec;
@@ -1057,11 +1066,12 @@ static void WM_OT_save_mainfile(wmOperatorType *ot)
 
 static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot)
 {
-    ot->name= "Toggle Fullscreen";
-    ot->idname= "WM_OT_window_fullscreen_toggle";
+	ot->name= "Toggle Fullscreen";
+	ot->idname= "WM_OT_window_fullscreen_toggle";
+	ot->description="Toggle the current window fullscreen.";
 
-    ot->exec= wm_window_fullscreen_toggle_op;
-    ot->poll= WM_operator_winactive;
+	ot->exec= wm_window_fullscreen_toggle_op;
+	ot->poll= WM_operator_winactive;
 }
 
 static int wm_exit_blender_op(bContext *C, wmOperator *op)
@@ -1077,6 +1087,7 @@ static void WM_OT_exit_blender(wmOperatorType *ot)
 {
 	ot->name= "Exit Blender";
 	ot->idname= "WM_OT_exit_blender";
+	ot->description= "Quit Blender.";
 
 	ot->invoke= WM_operator_confirm;
 	ot->exec= wm_exit_blender_op;
@@ -1326,6 +1337,7 @@ void WM_OT_circle_gesture(wmOperatorType *ot)
 {
 	ot->name= "Circle Gesture";
 	ot->idname= "WM_OT_circle_gesture";
+	ot->description="Enter rotate mode with a circular gesture.";
 	
 	ot->invoke= WM_gesture_circle_invoke;
 	ot->modal= WM_gesture_circle_modal;
@@ -1539,6 +1551,7 @@ void WM_OT_lasso_gesture(wmOperatorType *ot)
 	
 	ot->name= "Lasso Gesture";
 	ot->idname= "WM_OT_lasso_gesture";
+	ot->description="Select objects within the lasso as you move the pointer.";
 	
 	ot->invoke= WM_gesture_lasso_invoke;
 	ot->modal= WM_gesture_lasso_modal;
@@ -1864,6 +1877,7 @@ static void WM_OT_ten_timer(wmOperatorType *ot)
 	
 	ot->name= "Ten Timer";
 	ot->idname= "WM_OT_ten_timer";
+	ot->description="Ten Timer operator.";
 	
 	ot->invoke= WM_menu_invoke;
 	ot->exec= ten_timer_exec;

From 5392a90e2862df43fd82d5fbe24faaf3ca6888c9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 Sep 2009 18:09:59 +0000
Subject: [PATCH 540/577] - adding curves didnt work if EnterEditmode option
 was off. - adding a curve in editmode now is 3D, if the curve its added in is
 3D.

---
 source/blender/editors/curve/editcurve.c   | 5 +++--
 source/blender/editors/object/object_add.c | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index e346ccafde3..edcfb46c270 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -4704,6 +4704,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 	float *curs, cent[3],vec[3],imat[3][3],mat[3][3];
 	float fac,cmat[3][3], grid;
 	int a, b, cutype, stype;
+	int force_3d = ((Curve *)obedit->data)->flag & CU_3D; /* could be adding to an existing 3D curve */
 	
 	cutype= type & CU_TYPE;	// poly, bezier, nurbs, etc
 	stype= type & CU_PRIMITIVE;
@@ -4760,7 +4761,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 			rename_id((ID *)obedit->data, "Curve");
 		}
 		if(cutype==CU_BEZIER) {
-			nu->flag= CU_2D;
+			if (!force_3d) nu->flag |= CU_2D;
 			nu->pntsu= 2;
 			nu->bezt =
 				(BezTriple*)MEM_callocN(2 * sizeof(BezTriple), "addNurbprim1");
@@ -4869,7 +4870,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 			rename_id((ID *)obedit->data, "CurveCircle");
 		}
 		if(cutype==CU_BEZIER) {
-			nu->flag= CU_2D;
+			if (!force_3d) nu->flag |= CU_2D;
 			nu->pntsu= 4;
 			nu->bezt= callocstructN(BezTriple, 4, "addNurbprim1");
 			nu->flagu= CU_CYCLIC;
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index f4c8c63c480..833d3914e47 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -307,7 +307,6 @@ static int object_add_curve_exec(bContext *C, wmOperator *op)
 	
 	/* userdef */
 	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_enter_editmode(C, 0);
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	

From 0fb9380b03c2cb403e54e342da36c23a27c75597 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 12 Sep 2009 18:52:26 +0000
Subject: [PATCH 541/577] - adding nurbs sufraces messed up when adding with
 both editmode and align to view disabled. - Vkey was being caught by the
 vertex paint mode, blocking it for curve edit where it sets the handle type.
 Now mode keys pass through if they dont apply to the object type. - set
 handles had invalid default

---
 source/blender/editors/curve/editcurve.c    | 4 ++--
 source/blender/editors/object/object_edit.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index edcfb46c270..8dabe24de91 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -2546,7 +2546,7 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_enum(ot->srna, "type", type_items, CU_POLY, "Type", "Spline type");
+	RNA_def_enum(ot->srna, "type", type_items, 1, "Type", "Spline type");
 }
 
 /***************** make segment operator **********************/
@@ -4728,7 +4728,7 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
 		cent[2]-= obedit->obmat[3][2];
 		
 		if(rv3d) {
-			if (!(newname) || U.flag & USER_ADD_VIEWALIGNED)
+			if (!newname && U.flag & USER_ADD_VIEWALIGNED)
 				Mat3CpyMat4(imat, rv3d->viewmat);
 			else
 				Mat3One(imat);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index daa63da03db..aaf6ed387c7 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1985,7 +1985,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 	int toggle = RNA_boolean_get(op->ptr, "toggle");
 
 	if(!ob || !object_mode_set_compat(C, op, ob))
-		return OPERATOR_CANCELLED;
+		return OPERATOR_PASS_THROUGH;
 
 	/* Exit current mode if it's not the mode we're setting */
 	if(ob->mode != OB_MODE_OBJECT && ob->mode != mode)

From c1e2e3fea2dd1b22cf22a9dca4d88bde2d280ab6 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sat, 12 Sep 2009 19:11:34 +0000
Subject: [PATCH 542/577] As discussed with Campbell on IRC:

Made some UI operators not register themselves in the console. This made macro creation a pain because the operator list would have tons of splits and other UI commends mixed in with actual data manipulation.

Moved Repeat Last from Ctrl-R to Shift-R so it doesn't conflict with loop cut, whenever it is added.
---
 source/blender/editors/screen/screen_ops.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 75da8f5fe06..bb9d940edca 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1261,7 +1261,7 @@ static void SCREEN_OT_area_split(wmOperatorType *ot)
 	ot->modal= area_split_modal;
 	
 	ot->poll= ED_operator_areaactive;
-	ot->flag= OPTYPE_REGISTER|OPTYPE_BLOCKING;
+	ot->flag= OPTYPE_BLOCKING;
 	
 	/* rna */
 	RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', "Direction", "");
@@ -2127,7 +2127,7 @@ static void SCREEN_OT_region_foursplit(wmOperatorType *ot)
 //	ot->invoke= WM_operator_confirm;
 	ot->exec= region_foursplit_exec;
 	ot->poll= ED_operator_areaactive;
-	ot->flag= OPTYPE_REGISTER;
+	ot->flag= 0;
 }
 
 
@@ -2165,7 +2165,7 @@ static void SCREEN_OT_region_flip(wmOperatorType *ot)
 	ot->exec= region_flip_exec;
 	
 	ot->poll= ED_operator_areaactive;
-	ot->flag= OPTYPE_REGISTER;
+	ot->flag= 0;
 
 }
 
@@ -3327,10 +3327,8 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_foursplit", SKEY, KM_PRESS, KM_CTRL|KM_ALT|KM_SHIFT, 0);
 	
 	WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
-	#ifdef __APPLE__
-	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);
-	#endif
-	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_CTRL, 0);
+
+	WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_SHIFT, 0);
 	
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);

From 9a25d22326060395b09cd6d81d7b4ac080bafb8f Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sat, 12 Sep 2009 19:54:39 +0000
Subject: [PATCH 543/577] 2.5 filebrowser Appending and Linking * Linking
 Operator, invokes filebrowser for Append/Link * Separated the append/link
 function into three parts: ** BLO_library_append_begin finds main for
 appending ** BLO_library_append_named_part appends one Object,Group,
 Material, ... ** BLO_library_append_end actually reads and expands the
 libraries

NOTE 1:
I also changed the returned properties for the filebrowser operators to the following convention:
"path" - the full path to a file or directory, means what is in directory + filename buttons in filebrowser
"directory" - the content of the directory button in filebrowser
"filename" - the content of the filename button in filebrowser
Usually only path should be required, but in some cases it might be more convenient to retrieve the parts separately.

Ton, Brecht: If you have time to take a look, let me know if anything needs to be fixed.
---
 .../blender/loader/BLO_loader.vcproj          | 234 +++++------
 release/io/export_ply.py                      |   2 +-
 release/ui/space_info.py                      |   3 +
 source/blender/blenkernel/BKE_library.h       |   1 +
 source/blender/blenkernel/intern/library.c    |  11 +
 source/blender/blenloader/BLO_readfile.h      |  19 +-
 source/blender/blenloader/intern/readfile.c   | 243 +++++++-----
 source/blender/editors/curve/editfont.c       |   2 +-
 source/blender/editors/screen/screendump.c    |  22 +-
 source/blender/editors/sound/sound_ops.c      |   8 +-
 .../editors/space_buttons/buttons_ops.c       |   6 +-
 source/blender/editors/space_file/file_ops.c  |  30 +-
 .../blender/editors/space_file/file_panels.c  |   6 +
 source/blender/editors/space_file/filelist.c  | 369 +++++++++++++++++-
 source/blender/editors/space_file/filelist.h  |  12 +-
 source/blender/editors/space_file/filesel.c   |  49 ++-
 .../blender/editors/space_file/space_file.c   |   5 +-
 .../blender/editors/space_image/image_ops.c   |  20 +-
 source/blender/editors/space_info/info_ops.c  |  10 +-
 .../editors/space_script/script_edit.c        |   8 +-
 .../blender/editors/space_script/script_ops.c |   2 +-
 .../editors/space_sequencer/sequencer_add.c   |  42 +-
 source/blender/editors/space_text/text_ops.c  |  16 +-
 source/blender/makesdna/DNA_space_types.h     |   7 +-
 source/blender/makesrna/RNA_define.h          |   1 +
 source/blender/makesrna/RNA_types.h           |   1 +
 source/blender/makesrna/intern/rna_define.c   |  14 +
 source/blender/windowmanager/WM_api.h         |   4 +-
 .../windowmanager/intern/wm_event_system.c    |  10 +-
 .../windowmanager/intern/wm_operators.c       | 207 +++++++++-
 30 files changed, 994 insertions(+), 370 deletions(-)

diff --git a/projectfiles_vc9/blender/loader/BLO_loader.vcproj b/projectfiles_vc9/blender/loader/BLO_loader.vcproj
index a8cec5ecf76..e8b155875d0 100644
--- a/projectfiles_vc9/blender/loader/BLO_loader.vcproj
+++ b/projectfiles_vc9/blender/loader/BLO_loader.vcproj
@@ -469,123 +469,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\source\blender\blenloader\intern\readblenentry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenloader\intern\readfile.c"
-				>
-				<FileConfiguration
-					Name="Blender Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="3D Plugin Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="3D Plugin Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Blender Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="BlenderPlayer Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="BlenderPlayer Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenloader\intern\undofile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenloader\intern\writefile.c"
-				>
-				<FileConfiguration
-					Name="Blender Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="3D Plugin Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="3D Plugin Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Blender Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="BlenderPlayer Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="BlenderPlayer Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
@@ -606,6 +489,123 @@
 				RelativePath="..\..\..\source\blender\blenloader\BLO_undofile.h"
 				>
 			</File>
+			<Filter
+				Name="Source Files"
+				Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+				>
+				<File
+					RelativePath="..\..\..\source\blender\blenloader\intern\readblenentry.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\blenloader\intern\readfile.c"
+					>
+					<FileConfiguration
+						Name="Blender Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Blender Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="BlenderPlayer Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="BlenderPlayer Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\blenloader\intern\undofile.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\blenloader\intern\writefile.c"
+					>
+					<FileConfiguration
+						Name="Blender Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Blender Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="BlenderPlayer Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="BlenderPlayer Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/release/io/export_ply.py b/release/io/export_ply.py
index c293119d3c8..7a3253b2d16 100644
--- a/release/io/export_ply.py
+++ b/release/io/export_ply.py
@@ -242,7 +242,7 @@ class EXPORT_OT_ply(bpy.types.Operator):
 	# to the class instance from the operator settings before calling.
 	
 	__props__ = [
-		bpy.props.StringProperty(attr="filename", name="File Name", description="File name used for exporting the PLY file", maxlen= 1024, default= ""),
+		bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the PLY file", maxlen= 1024, default= ""),
 		bpy.props.BoolProperty(attr="use_modifiers", name="Apply Modifiers", description="Apply Modifiers to the exported mesh", default= True),
 		bpy.props.BoolProperty(attr="use_normals", name="Export Normals", description="Export Normals for smooth and hard shaded faces", default= True),
 		bpy.props.BoolProperty(attr="use_uvs", name="Export UVs", description="Exort the active UV layer", default= True),
diff --git a/release/ui/space_info.py b/release/ui/space_info.py
index 97243f857a6..6b2a457e89d 100644
--- a/release/ui/space_info.py
+++ b/release/ui/space_info.py
@@ -59,6 +59,9 @@ class INFO_MT_file(bpy.types.Menu):
 		layout.itemO("wm.save_as_mainfile", text="Save As...")
 		layout.itemO("screen.userpref_show", text="User Preferences...")
 
+		layout.itemS()
+		layout.operator_context = "INVOKE_AREA"
+		layout.itemO("wm.link_append", text="Append or Link")
 		layout.itemS()
 
 		layout.itemM("INFO_MT_file_import")
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 54722dac910..0e978128cf6 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -77,6 +77,7 @@ void IPOnames_to_pupstring(char **str, char *title, char *extraops, struct ListB
 
 void flag_listbase_ids(ListBase *lb, short flag, short value);
 void flag_all_listbases_ids(short flag, short value);
+void recalc_all_library_objects(struct Main *main);
 
 void set_free_windowmanager_cb(void (*func)(struct bContext *, struct wmWindowManager *) );
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 02d92a62b59..da7692d0cdb 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -455,6 +455,17 @@ void flag_all_listbases_ids(short flag, short value)
 	while(a--)	flag_listbase_ids(lbarray[a], flag, value);
 }
 
+void recalc_all_library_objects(struct Main *main)
+{
+	/* DISPLISTS? */
+	Object *ob= main->object.first;
+	while(ob) {
+		if(ob->id.lib) {
+			ob->recalc |= OB_RECALC;
+		}
+		ob= ob->id.next;
+	}
+}
 
 /* note: MAX_LIBARRAY define should match this code */
 int set_listbasepointers(Main *main, ListBase **lb)
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 4fafac29a6f..6e2772efea4 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -36,7 +36,6 @@ extern "C" {
 
 struct bScreen;
 struct direntry;
-struct FileList;
 struct LinkNode;
 struct Main;
 struct MemFile;
@@ -45,6 +44,7 @@ struct Scene;
 struct SpaceFile;
 struct SpaceImaSel;
 struct UserDef;
+struct bContext;
 
 typedef struct BlendHandle	BlendHandle;
 
@@ -197,12 +197,23 @@ BLO_blendhandle_close(
 	
 	/***/
 
-char *BLO_gethome(void);
+#define GROUP_MAX 32
+
 int BLO_has_bfile_extension(char *str);
 
-void BLO_library_append(BlendHandle **libfiledata, struct direntry* filelist, int totfile, 
-						 char *dir, char* file, short flag, int idcode, struct Main *mainvar, struct Scene *scene, struct ReportList *reports);
+/* return ok when a blenderfile, in dir is the filename,
+ * in group the type of libdata
+ */
+int BLO_is_a_library(char *path, char *dir, char *group);
+
+struct Main* BLO_library_append_begin(const struct bContext *C, BlendHandle** bh, char *dir);
+void BLO_library_append_named_part(const struct bContext *C, struct Main *mainl, BlendHandle** bh, char *name, int idcode, short flag);
+void BLO_library_append_end(const struct bContext *C, struct Main *mainl, BlendHandle** bh, int idcode, short flag);
+
+/* deprecated */
+#if 0
 void BLO_script_library_append(BlendHandle **bh, char *dir, char *name, int idcode, short flag, struct Main *mainvar, struct Scene *scene, struct ReportList *reports);
+#endif
 
 BlendFileData* blo_read_blendafterruntime(int file, char *name, int actualsize, struct ReportList *reports);
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 99285fefb4d..83abd5c2b4d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -113,6 +113,7 @@
 #include "BKE_cloth.h"
 #include "BKE_colortools.h"
 #include "BKE_constraint.h"
+#include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
@@ -1065,6 +1066,46 @@ int BLO_has_bfile_extension(char *str)
 	return (BLI_testextensie(str, ".ble") || BLI_testextensie(str, ".blend")||BLI_testextensie(str, ".blend.gz"));
 }
 
+int BLO_is_a_library(char *path, char *dir, char *group)
+{
+	/* return ok when a blenderfile, in dir is the filename,
+	 * in group the type of libdata
+	 */
+	int len;
+	char *fd;
+	
+	strcpy(dir, path);
+	len= strlen(dir);
+	if(len<7) return 0;
+	if( dir[len-1] != '/' && dir[len-1] != '\\') return 0;
+	
+	group[0]= 0;
+	dir[len-1]= 0;
+
+	/* Find the last slash */
+	fd= (strrchr(dir, '/')>strrchr(dir, '\\'))?strrchr(dir, '/'):strrchr(dir, '\\');
+
+	if(fd==0) return 0;
+	*fd= 0;
+	if(BLO_has_bfile_extension(fd+1)) {
+		/* the last part of the dir is a .blend file, no group follows */
+		*fd= '/'; /* put back the removed slash separating the dir and the .blend file name */
+	}
+	else {		
+		char *gp = fd+1; // in case we have a .blend file, gp points to the group
+
+		/* Find the last slash */
+		fd= (strrchr(dir, '/')>strrchr(dir, '\\'))?strrchr(dir, '/'):strrchr(dir, '\\');
+		if (!fd || !BLO_has_bfile_extension(fd+1)) return 0;
+
+		/* now we know that we are in a blend file and it is safe to 
+		   assume that gp actually points to a group */
+		if (BLI_streq("Screen", gp)==0)
+			BLI_strncpy(group, gp, GROUP_MAX);
+	}
+	return 1;
+}
+
 /* ************** OLD POINTERS ******************* */
 
 static void *newdataadr(FileData *fd, void *adr)		/* only direct databocks */
@@ -10729,8 +10770,9 @@ static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, int is
 }
 
 
-static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *name, int idcode, short flag)
+static void append_named_part(const bContext *C, Main *mainl, FileData *fd, char *name, int idcode, short flag)
 {
+	Scene *scene= CTX_data_scene(C);
 	Object *ob;
 	Base *base;
 	BHead *bhead;
@@ -10746,9 +10788,9 @@ static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *n
 				
 			if(strcmp(idname+2, name)==0) {
 
-				id= is_yet_read(fd, mainvar, bhead);
+				id= is_yet_read(fd, mainl, bhead);
 				if(id==NULL) {
-					read_libblock(fd, mainvar, bhead, LIB_TESTEXT, NULL);
+					read_libblock(fd, mainl, bhead, LIB_TESTEXT, NULL);
 				}
 				else {
 					printf("append: already linked\n");
@@ -10763,13 +10805,18 @@ static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *n
 					base= MEM_callocN( sizeof(Base), "app_nam_part");
 					BLI_addtail(&scene->base, base);
 
-					if(id==NULL) ob= mainvar->object.last;
+					if(id==NULL) ob= mainl->object.last;
 					else ob= (Object *)id;
 					
-					/* XXX use context to find view3d->lay */
-					//if((flag & FILE_ACTIVELAY)) {
-					//	scene->lay;
-					//}
+					/* link at active layer (view3d->lay if in context, else scene->lay */
+					if((flag & FILE_ACTIVELAY)) {
+						View3D *v3d = CTX_wm_view3d(C);
+						if (v3d) {
+							ob->lay = v3d->layact;
+						} else {
+							ob->lay = scene->lay;
+						}
+					}
 					base->lay= ob->lay;
 					base->object= ob;
 					ob->id.us++;
@@ -10788,6 +10835,12 @@ static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *n
 	}
 }
 
+void BLO_library_append_named_part(const bContext *C, Main *mainl, BlendHandle** bh, char *name, int idcode, short flag)
+{
+	FileData *fd= (FileData*)(*bh);
+	append_named_part(C, mainl, fd, name, idcode, flag);
+}
+
 static void append_id_part(FileData *fd, Main *mainvar, ID *id, ID **id_r)
 {
 	BHead *bhead;
@@ -10810,11 +10863,10 @@ static void append_id_part(FileData *fd, Main *mainvar, ID *id, ID **id_r)
 
 /* common routine to append/link something from a library */
 
-static Library* library_append(Main *mainvar, Scene *scene, char* file, char *dir, int idcode,
-		int totsel, FileData **fd, struct direntry* filelist, int totfile, short flag)
+static Main* library_append_begin(const bContext *C, FileData **fd, char *dir)
 {
+	Main *mainvar= CTX_data_main(C);
 	Main *mainl;
-	Library *curlib;
 
 	/* make mains */
 	blo_split_main(&(*fd)->mainlist, mainvar);
@@ -10824,19 +10876,69 @@ static Library* library_append(Main *mainvar, Scene *scene, char* file, char *di
 	
 	mainl->versionfile= (*fd)->fileversion;	/* needed for do_version */
 	
-	curlib= mainl->curlib;
+	return mainl;
+}
+
+Main* BLO_library_append_begin(const bContext *C, BlendHandle** bh, char *dir)
+{
+	FileData *fd= (FileData*)(*bh);
+	return library_append_begin(C, &fd, dir);
+}
+
+static void append_do_cursor(Scene *scene, Library *curlib, short flag)
+{
+	Base *centerbase;
+	Object *ob;
+	float *curs, centerloc[3], vec[3], min[3], max[3];
+	int count= 0;
+
+	/* when not linking (appending)... */
+	if(flag & FILE_LINK) 
+		return;
+
+	/* we're not appending at cursor */
+	if((flag & FILE_ATCURSOR) == 0) 
+		return;
 	
-	if(totsel==0) {
-		append_named_part(*fd, mainl, scene, file, idcode, flag);
-	}
-	else {
-		int a;
-		for(a=0; a<totfile; a++) {
-			if(filelist[a].flags & ACTIVE) {
-				append_named_part(*fd, mainl, scene, filelist[a].relname, idcode, flag);
-			}
+	/* find the center of everything appended */
+	INIT_MINMAX(min, max);
+	centerbase= (scene->base.first);
+	while(centerbase) {
+		if(centerbase->object->id.lib==curlib && centerbase->object->parent==NULL) {
+			VECCOPY(vec, centerbase->object->loc);
+			DO_MINMAX(vec, min, max);
+			count++;
 		}
+		centerbase= centerbase->next;
 	}
+	/* we haven't found any objects to move to cursor */
+	if(!count) 
+		return;
+	
+	/* move from the center of the appended objects to cursor */
+	centerloc[0]= (min[0]+max[0])/2;
+	centerloc[1]= (min[1]+max[1])/2;
+	centerloc[2]= (min[2]+max[2])/2;
+	curs = scene->cursor;
+	VECSUB(centerloc,curs,centerloc);
+	
+	/* now translate the center of the objects */
+	centerbase= (scene->base.first);
+	while(centerbase) {
+		if(centerbase->object->id.lib==curlib && centerbase->object->parent==NULL) {
+			ob= centerbase->object;
+			ob->loc[0] += centerloc[0];
+			ob->loc[1] += centerloc[1];
+			ob->loc[2] += centerloc[2];
+		}
+		centerbase= centerbase->next;
+	}
+}
+
+static void library_append_end(const bContext *C, Main *mainl, FileData **fd, int idcode, short flag)
+{
+	Main *mainvar= CTX_data_main(C);
+	Scene *scene= CTX_data_scene(C);
 
 	/* make main consistant */
 	expand_main(*fd, mainl);
@@ -10844,6 +10946,7 @@ static Library* library_append(Main *mainvar, Scene *scene, char* file, char *di
 	/* do this when expand found other libs */
 	read_libraries(*fd, &(*fd)->mainlist);
 
+	/* make the lib path relative if required */
 	if(flag & FILE_STRINGCODE) {
 
 		/* use the full path, this could have been read by other library even */
@@ -10866,7 +10969,7 @@ static Library* library_append(Main *mainvar, Scene *scene, char* file, char *di
 			if (flag & FILE_LINK) {
 				give_base_to_objects(mainvar, scene, NULL, 0);
 			} else {
-				give_base_to_objects(mainvar, scene, curlib, 1);
+				give_base_to_objects(mainvar, scene, mainl->curlib, 1);
 			}	
 		} else {
 			give_base_to_objects(mainvar, scene, NULL, 0);
@@ -10882,14 +10985,23 @@ static Library* library_append(Main *mainvar, Scene *scene, char* file, char *di
 		*fd = NULL;
 	}	
 
-	return curlib;
+	append_do_cursor(scene, mainl->curlib, flag);
+}
+
+void BLO_library_append_end(const bContext *C, struct Main *mainl, BlendHandle** bh, int idcode, short flag)
+{
+	FileData *fd= (FileData*)(*bh);
+	library_append_end(C, mainl, &fd, idcode, flag);
+	*bh= (BlendHandle*)fd;
 }
 
 /* this is a version of BLO_library_append needed by the BPython API, so
  * scripts can load data from .blend files -- see Blender.Library module.*/
 /* append to scene */
 /* this should probably be moved into the Python code anyway */
-
+/* tentatively removed, Python should be able to use the split functions too: */
+/* BLO_library_append_begin, BLO_library_append_end, BLO_library_append_named_part */
+#if 0 
 void BLO_script_library_append(BlendHandle **bh, char *dir, char *name, 
 		int idcode, short flag, Main *mainvar, Scene *scene, ReportList *reports)
 {
@@ -10906,88 +11018,7 @@ void BLO_script_library_append(BlendHandle **bh, char *dir, char *name,
 
 	*bh= (BlendHandle*)fd;
 }
-
-/* append to scene */
-void BLO_library_append(BlendHandle** bh, struct direntry* filelist, int totfile, 
-						 char *dir, char* file, short flag, int idcode, Main *mainvar, Scene *scene, ReportList *reports)
-{
-	FileData *fd= (FileData*)(*bh);
-	Library *curlib;
-	Base *centerbase;
-	Object *ob;
-	int a, totsel=0;
-	
-	/* are there files selected? */
-	for(a=0; a<totfile; a++) {
-		if(filelist[a].flags & ACTIVE) {
-			totsel++;
-		}
-	}
-
-	if(totsel==0) {
-		/* is the indicated file in the filelist? */
-		if(file[0]) {
-			for(a=0; a<totfile; a++) {
-				if( strcmp(filelist[a].relname, file)==0) break;
-			}
-			if(a==totfile) {
-				BKE_report(reports, RPT_ERROR, "Wrong indicated name");
-				return;
-			}
-		}
-		else {
-			BKE_report(reports, RPT_ERROR, "Nothing indicated");
-			return;
-		}
-	}
-	/* now we have or selected, or an indicated file */
-	
-	if(flag & FILE_AUTOSELECT) scene_deselect_all(scene);
-
-	fd->reports= reports;
-	curlib = library_append(mainvar, scene, file, dir, idcode, totsel, &fd, filelist, totfile,flag );
-	if(fd) fd->reports= NULL;
-
-	*bh= (BlendHandle*)fd;
-
-	/* when not linking (appending)... */
-	if((flag & FILE_LINK)==0) {
-		if(flag & FILE_ATCURSOR) {
-			float *curs, centerloc[3], vec[3], min[3], max[3];
-			int count= 0;
-			
-			INIT_MINMAX(min, max);
-			
-			centerbase= (scene->base.first);
-			while(centerbase) {
-				if(centerbase->object->id.lib==curlib && centerbase->object->parent==NULL) {
-					VECCOPY(vec, centerbase->object->loc);
-					DO_MINMAX(vec, min, max);
-					count++;
-				}
-				centerbase= centerbase->next;
-			}
-			if(count) {
-				centerloc[0]= (min[0]+max[0])/2;
-				centerloc[1]= (min[1]+max[1])/2;
-				centerloc[2]= (min[2]+max[2])/2;
-				curs = scene->cursor;
-				VECSUB(centerloc,curs,centerloc);
-			
-				centerbase= (scene->base.first);
-				while(centerbase) {
-					if(centerbase->object->id.lib==curlib && centerbase->object->parent==NULL) {
-						ob= centerbase->object;
-						ob->loc[0] += centerloc[0];
-						ob->loc[1] += centerloc[1];
-						ob->loc[2] += centerloc[2];
-					}
-					centerbase= centerbase->next;
-				}
-			}
-		}
-	}
-}
+#endif
 
 /* ************* READ LIBRARY ************** */
 
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index a9736f3f88d..868c5902670 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -417,7 +417,7 @@ void FONT_OT_file_paste(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL);
 }
 
 /******************* paste buffer operator ********************/
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index 5ae1bdf84aa..fb3da4a5353 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -73,24 +73,24 @@ static int screenshot_exec(bContext *C, wmOperator *op)
 	if(scd && scd->dumprect) {
 		Scene *scene= CTX_data_scene(C);
 		ImBuf *ibuf;
-		char filename[FILE_MAX];
+		char path[FILE_MAX];
 	
-		RNA_string_get(op->ptr, "filename", filename);
+		RNA_string_get(op->ptr, "path", path);
 	
-		strcpy(G.ima, filename);
-		BLI_convertstringcode(filename, G.sce);
+		strcpy(G.ima, path);
+		BLI_convertstringcode(path, G.sce);
 		
 		/* BKE_add_image_extension() checks for if extension was already set */
 		if(scene->r.scemode & R_EXTENSION) 
-			if(strlen(filename)<FILE_MAXDIR+FILE_MAXFILE-5)
-				BKE_add_image_extension(scene, filename, scene->r.imtype);
+			if(strlen(path)<FILE_MAXDIR+FILE_MAXFILE-5)
+				BKE_add_image_extension(scene, path, scene->r.imtype);
 		
 		ibuf= IMB_allocImBuf(scd->dumpsx, scd->dumpsy, 24, 0, 0);
 		ibuf->rect= scd->dumprect;
 		
 		if(scene->r.planes == 8) IMB_cspace(ibuf, rgb_to_bw);
 		
-		BKE_write_ibuf(scene, ibuf, filename, scene->r.imtype, scene->r.subimtype, scene->r.quality);
+		BKE_write_ibuf(scene, ibuf, path, scene->r.imtype, scene->r.subimtype, scene->r.quality);
 
 		IMB_freeImBuf(ibuf);
 
@@ -149,10 +149,10 @@ static int screenshot_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		scd->dumprect= dumprect;
 		op->customdata= scd;
 		
-		if(RNA_property_is_set(op->ptr, "filename"))
+		if(RNA_property_is_set(op->ptr, "path"))
 			return screenshot_exec(C, op);
 		
-		RNA_string_set(op->ptr, "filename", G.ima);
+		RNA_string_set(op->ptr, "path", G.ima);
 		
 		WM_event_add_fileselect(C, op);
 	
@@ -173,7 +173,7 @@ void SCREEN_OT_screenshot(wmOperatorType *ot)
 	
 	ot->flag= 0;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL);
 	RNA_def_boolean(ot->srna, "full", 1, "Full Screen", "");
 }
 
@@ -327,7 +327,7 @@ void SCREEN_OT_screencast(wmOperatorType *ot)
 	
 	ot->flag= 0;
 	
-	RNA_def_property(ot->srna, "filename", PROP_STRING, PROP_FILEPATH);
+	RNA_def_property(ot->srna, "path", PROP_STRING, PROP_FILEPATH);
 	RNA_def_boolean(ot->srna, "full", 1, "Full Screen", "");
 }
 
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 303ca0eaefd..1121a3bcbcd 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -66,13 +66,13 @@
 
 static int open_exec(bContext *C, wmOperator *op)
 {
-	char filename[FILE_MAX];
+	char path[FILE_MAX];
 	bSound *sound;
 	AUD_SoundInfo info;
 
-	RNA_string_get(op->ptr, "filename", filename);
+	RNA_string_get(op->ptr, "path", path);
 
-	sound = sound_new_file(CTX_data_main(C), filename);
+	sound = sound_new_file(CTX_data_main(C), path);
 
 	if (sound==NULL || sound->handle == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
@@ -114,7 +114,7 @@ void SOUND_OT_open(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL);
 	RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory.");
 }
 
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 481c2d6cfc3..9b335b86163 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -1069,10 +1069,10 @@ static int file_browse_exec(bContext *C, wmOperator *op)
 	FileBrowseOp *fbo= op->customdata;
 	char *str;
 	
-	if (RNA_property_is_set(op->ptr, "filename")==0 || fbo==NULL)
+	if (RNA_property_is_set(op->ptr, "path")==0 || fbo==NULL)
 		return OPERATOR_CANCELLED;
 	
-	str= RNA_string_get_alloc(op->ptr, "filename", 0, 0);
+	str= RNA_string_get_alloc(op->ptr, "path", 0, 0);
 	RNA_property_string_set(&fbo->ptr, fbo->prop, str);
 	RNA_property_update(C, &fbo->ptr, fbo->prop);
 	MEM_freeN(str);
@@ -1128,6 +1128,6 @@ void BUTTONS_OT_file_browse(wmOperatorType *ot)
 	ot->cancel= file_browse_cancel;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, 0);
+	WM_operator_properties_filesel(ot, 0, FILE_SPECIAL);
 }
 
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index e1a6e346ce2..5d3c2c766a3 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -520,9 +520,11 @@ int file_exec(bContext *C, wmOperator *unused)
 		wmOperator *op= sfile->op;
 		
 		sfile->op = NULL;
+		RNA_string_set(op->ptr, "filename", sfile->params->file);
 		BLI_strncpy(name, sfile->params->dir, sizeof(name));
+		RNA_string_set(op->ptr, "directory", name);
 		strcat(name, sfile->params->file);
-		RNA_string_set(op->ptr, "filename", name);
+		RNA_string_set(op->ptr, "path", name);
 		
 		/* some ops have multiple files to select */
 		{
@@ -872,11 +874,13 @@ void FILE_OT_bookmark_toggle(struct wmOperatorType *ot)
 int file_filenum_exec(bContext *C, wmOperator *op)
 {
 	SpaceFile *sfile= CTX_wm_space_file(C);
+	ScrArea *sa= CTX_wm_area(C);
 	
 	int inc = RNA_int_get(op->ptr, "increment");
 	if(sfile->params && (inc != 0)) {
 		BLI_newname(sfile->params->file, inc);
-		WM_event_add_notifier(C, NC_WINDOW, NULL);
+		ED_area_tag_redraw(sa);
+		// WM_event_add_notifier(C, NC_WINDOW, NULL);
 	}
 	
 	return OPERATOR_FINISHED;
@@ -916,6 +920,24 @@ int file_rename_exec(bContext *C, wmOperator *op)
 
 }
 
+int file_rename_poll(bContext *C)
+{
+	int poll = ED_operator_file_active(C);
+	SpaceFile *sfile= CTX_wm_space_file(C);
+
+	if (sfile && sfile->params) {
+		if (sfile->params->active_file < 0) { 
+			poll= 0;
+		} else {
+			char dir[FILE_MAX], group[FILE_MAX];	
+			if (filelist_islibrary(sfile->files, dir, group)) poll= 0;
+		}
+	}
+	else
+		poll= 0;
+	return poll;
+}
+
 void FILE_OT_rename(struct wmOperatorType *ot)
 {
 	/* identifiers */
@@ -924,7 +946,7 @@ void FILE_OT_rename(struct wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec= file_rename_exec;
-	ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+	ot->poll= file_rename_poll; 
 
 }
 
@@ -938,6 +960,8 @@ int file_delete_poll(bContext *C)
 		if (sfile->params->active_file < 0) { 
 			poll= 0;
 		} else {
+			char dir[FILE_MAX], group[FILE_MAX];	
+			if (filelist_islibrary(sfile->files, dir, group)) poll= 0;
 			file = filelist_file(sfile->files, sfile->params->active_file);
 			if (file && S_ISDIR(file->type)) poll= 0;
 		}
diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index 24c3f9b4ca1..2d351016893 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -181,6 +181,12 @@ static void file_panel_operator(const bContext *C, Panel *pa)
 		RNA_STRUCT_BEGIN(op->ptr, prop) {
 			if(strcmp(RNA_property_identifier(prop), "rna_type") == 0)
 				continue;
+			if(strcmp(RNA_property_identifier(prop), "type") == 0)
+				continue;
+			if(strcmp(RNA_property_identifier(prop), "path") == 0)
+				continue;
+			if(strcmp(RNA_property_identifier(prop), "directory") == 0)
+				continue;
 			if(strcmp(RNA_property_identifier(prop), "filename") == 0)
 				continue;
 			if(strcmp(RNA_property_identifier(prop), "display") == 0)
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 538c1e4fce7..23f24f26dc0 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -60,6 +60,7 @@
 #include "BKE_library.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_report.h"
 #include "BLO_readfile.h"
 
 #include "DNA_space_types.h"
@@ -109,7 +110,6 @@ typedef struct FileList
 {
 	struct direntry *filelist;
 	int *fidx;
-
 	int numfiles;
 	int numfiltered;
 	char dir[FILE_MAX];
@@ -118,6 +118,12 @@ typedef struct FileList
 	short hide_dot;
 	unsigned int filter;
 	short changed;
+
+	struct BlendHandle *libfiledata;
+	short hide_parent;
+
+	void (*read)(struct FileList *);
+
 	ListBase loadimages;
 	ListBase threads;
 } FileList;
@@ -277,12 +283,20 @@ static int compare_extension(const void *a1, const void *a2) {
 
 void filelist_filter(FileList* filelist)
 {
+	/* char dir[FILE_MAX], group[GROUP_MAX]; XXXXX */
 	int num_filtered = 0;
 	int i, j;
 	
 	if (!filelist->filelist)
 		return;
 	
+	/* XXXXX TODO: check if the filter can be handled outside the filelist 
+	if ( ( (filelist->type == FILE_LOADLIB) &&  BIF_filelist_islibrary(filelist, dir, group)) 
+		|| (filelist->type == FILE_MAIN) ) {
+		filelist->filter = 0;
+	}
+	*/
+
 	if (!filelist->filter) {
 		if (filelist->fidx) {
 			MEM_freeN(filelist->fidx);
@@ -438,22 +452,28 @@ void folderlist_free(ListBase* folderlist)
 	folderlist= NULL;
 }
 
+static void filelist_read_main(struct FileList* filelist);
+static void filelist_read_library(struct FileList* filelist);
+static void filelist_read_dir(struct FileList* filelist);
+
 //------------------FILELIST------------------------//
-struct FileList*	filelist_new()
+struct FileList*	filelist_new(short type)
 {
 	FileList* p = MEM_callocN( sizeof(FileList), "filelist" );
+	switch(type) {
+		case FILE_MAIN:
+			p->read = filelist_read_main;
+			break;
+		case FILE_LOADLIB:
+			p->read = filelist_read_library;
+			break;
+		default:
+			p->read = filelist_read_dir;
+
+	}
 	return p;
 }
 
-struct FileList*	filelist_copy(struct FileList* filelist)
-{
-	FileList* p = filelist_new();
-	BLI_strncpy(p->dir, filelist->dir, FILE_MAX);
-	p->filelist = NULL;
-	p->fidx = NULL;
-
-	return p;
-}
 
 void filelist_free(struct FileList* filelist)
 {
@@ -493,6 +513,18 @@ void filelist_free(struct FileList* filelist)
 	filelist->hide_dot =0;
 }
 
+void filelist_freelib(struct FileList* filelist)
+{
+	if(filelist->libfiledata)	
+		BLO_blendhandle_close(filelist->libfiledata);
+	filelist->libfiledata= 0;
+}
+
+struct BlendHandle *filelist_lib(struct FileList* filelist)
+{
+	return filelist->libfiledata;
+}
+
 int	filelist_numfiles(struct FileList* filelist)
 {
 	return filelist->numfiltered;
@@ -733,16 +765,16 @@ void filelist_setfilter(struct FileList* filelist, unsigned int filter)
 	filelist->filter = filter;
 }
 
-void filelist_readdir(struct FileList* filelist)
+static void filelist_read_dir(struct FileList* filelist)
 {
 	char wdir[FILE_MAX];
-
 	if (!filelist) return;
+
 	filelist->fidx = 0;
 	filelist->filelist = 0;
 
 	BLI_getwdN(wdir);	 
-	
+
 	BLI_cleanup_dir(G.sce, filelist->dir);
 	BLI_hide_dot_files(filelist->hide_dot);
 	filelist->numfiles = BLI_getdir(filelist->dir, &(filelist->filelist));
@@ -750,12 +782,50 @@ void filelist_readdir(struct FileList* filelist)
 	chdir(wdir);
 	filelist_setfiletypes(filelist, G.have_quicktime);
 	filelist_filter(filelist);
-	
+
 	if (!filelist->threads.first) {
 		BLI_init_threads(&filelist->threads, exec_loadimages, 2);
 	}
 }
 
+static void filelist_read_main(struct FileList* filelist)
+{
+	if (!filelist) return;
+	filelist_from_main(filelist);
+}
+
+static void filelist_read_library(struct FileList* filelist)
+{
+	if (!filelist) return;
+	BLI_cleanup_dir(G.sce, filelist->dir);
+	filelist_from_library(filelist);
+	if(!filelist->libfiledata) {
+		int num;
+		struct direntry *file;
+		filelist_read_dir(filelist);
+		file = filelist->filelist;
+		for(num=0; num<filelist->numfiles; num++, file++) {
+			if(BLO_has_bfile_extension(file->relname)) {
+				char name[FILE_MAXDIR+FILE_MAXFILE];
+			
+				BLI_strncpy(name, filelist->dir, sizeof(name));
+				strcat(name, file->relname);
+				
+				/* prevent current file being used as acceptable dir */
+				if (BLI_streq(G.main->name, name)==0) {
+					file->type &= ~S_IFMT;
+					file->type |= S_IFDIR;
+				}
+			}
+		}
+	}
+}
+
+void filelist_readdir(struct FileList* filelist)
+{
+	filelist->read(filelist);
+}
+
 int filelist_empty(struct FileList* filelist)
 {	
 	return filelist->filelist == 0;
@@ -937,3 +1007,272 @@ void filelist_sort(struct FileList* filelist, short sort)
 
 	filelist_filter(filelist);
 }
+
+
+int filelist_islibrary(struct FileList* filelist, char* dir, char* group)
+{
+	return BLO_is_a_library(filelist->dir, dir, group);
+}
+
+static int groupname_to_code(char *group)
+{
+	char buf[32];
+	char *lslash;
+	
+	BLI_strncpy(buf, group, 31);
+	lslash= BLI_last_slash(buf);
+	if (lslash)
+		lslash[0]= '\0';
+
+	return BLO_idcode_from_name(buf);
+}
+
+void filelist_from_library(struct FileList* filelist)
+{
+	LinkNode *l, *names, *previews;
+	struct ImBuf* ima;
+	int ok, i, nnames, idcode;
+	char filename[FILE_MAXDIR+FILE_MAXFILE];
+	char dir[FILE_MAX], group[GROUP_MAX];	
+	
+	/* name test */
+	ok= filelist_islibrary(filelist, dir, group);
+	if (!ok) {
+		/* free */
+		if(filelist->libfiledata) BLO_blendhandle_close(filelist->libfiledata);
+		filelist->libfiledata= 0;
+		return;
+	}
+	
+	BLI_strncpy(filename, G.sce, sizeof(filename));	// G.sce = last file loaded, for UI
+
+	/* there we go */
+	/* for the time being only read filedata when libfiledata==0 */
+	if (filelist->libfiledata==0) {
+		filelist->libfiledata= BLO_blendhandle_from_file(dir);
+		if(filelist->libfiledata==0) return;
+	}
+	
+	idcode= groupname_to_code(group);
+
+		// memory for strings is passed into filelist[i].relname
+		// and free'd in freefilelist
+	previews = NULL;
+	if (idcode) {
+		previews= BLO_blendhandle_get_previews(filelist->libfiledata, idcode);
+		names= BLO_blendhandle_get_datablock_names(filelist->libfiledata, idcode);
+		/* ugh, no rewind, need to reopen */
+		BLO_blendhandle_close(filelist->libfiledata);
+		filelist->libfiledata= BLO_blendhandle_from_file(dir);
+		
+	} else {
+		names= BLO_blendhandle_get_linkable_groups(filelist->libfiledata);
+	}
+	
+	nnames= BLI_linklist_length(names);
+
+	filelist->numfiles= nnames + 1;
+	filelist->filelist= malloc(filelist->numfiles * sizeof(*filelist->filelist));
+	memset(filelist->filelist, 0, filelist->numfiles * sizeof(*filelist->filelist));
+
+	filelist->filelist[0].relname= BLI_strdup("..");
+	filelist->filelist[0].type |= S_IFDIR;
+		
+	for (i=0, l= names; i<nnames; i++, l= l->next) {
+		char *blockname= l->link;
+
+		filelist->filelist[i + 1].relname= BLI_strdup(blockname);
+		if (!idcode)
+			filelist->filelist[i + 1].type |= S_IFDIR;
+	}
+	
+	if(previews) {
+		for (i=0, l= previews; i<nnames; i++, l= l->next) {
+			PreviewImage *img= l->link;
+			
+			if (img) {
+				unsigned int w = img->w[PREVIEW_MIPMAP_LARGE];
+				unsigned int h = img->h[PREVIEW_MIPMAP_LARGE];
+				unsigned int *rect = img->rect[PREVIEW_MIPMAP_LARGE];
+
+				/* first allocate imbuf for copying preview into it */
+				if (w > 0 && h > 0 && rect) {
+					ima = IMB_allocImBuf(w, h, 32, IB_rect, 0);
+					memcpy(ima->rect, rect, w*h*sizeof(unsigned int));
+					filelist->filelist[i + 1].image = ima;
+					filelist->filelist[i + 1].flags = IMAGEFILE;
+				}
+			}
+		}
+	}
+
+	BLI_linklist_free(names, free);
+	if (previews) BLI_linklist_free(previews, (void(*)(void*)) MEM_freeN);
+
+	filelist_sort(filelist, FILE_SORT_ALPHA);
+
+	BLI_strncpy(G.sce, filename, sizeof(filename));	// prevent G.sce to change
+
+	filelist->filter = 0;
+	filelist_filter(filelist);
+}
+
+void filelist_hideparent(struct FileList* filelist, short hide)
+{
+	filelist->hide_parent = hide;
+}
+
+void filelist_from_main(struct FileList *filelist)
+{
+	ID *id;
+	struct direntry *files, *firstlib = NULL;
+	ListBase *lb;
+	int a, fake, idcode, ok, totlib, totbl;
+	
+	// filelist->type = FILE_MAIN; // XXXXX TODO: add modes to filebrowser
+
+	if(filelist->dir[0]=='/') filelist->dir[0]= 0;
+	
+	if(filelist->dir[0]) {
+		idcode= groupname_to_code(filelist->dir);
+		if(idcode==0) filelist->dir[0]= 0;
+	}
+	
+	if( filelist->dir[0]==0) {
+		
+		/* make directories */
+		filelist->numfiles= 23;
+		filelist->filelist= (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry));
+		
+		for(a=0; a<filelist->numfiles; a++) {
+			memset( &(filelist->filelist[a]), 0 , sizeof(struct direntry));
+			filelist->filelist[a].type |= S_IFDIR;
+		}
+		
+		filelist->filelist[0].relname= BLI_strdup("..");
+		filelist->filelist[2].relname= BLI_strdup("Scene");
+		filelist->filelist[3].relname= BLI_strdup("Object");
+		filelist->filelist[4].relname= BLI_strdup("Mesh");
+		filelist->filelist[5].relname= BLI_strdup("Curve");
+		filelist->filelist[6].relname= BLI_strdup("Metaball");
+		filelist->filelist[7].relname= BLI_strdup("Material");
+		filelist->filelist[8].relname= BLI_strdup("Texture");
+		filelist->filelist[9].relname= BLI_strdup("Image");
+		filelist->filelist[10].relname= BLI_strdup("Ika");
+		filelist->filelist[11].relname= BLI_strdup("Wave");
+		filelist->filelist[12].relname= BLI_strdup("Lattice");
+		filelist->filelist[13].relname= BLI_strdup("Lamp");
+		filelist->filelist[14].relname= BLI_strdup("Camera");
+		filelist->filelist[15].relname= BLI_strdup("Ipo");
+		filelist->filelist[16].relname= BLI_strdup("World");
+		filelist->filelist[17].relname= BLI_strdup("Screen");
+		filelist->filelist[18].relname= BLI_strdup("VFont");
+		filelist->filelist[19].relname= BLI_strdup("Text");
+		filelist->filelist[20].relname= BLI_strdup("Armature");
+		filelist->filelist[21].relname= BLI_strdup("Action");
+		filelist->filelist[22].relname= BLI_strdup("NodeTree");
+		filelist_sort(filelist, FILE_SORT_ALPHA);
+	}
+	else {
+
+		/* make files */
+		idcode= groupname_to_code(filelist->dir);
+		
+		lb= wich_libbase(G.main, idcode );
+		if(lb==0) return;
+		
+		id= lb->first;
+		filelist->numfiles= 0;
+		while(id) {
+			/* XXXXX TODO: the selection of the ipo blocktype might go somewhere else? 
+			if(filelist->has_func && idcode==ID_IP) {
+				if(filelist->ipotype== ((Ipo *)id)->blocktype) filelist->numfiles++;
+			}
+			else */
+			if (!filelist->hide_dot || id->name[2] != '.') {
+				filelist->numfiles++;
+			}
+			
+			id= id->next;
+		}
+		
+		/* XXXXX TODO: if databrowse F4 or append/link filelist->hide_parent has to be set */
+		if (!filelist->hide_parent) filelist->numfiles+= 1;
+		filelist->filelist= (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry));
+		
+		files = filelist->filelist;
+		
+		if (!filelist->hide_parent) {
+			memset( &(filelist->filelist[0]), 0 , sizeof(struct direntry));
+			filelist->filelist[0].relname= BLI_strdup("..");
+			filelist->filelist[0].type |= S_IFDIR;
+		
+			files++;
+		}
+		
+		id= lb->first;
+		totlib= totbl= 0;
+		
+		while(id) {
+#if 0 
+			// XXXXX TODO: this is deprecated, checks for correct IPO block? 
+			ok= 0;
+			if(filelist->has_func && idcode==ID_IP) {
+				if(filelist->ipotype== ((Ipo *)id)->blocktype) ok= 1;
+			}
+			else ok= 1;
+#endif			
+			ok = 1;
+			if(ok) {
+				if (!filelist->hide_dot || id->name[2] != '.') {
+					memset( files, 0 , sizeof(struct direntry));
+					if(id->lib==NULL)
+						files->relname= BLI_strdup(id->name+2);
+					else {
+						files->relname= MEM_mallocN(FILE_MAXDIR+FILE_MAXFILE+32, "filename for lib");
+						sprintf(files->relname, "%s | %s", id->lib->name, id->name+2);
+					}
+					/* files->type |= S_IFDIR; */
+#if 0				// XXXXX TODO show the selection status of the objects
+					if(!filelist->has_func) { /* F4 DATA BROWSE */
+						if(idcode==ID_OB) {
+							if( ((Object *)id)->flag & SELECT) files->flags |= ACTIVE;
+						}
+						else if(idcode==ID_SCE) {
+							if( ((Scene *)id)->r.scemode & R_BG_RENDER) files->flags |= ACTIVE;
+						}					
+					}
+#endif
+					files->nr= totbl+1;
+					files->poin= id;
+					fake= id->flag & LIB_FAKEUSER;
+					if(idcode == ID_MA || idcode == ID_TE || idcode == ID_LA || idcode == ID_WO || idcode == ID_IM) {
+						files->flags |= IMAGEFILE;
+					}
+					if(id->lib && fake) sprintf(files->extra, "LF %d", id->us);
+					else if(id->lib) sprintf(files->extra, "L    %d", id->us);
+					else if(fake) sprintf(files->extra, "F    %d", id->us);
+					else sprintf(files->extra, "      %d", id->us);
+					
+					if(id->lib) {
+						if(totlib==0) firstlib= files;
+						totlib++;
+					}
+					
+					files++;
+				}
+				totbl++;
+			}
+			
+			id= id->next;
+		}
+		
+		/* only qsort of library blocks */
+		if(totlib>1) {
+			qsort(firstlib, totlib, sizeof(struct direntry), compare_name);
+		}
+	}
+	filelist->filter = 0;
+	filelist_filter(filelist);
+}
+
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index dd3c2c766c1..a8d909f899e 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -42,12 +42,13 @@ struct FolderList;
 struct direntry;
 struct BlendHandle;
 struct Scene;
+struct Main;
 struct rcti;
+struct ReportList;
 
-struct FileList *	filelist_new();
+struct FileList *	filelist_new(short type);
 void				filelist_init_icons();
 void				filelist_free_icons();
-struct FileList *	filelist_copy(struct FileList* filelist);
 int					filelist_find(struct FileList* filelist, char *file);
 void				filelist_free(struct FileList* filelist);
 void				filelist_sort(struct FileList* filelist, short sort);
@@ -71,6 +72,13 @@ int					filelist_empty(struct FileList* filelist);
 void				filelist_parent(struct FileList* filelist);
 void				filelist_setfiletypes(struct FileList* filelist, short has_quicktime);
 
+
+int					filelist_islibrary (struct FileList* filelist, char* dir, char* group);
+void				filelist_from_main(struct FileList* filelist);
+void				filelist_from_library(struct FileList* filelist);
+void				filelist_freelib(struct FileList* filelist);
+void				filelist_hideparent(struct FileList* filelist, short hide);
+
 struct ListBase *	folderlist_new();
 void				folderlist_free(struct ListBase* folderlist);
 void				folderlist_popdir(struct ListBase* folderlist, char *dir);
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index f300505933f..b0bd3a9a5e7 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -123,6 +123,22 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 	/* set the parameters from the operator, if it exists */
 	if (op) {
 		BLI_strncpy(params->title, op->type->name, sizeof(params->title));
+
+		params->type = RNA_int_get(op->ptr, "type");
+
+		if (RNA_property_is_set(op->ptr, "path")) {
+			RNA_string_get(op->ptr, "path", name);
+			if (params->type == FILE_LOADLIB) {
+				BLI_strncpy(params->dir, name, sizeof(params->dir));
+				BLI_cleanup_dir(G.sce, params->dir);	
+			} else { 
+				/* if operator has path set, use it, otherwise keep the last */
+				BLI_convertstringcode(name, G.sce);
+				BLI_split_dirfile(name, dir, file);
+				BLI_strncpy(params->file, file, sizeof(params->file));
+				BLI_make_file_string(G.sce, params->dir, dir, ""); /* XXX needed ? - also solve G.sce */
+			}
+		}
 		params->filter = 0;
 		params->filter |= RNA_boolean_get(op->ptr, "filter_blender") ? BLENDERFILE : 0;
 		params->filter |= RNA_boolean_get(op->ptr, "filter_image") ? IMAGEFILE : 0;
@@ -136,21 +152,18 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		if (params->filter != 0)
 			params->flag |= FILE_FILTER;
 
-		params->flag |= FILE_HIDE_DOT;
-		
+		if (params->type == FILE_LOADLIB) {
+			params->flag |= FILE_HIDE_DOT;
+			params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
+			params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
+			params->flag |= RNA_boolean_get(op->ptr, "active_layer") ? FILE_ACTIVELAY : 0;
+		}
+
 		if(params->filter & (IMAGEFILE|MOVIEFILE))
 			params->display= FILE_IMGDISPLAY;
 		else
 			params->display= FILE_SHORTDISPLAY;
 		
-		/* if operator has path set, use it, otherwise keep the last */
-		if (RNA_property_is_set(op->ptr, "filename")) {
-			RNA_string_get(op->ptr, "filename", name);
-			BLI_convertstringcode(name, G.sce);
-			BLI_split_dirfile(name, dir, file);
-			BLI_strncpy(params->file, file, sizeof(params->file));
-			BLI_make_file_string(G.sce, params->dir, dir, ""); /* XXX needed ? - also solve G.sce */		
-		}
 	} else {
 		/* default values, if no operator */
 		params->flag |= FILE_HIDE_DOT;
@@ -357,19 +370,15 @@ FileLayout* ED_fileselect_get_layout(struct SpaceFile *sfile, struct ARegion *ar
 void file_change_dir(struct SpaceFile *sfile)
 {
 	if (sfile->params) { 
-		if (BLI_exists(sfile->params->dir)) {
-			filelist_setdir(sfile->files, sfile->params->dir);
+		filelist_setdir(sfile->files, sfile->params->dir);
 
-			if(folderlist_clear_next(sfile))
-				folderlist_free(sfile->folders_next);
+		if(folderlist_clear_next(sfile))
+			folderlist_free(sfile->folders_next);
 
-			folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
+		folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
 
-			filelist_free(sfile->files);
-			sfile->params->active_file = -1;
-		} else {
-			BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), FILE_MAX);
-		}
+		filelist_free(sfile->files);
+		sfile->params->active_file = -1;
 	}
 }
 
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 722fa475727..f71defe3949 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -119,6 +119,7 @@ static void file_free(SpaceLink *sl)
 	SpaceFile *sfile= (SpaceFile *) sl;
 	
 	if(sfile->files) {
+		filelist_freelib(sfile->files);
 		filelist_free(sfile->files);
 		MEM_freeN(sfile->files);
 		sfile->files= NULL;
@@ -165,7 +166,7 @@ static SpaceLink *file_duplicate(SpaceLink *sl)
 	/* clear or remove stuff from old */
 	sfilen->op = NULL; /* file window doesn't own operators */
 
-	sfilen->files = filelist_new();
+	sfilen->files = filelist_new(sfileo->params->type);
 	if(sfileo->folders_prev)
 		sfilen->folders_prev = MEM_dupallocN(sfileo->folders_prev);
 
@@ -190,7 +191,7 @@ static void file_refresh(const bContext *C, ScrArea *sa)
 	if (!sfile->folders_prev)
 		sfile->folders_prev = folderlist_new();
 	if (!sfile->files) {
-		sfile->files = filelist_new();
+		sfile->files = filelist_new(params->type);
 		file_change_dir(sfile);
 		params->active_file = -1; // added this so it opens nicer (ton)
 	}
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index bee06e6892f..806d0d7ce52 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -609,7 +609,7 @@ static const EnumPropertyItem image_file_type_items[] = {
 
 static void image_filesel(bContext *C, wmOperator *op, const char *path)
 {
-	RNA_string_set(op->ptr, "filename", path);
+	RNA_string_set(op->ptr, "path", path);
 	WM_event_add_fileselect(C, op); 
 }
 
@@ -623,7 +623,7 @@ static int open_exec(bContext *C, wmOperator *op)
 	Image *ima= NULL;
 	char str[FILE_MAX];
 
-	RNA_string_get(op->ptr, "filename", str);
+	RNA_string_get(op->ptr, "path", str);
 	ima= BKE_add_image_file(str, scene->r.cfra);
 
 	if(!ima)
@@ -640,7 +640,7 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	SpaceImage *sima= CTX_wm_space_image(C);
 	char *path= (sima->image)? sima->image->name: U.textudir;
 
-	if(RNA_property_is_set(op->ptr, "filename"))
+	if(RNA_property_is_set(op->ptr, "path"))
 		return open_exec(C, op);
 	
 	image_filesel(C, op, path);
@@ -663,7 +663,7 @@ void IMAGE_OT_open(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL);
 }
 
 /******************** replace image operator ********************/
@@ -676,7 +676,7 @@ static int replace_exec(bContext *C, wmOperator *op)
 	if(!sima->image)
 		return OPERATOR_CANCELLED;
 	
-	RNA_string_get(op->ptr, "filename", str);
+	RNA_string_get(op->ptr, "path", str);
 	BLI_strncpy(sima->image->name, str, sizeof(sima->image->name)-1); /* we cant do much if the str is longer then 240 :/ */
 
 	BKE_image_signal(sima->image, &sima->iuser, IMA_SIGNAL_RELOAD);
@@ -693,7 +693,7 @@ static int replace_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	if(!sima->image)
 		return OPERATOR_CANCELLED;
 
-	if(RNA_property_is_set(op->ptr, "filename"))
+	if(RNA_property_is_set(op->ptr, "path"))
 		return replace_exec(C, op);
 
 	image_filesel(C, op, path);
@@ -716,7 +716,7 @@ void IMAGE_OT_replace(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL);
 }
 
 /******************** save image as operator ********************/
@@ -801,7 +801,7 @@ static int save_as_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	sima->imtypenr= RNA_enum_get(op->ptr, "file_type");
-	RNA_string_get(op->ptr, "filename", str);
+	RNA_string_get(op->ptr, "path", str);
 
 	save_image_doit(C, sima, scene, op, str);
 
@@ -815,7 +815,7 @@ static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	ImBuf *ibuf= ED_space_image_buffer(sima);
 	Scene *scene= CTX_data_scene(C);
 
-	if(RNA_property_is_set(op->ptr, "filename"))
+	if(RNA_property_is_set(op->ptr, "path"))
 		return save_as_exec(C, op);
 	
 	if(!ima)
@@ -861,7 +861,7 @@ void IMAGE_OT_save_as(wmOperatorType *ot)
 
 	/* properties */
 	RNA_def_enum(ot->srna, "file_type", image_file_type_items, R_PNG, "File Type", "File type to save image as.");
-	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL);
 }
 
 /******************** save image operator ********************/
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c
index 640c968742c..f4d8682b8ea 100644
--- a/source/blender/editors/space_info/info_ops.c
+++ b/source/blender/editors/space_info/info_ops.c
@@ -300,11 +300,11 @@ void FILE_OT_report_missing_files(wmOperatorType *ot)
 
 static int find_missing_files_exec(bContext *C, wmOperator *op)
 {
-	char *filename;
+	char *path;
 	
-	filename= RNA_string_get_alloc(op->ptr, "filename", NULL, 0);
-	findMissingFiles(filename);
-	MEM_freeN(filename);
+	path= RNA_string_get_alloc(op->ptr, "path", NULL, 0);
+	findMissingFiles(path);
+	MEM_freeN(path);
 
 	return OPERATOR_FINISHED;
 }
@@ -330,7 +330,7 @@ void FILE_OT_find_missing_files(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, 0);
+	WM_operator_properties_filesel(ot, 0, FILE_SPECIAL);
 }
 
 #if 0
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c
index 88b8dccc6c9..c17793b28f8 100644
--- a/source/blender/editors/space_script/script_edit.c
+++ b/source/blender/editors/space_script/script_edit.c
@@ -64,10 +64,10 @@ static int run_pyfile_exec(bContext *C, wmOperator *op)
 	ARegion *ar= CTX_wm_region(C);
 	
 
-	char filename[512];
-	RNA_string_get(op->ptr, "filename", filename);
+	char path[512];
+	RNA_string_get(op->ptr, "path", path);
 #ifndef DISABLE_PYTHON
-	if(BPY_run_python_script(C, filename, NULL, op->reports)) {
+	if(BPY_run_python_script(C, path, NULL, op->reports)) {
 		ED_region_tag_redraw(ar);
 		return OPERATOR_FINISHED;
 	}
@@ -85,7 +85,7 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot)
 	ot->exec= run_pyfile_exec;
 	ot->poll= ED_operator_areaactive;
 
-	RNA_def_string_file_path(ot->srna, "filename", "", 512, "Filename", "");
+	RNA_def_string_file_path(ot->srna, "path", "", 512, "Path", "");
 }
 
 static int run_ui_scripts_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c
index aa35ba54b7f..270cc1ffd8f 100644
--- a/source/blender/editors/space_script/script_ops.c
+++ b/source/blender/editors/space_script/script_ops.c
@@ -68,7 +68,7 @@ void script_keymap(wmWindowManager *wm)
 	ListBase *keymap= WM_keymap_listbase(wm, "Script", SPACE_SCRIPT, 0);
 
 	/* TODO - this is just while we have no way to load a text datablock */
-	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0)->ptr, "filename", "test.py");
+	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0)->ptr, "path", "test.py");
 	WM_keymap_add_item(keymap, "SCRIPT_OT_python_run_ui_scripts", PKEY, KM_PRESS, KM_SHIFT, 0);
 }
 
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 8a1b3bf3465..bd5259ddb52 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -289,7 +289,7 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op)
 	Editing *ed= seq_give_editing(scene, TRUE);
 
 	struct anim *an;
-	char filename[FILE_MAX];
+	char path[FILE_MAX];
 
 	Sequence *seq, *soundseq=NULL;	/* generic strip vars */
 	Strip *strip;
@@ -301,12 +301,12 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op)
 	channel= RNA_int_get(op->ptr, "channel");
 	sound = RNA_boolean_get(op->ptr, "sound");
 
-	RNA_string_get(op->ptr, "filename", filename);
+	RNA_string_get(op->ptr, "path", path);
 	
-	an = openanim(filename, IB_rect);
+	an = openanim(path, IB_rect);
 
 	if (an==NULL) {
-		BKE_reportf(op->reports, RPT_ERROR, "Filename \"%s\" could not be loaded as a movie", filename);
+		BKE_reportf(op->reports, RPT_ERROR, "File \"%s\" could not be loaded as a movie", path);
 		return OPERATOR_CANCELLED;
 	}
 	
@@ -323,7 +323,7 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op)
 	
 	strip->stripdata= se= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
 	
-	BLI_split_dirfile_basic(filename, strip->dir, se->name);
+	BLI_split_dirfile_basic(path, strip->dir, se->name);
 
 	RNA_string_get(op->ptr, "name", seq->name);
 	
@@ -332,7 +332,7 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op)
 
 	if(sound)
 	{
-		soundseq = sequencer_add_sound_strip(C, NULL, start_frame, channel+1, filename);
+		soundseq = sequencer_add_sound_strip(C, NULL, start_frame, channel+1, path);
 		if(soundseq != NULL)
 			RNA_string_get(op->ptr, "name", soundseq->name);
 	}
@@ -376,7 +376,7 @@ void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE, FILE_SPECIAL);
 	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
 	RNA_def_boolean(ot->srna, "sound", TRUE, "Sound", "Load sound with the movie");
 }
@@ -384,7 +384,7 @@ void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot)
 /* add sound operator */
 static int sequencer_add_sound_strip_exec(bContext *C, wmOperator *op)
 {
-	char filename[FILE_MAX];
+	char path[FILE_MAX];
 	Scene *scene= CTX_data_scene(C);
 	Sequence *seq;	/* generic strip vars */
 	int start_frame, channel; /* operator props */
@@ -392,9 +392,9 @@ static int sequencer_add_sound_strip_exec(bContext *C, wmOperator *op)
 	start_frame= RNA_int_get(op->ptr, "start_frame");
 	channel= RNA_int_get(op->ptr, "channel");
 	
-	RNA_string_get(op->ptr, "filename", filename);
+	RNA_string_get(op->ptr, "path", path);
 
-	seq = sequencer_add_sound_strip(C, op, start_frame, channel, filename);
+	seq = sequencer_add_sound_strip(C, op, start_frame, channel, path);
 
 	if(seq == NULL)
 		return OPERATOR_CANCELLED;
@@ -442,7 +442,7 @@ void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL);
 	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
 	RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory.");
 }
@@ -455,7 +455,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op)
 
 	int tot_images;
 
-	char filename[FILE_MAX];
+	char path[FILE_MAX];
 
 	Sequence *seq;	/* generic strip vars */
 	Strip *strip;
@@ -466,14 +466,14 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op)
 	start_frame= RNA_int_get(op->ptr, "start_frame");
 	channel= RNA_int_get(op->ptr, "channel");
 	
-	RNA_string_get(op->ptr, "filename", filename);
+	RNA_string_get(op->ptr, "path", path);
 
 	seq = alloc_sequence(ed->seqbasep, start_frame, channel);	
 	seq->type= SEQ_IMAGE;
 	
 	/* basic defaults */
 	seq->strip= strip= MEM_callocN(sizeof(Strip), "strip");
-	BLI_split_dirfile_basic(filename, strip->dir, NULL);
+	BLI_split_dirfile_basic(path, strip->dir, NULL);
 	
 	tot_images= RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files"));
 	
@@ -490,7 +490,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op)
 		RNA_END;
 	}
 	else {
-		BLI_split_dirfile_basic(filename, NULL, se->name);
+		BLI_split_dirfile_basic(path, NULL, se->name);
 	}
 
 	RNA_string_get(op->ptr, "name", seq->name);
@@ -538,7 +538,7 @@ void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL);
 	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
 	
 	RNA_def_collection_runtime(ot->srna, "files", &RNA_OperatorFileListElement, "Files", "");
@@ -606,15 +606,15 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op)
 		strip->stripdata= se= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
 
 	if (seq->type==SEQ_PLUGIN) {
-		char filename[FILE_MAX];
-		RNA_string_get(op->ptr, "filename", filename);
+		char path[FILE_MAX];
+		RNA_string_get(op->ptr, "path", path);
 
-		sh.init_plugin(seq, filename);
+		sh.init_plugin(seq, path);
 
 		if(seq->plugin==NULL) {
 			BLI_remlink(ed->seqbasep, seq);
 			seq_free_sequence(scene, seq);
-			BKE_reportf(op->reports, RPT_ERROR, "Sequencer plugin \"%s\" could not load.", filename);
+			BKE_reportf(op->reports, RPT_ERROR, "Sequencer plugin \"%s\" could not load.", path);
 			return OPERATOR_CANCELLED;
 		}
 	}
@@ -673,7 +673,7 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	WM_operator_properties_filesel(ot, 0);
+	WM_operator_properties_filesel(ot, 0, FILE_SPECIAL);
 	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME|SEQPROP_ENDFRAME);
 	RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, "Type", "Sequencer effect type");
 	RNA_def_float_vector(ot->srna, "color", 3, NULL, 0.0f, 1.0f, "Color", "Initialize the strip with this color (only used when type='COLOR')", 0.0f, 1.0f);
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 3411d9114df..3568f50dfe1 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -192,7 +192,7 @@ static int open_exec(bContext *C, wmOperator *op)
 	Text *text;
 	char str[FILE_MAX];
 
-	RNA_string_get(op->ptr, "filename", str);
+	RNA_string_get(op->ptr, "path", str);
 
 	text= add_text(str, G.sce);
 
@@ -211,10 +211,10 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	Text *text= CTX_data_edit_text(C);
 	char *path= (text && text->name)? text->name: G.sce;
 
-	if(RNA_property_is_set(op->ptr, "filename"))
+	if(RNA_property_is_set(op->ptr, "path"))
 		return open_exec(C, op);
 	
-	RNA_string_set(op->ptr, "filename", path);
+	RNA_string_set(op->ptr, "path", path);
 	WM_event_add_fileselect(C, op); 
 
 	return OPERATOR_RUNNING_MODAL;
@@ -233,7 +233,7 @@ void TEXT_OT_open(wmOperatorType *ot)
 	ot->poll= text_new_poll;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE, FILE_SPECIAL);
 }
 
 /******************* reload operator *********************/
@@ -420,7 +420,7 @@ static int save_as_exec(bContext *C, wmOperator *op)
 	if(!text)
 		return OPERATOR_CANCELLED;
 
-	RNA_string_get(op->ptr, "filename", str);
+	RNA_string_get(op->ptr, "path", str);
 
 	if(text->name) MEM_freeN(text->name);
 	text->name= BLI_strdup(str);
@@ -438,7 +438,7 @@ static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	Text *text= CTX_data_edit_text(C);
 	char *str;
 
-	if(RNA_property_is_set(op->ptr, "filename"))
+	if(RNA_property_is_set(op->ptr, "path"))
 		return save_as_exec(C, op);
 
 	if(text->name)
@@ -448,7 +448,7 @@ static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	else
 		str= G.sce;
 	
-	RNA_string_set(op->ptr, "filename", str);
+	RNA_string_set(op->ptr, "path", str);
 	WM_event_add_fileselect(C, op); 
 
 	return OPERATOR_RUNNING_MODAL;
@@ -467,7 +467,7 @@ void TEXT_OT_save_as(wmOperatorType *ot)
 	ot->poll= text_edit_poll;
 
 	/* properties */
-	WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE, FILE_SPECIAL);
 }
 
 /******************* run script operator *********************/
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 6fdc3a7787b..5c1b363aa39 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -154,24 +154,23 @@ typedef struct FileSelectParams {
 	char dir[240]; /* directory */
 	char file[80]; /* file */
 
-	short flag; /* settings for filter, hiding files and display mode */
+	short type; /* XXXXX for now store type here, should be moved to the operator */
+	short flag; /* settings for filter, hiding dots files,...  */
 	short sort; /* sort order */
 	short display; /* display mode flag */
 	short filter; /* filter when (flags & FILE_FILTER) is true */
 
 	/* XXX - temporary, better move to filelist */
 	short active_bookmark;
-	short pad;
 	int	active_file;
 	int selstate;
 
+	/* short 
 	/* XXX --- still unused -- */
 	short f_fp; /* show font preview */
 	short menu; /* currently selected option in pupmenu */
 	char fp_str[8]; /* string to use for font preview */
-	
 	char *pupmenu; /* allows menu for save options - result stored in menup */
-	
 	/* XXX --- end unused -- */
 } FileSelectParams;
 
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h
index 42c5343dbff..595562503aa 100644
--- a/source/blender/makesrna/RNA_define.h
+++ b/source/blender/makesrna/RNA_define.h
@@ -83,6 +83,7 @@ PropertyRNA *RNA_def_int_array(StructOrFunctionRNA *cont, const char *identifier
 PropertyRNA *RNA_def_string(StructOrFunctionRNA *cont, const char *identifier, const char *default_value, int maxlen, const char *ui_name, const char *ui_description);
 PropertyRNA *RNA_def_string_file_path(StructOrFunctionRNA *cont, const char *identifier, const char *default_value, int maxlen, const char *ui_name, const char *ui_description);
 PropertyRNA *RNA_def_string_dir_path(StructOrFunctionRNA *cont, const char *identifier, const char *default_value, int maxlen, const char *ui_name, const char *ui_description);
+PropertyRNA *RNA_def_string_file_name(StructOrFunctionRNA *cont, const char *identifier, const char *default_value, int maxlen, const char *ui_name, const char *ui_description);
 
 PropertyRNA *RNA_def_enum(StructOrFunctionRNA *cont, const char *identifier, const EnumPropertyItem *items, int default_value, const char *ui_name, const char *ui_description);
 void RNA_def_enum_funcs(PropertyRNA *prop, EnumPropertyItemFunc itemfunc);
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index c6fed5cd8e6..e7fe86afd03 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -89,6 +89,7 @@ typedef enum PropertySubType {
 	/* strings */
 	PROP_FILEPATH = 1,
 	PROP_DIRPATH = 2,
+	PROP_FILENAME = 3,
 
 	/* numbers */
 	PROP_UNSIGNED = 13,
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 8d05cbde74c..6bca237e02f 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -2113,6 +2113,20 @@ PropertyRNA *RNA_def_string_dir_path(StructOrFunctionRNA *cont_, const char *ide
 	return prop;
 }
 
+PropertyRNA *RNA_def_string_file_name(StructOrFunctionRNA *cont_, const char *identifier, const char *default_value, int maxlen, 
+	const char *ui_name, const char *ui_description)
+{
+	ContainerRNA *cont= cont_;
+	PropertyRNA *prop;
+	
+	prop= RNA_def_property(cont, identifier, PROP_STRING, PROP_FILENAME);
+	if(maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen);
+	if(default_value) RNA_def_property_string_default(prop, default_value);
+	RNA_def_property_ui_text(prop, ui_name, ui_description);
+
+	return prop;
+}
+
 PropertyRNA *RNA_def_enum(StructOrFunctionRNA *cont_, const char *identifier, const EnumPropertyItem *items, int default_value, 
 	const char *ui_name, const char *ui_description)
 {
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 544804b26d6..6610c5d8931 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -139,7 +139,7 @@ void		WM_event_window_timer_sleep(struct wmWindow *win, struct wmTimer *timer, i
 int			WM_menu_invoke			(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
 			/* invoke callback, confirm menu + exec */
 int			WM_operator_confirm		(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
-		/* invoke callback, file selector "filename" unset + exec */
+		/* invoke callback, file selector "path" unset + exec */
 int			WM_operator_filesel		(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
 			/* poll callback, context checks */
 int			WM_operator_winactive	(struct bContext *C);
@@ -169,7 +169,7 @@ int			WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int con
 
 void		WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring);
 void		WM_operator_properties_free(struct PointerRNA *ptr);
-void		WM_operator_properties_filesel(struct wmOperatorType *ot, int filter);
+void		WM_operator_properties_filesel(struct wmOperatorType *ot, int filter, short type);
 
 		/* operator as a python command (resultuing string must be free'd) */
 char		*WM_operator_pystring(struct bContext *C, struct wmOperatorType *ot, struct PointerRNA *opptr, int all_args);
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 3c03d24ca93..79441f33610 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -895,9 +895,7 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
 	switch(event->val) {
 		case EVT_FILESELECT_OPEN: 
 		case EVT_FILESELECT_FULL_OPEN: 
-			{
-				char *dir= NULL; char *path= RNA_string_get_alloc(handler->op->ptr, "filename", NULL, 0);
-					
+			{	
 				if(event->val==EVT_FILESELECT_OPEN)
 					ED_area_newspace(C, handler->op_area, SPACE_FILE);
 				else
@@ -908,8 +906,6 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
 				sfile->op= handler->op;
 
 				ED_fileselect_set_params(sfile);
-				dir = NULL;
-				MEM_freeN(path);
 				
 				action= WM_HANDLER_BREAK;
 			}
@@ -920,7 +916,7 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
 			{
 				/* XXX validate area and region? */
 				bScreen *screen= CTX_wm_screen(C);
-				char *path= RNA_string_get_alloc(handler->op->ptr, "filename", NULL, 0);
+				char *path= RNA_string_get_alloc(handler->op->ptr, "path", NULL, 0);
 				
 				if(screen != handler->filescreen)
 					ED_screen_full_prevspace(C);
@@ -1250,7 +1246,7 @@ void WM_event_fileselect_event(bContext *C, void *ophandle, int eventval)
 	}
 }
 
-/* operator is supposed to have a filled "filename" property */
+/* operator is supposed to have a filled "path" property */
 /* optional property: filetype (XXX enum?) */
 
 /* Idea is to keep a handler alive on window queue, owning the operator.
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 37cd424ac18..66724b57ff8 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -46,12 +46,16 @@
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h" /*for WM_operator_pystring */
 
+#include "BLO_readfile.h"
+
 #include "BKE_blender.h"
 #include "BKE_context.h"
+#include "BKE_depsgraph.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_utildefines.h"
 
@@ -496,10 +500,10 @@ int WM_operator_confirm(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_CANCELLED;
 }
 
-/* op->invoke, opens fileselect if filename property not set, otherwise executes */
+/* op->invoke, opens fileselect if path property not set, otherwise executes */
 int WM_operator_filesel(bContext *C, wmOperator *op, wmEvent *event)
 {
-	if (RNA_property_is_set(op->ptr, "filename")) {
+	if (RNA_property_is_set(op->ptr, "path")) {
 		return WM_operator_call(C, op);
 	} 
 	else {
@@ -509,9 +513,11 @@ int WM_operator_filesel(bContext *C, wmOperator *op, wmEvent *event)
 }
 
 /* default properties for fileselect */
-void WM_operator_properties_filesel(wmOperatorType *ot, int filter)
+void WM_operator_properties_filesel(wmOperatorType *ot, int filter, short type)
 {
-	RNA_def_string_file_path(ot->srna, "filename", "", FILE_MAX, "Filename", "Path to file.");
+	RNA_def_string_file_path(ot->srna, "path", "", FILE_MAX, "FilePath", "Path to file.");
+	RNA_def_string_file_name(ot->srna, "filename", "", FILE_MAX, "FileName", "Name of the file.");
+	RNA_def_string_dir_path(ot->srna, "directory", "", FILE_MAX, "Directory", "Directory of the file.");
 
 	RNA_def_boolean(ot->srna, "filter_blender", (filter & BLENDERFILE), "Filter .blend files", "");
 	RNA_def_boolean(ot->srna, "filter_image", (filter & IMAGEFILE), "Filter image files", "");
@@ -521,6 +527,10 @@ void WM_operator_properties_filesel(wmOperatorType *ot, int filter)
 	RNA_def_boolean(ot->srna, "filter_sound", (filter & SOUNDFILE), "Filter sound files", "");
 	RNA_def_boolean(ot->srna, "filter_text", (filter & TEXTFILE), "Filter text files", "");
 	RNA_def_boolean(ot->srna, "filter_folder", (filter & FOLDERFILE), "Filter folders", "");
+
+	RNA_def_int(ot->srna, "type", type, FILE_LOADLIB, FILE_SPECIAL, 
+		"File Browser Mode", "The setting for the file browser mode to load a .blend file, a library or a special file.",
+		FILE_LOADLIB, FILE_SPECIAL);
 }
 
 /* op->poll */
@@ -891,7 +901,7 @@ static void load_set_load_ui(wmOperator *op)
 
 static int wm_open_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	RNA_string_set(op->ptr, "filename", G.sce);
+	RNA_string_set(op->ptr, "path", G.sce);
 	load_set_load_ui(op);
 
 	WM_event_add_fileselect(C, op);
@@ -901,9 +911,9 @@ static int wm_open_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 static int wm_open_mainfile_exec(bContext *C, wmOperator *op)
 {
-	char filename[FILE_MAX];
+	char path[FILE_MAX];
 
-	RNA_string_get(op->ptr, "filename", filename);
+	RNA_string_get(op->ptr, "path", path);
 	load_set_load_ui(op);
 
 	if(RNA_boolean_get(op->ptr, "load_ui"))
@@ -915,7 +925,7 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op)
 	// do it before for now, but is this correct with multiple windows?
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
-	WM_read_file(C, filename, op->reports);
+	WM_read_file(C, path, op->reports);
 	
 	return 0;
 }
@@ -930,11 +940,168 @@ static void WM_OT_open_mainfile(wmOperatorType *ot)
 	ot->exec= wm_open_mainfile_exec;
 	ot->poll= WM_operator_winactive;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER);
 
 	RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file.");
 }
 
+static int wm_link_append_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	if (RNA_property_is_set(op->ptr, "path")) {
+		return WM_operator_call(C, op);
+	} 
+	else {
+		/* XXX solve where to get last linked library from */
+		RNA_string_set(op->ptr, "path", G.lib);
+		WM_event_add_fileselect(C, op);
+		return OPERATOR_RUNNING_MODAL;
+	}
+}
+
+static short wm_link_append_flag(wmOperator *op)
+{
+	short flag = 0;
+	if (RNA_boolean_get(op->ptr, "autoselect")) flag |= FILE_AUTOSELECT;
+	if (RNA_boolean_get(op->ptr, "active_layer")) flag |= FILE_ACTIVELAY;
+	if (RNA_boolean_get(op->ptr, "relative_paths")) flag |= FILE_STRINGCODE;
+	if (RNA_boolean_get(op->ptr, "link")) flag |= FILE_LINK;
+	return flag;
+}
+
+#define GROUP_MAX 32
+
+
+static void make_library_local(const char *libname, Main *main)
+{
+	struct Library *lib;
+
+	/* and now find the latest append lib file */
+	lib= main->library.first;
+	while(lib) {
+		if (BLI_streq(libname, lib->filename)) break;
+		lib= lib->id.next;
+	}
+	
+	/* make local */
+	if(lib) {
+		all_local(lib, 1);
+		/* important we unset, otherwise these object wont
+		 * link into other scenes from this blend file */
+		flag_all_listbases_ids(LIB_APPEND_TAG, 0);
+	}
+}
+
+static int wm_link_append_exec(bContext *C, wmOperator *op)
+{
+	char name[FILE_MAX], dir[FILE_MAX], libname[FILE_MAX], group[GROUP_MAX];
+	int idcode;
+	BlendHandle *bh;
+	struct Main *main= CTX_data_main(C);
+	struct Scene *scene= CTX_data_scene(C);
+	struct Main *mainl= 0;
+	
+	struct ScrArea *sa= CTX_wm_area(C);
+	PropertyRNA *prop;
+	int totfiles=0;
+	short flag;
+
+	name[0] = '\0';
+	RNA_string_get(op->ptr, "filename", name);
+	RNA_string_get(op->ptr, "directory", dir);
+
+	if ( BLO_is_a_library(dir, libname, group)==0 ) {
+		BKE_report(op->reports, RPT_ERROR, "Not a library");
+		return OPERATOR_FINISHED;
+	} else if (group[0]==0) {
+		BKE_report(op->reports, RPT_ERROR, "Nothing indicated");
+		return OPERATOR_FINISHED;
+	} else if (BLI_streq(main->name, libname)) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot use current file as library");
+		return OPERATOR_FINISHED;
+	}
+
+	/* check if something is indicated for append/link */
+	prop = RNA_struct_find_property(op->ptr, "files");
+	if (prop) {
+		totfiles= RNA_property_collection_length(op->ptr, prop);
+		if (totfiles == 0) {
+			if (name[0] == '\0') {
+				BKE_report(op->reports, RPT_ERROR, "Nothing indicated");
+				return OPERATOR_FINISHED;
+			}
+		}
+	} else if (name[0] == '\0') {
+		BKE_report(op->reports, RPT_ERROR, "Nothing indicated");
+		return OPERATOR_FINISHED;
+	}
+
+	/* now we have or selected, or an indicated file */
+	if (RNA_boolean_get(op->ptr, "autoselect"))
+		scene_deselect_all(scene);
+
+	bh = BLO_blendhandle_from_file(libname);
+	idcode = BLO_idcode_from_name(group);
+	
+	flag = wm_link_append_flag(op);
+
+	if((flag & FILE_LINK)==0) {
+		/* tag everything, all untagged data can be made local */
+		flag_all_listbases_ids(LIB_APPEND_TAG, 1);
+	}
+
+	/* here appending/linking starts */
+	mainl = BLO_library_append_begin(C, &bh, libname);
+	if (totfiles == 0) {
+		BLO_library_append_named_part(C, mainl, &bh, name, idcode, flag);
+	} else {
+		RNA_BEGIN(op->ptr, itemptr, "files") {
+			RNA_string_get(&itemptr, "name", name);
+			BLO_library_append_named_part(C, mainl, &bh, name, idcode, flag);
+		}
+		RNA_END;
+	}
+	BLO_library_append_end(C, mainl, &bh, idcode, flag);
+	
+	/* DISPLISTS? */
+	recalc_all_library_objects(main);
+
+	/* Append, rather than linking */
+	if ((flag & FILE_LINK)==0) {
+		make_library_local(main, libname);
+	}
+
+	/* do we need to do this? */
+	if(scene)
+		DAG_scene_sort(scene);
+
+	BLO_blendhandle_close(bh);
+	BLI_strncpy(G.lib, dir, FILE_MAX);
+
+	WM_event_add_notifier(C, NC_WINDOW, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+static void WM_OT_link_append(wmOperatorType *ot)
+{
+	ot->name= "Link/Append from Library";
+	ot->idname= "WM_OT_link_append";
+	ot->description= "Link or Append from a Library .blend file";
+	
+	ot->invoke= wm_link_append_invoke;
+	ot->exec= wm_link_append_exec;
+	ot->poll= WM_operator_winactive;
+	
+	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_LOADLIB);
+	
+	RNA_def_boolean(ot->srna, "link", 1, "Link", "Link the objects or datablocks rather than appending.");
+	RNA_def_boolean(ot->srna, "autoselect", 1, "Select", "Select the linked objects.");
+	RNA_def_boolean(ot->srna, "active_layer", 1, "Active Layer", "Put the linked objects on the active layer.");
+	RNA_def_boolean(ot->srna, "relative_paths", 1, "Relative Paths", "Store the library path as a relative path to current .blend file.");
+
+	RNA_def_collection_runtime(ot->srna, "files", &RNA_OperatorFileListElement, "Files", "");
+}	
+
 static int wm_recover_last_session_exec(bContext *C, wmOperator *op)
 {
 	char scestr[FILE_MAX], filename[FILE_MAX];
@@ -987,7 +1154,7 @@ static int wm_save_as_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *even
 	
 	BLI_strncpy(name, G.sce, FILE_MAX);
 	untitled(name);
-	RNA_string_set(op->ptr, "filename", name);
+	RNA_string_set(op->ptr, "path", name);
 	
 	WM_event_add_fileselect(C, op);
 
@@ -997,20 +1164,20 @@ static int wm_save_as_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *even
 /* function used for WM_OT_save_mainfile too */
 static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
 {
-	char filename[FILE_MAX];
+	char path[FILE_MAX];
 	int compress;
 
 	save_set_compress(op);
 	compress= RNA_boolean_get(op->ptr, "compress");
 	
-	if(RNA_property_is_set(op->ptr, "filename"))
-		RNA_string_get(op->ptr, "filename", filename);
+	if(RNA_property_is_set(op->ptr, "path"))
+		RNA_string_get(op->ptr, "path", path);
 	else {
-		BLI_strncpy(filename, G.sce, FILE_MAX);
-		untitled(filename);
+		BLI_strncpy(path, G.sce, FILE_MAX);
+		untitled(path);
 	}
 
-	WM_write_file(C, filename, compress, op->reports);
+	WM_write_file(C, path, compress, op->reports);
 	
 	WM_event_add_notifier(C, NC_WM|ND_FILESAVE, NULL);
 
@@ -1027,7 +1194,7 @@ static void WM_OT_save_as_mainfile(wmOperatorType *ot)
 	ot->exec= wm_save_as_mainfile_exec;
 	ot->poll= WM_operator_winactive;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER);
 	RNA_def_boolean(ot->srna, "compress", 0, "Compress", "Write compressed .blend file.");
 }
 
@@ -1041,7 +1208,7 @@ static int wm_save_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	
 	BLI_strncpy(name, G.sce, FILE_MAX);
 	untitled(name);
-	RNA_string_set(op->ptr, "filename", name);
+	RNA_string_set(op->ptr, "path", name);
 	uiPupMenuSaveOver(C, op, name);
 
 	return OPERATOR_RUNNING_MODAL;
@@ -1057,7 +1224,7 @@ static void WM_OT_save_mainfile(wmOperatorType *ot)
 	ot->exec= wm_save_as_mainfile_exec;
 	ot->poll= WM_operator_winactive;
 	
-	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE);
+	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER);
 	RNA_def_boolean(ot->srna, "compress", 0, "Compress", "Write compressed .blend file.");
 }
 
@@ -1913,6 +2080,7 @@ void wm_operatortype_init(void)
 	WM_operatortype_append(WM_OT_exit_blender);
 	WM_operatortype_append(WM_OT_open_recentfile);
 	WM_operatortype_append(WM_OT_open_mainfile);
+	WM_operatortype_append(WM_OT_link_append);
 	WM_operatortype_append(WM_OT_recover_last_session);
 	WM_operatortype_append(WM_OT_jobs_timer);
 	WM_operatortype_append(WM_OT_save_as_mainfile);
@@ -1944,6 +2112,7 @@ void wm_window_keymap(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0); 
 	WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_link_append", OKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 

From 5ac5988448b89ecfdff955499743169c4e8a369e Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sat, 12 Sep 2009 20:18:54 +0000
Subject: [PATCH 544/577] Bugfix: Append crashed because of wrong parameters
 passed.

---
 source/blender/windowmanager/intern/wm_operators.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 66724b57ff8..54ba18e3df5 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1067,7 +1067,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
 
 	/* Append, rather than linking */
 	if ((flag & FILE_LINK)==0) {
-		make_library_local(main, libname);
+		make_library_local(libname, main);
 	}
 
 	/* do we need to do this? */

From 26942cd78936d9f160478aff3d6df11514c9d50d Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sat, 12 Sep 2009 20:47:53 +0000
Subject: [PATCH 545/577] Pointcache: * Flagging object caches as outdated and
 use PTCACHE_RESET_OUTDATED as reset event

---
 source/blender/editors/object/object_edit.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index aaf6ed387c7..e5a8df8cb26 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -334,10 +334,20 @@ void ED_object_exit_editmode(bContext *C, int flag)
 
 	/* freedata only 0 now on file saves */
 	if(freedata) {
+		ListBase pidlist;
+		PTCacheID *pid;
+
 		/* for example; displist make is different in editmode */
 		scene->obedit= NULL; // XXX for context
+
+		/* flag object caches as outdated */
+		BKE_ptcache_ids_from_object(&pidlist, obedit);
+		for(pid=pidlist.first; pid; pid=pid->next) {
+			if(pid->type != PTCACHE_TYPE_PARTICLES) /* particles don't need reset on geometry change */
+				pid->cache->flag |= PTCACHE_OUTDATED;
+		}
 		
-		BKE_ptcache_object_reset(scene, obedit, PTCACHE_RESET_DEPSGRAPH);
+		BKE_ptcache_object_reset(scene, obedit, PTCACHE_RESET_OUTDATED);
 
 		/* also flush ob recalc, doesn't take much overhead, but used for particles */
 		DAG_id_flush_update(&obedit->id, OB_RECALC_OB|OB_RECALC_DATA);

From fb599348d39d940d722b79864dd8d171d5ed973a Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sat, 12 Sep 2009 23:56:30 +0000
Subject: [PATCH 546/577] * Removed the grey overlapping 'region manipulation'
 triangles.

- They were causing unnecessary visual noise, breaking up the lines of the region edges
- Now you can just drag anywhere on a region edge to resize it, like existing area edges
- To minimise a region, click once on the region edge, or resize it down to nothing. For minimised regions, a (+) icon will appear, which you can click to restore it to the size it was before it was minimised.
---
 .../blender/editors/include/ED_screen_types.h |   2 +-
 source/blender/editors/screen/area.c          | 199 +++++++++++-------
 source/blender/editors/screen/screen_ops.c    |  22 +-
 .../editors/space_view3d/view3d_draw.c        |   2 +-
 4 files changed, 132 insertions(+), 93 deletions(-)

diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h
index 72afe7704b4..dcdc9e417e4 100644
--- a/source/blender/editors/include/ED_screen_types.h
+++ b/source/blender/editors/include/ED_screen_types.h
@@ -59,7 +59,7 @@ typedef struct AZone {
 	/* internal */
 	short do_draw;
 	/* for draw */
-	short x1, y1, x2, y2, x3, y3;
+	short x1, y1, x2, y2;
 	/* for clip */
 	rcti rect;	
 } AZone;
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 2cdb75e28e3..93348d9d556 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -159,14 +159,8 @@ void ED_area_overdraw_flush(bContext *C, ScrArea *sa, ARegion *ar)
 	for(az= sa->actionzones.first; az; az= az->next) {
 		int xs, ys;
 		
-		if(az->type==AZONE_AREA) {
-			xs= (az->x1+az->x2)/2;
-			ys= (az->y1+az->y2)/2;
-		}
-		else {
-			xs= az->x3;
-			ys= az->y3;
-		}
+		xs= (az->x1+az->x2)/2;
+		ys= (az->y1+az->y2)/2;
 
 		/* test if inside */
 		if(BLI_in_rcti(&ar->winrct, xs, ys)) {
@@ -196,25 +190,42 @@ static void area_draw_azone(short x1, short y1, short x2, short y2)
 	fdrawline(xmin, ymax-2*dy+1, xmax-2*dx+1, ymin);
 }
 
+
 static void region_draw_azone(ScrArea *sa, AZone *az)
 {
+	GLUquadricObj *qobj = gluNewQuadric(); 
+	short midx = az->x1 + (az->x2 - az->x1)/2;
+	short midy = az->y1 + (az->y2 - az->y1)/2;
+	
 	if(az->ar==NULL) return;
 	
-	UI_SetTheme(sa->spacetype, az->ar->type->regionid);
+	/* only display action zone icons when the region is hidden */
+	if (!(az->ar->flag & RGN_FLAG_HIDDEN)) return;
 	
-	UI_ThemeColor(TH_BACK);
-	glBegin(GL_TRIANGLES);
-	glVertex2s(az->x1, az->y1);
-	glVertex2s(az->x2, az->y2);
-	glVertex2s(az->x3, az->y3);
-	glEnd();
+	glPushMatrix(); 	
+	glTranslatef(midx, midy, 0.); 
 	
-	UI_ThemeColorShade(TH_BACK, 50);
-	sdrawline(az->x1, az->y1, az->x3, az->y3);
-	
-	UI_ThemeColorShade(TH_BACK, -50);
-	sdrawline(az->x2, az->y2, az->x3, az->y3);
+	/* outlined circle */
+	glEnable(GL_LINE_SMOOTH);
 
+	glColor4f(1.f, 1.f, 1.f, 0.8f);
+
+	gluQuadricDrawStyle(qobj, GLU_FILL); 
+	gluDisk( qobj, 0.0,  4.25f, 16, 1); 
+
+	glColor4f(0.2f, 0.2f, 0.2f, 0.9f);
+	
+	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE); 
+	gluDisk( qobj, 0.0,  4.25f, 16, 1); 
+	
+	glDisable(GL_LINE_SMOOTH);
+	
+	glPopMatrix();
+	gluDeleteQuadric(qobj);
+	
+	/* + */
+	sdrawline(midx, midy-2, midx, midy+3);
+	sdrawline(midx-2, midy, midx+3, midy);
 }
 
 
@@ -235,10 +246,11 @@ void ED_area_overdraw(bContext *C)
 		AZone *az;
 		for(az= sa->actionzones.first; az; az= az->next) {
 			if(az->do_draw) {
-				if(az->type==AZONE_AREA)
+				if(az->type==AZONE_AREA) {
 					area_draw_azone(az->x1, az->y1, az->x2, az->y2);
-				else if(az->type==AZONE_REGION)
+				} else if(az->type==AZONE_REGION) {
 					region_draw_azone(sa, az);
+				}
 				
 				az->do_draw= 0;
 			}
@@ -449,9 +461,91 @@ static void area_azone_initialize(ScrArea *sa)
 	BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
+#define AZONEPAD_EDGE	4
+#define AZONEPAD_ICON	6
+static void region_azone_edge(AZone *az, ARegion *ar)
+{
+	if(az->edge=='t') {
+		az->x1= ar->winrct.xmin;
+		az->y1= ar->winrct.ymax - AZONEPAD_EDGE;
+		az->x2= ar->winrct.xmax;
+		az->y2= ar->winrct.ymax;
+	}
+	else if(az->edge=='b') {
+		az->x1= ar->winrct.xmin;
+		az->y1= ar->winrct.ymin + AZONEPAD_EDGE;
+		az->x2= ar->winrct.xmax;
+		az->y2= ar->winrct.ymin;
+	}
+	else if(az->edge=='l') {
+		az->x1= ar->winrct.xmin;
+		az->y1= ar->winrct.ymin;
+		az->x2= ar->winrct.xmin + AZONEPAD_EDGE;
+		az->y2= ar->winrct.ymax;
+	}
+	else { // if(az->edge=='r') {
+		az->x1= ar->winrct.xmax;
+		az->y1= ar->winrct.ymin;
+		az->x2= ar->winrct.xmax - AZONEPAD_EDGE;
+		az->y2= ar->winrct.ymax;
+	}
+
+	BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
+}
+
+static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar)
+{
+	AZone *azt;
+	
+	if(az->edge=='t') {
+		az->x1= ar->winrct.xmax - AZONEPAD_ICON;
+		az->y1= ar->winrct.ymax + AZONEPAD_ICON;
+		az->x2= ar->winrct.xmax - 2*AZONEPAD_ICON;
+		az->y2= ar->winrct.ymax + 2*AZONEPAD_ICON;
+	}
+	else if(az->edge=='b') {
+		az->x1= ar->winrct.xmin + AZONEPAD_ICON;
+		az->y1= ar->winrct.ymin - AZONEPAD_ICON;
+		az->x2= ar->winrct.xmin + 2*AZONEPAD_ICON;
+		az->y2= ar->winrct.ymin - 2*AZONEPAD_ICON;
+	}
+	else if(az->edge=='l') {
+		az->x1= ar->winrct.xmin - 2*AZONEPAD_ICON;
+		az->y1= ar->winrct.ymax - 3*AZONEPAD_ICON;
+		az->x2= ar->winrct.xmin - AZONEPAD_ICON;
+		az->y2= ar->winrct.ymax - 2*AZONEPAD_ICON;
+	}
+	else { // if(az->edge=='r') {
+		az->x1= ar->winrct.xmax + AZONEPAD_ICON;
+		az->y1= ar->winrct.ymax - 3*AZONEPAD_ICON;
+		az->x2= ar->winrct.xmax + 2*AZONEPAD_ICON;
+		az->y2= ar->winrct.ymax - 2*AZONEPAD_ICON;
+	}
+
+	BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
+	
+	/* if more azones on 1 spot, set offset */
+	for(azt= sa->actionzones.first; azt; azt= azt->next) {
+		if(az!=azt) {
+			if( ABS(az->x1-azt->x1) < 2 && ABS(az->y1-azt->y1) < 2) {
+				if(az->edge=='t' || az->edge=='b') {
+					az->x1+= AZONESPOT;
+					az->x2+= AZONESPOT;
+					BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
+				}
+				else {
+					az->y1-= AZONESPOT;
+					az->y2-= AZONESPOT;
+					BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
+				}
+			}
+		}
+	}
+}
+
 static void region_azone_initialize(ScrArea *sa, ARegion *ar, char edge) 
 {
-	AZone *az, *azt;
+	AZone *az;
 	
 	az= (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
 	BLI_addtail(&(sa->actionzones), az);
@@ -459,61 +553,10 @@ static void region_azone_initialize(ScrArea *sa, ARegion *ar, char edge)
 	az->ar= ar;
 	az->edge= edge;
 	
-	if(edge=='t') {
-		az->x1= ar->winrct.xmin+AZONESPOT;
-		az->y1= ar->winrct.ymax;
-		az->x2= ar->winrct.xmin+2*AZONESPOT;
-		az->y2= ar->winrct.ymax;
-		az->x3= (az->x1+az->x2)/2;
-		az->y3= az->y2+AZONESPOT/2;
-		BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y3);
-	}
-	else if(edge=='b') {
-		az->x1= ar->winrct.xmin+AZONESPOT;
-		az->y1= ar->winrct.ymin;
-		az->x2= ar->winrct.xmin+2*AZONESPOT;
-		az->y2= ar->winrct.ymin;
-		az->x3= (az->x1+az->x2)/2;
-		az->y3= az->y2-AZONESPOT/2;
-		BLI_init_rcti(&az->rect, az->x1, az->x2, az->y3, az->y1);
-	}
-	else if(edge=='l') {
-		az->x1= ar->winrct.xmin;
-		az->y1= ar->winrct.ymax-AZONESPOT;
-		az->x2= ar->winrct.xmin;
-		az->y2= ar->winrct.ymax-2*AZONESPOT;
-		az->x3= az->x2-AZONESPOT/2;
-		az->y3= (az->y1+az->y2)/2;
-		BLI_init_rcti(&az->rect, az->x3, az->x1, az->y1, az->y2);
-	}
-	else { // if(edge=='r') {
-		az->x1= ar->winrct.xmax;
-		az->y1= ar->winrct.ymax-AZONESPOT;
-		az->x2= ar->winrct.xmax;
-		az->y2= ar->winrct.ymax-2*AZONESPOT;
-		az->x3= az->x2+AZONESPOT/2;
-		az->y3= (az->y1+az->y2)/2;
-		BLI_init_rcti(&az->rect, az->x1, az->x3, az->y1, az->y2);
-	}
-	
-	/* if more azones on 1 spot, set offset */
-	for(azt= sa->actionzones.first; azt; azt= azt->next) {
-		if(az!=azt) {
-			if( ABS(az->x1-azt->x1) < 2 && ABS(az->y1-azt->y1) < 2) {
-				if(edge=='t' || edge=='b') {
-					az->x1+= AZONESPOT;
-					az->x2+= AZONESPOT;
-					az->x3+= AZONESPOT;
-					BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y3);
-				}
-				else {
-					az->y1-= AZONESPOT;
-					az->y2-= AZONESPOT;
-					az->y3-= AZONESPOT;
-					BLI_init_rcti(&az->rect, az->x1, az->x3, az->y1, az->y2);
-				}
-			}
-		}
+	if (ar->flag & RGN_FLAG_HIDDEN) {
+		region_azone_icon(sa, az, ar);
+	} else {
+		region_azone_edge(az, ar);
 	}
 	
 }
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index bb9d940edca..0ac50d85ff4 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -396,15 +396,7 @@ AZone *is_in_area_actionzone(ScrArea *sa, int x, int y)
 					break;
 			}
 			else if(az->type == AZONE_REGION) {
-				float v1[2], v2[2], v3[2], pt[2];
-				
-				v1[0]= az->x1; v1[1]= az->y1;
-				v2[0]= az->x2; v2[1]= az->y2;
-				v3[0]= az->x3; v3[1]= az->y3;
-				pt[0]= x; pt[1]=y;
-
-				if(IsPointInTri2D(v1, v2, v3, pt)) 
-					break;
+				break;
 			}
 		}
 	}
@@ -1273,7 +1265,9 @@ static void SCREEN_OT_area_split(wmOperatorType *ot)
 /* ************** scale region edge operator *********************************** */
 
 typedef struct RegionMoveData {
+	AZone *az;
 	ARegion *ar;
+	ScrArea *sa;
 	int bigger, smaller, origval;
 	int origx, origy;
 	char edge;
@@ -1290,7 +1284,9 @@ static int region_scale_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		
 		op->customdata= rmd;
 		
+		rmd->az = az;
 		rmd->ar= az->ar;
+		rmd->sa = sad->sa1;
 		rmd->edge= az->edge;
 		rmd->origx= event->x;
 		rmd->origy= event->y;
@@ -1322,8 +1318,8 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event)
 				if(rmd->edge=='l') delta= -delta;
 				rmd->ar->type->minsizex= rmd->origval + delta;
 				CLAMP(rmd->ar->type->minsizex, 0, 1000);
-				if(rmd->ar->type->minsizex < 10) {
-					rmd->ar->type->minsizex= 10;
+				if(rmd->ar->type->minsizex < 24) {
+					rmd->ar->type->minsizex= rmd->origval;
 					rmd->ar->flag |= RGN_FLAG_HIDDEN;
 				}
 				else
@@ -1334,8 +1330,8 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event)
 				if(rmd->edge=='b') delta= -delta;
 				rmd->ar->type->minsizey= rmd->origval + delta;
 				CLAMP(rmd->ar->type->minsizey, 0, 1000);
-				if(rmd->ar->type->minsizey < 10) {
-					rmd->ar->type->minsizey= 10;
+				if(rmd->ar->type->minsizey < 24) {
+					rmd->ar->type->minsizey= rmd->origval;
 					rmd->ar->flag |= RGN_FLAG_HIDDEN;
 				}
 				else
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 66113ec4941..8571d3601c6 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -742,7 +742,7 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d)
 
 	if (printable) {
 		UI_ThemeColor(TH_TEXT_HI);
-		BLF_draw_default(10,  ar->winy-20, 0.0f, printable);
+		BLF_draw_default(20,  ar->winy-20, 0.0f, printable);
 	}
 
 	if (v3d->localview) {

From 57ec59fb85a08371d360e9633e8f14ec3f882534 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 13 Sep 2009 02:14:41 +0000
Subject: [PATCH 547/577] Compile fix: silencing warning due to /*.../* in a
 header

(It's strange seeing/making commits in trunk again after ignoring it as 'inferior' stuff for over a year now XD)
---
 source/blender/makesdna/DNA_space_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 5c1b363aa39..97ddb291136 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -165,7 +165,7 @@ typedef struct FileSelectParams {
 	int	active_file;
 	int selstate;
 
-	/* short 
+	/* short */
 	/* XXX --- still unused -- */
 	short f_fp; /* show font preview */
 	short menu; /* currently selected option in pupmenu */

From 896ada37ac2d9913f514a772b8e2356bac2b32ab Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 13 Sep 2009 03:08:46 +0000
Subject: [PATCH 548/577] * Gave the region icons a bit more padding for the
 clickable area

---
 source/blender/editors/screen/area.c              | 10 +++++-----
 source/blender/editors/space_view3d/view3d_draw.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 93348d9d556..81f06611c39 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -462,7 +462,7 @@ static void area_azone_initialize(ScrArea *sa)
 }
 
 #define AZONEPAD_EDGE	4
-#define AZONEPAD_ICON	6
+#define AZONEPAD_ICON	8
 static void region_azone_edge(AZone *az, ARegion *ar)
 {
 	if(az->edge=='t') {
@@ -511,15 +511,15 @@ static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar)
 	}
 	else if(az->edge=='l') {
 		az->x1= ar->winrct.xmin - 2*AZONEPAD_ICON;
-		az->y1= ar->winrct.ymax - 3*AZONEPAD_ICON;
+		az->y1= ar->winrct.ymax - 2*AZONEPAD_ICON;
 		az->x2= ar->winrct.xmin - AZONEPAD_ICON;
-		az->y2= ar->winrct.ymax - 2*AZONEPAD_ICON;
+		az->y2= ar->winrct.ymax - AZONEPAD_ICON;
 	}
 	else { // if(az->edge=='r') {
 		az->x1= ar->winrct.xmax + AZONEPAD_ICON;
-		az->y1= ar->winrct.ymax - 3*AZONEPAD_ICON;
+		az->y1= ar->winrct.ymax - 2*AZONEPAD_ICON;
 		az->x2= ar->winrct.xmax + 2*AZONEPAD_ICON;
-		az->y2= ar->winrct.ymax - 2*AZONEPAD_ICON;
+		az->y2= ar->winrct.ymax - AZONEPAD_ICON;
 	}
 
 	BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 8571d3601c6..918aebda8e1 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -742,7 +742,7 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d)
 
 	if (printable) {
 		UI_ThemeColor(TH_TEXT_HI);
-		BLF_draw_default(20,  ar->winy-20, 0.0f, printable);
+		BLF_draw_default(22,  ar->winy-17, 0.0f, printable);
 	}
 
 	if (v3d->localview) {

From 82a7b73d5aa4706d77028663ab35c0180d508751 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 13 Sep 2009 03:30:51 +0000
Subject: [PATCH 549/577] 2.5 - UI Bugfixes

* Loading newly saved files (where linked-libs were used) crashed.
However, libraries still don't get loaded correctly yet for some reason...

* Pointer layout-items now draw without their UI text if their name is set to "" (i.e. text=""), making the ones with icons appear normal. This is kindof a hack, since it would be better to expose icon_only, but this way is less work.
---
 source/blender/blenloader/intern/readfile.c | 3 ++-
 source/blender/makesrna/intern/rna_ui_api.c | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 83abd5c2b4d..c2d745bfc8e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -11062,9 +11062,10 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
 
 					printf("read library: lib %s\n", mainptr->curlib->name);
 					fd= blo_openblenderfile(mainptr->curlib->filename, &reports);
-					fd->reports= basefd->reports;
 
 					if (fd) {
+						fd->reports= basefd->reports;
+						
 						if (fd->libmap)
 							oldnewmap_free(fd->libmap);
 
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 20948843f8a..ab2dfe5e33c 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -44,6 +44,9 @@ static void rna_uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr,
 	flag |= (slider)? UI_ITEM_R_SLIDER: 0;
 	flag |= (expand)? UI_ITEM_R_EXPAND: 0;
 	flag |= (toggle)? UI_ITEM_R_TOGGLE: 0;
+	
+		// XXX: an 'icon_only' prop should be added instead, but for now, this makes ptrs look ok
+	flag |= (name && name[0]==0)? UI_ITEM_R_ICON_ONLY: 0; 
 
 	uiItemR(layout, name, icon, ptr, propname, flag);
 }

From 69496abf1d91829afdfcb807e06a2f48f19ffbc3 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 13 Sep 2009 03:56:30 +0000
Subject: [PATCH 550/577] Crash Fix: Sequencer Add->Effects->... menu crashed.

Unfortunately, this menu is now empty, but this shows that the sequencer code is probably doing something funky...

http://dpaste.com/92865/
---
 source/blender/editors/interface/interface_layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index bf449dba597..6211c79beca 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -718,7 +718,7 @@ void uiItemEnumO_string(uiLayout *layout, char *name, int icon, char *opname, ch
 	/* enum lookup */
 	if((prop= RNA_struct_find_property(&ptr, propname))) {
 		RNA_property_enum_items(layout->root->block->evil_C, &ptr, prop, &item, NULL, &free);
-		if(RNA_enum_value_from_id(item, value_str, &value)==0) {
+		if(item==NULL || RNA_enum_value_from_id(item, value_str, &value)==0) {
 			if(free) MEM_freeN(item);
 			printf("uiItemEnumO_string: %s.%s, enum %s not found.\n", RNA_struct_identifier(ptr.type), propname, value_str);
 			return;

From b1e418db20cb854a933f0dcf9689a9104b99be7d Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sun, 13 Sep 2009 07:00:44 +0000
Subject: [PATCH 551/577] 2.5 filebrowser fix operator property name 'type' was
 used by sequencer for strip effect type. Changed to 'filemode' for file
 browser.

---
 source/blender/editors/space_file/file_panels.c    | 2 +-
 source/blender/editors/space_file/filesel.c        | 2 +-
 source/blender/windowmanager/intern/wm_operators.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c
index 2d351016893..1b54277c383 100644
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@ -181,7 +181,7 @@ static void file_panel_operator(const bContext *C, Panel *pa)
 		RNA_STRUCT_BEGIN(op->ptr, prop) {
 			if(strcmp(RNA_property_identifier(prop), "rna_type") == 0)
 				continue;
-			if(strcmp(RNA_property_identifier(prop), "type") == 0)
+			if(strcmp(RNA_property_identifier(prop), "filemode") == 0)
 				continue;
 			if(strcmp(RNA_property_identifier(prop), "path") == 0)
 				continue;
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index b0bd3a9a5e7..e22e9f8e023 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -124,7 +124,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 	if (op) {
 		BLI_strncpy(params->title, op->type->name, sizeof(params->title));
 
-		params->type = RNA_int_get(op->ptr, "type");
+		params->type = RNA_int_get(op->ptr, "filemode");
 
 		if (RNA_property_is_set(op->ptr, "path")) {
 			RNA_string_get(op->ptr, "path", name);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 54ba18e3df5..b57edcb4dfc 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -528,7 +528,7 @@ void WM_operator_properties_filesel(wmOperatorType *ot, int filter, short type)
 	RNA_def_boolean(ot->srna, "filter_text", (filter & TEXTFILE), "Filter text files", "");
 	RNA_def_boolean(ot->srna, "filter_folder", (filter & FOLDERFILE), "Filter folders", "");
 
-	RNA_def_int(ot->srna, "type", type, FILE_LOADLIB, FILE_SPECIAL, 
+	RNA_def_int(ot->srna, "filemode", type, FILE_LOADLIB, FILE_SPECIAL, 
 		"File Browser Mode", "The setting for the file browser mode to load a .blend file, a library or a special file.",
 		FILE_LOADLIB, FILE_SPECIAL);
 }

From 7eea0b647cbfa7cadec14b07b696bf10830189e8 Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sun, 13 Sep 2009 08:08:50 +0000
Subject: [PATCH 552/577] 2.5 filebrowser Fix crash when loading old files with
 filebrowser UI Partial Fix for invoking filebrowser via spacetype pupmenu:
 reset directory in filelist Make paths relative in 'path' return when
 requested by 'relative_paths' property in operator

---
 source/blender/editors/space_file/file_ops.c   | 4 ++++
 source/blender/editors/space_file/filesel.c    | 8 +++++++-
 source/blender/editors/space_file/space_file.c | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 5d3c2c766a3..e51fd421c8c 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -524,6 +524,10 @@ int file_exec(bContext *C, wmOperator *unused)
 		BLI_strncpy(name, sfile->params->dir, sizeof(name));
 		RNA_string_set(op->ptr, "directory", name);
 		strcat(name, sfile->params->file);
+
+		if ( RNA_boolean_get(op->ptr, "relative_paths") ) {
+			BLI_makestringcode(G.sce, name);
+		}
 		RNA_string_set(op->ptr, "path", name);
 		
 		/* some ops have multiple files to select */
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index e22e9f8e023..f226b3de260 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -117,6 +117,8 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		BLI_strncpy(sfile->params->file, file, sizeof(sfile->params->file));
 		BLI_make_file_string(G.sce, sfile->params->dir, dir, ""); /* XXX needed ? - also solve G.sce */
 	}
+	
+	ED_fileselect_reset_params(sfile);
 
 	params = sfile->params;
 
@@ -173,13 +175,17 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 	}
 
 	/* new params, refresh file list */
-	if(sfile->files) filelist_free(sfile->files);
+	if(sfile->files) { 
+		filelist_free(sfile->files);
+		filelist_setdir(sfile->files, params->dir);
+	}
 
 	return 1;
 }
 
 void ED_fileselect_reset_params(SpaceFile *sfile)
 {
+	sfile->params->type = FILE_UNIX;
 	sfile->params->flag = 0;
 	sfile->params->title[0] = '\0';
 }
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index f71defe3949..bceeec1cb55 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -166,7 +166,8 @@ static SpaceLink *file_duplicate(SpaceLink *sl)
 	/* clear or remove stuff from old */
 	sfilen->op = NULL; /* file window doesn't own operators */
 
-	sfilen->files = filelist_new(sfileo->params->type);
+	if (sfileo->params)
+		sfilen->files = filelist_new(sfileo->params->type);
 	if(sfileo->folders_prev)
 		sfilen->folders_prev = MEM_dupallocN(sfileo->folders_prev);
 

From f9694287d9a9a2ca5d031d6fbf4aa05045944ecc Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 13 Sep 2009 08:50:54 +0000
Subject: [PATCH 553/577] svn merge
 https://svn.blender.org/svnroot/bf-blender/branches/blender2.4 -r23172:HEAD

merging now to save confusion later since the changes between last merge and 23172 shouldn't be merged.

brings 2.4 and trunk in sync aside from sequencer edits from Peter.
---
 source/blender/imbuf/intern/jp2.c          |  4 +--
 source/gameengine/Ketsji/KX_NearSensor.cpp | 33 +++++++++++++---------
 source/gameengine/Ketsji/KX_NearSensor.h   |  3 ++
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 6217cd6bea2..2583a155d6a 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -230,7 +230,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, int size, int flags)
 				rect_float[2]= (float)(image->comps[2].data[index] + signed_offsets[2]) / float_divs[2];
 				
 				if (image->numcomps >= 4)
-					rect_float[3]= (float)(image->comps[2].data[index] + signed_offsets[3]) / float_divs[3];
+					rect_float[3]= (float)(image->comps[3].data[index] + signed_offsets[3]) / float_divs[3];
 				else
 					rect_float[3]= 1.0f;
 			}
@@ -260,7 +260,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, int size, int flags)
 				rect[2]= image->comps[2].data[index] + signed_offsets[2];
 				
 				if (image->numcomps >= 4)
-					rect[3]= image->comps[2].data[index] + signed_offsets[3];
+					rect[3]= image->comps[3].data[index] + signed_offsets[3];
 				else
 					rect[3]= 255;
 			}
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp
index f7baacdfa61..c6a6304cb2c 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.cpp
+++ b/source/gameengine/Ketsji/KX_NearSensor.cpp
@@ -142,6 +142,22 @@ KX_NearSensor::~KX_NearSensor()
 		delete m_client_info;
 }
 
+void KX_NearSensor::SetPhysCtrlRadius()
+{
+	if (m_bTriggered)
+	{
+		if (m_physCtrl)
+		{
+			m_physCtrl->SetRadius(m_ResetMargin);
+		}
+	} else
+	{
+		if (m_physCtrl)
+		{
+			m_physCtrl->SetRadius(m_Margin);
+		}
+	}
+}
 
 bool KX_NearSensor::Evaluate()
 {
@@ -151,20 +167,9 @@ bool KX_NearSensor::Evaluate()
 	if (m_bTriggered != m_bLastTriggered)
 	{
 		m_bLastTriggered = m_bTriggered;
-		if (m_bTriggered)
-		{
-			if (m_physCtrl)
-			{
-				m_physCtrl->SetRadius(m_ResetMargin);
-			}
-		} else
-		{
-			if (m_physCtrl)
-			{
-				m_physCtrl->SetRadius(m_Margin);
-			}
-
-		}
+		
+		SetPhysCtrlRadius();
+		
 		result = true;
 	}
 
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index 03d6f830579..4f0247d209d 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -68,6 +68,7 @@ public:
 	virtual void SynchronizeTransform();
 	virtual CValue* GetReplica();
 	virtual void ProcessReplica();
+	virtual void SetPhysCtrlRadius();
 	virtual bool Evaluate();
 
 	virtual void ReParent(SCA_IObject* parent);
@@ -91,6 +92,8 @@ public:
 		if (sensor->m_Margin > sensor->m_ResetMargin)
 			sensor->m_ResetMargin = sensor->m_Margin;
 
+		sensor->SetPhysCtrlRadius();
+			
 		return 0;
 	}
 

From 78bb6ce0347234d9103453d1242ec8e397d3eb7f Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sun, 13 Sep 2009 09:41:00 +0000
Subject: [PATCH 554/577] 2.5 filebrowser * Fix for space init when loading
 with pupmenu (without operator) - parameters now get reset * experimental:
 made new director operator jump directly into renaming

---
 source/blender/editors/space_file/file_ops.c   |  4 +++-
 source/blender/editors/space_file/filesel.c    |  3 ++-
 source/blender/editors/space_file/space_file.c | 16 +++++++++++++++-
 source/blender/makesdna/DNA_space_types.h      |  1 +
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index e51fd421c8c..9705a36fc75 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -705,7 +705,9 @@ int file_directory_new_exec(bContext *C, wmOperator *unused)
 			BLI_join_dirfile(tmpstr, tmpstr, tmpdir);
 		}
 		BLI_recurdir_fileops(tmpstr);
-		if (!BLI_exists(tmpstr)) {
+		if (BLI_exists(tmpstr)) {
+			BLI_strncpy(sfile->params->renamefile, tmpdir, FILE_MAXFILE);
+		} else {
 			filelist_free(sfile->files);
 			filelist_parent(sfile->files);
 			BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), FILE_MAX);
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index f226b3de260..085eecd2a7d 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -154,8 +154,9 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		if (params->filter != 0)
 			params->flag |= FILE_FILTER;
 
+		params->flag |= FILE_HIDE_DOT;
+
 		if (params->type == FILE_LOADLIB) {
-			params->flag |= FILE_HIDE_DOT;
 			params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
 			params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
 			params->flag |= RNA_boolean_get(op->ptr, "active_layer") ? FILE_ACTIVELAY : 0;
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index bceeec1cb55..47839ea0342 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -45,6 +45,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
+#include "BLI_storage_types.h"
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
@@ -154,6 +155,9 @@ static void file_free(SpaceLink *sl)
 /* spacetype; init callback, area size changes, screen set, etc */
 static void file_init(struct wmWindowManager *wm, ScrArea *sa)
 {
+	SpaceFile *sfile= (SpaceFile*)sa->spacedata.first;
+	MEM_freeN(sfile->params);
+	sfile->params = 0;
 	printf("file_init\n");
 }
 
@@ -203,7 +207,17 @@ static void file_refresh(const bContext *C, ScrArea *sa)
 		filelist_readdir(sfile->files);
 	}
 	if(params->sort!=FILE_SORT_NONE) filelist_sort(sfile->files, params->sort);		
-
+	
+	if (params->renamefile[0] != '\0') {
+		int idx = filelist_find(sfile->files, params->renamefile);
+		if (idx >= 0) {
+			struct direntry *file= filelist_file(sfile->files, idx);
+			if (file) {
+				file->flags |= EDITING;
+			}
+		}
+		params->renamefile[0] = '\0';
+	}
 	if (sfile->layout) sfile->layout->dirty= 1;
 
 }
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 97ddb291136..806d12815b5 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -153,6 +153,7 @@ typedef struct FileSelectParams {
 	char title[24]; /* title, also used for the text of the execute button */
 	char dir[240]; /* directory */
 	char file[80]; /* file */
+	char renamefile[80];
 
 	short type; /* XXXXX for now store type here, should be moved to the operator */
 	short flag; /* settings for filter, hiding dots files,...  */

From 16a7fe1314bb82850a2d410089b6665eb8154f26 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 13 Sep 2009 12:32:57 +0000
Subject: [PATCH 555/577] Smoke: * Bugfix for drawing issues when having the
 domain transformed (editmode + object mode, both were buggy)

---
 .../blender/editors/space_view3d/drawobject.c |   4 +-
 .../blender/editors/space_view3d/drawvolume.c | 111 +++++++++++++++---
 .../editors/space_view3d/view3d_intern.h      |   2 +-
 3 files changed, 95 insertions(+), 22 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index e886bbbd5f2..c02d45ca798 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5362,14 +5362,14 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			{
 				smd->domain->tex = NULL;
 				GPU_create_smoke(smd, 0);
-				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res, smd->domain->dx, smd->domain->tex_shadow);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res, smd->domain->dx, smd->domain->tex_shadow);
 				GPU_free_smoke(smd);
 			}
 			else if(smd->domain->wt || (smd->domain->viewsettings & MOD_SMOKE_VIEW_SHOWBIG))
 			{
 				smd->domain->tex = NULL;
 				GPU_create_smoke(smd, 1);
-				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res_wt, smd->domain->dx_wt, smd->domain->tex_shadow);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res_wt, smd->domain->dx_wt, smd->domain->tex_shadow);
 				GPU_free_smoke(smd);
 			}
 		}
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index c8eda10566c..2c2ab2cbdec 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -129,20 +129,20 @@ static float cv[][3] = {
 
 // edges have the form edges[n][0][xyz] + t*edges[n][1][xyz]
 static float edges[12][2][3] = {
-	{{1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
-	{{-1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
-	{{-1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
-	{{1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 1.0f}},
+	{{1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+	{{-1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+	{{-1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+	{{1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
 
-	{{1.0f, -1.0f, 1.0f}, {0.0f, 1.0f, 0.0f}},
-	{{-1.0f, -1.0f, 1.0f}, {0.0f, 1.0f, 0.0f}},
-	{{-1.0f, -1.0f, -1.0f}, {0.0f, 1.0f, 0.0f}},
-	{{1.0f, -1.0f, -1.0f}, {0.0f, 1.0f, 0.0f}},
+	{{1.0f, -1.0f, 1.0f}, {0.0f, 2.0f, 0.0f}},
+	{{-1.0f, -1.0f, 1.0f}, {0.0f, 2.0f, 0.0f}},
+	{{-1.0f, -1.0f, -1.0f}, {0.0f, 2.0f, 0.0f}},
+	{{1.0f, -1.0f, -1.0f}, {0.0f, 2.0f, 0.0f}},
 
-	{{-1.0f, 1.0f, 1.0f}, {1.0f, 0.0f, 0.0f}},
-	{{-1.0f, -1.0f, 1.0f}, {1.0f, 0.0f, 0.0f}},
-	{{-1.0f, -1.0f, -1.0f}, {1.0f, 0.0f, 0.0f}},
-	{{-1.0f, 1.0f, -1.0f}, {1.0f, 0.0f, 0.0f}}
+	{{-1.0f, 1.0f, 1.0f}, {2.0f, 0.0f, 0.0f}},
+	{{-1.0f, -1.0f, 1.0f}, {2.0f, 0.0f, 0.0f}},
+	{{-1.0f, -1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}},
+	{{-1.0f, 1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}}
 };
 
 int intersect_edges(float *points, float a, float b, float c, float d)
@@ -154,7 +154,7 @@ int intersect_edges(float *points, float a, float b, float c, float d)
 	for (i=0; i<12; i++) {
 		t = -(a*edges[i][0][0] + b*edges[i][0][1] + c*edges[i][0][2] + d)
 			/ (a*edges[i][1][0] + b*edges[i][1][1] + c*edges[i][1][2]);
-		if ((t>0)&&(t<2)) {
+		if ((t>0)&&(t<1)) {
 			points[numpoints * 3 + 0] = edges[i][0][0] + edges[i][1][0]*t;
 			points[numpoints * 3 + 1] = edges[i][0][1] + edges[i][1][1]*t;
 			points[numpoints * 3 + 2] = edges[i][0][2] + edges[i][1][2]*t;
@@ -191,7 +191,7 @@ static int larger_pow2(int n)
 	return n*2;
 }
 
-void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, int res[3], float dx, GPUTexture *tex_shadow)
+void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, float *min, float *max, int res[3], float dx, GPUTexture *tex_shadow)
 {
 	Object *ob = base->object;
 	RegionView3D *rv3d= ar->regiondata;
@@ -225,11 +225,82 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 					"END\n";
 	unsigned int prog;
 
+	
+	float size[3];
+
+	VECSUB(size, max, min);
+
+	// maxx, maxy, maxz
+	cv[0][0] = max[0];
+	cv[0][1] = max[1];
+	cv[0][2] = max[2];
+	// minx, maxy, maxz
+	cv[1][0] = min[0];
+	cv[1][1] = max[1];
+	cv[1][2] = max[2];
+	// minx, miny, maxz
+	cv[2][0] = min[0];
+	cv[2][1] = min[1];
+	cv[2][2] = max[2];
+	// maxx, miny, maxz
+	cv[3][0] = max[0];
+	cv[3][1] = min[1];
+	cv[3][2] = max[2];
+
+	// maxx, maxy, minz
+	cv[4][0] = max[0];
+	cv[4][1] = max[1];
+	cv[4][2] = min[2];
+	// minx, maxy, minz
+	cv[5][0] = min[0];
+	cv[5][1] = max[1];
+	cv[5][2] = min[2];
+	// minx, miny, minz
+	cv[6][0] = min[0];
+	cv[6][1] = min[1];
+	cv[6][2] = min[2];
+	// maxx, miny, minz
+	cv[7][0] = max[0];
+	cv[7][1] = min[1];
+	cv[7][2] = min[2];
+
+	VECCOPY(edges[0][0], cv[4]); // maxx, maxy, minz
+	VECCOPY(edges[1][0], cv[5]); // minx, maxy, minz
+	VECCOPY(edges[2][0], cv[6]); // minx, miny, minz
+	VECCOPY(edges[3][0], cv[7]); // maxx, miny, minz
+
+	VECCOPY(edges[4][0], cv[3]); // maxx, miny, maxz
+	VECCOPY(edges[5][0], cv[2]); // minx, miny, maxz
+	VECCOPY(edges[6][0], cv[6]); // minx, miny, minz
+	VECCOPY(edges[7][0], cv[7]); // maxx, miny, minz
+
+	VECCOPY(edges[8][0], cv[1]); // minx, maxy, maxz
+	VECCOPY(edges[9][0], cv[2]); // minx, miny, maxz
+	VECCOPY(edges[10][0], cv[6]); // minx, miny, minz
+	VECCOPY(edges[11][0], cv[5]); // minx, maxy, minz
+
+	// printf("size x: %f, y: %f, z: %f\n", size[0], size[1], size[2]);
+
+	edges[0][1][2] = size[2];
+	edges[1][1][2] = size[2];
+	edges[2][1][2] = size[2];
+	edges[3][1][2] = size[2];
+
+	edges[4][1][1] = size[1];
+	edges[5][1][1] = size[1];
+	edges[6][1][1] = size[1];
+	edges[7][1][1] = size[1];
+
+	edges[8][1][0] = size[0];
+	edges[9][1][0] = size[0];
+	edges[10][1][0] = size[0];
+	edges[11][1][0] = size[0];
+
 	glGetBooleanv(GL_BLEND, (GLboolean *)&gl_blend);
 	glGetBooleanv(GL_DEPTH_TEST, (GLboolean *)&gl_depth);
 
 	wmLoadMatrix(rv3d->viewmat);
-	wmMultMatrix(ob->obmat);	
+	// wmMultMatrix(ob->obmat);	
 
 	glDepthMask(GL_FALSE);
 	glDisable(GL_DEPTH_TEST);
@@ -248,13 +319,15 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		y = cv[i][1] + viewnormal[1];
 		z = cv[i][2] + viewnormal[2];
 
-		if ((x>=-1.0f)&&(x<=1.0f)
-			&&(y>=-1.0f)&&(y<=1.0f)
-			&&(z>=-1.0f)&&(z<=1.0f)) {
+		if ((x>=min[0])&&(x<=max[0])
+			&&(y>=min[1])&&(y<=max[1])
+			&&(z>=min[2])&&(z<=max[2])) {
 			break;
 		}
 	}
 
+	// printf("i: %d\n", i);
+
 	if(GLEW_ARB_fragment_program)
 	{
 		glGenProgramsARB(1, &prog);
@@ -318,7 +391,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 			glBegin(GL_POLYGON);
 			for (i = 0; i < numpoints; i++) {
 				glColor3f(1.0, 1.0, 1.0);
-				glTexCoord3d((points[i * 3 + 0] + 1.0)*cor[0]/2.0, (points[i * 3 + 1] + 1)*cor[1]/2.0, (points[i * 3 + 2] + 1.0)*cor[2]/2.0);
+				glTexCoord3d((points[i * 3 + 0] - min[0] )*cor[0]/size[0], (points[i * 3 + 1] - min[1])*cor[1]/size[1], (points[i * 3 + 2] - min[2])*cor[2]/size[2]);
 				glVertex3f(points[i * 3 + 0], points[i * 3 + 1], points[i * 3 + 2]);
 			}
 			glEnd();
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 00b0b5c4fd1..7dbea44b68b 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -157,7 +157,7 @@ ARegion *view3d_has_buttons_region(ScrArea *sa);
 ARegion *view3d_has_tools_region(ScrArea *sa);
 
 /* draw_volume.c */
-void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, int res[3], float dx, struct GPUTexture *tex_shadow);
+void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, float *min, float *max, int res[3], float dx, struct GPUTexture *tex_shadow);
 
 
 #endif /* ED_VIEW3D_INTERN_H */

From ca986a6874412aacbe9ec31a0cf94285f3d9ad41 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Sun, 13 Sep 2009 12:34:00 +0000
Subject: [PATCH 556/577] 2 Animation Fixes:

* Auto-keyframing for Paste Poses and PoseLib works again. Unfortunately, it doesn't take into account whether the transforms were changed or not...

* 'Stick to View' setting for Grease Pencil has now been inverted, since the old order was confusing.
---
 source/blender/editors/armature/poselib.c    | 65 +++++++-------------
 source/blender/editors/armature/poseobject.c | 51 ++++++++-------
 source/blender/makesrna/intern/rna_gpencil.c |  2 +-
 3 files changed, 51 insertions(+), 67 deletions(-)

diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c
index 46d08afa656..c332a297e57 100644
--- a/source/blender/editors/armature/poselib.c
+++ b/source/blender/editors/armature/poselib.c
@@ -278,24 +278,7 @@ void poselib_validate_act (bAction *act)
 /* ************************************************************* */
 
 /* Pointers to the builtin KeyingSets that we want to use */
-static KeyingSet *poselib_ks_locrotscale = NULL;		/* the only keyingset we'll need*/
-static short poselib_ks_need_init= 1;					/* have the above been obtained yet? */
-
-/* Make sure the builtin KeyingSets are initialised properly 
- * (only gets called on first run of  poselib_add_current_pose).
- */
-static void poselib_get_builtin_keyingsets (void)
-{
-	/* only if we haven't got these yet */
-	// FIXME: this assumes that we will always get the builtin sets... 
-	if (poselib_ks_need_init) {
-		/* LocRotScale (quaternions or eulers depending on context) */
-		poselib_ks_locrotscale= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
-		
-		/* clear flag requesting init */
-		poselib_ks_need_init= 0;
-	}
-}
+static KeyingSet *poselib_ks_locrotscale = NULL;		/* the only keyingset we'll need */
 
 /* ----- */
 
@@ -390,9 +373,6 @@ static int poselib_add_exec (bContext *C, wmOperator *op)
 	/* validate name */
 	BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), 64);
 	
-	/* make sure we've got KeyingSets to use */
-	poselib_get_builtin_keyingsets();
-	
 	/* init common-key-source for use by KeyingSets */
 	memset(&cks, 0, sizeof(bCommonKeySrc));
 	cks.id= &ob->id;
@@ -406,6 +386,8 @@ static int poselib_add_exec (bContext *C, wmOperator *op)
 				cks.pchan= pchan;
 				
 				/* KeyingSet to use depends on rotation mode (but that's handled by the templates code)  */
+				if (poselib_ks_locrotscale == NULL)
+					poselib_ks_locrotscale= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
 				modify_keyframes(C, &dsources, act, poselib_ks_locrotscale, MODIFYKEY_MODE_INSERT, (float)frame);
 			}
 		}
@@ -756,13 +738,20 @@ static void poselib_apply_pose (tPoseLib_PreviewData *pld)
 }
 
 /* Auto-keys/tags bones affected by the pose used from the poselib */
-static void poselib_keytag_pose (Scene *scene, tPoseLib_PreviewData *pld)
+static void poselib_keytag_pose (bContext *C, Scene *scene, tPoseLib_PreviewData *pld)
 {
 	bPose *pose= pld->pose;
 	bPoseChannel *pchan;
 	bAction *act= pld->act;
 	bActionGroup *agrp;
 	
+	bCommonKeySrc cks;
+	ListBase dsources = {&cks, &cks};
+	
+	/* init common-key-source for use by KeyingSets */
+	memset(&cks, 0, sizeof(bCommonKeySrc));
+	cks.id= &pld->ob->id;
+	
 	/* start tagging/keying */
 	for (agrp= act->groups.first; agrp; agrp= agrp->next) {
 		/* only for selected action channels */
@@ -770,28 +759,17 @@ static void poselib_keytag_pose (Scene *scene, tPoseLib_PreviewData *pld)
 			pchan= get_pose_channel(pose, agrp->name);
 			
 			if (pchan) {
-#if 0 // XXX old animation system	
 				// TODO: use a standard autokeying function in future (to allow autokeying-editkeys to work)
-				if (IS_AUTOKEY_MODE(NORMAL)) {
-					ID *id= &pld->ob->id;
+				if (IS_AUTOKEY_MODE(scene, NORMAL)) {
+					/* Set keys on pose
+					 *	- KeyingSet to use depends on rotation mode 
+					 *	(but that's handled by the templates code)  
+					 */
+					// TODO: for getting the KeyingSet used, we should really check which channels were affected
+					if (poselib_ks_locrotscale == NULL)
+						poselib_ks_locrotscale= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
 					
-					/* Set keys on pose */
-					if (pchan->flag & POSE_ROT) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_X, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Y, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Z, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_W, 0);
-					}
-					if (pchan->flag & POSE_SIZE) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_X, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Y, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Z, 0);
-					}
-					if (pchan->flag & POSE_LOC) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_X, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Y, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Z, 0);
-					}
+					modify_keyframes(C, &dsources, NULL, poselib_ks_locrotscale, MODIFYKEY_MODE_INSERT, (float)CFRA);
 					
 					/* clear any unkeyed tags */
 					if (pchan->bone)
@@ -802,7 +780,6 @@ static void poselib_keytag_pose (Scene *scene, tPoseLib_PreviewData *pld)
 					if (pchan->bone)
 						pchan->bone->flag |= BONE_UNKEYED;
 				}
-#endif // XXX old animation system	
 		
 			}
 		}
@@ -1345,7 +1322,7 @@ static void poselib_preview_cleanup (bContext *C, wmOperator *op)
 	}
 	else if (pld->state == PL_PREVIEW_CONFIRM) {
 		/* tag poses as appropriate */
-		poselib_keytag_pose(scene, pld);
+		poselib_keytag_pose(C, scene, pld);
 		
 		/* change active pose setting */
 		act->active_marker= BLI_findindex(&act->markers, marker) + 1;
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index 7d7f54309a8..bab7111dbd7 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -961,6 +961,11 @@ void POSE_OT_copy (wmOperatorType *ot)
 
 /* ---- */
 
+/* Pointers to the builtin KeyingSets that we want to use */
+static KeyingSet *posePaste_ks_locrotscale = NULL;		/* the only keyingset we'll need */
+
+/* ---- */
+
 static int pose_paste_exec (bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
@@ -969,6 +974,13 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 	char name[32];
 	int flip= RNA_boolean_get(op->ptr, "flipped");
 	
+	bCommonKeySrc cks;
+	ListBase dsources = {&cks, &cks};
+	
+	/* init common-key-source for use by KeyingSets */
+	memset(&cks, 0, sizeof(bCommonKeySrc));
+	cks.id= &ob->id;
+	
 	/* sanity checks */
 	if ELEM(NULL, ob, ob->pose)
 		return OPERATOR_CANCELLED;
@@ -1045,6 +1057,13 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 						eul[1]*= -1;
 						eul[2]*= -1;
 						EulOToAxisAngle(eul, EULER_ORDER_DEFAULT, &pchan->quat[1], &pchan->quat[0]);
+						
+						// experimental method (uncomment to test):
+#if 0
+						/* experimental method: just flip the orientation of the axis on x/y axes */
+						pchan->quat[1] *= -1;
+						pchan->quat[2] *= -1;
+#endif
 					}
 					else {
 						float eul[3];
@@ -1056,28 +1075,16 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 					}
 				}
 				
-#if 0 // XXX old animation system
-				if (autokeyframe_cfra_can_key(ob)) {
-					ID *id= &ob->id;
+				if (autokeyframe_cfra_can_key(scene, &ob->id)) {
+					/* Set keys on pose
+					 *	- KeyingSet to use depends on rotation mode 
+					 *	(but that's handled by the templates code)  
+					 */
+					// TODO: for getting the KeyingSet used, we should really check which channels were affected
+					if (posePaste_ks_locrotscale == NULL)
+						posePaste_ks_locrotscale= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
 					
-					/* Set keys on pose */
-					// TODO: make these use keyingsets....
-					if (chan->flag & POSE_ROT) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_X, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Y, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Z, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_W, 0);
-					}
-					if (chan->flag & POSE_SIZE) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_X, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Y, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Z, 0);
-					}
-					if (chan->flag & POSE_LOC) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_X, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Y, 0);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Z, 0);
-					}
+					modify_keyframes(C, &dsources, NULL, posePaste_ks_locrotscale, MODIFYKEY_MODE_INSERT, (float)CFRA);
 					
 					/* clear any unkeyed tags */
 					if (chan->bone)
@@ -1088,7 +1095,6 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
 					if (chan->bone)
 						chan->bone->flag |= BONE_UNKEYED;
 				}
-#endif // XXX old animation system
 			}
 		}
 	}
@@ -1975,6 +1981,7 @@ void ARMATURE_OT_bone_layers (wmOperatorType *ot)
 	RNA_def_boolean_array(ot->srna, "layers", 16, NULL, "Layers", "Armature layers that bone belongs to.");
 }
 
+/* ********************************************** */
 
 #if 0
 // XXX old sys
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 72e77e93607..15f5ef7884f 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -233,7 +233,7 @@ void rna_def_gpencil_data(BlenderRNA *brna)
 	
 	/* Flags */
 	prop= RNA_def_property(srna, "view_space_draw", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_VIEWALIGN);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GP_DATA_VIEWALIGN);
 	RNA_def_property_ui_text(prop, "Stick to View", "Newly drawn strokes get added in view space (i.e. sketches stick to data when view is manipulated).");
 }
 

From 06a2ee4afed4237398b69ddf253e29a730b2f9f0 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 13 Sep 2009 12:35:35 +0000
Subject: [PATCH 557/577] Smoke: * Making edge and vertex arrays local to avoid
 problems

---
 .../blender/editors/space_view3d/drawvolume.c | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 2c2ab2cbdec..48f2145c03c 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -121,31 +121,7 @@
 
 struct GPUTexture;
 
-/* draw slices of smoke is adapted from c++ code authored by: Johannes Schmid and Ingemar Rask, 2006, johnny@grob.org */
-static float cv[][3] = {
-	{1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f}, {1.0f, -1.0f, 1.0f},
-	{1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, {-1.0f, -1.0f, -1.0f}, {1.0f, -1.0f, -1.0f}
-};
-
-// edges have the form edges[n][0][xyz] + t*edges[n][1][xyz]
-static float edges[12][2][3] = {
-	{{1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
-	{{-1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
-	{{-1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
-	{{1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
-
-	{{1.0f, -1.0f, 1.0f}, {0.0f, 2.0f, 0.0f}},
-	{{-1.0f, -1.0f, 1.0f}, {0.0f, 2.0f, 0.0f}},
-	{{-1.0f, -1.0f, -1.0f}, {0.0f, 2.0f, 0.0f}},
-	{{1.0f, -1.0f, -1.0f}, {0.0f, 2.0f, 0.0f}},
-
-	{{-1.0f, 1.0f, 1.0f}, {2.0f, 0.0f, 0.0f}},
-	{{-1.0f, -1.0f, 1.0f}, {2.0f, 0.0f, 0.0f}},
-	{{-1.0f, -1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}},
-	{{-1.0f, 1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}}
-};
-
-int intersect_edges(float *points, float a, float b, float c, float d)
+int intersect_edges(float *points, float a, float b, float c, float d, float edges[12][2][3])
 {
 	int i;
 	float t;
@@ -204,6 +180,30 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 	float cor[3] = {1.,1.,1.};
 	int gl_depth = 0, gl_blend = 0;
 
+	/* draw slices of smoke is adapted from c++ code authored by: Johannes Schmid and Ingemar Rask, 2006, johnny@grob.org */
+	float cv[][3] = {
+		{1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f}, {1.0f, -1.0f, 1.0f},
+		{1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, {-1.0f, -1.0f, -1.0f}, {1.0f, -1.0f, -1.0f}
+	};
+
+	// edges have the form edges[n][0][xyz] + t*edges[n][1][xyz]
+	float edges[12][2][3] = {
+		{{1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+		{{-1.0f, 1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+		{{-1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+		{{1.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 2.0f}},
+
+		{{1.0f, -1.0f, 1.0f}, {0.0f, 2.0f, 0.0f}},
+		{{-1.0f, -1.0f, 1.0f}, {0.0f, 2.0f, 0.0f}},
+		{{-1.0f, -1.0f, -1.0f}, {0.0f, 2.0f, 0.0f}},
+		{{1.0f, -1.0f, -1.0f}, {0.0f, 2.0f, 0.0f}},
+
+		{{-1.0f, 1.0f, 1.0f}, {2.0f, 0.0f, 0.0f}},
+		{{-1.0f, -1.0f, 1.0f}, {2.0f, 0.0f, 0.0f}},
+		{{-1.0f, -1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}},
+		{{-1.0f, 1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}}
+	};
+
 	/* Fragment program to calculate the 3dview of smoke */
 	/* using 2 textures, density and shadow */
 	const char *text = "!!ARBfp1.0\n"
@@ -368,7 +368,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		float p0[3];
 		// intersect_edges returns the intersection points of all cube edges with
 		// the given plane that lie within the cube
-		numpoints = intersect_edges(points, viewnormal[0], viewnormal[1], viewnormal[2], d);
+		numpoints = intersect_edges(points, viewnormal[0], viewnormal[1], viewnormal[2], d, edges);
 
 		if (numpoints > 2) {
 			VECCOPY(p0, points);

From 716953f0c1e968f00083c6bfc0bc53e6ba6c80d5 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 13 Sep 2009 13:38:23 +0000
Subject: [PATCH 558/577] Pointcache / Smoke: * Disable "step" setting for
 smoke on GUI

---
 release/ui/buttons_particle.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index 1d496e19121..1bbd64c9b0f 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -57,7 +57,8 @@ def point_cache_ui(self, cache, enabled, particles, smoke):
 		row = layout.row()
 		row.enabled = enabled
 		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		row.itemR(cache, "step");
+		if not smoke:
+			row.itemR(cache, "step");
 	
 		if not smoke:
 			row = layout.row()

From cfc8d66ab08a0449b0ad553c598416787f614b3a Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 13 Sep 2009 13:39:06 +0000
Subject: [PATCH 559/577] Smoke: * Report console error if gfx card does not
 support smoke drawing

---
 source/blender/editors/space_view3d/drawvolume.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 48f2145c03c..cc4cb4771e7 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -341,6 +341,8 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		// custom parameter for smoke style (higher = thicker)
 		glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 1, 7.0, 7.0, 7.0, 1.0);
 	}
+	else
+		printf("Your gfx card does not support 3dview smoke drawing.");
 
 	GPU_texture_bind(tex, 0);
 	if(tex_shadow)

From e903632c1053f041a33ddb1b27d5cb938a7ee38b Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Sun, 13 Sep 2009 16:15:26 +0000
Subject: [PATCH 560/577] after some discussion, this is the replacement for
 the old loopcut tool: edge ring select displays a preview of the edge ring,
 and you can move the mouse with ctrl-alt held down and change the edge ring
 selection.

---
 source/blender/blenkernel/BKE_utildefines.h |  49 +++
 source/blender/editors/mesh/editmesh_loop.c |   1 +
 source/blender/editors/mesh/loopcut.c       | 400 ++++++++++++++++++++
 source/blender/editors/mesh/mesh_intern.h   |   2 +
 source/blender/editors/mesh/mesh_ops.c      |  11 +-
 5 files changed, 458 insertions(+), 5 deletions(-)
 create mode 100644 source/blender/editors/mesh/loopcut.c

diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index 4d43518901e..7d8cb41db82 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -193,5 +193,54 @@
 #define SET_INT_IN_POINTER(i) ((void*)(intptr_t)(i))
 #define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i))
 
+/*little array macro library.  example of usage:
+
+int *arr = NULL;
+V_DECLARE(arr);
+int i;
+
+for (i=0; i<10; i++) {
+	V_GROW(arr);
+	arr[i] = something;
+}
+V_FREE(arr);
+
+arrays are buffered, using double-buffering (so on each reallocation,
+the array size is doubled).  supposedly this should give good Big Oh
+behaviour, though it may not be the best in practice.
+*/
+
+#define V_DECLARE(vec) int _##vec##_count=0; void *_##vec##_tmp
+
+/*in the future, I plan on having V_DECLARE allocate stack memory it'll
+  use at first, and switch over to heap when it needs more.  that'll mess
+  up cases where you'd want to use this API to build a dynamic list for
+  non-local use, so all such cases should use this macro.*/
+#define V_DYNDECLARE(vec) V_DECLARE(vec)
+
+/*this returns the entire size of the array, including any buffering.*/
+#define V_SIZE(vec) ((signed int)((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec)))
+
+/*this returns the logical size of the array, not including buffering.*/
+#define V_COUNT(vec) _##vec##_count
+
+/*grow the array by one.  zeroes the new elements.*/
+#define V_GROW(vec) \
+	V_SIZE(vec) > _##vec##_count ? _##vec##_count++ : \
+	((_##vec##_tmp = MEM_callocN(sizeof(*vec)*(_##vec##_count*2+2), #vec " " __FILE__ " ")),\
+	(vec && memcpy(_##vec##_tmp, vec, sizeof(*vec) * _##vec##_count)),\
+	(vec && (MEM_freeN(vec),1)),\
+	(vec = _##vec##_tmp),\
+	_##vec##_count++)
+
+#define V_FREE(vec) if (vec) MEM_freeN(vec);
+
+/*resets the logical size of an array to zero, but doesn't
+  free the memory.*/
+#define V_RESET(vec) _##vec##_count=0
+
+/*set the count of the array*/
+#define V_SETCOUNT(vec, count) _##vec##_count = (count)
+
 #endif
 
diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c
index 4c3e76f2285..c98b387d28a 100644
--- a/source/blender/editors/mesh/editmesh_loop.c
+++ b/source/blender/editors/mesh/editmesh_loop.c
@@ -199,6 +199,7 @@ static void edgering_sel(EditMesh *em, EditEdge *startedge, int select, int prev
 		}
 	}
 }
+
 void CutEdgeloop(Object *obedit, wmOperator *op, EditMesh *em, int numcuts)
 {
 	ViewContext vc; // XXX
diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c
new file mode 100644
index 00000000000..c7e10d5809f
--- /dev/null
+++ b/source/blender/editors/mesh/loopcut.c
@@ -0,0 +1,400 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Joseph Eagar, Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <float.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+
+#include "DNA_ID.h"
+#include "DNA_screen_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_windowmanager_types.h"
+#include "DNA_object_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "PIL_time.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_dynstr.h" /*for WM_operator_pystring */
+#include "BLI_editVert.h"
+
+#include "BKE_blender.h"
+#include "BKE_context.h"
+#include "BKE_scene.h"
+#include "BKE_utildefines.h"
+#include "BKE_mesh.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h" /* for paint cursor */
+
+#include "IMB_imbuf_types.h"
+
+#include "ED_screen.h"
+#include "ED_util.h"
+#include "ED_space_api.h"
+#include "ED_view3d.h"
+#include "ED_mesh.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "mesh_intern.h"
+
+/* ringsel operator */
+
+/* struct for properties used while drawing */
+typedef struct tringselOpData {
+	ARegion *ar;		/* region that ringsel was activated in */
+	void *draw_handle;	/* for drawing preview loop */
+	
+	float (*edges)[2][3];
+	int totedge;
+
+	ViewContext vc;
+
+	Object *ob;
+	EditMesh *em;
+	EditEdge *eed;
+
+	int extend;
+} tringselOpData;
+
+/* modal loop selection drawing callback */
+static void ringsel_draw(const bContext *C, ARegion *ar, void *arg)
+{
+	int i;
+	tringselOpData *lcd = arg;
+	
+	glDisable(GL_DEPTH_TEST);
+
+	glPushMatrix();
+	glMultMatrixf(lcd->ob->obmat);
+
+	glColor3ub(255, 0, 255);
+	glBegin(GL_LINES);
+	for (i=0; i<lcd->totedge; i++) {
+		glVertex3fv(lcd->edges[i][0]);
+		glVertex3fv(lcd->edges[i][1]);
+	}
+	glEnd();
+
+	glPopMatrix();
+	glEnable(GL_DEPTH_TEST);
+}
+
+static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
+{
+	EditMesh *em = lcd->em;
+	EditEdge *startedge = lcd->eed;
+	EditEdge *eed;
+	EditFace *efa;
+	EditVert *v[2][2];
+	float (*edges)[2][3] = NULL;
+	V_DYNDECLARE(edges);
+	float co[2][3];
+	int looking=1, i, j=0, tot=0;
+	
+	if (!startedge)
+		return;
+
+	if (lcd->edges) {
+		MEM_freeN(lcd->edges);
+		lcd->edges = NULL;
+		lcd->totedge = 0;
+	}
+
+	if (!lcd->extend) {
+		EM_clear_flag_all(lcd->em, SELECT);
+	}
+
+	/* in eed->f1 we put the valence (amount of faces in edge) */
+	/* in eed->f2 we put tagged flag as correct loop */
+	/* in efa->f1 we put tagged flag as correct to select */
+
+	for(eed= em->edges.first; eed; eed= eed->next) {
+		eed->f1= 0;
+		eed->f2= 0;
+	}
+
+	for(efa= em->faces.first; efa; efa= efa->next) {
+		efa->f1= 0;
+		if(efa->h==0) {
+			efa->e1->f1++;
+			efa->e2->f1++;
+			efa->e3->f1++;
+			if(efa->e4) efa->e4->f1++;
+		}
+	}
+	
+	// tag startedge OK
+	startedge->f2= 1;
+	
+	while(looking) {
+		looking= 0;
+		
+		for(efa= em->faces.first; efa; efa= efa->next) {
+			if(efa->e4 && efa->f1==0 && efa->h == 0) {	// not done quad
+				if(efa->e1->f1<=2 && efa->e2->f1<=2 && efa->e3->f1<=2 && efa->e4->f1<=2) { // valence ok
+
+					// if edge tagged, select opposing edge and mark face ok
+					if(efa->e1->f2) {
+						efa->e3->f2= 1;
+						efa->f1= 1;
+						looking= 1;
+					}
+					else if(efa->e2->f2) {
+						efa->e4->f2= 1;
+						efa->f1= 1;
+						looking= 1;
+					}
+					if(efa->e3->f2) {
+						efa->e1->f2= 1;
+						efa->f1= 1;
+						looking= 1;
+					}
+					if(efa->e4->f2) {
+						efa->e2->f2= 1;
+						efa->f1= 1;
+						looking= 1;
+					}
+				}
+			}
+		}
+	}
+	
+	if(previewlines > 0 && !select){
+			for(efa= em->faces.first; efa; efa= efa->next) {
+				if(efa->v4 == NULL) {  continue; }
+				if(efa->h == 0){
+					if(efa->e1->f2 == 1){
+						if(efa->e1->h == 1 || efa->e3->h == 1 )
+							continue;
+						
+						v[0][0] = efa->v1;
+						v[0][1] = efa->v2;
+						v[1][0] = efa->v4;
+						v[1][1] = efa->v3;
+					} else if(efa->e2->f2 == 1){
+						if(efa->e2->h == 1 || efa->e4->h == 1)
+							continue;
+						v[0][0] = efa->v2;
+						v[0][1] = efa->v3;
+						v[1][0] = efa->v1;
+						v[1][1] = efa->v4;					
+					} else { continue; }
+										  
+					for(i=1;i<=previewlines;i++){
+						co[0][0] = (v[0][1]->co[0] - v[0][0]->co[0])*(i/((float)previewlines+1))+v[0][0]->co[0];
+						co[0][1] = (v[0][1]->co[1] - v[0][0]->co[1])*(i/((float)previewlines+1))+v[0][0]->co[1];
+						co[0][2] = (v[0][1]->co[2] - v[0][0]->co[2])*(i/((float)previewlines+1))+v[0][0]->co[2];
+
+						co[1][0] = (v[1][1]->co[0] - v[1][0]->co[0])*(i/((float)previewlines+1))+v[1][0]->co[0];
+						co[1][1] = (v[1][1]->co[1] - v[1][0]->co[1])*(i/((float)previewlines+1))+v[1][0]->co[1];
+						co[1][2] = (v[1][1]->co[2] - v[1][0]->co[2])*(i/((float)previewlines+1))+v[1][0]->co[2];					
+						
+						V_GROW(edges);
+						VECCOPY(edges[tot][0], co[0]);
+						VECCOPY(edges[tot][1], co[1]);
+						tot++;
+					}
+				}
+			}
+	} else {
+		select = (startedge->f & SELECT) == 0;
+
+		/* select the edges */
+		for(eed= em->edges.first; eed; eed= eed->next) {
+			if(eed->f2) EM_select_edge(eed, select);
+		}
+	}
+
+	lcd->edges = edges;
+	lcd->totedge = tot;
+}
+
+static void ringsel_find_edge(tringselOpData *lcd, const bContext *C, ARegion *ar)
+{
+	if (lcd->eed)
+		edgering_sel(lcd, 1, 0);
+}
+
+static void ringsel_finish(bContext *C, wmOperator *op)
+{
+	tringselOpData *lcd= op->customdata;
+
+	if (lcd->eed);
+		edgering_sel(lcd, 0, 1);
+}
+
+/* called when modal loop selection is done... */
+static void ringsel_exit (bContext *C, wmOperator *op)
+{
+	tringselOpData *lcd= op->customdata;
+
+	/* deactivate the extra drawing stuff in 3D-View */
+	ED_region_draw_cb_exit(lcd->ar->type, lcd->draw_handle);
+	
+	if (lcd->edges)
+		MEM_freeN(lcd->edges);
+
+	ED_region_tag_redraw(lcd->ar);
+
+	/* free the custom data */
+	MEM_freeN(lcd);
+	op->customdata= NULL;
+}
+
+/* called when modal loop selection gets set up... */
+static int ringsel_init (bContext *C, wmOperator *op)
+{
+	tringselOpData *lcd;
+	
+	/* alloc new customdata */
+	lcd= op->customdata= MEM_callocN(sizeof(tringselOpData), "ringsel Modal Op Data");
+	
+	/* assign the drawing handle for drawing preview line... */
+	lcd->ar= CTX_wm_region(C);
+	lcd->draw_handle= ED_region_draw_cb_activate(lcd->ar->type, ringsel_draw, lcd, REGION_DRAW_POST);
+	lcd->ob = CTX_data_edit_object(C);
+	lcd->em= BKE_mesh_get_editmesh((Mesh *)lcd->ob->data);
+	lcd->extend = RNA_boolean_get(op->ptr, "extend");
+	em_setup_viewcontext(C, &lcd->vc);
+
+	ED_region_tag_redraw(lcd->ar);
+
+	return 1;
+}
+
+static int ringsel_cancel (bContext *C, wmOperator *op)
+{
+	/* this is just a wrapper around exit() */
+	ringsel_exit(C, op);
+	return OPERATOR_CANCELLED;
+}
+
+static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	tringselOpData *lcd;
+	EditEdge *edge;
+	int dist = 75;
+
+	view3d_operator_needs_opengl(C);
+
+	if (!ringsel_init(C, op))
+		return OPERATOR_CANCELLED;
+	
+	/* add a modal handler for this operator - handles loop selection */
+	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+	lcd = op->customdata;
+	lcd->vc.mval[0] = evt->mval[0];
+	lcd->vc.mval[1] = evt->mval[1];
+	
+	edge = findnearestedge(&lcd->vc, &dist);
+	if (edge != lcd->eed) {
+		lcd->eed = edge;
+		ringsel_find_edge(lcd, C, lcd->ar);
+	}
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int ringsel_modal (bContext *C, wmOperator *op, wmEvent *event)
+{
+	tringselOpData *lcd= op->customdata;
+
+	view3d_operator_needs_opengl(C);
+
+	switch (event->type) {
+		case RIGHTMOUSE:
+		case LEFTMOUSE: /* confirm */ // XXX hardcoded
+			if (event->val == 0) {
+				/* finish */
+				ED_region_tag_redraw(lcd->ar);
+
+				ringsel_finish(C, op);
+				ringsel_exit(C, op);
+				
+				return OPERATOR_FINISHED;
+			}
+
+			ED_region_tag_redraw(lcd->ar);
+			break;
+		case MOUSEMOVE: { /* mouse moved somewhere to select another loop */
+			int dist = 75;
+			EditEdge *edge;
+
+			lcd->vc.mval[0] = event->mval[0];
+			lcd->vc.mval[1] = event->mval[1];
+			edge = findnearestedge(&lcd->vc, &dist);
+
+			if (edge != lcd->eed) {
+				lcd->eed = edge;
+				ringsel_find_edge(lcd, C, lcd->ar);
+			}
+
+			ED_region_tag_redraw(lcd->ar);
+			break;
+		}
+	}
+	
+	/* keep going until the user confirms */
+	return OPERATOR_RUNNING_MODAL;
+}
+
+// naming is whatever this should use...
+void MESH_OT_edgering_select (wmOperatorType *ot)
+{
+	/* description */
+	ot->name= "Loop Cut";
+	ot->idname= "MESH_OT_edgering_select";
+	ot->description= "Add a new loop between existing loops.";
+	
+	/* callbacks */
+	ot->invoke= ringsel_invoke;
+	ot->modal= ringsel_modal;
+	ot->cancel= ringsel_cancel;
+	ot->poll= ED_operator_editmesh;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+
+	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection");
+}
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index 905a51a1bb0..887474414b3 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -242,5 +242,7 @@ void MESH_OT_vertex_color_remove(struct wmOperatorType *ot);
 void MESH_OT_sticky_add(struct wmOperatorType *ot);
 void MESH_OT_sticky_remove(struct wmOperatorType *ot);
 
+void MESH_OT_edgering_select(struct wmOperatorType *ot);
+
 #endif // MESH_INTERN_H
 
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index c545f7d70d6..3cdf1d47817 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -320,6 +320,8 @@ void ED_operatortypes_mesh(void)
 	WM_operatortype_append(MESH_OT_face_specials);
 	WM_operatortype_append(MESH_OT_specials);
 	
+	WM_operatortype_append(MESH_OT_edgering_select);
+
 	/* macros */
 	ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", "Add Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "MESH_OT_duplicate");
@@ -332,7 +334,7 @@ void ED_operatortypes_mesh(void)
 	ot= WM_operatortype_append_macro("MESH_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "MESH_OT_extrude");
 	WM_operatortype_macro_define(ot, "TFM_OT_translate");
-	
+
 }
 
 /* note mesh keymap also for other space? */
@@ -346,11 +348,10 @@ void ED_keymap_mesh(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0);
 	kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0);
 	RNA_boolean_set(kmi->ptr, "extend", 1);
-	kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0);
-	RNA_boolean_set(kmi->ptr, "ring", 1);
-	kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0);
+
+	kmi= WM_keymap_add_item(keymap, "MESH_OT_edgering_select", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0);
+	kmi= WM_keymap_add_item(keymap, "MESH_OT_edgering_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0);
 	RNA_boolean_set(kmi->ptr, "extend", 1);
-	RNA_boolean_set(kmi->ptr, "ring", 1);
 
 	WM_keymap_add_item(keymap, "MESH_OT_select_shortest_path", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
 	

From 5c6eb9c4fad5871efc1d1c3d258b3ba65c221ea9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 13 Sep 2009 17:38:43 +0000
Subject: [PATCH 561/577] replace curve.curve_2d True/False with
 curve.dimensions (2D/3D) enum suggested by William.

---
 release/ui/buttons_data_curve.py           |  6 ++---
 source/blender/editors/screen/screen_ops.c |  2 +-
 source/blender/makesrna/intern/rna_curve.c | 31 +++++++++++++---------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 1a5e56b02a4..94ad073d0bb 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -56,7 +56,7 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 
 		if not is_surf:
 			row = layout.row()
-			row.itemR(curve, "curve_2d")
+			row.itemR(curve, "dimensions", expand=True)
 		
 		split = layout.split()
 		
@@ -64,7 +64,7 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 		
 		if not is_surf:
 			sub = col.column()
-			sub.active = curve.curve_2d
+			sub.active = (curve.dimensions=='2D')
 			sub.itemL(text="Caps:")
 			row = sub.row()
 			row.itemR(curve, "front")
@@ -208,7 +208,7 @@ class DATA_PT_active_spline(DataButtonsPanelActive):
 			if not is_surf:
 				split = layout.split()
 				col = split.column()
-				col.active = (not curve.curve_2d)
+				col.active = (curve.dimensions=='3D')
 				
 				col.itemL(text="Interpolation:")
 				col.itemR(act_spline, "tilt_interpolation", text="Tilt")
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 0ac50d85ff4..dba882200ce 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3329,7 +3329,7 @@ void ED_keymap_screen(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);
 	
-	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", F7KEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");
+	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", F7KEY, KM_PRESS, 0, 0)->ptr, "path", "test.py");
 	WM_keymap_verify_item(keymap, "SCRIPT_OT_python_run_ui_scripts", F8KEY, KM_PRESS, 0, 0);
 
 	/* files */
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index da4abe81f24..121812c189c 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -167,12 +167,18 @@ static void rna_Curve_active_textbox_index_range(PointerRNA *ptr, int *min, int
 }
 
 
-static void rna_Curve_2d_set(PointerRNA *ptr, int value)
+static void rna_Curve_dimension_set(PointerRNA *ptr, int value)
 {
 	Curve *cu= (Curve*)ptr->id.data;
 	Nurb *nu= cu->editnurb ? cu->editnurb->first : cu->nurb.first;
 
-	if(value) {
+	if(value==CU_3D) {
+		cu->flag |=  CU_3D;
+		for( ; nu; nu= nu->next) {
+			nu->flag &= ~CU_2D;
+		}
+	}
+	else {
 		cu->flag &= ~CU_3D;
 		for( ; nu; nu= nu->next) {
 			nu->flag |= CU_2D;
@@ -183,12 +189,6 @@ static void rna_Curve_2d_set(PointerRNA *ptr, int value)
 				calchandlesNurb(nu);
 		}
 	}
-	else {
-		cu->flag |=  CU_3D;
-		for( ; nu; nu= nu->next) {
-			nu->flag &= ~CU_2D;
-		}
-	}
 }
 
 
@@ -675,6 +675,11 @@ static void rna_def_curve(BlenderRNA *brna)
 			{CU_TWIST_TANGENT, "TANGENT", 0, "Tangent", "Use the tangent to calculate twist"},
 			{0, NULL, 0, NULL, NULL}};
 
+	static const EnumPropertyItem curve_axis_items[]= {
+		{0, "2D", 0, "2D", "Clamp the Z axis of of the curve"},
+		{CU_3D, "3D", 0, "3D", "Allow editing on the Z axis of this curve, also alows tilt and curve radius to be used."},
+		{0, NULL, 0, NULL, NULL}};
+			
 	srna= RNA_def_struct(brna, "Curve", "ID");
 	RNA_def_struct_ui_text(srna, "Curve", "Curve datablock storing curves, splines and NURBS.");
 	RNA_def_struct_ui_icon(srna, ICON_CURVE_DATA);
@@ -778,10 +783,12 @@ static void rna_def_curve(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	/* Flags */
-	prop= RNA_def_property(srna, "curve_2d", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CU_3D);
-	RNA_def_property_boolean_funcs(prop, NULL, "rna_Curve_2d_set");
-	RNA_def_property_ui_text(prop, "2D Curve", "Define curve in two dimensions only. Note that fill only works when this is enabled.");
+
+	prop= RNA_def_property(srna, "dimensions", PROP_ENUM, PROP_NONE); /* as an enum */
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, curve_axis_items);
+	RNA_def_property_enum_funcs(prop, NULL, "rna_Curve_dimension_set", NULL);
+	RNA_def_property_ui_text(prop, "Dimensions", "Select 2D or 3D curve type.");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	prop= RNA_def_property(srna, "front", PROP_BOOLEAN, PROP_NONE);

From d47e1fee328d816e8f5c308556986669fc262616 Mon Sep 17 00:00:00 2001
From: Peter Schlaile <peter@schlaile.de>
Date: Sun, 13 Sep 2009 17:52:36 +0000
Subject: [PATCH 562/577] == FFMPEG ==

This fixes the underlying problem of the DV crashings - within blender
code.

Problem was, that we tried to seek on decode errors. (Unintentionally,
curposition wasn't advanced in that case). That triggered a bug within
ffmpeg, that made blender crash. My workaround fix for 2.49 actually only
prevented the crash, but didn't stop ffmpeg from only decoding black frames
after that point...

(The patch also cleans up the color conversion a little bit, by using
PIX_FMT_RGBA (still need to find a way to make it work with video files
that actually *have* an alpha channel. At least, latest FFMPEG-SVN swscaler
has the ability to use alpha.)

Looks like we can remove extern/ffmpeg now...
---
 source/blender/imbuf/intern/anim.c | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c
index a2dbdfbe483..1aaba620f3a 100644
--- a/source/blender/imbuf/intern/anim.c
+++ b/source/blender/imbuf/intern/anim.c
@@ -608,7 +608,7 @@ static int startffmpeg(struct anim * anim) {
 	anim->pFrameDeinterlaced = avcodec_alloc_frame();
 	anim->pFrameRGB = avcodec_alloc_frame();
 
-	if (avpicture_get_size(PIX_FMT_BGR32, anim->x, anim->y)
+	if (avpicture_get_size(PIX_FMT_RGBA, anim->x, anim->y)
 	    != anim->x * anim->y * 4) {
 		fprintf (stderr,
 			 "ffmpeg has changed alloc scheme ... ARGHHH!\n");
@@ -642,7 +642,7 @@ static int startffmpeg(struct anim * anim) {
 		anim->pCodecCtx->pix_fmt,
 		anim->pCodecCtx->width,
 		anim->pCodecCtx->height,
-		PIX_FMT_BGR32,
+		PIX_FMT_RGBA,
 		SWS_FAST_BILINEAR | SWS_PRINT_INFO,
 		NULL, NULL, NULL);
 		
@@ -671,11 +671,11 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 
 	if (anim == 0) return (0);
 
-	ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect, 0);
+	ibuf = IMB_allocImBuf(anim->x, anim->y, 32, IB_rect, 0);
 
 	avpicture_fill((AVPicture*) anim->pFrameRGB, 
 		       (unsigned char*) ibuf->rect, 
-		       PIX_FMT_BGR32, anim->x, anim->y);
+		       PIX_FMT_RGBA, anim->x, anim->y);
 
 	if (position != anim->curposition + 1) { 
 		if (position > anim->curposition + 1 
@@ -748,6 +748,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 			if (frameFinished && !pos_found) {
 				if (packet.dts >= pts_to_search) {
 					pos_found = 1;
+					anim->curposition = position;
 				}
 			} 
 
@@ -811,21 +812,21 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 
 					for (y = 0; y < h; y++) {
 						unsigned char tmp[4];
-						unsigned long * tmp_l =
-							(unsigned long*) tmp;
+						unsigned int * tmp_l =
+							(unsigned int*) tmp;
 						tmp[3] = 0xff;
 
 						for (x = 0; x < w; x++) {
-							tmp[0] = bottom[3];
-							tmp[1] = bottom[2];
-							tmp[2] = bottom[1];
+							tmp[0] = bottom[0];
+							tmp[1] = bottom[1];
+							tmp[2] = bottom[2];
 
-							bottom[0] = top[3];
-							bottom[1] = top[2];
-							bottom[2] = top[1];
+							bottom[0] = top[0];
+							bottom[1] = top[1];
+							bottom[2] = top[2];
 							bottom[3] = 0xff;
 								
-							*(unsigned long*) top
+							*(unsigned int*) top
 								= *tmp_l;
 
 							bottom +=4;
@@ -848,8 +849,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 						0, 0, 0 };
 					int i;
 					unsigned char* r;
-					
-						
+	
 					sws_scale(anim->img_convert_ctx,
 						  input->data,
 						  input->linesize,
@@ -857,8 +857,8 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 						  anim->pCodecCtx->height,
 						  dst2,
 						  dstStride2);
-					
-					/* workaround: sws_scale 
+
+					/* workaround: sws_scale
 					   sets alpha = 0... */
 					
 					r = (unsigned char*) ibuf->rect;
@@ -867,7 +867,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 						r[3] = 0xff;
 						r+=4;
 					}
-					
+
 					av_free_packet(&packet);
 					break;
 				}

From 8c6176b84688fae585952992676d56903113c040 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 13 Sep 2009 18:09:13 +0000
Subject: [PATCH 563/577] use Py_SetPythonHome rather then setting environment
 vars PYTHONHOME and PYTHONPATH

---
 source/blender/python/intern/bpy_interface.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index a85bcd011a6..a850809b4a5 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -259,8 +259,17 @@ void BPY_start_python_path(void)
 	/* set the environment path */
 	printf("found bundled python: %s\n", py_path_bundle);
 
+#if 0
 	BLI_setenv("PYTHONHOME", py_path_bundle);
 	BLI_setenv("PYTHONPATH", py_path_bundle);
+#endif
+
+	{
+		static wchar_t py_path_bundle_wchar[FILE_MAXDIR];
+
+		mbstowcs(py_path_bundle_wchar, py_path_bundle, FILE_MAXDIR);
+		Py_SetPythonHome(py_path_bundle_wchar);
+	}
 }
 
 

From be7eeb888af6cebe5d4162faa6e1b7551312410a Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sun, 13 Sep 2009 19:37:51 +0000
Subject: [PATCH 564/577] Sculpt UI

*Changed Sculpt Modes Flip Direction to an enum so that you can explicitly choose Add or Subtract.
*Expanded the sculpt tool list. I realize Nicolas has a longer term plan for the brush tools, but at least now it's useable again.
---
 release/ui/space_view3d_toolbar.py         |  8 +++++---
 source/blender/makesrna/intern/rna_brush.c | 14 ++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index 9dd2df14492..40ebb6883f0 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -399,7 +399,9 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 		elif context.sculpt_object and settings.brush:
 			col = layout.column()
 			col.itemS()
-				
+			col.itemR(brush, "sculpt_tool", expand=True)
+			col.itemS()
+			
 			row = col.row(align=True)
 			row.itemR(brush, "size", slider=True)
 			row.itemR(brush, "size_pressure", toggle=True, text="")
@@ -412,13 +414,13 @@ class VIEW3D_PT_tools_brush(PaintPanel):
 				col = layout.column()
 
 				if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
-					col.itemR(brush, "flip_direction")
+					col.row().itemR(brush, "direction", expand=True)
 
 				if brush.sculpt_tool == 'LAYER':
 					col.itemR(brush, "persistent")
 					col.itemO("sculpt.set_persistent_base")
 
-			col.itemR(brush, "sculpt_tool")
+			
 				
 		# Texture Paint Mode #
 		
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 448a2046855..612863e1ab9 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -104,6 +104,11 @@ void rna_def_brush(BlenderRNA *brna)
 		{IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting."},
 		{IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting."},
 		{0, NULL, 0, NULL, NULL}};
+	
+	static const EnumPropertyItem prop_flip_direction_items[]= {
+		{0, "ADD", 0, "Add", "Add effect of brush"},
+		{BRUSH_DIR_IN, "SUBTRACT", 0, "Subtract", "Subtract effect of brush"},
+		{0, NULL, 0, NULL, NULL}};
 		
 	srna= RNA_def_struct(brna, "Brush", "ID");
 	RNA_def_struct_ui_text(srna, "Brush", "Brush datablock for storing brush settings for painting and sculpting.");
@@ -117,6 +122,11 @@ void rna_def_brush(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "sculpt_tool", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, brush_sculpt_tool_items);
 	RNA_def_property_ui_text(prop, "Sculpt Tool", "");
+
+	prop= RNA_def_property(srna, "direction", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, prop_flip_direction_items);
+	RNA_def_property_ui_text(prop, "Direction", "Mapping type to use for this image in the game engine.");
 	
 	/* number values */
 	prop= RNA_def_property(srna, "size", PROP_INT, PROP_NONE);
@@ -192,10 +202,6 @@ void rna_def_brush(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ANCHORED);
 	RNA_def_property_ui_text(prop, "Anchored", "Keep the brush anchored to the initial location.");
 
-	prop= RNA_def_property(srna, "flip_direction", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_DIR_IN);
-	RNA_def_property_ui_text(prop, "Flip Direction", "Move vertices in the opposite direction.");
-
 	prop= RNA_def_property(srna, "space", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SPACE);
 	RNA_def_property_ui_text(prop, "Space", "Limit brush application to the distance specified by spacing.");

From 7e7a6a193e48ce8a34e11eebefbf2423c9c6b444 Mon Sep 17 00:00:00 2001
From: William Reynish <william@reynish.com>
Date: Sun, 13 Sep 2009 21:36:24 +0000
Subject: [PATCH 565/577] *Changed some userpref options to enums.

*Tweaked curve UI slightly.
---
 release/ui/buttons_data_curve.py             | 12 +++++---
 release/ui/buttons_data_text.py              |  8 ++---
 release/ui/space_userpref.py                 | 10 +++---
 source/blender/makesrna/intern/rna_userdef.c | 32 +++++++++++++-------
 4 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index 94ad073d0bb..70904239d86 100644
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -96,27 +96,29 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 #		col.itemL(text="NORMALS")
 #		col.itemR(curve, "vertex_normal_flip")
 
-class DATA_PT_geometry_curve(DataButtonsPanelCurve):
-	__label__ = "Geometry "
+class DATA_PT_geometry_curve(DataButtonsPanel):
+	__label__ = "Geometry"
 
 	def draw(self, context):
 		layout = self.layout
 		
 		curve = context.curve
-		
+
 		split = layout.split()
 	
 		col = split.column()
 		col.itemL(text="Modification:")
 		col.itemR(curve, "width")
 		col.itemR(curve, "extrude")
-		col.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
+		col.itemL(text="Taper Object:")
+		col.itemR(curve, "taper_object", text="")
 		
 		col = split.column()
 		col.itemL(text="Bevel:")
 		col.itemR(curve, "bevel_depth", text="Depth")
 		col.itemR(curve, "bevel_resolution", text="Resolution")
-		col.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
+		col.itemL(text="Bevel Object:")
+		col.itemR(curve, "bevel_object", text="")
 
 	
 class DATA_PT_pathanim(DataButtonsPanelCurve):
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index d0e7ea09a92..2959f60a5f5 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -36,9 +36,7 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		
 		ob = context.object
 		curve = context.curve
-		space = context.space_data
-
-		layout.itemR(curve, "curve_2d")			
+		space = context.space_data		
 							
 		split = layout.split()
 		
@@ -55,8 +53,8 @@ class DATA_PT_shape_text(DataButtonsPanel):
 		col = split.column()	
 		col.itemL(text="Resolution:")
 		sub = col.column(align=True)
-		sub.itemR(curve, "resolution_u", text="Preview U")
-		sub.itemR(curve, "render_resolution_u", text="Render U")
+		sub.itemR(curve, "resolution_u", text="Preview")
+		sub.itemR(curve, "render_resolution_u", text="Render")
 		
 		# resolution_v is not used for text
 		
diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py
index 1e7a9b581d4..cfdabadcee1 100644
--- a/release/ui/space_userpref.py
+++ b/release/ui/space_userpref.py
@@ -156,15 +156,15 @@ class USERPREF_PT_edit(bpy.types.Panel):
 		sub = col.split(percentage=0.85)
 		
 		sub1 = sub.column()
-		sub1.itemL(text="Materials:")
-		sub1.itemR(edit, "material_linked_object", text="Linked to Object")
-		sub1.itemR(edit, "material_linked_obdata", text="Linked to ObData")
+		sub1.itemL(text="Link Materials To:")
+		sub1.row().itemR(edit, "material_link", expand=True)
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemL(text="New Objects:")
 		sub1.itemR(edit, "enter_edit_mode")
-		sub1.itemR(edit, "align_to_view")
+		sub1.itemL(text="Align To:")
+		sub1.row().itemR(edit, "object_align", expand=True)
 		sub1.itemS()
 		sub1.itemS()
 		sub1.itemS()
@@ -185,9 +185,9 @@ class USERPREF_PT_edit(bpy.types.Panel):
 		sub1.itemL(text="Grease Pencil:")
 		sub1.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
 		sub1.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
-		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
 		# sub1.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
 		sub1.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
+		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
 		
 		col = split.column()
 		sub = col.split(percentage=0.85)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index ffc3f1696fc..1a000525fda 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1766,28 +1766,38 @@ static void rna_def_userdef_edit(BlenderRNA *brna)
 		{BEZT_IPO_BEZ, "BEZIER", 0, "Bezier", ""},
 		{0, NULL, 0, NULL, NULL}};
 
+	static const EnumPropertyItem material_link_items[]= {
+		{0, "OBDATA", 0, "ObData", "Toggle whether the material is linked to object data or the object block."},
+		{USER_MAT_ON_OB, "OBJECT", 0, "Object", "Toggle whether the material is linked to object data or the object block."},
+		{0, NULL, 0, NULL, NULL}};
+		
+	static const EnumPropertyItem object_align_items[]= {
+		{0, "WORLD", 0, "World", "Align newly added objects facing the 3D View direction"},
+		{USER_ADD_VIEWALIGNED, "VIEW", 0, "View", "Align newly added objects to the world coordinates"},
+		{0, NULL, 0, NULL, NULL}};
+
+
 	srna= RNA_def_struct(brna, "UserPreferencesEdit", NULL);
 	RNA_def_struct_sdna(srna, "UserDef");
 	RNA_def_struct_nested(brna, srna, "UserPreferences");
 	RNA_def_struct_ui_text(srna, "Edit Methods", "Settings for interacting with Blender data.");
 	
 	/* Edit Methods */
-	prop= RNA_def_property(srna, "material_linked_object", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_MAT_ON_OB);
-	RNA_def_property_ui_text(prop, "Material Linked Object", "Toggle whether the material is linked to object data or the object block.");
-
-	prop= RNA_def_property(srna, "material_linked_obdata", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_MAT_ON_OB);
-	RNA_def_property_ui_text(prop, "Material Linked ObData", "Toggle whether the material is linked to object data or the object block.");
+	
+	prop= RNA_def_property(srna, "material_link", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, material_link_items);
+	RNA_def_property_ui_text(prop, "Material Link To", "Toggle whether the material is linked to object data or the object block");
+	
+	prop= RNA_def_property(srna, "object_align", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, object_align_items);
+	RNA_def_property_ui_text(prop, "Align Object To", "Align newly added objects facing the 3D View direction or the world coordinates");
 
 	prop= RNA_def_property(srna, "enter_edit_mode", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_ADD_EDITMODE);
 	RNA_def_property_ui_text(prop, "Enter Edit Mode", "Enter Edit Mode automatically after adding a new object.");
 
-	prop= RNA_def_property(srna, "align_to_view", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_ADD_VIEWALIGNED);
-	RNA_def_property_ui_text(prop, "Align To View", "Align newly added objects facing the 3D View direction.");
-
 	prop= RNA_def_property(srna, "drag_immediately", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_DRAGIMMEDIATE);
 	RNA_def_property_ui_text(prop, "Drag Immediately", "Moving things with a mouse drag doesn't require a click to confirm (Best for tablet users).");

From a4532b202b960fcff3049fa047c8e828802e91ce Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Sun, 13 Sep 2009 22:08:27 +0000
Subject: [PATCH 566/577] Prepare for removal of FFMPEG from extern. make clean
 and full rebuild recommended.

---
 extern/Makefile           |  9 ---------
 source/nan_definitions.mk | 12 +++---------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/extern/Makefile b/extern/Makefile
index 1bebf1e1994..b81fbd2b91a 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -32,15 +32,6 @@ SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
 DIRS = glew/src
 
-ifeq ($(WITH_FFMPEG), true)
-ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
-    DIRS += ffmpeg
-endif
-ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
-    DIRS += ffmpeg
-endif
-endif
-
 # Cloth requires it
 #ifneq ($(NAN_NO_KETSJI), true)
 DIRS += bullet2
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index f8afc7f3fa6..8c47bcf11c1 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -138,9 +138,9 @@ ifndef CONFIG_GUESS
   endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
-    export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)
-    export NAN_FFMPEGLIBS ?= $(shell ffmpeg-config --libs avformat avcodec)
-    export NAN_FFMPEGCFLAGS ?= $(shell ffmpeg-config --cflags)
+    export NAN_FFMPEG = $(shell pkg-config --variable=prefix libavcodec) # Assume they are all in the same prefix
+    export NAN_FFMPEGLIBS = $(shell pkg-config --libs libavcodec libavdevice libavformat libswscale libavutil)
+    export NAN_FFMPEGCFLAGS = $(shell pkg-config --cflags libavcodec libavdevice libavformat libswscale libavutil)
   endif
 
   # Platform Dependent settings go below:
@@ -336,12 +336,6 @@ ifndef CONFIG_GUESS
     export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
     export NAN_SAMPLERATE ?= /usr
 
-ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
-    export NAN_FFMPEG ?= /usr
-    export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -lswscale -lavdevice -ldts -lz
-    export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
-endif
-
     ifeq ($(WITH_OPENEXR), true)
       export NAN_OPENEXR ?= $(shell pkg-config --variable=prefix OpenEXR )
       export NAN_OPENEXR_INC ?= $(shell pkg-config --cflags OpenEXR )

From 492f6589c4857d207810f7b546817c2ae35184c8 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Sun, 13 Sep 2009 22:33:47 +0000
Subject: [PATCH 567/577] New 'icon_only' wasn't actually exposed in the ui
 api, causing errors in the py scripts, so I added it to ItemR. Also reverted
 Joshua's temporary fix, which didn't seem to help much and was making the
 render engine menu too small.

---
 source/blender/makesrna/intern/rna_ui_api.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index ab2dfe5e33c..e3cae8ab453 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -37,17 +37,15 @@
 
 #ifdef RNA_RUNTIME
 
-static void rna_uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *propname, int expand, int slider, int toggle)
+static void rna_uiItemR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, char *propname, int expand, int slider, int toggle, int icon_only)
 {
 	int flag= 0;
 
 	flag |= (slider)? UI_ITEM_R_SLIDER: 0;
 	flag |= (expand)? UI_ITEM_R_EXPAND: 0;
 	flag |= (toggle)? UI_ITEM_R_TOGGLE: 0;
+	flag |= (icon_only)? UI_ITEM_R_ICON_ONLY: 0;
 	
-		// XXX: an 'icon_only' prop should be added instead, but for now, this makes ptrs look ok
-	flag |= (name && name[0]==0)? UI_ITEM_R_ICON_ONLY: 0; 
-
 	uiItemR(layout, name, icon, ptr, propname, flag);
 }
 
@@ -148,6 +146,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	RNA_def_boolean(func, "expand", 0, "", "Expand button to show more detail.");
 	RNA_def_boolean(func, "slider", 0, "", "Use slider widget for numeric values.");
 	RNA_def_boolean(func, "toggle", 0, "", "Use toggle widget for boolean values.");
+	RNA_def_boolean(func, "icon_only", 0, "", "Only show the property's icon, with no text");
 
 	func= RNA_def_function(srna, "items_enumR", "uiItemsEnumR");
 	api_ui_item_rna_common(func);

From ccf847585d3f075a16ca05ed41498c9e9e7ffb6a Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Sun, 13 Sep 2009 22:34:47 +0000
Subject: [PATCH 568/577] Make compiler easily to override (CC & CCC) and clean
 up whitespace.

---
 source/nan_compile.mk | 140 +++++++++++++++++++++---------------------
 source/nan_warn.mk    |  23 ++++---
 2 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index c62b4f2681b..8d4da1e2790 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -62,27 +62,27 @@ ifdef NAN_DEBUG
     CCFLAGS += $(NAN_DEBUG)
 endif
 
-REL_CFLAGS	+= -DNDEBUG
-REL_CCFLAGS	+= -DNDEBUG
-DBG_CFLAGS	+= -g
-DBG_CCFLAGS	+= -g
+REL_CFLAGS  += -DNDEBUG
+REL_CCFLAGS += -DNDEBUG
+DBG_CFLAGS  += -g
+DBG_CCFLAGS += -g
 
 # OS dependent parts ---------------------------------------------------
 
 ifeq ($(OS),darwin)
-    CC	= gcc
-    CCC	= g++
-	ifeq ($(CPU),powerpc)
-        CFLAGS	+= -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 -funsigned-char -fno-strict-aliasing
-        CCFLAGS	+= -pipe -fPIC  -funsigned-char -fno-strict-aliasing
-	else
-        CFLAGS	+= -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing
-        CCFLAGS	+= -pipe -fPIC  -funsigned-char -fno-strict-aliasing
-	endif
-#   REL_CFLAGS	+= -O
-#    REL_CCFLAGS	+= -O2
-    CPPFLAGS	+= -D_THREAD_SAFE
-    NAN_DEPEND	= true
+    CC  ?= gcc
+    CCC ?= g++
+    ifeq ($(CPU),powerpc)
+        CFLAGS  += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 -funsigned-char -fno-strict-aliasing
+        CCFLAGS += -pipe -fPIC  -funsigned-char -fno-strict-aliasing
+    else
+        CFLAGS  += -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing
+        CCFLAGS += -pipe -fPIC  -funsigned-char -fno-strict-aliasing
+    endif
+#   REL_CFLAGS  += -O
+#   REL_CCFLAGS += -O2
+    CPPFLAGS    += -D_THREAD_SAFE
+    NAN_DEPEND  = true
     OPENGL_HEADERS = /System/Library/Frameworks/OpenGL.framework
     AR = ar
     ARFLAGS = ruv
@@ -91,28 +91,28 @@ ifeq ($(OS),darwin)
 endif
 
 ifeq ($(OS),freebsd)
-    CC	= gcc
-    CCC	= g++
+    CC  ?= gcc
+    CCC ?= g++
     JAVAC = javac
     JAVAH = javah
-    CFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    CCFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    REL_CFLAGS	+= -O2
-    REL_CCFLAGS	+= -O2
-    CPPFLAGS	+= -D_THREAD_SAFE
-    NAN_DEPEND	= true
+    CFLAGS  += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    REL_CFLAGS  += -O2
+    REL_CCFLAGS += -O2
+    CPPFLAGS += -D_THREAD_SAFE
+    NAN_DEPEND = true
     OPENGL_HEADERS  = /usr/X11R6/include
     JAVA_HEADERS = /usr/local/jdk1.3.1/include
     JAVA_SYSTEM_HEADERS = /usr/local/jdk1.3.1/include/freebsd
-    AR	= ar
+    AR = ar
     ARFLAGS = ruv
     ARFLAGSQUIET = ru
 endif
 
 ifeq ($(OS),irix)
     ifeq ($(IRIX_USE_GCC),true)
-        CC = gcc
-        CCC = g++
+        CC  ?= gcc
+        CCC ?= g++
         CFLAGS += -fPIC -funsigned-char -fno-strict-aliasing -mabi=n32 -mips4
         CCFLAGS += -fPIC -fpermissive -funsigned-char -fno-strict-aliasing -mabi=n32 -mips4
         REL_CFLAGS += -O2
@@ -121,16 +121,16 @@ ifeq ($(OS),irix)
         DBG_CFLAGS += -g3 -gdwarf-2 -ggdb
         DBG_CCFLAGS += -g3 -gdwarf-2 -ggdb
     else
-        CC = cc
-        CCC = CC
-        CFLAGS	+= -n32 -mips3 -Xcpluscomm
-        CCFLAGS	+= -n32 -mips3 -Xcpluscomm -LANG:std
+        CC  ?= cc
+        CCC ?= CC
+        CFLAGS  += -n32 -mips3 -Xcpluscomm
+        CCFLAGS += -n32 -mips3 -Xcpluscomm -LANG:std
         ifdef MIPS73_ISOHEADERS
-            CCFLAGS	+= -LANG:libc_in_namespace_std=off -I$(MIPS73_ISOHEADERS)
+            CCFLAGS += -LANG:libc_in_namespace_std=off -I$(MIPS73_ISOHEADERS)
         else
-            CCFLAGS	+= -LANG:libc_in_namespace_std=off
+            CCFLAGS += -LANG:libc_in_namespace_std=off
         endif
-        REL_CFLAGS	+= -n32 -mips3 -O2 -OPT:Olimit=0
+        REL_CFLAGS  += -n32 -mips3 -O2 -OPT:Olimit=0
         REL_CCFLAGS += -n32 -mips3 -O2 -OPT:Olimit=0
     endif
     OPENGL_HEADERS = /usr/include
@@ -141,14 +141,14 @@ ifeq ($(OS),irix)
 endif
 
 ifeq ($(OS),linux)
-    CC	= gcc
-    CCC	= g++
-#    CFLAGS	+= -pipe
-    CFLAGS	+= -pipe -fPIC  -funsigned-char -fno-strict-aliasing
-    CCFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-#    CCFLAGS	+= -pipe
-    REL_CFLAGS	+= -O2
-    REL_CCFLAGS	+= -O2
+    CC  ?= gcc
+    CCC ?= g++
+#    CFLAGS += -pipe
+#    CCFLAGS += -pipe
+    CFLAGS  += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    REL_CFLAGS  += -O2
+    REL_CCFLAGS += -O2
     NAN_DEPEND = true
   ifeq ($(CPU),alpha)
     CFLAGS += -mieee
@@ -160,11 +160,11 @@ ifeq ($(OS),linux)
 endif
 
 ifeq ($(OS),openbsd)
-    CC	= gcc
-    CCC = g++
-    CFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    CCFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    REL_CFLAGS	+= -O2
+    CC  ?= gcc
+    CCC ?= g++
+    CFLAGS  += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    REL_CFLAGS  += -O2
     REL_CCFLAGS += -O2
     NAN_DEPEND = true
     CPPFLAGS += -D__FreeBSD__
@@ -177,30 +177,30 @@ endif
 ifeq ($(OS),solaris)
     # Adding gcc flag to $CC is not good, however if its not there makesdna wont build - Campbell
     ifeq (x86_64, $(findstring x86_64, $(CPU)))
-        CC  = gcc -m64
-        CCC = g++ -m64
+        CC  ?= gcc -m64
+        CCC ?= g++ -m64
     else
-        CC  = gcc
-        CCC = g++
-        #CC  = cc
-        #CCC = CC
+        CC  ?= gcc
+        CCC ?= g++
+        #CC  ?= cc
+        #CCC ?= CC
     endif
     
     JAVAC = javac
     JAVAH = javah
-    CFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    CCFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
-#    CFLAGS	+= "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned"
-#    CCFLAGS	+= "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned"
+    CFLAGS  += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+    CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing
+#    CFLAGS  += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned"
+#    CCFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned"
 
     # Note, you might still want to compile a 32 bit binary if you have a 64bit system. if so remove the following lines
 #    ifeq ($(findstring 64,$(CPU)), 64)
-#        CFLAGS	+= -m64
-#        CCFLAGS	+= -m64
+#        CFLAGS  += -m64
+#        CCFLAGS += -m64
 #    endif
 
-    REL_CFLAGS	+= -O2
-    REL_CCFLAGS	+= -O2
+    REL_CFLAGS  += -O2
+    REL_CCFLAGS += -O2
 
     NAN_DEPEND = true
 #    ifeq ($(CPU),sparc)
@@ -211,7 +211,7 @@ ifeq ($(OS),solaris)
         JAVA_SYSTEM_HEADERS = /usr/java/include/solaris
     else
         # OPENGL_HEADERS = /usr/X11/include/mesa
-	OPENGL_HEADERS = /usr/X11/include/
+        OPENGL_HEADERS = /usr/X11/include/
     endif
     AR = ar
     ARFLAGS = ruv
@@ -220,8 +220,8 @@ endif
 
 ifeq ($(OS),windows)
   ifeq ($(FREE_WINDOWS),true)
-    CC  = gcc
-    CCC = g++
+    CC  ?= gcc
+    CCC ?= g++
     CFLAGS += -pipe -mno-cygwin -mwindows -funsigned-char -fno-strict-aliasing
     CCFLAGS += -pipe -mno-cygwin -mwindows -funsigned-char -fno-strict-aliasing
     CPPFLAGS += -DFREE_WINDOWS
@@ -233,16 +233,16 @@ ifeq ($(OS),windows)
     AR = ar
     ARFLAGS = ruv
     ARFLAGSQUIET = ru
-    WINRC = $(wildcard *.rc)	
+    WINRC = $(wildcard *.rc)
     RANLIB = ranlib
   else
-    CC	= $(SRCHOME)/tools/cygwin/cl_wrapper.pl
-    CCC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl
+    CC  ?= $(SRCHOME)/tools/cygwin/cl_wrapper.pl
+    CCC ?= $(SRCHOME)/tools/cygwin/cl_wrapper.pl
     JAVAC = $(SRCHOME)/tools/cygwin/java_wrapper.pl -c
     JAVAH = $(SRCHOME)/tools/cygwin/java_wrapper.pl -h
-    REL_CFLAGS	+= /O2
+    REL_CFLAGS  += /O2
     REL_CCFLAGS += /O2 -GX
-    DBG_CFLAGS	+= /Fd$(DIR)/debug/
+    DBG_CFLAGS  += /Fd$(DIR)/debug/
     DBG_CCFLAGS += /Fd$(DIR)/debug/
     CFLAGS += /MT
     CCFLAGS += /MT
diff --git a/source/nan_warn.mk b/source/nan_warn.mk
index 5841cdf5908..b685c13604d 100644
--- a/source/nan_warn.mk
+++ b/source/nan_warn.mk
@@ -52,16 +52,15 @@ else
       #
       # Irix warning info
       #
-	  # 1001		# the source file does not end w/ a newline
-      # 1110		# unreachable statement
-      # 1201		# trailing comma in enums is nonstandard
-      # 1209		# constant controlling expressions
-      # 1355		# extra semicolon is ignored
-      # 1424		# unreferenced template paramaters
-      # 1681		# virtual function override
-      # 3201		# unreferenced formal paramaters
+      # 1001 # the source file does not end w/ a newline
+      # 1110 # unreachable statement
+      # 1201 # trailing comma in enums is nonstandard
+      # 1209 # constant controlling expressions
+      # 1355 # extra semicolon is ignored
+      # 1424 # unreferenced template paramaters
+      # 1681 # virtual function override
+      # 3201 # unreferenced formal paramaters
       #
-		
       LEVEL_1_C_WARNINGS = -fullwarn -woff 1001,1110,1201,1209,1355,1424,1681,3201
     endif
   endif
@@ -79,7 +78,7 @@ else
   ifeq ($(CCC),CC)
     ifeq ($(OS),irix)
       # MIPSpro Compilers
-	  #  see warning descriptions above
+      #  see warning descriptions above
       LEVEL_1_CPP_WARNINGS = -woff 1001,1110,1201,1209,1355,1424,1681,3201
     endif
   endif
@@ -111,7 +110,7 @@ else
   ifeq ($(CC),cc)
     ifeq ($(OS),irix)
       # MIPSpro Compilers
-	  #  see warning descriptions above
+      #  see warning descriptions above
       LEVEL_2_C_WARNINGS = -fullwarn -woff 1001,1209,1424,3201
     endif
     ifeq ($(OS),solaris)
@@ -148,7 +147,7 @@ else
   ifeq ($(CCC),CC)
     ifeq ($(OS),irix)
       # MIPSpro Compilers
-	  #  see warning descriptions above
+      #  see warning descriptions above
       LEVEL_2_CPP_WARNINGS = -fullwarn -woff 1209,1424,3201
     endif
   endif

From cf20399993566ce15b4af8c558394eb3a6e391c8 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 13 Sep 2009 23:58:03 +0000
Subject: [PATCH 569/577] Pointcache: * reset on object transformations

---
 .../editors/transform/transform_conversions.c        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 6386c0d4eb7..776f2e47d1e 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4946,8 +4946,18 @@ void special_aftertrans_update(TransInfo *t)
 			ob= base->object;
 
 			if (base->flag & SELECT && (t->mode != TFM_DUMMY)) {
+				ListBase pidlist;
+				PTCacheID *pid;
+
+				/* flag object caches as outdated */
+				BKE_ptcache_ids_from_object(&pidlist, ob);
+				for(pid=pidlist.first; pid; pid=pid->next) {
+					if(pid->type != PTCACHE_TYPE_PARTICLES) /* particles don't need reset on geometry change */
+						pid->cache->flag |= PTCACHE_OUTDATED;
+				}
+
 				/* pointcache refresh */
-				if (BKE_ptcache_object_reset(scene, ob, PTCACHE_RESET_DEPSGRAPH))
+				if (BKE_ptcache_object_reset(scene, ob, PTCACHE_RESET_OUTDATED))
 					ob->recalc |= OB_RECALC_DATA;
 
 				/* Needed for proper updating of "quick cached" dynamics. */

From 9f5e42ff7622b5b2dd0ef711769ecc541126efb5 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Mon, 14 Sep 2009 00:01:08 +0000
Subject: [PATCH 570/577] Smoke: * Totally new try to get cache running *
 Didn't try "bake" and such things yet

Hint
* Very verbose yet
* Please do only test new blend files, not old ones!

Please give me feedback on my blog about the old crashers.
---
 intern/smoke/intern/FLUID_3D.cpp         |   3 +
 intern/smoke/intern/FLUID_3D.h           |   2 +-
 intern/smoke/intern/FLUID_3D_STATIC.cpp  |  18 +--
 intern/smoke/intern/smoke_API.cpp        |   3 +-
 source/blender/blenkernel/intern/smoke.c | 196 +++++------------------
 5 files changed, 54 insertions(+), 168 deletions(-)

diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 7574a0ec16e..8a32eaa2e68 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -182,6 +182,9 @@ void FLUID_3D::initBlenderRNA(float *alpha, float *beta)
 //////////////////////////////////////////////////////////////////////
 void FLUID_3D::step()
 {
+	// addSmokeTestCase(_density, _res);
+	// addSmokeTestCase(_heat, _res);
+	
 	// wipe forces
 	for (int i = 0; i < _totalCells; i++)
 	{
diff --git a/intern/smoke/intern/FLUID_3D.h b/intern/smoke/intern/FLUID_3D.h
index 9d9e7318204..a7be7f58335 100644
--- a/intern/smoke/intern/FLUID_3D.h
+++ b/intern/smoke/intern/FLUID_3D.h
@@ -47,7 +47,7 @@ class FLUID_3D
 		void initVectorNoise(int amplify);
 
 		void addSmokeColumn();
-		static void addSmokeTestCase(float* field, Vec3Int res, float value);
+		static void addSmokeTestCase(float* field, Vec3Int res);
 
 		void step();
 		void addObstacle(OBSTACLE* obstacle);
diff --git a/intern/smoke/intern/FLUID_3D_STATIC.cpp b/intern/smoke/intern/FLUID_3D_STATIC.cpp
index 4909c071c3d..2d3ec125c2b 100644
--- a/intern/smoke/intern/FLUID_3D_STATIC.cpp
+++ b/intern/smoke/intern/FLUID_3D_STATIC.cpp
@@ -44,8 +44,8 @@ void FLUID_3D::addSmokeColumn() {
 // generic static version, so that it can be applied to the
 // WTURBULENCE grid as well
 //////////////////////////////////////////////////////////////////////
-/*
-void FLUID_3D::addSmokeTestCase(float* field, Vec3Int res, float value)
+
+void FLUID_3D::addSmokeTestCase(float* field, Vec3Int res)
 {
 	const int slabSize = res[0]*res[1]; int maxRes = (int)MAX3V(res);
 	float dx = 1.0f / (float)maxRes;
@@ -57,22 +57,22 @@ void FLUID_3D::addSmokeTestCase(float* field, Vec3Int res, float value)
   float heighMin = 0.05;
   float heighMax = 0.10;
 
-  for (int y = 0; y < res[1]; y++)
-    for (int z = (int)(heighMin*res[2]); z <= (int)(heighMax * res[1]); z++)
+  for (int y = 0; y < res[2]; y++)
+    for (int z = (int)(heighMin*res[2]); z <= (int)(heighMax * res[2]); z++)
       for (int x = 0; x < res[0]; x++)
       {
         float xLength = x * dx - xTotal * 0.4f;
-        float yLength = y * dx - zTotal * 0.5f;
+        float yLength = y * dx - yTotal * 0.5f;
         float radius = sqrtf(xLength * xLength + yLength * yLength);
 
         if (radius < 0.075f * xTotal)
         {
           int index = x + y * res[0] + z * slabSize;
-          field[index] = value;
+          field[index] = 1.0f;
         }
       }
 }
-*/
+
 
 //////////////////////////////////////////////////////////////////////
 // set x direction to Neumann boundary conditions
@@ -295,12 +295,10 @@ void FLUID_3D::advectFieldSemiLagrange(const float dt, const float* velx, const
 	const int xres = res[0];
 	const int yres = res[1];
 	const int zres = res[2];
-	static int hits = 0;
-	static int total = 0;
 	const int slabSize = res[0] * res[1];
 
 	// scale dt up to grid resolution
-#if PARALLEL==1 && !_WIN32
+#if PARALLEL==1
 #pragma omp parallel
 #pragma omp for  schedule(static)
 #endif
diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 058831dddbb..67df6e805d8 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -81,8 +81,7 @@ extern "C" void smoke_step(FLUID_3D *fluid, size_t framenr)
 
 extern "C" void smoke_turbulence_step(WTURBULENCE *wt, FLUID_3D *fluid)
 {
-	if(wt) 
-		wt->stepTurbulenceFull(fluid->_dt/fluid->_dx, fluid->_xVelocity, fluid->_yVelocity, fluid->_zVelocity, fluid->_obstacles); 
+	wt->stepTurbulenceFull(fluid->_dt/fluid->_dx, fluid->_xVelocity, fluid->_yVelocity, fluid->_zVelocity, fluid->_obstacles); 
 }
 
 extern "C" void smoke_initBlenderRNA(FLUID_3D *fluid, float *alpha, float *beta)
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index af79fd74ae8..67744ab56a2 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -167,6 +167,8 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 		// calc other res with max_res provided
 		VECSUB(size, max, min);
 
+		printf("size: %f, %f, %f\n", size[0], size[1], size[2]);
+
 		// prevent crash when initializing a plane as domain
 		if((size[0] < FLT_EPSILON) || (size[1] < FLT_EPSILON) || (size[2] < FLT_EPSILON))
 			return 0;
@@ -210,6 +212,8 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 			}
 		}
 
+		printf("smd->domain->dx: %f\n", smd->domain->dx);
+
 		// TODO: put in failsafe if res<=0 - dg
 
 		// printf("res[0]: %d, res[1]: %d, res[2]: %d\n", smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]);
@@ -595,11 +599,6 @@ void smokeModifier_reset_turbulence(struct SmokeModifierData *smd)
 		smoke_turbulence_free(smd->domain->wt);
 		smd->domain->wt = NULL;
 	}
-
-	smd->domain->point_cache[1]->flag &= ~PTCACHE_SIMULATION_VALID;
-	smd->domain->point_cache[1]->flag |= PTCACHE_OUTDATED;
-	smd->domain->point_cache[1]->simframe= 0;
-	smd->domain->point_cache[1]->last_exact= 0;
 }
 
 void smokeModifier_reset(struct SmokeModifierData *smd)
@@ -617,17 +616,15 @@ void smokeModifier_reset(struct SmokeModifierData *smd)
 				smoke_free(smd->domain->fluid);
 				smd->domain->fluid = NULL;
 			}
-					
-			smd->domain->point_cache[0]->flag &= ~PTCACHE_SIMULATION_VALID;
+
 			smd->domain->point_cache[0]->flag |= PTCACHE_OUTDATED;
-			smd->domain->point_cache[0]->simframe= 0;
-			smd->domain->point_cache[0]->last_exact= 0;
+			smd->domain->point_cache[1]->flag |= PTCACHE_OUTDATED;
 
 			smokeModifier_reset_turbulence(smd);
 
 			smd->time = -1;
 
-			// printf("reset domain end\n");
+			printf("reset domain end\n");
 		}
 		else if(smd->flow)
 		{
@@ -841,7 +838,7 @@ static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd)
 							else if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;																		
 							// VECCOPY(pos, pa->state.co);									
 							// Mat4MulVecfl (ob->imat, pos);																		
-							// 1. get corresponding cell									
+							// 1. get corresponding cell	
 							get_cell(smd->domain->p0, smd->domain->res, smd->domain->dx, pa->state.co, cell, 0);																	
 							// check if cell is valid (in the domain boundary)									
 							for(i = 0; i < 3; i++)									
@@ -1102,153 +1099,76 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 	}
 	else if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
 	{
+		SmokeDomainSettings *sds = smd->domain;
+		float light[3];	
 		PointCache *cache = NULL;
 		PTCacheID pid;
 		PointCache *cache_wt = NULL;
 		PTCacheID pid_wt;
+		int startframe, endframe, framenr;
 		float timescale;
 		int cache_result = 0, cache_result_wt = 0;
-		int startframe, endframe, framenr, badloading = 0;
-		SmokeDomainSettings *sds = smd->domain;
-		float light[3];	
 
 		framenr = scene->r.cfra;
 
-		cache = sds->point_cache[0];
+		printf("time: %d\n", scene->r.cfra);
 
+		if(framenr == smd->time)
+			return;
+
+		cache = sds->point_cache[0];
 		BKE_ptcache_id_from_smoke(&pid, ob, smd);
 		BKE_ptcache_id_time(&pid, scene, framenr, &startframe, &endframe, &timescale);
 
 		cache_wt = sds->point_cache[1];
 		BKE_ptcache_id_from_smoke_turbulence(&pid_wt, ob, smd);
 
-		/* handle continuous simulation with the play button */
-		if(BKE_ptcache_get_continue_physics()) 
-		{
-			// TODO
-			return;
-		}
-
 		if(framenr < startframe)
-		{
-			cache->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache->simframe= 0;
-			cache->last_exact= 0;
-
-			cache_wt->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache_wt->simframe= 0;
-			cache_wt->last_exact= 0;
-
-			// we got back in time, reset smoke in this case (TODO: use cache later)
-			// smd->time = scene->r.cfra;
-			// smokeModifier_reset(smd);
-
-			return;
-		}
-		else if(framenr > endframe) 
-		{
-			framenr = endframe;
-
-			// we load last valid frame here 
-			// and don't update the smd->time variable later
-			badloading = 1;
-		}
-
-		if(!(cache->flag & PTCACHE_SIMULATION_VALID))
-		{
-			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
-		}
-		if(sds->wt && !(cache_wt->flag & PTCACHE_SIMULATION_VALID))
-		{
-			BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_OUTDATED);
-		}
-
-		if(smd->time == -1 && framenr!= startframe)
 			return;
 
-		if(!smokeModifier_init(smd, ob, scene, dm))
+		if(framenr > endframe)
 			return;
 
 		if(!smd->domain->fluid)
-				return;
+		{
+			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+			BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_OUTDATED);
+		}
+
+		if(!smokeModifier_init(smd, ob, scene, dm))
+		{
+			printf("bad smokeModifier_init\n");
+			return;
+		}
 
 		/* try to read from cache */
 		cache_result =  BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec);
-		// printf("cache_result: %d\n", cache_result);
+		printf("cache_result: %d\n", cache_result);
 
 		if(cache_result == PTCACHE_READ_EXACT) 
 		{
-			SmokeDomainSettings *sds = smd->domain;
-
 			cache->flag |= PTCACHE_SIMULATION_VALID;
 			cache->simframe= framenr;
-			sds->v3dnum = framenr;
 
-			if(!badloading)
-				smd->time = scene->r.cfra;
-
-			// check for wt cache
 			if(sds->wt)
 			{
 				cache_result_wt = BKE_ptcache_read_cache(&pid_wt, (float)framenr, scene->r.frs_sec);
-				// printf("cache_result_wt: %d\n", cache_result_wt);
-
-				// error handling
+				
 				if(cache_result_wt == PTCACHE_READ_EXACT) 
 				{
 					cache_wt->flag |= PTCACHE_SIMULATION_VALID;
 					cache_wt->simframe= framenr;
 				}
-				else if(cache_result_wt==PTCACHE_READ_OLD) 
-				{
-					BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_FREE);
-					cache_wt->flag |= PTCACHE_SIMULATION_VALID;
-				}
-				else if(ob->id.lib || (cache_wt->flag & PTCACHE_BAKED)) 
-				{
-					// if baked and nothing in cache, do nothing 
-					cache_wt->flag &= ~PTCACHE_SIMULATION_VALID;
-					cache_wt->simframe= 0;
-					cache_wt->last_exact= 0;
-				}
 			}
-
-			// printf("PTCACHE_READ_EXACT\n");
 			return;
 		}
-		else if(cache_result==PTCACHE_READ_OLD) 
-		{
-			BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_FREE);
-			cache->flag |= PTCACHE_SIMULATION_VALID;
 
-			BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_FREE);
-			cache_wt->flag |= PTCACHE_SIMULATION_VALID;
-		}
-		else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) 
-		{
-			// if baked and nothing in cache, do nothing 
-			cache->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache->simframe= 0;
-			cache->last_exact= 0;
+		tstart();
 
-			cache_wt->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache_wt->simframe= 0;
-			cache_wt->last_exact= 0;
+		smoke_calc_domain(scene, ob, smd);
 		
-			// printf("PTCACHE_BAKED\n");
-			return;
-		}
-		/*
-		else if((cache_result==0) && ((startframe!=framenr) && !(cache->flag & PTCACHE_SIMULATION_VALID || (framenr == smd->time))))
-		{
-			cache->flag &= ~PTCACHE_SIMULATION_VALID;
-			cache->simframe= 0;
-			cache->last_exact= 0;
-
-			return;
-		}*/
-
-		// printf("framenr: %d, time: %f\n", framenr, smd->time);
+		// set new time
+		smd->time = scene->r.cfra;
 
 		/* do simulation */
 
@@ -1256,60 +1176,26 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
 		cache->flag |= PTCACHE_SIMULATION_VALID;
 		cache->simframe= framenr;
 
-		if(sds->wt)
-		{
-			cache_wt->flag |= PTCACHE_SIMULATION_VALID;
-			cache_wt->simframe= framenr;
-		}
-				
-		tstart();	
-
-		if(sds->flags & MOD_SMOKE_DISSOLVE)			
-		{				
-			smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);								
-		}
-
-		smoke_calc_domain(scene, ob, smd);
-		
-		// set new time
-		smd->time = scene->r.cfra;
-
-		// frame 1 is start, don't simulate anything
-		if(smd->time == 1)
-		{
-			// set new time
-			smd->time = scene->r.cfra;
-
-			BKE_ptcache_write_cache(&pid, framenr);
-			if(sds->wt)
-				BKE_ptcache_write_cache(&pid_wt, framenr);
-
-			if(get_lamp(scene, light))
-				smoke_calc_transparency(sds->shadow, smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp, -7.0*sds->dx);
-
-			// printf("smd->time: %f\n", smd->time);
-			return;
-		}
-
 		// simulate the actual smoke (c++ code in intern/smoke)
-		smoke_step(sds->fluid, smd->time);
+		if(framenr!=startframe)
+			smoke_step(sds->fluid, smd->time);
 		BKE_ptcache_write_cache(&pid, framenr);
 
 		if(sds->wt)
 		{
+			if(framenr!=startframe)
+				smoke_turbulence_step(sds->wt, sds->fluid);
 
-			if(sds->flags & MOD_SMOKE_DISSOLVE)							
-				smoke_dissolve_wavelet(sds->wt, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG);
-
-			smoke_turbulence_step(sds->wt, sds->fluid);
+			cache_wt->flag |= PTCACHE_SIMULATION_VALID;
+			cache_wt->simframe= framenr;
 			BKE_ptcache_write_cache(&pid_wt, framenr);
 		}
 
 		if(get_lamp(scene, light))
 			smoke_calc_transparency(sds->shadow, smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light, calc_voxel_transp, -7.0*sds->dx);
-
+		
 		tend();
-		// printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
+		printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() );
 	}
 }
 

From a11ef8030aecfe80e4718b6000ea32d2bbc062a9 Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Mon, 14 Sep 2009 05:00:03 +0000
Subject: [PATCH 571/577] 2.5 mesh cleanup: merge tools all work again

---
 source/blender/editors/mesh/editmesh_tools.c | 60 +++++++++++++++++---
 source/blender/makesdna/DNA_modifier_types.h |  5 +-
 source/blender/windowmanager/intern/wm.c     |  6 +-
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 5a4397256de..9c8e8e11e86 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -98,8 +98,6 @@ static void waitcursor(int val) {}
 static int pupmenu() {return 0;}
 static int qtest() {return 0;}
 #define add_numbut(a, b, c, d, e, f, g) {}
-static int snap_sel_to_curs() {return 0;}
-static int snap_to_center() {return 0;}
 
 /* XXX */
 
@@ -5735,13 +5733,59 @@ int merge_firstlast(EditMesh *em, int first, int uvmerge)
 	return removedoublesflag(em, 1, 0, MERGELIMIT);
 }
 
-int merge_target(EditMesh *em, int target, int uvmerge)
+void em_snap_to_center(EditMesh *em)
+{
+	EditVert *eve;
+	float cent[3] = {0.0f, 0.0f, 0.0f};
+	int i=0;
+
+	for (eve=em->verts.first; eve; eve=eve->next) {
+		if (eve->f & SELECT) {
+			VecAddf(cent, cent, eve->co);
+			i++;
+		}
+	}
+
+	if (!i)
+		return;
+
+	VecMulf(cent, 1.0f / (float)i);
+
+	for (eve=em->verts.first; eve; eve=eve->next) {
+		if (eve->f & SELECT) {
+			VECCOPY(eve->co, cent);
+		}
+	}
+}
+
+void em_snap_to_cursor(EditMesh *em, bContext *C)
+{
+	Scene *scene = CTX_data_scene(C);
+	Object *ob= CTX_data_edit_object(C);
+	View3D *v3d = CTX_wm_view3d(C);
+	EditVert *eve;
+	float co[3], *vco, invmat[4][4];
+		
+	Mat4Invert(invmat, ob->obmat);
+
+	vco = give_cursor(scene, v3d);
+	VECCOPY(co, vco);
+	Mat4MulVecfl(invmat, co);
+
+	for (eve=em->verts.first; eve; eve=eve->next) {
+		if (eve->f & SELECT) {
+			VECCOPY(eve->co, co);
+		}
+	}
+}
+
+int merge_target(bContext *C, EditMesh *em, int target, int uvmerge)
 {
 	EditVert *eve;
 
 	// XXX not working
-	if(target) snap_sel_to_curs();
-	else snap_to_center();
+	if(target) em_snap_to_cursor(em, C);
+	else em_snap_to_center(em);
 
 	if(uvmerge && CustomData_has_layer(&em->fdata, CD_MTFACE)){
 		for(eve=em->verts.first; eve; eve=eve->next) eve->f1 = 0;
@@ -5763,10 +5807,10 @@ static int merge_exec(bContext *C, wmOperator *op)
 
 	switch(RNA_enum_get(op->ptr, "type")) {
 		case 3:
-			count = merge_target(em, 0, uvs);
+			count = merge_target(C, em, 0, uvs);
 			break;
 		case 4:
-			count = merge_target(em, 1, uvs);
+			count = merge_target(C, em, 1, uvs);
 			break;
 		case 1:
 			count = merge_firstlast(em, 0, uvs);
@@ -5774,7 +5818,7 @@ static int merge_exec(bContext *C, wmOperator *op)
 		case 6:
 			count = merge_firstlast(em, 1, uvs);
 			break;
-		case 2:
+		case 5:
 			count = collapseEdges(em);
 			break;
 	}
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index be7452c4ae1..d58488ce82d 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -469,8 +469,9 @@ typedef struct BooleanModifierData {
 	int operation, pad;
 } BooleanModifierData;
 
-#define MOD_MDEF_INVERT_VGROUP (1<<0)
-#define MOD_MDEF_DYNAMIC_BIND  (1<<1)
+#define MOD_MDEF_INVERT_VGROUP	(1<<0)
+#define MOD_MDEF_DYNAMIC_BIND	(1<<1)
+#define MOD_MDEF_USE_FINAL		(1<<2)
 
 typedef struct MDefInfluence {
 	int vertex;
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 38cf39c2081..651394d51af 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -75,9 +75,11 @@ void WM_operator_free(wmOperator *op)
 	}
 
 	if(op->macro.first) {
-		wmOperator *opm;
-		for(opm= op->macro.first; opm; opm= opm->next) 
+		wmOperator *opm, *opmnext;
+		for(opm= op->macro.first; opm; opm= opmnext) {
+			opmnext = opm->next;
 			WM_operator_free(opm);
+		}
 	}
 	
 	MEM_freeN(op);

From 894c1e98ad398d3970ea928c0a9db8f34e5dbef4 Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Mon, 14 Sep 2009 06:06:01 +0000
Subject: [PATCH 572/577] remove doubles uses an operator property for the
 merge distance.  it no longer reports number of merged verts to the user, as
 this violates operator nonmodality and messes up last operator panel
 workflow.

---
 source/blender/editors/mesh/editmesh_tools.c |  7 +++++--
 source/blender/editors/mesh/mesh_ops.c       | 10 +++++++++-
 source/blender/makesdna/DNA_modifier_types.h |  1 -
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 9c8e8e11e86..7698faf3178 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -486,13 +486,14 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	char msg[100];
 
-	int cnt = removedoublesflag(em,1,0,ts->doublimit);
+	int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
 
+	/*XXX this messes up last operator panel
 	if(cnt)
 	{
 		sprintf(msg, "Removed %d vertices", cnt);
 		BKE_report(op->reports, RPT_INFO, msg);
-	}
+	}*/
 
 	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -514,6 +515,8 @@ void MESH_OT_remove_doubles(wmOperatorType *ot)
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_float(ot->srna, "limit", 0.00001f, 0.000001f, 50.0f, "Merge Threshold", "Minimum distance between merged verts", 0.00001f, 10.0f);
 }
 
 // XXX is this needed?
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 3cdf1d47817..5be39a3e4f1 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -335,6 +335,12 @@ void ED_operatortypes_mesh(void)
 	WM_operatortype_macro_define(ot, "MESH_OT_extrude");
 	WM_operatortype_macro_define(ot, "TFM_OT_translate");
 
+	/*combining operators with invoke and exec portions doesn't work yet.
+	
+	ot= WM_operatortype_append_macro("MESH_OT_loopcut", "Loopcut", OPTYPE_UNDO|OPTYPE_REGISTER);
+	WM_operatortype_macro_define(ot, "MESH_OT_edgering_select");
+	WM_operatortype_macro_define(ot, "MESH_OT_subdivide");
+	*/
 }
 
 /* note mesh keymap also for other space? */
@@ -343,6 +349,8 @@ void ED_keymap_mesh(wmWindowManager *wm)
 	ListBase *keymap= WM_keymap_listbase(wm, "EditMesh", 0, 0);
 	wmKeymapItem *kmi;
 	
+	//WM_keymap_add_item(keymap, "MESH_OT_loopcut", RKEY, KM_PRESS, KM_CTRL, 0);
+
 	/* selecting */
 	/* standard mouse selection goes via space_view3d */
 	WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0);
@@ -354,7 +362,7 @@ void ED_keymap_mesh(wmWindowManager *wm)
 	RNA_boolean_set(kmi->ptr, "extend", 1);
 
 	WM_keymap_add_item(keymap, "MESH_OT_select_shortest_path", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
-	
+
 	WM_keymap_add_item(keymap, "MESH_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d58488ce82d..54433fd4254 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -471,7 +471,6 @@ typedef struct BooleanModifierData {
 
 #define MOD_MDEF_INVERT_VGROUP	(1<<0)
 #define MOD_MDEF_DYNAMIC_BIND	(1<<1)
-#define MOD_MDEF_USE_FINAL		(1<<2)
 
 typedef struct MDefInfluence {
 	int vertex;

From 84e17862cd02b0ad018a0269bcfce623a9eae417 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Mon, 14 Sep 2009 06:31:20 +0000
Subject: [PATCH 573/577] * boundbox display option was missing from object
 properties

---
 release/ui/buttons_object.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/release/ui/buttons_object.py b/release/ui/buttons_object.py
index af2c7cfb58a..9e043cfeaf3 100644
--- a/release/ui/buttons_object.py
+++ b/release/ui/buttons_object.py
@@ -92,10 +92,14 @@ class OBJECT_PT_display(ObjectButtonsPanel):
 		layout = self.layout
 		
 		ob = context.object
-			
-		row = layout.row()
-		row.itemR(ob, "max_draw_type", text="Type")
-		row.itemR(ob, "draw_bounds_type", text="Bounds")
+		
+		split = layout.split()
+		col = split.column()
+		col.itemR(ob, "max_draw_type", text="Type")
+		col = split.column()
+		row = col.row()
+		row.itemR(ob, "draw_bounds", text="Bounds")
+		row.itemR(ob, "draw_bounds_type", text="")
 
 		flow = layout.column_flow()
 		flow.itemR(ob, "draw_name", text="Name")

From 1b446d2902e8101d45fd6ec2c201a010930f8ad2 Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Mon, 14 Sep 2009 06:59:37 +0000
Subject: [PATCH 574/577] to sphere transform hotkey is now alt-shift-s, since
 ctrl-shift-s was taken by save as.

---
 source/blender/editors/transform/transform_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 4ae0bca3284..8d7e8f20ad5 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -641,7 +641,7 @@ void transform_keymap_for_space(struct wmWindowManager *wm, struct ListBase *key
 
 			km = WM_keymap_add_item(keymap, "TFM_OT_warp", WKEY, KM_PRESS, KM_SHIFT, 0);
 
-			km = WM_keymap_add_item(keymap, "TFM_OT_tosphere", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+			km = WM_keymap_add_item(keymap, "TFM_OT_tosphere", SKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0);
 
 			km = WM_keymap_add_item(keymap, "TFM_OT_shear", SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0);
 

From 48732cf01738e733db7457aa20e8b4a2cfa3feb0 Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Mon, 14 Sep 2009 07:33:00 +0000
Subject: [PATCH 575/577] knife 'mode' is now leftclick with ctrl-x held down,
 instead of ctrl-alt

---
 source/blender/editors/mesh/mesh_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 5be39a3e4f1..606614cd1f1 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -431,7 +431,7 @@ void ED_keymap_mesh(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "MESH_OT_fgon_make", FKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
 	
-	WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, XKEY);
 
 	/* menus */
 	WM_keymap_add_item(keymap, "MESH_OT_vertex_specials", VKEY, KM_PRESS, KM_CTRL, 0);

From cbb9815b0df6b7f8e57cedcc5d133ade66275074 Mon Sep 17 00:00:00 2001
From: Joseph Eagar <joeedh@gmail.com>
Date: Mon, 14 Sep 2009 08:38:04 +0000
Subject: [PATCH 576/577] updated .b.blend; show toolbar by default now, made
 the view3d clip start saner, and turend on grab manipulator

---
 source/blender/editors/datafiles/B.blend.c | 5665 ++++++++++----------
 1 file changed, 2927 insertions(+), 2738 deletions(-)

diff --git a/source/blender/editors/datafiles/B.blend.c b/source/blender/editors/datafiles/B.blend.c
index 980a9ee1697..b469f0c24cb 100644
--- a/source/blender/editors/datafiles/B.blend.c
+++ b/source/blender/editors/datafiles/B.blend.c
@@ -1,177 +1,603 @@
 /* DataToC output of file <B_blend> */
 
-int datatoc_B_blend_size= 94308;
+int datatoc_B_blend_size= 100360;
 char datatoc_B_blend[]= {
- 66, 76, 69, 78,
- 68, 69, 82, 45,118, 50, 53, 48, 82, 69, 78, 68, 32,  0,  0,  0, 80,187,118,198,255,127,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 71, 76, 79, 66, 40,  0,  0,  0, 64,187,118,198,255,127,  0,  0,185,  0,  0,  0,  1,  0,  0,  0, 32, 32, 32, 48,  0,  0,  0,  0,
-250,  0,  0,  0,  1,  0,  0,  1,208,233, 90,  2,  0,  0,  0,  0, 96,130, 91,  2,  0,  0,  0,  0,  0, 16,  0,  0,128, 32,  4,  0,
- 87, 77,  0,  0,224,  0,  0,  0,144,231, 90,  2,  0,  0,  0,  0, 75,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77, 87,105,110, 77, 97,110,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-176,232, 90,  2,  0,  0,  0,  0,176,232, 90,  2,  0,  0,  0,  0,176,232, 90,  2,  0,  0,  0,  0,176,232, 90,  2,  0,  0,  0,  0,
-  3,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,144,131,100,  2,  0,  0,  0,  0,176,167,177,  2,  0,  0,  0,  0, 68, 65, 84, 65,224,  0,  0,  0,
-176,232, 90,  2,  0,  0,  0,  0, 76,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-224,186, 91,  2,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,208,233, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-115, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  5,  0, 30,  0,118,  7, 97,  4,  0,  0,  0,  0,  1,  0,238,  3,  0,  0,  1,  0,  0,  0,  0,  0,  0,131,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 14,119,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,224,180,  2,  0,  0,  0,  0,224,224,180,  2,  0,  0,  0,  0,
- 64,132,100,  2,  0,  0,  0,  0,176,133,100,  2,  0,  0,  0,  0,112,134,100,  2,  0,  0,  0,  0,144,191,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,208,  0,  0,  0,208,233, 90,  2,  0,  0,  0,  0,
-179,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 83, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,234, 90,  2,  0,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
- 32,240, 90,  2,  0,  0,  0,  0,144,247, 90,  2,  0,  0,  0,  0,  0,248, 90,  2,  0,  0,  0,  0,160,111, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,130, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 80,149,150,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
-224,234, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0, 64,235, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 64,235, 90,  2,  0,  0,  0,  0,
-180,  0,  0,  0,  1,  0,  0,  0,160,235, 90,  2,  0,  0,  0,  0,224,234, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 97,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,160,235, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,
-  0,236, 90,  2,  0,  0,  0,  0, 64,235, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  7, 97,  4,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0,  0,236, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0,
-160,235, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  7,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
- 96,236, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,  0,236, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 70,  4,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,
-180,  0,  0,  0,  1,  0,  0,  0, 32,237, 90,  2,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-118,  7, 70,  4,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 32,237, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,
-128,237, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0,128,237, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0,
- 32,237, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  7, 80,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
-224,237, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,128,237, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 12,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,
-180,  0,  0,  0,  1,  0,  0,  0,160,238, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 12,  6, 70,  4,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,160,238, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,
-  0,239, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0, 96,239, 90,  2,  0,  0,  0,  0,
-160,238, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  6,100,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
- 96,239, 90,  2,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 12,  6, 80,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
-180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,239, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-118,  7, 80,  3,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 32,240, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-144,240, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,235, 90,  2,  0,  0,  0,  0,160,235, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,144,240, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-  0,241, 90,  2,  0,  0,  0,  0, 32,240, 90,  2,  0,  0,  0,  0, 64,235, 90,  2,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  0,241, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-112,241, 90,  2,  0,  0,  0,  0,144,240, 90,  2,  0,  0,  0,  0,160,235, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,112,241, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-224,241, 90,  2,  0,  0,  0,  0,  0,241, 90,  2,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,224,241, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
- 80,242, 90,  2,  0,  0,  0,  0,112,241, 90,  2,  0,  0,  0,  0,224,234, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 80,242, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-192,242, 90,  2,  0,  0,  0,  0,224,241, 90,  2,  0,  0,  0,  0,  0,236, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,192,242, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
- 48,243, 90,  2,  0,  0,  0,  0, 80,242, 90,  2,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 48,243, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-160,243, 90,  2,  0,  0,  0,  0,192,242, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,160,243, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
- 16,244, 90,  2,  0,  0,  0,  0, 48,243, 90,  2,  0,  0,  0,  0,224,234, 90,  2,  0,  0,  0,  0,160,238, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 16,244, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-128,244, 90,  2,  0,  0,  0,  0,160,243, 90,  2,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0,160,238, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,128,244, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-240,244, 90,  2,  0,  0,  0,  0, 16,244, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,240,244, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
- 96,245, 90,  2,  0,  0,  0,  0,128,244, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 96,245, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-208,245, 90,  2,  0,  0,  0,  0,240,244, 90,  2,  0,  0,  0,  0,160,238, 90,  2,  0,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,208,245, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
- 64,246, 90,  2,  0,  0,  0,  0, 96,245, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0, 96,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 64,246, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-176,246, 90,  2,  0,  0,  0,  0,208,245, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0, 96,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,176,246, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
- 32,247, 90,  2,  0,  0,  0,  0, 64,246, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 32,247, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-144,247, 90,  2,  0,  0,  0,  0,176,246, 90,  2,  0,  0,  0,  0,  0,236, 90,  2,  0,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,144,247, 90,  2,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 32,247, 90,  2,  0,  0,  0,  0, 96,239, 90,  2,  0,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,  0,248, 90,  2,  0,  0,  0,  0,183,  0,  0,  0,  1,  0,  0,  0,
-192,251, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0, 64,235, 90,  2,  0,  0,  0,  0,
-160,235, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  7,  0,  0,
- 71,  4,  0,  0, 97,  4,  0,  0,  7,  7,119,  7, 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,112,153, 76,  2,  0,  0,  0,  0,
-208,129, 91,  2,  0,  0,  0,  0,208,129, 91,  2,  0,  0,  0,  0,224,248, 90,  2,  0,  0,  0,  0, 80,250, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224, 78,100,  2,  0,  0,  0,  0, 64,153,118,  2,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0,224,248, 90,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0, 80,250, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,106, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,238, 68,
+ 66, 76, 69, 78, 68, 69, 82, 95,
+118, 50, 53, 48, 82, 69, 78, 68, 32,  0,  0,  0,208,245, 18,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0,
+ 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 76, 79, 66, 32,  0,  0,  0,
+200,245, 18,  0,192,  0,  0,  0,  1,  0,  0,  0, 32, 32, 32, 51,  3,  0,  0,  0,250,  0,  0,  0,  1,  0,  0,  1, 72, 22, 11,  7,
+160, 33, 10,  7,  0, 16,  0,  0,128, 32,  4,  0, 87, 77,  0,  0,140,  0,  0,  0,192, 75, 10,  7, 86,  1,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77, 87,105,110, 77, 97,110,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,254, 14,  7,160,147,103,  2,160,254, 14,  7,
+160,254, 14,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,224,183,102,  2,216, 85,  5,  7, 68, 65, 84, 65,148,  0,  0,  0,160,254, 14,  7, 87,  1,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0, 44, 99,  2,  1,  0,  0,  0,  0,  0,  0,  0, 72, 22, 11,  7,  0,  0,  0,  0,115, 99,114,101,
+101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  0, 34,  0,
+186,  4,254,  2,  0,  0,  0,  0,  1,  0,238,  3,  0,  0,  1,  0,  0,  0,  0,  0,232, 44, 99,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,144, 76, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,208,229, 25,  7,176,202, 25,  7,152, 43, 99,  2,
+184,231,  9,  7,200, 45,  5,  7, 56, 90,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,140,  0,  0,  0, 72, 22, 11,  7,
+186,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 83, 99,114,101,101,110,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208, 79, 10,  7,
+176,183,  3,  7,232,192,  3,  7, 96,201,  2,  7,120,255, 14,  7, 72,136,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,160, 33, 10,  7,
+  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 16,111, 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,208, 79, 10,  7,
+187,  0,  0,  0,  1,  0,  0,  0,120, 63, 11,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 20,  0,  0,  0,120, 63, 11,  7,187,  0,  0,  0,  1,  0,  0,  0,  8, 11, 11,  7,208, 79, 10,  7,  0,  0,  0,  0,  0,  0,254,  2,
+  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,  8, 11, 11,  7,187,  0,  0,  0,  1,  0,  0,  0,200, 32,  4,  7,120, 63, 11,  7,
+  0,  0,  0,  0,186,  4,254,  2,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,200, 32,  4,  7,187,  0,  0,  0,  1,  0,  0,  0,
+232,251,  3,  7,  8, 11, 11,  7,  0,  0,  0,  0,186,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,232,251,  3,  7,
+187,  0,  0,  0,  1,  0,  0,  0, 48, 16,  4,  7,200, 32,  4,  7,  0,  0,  0,  0,  0,  0,227,  2,  1,  0,  0,  0, 68, 65, 84, 65,
+ 20,  0,  0,  0, 48, 16,  4,  7,187,  0,  0,  0,  1,  0,  0,  0,216, 43,  4,  7,232,251,  3,  7,  0,  0,  0,  0,186,  4,227,  2,
+  1,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,216, 43,  4,  7,187,  0,  0,  0,  1,  0,  0,  0,160, 34,  4,  7, 48, 16,  4,  7,
+  0,  0,  0,  0,  0,  0, 60,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,160, 34,  4,  7,187,  0,  0,  0,  1,  0,  0,  0,
+ 88,147,  4,  7,216, 43,  4,  7,  0,  0,  0,  0,186,  4, 60,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0, 88,147,  4,  7,
+187,  0,  0,  0,  1,  0,  0,  0,136,121,  4,  7,160, 34,  4,  7,  0,  0,  0,  0,216,  3,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 20,  0,  0,  0,136,121,  4,  7,187,  0,  0,  0,  1,  0,  0,  0,104, 25,  4,  7, 88,147,  4,  7,  0,  0,  0,  0,216,  3,227,  2,
+  1,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,104, 25,  4,  7,187,  0,  0,  0,  1,  0,  0,  0, 64,160,  4,  7,136,121,  4,  7,
+  0,  0,  0,  0,  0,  0, 72,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0, 64,160,  4,  7,187,  0,  0,  0,  1,  0,  0,  0,
+ 32, 26, 15,  7,104, 25,  4,  7,  0,  0,  0,  0,216,  3, 72,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0, 32, 26, 15,  7,
+187,  0,  0,  0,  1,  0,  0,  0,176,183,  3,  7, 64,160,  4,  7,  0,  0,  0,  0,216,  3, 72,  2,  0,  0,  0,  0, 68, 65, 84, 65,
+ 20,  0,  0,  0,176,183,  3,  7,187,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 32, 26, 15,  7,  0,  0,  0,  0,186,  4, 72,  2,
+  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,232,192,  3,  7,188,  0,  0,  0,  1,  0,  0,  0, 24,226,  3,  7,  0,  0,  0,  0,
+  8, 11, 11,  7,120, 63, 11,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0, 24,226,  3,  7,188,  0,  0,  0,
+  1,  0,  0,  0, 88, 14,  4,  7,232,192,  3,  7,232,251,  3,  7,120, 63, 11,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 24,  0,  0,  0, 88, 14,  4,  7,188,  0,  0,  0,  1,  0,  0,  0,  0,180,  3,  7, 24,226,  3,  7, 48, 16,  4,  7,  8, 11, 11,  7,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,  0,180,  3,  7,188,  0,  0,  0,  1,  0,  0,  0,104,163,  3,  7,
+ 88, 14,  4,  7,232,251,  3,  7, 48, 16,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,104,163,  3,  7,
+188,  0,  0,  0,  1,  0,  0,  0,248,203,  3,  7,  0,180,  3,  7, 88,147,  4,  7,208, 79, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 24,  0,  0,  0,248,203,  3,  7,188,  0,  0,  0,  1,  0,  0,  0, 16,191,  3,  7,104,163,  3,  7,200, 32,  4,  7,
+ 88,147,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0, 16,191,  3,  7,188,  0,  0,  0,  1,  0,  0,  0,
+144, 23,  4,  7,248,203,  3,  7,232,251,  3,  7,136,121,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,
+144, 23,  4,  7,188,  0,  0,  0,  1,  0,  0,  0,  0,118,  4,  7, 16,191,  3,  7, 48, 16,  4,  7,136,121,  4,  7,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,  0,118,  4,  7,188,  0,  0,  0,  1,  0,  0,  0,144,109,  4,  7,144, 23,  4,  7,
+104, 25,  4,  7,208, 79, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,144,109,  4,  7,188,  0,  0,  0,
+  1,  0,  0,  0, 40,178,  3,  7,  0,118,  4,  7,232,251,  3,  7,104, 25,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 24,  0,  0,  0, 40,178,  3,  7,188,  0,  0,  0,  1,  0,  0,  0,200,170,  3,  7,144,109,  4,  7,136,121,  4,  7, 64,160,  4,  7,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,200,170,  3,  7,188,  0,  0,  0,  1,  0,  0,  0,176,242,  3,  7,
+ 40,178,  3,  7, 88,147,  4,  7, 64,160,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,176,242,  3,  7,
+188,  0,  0,  0,  1,  0,  0,  0, 56,248,  3,  7,200,170,  3,  7,104, 25,  4,  7, 64,160,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 24,  0,  0,  0, 56,248,  3,  7,188,  0,  0,  0,  1,  0,  0,  0, 80, 38,  4,  7,176,242,  3,  7, 88,147,  4,  7,
+ 32, 26, 15,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0, 80, 38,  4,  7,188,  0,  0,  0,  1,  0,  0,  0,
+232,133,  3,  7, 56,248,  3,  7,136,121,  4,  7, 32, 26, 15,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,
+232,133,  3,  7,188,  0,  0,  0,  1,  0,  0,  0,160,210,  2,  7, 80, 38,  4,  7,176,183,  3,  7, 48, 16,  4,  7,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,160,210,  2,  7,188,  0,  0,  0,  1,  0,  0,  0, 96,201,  2,  7,232,133,  3,  7,
+176,183,  3,  7,200, 32,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0, 96,201,  2,  7,188,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,160,210,  2,  7,176,183,  3,  7, 32, 26, 15,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 96,  0,  0,  0,120,255, 14,  7,190,  0,  0,  0,  1,  0,  0,  0, 24, 23, 11,  7,  0,  0,  0,  0,232,251,  3,  7,120, 63, 11,  7,
+  8, 11, 11,  7, 48, 16,  4,  7,  0,  0,  0,  0,  0,  0,  0,  0,186,  4,  0,  0,228,  2,  0,  0,254,  2,  0,  0,  7,  7,187,  4,
+ 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0, 56,150, 92,  2,152,180,102,  2,152,180,102,  2, 32,173, 11,  7,112,158, 24,  7,
+  0,  0,  0,  0,  0,  0,  0,  0, 40, 47,  5,  7,  8, 48,  5,  7, 68, 65, 84, 65,248,  0,  0,  0, 32,173, 11,  7,191,  0,  0,  0,
+  1,  0,  0,  0,112,158, 24,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,157, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
+  0, 96,151, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,186,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,
+  0,  0,200, 65,  0,128,237, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4,
+ 10,  0,187,  4, 26,  0,187,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,186,  4,  0,  0,228,  2,  0,  0,253,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+187,  4, 26,  0,  2,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,151, 92,  2,184,191, 25,  7,
+184,191, 25,  7,  0,  0,  0,  0,  0,  0,  0,  0,216, 49,  5,  7, 96, 50,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+248,  0,  0,  0,112,158, 24,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 32,173, 11,  7,  0,  0,  0,  0,  0, 32,240, 68,
+  0,  0,  0,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0,
+ 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,
+ 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  4,  6,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,254,  2,  0,  0,254,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,224,150, 92,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  0,  0,  0, 24, 23, 11,  7,190,  0,  0,  0,  1,  0,  0,  0,200, 33, 11,  7,
+120,255, 14,  7, 88,147,  4,  7, 32, 26, 15,  7,176,183,  3,  7,200, 32,  4,  7,  0,  0,  0,  0,217,  3,  0,  0,186,  4,  0,  0,
+  0,  0,  0,  0, 71,  2,  0,  0,  4,  4,226,  0, 72,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,147, 92,  2,192,160,  9,  7,
+120,148, 10,  7,128,237, 11,  7,184,238, 11,  7,  0,  0,  0,  0,  0,  0,  0,  0,232, 50,  5,  7,200, 51,  5,  7, 68, 65, 84, 65,
+248,  0,  0,  0,128,237, 11,  7,191,  0,  0,  0,  1,  0,  0,  0,184,238, 11,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,193, 67,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0, 98, 67,  0,  0,  0,  0,  0,  0,248, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,225,  0,  0,  0,
+  0,  0,  0,  0, 30,  0,  0,  0,  0,128,137, 67,  0,  0,200, 65,  0,128,137, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,226,  0, 31,  0,226,  0, 31,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,217,  3,  0,  0,186,  4,  0,  0,  0,  0,  0,  0, 30,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,226,  0, 31,  0,  3,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,152,149, 92,  2,160,145,246,  6,160,145,246,  6,  0,  0,  0,  0,  0,  0,  0,  0,152, 53,  5,  7,168, 54,  5,  7,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,184,238, 11,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+128,237, 11,  7,  0,  0,  0,  0,  0,  0, 80, 67,  0,  0, 68,196,  0,  0,  0,  0,  0,  0,  0,  0,254,255, 80, 67,255,191,  5,196,
+  0,  0,  0,  0,209,  0,  0,  0,226,  0,  0,  0, 18,  0,  0,  0, 40,  2,  0,  0,  0,  0,  0,  0,208,  0,  0,  0,  0,  0,  0,  0,
+ 17,  0,  0,  0,  0,  0,  0,  0,208,  0,  0,  0, 18,  0,  0,  0, 40,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,226,  0, 41,  2,209,  0,
+ 23,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176, 63,100,  2,  1,  0,  0,  0,  0,  0,  0,  0,217,  3,  0,  0,186,  4,  0,  0,
+ 31,  0,  0,  0, 71,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,226,  0, 41,  2,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,148, 92,  2, 88, 22,  6,  7, 16,102,  5,  7,248, 24, 11,  7,
+ 72,159,  9,  7,144, 56,  5,  7, 40, 58,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,248, 24, 11,  7,
+189,  0,  0,  0,  1,  0,  0,  0,112, 26, 11,  7,  0,  0,  0,  0,200,148, 92,  2,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95,
+ 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95,
+ 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,101,120,116,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,208,  0, 36,  0,
+  0,  0,  0,  0,  0,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0,112, 26, 11,  7,189,  0,  0,  0,  1,  0,  0,  0,232, 27, 11,  7,248, 24, 11,  7,232,164,  2,  7,
+  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,135,255,208,  0, 61,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,232, 27, 11,  7,189,  0,  0,  0,  1,  0,  0,  0,
+ 96, 29, 11,  7,112, 26, 11,  7,192,166,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,108, 97,121,101,114,115,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,108, 97,121,101,114,115,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,208,  0,  0,  0,  0,  0,  0,  0,  4,  0,  2,  0,
+  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+ 96, 29, 11,  7,189,  0,  0,  0,  1,  0,  0,  0,216, 30, 11,  7,232, 27, 11,  7,152,168,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78,
+ 69, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
+ 69, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,
+110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,165,254,
+208,  0,178,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,216, 30, 11,  7,189,  0,  0,  0,  1,  0,  0,  0, 80, 32, 11,  7, 96, 29, 11,  7,
+112,170,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105, 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,254,208,  0, 58,  0, 20,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 80, 32, 11,  7,189,  0,  0,  0,
+  1,  0,  0,  0,104,153,  9,  7,216, 30, 11,  7, 72,172,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,115,104, 97,
+100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,115,104, 97,
+100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,213,253,208,  0,102,  0,  0,  0,  0,  0,
+  0,  0,  2,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 56,  1,  0,  0,104,153,  9,  7,189,  0,  0,  0,  1,  0,  0,  0,224,154,  9,  7, 80, 32, 11,  7, 32,174,  2,  7,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 84,253,208,  0,105,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,224,154,  9,  7,189,  0,  0,  0,  1,  0,  0,  0, 88,156,  9,  7,
+104,153,  9,  7,208,177,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 60,253,208,  0,  0,  0,  0,  0,  0,  0,  4,  0,  2,  0,  0,  0,  0,  0,
+  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 88,156,  9,  7,
+189,  0,  0,  0,  1,  0,  0,  0,208,157,  9,  7,224,154,  9,  7,168,179,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84,
+ 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84,
+ 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116, 32, 80,114,111,
+ 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 36,253,208,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  2,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0,208,157,  9,  7,189,  0,  0,  0,  1,  0,  0,  0, 72,159,  9,  7, 88,156,  9,  7,128,181,  2,  7,
+  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 12,253,208,  0,  0,  0, 20,  0,  0,  0,  4,  0,  2,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 72,159,  9,  7,189,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,208,157,  9,  7, 88,183,  2,  7,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,117,110,105,116,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,117,110,105,116,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85,110,105,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,244,252,208,  0,  0,  0,  0,  0,  0,  0,  4,  0,  3,  0,
+  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,224,  0,  0,  0,
+192,160,  9,  7,158,  0,  0,  0,  1,  0,  0,  0,120,148, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0, 80,175, 11,  7,
+255, 20,  0,  0,160,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,224,161,  9,  7,191,  0,  0,  0,  1,  0,  0,  0,
+ 40,144, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,138, 67,
   0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,
-  0,128,237, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,119,  7,
- 26,  0,119,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,118,  7,  0,  0, 71,  4,  0,  0, 96,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-119,  7, 26,  0,  2,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,155, 76,  2,  0,  0,  0,  0,
- 96,164,100,  2,  0,  0,  0,  0, 96,164,100,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-208,138,100,  2,  0,  0,  0,  0, 64,140,100,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0, 80,250, 90,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-224,248, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,240, 68,  0,  0,  0,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110, 69,
-  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,
-  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  4,  6,  0,129,  7,
-  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 97,  4,  0,  0, 97,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 96,154, 76,  2,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,
+  0,128,237, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 20,  1,
+ 26,  0, 20,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,
+108,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 26,  0,
+  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,
+ 40,144, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,224,161,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,160,  0,  0,  0,192,251, 90,  2,  0,  0,  0,  0,183,  0,  0,  0,  1,  0,  0,  0,176, 81, 91,  2,  0,  0,  0,  0,
-  0,248, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0, 96,239, 90,  2,  0,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
-  0,236, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,  6,  0,  0,118,  7,  0,  0,  0,  0,  0,  0, 79,  3,  0,  0,
-  4,  4,106,  1, 80,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,149, 76,  2,  0,  0,  0,  0,240, 72, 91,  2,  0,  0,  0,  0,
- 80, 80, 91,  2,  0,  0,  0,  0,160,252, 90,  2,  0,  0,  0,  0, 16,254, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,160,158,118,  2,  0,  0,  0,  0, 96,169,118,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
-160,252, 90,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0, 16,254, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,193, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,181, 67,  0,  0,  0,  0,  0,  0,248, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,105,  1,  0,  0,  0,  0,  0,  0, 30,  0,  0,  0,  0,128,137, 67,  0,  0,200, 65,  0,128,137, 67,  0,  0,200, 65,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,106,  1, 31,  0,106,  1, 31,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,  6,  0,  0,118,  7,  0,  0,
-  0,  0,  0,  0, 30,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  1, 31,  0,  3,  0,  1,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,152, 76,  2,  0,  0,  0,  0,112,176,178,  2,  0,  0,  0,  0,
-112,176,178,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,143,100,  2,  0,  0,  0,  0,
- 32,146,100,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
- 16,254, 90,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,252, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,128,172, 67,  0,192, 71,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,172, 67,  0,192, 71,196,  0,  0,  0,  0,
- 89,  1,  0,  0,106,  1,  0,  0, 18,  0,  0,  0, 48,  3,  0,  0,  0,  0,  0,  0, 88,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
-  0,  0,  0,  0, 88,  1,  0,  0, 18,  0,  0,  0, 48,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,106,  1, 49,  3, 89,  1, 31,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,160, 90,119,  2,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 13,  6,  0,  0,118,  7,  0,  0,
- 31,  0,  0,  0, 79,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  1, 49,  3,  4,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,144,150, 76,  2,  0,  0,  0,  0,176,210,178,  2,  0,  0,  0,  0,
- 96, 53,180,  2,  0,  0,  0,  0,128,255, 90,  2,  0,  0,  0,  0, 96, 55,180,  2,  0,  0,  0,  0, 80,148,100,  2,  0,  0,  0,  0,
-240,151,100,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  0,  1,  0,  0,
-240, 72, 91,  2,  0,  0,  0,  0,152,  0,  0,  0,  1,  0,  0,  0, 80, 80, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0, 26,  0,  0,  0, 80,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 55,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 96,145, 10,  7, 68, 65, 84, 65,216,  2,  0,  0, 96,145, 10,  7,152,  0,  0,  0,  1,  0,  0,  0,103,212,136, 64,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 80,  1,128,191,  0,  0,128,191,  0,  0,  0,128,  0,  0,  0,128,226,215,163,188,  0,  0,  0,128,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,128, 63,103,212,136, 64,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 80,  1,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,184,175, 31, 65,  0,  0, 32, 65,237,122,111, 62,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,161, 14,106, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+209,252,249,195,115,253, 71,194,  0,  0,  0,  0,  0,  0,  0,  0, 98,127,249, 67,129,255, 71, 66,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,128, 63,103,212,136, 64,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 80,  1,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,184,175, 31, 65,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100, 32,222, 58,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,120,148, 10,  7,153,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,192,160,  9,  7,224,161,  9,  7, 40,144, 10,  7,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,
+  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 56,192,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0, 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 16,  0,  0,  0,  7,  0, 10,  0,159,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  0,  0,  0,200, 33, 11,  7,
+190,  0,  0,  0,  1,  0,  0,  0, 48,124,  9,  7, 24, 23, 11,  7,208, 79, 10,  7,104, 25,  4,  7, 64,160,  4,  7, 88,147,  4,  7,
+  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0,  0,  0,  0,  0, 71,  0,  0,  0, 15, 15,216,  3, 72,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,123, 92,  2, 24,152, 10,  7,  0,123,  9,  7,168,149, 10,  7,224,150, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+176, 58,  5,  7,144, 59,  5,  7, 68, 65, 84, 65,248,  0,  0,  0,168,149, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,224,150, 10,  7,
+  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,128, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0, 56,  0,  0,118, 68,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,224,202, 68,  0,  0,200, 65,  0,224,202, 68,
+  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,216,  3, 26,  0,216,  3,
+ 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  3, 26,  0,  5,  0,  1,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,124, 92,  2,248, 23,  6,  7,248, 23,  6,  7,  0,  0,  0,  0,
+  0,  0,  0,  0, 96, 61,  5,  7,112, 62,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,224,150, 10,  7,
+191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,168,149, 10,  7,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,  0,  0, 72, 66,
+112,189, 17,192,246, 70,125, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,215,  3,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0, 18,  0,  0,  0, 45,  0,  0,  0,
+  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,  0,  0,  0,  2,
+  4,  0,  0,  4,  8,  0,216,  3, 46,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0, 26,  0,  0,  0, 71,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,216,  3, 46,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,123, 92,  2,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 64,  5,  7,120, 66,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,180,  0,  0,  0, 24,152, 10,  7,168,  0,  0,  0,  1,  0,  0,  0,  0,123,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  6,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 16,153, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,176,118,  9,  7,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,203, 68,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,  0,128,237, 68,
+  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 88,  6, 26,  0, 88,  6,
+ 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,  6,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,  6, 26,  0,  0,  0,  1,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,176,118,  9,  7,
+191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 16,153, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,  6,  0,  0, 26,  0,  0,  0, 55,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 88,  6, 30,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,119,  9,  7,
+ 68, 65, 84, 65,216,  2,  0,  0,232,119,  9,  7,152,  0,  0,  0,  1,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,213,108, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,
+  0,  0,128,191,  0,  0,  0,128,  0,  0,  0,128,226,215,163,188,  0,  0,  0,128,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,128, 63,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,213,108, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,
+  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,184,175, 31, 65,  0,  0, 32, 65,161, 14,106, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,224, 91,138, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,252,249,195,
+115,253, 71,194,  0,  0,  0,  0,  0,  0,  0,  0, 98,127,249, 67,129,255, 71, 66,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,128, 63,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,213,108, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,
+  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,184,175, 31, 65,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 52,149,147, 58,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,  0,123,  9,  7,153,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0, 24,152, 10,  7, 16,153, 10,  7,176,118,  9,  7,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  7,  0, 56,192,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
+  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+ 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 16,  0,  0,  0,  7,  0, 10,  0,159,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  0,  0,  0, 48,124,  9,  7,190,  0,  0,  0,
+  1,  0,  0,  0, 72,136,  9,  7,200, 33, 11,  7,104, 25,  4,  7,232,251,  3,  7,136,121,  4,  7, 64,160,  4,  7,  0,  0,  0,  0,
+  0,  0,  0,  0,215,  3,  0,  0, 73,  0,  0,  0,226,  2,  0,  0,  1,  1,216,  3,154,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+232,124, 92,  2, 24,135,  9,  7, 24,135,  9,  7,208,124,  9,  7,160,229, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  5,  7,
+ 48, 69,  5,  7, 68, 65, 84, 65,248,  0,  0,  0,208,124,  9,  7,191,  0,  0,  0,  1,  0,  0,  0,  8,126,  9,  7,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 64, 90, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,118, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,215,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,  0,128,237, 68,  0,  0,200, 65,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,216,  3, 26,  0,216,  3, 26,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0, 73,  0,  0,  0,
+ 98,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  3, 26,  0,  7,  0,  1,  0,  2,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,132, 92,  2, 32, 77,104,  2, 32, 77,104,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+  0, 71,  5,  7,152, 72,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,  8,126,  9,  7,191,  0,  0,  0,
+  1,  0,  0,  0, 48,130,  9,  7,208,124,  9,  7,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0,251,195,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 15, 67,  0,  0,251,195,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,  7,  2,  0,  0,  0,  0,  0,  0,
+142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,  7,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
+  6,  0,160,  0,  8,  2,143,  0,246,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,159,  0,  0,  0,219,  0,  0,  0,226,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+160,  0,  8,  2,  8,  0,  5,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,129, 92,  2, 72,117,101,  2,
+136, 52,102,  2, 64,127,  9,  7,184,128,  9,  7,128, 74,  5,  7, 24, 76,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 56,  1,  0,  0, 64,127,  9,  7,189,  0,  0,  0,  1,  0,  0,  0,184,128,  9,  7,  0,  0,  0,  0,224,129, 92,  2,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108, 95,115,104,101,108,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108, 95,115,104,101,108,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84,111,111,108, 32, 83,104,101,108,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,196,255,143,  0, 36,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,184,128,  9,  7,189,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+ 64,127,  9,  7, 80,129,  4,  7,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,111, 98,106,101,
+ 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,111, 98,106,101,
+ 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 84,111,111,108,115,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 27,254,143,  0,145,  1,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 48,130,  9,  7,
+191,  0,  0,  0,  1,  0,  0,  0,152,219, 10,  7,  8,126,  9,  7,  0,  0,  0,  0,  0,  0, 16, 67,  0,  0,206,194,  0,  0,  0,  0,
+  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0, 99,  0,  0,  0,218,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,160,  0,120,  0,  9,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,130, 92,  2,
+120, 73, 25,  7,120, 73, 25,  7, 32,218, 10,  7, 32,218, 10,  7,  0, 78,  5,  7,152, 79,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0, 32,218, 10,  7,189,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,131, 92,  2,
+  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 79,112,101,114, 97,116,111,114,  0,105,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,216,255,144,  0, 16,  0,  0,  0,  0,  0,  0,  0, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,152,219, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,
+160,229, 10,  7, 48,130,  9,  7,  0,  0,  0,  0,  0,  0, 75, 67,  0,128,118,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 67,
+  0,128, 27,196,  0,  0,  0,  0,203,  0,  0,  0,220,  0,  0,  0, 18,  0,  0,  0,127,  2,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,
+  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0, 18,  0,  0,  0,127,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,220,  0,
+128,  2,203,  0,110,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0,
+215,  3,  0,  0, 99,  0,  0,  0,226,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 48,126, 92,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+208,220, 10,  7, 40,228, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+208,220, 10,  7,189,  0,  0,  0,  1,  0,  0,  0, 72,222, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
+ 51, 68, 95, 80, 84, 95,111, 98,106,101, 99,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
+ 51, 68, 95, 80, 84, 95,111, 98,106,101, 99,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84,114, 97,110,
+115,102,111,114,109,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,255,
+203,  0,206,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 72,222, 10,  7,189,  0,  0,  0,  1,  0,  0,  0,192,223, 10,  7,208,220, 10,  7,
+  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,254,203,  0, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,223, 10,  7,189,  0,  0,  0,
+  1,  0,  0,  0, 56,225, 10,  7, 72,222, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95, 51,100,
+118,105,101,119, 95,112,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95, 51,100,
+118,105,101,119, 95,112,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86,105,101,119,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,129,253,203,  0, 47,  1,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 56,  1,  0,  0, 56,225, 10,  7,189,  0,  0,  0,  1,  0,  0,  0,176,226, 10,  7,192,223, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95, 51,100,118,105,101,119, 95,100,105,115,112,108, 97,121,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95, 51,100,118,105,101,119, 95,100,105,115,112,108, 97,121,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68,105,115,112,108, 97,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 66,252,203,  0, 39,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,176,226, 10,  7,189,  0,  0,  0,  1,  0,  0,  0, 40,228, 10,  7,
+ 56,225, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95, 51,100,118,105,101,119, 95,109,101,115,
+104,100,105,115,112,108, 97,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95, 51,100,118,105,101,119, 95,109,101,115,
+104,100,105,115,112,108, 97,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77,101,115,104, 32, 68,105,115,112,108, 97,121,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,254,250,203,  0,104,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 40,228, 10,  7,
+189,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,176,226, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80,
+ 84, 95, 98, 97, 99,107,103,114,111,117,110,100, 95,105,109, 97,103,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80,
+ 84, 95, 98, 97, 99,107,103,114,111,117,110,100, 95,105,109, 97,103,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97, 99,107,103,114,111,117,
+110,100, 32, 73,109, 97,103,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 42,252,203,  0,  0,  0,
+ 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,248,  0,  0,  0,160,229, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,152,219, 10,  7,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  3,  0,  0, 99,  0,  0,  0,226,  2,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  3,128,  2, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,144,125, 92,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 81,  5,  7,
+ 40, 84,  5,  7,  0,  0,  0,  0,  0,132,  9,  7, 68, 65, 84, 65,216,  2,  0,  0,  0,132,  9,  7,152,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1, 64,215, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 28, 13,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 74,215, 76,190,  0,  0,  0,  0,
+238,  4, 53, 63,186,103, 59,190,247,217, 46, 63,  0,  0,  0,  0,255,  4, 53, 63,126,103, 59, 62,244,217, 46,191,  0,  0,  0,  0,
+228,  3, 52, 50,248, 70,119, 63,217,131,132, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 60,138,193,  0,  0,128, 63,
+236,  4, 53, 63,244,  4, 53, 63,  0,  0, 24, 53,  0,  0,  0,  0,137,103, 59,190,118,103, 59, 62,227, 70,119, 63,  0,  0,  0,  0,
+238,217, 46, 63,221,217, 46,191,213,131,132, 62,  0,  0,  0,  0,186,213, 60, 65,168,213, 60,193,221, 28,143, 64,  0,  0,128, 63,
+100,253, 69, 63,248,146,157,190,223,235, 46,191,247,217, 46,191,119,253, 69, 63,197,146,157, 62,220,235, 46, 63,244,217, 46, 63,
+ 65,228, 68, 50,109,234,207, 63,107,145,132,190,217,131,132,190,  0,  0,  0,  0,  0,  0,  0,  0, 18,177,136, 65,152, 60,138, 65,
+252,128, 37, 63,186,128, 37, 63,  0,  0,180, 53,  0,  0, 60, 52,154,225,222,189,131,225,222, 61,139, 11, 19, 63,  0,  0,144, 51,
+ 25,255,107,194,  1,255,107, 66,239,218,178,193,208,247,159,192,220, 91,105, 66,197, 91,105,194, 49,219,176, 65, 50,  8,160, 64,
+238,  4, 53, 63,186,103, 59,190,247,217, 46, 63,  0,  0,  0,  0,255,  4, 53, 63,126,103, 59, 62,244,217, 46,191,  0,  0,  0,  0,
+228,  3, 52, 50,248, 70,119, 63,217,131,132, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 60,138,193,  0,  0,128, 63,
+100,253, 69, 63,248,146,157,190,223,235, 46,191,247,217, 46,191,119,253, 69, 63,197,146,157, 62,220,235, 46, 63,244,217, 46, 63,
+ 65,228, 68, 50,109,234,207, 63,107,145,132,190,217,131,132,190,  0,  0,  0,  0,  0,  0,  0,  0, 18,177,136, 65,152, 60,138, 65,
+166, 33, 26, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,166, 33, 26, 64,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,166, 33, 26, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+122,163, 59, 63,235,250, 15,191,221,141,110,190,230,113,155,190,152, 60,138, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,146,243, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,
+ 24,135,  9,  7,153,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+ 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 56,192,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  0,  0,  0,  0,  8,  8,  0,  0,  0,  0,  0,  0, 12, 66,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,205,204,204, 61,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  7,  0, 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,255,255,
+ 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 96,  0,  0,  0, 72,136,  9,  7,190,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 48,124,  9,  7, 32, 26, 15,  7,136,121,  4,  7,
+ 48, 16,  4,  7,176,183,  3,  7,  0,  0,  0,  0,217,  3,  0,  0,186,  4,  0,  0, 73,  2,  0,  0,226,  2,  0,  0,  3,  3,226,  0,
+154,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,121, 92,  2, 88,139,  9,  7, 24,238, 10,  7,232,136,  9,  7, 32,138,  9,  7,
+  0,  0,  0,  0,  0,  0,  0,  0,120, 86,  5,  7, 88, 87,  5,  7, 68, 65, 84, 65,248,  0,  0,  0,232,136,  9,  7,191,  0,  0,  0,
+  1,  0,  0,  0, 32,138,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,190, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
+  0,  0, 98, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,225,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0, 66, 67,
+  0,  0,200, 65,  0,  0, 66, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4,
+ 10,  0,226,  0, 26,  0,226,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+217,  3,  0,  0,186,  4,  0,  0, 73,  2,  0,  0, 98,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+226,  0, 26,  0, 11,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,122, 92,  2, 96,150, 25,  7,
+ 96,150, 25,  7,  0,  0,  0,  0,  0,  0,  0,  0, 40, 89,  5,  7,176, 89,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+248,  0,  0,  0, 32,138,  9,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,232,136,  9,  7,  0,  0,  0,  0,  0,128,131, 67,
+  0,  0,228,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 81, 67,  0,  0,220,194,  0,  0,  0,  0,209,  0,  0,  0,226,  0,  0,  0,
+ 18,  0,  0,  0,127,  0,  0,  0,  0,  0,  0,  0,208,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,208,  0,  0,  0,
+ 18,  0,  0,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+ 18,  0,  0,  0,  2,  0,  3,  3,  0,  0,  0,  4,  6,  0,226,  0,128,  0,209,  0,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,217,  3,  0,  0,186,  4,  0,  0, 99,  2,  0,  0,226,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,226,  0,128,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,192,121, 92,  2,200,170, 25,  7,200,170, 25,  7,  0,  0,  0,  0,  0,  0,  0,  0,152, 91,  5,  7,168, 92,  5,  7,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  1,  0,  0, 88,139,  9,  7,162,  0,  0,  0,  1,  0,  0,  0,112,231, 10,  7,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,125, 25,  7,176,125, 25,  7,
+216,143, 12,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+ 68, 65, 84, 65, 12,  0,  0,  0,216,143, 12,  7,214,  0,  0,  0,  1,  0,  0,  0, 13,  0,  0,  0, 13,  0,  0,  0,160,140,  9,  7,
+ 68, 65, 84, 65,156,  0,  0,  0,160,140,  9,  7,213,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,160, 33, 10,  7,
+ 19,  0,  0,  0,  1,  0,  1,  0,160, 33, 10,  7, 20,  0,  0,  0,  1,  0,  1,  0,160, 33, 10,  7, 21,  0,  1,  0,  1,  0,  1,  0,
+160, 33, 10,  7,  0,  0,  0,  0,  1,  0,  1,  0, 64, 39, 10,  7,  0,  0,  0,  0,  1,  0,  1,  0,224,195,  9,  7,  0,  0,  0,  0,
+  1,  0,  1,  0, 48, 21, 12,  7,  0,  0,  0,  0,  1,  0,  1,  0, 48,203,  9,  7,  0,  0,  0,  0,  1,  0,  1,  0,224, 45, 10,  7,
+  0,  0,  0,  0,  1,  0,  1,  0,136,199,  9,  7,  0,  0,  0,  0,  1,  0,  1,  0,208,240, 10,  7,  0,  0,  0,  0,  1,  0,  1,  0,
+ 56,192,  9,  7,  0,  0,  0,  0,  1,  0,  1,  0,240,143,  9,  7, 68, 65, 84, 65,248,  0,  0,  0,128,141,  9,  7,191,  0,  0,  0,
+  1,  0,  0,  0,184,142,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0, 55,
+  0,  0, 67, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,137, 67,
+  0,  0,200, 65,  0,128,137, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4,
+ 10,  0,195,  0, 26,  0,195,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 53,  4,  0,  0,247,  4,  0,  0, 69,  2,  0,  0, 94,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+195,  0, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+248,  0,  0,  0,184,142,  9,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,128,141,  9,  7,  0,  0,  0,  0,  0,  0,150, 67,
+  0,192,116,196,  0,  0,  0,  0,  0,  0,  0,  0,205, 85,150, 67,223,204, 35,196, 26, 85,207,195,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,  0,  0,  0,
+  0,  0,  0,  0,155,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+  0,  0,  0,  0,  1,  0,  3,  0,  2,  0,  0,  4,  6,  0,195,  0,156,  0,195,  0,156,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 53,  4,  0,  0,247,  4,  0,  0, 95,  2,  0,  0,250,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195,  0,156,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,224,  0,  0,  0,112,231, 10,  7,158,  0,  0,  0,  1,  0,  0,  0, 24,238, 10,  7,
+ 88,139,  9,  7,128,141,  9,  7,184,142,  9,  7,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,128,236,177,  2,  0,  0,  0,  0,
-255, 20,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 48, 74, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,160, 75, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69, 68,
+  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+248,  0,  0,  0,144,232, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,200,233, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69, 68,
   0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,138, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  1,  0,  0,
   0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,  0,128,237, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 20,  1, 26,  0, 20,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,160, 75, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 74, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,200,233, 10,  7,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+144,232, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0,
+ 26,  0,  0,  0, 80,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 55,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0, 26,  0,  0,  0, 80,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 55,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 16, 77, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65,248,  2,  0,  0, 16, 77, 91,  2,  0,  0,  0,  0,
-146,  0,  0,  0,  1,  0,  0,  0,103,212,136, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,235, 10,  7, 68, 65, 84, 65,216,  2,  0,  0,  0,235, 10,  7,
+152,  0,  0,  0,  1,  0,  0,  0,103,212,136, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,  0,  0,  0,128,  0,  0,  0,128,
 226,215,163,188,  0,  0,  0,128,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -194,566 +620,239 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,240,  0,  0,  0, 24,238, 10,  7,153,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,112,231, 10,  7,144,232, 10,  7,
+200,233, 10,  7,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 56,192,  9,  7,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  1,  0,  0, 80, 80, 91,  2,  0,  0,  0,  0,147,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-240, 72, 91,  2,  0,  0,  0,  0, 48, 74, 91,  2,  0,  0,  0,  0,160, 75, 91,  2,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32, 65,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 64,153, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  8,  0,
+  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  7,  0, 10,  0,159,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 83, 67,  0,  0, 92,  5,  0,  0,160, 33, 10,  7,150,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 83, 99,101,110,101,  0,116, 97,103,101,  0, 97,105,110,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,192,  9,  7, 64, 39, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+120,188,  2,  7, 48,241,  2,  7,120,188,  2,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,250, 67,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  7,  0, 10,  0,
-159,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
-176, 81, 91,  2,  0,  0,  0,  0,183,  0,  0,  0,  1,  0,  0,  0,  0, 94, 91,  2,  0,  0,  0,  0,192,251, 90,  2,  0,  0,  0,  0,
-224,234, 90,  2,  0,  0,  0,  0,160,238, 90,  2,  0,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,224,237, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,  0,  0,  0,  0, 99,  0,  0,  0, 15, 15, 12,  6,100,  0,  1,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,240,118, 76,  2,  0,  0,  0,  0,112, 85, 91,  2,  0,  0,  0,  0,160, 92, 91,  2,  0,  0,  0,  0,
-144, 82, 91,  2,  0,  0,  0,  0,  0, 84, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-192,174,118,  2,  0,  0,  0,  0,176,185,118,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,144, 82, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,  0, 84, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,104, 68,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128,193, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,224,202, 68,  0,  0,200, 65,  0,224,202, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 12,  6, 26,  0, 12,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  6, 26,  0,  5,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,208,120, 76,  2,  0,  0,  0,  0,208,218,179,  2,  0,  0,  0,  0,208,218,179,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,155,100,  2,  0,  0,  0,  0, 96,156,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  0, 84, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,144, 82, 91,  2,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,
-  0,  0,  0,  0,  0,  0, 72, 66,112,189, 17,192,246, 70,125, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,
- 18,  0,  0,  0, 73,  0,  0,  0,  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65,
- 72,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  4,  8,  0, 12,  6, 74,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0, 26,  0,  0,  0, 99,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  6, 74,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,224,119, 76,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,144,158,100,  2,  0,  0,  0,  0,160,163,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,200,  0,  0,  0,112, 85, 91,  2,  0,  0,  0,  0,
-162,  0,  0,  0,  1,  0,  0,  0,160, 92, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,239, 10,  7,152,230,101,  2,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,100,  0,  0,  0,
+  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,
+224,  1, 60,  0, 32,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  6,  0, 25,  0,141,  0,128,  7, 56,  4,  8,  0,  8,  0,  0,  0,
+ 24,  0, 17,  0,  0,  0,  0,  0, 90,  0,  0,  0,  0,  0,  0,  0, 81,  0,  0,  0, 23,  0, 33,  0,  0,  0,128,  0,  0,  0,  8,  0,
+ 24,  0, 10,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,231,  9,  7, 48,231,  9,  7,  0,  0,  0,  0,
+  0,  0,200, 66,  0,  0,200, 66,  0,  0,128, 63,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  5,  0,  2,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47, 98, 97,
+ 99,107, 98,117,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  6,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,128, 86, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,240, 87, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69, 68,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,203, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,  6,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,  0,128,237, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 88,  6, 26,  0, 88,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,240, 87, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 86, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,116,109,112,
+ 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  1,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,  6,  0,  0, 26,  0,  0,  0, 55,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,  6, 30,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 96, 89, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65,248,  2,  0,  0, 96, 89, 91,  2,  0,  0,  0,  0,
-146,  0,  0,  0,  1,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,213,108, 66,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,  0,  0,  0,128,  0,  0,  0,128,
-226,215,163,188,  0,  0,  0,128,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32,193,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32, 65,  0,  0,128, 63,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,213,108, 66,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,
-184,175, 31, 65,  0,  0, 32, 65,161, 14,106, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224, 91,138, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,252,249,195,115,253, 71,194,  0,  0,  0,  0,  0,  0,  0,  0,
- 98,127,249, 67,129,255, 71, 66,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32,193,  0,  0,128, 63,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,213,108, 66,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,
-184,175, 31, 65,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 52,149,147, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  1,  0,  0,160, 92, 91,  2,  0,  0,  0,  0,147,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-112, 85, 91,  2,  0,  0,  0,  0,128, 86, 91,  2,  0,  0,  0,  0,240, 87, 91,  2,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32, 65,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 64,153, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,250, 67,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  7,  0, 10,  0,
-159,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
-  0, 94, 91,  2,  0,  0,  0,  0,183,  0,  0,  0,  1,  0,  0,  0,160,111, 91,  2,  0,  0,  0,  0,176, 81, 91,  2,  0,  0,  0,  0,
-160,238, 90,  2,  0,  0,  0,  0, 96,236, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,  0,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,101,  0,  0,  0, 69,  4,  0,  0,  1,  1, 12,  6,225,  3,  1,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,192,121, 76,  2,  0,  0,  0,  0, 64,110, 91,  2,  0,  0,  0,  0, 64,110, 91,  2,  0,  0,  0,  0,
-224, 94, 91,  2,  0,  0,  0,  0,144,105, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 48,188,118,  2,  0,  0,  0,  0,224,204,118,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,224, 94, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0, 80, 96, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 66,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128,193, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,  0,128,237, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 12,  6, 26,  0, 12,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,101,  0,  0,  0,126,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  6, 26,  0,  7,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,112,130, 76,  2,  0,  0,  0,  0,128, 47,182,  2,  0,  0,  0,  0,128, 47,182,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,167,100,  2,  0,  0,  0,  0,192,170,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 80, 96, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,144,105, 91,  2,  0,  0,  0,  0,224, 94, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 92, 67,
-  0, 64, 55,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 92, 67,  0,  0, 41,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,219,  0,  0,  0,
-  0,  0,  0,  0,163,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
-  0,  0,  0,  0,  1,  0,  3,  0,  2,  0,  0,  0,  6,  0,220,  0,164,  2,220,  0,164,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0, 11,  6,  0,  0,127,  0,  0,  0, 69,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,160,123, 76,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-192, 97, 91,  2,  0,  0,  0,  0,  0,104, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,144,105, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80, 96, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  6,  0,  0,127,  0,  0,  0, 69,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  6,199,  3,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,176,122, 76,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,172,100,  2,  0,  0,  0,  0, 96,186,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,107, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65,248,  2,  0,  0,  0,107, 91,  2,  0,  0,  0,  0,
-146,  0,  0,  0,  1,  0,  0,  0,  1,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,167, 29,224, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,
-225,215,163,188,  0,  0,  0,  0,238,  4, 53, 63,186,103, 59,190,247,217, 46, 63,  0,  0,  0,  0,255,  4, 53, 63,126,103, 59, 62,
-244,217, 46,191,  0,  0,  0,  0,228,  3, 52, 50,248, 70,119, 63,217,131,132, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-152, 60,138,193,  0,  0,128, 63,236,  4, 53, 63,244,  4, 53, 63,  0,  0, 24, 53,  0,  0,  0,  0,137,103, 59,190,118,103, 59, 62,
-227, 70,119, 63,  0,  0,  0,  0,238,217, 46, 63,221,217, 46,191,213,131,132, 62,  0,  0,  0,  0,186,213, 60, 65,168,213, 60,193,
-221, 28,143, 64,  0,  0,128, 63,102,253, 69, 63,120, 16,164,190,194,219, 46,191,247,217, 46,191,120,253, 69, 63, 67, 16,164, 62,
-191,219, 46, 63,244,217, 46, 63, 67,228, 68, 50,189,122,216, 63, 53,133,132,190,217,131,132,190,  0,  0,  0,  0,  0,  0,  0,  0,
- 13, 21,138, 65,152, 60,138, 65, 15,132, 37, 63,166,125, 37, 63,  0, 96,160, 55,  0,128,139, 54, 97, 17,214,189, 77, 17,214, 61,
- 92, 58, 13, 63,  0,  0,184,179,168,135, 19,196,155,135, 19, 68, 34,158, 95,195,235,  0, 72,194,116, 93, 19, 68,103, 93, 19,196,
- 42, 94, 95, 67,248,  2, 72, 66,238,  4, 53, 63,186,103, 59,190,247,217, 46, 63,  0,  0,  0,  0,255,  4, 53, 63,126,103, 59, 62,
-244,217, 46,191,  0,  0,  0,  0,228,  3, 52, 50,248, 70,119, 63,217,131,132, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-152, 60,138,193,  0,  0,128, 63,102,253, 69, 63,120, 16,164,190,194,219, 46,191,247,217, 46,191,120,253, 69, 63, 67, 16,164, 62,
-191,219, 46, 63,244,217, 46, 63, 67,228, 68, 50,189,122,216, 63, 53,133,132,190,217,131,132,190,  0,  0,  0,  0,  0,  0,  0,  0,
- 13, 21,138, 65,152, 60,138, 65, 55,243,195, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 55,243,195, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 55,243,195, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,122,163, 59, 63,235,250, 15,191,221,141,110,190,230,113,155,190,152, 60,138, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 21,212,154, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  1,  0,  0, 64,110, 91,  2,  0,  0,  0,  0,147,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32, 65,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 64,153, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  8,  8,  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,250, 67,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  7,  0, 10,  0,
-159,  0,  0,  0,  0,  0,  0,  0,  3,  0,255,255, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
-160,111, 91,  2,  0,  0,  0,  0,183,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94, 91,  2,  0,  0,  0,  0,
- 96,239, 90,  2,  0,  0,  0,  0, 64,238, 90,  2,  0,  0,  0,  0,192,236, 90,  2,  0,  0,  0,  0,192,239, 90,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 13,  6,  0,  0,118,  7,  0,  0, 81,  3,  0,  0, 69,  4,  0,  0,  3,  3,106,  1,245,  0,  1,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 32,116, 76,  2,  0,  0,  0,  0, 96,115, 91,  2,  0,  0,  0,  0,112,128, 91,  2,  0,  0,  0,  0,
-128,112, 91,  2,  0,  0,  0,  0,240,113, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,207,118,  2,  0,  0,  0,  0,144, 82,119,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,128,112, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,240,113, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,190, 67,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,181, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,  1,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,  0, 66, 67,  0,  0,200, 65,  0,  0, 66, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,106,  1, 26,  0,106,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,  6,  0,  0,118,  7,  0,  0, 81,  3,  0,  0,106,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  1, 26,  0,  9,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,118, 76,  2,  0,  0,  0,  0,128,  5,182,  2,  0,  0,  0,  0,128,  5,182,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,190,100,  2,  0,  0,  0,  0,208,190,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,240,113, 91,  2,  0,  0,  0,  0,
-184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,131, 67,
-  0,  0,194,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,172, 67,  0,  0, 73,195,  0,  0,  0,  0, 89,  1,  0,  0,106,  1,  0,  0,
- 18,  0,  0,  0,218,  0,  0,  0,  0,  0,  0,  0, 88,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 88,  1,  0,  0,
- 18,  0,  0,  0,218,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
- 18,  0,  0,  0,  2,  0,  3,  3,  0,  0,  0,  4,  6,  0,106,  1,219,  0, 89,  1,201,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,  6,  0,  0,118,  7,  0,  0,107,  3,  0,  0, 69,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  1,219,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 16,117, 76,  2,  0,  0,  0,  0,192, 43,182,  2,  0,  0,  0,  0,192, 43,182,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,193,100,  2,  0,  0,  0,  0, 48,195,100,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 96,115, 91,  2,  0,  0,  0,  0,
-156,  0,  0,  0,  1,  0,  0,  0, 16,121, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,  8,182,  2,  0,  0,  0,  0,
-224,  8,182,  2,  0,  0,  0,  0,208,116, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,208,116, 91,  2,  0,  0,  0,  0,
-207,  0,  0,  0,  1,  0,  0,  0, 13,  0,  0,  0, 13,  0,  0,  0, 32,117, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,
- 32,117, 91,  2,  0,  0,  0,  0,206,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 96,130, 91,  2,  0,  0,  0,  0,
- 19,  0,  0,  0,  1,  0,  1,  0, 96,130, 91,  2,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0, 96,130, 91,  2,  0,  0,  0,  0,
- 21,  0,  1,  0,  1,  0,  1,  0, 96,130, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 48,145, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,176,157, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,128,173, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,128,167, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,224,171, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0, 16,163, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,176,140, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0, 64,153, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,208,139, 91,  2,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0, 48,118, 91,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,160,119, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0, 55,  0,  0, 67, 67,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,137, 67,  0,  0,200, 65,
-  0,128,137, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0,195,  0,
- 26,  0,195,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 53,  4,  0,  0,247,  4,  0,  0, 69,  2,  0,  0, 94,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-195,  0, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0,160,119, 91,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 48,118, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,150, 67,  0,192,116,196,  0,  0,  0,  0,  0,  0,  0,  0,205, 85,150, 67,
-223,204, 35,196, 26, 85,207,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,  0,  0,  0,  0,  0,  0,  0,155,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,  0,  0,  0,  0,  1,  0,  3,  0,  2,  0,  0,  4,  6,  0,195,  0,
-156,  0,195,  0,156,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 53,  4,  0,  0,247,  4,  0,  0, 95,  2,  0,  0,250,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-195,  0,156,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,  0,  1,  0,  0, 16,121, 91,  2,  0,  0,  0,  0,152,  0,  0,  0,  1,  0,  0,  0,112,128, 91,  2,  0,  0,  0,  0,
- 96,115, 91,  2,  0,  0,  0,  0, 48,118, 91,  2,  0,  0,  0,  0,160,119, 91,  2,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
- 80,122, 91,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,192,123, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 69, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,138, 67,  0,  0,  0,  0,  0,  0,208, 65,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 19,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,237, 68,  0,  0,200, 65,  0,128,237, 68,  0,  0,200, 65,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  4, 10,  0, 20,  1, 26,  0, 20,  1, 26,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 26,  0,  0,  0,  1,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
-192,123, 91,  2,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,122, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 89,  6,  0,  0,108,  7,  0,  0,
- 26,  0,  0,  0, 80,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  1, 55,  4,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,125, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65,248,  2,  0,  0,
- 48,125, 91,  2,  0,  0,  0,  0,146,  0,  0,  0,  1,  0,  0,  0,103,212,136, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,
-  0,  0,  0,128,  0,  0,  0,128,226,215,163,188,  0,  0,  0,128,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,128, 63,103,212,136, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,
-  0,  0,  0,  0,  0,  0,  0,  0,184,175, 31, 65,  0,  0, 32, 65,237,122,111, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,161, 14,106, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,252,249,195,115,253, 71,194,
-  0,  0,  0,  0,  0,  0,  0,  0, 98,127,249, 67,129,255, 71, 66,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,128, 63,103,212,136, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,
-  0,  0,  0,  0,  0,  0,  0,  0,184,175, 31, 65,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100, 32,222, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  1,  0,  0,112,128, 91,  2,  0,  0,  0,  0,147,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 16,121, 91,  2,  0,  0,  0,  0, 80,122, 91,  2,  0,  0,  0,  0,192,123, 91,  2,  0,  0,  0,  0,
-  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 64,153, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 12, 66,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
- 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 16,  0,  0,  0,  7,  0, 10,  0,159,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 83, 67,  0,  0,192,  5,  0,  0, 96,130, 91,  2,  0,  0,  0,  0,144,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 83, 99,101,110,101,  0,
-116, 97,103,101,  0, 97,105,110,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 64,153, 91,  2,  0,  0,  0,  0, 48,145, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 96,136, 91,  2,  0,  0,  0,  0, 64,137, 91,  2,  0,  0,  0,  0, 96,136, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,137, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,100,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,224,  1, 60,  0, 32,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  6,  0, 25,  0,141,  0,128,  7, 56,  4,  8,  0,  8,  0,  0,  0, 24,  0, 17,  0,  0,  0,  0,  0, 90,  0,  0,  0,
-  0,  0,  0,  0, 81,  0,  0,  0, 23,  0, 33,  0,  0,  0,128,  0,  0,  0,  8,  0, 24,  0, 10,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 48,139, 91,  2,  0,  0,  0,  0, 48,139, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 66,
-  0,  0,200, 66,  0,  0,128, 63,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  5,  0,  2,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47, 98, 97, 99,107, 98,117,
-102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,116,109,112, 47,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  1,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,
-  6,  0,  0,  0, 16,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,173,  2, 95,  0,154,153,217, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 62,  6,  0,  0,  0, 16,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,173,  2, 95,  0,154,153,217, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,172,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,176,191, 66,  2,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0, 10,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-205,204, 28, 65,  0,  0,  0,  0, 32,  0,  0,  0,128,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,224,  1, 60,  0, 32,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  5,  0,128,  7, 56,  4, 68, 65, 84, 65, 40,  0,  0,  0,
- 96,136, 91,  2,  0,  0,  0,  0,124,  0,  0,  0,  1,  0,  0,  0,208,136, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  6,  3,227,  1,176,157, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-208,136, 91,  2,  0,  0,  0,  0,124,  0,  0,  0,  1,  0,  0,  0, 64,137, 91,  2,  0,  0,  0,  0, 96,136, 91,  2,  0,  0,  0,  0,
-  1,  0,  0,  0,  2,  0,  0,  0,  0,  4,  0,  0,228,  3, 33,  3, 16,163, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 64,137, 91,  2,  0,  0,  0,  0,124,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,136, 91,  2,  0,  0,  0,  0,
-  1,  0,  0,  0,  3,  0,  0,  0,  0,  4,  0,  0, 97,  3, 61,  3, 64,153, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65, 64,  1,  0,  0,
-176,137, 91,  2,  0,  0,  0,  0,142,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  1,  0,205,204, 76, 63,  0,  0,180, 66,  9,  0,  1,  0,  0,  0,128, 63,
-111, 18,131, 58,205,204,204, 61,  0,  0,  1,  0, 32,  0, 32,  0, 32,  0,  1,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  1,  0,  1,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0, 80,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  5,  0,  5,  0,255,255, 50,  0, 50,  0, 10,  0,  0,  0, 50,  0,100,  0, 10,  0,  0,  0,
- 50,  0, 50,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0,
- 50,  0, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 10,215, 35, 60,205,204,204, 61,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  0,205,204,204, 61,205,204,204, 61,
-102,102,166, 63,  0,  0,192, 63,  0,  0,240, 65, 72,225,122, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
- 67,  2,  0,  3,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  0,  0,  0, 48,139, 91,  2,  0,  0,  0,  0,
-129,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49, 32, 82,101,110,100,101,114,
- 76, 97,121,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255, 15,  0,  0,  0,  0,  0,255,127,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
- 67, 65,  0,  0,152,  0,  0,  0,208,139, 91,  2,  0,  0,  0,  0, 29,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 65, 67, 97,109,101,114, 97,
-  0, 97,109,101,114, 97, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+152, 24, 11,  7,  1,  0,  0,  0,  1,  0, 10,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,205,204, 28, 65,  0,  0,  0,  0, 32,  0, 32,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+128,  0,  5,  0, 60,  0,  5,  0,  1,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,
+224,  1, 60,  0, 32,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  5,  0,128,  7, 56,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 28,  0,  0,  0,120,188,  2,  7,
+128,  0,  0,  0,  1,  0,  0,  0,136,223,  2,  7,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,236,  1, 64,  1,
+224,195,  9,  7, 68, 65, 84, 65, 28,  0,  0,  0,136,223,  2,  7,128,  0,  0,  0,  1,  0,  0,  0, 48,241,  2,  7,120,188,  2,  7,
+  1,  0,  0,  0,  2,  0,  0,  0,  0,  4,  0,  0,121,  2, 10,  2,136,199,  9,  7, 68, 65, 84, 65, 28,  0,  0,  0, 48,241,  2,  7,
+128,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,136,223,  2,  7,  1,  0,  0,  0,  3,  0,  0,  0,  0,  4,  0,  0, 38,  2, 28,  2,
+ 56,192,  9,  7, 68, 65, 84, 65, 72,  1,  0,  0, 72,239, 10,  7,147,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  1,  0,205,204, 76, 63,  0,  0,180, 66,  9,  0,  1,  0,  0,  0,128, 63,111, 18,131, 58,
+205,204,204, 61,  0,  0,  1,  0, 32,  0, 32,  0, 32,  0,  1,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  1,  0,  1,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  2,  0, 80,  0,  0,  0,  0,  0,  7,  0,  5,  0,  5,  0,255,255, 50,  0, 50,  0, 10,  0,  0,  0,
+ 50,  0,100,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0,
+ 50,  0, 50,  0, 10,  0,  0,  0, 50,  0, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,205,204,204, 61,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  0,205,204,204, 61,205,204,204, 61,102,102,166, 63,  0,  0,192, 63,  0,  0,240, 65,
+ 72,225,122, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 67,  2,  0,  3,  2,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 72,  0,  0,  0, 48,231,  9,  7,133,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49, 32, 82,101,
+110,100,101,114, 76, 97,121,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255, 15,  0,  0,  0,  0,  0,255,127,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0, 67, 65,  0,  0,
+120,  0,  0,  0,240,143,  9,  7, 29,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67, 65, 67, 97,109,101,114, 97,  0, 97,109,101,114, 97, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0, 63,145,137, 68, 66,205,204,204, 61,  0,  0,200, 66,  0,  0, 12, 66,
 161, 14,234, 64,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 65,  0,  0,232,  1,  0,  0,176,140, 91,  2,  0,  0,  0,  0,
- 39,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 76, 65, 83,112,111,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,247,255,239, 65,  0,  0,150, 66,154,153, 25, 62,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-224,142, 91,  2,  0,  0,  0,  0,  2,  0,  0,  0, 46, 26,128, 63, 25,  4,240, 65,  0,  0, 52, 66,  0,  0,128, 63,  0,  0, 64, 64,
- 64, 11,  3,  0,  1,  0,  0,  0,  0,  0,  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-111, 18,131, 58,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 76, 65,  0,  0,124,  1,  0,  0,208,240, 10,  7, 41,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 65, 83,112,111,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,247,255,239, 65,  0,  0,150, 66,154,153, 25, 62,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,144,242, 10,  7,
+  2,  0,  0,  0, 46, 26,128, 63, 25,  4,240, 65,  0,  0, 52, 66,  0,  0,128, 63,  0,  0, 64, 64, 64, 11,  3,  0,  1,  0,  0,  0,
+  0,  0,  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,111, 18,131, 58,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 42,  4,  7, 68, 65, 84, 65,  8,  1,  0,  0,
+144,242, 10,  7, 64,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  1,  0,  0,  0,128, 67,  0,  0,  0,  0,
+  0,  0,128, 63,243,  4, 53,191,242,  4, 53, 63,242,  4, 53,191,243,  4, 53, 63,112,236,  2,  7,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,192,144, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,224,142, 91,  2,  0,  0,  0,  0,
- 54,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  1,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
-243,  4, 53,191,242,  4, 53, 63,242,  4, 53,191,243,  4, 53, 63, 96,144, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 24,  0,  0,  0, 96,144, 91,  2,  0,  0,  0,  0, 52,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,192,144, 91,  2,  0,  0,  0,  0,
- 19,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 79,  0,  0,216,  1,  0,  0, 48,145, 91,  2,  0,  0,  0,  0,
-123,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 87, 79, 87,111,114,108,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 62,  0,  0,128, 62,  0,  0,128, 62,  0,  0,  0,  0,205,204,204, 61,205,204,204, 61,205,204,204, 61,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,205,204, 28, 65,  0,  0,  0,  0,  0,  0, 32,  0,128,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0, 64,  0,  0,  0,  0,  0,  0,112, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,
-  0,  0,128, 63,205,204, 76, 61,  0,  0,  5,  0,  0,  0,  0,  0, 10,215,163, 59,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 84, 88,  0,  0,176,  0,  0,  0, 80,147, 91,  2,  0,  0,  0,  0, 27,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 88, 84,101,120,116,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,112,236,  2,  7,
+ 62,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,  0, 42,  4,  7, 19,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 79,  0,  0,104,  1,  0,  0, 64, 39, 10,  7,
+127,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 79, 87,111,114,108,100,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  1,  0,  0,  0, 64,148, 91,  2,  0,  0,  0,  0, 64,148, 91,  2,  0,  0,  0,  0,
- 64,148, 91,  2,  0,  0,  0,  0, 64,148, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,149, 91,  2,  0,  0,  0,  0,255,255,255,255,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 64,148, 91,  2,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,148, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 69, 69, 82, 70, 68, 65, 84, 65,  4,  0,  0,  0,176,148, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  1,  0, 79, 66,  0,  0, 40,  4,  0,  0, 64,153, 91,  2,  0,  0,  0,  0,114,  0,  0,  0,  1,  0,  0,  0,176,157, 91,  2,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 67, 97,
-109,101,114, 97,  0, 97,109,101,114, 97, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,128, 62,  0,  0,128, 62,  0,  0,  0,  0,205,204,204, 61,205,204,204, 61,
+205,204,204, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,205,204, 28, 65,  0,  0,  0,  0,  0,  0, 32,  0,128,  0,  5,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  0,  0,  0,  0,  0,  0,112, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,128, 63,205,204, 76, 61,  0,  0,  5,  0,  0,  0,  0,  0, 10,215,163, 59,  0,  0,  0,  0,
+  0,  0,128, 62,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,139, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 88,  0,  0,120,  0,  0,  0,232, 40, 10,  7, 27,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 88, 84,101,120,116,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,
+  1,  0,  0,  0, 96,142,  2,  7, 96,142,  2,  7, 96,142,  2,  7, 96,142,  2,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,160, 41, 10,  7,255,255,255,255,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 24,  0,  0,  0, 96,142,  2,  7, 25,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,248, 11,  7,  0,  0,  0,  0,
+  0,  0,  0,  0, 69, 69, 82, 70, 68, 65, 84, 65,  4,  0,  0,  0,104,248, 11,  7,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  1,  0,
+ 79, 66,  0,  0,100,  3,  0,  0, 56,192,  9,  7,118,  0,  0,  0,  1,  0,  0,  0,224,195,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 79, 66, 67, 97,109,101,114, 97,  0, 97,109,101,114, 97, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,143,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,110,101,239, 64,150, 62,208,192, 78,255,170, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 42,254,141, 63,192, 57, 49, 60, 34,159, 80, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,149, 47, 63, 53, 70, 58, 63,
-222, 56, 49,188,  0,  0,  0,  0, 86,126,162,190,227,251,159, 62, 55, 53,101, 63,  0,  0,  0,  0,  7,165, 39, 63,149, 84, 28,191,
- 51,247,227, 62,  0,  0,  0,  0,110,101,239, 64,150, 62,208,192, 78,255,170, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,128, 63,  1,  0,128, 51,
-  1,  0,  0,179,  0,  0,  0,  0,  0,  0,  0, 51,  0,  0,128, 63,  1,  0,128, 51,  0,  0,  0,  0,  2,  0,  0,179,  2,  0,  0,167,
-  1,  0,128, 63,  0,  0,  0,  0,  1,  0,  0, 53,  1,  0,  0, 41,  1,  0,128,168,  0,  0,128, 63,  0,  0,128, 63,157,190,215, 49,
-167,170,  4, 52,  0,  0,  0,128,129,116,157,178,  1,  0,128, 63, 33, 69, 15, 51,  0,  0,  0,128, 73,254, 67, 51,243, 97,106, 49,
-  0,  0,128, 63,  0,  0,  0,128,  3,  0, 64, 52,183,164,157, 39,  0,  0,128, 53,  0,  0,128, 63,  1,  0,  0,  0,  0,  4,  0,  0,
-  0,  0,  0,  0,  5,  0,  1,  0,  0,  0,  0,  0, 79, 66,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,187,225, 16, 63,  0,  0,128, 63,205,204,204, 62,237, 54, 32, 63,
-  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,101,239, 64,150, 62,208,192, 78,255,170, 64,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 42,254,141, 63,192, 57, 49, 60, 34,159, 80, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,222,149, 47, 63, 53, 70, 58, 63,222, 56, 49,188,  0,  0,  0,  0, 86,126,162,190,227,251,159, 62,
+ 55, 53,101, 63,  0,  0,  0,  0,  7,165, 39, 63,149, 84, 28,191, 51,247,227, 62,  0,  0,  0,  0,110,101,239, 64,150, 62,208,192,
+ 78,255,170, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,125,103,133, 51,176,219,194,178,  0,  0,  0,  0,190, 32, 66, 51,  1,  0,128, 63,
+168,200,153, 51,  0,  0,  0,  0, 32,206, 18,179,126,126,149, 50,  1,  0,128, 63,  0,  0,  0,  0,241,251,133, 52,172,182, 27,180,
+174,236,252, 51,  0,  0,128, 63,  0,  0,128, 63,157,190,215, 49,167,170,  4, 52,  0,  0,  0,128,129,116,157,178,  1,  0,128, 63,
+ 33, 69, 15, 51,  0,  0,  0,128, 73,254, 67, 51,243, 97,106, 49,  0,  0,128, 63,  0,  0,  0,128,  3,  0, 64, 52,183,164,157, 39,
+  0,  0,128, 53,  0,  0,128, 63,  1,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  5,  0,  1,  0,  0,  0,  0,  0, 79, 66,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,
+187,225, 16, 63,  0,  0,128, 63,205,204,204, 62,237, 54, 32, 63,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 79, 66,  0,  0, 40,  4,  0,  0,176,157, 91,  2,  0,  0,  0,  0,114,  0,  0,  0,  1,  0,  0,  0, 16,163, 91,  2,
-  0,  0,  0,  0, 64,153, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 67,117,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66,  0,  0,100,  3,  0,  0,
+224,195,  9,  7,118,  0,  0,  0,  1,  0,  0,  0,136,199,  9,  7, 56,192,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 67,117,
  98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,193,181,  2,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,173, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,162, 91,  2,  0,  0,  0,  0,112,162, 91,  2,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,222,149, 47, 63, 52, 70, 58, 63,
-179, 56, 49,188,  0,  0,  0,128, 86,126,162,190,227,251,159, 62, 56, 53,101, 63,  0,  0,  0,128,  7,165, 39, 63,149, 84, 28,191,
- 50,247,227, 62,  0,  0,  0,128,110,101,239, 64,151, 62,208,192, 77,255,170, 64,  0,  0,128, 63,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  2,  0,  0,  0, 68,  0, 79, 66,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,229,208, 34, 62,
-  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,204,180,  2,  0,  0,  0,  0,160,185,181,  2,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,  8,  0,  0,  0,192,162, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0,112,162, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
- 79, 66,  0,  0, 40,  4,  0,  0, 16,163, 91,  2,  0,  0,  0,  0,114,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-176,157, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 76, 97,109,112,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,140, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-154,112,130, 64,183,178,128, 63,112,236,188, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,229,123, 38, 63,
- 87, 43, 98, 61,229,229,238, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 54,236,148,190, 25,134,116, 63,236, 13, 98,189,
-  0,  0,  0,  0,221,102, 69,191, 57,174, 76,190, 34,194, 26, 63,  0,  0,  0,  0, 37,255, 16, 63,241,161, 95, 62,164,111, 75, 63,
-  0,  0,  0,  0,154,112,130, 64,183,178,128, 63,112,236,188, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,149, 25,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 48, 21, 12,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,127, 10,  7,
+168,144,  9,  7,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  1,  0,128, 50,  0,  0,  0,179,
-  0,  0,  0,  0,  1,  0,128, 50,  1,  0,128, 63,  1,  0,  0, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  1,  0,  0, 39,  1,  0,  0, 52,  1,  0,128, 39,  0,  0,128, 63, 53,236,148,190,222,102, 69,191, 37,255, 16, 63,
-  0,  0,  0,128, 24,134,116, 63, 57,174, 76,190,240,161, 95, 62,  0,  0,  0,128,235, 13, 98,189, 34,194, 26, 63,166,111, 75, 63,
-  0,  0,  0,128,208, 19, 13, 63,234, 65,102,190, 10, 10,231,192,  0,  0,128, 63,  1,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,
-  5,  0,  1,  0,  0,  0, 68,  0, 79, 66,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,
-  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,229,208, 34, 62,  0,  0,  0,  0,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+222,149, 47, 63, 52, 70, 58, 63,179, 56, 49,188,  0,  0,  0,128, 86,126,162,190,227,251,159, 62, 56, 53,101, 63,  0,  0,  0,128,
+  7,165, 39, 63,149, 84, 28,191, 50,247,227, 62,  0,  0,  0,128,110,101,239, 64,151, 62,208,192, 77,255,170, 64,  0,  0,128, 63,
+  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0, 68,  0, 79, 66,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,169, 19,208, 60,  0,  0,128, 63,
+205,204,204, 62,229,208, 34, 62,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,120,137, 25,  7,152,143, 25,  7, 25,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0,224,127, 10,  7,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0,168,144,  9,  7,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+ 79, 66,  0,  0,100,  3,  0,  0,136,199,  9,  7,118,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,224,195,  9,  7,  0,  0,  0,  0,
+  0,  0,  0,  0, 79, 66, 76, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,240, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,112,130, 64,183,178,128, 63,112,236,188, 64,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,229,123, 38, 63, 87, 43, 98, 61,229,229,238, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 54,236,148,190, 25,134,116, 63,236, 13, 98,189,  0,  0,  0,  0,221,102, 69,191, 57,174, 76,190,
+ 34,194, 26, 63,  0,  0,  0,  0, 37,255, 16, 63,241,161, 95, 62,164,111, 75, 63,  0,  0,  0,  0,154,112,130, 64,183,178,128, 63,
+112,236,188, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 35,233,134, 49,251,110, 17,179,  0,  0,  0,  0, 49,158,141, 50,  1,  0,128, 63,
+126,214,237, 50,  0,  0,  0,  0,155,248, 28,178,199,139, 96,177,254,255,127, 63,  0,  0,  0,  0, 80,136,159,178,192,  4,158,178,
+209,114,143,179,  0,  0,128, 63, 53,236,148,190,222,102, 69,191, 37,255, 16, 63,  0,  0,  0,128, 24,134,116, 63, 57,174, 76,190,
+240,161, 95, 62,  0,  0,  0,128,235, 13, 98,189, 34,194, 26, 63,166,111, 75, 63,  0,  0,  0,128,208, 19, 13, 63,234, 65,102,190,
+ 10, 10,231,192,  0,  0,128, 63,  1,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  5,  0,  1,  0,  0,  0, 68,  0, 79, 66,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,
+169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,229,208, 34, 62,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 65,  0,  0,184,  2,  0,  0,
+ 48,203,  9,  7, 44,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 65, 77, 97,
+116,101,114,105, 97,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,205,204, 76, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 10,215, 35, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,205,204, 76, 62,  0,  0,  8,  0,  1,  0, 50,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,160, 63,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  2,  0, 50,  0,  0,  6,
+  0,  0,128, 63,  0,  0,128, 63, 18,  0, 18,  0, 10,215,163, 59, 10,215,163, 59,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67,  0,  0,  3,  3,  0,  1,  3,  1,  0,  4,  0, 12,  0,  4,  0,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,128, 64,
+  0,  0,  0, 63,205,204,204, 61,  0,  0,  0, 63,205,204,204, 61,205,204,204, 61,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 40,206,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,144,  2,  7,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,205,204, 76, 61,
+205,204,204, 61,102,102,166, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 77, 65,  0,  0,224,  2,  0,  0,128,167, 91,  2,  0,  0,  0,  0, 41,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 65, 77, 97,116,101,114,105,
- 97,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,205,204, 76, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  2,  0,  2,  0, 50,  0,  0,  6,  0,  0,128, 63,  0,  0,128, 63, 18,  0, 18,  0, 10,215,163, 59, 10,215,163, 59,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  1,  3,  3,  0,  1,  3,  1,  0,  4,  0, 12,  0,  4,  0,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,128, 64,  0,  0,  0, 63,205,204,204, 61,  0,  0,  0, 63,205,204,204, 61,205,204,204, 61,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,160,170, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,112,171, 91,  2,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 63,
-205,204, 76, 63,205,204, 76, 63,205,204, 76, 61,205,204,204, 61,102,102,166, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,144,  0,  0,  0,
-160,170, 91,  2,  0,  0,  0,  0, 32,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-224,171, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,144,  0,  0,  0, 40,206,  9,  7, 32,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,224, 45, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,144,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,112,171, 91,  2,  0,  0,  0,  0, 19,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 84, 69,  0,  0, 88,  1,  0,  0,224,171, 91,  2,  0,  0,  0,  0, 37,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 84,101,120,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,144,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,128, 63,
+205,204, 76, 62,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56,144,  2,  7, 19,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69,  0,  0,
+ 40,  1,  0,  0,224, 45, 10,  7, 39,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84, 69, 84,101,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,160, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 64,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 64,  0,  0,  0,  0,  2,  0,  0,  0,
@@ -761,25 +860,21 @@ char datatoc_B_blend[]= {
   8,  0,  0,  0,  1,  0,  1,  0,  3,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
 205,204,204, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 69,  0,  0, 24,  1,  0,  0,
+ 48, 21, 12,  7, 54,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 69, 67,117,
+ 98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,131,  2,  7, 80, 27, 12,  7,  0,  0,  0,  0,
+  0,  0,  0,  0,248,206,  9,  7, 72, 47, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,136, 22, 12,  7,  1,  0,  0,  0,  5,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 24, 12,  7,
+  1,  0,  0,  0,  5,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 25, 12,  7,  1,  0,  0,  0,  5,  0,  0,  0,
+ 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0, 12,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,128, 51,  0,  0,  0,180,  0,  0,  0,  0,  4,  0,128, 63,  4,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  0,  0,  0, 30,  0,  4,  0,  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0, 80,131,  2,  7,  0,  0,  0,  0,  1,  0,  0,  0, 48,203,  9,  7, 68, 65, 84, 65,
+ 84,  1,  0,  0,136, 22, 12,  7, 67,  1,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 69,  0,  0,144,  1,  0,  0,128,173, 91,  2,  0,  0,  0,  0,
- 51,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 77, 69, 67,117, 98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,182, 91,  2,  0,  0,  0,  0,
- 48,182, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,177, 91,  2,  0,  0,  0,  0,
-176,179, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,175, 91,  2,  0,  0,  0,  0,
-  1,  0,  0,  0,  5,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,178, 91,  2,  0,  0,  0,  0,
-  1,  0,  0,  0,  5,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,180, 91,  2,  0,  0,  0,  0,
-  1,  0,  0,  0,  5,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0, 12,  0,  0,  0,
-  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,128, 51,  0,  0,  0,180,  0,  0,  0,  0,  4,  0,128, 63,
-  4,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  0,  0,  0, 30,  0,  4,  0,
-  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  8,  0,  0,  0,
-240,182, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,128,167, 91,  2,  0,  0,  0,  0, 68, 65, 84, 65,104,  1,  0,  0,
- 80,175, 91,  2,  0,  0,  0,  0, 57,  1,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,206,  9,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,177, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -787,18 +882,17 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,192,  0,  0,  0,248,206,  9,  7, 60,  0,  0,  0,  8,  0,  0,  0,  0,  0,128, 63,255,255,127, 63,
+  0,  0,128,191,230, 73,230, 73, 26,182,255,127,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,128,191,  0,  0,128,191,230, 73, 26,182,
+ 26,182,255,127,  1,  0,  0,  0,  1,  0,128,191,253,255,127,191,  0,  0,128,191, 26,182, 26,182, 26,182,255,127,  1,  0,  0,  0,
+250,255,127,191,  3,  0,128, 63,  0,  0,128,191, 26,182,230, 73, 26,182,255,127,  1,  0,  0,  0,  4,  0,128, 63,247,255,127, 63,
+  0,  0,128, 63,230, 73,230, 73,230, 73,255,127,  1,  0,  0,  0,245,255,127, 63,  5,  0,128,191,  0,  0,128, 63,230, 73, 26,182,
+230, 73,255,127,  1,  0,  0,  0,  3,  0,128,191,250,255,127,191,  0,  0,128, 63, 26,182, 26,182,230, 73,255,127,  1,  0,  0,  0,
+255,255,127,191,  0,  0,128, 63,  0,  0,128, 63, 26,182,230, 73,230, 73,255,127,  1,  0,  0,  0, 68, 65, 84, 65, 84,  1,  0,  0,
+ 32, 24, 12,  7, 67,  1,  0,  0,  5,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,192,  0,  0,  0,
-  0,177, 91,  2,  0,  0,  0,  0, 57,  0,  0,  0,  8,  0,  0,  0,  0,  0,128, 63,255,255,127, 63,  0,  0,128,191,230, 73,230, 73,
- 26,182,255,  0,  3,  0,  0,  0,  0,  0,128, 63,  0,  0,128,191,  0,  0,128,191,230, 73, 26,182, 26,182,255,  0,  3,  0,  0,  0,
-  1,  0,128,191,253,255,127,191,  0,  0,128,191, 26,182, 26,182, 26,182,255,  0,  3,  0,  0,  0,250,255,127,191,  3,  0,128, 63,
-  0,  0,128,191, 26,182,230, 73, 26,182,255,  0,  3,  0,  0,  0,  4,  0,128, 63,247,255,127, 63,  0,  0,128, 63,230, 73,230, 73,
-230, 73,255,  0,  3,  0,  0,  0,245,255,127, 63,  5,  0,128,191,  0,  0,128, 63,230, 73, 26,182,230, 73,255,  0,  3,  0,  0,  0,
-  3,  0,128,191,250,255,127,191,  0,  0,128, 63, 26,182, 26,182,230, 73,255,  0,  3,  0,  0,  0,255,255,127,191,  0,  0,128, 63,
-  0,  0,128, 63, 26,182,230, 73,230, 73,255,  0,  3,  0,  0,  0, 68, 65, 84, 65,104,  1,  0,  0,  0,178, 91,  2,  0,  0,  0,  0,
- 57,  1,  0,  0,  5,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 47, 10,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,176,179, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -806,16 +900,15 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,144,  0,  0,  0, 72, 47, 10,  7, 57,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0, 35,  0,
+  0,  0,  0,  0,  3,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0, 35,  0,  1,  0,  0,  0,  2,  0,  0,  0,
+  0,  0, 35,  0,  1,  0,  0,  0,  5,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,
+  6,  0,  0,  0,  0,  0, 35,  0,  3,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0,  4,  0,  0,  0,  5,  0,  0,  0,  0,  0, 35,  0,
+  4,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0,  5,  0,  0,  0,  6,  0,  0,  0,  0,  0, 35,  0,  6,  0,  0,  0,  7,  0,  0,  0,
+  0,  0, 35,  0, 68, 65, 84, 65, 84,  1,  0,  0,184, 25, 12,  7, 67,  1,  0,  0,  5,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,144,  0,  0,  0,176,179, 91,  2,  0,  0,  0,  0,
- 54,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0, 35,  0,
-  0,  0,  0,  0,  4,  0,  0,  0,  0,  0, 35,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,  0, 35,  0,  1,  0,  0,  0,  5,  0,  0,  0,
-  0,  0, 35,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,  6,  0,  0,  0,  0,  0, 35,  0,  3,  0,  0,  0,
-  7,  0,  0,  0,  0,  0, 35,  0,  4,  0,  0,  0,  5,  0,  0,  0,  0,  0, 35,  0,  4,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0,
-  5,  0,  0,  0,  6,  0,  0,  0,  0,  0, 35,  0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0, 68, 65, 84, 65,104,  1,  0,  0,
-128,180, 91,  2,  0,  0,  0,  0, 57,  1,  0,  0,  5,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80, 27, 12,  7,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,182, 91,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -823,29 +916,28 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,120,  0,  0,  0, 80, 27, 12,  7, 56,  0,  0,  0,  6,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  0,  7,  0,  0,  0,  6,  0,  0,  0,
+  5,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  4,  0,  0,  0,  5,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  2,  1,  0,  0,  0,
+  5,  0,  0,  0,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  2,  2,  0,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  3,  0,  0,  0,
+  0,  0,  0,  2,  4,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  2, 85, 83, 69, 82, 56, 11,  0,  0,
+  0,  2, 68,  1,185,  0,  0,  0,  1,  0,  0,  0, 33,152,  1,  0, 63,  2,  0,  0,  5,  0,  0,  0, 47,116,109,112, 47,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,120,  0,  0,  0,
- 48,182, 91,  2,  0,  0,  0,  0, 53,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  2,  4,  0,  0,  0,  7,  0,  0,  0,  6,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  4,  0,  0,  0,
-  5,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  2,  1,  0,  0,  0,  5,  0,  0,  0,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  2,
-  2,  0,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  7,  0,  0,  0,  0,  0,  0,  2, 85, 83, 69, 82, 64, 11,  0,  0, 32, 94,154,  1,  0,  0,  0,  0,178,  0,  0,  0,  1,  0,  0,  0,
- 33,152,  1,  0, 63,  2,  0,  0,  5,  0,  0,  0, 47,116,109,112, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0, 85,115,101,114,115,
+ 47,116,111,110, 47, 68,101,115,107,116,111,112, 47,  0, 45,112,111,119,101,114,112, 99, 47, 98,105,110, 47, 98,108,101,110,100,
+101,114, 46, 97,112,112, 47, 67,111,110,116,101,110,116,115, 47, 82,101,115,111,117,114, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0, 85,115,101,114,115, 47,116,111,110, 47, 68,101,115,107,116,111,112,
- 47,  0, 45,112,111,119,101,114,112, 99, 47, 98,105,110, 47, 98,108,101,110,100,101,114, 46, 97,112,112, 47, 67,111,110,116,101,
-110,116,115, 47, 82,101,115,111,117,114, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -864,8 +956,8 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -874,18 +966,18 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0, 48, 52,  6,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  8,  0,  0,  2,  0,  0,  0, 68,172,  0,  0, 36,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0, 72,  0,  0,  0,  0,  0, 64,  0,  5,  0,  2,  0,168,  3, 10,  7, 40,207, 13,  7, 48, 93,  5,  7,
+ 48, 93,  5,  7,128, 94,  5,  7,128, 94,  5,  7, 32,  0,  0,  0,  1,  0,  2,  0, 25,  0,  0,  0, 20,  0, 20,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63, 30, 90,100,191,154,153,153, 62,102,102,102, 63,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 31,250,254, 62,
+  9,  0,  0, 63,156,153, 25, 63,  0,  0,  0,  0,205,204, 76, 62,205,204, 76, 62,205,204, 76, 62,  0,  0,128, 63, 44,135, 22, 63,
+ 32,133,235, 62,184,243,125, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195, 73, 76, 63, 42,135, 86, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  1, 43,135, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 16, 47, 93, 62, 58,180,200,190, 24, 47, 93,190,
+  0,  0,  0,  0, 14,  0,  0,  0, 25,  0, 15,  0,120,  0, 60,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,144, 31, 15,  0,
+  6,  0, 15,  0,  8,  0, 10,  0,250,  0,  0,  0,100,  0,100,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0, 48, 52,  6,  0,  0,  0,  0,  0,
-  0,  0,  2,  0,  0,  8,  0,  0,  0,  0,  0,  0, 72,  0,  0,  0,  0,  0, 64,  0,  5,  0,  2,  0,192,194, 91,  2,  0,  0,  0,  0,
-192,215, 91,  2,  0,  0,  0,  0,240,195,100,  2,  0,  0,  0,  0,240,195,100,  2,  0,  0,  0,  0, 80, 51,101,  2,  0,  0,  0,  0,
- 80, 51,101,  2,  0,  0,  0,  0, 32,  0,  0,  0,  1,  0,  2,  0, 25,  0,  0,  0, 20,  0, 20,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
- 30, 90,100,191,154,153,153, 62,102,102,102, 63,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 31,250,254, 62,  9,  0,  0, 63,
-156,153, 25, 63,  0,  0,  0,  0,205,204, 76, 62,205,204, 76, 62,205,204, 76, 62,  0,  0,128, 63, 44,135, 22, 63, 32,133,235, 62,
-184,243,125, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195, 73, 76, 63, 42,135, 86, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  1, 43,135, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 16, 47, 93, 62, 58,180,200,190, 24, 47, 93,190,  0,  0,  0,  0,
- 14,  0,  0,  0, 25,  0, 15,  0,120,  0, 60,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,144, 31, 15,  0,  6,  0, 15,  0,
-  8,  0, 10,  0,250,  0,  0,  0,100,  0,100,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -894,983 +986,1025 @@ char datatoc_B_blend[]= {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,192, 20,  0,  0,192,194, 91,  2,  0,  0,  0,  0,176,  0,  0,  0,  1,  0,  0,  0,192,215, 91,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68,101,102, 97,117,108,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,
-  1,  0, 25,  0,231,255,  0,  0, 25, 25, 25,255,153,153,153,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,
-  1,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,255, 70, 70, 70,255, 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,
-  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255, 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,
-  1,  0, 15,  0,241,255,  0,  0, 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,180,180,180,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,
-  1,  0,236,255,  0,  0,  0,  0, 25, 25, 25,255,180,180,180,255,153,153,153,255,128,128,128,255,  0,  0,  0,255,255,255,255,255,
-  1,  0,236,255,  0,  0,  0,  0,  0,  0,  0,255, 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,255,255,255,255,204,204,204,255,
-  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255, 63, 63, 63,255, 86,128,194,255,255,255,255,255,  0,  0,  0,255,  0,  0,  0,255,
-  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255, 25, 25, 25,230, 45, 45, 45,230,100,100,100,255,160,160,160,255,255,255,255,255,
-  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255,  0,  0,  0,  0, 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,
-  0,  0, 38,  0,  0,  0,  0,  0, 25, 25, 25,255,128,128,128,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0, 50, 50, 50,180, 80, 80, 80,180,100,100,100,180,128,128,128,255,  0,  0,  0,255,255,255,255,255,
-  1,  0,  5,  0,251,255,  0,  0,  0,  0,  0,255,  0,  0,  0,  0, 86,128,194,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0,  0,255,
-  0,  0,  0,  0,  0,  0,  0,  0,115,190, 76,255, 90,166, 51,255,240,235,100,255,215,211, 75,255,180,  0,255,255,153,  0,230,255,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,130,130,130,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
-  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 90, 90, 90,255,  0,  0,  0,  0,
-250,250,250,255, 15, 15, 15,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,180,180,180,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,255,140, 25,255,250,250,250,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,130,130,130,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,250,250,255,250,250,250,255,250,250,250,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100,
- 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 79,101, 73,255,135,177,125,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255, 82, 96,110,255,124,137,150,255,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,173,173,173,255,127,112,112,100,
-  0,  0,  0,  0, 91, 91, 91,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,255,140, 25,255, 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255, 96,192, 64,255, 82, 96,110,255,124,137,150,255,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,255,133,  0,255,
-  3,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100,
- 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 79,101, 73,255,135,177,125,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255,
- 96,192, 64,255, 82, 96,110,255,124,137,150,255,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,116,116,116,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 81,105,135,255,109, 88,129,255, 78,152, 62,255,
- 46,143,143,255,169, 84,124,255,126,126, 80,255,162, 95,111,255,109,145,131,255,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 53, 53, 53,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
-  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-255,255,255, 10,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,110,110,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,132,132,132,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255, 94, 94, 94,255,172,172,172,255, 17, 27, 60,100, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,195,195,195,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,153,153,153,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,143,143,143,255,198,119,119,255,
-255,  0,  0,255, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,100,  0,  0,255,  0,  0,200,255,128,  0, 80,255, 95, 95,  0,255,
-  0,100, 50,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,173,173,173,255,127,112,112,100,
-  0,  0,  0,  0, 91, 91, 91,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,  0,  0,  0,  0,
-  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
-  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,
-255,255,255,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,
-200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,
-150,150,150,255,129,131,144,255,127,127,127,255,142,138,145,255,120,145,120,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,100,100,100,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
-  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
-  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,
-255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,
-  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,  0,  0,255,189, 17, 17,255,
-247, 10, 10,255,  0,  0,  0,  0,247, 64, 24,255,246,105, 19,255,250,153,  0,255,  0,  0,  0,  0, 30,145,  9,255, 89,183, 11,255,
-131,239, 29,255,  0,  0,  0,  0, 10, 54,148,255, 54,103,223,255, 94,193,239,255,  0,  0,  0,  0,169, 41, 78,255,193, 65,106,255,
-240, 93,145,255,  0,  0,  0,  0, 67, 12,120,255, 84, 58,163,255,135,100,213,255,  0,  0,  0,  0, 36,120, 90,255, 60,149,121,255,
-111,182,171,255,  0,  0,  0,  0, 75,112,124,255,106,134,145,255,155,194,205,255,  0,  0,  0,  0,244,201, 12,255,238,194, 54,255,
-243,255,  0,255,  0,  0,  0,  0, 30, 32, 36,255, 72, 76, 86,255,255,255,255,255,  0,  0,  0,  0,111, 47,106,255,152, 69,190,255,
-211, 48,214,255,  0,  0,  0,  0,108,142, 34,255,127,176, 34,255,187,239, 91,255,  0,  0,  0,  0,141,141,141,255,176,176,176,255,
-222,222,222,255,  0,  0,  0,  0,131, 67, 38,255,139, 88, 17,255,189,106, 17,255,  0,  0,  0,  0,  8, 49, 14,255, 28, 67, 11,255,
- 52, 98, 43,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,192, 20,  0,  0,
-192,215, 91,  2,  0,  0,  0,  0,176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,194, 91,  2,  0,  0,  0,  0,
- 82,111,117,110,100,101,100,  0,  0,101,119, 32, 85,115,101,114, 32, 84,104,101,109,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,200, 21,  0,  0,168,  3, 10,  7,183,  0,  0,  0,  1,  0,  0,  0, 40,207, 13,  7,  0,  0,  0,  0,
+ 68,101,102, 97,117,108,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
  25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,
- 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  1,  0, 25,  0,231,255,  0,  0,
+ 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  1,  0, 15,  0,241,255,  0,  0,
  25, 25, 25,255,153,153,153,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,  1,  0,  0,  0, 25,  0,  0,  0,
   0,  0,  0,255, 70, 70, 70,255, 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,  1,  0, 15,  0,241,255,  0,  0,
   0,  0,  0,255, 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,  1,  0, 15,  0,241,255,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,
  25, 25, 25,255,180,180,180,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,  1,  0,236,255,  0,  0,  0,  0,
  25, 25, 25,255,180,180,180,255,153,153,153,255,128,128,128,255,  0,  0,  0,255,255,255,255,255,  1,  0,236,255,  0,  0,  0,  0,
   0,  0,  0,255, 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,255,255,255,255,204,204,204,255,  1,  0, 15,  0,241,255,  0,  0,
   0,  0,  0,255, 63, 63, 63,255, 86,128,194,255,255,255,255,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0, 25,  0,236,255,  0,  0,
-  0,  0,  0,255, 25, 25, 25,230, 46,124,217,204,255,255,255,255,255,255,255,255,  0,  0,  0,255,  0,  0, 25,  0,236,255,  0,  0,
+  0,  0,  0,255, 25, 25, 25,230, 45, 45, 45,230,100,100,100,255,160,160,160,255,255,255,255,255,  0,  0, 25,  0,236,255,  0,  0,
   0,  0,  0,255,  0,  0,  0,  0, 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,  0,  0, 38,  0,  0,  0,  0,  0,
+ 25, 25, 25,255,128,128,128,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,
+ 50, 50, 50,180, 80, 80, 80,180,100,100,100,180,128,128,128,255,  0,  0,  0,255,255,255,255,255,  1,  0,  5,  0,251,255,  0,  0,
+  0,  0,  0,255,  0,  0,  0,  0, 86,128,194,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
+115,190, 76,255, 90,166, 51,255,240,235,100,255,215,211, 75,255,180,  0,255,255,153,  0,230,255,  0,  0,  0, 63,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,130,130,130,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 57, 57, 57,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 90, 90, 90,255,  0,  0,  0,  0,250,250,250,255, 15, 15, 15,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,180,180,180,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,255,140, 25,255,250,250,250,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,130,130,130,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,250,250,255,250,250,250,255,250,250,250,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255, 82, 96,110,255,
+124,137,150,255,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
+  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,175,175,175, 51,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-160,160,160,100,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-  0,  0,  0, 51,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0,143,143,143,255,
-  0,  0,  0,255,217,217,217,255,  0,  0,  0, 40,255,255,255,255, 16, 64, 16,255,102,255,102,255,255,130,  0,255,  0,  0,  0,255,
-255,130,  0,255,  0,  0,  0,255,255,255,255,255,230,150, 50,255,255, 32, 32,255,  0,  0,  0,  0,255,255,255, 10,255,130,  0, 60,
-255,138, 48,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,173,173,173,255,127,112,112,100,  0,  0,  0,  0, 91, 91, 91,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
   0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-160,160,160,100,127,112,112,100,255,130,  0,255, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+ 12, 10, 10,128,255,140,  0,255, 96,192, 64,255, 82, 96,110,255,124,137,150,255,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-107,107,107,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,107,107,107,100,143,143,143,100, 96,192, 64,255, 94, 94, 94,255,
-  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255, 79,101, 73,255,135,177,125,255,255,255,255,255,255,255,255,255,
-255,130,  0,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255, 82, 96,110,255,
-124,137,150,255,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-255,255,255,255,255,130,  0,255,  2,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-160,160,160,100,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-158,158,158,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,158,158,158,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,140,140,140,255,127,112,112,100,  0,  0,  0,  0,112,112, 96,255,
-  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,
-255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,178,178,178,100,255,130,  0,100, 94, 94, 94,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
- 79,101, 73,255,135,177,125,255,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,143,143,143,255,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-228,156,198,204,255,255,170,204, 96,192, 64,255, 82, 96,110,255,124,137,150,255,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,143,143,143,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,107,107,107,255,178,178,178,100,255,130,  0,100, 94, 94, 94,255,
-  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,
-255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,228,156,198,255,255,255,170,255, 96,192, 64,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-160,160,160,100,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,130,  0,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,200,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,
+107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255, 96,192, 64,255, 82, 96,110,255,
+124,137,150,255,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
+  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,116,116,116,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 81,105,135,255,109, 88,129,255, 78,152, 62,255, 46,143,143,255,169, 84,124,255,
-126,126, 80,255,162, 95,111,255,109,145,131,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 53, 53, 53,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,195,195,195,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,
-  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,
-255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,
-255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0, 80,200,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+126,126, 80,255,162, 95,111,255,109,145,131,255,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 53, 53, 53,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,255,255,255, 10,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-195,195,195,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-143,143,143,255,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,110,110,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,132,132,132,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+ 94, 94, 94,255,172,172,172,255, 17, 27, 60,100, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,195,195,195,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+153,153,153,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,143,143,143,255,198,119,119,255,255,  0,  0,255, 64, 64, 64,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  4,  0,  0,100,  0,  0,255,  0,  0,200,255,128,  0, 80,255, 95, 95,  0,255,  0,100, 50,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-153,153,153,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,153,153,153,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,143,143,143,255,198,119,119,255,255,  0,  0,255, 88, 88, 88,255,
-  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,
-255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,100,  0,  0,255,  0,  0,200,255,128,  0, 80,255, 95, 95,  0,255,  0,100, 50,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-160,160,160,100,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-158,158,158,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,158,158,158,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,140,140,140,255,127,112,112,100,  0,  0,  0,  0,112,112, 96,255,
-  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,
-255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
-107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0, 51,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-160,160,160,100,127,112,112,100,  0,  0,  0,  0,143,143,143,255,  0,  0,  0,255,217,217,217,255,  0,  0,  0, 40,255,255,255,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,130,  0,255,  0,  0,  0,255,255,130,  0,255,  0,  0,  0,255,255,255,255,255,230,150, 50,255,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,255, 10,255,130,  0, 60,255,138, 48,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,150,150,150,255,129,131,144,255,
-127,127,127,255,142,138,145,255,120,145,120,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-100,100,100,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
-  0,  0,  0, 51,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0,143,143,143,255,
-  0,  0,  0,255,217,217,217,255,  0,  0,  0, 40,255,255,255,255, 16, 64, 16,255,102,255,102,255,255,130,  0,255,  0,  0,  0,255,
-255,130,  0,255,  0,  0,  0,255,255,255,255,255,230,150, 50,255,255, 32, 32,255,  0,  0,  0,  0,255,255,255, 10,255,130,  0, 60,
-255,138, 48,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,173,173,173,255,127,112,112,100,  0,  0,  0,  0, 91, 91, 91,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
   0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,  0,  0,255,189, 17, 17,255,247, 10, 10,255,  0,  0,  0,  0,
-247, 64, 24,255,246,105, 19,255,250,153,  0,255,  0,  0,  0,  0, 30,145,  9,255, 89,183, 11,255,131,239, 29,255,  0,  0,  0,  0,
- 10, 54,148,255, 54,103,223,255, 94,193,239,255,  0,  0,  0,  0,169, 41, 78,255,193, 65,106,255,240, 93,145,255,  0,  0,  0,  0,
- 67, 12,120,255, 84, 58,163,255,135,100,213,255,  0,  0,  0,  0, 36,120, 90,255, 60,149,121,255,111,182,171,255,  0,  0,  0,  0,
- 75,112,124,255,106,134,145,255,155,194,205,255,  0,  0,  0,  0,244,201, 12,255,238,194, 54,255,243,255,  0,255,  0,  0,  0,  0,
- 30, 32, 36,255, 72, 76, 86,255,255,255,255,255,  0,  0,  0,  0,111, 47,106,255,152, 69,190,255,211, 48,214,255,  0,  0,  0,  0,
-108,142, 34,255,127,176, 34,255,187,239, 91,255,  0,  0,  0,  0,141,141,141,255,176,176,176,255,222,222,222,255,  0,  0,  0,  0,
-131, 67, 38,255,139, 88, 17,255,189,106, 17,255,  0,  0,  0,  0,  8, 49, 14,255, 28, 67, 11,255, 52, 98, 43,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,255,255,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,150,150,150,255,129,131,144,255,
+127,127,127,255,142,138,145,255,120,145,120,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+100,100,100,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255, 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,
+255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,255,140, 25,255,
+ 16, 64, 16,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
+255, 32, 32,255, 75, 75, 75,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+154,  0,  0,255,189, 17, 17,255,247, 10, 10,255,  0,  0,  0,  0,247, 64, 24,255,246,105, 19,255,250,153,  0,255,  0,  0,  0,  0,
+ 30,145,  9,255, 89,183, 11,255,131,239, 29,255,  0,  0,  0,  0, 10, 54,148,255, 54,103,223,255, 94,193,239,255,  0,  0,  0,  0,
+169, 41, 78,255,193, 65,106,255,240, 93,145,255,  0,  0,  0,  0, 67, 12,120,255, 84, 58,163,255,135,100,213,255,  0,  0,  0,  0,
+ 36,120, 90,255, 60,149,121,255,111,182,171,255,  0,  0,  0,  0, 75,112,124,255,106,134,145,255,155,194,205,255,  0,  0,  0,  0,
+244,201, 12,255,238,194, 54,255,243,255,  0,255,  0,  0,  0,  0, 30, 32, 36,255, 72, 76, 86,255,255,255,255,255,  0,  0,  0,  0,
+111, 47,106,255,152, 69,190,255,211, 48,214,255,  0,  0,  0,  0,108,142, 34,255,127,176, 34,255,187,239, 91,255,  0,  0,  0,  0,
+141,141,141,255,176,176,176,255,222,222,222,255,  0,  0,  0,  0,131, 67, 38,255,139, 88, 17,255,189,106, 17,255,  0,  0,  0,  0,
+  8, 49, 14,255, 28, 67, 11,255, 52, 98, 43,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 78, 65, 49,224,211,  0,  0, 96,169,184,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0, 83, 68, 78, 65, 78, 65, 77, 69,102, 10,  0,  0, 42,110,101,120,116,  0, 42,112,114,101,118,  0,
- 42,100, 97,116, 97,  0, 42,102,105,114,115,116,  0, 42,108, 97,115,116,  0,120,  0,121,  0,122,  0,119,  0,120,109,105,110,  0,
-120,109, 97,120,  0,121,109,105,110,  0,121,109, 97,120,  0, 42,112,111,105,110,116,101,114,  0,103,114,111,117,112,  0,118, 97,
-108,  0,118, 97,108, 50,  0,116,121,112,101,  0,115,117, 98,116,121,112,101,  0,102,108, 97,103,  0,110, 97,109,101, 91, 51, 50,
- 93,  0,115, 97,118,101,100,  0,100, 97,116, 97,  0,108,101,110,  0,116,111,116, 97,108,108,101,110,  0, 42,110,101,119,105,100,
-  0, 42,108,105, 98,  0,110, 97,109,101, 91, 50, 52, 93,  0,117,115,  0,105, 99,111,110, 95,105,100,  0, 42,112,114,111,112,101,
-114,116,105,101,115,  0,105,100,  0, 42,105,100, 98,108,111, 99,107,  0, 42,102,105,108,101,100, 97,116, 97,  0,110, 97,109,101,
- 91, 50, 52, 48, 93,  0,102,105,108,101,110, 97,109,101, 91, 50, 52, 48, 93,  0,116,111,116,  0,112, 97,100,  0, 42,112, 97,114,
-101,110,116,  0,119, 91, 50, 93,  0,104, 91, 50, 93,  0, 99,104, 97,110,103,101,100, 91, 50, 93,  0,112, 97,100, 48,  0,112, 97,
-100, 49,  0, 42,114,101, 99,116, 91, 50, 93,  0, 42,111, 98,  0, 98,108,111, 99,107,116,121,112,101,  0, 97,100,114, 99,111,100,
-101,  0,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 98,112,  0, 42, 98,101,122,116,  0,109, 97,120,114, 99,116,  0,116,111,116,
-114, 99,116,  0,118, 97,114,116,121,112,101,  0,116,111,116,118,101,114,116,  0,105,112,111,  0,101,120,116,114, 97,112,  0,114,
-116,  0, 98,105,116,109, 97,115,107,  0,115,108,105,100,101, 95,109,105,110,  0,115,108,105,100,101, 95,109, 97,120,  0, 99,117,
-114,118, 97,108,  0, 42,100,114,105,118,101,114,  0, 99,117,114,118,101,  0, 99,117,114,  0,115,104,111,119,107,101,121,  0,109,
-117,116,101,105,112,111,  0,112,111,115,  0,114,101,108, 97,116,105,118,101,  0,116,111,116,101,108,101,109,  0,112, 97,100, 50,
-  0, 42,119,101,105,103,104,116,115,  0,118,103,114,111,117,112, 91, 51, 50, 93,  0,115,108,105,100,101,114,109,105,110,  0,115,
-108,105,100,101,114,109, 97,120,  0, 42, 97,100,116,  0, 42,114,101,102,107,101,121,  0,101,108,101,109,115,116,114, 91, 51, 50,
- 93,  0,101,108,101,109,115,105,122,101,  0, 98,108,111, 99,107,  0, 42,105,112,111,  0, 42,102,114,111,109,  0,116,111,116,107,
-101,121,  0,115,108,117,114,112,104,  0, 42,108,105,110,101,  0, 42,102,111,114,109, 97,116,  0, 98,108,101,110,  0,108,105,110,
-101,110,111,  0,115,116, 97,114,116,  0,101,110,100,  0,102,108, 97,103,115,  0, 99,111,108,111,114, 91, 52, 93,  0,112, 97,100,
- 91, 52, 93,  0, 42,110, 97,109,101,  0,110,108,105,110,101,115,  0,108,105,110,101,115,  0, 42, 99,117,114,108,  0, 42,115,101,
-108,108,  0, 99,117,114, 99,  0,115,101,108, 99,  0,109, 97,114,107,101,114,115,  0, 42,117,110,100,111, 95, 98,117,102,  0,117,
-110,100,111, 95,112,111,115,  0,117,110,100,111, 95,108,101,110,  0, 42, 99,111,109,112,105,108,101,100,  0,109,116,105,109,101,
-  0,115,105,122,101,  0,115,101,101,107,  0,112, 97,115,115,101,112, 97,114,116, 97,108,112,104, 97,  0, 97,110,103,108,101,  0,
- 99,108,105,112,115,116, 97,  0, 99,108,105,112,101,110,100,  0,108,101,110,115,  0,111,114,116,104,111, 95,115, 99, 97,108,101,
-  0,100,114, 97,119,115,105,122,101,  0,115,104,105,102,116,120,  0,115,104,105,102,116,121,  0, 89, 70, 95,100,111,102,100,105,
-115,116,  0, 89, 70, 95, 97,112,101,114,116,117,114,101,  0, 89, 70, 95, 98,107,104,116,121,112,101,  0, 89, 70, 95, 98,107,104,
- 98,105, 97,115,  0, 89, 70, 95, 98,107,104,114,111,116,  0, 42,100,111,102, 95,111, 98,  0,102,114, 97,109,101,110,114,  0,102,
-114, 97,109,101,115,  0,111,102,102,115,101,116,  0,115,102,114, 97,  0,102,105,101, 95,105,109, 97,  0, 99,121, 99,108,  0,111,
-107,  0,109,117,108,116,105, 95,105,110,100,101,120,  0,108, 97,121,101,114,  0,112, 97,115,115,  0,109,101,110,117,110,114,  0,
- 42,115, 99,101,110,101,  0,105, 98,117,102,115,  0, 42,103,112,117,116,101,120,116,117,114,101,  0, 42, 97,110,105,109,  0, 42,
-114,114,  0,115,111,117,114, 99,101,  0,108, 97,115,116,102,114, 97,109,101,  0,116,112, 97,103,101,102,108, 97,103,  0,116,111,
-116, 98,105,110,100,  0,120,114,101,112,  0,121,114,101,112,  0,116,119,115,116, 97,  0,116,119,101,110,100,  0, 98,105,110,100,
- 99,111,100,101,  0, 42,114,101,112, 98,105,110,100,  0, 42,112, 97, 99,107,101,100,102,105,108,101,  0, 42,112,114,101,118,105,
-101,119,  0, 42,114,101,110,100,101,114, 95,116,101,120,116,  0,108, 97,115,116,117,112,100, 97,116,101,  0,108, 97,115,116,117,
-115,101,100,  0, 97,110,105,109,115,112,101,101,100,  0,103,101,110, 95,120,  0,103,101,110, 95,121,  0,103,101,110, 95,116,121,
-112,101,  0, 97,115,112,120,  0, 97,115,112,121,  0,116,101,120, 99,111,  0,109, 97,112,116,111,  0,109, 97,112,116,111,110,101,
-103,  0, 98,108,101,110,100,116,121,112,101,  0, 42,111, 98,106,101, 99,116,  0, 42,116,101,120,  0,117,118,110, 97,109,101, 91,
- 51, 50, 93,  0,112,114,111,106,120,  0,112,114,111,106,121,  0,112,114,111,106,122,  0,109, 97,112,112,105,110,103,  0,111,102,
-115, 91, 51, 93,  0,115,105,122,101, 91, 51, 93,  0,116,101,120,102,108, 97,103,  0, 99,111,108,111,114,109,111,100,101,108,  0,
-112,109, 97,112,116,111,  0,112,109, 97,112,116,111,110,101,103,  0,110,111,114,109, 97,112,115,112, 97, 99,101,  0,119,104,105,
- 99,104, 95,111,117,116,112,117,116,  0,112, 97,100, 91, 50, 93,  0,114,  0,103,  0, 98,  0,107,  0,100,101,102, 95,118, 97,114,
-  0, 99,111,108,102, 97, 99,  0,110,111,114,102, 97, 99,  0,118, 97,114,102, 97, 99,  0,100,105,115,112,102, 97, 99,  0,119, 97,
-114,112,102, 97, 99,  0,110, 97,109,101, 91, 49, 54, 48, 93,  0, 42,104, 97,110,100,108,101,  0, 42,112,110, 97,109,101,  0, 42,
-115,116,110, 97,109,101,115,  0,115,116,121,112,101,115,  0,118, 97,114,115,  0, 42,118, 97,114,115,116,114,  0, 42,114,101,115,
-117,108,116,  0, 42, 99,102,114, 97,  0,100, 97,116, 97, 91, 51, 50, 93,  0, 40, 42,100,111,105,116, 41, 40, 41,  0, 40, 42,105,
-110,115,116, 97,110, 99,101, 95,105,110,105,116, 41, 40, 41,  0, 40, 42, 99, 97,108,108, 98, 97, 99,107, 41, 40, 41,  0,118,101,
-114,115,105,111,110,  0, 97,  0,105,112,111,116,121,112,101,  0, 42,105,109, 97,  0, 42, 99,117, 98,101, 91, 54, 93,  0,105,109,
- 97,116, 91, 52, 93, 91, 52, 93,  0,111, 98,105,109, 97,116, 91, 51, 93, 91, 51, 93,  0,115,116,121,112,101,  0,118,105,101,119,
-115, 99, 97,108,101,  0,110,111,116,108, 97,121,  0, 99,117, 98,101,114,101,115,  0,100,101,112,116,104,  0,114,101, 99, 97,108,
- 99,  0,108, 97,115,116,115,105,122,101,  0,110,111,105,115,101,115,105,122,101,  0,116,117,114, 98,117,108,  0, 98,114,105,103,
-104,116,  0, 99,111,110,116,114, 97,115,116,  0,114,102, 97, 99,  0,103,102, 97, 99,  0, 98,102, 97, 99,  0,102,105,108,116,101,
-114,115,105,122,101,  0,109,103, 95, 72,  0,109,103, 95,108, 97, 99,117,110, 97,114,105,116,121,  0,109,103, 95,111, 99,116, 97,
-118,101,115,  0,109,103, 95,111,102,102,115,101,116,  0,109,103, 95,103, 97,105,110,  0,100,105,115,116, 95, 97,109,111,117,110,
-116,  0,110,115, 95,111,117,116,115, 99, 97,108,101,  0,118,110, 95,119, 49,  0,118,110, 95,119, 50,  0,118,110, 95,119, 51,  0,
-118,110, 95,119, 52,  0,118,110, 95,109,101,120,112,  0,118,110, 95,100,105,115,116,109,  0,118,110, 95, 99,111,108,116,121,112,
-101,  0,110,111,105,115,101,100,101,112,116,104,  0,110,111,105,115,101,116,121,112,101,  0,110,111,105,115,101, 98, 97,115,105,
-115,  0,110,111,105,115,101, 98, 97,115,105,115, 50,  0,105,109, 97,102,108, 97,103,  0, 99,114,111,112,120,109,105,110,  0, 99,
-114,111,112,121,109,105,110,  0, 99,114,111,112,120,109, 97,120,  0, 99,114,111,112,121,109, 97,120,  0,116,101,120,102,105,108,
-116,101,114,  0, 97,102,109, 97,120,  0,120,114,101,112,101, 97,116,  0,121,114,101,112,101, 97,116,  0,101,120,116,101,110,100,
-  0, 99,104,101, 99,107,101,114,100,105,115,116,  0,110, 97, 98,108, 97,  0,105,117,115,101,114,  0, 42,110,111,100,101,116,114,
-101,101,  0, 42,112,108,117,103,105,110,  0, 42, 99,111, 98, 97,  0, 42,101,110,118,  0,117,115,101, 95,110,111,100,101,115,  0,
-112, 97,100, 91, 55, 93,  0,108,111, 99, 91, 51, 93,  0,114,111,116, 91, 51, 93,  0,109, 97,116, 91, 52, 93, 91, 52, 93,  0,109,
-105,110, 91, 51, 93,  0,109, 97,120, 91, 51, 93,  0,109,111,100,101,  0,116,111,116,101,120,  0,115,104,100,119,114,  0,115,104,
-100,119,103,  0,115,104,100,119, 98,  0,115,104,100,119,112, 97,100,  0,101,110,101,114,103,121,  0,100,105,115,116,  0,115,112,
-111,116,115,105,122,101,  0,115,112,111,116, 98,108,101,110,100,  0,104, 97,105,110,116,  0, 97,116,116, 49,  0, 97,116,116, 50,
-  0, 42, 99,117,114,102, 97,108,108,111,102,102,  0,102, 97,108,108,111,102,102, 95,116,121,112,101,  0,115,104, 97,100,115,112,
-111,116,115,105,122,101,  0, 98,105, 97,115,  0,115,111,102,116,  0, 98,117,102,115,105,122,101,  0,115, 97,109,112,  0, 98,117,
-102,102,101,114,115,  0,102,105,108,116,101,114,116,121,112,101,  0, 98,117,102,102,108, 97,103,  0, 98,117,102,116,121,112,101,
-  0,114, 97,121, 95,115, 97,109,112,  0,114, 97,121, 95,115, 97,109,112,121,  0,114, 97,121, 95,115, 97,109,112,122,  0,114, 97,
-121, 95,115, 97,109,112, 95,116,121,112,101,  0, 97,114,101, 97, 95,115,104, 97,112,101,  0, 97,114,101, 97, 95,115,105,122,101,
-  0, 97,114,101, 97, 95,115,105,122,101,121,  0, 97,114,101, 97, 95,115,105,122,101,122,  0, 97,100, 97,112,116, 95,116,104,114,
-101,115,104,  0,114, 97,121, 95,115, 97,109,112, 95,109,101,116,104,111,100,  0,116,101,120, 97, 99,116,  0,115,104, 97,100,104,
- 97,108,111,115,116,101,112,  0,115,117,110, 95,101,102,102,101, 99,116, 95,116,121,112,101,  0,115,107,121, 98,108,101,110,100,
-116,121,112,101,  0,104,111,114,105,122,111,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,112,114,101, 97,100,  0,115,
-117,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,117,110, 95,115,105,122,101,  0, 98, 97, 99,107,115, 99, 97,116,116,
-101,114,101,100, 95,108,105,103,104,116,  0,115,117,110, 95,105,110,116,101,110,115,105,116,121,  0, 97,116,109, 95,116,117,114,
- 98,105,100,105,116,121,  0, 97,116,109, 95,105,110,115, 99, 97,116,116,101,114,105,110,103, 95,102, 97, 99,116,111,114,  0, 97,
-116,109, 95,101,120,116,105,110, 99,116,105,111,110, 95,102, 97, 99,116,111,114,  0, 97,116,109, 95,100,105,115,116, 97,110, 99,
-101, 95,102, 97, 99,116,111,114,  0,115,107,121, 98,108,101,110,100,102, 97, 99,  0,115,107,121, 95,101,120,112,111,115,117,114,
-101,  0,115,107,121, 95, 99,111,108,111,114,115,112, 97, 99,101,  0,112, 97,100, 52,  0, 89, 70, 95,110,117,109,112,104,111,116,
-111,110,115,  0, 89, 70, 95,110,117,109,115,101, 97,114, 99,104,  0, 89, 70, 95,112,104,100,101,112,116,104,  0, 89, 70, 95,117,
-115,101,113,109, 99,  0, 89, 70, 95, 98,117,102,115,105,122,101,  0, 89, 70, 95,112, 97,100,  0, 89, 70, 95, 99, 97,117,115,116,
-105, 99, 98,108,117,114,  0, 89, 70, 95,108,116,114, 97,100,105,117,115,  0, 89, 70, 95,103,108,111,119,105,110,116,  0, 89, 70,
- 95,103,108,111,119,111,102,115,  0, 89, 70, 95,103,108,111,119,116,121,112,101,  0, 89, 70, 95,112, 97,100, 50,  0, 42,109,116,
-101,120, 91, 49, 56, 93,  0,112,114, 95,116,101,120,116,117,114,101,  0,112, 97,100, 91, 51, 93,  0,109, 97,116,101,114,105, 97,
-108, 95,116,121,112,101,  0,115,112,101, 99,114,  0,115,112,101, 99,103,  0,115,112,101, 99, 98,  0,109,105,114,114,  0,109,105,
-114,103,  0,109,105,114, 98,  0, 97,109, 98,114,  0, 97,109, 98, 98,  0, 97,109, 98,103,  0, 97,109, 98,  0,101,109,105,116,  0,
- 97,110,103,  0,115,112,101, 99,116,114, 97,  0,114, 97,121, 95,109,105,114,114,111,114,  0, 97,108,112,104, 97,  0,114,101,102,
-  0,115,112,101, 99,  0,122,111,102,102,115,  0, 97,100,100,  0,116,114, 97,110,115,108,117, 99,101,110, 99,121,  0,102,114,101,
-115,110,101,108, 95,109,105,114,  0,102,114,101,115,110,101,108, 95,109,105,114, 95,105,  0,102,114,101,115,110,101,108, 95,116,
-114, 97,  0,102,114,101,115,110,101,108, 95,116,114, 97, 95,105,  0,102,105,108,116,101,114,  0,116,120, 95,108,105,109,105,116,
-  0,116,120, 95,102, 97,108,108,111,102,102,  0,114, 97,121, 95,100,101,112,116,104,  0,114, 97,121, 95,100,101,112,116,104, 95,
-116,114, 97,  0,104, 97,114,  0,115,101,101,100, 49,  0,115,101,101,100, 50,  0,103,108,111,115,115, 95,109,105,114,  0,103,108,
-111,115,115, 95,116,114, 97,  0,115, 97,109,112, 95,103,108,111,115,115, 95,109,105,114,  0,115, 97,109,112, 95,103,108,111,115,
-115, 95,116,114, 97,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104, 95,109,105,114,  0, 97,100, 97,112,116, 95,116,104,114,
-101,115,104, 95,116,114, 97,  0, 97,110,105,115,111, 95,103,108,111,115,115, 95,109,105,114,  0,100,105,115,116, 95,109,105,114,
-  0,102, 97,100,101,116,111, 95,109,105,114,  0,115,104, 97,100,101, 95,102,108, 97,103,  0,109,111,100,101, 95,108,  0,102,108,
- 97,114,101, 99,  0,115,116, 97,114, 99,  0,108,105,110,101, 99,  0,114,105,110,103, 99,  0,104, 97,115,105,122,101,  0,102,108,
- 97,114,101,115,105,122,101,  0,115,117, 98,115,105,122,101,  0,102,108, 97,114,101, 98,111,111,115,116,  0,115,116,114, 97,110,
-100, 95,115,116, 97,  0,115,116,114, 97,110,100, 95,101,110,100,  0,115,116,114, 97,110,100, 95,101, 97,115,101,  0,115,116,114,
- 97,110,100, 95,115,117,114,102,110,111,114,  0,115,116,114, 97,110,100, 95,109,105,110,  0,115,116,114, 97,110,100, 95,119,105,
-100,116,104,102, 97,100,101,  0,115,116,114, 97,110,100, 95,117,118,110, 97,109,101, 91, 51, 50, 93,  0,115, 98,105, 97,115,  0,
-108, 98,105, 97,115,  0,115,104, 97,100, 95, 97,108,112,104, 97,  0,115,101,112,116,101,120,  0,114,103, 98,115,101,108,  0,112,
-114, 95,116,121,112,101,  0,112,114, 95, 98, 97, 99,107,  0,112,114, 95,108, 97,109,112,  0,109,108, 95,102,108, 97,103,  0,100,
-105,102,102, 95,115,104, 97,100,101,114,  0,115,112,101, 99, 95,115,104, 97,100,101,114,  0,114,111,117,103,104,110,101,115,115,
-  0,114,101,102,114, 97, 99,  0,112, 97,114, 97,109, 91, 52, 93,  0,114,109,115,  0,100, 97,114,107,110,101,115,115,  0, 42,114,
- 97,109,112, 95, 99,111,108,  0, 42,114, 97,109,112, 95,115,112,101, 99,  0,114, 97,109,112,105,110, 95, 99,111,108,  0,114, 97,
-109,112,105,110, 95,115,112,101, 99,  0,114, 97,109,112, 98,108,101,110,100, 95, 99,111,108,  0,114, 97,109,112, 98,108,101,110,
-100, 95,115,112,101, 99,  0,114, 97,109,112, 95,115,104,111,119,  0,112, 97,100, 51,  0,114, 97,109,112,102, 97, 99, 95, 99,111,
-108,  0,114, 97,109,112,102, 97, 99, 95,115,112,101, 99,  0, 42,103,114,111,117,112,  0,102,114,105, 99,116,105,111,110,  0,102,
-104,  0,114,101,102,108,101, 99,116,  0,102,104,100,105,115,116,  0,120,121,102,114,105, 99,116,  0,100,121,110, 97,109,111,100,
-101,  0,115,115,115, 95,114, 97,100,105,117,115, 91, 51, 93,  0,115,115,115, 95, 99,111,108, 91, 51, 93,  0,115,115,115, 95,101,
-114,114,111,114,  0,115,115,115, 95,115, 99, 97,108,101,  0,115,115,115, 95,105,111,114,  0,115,115,115, 95, 99,111,108,102, 97,
- 99,  0,115,115,115, 95,116,101,120,102, 97, 99,  0,115,115,115, 95,102,114,111,110,116,  0,115,115,115, 95, 98, 97, 99,107,  0,
-115,115,115, 95,102,108, 97,103,  0,115,115,115, 95,112,114,101,115,101,116,  0, 89, 70, 95, 97,114,  0, 89, 70, 95, 97,103,  0,
- 89, 70, 95, 97, 98,  0, 89, 70, 95,100,115, 99, 97,108,101,  0, 89, 70, 95,100,112,119,114,  0, 89, 70, 95,100,115,109,112,  0,
- 89, 70, 95,112,114,101,115,101,116,  0, 89, 70, 95,100,106,105,116,  0,103,112,117,109, 97,116,101,114,105, 97,108,  0,110, 97,
-109,101, 91, 50, 53, 54, 93,  0, 42, 98, 98,  0,105, 49,  0,106, 49,  0,107, 49,  0,105, 50,  0,106, 50,  0,107, 50,  0,115,101,
-108, 99,111,108, 49,  0,115,101,108, 99,111,108, 50,  0,113,117, 97,116, 91, 52, 93,  0,101,120,112,120,  0,101,120,112,121,  0,
-101,120,112,122,  0,114, 97,100,  0,114, 97,100, 50,  0,115,  0, 42,109, 97,116,  0, 42,105,109, 97,116,  0,101,108,101,109,115,
-  0,100,105,115,112,  0, 42,101,100,105,116,101,108,101,109,115,  0, 42, 42,109, 97,116,  0,116,111,116, 99,111,108,  0,119,105,
+ 68, 65, 84, 65,200, 21,  0,  0, 40,207, 13,  7,183,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,168,  3, 10,  7, 82,111,117,110,
+100,101,100,  0,  0,101,119, 32, 85,115,101,114, 32, 84,104,101,109,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,
+153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,
+153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  1,  0, 25,  0,231,255,  0,  0, 25, 25, 25,255,
+153,153,153,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,  1,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,255,
+ 70, 70, 70,255, 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255,
+ 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,
+180,180,180,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,  1,  0,236,255,  0,  0,  0,  0, 25, 25, 25,255,
+180,180,180,255,153,153,153,255,128,128,128,255,  0,  0,  0,255,255,255,255,255,  1,  0,236,255,  0,  0,  0,  0,  0,  0,  0,255,
+ 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,255,255,255,255,204,204,204,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255,
+ 63, 63, 63,255, 86,128,194,255,255,255,255,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255,
+ 25, 25, 25,230, 46,124,217,204,255,255,255,255,255,255,255,255,  0,  0,  0,255,  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255,
+  0,  0,  0,  0, 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,175,175,175, 51,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,
+127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0, 51,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0,143,143,143,255,  0,  0,  0,255,
+217,217,217,255,  0,  0,  0, 40,255,255,255,255, 16, 64, 16,255,102,255,102,255,255,130,  0,255,  0,  0,  0,255,255,130,  0,255,
+  0,  0,  0,255,255,255,255,255,230,150, 50,255,255, 32, 32,255,  0,  0,  0,  0,255,255,255, 10,255,130,  0, 60,255,138, 48,255,
+ 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,
+127,112,112,100,255,130,  0,255, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,107,107,107,150,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,107,107,107,100,143,143,143,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,
+255,136,255,255,  0,  0,  0,  0,255,187,255,255, 79,101, 73,255,135,177,125,255,255,255,255,255,255,255,255,255,255,130,  0,255,
+  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255, 82, 96,110,255,124,137,150,255,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,
+255,130,  0,255,  2,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,
+127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,158,158,158,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,158,158,158,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,140,140,140,255,127,112,112,100,  0,  0,  0,  0,112,112, 96,255,  0,  0,  0,255,
+255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,
+  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+178,178,178,100,255,130,  0,100, 94, 94, 94,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255, 79,101, 73,255,
+135,177,125,255,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,143,143,143,255,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,228,156,198,204,
+255,255,170,204, 96,192, 64,255, 82, 96,110,255,124,137,150,255,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,143,143,143,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,107,107,107,255,178,178,178,100,255,130,  0,100, 94, 94, 94,255,  0,  0,  0,255,
+255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,
+  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,228,156,198,255,255,255,170,255, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,
+127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,130,  0,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,200,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 81,105,135,255,109, 88,129,255, 78,152, 62,255, 46,143,143,255,169, 84,124,255,126,126, 80,255,
+162, 95,111,255,109,145,131,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 53, 53, 53,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,195,195,195,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,
+255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,
+  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,255,133,  0,255,
+  0,  0,  0,  0,  0,  0,  0,  0, 80,200,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,195,195,195,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,143,143,143,255,
+127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,153,153,153,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,153,153,153,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,143,143,143,255,198,119,119,255,255,  0,  0,255, 88, 88, 88,255,  0,  0,  0,255,
+255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,
+  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,100,  0,  0,255,  0,  0,200,255,128,  0, 80,255, 95, 95,  0,255,  0,100, 50,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,
+127,112,112,100,  0,  0,  0,  0, 88, 88, 88,255,  0,  0,  0,255,255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,158,158,158,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,158,158,158,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,150,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,140,140,140,255,127,112,112,100,  0,  0,  0,  0,112,112, 96,255,  0,  0,  0,255,
+255,136,255,255,  0,  0,  0,  0,255,187,255,255,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,112,255,255,255,255,112,255,
+  0,  0,  0,255,144,144, 48,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,150, 30,200,100,200, 60,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0, 51,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,
+127,112,112,100,  0,  0,  0,  0,143,143,143,255,  0,  0,  0,255,217,217,217,255,  0,  0,  0, 40,255,255,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,130,  0,255,  0,  0,  0,255,255,130,  0,255,  0,  0,  0,255,255,255,255,255,230,150, 50,255,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255, 10,255,130,  0, 60,255,138, 48,255, 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,150,150,150,255,129,131,144,255,127,127,127,255,
+142,138,145,255,120,145,120,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,100,100,255,
+  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,107,107,107,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0, 51,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0,143,143,143,255,  0,  0,  0,255,
+217,217,217,255,  0,  0,  0, 40,255,255,255,255, 16, 64, 16,255,102,255,102,255,255,130,  0,255,  0,  0,  0,255,255,130,  0,255,
+  0,  0,  0,255,255,255,255,255,230,150, 50,255,255, 32, 32,255,  0,  0,  0,  0,255,255,255, 10,255,130,  0, 60,255,138, 48,255,
+ 34,221,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,245,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,
+  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,  0,  0,255,
+189, 17, 17,255,247, 10, 10,255,  0,  0,  0,  0,247, 64, 24,255,246,105, 19,255,250,153,  0,255,  0,  0,  0,  0, 30,145,  9,255,
+ 89,183, 11,255,131,239, 29,255,  0,  0,  0,  0, 10, 54,148,255, 54,103,223,255, 94,193,239,255,  0,  0,  0,  0,169, 41, 78,255,
+193, 65,106,255,240, 93,145,255,  0,  0,  0,  0, 67, 12,120,255, 84, 58,163,255,135,100,213,255,  0,  0,  0,  0, 36,120, 90,255,
+ 60,149,121,255,111,182,171,255,  0,  0,  0,  0, 75,112,124,255,106,134,145,255,155,194,205,255,  0,  0,  0,  0,244,201, 12,255,
+238,194, 54,255,243,255,  0,255,  0,  0,  0,  0, 30, 32, 36,255, 72, 76, 86,255,255,255,255,255,  0,  0,  0,  0,111, 47,106,255,
+152, 69,190,255,211, 48,214,255,  0,  0,  0,  0,108,142, 34,255,127,176, 34,255,187,239, 91,255,  0,  0,  0,  0,141,141,141,255,
+176,176,176,255,222,222,222,255,  0,  0,  0,  0,131, 67, 38,255,139, 88, 17,255,189,106, 17,255,  0,  0,  0,  0,  8, 49, 14,255,
+ 28, 67, 11,255, 52, 98, 43,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 78, 65, 49,
+ 28,222,  0,  0, 32, 80,  6,  7,  0,  0,  0,  0,  1,  0,  0,  0, 83, 68, 78, 65, 78, 65, 77, 69,212, 10,  0,  0, 42,110,101,120,
+116,  0, 42,112,114,101,118,  0, 42,100, 97,116, 97,  0, 42,102,105,114,115,116,  0, 42,108, 97,115,116,  0,120,  0,121,  0,122,
+  0,119,  0,120,109,105,110,  0,120,109, 97,120,  0,121,109,105,110,  0,121,109, 97,120,  0, 42,112,111,105,110,116,101,114,  0,
+103,114,111,117,112,  0,118, 97,108,  0,118, 97,108, 50,  0,116,121,112,101,  0,115,117, 98,116,121,112,101,  0,102,108, 97,103,
+  0,110, 97,109,101, 91, 51, 50, 93,  0,115, 97,118,101,100,  0,100, 97,116, 97,  0,108,101,110,  0,116,111,116, 97,108,108,101,
+110,  0, 42,110,101,119,105,100,  0, 42,108,105, 98,  0,110, 97,109,101, 91, 50, 52, 93,  0,117,115,  0,105, 99,111,110, 95,105,
+100,  0, 42,112,114,111,112,101,114,116,105,101,115,  0,105,100,  0, 42,105,100, 98,108,111, 99,107,  0, 42,102,105,108,101,100,
+ 97,116, 97,  0,110, 97,109,101, 91, 50, 52, 48, 93,  0,102,105,108,101,110, 97,109,101, 91, 50, 52, 48, 93,  0,116,111,116,  0,
+112, 97,100,  0, 42,112, 97,114,101,110,116,  0,119, 91, 50, 93,  0,104, 91, 50, 93,  0, 99,104, 97,110,103,101,100, 91, 50, 93,
+  0,112, 97,100, 48,  0,112, 97,100, 49,  0, 42,114,101, 99,116, 91, 50, 93,  0, 42,111, 98,  0, 98,108,111, 99,107,116,121,112,
+101,  0, 97,100,114, 99,111,100,101,  0,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 98,112,  0, 42, 98,101,122,116,  0,109, 97,
+120,114, 99,116,  0,116,111,116,114, 99,116,  0,118, 97,114,116,121,112,101,  0,116,111,116,118,101,114,116,  0,105,112,111,  0,
+101,120,116,114, 97,112,  0,114,116,  0, 98,105,116,109, 97,115,107,  0,115,108,105,100,101, 95,109,105,110,  0,115,108,105,100,
+101, 95,109, 97,120,  0, 99,117,114,118, 97,108,  0, 42,100,114,105,118,101,114,  0, 99,117,114,118,101,  0, 99,117,114,  0,115,
+104,111,119,107,101,121,  0,109,117,116,101,105,112,111,  0,112,111,115,  0,114,101,108, 97,116,105,118,101,  0,116,111,116,101,
+108,101,109,  0,112, 97,100, 50,  0, 42,119,101,105,103,104,116,115,  0,118,103,114,111,117,112, 91, 51, 50, 93,  0,115,108,105,
+100,101,114,109,105,110,  0,115,108,105,100,101,114,109, 97,120,  0, 42, 97,100,116,  0, 42,114,101,102,107,101,121,  0,101,108,
+101,109,115,116,114, 91, 51, 50, 93,  0,101,108,101,109,115,105,122,101,  0, 98,108,111, 99,107,  0, 42,105,112,111,  0, 42,102,
+114,111,109,  0,116,111,116,107,101,121,  0,115,108,117,114,112,104,  0, 42,108,105,110,101,  0, 42,102,111,114,109, 97,116,  0,
+ 98,108,101,110,  0,108,105,110,101,110,111,  0,115,116, 97,114,116,  0,101,110,100,  0,102,108, 97,103,115,  0, 99,111,108,111,
+114, 91, 52, 93,  0,112, 97,100, 91, 52, 93,  0, 42,110, 97,109,101,  0,110,108,105,110,101,115,  0,108,105,110,101,115,  0, 42,
+ 99,117,114,108,  0, 42,115,101,108,108,  0, 99,117,114, 99,  0,115,101,108, 99,  0,109, 97,114,107,101,114,115,  0, 42,117,110,
+100,111, 95, 98,117,102,  0,117,110,100,111, 95,112,111,115,  0,117,110,100,111, 95,108,101,110,  0, 42, 99,111,109,112,105,108,
+101,100,  0,109,116,105,109,101,  0,115,105,122,101,  0,115,101,101,107,  0,112, 97,115,115,101,112, 97,114,116, 97,108,112,104,
+ 97,  0, 97,110,103,108,101,  0, 99,108,105,112,115,116, 97,  0, 99,108,105,112,101,110,100,  0,108,101,110,115,  0,111,114,116,
+104,111, 95,115, 99, 97,108,101,  0,100,114, 97,119,115,105,122,101,  0,115,104,105,102,116,120,  0,115,104,105,102,116,121,  0,
+ 89, 70, 95,100,111,102,100,105,115,116,  0, 89, 70, 95, 97,112,101,114,116,117,114,101,  0, 89, 70, 95, 98,107,104,116,121,112,
+101,  0, 89, 70, 95, 98,107,104, 98,105, 97,115,  0, 89, 70, 95, 98,107,104,114,111,116,  0, 42,100,111,102, 95,111, 98,  0,102,
+114, 97,109,101,110,114,  0,102,114, 97,109,101,115,  0,111,102,102,115,101,116,  0,115,102,114, 97,  0,102,105,101, 95,105,109,
+ 97,  0, 99,121, 99,108,  0,111,107,  0,109,117,108,116,105, 95,105,110,100,101,120,  0,108, 97,121,101,114,  0,112, 97,115,115,
+  0,109,101,110,117,110,114,  0, 42,115, 99,101,110,101,  0,105, 98,117,102,115,  0, 42,103,112,117,116,101,120,116,117,114,101,
+  0, 42, 97,110,105,109,  0, 42,114,114,  0,115,111,117,114, 99,101,  0,108, 97,115,116,102,114, 97,109,101,  0,116,112, 97,103,
+101,102,108, 97,103,  0,116,111,116, 98,105,110,100,  0,120,114,101,112,  0,121,114,101,112,  0,116,119,115,116, 97,  0,116,119,
+101,110,100,  0, 98,105,110,100, 99,111,100,101,  0, 42,114,101,112, 98,105,110,100,  0, 42,112, 97, 99,107,101,100,102,105,108,
+101,  0, 42,112,114,101,118,105,101,119,  0, 42,114,101,110,100,101,114, 95,116,101,120,116,  0,108, 97,115,116,117,112,100, 97,
+116,101,  0,108, 97,115,116,117,115,101,100,  0, 97,110,105,109,115,112,101,101,100,  0,103,101,110, 95,120,  0,103,101,110, 95,
+121,  0,103,101,110, 95,116,121,112,101,  0, 97,115,112,120,  0, 97,115,112,121,  0,116,101,120, 99,111,  0,109, 97,112,116,111,
+  0,109, 97,112,116,111,110,101,103,  0, 98,108,101,110,100,116,121,112,101,  0, 42,111, 98,106,101, 99,116,  0, 42,116,101,120,
+  0,117,118,110, 97,109,101, 91, 51, 50, 93,  0,112,114,111,106,120,  0,112,114,111,106,121,  0,112,114,111,106,122,  0,109, 97,
+112,112,105,110,103,  0,111,102,115, 91, 51, 93,  0,115,105,122,101, 91, 51, 93,  0,114,111,116,  0,116,101,120,102,108, 97,103,
+  0, 99,111,108,111,114,109,111,100,101,108,  0,112,109, 97,112,116,111,  0,112,109, 97,112,116,111,110,101,103,  0,110,111,114,
+109, 97,112,115,112, 97, 99,101,  0,119,104,105, 99,104, 95,111,117,116,112,117,116,  0, 98,114,117,115,104, 95,109, 97,112, 95,
+109,111,100,101,  0,112, 97,100, 91, 55, 93,  0,114,  0,103,  0, 98,  0,107,  0,100,101,102, 95,118, 97,114,  0, 99,111,108,102,
+ 97, 99,  0,110,111,114,102, 97, 99,  0,118, 97,114,102, 97, 99,  0,100,105,115,112,102, 97, 99,  0,119, 97,114,112,102, 97, 99,
+  0,110, 97,109,101, 91, 49, 54, 48, 93,  0, 42,104, 97,110,100,108,101,  0, 42,112,110, 97,109,101,  0, 42,115,116,110, 97,109,
+101,115,  0,115,116,121,112,101,115,  0,118, 97,114,115,  0, 42,118, 97,114,115,116,114,  0, 42,114,101,115,117,108,116,  0, 42,
+ 99,102,114, 97,  0,100, 97,116, 97, 91, 51, 50, 93,  0, 40, 42,100,111,105,116, 41, 40, 41,  0, 40, 42,105,110,115,116, 97,110,
+ 99,101, 95,105,110,105,116, 41, 40, 41,  0, 40, 42, 99, 97,108,108, 98, 97, 99,107, 41, 40, 41,  0,118,101,114,115,105,111,110,
+  0, 97,  0,105,112,111,116,121,112,101,  0, 42,105,109, 97,  0, 42, 99,117, 98,101, 91, 54, 93,  0,105,109, 97,116, 91, 52, 93,
+ 91, 52, 93,  0,111, 98,105,109, 97,116, 91, 51, 93, 91, 51, 93,  0,115,116,121,112,101,  0,118,105,101,119,115, 99, 97,108,101,
+  0,110,111,116,108, 97,121,  0, 99,117, 98,101,114,101,115,  0,100,101,112,116,104,  0,114,101, 99, 97,108, 99,  0,108, 97,115,
+116,115,105,122,101,  0,102, 97,108,108,111,102,102, 95,116,121,112,101,  0,102, 97,108,108,111,102,102, 95,115,111,102,116,110,
+101,115,115,  0,114, 97,100,105,117,115,  0, 99,111,108,111,114, 95,115,111,117,114, 99,101,  0,116,111,116,112,111,105,110,116,
+115,  0,112,100,112, 97,100,  0, 42,112,115,121,115,  0,112,115,121,115, 95, 99, 97, 99,104,101, 95,115,112, 97, 99,101,  0,111,
+ 98, 95, 99, 97, 99,104,101, 95,115,112, 97, 99,101,  0,112,100,112, 97,100, 50, 91, 50, 93,  0, 42,112,111,105,110,116, 95,116,
+114,101,101,  0, 42,112,111,105,110,116, 95,100, 97,116, 97,  0,110,111,105,115,101, 95,115,105,122,101,  0,110,111,105,115,101,
+ 95,100,101,112,116,104,  0,110,111,105,115,101, 95,105,110,102,108,117,101,110, 99,101,  0,110,111,105,115,101, 95, 98, 97,115,
+105,115,  0,112,100,112, 97,100, 51, 91, 51, 93,  0,110,111,105,115,101, 95,102, 97, 99,  0,115,112,101,101,100, 95,115, 99, 97,
+108,101,  0, 42, 99,111, 98, 97,  0,114,101,115,111,108, 91, 51, 93,  0,105,110,116,101,114,112, 95,116,121,112,101,  0,102,105,
+108,101, 95,102,111,114,109, 97,116,  0,105,110,116, 95,109,117,108,116,105,112,108,105,101,114,  0,115,116,105,108,108, 95,102,
+114, 97,109,101,  0,115,111,117,114, 99,101, 95,112, 97,116,104, 91, 50, 52, 48, 93,  0, 42,100, 97,116, 97,115,101,116,  0,110,
+111,105,115,101,115,105,122,101,  0,116,117,114, 98,117,108,  0, 98,114,105,103,104,116,  0, 99,111,110,116,114, 97,115,116,  0,
+114,102, 97, 99,  0,103,102, 97, 99,  0, 98,102, 97, 99,  0,102,105,108,116,101,114,115,105,122,101,  0,109,103, 95, 72,  0,109,
+103, 95,108, 97, 99,117,110, 97,114,105,116,121,  0,109,103, 95,111, 99,116, 97,118,101,115,  0,109,103, 95,111,102,102,115,101,
+116,  0,109,103, 95,103, 97,105,110,  0,100,105,115,116, 95, 97,109,111,117,110,116,  0,110,115, 95,111,117,116,115, 99, 97,108,
+101,  0,118,110, 95,119, 49,  0,118,110, 95,119, 50,  0,118,110, 95,119, 51,  0,118,110, 95,119, 52,  0,118,110, 95,109,101,120,
+112,  0,118,110, 95,100,105,115,116,109,  0,118,110, 95, 99,111,108,116,121,112,101,  0,110,111,105,115,101,100,101,112,116,104,
+  0,110,111,105,115,101,116,121,112,101,  0,110,111,105,115,101, 98, 97,115,105,115,  0,110,111,105,115,101, 98, 97,115,105,115,
+ 50,  0,105,109, 97,102,108, 97,103,  0, 99,114,111,112,120,109,105,110,  0, 99,114,111,112,121,109,105,110,  0, 99,114,111,112,
+120,109, 97,120,  0, 99,114,111,112,121,109, 97,120,  0,116,101,120,102,105,108,116,101,114,  0, 97,102,109, 97,120,  0,120,114,
+101,112,101, 97,116,  0,121,114,101,112,101, 97,116,  0,101,120,116,101,110,100,  0, 99,104,101, 99,107,101,114,100,105,115,116,
+  0,110, 97, 98,108, 97,  0,105,117,115,101,114,  0, 42,110,111,100,101,116,114,101,101,  0, 42,112,108,117,103,105,110,  0, 42,
+101,110,118,  0, 42,112,100,  0, 42,118,100,  0,117,115,101, 95,110,111,100,101,115,  0,108,111, 99, 91, 51, 93,  0,114,111,116,
+ 91, 51, 93,  0,109, 97,116, 91, 52, 93, 91, 52, 93,  0,109,105,110, 91, 51, 93,  0,109, 97,120, 91, 51, 93,  0,109,111,100,101,
+  0,116,111,116,101,120,  0,115,104,100,119,114,  0,115,104,100,119,103,  0,115,104,100,119, 98,  0,115,104,100,119,112, 97,100,
+  0,101,110,101,114,103,121,  0,100,105,115,116,  0,115,112,111,116,115,105,122,101,  0,115,112,111,116, 98,108,101,110,100,  0,
+104, 97,105,110,116,  0, 97,116,116, 49,  0, 97,116,116, 50,  0, 42, 99,117,114,102, 97,108,108,111,102,102,  0,115,104, 97,100,
+115,112,111,116,115,105,122,101,  0, 98,105, 97,115,  0,115,111,102,116,  0, 98,117,102,115,105,122,101,  0,115, 97,109,112,  0,
+ 98,117,102,102,101,114,115,  0,102,105,108,116,101,114,116,121,112,101,  0, 98,117,102,102,108, 97,103,  0, 98,117,102,116,121,
+112,101,  0,114, 97,121, 95,115, 97,109,112,  0,114, 97,121, 95,115, 97,109,112,121,  0,114, 97,121, 95,115, 97,109,112,122,  0,
+114, 97,121, 95,115, 97,109,112, 95,116,121,112,101,  0, 97,114,101, 97, 95,115,104, 97,112,101,  0, 97,114,101, 97, 95,115,105,
+122,101,  0, 97,114,101, 97, 95,115,105,122,101,121,  0, 97,114,101, 97, 95,115,105,122,101,122,  0, 97,100, 97,112,116, 95,116,
+104,114,101,115,104,  0,114, 97,121, 95,115, 97,109,112, 95,109,101,116,104,111,100,  0,116,101,120, 97, 99,116,  0,115,104, 97,
+100,104, 97,108,111,115,116,101,112,  0,115,117,110, 95,101,102,102,101, 99,116, 95,116,121,112,101,  0,115,107,121, 98,108,101,
+110,100,116,121,112,101,  0,104,111,114,105,122,111,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,112,114,101, 97,100,
+  0,115,117,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,117,110, 95,115,105,122,101,  0, 98, 97, 99,107,115, 99, 97,
+116,116,101,114,101,100, 95,108,105,103,104,116,  0,115,117,110, 95,105,110,116,101,110,115,105,116,121,  0, 97,116,109, 95,116,
+117,114, 98,105,100,105,116,121,  0, 97,116,109, 95,105,110,115, 99, 97,116,116,101,114,105,110,103, 95,102, 97, 99,116,111,114,
+  0, 97,116,109, 95,101,120,116,105,110, 99,116,105,111,110, 95,102, 97, 99,116,111,114,  0, 97,116,109, 95,100,105,115,116, 97,
+110, 99,101, 95,102, 97, 99,116,111,114,  0,115,107,121, 98,108,101,110,100,102, 97, 99,  0,115,107,121, 95,101,120,112,111,115,
+117,114,101,  0,115,107,121, 95, 99,111,108,111,114,115,112, 97, 99,101,  0,112, 97,100, 52,  0, 89, 70, 95,110,117,109,112,104,
+111,116,111,110,115,  0, 89, 70, 95,110,117,109,115,101, 97,114, 99,104,  0, 89, 70, 95,112,104,100,101,112,116,104,  0, 89, 70,
+ 95,117,115,101,113,109, 99,  0, 89, 70, 95, 98,117,102,115,105,122,101,  0, 89, 70, 95,112, 97,100,  0, 89, 70, 95, 99, 97,117,
+115,116,105, 99, 98,108,117,114,  0, 89, 70, 95,108,116,114, 97,100,105,117,115,  0, 89, 70, 95,103,108,111,119,105,110,116,  0,
+ 89, 70, 95,103,108,111,119,111,102,115,  0, 89, 70, 95,103,108,111,119,116,121,112,101,  0, 89, 70, 95,112, 97,100, 50,  0, 42,
+109,116,101,120, 91, 49, 56, 93,  0,112,114, 95,116,101,120,116,117,114,101,  0,112, 97,100, 91, 51, 93,  0,100,101,110,115,105,
+116,121,  0,101,109,105,115,115,105,111,110,  0, 97, 98,115,111,114,112,116,105,111,110,  0,115, 99, 97,116,116,101,114,105,110,
+103,  0,101,109,105,115,115,105,111,110, 95, 99,111,108, 91, 51, 93,  0, 97, 98,115,111,114,112,116,105,111,110, 95, 99,111,108,
+ 91, 51, 93,  0,100,101,110,115,105,116,121, 95,115, 99, 97,108,101,  0,100,101,112,116,104, 95, 99,117,116,111,102,102,  0,112,
+104, 97,115,101,102,117,110, 99, 95,116,121,112,101,  0,118,112, 97,100, 91, 51, 93,  0,112,104, 97,115,101,102,117,110, 99, 95,
+103,  0,115,116,101,112,115,105,122,101,  0,115,104, 97,100,101, 95,115,116,101,112,115,105,122,101,  0,115,116,101,112,115,105,
+122,101, 95,116,121,112,101,  0,115,104, 97,100,101,102,108, 97,103,  0,115,104, 97,100,101, 95,116,121,112,101,  0,112,114,101,
+ 99, 97, 99,104,101, 95,114,101,115,111,108,117,116,105,111,110,  0,109,115, 95,100,105,102,102,  0,109,115, 95,105,110,116,101,
+110,115,105,116,121,  0,109,115, 95,115,116,101,112,115,  0,109, 97,116,101,114,105, 97,108, 95,116,121,112,101,  0,115,112,101,
+ 99,114,  0,115,112,101, 99,103,  0,115,112,101, 99, 98,  0,109,105,114,114,  0,109,105,114,103,  0,109,105,114, 98,  0, 97,109,
+ 98,114,  0, 97,109, 98, 98,  0, 97,109, 98,103,  0, 97,109, 98,  0,101,109,105,116,  0, 97,110,103,  0,115,112,101, 99,116,114,
+ 97,  0,114, 97,121, 95,109,105,114,114,111,114,  0, 97,108,112,104, 97,  0,114,101,102,  0,115,112,101, 99,  0,122,111,102,102,
+115,  0, 97,100,100,  0,116,114, 97,110,115,108,117, 99,101,110, 99,121,  0,118,111,108,  0,102,114,101,115,110,101,108, 95,109,
+105,114,  0,102,114,101,115,110,101,108, 95,109,105,114, 95,105,  0,102,114,101,115,110,101,108, 95,116,114, 97,  0,102,114,101,
+115,110,101,108, 95,116,114, 97, 95,105,  0,102,105,108,116,101,114,  0,116,120, 95,108,105,109,105,116,  0,116,120, 95,102, 97,
+108,108,111,102,102,  0,114, 97,121, 95,100,101,112,116,104,  0,114, 97,121, 95,100,101,112,116,104, 95,116,114, 97,  0,104, 97,
+114,  0,115,101,101,100, 49,  0,115,101,101,100, 50,  0,103,108,111,115,115, 95,109,105,114,  0,103,108,111,115,115, 95,116,114,
+ 97,  0,115, 97,109,112, 95,103,108,111,115,115, 95,109,105,114,  0,115, 97,109,112, 95,103,108,111,115,115, 95,116,114, 97,  0,
+ 97,100, 97,112,116, 95,116,104,114,101,115,104, 95,109,105,114,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104, 95,116,114,
+ 97,  0, 97,110,105,115,111, 95,103,108,111,115,115, 95,109,105,114,  0,100,105,115,116, 95,109,105,114,  0,102, 97,100,101,116,
+111, 95,109,105,114,  0,115,104, 97,100,101, 95,102,108, 97,103,  0,109,111,100,101, 95,108,  0,102,108, 97,114,101, 99,  0,115,
+116, 97,114, 99,  0,108,105,110,101, 99,  0,114,105,110,103, 99,  0,104, 97,115,105,122,101,  0,102,108, 97,114,101,115,105,122,
+101,  0,115,117, 98,115,105,122,101,  0,102,108, 97,114,101, 98,111,111,115,116,  0,115,116,114, 97,110,100, 95,115,116, 97,  0,
+115,116,114, 97,110,100, 95,101,110,100,  0,115,116,114, 97,110,100, 95,101, 97,115,101,  0,115,116,114, 97,110,100, 95,115,117,
+114,102,110,111,114,  0,115,116,114, 97,110,100, 95,109,105,110,  0,115,116,114, 97,110,100, 95,119,105,100,116,104,102, 97,100,
+101,  0,115,116,114, 97,110,100, 95,117,118,110, 97,109,101, 91, 51, 50, 93,  0,115, 98,105, 97,115,  0,108, 98,105, 97,115,  0,
+115,104, 97,100, 95, 97,108,112,104, 97,  0,115,101,112,116,101,120,  0,114,103, 98,115,101,108,  0,112,114, 95,116,121,112,101,
+  0,112,114, 95, 98, 97, 99,107,  0,112,114, 95,108, 97,109,112,  0,109,108, 95,102,108, 97,103,  0,100,105,102,102, 95,115,104,
+ 97,100,101,114,  0,115,112,101, 99, 95,115,104, 97,100,101,114,  0,114,111,117,103,104,110,101,115,115,  0,114,101,102,114, 97,
+ 99,  0,112, 97,114, 97,109, 91, 52, 93,  0,114,109,115,  0,100, 97,114,107,110,101,115,115,  0, 42,114, 97,109,112, 95, 99,111,
+108,  0, 42,114, 97,109,112, 95,115,112,101, 99,  0,114, 97,109,112,105,110, 95, 99,111,108,  0,114, 97,109,112,105,110, 95,115,
+112,101, 99,  0,114, 97,109,112, 98,108,101,110,100, 95, 99,111,108,  0,114, 97,109,112, 98,108,101,110,100, 95,115,112,101, 99,
+  0,114, 97,109,112, 95,115,104,111,119,  0,112, 97,100, 51,  0,114, 97,109,112,102, 97, 99, 95, 99,111,108,  0,114, 97,109,112,
+102, 97, 99, 95,115,112,101, 99,  0, 42,103,114,111,117,112,  0,102,114,105, 99,116,105,111,110,  0,102,104,  0,114,101,102,108,
+101, 99,116,  0,102,104,100,105,115,116,  0,120,121,102,114,105, 99,116,  0,100,121,110, 97,109,111,100,101,  0,115,115,115, 95,
+114, 97,100,105,117,115, 91, 51, 93,  0,115,115,115, 95, 99,111,108, 91, 51, 93,  0,115,115,115, 95,101,114,114,111,114,  0,115,
+115,115, 95,115, 99, 97,108,101,  0,115,115,115, 95,105,111,114,  0,115,115,115, 95, 99,111,108,102, 97, 99,  0,115,115,115, 95,
+116,101,120,102, 97, 99,  0,115,115,115, 95,102,114,111,110,116,  0,115,115,115, 95, 98, 97, 99,107,  0,115,115,115, 95,102,108,
+ 97,103,  0,115,115,115, 95,112,114,101,115,101,116,  0, 89, 70, 95, 97,114,  0, 89, 70, 95, 97,103,  0, 89, 70, 95, 97, 98,  0,
+ 89, 70, 95,100,115, 99, 97,108,101,  0, 89, 70, 95,100,112,119,114,  0, 89, 70, 95,100,115,109,112,  0, 89, 70, 95,112,114,101,
+115,101,116,  0, 89, 70, 95,100,106,105,116,  0,103,112,117,109, 97,116,101,114,105, 97,108,  0,110, 97,109,101, 91, 50, 53, 54,
+ 93,  0, 42, 98, 98,  0,105, 49,  0,106, 49,  0,107, 49,  0,105, 50,  0,106, 50,  0,107, 50,  0,115,101,108, 99,111,108, 49,  0,
+115,101,108, 99,111,108, 50,  0,113,117, 97,116, 91, 52, 93,  0,101,120,112,120,  0,101,120,112,121,  0,101,120,112,122,  0,114,
+ 97,100,  0,114, 97,100, 50,  0,115,  0, 42,109, 97,116,  0, 42,105,109, 97,116,  0,101,108,101,109,115,  0,100,105,115,112,  0,
+ 42,101,100,105,116,101,108,101,109,115,  0, 42, 42,109, 97,116,  0,102,108, 97,103, 50,  0,116,111,116, 99,111,108,  0,119,105,
 114,101,115,105,122,101,  0,114,101,110,100,101,114,115,105,122,101,  0,116,104,114,101,115,104,  0, 42,108, 97,115,116,101,108,
-101,109,  0,118,101, 99, 91, 51, 93, 91, 51, 93,  0, 97,108,102, 97,  0,119,101,105,103,104,116,  0,114, 97,100,105,117,115,  0,
-104, 49,  0,104, 50,  0,102, 49,  0,102, 50,  0,102, 51,  0,104,105,100,101,  0,118,101, 99, 91, 52, 93,  0,109, 97,116, 95,110,
-114,  0,112,110,116,115,117,  0,112,110,116,115,118,  0,114,101,115,111,108,117,  0,114,101,115,111,108,118,  0,111,114,100,101,
-114,117,  0,111,114,100,101,114,118,  0,102,108, 97,103,117,  0,102,108, 97,103,118,  0, 42,107,110,111,116,115,117,  0, 42,107,
-110,111,116,115,118,  0,116,105,108,116, 95,105,110,116,101,114,112,  0,114, 97,100,105,117,115, 95,105,110,116,101,114,112,  0,
- 99,104, 97,114,105,100,120,  0,107,101,114,110,  0,104,  0,110,117,114, 98,  0, 42,101,100,105,116,110,117,114, 98,  0, 42, 98,
-101,118,111, 98,106,  0, 42,116, 97,112,101,114,111, 98,106,  0, 42,116,101,120,116,111,110, 99,117,114,118,101,  0, 42,112, 97,
-116,104,  0, 42,107,101,121,  0, 98,101,118,  0,112, 97,116,104,108,101,110,  0, 98,101,118,114,101,115,111,108,  0,119,105,100,
-116,104,  0,101,120,116, 49,  0,101,120,116, 50,  0,114,101,115,111,108,117, 95,114,101,110,  0,114,101,115,111,108,118, 95,114,
-101,110,  0, 97, 99,116,110,117,  0, 42,108, 97,115,116,115,101,108, 98,112,  0,115,112, 97, 99,101,109,111,100,101,  0,115,112,
- 97, 99,105,110,103,  0,108,105,110,101,100,105,115,116,  0,115,104,101, 97,114,  0,102,115,105,122,101,  0,119,111,114,100,115,
-112, 97, 99,101,  0,117,108,112,111,115,  0,117,108,104,101,105,103,104,116,  0,120,111,102,  0,121,111,102,  0,108,105,110,101,
-119,105,100,116,104,  0, 42,115,116,114,  0, 42,115,101,108, 98,111,120,101,115,  0, 42,101,100,105,116,102,111,110,116,  0,102,
- 97,109,105,108,121, 91, 50, 52, 93,  0, 42,118,102,111,110,116,  0, 42,118,102,111,110,116, 98,  0, 42,118,102,111,110,116,105,
-  0, 42,118,102,111,110,116, 98,105,  0,115,101,112, 99,104, 97,114,  0, 99,116,105,109,101,  0,116,111,116, 98,111,120,  0, 97,
- 99,116, 98,111,120,  0, 42,116, 98,  0,115,101,108,115,116, 97,114,116,  0,115,101,108,101,110,100,  0, 42,115,116,114,105,110,
-102,111,  0, 99,117,114,105,110,102,111,  0,101,102,102,101, 99,116,  0, 42,109,102, 97, 99,101,  0, 42,109,116,102, 97, 99,101,
-  0, 42,116,102, 97, 99,101,  0, 42,109,118,101,114,116,  0, 42,109,101,100,103,101,  0, 42,100,118,101,114,116,  0, 42,109, 99,
-111,108,  0, 42,109,115,116,105, 99,107,121,  0, 42,116,101,120, 99,111,109,101,115,104,  0, 42,109,115,101,108,101, 99,116,  0,
- 42,101,100,105,116, 95,109,101,115,104,  0,118,100, 97,116, 97,  0,101,100, 97,116, 97,  0,102,100, 97,116, 97,  0,116,111,116,
-101,100,103,101,  0,116,111,116,102, 97, 99,101,  0,116,111,116,115,101,108,101, 99,116,  0, 97, 99,116, 95,102, 97, 99,101,  0,
- 99,117, 98,101,109, 97,112,115,105,122,101,  0,100,114, 97,119,102,108, 97,103,  0,115,109,111,111,116,104,114,101,115,104,  0,
-115,117, 98,100,105,118,  0,115,117, 98,100,105,118,114,  0,115,117, 98,115,117,114,102,116,121,112,101,  0, 42,109,114,  0, 42,
-112,118,  0, 42,116,112, 97,103,101,  0,117,118, 91, 52, 93, 91, 50, 93,  0, 99,111,108, 91, 52, 93,  0,116,114, 97,110,115,112,
-  0,116,105,108,101,  0,117,110,119,114, 97,112,  0,118, 49,  0,118, 50,  0,118, 51,  0,118, 52,  0,101,100, 99,111,100,101,  0,
- 99,114,101, 97,115,101,  0, 98,119,101,105,103,104,116,  0,100,101,102, 95,110,114,  0, 42,100,119,  0,116,111,116,119,101,105,
-103,104,116,  0, 99,111, 91, 51, 93,  0,110,111, 91, 51, 93,  0,117,118, 91, 50, 93,  0, 99,111, 91, 50, 93,  0,105,110,100,101,
-120,  0,102,  0,105,  0,115, 91, 50, 53, 54, 93,  0,116,111,116,100,105,115,112,  0, 40, 42,100,105,115,112,115, 41, 40, 41,  0,
-118, 91, 52, 93,  0,109,105,100,  0,118, 91, 50, 93,  0, 42,102, 97, 99,101,115,  0, 42, 99,111,108,102, 97, 99,101,115,  0, 42,
-101,100,103,101,115,  0, 42,118,101,114,116,115,  0,108,101,118,101,108,115,  0,108,101,118,101,108, 95, 99,111,117,110,116,  0,
- 99,117,114,114,101,110,116,  0,110,101,119,108,118,108,  0,101,100,103,101,108,118,108,  0,112,105,110,108,118,108,  0,114,101,
-110,100,101,114,108,118,108,  0,117,115,101, 95, 99,111,108,  0, 42,101,100,103,101, 95,102,108, 97,103,115,  0, 42,101,100,103,
-101, 95, 99,114,101, 97,115,101,115,  0, 42,118,101,114,116, 95,109, 97,112,  0, 42,101,100,103,101, 95,109, 97,112,  0, 42,111,
-108,100, 95,102, 97, 99,101,115,  0, 42,111,108,100, 95,101,100,103,101,115,  0, 42,101,114,114,111,114,  0,109,111,100,105,102,
-105,101,114,  0,115,117, 98,100,105,118, 84,121,112,101,  0,114,101,110,100,101,114, 76,101,118,101,108,115,  0, 42,101,109, 67,
- 97, 99,104,101,  0, 42,109, 67, 97, 99,104,101,  0,100,101,102, 97,120,105,115,  0,112, 97,100, 91, 54, 93,  0,108,101,110,103,
-116,104,  0,114, 97,110,100,111,109,105,122,101,  0,115,101,101,100,  0, 42,111, 98, 95, 97,114,109,  0, 42,115,116, 97,114,116,
- 95, 99, 97,112,  0, 42,101,110,100, 95, 99, 97,112,  0, 42, 99,117,114,118,101, 95,111, 98,  0, 42,111,102,102,115,101,116, 95,
-111, 98,  0,111,102,102,115,101,116, 91, 51, 93,  0,115, 99, 97,108,101, 91, 51, 93,  0,109,101,114,103,101, 95,100,105,115,116,
-  0,102,105,116, 95,116,121,112,101,  0,111,102,102,115,101,116, 95,116,121,112,101,  0, 99,111,117,110,116,  0, 97,120,105,115,
-  0,116,111,108,101,114, 97,110, 99,101,  0, 42,109,105,114,114,111,114, 95,111, 98,  0,115,112,108,105,116, 95, 97,110,103,108,
-101,  0,118, 97,108,117,101,  0,114,101,115,  0,118, 97,108, 95,102,108, 97,103,115,  0,108,105,109, 95,102,108, 97,103,115,  0,
-101, 95,102,108, 97,103,115,  0, 98,101,118,101,108, 95, 97,110,103,108,101,  0,100,101,102,103,114,112, 95,110, 97,109,101, 91,
- 51, 50, 93,  0, 42,116,101,120,116,117,114,101,  0,115,116,114,101,110,103,116,104,  0,100,105,114,101, 99,116,105,111,110,  0,
-109,105,100,108,101,118,101,108,  0,116,101,120,109, 97,112,112,105,110,103,  0, 42,109, 97,112, 95,111, 98,106,101, 99,116,  0,
-117,118,108, 97,121,101,114, 95,110, 97,109,101, 91, 51, 50, 93,  0,117,118,108, 97,121,101,114, 95,116,109,112,  0, 42,112,114,
-111,106,101, 99,116,111,114,115, 91, 49, 48, 93,  0, 42,105,109, 97,103,101,  0,110,117,109, 95,112,114,111,106,101, 99,116,111,
-114,115,  0, 97,115,112,101, 99,116,120,  0, 97,115,112,101, 99,116,121,  0,112,101,114, 99,101,110,116,  0,102, 97, 99,101, 67,
-111,117,110,116,  0,102, 97, 99,  0,114,101,112,101, 97,116,  0, 42,111, 98,106,101, 99,116, 99,101,110,116,101,114,  0,115,116,
- 97,114,116,120,  0,115,116, 97,114,116,121,  0,104,101,105,103,104,116,  0,110, 97,114,114,111,119,  0,115,112,101,101,100,  0,
-100, 97,109,112,  0,102, 97,108,108,111,102,102,  0,116,105,109,101,111,102,102,115,  0,108,105,102,101,116,105,109,101,  0,100,
-101,102,111,114,109,102,108, 97,103,  0,109,117,108,116,105,  0, 42,112,114,101,118, 67,111,115,  0,112, 97,114,101,110,116,105,
-110,118, 91, 52, 93, 91, 52, 93,  0, 99,101,110,116, 91, 51, 93,  0, 42,105,110,100,101,120, 97,114,  0,116,111,116,105,110,100,
-101,120,  0,102,111,114, 99,101,  0, 42, 99,108,111,116,104, 79, 98,106,101, 99,116,  0, 42,115,105,109, 95,112, 97,114,109,115,
-  0, 42, 99,111,108,108, 95,112, 97,114,109,115,  0, 42,112,111,105,110,116, 95, 99, 97, 99,104,101,  0, 42,120,  0, 42,120,110,
-101,119,  0, 42,120,111,108,100,  0, 42, 99,117,114,114,101,110,116, 95,120,110,101,119,  0, 42, 99,117,114,114,101,110,116, 95,
-120,  0, 42, 99,117,114,114,101,110,116, 95,118,  0, 42,109,102, 97, 99,101,115,  0,110,117,109,118,101,114,116,115,  0,110,117,
-109,102, 97, 99,101,115,  0, 97, 98,115,111,114,112,116,105,111,110,  0,116,105,109,101,  0, 42, 98,118,104,116,114,101,101,  0,
- 42,118,  0, 42,100,109,  0, 99,102,114, 97,  0,111,112,101,114, 97,116,105,111,110,  0,118,101,114,116,101,120,  0,116,111,116,
-105,110,102,108,117,101,110, 99,101,  0,103,114,105,100,115,105,122,101,  0,110,101,101,100, 98,105,110,100,  0, 42, 98,105,110,
-100,119,101,105,103,104,116,115,  0, 42, 98,105,110,100, 99,111,115,  0,116,111,116, 99, 97,103,101,118,101,114,116,  0, 42,100,
-121,110,103,114,105,100,  0, 42,100,121,110,105,110,102,108,117,101,110, 99,101,115,  0, 42,100,121,110,118,101,114,116,115,  0,
- 42,112, 97,100, 50,  0,100,121,110,103,114,105,100,115,105,122,101,  0,100,121,110, 99,101,108,108,109,105,110, 91, 51, 93,  0,
-100,121,110, 99,101,108,108,119,105,100,116,104,  0, 98,105,110,100,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42,112,115,121,115,
-  0,116,111,116,100,109,118,101,114,116,  0,116,111,116,100,109,101,100,103,101,  0,116,111,116,100,109,102, 97, 99,101,  0,112,
-115,121,115,  0,112,111,115,105,116,105,111,110,  0,114, 97,110,100,111,109, 95,112,111,115,105,116,105,111,110,  0, 42,102, 97,
- 99,101,112, 97,  0,118,103,114,111,117,112,  0,112,114,111,116,101, 99,116,  0, 42,117,110,100,111, 95,118,101,114,116,115,  0,
-117,110,100,111, 95,118,101,114,116,115, 95,116,111,116,  0,117,110,100,111, 95,115,105,103,110, 97,108,  0,108,118,108,  0,116,
-111,116,108,118,108,  0,115,105,109,112,108,101,  0, 42,102,115,115,  0, 42,116, 97,114,103,101,116,  0, 42, 97,117,120, 84, 97,
-114,103,101,116,  0,118,103,114,111,117,112, 95,110, 97,109,101, 91, 51, 50, 93,  0,107,101,101,112, 68,105,115,116,  0,115,104,
-114,105,110,107, 84,121,112,101,  0,115,104,114,105,110,107, 79,112,116,115,  0,112,114,111,106, 65,120,105,115,  0,115,117, 98,
-115,117,114,102, 76,101,118,101,108,115,  0, 42,111,114,105,103,105,110,  0,102, 97, 99,116,111,114,  0,108,105,109,105,116, 91,
- 50, 93,  0,111,114,105,103,105,110, 79,112,116,115,  0,112,110,116,115,119,  0,111,112,110,116,115,117,  0,111,112,110,116,115,
-118,  0,111,112,110,116,115,119,  0,116,121,112,101,117,  0,116,121,112,101,118,  0,116,121,112,101,119,  0,102,117,  0,102,118,
-  0,102,119,  0,100,117,  0,100,118,  0,100,119,  0, 42,100,101,102,  0, 42,108, 97,116,116,105, 99,101,100, 97,116, 97,  0,108,
- 97,116,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42,101,100,105,116,108, 97,116,116,  0,118,101, 99, 91, 56, 93, 91, 51, 93,  0,
-112, 97,114,116,121,112,101,  0,112, 97,114, 49,  0,112, 97,114, 50,  0,112, 97,114, 51,  0,112, 97,114,115,117, 98,115,116,114,
- 91, 51, 50, 93,  0, 42,116,114, 97, 99,107,  0, 42,112,114,111,120,121,  0, 42,112,114,111,120,121, 95,103,114,111,117,112,  0,
- 42,112,114,111,120,121, 95,102,114,111,109,  0, 42, 97, 99,116,105,111,110,  0, 42,112,111,115,101,108,105, 98,  0, 42,112,111,
-115,101,  0, 99,111,110,115,116,114, 97,105,110,116, 67,104, 97,110,110,101,108,115,  0,100,101,102, 98, 97,115,101,  0,109,111,
-100,105,102,105,101,114,115,  0, 42,109, 97,116, 98,105,116,115,  0, 97, 99,116, 99,111,108,  0,100,108,111, 99, 91, 51, 93,  0,
-111,114,105,103, 91, 51, 93,  0,100,115,105,122,101, 91, 51, 93,  0,100,114,111,116, 91, 51, 93,  0,111, 98,109, 97,116, 91, 52,
- 93, 91, 52, 93,  0, 99,111,110,115,116,105,110,118, 91, 52, 93, 91, 52, 93,  0,108, 97,121,  0, 99,111,108, 98,105,116,115,  0,
-116,114, 97,110,115,102,108, 97,103,  0,112,114,111,116,101, 99,116,102,108, 97,103,  0,116,114, 97, 99,107,102,108, 97,103,  0,
-117,112,102,108, 97,103,  0,110,108, 97,102,108, 97,103,  0,105,112,111,102,108, 97,103,  0,105,112,111,119,105,110,  0,115, 99,
- 97,102,108, 97,103,  0,115, 99, 97,118,105,115,102,108, 97,103,  0, 98,111,117,110,100,116,121,112,101,  0,100,117,112,111,110,
-  0,100,117,112,111,102,102,  0,100,117,112,115,116, 97,  0,100,117,112,101,110,100,  0,115,102,  0,109, 97,115,115,  0,100, 97,
-109,112,105,110,103,  0,105,110,101,114,116,105, 97,  0,102,111,114,109,102, 97, 99,116,111,114,  0,114,100, 97,109,112,105,110,
-103,  0,115,105,122,101,102, 97, 99,  0,109, 97,114,103,105,110,  0,109, 97,120, 95,118,101,108,  0,109,105,110, 95,118,101,108,
-  0,109, 95, 99,111,110,116, 97, 99,116, 80,114,111, 99,101,115,115,105,110,103, 84,104,114,101,115,104,111,108,100,  0,100,116,
-  0,100,116,120,  0,101,109,112,116,121, 95,100,114, 97,119,116,121,112,101,  0,112, 97,100, 49, 91, 53, 93,  0,101,109,112,116,
-121, 95,100,114, 97,119,115,105,122,101,  0,100,117,112,102, 97, 99,101,115, 99, 97,  0,112,114,111,112,  0,115,101,110,115,111,
-114,115,  0, 99,111,110,116,114,111,108,108,101,114,115,  0, 97, 99,116,117, 97,116,111,114,115,  0, 98, 98,115,105,122,101, 91,
- 51, 93,  0, 97, 99,116,100,101,102,  0,103, 97,109,101,102,108, 97,103,  0,103, 97,109,101,102,108, 97,103, 50,  0, 42, 98,115,
-111,102,116,  0,115,111,102,116,102,108, 97,103,  0, 97,110,105,115,111,116,114,111,112,105, 99, 70,114,105, 99,116,105,111,110,
- 91, 51, 93,  0, 99,111,110,115,116,114, 97,105,110,116,115,  0,110,108, 97,115,116,114,105,112,115,  0,104,111,111,107,115,  0,
-112, 97,114,116,105, 99,108,101,115,121,115,116,101,109,  0, 42,112,100,  0, 42,115,111,102,116,  0, 42,100,117,112, 95,103,114,
-111,117,112,  0,102,108,117,105,100,115,105,109, 70,108, 97,103,  0,114,101,115,116,114,105, 99,116,102,108, 97,103,  0,115,104,
- 97,112,101,110,114,  0,115,104, 97,112,101,102,108, 97,103,  0,114,101, 99, 97,108, 99,111,  0, 98,111,100,121, 95,116,121,112,
-101,  0, 42,102,108,117,105,100,115,105,109, 83,101,116,116,105,110,103,115,  0, 42,100,101,114,105,118,101,100, 68,101,102,111,
-114,109,  0, 42,100,101,114,105,118,101,100, 70,105,110, 97,108,  0,108, 97,115,116, 68, 97,116, 97, 77, 97,115,107,  0,115,116,
- 97,116,101,  0,105,110,105,116, 95,115,116, 97,116,101,  0,103,112,117,108, 97,109,112,  0, 99,117,114,105,110,100,101,120,  0,
- 97, 99,116,105,118,101,  0,100,101,102,108,101, 99,116,  0,102,111,114, 99,101,102,105,101,108,100,  0,112,100,101,102, 95,100,
- 97,109,112,  0,112,100,101,102, 95,114,100, 97,109,112,  0,112,100,101,102, 95,112,101,114,109,  0,112,100,101,102, 95,102,114,
-105, 99,116,  0,112,100,101,102, 95,114,102,114,105, 99,116,  0,102, 95,115,116,114,101,110,103,116,104,  0,102, 95,112,111,119,
-101,114,  0,102, 95,100,105,115,116,  0,102, 95,100, 97,109,112,  0,109, 97,120,100,105,115,116,  0,109,105,110,100,105,115,116,
-  0,109, 97,120,114, 97,100,  0,109,105,110,114, 97,100,  0,102, 95,112,111,119,101,114, 95,114,  0,112,100,101,102, 95,115, 98,
-100, 97,109,112,  0,112,100,101,102, 95,115, 98,105,102,116,  0,112,100,101,102, 95,115, 98,111,102,116,  0, 99,108,117,109,112,
- 95,102, 97, 99,  0, 99,108,117,109,112, 95,112,111,119,  0,107,105,110,107, 95,102,114,101,113,  0,107,105,110,107, 95,115,104,
- 97,112,101,  0,107,105,110,107, 95, 97,109,112,  0,102,114,101,101, 95,101,110,100,  0,116,101,120, 95,110, 97, 98,108, 97,  0,
-116,101,120, 95,109,111,100,101,  0,107,105,110,107,  0,107,105,110,107, 95, 97,120,105,115,  0,114,116, 50,  0, 42,114,110,103,
-  0,102, 95,110,111,105,115,101,  0,102,114, 97,109,101,  0,116,111,116,112,111,105,110,116,  0, 42,120,100, 97,116, 97,  0,115,
-116,101,112,  0,115,105,109,102,114, 97,109,101,  0,115,116, 97,114,116,102,114, 97,109,101,  0,101,110,100,102,114, 97,109,101,
-  0,101,100,105,116,102,114, 97,109,101,  0,108, 97,115,116, 95,101,120, 97, 99,116,  0,110, 97,109,101, 91, 54, 52, 93,  0,112,
-114,101,118, 95,110, 97,109,101, 91, 54, 52, 93,  0,105,110,102,111, 91, 54, 52, 93,  0,112, 97,116,104, 91, 50, 52, 48, 93,  0,
-109,101,109, 95, 99, 97, 99,104,101,  0,108,105,110, 83,116,105,102,102,  0, 97,110,103, 83,116,105,102,102,  0,118,111,108,117,
-109,101,  0,118,105,116,101,114, 97,116,105,111,110,115,  0,112,105,116,101,114, 97,116,105,111,110,115,  0,100,105,116,101,114,
- 97,116,105,111,110,115,  0, 99,105,116,101,114, 97,116,105,111,110,115,  0,107, 83, 82, 72, 82, 95, 67, 76,  0,107, 83, 75, 72,
- 82, 95, 67, 76,  0,107, 83, 83, 72, 82, 95, 67, 76,  0,107, 83, 82, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 83, 75, 95, 83, 80,
- 76, 84, 95, 67, 76,  0,107, 83, 83, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 86, 67, 70,  0,107, 68, 80,  0,107, 68, 71,  0,107,
- 76, 70,  0,107, 80, 82,  0,107, 86, 67,  0,107, 68, 70,  0,107, 77, 84,  0,107, 67, 72, 82,  0,107, 75, 72, 82,  0,107, 83, 72,
- 82,  0,107, 65, 72, 82,  0, 99,111,108,108,105,115,105,111,110,102,108, 97,103,115,  0,110,117,109, 99,108,117,115,116,101,114,
-105,116,101,114, 97,116,105,111,110,115,  0,119,101,108,100,105,110,103,  0, 42,112, 97,114,116,105, 99,108,101,115,  0,116,111,
-116,115,112,114,105,110,103,  0, 42, 98,112,111,105,110,116,  0, 42, 98,115,112,114,105,110,103,  0,109,115,103, 95,108,111, 99,
-107,  0,109,115,103, 95,118, 97,108,117,101,  0,110,111,100,101,109, 97,115,115,  0,110, 97,109,101,100, 86, 71, 95, 77, 97,115,
-115, 91, 51, 50, 93,  0,103,114, 97,118,  0,109,101,100,105, 97,102,114,105, 99,116,  0,114,107,108,105,109,105,116,  0,112,104,
-121,115,105, 99,115, 95,115,112,101,101,100,  0,103,111, 97,108,115,112,114,105,110,103,  0,103,111, 97,108,102,114,105, 99,116,
-  0,109,105,110,103,111, 97,108,  0,109, 97,120,103,111, 97,108,  0,100,101,102,103,111, 97,108,  0,118,101,114,116,103,114,111,
-117,112,  0,110, 97,109,101,100, 86, 71, 95, 83,111,102,116,103,111, 97,108, 91, 51, 50, 93,  0,102,117,122,122,121,110,101,115,
-115,  0,105,110,115,112,114,105,110,103,  0,105,110,102,114,105, 99,116,  0,110, 97,109,101,100, 86, 71, 95, 83,112,114,105,110,
-103, 95, 75, 91, 51, 50, 93,  0,101,102,114, 97,  0,105,110,116,101,114,118, 97,108,  0,108,111, 99, 97,108,  0,115,111,108,118,
-101,114,102,108, 97,103,115,  0, 42, 42,107,101,121,115,  0,116,111,116,112,111,105,110,116,107,101,121,  0,115,101, 99,111,110,
-100,115,112,114,105,110,103,  0, 99,111,108, 98, 97,108,108,  0, 98, 97,108,108,100, 97,109,112,  0, 98, 97,108,108,115,116,105,
-102,102,  0,115, 98, 99, 95,109,111,100,101,  0, 97,101,114,111,101,100,103,101,  0,109,105,110,108,111,111,112,115,  0,109, 97,
-120,108,111,111,112,115,  0, 99,104,111,107,101,  0,115,111,108,118,101,114, 95, 73, 68,  0,112,108, 97,115,116,105, 99,  0,115,
-112,114,105,110,103,112,114,101,108,111, 97,100,  0, 42,115, 99,114, 97,116, 99,104,  0,115,104,101, 97,114,115,116,105,102,102,
-  0,105,110,112,117,115,104,  0, 42,112,111,105,110,116, 99, 97, 99,104,101,  0,115,104,111,119, 95, 97,100,118, 97,110, 99,101,
-100,111,112,116,105,111,110,115,  0,114,101,115,111,108,117,116,105,111,110,120,121,122,  0,112,114,101,118,105,101,119,114,101,
-115,120,121,122,  0,114,101, 97,108,115,105,122,101,  0,103,117,105, 68,105,115,112,108, 97,121, 77,111,100,101,  0,114,101,110,
-100,101,114, 68,105,115,112,108, 97,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 86, 97,108,117,101,  0,118,105,
-115, 99,111,115,105,116,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 69,120,112,111,110,101,110,116,  0,103,114,
- 97,118,120,  0,103,114, 97,118,121,  0,103,114, 97,118,122,  0, 97,110,105,109, 83,116, 97,114,116,  0, 97,110,105,109, 69,110,
-100,  0,103,115,116, 97,114,  0,109, 97,120, 82,101,102,105,110,101,  0,105,110,105, 86,101,108,120,  0,105,110,105, 86,101,108,
-121,  0,105,110,105, 86,101,108,122,  0, 42,111,114,103, 77,101,115,104,  0, 42,109,101,115,104, 83,117,114,102, 97, 99,101,  0,
- 42,109,101,115,104, 66, 66,  0,115,117,114,102,100, 97,116, 97, 80, 97,116,104, 91, 50, 52, 48, 93,  0, 98, 98, 83,116, 97,114,
-116, 91, 51, 93,  0, 98, 98, 83,105,122,101, 91, 51, 93,  0,116,121,112,101, 70,108, 97,103,115,  0,100,111,109, 97,105,110, 78,
-111,118,101, 99,103,101,110,  0,118,111,108,117,109,101, 73,110,105,116, 84,121,112,101,  0,112, 97,114,116, 83,108,105,112, 86,
- 97,108,117,101,  0,103,101,110,101,114, 97,116,101, 84,114, 97, 99,101,114,115,  0,103,101,110,101,114, 97,116,101, 80, 97,114,
-116,105, 99,108,101,115,  0,115,117,114,102, 97, 99,101, 83,109,111,111,116,104,105,110,103,  0,115,117,114,102, 97, 99,101, 83,
-117, 98,100,105,118,115,  0,112, 97,114,116,105, 99,108,101, 73,110,102, 83,105,122,101,  0,112, 97,114,116,105, 99,108,101, 73,
-110,102, 65,108,112,104, 97,  0,102, 97,114, 70,105,101,108,100, 83,105,122,101,  0, 42,109,101,115,104, 83,117,114,102, 78,111,
-114,109, 97,108,115,  0, 99,112,115, 84,105,109,101, 83,116, 97,114,116,  0, 99,112,115, 84,105,109,101, 69,110,100,  0, 99,112,
-115, 81,117, 97,108,105,116,121,  0, 97,116,116,114, 97, 99,116,102,111,114, 99,101, 83,116,114,101,110,103,116,104,  0, 97,116,
-116,114, 97, 99,116,102,111,114, 99,101, 82, 97,100,105,117,115,  0,118,101,108,111, 99,105,116,121,102,111,114, 99,101, 83,116,
-114,101,110,103,116,104,  0,118,101,108,111, 99,105,116,121,102,111,114, 99,101, 82, 97,100,105,117,115,  0,108, 97,115,116,103,
-111,111,100,102,114, 97,109,101,  0,109,105,115,116,121,112,101,  0,104,111,114,114,  0,104,111,114,103,  0,104,111,114, 98,  0,
-104,111,114,107,  0,122,101,110,114,  0,122,101,110,103,  0,122,101,110, 98,  0,122,101,110,107,  0, 97,109, 98,107,  0,102, 97,
-115,116, 99,111,108,  0,101,120,112,111,115,117,114,101,  0,101,120,112,  0,114, 97,110,103,101,  0,108,105,110,102, 97, 99,  0,
-108,111,103,102, 97, 99,  0,103,114, 97,118,105,116,121,  0, 97, 99,116,105,118,105,116,121, 66,111,120, 82, 97,100,105,117,115,
-  0,115,107,121,116,121,112,101,  0,111, 99, 99,108,117,115,105,111,110, 82,101,115,  0,112,104,121,115,105, 99,115, 69,110,103,
-105,110,101,  0,116,105, 99,114, 97,116,101,  0,109, 97,120,108,111,103,105, 99,115,116,101,112,  0,112,104,121,115,117, 98,115,
-116,101,112,  0,109, 97,120,112,104,121,115,116,101,112,  0,109,105,115,105,  0,109,105,115,116,115,116, 97,  0,109,105,115,116,
-100,105,115,116,  0,109,105,115,116,104,105,  0,115,116, 97,114,114,  0,115,116, 97,114,103,  0,115,116, 97,114, 98,  0,115,116,
- 97,114,107,  0,115,116, 97,114,115,105,122,101,  0,115,116, 97,114,109,105,110,100,105,115,116,  0,115,116, 97,114,100,105,115,
-116,  0,115,116, 97,114, 99,111,108,110,111,105,115,101,  0,100,111,102,115,116, 97,  0,100,111,102,101,110,100,  0,100,111,102,
-109,105,110,  0,100,111,102,109, 97,120,  0, 97,111,100,105,115,116,  0, 97,111,100,105,115,116,102, 97, 99,  0, 97,111,101,110,
-101,114,103,121,  0, 97,111, 98,105, 97,115,  0, 97,111,109,111,100,101,  0, 97,111,115, 97,109,112,  0, 97,111,109,105,120,  0,
- 97,111, 99,111,108,111,114,  0, 97,111, 95, 97,100, 97,112,116, 95,116,104,114,101,115,104,  0, 97,111, 95, 97,100, 97,112,116,
- 95,115,112,101,101,100, 95,102, 97, 99,  0, 97,111, 95, 97,112,112,114,111,120, 95,101,114,114,111,114,  0, 97,111, 95, 97,112,
-112,114,111,120, 95, 99,111,114,114,101, 99,116,105,111,110,  0, 97,111, 95,115, 97,109,112, 95,109,101,116,104,111,100,  0, 97,
-111, 95,103, 97,116,104,101,114, 95,109,101,116,104,111,100,  0, 97,111, 95, 97,112,112,114,111,120, 95,112, 97,115,115,101,115,
-  0, 42, 97,111,115,112,104,101,114,101,  0, 42, 97,111,116, 97, 98,108,101,115,  0,115,101,108, 99,111,108,  0,115,120,  0,115,
-121,  0, 42,108,112, 70,111,114,109, 97,116,  0, 42,108,112, 80, 97,114,109,115,  0, 99, 98, 70,111,114,109, 97,116,  0, 99, 98,
- 80, 97,114,109,115,  0,102, 99, 99, 84,121,112,101,  0,102, 99, 99, 72, 97,110,100,108,101,114,  0,100,119, 75,101,121, 70,114,
- 97,109,101, 69,118,101,114,121,  0,100,119, 81,117, 97,108,105,116,121,  0,100,119, 66,121,116,101,115, 80,101,114, 83,101, 99,
-111,110,100,  0,100,119, 70,108, 97,103,115,  0,100,119, 73,110,116,101,114,108,101, 97,118,101, 69,118,101,114,121,  0, 97,118,
-105, 99,111,100,101, 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 99,100, 80, 97,114,109,115,  0, 42,112, 97,100,  0, 99,100,
- 83,105,122,101,  0,113,116, 99,111,100,101, 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 99,111,100,101, 99,  0, 97,117,100,105,
-111, 95, 99,111,100,101, 99,  0,118,105,100,101,111, 95, 98,105,116,114, 97,116,101,  0, 97,117,100,105,111, 95, 98,105,116,114,
- 97,116,101,  0,103,111,112, 95,115,105,122,101,  0,114, 99, 95,109,105,110, 95,114, 97,116,101,  0,114, 99, 95,109, 97,120, 95,
-114, 97,116,101,  0,114, 99, 95, 98,117,102,102,101,114, 95,115,105,122,101,  0,109,117,120, 95,112, 97, 99,107,101,116, 95,115,
-105,122,101,  0,109,117,120, 95,114, 97,116,101,  0,109,105,120,114, 97,116,101,  0,109, 97,105,110,  0, 42,109, 97,116, 95,111,
-118,101,114,114,105,100,101,  0, 42,108,105,103,104,116, 95,111,118,101,114,114,105,100,101,  0,108, 97,121, 95,122,109, 97,115,
-107,  0,108, 97,121,102,108, 97,103,  0,112, 97,115,115,102,108, 97,103,  0,112, 97,115,115, 95,120,111,114,  0, 42, 97,118,105,
- 99,111,100,101, 99,100, 97,116, 97,  0, 42,113,116, 99,111,100,101, 99,100, 97,116, 97,  0,102,102, 99,111,100,101, 99,100, 97,
-116, 97,  0, 97,117,100,105,111,  0,112,115,102,114, 97,  0,112,101,102,114, 97,  0,105,109, 97,103,101,115,  0,102,114, 97,109,
- 97,112,116,111,  0,116,104,114,101, 97,100,115,  0,102,114, 97,109,101,108,101,110,  0, 98,108,117,114,102, 97, 99,  0,101,100,
-103,101, 82,  0,101,100,103,101, 71,  0,101,100,103,101, 66,  0,102,117,108,108,115, 99,114,101,101,110,  0,120,112,108, 97,121,
-  0,121,112,108, 97,121,  0,102,114,101,113,112,108, 97,121,  0, 97,116,116,114,105, 98,  0,114,116, 49,  0,115,116,101,114,101,
-111,109,111,100,101,  0,100,105,109,101,110,115,105,111,110,115,112,114,101,115,101,116,  0,109, 97,120,105,109,115,105,122,101,
-  0,120,115, 99,104,  0,121,115, 99,104,  0,120,112, 97,114,116,115,  0,121,112, 97,114,116,115,  0,119,105,110,112,111,115,  0,
-112,108, 97,110,101,115,  0,105,109,116,121,112,101,  0,115,117, 98,105,109,116,121,112,101,  0,113,117, 97,108,105,116,121,  0,
-100,105,115,112,108, 97,121,109,111,100,101,  0,114,112, 97,100, 49,  0,114,112, 97,100, 50,  0,115, 99,101,109,111,100,101,  0,
-114,101,110,100,101,114,101,114,  0,111, 99,114,101,115,  0, 97,108,112,104, 97,109,111,100,101,  0,111,115, 97,  0,102,114,115,
- 95,115,101, 99,  0,101,100,103,101,105,110,116,  0,115, 97,102,101,116,121,  0, 98,111,114,100,101,114,  0,100,105,115,112,114,
-101, 99,116,  0,108, 97,121,101,114,115,  0, 97, 99,116,108, 97,121,  0,120, 97,115,112,  0,121, 97,115,112,  0,102,114,115, 95,
-115,101, 99, 95, 98, 97,115,101,  0,103, 97,117,115,115,  0, 99,111,108,111,114, 95,109,103,116, 95,102,108, 97,103,  0,112,111,
-115,116,103, 97,109,109, 97,  0,112,111,115,116,104,117,101,  0,112,111,115,116,115, 97,116,  0,100,105,116,104,101,114, 95,105,
-110,116,101,110,115,105,116,121,  0, 98, 97,107,101, 95,111,115, 97,  0, 98, 97,107,101, 95,102,105,108,116,101,114,  0, 98, 97,
-107,101, 95,109,111,100,101,  0, 98, 97,107,101, 95,102,108, 97,103,  0, 98, 97,107,101, 95,110,111,114,109, 97,108, 95,115,112,
- 97, 99,101,  0, 98, 97,107,101, 95,113,117, 97,100, 95,115,112,108,105,116,  0, 98, 97,107,101, 95,109, 97,120,100,105,115,116,
-  0, 98, 97,107,101, 95, 98,105, 97,115,100,105,115,116,  0, 98, 97,107,101, 95,112, 97,100,  0, 71, 73,113,117, 97,108,105,116,
-121,  0, 71, 73, 99, 97, 99,104,101,  0, 71, 73,109,101,116,104,111,100,  0, 71, 73,112,104,111,116,111,110,115,  0, 71, 73,100,
-105,114,101, 99,116,  0, 89, 70, 95, 65, 65,  0, 89, 70,101,120,112,111,114,116,120,109,108,  0, 89, 70, 95,110,111, 98,117,109,
-112,  0, 89, 70, 95, 99,108, 97,109,112,114,103, 98,  0,121,102,112, 97,100, 49,  0, 71, 73,100,101,112,116,104,  0, 71, 73, 99,
- 97,117,115,100,101,112,116,104,  0, 71, 73,112,105,120,101,108,115,112,101,114,115, 97,109,112,108,101,  0, 71, 73,112,104,111,
-116,111,110, 99,111,117,110,116,  0, 71, 73,109,105,120,112,104,111,116,111,110,115,  0, 71, 73,112,104,111,116,111,110,114, 97,
-100,105,117,115,  0, 89, 70, 95,114, 97,121,100,101,112,116,104,  0, 89, 70, 95, 65, 65,112, 97,115,115,101,115,  0, 89, 70, 95,
- 65, 65,115, 97,109,112,108,101,115,  0,121,102,112, 97,100, 50,  0, 71, 73,115,104, 97,100,111,119,113,117, 97,108,105,116,121,
-  0, 71, 73,114,101,102,105,110,101,109,101,110,116,  0, 71, 73,112,111,119,101,114,  0, 71, 73,105,110,100,105,114,112,111,119,
-101,114,  0, 89, 70, 95,103, 97,109,109, 97,  0, 89, 70, 95,101,120,112,111,115,117,114,101,  0, 89, 70, 95,114, 97,121, 98,105,
- 97,115,  0, 89, 70, 95, 65, 65,112,105,120,101,108,115,105,122,101,  0, 89, 70, 95, 65, 65,116,104,114,101,115,104,111,108,100,
-  0, 98, 97, 99,107, 98,117,102, 91, 49, 54, 48, 93,  0,112,105, 99, 91, 49, 54, 48, 93,  0,115,116, 97,109,112,  0,115,116, 97,
-109,112, 95,102,111,110,116, 95,105,100,  0,115,116, 97,109,112, 95,117,100, 97,116, 97, 91, 49, 54, 48, 93,  0,102,103, 95,115,
-116, 97,109,112, 91, 52, 93,  0, 98,103, 95,115,116, 97,109,112, 91, 52, 93,  0,115,105,109,112,108,105,102,121, 95,115,117, 98,
-115,117,114,102,  0,115,105,109,112,108,105,102,121, 95,115,104, 97,100,111,119,115, 97,109,112,108,101,115,  0,115,105,109,112,
-108,105,102,121, 95,112, 97,114,116,105, 99,108,101,115,  0,115,105,109,112,108,105,102,121, 95, 97,111,115,115,115,  0, 99,105,
-110,101,111,110,119,104,105,116,101,  0, 99,105,110,101,111,110, 98,108, 97, 99,107,  0, 99,105,110,101,111,110,103, 97,109,109,
- 97,  0,106,112, 50, 95,112,114,101,115,101,116,  0,106,112, 50, 95,100,101,112,116,104,  0,114,112, 97,100, 51,  0,100,111,109,
-101,114,101,115,  0,100,111,109,101,109,111,100,101,  0,100,111,109,101, 97,110,103,108,101,  0,100,111,109,101,116,105,108,116,
-  0,100,111,109,101,114,101,115, 98,117,102,  0, 42,100,111,109,101,116,101,120,116,  0,101,110,103,105,110,101, 91, 51, 50, 93,
-  0,112, 97,114,116,105, 99,108,101, 95,112,101,114, 99,  0,115,117, 98,115,117,114,102, 95,109, 97,120,  0,115,104, 97,100, 98,
-117,102,115, 97,109,112,108,101, 95,109, 97,120,  0, 97,111, 95,101,114,114,111,114,  0,116,105,108,116,  0,114,101,115, 98,117,
-102,  0, 42,119, 97,114,112,116,101,120,116,  0, 99,111,108, 91, 51, 93,  0,112, 97,100, 49, 49,  0,102,114, 97,109,105,110,103,
-  0,100,111,109,101,  0,115,116,101,114,101,111,102,108, 97,103,  0, 42, 98,114,117,115,104,  0,116,111,111,108,  0,115,101, 97,
-109, 95, 98,108,101,101,100,  0,110,111,114,109, 97,108, 95, 97,110,103,108,101,  0, 42,112, 97,105,110,116, 99,117,114,115,111,
-114,  0,105,110,118,101,114,116,  0,116,111,116,114,101,107,101,121,  0,116,111,116, 97,100,100,107,101,121,  0, 98,114,117,115,
-104,116,121,112,101,  0, 98,114,117,115,104, 91, 55, 93,  0,101,109,105,116,116,101,114,100,105,115,116,  0,100,114, 97,119, 95,
-116,105,109,101,100,  0,115,101,108,101, 99,116,109,111,100,101,  0,110, 97,109,101, 91, 51, 54, 93,  0,109, 97,116, 91, 51, 93,
- 91, 51, 93,  0, 42,115,101,115,115,105,111,110,  0,112,105,118,111,116, 91, 51, 93,  0,116,101,120,115,101,112,  0,116, 97, 98,
-108,101,116, 95,115,105,122,101,  0,116, 97, 98,108,101,116, 95,115,116,114,101,110,103,116,104,  0,112, 97,100, 91, 53, 93,  0,
-103, 97,109,109, 97,  0,109,117,108,  0, 42,118,112, 97,105,110,116, 95,112,114,101,118,  0, 42,119,112, 97,105,110,116, 95,112,
-114,101,118,  0, 42,118,112, 97,105,110,116,  0, 42,119,112, 97,105,110,116,  0, 42,115, 99,117,108,112,116,  0,118,103,114,111,
-117,112, 95,119,101,105,103,104,116,  0, 99,111,114,110,101,114,116,121,112,101,  0,101,100,105,116, 98,117,116,102,108, 97,103,
-  0,106,111,105,110,116,114,105,108,105,109,105,116,  0,100,101,103,114,  0,116,117,114,110,  0,101,120,116,114, 95,111,102,102,
-115,  0,100,111,117, 98,108,105,109,105,116,  0,110,111,114,109, 97,108,115,105,122,101,  0, 97,117,116,111,109,101,114,103,101,
-  0,115,101,103,109,101,110,116,115,  0,114,105,110,103,115,  0,118,101,114,116,105, 99,101,115,  0,117,110,119,114, 97,112,112,
-101,114,  0,117,118, 99, 97,108, 99, 95,114, 97,100,105,117,115,  0,117,118, 99, 97,108, 99, 95, 99,117, 98,101,115,105,122,101,
-  0,117,118, 99, 97,108, 99, 95,109, 97,114,103,105,110,  0,117,118, 99, 97,108, 99, 95,109, 97,112,100,105,114,  0,117,118, 99,
- 97,108, 99, 95,109, 97,112, 97,108,105,103,110,  0,117,118, 99, 97,108, 99, 95,102,108, 97,103,  0,117,118, 95,102,108, 97,103,
-  0,117,118, 95,115,101,108,101, 99,116,109,111,100,101,  0,117,118, 95,112, 97,100, 91, 50, 93,  0, 97,117,116,111,105,107, 95,
- 99,104, 97,105,110,108,101,110,  0,105,109, 97,112, 97,105,110,116,  0,112, 97,114,116,105, 99,108,101,  0,112,114,111,112,111,
-114,116,105,111,110, 97,108, 95,115,105,122,101,  0,115,101,108,101, 99,116, 95,116,104,114,101,115,104,  0, 99,108,101, 97,110,
- 95,116,104,114,101,115,104,  0, 97,117,116,111,107,101,121, 95,109,111,100,101,  0,114,101,116,111,112,111, 95,109,111,100,101,
-  0,114,101,116,111,112,111, 95,112, 97,105,110,116, 95,116,111,111,108,  0,108,105,110,101, 95,100,105,118,  0,101,108,108,105,
-112,115,101, 95,100,105,118,  0,114,101,116,111,112,111, 95,104,111,116,115,112,111,116,  0,109,117,108,116,105,114,101,115, 95,
-115,117, 98,100,105,118, 95,116,121,112,101,  0,115,107,103,101,110, 95,114,101,115,111,108,117,116,105,111,110,  0,115,107,103,
-101,110, 95,116,104,114,101,115,104,111,108,100, 95,105,110,116,101,114,110, 97,108,  0,115,107,103,101,110, 95,116,104,114,101,
-115,104,111,108,100, 95,101,120,116,101,114,110, 97,108,  0,115,107,103,101,110, 95,108,101,110,103,116,104, 95,114, 97,116,105,
-111,  0,115,107,103,101,110, 95,108,101,110,103,116,104, 95,108,105,109,105,116,  0,115,107,103,101,110, 95, 97,110,103,108,101,
- 95,108,105,109,105,116,  0,115,107,103,101,110, 95, 99,111,114,114,101,108, 97,116,105,111,110, 95,108,105,109,105,116,  0,115,
-107,103,101,110, 95,115,121,109,109,101,116,114,121, 95,108,105,109,105,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,
-101,116, 95, 97,110,103,108,101, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,108,
-101,110,103,116,104, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,100,105,115,116,
- 97,110, 99,101, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,111,112,116,105,111,110,115,  0,115,107,103,101,110, 95,
-112,111,115,116,112,114,111,  0,115,107,103,101,110, 95,112,111,115,116,112,114,111, 95,112, 97,115,115,101,115,  0,115,107,103,
-101,110, 95,115,117, 98,100,105,118,105,115,105,111,110,115, 91, 51, 93,  0,115,107,103,101,110, 95,109,117,108,116,105, 95,108,
-101,118,101,108,  0, 42,115,107,103,101,110, 95,116,101,109,112,108, 97,116,101,  0, 98,111,110,101, 95,115,107,101,116, 99,104,
-105,110,103,  0, 98,111,110,101, 95,115,107,101,116, 99,104,105,110,103, 95, 99,111,110,118,101,114,116,  0,115,107,103,101,110,
- 95,115,117, 98,100,105,118,105,115,105,111,110, 95,110,117,109, 98,101,114,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,
-101,116, 95,111,112,116,105,111,110,115,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,114,111,108,108,  0,115,
-107,103,101,110, 95,115,105,100,101, 95,115,116,114,105,110,103, 91, 56, 93,  0,115,107,103,101,110, 95,110,117,109, 95,115,116,
-114,105,110,103, 91, 56, 93,  0,101,100,103,101, 95,109,111,100,101,  0,115,110, 97,112, 95,109,111,100,101,  0,115,110, 97,112,
- 95,102,108, 97,103,  0,115,110, 97,112, 95,116, 97,114,103,101,116,  0,112,114,111,112,111,114,116,105,111,110, 97,108,  0,112,
-114,111,112, 95,109,111,100,101,  0,116,111,116,111, 98,106,  0,116,111,116,108, 97,109,112,  0,116,111,116,111, 98,106,115,101,
-108,  0,116,111,116, 99,117,114,118,101,  0,116,111,116,109,101,115,104,  0,116,111,116, 97,114,109, 97,116,117,114,101,  0, 42,
- 99, 97,109,101,114, 97,  0, 42,119,111,114,108,100,  0, 42,115,101,116,  0, 98, 97,115,101,  0, 42, 98, 97,115, 97, 99,116,  0,
- 42,111, 98,101,100,105,116,  0, 99,117,114,115,111,114, 91, 51, 93,  0,116,119, 99,101,110,116, 91, 51, 93,  0,116,119,109,105,
-110, 91, 51, 93,  0,116,119,109, 97,120, 91, 51, 93,  0, 42,101,100,  0, 42,116,111,111,108,115,101,116,116,105,110,103,115,  0,
- 42,115,116, 97,116,115,  0,116,114, 97,110,115,102,111,114,109, 95,115,112, 97, 99,101,115,  0, 42,116,104,101, 68, 97,103,  0,
-100, 97,103,105,115,118, 97,108,105,100,  0,100, 97,103,102,108, 97,103,115,  0,106,117,109,112,102,114, 97,109,101,  0,102,114,
- 97,109,101, 95,115,116,101,112,  0, 97, 99,116,105,118,101, 95,107,101,121,105,110,103,115,101,116,  0,107,101,121,105,110,103,
-115,101,116,115,  0,103,109,  0, 98,108,101,110,100,  0,119,105,110,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,109,
- 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,105,110,118, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,109, 97,116, 91, 52,
- 93, 91, 52, 93,  0,112,101,114,115,105,110,118, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,109, 97,116,111, 98, 91, 52, 93, 91,
- 52, 93,  0,112,101,114,115,109, 97,116,111, 98, 91, 52, 93, 91, 52, 93,  0,116,119,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,
-105,101,119,113,117, 97,116, 91, 52, 93,  0,122,102, 97, 99,  0, 99, 97,109,100,120,  0, 99, 97,109,100,121,  0,112,105,120,115,
-105,122,101,  0, 99, 97,109,122,111,111,109,  0,118,105,101,119, 98,117,116,  0,108, 97,115,116,109,111,100,101,  0,114,102,108,
- 97,103,  0,118,105,101,119,108,111, 99,107,  0,112,101,114,115,112,  0,118,105,101,119,  0, 99,108,105,112, 91, 54, 93, 91, 52,
- 93,  0, 42, 99,108,105,112, 98, 98,  0, 42,103,112,100,  0, 42,108,111, 99, 97,108,118,100,  0, 42,114,105,  0, 42,114,101,116,
-111,112,111, 95,118,105,101,119, 95,100, 97,116, 97,  0, 42,100,101,112,116,104,115,  0, 42,115,109,115,  0, 42,115,109,111,111,
-116,104, 95,116,105,109,101,114,  0,108,118,105,101,119,113,117, 97,116, 91, 52, 93,  0,108,112,101,114,115,112,  0,108,118,105,
-101,119,  0,114,101,103,105,111,110, 98, 97,115,101,  0,115,112, 97, 99,101,116,121,112,101,  0, 98,108,111, 99,107,115, 99, 97,
-108,101,  0, 98,108,111, 99,107,104, 97,110,100,108,101,114, 91, 56, 93,  0,108, 97,121, 95,117,115,101,100,  0, 42,111, 98, 95,
- 99,101,110,116,114,101,  0, 42, 98,103,112,105, 99,  0,111, 98, 95, 99,101,110,116,114,101, 95, 98,111,110,101, 91, 51, 50, 93,
-  0,108, 97,121, 97, 99,116,  0,100,114, 97,119,116,121,112,101,  0,108,111, 99, 97,108,118,105,101,119,  0,115, 99,101,110,101,
-108,111, 99,107,  0, 97,114,111,117,110,100,  0,102,108, 97,103, 50,  0,112,105,118,111,116, 95,108, 97,115,116,  0,103,114,105,
-100,  0,103,114,105,100,118,105,101,119,  0,112, 97,100,102,  0,110,101, 97,114,  0,102, 97,114,  0,103,114,105,100,108,105,110,
-101,115,  0,103,114,105,100,102,108, 97,103,  0,103,114,105,100,115,117, 98,100,105,118,  0,109,111,100,101,115,101,108,101, 99,
-116,  0,107,101,121,102,108, 97,103,115,  0,116,119,116,121,112,101,  0,116,119,109,111,100,101,  0,116,119,102,108, 97,103,  0,
-116,119,100,114, 97,119,102,108, 97,103,  0, 99,117,115,116,111,109,100, 97,116, 97, 95,109, 97,115,107,  0, 97,102,116,101,114,
-100,114, 97,119,  0,122, 98,117,102,  0,120,114, 97,121,  0,110,100,111,102,109,111,100,101,  0,110,100,111,102,102,105,108,116,
-101,114,  0, 42,112,114,111,112,101,114,116,105,101,115, 95,115,116,111,114, 97,103,101,  0,118,101,114,116,  0,104,111,114,  0,
-109, 97,115,107,  0,109,105,110, 91, 50, 93,  0,109, 97,120, 91, 50, 93,  0,109,105,110,122,111,111,109,  0,109, 97,120,122,111,
-111,109,  0,115, 99,114,111,108,108,  0,115, 99,114,111,108,108, 95,117,105,  0,107,101,101,112,116,111,116,  0,107,101,101,112,
-122,111,111,109,  0,107,101,101,112,111,102,115,  0, 97,108,105,103,110,  0,119,105,110,120,  0,119,105,110,121,  0,111,108,100,
-119,105,110,120,  0,111,108,100,119,105,110,121,  0, 99,117,114,115,111,114, 91, 50, 93,  0, 42,116, 97, 98, 95,111,102,102,115,
-101,116,  0,116, 97, 98, 95,110,117,109,  0,116, 97, 98, 95, 99,117,114,  0, 42,115, 99,114,101,101,110,  0,118, 50,100,  0, 42,
- 97,100,115,  0,103,104,111,115,116, 67,117,114,118,101,115,  0, 97,117,116,111,115,110, 97,112,  0,112,105,110,  0,108,111, 99,
-107,  0,109, 97,105,110, 98,  0,109, 97,105,110, 98,111,  0,109, 97,105,110, 98,117,115,101,114,  0,114,101, 95, 97,108,105,103,
-110,  0,112,114,101,118,105,101,119,  0,112, 97,116,104,102,108, 97,103,  0,100, 97,116, 97,105, 99,111,110,  0, 42,112,105,110,
-105,100,  0,114,101,110,100,101,114, 95,115,105,122,101,  0, 99,104, 97,110,115,104,111,119,110,  0,122,101, 98,114, 97,  0,122,
-111,111,109,  0,116,105,116,108,101, 91, 50, 52, 93,  0,100,105,114, 91, 50, 52, 48, 93,  0,102,105,108,101, 91, 56, 48, 93,  0,
-115,111,114,116,  0,100,105,115,112,108, 97,121,  0, 97, 99,116,105,118,101, 95, 98,111,111,107,109, 97,114,107,  0, 97, 99,116,
-105,118,101, 95,102,105,108,101,  0,115,101,108,115,116, 97,116,101,  0,102, 95,102,112,  0,109,101,110,117,  0,102,112, 95,115,
-116,114, 91, 56, 93,  0, 42,112,117,112,109,101,110,117,  0, 42,112, 97,114, 97,109,115,  0, 42,102,105,108,101,115,  0, 42,102,
-111,108,100,101,114,115, 95,112,114,101,118,  0, 42,102,111,108,100,101,114,115, 95,110,101,120,116,  0, 42,111,112,  0, 42,108,
-111, 97,100,105,109, 97,103,101, 95,116,105,109,101,114,  0, 42,108, 97,121,111,117,116,  0,114,101, 99,101,110,116,110,114,  0,
- 98,111,111,107,109, 97,114,107,110,114,  0,115,121,115,116,101,109,110,114,  0,116,114,101,101,  0, 42,116,114,101,101,115,116,
-111,114,101,  0,115,101, 97,114, 99,104, 95,115,116,114,105,110,103, 91, 51, 50, 93,  0,115,101, 97,114, 99,104, 95,116,115,101,
-  0,115,101, 97,114, 99,104, 95,102,108, 97,103,115,  0,100,111, 95,  0,111,117,116,108,105,110,101,118,105,115,  0,115,116,111,
-114,101,102,108, 97,103,  0, 42, 99,117,109, 97,112,  0,105,109, 97,110,114,  0, 99,117,114,116,105,108,101,  0,105,109,116,121,
-112,101,110,114,  0,100,116, 95,117,118,  0,115,116,105, 99,107,121,  0,100,116, 95,117,118,115,116,114,101,116, 99,104,  0, 99,
-101,110,116,120,  0, 99,101,110,116,121,  0, 42,116,101,120,116,  0,116,111,112,  0,118,105,101,119,108,105,110,101,115,  0,108,
-104,101,105,103,104,116,  0, 99,119,105,100,116,104,  0,108,105,110,101,110,114,115, 95,116,111,116,  0,108,101,102,116,  0,115,
-104,111,119,108,105,110,101,110,114,115,  0,116, 97, 98,110,117,109, 98,101,114,  0,115,104,111,119,115,121,110,116, 97,120,  0,
-111,118,101,114,119,114,105,116,101,  0,108,105,118,101, 95,101,100,105,116,  0,112,105,120, 95,112,101,114, 95,108,105,110,101,
-  0,116,120,116,115, 99,114,111,108,108,  0,116,120,116, 98, 97,114,  0,119,111,114,100,119,114, 97,112,  0,100,111,112,108,117,
-103,105,110,115,  0,102,105,110,100,115,116,114, 91, 50, 53, 54, 93,  0,114,101,112,108, 97, 99,101,115,116,114, 91, 50, 53, 54,
- 93,  0, 42,112,121, 95,100,114, 97,119,  0, 42,112,121, 95,101,118,101,110,116,  0, 42,112,121, 95, 98,117,116,116,111,110,  0,
- 42,112,121, 95, 98,114,111,119,115,101,114, 99, 97,108,108, 98, 97, 99,107,  0, 42,112,121, 95,103,108,111, 98, 97,108,100,105,
- 99,116,  0,108, 97,115,116,115,112, 97, 99,101,  0,115, 99,114,105,112,116,110, 97,109,101, 91, 50, 53, 54, 93,  0,115, 99,114,
-105,112,116, 97,114,103, 91, 50, 53, 54, 93,  0, 42,115, 99,114,105,112,116,  0, 42, 98,117,116, 95,114,101,102,115,  0,114,101,
-100,114, 97,119,115,  0, 42,105,100,  0, 97,115,112,101, 99,116,  0, 42, 99,117,114,102,111,110,116,  0,109,120,  0,109,121,  0,
- 42,101,100,105,116,116,114,101,101,  0,116,114,101,101,116,121,112,101,  0,116,101,120,102,114,111,109,  0,110,117,109,116,105,
-108,101,115,120,  0,110,117,109,116,105,108,101,115,121,  0,118,105,101,119,114,101, 99,116,  0, 98,111,111,107,109, 97,114,107,
-114,101, 99,116,  0,115, 99,114,111,108,108,112,111,115,  0,115, 99,114,111,108,108,104,101,105,103,104,116,  0,115, 99,114,111,
-108,108, 97,114,101, 97,  0,114,101,116,118, 97,108,  0,112,114,118, 95,119,  0,112,114,118, 95,104,  0, 40, 42,114,101,116,117,
-114,110,102,117,110, 99, 41, 40, 41,  0, 40, 42,114,101,116,117,114,110,102,117,110, 99, 95,101,118,101,110,116, 41, 40, 41,  0,
- 40, 42,114,101,116,117,114,110,102,117,110, 99, 95, 97,114,103,115, 41, 40, 41,  0, 42, 97,114,103, 49,  0, 42, 97,114,103, 50,
-  0, 42,109,101,110,117,112,  0, 42,105,109,103,  0,108,101,110, 95, 97,108,108,111, 99,  0, 99,117,114,115,111,114,  0,114,112,
-116, 95,109, 97,115,107,  0,115, 99,114,111,108,108, 98, 97, 99,107,  0,104,105,115,116,111,114,121,  0,112,114,111,109,112,116,
- 91, 56, 93,  0,102,105,108,101,110, 97,109,101, 91, 50, 53, 54, 93,  0, 98,108,102, 95,105,100,  0,117,105,102,111,110,116, 95,
-105,100,  0,114, 95,116,111, 95,108,  0,112,111,105,110,116,115,  0,107,101,114,110,105,110,103,  0,105,116, 97,108,105, 99,  0,
- 98,111,108,100,  0,115,104, 97,100,111,119,  0,115,104, 97,100,120,  0,115,104, 97,100,121,  0,115,104, 97,100,111,119, 97,108,
-112,104, 97,  0,115,104, 97,100,111,119, 99,111,108,111,114,  0,112, 97,110,101,108,116,105,116,108,101,  0,103,114,111,117,112,
-108, 97, 98,101,108,  0,119,105,100,103,101,116,108, 97, 98,101,108,  0,119,105,100,103,101,116,  0,112, 97,110,101,108,122,111,
-111,109,  0,109,105,110,108, 97, 98,101,108, 99,104, 97,114,115,  0,109,105,110,119,105,100,103,101,116, 99,104, 97,114,115,  0,
- 99,111,108,117,109,110,115,112, 97, 99,101,  0,116,101,109,112,108, 97,116,101,115,112, 97, 99,101,  0, 98,111,120,115,112, 97,
- 99,101,  0, 98,117,116,116,111,110,115,112, 97, 99,101,120,  0, 98,117,116,116,111,110,115,112, 97, 99,101,121,  0,112, 97,110,
-101,108,115,112, 97, 99,101,  0,112, 97,110,101,108,111,117,116,101,114,  0,112, 97,100, 91, 49, 93,  0,111,117,116,108,105,110,
-101, 91, 52, 93,  0,105,110,110,101,114, 91, 52, 93,  0,105,110,110,101,114, 95,115,101,108, 91, 52, 93,  0,105,116,101,109, 91,
- 52, 93,  0,116,101,120,116, 91, 52, 93,  0,116,101,120,116, 95,115,101,108, 91, 52, 93,  0,115,104, 97,100,101,100,  0,115,104,
- 97,100,101,116,111,112,  0,115,104, 97,100,101,100,111,119,110,  0,105,110,110,101,114, 95, 97,110,105,109, 91, 52, 93,  0,105,
-110,110,101,114, 95, 97,110,105,109, 95,115,101,108, 91, 52, 93,  0,105,110,110,101,114, 95,107,101,121, 91, 52, 93,  0,105,110,
-110,101,114, 95,107,101,121, 95,115,101,108, 91, 52, 93,  0,105,110,110,101,114, 95,100,114,105,118,101,110, 91, 52, 93,  0,105,
-110,110,101,114, 95,100,114,105,118,101,110, 95,115,101,108, 91, 52, 93,  0,119, 99,111,108, 95,114,101,103,117,108, 97,114,  0,
-119, 99,111,108, 95,116,111,111,108,  0,119, 99,111,108, 95,116,101,120,116,  0,119, 99,111,108, 95,114, 97,100,105,111,  0,119,
- 99,111,108, 95,111,112,116,105,111,110,  0,119, 99,111,108, 95,116,111,103,103,108,101,  0,119, 99,111,108, 95,110,117,109,  0,
-119, 99,111,108, 95,110,117,109,115,108,105,100,101,114,  0,119, 99,111,108, 95,109,101,110,117,  0,119, 99,111,108, 95,112,117,
-108,108,100,111,119,110,  0,119, 99,111,108, 95,109,101,110,117, 95, 98, 97, 99,107,  0,119, 99,111,108, 95,109,101,110,117, 95,
-105,116,101,109,  0,119, 99,111,108, 95, 98,111,120,  0,119, 99,111,108, 95,115, 99,114,111,108,108,  0,119, 99,111,108, 95,108,
-105,115,116, 95,105,116,101,109,  0,119, 99,111,108, 95,115,116, 97,116,101,  0,105, 99,111,110,102,105,108,101, 91, 56, 48, 93,
-  0, 98, 97, 99,107, 91, 52, 93,  0,116,105,116,108,101, 91, 52, 93,  0,116,101,120,116, 95,104,105, 91, 52, 93,  0,104,101, 97,
-100,101,114, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,105,116,108,101, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,101,
-120,116, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0, 98,117,116,116,111,110, 91, 52,
- 93,  0, 98,117,116,116,111,110, 95,116,105,116,108,101, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,101,120,116, 91, 52, 93,
-  0, 98,117,116,116,111,110, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,108,105,115,116, 91, 52, 93,  0,108,105,115,116, 95,
-116,105,116,108,101, 91, 52, 93,  0,108,105,115,116, 95,116,101,120,116, 91, 52, 93,  0,108,105,115,116, 95,116,101,120,116, 95,
-104,105, 91, 52, 93,  0,112, 97,110,101,108, 91, 52, 93,  0,112, 97,110,101,108, 95,116,105,116,108,101, 91, 52, 93,  0,112, 97,
-110,101,108, 95,116,101,120,116, 91, 52, 93,  0,112, 97,110,101,108, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,115,104, 97,
-100,101, 49, 91, 52, 93,  0,115,104, 97,100,101, 50, 91, 52, 93,  0,104,105,108,105,116,101, 91, 52, 93,  0,103,114,105,100, 91,
- 52, 93,  0,119,105,114,101, 91, 52, 93,  0,115,101,108,101, 99,116, 91, 52, 93,  0,108, 97,109,112, 91, 52, 93,  0, 97, 99,116,
-105,118,101, 91, 52, 93,  0,103,114,111,117,112, 91, 52, 93,  0,103,114,111,117,112, 95, 97, 99,116,105,118,101, 91, 52, 93,  0,
-116,114, 97,110,115,102,111,114,109, 91, 52, 93,  0,118,101,114,116,101,120, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,101,
-108,101, 99,116, 91, 52, 93,  0,101,100,103,101, 91, 52, 93,  0,101,100,103,101, 95,115,101,108,101, 99,116, 91, 52, 93,  0,101,
-100,103,101, 95,115,101, 97,109, 91, 52, 93,  0,101,100,103,101, 95,115,104, 97,114,112, 91, 52, 93,  0,101,100,103,101, 95,102,
- 97, 99,101,115,101,108, 91, 52, 93,  0,102, 97, 99,101, 91, 52, 93,  0,102, 97, 99,101, 95,115,101,108,101, 99,116, 91, 52, 93,
-  0,102, 97, 99,101, 95,100,111,116, 91, 52, 93,  0,110,111,114,109, 97,108, 91, 52, 93,  0, 98,111,110,101, 95,115,111,108,105,
-100, 91, 52, 93,  0, 98,111,110,101, 95,112,111,115,101, 91, 52, 93,  0,115,116,114,105,112, 91, 52, 93,  0,115,116,114,105,112,
- 95,115,101,108,101, 99,116, 91, 52, 93,  0, 99,102,114, 97,109,101, 91, 52, 93,  0,100,115, 95, 99,104, 97,110,110,101,108, 91,
- 52, 93,  0,100,115, 95,115,117, 98, 99,104, 97,110,110,101,108, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,105,122,101,  0,
-102, 97, 99,101,100,111,116, 95,115,105,122,101,  0, 98,112, 97,100, 91, 50, 93,  0,115,121,110,116, 97,120,108, 91, 52, 93,  0,
-115,121,110,116, 97,120,110, 91, 52, 93,  0,115,121,110,116, 97,120, 98, 91, 52, 93,  0,115,121,110,116, 97,120,118, 91, 52, 93,
-  0,115,121,110,116, 97,120, 99, 91, 52, 93,  0,109,111,118,105,101, 91, 52, 93,  0,105,109, 97,103,101, 91, 52, 93,  0,115, 99,
-101,110,101, 91, 52, 93,  0, 97,117,100,105,111, 91, 52, 93,  0,101,102,102,101, 99,116, 91, 52, 93,  0,112,108,117,103,105,110,
- 91, 52, 93,  0,116,114, 97,110,115,105,116,105,111,110, 91, 52, 93,  0,109,101,116, 97, 91, 52, 93,  0,101,100,105,116,109,101,
-115,104, 95, 97, 99,116,105,118,101, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 91, 52, 93,  0,104, 97,
-110,100,108,101, 95,118,101,114,116,101,120, 95,115,101,108,101, 99,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,
-116,101,120, 95,115,105,122,101,  0,104,112, 97,100, 91, 51, 93,  0,115,111,108,105,100, 91, 52, 93,  0,116,117,105,  0,116, 98,
-117,116,115,  0,116,118, 51,100,  0,116,102,105,108,101,  0,116,105,112,111,  0,116,105,110,102,111,  0,116,115,110,100,  0,116,
- 97, 99,116,  0,116,110,108, 97,  0,116,115,101,113,  0,116,105,109, 97,  0,116,105,109, 97,115,101,108,  0,116,101,120,116,  0,
-116,111,111,112,115,  0,116,116,105,109,101,  0,116,110,111,100,101,  0,116,108,111,103,105, 99,  0,116, 97,114,109, 91, 50, 48,
- 93,  0,115,112,101, 99, 91, 52, 93,  0,100,117,112,102,108, 97,103,  0,115, 97,118,101,116,105,109,101,  0,116,101,109,112,100,
-105,114, 91, 49, 54, 48, 93,  0,102,111,110,116,100,105,114, 91, 49, 54, 48, 93,  0,114,101,110,100,101,114,100,105,114, 91, 49,
- 54, 48, 93,  0,116,101,120,116,117,100,105,114, 91, 49, 54, 48, 93,  0,112,108,117,103,116,101,120,100,105,114, 91, 49, 54, 48,
- 93,  0,112,108,117,103,115,101,113,100,105,114, 91, 49, 54, 48, 93,  0,112,121,116,104,111,110,100,105,114, 91, 49, 54, 48, 93,
-  0,115,111,117,110,100,100,105,114, 91, 49, 54, 48, 93,  0,121,102,101,120,112,111,114,116,100,105,114, 91, 49, 54, 48, 93,  0,
-118,101,114,115,105,111,110,115,  0,103, 97,109,101,102,108, 97,103,115,  0,119,104,101,101,108,108,105,110,101,115, 99,114,111,
-108,108,  0,117,105,102,108, 97,103,  0,108, 97,110,103,117, 97,103,101,  0,117,115,101,114,112,114,101,102,  0,118,105,101,119,
-122,111,111,109,  0,109,105,120, 98,117,102,115,105,122,101,  0,100,112,105,  0,101,110, 99,111,100,105,110,103,  0,116,114, 97,
-110,115,111,112,116,115,  0,109,101,110,117,116,104,114,101,115,104,111,108,100, 49,  0,109,101,110,117,116,104,114,101,115,104,
-111,108,100, 50,  0,116,104,101,109,101,115,  0,117,105,102,111,110,116,115,  0,117,105,115,116,121,108,101,115,  0,117,110,100,
-111,115,116,101,112,115,  0,117,110,100,111,109,101,109,111,114,121,  0,103,112, 95,109, 97,110,104, 97,116,116,101,110,100,105,
-115,116,  0,103,112, 95,101,117, 99,108,105,100,101, 97,110,100,105,115,116,  0,103,112, 95,101,114, 97,115,101,114,  0,103,112,
- 95,115,101,116,116,105,110,103,115,  0,116, 98, 95,108,101,102,116,109,111,117,115,101,  0,116, 98, 95,114,105,103,104,116,109,
-111,117,115,101,  0,108,105,103,104,116, 91, 51, 93,  0,116,119, 95,104,111,116,115,112,111,116,  0,116,119, 95,102,108, 97,103,
-  0,116,119, 95,104, 97,110,100,108,101,115,105,122,101,  0,116,119, 95,115,105,122,101,  0,116,101,120,116,105,109,101,111,117,
-116,  0,116,101,120, 99,111,108,108,101, 99,116,114, 97,116,101,  0,119,109,100,114, 97,119,109,101,116,104,111,100,  0,119,109,
-112, 97,100,  0,109,101,109, 99, 97, 99,104,101,108,105,109,105,116,  0,112,114,101,102,101,116, 99,104,102,114, 97,109,101,115,
-  0,102,114, 97,109,101,115,101,114,118,101,114,112,111,114,116,  0,112, 97,100, 95,114,111,116, 95, 97,110,103,108,101,  0,111,
- 98, 99,101,110,116,101,114, 95,100,105, 97,  0,114,118,105,115,105,122,101,  0,114,118,105, 98,114,105,103,104,116,  0,114,101,
- 99,101,110,116, 95,102,105,108,101,115,  0,115,109,111,111,116,104, 95,118,105,101,119,116,120,  0,103,108,114,101,115,108,105,
-109,105,116,  0,110,100,111,102, 95,112, 97,110,  0,110,100,111,102, 95,114,111,116, 97,116,101,  0, 99,117,114,115,115,105,122,
-101,  0,105,112,111, 95,110,101,119,  0,118,101,114,115,101,109, 97,115,116,101,114, 91, 49, 54, 48, 93,  0,118,101,114,115,101,
-117,115,101,114, 91, 49, 54, 48, 93,  0,103,108, 97,108,112,104, 97, 99,108,105,112,  0, 97,117,116,111,107,101,121, 95,102,108,
- 97,103,  0, 99,111, 98, 97, 95,119,101,105,103,104,116,  0,118,101,114,116, 98, 97,115,101,  0,101,100,103,101, 98, 97,115,101,
-  0, 97,114,101, 97, 98, 97,115,101,  0, 42,110,101,119,115, 99,101,110,101,  0,102,117,108,108,  0,119,105,110,105,100,  0,100,
-111, 95,100,114, 97,119,  0,100,111, 95,114,101,102,114,101,115,104,  0,100,111, 95,100,114, 97,119, 95,103,101,115,116,117,114,
-101,  0,100,111, 95,100,114, 97,119, 95,112, 97,105,110,116, 99,117,114,115,111,114,  0,115,119, 97,112,  0,109, 97,105,110,119,
-105,110,  0,115,117, 98,119,105,110, 97, 99,116,105,118,101,  0, 42, 97,110,105,109,116,105,109,101,114,  0, 42, 99,111,110,116,
-101,120,116,  0,104, 97,110,100,108,101,114, 91, 56, 93,  0, 42,110,101,119,118,  0,118,101, 99,  0, 42,118, 49,  0, 42,118, 50,
-  0, 42,116,121,112,101,  0,112, 97,110,101,108,110, 97,109,101, 91, 54, 52, 93,  0,116, 97, 98,110, 97,109,101, 91, 54, 52, 93,
-  0,100,114, 97,119,110, 97,109,101, 91, 54, 52, 93,  0,111,102,115,120,  0,111,102,115,121,  0,115,105,122,101,120,  0,115,105,
-122,101,121,  0,108, 97, 98,101,108,111,102,115,  0,114,117,110,116,105,109,101, 95,102,108, 97,103,  0, 99,111,110,116,114,111,
-108,  0,115,110, 97,112,  0,115,111,114,116,111,114,100,101,114,  0, 42,112, 97,110,101,108,116, 97, 98,  0, 42, 97, 99,116,105,
-118,101,100, 97,116, 97,  0,108,105,115,116, 95,115, 99,114,111,108,108,  0,108,105,115,116, 95,115,105,122,101,  0,108,105,115,
-116, 95,115,101, 97,114, 99,104, 91, 54, 52, 93,  0, 42,118, 51,  0, 42,118, 52,  0, 42,102,117,108,108,  0, 98,117,116,115,112,
- 97, 99,101,116,121,112,101,  0,104,101, 97,100,101,114,116,121,112,101,  0,115,112, 97, 99,101,100, 97,116, 97,  0,104, 97,110,
-100,108,101,114,115,  0, 97, 99,116,105,111,110,122,111,110,101,115,  0,119,105,110,114, 99,116,  0,100,114, 97,119,114, 99,116,
-  0,115,119,105,110,105,100,  0,114,101,103,105,111,110,116,121,112,101,  0, 97,108,105,103,110,109,101,110,116,  0,117,105, 98,
-108,111, 99,107,115,  0,112, 97,110,101,108,115,  0, 42,104,101, 97,100,101,114,115,116,114,  0, 42,114,101,103,105,111,110,100,
- 97,116, 97,  0,115,117, 98,118,115,116,114, 91, 52, 93,  0,115,117, 98,118,101,114,115,105,111,110,  0,112, 97,100,115,  0,109,
-105,110,118,101,114,115,105,111,110,  0,109,105,110,115,117, 98,118,101,114,115,105,111,110,  0, 42, 99,117,114,115, 99,114,101,
-101,110,  0, 42, 99,117,114,115, 99,101,110,101,  0,102,105,108,101,102,108, 97,103,115,  0,103,108,111, 98, 97,108,102,  0,110,
- 97,109,101, 91, 56, 48, 93,  0, 42,105, 98,117,102,  0, 42,105, 98,117,102, 95, 99,111,109,112,  0, 42,115,101, 49,  0, 42,115,
-101, 50,  0, 42,115,101, 51,  0,110,114,  0, 98,111,116,116,111,109,  0,114,105,103,104,116,  0,120,111,102,115,  0,121,111,102,
-115,  0,108,105,102,116, 91, 51, 93,  0,103, 97,109,109, 97, 91, 51, 93,  0,103, 97,105,110, 91, 51, 93,  0,115, 97,116,117,114,
- 97,116,105,111,110,  0,100,105,114, 91, 49, 54, 48, 93,  0,100,111,110,101,  0,115,116, 97,114,116,115,116,105,108,108,  0,101,
-110,100,115,116,105,108,108,  0, 42,115,116,114,105,112,100, 97,116, 97,  0,111,114,120,  0,111,114,121,  0, 42, 99,114,111,112,
-  0, 42,116,114, 97,110,115,102,111,114,109,  0, 42, 99,111,108,111,114, 95, 98, 97,108, 97,110, 99,101,  0, 42,116,115,116,114,
-105,112,100, 97,116, 97,  0, 42,116,115,116,114,105,112,100, 97,116, 97, 95,115,116, 97,114,116,115,116,105,108,108,  0, 42,116,
-115,116,114,105,112,100, 97,116, 97, 95,101,110,100,115,116,105,108,108,  0, 42,105, 98,117,102, 95,115,116, 97,114,116,115,116,
-105,108,108,  0, 42,105, 98,117,102, 95,101,110,100,115,116,105,108,108,  0, 42,105,110,115,116, 97,110, 99,101, 95,112,114,105,
-118, 97,116,101, 95,100, 97,116, 97,  0, 42, 42, 99,117,114,114,101,110,116, 95,112,114,105,118, 97,116,101, 95,100, 97,116, 97,
-  0, 42,116,109,112,  0,115,116, 97,114,116,111,102,115,  0,101,110,100,111,102,115,  0,109, 97, 99,104,105,110,101,  0,115,116,
- 97,114,116,100,105,115,112,  0,101,110,100,100,105,115,112,  0,104, 97,110,100,115,105,122,101,  0, 97,110,105,109, 95,112,114,
-101,115,101,101,107,  0, 42,115,116,114,105,112,  0,102, 97, 99,102, 48,  0,102, 97, 99,102, 49,  0, 42,115,101,113, 49,  0, 42,
-115,101,113, 50,  0, 42,115,101,113, 51,  0,115,101,113, 98, 97,115,101,  0, 42,115,111,117,110,100,  0, 42,104,100, 97,117,100,
-105,111,  0,108,101,118,101,108,  0,112, 97,110,  0,115, 99,101,110,101,110,114,  0,115,116,114,111, 98,101,  0, 42,101,102,102,
-101, 99,116,100, 97,116, 97,  0, 97,110,105,109, 95,115,116, 97,114,116,111,102,115,  0, 97,110,105,109, 95,101,110,100,111,102,
-115,  0, 98,108,101,110,100, 95,109,111,100,101,  0, 98,108,101,110,100, 95,111,112, 97, 99,105,116,121,  0, 42,111,108,100, 98,
- 97,115,101,112,  0, 42,112, 97,114,115,101,113,  0, 42,115,101,113, 98, 97,115,101,112,  0,109,101,116, 97,115,116, 97, 99,107,
-  0, 42, 97, 99,116, 95,115,101,113,  0, 97, 99,116, 95,105,109, 97,103,101,100,105,114, 91, 50, 53, 54, 93,  0, 97, 99,116, 95,
-115,111,117,110,100,100,105,114, 91, 50, 53, 54, 93,  0,101,100,103,101, 87,105,100,116,104,  0,102,111,114,119, 97,114,100,  0,
-119,105,112,101,116,121,112,101,  0,102, 77,105,110,105,  0,102, 67,108, 97,109,112,  0,102, 66,111,111,115,116,  0,100, 68,105,
-115,116,  0,100, 81,117, 97,108,105,116,121,  0, 98, 78,111, 67,111,109,112,  0, 83, 99, 97,108,101,120, 73,110,105,  0, 83, 99,
- 97,108,101,121, 73,110,105,  0, 83, 99, 97,108,101,120, 70,105,110,  0, 83, 99, 97,108,101,121, 70,105,110,  0,120, 73,110,105,
-  0,120, 70,105,110,  0,121, 73,110,105,  0,121, 70,105,110,  0,114,111,116, 73,110,105,  0,114,111,116, 70,105,110,  0,105,110,
-116,101,114,112,111,108, 97,116,105,111,110,  0, 42,102,114, 97,109,101, 77, 97,112,  0,103,108,111, 98, 97,108, 83,112,101,101,
-100,  0,108, 97,115,116, 86, 97,108,105,100, 70,114, 97,109,101,  0, 98,117,116,116,121,112,101,  0,117,115,101,114,106,105,116,
-  0,115,116, 97,  0,116,111,116,112, 97,114,116,  0,110,111,114,109,102, 97, 99,  0,111, 98,102, 97, 99,  0,114, 97,110,100,102,
- 97, 99,  0,116,101,120,102, 97, 99,  0,114, 97,110,100,108,105,102,101,  0,102,111,114, 99,101, 91, 51, 93,  0,118,101, 99,116,
-115,105,122,101,  0,109, 97,120,108,101,110,  0,100,101,102,118,101, 99, 91, 51, 93,  0,109,117,108,116, 91, 52, 93,  0,108,105,
-102,101, 91, 52, 93,  0, 99,104,105,108,100, 91, 52, 93,  0,109, 97,116, 91, 52, 93,  0,116,101,120,109, 97,112,  0, 99,117,114,
-109,117,108,116,  0,115,116, 97,116,105, 99,115,116,101,112,  0,111,109, 97,116,  0,116,105,109,101,116,101,120,  0,115,112,101,
-101,100,116,101,120,  0,102,108, 97,103, 50,110,101,103,  0,118,101,114,116,103,114,111,117,112, 95,118,  0,118,103,114,111,117,
-112,110, 97,109,101, 91, 51, 50, 93,  0,118,103,114,111,117,112,110, 97,109,101, 95,118, 91, 51, 50, 93,  0, 42,107,101,121,115,
-  0,109,105,110,102, 97, 99,  0,117,115,101,100,  0,117,115,101,100,101,108,101,109,  0, 42,112,111,105,110,  0,114,101,115,101,
-116,100,105,115,116,  0,108, 97,115,116,118, 97,108,  0, 42,109, 97,  0,107,101,121,  0,113,117, 97,108,  0,113,117, 97,108, 50,
-  0,116, 97,114,103,101,116, 78, 97,109,101, 91, 51, 50, 93,  0,116,111,103,103,108,101, 78, 97,109,101, 91, 51, 50, 93,  0,118,
- 97,108,117,101, 91, 51, 50, 93,  0,109, 97,120,118, 97,108,117,101, 91, 51, 50, 93,  0,100,101,108, 97,121,  0,100,117,114, 97,
-116,105,111,110,  0,109, 97,116,101,114,105, 97,108, 78, 97,109,101, 91, 51, 50, 93,  0,100, 97,109,112,116,105,109,101,114,  0,
-112,114,111,112,110, 97,109,101, 91, 51, 50, 93,  0,109, 97,116,110, 97,109,101, 91, 51, 50, 93,  0, 97,120,105,115,102,108, 97,
-103,  0, 42,102,114,111,109, 79, 98,106,101, 99,116,  0,115,117, 98,106,101, 99,116, 91, 51, 50, 93,  0, 98,111,100,121, 91, 51,
- 50, 93,  0,111,116,121,112,101,  0,112,117,108,115,101,  0,102,114,101,113,  0,116,111,116,108,105,110,107,115,  0, 42, 42,108,
-105,110,107,115,  0,116, 97,112,  0,106,111,121,105,110,100,101,120,  0, 97,120,105,115, 95,115,105,110,103,108,101,  0, 97,120,
-105,115,102,  0, 98,117,116,116,111,110,  0,104, 97,116,  0,104, 97,116,102,  0,112,114,101, 99,105,115,105,111,110,  0,115,116,
-114, 91, 49, 50, 56, 93,  0,109,111,100,117,108,101, 91, 54, 52, 93,  0, 42,109,121,110,101,119,  0,105,110,112,117,116,115,  0,
-116,111,116,115,108,105,110,107,115,  0, 42, 42,115,108,105,110,107,115,  0,118, 97,108,111,  0,115,116, 97,116,101, 95,109, 97,
-115,107,  0, 42, 97, 99,116,  0,102,114, 97,109,101, 80,114,111,112, 91, 51, 50, 93,  0, 98,108,101,110,100,105,110,  0,112,114,
-105,111,114,105,116,121,  0,101,110,100, 95,114,101,115,101,116,  0,115,116,114,105,100,101, 97,120,105,115,  0,115,116,114,105,
-100,101,108,101,110,103,116,104,  0,115,110,100,110,114,  0,112, 97,100, 49, 91, 50, 93,  0,109, 97,107,101, 99,111,112,121,  0,
- 99,111,112,121,109, 97,100,101,  0,112, 97,100, 50, 91, 49, 93,  0,116,114, 97, 99,107,  0, 42,109,101,  0,108,105,110, 86,101,
-108,111, 99,105,116,121, 91, 51, 93,  0, 97,110,103, 86,101,108,111, 99,105,116,121, 91, 51, 93,  0,108,111, 99, 97,108,102,108,
- 97,103,  0,100,121,110, 95,111,112,101,114, 97,116,105,111,110,  0,102,111,114, 99,101,108,111, 99, 91, 51, 93,  0,102,111,114,
- 99,101,114,111,116, 91, 51, 93,  0,108,105,110,101, 97,114,118,101,108,111, 99,105,116,121, 91, 51, 93,  0, 97,110,103,117,108,
- 97,114,118,101,108,111, 99,105,116,121, 91, 51, 93,  0, 42,114,101,102,101,114,101,110, 99,101,  0, 98,117,116,115,116, 97,  0,
- 98,117,116,101,110,100,  0,109,105,110,  0,109, 97,120,  0,118,105,115,105,102, 97, 99,  0,114,111,116,100, 97,109,112,  0,109,
-105,110,108,111, 99, 91, 51, 93,  0,109, 97,120,108,111, 99, 91, 51, 93,  0,109,105,110,114,111,116, 91, 51, 93,  0,109, 97,120,
-114,111,116, 91, 51, 93,  0,109, 97,116,112,114,111,112, 91, 51, 50, 93,  0,100,105,115,116,114,105, 98,117,116,105,111,110,  0,
-105,110,116, 95, 97,114,103, 95, 49,  0,105,110,116, 95, 97,114,103, 95, 50,  0,102,108,111, 97,116, 95, 97,114,103, 95, 49,  0,
-102,108,111, 97,116, 95, 97,114,103, 95, 50,  0,116,111, 80,114,111,112, 78, 97,109,101, 91, 51, 50, 93,  0, 42,116,111, 79, 98,
-106,101, 99,116,  0, 98,111,100,121, 84,121,112,101,  0,102,105,108,101,110, 97,109,101, 91, 54, 52, 93,  0,108,111, 97,100, 97,
-110,105,110, 97,109,101, 91, 54, 52, 93,  0,105,110,116, 95, 97,114,103,  0,102,108,111, 97,116, 95, 97,114,103,  0,103,111,  0,
- 97, 99, 99,101,108,108,101,114, 97,116,105,111,110,  0,109, 97,120,115,112,101,101,100,  0,109, 97,120,114,111,116,115,112,101,
-101,100,  0,109, 97,120,116,105,108,116,115,112,101,101,100,  0,116,105,108,116,100, 97,109,112,  0,115,112,101,101,100,100, 97,
-109,112,  0, 42,115, 97,109,112,108,101,  0, 42,115,116,114,101, 97,109,  0, 42,110,101,119,112, 97, 99,107,101,100,102,105,108,
-101,  0, 42,115,110,100, 95,115,111,117,110,100,  0,112, 97,110,110,105,110,103,  0, 97,116,116,101,110,117, 97,116,105,111,110,
-  0,112,105,116, 99,104,  0,109,105,110, 95,103, 97,105,110,  0,109, 97,120, 95,103, 97,105,110,  0,100,105,115,116, 97,110, 99,
-101,  0,115,116,114,101, 97,109,108,101,110,  0, 99,104, 97,110,110,101,108,115,  0,104,105,103,104,112,114,105,111,  0,112, 97,
-100, 91, 49, 48, 93,  0,103, 97,105,110,  0,100,111,112,112,108,101,114,102, 97, 99,116,111,114,  0,100,111,112,112,108,101,114,
-118,101,108,111, 99,105,116,121,  0,110,117,109,115,111,117,110,100,115, 98,108,101,110,100,101,114,  0,110,117,109,115,111,117,
-110,100,115,103, 97,109,101,101,110,103,105,110,101,  0, 42, 97,114,101, 97,  0, 42,108, 97,109,112,114,101,110,  0,103,111, 98,
+101,109,  0,118,101, 99, 91, 51, 93, 91, 51, 93,  0, 97,108,102, 97,  0,119,101,105,103,104,116,  0,104, 49,  0,104, 50,  0,102,
+ 49,  0,102, 50,  0,102, 51,  0,104,105,100,101,  0,118,101, 99, 91, 52, 93,  0,109, 97,116, 95,110,114,  0,112,110,116,115,117,
+  0,112,110,116,115,118,  0,114,101,115,111,108,117,  0,114,101,115,111,108,118,  0,111,114,100,101,114,117,  0,111,114,100,101,
+114,118,  0,102,108, 97,103,117,  0,102,108, 97,103,118,  0, 42,107,110,111,116,115,117,  0, 42,107,110,111,116,115,118,  0,116,
+105,108,116, 95,105,110,116,101,114,112,  0,114, 97,100,105,117,115, 95,105,110,116,101,114,112,  0, 99,104, 97,114,105,100,120,
+  0,107,101,114,110,  0,104,  0,110,117,114, 98,  0, 42,101,100,105,116,110,117,114, 98,  0, 42, 98,101,118,111, 98,106,  0, 42,
+116, 97,112,101,114,111, 98,106,  0, 42,116,101,120,116,111,110, 99,117,114,118,101,  0, 42,112, 97,116,104,  0, 42,107,101,121,
+  0, 98,101,118,  0,100,114, 97,119,102,108, 97,103,  0,116,119,105,115,116, 95,109,111,100,101,  0,112, 97,100, 91, 50, 93,  0,
+116,119,105,115,116, 95,115,109,111,111,116,104,  0,112, 97,116,104,108,101,110,  0, 98,101,118,114,101,115,111,108,  0,119,105,
+100,116,104,  0,101,120,116, 49,  0,101,120,116, 50,  0,114,101,115,111,108,117, 95,114,101,110,  0,114,101,115,111,108,118, 95,
+114,101,110,  0, 97, 99,116,110,117,  0, 42,108, 97,115,116,115,101,108, 98,112,  0,115,112, 97, 99,101,109,111,100,101,  0,115,
+112, 97, 99,105,110,103,  0,108,105,110,101,100,105,115,116,  0,115,104,101, 97,114,  0,102,115,105,122,101,  0,119,111,114,100,
+115,112, 97, 99,101,  0,117,108,112,111,115,  0,117,108,104,101,105,103,104,116,  0,120,111,102,  0,121,111,102,  0,108,105,110,
+101,119,105,100,116,104,  0, 42,115,116,114,  0, 42,115,101,108, 98,111,120,101,115,  0, 42,101,100,105,116,102,111,110,116,  0,
+102, 97,109,105,108,121, 91, 50, 52, 93,  0, 42,118,102,111,110,116,  0, 42,118,102,111,110,116, 98,  0, 42,118,102,111,110,116,
+105,  0, 42,118,102,111,110,116, 98,105,  0,115,101,112, 99,104, 97,114,  0, 99,116,105,109,101,  0,116,111,116, 98,111,120,  0,
+ 97, 99,116, 98,111,120,  0, 42,116, 98,  0,115,101,108,115,116, 97,114,116,  0,115,101,108,101,110,100,  0, 42,115,116,114,105,
+110,102,111,  0, 99,117,114,105,110,102,111,  0,101,102,102,101, 99,116,  0, 42,109,102, 97, 99,101,  0, 42,109,116,102, 97, 99,
+101,  0, 42,116,102, 97, 99,101,  0, 42,109,118,101,114,116,  0, 42,109,101,100,103,101,  0, 42,100,118,101,114,116,  0, 42,109,
+ 99,111,108,  0, 42,109,115,116,105, 99,107,121,  0, 42,116,101,120, 99,111,109,101,115,104,  0, 42,109,115,101,108,101, 99,116,
+  0, 42,101,100,105,116, 95,109,101,115,104,  0,118,100, 97,116, 97,  0,101,100, 97,116, 97,  0,102,100, 97,116, 97,  0,116,111,
+116,101,100,103,101,  0,116,111,116,102, 97, 99,101,  0,116,111,116,115,101,108,101, 99,116,  0, 97, 99,116, 95,102, 97, 99,101,
+  0, 99,117, 98,101,109, 97,112,115,105,122,101,  0,115,109,111,111,116,104,114,101,115,104,  0,115,117, 98,100,105,118,  0,115,
+117, 98,100,105,118,114,  0,115,117, 98,115,117,114,102,116,121,112,101,  0, 42,109,114,  0, 42,112,118,  0, 42,116,112, 97,103,
+101,  0,117,118, 91, 52, 93, 91, 50, 93,  0, 99,111,108, 91, 52, 93,  0,116,114, 97,110,115,112,  0,116,105,108,101,  0,117,110,
+119,114, 97,112,  0,118, 49,  0,118, 50,  0,118, 51,  0,118, 52,  0,101,100, 99,111,100,101,  0, 99,114,101, 97,115,101,  0, 98,
+119,101,105,103,104,116,  0,100,101,102, 95,110,114,  0, 42,100,119,  0,116,111,116,119,101,105,103,104,116,  0, 99,111, 91, 51,
+ 93,  0,110,111, 91, 51, 93,  0,117,118, 91, 50, 93,  0, 99,111, 91, 50, 93,  0,105,110,100,101,120,  0,102,  0,105,  0,115, 91,
+ 50, 53, 54, 93,  0,116,111,116,100,105,115,112,  0, 40, 42,100,105,115,112,115, 41, 40, 41,  0,118, 91, 52, 93,  0,109,105,100,
+  0,118, 91, 50, 93,  0, 42,102, 97, 99,101,115,  0, 42, 99,111,108,102, 97, 99,101,115,  0, 42,101,100,103,101,115,  0, 42,118,
+101,114,116,115,  0,108,101,118,101,108,115,  0,108,101,118,101,108, 95, 99,111,117,110,116,  0, 99,117,114,114,101,110,116,  0,
+110,101,119,108,118,108,  0,101,100,103,101,108,118,108,  0,112,105,110,108,118,108,  0,114,101,110,100,101,114,108,118,108,  0,
+117,115,101, 95, 99,111,108,  0, 42,101,100,103,101, 95,102,108, 97,103,115,  0, 42,101,100,103,101, 95, 99,114,101, 97,115,101,
+115,  0, 42,118,101,114,116, 95,109, 97,112,  0, 42,101,100,103,101, 95,109, 97,112,  0, 42,111,108,100, 95,102, 97, 99,101,115,
+  0, 42,111,108,100, 95,101,100,103,101,115,  0, 42,101,114,114,111,114,  0,109,111,100,105,102,105,101,114,  0,115,117, 98,100,
+105,118, 84,121,112,101,  0,114,101,110,100,101,114, 76,101,118,101,108,115,  0, 42,101,109, 67, 97, 99,104,101,  0, 42,109, 67,
+ 97, 99,104,101,  0,100,101,102, 97,120,105,115,  0,112, 97,100, 91, 54, 93,  0,108,101,110,103,116,104,  0,114, 97,110,100,111,
+109,105,122,101,  0,115,101,101,100,  0, 42,111, 98, 95, 97,114,109,  0, 42,115,116, 97,114,116, 95, 99, 97,112,  0, 42,101,110,
+100, 95, 99, 97,112,  0, 42, 99,117,114,118,101, 95,111, 98,  0, 42,111,102,102,115,101,116, 95,111, 98,  0,111,102,102,115,101,
+116, 91, 51, 93,  0,115, 99, 97,108,101, 91, 51, 93,  0,109,101,114,103,101, 95,100,105,115,116,  0,102,105,116, 95,116,121,112,
+101,  0,111,102,102,115,101,116, 95,116,121,112,101,  0, 99,111,117,110,116,  0, 97,120,105,115,  0,116,111,108,101,114, 97,110,
+ 99,101,  0, 42,109,105,114,114,111,114, 95,111, 98,  0,115,112,108,105,116, 95, 97,110,103,108,101,  0,118, 97,108,117,101,  0,
+114,101,115,  0,118, 97,108, 95,102,108, 97,103,115,  0,108,105,109, 95,102,108, 97,103,115,  0,101, 95,102,108, 97,103,115,  0,
+ 98,101,118,101,108, 95, 97,110,103,108,101,  0,100,101,102,103,114,112, 95,110, 97,109,101, 91, 51, 50, 93,  0, 42,100,111,109,
+ 97,105,110,  0, 42,102,108,111,119,  0, 42, 99,111,108,108,  0,116,105,109,101,  0, 42,116,101,120,116,117,114,101,  0,115,116,
+114,101,110,103,116,104,  0,100,105,114,101, 99,116,105,111,110,  0,109,105,100,108,101,118,101,108,  0,116,101,120,109, 97,112,
+112,105,110,103,  0, 42,109, 97,112, 95,111, 98,106,101, 99,116,  0,117,118,108, 97,121,101,114, 95,110, 97,109,101, 91, 51, 50,
+ 93,  0,117,118,108, 97,121,101,114, 95,116,109,112,  0, 42,112,114,111,106,101, 99,116,111,114,115, 91, 49, 48, 93,  0, 42,105,
+109, 97,103,101,  0,110,117,109, 95,112,114,111,106,101, 99,116,111,114,115,  0, 97,115,112,101, 99,116,120,  0, 97,115,112,101,
+ 99,116,121,  0,112,101,114, 99,101,110,116,  0,102, 97, 99,101, 67,111,117,110,116,  0,102, 97, 99,  0,114,101,112,101, 97,116,
+  0, 42,111, 98,106,101, 99,116, 99,101,110,116,101,114,  0,115,116, 97,114,116,120,  0,115,116, 97,114,116,121,  0,104,101,105,
+103,104,116,  0,110, 97,114,114,111,119,  0,115,112,101,101,100,  0,100, 97,109,112,  0,102, 97,108,108,111,102,102,  0,116,105,
+109,101,111,102,102,115,  0,108,105,102,101,116,105,109,101,  0,100,101,102,111,114,109,102,108, 97,103,  0,109,117,108,116,105,
+  0, 42,112,114,101,118, 67,111,115,  0,115,117, 98,116, 97,114,103,101,116, 91, 51, 50, 93,  0,112, 97,114,101,110,116,105,110,
+118, 91, 52, 93, 91, 52, 93,  0, 99,101,110,116, 91, 51, 93,  0, 42,105,110,100,101,120, 97,114,  0,116,111,116,105,110,100,101,
+120,  0,102,111,114, 99,101,  0, 42, 99,108,111,116,104, 79, 98,106,101, 99,116,  0, 42,115,105,109, 95,112, 97,114,109,115,  0,
+ 42, 99,111,108,108, 95,112, 97,114,109,115,  0, 42,112,111,105,110,116, 95, 99, 97, 99,104,101,  0,112,116, 99, 97, 99,104,101,
+115,  0, 42,120,  0, 42,120,110,101,119,  0, 42,120,111,108,100,  0, 42, 99,117,114,114,101,110,116, 95,120,110,101,119,  0, 42,
+ 99,117,114,114,101,110,116, 95,120,  0, 42, 99,117,114,114,101,110,116, 95,118,  0, 42,109,102, 97, 99,101,115,  0,110,117,109,
+118,101,114,116,115,  0,110,117,109,102, 97, 99,101,115,  0, 42, 98,118,104,116,114,101,101,  0, 42,118,  0, 42,100,109,  0, 99,
+102,114, 97,  0,111,112,101,114, 97,116,105,111,110,  0,118,101,114,116,101,120,  0,116,111,116,105,110,102,108,117,101,110, 99,
+101,  0,103,114,105,100,115,105,122,101,  0,110,101,101,100, 98,105,110,100,  0, 42, 98,105,110,100,119,101,105,103,104,116,115,
+  0, 42, 98,105,110,100, 99,111,115,  0,116,111,116, 99, 97,103,101,118,101,114,116,  0, 42,100,121,110,103,114,105,100,  0, 42,
+100,121,110,105,110,102,108,117,101,110, 99,101,115,  0, 42,100,121,110,118,101,114,116,115,  0, 42,112, 97,100, 50,  0,100,121,
+110,103,114,105,100,115,105,122,101,  0,100,121,110, 99,101,108,108,109,105,110, 91, 51, 93,  0,100,121,110, 99,101,108,108,119,
+105,100,116,104,  0, 98,105,110,100,109, 97,116, 91, 52, 93, 91, 52, 93,  0,116,111,116,100,109,118,101,114,116,  0,116,111,116,
+100,109,101,100,103,101,  0,116,111,116,100,109,102, 97, 99,101,  0,112,115,121,115,  0,112,111,115,105,116,105,111,110,  0,114,
+ 97,110,100,111,109, 95,112,111,115,105,116,105,111,110,  0, 42,102, 97, 99,101,112, 97,  0,118,103,114,111,117,112,  0,112,114,
+111,116,101, 99,116,  0, 42,117,110,100,111, 95,118,101,114,116,115,  0,117,110,100,111, 95,118,101,114,116,115, 95,116,111,116,
+  0,117,110,100,111, 95,115,105,103,110, 97,108,  0,108,118,108,  0,116,111,116,108,118,108,  0,115,105,109,112,108,101,  0, 42,
+102,115,115,  0, 42,116, 97,114,103,101,116,  0, 42, 97,117,120, 84, 97,114,103,101,116,  0,118,103,114,111,117,112, 95,110, 97,
+109,101, 91, 51, 50, 93,  0,107,101,101,112, 68,105,115,116,  0,115,104,114,105,110,107, 84,121,112,101,  0,115,104,114,105,110,
+107, 79,112,116,115,  0,112,114,111,106, 65,120,105,115,  0,115,117, 98,115,117,114,102, 76,101,118,101,108,115,  0, 42,111,114,
+105,103,105,110,  0,102, 97, 99,116,111,114,  0,108,105,109,105,116, 91, 50, 93,  0,111,114,105,103,105,110, 79,112,116,115,  0,
+112,110,116,115,119,  0,111,112,110,116,115,117,  0,111,112,110,116,115,118,  0,111,112,110,116,115,119,  0,116,121,112,101,117,
+  0,116,121,112,101,118,  0,116,121,112,101,119,  0,102,117,  0,102,118,  0,102,119,  0,100,117,  0,100,118,  0,100,119,  0, 42,
+100,101,102,  0, 42,108, 97,116,116,105, 99,101,100, 97,116, 97,  0,108, 97,116,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42,101,
+100,105,116,108, 97,116,116,  0,118,101, 99, 91, 56, 93, 91, 51, 93,  0, 42,115, 99,117,108,112,116,  0,112, 97,114,116,121,112,
+101,  0,112, 97,114, 49,  0,112, 97,114, 50,  0,112, 97,114, 51,  0,112, 97,114,115,117, 98,115,116,114, 91, 51, 50, 93,  0, 42,
+116,114, 97, 99,107,  0, 42,112,114,111,120,121,  0, 42,112,114,111,120,121, 95,103,114,111,117,112,  0, 42,112,114,111,120,121,
+ 95,102,114,111,109,  0, 42, 97, 99,116,105,111,110,  0, 42,112,111,115,101,108,105, 98,  0, 42,112,111,115,101,  0, 42,103,112,
+100,  0, 99,111,110,115,116,114, 97,105,110,116, 67,104, 97,110,110,101,108,115,  0,100,101,102, 98, 97,115,101,  0,109,111,100,
+105,102,105,101,114,115,  0,114,101,115,116,111,114,101, 95,109,111,100,101,  0, 42,109, 97,116, 98,105,116,115,  0, 97, 99,116,
+ 99,111,108,  0,100,108,111, 99, 91, 51, 93,  0,111,114,105,103, 91, 51, 93,  0,100,115,105,122,101, 91, 51, 93,  0,100,114,111,
+116, 91, 51, 93,  0,111, 98,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 99,111,110,115,116,105,110,118, 91, 52, 93, 91, 52, 93,  0,
+108, 97,121,  0, 99,111,108, 98,105,116,115,  0,116,114, 97,110,115,102,108, 97,103,  0,112,114,111,116,101, 99,116,102,108, 97,
+103,  0,116,114, 97, 99,107,102,108, 97,103,  0,117,112,102,108, 97,103,  0,110,108, 97,102,108, 97,103,  0,105,112,111,102,108,
+ 97,103,  0,105,112,111,119,105,110,  0,115, 99, 97,102,108, 97,103,  0,115, 99, 97,118,105,115,102,108, 97,103,  0, 98,111,117,
+110,100,116,121,112,101,  0,100,117,112,111,110,  0,100,117,112,111,102,102,  0,100,117,112,115,116, 97,  0,100,117,112,101,110,
+100,  0,115,102,  0,109, 97,115,115,  0,100, 97,109,112,105,110,103,  0,105,110,101,114,116,105, 97,  0,102,111,114,109,102, 97,
+ 99,116,111,114,  0,114,100, 97,109,112,105,110,103,  0,115,105,122,101,102, 97, 99,  0,109, 97,114,103,105,110,  0,109, 97,120,
+ 95,118,101,108,  0,109,105,110, 95,118,101,108,  0,109, 95, 99,111,110,116, 97, 99,116, 80,114,111, 99,101,115,115,105,110,103,
+ 84,104,114,101,115,104,111,108,100,  0,100,116,  0,100,116,120,  0,101,109,112,116,121, 95,100,114, 97,119,116,121,112,101,  0,
+112, 97,100, 49, 91, 53, 93,  0,101,109,112,116,121, 95,100,114, 97,119,115,105,122,101,  0,100,117,112,102, 97, 99,101,115, 99,
+ 97,  0,112,114,111,112,  0,115,101,110,115,111,114,115,  0, 99,111,110,116,114,111,108,108,101,114,115,  0, 97, 99,116,117, 97,
+116,111,114,115,  0, 98, 98,115,105,122,101, 91, 51, 93,  0, 97, 99,116,100,101,102,  0,103, 97,109,101,102,108, 97,103,  0,103,
+ 97,109,101,102,108, 97,103, 50,  0, 42, 98,115,111,102,116,  0,115,111,102,116,102,108, 97,103,  0, 97,110,105,115,111,116,114,
+111,112,105, 99, 70,114,105, 99,116,105,111,110, 91, 51, 93,  0, 99,111,110,115,116,114, 97,105,110,116,115,  0,110,108, 97,115,
+116,114,105,112,115,  0,104,111,111,107,115,  0,112, 97,114,116,105, 99,108,101,115,121,115,116,101,109,  0, 42,115,111,102,116,
+  0, 42,100,117,112, 95,103,114,111,117,112,  0,102,108,117,105,100,115,105,109, 70,108, 97,103,  0,114,101,115,116,114,105, 99,
+116,102,108, 97,103,  0,115,104, 97,112,101,110,114,  0,115,104, 97,112,101,102,108, 97,103,  0,114,101, 99, 97,108, 99,111,  0,
+ 98,111,100,121, 95,116,121,112,101,  0, 42,102,108,117,105,100,115,105,109, 83,101,116,116,105,110,103,115,  0, 42,100,101,114,
+105,118,101,100, 68,101,102,111,114,109,  0, 42,100,101,114,105,118,101,100, 70,105,110, 97,108,  0,108, 97,115,116, 68, 97,116,
+ 97, 77, 97,115,107,  0,115,116, 97,116,101,  0,105,110,105,116, 95,115,116, 97,116,101,  0,103,112,117,108, 97,109,112,  0,112,
+ 99, 95,105,100,115,  0, 99,117,114,105,110,100,101,120,  0, 97, 99,116,105,118,101,  0,100,101,102,108,101, 99,116,  0,102,111,
+114, 99,101,102,105,101,108,100,  0,112,100,101,102, 95,100, 97,109,112,  0,112,100,101,102, 95,114,100, 97,109,112,  0,112,100,
+101,102, 95,112,101,114,109,  0,112,100,101,102, 95,102,114,105, 99,116,  0,112,100,101,102, 95,114,102,114,105, 99,116,  0,102,
+ 95,115,116,114,101,110,103,116,104,  0,102, 95,112,111,119,101,114,  0,102, 95,100,105,115,116,  0,102, 95,100, 97,109,112,  0,
+109, 97,120,100,105,115,116,  0,109,105,110,100,105,115,116,  0,109, 97,120,114, 97,100,  0,109,105,110,114, 97,100,  0,102, 95,
+112,111,119,101,114, 95,114,  0,112,100,101,102, 95,115, 98,100, 97,109,112,  0,112,100,101,102, 95,115, 98,105,102,116,  0,112,
+100,101,102, 95,115, 98,111,102,116,  0, 99,108,117,109,112, 95,102, 97, 99,  0, 99,108,117,109,112, 95,112,111,119,  0,107,105,
+110,107, 95,102,114,101,113,  0,107,105,110,107, 95,115,104, 97,112,101,  0,107,105,110,107, 95, 97,109,112,  0,102,114,101,101,
+ 95,101,110,100,  0,116,101,120, 95,110, 97, 98,108, 97,  0,116,101,120, 95,109,111,100,101,  0,107,105,110,107,  0,107,105,110,
+107, 95, 97,120,105,115,  0,114,116, 50,  0, 42,114,110,103,  0,102, 95,110,111,105,115,101,  0,102,114, 97,109,101,  0,116,111,
+116,112,111,105,110,116,  0,100, 97,116, 97, 95,116,121,112,101,115,  0, 42,105,110,100,101,120, 95, 97,114,114, 97,121,  0, 42,
+100, 97,116, 97, 91, 56, 93,  0, 42, 99,117,114, 91, 56, 93,  0,115,116,101,112,  0,115,105,109,102,114, 97,109,101,  0,115,116,
+ 97,114,116,102,114, 97,109,101,  0,101,110,100,102,114, 97,109,101,  0,101,100,105,116,102,114, 97,109,101,  0,108, 97,115,116,
+ 95,101,120, 97, 99,116,  0,110, 97,109,101, 91, 54, 52, 93,  0,112,114,101,118, 95,110, 97,109,101, 91, 54, 52, 93,  0,105,110,
+102,111, 91, 54, 52, 93,  0,112, 97,116,104, 91, 50, 52, 48, 93,  0,109,101,109, 95, 99, 97, 99,104,101,  0, 42,101,100,105,116,
+  0, 40, 42,102,114,101,101, 95,101,100,105,116, 41, 40, 41,  0,108,105,110, 83,116,105,102,102,  0, 97,110,103, 83,116,105,102,
+102,  0,118,111,108,117,109,101,  0,118,105,116,101,114, 97,116,105,111,110,115,  0,112,105,116,101,114, 97,116,105,111,110,115,
+  0,100,105,116,101,114, 97,116,105,111,110,115,  0, 99,105,116,101,114, 97,116,105,111,110,115,  0,107, 83, 82, 72, 82, 95, 67,
+ 76,  0,107, 83, 75, 72, 82, 95, 67, 76,  0,107, 83, 83, 72, 82, 95, 67, 76,  0,107, 83, 82, 95, 83, 80, 76, 84, 95, 67, 76,  0,
+107, 83, 75, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 83, 83, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 86, 67, 70,  0,107, 68, 80,
+  0,107, 68, 71,  0,107, 76, 70,  0,107, 80, 82,  0,107, 86, 67,  0,107, 68, 70,  0,107, 77, 84,  0,107, 67, 72, 82,  0,107, 75,
+ 72, 82,  0,107, 83, 72, 82,  0,107, 65, 72, 82,  0, 99,111,108,108,105,115,105,111,110,102,108, 97,103,115,  0,110,117,109, 99,
+108,117,115,116,101,114,105,116,101,114, 97,116,105,111,110,115,  0,119,101,108,100,105,110,103,  0,116,111,116,115,112,114,105,
+110,103,  0, 42, 98,112,111,105,110,116,  0, 42, 98,115,112,114,105,110,103,  0,109,115,103, 95,108,111, 99,107,  0,109,115,103,
+ 95,118, 97,108,117,101,  0,110,111,100,101,109, 97,115,115,  0,110, 97,109,101,100, 86, 71, 95, 77, 97,115,115, 91, 51, 50, 93,
+  0,103,114, 97,118,  0,109,101,100,105, 97,102,114,105, 99,116,  0,114,107,108,105,109,105,116,  0,112,104,121,115,105, 99,115,
+ 95,115,112,101,101,100,  0,103,111, 97,108,115,112,114,105,110,103,  0,103,111, 97,108,102,114,105, 99,116,  0,109,105,110,103,
+111, 97,108,  0,109, 97,120,103,111, 97,108,  0,100,101,102,103,111, 97,108,  0,118,101,114,116,103,114,111,117,112,  0,110, 97,
+109,101,100, 86, 71, 95, 83,111,102,116,103,111, 97,108, 91, 51, 50, 93,  0,102,117,122,122,121,110,101,115,115,  0,105,110,115,
+112,114,105,110,103,  0,105,110,102,114,105, 99,116,  0,110, 97,109,101,100, 86, 71, 95, 83,112,114,105,110,103, 95, 75, 91, 51,
+ 50, 93,  0,101,102,114, 97,  0,105,110,116,101,114,118, 97,108,  0,108,111, 99, 97,108,  0,115,111,108,118,101,114,102,108, 97,
+103,115,  0, 42, 42,107,101,121,115,  0,116,111,116,112,111,105,110,116,107,101,121,  0,115,101, 99,111,110,100,115,112,114,105,
+110,103,  0, 99,111,108, 98, 97,108,108,  0, 98, 97,108,108,100, 97,109,112,  0, 98, 97,108,108,115,116,105,102,102,  0,115, 98,
+ 99, 95,109,111,100,101,  0, 97,101,114,111,101,100,103,101,  0,109,105,110,108,111,111,112,115,  0,109, 97,120,108,111,111,112,
+115,  0, 99,104,111,107,101,  0,115,111,108,118,101,114, 95, 73, 68,  0,112,108, 97,115,116,105, 99,  0,115,112,114,105,110,103,
+112,114,101,108,111, 97,100,  0, 42,115, 99,114, 97,116, 99,104,  0,115,104,101, 97,114,115,116,105,102,102,  0,105,110,112,117,
+115,104,  0, 42,112,111,105,110,116, 99, 97, 99,104,101,  0,115,104,111,119, 95, 97,100,118, 97,110, 99,101,100,111,112,116,105,
+111,110,115,  0,114,101,115,111,108,117,116,105,111,110,120,121,122,  0,112,114,101,118,105,101,119,114,101,115,120,121,122,  0,
+114,101, 97,108,115,105,122,101,  0,103,117,105, 68,105,115,112,108, 97,121, 77,111,100,101,  0,114,101,110,100,101,114, 68,105,
+115,112,108, 97,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 86, 97,108,117,101,  0,118,105,115, 99,111,115,105,
+116,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 69,120,112,111,110,101,110,116,  0,103,114, 97,118,120,  0,103,
+114, 97,118,121,  0,103,114, 97,118,122,  0, 97,110,105,109, 83,116, 97,114,116,  0, 97,110,105,109, 69,110,100,  0,103,115,116,
+ 97,114,  0,109, 97,120, 82,101,102,105,110,101,  0,105,110,105, 86,101,108,120,  0,105,110,105, 86,101,108,121,  0,105,110,105,
+ 86,101,108,122,  0, 42,111,114,103, 77,101,115,104,  0, 42,109,101,115,104, 83,117,114,102, 97, 99,101,  0, 42,109,101,115,104,
+ 66, 66,  0,115,117,114,102,100, 97,116, 97, 80, 97,116,104, 91, 50, 52, 48, 93,  0, 98, 98, 83,116, 97,114,116, 91, 51, 93,  0,
+ 98, 98, 83,105,122,101, 91, 51, 93,  0,116,121,112,101, 70,108, 97,103,115,  0,100,111,109, 97,105,110, 78,111,118,101, 99,103,
+101,110,  0,118,111,108,117,109,101, 73,110,105,116, 84,121,112,101,  0,112, 97,114,116, 83,108,105,112, 86, 97,108,117,101,  0,
+103,101,110,101,114, 97,116,101, 84,114, 97, 99,101,114,115,  0,103,101,110,101,114, 97,116,101, 80, 97,114,116,105, 99,108,101,
+115,  0,115,117,114,102, 97, 99,101, 83,109,111,111,116,104,105,110,103,  0,115,117,114,102, 97, 99,101, 83,117, 98,100,105,118,
+115,  0,112, 97,114,116,105, 99,108,101, 73,110,102, 83,105,122,101,  0,112, 97,114,116,105, 99,108,101, 73,110,102, 65,108,112,
+104, 97,  0,102, 97,114, 70,105,101,108,100, 83,105,122,101,  0, 42,109,101,115,104, 83,117,114,102, 78,111,114,109, 97,108,115,
+  0, 99,112,115, 84,105,109,101, 83,116, 97,114,116,  0, 99,112,115, 84,105,109,101, 69,110,100,  0, 99,112,115, 81,117, 97,108,
+105,116,121,  0, 97,116,116,114, 97, 99,116,102,111,114, 99,101, 83,116,114,101,110,103,116,104,  0, 97,116,116,114, 97, 99,116,
+102,111,114, 99,101, 82, 97,100,105,117,115,  0,118,101,108,111, 99,105,116,121,102,111,114, 99,101, 83,116,114,101,110,103,116,
+104,  0,118,101,108,111, 99,105,116,121,102,111,114, 99,101, 82, 97,100,105,117,115,  0,108, 97,115,116,103,111,111,100,102,114,
+ 97,109,101,  0,109,105,115,116,121,112,101,  0,104,111,114,114,  0,104,111,114,103,  0,104,111,114, 98,  0,104,111,114,107,  0,
+122,101,110,114,  0,122,101,110,103,  0,122,101,110, 98,  0,122,101,110,107,  0, 97,109, 98,107,  0,102, 97,115,116, 99,111,108,
+  0,101,120,112,111,115,117,114,101,  0,101,120,112,  0,114, 97,110,103,101,  0,108,105,110,102, 97, 99,  0,108,111,103,102, 97,
+ 99,  0,103,114, 97,118,105,116,121,  0, 97, 99,116,105,118,105,116,121, 66,111,120, 82, 97,100,105,117,115,  0,115,107,121,116,
+121,112,101,  0,111, 99, 99,108,117,115,105,111,110, 82,101,115,  0,112,104,121,115,105, 99,115, 69,110,103,105,110,101,  0,116,
+105, 99,114, 97,116,101,  0,109, 97,120,108,111,103,105, 99,115,116,101,112,  0,112,104,121,115,117, 98,115,116,101,112,  0,109,
+ 97,120,112,104,121,115,116,101,112,  0,109,105,115,105,  0,109,105,115,116,115,116, 97,  0,109,105,115,116,100,105,115,116,  0,
+109,105,115,116,104,105,  0,115,116, 97,114,114,  0,115,116, 97,114,103,  0,115,116, 97,114, 98,  0,115,116, 97,114,107,  0,115,
+116, 97,114,115,105,122,101,  0,115,116, 97,114,109,105,110,100,105,115,116,  0,115,116, 97,114,100,105,115,116,  0,115,116, 97,
+114, 99,111,108,110,111,105,115,101,  0,100,111,102,115,116, 97,  0,100,111,102,101,110,100,  0,100,111,102,109,105,110,  0,100,
+111,102,109, 97,120,  0, 97,111,100,105,115,116,  0, 97,111,100,105,115,116,102, 97, 99,  0, 97,111,101,110,101,114,103,121,  0,
+ 97,111, 98,105, 97,115,  0, 97,111,109,111,100,101,  0, 97,111,115, 97,109,112,  0, 97,111,109,105,120,  0, 97,111, 99,111,108,
+111,114,  0, 97,111, 95, 97,100, 97,112,116, 95,116,104,114,101,115,104,  0, 97,111, 95, 97,100, 97,112,116, 95,115,112,101,101,
+100, 95,102, 97, 99,  0, 97,111, 95, 97,112,112,114,111,120, 95,101,114,114,111,114,  0, 97,111, 95, 97,112,112,114,111,120, 95,
+ 99,111,114,114,101, 99,116,105,111,110,  0, 97,111, 95,115, 97,109,112, 95,109,101,116,104,111,100,  0, 97,111, 95,103, 97,116,
+104,101,114, 95,109,101,116,104,111,100,  0, 97,111, 95, 97,112,112,114,111,120, 95,112, 97,115,115,101,115,  0, 42, 97,111,115,
+112,104,101,114,101,  0, 42, 97,111,116, 97, 98,108,101,115,  0,115,101,108, 99,111,108,  0,115,120,  0,115,121,  0, 42,108,112,
+ 70,111,114,109, 97,116,  0, 42,108,112, 80, 97,114,109,115,  0, 99, 98, 70,111,114,109, 97,116,  0, 99, 98, 80, 97,114,109,115,
+  0,102, 99, 99, 84,121,112,101,  0,102, 99, 99, 72, 97,110,100,108,101,114,  0,100,119, 75,101,121, 70,114, 97,109,101, 69,118,
+101,114,121,  0,100,119, 81,117, 97,108,105,116,121,  0,100,119, 66,121,116,101,115, 80,101,114, 83,101, 99,111,110,100,  0,100,
+119, 70,108, 97,103,115,  0,100,119, 73,110,116,101,114,108,101, 97,118,101, 69,118,101,114,121,  0, 97,118,105, 99,111,100,101,
+ 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 99,100, 80, 97,114,109,115,  0, 42,112, 97,100,  0, 99,100, 83,105,122,101,  0,
+113,116, 99,111,100,101, 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 99,111,100,101, 99,  0, 97,117,100,105,111, 95, 99,111,100,
+101, 99,  0,118,105,100,101,111, 95, 98,105,116,114, 97,116,101,  0, 97,117,100,105,111, 95, 98,105,116,114, 97,116,101,  0,103,
+111,112, 95,115,105,122,101,  0,114, 99, 95,109,105,110, 95,114, 97,116,101,  0,114, 99, 95,109, 97,120, 95,114, 97,116,101,  0,
+114, 99, 95, 98,117,102,102,101,114, 95,115,105,122,101,  0,109,117,120, 95,112, 97, 99,107,101,116, 95,115,105,122,101,  0,109,
+117,120, 95,114, 97,116,101,  0,109,105,120,114, 97,116,101,  0,109, 97,105,110,  0, 42,109, 97,116, 95,111,118,101,114,114,105,
+100,101,  0, 42,108,105,103,104,116, 95,111,118,101,114,114,105,100,101,  0,108, 97,121, 95,122,109, 97,115,107,  0,108, 97,121,
+102,108, 97,103,  0,112, 97,115,115,102,108, 97,103,  0,112, 97,115,115, 95,120,111,114,  0, 42, 97,118,105, 99,111,100,101, 99,
+100, 97,116, 97,  0, 42,113,116, 99,111,100,101, 99,100, 97,116, 97,  0,102,102, 99,111,100,101, 99,100, 97,116, 97,  0, 97,117,
+100,105,111,  0,112,115,102,114, 97,  0,112,101,102,114, 97,  0,105,109, 97,103,101,115,  0,102,114, 97,109, 97,112,116,111,  0,
+116,104,114,101, 97,100,115,  0,102,114, 97,109,101,108,101,110,  0, 98,108,117,114,102, 97, 99,  0,101,100,103,101, 82,  0,101,
+100,103,101, 71,  0,101,100,103,101, 66,  0,102,117,108,108,115, 99,114,101,101,110,  0,120,112,108, 97,121,  0,121,112,108, 97,
+121,  0,102,114,101,113,112,108, 97,121,  0, 97,116,116,114,105, 98,  0,114,116, 49,  0,115,116,101,114,101,111,109,111,100,101,
+  0,100,105,109,101,110,115,105,111,110,115,112,114,101,115,101,116,  0,109, 97,120,105,109,115,105,122,101,  0,120,115, 99,104,
+  0,121,115, 99,104,  0,120,112, 97,114,116,115,  0,121,112, 97,114,116,115,  0,119,105,110,112,111,115,  0,112,108, 97,110,101,
+115,  0,105,109,116,121,112,101,  0,115,117, 98,105,109,116,121,112,101,  0,113,117, 97,108,105,116,121,  0,100,105,115,112,108,
+ 97,121,109,111,100,101,  0,114,112, 97,100, 49,  0,114,112, 97,100, 50,  0,115, 99,101,109,111,100,101,  0,114,101,110,100,101,
+114,101,114,  0,111, 99,114,101,115,  0, 97,108,112,104, 97,109,111,100,101,  0,111,115, 97,  0,102,114,115, 95,115,101, 99,  0,
+101,100,103,101,105,110,116,  0,115, 97,102,101,116,121,  0, 98,111,114,100,101,114,  0,100,105,115,112,114,101, 99,116,  0,108,
+ 97,121,101,114,115,  0, 97, 99,116,108, 97,121,  0,120, 97,115,112,  0,121, 97,115,112,  0,102,114,115, 95,115,101, 99, 95, 98,
+ 97,115,101,  0,103, 97,117,115,115,  0, 99,111,108,111,114, 95,109,103,116, 95,102,108, 97,103,  0,112,111,115,116,103, 97,109,
+109, 97,  0,112,111,115,116,104,117,101,  0,112,111,115,116,115, 97,116,  0,100,105,116,104,101,114, 95,105,110,116,101,110,115,
+105,116,121,  0, 98, 97,107,101, 95,111,115, 97,  0, 98, 97,107,101, 95,102,105,108,116,101,114,  0, 98, 97,107,101, 95,109,111,
+100,101,  0, 98, 97,107,101, 95,102,108, 97,103,  0, 98, 97,107,101, 95,110,111,114,109, 97,108, 95,115,112, 97, 99,101,  0, 98,
+ 97,107,101, 95,113,117, 97,100, 95,115,112,108,105,116,  0, 98, 97,107,101, 95,109, 97,120,100,105,115,116,  0, 98, 97,107,101,
+ 95, 98,105, 97,115,100,105,115,116,  0, 98, 97,107,101, 95,112, 97,100,  0, 71, 73,113,117, 97,108,105,116,121,  0, 71, 73, 99,
+ 97, 99,104,101,  0, 71, 73,109,101,116,104,111,100,  0, 71, 73,112,104,111,116,111,110,115,  0, 71, 73,100,105,114,101, 99,116,
+  0, 89, 70, 95, 65, 65,  0, 89, 70,101,120,112,111,114,116,120,109,108,  0, 89, 70, 95,110,111, 98,117,109,112,  0, 89, 70, 95,
+ 99,108, 97,109,112,114,103, 98,  0,121,102,112, 97,100, 49,  0, 71, 73,100,101,112,116,104,  0, 71, 73, 99, 97,117,115,100,101,
+112,116,104,  0, 71, 73,112,105,120,101,108,115,112,101,114,115, 97,109,112,108,101,  0, 71, 73,112,104,111,116,111,110, 99,111,
+117,110,116,  0, 71, 73,109,105,120,112,104,111,116,111,110,115,  0, 71, 73,112,104,111,116,111,110,114, 97,100,105,117,115,  0,
+ 89, 70, 95,114, 97,121,100,101,112,116,104,  0, 89, 70, 95, 65, 65,112, 97,115,115,101,115,  0, 89, 70, 95, 65, 65,115, 97,109,
+112,108,101,115,  0,121,102,112, 97,100, 50,  0, 71, 73,115,104, 97,100,111,119,113,117, 97,108,105,116,121,  0, 71, 73,114,101,
+102,105,110,101,109,101,110,116,  0, 71, 73,112,111,119,101,114,  0, 71, 73,105,110,100,105,114,112,111,119,101,114,  0, 89, 70,
+ 95,103, 97,109,109, 97,  0, 89, 70, 95,101,120,112,111,115,117,114,101,  0, 89, 70, 95,114, 97,121, 98,105, 97,115,  0, 89, 70,
+ 95, 65, 65,112,105,120,101,108,115,105,122,101,  0, 89, 70, 95, 65, 65,116,104,114,101,115,104,111,108,100,  0, 98, 97, 99,107,
+ 98,117,102, 91, 49, 54, 48, 93,  0,112,105, 99, 91, 49, 54, 48, 93,  0,115,116, 97,109,112,  0,115,116, 97,109,112, 95,102,111,
+110,116, 95,105,100,  0,115,116, 97,109,112, 95,117,100, 97,116, 97, 91, 49, 54, 48, 93,  0,102,103, 95,115,116, 97,109,112, 91,
+ 52, 93,  0, 98,103, 95,115,116, 97,109,112, 91, 52, 93,  0,115,105,109,112,108,105,102,121, 95,115,117, 98,115,117,114,102,  0,
+115,105,109,112,108,105,102,121, 95,115,104, 97,100,111,119,115, 97,109,112,108,101,115,  0,115,105,109,112,108,105,102,121, 95,
+112, 97,114,116,105, 99,108,101,115,  0,115,105,109,112,108,105,102,121, 95, 97,111,115,115,115,  0, 99,105,110,101,111,110,119,
+104,105,116,101,  0, 99,105,110,101,111,110, 98,108, 97, 99,107,  0, 99,105,110,101,111,110,103, 97,109,109, 97,  0,106,112, 50,
+ 95,112,114,101,115,101,116,  0,106,112, 50, 95,100,101,112,116,104,  0,114,112, 97,100, 51,  0,100,111,109,101,114,101,115,  0,
+100,111,109,101,109,111,100,101,  0,100,111,109,101, 97,110,103,108,101,  0,100,111,109,101,116,105,108,116,  0,100,111,109,101,
+114,101,115, 98,117,102,  0, 42,100,111,109,101,116,101,120,116,  0,101,110,103,105,110,101, 91, 51, 50, 93,  0,112, 97,114,116,
+105, 99,108,101, 95,112,101,114, 99,  0,115,117, 98,115,117,114,102, 95,109, 97,120,  0,115,104, 97,100, 98,117,102,115, 97,109,
+112,108,101, 95,109, 97,120,  0, 97,111, 95,101,114,114,111,114,  0,116,105,108,116,  0,114,101,115, 98,117,102,  0, 42,119, 97,
+114,112,116,101,120,116,  0, 99,111,108, 91, 51, 93,  0,109, 97,116,109,111,100,101,  0,102,114, 97,109,105,110,103,  0,100,111,
+109,101,  0,115,116,101,114,101,111,102,108, 97,103,  0, 42, 42, 98,114,117,115,104,101,115,  0, 97, 99,116,105,118,101, 95, 98,
+114,117,115,104, 95,105,110,100,101,120,  0, 98,114,117,115,104, 95, 99,111,117,110,116,  0, 42,112, 97,105,110,116, 95, 99,117,
+114,115,111,114,  0,112, 97,105,110,116, 95, 99,117,114,115,111,114, 95, 99,111,108, 91, 52, 93,  0,112, 97,105,110,116,  0,116,
+111,111,108,  0,115,101, 97,109, 95, 98,108,101,101,100,  0,110,111,114,109, 97,108, 95, 97,110,103,108,101,  0, 42,112, 97,105,
+110,116, 99,117,114,115,111,114,  0,105,110,118,101,114,116,  0,116,111,116,114,101,107,101,121,  0,116,111,116, 97,100,100,107,
+101,121,  0, 98,114,117,115,104,116,121,112,101,  0, 98,114,117,115,104, 91, 55, 93,  0,101,109,105,116,116,101,114,100,105,115,
+116,  0,115,101,108,101, 99,116,109,111,100,101,  0,101,100,105,116,116,121,112,101,  0,100,114, 97,119, 95,115,116,101,112,  0,
+102, 97,100,101, 95,102,114, 97,109,101,115,  0,110, 97,109,101, 91, 51, 54, 93,  0,109, 97,116, 91, 51, 93, 91, 51, 93,  0,112,
+105,118,111,116, 91, 51, 93,  0,116, 97, 98,108,101,116, 95,115,105,122,101,  0,116, 97, 98,108,101,116, 95,115,116,114,101,110,
+103,116,104,  0,103, 97,109,109, 97,  0,109,117,108,  0, 42,118,112, 97,105,110,116, 95,112,114,101,118,  0, 42,119,112, 97,105,
+110,116, 95,112,114,101,118,  0, 42,118,112, 97,105,110,116,  0, 42,119,112, 97,105,110,116,  0,118,103,114,111,117,112, 95,119,
+101,105,103,104,116,  0, 99,111,114,110,101,114,116,121,112,101,  0,101,100,105,116, 98,117,116,102,108, 97,103,  0,106,111,105,
+110,116,114,105,108,105,109,105,116,  0,100,101,103,114,  0,116,117,114,110,  0,101,120,116,114, 95,111,102,102,115,  0,100,111,
+117, 98,108,105,109,105,116,  0,110,111,114,109, 97,108,115,105,122,101,  0, 97,117,116,111,109,101,114,103,101,  0,115,101,103,
+109,101,110,116,115,  0,114,105,110,103,115,  0,118,101,114,116,105, 99,101,115,  0,117,110,119,114, 97,112,112,101,114,  0,117,
+118, 99, 97,108, 99, 95,114, 97,100,105,117,115,  0,117,118, 99, 97,108, 99, 95, 99,117, 98,101,115,105,122,101,  0,117,118, 99,
+ 97,108, 99, 95,109, 97,114,103,105,110,  0,117,118, 99, 97,108, 99, 95,109, 97,112,100,105,114,  0,117,118, 99, 97,108, 99, 95,
+109, 97,112, 97,108,105,103,110,  0,117,118, 99, 97,108, 99, 95,102,108, 97,103,  0,117,118, 95,102,108, 97,103,  0,117,118, 95,
+115,101,108,101, 99,116,109,111,100,101,  0,117,118, 95,112, 97,100, 91, 50, 93,  0, 97,117,116,111,105,107, 95, 99,104, 97,105,
+110,108,101,110,  0,105,109, 97,112, 97,105,110,116,  0,112, 97,114,116,105, 99,108,101,  0,112,114,111,112,111,114,116,105,111,
+110, 97,108, 95,115,105,122,101,  0,115,101,108,101, 99,116, 95,116,104,114,101,115,104,  0, 99,108,101, 97,110, 95,116,104,114,
+101,115,104,  0, 97,117,116,111,107,101,121, 95,109,111,100,101,  0, 97,117,116,111,107,101,121, 95,102,108, 97,103,  0,114,101,
+116,111,112,111, 95,109,111,100,101,  0,114,101,116,111,112,111, 95,112, 97,105,110,116, 95,116,111,111,108,  0,108,105,110,101,
+ 95,100,105,118,  0,101,108,108,105,112,115,101, 95,100,105,118,  0,114,101,116,111,112,111, 95,104,111,116,115,112,111,116,  0,
+109,117,108,116,105,114,101,115, 95,115,117, 98,100,105,118, 95,116,121,112,101,  0,115,107,103,101,110, 95,114,101,115,111,108,
+117,116,105,111,110,  0,115,107,103,101,110, 95,116,104,114,101,115,104,111,108,100, 95,105,110,116,101,114,110, 97,108,  0,115,
+107,103,101,110, 95,116,104,114,101,115,104,111,108,100, 95,101,120,116,101,114,110, 97,108,  0,115,107,103,101,110, 95,108,101,
+110,103,116,104, 95,114, 97,116,105,111,  0,115,107,103,101,110, 95,108,101,110,103,116,104, 95,108,105,109,105,116,  0,115,107,
+103,101,110, 95, 97,110,103,108,101, 95,108,105,109,105,116,  0,115,107,103,101,110, 95, 99,111,114,114,101,108, 97,116,105,111,
+110, 95,108,105,109,105,116,  0,115,107,103,101,110, 95,115,121,109,109,101,116,114,121, 95,108,105,109,105,116,  0,115,107,103,
+101,110, 95,114,101,116, 97,114,103,101,116, 95, 97,110,103,108,101, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,114,
+101,116, 97,114,103,101,116, 95,108,101,110,103,116,104, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,114,101,116, 97,
+114,103,101,116, 95,100,105,115,116, 97,110, 99,101, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,111,112,116,105,111,
+110,115,  0,115,107,103,101,110, 95,112,111,115,116,112,114,111,  0,115,107,103,101,110, 95,112,111,115,116,112,114,111, 95,112,
+ 97,115,115,101,115,  0,115,107,103,101,110, 95,115,117, 98,100,105,118,105,115,105,111,110,115, 91, 51, 93,  0,115,107,103,101,
+110, 95,109,117,108,116,105, 95,108,101,118,101,108,  0, 42,115,107,103,101,110, 95,116,101,109,112,108, 97,116,101,  0, 98,111,
+110,101, 95,115,107,101,116, 99,104,105,110,103,  0, 98,111,110,101, 95,115,107,101,116, 99,104,105,110,103, 95, 99,111,110,118,
+101,114,116,  0,115,107,103,101,110, 95,115,117, 98,100,105,118,105,115,105,111,110, 95,110,117,109, 98,101,114,  0,115,107,103,
+101,110, 95,114,101,116, 97,114,103,101,116, 95,111,112,116,105,111,110,115,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,
+101,116, 95,114,111,108,108,  0,115,107,103,101,110, 95,115,105,100,101, 95,115,116,114,105,110,103, 91, 56, 93,  0,115,107,103,
+101,110, 95,110,117,109, 95,115,116,114,105,110,103, 91, 56, 93,  0,101,100,103,101, 95,109,111,100,101,  0,115,110, 97,112, 95,
+109,111,100,101,  0,115,110, 97,112, 95,102,108, 97,103,  0,115,110, 97,112, 95,116, 97,114,103,101,116,  0,112,114,111,112,111,
+114,116,105,111,110, 97,108,  0,112,114,111,112, 95,109,111,100,101,  0,116,111,116,111, 98,106,  0,116,111,116,108, 97,109,112,
+  0,116,111,116,111, 98,106,115,101,108,  0,116,111,116, 99,117,114,118,101,  0,116,111,116,109,101,115,104,  0,116,111,116, 97,
+114,109, 97,116,117,114,101,  0,115, 99, 97,108,101, 95,108,101,110,103,116,104,  0,115,121,115,116,101,109,  0, 42, 99, 97,109,
+101,114, 97,  0, 42,119,111,114,108,100,  0, 42,115,101,116,  0, 98, 97,115,101,  0, 42, 98, 97,115, 97, 99,116,  0, 42,111, 98,
+101,100,105,116,  0, 99,117,114,115,111,114, 91, 51, 93,  0,116,119, 99,101,110,116, 91, 51, 93,  0,116,119,109,105,110, 91, 51,
+ 93,  0,116,119,109, 97,120, 91, 51, 93,  0, 42,101,100,  0, 42,116,111,111,108,115,101,116,116,105,110,103,115,  0, 42,115,116,
+ 97,116,115,  0,116,114, 97,110,115,102,111,114,109, 95,115,112, 97, 99,101,115,  0,115,111,117,110,100, 95,104, 97,110,100,108,
+101,115,  0, 42,116,104,101, 68, 97,103,  0,100, 97,103,105,115,118, 97,108,105,100,  0,100, 97,103,102,108, 97,103,115,  0,106,
+117,109,112,102,114, 97,109,101,  0,102,114, 97,109,101, 95,115,116,101,112,  0, 97, 99,116,105,118,101, 95,107,101,121,105,110,
+103,115,101,116,  0,107,101,121,105,110,103,115,101,116,115,  0,103,109,  0,117,110,105,116,  0, 98,108,101,110,100,  0,119,105,
+110,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,105,110,118,
+ 91, 52, 93, 91, 52, 93,  0,112,101,114,115,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,105,110,118, 91, 52, 93, 91,
+ 52, 93,  0,118,105,101,119,109, 97,116,111, 98, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,109, 97,116,111, 98, 91, 52, 93, 91,
+ 52, 93,  0,116,119,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,113,117, 97,116, 91, 52, 93,  0,122,102, 97, 99,  0,
+ 99, 97,109,100,120,  0, 99, 97,109,100,121,  0,112,105,120,115,105,122,101,  0, 99, 97,109,122,111,111,109,  0,118,105,101,119,
+ 98,117,116,  0,108, 97,115,116,109,111,100,101,  0,114,102,108, 97,103,  0,118,105,101,119,108,111, 99,107,  0,112,101,114,115,
+112,  0,118,105,101,119,  0, 99,108,105,112, 91, 54, 93, 91, 52, 93,  0, 42, 99,108,105,112, 98, 98,  0, 42,108,111, 99, 97,108,
+118,100,  0, 42,114,105,  0, 42,114,101,116,111,112,111, 95,118,105,101,119, 95,100, 97,116, 97,  0, 42,100,101,112,116,104,115,
+  0, 42,115,109,115,  0, 42,115,109,111,111,116,104, 95,116,105,109,101,114,  0,108,118,105,101,119,113,117, 97,116, 91, 52, 93,
+  0,108,112,101,114,115,112,  0,108,118,105,101,119,  0,114,101,103,105,111,110, 98, 97,115,101,  0,115,112, 97, 99,101,116,121,
+112,101,  0, 98,108,111, 99,107,115, 99, 97,108,101,  0, 98,108,111, 99,107,104, 97,110,100,108,101,114, 91, 56, 93,  0,108, 97,
+121, 95,117,115,101,100,  0, 42,111, 98, 95, 99,101,110,116,114,101,  0, 42, 98,103,112,105, 99,  0,111, 98, 95, 99,101,110,116,
+114,101, 95, 98,111,110,101, 91, 51, 50, 93,  0,108, 97,121, 97, 99,116,  0,100,114, 97,119,116,121,112,101,  0,108,111, 99, 97,
+108,118,105,101,119,  0,115, 99,101,110,101,108,111, 99,107,  0, 97,114,111,117,110,100,  0,112,105,118,111,116, 95,108, 97,115,
+116,  0,103,114,105,100,  0,103,114,105,100,118,105,101,119,  0,112, 97,100,102,  0,110,101, 97,114,  0,102, 97,114,  0,103,114,
+105,100,108,105,110,101,115,  0,103,114,105,100,102,108, 97,103,  0,103,114,105,100,115,117, 98,100,105,118,  0,109,111,100,101,
+115,101,108,101, 99,116,  0,107,101,121,102,108, 97,103,115,  0,116,119,116,121,112,101,  0,116,119,109,111,100,101,  0,116,119,
+102,108, 97,103,  0,116,119,100,114, 97,119,102,108, 97,103,  0, 99,117,115,116,111,109,100, 97,116, 97, 95,109, 97,115,107,  0,
+ 97,102,116,101,114,100,114, 97,119,  0,122, 98,117,102,  0,120,114, 97,121,  0,110,100,111,102,109,111,100,101,  0,110,100,111,
+102,102,105,108,116,101,114,  0, 42,112,114,111,112,101,114,116,105,101,115, 95,115,116,111,114, 97,103,101,  0,118,101,114,116,
+  0,104,111,114,  0,109, 97,115,107,  0,109,105,110, 91, 50, 93,  0,109, 97,120, 91, 50, 93,  0,109,105,110,122,111,111,109,  0,
+109, 97,120,122,111,111,109,  0,115, 99,114,111,108,108,  0,115, 99,114,111,108,108, 95,117,105,  0,107,101,101,112,116,111,116,
+  0,107,101,101,112,122,111,111,109,  0,107,101,101,112,111,102,115,  0, 97,108,105,103,110,  0,119,105,110,120,  0,119,105,110,
+121,  0,111,108,100,119,105,110,120,  0,111,108,100,119,105,110,121,  0, 99,117,114,115,111,114, 91, 50, 93,  0, 42,116, 97, 98,
+ 95,111,102,102,115,101,116,  0,116, 97, 98, 95,110,117,109,  0,116, 97, 98, 95, 99,117,114,  0, 42,115, 99,114,101,101,110,  0,
+118, 50,100,  0, 42, 97,100,115,  0,103,104,111,115,116, 67,117,114,118,101,115,  0, 97,117,116,111,115,110, 97,112,  0,112,105,
+110,  0,108,111, 99,107,  0,109, 97,105,110, 98,  0,109, 97,105,110, 98,111,  0,109, 97,105,110, 98,117,115,101,114,  0,114,101,
+ 95, 97,108,105,103,110,  0,112,114,101,118,105,101,119,  0,112, 97,116,104,102,108, 97,103,  0,100, 97,116, 97,105, 99,111,110,
+  0, 42,112,105,110,105,100,  0,114,101,110,100,101,114, 95,115,105,122,101,  0, 99,104, 97,110,115,104,111,119,110,  0,122,101,
+ 98,114, 97,  0,122,111,111,109,  0,116,105,116,108,101, 91, 50, 52, 93,  0,100,105,114, 91, 50, 52, 48, 93,  0,102,105,108,101,
+ 91, 56, 48, 93,  0,114,101,110, 97,109,101,102,105,108,101, 91, 56, 48, 93,  0,115,111,114,116,  0,100,105,115,112,108, 97,121,
+  0, 97, 99,116,105,118,101, 95, 98,111,111,107,109, 97,114,107,  0, 97, 99,116,105,118,101, 95,102,105,108,101,  0,115,101,108,
+115,116, 97,116,101,  0,102, 95,102,112,  0,109,101,110,117,  0,102,112, 95,115,116,114, 91, 56, 93,  0, 42,112,117,112,109,101,
+110,117,  0, 42,112, 97,114, 97,109,115,  0, 42,102,105,108,101,115,  0, 42,102,111,108,100,101,114,115, 95,112,114,101,118,  0,
+ 42,102,111,108,100,101,114,115, 95,110,101,120,116,  0, 42,111,112,  0, 42,108,111, 97,100,105,109, 97,103,101, 95,116,105,109,
+101,114,  0, 42,108, 97,121,111,117,116,  0,114,101, 99,101,110,116,110,114,  0, 98,111,111,107,109, 97,114,107,110,114,  0,115,
+121,115,116,101,109,110,114,  0,116,114,101,101,  0, 42,116,114,101,101,115,116,111,114,101,  0,115,101, 97,114, 99,104, 95,115,
+116,114,105,110,103, 91, 51, 50, 93,  0,115,101, 97,114, 99,104, 95,116,115,101,  0,115,101, 97,114, 99,104, 95,102,108, 97,103,
+115,  0,100,111, 95,  0,111,117,116,108,105,110,101,118,105,115,  0,115,116,111,114,101,102,108, 97,103,  0, 42, 99,117,109, 97,
+112,  0,105,109, 97,110,114,  0, 99,117,114,116,105,108,101,  0,105,109,116,121,112,101,110,114,  0,100,116, 95,117,118,  0,115,
+116,105, 99,107,121,  0,100,116, 95,117,118,115,116,114,101,116, 99,104,  0, 99,101,110,116,120,  0, 99,101,110,116,121,  0, 42,
+116,101,120,116,  0,116,111,112,  0,118,105,101,119,108,105,110,101,115,  0,108,104,101,105,103,104,116,  0, 99,119,105,100,116,
+104,  0,108,105,110,101,110,114,115, 95,116,111,116,  0,108,101,102,116,  0,115,104,111,119,108,105,110,101,110,114,115,  0,116,
+ 97, 98,110,117,109, 98,101,114,  0,115,104,111,119,115,121,110,116, 97,120,  0,111,118,101,114,119,114,105,116,101,  0,108,105,
+118,101, 95,101,100,105,116,  0,112,105,120, 95,112,101,114, 95,108,105,110,101,  0,116,120,116,115, 99,114,111,108,108,  0,116,
+120,116, 98, 97,114,  0,119,111,114,100,119,114, 97,112,  0,100,111,112,108,117,103,105,110,115,  0,102,105,110,100,115,116,114,
+ 91, 50, 53, 54, 93,  0,114,101,112,108, 97, 99,101,115,116,114, 91, 50, 53, 54, 93,  0, 42,112,121, 95,100,114, 97,119,  0, 42,
+112,121, 95,101,118,101,110,116,  0, 42,112,121, 95, 98,117,116,116,111,110,  0, 42,112,121, 95, 98,114,111,119,115,101,114, 99,
+ 97,108,108, 98, 97, 99,107,  0, 42,112,121, 95,103,108,111, 98, 97,108,100,105, 99,116,  0,108, 97,115,116,115,112, 97, 99,101,
+  0,115, 99,114,105,112,116,110, 97,109,101, 91, 50, 53, 54, 93,  0,115, 99,114,105,112,116, 97,114,103, 91, 50, 53, 54, 93,  0,
+ 42,115, 99,114,105,112,116,  0, 42, 98,117,116, 95,114,101,102,115,  0,114,101,100,114, 97,119,115,  0, 42,105,100,  0, 97,115,
+112,101, 99,116,  0, 42, 99,117,114,102,111,110,116,  0,109,120,  0,109,121,  0, 42,101,100,105,116,116,114,101,101,  0,116,114,
+101,101,116,121,112,101,  0,116,101,120,102,114,111,109,  0,110,117,109,116,105,108,101,115,120,  0,110,117,109,116,105,108,101,
+115,121,  0,118,105,101,119,114,101, 99,116,  0, 98,111,111,107,109, 97,114,107,114,101, 99,116,  0,115, 99,114,111,108,108,112,
+111,115,  0,115, 99,114,111,108,108,104,101,105,103,104,116,  0,115, 99,114,111,108,108, 97,114,101, 97,  0,114,101,116,118, 97,
+108,  0,112,114,118, 95,119,  0,112,114,118, 95,104,  0, 40, 42,114,101,116,117,114,110,102,117,110, 99, 41, 40, 41,  0, 40, 42,
+114,101,116,117,114,110,102,117,110, 99, 95,101,118,101,110,116, 41, 40, 41,  0, 40, 42,114,101,116,117,114,110,102,117,110, 99,
+ 95, 97,114,103,115, 41, 40, 41,  0, 42, 97,114,103, 49,  0, 42, 97,114,103, 50,  0, 42,109,101,110,117,112,  0, 42,105,109,103,
+  0,108,101,110, 95, 97,108,108,111, 99,  0, 99,117,114,115,111,114,  0,114,112,116, 95,109, 97,115,107,  0,115, 99,114,111,108,
+108, 98, 97, 99,107,  0,104,105,115,116,111,114,121,  0,112,114,111,109,112,116, 91, 56, 93,  0,102,105,108,101,110, 97,109,101,
+ 91, 50, 53, 54, 93,  0, 98,108,102, 95,105,100,  0,117,105,102,111,110,116, 95,105,100,  0,114, 95,116,111, 95,108,  0,112,111,
+105,110,116,115,  0,107,101,114,110,105,110,103,  0,105,116, 97,108,105, 99,  0, 98,111,108,100,  0,115,104, 97,100,111,119,  0,
+115,104, 97,100,120,  0,115,104, 97,100,121,  0,115,104, 97,100,111,119, 97,108,112,104, 97,  0,115,104, 97,100,111,119, 99,111,
+108,111,114,  0,112, 97,110,101,108,116,105,116,108,101,  0,103,114,111,117,112,108, 97, 98,101,108,  0,119,105,100,103,101,116,
+108, 97, 98,101,108,  0,119,105,100,103,101,116,  0,112, 97,110,101,108,122,111,111,109,  0,109,105,110,108, 97, 98,101,108, 99,
+104, 97,114,115,  0,109,105,110,119,105,100,103,101,116, 99,104, 97,114,115,  0, 99,111,108,117,109,110,115,112, 97, 99,101,  0,
+116,101,109,112,108, 97,116,101,115,112, 97, 99,101,  0, 98,111,120,115,112, 97, 99,101,  0, 98,117,116,116,111,110,115,112, 97,
+ 99,101,120,  0, 98,117,116,116,111,110,115,112, 97, 99,101,121,  0,112, 97,110,101,108,115,112, 97, 99,101,  0,112, 97,110,101,
+108,111,117,116,101,114,  0,112, 97,100, 91, 49, 93,  0,111,117,116,108,105,110,101, 91, 52, 93,  0,105,110,110,101,114, 91, 52,
+ 93,  0,105,110,110,101,114, 95,115,101,108, 91, 52, 93,  0,105,116,101,109, 91, 52, 93,  0,116,101,120,116, 91, 52, 93,  0,116,
+101,120,116, 95,115,101,108, 91, 52, 93,  0,115,104, 97,100,101,100,  0,115,104, 97,100,101,116,111,112,  0,115,104, 97,100,101,
+100,111,119,110,  0,105,110,110,101,114, 95, 97,110,105,109, 91, 52, 93,  0,105,110,110,101,114, 95, 97,110,105,109, 95,115,101,
+108, 91, 52, 93,  0,105,110,110,101,114, 95,107,101,121, 91, 52, 93,  0,105,110,110,101,114, 95,107,101,121, 95,115,101,108, 91,
+ 52, 93,  0,105,110,110,101,114, 95,100,114,105,118,101,110, 91, 52, 93,  0,105,110,110,101,114, 95,100,114,105,118,101,110, 95,
+115,101,108, 91, 52, 93,  0,119, 99,111,108, 95,114,101,103,117,108, 97,114,  0,119, 99,111,108, 95,116,111,111,108,  0,119, 99,
+111,108, 95,116,101,120,116,  0,119, 99,111,108, 95,114, 97,100,105,111,  0,119, 99,111,108, 95,111,112,116,105,111,110,  0,119,
+ 99,111,108, 95,116,111,103,103,108,101,  0,119, 99,111,108, 95,110,117,109,  0,119, 99,111,108, 95,110,117,109,115,108,105,100,
+101,114,  0,119, 99,111,108, 95,109,101,110,117,  0,119, 99,111,108, 95,112,117,108,108,100,111,119,110,  0,119, 99,111,108, 95,
+109,101,110,117, 95, 98, 97, 99,107,  0,119, 99,111,108, 95,109,101,110,117, 95,105,116,101,109,  0,119, 99,111,108, 95, 98,111,
+120,  0,119, 99,111,108, 95,115, 99,114,111,108,108,  0,119, 99,111,108, 95,108,105,115,116, 95,105,116,101,109,  0,119, 99,111,
+108, 95,115,116, 97,116,101,  0,105, 99,111,110,102,105,108,101, 91, 56, 48, 93,  0, 98, 97, 99,107, 91, 52, 93,  0,116,105,116,
+108,101, 91, 52, 93,  0,116,101,120,116, 95,104,105, 91, 52, 93,  0,104,101, 97,100,101,114, 91, 52, 93,  0,104,101, 97,100,101,
+114, 95,116,105,116,108,101, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,101,120,116, 91, 52, 93,  0,104,101, 97,100,101,114,
+ 95,116,101,120,116, 95,104,105, 91, 52, 93,  0, 98,117,116,116,111,110, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,105,116,
+108,101, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,101,120,116, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,101,120,116,
+ 95,104,105, 91, 52, 93,  0,108,105,115,116, 91, 52, 93,  0,108,105,115,116, 95,116,105,116,108,101, 91, 52, 93,  0,108,105,115,
+116, 95,116,101,120,116, 91, 52, 93,  0,108,105,115,116, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,112, 97,110,101,108, 91,
+ 52, 93,  0,112, 97,110,101,108, 95,116,105,116,108,101, 91, 52, 93,  0,112, 97,110,101,108, 95,116,101,120,116, 91, 52, 93,  0,
+112, 97,110,101,108, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,115,104, 97,100,101, 49, 91, 52, 93,  0,115,104, 97,100,101,
+ 50, 91, 52, 93,  0,104,105,108,105,116,101, 91, 52, 93,  0,103,114,105,100, 91, 52, 93,  0,119,105,114,101, 91, 52, 93,  0,115,
+101,108,101, 99,116, 91, 52, 93,  0,108, 97,109,112, 91, 52, 93,  0, 97, 99,116,105,118,101, 91, 52, 93,  0,103,114,111,117,112,
+ 91, 52, 93,  0,103,114,111,117,112, 95, 97, 99,116,105,118,101, 91, 52, 93,  0,116,114, 97,110,115,102,111,114,109, 91, 52, 93,
+  0,118,101,114,116,101,120, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,101,108,101, 99,116, 91, 52, 93,  0,101,100,103,101,
+ 91, 52, 93,  0,101,100,103,101, 95,115,101,108,101, 99,116, 91, 52, 93,  0,101,100,103,101, 95,115,101, 97,109, 91, 52, 93,  0,
+101,100,103,101, 95,115,104, 97,114,112, 91, 52, 93,  0,101,100,103,101, 95,102, 97, 99,101,115,101,108, 91, 52, 93,  0,102, 97,
+ 99,101, 91, 52, 93,  0,102, 97, 99,101, 95,115,101,108,101, 99,116, 91, 52, 93,  0,102, 97, 99,101, 95,100,111,116, 91, 52, 93,
+  0,110,111,114,109, 97,108, 91, 52, 93,  0, 98,111,110,101, 95,115,111,108,105,100, 91, 52, 93,  0, 98,111,110,101, 95,112,111,
+115,101, 91, 52, 93,  0,115,116,114,105,112, 91, 52, 93,  0,115,116,114,105,112, 95,115,101,108,101, 99,116, 91, 52, 93,  0, 99,
+102,114, 97,109,101, 91, 52, 93,  0,100,115, 95, 99,104, 97,110,110,101,108, 91, 52, 93,  0,100,115, 95,115,117, 98, 99,104, 97,
+110,110,101,108, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,105,122,101,  0,102, 97, 99,101,100,111,116, 95,115,105,122,101,
+  0, 98,112, 97,100, 91, 50, 93,  0,115,121,110,116, 97,120,108, 91, 52, 93,  0,115,121,110,116, 97,120,110, 91, 52, 93,  0,115,
+121,110,116, 97,120, 98, 91, 52, 93,  0,115,121,110,116, 97,120,118, 91, 52, 93,  0,115,121,110,116, 97,120, 99, 91, 52, 93,  0,
+109,111,118,105,101, 91, 52, 93,  0,105,109, 97,103,101, 91, 52, 93,  0,115, 99,101,110,101, 91, 52, 93,  0, 97,117,100,105,111,
+ 91, 52, 93,  0,101,102,102,101, 99,116, 91, 52, 93,  0,112,108,117,103,105,110, 91, 52, 93,  0,116,114, 97,110,115,105,116,105,
+111,110, 91, 52, 93,  0,109,101,116, 97, 91, 52, 93,  0,101,100,105,116,109,101,115,104, 95, 97, 99,116,105,118,101, 91, 52, 93,
+  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 95,
+115,101,108,101, 99,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 95,115,105,122,101,  0,104,112, 97,
+100, 91, 51, 93,  0,115,111,108,105,100, 91, 52, 93,  0,116,117,105,  0,116, 98,117,116,115,  0,116,118, 51,100,  0,116,102,105,
+108,101,  0,116,105,112,111,  0,116,105,110,102,111,  0,116,115,110,100,  0,116, 97, 99,116,  0,116,110,108, 97,  0,116,115,101,
+113,  0,116,105,109, 97,  0,116,105,109, 97,115,101,108,  0,116,101,120,116,  0,116,111,111,112,115,  0,116,116,105,109,101,  0,
+116,110,111,100,101,  0,116,108,111,103,105, 99,  0,116,117,115,101,114,112,114,101,102,  0,116, 97,114,109, 91, 50, 48, 93,  0,
+115,112,101, 99, 91, 52, 93,  0,100,117,112,102,108, 97,103,  0,115, 97,118,101,116,105,109,101,  0,116,101,109,112,100,105,114,
+ 91, 49, 54, 48, 93,  0,102,111,110,116,100,105,114, 91, 49, 54, 48, 93,  0,114,101,110,100,101,114,100,105,114, 91, 49, 54, 48,
+ 93,  0,116,101,120,116,117,100,105,114, 91, 49, 54, 48, 93,  0,112,108,117,103,116,101,120,100,105,114, 91, 49, 54, 48, 93,  0,
+112,108,117,103,115,101,113,100,105,114, 91, 49, 54, 48, 93,  0,112,121,116,104,111,110,100,105,114, 91, 49, 54, 48, 93,  0,115,
+111,117,110,100,100,105,114, 91, 49, 54, 48, 93,  0,121,102,101,120,112,111,114,116,100,105,114, 91, 49, 54, 48, 93,  0,118,101,
+114,115,105,111,110,115,  0,103, 97,109,101,102,108, 97,103,115,  0,119,104,101,101,108,108,105,110,101,115, 99,114,111,108,108,
+  0,117,105,102,108, 97,103,  0,108, 97,110,103,117, 97,103,101,  0,117,115,101,114,112,114,101,102,  0,118,105,101,119,122,111,
+111,109,  0,109,105,120, 98,117,102,115,105,122,101,  0, 97,117,100,105,111,100,101,118,105, 99,101,  0, 97,117,100,105,111,114,
+ 97,116,101,  0, 97,117,100,105,111,102,111,114,109, 97,116,  0, 97,117,100,105,111, 99,104, 97,110,110,101,108,115,  0,100,112,
+105,  0,101,110, 99,111,100,105,110,103,  0,116,114, 97,110,115,111,112,116,115,  0,109,101,110,117,116,104,114,101,115,104,111,
+108,100, 49,  0,109,101,110,117,116,104,114,101,115,104,111,108,100, 50,  0,116,104,101,109,101,115,  0,117,105,102,111,110,116,
+115,  0,117,105,115,116,121,108,101,115,  0,117,110,100,111,115,116,101,112,115,  0,117,110,100,111,109,101,109,111,114,121,  0,
+103,112, 95,109, 97,110,104, 97,116,116,101,110,100,105,115,116,  0,103,112, 95,101,117, 99,108,105,100,101, 97,110,100,105,115,
+116,  0,103,112, 95,101,114, 97,115,101,114,  0,103,112, 95,115,101,116,116,105,110,103,115,  0,116, 98, 95,108,101,102,116,109,
+111,117,115,101,  0,116, 98, 95,114,105,103,104,116,109,111,117,115,101,  0,108,105,103,104,116, 91, 51, 93,  0,116,119, 95,104,
+111,116,115,112,111,116,  0,116,119, 95,102,108, 97,103,  0,116,119, 95,104, 97,110,100,108,101,115,105,122,101,  0,116,119, 95,
+115,105,122,101,  0,116,101,120,116,105,109,101,111,117,116,  0,116,101,120, 99,111,108,108,101, 99,116,114, 97,116,101,  0,119,
+109,100,114, 97,119,109,101,116,104,111,100,  0,119,109,112, 97,100,  0,109,101,109, 99, 97, 99,104,101,108,105,109,105,116,  0,
+112,114,101,102,101,116, 99,104,102,114, 97,109,101,115,  0,102,114, 97,109,101,115,101,114,118,101,114,112,111,114,116,  0,112,
+ 97,100, 95,114,111,116, 95, 97,110,103,108,101,  0,111, 98, 99,101,110,116,101,114, 95,100,105, 97,  0,114,118,105,115,105,122,
+101,  0,114,118,105, 98,114,105,103,104,116,  0,114,101, 99,101,110,116, 95,102,105,108,101,115,  0,115,109,111,111,116,104, 95,
+118,105,101,119,116,120,  0,103,108,114,101,115,108,105,109,105,116,  0,110,100,111,102, 95,112, 97,110,  0,110,100,111,102, 95,
+114,111,116, 97,116,101,  0, 99,117,114,115,115,105,122,101,  0,105,112,111, 95,110,101,119,  0,118,101,114,115,101,109, 97,115,
+116,101,114, 91, 49, 54, 48, 93,  0,118,101,114,115,101,117,115,101,114, 91, 49, 54, 48, 93,  0,103,108, 97,108,112,104, 97, 99,
+108,105,112,  0, 99,111, 98, 97, 95,119,101,105,103,104,116,  0,118,101,114,116, 98, 97,115,101,  0,101,100,103,101, 98, 97,115,
+101,  0, 97,114,101, 97, 98, 97,115,101,  0, 42,110,101,119,115, 99,101,110,101,  0,102,117,108,108,  0,119,105,110,105,100,  0,
+100,111, 95,100,114, 97,119,  0,100,111, 95,114,101,102,114,101,115,104,  0,100,111, 95,100,114, 97,119, 95,103,101,115,116,117,
+114,101,  0,100,111, 95,100,114, 97,119, 95,112, 97,105,110,116, 99,117,114,115,111,114,  0,115,119, 97,112,  0,109, 97,105,110,
+119,105,110,  0,115,117, 98,119,105,110, 97, 99,116,105,118,101,  0, 42, 97,110,105,109,116,105,109,101,114,  0, 42, 99,111,110,
+116,101,120,116,  0,104, 97,110,100,108,101,114, 91, 56, 93,  0, 42,110,101,119,118,  0,118,101, 99,  0, 42,118, 49,  0, 42,118,
+ 50,  0, 42,116,121,112,101,  0,112, 97,110,101,108,110, 97,109,101, 91, 54, 52, 93,  0,116, 97, 98,110, 97,109,101, 91, 54, 52,
+ 93,  0,100,114, 97,119,110, 97,109,101, 91, 54, 52, 93,  0,111,102,115,120,  0,111,102,115,121,  0,115,105,122,101,120,  0,115,
+105,122,101,121,  0,108, 97, 98,101,108,111,102,115,  0,114,117,110,116,105,109,101, 95,102,108, 97,103,  0, 99,111,110,116,114,
+111,108,  0,115,110, 97,112,  0,115,111,114,116,111,114,100,101,114,  0, 42,112, 97,110,101,108,116, 97, 98,  0, 42, 97, 99,116,
+105,118,101,100, 97,116, 97,  0,108,105,115,116, 95,115, 99,114,111,108,108,  0,108,105,115,116, 95,115,105,122,101,  0,108,105,
+115,116, 95,115,101, 97,114, 99,104, 91, 54, 52, 93,  0, 42,118, 51,  0, 42,118, 52,  0, 42,102,117,108,108,  0, 98,117,116,115,
+112, 97, 99,101,116,121,112,101,  0,104,101, 97,100,101,114,116,121,112,101,  0,115,112, 97, 99,101,100, 97,116, 97,  0,104, 97,
+110,100,108,101,114,115,  0, 97, 99,116,105,111,110,122,111,110,101,115,  0,119,105,110,114, 99,116,  0,100,114, 97,119,114, 99,
+116,  0,115,119,105,110,105,100,  0,114,101,103,105,111,110,116,121,112,101,  0, 97,108,105,103,110,109,101,110,116,  0,117,105,
+ 98,108,111, 99,107,115,  0,112, 97,110,101,108,115,  0, 42,104,101, 97,100,101,114,115,116,114,  0, 42,114,101,103,105,111,110,
+100, 97,116, 97,  0,115,117, 98,118,115,116,114, 91, 52, 93,  0,115,117, 98,118,101,114,115,105,111,110,  0,112, 97,100,115,  0,
+109,105,110,118,101,114,115,105,111,110,  0,109,105,110,115,117, 98,118,101,114,115,105,111,110,  0, 42, 99,117,114,115, 99,114,
+101,101,110,  0, 42, 99,117,114,115, 99,101,110,101,  0,102,105,108,101,102,108, 97,103,115,  0,103,108,111, 98, 97,108,102,  0,
+110, 97,109,101, 91, 56, 48, 93,  0, 42,105, 98,117,102,  0, 42,105, 98,117,102, 95, 99,111,109,112,  0, 42,115,101, 49,  0, 42,
+115,101, 50,  0, 42,115,101, 51,  0,110,114,  0, 98,111,116,116,111,109,  0,114,105,103,104,116,  0,120,111,102,115,  0,121,111,
+102,115,  0,108,105,102,116, 91, 51, 93,  0,103, 97,109,109, 97, 91, 51, 93,  0,103, 97,105,110, 91, 51, 93,  0,115, 97,116,117,
+114, 97,116,105,111,110,  0,100,105,114, 91, 49, 54, 48, 93,  0,100,111,110,101,  0,115,116, 97,114,116,115,116,105,108,108,  0,
+101,110,100,115,116,105,108,108,  0, 42,115,116,114,105,112,100, 97,116, 97,  0,111,114,120,  0,111,114,121,  0, 42, 99,114,111,
+112,  0, 42,116,114, 97,110,115,102,111,114,109,  0, 42, 99,111,108,111,114, 95, 98, 97,108, 97,110, 99,101,  0, 42,116,115,116,
+114,105,112,100, 97,116, 97,  0, 42,116,115,116,114,105,112,100, 97,116, 97, 95,115,116, 97,114,116,115,116,105,108,108,  0, 42,
+116,115,116,114,105,112,100, 97,116, 97, 95,101,110,100,115,116,105,108,108,  0, 42,105, 98,117,102, 95,115,116, 97,114,116,115,
+116,105,108,108,  0, 42,105, 98,117,102, 95,101,110,100,115,116,105,108,108,  0, 42,105,110,115,116, 97,110, 99,101, 95,112,114,
+105,118, 97,116,101, 95,100, 97,116, 97,  0, 42, 42, 99,117,114,114,101,110,116, 95,112,114,105,118, 97,116,101, 95,100, 97,116,
+ 97,  0, 42,116,109,112,  0,115,116, 97,114,116,111,102,115,  0,101,110,100,111,102,115,  0,109, 97, 99,104,105,110,101,  0,115,
+116, 97,114,116,100,105,115,112,  0,101,110,100,100,105,115,112,  0,104, 97,110,100,115,105,122,101,  0, 97,110,105,109, 95,112,
+114,101,115,101,101,107,  0, 42,115,116,114,105,112,  0,102, 97, 99,102, 48,  0,102, 97, 99,102, 49,  0, 42,115,101,113, 49,  0,
+ 42,115,101,113, 50,  0, 42,115,101,113, 51,  0,115,101,113, 98, 97,115,101,  0, 42,115,111,117,110,100,  0, 42,115,111,117,110,
+100, 95,104, 97,110,100,108,101,  0,108,101,118,101,108,  0,112, 97,110,  0,115, 99,101,110,101,110,114,  0,115,116,114,111, 98,
+101,  0, 42,101,102,102,101, 99,116,100, 97,116, 97,  0, 97,110,105,109, 95,115,116, 97,114,116,111,102,115,  0, 97,110,105,109,
+ 95,101,110,100,111,102,115,  0, 98,108,101,110,100, 95,109,111,100,101,  0, 98,108,101,110,100, 95,111,112, 97, 99,105,116,121,
+  0, 42,111,108,100, 98, 97,115,101,112,  0, 42,112, 97,114,115,101,113,  0, 42,115,101,113, 98, 97,115,101,112,  0,109,101,116,
+ 97,115,116, 97, 99,107,  0, 42, 97, 99,116, 95,115,101,113,  0, 97, 99,116, 95,105,109, 97,103,101,100,105,114, 91, 50, 53, 54,
+ 93,  0, 97, 99,116, 95,115,111,117,110,100,100,105,114, 91, 50, 53, 54, 93,  0,101,100,103,101, 87,105,100,116,104,  0,102,111,
+114,119, 97,114,100,  0,119,105,112,101,116,121,112,101,  0,102, 77,105,110,105,  0,102, 67,108, 97,109,112,  0,102, 66,111,111,
+115,116,  0,100, 68,105,115,116,  0,100, 81,117, 97,108,105,116,121,  0, 98, 78,111, 67,111,109,112,  0, 83, 99, 97,108,101,120,
+ 73,110,105,  0, 83, 99, 97,108,101,121, 73,110,105,  0, 83, 99, 97,108,101,120, 70,105,110,  0, 83, 99, 97,108,101,121, 70,105,
+110,  0,120, 73,110,105,  0,120, 70,105,110,  0,121, 73,110,105,  0,121, 70,105,110,  0,114,111,116, 73,110,105,  0,114,111,116,
+ 70,105,110,  0,105,110,116,101,114,112,111,108, 97,116,105,111,110,  0, 42,102,114, 97,109,101, 77, 97,112,  0,103,108,111, 98,
+ 97,108, 83,112,101,101,100,  0,108, 97,115,116, 86, 97,108,105,100, 70,114, 97,109,101,  0, 98,117,116,116,121,112,101,  0,117,
+115,101,114,106,105,116,  0,115,116, 97,  0,116,111,116,112, 97,114,116,  0,110,111,114,109,102, 97, 99,  0,111, 98,102, 97, 99,
+  0,114, 97,110,100,102, 97, 99,  0,116,101,120,102, 97, 99,  0,114, 97,110,100,108,105,102,101,  0,102,111,114, 99,101, 91, 51,
+ 93,  0,118,101, 99,116,115,105,122,101,  0,109, 97,120,108,101,110,  0,100,101,102,118,101, 99, 91, 51, 93,  0,109,117,108,116,
+ 91, 52, 93,  0,108,105,102,101, 91, 52, 93,  0, 99,104,105,108,100, 91, 52, 93,  0,109, 97,116, 91, 52, 93,  0,116,101,120,109,
+ 97,112,  0, 99,117,114,109,117,108,116,  0,115,116, 97,116,105, 99,115,116,101,112,  0,111,109, 97,116,  0,116,105,109,101,116,
+101,120,  0,115,112,101,101,100,116,101,120,  0,102,108, 97,103, 50,110,101,103,  0,118,101,114,116,103,114,111,117,112, 95,118,
+  0,118,103,114,111,117,112,110, 97,109,101, 91, 51, 50, 93,  0,118,103,114,111,117,112,110, 97,109,101, 95,118, 91, 51, 50, 93,
+  0, 42,107,101,121,115,  0,109,105,110,102, 97, 99,  0,117,115,101,100,  0,117,115,101,100,101,108,101,109,  0, 42,112,111,105,
+110,  0,114,101,115,101,116,100,105,115,116,  0,108, 97,115,116,118, 97,108,  0, 42,109, 97,  0,107,101,121,  0,113,117, 97,108,
+  0,113,117, 97,108, 50,  0,116, 97,114,103,101,116, 78, 97,109,101, 91, 51, 50, 93,  0,116,111,103,103,108,101, 78, 97,109,101,
+ 91, 51, 50, 93,  0,118, 97,108,117,101, 91, 51, 50, 93,  0,109, 97,120,118, 97,108,117,101, 91, 51, 50, 93,  0,100,101,108, 97,
+121,  0,100,117,114, 97,116,105,111,110,  0,109, 97,116,101,114,105, 97,108, 78, 97,109,101, 91, 51, 50, 93,  0,100, 97,109,112,
+116,105,109,101,114,  0,112,114,111,112,110, 97,109,101, 91, 51, 50, 93,  0,109, 97,116,110, 97,109,101, 91, 51, 50, 93,  0, 97,
+120,105,115,102,108, 97,103,  0, 42,102,114,111,109, 79, 98,106,101, 99,116,  0,115,117, 98,106,101, 99,116, 91, 51, 50, 93,  0,
+ 98,111,100,121, 91, 51, 50, 93,  0,111,116,121,112,101,  0,112,117,108,115,101,  0,102,114,101,113,  0,116,111,116,108,105,110,
+107,115,  0, 42, 42,108,105,110,107,115,  0,116, 97,112,  0,106,111,121,105,110,100,101,120,  0, 97,120,105,115, 95,115,105,110,
+103,108,101,  0, 97,120,105,115,102,  0, 98,117,116,116,111,110,  0,104, 97,116,  0,104, 97,116,102,  0,112,114,101, 99,105,115,
+105,111,110,  0,115,116,114, 91, 49, 50, 56, 93,  0,109,111,100,117,108,101, 91, 54, 52, 93,  0, 42,109,121,110,101,119,  0,105,
+110,112,117,116,115,  0,116,111,116,115,108,105,110,107,115,  0, 42, 42,115,108,105,110,107,115,  0,118, 97,108,111,  0,115,116,
+ 97,116,101, 95,109, 97,115,107,  0, 42, 97, 99,116,  0,102,114, 97,109,101, 80,114,111,112, 91, 51, 50, 93,  0, 98,108,101,110,
+100,105,110,  0,112,114,105,111,114,105,116,121,  0,101,110,100, 95,114,101,115,101,116,  0,115,116,114,105,100,101, 97,120,105,
+115,  0,115,116,114,105,100,101,108,101,110,103,116,104,  0,115,110,100,110,114,  0,112, 97,100, 49, 91, 50, 93,  0,112,105,116,
+ 99,104,  0,115,111,117,110,100, 51, 68,  0,109, 97,107,101, 99,111,112,121,  0, 99,111,112,121,109, 97,100,101,  0,112, 97,100,
+ 50, 91, 49, 93,  0, 42,109,101,  0,108,105,110, 86,101,108,111, 99,105,116,121, 91, 51, 93,  0, 97,110,103, 86,101,108,111, 99,
+105,116,121, 91, 51, 93,  0,108,111, 99, 97,108,102,108, 97,103,  0,100,121,110, 95,111,112,101,114, 97,116,105,111,110,  0,102,
+111,114, 99,101,108,111, 99, 91, 51, 93,  0,102,111,114, 99,101,114,111,116, 91, 51, 93,  0,108,105,110,101, 97,114,118,101,108,
+111, 99,105,116,121, 91, 51, 93,  0, 97,110,103,117,108, 97,114,118,101,108,111, 99,105,116,121, 91, 51, 93,  0, 42,114,101,102,
+101,114,101,110, 99,101,  0, 98,117,116,115,116, 97,  0, 98,117,116,101,110,100,  0,109,105,110,  0,109, 97,120,  0,118,105,115,
+105,102, 97, 99,  0,114,111,116,100, 97,109,112,  0,109,105,110,108,111, 99, 91, 51, 93,  0,109, 97,120,108,111, 99, 91, 51, 93,
+  0,109,105,110,114,111,116, 91, 51, 93,  0,109, 97,120,114,111,116, 91, 51, 93,  0,109, 97,116,112,114,111,112, 91, 51, 50, 93,
+  0,100,105,115,116,114,105, 98,117,116,105,111,110,  0,105,110,116, 95, 97,114,103, 95, 49,  0,105,110,116, 95, 97,114,103, 95,
+ 50,  0,102,108,111, 97,116, 95, 97,114,103, 95, 49,  0,102,108,111, 97,116, 95, 97,114,103, 95, 50,  0,116,111, 80,114,111,112,
+ 78, 97,109,101, 91, 51, 50, 93,  0, 42,116,111, 79, 98,106,101, 99,116,  0, 98,111,100,121, 84,121,112,101,  0,102,105,108,101,
+110, 97,109,101, 91, 54, 52, 93,  0,108,111, 97,100, 97,110,105,110, 97,109,101, 91, 54, 52, 93,  0,105,110,116, 95, 97,114,103,
+  0,102,108,111, 97,116, 95, 97,114,103,  0,103,111,  0, 97, 99, 99,101,108,108,101,114, 97,116,105,111,110,  0,109, 97,120,115,
+112,101,101,100,  0,109, 97,120,114,111,116,115,112,101,101,100,  0,109, 97,120,116,105,108,116,115,112,101,101,100,  0,116,105,
+108,116,100, 97,109,112,  0,115,112,101,101,100,100, 97,109,112,  0, 42,115,111,117,114, 99,101,  0,102,114, 97,109,101,115,107,
+105,112,  0,109,117,116,101,  0, 99,104, 97,110,103,101,100,  0,109,105,110, 95,103, 97,105,110,  0,109, 97,120, 95,103, 97,105,
+110,  0,114,101,102,101,114,101,110, 99,101, 95,100,105,115,116, 97,110, 99,101,  0,109, 97,120, 95,100,105,115,116, 97,110, 99,
+101,  0,114,111,108,108,111,102,102, 95,102, 97, 99,116,111,114,  0, 99,111,110,101, 95,105,110,110,101,114, 95, 97,110,103,108,
+101,  0, 99,111,110,101, 95,111,117,116,101,114, 95, 97,110,103,108,101,  0, 99,111,110,101, 95,111,117,116,101,114, 95,103, 97,
+105,110,  0, 42,110,101,119,112, 97, 99,107,101,100,102,105,108,101,  0, 97,116,116,101,110,117, 97,116,105,111,110,  0,100,105,
+115,116, 97,110, 99,101,  0, 42, 99, 97, 99,104,101,  0, 42, 97,114,101, 97,  0, 42,108, 97,109,112,114,101,110,  0,103,111, 98,
 106,101, 99,116,  0,100,117,112,108,105, 95,111,102,115, 91, 51, 93,  0, 99,104,105,108,100, 98, 97,115,101,  0,114,111,108,108,
   0,104,101, 97,100, 91, 51, 93,  0,116, 97,105,108, 91, 51, 93,  0, 98,111,110,101, 95,109, 97,116, 91, 51, 93, 91, 51, 93,  0,
  97,114,109, 95,104,101, 97,100, 91, 51, 93,  0, 97,114,109, 95,116, 97,105,108, 91, 51, 93,  0, 97,114,109, 95,109, 97,116, 91,
@@ -1879,321 +2013,347 @@ char datatoc_B_blend[]= {
  98, 97,115,101,  0, 42,101,100, 98,111,  0, 42,115,107,101,116, 99,104,  0,108, 97,121,101,114, 95,112,114,111,116,101, 99,116,
 101,100,  0,103,104,111,115,116,101,112,  0,103,104,111,115,116,115,105,122,101,  0,103,104,111,115,116,116,121,112,101,  0,112,
  97,116,104,115,105,122,101,  0,103,104,111,115,116,115,102,  0,103,104,111,115,116,101,102,  0,112, 97,116,104,115,102,  0,112,
- 97,116,104,101,102,  0,112, 97,116,104, 98, 99,  0,112, 97,116,104, 97, 99,  0, 42,112,114,111,112,  0, 99,111,110,115,116,102,
-108, 97,103,  0,105,107,102,108, 97,103,  0,115,101,108,101, 99,116,102,108, 97,103,  0, 97,103,114,112, 95,105,110,100,101,120,
-  0, 42, 98,111,110,101,  0, 42, 99,104,105,108,100,  0,105,107,116,114,101,101,  0, 42, 98, 95, 98,111,110,101, 95,109, 97,116,
-115,  0, 42,100,117, 97,108, 95,113,117, 97,116,  0, 42, 98, 95, 98,111,110,101, 95,100,117, 97,108, 95,113,117, 97,116,115,  0,
-101,117,108, 91, 51, 93,  0,114,111,116,109,111,100,101,  0, 99,104, 97,110, 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,
-115,101, 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,101, 95,104,101, 97,100, 91, 51, 93,  0,112,111,115,101, 95,116,
- 97,105,108, 91, 51, 93,  0,108,105,109,105,116,109,105,110, 91, 51, 93,  0,108,105,109,105,116,109, 97,120, 91, 51, 93,  0,115,
-116,105,102,102,110,101,115,115, 91, 51, 93,  0,105,107,115,116,114,101,116, 99,104,  0, 42, 99,117,115,116,111,109,  0, 99,104,
- 97,110, 98, 97,115,101,  0,112,114,111,120,121, 95,108, 97,121,101,114,  0,115,116,114,105,100,101, 95,111,102,102,115,101,116,
- 91, 51, 93,  0, 99,121, 99,108,105, 99, 95,111,102,102,115,101,116, 91, 51, 93,  0, 97,103,114,111,117,112,115,  0, 97, 99,116,
-105,118,101, 95,103,114,111,117,112,  0, 99,117,115,116,111,109, 67,111,108,  0, 99,115,  0, 99,117,114,118,101,115,  0,103,114,
-111,117,112,115,  0, 97, 99,116,105,118,101, 95,109, 97,114,107,101,114,  0, 42,115,111,117,114, 99,101,  0,102,105,108,116,101,
-114,102,108, 97,103,  0, 97,100,115,  0, 97, 99,116,110,114,  0, 97, 99,116,119,105,100,116,104,  0,116,105,109,101,115,108,105,
-100,101,  0, 42,103,114,112,  0,116,101,109,112,  0,110, 97,109,101, 91, 51, 48, 93,  0,111,119,110,115,112, 97, 99,101,  0,116,
- 97,114,115,112, 97, 99,101,  0,101,110,102,111,114, 99,101,  0,104,101, 97,100,116, 97,105,108,  0, 42,116, 97,114,  0,115,117,
- 98,116, 97,114,103,101,116, 91, 51, 50, 93,  0,109, 97,116,114,105,120, 91, 52, 93, 91, 52, 93,  0,115,112, 97, 99,101,  0,116,
- 97,114,110,117,109,  0,116, 97,114,103,101,116,115,  0,105,116,101,114, 97,116,105,111,110,115,  0,114,111,111,116, 98,111,110,
-101,  0,109, 97,120, 95,114,111,111,116, 98,111,110,101,  0, 42,112,111,108,101,116, 97,114,  0,112,111,108,101,115,117, 98,116,
- 97,114,103,101,116, 91, 51, 50, 93,  0,112,111,108,101, 97,110,103,108,101,  0,111,114,105,101,110,116,119,101,105,103,104,116,
-  0,103,114, 97, 98,116, 97,114,103,101,116, 91, 51, 93,  0,114,101,115,101,114,118,101,100, 49,  0,114,101,115,101,114,118,101,
-100, 50,  0,109,105,110,109, 97,120,102,108, 97,103,  0,115,116,117, 99,107,  0, 99, 97, 99,104,101, 91, 51, 93,  0,108,111, 99,
-107,102,108, 97,103,  0,102,111,108,108,111,119,102,108, 97,103,  0,118,111,108,109,111,100,101,  0,112,108, 97,110,101,  0,111,
-114,103,108,101,110,103,116,104,  0, 98,117,108,103,101,  0,112,105,118, 88,  0,112,105,118, 89,  0,112,105,118, 90,  0, 97,120,
- 88,  0, 97,120, 89,  0, 97,120, 90,  0,109,105,110, 76,105,109,105,116, 91, 54, 93,  0,109, 97,120, 76,105,109,105,116, 91, 54,
- 93,  0,101,120,116,114, 97, 70,122,  0,105,110,118,109, 97,116, 91, 52, 93, 91, 52, 93,  0,102,114,111,109,  0,116,111,  0,109,
- 97,112, 91, 51, 93,  0,101,120,112,111,  0,102,114,111,109, 95,109,105,110, 91, 51, 93,  0,102,114,111,109, 95,109, 97,120, 91,
- 51, 93,  0,116,111, 95,109,105,110, 91, 51, 93,  0,116,111, 95,109, 97,120, 91, 51, 93,  0,122,109,105,110,  0,122,109, 97,120,
-  0,112, 97,100, 91, 57, 93,  0, 99,104, 97,110,110,101,108, 91, 51, 50, 93,  0,110,111, 95,114,111,116, 95, 97,120,105,115,  0,
-115,116,114,105,100,101, 95, 97,120,105,115,  0, 99,117,114,109,111,100,  0, 97, 99,116,115,116, 97,114,116,  0, 97, 99,116,101,
-110,100,  0, 97, 99,116,111,102,102,115,  0,115,116,114,105,100,101,108,101,110,  0,115, 99, 97,108,101,  0, 98,108,101,110,100,
-111,117,116,  0,115,116,114,105,100,101, 99,104, 97,110,110,101,108, 91, 51, 50, 93,  0,111,102,102,115, 95, 98,111,110,101, 91,
- 51, 50, 93,  0,104, 97,115,105,110,112,117,116,  0,104, 97,115,111,117,116,112,117,116,  0,100, 97,116, 97,116,121,112,101,  0,
-115,111, 99,107,101,116,116,121,112,101,  0, 42,110,101,119, 95,115,111, 99,107,  0,110,115,  0,108,105,109,105,116,  0,115,116,
- 97, 99,107, 95,105,110,100,101,120,  0,105,110,116,101,114,110,  0,115,116, 97, 99,107, 95,105,110,100,101,120, 95,101,120,116,
-  0,108,111, 99,120,  0,108,111, 99,121,  0,111,119,110, 95,105,110,100,101,120,  0,116,111, 95,105,110,100,101,120,  0, 42,116,
-111,115,111, 99,107,  0, 42,108,105,110,107,  0, 42,110,101,119, 95,110,111,100,101,  0,117,115,101,114,110, 97,109,101, 91, 51,
- 50, 93,  0,108, 97,115,116,121,  0,111,117,116,112,117,116,115,  0, 42,115,116,111,114, 97,103,101,  0,109,105,110,105,119,105,
-100,116,104,  0, 99,117,115,116,111,109, 49,  0, 99,117,115,116,111,109, 50,  0, 99,117,115,116,111,109, 51,  0, 99,117,115,116,
-111,109, 52,  0,110,101,101,100, 95,101,120,101, 99,  0,101,120,101, 99,  0, 42,116,104,114,101, 97,100,100, 97,116, 97,  0,116,
-111,116,114,  0, 98,117,116,114,  0,112,114,118,114,  0, 42,116,121,112,101,105,110,102,111,  0, 42,102,114,111,109,110,111,100,
-101,  0, 42,116,111,110,111,100,101,  0, 42,102,114,111,109,115,111, 99,107,  0,110,111,100,101,115,  0,108,105,110,107,115,  0,
- 42,115,116, 97, 99,107,  0, 42,116,104,114,101, 97,100,115,116, 97, 99,107,  0,105,110,105,116,  0,115,116, 97, 99,107,115,105,
-122,101,  0, 99,117,114, 95,105,110,100,101,120,  0, 97,108,108,116,121,112,101,115,  0, 42,111,119,110,116,121,112,101,  0, 42,
-115,101,108,105,110,  0, 42,115,101,108,111,117,116,  0, 40, 42,116,105,109,101, 99,117,114,115,111,114, 41, 40, 41,  0, 40, 42,
-115,116, 97,116,115, 95,100,114, 97,119, 41, 40, 41,  0, 40, 42,116,101,115,116, 95, 98,114,101, 97,107, 41, 40, 41,  0, 42,116,
- 98,104,  0, 42,116, 99,104,  0, 42,115,100,104,  0, 99,121, 99,108,105, 99,  0,109,111,118,105,101,  0,115, 97,109,112,108,101,
-115,  0,109,105,110,115,112,101,101,100,  0,112,101,114, 99,101,110,116,120,  0,112,101,114, 99,101,110,116,121,  0, 98,111,107,
-101,104,  0, 99,117,114,118,101,100,  0,105,109, 97,103,101, 95,105,110, 95,119,105,100,116,104,  0,105,109, 97,103,101, 95,105,
-110, 95,104,101,105,103,104,116,  0, 99,101,110,116,101,114, 95,120,  0, 99,101,110,116,101,114, 95,121,  0,115,112,105,110,  0,
-105,116,101,114,  0,119,114, 97,112,  0,115,105,103,109, 97, 95, 99,111,108,111,114,  0,115,105,103,109, 97, 95,115,112, 97, 99,
-101,  0,104,117,101,  0,115, 97,116,  0,116, 49,  0,116, 50,  0,116, 51,  0,102,115,116,114,101,110,103,116,104,  0,102, 97,108,
-112,104, 97,  0,107,101,121, 91, 52, 93,  0,120, 49,  0,120, 50,  0,121, 49,  0,121, 50,  0, 99,111,108,110, 97,109,101, 91, 51,
- 50, 93,  0, 98,107,116,121,112,101,  0,114,111,116, 97,116,105,111,110,  0,103, 97,109, 99,111,  0,110,111, 95,122, 98,117,102,
-  0,102,115,116,111,112,  0,109, 97,120, 98,108,117,114,  0, 98,116,104,114,101,115,104,  0, 42,100,105, 99,116,  0, 42,110,111,
-100,101,  0, 97,110,103,108,101, 95,111,102,115,  0, 99,111,108,109,111,100,  0,109,105,120,  0,116,104,114,101,115,104,111,108,
-100,  0,102, 97,100,101,  0,109,  0, 99,  0,106,105,116,  0,112,114,111,106,  0,102,105,116,  0,115,104,111,114,116,121,  0,109,
-105,110,116, 97, 98,108,101,  0,109, 97,120,116, 97, 98,108,101,  0,101,120,116, 95,105,110, 91, 50, 93,  0,101,120,116, 95,111,
-117,116, 91, 50, 93,  0, 42, 99,117,114,118,101,  0, 42,116, 97, 98,108,101,  0, 42,112,114,101,109,117,108,116, 97, 98,108,101,
-  0, 99,117,114,114,  0, 99,108,105,112,114,  0, 99,109, 91, 52, 93,  0, 98,108, 97, 99,107, 91, 51, 93,  0,119,104,105,116,101,
- 91, 51, 93,  0, 98,119,109,117,108, 91, 51, 93,  0,115, 97,109,112,108,101, 91, 51, 93,  0,111,102,102,115,101,116, 91, 50, 93,
-  0, 99,108,111,110,101,  0,105,110,110,101,114,114, 97,100,105,117,115,  0,114, 97,116,101,  0,114,103, 98, 91, 51, 93,  0,114,
-111,116,  0,115, 99,117,108,112,116, 95,116,111,111,108,  0, 97, 99,116,105,118,101, 95,114,110,100,  0, 97, 99,116,105,118,101,
+ 97,116,104,101,102,  0,112, 97,116,104, 98, 99,  0,112, 97,116,104, 97, 99,  0, 42,112,111,105,110,116,115,  0,115,116, 97,114,
+116, 95,102,114, 97,109,101,  0,101,110,100, 95,102,114, 97,109,101,  0, 42,112,114,111,112,  0, 99,111,110,115,116,102,108, 97,
+103,  0,105,107,102,108, 97,103,  0,115,101,108,101, 99,116,102,108, 97,103,  0, 97,103,114,112, 95,105,110,100,101,120,  0, 42,
+ 98,111,110,101,  0, 42, 99,104,105,108,100,  0,105,107,116,114,101,101,  0, 42, 98, 95, 98,111,110,101, 95,109, 97,116,115,  0,
+ 42,100,117, 97,108, 95,113,117, 97,116,  0, 42, 98, 95, 98,111,110,101, 95,100,117, 97,108, 95,113,117, 97,116,115,  0,101,117,
+108, 91, 51, 93,  0,114,111,116,109,111,100,101,  0, 99,104, 97,110, 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,101,
+ 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,101, 95,104,101, 97,100, 91, 51, 93,  0,112,111,115,101, 95,116, 97,105,
+108, 91, 51, 93,  0,108,105,109,105,116,109,105,110, 91, 51, 93,  0,108,105,109,105,116,109, 97,120, 91, 51, 93,  0,115,116,105,
+102,102,110,101,115,115, 91, 51, 93,  0,105,107,115,116,114,101,116, 99,104,  0, 42, 99,117,115,116,111,109,  0, 99,104, 97,110,
+ 98, 97,115,101,  0,112,114,111,120,121, 95,108, 97,121,101,114,  0,115,116,114,105,100,101, 95,111,102,102,115,101,116, 91, 51,
+ 93,  0, 99,121, 99,108,105, 99, 95,111,102,102,115,101,116, 91, 51, 93,  0, 97,103,114,111,117,112,115,  0, 97, 99,116,105,118,
+101, 95,103,114,111,117,112,  0, 99,104, 97,110,110,101,108,115,  0, 99,117,115,116,111,109, 67,111,108,  0, 99,115,  0, 99,117,
+114,118,101,115,  0,103,114,111,117,112,115,  0, 97, 99,116,105,118,101, 95,109, 97,114,107,101,114,  0,102,105,108,116,101,114,
+102,108, 97,103,  0, 97,100,115,  0, 97, 99,116,110,114,  0, 97, 99,116,119,105,100,116,104,  0,116,105,109,101,115,108,105,100,
+101,  0, 42,103,114,112,  0,116,101,109,112,  0,110, 97,109,101, 91, 51, 48, 93,  0,111,119,110,115,112, 97, 99,101,  0,116, 97,
+114,115,112, 97, 99,101,  0,101,110,102,111,114, 99,101,  0,104,101, 97,100,116, 97,105,108,  0, 42,116, 97,114,  0,109, 97,116,
+114,105,120, 91, 52, 93, 91, 52, 93,  0,115,112, 97, 99,101,  0,114,111,116, 79,114,100,101,114,  0,116, 97,114,110,117,109,  0,
+116, 97,114,103,101,116,115,  0,105,116,101,114, 97,116,105,111,110,115,  0,114,111,111,116, 98,111,110,101,  0,109, 97,120, 95,
+114,111,111,116, 98,111,110,101,  0, 42,112,111,108,101,116, 97,114,  0,112,111,108,101,115,117, 98,116, 97,114,103,101,116, 91,
+ 51, 50, 93,  0,112,111,108,101, 97,110,103,108,101,  0,111,114,105,101,110,116,119,101,105,103,104,116,  0,103,114, 97, 98,116,
+ 97,114,103,101,116, 91, 51, 93,  0,114,101,115,101,114,118,101,100, 49,  0,114,101,115,101,114,118,101,100, 50,  0,109,105,110,
+109, 97,120,102,108, 97,103,  0,115,116,117, 99,107,  0, 99, 97, 99,104,101, 91, 51, 93,  0,108,111, 99,107,102,108, 97,103,  0,
+102,111,108,108,111,119,102,108, 97,103,  0,118,111,108,109,111,100,101,  0,112,108, 97,110,101,  0,111,114,103,108,101,110,103,
+116,104,  0, 98,117,108,103,101,  0,112,105,118, 88,  0,112,105,118, 89,  0,112,105,118, 90,  0, 97,120, 88,  0, 97,120, 89,  0,
+ 97,120, 90,  0,109,105,110, 76,105,109,105,116, 91, 54, 93,  0,109, 97,120, 76,105,109,105,116, 91, 54, 93,  0,101,120,116,114,
+ 97, 70,122,  0,105,110,118,109, 97,116, 91, 52, 93, 91, 52, 93,  0,102,114,111,109,  0,116,111,  0,109, 97,112, 91, 51, 93,  0,
+101,120,112,111,  0,102,114,111,109, 95,109,105,110, 91, 51, 93,  0,102,114,111,109, 95,109, 97,120, 91, 51, 93,  0,116,111, 95,
+109,105,110, 91, 51, 93,  0,116,111, 95,109, 97,120, 91, 51, 93,  0,122,109,105,110,  0,122,109, 97,120,  0,112, 97,100, 91, 57,
+ 93,  0, 99,104, 97,110,110,101,108, 91, 51, 50, 93,  0,110,111, 95,114,111,116, 95, 97,120,105,115,  0,115,116,114,105,100,101,
+ 95, 97,120,105,115,  0, 99,117,114,109,111,100,  0, 97, 99,116,115,116, 97,114,116,  0, 97, 99,116,101,110,100,  0, 97, 99,116,
+111,102,102,115,  0,115,116,114,105,100,101,108,101,110,  0,115, 99, 97,108,101,  0, 98,108,101,110,100,111,117,116,  0,115,116,
+114,105,100,101, 99,104, 97,110,110,101,108, 91, 51, 50, 93,  0,111,102,102,115, 95, 98,111,110,101, 91, 51, 50, 93,  0,104, 97,
+115,105,110,112,117,116,  0,104, 97,115,111,117,116,112,117,116,  0,100, 97,116, 97,116,121,112,101,  0,115,111, 99,107,101,116,
+116,121,112,101,  0, 42,110,101,119, 95,115,111, 99,107,  0,110,115,  0,108,105,109,105,116,  0,115,116, 97, 99,107, 95,105,110,
+100,101,120,  0,105,110,116,101,114,110,  0,115,116, 97, 99,107, 95,105,110,100,101,120, 95,101,120,116,  0,108,111, 99,120,  0,
+108,111, 99,121,  0,111,119,110, 95,105,110,100,101,120,  0,116,111, 95,105,110,100,101,120,  0, 42,116,111,115,111, 99,107,  0,
+ 42,108,105,110,107,  0, 42,110,101,119, 95,110,111,100,101,  0,117,115,101,114,110, 97,109,101, 91, 51, 50, 93,  0,108, 97,115,
+116,121,  0,111,117,116,112,117,116,115,  0, 42,115,116,111,114, 97,103,101,  0,109,105,110,105,119,105,100,116,104,  0, 99,117,
+115,116,111,109, 49,  0, 99,117,115,116,111,109, 50,  0, 99,117,115,116,111,109, 51,  0, 99,117,115,116,111,109, 52,  0,110,101,
+101,100, 95,101,120,101, 99,  0,101,120,101, 99,  0, 42,116,104,114,101, 97,100,100, 97,116, 97,  0,116,111,116,114,  0, 98,117,
+116,114,  0,112,114,118,114,  0, 42,116,121,112,101,105,110,102,111,  0, 42,102,114,111,109,110,111,100,101,  0, 42,116,111,110,
+111,100,101,  0, 42,102,114,111,109,115,111, 99,107,  0,110,111,100,101,115,  0,108,105,110,107,115,  0, 42,115,116, 97, 99,107,
+  0, 42,116,104,114,101, 97,100,115,116, 97, 99,107,  0,105,110,105,116,  0,115,116, 97, 99,107,115,105,122,101,  0, 99,117,114,
+ 95,105,110,100,101,120,  0, 97,108,108,116,121,112,101,115,  0, 42,111,119,110,116,121,112,101,  0, 42,115,101,108,105,110,  0,
+ 42,115,101,108,111,117,116,  0, 40, 42,116,105,109,101, 99,117,114,115,111,114, 41, 40, 41,  0, 40, 42,115,116, 97,116,115, 95,
+100,114, 97,119, 41, 40, 41,  0, 40, 42,116,101,115,116, 95, 98,114,101, 97,107, 41, 40, 41,  0, 42,116, 98,104,  0, 42,116, 99,
+104,  0, 42,115,100,104,  0, 99,121, 99,108,105, 99,  0,109,111,118,105,101,  0,115, 97,109,112,108,101,115,  0,109,105,110,115,
+112,101,101,100,  0,112,101,114, 99,101,110,116,120,  0,112,101,114, 99,101,110,116,121,  0, 98,111,107,101,104,  0, 99,117,114,
+118,101,100,  0,105,109, 97,103,101, 95,105,110, 95,119,105,100,116,104,  0,105,109, 97,103,101, 95,105,110, 95,104,101,105,103,
+104,116,  0, 99,101,110,116,101,114, 95,120,  0, 99,101,110,116,101,114, 95,121,  0,115,112,105,110,  0,105,116,101,114,  0,119,
+114, 97,112,  0,115,105,103,109, 97, 95, 99,111,108,111,114,  0,115,105,103,109, 97, 95,115,112, 97, 99,101,  0,104,117,101,  0,
+115, 97,116,  0,116, 49,  0,116, 50,  0,116, 51,  0,102,115,116,114,101,110,103,116,104,  0,102, 97,108,112,104, 97,  0,107,101,
+121, 91, 52, 93,  0,120, 49,  0,120, 50,  0,121, 49,  0,121, 50,  0, 99,111,108,110, 97,109,101, 91, 51, 50, 93,  0, 98,107,116,
+121,112,101,  0,114,111,116, 97,116,105,111,110,  0,103, 97,109, 99,111,  0,110,111, 95,122, 98,117,102,  0,102,115,116,111,112,
+  0,109, 97,120, 98,108,117,114,  0, 98,116,104,114,101,115,104,  0, 42,100,105, 99,116,  0, 42,110,111,100,101,  0, 97,110,103,
+108,101, 95,111,102,115,  0, 99,111,108,109,111,100,  0,109,105,120,  0,116,104,114,101,115,104,111,108,100,  0,102, 97,100,101,
+  0,109,  0, 99,  0,106,105,116,  0,112,114,111,106,  0,102,105,116,  0,115,104,111,114,116,121,  0,109,105,110,116, 97, 98,108,
+101,  0,109, 97,120,116, 97, 98,108,101,  0,101,120,116, 95,105,110, 91, 50, 93,  0,101,120,116, 95,111,117,116, 91, 50, 93,  0,
+ 42, 99,117,114,118,101,  0, 42,116, 97, 98,108,101,  0, 42,112,114,101,109,117,108,116, 97, 98,108,101,  0, 99,117,114,114,  0,
+ 99,108,105,112,114,  0, 99,109, 91, 52, 93,  0, 98,108, 97, 99,107, 91, 51, 93,  0,119,104,105,116,101, 91, 51, 93,  0, 98,119,
+109,117,108, 91, 51, 93,  0,115, 97,109,112,108,101, 91, 51, 93,  0,111,102,102,115,101,116, 91, 50, 93,  0, 99,108,111,110,101,
+  0,105,110,110,101,114,114, 97,100,105,117,115,  0,115,109,111,111,116,104, 95,115,116,114,111,107,101, 95,114, 97,100,105,117,
+115,  0,115,109,111,111,116,104, 95,115,116,114,111,107,101, 95,102, 97, 99,116,111,114,  0,114, 97,116,101,  0,114,103, 98, 91,
+ 51, 93,  0,115, 99,117,108,112,116, 95,116,111,111,108,  0, 97, 99,116,105,118,101, 95,114,110,100,  0, 97, 99,116,105,118,101,
  95, 99,108,111,110,101,  0, 97, 99,116,105,118,101, 95,109, 97,115,107,  0, 42,108, 97,121,101,114,115,  0,116,111,116,108, 97,
 121,101,114,  0,109, 97,120,108, 97,121,101,114,  0,116,111,116,115,105,122,101,  0, 42,112,111,111,108,  0,101,100,105,116,102,
-108, 97,103,  0,118,101,108, 91, 51, 93,  0,114,111,116, 91, 52, 93,  0, 97,118,101, 91, 51, 93,  0,110,117,109,  0,112, 97,114,
-101,110,116,  0,112, 97, 91, 52, 93,  0,119, 91, 52, 93,  0,102,117,118, 91, 52, 93,  0,102,111,102,102,115,101,116,  0,114, 97,
-110,100, 91, 51, 93,  0, 42,115,116,105, 99,107, 95,111, 98,  0,112,114,101,118, 95,115,116, 97,116,101,  0, 42,104, 97,105,114,
-  0, 42, 98,111,105,100,  0,114, 95,114,111,116, 91, 52, 93,  0,114, 95, 97,118,101, 91, 51, 93,  0,114, 95,118,101, 91, 51, 93,
-  0,100,105,101,116,105,109,101,  0,115,105,122,101,109,117,108,  0,110,117,109, 95,100,109, 99, 97, 99,104,101,  0, 98,112,105,
-  0, 97,108,105,118,101,  0,108,111,111,112,  0, 42, 98,111,105,100,115,  0,100,105,115,116,114,  0,112,104,121,115,116,121,112,
-101,  0, 97,118,101,109,111,100,101,  0,114,101, 97, 99,116,101,118,101,110,116,  0,100,114, 97,119,  0,100,114, 97,119, 95, 97,
-115,  0,100,114, 97,119, 95,115,105,122,101,  0, 99,104,105,108,100,116,121,112,101,  0,114,101,110, 95, 97,115,  0,100,114, 97,
-119, 95,115,116,101,112,  0,114,101,110, 95,115,116,101,112,  0,104, 97,105,114, 95,115,116,101,112,  0,107,101,121,115, 95,115,
-116,101,112,  0, 97,100, 97,112,116, 95, 97,110,103,108,101,  0, 97,100, 97,112,116, 95,112,105,120,  0,114,111,116,102,114,111,
-109,  0,105,110,116,101,103,114, 97,116,111,114,  0, 98, 98, 95, 97,108,105,103,110,  0, 98, 98, 95,117,118, 95,115,112,108,105,
-116,  0, 98, 98, 95, 97,110,105,109,  0, 98, 98, 95,115,112,108,105,116, 95,111,102,102,115,101,116,  0, 98, 98, 95,116,105,108,
-116,  0, 98, 98, 95,114, 97,110,100, 95,116,105,108,116,  0, 98, 98, 95,111,102,102,115,101,116, 91, 50, 93,  0,115,105,109,112,
-108,105,102,121, 95,102,108, 97,103,  0,115,105,109,112,108,105,102,121, 95,114,101,102,115,105,122,101,  0,115,105,109,112,108,
-105,102,121, 95,114, 97,116,101,  0,115,105,109,112,108,105,102,121, 95,116,114, 97,110,115,105,116,105,111,110,  0,115,105,109,
-112,108,105,102,121, 95,118,105,101,119,112,111,114,116,  0,116,105,109,101,116,119,101, 97,107,  0,106,105,116,102, 97, 99,  0,
-101,102,102, 95,104, 97,105,114,  0,103,114,105,100, 95,114,101,115,  0,112, 97,114,116,102, 97, 99,  0,116, 97,110,102, 97, 99,
-  0,116, 97,110,112,104, 97,115,101,  0,114,101, 97, 99,116,102, 97, 99,  0, 97,118,101,102, 97, 99,  0,112,104, 97,115,101,102,
- 97, 99,  0,114, 97,110,100,114,111,116,102, 97, 99,  0,114, 97,110,100,112,104, 97,115,101,102, 97, 99,  0,114, 97,110,100,115,
-105,122,101,  0,114,101, 97, 99,116,115,104, 97,112,101,  0, 97, 99, 99, 91, 51, 93,  0,100,114, 97,103,102, 97, 99,  0, 98,114,
-111,119,110,102, 97, 99,  0,100, 97,109,112,102, 97, 99,  0,114, 97,110,100,108,101,110,103,116,104,  0, 99,104,105,108,100, 95,
-110, 98,114,  0,114,101,110, 95, 99,104,105,108,100, 95,110, 98,114,  0,112, 97,114,101,110,116,115,  0, 99,104,105,108,100,115,
-105,122,101,  0, 99,104,105,108,100,114, 97,110,100,115,105,122,101,  0, 99,104,105,108,100,114, 97,100,  0, 99,104,105,108,100,
-102,108, 97,116,  0, 99,108,117,109,112,102, 97, 99,  0, 99,108,117,109,112,112,111,119,  0,114,111,117,103,104, 49,  0,114,111,
-117,103,104, 49, 95,115,105,122,101,  0,114,111,117,103,104, 50,  0,114,111,117,103,104, 50, 95,115,105,122,101,  0,114,111,117,
-103,104, 50, 95,116,104,114,101,115,  0,114,111,117,103,104, 95,101,110,100,  0,114,111,117,103,104, 95,101,110,100, 95,115,104,
- 97,112,101,  0, 99,108,101,110,103,116,104,  0, 99,108,101,110,103,116,104, 95,116,104,114,101,115,  0, 98,114, 97,110, 99,104,
- 95,116,104,114,101,115,  0,100,114, 97,119, 95,108,105,110,101, 91, 50, 93,  0,112, 97,116,104, 95,115,116, 97,114,116,  0,112,
- 97,116,104, 95,101,110,100,  0,116,114, 97,105,108, 95, 99,111,117,110,116,  0,107,101,121,101,100, 95,108,111,111,112,115,  0,
-101,102,102,101, 99,116,111,114, 95,119,101,105,103,104,116, 91, 49, 48, 93,  0, 42,101,102,102, 95,103,114,111,117,112,  0, 42,
-100,117,112, 95,111, 98,  0, 42, 98, 98, 95,111, 98,  0, 42,112,100, 50,  0, 42,112, 97,114,116,  0, 42,101,100,105,116,  0, 40,
- 42,102,114,101,101, 95,101,100,105,116, 41, 40, 41,  0, 42, 42,112, 97,116,104, 99, 97, 99,104,101,  0, 42, 42, 99,104,105,108,
-100, 99, 97, 99,104,101,  0,112, 97,116,104, 99, 97, 99,104,101, 98,117,102,115,  0, 99,104,105,108,100, 99, 97, 99,104,101, 98,
-117,102,115,  0, 42,116, 97,114,103,101,116, 95,111, 98,  0, 42,108, 97,116,116,105, 99,101,  0,101,102,102,101, 99,116,111,114,
-115,  0,114,101, 97, 99,116,101,118,101,110,116,115,  0,116,114,101,101, 95,102,114, 97,109,101,  0,116,111,116, 99,104,105,108,
-100,  0,116,111,116, 99, 97, 99,104,101,100,  0,116,111,116, 99,104,105,108,100, 99, 97, 99,104,101,  0,116, 97,114,103,101,116,
- 95,112,115,121,115,  0,116,111,116,107,101,121,101,100,  0, 98, 97,107,101,115,112, 97, 99,101,  0, 98, 98, 95,117,118,110, 97,
-109,101, 91, 51, 93, 91, 51, 50, 93,  0,118,103,114,111,117,112, 91, 49, 50, 93,  0,118,103, 95,110,101,103,  0,114,116, 51,  0,
- 42,114,101,110,100,101,114,100, 97,116, 97,  0, 42,116,114,101,101,  0, 42, 99, 97, 99,104,101,  0, 67,100,105,115,  0, 67,118,
-105,  0, 91, 51, 93,  0,115,116,114,117, 99,116,117,114, 97,108,  0, 98,101,110,100,105,110,103,  0,109, 97,120, 95, 98,101,110,
-100,  0,109, 97,120, 95,115,116,114,117, 99,116,  0,109, 97,120, 95,115,104,101, 97,114,  0, 97,118,103, 95,115,112,114,105,110,
-103, 95,108,101,110,  0,116,105,109,101,115, 99, 97,108,101,  0,101,102,102, 95,102,111,114, 99,101, 95,115, 99, 97,108,101,  0,
-101,102,102, 95,119,105,110,100, 95,115, 99, 97,108,101,  0,115,105,109, 95,116,105,109,101, 95,111,108,100,  0,115,116,101,112,
-115, 80,101,114, 70,114, 97,109,101,  0,112,114,101,114,111,108,108,  0,109, 97,120,115,112,114,105,110,103,108,101,110,  0,115,
-111,108,118,101,114, 95,116,121,112,101,  0,118,103,114,111,117,112, 95, 98,101,110,100,  0,118,103,114,111,117,112, 95,109, 97,
-115,115,  0,118,103,114,111,117,112, 95,115,116,114,117, 99,116,  0,112,114,101,115,101,116,115,  0, 42, 99,111,108,108,105,115,
-105,111,110, 95,108,105,115,116,  0,101,112,115,105,108,111,110,  0,115,101,108,102, 95,102,114,105, 99,116,105,111,110,  0,115,
-101,108,102,101,112,115,105,108,111,110,  0,115,101,108,102, 95,108,111,111,112, 95, 99,111,117,110,116,  0,108,111,111,112, 95,
- 99,111,117,110,116,  0,112,114,101,115,115,117,114,101,  0, 42,112,111,105,110,116,115,  0,116,111,116,112,111,105,110,116,115,
-  0,116,104,105, 99,107,110,101,115,115,  0,115,116,114,111,107,101,115,  0,102,114, 97,109,101,110,117,109,  0, 42, 97, 99,116,
-102,114, 97,109,101,  0,103,115,116,101,112,  0,105,110,102,111, 91, 49, 50, 56, 93,  0,115, 98,117,102,102,101,114, 95,115,105,
-122,101,  0,115, 98,117,102,102,101,114, 95,115,102,108, 97,103,  0, 42,115, 98,117,102,102,101,114,  0, 42,116,121,112,101,115,
-116,114,  0, 42,109,101,115,115, 97,103,101,  0,108,105,115,116,  0,112,114,105,110,116,108,101,118,101,108,  0,115,116,111,114,
-101,108,101,118,101,108,  0, 42,119,105,110,100,114, 97,119, 97, 98,108,101,  0, 42,119,105,110, 97, 99,116,105,118,101,  0,119,
-105,110,100,111,119,115,  0,105,110,105,116,105, 97,108,105,122,101,100,  0,102,105,108,101, 95,115, 97,118,101,100,  0,111,112,
-101,114, 97,116,111,114,115,  0,113,117,101,117,101,  0,114,101,112,111,114,116,115,  0,106,111, 98,115,  0,112, 97,105,110,116,
- 99,117,114,115,111,114,115,  0,107,101,121,109, 97,112,115,  0, 42,103,104,111,115,116,119,105,110,  0, 42,110,101,119,115, 99,
-114,101,101,110,  0,115, 99,114,101,101,110,110, 97,109,101, 91, 51, 50, 93,  0,112,111,115,120,  0,112,111,115,121,  0,119,105,
-110,100,111,119,115,116, 97,116,101,  0,109,111,110,105,116,111,114,  0,108, 97,115,116, 99,117,114,115,111,114,  0, 97,100,100,
-109,111,117,115,101,109,111,118,101,  0, 42,101,118,101,110,116,115,116, 97,116,101,  0, 42, 99,117,114,115,119,105,110,  0, 42,
-116,119,101, 97,107,  0,100,114, 97,119,109,101,116,104,111,100,  0,100,114, 97,119,102, 97,105,108,  0, 42,100,114, 97,119,100,
- 97,116, 97,  0,116,105,109,101,114,115,  0,115,117, 98,119,105,110,100,111,119,115,  0,103,101,115,116,117,114,101,  0,105,100,
-110, 97,109,101, 91, 54, 52, 93,  0, 42,112,116,114,  0,115,104,105,102,116,  0, 99,116,114,108,  0, 97,108,116,  0,111,115,107,
-101,121,  0,107,101,121,109,111,100,105,102,105,101,114,  0,112,114,111,112,118, 97,108,117,101,  0,105,110, 97, 99,116,105,118,
-101,  0,109, 97,112,116,121,112,101,  0,107,101,121,109, 97,112,  0,110, 97,109,101,105,100, 91, 54, 52, 93,  0,115,112, 97, 99,
-101,105,100,  0,114,101,103,105,111,110,105,100,  0,105,115, 95,109,111,100, 97,108,  0, 42,105,116,101,109,115,  0, 42, 99,117,
-115,116,111,109,100, 97,116, 97,  0, 42,114,101,112,111,114,116,115,  0,109, 97, 99,114,111,  0, 42,111,112,109,  0,109,118, 97,
-108, 91, 50, 93,  0,112,114,101,118,120,  0,112,114,101,118,121,  0,117,110,105, 99,111,100,101,  0, 97,115, 99,105,105,  0, 42,
-107,101,121,109, 97,112, 95,105,100,110, 97,109,101,  0, 99,117,115,116,111,109,  0, 99,117,115,116,111,109,100, 97,116, 97,102,
-114,101,101,  0, 42,101,100, 97,116, 97,  0,105,110,102,108,117,101,110, 99,101,  0, 42, 99,111,101,102,102,105, 99,105,101,110,
-116,115,  0, 97,114,114, 97,121,115,105,122,101,  0,112,111,108,121, 95,111,114,100,101,114,  0, 97,109,112,108,105,116,117,100,
-101,  0,112,104, 97,115,101, 95,109,117,108,116,105,112,108,105,101,114,  0,112,104, 97,115,101, 95,111,102,102,115,101,116,  0,
-118, 97,108,117,101, 95,111,102,102,115,101,116,  0,109,105,100,118, 97,108,  0, 98,101,102,111,114,101, 95,109,111,100,101,  0,
- 97,102,116,101,114, 95,109,111,100,101,  0, 98,101,102,111,114,101, 95, 99,121, 99,108,101,115,  0, 97,102,116,101,114, 95, 99,
-121, 99,108,101,115,  0,114,101, 99,116,  0,112,104, 97,115,101,  0,109,111,100,105,102,105, 99, 97,116,105,111,110,  0, 42,114,
-110, 97, 95,112, 97,116,104,  0, 97,114,114, 97,121, 95,105,110,100,101,120,  0,101,120,112,114,101,115,115,105,111,110, 91, 50,
- 53, 54, 93,  0,118,101, 99, 91, 50, 93,  0, 42,102,112,116,  0, 99,111,108,111,114, 95,109,111,100,101,  0, 99,111,108,111,114,
- 91, 51, 93,  0,102,114,111,109, 91, 49, 50, 56, 93,  0,116,111, 91, 49, 50, 56, 93,  0,109, 97,112,112,105,110,103,115,  0,115,
-116,114,105,112,115,  0, 42,114,101,109, 97,112,  0,102, 99,117,114,118,101,115,  0,115,116,114,105,112, 95,116,105,109,101,  0,
- 98,108,101,110,100,109,111,100,101,  0,101,120,116,101,110,100,109,111,100,101,  0,103,114,111,117,112, 91, 54, 52, 93,  0,105,
-100,116,121,112,101,  0,116,101,109,112,108, 97,116,101,115,  0,103,114,111,117,112,109,111,100,101,  0,112, 97,116,104,115,  0,
-107,101,121,105,110,103,102,108, 97,103,  0, 42,116,109,112, 97, 99,116,  0,110,108, 97, 95,116,114, 97, 99,107,115,  0, 42, 97,
- 99,116,115,116,114,105,112,  0,100,114,105,118,101,114,115,  0,111,118,101,114,114,105,100,101,115,  0,114,117,108,101,  0,111,
-112,116,105,111,110,115,  0,102,101, 97,114, 95,102, 97, 99,116,111,114,  0,115,105,103,110, 97,108, 95,105,100,  0,108,111,111,
-107, 95, 97,104,101, 97,100,  0,111,108,111, 99, 91, 51, 93,  0,113,117,101,117,101, 95,115,105,122,101,  0,119, 97,110,100,101,
-114,  0,102,108,101,101, 95,100,105,115,116, 97,110, 99,101,  0,104,101, 97,108,116,104,  0,115,116, 97,116,101, 95,105,100,  0,
-114,117,108,101,115,  0, 99,111,110,100,105,116,105,111,110,115,  0, 97, 99,116,105,111,110,115,  0,114,117,108,101,115,101,116,
- 95,116,121,112,101,  0,114,117,108,101, 95,102,117,122,122,105,110,101,115,115,  0,108, 97,115,116, 95,115,116, 97,116,101, 95,
-105,100,  0,108, 97,110,100,105,110,103, 95,115,109,111,111,116,104,110,101,115,115,  0, 98, 97,110,107,105,110,103,  0, 97,103,
-103,114,101,115,115,105,111,110,  0, 97, 99, 99,117,114, 97, 99,121,  0, 97,105,114, 95,109,105,110, 95,115,112,101,101,100,  0,
- 97,105,114, 95,109, 97,120, 95,115,112,101,101,100,  0, 97,105,114, 95,109, 97,120, 95, 97, 99, 99,  0, 97,105,114, 95,109, 97,
-120, 95, 97,118,101,  0, 97,105,114, 95,112,101,114,115,111,110, 97,108, 95,115,112, 97, 99,101,  0,108, 97,110,100, 95,106,117,
-109,112, 95,115,112,101,101,100,  0,108, 97,110,100, 95,109, 97,120, 95,115,112,101,101,100,  0,108, 97,110,100, 95,109, 97,120,
- 95, 97, 99, 99,  0,108, 97,110,100, 95,109, 97,120, 95, 97,118,101,  0,108, 97,110,100, 95,112,101,114,115,111,110, 97,108, 95,
-115,112, 97, 99,101,  0,108, 97,110,100, 95,115,116,105, 99,107, 95,102,111,114, 99,101,  0,115,116, 97,116,101,115,  0,  0,  0,
- 84, 89, 80, 69,168,  1,  0,  0, 99,104, 97,114,  0,117, 99,104, 97,114,  0,115,104,111,114,116,  0,117,115,104,111,114,116,  0,
-105,110,116,  0,108,111,110,103,  0,117,108,111,110,103,  0,102,108,111, 97,116,  0,100,111,117, 98,108,101,  0,118,111,105,100,
-  0, 76,105,110,107,  0, 76,105,110,107, 68, 97,116, 97,  0, 76,105,115,116, 66, 97,115,101,  0,118,101, 99, 50,115,  0,118,101,
- 99, 50,105,  0,118,101, 99, 50,102,  0,118,101, 99, 50,100,  0,118,101, 99, 51,105,  0,118,101, 99, 51,102,  0,118,101, 99, 51,
-100,  0,118,101, 99, 52,105,  0,118,101, 99, 52,102,  0,118,101, 99, 52,100,  0,114, 99,116,105,  0,114, 99,116,102,  0, 73, 68,
- 80,114,111,112,101,114,116,121, 68, 97,116, 97,  0, 73, 68, 80,114,111,112,101,114,116,121,  0, 73, 68,  0, 76,105, 98,114, 97,
-114,121,  0, 70,105,108,101, 68, 97,116, 97,  0, 80,114,101,118,105,101,119, 73,109, 97,103,101,  0, 73,112,111, 68,114,105,118,
-101,114,  0, 79, 98,106,101, 99,116,  0, 73,112,111, 67,117,114,118,101,  0, 66, 80,111,105,110,116,  0, 66,101,122, 84,114,105,
-112,108,101,  0, 73,112,111,  0, 75,101,121, 66,108,111, 99,107,  0, 75,101,121,  0, 65,110,105,109, 68, 97,116, 97,  0, 84,101,
-120,116, 76,105,110,101,  0, 84,101,120,116, 77, 97,114,107,101,114,  0, 84,101,120,116,  0, 80, 97, 99,107,101,100, 70,105,108,
-101,  0, 67, 97,109,101,114, 97,  0, 73,109, 97,103,101, 85,115,101,114,  0, 83, 99,101,110,101,  0, 73,109, 97,103,101,  0, 71,
- 80, 85, 84,101,120,116,117,114,101,  0, 97,110,105,109,  0, 82,101,110,100,101,114, 82,101,115,117,108,116,  0, 77, 84,101,120,
-  0, 84,101,120,  0, 80,108,117,103,105,110, 84,101,120,  0, 67, 66, 68, 97,116, 97,  0, 67,111,108,111,114, 66, 97,110,100,  0,
- 69,110,118, 77, 97,112,  0, 73,109, 66,117,102,  0, 98, 78,111,100,101, 84,114,101,101,  0, 84,101,120, 77, 97,112,112,105,110,
-103,  0, 76, 97,109,112,  0, 67,117,114,118,101, 77, 97,112,112,105,110,103,  0, 87, 97,118,101,  0, 77, 97,116,101,114,105, 97,
-108,  0, 71,114,111,117,112,  0, 86, 70,111,110,116,  0, 86, 70,111,110,116, 68, 97,116, 97,  0, 77,101,116, 97, 69,108,101,109,
-  0, 66,111,117,110,100, 66,111,120,  0, 77,101,116, 97, 66, 97,108,108,  0, 78,117,114, 98,  0, 67,104, 97,114, 73,110,102,111,
-  0, 84,101,120,116, 66,111,120,  0, 67,117,114,118,101,  0, 80, 97,116,104,  0, 83,101,108, 66,111,120,  0, 69,100,105,116, 70,
-111,110,116,  0, 77,101,115,104,  0, 77, 70, 97, 99,101,  0, 77, 84, 70, 97, 99,101,  0, 84, 70, 97, 99,101,  0, 77, 86,101,114,
-116,  0, 77, 69,100,103,101,  0, 77, 68,101,102,111,114,109, 86,101,114,116,  0, 77, 67,111,108,  0, 77, 83,116,105, 99,107,121,
-  0, 77, 83,101,108,101, 99,116,  0, 69,100,105,116, 77,101,115,104,  0, 67,117,115,116,111,109, 68, 97,116, 97,  0, 77,117,108,
-116,105,114,101,115,  0, 80, 97,114,116,105, 97,108, 86,105,115,105, 98,105,108,105,116,121,  0, 77, 68,101,102,111,114,109, 87,
-101,105,103,104,116,  0, 77, 84,101,120, 80,111,108,121,  0, 77, 76,111,111,112, 85, 86,  0, 77, 76,111,111,112, 67,111,108,  0,
- 77, 70,108,111, 97,116, 80,114,111,112,101,114,116,121,  0, 77, 73,110,116, 80,114,111,112,101,114,116,121,  0, 77, 83,116,114,
-105,110,103, 80,114,111,112,101,114,116,121,  0, 79,114,105,103, 83,112, 97, 99,101, 70, 97, 99,101,  0, 77, 68,105,115,112,115,
-  0, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69, 68, 82, 65, 87, 32, 40, 49, 60, 60, 49, 41, 32, 35,100,101,
-102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77, 32, 40, 49, 60, 60, 50, 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70,
- 71, 79, 78, 32, 40, 49, 60, 60, 51, 41, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69, 82, 69, 78, 68, 69,
- 82, 32, 40, 49, 60, 60, 53, 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 76, 79, 79, 83, 69, 69, 68, 71, 69, 32, 40, 49,
- 60, 60, 55, 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77, 95, 76, 65, 83, 84, 32, 40, 49, 60, 60, 56, 41,
- 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 72, 65, 82, 80, 32, 40, 49, 60, 60, 57, 41, 32, 32, 32, 35,100,101,102,105,
-110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 49, 32, 49, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 50,
- 32, 50, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 51, 32, 52, 32, 35,100,101,102,105,110,101, 32, 77,
- 69, 95, 70, 76, 73, 80, 86, 52, 32, 56, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88, 89, 32, 49, 54, 32,
- 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88, 90, 32, 51, 50, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95,
- 80, 82, 79, 74, 89, 90, 32, 54, 52, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 49, 86, 50, 32, 49, 32, 35,100,101,
-102,105,110,101, 32, 77, 69, 95, 86, 50, 86, 51, 32, 50, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86, 49, 32, 52,
- 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86, 52, 32, 52, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 52,
- 86, 49, 32, 56, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 77, 79, 79, 84, 72, 32, 49, 32, 35,100,101,102,105,110,
-101, 32, 77, 69, 95, 70, 65, 67, 69, 95, 83, 69, 76, 32, 50, 32, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 83, 69,
-108, 32, 48, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 83, 69,108, 32, 49, 32, 35,100,101,102,105,110,101, 32, 77, 69,
- 95, 70, 83, 69, 76, 32, 50, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 69, 67, 84, 32, 49, 32, 32, 35,100,
-101,102,105,110,101, 32, 84, 70, 95, 65, 67, 84, 73, 86, 69, 32, 50, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69,
- 76, 49, 32, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 50, 32, 56, 32, 35,100,101,102,105,110,101, 32, 84,
- 70, 95, 83, 69, 76, 51, 32, 49, 54, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 52, 32, 51, 50, 32, 35,100,101,
-102,105,110,101, 32, 84, 70, 95, 72, 73, 68, 69, 32, 54, 52, 32, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 89, 78,
- 65, 77, 73, 67, 32, 49, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 76, 80, 72, 65, 83, 79, 82, 84, 32, 50, 32, 35,100,
-101,102,105,110,101, 32, 84, 70, 95, 84, 69, 88, 32, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 82, 69, 68,
- 86, 69, 82, 84, 32, 56, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 76, 73, 71, 72, 84, 32, 49, 54, 32, 35,100,101,102,105,
-110,101, 32, 84, 70, 95, 83, 72, 65, 82, 69, 68, 67, 79, 76, 32, 54, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 84, 73,
- 76, 69, 83, 32, 49, 50, 56, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65, 82, 68, 32, 50, 53,
- 54, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 84, 87, 79, 83, 73, 68, 69, 32, 53, 49, 50, 32, 35,100,101,102,105,110,101,
- 32, 84, 70, 95, 73, 78, 86, 73, 83, 73, 66, 76, 69, 32, 49, 48, 50, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 79, 66,
- 67, 79, 76, 32, 50, 48, 52, 56, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65, 82, 68, 50, 32, 52,
- 48, 57, 54, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 68, 79, 87, 32, 56, 49, 57, 50, 32, 35,100,101,102,
-105,110,101, 32, 84, 70, 95, 66, 77, 70, 79, 78, 84, 32, 49, 54, 51, 56, 52, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95,
- 83, 79, 76, 73, 68, 32, 48, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 68, 68, 32, 49, 32, 35,100,101,102,105,110,101,
- 32, 84, 70, 95, 65, 76, 80, 72, 65, 32, 50, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 67, 76, 73, 80, 32, 52, 32, 32, 32,
- 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 85, 66, 32, 51, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80,
- 82, 69, 67, 65, 84, 69, 68, 49, 32, 49, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68,
- 50, 32, 50, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 51, 32, 52, 32, 35,100,101,
-102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 52, 32, 56, 32, 35,100,101,102,105,110,101, 32, 84, 70,
- 95, 80, 73, 78, 49, 32, 49, 54, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 50, 32, 51, 50, 32, 35,100,101,102,
-105,110,101, 32, 84, 70, 95, 80, 73, 78, 51, 32, 54, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 52, 32, 49,
- 50, 56, 32, 35,101,110,100,105,102, 32, 32, 99,104, 97,114, 32,117,115,101, 95, 99,111,108, 44, 32,102,108, 97,103, 59, 10, 10,
-  9, 47, 42, 32, 83,112,101, 99,105, 97,108, 32,108,101,118,101,108, 32, 49, 32,100, 97,116, 97, 32,116,104, 97,116, 32, 99, 97,
-110,110,111,116, 32, 98,101, 32,109,111,100,105,102,105,101,100, 32,102,114,111,109, 32,111,116,104,101,114, 32,108,101,118,101,
-108,115, 32, 42, 47, 10,  9, 67,117,115,116,111,109, 68, 97,116, 97, 32,118,100, 97,116, 97, 59, 10,  9, 67,117,115,116,111,109,
- 68, 97,116, 97, 32,102,100, 97,116, 97, 59, 10,  9,115,104,111,114,116, 32, 42,101,100,103,101, 95,102,108, 97,103,115, 59, 10,
-  9, 99,104, 97,114, 32, 42,101,100,103,101, 95, 99,114,101, 97,115,101,115, 59, 10,125, 32, 77,117,108,116,105,114,101,115, 59,
- 10, 10, 47, 42, 42, 32, 69,110,100, 32, 77,117,108,116,105,114,101,115, 32, 42, 42, 47, 10, 10,116,121,112,101,100,101,102, 32,
-115,116,114,117, 99,116, 32, 80, 97,114,116,105, 97,108, 86,105,115,105, 98,105,108,105,116,121, 32,123, 10,  9,117,110,115,105,
-103,110,101,100, 32,105,110,116, 32, 42,118,101,114,116, 95,109, 97,112, 59, 32, 47, 42, 32,118,101,114,116, 95,109, 97,112, 91,
- 79,108,100, 32, 73,110,100,101,120, 93, 61, 32, 78,101,119, 32, 73,110,100,101,120, 32, 42, 47, 10,  9,105,110,116, 32, 42,101,
-100,103,101, 95,109, 97,112, 59, 32, 47, 42, 32,101,100,103,101, 95,109, 97,112, 91, 79,108,100, 32, 73,110,100,101,120, 93, 61,
- 32, 78,101,119, 32, 73,110,100,101,120, 44, 32, 45, 49, 61, 32,104,105,100,100,101,110, 32, 42, 47, 10,  9, 77, 70, 97, 99,101,
- 32, 42,111,108,100, 95,102, 97, 99,101,115, 59, 10,  9, 77, 69,100,103,101, 32, 42,111,108,100, 95,101,100,103,101,115, 59, 10,
-  9,117,110,115,105,103,110,101,100, 32,105,110,116, 32,116,111,116,102, 97, 99,101, 44, 32,116,111,116,101,100,103,101, 44, 32,
-116,111,116,118,101,114,116, 44, 32,112, 97,100, 59, 10,125, 32, 80, 97,114,116,105, 97,108, 86,105,115,105, 98,105,108,105,116,
-121, 59, 10, 10, 47, 42, 32,109,118,101,114,116, 45, 62,102,108, 97,103, 32, 40, 49, 61, 83, 69, 76, 69, 67, 84, 41, 32, 42, 47,
- 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 80, 72, 69, 82, 69, 84, 69, 83, 84,  9, 50, 10, 35,100,101,102,105,110,101,
- 32, 77, 69, 95, 83, 80, 72, 69, 82, 69, 84, 69, 77, 80,  9, 52, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 72, 73, 68, 69,
-  9,  9,  9, 49, 54, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 69, 82, 84, 95, 77, 69, 82, 71, 69, 68,  9,  9, 40, 49,
- 60, 60, 54, 41, 10, 10, 47, 42, 32,109,101,100,103,101, 45, 62,102,108, 97,103, 32, 40, 49, 61, 83, 69, 76, 69, 67, 84, 41, 42,
- 47, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69, 68, 82, 65, 87,  9,  9,  9, 40, 49, 60, 60, 49, 41, 10, 35,
-100,101,102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77,  9,  9,  9,  9, 40, 49, 60, 60, 50, 41, 10, 35,100,101,102,105,110,101,
- 32, 77, 69, 95, 70, 71, 79, 78,  9,  9,  9,  9, 40, 49, 60, 60, 51, 41, 10,  9,  9,  9,  9,  9,  9, 47, 42, 32,114,101,115,101,
-114,118,101, 32, 49, 54, 32,102,111,114, 32, 77, 69, 95, 72, 73, 68, 69, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 77, 69,
- 95, 69, 68, 71, 69, 82, 69, 78, 68, 69, 82,  9,  9, 40, 49, 60, 60, 53, 41, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 76,
- 79, 79, 83, 69, 69, 68, 71, 69,  9,  9, 40, 49, 60, 60, 55, 41, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77,
- 95, 76, 65, 83, 84,  9,  9, 40, 49, 60, 60, 56, 41, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 72, 65, 82, 80,  9,  9,
-  9, 40, 49, 60, 60, 57, 41, 10, 10, 47, 42, 32,112,117,110,111, 32, 61, 32,118,101,114,116,101,120,110,111,114,109, 97,108, 32,
- 40,109,102, 97, 99,101, 41, 32, 42, 47, 10, 47, 42, 32,114,101,110,100,101,114, 32, 97,115,115,117,109,101,115, 32,102,108,105,
-112,115, 32,116,111, 32, 98,101, 32,111,114,100,101,114,101,100, 32,108,105,107,101, 32,116,104,105,115, 32, 42, 47, 10, 35,100,
-101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 49,  9,  9, 49, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76,
- 73, 80, 86, 50,  9,  9, 50, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 51,  9,  9, 52, 10, 35,100,101,
-102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 52,  9,  9, 56, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79,
- 74, 88, 89,  9,  9, 49, 54, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88, 90,  9,  9, 51, 50, 10, 35,100,
-101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 89, 90,  9,  9, 54, 52, 10, 10, 47, 42, 32,101,100, 99,111,100,101, 32, 40,
-109,102, 97, 99,101, 41, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 49, 86, 50,  9,  9,  9, 49, 10, 35,100,
-101,102,105,110,101, 32, 77, 69, 95, 86, 50, 86, 51,  9,  9,  9, 50, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86,
- 49,  9,  9,  9, 52, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86, 52,  9,  9,  9, 52, 10, 35,100,101,102,105,110,
-101, 32, 77, 69, 95, 86, 52, 86, 49,  9,  9,  9, 56, 10, 10, 47, 42, 32,102,108, 97,103, 32, 40,109,102, 97, 99,101, 41, 32, 42,
- 47, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 77, 79, 79, 84, 72,  9,  9,  9, 49, 10, 35,100,101,102,105,110,101, 32,
- 77, 69, 95, 70, 65, 67, 69, 95, 83, 69, 76,  9,  9,  9, 50, 10,  9,  9,  9,  9,  9,  9, 47, 42, 32,102,108, 97,103, 32, 77, 69,
- 95, 72, 73, 68, 69, 61, 61, 49, 54, 32,105,115, 32,117,115,101,100, 32,104,101,114,101, 32,116,111,111, 32, 42, 47, 32, 10, 47,
- 42, 32,109,115,101,108,101, 99,116, 45, 62,116,121,112,101, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 83,
- 69,108,  9, 48, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 83, 69,108, 32, 49, 10, 35,100,101,102,105,110,101, 32, 77,
- 69, 95, 70, 83, 69, 76, 32, 50, 10, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,102,108, 97,103, 32, 42, 47, 10, 35,100,101,
-102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 69, 67, 84,  9, 49, 32, 47, 42, 32,117,115,101, 32, 77, 70, 97, 99,101, 32,104,105,
-100,101, 32,102,108, 97,103, 32, 40, 97,102,116,101,114, 32, 50, 46, 52, 51, 41, 44, 32,115,104,111,117,108,100, 32, 98,101, 32,
- 97, 98,108,101, 32,116,111, 32,114,101,117,115,101, 32, 97,102,116,101,114, 32, 50, 46, 52, 52, 32, 42, 47, 10, 35,100,101,102,
-105,110,101, 32, 84, 70, 95, 65, 67, 84, 73, 86, 69,  9, 50, 32, 47, 42, 32,100,101,112,114,101, 99, 97,116,101,100, 33, 32, 42,
- 47, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 49,  9,  9, 52, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95,
- 83, 69, 76, 50,  9,  9, 56, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 51,  9,  9, 49, 54, 10, 35,100,101,102,
-105,110,101, 32, 84, 70, 95, 83, 69, 76, 52,  9,  9, 51, 50, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 72, 73, 68, 69,  9,
-  9, 54, 52, 32, 47, 42, 32,117,110,117,115,101,100, 44, 32,115, 97,109,101, 32, 97,115, 32, 84, 70, 95, 83, 69, 76, 69, 67, 84,
- 32, 42, 47, 10, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,109,111,100,101, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32,
- 84, 70, 95, 68, 89, 78, 65, 77, 73, 67,  9,  9, 49, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 76, 80, 72, 65, 83, 79,
- 82, 84,  9, 50, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 84, 69, 88,  9,  9,  9, 52, 10, 35,100,101,102,105,110,101, 32,
- 84, 70, 95, 83, 72, 65, 82, 69, 68, 86, 69, 82, 84,  9, 56, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 76, 73, 71, 72, 84,
-  9,  9, 49, 54, 10, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 82, 69, 68, 67, 79, 76,  9, 54, 52, 10, 35,100,
-101,102,105,110,101, 32, 84, 70, 95, 84, 73, 76, 69, 83,  9,  9, 49, 50, 56,  9,  9, 47, 42, 32,100,101,112,114,101, 99, 97,116,
-101,100, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65, 82, 68,  9, 50, 53, 54, 10, 35,
-100,101,102,105,110,101, 32, 84, 70, 95, 84, 87, 79, 83, 73, 68, 69,  9,  9, 53, 49, 50, 10, 35,100,101,102,105,110,101, 32, 84,
- 70, 95, 73, 78, 86, 73, 83, 73, 66, 76, 69,  9, 49, 48, 50, 52, 10, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 79, 66, 67,
- 79, 76,  9,  9, 50, 48, 52, 56, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65, 82, 68, 50,  9, 52,
- 48, 57, 54,  9, 47, 42, 32,119,105,116,104, 32, 90, 32, 97,120,105,115, 32, 99,111,110,115,116,114, 97,105,110,116, 32, 42, 47,
- 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 68, 79, 87,  9,  9, 56, 49, 57, 50, 10, 35,100,101,102,105,110,101,
- 32, 84, 70, 95, 66, 77, 70, 79, 78, 84,  9,  9, 49, 54, 51, 56, 52, 10, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,116,114,
- 97,110,115,112, 44, 32,118, 97,108,117,101,115, 32, 49, 45, 52, 32, 97,114,101, 32,117,115,101,100, 32, 97,115, 32,102,108, 97,
-103,115, 32,105,110, 32,116,104,101, 32, 71, 76, 44, 32, 87, 65, 82, 78, 73, 78, 71, 44, 32, 84, 70, 95, 83, 85, 66, 32, 99, 97,
-110,116, 32,119,111,114,107, 32,119,105,116,104, 32,116,104,105,115, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95,
- 83, 79, 76, 73, 68,  9, 48, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 68, 68,  9,  9, 49, 10, 35,100,101,102,105,110,
-101, 32, 84, 70, 95, 65, 76, 80, 72, 65,  9, 50, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 67, 76, 73, 80,  9,  9, 52, 32,
- 47, 42, 32, 99,108,105,112,109, 97,112, 32, 97,108,112,104, 97, 47, 98,105,110, 97,114,121, 32, 97,108,112,104, 97, 32, 97,108,
-108, 32,111,114, 32,110,111,116,104,105,110,103, 33, 32, 42, 47, 10, 10, 47, 42, 32,115,117, 98, 32,105,115, 32,110,111,116, 32,
- 97,118, 97,105,108, 97, 98,108,101, 32,105,110, 32,116,104,101, 32,117,115,101,114, 32,105,110,116,101,114,102, 97, 99,101, 32,
- 97,110,121,109,111,114,101, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 85, 66,  9,  9, 51, 10, 10, 10, 47,
- 42, 32,109,116,102, 97, 99,101, 45, 62,117,110,119,114, 97,112, 32, 42, 47, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68,
- 69, 80, 82, 69, 67, 65, 84, 69, 68, 49,  9, 49, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84,
- 69, 68, 50,  9, 50, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 51,  9, 52, 10, 35,
-100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 52,  9, 56, 10, 35,100,101,102,105,110,101, 32,
- 84, 70, 95, 80, 73, 78, 49,  9,  9, 32, 32, 32, 32, 49, 54, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 50,  9,
-  9, 32, 32, 32, 32, 51, 50, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 51,  9, 32, 32, 32,  9,  9, 54, 52, 10,
- 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 52,  9, 32, 32, 32, 32,  9, 49, 50, 56, 10, 10, 35,101,110,100,105,102,
- 10,105,110, 79, 67, 75, 33,116, 95,102, 97, 99,101, 59, 32, 32, 32, 32, 32,129, 71,  0, 77,117,108,116,105,114,101,115, 67,111,
-108,  0, 77,117,108,116,105,114,101,115, 67,111,108, 70, 97, 99,101,  0, 77,117,108,116,105,114,101,115, 70, 97, 99,101,  0, 77,
-117,108,116,105,114,101,115, 69,100,103,101,  0, 77,117,108,116,105,114,101,115, 76,101,118,101,108,  0, 77,111,100,105,102,105,
-101,114, 68, 97,116, 97,  0, 83,117, 98,115,117,114,102, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 76, 97,116,116,105,
- 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67,117,114,118,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,
-  0, 66,117,105,108,100, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77, 97,115,107, 77,111,100,105,102,105,101,114, 68,
- 97,116, 97,  0, 65,114,114, 97,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77,105,114,114,111,114, 77,111,100,105,
-102,105,101,114, 68, 97,116, 97,  0, 69,100,103,101, 83,112,108,105,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66,
-101,118,101,108, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66, 77,101,115,104, 77,111,100,105,102,105,101,114, 68, 97,
-116, 97,  0, 68,105,115,112,108, 97, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 85, 86, 80,114,111,106,101, 99,
+108, 97,103,  0,118,101,108, 91, 51, 93,  0,114,111,116, 91, 52, 93,  0, 97,118,101, 91, 51, 93,  0, 42,103,114,111,117,110,100,
+  0,103,114, 97,118,105,116,121, 91, 51, 93,  0,119, 97,110,100,101,114, 91, 51, 93,  0,110,117,109,  0,112, 97,114,101,110,116,
+  0,112, 97, 91, 52, 93,  0,119, 91, 52, 93,  0,102,117,118, 91, 52, 93,  0,102,111,102,102,115,101,116,  0,114, 97,110,100, 91,
+ 51, 93,  0,112,114,101,118, 95,115,116, 97,116,101,  0, 42,104, 97,105,114,  0, 42, 98,111,105,100,  0,100,105,101,116,105,109,
+101,  0,110,117,109, 95,100,109, 99, 97, 99,104,101,  0, 97,108,105,118,101,  0,108,111,111,112,  0,104, 97,105,114, 95,105,110,
+100,101,120,  0, 42, 98,111,105,100,115,  0,100,105,115,116,114,  0,112,104,121,115,116,121,112,101,  0, 97,118,101,109,111,100,
+101,  0,114,101, 97, 99,116,101,118,101,110,116,  0,100,114, 97,119,  0,100,114, 97,119, 95, 97,115,  0,100,114, 97,119, 95,115,
+105,122,101,  0, 99,104,105,108,100,116,121,112,101,  0,114,101,110, 95, 97,115,  0,114,101,110, 95,115,116,101,112,  0,104, 97,
+105,114, 95,115,116,101,112,  0,107,101,121,115, 95,115,116,101,112,  0, 97,100, 97,112,116, 95, 97,110,103,108,101,  0, 97,100,
+ 97,112,116, 95,112,105,120,  0,114,111,116,102,114,111,109,  0,105,110,116,101,103,114, 97,116,111,114,  0, 98, 98, 95, 97,108,
+105,103,110,  0, 98, 98, 95,117,118, 95,115,112,108,105,116,  0, 98, 98, 95, 97,110,105,109,  0, 98, 98, 95,115,112,108,105,116,
+ 95,111,102,102,115,101,116,  0, 98, 98, 95,116,105,108,116,  0, 98, 98, 95,114, 97,110,100, 95,116,105,108,116,  0, 98, 98, 95,
+111,102,102,115,101,116, 91, 50, 93,  0,115,105,109,112,108,105,102,121, 95,102,108, 97,103,  0,115,105,109,112,108,105,102,121,
+ 95,114,101,102,115,105,122,101,  0,115,105,109,112,108,105,102,121, 95,114, 97,116,101,  0,115,105,109,112,108,105,102,121, 95,
+116,114, 97,110,115,105,116,105,111,110,  0,115,105,109,112,108,105,102,121, 95,118,105,101,119,112,111,114,116,  0,116,105,109,
+101,116,119,101, 97,107,  0,106,105,116,102, 97, 99,  0,101,102,102, 95,104, 97,105,114,  0,103,114,105,100, 95,114,101,115,  0,
+112, 97,114,116,102, 97, 99,  0,116, 97,110,102, 97, 99,  0,116, 97,110,112,104, 97,115,101,  0,114,101, 97, 99,116,102, 97, 99,
+  0, 97,118,101,102, 97, 99,  0,112,104, 97,115,101,102, 97, 99,  0,114, 97,110,100,114,111,116,102, 97, 99,  0,114, 97,110,100,
+112,104, 97,115,101,102, 97, 99,  0,114, 97,110,100,115,105,122,101,  0,114,101, 97, 99,116,115,104, 97,112,101,  0, 97, 99, 99,
+ 91, 51, 93,  0,100,114, 97,103,102, 97, 99,  0, 98,114,111,119,110,102, 97, 99,  0,100, 97,109,112,102, 97, 99,  0,114, 97,110,
+100,108,101,110,103,116,104,  0, 99,104,105,108,100, 95,110, 98,114,  0,114,101,110, 95, 99,104,105,108,100, 95,110, 98,114,  0,
+112, 97,114,101,110,116,115,  0, 99,104,105,108,100,115,105,122,101,  0, 99,104,105,108,100,114, 97,110,100,115,105,122,101,  0,
+ 99,104,105,108,100,114, 97,100,  0, 99,104,105,108,100,102,108, 97,116,  0, 99,108,117,109,112,102, 97, 99,  0, 99,108,117,109,
+112,112,111,119,  0,114,111,117,103,104, 49,  0,114,111,117,103,104, 49, 95,115,105,122,101,  0,114,111,117,103,104, 50,  0,114,
+111,117,103,104, 50, 95,115,105,122,101,  0,114,111,117,103,104, 50, 95,116,104,114,101,115,  0,114,111,117,103,104, 95,101,110,
+100,  0,114,111,117,103,104, 95,101,110,100, 95,115,104, 97,112,101,  0, 99,108,101,110,103,116,104,  0, 99,108,101,110,103,116,
+104, 95,116,104,114,101,115,  0, 98,114, 97,110, 99,104, 95,116,104,114,101,115,  0,100,114, 97,119, 95,108,105,110,101, 91, 50,
+ 93,  0,112, 97,116,104, 95,115,116, 97,114,116,  0,112, 97,116,104, 95,101,110,100,  0,116,114, 97,105,108, 95, 99,111,117,110,
+116,  0,107,101,121,101,100, 95,108,111,111,112,115,  0,101,102,102,101, 99,116,111,114, 95,119,101,105,103,104,116, 91, 49, 48,
+ 93,  0, 42,101,102,102, 95,103,114,111,117,112,  0, 42,100,117,112, 95,111, 98,  0, 42, 98, 98, 95,111, 98,  0, 42,112,100, 50,
+  0, 42,112, 97,114,116,  0, 42,112, 97,114,116,105, 99,108,101,115,  0, 42, 42,112, 97,116,104, 99, 97, 99,104,101,  0, 42, 42,
+ 99,104,105,108,100, 99, 97, 99,104,101,  0,112, 97,116,104, 99, 97, 99,104,101, 98,117,102,115,  0, 99,104,105,108,100, 99, 97,
+ 99,104,101, 98,117,102,115,  0, 42, 99,108,109,100,  0, 42,104, 97,105,114, 95,105,110, 95,100,109,  0, 42,104, 97,105,114, 95,
+111,117,116, 95,100,109,  0, 42,116, 97,114,103,101,116, 95,111, 98,  0, 42,108, 97,116,116,105, 99,101,  0,101,102,102,101, 99,
+116,111,114,115,  0,114,101, 97, 99,116,101,118,101,110,116,115,  0,116,114,101,101, 95,102,114, 97,109,101,  0,116,111,116, 99,
+104,105,108,100,  0,116,111,116, 99, 97, 99,104,101,100,  0,116,111,116, 99,104,105,108,100, 99, 97, 99,104,101,  0,116, 97,114,
+103,101,116, 95,112,115,121,115,  0,116,111,116,107,101,121,101,100,  0, 98, 97,107,101,115,112, 97, 99,101,  0, 98, 98, 95,117,
+118,110, 97,109,101, 91, 51, 93, 91, 51, 50, 93,  0,118,103,114,111,117,112, 91, 49, 50, 93,  0,118,103, 95,110,101,103,  0,114,
+116, 51,  0, 42,114,101,110,100,101,114,100, 97,116, 97,  0, 42,116,114,101,101,  0, 67,100,105,115,  0, 67,118,105,  0, 91, 51,
+ 93,  0,115,116,114,117, 99,116,117,114, 97,108,  0, 98,101,110,100,105,110,103,  0,109, 97,120, 95, 98,101,110,100,  0,109, 97,
+120, 95,115,116,114,117, 99,116,  0,109, 97,120, 95,115,104,101, 97,114,  0, 97,118,103, 95,115,112,114,105,110,103, 95,108,101,
+110,  0,116,105,109,101,115, 99, 97,108,101,  0,101,102,102, 95,102,111,114, 99,101, 95,115, 99, 97,108,101,  0,101,102,102, 95,
+119,105,110,100, 95,115, 99, 97,108,101,  0,115,105,109, 95,116,105,109,101, 95,111,108,100,  0,118,101,108,111, 99,105,116,121,
+ 95,115,109,111,111,116,104,  0,115,116,101,112,115, 80,101,114, 70,114, 97,109,101,  0,112,114,101,114,111,108,108,  0,109, 97,
+120,115,112,114,105,110,103,108,101,110,  0,115,111,108,118,101,114, 95,116,121,112,101,  0,118,103,114,111,117,112, 95, 98,101,
+110,100,  0,118,103,114,111,117,112, 95,109, 97,115,115,  0,118,103,114,111,117,112, 95,115,116,114,117, 99,116,  0,112,114,101,
+115,101,116,115,  0, 42, 99,111,108,108,105,115,105,111,110, 95,108,105,115,116,  0,101,112,115,105,108,111,110,  0,115,101,108,
+102, 95,102,114,105, 99,116,105,111,110,  0,115,101,108,102,101,112,115,105,108,111,110,  0,115,101,108,102, 95,108,111,111,112,
+ 95, 99,111,117,110,116,  0,108,111,111,112, 95, 99,111,117,110,116,  0,112,114,101,115,115,117,114,101,  0,116,104,105, 99,107,
+110,101,115,115,  0,115,116,114,111,107,101,115,  0,102,114, 97,109,101,110,117,109,  0, 42, 97, 99,116,102,114, 97,109,101,  0,
+103,115,116,101,112,  0,105,110,102,111, 91, 49, 50, 56, 93,  0,115, 98,117,102,102,101,114, 95,115,105,122,101,  0,115, 98,117,
+102,102,101,114, 95,115,102,108, 97,103,  0, 42,115, 98,117,102,102,101,114,  0, 42,116,121,112,101,115,116,114,  0, 42,109,101,
+115,115, 97,103,101,  0,108,105,115,116,  0,112,114,105,110,116,108,101,118,101,108,  0,115,116,111,114,101,108,101,118,101,108,
+  0, 42,119,105,110,100,114, 97,119, 97, 98,108,101,  0, 42,119,105,110, 97, 99,116,105,118,101,  0,119,105,110,100,111,119,115,
+  0,105,110,105,116,105, 97,108,105,122,101,100,  0,102,105,108,101, 95,115, 97,118,101,100,  0,111,112,101,114, 97,116,111,114,
+115,  0,113,117,101,117,101,  0,114,101,112,111,114,116,115,  0,106,111, 98,115,  0,112, 97,105,110,116, 99,117,114,115,111,114,
+115,  0,107,101,121,109, 97,112,115,  0, 42,103,104,111,115,116,119,105,110,  0, 42,110,101,119,115, 99,114,101,101,110,  0,115,
+ 99,114,101,101,110,110, 97,109,101, 91, 51, 50, 93,  0,112,111,115,120,  0,112,111,115,121,  0,119,105,110,100,111,119,115,116,
+ 97,116,101,  0,109,111,110,105,116,111,114,  0,108, 97,115,116, 99,117,114,115,111,114,  0, 97,100,100,109,111,117,115,101,109,
+111,118,101,  0, 42,101,118,101,110,116,115,116, 97,116,101,  0, 42, 99,117,114,115,119,105,110,  0, 42,116,119,101, 97,107,  0,
+100,114, 97,119,109,101,116,104,111,100,  0,100,114, 97,119,102, 97,105,108,  0, 42,100,114, 97,119,100, 97,116, 97,  0,116,105,
+109,101,114,115,  0,115,117, 98,119,105,110,100,111,119,115,  0,103,101,115,116,117,114,101,  0,105,100,110, 97,109,101, 91, 54,
+ 52, 93,  0, 42,112,116,114,  0,115,104,105,102,116,  0, 99,116,114,108,  0, 97,108,116,  0,111,115,107,101,121,  0,107,101,121,
+109,111,100,105,102,105,101,114,  0,112,114,111,112,118, 97,108,117,101,  0,105,110, 97, 99,116,105,118,101,  0,109, 97,112,116,
+121,112,101,  0,107,101,121,109, 97,112,  0,110, 97,109,101,105,100, 91, 54, 52, 93,  0,115,112, 97, 99,101,105,100,  0,114,101,
+103,105,111,110,105,100,  0,105,115, 95,109,111,100, 97,108,  0, 42,105,116,101,109,115,  0, 42, 99,117,115,116,111,109,100, 97,
+116, 97,  0, 42,114,101,112,111,114,116,115,  0,109, 97, 99,114,111,  0, 42,111,112,109,  0,109,118, 97,108, 91, 50, 93,  0,112,
+114,101,118,120,  0,112,114,101,118,121,  0,117,110,105, 99,111,100,101,  0, 97,115, 99,105,105,  0, 42,107,101,121,109, 97,112,
+ 95,105,100,110, 97,109,101,  0, 99,117,115,116,111,109,  0, 99,117,115,116,111,109,100, 97,116, 97,102,114,101,101,  0, 42,101,
+100, 97,116, 97,  0,105,110,102,108,117,101,110, 99,101,  0, 42, 99,111,101,102,102,105, 99,105,101,110,116,115,  0, 97,114,114,
+ 97,121,115,105,122,101,  0,112,111,108,121, 95,111,114,100,101,114,  0, 97,109,112,108,105,116,117,100,101,  0,112,104, 97,115,
+101, 95,109,117,108,116,105,112,108,105,101,114,  0,112,104, 97,115,101, 95,111,102,102,115,101,116,  0,118, 97,108,117,101, 95,
+111,102,102,115,101,116,  0,109,105,100,118, 97,108,  0, 98,101,102,111,114,101, 95,109,111,100,101,  0, 97,102,116,101,114, 95,
+109,111,100,101,  0, 98,101,102,111,114,101, 95, 99,121, 99,108,101,115,  0, 97,102,116,101,114, 95, 99,121, 99,108,101,115,  0,
+114,101, 99,116,  0,112,104, 97,115,101,  0,109,111,100,105,102,105, 99, 97,116,105,111,110,  0, 42,114,110, 97, 95,112, 97,116,
+104,  0, 97,114,114, 97,121, 95,105,110,100,101,120,  0,101,120,112,114,101,115,115,105,111,110, 91, 50, 53, 54, 93,  0,118,101,
+ 99, 91, 50, 93,  0, 42,102,112,116,  0, 99,111,108,111,114, 95,109,111,100,101,  0, 99,111,108,111,114, 91, 51, 93,  0,102,114,
+111,109, 91, 49, 50, 56, 93,  0,116,111, 91, 49, 50, 56, 93,  0,109, 97,112,112,105,110,103,115,  0,115,116,114,105,112,115,  0,
+ 42,114,101,109, 97,112,  0,102, 99,117,114,118,101,115,  0,115,116,114,105,112, 95,116,105,109,101,  0, 98,108,101,110,100,109,
+111,100,101,  0,101,120,116,101,110,100,109,111,100,101,  0,103,114,111,117,112, 91, 54, 52, 93,  0,105,100,116,121,112,101,  0,
+116,101,109,112,108, 97,116,101,115,  0,103,114,111,117,112,109,111,100,101,  0,112, 97,116,104,115,  0,107,101,121,105,110,103,
+102,108, 97,103,  0, 42,116,109,112, 97, 99,116,  0,110,108, 97, 95,116,114, 97, 99,107,115,  0, 42, 97, 99,116,115,116,114,105,
+112,  0,100,114,105,118,101,114,115,  0,111,118,101,114,114,105,100,101,115,  0, 97, 99,116, 95, 98,108,101,110,100,109,111,100,
+101,  0, 97, 99,116, 95,101,120,116,101,110,100,109,111,100,101,  0, 97, 99,116, 95,105,110,102,108,117,101,110, 99,101,  0,114,
+117,108,101,  0,111,112,116,105,111,110,115,  0,102,101, 97,114, 95,102, 97, 99,116,111,114,  0,115,105,103,110, 97,108, 95,105,
+100,  0,108,111,111,107, 95, 97,104,101, 97,100,  0,111,108,111, 99, 91, 51, 93,  0,113,117,101,117,101, 95,115,105,122,101,  0,
+119, 97,110,100,101,114,  0,102,108,101,101, 95,100,105,115,116, 97,110, 99,101,  0,104,101, 97,108,116,104,  0,115,116, 97,116,
+101, 95,105,100,  0,114,117,108,101,115,  0, 99,111,110,100,105,116,105,111,110,115,  0, 97, 99,116,105,111,110,115,  0,114,117,
+108,101,115,101,116, 95,116,121,112,101,  0,114,117,108,101, 95,102,117,122,122,105,110,101,115,115,  0,108, 97,115,116, 95,115,
+116, 97,116,101, 95,105,100,  0,108, 97,110,100,105,110,103, 95,115,109,111,111,116,104,110,101,115,115,  0, 98, 97,110,107,105,
+110,103,  0, 97,103,103,114,101,115,115,105,111,110,  0, 97, 99, 99,117,114, 97, 99,121,  0, 97,105,114, 95,109,105,110, 95,115,
+112,101,101,100,  0, 97,105,114, 95,109, 97,120, 95,115,112,101,101,100,  0, 97,105,114, 95,109, 97,120, 95, 97, 99, 99,  0, 97,
+105,114, 95,109, 97,120, 95, 97,118,101,  0, 97,105,114, 95,112,101,114,115,111,110, 97,108, 95,115,112, 97, 99,101,  0,108, 97,
+110,100, 95,106,117,109,112, 95,115,112,101,101,100,  0,108, 97,110,100, 95,109, 97,120, 95,115,112,101,101,100,  0,108, 97,110,
+100, 95,109, 97,120, 95, 97, 99, 99,  0,108, 97,110,100, 95,109, 97,120, 95, 97,118,101,  0,108, 97,110,100, 95,112,101,114,115,
+111,110, 97,108, 95,115,112, 97, 99,101,  0,108, 97,110,100, 95,115,116,105, 99,107, 95,102,111,114, 99,101,  0,115,116, 97,116,
+101,115,  0, 42,115,109,100,  0, 42,102,108,117,105,100,  0, 42,102,108,117,105,100, 95,103,114,111,117,112,  0, 42, 99,111,108,
+108, 95,103,114,111,117,112,  0, 42,119,116,  0, 42,116,101,120, 95,119,116,  0, 42,116,101,120, 95,115,104, 97,100,111,119,  0,
+ 42,115,104, 97,100,111,119,  0,112, 48, 91, 51, 93,  0,112, 49, 91, 51, 93,  0,100,120,  0,111,109,101,103, 97,  0,116,101,109,
+112, 65,109, 98,  0, 98,101,116, 97,  0,114,101,115, 91, 51, 93,  0, 97,109,112,108,105,102,121,  0,109, 97,120,114,101,115,  0,
+118,105,101,119,115,101,116,116,105,110,103,115,  0,110,111,105,115,101,  0,100,105,115,115, 95,112,101,114, 99,101,110,116,  0,
+100,105,115,115, 95,115,112,101,101,100,  0,114,101,115, 95,119,116, 91, 51, 93,  0,100,120, 95,119,116,  0,118, 51,100,110,117,
+109,  0, 42,112,111,105,110,116, 95, 99, 97, 99,104,101, 91, 50, 93,  0,112,116, 99, 97, 99,104,101,115, 91, 50, 93,  0,118,101,
+108,111, 99,105,116,121, 91, 51, 93,  0,118,103,114,112, 95,104,101, 97,116, 95,115, 99, 97,108,101, 91, 50, 93,  0,118,103,114,
+111,117,112, 95,102,108,111,119,  0,118,103,114,111,117,112, 95,100,101,110,115,105,116,121,  0,118,103,114,111,117,112, 95,104,
+101, 97,116,  0, 42,112,111,105,110,116,115, 95,111,108,100,  0, 42,118,101,108,  0,109, 97,116, 95,111,108,100, 91, 52, 93, 91,
+ 52, 93,  0,110,117,109,112,111,105,110,116,115,  0,  0,  0,  0, 84, 89, 80, 69,182,  1,  0,  0, 99,104, 97,114,  0,117, 99,104,
+ 97,114,  0,115,104,111,114,116,  0,117,115,104,111,114,116,  0,105,110,116,  0,108,111,110,103,  0,117,108,111,110,103,  0,102,
+108,111, 97,116,  0,100,111,117, 98,108,101,  0,118,111,105,100,  0, 76,105,110,107,  0, 76,105,110,107, 68, 97,116, 97,  0, 76,
+105,115,116, 66, 97,115,101,  0,118,101, 99, 50,115,  0,118,101, 99, 50,105,  0,118,101, 99, 50,102,  0,118,101, 99, 50,100,  0,
+118,101, 99, 51,105,  0,118,101, 99, 51,102,  0,118,101, 99, 51,100,  0,118,101, 99, 52,105,  0,118,101, 99, 52,102,  0,118,101,
+ 99, 52,100,  0,114, 99,116,105,  0,114, 99,116,102,  0, 73, 68, 80,114,111,112,101,114,116,121, 68, 97,116, 97,  0, 73, 68, 80,
+114,111,112,101,114,116,121,  0, 73, 68,  0, 76,105, 98,114, 97,114,121,  0, 70,105,108,101, 68, 97,116, 97,  0, 80,114,101,118,
+105,101,119, 73,109, 97,103,101,  0, 73,112,111, 68,114,105,118,101,114,  0, 79, 98,106,101, 99,116,  0, 73,112,111, 67,117,114,
+118,101,  0, 66, 80,111,105,110,116,  0, 66,101,122, 84,114,105,112,108,101,  0, 73,112,111,  0, 75,101,121, 66,108,111, 99,107,
+  0, 75,101,121,  0, 65,110,105,109, 68, 97,116, 97,  0, 84,101,120,116, 76,105,110,101,  0, 84,101,120,116, 77, 97,114,107,101,
+114,  0, 84,101,120,116,  0, 80, 97, 99,107,101,100, 70,105,108,101,  0, 67, 97,109,101,114, 97,  0, 73,109, 97,103,101, 85,115,
+101,114,  0, 83, 99,101,110,101,  0, 73,109, 97,103,101,  0, 71, 80, 85, 84,101,120,116,117,114,101,  0, 97,110,105,109,  0, 82,
+101,110,100,101,114, 82,101,115,117,108,116,  0, 77, 84,101,120,  0, 84,101,120,  0, 80,108,117,103,105,110, 84,101,120,  0, 67,
+ 66, 68, 97,116, 97,  0, 67,111,108,111,114, 66, 97,110,100,  0, 69,110,118, 77, 97,112,  0, 73,109, 66,117,102,  0, 80,111,105,
+110,116, 68,101,110,115,105,116,121,  0, 80, 97,114,116,105, 99,108,101, 83,121,115,116,101,109,  0, 86,111,120,101,108, 68, 97,
+116, 97,  0, 98, 78,111,100,101, 84,114,101,101,  0, 84,101,120, 77, 97,112,112,105,110,103,  0, 76, 97,109,112,  0, 67,117,114,
+118,101, 77, 97,112,112,105,110,103,  0, 87, 97,118,101,  0, 86,111,108,117,109,101, 83,101,116,116,105,110,103,115,  0, 77, 97,
+116,101,114,105, 97,108,  0, 71,114,111,117,112,  0, 86, 70,111,110,116,  0, 86, 70,111,110,116, 68, 97,116, 97,  0, 77,101,116,
+ 97, 69,108,101,109,  0, 66,111,117,110,100, 66,111,120,  0, 77,101,116, 97, 66, 97,108,108,  0, 78,117,114, 98,  0, 67,104, 97,
+114, 73,110,102,111,  0, 84,101,120,116, 66,111,120,  0, 67,117,114,118,101,  0, 80, 97,116,104,  0, 83,101,108, 66,111,120,  0,
+ 69,100,105,116, 70,111,110,116,  0, 77,101,115,104,  0, 77, 70, 97, 99,101,  0, 77, 84, 70, 97, 99,101,  0, 84, 70, 97, 99,101,
+  0, 77, 86,101,114,116,  0, 77, 69,100,103,101,  0, 77, 68,101,102,111,114,109, 86,101,114,116,  0, 77, 67,111,108,  0, 77, 83,
+116,105, 99,107,121,  0, 77, 83,101,108,101, 99,116,  0, 69,100,105,116, 77,101,115,104,  0, 67,117,115,116,111,109, 68, 97,116,
+ 97,  0, 77,117,108,116,105,114,101,115,  0, 80, 97,114,116,105, 97,108, 86,105,115,105, 98,105,108,105,116,121,  0, 77, 68,101,
+102,111,114,109, 87,101,105,103,104,116,  0, 77, 84,101,120, 80,111,108,121,  0, 77, 76,111,111,112, 85, 86,  0, 77, 76,111,111,
+112, 67,111,108,  0, 77, 70,108,111, 97,116, 80,114,111,112,101,114,116,121,  0, 77, 73,110,116, 80,114,111,112,101,114,116,121,
+  0, 77, 83,116,114,105,110,103, 80,114,111,112,101,114,116,121,  0, 79,114,105,103, 83,112, 97, 99,101, 70, 97, 99,101,  0, 77,
+ 68,105,115,112,115,  0, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69, 68, 82, 65, 87, 32, 40, 49, 60, 60, 49,
+ 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77, 32, 40, 49, 60, 60, 50, 41, 32, 35,100,101,102,105,110,101,
+ 32, 77, 69, 95, 70, 71, 79, 78, 32, 40, 49, 60, 60, 51, 41, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69,
+ 82, 69, 78, 68, 69, 82, 32, 40, 49, 60, 60, 53, 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 76, 79, 79, 83, 69, 69, 68,
+ 71, 69, 32, 40, 49, 60, 60, 55, 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77, 95, 76, 65, 83, 84, 32, 40,
+ 49, 60, 60, 56, 41, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 72, 65, 82, 80, 32, 40, 49, 60, 60, 57, 41, 32, 32, 32,
+ 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 49, 32, 49, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70,
+ 76, 73, 80, 86, 50, 32, 50, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 51, 32, 52, 32, 35,100,101,102,
+105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 52, 32, 56, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88,
+ 89, 32, 49, 54, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88, 90, 32, 51, 50, 32, 35,100,101,102,105,110,
+101, 32, 77, 69, 95, 80, 82, 79, 74, 89, 90, 32, 54, 52, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 49, 86, 50, 32,
+ 49, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 50, 86, 51, 32, 50, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86,
+ 51, 86, 49, 32, 52, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86, 52, 32, 52, 32, 35,100,101,102,105,110,101, 32,
+ 77, 69, 95, 86, 52, 86, 49, 32, 56, 32, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 77, 79, 79, 84, 72, 32, 49, 32, 35,
+100,101,102,105,110,101, 32, 77, 69, 95, 70, 65, 67, 69, 95, 83, 69, 76, 32, 50, 32, 32, 32, 35,100,101,102,105,110,101, 32, 77,
+ 69, 95, 86, 83, 69,108, 32, 48, 32, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 83, 69,108, 32, 49, 32, 35,100,101,102,105,
+110,101, 32, 77, 69, 95, 70, 83, 69, 76, 32, 50, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 69, 67, 84, 32,
+ 49, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 67, 84, 73, 86, 69, 32, 50, 32, 32, 35,100,101,102,105,110,101, 32,
+ 84, 70, 95, 83, 69, 76, 49, 32, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 50, 32, 56, 32, 35,100,101,102,
+105,110,101, 32, 84, 70, 95, 83, 69, 76, 51, 32, 49, 54, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 52, 32, 51,
+ 50, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 72, 73, 68, 69, 32, 54, 52, 32, 32, 32, 35,100,101,102,105,110,101, 32, 84,
+ 70, 95, 68, 89, 78, 65, 77, 73, 67, 32, 49, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 76, 80, 72, 65, 83, 79, 82, 84,
+ 32, 50, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 84, 69, 88, 32, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83,
+ 72, 65, 82, 69, 68, 86, 69, 82, 84, 32, 56, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 76, 73, 71, 72, 84, 32, 49, 54, 32,
+ 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 82, 69, 68, 67, 79, 76, 32, 54, 52, 32, 35,100,101,102,105,110,101, 32,
+ 84, 70, 95, 84, 73, 76, 69, 83, 32, 49, 50, 56, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65,
+ 82, 68, 32, 50, 53, 54, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 84, 87, 79, 83, 73, 68, 69, 32, 53, 49, 50, 32, 35,100,
+101,102,105,110,101, 32, 84, 70, 95, 73, 78, 86, 73, 83, 73, 66, 76, 69, 32, 49, 48, 50, 52, 32, 35,100,101,102,105,110,101, 32,
+ 84, 70, 95, 79, 66, 67, 79, 76, 32, 50, 48, 52, 56, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65,
+ 82, 68, 50, 32, 52, 48, 57, 54, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 68, 79, 87, 32, 56, 49, 57, 50,
+ 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 77, 70, 79, 78, 84, 32, 49, 54, 51, 56, 52, 32, 32, 35,100,101,102,105,110,
+101, 32, 84, 70, 95, 83, 79, 76, 73, 68, 32, 48, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 68, 68, 32, 49, 32, 35,100,
+101,102,105,110,101, 32, 84, 70, 95, 65, 76, 80, 72, 65, 32, 50, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 67, 76, 73, 80,
+ 32, 52, 32, 32, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 85, 66, 32, 51, 32, 32, 35,100,101,102,105,110,101, 32, 84,
+ 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 49, 32, 49, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69,
+ 67, 65, 84, 69, 68, 50, 32, 50, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 51, 32,
+ 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 52, 32, 56, 32, 35,100,101,102,105,
+110,101, 32, 84, 70, 95, 80, 73, 78, 49, 32, 49, 54, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 50, 32, 51, 50,
+ 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 51, 32, 54, 52, 32, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80,
+ 73, 78, 52, 32, 49, 50, 56, 32, 35,101,110,100,105,102, 77,117,108,116,105,114,101,115, 76,101,118,101,108, 59, 13, 10, 13, 10,
+116,121,112,101,100,101,102, 32,115,116,114,117, 99,116, 32, 77,117,108,116,105,114,101,115, 32,123, 13, 10,  9, 76,105,115,116,
+ 66, 97,115,101, 32,108,101,118,101,108,115, 59, 13, 10,  9, 77, 86,101,114,116, 32, 42,118,101,114,116,115, 59, 13, 10, 13, 10,
+  9,117,110,115,105,103,110,101,100, 32, 99,104, 97,114, 32,108,101,118,101,108, 95, 99,111,117,110,116, 44, 32, 99,117,114,114,
+101,110,116, 44, 32,110,101,119,108,118,108, 44, 32,101,100,103,101,108,118,108, 44, 32,112,105,110,108,118,108, 44, 32,114,101,
+110,100,101,114,108,118,108, 59, 13, 10,  9,117,110,115,105,103,110,101,100, 32, 99,104, 97,114, 32,117,115,101, 95, 99,111,108,
+ 44, 32,102,108, 97,103, 59, 13, 10, 13, 10,  9, 47, 42, 32, 83,112,101, 99,105, 97,108, 32,108,101,118,101,108, 32, 49, 32,100,
+ 97,116, 97, 32,116,104, 97,116, 32, 99, 97,110,110,111,116, 32, 98,101, 32,109,111,100,105,102,105,101,100, 32,102,114,111,109,
+ 32,111,116,104,101,114, 32,108,101,118,101,108,115, 32, 42, 47, 13, 10,  9, 67,117,115,116,111,109, 68, 97,116, 97, 32,118,100,
+ 97,116, 97, 59, 13, 10,  9, 67,117,115,116,111,109, 68, 97,116, 97, 32,102,100, 97,116, 97, 59, 13, 10,  9,115,104,111,114,116,
+ 32, 42,101,100,103,101, 95,102,108, 97,103,115, 59, 13, 10,  9, 99,104, 97,114, 32, 42,101,100,103,101, 95, 99,114,101, 97,115,
+101,115, 59, 13, 10,125, 32, 77,117,108,116,105,114,101,115, 59, 13, 10, 13, 10, 47, 42, 42, 32, 69,110,100, 32, 77,117,108,116,
+105,114,101,115, 32, 42, 42, 47, 13, 10, 13, 10,116,121,112,101,100,101,102, 32,115,116,114,117, 99,116, 32, 80, 97,114,116,105,
+ 97,108, 86,105,115,105, 98,105,108,105,116,121, 32,123, 13, 10,  9,117,110,115,105,103,110,101,100, 32,105,110,116, 32, 42,118,
+101,114,116, 95,109, 97,112, 59, 32, 47, 42, 32,118,101,114,116, 95,109, 97,112, 91, 79,108,100, 32, 73,110,100,101,120, 93, 61,
+ 32, 78,101,119, 32, 73,110,100,101,120, 32, 42, 47, 13, 10,  9,105,110,116, 32, 42,101,100,103,101, 95,109, 97,112, 59, 32, 47,
+ 42, 32,101,100,103,101, 95,109, 97,112, 91, 79,108,100, 32, 73,110,100,101,120, 93, 61, 32, 78,101,119, 32, 73,110,100,101,120,
+ 44, 32, 45, 49, 61, 32,104,105,100,100,101,110, 32, 42, 47, 13, 10,  9, 77, 70, 97, 99,101, 32, 42,111,108,100, 95,102, 97, 99,
+101,115, 59, 13, 10,  9, 77, 69,100,103,101, 32, 42,111,108,100, 95,101,100,103,101,115, 59, 13, 10,  9,117,110,115,105,103,110,
+101,100, 32,105,110,116, 32,116,111,116,102, 97, 99,101, 44, 32,116,111,116,101,100,103,101, 44, 32,116,111,116,118,101,114,116,
+ 44, 32,112, 97,100, 59, 13, 10,125, 32, 80, 97,114,116,105, 97,108, 86,105,115,105, 98,105,108,105,116,121, 59, 13, 10, 13, 10,
+ 47, 42, 32,109,118,101,114,116, 45, 62,102,108, 97,103, 32, 40, 49, 61, 83, 69, 76, 69, 67, 84, 41, 32, 42, 47, 13, 10, 35,100,
+101,102,105,110,101, 32, 77, 69, 95, 83, 80, 72, 69, 82, 69, 84, 69, 83, 84,  9, 50, 13, 10, 35,100,101,102,105,110,101, 32, 77,
+ 69, 95, 83, 80, 72, 69, 82, 69, 84, 69, 77, 80,  9, 52, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 72, 73, 68, 69,  9,
+  9,  9, 49, 54, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 69, 82, 84, 95, 77, 69, 82, 71, 69, 68,  9,  9, 40, 49,
+ 60, 60, 54, 41, 13, 10, 13, 10, 47, 42, 32,109,101,100,103,101, 45, 62,102,108, 97,103, 32, 40, 49, 61, 83, 69, 76, 69, 67, 84,
+ 41, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69, 68, 82, 65, 87,  9,  9,  9, 40, 49, 60, 60, 49,
+ 41, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 69, 65, 77,  9,  9,  9,  9, 40, 49, 60, 60, 50, 41, 13, 10, 35,100,
+101,102,105,110,101, 32, 77, 69, 95, 70, 71, 79, 78,  9,  9,  9,  9, 40, 49, 60, 60, 51, 41, 13, 10,  9,  9,  9,  9,  9,  9, 47,
+ 42, 32,114,101,115,101,114,118,101, 32, 49, 54, 32,102,111,114, 32, 77, 69, 95, 72, 73, 68, 69, 32, 42, 47, 13, 10, 35,100,101,
+102,105,110,101, 32, 77, 69, 95, 69, 68, 71, 69, 82, 69, 78, 68, 69, 82,  9,  9, 40, 49, 60, 60, 53, 41, 13, 10, 35,100,101,102,
+105,110,101, 32, 77, 69, 95, 76, 79, 79, 83, 69, 69, 68, 71, 69,  9,  9, 40, 49, 60, 60, 55, 41, 13, 10, 35,100,101,102,105,110,
+101, 32, 77, 69, 95, 83, 69, 65, 77, 95, 76, 65, 83, 84,  9,  9, 40, 49, 60, 60, 56, 41, 13, 10, 35,100,101,102,105,110,101, 32,
+ 77, 69, 95, 83, 72, 65, 82, 80,  9,  9,  9, 40, 49, 60, 60, 57, 41, 13, 10, 13, 10, 47, 42, 32,112,117,110,111, 32, 61, 32,118,
+101,114,116,101,120,110,111,114,109, 97,108, 32, 40,109,102, 97, 99,101, 41, 32, 42, 47, 13, 10, 47, 42, 32,114,101,110,100,101,
+114, 32, 97,115,115,117,109,101,115, 32,102,108,105,112,115, 32,116,111, 32, 98,101, 32,111,114,100,101,114,101,100, 32,108,105,
+107,101, 32,116,104,105,115, 32, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 49,  9,  9, 49,
+ 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 50,  9,  9, 50, 13, 10, 35,100,101,102,105,110,101, 32,
+ 77, 69, 95, 70, 76, 73, 80, 86, 51,  9,  9, 52, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 70, 76, 73, 80, 86, 52,  9,
+  9, 56, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88, 89,  9,  9, 49, 54, 13, 10, 35,100,101,102,105,
+110,101, 32, 77, 69, 95, 80, 82, 79, 74, 88, 90,  9,  9, 51, 50, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 80, 82, 79,
+ 74, 89, 90,  9,  9, 54, 52, 13, 10, 13, 10, 47, 42, 32,101,100, 99,111,100,101, 32, 40,109,102, 97, 99,101, 41, 32, 42, 47, 13,
+ 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 49, 86, 50,  9,  9,  9, 49, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69,
+ 95, 86, 50, 86, 51,  9,  9,  9, 50, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86, 49,  9,  9,  9, 52, 13, 10,
+ 35,100,101,102,105,110,101, 32, 77, 69, 95, 86, 51, 86, 52,  9,  9,  9, 52, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95,
+ 86, 52, 86, 49,  9,  9,  9, 56, 13, 10, 13, 10, 47, 42, 32,102,108, 97,103, 32, 40,109,102, 97, 99,101, 41, 32, 42, 47, 13, 10,
+ 35,100,101,102,105,110,101, 32, 77, 69, 95, 83, 77, 79, 79, 84, 72,  9,  9,  9, 49, 13, 10, 35,100,101,102,105,110,101, 32, 77,
+ 69, 95, 70, 65, 67, 69, 95, 83, 69, 76,  9,  9,  9, 50, 13, 10,  9,  9,  9,  9,  9,  9, 47, 42, 32,102,108, 97,103, 32, 77, 69,
+ 95, 72, 73, 68, 69, 61, 61, 49, 54, 32,105,115, 32,117,115,101,100, 32,104,101,114,101, 32,116,111,111, 32, 42, 47, 32, 13, 10,
+ 47, 42, 32,109,115,101,108,101, 99,116, 45, 62,116,121,112,101, 32, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95,
+ 86, 83, 69,108,  9, 48, 13, 10, 35,100,101,102,105,110,101, 32, 77, 69, 95, 69, 83, 69,108, 32, 49, 13, 10, 35,100,101,102,105,
+110,101, 32, 77, 69, 95, 70, 83, 69, 76, 32, 50, 13, 10, 13, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,102,108, 97,103, 32,
+ 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 69, 67, 84,  9, 49, 32, 47, 42, 32,117,115,101, 32, 77,
+ 70, 97, 99,101, 32,104,105,100,101, 32,102,108, 97,103, 32, 40, 97,102,116,101,114, 32, 50, 46, 52, 51, 41, 44, 32,115,104,111,
+117,108,100, 32, 98,101, 32, 97, 98,108,101, 32,116,111, 32,114,101,117,115,101, 32, 97,102,116,101,114, 32, 50, 46, 52, 52, 32,
+ 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 67, 84, 73, 86, 69,  9, 50, 32, 47, 42, 32,100,101,112,114,101,
+ 99, 97,116,101,100, 33, 32, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 49,  9,  9, 52, 13, 10, 35,
+100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 50,  9,  9, 56, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69,
+ 76, 51,  9,  9, 49, 54, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 69, 76, 52,  9,  9, 51, 50, 13, 10, 35,100,101,
+102,105,110,101, 32, 84, 70, 95, 72, 73, 68, 69,  9,  9, 54, 52, 32, 47, 42, 32,117,110,117,115,101,100, 44, 32,115, 97,109,101,
+ 32, 97,115, 32, 84, 70, 95, 83, 69, 76, 69, 67, 84, 32, 42, 47, 13, 10, 13, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,109,
+111,100,101, 32, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 89, 78, 65, 77, 73, 67,  9,  9, 49, 13, 10, 35,
+100,101,102,105,110,101, 32, 84, 70, 95, 65, 76, 80, 72, 65, 83, 79, 82, 84,  9, 50, 13, 10, 35,100,101,102,105,110,101, 32, 84,
+ 70, 95, 84, 69, 88,  9,  9,  9, 52, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 82, 69, 68, 86, 69, 82, 84,
+  9, 56, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 76, 73, 71, 72, 84,  9,  9, 49, 54, 13, 10, 13, 10, 35,100,101,102,
+105,110,101, 32, 84, 70, 95, 83, 72, 65, 82, 69, 68, 67, 79, 76,  9, 54, 52, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95,
+ 84, 73, 76, 69, 83,  9,  9, 49, 50, 56,  9,  9, 47, 42, 32,100,101,112,114,101, 99, 97,116,101,100, 32, 42, 47, 13, 10, 35,100,
+101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65, 82, 68,  9, 50, 53, 54, 13, 10, 35,100,101,102,105,110,101, 32,
+ 84, 70, 95, 84, 87, 79, 83, 73, 68, 69,  9,  9, 53, 49, 50, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 73, 78, 86, 73,
+ 83, 73, 66, 76, 69,  9, 49, 48, 50, 52, 13, 10, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 79, 66, 67, 79, 76,  9,  9,
+ 50, 48, 52, 56, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 66, 73, 76, 76, 66, 79, 65, 82, 68, 50,  9, 52, 48, 57, 54,
+  9, 47, 42, 32,119,105,116,104, 32, 90, 32, 97,120,105,115, 32, 99,111,110,115,116,114, 97,105,110,116, 32, 42, 47, 13, 10, 35,
+100,101,102,105,110,101, 32, 84, 70, 95, 83, 72, 65, 68, 79, 87,  9,  9, 56, 49, 57, 50, 13, 10, 35,100,101,102,105,110,101, 32,
+ 84, 70, 95, 66, 77, 70, 79, 78, 84,  9,  9, 49, 54, 51, 56, 52, 13, 10, 13, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,116,
+114, 97,110,115,112, 44, 32,118, 97,108,117,101,115, 32, 49, 45, 52, 32, 97,114,101, 32,117,115,101,100, 32, 97,115, 32,102,108,
+ 97,103,115, 32,105,110, 32,116,104,101, 32, 71, 76, 44, 32, 87, 65, 82, 78, 73, 78, 71, 44, 32, 84, 70, 95, 83, 85, 66, 32, 99,
+ 97,110,116, 32,119,111,114,107, 32,119,105,116,104, 32,116,104,105,115, 32, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 84,
+ 70, 95, 83, 79, 76, 73, 68,  9, 48, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 65, 68, 68,  9,  9, 49, 13, 10, 35,100,
+101,102,105,110,101, 32, 84, 70, 95, 65, 76, 80, 72, 65,  9, 50, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 67, 76, 73,
+ 80,  9,  9, 52, 32, 47, 42, 32, 99,108,105,112,109, 97,112, 32, 97,108,112,104, 97, 47, 98,105,110, 97,114,121, 32, 97,108,112,
+104, 97, 32, 97,108,108, 32,111,114, 32,110,111,116,104,105,110,103, 33, 32, 42, 47, 13, 10, 13, 10, 47, 42, 32,115,117, 98, 32,
+105,115, 32,110,111,116, 32, 97,118, 97,105,108, 97, 98,108,101, 32,105,110, 32,116,104,101, 32,117,115,101,114, 32,105,110,116,
+101,114,102, 97, 99,101, 32, 97,110,121,109,111,114,101, 32, 42, 47, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 83, 85,
+ 66,  9,  9, 51, 13, 10, 13, 10, 13, 10, 47, 42, 32,109,116,102, 97, 99,101, 45, 62,117,110,119,114, 97,112, 32, 42, 47, 13, 10,
+ 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 49,  9, 49, 13, 10, 35,100,101,102,105,110,
+101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65, 84, 69, 68, 50,  9, 50, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68,
+ 69, 80, 82, 69, 67, 65, 84, 69, 68, 51,  9, 52, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 68, 69, 80, 82, 69, 67, 65,
+ 84, 69, 68, 52,  9, 56, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 49,  9,  9, 32, 32, 32, 32, 49, 54, 13,
+ 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73, 78, 50,  9,  9, 32, 32, 32, 32, 51, 50, 13, 10, 35,100,101,102,105,110,
+101, 32, 84, 70, 95, 80, 73, 78, 51,  9, 32, 32, 32,  9,  9, 54, 52, 13, 10, 35,100,101,102,105,110,101, 32, 84, 70, 95, 80, 73,
+ 78, 52,  9, 32, 32, 32, 32,  9, 49, 50, 56, 13, 10, 13, 10, 35,101,110,100,105,102, 13, 10,104, 79, 67, 75, 33,109, 98,101,114,
+ 97,  2, 67,  3,191, 16,  8,  1,232, 80,100,  0, 77,117,108,116,105,114,101,115, 67,111,108,  0, 77,117,108,116,105,114,101,115,
+ 67,111,108, 70, 97, 99,101,  0, 77,117,108,116,105,114,101,115, 70, 97, 99,101,  0, 77,117,108,116,105,114,101,115, 69,100,103,
+101,  0, 77,117,108,116,105,114,101,115, 76,101,118,101,108,  0, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,117, 98,
+115,117,114,102, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 76, 97,116,116,105, 99,101, 77,111,100,105,102,105,101,114,
+ 68, 97,116, 97,  0, 67,117,114,118,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66,117,105,108,100, 77,111,100,105,
+102,105,101,114, 68, 97,116, 97,  0, 77, 97,115,107, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 65,114,114, 97,121, 77,
+111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77,105,114,114,111,114, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 69,
+100,103,101, 83,112,108,105,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66,101,118,101,108, 77,111,100,105,102,105,
+101,114, 68, 97,116, 97,  0, 66, 77,101,115,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,109,111,107,101, 77,111,
+100,105,102,105,101,114, 68, 97,116, 97,  0, 83,109,111,107,101, 68,111,109, 97,105,110, 83,101,116,116,105,110,103,115,  0, 83,
+109,111,107,101, 70,108,111,119, 83,101,116,116,105,110,103,115,  0, 83,109,111,107,101, 67,111,108,108, 83,101,116,116,105,110,
+103,115,  0, 68,105,115,112,108, 97, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 85, 86, 80,114,111,106,101, 99,
 116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 68,101, 99,105,109, 97,116,101, 77,111,100,105,102,105,101,114, 68, 97,
 116, 97,  0, 83,109,111,111,116,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67, 97,115,116, 77,111,100,105,102,105,
 101,114, 68, 97,116, 97,  0, 87, 97,118,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 65,114,109, 97,116,117,114,101,
@@ -2206,749 +2366,778 @@ char datatoc_B_blend[]= {
 111,109, 77,101,115,104,  0, 66,111,111,108,101, 97,110, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77, 68,101,102, 73,
 110,102,108,117,101,110, 99,101,  0, 77, 68,101,102, 67,101,108,108,  0, 77,101,115,104, 68,101,102,111,114,109, 77,111,100,105,
 102,105,101,114, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 83,121,115,116,101,109, 77,111,100,105,102,105,101,114, 68,
- 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 83,121,115,116,101,109,  0, 80, 97,114,116,105, 99,108,101, 73,110,115,116, 97,
-110, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 69,120,112,108,111,100,101, 77,111,100,105,102,105,101,114, 68,
- 97,116, 97,  0, 77,117,108,116,105,114,101,115, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 70,108,117,105,100,115,105,
-109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 70,108,117,105,100,115,105,109, 83,101,116,116,105,110,103,115,  0, 83,
-104,114,105,110,107,119,114, 97,112, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,105,109,112,108,101, 68,101,102,111,
-114,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 76, 97,116,116,105, 99,101,  0, 98, 68,101,102,111,114,109, 71,114,
-111,117,112,  0, 98, 65, 99,116,105,111,110,  0, 98, 80,111,115,101,  0, 66,117,108,108,101,116, 83,111,102,116, 66,111,100,121,
-  0, 80, 97,114,116, 68,101,102,108,101, 99,116,  0, 83,111,102,116, 66,111,100,121,  0, 79, 98, 72,111,111,107,  0, 82, 78, 71,
-  0, 80, 84, 67, 97, 99,104,101, 77,101,109,  0, 83, 66, 86,101,114,116,101,120,  0, 66,111,100,121, 80,111,105,110,116,  0, 66,
-111,100,121, 83,112,114,105,110,103,  0, 83, 66, 83, 99,114, 97,116, 99,104,  0, 87,111,114,108,100,  0, 66, 97,115,101,  0, 65,
-118,105, 67,111,100,101, 99, 68, 97,116, 97,  0, 81,117,105, 99,107,116,105,109,101, 67,111,100,101, 99, 68, 97,116, 97,  0, 70,
- 70, 77,112,101,103, 67,111,100,101, 99, 68, 97,116, 97,  0, 65,117,100,105,111, 68, 97,116, 97,  0, 83, 99,101,110,101, 82,101,
-110,100,101,114, 76, 97,121,101,114,  0, 82,101,110,100,101,114, 68, 97,116, 97,  0, 82,101,110,100,101,114, 80,114,111,102,105,
-108,101,  0, 71, 97,109,101, 68,111,109,101,  0, 71, 97,109,101, 70,114, 97,109,105,110,103,  0, 71, 97,109,101, 68, 97,116, 97,
-  0, 84,105,109,101, 77, 97,114,107,101,114,  0, 73,109, 97,103,101, 80, 97,105,110,116, 83,101,116,116,105,110,103,115,  0, 66,
-114,117,115,104,  0, 80, 97,114,116,105, 99,108,101, 66,114,117,115,104, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 69,
-100,105,116, 83,101,116,116,105,110,103,115,  0, 84,114, 97,110,115,102,111,114,109, 79,114,105,101,110,116, 97,116,105,111,110,
-  0, 83, 99,117,108,112,116,  0, 83, 99,117,108,112,116, 83,101,115,115,105,111,110,  0, 86, 80, 97,105,110,116,  0, 84,111,111,
-108, 83,101,116,116,105,110,103,115,  0, 98, 83,116, 97,116,115,  0, 69,100,105,116,105,110,103,  0, 83, 99,101,110,101, 83,116,
- 97,116,115,  0, 68, 97,103, 70,111,114,101,115,116,  0, 66, 71,112,105, 99,  0, 82,101,103,105,111,110, 86,105,101,119, 51, 68,
-  0, 98, 71, 80,100, 97,116, 97,  0, 82,101,110,100,101,114, 73,110,102,111,  0, 82,101,116,111,112,111, 86,105,101,119, 68, 97,
-116, 97,  0, 86,105,101,119, 68,101,112,116,104,115,  0, 83,109,111,111,116,104, 86,105,101,119, 83,116,111,114,101,  0,119,109,
- 84,105,109,101,114,  0, 86,105,101,119, 51, 68,  0, 83,112, 97, 99,101, 76,105,110,107,  0, 86,105,101,119, 50, 68,  0, 83,112,
- 97, 99,101, 73,110,102,111,  0, 98, 83, 99,114,101,101,110,  0, 83,112, 97, 99,101, 73,112,111,  0, 98, 68,111,112,101, 83,104,
-101,101,116,  0, 83,112, 97, 99,101, 66,117,116,115,  0, 83,112, 97, 99,101, 83,101,113,  0, 70,105,108,101, 83,101,108,101, 99,
-116, 80, 97,114, 97,109,115,  0, 83,112, 97, 99,101, 70,105,108,101,  0, 70,105,108,101, 76,105,115,116,  0,119,109, 79,112,101,
-114, 97,116,111,114,  0, 70,105,108,101, 76, 97,121,111,117,116,  0, 83,112, 97, 99,101, 79,111,112,115,  0, 84,114,101,101, 83,
-116,111,114,101,  0, 84,114,101,101, 83,116,111,114,101, 69,108,101,109,  0, 83,112, 97, 99,101, 73,109, 97,103,101,  0, 83,112,
- 97, 99,101, 78,108, 97,  0, 83,112, 97, 99,101, 84,101,120,116,  0, 83, 99,114,105,112,116,  0, 83,112, 97, 99,101, 83, 99,114,
-105,112,116,  0, 83,112, 97, 99,101, 84,105,109,101,  0, 83,112, 97, 99,101, 78,111,100,101,  0, 83,112, 97, 99,101, 76,111,103,
-105, 99,  0, 83,112, 97, 99,101, 73,109, 97, 83,101,108,  0, 67,111,110,115,111,108,101, 76,105,110,101,  0, 83,112, 97, 99,101,
- 67,111,110,115,111,108,101,  0,117,105, 70,111,110,116,  0,117,105, 70,111,110,116, 83,116,121,108,101,  0,117,105, 83,116,121,
-108,101,  0,117,105, 87,105,100,103,101,116, 67,111,108,111,114,115,  0,117,105, 87,105,100,103,101,116, 83,116, 97,116,101, 67,
-111,108,111,114,115,  0, 84,104,101,109,101, 85, 73,  0, 84,104,101,109,101, 83,112, 97, 99,101,  0, 84,104,101,109,101, 87,105,
-114,101, 67,111,108,111,114,  0, 98, 84,104,101,109,101,  0, 83,111,108,105,100, 76,105,103,104,116,  0, 85,115,101,114, 68,101,
-102,  0, 83, 99,114, 86,101,114,116,  0, 83, 99,114, 69,100,103,101,  0, 80, 97,110,101,108,  0, 80, 97,110,101,108, 84,121,112,
-101,  0,117,105, 76, 97,121,111,117,116,  0, 83, 99,114, 65,114,101, 97,  0, 83,112, 97, 99,101, 84,121,112,101,  0, 65, 82,101,
-103,105,111,110,  0, 65, 82,101,103,105,111,110, 84,121,112,101,  0, 70,105,108,101, 71,108,111, 98, 97,108,  0, 83,116,114,105,
-112, 69,108,101,109,  0, 84, 83,116,114,105,112, 69,108,101,109,  0, 83,116,114,105,112, 67,114,111,112,  0, 83,116,114,105,112,
- 84,114, 97,110,115,102,111,114,109,  0, 83,116,114,105,112, 67,111,108,111,114, 66, 97,108, 97,110, 99,101,  0, 83,116,114,105,
-112, 80,114,111,120,121,  0, 83,116,114,105,112,  0, 80,108,117,103,105,110, 83,101,113,  0, 83,101,113,117,101,110, 99,101,  0,
- 98, 83,111,117,110,100,  0,104,100, 97,117,100,105,111,  0, 77,101,116, 97, 83,116, 97, 99,107,  0, 87,105,112,101, 86, 97,114,
-115,  0, 71,108,111,119, 86, 97,114,115,  0, 84,114, 97,110,115,102,111,114,109, 86, 97,114,115,  0, 83,111,108,105,100, 67,111,
-108,111,114, 86, 97,114,115,  0, 83,112,101,101,100, 67,111,110,116,114,111,108, 86, 97,114,115,  0, 69,102,102,101, 99,116,  0,
- 66,117,105,108,100, 69,102,102,  0, 80, 97,114,116, 69,102,102,  0, 80, 97,114,116,105, 99,108,101,  0, 87, 97,118,101, 69,102,
-102,  0, 98, 80,114,111,112,101,114,116,121,  0, 98, 78,101, 97,114, 83,101,110,115,111,114,  0, 98, 77,111,117,115,101, 83,101,
-110,115,111,114,  0, 98, 84,111,117, 99,104, 83,101,110,115,111,114,  0, 98, 75,101,121, 98,111, 97,114,100, 83,101,110,115,111,
-114,  0, 98, 80,114,111,112,101,114,116,121, 83,101,110,115,111,114,  0, 98, 65, 99,116,117, 97,116,111,114, 83,101,110,115,111,
-114,  0, 98, 68,101,108, 97,121, 83,101,110,115,111,114,  0, 98, 67,111,108,108,105,115,105,111,110, 83,101,110,115,111,114,  0,
- 98, 82, 97,100, 97,114, 83,101,110,115,111,114,  0, 98, 82, 97,110,100,111,109, 83,101,110,115,111,114,  0, 98, 82, 97,121, 83,
-101,110,115,111,114,  0, 98, 77,101,115,115, 97,103,101, 83,101,110,115,111,114,  0, 98, 83,101,110,115,111,114,  0, 98, 67,111,
-110,116,114,111,108,108,101,114,  0, 98, 74,111,121,115,116,105, 99,107, 83,101,110,115,111,114,  0, 98, 69,120,112,114,101,115,
-115,105,111,110, 67,111,110,116,  0, 98, 80,121,116,104,111,110, 67,111,110,116,  0, 98, 65, 99,116,117, 97,116,111,114,  0, 98,
- 65,100,100, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 65, 99,116,105,111,110, 65, 99,116,117, 97,116,111,
-114,  0, 98, 83,111,117,110,100, 65, 99,116,117, 97,116,111,114,  0, 98, 67, 68, 65, 99,116,117, 97,116,111,114,  0, 98, 69,100,
-105,116, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 83, 99,101,110,101, 65, 99,116,117, 97,116,111,114,  0,
- 98, 80,114,111,112,101,114,116,121, 65, 99,116,117, 97,116,111,114,  0, 98, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,
-114,  0, 98, 73,112,111, 65, 99,116,117, 97,116,111,114,  0, 98, 67, 97,109,101,114, 97, 65, 99,116,117, 97,116,111,114,  0, 98,
- 67,111,110,115,116,114, 97,105,110,116, 65, 99,116,117, 97,116,111,114,  0, 98, 71,114,111,117,112, 65, 99,116,117, 97,116,111,
-114,  0, 98, 82, 97,110,100,111,109, 65, 99,116,117, 97,116,111,114,  0, 98, 77,101,115,115, 97,103,101, 65, 99,116,117, 97,116,
-111,114,  0, 98, 71, 97,109,101, 65, 99,116,117, 97,116,111,114,  0, 98, 86,105,115,105, 98,105,108,105,116,121, 65, 99,116,117,
- 97,116,111,114,  0, 98, 84,119,111, 68, 70,105,108,116,101,114, 65, 99,116,117, 97,116,111,114,  0, 98, 80, 97,114,101,110,116,
- 65, 99,116,117, 97,116,111,114,  0, 98, 83,116, 97,116,101, 65, 99,116,117, 97,116,111,114,  0, 70,114,101,101, 67, 97,109,101,
-114, 97,  0, 98, 83, 97,109,112,108,101,  0, 98, 83,111,117,110,100, 76,105,115,116,101,110,101,114,  0, 83,112, 97, 99,101, 83,
-111,117,110,100,  0, 71,114,111,117,112, 79, 98,106,101, 99,116,  0, 66,111,110,101,  0, 98, 65,114,109, 97,116,117,114,101,  0,
- 98, 80,111,115,101, 67,104, 97,110,110,101,108,  0, 98, 65, 99,116,105,111,110, 71,114,111,117,112,  0, 83,112, 97, 99,101, 65,
- 99,116,105,111,110,  0, 98, 65, 99,116,105,111,110, 67,104, 97,110,110,101,108,  0, 98, 67,111,110,115,116,114, 97,105,110,116,
- 67,104, 97,110,110,101,108,  0, 98, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,111,110,115,116,114, 97,105,110,116, 84,
- 97,114,103,101,116,  0, 98, 80,121,116,104,111,110, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 75,105,110,101,109, 97,116,
-105, 99, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 84,114, 97, 99,107, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0,
- 98, 82,111,116, 97,116,101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 97,116,101, 76,105,107,
-101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 77,105,110, 77, 97,120, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,
-105,122,101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 65, 99,116,105,111,110, 67,111,110,115,116,114, 97,
-105,110,116,  0, 98, 76,111, 99,107, 84,114, 97, 99,107, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 70,111,108,108,111,119,
- 80, 97,116,104, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,116,114,101,116, 99,104, 84,111, 67,111,110,115,116,114, 97,
-105,110,116,  0, 98, 82,105,103,105,100, 66,111,100,121, 74,111,105,110,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,
-108, 97,109,112, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,104,105,108,100, 79,102, 67,111,110,115,116,114, 97,
-105,110,116,  0, 98, 84,114, 97,110,115,102,111,114,109, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 76,105,109,
-105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 82,111,116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,
-  0, 98, 83,105,122,101, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 68,105,115,116, 76,105,109,105,116,
- 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,104,114,105,110,107,119,114, 97,112, 67,111,110,115,116,114, 97,105,110,116,
-  0, 98, 65, 99,116,105,111,110, 77,111,100,105,102,105,101,114,  0, 98, 65, 99,116,105,111,110, 83,116,114,105,112,  0, 98, 78,
-111,100,101, 83,116, 97, 99,107,  0, 98, 78,111,100,101, 83,111, 99,107,101,116,  0, 98, 78,111,100,101, 76,105,110,107,  0, 98,
- 78,111,100,101,  0, 98, 78,111,100,101, 80,114,101,118,105,101,119,  0, 98, 78,111,100,101, 84,121,112,101,  0, 78,111,100,101,
- 73,109, 97,103,101, 65,110,105,109,  0, 78,111,100,101, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 68, 66,108,117,114,
- 68, 97,116, 97,  0, 78,111,100,101, 66,105,108, 97,116,101,114, 97,108, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 72,
-117,101, 83, 97,116,  0, 78,111,100,101, 73,109, 97,103,101, 70,105,108,101,  0, 78,111,100,101, 67,104,114,111,109, 97,  0, 78,
-111,100,101, 84,119,111, 88, 89,115,  0, 78,111,100,101, 84,119,111, 70,108,111, 97,116,115,  0, 78,111,100,101, 71,101,111,109,
-101,116,114,121,  0, 78,111,100,101, 86,101,114,116,101,120, 67,111,108,  0, 78,111,100,101, 68,101,102,111, 99,117,115,  0, 78,
-111,100,101, 83, 99,114,105,112,116, 68,105, 99,116,  0, 78,111,100,101, 71,108, 97,114,101,  0, 78,111,100,101, 84,111,110,101,
-109, 97,112,  0, 78,111,100,101, 76,101,110,115, 68,105,115,116,  0, 84,101,120, 78,111,100,101, 79,117,116,112,117,116,  0, 67,
-117,114,118,101, 77, 97,112, 80,111,105,110,116,  0, 67,117,114,118,101, 77, 97,112,  0, 66,114,117,115,104, 67,108,111,110,101,
-  0, 67,117,115,116,111,109, 68, 97,116, 97, 76, 97,121,101,114,  0, 72, 97,105,114, 75,101,121,  0, 80, 97,114,116,105, 99,108,
-101, 75,101,121,  0, 67,104,105,108,100, 80, 97,114,116,105, 99,108,101,  0, 80, 97,114,116,105, 99,108,101, 84, 97,114,103,101,
-116,  0, 80, 97,114,116,105, 99,108,101, 68, 97,116, 97,  0, 66,111,105,100, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101,
- 83,101,116,116,105,110,103,115,  0, 66,111,105,100, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,101, 69,100,
-105,116,  0, 80, 97,114,116,105, 99,108,101, 67, 97, 99,104,101, 75,101,121,  0, 75, 68, 84,114,101,101,  0, 76,105,110,107, 78,
-111,100,101,  0, 98, 71, 80, 68,115,112,111,105,110,116,  0, 98, 71, 80, 68,115,116,114,111,107,101,  0, 98, 71, 80, 68,102,114,
- 97,109,101,  0, 98, 71, 80, 68,108, 97,121,101,114,  0, 82,101,112,111,114,116,  0, 82,101,112,111,114,116, 76,105,115,116,  0,
-119,109, 87,105,110,100,111,119, 77, 97,110, 97,103,101,114,  0,119,109, 87,105,110,100,111,119,  0,119,109, 69,118,101,110,116,
-  0,119,109, 83,117, 98, 87,105,110,100,111,119,  0,119,109, 71,101,115,116,117,114,101,  0,119,109, 75,101,121,109, 97,112, 73,
-116,101,109,  0, 80,111,105,110,116,101,114, 82, 78, 65,  0,119,109, 75,101,121, 77, 97,112,  0,119,109, 79,112,101,114, 97,116,
-111,114, 84,121,112,101,  0, 70, 77,111,100,105,102,105,101,114,  0, 70, 77,111,100, 95, 71,101,110,101,114, 97,116,111,114,  0,
- 70, 77,111,100, 95, 70,117,110, 99,116,105,111,110, 71,101,110,101,114, 97,116,111,114,  0, 70, 67, 77, 95, 69,110,118,101,108,
-111,112,101, 68, 97,116, 97,  0, 70, 77,111,100, 95, 69,110,118,101,108,111,112,101,  0, 70, 77,111,100, 95, 67,121, 99,108,101,
-115,  0, 70, 77,111,100, 95, 80,121,116,104,111,110,  0, 70, 77,111,100, 95, 76,105,109,105,116,115,  0, 70, 77,111,100, 95, 78,
-111,105,115,101,  0, 68,114,105,118,101,114, 84, 97,114,103,101,116,  0, 67,104, 97,110,110,101,108, 68,114,105,118,101,114,  0,
- 70, 80,111,105,110,116,  0, 70, 67,117,114,118,101,  0, 65,110,105,109, 77, 97,112, 80, 97,105,114,  0, 65,110,105,109, 77, 97,
-112,112,101,114,  0, 78,108, 97, 83,116,114,105,112,  0, 78,108, 97, 84,114, 97, 99,107,  0, 75, 83, 95, 80, 97,116,104,  0, 75,
-101,121,105,110,103, 83,101,116,  0, 65,110,105,109, 79,118,101,114,114,105,100,101,  0, 73,100, 65,100,116, 84,101,109,112,108,
- 97,116,101,  0, 66,111,105,100, 82,117,108,101,  0, 66,111,105,100, 82,117,108,101, 71,111, 97,108, 65,118,111,105,100,  0, 66,
-111,105,100, 82,117,108,101, 65,118,111,105,100, 67,111,108,108,105,115,105,111,110,  0, 66,111,105,100, 82,117,108,101, 70,111,
-108,108,111,119, 76,101, 97,100,101,114,  0, 66,111,105,100, 82,117,108,101, 65,118,101,114, 97,103,101, 83,112,101,101,100,  0,
- 66,111,105,100, 82,117,108,101, 70,105,103,104,116,  0, 66,111,105,100, 83,116, 97,116,101,  0, 84, 76, 69, 78,  1,  0,  1,  0,
-  2,  0,  2,  0,  4,  0,  4,  0,  4,  0,  4,  0,  8,  0,  0,  0, 16,  0, 24,  0, 16,  0,  4,  0,  8,  0,  8,  0, 16,  0, 12,  0,
- 12,  0, 24,  0, 16,  0, 16,  0, 32,  0, 16,  0, 16,  0, 32,  0, 96,  0, 72,  0, 72,  2,  0,  0, 40,  0,144,  0, 40,  4,112,  0,
- 36,  0, 56,  0,112,  0,128,  0,168,  0, 88,  0, 40,  0, 48,  0,176,  0, 16,  0,152,  0, 40,  0,192,  5,184,  1,  0,  0,  0,  0,
-  0,  0,144,  0, 88,  1,120,  1, 24,  0,  8,  3,200,  0,  0,  0,232,  0,136,  0,232,  1, 56,  1, 80,  0,224,  2,104,  0, 88,  1,
-  0,  0,128,  0,104,  0,200,  0, 80,  0,  8,  0, 16,  0,200,  1,  0,  0,  0,  0,  0,  0,144,  1, 20,  0, 48,  0, 64,  0, 24,  0,
- 12,  0, 16,  0,  4,  0,  8,  0,  8,  0,  0,  0, 32,  0,112,  0, 48,  0,  8,  0, 16,  0,  8,  0,  8,  0,  4,  0,  4,  0,  0,  1,
- 32,  0, 16,  0,  0,  0, 16,  0, 64,  0, 24,  0, 12,  0, 64,  0, 72,  0, 96,  0,112,  0,120,  0, 88,  0,120,  0,152,  0, 88,  0,
- 80,  0,128,  0, 80,  0,176,  0,216,  0, 80,  0,112,  0,128,  0,216,  0,128,  0,208,  0, 72,  0,112,  0,  0,  0,136,  0, 32,  0,
-232,  1,152,  0,  0,  0,112,  0,  0,  0,  0,  0, 88,  0,  8,  0,  8,  0,  8,  1,104,  0,216,  1, 96,  0, 88,  0, 88,  0, 88,  0,
-184,  1,136,  0,128,  0,232,  0, 48,  0,144,  0, 72,  0,120,  0,136,  0, 16,  1,224,  0,  0,  0, 40,  0, 16,  0,  0,  0,  0,  0,
-  0,  0,216,  1, 40,  0,184,  0,152,  0, 56,  0, 16,  0, 88,  0, 24,  4, 64,  0, 24,  0, 16,  0, 88,  0, 88,  0, 24,  0, 40,  1,
-  8,  0, 88,  0, 88,  0, 40,  0,  0,  0, 48,  0, 64,  1, 32,  0, 48,  2,  0,  0,  0,  0, 64,  0,248,  2,104,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 32,  1, 56,  0,152,  0, 72,  0,208,  0,240,  0, 32,  0,  0,  1,240,  0,128,  1,104,  0,  0,  0,144,  0,
-  0,  0, 40,  1, 16,  0, 16,  0,168,  0,224,  0,144,  2,120,  2, 64,  0,200,  0, 32,  1, 72,  0,208,  2, 40,  0,112,  0, 24,  1,
- 32,  0,232,  0, 32,  0, 32,  0, 80,  2, 16,  1, 16,  0,192, 20, 56,  0, 64, 11, 32,  0, 40,  0, 80,  1,  0,  0,  0,  0,160,  0,
-  0,  0, 40,  1,  0,  0, 40,  0, 80,  0, 48,  0, 16,  0,  8,  0, 52,  0,  0,  1, 32,  1,200,  1,  8,  1, 72,  1,  0,  0, 32,  0,
- 12,  0, 24,  0, 48,  0, 16,  0, 24,  0, 24,  0, 32,  0, 72,  1,  0,  0, 64,  0, 64,  0, 48,  0,  8,  0, 48,  0, 72,  0,104,  0,
- 40,  0,  8,  0, 72,  0, 44,  0, 40,  0,108,  0, 72,  0, 96,  0,104,  0, 60,  0,128,  0, 80,  0, 80,  0, 16,  0, 96,  0, 32,  0,
- 20,  0, 88,  0, 24,  0, 80,  0,112,  0, 84,  0, 32,  0, 96,  0, 64,  0, 56,  0,112,  0,140,  0,  4,  0, 24,  0, 16,  0,  8,  0,
- 40,  0,  0,  0, 88,  0,224,  0, 40,  0, 24,  1,168,  0,232,  1,120,  0,  8,  1, 88,  0, 56,  0, 80,  0,128,  0, 80,  0,112,  0,
- 56,  0, 48,  0, 48,  0, 72,  0, 48,  0, 72,  0, 48,  0, 24,  0, 56,  0,104,  0, 16,  0,112,  0, 96,  0, 28,  0, 28,  0, 28,  0,
- 56,  0, 24,  0, 72,  0,168,  0, 40,  0,144,  0, 56,  0,  0,  1,  0,  0,  0,  0, 16,  0, 40,  0, 28,  0, 12,  0, 12,  0, 16,  1,
- 40,  0,  8,  0,  8,  0, 64,  0, 32,  0, 24,  0, 16,  0, 24,  0, 32,  0,  8,  0, 32,  0, 12,  0, 56,  0, 24,  0, 72,  0, 24,  0,
- 56,  0, 72,  0, 40,  0,248,  0, 20,  0,  8,  2,104,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 32,  0, 40,  0,192,  0, 40,  0,
- 32,  0,224,  0,224,  0, 72,  0,  0,  0,  0,  0,112,  0,  0,  0,112,  0,  0,  0,104,  0, 24,  0, 24,  0, 16,  0, 24,  0,  8,  0,
- 16,  0, 24,  0, 20,  0,104,  0, 32,  1, 16,  0,104,  0,  0,  1, 40,  0,200,  0,104,  0,112,  0,104,  0, 32,  0, 80,  0, 56,  0,
- 80,  0, 64,  0,104,  0, 72,  0, 64,  0,128,  0, 83, 84, 82, 67,112,  1,  0,  0, 10,  0,  2,  0, 10,  0,  0,  0, 10,  0,  1,  0,
- 11,  0,  3,  0, 11,  0,  0,  0, 11,  0,  1,  0,  9,  0,  2,  0, 12,  0,  2,  0,  9,  0,  3,  0,  9,  0,  4,  0, 13,  0,  2,  0,
-  2,  0,  5,  0,  2,  0,  6,  0, 14,  0,  2,  0,  4,  0,  5,  0,  4,  0,  6,  0, 15,  0,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0,
- 16,  0,  2,  0,  8,  0,  5,  0,  8,  0,  6,  0, 17,  0,  3,  0,  4,  0,  5,  0,  4,  0,  6,  0,  4,  0,  7,  0, 18,  0,  3,  0,
-  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0, 19,  0,  3,  0,  8,  0,  5,  0,  8,  0,  6,  0,  8,  0,  7,  0, 20,  0,  4,  0,
-  4,  0,  5,  0,  4,  0,  6,  0,  4,  0,  7,  0,  4,  0,  8,  0, 21,  0,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0,
-  7,  0,  8,  0, 22,  0,  4,  0,  8,  0,  5,  0,  8,  0,  6,  0,  8,  0,  7,  0,  8,  0,  8,  0, 23,  0,  4,  0,  4,  0,  9,  0,
-  4,  0, 10,  0,  4,  0, 11,  0,  4,  0, 12,  0, 24,  0,  4,  0,  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 12,  0,
- 25,  0,  4,  0,  9,  0, 13,  0, 12,  0, 14,  0,  4,  0, 15,  0,  4,  0, 16,  0, 26,  0, 10,  0, 26,  0,  0,  0, 26,  0,  1,  0,
-  0,  0, 17,  0,  0,  0, 18,  0,  2,  0, 19,  0,  0,  0, 20,  0,  4,  0, 21,  0, 25,  0, 22,  0,  4,  0, 23,  0,  4,  0, 24,  0,
- 27,  0,  9,  0,  9,  0,  0,  0,  9,  0,  1,  0, 27,  0, 25,  0, 28,  0, 26,  0,  0,  0, 27,  0,  2,  0, 28,  0,  2,  0, 19,  0,
-  4,  0, 29,  0, 26,  0, 30,  0, 28,  0,  8,  0, 27,  0, 31,  0, 27,  0, 32,  0, 29,  0, 33,  0,  0,  0, 34,  0,  0,  0, 35,  0,
-  4,  0, 36,  0,  4,  0, 37,  0, 28,  0, 38,  0, 30,  0,  6,  0,  4,  0, 39,  0,  4,  0, 40,  0,  2,  0, 41,  0,  2,  0, 42,  0,
-  2,  0, 43,  0,  4,  0, 44,  0, 31,  0,  6,  0, 32,  0, 45,  0,  2,  0, 46,  0,  2,  0, 47,  0,  2,  0, 17,  0,  2,  0, 19,  0,
-  0,  0, 48,  0, 33,  0, 21,  0, 33,  0,  0,  0, 33,  0,  1,  0, 34,  0, 49,  0, 35,  0, 50,  0, 24,  0, 51,  0, 24,  0, 52,  0,
-  2,  0, 46,  0,  2,  0, 47,  0,  2,  0, 53,  0,  2,  0, 54,  0,  2,  0, 55,  0,  2,  0, 56,  0,  2,  0, 19,  0,  2,  0, 57,  0,
-  7,  0, 11,  0,  7,  0, 12,  0,  4,  0, 58,  0,  7,  0, 59,  0,  7,  0, 60,  0,  7,  0, 61,  0, 31,  0, 62,  0, 36,  0,  7,  0,
- 27,  0, 31,  0, 12,  0, 63,  0, 24,  0, 64,  0,  2,  0, 46,  0,  2,  0, 65,  0,  2,  0, 66,  0,  2,  0, 37,  0, 37,  0, 16,  0,
- 37,  0,  0,  0, 37,  0,  1,  0,  7,  0, 67,  0,  7,  0, 61,  0,  2,  0, 17,  0,  2,  0, 47,  0,  2,  0, 68,  0,  2,  0, 19,  0,
-  4,  0, 69,  0,  4,  0, 70,  0,  9,  0,  2,  0,  7,  0, 71,  0,  0,  0, 20,  0,  0,  0, 72,  0,  7,  0, 73,  0,  7,  0, 74,  0,
- 38,  0, 13,  0, 27,  0, 31,  0, 39,  0, 75,  0, 37,  0, 76,  0,  0,  0, 77,  0,  4,  0, 78,  0,  7,  0, 61,  0, 12,  0, 79,  0,
- 36,  0, 80,  0, 27,  0, 81,  0,  2,  0, 17,  0,  2,  0, 82,  0,  2,  0, 83,  0,  2,  0, 19,  0, 40,  0,  6,  0, 40,  0,  0,  0,
- 40,  0,  1,  0,  0,  0, 84,  0,  0,  0, 85,  0,  4,  0, 23,  0,  4,  0, 86,  0, 41,  0, 10,  0, 41,  0,  0,  0, 41,  0,  1,  0,
-  4,  0, 87,  0,  4,  0, 88,  0,  4,  0, 89,  0,  4,  0, 43,  0,  4,  0, 14,  0,  4,  0, 90,  0,  0,  0, 91,  0,  0,  0, 92,  0,
- 42,  0, 15,  0, 27,  0, 31,  0,  0,  0, 93,  0,  4,  0, 90,  0,  4,  0, 94,  0, 12,  0, 95,  0, 40,  0, 96,  0, 40,  0, 97,  0,
-  4,  0, 98,  0,  4,  0, 99,  0, 12,  0,100,  0,  0,  0,101,  0,  4,  0,102,  0,  4,  0,103,  0,  9,  0,104,  0,  8,  0,105,  0,
- 43,  0,  3,  0,  4,  0,106,  0,  4,  0,107,  0,  9,  0,  2,  0, 44,  0, 20,  0, 27,  0, 31,  0, 39,  0, 75,  0,  2,  0, 17,  0,
-  2,  0, 19,  0,  7,  0,108,  0,  7,  0,109,  0,  7,  0,110,  0,  7,  0,111,  0,  7,  0,112,  0,  7,  0,113,  0,  7,  0,114,  0,
-  7,  0,115,  0,  7,  0,116,  0,  7,  0,117,  0,  7,  0,118,  0,  2,  0,119,  0,  2,  0,120,  0,  7,  0,121,  0, 36,  0, 80,  0,
- 32,  0,122,  0, 45,  0, 13,  0,  4,  0,123,  0,  4,  0,124,  0,  4,  0,125,  0,  4,  0,126,  0,  2,  0,127,  0,  2,  0,128,  0,
-  2,  0, 19,  0,  2,  0,129,  0,  2,  0,130,  0,  2,  0,131,  0,  2,  0,132,  0,  2,  0,133,  0, 46,  0,134,  0, 47,  0, 32,  0,
- 27,  0, 31,  0,  0,  0, 34,  0, 12,  0,135,  0, 48,  0,136,  0, 49,  0,137,  0, 50,  0,138,  0,  2,  0,129,  0,  2,  0, 19,  0,
-  2,  0,139,  0,  2,  0, 17,  0,  2,  0, 37,  0,  2,  0, 43,  0,  4,  0,140,  0,  2,  0,141,  0,  2,  0,142,  0,  2,  0,143,  0,
-  2,  0,144,  0,  2,  0,145,  0,  2,  0,146,  0,  4,  0,147,  0,  4,  0,148,  0, 43,  0,149,  0, 30,  0,150,  0,  0,  0,151,  0,
-  7,  0,152,  0,  4,  0,153,  0,  2,  0,154,  0,  2,  0,155,  0,  2,  0,156,  0,  2,  0,157,  0,  7,  0,158,  0,  7,  0,159,  0,
- 51,  0, 31,  0,  2,  0,160,  0,  2,  0,161,  0,  2,  0,162,  0,  2,  0,163,  0, 32,  0,164,  0, 52,  0,165,  0,  0,  0,166,  0,
-  0,  0,167,  0,  0,  0,168,  0,  0,  0,169,  0,  0,  0,170,  0,  7,  0,171,  0,  7,  0,172,  0,  2,  0,173,  0,  2,  0,174,  0,
-  2,  0,175,  0,  2,  0,176,  0,  2,  0,177,  0,  2,  0,178,  0,  2,  0,179,  0,  7,  0,180,  0,  7,  0,181,  0,  7,  0,182,  0,
-  7,  0,183,  0,  7,  0,184,  0,  7,  0, 57,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,187,  0,  7,  0,188,  0,  7,  0,189,  0,
- 53,  0, 15,  0,  0,  0,190,  0,  9,  0,191,  0,  0,  0,192,  0,  0,  0,193,  0,  4,  0,194,  0,  4,  0,195,  0,  9,  0,196,  0,
-  7,  0,197,  0,  7,  0,198,  0,  7,  0,199,  0,  4,  0,200,  0,  9,  0,201,  0,  9,  0,202,  0,  4,  0,203,  0,  4,  0, 37,  0,
- 54,  0,  6,  0,  7,  0,180,  0,  7,  0,181,  0,  7,  0,182,  0,  7,  0,204,  0,  7,  0, 67,  0,  4,  0, 64,  0, 55,  0,  5,  0,
-  2,  0, 19,  0,  2,  0, 36,  0,  2,  0, 64,  0,  2,  0,205,  0, 54,  0,199,  0, 56,  0, 17,  0, 32,  0,164,  0, 47,  0,206,  0,
- 57,  0,207,  0,  7,  0,208,  0,  7,  0,209,  0,  2,  0, 17,  0,  2,  0,210,  0,  7,  0,110,  0,  7,  0,111,  0,  7,  0,211,  0,
-  4,  0,212,  0,  2,  0,213,  0,  2,  0,214,  0,  4,  0,129,  0,  4,  0,140,  0,  2,  0,215,  0,  2,  0,216,  0, 52,  0, 59,  0,
- 27,  0, 31,  0, 39,  0, 75,  0,  7,  0,217,  0,  7,  0,218,  0,  7,  0,219,  0,  7,  0,220,  0,  7,  0,221,  0,  7,  0,222,  0,
-  7,  0,223,  0,  7,  0,224,  0,  7,  0,225,  0,  7,  0,226,  0,  7,  0,227,  0,  7,  0,228,  0,  7,  0,229,  0,  7,  0,230,  0,
-  7,  0,231,  0,  7,  0,232,  0,  7,  0,233,  0,  7,  0,234,  0,  7,  0,235,  0,  7,  0,236,  0,  2,  0,237,  0,  2,  0,238,  0,
-  2,  0,239,  0,  2,  0,240,  0,  2,  0,241,  0,  2,  0,242,  0,  2,  0,243,  0,  2,  0, 19,  0,  2,  0, 17,  0,  2,  0,210,  0,
-  7,  0,244,  0,  7,  0,245,  0,  7,  0,246,  0,  7,  0,247,  0,  4,  0,248,  0,  4,  0,249,  0,  2,  0,250,  0,  2,  0,251,  0,
-  2,  0,252,  0,  2,  0,127,  0,  4,  0, 23,  0,  4,  0,124,  0,  4,  0,125,  0,  4,  0,126,  0,  7,  0,253,  0,  7,  0,254,  0,
-  7,  0,186,  0, 45,  0,255,  0, 58,  0,  0,  1, 36,  0, 80,  0, 47,  0,206,  0, 53,  0,  1,  1, 55,  0,  2,  1, 56,  0,  3,  1,
- 30,  0,150,  0,  0,  0,  4,  1,  0,  0,  5,  1, 59,  0,  8,  0,  7,  0,  6,  1,  7,  0,  7,  1,  7,  0,172,  0,  4,  0, 19,  0,
-  7,  0,  8,  1,  7,  0,  9,  1,  7,  0, 10,  1, 32,  0, 45,  0, 60,  0, 82,  0, 27,  0, 31,  0, 39,  0, 75,  0,  2,  0, 17,  0,
-  2,  0, 19,  0,  4,  0, 11,  1,  2,  0,174,  0,  2,  0, 12,  1,  7,  0,180,  0,  7,  0,181,  0,  7,  0,182,  0,  7,  0,183,  0,
-  7,  0, 13,  1,  7,  0, 14,  1,  7,  0, 15,  1,  7,  0, 16,  1,  7,  0, 17,  1,  7,  0, 18,  1,  7,  0, 19,  1,  7,  0, 20,  1,
-  7,  0, 21,  1,  7,  0, 22,  1,  7,  0, 23,  1, 61,  0, 24,  1,  2,  0, 25,  1,  2,  0, 70,  0,  7,  0,110,  0,  7,  0,111,  0,
-  7,  0, 26,  1,  7,  0, 27,  1,  7,  0, 28,  1,  2,  0, 29,  1,  2,  0, 30,  1,  2,  0, 31,  1,  2,  0, 32,  1,  0,  0, 33,  1,
-  0,  0, 34,  1,  2,  0, 35,  1,  2,  0, 36,  1,  2,  0, 37,  1,  2,  0, 38,  1,  2,  0, 39,  1,  7,  0, 40,  1,  7,  0, 41,  1,
-  7,  0, 42,  1,  7,  0, 43,  1,  2,  0, 44,  1,  2,  0, 43,  0,  2,  0, 45,  1,  2,  0, 46,  1,  2,  0, 47,  1,  2,  0, 48,  1,
-  7,  0, 49,  1,  7,  0, 50,  1,  7,  0, 51,  1,  7,  0, 52,  1,  7,  0, 53,  1,  7,  0, 54,  1,  7,  0, 55,  1,  7,  0, 56,  1,
-  7,  0, 57,  1,  7,  0, 58,  1,  7,  0, 59,  1,  7,  0, 60,  1,  2,  0, 61,  1,  2,  0, 62,  1,  4,  0, 63,  1,  4,  0, 64,  1,
-  2,  0, 65,  1,  2,  0, 66,  1,  2,  0, 67,  1,  2,  0, 68,  1,  7,  0, 69,  1,  7,  0, 70,  1,  7,  0, 71,  1,  7,  0, 72,  1,
-  2,  0, 73,  1,  2,  0, 74,  1, 36,  0, 80,  0, 51,  0, 75,  1,  2,  0, 76,  1,  2,  0, 77,  1, 30,  0,150,  0, 62,  0,  2,  0,
- 27,  0, 31,  0, 36,  0, 80,  0, 63,  0,129,  0, 27,  0, 31,  0, 39,  0, 75,  0,  2,  0, 78,  1,  2,  0, 19,  0,  7,  0,180,  0,
-  7,  0,181,  0,  7,  0,182,  0,  7,  0, 79,  1,  7,  0, 80,  1,  7,  0, 81,  1,  7,  0, 82,  1,  7,  0, 83,  1,  7,  0, 84,  1,
-  7,  0, 85,  1,  7,  0, 86,  1,  7,  0, 87,  1,  7,  0, 88,  1,  7,  0, 89,  1,  7,  0, 90,  1,  7,  0, 91,  1,  7,  0, 92,  1,
-  7,  0, 93,  1,  7,  0, 94,  1,  7,  0, 95,  1,  7,  0, 96,  1,  7,  0, 97,  1,  7,  0, 98,  1,  7,  0, 99,  1,  7,  0,100,  1,
-  7,  0,101,  1,  7,  0,102,  1,  7,  0,103,  1,  7,  0,104,  1,  7,  0,105,  1,  2,  0,106,  1,  2,  0,107,  1,  2,  0,108,  1,
-  0,  0,109,  1,  0,  0,110,  1,  7,  0,111,  1,  7,  0,112,  1,  2,  0,113,  1,  2,  0,114,  1,  7,  0,115,  1,  7,  0,116,  1,
-  7,  0,117,  1,  7,  0,118,  1,  2,  0,119,  1,  2,  0,120,  1,  4,  0, 11,  1,  4,  0,121,  1,  2,  0,122,  1,  2,  0,123,  1,
-  2,  0,124,  1,  2,  0,125,  1,  7,  0,126,  1,  7,  0,127,  1,  7,  0,128,  1,  7,  0,129,  1,  7,  0,130,  1,  7,  0,131,  1,
-  7,  0,132,  1,  7,  0,133,  1,  7,  0,134,  1,  7,  0,135,  1,  0,  0,136,  1,  7,  0,137,  1,  7,  0,138,  1,  7,  0,139,  1,
-  4,  0,140,  1,  0,  0,141,  1,  0,  0, 45,  1,  0,  0,142,  1,  0,  0,  4,  1,  2,  0,143,  1,  2,  0,144,  1,  2,  0, 76,  1,
-  2,  0,145,  1,  2,  0,146,  1,  2,  0,147,  1,  7,  0,148,  1,  7,  0,149,  1,  7,  0,150,  1,  7,  0,151,  1,  7,  0,152,  1,
-  2,  0,160,  0,  2,  0,161,  0, 55,  0,153,  1, 55,  0,154,  1,  0,  0,155,  1,  0,  0,156,  1,  0,  0,157,  1,  0,  0,158,  1,
-  2,  0,159,  1,  2,  0,160,  1,  7,  0,161,  1,  7,  0,162,  1, 51,  0, 75,  1, 58,  0,  0,  1, 36,  0, 80,  0, 64,  0,163,  1,
- 30,  0,150,  0,  7,  0,164,  1,  7,  0,165,  1,  7,  0,166,  1,  7,  0,167,  1,  7,  0,168,  1,  2,  0,169,  1,  2,  0, 70,  0,
-  7,  0,170,  1,  7,  0,171,  1,  7,  0,172,  1,  7,  0,173,  1,  7,  0,174,  1,  7,  0,175,  1,  7,  0,176,  1,  7,  0,177,  1,
-  7,  0,178,  1,  2,  0,179,  1,  2,  0,180,  1,  7,  0,181,  1,  7,  0,182,  1,  7,  0,183,  1,  7,  0,184,  1,  7,  0,185,  1,
-  4,  0,186,  1,  4,  0,187,  1,  4,  0,188,  1, 12,  0,189,  1, 65,  0,  4,  0, 27,  0, 31,  0,  0,  0,190,  1, 66,  0,  2,  0,
- 43,  0,149,  0, 67,  0, 26,  0, 67,  0,  0,  0, 67,  0,  1,  0, 68,  0,191,  1,  4,  0,192,  1,  4,  0,193,  1,  4,  0,194,  1,
-  4,  0,195,  1,  4,  0,196,  1,  4,  0,197,  1,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,198,  1,  2,  0,199,  1,  7,  0,  5,  0,
-  7,  0,  6,  0,  7,  0,  7,  0,  7,  0,200,  1,  7,  0,201,  1,  7,  0,202,  1,  7,  0,203,  1,  7,  0,204,  1,  7,  0,205,  1,
-  7,  0,206,  1,  7,  0, 23,  0,  7,  0,207,  1,  7,  0,208,  1, 69,  0, 17,  0, 27,  0, 31,  0, 68,  0,191,  1, 12,  0,209,  1,
- 12,  0,210,  1, 12,  0,211,  1, 36,  0, 80,  0, 63,  0,212,  1,  2,  0, 19,  0,  2,  0,213,  1,  4,  0,173,  0,  7,  0,  6,  1,
-  7,  0,172,  0,  7,  0,  7,  1,  7,  0,214,  1,  7,  0,215,  1,  7,  0,216,  1, 67,  0,217,  1, 35,  0, 11,  0,  7,  0,218,  1,
-  7,  0,219,  1,  7,  0,220,  1,  7,  0,221,  1,  2,  0, 55,  0,  0,  0,222,  1,  0,  0,223,  1,  0,  0,224,  1,  0,  0,225,  1,
-  0,  0,226,  1,  0,  0,227,  1, 34,  0,  7,  0,  7,  0,228,  1,  7,  0,219,  1,  7,  0,220,  1,  2,  0,224,  1,  2,  0,227,  1,
-  7,  0,221,  1,  7,  0, 37,  0, 70,  0, 21,  0, 70,  0,  0,  0, 70,  0,  1,  0,  2,  0, 17,  0,  2,  0,229,  1,  2,  0,227,  1,
-  2,  0, 19,  0,  2,  0,230,  1,  2,  0,231,  1,  2,  0,232,  1,  2,  0,233,  1,  2,  0,234,  1,  2,  0,235,  1,  2,  0,236,  1,
-  2,  0,237,  1,  7,  0,238,  1,  7,  0,239,  1, 34,  0, 49,  0, 35,  0, 50,  0,  2,  0,240,  1,  2,  0,241,  1,  4,  0,242,  1,
- 71,  0,  5,  0,  2,  0,243,  1,  2,  0,229,  1,  0,  0, 19,  0,  0,  0, 37,  0,  2,  0, 70,  0, 72,  0,  4,  0,  7,  0,  5,  0,
-  7,  0,  6,  0,  7,  0,  8,  0,  7,  0,244,  1, 73,  0, 62,  0, 27,  0, 31,  0, 39,  0, 75,  0, 68,  0,191,  1, 12,  0,245,  1,
- 12,  0,210,  1, 12,  0,246,  1, 32,  0,247,  1, 32,  0,248,  1, 32,  0,249,  1, 36,  0, 80,  0, 74,  0,250,  1, 38,  0,251,  1,
- 63,  0,212,  1, 12,  0,252,  1,  7,  0,  6,  1,  7,  0,172,  0,  7,  0,  7,  1,  4,  0,173,  0,  2,  0,253,  1,  2,  0,213,  1,
-  2,  0, 19,  0,  2,  0,254,  1,  7,  0,255,  1,  7,  0,  0,  2,  7,  0,  1,  2,  2,  0,232,  1,  2,  0,233,  1,  2,  0,  2,  2,
-  2,  0,  3,  2,  4,  0,  4,  2, 34,  0,  5,  2,  2,  0, 23,  0,  2,  0, 95,  0,  2,  0, 67,  0,  2,  0,  6,  2,  7,  0,  7,  2,
-  7,  0,  8,  2,  7,  0,  9,  2,  7,  0, 10,  2,  7,  0, 11,  2,  7,  0, 12,  2,  7,  0, 13,  2,  7,  0, 14,  2,  7,  0, 15,  2,
-  7,  0, 16,  2,  0,  0, 17,  2, 75,  0, 18,  2, 76,  0, 19,  2,  0,  0, 20,  2, 65,  0, 21,  2, 65,  0, 22,  2, 65,  0, 23,  2,
- 65,  0, 24,  2,  4,  0, 25,  2,  7,  0, 26,  2,  4,  0, 27,  2,  4,  0, 28,  2, 72,  0, 29,  2,  4,  0, 30,  2,  4,  0, 31,  2,
- 71,  0, 32,  2, 71,  0, 33,  2, 77,  0, 39,  0, 27,  0, 31,  0, 68,  0,191,  1, 12,  0, 34,  2, 36,  0, 80,  0, 38,  0,251,  1,
- 63,  0,212,  1, 78,  0, 35,  2, 79,  0, 36,  2, 80,  0, 37,  2, 81,  0, 38,  2, 82,  0, 39,  2, 83,  0, 40,  2, 84,  0, 41,  2,
- 85,  0, 42,  2, 77,  0, 43,  2, 86,  0, 44,  2, 87,  0, 45,  2, 88,  0, 46,  2, 88,  0, 47,  2, 88,  0, 48,  2,  4,  0, 54,  0,
-  4,  0, 49,  2,  4,  0, 50,  2,  4,  0, 51,  2,  4,  0, 52,  2,  4,  0,173,  0,  7,  0,  6,  1,  7,  0,172,  0,  7,  0,  7,  1,
-  7,  0, 53,  2,  4,  0, 54,  2,  2,  0, 55,  2,  2,  0, 19,  0,  2,  0, 56,  2,  2,  0, 57,  2,  2,  0,213,  1,  2,  0, 58,  2,
- 89,  0, 59,  2, 90,  0, 60,  2, 80,  0,  8,  0,  9,  0, 61,  2,  7,  0, 62,  2,  4,  0, 63,  2,  0,  0, 19,  0,  0,  0, 64,  2,
-  2,  0, 11,  1,  2,  0, 65,  2,  2,  0, 66,  2, 78,  0,  7,  0,  4,  0, 67,  2,  4,  0, 68,  2,  4,  0, 69,  2,  4,  0, 70,  2,
-  2,  0,229,  1,  0,  0, 71,  2,  0,  0, 19,  0, 82,  0,  5,  0,  4,  0, 67,  2,  4,  0, 68,  2,  0,  0, 72,  2,  0,  0, 73,  2,
-  2,  0, 19,  0, 91,  0,  2,  0,  4,  0, 74,  2,  7,  0,220,  1, 83,  0,  3,  0, 91,  0, 75,  2,  4,  0, 76,  2,  4,  0, 19,  0,
- 81,  0,  6,  0,  7,  0, 77,  2,  2,  0, 78,  2,  2,  0,229,  1,  0,  0, 19,  0,  0,  0, 73,  2,  0,  0,179,  0, 84,  0,  4,  0,
-  0,  0,204,  0,  0,  0,180,  0,  0,  0,181,  0,  0,  0,182,  0, 92,  0,  6,  0, 47,  0, 61,  2,  0,  0, 19,  0,  0,  0, 64,  2,
-  2,  0, 11,  1,  2,  0, 65,  2,  2,  0, 66,  2, 93,  0,  1,  0,  7,  0, 79,  2, 94,  0,  5,  0,  0,  0,204,  0,  0,  0,180,  0,
-  0,  0,181,  0,  0,  0,182,  0,  4,  0, 37,  0, 85,  0,  1,  0,  7,  0, 80,  2, 86,  0,  2,  0,  4,  0, 81,  2,  4,  0, 17,  0,
- 79,  0,  7,  0,  7,  0, 62,  2, 47,  0, 61,  2,  0,  0, 19,  0,  0,  0, 64,  2,  2,  0, 11,  1,  2,  0, 65,  2,  2,  0, 66,  2,
- 95,  0,  1,  0,  7,  0, 82,  2, 96,  0,  1,  0,  4,  0, 83,  2, 97,  0,  1,  0,  0,  0, 84,  2, 98,  0,  1,  0,  7,  0, 62,  2,
- 99,  0,  3,  0,  4,  0, 85,  2,  0,  0, 92,  0,  7,  0, 86,  2,101,  0,  4,  0,  7,  0,204,  0,  7,  0,180,  0,  7,  0,181,  0,
-  7,  0,182,  0,102,  0,  1,  0,101,  0, 63,  2,103,  0,  5,  0,  4,  0, 87,  2,  4,  0, 88,  2,  0,  0, 19,  0,  0,  0,229,  1,
-  0,  0,179,  0,104,  0,  2,  0,  4,  0, 89,  2,  4,  0, 88,  2,105,  0, 10,  0,105,  0,  0,  0,105,  0,  1,  0,103,  0, 90,  2,
-102,  0, 91,  2,104,  0, 92,  2,  4,  0, 54,  0,  4,  0, 50,  2,  4,  0, 49,  2,  4,  0, 37,  0, 81,  0, 93,  2, 89,  0, 14,  0,
- 12,  0, 94,  2, 81,  0, 93,  2,  0,  0, 95,  2,  0,  0, 96,  2,  0,  0, 97,  2,  0,  0, 98,  2,  0,  0, 99,  2,  0,  0,100,  2,
-  0,  0,101,  2,  0,  0, 19,  0, 88,  0, 46,  2, 88,  0, 48,  2,  2,  0,102,  2,  0,  0,103,  2, 90,  0,  8,  0,  4,  0,104,  2,
-  4,  0,105,  2, 78,  0,106,  2, 82,  0,107,  2,  4,  0, 50,  2,  4,  0, 49,  2,  4,  0, 54,  0,  4,  0, 37,  0,106,  0,  7,  0,
-106,  0,  0,  0,106,  0,  1,  0,  4,  0, 17,  0,  4,  0, 11,  1,  0,  0, 20,  0, 46,  0,134,  0,  0,  0,108,  2,107,  0,  7,  0,
-106,  0,109,  2,  2,  0,110,  2,  2,  0, 94,  2,  2,  0,111,  2,  2,  0, 90,  0,  9,  0,112,  2,  9,  0,113,  2,108,  0,  3,  0,
-106,  0,109,  2, 32,  0,164,  0,  0,  0, 20,  0,109,  0,  5,  0,106,  0,109,  2, 32,  0,164,  0,  0,  0, 20,  0,  2,  0,114,  2,
-  0,  0,115,  2,110,  0,  5,  0,106,  0,109,  2,  7,  0, 88,  0,  7,  0,116,  2,  4,  0,117,  2,  4,  0,118,  2,111,  0,  5,  0,
-106,  0,109,  2, 32,  0,119,  2,  0,  0, 72,  0,  4,  0, 11,  1,  4,  0, 19,  0,112,  0, 13,  0,106,  0,109,  2, 32,  0,120,  2,
- 32,  0,121,  2, 32,  0,122,  2, 32,  0,123,  2,  7,  0,124,  2,  7,  0,125,  2,  7,  0,116,  2,  7,  0,126,  2,  4,  0,127,  2,
-  4,  0,128,  2,  4,  0, 90,  0,  4,  0,129,  2,113,  0,  5,  0,106,  0,109,  2,  2,  0,130,  2,  2,  0, 19,  0,  7,  0,131,  2,
- 32,  0,132,  2,114,  0,  3,  0,106,  0,109,  2,  7,  0,133,  2,  4,  0, 90,  0,115,  0, 10,  0,106,  0,109,  2,  7,  0,134,  2,
-  4,  0,135,  2,  4,  0, 37,  0,  2,  0, 90,  0,  2,  0,136,  2,  2,  0,137,  2,  2,  0,138,  2,  7,  0,139,  2,  0,  0,140,  2,
-116,  0,  3,  0,106,  0,109,  2,  7,  0, 37,  0,  4,  0, 17,  0,117,  0, 11,  0,106,  0,109,  2, 52,  0,141,  2,  7,  0,142,  2,
-  4,  0,143,  2,  0,  0,140,  2,  7,  0,144,  2,  4,  0,145,  2, 32,  0,146,  2,  0,  0,147,  2,  4,  0,148,  2,  4,  0, 37,  0,
-118,  0, 10,  0,106,  0,109,  2, 32,  0,149,  2, 47,  0,150,  2,  4,  0, 90,  0,  4,  0,151,  2,  7,  0,152,  2,  7,  0,153,  2,
-  0,  0,147,  2,  4,  0,148,  2,  4,  0, 37,  0,119,  0,  3,  0,106,  0,109,  2,  7,  0,154,  2,  4,  0,155,  2,120,  0,  5,  0,
-106,  0,109,  2,  7,  0,156,  2,  0,  0,140,  2,  2,  0, 19,  0,  2,  0,157,  2,121,  0,  8,  0,106,  0,109,  2, 32,  0,164,  0,
-  7,  0,156,  2,  7,  0,221,  1,  7,  0,106,  0,  0,  0,140,  2,  2,  0, 19,  0,  2,  0, 17,  0,122,  0, 21,  0,106,  0,109,  2,
- 32,  0,158,  2,  0,  0,140,  2, 52,  0,141,  2, 32,  0,146,  2,  2,  0, 19,  0,  2,  0, 37,  0,  7,  0,159,  2,  7,  0,160,  2,
-  7,  0,161,  2,  7,  0,255,  1,  7,  0,162,  2,  7,  0,163,  2,  7,  0,164,  2,  7,  0,165,  2,  4,  0,145,  2,  4,  0,148,  2,
-  0,  0,147,  2,  7,  0,166,  2,  7,  0,167,  2,  7,  0, 43,  0,123,  0,  7,  0,106,  0,109,  2,  2,  0,168,  2,  2,  0,169,  2,
-  4,  0, 70,  0, 32,  0,164,  0,  7,  0,170,  2,  0,  0,140,  2,124,  0,  9,  0,106,  0,109,  2, 32,  0,164,  0,  7,  0,171,  2,
-  7,  0,172,  2,  7,  0,165,  2,  4,  0,173,  2,  4,  0,174,  2,  7,  0,175,  2,  0,  0, 20,  0,125,  0,  1,  0,106,  0,109,  2,
-126,  0,  6,  0,106,  0,109,  2, 46,  0,134,  0,127,  0,176,  2,128,  0,177,  2,129,  0,178,  2,130,  0,179,  2,131,  0, 14,  0,
-106,  0,109,  2, 81,  0,180,  2, 81,  0,181,  2, 81,  0,182,  2, 81,  0,183,  2, 81,  0,184,  2, 81,  0,185,  2, 78,  0,186,  2,
-  4,  0,187,  2,  4,  0,188,  2,  2,  0,189,  2,  2,  0, 37,  0,  7,  0,190,  2,132,  0,191,  2,133,  0,  7,  0,106,  0,109,  2,
- 81,  0,180,  2, 81,  0,192,  2,134,  0,193,  2,135,  0,191,  2,  4,  0,194,  2,  4,  0,187,  2,136,  0,  4,  0,106,  0,109,  2,
- 32,  0,164,  0,  4,  0,195,  2,  4,  0, 37,  0,137,  0,  2,  0,  4,  0,196,  2,  7,  0,220,  1,138,  0,  2,  0,  4,  0,125,  0,
-  4,  0,197,  2,139,  0, 20,  0,106,  0,109,  2, 32,  0,164,  0,  0,  0,140,  2,  2,  0,198,  2,  2,  0,199,  2,  2,  0, 19,  0,
-  2,  0, 37,  0,  7,  0,200,  2,  7,  0,201,  2,  4,  0, 54,  0,  4,  0,202,  2,138,  0,203,  2,137,  0,204,  2,  4,  0,205,  2,
-  4,  0,206,  2,  4,  0,207,  2,  4,  0,197,  2,  7,  0,208,  2,  7,  0,209,  2,  7,  0,210,  2,140,  0,  8,  0,106,  0,109,  2,
-141,  0,211,  2,134,  0,193,  2,  4,  0,212,  2,  4,  0,213,  2,  4,  0,214,  2,  2,  0, 19,  0,  2,  0, 57,  0,142,  0,  8,  0,
-106,  0,109,  2, 32,  0, 45,  0,  2,  0,215,  2,  2,  0, 19,  0,  2,  0,130,  2,  2,  0, 57,  0,  7,  0,216,  2,  7,  0,217,  2,
-143,  0,  5,  0,106,  0,109,  2,  4,  0,218,  2,  2,  0, 19,  0,  2,  0,219,  2,  7,  0,220,  2,144,  0,  7,  0,106,  0,109,  2,
- 81,  0,221,  2,  4,  0,222,  2,  0,  0,223,  2,  0,  0,224,  2,  0,  0,225,  2,  0,  0,226,  2,145,  0,  3,  0,106,  0,109,  2,
-146,  0,227,  2,130,  0,179,  2,147,  0, 10,  0,106,  0,109,  2, 32,  0,228,  2, 32,  0,229,  2,  0,  0,230,  2,  7,  0,231,  2,
-  2,  0,232,  2,  2,  0,233,  2,  0,  0,234,  2,  0,  0,235,  2,  0,  0,115,  2,148,  0,  9,  0,106,  0,109,  2, 32,  0,236,  2,
-  0,  0,230,  2,  7,  0,237,  2,  7,  0,238,  2,  0,  0, 11,  1,  0,  0,130,  2,  0,  0,239,  2,  0,  0, 37,  0,149,  0, 27,  0,
- 27,  0, 31,  0,  2,  0,230,  1,  2,  0,231,  1,  2,  0,240,  2,  2,  0, 19,  0,  2,  0,241,  2,  2,  0,242,  2,  2,  0,243,  2,
-  2,  0, 70,  0,  0,  0,244,  2,  0,  0,245,  2,  0,  0,246,  2,  0,  0, 17,  0,  4,  0, 37,  0,  7,  0,247,  2,  7,  0,248,  2,
-  7,  0,249,  2,  7,  0,250,  2,  7,  0,251,  2,  7,  0,252,  2, 34,  0,253,  2, 36,  0, 80,  0, 38,  0,251,  1, 83,  0, 40,  2,
-  7,  0,254,  2,  7,  0,255,  2,149,  0,  0,  3,150,  0,  3,  0,150,  0,  0,  0,150,  0,  1,  0,  0,  0, 20,  0, 68,  0,  3,  0,
-  7,  0,  1,  3,  4,  0, 19,  0,  4,  0, 37,  0, 32,  0,111,  0, 27,  0, 31,  0, 39,  0, 75,  0,  2,  0, 17,  0,  2,  0,  2,  3,
-  4,  0,  3,  3,  4,  0,  4,  3,  4,  0,  5,  3,  0,  0,  6,  3, 32,  0, 38,  0, 32,  0,  7,  3, 32,  0,  8,  3, 32,  0,  9,  3,
- 32,  0, 10,  3, 36,  0, 80,  0, 74,  0,250,  1, 68,  0,191,  1,151,  0, 11,  3,151,  0, 12,  3,152,  0, 13,  3,  9,  0,  2,  0,
- 12,  0, 14,  3, 12,  0, 34,  2, 12,  0,210,  1, 12,  0, 15,  3, 12,  0, 16,  3, 63,  0,212,  1,  0,  0, 17,  3,  4,  0,213,  1,
-  4,  0, 18,  3,  7,  0,  6,  1,  7,  0, 19,  3,  7,  0, 20,  3,  7,  0,172,  0,  7,  0, 21,  3,  7,  0,  7,  1,  7,  0, 22,  3,
-  7,  0, 23,  3,  7,  0,171,  2,  7,  0, 24,  3,  7,  0,208,  0,  4,  0, 25,  3,  2,  0, 19,  0,  2,  0, 26,  3,  2,  0, 27,  3,
-  2,  0, 28,  3,  2,  0, 29,  3,  2,  0, 30,  3,  2,  0, 31,  3,  2,  0, 32,  3,  2,  0, 33,  3,  2,  0, 34,  3,  2,  0, 35,  3,
-  2,  0, 36,  3,  4,  0, 37,  3,  4,  0, 38,  3,  4,  0, 39,  3,  4,  0, 40,  3,  7,  0, 41,  3,  7,  0, 26,  2,  7,  0, 42,  3,
-  7,  0, 43,  3,  7,  0, 44,  3,  7,  0, 45,  3,  7,  0, 46,  3,  7,  0, 47,  3,  7,  0, 48,  3,  7,  0, 49,  3,  7,  0, 50,  3,
-  7,  0, 51,  3,  0,  0, 52,  3,  0,  0, 53,  3,  0,  0, 54,  3,  0,  0, 55,  3,  7,  0, 56,  3,  7,  0, 57,  3, 12,  0, 58,  3,
- 12,  0, 59,  3, 12,  0, 60,  3, 12,  0, 61,  3,  7,  0, 62,  3,  2,  0, 81,  2,  2,  0, 63,  3,  7,  0, 63,  2,  4,  0, 64,  3,
-  4,  0, 65,  3,153,  0, 66,  3,  2,  0, 67,  3,  2,  0,215,  0,  7,  0, 68,  3, 12,  0, 69,  3, 12,  0, 70,  3, 12,  0, 71,  3,
- 12,  0, 72,  3,154,  0, 73,  3,155,  0, 74,  3, 64,  0, 75,  3,  2,  0, 76,  3,  2,  0, 77,  3,  2,  0, 78,  3,  2,  0, 79,  3,
-  7,  0, 55,  2,  2,  0, 80,  3,  2,  0, 81,  3,146,  0, 82,  3,134,  0, 83,  3,134,  0, 84,  3,  4,  0, 85,  3,  4,  0, 86,  3,
-  4,  0, 87,  3,  4,  0, 70,  0, 12,  0, 88,  3,156,  0, 14,  0,156,  0,  0,  0,156,  0,  1,  0, 32,  0, 38,  0,  7,  0,171,  2,
-  7,  0,  8,  1,  7,  0,172,  2,  7,  0,165,  2,  0,  0, 20,  0,  4,  0,173,  2,  4,  0,174,  2,  4,  0, 89,  3,  2,  0, 17,  0,
-  2,  0, 90,  3,  7,  0,175,  2,154,  0, 36,  0,  2,  0, 91,  3,  2,  0, 92,  3,  2,  0, 19,  0,  2,  0,165,  2,  7,  0, 93,  3,
-  7,  0, 94,  3,  7,  0, 95,  3,  7,  0, 96,  3,  7,  0, 97,  3,  7,  0, 98,  3,  7,  0, 99,  3,  7,  0,100,  3,  7,  0,101,  3,
-  7,  0,102,  3,  7,  0,103,  3,  7,  0,104,  3,  7,  0,105,  3,  7,  0,106,  3,  7,  0,107,  3,  7,  0,108,  3,  7,  0,109,  3,
-  7,  0,110,  3,  7,  0,111,  3,  7,  0,112,  3,  7,  0,113,  3,  7,  0,114,  3,  7,  0,115,  3,  7,  0,116,  3,  2,  0,117,  3,
-  2,  0,118,  3,  2,  0,119,  3,  2,  0,120,  3, 52,  0,165,  0,157,  0,121,  3,  7,  0,122,  3,  4,  0,118,  2,158,  0,  6,  0,
-158,  0,  0,  0,158,  0,  1,  0,  4,  0,123,  3,  4,  0,124,  3,  7,  0,  2,  0,  9,  0,125,  3,130,  0, 15,  0,  4,  0, 19,  0,
-  4,  0,126,  3,  4,  0,127,  3,  4,  0,128,  3,  4,  0,129,  3,  4,  0,130,  3,  4,  0,131,  3,  4,  0,124,  3,  4,  0, 81,  2,
-  4,  0, 57,  0,  0,  0,132,  3,  0,  0,133,  3,  0,  0,134,  3,  0,  0,135,  3, 12,  0,136,  3,159,  0,  1,  0,  7,  0,228,  1,
-153,  0, 30,  0,  4,  0, 19,  0,  7,  0,137,  3,  7,  0,138,  3,  7,  0,139,  3,  4,  0,140,  3,  4,  0,141,  3,  4,  0,142,  3,
-  4,  0,143,  3,  7,  0,144,  3,  7,  0,145,  3,  7,  0,146,  3,  7,  0,147,  3,  7,  0,148,  3,  7,  0,149,  3,  7,  0,150,  3,
-  7,  0,151,  3,  7,  0,152,  3,  7,  0,153,  3,  7,  0,154,  3,  7,  0,155,  3,  7,  0,156,  3,  7,  0,157,  3,  7,  0,158,  3,
-  7,  0,159,  3,  7,  0,160,  3,  7,  0,161,  3,  4,  0,162,  3,  4,  0,163,  3,  7,  0,164,  3,  7,  0, 48,  3,155,  0, 49,  0,
-141,  0,165,  3,  4,  0,124,  3,  4,  0,166,  3,160,  0,167,  3,161,  0,168,  3,  0,  0, 37,  0,  0,  0,169,  3,  2,  0,170,  3,
-  7,  0,171,  3,  0,  0,172,  3,  7,  0,173,  3,  7,  0,174,  3,  7,  0,175,  3,  7,  0,176,  3,  7,  0,177,  3,  7,  0,178,  3,
-  7,  0,179,  3,  7,  0,180,  3,  7,  0,181,  3,  2,  0,182,  3,  0,  0,183,  3,  2,  0,184,  3,  7,  0,185,  3,  7,  0,186,  3,
-  0,  0,187,  3,  4,  0,126,  0,  4,  0,188,  3,  4,  0,189,  3,  2,  0,190,  3,  2,  0,191,  3,159,  0,192,  3,  4,  0,193,  3,
-  4,  0, 82,  0,  7,  0,194,  3,  7,  0,195,  3,  7,  0,196,  3,  7,  0,197,  3,  2,  0,198,  3,  2,  0,199,  3,  2,  0,200,  3,
-  2,  0,201,  3,  2,  0,202,  3,  2,  0,203,  3,  2,  0,204,  3,  2,  0,205,  3,162,  0,206,  3,  7,  0,207,  3,  7,  0,208,  3,
-130,  0,209,  3,146,  0, 48,  0,  2,  0, 17,  0,  2,  0,210,  3,  2,  0,211,  3,  2,  0,212,  3,  7,  0,213,  3,  2,  0,214,  3,
-  2,  0,215,  3,  7,  0,216,  3,  2,  0,217,  3,  2,  0,218,  3,  7,  0,219,  3,  7,  0,220,  3,  7,  0,221,  3,  7,  0,222,  3,
-  7,  0,223,  3,  7,  0,224,  3,  4,  0,225,  3,  7,  0,226,  3,  7,  0,227,  3,  7,  0,228,  3, 77,  0,229,  3, 77,  0,230,  3,
- 77,  0,231,  3,  0,  0,232,  3,  7,  0,233,  3,  7,  0,234,  3, 36,  0, 80,  0,  2,  0,235,  3,  0,  0,236,  3,  0,  0,237,  3,
-  7,  0,238,  3,  4,  0,239,  3,  7,  0,240,  3,  7,  0,241,  3,  4,  0,242,  3,  4,  0, 19,  0,  7,  0,243,  3,  7,  0,244,  3,
-  7,  0,245,  3, 81,  0,246,  3,  7,  0,247,  3,  7,  0,248,  3,  7,  0,249,  3,  7,  0,250,  3,  7,  0,251,  3,  7,  0,252,  3,
-  7,  0,253,  3,  4,  0,254,  3,163,  0, 73,  0, 27,  0, 31,  0, 39,  0, 75,  0,  2,  0,174,  0,  2,  0, 12,  1,  2,  0, 45,  1,
-  2,  0,255,  3,  7,  0,  0,  4,  7,  0,  1,  4,  7,  0,  2,  4,  7,  0,  3,  4,  7,  0,  4,  4,  7,  0,  5,  4,  7,  0,  6,  4,
-  7,  0,  7,  4,  7,  0, 85,  1,  7,  0, 87,  1,  7,  0, 86,  1,  7,  0,  8,  4,  4,  0,  9,  4,  7,  0, 10,  4,  7,  0, 11,  4,
-  7,  0, 12,  4,  7,  0, 13,  4,  7,  0, 14,  4,  7,  0, 15,  4,  7,  0, 16,  4,  2,  0, 17,  4,  2,  0, 11,  1,  2,  0, 18,  4,
-  2,  0, 19,  4,  2,  0, 20,  4,  2,  0, 21,  4,  2,  0, 22,  4,  2,  0, 23,  4,  7,  0, 24,  4,  7,  0, 25,  4,  7,  0, 26,  4,
-  7,  0, 27,  4,  7,  0, 28,  4,  7,  0, 29,  4,  7,  0, 30,  4,  7,  0, 31,  4,  7,  0, 32,  4,  7,  0, 33,  4,  7,  0, 34,  4,
-  7,  0, 35,  4,  2,  0, 36,  4,  2,  0, 37,  4,  2,  0, 38,  4,  2,  0, 39,  4,  7,  0, 40,  4,  7,  0, 41,  4,  7,  0, 42,  4,
-  7,  0, 43,  4,  2,  0, 44,  4,  2,  0, 45,  4,  2,  0, 46,  4,  2,  0, 47,  4,  7,  0, 48,  4,  7,  0, 49,  4,  7,  0, 50,  4,
-  7,  0, 51,  4,  2,  0, 52,  4,  2,  0, 53,  4,  2,  0, 54,  4,  2,  0, 19,  0,  7,  0, 55,  4,  7,  0, 56,  4, 36,  0, 80,  0,
- 51,  0, 75,  1,  2,  0, 76,  1,  2,  0, 77,  1, 30,  0,150,  0,164,  0,  8,  0,164,  0,  0,  0,164,  0,  1,  0,  4,  0, 25,  3,
-  4,  0, 57,  4,  4,  0, 19,  0,  2,  0, 58,  4,  2,  0, 59,  4, 32,  0,164,  0,165,  0, 13,  0,  9,  0, 60,  4,  9,  0, 61,  4,
-  4,  0, 62,  4,  4,  0, 63,  4,  4,  0, 64,  4,  4,  0, 65,  4,  4,  0, 66,  4,  4,  0, 67,  4,  4,  0, 68,  4,  4,  0, 69,  4,
-  4,  0, 70,  4,  4,  0, 37,  0,  0,  0, 71,  4,166,  0,  5,  0,  9,  0, 72,  4,  9,  0, 73,  4,  4,  0, 74,  4,  4,  0, 70,  0,
-  0,  0, 75,  4,167,  0, 13,  0,  4,  0, 17,  0,  4,  0, 76,  4,  4,  0, 77,  4,  4,  0, 78,  4,  4,  0, 79,  4,  4,  0, 80,  4,
-  4,  0, 90,  0,  4,  0, 81,  4,  4,  0, 82,  4,  4,  0, 83,  4,  4,  0, 84,  4,  4,  0, 85,  4, 26,  0, 30,  0,168,  0,  4,  0,
-  4,  0, 86,  4,  7,  0, 87,  4,  2,  0, 19,  0,  2,  0, 77,  1,169,  0, 11,  0,169,  0,  0,  0,169,  0,  1,  0,  0,  0, 20,  0,
- 63,  0, 88,  4, 64,  0, 89,  4,  4,  0, 25,  3,  4,  0, 90,  4,  4,  0, 91,  4,  4,  0, 37,  0,  4,  0, 92,  4,  4,  0, 93,  4,
-170,  0,132,  0,165,  0, 94,  4,166,  0, 95,  4,167,  0, 96,  4,168,  0, 97,  4,  4,  0,194,  2,  4,  0,126,  0,  4,  0,188,  3,
-  4,  0, 98,  4,  4,  0, 99,  4,  4,  0,100,  4,  4,  0,101,  4,  2,  0, 19,  0,  2,  0,102,  4,  7,  0, 26,  2,  7,  0,103,  4,
-  7,  0,104,  4,  7,  0,105,  4,  7,  0,106,  4,  7,  0,107,  4,  2,  0,108,  4,  2,  0,109,  4,  2,  0,110,  4,  2,  0,111,  4,
-  2,  0,214,  0,  2,  0,112,  4,  2,  0,113,  4,  2,  0,120,  3,  2,  0,114,  4,  2,  0,115,  4,  2,  0, 32,  1,  2,  0,106,  0,
-  2,  0,116,  4,  2,  0,117,  4,  2,  0,118,  4,  2,  0,119,  4,  2,  0,120,  4,  2,  0,121,  4,  2,  0,122,  4,  2,  0,123,  4,
-  2,  0,124,  4,  2,  0, 33,  1,  2,  0,125,  4,  2,  0,126,  4,  2,  0,127,  4,  2,  0,128,  4,  4,  0,129,  4,  4,  0, 11,  1,
-  2,  0,130,  4,  2,  0,131,  4,  2,  0,132,  4,  2,  0,133,  4,  2,  0,134,  4,  2,  0,135,  4, 24,  0,136,  4, 24,  0,137,  4,
- 23,  0,138,  4, 12,  0,139,  4,  2,  0,140,  4,  2,  0, 37,  0,  7,  0,141,  4,  7,  0,142,  4,  7,  0,143,  4,  7,  0,144,  4,
-  4,  0,145,  4,  7,  0,146,  4,  7,  0,147,  4,  7,  0,148,  4,  7,  0,149,  4,  2,  0,150,  4,  2,  0,151,  4,  2,  0,152,  4,
-  2,  0,153,  4,  2,  0,154,  4,  2,  0,155,  4,  7,  0,156,  4,  7,  0,157,  4,  7,  0,158,  4,  2,  0,159,  4,  2,  0,160,  4,
-  2,  0,161,  4,  2,  0,162,  4,  2,  0,163,  4,  2,  0,164,  4,  2,  0,165,  4,  2,  0,166,  4,  2,  0,167,  4,  2,  0,168,  4,
-  4,  0,169,  4,  4,  0,170,  4,  4,  0,171,  4,  4,  0,172,  4,  4,  0,173,  4,  7,  0,174,  4,  4,  0,175,  4,  4,  0,176,  4,
-  4,  0,177,  4,  4,  0,178,  4,  7,  0,179,  4,  7,  0,180,  4,  7,  0,181,  4,  7,  0,182,  4,  7,  0,183,  4,  7,  0,184,  4,
-  7,  0,185,  4,  7,  0,186,  4,  7,  0,187,  4,  0,  0,188,  4,  0,  0,189,  4,  4,  0,190,  4,  2,  0,191,  4,  2,  0,160,  1,
-  0,  0,192,  4,  7,  0,193,  4,  7,  0,194,  4,  4,  0,195,  4,  4,  0,196,  4,  7,  0,197,  4,  7,  0,198,  4,  2,  0,199,  4,
-  2,  0,200,  4,  7,  0,201,  4,  2,  0,202,  4,  2,  0,203,  4,  4,  0,204,  4,  2,  0,205,  4,  2,  0,206,  4,  2,  0,207,  4,
-  2,  0,208,  4,  7,  0,209,  4,  7,  0, 70,  0, 42,  0,210,  4,  0,  0,211,  4,171,  0,  9,  0,171,  0,  0,  0,171,  0,  1,  0,
-  0,  0, 20,  0,  2,  0,212,  4,  2,  0,213,  4,  2,  0,214,  4,  2,  0, 43,  0,  7,  0,215,  4,  7,  0, 70,  0,172,  0,  7,  0,
-  2,  0,135,  2,  2,  0, 11,  1,  2,  0,109,  0,  2,  0,216,  4,  7,  0,217,  4,  7,  0, 70,  0, 42,  0,218,  4,173,  0,  5,  0,
-  7,  0,219,  4,  0,  0, 17,  0,  0,  0, 43,  0,  0,  0, 70,  0,  0,  0,160,  1,174,  0, 24,  0,  7,  0, 15,  4,  7,  0, 16,  4,
-  2,  0, 11,  1,  2,  0,220,  4,  2,  0, 18,  4,  2,  0, 19,  4,  2,  0, 20,  4,  2,  0, 21,  4,  2,  0, 22,  4,  2,  0, 23,  4,
-173,  0,221,  4,  2,  0,108,  4,  2,  0,109,  4,  2,  0,110,  4,  2,  0,111,  4,  2,  0,214,  0,  2,  0,112,  4,  2,  0,113,  4,
-  2,  0,120,  3,172,  0,222,  4,  2,  0,223,  4,  2,  0,114,  4,  2,  0,117,  4,  2,  0,118,  4,175,  0,  5,  0,175,  0,  0,  0,
-175,  0,  1,  0,  4,  0,123,  3,  0,  0,132,  3,  4,  0, 19,  0,176,  0,  6,  0,177,  0,224,  4,  2,  0, 19,  0,  2,  0,225,  4,
-  2,  0,226,  4,  2,  0,227,  4,  9,  0,228,  4,178,  0,  4,  0,  2,  0,106,  0,  2,  0,142,  2,  2,  0,126,  3,  2,  0,229,  4,
-179,  0, 10,  0,  2,  0, 19,  0,  2,  0,230,  4,  2,  0,231,  4,  2,  0,232,  4,178,  0,233,  4,  9,  0,228,  4,  7,  0,234,  4,
-  4,  0,235,  4,  4,  0,236,  4,  4,  0, 37,  0,180,  0,  4,  0,180,  0,  0,  0,180,  0,  1,  0,  0,  0,237,  4,  7,  0,238,  4,
-181,  0,  8,  0,182,  0,239,  4,177,  0,224,  4,  7,  0,240,  4,  4,  0, 90,  0,  0,  0,241,  4,  0,  0,242,  4,  0,  0,243,  4,
-  0,  0,244,  4,183,  0,  9,  0,177,  0,224,  4,  7,  0,245,  4,  7,  0,246,  4,  2,  0, 11,  1,  2,  0, 19,  0,  4,  0, 36,  0,
-  4,  0,247,  4, 83,  0,248,  4,  9,  0,228,  4,184,  0, 72,  0,183,  0,249,  4,183,  0,250,  4,181,  0,251,  4,  7,  0,252,  4,
-  2,  0,253,  4,  2,  0,254,  4,  7,  0,255,  4,  7,  0,  0,  5,  2,  0,126,  3,  2,  0,  1,  5,  7,  0,  2,  5,  7,  0,  3,  5,
-  7,  0,  4,  5,  2,  0,  5,  5,  2,  0,236,  4,  2,  0,  6,  5,  2,  0,  7,  5,  2,  0,  8,  5,  2,  0,  9,  5,  7,  0, 10,  5,
-  7,  0, 11,  5,  7,  0, 12,  5,  2,  0, 13,  5,  2,  0, 14,  5,  2,  0, 15,  5,  2,  0, 16,  5,  2,  0, 17,  5,  2,  0, 18,  5,
-  2,  0, 19,  5,176,  0, 20,  5,179,  0, 21,  5,  7,  0, 22,  5,  7,  0, 23,  5,  7,  0, 24,  5,  2,  0, 25,  5,  2,  0, 70,  0,
-  0,  0, 26,  5,  0,  0, 27,  5,  0,  0, 28,  5,  0,  0, 29,  5,  0,  0, 30,  5,  0,  0, 31,  5,  2,  0, 32,  5,  7,  0, 33,  5,
-  7,  0, 34,  5,  7,  0, 35,  5,  7,  0, 36,  5,  7,  0, 37,  5,  7,  0, 38,  5,  7,  0, 39,  5,  7,  0, 40,  5,  7,  0, 41,  5,
-  7,  0, 42,  5,  2,  0, 43,  5,  0,  0, 44,  5,  0,  0, 45,  5,  0,  0, 46,  5,  0,  0, 47,  5, 32,  0, 48,  5,  0,  0, 49,  5,
-  0,  0, 50,  5,  0,  0, 51,  5,  0,  0, 52,  5,  0,  0, 53,  5,  0,  0, 54,  5,  0,  0, 55,  5,  0,  0, 56,  5,  2,  0, 57,  5,
-  2,  0, 58,  5,  2,  0, 59,  5,  2,  0, 60,  5,  2,  0, 61,  5,185,  0,  8,  0,  4,  0, 62,  5,  4,  0, 63,  5,  4,  0, 64,  5,
-  4,  0, 65,  5,  4,  0, 66,  5,  4,  0, 67,  5,  4,  0, 54,  0,  4,  0, 50,  2, 46,  0, 34,  0, 27,  0, 31,  0, 39,  0, 75,  0,
- 32,  0, 68,  5,163,  0, 69,  5, 46,  0, 70,  5, 47,  0,206,  0, 12,  0, 71,  5,164,  0, 72,  5, 32,  0, 73,  5,  7,  0, 74,  5,
-  7,  0, 75,  5,  7,  0, 76,  5,  7,  0, 77,  5,  4,  0, 25,  3,  2,  0, 19,  0,  2,  0,  4,  1, 58,  0,  0,  1,186,  0, 78,  5,
-184,  0, 79,  5,187,  0, 80,  5,170,  0,180,  0,168,  0, 97,  4, 12,  0,100,  0, 12,  0, 81,  5,188,  0, 82,  5,  2,  0, 83,  5,
-  2,  0, 84,  5,  2,  0,215,  0,  2,  0, 85,  5,  4,  0, 86,  5,  4,  0, 87,  5, 12,  0, 88,  5,173,  0,221,  4,174,  0, 89,  5,
-189,  0,  6,  0, 47,  0,206,  0, 45,  0,255,  0,  7,  0, 14,  2,  7,  0, 15,  2,  7,  0,106,  0,  7,  0, 90,  5,190,  0, 35,  0,
-  7,  0, 91,  5,  7,  0, 92,  5,  7,  0, 93,  5,  7,  0, 94,  5,  7,  0, 95,  5,  7,  0, 96,  5,  7,  0, 97,  5,  7,  0, 98,  5,
-  7,  0, 99,  5,  7,  0, 18,  1,  7,  0,100,  5,  7,  0,101,  5,  7,  0,102,  5,  7,  0,103,  5,  7,  0,171,  0,  2,  0,104,  5,
-  2,  0,105,  5,  4,  0,106,  5,  2,  0,107,  5,  2,  0,108,  5,  2,  0,109,  5,  2,  0,110,  5,  7,  0,111,  5, 68,  0,112,  5,
-191,  0,113,  5,190,  0,114,  5,192,  0,115,  5,193,  0,116,  5,194,  0,117,  5,195,  0,118,  5,196,  0,119,  5,  7,  0,120,  5,
-  2,  0,121,  5,  2,  0,122,  5,  4,  0,160,  1,197,  0, 54,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,
-  7,  0,125,  5,  2,  0,126,  5,  7,  0, 99,  5,  7,  0, 18,  1,  7,  0, 43,  0,  4,  0,127,  5,  2,  0,109,  5,  2,  0,110,  5,
- 32,  0, 68,  5, 32,  0,128,  5,189,  0,129,  5,197,  0,114,  5,  0,  0,130,  5,  4,  0, 25,  3,  4,  0,131,  5,  2,  0,132,  5,
-  2,  0,133,  5,  2,  0,134,  5,  2,  0,135,  5,  2,  0,160,  1,  2,  0, 19,  0,  2,  0,136,  5,  2,  0,137,  5,  7,  0,112,  0,
-  7,  0,138,  5,  7,  0,139,  5,  7,  0,140,  5,  7,  0,141,  5,  7,  0,142,  5,  7,  0,171,  0,  7,  0, 74,  5,  2,  0,143,  5,
-  2,  0, 62,  1,  2,  0,144,  5,  2,  0,145,  5,  2,  0,146,  5,  2,  0,147,  5,  2,  0,148,  5,  2,  0,149,  5,  2,  0,150,  5,
-  2,  0,151,  5,  4,  0,152,  5, 12,  0,153,  5,  2,  0,154,  5,  2,  0, 64,  2,  2,  0,155,  5,  0,  0,156,  5,  0,  0,157,  5,
-  9,  0,158,  5,191,  0,113,  5,199,  0, 25,  0, 24,  0, 36,  0, 24,  0, 64,  0, 23,  0,159,  5, 23,  0,160,  5, 23,  0,161,  5,
-  7,  0,162,  5,  7,  0,163,  5,  7,  0,164,  5,  7,  0,165,  5,  2,  0,166,  5,  2,  0,167,  5,  2,  0,168,  5,  2,  0,169,  5,
-  2,  0,170,  5,  2,  0, 19,  0,  2,  0,171,  5,  2,  0,172,  5,  2,  0,173,  5,  2,  0,174,  5,  2,  0,175,  5,  2,  0,135,  5,
-  7,  0,176,  5,  7,  0,177,  5,  4,  0,178,  5,  4,  0,179,  5,198,  0,  6,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,
-  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,200,  0,  8,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,
-  7,  0,125,  5,  2,  0,126,  5,201,  0,180,  5, 46,  0,134,  0,202,  0, 14,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,
-  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,199,  0,181,  5,203,  0,182,  5, 12,  0,183,  5,  2,  0, 11,  1,  2,  0, 19,  0,
-  2,  0,184,  5,  0,  0,185,  5,  0,  0,186,  5,204,  0, 20,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,
-  7,  0,125,  5,  2,  0,126,  5,192,  0,115,  5,199,  0,181,  5,  2,  0,187,  5,  2,  0,188,  5,  2,  0,189,  5,  2,  0,190,  5,
-  2,  0,171,  5,  2,  0,191,  5,  0,  0, 19,  0,  0,  0, 77,  1,  9,  0,250,  1,  4,  0,192,  5,  4,  0,193,  5, 27,  0,194,  5,
-205,  0, 16,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,199,  0,181,  5,
-  7,  0, 14,  2,  7,  0, 15,  2,  2,  0,187,  5,  2,  0,195,  5,  2,  0,196,  5,  2,  0,197,  5,  4,  0, 19,  0,  7,  0,198,  5,
-191,  0,113,  5,206,  0, 15,  0,  0,  0,199,  5,  0,  0,200,  5,  0,  0,201,  5,  2,  0, 19,  0,  2,  0,202,  5,  2,  0,203,  5,
-  2,  0,103,  1,  2,  0,204,  5,  2,  0, 37,  0,  4,  0,205,  5,  4,  0,206,  5,  2,  0,207,  5,  2,  0,208,  5,  0,  0,209,  5,
-  0,  0,210,  5,207,  0, 16,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  4,  0, 37,  0,206,  0,211,  5,
-208,  0,212,  5, 12,  0,213,  5, 12,  0,214,  5,209,  0,215,  5,196,  0,216,  5,210,  0,217,  5,  2,  0,218,  5,  2,  0,219,  5,
-  2,  0,220,  5,  2,  0, 70,  0,211,  0, 17,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,
-  2,  0,126,  5,199,  0,181,  5, 12,  0,221,  5,212,  0,222,  5,  0,  0,223,  5,213,  0,224,  5,  4,  0,225,  5,  4,  0,226,  5,
-  2,  0, 19,  0,  2,  0,227,  5,  2,  0,228,  5,  2,  0, 37,  0,214,  0, 29,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,
-  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5, 47,  0,150,  2, 45,  0,255,  0, 61,  0,229,  5,  2,  0,133,  0,  2,  0,230,  5,
-  2,  0, 70,  0,  2,  0,231,  5,  4,  0, 19,  0,  2,  0,232,  5,  2,  0,186,  5,  2,  0,185,  5,  2,  0,160,  1,  0,  0,233,  5,
-  0,  0,234,  5,  0,  0,235,  5,  0,  0,135,  5,  7,  0, 14,  2,  7,  0, 15,  2,  7,  0,198,  5,  7,  0, 62,  1,  7,  0,236,  5,
-  7,  0,237,  5,191,  0,113,  5,215,  0, 11,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,
-  2,  0,126,  5,  2,  0,184,  5,  2,  0, 19,  0,  4,  0, 37,  0,203,  0,182,  5,199,  0,181,  5,216,  0, 27,  0,198,  0,  0,  0,
-198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5, 42,  0,238,  5,  4,  0,239,  5,  4,  0,240,  5,
-  2,  0, 90,  0,  2,  0,133,  0,  2,  0,241,  5,  0,  0,242,  5,  0,  0,243,  5,  4,  0,244,  5,  4,  0,245,  5,  4,  0,246,  5,
-  4,  0,247,  5,  2,  0,248,  5,  2,  0,249,  5,  7,  0,250,  5, 23,  0,251,  5, 23,  0,252,  5,  4,  0,253,  5,  4,  0,254,  5,
-  0,  0,255,  5,  0,  0,  0,  6,217,  0, 10,  0, 27,  0, 31,  0,  9,  0,  1,  6,  9,  0,  2,  6,  9,  0,  3,  6,  9,  0,  4,  6,
-  9,  0,  5,  6,  4,  0, 90,  0,  4,  0,  6,  6,  0,  0,  7,  6,  0,  0,  8,  6,218,  0, 10,  0,198,  0,  0,  0,198,  0,  1,  0,
- 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,217,  0,  9,  6,  2,  0, 90,  0,  2,  0,133,  0,  4,  0, 43,  0,  9,  0, 10,  6,
-219,  0,  8,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,199,  0,181,  5,  4,  0, 19,  0,
-  4,  0, 11,  6,220,  0, 23,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,
-199,  0,181,  5, 27,  0, 12,  6, 27,  0, 81,  0,  2,  0, 19,  0,  2,  0,133,  0,  7,  0, 13,  6,  9,  0, 14,  6,  7,  0, 14,  2,
-  7,  0, 15,  2,  7,  0, 15,  6,  7,  0, 16,  6, 58,  0,  0,  1, 58,  0, 17,  6,  4,  0, 18,  6,  2,  0, 19,  6,  2,  0, 37,  0,
-191,  0,113,  5,221,  0, 10,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,
-  2,  0, 19,  0,  2,  0, 34,  3,  4,  0, 37,  0,191,  0,113,  5,222,  0, 42,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,
-  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,199,  0,181,  5,208,  0,212,  5,  0,  0,199,  5,  0,  0,200,  5,  0,  0,201,  5,
-  2,  0, 17,  0,  2,  0,208,  5,  2,  0, 19,  0,  2,  0,202,  5,  9,  0, 14,  6,  4,  0,205,  5,  4,  0, 20,  6,  4,  0, 21,  6,
-  4,  0,206,  5, 23,  0, 22,  6, 23,  0, 23,  6,  7,  0, 24,  6,  7,  0, 25,  6,  7,  0, 26,  6,  7,  0, 13,  6,  2,  0, 27,  6,
-  2,  0,205,  0,  2,  0,103,  1,  2,  0,204,  5,  2,  0, 37,  0,  2,  0, 43,  0,  2,  0, 28,  6,  2,  0, 29,  6,  9,  0, 30,  6,
-  9,  0, 31,  6,  9,  0, 32,  6,  9,  0, 33,  6,  9,  0, 34,  6,  2,  0, 35,  6,  0,  0,210,  5, 57,  0, 36,  6,223,  0,  7,  0,
-223,  0,  0,  0,223,  0,  1,  0,  4,  0, 37,  6,  4,  0, 23,  0,  0,  0, 84,  0,  4,  0, 38,  6,  4,  0, 17,  0,224,  0, 13,  0,
-198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,  4,  0, 17,  0,  4,  0, 39,  6,
-  4,  0, 19,  0,  4,  0,241,  5, 12,  0, 40,  6, 12,  0, 41,  6,  0,  0, 42,  6,225,  0,  7,  0,225,  0,  0,  0,225,  0,  1,  0,
-  0,  0, 43,  6,  2,  0, 44,  6,  2,  0, 45,  6,  2,  0, 46,  6,  2,  0, 37,  0,226,  0, 12,  0,  2,  0, 45,  6,  2,  0, 47,  6,
-  2,  0, 48,  6,  0,  0,115,  2,  2,  0, 49,  6,  2,  0, 50,  6,  2,  0, 51,  6,  2,  0, 52,  6,  2,  0, 53,  6,  2,  0,171,  5,
-  7,  0, 54,  6,  7,  0, 55,  6,227,  0, 18,  0,227,  0,  0,  0,227,  0,  1,  0,  0,  0,132,  3,226,  0, 56,  6,226,  0, 57,  6,
-226,  0, 58,  6,226,  0, 59,  6,  7,  0, 60,  6,  2,  0, 61,  6,  2,  0, 62,  6,  2,  0, 63,  6,  2,  0, 64,  6,  2,  0, 65,  6,
-  2,  0, 66,  6,  2,  0, 67,  6,  2,  0, 68,  6,  2,  0, 69,  6,  2,  0, 70,  6,228,  0, 10,  0,  0,  0, 71,  6,  0,  0, 72,  6,
-  0,  0, 73,  6,  0,  0, 74,  6,  0,  0, 75,  6,  0,  0, 76,  6,  2,  0, 77,  6,  2,  0, 78,  6,  2,  0, 79,  6,  2,  0, 37,  0,
-229,  0,  8,  0,  0,  0, 80,  6,  0,  0, 81,  6,  0,  0, 82,  6,  0,  0, 83,  6,  0,  0, 84,  6,  0,  0, 85,  6,  7,  0, 90,  5,
-  7,  0, 37,  0,230,  0, 17,  0,228,  0, 86,  6,228,  0, 87,  6,228,  0, 88,  6,228,  0, 89,  6,228,  0, 90,  6,228,  0, 91,  6,
-228,  0, 92,  6,228,  0, 93,  6,228,  0, 94,  6,228,  0, 95,  6,228,  0, 96,  6,228,  0, 97,  6,228,  0, 98,  6,228,  0, 99,  6,
-228,  0,100,  6,229,  0,101,  6,  0,  0,102,  6,231,  0, 71,  0,  0,  0,103,  6,  0,  0,104,  6,  0,  0, 75,  6,  0,  0,105,  6,
-  0,  0,106,  6,  0,  0,107,  6,  0,  0,108,  6,  0,  0,109,  6,  0,  0,110,  6,  0,  0,111,  6,  0,  0,112,  6,  0,  0,113,  6,
-  0,  0,114,  6,  0,  0,115,  6,  0,  0,116,  6,  0,  0,117,  6,  0,  0,118,  6,  0,  0,119,  6,  0,  0,120,  6,  0,  0,121,  6,
-  0,  0,122,  6,  0,  0,123,  6,  0,  0,124,  6,  0,  0,125,  6,  0,  0,126,  6,  0,  0,127,  6,  0,  0,128,  6,  0,  0,129,  6,
-  0,  0,130,  6,  0,  0,131,  6,  0,  0,132,  6,  0,  0,133,  6,  0,  0,134,  6,  0,  0,135,  6,  0,  0,136,  6,  0,  0,137,  6,
-  0,  0,138,  6,  0,  0,139,  6,  0,  0,140,  6,  0,  0,141,  6,  0,  0,142,  6,  0,  0,143,  6,  0,  0,144,  6,  0,  0,145,  6,
-  0,  0,146,  6,  0,  0,147,  6,  0,  0,148,  6,  0,  0,149,  6,  0,  0,150,  6,  0,  0,151,  6,  0,  0,152,  6,  0,  0,153,  6,
-  0,  0,154,  6,  0,  0,155,  6,  0,  0,156,  6,  0,  0,157,  6,  0,  0,158,  6,  0,  0,159,  6,  0,  0,160,  6,  0,  0,161,  6,
-  0,  0,162,  6,  0,  0,163,  6,  0,  0,164,  6,  0,  0,165,  6,  0,  0,166,  6,  0,  0,167,  6,  0,  0,168,  6,  0,  0,169,  6,
-  0,  0,170,  6,  0,  0,171,  6,  0,  0, 92,  0,232,  0,  5,  0,  0,  0,172,  6,  0,  0,127,  6,  0,  0,129,  6,  2,  0, 19,  0,
-  2,  0, 37,  0,233,  0, 21,  0,233,  0,  0,  0,233,  0,  1,  0,  0,  0, 20,  0,230,  0,173,  6,231,  0,174,  6,231,  0,175,  6,
-231,  0,176,  6,231,  0,177,  6,231,  0,178,  6,231,  0,179,  6,231,  0,180,  6,231,  0,181,  6,231,  0,182,  6,231,  0,183,  6,
-231,  0,184,  6,231,  0,185,  6,231,  0,186,  6,231,  0,187,  6,231,  0,188,  6,231,  0,189,  6,232,  0,190,  6,234,  0,  5,  0,
-  4,  0, 19,  0,  4,  0, 37,  0,  7,  0, 63,  2,  7,  0,191,  6,  7,  0,228,  1,235,  0, 67,  0,  4,  0, 19,  0,  4,  0,192,  6,
-  4,  0,193,  6,  0,  0,194,  6,  0,  0,195,  6,  0,  0,196,  6,  0,  0,197,  6,  0,  0,198,  6,  0,  0,199,  6,  0,  0,200,  6,
-  0,  0,201,  6,  0,  0,202,  6,  2,  0,203,  6,  2,  0, 37,  0,  4,  0,204,  6,  4,  0,205,  6,  4,  0,206,  6,  4,  0,207,  6,
-  2,  0,208,  6,  2,  0,209,  6,  4,  0,210,  6,  4,  0, 40,  6,  4,  0,211,  6,  2,  0,212,  6,  2,  0,213,  6,  2,  0,214,  6,
-  2,  0,215,  6, 12,  0,216,  6, 12,  0,217,  6, 12,  0,218,  6,  2,  0,219,  6,  2,  0,220,  6,  2,  0,221,  6,  2,  0,222,  6,
-  2,  0,223,  6,  2,  0,224,  6,  2,  0,225,  6,  2,  0,226,  6,234,  0,227,  6,  2,  0,228,  6,  2,  0,229,  6,  2,  0,230,  6,
-  2,  0,231,  6,  2,  0,232,  6,  2,  0,233,  6,  2,  0,234,  6,  2,  0,235,  6,  4,  0,236,  6,  4,  0,237,  6,  2,  0,238,  6,
-  2,  0,239,  6,  2,  0,240,  6,  2,  0,241,  6,  2,  0,242,  6,  2,  0,243,  6,  2,  0,244,  6,  2,  0,245,  6,  2,  0,246,  6,
-  2,  0,247,  6,  2,  0,248,  6,  2,  0,249,  6,  0,  0,250,  6,  0,  0,251,  6,  7,  0,252,  6,  2,  0, 25,  5,  2,  0,253,  6,
- 55,  0,254,  6,201,  0, 21,  0, 27,  0, 31,  0, 12,  0,255,  6, 12,  0,  0,  7, 12,  0,  1,  7, 12,  0,123,  5, 46,  0,134,  0,
- 46,  0,  2,  7,  2,  0,  3,  7,  2,  0,  4,  7,  2,  0,  5,  7,  2,  0,  6,  7,  2,  0,  7,  7,  2,  0,  8,  7,  2,  0,  9,  7,
-  2,  0, 37,  0,  2,  0, 10,  7,  2,  0, 11,  7,  4,  0, 70,  0,196,  0, 12,  7,  9,  0, 13,  7,  2,  0, 14,  7,236,  0,  5,  0,
-236,  0,  0,  0,236,  0,  1,  0,236,  0, 15,  7, 13,  0, 16,  7,  4,  0, 19,  0,237,  0,  7,  0,237,  0,  0,  0,237,  0,  1,  0,
-236,  0, 17,  7,236,  0, 18,  7,  2,  0,137,  4,  2,  0, 19,  0,  4,  0, 37,  0,238,  0, 23,  0,238,  0,  0,  0,238,  0,  1,  0,
-239,  0, 19,  7,240,  0,217,  5,  0,  0, 20,  7,  0,  0, 21,  7,  0,  0, 22,  7,  2,  0, 23,  7,  2,  0, 24,  7,  2,  0, 25,  7,
-  2,  0, 26,  7,  2,  0, 27,  7,  2,  0, 37,  0,  2,  0, 19,  0,  2,  0, 28,  7,  2,  0, 29,  7,  2,  0, 30,  7,  4,  0, 31,  7,
-238,  0, 32,  7,  9,  0, 33,  7,  4,  0, 34,  7,  4,  0, 35,  7,  0,  0, 36,  7,241,  0, 22,  0,241,  0,  0,  0,241,  0,  1,  0,
-236,  0, 17,  7,236,  0, 18,  7,236,  0, 37,  7,236,  0, 38,  7,201,  0, 39,  7, 23,  0, 52,  0,  0,  0,124,  5,  0,  0, 40,  7,
-  2,  0,172,  5,  2,  0,173,  5,  2,  0, 41,  7,  2,  0, 37,  0,  2,  0,  6,  7,  2,  0, 38,  6,  2,  0, 19,  0,242,  0, 19,  7,
- 12,  0, 42,  7, 12,  0,123,  5, 12,  0, 43,  7, 12,  0, 44,  7,243,  0, 21,  0,243,  0,  0,  0,243,  0,  1,  0,199,  0,181,  5,
- 23,  0, 45,  7, 23,  0, 46,  7,  2,  0,172,  5,  2,  0,173,  5,  2,  0, 47,  7,  2,  0, 48,  7,  2,  0, 49,  7,  2,  0, 19,  0,
-  7,  0, 10,  2,  2,  0,  5,  7,  2,  0,  9,  7,  4,  0, 43,  0,244,  0, 19,  7, 12,  0, 50,  7, 12,  0, 51,  7, 12,  0, 43,  7,
-  0,  0, 52,  7,  9,  0, 53,  7,245,  0, 11,  0,  0,  0, 54,  7,  2,  0, 55,  7,  2,  0, 56,  7,  2,  0, 57,  7,  2,  0, 58,  7,
-  2,  0,126,  4,  2,  0,121,  4,201,  0, 59,  7, 46,  0, 60,  7,  4,  0, 61,  7,  4,  0, 62,  7,246,  0,  1,  0,  0,  0, 63,  7,
-247,  0,  8,  0, 57,  0, 64,  7, 57,  0, 65,  7,247,  0, 66,  7,247,  0, 67,  7,247,  0, 68,  7,  2,  0,129,  0,  2,  0, 19,  0,
-  4,  0, 69,  7,248,  0,  4,  0,  4,  0,239,  5,  4,  0, 70,  7,  4,  0,244,  5,  4,  0, 71,  7,249,  0,  2,  0,  4,  0, 72,  7,
-  4,  0, 73,  7,250,  0,  7,  0,  7,  0, 74,  7,  7,  0, 75,  7,  7,  0, 76,  7,  4,  0, 19,  0,  4,  0, 37,  0,  7,  0, 10,  4,
-  7,  0, 77,  7,251,  0,  6,  0,  0,  0, 78,  7,  0,  0,201,  5, 49,  0,137,  0,  2,  0,106,  0,  2,  0,125,  4,  4,  0, 37,  0,
-252,  0, 21,  0,252,  0,  0,  0,252,  0,  1,  0,  4,  0, 57,  0,  4,  0, 23,  0,  4,  0, 28,  0,  4,  0, 79,  7,  4,  0, 80,  7,
-  4,  0, 81,  7,246,  0, 82,  7,  0,  0, 78,  7,  4,  0, 83,  7,  4,  0, 84,  7,251,  0,  8,  3,248,  0, 85,  7,249,  0, 86,  7,
-250,  0, 87,  7,247,  0, 88,  7,247,  0, 89,  7,247,  0, 90,  7, 57,  0, 91,  7, 57,  0, 92,  7,253,  0, 12,  0,  0,  0,190,  1,
-  9,  0,191,  0,  0,  0,192,  0,  4,  0,195,  0,  4,  0,203,  0,  9,  0,196,  0,  7,  0,198,  0,  7,  0,199,  0,  9,  0, 93,  7,
-  9,  0, 94,  7,  9,  0,200,  0,  9,  0,202,  0,254,  0, 43,  0,254,  0,  0,  0,254,  0,  1,  0,  9,  0, 95,  7,  9,  0, 26,  0,
-  0,  0, 27,  0,  4,  0, 19,  0,  4,  0, 17,  0,  4,  0, 23,  0,  4,  0, 88,  0,  4,  0, 96,  7,  4,  0, 97,  7,  4,  0, 80,  7,
-  4,  0, 81,  7,  4,  0, 98,  7,  4,  0,214,  0,  4,  0, 99,  7,  4,  0,100,  7,  7,  0,246,  4,  7,  0,101,  7,  4,  0,126,  0,
-  4,  0,102,  7,252,  0,103,  7, 36,  0, 80,  0, 46,  0,134,  0, 49,  0,137,  0,  7,  0,104,  7,  7,  0,105,  7,253,  0,  1,  1,
-254,  0,106,  7,254,  0,107,  7,254,  0,108,  7, 12,  0,109,  7,255,  0,110,  7,  0,  1,111,  7,  7,  0,112,  7,  7,  0,113,  7,
-  4,  0,114,  7,  7,  0,115,  7,  9,  0,116,  7,  4,  0,117,  7,  4,  0,118,  7,  4,  0,119,  7,  7,  0,120,  7,  1,  1,  4,  0,
-  1,  1,  0,  0,  1,  1,  1,  0, 12,  0,121,  7,254,  0,122,  7,186,  0,  6,  0, 12,  0,123,  7, 12,  0,109,  7, 12,  0,124,  7,
-254,  0,125,  7,  0,  0,126,  7,  0,  0,127,  7,  2,  1,  4,  0,  7,  0,128,  7,  7,  0,109,  0,  2,  0,129,  7,  2,  0,130,  7,
-  3,  1,  6,  0,  7,  0,131,  7,  7,  0,132,  7,  7,  0,133,  7,  7,  0,134,  7,  4,  0,135,  7,  4,  0,136,  7,  4,  1, 12,  0,
-  7,  0,137,  7,  7,  0,138,  7,  7,  0,139,  7,  7,  0,140,  7,  7,  0,141,  7,  7,  0,142,  7,  7,  0,143,  7,  7,  0,144,  7,
-  7,  0,145,  7,  7,  0,146,  7,  4,  0,154,  2,  4,  0,147,  7,  5,  1,  2,  0,  7,  0,219,  4,  7,  0, 37,  0,  6,  1,  5,  0,
-  7,  0,148,  7,  7,  0,149,  7,  4,  0, 90,  0,  4,  0,116,  2,  4,  0,150,  7,  7,  1,  6,  0,  7,  1,  0,  0,  7,  1,  1,  0,
-  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,151,  7,  2,  0, 57,  0,  8,  1,  8,  0,  8,  1,  0,  0,  8,  1,  1,  0,  2,  0, 17,  0,
-  2,  0, 19,  0,  2,  0,151,  7,  2,  0, 57,  0,  7,  0, 23,  0,  7,  0,126,  0,  9,  1, 45,  0,  9,  1,  0,  0,  9,  1,  1,  0,
-  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,151,  7,  2,  0,210,  0,  2,  0,182,  3,  2,  0,152,  7,  7,  0,153,  7,  7,  0, 89,  0,
-  7,  0,167,  2,  4,  0,154,  7,  4,  0, 82,  0,  4,  0,118,  2,  7,  0,155,  7,  7,  0,156,  7,  7,  0,157,  7,  7,  0,158,  7,
-  7,  0,159,  7,  7,  0,160,  7,  7,  0,164,  2,  7,  0,254,  0,  7,  0,161,  7,  7,  0,162,  7,  7,  0, 37,  0,  7,  0,163,  7,
-  7,  0,164,  7,  7,  0,165,  7,  2,  0,166,  7,  2,  0,167,  7,  2,  0,168,  7,  2,  0,169,  7,  2,  0,170,  7,  2,  0,171,  7,
-  2,  0,172,  7,  2,  0,173,  7,  2,  0,136,  5,  2,  0,174,  7,  2,  0,210,  1,  2,  0,175,  7,  0,  0,176,  7,  0,  0,177,  7,
-  7,  0,208,  0, 10,  1,178,  7, 64,  0,163,  1, 11,  1, 16,  0, 11,  1,  0,  0, 11,  1,  1,  0,  2,  0, 17,  0,  2,  0, 19,  0,
-  2,  0,151,  7,  2,  0,210,  0,  7,  0,159,  2,  7,  0,160,  2,  7,  0,161,  2,  7,  0,255,  1,  7,  0,162,  2,  7,  0,163,  2,
-  7,  0,179,  7,  7,  0,164,  2,  7,  0,166,  2,  7,  0,167,  2,213,  0,  5,  0,  2,  0, 17,  0,  2,  0, 69,  7,  2,  0, 19,  0,
-  2,  0,180,  7, 27,  0, 12,  6,212,  0,  3,  0,  4,  0, 69,  0,  4,  0,181,  7,213,  0,  2,  0, 12,  1,  7,  0, 12,  1,  0,  0,
- 12,  1,  1,  0,  0,  0, 20,  0,  2,  0, 17,  0,  2,  0, 19,  0,  4,  0, 22,  0,  9,  0,182,  7, 13,  1,  5,  0,  0,  0, 20,  0,
-  7,  0, 18,  1,  7,  0,183,  7,  4,  0,184,  7,  4,  0, 37,  0, 14,  1,  4,  0,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0, 43,  0,
-  2,  0, 70,  0, 15,  1,  4,  0,  0,  0, 20,  0, 63,  0,185,  7,  7,  0, 18,  1,  7,  0, 37,  0, 16,  1,  6,  0,  2,  0,186,  7,
-  2,  0,187,  7,  2,  0, 17,  0,  2,  0,188,  7,  0,  0,189,  7,  0,  0,190,  7, 17,  1,  5,  0,  4,  0, 17,  0,  4,  0, 37,  0,
-  0,  0, 20,  0,  0,  0,191,  7,  0,  0,192,  7, 18,  1,  3,  0,  4,  0, 17,  0,  4,  0, 37,  0,  0,  0, 20,  0, 19,  1,  4,  0,
-  2,  0,193,  7,  2,  0,194,  7,  2,  0, 19,  0,  2,  0, 37,  0, 20,  1,  6,  0,  0,  0, 20,  0,  0,  0,195,  7,  2,  0,196,  7,
-  2,  0,164,  2,  2,  0, 11,  1,  2,  0, 70,  0, 21,  1,  5,  0,  0,  0, 20,  0,  7,  0,109,  0,  7,  0, 12,  4,  2,  0, 19,  0,
-  2,  0,130,  2, 22,  1,  3,  0,  0,  0, 20,  0,  4,  0,118,  2,  4,  0,193,  7, 23,  1,  7,  0,  0,  0, 20,  0,  7,  0, 12,  4,
-  0,  0,197,  7,  0,  0,198,  7,  2,  0, 11,  1,  2,  0, 43,  0,  4,  0,199,  7, 24,  1,  3,  0, 32,  0,200,  7,  0,  0,201,  7,
-  0,  0,202,  7, 25,  1, 18,  0, 25,  1,  0,  0, 25,  1,  1,  0,  2,  0, 17,  0,  2,  0,203,  7,  2,  0, 19,  0,  2,  0,204,  7,
-  2,  0,205,  7,  2,  0,206,  7,  2,  0, 43,  0,  2,  0, 70,  0,  0,  0, 20,  0,  9,  0,  2,  0, 26,  1,207,  7, 32,  0, 45,  0,
-  2,  0,229,  4,  2,  0,112,  7,  2,  0,208,  7,  2,  0, 37,  0, 27,  1, 11,  0,  0,  0, 20,  0,  0,  0, 17,  0,  0,  0,209,  7,
-  2,  0, 19,  0,  2,  0,130,  2,  2,  0,210,  7,  4,  0,211,  7,  4,  0,212,  7,  4,  0,213,  7,  4,  0,214,  7,  4,  0,215,  7,
- 28,  1,  1,  0,  0,  0,216,  7, 29,  1,  4,  0, 42,  0,238,  5,  0,  0,217,  7,  4,  0, 11,  1,  4,  0, 19,  0, 26,  1, 18,  0,
- 26,  1,  0,  0, 26,  1,  1,  0, 26,  1,218,  7,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,219,  7,  2,  0,206,  7,  2,  0,203,  7,
-  2,  0,220,  7,  2,  0, 70,  0,  2,  0,160,  1,  0,  0, 20,  0,  9,  0,  2,  0, 30,  1,207,  7, 25,  1,221,  7,  2,  0, 15,  0,
-  2,  0,222,  7,  4,  0,223,  7, 31,  1,  3,  0,  4,  0,190,  2,  4,  0, 37,  0, 32,  0, 45,  0, 32,  1, 12,  0,151,  0,224,  7,
-  2,  0, 17,  0,  2,  0, 19,  0,  4,  0,153,  7,  4,  0, 89,  0,  0,  0, 20,  0,  0,  0,225,  7,  2,  0,226,  7,  2,  0,227,  7,
-  2,  0,228,  7,  2,  0,229,  7,  7,  0,230,  7, 33,  1, 10,  0,  2,  0, 19,  0,  2,  0,231,  7,  4,  0,153,  7,  4,  0, 89,  0,
-  2,  0,232,  7,255,  0,110,  7,  2,  0, 17,  0,  2,  0,233,  7,  2,  0,234,  7,  2,  0,235,  7, 34,  1,  7,  0,  2,  0, 19,  0,
-  2,  0,231,  7,  4,  0,153,  7,  4,  0, 89,  0,  2,  0, 17,  0,  2,  0,236,  7,  7,  0,139,  3, 35,  1, 11,  0,  4,  0,190,  2,
-  2,  0, 17,  0,  2,  0, 19,  0, 32,  0, 45,  0, 77,  0,237,  7,  0,  0, 20,  0,  7,  0,238,  7,  7,  0,239,  7,  7,  0, 42,  3,
-  2,  0,240,  7,  2,  0,241,  7, 36,  1,  5,  0,  2,  0, 17,  0,  2,  0, 19,  0,  4,  0, 37,  0, 46,  0,134,  0, 32,  0, 68,  5,
- 37,  1,  5,  0,  4,  0, 19,  0,  4,  0, 17,  0,  0,  0, 20,  0,  0,  0,191,  7, 32,  0, 45,  0, 38,  1, 13,  0,  2,  0, 19,  0,
-  2,  0, 17,  0,  2,  0,203,  7,  2,  0, 43,  3,  7,  0,242,  7,  7,  0,243,  7,  7,  0,  6,  1,  7,  0,  7,  1,  7,  0, 19,  3,
-  7,  0, 22,  3,  7,  0,244,  7,  7,  0,245,  7, 32,  0,246,  7, 39,  1, 10,  0,  2,  0, 19,  0,  2,  0, 17,  0,  4,  0,153,  7,
-  4,  0, 89,  0,  0,  0, 20,  0,  0,  0,225,  7,  2,  0, 43,  0,  2,  0, 64,  0,  2,  0,247,  7,  2,  0,248,  7, 40,  1,  8,  0,
- 32,  0, 45,  0,  7,  0,161,  2,  7,  0,249,  7,  7,  0,250,  7,  7,  0,156,  2,  2,  0, 19,  0,  2,  0,130,  2,  7,  0,251,  7,
- 41,  1, 12,  0,  2,  0, 17,  0,  2,  0, 11,  1,  2,  0, 19,  0,  2,  0,164,  2,  2,  0,190,  2,  2,  0,252,  7,  4,  0, 37,  0,
-  7,  0,253,  7,  7,  0,254,  7,  7,  0,255,  7,  7,  0,  0,  8,  0,  0,  1,  8, 42,  1, 10,  0,  2,  0, 19,  0,  2,  0, 17,  0,
-  4,  0,153,  7,  4,  0, 89,  0,  0,  0, 20,  0,  2,  0, 77,  1,  2,  0, 64,  0,  2,  0,247,  7,  2,  0,248,  7, 64,  0,163,  1,
- 43,  1,  7,  0,  4,  0,118,  2,  4,  0,  2,  8,  4,  0,  3,  8,  4,  0,  4,  8,  7,  0,  5,  8,  7,  0,  6,  8,  0,  0,197,  7,
- 44,  1,  7,  0,  0,  0,  7,  8, 32,  0,  8,  8,  0,  0,201,  7,  2,  0,  9,  8,  2,  0, 43,  0,  4,  0, 70,  0,  0,  0,202,  7,
- 45,  1,  6,  0,  2,  0, 19,  0,  2,  0, 17,  0,  4,  0,153,  7,  4,  0, 89,  0,  0,  0, 10,  8,  0,  0, 11,  8, 46,  1,  1,  0,
-  4,  0, 19,  0, 47,  1,  6,  0,  0,  0, 92,  0,  2,  0, 17,  0,  2,  0, 19,  0,  4,  0, 12,  8,  7,  0, 13,  8, 42,  0,238,  5,
- 48,  1,  4,  0,  0,  0,179,  0,  2,  0, 19,  0,  4,  0, 17,  0, 32,  0, 45,  0, 49,  1,  2,  0,  4,  0, 17,  0,  4,  0,161,  5,
- 30,  1, 10,  0, 30,  1,  0,  0, 30,  1,  1,  0, 30,  1,218,  7,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,203,  7,  2,  0, 14,  8,
-  0,  0, 20,  0,  9,  0,  2,  0, 32,  0, 45,  0, 50,  1, 10,  0,  7,  0, 42,  3,  7,  0, 15,  8,  7,  0, 16,  8,  7,  0, 17,  8,
-  7,  0, 18,  8,  4,  0, 19,  0,  7,  0,252,  7,  7,  0, 19,  8,  7,  0, 20,  8,  7,  0, 37,  0,255,  0, 20,  0, 27,  0, 31,  0,
-  0,  0,190,  0, 51,  1, 21,  8,  9,  0, 22,  8, 43,  0,149,  0, 43,  0, 23,  8,  9,  0, 24,  8, 36,  0, 80,  0,  7,  0,139,  3,
-  7,  0, 25,  8,  7,  0, 26,  8,  7,  0, 27,  8,  7,  0, 28,  8,  7,  0, 29,  8,  7,  0, 30,  8,  4,  0, 90,  0,  4,  0, 31,  8,
-  0,  0, 32,  8,  0,  0, 33,  8,  0,  0, 34,  8, 52,  1,  6,  0, 27,  0, 31,  0,  7,  0, 35,  8,  7,  0, 36,  8,  7,  0, 37,  8,
-  2,  0, 38,  8,  2,  0, 39,  8, 53,  1, 15,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,  4,  0,124,  5,  7,  0,125,  5,
-241,  0, 40,  8,199,  0,181,  5,255,  0,110,  7,  2,  0, 11,  1,  2,  0,231,  7,  2,  0, 14,  2,  2,  0, 15,  2,  2,  0, 19,  0,
-  2,  0,186,  5,  4,  0, 70,  0, 54,  1,  6,  0, 54,  1,  0,  0, 54,  1,  1,  0, 32,  0, 45,  0,  9,  0, 41,  8,  4,  0,215,  0,
-  4,  0, 37,  0, 64,  0,  4,  0, 27,  0, 31,  0, 12,  0, 42,  8,  4,  0,131,  0,  7,  0, 43,  8, 55,  1, 25,  0, 55,  1,  0,  0,
- 55,  1,  1,  0, 55,  1, 38,  0, 12,  0, 44,  8,  0,  0, 20,  0,  7,  0, 45,  8,  7,  0, 46,  8,  7,  0, 47,  8,  7,  0, 48,  8,
-  4,  0, 19,  0,  7,  0, 49,  8,  7,  0, 50,  8,  7,  0, 51,  8,  7,  0, 18,  1,  7,  0,220,  1,  7,  0, 52,  8,  7,  0,116,  2,
-  7,  0, 53,  8,  7,  0, 54,  8,  7,  0, 55,  8,  7,  0, 56,  8,  7,  0, 57,  8,  7,  0,172,  0,  2,  0,131,  0,  2,  0,  6,  5,
- 56,  1, 21,  0, 27,  0, 31,  0, 12,  0, 58,  8, 12,  0, 59,  8, 12,  0, 60,  8,  9,  0, 61,  8,  4,  0, 19,  0,  4,  0,132,  5,
-  2,  0,168,  2,  2,  0,192,  5,  2,  0,131,  0,  2,  0, 62,  8,  2,  0, 63,  8,  2,  0, 64,  8,  2,  0, 65,  8,  2,  0, 66,  8,
-  4,  0, 67,  8,  4,  0, 68,  8,  4,  0, 69,  8,  4,  0, 70,  8,  4,  0, 71,  8,  4,  0, 72,  8, 57,  1, 38,  0, 57,  1,  0,  0,
- 57,  1,  1,  0, 26,  0, 73,  8, 12,  0, 69,  3,  0,  0, 20,  0,  2,  0, 19,  0,  2,  0, 74,  8,  2,  0, 75,  8,  2,  0, 76,  8,
-  2,  0, 28,  3,  2,  0, 77,  8,  4,  0,253,  1,  4,  0, 69,  8,  4,  0, 70,  8, 55,  1, 78,  8, 57,  1, 38,  0, 57,  1, 79,  8,
- 12,  0, 80,  8,  9,  0, 81,  8,  9,  0, 82,  8,  9,  0, 83,  8,  7,  0,  6,  1,  7,  0,172,  0,  7,  0, 84,  8,  7,  0,200,  1,
-  2,  0, 85,  8,  2,  0, 37,  0,  7,  0, 86,  8,  7,  0, 87,  8,  7,  0, 24,  3,  7,  0, 88,  8,  7,  0, 89,  8,  7,  0, 90,  8,
-  7,  0, 91,  8,  7,  0, 92,  8,  7,  0, 93,  8,  7,  0,250,  1, 32,  0, 94,  8,152,  0,  9,  0, 12,  0, 95,  8,  2,  0, 19,  0,
-  2,  0, 96,  8,  7,  0, 26,  2,  7,  0, 97,  8,  7,  0, 98,  8, 12,  0, 99,  8,  4,  0,100,  8,  4,  0, 37,  0, 58,  1,  7,  0,
- 58,  1,  0,  0, 58,  1,  1,  0, 12,  0, 32,  8,  4,  0, 19,  0,  4,  0,101,  8,  0,  0,132,  3,232,  0,102,  8,151,  0,  7,  0,
- 27,  0, 31,  0, 12,  0,103,  8, 12,  0, 95,  8, 12,  0,104,  8, 12,  0,100,  0,  4,  0, 19,  0,  4,  0,105,  8,203,  0,  4,  0,
- 27,  0,106,  8, 12,  0, 95,  8,  4,  0,107,  8,  4,  0, 19,  0, 59,  1, 17,  0,198,  0,  0,  0,198,  0,  1,  0, 12,  0,123,  5,
-  4,  0,124,  5,  7,  0,125,  5,  2,  0,126,  5,199,  0,181,  5,151,  0, 11,  3,203,  0,108,  8,  0,  0, 11,  1,  0,  0,184,  5,
-  2,  0, 19,  0,  2,  0,109,  8,  2,  0,185,  5,  2,  0,186,  5,  2,  0,110,  8,  7,  0,111,  8, 60,  1,  8,  0, 60,  1,  0,  0,
- 60,  1,  1,  0, 58,  1,112,  8, 36,  0, 80,  0, 12,  0, 14,  3,  4,  0, 19,  0,  0,  0, 20,  0,  4,  0,113,  8, 61,  1,  5,  0,
- 61,  1,  0,  0, 61,  1,  1,  0, 36,  0, 80,  0,  2,  0, 19,  0,  0,  0,114,  8, 62,  1, 12,  0, 62,  1,  0,  0, 62,  1,  1,  0,
-  9,  0,  2,  0,  2,  0, 17,  0,  2,  0, 19,  0,  0,  0,115,  8,  0,  0,116,  8,  0,  0,114,  8,  7,  0,117,  8,  7,  0,118,  8,
-  4,  0, 37,  0, 36,  0, 80,  0, 63,  1,  9,  0, 63,  1,  0,  0, 63,  1,  1,  0, 32,  0,119,  8,  0,  0,120,  8,  7,  0,121,  8,
-  2,  0,122,  8,  2,  0, 19,  0,  2,  0, 17,  0,  2,  0, 37,  0, 64,  1,  7,  0, 42,  0,238,  5, 26,  0, 73,  8,  4,  0, 19,  0,
-  4,  0,123,  8, 12,  0,124,  8, 32,  0,119,  8,  0,  0,120,  8, 65,  1, 12,  0, 32,  0,119,  8,  2,  0,125,  8,  2,  0, 19,  0,
-  2,  0,126,  8,  2,  0,127,  8,  0,  0,120,  8, 32,  0,128,  8,  0,  0,129,  8,  7,  0,130,  8,  7,  0,220,  1,  7,  0,131,  8,
-  7,  0,132,  8, 66,  1,  6,  0, 32,  0,119,  8,  4,  0,133,  8,  4,  0,134,  8,  4,  0, 90,  0,  4,  0, 37,  0,  0,  0,120,  8,
- 67,  1,  4,  0, 32,  0,119,  8,  4,  0, 19,  0,  4,  0,133,  8,  0,  0,120,  8, 68,  1,  4,  0, 32,  0,119,  8,  4,  0, 19,  0,
-  4,  0,133,  8,  0,  0,120,  8, 69,  1, 10,  0, 32,  0,119,  8,  4,  0,135,  8,  7,  0,125,  0,  4,  0, 19,  0,  2,  0,234,  5,
-  2,  0,136,  8,  2,  0, 43,  0,  2,  0, 70,  0,  7,  0,137,  8,  0,  0,120,  8, 70,  1,  4,  0, 32,  0,119,  8,  4,  0, 19,  0,
-  4,  0,133,  8,  0,  0,120,  8, 71,  1, 10,  0, 32,  0,119,  8,  2,  0, 17,  0,  2,  0,190,  3,  4,  0, 88,  0,  4,  0, 89,  0,
-  7,  0,249,  7,  7,  0,250,  7,  4,  0, 37,  0,151,  0,224,  7,  0,  0,120,  8, 72,  1,  4,  0, 32,  0,119,  8,  4,  0, 29,  3,
-  4,  0,138,  8,  0,  0,120,  8, 73,  1,  5,  0, 32,  0,119,  8,  7,  0,125,  0,  4,  0,139,  8,  4,  0, 29,  3,  4,  0, 30,  3,
- 74,  1,  6,  0, 32,  0,119,  8,  4,  0,140,  8,  4,  0,141,  8,  7,  0,142,  8,  7,  0,143,  8,  0,  0,120,  8, 75,  1, 16,  0,
- 32,  0,119,  8, 32,  0, 79,  8,  4,  0, 17,  0,  7,  0,144,  8,  7,  0,145,  8,  7,  0,146,  8,  7,  0,147,  8,  7,  0,148,  8,
-  7,  0,149,  8,  7,  0,150,  8,  7,  0,151,  8,  7,  0,152,  8,  2,  0, 19,  0,  2,  0, 37,  0,  2,  0, 43,  0,  2,  0, 70,  0,
- 76,  1,  3,  0, 32,  0,119,  8,  4,  0, 19,  0,  4,  0,136,  5, 77,  1,  5,  0, 32,  0,119,  8,  4,  0, 19,  0,  4,  0, 37,  0,
-  7,  0,153,  8,  0,  0,120,  8, 78,  1, 10,  0, 32,  0,119,  8,  0,  0,120,  8,  2,  0,154,  8,  2,  0,155,  8,  0,  0,156,  8,
-  0,  0,157,  8,  7,  0,158,  8,  7,  0,159,  8,  7,  0,160,  8,  7,  0,161,  8, 79,  1,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,
-  7,  0, 11,  0,  7,  0, 12,  0,  7,  0,162,  8,  7,  0,163,  8,  2,  0, 19,  0,  2,  0,136,  5, 80,  1,  8,  0,  7,  0,  9,  0,
-  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 12,  0,  7,  0,162,  8,  7,  0,163,  8,  2,  0, 19,  0,  2,  0,136,  5, 81,  1,  8,  0,
-  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 12,  0,  7,  0,162,  8,  7,  0,163,  8,  2,  0, 19,  0,  2,  0,136,  5,
- 82,  1,  7,  0, 32,  0,119,  8,  0,  0,120,  8,  7,  0, 18,  1,  7,  0, 28,  1,  2,  0, 19,  0,  2,  0, 11,  1,  4,  0, 37,  0,
- 83,  1,  5,  0, 32,  0,228,  2,  7,  0, 18,  1,  2,  0,232,  2,  0,  0,234,  2,  0,  0,164,  8, 84,  1, 10,  0, 84,  1,  0,  0,
- 84,  1,  1,  0,  2,  0, 17,  0,  2,  0, 19,  0,  0,  0,165,  8,  7,  0,217,  0,  7,  0,218,  0,  2,  0, 32,  8,  2,  0,166,  8,
- 32,  0, 45,  0, 85,  1, 22,  0, 85,  1,  0,  0, 85,  1,  1,  0,  2,  0, 19,  0,  2,  0, 11,  1,  2,  0,167,  8,  2,  0,168,  8,
- 36,  0, 80,  0,151,  0,224,  7, 32,  0,164,  0,  7,  0, 88,  0,  7,  0, 89,  0,  7,  0,169,  8,  7,  0,170,  8,  7,  0,171,  8,
-  7,  0,172,  8,  7,  0,157,  2,  7,  0,173,  8,  7,  0,226,  7,  7,  0,174,  8,  0,  0,175,  8,  0,  0,176,  8, 12,  0, 16,  3,
- 86,  1,  8,  0,  7,  0,228,  1,  7,  0,249,  7,  7,  0,250,  7,  9,  0,  2,  0,  2,  0,177,  8,  2,  0,178,  8,  2,  0,179,  8,
-  2,  0,180,  8, 87,  1, 18,  0, 87,  1,  0,  0, 87,  1,  1,  0, 87,  1,181,  8,  0,  0, 20,  0, 86,  1,182,  8,  2,  0, 17,  0,
-  2,  0, 19,  0,  2,  0,183,  8,  2,  0,184,  8,  2,  0,185,  8,  2,  0,186,  8,  4,  0, 43,  0,  7,  0,187,  8,  7,  0,188,  8,
-  4,  0,189,  8,  4,  0,190,  8, 87,  1,191,  8, 88,  1,192,  8, 89,  1, 33,  0, 89,  1,  0,  0, 89,  1,  1,  0, 89,  1,193,  8,
-  0,  0, 20,  0,  0,  0,194,  8,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0, 79,  7,  2,  0,112,  7,  2,  0,195,  8,  2,  0,133,  0,
-  2,  0,184,  8,  2,  0, 69,  7, 12,  0,219,  7, 12,  0,196,  8, 27,  0, 12,  6,  9,  0,197,  8,  7,  0,187,  8,  7,  0,188,  8,
-  7,  0,255,  1,  7,  0,198,  8,  2,  0,199,  8,  2,  0,200,  8,  7,  0,201,  8,  7,  0,202,  8,  2,  0,203,  8,  2,  0,204,  8,
-  9,  0,205,  8, 24,  0,206,  8, 24,  0,207,  8, 24,  0,208,  8, 90,  1,150,  0, 91,  1,209,  8, 88,  1,  8,  0, 88,  1,  0,  0,
- 88,  1,  1,  0, 89,  1,210,  8, 89,  1,211,  8, 87,  1,212,  8, 87,  1,191,  8,  4,  0, 19,  0,  4,  0, 37,  0, 58,  0, 20,  0,
- 27,  0, 31,  0, 39,  0, 75,  0, 12,  0,213,  8, 12,  0,214,  8, 86,  1,215,  8, 12,  0,216,  8,  4,  0, 17,  0,  4,  0,217,  8,
-  4,  0,218,  8,  4,  0,219,  8, 12,  0,220,  8, 91,  1,221,  8, 87,  1,222,  8, 87,  1,223,  8,  9,  0,224,  8,  9,  0,225,  8,
-  4,  0,226,  8,  9,  0,227,  8,  9,  0,228,  8,  9,  0,229,  8, 92,  1,  6,  0,  4,  0,124,  0,  4,  0,126,  0,  4,  0, 69,  7,
-  0,  0,230,  8,  0,  0,231,  8,  2,  0, 37,  0, 93,  1, 16,  0,  2,  0, 25,  7,  2,  0, 26,  7,  2,  0,232,  8,  2,  0, 16,  8,
-  2,  0,233,  8,  2,  0, 68,  0,  7,  0,156,  2,  7,  0,234,  8,  7,  0,235,  8,  2,  0, 32,  1,  0,  0,236,  8,  0,  0,245,  4,
-  2,  0,237,  8,  2,  0, 37,  0,  4,  0,238,  8,  4,  0,239,  8, 94,  1,  9,  0,  7,  0,240,  8,  7,  0,241,  8,  7,  0, 30,  8,
-  7,  0,109,  0,  7,  0,242,  8,  7,  0,198,  5,  2,  0,243,  8,  0,  0,244,  8,  0,  0, 37,  0, 95,  1,  4,  0,  7,  0,245,  8,
-  7,  0,246,  8,  2,  0,243,  8,  2,  0, 37,  0, 96,  1,  3,  0,  7,  0,247,  8,  7,  0,248,  8,  7,  0, 15,  0, 97,  1,  7,  0,
-  0,  0,190,  1,  2,  0,123,  4,  2,  0,124,  4,  2,  0,125,  4,  2,  0, 76,  4,  4,  0,126,  0,  4,  0,188,  3, 98,  1,  7,  0,
-  7,  0,249,  8,  7,  0,250,  8,  7,  0,251,  8,  7,  0, 10,  2,  7,  0,252,  8,  7,  0,253,  8,  7,  0,254,  8, 99,  1,  4,  0,
-  2,  0,255,  8,  2,  0,  0,  9,  2,  0,  1,  9,  2,  0,  2,  9,100,  1,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0,101,  1,  2,  0,
-  0,  0,166,  0,  0,  0,  3,  9,102,  1,  1,  0,  0,  0, 20,  0,103,  1, 10,  0,  0,  0,  4,  9,  0,  0,  5,  9,  0,  0,191,  5,
-  0,  0,  6,  9,  2,  0,232,  8,  2,  0,  7,  9,  7,  0,  8,  9,  7,  0,  9,  9,  7,  0, 10,  9,  7,  0,173,  8,104,  1,  2,  0,
-  9,  0, 11,  9,  9,  0, 12,  9,105,  1, 11,  0,  0,  0,125,  4,  0,  0, 17,  0,  0,  0,243,  8,  0,  0,109,  0,  0,  0, 13,  9,
-  0,  0,106,  0,  0,  0,179,  0,  7,  0, 14,  9,  7,  0, 15,  9,  7,  0, 16,  9,  7,  0, 17,  9,106,  1,  8,  0,  7,  0,186,  7,
-  7,  0,125,  0,  7,  0,245,  4,  7,  0, 82,  2,  7,  0, 18,  9,  7,  0,204,  0,  7,  0, 19,  9,  4,  0, 17,  0,107,  1,  4,  0,
-  2,  0, 20,  9,  2,  0, 21,  9,  2,  0, 22,  9,  2,  0, 37,  0,108,  1,  1,  0,  0,  0, 20,  0,109,  1,  4,  0,  7,  0,  5,  0,
-  7,  0,  6,  0,  2,  0, 19,  0,  2,  0, 23,  9,110,  1, 10,  0,  2,  0,124,  3,  2,  0, 19,  0,  7,  0, 12,  4,  7,  0, 24,  9,
-  7,  0, 25,  9,  7,  0, 26,  9,  7,  0, 27,  9,109,  1, 28,  9,109,  1, 29,  9,109,  1, 30,  9, 61,  0,  9,  0,  4,  0, 19,  0,
-  4,  0, 64,  0, 24,  0, 31,  9, 24,  0, 32,  9,110,  1, 33,  9,  7,  0, 34,  9,  7,  0, 35,  9,  7,  0, 36,  9,  7,  0, 37,  9,
-111,  1,  4,  0, 47,  0,150,  2,  7,  0, 38,  9,  7,  0, 93,  1,  7,  0, 37,  0,177,  0, 17,  0, 27,  0, 31,  0,111,  1, 39,  9,
- 61,  0, 28,  9, 51,  0, 75,  1,  2,  0, 19,  0,  2,  0, 90,  5,  4,  0,106,  0,  7,  0, 40,  9,  7,  0,  7,  2,  7,  0, 41,  9,
-  7,  0, 42,  9,  7,  0, 93,  1,  7,  0, 43,  9,  2,  0, 45,  1,  0,  0, 44,  9,  0,  0,117,  3,  0,  0, 92,  0,112,  1, 10,  0,
-  4,  0, 17,  0,  4,  0,125,  0,  4,  0, 19,  0,  4,  0, 90,  3,  4,  0, 45,  9,  4,  0, 46,  9,  4,  0, 47,  9,  0,  0, 92,  0,
-  0,  0, 20,  0,  9,  0,  2,  0, 88,  0,  6,  0,112,  1, 48,  9,  4,  0, 49,  9,  4,  0, 50,  9,  4,  0, 51,  9,  4,  0, 37,  0,
-  9,  0, 52,  9,113,  1,  5,  0,  7,  0, 77,  2,  7,  0,190,  2,  7,  0,220,  1,  2,  0, 53,  9,  2,  0, 37,  0,114,  1,  5,  0,
-  7,  0, 77,  2,  7,  0, 54,  9,  7,  0, 55,  9,  7,  0, 56,  9,  7,  0,190,  2,115,  1,  7,  0,  4,  0, 57,  9,  4,  0, 58,  9,
-  4,  0, 59,  9,  7,  0, 60,  9,  7,  0, 61,  9,  7,  0, 62,  9,  7,  0, 63,  9,116,  1,  8,  0,116,  1,  0,  0,116,  1,  1,  0,
- 32,  0, 45,  0,  4,  0,215,  2,  2,  0, 19,  0,  2,  0, 11,  1,  7,  0,190,  2,  7,  0,194,  7,117,  1, 24,  0, 32,  0, 64,  9,
-114,  1, 86,  3,114,  1, 65,  9,113,  1, 66,  9,114,  1,178,  7,118,  1, 67,  9,  7,  0, 68,  9,  7,  0, 69,  9,  7,  0, 70,  9,
-  7,  0, 61,  9,  7,  0, 62,  9,  7,  0,190,  2,  7,  0,167,  2,  7,  0, 71,  9,  7,  0,106,  0,  7,  0, 72,  9,  4,  0, 57,  9,
-  4,  0, 73,  9,  4,  0, 82,  0,  4,  0, 74,  9,  2,  0, 19,  0,  2,  0, 75,  9,  2,  0, 76,  9,  2,  0,120,  3,119,  1,107,  0,
- 27,  0, 31,  0, 39,  0, 75,  0,120,  1, 77,  9,  4,  0, 19,  0,  2,  0, 17,  0,  2,  0,154,  8,  2,  0, 78,  9,  2,  0, 79,  9,
-  2,  0, 85,  8,  2,  0, 80,  9,  2,  0, 81,  9,  2,  0, 82,  9,  2,  0, 83,  9,  2,  0, 84,  9,  2,  0, 85,  9,  2,  0, 86,  9,
-  2,  0,120,  3,  2,  0, 87,  9,  2,  0, 88,  9,  2,  0, 89,  9,  2,  0, 90,  9,  2,  0, 91,  9,  2,  0, 92,  9,  2,  0,210,  1,
-  2,  0,171,  7,  2,  0,147,  7,  2,  0, 93,  9,  2,  0, 94,  9,  2,  0,118,  3,  2,  0,119,  3,  2,  0, 95,  9,  2,  0, 96,  9,
-  2,  0, 97,  9,  2,  0, 98,  9,  7,  0, 99,  9,  7,  0,100,  9,  7,  0,101,  9,  2,  0,102,  9,  2,  0,103,  9,  7,  0,104,  9,
-  7,  0,105,  9,  7,  0,106,  9,  7,  0,153,  7,  7,  0, 89,  0,  7,  0,167,  2,  7,  0,159,  7,  7,  0,107,  9,  7,  0,108,  9,
-  7,  0,109,  9,  4,  0,154,  7,  4,  0,152,  7,  4,  0,110,  9,  7,  0,155,  7,  7,  0,156,  7,  7,  0,157,  7,  7,  0,111,  9,
-  7,  0,112,  9,  7,  0,113,  9,  7,  0,114,  9,  7,  0,115,  9,  7,  0,116,  9,  7,  0,117,  9,  7,  0,118,  9,  7,  0, 42,  3,
-  7,  0,106,  0,  7,  0,119,  9,  7,  0,120,  9,  7,  0,121,  9,  7,  0,122,  9,  7,  0,123,  9,  7,  0,124,  9,  7,  0,125,  9,
-  4,  0,126,  9,  4,  0,127,  9,  7,  0,128,  9,  7,  0,129,  9,  7,  0,130,  9,  7,  0,131,  9,  7,  0,132,  9,  7,  0,133,  9,
-  7,  0,134,  9,  7,  0,114,  3,  7,  0,112,  3,  7,  0,113,  3,  7,  0,135,  9,  7,  0,136,  9,  7,  0,137,  9,  7,  0,138,  9,
-  7,  0,139,  9,  7,  0,140,  9,  7,  0,141,  9,  7,  0,142,  9,  7,  0,143,  9,  7,  0,144,  9,  7,  0,145,  9,  7,  0,146,  9,
-  7,  0,147,  9,  4,  0,148,  9,  4,  0,149,  9,  7,  0,150,  9, 64,  0, 75,  3, 64,  0,151,  9, 32,  0,152,  9, 32,  0,153,  9,
- 36,  0, 80,  0,154,  0, 73,  3,154,  0,154,  9,141,  0, 41,  0,141,  0,  0,  0,141,  0,  1,  0,119,  1,155,  9,117,  1,165,  3,
-115,  1, 79,  8,121,  1,156,  9,  9,  0,157,  9,122,  1,158,  9,122,  1,159,  9, 12,  0,160,  9, 12,  0,161,  9,155,  0, 74,  3,
- 32,  0,162,  9, 32,  0,163,  9, 32,  0, 38,  0, 12,  0,164,  9, 12,  0,165,  9, 12,  0,124,  8,  0,  0, 20,  0,  7,  0,208,  0,
-  7,  0,194,  2,  7,  0,166,  9,  4,  0,118,  2,  4,  0, 19,  0,  4,  0,154,  7,  4,  0,167,  9,  4,  0,168,  9,  4,  0,169,  9,
-  2,  0,215,  0,  2,  0,170,  9,  2,  0,171,  9,  2,  0, 67,  3,  2,  0,172,  9,  2,  0,120,  3,  0,  0,173,  9,  2,  0,174,  9,
-  2,  0,175,  9,  2,  0,176,  9,  9,  0,177,  9,130,  0,209,  3,123,  1,178,  9,128,  0, 34,  0,124,  1,179,  9,  7,  0,179,  3,
-  7,  0,180,  9,  7,  0,181,  9,  7,  0, 15,  4,  7,  0,182,  9,  7,  0, 52,  3,  7,  0, 42,  3,  7,  0,183,  9,  7,  0,  9,  2,
-  7,  0,184,  9,  7,  0,185,  9,  7,  0,186,  9,  7,  0,187,  9,  7,  0,188,  9,  7,  0,189,  9,  7,  0,180,  3,  7,  0,190,  9,
-  7,  0,191,  9,  7,  0,192,  9,  7,  0,181,  3,  7,  0,177,  3,  7,  0,178,  3,  4,  0,193,  9,  4,  0, 90,  0,  4,  0,194,  9,
-  4,  0,195,  9,  2,  0,196,  9,  2,  0,197,  9,  2,  0,198,  9,  2,  0,199,  9,  2,  0,200,  9,  2,  0, 37,  0,  4,  0, 70,  0,
-129,  0,  8,  0,124,  1,201,  9,  7,  0,202,  9,  7,  0,203,  9,  7,  0,164,  1,  7,  0,204,  9,  4,  0, 90,  0,  2,  0,205,  9,
-  2,  0,206,  9,125,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0,  7,  0,207,  9,126,  1,  6,  0,126,  1,  0,  0,
-126,  1,  1,  0,125,  1,208,  9,  4,  0,209,  9,  2,  0,210,  9,  2,  0, 19,  0,127,  1,  5,  0,127,  1,  0,  0,127,  1,  1,  0,
- 12,  0,211,  9,  4,  0,212,  9,  4,  0, 19,  0,128,  1,  9,  0,128,  1,  0,  0,128,  1,  1,  0, 12,  0,124,  0,127,  1,213,  9,
-  4,  0, 19,  0,  2,  0,210,  9,  2,  0,214,  9,  7,  0, 91,  0,  0,  0,215,  9,191,  0,  6,  0, 27,  0, 31,  0, 12,  0,139,  4,
-  4,  0, 19,  0,  2,  0,216,  9,  2,  0,217,  9,  9,  0,218,  9,129,  1,  7,  0,129,  1,  0,  0,129,  1,  1,  0,  2,  0, 17,  0,
-  2,  0, 19,  0,  4,  0, 23,  0,  0,  0,219,  9,  0,  0,220,  9,130,  1,  5,  0, 12,  0,221,  9,  4,  0,222,  9,  4,  0,223,  9,
-  4,  0, 19,  0,  4,  0, 37,  0,131,  1, 13,  0, 27,  0, 31,  0,132,  1,224,  9,132,  1,225,  9, 12,  0,226,  9,  4,  0,227,  9,
-  2,  0,228,  9,  2,  0, 37,  0, 12,  0,229,  9, 12,  0,230,  9,130,  1,231,  9, 12,  0,232,  9, 12,  0,233,  9, 12,  0,234,  9,
-132,  1, 30,  0,132,  1,  0,  0,132,  1,  1,  0,  9,  0,235,  9,  4,  0,  4,  7,  4,  0, 37,  0,201,  0,180,  5,201,  0,236,  9,
-  0,  0,237,  9,  2,  0,238,  9,  2,  0,239,  9,  2,  0, 25,  7,  2,  0, 26,  7,  2,  0,240,  9,  2,  0,241,  9,  2,  0, 90,  3,
-  2,  0, 38,  6,  2,  0,242,  9,  2,  0,243,  9,  4,  0,160,  1,133,  1,244,  9,134,  1,245,  9,135,  1,246,  9,  4,  0,247,  9,
-  4,  0,248,  9,  9,  0,249,  9, 12,  0,250,  9, 12,  0,230,  9, 12,  0, 43,  7, 12,  0,251,  9, 12,  0,252,  9,136,  1, 16,  0,
-136,  1,  0,  0,136,  1,  1,  0,  0,  0,253,  9,137,  1,254,  9,  2,  0, 17,  0,  2,  0, 15,  0,  2,  0,255,  9,  2,  0,  0, 10,
-  2,  0,  1, 10,  2,  0,  2, 10,  2,  0,  3, 10,  2,  0,  4, 10,  2,  0,  5, 10,  2,  0,  6, 10,  2,  0, 70,  0,  2,  0,160,  1,
-138,  1,  9,  0,138,  1,  0,  0,138,  1,  1,  0, 12,  0,  7, 10,  0,  0,  8, 10,  2,  0,  9, 10,  2,  0, 10, 10,  2,  0, 11, 10,
-  2,  0, 37,  0,  9,  0, 12, 10,209,  0, 10,  0,209,  0,  0,  0,209,  0,  1,  0,  0,  0,253,  9, 26,  0, 30,  0,139,  1, 19,  7,
-  9,  0, 13, 10,137,  1,254,  9,130,  1, 14, 10, 12,  0, 15, 10,209,  0, 16, 10,133,  1, 23,  0,133,  1,  0,  0,133,  1,  1,  0,
-  2,  0, 17,  0,  2,  0, 15,  0,  2,  0,  5,  0,  2,  0,  6,  0,  2,  0, 17, 10,  2,  0, 18, 10,  2,  0, 19, 10,  2,  0, 20, 10,
-  0,  0, 21, 10,  0,  0, 37,  0,  2,  0,255,  9,  2,  0,  0, 10,  2,  0,  1, 10,  2,  0,  2, 10,  2,  0,  3, 10,  2,  0, 43,  0,
-  0,  0, 22, 10,  2,  0, 23, 10,  2,  0, 24, 10,  4,  0, 70,  0,  9,  0, 13, 10,140,  1,  8,  0,140,  1,  0,  0,140,  1,  1,  0,
-  9,  0,  2,  0,  9,  0, 25, 10,  0,  0,132,  3,  2,  0, 17,  0,  2,  0, 19,  0,  7,  0, 26, 10,141,  1,  5,  0,  7,  0, 27, 10,
-  4,  0, 28, 10,  4,  0, 29, 10,  4,  0, 11,  1,  4,  0, 19,  0,142,  1,  6,  0,  7,  0, 30, 10,  7,  0, 31, 10,  7,  0, 32, 10,
-  7,  0, 33, 10,  4,  0, 17,  0,  4,  0, 19,  0,143,  1,  5,  0,  7,  0,249,  7,  7,  0,250,  7,  7,  0,190,  2,  2,  0,224,  1,
-  2,  0,225,  1,144,  1,  5,  0,143,  1,  2,  0,  4,  0, 54,  0,  7,  0, 34, 10,  7,  0,249,  7,  7,  0,250,  7,145,  1,  4,  0,
-  2,  0, 35, 10,  2,  0, 36, 10,  2,  0, 37, 10,  2,  0, 38, 10,146,  1,  2,  0, 42,  0,  9,  6, 26,  0, 73,  8,147,  1,  3,  0,
- 24,  0, 39, 10,  4,  0, 19,  0,  4,  0, 37,  0,148,  1,  6,  0,  7,  0,106,  0,  7,  0,142,  2,  7,  0, 40, 10,  7,  0, 37,  0,
-  2,  0,214,  0,  2,  0, 41, 10,149,  1,  7,  0,149,  1,  0,  0,149,  1,  1,  0, 27,  0, 12,  6,  0,  0, 42, 10,  4,  0, 43, 10,
-  4,  0, 90,  0,  0,  0,132,  3,150,  1,  6,  0, 12,  0,124,  8,  0,  0, 44, 10,  7,  0, 61,  0,  7,  0, 26, 10,  4,  0, 17,  0,
-  4,  0, 19,  0,151,  1,  3,  0,  7,  0, 45, 10,  4,  0, 19,  0,  4,  0, 37,  0,152,  1, 15,  0,152,  1,  0,  0,152,  1,  1,  0,
- 58,  1,112,  8,150,  1, 62,  0, 12,  0, 16,  3, 35,  0, 50,  0,151,  1, 46, 10,  4,  0, 54,  0,  7,  0, 61,  0,  2,  0, 19,  0,
-  2,  0,252,  0,  4,  0, 43, 10,  0,  0, 42, 10,  4,  0, 47, 10,  7,  0, 48, 10,153,  1,  2,  0,  0,  0, 49, 10,  0,  0, 50, 10,
-154,  1,  4,  0,154,  1,  0,  0,154,  1,  1,  0,151,  0,228,  2, 12,  0, 51, 10,155,  1, 24,  0,155,  1,  0,  0,155,  1,  1,  0,
- 12,  0, 52, 10,151,  0,224,  7,154,  1, 53, 10, 12,  0, 54, 10, 12,  0, 16,  3,  0,  0,132,  3,  7,  0, 26, 10,  7,  0, 55, 10,
-  7,  0, 88,  0,  7,  0, 89,  0,  7,  0,169,  8,  7,  0,170,  8,  7,  0,157,  2,  7,  0,173,  8,  7,  0,226,  7,  7,  0,174,  8,
-  2,  0, 56, 10,  2,  0, 57, 10,  2,  0, 43,  0,  2,  0, 17,  0,  4,  0, 19,  0,  4,  0, 70,  0,156,  1,  6,  0,156,  1,  0,  0,
-156,  1,  1,  0, 12,  0, 52, 10,  4,  0, 19,  0,  4,  0, 81,  2,  0,  0,132,  3,157,  1, 10,  0,157,  1,  0,  0,157,  1,  1,  0,
- 27,  0, 12,  6,  0,  0, 58, 10,  4,  0, 59, 10,  4,  0, 60, 10,  0,  0, 42, 10,  4,  0, 43, 10,  2,  0, 19,  0,  2,  0, 61, 10,
-158,  1,  6,  0,158,  1,  0,  0,158,  1,  1,  0, 12,  0, 62, 10,  0,  0,132,  3,  4,  0, 19,  0,  4,  0, 63, 10,159,  1,  5,  0,
-159,  1,  0,  0,159,  1,  1,  0,  0,  0, 42, 10,  4,  0, 43, 10,  7,  0,134,  2, 39,  0,  9,  0,151,  0, 11,  3,151,  0, 64, 10,
-154,  1, 53, 10, 12,  0, 65, 10,155,  1, 66, 10, 12,  0, 67, 10, 12,  0, 68, 10,  4,  0, 19,  0,  4,  0,215,  0,160,  1,  2,  0,
- 27,  0, 31,  0, 39,  0, 75,  0,161,  1,  5,  0,161,  1,  0,  0,161,  1,  1,  0,  4,  0, 17,  0,  4,  0, 19,  0,  0,  0, 20,  0,
-162,  1,  6,  0,161,  1, 69, 10, 32,  0, 45,  0,  4,  0, 70, 10,  7,  0, 71, 10,  4,  0, 72, 10,  4,  0, 32,  8,163,  1,  3,  0,
-161,  1, 69, 10,  4,  0, 70, 10,  7,  0, 73, 10,164,  1,  8,  0,161,  1, 69, 10, 32,  0, 45,  0,  7,  0,  6,  1,  7,  0, 74, 10,
-  7,  0,194,  2,  7,  0, 30,  8,  4,  0, 70, 10,  4,  0, 75, 10,165,  1,  5,  0,161,  1, 69, 10,  7,  0, 76, 10,  7,  0,112,  7,
-  7,  0,163,  2,  7,  0, 57,  0,166,  1,  3,  0,161,  1, 69, 10,  7,  0, 30,  8,  7,  0, 77, 10,118,  1,  4,  0,  7,  0, 78, 10,
-  7,  0,121,  9,  2,  0, 79, 10,  2,  0, 11,  1,167,  1, 14,  0,167,  1,  0,  0,167,  1,  1,  0, 12,  0, 80, 10, 12,  0, 81, 10,
- 12,  0, 82, 10,  0,  0, 20,  0,  4,  0, 31,  0,  4,  0, 19,  0,  4,  0, 83, 10,  7,  0, 84, 10,  4,  0, 72, 10,  4,  0, 32,  8,
-  7,  0,139,  3,  7,  0,165,  2,120,  1, 23,  0,  4,  0, 70, 10,  4,  0, 85, 10,  7,  0, 86, 10,  7,  0, 57,  0,  7,  0, 87, 10,
-  7,  0,161,  2,  7,  0, 78, 10,  7,  0, 88, 10,  7,  0,142,  2,  7,  0, 89, 10,  7,  0, 12,  4,  7,  0, 90, 10,  7,  0, 91, 10,
-  7,  0, 92, 10,  7,  0, 93, 10,  7,  0, 94, 10,  7,  0, 95, 10,  7,  0, 96, 10,  7,  0, 97, 10,  7,  0, 98, 10,  7,  0, 99, 10,
-  7,  0,100, 10, 12,  0,101, 10, 69, 78, 68, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 73,110,115,116, 97,110, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,
+  0, 69,120,112,108,111,100,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77,117,108,116,105,114,101,115, 77,111,100,
+105,102,105,101,114, 68, 97,116, 97,  0, 70,108,117,105,100,115,105,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 70,
+108,117,105,100,115,105,109, 83,101,116,116,105,110,103,115,  0, 83,104,114,105,110,107,119,114, 97,112, 77,111,100,105,102,105,
+101,114, 68, 97,116, 97,  0, 83,105,109,112,108,101, 68,101,102,111,114,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0,
+ 76, 97,116,116,105, 99,101,  0, 98, 68,101,102,111,114,109, 71,114,111,117,112,  0, 83, 99,117,108,112,116, 83,101,115,115,105,
+111,110,  0, 98, 65, 99,116,105,111,110,  0, 98, 80,111,115,101,  0, 98, 71, 80,100, 97,116, 97,  0, 66,117,108,108,101,116, 83,
+111,102,116, 66,111,100,121,  0, 80, 97,114,116, 68,101,102,108,101, 99,116,  0, 83,111,102,116, 66,111,100,121,  0, 79, 98, 72,
+111,111,107,  0, 82, 78, 71,  0, 80, 84, 67, 97, 99,104,101, 77,101,109,  0, 80, 84, 67, 97, 99,104,101, 69,100,105,116,  0, 83,
+ 66, 86,101,114,116,101,120,  0, 66,111,100,121, 80,111,105,110,116,  0, 66,111,100,121, 83,112,114,105,110,103,  0, 83, 66, 83,
+ 99,114, 97,116, 99,104,  0, 87,111,114,108,100,  0, 66, 97,115,101,  0, 65,118,105, 67,111,100,101, 99, 68, 97,116, 97,  0, 81,
+117,105, 99,107,116,105,109,101, 67,111,100,101, 99, 68, 97,116, 97,  0, 70, 70, 77,112,101,103, 67,111,100,101, 99, 68, 97,116,
+ 97,  0, 65,117,100,105,111, 68, 97,116, 97,  0, 83, 99,101,110,101, 82,101,110,100,101,114, 76, 97,121,101,114,  0, 82,101,110,
+100,101,114, 68, 97,116, 97,  0, 82,101,110,100,101,114, 80,114,111,102,105,108,101,  0, 71, 97,109,101, 68,111,109,101,  0, 71,
+ 97,109,101, 70,114, 97,109,105,110,103,  0, 71, 97,109,101, 68, 97,116, 97,  0, 84,105,109,101, 77, 97,114,107,101,114,  0, 80,
+ 97,105,110,116,  0, 66,114,117,115,104,  0, 73,109, 97,103,101, 80, 97,105,110,116, 83,101,116,116,105,110,103,115,  0, 80, 97,
+114,116,105, 99,108,101, 66,114,117,115,104, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 69,100,105,116, 83,101,116,116,
+105,110,103,115,  0, 84,114, 97,110,115,102,111,114,109, 79,114,105,101,110,116, 97,116,105,111,110,  0, 83, 99,117,108,112,116,
+  0, 86, 80, 97,105,110,116,  0, 84,111,111,108, 83,101,116,116,105,110,103,115,  0, 98, 83,116, 97,116,115,  0, 85,110,105,116,
+ 83,101,116,116,105,110,103,115,  0, 69,100,105,116,105,110,103,  0, 83, 99,101,110,101, 83,116, 97,116,115,  0, 68, 97,103, 70,
+111,114,101,115,116,  0, 66, 71,112,105, 99,  0, 82,101,103,105,111,110, 86,105,101,119, 51, 68,  0, 82,101,110,100,101,114, 73,
+110,102,111,  0, 82,101,116,111,112,111, 86,105,101,119, 68, 97,116, 97,  0, 86,105,101,119, 68,101,112,116,104,115,  0, 83,109,
+111,111,116,104, 86,105,101,119, 83,116,111,114,101,  0,119,109, 84,105,109,101,114,  0, 86,105,101,119, 51, 68,  0, 83,112, 97,
+ 99,101, 76,105,110,107,  0, 86,105,101,119, 50, 68,  0, 83,112, 97, 99,101, 73,110,102,111,  0, 98, 83, 99,114,101,101,110,  0,
+ 83,112, 97, 99,101, 73,112,111,  0, 98, 68,111,112,101, 83,104,101,101,116,  0, 83,112, 97, 99,101, 66,117,116,115,  0, 83,112,
+ 97, 99,101, 83,101,113,  0, 70,105,108,101, 83,101,108,101, 99,116, 80, 97,114, 97,109,115,  0, 83,112, 97, 99,101, 70,105,108,
+101,  0, 70,105,108,101, 76,105,115,116,  0,119,109, 79,112,101,114, 97,116,111,114,  0, 70,105,108,101, 76, 97,121,111,117,116,
+  0, 83,112, 97, 99,101, 79,111,112,115,  0, 84,114,101,101, 83,116,111,114,101,  0, 84,114,101,101, 83,116,111,114,101, 69,108,
+101,109,  0, 83,112, 97, 99,101, 73,109, 97,103,101,  0, 83,112, 97, 99,101, 78,108, 97,  0, 83,112, 97, 99,101, 84,101,120,116,
+  0, 83, 99,114,105,112,116,  0, 83,112, 97, 99,101, 83, 99,114,105,112,116,  0, 83,112, 97, 99,101, 84,105,109,101,  0, 83,112,
+ 97, 99,101, 78,111,100,101,  0, 83,112, 97, 99,101, 76,111,103,105, 99,  0, 83,112, 97, 99,101, 73,109, 97, 83,101,108,  0, 67,
+111,110,115,111,108,101, 76,105,110,101,  0, 83,112, 97, 99,101, 67,111,110,115,111,108,101,  0, 83,112, 97, 99,101, 85,115,101,
+114, 80,114,101,102,  0,117,105, 70,111,110,116,  0,117,105, 70,111,110,116, 83,116,121,108,101,  0,117,105, 83,116,121,108,101,
+  0,117,105, 87,105,100,103,101,116, 67,111,108,111,114,115,  0,117,105, 87,105,100,103,101,116, 83,116, 97,116,101, 67,111,108,
+111,114,115,  0, 84,104,101,109,101, 85, 73,  0, 84,104,101,109,101, 83,112, 97, 99,101,  0, 84,104,101,109,101, 87,105,114,101,
+ 67,111,108,111,114,  0, 98, 84,104,101,109,101,  0, 83,111,108,105,100, 76,105,103,104,116,  0, 85,115,101,114, 68,101,102,  0,
+ 83, 99,114, 86,101,114,116,  0, 83, 99,114, 69,100,103,101,  0, 80, 97,110,101,108,  0, 80, 97,110,101,108, 84,121,112,101,  0,
+117,105, 76, 97,121,111,117,116,  0, 83, 99,114, 65,114,101, 97,  0, 83,112, 97, 99,101, 84,121,112,101,  0, 65, 82,101,103,105,
+111,110,  0, 65, 82,101,103,105,111,110, 84,121,112,101,  0, 70,105,108,101, 71,108,111, 98, 97,108,  0, 83,116,114,105,112, 69,
+108,101,109,  0, 84, 83,116,114,105,112, 69,108,101,109,  0, 83,116,114,105,112, 67,114,111,112,  0, 83,116,114,105,112, 84,114,
+ 97,110,115,102,111,114,109,  0, 83,116,114,105,112, 67,111,108,111,114, 66, 97,108, 97,110, 99,101,  0, 83,116,114,105,112, 80,
+114,111,120,121,  0, 83,116,114,105,112,  0, 80,108,117,103,105,110, 83,101,113,  0, 83,101,113,117,101,110, 99,101,  0, 98, 83,
+111,117,110,100,  0, 83,111,117,110,100, 72, 97,110,100,108,101,  0, 77,101,116, 97, 83,116, 97, 99,107,  0, 87,105,112,101, 86,
+ 97,114,115,  0, 71,108,111,119, 86, 97,114,115,  0, 84,114, 97,110,115,102,111,114,109, 86, 97,114,115,  0, 83,111,108,105,100,
+ 67,111,108,111,114, 86, 97,114,115,  0, 83,112,101,101,100, 67,111,110,116,114,111,108, 86, 97,114,115,  0, 69,102,102,101, 99,
+116,  0, 66,117,105,108,100, 69,102,102,  0, 80, 97,114,116, 69,102,102,  0, 80, 97,114,116,105, 99,108,101,  0, 87, 97,118,101,
+ 69,102,102,  0, 98, 80,114,111,112,101,114,116,121,  0, 98, 78,101, 97,114, 83,101,110,115,111,114,  0, 98, 77,111,117,115,101,
+ 83,101,110,115,111,114,  0, 98, 84,111,117, 99,104, 83,101,110,115,111,114,  0, 98, 75,101,121, 98,111, 97,114,100, 83,101,110,
+115,111,114,  0, 98, 80,114,111,112,101,114,116,121, 83,101,110,115,111,114,  0, 98, 65, 99,116,117, 97,116,111,114, 83,101,110,
+115,111,114,  0, 98, 68,101,108, 97,121, 83,101,110,115,111,114,  0, 98, 67,111,108,108,105,115,105,111,110, 83,101,110,115,111,
+114,  0, 98, 82, 97,100, 97,114, 83,101,110,115,111,114,  0, 98, 82, 97,110,100,111,109, 83,101,110,115,111,114,  0, 98, 82, 97,
+121, 83,101,110,115,111,114,  0, 98, 77,101,115,115, 97,103,101, 83,101,110,115,111,114,  0, 98, 83,101,110,115,111,114,  0, 98,
+ 67,111,110,116,114,111,108,108,101,114,  0, 98, 74,111,121,115,116,105, 99,107, 83,101,110,115,111,114,  0, 98, 69,120,112,114,
+101,115,115,105,111,110, 67,111,110,116,  0, 98, 80,121,116,104,111,110, 67,111,110,116,  0, 98, 65, 99,116,117, 97,116,111,114,
+  0, 98, 65,100,100, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 65, 99,116,105,111,110, 65, 99,116,117, 97,
+116,111,114,  0, 98, 83,111,117,110,100, 65, 99,116,117, 97,116,111,114,  0, 83,111,117,110,100, 51, 68,  0, 98, 69,100,105,116,
+ 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 83, 99,101,110,101, 65, 99,116,117, 97,116,111,114,  0, 98, 80,
+114,111,112,101,114,116,121, 65, 99,116,117, 97,116,111,114,  0, 98, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0,
+ 98, 73,112,111, 65, 99,116,117, 97,116,111,114,  0, 98, 67, 97,109,101,114, 97, 65, 99,116,117, 97,116,111,114,  0, 98, 67,111,
+110,115,116,114, 97,105,110,116, 65, 99,116,117, 97,116,111,114,  0, 98, 71,114,111,117,112, 65, 99,116,117, 97,116,111,114,  0,
+ 98, 82, 97,110,100,111,109, 65, 99,116,117, 97,116,111,114,  0, 98, 77,101,115,115, 97,103,101, 65, 99,116,117, 97,116,111,114,
+  0, 98, 71, 97,109,101, 65, 99,116,117, 97,116,111,114,  0, 98, 86,105,115,105, 98,105,108,105,116,121, 65, 99,116,117, 97,116,
+111,114,  0, 98, 84,119,111, 68, 70,105,108,116,101,114, 65, 99,116,117, 97,116,111,114,  0, 98, 80, 97,114,101,110,116, 65, 99,
+116,117, 97,116,111,114,  0, 98, 83,116, 97,116,101, 65, 99,116,117, 97,116,111,114,  0, 70,114,101,101, 67, 97,109,101,114, 97,
+  0, 83,112, 97, 99,101, 83,111,117,110,100,  0, 71,114,111,117,112, 79, 98,106,101, 99,116,  0, 66,111,110,101,  0, 98, 65,114,
+109, 97,116,117,114,101,  0, 98, 77,111,116,105,111,110, 80, 97,116,104, 86,101,114,116,  0, 98, 77,111,116,105,111,110, 80, 97,
+116,104,  0, 98, 65,110,105,109, 86,105,122, 83,101,116,116,105,110,103,115,  0, 98, 80,111,115,101, 67,104, 97,110,110,101,108,
+  0, 98, 65, 99,116,105,111,110, 71,114,111,117,112,  0, 83,112, 97, 99,101, 65, 99,116,105,111,110,  0, 98, 65, 99,116,105,111,
+110, 67,104, 97,110,110,101,108,  0, 98, 67,111,110,115,116,114, 97,105,110,116, 67,104, 97,110,110,101,108,  0, 98, 67,111,110,
+115,116,114, 97,105,110,116,  0, 98, 67,111,110,115,116,114, 97,105,110,116, 84, 97,114,103,101,116,  0, 98, 80,121,116,104,111,
+110, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 75,105,110,101,109, 97,116,105, 99, 67,111,110,115,116,114, 97,105,110,116,
+  0, 98, 84,114, 97, 99,107, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 82,111,116, 97,116,101, 76,105,107,101, 67,
+111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 97,116,101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0,
+ 98, 77,105,110, 77, 97,120, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,105,122,101, 76,105,107,101, 67,111,110,115,116,
+114, 97,105,110,116,  0, 98, 65, 99,116,105,111,110, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99,107, 84,114, 97,
+ 99,107, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 70,111,108,108,111,119, 80, 97,116,104, 67,111,110,115,116,114, 97,105,
+110,116,  0, 98, 83,116,114,101,116, 99,104, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 82,105,103,105,100, 66,111,
+100,121, 74,111,105,110,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,108, 97,109,112, 84,111, 67,111,110,115,116,114,
+ 97,105,110,116,  0, 98, 67,104,105,108,100, 79,102, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 84,114, 97,110,115,102,111,
+114,109, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,
+  0, 98, 82,111,116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,105,122,101, 76,105,109,105,116, 67,
+111,110,115,116,114, 97,105,110,116,  0, 98, 68,105,115,116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98,
+ 83,104,114,105,110,107,119,114, 97,112, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 65, 99,116,105,111,110, 77,111,100,105,
+102,105,101,114,  0, 98, 65, 99,116,105,111,110, 83,116,114,105,112,  0, 98, 78,111,100,101, 83,116, 97, 99,107,  0, 98, 78,111,
+100,101, 83,111, 99,107,101,116,  0, 98, 78,111,100,101, 76,105,110,107,  0, 98, 78,111,100,101,  0, 98, 78,111,100,101, 80,114,
+101,118,105,101,119,  0, 98, 78,111,100,101, 84,121,112,101,  0, 78,111,100,101, 73,109, 97,103,101, 65,110,105,109,  0, 78,111,
+100,101, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 68, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 66,105,108,
+ 97,116,101,114, 97,108, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 72,117,101, 83, 97,116,  0, 78,111,100,101, 73,109,
+ 97,103,101, 70,105,108,101,  0, 78,111,100,101, 67,104,114,111,109, 97,  0, 78,111,100,101, 84,119,111, 88, 89,115,  0, 78,111,
+100,101, 84,119,111, 70,108,111, 97,116,115,  0, 78,111,100,101, 71,101,111,109,101,116,114,121,  0, 78,111,100,101, 86,101,114,
+116,101,120, 67,111,108,  0, 78,111,100,101, 68,101,102,111, 99,117,115,  0, 78,111,100,101, 83, 99,114,105,112,116, 68,105, 99,
+116,  0, 78,111,100,101, 71,108, 97,114,101,  0, 78,111,100,101, 84,111,110,101,109, 97,112,  0, 78,111,100,101, 76,101,110,115,
+ 68,105,115,116,  0, 84,101,120, 78,111,100,101, 79,117,116,112,117,116,  0, 67,117,114,118,101, 77, 97,112, 80,111,105,110,116,
+  0, 67,117,114,118,101, 77, 97,112,  0, 66,114,117,115,104, 67,108,111,110,101,  0, 67,117,115,116,111,109, 68, 97,116, 97, 76,
+ 97,121,101,114,  0, 72, 97,105,114, 75,101,121,  0, 80, 97,114,116,105, 99,108,101, 75,101,121,  0, 66,111,105,100, 80, 97,114,
+116,105, 99,108,101,  0, 66,111,105,100, 68, 97,116, 97,  0, 67,104,105,108,100, 80, 97,114,116,105, 99,108,101,  0, 80, 97,114,
+116,105, 99,108,101, 84, 97,114,103,101,116,  0, 80, 97,114,116,105, 99,108,101, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,
+101, 83,101,116,116,105,110,103,115,  0, 66,111,105,100, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,101, 67,
+ 97, 99,104,101, 75,101,121,  0, 75, 68, 84,114,101,101,  0, 76,105,110,107, 78,111,100,101,  0, 98, 71, 80, 68,115,112,111,105,
+110,116,  0, 98, 71, 80, 68,115,116,114,111,107,101,  0, 98, 71, 80, 68,102,114, 97,109,101,  0, 98, 71, 80, 68,108, 97,121,101,
+114,  0, 82,101,112,111,114,116,  0, 82,101,112,111,114,116, 76,105,115,116,  0,119,109, 87,105,110,100,111,119, 77, 97,110, 97,
+103,101,114,  0,119,109, 87,105,110,100,111,119,  0,119,109, 69,118,101,110,116,  0,119,109, 83,117, 98, 87,105,110,100,111,119,
+  0,119,109, 71,101,115,116,117,114,101,  0,119,109, 75,101,121,109, 97,112, 73,116,101,109,  0, 80,111,105,110,116,101,114, 82,
+ 78, 65,  0,119,109, 75,101,121, 77, 97,112,  0,119,109, 79,112,101,114, 97,116,111,114, 84,121,112,101,  0, 70, 77,111,100,105,
+102,105,101,114,  0, 70, 77,111,100, 95, 71,101,110,101,114, 97,116,111,114,  0, 70, 77,111,100, 95, 70,117,110, 99,116,105,111,
+110, 71,101,110,101,114, 97,116,111,114,  0, 70, 67, 77, 95, 69,110,118,101,108,111,112,101, 68, 97,116, 97,  0, 70, 77,111,100,
+ 95, 69,110,118,101,108,111,112,101,  0, 70, 77,111,100, 95, 67,121, 99,108,101,115,  0, 70, 77,111,100, 95, 80,121,116,104,111,
+110,  0, 70, 77,111,100, 95, 76,105,109,105,116,115,  0, 70, 77,111,100, 95, 78,111,105,115,101,  0, 68,114,105,118,101,114, 84,
+ 97,114,103,101,116,  0, 67,104, 97,110,110,101,108, 68,114,105,118,101,114,  0, 70, 80,111,105,110,116,  0, 70, 67,117,114,118,
+101,  0, 65,110,105,109, 77, 97,112, 80, 97,105,114,  0, 65,110,105,109, 77, 97,112,112,101,114,  0, 78,108, 97, 83,116,114,105,
+112,  0, 78,108, 97, 84,114, 97, 99,107,  0, 75, 83, 95, 80, 97,116,104,  0, 75,101,121,105,110,103, 83,101,116,  0, 65,110,105,
+109, 79,118,101,114,114,105,100,101,  0, 73,100, 65,100,116, 84,101,109,112,108, 97,116,101,  0, 66,111,105,100, 82,117,108,101,
+  0, 66,111,105,100, 82,117,108,101, 71,111, 97,108, 65,118,111,105,100,  0, 66,111,105,100, 82,117,108,101, 65,118,111,105,100,
+ 67,111,108,108,105,115,105,111,110,  0, 66,111,105,100, 82,117,108,101, 70,111,108,108,111,119, 76,101, 97,100,101,114,  0, 66,
+111,105,100, 82,117,108,101, 65,118,101,114, 97,103,101, 83,112,101,101,100,  0, 66,111,105,100, 82,117,108,101, 70,105,103,104,
+116,  0, 66,111,105,100, 83,116, 97,116,101,  0, 70, 76, 85, 73, 68, 95, 51, 68,  0, 87, 84, 85, 82, 66, 85, 76, 69, 78, 67, 69,
+  0,  0,  0,  0, 84, 76, 69, 78,  1,  0,  1,  0,  2,  0,  2,  0,  4,  0,  4,  0,  4,  0,  4,  0,  8,  0,  0,  0,  8,  0, 12,  0,
+  8,  0,  4,  0,  8,  0,  8,  0, 16,  0, 12,  0, 12,  0, 24,  0, 16,  0, 16,  0, 32,  0, 16,  0, 16,  0, 20,  0, 76,  0, 52,  0,
+ 40,  2,  0,  0, 32,  0,140,  0,100,  3, 92,  0, 36,  0, 56,  0, 84,  0,112,  0,124,  0, 56,  0, 24,  0, 40,  0,120,  0, 12,  0,
+120,  0, 36,  0, 92,  5,128,  1,  0,  0,  0,  0,  0,  0,144,  0, 40,  1, 84,  1, 24,  0,  8,  3,168,  0,  0,  0, 76,  0,128,  1,
+ 24,  1,140,  0,132,  0,124,  1,  8,  1, 56,  0, 88,  0,184,  2, 76,  0, 60,  1,  0,  0,108,  0,104,  0,148,  0, 56,  0,  8,  0,
+ 16,  0, 92,  1,  0,  0,  0,  0,  0,  0, 24,  1, 20,  0, 44,  0, 60,  0, 24,  0, 12,  0, 12,  0,  4,  0,  8,  0,  8,  0,  0,  0,
+ 24,  0, 76,  0, 32,  0,  8,  0, 12,  0,  8,  0,  8,  0,  4,  0,  4,  0,  0,  1, 32,  0, 12,  0,  0,  0, 16,  0, 64,  0, 24,  0,
+ 12,  0, 40,  0, 56,  0, 72,  0, 92,  0,100,  0, 72,  0,100,  0,120,  0, 68,  0, 64,  0,112,  0, 64,  0, 76,  0,176,  0, 48,  0,
+168,  0,152,  0,156,  0, 64,  0, 96,  0,108,  0,188,  0,104,  0,216,  0, 56,  0, 84,  0,  0,  0,132,  0, 28,  0,240,  1,104,  0,
+  0,  0, 80,  0,  0,  0,  0,  0, 68,  0,  8,  0,  8,  0,220,  0, 80,  0, 76,  0, 68,  0, 68,  0, 64,  0,164,  1,112,  0,108,  0,
+188,  0, 40,  0,  0,  0, 92,  0, 56,  0, 72,  0,120,  0,128,  0,252,  0,208,  0,  0,  0, 92,  0,  0,  0, 16,  0,  0,  0,  0,  0,
+  0,  0,104,  1, 28,  0,176,  0,144,  0, 52,  0, 16,  0, 72,  0,  0,  4, 56,  0, 20,  0, 16,  0, 92,  0, 80,  0, 24,  0,196,  0,
+ 36,  0,  8,  0,100,  0, 80,  0, 48,  0, 52,  0, 72,  1, 32,  0,  8,  0, 24,  2,  0,  0,  0,  0, 56,  0,216,  2,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,240,  0, 40,  0,148,  0, 48,  0,140,  0,208,  0, 20,  0,224,  0,216,  0,204,  1, 60,  0,  0,  0,112,  0,
+  0,  0,  4,  1, 12,  0, 12,  0,136,  0,200,  0,124,  2, 80,  2, 40,  0,180,  0,244,  0, 52,  0,148,  2, 28,  0, 80,  0, 24,  0,
+ 16,  1, 32,  0,224,  0, 32,  0, 32,  0, 80,  2, 16,  1, 16,  0,200, 21, 56,  0, 56, 11, 20,  0, 24,  0, 56,  1,  0,  0,  0,  0,
+ 96,  0,  0,  0,248,  0,  0,  0, 32,  0, 80,  0, 28,  0, 16,  0,  8,  0, 52,  0,252,  0,240,  0,168,  1,196,  0,  8,  1, 48,  0,
+ 16,  0, 12,  0, 24,  0, 48,  0, 16,  0, 20,  0, 16,  0, 24,  0, 56,  1,  0,  0, 56,  0, 52,  0, 48,  0,  8,  0, 44,  0, 72,  0,
+104,  0, 40,  0,  8,  0, 72,  0, 44,  0, 40,  0,108,  0, 68,  0, 76,  0, 80,  0, 60,  0,128,  0, 76,  0, 60,  0, 12,  0, 92,  0,
+ 68,  0, 32,  0, 80,  0, 16,  0, 76,  0,108,  0, 84,  0, 28,  0, 96,  0, 60,  0, 56,  0,108,  0,140,  0,  4,  0, 20,  0, 12,  0,
+  8,  0, 40,  0,196,  0, 24,  0,  4,  1,124,  0, 16,  0, 20,  0, 24,  0,172,  1,104,  0,228,  0, 64,  0, 44,  0, 64,  0,116,  0,
+ 60,  0,104,  0, 52,  0, 44,  0, 44,  0, 68,  0, 44,  0, 64,  0, 44,  0, 20,  0, 52,  0, 96,  0, 12,  0,108,  0, 92,  0, 28,  0,
+ 28,  0, 28,  0, 52,  0, 20,  0, 60,  0,140,  0, 36,  0,120,  0, 32,  0,208,  0,  0,  0,  0,  0, 16,  0, 40,  0, 28,  0, 12,  0,
+ 12,  0, 16,  1, 40,  0,  8,  0,  8,  0, 64,  0, 32,  0, 24,  0,  8,  0, 24,  0, 32,  0,  8,  0, 32,  0, 12,  0, 44,  0, 20,  0,
+ 68,  0, 24,  0, 56,  0, 52,  0, 20,  0, 72,  0, 28,  0,180,  0,208,  1, 96,  0,  0,  0,  0,  0,  0,  0, 16,  0, 20,  0, 24,  0,
+172,  0, 24,  0, 24,  0,140,  0,148,  0, 56,  0,  0,  0,  0,  0,100,  0,  0,  0, 92,  0,  0,  0, 88,  0, 20,  0, 24,  0, 16,  0,
+ 20,  0,  8,  0,  8,  0, 24,  0, 20,  0, 88,  0, 24,  1, 16,  0, 68,  0,  0,  1, 20,  0,160,  0, 88,  0, 96,  0, 88,  0, 20,  0,
+ 56,  0, 48,  0, 68,  0, 56,  0, 92,  0, 64,  0, 56,  0, 96,  0,  0,  0,  0,  0, 83, 84, 82, 67,126,  1,  0,  0, 10,  0,  2,  0,
+ 10,  0,  0,  0, 10,  0,  1,  0, 11,  0,  3,  0, 11,  0,  0,  0, 11,  0,  1,  0,  9,  0,  2,  0, 12,  0,  2,  0,  9,  0,  3,  0,
+  9,  0,  4,  0, 13,  0,  2,  0,  2,  0,  5,  0,  2,  0,  6,  0, 14,  0,  2,  0,  4,  0,  5,  0,  4,  0,  6,  0, 15,  0,  2,  0,
+  7,  0,  5,  0,  7,  0,  6,  0, 16,  0,  2,  0,  8,  0,  5,  0,  8,  0,  6,  0, 17,  0,  3,  0,  4,  0,  5,  0,  4,  0,  6,  0,
+  4,  0,  7,  0, 18,  0,  3,  0,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0, 19,  0,  3,  0,  8,  0,  5,  0,  8,  0,  6,  0,
+  8,  0,  7,  0, 20,  0,  4,  0,  4,  0,  5,  0,  4,  0,  6,  0,  4,  0,  7,  0,  4,  0,  8,  0, 21,  0,  4,  0,  7,  0,  5,  0,
+  7,  0,  6,  0,  7,  0,  7,  0,  7,  0,  8,  0, 22,  0,  4,  0,  8,  0,  5,  0,  8,  0,  6,  0,  8,  0,  7,  0,  8,  0,  8,  0,
+ 23,  0,  4,  0,  4,  0,  9,  0,  4,  0, 10,  0,  4,  0, 11,  0,  4,  0, 12,  0, 24,  0,  4,  0,  7,  0,  9,  0,  7,  0, 10,  0,
+  7,  0, 11,  0,  7,  0, 12,  0, 25,  0,  4,  0,  9,  0, 13,  0, 12,  0, 14,  0,  4,  0, 15,  0,  4,  0, 16,  0, 26,  0, 10,  0,
+ 26,  0,  0,  0, 26,  0,  1,  0,  0,  0, 17,  0,  0,  0, 18,  0,  2,  0, 19,  0,  0,  0, 20,  0,  4,  0, 21,  0, 25,  0, 22,  0,
+  4,  0, 23,  0,  4,  0, 24,  0, 27,  0,  9,  0,  9,  0,  0,  0,  9,  0,  1,  0, 27,  0, 25,  0, 28,  0, 26,  0,  0,  0, 27,  0,
+  2,  0, 28,  0,  2,  0, 19,  0,  4,  0, 29,  0, 26,  0, 30,  0, 28,  0,  8,  0, 27,  0, 31,  0, 27,  0, 32,  0, 29,  0, 33,  0,
+  0,  0, 34,  0,  0,  0, 35,  0,  4,  0, 36,  0,  4,  0, 37,  0, 28,  0, 38,  0, 30,  0,  6,  0,  4,  0, 39,  0,  4,  0, 40,  0,
+  2,  0, 41,  0,  2,  0, 42,  0,  2,  0, 43,  0,  4,  0, 44,  0, 31,  0,  6,  0, 32,  0, 45,  0,  2,  0, 46,  0,  2,  0, 47,  0,
+  2,  0, 17,  0,  2,  0, 19,  0,  0,  0, 48,  0, 33,  0, 21,  0, 33,  0,  0,  0, 33,  0,  1,  0, 34,  0, 49,  0, 35,  0, 50,  0,
+ 24,  0, 51,  0, 24,  0, 52,  0,  2,  0, 46,  0,  2,  0, 47,  0,  2,  0, 53,  0,  2,  0, 54,  0,  2,  0, 55,  0,  2,  0, 56,  0,
+  2,  0, 19,  0,  2,  0, 57,  0,  7,  0, 11,  0,  7,  0, 12,  0,  4,  0, 58,  0,  7,  0, 59,  0,  7,  0, 60,  0,  7,  0, 61,  0,
+ 31,  0, 62,  0, 36,  0,  7,  0, 27,  0, 31,  0, 12,  0, 63,  0, 24,  0, 64,  0,  2,  0, 46,  0,  2,  0, 65,  0,  2,  0, 66,  0,
+  2,  0, 37,  0, 37,  0, 16,  0, 37,  0,  0,  0, 37,  0,  1,  0,  7,  0, 67,  0,  7,  0, 61,  0,  2,  0, 17,  0,  2,  0, 47,  0,
+  2,  0, 68,  0,  2,  0, 19,  0,  4,  0, 69,  0,  4,  0, 70,  0,  9,  0,  2,  0,  7,  0, 71,  0,  0,  0, 20,  0,  0,  0, 72,  0,
+  7,  0, 73,  0,  7,  0, 74,  0, 38,  0, 13,  0, 27,  0, 31,  0, 39,  0, 75,  0, 37,  0, 76,  0,  0,  0, 77,  0,  4,  0, 78,  0,
+  7,  0, 61,  0, 12,  0, 79,  0, 36,  0, 80,  0, 27,  0, 81,  0,  2,  0, 17,  0,  2,  0, 82,  0,  2,  0, 83,  0,  2,  0, 19,  0,
+ 40,  0,  6,  0, 40,  0,  0,  0, 40,  0,  1,  0,  0,  0, 84,  0,  0,  0, 85,  0,  4,  0, 23,  0,  4,  0, 86,  0, 41,  0, 10,  0,
+ 41,  0,  0,  0, 41,  0,  1,  0,  4,  0, 87,  0,  4,  0, 88,  0,  4,  0, 89,  0,  4,  0, 43,  0,  4,  0, 14,  0,  4,  0, 90,  0,
+  0,  0, 91,  0,  0,  0, 92,  0, 42,  0, 15,  0, 27,  0, 31,  0,  0,  0, 93,  0,  4,  0, 90,  0,  4,  0, 94,  0, 12,  0, 95,  0,
+ 40,  0, 96,  0, 40,  0, 97,  0,  4,  0, 98,  0,  4,  0, 99,  0, 12,  0,100,  0,  0,  0,101,  0,  4,  0,102,  0,  4,  0,103,  0,
+  9,  0,104,  0,  8,  0,105,  0, 43,  0,  3,  0,  4,  0,106,  0,  4,  0,107,  0,  9,  0,  2,  0, 44,  0, 20,  0, 27,  0, 31,  0,
+ 39,  0, 75,  0,  2,  0, 17,  0,  2,  0, 19,  0,  7,  0,108,  0,  7,  0,109,  0,  7,  0,110,  0,  7,  0,111,  0,  7,  0,112,  0,
+  7,  0,113,  0,  7,  0,114,  0,  7,  0,115,  0,  7,  0,116,  0,  7,  0,117,  0,  7,  0,118,  0,  2,  0,119,  0,  2,  0,120,  0,
+  7,  0,121,  0, 36,  0, 80,  0, 32,  0,122,  0, 45,  0, 13,  0,  4,  0,123,  0,  4,  0,124,  0,  4,  0,125,  0,  4,  0,126,  0,
+  2,  0,127,  0,  2,  0,128,  0,  2,  0, 19,  0,  2,  0,129,  0,  2,  0,130,  0,  2,  0,131,  0,  2,  0,132,  0,  2,  0,133,  0,
+ 46,  0,134,  0, 47,  0, 32,  0, 27,  0, 31,  0,  0,  0, 34,  0, 12,  0,135,  0, 48,  0,136,  0, 49,  0,137,  0, 50,  0,138,  0,
+  2,  0,129,  0,  2,  0, 19,  0,  2,  0,139,  0,  2,  0, 17,  0,  2,  0, 37,  0,  2,  0, 43,  0,  4,  0,140,  0,  2,  0,141,  0,
+  2,  0,142,  0,  2,  0,143,  0,  2,  0,144,  0,  2,  0,145,  0,  2,  0,146,  0,  4,  0,147,  0,  4,  0,148,  0, 43,  0,149,  0,
+ 30,  0,150,  0,  0,  0,151,  0,  7,  0,152,  0,  4,  0,153,  0,  2,  0,154,  0,  2,  0,155,  0,  2,  0,156,  0,  2,  0,157,  0,
+  7,  0,158,  0,  7,  0,159,  0, 51,  0, 33,  0,  2,  0,160,  0,  2,  0,161,  0,  2,  0,162,  0,  2,  0,163,  0, 32,  0,164,  0,
+ 52,  0,165,  0,  0,  0,166,  0,  0,  0,167,  0,  0,  0,168,  0,  0,  0,169,  0,  0,  0,170,  0,  7,  0,171,  0,  7,  0,172,  0,
+  7,  0,173,  0,  2,  0,174,  0,  2,  0,175,  0,  2,  0,176,  0,  2,  0,177,  0,  2,  0,178,  0,  2,  0,179,  0,  0,  0,180,  0,
+  0,  0,181,  0,  7,  0,182,  0,  7,  0,183,  0,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0, 57,  0,  7,  0,187,  0,
+  7,  0,188,  0,  7,  0,189,  0,  7,  0,190,  0,  7,  0,191,  0, 53,  0, 15,  0,  0,  0,192,  0,  9,  0,193,  0,  0,  0,194,  0,
+  0,  0,195,  0,  4,  0,196,  0,  4,  0,197,  0,  9,  0,198,  0,  7,  0,199,  0,  7,  0,200,  0,  7,  0,201,  0,  4,  0,202,  0,
+  9,  0,203,  0,  9,  0,204,  0,  4,  0,205,  0,  4,  0, 37,  0, 54,  0,  6,  0,  7,  0,182,  0,  7,  0,183,  0,  7,  0,184,  0,
+  7,  0,206,  0,  7,  0, 67,  0,  4,  0, 64,  0, 55,  0,  5,  0,  2,  0, 19,  0,  2,  0, 36,  0,  2,  0, 64,  0,  2,  0,207,  0,
+ 54,  0,201,  0, 56,  0, 17,  0, 32,  0,164,  0, 47,  0,208,  0, 57,  0,209,  0,  7,  0,210,  0,  7,  0,211,  0,  2,  0, 17,  0,
+  2,  0,212,  0,  7,  0,110,  0,  7,  0,111,  0,  7,  0,213,  0,  4,  0,214,  0,  2,  0,215,  0,  2,  0,216,  0,  4,  0,129,  0,
+  4,  0,140,  0,  2,  0,217,  0,  2,  0,218,  0, 58,  0, 23,  0,  2,  0, 19,  0,  2,  0,219,  0,  7,  0,220,  0,  7,  0,221,  0,
+  2,  0,139,  0,  2,  0,222,  0,  4,  0,223,  0,  4,  0,224,  0, 32,  0,164,  0, 59,  0,225,  0,  2,  0,226,  0,  2,  0,227,  0,
+  2,  0,228,  0,  9,  0,229,  0,  7,  0,230,  0,  7,  0,231,  0,  2,  0,232,  0,  2,  0,233,  0,  2,  0,234,  0,  2,  0,235,  0,
+  7,  0,236,  0,  7,  0,237,  0, 55,  0,238,  0, 60,  0, 10,  0,  4,  0,239,  0,  4,  0,240,  0,  2,  0,241,  0,  2,  0, 19,  0,
+  4,  0, 37,  0, 32,  0,164,  0,  7,  0,242,  0,  4,  0,243,  0,  0,  0,244,  0,  7,  0,245,  0, 52,  0, 61,  0, 27,  0, 31,  0,
+ 39,  0, 75,  0,  7,  0,246,  0,  7,  0,247,  0,  7,  0,248,  0,  7,  0,249,  0,  7,  0,250,  0,  7,  0,251,  0,  7,  0,252,  0,
+  7,  0,253,  0,  7,  0,254,  0,  7,  0,255,  0,  7,  0,  0,  1,  7,  0,  1,  1,  7,  0,  2,  1,  7,  0,  3,  1,  7,  0,  4,  1,
+  7,  0,  5,  1,  7,  0,  6,  1,  7,  0,  7,  1,  7,  0,  8,  1,  7,  0,  9,  1,  2,  0, 10,  1,  2,  0, 11,  1,  2,  0, 12,  1,
+  2,  0, 13,  1,  2,  0, 14,  1,  2,  0, 15,  1,  2,  0, 16,  1,  2,  0, 19,  0,  2,  0, 17,  0,  2,  0,212,  0,  7,  0, 17,  1,
+  7,  0, 18,  1,  7,  0, 19,  1,  7,  0, 20,  1,  4,  0, 21,  1,  4,  0, 22,  1,  2,  0, 23,  1,  2,  0, 24,  1,  2,  0, 25,  1,
+  2,  0,127,  0,  4,  0, 23,  0,  4,  0,124,  0,  4,  0,125,  0,  4,  0,126,  0,  7,  0, 26,  1,  7,  0, 27,  1,  7,  0,188,  0,
+ 45,  0, 28,  1, 61,  0, 29,  1, 36,  0, 80,  0, 47,  0,208,  0, 53,  0, 30,  1, 55,  0,238,  0, 56,  0, 31,  1, 30,  0,150,  0,
+ 58,  0, 32,  1, 60,  0, 33,  1,  0,  0, 34,  1,  0,  0,181,  0, 62,  0,  8,  0,  7,  0, 35,  1,  7,  0, 36,  1,  7,  0,172,  0,
+  4,  0, 19,  0,  7,  0, 37,  1,  7,  0, 38,  1,  7,  0, 39,  1, 32,  0, 45,  0, 63,  0, 82,  0, 27,  0, 31,  0, 39,  0, 75,  0,
+  2,  0, 17,  0,  2,  0, 19,  0,  4,  0, 40,  1,  2,  0,175,  0,  2,  0, 41,  1,  7,  0,182,  0,  7,  0,183,  0,  7,  0,184,  0,
+  7,  0,185,  0,  7,  0, 42,  1,  7,  0, 43,  1,  7,  0, 44,  1,  7,  0, 45,  1,  7,  0, 46,  1,  7,  0, 47,  1,  7,  0, 48,  1,
+  7,  0, 49,  1,  7,  0, 50,  1,  7,  0, 51,  1,  7,  0, 52,  1, 64,  0, 53,  1,  2,  0,219,  0,  2,  0, 70,  0,  7,  0,110,  0,
+  7,  0,111,  0,  7,  0, 54,  1,  7,  0, 55,  1,  7,  0, 56,  1,  2,  0, 57,  1,  2,  0, 58,  1,  2,  0, 59,  1,  2,  0, 60,  1,
+  0,  0, 61,  1,  0,  0, 62,  1,  2,  0, 63,  1,  2,  0, 64,  1,  2,  0, 65,  1,  2,  0, 66,  1,  2,  0, 67,  1,  7,  0, 68,  1,
+  7,  0, 69,  1,  7,  0, 70,  1,  7,  0, 71,  1,  2,  0, 72,  1,  2,  0, 43,  0,  2,  0, 73,  1,  2,  0, 74,  1,  2,  0, 75,  1,
+  2,  0, 76,  1,  7,  0, 77,  1,  7,  0, 78,  1,  7,  0, 79,  1,  7,  0, 80,  1,  7,  0, 81,  1,  7,  0, 82,  1,  7,  0, 83,  1,
+  7,  0, 84,  1,  7,  0, 85,  1,  7,  0, 86,  1,  7,  0, 87,  1,  7,  0, 88,  1,  2,  0, 89,  1,  2,  0, 90,  1,  4,  0, 91,  1,
+  4,  0, 92,  1,  2,  0, 93,  1,  2,  0, 94,  1,  2,  0, 95,  1,  2,  0, 96,  1,  7,  0, 97,  1,  7,  0, 98,  1,  7,  0, 99,  1,
+  7,  0,100,  1,  2,  0,101,  1,  2,  0,102,  1, 36,  0, 80,  0, 51,  0,103,  1,  2,  0,104,  1,  2,  0,105,  1, 30,  0,150,  0,
+ 65,  0,  2,  0, 27,  0, 31,  0, 36,  0, 80,  0, 66,  0, 20,  0,  7,  0,106,  1,  7,  0,107,  1,  7,  0,108,  1,  7,  0,109,  1,
+  7,  0,110,  1,  7,  0,111,  1,  7,  0,112,  1,  7,  0,113,  1,  2,  0,114,  1,  2,  0,115,  1,  7,  0,116,  1,  7,  0,117,  1,
+  7,  0,118,  1,  2,  0,119,  1,  2,  0,120,  1,  2,  0,121,  1,  2,  0,122,  1,  7,  0,123,  1,  7,  0,124,  1,  4,  0,125,  1,
+ 67,  0,130,  0, 27,  0, 31,  0, 39,  0, 75,  0,  2,  0,126,  1,  2,  0, 19,  0,  7,  0,182,  0,  7,  0,183,  0,  7,  0,184,  0,
+  7,  0,127,  1,  7,  0,128,  1,  7,  0,129,  1,  7,  0,130,  1,  7,  0,131,  1,  7,  0,132,  1,  7,  0,133,  1,  7,  0,134,  1,
+  7,  0,135,  1,  7,  0,136,  1,  7,  0,137,  1,  7,  0,138,  1,  7,  0,139,  1,  7,  0,140,  1,  7,  0,141,  1,  7,  0,142,  1,
+  7,  0,143,  1,  7,  0,144,  1,  7,  0,145,  1,  7,  0,146,  1, 66,  0,147,  1,  7,  0,148,  1,  7,  0,149,  1,  7,  0,150,  1,
+  7,  0,151,  1,  7,  0,152,  1,  7,  0,153,  1,  7,  0,154,  1,  2,  0,155,  1,  2,  0,156,  1,  2,  0,157,  1,  0,  0,158,  1,
+  0,  0,159,  1,  7,  0,160,  1,  7,  0,161,  1,  2,  0,162,  1,  2,  0,163,  1,  7,  0,164,  1,  7,  0,165,  1,  7,  0,166,  1,
+  7,  0,167,  1,  2,  0,168,  1,  2,  0,169,  1,  4,  0, 40,  1,  4,  0,170,  1,  2,  0,171,  1,  2,  0,172,  1,  2,  0,173,  1,
+  2,  0,174,  1,  7,  0,175,  1,  7,  0,176,  1,  7,  0,177,  1,  7,  0,178,  1,  7,  0,179,  1,  7,  0,180,  1,  7,  0,181,  1,
+  7,  0,182,  1,  7,  0,183,  1,  7,  0,184,  1,  0,  0,185,  1,  7,  0,186,  1,  7,  0,187,  1,  7,  0,188,  1,  4,  0,189,  1,
+  0,  0,190,  1,  0,  0, 73,  1,  0,  0,191,  1,  0,  0, 34,  1,  2,  0,192,  1,  2,  0,193,  1,  2,  0,104,  1,  2,  0,194,  1,
+  2,  0,195,  1,  2,  0,196,  1,  7,  0,197,  1,  7,  0,198,  1,  7,  0,199,  1,  7,  0,200,  1,  7,  0,201,  1,  2,  0,160,  0,
+  2,  0,161,  0, 55,  0,202,  1, 55,  0,203,  1,  0,  0,204,  1,  0,  0,205,  1,  0,  0,206,  1,  0,  0,207,  1,  2,  0,208,  1,
+  2,  0,209,  1,  7,  0,210,  1,  7,  0,211,  1, 51,  0,103,  1, 61,  0, 29,  1, 36,  0, 80,  0, 68,  0,212,  1, 30,  0,150,  0,
+  7,  0,213,  1,  7,  0,214,  1,  7,  0,215,  1,  7,  0,216,  1,  7,  0,217,  1,  2,  0,218,  1,  2,  0, 70,  0,  7,  0,219,  1,
+  7,  0,220,  1,  7,  0,221,  1,  7,  0,222,  1,  7,  0,223,  1,  7,  0,224,  1,  7,  0,225,  1,  7,  0,226,  1,  7,  0,227,  1,
+  2,  0,228,  1,  2,  0,229,  1,  7,  0,230,  1,  7,  0,231,  1,  7,  0,232,  1,  7,  0,233,  1,  7,  0,234,  1,  4,  0,235,  1,
+  4,  0,236,  1,  4,  0,237,  1, 12,  0,238,  1, 69,  0,  4,  0, 27,  0, 31,  0,  0,  0,239,  1, 70,  0,  2,  0, 43,  0,149,  0,
+ 71,  0, 26,  0, 71,  0,  0,  0, 71,  0,  1,  0, 72,  0,240,  1,  4,  0,241,  1,  4,  0,242,  1,  4,  0,243,  1,  4,  0,244,  1,
+  4,  0,245,  1,  4,  0,246,  1,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,247,  1,  2,  0,248,  1,  7,  0,  5,  0,  7,  0,  6,  0,
+  7,  0,  7,  0,  7,  0,249,  1,  7,  0,250,  1,  7,  0,251,  1,  7,  0,252,  1,  7,  0,253,  1,  7,  0,254,  1,  7,  0,255,  1,
+  7,  0, 23,  0,  7,  0,  0,  2,  7,  0,  1,  2, 73,  0, 19,  0, 27,  0, 31,  0, 39,  0, 75,  0, 72,  0,240,  1, 12,  0,  2,  2,
+ 12,  0,  3,  2, 12,  0,  4,  2, 36,  0, 80,  0, 67,  0,  5,  2,  0,  0, 19,  0,  0,  0,  6,  2,  2,  0,  7,  2,  4,  0,174,  0,
+  7,  0, 35,  1,  7,  0,172,  0,  7,  0, 36,  1,  7,  0,  8,  2,  7,  0,  9,  2,  7,  0, 10,  2, 71,  0, 11,  2, 35,  0, 11,  0,
+  7,  0, 12,  2,  7,  0, 13,  2,  7,  0, 14,  2,  7,  0,221,  0,  2,  0, 55,  0,  0,  0, 15,  2,  0,  0, 16,  2,  0,  0, 17,  2,
+  0,  0, 18,  2,  0,  0, 19,  2,  0,  0, 20,  2, 34,  0,  7,  0,  7,  0, 21,  2,  7,  0, 13,  2,  7,  0, 14,  2,  2,  0, 17,  2,
+  2,  0, 20,  2,  7,  0,221,  0,  7,  0, 37,  0, 74,  0, 21,  0, 74,  0,  0,  0, 74,  0,  1,  0,  2,  0, 17,  0,  2,  0, 22,  2,
+  2,  0, 20,  2,  2,  0, 19,  0,  2,  0, 23,  2,  2,  0, 24,  2,  2,  0, 25,  2,  2,  0, 26,  2,  2,  0, 27,  2,  2,  0, 28,  2,
+  2,  0, 29,  2,  2,  0, 30,  2,  7,  0, 31,  2,  7,  0, 32,  2, 34,  0, 49,  0, 35,  0, 50,  0,  2,  0, 33,  2,  2,  0, 34,  2,
+  4,  0, 35,  2, 75,  0,  5,  0,  2,  0, 36,  2,  2,  0, 22,  2,  0,  0, 19,  0,  0,  0, 37,  0,  2,  0, 70,  0, 76,  0,  4,  0,
+  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  8,  0,  7,  0, 37,  2, 77,  0, 67,  0, 27,  0, 31,  0, 39,  0, 75,  0, 72,  0,240,  1,
+ 12,  0, 38,  2, 12,  0,  3,  2, 12,  0, 39,  2, 32,  0, 40,  2, 32,  0, 41,  2, 32,  0, 42,  2, 36,  0, 80,  0, 78,  0, 43,  2,
+ 38,  0, 44,  2, 67,  0,  5,  2, 12,  0, 45,  2,  7,  0, 35,  1,  7,  0,172,  0,  7,  0, 36,  1,  4,  0,174,  0,  2,  0, 46,  2,
+  2,  0, 47,  2,  2,  0, 48,  2,  7,  0, 49,  2,  7,  0, 70,  0,  2,  0, 50,  2,  2,  0,  7,  2,  2,  0, 19,  0,  2,  0, 51,  2,
+  7,  0, 52,  2,  7,  0, 53,  2,  7,  0, 54,  2,  2,  0, 25,  2,  2,  0, 26,  2,  2,  0, 55,  2,  2,  0, 56,  2,  4,  0, 57,  2,
+ 34,  0, 58,  2,  2,  0, 23,  0,  2,  0, 95,  0,  2,  0, 67,  0,  2,  0, 59,  2,  7,  0, 60,  2,  7,  0, 61,  2,  7,  0, 62,  2,
+  7,  0, 63,  2,  7,  0, 64,  2,  7,  0, 65,  2,  7,  0, 66,  2,  7,  0, 67,  2,  7,  0, 68,  2,  7,  0, 69,  2,  0,  0, 70,  2,
+ 79,  0, 71,  2, 80,  0, 72,  2,  0,  0, 73,  2, 69,  0, 74,  2, 69,  0, 75,  2, 69,  0, 76,  2, 69,  0, 77,  2,  4,  0, 78,  2,
+  7,  0, 79,  2,  4,  0, 80,  2,  4,  0, 81,  2, 76,  0, 82,  2,  4,  0, 83,  2,  4,  0, 84,  2, 75,  0, 85,  2, 75,  0, 86,  2,
+ 81,  0, 39,  0, 27,  0, 31,  0, 72,  0,240,  1, 12,  0, 87,  2, 36,  0, 80,  0, 38,  0, 44,  2, 67,  0,  5,  2, 82,  0, 88,  2,
+ 83,  0, 89,  2, 84,  0, 90,  2, 85,  0, 91,  2, 86,  0, 92,  2, 87,  0, 93,  2, 88,  0, 94,  2, 89,  0, 95,  2, 81,  0, 96,  2,
+ 90,  0, 97,  2, 91,  0, 98,  2, 92,  0, 99,  2, 92,  0,100,  2, 92,  0,101,  2,  4,  0, 54,  0,  4,  0,102,  2,  4,  0,103,  2,
+  4,  0,104,  2,  4,  0,105,  2,  4,  0,174,  0,  7,  0, 35,  1,  7,  0,172,  0,  7,  0, 36,  1,  7,  0,106,  2,  4,  0, 46,  2,
+  2,  0,107,  2,  2,  0, 19,  0,  2,  0,108,  2,  2,  0,109,  2,  2,  0,  7,  2,  2,  0,110,  2, 93,  0,111,  2, 94,  0,112,  2,
+ 84,  0,  8,  0,  9,  0,113,  2,  7,  0,114,  2,  4,  0,115,  2,  0,  0, 19,  0,  0,  0,116,  2,  2,  0, 40,  1,  2,  0,117,  2,
+  2,  0,118,  2, 82,  0,  7,  0,  4,  0,119,  2,  4,  0,120,  2,  4,  0,121,  2,  4,  0,122,  2,  2,  0, 22,  2,  0,  0,123,  2,
+  0,  0, 19,  0, 86,  0,  5,  0,  4,  0,119,  2,  4,  0,120,  2,  0,  0,124,  2,  0,  0,125,  2,  2,  0, 19,  0, 95,  0,  2,  0,
+  4,  0,126,  2,  7,  0, 14,  2, 87,  0,  3,  0, 95,  0,127,  2,  4,  0,128,  2,  4,  0, 19,  0, 85,  0,  6,  0,  7,  0,129,  2,
+  2,  0,130,  2,  2,  0, 22,  2,  0,  0, 19,  0,  0,  0,125,  2,  0,  0, 48,  2, 88,  0,  4,  0,  0,  0,206,  0,  0,  0,182,  0,
+  0,  0,183,  0,  0,  0,184,  0, 96,  0,  6,  0, 47,  0,113,  2,  0,  0, 19,  0,  0,  0,116,  2,  2,  0, 40,  1,  2,  0,117,  2,
+  2,  0,118,  2, 97,  0,  1,  0,  7,  0,131,  2, 98,  0,  5,  0,  0,  0,206,  0,  0,  0,182,  0,  0,  0,183,  0,  0,  0,184,  0,
+  4,  0, 37,  0, 89,  0,  1,  0,  7,  0,132,  2, 90,  0,  2,  0,  4,  0,133,  2,  4,  0, 17,  0, 83,  0,  7,  0,  7,  0,114,  2,
+ 47,  0,113,  2,  0,  0, 19,  0,  0,  0,116,  2,  2,  0, 40,  1,  2,  0,117,  2,  2,  0,118,  2, 99,  0,  1,  0,  7,  0,134,  2,
+100,  0,  1,  0,  4,  0,135,  2,101,  0,  1,  0,  0,  0,136,  2,102,  0,  1,  0,  7,  0,114,  2,103,  0,  3,  0,  4,  0,137,  2,
+  0,  0, 92,  0,  7,  0,138,  2,105,  0,  4,  0,  7,  0,206,  0,  7,  0,182,  0,  7,  0,183,  0,  7,  0,184,  0,106,  0,  1,  0,
+105,  0,115,  2,107,  0,  5,  0,  4,  0,139,  2,  4,  0,140,  2,  0,  0, 19,  0,  0,  0, 22,  2,  0,  0, 48,  2,108,  0,  2,  0,
+  4,  0,141,  2,  4,  0,140,  2,109,  0, 10,  0,109,  0,  0,  0,109,  0,  1,  0,107,  0,142,  2,106,  0,143,  2,108,  0,144,  2,
+  4,  0, 54,  0,  4,  0,103,  2,  4,  0,102,  2,  4,  0, 37,  0, 85,  0,145,  2, 93,  0, 14,  0, 12,  0,146,  2, 85,  0,145,  2,
+  0,  0,147,  2,  0,  0,148,  2,  0,  0,149,  2,  0,  0,150,  2,  0,  0,151,  2,  0,  0,152,  2,  0,  0,153,  2,  0,  0, 19,  0,
+ 92,  0, 99,  2, 92,  0,101,  2,  2,  0,154,  2,  0,  0,155,  2, 94,  0,  8,  0,  4,  0,156,  2,  4,  0,157,  2, 82,  0,158,  2,
+ 86,  0,159,  2,  4,  0,103,  2,  4,  0,102,  2,  4,  0, 54,  0,  4,  0, 37,  0,110,  0,  7,  0,110,  0,  0,  0,110,  0,  1,  0,
+  4,  0, 17,  0,  4,  0, 40,  1,  0,  0, 20,  0, 46,  0,134,  0,  0,  0,160,  2,111,  0,  7,  0,110,  0,161,  2,  2,  0,162,  2,
+  2,  0,146,  2,  2,  0,163,  2,  2,  0, 90,  0,  9,  0,164,  2,  9,  0,165,  2,112,  0,  3,  0,110,  0,161,  2, 32,  0,164,  0,
+  0,  0, 20,  0,113,  0,  5,  0,110,  0,161,  2, 32,  0,164,  0,  0,  0, 20,  0,  2,  0,166,  2,  0,  0,167,  2,114,  0,  5,  0,
+110,  0,161,  2,  7,  0, 88,  0,  7,  0,168,  2,  4,  0,169,  2,  4,  0,170,  2,115,  0,  5,  0,110,  0,161,  2, 32,  0,171,  2,
+  0,  0, 72,  0,  4,  0, 40,  1,  4,  0, 19,  0,116,  0, 13,  0,110,  0,161,  2, 32,  0,172,  2, 32,  0,173,  2, 32,  0,174,  2,
+ 32,  0,175,  2,  7,  0,176,  2,  7,  0,177,  2,  7,  0,168,  2,  7,  0,178,  2,  4,  0,179,  2,  4,  0,180,  2,  4,  0, 90,  0,
+  4,  0,181,  2,117,  0,  5,  0,110,  0,161,  2,  2,  0,182,  2,  2,  0, 19,  0,  7,  0,183,  2, 32,  0,184,  2,118,  0,  3,  0,
+110,  0,161,  2,  7,  0,185,  2,  4,  0, 90,  0,119,  0, 10,  0,110,  0,161,  2,  7,  0,186,  2,  4,  0,187,  2,  4,  0, 37,  0,
+  2,  0, 90,  0,  2,  0,188,  2,  2,  0,189,  2,  2,  0,190,  2,  7,  0,191,  2,  0,  0,192,  2,120,  0,  3,  0,110,  0,161,  2,
+  7,  0, 37,  0,  4,  0, 17,  0,121,  0,  6,  0,110,  0,161,  2,122,  0,193,  2,123,  0,194,  2,124,  0,195,  2,  7,  0,196,  2,
+  4,  0, 17,  0,125,  0, 11,  0,110,  0,161,  2, 52,  0,197,  2,  7,  0,198,  2,  4,  0,199,  2,  0,  0,192,  2,  7,  0,200,  2,
+  4,  0,201,  2, 32,  0,202,  2,  0,  0,203,  2,  4,  0,204,  2,  4,  0, 37,  0,126,  0, 10,  0,110,  0,161,  2, 32,  0,205,  2,
+ 47,  0,206,  2,  4,  0, 90,  0,  4,  0,207,  2,  7,  0,208,  2,  7,  0,209,  2,  0,  0,203,  2,  4,  0,204,  2,  4,  0, 37,  0,
+127,  0,  3,  0,110,  0,161,  2,  7,  0,210,  2,  4,  0,211,  2,128,  0,  5,  0,110,  0,161,  2,  7,  0,212,  2,  0,  0,192,  2,
+  2,  0, 19,  0,  2,  0,213,  2,129,  0,  8,  0,110,  0,161,  2, 32,  0,164,  0,  7,  0,212,  2,  7,  0,221,  0,  7,  0,106,  0,
+  0,  0,192,  2,  2,  0, 19,  0,  2,  0, 17,  0,130,  0, 21,  0,110,  0,161,  2, 32,  0,214,  2,  0,  0,192,  2, 52,  0,197,  2,
+ 32,  0,202,  2,  2,  0, 19,  0,  2,  0, 37,  0,  7,  0,215,  2,  7,  0,216,  2,  7,  0,217,  2,  7,  0, 52,  2,  7,  0,218,  2,
+  7,  0,219,  2,  7,  0,220,  2,  7,  0,221,  2,  4,  0,201,  2,  4,  0,204,  2,  0,  0,203,  2,  7,  0,222,  2,  7,  0,223,  2,
+  7,  0, 43,  0,131,  0,  7,  0,110,  0,161,  2,  2,  0,224,  2,  2,  0,225,  2,  4,  0, 70,  0, 32,  0,164,  0,  7,  0,226,  2,
+  0,  0,192,  2,132,  0, 10,  0,110,  0,161,  2, 32,  0,164,  0,  0,  0,227,  2,  7,  0,228,  2,  7,  0,229,  2,  7,  0,221,  2,
+  4,  0,230,  2,  4,  0,231,  2,  7,  0,232,  2,  0,  0, 20,  0,133,  0,  1,  0,110,  0,161,  2,134,  0,  7,  0,110,  0,161,  2,
+ 46,  0,134,  0,135,  0,233,  2,136,  0,234,  2,137,  0,235,  2,138,  0,236,  2, 12,  0,237,  2,139,  0, 14,  0,110,  0,161,  2,
+ 85,  0,238,  2, 85,  0,239,  2, 85,  0,240,  2, 85,  0,241,  2, 85,  0,242,  2, 85,  0,243,  2, 82,  0,244,  2,  4,  0,245,  2,
+  4,  0,246,  2,  2,  0,108,  1,  2,  0, 37,  0,  7,  0,196,  2,140,  0,247,  2,141,  0,  7,  0,110,  0,161,  2, 85,  0,238,  2,
+ 85,  0,248,  2,142,  0,249,  2,143,  0,247,  2,  4,  0,250,  2,  4,  0,245,  2,144,  0,  4,  0,110,  0,161,  2, 32,  0,164,  0,
+  4,  0,251,  2,  4,  0, 37,  0,145,  0,  2,  0,  4,  0,252,  2,  7,  0, 14,  2,146,  0,  2,  0,  4,  0,125,  0,  4,  0,253,  2,
+147,  0, 20,  0,110,  0,161,  2, 32,  0,164,  0,  0,  0,192,  2,  2,  0,254,  2,  2,  0,255,  2,  2,  0, 19,  0,  2,  0, 37,  0,
+  7,  0,  0,  3,  7,  0,  1,  3,  4,  0, 54,  0,  4,  0,  2,  3,146,  0,  3,  3,145,  0,  4,  3,  4,  0,  5,  3,  4,  0,  6,  3,
+  4,  0,  7,  3,  4,  0,253,  2,  7,  0,  8,  3,  7,  0,  9,  3,  7,  0, 10,  3,148,  0,  8,  0,110,  0,161,  2, 59,  0,225,  0,
+142,  0,249,  2,  4,  0, 11,  3,  4,  0, 12,  3,  4,  0, 13,  3,  2,  0, 19,  0,  2,  0, 57,  0,149,  0,  8,  0,110,  0,161,  2,
+ 32,  0, 45,  0,  2,  0, 14,  3,  2,  0, 19,  0,  2,  0,182,  2,  2,  0, 57,  0,  7,  0, 15,  3,  7,  0, 16,  3,150,  0,  5,  0,
+110,  0,161,  2,  4,  0, 17,  3,  2,  0, 19,  0,  2,  0, 18,  3,  7,  0, 19,  3,151,  0,  7,  0,110,  0,161,  2, 85,  0, 20,  3,
+  4,  0, 21,  3,  0,  0, 22,  3,  0,  0, 23,  3,  0,  0, 24,  3,  0,  0, 25,  3,152,  0,  3,  0,110,  0,161,  2,153,  0, 26,  3,
+138,  0,236,  2,154,  0, 10,  0,110,  0,161,  2, 32,  0, 27,  3, 32,  0, 28,  3,  0,  0, 29,  3,  7,  0, 30,  3,  2,  0, 31,  3,
+  2,  0, 32,  3,  0,  0, 33,  3,  0,  0, 34,  3,  0,  0,167,  2,155,  0,  9,  0,110,  0,161,  2, 32,  0, 35,  3,  0,  0, 29,  3,
+  7,  0, 36,  3,  7,  0, 37,  3,  0,  0, 40,  1,  0,  0,182,  2,  0,  0, 38,  3,  0,  0, 37,  0,156,  0, 27,  0, 27,  0, 31,  0,
+  2,  0, 23,  2,  2,  0, 24,  2,  2,  0, 39,  3,  2,  0, 19,  0,  2,  0, 40,  3,  2,  0, 41,  3,  2,  0, 42,  3,  2,  0, 70,  0,
+  0,  0, 43,  3,  0,  0, 44,  3,  0,  0, 45,  3,  0,  0, 17,  0,  4,  0, 37,  0,  7,  0, 46,  3,  7,  0, 47,  3,  7,  0, 48,  3,
+  7,  0, 49,  3,  7,  0, 50,  3,  7,  0, 51,  3, 34,  0, 52,  3, 36,  0, 80,  0, 38,  0, 44,  2, 87,  0, 93,  2,  7,  0, 53,  3,
+  7,  0, 54,  3,156,  0, 55,  3,157,  0,  3,  0,157,  0,  0,  0,157,  0,  1,  0,  0,  0, 20,  0, 72,  0,  3,  0,  7,  0, 56,  3,
+  4,  0, 19,  0,  4,  0, 37,  0, 32,  0,116,  0, 27,  0, 31,  0, 39,  0, 75,  0,158,  0, 57,  3,  2,  0, 17,  0,  2,  0, 58,  3,
+  4,  0, 59,  3,  4,  0, 60,  3,  4,  0, 61,  3,  0,  0, 62,  3, 32,  0, 38,  0, 32,  0, 63,  3, 32,  0, 64,  3, 32,  0, 65,  3,
+ 32,  0, 66,  3, 36,  0, 80,  0, 78,  0, 43,  2, 72,  0,240,  1,159,  0, 67,  3,159,  0, 68,  3,160,  0, 69,  3,  9,  0,  2,  0,
+161,  0, 70,  3, 12,  0, 71,  3, 12,  0, 87,  2, 12,  0,  3,  2, 12,  0, 72,  3, 12,  0, 73,  3,  4,  0, 40,  1,  4,  0, 74,  3,
+ 67,  0,  5,  2,  0,  0, 75,  3,  4,  0,  7,  2,  4,  0, 76,  3,  7,  0, 35,  1,  7,  0, 77,  3,  7,  0, 78,  3,  7,  0,172,  0,
+  7,  0, 79,  3,  7,  0, 36,  1,  7,  0, 80,  3,  7,  0, 81,  3,  7,  0,228,  2,  7,  0, 82,  3,  7,  0,210,  0,  4,  0, 83,  3,
+  2,  0, 19,  0,  2,  0, 84,  3,  2,  0, 85,  3,  2,  0, 86,  3,  2,  0, 87,  3,  2,  0, 88,  3,  2,  0, 89,  3,  2,  0, 90,  3,
+  2,  0, 91,  3,  2,  0, 92,  3,  2,  0, 93,  3,  2,  0, 94,  3,  4,  0, 95,  3,  4,  0, 96,  3,  4,  0, 97,  3,  4,  0, 98,  3,
+  7,  0, 99,  3,  7,  0, 79,  2,  7,  0,100,  3,  7,  0,101,  3,  7,  0,102,  3,  7,  0,103,  3,  7,  0,104,  3,  7,  0,105,  3,
+  7,  0,106,  3,  7,  0,107,  3,  7,  0,108,  3,  7,  0,109,  3,  0,  0,110,  3,  0,  0,111,  3,  0,  0,112,  3,  0,  0,113,  3,
+  7,  0,114,  3,  7,  0,115,  3, 12,  0,116,  3, 12,  0,117,  3, 12,  0,118,  3, 12,  0,119,  3,  7,  0,120,  3,  2,  0,133,  2,
+  2,  0,121,  3,  7,  0,115,  2,  4,  0,122,  3,  4,  0,123,  3,162,  0,124,  3,  2,  0,125,  3,  2,  0,217,  0,  7,  0,126,  3,
+ 12,  0,127,  3, 12,  0,128,  3, 12,  0,129,  3, 12,  0,130,  3,163,  0, 32,  1,164,  0,131,  3, 68,  0,132,  3,  2,  0,133,  3,
+  2,  0,134,  3,  2,  0,135,  3,  2,  0,136,  3,  7,  0,107,  2,  2,  0,137,  3,  2,  0,138,  3,153,  0,139,  3,142,  0,140,  3,
+142,  0,141,  3,  4,  0,142,  3,  4,  0,143,  3,  4,  0,144,  3,  4,  0, 70,  0, 12,  0,145,  3, 12,  0,146,  3,165,  0, 14,  0,
+165,  0,  0,  0,165,  0,  1,  0, 32,  0, 38,  0,  7,  0,228,  2,  7,  0, 37,  1,  7,  0,229,  2,  7,  0,221,  2,  0,  0, 20,  0,
+  4,  0,230,  2,  4,  0,231,  2,  4,  0,147,  3,  2,  0, 17,  0,  2,  0,148,  3,  7,  0,232,  2,163,  0, 36,  0,  2,  0,149,  3,
+  2,  0,150,  3,  2,  0, 19,  0,  2,  0,221,  2,  7,  0,151,  3,  7,  0,152,  3,  7,  0,153,  3,  7,  0,154,  3,  7,  0,155,  3,
+  7,  0,156,  3,  7,  0,157,  3,  7,  0,158,  3,  7,  0,159,  3,  7,  0,160,  3,  7,  0,161,  3,  7,  0,162,  3,  7,  0,163,  3,
+  7,  0,164,  3,  7,  0,165,  3,  7,  0,166,  3,  7,  0,167,  3,  7,  0,168,  3,  7,  0,169,  3,  7,  0,170,  3,  7,  0,171,  3,
+  7,  0,172,  3,  7,  0,173,  3,  7,  0,174,  3,  2,  0,175,  3,  2,  0,176,  3,  2,  0,177,  3,  2,  0,178,  3, 52,  0,165,  0,
+166,  0,179,  3,  7,  0,180,  3,  4,  0,170,  2,167,  0,  9,  0,167,  0,  0,  0,167,  0,  1,  0,  4,  0,181,  3,  4,  0,182,  3,
+  4,  0,183,  3,  4,  0, 19,  0,  4,  0,184,  3,  9,  0,185,  3,  9,  0,186,  3,138,  0, 19,  0,138,  0,  0,  0,138,  0,  1,  0,
+  4,  0, 19,  0,  4,  0,187,  3,  4,  0,188,  3,  4,  0,189,  3,  4,  0,190,  3,  4,  0,191,  3,  4,  0,192,  3,  4,  0,182,  3,
+  4,  0,133,  2,  4,  0, 57,  0,  0,  0,193,  3,  0,  0,194,  3,  0,  0,195,  3,  0,  0,196,  3, 12,  0,197,  3,168,  0,198,  3,
+  9,  0,199,  3,169,  0,  1,  0,  7,  0, 21,  2,162,  0, 30,  0,  4,  0, 19,  0,  7,  0,200,  3,  7,  0,201,  3,  7,  0,202,  3,
+  4,  0,203,  3,  4,  0,204,  3,  4,  0,205,  3,  4,  0,206,  3,  7,  0,207,  3,  7,  0,208,  3,  7,  0,209,  3,  7,  0,210,  3,
+  7,  0,211,  3,  7,  0,212,  3,  7,  0,213,  3,  7,  0,214,  3,  7,  0,215,  3,  7,  0,216,  3,  7,  0,217,  3,  7,  0,218,  3,
+  7,  0,219,  3,  7,  0,220,  3,  7,  0,221,  3,  7,  0,222,  3,  7,  0,223,  3,  7,  0,224,  3,  4,  0,225,  3,  4,  0,226,  3,
+  7,  0,227,  3,  7,  0,106,  3,164,  0, 49,  0,  4,  0,182,  3,  4,  0,228,  3,170,  0,229,  3,171,  0,230,  3,  0,  0, 37,  0,
+  0,  0,231,  3,  2,  0,232,  3,  7,  0,233,  3,  0,  0,234,  3,  7,  0,235,  3,  7,  0,236,  3,  7,  0,237,  3,  7,  0,238,  3,
+  7,  0,239,  3,  7,  0,240,  3,  7,  0,241,  3,  7,  0,242,  3,  7,  0,243,  3,  2,  0,244,  3,  0,  0,245,  3,  2,  0,246,  3,
+  7,  0,247,  3,  7,  0,248,  3,  0,  0,249,  3,  4,  0,126,  0,  4,  0,250,  3,  4,  0,251,  3,  2,  0,252,  3,  2,  0,253,  3,
+169,  0,254,  3,  4,  0,255,  3,  4,  0, 82,  0,  7,  0,  0,  4,  7,  0,  1,  4,  7,  0,  2,  4,  7,  0,  3,  4,  2,  0,  4,  4,
+  2,  0,  5,  4,  2,  0,  6,  4,  2,  0,  7,  4,  2,  0,  8,  4,  2,  0,  9,  4,  2,  0, 10,  4,  2,  0, 11,  4,172,  0, 12,  4,
+  7,  0, 13,  4,  7,  0, 14,  4,138,  0, 15,  4, 12,  0,237,  2,153,  0, 48,  0,  2,  0, 17,  0,  2,  0, 16,  4,  2,  0, 17,  4,
+  2,  0, 18,  4,  7,  0, 19,  4,  2,  0, 20,  4,  2,  0, 21,  4,  7,  0, 22,  4,  2,  0, 23,  4,  2,  0, 24,  4,  7,  0, 25,  4,
+  7,  0, 26,  4,  7,  0, 27,  4,  7,  0, 28,  4,  7,  0, 29,  4,  7,  0, 30,  4,  4,  0, 31,  4,  7,  0, 32,  4,  7,  0, 33,  4,
+  7,  0, 34,  4, 81,  0, 35,  4, 81,  0, 36,  4, 81,  0, 37,  4,  0,  0, 38,  4,  7,  0, 39,  4,  7,  0, 40,  4, 36,  0, 80,  0,
+  2,  0, 41,  4,  0,  0, 42,  4,  0,  0, 43,  4,  7,  0, 44,  4,  4,  0, 45,  4,  7,  0, 46,  4,  7,  0, 47,  4,  4,  0, 48,  4,
+  4,  0, 19,  0,  7,  0, 49,  4,  7,  0, 50,  4,  7,  0, 51,  4, 85,  0, 52,  4,  7,  0, 53,  4,  7,  0, 54,  4,  7,  0, 55,  4,
+  7,  0, 56,  4,  7,  0, 57,  4,  7,  0, 58,  4,  7,  0, 59,  4,  4,  0, 60,  4,173,  0, 73,  0, 27,  0, 31,  0, 39,  0, 75,  0,
+  2,  0,175,  0,  2,  0, 41,  1,  2,  0, 73,  1,  2,  0, 61,  4,  7,  0, 62,  4,  7,  0, 63,  4,  7,  0, 64,  4,  7,  0, 65,  4,
+  7,  0, 66,  4,  7,  0, 67,  4,  7,  0, 68,  4,  7,  0, 69,  4,  7,  0,133,  1,  7,  0,135,  1,  7,  0,134,  1,  7,  0, 70,  4,
+  4,  0, 71,  4,  7,  0, 72,  4,  7,  0, 73,  4,  7,  0, 74,  4,  7,  0, 75,  4,  7,  0, 76,  4,  7,  0, 77,  4,  7,  0, 78,  4,
+  2,  0, 79,  4,  2,  0, 40,  1,  2,  0, 80,  4,  2,  0, 81,  4,  2,  0, 82,  4,  2,  0, 83,  4,  2,  0, 84,  4,  2,  0, 85,  4,
+  7,  0, 86,  4,  7,  0, 87,  4,  7,  0, 88,  4,  7,  0, 89,  4,  7,  0, 90,  4,  7,  0, 91,  4,  7,  0, 92,  4,  7,  0, 93,  4,
+  7,  0, 94,  4,  7,  0, 95,  4,  7,  0, 96,  4,  7,  0, 97,  4,  2,  0, 98,  4,  2,  0, 99,  4,  2,  0,100,  4,  2,  0,101,  4,
+  7,  0,102,  4,  7,  0,103,  4,  7,  0,104,  4,  7,  0,105,  4,  2,  0,106,  4,  2,  0,107,  4,  2,  0,108,  4,  2,  0,109,  4,
+  7,  0,110,  4,  7,  0,111,  4,  7,  0,112,  4,  7,  0,113,  4,  2,  0,114,  4,  2,  0,115,  4,  2,  0,116,  4,  2,  0, 19,  0,
+  7,  0,117,  4,  7,  0,118,  4, 36,  0, 80,  0, 51,  0,103,  1,  2,  0,104,  1,  2,  0,105,  1, 30,  0,150,  0,174,  0,  8,  0,
+174,  0,  0,  0,174,  0,  1,  0,  4,  0, 83,  3,  4,  0,119,  4,  4,  0, 19,  0,  2,  0,120,  4,  2,  0,121,  4, 32,  0,164,  0,
+175,  0, 13,  0,  9,  0,122,  4,  9,  0,123,  4,  4,  0,124,  4,  4,  0,125,  4,  4,  0,126,  4,  4,  0,127,  4,  4,  0,128,  4,
+  4,  0,129,  4,  4,  0,130,  4,  4,  0,131,  4,  4,  0,132,  4,  4,  0, 37,  0,  0,  0,133,  4,176,  0,  5,  0,  9,  0,134,  4,
+  9,  0,135,  4,  4,  0,136,  4,  4,  0, 70,  0,  0,  0,137,  4,177,  0, 13,  0,  4,  0, 17,  0,  4,  0,138,  4,  4,  0,139,  4,
+  4,  0,140,  4,  4,  0,141,  4,  4,  0,142,  4,  4,  0, 90,  0,  4,  0,143,  4,  4,  0,144,  4,  4,  0,145,  4,  4,  0,146,  4,
+  4,  0,147,  4, 26,  0, 30,  0,178,  0,  4,  0,  4,  0,148,  4,  7,  0,149,  4,  2,  0, 19,  0,  2,  0,105,  1,179,  0, 11,  0,
+179,  0,  0,  0,179,  0,  1,  0,  0,  0, 20,  0, 67,  0,150,  4, 68,  0,151,  4,  4,  0, 83,  3,  4,  0,152,  4,  4,  0,153,  4,
+  4,  0, 37,  0,  4,  0,154,  4,  4,  0,155,  4,180,  0,132,  0,175,  0,156,  4,176,  0,157,  4,177,  0,158,  4,178,  0,159,  4,
+  4,  0,250,  2,  4,  0,126,  0,  4,  0,250,  3,  4,  0,160,  4,  4,  0,161,  4,  4,  0,162,  4,  4,  0,163,  4,  2,  0, 19,  0,
+  2,  0,164,  4,  7,  0, 79,  2,  7,  0,165,  4,  7,  0,166,  4,  7,  0,167,  4,  7,  0,168,  4,  7,  0,169,  4,  2,  0,170,  4,
+  2,  0,171,  4,  2,  0,172,  4,  2,  0,173,  4,  2,  0,216,  0,  2,  0,174,  4,  2,  0,175,  4,  2,  0,178,  3,  2,  0,176,  4,
+  2,  0,177,  4,  2,  0, 60,  1,  2,  0,106,  0,  2,  0,178,  4,  2,  0,179,  4,  2,  0,180,  4,  2,  0,181,  4,  2,  0,182,  4,
+  2,  0,183,  4,  2,  0,184,  4,  2,  0,185,  4,  2,  0,186,  4,  2,  0, 61,  1,  2,  0,187,  4,  2,  0,188,  4,  2,  0,189,  4,
+  2,  0,190,  4,  4,  0,191,  4,  4,  0, 40,  1,  2,  0,192,  4,  2,  0,193,  4,  2,  0,194,  4,  2,  0,195,  4,  2,  0,196,  4,
+  2,  0,197,  4, 24,  0,198,  4, 24,  0,199,  4, 23,  0,200,  4, 12,  0,201,  4,  2,  0,202,  4,  2,  0, 37,  0,  7,  0,203,  4,
+  7,  0,204,  4,  7,  0,205,  4,  7,  0,206,  4,  4,  0,207,  4,  7,  0,208,  4,  7,  0,209,  4,  7,  0,210,  4,  7,  0,211,  4,
+  2,  0,212,  4,  2,  0,213,  4,  2,  0,214,  4,  2,  0,215,  4,  2,  0,216,  4,  2,  0,217,  4,  7,  0,218,  4,  7,  0,219,  4,
+  7,  0,220,  4,  2,  0,221,  4,  2,  0,222,  4,  2,  0,223,  4,  2,  0,224,  4,  2,  0,225,  4,  2,  0,226,  4,  2,  0,227,  4,
+  2,  0,228,  4,  2,  0,229,  4,  2,  0,230,  4,  4,  0,231,  4,  4,  0,232,  4,  4,  0,233,  4,  4,  0,234,  4,  4,  0,235,  4,
+  7,  0,236,  4,  4,  0,237,  4,  4,  0,238,  4,  4,  0,239,  4,  4,  0,240,  4,  7,  0,241,  4,  7,  0,242,  4,  7,  0,243,  4,
+  7,  0,244,  4,  7,  0,245,  4,  7,  0,246,  4,  7,  0,247,  4,  7,  0,248,  4,  7,  0,249,  4,  0,  0,250,  4,  0,  0,251,  4,
+  4,  0,252,  4,  2,  0,253,  4,  2,  0,209,  1,  0,  0,254,  4,  7,  0,255,  4,  7,  0,  0,  5,  4,  0,  1,  5,  4,  0,  2,  5,
+  7,  0,  3,  5,  7,  0,  4,  5,  2,  0,  5,  5,  2,  0,  6,  5,  7,  0,  7,  5,  2,  0,  8,  5,  2,  0,  9,  5,  4,  0, 10,  5,
+  2,  0, 11,  5,  2,  0, 12,  5,  2,  0, 13,  5,  2,  0, 14,  5,  7,  0, 15,  5,  7,  0, 70,  0, 42,  0, 16,  5,  0,  0, 17,  5,
+181,  0,  9,  0,181,  0,  0,  0,181,  0,  1,  0,  0,  0, 20,  0,  2,  0, 18,  5,  2,  0, 19,  5,  2,  0, 20,  5,  2,  0, 43,  0,
+  7,  0, 21,  5,  7,  0, 70,  0,182,  0,  7,  0,  2,  0,187,  2,  2,  0, 40,  1,  2,  0,109,  0,  2,  0, 22,  5,  7,  0, 23,  5,
+  7,  0, 70,  0, 42,  0, 24,  5,183,  0,  5,  0,  7,  0, 25,  5,  0,  0, 17,  0,  0,  0, 43,  0,  0,  0, 70,  0,  0,  0,209,  1,
+184,  0, 26,  0,  7,  0, 77,  4,  7,  0, 78,  4,  2,  0, 40,  1,  2,  0, 19,  0,  2,  0, 26,  5,  2,  0,105,  1,  2,  0, 80,  4,
+  2,  0, 81,  4,  2,  0, 82,  4,  2,  0, 83,  4,  2,  0, 84,  4,  2,  0, 85,  4,183,  0, 27,  5,  2,  0,170,  4,  2,  0,171,  4,
+  2,  0,172,  4,  2,  0,173,  4,  2,  0,216,  0,  2,  0,174,  4,  2,  0,175,  4,  2,  0,178,  3,182,  0, 28,  5,  2,  0, 29,  5,
+  2,  0,176,  4,  2,  0,179,  4,  2,  0,180,  4,185,  0,  5,  0,185,  0,  0,  0,185,  0,  1,  0,  4,  0,181,  3,  0,  0,193,  3,
+  4,  0, 19,  0,186,  0,  6,  0,187,  0, 30,  5,  4,  0, 31,  5,  4,  0, 32,  5,  9,  0, 33,  5,  0,  0, 34,  5,  4,  0, 37,  0,
+188,  0,  6,  0,186,  0, 35,  5,  2,  0, 19,  0,  2,  0, 36,  5,  2,  0, 37,  5,  2,  0, 38,  5,  9,  0, 39,  5,189,  0,  4,  0,
+  2,  0,106,  0,  2,  0,198,  2,  2,  0,187,  3,  2,  0, 40,  5,190,  0, 14,  0,  2,  0, 19,  0,  2,  0, 41,  5,  2,  0, 42,  5,
+  2,  0, 43,  5,189,  0, 44,  5,  9,  0, 39,  5,  7,  0, 45,  5,  7,  0, 57,  0,  4,  0, 46,  5,  4,  0, 47,  5,  4,  0, 48,  5,
+  4,  0, 49,  5, 46,  0,134,  0, 32,  0,164,  0,191,  0,  4,  0,191,  0,  0,  0,191,  0,  1,  0,  0,  0, 50,  5,  7,  0, 51,  5,
+192,  0,  6,  0,186,  0, 35,  5,  7,  0, 52,  5,  4,  0, 90,  0,  0,  0, 53,  5,  0,  0, 54,  5,  0,  0,167,  2,193,  0,  9,  0,
+186,  0, 35,  5,  7,  0, 55,  5,  7,  0, 56,  5,  2,  0, 40,  1,  2,  0, 19,  0,  4,  0, 36,  0,  4,  0, 57,  5, 87,  0, 58,  5,
+  9,  0, 39,  5,194,  0, 72,  0,193,  0, 59,  5,193,  0, 60,  5,192,  0, 57,  3,  7,  0, 61,  5,  2,  0, 62,  5,  2,  0, 63,  5,
+  7,  0, 64,  5,  7,  0, 65,  5,  2,  0,187,  3,  2,  0, 66,  5,  7,  0, 67,  5,  7,  0, 68,  5,  7,  0, 69,  5,  2,  0, 70,  5,
+  2,  0, 46,  5,  2,  0, 71,  5,  2,  0, 72,  5,  2,  0, 73,  5,  2,  0, 74,  5,  7,  0, 75,  5,  7,  0, 76,  5,  7,  0, 77,  5,
+  2,  0, 78,  5,  2,  0, 79,  5,  2,  0, 80,  5,  2,  0, 81,  5,  2,  0, 82,  5,  2,  0, 83,  5,  2,  0, 84,  5,188,  0, 85,  5,
+190,  0, 86,  5,  7,  0, 87,  5,  7,  0, 88,  5,  7,  0, 89,  5,  2,  0, 90,  5,  2,  0, 91,  5,  0,  0, 92,  5,  0,  0, 93,  5,
+  0,  0, 94,  5,  0,  0, 95,  5,  0,  0, 96,  5,  0,  0, 97,  5,  2,  0, 98,  5,  7,  0, 99,  5,  7,  0,100,  5,  7,  0,101,  5,
+  7,  0,102,  5,  7,  0,103,  5,  7,  0,104,  5,  7,  0,105,  5,  7,  0,106,  5,  7,  0,107,  5,  7,  0,108,  5,  2,  0,109,  5,
+  0,  0,110,  5,  0,  0,111,  5,  0,  0,112,  5,  0,  0,113,  5, 32,  0,114,  5,  0,  0,115,  5,  0,  0,116,  5,  0,  0,117,  5,
+  0,  0,118,  5,  0,  0,119,  5,  0,  0,120,  5,  0,  0,121,  5,  0,  0,122,  5,  2,  0,123,  5,  2,  0,124,  5,  2,  0,125,  5,
+  2,  0,126,  5,  2,  0,127,  5,195,  0,  8,  0,  4,  0,128,  5,  4,  0,129,  5,  4,  0,130,  5,  4,  0,131,  5,  4,  0,132,  5,
+  4,  0,133,  5,  4,  0, 54,  0,  4,  0,103,  2,196,  0,  3,  0,  7,  0,134,  5,  2,  0,135,  5,  2,  0, 19,  0, 46,  0, 37,  0,
+ 27,  0, 31,  0, 39,  0, 75,  0, 32,  0,136,  5,173,  0,137,  5, 46,  0,138,  5, 47,  0,208,  0, 12,  0,139,  5,174,  0,140,  5,
+ 32,  0,141,  5,  7,  0,142,  5,  7,  0,143,  5,  7,  0,144,  5,  7,  0,145,  5,  4,  0, 83,  3,  2,  0, 19,  0,  2,  0, 34,  1,
+ 61,  0, 29,  1,197,  0,146,  5,194,  0,147,  5,198,  0,148,  5,180,  0,182,  0,178,  0,159,  4, 12,  0,100,  0, 12,  0,149,  5,
+ 12,  0,150,  5,199,  0,151,  5,  2,  0,152,  5,  2,  0,153,  5,  2,  0,217,  0,  2,  0,154,  5,  4,  0,155,  5,  4,  0,156,  5,
+ 12,  0,157,  5,183,  0, 27,  5,184,  0,158,  5,196,  0,159,  5,161,  0, 70,  3,200,  0,  6,  0, 47,  0,208,  0, 45,  0, 28,  1,
+  7,  0, 67,  2,  7,  0, 68,  2,  7,  0,106,  0,  7,  0,160,  5,201,  0, 35,  0,  7,  0,161,  5,  7,  0,162,  5,  7,  0,163,  5,
+  7,  0,164,  5,  7,  0,165,  5,  7,  0,166,  5,  7,  0,167,  5,  7,  0,168,  5,  7,  0,169,  5,  7,  0, 47,  1,  7,  0,170,  5,
+  7,  0,171,  5,  7,  0,172,  5,  7,  0,173,  5,  7,  0,171,  0,  2,  0,174,  5,  2,  0,175,  5,  4,  0,176,  5,  2,  0,177,  5,
+  2,  0,178,  5,  2,  0,179,  5,  2,  0,180,  5,  7,  0,181,  5, 72,  0,182,  5,161,  0, 70,  3,201,  0,183,  5,202,  0,184,  5,
+203,  0,185,  5,204,  0,186,  5,205,  0,187,  5,206,  0,188,  5,  7,  0,189,  5,  2,  0,190,  5,  2,  0,191,  5,  4,  0,209,  1,
+207,  0, 54,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,  7,  0,169,  5,
+  7,  0, 47,  1,  7,  0, 43,  0,  4,  0,196,  5,  2,  0,179,  5,  2,  0,180,  5, 32,  0,136,  5, 32,  0,197,  5,200,  0,198,  5,
+207,  0,183,  5,  0,  0,199,  5,  4,  0, 83,  3,  4,  0,200,  5,  2,  0,201,  5,  2,  0,202,  5,  2,  0,203,  5,  2,  0,204,  5,
+  2,  0,209,  1,  2,  0, 19,  0,  2,  0,  6,  2,  2,  0,205,  5,  7,  0,112,  0,  7,  0,206,  5,  7,  0,207,  5,  7,  0,208,  5,
+  7,  0,209,  5,  7,  0,210,  5,  7,  0,171,  0,  7,  0,142,  5,  2,  0,211,  5,  2,  0, 90,  1,  2,  0,212,  5,  2,  0,213,  5,
+  2,  0,214,  5,  2,  0,215,  5,  2,  0,216,  5,  2,  0,217,  5,  2,  0,218,  5,  2,  0,219,  5,  4,  0,220,  5, 12,  0,221,  5,
+  2,  0,222,  5,  2,  0,116,  2,  2,  0,223,  5,  0,  0,224,  5,  0,  0,225,  5,  9,  0,226,  5,161,  0, 70,  3,209,  0, 25,  0,
+ 24,  0, 36,  0, 24,  0, 64,  0, 23,  0,227,  5, 23,  0,228,  5, 23,  0,229,  5,  7,  0,230,  5,  7,  0,231,  5,  7,  0,232,  5,
+  7,  0,233,  5,  2,  0,234,  5,  2,  0,235,  5,  2,  0,236,  5,  2,  0,237,  5,  2,  0,238,  5,  2,  0, 19,  0,  2,  0,239,  5,
+  2,  0,240,  5,  2,  0,241,  5,  2,  0,242,  5,  2,  0,243,  5,  2,  0,204,  5,  7,  0,244,  5,  7,  0,245,  5,  4,  0,246,  5,
+  4,  0,247,  5,208,  0,  6,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,
+210,  0,  8,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,211,  0,248,  5,
+ 46,  0,134,  0,212,  0, 14,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,
+209,  0,249,  5,213,  0,250,  5, 12,  0,251,  5,  2,  0, 40,  1,  2,  0, 19,  0,  2,  0,252,  5,  0,  0,253,  5,  0,  0,254,  5,
+214,  0, 20,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,202,  0,184,  5,
+209,  0,249,  5,  2,  0,255,  5,  2,  0,  0,  6,  2,  0,  1,  6,  2,  0,  2,  6,  2,  0,239,  5,  2,  0,  3,  6,  0,  0, 19,  0,
+  0,  0,105,  1,  9,  0, 43,  2,  4,  0,  4,  6,  4,  0,  5,  6, 27,  0,  6,  6,215,  0, 16,  0,208,  0,  0,  0,208,  0,  1,  0,
+ 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,209,  0,249,  5,  7,  0, 67,  2,  7,  0, 68,  2,  2,  0,255,  5,
+  2,  0,  7,  6,  2,  0,  8,  6,  2,  0,  9,  6,  4,  0, 19,  0,  7,  0, 10,  6,161,  0, 70,  3,216,  0, 16,  0,  0,  0, 11,  6,
+  0,  0, 12,  6,  0,  0, 13,  6,  0,  0, 14,  6,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0, 15,  6,  2,  0, 16,  6,  2,  0,152,  1,
+  2,  0, 17,  6,  4,  0, 18,  6,  4,  0, 19,  6,  2,  0, 20,  6,  2,  0, 21,  6,  0,  0, 22,  6,  0,  0, 23,  6,217,  0, 16,  0,
+208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  4,  0, 37,  0,216,  0, 24,  6,218,  0, 25,  6, 12,  0, 26,  6,
+ 12,  0, 27,  6,219,  0, 28,  6,206,  0, 29,  6,220,  0, 30,  6,  2,  0, 31,  6,  2,  0, 32,  6,  2,  0, 33,  6,  2,  0, 70,  0,
+221,  0, 17,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,209,  0,249,  5,
+ 12,  0, 34,  6,222,  0, 35,  6,  0,  0, 36,  6,223,  0, 37,  6,  4,  0, 38,  6,  4,  0, 39,  6,  2,  0, 19,  0,  2,  0, 40,  6,
+  2,  0, 41,  6,  2,  0, 37,  0,224,  0, 29,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,
+  2,  0,195,  5, 47,  0,206,  2, 45,  0, 28,  1, 64,  0, 42,  6,  2,  0,133,  0,  2,  0, 43,  6,  2,  0, 70,  0,  2,  0, 44,  6,
+  4,  0, 19,  0,  2,  0, 45,  6,  2,  0,254,  5,  2,  0,253,  5,  2,  0,209,  1,  0,  0, 46,  6,  0,  0, 47,  6,  0,  0, 48,  6,
+  0,  0,204,  5,  7,  0, 67,  2,  7,  0, 68,  2,  7,  0, 10,  6,  7,  0, 90,  1,  7,  0, 49,  6,  7,  0, 50,  6,161,  0, 70,  3,
+225,  0, 11,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,  2,  0,252,  5,
+  2,  0, 19,  0,  4,  0, 37,  0,213,  0,250,  5,209,  0,249,  5,226,  0, 27,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,
+  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5, 42,  0, 51,  6,  4,  0, 52,  6,  4,  0, 53,  6,  2,  0, 90,  0,  2,  0,133,  0,
+  2,  0, 54,  6,  0,  0, 55,  6,  0,  0, 56,  6,  4,  0, 57,  6,  4,  0, 58,  6,  4,  0, 59,  6,  4,  0, 60,  6,  2,  0, 61,  6,
+  2,  0, 62,  6,  7,  0, 63,  6, 23,  0, 64,  6, 23,  0, 65,  6,  4,  0, 66,  6,  4,  0, 67,  6,  0,  0, 68,  6,  0,  0, 69,  6,
+227,  0, 10,  0, 27,  0, 31,  0,  9,  0, 70,  6,  9,  0, 71,  6,  9,  0, 72,  6,  9,  0, 73,  6,  9,  0, 74,  6,  4,  0, 90,  0,
+  4,  0, 75,  6,  0,  0, 76,  6,  0,  0, 77,  6,228,  0, 10,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,
+  7,  0,194,  5,227,  0, 78,  6,  2,  0, 90,  0,  2,  0,133,  0,  4,  0, 43,  0,  9,  0, 79,  6,229,  0,  8,  0,208,  0,  0,  0,
+208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,209,  0,249,  5,  4,  0, 19,  0,  4,  0, 80,  6,230,  0, 23,  0,
+208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,209,  0,249,  5, 27,  0, 81,  6,
+ 27,  0, 81,  0,  2,  0, 19,  0,  2,  0,133,  0,  7,  0, 82,  6,  9,  0, 83,  6,  7,  0, 67,  2,  7,  0, 68,  2,  7,  0, 84,  6,
+  7,  0, 85,  6, 61,  0, 29,  1, 61,  0, 86,  6,  4,  0, 87,  6,  2,  0, 88,  6,  2,  0, 37,  0,161,  0, 70,  3,231,  0, 10,  0,
+208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,  2,  0, 19,  0,  2,  0, 92,  3,
+  4,  0, 37,  0,161,  0, 70,  3,232,  0, 42,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,
+  2,  0,195,  5,209,  0,249,  5,218,  0, 25,  6,  0,  0, 11,  6,  0,  0, 12,  6,  0,  0, 13,  6,  2,  0, 17,  0,  2,  0, 21,  6,
+  2,  0, 19,  0,  2,  0, 15,  6,  9,  0, 83,  6,  4,  0, 18,  6,  4,  0, 89,  6,  4,  0, 90,  6,  4,  0, 19,  6, 23,  0, 91,  6,
+ 23,  0, 92,  6,  7,  0, 93,  6,  7,  0, 94,  6,  7,  0, 95,  6,  7,  0, 82,  6,  2,  0, 96,  6,  2,  0,207,  0,  2,  0,152,  1,
+  2,  0, 17,  6,  2,  0, 37,  0,  2,  0, 43,  0,  2,  0, 97,  6,  2,  0, 98,  6,  9,  0, 99,  6,  9,  0,100,  6,  9,  0,101,  6,
+  9,  0,102,  6,  9,  0,103,  6,  2,  0,104,  6,  0,  0, 23,  6, 57,  0,105,  6,233,  0,  7,  0,233,  0,  0,  0,233,  0,  1,  0,
+  4,  0,106,  6,  4,  0, 23,  0,  0,  0, 84,  0,  4,  0,107,  6,  4,  0, 17,  0,234,  0, 13,  0,208,  0,  0,  0,208,  0,  1,  0,
+ 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,  2,  0,195,  5,  4,  0, 17,  0,  4,  0,108,  6,  4,  0, 19,  0,  4,  0, 54,  6,
+ 12,  0,109,  6, 12,  0,110,  6,  0,  0,111,  6,235,  0,  5,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,
+  4,  0, 37,  0,236,  0,  7,  0,236,  0,  0,  0,236,  0,  1,  0,  0,  0,112,  6,  2,  0,113,  6,  2,  0,114,  6,  2,  0,115,  6,
+  2,  0, 37,  0,237,  0, 12,  0,  2,  0,114,  6,  2,  0,116,  6,  2,  0,117,  6,  0,  0,167,  2,  2,  0,118,  6,  2,  0,119,  6,
+  2,  0,120,  6,  2,  0,121,  6,  2,  0,122,  6,  2,  0,239,  5,  7,  0,123,  6,  7,  0,124,  6,238,  0, 18,  0,238,  0,  0,  0,
+238,  0,  1,  0,  0,  0,193,  3,237,  0,125,  6,237,  0,126,  6,237,  0,127,  6,237,  0,128,  6,  7,  0,129,  6,  2,  0,130,  6,
+  2,  0,131,  6,  2,  0,132,  6,  2,  0,133,  6,  2,  0,134,  6,  2,  0,135,  6,  2,  0,136,  6,  2,  0,137,  6,  2,  0,138,  6,
+  2,  0,139,  6,239,  0, 10,  0,  0,  0,140,  6,  0,  0,141,  6,  0,  0,142,  6,  0,  0,143,  6,  0,  0,144,  6,  0,  0,145,  6,
+  2,  0,146,  6,  2,  0,147,  6,  2,  0,148,  6,  2,  0, 37,  0,240,  0,  8,  0,  0,  0,149,  6,  0,  0,150,  6,  0,  0,151,  6,
+  0,  0,152,  6,  0,  0,153,  6,  0,  0,154,  6,  7,  0,160,  5,  7,  0, 37,  0,241,  0, 17,  0,239,  0,155,  6,239,  0,156,  6,
+239,  0,157,  6,239,  0,158,  6,239,  0,159,  6,239,  0,160,  6,239,  0,161,  6,239,  0,162,  6,239,  0,163,  6,239,  0,164,  6,
+239,  0,165,  6,239,  0,166,  6,239,  0,167,  6,239,  0,168,  6,239,  0,169,  6,240,  0,170,  6,  0,  0,171,  6,242,  0, 71,  0,
+  0,  0,172,  6,  0,  0,173,  6,  0,  0,144,  6,  0,  0,174,  6,  0,  0,175,  6,  0,  0,176,  6,  0,  0,177,  6,  0,  0,178,  6,
+  0,  0,179,  6,  0,  0,180,  6,  0,  0,181,  6,  0,  0,182,  6,  0,  0,183,  6,  0,  0,184,  6,  0,  0,185,  6,  0,  0,186,  6,
+  0,  0,187,  6,  0,  0,188,  6,  0,  0,189,  6,  0,  0,190,  6,  0,  0,191,  6,  0,  0,192,  6,  0,  0,193,  6,  0,  0,194,  6,
+  0,  0,195,  6,  0,  0,196,  6,  0,  0,197,  6,  0,  0,198,  6,  0,  0,199,  6,  0,  0,200,  6,  0,  0,201,  6,  0,  0,202,  6,
+  0,  0,203,  6,  0,  0,204,  6,  0,  0,205,  6,  0,  0,206,  6,  0,  0,207,  6,  0,  0,208,  6,  0,  0,209,  6,  0,  0,210,  6,
+  0,  0,211,  6,  0,  0,212,  6,  0,  0,213,  6,  0,  0,214,  6,  0,  0,215,  6,  0,  0,216,  6,  0,  0,217,  6,  0,  0,218,  6,
+  0,  0,219,  6,  0,  0,220,  6,  0,  0,221,  6,  0,  0,222,  6,  0,  0,223,  6,  0,  0,224,  6,  0,  0,225,  6,  0,  0,226,  6,
+  0,  0,227,  6,  0,  0,228,  6,  0,  0,229,  6,  0,  0,230,  6,  0,  0,231,  6,  0,  0,232,  6,  0,  0,233,  6,  0,  0,234,  6,
+  0,  0,235,  6,  0,  0,236,  6,  0,  0,237,  6,  0,  0,238,  6,  0,  0,239,  6,  0,  0,240,  6,  0,  0, 92,  0,243,  0,  5,  0,
+  0,  0,241,  6,  0,  0,196,  6,  0,  0,198,  6,  2,  0, 19,  0,  2,  0, 37,  0,244,  0, 22,  0,244,  0,  0,  0,244,  0,  1,  0,
+  0,  0, 20,  0,241,  0,242,  6,242,  0,243,  6,242,  0,244,  6,242,  0,245,  6,242,  0,246,  6,242,  0,247,  6,242,  0,248,  6,
+242,  0,249,  6,242,  0,250,  6,242,  0,251,  6,242,  0,252,  6,242,  0,253,  6,242,  0,254,  6,242,  0,255,  6,242,  0,  0,  7,
+242,  0,  1,  7,242,  0,  2,  7,242,  0,  3,  7,243,  0,  4,  7,245,  0,  5,  0,  4,  0, 19,  0,  4,  0, 37,  0,  7,  0,115,  2,
+  7,  0,  5,  7,  7,  0, 21,  2,246,  0, 71,  0,  4,  0, 19,  0,  4,  0,  6,  7,  4,  0,  7,  7,  0,  0,  8,  7,  0,  0,  9,  7,
+  0,  0, 10,  7,  0,  0, 11,  7,  0,  0, 12,  7,  0,  0, 13,  7,  0,  0, 14,  7,  0,  0, 15,  7,  0,  0, 16,  7,  2,  0, 17,  7,
+  2,  0, 37,  0,  4,  0, 18,  7,  4,  0, 19,  7,  4,  0, 20,  7,  4,  0, 21,  7,  2,  0, 22,  7,  2,  0, 23,  7,  4,  0, 24,  7,
+  4,  0, 25,  7,  4,  0, 26,  7,  4,  0, 27,  7,  4,  0, 28,  7,  4,  0,109,  6,  4,  0, 29,  7,  2,  0, 30,  7,  2,  0, 31,  7,
+  2,  0, 32,  7,  2,  0, 33,  7, 12,  0, 34,  7, 12,  0, 35,  7, 12,  0, 36,  7,  2,  0, 37,  7,  2,  0, 38,  7,  2,  0, 39,  7,
+  2,  0, 40,  7,  2,  0, 41,  7,  2,  0, 42,  7,  2,  0, 43,  7,  2,  0, 44,  7,245,  0, 45,  7,  2,  0, 46,  7,  2,  0, 47,  7,
+  2,  0, 48,  7,  2,  0, 49,  7,  2,  0, 50,  7,  2,  0, 51,  7,  2,  0, 52,  7,  2,  0, 53,  7,  4,  0, 54,  7,  4,  0, 55,  7,
+  2,  0, 56,  7,  2,  0, 57,  7,  2,  0, 58,  7,  2,  0, 59,  7,  2,  0, 60,  7,  2,  0, 61,  7,  2,  0, 62,  7,  2,  0, 63,  7,
+  2,  0, 64,  7,  2,  0, 65,  7,  2,  0, 66,  7,  2,  0, 67,  7,  0,  0, 68,  7,  0,  0, 69,  7,  7,  0, 70,  7,  2,  0, 90,  5,
+  2,  0, 91,  5, 55,  0, 71,  7,211,  0, 21,  0, 27,  0, 31,  0, 12,  0, 72,  7, 12,  0, 73,  7, 12,  0, 74,  7, 12,  0,192,  5,
+ 46,  0,134,  0, 46,  0, 75,  7,  2,  0, 76,  7,  2,  0, 77,  7,  2,  0, 78,  7,  2,  0, 79,  7,  2,  0, 80,  7,  2,  0, 81,  7,
+  2,  0, 82,  7,  2,  0, 37,  0,  2,  0, 83,  7,  2,  0, 84,  7,  4,  0, 70,  0,206,  0, 85,  7,  9,  0, 86,  7,  2,  0, 87,  7,
+247,  0,  5,  0,247,  0,  0,  0,247,  0,  1,  0,247,  0, 88,  7, 13,  0, 89,  7,  4,  0, 19,  0,248,  0,  7,  0,248,  0,  0,  0,
+248,  0,  1,  0,247,  0, 90,  7,247,  0, 91,  7,  2,  0,199,  4,  2,  0, 19,  0,  4,  0, 37,  0,249,  0, 23,  0,249,  0,  0,  0,
+249,  0,  1,  0,250,  0, 92,  7,251,  0, 30,  6,  0,  0, 93,  7,  0,  0, 94,  7,  0,  0, 95,  7,  2,  0, 96,  7,  2,  0, 97,  7,
+  2,  0, 98,  7,  2,  0, 99,  7,  2,  0,100,  7,  2,  0, 37,  0,  2,  0, 19,  0,  2,  0,101,  7,  2,  0,102,  7,  2,  0,103,  7,
+  4,  0,104,  7,249,  0,105,  7,  9,  0,106,  7,  4,  0,107,  7,  4,  0,108,  7,  0,  0,109,  7,252,  0, 22,  0,252,  0,  0,  0,
+252,  0,  1,  0,247,  0, 90,  7,247,  0, 91,  7,247,  0,110,  7,247,  0,111,  7,211,  0,112,  7, 23,  0, 52,  0,  0,  0,193,  5,
+  0,  0,113,  7,  2,  0,240,  5,  2,  0,241,  5,  2,  0,114,  7,  2,  0, 37,  0,  2,  0, 79,  7,  2,  0,107,  6,  2,  0, 19,  0,
+253,  0, 92,  7, 12,  0,115,  7, 12,  0,192,  5, 12,  0,116,  7, 12,  0,117,  7,254,  0, 21,  0,254,  0,  0,  0,254,  0,  1,  0,
+209,  0,249,  5, 23,  0,118,  7, 23,  0,119,  7,  2,  0,240,  5,  2,  0,241,  5,  2,  0,120,  7,  2,  0,121,  7,  2,  0,122,  7,
+  2,  0, 19,  0,  7,  0, 63,  2,  2,  0, 78,  7,  2,  0, 82,  7,  4,  0, 43,  0,255,  0, 92,  7, 12,  0,123,  7, 12,  0,124,  7,
+ 12,  0,116,  7,  0,  0,125,  7,  9,  0,126,  7,  0,  1, 11,  0,  0,  0,127,  7,  2,  0,128,  7,  2,  0,129,  7,  2,  0,130,  7,
+  2,  0,131,  7,  2,  0,188,  4,  2,  0,183,  4,211,  0,132,  7, 46,  0,133,  7,  4,  0,134,  7,  4,  0,135,  7,  1,  1,  1,  0,
+  0,  0,136,  7,  2,  1,  8,  0, 57,  0,137,  7, 57,  0,138,  7,  2,  1,139,  7,  2,  1,140,  7,  2,  1,141,  7,  2,  0,129,  0,
+  2,  0, 19,  0,  4,  0,142,  7,  3,  1,  4,  0,  4,  0, 52,  6,  4,  0,143,  7,  4,  0, 57,  6,  4,  0,144,  7,  4,  1,  2,  0,
+  4,  0,145,  7,  4,  0,146,  7,  5,  1,  7,  0,  7,  0,147,  7,  7,  0,148,  7,  7,  0,149,  7,  4,  0, 19,  0,  4,  0, 37,  0,
+  7,  0, 72,  4,  7,  0,150,  7,  6,  1,  6,  0,  0,  0,151,  7,  0,  0, 13,  6, 49,  0,137,  0,  2,  0,106,  0,  2,  0,187,  4,
+  4,  0, 37,  0,  7,  1, 21,  0,  7,  1,  0,  0,  7,  1,  1,  0,  4,  0, 57,  0,  4,  0, 23,  0,  4,  0, 28,  0,  4,  0,152,  7,
+  4,  0,153,  7,  4,  0,154,  7,  1,  1,155,  7,  0,  0,151,  7,  4,  0,156,  7,  4,  0,157,  7,  6,  1, 64,  3,  3,  1,158,  7,
+  4,  1,159,  7,  5,  1,160,  7,  2,  1,161,  7,  2,  1,162,  7,  2,  1,163,  7, 57,  0,164,  7, 57,  0,165,  7,  8,  1, 12,  0,
+  0,  0,239,  1,  9,  0,193,  0,  0,  0,194,  0,  4,  0,197,  0,  4,  0,205,  0,  9,  0,198,  0,  7,  0,200,  0,  7,  0,201,  0,
+  9,  0,166,  7,  9,  0,167,  7,  9,  0,202,  0,  9,  0,204,  0,  9,  1, 43,  0,  9,  1,  0,  0,  9,  1,  1,  0,  9,  0,168,  7,
+  9,  0, 26,  0,  0,  0, 27,  0,  4,  0, 19,  0,  4,  0, 17,  0,  4,  0, 23,  0,  4,  0, 88,  0,  4,  0,169,  7,  4,  0,170,  7,
+  4,  0,153,  7,  4,  0,154,  7,  4,  0,171,  7,  4,  0,216,  0,  4,  0,172,  7,  4,  0,173,  7,  7,  0, 56,  5,  7,  0,174,  7,
+  4,  0,126,  0,  4,  0,175,  7,  7,  1,176,  7, 36,  0, 80,  0, 46,  0,134,  0, 49,  0,137,  0,  7,  0,177,  7,  7,  0,178,  7,
+  8,  1, 30,  1,  9,  1,179,  7,  9,  1,180,  7,  9,  1,181,  7, 12,  0,182,  7, 10,  1,183,  7, 11,  1,184,  7,  7,  0,185,  7,
+  7,  0,186,  7,  4,  0,187,  7,  7,  0,188,  7,  9,  0,189,  7,  4,  0,190,  7,  4,  0,191,  7,  4,  0,192,  7,  7,  0,193,  7,
+ 12,  1,  4,  0, 12,  1,  0,  0, 12,  1,  1,  0, 12,  0,194,  7,  9,  1,195,  7,197,  0,  6,  0, 12,  0,196,  7, 12,  0,182,  7,
+ 12,  0,197,  7,  9,  1,198,  7,  0,  0,199,  7,  0,  0,200,  7, 13,  1,  4,  0,  7,  0,201,  7,  7,  0,109,  0,  2,  0,202,  7,
+  2,  0,203,  7, 14,  1,  6,  0,  7,  0,204,  7,  7,  0,205,  7,  7,  0,206,  7,  7,  0,207,  7,  4,  0,208,  7,  4,  0,209,  7,
+ 15,  1, 12,  0,  7,  0,210,  7,  7,  0,211,  7,  7,  0,212,  7,  7,  0,213,  7,  7,  0,214,  7,  7,  0,215,  7,  7,  0,216,  7,
+  7,  0,217,  7,  7,  0,218,  7,  7,  0,219,  7,  4,  0,210,  2,  4,  0,220,  7, 16,  1,  2,  0,  7,  0, 25,  5,  7,  0, 37,  0,
+ 17,  1,  5,  0,  7,  0,221,  7,  7,  0,222,  7,  4,  0, 90,  0,  4,  0,168,  2,  4,  0,223,  7, 18,  1,  6,  0, 18,  1,  0,  0,
+ 18,  1,  1,  0,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,224,  7,  2,  0, 57,  0, 19,  1,  8,  0, 19,  1,  0,  0, 19,  1,  1,  0,
+  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,224,  7,  2,  0, 57,  0,  7,  0, 23,  0,  7,  0,126,  0, 20,  1, 45,  0, 20,  1,  0,  0,
+ 20,  1,  1,  0,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,224,  7,  2,  0,212,  0,  2,  0,244,  3,  2,  0,225,  7,  7,  0,226,  7,
+  7,  0, 89,  0,  7,  0,223,  2,  4,  0,227,  7,  4,  0, 82,  0,  4,  0,170,  2,  7,  0,228,  7,  7,  0,229,  7,  7,  0,230,  7,
+  7,  0,231,  7,  7,  0,232,  7,  7,  0,233,  7,  7,  0,220,  2,  7,  0, 27,  1,  7,  0,234,  7,  7,  0,235,  7,  7,  0, 37,  0,
+  7,  0,236,  7,  7,  0,237,  7,  7,  0,238,  7,  2,  0,239,  7,  2,  0,240,  7,  2,  0,241,  7,  2,  0,242,  7,  2,  0,243,  7,
+  2,  0,244,  7,  2,  0,245,  7,  2,  0,246,  7,  2,  0,  6,  2,  2,  0,247,  7,  2,  0,  3,  2,  2,  0,248,  7,  0,  0,249,  7,
+  0,  0,250,  7,  7,  0,210,  0, 21,  1,251,  7, 68,  0,212,  1, 22,  1, 16,  0, 22,  1,  0,  0, 22,  1,  1,  0,  2,  0, 17,  0,
+  2,  0, 19,  0,  2,  0,224,  7,  2,  0,212,  0,  7,  0,215,  2,  7,  0,216,  2,  7,  0,217,  2,  7,  0, 52,  2,  7,  0,218,  2,
+  7,  0,219,  2,  7,  0,252,  7,  7,  0,220,  2,  7,  0,222,  2,  7,  0,223,  2,223,  0,  5,  0,  2,  0, 17,  0,  2,  0,142,  7,
+  2,  0, 19,  0,  2,  0,253,  7, 27,  0, 81,  6,222,  0,  3,  0,  4,  0, 69,  0,  4,  0,254,  7,223,  0,  2,  0, 23,  1,  7,  0,
+ 23,  1,  0,  0, 23,  1,  1,  0,  0,  0, 20,  0,  2,  0, 17,  0,  2,  0, 19,  0,  4,  0, 22,  0,  9,  0,255,  7, 24,  1,  5,  0,
+  0,  0, 20,  0,  7,  0, 47,  1,  7,  0,  0,  8,  4,  0,  1,  8,  4,  0, 37,  0, 25,  1,  4,  0,  2,  0, 17,  0,  2,  0, 19,  0,
+  2,  0, 43,  0,  2,  0, 70,  0, 26,  1,  4,  0,  0,  0, 20,  0, 67,  0,  2,  8,  7,  0, 47,  1,  7,  0, 37,  0, 27,  1,  6,  0,
+  2,  0,  3,  8,  2,  0,  4,  8,  2,  0, 17,  0,  2,  0,  5,  8,  0,  0,  6,  8,  0,  0,  7,  8, 28,  1,  5,  0,  4,  0, 17,  0,
+  4,  0, 37,  0,  0,  0, 20,  0,  0,  0,  8,  8,  0,  0,  9,  8, 29,  1,  3,  0,  4,  0, 17,  0,  4,  0, 37,  0,  0,  0, 20,  0,
+ 30,  1,  4,  0,  2,  0, 10,  8,  2,  0, 11,  8,  2,  0, 19,  0,  2,  0, 37,  0, 31,  1,  6,  0,  0,  0, 20,  0,  0,  0, 12,  8,
+  2,  0, 13,  8,  2,  0,220,  2,  2,  0, 40,  1,  2,  0, 70,  0, 32,  1,  5,  0,  0,  0, 20,  0,  7,  0,109,  0,  7,  0, 74,  4,
+  2,  0, 19,  0,  2,  0,182,  2, 33,  1,  3,  0,  0,  0, 20,  0,  4,  0,170,  2,  4,  0, 10,  8, 34,  1,  7,  0,  0,  0, 20,  0,
+  7,  0, 74,  4,  0,  0, 14,  8,  0,  0, 15,  8,  2,  0, 40,  1,  2,  0, 43,  0,  4,  0, 16,  8, 35,  1,  3,  0, 32,  0, 17,  8,
+  0,  0, 18,  8,  0,  0, 19,  8, 36,  1, 18,  0, 36,  1,  0,  0, 36,  1,  1,  0,  2,  0, 17,  0,  2,  0, 20,  8,  2,  0, 19,  0,
+  2,  0, 21,  8,  2,  0, 22,  8,  2,  0, 23,  8,  2,  0, 43,  0,  2,  0, 70,  0,  0,  0, 20,  0,  9,  0,  2,  0, 37,  1, 24,  8,
+ 32,  0, 45,  0,  2,  0, 40,  5,  2,  0,185,  7,  2,  0, 25,  8,  2,  0, 37,  0, 38,  1, 11,  0,  0,  0, 20,  0,  0,  0, 17,  0,
+  0,  0, 26,  8,  2,  0, 19,  0,  2,  0,182,  2,  2,  0, 27,  8,  4,  0, 28,  8,  4,  0, 29,  8,  4,  0, 30,  8,  4,  0, 31,  8,
+  4,  0, 32,  8, 39,  1,  1,  0,  0,  0, 33,  8, 40,  1,  4,  0, 42,  0, 51,  6,  0,  0, 34,  8,  4,  0, 40,  1,  4,  0, 19,  0,
+ 37,  1, 18,  0, 37,  1,  0,  0, 37,  1,  1,  0, 37,  1, 35,  8,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0, 36,  8,  2,  0, 23,  8,
+  2,  0, 20,  8,  2,  0, 37,  8,  2,  0, 70,  0,  2,  0,209,  1,  0,  0, 20,  0,  9,  0,  2,  0, 41,  1, 24,  8, 36,  1, 38,  8,
+  2,  0, 15,  0,  2,  0, 39,  8,  4,  0, 40,  8, 42,  1,  3,  0,  4,  0,196,  2,  4,  0, 37,  0, 32,  0, 45,  0, 43,  1, 12,  0,
+159,  0, 41,  8,  2,  0, 17,  0,  2,  0, 19,  0,  4,  0,226,  7,  4,  0, 89,  0,  0,  0, 20,  0,  0,  0, 42,  8,  2,  0, 43,  8,
+  2,  0, 44,  8,  2,  0, 45,  8,  2,  0, 46,  8,  7,  0, 47,  8, 44,  1, 13,  0,  2,  0, 19,  0,  2,  0, 48,  8,  4,  0,226,  7,
+  4,  0, 89,  0,  2,  0, 49,  8,  7,  0,202,  3,  7,  0, 50,  8, 10,  1,183,  7, 45,  1, 51,  8,  2,  0, 17,  0,  2,  0, 52,  8,
+  2,  0, 53,  8,  2,  0, 54,  8, 46,  1, 11,  0,  4,  0,196,  2,  2,  0, 17,  0,  2,  0, 19,  0, 32,  0, 45,  0, 81,  0, 55,  8,
+  0,  0, 20,  0,  7,  0, 56,  8,  7,  0, 57,  8,  7,  0,100,  3,  2,  0, 58,  8,  2,  0, 59,  8, 47,  1,  5,  0,  2,  0, 17,  0,
+  2,  0, 19,  0,  4,  0, 37,  0, 46,  0,134,  0, 32,  0,136,  5, 48,  1,  5,  0,  4,  0, 19,  0,  4,  0, 17,  0,  0,  0, 20,  0,
+  0,  0,  8,  8, 32,  0, 45,  0, 49,  1, 13,  0,  2,  0, 19,  0,  2,  0, 17,  0,  2,  0, 20,  8,  2,  0,101,  3,  7,  0, 60,  8,
+  7,  0, 61,  8,  7,  0, 35,  1,  7,  0, 36,  1,  7,  0, 77,  3,  7,  0, 80,  3,  7,  0, 62,  8,  7,  0, 63,  8, 32,  0, 64,  8,
+ 50,  1, 10,  0,  2,  0, 19,  0,  2,  0, 17,  0,  4,  0,226,  7,  4,  0, 89,  0,  0,  0, 20,  0,  0,  0, 42,  8,  2,  0, 43,  0,
+  2,  0, 64,  0,  2,  0, 65,  8,  2,  0, 66,  8, 51,  1,  8,  0, 32,  0, 45,  0,  7,  0,217,  2,  7,  0, 67,  8,  7,  0, 68,  8,
+  7,  0,212,  2,  2,  0, 19,  0,  2,  0,182,  2,  7,  0, 69,  8, 52,  1, 12,  0,  2,  0, 17,  0,  2,  0, 40,  1,  2,  0, 19,  0,
+  2,  0,220,  2,  2,  0,196,  2,  2,  0, 70,  8,  4,  0, 37,  0,  7,  0, 71,  8,  7,  0, 72,  8,  7,  0, 73,  8,  7,  0, 74,  8,
+  0,  0, 75,  8, 53,  1, 10,  0,  2,  0, 19,  0,  2,  0, 17,  0,  4,  0,226,  7,  4,  0, 89,  0,  0,  0, 20,  0,  2,  0,105,  1,
+  2,  0, 64,  0,  2,  0, 65,  8,  2,  0, 66,  8, 68,  0,212,  1, 54,  1,  7,  0,  4,  0,170,  2,  4,  0, 76,  8,  4,  0, 77,  8,
+  4,  0, 78,  8,  7,  0, 79,  8,  7,  0, 80,  8,  0,  0, 14,  8, 55,  1,  7,  0,  0,  0, 81,  8, 32,  0, 82,  8,  0,  0, 18,  8,
+  2,  0, 83,  8,  2,  0, 43,  0,  4,  0, 70,  0,  0,  0, 19,  8, 56,  1,  6,  0,  2,  0, 19,  0,  2,  0, 17,  0,  4,  0,226,  7,
+  4,  0, 89,  0,  0,  0, 84,  8,  0,  0, 85,  8, 57,  1,  1,  0,  4,  0, 19,  0, 58,  1,  6,  0,  0,  0, 92,  0,  2,  0, 17,  0,
+  2,  0, 19,  0,  4,  0, 86,  8,  7,  0, 87,  8, 42,  0, 51,  6, 59,  1,  4,  0,  0,  0, 48,  2,  2,  0, 19,  0,  4,  0, 17,  0,
+ 32,  0, 45,  0, 60,  1,  2,  0,  4,  0, 17,  0,  4,  0,229,  5, 41,  1, 10,  0, 41,  1,  0,  0, 41,  1,  1,  0, 41,  1, 35,  8,
+  2,  0, 17,  0,  2,  0, 19,  0,  2,  0, 20,  8,  2,  0, 88,  8,  0,  0, 20,  0,  9,  0,  2,  0, 32,  0, 45,  0, 61,  1, 10,  0,
+  7,  0,100,  3,  7,  0, 89,  8,  7,  0, 90,  8,  7,  0, 91,  8,  7,  0, 92,  8,  4,  0, 19,  0,  7,  0, 70,  8,  7,  0, 93,  8,
+  7,  0, 94,  8,  7,  0, 37,  0, 11,  1, 12,  0, 11,  1,  0,  0, 11,  1,  1,  0, 10,  1, 95,  8,  9,  0,193,  0,  4,  0,143,  3,
+  4,  0,189,  3,  4,  0,190,  3,  4,  0, 96,  8,  4,  0, 97,  8,  4,  0, 98,  8,  7,  0,202,  3,  7,  0, 37,  0, 45,  1,  8,  0,
+  7,  0, 99,  8,  7,  0,100,  8,  7,  0,101,  8,  7,  0,102,  8,  7,  0,103,  8,  7,  0,104,  8,  7,  0,105,  8,  7,  0,106,  8,
+ 10,  1, 15,  0, 27,  0, 31,  0,  0,  0,192,  0, 43,  0,149,  0,  9,  0,193,  0, 43,  0,107,  8, 36,  0, 80,  0,  7,  0,202,  3,
+  7,  0,108,  8,  7,  0, 50,  8,  7,  0, 99,  8,  7,  0,100,  8,  7,  0,109,  8,  4,  0, 90,  0,  4,  0, 98,  8,  9,  0,110,  8,
+ 62,  1, 15,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,252,  0,111,  8,209,  0,249,  5,
+ 10,  1,183,  7,  2,  0, 40,  1,  2,  0, 48,  8,  2,  0, 67,  2,  2,  0, 68,  2,  2,  0, 19,  0,  2,  0,254,  5,  4,  0, 70,  0,
+ 63,  1,  6,  0, 63,  1,  0,  0, 63,  1,  1,  0, 32,  0, 45,  0,  9,  0,112,  8,  4,  0,217,  0,  4,  0, 37,  0, 68,  0,  4,  0,
+ 27,  0, 31,  0, 12,  0,113,  8,  4,  0,131,  0,  7,  0,114,  8, 64,  1, 25,  0, 64,  1,  0,  0, 64,  1,  1,  0, 64,  1, 38,  0,
+ 12,  0,115,  8,  0,  0, 20,  0,  7,  0,116,  8,  7,  0,117,  8,  7,  0,118,  8,  7,  0,119,  8,  4,  0, 19,  0,  7,  0,120,  8,
+  7,  0,121,  8,  7,  0,122,  8,  7,  0, 47,  1,  7,  0, 14,  2,  7,  0,123,  8,  7,  0,168,  2,  7,  0,124,  8,  7,  0,125,  8,
+  7,  0,126,  8,  7,  0,127,  8,  7,  0,128,  8,  7,  0,172,  0,  2,  0,131,  0,  2,  0, 71,  5, 65,  1, 21,  0, 27,  0, 31,  0,
+ 12,  0,129,  8, 12,  0,130,  8, 12,  0,131,  8,  9,  0,132,  8,  4,  0, 19,  0,  4,  0,201,  5,  2,  0,224,  2,  2,  0,  4,  6,
+  2,  0,131,  0,  2,  0,133,  8,  2,  0,134,  8,  2,  0,135,  8,  2,  0,136,  8,  2,  0,137,  8,  4,  0,138,  8,  4,  0,139,  8,
+  4,  0,140,  8,  4,  0,141,  8,  4,  0,142,  8,  4,  0,143,  8, 66,  1,  2,  0,  7,  0,129,  2,  4,  0, 19,  0, 67,  1,  5,  0,
+ 66,  1,144,  8,  4,  0,168,  2,  4,  0,145,  8,  4,  0,146,  8,  4,  0, 19,  0, 68,  1,  6,  0,  4,  0, 37,  0,  4,  0,  4,  6,
+  4,  0,140,  8,  4,  0,141,  8,  4,  0,142,  8,  4,  0,143,  8, 69,  1, 38,  0, 69,  1,  0,  0, 69,  1,  1,  0, 26,  0,147,  8,
+ 12,  0,127,  3,  0,  0, 20,  0,  2,  0, 19,  0,  2,  0,148,  8,  2,  0,149,  8,  2,  0,150,  8,  2,  0, 86,  3,  2,  0,151,  8,
+  4,  0, 50,  2,  4,  0,140,  8,  4,  0,141,  8, 64,  1,152,  8, 69,  1, 38,  0, 69,  1,153,  8, 12,  0,154,  8,  9,  0,155,  8,
+  9,  0,156,  8,  9,  0,157,  8,  7,  0, 35,  1,  7,  0,172,  0,  7,  0,158,  8,  7,  0,249,  1,  2,  0,159,  8,  2,  0, 37,  0,
+  7,  0,160,  8,  7,  0,161,  8,  7,  0, 82,  3,  7,  0,162,  8,  7,  0,163,  8,  7,  0,164,  8,  7,  0,165,  8,  7,  0,166,  8,
+  7,  0,167,  8,  7,  0, 43,  2, 32,  0,168,  8,160,  0,  9,  0, 12,  0,169,  8,  2,  0, 19,  0,  2,  0,170,  8,  7,  0, 79,  2,
+  7,  0,171,  8,  7,  0,172,  8, 12,  0,173,  8,  4,  0,174,  8,  4,  0, 37,  0, 70,  1,  7,  0, 70,  1,  0,  0, 70,  1,  1,  0,
+ 12,  0,175,  8,  4,  0, 19,  0,  4,  0,176,  8,  0,  0,193,  3,243,  0,177,  8,159,  0,  7,  0, 27,  0, 31,  0, 12,  0,178,  8,
+ 12,  0,169,  8, 12,  0,179,  8, 12,  0,100,  0,  4,  0, 19,  0,  4,  0,180,  8,213,  0,  4,  0, 27,  0, 95,  8, 12,  0,169,  8,
+  4,  0,181,  8,  4,  0, 19,  0, 71,  1, 17,  0,208,  0,  0,  0,208,  0,  1,  0, 12,  0,192,  5,  4,  0,193,  5,  7,  0,194,  5,
+  2,  0,195,  5,209,  0,249,  5,159,  0, 67,  3,213,  0,182,  8,  0,  0, 40,  1,  0,  0,252,  5,  2,  0, 19,  0,  2,  0,183,  8,
+  2,  0,253,  5,  2,  0,254,  5,  2,  0,184,  8,  7,  0,185,  8, 72,  1,  8,  0, 72,  1,  0,  0, 72,  1,  1,  0, 70,  1,186,  8,
+ 36,  0, 80,  0, 12,  0, 71,  3,  4,  0, 19,  0,  0,  0, 20,  0,  4,  0,187,  8, 73,  1,  5,  0, 73,  1,  0,  0, 73,  1,  1,  0,
+ 36,  0, 80,  0,  2,  0, 19,  0,  0,  0,188,  8, 74,  1, 12,  0, 74,  1,  0,  0, 74,  1,  1,  0,  9,  0,  2,  0,  2,  0, 17,  0,
+  2,  0, 19,  0,  0,  0,189,  8,  0,  0,190,  8,  0,  0,188,  8,  7,  0,191,  8,  7,  0,192,  8,  4,  0, 37,  0, 36,  0, 80,  0,
+ 75,  1,  9,  0, 75,  1,  0,  0, 75,  1,  1,  0, 32,  0,193,  8,  0,  0,227,  2,  7,  0,194,  8,  2,  0,195,  8,  2,  0, 19,  0,
+  2,  0, 17,  0,  2,  0,196,  8, 76,  1,  7,  0, 42,  0, 51,  6, 26,  0,147,  8,  4,  0, 19,  0,  4,  0,197,  8, 12,  0,198,  8,
+ 32,  0,193,  8,  0,  0,227,  2, 77,  1, 12,  0, 32,  0,193,  8,  2,  0,199,  8,  2,  0, 19,  0,  2,  0,200,  8,  2,  0,201,  8,
+  0,  0,227,  2, 32,  0,202,  8,  0,  0,203,  8,  7,  0,204,  8,  7,  0, 14,  2,  7,  0,205,  8,  7,  0,206,  8, 78,  1,  6,  0,
+ 32,  0,193,  8,  4,  0,207,  8,  4,  0,208,  8,  4,  0, 90,  0,  4,  0, 37,  0,  0,  0,227,  2, 79,  1,  4,  0, 32,  0,193,  8,
+  4,  0, 19,  0,  4,  0,207,  8,  0,  0,227,  2, 80,  1,  4,  0, 32,  0,193,  8,  4,  0, 19,  0,  4,  0,207,  8,  0,  0,227,  2,
+ 81,  1, 10,  0, 32,  0,193,  8,  4,  0,209,  8,  7,  0,125,  0,  4,  0, 19,  0,  2,  0, 47,  6,  2,  0,210,  8,  2,  0, 43,  0,
+  2,  0, 70,  0,  7,  0,211,  8,  0,  0,227,  2, 82,  1,  4,  0, 32,  0,193,  8,  4,  0, 19,  0,  4,  0,207,  8,  0,  0,227,  2,
+ 83,  1, 10,  0, 32,  0,193,  8,  2,  0, 17,  0,  2,  0,252,  3,  4,  0, 88,  0,  4,  0, 89,  0,  7,  0, 67,  8,  7,  0, 68,  8,
+  4,  0, 37,  0,159,  0, 41,  8,  0,  0,227,  2, 84,  1,  4,  0, 32,  0,193,  8,  4,  0, 87,  3,  4,  0,212,  8,  0,  0,227,  2,
+ 85,  1,  5,  0, 32,  0,193,  8,  7,  0,125,  0,  4,  0,213,  8,  4,  0, 87,  3,  4,  0, 88,  3, 86,  1,  6,  0, 32,  0,193,  8,
+  4,  0,214,  8,  4,  0,215,  8,  7,  0,216,  8,  7,  0,217,  8,  0,  0,227,  2, 87,  1, 16,  0, 32,  0,193,  8, 32,  0,153,  8,
+  4,  0, 17,  0,  7,  0,218,  8,  7,  0,219,  8,  7,  0,220,  8,  7,  0,221,  8,  7,  0,222,  8,  7,  0,223,  8,  7,  0,224,  8,
+  7,  0,225,  8,  7,  0,226,  8,  2,  0, 19,  0,  2,  0, 37,  0,  2,  0, 43,  0,  2,  0, 70,  0, 88,  1,  3,  0, 32,  0,193,  8,
+  4,  0, 19,  0,  4,  0,  6,  2, 89,  1,  5,  0, 32,  0,193,  8,  4,  0, 19,  0,  4,  0, 37,  0,  7,  0,227,  8,  0,  0,227,  2,
+ 90,  1, 10,  0, 32,  0,193,  8,  0,  0,227,  2,  2,  0,228,  8,  2,  0,229,  8,  0,  0,230,  8,  0,  0,231,  8,  7,  0,232,  8,
+  7,  0,233,  8,  7,  0,234,  8,  7,  0,235,  8, 91,  1,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 12,  0,
+  7,  0,236,  8,  7,  0,237,  8,  2,  0, 19,  0,  2,  0,  6,  2, 92,  1,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,
+  7,  0, 12,  0,  7,  0,236,  8,  7,  0,237,  8,  2,  0, 19,  0,  2,  0,  6,  2, 93,  1,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,
+  7,  0, 11,  0,  7,  0, 12,  0,  7,  0,236,  8,  7,  0,237,  8,  2,  0, 19,  0,  2,  0,  6,  2, 94,  1,  7,  0, 32,  0,193,  8,
+  0,  0,227,  2,  7,  0, 47,  1,  7,  0, 56,  1,  2,  0, 19,  0,  2,  0, 40,  1,  4,  0, 37,  0, 95,  1,  5,  0, 32,  0, 27,  3,
+  7,  0, 47,  1,  2,  0, 31,  3,  0,  0, 33,  3,  0,  0,238,  8, 96,  1, 10,  0, 96,  1,  0,  0, 96,  1,  1,  0,  2,  0, 17,  0,
+  2,  0, 19,  0,  0,  0,239,  8,  7,  0,246,  0,  7,  0,247,  0,  2,  0,175,  8,  2,  0,240,  8, 32,  0, 45,  0, 97,  1, 22,  0,
+ 97,  1,  0,  0, 97,  1,  1,  0,  2,  0, 19,  0,  2,  0, 40,  1,  2,  0,241,  8,  2,  0,242,  8, 36,  0, 80,  0,159,  0, 41,  8,
+ 32,  0,164,  0,  7,  0, 88,  0,  7,  0, 89,  0,  7,  0,243,  8,  7,  0,244,  8,  7,  0,245,  8,  7,  0,246,  8,  7,  0,213,  2,
+  7,  0,247,  8,  7,  0, 43,  8,  7,  0,248,  8,  0,  0,249,  8,  0,  0,250,  8, 12,  0, 73,  3, 98,  1,  8,  0,  7,  0, 21,  2,
+  7,  0, 67,  8,  7,  0, 68,  8,  9,  0,  2,  0,  2,  0,251,  8,  2,  0,252,  8,  2,  0,253,  8,  2,  0,254,  8, 99,  1, 18,  0,
+ 99,  1,  0,  0, 99,  1,  1,  0, 99,  1,255,  8,  0,  0, 20,  0, 98,  1,  0,  9,  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,  1,  9,
+  2,  0,  2,  9,  2,  0,  3,  9,  2,  0,  4,  9,  4,  0, 43,  0,  7,  0,  5,  9,  7,  0,  6,  9,  4,  0,  7,  9,  4,  0,  8,  9,
+ 99,  1,  9,  9,100,  1, 10,  9,101,  1, 33,  0,101,  1,  0,  0,101,  1,  1,  0,101,  1, 11,  9,  0,  0, 20,  0,  0,  0, 12,  9,
+  2,  0, 17,  0,  2,  0, 19,  0,  2,  0,152,  7,  2,  0,185,  7,  2,  0, 13,  9,  2,  0,133,  0,  2,  0,  2,  9,  2,  0,142,  7,
+ 12,  0, 36,  8, 12,  0, 14,  9, 27,  0, 81,  6,  9,  0, 15,  9,  7,  0,  5,  9,  7,  0,  6,  9,  7,  0, 52,  2,  7,  0, 16,  9,
+  2,  0, 17,  9,  2,  0, 18,  9,  7,  0, 19,  9,  7,  0, 20,  9,  2,  0, 21,  9,  2,  0, 22,  9,  9,  0, 23,  9, 24,  0, 24,  9,
+ 24,  0, 25,  9, 24,  0, 26,  9,102,  1,150,  0,103,  1, 27,  9,100,  1,  8,  0,100,  1,  0,  0,100,  1,  1,  0,101,  1, 28,  9,
+101,  1, 29,  9, 99,  1, 30,  9, 99,  1,  9,  9,  4,  0, 19,  0,  4,  0, 37,  0, 61,  0, 20,  0, 27,  0, 31,  0, 39,  0, 75,  0,
+ 12,  0, 31,  9, 12,  0, 32,  9, 98,  1, 33,  9, 12,  0, 34,  9,  4,  0, 17,  0,  4,  0, 35,  9,  4,  0, 36,  9,  4,  0, 37,  9,
+ 12,  0, 38,  9,103,  1, 39,  9, 99,  1, 40,  9, 99,  1, 41,  9,  9,  0, 42,  9,  9,  0, 43,  9,  4,  0, 44,  9,  9,  0, 45,  9,
+  9,  0, 46,  9,  9,  0, 47,  9,104,  1,  6,  0,  4,  0,124,  0,  4,  0,126,  0,  4,  0,142,  7,  0,  0, 48,  9,  0,  0, 49,  9,
+  2,  0, 37,  0,105,  1, 16,  0,  2,  0, 98,  7,  2,  0, 99,  7,  2,  0, 50,  9,  2,  0, 90,  8,  2,  0, 51,  9,  2,  0, 68,  0,
+  7,  0,212,  2,  7,  0, 52,  9,  7,  0, 53,  9,  2,  0, 60,  1,  0,  0, 54,  9,  0,  0, 55,  5,  2,  0, 55,  9,  2,  0, 37,  0,
+  4,  0, 56,  9,  4,  0, 57,  9,106,  1,  9,  0,  7,  0, 58,  9,  7,  0, 59,  9,  7,  0,109,  8,  7,  0,109,  0,  7,  0, 60,  9,
+  7,  0, 10,  6,  2,  0, 61,  9,  0,  0, 62,  9,  0,  0, 37,  0,107,  1,  4,  0,  7,  0, 63,  9,  7,  0, 64,  9,  2,  0, 61,  9,
+  2,  0, 37,  0,108,  1,  3,  0,  7,  0, 65,  9,  7,  0, 66,  9,  7,  0, 15,  0,109,  1,  7,  0,  0,  0,239,  1,  2,  0,185,  4,
+  2,  0,186,  4,  2,  0,187,  4,  2,  0,138,  4,  4,  0,126,  0,  4,  0,250,  3,110,  1,  7,  0,  7,  0, 67,  9,  7,  0, 68,  9,
+  7,  0, 69,  9,  7,  0, 63,  2,  7,  0, 70,  9,  7,  0, 71,  9,  7,  0, 72,  9,111,  1,  4,  0,  2,  0, 73,  9,  2,  0, 74,  9,
+  2,  0, 75,  9,  2,  0, 76,  9,112,  1,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0,113,  1,  2,  0,  0,  0,166,  0,  0,  0, 77,  9,
+114,  1,  1,  0,  0,  0, 20,  0,115,  1, 10,  0,  0,  0, 78,  9,  0,  0, 79,  9,  0,  0,  3,  6,  0,  0, 80,  9,  2,  0, 50,  9,
+  2,  0, 81,  9,  7,  0, 82,  9,  7,  0, 83,  9,  7,  0, 84,  9,  7,  0,247,  8,116,  1,  2,  0,  9,  0, 85,  9,  9,  0, 86,  9,
+117,  1, 11,  0,  0,  0,187,  4,  0,  0, 17,  0,  0,  0, 61,  9,  0,  0,109,  0,  0,  0, 87,  9,  0,  0,106,  0,  0,  0, 48,  2,
+  7,  0, 88,  9,  7,  0, 89,  9,  7,  0, 90,  9,  7,  0, 91,  9,118,  1,  8,  0,  7,  0,  3,  8,  7,  0,125,  0,  7,  0, 55,  5,
+  7,  0,134,  2,  7,  0, 92,  9,  7,  0,206,  0,  7,  0, 93,  9,  4,  0, 17,  0,119,  1,  4,  0,  2,  0, 94,  9,  2,  0, 95,  9,
+  2,  0, 96,  9,  2,  0, 37,  0,120,  1,  1,  0,  0,  0, 20,  0,121,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,  2,  0, 19,  0,
+  2,  0, 97,  9,122,  1, 10,  0,  2,  0,182,  3,  2,  0, 19,  0,  7,  0, 74,  4,  7,  0, 98,  9,  7,  0, 99,  9,  7,  0,100,  9,
+  7,  0,101,  9,121,  1,102,  9,121,  1,103,  9,121,  1,104,  9, 64,  0,  9,  0,  4,  0, 19,  0,  4,  0, 64,  0, 24,  0,105,  9,
+ 24,  0,106,  9,122,  1,107,  9,  7,  0,108,  9,  7,  0,109,  9,  7,  0,110,  9,  7,  0,111,  9,123,  1,  4,  0, 47,  0,206,  2,
+  7,  0,112,  9,  7,  0,141,  1,  7,  0, 37,  0,187,  0, 17,  0, 27,  0, 31,  0,123,  1,113,  9, 64,  0,102,  9, 51,  0,103,  1,
+  2,  0, 19,  0,  2,  0,160,  5,  4,  0,106,  0,  7,  0,114,  9,  7,  0, 60,  2,  4,  0,115,  9,  7,  0,116,  9,  7,  0,117,  9,
+  7,  0,118,  9,  7,  0,141,  1,  2,  0, 73,  1,  0,  0,119,  9,  0,  0,139,  6,124,  1, 10,  0,  4,  0, 17,  0,  4,  0,125,  0,
+  4,  0, 19,  0,  4,  0,148,  3,  4,  0,120,  9,  4,  0,121,  9,  4,  0,122,  9,  0,  0, 92,  0,  0,  0, 20,  0,  9,  0,  2,  0,
+ 92,  0,  6,  0,124,  1,123,  9,  4,  0,124,  9,  4,  0,125,  9,  4,  0,126,  9,  4,  0, 37,  0,  9,  0,127,  9,125,  1,  5,  0,
+  7,  0,129,  2,  7,  0,196,  2,  7,  0, 14,  2,  2,  0,128,  9,  2,  0, 37,  0,126,  1,  5,  0,  7,  0,129,  2,  7,  0,129,  9,
+  7,  0,130,  9,  7,  0,131,  9,  7,  0,196,  2,127,  1,  5,  0, 32,  0,132,  9,128,  1, 22,  0,  7,  0,133,  9,  7,  0,134,  9,
+  7,  0, 57,  0,129,  1,  7,  0,  4,  0,135,  9,  4,  0,136,  9,  4,  0,137,  9,  7,  0,138,  9,  7,  0,139,  9,  7,  0,140,  9,
+  7,  0,141,  9,130,  1,  8,  0,130,  1,  0,  0,130,  1,  1,  0, 32,  0, 45,  0,  4,  0, 14,  3,  2,  0, 19,  0,  2,  0, 40,  1,
+  7,  0,196,  2,  7,  0, 11,  8,131,  1, 18,  0,126,  1,143,  3,126,  1,142,  9,125,  1,143,  9,126,  1,251,  7,127,  1,144,  9,
+  4,  0, 82,  0,  7,  0,196,  2,  7,  0,223,  2,  7,  0,145,  9,  4,  0,135,  9,  4,  0,146,  9,  7,  0,139,  9,  7,  0,140,  9,
+  7,  0,106,  0,  2,  0, 19,  0,  2,  0,147,  9,  2,  0,148,  9,  2,  0,149,  9,132,  1,107,  0, 27,  0, 31,  0, 39,  0, 75,  0,
+133,  1,150,  9,  4,  0, 19,  0,  2,  0, 17,  0,  2,  0,228,  8,  2,  0,151,  9,  2,  0,152,  9,  2,  0,159,  8,  2,  0,153,  9,
+  2,  0,154,  9,  2,  0,155,  9,  2,  0,156,  9,  2,  0,157,  9,  2,  0,158,  9,  2,  0,159,  9,  2,  0,178,  3,  2,  0, 48,  5,
+  2,  0,160,  9,  2,  0,161,  9,  2,  0,162,  9,  2,  0,163,  9,  2,  0,164,  9,  2,  0,  3,  2,  2,  0,244,  7,  2,  0,220,  7,
+  2,  0,165,  9,  2,  0,166,  9,  2,  0,176,  3,  2,  0,177,  3,  2,  0,167,  9,  2,  0,168,  9,  2,  0,169,  9,  2,  0,170,  9,
+  7,  0,171,  9,  7,  0,172,  9,  7,  0,173,  9,  2,  0,174,  9,  2,  0,175,  9,  7,  0,176,  9,  7,  0,177,  9,  7,  0,178,  9,
+  7,  0,226,  7,  7,  0, 89,  0,  7,  0,223,  2,  7,  0,232,  7,  7,  0,179,  9,  7,  0,180,  9,  7,  0,181,  9,  4,  0,227,  7,
+  4,  0,225,  7,  4,  0,182,  9,  7,  0,228,  7,  7,  0,229,  7,  7,  0,230,  7,  7,  0,183,  9,  7,  0,184,  9,  7,  0,185,  9,
+  7,  0,186,  9,  7,  0,187,  9,  7,  0,188,  9,  7,  0,189,  9,  7,  0,190,  9,  7,  0,100,  3,  7,  0,106,  0,  7,  0,191,  9,
+  7,  0,192,  9,  7,  0,193,  9,  7,  0,194,  9,  7,  0,195,  9,  7,  0,196,  9,  7,  0,197,  9,  4,  0,198,  9,  4,  0,199,  9,
+  7,  0,200,  9,  7,  0,201,  9,  7,  0,202,  9,  7,  0,203,  9,  7,  0,204,  9,  7,  0,205,  9,  7,  0,206,  9,  7,  0,172,  3,
+  7,  0,170,  3,  7,  0,171,  3,  7,  0,207,  9,  7,  0,208,  9,  7,  0,209,  9,  7,  0,210,  9,  7,  0,211,  9,  7,  0,212,  9,
+  7,  0,213,  9,  7,  0,214,  9,  7,  0,215,  9,  7,  0,216,  9,  7,  0,217,  9,  7,  0,218,  9,  7,  0,219,  9,  4,  0,220,  9,
+  4,  0,221,  9,  7,  0,222,  9, 68,  0,132,  3, 68,  0,223,  9, 32,  0,224,  9, 32,  0,225,  9, 36,  0, 80,  0,163,  0, 32,  1,
+163,  0,226,  9, 59,  0, 43,  0, 59,  0,  0,  0, 59,  0,  1,  0,132,  1,227,  9,131,  1,228,  9,129,  1,153,  8,168,  0,198,  3,
+  9,  0,199,  3,134,  1,229,  9,134,  1,230,  9, 12,  0,231,  9, 12,  0,232,  9,134,  0,233,  9,142,  0,234,  9,142,  0,235,  9,
+ 32,  0,236,  9, 32,  0,237,  9, 32,  0, 38,  0, 12,  0,238,  9, 12,  0,239,  9, 12,  0,198,  8,  0,  0, 20,  0,  7,  0,210,  0,
+  7,  0,250,  2,  7,  0,240,  9,  4,  0,170,  2,  4,  0, 57,  0,  4,  0, 19,  0,  4,  0,227,  7,  4,  0,241,  9,  4,  0,242,  9,
+  4,  0,243,  9,  2,  0,217,  0,  2,  0,244,  9,  2,  0,245,  9,  2,  0,246,  9,  0,  0,247,  9,  2,  0,248,  9,  2,  0,249,  9,
+  2,  0,250,  9,  9,  0,251,  9,138,  0, 15,  4, 12,  0,237,  2,135,  1,252,  9,136,  0, 34,  0,136,  1,110,  8,  7,  0,241,  3,
+  7,  0,253,  9,  7,  0,254,  9,  7,  0, 77,  4,  7,  0,255,  9,  7,  0,110,  3,  7,  0,100,  3,  7,  0,  0, 10,  7,  0, 62,  2,
+  7,  0,  1, 10,  7,  0,  2, 10,  7,  0,  3, 10,  7,  0,  4, 10,  7,  0,  5, 10,  7,  0,  6, 10,  7,  0,242,  3,  7,  0,  7, 10,
+  7,  0,  8, 10,  7,  0,  9, 10,  7,  0,243,  3,  7,  0,239,  3,  7,  0,240,  3,  7,  0, 10, 10,  4,  0, 11, 10,  4,  0, 90,  0,
+  4,  0, 12, 10,  4,  0, 13, 10,  2,  0, 14, 10,  2,  0, 15, 10,  2,  0, 16, 10,  2,  0, 17, 10,  2,  0, 18, 10,  2,  0, 37,  0,
+137,  0,  8,  0,136,  1, 19, 10,  7,  0, 20, 10,  7,  0, 21, 10,  7,  0,213,  1,  7,  0, 22, 10,  4,  0, 90,  0,  2,  0, 23, 10,
+  2,  0, 24, 10,137,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0,  7,  0, 25, 10,138,  1,  6,  0,138,  1,  0,  0,
+138,  1,  1,  0,137,  1,144,  8,  4,  0,223,  0,  2,  0, 26, 10,  2,  0, 19,  0,139,  1,  5,  0,139,  1,  0,  0,139,  1,  1,  0,
+ 12,  0, 27, 10,  4,  0, 28, 10,  4,  0, 19,  0,140,  1,  9,  0,140,  1,  0,  0,140,  1,  1,  0, 12,  0,124,  0,139,  1, 29, 10,
+  4,  0, 19,  0,  2,  0, 26, 10,  2,  0, 30, 10,  7,  0, 91,  0,  0,  0, 31, 10,161,  0,  6,  0, 27,  0, 31,  0, 12,  0,201,  4,
+  4,  0, 19,  0,  2,  0, 32, 10,  2,  0, 33, 10,  9,  0, 34, 10,141,  1,  7,  0,141,  1,  0,  0,141,  1,  1,  0,  2,  0, 17,  0,
+  2,  0, 19,  0,  4,  0, 23,  0,  0,  0, 35, 10,  0,  0, 36, 10,142,  1,  5,  0, 12,  0, 37, 10,  4,  0, 38, 10,  4,  0, 39, 10,
+  4,  0, 19,  0,  4,  0, 37,  0,143,  1, 13,  0, 27,  0, 31,  0,144,  1, 40, 10,144,  1, 41, 10, 12,  0, 42, 10,  4,  0, 43, 10,
+  2,  0, 44, 10,  2,  0, 37,  0, 12,  0, 45, 10, 12,  0, 46, 10,142,  1, 47, 10, 12,  0, 48, 10, 12,  0, 49, 10, 12,  0, 50, 10,
+144,  1, 30,  0,144,  1,  0,  0,144,  1,  1,  0,  9,  0, 51, 10,  4,  0, 77,  7,  4,  0, 37,  0,211,  0,248,  5,211,  0, 52, 10,
+  0,  0, 53, 10,  2,  0, 54, 10,  2,  0, 55, 10,  2,  0, 98,  7,  2,  0, 99,  7,  2,  0, 56, 10,  2,  0, 57, 10,  2,  0,148,  3,
+  2,  0,107,  6,  2,  0, 58, 10,  2,  0, 59, 10,  4,  0,209,  1,145,  1, 60, 10,146,  1, 61, 10,147,  1, 62, 10,  4,  0, 63, 10,
+  4,  0, 64, 10,  9,  0, 65, 10, 12,  0, 66, 10, 12,  0, 46, 10, 12,  0,116,  7, 12,  0, 67, 10, 12,  0, 68, 10,148,  1, 16,  0,
+148,  1,  0,  0,148,  1,  1,  0,  0,  0, 69, 10,149,  1, 70, 10,  2,  0, 17,  0,  2,  0, 15,  0,  2,  0, 71, 10,  2,  0, 72, 10,
+  2,  0, 73, 10,  2,  0, 74, 10,  2,  0, 75, 10,  2,  0, 76, 10,  2,  0, 77, 10,  2,  0, 78, 10,  2,  0, 70,  0,  2,  0,209,  1,
+150,  1,  9,  0,150,  1,  0,  0,150,  1,  1,  0, 12,  0, 79, 10,  0,  0, 80, 10,  2,  0, 81, 10,  2,  0, 82, 10,  2,  0, 83, 10,
+  2,  0, 37,  0,  9,  0, 84, 10,219,  0, 12,  0,219,  0,  0,  0,219,  0,  1,  0,  0,  0, 69, 10, 26,  0, 30,  0,151,  1, 92,  7,
+  9,  0, 85, 10,149,  1, 70, 10,142,  1, 86, 10, 12,  0, 87, 10,219,  0, 88, 10,  2,  0, 19,  0,  2,  0,105,  1,145,  1, 23,  0,
+145,  1,  0,  0,145,  1,  1,  0,  2,  0, 17,  0,  2,  0, 15,  0,  2,  0,  5,  0,  2,  0,  6,  0,  2,  0, 89, 10,  2,  0, 90, 10,
+  2,  0, 91, 10,  2,  0, 92, 10,  0,  0, 93, 10,  0,  0, 37,  0,  2,  0, 71, 10,  2,  0, 72, 10,  2,  0, 73, 10,  2,  0, 74, 10,
+  2,  0, 75, 10,  2,  0, 43,  0,  0,  0, 94, 10,  2,  0, 95, 10,  2,  0, 96, 10,  4,  0, 70,  0,  9,  0, 85, 10,152,  1,  8,  0,
+152,  1,  0,  0,152,  1,  1,  0,  9,  0,  2,  0,  9,  0, 97, 10,  0,  0,193,  3,  2,  0, 17,  0,  2,  0, 19,  0,  7,  0, 98, 10,
+153,  1,  5,  0,  7,  0, 99, 10,  4,  0,100, 10,  4,  0,101, 10,  4,  0, 40,  1,  4,  0, 19,  0,154,  1,  6,  0,  7,  0,102, 10,
+  7,  0,103, 10,  7,  0,104, 10,  7,  0,105, 10,  4,  0, 17,  0,  4,  0, 19,  0,155,  1,  5,  0,  7,  0, 67,  8,  7,  0, 68,  8,
+  7,  0,196,  2,  2,  0, 17,  2,  2,  0, 18,  2,156,  1,  5,  0,155,  1,  2,  0,  4,  0, 54,  0,  7,  0,106, 10,  7,  0, 67,  8,
+  7,  0, 68,  8,157,  1,  4,  0,  2,  0,107, 10,  2,  0,108, 10,  2,  0,109, 10,  2,  0,110, 10,158,  1,  2,  0, 42,  0, 78,  6,
+ 26,  0,147,  8,159,  1,  3,  0, 24,  0,111, 10,  4,  0, 19,  0,  4,  0, 37,  0,160,  1,  6,  0,  7,  0,106,  0,  7,  0,198,  2,
+  7,  0,112, 10,  7,  0, 37,  0,  2,  0,216,  0,  2,  0,113, 10,161,  1,  7,  0,161,  1,  0,  0,161,  1,  1,  0, 27,  0, 81,  6,
+  0,  0,114, 10,  4,  0,115, 10,  4,  0, 90,  0,  0,  0,193,  3,162,  1,  6,  0, 12,  0,198,  8,  0,  0,116, 10,  7,  0, 61,  0,
+  7,  0, 98, 10,  4,  0, 17,  0,  4,  0, 19,  0,163,  1,  3,  0,  7,  0,117, 10,  4,  0, 19,  0,  4,  0, 37,  0,164,  1, 15,  0,
+164,  1,  0,  0,164,  1,  1,  0, 70,  1,186,  8,162,  1, 62,  0, 12,  0, 73,  3, 35,  0, 50,  0,163,  1,118, 10,  4,  0, 54,  0,
+  7,  0, 61,  0,  2,  0, 19,  0,  2,  0, 25,  1,  4,  0,115, 10,  0,  0,114, 10,  4,  0,119, 10,  7,  0,120, 10,165,  1,  2,  0,
+  0,  0,121, 10,  0,  0,122, 10,166,  1,  4,  0,166,  1,  0,  0,166,  1,  1,  0,159,  0, 27,  3, 12,  0,123, 10,167,  1, 24,  0,
+167,  1,  0,  0,167,  1,  1,  0, 12,  0,124, 10,159,  0, 41,  8,166,  1,125, 10, 12,  0,126, 10, 12,  0, 73,  3,  0,  0,193,  3,
+  7,  0, 98, 10,  7,  0,127, 10,  7,  0, 88,  0,  7,  0, 89,  0,  7,  0,243,  8,  7,  0,244,  8,  7,  0,213,  2,  7,  0,247,  8,
+  7,  0, 43,  8,  7,  0,248,  8,  2,  0,128, 10,  2,  0,129, 10,  2,  0, 43,  0,  2,  0, 17,  0,  4,  0, 19,  0,  4,  0, 70,  0,
+168,  1,  6,  0,168,  1,  0,  0,168,  1,  1,  0, 12,  0,124, 10,  4,  0, 19,  0,  4,  0,133,  2,  0,  0,193,  3,169,  1, 10,  0,
+169,  1,  0,  0,169,  1,  1,  0, 27,  0, 81,  6,  0,  0,130, 10,  4,  0,131, 10,  4,  0,132, 10,  0,  0,114, 10,  4,  0,115, 10,
+  2,  0, 19,  0,  2,  0,133, 10,170,  1,  6,  0,170,  1,  0,  0,170,  1,  1,  0, 12,  0,134, 10,  0,  0,193,  3,  4,  0, 19,  0,
+  4,  0,135, 10,171,  1,  5,  0,171,  1,  0,  0,171,  1,  1,  0,  0,  0,114, 10,  4,  0,115, 10,  7,  0,186,  2, 39,  0, 12,  0,
+159,  0, 67,  3,159,  0,136, 10,166,  1,125, 10, 12,  0,137, 10,167,  1,138, 10, 12,  0,139, 10, 12,  0,140, 10,  4,  0, 19,  0,
+  4,  0,217,  0,  2,  0,141, 10,  2,  0,142, 10,  7,  0,143, 10,172,  1,  2,  0, 27,  0, 31,  0, 39,  0, 75,  0,173,  1,  5,  0,
+173,  1,  0,  0,173,  1,  1,  0,  4,  0, 17,  0,  4,  0, 19,  0,  0,  0, 20,  0,174,  1,  6,  0,173,  1,144, 10, 32,  0, 45,  0,
+  4,  0,145, 10,  7,  0,146, 10,  4,  0,147, 10,  4,  0,175,  8,175,  1,  3,  0,173,  1,144, 10,  4,  0,145, 10,  7,  0,148, 10,
+176,  1,  8,  0,173,  1,144, 10, 32,  0, 45,  0,  7,  0, 35,  1,  7,  0,149, 10,  7,  0,250,  2,  7,  0,109,  8,  4,  0,145, 10,
+  4,  0,150, 10,177,  1,  5,  0,173,  1,144, 10,  7,  0,151, 10,  7,  0,185,  7,  7,  0,219,  2,  7,  0, 57,  0,178,  1,  3,  0,
+173,  1,144, 10,  7,  0,109,  8,  7,  0,152, 10,128,  1,  4,  0,  7,  0,153, 10,  7,  0,193,  9,  2,  0,154, 10,  2,  0, 40,  1,
+179,  1, 14,  0,179,  1,  0,  0,179,  1,  1,  0, 12,  0,155, 10, 12,  0,156, 10, 12,  0,157, 10,  0,  0, 20,  0,  4,  0, 31,  0,
+  4,  0, 19,  0,  4,  0,158, 10,  7,  0,159, 10,  4,  0,147, 10,  4,  0,175,  8,  7,  0,202,  3,  7,  0,221,  2,133,  1, 23,  0,
+  4,  0,145, 10,  4,  0,160, 10,  7,  0,161, 10,  7,  0, 57,  0,  7,  0,162, 10,  7,  0,217,  2,  7,  0,153, 10,  7,  0,163, 10,
+  7,  0,198,  2,  7,  0,164, 10,  7,  0, 74,  4,  7,  0,165, 10,  7,  0,166, 10,  7,  0,167, 10,  7,  0,168, 10,  7,  0,169, 10,
+  7,  0,170, 10,  7,  0,171, 10,  7,  0,172, 10,  7,  0,173, 10,  7,  0,174, 10,  7,  0,175, 10, 12,  0,176, 10,122,  0, 33,  0,
+121,  0,177, 10,180,  1,178, 10, 68,  0,179, 10, 68,  0,223,  9, 68,  0,180, 10,181,  1,181, 10, 48,  0,165,  0, 48,  0,182, 10,
+ 48,  0,183, 10,  7,  0,184, 10,  7,  0,185, 10,  7,  0,186, 10,  7,  0,187, 10,  7,  0,188, 10,  7,  0,187,  8,  7,  0,189, 10,
+  7,  0,141,  1,  7,  0,190, 10,  4,  0,191, 10,  4,  0,192, 10,  4,  0,193, 10,  4,  0, 90,  0,  4,  0, 37,  0,  4,  0,194, 10,
+  2,  0,195, 10,  2,  0,196, 10,  4,  0,197, 10,  7,  0,198,  2,  4,  0,198, 10,  7,  0,199, 10,  4,  0,200, 10,138,  0,201, 10,
+ 12,  0,202, 10,123,  0, 11,  0,121,  0,177, 10, 59,  0,225,  0,  7,  0,106,  1,  7,  0,187,  8,  7,  0,203, 10,  7,  0,204, 10,
+  2,  0,205, 10,  2,  0,206, 10,  2,  0,207, 10,  2,  0, 17,  0,  4,  0, 37,  0,124,  0, 13,  0,121,  0,177, 10,140,  0,247,  2,
+142,  0,249,  2,  7,  0,144,  8,  7,  0,208, 10,  7,  0,209, 10,  7,  0, 37,  1,  7,  0,210, 10,  4,  0,211, 10,  4,  0,245,  2,
+  2,  0, 17,  0,  2,  0, 37,  0,  4,  0, 70,  0, 69, 78, 68, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0};
 

From 0338b05a64184ce1a439a418ebc4e315185c1eec Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Mon, 14 Sep 2009 08:47:13 +0000
Subject: [PATCH 577/577] =?UTF-8?q?Three=20node=20selection=20operators=20?=
 =?UTF-8?q?added,=20patch=20by=20Micha=C5=82=20Ziu=C5=82ek,=20thanks!=20*?=
 =?UTF-8?q?=20Select=20all=20*=20Select=20linked=20to=20*=20Select=20linke?=
 =?UTF-8?q?d=20from?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 release/ui/space_node.py                      |   9 +-
 source/blender/editors/space_node/node_edit.c |  46 +------
 .../blender/editors/space_node/node_intern.h  |   5 +-
 source/blender/editors/space_node/node_ops.c  |   8 +-
 .../blender/editors/space_node/node_select.c  | 120 +++++++++++++++++-
 5 files changed, 136 insertions(+), 52 deletions(-)

diff --git a/release/ui/space_node.py b/release/ui/space_node.py
index 6ac1ac84f35..55b2065084b 100644
--- a/release/ui/space_node.py
+++ b/release/ui/space_node.py
@@ -74,11 +74,10 @@ class NODE_MT_select(bpy.types.Menu):
 
 		layout.itemO("node.select_border")
 
-		# XXX
-		# layout.itemS()
-		# layout.itemO("node.select_all")
-		# layout.itemO("node.select_linked_from")
-		# layout.itemO("node.select_linked_to")
+		layout.itemS()
+		layout.itemO("node.select_all")
+		layout.itemO("node.select_linked_from")
+		layout.itemO("node.select_linked_to")
 
 class NODE_MT_node(bpy.types.Menu):
 	__space_type__ = 'NODE_EDITOR'
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index bc81c25d106..159a4036914 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1229,27 +1229,14 @@ Material *editnode_get_active_material(Material *ma)
 
 
 /* no undo here! */
-void node_deselectall(SpaceNode *snode, int swap)
+void node_deselectall(SpaceNode *snode)
 {
 	bNode *node;
 	
-	if(swap) {
-		for(node= snode->edittree->nodes.first; node; node= node->next)
-			if(node->flag & SELECT)
-				break;
-		if(node==NULL) {
-			for(node= snode->edittree->nodes.first; node; node= node->next)
-				node->flag |= SELECT;
-			return;
-		}
-		/* else pass on to deselect */
-	}
-	
 	for(node= snode->edittree->nodes.first; node; node= node->next)
 		node->flag &= ~SELECT;
 }
 
-
 int node_has_hidden_sockets(bNode *node)
 {
 	bNodeSocket *sock;
@@ -1606,7 +1593,7 @@ bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float
 {
 	bNode *node= NULL, *gnode;
 	
-	node_deselectall(snode, 0);
+	node_deselectall(snode);
 	
 	if(type>=NODE_DYNAMIC_MENU) {
 		node= nodeAddNodeType(snode->edittree, type, NULL, NULL);
@@ -2091,32 +2078,6 @@ void node_insert_key(SpaceNode *snode)
 	}
 }
 
-void node_select_linked(SpaceNode *snode, int out)
-{
-	bNodeLink *link;
-	bNode *node;
-	
-	/* NODE_TEST is the free flag */
-	for(node= snode->edittree->nodes.first; node; node= node->next)
-		node->flag &= ~NODE_TEST;
-
-	for(link= snode->edittree->links.first; link; link= link->next) {
-		if(out) {
-			if(link->fromnode->flag & NODE_SELECT)
-				link->tonode->flag |= NODE_TEST;
-		}
-		else {
-			if(link->tonode->flag & NODE_SELECT)
-				link->fromnode->flag |= NODE_TEST;
-		}
-	}
-	
-	for(node= snode->edittree->nodes.first; node; node= node->next)
-		if(node->flag & NODE_TEST)
-			node->flag |= NODE_SELECT;
-	
-}
-
 /* makes a link between selected output and input sockets */
 void node_make_link(SpaceNode *snode)
 {
@@ -2451,9 +2412,6 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				if(fromlib) fromlib= -1;
 				else toolbox_n_add();
 			}
-			else if(G.qual==0) {
-				node_deselectall(snode, 1);
-			}
 			break;
 		case BKEY:
 			if(G.qual==0)
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index 5c66c902797..6fdaeca7701 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -58,6 +58,9 @@ void node_keymap(wmWindowManager *wm);
 /* node_select.c */
 void NODE_OT_select(struct wmOperatorType *ot);
 void NODE_OT_select_extend(struct wmOperatorType *ot);
+void NODE_OT_select_all(wmOperatorType *ot);
+void NODE_OT_select_linked_to(wmOperatorType *ot);
+void NODE_OT_select_linked_from(wmOperatorType *ot);
 void NODE_OT_visibility_toggle(struct wmOperatorType *ot);
 void NODE_OT_view_all(struct wmOperatorType *ot);
 void NODE_OT_select_border(struct wmOperatorType *ot);
@@ -76,7 +79,7 @@ void snode_set_context(SpaceNode *snode, Scene *scene);
 void snode_make_group_editable(SpaceNode *snode, bNode *gnode);
 void snode_home(ScrArea *sa, ARegion *ar, SpaceNode *snode);
 void node_set_active(SpaceNode *snode, bNode *node);
-void node_deselectall(SpaceNode *snode, int swap);
+void node_deselectall(SpaceNode *snode);
 void snode_composite_job(const struct bContext *C, ScrArea *sa);
 bNode *snode_get_editgroup(SpaceNode *snode);
 void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag);
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index f78abb28313..af857d57634 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -51,6 +51,9 @@ void node_operatortypes(void)
 {
 	WM_operatortype_append(NODE_OT_select);
 	WM_operatortype_append(NODE_OT_select_extend);
+	WM_operatortype_append(NODE_OT_select_all);
+	WM_operatortype_append(NODE_OT_select_linked_to);
+	WM_operatortype_append(NODE_OT_select_linked_from);
 	WM_operatortype_append(NODE_OT_visibility_toggle);
 	WM_operatortype_append(NODE_OT_view_all);
 	WM_operatortype_append(NODE_OT_select_border);
@@ -59,7 +62,6 @@ void node_operatortypes(void)
 	WM_operatortype_append(NODE_OT_resize);
 	WM_operatortype_append(NODE_OT_links_cut);
 	WM_operatortype_append(NODE_OT_duplicate);
-	
 }
 
 void node_keymap(struct wmWindowManager *wm)
@@ -82,6 +84,10 @@ void node_keymap(struct wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "NODE_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_select_border", BKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_delete", XKEY, KM_PRESS, 0, 0);
+
+	WM_keymap_add_item(keymap, "NODE_OT_select_all", AKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "NODE_OT_select_linked_to", LKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "NODE_OT_select_linked_from", LKEY, KM_PRESS, 0, 0);
 	
 	transform_keymap_for_space(wm, keymap, SPACE_NODE);
 }
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 73becc1ebe8..94e17b56a02 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -83,7 +83,7 @@ static void node_mouse_select(SpaceNode *snode, ARegion *ar, short *mval, short
 	}
 	if(node) {
 		if((extend & KM_SHIFT)==0)
-			node_deselectall(snode, 0);
+			node_deselectall(snode);
 		
 		if(extend & KM_SHIFT) {
 			if(node->flag & SELECT)
@@ -291,3 +291,121 @@ void NODE_OT_select_border(wmOperatorType *ot)
 
 	RNA_def_enum(ot->srna, "type", prop_select_types, 0, "Type", "");
 }
+
+/* ****** Select/Deselect All ****** */
+
+static int node_select_all_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+	bNode *first = snode->edittree->nodes.first;
+	bNode *node;
+	int count= 0;
+
+	for(node=first; node; node=node->next)
+		if(node->flag & NODE_SELECT)
+			count++;
+
+	if(count) {
+		for(node=first; node; node=node->next)
+			node->flag &= ~NODE_SELECT;
+	}
+	else {
+		for(node=first; node; node=node->next)
+			node->flag |= NODE_SELECT;
+	}
+	
+	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void NODE_OT_select_all(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select/Deselect All";
+	ot->description = "(De)select all nodes.";
+	ot->idname = "NODE_OT_select_all";
+	
+	/* api callbacks */
+	ot->exec = node_select_all_exec;
+	ot->poll = ED_operator_node_active;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/* ****** Select Linked To ****** */
+
+static int node_select_linked_to_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+	bNodeLink *link;
+	bNode *node;
+	
+	for (node=snode->edittree->nodes.first; node; node=node->next)
+		node->flag &= ~NODE_TEST;
+
+	for (link=snode->edittree->links.first; link; link=link->next)
+		if (link->fromnode->flag & NODE_SELECT)
+			link->tonode->flag |= NODE_TEST;
+	
+	for (node=snode->edittree->nodes.first; node; node=node->next)
+		if (node->flag & NODE_TEST)
+			node->flag |= NODE_SELECT;
+	
+	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void NODE_OT_select_linked_to(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Linked To";
+	ot->description = "Select nodes linked to the selected ones.";
+	ot->idname = "NODE_OT_select_linked_to";
+	
+	/* api callbacks */
+	ot->exec = node_select_linked_to_exec;
+	ot->poll = ED_operator_node_active;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+/* ****** Select Linked From ****** */
+
+static int node_select_linked_from_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+	bNodeLink *link;
+	bNode *node;
+	
+	for(node=snode->edittree->nodes.first; node; node=node->next)
+		node->flag &= ~NODE_TEST;
+
+	for(link=snode->edittree->links.first; link; link=link->next)
+		if(link->tonode->flag & NODE_SELECT)
+			link->fromnode->flag |= NODE_TEST;
+	
+	for(node=snode->edittree->nodes.first; node; node=node->next)
+		if(node->flag & NODE_TEST)
+			node->flag |= NODE_SELECT;
+	
+	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void NODE_OT_select_linked_from(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Linked From";
+	ot->description = "Select nodes linked from the selected ones.";
+	ot->idname = "NODE_OT_select_linked_from";
+	
+	/* api callbacks */
+	ot->exec = node_select_linked_from_exec;
+	ot->poll = ED_operator_node_active;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+